diff --git a/.agents/skills/component-refactoring/SKILL.md b/.agents/skills/component-refactoring/SKILL.md
index 98a94592ab..a7cae67e8f 100644
--- a/.agents/skills/component-refactoring/SKILL.md
+++ b/.agents/skills/component-refactoring/SKILL.md
@@ -63,7 +63,7 @@ pnpm analyze-component <path> --json
 
 ```typescript
 // ❌ Before: Complex state logic in component
-const Configuration: FC = () => {
+function Configuration() {
   const [modelConfig, setModelConfig] = useState<ModelConfig>(...)
   const [datasetConfigs, setDatasetConfigs] = useState<DatasetConfigs>(...)
   const [completionParams, setCompletionParams] = useState<FormValue>({})
@@ -85,7 +85,7 @@ export const useModelConfig = (appId: string) => {
 }
 
 // Component becomes cleaner
-const Configuration: FC = () => {
+function Configuration() {
   const { modelConfig, setModelConfig } = useModelConfig(appId)
   return <div>...</div>
 }
@@ -189,8 +189,6 @@ const Template = useMemo(() => {
 
 **Dify Convention**:
 - This skill is for component decomposition, not query/mutation design.
-- When refactoring data fetching, follow `web/AGENTS.md`.
-- Use `frontend-query-mutation` for contracts, query shape, data-fetching wrappers, query/mutation call-site patterns, conditional queries, invalidation, and mutation error handling.
 - Do not introduce deprecated `useInvalid` / `useReset`.
 - Do not add thin passthrough `useQuery` wrappers during refactoring; only extract a custom hook when it truly orchestrates multiple queries/mutations or shared derived state.
 
diff --git a/.agents/skills/component-refactoring/references/complexity-patterns.md b/.agents/skills/component-refactoring/references/complexity-patterns.md
index 5a0a268f38..2873630d4b 100644
--- a/.agents/skills/component-refactoring/references/complexity-patterns.md
+++ b/.agents/skills/component-refactoring/references/complexity-patterns.md
@@ -60,8 +60,10 @@ const Template = useMemo(() => {
 **After** (complexity: ~3):
 
 ```typescript
+import type { ComponentType } from 'react'
+
 // Define lookup table outside component
-const TEMPLATE_MAP: Record<AppModeEnum, Record<string, FC<TemplateProps>>> = {
+const TEMPLATE_MAP: Record<AppModeEnum, Record<string, ComponentType<TemplateProps>>> = {
   [AppModeEnum.CHAT]: {
     [LanguagesSupported[1]]: TemplateChatZh,
     [LanguagesSupported[7]]: TemplateChatJa,
diff --git a/.agents/skills/component-refactoring/references/component-splitting.md b/.agents/skills/component-refactoring/references/component-splitting.md
index 78a3389100..81c007e005 100644
--- a/.agents/skills/component-refactoring/references/component-splitting.md
+++ b/.agents/skills/component-refactoring/references/component-splitting.md
@@ -65,10 +65,10 @@ interface ConfigurationHeaderProps {
   onPublish: () => void
 }
 
-const ConfigurationHeader: FC<ConfigurationHeaderProps> = ({
+function ConfigurationHeader({
   isAdvancedMode,
   onPublish,
-}) => {
+}: ConfigurationHeaderProps) {
   const { t } = useTranslation()
   
   return (
@@ -136,7 +136,7 @@ const AppInfo = () => {
 }
 
 // ✅ After: Separate view components
-const AppInfoExpanded: FC<AppInfoViewProps> = ({ appDetail, onAction }) => {
+function AppInfoExpanded({ appDetail, onAction }: AppInfoViewProps) {
   return (
     <div className="expanded">
       {/* Clean, focused expanded view */}
@@ -144,7 +144,7 @@ const AppInfoExpanded: FC<AppInfoViewProps> = ({ appDetail, onAction }) => {
   )
 }
 
-const AppInfoCollapsed: FC<AppInfoViewProps> = ({ appDetail, onAction }) => {
+function AppInfoCollapsed({ appDetail, onAction }: AppInfoViewProps) {
   return (
     <div className="collapsed">
       {/* Clean, focused collapsed view */}
@@ -203,12 +203,12 @@ interface AppInfoModalsProps {
   onSuccess: () => void
 }
 
-const AppInfoModals: FC<AppInfoModalsProps> = ({
+function AppInfoModals({
   appDetail,
   activeModal,
   onClose,
   onSuccess,
-}) => {
+}: AppInfoModalsProps) {
   const handleEdit = async (data) => { /* logic */ }
   const handleDuplicate = async (data) => { /* logic */ }
   const handleDelete = async () => { /* logic */ }
@@ -296,7 +296,7 @@ interface OperationItemProps {
   onAction: (id: string) => void
 }
 
-const OperationItem: FC<OperationItemProps> = ({ operation, onAction }) => {
+function OperationItem({ operation, onAction }: OperationItemProps) {
   return (
     <div className="operation-item">
       <span className="icon">{operation.icon}</span>
@@ -435,7 +435,7 @@ interface ChildProps {
   onSubmit: () => void
 }
 
-const Child: FC<ChildProps> = ({ value, onChange, onSubmit }) => {
+function Child({ value, onChange, onSubmit }: ChildProps) {
   return (
     <div>
       <input value={value} onChange={e => onChange(e.target.value)} />
diff --git a/.agents/skills/component-refactoring/references/hook-extraction.md b/.agents/skills/component-refactoring/references/hook-extraction.md
index 0d567eb2a6..6fad2c8885 100644
--- a/.agents/skills/component-refactoring/references/hook-extraction.md
+++ b/.agents/skills/component-refactoring/references/hook-extraction.md
@@ -112,13 +112,13 @@ export const useModelConfig = ({
 
 ```typescript
 // Before: 50+ lines of state management
-const Configuration: FC = () => {
+function Configuration() {
   const [modelConfig, setModelConfig] = useState<ModelConfig>(...)
   // ... lots of related state and effects
 }
 
 // After: Clean component
-const Configuration: FC = () => {
+function Configuration() {
   const {
     modelConfig,
     setModelConfig,
@@ -159,8 +159,6 @@ const Configuration: FC = () => {
 
 When hook extraction touches query or mutation code, do not use this reference as the source of truth for data-layer patterns.
 
-- Follow `web/AGENTS.md` first.
-- Use `frontend-query-mutation` for contracts, query shape, data-fetching wrappers, query/mutation call-site patterns, conditional queries, invalidation, and mutation error handling.
 - Do not introduce deprecated `useInvalid` / `useReset`.
 - Do not extract thin passthrough `useQuery` hooks; only extract orchestration hooks.
 
diff --git a/.agents/skills/e2e-cucumber-playwright/SKILL.md b/.agents/skills/e2e-cucumber-playwright/SKILL.md
index de6b58f26d..dd7d204678 100644
--- a/.agents/skills/e2e-cucumber-playwright/SKILL.md
+++ b/.agents/skills/e2e-cucumber-playwright/SKILL.md
@@ -23,7 +23,7 @@ Use this skill for Dify's repository-level E2E suite in `e2e/`. Use [`e2e/AGENTS
    - `e2e/scripts/run-cucumber.ts` and `e2e/cucumber.config.ts` when tags or execution flow matter
 3. Read [`references/playwright-best-practices.md`](references/playwright-best-practices.md) only when locator, assertion, isolation, or waiting choices are involved.
 4. Read [`references/cucumber-best-practices.md`](references/cucumber-best-practices.md) only when scenario wording, step granularity, tags, or expression design are involved.
-5. Re-check official docs with Context7 before introducing a new Playwright or Cucumber pattern.
+5. Re-check official Playwright or Cucumber docs with the available documentation tools before introducing a new framework pattern.
 
 ## Local Rules
 
diff --git a/.agents/skills/frontend-code-review/references/performance.md b/.agents/skills/frontend-code-review/references/performance.md
index 2d60072f5c..0c33db46d0 100644
--- a/.agents/skills/frontend-code-review/references/performance.md
+++ b/.agents/skills/frontend-code-review/references/performance.md
@@ -9,18 +9,18 @@ Category: Performance
 
 When rendering React Flow, prefer `useNodes`/`useEdges` for UI consumption and rely on `useStoreApi` inside callbacks that mutate or read node/edge state. Avoid manually pulling Flow data outside of these hooks.
 
-## Complex prop memoization
+## Complex prop stability
 
-IsUrgent: True
+IsUrgent: False
 Category: Performance
 
 ### Description
 
-Wrap complex prop values (objects, arrays, maps) in `useMemo` prior to passing them into child components to guarantee stable references and prevent unnecessary renders.
+Only require stable object, array, or map props when there is a clear reason: the child is memoized, the value participates in effect/query dependencies, the value is part of a stable-reference API contract, or profiling/local behavior shows avoidable re-renders. Do not request `useMemo` for every inline object by default; `how-to-write-component` treats memoization as a targeted optimization.
 
 Update this file when adding, editing, or removing Performance rules so the catalog remains accurate.
 
-Wrong:
+Risky:
 
 ```tsx
 <HeavyComp
@@ -31,7 +31,7 @@ Wrong:
 />
 ```
 
-Right:
+Better when stable identity matters:
 
 ```tsx
 const config = useMemo(() => ({
diff --git a/.agents/skills/frontend-query-mutation/SKILL.md b/.agents/skills/frontend-query-mutation/SKILL.md
deleted file mode 100644
index 49888bdb66..0000000000
--- a/.agents/skills/frontend-query-mutation/SKILL.md
+++ /dev/null
@@ -1,44 +0,0 @@
----
-name: frontend-query-mutation
-description: Guide for implementing Dify frontend query and mutation patterns with TanStack Query and oRPC. Trigger when creating or updating contracts in web/contract, wiring router composition, consuming consoleQuery or marketplaceQuery in components or services, deciding whether to call queryOptions() directly or extract a helper or use-* hook, handling conditional queries, cache invalidation, mutation error handling, or migrating legacy service calls to contract-first query and mutation helpers.
----
-
-# Frontend Query & Mutation
-
-## Intent
-
-- Keep contract as the single source of truth in `web/contract/*`.
-- Prefer contract-shaped `queryOptions()` and `mutationOptions()`.
-- Keep invalidation and mutation flow knowledge in the service layer.
-- Keep abstractions minimal to preserve TypeScript inference.
-
-## Workflow
-
-1. Identify the change surface.
-   - Read `references/contract-patterns.md` for contract files, router composition, client helpers, and query or mutation call-site shape.
-   - Read `references/runtime-rules.md` for conditional queries, invalidation, error handling, and legacy migrations.
-   - Read both references when a task spans contract shape and runtime behavior.
-2. Implement the smallest abstraction that fits the task.
-   - Default to direct `useQuery(...)` or `useMutation(...)` calls with oRPC helpers at the call site.
-   - Extract a small shared query helper only when multiple call sites share the same extra options.
-   - Create `web/service/use-{domain}.ts` only for orchestration or shared domain behavior.
-3. Preserve Dify conventions.
-   - Keep contract inputs in `{ params, query?, body? }` shape.
-   - Bind invalidation in the service-layer mutation definition.
-   - Prefer `mutate(...)`; use `mutateAsync(...)` only when Promise semantics are required.
-
-## Files Commonly Touched
-
-- `web/contract/console/*.ts`
-- `web/contract/marketplace.ts`
-- `web/contract/router.ts`
-- `web/service/client.ts`
-- `web/service/use-*.ts`
-- component and hook call sites using `consoleQuery` or `marketplaceQuery`
-
-## References
-
-- Use `references/contract-patterns.md` for contract shape, router registration, query and mutation helpers, and anti-patterns that degrade inference.
-- Use `references/runtime-rules.md` for conditional queries, invalidation, `mutate` versus `mutateAsync`, and legacy migration rules.
-
-Treat this skill as the single query and mutation entry point for Dify frontend work. Keep detailed rules in the reference files instead of duplicating them in project docs.
diff --git a/.agents/skills/frontend-query-mutation/agents/openai.yaml b/.agents/skills/frontend-query-mutation/agents/openai.yaml
deleted file mode 100644
index 87f7ae6ea4..0000000000
--- a/.agents/skills/frontend-query-mutation/agents/openai.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-interface:
-  display_name: "Frontend Query & Mutation"
-  short_description: "Dify TanStack Query and oRPC patterns"
-  default_prompt: "Use this skill when implementing or reviewing Dify frontend contracts, query and mutation call sites, conditional queries, invalidation, or legacy query/mutation migrations."
diff --git a/.agents/skills/frontend-query-mutation/references/contract-patterns.md b/.agents/skills/frontend-query-mutation/references/contract-patterns.md
deleted file mode 100644
index 08016ed2cc..0000000000
--- a/.agents/skills/frontend-query-mutation/references/contract-patterns.md
+++ /dev/null
@@ -1,98 +0,0 @@
-# Contract Patterns
-
-## Table of Contents
-
-- Intent
-- Minimal structure
-- Core workflow
-- Query usage decision rule
-- Mutation usage decision rule
-- Anti-patterns
-- Contract rules
-- Type export
-
-## Intent
-
-- Keep contract as the single source of truth in `web/contract/*`.
-- Default query usage to call-site `useQuery(consoleQuery|marketplaceQuery.xxx.queryOptions(...))` when endpoint behavior maps 1:1 to the contract.
-- Keep abstractions minimal and preserve TypeScript inference.
-
-## Minimal Structure
-
-```text
-web/contract/
-├── base.ts
-├── router.ts
-├── marketplace.ts
-└── console/
-    ├── billing.ts
-    └── ...other domains
-web/service/client.ts
-```
-
-## Core Workflow
-
-1. Define contract in `web/contract/console/{domain}.ts` or `web/contract/marketplace.ts`.
-   - Use `base.route({...}).output(type<...>())` as the baseline.
-   - Add `.input(type<...>())` only when the request has `params`, `query`, or `body`.
-   - For `GET` without input, omit `.input(...)`; do not use `.input(type<unknown>())`.
-2. Register contract in `web/contract/router.ts`.
-   - Import directly from domain files and nest by API prefix.
-3. Consume from UI call sites via oRPC query utilities.
-
-```typescript
-import { useQuery } from '@tanstack/react-query'
-import { consoleQuery } from '@/service/client'
-
-const invoiceQuery = useQuery(consoleQuery.billing.invoices.queryOptions({
-  staleTime: 5 * 60 * 1000,
-  throwOnError: true,
-  select: invoice => invoice.url,
-}))
-```
-
-## Query Usage Decision Rule
-
-1. Default to direct `*.queryOptions(...)` usage at the call site.
-2. If 3 or more call sites share the same extra options, extract a small query helper, not a `use-*` passthrough hook.
-3. Create `web/service/use-{domain}.ts` only for orchestration.
-   - Combine multiple queries or mutations.
-   - Share domain-level derived state or invalidation helpers.
-
-```typescript
-const invoicesBaseQueryOptions = () =>
-  consoleQuery.billing.invoices.queryOptions({ retry: false })
-
-const invoiceQuery = useQuery({
-  ...invoicesBaseQueryOptions(),
-  throwOnError: true,
-})
-```
-
-## Mutation Usage Decision Rule
-
-1. Default to mutation helpers from `consoleQuery` or `marketplaceQuery`, for example `useMutation(consoleQuery.billing.bindPartnerStack.mutationOptions(...))`.
-2. If the mutation flow is heavily custom, use oRPC clients as `mutationFn`, for example `consoleClient.xxx` or `marketplaceClient.xxx`, instead of handwritten non-oRPC mutation logic.
-
-## Anti-Patterns
-
-- Do not wrap `useQuery` with `options?: Partial<UseQueryOptions>`.
-- Do not split local `queryKey` and `queryFn` when oRPC `queryOptions` already exists and fits the use case.
-- Do not create thin `use-*` passthrough hooks for a single endpoint.
-- These patterns can degrade inference, especially around `throwOnError` and `select`, and add unnecessary indirection.
-
-## Contract Rules
-
-- Input structure: always use `{ params, query?, body? }`.
-- No-input `GET`: omit `.input(...)`; do not use `.input(type<unknown>())`.
-- Path params: use `{paramName}` in the path and match it in the `params` object.
-- Router nesting: group by API prefix, for example `/billing/*` becomes `billing: {}`.
-- No barrel files: import directly from specific files.
-- Types: import from `@/types/` and use the `type<T>()` helper.
-- Mutations: prefer `mutationOptions`; use explicit `mutationKey` mainly for defaults, filtering, and devtools.
-
-## Type Export
-
-```typescript
-export type ConsoleInputs = InferContractRouterInputs<typeof consoleRouterContract>
-```
diff --git a/.agents/skills/frontend-query-mutation/references/runtime-rules.md b/.agents/skills/frontend-query-mutation/references/runtime-rules.md
deleted file mode 100644
index 73d6fbdded..0000000000
--- a/.agents/skills/frontend-query-mutation/references/runtime-rules.md
+++ /dev/null
@@ -1,130 +0,0 @@
-# Runtime Rules
-
-## Table of Contents
-
-- Conditional queries
-- Cache invalidation
-- Key API guide
-- `mutate` vs `mutateAsync`
-- Legacy migration
-
-## Conditional Queries
-
-Prefer contract-shaped `queryOptions(...)`.
-When required input is missing, prefer `input: skipToken` instead of placeholder params or non-null assertions.
-Use `enabled` only for extra business gating after the input itself is already valid.
-
-```typescript
-import { skipToken, useQuery } from '@tanstack/react-query'
-
-// Disable the query by skipping input construction.
-function useAccessMode(appId: string | undefined) {
-  return useQuery(consoleQuery.accessControl.appAccessMode.queryOptions({
-    input: appId
-      ? { params: { appId } }
-      : skipToken,
-  }))
-}
-
-// Avoid runtime-only guards that bypass type checking.
-function useBadAccessMode(appId: string | undefined) {
-  return useQuery(consoleQuery.accessControl.appAccessMode.queryOptions({
-    input: { params: { appId: appId! } },
-    enabled: !!appId,
-  }))
-}
-```
-
-## Cache Invalidation
-
-Bind invalidation in the service-layer mutation definition.
-Components may add UI feedback in call-site callbacks, but they should not decide which queries to invalidate.
-
-Use:
-
-- `.key()` for namespace or prefix invalidation
-- `.queryKey(...)` only for exact cache reads or writes such as `getQueryData` and `setQueryData`
-- `queryClient.invalidateQueries(...)` in mutation `onSuccess`
-
-Do not use deprecated `useInvalid` from `use-base.ts`.
-
-```typescript
-// Service layer owns cache invalidation.
-export const useUpdateAccessMode = () => {
-  const queryClient = useQueryClient()
-
-  return useMutation(consoleQuery.accessControl.updateAccessMode.mutationOptions({
-    onSuccess: () => {
-      queryClient.invalidateQueries({
-        queryKey: consoleQuery.accessControl.appWhitelistSubjects.key(),
-      })
-    },
-  }))
-}
-
-// Component only adds UI behavior.
-updateAccessMode({ appId, mode }, {
-  onSuccess: () => toast.success('...'),
-})
-
-// Avoid putting invalidation knowledge in the component.
-mutate({ appId, mode }, {
-  onSuccess: () => {
-    queryClient.invalidateQueries({
-      queryKey: consoleQuery.accessControl.appWhitelistSubjects.key(),
-    })
-  },
-})
-```
-
-## Key API Guide
-
-- `.key(...)`
-  - Use for partial matching operations.
-  - Prefer it for invalidation, refetch, and cancel patterns.
-  - Example: `queryClient.invalidateQueries({ queryKey: consoleQuery.billing.key() })`
-- `.queryKey(...)`
-  - Use for a specific query's full key.
-  - Prefer it for exact cache addressing and direct reads or writes.
-- `.mutationKey(...)`
-  - Use for a specific mutation's full key.
-  - Prefer it for mutation defaults registration, mutation-status filtering, and devtools grouping.
-
-## `mutate` vs `mutateAsync`
-
-Prefer `mutate` by default.
-Use `mutateAsync` only when Promise semantics are truly required, such as parallel mutations or sequential steps with result dependencies.
-
-Rules:
-
-- Event handlers should usually call `mutate(...)` with `onSuccess` or `onError`.
-- Every `await mutateAsync(...)` must be wrapped in `try/catch`.
-- Do not use `mutateAsync` when callbacks already express the flow clearly.
-
-```typescript
-// Default case.
-mutation.mutate(data, {
-  onSuccess: result => router.push(result.url),
-})
-
-// Promise semantics are required.
-try {
-  const order = await createOrder.mutateAsync(orderData)
-  await confirmPayment.mutateAsync({ orderId: order.id, token })
-  router.push(`/orders/${order.id}`)
-}
-catch (error) {
-  toast.error(error instanceof Error ? error.message : 'Unknown error')
-}
-```
-
-## Legacy Migration
-
-When touching old code, migrate it toward these rules:
-
-| Old pattern | New pattern |
-|---|---|
-| `useInvalid(key)` in service layer | `queryClient.invalidateQueries(...)` inside mutation `onSuccess` |
-| component-triggered invalidation after mutation | move invalidation into the service-layer mutation definition |
-| imperative fetch plus manual invalidation | wrap it in `useMutation(...mutationOptions(...))` |
-| `await mutateAsync()` without `try/catch` | switch to `mutate(...)` or add `try/catch` |
diff --git a/.agents/skills/frontend-testing/SKILL.md b/.agents/skills/frontend-testing/SKILL.md
index 105c979c58..21c46d75bc 100644
--- a/.agents/skills/frontend-testing/SKILL.md
+++ b/.agents/skills/frontend-testing/SKILL.md
@@ -5,7 +5,7 @@ description: Generate Vitest + React Testing Library tests for Dify frontend com
 
 # Dify Frontend Testing Skill
 
-This skill enables Claude to generate high-quality, comprehensive frontend tests for the Dify project following established conventions and best practices.
+This skill enables Codex to generate high-quality, comprehensive frontend tests for the Dify project following established conventions and best practices.
 
 > **⚠️ Authoritative Source**: This skill is derived from `web/docs/test.md`. Use Vitest mock/timer APIs (`vi.*`).
 
@@ -24,35 +24,27 @@ Apply this skill when the user:
 **Do NOT apply** when:
 
 - User is asking about backend/API tests (Python/pytest)
-- User is asking about E2E tests (Playwright/Cypress)
+- User is asking about E2E tests (Cucumber + Playwright under `e2e/`)
 - User is only asking conceptual questions without code context
 
 ## Quick Reference
 
-### Tech Stack
-
-| Tool | Version | Purpose |
-|------|---------|---------|
-| Vitest | 4.0.16 | Test runner |
-| React Testing Library | 16.0 | Component testing |
-| jsdom | - | Test environment |
-| nock | 14.0 | HTTP mocking |
-| TypeScript | 5.x | Type safety |
-
 ### Key Commands
 
+Run these commands from `web/`. From the repository root, prefix them with `pnpm -C web`.
+
 ```bash
 # Run all tests
 pnpm test
 
 # Watch mode
-pnpm test:watch
+pnpm test --watch
 
 # Run specific file
 pnpm test path/to/file.spec.tsx
 
 # Generate coverage report
-pnpm test:coverage
+pnpm test --coverage
 
 # Analyze component complexity
 pnpm analyze-component <path>
@@ -228,7 +220,10 @@ Every test should clearly separate:
 ### 2. Black-Box Testing
 
 - Test observable behavior, not implementation details
-- Use semantic queries (getByRole, getByLabelText)
+- Use semantic queries (`getByRole` with accessible `name`, `getByLabelText`, `getByPlaceholderText`, `getByText`, and scoped `within(...)`)
+- Treat `getByTestId` as a last resort. If a control cannot be found by role/name, label, landmark, or dialog scope, fix the component accessibility first instead of adding or relying on `data-testid`.
+- Remove production `data-testid` attributes when semantic selectors can cover the behavior. Keep them only for non-visual mocked boundaries, editor/browser shims such as Monaco, canvas/chart output, or third-party widgets with no accessible DOM in the test environment.
+- Do not assert decorative icons by test id. Assert the named control that contains them, or mark decorative icons `aria-hidden`.
 - Avoid testing internal state directly
 - **Prefer pattern matching over hardcoded strings** in assertions:
 
diff --git a/.agents/skills/frontend-testing/references/mocking.md b/.agents/skills/frontend-testing/references/mocking.md
index 8c2f1c0c58..7723e4df21 100644
--- a/.agents/skills/frontend-testing/references/mocking.md
+++ b/.agents/skills/frontend-testing/references/mocking.md
@@ -56,7 +56,7 @@ See [Zustand Store Testing](#zustand-store-testing) section for full details.
 
 | Location | Purpose |
 |----------|---------|
-| `web/vitest.setup.ts` | Global mocks shared by all tests (`react-i18next`, `next/image`, `zustand`) |
+| `web/vitest.setup.ts` | Global mocks shared by all tests (`react-i18next`, `zustand`, clipboard, FloatingPortal, Monaco, localStorage`) |
 | `web/__mocks__/zustand.ts` | Zustand mock implementation (auto-resets stores after each test) |
 | `web/__mocks__/` | Reusable mock factories shared across multiple test files |
 | Test file | Test-specific mocks, inline with `vi.mock()` |
@@ -216,28 +216,21 @@ describe('Component', () => {
 })
 ```
 
-### 5. HTTP Mocking with Nock
+### 5. HTTP and `fetch` Mocking
 
 ```typescript
-import nock from 'nock'
-
-const GITHUB_HOST = 'https://api.github.com'
-const GITHUB_PATH = '/repos/owner/repo'
-
-const mockGithubApi = (status: number, body: Record<string, unknown>, delayMs = 0) => {
-  return nock(GITHUB_HOST)
-    .get(GITHUB_PATH)
-    .delay(delayMs)
-    .reply(status, body)
-}
-
 describe('GithubComponent', () => {
-  afterEach(() => {
-    nock.cleanAll()
+  beforeEach(() => {
+    vi.clearAllMocks()
   })
 
   it('should display repo info', async () => {
-    mockGithubApi(200, { name: 'dify', stars: 1000 })
+    vi.mocked(globalThis.fetch).mockResolvedValueOnce(
+      new Response(JSON.stringify({ name: 'dify', stars: 1000 }), {
+        status: 200,
+        headers: { 'Content-Type': 'application/json' },
+      }),
+    )
     
     render(<GithubComponent />)
     
@@ -247,7 +240,12 @@ describe('GithubComponent', () => {
   })
 
   it('should handle API error', async () => {
-    mockGithubApi(500, { message: 'Server error' })
+    vi.mocked(globalThis.fetch).mockResolvedValueOnce(
+      new Response(JSON.stringify({ message: 'Server error' }), {
+        status: 500,
+        headers: { 'Content-Type': 'application/json' },
+      }),
+    )
     
     render(<GithubComponent />)
     
@@ -258,6 +256,8 @@ describe('GithubComponent', () => {
 })
 ```
 
+Prefer mocking `@/service/*` modules or spying on `global.fetch` / `ky` clients with deterministic responses. Do not introduce an HTTP interception dependency such as `nock` or MSW unless it is already declared in the workspace or adding it is part of the task.
+
 ### 6. Context Providers
 
 ```typescript
@@ -332,7 +332,7 @@ const renderWithQueryClient = (ui: React.ReactElement) => {
 1. **Don't mock Zustand store modules** - Use real stores with `setState()`
 1. Don't mock components you can import directly
 1. Don't create overly simplified mocks that miss conditional logic
-1. Don't forget to clean up nock after each test
+1. Don't leave HTTP mocks or service mock state leaking between tests
 1. Don't use `any` types in mocks without necessity
 
 ### Mock Decision Tree
diff --git a/.agents/skills/frontend-testing/references/workflow.md b/.agents/skills/frontend-testing/references/workflow.md
index bc4ed8285a..27755d42a7 100644
--- a/.agents/skills/frontend-testing/references/workflow.md
+++ b/.agents/skills/frontend-testing/references/workflow.md
@@ -227,12 +227,12 @@ Failing tests compound:
 
 **Fix failures immediately before proceeding.**
 
-## Integration with Claude's Todo Feature
+## Integration with Codex's Todo Feature
 
-When using Claude for multi-file testing:
+When using Codex for multi-file testing:
 
-1. **Ask Claude to create a todo list** before starting
-1. **Request one file at a time** or ensure Claude processes incrementally
+1. **Create a todo list** before starting
+1. **Process one file at a time**
 1. **Verify each test passes** before asking for the next
 1. **Mark todos complete** as you progress
 
diff --git a/.agents/skills/how-to-write-component/SKILL.md b/.agents/skills/how-to-write-component/SKILL.md
new file mode 100644
index 0000000000..ac77112993
--- /dev/null
+++ b/.agents/skills/how-to-write-component/SKILL.md
@@ -0,0 +1,71 @@
+---
+name: how-to-write-component
+description: React/TypeScript component style guide. Use when writing, refactoring, or reviewing React components, especially around props typing, state boundaries, shared local state with Jotai atoms, API types, query/mutation contracts, navigation, memoization, wrappers, and empty-state handling.
+---
+
+# How To Write A Component
+
+Use this as the decision guide for React/TypeScript component structure. Existing code is reference material, not automatic precedent; when it conflicts with these rules, adapt the approach instead of reproducing the violation.
+
+## Core Defaults
+
+- Search before adding UI, hooks, helpers, or styling patterns. Reuse existing base components, feature components, hooks, utilities, and design styles when they fit.
+- Group code by feature workflow, route, or ownership area: components, hooks, local types, query helpers, atoms, constants, and small utilities should live near the code that changes with them.
+- Promote code to shared only when multiple verticals need the same stable primitive. Otherwise keep it local and compose shared primitives inside the owning feature.
+- Use Tailwind CSS v4.1+ rules via the `tailwind-css-rules` skill. Prefer v4 utilities, `gap`, `text-size/line-height`, `min-h-dvh`, and avoid deprecated utilities and `@apply`.
+
+## Ownership
+
+- Put local state, queries, mutations, handlers, and derived UI data in the lowest component that uses them. Extract a purpose-built owner component only when the logic has no natural home.
+- Repeated TanStack query calls in sibling components are acceptable when each component independently consumes the data. Do not hoist a query only because it is duplicated; TanStack Query handles deduplication and cache sharing.
+- Hoist state, queries, or callbacks to a parent only when the parent consumes the data, coordinates shared loading/error/empty UI, needs one consistent snapshot, or owns a workflow spanning children.
+- Avoid prop drilling. One pass-through layer is acceptable; repeated forwarding means ownership should move down or into feature-scoped Jotai UI state. Keep server/cache state in query and API data flow.
+- Keep callbacks in a parent only for workflow coordination such as form submission, shared selection, batch behavior, or navigation. Otherwise let the child or row own its action.
+- Prefer uncontrolled DOM state and CSS variables before adding controlled props.
+
+## Components, Props, And Types
+
+- Type component signatures directly; do not use `FC` or `React.FC`.
+- Prefer `function` for top-level components and module helpers. Use arrow functions for local callbacks, handlers, and lambda-style APIs.
+- Prefer named exports. Use default exports only where the framework requires them, such as Next.js route files.
+- Type simple one-off props inline. Use a named `Props` type only when reused, exported, complex, or clearer.
+- Use API-generated or API-returned types at component boundaries. Keep small UI conversion helpers beside the component that needs them.
+- Name values by their domain role and backend API contract, and keep that name stable across the call chain, especially IDs like `appInstanceId`. Normalize framework or route params at the boundary.
+- Keep fallback and invariant checks at the lowest component that already handles that state; callers should pass raw values through instead of duplicating checks.
+
+## Queries And Mutations
+
+- Keep `web/contract/*` as the single source of truth for API shape; follow existing domain/router patterns and the `{ params, query?, body? }` input shape.
+- Consume queries directly with `useQuery(consoleQuery.xxx.queryOptions(...))` or `useQuery(marketplaceQuery.xxx.queryOptions(...))`.
+- Avoid pass-through hooks and thin `web/service/use-*` wrappers that only rename `queryOptions()` or `mutationOptions()`. Extract a small `queryOptions` helper only when repeated call-site options justify it.
+- Keep feature hooks for real orchestration, workflow state, or shared domain behavior.
+- For missing required query input, use `input: skipToken`; use `enabled` only for extra business gating after the input is valid.
+- Consume mutations directly with `useMutation(consoleQuery.xxx.mutationOptions(...))` or `useMutation(marketplaceQuery.xxx.mutationOptions(...))`; use oRPC clients as `mutationFn` only for custom flows.
+- Put shared cache behavior in `createTanstackQueryUtils(...experimental_defaults...)`; components may add UI feedback callbacks, but should not own shared invalidation rules.
+- Do not use deprecated `useInvalid` or `useReset`.
+- Prefer `mutate(...)`; use `mutateAsync(...)` only when Promise semantics are required, and wrap awaited calls in `try/catch`.
+
+## Component Boundaries
+
+- Use the first level below a page or tab to organize independent page sections when it adds real structure. This layer is layout/semantic first, not automatically the data owner.
+- Split deeper components by the data and state each layer actually needs. Each component should access only necessary data, and ownership should stay at the lowest consumer.
+- Keep cohesive forms, menu bodies, and one-off helpers local unless they need their own state, reuse, or semantic boundary.
+- Separate hidden secondary surfaces from the trigger's main flow. For dialogs, dropdowns, popovers, and similar branches, extract a small local component that owns the trigger, open state, and hidden content when it would obscure the parent flow.
+- Preserve composability by separating behavior ownership from layout ownership. A dropdown action may own its trigger, open state, and menu content; the caller owns placement such as slots, offsets, and alignment.
+- Avoid unnecessary DOM hierarchy. Do not add wrapper elements unless they provide layout, semantics, accessibility, state ownership, or integration with a library API; prefer fragments or styling an existing element when possible.
+- Avoid shallow wrappers and prop renaming unless the wrapper adds validation, orchestration, error handling, state ownership, or a real semantic boundary.
+
+## You Might Not Need An Effect
+
+- Use Effects only to synchronize with external systems such as browser APIs, non-React widgets, subscriptions, timers, analytics that must run because the component was shown, or imperative DOM integration.
+- Do not use Effects to transform props or state for rendering. Calculate derived values during render, and use `useMemo` only when the calculation is actually expensive.
+- Do not use Effects to handle user actions. Put action-specific logic in the event handler where the cause is known.
+- Do not use Effects to copy one state value into another state value representing the same concept. Pick one source of truth and derive the rest during render.
+- Do not reset or adjust state from props with an Effect. Prefer a `key` reset, storing a stable ID and deriving the selected object, or guarded same-component render-time adjustment when truly necessary.
+- Prefer framework data APIs or TanStack Query for data fetching instead of writing request Effects in components.
+- If an Effect still seems necessary, first name the external system it synchronizes with. If there is no external system, remove the Effect and restructure the state or event flow.
+
+## Navigation And Performance
+
+- Prefer `Link` for normal navigation. Use router APIs only for command-flow side effects such as mutation success, guarded redirects, or form submission.
+- Avoid `memo`, `useMemo`, and `useCallback` unless there is a clear performance reason.
diff --git a/.agents/skills/tailwind-css-rules/SKILL.md b/.agents/skills/tailwind-css-rules/SKILL.md
new file mode 100644
index 0000000000..3528548036
--- /dev/null
+++ b/.agents/skills/tailwind-css-rules/SKILL.md
@@ -0,0 +1,367 @@
+---
+name: tailwind-css-rules
+description: Tailwind CSS v4.1+ rules and best practices. Use when writing, reviewing, refactoring, or upgrading Tailwind CSS classes and styles, especially v4 utility migrations, layout spacing, typography, responsive variants, dark mode, gradients, CSS variables, and component styling.
+---
+
+# Tailwind CSS Rules and Best Practices
+
+## Core Principles
+
+- **Always use Tailwind CSS v4.1+** - Ensure the codebase is using the latest version
+- **Do not use deprecated or removed utilities** - ALWAYS use the replacement
+- **Never use `@apply`** - Use CSS variables, the `--spacing()` function, or framework components instead
+- **Check for redundant classes** - Remove any classes that aren't necessary
+- **Group elements logically** to simplify responsive tweaks later
+
+## Upgrading to Tailwind CSS v4
+
+### Before Upgrading
+
+- **Always read the upgrade documentation first** - Read https://tailwindcss.com/docs/upgrade-guide and https://tailwindcss.com/blog/tailwindcss-v4 before starting an upgrade.
+- Ensure the git repository is in a clean state before starting
+
+### Upgrade Process
+
+1. Run the upgrade command: `npx @tailwindcss/upgrade@latest` for both major and minor updates
+2. The tool will convert JavaScript config files to the new CSS format
+3. Review all changes extensively to clean up any false positives
+4. Test thoroughly across your application
+
+## Breaking Changes Reference
+
+### Removed Utilities (NEVER use these in v4)
+
+| ❌ Deprecated           | ✅ Replacement                                    |
+| ----------------------- | ------------------------------------------------- |
+| `bg-opacity-*`          | Use opacity modifiers like `bg-black/50`          |
+| `text-opacity-*`        | Use opacity modifiers like `text-black/50`        |
+| `border-opacity-*`      | Use opacity modifiers like `border-black/50`      |
+| `divide-opacity-*`      | Use opacity modifiers like `divide-black/50`      |
+| `ring-opacity-*`        | Use opacity modifiers like `ring-black/50`        |
+| `placeholder-opacity-*` | Use opacity modifiers like `placeholder-black/50` |
+| `flex-shrink-*`         | `shrink-*`                                        |
+| `flex-grow-*`           | `grow-*`                                          |
+| `overflow-ellipsis`     | `text-ellipsis`                                   |
+| `decoration-slice`      | `box-decoration-slice`                            |
+| `decoration-clone`      | `box-decoration-clone`                            |
+
+### Renamed Utilities
+
+Use the v4 name when migrating code that still carries Tailwind v3 semantics. Do not blanket-replace existing v4 classes: classes such as `rounded-sm`, `shadow-sm`, `ring-1`, and `ring-2` are valid in this codebase when they intentionally represent the current design scale.
+
+| ❌ v3 pattern       | ✅ v4 pattern                                      |
+| ------------------- | -------------------------------------------------- |
+| `bg-gradient-*`     | `bg-linear-*`                                      |
+| old shadow scale    | verify against the current Tailwind/design scale   |
+| old blur scale      | verify against the current Tailwind/design scale   |
+| old radius scale    | use the Dify radius token mapping when applicable  |
+| `outline-none`      | `outline-hidden`                                   |
+| bare `ring` utility | use an explicit ring width such as `ring-1`/`ring-2`/`ring-3` |
+
+For Figma radius tokens, follow `packages/dify-ui/AGENTS.md`. For example, `--radius/xs` maps to `rounded-sm`; do not rewrite it to `rounded-xs`.
+
+## Layout and Spacing Rules
+
+### Flexbox and Grid Spacing
+
+#### Always use gap utilities for internal spacing
+
+Gap provides consistent spacing without edge cases (no extra space on last items). It's cleaner and more maintainable than margins on children.
+
+```html
+<!-- ❌ Don't do this -->
+<div class="flex">
+  <div class="mr-4">Item 1</div>
+  <div class="mr-4">Item 2</div>
+  <div>Item 3</div>
+  <!-- No margin on last -->
+</div>
+
+<!-- ✅ Do this instead -->
+<div class="flex gap-4">
+  <div>Item 1</div>
+  <div>Item 2</div>
+  <div>Item 3</div>
+</div>
+```
+
+#### Gap vs Space utilities
+
+- **Never use `space-x-*` or `space-y-*` in flex/grid layouts** - always use gap
+- Space utilities add margins to children and have issues with wrapped items
+- Gap works correctly with flex-wrap and all flex directions
+
+```html
+<!-- ❌ Avoid space utilities in flex containers -->
+<div class="flex flex-wrap space-x-4">
+  <!-- Space utilities break with wrapped items -->
+</div>
+
+<!-- ✅ Use gap for consistent spacing -->
+<div class="flex flex-wrap gap-4">
+  <!-- Gap works perfectly with wrapping -->
+</div>
+```
+
+### General Spacing Guidelines
+
+- **Prefer top and left margins** over bottom and right margins (unless conditionally rendered)
+- **Use padding on parent containers** instead of bottom margins on the last child
+- **Always use `min-h-dvh` instead of `min-h-screen`** - `min-h-screen` is buggy on mobile Safari
+- **Prefer `size-*` utilities** over separate `w-*` and `h-*` when setting equal dimensions
+- For max-widths, prefer the container scale (e.g., `max-w-2xs` over `max-w-72`)
+
+## Typography Rules
+
+### Line Heights
+
+- **Never use `leading-*` classes** - Always use line height modifiers with text size
+- **Always use fixed line heights from the spacing scale** - Don't use named values
+
+```html
+<!-- ❌ Don't do this -->
+<p class="text-base leading-7">Text with separate line height</p>
+<p class="text-lg leading-relaxed">Text with named line height</p>
+
+<!-- ✅ Do this instead -->
+<p class="text-base/7">Text with line height modifier</p>
+<p class="text-lg/8">Text with specific line height</p>
+```
+
+### Font Size Reference
+
+Be precise with font sizes - know the actual pixel values:
+
+- `text-xs` = 12px
+- `text-sm` = 14px
+- `text-base` = 16px
+- `text-lg` = 18px
+- `text-xl` = 20px
+
+## Color and Opacity
+
+### Opacity Modifiers
+
+**Never use `bg-opacity-*`, `text-opacity-*`, etc.** - use the opacity modifier syntax:
+
+```html
+<!-- ❌ Don't do this -->
+<div class="bg-red-500 bg-opacity-60">Old opacity syntax</div>
+
+<!-- ✅ Do this instead -->
+<div class="bg-red-500/60">Modern opacity syntax</div>
+```
+
+## Responsive Design
+
+### Breakpoint Optimization
+
+- **Check for redundant classes across breakpoints**
+- **Only add breakpoint variants when values change**
+
+```html
+<!-- ❌ Redundant breakpoint classes -->
+<div class="px-4 md:px-4 lg:px-4">
+  <!-- md:px-4 and lg:px-4 are redundant -->
+</div>
+
+<!-- ✅ Efficient breakpoint usage -->
+<div class="px-4 lg:px-8">
+  <!-- Only specify when value changes -->
+</div>
+```
+
+## Dark Mode
+
+### Dark Mode Best Practices
+
+- Use the plain `dark:` variant pattern
+- Put light mode styles first, then dark mode styles
+- Ensure `dark:` variant comes before other variants
+
+```html
+<!-- ✅ Correct dark mode pattern -->
+<div class="bg-white text-black dark:bg-black dark:text-white">
+  <button class="hover:bg-gray-100 dark:hover:bg-gray-800">Click me</button>
+</div>
+```
+
+## Gradient Utilities
+
+- **ALWAYS Use `bg-linear-*` instead of `bg-gradient-*` utilities** - The gradient utilities were renamed in v4
+- Use the new `bg-radial` or `bg-radial-[<position>]` to create radial gradients
+- Use the new `bg-conic` or `bg-conic-*` to create conic gradients
+
+```html
+<!-- ✅ Use the new gradient utilities -->
+<div class="h-14 bg-linear-to-br from-violet-500 to-fuchsia-500"></div>
+<div
+  class="size-18 bg-radial-[at_50%_75%] from-sky-200 via-blue-400 to-indigo-900 to-90%"
+></div>
+<div
+  class="size-24 bg-conic-180 from-indigo-600 via-indigo-50 to-indigo-600"
+></div>
+
+<!-- ❌ Do not use bg-gradient-* utilities -->
+<div class="h-14 bg-gradient-to-br from-violet-500 to-fuchsia-500"></div>
+```
+
+## Working with CSS Variables
+
+### Accessing Theme Values
+
+Tailwind CSS v4 exposes all theme values as CSS variables:
+
+```css
+/* Access colors, and other theme values */
+.custom-element {
+  background: var(--color-red-500);
+  border-radius: var(--radius-lg);
+}
+```
+
+### The `--spacing()` Function
+
+Use the dedicated `--spacing()` function for spacing calculations:
+
+```css
+.custom-class {
+  margin-top: calc(100vh - --spacing(16));
+}
+```
+
+### Extending theme values
+
+Use CSS to extend theme values:
+
+```css
+@import "tailwindcss";
+
+@theme {
+  --color-mint-500: oklch(0.72 0.11 178);
+}
+```
+
+```html
+<div class="bg-mint-500">
+  <!-- ... -->
+</div>
+```
+
+## New v4 Features
+
+### Container Queries
+
+Use the `@container` class and size variants:
+
+```html
+<article class="@container">
+  <div class="flex flex-col @md:flex-row @lg:gap-8">
+    <img class="w-full @md:w-48" />
+    <div class="mt-4 @md:mt-0">
+      <!-- Content adapts to container size -->
+    </div>
+  </div>
+</article>
+```
+
+### Container Query Units
+
+Use container-based units like `cqw` for responsive sizing:
+
+```html
+<div class="@container">
+  <h1 class="text-[50cqw]">Responsive to container width</h1>
+</div>
+```
+
+### Text Shadows (v4.1)
+
+Use text-shadow-\* utilities from text-shadow-2xs to text-shadow-lg:
+
+```html
+<!-- ✅ Text shadow examples -->
+<h1 class="text-shadow-lg">Large shadow</h1>
+<p class="text-shadow-sm/50">Small shadow with opacity</p>
+```
+
+### Masking (v4.1)
+
+Use the new composable mask utilities for image and gradient masks:
+
+```html
+<!-- ✅ Linear gradient masks on specific sides -->
+<div class="mask-t-from-50%">Top fade</div>
+<div class="mask-b-from-20% mask-b-to-80%">Bottom gradient</div>
+<div class="mask-linear-from-white mask-linear-to-black/60">
+  Fade from white to black
+</div>
+
+<!-- ✅ Radial gradient masks -->
+<div class="mask-radial-[100%_100%] mask-radial-from-75% mask-radial-at-left">
+  Radial mask
+</div>
+```
+
+## Component Patterns
+
+### Avoiding Utility Inheritance
+
+Don't add utilities to parents that you override in children:
+
+```html
+<!-- ❌ Avoid this pattern -->
+<div class="text-center">
+  <h1>Centered Heading</h1>
+  <div class="text-left">Left-aligned content</div>
+</div>
+
+<!-- ✅ Better approach -->
+<div>
+  <h1 class="text-center">Centered Heading</h1>
+  <div>Left-aligned content</div>
+</div>
+```
+
+### Component Extraction
+
+- Extract repeated patterns into framework components, not CSS classes
+- Keep utility classes in templates/JSX
+- Use data attributes for complex state-based styling
+
+## CSS Best Practices
+
+### Nesting Guidelines
+
+- Use nesting when styling both parent and children
+- Avoid empty parent selectors
+
+```css
+/* ✅ Good nesting - parent has styles */
+.card {
+  padding: --spacing(4);
+
+  > .card-title {
+    font-weight: bold;
+  }
+}
+
+/* ❌ Avoid empty parents */
+ul {
+  > li {
+    /* Parent has no styles */
+  }
+}
+```
+
+## Common Pitfalls to Avoid
+
+1. **Using old opacity utilities** - Always use `/opacity` syntax like `bg-red-500/60`
+2. **Redundant breakpoint classes** - Only specify changes
+3. **Space utilities in flex/grid** - Always use gap
+4. **Leading utilities** - Use line-height modifiers like `text-sm/6`
+5. **Arbitrary values** - Use the design scale
+6. **@apply directive** - Use components or CSS variables
+7. **min-h-screen on mobile** - Use min-h-dvh
+8. **Separate width/height** - Use size utilities when equal
+9. **Arbitrary values** - Always use Tailwind's predefined scale whenever possible (e.g., use `ml-4` over `ml-[16px]`)
diff --git a/.codex b/.codex
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/.github/actions/setup-web/action.yml b/.github/actions/setup-web/action.yml
index 085b39ebfb..2979c3ddb8 100644
--- a/.github/actions/setup-web/action.yml
+++ b/.github/actions/setup-web/action.yml
@@ -1,8 +1,13 @@
 name: Setup Web Environment
+description: Set up Node.js, Vite+, pnpm, and web dependencies
 
 runs:
   using: composite
   steps:
+    - name: Setup pnpm
+      uses: pnpm/action-setup@8912a9102ac27614460f54aedde9e1e7f9aec20d # v6.0.5
+      with:
+        run_install: false
     - name: Setup Vite+
       uses: voidzero-dev/setup-vp@4f5aa3e38c781f1b01e78fb9255527cee8a6efa6 # v1.8.0
       with:
diff --git a/.github/scripts/check-hotfix-cherry-picks.sh b/.github/scripts/check-hotfix-cherry-picks.sh
new file mode 100644
index 0000000000..11dc024ccf
--- /dev/null
+++ b/.github/scripts/check-hotfix-cherry-picks.sh
@@ -0,0 +1,73 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+BASE_SHA=${BASE_SHA:-}
+HEAD_SHA=${HEAD_SHA:-}
+MAIN_REF=${MAIN_REF:-origin/main}
+REMEDIATION_HINT="Changes should be made from the main branch using git cherry-pick -x."
+
+error() {
+  printf 'ERROR: %s\n' "$1" >&2
+}
+
+if [[ -z "$BASE_SHA" || -z "$HEAD_SHA" ]]; then
+  error "BASE_SHA and HEAD_SHA are required. $REMEDIATION_HINT"
+  exit 2
+fi
+
+if ! git rev-parse --verify "$BASE_SHA^{commit}" > /dev/null 2>&1; then
+  error "Base commit '$BASE_SHA' is not available in the local git checkout."
+  exit 2
+fi
+
+if ! git rev-parse --verify "$HEAD_SHA^{commit}" > /dev/null 2>&1; then
+  error "Head commit '$HEAD_SHA' is not available in the local git checkout."
+  exit 2
+fi
+
+if ! git rev-parse --verify "$MAIN_REF^{commit}" > /dev/null 2>&1; then
+  error "Main ref '$MAIN_REF' is not available in the local git checkout. $REMEDIATION_HINT"
+  exit 2
+fi
+
+failed=0
+checked=0
+
+while IFS= read -r commit_sha; do
+  [[ -n "$commit_sha" ]] || continue
+
+  checked=$((checked + 1))
+  subject=$(git log -1 --format=%s "$commit_sha")
+  source_sha=$(
+    git log -1 --format=%B "$commit_sha" \
+      | sed -nE 's/^\(cherry picked from commit ([0-9a-fA-F]{7,64})\)$/\1/p' \
+      | tail -n 1
+  )
+
+  if [[ -z "$source_sha" ]]; then
+    error "Commit $commit_sha ($subject) is missing cherry-pick provenance. $REMEDIATION_HINT"
+    failed=1
+    continue
+  fi
+
+  if ! git cat-file -e "$source_sha^{commit}" 2> /dev/null; then
+    error "Commit $commit_sha ($subject) references source $source_sha, but that commit is not available locally. $REMEDIATION_HINT"
+    failed=1
+    continue
+  fi
+
+  if ! git merge-base --is-ancestor "$source_sha" "$MAIN_REF"; then
+    error "Commit $commit_sha ($subject) references source $source_sha, but that source is not reachable from main ($MAIN_REF). $REMEDIATION_HINT"
+    failed=1
+  fi
+done < <(git rev-list --reverse "$BASE_SHA..$HEAD_SHA")
+
+if [[ "$failed" -ne 0 ]]; then
+  exit 1
+fi
+
+if [[ "$checked" -eq 0 ]]; then
+  echo "No PR commits to check."
+else
+  echo "Verified $checked PR commit(s) include cherry-pick provenance from main."
+fi
diff --git a/.github/workflows/api-tests.yml b/.github/workflows/api-tests.yml
index bd47abc710..a08e7aacae 100644
--- a/.github/workflows/api-tests.yml
+++ b/.github/workflows/api-tests.yml
@@ -99,7 +99,7 @@ jobs:
       - name: Set up dotenvs
         run: |
           cp docker/.env.example docker/.env
-          cp docker/middleware.env.example docker/middleware.env
+          cp docker/envs/middleware.env.example docker/middleware.env
 
       - name: Expose Service Ports
         run: sh .github/workflows/expose_service_ports.sh
diff --git a/.github/workflows/autofix.yml b/.github/workflows/autofix.yml
index 76fbd18f47..b0cd652c43 100644
--- a/.github/workflows/autofix.yml
+++ b/.github/workflows/autofix.yml
@@ -116,6 +116,16 @@ jobs:
         if: github.event_name != 'merge_group'
         uses: ./.github/actions/setup-web
 
+      - name: Generate API docs
+        if: github.event_name != 'merge_group' && steps.api-changes.outputs.any_changed == 'true'
+        run: |
+          cd api
+          uv run dev/generate_swagger_markdown_docs.py --swagger-dir ../packages/contracts/openapi --markdown-dir openapi/markdown --keep-swagger-json
+
+      - name: Generate frontend contracts
+        if: github.event_name != 'merge_group' && steps.api-changes.outputs.any_changed == 'true'
+        run: pnpm --dir packages/contracts gen-api-contract-from-openapi
+
       - name: ESLint autofix
         if: github.event_name != 'merge_group' && steps.web-changes.outputs.any_changed == 'true'
         run: |
diff --git a/.github/workflows/db-migration-test.yml b/.github/workflows/db-migration-test.yml
index 65f0149a74..9d3ccb34b2 100644
--- a/.github/workflows/db-migration-test.yml
+++ b/.github/workflows/db-migration-test.yml
@@ -37,7 +37,7 @@ jobs:
       - name: Prepare middleware env
         run: |
           cd docker
-          cp middleware.env.example middleware.env
+          cp envs/middleware.env.example middleware.env
 
       - name: Set up Middlewares
         uses: hoverkraft-tech/compose-action@d2bee4f07e8ca410d6b196d00f90c12e7d48c33a # v2.6.0
@@ -87,7 +87,7 @@ jobs:
       - name: Prepare middleware env for MySQL
         run: |
           cd docker
-          cp middleware.env.example middleware.env
+          cp envs/middleware.env.example middleware.env
           sed -i 's/DB_TYPE=postgresql/DB_TYPE=mysql/' middleware.env
           sed -i 's/DB_HOST=db_postgres/DB_HOST=db_mysql/' middleware.env
           sed -i 's/DB_PORT=5432/DB_PORT=3306/' middleware.env
diff --git a/.github/workflows/hotfix-cherry-pick.yml b/.github/workflows/hotfix-cherry-pick.yml
new file mode 100644
index 0000000000..594b10c743
--- /dev/null
+++ b/.github/workflows/hotfix-cherry-pick.yml
@@ -0,0 +1,49 @@
+name: Hotfix Cherry-Pick Provenance
+
+on:
+  pull_request:
+    branches:
+      - 'hotfix/**'
+      - 'lts/**'
+    types:
+      - opened
+      - edited
+      - reopened
+      - ready_for_review
+      - synchronize
+
+permissions:
+  contents: read
+
+concurrency:
+  group: hotfix-cherry-pick-${{ github.event.pull_request.number || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+  check-cherry-pick-provenance:
+    name: Require cherry-pick provenance
+    runs-on: depot-ubuntu-24.04
+    steps:
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 0
+
+      - name: Fetch PR base, PR head, and main
+        env:
+          BASE_REF: ${{ github.base_ref }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+        run: |
+          git fetch --no-tags --prune origin \
+            "+refs/heads/main:refs/remotes/origin/main" \
+            "+refs/heads/${BASE_REF}:refs/remotes/origin/${BASE_REF}" \
+            "+refs/pull/${PR_NUMBER}/head:refs/remotes/pull/${PR_NUMBER}/head"
+
+      - name: Load checker from main
+        run: git show origin/main:.github/scripts/check-hotfix-cherry-picks.sh > "$RUNNER_TEMP/check-hotfix-cherry-picks.sh"
+
+      - name: Check PR commits
+        env:
+          BASE_SHA: ${{ github.event.pull_request.base.sha }}
+          HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+          MAIN_REF: origin/main
+        run: bash "$RUNNER_TEMP/check-hotfix-cherry-picks.sh"
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index f59cc6be48..aefcf1b5ac 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -9,6 +9,6 @@ jobs:
       pull-requests: write
     runs-on: depot-ubuntu-24.04
     steps:
-      - uses: actions/labeler@634933edcd8ababfe52f92936142cc22ac488b1b # v6.0.1
+      - uses: actions/labeler@f27b608878404679385c85cfa523b85ccb86e213 # v6.1.0
         with:
           sync-labels: true
diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml
index 8071d6204d..f624e8f872 100644
--- a/.github/workflows/main-ci.yml
+++ b/.github/workflows/main-ci.yml
@@ -57,7 +57,7 @@ jobs:
               - '.github/workflows/api-tests.yml'
               - '.github/workflows/expose_service_ports.sh'
               - 'docker/.env.example'
-              - 'docker/middleware.env.example'
+              - 'docker/envs/middleware.env.example'
               - 'docker/docker-compose.middleware.yaml'
               - 'docker/docker-compose-template.yaml'
               - 'docker/generate_docker_compose'
@@ -84,7 +84,7 @@ jobs:
               - 'pnpm-workspace.yaml'
               - '.nvmrc'
               - 'docker/docker-compose.middleware.yaml'
-              - 'docker/middleware.env.example'
+              - 'docker/envs/middleware.env.example'
               - '.github/workflows/web-e2e.yml'
               - '.github/actions/setup-web/**'
             vdb:
@@ -94,7 +94,7 @@ jobs:
               - '.github/workflows/vdb-tests.yml'
               - '.github/workflows/expose_service_ports.sh'
               - 'docker/.env.example'
-              - 'docker/middleware.env.example'
+              - 'docker/envs/middleware.env.example'
               - 'docker/docker-compose.yaml'
               - 'docker/docker-compose-template.yaml'
               - 'docker/generate_docker_compose'
@@ -116,7 +116,7 @@ jobs:
               - '.github/workflows/db-migration-test.yml'
               - '.github/workflows/expose_service_ports.sh'
               - 'docker/.env.example'
-              - 'docker/middleware.env.example'
+              - 'docker/envs/middleware.env.example'
               - 'docker/docker-compose.middleware.yaml'
               - 'docker/docker-compose-template.yaml'
               - 'docker/generate_docker_compose'
diff --git a/.github/workflows/pyrefly-diff-comment.yml b/.github/workflows/pyrefly-diff-comment.yml
index 7f82942e7e..8e16baf933 100644
--- a/.github/workflows/pyrefly-diff-comment.yml
+++ b/.github/workflows/pyrefly-diff-comment.yml
@@ -77,10 +77,28 @@ jobs:
             }
 
             if (diff.trim()) {
-              await github.rest.issues.createComment({
+              const body = '### Pyrefly Diff\n<details>\n<summary>base → PR</summary>\n\n```diff\n' + diff + '\n```\n</details>';
+              const marker = '### Pyrefly Diff';
+              const { data: comments } = await github.rest.issues.listComments({
                 issue_number: prNumber,
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                body: '### Pyrefly Diff\n<details>\n<summary>base → PR</summary>\n\n```diff\n' + diff + '\n```\n</details>',
               });
+              const existing = comments.find((comment) => comment.body.startsWith(marker));
+
+              if (existing) {
+                await github.rest.issues.updateComment({
+                  comment_id: existing.id,
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  body,
+                });
+              } else {
+                await github.rest.issues.createComment({
+                  issue_number: prNumber,
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  body,
+                });
+              }
             }
diff --git a/.github/workflows/pyrefly-diff.yml b/.github/workflows/pyrefly-diff.yml
index 0cf54e3585..386bd25751 100644
--- a/.github/workflows/pyrefly-diff.yml
+++ b/.github/workflows/pyrefly-diff.yml
@@ -103,9 +103,26 @@ jobs:
                 ].join('\n')
               : '### Pyrefly Diff\nNo changes detected.';
 
-            await github.rest.issues.createComment({
+            const marker = '### Pyrefly Diff';
+            const { data: comments } = await github.rest.issues.listComments({
               issue_number: prNumber,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              body,
             });
+            const existing = comments.find((comment) => comment.body.startsWith(marker));
+
+            if (existing) {
+              await github.rest.issues.updateComment({
+                comment_id: existing.id,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                body,
+              });
+            } else {
+              await github.rest.issues.createComment({
+                issue_number: prNumber,
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                body,
+              });
+            }
diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
index d2b892d9aa..4ce121ba60 100644
--- a/.github/workflows/style.yml
+++ b/.github/workflows/style.yml
@@ -109,6 +109,8 @@ jobs:
       - name: Web tsslint
         if: steps.changed-files.outputs.any_changed == 'true'
         working-directory: ./web
+        env:
+          NODE_OPTIONS: --max-old-space-size=4096
         run: vp run lint:tss
 
       - name: Web type check
diff --git a/.github/workflows/translate-i18n-claude.yml b/.github/workflows/translate-i18n-claude.yml
index 7bb6fc1bbd..4e738df684 100644
--- a/.github/workflows/translate-i18n-claude.yml
+++ b/.github/workflows/translate-i18n-claude.yml
@@ -158,7 +158,7 @@ jobs:
 
       - name: Run Claude Code for Translation Sync
         if: steps.context.outputs.CHANGED_FILES != ''
-        uses: anthropics/claude-code-action@fefa07e9c665b7320f08c3b525980457f22f58aa # v1.0.111
+        uses: anthropics/claude-code-action@476e359e6203e73dad705c8b322e333fabbd7416 # v1.0.119
         with:
           anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/vdb-tests-full.yml b/.github/workflows/vdb-tests-full.yml
index 5c241af5c5..1405eb4eeb 100644
--- a/.github/workflows/vdb-tests-full.yml
+++ b/.github/workflows/vdb-tests-full.yml
@@ -51,7 +51,7 @@ jobs:
       - name: Set up dotenvs
         run: |
           cp docker/.env.example docker/.env
-          cp docker/middleware.env.example docker/middleware.env
+          cp docker/envs/middleware.env.example docker/middleware.env
 
       - name: Expose Service Ports
         run: sh .github/workflows/expose_service_ports.sh
diff --git a/.github/workflows/vdb-tests.yml b/.github/workflows/vdb-tests.yml
index 38ec96f00f..cdcdcb27d7 100644
--- a/.github/workflows/vdb-tests.yml
+++ b/.github/workflows/vdb-tests.yml
@@ -48,7 +48,7 @@ jobs:
       - name: Set up dotenvs
         run: |
           cp docker/.env.example docker/.env
-          cp docker/middleware.env.example docker/middleware.env
+          cp docker/envs/middleware.env.example docker/middleware.env
 
       - name: Expose Service Ports
         run: sh .github/workflows/expose_service_ports.sh
diff --git a/.gitignore b/.gitignore
index dc3b3f284f..881f841da1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -250,5 +250,5 @@ scripts/stress-test/reports/
 
 # Code Agent Folder
 .qoder/*
-
+.context/*
 .eslintcache
diff --git a/AGENTS.md b/AGENTS.md
index 8be2daef95..c6ebf7ae8a 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -9,6 +9,7 @@ The codebase is split into:
 - **Backend API** (`/api`): Python Flask application organized with Domain-Driven Design
 - **Frontend Web** (`/web`): Next.js application using TypeScript and React
 - **Docker deployment** (`/docker`): Containerized deployment configurations
+- **Dify Agent Backend** (`/dify-agent`): Backend services for managing and executing agent
 
 ## Backend Workflow
 
diff --git a/Makefile b/Makefile
index d8c9df5208..d65209c2ff 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,10 @@ DOCKER_REGISTRY=langgenius
 WEB_IMAGE=$(DOCKER_REGISTRY)/dify-web
 API_IMAGE=$(DOCKER_REGISTRY)/dify-api
 VERSION=latest
+DOCKER_DIR=docker
+DOCKER_MIDDLEWARE_ENV=$(DOCKER_DIR)/middleware.env
+DOCKER_MIDDLEWARE_ENV_EXAMPLE=$(DOCKER_DIR)/envs/middleware.env.example
+DOCKER_MIDDLEWARE_PROJECT=dify-middlewares-dev
 
 # Default target - show help
 .DEFAULT_GOAL := help
@@ -17,8 +21,13 @@ dev-setup: prepare-docker prepare-web prepare-api
 # Step 1: Prepare Docker middleware
 prepare-docker:
 	@echo "🐳 Setting up Docker middleware..."
-	@cp -n docker/middleware.env.example docker/middleware.env 2>/dev/null || echo "Docker middleware.env already exists"
-	@cd docker && docker compose -f docker-compose.middleware.yaml --env-file middleware.env -p dify-middlewares-dev up -d
+	@if [ ! -f "$(DOCKER_MIDDLEWARE_ENV)" ]; then \
+		cp "$(DOCKER_MIDDLEWARE_ENV_EXAMPLE)" "$(DOCKER_MIDDLEWARE_ENV)"; \
+		echo "Docker middleware.env created"; \
+	else \
+		echo "Docker middleware.env already exists"; \
+	fi
+	@cd $(DOCKER_DIR) && docker compose -f docker-compose.middleware.yaml --env-file middleware.env -p $(DOCKER_MIDDLEWARE_PROJECT) up -d
 	@echo "✅ Docker middleware started"
 
 # Step 2: Prepare web environment
@@ -39,12 +48,18 @@ prepare-api:
 # Clean dev environment
 dev-clean:
 	@echo "⚠️  Stopping Docker containers..."
-	@cd docker && docker compose -f docker-compose.middleware.yaml --env-file middleware.env -p dify-middlewares-dev down
+	@if [ -f "$(DOCKER_MIDDLEWARE_ENV)" ]; then \
+		cd $(DOCKER_DIR) && docker compose -f docker-compose.middleware.yaml --env-file middleware.env -p $(DOCKER_MIDDLEWARE_PROJECT) down; \
+	else \
+		echo "Docker middleware.env does not exist, skipping compose down"; \
+	fi
 	@echo "🗑️  Removing volumes..."
 	@rm -rf docker/volumes/db
+	@rm -rf docker/volumes/mysql
 	@rm -rf docker/volumes/redis
 	@rm -rf docker/volumes/plugin_daemon
 	@rm -rf docker/volumes/weaviate
+	@rm -rf docker/volumes/sandbox/dependencies
 	@rm -rf api/storage
 	@echo "✅ Cleanup complete"
 
@@ -68,16 +83,15 @@ lint:
 	@echo "✅ Linting complete"
 
 type-check:
-	@echo "📝 Running type checks (basedpyright + pyrefly + mypy)..."
-	@./dev/basedpyright-check $(PATH_TO_CHECK)
-	@./dev/pyrefly-check-local
-	@uv --directory api run mypy --exclude-gitignore --exclude 'tests/' --exclude 'migrations/' --check-untyped-defs --disable-error-code=import-untyped .
+	@echo "📝 Running type checks (pyrefly + mypy)..."
+	@./dev/pyrefly-check-local $(PATH_TO_CHECK)
+	@uv --directory api run mypy --exclude-gitignore --exclude 'tests/' --exclude 'migrations/' --exclude 'dev/generate_swagger_specs.py' --exclude 'dev/generate_fastopenapi_specs.py' --check-untyped-defs --disable-error-code=import-untyped .
 	@echo "✅ Type checks complete"
 
 type-check-core:
-	@echo "📝 Running core type checks (basedpyright + mypy)..."
-	@./dev/basedpyright-check $(PATH_TO_CHECK)
-	@uv --directory api run mypy --exclude-gitignore --exclude 'tests/' --exclude 'migrations/' --check-untyped-defs --disable-error-code=import-untyped .
+	@echo "📝 Running core type checks (pyrefly + mypy)..."
+	@./dev/pyrefly-check-local $(PATH_TO_CHECK)
+	@uv --directory api run mypy --exclude-gitignore --exclude 'tests/' --exclude 'migrations/' --exclude 'dev/generate_swagger_specs.py' --exclude 'dev/generate_fastopenapi_specs.py' --check-untyped-defs --disable-error-code=import-untyped .
 	@echo "✅ Core type checks complete"
 
 test:
@@ -132,14 +146,14 @@ help:
 	@echo "  make prepare-docker - Set up Docker middleware"
 	@echo "  make prepare-web    - Set up web environment"
 	@echo "  make prepare-api    - Set up API environment"
-	@echo "  make dev-clean      - Stop Docker middleware containers"
+	@echo "  make dev-clean      - Stop Docker middleware containers and remove dev data"
 	@echo ""
 	@echo "Backend Code Quality:"
 	@echo "  make format         - Format code with ruff"
 	@echo "  make check          - Check code with ruff"
 	@echo "  make lint           - Format, fix, and lint code (ruff, imports, dotenv)"
-	@echo "  make type-check     - Run type checks (basedpyright, pyrefly, mypy)"
-	@echo "  make type-check-core - Run core type checks (basedpyright, mypy)"
+	@echo "  make type-check     - Run type checks (pyrefly, mypy)"
+	@echo "  make type-check-core - Run core type checks (pyrefly, mypy)"
 	@echo "  make test           - Run backend unit tests (or TARGET_TESTS=./api/tests/<target_tests>)"
 	@echo ""
 	@echo "Docker Build Targets:"
diff --git a/README.md b/README.md
index 778028fc76..b6cbb0e126 100644
--- a/README.md
+++ b/README.md
@@ -137,7 +137,7 @@ Star Dify on GitHub and be instantly notified of new releases.
 
 ### Custom configurations
 
-If you need to customize the configuration, please refer to the comments in our [.env.example](docker/.env.example) file and update the corresponding values in your `.env` file. Additionally, you might need to make adjustments to the `docker-compose.yaml` file itself, such as changing image versions, port mappings, or volume mounts, based on your specific deployment environment and requirements. After making any changes, please re-run `docker compose up -d`. You can find the full list of available environment variables [here](https://docs.dify.ai/getting-started/install-self-hosted/environments).
+If you need to customize the configuration, edit `docker/.env`. The essential startup defaults live in [`docker/.env.example`](docker/.env.example), and optional advanced variables are split under `docker/envs/` by theme. After making any changes, re-run `docker compose up -d` from the `docker` directory. You can find the full list of available environment variables [here](https://docs.dify.ai/getting-started/install-self-hosted/environments).
 
 ### Metrics Monitoring with Grafana
 
diff --git a/api/.env.example b/api/.env.example
index f6f65011ea..34be400e87 100644
--- a/api/.env.example
+++ b/api/.env.example
@@ -34,7 +34,7 @@ TRIGGER_URL=http://localhost:5001
 FILES_ACCESS_TIMEOUT=300
 
 # Collaboration mode toggle
-ENABLE_COLLABORATION_MODE=false
+ENABLE_COLLABORATION_MODE=true
 
 # Access token expiration time in minutes
 ACCESS_TOKEN_EXPIRE_MINUTES=60
@@ -88,6 +88,10 @@ REDIS_HEALTH_CHECK_INTERVAL=30
 CELERY_BROKER_URL=redis://:difyai123456@localhost:${REDIS_PORT}/1
 CELERY_BACKEND=redis
 
+# Ops trace retry configuration
+OPS_TRACE_RETRYABLE_DISPATCH_MAX_RETRIES=60
+OPS_TRACE_RETRYABLE_DISPATCH_DELAY_SECONDS=5
+
 # Database configuration
 DB_TYPE=postgresql
 DB_USERNAME=postgres
@@ -98,6 +102,8 @@ DB_DATABASE=dify
 
 SQLALCHEMY_POOL_PRE_PING=true
 SQLALCHEMY_POOL_TIMEOUT=30
+# Connection pool reset behavior on return
+SQLALCHEMY_POOL_RESET_ON_RETURN=rollback
 
 # Storage configuration
 # use for store upload files, private keys...
@@ -381,7 +387,7 @@ VIKINGDB_ACCESS_KEY=your-ak
 VIKINGDB_SECRET_KEY=your-sk
 VIKINGDB_REGION=cn-shanghai
 VIKINGDB_HOST=api-vikingdb.xxx.volces.com
-VIKINGDB_SCHEMA=http
+VIKINGDB_SCHEME=http
 VIKINGDB_CONNECTION_TIMEOUT=30
 VIKINGDB_SOCKET_TIMEOUT=30
 
@@ -432,8 +438,6 @@ UPLOAD_FILE_EXTENSION_BLACKLIST=
 
 # Model configuration
 MULTIMODAL_SEND_FORMAT=base64
-PROMPT_GENERATION_MAX_TOKENS=512
-CODE_GENERATION_MAX_TOKENS=1024
 PLUGIN_BASED_TOKEN_COUNTING_ENABLED=false
 
 # Mail configuration, support: resend, smtp, sendgrid
@@ -553,7 +557,7 @@ MAX_VARIABLE_SIZE=204800
 
 # GraphEngine Worker Pool Configuration
 # Minimum number of workers per GraphEngine instance (default: 1)
-GRAPH_ENGINE_MIN_WORKERS=1
+GRAPH_ENGINE_MIN_WORKERS=3
 # Maximum number of workers per GraphEngine instance (default: 10)
 GRAPH_ENGINE_MAX_WORKERS=10
 # Queue depth threshold that triggers worker scale up (default: 3)
diff --git a/api/AGENTS.md b/api/AGENTS.md
index 8e5d9f600d..7cd60b0281 100644
--- a/api/AGENTS.md
+++ b/api/AGENTS.md
@@ -193,6 +193,10 @@ Before opening a PR / submitting:
 - Controllers: parse input via Pydantic, invoke services, return serialised responses; no business logic.
 - Services: coordinate repositories, providers, background tasks; keep side effects explicit.
 - Document non-obvious behaviour with concise docstrings and comments.
+- For Flask-RESTX controller request, query, and response schemas, follow `controllers/API_SCHEMA_GUIDE.md`.
+  In short: use Pydantic models, document GET query params with `query_params_from_model(...)`, register response
+  DTOs with `register_response_schema_models(...)`, serialize response DTOs with `dump_response(...)`,
+  and avoid adding new legacy `ns.model(...)`, `@marshal_with(...)`, or GET `@ns.expect(...)` patterns.
 
 ### Miscellaneous
 
diff --git a/api/Dockerfile b/api/Dockerfile
index 6098652573..8425578953 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -24,7 +24,8 @@ RUN apt-get update \
 # Install Python dependencies (workspace members under providers/vdb/)
 COPY pyproject.toml uv.lock ./
 COPY providers ./providers
-RUN uv sync --locked --no-dev
+# Trust the checked-in lock during image builds; dev-only path sources live outside the api/ context.
+RUN uv sync --frozen --no-dev
 
 # production stage
 FROM base AS production
diff --git a/api/README.md b/api/README.md
index a075bc0fa9..b41ee99b09 100644
--- a/api/README.md
+++ b/api/README.md
@@ -99,7 +99,7 @@ The scripts resolve paths relative to their location, so you can run them from a
    ./dev/reformat               # Run all formatters and linters
    uv run ruff check --fix ./   # Fix linting issues
    uv run ruff format ./        # Format code
-   uv run basedpyright .        # Type checking
+   uv run pyrefly check         # Type checking
    ```
 
 ## Generate TS stub
diff --git a/api/app_factory.py b/api/app_factory.py
index 48e50ceae9..565c7fefd8 100644
--- a/api/app_factory.py
+++ b/api/app_factory.py
@@ -117,7 +117,7 @@ def create_flask_app_with_configs() -> DifyApp:
             logger.warning("Failed to add trace headers to response", exc_info=True)
         return response
 
-    # Capture the decorator's return value to avoid pyright reportUnusedFunction
+    # Capture the decorator return values so static checkers do not treat the hooks as unused.
     _ = before_request
     _ = add_trace_headers
 
@@ -181,7 +181,6 @@ def initialize_extensions(app: DifyApp):
         ext_import_modules,
         ext_orjson,
         ext_forward_refs,
-        ext_set_secretkey,
         ext_compress,
         ext_code_based_extension,
         ext_database,
@@ -189,6 +188,7 @@ def initialize_extensions(app: DifyApp):
         ext_migrate,
         ext_redis,
         ext_storage,
+        ext_set_secretkey,
         ext_logstore,  # Initialize logstore after storage, before celery
         ext_celery,
         ext_login,
diff --git a/api/commands/plugin.py b/api/commands/plugin.py
index 8bd5392d7b..8ad2321b07 100644
--- a/api/commands/plugin.py
+++ b/api/commands/plugin.py
@@ -185,9 +185,9 @@ def transform_datasource_credentials(environment: str):
         firecrawl_plugin_id = "langgenius/firecrawl_datasource"
         jina_plugin_id = "langgenius/jina_datasource"
         if environment == "online":
-            notion_plugin_unique_identifier = plugin_migration._fetch_plugin_unique_identifier(notion_plugin_id)  # pyright: ignore[reportPrivateUsage]
-            firecrawl_plugin_unique_identifier = plugin_migration._fetch_plugin_unique_identifier(firecrawl_plugin_id)  # pyright: ignore[reportPrivateUsage]
-            jina_plugin_unique_identifier = plugin_migration._fetch_plugin_unique_identifier(jina_plugin_id)  # pyright: ignore[reportPrivateUsage]
+            notion_plugin_unique_identifier = plugin_migration._fetch_plugin_unique_identifier(notion_plugin_id)
+            firecrawl_plugin_unique_identifier = plugin_migration._fetch_plugin_unique_identifier(firecrawl_plugin_id)
+            jina_plugin_unique_identifier = plugin_migration._fetch_plugin_unique_identifier(jina_plugin_id)
         else:
             notion_plugin_unique_identifier = None
             firecrawl_plugin_unique_identifier = None
diff --git a/api/commands/system.py b/api/commands/system.py
index 39b2e991ed..7755d3b5bc 100644
--- a/api/commands/system.py
+++ b/api/commands/system.py
@@ -14,6 +14,7 @@ from libs.rsa import generate_key_pair
 from models import Tenant
 from models.model import App, AppMode, Conversation
 from models.provider import Provider, ProviderModel
+from models.tools import ApiToolProvider, BuiltinToolProvider, MCPToolProvider
 
 logger = logging.getLogger(__name__)
 
@@ -23,13 +24,16 @@ DB_UPGRADE_LOCK_TTL_SECONDS = 60
 @click.command(
     "reset-encrypt-key-pair",
     help="Reset the asymmetric key pair of workspace for encrypt LLM credentials. "
-    "After the reset, all LLM credentials will become invalid, "
-    "requiring re-entry."
+    "After the reset, all LLM credentials and tool provider credentials "
+    "(builtin / API / MCP) will be purged, requiring re-entry. "
     "Only support SELF_HOSTED mode.",
 )
 @click.confirmation_option(
     prompt=click.style(
-        "Are you sure you want to reset encrypt key pair? This operation cannot be rolled back!", fg="red"
+        "Are you sure you want to reset encrypt key pair? "
+        "This will also purge builtin / API / MCP tool provider records for every tenant. "
+        "This operation cannot be rolled back!",
+        fg="red",
     )
 )
 def reset_encrypt_key_pair():
@@ -53,6 +57,13 @@ def reset_encrypt_key_pair():
             session.execute(delete(Provider).where(Provider.provider_type == "custom", Provider.tenant_id == tenant.id))
             session.execute(delete(ProviderModel).where(ProviderModel.tenant_id == tenant.id))
 
+            # Purge tool provider records that hold credentials encrypted under the
+            # tenant key. Leaving them in place causes /console/api/workspaces/current/
+            # tool-providers to 500 because decryption fails on stale ciphertext (#35396).
+            session.execute(delete(BuiltinToolProvider).where(BuiltinToolProvider.tenant_id == tenant.id))
+            session.execute(delete(ApiToolProvider).where(ApiToolProvider.tenant_id == tenant.id))
+            session.execute(delete(MCPToolProvider).where(MCPToolProvider.tenant_id == tenant.id))
+
             click.echo(
                 click.style(
                     f"Congratulations! The asymmetric key pair of workspace {tenant.id} has been reset.",
diff --git a/api/configs/enterprise/__init__.py b/api/configs/enterprise/__init__.py
index 8a6a921a4e..b3a93d9773 100644
--- a/api/configs/enterprise/__init__.py
+++ b/api/configs/enterprise/__init__.py
@@ -23,6 +23,12 @@ class EnterpriseFeatureConfig(BaseSettings):
         ge=1, description="Maximum timeout in seconds for enterprise requests", default=5
     )
 
+    ENTERPRISE_DISABLE_RUNTIME_CREDENTIAL_CHECK: bool = Field(
+        default=False,
+        description="If disabled, credential policy check is only performed when saving workflows."
+        "This helps gain runtime performance by trading off consistency.",
+    )
+
 
 class EnterpriseTelemetryConfig(BaseSettings):
     """
diff --git a/api/configs/feature/__init__.py b/api/configs/feature/__init__.py
index 52e33c1789..a752d9d103 100644
--- a/api/configs/feature/__init__.py
+++ b/api/configs/feature/__init__.py
@@ -23,9 +23,9 @@ class SecurityConfig(BaseSettings):
     """
 
     SECRET_KEY: str = Field(
-        description="Secret key for secure session cookie signing."
-        "Make sure you are changing this key for your deployment with a strong key."
-        "Generate a strong key using `openssl rand -base64 42` or set via the `SECRET_KEY` environment variable.",
+        description="Secret key for secure session cookie signing. "
+        "Leave empty to let Dify generate a persistent key in the storage directory, "
+        "or set a strong value via the `SECRET_KEY` environment variable.",
         default="",
     )
 
@@ -761,7 +761,7 @@ class WorkflowConfig(BaseSettings):
     # GraphEngine Worker Pool Configuration
     GRAPH_ENGINE_MIN_WORKERS: PositiveInt = Field(
         description="Minimum number of workers per GraphEngine instance",
-        default=1,
+        default=3,
     )
 
     GRAPH_ENGINE_MAX_WORKERS: PositiveInt = Field(
@@ -1137,6 +1137,18 @@ class MultiModalTransferConfig(BaseSettings):
     )
 
 
+class OpsTraceConfig(BaseSettings):
+    OPS_TRACE_RETRYABLE_DISPATCH_MAX_RETRIES: PositiveInt = Field(
+        description="Maximum retry attempts for transient ops trace provider dispatch failures.",
+        default=60,
+    )
+
+    OPS_TRACE_RETRYABLE_DISPATCH_DELAY_SECONDS: PositiveInt = Field(
+        description="Delay in seconds between transient ops trace provider dispatch retry attempts.",
+        default=5,
+    )
+
+
 class CeleryBeatConfig(BaseSettings):
     CELERY_BEAT_SCHEDULER_TIME: int = Field(
         description="Interval in days for Celery Beat scheduler execution, default to 1 day",
@@ -1298,7 +1310,7 @@ class PositionConfig(BaseSettings):
 class CollaborationConfig(BaseSettings):
     ENABLE_COLLABORATION_MODE: bool = Field(
         description="Whether to enable collaboration mode features across the workspace",
-        default=False,
+        default=True,
     )
 
 
@@ -1417,6 +1429,7 @@ class FeatureConfig(
     ModelLoadBalanceConfig,
     ModerationConfig,
     MultiModalTransferConfig,
+    OpsTraceConfig,
     PositionConfig,
     RagEtlConfig,
     RepositoryConfig,
diff --git a/api/configs/middleware/__init__.py b/api/configs/middleware/__init__.py
index c392b8840f..865bb48c67 100644
--- a/api/configs/middleware/__init__.py
+++ b/api/configs/middleware/__init__.py
@@ -1,5 +1,5 @@
 import os
-from typing import Any, Literal, TypedDict
+from typing import Any, Literal, TypedDict, cast
 from urllib.parse import parse_qsl, quote_plus
 
 from pydantic import Field, NonNegativeFloat, NonNegativeInt, PositiveFloat, PositiveInt, computed_field
@@ -50,28 +50,30 @@ from .vdb.vastbase_vector_config import VastbaseVectorConfig
 from .vdb.vikingdb_config import VikingDBConfig
 from .vdb.weaviate_config import WeaviateConfig
 
+_VALID_STORAGE_TYPE = Literal[
+    "opendal",
+    "s3",
+    "aliyun-oss",
+    "azure-blob",
+    "baidu-obs",
+    "clickzetta-volume",
+    "google-storage",
+    "huawei-obs",
+    "oci-storage",
+    "tencent-cos",
+    "volcengine-tos",
+    "supabase",
+    "local",
+]
+
 
 class StorageConfig(BaseSettings):
-    STORAGE_TYPE: Literal[
-        "opendal",
-        "s3",
-        "aliyun-oss",
-        "azure-blob",
-        "baidu-obs",
-        "clickzetta-volume",
-        "google-storage",
-        "huawei-obs",
-        "oci-storage",
-        "tencent-cos",
-        "volcengine-tos",
-        "supabase",
-        "local",
-    ] = Field(
+    STORAGE_TYPE: _VALID_STORAGE_TYPE = Field(
         description="Type of storage to use."
         " Options: 'opendal', '(deprecated) local', 's3', 'aliyun-oss', 'azure-blob', 'baidu-obs', "
         "'clickzetta-volume', 'google-storage', 'huawei-obs', 'oci-storage', 'tencent-cos', "
         "'volcengine-tos', 'supabase'. Default is 'opendal'.",
-        default="opendal",
+        default=cast(_VALID_STORAGE_TYPE, "opendal"),
     )
 
     STORAGE_LOCAL_PATH: str = Field(
@@ -114,7 +116,7 @@ class SQLAlchemyEngineOptionsDict(TypedDict):
     pool_pre_ping: bool
     connect_args: dict[str, str]
     pool_use_lifo: bool
-    pool_reset_on_return: None
+    pool_reset_on_return: Literal["commit", "rollback", None]
     pool_timeout: int
 
 
@@ -223,6 +225,11 @@ class DatabaseConfig(BaseSettings):
         default=30,
     )
 
+    SQLALCHEMY_POOL_RESET_ON_RETURN: Literal["commit", "rollback", None] = Field(
+        description="Connection pool reset behavior on return. Options: 'commit', 'rollback', or None",
+        default="rollback",
+    )
+
     RETRIEVAL_SERVICE_EXECUTORS: NonNegativeInt = Field(
         description="Number of processes for the retrieval service, default to CPU cores.",
         default=os.cpu_count() or 1,
@@ -252,7 +259,7 @@ class DatabaseConfig(BaseSettings):
             "pool_pre_ping": self.SQLALCHEMY_POOL_PRE_PING,
             "connect_args": connect_args,
             "pool_use_lifo": self.SQLALCHEMY_POOL_USE_LIFO,
-            "pool_reset_on_return": None,
+            "pool_reset_on_return": self.SQLALCHEMY_POOL_RESET_ON_RETURN,
             "pool_timeout": self.SQLALCHEMY_POOL_TIMEOUT,
         }
         return result
diff --git a/api/configs/secret_key.py b/api/configs/secret_key.py
new file mode 100644
index 0000000000..f8c33f6a2c
--- /dev/null
+++ b/api/configs/secret_key.py
@@ -0,0 +1,38 @@
+"""SECRET_KEY persistence helpers for runtime setup."""
+
+from __future__ import annotations
+
+import secrets
+
+from extensions.ext_storage import storage
+
+GENERATED_SECRET_KEY_FILENAME = ".dify_secret_key"
+
+
+def resolve_secret_key(secret_key: str) -> str:
+    """Return an explicit SECRET_KEY or a generated key persisted in storage."""
+    if secret_key:
+        return secret_key
+
+    return _load_or_create_secret_key()
+
+
+def _load_or_create_secret_key() -> str:
+    try:
+        persisted_key = storage.load_once(GENERATED_SECRET_KEY_FILENAME).decode("utf-8").strip()
+        if persisted_key:
+            return persisted_key
+    except FileNotFoundError:
+        pass
+
+    generated_key = secrets.token_urlsafe(48)
+
+    try:
+        storage.save(GENERATED_SECRET_KEY_FILENAME, f"{generated_key}\n".encode())
+    except Exception as exc:
+        raise ValueError(
+            f"SECRET_KEY is not set and could not be generated at {GENERATED_SECRET_KEY_FILENAME}. "
+            "Set SECRET_KEY explicitly or make storage writable."
+        ) from exc
+
+    return generated_key
diff --git a/api/constants/recommended_apps.json b/api/constants/recommended_apps.json
index 3779fb0180..3d728f1b2e 100644
--- a/api/constants/recommended_apps.json
+++ b/api/constants/recommended_apps.json
@@ -19,7 +19,7 @@
                         "name": "Website Generator"
                     },
                     "app_id": "b53545b1-79ea-4da3-b31a-c39391c6f041",
-                    "category": "Programming",
+                    "categories": ["Programming"],
                     "copyright": null,
                     "description": null,
                     "is_listed": true,
@@ -35,7 +35,7 @@
                         "name": "Investment Analysis Report Copilot"
                     },
                     "app_id": "a23b57fa-85da-49c0-a571-3aff375976c1",
-                    "category": "Agent",
+                    "categories": ["Agent"],
                     "copyright": "Dify.AI",
                     "description": "Welcome to your personalized Investment Analysis Copilot service, where we delve into the depths of stock analysis to provide you with comprehensive insights. \n",
                     "is_listed": true,
@@ -51,7 +51,7 @@
                         "name": "Workflow Planning Assistant "
                     },
                     "app_id": "f3303a7d-a81c-404e-b401-1f8711c998c1",
-                    "category": "Workflow",
+                    "categories": ["Workflow"],
                     "copyright": null,
                     "description": "An assistant that helps you plan and select the right node for a workflow (V0.6.0).  ",
                     "is_listed": true,
@@ -67,7 +67,7 @@
                         "name": "Automated Email Reply  "
                     },
                     "app_id": "e9d92058-7d20-4904-892f-75d90bef7587",
-                    "category": "Workflow",
+                    "categories": ["Workflow"],
                     "copyright": null,
                     "description": "Reply emails using Gmail API. It will automatically retrieve email in your inbox and create a response in Gmail. \nConfigure your Gmail API in Google Cloud Console. ",
                     "is_listed": true,
@@ -83,7 +83,7 @@
                         "name": "Book Translation "
                     },
                     "app_id": "98b87f88-bd22-4d86-8b74-86beba5e0ed4",
-                    "category": "Workflow",
+                    "categories": ["Workflow"],
                     "copyright": null,
                     "description": "A workflow designed to translate a full book up to 15000 tokens per run. Uses Code node to separate text into chunks and Iteration to translate each chunk. ",
                     "is_listed": true,
@@ -99,7 +99,7 @@
                         "name": "Python bug fixer"
                     },
                     "app_id": "cae337e6-aec5-4c7b-beca-d6f1a808bd5e",
-                    "category": "Programming",
+                    "categories": ["Programming"],
                     "copyright": null,
                     "description": null,
                     "is_listed": true,
@@ -115,7 +115,7 @@
                         "name": "Code Interpreter"
                     },
                     "app_id": "d077d587-b072-4f2c-b631-69ed1e7cdc0f",
-                    "category": "Programming",
+                    "categories": ["Programming"],
                     "copyright": "Copyright 2023 Dify",
                     "description": "Code interpreter, clarifying the syntax and semantics of the code.",
                     "is_listed": true,
@@ -131,7 +131,7 @@
                         "name": "SVG Logo Design "
                     },
                     "app_id": "73fbb5f1-c15d-4d74-9cc8-46d9db9b2cca",
-                    "category": "Agent",
+                    "categories": ["Agent"],
                     "copyright": "Dify.AI",
                     "description": "Hello, I am your creative partner in bringing ideas to vivid life! I can assist you in creating stunning designs by leveraging abilities of DALL·E 3.  ",
                     "is_listed": true,
@@ -147,7 +147,7 @@
                         "name": "Long Story Generator (Iteration) "
                     },
                     "app_id": "5efb98d7-176b-419c-b6ef-50767391ab62",
-                    "category": "Workflow",
+                    "categories": ["Workflow"],
                     "copyright": null,
                     "description": "A workflow demonstrating how to use Iteration node to generate long article that is longer than the context length of LLMs. ",
                     "is_listed": true,
@@ -163,7 +163,7 @@
                         "name": "Text Summarization Workflow"
                     },
                     "app_id": "f00c4531-6551-45ee-808f-1d7903099515",
-                    "category": "Workflow",
+                    "categories": ["Workflow"],
                     "copyright": null,
                     "description": "Based on users' choice, retrieve external knowledge to more accurately summarize articles.",
                     "is_listed": true,
@@ -179,7 +179,7 @@
                         "name": "YouTube Channel Data Analysis"
                     },
                     "app_id": "be591209-2ca8-410f-8f3b-ca0e530dd638",
-                    "category": "Agent",
+                    "categories": ["Agent"],
                     "copyright": "Dify.AI",
                     "description": "I am a YouTube Channel Data Analysis Copilot, I am here to provide expert data analysis tailored to your needs. ",
                     "is_listed": true,
@@ -195,7 +195,7 @@
                         "name": "Article Grading Bot"
                     },
                     "app_id": "a747f7b4-c48b-40d6-b313-5e628232c05f",
-                    "category": "Writing",
+                    "categories": ["Writing"],
                     "copyright": null,
                     "description": "Assess the quality of articles and text based on user defined criteria. ",
                     "is_listed": true,
@@ -211,7 +211,7 @@
                         "name": "SEO Blog Generator"
                     },
                     "app_id": "18f3bd03-524d-4d7a-8374-b30dbe7c69d5",
-                    "category": "Workflow",
+                    "categories": ["Workflow"],
                     "copyright": null,
                     "description": "Workflow for retrieving information from the internet, followed by segmented generation of SEO blogs.",
                     "is_listed": true,
@@ -227,7 +227,7 @@
                         "name": "SQL Creator"
                     },
                     "app_id": "050ef42e-3e0c-40c1-a6b6-a64f2c49d744",
-                    "category": "Programming",
+                    "categories": ["Programming"],
                     "copyright": "Copyright 2023 Dify",
                     "description": "Write SQL from natural language by pasting in your schema with the request.Please describe your query requirements in natural language and select the target database type.",
                     "is_listed": true,
@@ -243,7 +243,7 @@
                         "name": "Sentiment Analysis "
                     },
                     "app_id": "f06bf86b-d50c-4895-a942-35112dbe4189",
-                    "category": "Workflow",
+                    "categories": ["Workflow"],
                     "copyright": null,
                     "description": "Batch sentiment analysis of text, followed by JSON output of sentiment classification along with scores.",
                     "is_listed": true,
@@ -259,7 +259,7 @@
                         "name": "Strategic Consulting Expert"
                     },
                     "app_id": "7e8ca1ae-02f2-4b5f-979e-62d19133bee2",
-                    "category": "Assistant",
+                    "categories": ["Assistant"],
                     "copyright": "Copyright 2023 Dify",
                     "description": "I can answer your questions related to strategic marketing.",
                     "is_listed": true,
@@ -275,7 +275,7 @@
                         "name": "Code Converter"
                     },
                     "app_id": "4006c4b2-0735-4f37-8dbb-fb1a8c5bd87a",
-                    "category": "Programming",
+                    "categories": ["Programming"],
                     "copyright": "Copyright 2023 Dify",
                     "description": "This is an application that provides the ability to convert code snippets in multiple programming languages. You can input the code you wish to convert, select the target programming language, and get the desired output.",
                     "is_listed": true,
@@ -291,7 +291,7 @@
                         "name": "Question Classifier + Knowledge + Chatbot "
                     },
                     "app_id": "d9f6b733-e35d-4a40-9f38-ca7bbfa009f7",
-                    "category": "Workflow",
+                    "categories": ["Workflow"],
                     "copyright": null,
                     "description": "Basic Workflow Template, a chatbot capable of identifying intents alongside with a knowledge base.",
                     "is_listed": true,
@@ -307,7 +307,7 @@
                         "name": "AI Front-end interviewer"
                     },
                     "app_id": "127efead-8944-4e20-ba9d-12402eb345e0",
-                    "category": "HR",
+                    "categories": ["HR"],
                     "copyright": "Copyright 2023 Dify",
                     "description": "A simulated front-end interviewer that tests the skill level of front-end development through questioning.",
                     "is_listed": true,
@@ -323,7 +323,7 @@
                         "name": "Knowledge Retrieval + Chatbot "
                     },
                     "app_id": "e9870913-dd01-4710-9f06-15d4180ca1ce",
-                    "category": "Workflow",
+                    "categories": ["Workflow"],
                     "copyright": null,
                     "description": "Basic Workflow Template, A chatbot with a knowledge base. ",
                     "is_listed": true,
@@ -339,7 +339,7 @@
                         "name": "Email Assistant Workflow "
                     },
                     "app_id": "dd5b6353-ae9b-4bce-be6a-a681a12cf709",
-                    "category": "Workflow",
+                    "categories": ["Workflow"],
                     "copyright": null,
                     "description": "A multifunctional email assistant capable of summarizing, replying, composing, proofreading, and checking grammar.",
                     "is_listed": true,
@@ -355,7 +355,7 @@
                         "name": "Customer Review Analysis Workflow "
                     },
                     "app_id": "9c0cd31f-4b62-4005-adf5-e3888d08654a",
-                    "category": "Workflow",
+                    "categories": ["Workflow"],
                     "copyright": null,
                     "description": "Utilize LLM (Large Language Models) to classify customer reviews and forward them to the internal system.",
                     "is_listed": true,
diff --git a/api/controllers/API_SCHEMA_GUIDE.md b/api/controllers/API_SCHEMA_GUIDE.md
new file mode 100644
index 0000000000..6cfbab4b1c
--- /dev/null
+++ b/api/controllers/API_SCHEMA_GUIDE.md
@@ -0,0 +1,211 @@
+# API Schema Guide
+
+This guide describes the expected Flask-RESTX + Pydantic pattern for controller request payloads, query
+parameters, response schemas, and Swagger documentation.
+
+## Principles
+
+- Use Pydantic `BaseModel` for request bodies and query parameters.
+- Use `fields.base.ResponseModel` for response DTOs.
+- Keep runtime validation and Swagger documentation wired to the same Pydantic model.
+- Prefer explicit validation and serialization in controller methods over Flask-RESTX marshalling.
+- Do not add new Flask-RESTX `fields.*` dictionaries, `Namespace.model(...)` exports, or `@marshal_with(...)` for migrated or new endpoints.
+- Do not use `@ns.expect(...)` for GET query parameters. Flask-RESTX documents that as a request body.
+
+## Naming
+
+- Request body models: use a `Payload` suffix.
+  - Example: `WorkflowRunPayload`, `DatasourceVariablesPayload`.
+- Query parameter models: use a `Query` suffix.
+  - Example: `WorkflowRunListQuery`, `MessageListQuery`.
+- Response models: use a `Response` suffix and inherit from `ResponseModel`.
+  - Example: `WorkflowRunDetailResponse`, `WorkflowRunNodeExecutionListResponse`.
+- Use `ListResponse` or `PaginationResponse` for wrapper responses.
+  - Example: `WorkflowRunNodeExecutionListResponse`, `WorkflowRunPaginationResponse`.
+- Keep these models near the controller when they are endpoint-specific. Move them to `fields/*_fields.py` only when shared by multiple controllers.
+
+## Registering Models For Swagger
+
+Use helpers from `controllers.common.schema`.
+
+```python
+from controllers.common.schema import (
+    query_params_from_model,
+    register_response_schema_models,
+    register_schema_models,
+)
+from libs.helper import dump_response
+```
+
+Register request payload and query models with `register_schema_models(...)`:
+
+```python
+register_schema_models(
+    console_ns,
+    WorkflowRunPayload,
+    WorkflowRunListQuery,
+)
+```
+
+Register response models with `register_response_schema_models(...)`:
+
+```python
+register_response_schema_models(
+    console_ns,
+    WorkflowRunDetailResponse,
+    WorkflowRunPaginationResponse,
+)
+```
+
+Response models are registered in Pydantic serialization mode. This matters when a response model uses
+`validation_alias` to read internal object attributes but emits public API field names. For example, a response model
+can validate from `inputs_dict` while documenting and serializing `inputs`.
+
+## Request Bodies
+
+For non-GET request bodies:
+
+1. Define a Pydantic `Payload` model.
+2. Register it with `register_schema_models(...)`.
+3. Use `@ns.expect(ns.models[Payload.__name__])` for Swagger documentation.
+4. Validate from `ns.payload or {}` inside the controller.
+
+```python
+class DraftWorkflowNodeRunPayload(BaseModel):
+    inputs: dict[str, Any]
+    query: str = ""
+
+
+register_schema_models(console_ns, DraftWorkflowNodeRunPayload)
+
+
+@console_ns.expect(console_ns.models[DraftWorkflowNodeRunPayload.__name__])
+def post(self, app_model: App, node_id: str):
+    payload = DraftWorkflowNodeRunPayload.model_validate(console_ns.payload or {})
+    result = service.run(..., inputs=payload.inputs, query=payload.query)
+    return dump_response(WorkflowRunNodeExecutionResponse, result)
+```
+
+## Query Parameters
+
+For GET query parameters:
+
+1. Define a Pydantic `Query` model.
+2. Register it with `register_schema_models(...)` if it is referenced elsewhere in docs, or only use
+   `query_params_from_model(...)` if a body schema is not needed.
+3. Use `@ns.doc(params=query_params_from_model(QueryModel))`.
+4. Validate from `request.args.to_dict(flat=True)` or an explicit dict when type coercion is needed.
+
+```python
+class WorkflowRunListQuery(BaseModel):
+    last_id: str | None = Field(default=None, description="Last run ID for pagination")
+    limit: int = Field(default=20, ge=1, le=100, description="Number of items per page (1-100)")
+
+
+@console_ns.doc(params=query_params_from_model(WorkflowRunListQuery))
+def get(self, app_model: App):
+    query = WorkflowRunListQuery.model_validate(request.args.to_dict(flat=True))
+    result = service.list(..., limit=query.limit, last_id=query.last_id)
+    return dump_response(WorkflowRunPaginationResponse, result)
+```
+
+Do not do this for GET query parameters:
+
+```python
+@console_ns.expect(console_ns.models[WorkflowRunListQuery.__name__])
+def get(...):
+    ...
+```
+
+That documents a GET request body and is not the expected contract.
+
+## Responses
+
+Response models should inherit from `ResponseModel`:
+
+```python
+class WorkflowRunNodeExecutionResponse(ResponseModel):
+    id: str
+    inputs: Any = Field(default=None, validation_alias="inputs_dict")
+    process_data: Any = Field(default=None, validation_alias="process_data_dict")
+    outputs: Any = Field(default=None, validation_alias="outputs_dict")
+```
+
+Document response models with `@ns.response(...)`:
+
+```python
+@console_ns.response(
+    200,
+    "Node run started successfully",
+    console_ns.models[WorkflowRunNodeExecutionResponse.__name__],
+)
+def post(...):
+    ...
+```
+
+Serialize explicitly:
+
+```python
+return dump_response(WorkflowRunNodeExecutionResponse, workflow_node_execution)
+```
+
+`dump_response(...)` is the preferred response serialization helper for a single Pydantic response DTO. It validates
+with `from_attributes=True` and returns `model_dump(mode="json")`, so SQLAlchemy models, plain objects, dictionaries,
+Pydantic aliases, computed fields, and `datetime` values are serialized consistently.
+
+For wrapper responses, pass a dictionary with the public wrapper fields:
+
+```python
+return dump_response(
+    WorkflowRunPaginationResponse,
+    {
+        "data": workflow_runs,
+        "page": page,
+        "limit": limit,
+        "has_more": has_more,
+    },
+)
+```
+
+If the service can return `None`, translate that into the expected HTTP error before validation:
+
+```python
+workflow_run = service.get_workflow_run(...)
+if workflow_run is None:
+    raise NotFound("Workflow run not found")
+
+return dump_response(WorkflowRunDetailResponse, workflow_run)
+```
+
+Use manual `model_validate(...).model_dump(...)` only when the endpoint needs behavior that `dump_response(...)` does
+not provide, such as returning a non-dict payload, intentionally excluding fields, or composing a `(body, status)` tuple.
+
+## Legacy Flask-RESTX Patterns
+
+Avoid adding these patterns to new or migrated endpoints:
+
+- `ns.model(...)` for new request/response DTOs.
+- Module-level exported RESTX model objects such as `workflow_run_detail_model`.
+- `fields.Nested({...})` with raw inline dict field maps.
+- `@marshal_with(...)` for response serialization.
+- `@ns.expect(...)` for GET query params.
+
+Existing legacy field dictionaries may remain where an endpoint has not yet been migrated. Keep that compatibility local
+to the legacy area and avoid importing RESTX model objects from controllers.
+
+## Verifying Swagger
+
+For schema and documentation changes, run focused tests and generate Swagger JSON:
+
+```bash
+uv run --project . pytest tests/unit_tests/controllers/common/test_schema.py
+uv run --project . pytest tests/unit_tests/commands/test_generate_swagger_specs.py tests/unit_tests/controllers/test_swagger.py
+uv run --project . dev/generate_swagger_specs.py --output-dir /tmp/dify-openapi-check
+```
+
+Inspect affected endpoints with `jq`. Check that:
+
+- GET parameters are `in: query`.
+- Request bodies appear only where the endpoint has a body.
+- Responses reference the expected `*Response` schema.
+- Response schemas use public serialized names, not internal validation aliases like `inputs_dict`.
diff --git a/api/controllers/common/human_input.py b/api/controllers/common/human_input.py
index 5d6f4efb95..98fe2ce67b 100644
--- a/api/controllers/common/human_input.py
+++ b/api/controllers/common/human_input.py
@@ -1,6 +1,21 @@
+import json
+
 from pydantic import BaseModel, JsonValue
 
 
 class HumanInputFormSubmitPayload(BaseModel):
     inputs: dict[str, JsonValue]
     action: str
+
+
+def stringify_form_default_values(values: dict[str, object]) -> dict[str, str]:
+    """Serialize default values into strings expected by human-input form clients."""
+    result: dict[str, str] = {}
+    for key, value in values.items():
+        if value is None:
+            result[key] = ""
+        elif isinstance(value, (dict, list)):
+            result[key] = json.dumps(value, ensure_ascii=False)
+        else:
+            result[key] = str(value)
+    return result
diff --git a/api/controllers/common/schema.py b/api/controllers/common/schema.py
index 8d112c203b..a1b37d3df4 100644
--- a/api/controllers/common/schema.py
+++ b/api/controllers/common/schema.py
@@ -1,6 +1,14 @@
-"""Helpers for registering Pydantic models with Flask-RESTX namespaces."""
+"""Helpers for registering Pydantic models with Flask-RESTX namespaces.
 
+Flask-RESTX treats `SchemaModel` bodies as opaque JSON schemas; it does not
+promote Pydantic's nested `$defs` into top-level Swagger `definitions`.
+These helpers keep that translation centralized so models registered through
+`register_schema_models` emit resolvable Swagger 2.0 references.
+"""
+
+from collections.abc import Mapping
 from enum import StrEnum
+from typing import Any, Literal, NotRequired, TypedDict
 
 from flask_restx import Namespace
 from pydantic import BaseModel, TypeAdapter
@@ -8,10 +16,89 @@ from pydantic import BaseModel, TypeAdapter
 DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
 
 
-def register_schema_model(namespace: Namespace, model: type[BaseModel]) -> None:
-    """Register a single BaseModel with a namespace for Swagger documentation."""
+QueryParamDoc = TypedDict(
+    "QueryParamDoc",
+    {
+        "in": NotRequired[str],
+        "type": NotRequired[str],
+        "items": NotRequired[dict[str, object]],
+        "required": NotRequired[bool],
+        "description": NotRequired[str],
+        "enum": NotRequired[list[object]],
+        "default": NotRequired[object],
+        "minimum": NotRequired[int | float],
+        "maximum": NotRequired[int | float],
+        "minLength": NotRequired[int],
+        "maxLength": NotRequired[int],
+        "minItems": NotRequired[int],
+        "maxItems": NotRequired[int],
+    },
+)
 
-    namespace.schema_model(model.__name__, model.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0))
+
+def _register_json_schema(namespace: Namespace, name: str, schema: dict) -> None:
+    """Register a JSON schema and promote any nested Pydantic `$defs`."""
+
+    schema = _swagger_2_compatible_schema(schema)
+    nested_definitions = schema.get("$defs")
+    schema_to_register = dict(schema)
+    if isinstance(nested_definitions, dict):
+        schema_to_register.pop("$defs")
+
+    namespace.schema_model(name, schema_to_register)
+
+    if not isinstance(nested_definitions, dict):
+        return
+
+    for nested_name, nested_schema in nested_definitions.items():
+        if isinstance(nested_schema, dict):
+            _register_json_schema(namespace, nested_name, nested_schema)
+
+
+JsonSchemaMode = Literal["validation", "serialization"]
+
+
+def _register_schema_model(namespace: Namespace, model: type[BaseModel], *, mode: JsonSchemaMode) -> None:
+    _register_json_schema(
+        namespace,
+        model.__name__,
+        model.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0, mode=mode),
+    )
+
+
+def _swagger_2_compatible_schema(value: Any) -> Any:
+    if isinstance(value, list):
+        return [_swagger_2_compatible_schema(item) for item in value]
+
+    if not isinstance(value, dict):
+        return value
+
+    converted = {key: _swagger_2_compatible_schema(child) for key, child in value.items()}
+    any_of = value.get("anyOf")
+    if not isinstance(any_of, list):
+        return converted
+
+    non_null_candidates = [
+        candidate for candidate in any_of if isinstance(candidate, Mapping) and candidate.get("type") != "null"
+    ]
+    has_null_candidate = any(isinstance(candidate, Mapping) and candidate.get("type") == "null" for candidate in any_of)
+    if not has_null_candidate or len(non_null_candidates) != 1:
+        return converted
+
+    non_null_schema = _swagger_2_compatible_schema(dict(non_null_candidates[0]))
+    if not isinstance(non_null_schema, dict):
+        return converted
+
+    converted.pop("anyOf", None)
+    converted.update(non_null_schema)
+    converted["x-nullable"] = True
+    return converted
+
+
+def register_schema_model(namespace: Namespace, model: type[BaseModel]) -> None:
+    """Register a BaseModel and its nested schema definitions for Swagger documentation."""
+
+    _register_schema_model(namespace, model, mode="validation")
 
 
 def register_schema_models(namespace: Namespace, *models: type[BaseModel]) -> None:
@@ -21,6 +108,19 @@ def register_schema_models(namespace: Namespace, *models: type[BaseModel]) -> No
         register_schema_model(namespace, model)
 
 
+def register_response_schema_model(namespace: Namespace, model: type[BaseModel]) -> None:
+    """Register a BaseModel using its serialized response shape."""
+
+    _register_schema_model(namespace, model, mode="serialization")
+
+
+def register_response_schema_models(namespace: Namespace, *models: type[BaseModel]) -> None:
+    """Register multiple response BaseModels using their serialized response shape."""
+
+    for model in models:
+        register_response_schema_model(namespace, model)
+
+
 def get_or_create_model(model_name: str, field_def):
     # Import lazily to avoid circular imports between console controllers and schema helpers.
     from controllers.console import console_ns
@@ -34,15 +134,114 @@ def get_or_create_model(model_name: str, field_def):
 def register_enum_models(namespace: Namespace, *models: type[StrEnum]) -> None:
     """Register multiple StrEnum with a namespace."""
     for model in models:
-        namespace.schema_model(
-            model.__name__, TypeAdapter(model).json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0)
+        _register_json_schema(
+            namespace,
+            model.__name__,
+            TypeAdapter(model).json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
         )
 
 
+def query_params_from_model(model: type[BaseModel]) -> dict[str, QueryParamDoc]:
+    """Build Flask-RESTX query parameter docs from a flat Pydantic model.
+
+    `Namespace.expect()` treats Pydantic schema models as request bodies, so GET
+    endpoints should keep runtime validation on the Pydantic model and feed this
+    derived mapping to `Namespace.doc(params=...)` for Swagger documentation.
+    """
+
+    schema = model.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0)
+    properties = schema.get("properties", {})
+    if not isinstance(properties, Mapping):
+        return {}
+
+    required = schema.get("required", [])
+    required_names = set(required) if isinstance(required, list) else set()
+
+    params: dict[str, QueryParamDoc] = {}
+    for name, property_schema in properties.items():
+        if not isinstance(name, str) or not isinstance(property_schema, Mapping):
+            continue
+
+        params[name] = _query_param_from_property(property_schema, required=name in required_names)
+
+    return params
+
+
+def _query_param_from_property(property_schema: Mapping[str, Any], *, required: bool) -> QueryParamDoc:
+    param_schema = _nullable_property_schema(property_schema)
+    param_doc: QueryParamDoc = {"in": "query", "required": required}
+
+    description = param_schema.get("description")
+    if isinstance(description, str):
+        param_doc["description"] = description
+
+    schema_type = param_schema.get("type")
+    if isinstance(schema_type, str) and schema_type in {"array", "boolean", "integer", "number", "string"}:
+        param_doc["type"] = schema_type
+        if schema_type == "array":
+            items = param_schema.get("items")
+            if isinstance(items, Mapping):
+                item_type = items.get("type")
+                if isinstance(item_type, str):
+                    param_doc["items"] = {"type": item_type}
+
+    enum = param_schema.get("enum")
+    if isinstance(enum, list):
+        param_doc["enum"] = enum
+
+    default = param_schema.get("default")
+    if default is not None:
+        param_doc["default"] = default
+
+    minimum = param_schema.get("minimum")
+    if isinstance(minimum, int | float):
+        param_doc["minimum"] = minimum
+
+    maximum = param_schema.get("maximum")
+    if isinstance(maximum, int | float):
+        param_doc["maximum"] = maximum
+
+    min_length = param_schema.get("minLength")
+    if isinstance(min_length, int):
+        param_doc["minLength"] = min_length
+
+    max_length = param_schema.get("maxLength")
+    if isinstance(max_length, int):
+        param_doc["maxLength"] = max_length
+
+    min_items = param_schema.get("minItems")
+    if isinstance(min_items, int):
+        param_doc["minItems"] = min_items
+
+    max_items = param_schema.get("maxItems")
+    if isinstance(max_items, int):
+        param_doc["maxItems"] = max_items
+
+    return param_doc
+
+
+def _nullable_property_schema(property_schema: Mapping[str, Any]) -> Mapping[str, Any]:
+    any_of = property_schema.get("anyOf")
+    if not isinstance(any_of, list):
+        return property_schema
+
+    non_null_candidates = [
+        candidate for candidate in any_of if isinstance(candidate, Mapping) and candidate.get("type") != "null"
+    ]
+
+    if len(non_null_candidates) == 1:
+        return {**property_schema, **non_null_candidates[0]}
+
+    return property_schema
+
+
 __all__ = [
     "DEFAULT_REF_TEMPLATE_SWAGGER_2_0",
     "get_or_create_model",
+    "query_params_from_model",
     "register_enum_models",
+    "register_response_schema_model",
+    "register_response_schema_models",
     "register_schema_model",
     "register_schema_models",
 ]
diff --git a/api/controllers/console/__init__.py b/api/controllers/console/__init__.py
index 980e828945..f5aeb17ba2 100644
--- a/api/controllers/console/__init__.py
+++ b/api/controllers/console/__init__.py
@@ -33,7 +33,6 @@ for module_name in RESOURCE_MODULES:
 # Ensure resource modules are imported so route decorators are evaluated.
 # Import other controllers
 from . import (
-    admin,
     apikey,
     extension,
     feature,
@@ -117,7 +116,7 @@ from .explore import (
     saved_message,
     trial,
 )
-from .socketio import workflow as socketio_workflow  # pyright: ignore[reportUnusedImport]
+from .socketio import workflow as socketio_workflow
 
 # Import tag controllers
 from .tag import tags
@@ -142,7 +141,6 @@ api.add_namespace(console_ns)
 __all__ = [
     "account",
     "activate",
-    "admin",
     "advanced_prompt_template",
     "agent",
     "agent_providers",
diff --git a/api/controllers/console/admin.py b/api/controllers/console/admin.py
index dce394be97..0cfa1fb25b 100644
--- a/api/controllers/console/admin.py
+++ b/api/controllers/console/admin.py
@@ -1,72 +1,11 @@
-import csv
-import io
 from collections.abc import Callable
 from functools import wraps
-from typing import cast
 
 from flask import request
-from flask_restx import Resource
-from pydantic import BaseModel, Field, field_validator
-from sqlalchemy import select
-from werkzeug.exceptions import BadRequest, NotFound, Unauthorized
+from werkzeug.exceptions import Unauthorized
 
 from configs import dify_config
-from constants.languages import supported_language
-from controllers.console import console_ns
-from controllers.console.wraps import only_edition_cloud
-from core.db.session_factory import session_factory
-from extensions.ext_database import db
 from libs.token import extract_access_token
-from models.model import App, ExporleBanner, InstalledApp, RecommendedApp, TrialApp
-from services.billing_service import BillingService, LangContentDict
-
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
-
-
-class InsertExploreAppPayload(BaseModel):
-    app_id: str = Field(...)
-    desc: str | None = None
-    copyright: str | None = None
-    privacy_policy: str | None = None
-    custom_disclaimer: str | None = None
-    language: str = Field(...)
-    category: str = Field(...)
-    position: int = Field(...)
-    can_trial: bool = Field(default=False)
-    trial_limit: int = Field(default=0)
-
-    @field_validator("language")
-    @classmethod
-    def validate_language(cls, value: str) -> str:
-        return supported_language(value)
-
-
-class InsertExploreBannerPayload(BaseModel):
-    category: str = Field(...)
-    title: str = Field(...)
-    description: str = Field(...)
-    img_src: str = Field(..., alias="img-src")
-    language: str = Field(default="en-US")
-    link: str = Field(...)
-    sort: int = Field(...)
-
-    @field_validator("language")
-    @classmethod
-    def validate_language(cls, value: str) -> str:
-        return supported_language(value)
-
-    model_config = {"populate_by_name": True}
-
-
-console_ns.schema_model(
-    InsertExploreAppPayload.__name__,
-    InsertExploreAppPayload.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
-)
-
-console_ns.schema_model(
-    InsertExploreBannerPayload.__name__,
-    InsertExploreBannerPayload.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
-)
 
 
 def admin_required[**P, R](view: Callable[P, R]) -> Callable[P, R]:
@@ -84,361 +23,3 @@ def admin_required[**P, R](view: Callable[P, R]) -> Callable[P, R]:
         return view(*args, **kwargs)
 
     return decorated
-
-
-@console_ns.route("/admin/insert-explore-apps")
-class InsertExploreAppListApi(Resource):
-    @console_ns.doc("insert_explore_app")
-    @console_ns.doc(description="Insert or update an app in the explore list")
-    @console_ns.expect(console_ns.models[InsertExploreAppPayload.__name__])
-    @console_ns.response(200, "App updated successfully")
-    @console_ns.response(201, "App inserted successfully")
-    @console_ns.response(404, "App not found")
-    @only_edition_cloud
-    @admin_required
-    def post(self):
-        payload = InsertExploreAppPayload.model_validate(console_ns.payload)
-
-        app = db.session.execute(select(App).where(App.id == payload.app_id)).scalar_one_or_none()
-        if not app:
-            raise NotFound(f"App '{payload.app_id}' is not found")
-
-        site = app.site
-        if not site:
-            desc = payload.desc or ""
-            copy_right = payload.copyright or ""
-            privacy_policy = payload.privacy_policy or ""
-            custom_disclaimer = payload.custom_disclaimer or ""
-        else:
-            desc = site.description or payload.desc or ""
-            copy_right = site.copyright or payload.copyright or ""
-            privacy_policy = site.privacy_policy or payload.privacy_policy or ""
-            custom_disclaimer = site.custom_disclaimer or payload.custom_disclaimer or ""
-
-        with session_factory.create_session() as session:
-            recommended_app = session.execute(
-                select(RecommendedApp).where(RecommendedApp.app_id == payload.app_id)
-            ).scalar_one_or_none()
-
-            if not recommended_app:
-                recommended_app = RecommendedApp(
-                    app_id=app.id,
-                    description=desc,
-                    copyright=copy_right,
-                    privacy_policy=privacy_policy,
-                    custom_disclaimer=custom_disclaimer,
-                    language=payload.language,
-                    category=payload.category,
-                    position=payload.position,
-                )
-
-                db.session.add(recommended_app)
-                if payload.can_trial:
-                    trial_app = db.session.execute(
-                        select(TrialApp).where(TrialApp.app_id == payload.app_id)
-                    ).scalar_one_or_none()
-                    if not trial_app:
-                        db.session.add(
-                            TrialApp(
-                                app_id=payload.app_id,
-                                tenant_id=app.tenant_id,
-                                trial_limit=payload.trial_limit,
-                            )
-                        )
-                    else:
-                        trial_app.trial_limit = payload.trial_limit
-
-                app.is_public = True
-                db.session.commit()
-
-                return {"result": "success"}, 201
-            else:
-                recommended_app.description = desc
-                recommended_app.copyright = copy_right
-                recommended_app.privacy_policy = privacy_policy
-                recommended_app.custom_disclaimer = custom_disclaimer
-                recommended_app.language = payload.language
-                recommended_app.category = payload.category
-                recommended_app.position = payload.position
-
-                if payload.can_trial:
-                    trial_app = db.session.execute(
-                        select(TrialApp).where(TrialApp.app_id == payload.app_id)
-                    ).scalar_one_or_none()
-                    if not trial_app:
-                        db.session.add(
-                            TrialApp(
-                                app_id=payload.app_id,
-                                tenant_id=app.tenant_id,
-                                trial_limit=payload.trial_limit,
-                            )
-                        )
-                    else:
-                        trial_app.trial_limit = payload.trial_limit
-                app.is_public = True
-
-                db.session.commit()
-
-                return {"result": "success"}, 200
-
-
-@console_ns.route("/admin/insert-explore-apps/<uuid:app_id>")
-class InsertExploreAppApi(Resource):
-    @console_ns.doc("delete_explore_app")
-    @console_ns.doc(description="Remove an app from the explore list")
-    @console_ns.doc(params={"app_id": "Application ID to remove"})
-    @console_ns.response(204, "App removed successfully")
-    @only_edition_cloud
-    @admin_required
-    def delete(self, app_id):
-        with session_factory.create_session() as session:
-            recommended_app = session.execute(
-                select(RecommendedApp).where(RecommendedApp.app_id == str(app_id))
-            ).scalar_one_or_none()
-
-        if not recommended_app:
-            return {"result": "success"}, 204
-
-        with session_factory.create_session() as session:
-            app = session.execute(select(App).where(App.id == recommended_app.app_id)).scalar_one_or_none()
-
-        if app:
-            app.is_public = False
-
-        with session_factory.create_session() as session:
-            installed_apps = (
-                session.execute(
-                    select(InstalledApp).where(
-                        InstalledApp.app_id == recommended_app.app_id,
-                        InstalledApp.tenant_id != InstalledApp.app_owner_tenant_id,
-                    )
-                )
-                .scalars()
-                .all()
-            )
-
-            for installed_app in installed_apps:
-                session.delete(installed_app)
-
-            trial_app = session.execute(
-                select(TrialApp).where(TrialApp.app_id == recommended_app.app_id)
-            ).scalar_one_or_none()
-            if trial_app:
-                session.delete(trial_app)
-
-        db.session.delete(recommended_app)
-        db.session.commit()
-
-        return {"result": "success"}, 204
-
-
-@console_ns.route("/admin/insert-explore-banner")
-class InsertExploreBannerApi(Resource):
-    @console_ns.doc("insert_explore_banner")
-    @console_ns.doc(description="Insert an explore banner")
-    @console_ns.expect(console_ns.models[InsertExploreBannerPayload.__name__])
-    @console_ns.response(201, "Banner inserted successfully")
-    @only_edition_cloud
-    @admin_required
-    def post(self):
-        payload = InsertExploreBannerPayload.model_validate(console_ns.payload)
-
-        banner = ExporleBanner(
-            content={
-                "category": payload.category,
-                "title": payload.title,
-                "description": payload.description,
-                "img-src": payload.img_src,
-            },
-            link=payload.link,
-            sort=payload.sort,
-            language=payload.language,
-        )
-        db.session.add(banner)
-        db.session.commit()
-
-        return {"result": "success"}, 201
-
-
-@console_ns.route("/admin/delete-explore-banner/<uuid:banner_id>")
-class DeleteExploreBannerApi(Resource):
-    @console_ns.doc("delete_explore_banner")
-    @console_ns.doc(description="Delete an explore banner")
-    @console_ns.doc(params={"banner_id": "Banner ID to delete"})
-    @console_ns.response(204, "Banner deleted successfully")
-    @only_edition_cloud
-    @admin_required
-    def delete(self, banner_id):
-        banner = db.session.execute(select(ExporleBanner).where(ExporleBanner.id == banner_id)).scalar_one_or_none()
-        if not banner:
-            raise NotFound(f"Banner '{banner_id}' is not found")
-
-        db.session.delete(banner)
-        db.session.commit()
-
-        return {"result": "success"}, 204
-
-
-class LangContentPayload(BaseModel):
-    lang: str = Field(..., description="Language tag: 'zh' | 'en' | 'jp'")
-    title: str = Field(...)
-    subtitle: str | None = Field(default=None)
-    body: str = Field(...)
-    title_pic_url: str | None = Field(default=None)
-
-
-class UpsertNotificationPayload(BaseModel):
-    notification_id: str | None = Field(default=None, description="Omit to create; supply UUID to update")
-    contents: list[LangContentPayload] = Field(..., min_length=1)
-    start_time: str | None = Field(default=None, description="RFC3339, e.g. 2026-03-01T00:00:00Z")
-    end_time: str | None = Field(default=None, description="RFC3339, e.g. 2026-03-20T23:59:59Z")
-    frequency: str = Field(default="once", description="'once' | 'every_page_load'")
-    status: str = Field(default="active", description="'active' | 'inactive'")
-
-
-class BatchAddNotificationAccountsPayload(BaseModel):
-    notification_id: str = Field(...)
-    user_email: list[str] = Field(..., description="List of account email addresses")
-
-
-console_ns.schema_model(
-    UpsertNotificationPayload.__name__,
-    UpsertNotificationPayload.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
-)
-
-console_ns.schema_model(
-    BatchAddNotificationAccountsPayload.__name__,
-    BatchAddNotificationAccountsPayload.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
-)
-
-
-@console_ns.route("/admin/upsert_notification")
-class UpsertNotificationApi(Resource):
-    @console_ns.doc("upsert_notification")
-    @console_ns.doc(
-        description=(
-            "Create or update an in-product notification. "
-            "Supply notification_id to update an existing one; omit it to create a new one. "
-            "Pass at least one language variant in contents (zh / en / jp)."
-        )
-    )
-    @console_ns.expect(console_ns.models[UpsertNotificationPayload.__name__])
-    @console_ns.response(200, "Notification upserted successfully")
-    @only_edition_cloud
-    @admin_required
-    def post(self):
-        payload = UpsertNotificationPayload.model_validate(console_ns.payload)
-        result = BillingService.upsert_notification(
-            contents=[cast(LangContentDict, c.model_dump()) for c in payload.contents],
-            frequency=payload.frequency,
-            status=payload.status,
-            notification_id=payload.notification_id,
-            start_time=payload.start_time,
-            end_time=payload.end_time,
-        )
-        return {"result": "success", "notification_id": result.get("notificationId")}, 200
-
-
-@console_ns.route("/admin/batch_add_notification_accounts")
-class BatchAddNotificationAccountsApi(Resource):
-    @console_ns.doc("batch_add_notification_accounts")
-    @console_ns.doc(
-        description=(
-            "Register target accounts for a notification by email address. "
-            'JSON body: {"notification_id": "...", "user_email": ["a@example.com", ...]}. '
-            "File upload: multipart/form-data with a 'file' field (CSV or TXT, one email per line) "
-            "plus a 'notification_id' field. "
-            "Emails that do not match any account are silently skipped."
-        )
-    )
-    @console_ns.response(200, "Accounts added successfully")
-    @only_edition_cloud
-    @admin_required
-    def post(self):
-        from models.account import Account
-
-        if "file" in request.files:
-            notification_id = request.form.get("notification_id", "").strip()
-            if not notification_id:
-                raise BadRequest("notification_id is required.")
-            emails = self._parse_emails_from_file()
-        else:
-            payload = BatchAddNotificationAccountsPayload.model_validate(console_ns.payload)
-            notification_id = payload.notification_id
-            emails = payload.user_email
-
-        if not emails:
-            raise BadRequest("No valid email addresses provided.")
-
-        # Resolve emails → account IDs in chunks to avoid large IN-clause
-        account_ids: list[str] = []
-        chunk_size = 500
-        for i in range(0, len(emails), chunk_size):
-            chunk = emails[i : i + chunk_size]
-            rows = db.session.execute(select(Account.id, Account.email).where(Account.email.in_(chunk))).all()
-            account_ids.extend(str(row.id) for row in rows)
-
-        if not account_ids:
-            raise BadRequest("None of the provided emails matched an existing account.")
-
-        # Send to dify-saas in batches of 1000
-        total_count = 0
-        batch_size = 1000
-        for i in range(0, len(account_ids), batch_size):
-            batch = account_ids[i : i + batch_size]
-            result = BillingService.batch_add_notification_accounts(
-                notification_id=notification_id,
-                account_ids=batch,
-            )
-            total_count += result.get("count", 0)
-
-        return {
-            "result": "success",
-            "emails_provided": len(emails),
-            "accounts_matched": len(account_ids),
-            "count": total_count,
-        }, 200
-
-    @staticmethod
-    def _parse_emails_from_file() -> list[str]:
-        """Parse email addresses from an uploaded CSV or TXT file."""
-        file = request.files["file"]
-        if not file.filename:
-            raise BadRequest("Uploaded file has no filename.")
-
-        filename_lower = file.filename.lower()
-        if not filename_lower.endswith((".csv", ".txt")):
-            raise BadRequest("Invalid file type. Only CSV (.csv) and TXT (.txt) files are allowed.")
-
-        try:
-            content = file.read().decode("utf-8")
-        except UnicodeDecodeError:
-            try:
-                file.seek(0)
-                content = file.read().decode("gbk")
-            except UnicodeDecodeError:
-                raise BadRequest("Unable to decode the file. Please use UTF-8 or GBK encoding.")
-
-        emails: list[str] = []
-        if filename_lower.endswith(".csv"):
-            reader = csv.reader(io.StringIO(content))
-            for row in reader:
-                for cell in row:
-                    cell = cell.strip()
-                    if cell:
-                        emails.append(cell)
-        else:
-            for line in content.splitlines():
-                line = line.strip()
-                if line:
-                    emails.append(line)
-
-        # Deduplicate while preserving order
-        seen: set[str] = set()
-        unique_emails: list[str] = []
-        for email in emails:
-            if email.lower() not in seen:
-                seen.add(email.lower())
-                unique_emails.append(email)
-
-        return unique_emails
diff --git a/api/controllers/console/apikey.py b/api/controllers/console/apikey.py
index b03d9b4a4c..6463b022b5 100644
--- a/api/controllers/console/apikey.py
+++ b/api/controllers/console/apikey.py
@@ -11,6 +11,7 @@ from werkzeug.exceptions import Forbidden
 from controllers.common.schema import register_schema_models
 from extensions.ext_database import db
 from fields.base import ResponseModel
+from libs.helper import to_timestamp
 from libs.login import current_account_with_tenant, login_required
 from models.dataset import Dataset
 from models.enums import ApiTokenType
@@ -21,12 +22,6 @@ from . import console_ns
 from .wraps import account_initialization_required, edit_permission_required, setup_required
 
 
-def _to_timestamp(value: datetime | int | None) -> int | None:
-    if isinstance(value, datetime):
-        return int(value.timestamp())
-    return value
-
-
 class ApiKeyItem(ResponseModel):
     id: str
     type: str
@@ -37,7 +32,7 @@ class ApiKeyItem(ResponseModel):
     @field_validator("last_used_at", "created_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 class ApiKeyList(ResponseModel):
diff --git a/api/controllers/console/app/advanced_prompt_template.py b/api/controllers/console/app/advanced_prompt_template.py
index ed66da1be5..ad21671176 100644
--- a/api/controllers/console/app/advanced_prompt_template.py
+++ b/api/controllers/console/app/advanced_prompt_template.py
@@ -34,7 +34,7 @@ class AdvancedPromptTemplateList(Resource):
     @login_required
     @account_initialization_required
     def get(self):
-        args = AdvancedPromptTemplateQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = AdvancedPromptTemplateQuery.model_validate(request.args.to_dict(flat=True))
         prompt_args: AdvancedPromptTemplateArgs = {
             "app_mode": args.app_mode,
             "model_mode": args.model_mode,
diff --git a/api/controllers/console/app/agent.py b/api/controllers/console/app/agent.py
index cfdb9cf417..c05600ced5 100644
--- a/api/controllers/console/app/agent.py
+++ b/api/controllers/console/app/agent.py
@@ -2,6 +2,7 @@ from flask import request
 from flask_restx import Resource, fields
 from pydantic import BaseModel, Field, field_validator
 
+from controllers.common.schema import register_schema_models
 from controllers.console import console_ns
 from controllers.console.app.wraps import get_app_model
 from controllers.console.wraps import account_initialization_required, setup_required
@@ -10,8 +11,6 @@ from libs.login import login_required
 from models.model import AppMode
 from services.agent_service import AgentService
 
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
-
 
 class AgentLogQuery(BaseModel):
     message_id: str = Field(..., description="Message UUID")
@@ -23,9 +22,7 @@ class AgentLogQuery(BaseModel):
         return uuid_value(value)
 
 
-console_ns.schema_model(
-    AgentLogQuery.__name__, AgentLogQuery.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0)
-)
+register_schema_models(console_ns, AgentLogQuery)
 
 
 @console_ns.route("/apps/<uuid:app_id>/agent/logs")
@@ -44,6 +41,6 @@ class AgentLogApi(Resource):
     @get_app_model(mode=[AppMode.AGENT_CHAT])
     def get(self, app_model):
         """Get agent logs"""
-        args = AgentLogQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = AgentLogQuery.model_validate(request.args.to_dict(flat=True))
 
         return AgentService.get_agent_logs(app_model, args.conversation_id, args.message_id)
diff --git a/api/controllers/console/app/annotation.py b/api/controllers/console/app/annotation.py
index 528785931e..cfeaec4af9 100644
--- a/api/controllers/console/app/annotation.py
+++ b/api/controllers/console/app/annotation.py
@@ -1,4 +1,5 @@
 from typing import Any, Literal
+from uuid import UUID
 
 from flask import abort, make_response, request
 from flask_restx import Resource
@@ -33,8 +34,6 @@ from services.annotation_service import (
     UpsertAnnotationArgs,
 )
 
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
-
 
 class AnnotationReplyPayload(BaseModel):
     score_threshold: float = Field(..., description="Score threshold for annotation matching")
@@ -87,17 +86,6 @@ class AnnotationFilePayload(BaseModel):
         return uuid_value(value)
 
 
-def reg(model: type[BaseModel]) -> None:
-    console_ns.schema_model(model.__name__, model.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0))
-
-
-reg(AnnotationReplyPayload)
-reg(AnnotationSettingUpdatePayload)
-reg(AnnotationListQuery)
-reg(CreateAnnotationPayload)
-reg(UpdateAnnotationPayload)
-reg(AnnotationReplyStatusQuery)
-reg(AnnotationFilePayload)
 register_schema_models(
     console_ns,
     Annotation,
@@ -105,6 +93,13 @@ register_schema_models(
     AnnotationExportList,
     AnnotationHitHistory,
     AnnotationHitHistoryList,
+    AnnotationReplyPayload,
+    AnnotationSettingUpdatePayload,
+    AnnotationListQuery,
+    CreateAnnotationPayload,
+    UpdateAnnotationPayload,
+    AnnotationReplyStatusQuery,
+    AnnotationFilePayload,
 )
 
 
@@ -121,8 +116,7 @@ class AnnotationReplyActionApi(Resource):
     @account_initialization_required
     @cloud_edition_billing_resource_check("annotation")
     @edit_permission_required
-    def post(self, app_id, action: Literal["enable", "disable"]):
-        app_id = str(app_id)
+    def post(self, app_id: UUID, action: Literal["enable", "disable"]):
         args = AnnotationReplyPayload.model_validate(console_ns.payload)
         match action:
             case "enable":
@@ -131,9 +125,9 @@ class AnnotationReplyActionApi(Resource):
                     "embedding_provider_name": args.embedding_provider_name,
                     "embedding_model_name": args.embedding_model_name,
                 }
-                result = AppAnnotationService.enable_app_annotation(enable_args, app_id)
+                result = AppAnnotationService.enable_app_annotation(enable_args, str(app_id))
             case "disable":
-                result = AppAnnotationService.disable_app_annotation(app_id)
+                result = AppAnnotationService.disable_app_annotation(str(app_id))
         return result, 200
 
 
@@ -148,9 +142,8 @@ class AppAnnotationSettingDetailApi(Resource):
     @login_required
     @account_initialization_required
     @edit_permission_required
-    def get(self, app_id):
-        app_id = str(app_id)
-        result = AppAnnotationService.get_app_annotation_setting_by_app_id(app_id)
+    def get(self, app_id: UUID):
+        result = AppAnnotationService.get_app_annotation_setting_by_app_id(str(app_id))
         return result, 200
 
 
@@ -166,14 +159,13 @@ class AppAnnotationSettingUpdateApi(Resource):
     @login_required
     @account_initialization_required
     @edit_permission_required
-    def post(self, app_id, annotation_setting_id):
-        app_id = str(app_id)
+    def post(self, app_id: UUID, annotation_setting_id):
         annotation_setting_id = str(annotation_setting_id)
 
         args = AnnotationSettingUpdatePayload.model_validate(console_ns.payload)
 
         setting_args: UpdateAnnotationSettingArgs = {"score_threshold": args.score_threshold}
-        result = AppAnnotationService.update_app_annotation_setting(app_id, annotation_setting_id, setting_args)
+        result = AppAnnotationService.update_app_annotation_setting(str(app_id), annotation_setting_id, setting_args)
         return result, 200
 
 
@@ -189,7 +181,7 @@ class AnnotationReplyActionStatusApi(Resource):
     @account_initialization_required
     @cloud_edition_billing_resource_check("annotation")
     @edit_permission_required
-    def get(self, app_id, job_id, action):
+    def get(self, app_id: UUID, job_id, action):
         job_id = str(job_id)
         app_annotation_job_key = f"{action}_app_annotation_job_{str(job_id)}"
         cache_result = redis_client.get(app_annotation_job_key)
@@ -217,14 +209,13 @@ class AnnotationApi(Resource):
     @login_required
     @account_initialization_required
     @edit_permission_required
-    def get(self, app_id):
-        args = AnnotationListQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+    def get(self, app_id: UUID):
+        args = AnnotationListQuery.model_validate(request.args.to_dict(flat=True))
         page = args.page
         limit = args.limit
         keyword = args.keyword
 
-        app_id = str(app_id)
-        annotation_list, total = AppAnnotationService.get_annotation_list_by_app_id(app_id, page, limit, keyword)
+        annotation_list, total = AppAnnotationService.get_annotation_list_by_app_id(str(app_id), page, limit, keyword)
         annotation_models = TypeAdapter(list[Annotation]).validate_python(annotation_list, from_attributes=True)
         response = AnnotationList(
             data=annotation_models,
@@ -246,8 +237,7 @@ class AnnotationApi(Resource):
     @account_initialization_required
     @cloud_edition_billing_resource_check("annotation")
     @edit_permission_required
-    def post(self, app_id):
-        app_id = str(app_id)
+    def post(self, app_id: UUID):
         args = CreateAnnotationPayload.model_validate(console_ns.payload)
         upsert_args: UpsertAnnotationArgs = {}
         if args.answer is not None:
@@ -258,15 +248,14 @@ class AnnotationApi(Resource):
             upsert_args["message_id"] = args.message_id
         if args.question is not None:
             upsert_args["question"] = args.question
-        annotation = AppAnnotationService.up_insert_app_annotation_from_message(upsert_args, app_id)
+        annotation = AppAnnotationService.up_insert_app_annotation_from_message(upsert_args, str(app_id))
         return Annotation.model_validate(annotation, from_attributes=True).model_dump(mode="json")
 
     @setup_required
     @login_required
     @account_initialization_required
     @edit_permission_required
-    def delete(self, app_id):
-        app_id = str(app_id)
+    def delete(self, app_id: UUID):
 
         # Use request.args.getlist to get annotation_ids array directly
         annotation_ids = request.args.getlist("annotation_id")
@@ -280,11 +269,11 @@ class AnnotationApi(Resource):
                     "message": "annotation_ids are required if the parameter is provided.",
                 }, 400
 
-            result = AppAnnotationService.delete_app_annotations_in_batch(app_id, annotation_ids)
+            result = AppAnnotationService.delete_app_annotations_in_batch(str(app_id), annotation_ids)
             return result, 204
         # If no annotation_ids are provided, handle clearing all annotations
         else:
-            AppAnnotationService.clear_all_annotations(app_id)
+            AppAnnotationService.clear_all_annotations(str(app_id))
             return {"result": "success"}, 204
 
 
@@ -303,9 +292,8 @@ class AnnotationExportApi(Resource):
     @login_required
     @account_initialization_required
     @edit_permission_required
-    def get(self, app_id):
-        app_id = str(app_id)
-        annotation_list = AppAnnotationService.export_annotation_list_by_app_id(app_id)
+    def get(self, app_id: UUID):
+        annotation_list = AppAnnotationService.export_annotation_list_by_app_id(str(app_id))
         annotation_models = TypeAdapter(list[Annotation]).validate_python(annotation_list, from_attributes=True)
         response_data = AnnotationExportList(data=annotation_models).model_dump(mode="json")
 
@@ -331,26 +319,22 @@ class AnnotationUpdateDeleteApi(Resource):
     @account_initialization_required
     @cloud_edition_billing_resource_check("annotation")
     @edit_permission_required
-    def post(self, app_id, annotation_id):
-        app_id = str(app_id)
-        annotation_id = str(annotation_id)
+    def post(self, app_id: UUID, annotation_id: UUID):
         args = UpdateAnnotationPayload.model_validate(console_ns.payload)
         update_args: UpdateAnnotationArgs = {}
         if args.answer is not None:
             update_args["answer"] = args.answer
         if args.question is not None:
             update_args["question"] = args.question
-        annotation = AppAnnotationService.update_app_annotation_directly(update_args, app_id, annotation_id)
+        annotation = AppAnnotationService.update_app_annotation_directly(update_args, str(app_id), str(annotation_id))
         return Annotation.model_validate(annotation, from_attributes=True).model_dump(mode="json")
 
     @setup_required
     @login_required
     @account_initialization_required
     @edit_permission_required
-    def delete(self, app_id, annotation_id):
-        app_id = str(app_id)
-        annotation_id = str(annotation_id)
-        AppAnnotationService.delete_app_annotation(app_id, annotation_id)
+    def delete(self, app_id: UUID, annotation_id: UUID):
+        AppAnnotationService.delete_app_annotation(str(app_id), str(annotation_id))
         return {"result": "success"}, 204
 
 
@@ -371,11 +355,9 @@ class AnnotationBatchImportApi(Resource):
     @annotation_import_rate_limit
     @annotation_import_concurrency_limit
     @edit_permission_required
-    def post(self, app_id):
+    def post(self, app_id: UUID):
         from configs import dify_config
 
-        app_id = str(app_id)
-
         # check file
         if "file" not in request.files:
             raise NoFileUploadedError()
@@ -391,9 +373,9 @@ class AnnotationBatchImportApi(Resource):
             raise ValueError("Invalid file type. Only CSV files are allowed")
 
         # Check file size before processing
-        file.seek(0, 2)  # Seek to end of file
-        file_size = file.tell()
-        file.seek(0)  # Reset to beginning
+        file.stream.seek(0, 2)  # Seek to end of file
+        file_size = file.stream.tell()
+        file.stream.seek(0)  # Reset to beginning
 
         max_size_bytes = dify_config.ANNOTATION_IMPORT_FILE_SIZE_LIMIT * 1024 * 1024
         if file_size > max_size_bytes:
@@ -406,7 +388,7 @@ class AnnotationBatchImportApi(Resource):
         if file_size == 0:
             raise ValueError("The uploaded file is empty")
 
-        return AppAnnotationService.batch_import_app_annotations(app_id, file)
+        return AppAnnotationService.batch_import_app_annotations(str(app_id), file)
 
 
 @console_ns.route("/apps/<uuid:app_id>/annotations/batch-import-status/<uuid:job_id>")
@@ -421,8 +403,7 @@ class AnnotationBatchImportStatusApi(Resource):
     @account_initialization_required
     @cloud_edition_billing_resource_check("annotation")
     @edit_permission_required
-    def get(self, app_id, job_id):
-        job_id = str(job_id)
+    def get(self, app_id: UUID, job_id: UUID):
         indexing_cache_key = f"app_annotation_batch_import_{str(job_id)}"
         cache_result = redis_client.get(indexing_cache_key)
         if cache_result is None:
@@ -456,13 +437,11 @@ class AnnotationHitHistoryListApi(Resource):
     @login_required
     @account_initialization_required
     @edit_permission_required
-    def get(self, app_id, annotation_id):
+    def get(self, app_id: UUID, annotation_id: UUID):
         page = request.args.get("page", default=1, type=int)
         limit = request.args.get("limit", default=20, type=int)
-        app_id = str(app_id)
-        annotation_id = str(annotation_id)
         annotation_hit_history_list, total = AppAnnotationService.get_annotation_hit_histories(
-            app_id, annotation_id, page, limit
+            str(app_id), str(annotation_id), page, limit
         )
         history_models = TypeAdapter(list[AnnotationHitHistory]).validate_python(
             annotation_hit_history_list, from_attributes=True
diff --git a/api/controllers/console/app/app.py b/api/controllers/console/app/app.py
index a736fc8bc8..045325f283 100644
--- a/api/controllers/console/app/app.py
+++ b/api/controllers/console/app/app.py
@@ -1,4 +1,5 @@
 import logging
+import re
 import uuid
 from datetime import datetime
 from typing import Any, Literal
@@ -8,6 +9,7 @@ from flask_restx import Resource
 from pydantic import AliasChoices, BaseModel, Field, computed_field, field_validator
 from sqlalchemy import select
 from sqlalchemy.orm import Session
+from werkzeug.datastructures import MultiDict
 from werkzeug.exceptions import BadRequest
 
 from controllers.common.helpers import FileInfo
@@ -23,6 +25,7 @@ from controllers.console.wraps import (
     is_admin_or_owner_required,
     setup_required,
 )
+from core.db.session_factory import session_factory
 from core.ops.ops_trace_manager import OpsTraceManager
 from core.rag.entities import PreProcessingRule, Rule, Segmentation
 from core.rag.retrieval.retrieval_methods import RetrievalMethod
@@ -30,12 +33,12 @@ from core.trigger.constants import TRIGGER_NODE_TYPES
 from extensions.ext_database import db
 from fields.base import ResponseModel
 from graphon.enums import WorkflowExecutionStatus
-from libs.helper import build_icon_url
+from libs.helper import build_icon_url, to_timestamp
 from libs.login import current_account_with_tenant, login_required
 from models import App, DatasetPermissionEnum, Workflow
 from models.model import IconType
 from services.app_dsl_service import AppDslService
-from services.app_service import AppService
+from services.app_service import AppListParams, AppService, CreateAppParams
 from services.enterprise.enterprise_service import EnterpriseService
 from services.entities.dsl_entities import ImportMode, ImportStatus
 from services.entities.knowledge_entities.knowledge_entities import (
@@ -57,6 +60,7 @@ ALLOW_CREATE_APP_MODES = ["chat", "agent-chat", "advanced-chat", "workflow", "co
 register_enum_models(console_ns, IconType)
 
 _logger = logging.getLogger(__name__)
+_TAG_IDS_BRACKET_PATTERN = re.compile(r"^tag_ids\[(\d+)\]$")
 
 
 class AppListQuery(BaseModel):
@@ -66,22 +70,19 @@ class AppListQuery(BaseModel):
         default="all", description="App mode filter"
     )
     name: str | None = Field(default=None, description="Filter by app name")
-    tag_ids: list[str] | None = Field(default=None, description="Comma-separated tag IDs")
+    tag_ids: list[str] | None = Field(default=None, description="Filter by tag IDs")
     is_created_by_me: bool | None = Field(default=None, description="Filter by creator")
 
     @field_validator("tag_ids", mode="before")
     @classmethod
-    def validate_tag_ids(cls, value: str | list[str] | None) -> list[str] | None:
+    def validate_tag_ids(cls, value: list[str] | None) -> list[str] | None:
         if not value:
             return None
 
-        if isinstance(value, str):
-            items = [item.strip() for item in value.split(",") if item.strip()]
-        elif isinstance(value, list):
-            items = [str(item).strip() for item in value if item and str(item).strip()]
-        else:
-            raise TypeError("Unsupported tag_ids type.")
+        if not isinstance(value, list):
+            raise ValueError("Unsupported tag_ids type.")
 
+        items = [str(item).strip() for item in value if item and str(item).strip()]
         if not items:
             return None
 
@@ -91,6 +92,26 @@ class AppListQuery(BaseModel):
             raise ValueError("Invalid UUID format in tag_ids.") from exc
 
 
+def _normalize_app_list_query_args(query_args: MultiDict[str, str]) -> dict[str, str | list[str]]:
+    normalized: dict[str, str | list[str]] = {}
+    indexed_tag_ids: list[tuple[int, str]] = []
+
+    for key in query_args:
+        match = _TAG_IDS_BRACKET_PATTERN.fullmatch(key)
+        if match:
+            indexed_tag_ids.extend((int(match.group(1)), value) for value in query_args.getlist(key))
+            continue
+
+        value = query_args.get(key)
+        if value is not None:
+            normalized[key] = value
+
+    if indexed_tag_ids:
+        normalized["tag_ids"] = [value for _, value in sorted(indexed_tag_ids)]
+
+    return normalized
+
+
 class CreateAppPayload(BaseModel):
     name: str = Field(..., min_length=1, description="App name")
     description: str | None = Field(default=None, description="App description (max 400 chars)", max_length=400)
@@ -156,12 +177,6 @@ class AppTracePayload(BaseModel):
 type JSONValue = Any
 
 
-def _to_timestamp(value: datetime | int | None) -> int | None:
-    if isinstance(value, datetime):
-        return int(value.timestamp())
-    return value
-
-
 class Tag(ResponseModel):
     id: str
     name: str
@@ -178,7 +193,7 @@ class WorkflowPartial(ResponseModel):
     @field_validator("created_at", "updated_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 class ModelConfigPartial(ResponseModel):
@@ -192,7 +207,7 @@ class ModelConfigPartial(ResponseModel):
     @field_validator("created_at", "updated_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 class ModelConfig(ResponseModel):
@@ -253,7 +268,7 @@ class ModelConfig(ResponseModel):
     @field_validator("created_at", "updated_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 class Site(ResponseModel):
@@ -296,7 +311,7 @@ class Site(ResponseModel):
     @field_validator("created_at", "updated_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 class DeletedTool(ResponseModel):
@@ -339,7 +354,7 @@ class AppPartial(ResponseModel):
     @field_validator("created_at", "updated_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 class AppDetail(ResponseModel):
@@ -369,7 +384,7 @@ class AppDetail(ResponseModel):
     @field_validator("created_at", "updated_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 class AppDetailWithSite(AppDetail):
@@ -455,12 +470,19 @@ class AppListApi(Resource):
         """Get app list"""
         current_user, current_tenant_id = current_account_with_tenant()
 
-        args = AppListQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
-        args_dict = args.model_dump()
+        args = AppListQuery.model_validate(_normalize_app_list_query_args(request.args))
+        params = AppListParams(
+            page=args.page,
+            limit=args.limit,
+            mode=args.mode,
+            name=args.name,
+            tag_ids=args.tag_ids,
+            is_created_by_me=args.is_created_by_me,
+        )
 
         # get app list
         app_service = AppService()
-        app_pagination = app_service.get_paginate_apps(current_user.id, current_tenant_id, args_dict)
+        app_pagination = app_service.get_paginate_apps(current_user.id, current_tenant_id, params)
         if not app_pagination:
             empty = AppPagination(page=args.page, limit=args.limit, total=0, has_more=False, data=[])
             return empty.model_dump(mode="json"), 200
@@ -524,9 +546,17 @@ class AppListApi(Resource):
         """Create app"""
         current_user, current_tenant_id = current_account_with_tenant()
         args = CreateAppPayload.model_validate(console_ns.payload)
+        params = CreateAppParams(
+            name=args.name,
+            description=args.description,
+            mode=args.mode,
+            icon_type=args.icon_type,
+            icon=args.icon,
+            icon_background=args.icon_background,
+        )
 
         app_service = AppService()
-        app = app_service.create_app(current_tenant_id, args.model_dump(), current_user)
+        app = app_service.create_app(current_tenant_id, params, current_user)
         app_detail = AppDetail.model_validate(app, from_attributes=True)
         return app_detail.model_dump(mode="json"), 201
 
@@ -680,7 +710,7 @@ class AppExportApi(Resource):
     @edit_permission_required
     def get(self, app_model):
         """Export app"""
-        args = AppExportQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = AppExportQuery.model_validate(request.args.to_dict(flat=True))
 
         payload = AppExportResponse(
             data=AppDslService.export_dsl(
@@ -819,9 +849,11 @@ class AppTraceApi(Resource):
     @setup_required
     @login_required
     @account_initialization_required
-    def get(self, app_id):
+    @get_app_model
+    def get(self, app_model):
         """Get app trace"""
-        app_trace_config = OpsTraceManager.get_app_tracing_config(app_id=app_id)
+        with session_factory.create_session() as session:
+            app_trace_config = OpsTraceManager.get_app_tracing_config(app_model.id, session)
 
         return app_trace_config
 
@@ -835,12 +867,13 @@ class AppTraceApi(Resource):
     @login_required
     @account_initialization_required
     @edit_permission_required
-    def post(self, app_id):
+    @get_app_model
+    def post(self, app_model):
         # add app trace
         args = AppTracePayload.model_validate(console_ns.payload)
 
         OpsTraceManager.update_app_tracing_config(
-            app_id=app_id,
+            app_id=app_model.id,
             enabled=args.enabled,
             tracing_provider=args.tracing_provider,
         )
diff --git a/api/controllers/console/app/app_import.py b/api/controllers/console/app/app_import.py
index e91dc9cfe5..b653016319 100644
--- a/api/controllers/console/app/app_import.py
+++ b/api/controllers/console/app/app_import.py
@@ -2,7 +2,7 @@ from flask_restx import Resource
 from pydantic import BaseModel, Field
 from sqlalchemy.orm import Session
 
-from controllers.common.schema import register_schema_models
+from controllers.common.schema import register_enum_models, register_schema_models
 from controllers.console.app.wraps import get_app_model
 from controllers.console.wraps import (
     account_initialization_required,
@@ -33,6 +33,7 @@ class AppImportPayload(BaseModel):
     app_id: str | None = Field(None)
 
 
+register_enum_models(console_ns, ImportStatus)
 register_schema_models(console_ns, AppImportPayload, Import, CheckDependenciesResult)
 
 
diff --git a/api/controllers/console/app/audio.py b/api/controllers/console/app/audio.py
index 91fbe4a85a..5b673f3394 100644
--- a/api/controllers/console/app/audio.py
+++ b/api/controllers/console/app/audio.py
@@ -173,7 +173,7 @@ class TextModesApi(Resource):
     @account_initialization_required
     def get(self, app_model):
         try:
-            args = TextToSpeechVoiceQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+            args = TextToSpeechVoiceQuery.model_validate(request.args.to_dict(flat=True))
 
             response = AudioService.transcript_tts_voices(
                 tenant_id=app_model.tenant_id,
diff --git a/api/controllers/console/app/completion.py b/api/controllers/console/app/completion.py
index fe274e4c9a..6a20296cff 100644
--- a/api/controllers/console/app/completion.py
+++ b/api/controllers/console/app/completion.py
@@ -7,6 +7,7 @@ from pydantic import BaseModel, Field, field_validator
 from werkzeug.exceptions import InternalServerError, NotFound
 
 import services
+from controllers.common.schema import register_schema_models
 from controllers.console import console_ns
 from controllers.console.app.error import (
     AppUnavailableError,
@@ -37,7 +38,6 @@ from services.app_task_service import AppTaskService
 from services.errors.llm import InvokeRateLimitError
 
 logger = logging.getLogger(__name__)
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
 
 
 class BaseMessagePayload(BaseModel):
@@ -65,13 +65,7 @@ class ChatMessagePayload(BaseMessagePayload):
         return uuid_value(value)
 
 
-console_ns.schema_model(
-    CompletionMessagePayload.__name__,
-    CompletionMessagePayload.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
-)
-console_ns.schema_model(
-    ChatMessagePayload.__name__, ChatMessagePayload.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0)
-)
+register_schema_models(console_ns, CompletionMessagePayload, ChatMessagePayload)
 
 
 # define completion message api for user
diff --git a/api/controllers/console/app/conversation.py b/api/controllers/console/app/conversation.py
index b2b1049f0c..c7347933cb 100644
--- a/api/controllers/console/app/conversation.py
+++ b/api/controllers/console/app/conversation.py
@@ -39,8 +39,6 @@ from models.model import AppMode
 from services.conversation_service import ConversationService
 from services.errors.conversation import ConversationNotExistsError
 
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
-
 
 class BaseConversationQuery(BaseModel):
     keyword: str | None = Field(default=None, description="Search keyword")
@@ -70,15 +68,6 @@ class ChatConversationQuery(BaseConversationQuery):
     )
 
 
-console_ns.schema_model(
-    CompletionConversationQuery.__name__,
-    CompletionConversationQuery.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
-)
-console_ns.schema_model(
-    ChatConversationQuery.__name__,
-    ChatConversationQuery.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
-)
-
 register_schema_models(
     console_ns,
     CompletionConversationQuery,
@@ -89,6 +78,8 @@ register_schema_models(
     ConversationWithSummaryPaginationResponse,
     ConversationDetailResponse,
     ResultResponse,
+    CompletionConversationQuery,
+    ChatConversationQuery,
 )
 
 
@@ -107,7 +98,7 @@ class CompletionConversationApi(Resource):
     @edit_permission_required
     def get(self, app_model):
         current_user, _ = current_account_with_tenant()
-        args = CompletionConversationQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = CompletionConversationQuery.model_validate(request.args.to_dict(flat=True))
 
         query = sa.select(Conversation).where(
             Conversation.app_id == app_model.id, Conversation.mode == "completion", Conversation.is_deleted.is_(False)
@@ -221,7 +212,7 @@ class ChatConversationApi(Resource):
     @edit_permission_required
     def get(self, app_model):
         current_user, _ = current_account_with_tenant()
-        args = ChatConversationQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = ChatConversationQuery.model_validate(request.args.to_dict(flat=True))
 
         subquery = (
             sa.select(Conversation.id.label("conversation_id"), EndUser.session_id.label("from_end_user_session_id"))
diff --git a/api/controllers/console/app/conversation_variables.py b/api/controllers/console/app/conversation_variables.py
index 9c8b095b9f..5951f7405a 100644
--- a/api/controllers/console/app/conversation_variables.py
+++ b/api/controllers/console/app/conversation_variables.py
@@ -16,6 +16,7 @@ from controllers.console.wraps import account_initialization_required, setup_req
 from extensions.ext_database import db
 from fields._value_type_serializer import serialize_value_type
 from fields.base import ResponseModel
+from libs.helper import to_timestamp
 from libs.login import login_required
 from models import ConversationVariable
 from models.model import AppMode
@@ -25,12 +26,6 @@ class ConversationVariablesQuery(BaseModel):
     conversation_id: str = Field(..., description="Conversation ID to filter variables")
 
 
-def _to_timestamp(value: datetime | int | None) -> int | None:
-    if isinstance(value, datetime):
-        return int(value.timestamp())
-    return value
-
-
 class ConversationVariableResponse(ResponseModel):
     id: str
     name: str
@@ -65,7 +60,7 @@ class ConversationVariableResponse(ResponseModel):
     @field_validator("created_at", "updated_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 class PaginatedConversationVariableResponse(ResponseModel):
@@ -100,7 +95,7 @@ class ConversationVariablesApi(Resource):
     @account_initialization_required
     @get_app_model(mode=AppMode.ADVANCED_CHAT)
     def get(self, app_model):
-        args = ConversationVariablesQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = ConversationVariablesQuery.model_validate(request.args.to_dict(flat=True))
 
         stmt = (
             select(ConversationVariable)
diff --git a/api/controllers/console/app/generator.py b/api/controllers/console/app/generator.py
index c720a5e074..d4f501d34c 100644
--- a/api/controllers/console/app/generator.py
+++ b/api/controllers/console/app/generator.py
@@ -3,6 +3,7 @@ from collections.abc import Sequence
 from flask_restx import Resource
 from pydantic import BaseModel, Field
 
+from controllers.common.schema import register_enum_models, register_schema_models
 from controllers.console import console_ns
 from controllers.console.app.error import (
     CompletionRequestError,
@@ -19,13 +20,12 @@ from core.helper.code_executor.python3.python3_code_provider import Python3CodeP
 from core.llm_generator.entities import RuleCodeGeneratePayload, RuleGeneratePayload, RuleStructuredOutputPayload
 from core.llm_generator.llm_generator import LLMGenerator
 from extensions.ext_database import db
+from graphon.model_runtime.entities.llm_entities import LLMMode
 from graphon.model_runtime.errors.invoke import InvokeError
 from libs.login import current_account_with_tenant, login_required
 from models import App
 from services.workflow_service import WorkflowService
 
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
-
 
 class InstructionGeneratePayload(BaseModel):
     flow_id: str = Field(..., description="Workflow/Flow ID")
@@ -41,16 +41,16 @@ class InstructionTemplatePayload(BaseModel):
     type: str = Field(..., description="Instruction template type")
 
 
-def reg(cls: type[BaseModel]):
-    console_ns.schema_model(cls.__name__, cls.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0))
-
-
-reg(RuleGeneratePayload)
-reg(RuleCodeGeneratePayload)
-reg(RuleStructuredOutputPayload)
-reg(InstructionGeneratePayload)
-reg(InstructionTemplatePayload)
-reg(ModelConfig)
+register_enum_models(console_ns, LLMMode)
+register_schema_models(
+    console_ns,
+    RuleGeneratePayload,
+    RuleCodeGeneratePayload,
+    RuleStructuredOutputPayload,
+    InstructionGeneratePayload,
+    InstructionTemplatePayload,
+    ModelConfig,
+)
 
 
 @console_ns.route("/rule-generate")
diff --git a/api/controllers/console/app/mcp_server.py b/api/controllers/console/app/mcp_server.py
index d517f695b8..13f6e098ba 100644
--- a/api/controllers/console/app/mcp_server.py
+++ b/api/controllers/console/app/mcp_server.py
@@ -13,6 +13,7 @@ from controllers.console.app.wraps import get_app_model
 from controllers.console.wraps import account_initialization_required, edit_permission_required, setup_required
 from extensions.ext_database import db
 from fields.base import ResponseModel
+from libs.helper import to_timestamp
 from libs.login import current_account_with_tenant, login_required
 from models.enums import AppMCPServerStatus
 from models.model import AppMCPServer
@@ -30,12 +31,6 @@ class MCPServerUpdatePayload(BaseModel):
     status: str | None = Field(default=None, description="Server status")
 
 
-def _to_timestamp(value: datetime | int | None) -> int | None:
-    if isinstance(value, datetime):
-        return int(value.timestamp())
-    return value
-
-
 class AppMCPServerResponse(ResponseModel):
     id: str
     name: str
@@ -59,7 +54,7 @@ class AppMCPServerResponse(ResponseModel):
     @field_validator("created_at", "updated_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 register_schema_models(console_ns, MCPServerCreatePayload, MCPServerUpdatePayload, AppMCPServerResponse)
diff --git a/api/controllers/console/app/message.py b/api/controllers/console/app/message.py
index 44e19b57db..4b596b992f 100644
--- a/api/controllers/console/app/message.py
+++ b/api/controllers/console/app/message.py
@@ -37,10 +37,9 @@ from fields.conversation_fields import (
     JSONValue,
     MessageFile,
     format_files_contained,
-    to_timestamp,
 )
 from graphon.model_runtime.errors.invoke import InvokeError
-from libs.helper import uuid_value
+from libs.helper import to_timestamp, uuid_value
 from libs.infinite_scroll_pagination import InfiniteScrollPagination
 from libs.login import current_account_with_tenant, login_required
 from models.enums import FeedbackFromSource, FeedbackRating
@@ -144,9 +143,7 @@ class MessageDetailResponse(ResponseModel):
     @field_validator("created_at", mode="before")
     @classmethod
     def _normalize_created_at(cls, value: datetime | int | None) -> int | None:
-        if isinstance(value, datetime):
-            return to_timestamp(value)
-        return value
+        return to_timestamp(value)
 
 
 class MessageInfiniteScrollPaginationResponse(ResponseModel):
diff --git a/api/controllers/console/app/ops_trace.py b/api/controllers/console/app/ops_trace.py
index cbcf513162..41acf39541 100644
--- a/api/controllers/console/app/ops_trace.py
+++ b/api/controllers/console/app/ops_trace.py
@@ -5,14 +5,15 @@ from flask_restx import Resource, fields
 from pydantic import BaseModel, Field
 from werkzeug.exceptions import BadRequest
 
+from controllers.common.schema import register_schema_models
 from controllers.console import console_ns
 from controllers.console.app.error import TracingConfigCheckError, TracingConfigIsExist, TracingConfigNotExist
+from controllers.console.app.wraps import get_app_model
 from controllers.console.wraps import account_initialization_required, setup_required
 from libs.login import login_required
+from models import App
 from services.ops_service import OpsService
 
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
-
 
 class TraceProviderQuery(BaseModel):
     tracing_provider: str = Field(..., description="Tracing provider name")
@@ -23,13 +24,7 @@ class TraceConfigPayload(BaseModel):
     tracing_config: dict[str, Any] = Field(..., description="Tracing configuration data")
 
 
-console_ns.schema_model(
-    TraceProviderQuery.__name__,
-    TraceProviderQuery.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
-)
-console_ns.schema_model(
-    TraceConfigPayload.__name__, TraceConfigPayload.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0)
-)
+register_schema_models(console_ns, TraceProviderQuery, TraceConfigPayload)
 
 
 @console_ns.route("/apps/<uuid:app_id>/trace-config")
@@ -49,11 +44,14 @@ class TraceAppConfigApi(Resource):
     @setup_required
     @login_required
     @account_initialization_required
-    def get(self, app_id):
+    @get_app_model
+    def get(self, app_model: App):
         args = TraceProviderQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
 
         try:
-            trace_config = OpsService.get_tracing_app_config(app_id=app_id, tracing_provider=args.tracing_provider)
+            trace_config = OpsService.get_tracing_app_config(
+                app_id=app_model.id, tracing_provider=args.tracing_provider
+            )
             if not trace_config:
                 return {"has_not_configured": True}
             return trace_config
@@ -71,13 +69,14 @@ class TraceAppConfigApi(Resource):
     @setup_required
     @login_required
     @account_initialization_required
-    def post(self, app_id):
+    @get_app_model
+    def post(self, app_model: App):
         """Create a new trace app configuration"""
         args = TraceConfigPayload.model_validate(console_ns.payload)
 
         try:
             result = OpsService.create_tracing_app_config(
-                app_id=app_id, tracing_provider=args.tracing_provider, tracing_config=args.tracing_config
+                app_id=app_model.id, tracing_provider=args.tracing_provider, tracing_config=args.tracing_config
             )
             if not result:
                 raise TracingConfigIsExist()
@@ -96,13 +95,14 @@ class TraceAppConfigApi(Resource):
     @setup_required
     @login_required
     @account_initialization_required
-    def patch(self, app_id):
+    @get_app_model
+    def patch(self, app_model: App):
         """Update an existing trace app configuration"""
         args = TraceConfigPayload.model_validate(console_ns.payload)
 
         try:
             result = OpsService.update_tracing_app_config(
-                app_id=app_id, tracing_provider=args.tracing_provider, tracing_config=args.tracing_config
+                app_id=app_model.id, tracing_provider=args.tracing_provider, tracing_config=args.tracing_config
             )
             if not result:
                 raise TracingConfigNotExist()
@@ -119,12 +119,13 @@ class TraceAppConfigApi(Resource):
     @setup_required
     @login_required
     @account_initialization_required
-    def delete(self, app_id):
+    @get_app_model
+    def delete(self, app_model: App):
         """Delete an existing trace app configuration"""
-        args = TraceProviderQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = TraceProviderQuery.model_validate(request.args.to_dict(flat=True))
 
         try:
-            result = OpsService.delete_tracing_app_config(app_id=app_id, tracing_provider=args.tracing_provider)
+            result = OpsService.delete_tracing_app_config(app_id=app_model.id, tracing_provider=args.tracing_provider)
             if not result:
                 raise TracingConfigNotExist()
             return {"result": "success"}, 204
diff --git a/api/controllers/console/app/statistic.py b/api/controllers/console/app/statistic.py
index ffa28b1c95..d23b2837c9 100644
--- a/api/controllers/console/app/statistic.py
+++ b/api/controllers/console/app/statistic.py
@@ -5,6 +5,7 @@ from flask import abort, jsonify, request
 from flask_restx import Resource, fields
 from pydantic import BaseModel, Field, field_validator
 
+from controllers.common.schema import register_schema_models
 from controllers.console import console_ns
 from controllers.console.app.wraps import get_app_model
 from controllers.console.wraps import account_initialization_required, setup_required
@@ -15,8 +16,6 @@ from libs.helper import convert_datetime_to_date
 from libs.login import current_account_with_tenant, login_required
 from models import AppMode
 
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
-
 
 class StatisticTimeRangeQuery(BaseModel):
     start: str | None = Field(default=None, description="Start date (YYYY-MM-DD HH:MM)")
@@ -30,10 +29,7 @@ class StatisticTimeRangeQuery(BaseModel):
         return value
 
 
-console_ns.schema_model(
-    StatisticTimeRangeQuery.__name__,
-    StatisticTimeRangeQuery.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
-)
+register_schema_models(console_ns, StatisticTimeRangeQuery)
 
 
 @console_ns.route("/apps/<uuid:app_id>/statistics/daily-messages")
@@ -54,7 +50,7 @@ class DailyMessageStatistic(Resource):
     def get(self, app_model):
         account, _ = current_account_with_tenant()
 
-        args = StatisticTimeRangeQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = StatisticTimeRangeQuery.model_validate(request.args.to_dict(flat=True))
 
         converted_created_at = convert_datetime_to_date("created_at")
         sql_query = f"""SELECT
@@ -111,7 +107,7 @@ class DailyConversationStatistic(Resource):
     def get(self, app_model):
         account, _ = current_account_with_tenant()
 
-        args = StatisticTimeRangeQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = StatisticTimeRangeQuery.model_validate(request.args.to_dict(flat=True))
 
         converted_created_at = convert_datetime_to_date("created_at")
         sql_query = f"""SELECT
@@ -167,7 +163,7 @@ class DailyTerminalsStatistic(Resource):
     def get(self, app_model):
         account, _ = current_account_with_tenant()
 
-        args = StatisticTimeRangeQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = StatisticTimeRangeQuery.model_validate(request.args.to_dict(flat=True))
 
         converted_created_at = convert_datetime_to_date("created_at")
         sql_query = f"""SELECT
@@ -224,7 +220,7 @@ class DailyTokenCostStatistic(Resource):
     def get(self, app_model):
         account, _ = current_account_with_tenant()
 
-        args = StatisticTimeRangeQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = StatisticTimeRangeQuery.model_validate(request.args.to_dict(flat=True))
 
         converted_created_at = convert_datetime_to_date("created_at")
         sql_query = f"""SELECT
@@ -284,7 +280,7 @@ class AverageSessionInteractionStatistic(Resource):
     def get(self, app_model):
         account, _ = current_account_with_tenant()
 
-        args = StatisticTimeRangeQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = StatisticTimeRangeQuery.model_validate(request.args.to_dict(flat=True))
 
         converted_created_at = convert_datetime_to_date("c.created_at")
         sql_query = f"""SELECT
@@ -360,7 +356,7 @@ class UserSatisfactionRateStatistic(Resource):
     def get(self, app_model):
         account, _ = current_account_with_tenant()
 
-        args = StatisticTimeRangeQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = StatisticTimeRangeQuery.model_validate(request.args.to_dict(flat=True))
 
         converted_created_at = convert_datetime_to_date("m.created_at")
         sql_query = f"""SELECT
@@ -426,7 +422,7 @@ class AverageResponseTimeStatistic(Resource):
     def get(self, app_model):
         account, _ = current_account_with_tenant()
 
-        args = StatisticTimeRangeQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = StatisticTimeRangeQuery.model_validate(request.args.to_dict(flat=True))
 
         converted_created_at = convert_datetime_to_date("created_at")
         sql_query = f"""SELECT
@@ -482,7 +478,7 @@ class TokensPerSecondStatistic(Resource):
     @account_initialization_required
     def get(self, app_model):
         account, _ = current_account_with_tenant()
-        args = StatisticTimeRangeQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = StatisticTimeRangeQuery.model_validate(request.args.to_dict(flat=True))
 
         converted_created_at = convert_datetime_to_date("created_at")
         sql_query = f"""SELECT
diff --git a/api/controllers/console/app/workflow.py b/api/controllers/console/app/workflow.py
index 68dd8b7a8d..8d065ece67 100644
--- a/api/controllers/console/app/workflow.py
+++ b/api/controllers/console/app/workflow.py
@@ -1,19 +1,24 @@
 import json
 import logging
 from collections.abc import Sequence
-from typing import Any
+from datetime import datetime
+from typing import Any, NotRequired, TypedDict
 
 from flask import abort, request
-from flask_restx import Resource, fields, marshal, marshal_with
-from pydantic import BaseModel, Field, ValidationError, field_validator
+from flask_restx import Resource, fields
+from pydantic import AliasChoices, BaseModel, Field, ValidationError, field_validator
 from sqlalchemy.orm import sessionmaker
 from werkzeug.exceptions import BadRequest, Forbidden, InternalServerError, NotFound
 
 import services
 from controllers.common.controller_schemas import DefaultBlockConfigQuery, WorkflowListQuery, WorkflowUpdatePayload
+from controllers.common.schema import (
+    register_response_schema_model,
+    register_response_schema_models,
+    register_schema_models,
+)
 from controllers.console import console_ns
 from controllers.console.app.error import ConversationCompletedError, DraftWorkflowNotExist, DraftWorkflowNotSync
-from controllers.console.app.workflow_run import workflow_run_node_execution_model
 from controllers.console.app.wraps import get_app_model
 from controllers.console.wraps import account_initialization_required, edit_permission_required, setup_required
 from controllers.web.error import InvokeRateLimitError as InvokeRateLimitHttpError
@@ -22,6 +27,7 @@ from core.app.apps.base_app_queue_manager import AppQueueManager
 from core.app.apps.workflow.app_generator import SKIP_PREPARE_USER_INPUTS_KEY
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.app.file_access import DatabaseFileAccessController
+from core.helper import encrypter
 from core.helper.trace_id_helper import get_external_trace_id
 from core.plugin.impl.exc import PluginInvokeError
 from core.trigger.constants import TRIGGER_SCHEDULE_NODE_TYPE
@@ -34,17 +40,18 @@ from core.trigger.debug.event_selectors import (
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
 from factories import file_factory, variable_factory
-from fields.member_fields import simple_account_fields
-from fields.online_user_fields import online_user_list_fields
-from fields.workflow_fields import workflow_fields, workflow_pagination_fields
+from fields.base import ResponseModel
+from fields.member_fields import SimpleAccount
+from fields.workflow_run_fields import WorkflowRunNodeExecutionResponse
 from graphon.enums import NodeType
 from graphon.file import File
 from graphon.file import helpers as file_helpers
 from graphon.graph_engine.manager import GraphEngineManager
 from graphon.model_runtime.utils.encoders import jsonable_encoder
+from graphon.variables import SecretVariable, SegmentType, VariableBase
 from libs import helper
 from libs.datetime_utils import naive_utc_now
-from libs.helper import TimestampField, uuid_value
+from libs.helper import TimestampField, dump_response, to_timestamp, uuid_value
 from libs.login import current_account_with_tenant, login_required
 from models import App
 from models.model import AppMode
@@ -56,48 +63,22 @@ from services.errors.llm import InvokeRateLimitError
 from services.workflow_service import DraftWorkflowDeletionError, WorkflowInUseError, WorkflowService
 
 logger = logging.getLogger(__name__)
+
 _file_access_controller = DatabaseFileAccessController()
 LISTENING_RETRY_IN = 2000
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
+
 RESTORE_SOURCE_WORKFLOW_MUST_BE_PUBLISHED_MESSAGE = "source workflow must be published"
 MAX_WORKFLOW_ONLINE_USERS_REQUEST_IDS = 1000
 WORKFLOW_ONLINE_USERS_REDIS_BATCH_SIZE = 50
+ENVIRONMENT_VARIABLE_SUPPORTED_TYPES = (SegmentType.STRING, SegmentType.NUMBER, SegmentType.SECRET)
 
-# Register models for flask_restx to avoid dict type issues in Swagger
-# Register in dependency order: base models first, then dependent models
 
-# Base models
-simple_account_model = console_ns.model("SimpleAccount", simple_account_fields)
-
-from fields.workflow_fields import pipeline_variable_fields, serialize_value_type
-
-conversation_variable_model = console_ns.model(
-    "ConversationVariable",
-    {
-        "id": fields.String,
-        "name": fields.String,
-        "value_type": fields.String(attribute=serialize_value_type),
-        "value": fields.Raw,
-        "description": fields.String,
-    },
-)
-
-pipeline_variable_model = console_ns.model("PipelineVariable", pipeline_variable_fields)
-
-# Workflow model with nested dependencies
-workflow_fields_copy = workflow_fields.copy()
-workflow_fields_copy["created_by"] = fields.Nested(simple_account_model, attribute="created_by_account")
-workflow_fields_copy["updated_by"] = fields.Nested(
-    simple_account_model, attribute="updated_by_account", allow_null=True
-)
-workflow_fields_copy["conversation_variables"] = fields.List(fields.Nested(conversation_variable_model))
-workflow_fields_copy["rag_pipeline_variables"] = fields.List(fields.Nested(pipeline_variable_model))
-workflow_model = console_ns.model("Workflow", workflow_fields_copy)
-
-# Workflow pagination model
-workflow_pagination_fields_copy = workflow_pagination_fields.copy()
-workflow_pagination_fields_copy["items"] = fields.List(fields.Nested(workflow_model), attribute="items")
-workflow_pagination_model = console_ns.model("WorkflowPagination", workflow_pagination_fields_copy)
+class EnvironmentVariableResponseDict(TypedDict):
+    value_type: str
+    id: NotRequired[str]
+    name: NotRequired[str]
+    value: NotRequired[Any]
+    description: NotRequired[str | None]
 
 
 class SyncDraftWorkflowPayload(BaseModel):
@@ -168,6 +149,110 @@ class WorkflowOnlineUsersPayload(BaseModel):
         return list(dict.fromkeys(app_id.strip() for app_id in app_ids if app_id.strip()))
 
 
+class WorkflowConversationVariableResponse(ResponseModel):
+    id: str
+    name: str
+    value_type: str
+    value: Any = Field(json_schema_extra={"type": "object"})
+    description: str
+
+    @field_validator("value_type", mode="before")
+    @classmethod
+    def _serialize_value_type(cls, value: Any) -> str:
+        if hasattr(value, "exposed_type"):
+            return str(value.exposed_type())
+        return str(value)
+
+
+class PipelineVariableResponse(ResponseModel):
+    label: str
+    variable: str
+    type: str
+    belong_to_node_id: str
+    max_length: int | None = None
+    required: bool
+    unit: str | None = None
+    default_value: Any = Field(default=None, json_schema_extra={"type": "object"})
+    options: list[str] | None = None
+    placeholder: str | None = None
+    tooltips: str | None = None
+    allowed_file_types: list[str] | None = None
+    allowed_file_extensions: list[str] | None = Field(
+        default=None, validation_alias=AliasChoices("allowed_file_extensions", "allow_file_extension")
+    )
+    allowed_file_upload_methods: list[str] | None = Field(
+        default=None, validation_alias=AliasChoices("allowed_file_upload_methods", "allow_file_upload_methods")
+    )
+
+
+class WorkflowEnvironmentVariableResponse(ResponseModel):
+    value_type: str
+    id: str
+    name: str
+    value: Any = Field(json_schema_extra={"type": "object"})
+    description: str
+
+
+class WorkflowResponse(ResponseModel):
+    id: str
+    graph: dict[str, Any] = Field(validation_alias=AliasChoices("graph_dict", "graph"))
+    features: dict[str, Any] = Field(validation_alias=AliasChoices("features_dict", "features"))
+    hash: str = Field(validation_alias=AliasChoices("unique_hash", "hash"))
+    version: str
+    marked_name: str
+    marked_comment: str
+    created_by: SimpleAccount | None = Field(
+        default=None, validation_alias=AliasChoices("created_by_account", "created_by")
+    )
+    created_at: int
+    updated_by: SimpleAccount | None = Field(
+        default=None, validation_alias=AliasChoices("updated_by_account", "updated_by")
+    )
+    updated_at: int
+    tool_published: bool
+    environment_variables: list[WorkflowEnvironmentVariableResponse]
+    conversation_variables: list[WorkflowConversationVariableResponse]
+    rag_pipeline_variables: list[PipelineVariableResponse]
+
+    @field_validator("created_at", "updated_at", mode="before")
+    @classmethod
+    def _normalize_timestamp(cls, value: datetime | int | None) -> int:
+        timestamp = to_timestamp(value)
+        if timestamp is None:
+            raise ValueError("timestamp is required")
+        return timestamp
+
+    @field_validator("environment_variables", mode="before")
+    @classmethod
+    def _serialize_environment_variables(cls, value: Any) -> list[Any]:
+        if value is None:
+            return []
+
+        return [_serialize_environment_variable(item) for item in value]
+
+
+class WorkflowPaginationResponse(ResponseModel):
+    items: list[WorkflowResponse]
+    page: int
+    limit: int
+    has_more: bool
+
+
+class WorkflowOnlineUser(ResponseModel):
+    user_id: str
+    username: str
+    avatar: str | None = None
+
+
+class WorkflowOnlineUsersByApp(ResponseModel):
+    app_id: str
+    users: list[WorkflowOnlineUser]
+
+
+class WorkflowOnlineUsersResponse(ResponseModel):
+    data: list[WorkflowOnlineUsersByApp]
+
+
 class DraftWorkflowTriggerRunPayload(BaseModel):
     node_id: str
 
@@ -176,25 +261,36 @@ class DraftWorkflowTriggerRunAllPayload(BaseModel):
     node_ids: list[str]
 
 
-def reg(cls: type[BaseModel]):
-    console_ns.schema_model(cls.__name__, cls.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0))
-
-
-reg(SyncDraftWorkflowPayload)
-reg(AdvancedChatWorkflowRunPayload)
-reg(IterationNodeRunPayload)
-reg(LoopNodeRunPayload)
-reg(DraftWorkflowRunPayload)
-reg(DraftWorkflowNodeRunPayload)
-reg(PublishWorkflowPayload)
-reg(DefaultBlockConfigQuery)
-reg(ConvertToWorkflowPayload)
-reg(WorkflowListQuery)
-reg(WorkflowUpdatePayload)
-reg(WorkflowFeaturesPayload)
-reg(WorkflowOnlineUsersPayload)
-reg(DraftWorkflowTriggerRunPayload)
-reg(DraftWorkflowTriggerRunAllPayload)
+register_schema_models(
+    console_ns,
+    SyncDraftWorkflowPayload,
+    AdvancedChatWorkflowRunPayload,
+    IterationNodeRunPayload,
+    LoopNodeRunPayload,
+    DraftWorkflowRunPayload,
+    DraftWorkflowNodeRunPayload,
+    PublishWorkflowPayload,
+    DefaultBlockConfigQuery,
+    ConvertToWorkflowPayload,
+    WorkflowListQuery,
+    WorkflowUpdatePayload,
+    WorkflowFeaturesPayload,
+    WorkflowOnlineUsersPayload,
+    DraftWorkflowTriggerRunPayload,
+    DraftWorkflowTriggerRunAllPayload,
+)
+register_response_schema_model(console_ns, WorkflowRunNodeExecutionResponse)
+register_response_schema_models(
+    console_ns,
+    WorkflowConversationVariableResponse,
+    PipelineVariableResponse,
+    WorkflowEnvironmentVariableResponse,
+    WorkflowResponse,
+    WorkflowPaginationResponse,
+    WorkflowOnlineUser,
+    WorkflowOnlineUsersByApp,
+    WorkflowOnlineUsersResponse,
+)
 
 
 # TODO(QuantumGhost): Refactor existing node run API to handle file parameter parsing
@@ -216,18 +312,56 @@ def _parse_file(workflow: Workflow, files: list[dict] | None = None) -> Sequence
     return file_objs
 
 
+def _serialize_environment_variable(value: Any) -> EnvironmentVariableResponseDict | Any:
+    match value:
+        case SecretVariable():
+            return {
+                "id": value.id,
+                "name": value.name,
+                "value": encrypter.full_mask_token(),
+                "value_type": value.value_type.value,
+                "description": value.description,
+            }
+
+        case VariableBase():
+            return {
+                "id": value.id,
+                "name": value.name,
+                "value": value.value,
+                "value_type": str(value.value_type.exposed_type()),
+                "description": value.description,
+            }
+
+        case dict():
+            value_type_str = value.get("value_type")
+            if not isinstance(value_type_str, str):
+                raise TypeError(
+                    f"unexpected type for value_type field, value={value_type_str}, type={type(value_type_str)}"
+                )
+            value_type = SegmentType(value_type_str).exposed_type()
+            if value_type not in ENVIRONMENT_VARIABLE_SUPPORTED_TYPES:
+                raise ValueError(f"Unsupported environment variable value type: {value_type}")
+            return value
+
+        case _:
+            return value
+
+
 @console_ns.route("/apps/<uuid:app_id>/workflows/draft")
 class DraftWorkflowApi(Resource):
     @console_ns.doc("get_draft_workflow")
     @console_ns.doc(description="Get draft workflow for an application")
     @console_ns.doc(params={"app_id": "Application ID"})
-    @console_ns.response(200, "Draft workflow retrieved successfully", workflow_model)
+    @console_ns.response(
+        200,
+        "Draft workflow retrieved successfully",
+        console_ns.models[WorkflowResponse.__name__],
+    )
     @console_ns.response(404, "Draft workflow not found")
     @setup_required
     @login_required
     @account_initialization_required
     @get_app_model(mode=[AppMode.ADVANCED_CHAT, AppMode.WORKFLOW])
-    @marshal_with(workflow_model)
     @edit_permission_required
     def get(self, app_model: App):
         """
@@ -240,8 +374,8 @@ class DraftWorkflowApi(Resource):
         if not workflow:
             raise DraftWorkflowNotExist()
 
-        # return workflow, if not found, return None (initiate graph by frontend)
-        return workflow
+        # return workflow, if not found, return 404
+        return dump_response(WorkflowResponse, workflow)
 
     @setup_required
     @login_required
@@ -540,9 +674,12 @@ class HumanInputDeliveryTestPayload(BaseModel):
     )
 
 
-reg(HumanInputFormPreviewPayload)
-reg(HumanInputFormSubmitPayload)
-reg(HumanInputDeliveryTestPayload)
+register_schema_models(
+    console_ns,
+    HumanInputFormPreviewPayload,
+    HumanInputFormSubmitPayload,
+    HumanInputDeliveryTestPayload,
+)
 
 
 @console_ns.route("/apps/<uuid:app_id>/advanced-chat/workflows/draft/human-input/nodes/<string:node_id>/form/preview")
@@ -760,14 +897,17 @@ class DraftWorkflowNodeRunApi(Resource):
     @console_ns.doc(description="Run draft workflow node")
     @console_ns.doc(params={"app_id": "Application ID", "node_id": "Node ID"})
     @console_ns.expect(console_ns.models[DraftWorkflowNodeRunPayload.__name__])
-    @console_ns.response(200, "Node run started successfully", workflow_run_node_execution_model)
+    @console_ns.response(
+        200,
+        "Node run started successfully",
+        console_ns.models[WorkflowRunNodeExecutionResponse.__name__],
+    )
     @console_ns.response(403, "Permission denied")
     @console_ns.response(404, "Node not found")
     @setup_required
     @login_required
     @account_initialization_required
     @get_app_model(mode=[AppMode.ADVANCED_CHAT, AppMode.WORKFLOW])
-    @marshal_with(workflow_run_node_execution_model)
     @edit_permission_required
     def post(self, app_model: App, node_id: str):
         """
@@ -799,7 +939,9 @@ class DraftWorkflowNodeRunApi(Resource):
             files=files,
         )
 
-        return workflow_node_execution
+        return WorkflowRunNodeExecutionResponse.model_validate(
+            workflow_node_execution, from_attributes=True
+        ).model_dump(mode="json")
 
 
 @console_ns.route("/apps/<uuid:app_id>/workflows/publish")
@@ -807,13 +949,15 @@ class PublishedWorkflowApi(Resource):
     @console_ns.doc("get_published_workflow")
     @console_ns.doc(description="Get published workflow for an application")
     @console_ns.doc(params={"app_id": "Application ID"})
-    @console_ns.response(200, "Published workflow retrieved successfully", workflow_model)
-    @console_ns.response(404, "Published workflow not found")
+    @console_ns.response(
+        200,
+        "Published workflow retrieved successfully, or null if not found",
+        console_ns.models[WorkflowResponse.__name__],
+    )
     @setup_required
     @login_required
     @account_initialization_required
     @get_app_model(mode=[AppMode.ADVANCED_CHAT, AppMode.WORKFLOW])
-    @marshal_with(workflow_model)
     @edit_permission_required
     def get(self, app_model: App):
         """
@@ -824,7 +968,10 @@ class PublishedWorkflowApi(Resource):
         workflow = workflow_service.get_published_workflow(app_model=app_model)
 
         # return workflow, if not found, return None
-        return workflow
+        if workflow is None:
+            return None
+
+        return dump_response(WorkflowResponse, workflow)
 
     @console_ns.expect(console_ns.models[PublishWorkflowPayload.__name__])
     @setup_required
@@ -902,7 +1049,7 @@ class DefaultBlockConfigApi(Resource):
         """
         Get default block config
         """
-        args = DefaultBlockConfigQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = DefaultBlockConfigQuery.model_validate(request.args.to_dict(flat=True))
 
         filters = None
         if args.q:
@@ -983,7 +1130,11 @@ class PublishedAllWorkflowApi(Resource):
     @console_ns.doc("get_all_published_workflows")
     @console_ns.doc(description="Get all published workflows for an application")
     @console_ns.doc(params={"app_id": "Application ID"})
-    @console_ns.response(200, "Published workflows retrieved successfully", workflow_pagination_model)
+    @console_ns.response(
+        200,
+        "Published workflows retrieved successfully",
+        console_ns.models[WorkflowPaginationResponse.__name__],
+    )
     @setup_required
     @login_required
     @account_initialization_required
@@ -995,7 +1146,7 @@ class PublishedAllWorkflowApi(Resource):
         """
         current_user, _ = current_account_with_tenant()
 
-        args = WorkflowListQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = WorkflowListQuery.model_validate(request.args.to_dict(flat=True))
         page = args.page
         limit = args.limit
         user_id = args.user_id
@@ -1015,14 +1166,14 @@ class PublishedAllWorkflowApi(Resource):
                 user_id=user_id,
                 named_only=named_only,
             )
-            serialized_workflows = marshal(workflows, workflow_fields_copy)
-
-            return {
-                "items": serialized_workflows,
-                "page": page,
-                "limit": limit,
-                "has_more": has_more,
-            }
+            return WorkflowPaginationResponse.model_validate(
+                {
+                    "items": workflows,
+                    "page": page,
+                    "limit": limit,
+                    "has_more": has_more,
+                }
+            ).model_dump(mode="json")
 
 
 @console_ns.route("/apps/<uuid:app_id>/workflows/<string:workflow_id>/restore")
@@ -1068,14 +1219,13 @@ class WorkflowByIdApi(Resource):
     @console_ns.doc(description="Update workflow by ID")
     @console_ns.doc(params={"app_id": "Application ID", "workflow_id": "Workflow ID"})
     @console_ns.expect(console_ns.models[WorkflowUpdatePayload.__name__])
-    @console_ns.response(200, "Workflow updated successfully", workflow_model)
+    @console_ns.response(200, "Workflow updated successfully", console_ns.models[WorkflowResponse.__name__])
     @console_ns.response(404, "Workflow not found")
     @console_ns.response(403, "Permission denied")
     @setup_required
     @login_required
     @account_initialization_required
     @get_app_model(mode=[AppMode.ADVANCED_CHAT, AppMode.WORKFLOW])
-    @marshal_with(workflow_model)
     @edit_permission_required
     def patch(self, app_model: App, workflow_id: str):
         """
@@ -1109,7 +1259,7 @@ class WorkflowByIdApi(Resource):
             if not workflow:
                 raise NotFound("Workflow not found")
 
-        return workflow
+        return dump_response(WorkflowResponse, workflow)
 
     @setup_required
     @login_required
@@ -1143,14 +1293,17 @@ class DraftWorkflowNodeLastRunApi(Resource):
     @console_ns.doc("get_draft_workflow_node_last_run")
     @console_ns.doc(description="Get last run result for draft workflow node")
     @console_ns.doc(params={"app_id": "Application ID", "node_id": "Node ID"})
-    @console_ns.response(200, "Node last run retrieved successfully", workflow_run_node_execution_model)
+    @console_ns.response(
+        200,
+        "Node last run retrieved successfully",
+        console_ns.models[WorkflowRunNodeExecutionResponse.__name__],
+    )
     @console_ns.response(404, "Node last run not found")
     @console_ns.response(403, "Permission denied")
     @setup_required
     @login_required
     @account_initialization_required
     @get_app_model(mode=[AppMode.ADVANCED_CHAT, AppMode.WORKFLOW])
-    @marshal_with(workflow_run_node_execution_model)
     def get(self, app_model: App, node_id: str):
         srv = WorkflowService()
         workflow = srv.get_draft_workflow(app_model)
@@ -1163,7 +1316,7 @@ class DraftWorkflowNodeLastRunApi(Resource):
         )
         if node_exec is None:
             raise NotFound("last run not found")
-        return node_exec
+        return WorkflowRunNodeExecutionResponse.model_validate(node_exec, from_attributes=True).model_dump(mode="json")
 
 
 @console_ns.route("/apps/<uuid:app_id>/workflows/draft/trigger/run")
@@ -1391,12 +1544,16 @@ class DraftWorkflowTriggerRunAllApi(Resource):
 @console_ns.route("/apps/workflows/online-users")
 class WorkflowOnlineUsersApi(Resource):
     @console_ns.expect(console_ns.models[WorkflowOnlineUsersPayload.__name__])
+    @console_ns.response(
+        200,
+        "Workflow online users retrieved successfully",
+        console_ns.models[WorkflowOnlineUsersResponse.__name__],
+    )
     @console_ns.doc("get_workflow_online_users")
     @console_ns.doc(description="Get workflow online users")
     @setup_required
     @login_required
     @account_initialization_required
-    @marshal_with(online_user_list_fields)
     def post(self):
         args = WorkflowOnlineUsersPayload.model_validate(console_ns.payload or {})
 
@@ -1439,10 +1596,18 @@ class WorkflowOnlineUsersApi(Resource):
                 if not isinstance(user_info, dict):
                     continue
 
+                user_id = user_info.get("user_id")
+                username = user_info.get("username")
+                if not isinstance(user_id, str) or not isinstance(username, str):
+                    continue
+
                 avatar = user_info.get("avatar")
+                if avatar is not None and not isinstance(avatar, str):
+                    avatar = None
+
                 if isinstance(avatar, str) and avatar and not avatar.startswith(("http://", "https://")):
                     try:
-                        user_info["avatar"] = file_helpers.get_signed_file_url(avatar)
+                        avatar = file_helpers.get_signed_file_url(avatar)
                     except Exception as exc:
                         logger.warning(
                             "Failed to sign workflow online user avatar; using original value. "
@@ -1452,7 +1617,7 @@ class WorkflowOnlineUsersApi(Resource):
                             exc,
                         )
 
-                users.append(user_info)
+                users.append({"user_id": user_id, "username": username, "avatar": avatar})
             results.append({"app_id": app_id, "users": users})
 
-        return {"data": results}
+        return WorkflowOnlineUsersResponse.model_validate({"data": results}).model_dump(mode="json")
diff --git a/api/controllers/console/app/workflow_app_log.py b/api/controllers/console/app/workflow_app_log.py
index 4b39590235..dec183a300 100644
--- a/api/controllers/console/app/workflow_app_log.py
+++ b/api/controllers/console/app/workflow_app_log.py
@@ -16,6 +16,7 @@ from fields.base import ResponseModel
 from fields.end_user_fields import SimpleEndUser
 from fields.member_fields import SimpleAccount
 from graphon.enums import WorkflowExecutionStatus
+from libs.helper import to_timestamp
 from libs.login import login_required
 from models import App
 from models.model import AppMode
@@ -82,9 +83,7 @@ class WorkflowRunForLogResponse(ResponseModel):
     @field_validator("created_at", "finished_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        if isinstance(value, datetime):
-            return int(value.timestamp())
-        return value
+        return to_timestamp(value)
 
 
 class WorkflowRunForArchivedLogResponse(ResponseModel):
@@ -117,9 +116,7 @@ class WorkflowAppLogPartialResponse(ResponseModel):
     @field_validator("created_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        if isinstance(value, datetime):
-            return int(value.timestamp())
-        return value
+        return to_timestamp(value)
 
 
 class WorkflowArchivedLogPartialResponse(ResponseModel):
@@ -133,9 +130,7 @@ class WorkflowArchivedLogPartialResponse(ResponseModel):
     @field_validator("created_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        if isinstance(value, datetime):
-            return int(value.timestamp())
-        return value
+        return to_timestamp(value)
 
 
 class WorkflowAppLogPaginationResponse(ResponseModel):
@@ -185,7 +180,7 @@ class WorkflowAppLogApi(Resource):
         """
         Get workflow app logs
         """
-        args = WorkflowAppLogQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = WorkflowAppLogQuery.model_validate(request.args.to_dict(flat=True))
 
         # get paginate workflow app logs
         workflow_app_service = WorkflowAppService()
@@ -228,7 +223,7 @@ class WorkflowArchivedLogApi(Resource):
         """
         Get workflow archived logs
         """
-        args = WorkflowAppLogQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = WorkflowAppLogQuery.model_validate(request.args.to_dict(flat=True))
 
         workflow_app_service = WorkflowAppService()
         with sessionmaker(db.engine, expire_on_commit=False).begin() as session:
diff --git a/api/controllers/console/app/workflow_comment.py b/api/controllers/console/app/workflow_comment.py
index e7c3e982a6..f011f576fd 100644
--- a/api/controllers/console/app/workflow_comment.py
+++ b/api/controllers/console/app/workflow_comment.py
@@ -1,29 +1,22 @@
 import logging
+from datetime import datetime
 
-from flask_restx import Resource, marshal_with
-from pydantic import BaseModel, Field, TypeAdapter
+from flask_restx import Resource
+from pydantic import BaseModel, Field, TypeAdapter, computed_field, field_validator
 
-from controllers.common.schema import register_schema_models
+from controllers.common.schema import register_response_schema_models, register_schema_models
 from controllers.console import console_ns
 from controllers.console.app.wraps import get_app_model
 from controllers.console.wraps import account_initialization_required, edit_permission_required, setup_required
+from fields.base import ResponseModel
 from fields.member_fields import AccountWithRole
-from fields.workflow_comment_fields import (
-    workflow_comment_basic_fields,
-    workflow_comment_create_fields,
-    workflow_comment_detail_fields,
-    workflow_comment_reply_create_fields,
-    workflow_comment_reply_update_fields,
-    workflow_comment_resolve_fields,
-    workflow_comment_update_fields,
-)
+from libs.helper import build_avatar_url, dump_response, to_timestamp
 from libs.login import current_user, login_required
 from models import App
 from services.account_service import TenantService
 from services.workflow_comment_service import WorkflowCommentService
 
 logger = logging.getLogger(__name__)
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
 
 
 class WorkflowCommentCreatePayload(BaseModel):
@@ -52,24 +45,159 @@ class WorkflowCommentMentionUsersPayload(BaseModel):
     users: list[AccountWithRole]
 
 
-for model in (
+class WorkflowCommentAccount(ResponseModel):
+    id: str
+    name: str
+    email: str
+    avatar: str | None = Field(default=None, exclude=True)
+
+    @computed_field(return_type=str | None)  # type: ignore[prop-decorator]
+    @property
+    def avatar_url(self) -> str | None:
+        return build_avatar_url(self.avatar)
+
+
+class WorkflowCommentReply(ResponseModel):
+    id: str
+    content: str
+    created_by: str
+    created_by_account: WorkflowCommentAccount | None = None
+    created_at: int | None = None
+
+    @field_validator("created_at", mode="before")
+    @classmethod
+    def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
+        return to_timestamp(value)
+
+
+class WorkflowCommentMention(ResponseModel):
+    mentioned_user_id: str
+    mentioned_user_account: WorkflowCommentAccount | None = None
+    reply_id: str | None = None
+
+
+class WorkflowCommentBasic(ResponseModel):
+    id: str
+    position_x: float
+    position_y: float
+    content: str
+    created_by: str
+    created_by_account: WorkflowCommentAccount | None = None
+    created_at: int | None = None
+    updated_at: int | None = None
+    resolved: bool
+    resolved_at: int | None = None
+    resolved_by: str | None = None
+    resolved_by_account: WorkflowCommentAccount | None = None
+    reply_count: int
+    mention_count: int
+    participants: list[WorkflowCommentAccount]
+
+    @field_validator("created_at", "updated_at", "resolved_at", mode="before")
+    @classmethod
+    def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
+        return to_timestamp(value)
+
+
+class WorkflowCommentBasicList(ResponseModel):
+    data: list[WorkflowCommentBasic]
+
+
+class WorkflowCommentDetail(ResponseModel):
+    id: str
+    position_x: float
+    position_y: float
+    content: str
+    created_by: str
+    created_by_account: WorkflowCommentAccount | None = None
+    created_at: int | None = None
+    updated_at: int | None = None
+    resolved: bool
+    resolved_at: int | None = None
+    resolved_by: str | None = None
+    resolved_by_account: WorkflowCommentAccount | None = None
+    replies: list[WorkflowCommentReply]
+    mentions: list[WorkflowCommentMention]
+
+    @field_validator("created_at", "updated_at", "resolved_at", mode="before")
+    @classmethod
+    def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
+        return to_timestamp(value)
+
+
+class WorkflowCommentCreate(ResponseModel):
+    id: str
+    created_at: int | None = None
+
+    @field_validator("created_at", mode="before")
+    @classmethod
+    def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
+        return to_timestamp(value)
+
+
+class WorkflowCommentUpdate(ResponseModel):
+    id: str
+    updated_at: int | None = None
+
+    @field_validator("updated_at", mode="before")
+    @classmethod
+    def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
+        return to_timestamp(value)
+
+
+class WorkflowCommentResolve(ResponseModel):
+    id: str
+    resolved: bool
+    resolved_at: int | None = None
+    resolved_by: str | None = None
+
+    @field_validator("resolved_at", mode="before")
+    @classmethod
+    def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
+        return to_timestamp(value)
+
+
+class WorkflowCommentReplyCreate(ResponseModel):
+    id: str
+    created_at: int | None = None
+
+    @field_validator("created_at", mode="before")
+    @classmethod
+    def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
+        return to_timestamp(value)
+
+
+class WorkflowCommentReplyUpdate(ResponseModel):
+    id: str
+    updated_at: int | None = None
+
+    @field_validator("updated_at", mode="before")
+    @classmethod
+    def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
+        return to_timestamp(value)
+
+
+register_schema_models(
+    console_ns,
+    AccountWithRole,
+    WorkflowCommentMentionUsersPayload,
     WorkflowCommentCreatePayload,
     WorkflowCommentUpdatePayload,
     WorkflowCommentReplyPayload,
-):
-    console_ns.schema_model(model.__name__, model.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0))
-register_schema_models(console_ns, AccountWithRole, WorkflowCommentMentionUsersPayload)
-
-workflow_comment_basic_model = console_ns.model("WorkflowCommentBasic", workflow_comment_basic_fields)
-workflow_comment_detail_model = console_ns.model("WorkflowCommentDetail", workflow_comment_detail_fields)
-workflow_comment_create_model = console_ns.model("WorkflowCommentCreate", workflow_comment_create_fields)
-workflow_comment_update_model = console_ns.model("WorkflowCommentUpdate", workflow_comment_update_fields)
-workflow_comment_resolve_model = console_ns.model("WorkflowCommentResolve", workflow_comment_resolve_fields)
-workflow_comment_reply_create_model = console_ns.model(
-    "WorkflowCommentReplyCreate", workflow_comment_reply_create_fields
 )
-workflow_comment_reply_update_model = console_ns.model(
-    "WorkflowCommentReplyUpdate", workflow_comment_reply_update_fields
+register_response_schema_models(
+    console_ns,
+    WorkflowCommentAccount,
+    WorkflowCommentReply,
+    WorkflowCommentMention,
+    WorkflowCommentBasic,
+    WorkflowCommentBasicList,
+    WorkflowCommentDetail,
+    WorkflowCommentCreate,
+    WorkflowCommentUpdate,
+    WorkflowCommentResolve,
+    WorkflowCommentReplyCreate,
+    WorkflowCommentReplyUpdate,
 )
 
 
@@ -80,28 +208,26 @@ class WorkflowCommentListApi(Resource):
     @console_ns.doc("list_workflow_comments")
     @console_ns.doc(description="Get all comments for a workflow")
     @console_ns.doc(params={"app_id": "Application ID"})
-    @console_ns.response(200, "Comments retrieved successfully", workflow_comment_basic_model)
+    @console_ns.response(200, "Comments retrieved successfully", console_ns.models[WorkflowCommentBasicList.__name__])
     @login_required
     @setup_required
     @account_initialization_required
     @get_app_model()
-    @marshal_with(workflow_comment_basic_model, envelope="data")
     def get(self, app_model: App):
         """Get all comments for a workflow."""
         comments = WorkflowCommentService.get_comments(tenant_id=current_user.current_tenant_id, app_id=app_model.id)
 
-        return comments
+        return WorkflowCommentBasicList.model_validate({"data": comments}).model_dump(mode="json")
 
     @console_ns.doc("create_workflow_comment")
     @console_ns.doc(description="Create a new workflow comment")
     @console_ns.doc(params={"app_id": "Application ID"})
     @console_ns.expect(console_ns.models[WorkflowCommentCreatePayload.__name__])
-    @console_ns.response(201, "Comment created successfully", workflow_comment_create_model)
+    @console_ns.response(201, "Comment created successfully", console_ns.models[WorkflowCommentCreate.__name__])
     @login_required
     @setup_required
     @account_initialization_required
     @get_app_model()
-    @marshal_with(workflow_comment_create_model)
     @edit_permission_required
     def post(self, app_model: App):
         """Create a new workflow comment."""
@@ -117,7 +243,7 @@ class WorkflowCommentListApi(Resource):
             mentioned_user_ids=payload.mentioned_user_ids,
         )
 
-        return result, 201
+        return dump_response(WorkflowCommentCreate, result), 201
 
 
 @console_ns.route("/apps/<uuid:app_id>/workflow/comments/<string:comment_id>")
@@ -127,30 +253,28 @@ class WorkflowCommentDetailApi(Resource):
     @console_ns.doc("get_workflow_comment")
     @console_ns.doc(description="Get a specific workflow comment")
     @console_ns.doc(params={"app_id": "Application ID", "comment_id": "Comment ID"})
-    @console_ns.response(200, "Comment retrieved successfully", workflow_comment_detail_model)
+    @console_ns.response(200, "Comment retrieved successfully", console_ns.models[WorkflowCommentDetail.__name__])
     @login_required
     @setup_required
     @account_initialization_required
     @get_app_model()
-    @marshal_with(workflow_comment_detail_model)
     def get(self, app_model: App, comment_id: str):
         """Get a specific workflow comment."""
         comment = WorkflowCommentService.get_comment(
             tenant_id=current_user.current_tenant_id, app_id=app_model.id, comment_id=comment_id
         )
 
-        return comment
+        return dump_response(WorkflowCommentDetail, comment)
 
     @console_ns.doc("update_workflow_comment")
     @console_ns.doc(description="Update a workflow comment")
     @console_ns.doc(params={"app_id": "Application ID", "comment_id": "Comment ID"})
     @console_ns.expect(console_ns.models[WorkflowCommentUpdatePayload.__name__])
-    @console_ns.response(200, "Comment updated successfully", workflow_comment_update_model)
+    @console_ns.response(200, "Comment updated successfully", console_ns.models[WorkflowCommentUpdate.__name__])
     @login_required
     @setup_required
     @account_initialization_required
     @get_app_model()
-    @marshal_with(workflow_comment_update_model)
     @edit_permission_required
     def put(self, app_model: App, comment_id: str):
         """Update a workflow comment."""
@@ -167,7 +291,7 @@ class WorkflowCommentDetailApi(Resource):
             mentioned_user_ids=payload.mentioned_user_ids,
         )
 
-        return result
+        return dump_response(WorkflowCommentUpdate, result)
 
     @console_ns.doc("delete_workflow_comment")
     @console_ns.doc(description="Delete a workflow comment")
@@ -197,12 +321,11 @@ class WorkflowCommentResolveApi(Resource):
     @console_ns.doc("resolve_workflow_comment")
     @console_ns.doc(description="Resolve a workflow comment")
     @console_ns.doc(params={"app_id": "Application ID", "comment_id": "Comment ID"})
-    @console_ns.response(200, "Comment resolved successfully", workflow_comment_resolve_model)
+    @console_ns.response(200, "Comment resolved successfully", console_ns.models[WorkflowCommentResolve.__name__])
     @login_required
     @setup_required
     @account_initialization_required
     @get_app_model()
-    @marshal_with(workflow_comment_resolve_model)
     @edit_permission_required
     def post(self, app_model: App, comment_id: str):
         """Resolve a workflow comment."""
@@ -213,7 +336,7 @@ class WorkflowCommentResolveApi(Resource):
             user_id=current_user.id,
         )
 
-        return comment
+        return dump_response(WorkflowCommentResolve, comment)
 
 
 @console_ns.route("/apps/<uuid:app_id>/workflow/comments/<string:comment_id>/replies")
@@ -224,12 +347,11 @@ class WorkflowCommentReplyApi(Resource):
     @console_ns.doc(description="Add a reply to a workflow comment")
     @console_ns.doc(params={"app_id": "Application ID", "comment_id": "Comment ID"})
     @console_ns.expect(console_ns.models[WorkflowCommentReplyPayload.__name__])
-    @console_ns.response(201, "Reply created successfully", workflow_comment_reply_create_model)
+    @console_ns.response(201, "Reply created successfully", console_ns.models[WorkflowCommentReplyCreate.__name__])
     @login_required
     @setup_required
     @account_initialization_required
     @get_app_model()
-    @marshal_with(workflow_comment_reply_create_model)
     @edit_permission_required
     def post(self, app_model: App, comment_id: str):
         """Add a reply to a workflow comment."""
@@ -247,7 +369,7 @@ class WorkflowCommentReplyApi(Resource):
             mentioned_user_ids=payload.mentioned_user_ids,
         )
 
-        return result, 201
+        return dump_response(WorkflowCommentReplyCreate, result), 201
 
 
 @console_ns.route("/apps/<uuid:app_id>/workflow/comments/<string:comment_id>/replies/<string:reply_id>")
@@ -258,12 +380,11 @@ class WorkflowCommentReplyDetailApi(Resource):
     @console_ns.doc(description="Update a comment reply")
     @console_ns.doc(params={"app_id": "Application ID", "comment_id": "Comment ID", "reply_id": "Reply ID"})
     @console_ns.expect(console_ns.models[WorkflowCommentReplyPayload.__name__])
-    @console_ns.response(200, "Reply updated successfully", workflow_comment_reply_update_model)
+    @console_ns.response(200, "Reply updated successfully", console_ns.models[WorkflowCommentReplyUpdate.__name__])
     @login_required
     @setup_required
     @account_initialization_required
     @get_app_model()
-    @marshal_with(workflow_comment_reply_update_model)
     @edit_permission_required
     def put(self, app_model: App, comment_id: str, reply_id: str):
         """Update a comment reply."""
@@ -284,7 +405,7 @@ class WorkflowCommentReplyDetailApi(Resource):
             mentioned_user_ids=payload.mentioned_user_ids,
         )
 
-        return reply
+        return dump_response(WorkflowCommentReplyUpdate, reply)
 
     @console_ns.doc("delete_workflow_comment_reply")
     @console_ns.doc(description="Delete a comment reply")
diff --git a/api/controllers/console/app/workflow_draft_variable.py b/api/controllers/console/app/workflow_draft_variable.py
index e32ba5f66c..3c887c33dc 100644
--- a/api/controllers/console/app/workflow_draft_variable.py
+++ b/api/controllers/console/app/workflow_draft_variable.py
@@ -8,6 +8,7 @@ from flask_restx import Resource, fields, marshal, marshal_with
 from pydantic import BaseModel, Field
 from sqlalchemy.orm import sessionmaker
 
+from controllers.common.schema import register_schema_models
 from controllers.console import console_ns
 from controllers.console.app.error import (
     DraftWorkflowNotExist,
@@ -33,7 +34,6 @@ from services.workflow_service import WorkflowService
 
 logger = logging.getLogger(__name__)
 _file_access_controller = DatabaseFileAccessController()
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
 
 
 class WorkflowDraftVariableListQuery(BaseModel):
@@ -56,33 +56,25 @@ class EnvironmentVariableUpdatePayload(BaseModel):
     environment_variables: list[dict[str, Any]] = Field(..., description="Environment variables for the draft workflow")
 
 
-console_ns.schema_model(
-    WorkflowDraftVariableListQuery.__name__,
-    WorkflowDraftVariableListQuery.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
-)
-console_ns.schema_model(
-    WorkflowDraftVariableUpdatePayload.__name__,
-    WorkflowDraftVariableUpdatePayload.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
-)
-console_ns.schema_model(
-    ConversationVariableUpdatePayload.__name__,
-    ConversationVariableUpdatePayload.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
-)
-console_ns.schema_model(
-    EnvironmentVariableUpdatePayload.__name__,
-    EnvironmentVariableUpdatePayload.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
+register_schema_models(
+    console_ns,
+    WorkflowDraftVariableListQuery,
+    WorkflowDraftVariableUpdatePayload,
+    ConversationVariableUpdatePayload,
+    EnvironmentVariableUpdatePayload,
 )
 
 
 def _convert_values_to_json_serializable_object(value: Segment):
-    if isinstance(value, FileSegment):
-        return value.value.model_dump()
-    elif isinstance(value, ArrayFileSegment):
-        return [i.model_dump() for i in value.value]
-    elif isinstance(value, SegmentGroup):
-        return [_convert_values_to_json_serializable_object(i) for i in value.value]
-    else:
-        return value.value
+    match value:
+        case FileSegment():
+            return value.value.model_dump()
+        case ArrayFileSegment():
+            return [i.model_dump() for i in value.value]
+        case SegmentGroup():
+            return [_convert_values_to_json_serializable_object(i) for i in value.value]
+        case _:
+            return value.value
 
 
 def _serialize_var_value(variable: WorkflowDraftVariable):
@@ -259,7 +251,7 @@ class WorkflowVariableCollectionApi(Resource):
         """
         Get draft workflow
         """
-        args = WorkflowDraftVariableListQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = WorkflowDraftVariableListQuery.model_validate(request.args.to_dict(flat=True))
 
         # fetch draft workflow by app_model
         workflow_service = WorkflowService()
diff --git a/api/controllers/console/app/workflow_run.py b/api/controllers/console/app/workflow_run.py
index 6748d95d6b..97d2003209 100644
--- a/api/controllers/console/app/workflow_run.py
+++ b/api/controllers/console/app/workflow_run.py
@@ -1,30 +1,28 @@
 from datetime import UTC, datetime, timedelta
-from typing import Literal, TypedDict, cast
+from typing import Literal, cast
 
 from flask import request
-from flask_restx import Resource, fields, marshal_with
+from flask_restx import Resource
 from pydantic import BaseModel, Field, field_validator
 from sqlalchemy import select
 from sqlalchemy.orm import sessionmaker
 
 from configs import dify_config
+from controllers.common.schema import query_params_from_model, register_response_schema_models, register_schema_models
 from controllers.console import console_ns
 from controllers.console.app.wraps import get_app_model
 from controllers.console.wraps import account_initialization_required, setup_required
 from controllers.web.error import NotFoundError
 from core.workflow.human_input_forms import load_form_tokens_by_form_id as _load_form_tokens_by_form_id
 from extensions.ext_database import db
-from fields.end_user_fields import simple_end_user_fields
-from fields.member_fields import simple_account_fields
+from fields.base import ResponseModel
 from fields.workflow_run_fields import (
-    advanced_chat_workflow_run_for_list_fields,
-    advanced_chat_workflow_run_pagination_fields,
-    workflow_run_count_fields,
-    workflow_run_detail_fields,
-    workflow_run_for_list_fields,
-    workflow_run_node_execution_fields,
-    workflow_run_node_execution_list_fields,
-    workflow_run_pagination_fields,
+    AdvancedChatWorkflowRunPaginationResponse,
+    WorkflowRunCountResponse,
+    WorkflowRunDetailResponse,
+    WorkflowRunNodeExecutionListResponse,
+    WorkflowRunNodeExecutionResponse,
+    WorkflowRunPaginationResponse,
 )
 from graphon.entities.pause_reason import HumanInputRequired
 from graphon.enums import WorkflowExecutionStatus
@@ -52,82 +50,6 @@ def _build_backstage_input_url(form_token: str | None) -> str | None:
 WORKFLOW_RUN_STATUS_CHOICES = ["running", "succeeded", "failed", "stopped", "partial-succeeded"]
 EXPORT_SIGNED_URL_EXPIRE_SECONDS = 3600
 
-# Register models for flask_restx to avoid dict type issues in Swagger
-# Register in dependency order: base models first, then dependent models
-
-# Base models
-simple_account_model = console_ns.model("SimpleAccount", simple_account_fields)
-
-simple_end_user_model = console_ns.model("SimpleEndUser", simple_end_user_fields)
-
-# Models that depend on simple_account_fields
-workflow_run_for_list_fields_copy = workflow_run_for_list_fields.copy()
-workflow_run_for_list_fields_copy["created_by_account"] = fields.Nested(
-    simple_account_model, attribute="created_by_account", allow_null=True
-)
-workflow_run_for_list_model = console_ns.model("WorkflowRunForList", workflow_run_for_list_fields_copy)
-
-advanced_chat_workflow_run_for_list_fields_copy = advanced_chat_workflow_run_for_list_fields.copy()
-advanced_chat_workflow_run_for_list_fields_copy["created_by_account"] = fields.Nested(
-    simple_account_model, attribute="created_by_account", allow_null=True
-)
-advanced_chat_workflow_run_for_list_model = console_ns.model(
-    "AdvancedChatWorkflowRunForList", advanced_chat_workflow_run_for_list_fields_copy
-)
-
-workflow_run_detail_fields_copy = workflow_run_detail_fields.copy()
-workflow_run_detail_fields_copy["created_by_account"] = fields.Nested(
-    simple_account_model, attribute="created_by_account", allow_null=True
-)
-workflow_run_detail_fields_copy["created_by_end_user"] = fields.Nested(
-    simple_end_user_model, attribute="created_by_end_user", allow_null=True
-)
-workflow_run_detail_model = console_ns.model("WorkflowRunDetail", workflow_run_detail_fields_copy)
-
-workflow_run_node_execution_fields_copy = workflow_run_node_execution_fields.copy()
-workflow_run_node_execution_fields_copy["created_by_account"] = fields.Nested(
-    simple_account_model, attribute="created_by_account", allow_null=True
-)
-workflow_run_node_execution_fields_copy["created_by_end_user"] = fields.Nested(
-    simple_end_user_model, attribute="created_by_end_user", allow_null=True
-)
-workflow_run_node_execution_model = console_ns.model(
-    "WorkflowRunNodeExecution", workflow_run_node_execution_fields_copy
-)
-
-# Simple models without nested dependencies
-workflow_run_count_model = console_ns.model("WorkflowRunCount", workflow_run_count_fields)
-
-# Pagination models that depend on list models
-advanced_chat_workflow_run_pagination_fields_copy = advanced_chat_workflow_run_pagination_fields.copy()
-advanced_chat_workflow_run_pagination_fields_copy["data"] = fields.List(
-    fields.Nested(advanced_chat_workflow_run_for_list_model), attribute="data"
-)
-advanced_chat_workflow_run_pagination_model = console_ns.model(
-    "AdvancedChatWorkflowRunPagination", advanced_chat_workflow_run_pagination_fields_copy
-)
-
-workflow_run_pagination_fields_copy = workflow_run_pagination_fields.copy()
-workflow_run_pagination_fields_copy["data"] = fields.List(fields.Nested(workflow_run_for_list_model), attribute="data")
-workflow_run_pagination_model = console_ns.model("WorkflowRunPagination", workflow_run_pagination_fields_copy)
-
-workflow_run_node_execution_list_fields_copy = workflow_run_node_execution_list_fields.copy()
-workflow_run_node_execution_list_fields_copy["data"] = fields.List(fields.Nested(workflow_run_node_execution_model))
-workflow_run_node_execution_list_model = console_ns.model(
-    "WorkflowRunNodeExecutionList", workflow_run_node_execution_list_fields_copy
-)
-
-workflow_run_export_fields = console_ns.model(
-    "WorkflowRunExport",
-    {
-        "status": fields.String(description="Export status: success/failed"),
-        "presigned_url": fields.String(description="Pre-signed URL for download", required=False),
-        "presigned_url_expires_at": fields.String(description="Pre-signed URL expiration time", required=False),
-    },
-)
-
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
-
 
 class WorkflowRunListQuery(BaseModel):
     last_id: str | None = Field(default=None, description="Last run ID for pagination")
@@ -136,7 +58,7 @@ class WorkflowRunListQuery(BaseModel):
         default=None, description="Workflow run status filter"
     )
     triggered_from: Literal["debugging", "app-run"] | None = Field(
-        default=None, description="Filter by trigger source: debugging or app-run"
+        default=None, description="Filter by trigger source: debugging or app-run. Default: debugging"
     )
 
     @field_validator("last_id")
@@ -151,9 +73,15 @@ class WorkflowRunCountQuery(BaseModel):
     status: Literal["running", "succeeded", "failed", "stopped", "partial-succeeded"] | None = Field(
         default=None, description="Workflow run status filter"
     )
-    time_range: str | None = Field(default=None, description="Time range filter (e.g., 7d, 4h, 30m, 30s)")
+    time_range: str | None = Field(
+        default=None,
+        description=(
+            "Filter by time range (optional): e.g., 7d (7 days), 4h (4 hours), "
+            "30m (30 minutes), 30s (30 seconds). Filters by created_at field."
+        ),
+    )
     triggered_from: Literal["debugging", "app-run"] | None = Field(
-        default=None, description="Filter by trigger source: debugging or app-run"
+        default=None, description="Filter by trigger source: debugging or app-run. Default: debugging"
     )
 
     @field_validator("time_range")
@@ -164,56 +92,69 @@ class WorkflowRunCountQuery(BaseModel):
         return time_duration(value)
 
 
-console_ns.schema_model(
-    WorkflowRunListQuery.__name__, WorkflowRunListQuery.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0)
-)
-console_ns.schema_model(
-    WorkflowRunCountQuery.__name__,
-    WorkflowRunCountQuery.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
-)
+class WorkflowRunExportResponse(ResponseModel):
+    status: str = Field(description="Export status: success/failed")
+    presigned_url: str | None = Field(default=None, description="Pre-signed URL for download")
+    presigned_url_expires_at: str | None = Field(default=None, description="Pre-signed URL expiration time")
 
 
-class HumanInputPauseTypeResponse(TypedDict):
+class HumanInputPauseTypeResponse(ResponseModel):
     type: Literal["human_input"]
     form_id: str
-    backstage_input_url: str | None
+    backstage_input_url: str | None = None
 
 
-class PausedNodeResponse(TypedDict):
+class PausedNodeResponse(ResponseModel):
     node_id: str
     node_title: str
     pause_type: HumanInputPauseTypeResponse
 
 
-class WorkflowPauseDetailsResponse(TypedDict):
-    paused_at: str | None
+class WorkflowPauseDetailsResponse(ResponseModel):
+    paused_at: str | None = None
     paused_nodes: list[PausedNodeResponse]
 
 
+register_schema_models(
+    console_ns,
+    WorkflowRunListQuery,
+    WorkflowRunCountQuery,
+)
+register_response_schema_models(
+    console_ns,
+    AdvancedChatWorkflowRunPaginationResponse,
+    WorkflowRunPaginationResponse,
+    WorkflowRunCountResponse,
+    WorkflowRunDetailResponse,
+    WorkflowRunNodeExecutionResponse,
+    WorkflowRunNodeExecutionListResponse,
+    WorkflowRunExportResponse,
+    HumanInputPauseTypeResponse,
+    PausedNodeResponse,
+    WorkflowPauseDetailsResponse,
+)
+
+
 @console_ns.route("/apps/<uuid:app_id>/advanced-chat/workflow-runs")
 class AdvancedChatAppWorkflowRunListApi(Resource):
     @console_ns.doc("get_advanced_chat_workflow_runs")
     @console_ns.doc(description="Get advanced chat workflow run list")
     @console_ns.doc(params={"app_id": "Application ID"})
-    @console_ns.doc(params={"last_id": "Last run ID for pagination", "limit": "Number of items per page (1-100)"})
-    @console_ns.doc(
-        params={"status": "Filter by status (optional): running, succeeded, failed, stopped, partial-succeeded"}
+    @console_ns.doc(params=query_params_from_model(WorkflowRunListQuery))
+    @console_ns.response(
+        200,
+        "Workflow runs retrieved successfully",
+        console_ns.models[AdvancedChatWorkflowRunPaginationResponse.__name__],
     )
-    @console_ns.doc(
-        params={"triggered_from": "Filter by trigger source (optional): debugging or app-run. Default: debugging"}
-    )
-    @console_ns.expect(console_ns.models[WorkflowRunListQuery.__name__])
-    @console_ns.response(200, "Workflow runs retrieved successfully", advanced_chat_workflow_run_pagination_model)
     @setup_required
     @login_required
     @account_initialization_required
     @get_app_model(mode=[AppMode.ADVANCED_CHAT])
-    @marshal_with(advanced_chat_workflow_run_pagination_model)
     def get(self, app_model: App):
         """
         Get advanced chat app workflow run list
         """
-        args_model = WorkflowRunListQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args_model = WorkflowRunListQuery.model_validate(request.args.to_dict(flat=True))
         args: WorkflowRunListArgs = {"limit": args_model.limit}
         if args_model.last_id is not None:
             args["last_id"] = args_model.last_id
@@ -232,7 +173,9 @@ class AdvancedChatAppWorkflowRunListApi(Resource):
             app_model=app_model, args=args, triggered_from=triggered_from
         )
 
-        return result
+        return AdvancedChatWorkflowRunPaginationResponse.model_validate(result, from_attributes=True).model_dump(
+            mode="json"
+        )
 
 
 @console_ns.route("/apps/<uuid:app_id>/workflow-runs/<uuid:run_id>/export")
@@ -240,7 +183,7 @@ class WorkflowRunExportApi(Resource):
     @console_ns.doc("get_workflow_run_export_url")
     @console_ns.doc(description="Generate a download URL for an archived workflow run.")
     @console_ns.doc(params={"app_id": "Application ID", "run_id": "Workflow run ID"})
-    @console_ns.response(200, "Export URL generated", workflow_run_export_fields)
+    @console_ns.response(200, "Export URL generated", console_ns.models[WorkflowRunExportResponse.__name__])
     @setup_required
     @login_required
     @account_initialization_required
@@ -278,11 +221,14 @@ class WorkflowRunExportApi(Resource):
             expires_in=EXPORT_SIGNED_URL_EXPIRE_SECONDS,
         )
         expires_at = datetime.now(UTC) + timedelta(seconds=EXPORT_SIGNED_URL_EXPIRE_SECONDS)
-        return {
-            "status": "success",
-            "presigned_url": presigned_url,
-            "presigned_url_expires_at": expires_at.isoformat(),
-        }, 200
+        response = WorkflowRunExportResponse.model_validate(
+            {
+                "status": "success",
+                "presigned_url": presigned_url,
+                "presigned_url_expires_at": expires_at.isoformat(),
+            }
+        )
+        return response.model_dump(mode="json"), 200
 
 
 @console_ns.route("/apps/<uuid:app_id>/advanced-chat/workflow-runs/count")
@@ -290,32 +236,21 @@ class AdvancedChatAppWorkflowRunCountApi(Resource):
     @console_ns.doc("get_advanced_chat_workflow_runs_count")
     @console_ns.doc(description="Get advanced chat workflow runs count statistics")
     @console_ns.doc(params={"app_id": "Application ID"})
-    @console_ns.doc(
-        params={"status": "Filter by status (optional): running, succeeded, failed, stopped, partial-succeeded"}
+    @console_ns.doc(params=query_params_from_model(WorkflowRunCountQuery))
+    @console_ns.response(
+        200,
+        "Workflow runs count retrieved successfully",
+        console_ns.models[WorkflowRunCountResponse.__name__],
     )
-    @console_ns.doc(
-        params={
-            "time_range": (
-                "Filter by time range (optional): e.g., 7d (7 days), 4h (4 hours), "
-                "30m (30 minutes), 30s (30 seconds). Filters by created_at field."
-            )
-        }
-    )
-    @console_ns.doc(
-        params={"triggered_from": "Filter by trigger source (optional): debugging or app-run. Default: debugging"}
-    )
-    @console_ns.response(200, "Workflow runs count retrieved successfully", workflow_run_count_model)
-    @console_ns.expect(console_ns.models[WorkflowRunCountQuery.__name__])
     @setup_required
     @login_required
     @account_initialization_required
     @get_app_model(mode=[AppMode.ADVANCED_CHAT])
-    @marshal_with(workflow_run_count_model)
     def get(self, app_model: App):
         """
         Get advanced chat workflow runs count statistics
         """
-        args_model = WorkflowRunCountQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args_model = WorkflowRunCountQuery.model_validate(request.args.to_dict(flat=True))
         args = args_model.model_dump(exclude_none=True)
 
         # Default to DEBUGGING if not specified
@@ -333,7 +268,7 @@ class AdvancedChatAppWorkflowRunCountApi(Resource):
             triggered_from=triggered_from,
         )
 
-        return result
+        return WorkflowRunCountResponse.model_validate(result).model_dump(mode="json")
 
 
 @console_ns.route("/apps/<uuid:app_id>/workflow-runs")
@@ -341,25 +276,21 @@ class WorkflowRunListApi(Resource):
     @console_ns.doc("get_workflow_runs")
     @console_ns.doc(description="Get workflow run list")
     @console_ns.doc(params={"app_id": "Application ID"})
-    @console_ns.doc(params={"last_id": "Last run ID for pagination", "limit": "Number of items per page (1-100)"})
-    @console_ns.doc(
-        params={"status": "Filter by status (optional): running, succeeded, failed, stopped, partial-succeeded"}
+    @console_ns.doc(params=query_params_from_model(WorkflowRunListQuery))
+    @console_ns.response(
+        200,
+        "Workflow runs retrieved successfully",
+        console_ns.models[WorkflowRunPaginationResponse.__name__],
     )
-    @console_ns.doc(
-        params={"triggered_from": "Filter by trigger source (optional): debugging or app-run. Default: debugging"}
-    )
-    @console_ns.response(200, "Workflow runs retrieved successfully", workflow_run_pagination_model)
-    @console_ns.expect(console_ns.models[WorkflowRunListQuery.__name__])
     @setup_required
     @login_required
     @account_initialization_required
     @get_app_model(mode=[AppMode.ADVANCED_CHAT, AppMode.WORKFLOW])
-    @marshal_with(workflow_run_pagination_model)
     def get(self, app_model: App):
         """
         Get workflow run list
         """
-        args_model = WorkflowRunListQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args_model = WorkflowRunListQuery.model_validate(request.args.to_dict(flat=True))
         args: WorkflowRunListArgs = {"limit": args_model.limit}
         if args_model.last_id is not None:
             args["last_id"] = args_model.last_id
@@ -378,7 +309,7 @@ class WorkflowRunListApi(Resource):
             app_model=app_model, args=args, triggered_from=triggered_from
         )
 
-        return result
+        return WorkflowRunPaginationResponse.model_validate(result, from_attributes=True).model_dump(mode="json")
 
 
 @console_ns.route("/apps/<uuid:app_id>/workflow-runs/count")
@@ -386,32 +317,21 @@ class WorkflowRunCountApi(Resource):
     @console_ns.doc("get_workflow_runs_count")
     @console_ns.doc(description="Get workflow runs count statistics")
     @console_ns.doc(params={"app_id": "Application ID"})
-    @console_ns.doc(
-        params={"status": "Filter by status (optional): running, succeeded, failed, stopped, partial-succeeded"}
+    @console_ns.doc(params=query_params_from_model(WorkflowRunCountQuery))
+    @console_ns.response(
+        200,
+        "Workflow runs count retrieved successfully",
+        console_ns.models[WorkflowRunCountResponse.__name__],
     )
-    @console_ns.doc(
-        params={
-            "time_range": (
-                "Filter by time range (optional): e.g., 7d (7 days), 4h (4 hours), "
-                "30m (30 minutes), 30s (30 seconds). Filters by created_at field."
-            )
-        }
-    )
-    @console_ns.doc(
-        params={"triggered_from": "Filter by trigger source (optional): debugging or app-run. Default: debugging"}
-    )
-    @console_ns.response(200, "Workflow runs count retrieved successfully", workflow_run_count_model)
-    @console_ns.expect(console_ns.models[WorkflowRunCountQuery.__name__])
     @setup_required
     @login_required
     @account_initialization_required
     @get_app_model(mode=[AppMode.ADVANCED_CHAT, AppMode.WORKFLOW])
-    @marshal_with(workflow_run_count_model)
     def get(self, app_model: App):
         """
         Get workflow runs count statistics
         """
-        args_model = WorkflowRunCountQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args_model = WorkflowRunCountQuery.model_validate(request.args.to_dict(flat=True))
         args = args_model.model_dump(exclude_none=True)
 
         # Default to DEBUGGING for workflow if not specified (backward compatibility)
@@ -429,7 +349,7 @@ class WorkflowRunCountApi(Resource):
             triggered_from=triggered_from,
         )
 
-        return result
+        return WorkflowRunCountResponse.model_validate(result).model_dump(mode="json")
 
 
 @console_ns.route("/apps/<uuid:app_id>/workflow-runs/<uuid:run_id>")
@@ -437,13 +357,16 @@ class WorkflowRunDetailApi(Resource):
     @console_ns.doc("get_workflow_run_detail")
     @console_ns.doc(description="Get workflow run detail")
     @console_ns.doc(params={"app_id": "Application ID", "run_id": "Workflow run ID"})
-    @console_ns.response(200, "Workflow run detail retrieved successfully", workflow_run_detail_model)
+    @console_ns.response(
+        200,
+        "Workflow run detail retrieved successfully",
+        console_ns.models[WorkflowRunDetailResponse.__name__],
+    )
     @console_ns.response(404, "Workflow run not found")
     @setup_required
     @login_required
     @account_initialization_required
     @get_app_model(mode=[AppMode.ADVANCED_CHAT, AppMode.WORKFLOW])
-    @marshal_with(workflow_run_detail_model)
     def get(self, app_model: App, run_id):
         """
         Get workflow run detail
@@ -452,8 +375,10 @@ class WorkflowRunDetailApi(Resource):
 
         workflow_run_service = WorkflowRunService()
         workflow_run = workflow_run_service.get_workflow_run(app_model=app_model, run_id=run_id)
+        if workflow_run is None:
+            raise NotFoundError("Workflow run not found")
 
-        return workflow_run
+        return WorkflowRunDetailResponse.model_validate(workflow_run, from_attributes=True).model_dump(mode="json")
 
 
 @console_ns.route("/apps/<uuid:app_id>/workflow-runs/<uuid:run_id>/node-executions")
@@ -461,13 +386,16 @@ class WorkflowRunNodeExecutionListApi(Resource):
     @console_ns.doc("get_workflow_run_node_executions")
     @console_ns.doc(description="Get workflow run node execution list")
     @console_ns.doc(params={"app_id": "Application ID", "run_id": "Workflow run ID"})
-    @console_ns.response(200, "Node executions retrieved successfully", workflow_run_node_execution_list_model)
+    @console_ns.response(
+        200,
+        "Node executions retrieved successfully",
+        console_ns.models[WorkflowRunNodeExecutionListResponse.__name__],
+    )
     @console_ns.response(404, "Workflow run not found")
     @setup_required
     @login_required
     @account_initialization_required
     @get_app_model(mode=[AppMode.ADVANCED_CHAT, AppMode.WORKFLOW])
-    @marshal_with(workflow_run_node_execution_list_model)
     def get(self, app_model: App, run_id):
         """
         Get workflow run node execution list
@@ -482,13 +410,24 @@ class WorkflowRunNodeExecutionListApi(Resource):
             user=user,
         )
 
-        return {"data": node_executions}
+        return WorkflowRunNodeExecutionListResponse.model_validate(
+            {"data": node_executions}, from_attributes=True
+        ).model_dump(mode="json")
 
 
 @console_ns.route("/workflow/<string:workflow_run_id>/pause-details")
 class ConsoleWorkflowPauseDetailsApi(Resource):
     """Console API for getting workflow pause details."""
 
+    @console_ns.doc("get_workflow_pause_details")
+    @console_ns.doc(description="Get workflow pause details")
+    @console_ns.doc(params={"workflow_run_id": "Workflow run ID"})
+    @console_ns.response(
+        200,
+        "Workflow pause details retrieved successfully",
+        console_ns.models[WorkflowPauseDetailsResponse.__name__],
+    )
+    @console_ns.response(404, "Workflow run not found")
     @setup_required
     @login_required
     @account_initialization_required
@@ -515,11 +454,8 @@ class ConsoleWorkflowPauseDetailsApi(Resource):
         # Check if workflow is suspended
         is_paused = workflow_run.status == WorkflowExecutionStatus.PAUSED
         if not is_paused:
-            empty_response: WorkflowPauseDetailsResponse = {
-                "paused_at": None,
-                "paused_nodes": [],
-            }
-            return empty_response, 200
+            empty_response = WorkflowPauseDetailsResponse(paused_at=None, paused_nodes=[])
+            return empty_response.model_dump(mode="json"), 200
 
         pause_entity = workflow_run_repo.get_workflow_pause(workflow_run_id)
         pause_reasons = pause_entity.get_pause_reasons() if pause_entity else []
@@ -530,27 +466,25 @@ class ConsoleWorkflowPauseDetailsApi(Resource):
         # Build response
         paused_at = pause_entity.paused_at if pause_entity else None
         paused_nodes: list[PausedNodeResponse] = []
-        response: WorkflowPauseDetailsResponse = {
-            "paused_at": paused_at.isoformat() + "Z" if paused_at else None,
-            "paused_nodes": paused_nodes,
-        }
 
         for reason in pause_reasons:
             if isinstance(reason, HumanInputRequired):
                 paused_nodes.append(
-                    {
-                        "node_id": reason.node_id,
-                        "node_title": reason.node_title,
-                        "pause_type": {
-                            "type": "human_input",
-                            "form_id": reason.form_id,
-                            "backstage_input_url": _build_backstage_input_url(
-                                form_tokens_by_form_id.get(reason.form_id)
-                            ),
-                        },
-                    }
+                    PausedNodeResponse(
+                        node_id=reason.node_id,
+                        node_title=reason.node_title,
+                        pause_type=HumanInputPauseTypeResponse(
+                            type="human_input",
+                            form_id=reason.form_id,
+                            backstage_input_url=_build_backstage_input_url(form_tokens_by_form_id.get(reason.form_id)),
+                        ),
+                    )
                 )
             else:
                 raise AssertionError("unimplemented.")
 
-        return response, 200
+        response = WorkflowPauseDetailsResponse(
+            paused_at=paused_at.isoformat() + "Z" if paused_at else None,
+            paused_nodes=paused_nodes,
+        )
+        return response.model_dump(mode="json"), 200
diff --git a/api/controllers/console/app/workflow_statistic.py b/api/controllers/console/app/workflow_statistic.py
index e48cf42762..ca899d8784 100644
--- a/api/controllers/console/app/workflow_statistic.py
+++ b/api/controllers/console/app/workflow_statistic.py
@@ -3,6 +3,7 @@ from flask_restx import Resource
 from pydantic import BaseModel, Field, field_validator
 from sqlalchemy.orm import sessionmaker
 
+from controllers.common.schema import register_schema_models
 from controllers.console import console_ns
 from controllers.console.app.wraps import get_app_model
 from controllers.console.wraps import account_initialization_required, setup_required
@@ -13,8 +14,6 @@ from models.enums import WorkflowRunTriggeredFrom
 from models.model import AppMode
 from repositories.factory import DifyAPIRepositoryFactory
 
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
-
 
 class WorkflowStatisticQuery(BaseModel):
     start: str | None = Field(default=None, description="Start date and time (YYYY-MM-DD HH:MM)")
@@ -28,10 +27,7 @@ class WorkflowStatisticQuery(BaseModel):
         return value
 
 
-console_ns.schema_model(
-    WorkflowStatisticQuery.__name__,
-    WorkflowStatisticQuery.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
-)
+register_schema_models(console_ns, WorkflowStatisticQuery)
 
 
 @console_ns.route("/apps/<uuid:app_id>/workflow/statistics/daily-conversations")
@@ -53,7 +49,7 @@ class WorkflowDailyRunsStatistic(Resource):
     def get(self, app_model):
         account, _ = current_account_with_tenant()
 
-        args = WorkflowStatisticQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = WorkflowStatisticQuery.model_validate(request.args.to_dict(flat=True))
 
         assert account.timezone is not None
 
@@ -93,7 +89,7 @@ class WorkflowDailyTerminalsStatistic(Resource):
     def get(self, app_model):
         account, _ = current_account_with_tenant()
 
-        args = WorkflowStatisticQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = WorkflowStatisticQuery.model_validate(request.args.to_dict(flat=True))
 
         assert account.timezone is not None
 
@@ -133,7 +129,7 @@ class WorkflowDailyTokenCostStatistic(Resource):
     def get(self, app_model):
         account, _ = current_account_with_tenant()
 
-        args = WorkflowStatisticQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = WorkflowStatisticQuery.model_validate(request.args.to_dict(flat=True))
 
         assert account.timezone is not None
 
@@ -173,7 +169,7 @@ class WorkflowAverageAppInteractionStatistic(Resource):
     def get(self, app_model):
         account, _ = current_account_with_tenant()
 
-        args = WorkflowStatisticQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = WorkflowStatisticQuery.model_validate(request.args.to_dict(flat=True))
 
         assert account.timezone is not None
 
diff --git a/api/controllers/console/app/workflow_trigger.py b/api/controllers/console/app/workflow_trigger.py
index a6715fa200..a80b4f5d0c 100644
--- a/api/controllers/console/app/workflow_trigger.py
+++ b/api/controllers/console/app/workflow_trigger.py
@@ -94,7 +94,7 @@ class WebhookTriggerApi(Resource):
     @console_ns.response(200, "Success", console_ns.models[WebhookTriggerResponse.__name__])
     def get(self, app_model: App):
         """Get webhook trigger for a node"""
-        args = Parser.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = Parser.model_validate(request.args.to_dict(flat=True))
 
         node_id = args.node_id
 
diff --git a/api/controllers/console/auth/activate.py b/api/controllers/console/auth/activate.py
index f7061f820f..0c05cf2fe3 100644
--- a/api/controllers/console/auth/activate.py
+++ b/api/controllers/console/auth/activate.py
@@ -63,7 +63,7 @@ class ActivateCheckApi(Resource):
         console_ns.models[ActivationCheckResponse.__name__],
     )
     def get(self):
-        args = ActivateCheckQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = ActivateCheckQuery.model_validate(request.args.to_dict(flat=True))
 
         workspaceId = args.workspace_id
         token = args.token
diff --git a/api/controllers/console/auth/data_source_bearer_auth.py b/api/controllers/console/auth/data_source_bearer_auth.py
index 905d0daef0..db0d36af6e 100644
--- a/api/controllers/console/auth/data_source_bearer_auth.py
+++ b/api/controllers/console/auth/data_source_bearer_auth.py
@@ -1,6 +1,7 @@
 from flask_restx import Resource
 from pydantic import BaseModel, Field
 
+from controllers.common.schema import register_schema_models
 from libs.login import current_account_with_tenant, login_required
 from services.auth.api_key_auth_service import ApiKeyAuthService
 
@@ -8,8 +9,6 @@ from .. import console_ns
 from ..auth.error import ApiKeyAuthFailedError
 from ..wraps import account_initialization_required, is_admin_or_owner_required, setup_required
 
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
-
 
 class ApiKeyAuthBindingPayload(BaseModel):
     category: str = Field(...)
@@ -17,10 +16,7 @@ class ApiKeyAuthBindingPayload(BaseModel):
     credentials: dict = Field(...)
 
 
-console_ns.schema_model(
-    ApiKeyAuthBindingPayload.__name__,
-    ApiKeyAuthBindingPayload.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
-)
+register_schema_models(console_ns, ApiKeyAuthBindingPayload)
 
 
 @console_ns.route("/api-key-auth/data-source")
diff --git a/api/controllers/console/auth/email_register.py b/api/controllers/console/auth/email_register.py
index 1fd781b4fc..e1f3f0eaeb 100644
--- a/api/controllers/console/auth/email_register.py
+++ b/api/controllers/console/auth/email_register.py
@@ -3,7 +3,8 @@ from flask_restx import Resource
 from pydantic import BaseModel, Field, field_validator
 
 from configs import dify_config
-from constants.languages import languages
+from constants.languages import get_valid_language, languages
+from controllers.common.schema import register_schema_models
 from controllers.console import console_ns
 from controllers.console.auth.error import (
     EmailAlreadyInUseError,
@@ -14,17 +15,16 @@ from controllers.console.auth.error import (
     PasswordMismatchError,
 )
 from libs.helper import EmailStr, extract_remote_ip
+from libs.helper import timezone as validate_timezone_string
 from libs.password import valid_password
 from models import Account
 from services.account_service import AccountService
 from services.billing_service import BillingService
-from services.errors.account import AccountNotFoundError, AccountRegisterError
+from services.errors.account import AccountRegisterError
 
 from ..error import AccountInFreezeError, EmailSendIpLimitError
 from ..wraps import email_password_login_enabled, email_register_enabled, setup_required
 
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
-
 
 class EmailRegisterSendPayload(BaseModel):
     email: EmailStr = Field(..., description="Email address")
@@ -41,15 +41,23 @@ class EmailRegisterResetPayload(BaseModel):
     token: str = Field(...)
     new_password: str = Field(...)
     password_confirm: str = Field(...)
+    language: str | None = Field(default=None)
+    timezone: str | None = Field(default=None)
 
     @field_validator("new_password", "password_confirm")
     @classmethod
     def validate_password(cls, value: str) -> str:
         return valid_password(value)
 
+    @field_validator("timezone")
+    @classmethod
+    def validate_timezone(cls, value: str | None) -> str | None:
+        if value is None:
+            return None
+        return validate_timezone_string(value)
 
-for model in (EmailRegisterSendPayload, EmailRegisterValidityPayload, EmailRegisterResetPayload):
-    console_ns.schema_model(model.__name__, model.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0))
+
+register_schema_models(console_ns, EmailRegisterSendPayload, EmailRegisterValidityPayload, EmailRegisterResetPayload)
 
 
 @console_ns.route("/email-register/send-email")
@@ -146,26 +154,32 @@ class EmailRegisterResetApi(Resource):
 
         if account:
             raise EmailAlreadyInUseError()
-        else:
-            account = self._create_new_account(normalized_email, args.password_confirm)
-            if not account:
-                raise AccountNotFoundError()
-            token_pair = AccountService.login(account=account, ip_address=extract_remote_ip(request))
-            AccountService.reset_login_error_rate_limit(normalized_email)
+
+        account = self._create_new_account(
+            email=normalized_email,
+            password=args.password_confirm,
+            timezone=args.timezone,
+            language=args.language,
+        )
+        token_pair = AccountService.login(account=account, ip_address=extract_remote_ip(request))
+        AccountService.reset_login_error_rate_limit(normalized_email)
 
         return {"result": "success", "data": token_pair.model_dump()}
 
-    def _create_new_account(self, email: str, password: str) -> Account | None:
-        # Create new account if allowed
-        account = None
+    def _create_new_account(
+        self,
+        email: str,
+        password: str,
+        timezone: str | None = None,
+        language: str | None = None,
+    ) -> Account:
         try:
-            account = AccountService.create_account_and_tenant(
+            return AccountService.create_account_and_tenant(
                 email=email,
                 name=email,
                 password=password,
-                interface_language=languages[0],
+                interface_language=get_valid_language(language),
+                timezone=timezone,
             )
         except AccountRegisterError:
             raise AccountInFreezeError()
-
-        return account
diff --git a/api/controllers/console/auth/forgot_password.py b/api/controllers/console/auth/forgot_password.py
index ed390a5f89..c34dd1ac85 100644
--- a/api/controllers/console/auth/forgot_password.py
+++ b/api/controllers/console/auth/forgot_password.py
@@ -28,8 +28,6 @@ from services.entities.auth_entities import (
 )
 from services.feature_service import FeatureService
 
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
-
 
 class ForgotPasswordEmailResponse(BaseModel):
     result: str = Field(description="Operation result")
diff --git a/api/controllers/console/auth/login.py b/api/controllers/console/auth/login.py
index 8216b3d0da..3121470b84 100644
--- a/api/controllers/console/auth/login.py
+++ b/api/controllers/console/auth/login.py
@@ -3,12 +3,13 @@ import logging
 import flask_login
 from flask import make_response, request
 from flask_restx import Resource
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, field_validator
 from werkzeug.exceptions import Unauthorized
 
 import services
 from configs import dify_config
 from constants.languages import get_valid_language
+from controllers.common.schema import register_schema_models
 from controllers.console import console_ns
 from controllers.console.auth.error import (
     AuthenticationFailedError,
@@ -33,6 +34,7 @@ from controllers.console.wraps import (
 )
 from events.tenant_event import tenant_was_created
 from libs.helper import EmailStr, extract_remote_ip
+from libs.helper import timezone as validate_timezone_string
 from libs.login import current_account_with_tenant
 from libs.token import (
     clear_access_token_from_cookie,
@@ -50,7 +52,6 @@ from services.errors.account import AccountRegisterError
 from services.errors.workspace import WorkSpaceNotAllowedCreateError, WorkspacesLimitExceededError
 from services.feature_service import FeatureService
 
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
 logger = logging.getLogger(__name__)
 
 
@@ -69,15 +70,17 @@ class EmailCodeLoginPayload(BaseModel):
     code: str = Field(...)
     token: str = Field(...)
     language: str | None = Field(default=None)
+    timezone: str | None = Field(default=None)
+
+    @field_validator("timezone")
+    @classmethod
+    def validate_timezone(cls, value: str | None) -> str | None:
+        if value is None:
+            return None
+        return validate_timezone_string(value)
 
 
-def reg(cls: type[BaseModel]):
-    console_ns.schema_model(cls.__name__, cls.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0))
-
-
-reg(LoginPayload)
-reg(EmailPayload)
-reg(EmailCodeLoginPayload)
+register_schema_models(console_ns, LoginPayload, EmailPayload, EmailCodeLoginPayload)
 
 
 @console_ns.route("/login")
@@ -294,6 +297,7 @@ class EmailCodeLoginApi(Resource):
                     email=user_email,
                     name=user_email,
                     interface_language=get_valid_language(language),
+                    timezone=args.timezone,
                 )
             except WorkSpaceNotAllowedCreateError:
                 raise NotAllowedCreateWorkspace()
diff --git a/api/controllers/console/auth/oauth.py b/api/controllers/console/auth/oauth.py
index d31fb4a46c..2254fa4981 100644
--- a/api/controllers/console/auth/oauth.py
+++ b/api/controllers/console/auth/oauth.py
@@ -12,7 +12,8 @@ from events.tenant_event import tenant_was_created
 from extensions.ext_database import db
 from libs.datetime_utils import naive_utc_now
 from libs.helper import extract_remote_ip
-from libs.oauth import GitHubOAuth, GoogleOAuth, OAuthUserInfo
+from libs.helper import timezone as validate_timezone_string
+from libs.oauth import GitHubOAuth, GoogleOAuth, OAuthUserInfo, decode_oauth_state
 from libs.token import (
     set_access_token_to_cookie,
     set_csrf_token_to_cookie,
@@ -53,6 +54,31 @@ def get_oauth_providers():
         return OAUTH_PROVIDERS
 
 
+def _validated_timezone(value: str | None) -> str | None:
+    if not value:
+        return None
+    try:
+        return validate_timezone_string(value)
+    except ValueError:
+        return None
+
+
+def _validated_language(value: str | None) -> str | None:
+    if value and value in languages:
+        return value
+    return None
+
+
+def _preferred_interface_language(language: str | None = None) -> str:
+    if language:
+        return language
+
+    preferred_lang = request.accept_languages.best_match(languages)
+    if preferred_lang and preferred_lang in languages:
+        return preferred_lang
+    return languages[0]
+
+
 @console_ns.route("/oauth/login/<provider>")
 class OAuthLogin(Resource):
     @console_ns.doc("oauth_login")
@@ -64,13 +90,19 @@ class OAuthLogin(Resource):
     @console_ns.response(400, "Invalid provider")
     def get(self, provider: str):
         invite_token = request.args.get("invite_token") or None
+        timezone = _validated_timezone(request.args.get("timezone") or None)
+        language = _validated_language(request.args.get("language") or None)
         OAUTH_PROVIDERS = get_oauth_providers()
         with current_app.app_context():
             oauth_provider = OAUTH_PROVIDERS.get(provider)
         if not oauth_provider:
             return {"error": "Invalid provider"}, 400
 
-        auth_url = oauth_provider.get_authorization_url(invite_token=invite_token)
+        auth_url = oauth_provider.get_authorization_url(
+            invite_token=invite_token,
+            timezone=timezone,
+            language=language,
+        )
         return redirect(auth_url)
 
 
@@ -96,9 +128,10 @@ class OAuthCallback(Resource):
 
         code = request.args.get("code")
         state = request.args.get("state")
-        invite_token = None
-        if state:
-            invite_token = state
+        oauth_state = decode_oauth_state(state)
+        invite_token = oauth_state.get("invite_token")
+        timezone = _validated_timezone(oauth_state.get("timezone"))
+        language = _validated_language(oauth_state.get("language"))
 
         if not code:
             return {"error": "Authorization code is required"}, 400
@@ -129,7 +162,7 @@ class OAuthCallback(Resource):
             return redirect(f"{dify_config.CONSOLE_WEB_URL}/signin/invite-settings?invite_token={invite_token}")
 
         try:
-            account, oauth_new_user = _generate_account(provider, user_info)
+            account, oauth_new_user = _generate_account(provider, user_info, timezone=timezone, language=language)
         except AccountNotFoundError:
             return redirect(f"{dify_config.CONSOLE_WEB_URL}/signin?message=Account not found.")
         except (WorkSpaceNotFoundError, WorkSpaceNotAllowedCreateError):
@@ -184,7 +217,12 @@ def _get_account_by_openid_or_email(provider: str, user_info: OAuthUserInfo) ->
     return account
 
 
-def _generate_account(provider: str, user_info: OAuthUserInfo) -> tuple[Account, bool]:
+def _generate_account(
+    provider: str,
+    user_info: OAuthUserInfo,
+    timezone: str | None = None,
+    language: str | None = None,
+) -> tuple[Account, bool]:
     # Get account by openid or email.
     account = _get_account_by_openid_or_email(provider, user_info)
     oauth_new_user = False
@@ -211,26 +249,19 @@ def _generate_account(provider: str, user_info: OAuthUserInfo) -> tuple[Account,
                         "30 days and is temporarily unavailable for new account registration"
                     )
                 )
-            else:
-                raise AccountRegisterError(description=("Invalid email or password"))
+            raise AccountRegisterError(description=("Invalid email or password"))
         account_name = user_info.name or "Dify"
+        interface_language = _preferred_interface_language(language)
         account = RegisterService.register(
             email=normalized_email,
             name=account_name,
             password=None,
             open_id=user_info.id,
             provider=provider,
+            language=interface_language,
+            timezone=timezone,
         )
 
-        # Set interface language
-        preferred_lang = request.accept_languages.best_match(languages)
-        if preferred_lang and preferred_lang in languages:
-            interface_language = preferred_lang
-        else:
-            interface_language = languages[0]
-        account.interface_language = interface_language
-        db.session.commit()
-
     # Link account
     AccountService.link_account_integrate(provider, user_info.id, account)
 
diff --git a/api/controllers/console/datasets/datasets.py b/api/controllers/console/datasets/datasets.py
index d001dfba64..0e91779b2c 100644
--- a/api/controllers/console/datasets/datasets.py
+++ b/api/controllers/console/datasets/datasets.py
@@ -606,63 +606,63 @@ class DatasetIndexingEstimateApi(Resource):
         # validate args
         DocumentService.estimate_args_validate(args)
         extract_settings = []
-        if args["info_list"]["data_source_type"] == "upload_file":
-            file_ids = args["info_list"]["file_info_list"]["file_ids"]
-            file_details = db.session.scalars(
-                select(UploadFile).where(UploadFile.tenant_id == current_tenant_id, UploadFile.id.in_(file_ids))
-            ).all()
+        match args["info_list"]["data_source_type"]:
+            case "upload_file":
+                file_ids = args["info_list"]["file_info_list"]["file_ids"]
+                file_details = db.session.scalars(
+                    select(UploadFile).where(UploadFile.tenant_id == current_tenant_id, UploadFile.id.in_(file_ids))
+                ).all()
+                if file_details is None:
+                    raise NotFound("File not found.")
 
-            if file_details is None:
-                raise NotFound("File not found.")
-
-            if file_details:
-                for file_detail in file_details:
+                if file_details:
+                    for file_detail in file_details:
+                        extract_setting = ExtractSetting(
+                            datasource_type=DatasourceType.FILE,
+                            upload_file=file_detail,
+                            document_model=args["doc_form"],
+                        )
+                        extract_settings.append(extract_setting)
+            case "notion_import":
+                notion_info_list = args["info_list"]["notion_info_list"]
+                for notion_info in notion_info_list:
+                    workspace_id = notion_info["workspace_id"]
+                    credential_id = notion_info.get("credential_id")
+                    for page in notion_info["pages"]:
+                        extract_setting = ExtractSetting(
+                            datasource_type=DatasourceType.NOTION,
+                            notion_info=NotionInfo.model_validate(
+                                {
+                                    "credential_id": credential_id,
+                                    "notion_workspace_id": workspace_id,
+                                    "notion_obj_id": page["page_id"],
+                                    "notion_page_type": page["type"],
+                                    "tenant_id": current_tenant_id,
+                                }
+                            ),
+                            document_model=args["doc_form"],
+                        )
+                        extract_settings.append(extract_setting)
+            case "website_crawl":
+                website_info_list = args["info_list"]["website_info_list"]
+                for url in website_info_list["urls"]:
                     extract_setting = ExtractSetting(
-                        datasource_type=DatasourceType.FILE,
-                        upload_file=file_detail,
-                        document_model=args["doc_form"],
-                    )
-                    extract_settings.append(extract_setting)
-        elif args["info_list"]["data_source_type"] == "notion_import":
-            notion_info_list = args["info_list"]["notion_info_list"]
-            for notion_info in notion_info_list:
-                workspace_id = notion_info["workspace_id"]
-                credential_id = notion_info.get("credential_id")
-                for page in notion_info["pages"]:
-                    extract_setting = ExtractSetting(
-                        datasource_type=DatasourceType.NOTION,
-                        notion_info=NotionInfo.model_validate(
+                        datasource_type=DatasourceType.WEBSITE,
+                        website_info=WebsiteInfo.model_validate(
                             {
-                                "credential_id": credential_id,
-                                "notion_workspace_id": workspace_id,
-                                "notion_obj_id": page["page_id"],
-                                "notion_page_type": page["type"],
+                                "provider": website_info_list["provider"],
+                                "job_id": website_info_list["job_id"],
+                                "url": url,
                                 "tenant_id": current_tenant_id,
+                                "mode": "crawl",
+                                "only_main_content": website_info_list["only_main_content"],
                             }
                         ),
                         document_model=args["doc_form"],
                     )
                     extract_settings.append(extract_setting)
-        elif args["info_list"]["data_source_type"] == "website_crawl":
-            website_info_list = args["info_list"]["website_info_list"]
-            for url in website_info_list["urls"]:
-                extract_setting = ExtractSetting(
-                    datasource_type=DatasourceType.WEBSITE,
-                    website_info=WebsiteInfo.model_validate(
-                        {
-                            "provider": website_info_list["provider"],
-                            "job_id": website_info_list["job_id"],
-                            "url": url,
-                            "tenant_id": current_tenant_id,
-                            "mode": "crawl",
-                            "only_main_content": website_info_list["only_main_content"],
-                        }
-                    ),
-                    document_model=args["doc_form"],
-                )
-                extract_settings.append(extract_setting)
-        else:
-            raise ValueError("Data source type not support")
+            case _:
+                raise ValueError("Data source type not support")
         indexing_runner = IndexingRunner()
         try:
             response = indexing_runner.indexing_estimate(
diff --git a/api/controllers/console/datasets/datasets_document.py b/api/controllers/console/datasets/datasets_document.py
index 3372a967d9..dfe8192b89 100644
--- a/api/controllers/console/datasets/datasets_document.py
+++ b/api/controllers/console/datasets/datasets_document.py
@@ -39,6 +39,7 @@ from fields.document_fields import (
 from graphon.model_runtime.entities.model_entities import ModelType
 from graphon.model_runtime.errors.invoke import InvokeAuthorizationError
 from libs.datetime_utils import naive_utc_now
+from libs.helper import to_timestamp
 from libs.login import current_account_with_tenant, login_required
 from models import DatasetProcessRule, Document, DocumentSegment, UploadFile
 from models.dataset import DocumentPipelineExecutionLog
@@ -71,12 +72,6 @@ from ..wraps import (
 logger = logging.getLogger(__name__)
 
 
-def _to_timestamp(value: datetime | int | None) -> int | None:
-    if isinstance(value, datetime):
-        return int(value.timestamp())
-    return value
-
-
 def _normalize_enum(value: Any) -> Any:
     if isinstance(value, str) or value is None:
         return value
@@ -101,7 +96,7 @@ class DatasetResponse(ResponseModel):
     @field_validator("created_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 class DocumentMetadataResponse(ResponseModel):
@@ -152,7 +147,7 @@ class DocumentResponse(ResponseModel):
     @field_validator("created_at", "disabled_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 class DocumentWithSegmentsResponse(DocumentResponse):
@@ -369,28 +364,31 @@ class DatasetDocumentListApi(Resource):
         else:
             sort_logic = asc
 
-        if sort == "hit_count":
-            sub_query = (
-                sa.select(DocumentSegment.document_id, sa.func.sum(DocumentSegment.hit_count).label("total_hit_count"))
-                .where(DocumentSegment.dataset_id == str(dataset_id))
-                .group_by(DocumentSegment.document_id)
-                .subquery()
-            )
+        match sort:
+            case "hit_count":
+                sub_query = (
+                    sa.select(
+                        DocumentSegment.document_id, sa.func.sum(DocumentSegment.hit_count).label("total_hit_count")
+                    )
+                    .where(DocumentSegment.dataset_id == str(dataset_id))
+                    .group_by(DocumentSegment.document_id)
+                    .subquery()
+                )
 
-            query = query.outerjoin(sub_query, sub_query.c.document_id == Document.id).order_by(
-                sort_logic(sa.func.coalesce(sub_query.c.total_hit_count, 0)),
-                sort_logic(Document.position),
-            )
-        elif sort == "created_at":
-            query = query.order_by(
-                sort_logic(Document.created_at),
-                sort_logic(Document.position),
-            )
-        else:
-            query = query.order_by(
-                desc(Document.created_at),
-                desc(Document.position),
-            )
+                query = query.outerjoin(sub_query, sub_query.c.document_id == Document.id).order_by(
+                    sort_logic(sa.func.coalesce(sub_query.c.total_hit_count, 0)),
+                    sort_logic(Document.position),
+                )
+            case "created_at":
+                query = query.order_by(
+                    sort_logic(Document.created_at),
+                    sort_logic(Document.position),
+                )
+            case _:
+                query = query.order_by(
+                    desc(Document.created_at),
+                    desc(Document.position),
+                )
 
         paginated_documents = db.paginate(select=query, page=page, per_page=limit, max_per_page=100, error_out=False)
         documents = paginated_documents.items
diff --git a/api/controllers/console/datasets/hit_testing.py b/api/controllers/console/datasets/hit_testing.py
index 36a7a4bb0e..8758f983ee 100644
--- a/api/controllers/console/datasets/hit_testing.py
+++ b/api/controllers/console/datasets/hit_testing.py
@@ -8,6 +8,7 @@ from pydantic import Field, field_validator
 
 from controllers.common.schema import register_schema_models
 from fields.base import ResponseModel
+from libs.helper import to_timestamp
 from libs.login import login_required
 
 from .. import console_ns
@@ -19,12 +20,6 @@ from ..wraps import (
 )
 
 
-def _to_timestamp(value: datetime | int | None) -> int | None:
-    if isinstance(value, datetime):
-        return int(value.timestamp())
-    return value
-
-
 class HitTestingDocument(ResponseModel):
     id: str | None = None
     data_source_type: str | None = None
@@ -61,7 +56,7 @@ class HitTestingSegment(ResponseModel):
     @field_validator("disabled_at", "created_at", "indexing_at", "completed_at", "stopped_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 class HitTestingChildChunk(ResponseModel):
diff --git a/api/controllers/console/datasets/hit_testing_base.py b/api/controllers/console/datasets/hit_testing_base.py
index 71ab1513ed..bb725a5f6c 100644
--- a/api/controllers/console/datasets/hit_testing_base.py
+++ b/api/controllers/console/datasets/hit_testing_base.py
@@ -39,11 +39,8 @@ class HitTestingPayload(BaseModel):
 
 class DatasetsHitTestingBase:
     @staticmethod
-    def _normalize_hit_testing_query(query: Any) -> str:
-        """Return the user-visible query string from legacy and current response shapes."""
-        if isinstance(query, str):
-            return query
-
+    def _extract_hit_testing_query(query: Any) -> str:
+        """Return the query string from the service response shape."""
         if isinstance(query, dict):
             content = query.get("content")
             if isinstance(content, str):
@@ -52,15 +49,15 @@ class DatasetsHitTestingBase:
         raise ValueError("Invalid hit testing query response")
 
     @staticmethod
-    def _normalize_hit_testing_records(records: Any) -> list[dict[str, Any]]:
-        """Coerce nullable collection fields into lists before response validation."""
+    def _prepare_hit_testing_records(records: Any) -> list[dict[str, Any]]:
+        """Ensure collection fields match the API schema before response validation."""
         if not isinstance(records, list):
-            return []
+            raise ValueError("Invalid hit testing records response")
 
         normalized_records: list[dict[str, Any]] = []
         for record in records:
             if not isinstance(record, dict):
-                continue
+                raise ValueError("Invalid hit testing record response")
 
             normalized_record = dict(record)
             segment = normalized_record.get("segment")
@@ -118,8 +115,8 @@ class DatasetsHitTestingBase:
                 limit=10,
             )
             return {
-                "query": DatasetsHitTestingBase._normalize_hit_testing_query(response.get("query")),
-                "records": DatasetsHitTestingBase._normalize_hit_testing_records(
+                "query": DatasetsHitTestingBase._extract_hit_testing_query(response.get("query")),
+                "records": DatasetsHitTestingBase._prepare_hit_testing_records(
                     marshal(response.get("records", []), hit_testing_record_fields)
                 ),
             }
diff --git a/api/controllers/console/datasets/rag_pipeline/datasource_content_preview.py b/api/controllers/console/datasets/rag_pipeline/datasource_content_preview.py
index 7caf5b52ed..a43caa8f56 100644
--- a/api/controllers/console/datasets/rag_pipeline/datasource_content_preview.py
+++ b/api/controllers/console/datasets/rag_pipeline/datasource_content_preview.py
@@ -4,6 +4,7 @@ from flask_restx import (  # type: ignore
 from pydantic import BaseModel
 from werkzeug.exceptions import Forbidden
 
+from controllers.common.schema import register_schema_models
 from controllers.console import console_ns
 from controllers.console.datasets.wraps import get_rag_pipeline
 from controllers.console.wraps import account_initialization_required, setup_required
@@ -12,8 +13,6 @@ from models import Account
 from models.dataset import Pipeline
 from services.rag_pipeline.rag_pipeline import RagPipelineService
 
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
-
 
 class Parser(BaseModel):
     inputs: dict
@@ -21,7 +20,7 @@ class Parser(BaseModel):
     credential_id: str | None = None
 
 
-console_ns.schema_model(Parser.__name__, Parser.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0))
+register_schema_models(console_ns, Parser)
 
 
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/published/datasource/nodes/<string:node_id>/preview")
diff --git a/api/controllers/console/datasets/rag_pipeline/rag_pipeline_workflow.py b/api/controllers/console/datasets/rag_pipeline/rag_pipeline_workflow.py
index ee146e8287..77dbf0be3f 100644
--- a/api/controllers/console/datasets/rag_pipeline/rag_pipeline_workflow.py
+++ b/api/controllers/console/datasets/rag_pipeline/rag_pipeline_workflow.py
@@ -3,14 +3,14 @@ import logging
 from typing import Any, Literal, cast
 
 from flask import abort, request
-from flask_restx import Resource, marshal_with  # type: ignore
+from flask_restx import Resource
 from pydantic import BaseModel, Field, ValidationError
 from sqlalchemy.orm import sessionmaker
 from werkzeug.exceptions import BadRequest, Forbidden, InternalServerError, NotFound
 
 import services
 from controllers.common.controller_schemas import DefaultBlockConfigQuery, WorkflowListQuery, WorkflowUpdatePayload
-from controllers.common.schema import register_schema_models
+from controllers.common.schema import register_response_schema_models, register_schema_models
 from controllers.console import console_ns
 from controllers.console.app.error import (
     ConversationCompletedError,
@@ -19,14 +19,8 @@ from controllers.console.app.error import (
 )
 from controllers.console.app.workflow import (
     RESTORE_SOURCE_WORKFLOW_MUST_BE_PUBLISHED_MESSAGE,
-    workflow_model,
-    workflow_pagination_model,
-)
-from controllers.console.app.workflow_run import (
-    workflow_run_detail_model,
-    workflow_run_node_execution_list_model,
-    workflow_run_node_execution_model,
-    workflow_run_pagination_model,
+    WorkflowPaginationResponse,
+    WorkflowResponse,
 )
 from controllers.console.datasets.wraps import get_rag_pipeline
 from controllers.console.wraps import (
@@ -40,9 +34,15 @@ from core.app.apps.pipeline.pipeline_generator import PipelineGenerator
 from core.app.entities.app_invoke_entities import InvokeFrom
 from extensions.ext_database import db
 from factories import variable_factory
+from fields.workflow_run_fields import (
+    WorkflowRunDetailResponse,
+    WorkflowRunNodeExecutionListResponse,
+    WorkflowRunNodeExecutionResponse,
+    WorkflowRunPaginationResponse,
+)
 from graphon.model_runtime.utils.encoders import jsonable_encoder
 from libs import helper
-from libs.helper import TimestampField, UUIDStrOrEmpty
+from libs.helper import TimestampField, UUIDStrOrEmpty, dump_response
 from libs.login import current_account_with_tenant, current_user, login_required
 from models import Account
 from models.dataset import Pipeline
@@ -131,16 +131,28 @@ register_schema_models(
     DatasourceVariablesPayload,
     RagPipelineRecommendedPluginQuery,
 )
+register_response_schema_models(
+    console_ns,
+    WorkflowRunDetailResponse,
+    WorkflowRunNodeExecutionListResponse,
+    WorkflowRunNodeExecutionResponse,
+    WorkflowRunPaginationResponse,
+)
 
 
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft")
 class DraftRagPipelineApi(Resource):
+    @console_ns.response(
+        200,
+        "Draft workflow retrieved successfully",
+        console_ns.models[WorkflowResponse.__name__],
+    )
+    @console_ns.response(404, "Draft workflow not found")
     @setup_required
     @login_required
     @account_initialization_required
     @get_rag_pipeline
     @edit_permission_required
-    @marshal_with(workflow_model)
     def get(self, pipeline: Pipeline):
         """
         Get draft rag pipeline's workflow
@@ -152,8 +164,8 @@ class DraftRagPipelineApi(Resource):
         if not workflow:
             raise DraftWorkflowNotExist()
 
-        # return workflow, if not found, return None (initiate graph by frontend)
-        return workflow
+        # return workflow, if not found, return 404
+        return dump_response(WorkflowResponse, workflow)
 
     @setup_required
     @login_required
@@ -415,12 +427,16 @@ class RagPipelineDraftDatasourceNodeRunApi(Resource):
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/nodes/<string:node_id>/run")
 class RagPipelineDraftNodeRunApi(Resource):
     @console_ns.expect(console_ns.models[NodeRunRequiredPayload.__name__])
+    @console_ns.response(
+        200,
+        "Node run started successfully",
+        console_ns.models[WorkflowRunNodeExecutionResponse.__name__],
+    )
     @setup_required
     @login_required
     @edit_permission_required
     @account_initialization_required
     @get_rag_pipeline
-    @marshal_with(workflow_run_node_execution_model)
     def post(self, pipeline: Pipeline, node_id: str):
         """
         Run draft workflow node
@@ -439,7 +455,9 @@ class RagPipelineDraftNodeRunApi(Resource):
         if workflow_node_execution is None:
             raise ValueError("Workflow node execution not found")
 
-        return workflow_node_execution
+        return WorkflowRunNodeExecutionResponse.model_validate(
+            workflow_node_execution, from_attributes=True
+        ).model_dump(mode="json")
 
 
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflow-runs/tasks/<string:task_id>/stop")
@@ -463,12 +481,16 @@ class RagPipelineTaskStopApi(Resource):
 
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/publish")
 class PublishedRagPipelineApi(Resource):
+    @console_ns.response(
+        200,
+        "Published workflow retrieved successfully, or null if not exist",
+        console_ns.models[WorkflowResponse.__name__],
+    )
     @setup_required
     @login_required
     @account_initialization_required
     @edit_permission_required
     @get_rag_pipeline
-    @marshal_with(workflow_model)
     def get(self, pipeline: Pipeline):
         """
         Get published pipeline
@@ -481,7 +503,10 @@ class PublishedRagPipelineApi(Resource):
         workflow = rag_pipeline_service.get_published_workflow(pipeline=pipeline)
 
         # return workflow, if not found, return None
-        return workflow
+        if workflow is None:
+            return None
+
+        return dump_response(WorkflowResponse, workflow)
 
     @setup_required
     @login_required
@@ -554,12 +579,17 @@ class DefaultRagPipelineBlockConfigApi(Resource):
 
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows")
 class PublishedAllRagPipelineApi(Resource):
+    @console_ns.response(
+        200,
+        "Published workflows retrieved successfully",
+        console_ns.models[WorkflowPaginationResponse.__name__],
+    )
+    @console_ns.response(403, "Permission denied")
     @setup_required
     @login_required
     @account_initialization_required
     @edit_permission_required
     @get_rag_pipeline
-    @marshal_with(workflow_pagination_model)
     def get(self, pipeline: Pipeline):
         """
         Get published workflows
@@ -588,12 +618,14 @@ class PublishedAllRagPipelineApi(Resource):
                 named_only=named_only,
             )
 
-            return {
-                "items": workflows,
-                "page": page,
-                "limit": limit,
-                "has_more": has_more,
-            }
+            return WorkflowPaginationResponse.model_validate(
+                {
+                    "items": workflows,
+                    "page": page,
+                    "limit": limit,
+                    "has_more": has_more,
+                }
+            ).model_dump(mode="json")
 
 
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/<string:workflow_id>/restore")
@@ -628,12 +660,15 @@ class RagPipelineDraftWorkflowRestoreApi(Resource):
 
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/<string:workflow_id>")
 class RagPipelineByIdApi(Resource):
+    @console_ns.response(200, "Workflow updated successfully", console_ns.models[WorkflowResponse.__name__])
+    @console_ns.response(400, "No valid fields to update")
+    @console_ns.response(403, "Permission denied")
+    @console_ns.response(404, "Workflow not found")
     @setup_required
     @login_required
     @account_initialization_required
     @edit_permission_required
     @get_rag_pipeline
-    @marshal_with(workflow_model)
     def patch(self, pipeline: Pipeline, workflow_id: str):
         """
         Update workflow attributes
@@ -662,7 +697,7 @@ class RagPipelineByIdApi(Resource):
             if not workflow:
                 raise NotFound("Workflow not found")
 
-            return workflow
+            return dump_response(WorkflowResponse, workflow)
 
     @setup_required
     @login_required
@@ -778,11 +813,15 @@ class DraftRagPipelineSecondStepApi(Resource):
 
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflow-runs")
 class RagPipelineWorkflowRunListApi(Resource):
+    @console_ns.response(
+        200,
+        "Workflow runs retrieved successfully",
+        console_ns.models[WorkflowRunPaginationResponse.__name__],
+    )
     @setup_required
     @login_required
     @account_initialization_required
     @get_rag_pipeline
-    @marshal_with(workflow_run_pagination_model)
     def get(self, pipeline: Pipeline):
         """
         Get workflow run list
@@ -801,16 +840,20 @@ class RagPipelineWorkflowRunListApi(Resource):
         rag_pipeline_service = RagPipelineService()
         result = rag_pipeline_service.get_rag_pipeline_paginate_workflow_runs(pipeline=pipeline, args=args)
 
-        return result
+        return WorkflowRunPaginationResponse.model_validate(result, from_attributes=True).model_dump(mode="json")
 
 
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflow-runs/<uuid:run_id>")
 class RagPipelineWorkflowRunDetailApi(Resource):
+    @console_ns.response(
+        200,
+        "Workflow run detail retrieved successfully",
+        console_ns.models[WorkflowRunDetailResponse.__name__],
+    )
     @setup_required
     @login_required
     @account_initialization_required
     @get_rag_pipeline
-    @marshal_with(workflow_run_detail_model)
     def get(self, pipeline: Pipeline, run_id):
         """
         Get workflow run detail
@@ -819,17 +862,23 @@ class RagPipelineWorkflowRunDetailApi(Resource):
 
         rag_pipeline_service = RagPipelineService()
         workflow_run = rag_pipeline_service.get_rag_pipeline_workflow_run(pipeline=pipeline, run_id=run_id)
+        if workflow_run is None:
+            raise NotFound("Workflow run not found")
 
-        return workflow_run
+        return WorkflowRunDetailResponse.model_validate(workflow_run, from_attributes=True).model_dump(mode="json")
 
 
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflow-runs/<uuid:run_id>/node-executions")
 class RagPipelineWorkflowRunNodeExecutionListApi(Resource):
+    @console_ns.response(
+        200,
+        "Node executions retrieved successfully",
+        console_ns.models[WorkflowRunNodeExecutionListResponse.__name__],
+    )
     @setup_required
     @login_required
     @account_initialization_required
     @get_rag_pipeline
-    @marshal_with(workflow_run_node_execution_list_model)
     def get(self, pipeline: Pipeline, run_id: str):
         """
         Get workflow run node execution list
@@ -844,7 +893,9 @@ class RagPipelineWorkflowRunNodeExecutionListApi(Resource):
             user=user,
         )
 
-        return {"data": node_executions}
+        return WorkflowRunNodeExecutionListResponse.model_validate(
+            {"data": node_executions}, from_attributes=True
+        ).model_dump(mode="json")
 
 
 @console_ns.route("/rag/pipelines/datasource-plugins")
@@ -859,11 +910,15 @@ class DatasourceListApi(Resource):
 
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/nodes/<string:node_id>/last-run")
 class RagPipelineWorkflowLastRunApi(Resource):
+    @console_ns.response(
+        200,
+        "Node last run retrieved successfully",
+        console_ns.models[WorkflowRunNodeExecutionResponse.__name__],
+    )
     @setup_required
     @login_required
     @account_initialization_required
     @get_rag_pipeline
-    @marshal_with(workflow_run_node_execution_model)
     def get(self, pipeline: Pipeline, node_id: str):
         rag_pipeline_service = RagPipelineService()
         workflow = rag_pipeline_service.get_draft_workflow(pipeline=pipeline)
@@ -876,7 +931,7 @@ class RagPipelineWorkflowLastRunApi(Resource):
         )
         if node_exec is None:
             raise NotFound("last run not found")
-        return node_exec
+        return WorkflowRunNodeExecutionResponse.model_validate(node_exec, from_attributes=True).model_dump(mode="json")
 
 
 @console_ns.route("/rag/pipelines/transform/datasets/<uuid:dataset_id>")
@@ -899,12 +954,16 @@ class RagPipelineTransformApi(Resource):
 @console_ns.route("/rag/pipelines/<uuid:pipeline_id>/workflows/draft/datasource/variables-inspect")
 class RagPipelineDatasourceVariableApi(Resource):
     @console_ns.expect(console_ns.models[DatasourceVariablesPayload.__name__])
+    @console_ns.response(
+        200,
+        "Datasource variables set successfully",
+        console_ns.models[WorkflowRunNodeExecutionResponse.__name__],
+    )
     @setup_required
     @login_required
     @account_initialization_required
     @get_rag_pipeline
     @edit_permission_required
-    @marshal_with(workflow_run_node_execution_model)
     def post(self, pipeline: Pipeline):
         """
         Set datasource variables
@@ -918,7 +977,9 @@ class RagPipelineDatasourceVariableApi(Resource):
             args=args,
             current_user=current_user,
         )
-        return workflow_node_execution
+        return WorkflowRunNodeExecutionResponse.model_validate(
+            workflow_node_execution, from_attributes=True
+        ).model_dump(mode="json")
 
 
 @console_ns.route("/rag/pipelines/recommended-plugins")
diff --git a/api/controllers/console/explore/installed_app.py b/api/controllers/console/explore/installed_app.py
index 2d9a997fbf..08c72e45d5 100644
--- a/api/controllers/console/explore/installed_app.py
+++ b/api/controllers/console/explore/installed_app.py
@@ -16,6 +16,7 @@ from extensions.ext_database import db
 from fields.base import ResponseModel
 from graphon.file import helpers as file_helpers
 from libs.datetime_utils import naive_utc_now
+from libs.helper import to_timestamp
 from libs.login import current_account_with_tenant, login_required
 from models import App, InstalledApp, RecommendedApp
 from models.model import IconType
@@ -105,9 +106,7 @@ class InstalledAppResponse(ResponseModel):
     @field_validator("last_used_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        if isinstance(value, datetime):
-            return int(value.timestamp())
-        return value
+        return to_timestamp(value)
 
 
 class InstalledAppListResponse(ResponseModel):
diff --git a/api/controllers/console/explore/recommended_app.py b/api/controllers/console/explore/recommended_app.py
index 55bd679b48..5821b91489 100644
--- a/api/controllers/console/explore/recommended_app.py
+++ b/api/controllers/console/explore/recommended_app.py
@@ -1,11 +1,12 @@
 from typing import Any
+from uuid import UUID
 
 from flask import request
 from flask_restx import Resource
 from pydantic import BaseModel, Field, computed_field, field_validator
 
 from constants.languages import languages
-from controllers.common.schema import register_schema_models
+from controllers.common.schema import query_params_from_model, register_schema_models
 from controllers.console import console_ns
 from controllers.console.wraps import account_initialization_required
 from fields.base import ResponseModel
@@ -15,7 +16,7 @@ from services.recommended_app_service import RecommendedAppService
 
 
 class RecommendedAppsQuery(BaseModel):
-    language: str | None = Field(default=None)
+    language: str | None = Field(default=None, description="Language code for recommended app localization")
 
 
 class RecommendedAppInfoResponse(ResponseModel):
@@ -52,7 +53,7 @@ class RecommendedAppResponse(ResponseModel):
     copyright: str | None = None
     privacy_policy: str | None = None
     custom_disclaimer: str | None = None
-    category: str | None = None
+    categories: list[str] = Field(default_factory=list)
     position: int | None = None
     is_listed: bool | None = None
     can_trial: bool | None = None
@@ -74,13 +75,13 @@ register_schema_models(
 
 @console_ns.route("/explore/apps")
 class RecommendedAppListApi(Resource):
-    @console_ns.expect(console_ns.models[RecommendedAppsQuery.__name__])
+    @console_ns.doc(params=query_params_from_model(RecommendedAppsQuery))
     @console_ns.response(200, "Success", console_ns.models[RecommendedAppListResponse.__name__])
     @login_required
     @account_initialization_required
     def get(self):
         # language args
-        args = RecommendedAppsQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = RecommendedAppsQuery.model_validate(request.args.to_dict(flat=True))
         language = args.language
         if language and language in languages:
             language_prefix = language
@@ -99,6 +100,5 @@ class RecommendedAppListApi(Resource):
 class RecommendedAppApi(Resource):
     @login_required
     @account_initialization_required
-    def get(self, app_id):
-        app_id = str(app_id)
-        return RecommendedAppService.get_recommend_app_detail(app_id)
+    def get(self, app_id: UUID):
+        return RecommendedAppService.get_recommend_app_detail(str(app_id))
diff --git a/api/controllers/console/explore/trial.py b/api/controllers/console/explore/trial.py
index 1456301a24..26b48ec599 100644
--- a/api/controllers/console/explore/trial.py
+++ b/api/controllers/console/explore/trial.py
@@ -10,7 +10,7 @@ from werkzeug.exceptions import Forbidden, InternalServerError, NotFound
 import services
 from controllers.common.fields import Parameters as ParametersResponse
 from controllers.common.fields import Site as SiteResponse
-from controllers.common.schema import get_or_create_model
+from controllers.common.schema import get_or_create_model, register_schema_models
 from controllers.console import console_ns
 from controllers.console.app.error import (
     AppUnavailableError,
@@ -106,7 +106,7 @@ app_detail_fields_with_site_copy["tags"] = fields.List(fields.Nested(tag_model))
 app_detail_fields_with_site_copy["site"] = fields.Nested(site_model)
 app_detail_with_site_model = get_or_create_model("TrialAppDetailWithSite", app_detail_fields_with_site_copy)
 
-simple_account_model = get_or_create_model("SimpleAccount", simple_account_fields)
+simple_account_model = get_or_create_model("TrialSimpleAccount", simple_account_fields)
 conversation_variable_model = get_or_create_model("TrialConversationVariable", conversation_variable_fields)
 pipeline_variable_model = get_or_create_model("TrialPipelineVariable", pipeline_variable_fields)
 
@@ -120,10 +120,6 @@ workflow_fields_copy["rag_pipeline_variables"] = fields.List(fields.Nested(pipel
 workflow_model = get_or_create_model("TrialWorkflow", workflow_fields_copy)
 
 
-# Pydantic models for request validation
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
-
-
 class WorkflowRunRequest(BaseModel):
     inputs: dict
     files: list | None = None
@@ -153,19 +149,7 @@ class CompletionRequest(BaseModel):
     retriever_from: str = "explore_app"
 
 
-# Register schemas for Swagger documentation
-console_ns.schema_model(
-    WorkflowRunRequest.__name__, WorkflowRunRequest.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0)
-)
-console_ns.schema_model(
-    ChatRequest.__name__, ChatRequest.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0)
-)
-console_ns.schema_model(
-    TextToSpeechRequest.__name__, TextToSpeechRequest.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0)
-)
-console_ns.schema_model(
-    CompletionRequest.__name__, CompletionRequest.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0)
-)
+register_schema_models(console_ns, WorkflowRunRequest, ChatRequest, TextToSpeechRequest, CompletionRequest)
 
 
 class TrialAppWorkflowRunApi(TrialAppResource):
diff --git a/api/controllers/console/extension.py b/api/controllers/console/extension.py
index 7a6356d052..0c9a93c1cd 100644
--- a/api/controllers/console/extension.py
+++ b/api/controllers/console/extension.py
@@ -7,6 +7,7 @@ from pydantic import BaseModel, Field, TypeAdapter, field_validator
 
 from constants import HIDDEN_VALUE
 from fields.base import ResponseModel
+from libs.helper import to_timestamp
 from libs.login import current_account_with_tenant, login_required
 from models.api_based_extension import APIBasedExtension
 from services.api_based_extension_service import APIBasedExtensionService
@@ -40,12 +41,6 @@ def _mask_api_key(api_key: str) -> str:
     return api_key[:3] + "******" + api_key[-3:]
 
 
-def _to_timestamp(value: datetime | int | None) -> int | None:
-    if isinstance(value, datetime):
-        return int(value.timestamp())
-    return value
-
-
 class APIBasedExtensionResponse(ResponseModel):
     id: str
     name: str
@@ -61,7 +56,7 @@ class APIBasedExtensionResponse(ResponseModel):
     @field_validator("created_at", mode="before")
     @classmethod
     def _normalize_created_at(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 register_schema_models(console_ns, APIBasedExtensionPayload, CodeBasedExtensionResponse, APIBasedExtensionResponse)
@@ -89,7 +84,7 @@ class CodeBasedExtensionAPI(Resource):
     @login_required
     @account_initialization_required
     def get(self):
-        query = CodeBasedExtensionQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        query = CodeBasedExtensionQuery.model_validate(request.args.to_dict(flat=True))
 
         return CodeBasedExtensionResponse(
             module=query.module,
diff --git a/api/controllers/console/files.py b/api/controllers/console/files.py
index 109a3cd0d3..5751026040 100644
--- a/api/controllers/console/files.py
+++ b/api/controllers/console/files.py
@@ -82,7 +82,7 @@ class FileApi(Resource):
         try:
             upload_file = FileService(db.engine).upload_file(
                 filename=file.filename,
-                content=file.read(),
+                content=file.stream.read(),
                 mimetype=file.mimetype,
                 user=current_user,
                 source=source,
@@ -105,7 +105,8 @@ class FilePreviewApi(Resource):
     @account_initialization_required
     def get(self, file_id):
         file_id = str(file_id)
-        text = FileService(db.engine).get_file_preview(file_id)
+        _, tenant_id = current_account_with_tenant()
+        text = FileService(db.engine).get_file_preview(file_id, tenant_id)
         return {"content": text}
 
 
diff --git a/api/controllers/console/tag/tags.py b/api/controllers/console/tag/tags.py
index f73e2da54e..346f572ccc 100644
--- a/api/controllers/console/tag/tags.py
+++ b/api/controllers/console/tag/tags.py
@@ -25,6 +25,10 @@ class TagBasePayload(BaseModel):
     type: TagType = Field(description="Tag type")
 
 
+class TagUpdateRequestPayload(BaseModel):
+    name: str = Field(description="Tag name", min_length=1, max_length=50)
+
+
 class TagBindingPayload(BaseModel):
     tag_ids: list[str] = Field(description="Tag IDs to bind")
     target_id: str = Field(description="Target ID to bind tags to")
@@ -32,12 +36,7 @@ class TagBindingPayload(BaseModel):
 
 
 class TagBindingRemovePayload(BaseModel):
-    tag_id: str = Field(description="Tag ID to remove")
-    target_id: str = Field(description="Target ID to unbind tag from")
-    type: TagType = Field(description="Tag type")
-
-
-class TagBindingItemDeletePayload(BaseModel):
+    tag_ids: list[str] = Field(description="Tag IDs to remove", min_length=1)
     target_id: str = Field(description="Target ID to unbind tag from")
     type: TagType = Field(description="Tag type")
 
@@ -73,9 +72,9 @@ class TagResponse(ResponseModel):
 register_schema_models(
     console_ns,
     TagBasePayload,
+    TagUpdateRequestPayload,
     TagBindingPayload,
     TagBindingRemovePayload,
-    TagBindingItemDeletePayload,
     TagListQueryParam,
     TagResponse,
 )
@@ -124,7 +123,7 @@ class TagListApi(Resource):
 
 @console_ns.route("/tags/<uuid:tag_id>")
 class TagUpdateDeleteApi(Resource):
-    @console_ns.expect(console_ns.models[TagBasePayload.__name__])
+    @console_ns.expect(console_ns.models[TagUpdateRequestPayload.__name__])
     @setup_required
     @login_required
     @account_initialization_required
@@ -135,8 +134,8 @@ class TagUpdateDeleteApi(Resource):
         if not (current_user.has_edit_permission or current_user.is_dataset_editor):
             raise Forbidden()
 
-        payload = TagBasePayload.model_validate(console_ns.payload or {})
-        tag = TagService.update_tags(UpdateTagPayload(name=payload.name, type=payload.type), tag_id)
+        payload = TagUpdateRequestPayload.model_validate(console_ns.payload or {})
+        tag = TagService.update_tags(UpdateTagPayload(name=payload.name), tag_id)
 
         binding_count = TagService.get_tag_binding_count(tag_id)
 
@@ -184,13 +183,13 @@ def _create_tag_bindings() -> tuple[dict[str, str], int]:
     return {"result": "success"}, 200
 
 
-def _remove_tag_binding() -> tuple[dict[str, str], int]:
+def _remove_tag_bindings() -> tuple[dict[str, str], int]:
     _require_tag_binding_edit_permission()
 
     payload = TagBindingRemovePayload.model_validate(console_ns.payload or {})
     TagService.delete_tag_binding(
         TagBindingDeletePayload(
-            tag_id=payload.tag_id,
+            tag_ids=payload.tag_ids,
             target_id=payload.target_id,
             type=payload.type,
         )
@@ -211,54 +210,15 @@ class TagBindingCollectionApi(Resource):
         return _create_tag_bindings()
 
 
-@console_ns.route("/tag-bindings/<uuid:id>")
-class TagBindingItemApi(Resource):
-    """Canonical item resource for tag binding deletion."""
-
-    @console_ns.doc("delete_tag_binding")
-    @console_ns.doc(params={"id": "Tag ID"})
-    @console_ns.expect(console_ns.models[TagBindingItemDeletePayload.__name__])
-    @setup_required
-    @login_required
-    @account_initialization_required
-    def delete(self, id):
-        _require_tag_binding_edit_permission()
-        payload = TagBindingItemDeletePayload.model_validate(console_ns.payload or {})
-        TagService.delete_tag_binding(
-            TagBindingDeletePayload(
-                tag_id=str(id),
-                target_id=payload.target_id,
-                type=payload.type,
-            )
-        )
-        return {"result": "success"}, 200
-
-
-@console_ns.route("/tag-bindings/create")
-class DeprecatedTagBindingCreateApi(Resource):
-    """Deprecated verb-based alias for tag binding creation."""
-
-    @console_ns.doc("create_tag_binding_deprecated")
-    @console_ns.doc(deprecated=True)
-    @console_ns.doc(description="Deprecated legacy alias. Use POST /tag-bindings instead.")
-    @console_ns.expect(console_ns.models[TagBindingPayload.__name__])
-    @setup_required
-    @login_required
-    @account_initialization_required
-    def post(self):
-        return _create_tag_bindings()
-
-
 @console_ns.route("/tag-bindings/remove")
-class DeprecatedTagBindingRemoveApi(Resource):
-    """Deprecated verb-based alias for tag binding deletion."""
+class TagBindingRemoveApi(Resource):
+    """Batch resource for tag binding deletion."""
 
-    @console_ns.doc("delete_tag_binding_deprecated")
-    @console_ns.doc(deprecated=True)
-    @console_ns.doc(description="Deprecated legacy alias. Use DELETE /tag-bindings/{id} instead.")
+    @console_ns.doc("remove_tag_bindings")
+    @console_ns.doc(description="Remove one or more tag bindings from a target.")
     @console_ns.expect(console_ns.models[TagBindingRemovePayload.__name__])
     @setup_required
     @login_required
     @account_initialization_required
     def post(self):
-        return _remove_tag_binding()
+        return _remove_tag_bindings()
diff --git a/api/controllers/console/workspace/account.py b/api/controllers/console/workspace/account.py
index d69a59ecb7..b1c363433a 100644
--- a/api/controllers/console/workspace/account.py
+++ b/api/controllers/console/workspace/account.py
@@ -42,7 +42,7 @@ from fields.base import ResponseModel
 from fields.member_fields import Account as AccountResponse
 from graphon.file import helpers as file_helpers
 from libs.datetime_utils import naive_utc_now
-from libs.helper import EmailStr, extract_remote_ip, timezone
+from libs.helper import EmailStr, extract_remote_ip, timezone, to_timestamp
 from libs.login import current_account_with_tenant, login_required
 from models import AccountIntegrate, InvitationCode
 from models.account import AccountStatus, InvitationCodeStatus
@@ -52,8 +52,6 @@ from services.account_service import AccountService
 from services.billing_service import BillingService
 from services.errors.account import CurrentPasswordIncorrectError as ServiceCurrentPasswordIncorrectError
 
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
-
 
 class AccountInitPayload(BaseModel):
     interface_language: str
@@ -161,39 +159,32 @@ class CheckEmailUniquePayload(BaseModel):
     email: EmailStr
 
 
-def reg(cls: type[BaseModel]):
-    console_ns.schema_model(cls.__name__, cls.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0))
-
-
-reg(AccountInitPayload)
-reg(AccountNamePayload)
-reg(AccountAvatarPayload)
-reg(AccountAvatarQuery)
-reg(AccountInterfaceLanguagePayload)
-reg(AccountInterfaceThemePayload)
-reg(AccountTimezonePayload)
-reg(AccountPasswordPayload)
-reg(AccountDeletePayload)
-reg(AccountDeletionFeedbackPayload)
-reg(EducationActivatePayload)
-reg(EducationAutocompleteQuery)
-reg(ChangeEmailSendPayload)
-reg(ChangeEmailValidityPayload)
-reg(ChangeEmailResetPayload)
-reg(CheckEmailUniquePayload)
-register_schema_models(console_ns, AccountResponse)
+register_schema_models(
+    console_ns,
+    AccountResponse,
+    AccountInitPayload,
+    AccountNamePayload,
+    AccountAvatarPayload,
+    AccountAvatarQuery,
+    AccountInterfaceLanguagePayload,
+    AccountInterfaceThemePayload,
+    AccountTimezonePayload,
+    AccountPasswordPayload,
+    AccountDeletePayload,
+    AccountDeletionFeedbackPayload,
+    EducationActivatePayload,
+    EducationAutocompleteQuery,
+    ChangeEmailSendPayload,
+    ChangeEmailValidityPayload,
+    ChangeEmailResetPayload,
+    CheckEmailUniquePayload,
+)
 
 
 def _serialize_account(account) -> dict[str, Any]:
     return AccountResponse.model_validate(account, from_attributes=True).model_dump(mode="json")
 
 
-def _to_timestamp(value: datetime | int | None) -> int | None:
-    if isinstance(value, datetime):
-        return int(value.timestamp())
-    return value
-
-
 class AccountIntegrateResponse(ResponseModel):
     provider: str
     created_at: int | None = None
@@ -203,7 +194,7 @@ class AccountIntegrateResponse(ResponseModel):
     @field_validator("created_at", mode="before")
     @classmethod
     def _normalize_created_at(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 class AccountIntegrateListResponse(ResponseModel):
@@ -223,7 +214,7 @@ class EducationStatusResponse(ResponseModel):
     @field_validator("expire_at", mode="before")
     @classmethod
     def _normalize_expire_at(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 class EducationAutocompleteResponse(ResponseModel):
@@ -326,7 +317,7 @@ class AccountAvatarApi(Resource):
     @account_initialization_required
     def get(self):
         current_user, current_tenant_id = current_account_with_tenant()
-        args = AccountAvatarQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = AccountAvatarQuery.model_validate(request.args.to_dict(flat=True))
         avatar = args.avatar
 
         if avatar.startswith(("http://", "https://")):
diff --git a/api/controllers/console/workspace/endpoint.py b/api/controllers/console/workspace/endpoint.py
index d4be07382a..925f3e1197 100644
--- a/api/controllers/console/workspace/endpoint.py
+++ b/api/controllers/console/workspace/endpoint.py
@@ -20,8 +20,6 @@ from graphon.model_runtime.utils.encoders import jsonable_encoder
 from libs.login import current_account_with_tenant, login_required
 from services.plugin.endpoint_service import EndpointService
 
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
-
 
 class EndpointCreatePayload(BaseModel):
     plugin_unique_identifier: str
@@ -80,10 +78,6 @@ class EndpointDisableResponse(BaseModel):
     success: bool = Field(description="Operation success")
 
 
-def reg(cls: type[BaseModel]):
-    console_ns.schema_model(cls.__name__, cls.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0))
-
-
 register_schema_models(
     console_ns,
     EndpointCreatePayload,
@@ -215,7 +209,7 @@ class EndpointListApi(Resource):
     def get(self):
         user, tenant_id = current_account_with_tenant()
 
-        args = EndpointListQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = EndpointListQuery.model_validate(request.args.to_dict(flat=True))
 
         page = args.page
         page_size = args.page_size
@@ -248,7 +242,7 @@ class EndpointListForSinglePluginApi(Resource):
     def get(self):
         user, tenant_id = current_account_with_tenant()
 
-        args = EndpointListForPluginQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = EndpointListForPluginQuery.model_validate(request.args.to_dict(flat=True))
 
         page = args.page
         page_size = args.page_size
diff --git a/api/controllers/console/workspace/members.py b/api/controllers/console/workspace/members.py
index e3bf4c95b8..dfc4142085 100644
--- a/api/controllers/console/workspace/members.py
+++ b/api/controllers/console/workspace/members.py
@@ -33,8 +33,6 @@ from services.account_service import AccountService, RegisterService, TenantServ
 from services.errors.account import AccountAlreadyInTenantError
 from services.feature_service import FeatureService
 
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
-
 
 class MemberInvitePayload(BaseModel):
     emails: list[str] = Field(default_factory=list)
@@ -59,17 +57,23 @@ class OwnerTransferPayload(BaseModel):
     token: str
 
 
-def reg(cls: type[BaseModel]):
-    console_ns.schema_model(cls.__name__, cls.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0))
-
-
-reg(MemberInvitePayload)
-reg(MemberRoleUpdatePayload)
-reg(OwnerTransferEmailPayload)
-reg(OwnerTransferCheckPayload)
-reg(OwnerTransferPayload)
 register_enum_models(console_ns, TenantAccountRole)
-register_schema_models(console_ns, AccountWithRole, AccountWithRoleList)
+register_schema_models(
+    console_ns,
+    AccountWithRole,
+    AccountWithRoleList,
+    MemberInvitePayload,
+    MemberRoleUpdatePayload,
+    OwnerTransferEmailPayload,
+    OwnerTransferCheckPayload,
+    OwnerTransferPayload,
+)
+
+
+def _is_role_enabled(role: TenantAccountRole | str, tenant_id: str) -> bool:
+    if role != TenantAccountRole.DATASET_OPERATOR:
+        return True
+    return FeatureService.get_features(tenant_id=tenant_id).dataset_operator_enabled
 
 
 @console_ns.route("/workspaces/current/members")
@@ -112,6 +116,8 @@ class MemberInviteEmailApi(Resource):
         inviter = current_user
         if not inviter.current_tenant:
             raise ValueError("No current tenant")
+        if not _is_role_enabled(invitee_role, inviter.current_tenant.id):
+            return {"code": "invalid-role", "message": "Invalid role"}, 400
 
         # Check workspace permission for member invitations
         from libs.workspace_permission import check_workspace_member_invite_permission
@@ -210,6 +216,8 @@ class MemberUpdateRoleApi(Resource):
         current_user, _ = current_account_with_tenant()
         if not current_user.current_tenant:
             raise ValueError("No current tenant")
+        if not _is_role_enabled(new_role, current_user.current_tenant.id):
+            return {"code": "invalid-role", "message": "Invalid role"}, 400
         member = db.session.get(Account, str(member_id))
         if not member:
             abort(404)
@@ -217,11 +225,17 @@ class MemberUpdateRoleApi(Resource):
         try:
             assert member is not None, "Member not found"
             TenantService.update_member_role(current_user.current_tenant, member, new_role, current_user)
+        except services.errors.account.CannotOperateSelfError as e:
+            return {"code": "cannot-operate-self", "message": str(e)}, 400
+        except services.errors.account.NoPermissionError as e:
+            return {"code": "forbidden", "message": str(e)}, 403
+        except services.errors.account.MemberNotInTenantError as e:
+            return {"code": "member-not-found", "message": str(e)}, 404
+        except services.errors.account.RoleAlreadyAssignedError as e:
+            return {"code": "role-already-assigned", "message": str(e)}, 400
         except Exception as e:
             raise ValueError(str(e))
 
-        # todo: 403
-
         return {"result": "success"}
 
 
diff --git a/api/controllers/console/workspace/model_providers.py b/api/controllers/console/workspace/model_providers.py
index 4b10561fdb..2f75218c0f 100644
--- a/api/controllers/console/workspace/model_providers.py
+++ b/api/controllers/console/workspace/model_providers.py
@@ -5,6 +5,7 @@ from flask import request, send_file
 from flask_restx import Resource
 from pydantic import BaseModel, Field, field_validator
 
+from controllers.common.schema import register_schema_models
 from controllers.console import console_ns
 from controllers.console.wraps import account_initialization_required, is_admin_or_owner_required, setup_required
 from graphon.model_runtime.entities.model_entities import ModelType
@@ -15,8 +16,6 @@ from libs.login import current_account_with_tenant, login_required
 from services.billing_service import BillingService
 from services.model_provider_service import ModelProviderService
 
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
-
 
 class ParserModelList(BaseModel):
     model_type: ModelType | None = None
@@ -75,18 +74,17 @@ class ParserPreferredProviderType(BaseModel):
     preferred_provider_type: Literal["system", "custom"]
 
 
-def reg(cls: type[BaseModel]):
-    console_ns.schema_model(cls.__name__, cls.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0))
-
-
-reg(ParserModelList)
-reg(ParserCredentialId)
-reg(ParserCredentialCreate)
-reg(ParserCredentialUpdate)
-reg(ParserCredentialDelete)
-reg(ParserCredentialSwitch)
-reg(ParserCredentialValidate)
-reg(ParserPreferredProviderType)
+register_schema_models(
+    console_ns,
+    ParserModelList,
+    ParserCredentialId,
+    ParserCredentialCreate,
+    ParserCredentialUpdate,
+    ParserCredentialDelete,
+    ParserCredentialSwitch,
+    ParserCredentialValidate,
+    ParserPreferredProviderType,
+)
 
 
 @console_ns.route("/workspaces/current/model-providers")
diff --git a/api/controllers/console/workspace/models.py b/api/controllers/console/workspace/models.py
index b2d07ff8f9..7f7d6379c3 100644
--- a/api/controllers/console/workspace/models.py
+++ b/api/controllers/console/workspace/models.py
@@ -17,7 +17,6 @@ from services.model_load_balancing_service import ModelLoadBalancingService
 from services.model_provider_service import ModelProviderService
 
 logger = logging.getLogger(__name__)
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
 
 
 class ParserGetDefault(BaseModel):
@@ -107,6 +106,12 @@ class ParserParameter(BaseModel):
     model: str
 
 
+class ParserSwitch(BaseModel):
+    model: str
+    model_type: ModelType
+    credential_id: str
+
+
 register_schema_models(
     console_ns,
     ParserGetDefault,
@@ -119,6 +124,7 @@ register_schema_models(
     ParserDeleteCredential,
     ParserParameter,
     Inner,
+    ParserSwitch,
 )
 
 register_enum_models(console_ns, ModelType)
@@ -133,7 +139,7 @@ class DefaultModelApi(Resource):
     def get(self):
         _, tenant_id = current_account_with_tenant()
 
-        args = ParserGetDefault.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = ParserGetDefault.model_validate(request.args.to_dict(flat=True))
 
         model_provider_service = ModelProviderService()
         default_model_entity = model_provider_service.get_default_model_of_model_type(
@@ -261,7 +267,7 @@ class ModelProviderModelCredentialApi(Resource):
     def get(self, provider: str):
         _, tenant_id = current_account_with_tenant()
 
-        args = ParserGetCredentials.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = ParserGetCredentials.model_validate(request.args.to_dict(flat=True))
 
         model_provider_service = ModelProviderService()
         current_credential = model_provider_service.get_model_credential(
@@ -387,17 +393,6 @@ class ModelProviderModelCredentialApi(Resource):
         return {"result": "success"}, 204
 
 
-class ParserSwitch(BaseModel):
-    model: str
-    model_type: ModelType
-    credential_id: str
-
-
-console_ns.schema_model(
-    ParserSwitch.__name__, ParserSwitch.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0)
-)
-
-
 @console_ns.route("/workspaces/current/model-providers/<path:provider>/models/credentials/switch")
 class ModelProviderModelCredentialSwitchApi(Resource):
     @console_ns.expect(console_ns.models[ParserSwitch.__name__])
@@ -468,9 +463,7 @@ class ParserValidate(BaseModel):
     credentials: dict[str, Any]
 
 
-console_ns.schema_model(
-    ParserValidate.__name__, ParserValidate.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0)
-)
+register_schema_models(console_ns, ParserSwitch, ParserValidate)
 
 
 @console_ns.route("/workspaces/current/model-providers/<path:provider>/models/credentials/validate")
@@ -515,7 +508,7 @@ class ModelProviderModelParameterRuleApi(Resource):
     @login_required
     @account_initialization_required
     def get(self, provider: str):
-        args = ParserParameter.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = ParserParameter.model_validate(request.args.to_dict(flat=True))
         _, tenant_id = current_account_with_tenant()
 
         model_provider_service = ModelProviderService()
diff --git a/api/controllers/console/workspace/plugin.py b/api/controllers/console/workspace/plugin.py
index b3e344ccea..a6d4a60beb 100644
--- a/api/controllers/console/workspace/plugin.py
+++ b/api/controllers/console/workspace/plugin.py
@@ -177,7 +177,7 @@ def _read_upload_content(file: FileStorage, max_size: int) -> bytes:
     FileStorage.content_length is not reliable for multipart test uploads and may be zero even when
     content exists, so the controllers validate against the loaded bytes instead.
     """
-    content = file.read()
+    content = file.stream.read()
     if len(content) > max_size:
         raise ValueError("File size exceeds the maximum allowed size")
 
@@ -211,7 +211,7 @@ class PluginListApi(Resource):
     @account_initialization_required
     def get(self):
         _, tenant_id = current_account_with_tenant()
-        args = ParserList.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = ParserList.model_validate(request.args.to_dict(flat=True))
         try:
             plugins_with_total = PluginService.list_with_total(tenant_id, args.page, args.page_size)
         except PluginDaemonClientSideError as e:
@@ -261,7 +261,7 @@ class PluginIconApi(Resource):
     @console_ns.expect(console_ns.models[ParserIcon.__name__])
     @setup_required
     def get(self):
-        args = ParserIcon.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = ParserIcon.model_validate(request.args.to_dict(flat=True))
 
         try:
             icon_bytes, mimetype = PluginService.get_asset(args.tenant_id, args.filename)
@@ -279,7 +279,7 @@ class PluginAssetApi(Resource):
     @login_required
     @account_initialization_required
     def get(self):
-        args = ParserAsset.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = ParserAsset.model_validate(request.args.to_dict(flat=True))
 
         _, tenant_id = current_account_with_tenant()
         try:
@@ -421,7 +421,7 @@ class PluginFetchMarketplacePkgApi(Resource):
     @plugin_permission_required(install_required=True)
     def get(self):
         _, tenant_id = current_account_with_tenant()
-        args = ParserPluginIdentifierQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = ParserPluginIdentifierQuery.model_validate(request.args.to_dict(flat=True))
 
         try:
             return jsonable_encoder(
@@ -446,7 +446,7 @@ class PluginFetchManifestApi(Resource):
     def get(self):
         _, tenant_id = current_account_with_tenant()
 
-        args = ParserPluginIdentifierQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = ParserPluginIdentifierQuery.model_validate(request.args.to_dict(flat=True))
 
         try:
             return jsonable_encoder(
@@ -466,7 +466,7 @@ class PluginFetchInstallTasksApi(Resource):
     def get(self):
         _, tenant_id = current_account_with_tenant()
 
-        args = ParserTasks.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = ParserTasks.model_validate(request.args.to_dict(flat=True))
 
         try:
             return jsonable_encoder({"tasks": PluginService.fetch_install_tasks(tenant_id, args.page, args.page_size)})
@@ -660,7 +660,7 @@ class PluginFetchDynamicSelectOptionsApi(Resource):
         current_user, tenant_id = current_account_with_tenant()
         user_id = current_user.id
 
-        args = ParserDynamicOptions.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = ParserDynamicOptions.model_validate(request.args.to_dict(flat=True))
 
         try:
             options = PluginParameterService.get_dynamic_select_options(
@@ -822,7 +822,7 @@ class PluginReadmeApi(Resource):
     @account_initialization_required
     def get(self):
         _, tenant_id = current_account_with_tenant()
-        args = ParserReadme.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = ParserReadme.model_validate(request.args.to_dict(flat=True))
         return jsonable_encoder(
             {"readme": PluginService.fetch_plugin_readme(tenant_id, args.plugin_unique_identifier, args.language)}
         )
diff --git a/api/controllers/console/workspace/tool_providers.py b/api/controllers/console/workspace/tool_providers.py
index 34c9534de8..cb01a02318 100644
--- a/api/controllers/console/workspace/tool_providers.py
+++ b/api/controllers/console/workspace/tool_providers.py
@@ -874,12 +874,13 @@ class ToolBuiltinProviderSetDefaultApi(Resource):
     @console_ns.expect(console_ns.models[BuiltinProviderDefaultCredentialPayload.__name__])
     @setup_required
     @login_required
+    @is_admin_or_owner_required
     @account_initialization_required
     def post(self, provider):
-        current_user, current_tenant_id = current_account_with_tenant()
+        _, current_tenant_id = current_account_with_tenant()
         payload = BuiltinProviderDefaultCredentialPayload.model_validate(console_ns.payload or {})
         return BuiltinToolManageService.set_default_provider(
-            tenant_id=current_tenant_id, user_id=current_user.id, provider=provider, id=payload.id
+            tenant_id=current_tenant_id, provider=provider, id=payload.id
         )
 
 
diff --git a/api/controllers/console/workspace/workspace.py b/api/controllers/console/workspace/workspace.py
index 565099db61..1eb91c472e 100644
--- a/api/controllers/console/workspace/workspace.py
+++ b/api/controllers/console/workspace/workspace.py
@@ -16,6 +16,7 @@ from controllers.common.errors import (
     TooManyFilesError,
     UnsupportedFileTypeError,
 )
+from controllers.common.schema import register_schema_models
 from controllers.console import console_ns
 from controllers.console.admin import admin_required
 from controllers.console.error import AccountNotLinkTenantError
@@ -28,7 +29,7 @@ from controllers.console.wraps import (
 from enums.cloud_plan import CloudPlan
 from extensions.ext_database import db
 from fields.base import ResponseModel
-from libs.helper import TimestampField
+from libs.helper import TimestampField, to_timestamp
 from libs.login import current_account_with_tenant, login_required
 from models.account import Tenant, TenantCustomConfigDict, TenantStatus
 from services.account_service import TenantService
@@ -39,7 +40,6 @@ from services.file_service import FileService
 from services.workspace_service import WorkspaceService
 
 logger = logging.getLogger(__name__)
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
 
 
 class WorkspaceListQuery(BaseModel):
@@ -86,20 +86,17 @@ class TenantInfoResponse(ResponseModel):
     @field_validator("created_at", mode="before")
     @classmethod
     def _normalize_created_at(cls, value: datetime | int | None):
-        if isinstance(value, datetime):
-            return int(value.timestamp())
-        return value
+        return to_timestamp(value)
 
 
-def reg(cls: type[BaseModel]):
-    console_ns.schema_model(cls.__name__, cls.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0))
-
-
-reg(WorkspaceListQuery)
-reg(SwitchWorkspacePayload)
-reg(WorkspaceCustomConfigPayload)
-reg(WorkspaceInfoPayload)
-reg(TenantInfoResponse)
+register_schema_models(
+    console_ns,
+    WorkspaceListQuery,
+    SwitchWorkspacePayload,
+    WorkspaceCustomConfigPayload,
+    WorkspaceInfoPayload,
+    TenantInfoResponse,
+)
 
 provider_fields = {
     "provider_name": fields.String,
@@ -322,7 +319,7 @@ class WebappLogoWorkspaceApi(Resource):
         try:
             upload_file = FileService(db.engine).upload_file(
                 filename=file.filename,
-                content=file.read(),
+                content=file.stream.read(),
                 mimetype=file.mimetype,
                 user=current_user,
             )
diff --git a/api/controllers/files/image_preview.py b/api/controllers/files/image_preview.py
index a91e745f80..be7886e831 100644
--- a/api/controllers/files/image_preview.py
+++ b/api/controllers/files/image_preview.py
@@ -8,13 +8,12 @@ from werkzeug.exceptions import NotFound
 import services
 from controllers.common.errors import UnsupportedFileTypeError
 from controllers.common.file_response import enforce_download_for_html
+from controllers.common.schema import register_schema_models
 from controllers.files import files_ns
 from extensions.ext_database import db
 from services.account_service import TenantService
 from services.file_service import FileService
 
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
-
 
 class FileSignatureQuery(BaseModel):
     timestamp: str = Field(..., description="Unix timestamp used in the signature")
@@ -26,12 +25,7 @@ class FilePreviewQuery(FileSignatureQuery):
     as_attachment: bool = Field(default=False, description="Whether to download as attachment")
 
 
-files_ns.schema_model(
-    FileSignatureQuery.__name__, FileSignatureQuery.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0)
-)
-files_ns.schema_model(
-    FilePreviewQuery.__name__, FilePreviewQuery.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0)
-)
+register_schema_models(files_ns, FileSignatureQuery, FilePreviewQuery)
 
 
 @files_ns.route("/<uuid:file_id>/image-preview")
@@ -58,7 +52,7 @@ class ImagePreviewApi(Resource):
     def get(self, file_id):
         file_id = str(file_id)
 
-        args = FileSignatureQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = FileSignatureQuery.model_validate(request.args.to_dict(flat=True))
         timestamp = args.timestamp
         nonce = args.nonce
         sign = args.sign
@@ -100,7 +94,7 @@ class FilePreviewApi(Resource):
     def get(self, file_id):
         file_id = str(file_id)
 
-        args = FilePreviewQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = FilePreviewQuery.model_validate(request.args.to_dict(flat=True))
 
         try:
             generator, upload_file = FileService(db.engine).get_file_generator_by_file_id(
diff --git a/api/controllers/files/tool_files.py b/api/controllers/files/tool_files.py
index 2f1e2f28bd..8ae16ce7f4 100644
--- a/api/controllers/files/tool_files.py
+++ b/api/controllers/files/tool_files.py
@@ -7,12 +7,11 @@ from werkzeug.exceptions import Forbidden, NotFound
 
 from controllers.common.errors import UnsupportedFileTypeError
 from controllers.common.file_response import enforce_download_for_html
+from controllers.common.schema import register_schema_models
 from controllers.files import files_ns
 from core.tools.signature import verify_tool_file_signature
 from core.tools.tool_file_manager import ToolFileManager
 
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
-
 
 class ToolFileQuery(BaseModel):
     timestamp: str = Field(..., description="Unix timestamp")
@@ -21,9 +20,7 @@ class ToolFileQuery(BaseModel):
     as_attachment: bool = Field(default=False, description="Download as attachment")
 
 
-files_ns.schema_model(
-    ToolFileQuery.__name__, ToolFileQuery.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0)
-)
+register_schema_models(files_ns, ToolFileQuery)
 
 
 @files_ns.route("/tools/<uuid:file_id>.<string:extension>")
diff --git a/api/controllers/files/upload.py b/api/controllers/files/upload.py
index ed3278a28b..7d588b95dd 100644
--- a/api/controllers/files/upload.py
+++ b/api/controllers/files/upload.py
@@ -20,8 +20,6 @@ from ..console.wraps import setup_required
 from ..files import files_ns
 from ..inner_api.plugin.wraps import get_user
 
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
-
 
 class PluginUploadQuery(BaseModel):
     timestamp: str = Field(..., description="Unix timestamp for signature verification")
@@ -31,9 +29,8 @@ class PluginUploadQuery(BaseModel):
     user_id: str | None = Field(default=None, description="User identifier")
 
 
-files_ns.schema_model(
-    PluginUploadQuery.__name__, PluginUploadQuery.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0)
-)
+register_schema_models(files_ns, PluginUploadQuery)
+
 
 register_schema_models(files_ns, FileResponse)
 
@@ -69,7 +66,7 @@ class PluginUploadFileApi(Resource):
             FileTooLargeError: File exceeds size limit
             UnsupportedFileTypeError: File type not supported
         """
-        args = PluginUploadQuery.model_validate(request.args.to_dict(flat=True))  # type: ignore
+        args = PluginUploadQuery.model_validate(request.args.to_dict(flat=True))
 
         file = request.files.get("file")
         if file is None:
@@ -103,7 +100,7 @@ class PluginUploadFileApi(Resource):
             tool_file = ToolFileManager().create_file_by_raw(
                 user_id=user.id,
                 tenant_id=tenant_id,
-                file_binary=file.read(),
+                file_binary=file.stream.read(),
                 mimetype=mimetype,
                 filename=filename,
                 conversation_id=None,
diff --git a/api/controllers/service_api/app/conversation.py b/api/controllers/service_api/app/conversation.py
index ca4b18cb5e..64b2038f9c 100644
--- a/api/controllers/service_api/app/conversation.py
+++ b/api/controllers/service_api/app/conversation.py
@@ -22,7 +22,7 @@ from fields.conversation_fields import (
     SimpleConversation,
 )
 from graphon.variables.types import SegmentType
-from libs.helper import UUIDStrOrEmpty
+from libs.helper import UUIDStrOrEmpty, to_timestamp
 from models.model import App, AppMode, EndUser
 from services.conversation_service import ConversationService
 
@@ -115,9 +115,7 @@ class ConversationVariableResponse(ResponseModel):
     @field_validator("created_at", "updated_at", mode="before")
     @classmethod
     def normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        if isinstance(value, datetime):
-            return int(value.timestamp())
-        return value
+        return to_timestamp(value)
 
 
 class ConversationVariableInfiniteScrollPaginationResponse(ResponseModel):
diff --git a/api/controllers/service_api/app/file.py b/api/controllers/service_api/app/file.py
index 6f6dadf768..687d34076d 100644
--- a/api/controllers/service_api/app/file.py
+++ b/api/controllers/service_api/app/file.py
@@ -58,7 +58,7 @@ class FileApi(Resource):
         try:
             upload_file = FileService(db.engine).upload_file(
                 filename=file.filename,
-                content=file.read(),
+                content=file.stream.read(),
                 mimetype=file.mimetype,
                 user=end_user,
             )
diff --git a/api/controllers/service_api/app/human_input_form.py b/api/controllers/service_api/app/human_input_form.py
index 8e5003dbbf..2b38a84b0e 100644
--- a/api/controllers/service_api/app/human_input_form.py
+++ b/api/controllers/service_api/app/human_input_form.py
@@ -7,18 +7,18 @@ paused human input forms in workflow/chatflow runs.
 
 import json
 import logging
-from datetime import datetime
 
 from flask import Response
 from flask_restx import Resource
 from werkzeug.exceptions import BadRequest, NotFound
 
-from controllers.common.human_input import HumanInputFormSubmitPayload
+from controllers.common.human_input import HumanInputFormSubmitPayload, stringify_form_default_values
 from controllers.common.schema import register_schema_models
 from controllers.service_api import service_api_ns
 from controllers.service_api.wraps import FetchUserArg, WhereisUserArg, validate_app_token
 from core.workflow.human_input_policy import HumanInputSurface, is_recipient_type_allowed_for_surface
 from extensions.ext_database import db
+from libs.helper import to_timestamp
 from models.model import App, EndUser
 from services.human_input_service import Form, FormNotFoundError, HumanInputService
 
@@ -28,30 +28,14 @@ logger = logging.getLogger(__name__)
 register_schema_models(service_api_ns, HumanInputFormSubmitPayload)
 
 
-def _stringify_default_values(values: dict[str, object]) -> dict[str, str]:
-    result: dict[str, str] = {}
-    for key, value in values.items():
-        if value is None:
-            result[key] = ""
-        elif isinstance(value, (dict, list)):
-            result[key] = json.dumps(value, ensure_ascii=False)
-        else:
-            result[key] = str(value)
-    return result
-
-
-def _to_timestamp(value: datetime) -> int:
-    return int(value.timestamp())
-
-
 def _jsonify_form_definition(form: Form) -> Response:
     definition_payload = form.get_definition().model_dump()
     payload = {
         "form_content": definition_payload["rendered_content"],
         "inputs": definition_payload["inputs"],
-        "resolved_default_values": _stringify_default_values(definition_payload["default_values"]),
+        "resolved_default_values": stringify_form_default_values(definition_payload["default_values"]),
         "user_actions": definition_payload["user_actions"],
-        "expiration_time": _to_timestamp(form.expiration_time),
+        "expiration_time": to_timestamp(form.expiration_time),
     }
     return Response(json.dumps(payload, ensure_ascii=False), mimetype="application/json")
 
diff --git a/api/controllers/service_api/app/workflow.py b/api/controllers/service_api/app/workflow.py
index cc763fa89c..45d2dda858 100644
--- a/api/controllers/service_api/app/workflow.py
+++ b/api/controllers/service_api/app/workflow.py
@@ -39,6 +39,7 @@ from graphon.enums import WorkflowExecutionStatus
 from graphon.graph_engine.manager import GraphEngineManager
 from graphon.model_runtime.errors.invoke import InvokeError
 from libs import helper
+from libs.helper import to_timestamp
 from models.model import App, AppMode, EndUser
 from models.workflow import WorkflowRun
 from repositories.factory import DifyAPIRepositoryFactory
@@ -68,12 +69,6 @@ class WorkflowLogQuery(BaseModel):
 register_schema_models(service_api_ns, WorkflowRunPayload, WorkflowLogQuery)
 
 
-def _to_timestamp(value: datetime | int | None) -> int | None:
-    if isinstance(value, datetime):
-        return int(value.timestamp())
-    return value
-
-
 def _enum_value(value):
     return getattr(value, "value", value)
 
@@ -109,7 +104,7 @@ class WorkflowRunResponse(ResponseModel):
     @field_validator("created_at", "finished_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 class WorkflowRunForLogResponse(ResponseModel):
@@ -133,7 +128,7 @@ class WorkflowRunForLogResponse(ResponseModel):
     @field_validator("created_at", "finished_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 class WorkflowAppLogPartialResponse(ResponseModel):
@@ -154,7 +149,7 @@ class WorkflowAppLogPartialResponse(ResponseModel):
     @field_validator("created_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 class WorkflowAppLogPaginationResponse(ResponseModel):
diff --git a/api/controllers/service_api/dataset/dataset.py b/api/controllers/service_api/dataset/dataset.py
index 76519cad0a..d85e46498d 100644
--- a/api/controllers/service_api/dataset/dataset.py
+++ b/api/controllers/service_api/dataset/dataset.py
@@ -2,11 +2,11 @@ from typing import Any, Literal, cast
 
 from flask import request
 from flask_restx import marshal
-from pydantic import BaseModel, Field, TypeAdapter, field_validator
+from pydantic import BaseModel, Field, TypeAdapter, field_validator, model_validator
 from werkzeug.exceptions import Forbidden, NotFound
 
 import services
-from controllers.common.schema import register_schema_models
+from controllers.common.schema import register_enum_models, register_schema_models
 from controllers.console.wraps import edit_permission_required
 from controllers.service_api import service_api_ns
 from controllers.service_api.dataset.error import DatasetInUseError, DatasetNameDuplicateError, InvalidActionError
@@ -31,16 +31,12 @@ from services.tag_service import (
     TagBindingCreatePayload,
     TagBindingDeletePayload,
     TagService,
-    UpdateTagPayload,
+)
+from services.tag_service import (
+    UpdateTagPayload as UpdateTagServicePayload,
 )
 
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
-
-
-service_api_ns.schema_model(
-    DatasetPermissionEnum.__name__,
-    TypeAdapter(DatasetPermissionEnum).json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0),
-)
+register_enum_models(service_api_ns, DatasetPermissionEnum)
 
 
 class DatasetCreatePayload(BaseModel):
@@ -100,9 +96,27 @@ class TagBindingPayload(BaseModel):
 
 
 class TagUnbindingPayload(BaseModel):
-    tag_id: str
+    """Accept the legacy single-tag Service API payload while exposing a normalized tag_ids list internally."""
+
+    tag_ids: list[str] = Field(default_factory=list)
+    tag_id: str | None = None
     target_id: str
 
+    @model_validator(mode="before")
+    @classmethod
+    def normalize_legacy_tag_id(cls, data: object) -> object:
+        if not isinstance(data, dict):
+            return data
+        if not data.get("tag_ids") and data.get("tag_id"):
+            return {**data, "tag_ids": [data["tag_id"]]}
+        return data
+
+    @model_validator(mode="after")
+    def validate_tag_ids(self) -> "TagUnbindingPayload":
+        if not self.tag_ids:
+            raise ValueError("Tag IDs is required.")
+        return self
+
 
 class DatasetListQuery(BaseModel):
     page: int = Field(default=1, description="Page number")
@@ -544,7 +558,7 @@ class DatasetTagsApi(DatasetApiResource):
 
         payload = TagUpdatePayload.model_validate(service_api_ns.payload or {})
         tag_id = payload.tag_id
-        tag = TagService.update_tags(UpdateTagPayload(name=payload.name, type=TagType.KNOWLEDGE), tag_id)
+        tag = TagService.update_tags(UpdateTagServicePayload(name=payload.name), tag_id)
 
         binding_count = TagService.get_tag_binding_count(tag_id)
 
@@ -601,11 +615,11 @@ class DatasetTagBindingApi(DatasetApiResource):
 @service_api_ns.route("/datasets/tags/unbinding")
 class DatasetTagUnbindingApi(DatasetApiResource):
     @service_api_ns.expect(service_api_ns.models[TagUnbindingPayload.__name__])
-    @service_api_ns.doc("unbind_dataset_tag")
-    @service_api_ns.doc(description="Unbind a tag from a dataset")
+    @service_api_ns.doc("unbind_dataset_tags")
+    @service_api_ns.doc(description="Unbind tags from a dataset")
     @service_api_ns.doc(
         responses={
-            204: "Tag unbound successfully",
+            204: "Tags unbound successfully",
             401: "Unauthorized - invalid API token",
             403: "Forbidden - insufficient permissions",
         }
@@ -618,7 +632,7 @@ class DatasetTagUnbindingApi(DatasetApiResource):
 
         payload = TagUnbindingPayload.model_validate(service_api_ns.payload or {})
         TagService.delete_tag_binding(
-            TagBindingDeletePayload(tag_id=payload.tag_id, target_id=payload.target_id, type=TagType.KNOWLEDGE)
+            TagBindingDeletePayload(tag_ids=payload.tag_ids, target_id=payload.target_id, type=TagType.KNOWLEDGE)
         )
 
         return "", 204
diff --git a/api/controllers/service_api/dataset/document.py b/api/controllers/service_api/dataset/document.py
index 0b09facf58..e68eeeca25 100644
--- a/api/controllers/service_api/dataset/document.py
+++ b/api/controllers/service_api/dataset/document.py
@@ -77,9 +77,6 @@ class DocumentTextCreatePayload(BaseModel):
         return value
 
 
-DEFAULT_REF_TEMPLATE_SWAGGER_2_0 = "#/definitions/{model}"
-
-
 class DocumentTextUpdate(BaseModel):
     name: str | None = None
     text: str | None = None
@@ -139,7 +136,7 @@ def _create_document_by_text(tenant_id: str, dataset_id: UUID) -> tuple[Mapping[
     if not dataset:
         raise ValueError("Dataset does not exist.")
 
-    if not dataset.indexing_technique and not args["indexing_technique"]:
+    if not dataset.indexing_technique and not args.get("indexing_technique"):
         raise ValueError("indexing_technique is required.")
 
     embedding_model_provider = payload.embedding_model_provider
@@ -435,7 +432,7 @@ class DocumentAddByFileApi(DatasetApiResource):
             raise ValueError("current_user is required")
         upload_file = FileService(db.engine).upload_file(
             filename=file.filename,
-            content=file.read(),
+            content=file.stream.read(),
             mimetype=file.mimetype,
             user=current_user,
             source="datasets",
@@ -509,7 +506,7 @@ def _update_document_by_file(tenant_id: str, dataset_id: UUID, document_id: UUID
         try:
             upload_file = FileService(db.engine).upload_file(
                 filename=file.filename,
-                content=file.read(),
+                content=file.stream.read(),
                 mimetype=file.mimetype,
                 user=current_user,
                 source="datasets",
diff --git a/api/controllers/service_api/dataset/rag_pipeline/rag_pipeline_workflow.py b/api/controllers/service_api/dataset/rag_pipeline/rag_pipeline_workflow.py
index 2dc98bfbf7..8bc43bccd5 100644
--- a/api/controllers/service_api/dataset/rag_pipeline/rag_pipeline_workflow.py
+++ b/api/controllers/service_api/dataset/rag_pipeline/rag_pipeline_workflow.py
@@ -241,7 +241,7 @@ class KnowledgebasePipelineFileUploadApi(DatasetApiResource):
         try:
             upload_file = FileService(db.engine).upload_file(
                 filename=file.filename,
-                content=file.read(),
+                content=file.stream.read(),
                 mimetype=file.mimetype,
                 user=current_user,
             )
diff --git a/api/controllers/web/audio.py b/api/controllers/web/audio.py
index 3ad595f1f4..8ddbc3abb8 100644
--- a/api/controllers/web/audio.py
+++ b/api/controllers/web/audio.py
@@ -23,7 +23,7 @@ from controllers.web.wraps import WebApiResource
 from core.errors.error import ModelCurrentlyNotSupportError, ProviderTokenNotInitError, QuotaExceededError
 from graphon.model_runtime.errors.invoke import InvokeError
 from libs.helper import uuid_value
-from models.model import App
+from models.model import App, EndUser
 from services.audio_service import AudioService
 from services.errors.audio import (
     AudioTooLargeServiceError,
@@ -69,12 +69,12 @@ class AudioApi(WebApiResource):
             500: "Internal Server Error",
         }
     )
-    def post(self, app_model: App, end_user):
+    def post(self, app_model: App, end_user: EndUser):
         """Convert audio to text"""
         file = request.files["file"]
 
         try:
-            response = AudioService.transcript_asr(app_model=app_model, file=file, end_user=end_user)
+            response = AudioService.transcript_asr(app_model=app_model, file=file, end_user=end_user.external_user_id)
 
             return response
         except services.errors.app_model_config.AppModelConfigBrokenError:
@@ -117,7 +117,7 @@ class TextApi(WebApiResource):
             500: "Internal Server Error",
         }
     )
-    def post(self, app_model: App, end_user):
+    def post(self, app_model: App, end_user: EndUser):
         """Convert text to audio"""
         try:
             payload = TextToAudioPayload.model_validate(web_ns.payload or {})
diff --git a/api/controllers/web/files.py b/api/controllers/web/files.py
index 0036c90800..6128490104 100644
--- a/api/controllers/web/files.py
+++ b/api/controllers/web/files.py
@@ -73,7 +73,7 @@ class FileApi(WebApiResource):
         try:
             upload_file = FileService(db.engine).upload_file(
                 filename=file.filename,
-                content=file.read(),
+                content=file.stream.read(),
                 mimetype=file.mimetype,
                 user=end_user,
                 source="datasets" if source == "datasets" else None,
diff --git a/api/controllers/web/human_input_form.py b/api/controllers/web/human_input_form.py
index 1ddf2e0717..69297450c9 100644
--- a/api/controllers/web/human_input_form.py
+++ b/api/controllers/web/human_input_form.py
@@ -4,7 +4,6 @@ Web App Human Input Form APIs.
 
 import json
 import logging
-from datetime import datetime
 from typing import Any, NotRequired, TypedDict
 
 from flask import Response, request
@@ -13,12 +12,12 @@ from sqlalchemy import select
 from werkzeug.exceptions import Forbidden
 
 from configs import dify_config
-from controllers.common.human_input import HumanInputFormSubmitPayload
+from controllers.common.human_input import HumanInputFormSubmitPayload, stringify_form_default_values
 from controllers.web import web_ns
 from controllers.web.error import NotFoundError, WebFormRateLimitExceededError
 from controllers.web.site import serialize_app_site_payload
 from extensions.ext_database import db
-from libs.helper import RateLimiter, extract_remote_ip
+from libs.helper import RateLimiter, extract_remote_ip, to_timestamp
 from models.account import TenantStatus
 from models.model import App, Site
 from services.human_input_service import Form, FormNotFoundError, HumanInputService
@@ -38,22 +37,6 @@ _FORM_ACCESS_RATE_LIMITER = RateLimiter(
 )
 
 
-def _stringify_default_values(values: dict[str, object]) -> dict[str, str]:
-    result: dict[str, str] = {}
-    for key, value in values.items():
-        if value is None:
-            result[key] = ""
-        elif isinstance(value, (dict, list)):
-            result[key] = json.dumps(value, ensure_ascii=False)
-        else:
-            result[key] = str(value)
-    return result
-
-
-def _to_timestamp(value: datetime) -> int:
-    return int(value.timestamp())
-
-
 class FormDefinitionPayload(TypedDict):
     form_content: Any
     inputs: Any
@@ -69,9 +52,9 @@ def _jsonify_form_definition(form: Form, site_payload: dict | None = None) -> Re
     payload: FormDefinitionPayload = {
         "form_content": definition_payload["rendered_content"],
         "inputs": definition_payload["inputs"],
-        "resolved_default_values": _stringify_default_values(definition_payload["default_values"]),
+        "resolved_default_values": stringify_form_default_values(definition_payload["default_values"]),
         "user_actions": definition_payload["user_actions"],
-        "expiration_time": _to_timestamp(form.expiration_time),
+        "expiration_time": to_timestamp(form.expiration_time),
     }
     if site_payload is not None:
         payload["site"] = site_payload
diff --git a/api/core/agent/base_agent_runner.py b/api/core/agent/base_agent_runner.py
index c22102c2ba..cba4659483 100644
--- a/api/core/agent/base_agent_runner.py
+++ b/api/core/agent/base_agent_runner.py
@@ -532,7 +532,6 @@ class BaseAgentRunner(AppRunner):
         file_objs = file_factory.build_from_message_files(
             message_files=files,
             tenant_id=self.tenant_id,
-            config=file_extra_config,
             access_controller=_file_access_controller,
         )
         if not file_objs:
diff --git a/api/core/app/app_config/easy_ui_based_app/prompt_template/manager.py b/api/core/app/app_config/easy_ui_based_app/prompt_template/manager.py
index 4c07445df3..f4bbbe5d8b 100644
--- a/api/core/app/app_config/easy_ui_based_app/prompt_template/manager.py
+++ b/api/core/app/app_config/easy_ui_based_app/prompt_template/manager.py
@@ -75,7 +75,7 @@ class PromptTemplateConfigManager:
         if not config.get("prompt_type"):
             config["prompt_type"] = PromptTemplateEntity.PromptType.SIMPLE
 
-        prompt_type_vals = [typ.value for typ in PromptTemplateEntity.PromptType]
+        prompt_type_vals = list(PromptTemplateEntity.PromptType)
         if config["prompt_type"] not in prompt_type_vals:
             raise ValueError(f"prompt_type must be in {prompt_type_vals}")
 
diff --git a/api/core/app/apps/advanced_chat/app_generator.py b/api/core/app/apps/advanced_chat/app_generator.py
index b79d5514b4..cc7bc64439 100644
--- a/api/core/app/apps/advanced_chat/app_generator.py
+++ b/api/core/app/apps/advanced_chat/app_generator.py
@@ -253,7 +253,20 @@ class AdvancedChatAppGenerator(MessageBasedAppGenerator):
     ):
         """
         Resume a paused advanced chat execution.
+
+        ``trace_manager`` is transient and excluded from generate-entity serialization,
+        so resumed executions rebuild it here before persistence layers receive the entity.
         """
+        if application_generate_entity.trace_manager is None:
+            application_generate_entity = application_generate_entity.model_copy(
+                update={
+                    "trace_manager": TraceQueueManager(
+                        app_id=app_model.id,
+                        user_id=user.id if isinstance(user, Account) else user.session_id,
+                    )
+                }
+            )
+
         return self._generate(
             workflow=workflow,
             user=user,
diff --git a/api/core/app/apps/advanced_chat/generate_task_pipeline.py b/api/core/app/apps/advanced_chat/generate_task_pipeline.py
index 82dbf5381d..adbe2241ef 100644
--- a/api/core/app/apps/advanced_chat/generate_task_pipeline.py
+++ b/api/core/app/apps/advanced_chat/generate_task_pipeline.py
@@ -9,7 +9,7 @@ from datetime import datetime
 from threading import Thread
 from typing import Any, Union
 
-from sqlalchemy import select
+from sqlalchemy import select, update
 from sqlalchemy.orm import Session, sessionmaker
 
 from constants.tts_auto_play_timeout import TTS_AUTO_PLAY_TIMEOUT, TTS_AUTO_PLAY_YIELD_CPU_TIME
@@ -245,49 +245,50 @@ class AdvancedChatAppGenerateTaskPipeline(GraphRuntimeStateSupport):
         """
         human_input_responses: list[HumanInputRequiredResponse] = []
         for stream_response in generator:
-            if isinstance(stream_response, ErrorStreamResponse):
-                raise stream_response.err
-            elif isinstance(stream_response, HumanInputRequiredResponse):
-                human_input_responses.append(stream_response)
-            elif isinstance(stream_response, WorkflowPauseStreamResponse):
-                return AdvancedChatPausedBlockingResponse(
-                    task_id=stream_response.task_id,
-                    data=AdvancedChatPausedBlockingResponse.Data(
-                        id=self._message_id,
-                        mode=self._conversation_mode,
-                        conversation_id=self._conversation_id,
-                        message_id=self._message_id,
-                        workflow_run_id=stream_response.data.workflow_run_id,
-                        answer=self._task_state.answer,
-                        metadata=self._message_end_to_stream_response().metadata,
-                        created_at=self._message_created_at,
-                        paused_nodes=stream_response.data.paused_nodes,
-                        reasons=stream_response.data.reasons,
-                        status=stream_response.data.status,
-                        elapsed_time=stream_response.data.elapsed_time,
-                        total_tokens=stream_response.data.total_tokens,
-                        total_steps=stream_response.data.total_steps,
-                    ),
-                )
-            elif isinstance(stream_response, MessageEndStreamResponse):
-                extras = {}
-                if stream_response.metadata:
-                    extras["metadata"] = stream_response.metadata
+            match stream_response:
+                case ErrorStreamResponse():
+                    raise stream_response.err
+                case HumanInputRequiredResponse():
+                    human_input_responses.append(stream_response)
+                case WorkflowPauseStreamResponse():
+                    return AdvancedChatPausedBlockingResponse(
+                        task_id=stream_response.task_id,
+                        data=AdvancedChatPausedBlockingResponse.Data(
+                            id=self._message_id,
+                            mode=self._conversation_mode,
+                            conversation_id=self._conversation_id,
+                            message_id=self._message_id,
+                            workflow_run_id=stream_response.data.workflow_run_id,
+                            answer=self._task_state.answer,
+                            metadata=self._message_end_to_stream_response().metadata,
+                            created_at=self._message_created_at,
+                            paused_nodes=stream_response.data.paused_nodes,
+                            reasons=stream_response.data.reasons,
+                            status=stream_response.data.status,
+                            elapsed_time=stream_response.data.elapsed_time,
+                            total_tokens=stream_response.data.total_tokens,
+                            total_steps=stream_response.data.total_steps,
+                        ),
+                    )
+                case MessageEndStreamResponse():
+                    extras = {}
+                    if stream_response.metadata:
+                        extras["metadata"] = stream_response.metadata
 
-                return ChatbotAppBlockingResponse(
-                    task_id=stream_response.task_id,
-                    data=ChatbotAppBlockingResponse.Data(
-                        id=self._message_id,
-                        mode=self._conversation_mode,
-                        conversation_id=self._conversation_id,
-                        message_id=self._message_id,
-                        answer=self._task_state.answer,
-                        created_at=self._message_created_at,
-                        **extras,
-                    ),
-                )
-            else:
-                continue
+                    return ChatbotAppBlockingResponse(
+                        task_id=stream_response.task_id,
+                        data=ChatbotAppBlockingResponse.Data(
+                            id=self._message_id,
+                            mode=self._conversation_mode,
+                            conversation_id=self._conversation_id,
+                            message_id=self._message_id,
+                            answer=self._task_state.answer,
+                            created_at=self._message_created_at,
+                            **extras,
+                        ),
+                    )
+                case _:
+                    continue
 
         if human_input_responses:
             return self._build_paused_blocking_response_from_human_input(human_input_responses)
@@ -425,11 +426,7 @@ class AdvancedChatAppGenerateTaskPipeline(GraphRuntimeStateSupport):
         self._workflow_run_id = run_id
 
         with self._database_session() as session:
-            message = self._get_message(session=session)
-            if not message:
-                raise ValueError(f"Message not found: {self._message_id}")
-
-            message.workflow_run_id = run_id
+            session.execute(update(Message).where(Message.id == self._message_id).values(workflow_run_id=run_id))
 
         workflow_start_resp = self._workflow_response_converter.workflow_start_to_stream_response(
             task_id=self._application_generate_entity.task_id,
diff --git a/api/core/app/apps/agent_chat/app_config_manager.py b/api/core/app/apps/agent_chat/app_config_manager.py
index f0d81e0c59..e269b98bad 100644
--- a/api/core/app/apps/agent_chat/app_config_manager.py
+++ b/api/core/app/apps/agent_chat/app_config_manager.py
@@ -178,7 +178,7 @@ class AgentChatAppConfigManager(BaseAppConfigManager):
         if not isinstance(agent_mode, dict):
             raise ValueError("agent_mode must be of object type")
 
-        # FIXME(-LAN-): Cast needed due to basedpyright limitation with dict type narrowing
+        # FIXME(-LAN-): Cast needed because static checkers do not narrow this dict value.
         agent_mode = cast(dict[str, Any], agent_mode)
 
         if "enabled" not in agent_mode or not agent_mode["enabled"]:
diff --git a/api/core/app/apps/base_app_generator.py b/api/core/app/apps/base_app_generator.py
index 8e8ccf2b90..d7ef5165f0 100644
--- a/api/core/app/apps/base_app_generator.py
+++ b/api/core/app/apps/base_app_generator.py
@@ -195,22 +195,23 @@ class BaseAppGenerator:
             )
 
         if variable_entity.type == VariableEntityType.NUMBER:
-            if isinstance(value, (int, float)):
-                return value
-            elif isinstance(value, str):
-                # handle empty string case
-                if not value.strip():
-                    return None
-                # may raise ValueError if user_input_value is not a valid number
-                try:
-                    if "." in value:
-                        return float(value)
-                    else:
-                        return int(value)
-                except ValueError:
-                    raise ValueError(f"{variable_entity.variable} in input form must be a valid number")
-            else:
-                raise TypeError(f"expected value type int, float or str, got {type(value)}, value: {value}")
+            match value:
+                case int() | float():
+                    return value
+                case str():
+                    # handle empty string case
+                    if not value.strip():
+                        return None
+                    # may raise ValueError if user_input_value is not a valid number
+                    try:
+                        if "." in value:
+                            return float(value)
+                        else:
+                            return int(value)
+                    except ValueError:
+                        raise ValueError(f"{variable_entity.variable} in input form must be a valid number")
+                case _:
+                    raise TypeError(f"expected value type int, float or str, got {type(value)}, value: {value}")
 
         match variable_entity.type:
             case VariableEntityType.SELECT:
@@ -241,17 +242,18 @@ class BaseAppGenerator:
                         f"{variable_entity.variable} in input form must be less than {variable_entity.max_length} files"
                     )
             case VariableEntityType.CHECKBOX:
-                if isinstance(value, str):
-                    normalized_value = value.strip().lower()
-                    if normalized_value in {"true", "1", "yes", "on"}:
-                        value = True
-                    elif normalized_value in {"false", "0", "no", "off"}:
-                        value = False
-                elif isinstance(value, (int, float)):
-                    if value == 1:
-                        value = True
-                    elif value == 0:
-                        value = False
+                match value:
+                    case str():
+                        normalized_value = value.strip().lower()
+                        if normalized_value in {"true", "1", "yes", "on"}:
+                            value = True
+                        elif normalized_value in {"false", "0", "no", "off"}:
+                            value = False
+                    case int() | float():
+                        if value == 1:
+                            value = True
+                        elif value == 0:
+                            value = False
             case VariableEntityType.JSON_OBJECT:
                 if value and not isinstance(value, dict):
                     raise ValueError(f"{variable_entity.variable} in input form must be a dict")
diff --git a/api/core/app/apps/common/workflow_response_converter.py b/api/core/app/apps/common/workflow_response_converter.py
index 7bab3f7bff..4a741d3154 100644
--- a/api/core/app/apps/common/workflow_response_converter.py
+++ b/api/core/app/apps/common/workflow_response_converter.py
@@ -842,24 +842,24 @@ class WorkflowResponseConverter:
             return []
 
         files: list[Mapping[str, Any]] = []
-        if isinstance(value, FileSegment):
-            files.append(value.value.to_dict())
-        elif isinstance(value, ArrayFileSegment):
-            files.extend([i.to_dict() for i in value.value])
-        elif isinstance(value, File):
-            files.append(value.to_dict())
-        elif isinstance(value, list):
-            for item in value:
-                file = cls._get_file_var_from_value(item)
+        match value:
+            case FileSegment():
+                files.append(value.value.to_dict())
+            case ArrayFileSegment():
+                files.extend([i.to_dict() for i in value.value])
+            case File():
+                files.append(value.to_dict())
+            case list():
+                for item in value:
+                    file = cls._get_file_var_from_value(item)
+                    if file:
+                        files.append(file)
+            case dict():
+                file = cls._get_file_var_from_value(value)
                 if file:
                     files.append(file)
-        elif isinstance(
-            value,
-            dict,
-        ):
-            file = cls._get_file_var_from_value(value)
-            if file:
-                files.append(file)
+            case _:
+                pass
 
         return files
 
diff --git a/api/core/app/apps/pipeline/generate_response_converter.py b/api/core/app/apps/pipeline/generate_response_converter.py
index 3913657ae8..03d7049150 100644
--- a/api/core/app/apps/pipeline/generate_response_converter.py
+++ b/api/core/app/apps/pipeline/generate_response_converter.py
@@ -45,20 +45,24 @@ class WorkflowAppGenerateResponseConverter(AppGenerateResponseConverter[Workflow
             chunk = cast(WorkflowAppStreamResponse, chunk)
             sub_stream_response = chunk.stream_response
 
-            if isinstance(sub_stream_response, PingStreamResponse):
-                yield "ping"
-                continue
+            match sub_stream_response:
+                case PingStreamResponse():
+                    yield "ping"
+                    continue
+                case ErrorStreamResponse():
+                    response_chunk = {
+                        "event": sub_stream_response.event.value,
+                        "workflow_run_id": chunk.workflow_run_id,
+                    }
+                    data = cls._error_to_stream_response(sub_stream_response.err)
+                    response_chunk.update(cast(dict, data))
+                case _:
+                    response_chunk = {
+                        "event": sub_stream_response.event.value,
+                        "workflow_run_id": chunk.workflow_run_id,
+                    }
+                    response_chunk.update(sub_stream_response.model_dump())
 
-            response_chunk = {
-                "event": sub_stream_response.event.value,
-                "workflow_run_id": chunk.workflow_run_id,
-            }
-
-            if isinstance(sub_stream_response, ErrorStreamResponse):
-                data = cls._error_to_stream_response(sub_stream_response.err)
-                response_chunk.update(cast(dict, data))
-            else:
-                response_chunk.update(sub_stream_response.model_dump())
             yield response_chunk
 
     @classmethod
@@ -74,20 +78,28 @@ class WorkflowAppGenerateResponseConverter(AppGenerateResponseConverter[Workflow
             chunk = cast(WorkflowAppStreamResponse, chunk)
             sub_stream_response = chunk.stream_response
 
-            if isinstance(sub_stream_response, PingStreamResponse):
-                yield "ping"
-                continue
+            match sub_stream_response:
+                case PingStreamResponse():
+                    yield "ping"
+                    continue
+                case ErrorStreamResponse():
+                    response_chunk = {
+                        "event": sub_stream_response.event.value,
+                        "workflow_run_id": chunk.workflow_run_id,
+                    }
+                    data = cls._error_to_stream_response(sub_stream_response.err)
+                    response_chunk.update(cast(dict, data))
+                case NodeStartStreamResponse() | NodeFinishStreamResponse():
+                    response_chunk = {
+                        "event": sub_stream_response.event.value,
+                        "workflow_run_id": chunk.workflow_run_id,
+                    }
+                    response_chunk.update(cast(dict, sub_stream_response.to_ignore_detail_dict()))
+                case _:
+                    response_chunk = {
+                        "event": sub_stream_response.event.value,
+                        "workflow_run_id": chunk.workflow_run_id,
+                    }
+                    response_chunk.update(sub_stream_response.model_dump())
 
-            response_chunk = {
-                "event": sub_stream_response.event.value,
-                "workflow_run_id": chunk.workflow_run_id,
-            }
-
-            if isinstance(sub_stream_response, ErrorStreamResponse):
-                data = cls._error_to_stream_response(sub_stream_response.err)
-                response_chunk.update(cast(dict, data))
-            elif isinstance(sub_stream_response, NodeStartStreamResponse | NodeFinishStreamResponse):
-                response_chunk.update(cast(dict, sub_stream_response.to_ignore_detail_dict()))
-            else:
-                response_chunk.update(sub_stream_response.model_dump())
             yield response_chunk
diff --git a/api/core/app/apps/workflow/app_generator.py b/api/core/app/apps/workflow/app_generator.py
index e811c2b2e0..78255c0512 100644
--- a/api/core/app/apps/workflow/app_generator.py
+++ b/api/core/app/apps/workflow/app_generator.py
@@ -32,7 +32,7 @@ from core.app.entities.task_entities import (
 )
 from core.app.layers.pause_state_persist_layer import PauseStateLayerConfig, PauseStatePersistenceLayer
 from core.db.session_factory import session_factory
-from core.helper.trace_id_helper import extract_external_trace_id_from_args
+from core.helper.trace_id_helper import extract_external_trace_id_from_args, extract_parent_trace_context_from_args
 from core.ops.ops_trace_manager import TraceQueueManager
 from core.repositories import DifyCoreRepositoryFactory
 from core.repositories.factory import WorkflowExecutionRepository, WorkflowNodeExecutionRepository
@@ -166,6 +166,7 @@ class WorkflowAppGenerator(BaseAppGenerator):
 
             extras = {
                 **extract_external_trace_id_from_args(args),
+                **extract_parent_trace_context_from_args(args),
             }
             workflow_run_id = str(workflow_run_id or uuid.uuid4())
             # FIXME (Yeuoly): we need to remove the SKIP_PREPARE_USER_INPUTS_KEY from the args
@@ -252,7 +253,20 @@ class WorkflowAppGenerator(BaseAppGenerator):
     ) -> Mapping[str, Any] | Generator[str | Mapping[str, Any], None, None]:
         """
         Resume a paused workflow execution using the persisted runtime state.
+
+        ``trace_manager`` is transient and excluded from generate-entity serialization,
+        so resumed executions rebuild it here before persistence layers receive the entity.
         """
+        if application_generate_entity.trace_manager is None:
+            application_generate_entity = application_generate_entity.model_copy(
+                update={
+                    "trace_manager": TraceQueueManager(
+                        app_id=app_model.id,
+                        user_id=user.id if isinstance(user, Account) else user.session_id,
+                    )
+                }
+            )
+
         return self._generate(
             app_model=app_model,
             workflow=workflow,
diff --git a/api/core/app/apps/workflow/generate_response_converter.py b/api/core/app/apps/workflow/generate_response_converter.py
index 4037388798..c390ad30c9 100644
--- a/api/core/app/apps/workflow/generate_response_converter.py
+++ b/api/core/app/apps/workflow/generate_response_converter.py
@@ -52,20 +52,24 @@ class WorkflowAppGenerateResponseConverter(
             chunk = cast(WorkflowAppStreamResponse, chunk)
             sub_stream_response = chunk.stream_response
 
-            if isinstance(sub_stream_response, PingStreamResponse):
-                yield "ping"
-                continue
+            match sub_stream_response:
+                case PingStreamResponse():
+                    yield "ping"
+                    continue
+                case ErrorStreamResponse():
+                    response_chunk: dict[str, object] = {
+                        "event": sub_stream_response.event.value,
+                        "workflow_run_id": chunk.workflow_run_id,
+                    }
+                    data = cls._error_to_stream_response(sub_stream_response.err)
+                    response_chunk.update(data)
+                case _:
+                    response_chunk = {
+                        "event": sub_stream_response.event.value,
+                        "workflow_run_id": chunk.workflow_run_id,
+                    }
+                    response_chunk.update(sub_stream_response.model_dump(mode="json"))
 
-            response_chunk: dict[str, object] = {
-                "event": sub_stream_response.event.value,
-                "workflow_run_id": chunk.workflow_run_id,
-            }
-
-            if isinstance(sub_stream_response, ErrorStreamResponse):
-                data = cls._error_to_stream_response(sub_stream_response.err)
-                response_chunk.update(data)
-            else:
-                response_chunk.update(sub_stream_response.model_dump(mode="json"))
             yield response_chunk
 
     @classmethod
@@ -81,20 +85,28 @@ class WorkflowAppGenerateResponseConverter(
             chunk = cast(WorkflowAppStreamResponse, chunk)
             sub_stream_response = chunk.stream_response
 
-            if isinstance(sub_stream_response, PingStreamResponse):
-                yield "ping"
-                continue
+            match sub_stream_response:
+                case PingStreamResponse():
+                    yield "ping"
+                    continue
+                case ErrorStreamResponse():
+                    response_chunk: dict[str, object] = {
+                        "event": sub_stream_response.event.value,
+                        "workflow_run_id": chunk.workflow_run_id,
+                    }
+                    data = cls._error_to_stream_response(sub_stream_response.err)
+                    response_chunk.update(data)
+                case NodeStartStreamResponse() | NodeFinishStreamResponse():
+                    response_chunk = {
+                        "event": sub_stream_response.event.value,
+                        "workflow_run_id": chunk.workflow_run_id,
+                    }
+                    response_chunk.update(sub_stream_response.to_ignore_detail_dict())
+                case _:
+                    response_chunk = {
+                        "event": sub_stream_response.event.value,
+                        "workflow_run_id": chunk.workflow_run_id,
+                    }
+                    response_chunk.update(sub_stream_response.model_dump(mode="json"))
 
-            response_chunk: dict[str, object] = {
-                "event": sub_stream_response.event.value,
-                "workflow_run_id": chunk.workflow_run_id,
-            }
-
-            if isinstance(sub_stream_response, ErrorStreamResponse):
-                data = cls._error_to_stream_response(sub_stream_response.err)
-                response_chunk.update(data)
-            elif isinstance(sub_stream_response, NodeStartStreamResponse | NodeFinishStreamResponse):
-                response_chunk.update(sub_stream_response.to_ignore_detail_dict())
-            else:
-                response_chunk.update(sub_stream_response.model_dump(mode="json"))
             yield response_chunk
diff --git a/api/core/app/apps/workflow/generate_task_pipeline.py b/api/core/app/apps/workflow/generate_task_pipeline.py
index 87d9b73078..80f8e3ad4a 100644
--- a/api/core/app/apps/workflow/generate_task_pipeline.py
+++ b/api/core/app/apps/workflow/generate_task_pipeline.py
@@ -145,50 +145,51 @@ class WorkflowAppGenerateTaskPipeline(GraphRuntimeStateSupport):
         """
         human_input_responses: list[HumanInputRequiredResponse] = []
         for stream_response in generator:
-            if isinstance(stream_response, ErrorStreamResponse):
-                raise stream_response.err
-            elif isinstance(stream_response, HumanInputRequiredResponse):
-                human_input_responses.append(stream_response)
-            elif isinstance(stream_response, WorkflowPauseStreamResponse):
-                return WorkflowAppPausedBlockingResponse(
-                    task_id=self._application_generate_entity.task_id,
-                    workflow_run_id=stream_response.data.workflow_run_id,
-                    data=WorkflowAppPausedBlockingResponse.Data(
-                        id=stream_response.data.workflow_run_id,
-                        workflow_id=self._workflow.id,
-                        status=stream_response.data.status,
-                        outputs=stream_response.data.outputs or {},
-                        error=None,
-                        elapsed_time=stream_response.data.elapsed_time,
-                        total_tokens=stream_response.data.total_tokens,
-                        total_steps=stream_response.data.total_steps,
-                        created_at=stream_response.data.created_at,
-                        finished_at=None,
-                        paused_nodes=stream_response.data.paused_nodes,
-                        reasons=stream_response.data.reasons,
-                    ),
-                )
-
-            elif isinstance(stream_response, WorkflowFinishStreamResponse):
-                return WorkflowAppBlockingResponse(
-                    task_id=self._application_generate_entity.task_id,
-                    workflow_run_id=stream_response.data.id,
-                    data=WorkflowAppBlockingResponse.Data(
-                        id=stream_response.data.id,
-                        workflow_id=stream_response.data.workflow_id,
-                        status=stream_response.data.status,
-                        outputs=stream_response.data.outputs,
-                        error=stream_response.data.error,
-                        elapsed_time=stream_response.data.elapsed_time,
-                        total_tokens=stream_response.data.total_tokens,
-                        total_steps=stream_response.data.total_steps,
-                        created_at=int(stream_response.data.created_at),
-                        finished_at=int(stream_response.data.finished_at) if stream_response.data.finished_at else None,
-                    ),
-                )
-
-            else:
-                continue
+            match stream_response:
+                case ErrorStreamResponse():
+                    raise stream_response.err
+                case HumanInputRequiredResponse():
+                    human_input_responses.append(stream_response)
+                case WorkflowPauseStreamResponse():
+                    return WorkflowAppPausedBlockingResponse(
+                        task_id=self._application_generate_entity.task_id,
+                        workflow_run_id=stream_response.data.workflow_run_id,
+                        data=WorkflowAppPausedBlockingResponse.Data(
+                            id=stream_response.data.workflow_run_id,
+                            workflow_id=self._workflow.id,
+                            status=stream_response.data.status,
+                            outputs=stream_response.data.outputs or {},
+                            error=None,
+                            elapsed_time=stream_response.data.elapsed_time,
+                            total_tokens=stream_response.data.total_tokens,
+                            total_steps=stream_response.data.total_steps,
+                            created_at=stream_response.data.created_at,
+                            finished_at=None,
+                            paused_nodes=stream_response.data.paused_nodes,
+                            reasons=stream_response.data.reasons,
+                        ),
+                    )
+                case WorkflowFinishStreamResponse():
+                    return WorkflowAppBlockingResponse(
+                        task_id=self._application_generate_entity.task_id,
+                        workflow_run_id=stream_response.data.id,
+                        data=WorkflowAppBlockingResponse.Data(
+                            id=stream_response.data.id,
+                            workflow_id=stream_response.data.workflow_id,
+                            status=stream_response.data.status,
+                            outputs=stream_response.data.outputs,
+                            error=stream_response.data.error,
+                            elapsed_time=stream_response.data.elapsed_time,
+                            total_tokens=stream_response.data.total_tokens,
+                            total_steps=stream_response.data.total_steps,
+                            created_at=int(stream_response.data.created_at),
+                            finished_at=int(stream_response.data.finished_at)
+                            if stream_response.data.finished_at
+                            else None,
+                        ),
+                    )
+                case _:
+                    continue
 
         if human_input_responses:
             return self._build_paused_blocking_response_from_human_input(human_input_responses)
diff --git a/api/core/app/apps/workflow_app_runner.py b/api/core/app/apps/workflow_app_runner.py
index 047b54c86c..84e9573416 100644
--- a/api/core/app/apps/workflow_app_runner.py
+++ b/api/core/app/apps/workflow_app_runner.py
@@ -399,278 +399,281 @@ class WorkflowBasedAppRunner:
         :param workflow_entry: workflow entry
         :param event: event
         """
-        if isinstance(event, GraphRunStartedEvent):
-            self._publish_event(QueueWorkflowStartedEvent(reason=event.reason))
-        elif isinstance(event, GraphRunSucceededEvent):
-            self._publish_event(QueueWorkflowSucceededEvent(outputs=event.outputs))
-        elif isinstance(event, GraphRunPartialSucceededEvent):
-            self._publish_event(
-                QueueWorkflowPartialSuccessEvent(outputs=event.outputs, exceptions_count=event.exceptions_count)
-            )
-        elif isinstance(event, GraphRunFailedEvent):
-            self._publish_event(QueueWorkflowFailedEvent(error=event.error, exceptions_count=event.exceptions_count))
-        elif isinstance(event, GraphRunAbortedEvent):
-            self._publish_event(QueueWorkflowFailedEvent(error=event.reason or "Unknown error", exceptions_count=0))
-        elif isinstance(event, GraphRunPausedEvent):
-            runtime_state = workflow_entry.graph_engine.graph_runtime_state
-            paused_nodes = runtime_state.get_paused_nodes()
-            self._enqueue_human_input_notifications(event.reasons)
-            self._publish_event(
-                QueueWorkflowPausedEvent(
-                    reasons=event.reasons,
-                    outputs=event.outputs,
-                    paused_nodes=paused_nodes,
+        match event:
+            case GraphRunStartedEvent():
+                self._publish_event(QueueWorkflowStartedEvent(reason=event.reason))
+            case GraphRunSucceededEvent():
+                self._publish_event(QueueWorkflowSucceededEvent(outputs=event.outputs))
+            case GraphRunPartialSucceededEvent():
+                self._publish_event(
+                    QueueWorkflowPartialSuccessEvent(outputs=event.outputs, exceptions_count=event.exceptions_count)
                 )
-            )
-        elif isinstance(event, NodeRunHumanInputFormFilledEvent):
-            self._publish_event(
-                QueueHumanInputFormFilledEvent(
-                    node_execution_id=event.id,
-                    node_id=event.node_id,
-                    node_type=event.node_type,
-                    node_title=event.node_title,
-                    rendered_content=event.rendered_content,
-                    action_id=event.action_id,
-                    action_text=event.action_text,
+            case GraphRunFailedEvent():
+                self._publish_event(
+                    QueueWorkflowFailedEvent(error=event.error, exceptions_count=event.exceptions_count)
                 )
-            )
-        elif isinstance(event, NodeRunHumanInputFormTimeoutEvent):
-            self._publish_event(
-                QueueHumanInputFormTimeoutEvent(
-                    node_id=event.node_id,
-                    node_type=event.node_type,
-                    node_title=event.node_title,
-                    expiration_time=event.expiration_time,
+            case GraphRunAbortedEvent():
+                self._publish_event(QueueWorkflowFailedEvent(error=event.reason or "Unknown error", exceptions_count=0))
+            case GraphRunPausedEvent():
+                runtime_state = workflow_entry.graph_engine.graph_runtime_state
+                paused_nodes = runtime_state.get_paused_nodes()
+                self._enqueue_human_input_notifications(event.reasons)
+                self._publish_event(
+                    QueueWorkflowPausedEvent(
+                        reasons=event.reasons,
+                        outputs=event.outputs,
+                        paused_nodes=paused_nodes,
+                    )
                 )
-            )
-        elif isinstance(event, NodeRunRetryEvent):
-            node_run_result = event.node_run_result
-            inputs = node_run_result.inputs
-            process_data = node_run_result.process_data
-            outputs = project_node_outputs_for_workflow_run(
-                node_type=event.node_type,
-                inputs=inputs,
-                outputs=node_run_result.outputs,
-            )
-            execution_metadata = node_run_result.metadata
-            self._publish_event(
-                QueueNodeRetryEvent(
-                    node_execution_id=event.id,
-                    node_id=event.node_id,
-                    node_title=event.node_title,
+            case NodeRunHumanInputFormFilledEvent():
+                self._publish_event(
+                    QueueHumanInputFormFilledEvent(
+                        node_execution_id=event.id,
+                        node_id=event.node_id,
+                        node_type=event.node_type,
+                        node_title=event.node_title,
+                        rendered_content=event.rendered_content,
+                        action_id=event.action_id,
+                        action_text=event.action_text,
+                    )
+                )
+            case NodeRunHumanInputFormTimeoutEvent():
+                self._publish_event(
+                    QueueHumanInputFormTimeoutEvent(
+                        node_id=event.node_id,
+                        node_type=event.node_type,
+                        node_title=event.node_title,
+                        expiration_time=event.expiration_time,
+                    )
+                )
+            case NodeRunRetryEvent():
+                node_run_result = event.node_run_result
+                inputs = node_run_result.inputs
+                process_data = node_run_result.process_data
+                outputs = project_node_outputs_for_workflow_run(
                     node_type=event.node_type,
-                    start_at=event.start_at,
-                    in_iteration_id=event.in_iteration_id,
-                    in_loop_id=event.in_loop_id,
                     inputs=inputs,
-                    process_data=process_data,
-                    outputs=outputs,
-                    error=event.error,
-                    execution_metadata=execution_metadata,
-                    retry_index=event.retry_index,
-                    provider_type=event.provider_type,
-                    provider_id=event.provider_id,
+                    outputs=node_run_result.outputs,
                 )
-            )
-        elif isinstance(event, NodeRunStartedEvent):
-            self._publish_event(
-                QueueNodeStartedEvent(
-                    node_execution_id=event.id,
-                    node_id=event.node_id,
-                    node_title=event.node_title,
-                    node_type=event.node_type,
-                    start_at=event.start_at,
-                    in_iteration_id=event.in_iteration_id,
-                    in_loop_id=event.in_loop_id,
-                    agent_strategy=self._build_agent_strategy_info(event),
-                    provider_type=event.provider_type,
-                    provider_id=event.provider_id,
+                execution_metadata = node_run_result.metadata
+                self._publish_event(
+                    QueueNodeRetryEvent(
+                        node_execution_id=event.id,
+                        node_id=event.node_id,
+                        node_title=event.node_title,
+                        node_type=event.node_type,
+                        start_at=event.start_at,
+                        in_iteration_id=event.in_iteration_id,
+                        in_loop_id=event.in_loop_id,
+                        inputs=inputs,
+                        process_data=process_data,
+                        outputs=outputs,
+                        error=event.error,
+                        execution_metadata=execution_metadata,
+                        retry_index=event.retry_index,
+                        provider_type=event.provider_type,
+                        provider_id=event.provider_id,
+                    )
                 )
-            )
-        elif isinstance(event, NodeRunSucceededEvent):
-            node_run_result = event.node_run_result
-            inputs = node_run_result.inputs
-            process_data = node_run_result.process_data
-            outputs = project_node_outputs_for_workflow_run(
-                node_type=event.node_type,
-                inputs=inputs,
-                outputs=node_run_result.outputs,
-            )
-            execution_metadata = node_run_result.metadata
-            self._publish_event(
-                QueueNodeSucceededEvent(
-                    node_execution_id=event.id,
-                    node_id=event.node_id,
+            case NodeRunStartedEvent():
+                self._publish_event(
+                    QueueNodeStartedEvent(
+                        node_execution_id=event.id,
+                        node_id=event.node_id,
+                        node_title=event.node_title,
+                        node_type=event.node_type,
+                        start_at=event.start_at,
+                        in_iteration_id=event.in_iteration_id,
+                        in_loop_id=event.in_loop_id,
+                        agent_strategy=self._build_agent_strategy_info(event),
+                        provider_type=event.provider_type,
+                        provider_id=event.provider_id,
+                    )
+                )
+            case NodeRunSucceededEvent():
+                node_run_result = event.node_run_result
+                inputs = node_run_result.inputs
+                process_data = node_run_result.process_data
+                outputs = project_node_outputs_for_workflow_run(
                     node_type=event.node_type,
-                    start_at=event.start_at,
-                    finished_at=event.finished_at,
                     inputs=inputs,
-                    process_data=process_data,
-                    outputs=outputs,
-                    execution_metadata=execution_metadata,
-                    in_iteration_id=event.in_iteration_id,
-                    in_loop_id=event.in_loop_id,
+                    outputs=node_run_result.outputs,
                 )
-            )
-        elif isinstance(event, NodeRunFailedEvent):
-            outputs = project_node_outputs_for_workflow_run(
-                node_type=event.node_type,
-                inputs=event.node_run_result.inputs,
-                outputs=event.node_run_result.outputs,
-            )
-            self._publish_event(
-                QueueNodeFailedEvent(
-                    node_execution_id=event.id,
-                    node_id=event.node_id,
+                execution_metadata = node_run_result.metadata
+                self._publish_event(
+                    QueueNodeSucceededEvent(
+                        node_execution_id=event.id,
+                        node_id=event.node_id,
+                        node_type=event.node_type,
+                        start_at=event.start_at,
+                        finished_at=event.finished_at,
+                        inputs=inputs,
+                        process_data=process_data,
+                        outputs=outputs,
+                        execution_metadata=execution_metadata,
+                        in_iteration_id=event.in_iteration_id,
+                        in_loop_id=event.in_loop_id,
+                    )
+                )
+            case NodeRunFailedEvent():
+                outputs = project_node_outputs_for_workflow_run(
                     node_type=event.node_type,
-                    start_at=event.start_at,
-                    finished_at=event.finished_at,
                     inputs=event.node_run_result.inputs,
-                    process_data=event.node_run_result.process_data,
-                    outputs=outputs,
-                    error=event.node_run_result.error or "Unknown error",
-                    execution_metadata=event.node_run_result.metadata,
-                    in_iteration_id=event.in_iteration_id,
-                    in_loop_id=event.in_loop_id,
+                    outputs=event.node_run_result.outputs,
                 )
-            )
-        elif isinstance(event, NodeRunExceptionEvent):
-            outputs = project_node_outputs_for_workflow_run(
-                node_type=event.node_type,
-                inputs=event.node_run_result.inputs,
-                outputs=event.node_run_result.outputs,
-            )
-            self._publish_event(
-                QueueNodeExceptionEvent(
-                    node_execution_id=event.id,
-                    node_id=event.node_id,
+                self._publish_event(
+                    QueueNodeFailedEvent(
+                        node_execution_id=event.id,
+                        node_id=event.node_id,
+                        node_type=event.node_type,
+                        start_at=event.start_at,
+                        finished_at=event.finished_at,
+                        inputs=event.node_run_result.inputs,
+                        process_data=event.node_run_result.process_data,
+                        outputs=outputs,
+                        error=event.node_run_result.error or "Unknown error",
+                        execution_metadata=event.node_run_result.metadata,
+                        in_iteration_id=event.in_iteration_id,
+                        in_loop_id=event.in_loop_id,
+                    )
+                )
+            case NodeRunExceptionEvent():
+                outputs = project_node_outputs_for_workflow_run(
                     node_type=event.node_type,
-                    start_at=event.start_at,
-                    finished_at=event.finished_at,
                     inputs=event.node_run_result.inputs,
-                    process_data=event.node_run_result.process_data,
-                    outputs=outputs,
-                    error=event.node_run_result.error or "Unknown error",
-                    execution_metadata=event.node_run_result.metadata,
-                    in_iteration_id=event.in_iteration_id,
-                    in_loop_id=event.in_loop_id,
+                    outputs=event.node_run_result.outputs,
                 )
-            )
-        elif isinstance(event, NodeRunStreamChunkEvent):
-            self._publish_event(
-                QueueTextChunkEvent(
-                    text=event.chunk,
-                    from_variable_selector=list(event.selector),
-                    in_iteration_id=event.in_iteration_id,
-                    in_loop_id=event.in_loop_id,
+                self._publish_event(
+                    QueueNodeExceptionEvent(
+                        node_execution_id=event.id,
+                        node_id=event.node_id,
+                        node_type=event.node_type,
+                        start_at=event.start_at,
+                        finished_at=event.finished_at,
+                        inputs=event.node_run_result.inputs,
+                        process_data=event.node_run_result.process_data,
+                        outputs=outputs,
+                        error=event.node_run_result.error or "Unknown error",
+                        execution_metadata=event.node_run_result.metadata,
+                        in_iteration_id=event.in_iteration_id,
+                        in_loop_id=event.in_loop_id,
+                    )
                 )
-            )
-        elif isinstance(event, NodeRunRetrieverResourceEvent):
-            self._publish_event(
-                QueueRetrieverResourcesEvent(
-                    retriever_resources=[
-                        RetrievalSourceMetadata.model_validate(resource) for resource in event.retriever_resources
-                    ],
-                    in_iteration_id=event.in_iteration_id,
-                    in_loop_id=event.in_loop_id,
+            case NodeRunStreamChunkEvent():
+                self._publish_event(
+                    QueueTextChunkEvent(
+                        text=event.chunk,
+                        from_variable_selector=list(event.selector),
+                        in_iteration_id=event.in_iteration_id,
+                        in_loop_id=event.in_loop_id,
+                    )
                 )
-            )
-        elif isinstance(event, NodeRunAgentLogEvent):
-            self._publish_event(
-                QueueAgentLogEvent(
-                    id=event.message_id,
-                    label=event.label,
-                    node_execution_id=event.node_execution_id,
-                    parent_id=event.parent_id,
-                    error=event.error,
-                    status=event.status,
-                    data=event.data,
-                    metadata=event.metadata,
-                    node_id=event.node_id,
+            case NodeRunRetrieverResourceEvent():
+                self._publish_event(
+                    QueueRetrieverResourcesEvent(
+                        retriever_resources=[
+                            RetrievalSourceMetadata.model_validate(resource) for resource in event.retriever_resources
+                        ],
+                        in_iteration_id=event.in_iteration_id,
+                        in_loop_id=event.in_loop_id,
+                    )
                 )
-            )
-        elif isinstance(event, NodeRunIterationStartedEvent):
-            self._publish_event(
-                QueueIterationStartEvent(
-                    node_execution_id=event.id,
-                    node_id=event.node_id,
-                    node_type=event.node_type,
-                    node_title=event.node_title,
-                    start_at=event.start_at,
-                    node_run_index=workflow_entry.graph_engine.graph_runtime_state.node_run_steps,
-                    inputs=event.inputs,
-                    metadata=event.metadata,
+            case NodeRunAgentLogEvent():
+                self._publish_event(
+                    QueueAgentLogEvent(
+                        id=event.message_id,
+                        label=event.label,
+                        node_execution_id=event.node_execution_id,
+                        parent_id=event.parent_id,
+                        error=event.error,
+                        status=event.status,
+                        data=event.data,
+                        metadata=event.metadata,
+                        node_id=event.node_id,
+                    )
                 )
-            )
-        elif isinstance(event, NodeRunIterationNextEvent):
-            self._publish_event(
-                QueueIterationNextEvent(
-                    node_execution_id=event.id,
-                    node_id=event.node_id,
-                    node_type=event.node_type,
-                    node_title=event.node_title,
-                    index=event.index,
-                    node_run_index=workflow_entry.graph_engine.graph_runtime_state.node_run_steps,
-                    output=event.pre_iteration_output,
+            case NodeRunIterationStartedEvent():
+                self._publish_event(
+                    QueueIterationStartEvent(
+                        node_execution_id=event.id,
+                        node_id=event.node_id,
+                        node_type=event.node_type,
+                        node_title=event.node_title,
+                        start_at=event.start_at,
+                        node_run_index=workflow_entry.graph_engine.graph_runtime_state.node_run_steps,
+                        inputs=event.inputs,
+                        metadata=event.metadata,
+                    )
                 )
-            )
-        elif isinstance(event, (NodeRunIterationSucceededEvent | NodeRunIterationFailedEvent)):
-            self._publish_event(
-                QueueIterationCompletedEvent(
-                    node_execution_id=event.id,
-                    node_id=event.node_id,
-                    node_type=event.node_type,
-                    node_title=event.node_title,
-                    start_at=event.start_at,
-                    node_run_index=workflow_entry.graph_engine.graph_runtime_state.node_run_steps,
-                    inputs=event.inputs,
-                    outputs=event.outputs,
-                    metadata=event.metadata,
-                    steps=event.steps,
-                    error=event.error if isinstance(event, NodeRunIterationFailedEvent) else None,
+            case NodeRunIterationNextEvent():
+                self._publish_event(
+                    QueueIterationNextEvent(
+                        node_execution_id=event.id,
+                        node_id=event.node_id,
+                        node_type=event.node_type,
+                        node_title=event.node_title,
+                        index=event.index,
+                        node_run_index=workflow_entry.graph_engine.graph_runtime_state.node_run_steps,
+                        output=event.pre_iteration_output,
+                    )
                 )
-            )
-        elif isinstance(event, NodeRunLoopStartedEvent):
-            self._publish_event(
-                QueueLoopStartEvent(
-                    node_execution_id=event.id,
-                    node_id=event.node_id,
-                    node_type=event.node_type,
-                    node_title=event.node_title,
-                    start_at=event.start_at,
-                    node_run_index=workflow_entry.graph_engine.graph_runtime_state.node_run_steps,
-                    inputs=event.inputs,
-                    metadata=event.metadata,
+            case NodeRunIterationSucceededEvent() | NodeRunIterationFailedEvent():
+                self._publish_event(
+                    QueueIterationCompletedEvent(
+                        node_execution_id=event.id,
+                        node_id=event.node_id,
+                        node_type=event.node_type,
+                        node_title=event.node_title,
+                        start_at=event.start_at,
+                        node_run_index=workflow_entry.graph_engine.graph_runtime_state.node_run_steps,
+                        inputs=event.inputs,
+                        outputs=event.outputs,
+                        metadata=event.metadata,
+                        steps=event.steps,
+                        error=event.error if isinstance(event, NodeRunIterationFailedEvent) else None,
+                    )
                 )
-            )
-        elif isinstance(event, NodeRunLoopNextEvent):
-            self._publish_event(
-                QueueLoopNextEvent(
-                    node_execution_id=event.id,
-                    node_id=event.node_id,
-                    node_type=event.node_type,
-                    node_title=event.node_title,
-                    index=event.index,
-                    node_run_index=workflow_entry.graph_engine.graph_runtime_state.node_run_steps,
-                    output=event.pre_loop_output,
+            case NodeRunLoopStartedEvent():
+                self._publish_event(
+                    QueueLoopStartEvent(
+                        node_execution_id=event.id,
+                        node_id=event.node_id,
+                        node_type=event.node_type,
+                        node_title=event.node_title,
+                        start_at=event.start_at,
+                        node_run_index=workflow_entry.graph_engine.graph_runtime_state.node_run_steps,
+                        inputs=event.inputs,
+                        metadata=event.metadata,
+                    )
                 )
-            )
-        elif isinstance(event, (NodeRunLoopSucceededEvent | NodeRunLoopFailedEvent)):
-            self._publish_event(
-                QueueLoopCompletedEvent(
-                    node_execution_id=event.id,
-                    node_id=event.node_id,
-                    node_type=event.node_type,
-                    node_title=event.node_title,
-                    start_at=event.start_at,
-                    node_run_index=workflow_entry.graph_engine.graph_runtime_state.node_run_steps,
-                    inputs=event.inputs,
-                    outputs=event.outputs,
-                    metadata=event.metadata,
-                    steps=event.steps,
-                    error=event.error if isinstance(event, NodeRunLoopFailedEvent) else None,
+            case NodeRunLoopNextEvent():
+                self._publish_event(
+                    QueueLoopNextEvent(
+                        node_execution_id=event.id,
+                        node_id=event.node_id,
+                        node_type=event.node_type,
+                        node_title=event.node_title,
+                        index=event.index,
+                        node_run_index=workflow_entry.graph_engine.graph_runtime_state.node_run_steps,
+                        output=event.pre_loop_output,
+                    )
+                )
+            case NodeRunLoopSucceededEvent() | NodeRunLoopFailedEvent():
+                self._publish_event(
+                    QueueLoopCompletedEvent(
+                        node_execution_id=event.id,
+                        node_id=event.node_id,
+                        node_type=event.node_type,
+                        node_title=event.node_title,
+                        start_at=event.start_at,
+                        node_run_index=workflow_entry.graph_engine.graph_runtime_state.node_run_steps,
+                        inputs=event.inputs,
+                        outputs=event.outputs,
+                        metadata=event.metadata,
+                        steps=event.steps,
+                        error=event.error if isinstance(event, NodeRunLoopFailedEvent) else None,
+                    )
                 )
-            )
 
     def _enqueue_human_input_notifications(self, reasons: Sequence[object]) -> None:
         for reason in reasons:
diff --git a/api/core/app/entities/task_entities.py b/api/core/app/entities/task_entities.py
index ad05566521..3a33899bdf 100644
--- a/api/core/app/entities/task_entities.py
+++ b/api/core/app/entities/task_entities.py
@@ -10,7 +10,7 @@ from graphon.entities import WorkflowStartReason
 from graphon.entities.pause_reason import PauseReasonType
 from graphon.enums import WorkflowExecutionStatus, WorkflowNodeExecutionMetadataKey, WorkflowNodeExecutionStatus
 from graphon.model_runtime.entities.llm_entities import LLMResult, LLMUsage
-from graphon.nodes.human_input.entities import FormInput, UserAction
+from graphon.nodes.human_input.entities import FormInputConfig, UserActionConfig
 
 
 class AnnotationReplyAccount(BaseModel):
@@ -284,8 +284,8 @@ class HumanInputRequiredResponse(StreamResponse):
         node_id: str
         node_title: str
         form_content: str
-        inputs: Sequence[FormInput] = Field(default_factory=list)
-        actions: Sequence[UserAction] = Field(default_factory=list)
+        inputs: Sequence[FormInputConfig] = Field(default_factory=list)
+        actions: Sequence[UserActionConfig] = Field(default_factory=list)
         display_in_ui: bool = False
         form_token: str | None = None
         resolved_default_values: Mapping[str, Any] = Field(default_factory=dict)
@@ -307,8 +307,8 @@ class HumanInputRequiredPauseReasonPayload(BaseModel):
     node_id: str
     node_title: str
     form_content: str
-    inputs: Sequence[FormInput] = Field(default_factory=list)
-    actions: Sequence[UserAction] = Field(default_factory=list)
+    inputs: Sequence[FormInputConfig] = Field(default_factory=list)
+    actions: Sequence[UserActionConfig] = Field(default_factory=list)
     display_in_ui: bool = False
     form_token: str | None = None
     resolved_default_values: Mapping[str, Any] = Field(default_factory=dict)
diff --git a/api/core/app/file_access/__init__.py b/api/core/app/file_access/__init__.py
index a75ab9781b..e02aba102b 100644
--- a/api/core/app/file_access/__init__.py
+++ b/api/core/app/file_access/__init__.py
@@ -1,6 +1,13 @@
 from .controller import DatabaseFileAccessController
 from .protocols import FileAccessControllerProtocol
-from .scope import FileAccessScope, bind_file_access_scope, get_current_file_access_scope
+from .scope import (
+    FileAccessScope,
+    bind_file_access_scope,
+    get_current_file_access_scope,
+    grant_retriever_segment_access,
+    grant_upload_file_access,
+    is_retriever_segment_access_granted,
+)
 
 __all__ = [
     "DatabaseFileAccessController",
@@ -8,4 +15,7 @@ __all__ = [
     "FileAccessScope",
     "bind_file_access_scope",
     "get_current_file_access_scope",
+    "grant_retriever_segment_access",
+    "grant_upload_file_access",
+    "is_retriever_segment_access_granted",
 ]
diff --git a/api/core/app/file_access/controller.py b/api/core/app/file_access/controller.py
index 300c187083..a6c6e74f06 100644
--- a/api/core/app/file_access/controller.py
+++ b/api/core/app/file_access/controller.py
@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from collections.abc import Callable
 
-from sqlalchemy import select
+from sqlalchemy import and_, or_, select
 from sqlalchemy.orm import Session
 from sqlalchemy.sql import Select
 
@@ -18,7 +18,8 @@ class DatabaseFileAccessController(FileAccessControllerProtocol):
 
     Tenant scoping remains mandatory. When the current execution belongs to an
     end user, the lookup is additionally constrained to that end user's file
-    ownership markers.
+    ownership markers, plus upload files explicitly granted by the current
+    execution context.
     """
 
     _scope_getter: Callable[[], FileAccessScope | None]
@@ -47,10 +48,19 @@ class DatabaseFileAccessController(FileAccessControllerProtocol):
         if not resolved_scope.requires_user_ownership:
             return scoped_stmt
 
-        return scoped_stmt.where(
+        user_owned_filter = and_(
             UploadFile.created_by_role == CreatorUserRole.END_USER,
             UploadFile.created_by == resolved_scope.user_id,
         )
+        if not resolved_scope.granted_upload_file_ids:
+            return scoped_stmt.where(user_owned_filter)
+
+        return scoped_stmt.where(
+            or_(
+                user_owned_filter,
+                UploadFile.id.in_(resolved_scope.granted_upload_file_ids),
+            )
+        )
 
     def apply_tool_file_filters(
         self,
diff --git a/api/core/app/file_access/scope.py b/api/core/app/file_access/scope.py
index a583301f9b..12fe7b3840 100644
--- a/api/core/app/file_access/scope.py
+++ b/api/core/app/file_access/scope.py
@@ -1,9 +1,9 @@
 from __future__ import annotations
 
-from collections.abc import Generator  # Changed from Iterator
+from collections.abc import Generator, Iterable
 from contextlib import contextmanager
 from contextvars import ContextVar
-from dataclasses import dataclass
+from dataclasses import dataclass, field, replace
 
 from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
 
@@ -15,12 +15,23 @@ _current_file_access_scope: ContextVar[FileAccessScope | None] = ContextVar(
 
 @dataclass(frozen=True, slots=True)
 class FileAccessScope:
-    """Request-scoped ownership context used by workflow-layer file lookups."""
+    """Request-scoped ownership context used by workflow-layer file lookups.
+
+    ``granted_upload_file_ids`` is execution-local: callers may add upload files
+    that were returned by trusted retrieval paths without changing persistent
+    ownership markers.
+
+    ``granted_retriever_segment_ids`` gates lazy attachment loading by segment
+    ID, so user-provided context cannot make a later LLM node load arbitrary
+    same-tenant knowledge attachments.
+    """
 
     tenant_id: str
     user_id: str
     user_from: UserFrom
     invoke_from: InvokeFrom
+    granted_upload_file_ids: frozenset[str] = field(default_factory=frozenset)
+    granted_retriever_segment_ids: frozenset[str] = field(default_factory=frozenset)
 
     @property
     def requires_user_ownership(self) -> bool:
@@ -31,8 +42,49 @@ def get_current_file_access_scope() -> FileAccessScope | None:
     return _current_file_access_scope.get()
 
 
+def grant_upload_file_access(upload_file_ids: Iterable[str]) -> None:
+    scope = _current_file_access_scope.get()
+    if scope is None:
+        return
+
+    granted_upload_file_ids = frozenset(str(file_id) for file_id in upload_file_ids if file_id)
+    if not granted_upload_file_ids:
+        return
+
+    _current_file_access_scope.set(
+        replace(
+            scope,
+            granted_upload_file_ids=scope.granted_upload_file_ids | granted_upload_file_ids,
+        )
+    )
+
+
+def grant_retriever_segment_access(segment_ids: Iterable[str]) -> None:
+    scope = _current_file_access_scope.get()
+    if scope is None:
+        return
+
+    granted_segment_ids = frozenset(str(segment_id) for segment_id in segment_ids if segment_id)
+    if not granted_segment_ids:
+        return
+
+    _current_file_access_scope.set(
+        replace(
+            scope,
+            granted_retriever_segment_ids=scope.granted_retriever_segment_ids | granted_segment_ids,
+        )
+    )
+
+
+def is_retriever_segment_access_granted(segment_id: str) -> bool:
+    scope = _current_file_access_scope.get()
+    if scope is None or not scope.requires_user_ownership:
+        return True
+    return str(segment_id) in scope.granted_retriever_segment_ids
+
+
 @contextmanager
-def bind_file_access_scope(scope: FileAccessScope) -> Generator[None, None, None]:  # Changed from Iterator[None]
+def bind_file_access_scope(scope: FileAccessScope) -> Generator[None, None, None]:
     token = _current_file_access_scope.set(scope)
     try:
         yield
diff --git a/api/core/app/llm/__init__.py b/api/core/app/llm/__init__.py
index f069bede74..d20a5b2344 100644
--- a/api/core/app/llm/__init__.py
+++ b/api/core/app/llm/__init__.py
@@ -1,5 +1,15 @@
 """LLM-related application services."""
 
-from .quota import deduct_llm_quota, ensure_llm_quota_available
+from .quota import (
+    deduct_llm_quota,
+    deduct_llm_quota_for_model,
+    ensure_llm_quota_available,
+    ensure_llm_quota_available_for_model,
+)
 
-__all__ = ["deduct_llm_quota", "ensure_llm_quota_available"]
+__all__ = [
+    "deduct_llm_quota",
+    "deduct_llm_quota_for_model",
+    "ensure_llm_quota_available",
+    "ensure_llm_quota_available_for_model",
+]
diff --git a/api/core/app/llm/quota.py b/api/core/app/llm/quota.py
index b6039e1e4e..5bf3334a7b 100644
--- a/api/core/app/llm/quota.py
+++ b/api/core/app/llm/quota.py
@@ -1,4 +1,14 @@
-from sqlalchemy import update
+"""Tenant-scoped helpers for checking and deducting LLM provider quota.
+
+System-hosted quota accounting is currently defined only for LLM models. Keep
+the public helpers LLM-specific so callers do not carry unused model-type
+plumbing, and fail loudly if the deprecated ``ModelInstance`` wrappers are used
+with a non-LLM model.
+"""
+
+import warnings
+
+from sqlalchemy import select
 from sqlalchemy.orm import sessionmaker
 
 from configs import dify_config
@@ -6,44 +16,47 @@ from core.entities.model_entities import ModelStatus
 from core.entities.provider_entities import ProviderQuotaType, QuotaUnit
 from core.errors.error import QuotaExceededError
 from core.model_manager import ModelInstance
+from core.plugin.impl.model_runtime_factory import create_plugin_provider_manager
 from extensions.ext_database import db
 from graphon.model_runtime.entities.llm_entities import LLMUsage
+from graphon.model_runtime.entities.model_entities import ModelType
 from libs.datetime_utils import naive_utc_now
 from models.provider import Provider, ProviderType
 from models.provider_ids import ModelProviderID
 
 
-def ensure_llm_quota_available(*, model_instance: ModelInstance) -> None:
-    provider_model_bundle = model_instance.provider_model_bundle
-    provider_configuration = provider_model_bundle.configuration
+def _get_provider_configuration(*, tenant_id: str, provider: str):
+    """Resolve the tenant-bound provider configuration for quota decisions."""
+    provider_manager = create_plugin_provider_manager(tenant_id=tenant_id)
+    provider_configuration = provider_manager.get_configurations(tenant_id).get(provider)
+    if provider_configuration is None:
+        raise ValueError(f"Provider {provider} does not exist.")
+    return provider_configuration
 
+
+def ensure_llm_quota_available_for_model(*, tenant_id: str, provider: str, model: str) -> None:
+    """Raise when a tenant-bound LLM model is already out of quota."""
+    provider_configuration = _get_provider_configuration(tenant_id=tenant_id, provider=provider)
     if provider_configuration.using_provider_type != ProviderType.SYSTEM:
         return
 
     provider_model = provider_configuration.get_provider_model(
-        model_type=model_instance.model_type_instance.model_type,
-        model=model_instance.model_name,
+        model_type=ModelType.LLM,
+        model=model,
     )
     if provider_model and provider_model.status == ModelStatus.QUOTA_EXCEEDED:
-        raise QuotaExceededError(f"Model provider {model_instance.provider} quota exceeded.")
+        raise QuotaExceededError(f"Model provider {provider} quota exceeded.")
 
 
-def deduct_llm_quota(*, tenant_id: str, model_instance: ModelInstance, usage: LLMUsage) -> None:
-    provider_model_bundle = model_instance.provider_model_bundle
-    provider_configuration = provider_model_bundle.configuration
-
-    if provider_configuration.using_provider_type != ProviderType.SYSTEM:
-        return
-
-    system_configuration = provider_configuration.system_configuration
-
+def _resolve_llm_used_quota(*, system_configuration, model: str, usage: LLMUsage) -> int | None:
+    """Compute the quota impact for an LLM invocation under the current quota mode."""
     quota_unit = None
     for quota_configuration in system_configuration.quota_configurations:
         if quota_configuration.quota_type == system_configuration.current_quota_type:
             quota_unit = quota_configuration.quota_unit
 
             if quota_configuration.quota_limit == -1:
-                return
+                return None
 
             break
 
@@ -52,42 +65,136 @@ def deduct_llm_quota(*, tenant_id: str, model_instance: ModelInstance, usage: LL
         if quota_unit == QuotaUnit.TOKENS:
             used_quota = usage.total_tokens
         elif quota_unit == QuotaUnit.CREDITS:
-            used_quota = dify_config.get_model_credits(model_instance.model_name)
+            used_quota = dify_config.get_model_credits(model)
         else:
             used_quota = 1
 
+    return used_quota
+
+
+def _deduct_free_llm_quota(
+    *,
+    tenant_id: str,
+    provider: str,
+    quota_type: ProviderQuotaType,
+    used_quota: int,
+) -> None:
+    """Deduct FREE provider quota, capping at the limit before reporting exhaustion."""
+    quota_exceeded = False
+    with sessionmaker(bind=db.engine).begin() as session:
+        provider_record = session.scalar(
+            select(Provider)
+            .where(
+                Provider.tenant_id == tenant_id,
+                # TODO: Use provider name with prefix after the data migration.
+                Provider.provider_name == ModelProviderID(provider).provider_name,
+                Provider.provider_type == ProviderType.SYSTEM.value,
+                Provider.quota_type == quota_type,
+            )
+            .with_for_update()
+        )
+        if (
+            provider_record is None
+            or provider_record.quota_limit is None
+            or provider_record.quota_used is None
+            or provider_record.quota_limit <= provider_record.quota_used
+        ):
+            quota_exceeded = True
+        else:
+            available_quota = provider_record.quota_limit - provider_record.quota_used
+            deducted_quota = min(used_quota, available_quota)
+            provider_record.quota_used += deducted_quota
+            provider_record.last_used = naive_utc_now()
+            quota_exceeded = deducted_quota < used_quota
+
+    if quota_exceeded:
+        raise QuotaExceededError(f"Model provider {provider} quota exceeded.")
+
+
+def _deduct_used_llm_quota(*, tenant_id: str, provider: str, provider_configuration, used_quota: int | None) -> None:
+    """Apply a resolved LLM quota charge against the current provider quota bucket."""
+    if provider_configuration.using_provider_type != ProviderType.SYSTEM:
+        return
+
+    system_configuration = provider_configuration.system_configuration
     if used_quota is not None and system_configuration.current_quota_type is not None:
         match system_configuration.current_quota_type:
             case ProviderQuotaType.TRIAL:
                 from services.credit_pool_service import CreditPoolService
 
-                CreditPoolService.check_and_deduct_credits(
+                CreditPoolService.deduct_credits_capped(
                     tenant_id=tenant_id,
                     credits_required=used_quota,
                 )
             case ProviderQuotaType.PAID:
                 from services.credit_pool_service import CreditPoolService
 
-                CreditPoolService.check_and_deduct_credits(
+                CreditPoolService.deduct_credits_capped(
                     tenant_id=tenant_id,
                     credits_required=used_quota,
                     pool_type="paid",
                 )
             case ProviderQuotaType.FREE:
-                with sessionmaker(bind=db.engine).begin() as session:
-                    stmt = (
-                        update(Provider)
-                        .where(
-                            Provider.tenant_id == tenant_id,
-                            # TODO: Use provider name with prefix after the data migration.
-                            Provider.provider_name == ModelProviderID(model_instance.provider).provider_name,
-                            Provider.provider_type == ProviderType.SYSTEM.value,
-                            Provider.quota_type == system_configuration.current_quota_type,
-                            Provider.quota_limit > Provider.quota_used,
-                        )
-                        .values(
-                            quota_used=Provider.quota_used + used_quota,
-                            last_used=naive_utc_now(),
-                        )
-                    )
-                    session.execute(stmt)
+                _deduct_free_llm_quota(
+                    tenant_id=tenant_id,
+                    provider=provider,
+                    quota_type=system_configuration.current_quota_type,
+                    used_quota=used_quota,
+                )
+            case _:
+                return
+
+
+def deduct_llm_quota_for_model(*, tenant_id: str, provider: str, model: str, usage: LLMUsage) -> None:
+    """Deduct tenant-bound quota for the resolved LLM model identity."""
+    provider_configuration = _get_provider_configuration(tenant_id=tenant_id, provider=provider)
+    used_quota = _resolve_llm_used_quota(
+        system_configuration=provider_configuration.system_configuration,
+        model=model,
+        usage=usage,
+    )
+    _deduct_used_llm_quota(
+        tenant_id=tenant_id,
+        provider=provider,
+        provider_configuration=provider_configuration,
+        used_quota=used_quota,
+    )
+
+
+def _require_llm_model_instance(model_instance: ModelInstance) -> None:
+    """Reject deprecated wrapper calls that pass a non-LLM model instance."""
+    if model_instance.model_type_instance.model_type != ModelType.LLM:
+        raise ValueError("LLM quota helpers only support LLM model instances.")
+
+
+def ensure_llm_quota_available(*, model_instance: ModelInstance) -> None:
+    """Deprecated compatibility wrapper for callers that still pass ModelInstance."""
+    warnings.warn(
+        "ensure_llm_quota_available(model_instance=...) is deprecated; "
+        "use ensure_llm_quota_available_for_model(...) instead.",
+        DeprecationWarning,
+        stacklevel=2,
+    )
+    _require_llm_model_instance(model_instance)
+    ensure_llm_quota_available_for_model(
+        tenant_id=model_instance.provider_model_bundle.configuration.tenant_id,
+        provider=model_instance.provider,
+        model=model_instance.model_name,
+    )
+
+
+def deduct_llm_quota(*, tenant_id: str, model_instance: ModelInstance, usage: LLMUsage) -> None:
+    """Deprecated compatibility wrapper for callers that still pass ModelInstance."""
+    warnings.warn(
+        "deduct_llm_quota(tenant_id=..., model_instance=..., usage=...) is deprecated; "
+        "use deduct_llm_quota_for_model(...) instead.",
+        DeprecationWarning,
+        stacklevel=2,
+    )
+    _require_llm_model_instance(model_instance)
+    deduct_llm_quota_for_model(
+        tenant_id=tenant_id,
+        provider=model_instance.provider,
+        model=model_instance.model_name,
+        usage=usage,
+    )
diff --git a/api/core/app/task_pipeline/easy_ui_based_generate_task_pipeline.py b/api/core/app/task_pipeline/easy_ui_based_generate_task_pipeline.py
index e2e07ebaff..171d5ab342 100644
--- a/api/core/app/task_pipeline/easy_ui_based_generate_task_pipeline.py
+++ b/api/core/app/task_pipeline/easy_ui_based_generate_task_pipeline.py
@@ -140,42 +140,43 @@ class EasyUIBasedGenerateTaskPipeline(BasedGenerateTaskPipeline):
         :return:
         """
         for stream_response in generator:
-            if isinstance(stream_response, ErrorStreamResponse):
-                raise stream_response.err
-            elif isinstance(stream_response, MessageEndStreamResponse):
-                extras = {"usage": self._task_state.llm_result.usage.model_dump()}
-                if self._task_state.metadata:
-                    extras["metadata"] = self._task_state.metadata.model_dump()
-                response: ChatbotAppBlockingResponse | CompletionAppBlockingResponse
-                if self._conversation_mode == AppMode.COMPLETION:
-                    response = CompletionAppBlockingResponse(
-                        task_id=self._application_generate_entity.task_id,
-                        data=CompletionAppBlockingResponse.Data(
-                            id=self._message_id,
-                            mode=self._conversation_mode,
-                            message_id=self._message_id,
-                            answer=self._task_state.llm_result.message.get_text_content(),
-                            created_at=self._message_created_at,
-                            **extras,
-                        ),
-                    )
-                else:
-                    response = ChatbotAppBlockingResponse(
-                        task_id=self._application_generate_entity.task_id,
-                        data=ChatbotAppBlockingResponse.Data(
-                            id=self._message_id,
-                            mode=self._conversation_mode,
-                            conversation_id=self._conversation_id,
-                            message_id=self._message_id,
-                            answer=self._task_state.llm_result.message.get_text_content(),
-                            created_at=self._message_created_at,
-                            **extras,
-                        ),
-                    )
+            match stream_response:
+                case ErrorStreamResponse():
+                    raise stream_response.err
+                case MessageEndStreamResponse():
+                    extras = {"usage": self._task_state.llm_result.usage.model_dump()}
+                    if self._task_state.metadata:
+                        extras["metadata"] = self._task_state.metadata.model_dump()
+                    response: ChatbotAppBlockingResponse | CompletionAppBlockingResponse
+                    if self._conversation_mode == AppMode.COMPLETION:
+                        response = CompletionAppBlockingResponse(
+                            task_id=self._application_generate_entity.task_id,
+                            data=CompletionAppBlockingResponse.Data(
+                                id=self._message_id,
+                                mode=self._conversation_mode,
+                                message_id=self._message_id,
+                                answer=self._task_state.llm_result.message.get_text_content(),
+                                created_at=self._message_created_at,
+                                **extras,
+                            ),
+                        )
+                    else:
+                        response = ChatbotAppBlockingResponse(
+                            task_id=self._application_generate_entity.task_id,
+                            data=ChatbotAppBlockingResponse.Data(
+                                id=self._message_id,
+                                mode=self._conversation_mode,
+                                conversation_id=self._conversation_id,
+                                message_id=self._message_id,
+                                answer=self._task_state.llm_result.message.get_text_content(),
+                                created_at=self._message_created_at,
+                                **extras,
+                            ),
+                        )
 
-                return response
-            else:
-                continue
+                    return response
+                case _:
+                    continue
 
         raise RuntimeError("queue listening stopped unexpectedly.")
 
@@ -265,104 +266,107 @@ class EasyUIBasedGenerateTaskPipeline(BasedGenerateTaskPipeline):
                 publisher.publish(message)
             event = message.event
 
-            if isinstance(event, QueueErrorEvent):
-                with sessionmaker(bind=db.engine).begin() as session:
-                    err = self.handle_error(event=event, session=session, message_id=self._message_id)
-                yield self.error_to_stream_response(err)
-                break
-            elif isinstance(event, QueueStopEvent | QueueMessageEndEvent):
-                if isinstance(event, QueueMessageEndEvent):
-                    if event.llm_result:
-                        self._task_state.llm_result = event.llm_result
-                else:
-                    self._handle_stop(event)
+            match event:
+                case QueueErrorEvent():
+                    with sessionmaker(bind=db.engine).begin() as session:
+                        err = self.handle_error(event=event, session=session, message_id=self._message_id)
+                    yield self.error_to_stream_response(err)
+                    break
+                case QueueStopEvent() | QueueMessageEndEvent():
+                    if isinstance(event, QueueMessageEndEvent):
+                        if event.llm_result:
+                            self._task_state.llm_result = event.llm_result
+                    else:
+                        self._handle_stop(event)
 
-                # handle output moderation
-                output_moderation_answer = self.handle_output_moderation_when_task_finished(
-                    self._task_state.llm_result.message.get_text_content()
-                )
-                if output_moderation_answer:
-                    self._task_state.llm_result.message.content = output_moderation_answer
-                    yield self._message_cycle_manager.message_replace_to_stream_response(
-                        answer=output_moderation_answer
+                    # handle output moderation
+                    output_moderation_answer = self.handle_output_moderation_when_task_finished(
+                        self._task_state.llm_result.message.get_text_content()
                     )
-
-                with sessionmaker(bind=db.engine).begin() as session:
-                    # Save message
-                    self._save_message(session=session, trace_manager=trace_manager)
-                message_end_resp = self._message_end_to_stream_response()
-                yield message_end_resp
-            elif isinstance(event, QueueRetrieverResourcesEvent):
-                self._message_cycle_manager.handle_retriever_resources(event)
-            elif isinstance(event, QueueAnnotationReplyEvent):
-                annotation = self._message_cycle_manager.handle_annotation_reply(event)
-                if annotation:
-                    self._task_state.llm_result.message.content = annotation.content
-            elif isinstance(event, QueueAgentThoughtEvent):
-                agent_thought_response = self._agent_thought_to_stream_response(event)
-                if agent_thought_response is not None:
-                    yield agent_thought_response
-            elif isinstance(event, QueueMessageFileEvent):
-                response = self._message_cycle_manager.message_file_to_stream_response(event)
-                if response:
-                    yield response
-            elif isinstance(event, QueueLLMChunkEvent | QueueAgentMessageEvent):
-                chunk = event.chunk
-                delta_text = chunk.delta.message.content
-                if delta_text is None:
-                    continue
-                if isinstance(chunk.delta.message.content, list):
-                    delta_text = ""
-                    for content in chunk.delta.message.content:
-                        logger.debug(
-                            "The content type %s in LLM chunk delta message content.: %r", type(content), content
+                    if output_moderation_answer:
+                        self._task_state.llm_result.message.content = output_moderation_answer
+                        yield self._message_cycle_manager.message_replace_to_stream_response(
+                            answer=output_moderation_answer
                         )
-                        if isinstance(content, TextPromptMessageContent):
-                            delta_text += content.data
-                        elif isinstance(content, str):
-                            delta_text += content  # failback to str
-                        else:
-                            logger.warning(
-                                "Unsupported content type %s in LLM chunk delta message content.: %r",
-                                type(content),
-                                content,
+
+                    with sessionmaker(bind=db.engine).begin() as session:
+                        # Save message
+                        self._save_message(session=session, trace_manager=trace_manager)
+                    message_end_resp = self._message_end_to_stream_response()
+                    yield message_end_resp
+                case QueueRetrieverResourcesEvent():
+                    self._message_cycle_manager.handle_retriever_resources(event)
+                case QueueAnnotationReplyEvent():
+                    annotation = self._message_cycle_manager.handle_annotation_reply(event)
+                    if annotation:
+                        self._task_state.llm_result.message.content = annotation.content
+                case QueueAgentThoughtEvent():
+                    agent_thought_response = self._agent_thought_to_stream_response(event)
+                    if agent_thought_response is not None:
+                        yield agent_thought_response
+                case QueueMessageFileEvent():
+                    response = self._message_cycle_manager.message_file_to_stream_response(event)
+                    if response:
+                        yield response
+                case QueueLLMChunkEvent() | QueueAgentMessageEvent():
+                    chunk = event.chunk
+                    delta_text = chunk.delta.message.content
+                    if delta_text is None:
+                        continue
+                    if isinstance(chunk.delta.message.content, list):
+                        delta_text = ""
+                        for content in chunk.delta.message.content:
+                            logger.debug(
+                                "The content type %s in LLM chunk delta message content.: %r", type(content), content
                             )
-                            continue
+                            match content:
+                                case TextPromptMessageContent():
+                                    delta_text += content.data
+                                case str():
+                                    delta_text += content  # failback to str
+                                case _:
+                                    logger.warning(
+                                        "Unsupported content type %s in LLM chunk delta message content.: %r",
+                                        type(content),
+                                        content,
+                                    )
+                                    continue
 
-                if not self._task_state.llm_result.prompt_messages:
-                    self._task_state.llm_result.prompt_messages = chunk.prompt_messages
+                    if not self._task_state.llm_result.prompt_messages:
+                        self._task_state.llm_result.prompt_messages = chunk.prompt_messages
 
-                # handle output moderation chunk
-                should_direct_answer = self._handle_output_moderation_chunk(cast(str, delta_text))
-                if should_direct_answer:
+                    # handle output moderation chunk
+                    should_direct_answer = self._handle_output_moderation_chunk(cast(str, delta_text))
+                    if should_direct_answer:
+                        continue
+
+                    current_content = cast(str, self._task_state.llm_result.message.content)
+                    current_content += cast(str, delta_text)
+                    self._task_state.llm_result.message.content = current_content
+
+                    match event:
+                        case QueueLLMChunkEvent():
+                            # Determine the event type once, on first LLM chunk, and reuse for subsequent chunks
+                            if not hasattr(self, "_precomputed_event_type") or self._precomputed_event_type is None:
+                                self._precomputed_event_type = self._message_cycle_manager.get_message_event_type(
+                                    message_id=self._message_id
+                                )
+                            yield self._message_cycle_manager.message_to_stream_response(
+                                answer=cast(str, delta_text),
+                                message_id=self._message_id,
+                                event_type=self._precomputed_event_type,
+                            )
+                        case _:
+                            yield self._agent_message_to_stream_response(
+                                answer=cast(str, delta_text),
+                                message_id=self._message_id,
+                            )
+                case QueueMessageReplaceEvent():
+                    yield self._message_cycle_manager.message_replace_to_stream_response(answer=event.text)
+                case QueuePingEvent():
+                    yield self.ping_stream_response()
+                case _:
                     continue
-
-                current_content = cast(str, self._task_state.llm_result.message.content)
-                current_content += cast(str, delta_text)
-                self._task_state.llm_result.message.content = current_content
-
-                if isinstance(event, QueueLLMChunkEvent):
-                    # Determine the event type once, on first LLM chunk, and reuse for subsequent chunks
-                    if not hasattr(self, "_precomputed_event_type") or self._precomputed_event_type is None:
-                        self._precomputed_event_type = self._message_cycle_manager.get_message_event_type(
-                            message_id=self._message_id
-                        )
-                    yield self._message_cycle_manager.message_to_stream_response(
-                        answer=cast(str, delta_text),
-                        message_id=self._message_id,
-                        event_type=self._precomputed_event_type,
-                    )
-                else:
-                    yield self._agent_message_to_stream_response(
-                        answer=cast(str, delta_text),
-                        message_id=self._message_id,
-                    )
-            elif isinstance(event, QueueMessageReplaceEvent):
-                yield self._message_cycle_manager.message_replace_to_stream_response(answer=event.text)
-            elif isinstance(event, QueuePingEvent):
-                yield self.ping_stream_response()
-            else:
-                continue
         if publisher:
             publisher.publish(None)
         if self._conversation_name_generate_thread:
diff --git a/api/core/app/workflow/file_runtime.py b/api/core/app/workflow/file_runtime.py
index 3a6f9d575a..587f700286 100644
--- a/api/core/app/workflow/file_runtime.py
+++ b/api/core/app/workflow/file_runtime.py
@@ -128,7 +128,7 @@ class DifyWorkflowFileRuntime(WorkflowFileRuntimeProtocol):
 
     @staticmethod
     def _secret_key() -> bytes:
-        return dify_config.SECRET_KEY.encode() if dify_config.SECRET_KEY else b""
+        return dify_config.SECRET_KEY.encode()
 
     def _sign_query(self, *, payload: str) -> dict[str, str]:
         timestamp = str(int(time.time()))
diff --git a/api/core/app/workflow/layers/llm_quota.py b/api/core/app/workflow/layers/llm_quota.py
index 4a7918032e..2422eed5a7 100644
--- a/api/core/app/workflow/layers/llm_quota.py
+++ b/api/core/app/workflow/layers/llm_quota.py
@@ -1,36 +1,48 @@
 """
 LLM quota deduction layer for GraphEngine.
 
-This layer centralizes model-quota deduction outside node implementations.
+This layer centralizes model-quota handling outside node implementations.
+
+Graphon LLM-backed nodes expose provider/model identity through public node
+configuration and, after execution, through ``node_run_result.inputs``. Resolve
+quota billing from that public identity instead of depending on
+``ModelInstance`` reconstruction inside the workflow layer. Missing identity on
+quota-tracked nodes is treated as a workflow bug and aborts execution so quota
+handling is never silently skipped.
 """
 
 import logging
-from typing import TYPE_CHECKING, cast, final, override
+from typing import final, override
 
-from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, DifyRunContext
-from core.app.llm import deduct_llm_quota, ensure_llm_quota_available
+from core.app.llm import deduct_llm_quota_for_model, ensure_llm_quota_available_for_model
 from core.errors.error import QuotaExceededError
-from core.model_manager import ModelInstance
-from graphon.enums import BuiltinNodeTypes
+from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionStatus
 from graphon.graph_engine.entities.commands import AbortCommand, CommandType
 from graphon.graph_engine.layers import GraphEngineLayer
 from graphon.graph_events import GraphEngineEvent, GraphNodeEventBase, NodeRunSucceededEvent
+from graphon.node_events import NodeRunResult
 from graphon.nodes.base.node import Node
 
-if TYPE_CHECKING:
-    from graphon.nodes.llm.node import LLMNode
-    from graphon.nodes.parameter_extractor.parameter_extractor_node import ParameterExtractorNode
-    from graphon.nodes.question_classifier.question_classifier_node import QuestionClassifierNode
-
 logger = logging.getLogger(__name__)
+_QUOTA_NODE_TYPES = frozenset(
+    [
+        BuiltinNodeTypes.LLM,
+        BuiltinNodeTypes.PARAMETER_EXTRACTOR,
+        BuiltinNodeTypes.QUESTION_CLASSIFIER,
+    ]
+)
 
 
 @final
 class LLMQuotaLayer(GraphEngineLayer):
-    """Graph layer that applies LLM quota deduction after node execution."""
+    """Graph layer that applies tenant-scoped quota checks to LLM-backed nodes."""
 
-    def __init__(self) -> None:
+    tenant_id: str
+    _abort_sent: bool
+
+    def __init__(self, tenant_id: str) -> None:
         super().__init__()
+        self.tenant_id = tenant_id
         self._abort_sent = False
 
     @override
@@ -50,33 +62,49 @@ class LLMQuotaLayer(GraphEngineLayer):
         if self._abort_sent:
             return
 
-        model_instance = self._extract_model_instance(node)
-        if model_instance is None:
+        if not self._supports_quota(node):
             return
 
+        model_identity = self._extract_model_identity_from_node(node)
+        if model_identity is None:
+            reason = "LLM quota check requires public node model identity before execution."
+            self._abort_before_node_run(node=node, reason=reason, error_type="LLMQuotaIdentityError")
+            logger.error("LLM quota handling aborted, node_id=%s, reason=%s", node.id, reason)
+            return
+
+        provider, model_name = model_identity
         try:
-            ensure_llm_quota_available(model_instance=model_instance)
+            ensure_llm_quota_available_for_model(
+                tenant_id=self.tenant_id,
+                provider=provider,
+                model=model_name,
+            )
         except QuotaExceededError as exc:
-            self._set_stop_event(node)
-            self._send_abort_command(reason=str(exc))
+            self._abort_before_node_run(node=node, reason=str(exc), error_type=QuotaExceededError.__name__)
             logger.warning("LLM quota check failed, node_id=%s, error=%s", node.id, exc)
 
     @override
     def on_node_run_end(
         self, node: Node, error: Exception | None, result_event: GraphNodeEventBase | None = None
     ) -> None:
-        if error is not None or not isinstance(result_event, NodeRunSucceededEvent):
+        if error is not None or not isinstance(result_event, NodeRunSucceededEvent) or not self._supports_quota(node):
             return
 
-        model_instance = self._extract_model_instance(node)
-        if model_instance is None:
+        model_identity = self._extract_model_identity_from_result_event(result_event)
+        if model_identity is None:
+            self._abort_for_missing_model_identity(
+                node=node,
+                reason="LLM quota deduction requires model identity in the node result event.",
+            )
             return
 
+        provider, model_name = model_identity
+
         try:
-            dify_ctx = DifyRunContext.model_validate(node.require_run_context_value(DIFY_RUN_CONTEXT_KEY))
-            deduct_llm_quota(
-                tenant_id=dify_ctx.tenant_id,
-                model_instance=model_instance,
+            deduct_llm_quota_for_model(
+                tenant_id=self.tenant_id,
+                provider=provider,
+                model=model_name,
                 usage=result_event.node_run_result.llm_usage,
             )
         except QuotaExceededError as exc:
@@ -92,6 +120,27 @@ class LLMQuotaLayer(GraphEngineLayer):
         if stop_event is not None:
             stop_event.set()
 
+    def _abort_before_node_run(self, *, node: Node, reason: str, error_type: str) -> None:
+        self._set_stop_event(node)
+        node.node_data.error_strategy = None
+        node.node_data.retry_config.retry_enabled = False
+
+        def quota_aborted_run() -> NodeRunResult:
+            return NodeRunResult(
+                status=WorkflowNodeExecutionStatus.FAILED,
+                error=reason,
+                error_type=error_type,
+            )
+
+        # TODO: Push Graphon to expose a public pre-run failure/skip hook, then replace this private _run override.
+        node._run = quota_aborted_run  # type: ignore[method-assign]
+        self._send_abort_command(reason=reason)
+
+    def _abort_for_missing_model_identity(self, *, node: Node, reason: str) -> None:
+        self._set_stop_event(node)
+        self._send_abort_command(reason=reason)
+        logger.error("LLM quota handling aborted, node_id=%s, reason=%s", node.id, reason)
+
     def _send_abort_command(self, *, reason: str) -> None:
         if not self.command_channel or self._abort_sent:
             return
@@ -108,29 +157,38 @@ class LLMQuotaLayer(GraphEngineLayer):
             logger.exception("Failed to send quota abort command")
 
     @staticmethod
-    def _extract_model_instance(node: Node) -> ModelInstance | None:
-        try:
-            match node.node_type:
-                case BuiltinNodeTypes.LLM:
-                    model_instance = cast("LLMNode", node).model_instance
-                case BuiltinNodeTypes.PARAMETER_EXTRACTOR:
-                    model_instance = cast("ParameterExtractorNode", node).model_instance
-                case BuiltinNodeTypes.QUESTION_CLASSIFIER:
-                    model_instance = cast("QuestionClassifierNode", node).model_instance
-                case _:
-                    return None
-        except AttributeError:
+    def _supports_quota(node: Node) -> bool:
+        return node.node_type in _QUOTA_NODE_TYPES
+
+    @staticmethod
+    def _extract_model_identity_from_result_event(result_event: NodeRunSucceededEvent) -> tuple[str, str] | None:
+        provider = result_event.node_run_result.inputs.get("model_provider")
+        model_name = result_event.node_run_result.inputs.get("model_name")
+        if isinstance(provider, str) and provider and isinstance(model_name, str) and model_name:
+            return provider, model_name
+        return None
+
+    @staticmethod
+    def _extract_model_identity_from_node(node: Node) -> tuple[str, str] | None:
+        node_data = getattr(node, "node_data", None)
+        if node_data is None:
+            node_data = getattr(node, "data", None)
+
+        model_config = getattr(node_data, "model", None)
+        if model_config is None:
             logger.warning(
-                "LLMQuotaLayer skipped quota deduction because node does not expose a model instance, node_id=%s",
+                "LLMQuotaLayer skipped quota handling because node model config is missing, node_id=%s",
                 node.id,
             )
             return None
 
-        if isinstance(model_instance, ModelInstance):
-            return model_instance
-
-        raw_model_instance = getattr(model_instance, "_model_instance", None)
-        if isinstance(raw_model_instance, ModelInstance):
-            return raw_model_instance
+        provider = getattr(model_config, "provider", None)
+        model_name = getattr(model_config, "name", None)
+        if isinstance(provider, str) and provider and isinstance(model_name, str) and model_name:
+            return provider, model_name
 
+        logger.warning(
+            "LLMQuotaLayer skipped quota handling because node model identity is invalid, node_id=%s",
+            node.id,
+        )
         return None
diff --git a/api/core/app/workflow/layers/persistence.py b/api/core/app/workflow/layers/persistence.py
index d521304615..c5dba65232 100644
--- a/api/core/app/workflow/layers/persistence.py
+++ b/api/core/app/workflow/layers/persistence.py
@@ -15,6 +15,7 @@ from datetime import datetime
 from typing import Any, Union
 
 from core.app.entities.app_invoke_entities import AdvancedChatAppGenerateEntity, WorkflowAppGenerateEntity
+from core.helper.trace_id_helper import ParentTraceContext
 from core.ops.entities.trace_entity import TraceTaskName
 from core.ops.ops_trace_manager import TraceQueueManager, TraceTask
 from core.repositories.factory import WorkflowExecutionRepository, WorkflowNodeExecutionRepository
@@ -104,52 +105,31 @@ class WorkflowPersistenceLayer(GraphEngineLayer):
         self._node_sequence = 0
 
     def on_event(self, event: GraphEngineEvent) -> None:
-        if isinstance(event, GraphRunStartedEvent):
-            self._handle_graph_run_started()
-            return
-
-        if isinstance(event, GraphRunSucceededEvent):
-            self._handle_graph_run_succeeded(event)
-            return
-
-        if isinstance(event, GraphRunPartialSucceededEvent):
-            self._handle_graph_run_partial_succeeded(event)
-            return
-
-        if isinstance(event, GraphRunFailedEvent):
-            self._handle_graph_run_failed(event)
-            return
-
-        if isinstance(event, GraphRunAbortedEvent):
-            self._handle_graph_run_aborted(event)
-            return
-
-        if isinstance(event, GraphRunPausedEvent):
-            self._handle_graph_run_paused(event)
-            return
-
-        if isinstance(event, NodeRunRetryEvent):
-            self._handle_node_retry(event)
-            return
-
-        if isinstance(event, NodeRunStartedEvent):
-            self._handle_node_started(event)
-            return
-
-        if isinstance(event, NodeRunSucceededEvent):
-            self._handle_node_succeeded(event)
-            return
-
-        if isinstance(event, NodeRunFailedEvent):
-            self._handle_node_failed(event)
-            return
-
-        if isinstance(event, NodeRunExceptionEvent):
-            self._handle_node_exception(event)
-            return
-
-        if isinstance(event, NodeRunPauseRequestedEvent):
-            self._handle_node_pause_requested(event)
+        match event:
+            case GraphRunStartedEvent():
+                self._handle_graph_run_started()
+            case GraphRunSucceededEvent():
+                self._handle_graph_run_succeeded(event)
+            case GraphRunPartialSucceededEvent():
+                self._handle_graph_run_partial_succeeded(event)
+            case GraphRunFailedEvent():
+                self._handle_graph_run_failed(event)
+            case GraphRunAbortedEvent():
+                self._handle_graph_run_aborted(event)
+            case GraphRunPausedEvent():
+                self._handle_graph_run_paused(event)
+            case NodeRunRetryEvent():
+                self._handle_node_retry(event)
+            case NodeRunStartedEvent():
+                self._handle_node_started(event)
+            case NodeRunSucceededEvent():
+                self._handle_node_succeeded(event)
+            case NodeRunFailedEvent():
+                self._handle_node_failed(event)
+            case NodeRunExceptionEvent():
+                self._handle_node_exception(event)
+            case NodeRunPauseRequestedEvent():
+                self._handle_node_pause_requested(event)
 
     def on_graph_end(self, error: Exception | None) -> None:
         return
@@ -403,8 +383,13 @@ class WorkflowPersistenceLayer(GraphEngineLayer):
 
         conversation_id = self._system_variables().get(SystemVariableKey.CONVERSATION_ID.value)
         external_trace_id = None
+        parent_trace_context = None
         if isinstance(self._application_generate_entity, (WorkflowAppGenerateEntity, AdvancedChatAppGenerateEntity)):
-            external_trace_id = self._application_generate_entity.extras.get("external_trace_id")
+            extras = self._application_generate_entity.extras
+            external_trace_id = extras.get("external_trace_id")
+            parent_trace_context = extras.get("parent_trace_context")
+            if isinstance(parent_trace_context, ParentTraceContext):
+                parent_trace_context = parent_trace_context.model_dump(exclude_none=True)
 
         trace_task = TraceTask(
             TraceTaskName.WORKFLOW_TRACE,
@@ -412,6 +397,7 @@ class WorkflowPersistenceLayer(GraphEngineLayer):
             conversation_id=conversation_id,
             user_id=self._trace_manager.user_id,
             external_trace_id=external_trace_id,
+            parent_trace_context=parent_trace_context,
         )
         self._trace_manager.add_trace_task(trace_task)
 
diff --git a/api/core/base/tts/app_generator_tts_publisher.py b/api/core/base/tts/app_generator_tts_publisher.py
index 9e3c187210..7002b1a470 100644
--- a/api/core/base/tts/app_generator_tts_publisher.py
+++ b/api/core/base/tts/app_generator_tts_publisher.py
@@ -95,13 +95,14 @@ class AppGeneratorTTSPublisher:
                     message_content = message.event.chunk.delta.message.content
                     if not message_content:
                         continue
-                    if isinstance(message_content, str):
-                        self.msg_text += message_content
-                    elif isinstance(message_content, list):
-                        for content in message_content:
-                            if not isinstance(content, TextPromptMessageContent):
-                                continue
-                            self.msg_text += content.data
+                    match message_content:
+                        case str():
+                            self.msg_text += message_content
+                        case list():
+                            for content in message_content:
+                                if not isinstance(content, TextPromptMessageContent):
+                                    continue
+                                self.msg_text += content.data
                 elif isinstance(message.event, QueueTextChunkEvent):
                     self.msg_text += message.event.text
                 elif isinstance(message.event, QueueNodeSucceededEvent):
diff --git a/api/core/datasource/datasource_file_manager.py b/api/core/datasource/datasource_file_manager.py
index 492b507aa9..79b84a28be 100644
--- a/api/core/datasource/datasource_file_manager.py
+++ b/api/core/datasource/datasource_file_manager.py
@@ -35,8 +35,11 @@ class DatasourceFileManager:
         timestamp = str(int(time.time()))
         nonce = os.urandom(16).hex()
         data_to_sign = f"file-preview|{datasource_file_id}|{timestamp}|{nonce}"
-        secret_key = dify_config.SECRET_KEY.encode() if dify_config.SECRET_KEY else b""
-        sign = hmac.new(secret_key, data_to_sign.encode(), hashlib.sha256).digest()
+        sign = hmac.new(
+            dify_config.SECRET_KEY.encode(),
+            data_to_sign.encode(),
+            hashlib.sha256,
+        ).digest()
         encoded_sign = base64.urlsafe_b64encode(sign).decode()
 
         return f"{file_preview_url}?timestamp={timestamp}&nonce={nonce}&sign={encoded_sign}"
@@ -47,8 +50,11 @@ class DatasourceFileManager:
         verify signature
         """
         data_to_sign = f"file-preview|{datasource_file_id}|{timestamp}|{nonce}"
-        secret_key = dify_config.SECRET_KEY.encode() if dify_config.SECRET_KEY else b""
-        recalculated_sign = hmac.new(secret_key, data_to_sign.encode(), hashlib.sha256).digest()
+        recalculated_sign = hmac.new(
+            dify_config.SECRET_KEY.encode(),
+            data_to_sign.encode(),
+            hashlib.sha256,
+        ).digest()
         recalculated_encoded_sign = base64.urlsafe_b64encode(recalculated_sign).decode()
 
         # verify signature
diff --git a/api/core/entities/execution_extra_content.py b/api/core/entities/execution_extra_content.py
index 04ae193396..f11c670069 100644
--- a/api/core/entities/execution_extra_content.py
+++ b/api/core/entities/execution_extra_content.py
@@ -5,7 +5,7 @@ from typing import Any, TypeAlias
 
 from pydantic import BaseModel, ConfigDict, Field
 
-from graphon.nodes.human_input.entities import FormInput, UserAction
+from graphon.nodes.human_input.entities import FormInputConfig, UserActionConfig
 from models.execution_extra_content import ExecutionContentType
 
 
@@ -16,8 +16,8 @@ class HumanInputFormDefinition(BaseModel):
     node_id: str
     node_title: str
     form_content: str
-    inputs: Sequence[FormInput] = Field(default_factory=list)
-    actions: Sequence[UserAction] = Field(default_factory=list)
+    inputs: Sequence[FormInputConfig] = Field(default_factory=list)
+    actions: Sequence[UserActionConfig] = Field(default_factory=list)
     display_in_ui: bool = False
     form_token: str | None = None
     resolved_default_values: Mapping[str, Any] = Field(default_factory=dict)
diff --git a/api/core/entities/provider_configuration.py b/api/core/entities/provider_configuration.py
index 38b87e2cd1..453dd41957 100644
--- a/api/core/entities/provider_configuration.py
+++ b/api/core/entities/provider_configuration.py
@@ -23,7 +23,7 @@ from core.entities.provider_entities import (
 )
 from core.helper import encrypter
 from core.helper.model_provider_cache import ProviderCredentialsCache, ProviderCredentialsCacheType
-from core.plugin.impl.model_runtime_factory import create_plugin_model_provider_factory
+from core.plugin.impl.model_runtime_factory import create_model_type_instance, create_plugin_model_assembly
 from graphon.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType
 from graphon.model_runtime.entities.provider_entities import (
     ConfigurateMethod,
@@ -33,7 +33,7 @@ from graphon.model_runtime.entities.provider_entities import (
 )
 from graphon.model_runtime.model_providers.base.ai_model import AIModel
 from graphon.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
-from graphon.model_runtime.runtime import ModelRuntime
+from graphon.model_runtime.protocols.runtime import ModelRuntime
 from libs.datetime_utils import naive_utc_now
 from models.engine import db
 from models.enums import CredentialSourceType
@@ -106,11 +106,18 @@ class ProviderConfiguration(BaseModel):
         """Attach the already-composed runtime for request-bound call chains."""
         self._bound_model_runtime = model_runtime
 
+    def _get_runtime_and_provider_factory(self) -> tuple[ModelRuntime, ModelProviderFactory]:
+        """Resolve a provider factory that stays aligned with the runtime used by the caller."""
+        if self._bound_model_runtime is not None:
+            return self._bound_model_runtime, ModelProviderFactory(runtime=self._bound_model_runtime)
+
+        model_assembly = create_plugin_model_assembly(tenant_id=self.tenant_id)
+        return model_assembly.model_runtime, model_assembly.model_provider_factory
+
     def get_model_provider_factory(self) -> ModelProviderFactory:
         """Return a provider factory that preserves any request-bound runtime."""
-        if self._bound_model_runtime is not None:
-            return ModelProviderFactory(model_runtime=self._bound_model_runtime)
-        return create_plugin_model_provider_factory(tenant_id=self.tenant_id)
+        _, model_provider_factory = self._get_runtime_and_provider_factory()
+        return model_provider_factory
 
     def get_current_credentials(self, model_type: ModelType, model: str) -> dict[str, Any] | None:
         """
@@ -164,9 +171,9 @@ class ProviderConfiguration(BaseModel):
                 current_credential_id = self.custom_configuration.provider.current_credential_id
 
             if current_credential_id:
-                from core.helper.credential_utils import check_credential_policy_compliance
+                from core.helper.credential_utils import runtime_check_credential_policy_compliance
 
-                check_credential_policy_compliance(
+                runtime_check_credential_policy_compliance(
                     credential_id=current_credential_id,
                     provider=self.provider.provider,
                     credential_type=PluginCredentialType.MODEL,
@@ -175,9 +182,9 @@ class ProviderConfiguration(BaseModel):
                 # no current credential id, check all available credentials
                 if self.custom_configuration.provider:
                     for credential_configuration in self.custom_configuration.provider.available_credentials:
-                        from core.helper.credential_utils import check_credential_policy_compliance
+                        from core.helper.credential_utils import runtime_check_credential_policy_compliance
 
-                        check_credential_policy_compliance(
+                        runtime_check_credential_policy_compliance(
                             credential_id=credential_configuration.credential_id,
                             provider=self.provider.provider,
                             credential_type=PluginCredentialType.MODEL,
@@ -1392,10 +1399,13 @@ class ProviderConfiguration(BaseModel):
         :param model_type: model type
         :return:
         """
-        model_provider_factory = self.get_model_provider_factory()
-
-        # Get model instance of LLM
-        return model_provider_factory.get_model_type_instance(provider=self.provider.provider, model_type=model_type)
+        model_runtime, model_provider_factory = self._get_runtime_and_provider_factory()
+        provider_schema = model_provider_factory.get_provider_schema(provider=self.provider.provider)
+        return create_model_type_instance(
+            runtime=model_runtime,
+            provider_schema=provider_schema,
+            model_type=model_type,
+        )
 
     def get_model_schema(
         self, model_type: ModelType, model: str, credentials: dict[str, Any] | None
diff --git a/api/core/errors/error.py b/api/core/errors/error.py
index 8c1ba98ae1..826a5ebae5 100644
--- a/api/core/errors/error.py
+++ b/api/core/errors/error.py
@@ -1,9 +1,9 @@
 class LLMError(ValueError):
     """Base class for all LLM exceptions."""
 
-    description: str | None = None
+    description: str = ""
 
-    def __init__(self, description: str | None = None):
+    def __init__(self, description: str = ""):
         self.description = description
 
 
diff --git a/api/core/helper/credential_utils.py b/api/core/helper/credential_utils.py
index 882639a16a..b5f68039d7 100644
--- a/api/core/helper/credential_utils.py
+++ b/api/core/helper/credential_utils.py
@@ -2,6 +2,7 @@
 Credential utility functions for checking credential existence and policy compliance.
 """
 
+from configs import dify_config
 from core.entities import PluginCredentialType
 
 
@@ -39,6 +40,16 @@ def is_credential_exists(credential_id: str, credential_type: "PluginCredentialT
         return False
 
 
+def runtime_check_credential_policy_compliance(
+    credential_id: str, provider: str, credential_type: "PluginCredentialType", check_existence: bool = True
+):
+    if dify_config.ENTERPRISE_DISABLE_RUNTIME_CREDENTIAL_CHECK:
+        return
+    check_credential_policy_compliance(
+        credential_id=credential_id, provider=provider, credential_type=credential_type, check_existence=check_existence
+    )
+
+
 def check_credential_policy_compliance(
     credential_id: str, provider: str, credential_type: "PluginCredentialType", check_existence: bool = True
 ) -> None:
diff --git a/api/core/helper/moderation.py b/api/core/helper/moderation.py
index f169f247cf..18b9b72e9d 100644
--- a/api/core/helper/moderation.py
+++ b/api/core/helper/moderation.py
@@ -4,7 +4,7 @@ from typing import cast
 
 from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEntity
 from core.entities import DEFAULT_PLUGIN_ID
-from core.plugin.impl.model_runtime_factory import create_plugin_model_provider_factory
+from core.plugin.impl.model_runtime_factory import create_plugin_model_assembly
 from extensions.ext_hosting_provider import hosting_configuration
 from graphon.model_runtime.entities.model_entities import ModelType
 from graphon.model_runtime.errors.invoke import InvokeBadRequestError
@@ -41,10 +41,8 @@ def check_moderation(tenant_id: str, model_config: ModelConfigWithCredentialsEnt
             text_chunk = secrets.choice(text_chunks)
 
             try:
-                model_provider_factory = create_plugin_model_provider_factory(tenant_id=tenant_id)
-
-                # Get model instance of LLM
-                model_type_instance = model_provider_factory.get_model_type_instance(
+                model_assembly = create_plugin_model_assembly(tenant_id=tenant_id)
+                model_type_instance = model_assembly.create_model_type_instance(
                     provider=openai_provider_name, model_type=ModelType.MODERATION
                 )
                 model_type_instance = cast(ModerationModel, model_type_instance)
diff --git a/api/core/helper/trace_id_helper.py b/api/core/helper/trace_id_helper.py
index e827859109..e4890c8d4d 100644
--- a/api/core/helper/trace_id_helper.py
+++ b/api/core/helper/trace_id_helper.py
@@ -3,6 +3,17 @@ import re
 from collections.abc import Mapping
 from typing import Any
 
+from pydantic import BaseModel, ConfigDict, StrictStr, ValidationError
+
+
+class ParentTraceContext(BaseModel):
+    """Typed parent trace context propagated from an outer workflow tool node."""
+
+    parent_workflow_run_id: StrictStr
+    parent_node_execution_id: StrictStr | None = None
+
+    model_config = ConfigDict(extra="forbid")
+
 
 def is_valid_trace_id(trace_id: str) -> bool:
     """
@@ -61,6 +72,30 @@ def extract_external_trace_id_from_args(args: Mapping[str, Any]):
     return {}
 
 
+def extract_parent_trace_context_from_args(args: Mapping[str, Any]) -> dict[str, ParentTraceContext]:
+    """
+    Extract 'parent_trace_context' from args.
+
+    Returns a dict suitable for use in extras when both parent identifiers exist.
+    Returns an empty dict if the context is missing or incomplete.
+    """
+    parent_trace_context = args.get("parent_trace_context")
+    if isinstance(parent_trace_context, ParentTraceContext):
+        context = parent_trace_context
+    elif isinstance(parent_trace_context, Mapping):
+        try:
+            context = ParentTraceContext.model_validate(parent_trace_context)
+        except ValidationError:
+            return {}
+    else:
+        return {}
+
+    if context.parent_node_execution_id is None:
+        return {}
+
+    return {"parent_trace_context": context}
+
+
 def get_trace_id_from_otel_context() -> str | None:
     """
     Retrieve the current trace ID from the active OpenTelemetry trace context.
diff --git a/api/core/indexing_runner.py b/api/core/indexing_runner.py
index b6e33396d1..537b14388e 100644
--- a/api/core/indexing_runner.py
+++ b/api/core/indexing_runner.py
@@ -324,9 +324,10 @@ class IndexingRunner:
         # one extract_setting is one source document
         for extract_setting in extract_settings:
             # extract
-            processing_rule = DatasetProcessRule(
-                mode=tmp_processing_rule["mode"], rules=json.dumps(tmp_processing_rule["rules"])
-            )
+            processing_rule = {
+                "mode": tmp_processing_rule["mode"],
+                "rules": tmp_processing_rule.get("rules"),
+            }
             # Extract document content
             text_docs = index_processor.extract(extract_setting, process_rule_mode=tmp_processing_rule["mode"])
             # Cleaning and segmentation
@@ -334,7 +335,7 @@ class IndexingRunner:
                 text_docs,
                 current_user=None,
                 embedding_model_instance=embedding_model_instance,
-                process_rule=processing_rule.to_dict(),
+                process_rule=processing_rule,
                 tenant_id=tenant_id,
                 doc_language=doc_language,
                 preview=True,
diff --git a/api/core/llm_generator/llm_generator.py b/api/core/llm_generator/llm_generator.py
index af2611bb0b..30b9523146 100644
--- a/api/core/llm_generator/llm_generator.py
+++ b/api/core/llm_generator/llm_generator.py
@@ -435,7 +435,7 @@ class LLMGenerator:
             stream=False,
         )
 
-        # Runtime type check since pyright has issues with the overload
+        # Runtime type check for overload narrowing.
         if not isinstance(result, LLMResult):
             raise TypeError("Expected LLMResult when stream=False")
         response = result
diff --git a/api/core/llm_generator/output_parser/structured_output.py b/api/core/llm_generator/output_parser/structured_output.py
index d2e375626f..6cba4fbdf6 100644
--- a/api/core/llm_generator/output_parser/structured_output.py
+++ b/api/core/llm_generator/output_parser/structured_output.py
@@ -288,11 +288,13 @@ def _parse_structured_output(result_text: str) -> Mapping[str, Any]:
     except ValidationError:
         # if the result_text is not a valid json, try to repair it
         temp_parsed = json_repair.loads(result_text)
-        if not isinstance(temp_parsed, dict):
-            # handle reasoning model like deepseek-r1 got '<think>\n\n</think>\n' prefix
-            if isinstance(temp_parsed, list):
+        match temp_parsed:
+            case dict():
+                pass
+            case list():
+                # handle reasoning model like deepseek-r1 got '<think>\n\n</think>\n' prefix
                 temp_parsed = next((item for item in temp_parsed if isinstance(item, dict)), {})
-            else:
+            case _:
                 raise OutputParserError(f"Failed to parse structured output: {result_text}")
         structured_output = cast(dict, temp_parsed)
     return structured_output
@@ -341,12 +343,13 @@ def remove_additional_properties(schema: dict[str, Any]) -> None:
 
     # Process nested structures recursively
     for value in schema.values():
-        if isinstance(value, dict):
-            remove_additional_properties(value)
-        elif isinstance(value, list):
-            for item in value:
-                if isinstance(item, dict):
-                    remove_additional_properties(item)
+        match value:
+            case dict():
+                remove_additional_properties(value)
+            case list():
+                for item in value:
+                    if isinstance(item, dict):
+                        remove_additional_properties(item)
 
 
 def convert_boolean_to_string(schema: dict[str, Any]) -> None:
@@ -364,9 +367,10 @@ def convert_boolean_to_string(schema: dict[str, Any]) -> None:
 
     # Process nested dictionaries and lists recursively
     for value in schema.values():
-        if isinstance(value, dict):
-            convert_boolean_to_string(value)
-        elif isinstance(value, list):
-            for item in value:
-                if isinstance(item, dict):
-                    convert_boolean_to_string(item)
+        match value:
+            case dict():
+                convert_boolean_to_string(value)
+            case list():
+                for item in value:
+                    if isinstance(item, dict):
+                        convert_boolean_to_string(item)
diff --git a/api/core/mcp/types.py b/api/core/mcp/types.py
index 10e3082aa3..9470d39f41 100644
--- a/api/core/mcp/types.py
+++ b/api/core/mcp/types.py
@@ -2,7 +2,7 @@ from collections.abc import Callable
 from dataclasses import dataclass
 from typing import Annotated, Any, Literal
 
-from pydantic import BaseModel, ConfigDict, Field, FileUrl, RootModel
+from pydantic import BaseModel, ConfigDict, Field, FileUrl, RootModel, model_validator
 from pydantic.networks import AnyUrl, UrlConstraints
 
 """
@@ -173,7 +173,21 @@ class JSONRPCError(BaseModel):
 
 
 class JSONRPCMessage(RootModel[JSONRPCRequest | JSONRPCNotification | JSONRPCResponse | JSONRPCError]):
-    pass
+    @model_validator(mode="before")
+    @classmethod
+    def _select_message_type(
+        cls, value: Any
+    ) -> JSONRPCRequest | JSONRPCNotification | JSONRPCResponse | JSONRPCError | Any:
+        if isinstance(value, dict):
+            if "result" in value:
+                return JSONRPCResponse.model_validate(value)
+            if "error" in value:
+                return JSONRPCError.model_validate(value)
+            if "method" in value:
+                if "id" in value:
+                    return JSONRPCRequest.model_validate(value)
+                return JSONRPCNotification.model_validate(value)
+        return value
 
 
 class EmptyResult(Result):
diff --git a/api/core/memory/token_buffer_memory.py b/api/core/memory/token_buffer_memory.py
index d840ee213c..c41c175cca 100644
--- a/api/core/memory/token_buffer_memory.py
+++ b/api/core/memory/token_buffer_memory.py
@@ -86,12 +86,10 @@ class TokenBufferMemory:
 
         detail = ImagePromptMessageContent.DETAIL.HIGH
         if file_extra_config and app_record:
-            # Build files directly without filtering by belongs_to
             file_objs = [
                 file_factory.build_from_message_file(
                     message_file=message_file,
                     tenant_id=app_record.tenant_id,
-                    config=file_extra_config,
                     access_controller=_file_access_controller,
                 )
                 for message_file in message_files
diff --git a/api/core/model_manager.py b/api/core/model_manager.py
index 457c888e33..56a8f3bd98 100644
--- a/api/core/model_manager.py
+++ b/api/core/model_manager.py
@@ -391,10 +391,10 @@ class ModelInstance:
 
             # Additional policy compliance check as fallback (in case fetch_next didn't catch it)
             try:
-                from core.helper.credential_utils import check_credential_policy_compliance
+                from core.helper.credential_utils import runtime_check_credential_policy_compliance
 
                 if lb_config.credential_id:
-                    check_credential_policy_compliance(
+                    runtime_check_credential_policy_compliance(
                         credential_id=lb_config.credential_id,
                         provider=self.provider,
                         credential_type=PluginCredentialType.MODEL,
@@ -630,10 +630,10 @@ class LBModelManager:
 
             # Check policy compliance for the selected configuration
             try:
-                from core.helper.credential_utils import check_credential_policy_compliance
+                from core.helper.credential_utils import runtime_check_credential_policy_compliance
 
                 if config.credential_id:
-                    check_credential_policy_compliance(
+                    runtime_check_credential_policy_compliance(
                         credential_id=config.credential_id,
                         provider=self._provider,
                         credential_type=PluginCredentialType.MODEL,
diff --git a/api/core/ops/entities/trace_entity.py b/api/core/ops/entities/trace_entity.py
index 45b2f635ba..98e87a0ceb 100644
--- a/api/core/ops/entities/trace_entity.py
+++ b/api/core/ops/entities/trace_entity.py
@@ -5,6 +5,8 @@ from typing import Any, Union
 
 from pydantic import BaseModel, ConfigDict, field_serializer, field_validator
 
+from core.helper.trace_id_helper import ParentTraceContext
+
 
 class BaseTraceInfo(BaseModel):
     message_id: str | None = None
@@ -51,8 +53,8 @@ class BaseTraceInfo(BaseModel):
     def resolved_parent_context(self) -> tuple[str | None, str | None]:
         """Resolve cross-workflow parent linking from metadata.
 
-        Extracts typed parent IDs from the untyped ``parent_trace_context``
-        metadata dict (set by tool_node when invoking nested workflows).
+        Extracts typed parent IDs from the ``parent_trace_context`` metadata
+        payload (set by tool_node when invoking nested workflows).
 
         Returns:
             (trace_correlation_override, parent_span_id_source) where
@@ -60,13 +62,18 @@ class BaseTraceInfo(BaseModel):
             parent_span_id_source is the outer node_execution_id.
         """
         parent_ctx = self.metadata.get("parent_trace_context")
-        if not isinstance(parent_ctx, dict):
+        if isinstance(parent_ctx, ParentTraceContext):
+            context = parent_ctx
+        elif isinstance(parent_ctx, Mapping):
+            try:
+                context = ParentTraceContext.model_validate(parent_ctx)
+            except ValueError:
+                return None, None
+        else:
             return None, None
-        trace_override = parent_ctx.get("parent_workflow_run_id")
-        parent_span = parent_ctx.get("parent_node_execution_id")
         return (
-            trace_override if isinstance(trace_override, str) else None,
-            parent_span if isinstance(parent_span, str) else None,
+            context.parent_workflow_run_id,
+            context.parent_node_execution_id,
         )
 
     @field_serializer("start_time", "end_time")
diff --git a/api/core/ops/exceptions.py b/api/core/ops/exceptions.py
new file mode 100644
index 0000000000..4551704687
--- /dev/null
+++ b/api/core/ops/exceptions.py
@@ -0,0 +1,22 @@
+"""Core exceptions shared by ops trace dispatchers and trace providers.
+
+Provider packages may raise these types to request generic task behavior, but
+generic Celery tasks should not import provider-specific exception classes.
+"""
+
+
+class RetryableTraceDispatchError(RuntimeError):
+    """Base class for transient trace dispatch failures that Celery may retry."""
+
+
+class PendingTraceParentContextError(RetryableTraceDispatchError):
+    """Raised when a nested trace arrives before its parent span context is available."""
+
+    parent_node_execution_id: str
+
+    def __init__(self, parent_node_execution_id: str) -> None:
+        self.parent_node_execution_id = parent_node_execution_id
+        super().__init__(
+            "Pending trace parent context for parent_node_execution_id="
+            f"{parent_node_execution_id}. Retry after the parent span context is published."
+        )
diff --git a/api/core/ops/ops_trace_manager.py b/api/core/ops/ops_trace_manager.py
index e7ba6e502b..61fd0e5c1f 100644
--- a/api/core/ops/ops_trace_manager.py
+++ b/api/core/ops/ops_trace_manager.py
@@ -16,6 +16,7 @@ from sqlalchemy import select
 from sqlalchemy.orm import Session, sessionmaker
 
 from core.helper.encrypter import batch_decrypt_token, encrypt_token, obfuscated_token
+from core.helper.trace_id_helper import ParentTraceContext
 from core.ops.entities.config_entity import (
     OPS_FILE_PATH,
     BaseTracingConfig,
@@ -52,6 +53,17 @@ if TYPE_CHECKING:
 logger = logging.getLogger(__name__)
 
 
+def _dump_parent_trace_context(parent_trace_context: Any) -> dict[str, str] | None:
+    if isinstance(parent_trace_context, ParentTraceContext):
+        return parent_trace_context.model_dump(exclude_none=True)
+    if isinstance(parent_trace_context, dict):
+        try:
+            return ParentTraceContext.model_validate(parent_trace_context).model_dump(exclude_none=True)
+        except ValueError:
+            return None
+    return None
+
+
 class _AppTracingConfig(TypedDict, total=False):
     enabled: bool
     tracing_provider: str | None
@@ -569,13 +581,13 @@ class OpsTraceManager:
         db.session.commit()
 
     @classmethod
-    def get_app_tracing_config(cls, app_id: str):
+    def get_app_tracing_config(cls, app_id: str, session: Session):
         """
         Get app tracing config
         :param app_id: app id
         :return:
         """
-        app: App | None = db.session.get(App, app_id)
+        app: App | None = session.get(App, app_id)
         if not app:
             raise ValueError("App not found")
         if not app.tracing:
@@ -857,8 +869,9 @@ class TraceTask:
         }
 
         parent_trace_context = self.kwargs.get("parent_trace_context")
-        if parent_trace_context:
-            metadata["parent_trace_context"] = parent_trace_context
+        dumped_parent_trace_context = _dump_parent_trace_context(parent_trace_context)
+        if dumped_parent_trace_context:
+            metadata["parent_trace_context"] = dumped_parent_trace_context
 
         workflow_trace_info = WorkflowTraceInfo(
             trace_id=self.trace_id,
@@ -1371,13 +1384,14 @@ class TraceTask:
         }
 
         parent_trace_context = node_data.get("parent_trace_context")
-        if parent_trace_context:
-            metadata["parent_trace_context"] = parent_trace_context
+        dumped_parent_trace_context = _dump_parent_trace_context(parent_trace_context)
+        if dumped_parent_trace_context:
+            metadata["parent_trace_context"] = dumped_parent_trace_context
 
         message_id: str | None = None
         conversation_id = node_data.get("conversation_id")
         workflow_execution_id = node_data.get("workflow_execution_id")
-        if conversation_id and workflow_execution_id and not parent_trace_context:
+        if conversation_id and workflow_execution_id and not dumped_parent_trace_context:
             with Session(db.engine) as session:
                 msg_id = session.scalar(
                     select(Message.id).where(
diff --git a/api/core/plugin/impl/model_runtime.py b/api/core/plugin/impl/model_runtime.py
index 4e66d58b5e..62573ba2f5 100644
--- a/api/core/plugin/impl/model_runtime.py
+++ b/api/core/plugin/impl/model_runtime.py
@@ -4,23 +4,32 @@ import hashlib
 import logging
 from collections.abc import Generator, Iterable, Sequence
 from threading import Lock
-from typing import IO, Any, Union
+from typing import IO, Any, Literal, cast, overload
 
 from pydantic import ValidationError
 from redis import RedisError
 
 from configs import dify_config
+from core.llm_generator.output_parser.structured_output import (
+    invoke_llm_with_structured_output as invoke_llm_with_structured_output_helper,
+)
 from core.plugin.entities.plugin_daemon import PluginModelProviderEntity
 from core.plugin.impl.asset import PluginAssetManager
 from core.plugin.impl.model import PluginModelClient
 from extensions.ext_redis import redis_client
-from graphon.model_runtime.entities.llm_entities import LLMResult, LLMResultChunk
+from graphon.model_runtime.entities.llm_entities import (
+    LLMResult,
+    LLMResultChunk,
+    LLMResultChunkWithStructuredOutput,
+    LLMResultWithStructuredOutput,
+)
 from graphon.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool
 from graphon.model_runtime.entities.model_entities import AIModelEntity, ModelType
 from graphon.model_runtime.entities.provider_entities import ProviderEntity
 from graphon.model_runtime.entities.rerank_entities import MultimodalRerankInput, RerankResult
 from graphon.model_runtime.entities.text_embedding_entities import EmbeddingInputType, EmbeddingResult
-from graphon.model_runtime.runtime import ModelRuntime
+from graphon.model_runtime.model_providers.base.large_language_model import normalize_non_stream_runtime_result
+from graphon.model_runtime.protocols.runtime import ModelRuntime
 from models.provider_ids import ModelProviderID
 
 logger = logging.getLogger(__name__)
@@ -29,6 +38,68 @@ logger = logging.getLogger(__name__)
 TENANT_SCOPE_SCHEMA_CACHE_USER_ID = "__DIFY_TS__"
 
 
+# TODO(-LAN-): Move native structured-output invocation into Graphon's LLM node.
+# TODO(-LAN-): Remove this Dify-side adapter once Graphon owns structured output end-to-end.
+class _PluginStructuredOutputModelInstance:
+    """Bind plugin model identity to the shared structured-output helper.
+
+    The structured-output parser is shared with legacy ``ModelInstance`` flows
+    and only needs an object exposing ``invoke_llm(...)``. ``PluginModelRuntime``
+    intentionally exposes a lower-level API where provider, model, and
+    credentials are passed per call. This adapter supplies the small bound
+    ``invoke_llm`` surface the helper needs without constructing a full
+    ``ModelInstance`` or reintroducing model-manager dependencies into the
+    plugin runtime path.
+    """
+
+    def __init__(
+        self,
+        *,
+        runtime: PluginModelRuntime,
+        provider: str,
+        model: str,
+        credentials: dict[str, Any],
+    ) -> None:
+        self._runtime = runtime
+        self._provider = provider
+        self._model = model
+        self._credentials = credentials
+
+    def invoke_llm(
+        self,
+        *,
+        prompt_messages: Sequence[PromptMessage],
+        model_parameters: dict[str, Any] | None = None,
+        tools: Sequence[PromptMessageTool] | None = None,
+        stop: Sequence[str] | None = None,
+        stream: bool = True,
+        callbacks: object | None = None,
+    ) -> LLMResult | Generator[LLMResultChunk, None, None]:
+        del callbacks
+        if stream:
+            return self._runtime.invoke_llm(
+                provider=self._provider,
+                model=self._model,
+                credentials=self._credentials,
+                model_parameters=model_parameters or {},
+                prompt_messages=prompt_messages,
+                tools=list(tools) if tools else None,
+                stop=stop,
+                stream=True,
+            )
+
+        return self._runtime.invoke_llm(
+            provider=self._provider,
+            model=self._model,
+            credentials=self._credentials,
+            model_parameters=model_parameters or {},
+            prompt_messages=prompt_messages,
+            tools=list(tools) if tools else None,
+            stop=stop,
+            stream=False,
+        )
+
+
 class PluginModelRuntime(ModelRuntime):
     """Plugin-backed runtime adapter bound to tenant context and optional caller scope."""
 
@@ -195,6 +266,34 @@ class PluginModelRuntime(ModelRuntime):
 
         return schema
 
+    @overload
+    def invoke_llm(
+        self,
+        *,
+        provider: str,
+        model: str,
+        credentials: dict[str, Any],
+        model_parameters: dict[str, Any],
+        prompt_messages: Sequence[PromptMessage],
+        tools: list[PromptMessageTool] | None,
+        stop: Sequence[str] | None,
+        stream: Literal[False],
+    ) -> LLMResult: ...
+
+    @overload
+    def invoke_llm(
+        self,
+        *,
+        provider: str,
+        model: str,
+        credentials: dict[str, Any],
+        model_parameters: dict[str, Any],
+        prompt_messages: Sequence[PromptMessage],
+        tools: list[PromptMessageTool] | None,
+        stop: Sequence[str] | None,
+        stream: Literal[True],
+    ) -> Generator[LLMResultChunk, None, None]: ...
+
     def invoke_llm(
         self,
         *,
@@ -206,9 +305,9 @@ class PluginModelRuntime(ModelRuntime):
         tools: list[PromptMessageTool] | None,
         stop: Sequence[str] | None,
         stream: bool,
-    ) -> Union[LLMResult, Generator[LLMResultChunk, None, None]]:
+    ) -> LLMResult | Generator[LLMResultChunk, None, None]:
         plugin_id, provider_name = self._split_provider(provider)
-        return self.client.invoke_llm(
+        result = self.client.invoke_llm(
             tenant_id=self.tenant_id,
             user_id=self.user_id,
             plugin_id=plugin_id,
@@ -221,6 +320,81 @@ class PluginModelRuntime(ModelRuntime):
             stop=list(stop) if stop else None,
             stream=stream,
         )
+        if stream:
+            return result
+
+        return normalize_non_stream_runtime_result(
+            model=model,
+            prompt_messages=prompt_messages,
+            result=result,
+        )
+
+    @overload
+    def invoke_llm_with_structured_output(
+        self,
+        *,
+        provider: str,
+        model: str,
+        credentials: dict[str, Any],
+        json_schema: dict[str, Any],
+        model_parameters: dict[str, Any],
+        prompt_messages: Sequence[PromptMessage],
+        stop: Sequence[str] | None,
+        stream: Literal[False],
+    ) -> LLMResultWithStructuredOutput: ...
+
+    @overload
+    def invoke_llm_with_structured_output(
+        self,
+        *,
+        provider: str,
+        model: str,
+        credentials: dict[str, Any],
+        json_schema: dict[str, Any],
+        model_parameters: dict[str, Any],
+        prompt_messages: Sequence[PromptMessage],
+        stop: Sequence[str] | None,
+        stream: Literal[True],
+    ) -> Generator[LLMResultChunkWithStructuredOutput, None, None]: ...
+
+    def invoke_llm_with_structured_output(
+        self,
+        *,
+        provider: str,
+        model: str,
+        credentials: dict[str, Any],
+        json_schema: dict[str, Any],
+        model_parameters: dict[str, Any],
+        prompt_messages: Sequence[PromptMessage],
+        stop: Sequence[str] | None,
+        stream: bool,
+    ) -> LLMResultWithStructuredOutput | Generator[LLMResultChunkWithStructuredOutput, None, None]:
+        model_schema = self.get_model_schema(
+            provider=provider,
+            model_type=ModelType.LLM,
+            model=model,
+            credentials=credentials,
+        )
+        if model_schema is None:
+            raise ValueError(f"Model schema not found for {model}")
+
+        adapter = _PluginStructuredOutputModelInstance(
+            runtime=self,
+            provider=provider,
+            model=model,
+            credentials=credentials,
+        )
+        return invoke_llm_with_structured_output_helper(
+            provider=provider,
+            model_schema=model_schema,
+            model_instance=cast(Any, adapter),
+            prompt_messages=prompt_messages,
+            json_schema=json_schema,
+            model_parameters=model_parameters,
+            tools=None,
+            stop=list(stop) if stop else None,
+            stream=stream,
+        )
 
     def get_llm_num_tokens(
         self,
diff --git a/api/core/plugin/impl/model_runtime_factory.py b/api/core/plugin/impl/model_runtime_factory.py
index 35abd2ae8c..fbe307ea60 100644
--- a/api/core/plugin/impl/model_runtime_factory.py
+++ b/api/core/plugin/impl/model_runtime_factory.py
@@ -3,13 +3,46 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 from core.plugin.impl.model import PluginModelClient
+from graphon.model_runtime.entities.model_entities import ModelType
+from graphon.model_runtime.entities.provider_entities import ProviderEntity
+from graphon.model_runtime.model_providers.base.ai_model import AIModel
+from graphon.model_runtime.model_providers.base.large_language_model import LargeLanguageModel
+from graphon.model_runtime.model_providers.base.moderation_model import ModerationModel
+from graphon.model_runtime.model_providers.base.rerank_model import RerankModel
+from graphon.model_runtime.model_providers.base.speech2text_model import Speech2TextModel
+from graphon.model_runtime.model_providers.base.text_embedding_model import TextEmbeddingModel
+from graphon.model_runtime.model_providers.base.tts_model import TTSModel
 from graphon.model_runtime.model_providers.model_provider_factory import ModelProviderFactory
+from graphon.model_runtime.protocols.runtime import ModelRuntime
 
 if TYPE_CHECKING:
     from core.model_manager import ModelManager
     from core.plugin.impl.model_runtime import PluginModelRuntime
     from core.provider_manager import ProviderManager
 
+_MODEL_CLASS_BY_TYPE: dict[ModelType, type[AIModel]] = {
+    ModelType.LLM: LargeLanguageModel,
+    ModelType.TEXT_EMBEDDING: TextEmbeddingModel,
+    ModelType.RERANK: RerankModel,
+    ModelType.SPEECH2TEXT: Speech2TextModel,
+    ModelType.MODERATION: ModerationModel,
+    ModelType.TTS: TTSModel,
+}
+
+
+def create_model_type_instance(
+    *,
+    runtime: ModelRuntime,
+    provider_schema: ProviderEntity,
+    model_type: ModelType,
+) -> AIModel:
+    """Build the graphon model wrapper explicitly against the request runtime."""
+    model_class = _MODEL_CLASS_BY_TYPE.get(model_type)
+    if model_class is None:
+        raise ValueError(f"Unsupported model type: {model_type}")
+
+    return model_class(provider_schema=provider_schema, model_runtime=runtime)
+
 
 class PluginModelAssembly:
     """Compose request-scoped model views on top of a single plugin runtime."""
@@ -38,9 +71,22 @@ class PluginModelAssembly:
     @property
     def model_provider_factory(self) -> ModelProviderFactory:
         if self._model_provider_factory is None:
-            self._model_provider_factory = ModelProviderFactory(model_runtime=self.model_runtime)
+            self._model_provider_factory = ModelProviderFactory(runtime=self.model_runtime)
         return self._model_provider_factory
 
+    def create_model_type_instance(
+        self,
+        *,
+        provider: str,
+        model_type: ModelType,
+    ) -> AIModel:
+        provider_schema = self.model_provider_factory.get_provider_schema(provider=provider)
+        return create_model_type_instance(
+            runtime=self.model_runtime,
+            provider_schema=provider_schema,
+            model_type=model_type,
+        )
+
     @property
     def provider_manager(self) -> ProviderManager:
         if self._provider_manager is None:
diff --git a/api/core/prompt/advanced_prompt_transform.py b/api/core/prompt/advanced_prompt_transform.py
index 24e05ef865..5a9914e6e4 100644
--- a/api/core/prompt/advanced_prompt_transform.py
+++ b/api/core/prompt/advanced_prompt_transform.py
@@ -161,35 +161,39 @@ class AdvancedPromptTransform(PromptTransform):
         prompt_messages: list[PromptMessage] = []
         for prompt_item in prompt_template:
             raw_prompt = prompt_item.text
-
-            if prompt_item.edition_type == "basic" or not prompt_item.edition_type:
-                if self.with_variable_tmpl:
-                    vp = VariablePool.empty()
-                    for k, v in inputs.items():
-                        if k.startswith("#"):
-                            vp.add(k[1:-1].split("."), v)
-                    raw_prompt = raw_prompt.replace("{{#context#}}", context or "")
-                    prompt = vp.convert_template(raw_prompt).text
-                else:
-                    parser = PromptTemplateParser(template=raw_prompt, with_variable_tmpl=self.with_variable_tmpl)
-                    prompt_inputs: Mapping[str, str] = {k: inputs[k] for k in parser.variable_keys if k in inputs}
-                    prompt_inputs = self._set_context_variable(
-                        context=context, parser=parser, prompt_inputs=prompt_inputs
-                    )
-                    prompt = parser.format(prompt_inputs)
-            elif prompt_item.edition_type == "jinja2":
-                prompt = raw_prompt
-                prompt_inputs = inputs
-                prompt = Jinja2Formatter.format(template=prompt, inputs=prompt_inputs)
-            else:
-                raise ValueError(f"Invalid edition type: {prompt_item.edition_type}")
-
-            if prompt_item.role == PromptMessageRole.USER:
-                prompt_messages.append(UserPromptMessage(content=prompt))
-            elif prompt_item.role == PromptMessageRole.SYSTEM and prompt:
-                prompt_messages.append(SystemPromptMessage(content=prompt))
-            elif prompt_item.role == PromptMessageRole.ASSISTANT:
-                prompt_messages.append(AssistantPromptMessage(content=prompt))
+            edition_type = prompt_item.edition_type or "basic"
+            match edition_type:
+                case "basic":
+                    if self.with_variable_tmpl:
+                        vp = VariablePool.empty()
+                        for k, v in inputs.items():
+                            if k.startswith("#"):
+                                vp.add(k[1:-1].split("."), v)
+                        raw_prompt = raw_prompt.replace("{{#context#}}", context or "")
+                        prompt = vp.convert_template(raw_prompt).text
+                    else:
+                        parser = PromptTemplateParser(template=raw_prompt, with_variable_tmpl=self.with_variable_tmpl)
+                        prompt_inputs: Mapping[str, str] = {k: inputs[k] for k in parser.variable_keys if k in inputs}
+                        prompt_inputs = self._set_context_variable(
+                            context=context, parser=parser, prompt_inputs=prompt_inputs
+                        )
+                        prompt = parser.format(prompt_inputs)
+                case "jinja2":
+                    prompt = raw_prompt
+                    prompt_inputs = inputs
+                    prompt = Jinja2Formatter.format(template=prompt, inputs=prompt_inputs)
+                case _:
+                    raise ValueError(f"Invalid edition type: {prompt_item.edition_type}")
+            match prompt_item.role:
+                case PromptMessageRole.USER:
+                    prompt_messages.append(UserPromptMessage(content=prompt))
+                case PromptMessageRole.SYSTEM:
+                    if prompt:
+                        prompt_messages.append(SystemPromptMessage(content=prompt))
+                case PromptMessageRole.ASSISTANT:
+                    prompt_messages.append(AssistantPromptMessage(content=prompt))
+                case PromptMessageRole.TOOL:
+                    pass
 
         if query and memory_config and memory_config.query_prompt_template:
             parser = PromptTemplateParser(
diff --git a/api/core/prompt/simple_prompt_transform.py b/api/core/prompt/simple_prompt_transform.py
index 1665bdeb52..e836554ca0 100644
--- a/api/core/prompt/simple_prompt_transform.py
+++ b/api/core/prompt/simple_prompt_transform.py
@@ -123,12 +123,15 @@ class SimplePromptTransform(PromptTransform):
 
         for v in special_variable_keys:
             # support #context#, #query# and #histories#
-            if v == "#context#":
-                variables["#context#"] = context or ""
-            elif v == "#query#":
-                variables["#query#"] = query or ""
-            elif v == "#histories#":
-                variables["#histories#"] = histories or ""
+            match v:
+                case "#context#":
+                    variables["#context#"] = context or ""
+                case "#query#":
+                    variables["#query#"] = query or ""
+                case "#histories#":
+                    variables["#histories#"] = histories or ""
+                case _:
+                    pass
 
         prompt_template = prompt_template_config["prompt_template"]
         if not isinstance(prompt_template, PromptTemplateParser):
diff --git a/api/core/prompt/utils/prompt_message_util.py b/api/core/prompt/utils/prompt_message_util.py
index ba76eb0c4e..11414832e3 100644
--- a/api/core/prompt/utils/prompt_message_util.py
+++ b/api/core/prompt/utils/prompt_message_util.py
@@ -53,24 +53,27 @@ class PromptMessageUtil:
                 files = []
                 if isinstance(prompt_message.content, list):
                     for content in prompt_message.content:
-                        if isinstance(content, TextPromptMessageContent):
-                            text += content.data
-                        elif isinstance(content, ImagePromptMessageContent):
-                            files.append(
-                                {
-                                    "type": "image",
-                                    "data": content.data[:10] + "...[TRUNCATED]..." + content.data[-10:],
-                                    "detail": content.detail.value,
-                                }
-                            )
-                        elif isinstance(content, AudioPromptMessageContent):
-                            files.append(
-                                {
-                                    "type": "audio",
-                                    "data": content.data[:10] + "...[TRUNCATED]..." + content.data[-10:],
-                                    "format": content.format,
-                                }
-                            )
+                        match content:
+                            case TextPromptMessageContent():
+                                text += content.data
+                            case ImagePromptMessageContent():
+                                files.append(
+                                    {
+                                        "type": "image",
+                                        "data": content.data[:10] + "...[TRUNCATED]..." + content.data[-10:],
+                                        "detail": content.detail.value,
+                                    }
+                                )
+                            case AudioPromptMessageContent():
+                                files.append(
+                                    {
+                                        "type": "audio",
+                                        "data": content.data[:10] + "...[TRUNCATED]..." + content.data[-10:],
+                                        "format": content.format,
+                                    }
+                                )
+                            case _:
+                                continue
                 else:
                     text = cast(str, prompt_message.content)
 
diff --git a/api/core/provider_manager.py b/api/core/provider_manager.py
index 8969825be4..9faa70a0b8 100644
--- a/api/core/provider_manager.py
+++ b/api/core/provider_manager.py
@@ -9,9 +9,9 @@ from typing import TYPE_CHECKING, Any
 from pydantic import TypeAdapter
 from sqlalchemy import select
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm import Session
 
 from configs import dify_config
+from core.db.session_factory import session_factory
 from core.entities.model_entities import DefaultModelEntity, DefaultModelProviderEntity
 from core.entities.provider_configuration import ProviderConfiguration, ProviderConfigurations, ProviderModelBundle
 from core.entities.provider_entities import (
@@ -56,7 +56,7 @@ from models.provider_ids import ModelProviderID
 from services.feature_service import FeatureService
 
 if TYPE_CHECKING:
-    from graphon.model_runtime.runtime import ModelRuntime
+    from graphon.model_runtime.protocols.runtime import ModelRuntime
 
 _credentials_adapter: TypeAdapter[dict[str, Any]] = TypeAdapter(dict[str, Any])
 
@@ -165,7 +165,7 @@ class ProviderManager:
                 )
 
         # Get all provider entities
-        model_provider_factory = ModelProviderFactory(model_runtime=self._model_runtime)
+        model_provider_factory = ModelProviderFactory(runtime=self._model_runtime)
         provider_entities = model_provider_factory.get_providers()
 
         # Get All preferred provider types of the workspace
@@ -362,7 +362,7 @@ class ProviderManager:
         if not default_model:
             return None
 
-        model_provider_factory = ModelProviderFactory(model_runtime=self._model_runtime)
+        model_provider_factory = ModelProviderFactory(runtime=self._model_runtime)
         provider_schema = model_provider_factory.get_provider_schema(provider=default_model.provider_name)
 
         return DefaultModelEntity(
@@ -445,7 +445,7 @@ class ProviderManager:
     @staticmethod
     def _get_all_providers(tenant_id: str) -> dict[str, list[Provider]]:
         provider_name_to_provider_records_dict = defaultdict(list)
-        with Session(db.engine, expire_on_commit=False) as session:
+        with session_factory.create_session() as session:
             stmt = select(Provider).where(Provider.tenant_id == tenant_id, Provider.is_valid == True)
             providers = session.scalars(stmt)
             for provider in providers:
@@ -462,7 +462,7 @@ class ProviderManager:
         :return:
         """
         provider_name_to_provider_model_records_dict = defaultdict(list)
-        with Session(db.engine, expire_on_commit=False) as session:
+        with session_factory.create_session() as session:
             stmt = select(ProviderModel).where(ProviderModel.tenant_id == tenant_id, ProviderModel.is_valid == True)
             provider_models = session.scalars(stmt)
             for provider_model in provider_models:
@@ -478,7 +478,7 @@ class ProviderManager:
         :return:
         """
         provider_name_to_preferred_provider_type_records_dict = {}
-        with Session(db.engine, expire_on_commit=False) as session:
+        with session_factory.create_session() as session:
             stmt = select(TenantPreferredModelProvider).where(TenantPreferredModelProvider.tenant_id == tenant_id)
             preferred_provider_types = session.scalars(stmt)
             provider_name_to_preferred_provider_type_records_dict = {
@@ -496,7 +496,7 @@ class ProviderManager:
         :return:
         """
         provider_name_to_provider_model_settings_dict = defaultdict(list)
-        with Session(db.engine, expire_on_commit=False) as session:
+        with session_factory.create_session() as session:
             stmt = select(ProviderModelSetting).where(ProviderModelSetting.tenant_id == tenant_id)
             provider_model_settings = session.scalars(stmt)
             for provider_model_setting in provider_model_settings:
@@ -514,7 +514,7 @@ class ProviderManager:
         :return:
         """
         provider_name_to_provider_model_credentials_dict = defaultdict(list)
-        with Session(db.engine, expire_on_commit=False) as session:
+        with session_factory.create_session() as session:
             stmt = select(ProviderModelCredential).where(ProviderModelCredential.tenant_id == tenant_id)
             provider_model_credentials = session.scalars(stmt)
             for provider_model_credential in provider_model_credentials:
@@ -544,7 +544,7 @@ class ProviderManager:
             return {}
 
         provider_name_to_provider_load_balancing_model_configs_dict = defaultdict(list)
-        with Session(db.engine, expire_on_commit=False) as session:
+        with session_factory.create_session() as session:
             stmt = select(LoadBalancingModelConfig).where(LoadBalancingModelConfig.tenant_id == tenant_id)
             provider_load_balancing_configs = session.scalars(stmt)
             for provider_load_balancing_config in provider_load_balancing_configs:
@@ -578,7 +578,7 @@ class ProviderManager:
         :param provider_name: provider name
         :return:
         """
-        with Session(db.engine, expire_on_commit=False) as session:
+        with session_factory.create_session() as session:
             stmt = (
                 select(ProviderCredential)
                 .where(
@@ -608,7 +608,7 @@ class ProviderManager:
         :param model_type: model type
         :return:
         """
-        with Session(db.engine, expire_on_commit=False) as session:
+        with session_factory.create_session() as session:
             stmt = (
                 select(ProviderModelCredential)
                 .where(
diff --git a/api/core/rag/datasource/keyword/jieba/jieba.py b/api/core/rag/datasource/keyword/jieba/jieba.py
index 392af351b6..b3f174bf78 100644
--- a/api/core/rag/datasource/keyword/jieba/jieba.py
+++ b/api/core/rag/datasource/keyword/jieba/jieba.py
@@ -245,6 +245,7 @@ class Jieba(BaseKeyword):
             segment = pre_segment_data["segment"]
             if pre_segment_data["keywords"]:
                 segment.keywords = pre_segment_data["keywords"]
+                assert segment.index_node_id
                 keyword_table = self._add_text_to_keyword_table(
                     keyword_table or {}, segment.index_node_id, pre_segment_data["keywords"]
                 )
@@ -253,6 +254,7 @@ class Jieba(BaseKeyword):
 
                 keywords = keyword_table_handler.extract_keywords(segment.content, keyword_number)
                 segment.keywords = list(keywords)
+                assert segment.index_node_id
                 keyword_table = self._add_text_to_keyword_table(
                     keyword_table or {}, segment.index_node_id, list(keywords)
                 )
diff --git a/api/core/rag/datasource/retrieval_service.py b/api/core/rag/datasource/retrieval_service.py
index b985ebbe1d..904d5c843f 100644
--- a/api/core/rag/datasource/retrieval_service.py
+++ b/api/core/rag/datasource/retrieval_service.py
@@ -1,5 +1,6 @@
 import concurrent.futures
 import logging
+from collections.abc import Sequence
 from concurrent.futures import ThreadPoolExecutor
 from typing import Any, NotRequired, TypedDict
 
@@ -8,6 +9,7 @@ from sqlalchemy import select
 from sqlalchemy.orm import Session, load_only
 
 from configs import dify_config
+from core.app.file_access import grant_upload_file_access
 from core.db.session_factory import session_factory
 from core.model_manager import ModelManager
 from core.rag.data_post_processor.data_post_processor import DataPostProcessor, RerankingModelDict, WeightsDict
@@ -21,7 +23,7 @@ from core.rag.index_processor.constant.query_type import QueryType
 from core.rag.models.document import Document
 from core.rag.rerank.rerank_type import RerankMode
 from core.rag.retrieval.retrieval_methods import RetrievalMethod
-from core.tools.signature import sign_upload_file
+from core.tools.signature import sign_upload_file_preview_url
 from extensions.ext_database import db
 from graphon.model_runtime.entities.model_entities import ModelType
 from models.dataset import (
@@ -526,7 +528,7 @@ class RetrievalService:
             index_node_ids = [i for i in index_node_ids if i]
 
             segment_ids: list[str] = []
-            index_node_segments: list[DocumentSegment] = []
+            index_node_segments: Sequence[DocumentSegment] = []
             segments: list[DocumentSegment] = []
             attachment_map: dict[str, list[AttachmentInfoDict]] = {}
             child_chunk_map: dict[str, list[ChildChunk]] = {}
@@ -568,8 +570,9 @@ class RetrievalService:
                         DocumentSegment.status == "completed",
                         DocumentSegment.index_node_id.in_(index_node_ids),
                     )
-                    index_node_segments = session.execute(document_segment_stmt).scalars().all()  # type: ignore
+                    index_node_segments = session.execute(document_segment_stmt).scalars().all()
                     for index_node_segment in index_node_segments:
+                        assert index_node_segment.index_node_id
                         doc_segment_map[index_node_segment.id] = [index_node_segment.index_node_id]
 
                 if segment_ids:
@@ -888,12 +891,13 @@ class RetrievalService:
                 .limit(1)
             )
             if attachment_binding:
+                grant_upload_file_access([str(upload_file.id)])
                 attachment_info: AttachmentInfoDict = {
                     "id": upload_file.id,
                     "name": upload_file.name,
                     "extension": "." + upload_file.extension,
                     "mime_type": upload_file.mime_type,
-                    "source_url": sign_upload_file(upload_file.id, upload_file.extension),
+                    "source_url": sign_upload_file_preview_url(upload_file.id, upload_file.extension),
                     "size": upload_file.size,
                 }
                 return {"attachment_info": attachment_info, "segment_id": attachment_binding.segment_id}
@@ -904,6 +908,7 @@ class RetrievalService:
         cls, attachment_ids: list[str], session: Session
     ) -> list[SegmentAttachmentInfoResult]:
         attachment_infos: list[SegmentAttachmentInfoResult] = []
+        granted_upload_file_ids: list[str] = []
         upload_files = session.scalars(select(UploadFile).where(UploadFile.id.in_(attachment_ids))).all()
         if upload_files:
             upload_file_ids = [upload_file.id for upload_file in upload_files]
@@ -920,10 +925,11 @@ class RetrievalService:
                         "name": upload_file.name,
                         "extension": "." + upload_file.extension,
                         "mime_type": upload_file.mime_type,
-                        "source_url": sign_upload_file(upload_file.id, upload_file.extension),
+                        "source_url": sign_upload_file_preview_url(upload_file.id, upload_file.extension),
                         "size": upload_file.size,
                     }
                     if attachment_binding:
+                        granted_upload_file_ids.append(str(upload_file.id))
                         attachment_infos.append(
                             {
                                 "attachment_id": attachment_binding.attachment_id,
@@ -931,4 +937,5 @@ class RetrievalService:
                                 "segment_id": attachment_binding.segment_id,
                             }
                         )
+        grant_upload_file_access(granted_upload_file_ids)
         return attachment_infos
diff --git a/api/core/rag/docstore/dataset_docstore.py b/api/core/rag/docstore/dataset_docstore.py
index 78305a6ac0..c7d52d74cb 100644
--- a/api/core/rag/docstore/dataset_docstore.py
+++ b/api/core/rag/docstore/dataset_docstore.py
@@ -50,6 +50,7 @@ class DatasetDocumentStore:
 
         output = {}
         for document_segment in document_segments:
+            assert document_segment.index_node_id
             doc_id = document_segment.index_node_id
             output[doc_id] = Document(
                 page_content=document_segment.content,
@@ -103,7 +104,7 @@ class DatasetDocumentStore:
 
             if not segment_document:
                 max_position += 1
-
+                assert self._document_id
                 segment_document = DocumentSegment(
                     tenant_id=self._dataset.tenant_id,
                     dataset_id=self._dataset.id,
diff --git a/api/core/rag/extractor/extract_processor.py b/api/core/rag/extractor/extract_processor.py
index b679edab36..e49e814149 100644
--- a/api/core/rag/extractor/extract_processor.py
+++ b/api/core/rag/extractor/extract_processor.py
@@ -183,34 +183,35 @@ class ExtractProcessor:
             return extractor.extract()
         elif extract_setting.datasource_type == DatasourceType.WEBSITE:
             assert extract_setting.website_info is not None, "website_info is required"
-            if extract_setting.website_info.provider == "firecrawl":
-                extractor = FirecrawlWebExtractor(
-                    url=extract_setting.website_info.url,
-                    job_id=extract_setting.website_info.job_id,
-                    tenant_id=extract_setting.website_info.tenant_id,
-                    mode=extract_setting.website_info.mode,
-                    only_main_content=extract_setting.website_info.only_main_content,
-                )
-                return extractor.extract()
-            elif extract_setting.website_info.provider == "watercrawl":
-                extractor = WaterCrawlWebExtractor(
-                    url=extract_setting.website_info.url,
-                    job_id=extract_setting.website_info.job_id,
-                    tenant_id=extract_setting.website_info.tenant_id,
-                    mode=extract_setting.website_info.mode,
-                    only_main_content=extract_setting.website_info.only_main_content,
-                )
-                return extractor.extract()
-            elif extract_setting.website_info.provider == "jinareader":
-                extractor = JinaReaderWebExtractor(
-                    url=extract_setting.website_info.url,
-                    job_id=extract_setting.website_info.job_id,
-                    tenant_id=extract_setting.website_info.tenant_id,
-                    mode=extract_setting.website_info.mode,
-                    only_main_content=extract_setting.website_info.only_main_content,
-                )
-                return extractor.extract()
-            else:
-                raise ValueError(f"Unsupported website provider: {extract_setting.website_info.provider}")
+            match extract_setting.website_info.provider:
+                case "firecrawl":
+                    extractor = FirecrawlWebExtractor(
+                        url=extract_setting.website_info.url,
+                        job_id=extract_setting.website_info.job_id,
+                        tenant_id=extract_setting.website_info.tenant_id,
+                        mode=extract_setting.website_info.mode,
+                        only_main_content=extract_setting.website_info.only_main_content,
+                    )
+                    return extractor.extract()
+                case "watercrawl":
+                    extractor = WaterCrawlWebExtractor(
+                        url=extract_setting.website_info.url,
+                        job_id=extract_setting.website_info.job_id,
+                        tenant_id=extract_setting.website_info.tenant_id,
+                        mode=extract_setting.website_info.mode,
+                        only_main_content=extract_setting.website_info.only_main_content,
+                    )
+                    return extractor.extract()
+                case "jinareader":
+                    extractor = JinaReaderWebExtractor(
+                        url=extract_setting.website_info.url,
+                        job_id=extract_setting.website_info.job_id,
+                        tenant_id=extract_setting.website_info.tenant_id,
+                        mode=extract_setting.website_info.mode,
+                        only_main_content=extract_setting.website_info.only_main_content,
+                    )
+                    return extractor.extract()
+                case _:
+                    raise ValueError(f"Unsupported website provider: {extract_setting.website_info.provider}")
         else:
             raise ValueError(f"Unsupported datasource type: {extract_setting.datasource_type}")
diff --git a/api/core/rag/extractor/pdf_extractor.py b/api/core/rag/extractor/pdf_extractor.py
index 02f0efc908..25f6fe3e2a 100644
--- a/api/core/rag/extractor/pdf_extractor.py
+++ b/api/core/rag/extractor/pdf_extractor.py
@@ -115,7 +115,7 @@ class PdfExtractor(BaseExtractor):
         """
         image_content = []
         upload_files = []
-        base_url = dify_config.INTERNAL_FILES_URL or dify_config.FILES_URL
+        base_url = dify_config.FILES_URL
 
         try:
             image_objects = page.get_objects(filter=(pdfium_c.FPDF_PAGEOBJ_IMAGE,))
diff --git a/api/core/rag/extractor/unstructured/unstructured_doc_extractor.py b/api/core/rag/extractor/unstructured/unstructured_doc_extractor.py
index f9fbfbc409..da370f70e7 100644
--- a/api/core/rag/extractor/unstructured/unstructured_doc_extractor.py
+++ b/api/core/rag/extractor/unstructured/unstructured_doc_extractor.py
@@ -19,7 +19,7 @@ class UnstructuredWordExtractor(BaseExtractor):
 
     def extract(self) -> list[Document]:
         from unstructured.__version__ import __version__ as __unstructured_version__
-        from unstructured.file_utils.filetype import (  # pyright: ignore[reportPrivateImportUsage]
+        from unstructured.file_utils.filetype import (
             FileType,
             detect_filetype,
         )
@@ -27,7 +27,7 @@ class UnstructuredWordExtractor(BaseExtractor):
         unstructured_version = tuple(int(x) for x in __unstructured_version__.split("."))
         # check the file extension
         try:
-            import magic  # noqa: F401  # pyright: ignore[reportUnusedImport]
+            import magic  # noqa: F401
 
             is_doc = detect_filetype(self._file_path) == FileType.DOC
         except ImportError:
diff --git a/api/core/rag/extractor/word_extractor.py b/api/core/rag/extractor/word_extractor.py
index 0330a43b28..60f8906181 100644
--- a/api/core/rag/extractor/word_extractor.py
+++ b/api/core/rag/extractor/word_extractor.py
@@ -110,7 +110,7 @@ class WordExtractor(BaseExtractor):
     def _extract_images_from_docx(self, doc):
         image_count = 0
         image_map = {}
-        base_url = dify_config.INTERNAL_FILES_URL or dify_config.FILES_URL
+        base_url = dify_config.FILES_URL
 
         for r_id, rel in doc.part.rels.items():
             if "image" in rel.target_ref:
diff --git a/api/core/rag/index_processor/index_processor.py b/api/core/rag/index_processor/index_processor.py
index aded5315bd..757134e734 100644
--- a/api/core/rag/index_processor/index_processor.py
+++ b/api/core/rag/index_processor/index_processor.py
@@ -84,7 +84,7 @@ class IndexProcessor:
                     select(DocumentSegment).where(DocumentSegment.document_id == original_document_id)
                 ).all()
                 if segments:
-                    index_node_ids = [segment.index_node_id for segment in segments]
+                    index_node_ids = [segment.index_node_id for segment in segments if segment.index_node_id]
 
         indexing_start_at = time.perf_counter()
         # delete from vector index
diff --git a/api/core/rag/index_processor/processor/parent_child_index_processor.py b/api/core/rag/index_processor/processor/parent_child_index_processor.py
index ba277d5018..a26a900512 100644
--- a/api/core/rag/index_processor/processor/parent_child_index_processor.py
+++ b/api/core/rag/index_processor/processor/parent_child_index_processor.py
@@ -29,6 +29,7 @@ from libs import helper
 from models import Account
 from models.dataset import ChildChunk, Dataset, DatasetProcessRule, DocumentSegment
 from models.dataset import Document as DatasetDocument
+from models.enums import ProcessRuleMode
 from services.account_service import AccountService
 from services.summary_index_service import SummaryIndexService
 
@@ -325,7 +326,7 @@ class ParentChildIndexProcessor(BaseIndexProcessor):
             # update document parent mode
             dataset_process_rule = DatasetProcessRule(
                 dataset_id=dataset.id,
-                mode="hierarchical",
+                mode=ProcessRuleMode.HIERARCHICAL,
                 rules=json.dumps(
                     {
                         "parent_mode": parent_childs.parent_mode,
diff --git a/api/core/rag/retrieval/dataset_retrieval.py b/api/core/rag/retrieval/dataset_retrieval.py
index 5631b3a921..039a266f44 100644
--- a/api/core/rag/retrieval/dataset_retrieval.py
+++ b/api/core/rag/retrieval/dataset_retrieval.py
@@ -19,6 +19,7 @@ from core.app.app_config.entities import (
     ModelConfig,
 )
 from core.app.entities.app_invoke_entities import InvokeFrom, ModelConfigWithCredentialsEntity
+from core.app.file_access import grant_retriever_segment_access, grant_upload_file_access
 from core.callback_handler.index_tool_callback_handler import DatasetIndexToolCallbackHandler
 from core.db.session_factory import session_factory
 from core.entities.agent_entities import PlanningStrategy
@@ -52,7 +53,7 @@ from core.rag.retrieval.template_prompts import (
     METADATA_FILTER_USER_PROMPT_2,
     METADATA_FILTER_USER_PROMPT_3,
 )
-from core.tools.signature import sign_upload_file
+from core.tools.signature import sign_upload_file_preview_url
 from core.tools.utils.dataset_retriever.dataset_retriever_base_tool import DatasetRetrieverBaseTool
 from core.workflow.file_reference import build_file_reference
 from core.workflow.nodes.knowledge_retrieval import exc
@@ -326,6 +327,7 @@ class DatasetRetrieval:
                         if record.summary:
                             source.summary = record.summary
 
+                        grant_retriever_segment_access([str(segment.id)])
                         retrieval_resource_list.append(source)
 
         if retrieval_resource_list:
@@ -515,6 +517,9 @@ class DatasetRetrieval:
                             )
                         ).all()
                         if attachments_with_bindings:
+                            grant_upload_file_access(
+                                str(upload_file.id) for _, upload_file in attachments_with_bindings
+                            )
                             for _, upload_file in attachments_with_bindings:
                                 attachment_info = File(
                                     file_id=upload_file.id,
@@ -529,7 +534,7 @@ class DatasetRetrieval:
                                     ),
                                     size=upload_file.size,
                                     storage_key=upload_file.key,
-                                    url=sign_upload_file(upload_file.id, upload_file.extension),
+                                    url=sign_upload_file_preview_url(upload_file.id, upload_file.extension),
                                 )
                                 context_files.append(attachment_info)
                 if show_retrieve_source:
diff --git a/api/core/rag/retrieval/router/multi_dataset_function_call_router.py b/api/core/rag/retrieval/router/multi_dataset_function_call_router.py
index dd17545c86..ef56567a5a 100644
--- a/api/core/rag/retrieval/router/multi_dataset_function_call_router.py
+++ b/api/core/rag/retrieval/router/multi_dataset_function_call_router.py
@@ -28,10 +28,10 @@ class FunctionCallMultiDatasetRouter:
                 SystemPromptMessage(content="You are a helpful AI assistant."),
                 UserPromptMessage(content=query),
             ]
-            result: LLMResult = model_instance.invoke_llm(  # pyright: ignore[reportCallIssue, reportArgumentType]
+            result: LLMResult = model_instance.invoke_llm(  # pyrefly: ignore[no-matching-overload]
                 prompt_messages=prompt_messages,
                 tools=dataset_tools,
-                stream=False,  # pyright: ignore[reportArgumentType]
+                stream=False,
                 model_parameters={"temperature": 0.2, "top_p": 0.3, "max_tokens": 1500},
             )
             usage = result.usage or LLMUsage.empty_usage()
diff --git a/api/core/tools/mcp_tool/tool.py b/api/core/tools/mcp_tool/tool.py
index 00fc8a8282..b54adea98e 100644
--- a/api/core/tools/mcp_tool/tool.py
+++ b/api/core/tools/mcp_tool/tool.py
@@ -67,23 +67,27 @@ class MCPTool(Tool):
 
         # handle dify tool output
         for content in result.content:
-            if isinstance(content, TextContent):
-                yield from self._process_text_content(content)
-            elif isinstance(content, ImageContent | AudioContent):
-                yield self.create_blob_message(
-                    blob=base64.b64decode(content.data), meta={"mime_type": content.mimeType}
-                )
-            elif isinstance(content, EmbeddedResource):
-                resource = content.resource
-                if isinstance(resource, TextResourceContents):
-                    yield self.create_text_message(resource.text)
-                elif isinstance(resource, BlobResourceContents):
-                    mime_type = resource.mimeType or "application/octet-stream"
-                    yield self.create_blob_message(blob=base64.b64decode(resource.blob), meta={"mime_type": mime_type})
-                else:
-                    raise ToolInvokeError(f"Unsupported embedded resource type: {type(resource)}")
-            else:
-                logger.warning("Unsupported content type=%s", type(content))
+            match content:
+                case TextContent():
+                    yield from self._process_text_content(content)
+                case ImageContent() | AudioContent():
+                    yield self.create_blob_message(
+                        blob=base64.b64decode(content.data), meta={"mime_type": content.mimeType}
+                    )
+                case EmbeddedResource():
+                    resource = content.resource
+                    match resource:
+                        case TextResourceContents():
+                            yield self.create_text_message(resource.text)
+                        case BlobResourceContents():
+                            mime_type = resource.mimeType or "application/octet-stream"
+                            yield self.create_blob_message(
+                                blob=base64.b64decode(resource.blob), meta={"mime_type": mime_type}
+                            )
+                        case _:
+                            raise ToolInvokeError(f"Unsupported embedded resource type: {type(resource)}")
+                case _:
+                    logger.warning("Unsupported content type=%s", type(content))
 
         # handle MCP structured output
         if self.entity.output_schema and result.structuredContent:
diff --git a/api/core/tools/signature.py b/api/core/tools/signature.py
index 1807226924..ca4756f2a4 100644
--- a/api/core/tools/signature.py
+++ b/api/core/tools/signature.py
@@ -8,6 +8,10 @@ import urllib.parse
 from configs import dify_config
 
 
+def _secret_key() -> bytes:
+    return dify_config.SECRET_KEY.encode()
+
+
 def sign_tool_file(tool_file_id: str, extension: str, for_external: bool = True) -> str:
     """
     sign file to get a temporary url for plugin access
@@ -19,26 +23,26 @@ def sign_tool_file(tool_file_id: str, extension: str, for_external: bool = True)
     timestamp = str(int(time.time()))
     nonce = os.urandom(16).hex()
     data_to_sign = f"file-preview|{tool_file_id}|{timestamp}|{nonce}"
-    secret_key = dify_config.SECRET_KEY.encode() if dify_config.SECRET_KEY else b""
-    sign = hmac.new(secret_key, data_to_sign.encode(), hashlib.sha256).digest()
+    sign = hmac.new(_secret_key(), data_to_sign.encode(), hashlib.sha256).digest()
     encoded_sign = base64.urlsafe_b64encode(sign).decode()
 
     return f"{file_preview_url}?timestamp={timestamp}&nonce={nonce}&sign={encoded_sign}"
 
 
-def sign_upload_file(upload_file_id: str, extension: str) -> str:
+def sign_upload_file_preview_url(upload_file_id: str, extension: str) -> str:
     """
-    sign file to get a temporary url for plugin access
+    Sign an upload file to get a temporary image preview URL.
+
+    The URL generated by this function is only for external preview and download,
+    not for internal communication.
     """
-    # Use internal URL for plugin/tool file access in Docker environments
-    base_url = dify_config.INTERNAL_FILES_URL or dify_config.FILES_URL
+    base_url = dify_config.FILES_URL
     file_preview_url = f"{base_url}/files/{upload_file_id}/image-preview"
 
     timestamp = str(int(time.time()))
     nonce = os.urandom(16).hex()
     data_to_sign = f"image-preview|{upload_file_id}|{timestamp}|{nonce}"
-    secret_key = dify_config.SECRET_KEY.encode() if dify_config.SECRET_KEY else b""
-    sign = hmac.new(secret_key, data_to_sign.encode(), hashlib.sha256).digest()
+    sign = hmac.new(_secret_key(), data_to_sign.encode(), hashlib.sha256).digest()
     encoded_sign = base64.urlsafe_b64encode(sign).decode()
 
     return f"{file_preview_url}?timestamp={timestamp}&nonce={nonce}&sign={encoded_sign}"
@@ -49,8 +53,7 @@ def verify_tool_file_signature(file_id: str, timestamp: str, nonce: str, sign: s
     verify signature
     """
     data_to_sign = f"file-preview|{file_id}|{timestamp}|{nonce}"
-    secret_key = dify_config.SECRET_KEY.encode() if dify_config.SECRET_KEY else b""
-    recalculated_sign = hmac.new(secret_key, data_to_sign.encode(), hashlib.sha256).digest()
+    recalculated_sign = hmac.new(_secret_key(), data_to_sign.encode(), hashlib.sha256).digest()
     recalculated_encoded_sign = base64.urlsafe_b64encode(recalculated_sign).decode()
 
     # verify signature
@@ -69,8 +72,7 @@ def get_signed_file_url_for_plugin(filename: str, mimetype: str, tenant_id: str,
     timestamp = str(int(time.time()))
     nonce = os.urandom(16).hex()
     data_to_sign = f"upload|{filename}|{mimetype}|{tenant_id}|{user_id}|{timestamp}|{nonce}"
-    secret_key = dify_config.SECRET_KEY.encode() if dify_config.SECRET_KEY else b""
-    sign = hmac.new(secret_key, data_to_sign.encode(), hashlib.sha256).digest()
+    sign = hmac.new(_secret_key(), data_to_sign.encode(), hashlib.sha256).digest()
     encoded_sign = base64.urlsafe_b64encode(sign).decode()
     query = urllib.parse.urlencode(
         {
@@ -90,8 +92,7 @@ def verify_plugin_file_signature(
     """Verify the signature used by the plugin-facing file upload endpoint."""
 
     data_to_sign = f"upload|{filename}|{mimetype}|{tenant_id}|{user_id}|{timestamp}|{nonce}"
-    secret_key = dify_config.SECRET_KEY.encode() if dify_config.SECRET_KEY else b""
-    recalculated_sign = hmac.new(secret_key, data_to_sign.encode(), hashlib.sha256).digest()
+    recalculated_sign = hmac.new(_secret_key(), data_to_sign.encode(), hashlib.sha256).digest()
     recalculated_encoded_sign = base64.urlsafe_b64encode(recalculated_sign).decode()
 
     if sign != recalculated_encoded_sign:
diff --git a/api/core/tools/tool_file_manager.py b/api/core/tools/tool_file_manager.py
index c87e8a3ae0..f2552e7cbd 100644
--- a/api/core/tools/tool_file_manager.py
+++ b/api/core/tools/tool_file_manager.py
@@ -51,8 +51,11 @@ class ToolFileManager:
         timestamp = str(int(time.time()))
         nonce = os.urandom(16).hex()
         data_to_sign = f"file-preview|{tool_file_id}|{timestamp}|{nonce}"
-        secret_key = dify_config.SECRET_KEY.encode() if dify_config.SECRET_KEY else b""
-        sign = hmac.new(secret_key, data_to_sign.encode(), hashlib.sha256).digest()
+        sign = hmac.new(
+            dify_config.SECRET_KEY.encode(),
+            data_to_sign.encode(),
+            hashlib.sha256,
+        ).digest()
         encoded_sign = base64.urlsafe_b64encode(sign).decode()
 
         return f"{file_preview_url}?timestamp={timestamp}&nonce={nonce}&sign={encoded_sign}"
@@ -63,8 +66,11 @@ class ToolFileManager:
         verify signature
         """
         data_to_sign = f"file-preview|{file_id}|{timestamp}|{nonce}"
-        secret_key = dify_config.SECRET_KEY.encode() if dify_config.SECRET_KEY else b""
-        recalculated_sign = hmac.new(secret_key, data_to_sign.encode(), hashlib.sha256).digest()
+        recalculated_sign = hmac.new(
+            dify_config.SECRET_KEY.encode(),
+            data_to_sign.encode(),
+            hashlib.sha256,
+        ).digest()
         recalculated_encoded_sign = base64.urlsafe_b64encode(recalculated_sign).decode()
 
         # verify signature
diff --git a/api/core/tools/tool_manager.py b/api/core/tools/tool_manager.py
index 87cf6d7085..53e82ce994 100644
--- a/api/core/tools/tool_manager.py
+++ b/api/core/tools/tool_manager.py
@@ -264,9 +264,9 @@ class ToolManager:
                     if builtin_provider is None:
                         raise ToolProviderNotFoundError(f"builtin provider {provider_id} not found")
 
-                from core.helper.credential_utils import check_credential_policy_compliance
+                from core.helper.credential_utils import runtime_check_credential_policy_compliance
 
-                check_credential_policy_compliance(
+                runtime_check_credential_policy_compliance(
                     credential_id=builtin_provider.id,
                     provider=provider_id,
                     credential_type=PluginCredentialType.TOOL,
@@ -1078,6 +1078,13 @@ class ToolManager:
             if parameter.form == ToolParameter.ToolParameterForm.FORM:
                 if variable_pool:
                     config = tool_configurations.get(parameter.name, {})
+
+                    selector_value = cls._extract_runtime_selector_value(parameter, config)
+                    if selector_value is not None:
+                        # Selector parameters carry structured dictionaries, not scalar ToolInput values.
+                        runtime_parameters[parameter.name] = selector_value
+                        continue
+
                     if not (config and isinstance(config, dict) and config.get("value") is not None):
                         continue
                     tool_input = ToolNodeData.ToolInput.model_validate(tool_configurations.get(parameter.name, {}))
@@ -1105,5 +1112,39 @@ class ToolManager:
                     runtime_parameters[parameter.name] = value
         return runtime_parameters
 
+    @classmethod
+    def _extract_runtime_selector_value(cls, parameter: ToolParameter, config: Any) -> dict[str, Any] | None:
+        if parameter.type not in {
+            ToolParameter.ToolParameterType.MODEL_SELECTOR,
+            ToolParameter.ToolParameterType.APP_SELECTOR,
+        }:
+            return None
+        if not isinstance(config, dict):
+            return None
+
+        input_value = config.get("value")
+        if isinstance(input_value, dict) and cls._is_selector_value(parameter, input_value):
+            return cast("dict[str, Any]", parameter.init_frontend_parameter(input_value))
+
+        if cls._is_selector_value(parameter, config):
+            selector_value = dict(config)
+            selector_value.pop("type", None)
+            selector_value.pop("value", None)
+            return cast("dict[str, Any]", parameter.init_frontend_parameter(selector_value))
+
+        return None
+
+    @classmethod
+    def _is_selector_value(cls, parameter: ToolParameter, value: Mapping[str, Any]) -> bool:
+        if parameter.type == ToolParameter.ToolParameterType.MODEL_SELECTOR:
+            return (
+                isinstance(value.get("provider"), str)
+                and isinstance(value.get("model"), str)
+                and isinstance(value.get("model_type"), str)
+            )
+        if parameter.type == ToolParameter.ToolParameterType.APP_SELECTOR:
+            return isinstance(value.get("app_id"), str)
+        return False
+
 
 ToolManager.load_hardcoded_providers_cache()
diff --git a/api/core/tools/utils/message_transformer.py b/api/core/tools/utils/message_transformer.py
index 5679466cbc..4c6e647335 100644
--- a/api/core/tools/utils/message_transformer.py
+++ b/api/core/tools/utils/message_transformer.py
@@ -23,36 +23,37 @@ _TOOL_FILE_URL_PATTERN = re.compile(r"(?:^|/+)files/tools/(?P<tool_file_id>[^/?#
 
 
 def safe_json_value(v):
-    if isinstance(v, datetime):
-        tz_name = "UTC"
-        if isinstance(current_user, Account) and current_user.timezone is not None:
-            tz_name = current_user.timezone
-        return v.astimezone(pytz.timezone(tz_name)).isoformat()
-    elif isinstance(v, date):
-        return v.isoformat()
-    elif isinstance(v, UUID):
-        return str(v)
-    elif isinstance(v, Decimal):
-        return float(v)
-    elif isinstance(v, bytes):
-        try:
-            return v.decode("utf-8")
-        except UnicodeDecodeError:
-            return v.hex()
-    elif isinstance(v, memoryview):
-        return v.tobytes().hex()
-    elif isinstance(v, np.integer):
-        return int(v)
-    elif isinstance(v, np.floating):
-        return float(v)
-    elif isinstance(v, np.ndarray):
-        return v.tolist()
-    elif isinstance(v, dict):
-        return safe_json_dict(v)
-    elif isinstance(v, list | tuple | set):
-        return [safe_json_value(i) for i in v]
-    else:
-        return v
+    match v:
+        case datetime():
+            tz_name = "UTC"
+            if isinstance(current_user, Account) and current_user.timezone is not None:
+                tz_name = current_user.timezone
+            return v.astimezone(pytz.timezone(tz_name)).isoformat()
+        case date():
+            return v.isoformat()
+        case UUID():
+            return str(v)
+        case Decimal():
+            return float(v)
+        case bytes():
+            try:
+                return v.decode("utf-8")
+            except UnicodeDecodeError:
+                return v.hex()
+        case memoryview():
+            return v.tobytes().hex()
+        case np.integer():
+            return int(v)
+        case np.floating():
+            return float(v)
+        case np.ndarray():
+            return v.tolist()
+        case dict():
+            return safe_json_dict(v)
+        case list() | tuple() | set():
+            return [safe_json_value(i) for i in v]
+        case _:
+            return v
 
 
 def safe_json_dict(d: dict[str, Any]):
diff --git a/api/core/tools/workflow_as_tool/tool.py b/api/core/tools/workflow_as_tool/tool.py
index cd8c6352b5..3fbd456fe5 100644
--- a/api/core/tools/workflow_as_tool/tool.py
+++ b/api/core/tools/workflow_as_tool/tool.py
@@ -9,6 +9,7 @@ from sqlalchemy import select
 
 from core.app.file_access import DatabaseFileAccessController
 from core.db.session_factory import session_factory
+from core.helper.trace_id_helper import ParentTraceContext, extract_parent_trace_context_from_args
 from core.tools.__base.tool import Tool
 from core.tools.__base.tool_runtime import ToolRuntime
 from core.tools.entities.tool_entities import (
@@ -36,6 +37,8 @@ class WorkflowTool(Tool):
     Workflow tool.
     """
 
+    _parent_trace_context: ParentTraceContext | None
+
     def __init__(
         self,
         workflow_app_id: str,
@@ -54,6 +57,7 @@ class WorkflowTool(Tool):
         self.workflow_call_depth = workflow_call_depth
         self.label = label
         self._latest_usage = LLMUsage.empty_usage()
+        self._parent_trace_context = None
 
         super().__init__(entity=entity, runtime=runtime)
 
@@ -94,11 +98,17 @@ class WorkflowTool(Tool):
 
         self._latest_usage = LLMUsage.empty_usage()
 
+        generator_args: dict[str, Any] = {"inputs": tool_parameters, "files": files}
+        if self._parent_trace_context:
+            generator_args.update(
+                extract_parent_trace_context_from_args({"parent_trace_context": self._parent_trace_context})
+            )
+
         result = generator.generate(
             app_model=app,
             workflow=workflow,
             user=user,
-            args={"inputs": tool_parameters, "files": files},
+            args=generator_args,
             invoke_from=self.runtime.invoke_from,
             streaming=False,
             call_depth=self.workflow_call_depth + 1,
@@ -194,7 +204,7 @@ class WorkflowTool(Tool):
 
         :return: the new tool
         """
-        return self.__class__(
+        forked = self.__class__(
             entity=self.entity.model_copy(),
             runtime=runtime,
             workflow_app_id=self.workflow_app_id,
@@ -204,6 +214,24 @@ class WorkflowTool(Tool):
             version=self.version,
             label=self.label,
         )
+        forked._parent_trace_context = self._parent_trace_context.model_copy() if self._parent_trace_context else None
+        return forked
+
+    def set_parent_trace_context(
+        self,
+        *,
+        parent_workflow_run_id: str,
+        parent_node_execution_id: str,
+    ) -> None:
+        """Attach outer workflow trace context without exposing it as tool input."""
+        self._parent_trace_context = ParentTraceContext(
+            parent_workflow_run_id=parent_workflow_run_id,
+            parent_node_execution_id=parent_node_execution_id,
+        )
+
+    def clear_parent_trace_context(self) -> None:
+        """Remove parent trace context before invoking this tool outside a nested workflow."""
+        self._parent_trace_context = None
 
     def _resolve_user(self, user_id: str) -> Account | EndUser | None:
         """
diff --git a/api/core/workflow/human_input_adapter.py b/api/core/workflow/human_input_adapter.py
index 4b765e6aea..731ae2b858 100644
--- a/api/core/workflow/human_input_adapter.py
+++ b/api/core/workflow/human_input_adapter.py
@@ -272,6 +272,14 @@ def _adapt_tool_node_data_for_graph(node_data: Mapping[str, Any]) -> dict[str, A
             normalized_tool_configurations[name] = value
             continue
 
+        selector_value = _extract_selector_configuration(value)
+        if selector_value is not None:
+            # Model/app selectors are dictionaries even when they come through the legacy tool configuration path.
+            # Move them to tool_parameters so graph validation does not flatten them as primitive constants.
+            found_legacy_tool_inputs = True
+            normalized_tool_parameters.setdefault(name, {"type": "constant", "value": selector_value})
+            continue
+
         input_type = value.get("type")
         input_value = value.get("value")
         if input_type not in {"mixed", "variable", "constant"}:
@@ -310,6 +318,28 @@ def _flatten_legacy_tool_configuration_value(*, input_type: Any, input_value: An
     return None
 
 
+def _extract_selector_configuration(value: Mapping[str, Any]) -> dict[str, Any] | None:
+    input_value = value.get("value")
+    if isinstance(input_value, Mapping) and _is_selector_configuration(input_value):
+        return dict(input_value)
+
+    if _is_selector_configuration(value):
+        selector_value = dict(value)
+        selector_value.pop("type", None)
+        selector_value.pop("value", None)
+        return selector_value
+
+    return None
+
+
+def _is_selector_configuration(value: Mapping[str, Any]) -> bool:
+    return (
+        isinstance(value.get("provider"), str)
+        and isinstance(value.get("model"), str)
+        and isinstance(value.get("model_type"), str)
+    ) or isinstance(value.get("app_id"), str)
+
+
 def _normalize_email_recipients(recipients: Mapping[str, Any]) -> dict[str, Any]:
     normalized = dict(recipients)
 
diff --git a/api/core/workflow/node_factory.py b/api/core/workflow/node_factory.py
index 895953a3c1..5d572bbd5e 100644
--- a/api/core/workflow/node_factory.py
+++ b/api/core/workflow/node_factory.py
@@ -1,16 +1,16 @@
 import importlib
 import pkgutil
-from collections.abc import Callable, Iterator, Mapping, MutableMapping
+from collections.abc import Callable, Iterator, Mapping, MutableMapping, Sequence
 from dataclasses import dataclass
 from functools import lru_cache
 from typing import TYPE_CHECKING, Any, cast, final, override
 
 from sqlalchemy import select
-from sqlalchemy.orm import Session
 
 from configs import dify_config
 from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, DifyRunContext
 from core.app.llm.model_access import build_dify_model_access, fetch_model_config
+from core.db.session_factory import session_factory
 from core.helper.code_executor.code_executor import (
     CodeExecutionError,
     CodeExecutor,
@@ -39,7 +39,6 @@ from core.workflow.nodes.agent.plugin_strategy_adapter import (
 from core.workflow.nodes.agent.runtime_support import AgentRuntimeSupport
 from core.workflow.system_variables import SystemVariableKey, get_system_text, system_variable_selector
 from core.workflow.template_rendering import CodeExecutorJinja2TemplateRenderer
-from extensions.ext_database import db
 from graphon.entities.base_node_data import BaseNodeData
 from graphon.entities.graph_config import NodeConfigDict, NodeConfigDictAdapter
 from graphon.enums import BuiltinNodeTypes, NodeType
@@ -48,7 +47,7 @@ from graphon.graph.graph import NodeFactory
 from graphon.model_runtime.memory import PromptMessageMemory
 from graphon.model_runtime.model_providers.base.large_language_model import LargeLanguageModel
 from graphon.nodes.base.node import Node
-from graphon.nodes.code.code_node import WorkflowCodeExecutor
+from graphon.nodes.code.code_node import CodeExecutorProtocol
 from graphon.nodes.code.entities import CodeLanguage
 from graphon.nodes.code.limits import CodeNodeLimits
 from graphon.nodes.document_extractor import UnstructuredApiConfig
@@ -56,6 +55,7 @@ from graphon.nodes.http_request import build_http_request_config
 from graphon.nodes.llm.entities import LLMNodeData
 from graphon.nodes.parameter_extractor.entities import ParameterExtractorNodeData
 from graphon.nodes.question_classifier.entities import QuestionClassifierNodeData
+from graphon.variables.segments import ArrayObjectSegment
 from models.model import Conversation
 
 if TYPE_CHECKING:
@@ -228,10 +228,14 @@ def fetch_memory(
     node_data_memory: MemoryConfig | None,
     model_instance: ModelInstance,
 ) -> TokenBufferMemory | None:
+    """Build prompt memory for node construction without requiring Flask-local state."""
     if not node_data_memory or not conversation_id:
         return None
 
-    with Session(db.engine, expire_on_commit=False) as session:
+    # Node construction can happen in graph initialization paths where Flask's
+    # app context is not active. Use the app-configured session factory instead
+    # of resolving db.engine through Flask-SQLAlchemy's current_app proxy.
+    with session_factory.create_session() as session:
         stmt = select(Conversation).where(Conversation.app_id == app_id, Conversation.id == conversation_id)
         conversation = session.scalar(stmt)
         if not conversation:
@@ -285,7 +289,7 @@ class DifyNodeFactory(NodeFactory):
         self.graph_init_params = graph_init_params
         self.graph_runtime_state = graph_runtime_state
         self._dify_context = self._resolve_dify_context(graph_init_params.run_context)
-        self._code_executor: WorkflowCodeExecutor = DefaultWorkflowCodeExecutor()
+        self._code_executor: CodeExecutorProtocol = DefaultWorkflowCodeExecutor()
         self._code_limits = CodeNodeLimits(
             max_string_length=dify_config.CODE_MAX_STRING_LENGTH,
             max_number=dify_config.CODE_MAX_NUMBER,
@@ -374,11 +378,6 @@ class DifyNodeFactory(NodeFactory):
         # Re-validate using the resolved node class so workflow-local node schemas
         # stay explicit and constructors receive the concrete typed payload.
         resolved_node_data = self._validate_resolved_node_data(node_class, node_data)
-        config_for_node_init: BaseNodeData | dict[str, Any]
-        if isinstance(resolved_node_data, BaseNodeData):
-            config_for_node_init = resolved_node_data.model_dump(mode="python", by_alias=True)
-        else:
-            config_for_node_init = resolved_node_data
         node_type = node_data.type
         node_init_kwargs_factories: Mapping[NodeType, Callable[[], dict[str, object]]] = {
             BuiltinNodeTypes.CODE: lambda: {
@@ -398,6 +397,7 @@ class DifyNodeFactory(NodeFactory):
             },
             BuiltinNodeTypes.HUMAN_INPUT: lambda: {
                 "runtime": self._human_input_runtime,
+                "file_reference_factory": self._file_reference_factory,
                 "form_repository": self._human_input_runtime.build_form_repository(),
             },
             BuiltinNodeTypes.LLM: lambda: self._build_llm_compatible_node_init_kwargs(
@@ -435,7 +435,7 @@ class DifyNodeFactory(NodeFactory):
                 include_jinja2_template_renderer=False,
             ),
             BuiltinNodeTypes.TOOL: lambda: {
-                "tool_file_manager_factory": self._bound_tool_file_manager_factory(),
+                "tool_file_manager": self._bound_tool_file_manager_factory(),
                 "runtime": self._tool_runtime,
             },
             BuiltinNodeTypes.AGENT: lambda: {
@@ -446,9 +446,10 @@ class DifyNodeFactory(NodeFactory):
             },
         }
         node_init_kwargs = node_init_kwargs_factories.get(node_type, lambda: {})()
+        constructor_node_data = resolved_node_data.model_dump(mode="python", by_alias=True)
         return node_class(
             node_id=node_id,
-            config=config_for_node_init,
+            data=constructor_node_data,
             graph_init_params=self.graph_init_params,
             graph_runtime_state=self.graph_runtime_state,
             **node_init_kwargs,
@@ -500,13 +501,47 @@ class DifyNodeFactory(NodeFactory):
         if include_prompt_message_serializer:
             node_init_kwargs["prompt_message_serializer"] = self._prompt_message_serializer
         if include_retriever_attachment_loader:
-            node_init_kwargs["retriever_attachment_loader"] = self._retriever_attachment_loader
+            node_init_kwargs["retriever_attachment_loader"] = self._build_retriever_attachment_loader(
+                cast(LLMNodeData, validated_node_data)
+            )
         if include_jinja2_template_renderer:
             node_init_kwargs["jinja2_template_renderer"] = self._jinja2_template_renderer
         if validated_node_data.type == BuiltinNodeTypes.LLM:
             node_init_kwargs["default_query_selector"] = system_variable_selector(SystemVariableKey.QUERY)
         return node_init_kwargs
 
+    def _build_retriever_attachment_loader(self, node_data: LLMNodeData) -> DifyRetrieverAttachmentLoader:
+        return DifyRetrieverAttachmentLoader(
+            file_reference_factory=self._file_reference_factory,
+            segment_access_checker=self._build_retriever_segment_access_checker(
+                node_data.context.variable_selector if node_data.context.enabled else None
+            ),
+        )
+
+    def _build_retriever_segment_access_checker(
+        self,
+        context_variable_selector: Sequence[str] | None,
+    ) -> Callable[[str], bool]:
+        def checker(segment_id: str) -> bool:
+            if not context_variable_selector:
+                return False
+
+            context_value = self.graph_runtime_state.variable_pool.get(context_variable_selector)
+            if not isinstance(context_value, ArrayObjectSegment):
+                return False
+
+            for item in context_value.value:
+                if not isinstance(item, Mapping):
+                    continue
+                metadata = item.get("metadata")
+                if not isinstance(metadata, Mapping):
+                    continue
+                if metadata.get("_source") == "knowledge" and str(metadata.get("segment_id")) == str(segment_id):
+                    return True
+            return False
+
+        return checker
+
     def _build_model_instance_for_llm_node(self, node_data: LLMCompatibleNodeData) -> ModelInstance:
         node_data_model = node_data.model
         model_instance, _ = fetch_model_config(
diff --git a/api/core/workflow/node_runtime.py b/api/core/workflow/node_runtime.py
index b8725853c4..7ea03a4a33 100644
--- a/api/core/workflow/node_runtime.py
+++ b/api/core/workflow/node_runtime.py
@@ -8,8 +8,13 @@ from sqlalchemy import select
 from sqlalchemy.orm import Session
 
 from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, DifyRunContext
-from core.app.file_access import DatabaseFileAccessController
+from core.app.file_access import (
+    DatabaseFileAccessController,
+    grant_upload_file_access,
+    is_retriever_segment_access_granted,
+)
 from core.callback_handler.workflow_tool_callback_handler import DifyWorkflowCallbackHandler
+from core.helper.trace_id_helper import ParentTraceContext
 from core.llm_generator.output_parser.errors import OutputParserError
 from core.llm_generator.output_parser.structured_output import invoke_llm_with_structured_output
 from core.model_manager import ModelInstance
@@ -44,7 +49,7 @@ from graphon.model_runtime.entities.model_entities import AIModelEntity
 from graphon.model_runtime.model_providers.base.large_language_model import LargeLanguageModel
 from graphon.nodes.human_input.entities import HumanInputNodeData
 from graphon.nodes.llm.runtime_protocols import (
-    PreparedLLMProtocol,
+    LLMProtocol,
     PromptMessageSerializerProtocol,
     RetrieverAttachmentLoaderProtocol,
 )
@@ -135,7 +140,7 @@ class DifyFileReferenceFactory(FileReferenceFactoryProtocol):
         )
 
 
-class DifyPreparedLLM(PreparedLLMProtocol):
+class DifyPreparedLLM(LLMProtocol):
     """Workflow-layer adapter that hides the full `ModelInstance` API from `graphon` nodes."""
 
     def __init__(self, model_instance: ModelInstance) -> None:
@@ -274,10 +279,23 @@ class DifyPromptMessageSerializer(PromptMessageSerializerProtocol):
 class DifyRetrieverAttachmentLoader(RetrieverAttachmentLoaderProtocol):
     """Resolve retriever attachments through Dify persistence and return graph file references."""
 
-    def __init__(self, *, file_reference_factory: FileReferenceFactoryProtocol) -> None:
+    _segment_access_checker: Callable[[str], bool] | None
+
+    def __init__(
+        self,
+        *,
+        file_reference_factory: FileReferenceFactoryProtocol,
+        segment_access_checker: Callable[[str], bool] | None = None,
+    ) -> None:
         self._file_reference_factory = file_reference_factory
+        self._segment_access_checker = segment_access_checker
 
     def load(self, *, segment_id: str) -> Sequence[File]:
+        if not is_retriever_segment_access_granted(segment_id):
+            return []
+        if self._segment_access_checker is not None and not self._segment_access_checker(segment_id):
+            return []
+
         with Session(db.engine, expire_on_commit=False) as session:
             attachments_with_bindings = session.execute(
                 select(SegmentAttachmentBinding, UploadFile)
@@ -285,6 +303,7 @@ class DifyRetrieverAttachmentLoader(RetrieverAttachmentLoaderProtocol):
                 .where(SegmentAttachmentBinding.segment_id == segment_id)
             ).all()
 
+        grant_upload_file_access(str(upload_file.id) for _, upload_file in attachments_with_bindings)
         return [
             self._file_reference_factory.build_from_mapping(
                 mapping={
@@ -358,6 +377,7 @@ class _WorkflowToolRuntimeBinding:
 
     tool: Tool
     conversation_id: str | None = None
+    parent_trace_context: ParentTraceContext | None = None
 
 
 class DifyToolNodeRuntime(ToolNodeRuntimeProtocol):
@@ -378,6 +398,7 @@ class DifyToolNodeRuntime(ToolNodeRuntimeProtocol):
         node_id: str,
         node_data: ToolNodeData,
         variable_pool,
+        node_execution_id: str | None = None,
     ) -> ToolRuntimeHandle:
         try:
             tool_runtime = ToolManager.get_workflow_tool_runtime(
@@ -397,7 +418,25 @@ class DifyToolNodeRuntime(ToolNodeRuntimeProtocol):
         conversation_id = (
             None if variable_pool is None else get_system_text(variable_pool, SystemVariableKey.CONVERSATION_ID)
         )
-        return ToolRuntimeHandle(raw=_WorkflowToolRuntimeBinding(tool=tool_runtime, conversation_id=conversation_id))
+        parent_trace_context: ParentTraceContext | None = None
+        if self._is_workflow_tool_provider(node_data):
+            outer_workflow_run_id = (
+                None
+                if variable_pool is None
+                else get_system_text(variable_pool, SystemVariableKey.WORKFLOW_EXECUTION_ID)
+            )
+            if isinstance(outer_workflow_run_id, str) and isinstance(node_execution_id, str):
+                parent_trace_context = ParentTraceContext(
+                    parent_workflow_run_id=outer_workflow_run_id,
+                    parent_node_execution_id=node_execution_id,
+                )
+        return ToolRuntimeHandle(
+            raw=_WorkflowToolRuntimeBinding(
+                tool=tool_runtime,
+                conversation_id=conversation_id,
+                parent_trace_context=parent_trace_context,
+            )
+        )
 
     def get_runtime_parameters(
         self,
@@ -421,6 +460,13 @@ class DifyToolNodeRuntime(ToolNodeRuntimeProtocol):
         runtime_binding = self._binding_from_handle(tool_runtime)
         tool = runtime_binding.tool
         callback = DifyWorkflowCallbackHandler()
+        if runtime_binding.parent_trace_context and hasattr(tool, "set_parent_trace_context"):
+            tool.set_parent_trace_context(
+                parent_workflow_run_id=runtime_binding.parent_trace_context.parent_workflow_run_id,
+                parent_node_execution_id=runtime_binding.parent_trace_context.parent_node_execution_id,
+            )
+        elif hasattr(tool, "clear_parent_trace_context"):
+            tool.clear_parent_trace_context()
 
         try:
             messages = ToolEngine.generic_invoke(
@@ -501,14 +547,22 @@ class DifyToolNodeRuntime(ToolNodeRuntimeProtocol):
 
     @staticmethod
     def _build_tool_runtime_spec(node_data: ToolNodeData) -> _WorkflowToolRuntimeSpec:
+        tool_configurations = dict(node_data.tool_configurations)
+        tool_configurations.update(
+            {name: tool_input.model_dump(mode="python") for name, tool_input in node_data.tool_parameters.items()}
+        )
         return _WorkflowToolRuntimeSpec(
             provider_type=CoreToolProviderType(node_data.provider_type.value),
             provider_id=node_data.provider_id,
             tool_name=node_data.tool_name,
-            tool_configurations=dict(node_data.tool_configurations),
+            tool_configurations=tool_configurations,
             credential_id=node_data.credential_id,
         )
 
+    @staticmethod
+    def _is_workflow_tool_provider(node_data: ToolNodeData) -> bool:
+        return node_data.provider_type.value == CoreToolProviderType.WORKFLOW.value
+
     def _adapt_messages(
         self,
         messages: Generator[CoreToolInvokeMessage, None, None],
@@ -554,64 +608,67 @@ class DifyToolNodeRuntime(ToolNodeRuntimeProtocol):
 
         from core.tools.entities.tool_entities import ToolInvokeMessage as CoreToolInvokeMessage
 
-        if isinstance(message, CoreToolInvokeMessage.TextMessage):
-            return ToolRuntimeMessage.TextMessage(text=message.text)
-        if isinstance(message, CoreToolInvokeMessage.JsonMessage):
-            return ToolRuntimeMessage.JsonMessage(
-                json_object=message.json_object,
-                suppress_output=message.suppress_output,
-            )
-        if isinstance(message, CoreToolInvokeMessage.BlobMessage):
-            return ToolRuntimeMessage.BlobMessage(blob=message.blob)
-        if isinstance(message, CoreToolInvokeMessage.BlobChunkMessage):
-            return ToolRuntimeMessage.BlobChunkMessage(
-                id=message.id,
-                sequence=message.sequence,
-                total_length=message.total_length,
-                blob=message.blob,
-                end=message.end,
-            )
-        if isinstance(message, CoreToolInvokeMessage.FileMessage):
-            return ToolRuntimeMessage.FileMessage(file_marker=message.file_marker)
-        if isinstance(message, CoreToolInvokeMessage.VariableMessage):
-            return ToolRuntimeMessage.VariableMessage(
-                variable_name=message.variable_name,
-                variable_value=message.variable_value,
-                stream=message.stream,
-            )
-        if isinstance(message, CoreToolInvokeMessage.LogMessage):
-            return ToolRuntimeMessage.LogMessage(
-                id=message.id,
-                label=message.label,
-                parent_id=message.parent_id,
-                error=message.error,
-                status=ToolRuntimeMessage.LogMessage.LogStatus(message.status.value),
-                data=dict(message.data),
-                metadata=dict(message.metadata),
-            )
-        if isinstance(message, CoreToolInvokeMessage.RetrieverResourceMessage):
-            retriever_resources = [
-                resource.model_dump() if hasattr(resource, "model_dump") else dict(resource)
-                for resource in message.retriever_resources
-            ]
-            return ToolRuntimeMessage.RetrieverResourceMessage(
-                retriever_resources=retriever_resources,
-                context=message.context,
-            )
-
-        raise TypeError(f"unsupported tool message payload: {type(message).__name__}")
+        match message:
+            case CoreToolInvokeMessage.TextMessage():
+                return ToolRuntimeMessage.TextMessage(text=message.text)
+            case CoreToolInvokeMessage.JsonMessage():
+                return ToolRuntimeMessage.JsonMessage(
+                    json_object=message.json_object,
+                    suppress_output=message.suppress_output,
+                )
+            case CoreToolInvokeMessage.BlobMessage():
+                return ToolRuntimeMessage.BlobMessage(blob=message.blob)
+            case CoreToolInvokeMessage.BlobChunkMessage():
+                return ToolRuntimeMessage.BlobChunkMessage(
+                    id=message.id,
+                    sequence=message.sequence,
+                    total_length=message.total_length,
+                    blob=message.blob,
+                    end=message.end,
+                )
+            case CoreToolInvokeMessage.FileMessage():
+                return ToolRuntimeMessage.FileMessage(file_marker=message.file_marker)
+            case CoreToolInvokeMessage.VariableMessage():
+                return ToolRuntimeMessage.VariableMessage(
+                    variable_name=message.variable_name,
+                    variable_value=message.variable_value,
+                    stream=message.stream,
+                )
+            case CoreToolInvokeMessage.LogMessage():
+                return ToolRuntimeMessage.LogMessage(
+                    id=message.id,
+                    label=message.label,
+                    parent_id=message.parent_id,
+                    error=message.error,
+                    status=ToolRuntimeMessage.LogMessage.LogStatus(message.status.value),
+                    data=dict(message.data),
+                    metadata=dict(message.metadata),
+                )
+            case CoreToolInvokeMessage.RetrieverResourceMessage():
+                retriever_resources = [
+                    resource.model_dump() if hasattr(resource, "model_dump") else dict(resource)
+                    for resource in message.retriever_resources
+                ]
+                return ToolRuntimeMessage.RetrieverResourceMessage(
+                    retriever_resources=retriever_resources,
+                    context=message.context,
+                )
+            case _:
+                raise TypeError(f"unsupported tool message payload: {type(message).__name__}")
 
     @staticmethod
     def _map_invocation_exception(exc: Exception, *, provider_name: str) -> ToolNodeError:
-        if isinstance(exc, ToolNodeError):
-            return exc
-        if isinstance(exc, PluginInvokeError):
-            return ToolRuntimeInvocationError(exc.to_user_friendly_error(plugin_name=provider_name))
-        if isinstance(exc, PluginDaemonClientSideError):
-            return ToolRuntimeInvocationError(f"Failed to invoke tool, error: {exc.description}")
-        if isinstance(exc, ToolInvokeError):
-            return ToolRuntimeInvocationError(f"Failed to invoke tool {provider_name}: {exc}")
-        return ToolRuntimeInvocationError(str(exc))
+        match exc:
+            case ToolNodeError():
+                return exc
+            case PluginInvokeError():
+                return ToolRuntimeInvocationError(exc.to_user_friendly_error(plugin_name=provider_name))
+            case PluginDaemonClientSideError():
+                return ToolRuntimeInvocationError(f"Failed to invoke tool, error: {exc.description}")
+            case ToolInvokeError():
+                return ToolRuntimeInvocationError(f"Failed to invoke tool {provider_name}: {exc}")
+            case _:
+                return ToolRuntimeInvocationError(str(exc))
 
 
 class DifyHumanInputNodeRuntime(HumanInputNodeRuntimeProtocol):
diff --git a/api/core/workflow/nodes/agent/agent_node.py b/api/core/workflow/nodes/agent/agent_node.py
index 68a24e86b1..17d71668cb 100644
--- a/api/core/workflow/nodes/agent/agent_node.py
+++ b/api/core/workflow/nodes/agent/agent_node.py
@@ -35,7 +35,7 @@ class AgentNode(Node[AgentNodeData]):
     def __init__(
         self,
         node_id: str,
-        config: AgentNodeData,
+        data: AgentNodeData,
         *,
         graph_init_params: GraphInitParams,
         graph_runtime_state: GraphRuntimeState,
@@ -46,7 +46,7 @@ class AgentNode(Node[AgentNodeData]):
     ) -> None:
         super().__init__(
             node_id=node_id,
-            config=config,
+            data=data,
             graph_init_params=graph_init_params,
             graph_runtime_state=graph_runtime_state,
         )
diff --git a/api/core/workflow/nodes/datasource/datasource_node.py b/api/core/workflow/nodes/datasource/datasource_node.py
index f3006c4242..a4ef3d1ea7 100644
--- a/api/core/workflow/nodes/datasource/datasource_node.py
+++ b/api/core/workflow/nodes/datasource/datasource_node.py
@@ -36,14 +36,14 @@ class DatasourceNode(Node[DatasourceNodeData]):
     def __init__(
         self,
         node_id: str,
-        config: DatasourceNodeData,
+        data: DatasourceNodeData,
         *,
         graph_init_params: "GraphInitParams",
         graph_runtime_state: "GraphRuntimeState",
     ) -> None:
         super().__init__(
             node_id=node_id,
-            config=config,
+            data=data,
             graph_init_params=graph_init_params,
             graph_runtime_state=graph_runtime_state,
         )
diff --git a/api/core/workflow/nodes/knowledge_index/knowledge_index_node.py b/api/core/workflow/nodes/knowledge_index/knowledge_index_node.py
index 9c1b7ab2c4..1d60f530a1 100644
--- a/api/core/workflow/nodes/knowledge_index/knowledge_index_node.py
+++ b/api/core/workflow/nodes/knowledge_index/knowledge_index_node.py
@@ -32,14 +32,14 @@ class KnowledgeIndexNode(Node[KnowledgeIndexNodeData]):
     def __init__(
         self,
         node_id: str,
-        config: KnowledgeIndexNodeData,
+        data: KnowledgeIndexNodeData,
         *,
         graph_init_params: "GraphInitParams",
         graph_runtime_state: "GraphRuntimeState",
     ) -> None:
         super().__init__(
             node_id=node_id,
-            config=config,
+            data=data,
             graph_init_params=graph_init_params,
             graph_runtime_state=graph_runtime_state,
         )
diff --git a/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py b/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py
index 25f73e446d..1aba2737b0 100644
--- a/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py
+++ b/api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py
@@ -71,14 +71,14 @@ class KnowledgeRetrievalNode(LLMUsageTrackingMixin, Node[KnowledgeRetrievalNodeD
     def __init__(
         self,
         node_id: str,
-        config: KnowledgeRetrievalNodeData,
+        data: KnowledgeRetrievalNodeData,
         *,
         graph_init_params: "GraphInitParams",
         graph_runtime_state: "GraphRuntimeState",
     ) -> None:
         super().__init__(
             node_id=node_id,
-            config=config,
+            data=data,
             graph_init_params=graph_init_params,
             graph_runtime_state=graph_runtime_state,
         )
diff --git a/api/core/workflow/system_variables.py b/api/core/workflow/system_variables.py
index 9d15a3fcea..77ef3826e9 100644
--- a/api/core/workflow/system_variables.py
+++ b/api/core/workflow/system_variables.py
@@ -3,7 +3,7 @@ from __future__ import annotations
 from collections import defaultdict
 from collections.abc import Mapping, Sequence
 from enum import StrEnum
-from typing import Any, Protocol, cast
+from typing import Any, Protocol
 from uuid import uuid4
 
 from graphon.enums import BuiltinNodeTypes
@@ -82,13 +82,10 @@ def build_system_variables(values: Mapping[str, Any] | None = None, /, **kwargs:
     normalized = _normalize_system_variable_values(values, **kwargs)
 
     return [
-        cast(
-            Variable,
-            segment_to_variable(
-                segment=build_segment(value),
-                selector=system_variable_selector(key),
-                name=key,
-            ),
+        segment_to_variable(
+            segment=build_segment(value),
+            selector=system_variable_selector(key),
+            name=key,
         )
         for key, value in normalized.items()
     ]
@@ -130,13 +127,10 @@ def build_bootstrap_variables(
 
     for node_id, value in rag_pipeline_variables_map.items():
         variables.append(
-            cast(
-                Variable,
-                segment_to_variable(
-                    segment=build_segment(value),
-                    selector=(RAG_PIPELINE_VARIABLE_NODE_ID, node_id),
-                    name=node_id,
-                ),
+            segment_to_variable(
+                segment=build_segment(value),
+                selector=(RAG_PIPELINE_VARIABLE_NODE_ID, node_id),
+                name=node_id,
             )
         )
 
diff --git a/api/core/workflow/workflow_entry.py b/api/core/workflow/workflow_entry.py
index 4e2f603e5b..3019704dac 100644
--- a/api/core/workflow/workflow_entry.py
+++ b/api/core/workflow/workflow_entry.py
@@ -46,6 +46,11 @@ _file_access_controller = DatabaseFileAccessController()
 
 
 class _WorkflowChildEngineBuilder:
+    tenant_id: str
+
+    def __init__(self, *, tenant_id: str) -> None:
+        self.tenant_id = tenant_id
+
     @staticmethod
     def _has_node_id(graph_config: Mapping[str, Any], node_id: str) -> bool | None:
         """
@@ -107,7 +112,7 @@ class _WorkflowChildEngineBuilder:
             config=config,
             child_engine_builder=self,
         )
-        child_engine.layer(LLMQuotaLayer())
+        child_engine.layer(LLMQuotaLayer(tenant_id=self.tenant_id))
         return child_engine
 
 
@@ -176,7 +181,7 @@ class WorkflowEntry:
         self.command_channel = command_channel
         execution_context = capture_current_context()
         graph_runtime_state.execution_context = execution_context
-        self._child_engine_builder = _WorkflowChildEngineBuilder()
+        self._child_engine_builder = _WorkflowChildEngineBuilder(tenant_id=tenant_id)
         self.graph_engine = GraphEngine(
             workflow_id=workflow_id,
             graph=graph,
@@ -208,7 +213,7 @@ class WorkflowEntry:
             max_steps=dify_config.WORKFLOW_MAX_EXECUTION_STEPS, max_time=dify_config.WORKFLOW_MAX_EXECUTION_TIME
         )
         self.graph_engine.layer(limits_layer)
-        self.graph_engine.layer(LLMQuotaLayer())
+        self.graph_engine.layer(LLMQuotaLayer(tenant_id=tenant_id))
 
         # Add observability layer when OTel is enabled
         if dify_config.ENABLE_OTEL or is_instrument_flag_enabled():
diff --git a/api/dev/generate_fastopenapi_specs.py b/api/dev/generate_fastopenapi_specs.py
new file mode 100644
index 0000000000..5a94d32b93
--- /dev/null
+++ b/api/dev/generate_fastopenapi_specs.py
@@ -0,0 +1,95 @@
+"""Generate FastOpenAPI OpenAPI 3.0 specs without booting the full backend."""
+
+from __future__ import annotations
+
+import argparse
+import json
+import logging
+import sys
+from dataclasses import dataclass
+from pathlib import Path
+
+API_ROOT = Path(__file__).resolve().parents[1]
+if str(API_ROOT) not in sys.path:
+    sys.path.insert(0, str(API_ROOT))
+
+from dev.generate_swagger_specs import apply_runtime_defaults, drop_null_values, sort_openapi_arrays
+
+logger = logging.getLogger(__name__)
+
+
+@dataclass(frozen=True)
+class FastOpenApiSpecTarget:
+    route: str
+    filename: str
+
+
+FASTOPENAPI_SPEC_TARGETS: tuple[FastOpenApiSpecTarget, ...] = (
+    FastOpenApiSpecTarget(route="/fastopenapi/openapi.json", filename="fastopenapi-console-openapi.json"),
+)
+
+
+def create_fastopenapi_spec_app():
+    """Build a minimal Flask app that only mounts FastOpenAPI docs routes."""
+
+    apply_runtime_defaults()
+
+    from app_factory import create_flask_app_with_configs
+    from extensions import ext_fastopenapi
+
+    app = create_flask_app_with_configs()
+    ext_fastopenapi.init_app(app)
+    return app
+
+
+def generate_fastopenapi_specs(output_dir: Path) -> list[Path]:
+    """Write FastOpenAPI specs to `output_dir` and return the written paths."""
+
+    output_dir.mkdir(parents=True, exist_ok=True)
+
+    app = create_fastopenapi_spec_app()
+    client = app.test_client()
+
+    written_paths: list[Path] = []
+    for target in FASTOPENAPI_SPEC_TARGETS:
+        response = client.get(target.route)
+        if response.status_code != 200:
+            raise RuntimeError(f"failed to fetch {target.route}: {response.status_code}")
+
+        payload = response.get_json()
+        if not isinstance(payload, dict):
+            raise RuntimeError(f"unexpected response payload for {target.route}")
+        payload = drop_null_values(payload)
+        payload = sort_openapi_arrays(payload)
+
+        output_path = output_dir / target.filename
+        output_path.write_text(json.dumps(payload, indent=2, sort_keys=True) + "\n", encoding="utf-8")
+        written_paths.append(output_path)
+
+    return written_paths
+
+
+def parse_args() -> argparse.Namespace:
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument(
+        "-o",
+        "--output-dir",
+        type=Path,
+        default=Path("openapi"),
+        help="Directory where the OpenAPI JSON files will be written.",
+    )
+    return parser.parse_args()
+
+
+def main() -> int:
+    args = parse_args()
+    written_paths = generate_fastopenapi_specs(args.output_dir)
+
+    for path in written_paths:
+        logger.debug(path)
+
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/api/dev/generate_swagger_markdown_docs.py b/api/dev/generate_swagger_markdown_docs.py
new file mode 100644
index 0000000000..c87b25eeb0
--- /dev/null
+++ b/api/dev/generate_swagger_markdown_docs.py
@@ -0,0 +1,305 @@
+"""Generate OpenAPI JSON specs and split Markdown API docs.
+
+The Markdown step uses `swagger-markdown`, the same converter family as the
+Swagger Markdown UI, so CI and local regeneration catch converter-incompatible
+OpenAPI output early.
+"""
+
+from __future__ import annotations
+
+import argparse
+import json
+import logging
+import subprocess
+import sys
+import tempfile
+from pathlib import Path
+
+API_ROOT = Path(__file__).resolve().parents[1]
+if str(API_ROOT) not in sys.path:
+    sys.path.insert(0, str(API_ROOT))
+
+from dev.generate_fastopenapi_specs import FASTOPENAPI_SPEC_TARGETS, generate_fastopenapi_specs
+from dev.generate_swagger_specs import SPEC_TARGETS, generate_specs
+
+logger = logging.getLogger(__name__)
+
+SWAGGER_MARKDOWN_PACKAGE = "swagger-markdown@3.0.0"
+CONSOLE_SWAGGER_FILENAME = "console-swagger.json"
+STALE_COMBINED_MARKDOWN_FILENAME = "api-reference.md"
+
+
+def _definition_ref_name(schema: object) -> str | None:
+    if not isinstance(schema, dict):
+        return None
+
+    ref = schema.get("$ref")
+    if not isinstance(ref, str) or not ref.startswith("#/definitions/"):
+        return None
+
+    return ref.removeprefix("#/definitions/")
+
+
+def _markdown_anchor(name: str) -> str:
+    return name.lower()
+
+
+def _schema_markdown_type(schema: object) -> str:
+    if not isinstance(schema, dict):
+        return ""
+
+    ref_name = _definition_ref_name(schema)
+    if ref_name is not None:
+        return f"[{ref_name}](#{_markdown_anchor(ref_name)})"
+
+    for union_key in ("oneOf", "anyOf"):
+        variants = schema.get(union_key)
+        if not isinstance(variants, list):
+            continue
+
+        variant_types = [
+            variant_type
+            for variant in variants
+            if not (isinstance(variant, dict) and variant.get("type") == "null")
+            for variant_type in [_schema_markdown_type(variant)]
+            if variant_type
+        ]
+        if len(variant_types) == 1:
+            return variant_types[0]
+        if variant_types:
+            return "<br>".join(variant_types)
+
+    schema_type = schema.get("type")
+    if schema_type == "array":
+        item_type = _schema_markdown_type(schema.get("items"))
+        return f"[ {item_type or 'object'} ]"
+    if isinstance(schema_type, str):
+        return schema_type
+
+    return ""
+
+
+def _replace_schema_table_type(markdown: str, definition_name: str, row_name: str, type_markdown: str) -> str:
+    if not type_markdown:
+        return markdown
+
+    lines = markdown.splitlines()
+    section_header = f"#### {definition_name}"
+    in_section = False
+
+    for index, line in enumerate(lines):
+        if line == section_header:
+            in_section = True
+            continue
+        if in_section and line.startswith("#### "):
+            break
+        if not in_section or not line.startswith(f"| {row_name} |"):
+            continue
+
+        cells = line.split("|")
+        if len(cells) < 5:
+            continue
+        cells[2] = f" {type_markdown} "
+        lines[index] = "|".join(cells)
+        break
+
+    return "\n".join(lines)
+
+
+def _patch_union_schema_markdown(markdown: str, spec_path: Path) -> str:
+    """Fill Swagger Markdown table cells that `swagger-markdown` leaves blank for union schemas."""
+
+    spec = json.loads(spec_path.read_text(encoding="utf-8"))
+    definitions = spec.get("definitions")
+    if not isinstance(definitions, dict):
+        return markdown
+
+    for definition_name, schema in definitions.items():
+        if not isinstance(definition_name, str) or not isinstance(schema, dict):
+            continue
+        one_of = schema.get("oneOf")
+        if not isinstance(one_of, list):
+            continue
+
+        markdown = _replace_schema_table_type(
+            markdown,
+            definition_name,
+            definition_name,
+            _schema_markdown_type(schema),
+        )
+
+        for variant in one_of:
+            variant_name = _definition_ref_name(variant)
+            variant_schema = definitions.get(variant_name) if variant_name is not None else None
+            if not isinstance(variant_name, str) or not isinstance(variant_schema, dict):
+                continue
+            properties = variant_schema.get("properties")
+            if not isinstance(properties, dict):
+                continue
+            for property_name, property_schema in properties.items():
+                if isinstance(property_name, str):
+                    markdown = _replace_schema_table_type(
+                        markdown,
+                        variant_name,
+                        property_name,
+                        _schema_markdown_type(property_schema),
+                    )
+
+    return markdown
+
+
+def _convert_spec_to_markdown(spec_path: Path, markdown_path: Path) -> None:
+    markdown_path.parent.mkdir(parents=True, exist_ok=True)
+    with tempfile.TemporaryDirectory(prefix=f"{markdown_path.stem}-", dir=markdown_path.parent) as temp_dir:
+        temp_markdown_path = Path(temp_dir) / markdown_path.name
+        result = subprocess.run(
+            [
+                "npx",
+                "--yes",
+                SWAGGER_MARKDOWN_PACKAGE,
+                "-i",
+                str(spec_path),
+                "-o",
+                str(temp_markdown_path),
+            ],
+            check=False,
+            capture_output=True,
+            text=True,
+        )
+        if result.returncode != 0:
+            raise subprocess.CalledProcessError(
+                result.returncode,
+                result.args,
+                output=result.stdout,
+                stderr=result.stderr,
+            )
+        if not temp_markdown_path.exists():
+            converter_output = "\n".join(item for item in (result.stdout, result.stderr) if item).strip()
+            raise RuntimeError(f"swagger-markdown did not write {markdown_path}: {converter_output}")
+
+        converted_markdown = _patch_union_schema_markdown(
+            temp_markdown_path.read_text(encoding="utf-8"),
+            spec_path,
+        )
+        if not converted_markdown.strip():
+            raise RuntimeError(f"swagger-markdown wrote an empty document for {markdown_path}")
+
+    markdown_path.write_text(converted_markdown, encoding="utf-8")
+
+
+def _demote_markdown_headings(markdown: str, *, levels: int = 1) -> str:
+    """Nest generated Markdown under another Markdown section."""
+
+    heading_prefix = "#" * levels
+    lines = []
+    for line in markdown.splitlines():
+        if line.startswith("#"):
+            lines.append(f"{heading_prefix}{line}")
+        else:
+            lines.append(line)
+    return "\n".join(lines).strip()
+
+
+def _append_fastopenapi_markdown(console_markdown_path: Path, fastopenapi_markdown_path: Path) -> None:
+    """Append FastOpenAPI console docs to the existing console API Markdown."""
+
+    console_markdown = console_markdown_path.read_text(encoding="utf-8").rstrip()
+    fastopenapi_markdown = _demote_markdown_headings(
+        fastopenapi_markdown_path.read_text(encoding="utf-8"),
+        levels=2,
+    )
+    console_markdown_path.write_text(
+        "\n\n".join(
+            [
+                console_markdown,
+                "## FastOpenAPI Preview (OpenAPI 3.0)",
+                fastopenapi_markdown,
+            ]
+        )
+        + "\n",
+        encoding="utf-8",
+    )
+
+
+def generate_markdown_docs(
+    swagger_dir: Path,
+    markdown_dir: Path,
+    *,
+    keep_swagger_json: bool = False,
+) -> list[Path]:
+    """Generate intermediate specs, convert them to split Markdown API docs, and return Markdown paths."""
+
+    swagger_paths = generate_specs(swagger_dir)
+    fastopenapi_paths = generate_fastopenapi_specs(swagger_dir)
+    spec_paths = [*swagger_paths, *fastopenapi_paths]
+    swagger_paths_by_name = {path.name: path for path in swagger_paths}
+    fastopenapi_paths_by_name = {path.name: path for path in fastopenapi_paths}
+
+    markdown_dir.mkdir(parents=True, exist_ok=True)
+
+    written_paths: list[Path] = []
+    try:
+        with tempfile.TemporaryDirectory(prefix="dify-api-docs-") as temp_dir:
+            temp_markdown_dir = Path(temp_dir)
+
+            for target in SPEC_TARGETS:
+                swagger_path = swagger_paths_by_name[target.filename]
+                markdown_path = markdown_dir / f"{swagger_path.stem}.md"
+                _convert_spec_to_markdown(swagger_path, markdown_path)
+                written_paths.append(markdown_path)
+
+            for target in FASTOPENAPI_SPEC_TARGETS:  # type: ignore
+                fastopenapi_path = fastopenapi_paths_by_name[target.filename]
+                markdown_path = temp_markdown_dir / f"{fastopenapi_path.stem}.md"
+                _convert_spec_to_markdown(fastopenapi_path, markdown_path)
+
+                console_markdown_path = markdown_dir / f"{Path(CONSOLE_SWAGGER_FILENAME).stem}.md"
+                _append_fastopenapi_markdown(console_markdown_path, markdown_path)
+
+            (markdown_dir / STALE_COMBINED_MARKDOWN_FILENAME).unlink(missing_ok=True)
+    finally:
+        if not keep_swagger_json:
+            for path in spec_paths:
+                path.unlink(missing_ok=True)
+
+    return written_paths
+
+
+def parse_args() -> argparse.Namespace:
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument(
+        "--swagger-dir",
+        type=Path,
+        default=Path("openapi"),
+        help="Directory where intermediate JSON spec files will be written.",
+    )
+    parser.add_argument(
+        "--markdown-dir",
+        type=Path,
+        default=Path("openapi/markdown"),
+        help="Directory where split Markdown API docs will be written.",
+    )
+    parser.add_argument(
+        "--keep-swagger-json",
+        action="store_true",
+        help="Keep intermediate JSON spec files after Markdown generation.",
+    )
+    return parser.parse_args()
+
+
+def main() -> int:
+    args = parse_args()
+    written_paths = generate_markdown_docs(
+        args.swagger_dir,
+        args.markdown_dir,
+        keep_swagger_json=args.keep_swagger_json,
+    )
+
+    for path in written_paths:
+        logger.debug(path)
+
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())
diff --git a/api/dev/generate_swagger_specs.py b/api/dev/generate_swagger_specs.py
index 7e9688bfb4..254310cd2a 100644
--- a/api/dev/generate_swagger_specs.py
+++ b/api/dev/generate_swagger_specs.py
@@ -9,15 +9,17 @@ which is unnecessary when the goal is only to serialize the Flask-RESTX
 from __future__ import annotations
 
 import argparse
+import hashlib
 import json
 import logging
 import os
 import sys
+from collections.abc import MutableMapping
 from dataclasses import dataclass
 from pathlib import Path
+from typing import Protocol, TypeGuard
 
 from flask import Flask
-from flask_restx.swagger import Swagger
 
 logger = logging.getLogger(__name__)
 
@@ -30,19 +32,107 @@ if str(API_ROOT) not in sys.path:
 class SpecTarget:
     route: str
     filename: str
+    namespace: str
+
+
+class RestxApi(Protocol):
+    models: MutableMapping[str, object]
+
+    def model(self, name: str, model: dict[object, object]) -> object: ...
 
 
 SPEC_TARGETS: tuple[SpecTarget, ...] = (
-    SpecTarget(route="/console/api/swagger.json", filename="console-swagger.json"),
-    SpecTarget(route="/api/swagger.json", filename="web-swagger.json"),
-    SpecTarget(route="/v1/swagger.json", filename="service-swagger.json"),
+    SpecTarget(route="/console/api/swagger.json", filename="console-swagger.json", namespace="console"),
+    SpecTarget(route="/api/swagger.json", filename="web-swagger.json", namespace="web"),
+    SpecTarget(route="/v1/swagger.json", filename="service-swagger.json", namespace="service"),
 )
 
-_ORIGINAL_REGISTER_MODEL = Swagger.register_model
-_ORIGINAL_REGISTER_FIELD = Swagger.register_field
+
+def _is_inline_field_map(value: object) -> TypeGuard[dict[object, object]]:
+    """Return whether a nested field map is an anonymous inline mapping."""
+
+    from flask_restx.model import Model, OrderedModel
+
+    return isinstance(value, dict) and not isinstance(value, (Model, OrderedModel))
 
 
-def _apply_runtime_defaults() -> None:
+def _jsonable_schema_value(value: object) -> object:
+    """Return a deterministic JSON-serializable representation for schema fingerprints."""
+
+    if value is None or isinstance(value, str | int | float | bool):
+        return value
+    if isinstance(value, list | tuple):
+        return [_jsonable_schema_value(item) for item in value]
+    if isinstance(value, dict):
+        return {str(key): _jsonable_schema_value(item) for key, item in value.items()}
+    value_type = type(value)
+    return f"<{value_type.__module__}.{value_type.__qualname__}>"
+
+
+def _field_signature(field: object) -> object:
+    """Build a stable signature for a Flask-RESTX field object."""
+
+    from flask_restx import fields
+    from flask_restx.model import instance
+
+    field_instance = instance(field)
+    signature: dict[str, object] = {
+        "class": f"{field_instance.__class__.__module__}.{field_instance.__class__.__qualname__}"
+    }
+
+    if isinstance(field_instance, fields.Nested):
+        nested = getattr(field_instance, "nested", None)
+        if _is_inline_field_map(nested):
+            signature["nested"] = _inline_model_signature(nested)
+        else:
+            signature["nested"] = getattr(
+                nested,
+                "name",
+                f"<{type(nested).__module__}.{type(nested).__qualname__}>",
+            )
+    elif hasattr(field_instance, "container"):
+        signature["container"] = _field_signature(field_instance.container)
+    else:
+        schema = getattr(field_instance, "__schema__", None)
+        if isinstance(schema, dict):
+            signature["schema"] = _jsonable_schema_value(schema)
+
+    for attr_name in (
+        "attribute",
+        "default",
+        "description",
+        "example",
+        "max",
+        "min",
+        "nullable",
+        "readonly",
+        "required",
+        "title",
+    ):
+        if hasattr(field_instance, attr_name):
+            signature[attr_name] = _jsonable_schema_value(getattr(field_instance, attr_name))
+
+    return signature
+
+
+def _inline_model_signature(nested_fields: dict[object, object]) -> object:
+    """Build a stable signature for an anonymous inline model."""
+
+    return [
+        (str(field_name), _field_signature(field))
+        for field_name, field in sorted(nested_fields.items(), key=lambda item: str(item[0]))
+    ]
+
+
+def _inline_model_name(nested_fields: dict[object, object]) -> str:
+    """Return a stable Swagger model name for an anonymous inline field map."""
+
+    signature = json.dumps(_inline_model_signature(nested_fields), sort_keys=True, separators=(",", ":"))
+    digest = hashlib.sha1(signature.encode("utf-8")).hexdigest()[:12]
+    return f"_AnonymousInlineModel_{digest}"
+
+
+def apply_runtime_defaults() -> None:
     """Force the small config surface required for Swagger generation."""
 
     os.environ.setdefault("SECRET_KEY", "spec-export")
@@ -58,69 +148,175 @@ def _apply_runtime_defaults() -> None:
     dify_config.SWAGGER_UI_ENABLED = os.environ["SWAGGER_UI_ENABLED"].lower() == "true"
 
 
-def _patch_swagger_for_inline_nested_dicts() -> None:
-    """Teach Flask-RESTX Swagger generation to tolerate inline nested field maps.
-
-    Some existing controllers use `fields.Nested({...})` with a raw field mapping
-    instead of a named `api.model(...)`. Flask-RESTX crashes on those anonymous
-    dicts during schema registration, so this helper upgrades them into temporary
-    named models at export time.
-    """
-
-    if getattr(Swagger, "_dify_inline_nested_dict_patch", False):
-        return
-
-    def get_or_create_inline_model(self: Swagger, nested_fields: dict[object, object]) -> object:
-        anonymous_models = getattr(self, "_anonymous_inline_models", None)
-        if anonymous_models is None:
-            anonymous_models = {}
-            self._anonymous_inline_models = anonymous_models
-
-        anonymous_name = anonymous_models.get(id(nested_fields))
-        if anonymous_name is None:
-            anonymous_name = f"_AnonymousInlineModel{len(anonymous_models) + 1}"
-            anonymous_models[id(nested_fields)] = anonymous_name
-            self.api.model(anonymous_name, nested_fields)
-
-        return self.api.models[anonymous_name]
-
-    def register_model_with_inline_dict_support(self: Swagger, model: object) -> dict[str, str]:
-        if isinstance(model, dict):
-            model = get_or_create_inline_model(self, model)
-
-        return _ORIGINAL_REGISTER_MODEL(self, model)
-
-    def register_field_with_inline_dict_support(self: Swagger, field: object) -> None:
-        nested = getattr(field, "nested", None)
-        if isinstance(nested, dict):
-            field.model = get_or_create_inline_model(self, nested)  # type: ignore
-
-        _ORIGINAL_REGISTER_FIELD(self, field)
-
-    Swagger.register_model = register_model_with_inline_dict_support
-    Swagger.register_field = register_field_with_inline_dict_support
-    Swagger._dify_inline_nested_dict_patch = True
-
-
 def create_spec_app() -> Flask:
     """Build a minimal Flask app that only mounts the Swagger-producing blueprints."""
 
-    _apply_runtime_defaults()
-    _patch_swagger_for_inline_nested_dicts()
+    apply_runtime_defaults()
+
+    from libs.flask_restx_compat import patch_swagger_for_inline_nested_dicts
+
+    patch_swagger_for_inline_nested_dicts()
 
     app = Flask(__name__)
 
     from controllers.console import bp as console_bp
+    from controllers.console import console_ns
     from controllers.service_api import bp as service_api_bp
+    from controllers.service_api import service_api_ns
     from controllers.web import bp as web_bp
+    from controllers.web import web_ns
 
     app.register_blueprint(console_bp)
     app.register_blueprint(web_bp)
     app.register_blueprint(service_api_bp)
 
+    for namespace in (console_ns, web_ns, service_api_ns):
+        for api in namespace.apis:
+            _materialize_inline_model_definitions(api)
+
     return app
 
 
+def _registered_models(namespace: str) -> dict[str, object]:
+    """Return the Flask-RESTX models registered for a Swagger namespace."""
+
+    if namespace == "console":
+        from controllers.console import console_ns
+
+        models = dict(console_ns.models)
+        for api in console_ns.apis:
+            models.update(api.models)
+        return models
+    if namespace == "web":
+        from controllers.web import web_ns
+
+        models = dict(web_ns.models)
+        for api in web_ns.apis:
+            models.update(api.models)
+        return models
+    if namespace == "service":
+        from controllers.service_api import service_api_ns
+
+        models = dict(service_api_ns.models)
+        for api in service_api_ns.apis:
+            models.update(api.models)
+        return models
+
+    raise ValueError(f"unknown Swagger namespace: {namespace}")
+
+
+def _materialize_inline_model_definitions(api: RestxApi) -> None:
+    """Convert inline `fields.Nested({...})` maps into named API models."""
+
+    from flask_restx import fields
+    from flask_restx.model import Model, OrderedModel, instance
+
+    inline_models: dict[int, dict[object, object]] = {}
+    inline_model_names: dict[int, str] = {}
+
+    def collect_field(field: object) -> None:
+        field_instance = instance(field)
+        if isinstance(field_instance, fields.Nested):
+            nested = getattr(field_instance, "nested", None)
+            if _is_inline_field_map(nested) and id(nested) not in inline_models:
+                inline_models[id(nested)] = nested
+                for nested_field in nested.values():
+                    collect_field(nested_field)
+
+        container = getattr(field_instance, "container", None)
+        if container is not None:
+            collect_field(container)
+
+    for model in list(api.models.values()):
+        if isinstance(model, (Model, OrderedModel)):
+            for field in model.values():
+                collect_field(field)
+
+    for nested_fields in sorted(inline_models.values(), key=_inline_model_name):
+        anonymous_name = _inline_model_name(nested_fields)
+        inline_model_names[id(nested_fields)] = anonymous_name
+        if anonymous_name not in api.models:
+            api.model(anonymous_name, nested_fields)
+
+    def model_name_for(nested_fields: dict[object, object]) -> str:
+        anonymous_name = inline_model_names.get(id(nested_fields))
+        if anonymous_name is None:
+            anonymous_name = _inline_model_name(nested_fields)
+            inline_model_names[id(nested_fields)] = anonymous_name
+            if anonymous_name not in api.models:
+                api.model(anonymous_name, nested_fields)
+        return anonymous_name
+
+    def materialize_field(field: object) -> None:
+        field_instance = instance(field)
+        if isinstance(field_instance, fields.Nested):
+            nested = getattr(field_instance, "nested", None)
+            if _is_inline_field_map(nested):
+                field_instance.model = api.models[model_name_for(nested)]  # type: ignore[attr-defined]
+
+        container = getattr(field_instance, "container", None)
+        if container is not None:
+            materialize_field(container)
+
+    index = 0
+    while index < len(api.models):
+        model = list(api.models.values())[index]
+        index += 1
+        if isinstance(model, (Model, OrderedModel)):
+            for field in model.values():
+                materialize_field(field)
+
+
+def drop_null_values(value: object) -> object:
+    """Remove JSON null values that make the Markdown converter crash."""
+
+    if isinstance(value, dict):
+        return {key: drop_null_values(item) for key, item in value.items() if item is not None}
+    if isinstance(value, list):
+        return [drop_null_values(item) for item in value]
+    return value
+
+
+def sort_openapi_arrays(value: object, *, parent_key: str | None = None) -> object:
+    """Sort order-insensitive Swagger arrays so generated Markdown is stable."""
+
+    if isinstance(value, dict):
+        return {key: sort_openapi_arrays(item, parent_key=key) for key, item in value.items()}
+    if not isinstance(value, list):
+        return value
+
+    sorted_items = [sort_openapi_arrays(item, parent_key=parent_key) for item in value]
+    if parent_key == "parameters":
+        return sorted(
+            sorted_items,
+            key=lambda item: (
+                item.get("in", "") if isinstance(item, dict) else "",
+                item.get("name", "") if isinstance(item, dict) else "",
+                json.dumps(item, sort_keys=True, default=str),
+            ),
+        )
+    if parent_key in {"enum", "required", "schemes", "tags"}:
+        string_items = [item for item in sorted_items if isinstance(item, str)]
+        if len(string_items) == len(sorted_items):
+            return sorted(string_items)
+    return sorted_items
+
+
+def _merge_registered_definitions(payload: dict[str, object], namespace: str) -> dict[str, object]:
+    """Include registered but route-indirect models in the exported Swagger definitions."""
+
+    definitions = payload.setdefault("definitions", {})
+    if not isinstance(definitions, dict):
+        raise RuntimeError("unexpected Swagger definitions payload")
+
+    for name, model in _registered_models(namespace).items():
+        schema = getattr(model, "__schema__", None)
+        if isinstance(schema, dict):
+            definitions.setdefault(name, schema)
+
+    return payload
+
+
 def generate_specs(output_dir: Path) -> list[Path]:
     """Write all Swagger specs to `output_dir` and return the written paths."""
 
@@ -138,6 +334,9 @@ def generate_specs(output_dir: Path) -> list[Path]:
         payload = response.get_json()
         if not isinstance(payload, dict):
             raise RuntimeError(f"unexpected response payload for {target.route}")
+        payload = _merge_registered_definitions(payload, target.namespace)
+        payload = drop_null_values(payload)
+        payload = sort_openapi_arrays(payload)
 
         output_path = output_dir / target.filename
         output_path.write_text(json.dumps(payload, indent=2, sort_keys=True) + "\n", encoding="utf-8")
diff --git a/api/enterprise/telemetry/enterprise_trace.py b/api/enterprise/telemetry/enterprise_trace.py
index fc17d9d93e..25c1a96dc1 100644
--- a/api/enterprise/telemetry/enterprise_trace.py
+++ b/api/enterprise/telemetry/enterprise_trace.py
@@ -77,28 +77,29 @@ class EnterpriseOtelTrace:
         self._exporter = exporter
 
     def trace(self, trace_info: BaseTraceInfo) -> None:
-        if isinstance(trace_info, WorkflowTraceInfo):
-            self._workflow_trace(trace_info)
-        elif isinstance(trace_info, MessageTraceInfo):
-            self._message_trace(trace_info)
-        elif isinstance(trace_info, ToolTraceInfo):
-            self._tool_trace(trace_info)
-        elif isinstance(trace_info, DraftNodeExecutionTrace):
-            self._draft_node_execution_trace(trace_info)
-        elif isinstance(trace_info, WorkflowNodeTraceInfo):
-            self._node_execution_trace(trace_info)
-        elif isinstance(trace_info, ModerationTraceInfo):
-            self._moderation_trace(trace_info)
-        elif isinstance(trace_info, SuggestedQuestionTraceInfo):
-            self._suggested_question_trace(trace_info)
-        elif isinstance(trace_info, DatasetRetrievalTraceInfo):
-            self._dataset_retrieval_trace(trace_info)
-        elif isinstance(trace_info, GenerateNameTraceInfo):
-            self._generate_name_trace(trace_info)
-        elif isinstance(trace_info, PromptGenerationTraceInfo):
-            self._prompt_generation_trace(trace_info)
-        else:
-            raise AssertionError("this statment should be unreachable")
+        match trace_info:
+            case WorkflowTraceInfo():
+                self._workflow_trace(trace_info)
+            case MessageTraceInfo():
+                self._message_trace(trace_info)
+            case ToolTraceInfo():
+                self._tool_trace(trace_info)
+            case DraftNodeExecutionTrace():
+                self._draft_node_execution_trace(trace_info)
+            case WorkflowNodeTraceInfo():
+                self._node_execution_trace(trace_info)
+            case ModerationTraceInfo():
+                self._moderation_trace(trace_info)
+            case SuggestedQuestionTraceInfo():
+                self._suggested_question_trace(trace_info)
+            case DatasetRetrievalTraceInfo():
+                self._dataset_retrieval_trace(trace_info)
+            case GenerateNameTraceInfo():
+                self._generate_name_trace(trace_info)
+            case PromptGenerationTraceInfo():
+                self._prompt_generation_trace(trace_info)
+            case _:
+                raise AssertionError("this statment should be unreachable")
 
     def _common_attrs(self, trace_info: BaseTraceInfo) -> dict[str, Any]:
         metadata = self._metadata(trace_info)
diff --git a/api/events/event_handlers/update_provider_when_message_created.py b/api/events/event_handlers/update_provider_when_message_created.py
index 1d615f0f87..8dec5876a9 100644
--- a/api/events/event_handlers/update_provider_when_message_created.py
+++ b/api/events/event_handlers/update_provider_when_message_created.py
@@ -137,17 +137,13 @@ def handle(sender: Message, **kwargs):
         if used_quota is not None:
             match provider_configuration.system_configuration.current_quota_type:
                 case ProviderQuotaType.TRIAL:
-                    from services.credit_pool_service import CreditPoolService
-
-                    CreditPoolService.check_and_deduct_credits(
+                    _deduct_credit_pool_quota_capped(
                         tenant_id=tenant_id,
                         credits_required=used_quota,
                         pool_type="trial",
                     )
                 case ProviderQuotaType.PAID:
-                    from services.credit_pool_service import CreditPoolService
-
-                    CreditPoolService.check_and_deduct_credits(
+                    _deduct_credit_pool_quota_capped(
                         tenant_id=tenant_id,
                         credits_required=used_quota,
                         pool_type="paid",
@@ -200,6 +196,26 @@ def handle(sender: Message, **kwargs):
         raise
 
 
+def _deduct_credit_pool_quota_capped(*, tenant_id: str, credits_required: int, pool_type: str) -> None:
+    """Apply post-generation credit accounting without failing message persistence on quota exhaustion."""
+    from services.credit_pool_service import CreditPoolService
+
+    deducted_credits = CreditPoolService.deduct_credits_capped(
+        tenant_id=tenant_id,
+        credits_required=credits_required,
+        pool_type=pool_type,
+    )
+    if deducted_credits < credits_required:
+        logger.warning(
+            "Credit pool exhausted during message-created accounting, "
+            "tenant_id=%s, pool_type=%s, credits_required=%s, credits_deducted=%s",
+            tenant_id,
+            pool_type,
+            credits_required,
+            deducted_credits,
+        )
+
+
 def _calculate_quota_usage(
     *, message: Message, system_configuration: SystemConfiguration, model_name: str
 ) -> int | None:
diff --git a/api/extensions/ext_app_metrics.py b/api/extensions/ext_app_metrics.py
index 4a6490b9f0..53490c06a9 100644
--- a/api/extensions/ext_app_metrics.py
+++ b/api/extensions/ext_app_metrics.py
@@ -5,19 +5,20 @@ import threading
 from flask import Response
 
 from configs import dify_config
+from controllers.console.admin import admin_required
 from dify_app import DifyApp
 
 
 def init_app(app: DifyApp):
     @app.after_request
-    def after_request(response):  # pyright: ignore[reportUnusedFunction]
+    def after_request(response):
         """Add Version headers to the response."""
         response.headers.add("X-Version", dify_config.project.version)
         response.headers.add("X-Env", dify_config.DEPLOY_ENV)
         return response
 
     @app.route("/health")
-    def health():  # pyright: ignore[reportUnusedFunction]
+    def health():
         return Response(
             json.dumps({"pid": os.getpid(), "status": "ok", "version": dify_config.project.version}),
             status=200,
@@ -25,7 +26,8 @@ def init_app(app: DifyApp):
         )
 
     @app.route("/threads")
-    def threads():  # pyright: ignore[reportUnusedFunction]
+    @admin_required
+    def threads():
         num_threads = threading.active_count()
         threads = threading.enumerate()
 
@@ -50,7 +52,8 @@ def init_app(app: DifyApp):
         }
 
     @app.route("/db-pool-stat")
-    def pool_stat():  # pyright: ignore[reportUnusedFunction]
+    @admin_required
+    def pool_stat():
         from extensions.ext_database import db
 
         engine = db.engine
diff --git a/api/extensions/ext_database.py b/api/extensions/ext_database.py
index 2e0d4c889a..466af99b95 100644
--- a/api/extensions/ext_database.py
+++ b/api/extensions/ext_database.py
@@ -33,7 +33,7 @@ def _setup_gevent_compatibility():
         return
 
     @event.listens_for(Pool, "reset")
-    def _safe_reset(dbapi_connection, connection_record, reset_state):  # pyright: ignore[reportUnusedFunction]
+    def _safe_reset(dbapi_connection, connection_record, reset_state):
         if reset_state.terminate_only:
             return
 
diff --git a/api/extensions/ext_import_modules.py b/api/extensions/ext_import_modules.py
index 4eb363ff93..9566f430b6 100644
--- a/api/extensions/ext_import_modules.py
+++ b/api/extensions/ext_import_modules.py
@@ -2,4 +2,4 @@ from dify_app import DifyApp
 
 
 def init_app(app: DifyApp):
-    from events import event_handlers  # noqa: F401 # pyright: ignore[reportUnusedImport]
+    from events import event_handlers  # noqa: F401
diff --git a/api/extensions/ext_mail.py b/api/extensions/ext_mail.py
index 042bf8cc47..ed30e94678 100644
--- a/api/extensions/ext_mail.py
+++ b/api/extensions/ext_mail.py
@@ -67,7 +67,7 @@ class Mail:
             case _:
                 raise ValueError(f"Unsupported mail type {mail_type}")
 
-    def send(self, to: str, subject: str, html: str, from_: str | None = None):
+    def send(self, to: str, subject: str, html: str, from_: str = ""):
         if not self._client:
             raise ValueError("Mail client is not initialized")
 
diff --git a/api/extensions/ext_session_factory.py b/api/extensions/ext_session_factory.py
index 0eb43d66f4..e19ccd11e5 100644
--- a/api/extensions/ext_session_factory.py
+++ b/api/extensions/ext_session_factory.py
@@ -1,7 +1,9 @@
+from flask import Flask
+
 from core.db.session_factory import configure_session_factory
 from extensions.ext_database import db
 
 
-def init_app(app):
+def init_app(app: Flask):
     with app.app_context():
         configure_session_factory(db.engine)
diff --git a/api/extensions/ext_set_secretkey.py b/api/extensions/ext_set_secretkey.py
index dfb87c0167..ca59a2de4d 100644
--- a/api/extensions/ext_set_secretkey.py
+++ b/api/extensions/ext_set_secretkey.py
@@ -1,6 +1,13 @@
 from configs import dify_config
+from configs.secret_key import resolve_secret_key
 from dify_app import DifyApp
 
 
-def init_app(app: DifyApp):
-    app.secret_key = dify_config.SECRET_KEY
+def init_app(app: DifyApp) -> None:
+    """Resolve SECRET_KEY after config loading and before session/login setup."""
+    secret_key = dify_config.SECRET_KEY
+    if not secret_key:
+        secret_key = resolve_secret_key(secret_key)
+    dify_config.SECRET_KEY = secret_key
+    app.config["SECRET_KEY"] = secret_key
+    app.secret_key = secret_key
diff --git a/api/extensions/ext_socketio.py b/api/extensions/ext_socketio.py
index 5ed82bac8d..2fe2369e9f 100644
--- a/api/extensions/ext_socketio.py
+++ b/api/extensions/ext_socketio.py
@@ -1,5 +1,9 @@
+from typing import Any, cast
+
 import socketio  # type: ignore[reportMissingTypeStubs]
 
 from configs import dify_config
 
-sio = socketio.Server(async_mode="gevent", cors_allowed_origins=dify_config.CONSOLE_CORS_ALLOW_ORIGINS)
+# TODO: FIXME(chariri) - Casting to any because app_factory attaches the
+# current app as the `app` attribute on this - Bad.
+sio = cast(Any, socketio.Server(async_mode="gevent", cors_allowed_origins=dify_config.CONSOLE_CORS_ALLOW_ORIGINS))
diff --git a/api/extensions/logstore/aliyun_logstore.py b/api/extensions/logstore/aliyun_logstore.py
index f6a4765f14..9869e1eaf7 100644
--- a/api/extensions/logstore/aliyun_logstore.py
+++ b/api/extensions/logstore/aliyun_logstore.py
@@ -198,7 +198,7 @@ class AliyunLogStore:
         )
 
         # Append Dify identification to the existing user agent
-        original_user_agent = self.client._user_agent  # pyright: ignore[reportPrivateUsage]
+        original_user_agent = self.client._user_agent
         dify_version = dify_config.project.version
         enhanced_user_agent = f"Dify,Dify-{dify_version},{original_user_agent}"
         self.client.set_user_agent(enhanced_user_agent)
diff --git a/api/factories/file_factory/builders.py b/api/factories/file_factory/builders.py
index 1d2ad4d445..4fb976f0e7 100644
--- a/api/factories/file_factory/builders.py
+++ b/api/factories/file_factory/builders.py
@@ -298,7 +298,7 @@ def _build_from_datasource_file(
             raise ValueError(f"DatasourceFile {mapping.get('datasource_file_id')} not found")
 
         extension = "." + datasource_file.key.split(".")[-1] if "." in datasource_file.key else ".bin"
-        detected_file_type = standardize_file_type(extension="." + extension, mime_type=datasource_file.mime_type)
+        detected_file_type = standardize_file_type(extension=extension, mime_type=datasource_file.mime_type)
         file_type = _resolve_file_type(
             detected_file_type=detected_file_type,
             specified_type=mapping.get("type"),
diff --git a/api/factories/file_factory/message_files.py b/api/factories/file_factory/message_files.py
index 4b3d514238..27441bdcc1 100644
--- a/api/factories/file_factory/message_files.py
+++ b/api/factories/file_factory/message_files.py
@@ -1,11 +1,18 @@
-"""Adapters from persisted message files to graph-layer file values."""
+"""Adapters from persisted message files to graph-layer file values.
+
+Replay paths only: files in conversation history were validated at upload time,
+so these helpers deliberately do not accept (or forward) a ``FileUploadConfig`` —
+re-validation here would break replays whenever workflow ``file_upload`` config
+drifts between rounds. Mirrors ``build_file_from_stored_mapping`` in
+``models/utils/file_input_compat.py``.
+"""
 
 from __future__ import annotations
 
 from collections.abc import Sequence
 
 from core.app.file_access import FileAccessControllerProtocol
-from graphon.file import File, FileBelongsTo, FileTransferMethod, FileUploadConfig
+from graphon.file import File, FileBelongsTo, FileTransferMethod
 from models import MessageFile
 
 from .builders import build_from_mapping
@@ -15,14 +22,12 @@ def build_from_message_files(
     *,
     message_files: Sequence[MessageFile],
     tenant_id: str,
-    config: FileUploadConfig | None = None,
     access_controller: FileAccessControllerProtocol,
 ) -> Sequence[File]:
     return [
         build_from_message_file(
             message_file=message_file,
             tenant_id=tenant_id,
-            config=config,
             access_controller=access_controller,
         )
         for message_file in message_files
@@ -34,7 +39,6 @@ def build_from_message_file(
     *,
     message_file: MessageFile,
     tenant_id: str,
-    config: FileUploadConfig | None,
     access_controller: FileAccessControllerProtocol,
 ) -> File:
     mapping = {
@@ -54,6 +58,5 @@ def build_from_message_file(
     return build_from_mapping(
         mapping=mapping,
         tenant_id=tenant_id,
-        config=config,
         access_controller=access_controller,
     )
diff --git a/api/factories/file_factory/validation.py b/api/factories/file_factory/validation.py
index 4c4f6150e4..8c4e7ef1d4 100644
--- a/api/factories/file_factory/validation.py
+++ b/api/factories/file_factory/validation.py
@@ -2,9 +2,25 @@
 
 from __future__ import annotations
 
+from collections.abc import Iterable
+
 from graphon.file import FileTransferMethod, FileType, FileUploadConfig
 
 
+def _normalize_extension(extension: str) -> str:
+    s = extension.strip().lower()
+    if not s:
+        return ""
+    return s if s.startswith(".") else "." + s
+
+
+def _extension_matches(extension: str, whitelist: Iterable[str]) -> bool:
+    normalized = _normalize_extension(extension)
+    if not normalized:
+        return False
+    return normalized in {_normalize_extension(e) for e in whitelist}
+
+
 def is_file_valid_with_config(
     *,
     input_file_type: str,
@@ -12,22 +28,31 @@ def is_file_valid_with_config(
     file_transfer_method: FileTransferMethod,
     config: FileUploadConfig,
 ) -> bool:
-    # FIXME(QIN2DIM): Always allow tool files (files generated by the assistant/model)
-    # These are internally generated and should bypass user upload restrictions
+    """Return whether the file is allowed by the upload config.
+
+    ``allowed_file_types`` lists the buckets a file may fall into; ``CUSTOM`` is
+    a fallback bucket gated by ``allowed_file_extensions`` (case- and
+    dot-insensitive). Tool-generated files bypass user-facing config.
+    """
     if file_transfer_method == FileTransferMethod.TOOL_FILE:
         return True
 
-    if (
-        config.allowed_file_types
-        and input_file_type not in config.allowed_file_types
-        and input_file_type != FileType.CUSTOM
-    ):
+    allowed_types = config.allowed_file_types or []
+    custom_allowed = FileType.CUSTOM in allowed_types
+    type_allowed = not allowed_types or input_file_type in allowed_types
+
+    if not type_allowed and not custom_allowed:
         return False
 
+    # When the file is in the CUSTOM bucket, the extension whitelist is authoritative.
+    # An explicitly set whitelist (including the empty list) is enforced; empty == deny —
+    # the UI never submits an empty list, so this guards against DSL/API paths that
+    # bypass the UI from accidentally widening the allowlist.
+    in_custom_bucket = input_file_type == FileType.CUSTOM or not type_allowed
     if (
-        input_file_type == FileType.CUSTOM
+        in_custom_bucket
         and config.allowed_file_extensions is not None
-        and file_extension not in config.allowed_file_extensions
+        and not _extension_matches(file_extension, config.allowed_file_extensions)
     ):
         return False
 
diff --git a/api/fields/annotation_fields.py b/api/fields/annotation_fields.py
index b2a0e92c47..4546a051cc 100644
--- a/api/fields/annotation_fields.py
+++ b/api/fields/annotation_fields.py
@@ -5,12 +5,7 @@ from datetime import datetime
 from pydantic import Field, field_validator
 
 from fields.base import ResponseModel
-
-
-def _to_timestamp(value: datetime | int | None) -> int | None:
-    if isinstance(value, datetime):
-        return int(value.timestamp())
-    return value
+from libs.helper import to_timestamp
 
 
 class Annotation(ResponseModel):
@@ -23,7 +18,7 @@ class Annotation(ResponseModel):
     @field_validator("created_at", mode="before")
     @classmethod
     def _normalize_created_at(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 class AnnotationList(ResponseModel):
@@ -50,7 +45,7 @@ class AnnotationHitHistory(ResponseModel):
     @field_validator("created_at", mode="before")
     @classmethod
     def _normalize_created_at(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 class AnnotationHitHistoryList(ResponseModel):
diff --git a/api/fields/conversation_fields.py b/api/fields/conversation_fields.py
index bf5c9ffcb1..eb49577d59 100644
--- a/api/fields/conversation_fields.py
+++ b/api/fields/conversation_fields.py
@@ -7,6 +7,7 @@ from pydantic import Field, field_validator, model_validator
 
 from fields.base import ResponseModel
 from graphon.file import File
+from libs.helper import to_timestamp
 
 type JSONValue = Any
 
@@ -47,9 +48,7 @@ class SimpleConversation(ResponseModel):
     @field_validator("created_at", "updated_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        if isinstance(value, datetime):
-            return to_timestamp(value)
-        return value
+        return to_timestamp(value)
 
 
 class ConversationInfiniteScrollPagination(ResponseModel):
@@ -90,9 +89,7 @@ class ConversationAnnotation(ResponseModel):
     @field_validator("created_at", mode="before")
     @classmethod
     def _normalize_created_at(cls, value: datetime | int | None) -> int | None:
-        if isinstance(value, datetime):
-            return to_timestamp(value)
-        return value
+        return to_timestamp(value)
 
 
 class ConversationAnnotationHitHistory(ResponseModel):
@@ -103,9 +100,7 @@ class ConversationAnnotationHitHistory(ResponseModel):
     @field_validator("created_at", mode="before")
     @classmethod
     def _normalize_created_at(cls, value: datetime | int | None) -> int | None:
-        if isinstance(value, datetime):
-            return to_timestamp(value)
-        return value
+        return to_timestamp(value)
 
 
 class AgentThought(ResponseModel):
@@ -125,9 +120,7 @@ class AgentThought(ResponseModel):
     @field_validator("created_at", mode="before")
     @classmethod
     def _normalize_created_at(cls, value: datetime | int | None) -> int | None:
-        if isinstance(value, datetime):
-            return to_timestamp(value)
-        return value
+        return to_timestamp(value)
 
     @model_validator(mode="after")
     def _fallback_chain_id(self):
@@ -169,9 +162,7 @@ class MessageDetail(ResponseModel):
     @field_validator("created_at", mode="before")
     @classmethod
     def _normalize_created_at(cls, value: datetime | int | None) -> int | None:
-        if isinstance(value, datetime):
-            return to_timestamp(value)
-        return value
+        return to_timestamp(value)
 
 
 class FeedbackStat(ResponseModel):
@@ -237,9 +228,7 @@ class Conversation(ResponseModel):
     @field_validator("read_at", "created_at", "updated_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        if isinstance(value, datetime):
-            return to_timestamp(value)
-        return value
+        return to_timestamp(value)
 
 
 class ConversationPagination(ResponseModel):
@@ -263,9 +252,7 @@ class ConversationMessageDetail(ResponseModel):
     @field_validator("created_at", mode="before")
     @classmethod
     def _normalize_created_at(cls, value: datetime | int | None) -> int | None:
-        if isinstance(value, datetime):
-            return to_timestamp(value)
-        return value
+        return to_timestamp(value)
 
 
 class ConversationWithSummary(ResponseModel):
@@ -291,9 +278,7 @@ class ConversationWithSummary(ResponseModel):
     @field_validator("read_at", "created_at", "updated_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        if isinstance(value, datetime):
-            return to_timestamp(value)
-        return value
+        return to_timestamp(value)
 
 
 class ConversationWithSummaryPagination(ResponseModel):
@@ -322,15 +307,7 @@ class ConversationDetail(ResponseModel):
     @field_validator("created_at", "updated_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        if isinstance(value, datetime):
-            return to_timestamp(value)
-        return value
-
-
-def to_timestamp(value: datetime | None) -> int | None:
-    if value is None:
-        return None
-    return int(value.timestamp())
+        return to_timestamp(value)
 
 
 def format_files_contained(value: JSONValue) -> JSONValue:
diff --git a/api/fields/conversation_variable_fields.py b/api/fields/conversation_variable_fields.py
index e4219ba1ee..05a519f3b1 100644
--- a/api/fields/conversation_variable_fields.py
+++ b/api/fields/conversation_variable_fields.py
@@ -8,7 +8,7 @@ from pydantic import field_validator
 
 from fields.base import ResponseModel
 from graphon.variables.types import SegmentType
-from libs.helper import TimestampField
+from libs.helper import TimestampField, to_timestamp
 
 from ._value_type_serializer import serialize_value_type
 
@@ -37,12 +37,6 @@ conversation_variable_infinite_scroll_pagination_fields = {
 }
 
 
-def _to_timestamp(value: datetime | int | None) -> int | None:
-    if isinstance(value, datetime):
-        return int(value.timestamp())
-    return value
-
-
 class ConversationVariableResponse(ResponseModel):
     id: str
     name: str
@@ -88,7 +82,7 @@ class ConversationVariableResponse(ResponseModel):
     @field_validator("created_at", "updated_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 class PaginatedConversationVariableResponse(ResponseModel):
diff --git a/api/fields/file_fields.py b/api/fields/file_fields.py
index ad8b95e4dc..a3987a7e40 100644
--- a/api/fields/file_fields.py
+++ b/api/fields/file_fields.py
@@ -5,12 +5,7 @@ from datetime import datetime
 from pydantic import field_validator
 
 from fields.base import ResponseModel
-
-
-def _to_timestamp(value: datetime | int | None) -> int | None:
-    if isinstance(value, datetime):
-        return int(value.timestamp())
-    return value
+from libs.helper import to_timestamp
 
 
 class UploadConfig(ResponseModel):
@@ -45,7 +40,7 @@ class FileResponse(ResponseModel):
     @field_validator("created_at", mode="before")
     @classmethod
     def _normalize_created_at(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 class RemoteFileInfo(ResponseModel):
@@ -66,7 +61,7 @@ class FileWithSignedUrl(ResponseModel):
     @field_validator("created_at", mode="before")
     @classmethod
     def _normalize_created_at(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 __all__ = [
diff --git a/api/fields/member_fields.py b/api/fields/member_fields.py
index 67b320beaa..7ae5e3b652 100644
--- a/api/fields/member_fields.py
+++ b/api/fields/member_fields.py
@@ -6,7 +6,7 @@ from flask_restx import fields
 from pydantic import computed_field, field_validator
 
 from fields.base import ResponseModel
-from graphon.file import helpers as file_helpers
+from libs.helper import build_avatar_url, to_timestamp
 
 simple_account_fields = {
     "id": fields.String,
@@ -15,20 +15,6 @@ simple_account_fields = {
 }
 
 
-def _to_timestamp(value: datetime | int | None) -> int | None:
-    if isinstance(value, datetime):
-        return int(value.timestamp())
-    return value
-
-
-def _build_avatar_url(avatar: str | None) -> str | None:
-    if avatar is None:
-        return None
-    if avatar.startswith(("http://", "https://")):
-        return avatar
-    return file_helpers.get_signed_file_url(avatar)
-
-
 class SimpleAccount(ResponseModel):
     id: str
     name: str
@@ -41,7 +27,7 @@ class _AccountAvatar(ResponseModel):
     @computed_field(return_type=str | None)  # type: ignore[prop-decorator]
     @property
     def avatar_url(self) -> str | None:
-        return _build_avatar_url(self.avatar)
+        return build_avatar_url(self.avatar)
 
 
 class Account(_AccountAvatar):
@@ -59,7 +45,7 @@ class Account(_AccountAvatar):
     @field_validator("last_login_at", "created_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 class AccountWithRole(_AccountAvatar):
@@ -75,7 +61,7 @@ class AccountWithRole(_AccountAvatar):
     @field_validator("last_login_at", "last_active_at", "created_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 class AccountWithRoleList(ResponseModel):
diff --git a/api/fields/message_fields.py b/api/fields/message_fields.py
index ca18f1c203..e0d37dd701 100644
--- a/api/fields/message_fields.py
+++ b/api/fields/message_fields.py
@@ -9,6 +9,7 @@ from core.entities.execution_extra_content import ExecutionExtraContentDomainMod
 from fields.base import ResponseModel
 from fields.conversation_fields import AgentThought, JSONValue, MessageFile
 from graphon.file import File
+from libs.helper import to_timestamp
 
 type JSONValueType = JSONValue
 
@@ -39,9 +40,7 @@ class RetrieverResource(ResponseModel):
     @field_validator("created_at", mode="before")
     @classmethod
     def _normalize_created_at(cls, value: datetime | int | None) -> int | None:
-        if isinstance(value, datetime):
-            return to_timestamp(value)
-        return value
+        return to_timestamp(value)
 
 
 class MessageListItem(ResponseModel):
@@ -68,9 +67,7 @@ class MessageListItem(ResponseModel):
     @field_validator("created_at", mode="before")
     @classmethod
     def _normalize_created_at(cls, value: datetime | int | None) -> int | None:
-        if isinstance(value, datetime):
-            return to_timestamp(value)
-        return value
+        return to_timestamp(value)
 
 
 class WebMessageListItem(MessageListItem):
@@ -106,9 +103,7 @@ class SavedMessageItem(ResponseModel):
     @field_validator("created_at", mode="before")
     @classmethod
     def _normalize_created_at(cls, value: datetime | int | None) -> int | None:
-        if isinstance(value, datetime):
-            return to_timestamp(value)
-        return value
+        return to_timestamp(value)
 
 
 class SavedMessageInfiniteScrollPagination(ResponseModel):
@@ -121,12 +116,6 @@ class SuggestedQuestionsResponse(ResponseModel):
     data: list[str]
 
 
-def to_timestamp(value: datetime | None) -> int | None:
-    if value is None:
-        return None
-    return int(value.timestamp())
-
-
 def format_files_contained(value: JSONValueType) -> JSONValueType:
     if isinstance(value, File):
         # Response payloads must preserve legacy file keys like `related_id`/`url`
diff --git a/api/fields/online_user_fields.py b/api/fields/online_user_fields.py
deleted file mode 100644
index bdbe19679c..0000000000
--- a/api/fields/online_user_fields.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from flask_restx import fields
-
-online_user_partial_fields = {
-    "user_id": fields.String,
-    "username": fields.String,
-    "avatar": fields.String,
-}
-
-workflow_online_users_fields = {
-    "app_id": fields.String,
-    "users": fields.List(fields.Nested(online_user_partial_fields)),
-}
-
-online_user_list_fields = {
-    "data": fields.List(fields.Nested(workflow_online_users_fields)),
-}
diff --git a/api/fields/workflow_app_log_fields.py b/api/fields/workflow_app_log_fields.py
index 1b2c71255d..a70f051807 100644
--- a/api/fields/workflow_app_log_fields.py
+++ b/api/fields/workflow_app_log_fields.py
@@ -17,7 +17,7 @@ from fields.workflow_run_fields import (
     workflow_run_for_archived_log_fields,
     workflow_run_for_log_fields,
 )
-from libs.helper import TimestampField
+from libs.helper import TimestampField, to_timestamp
 
 workflow_app_log_partial_fields = {
     "id": fields.String,
@@ -96,12 +96,6 @@ def build_workflow_archived_log_pagination_model(api_or_ns: Namespace):
     return api_or_ns.model("WorkflowArchivedLogPagination", copied_fields)
 
 
-def _to_timestamp(value: datetime | int | None) -> int | None:
-    if isinstance(value, datetime):
-        return int(value.timestamp())
-    return value
-
-
 class WorkflowAppLogPartialResponse(ResponseModel):
     id: str
     workflow_run: WorkflowRunForLogResponse | None = None
@@ -115,7 +109,7 @@ class WorkflowAppLogPartialResponse(ResponseModel):
     @field_validator("created_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 class WorkflowArchivedLogPartialResponse(ResponseModel):
@@ -129,7 +123,7 @@ class WorkflowArchivedLogPartialResponse(ResponseModel):
     @field_validator("created_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 class WorkflowAppLogPaginationResponse(ResponseModel):
diff --git a/api/fields/workflow_comment_fields.py b/api/fields/workflow_comment_fields.py
deleted file mode 100644
index c708dd3460..0000000000
--- a/api/fields/workflow_comment_fields.py
+++ /dev/null
@@ -1,96 +0,0 @@
-from flask_restx import fields
-
-from libs.helper import AvatarUrlField, TimestampField
-
-# basic account fields for comments
-account_fields = {
-    "id": fields.String,
-    "name": fields.String,
-    "email": fields.String,
-    "avatar_url": AvatarUrlField,
-}
-
-# Comment mention fields
-workflow_comment_mention_fields = {
-    "mentioned_user_id": fields.String,
-    "mentioned_user_account": fields.Nested(account_fields, allow_null=True),
-    "reply_id": fields.String,
-}
-
-# Comment reply fields
-workflow_comment_reply_fields = {
-    "id": fields.String,
-    "content": fields.String,
-    "created_by": fields.String,
-    "created_by_account": fields.Nested(account_fields, allow_null=True),
-    "created_at": TimestampField,
-}
-
-# Basic comment fields (for list views)
-workflow_comment_basic_fields = {
-    "id": fields.String,
-    "position_x": fields.Float,
-    "position_y": fields.Float,
-    "content": fields.String,
-    "created_by": fields.String,
-    "created_by_account": fields.Nested(account_fields, allow_null=True),
-    "created_at": TimestampField,
-    "updated_at": TimestampField,
-    "resolved": fields.Boolean,
-    "resolved_at": TimestampField,
-    "resolved_by": fields.String,
-    "resolved_by_account": fields.Nested(account_fields, allow_null=True),
-    "reply_count": fields.Integer,
-    "mention_count": fields.Integer,
-    "participants": fields.List(fields.Nested(account_fields)),
-}
-
-# Detailed comment fields (for single comment view)
-workflow_comment_detail_fields = {
-    "id": fields.String,
-    "position_x": fields.Float,
-    "position_y": fields.Float,
-    "content": fields.String,
-    "created_by": fields.String,
-    "created_by_account": fields.Nested(account_fields, allow_null=True),
-    "created_at": TimestampField,
-    "updated_at": TimestampField,
-    "resolved": fields.Boolean,
-    "resolved_at": TimestampField,
-    "resolved_by": fields.String,
-    "resolved_by_account": fields.Nested(account_fields, allow_null=True),
-    "replies": fields.List(fields.Nested(workflow_comment_reply_fields)),
-    "mentions": fields.List(fields.Nested(workflow_comment_mention_fields)),
-}
-
-# Comment creation response fields (simplified)
-workflow_comment_create_fields = {
-    "id": fields.String,
-    "created_at": TimestampField,
-}
-
-# Comment update response fields (simplified)
-workflow_comment_update_fields = {
-    "id": fields.String,
-    "updated_at": TimestampField,
-}
-
-# Comment resolve response fields
-workflow_comment_resolve_fields = {
-    "id": fields.String,
-    "resolved": fields.Boolean,
-    "resolved_at": TimestampField,
-    "resolved_by": fields.String,
-}
-
-# Reply creation response fields (simplified)
-workflow_comment_reply_create_fields = {
-    "id": fields.String,
-    "created_at": TimestampField,
-}
-
-# Reply update response fields
-workflow_comment_reply_update_fields = {
-    "id": fields.String,
-    "updated_at": TimestampField,
-}
diff --git a/api/fields/workflow_run_fields.py b/api/fields/workflow_run_fields.py
index 8c659086ed..53cdfa234f 100644
--- a/api/fields/workflow_run_fields.py
+++ b/api/fields/workflow_run_fields.py
@@ -1,15 +1,22 @@
+"""Workflow run response schemas for console APIs.
+
+Most workflow-run endpoints should document and serialize responses with the
+Pydantic models in this module. The remaining Flask-RESTX field dictionaries are
+kept only for workflow app-log endpoints that still build legacy log models.
+"""
+
 from __future__ import annotations
 
 from datetime import datetime
 from typing import Any
 
 from flask_restx import Namespace, fields
-from pydantic import Field, field_validator
+from pydantic import AliasChoices, Field, field_validator
 
 from fields.base import ResponseModel
-from fields.end_user_fields import SimpleEndUser, simple_end_user_fields
-from fields.member_fields import SimpleAccount, simple_account_fields
-from libs.helper import TimestampField
+from fields.end_user_fields import SimpleEndUser
+from fields.member_fields import SimpleAccount
+from libs.helper import TimestampField, to_timestamp
 
 workflow_run_for_log_fields = {
     "id": fields.String,
@@ -43,125 +50,6 @@ def build_workflow_run_for_archived_log_model(api_or_ns: Namespace):
     return api_or_ns.model("WorkflowRunForArchivedLog", workflow_run_for_archived_log_fields)
 
 
-workflow_run_for_list_fields = {
-    "id": fields.String,
-    "version": fields.String,
-    "status": fields.String,
-    "elapsed_time": fields.Float,
-    "total_tokens": fields.Integer,
-    "total_steps": fields.Integer,
-    "created_by_account": fields.Nested(simple_account_fields, attribute="created_by_account", allow_null=True),
-    "created_at": TimestampField,
-    "finished_at": TimestampField,
-    "exceptions_count": fields.Integer,
-    "retry_index": fields.Integer,
-}
-
-advanced_chat_workflow_run_for_list_fields = {
-    "id": fields.String,
-    "conversation_id": fields.String,
-    "message_id": fields.String,
-    "version": fields.String,
-    "status": fields.String,
-    "elapsed_time": fields.Float,
-    "total_tokens": fields.Integer,
-    "total_steps": fields.Integer,
-    "created_by_account": fields.Nested(simple_account_fields, attribute="created_by_account", allow_null=True),
-    "created_at": TimestampField,
-    "finished_at": TimestampField,
-    "exceptions_count": fields.Integer,
-    "retry_index": fields.Integer,
-}
-
-advanced_chat_workflow_run_pagination_fields = {
-    "limit": fields.Integer(attribute="limit"),
-    "has_more": fields.Boolean(attribute="has_more"),
-    "data": fields.List(fields.Nested(advanced_chat_workflow_run_for_list_fields), attribute="data"),
-}
-
-workflow_run_pagination_fields = {
-    "limit": fields.Integer(attribute="limit"),
-    "has_more": fields.Boolean(attribute="has_more"),
-    "data": fields.List(fields.Nested(workflow_run_for_list_fields), attribute="data"),
-}
-
-workflow_run_count_fields = {
-    "total": fields.Integer,
-    "running": fields.Integer,
-    "succeeded": fields.Integer,
-    "failed": fields.Integer,
-    "stopped": fields.Integer,
-    "partial_succeeded": fields.Integer(attribute="partial-succeeded"),
-}
-
-workflow_run_detail_fields = {
-    "id": fields.String,
-    "version": fields.String,
-    "graph": fields.Raw(attribute="graph_dict"),
-    "inputs": fields.Raw(attribute="inputs_dict"),
-    "status": fields.String,
-    "outputs": fields.Raw(attribute="outputs_dict"),
-    "error": fields.String,
-    "elapsed_time": fields.Float,
-    "total_tokens": fields.Integer,
-    "total_steps": fields.Integer,
-    "created_by_role": fields.String,
-    "created_by_account": fields.Nested(simple_account_fields, attribute="created_by_account", allow_null=True),
-    "created_by_end_user": fields.Nested(simple_end_user_fields, attribute="created_by_end_user", allow_null=True),
-    "created_at": TimestampField,
-    "finished_at": TimestampField,
-    "exceptions_count": fields.Integer,
-}
-
-retry_event_field = {
-    "elapsed_time": fields.Float,
-    "status": fields.String,
-    "inputs": fields.Raw(attribute="inputs"),
-    "process_data": fields.Raw(attribute="process_data"),
-    "outputs": fields.Raw(attribute="outputs"),
-    "metadata": fields.Raw(attribute="metadata"),
-    "llm_usage": fields.Raw(attribute="llm_usage"),
-    "error": fields.String,
-    "retry_index": fields.Integer,
-}
-
-
-workflow_run_node_execution_fields = {
-    "id": fields.String,
-    "index": fields.Integer,
-    "predecessor_node_id": fields.String,
-    "node_id": fields.String,
-    "node_type": fields.String,
-    "title": fields.String,
-    "inputs": fields.Raw(attribute="inputs_dict"),
-    "process_data": fields.Raw(attribute="process_data_dict"),
-    "outputs": fields.Raw(attribute="outputs_dict"),
-    "status": fields.String,
-    "error": fields.String,
-    "elapsed_time": fields.Float,
-    "execution_metadata": fields.Raw(attribute="execution_metadata_dict"),
-    "extras": fields.Raw,
-    "created_at": TimestampField,
-    "created_by_role": fields.String,
-    "created_by_account": fields.Nested(simple_account_fields, attribute="created_by_account", allow_null=True),
-    "created_by_end_user": fields.Nested(simple_end_user_fields, attribute="created_by_end_user", allow_null=True),
-    "finished_at": TimestampField,
-    "inputs_truncated": fields.Boolean,
-    "outputs_truncated": fields.Boolean,
-    "process_data_truncated": fields.Boolean,
-}
-
-workflow_run_node_execution_list_fields = {
-    "data": fields.List(fields.Nested(workflow_run_node_execution_fields)),
-}
-
-
-def _to_timestamp(value: datetime | int | None) -> int | None:
-    if isinstance(value, datetime):
-        return int(value.timestamp())
-    return value
-
-
 class WorkflowRunForLogResponse(ResponseModel):
     id: str
     version: str | None = None
@@ -185,7 +73,7 @@ class WorkflowRunForLogResponse(ResponseModel):
     @field_validator("created_at", "finished_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 class WorkflowRunForArchivedLogResponse(ResponseModel):
@@ -226,7 +114,7 @@ class WorkflowRunForListResponse(ResponseModel):
     @field_validator("created_at", "finished_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 class AdvancedChatWorkflowRunForListResponse(WorkflowRunForListResponse):
@@ -252,7 +140,10 @@ class WorkflowRunCountResponse(ResponseModel):
     succeeded: int
     failed: int
     stopped: int
-    partial_succeeded: int = Field(validation_alias="partial-succeeded")
+    partial_succeeded: int = Field(
+        alias="partial_succeeded",
+        validation_alias=AliasChoices("partial_succeeded", "partial-succeeded"),
+    )
 
 
 class WorkflowRunDetailResponse(ResponseModel):
@@ -283,7 +174,7 @@ class WorkflowRunDetailResponse(ResponseModel):
     @field_validator("created_at", "finished_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 class WorkflowRunNodeExecutionResponse(ResponseModel):
@@ -320,7 +211,7 @@ class WorkflowRunNodeExecutionResponse(ResponseModel):
     @field_validator("created_at", "finished_at", mode="before")
     @classmethod
     def _normalize_timestamp(cls, value: datetime | int | None) -> int | None:
-        return _to_timestamp(value)
+        return to_timestamp(value)
 
 
 class WorkflowRunNodeExecutionListResponse(ResponseModel):
diff --git a/api/libs/external_api.py b/api/libs/external_api.py
index f907d17750..64eb99a42b 100644
--- a/api/libs/external_api.py
+++ b/api/libs/external_api.py
@@ -9,6 +9,7 @@ from werkzeug.http import HTTP_STATUS_CODES
 
 from configs import dify_config
 from core.errors.error import AppInvokeQuotaExceededError
+from libs.flask_restx_compat import patch_swagger_for_inline_nested_dicts
 from libs.token import build_force_logout_cookie_headers
 
 
@@ -120,6 +121,7 @@ class ExternalApi(Api):
     }
 
     def __init__(self, app: Blueprint | Flask, *args, **kwargs):
+        patch_swagger_for_inline_nested_dicts()
         kwargs.setdefault("authorizations", self._authorizations)
         kwargs.setdefault("security", "Bearer")
         kwargs["add_specs"] = dify_config.SWAGGER_UI_ENABLED
diff --git a/api/libs/flask_restx_compat.py b/api/libs/flask_restx_compat.py
new file mode 100644
index 0000000000..34e0d586a0
--- /dev/null
+++ b/api/libs/flask_restx_compat.py
@@ -0,0 +1,149 @@
+"""Compatibility helpers for Dify's Flask-RESTX Swagger integration.
+
+These helpers are temporary bridges for legacy Flask-RESTX field contracts
+while controllers migrate their request and response documentation to Pydantic
+models. Keep the behavior centralized so live Swagger endpoints and offline
+spec export fail or succeed in the same way.
+"""
+
+import hashlib
+import json
+from typing import TypeGuard
+
+from flask import current_app
+from flask_restx import fields
+from flask_restx.model import Model, OrderedModel, instance
+from flask_restx.swagger import Swagger
+
+
+def _is_inline_field_map(value: object) -> TypeGuard[dict[object, object]]:
+    """Return whether a nested field map is an anonymous inline mapping."""
+
+    return isinstance(value, dict) and not isinstance(value, (Model, OrderedModel))
+
+
+def _jsonable_schema_value(value: object) -> object:
+    """Return a deterministic JSON-serializable representation for schema fingerprints."""
+
+    if value is None or isinstance(value, str | int | float | bool):
+        return value
+    if isinstance(value, list | tuple):
+        return [_jsonable_schema_value(item) for item in value]
+    if isinstance(value, dict):
+        return {str(key): _jsonable_schema_value(item) for key, item in value.items()}
+    value_type = type(value)
+    return f"<{value_type.__module__}.{value_type.__qualname__}>"
+
+
+def _field_signature(field: object) -> object:
+    """Build a stable signature for a Flask-RESTX field object."""
+
+    field_instance = instance(field)
+    signature: dict[str, object] = {
+        "class": f"{field_instance.__class__.__module__}.{field_instance.__class__.__qualname__}"
+    }
+
+    if isinstance(field_instance, fields.Nested):
+        nested = getattr(field_instance, "nested", None)
+        if _is_inline_field_map(nested):
+            signature["nested"] = _inline_model_signature(nested)
+        else:
+            signature["nested"] = getattr(
+                nested,
+                "name",
+                f"<{type(nested).__module__}.{type(nested).__qualname__}>",
+            )
+    elif hasattr(field_instance, "container"):
+        signature["container"] = _field_signature(field_instance.container)
+    else:
+        schema = getattr(field_instance, "__schema__", None)
+        if isinstance(schema, dict):
+            signature["schema"] = _jsonable_schema_value(schema)
+
+    for attr_name in (
+        "attribute",
+        "default",
+        "description",
+        "example",
+        "max",
+        "max_items",
+        "min",
+        "min_items",
+        "nullable",
+        "readonly",
+        "required",
+        "title",
+        "unique",
+    ):
+        if hasattr(field_instance, attr_name):
+            signature[attr_name] = _jsonable_schema_value(getattr(field_instance, attr_name))
+
+    return signature
+
+
+def _inline_model_signature(nested_fields: dict[object, object]) -> object:
+    """Build a stable signature for an anonymous inline model."""
+
+    return [
+        (str(field_name), _field_signature(field))
+        for field_name, field in sorted(nested_fields.items(), key=lambda item: str(item[0]))
+    ]
+
+
+def _inline_model_name(nested_fields: dict[object, object]) -> str:
+    """Return a stable Swagger model name for an anonymous inline field map."""
+
+    signature = json.dumps(_inline_model_signature(nested_fields), sort_keys=True, separators=(",", ":"))
+    digest = hashlib.sha1(signature.encode("utf-8")).hexdigest()[:12]
+    return f"_AnonymousInlineModel_{digest}"
+
+
+def patch_swagger_for_inline_nested_dicts() -> None:
+    """Allow Swagger generation to handle legacy inline Flask-RESTX field dicts.
+
+    Some existing controllers use raw field mappings in `fields.Nested({...})`
+    or directly in `@namespace.response(...)`. Runtime marshalling accepts that,
+    but Flask-RESTX Swagger registration expects a named model. Convert those
+    anonymous mappings into temporary named models during docs generation.
+    """
+
+    if getattr(Swagger, "_dify_inline_nested_dict_patch", False):
+        return
+
+    original_register_model = Swagger.register_model
+    original_register_field = Swagger.register_field
+    original_as_dict = Swagger.as_dict
+
+    def get_or_create_inline_model(self: Swagger, nested_fields: dict[object, object]) -> object:
+        anonymous_name = _inline_model_name(nested_fields)
+        if anonymous_name not in self.api.models:
+            self.api.model(anonymous_name, nested_fields)
+
+        return self.api.models[anonymous_name]
+
+    def register_model_with_inline_dict_support(self: Swagger, model: object) -> dict[str, str]:
+        if _is_inline_field_map(model):
+            model = get_or_create_inline_model(self, model)
+
+        return original_register_model(self, model)
+
+    def register_field_with_inline_dict_support(self: Swagger, field: object) -> None:
+        nested = getattr(field, "nested", None)
+        if _is_inline_field_map(nested):
+            field.model = get_or_create_inline_model(self, nested)  # type: ignore[attr-defined]
+
+        original_register_field(self, field)
+
+    def as_dict_with_inline_dict_support(self: Swagger):
+        # Temporary set RESTX_INCLUDE_ALL_MODELS = false to prevent "length changed while iterating" error
+        include_all_models = current_app.config.get("RESTX_INCLUDE_ALL_MODELS", False)
+        current_app.config["RESTX_INCLUDE_ALL_MODELS"] = False
+        try:
+            return original_as_dict(self)
+        finally:
+            current_app.config["RESTX_INCLUDE_ALL_MODELS"] = include_all_models
+
+    Swagger.register_model = register_model_with_inline_dict_support
+    Swagger.register_field = register_field_with_inline_dict_support
+    Swagger.as_dict = as_dict_with_inline_dict_support
+    Swagger._dify_inline_nested_dict_patch = True
diff --git a/api/libs/helper.py b/api/libs/helper.py
index ac69a11084..04900f385c 100644
--- a/api/libs/helper.py
+++ b/api/libs/helper.py
@@ -10,7 +10,7 @@ import uuid
 from collections.abc import Callable, Generator, Mapping
 from datetime import datetime
 from hashlib import sha256
-from typing import TYPE_CHECKING, Annotated, Any, Protocol, cast
+from typing import TYPE_CHECKING, Annotated, Any, Protocol, cast, overload
 from uuid import UUID
 from zoneinfo import available_timezones
 
@@ -39,6 +39,7 @@ class _TokenData(TypedDict, total=False):
     token_type: str
     code: str
     old_email: str
+    phase: str
 
 
 _token_data_adapter: TypeAdapter[_TokenData] = TypeAdapter(_TokenData)
@@ -97,12 +98,13 @@ def extract_tenant_id(user: "Account | EndUser") -> str | None:
     from models import Account
     from models.model import EndUser
 
-    if isinstance(user, Account):
-        return user.current_tenant_id
-    elif isinstance(user, EndUser):
-        return user.tenant_id
-    else:
-        raise ValueError(f"Invalid user type: {type(user)}. Expected Account or EndUser.")
+    match user:
+        case Account():
+            return user.current_tenant_id
+        case EndUser():
+            return user.tenant_id
+        case _:
+            raise ValueError(f"Invalid user type: {type(user)}. Expected Account or EndUser.")
 
 
 def run(script):
@@ -136,6 +138,14 @@ def build_icon_url(icon_type: Any, icon: str | None) -> str | None:
     return file_helpers.get_signed_file_url(icon)
 
 
+def build_avatar_url(avatar: str | None) -> str | None:
+    if avatar is None:
+        return None
+    if avatar.startswith(("http://", "https://")):
+        return avatar
+    return file_helpers.get_signed_file_url(avatar)
+
+
 class AvatarUrlField(fields.Raw):
     def output(self, key, obj, **kwargs):
         if obj is None:
@@ -144,9 +154,7 @@ class AvatarUrlField(fields.Raw):
         from models import Account
 
         if isinstance(obj, Account) and obj.avatar is not None:
-            if obj.avatar.startswith(("http://", "https://")):
-                return obj.avatar
-            return file_helpers.get_signed_file_url(obj.avatar)
+            return build_avatar_url(obj.avatar)
         return None
 
 
@@ -162,6 +170,35 @@ class OptionalTimestampField(fields.Raw):
         return int(value.timestamp())
 
 
+@overload
+def to_timestamp(value: datetime) -> int: ...
+
+
+@overload
+def to_timestamp(value: int) -> int: ...
+
+
+@overload
+def to_timestamp(value: None) -> None: ...
+
+
+def to_timestamp(value: datetime | int | None) -> int | None:
+    """Normalize API response timestamp values to epoch seconds."""
+    if isinstance(value, datetime):
+        return int(value.timestamp())
+    return value
+
+
+def dump_response(model: type[BaseModel], data: Any) -> dict[str, Any]:
+    """Serialize a Pydantic response model to JSON-compatible dict output."""
+    return model.model_validate(data, from_attributes=True).model_dump(mode="json")
+
+
+def current_timestamp() -> int:
+    """Return the current Unix timestamp in seconds."""
+    return int(time.time())
+
+
 def email(email):
     # Define a regex pattern for email addresses
     pattern = r"^[\w\.!#$%&'*+\-/=?^_`{|}~]+@([\w-]+\.)+[\w-]{2,}$"
@@ -386,18 +423,19 @@ 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):
-        return Response(
-            response=pack_response_with_length_prefix(json.dumps(jsonable_encoder(response)).encode("utf-8")),
-            status=200,
-            mimetype="application/json",
-        )
-    elif isinstance(response, BaseModel):
-        return Response(
-            response=pack_response_with_length_prefix(response.model_dump_json().encode("utf-8")),
-            status=200,
-            mimetype="application/json",
-        )
+    match response:
+        case Mapping():
+            return Response(
+                response=pack_response_with_length_prefix(json.dumps(jsonable_encoder(response)).encode("utf-8")),
+                status=200,
+                mimetype="application/json",
+            )
+        case BaseModel():
+            return Response(
+                response=pack_response_with_length_prefix(response.model_dump_json().encode("utf-8")),
+                status=200,
+                mimetype="application/json",
+            )
 
     stream_response = response
 
diff --git a/api/libs/oauth.py b/api/libs/oauth.py
index 3daaa038e0..309f2aa812 100644
--- a/api/libs/oauth.py
+++ b/api/libs/oauth.py
@@ -1,3 +1,6 @@
+import base64
+import binascii
+import json
 import logging
 import urllib.parse
 from dataclasses import dataclass
@@ -27,6 +30,12 @@ class AccessTokenResponse(TypedDict, total=False):
     access_token: str
 
 
+class OAuthState(TypedDict, total=False):
+    invite_token: str
+    timezone: str
+    language: str
+
+
 class GitHubEmailRecord(TypedDict, total=False):
     email: str
     primary: bool
@@ -46,6 +55,7 @@ class GoogleRawUserInfo(TypedDict):
 
 
 ACCESS_TOKEN_RESPONSE_ADAPTER = TypeAdapter(AccessTokenResponse)
+OAUTH_STATE_ADAPTER = TypeAdapter(OAuthState)
 GITHUB_RAW_USER_INFO_ADAPTER = TypeAdapter(GitHubRawUserInfo)
 GITHUB_EMAIL_RECORDS_ADAPTER = TypeAdapter(list[GitHubEmailRecord])
 GOOGLE_RAW_USER_INFO_ADAPTER = TypeAdapter(GoogleRawUserInfo)
@@ -58,6 +68,37 @@ class OAuthUserInfo:
     email: str
 
 
+def encode_oauth_state(
+    invite_token: str | None = None,
+    timezone: str | None = None,
+    language: str | None = None,
+) -> str | None:
+    state: OAuthState = {}
+    if invite_token:
+        state["invite_token"] = invite_token
+    if timezone:
+        state["timezone"] = timezone
+    if language:
+        state["language"] = language
+    if not state:
+        return None
+
+    raw_state = json.dumps(state, separators=(",", ":")).encode("utf-8")
+    return base64.urlsafe_b64encode(raw_state).decode("ascii").rstrip("=")
+
+
+def decode_oauth_state(state: str | None) -> OAuthState:
+    if not state:
+        return {}
+
+    try:
+        padded_state = state + "=" * (-len(state) % 4)
+        raw_state = base64.urlsafe_b64decode(padded_state.encode("ascii")).decode("utf-8")
+        return OAUTH_STATE_ADAPTER.validate_python(json.loads(raw_state))
+    except (binascii.Error, ValueError, UnicodeDecodeError, json.JSONDecodeError, ValidationError):
+        return {}
+
+
 def _json_object(response: httpx.Response) -> JsonObject:
     return JSON_OBJECT_ADAPTER.validate_python(response.json())
 
@@ -76,7 +117,12 @@ class OAuth:
         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,
+        invite_token: str | None = None,
+        timezone: str | None = None,
+        language: str | None = None,
+    ) -> str:
         raise NotImplementedError()
 
     def get_access_token(self, code: str) -> str:
@@ -99,14 +145,20 @@ 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,
+        timezone: str | None = None,
+        language: str | None = None,
+    ) -> str:
         params = {
             "client_id": self.client_id,
             "redirect_uri": self.redirect_uri,
             "scope": "user:email",  # Request only basic user information
         }
-        if invite_token:
-            params["state"] = invite_token
+        state = encode_oauth_state(invite_token=invite_token, timezone=timezone, language=language)
+        if state:
+            params["state"] = state
         return f"{self._AUTH_URL}?{urllib.parse.urlencode(params)}"
 
     def get_access_token(self, code: str) -> str:
@@ -186,15 +238,21 @@ 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,
+        timezone: str | None = None,
+        language: str | None = None,
+    ) -> str:
         params = {
             "client_id": self.client_id,
             "response_type": "code",
             "redirect_uri": self.redirect_uri,
             "scope": "openid email",
         }
-        if invite_token:
-            params["state"] = invite_token
+        state = encode_oauth_state(invite_token=invite_token, timezone=timezone, language=language)
+        if state:
+            params["state"] = state
         return f"{self._AUTH_URL}?{urllib.parse.urlencode(params)}"
 
     def get_access_token(self, code: str) -> str:
diff --git a/api/libs/typing.py b/api/libs/typing.py
deleted file mode 100644
index f84e9911e0..0000000000
--- a/api/libs/typing.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from typing import TypeGuard
-
-
-def is_str_dict(v: object) -> TypeGuard[dict[str, object]]:
-    return isinstance(v, dict)
-
-
-def is_str(v: object) -> TypeGuard[str]:
-    return isinstance(v, str)
diff --git a/api/migrations/versions/2026_04_29_1200-a4f2d8c9b731_add_recommended_app_categories.py b/api/migrations/versions/2026_04_29_1200-a4f2d8c9b731_add_recommended_app_categories.py
new file mode 100644
index 0000000000..eee58b6310
--- /dev/null
+++ b/api/migrations/versions/2026_04_29_1200-a4f2d8c9b731_add_recommended_app_categories.py
@@ -0,0 +1,26 @@
+"""add recommended app categories
+
+Revision ID: a4f2d8c9b731
+Revises: 227822d22895
+Create Date: 2026-04-29 12:00:00.000000
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "a4f2d8c9b731"
+down_revision = "227822d22895"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    with op.batch_alter_table("recommended_apps", schema=None) as batch_op:
+        batch_op.add_column(sa.Column("categories", sa.JSON(), nullable=True))
+
+
+def downgrade():
+    with op.batch_alter_table("recommended_apps", schema=None) as batch_op:
+        batch_op.drop_column("categories")
diff --git a/api/models/comment.py b/api/models/comment.py
index 5d4a08e783..6d151fe13d 100644
--- a/api/models/comment.py
+++ b/api/models/comment.py
@@ -1,19 +1,22 @@
 """Workflow comment models."""
 
+from __future__ import annotations
+
 from datetime import datetime
-from typing import Optional
 
 import sqlalchemy as sa
 from sqlalchemy import Index, func
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
+from models.base import TypeBase
+
 from .account import Account
-from .base import Base, gen_uuidv7_string
+from .base import gen_uuidv7_string
 from .engine import db
 from .types import StringUUID
 
 
-class WorkflowComment(Base):
+class WorkflowComment(TypeBase):
     """Workflow comment model for canvas commenting functionality.
 
     Comments are associated with apps rather than specific workflow versions,
@@ -42,27 +45,33 @@ class WorkflowComment(Base):
         Index("workflow_comments_created_at_idx", "created_at"),
     )
 
-    id: Mapped[str] = mapped_column(StringUUID, default=gen_uuidv7_string)
+    id: Mapped[str] = mapped_column(StringUUID, default_factory=gen_uuidv7_string, init=False)
     tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
     app_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
     position_x: Mapped[float] = mapped_column(sa.Float)
     position_y: Mapped[float] = mapped_column(sa.Float)
     content: Mapped[str] = mapped_column(sa.Text, nullable=False)
     created_by: Mapped[str] = mapped_column(StringUUID, nullable=False)
-    created_at: Mapped[datetime] = mapped_column(sa.DateTime, nullable=False, server_default=func.current_timestamp())
+    created_at: Mapped[datetime] = mapped_column(
+        sa.DateTime, nullable=False, server_default=func.current_timestamp(), init=False
+    )
     updated_at: Mapped[datetime] = mapped_column(
-        sa.DateTime, nullable=False, server_default=func.current_timestamp(), onupdate=func.current_timestamp()
+        sa.DateTime,
+        nullable=False,
+        server_default=func.current_timestamp(),
+        onupdate=func.current_timestamp(),
+        init=False,
     )
-    resolved: Mapped[bool] = mapped_column(sa.Boolean, nullable=False, server_default=sa.text("false"))
-    resolved_at: Mapped[datetime | None] = mapped_column(sa.DateTime)
-    resolved_by: Mapped[str | None] = mapped_column(StringUUID)
+    resolved_at: Mapped[datetime | None] = mapped_column(sa.DateTime, default=None)
+    resolved_by: Mapped[str | None] = mapped_column(StringUUID, default=None)
 
+    resolved: Mapped[bool] = mapped_column(sa.Boolean, nullable=False, server_default=sa.text("false"), default=False)
     # Relationships
-    replies: Mapped[list["WorkflowCommentReply"]] = relationship(
-        "WorkflowCommentReply", back_populates="comment", cascade="all, delete-orphan"
+    replies: Mapped[list[WorkflowCommentReply]] = relationship(
+        lambda: WorkflowCommentReply, back_populates="comment", cascade="all, delete-orphan", init=False
     )
-    mentions: Mapped[list["WorkflowCommentMention"]] = relationship(
-        "WorkflowCommentMention", back_populates="comment", cascade="all, delete-orphan"
+    mentions: Mapped[list[WorkflowCommentMention]] = relationship(
+        lambda: WorkflowCommentMention, back_populates="comment", cascade="all, delete-orphan", init=False
     )
 
     @property
@@ -131,7 +140,7 @@ class WorkflowComment(Base):
         return participants
 
 
-class WorkflowCommentReply(Base):
+class WorkflowCommentReply(TypeBase):
     """Workflow comment reply model.
 
     Attributes:
@@ -149,18 +158,24 @@ class WorkflowCommentReply(Base):
         Index("comment_replies_created_at_idx", "created_at"),
     )
 
-    id: Mapped[str] = mapped_column(StringUUID, default=gen_uuidv7_string)
+    id: Mapped[str] = mapped_column(StringUUID, default_factory=gen_uuidv7_string, init=False)
     comment_id: Mapped[str] = mapped_column(
         StringUUID, sa.ForeignKey("workflow_comments.id", ondelete="CASCADE"), nullable=False
     )
     content: Mapped[str] = mapped_column(sa.Text, nullable=False)
     created_by: Mapped[str] = mapped_column(StringUUID, nullable=False)
-    created_at: Mapped[datetime] = mapped_column(sa.DateTime, nullable=False, server_default=func.current_timestamp())
+    created_at: Mapped[datetime] = mapped_column(
+        sa.DateTime, nullable=False, server_default=func.current_timestamp(), init=False
+    )
     updated_at: Mapped[datetime] = mapped_column(
-        sa.DateTime, nullable=False, server_default=func.current_timestamp(), onupdate=func.current_timestamp()
+        sa.DateTime,
+        nullable=False,
+        server_default=func.current_timestamp(),
+        onupdate=func.current_timestamp(),
+        init=False,
     )
     # Relationships
-    comment: Mapped["WorkflowComment"] = relationship("WorkflowComment", back_populates="replies")
+    comment: Mapped[WorkflowComment] = relationship(lambda: WorkflowComment, back_populates="replies", init=False)
 
     @property
     def created_by_account(self):
@@ -174,7 +189,7 @@ class WorkflowCommentReply(Base):
         self._created_by_account_cache = account
 
 
-class WorkflowCommentMention(Base):
+class WorkflowCommentMention(TypeBase):
     """Workflow comment mention model.
 
     Mentions are only for internal accounts since end users
@@ -194,18 +209,18 @@ class WorkflowCommentMention(Base):
         Index("comment_mentions_user_idx", "mentioned_user_id"),
     )
 
-    id: Mapped[str] = mapped_column(StringUUID, default=gen_uuidv7_string)
+    id: Mapped[str] = mapped_column(StringUUID, default_factory=gen_uuidv7_string, init=False)
     comment_id: Mapped[str] = mapped_column(
         StringUUID, sa.ForeignKey("workflow_comments.id", ondelete="CASCADE"), nullable=False
     )
-    reply_id: Mapped[str | None] = mapped_column(
-        StringUUID, sa.ForeignKey("workflow_comment_replies.id", ondelete="CASCADE"), nullable=True
-    )
     mentioned_user_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
+    reply_id: Mapped[str | None] = mapped_column(
+        StringUUID, sa.ForeignKey("workflow_comment_replies.id", ondelete="CASCADE"), nullable=True, default=None
+    )
 
     # Relationships
-    comment: Mapped["WorkflowComment"] = relationship("WorkflowComment", back_populates="mentions")
-    reply: Mapped[Optional["WorkflowCommentReply"]] = relationship("WorkflowCommentReply")
+    comment: Mapped[WorkflowComment] = relationship(lambda: WorkflowComment, back_populates="mentions", init=False)
+    reply: Mapped[WorkflowCommentReply | None] = relationship(lambda: WorkflowCommentReply, init=False)
 
     @property
     def mentioned_user_account(self):
diff --git a/api/models/dataset.py b/api/models/dataset.py
index a00e9f7640..8137ed4ff3 100644
--- a/api/models/dataset.py
+++ b/api/models/dataset.py
@@ -8,10 +8,9 @@ import os
 import pickle
 import re
 import time
-from collections.abc import Sequence
 from datetime import datetime
 from json import JSONDecodeError
-from typing import Any, TypedDict, cast
+from typing import Any, ClassVar, TypedDict, cast
 from uuid import uuid4
 
 import sqlalchemy as sa
@@ -24,7 +23,7 @@ from core.rag.index_processor.constant.built_in_field import BuiltInField, Metad
 from core.rag.index_processor.constant.index_type import IndexStructureType, IndexTechniqueType
 from core.rag.index_processor.constant.query_type import QueryType
 from core.rag.retrieval.retrieval_methods import RetrievalMethod
-from core.tools.signature import sign_upload_file
+from core.tools.signature import sign_upload_file_preview_url
 from extensions.ext_storage import storage
 from libs.uuid_utils import uuidv7
 
@@ -441,23 +440,27 @@ class Dataset(Base):
         return f"{dify_config.VECTOR_INDEX_NAME_PREFIX}_{normalized_dataset_id}_Node"
 
 
-class DatasetProcessRule(Base):  # bug
+class DatasetProcessRule(TypeBase):
     __tablename__ = "dataset_process_rules"
     __table_args__ = (
         sa.PrimaryKeyConstraint("id", name="dataset_process_rule_pkey"),
         sa.Index("dataset_process_rule_dataset_id_idx", "dataset_id"),
     )
 
-    id = mapped_column(StringUUID, nullable=False, default=lambda: str(uuid4()))
-    dataset_id = mapped_column(StringUUID, nullable=False)
-    mode = mapped_column(EnumText(ProcessRuleMode, length=255), nullable=False, server_default=sa.text("'automatic'"))
-    rules = mapped_column(LongText, nullable=True)
-    created_by = mapped_column(StringUUID, nullable=False)
-    created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, server_default=func.current_timestamp())
+    id: Mapped[str] = mapped_column(StringUUID, nullable=False, default_factory=lambda: str(uuid4()), init=False)
+    dataset_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
+    mode: Mapped[ProcessRuleMode] = mapped_column(
+        EnumText(ProcessRuleMode, length=255), nullable=False, server_default=sa.text("'automatic'")
+    )
+    rules: Mapped[str | None] = mapped_column(LongText, nullable=True)
+    created_by: Mapped[str] = mapped_column(StringUUID, nullable=False)
+    created_at: Mapped[datetime] = mapped_column(
+        DateTime, nullable=False, server_default=func.current_timestamp(), init=False
+    )
 
     MODES = ["automatic", "custom", "hierarchical"]
     PRE_PROCESSING_RULES = ["remove_stopwords", "remove_extra_spaces", "remove_urls_emails"]
-    AUTOMATIC_RULES: AutomaticRulesConfig = {
+    AUTOMATIC_RULES: ClassVar[AutomaticRulesConfig] = {
         "pre_processing_rules": [
             {"id": "remove_extra_spaces", "enabled": True},
             {"id": "remove_urls_emails", "enabled": False},
@@ -827,7 +830,7 @@ class Document(Base):
         )
 
 
-class DocumentSegment(Base):
+class DocumentSegment(TypeBase):
     __tablename__ = "document_segments"
     __table_args__ = (
         sa.PrimaryKeyConstraint("id", name="document_segment_pkey"),
@@ -840,35 +843,40 @@ class DocumentSegment(Base):
     )
 
     # initial fields
-    id = mapped_column(StringUUID, nullable=False, default=lambda: str(uuid4()))
-    tenant_id = mapped_column(StringUUID, nullable=False)
-    dataset_id = mapped_column(StringUUID, nullable=False)
-    document_id = mapped_column(StringUUID, nullable=False)
+    id: Mapped[str] = mapped_column(StringUUID, nullable=False, default_factory=lambda: str(uuid4()), init=False)
+    tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
+    dataset_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
+    document_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
     position: Mapped[int]
-    content = mapped_column(LongText, nullable=False)
-    answer = mapped_column(LongText, nullable=True)
+    content: Mapped[str] = mapped_column(LongText, nullable=False)
     word_count: Mapped[int]
     tokens: Mapped[int]
 
-    # indexing fields
-    keywords = mapped_column(sa.JSON, nullable=True)
-    index_node_id = mapped_column(String(255), nullable=True)
-    index_node_hash = mapped_column(String(255), nullable=True)
-
+    created_by: Mapped[str] = mapped_column(StringUUID, nullable=False)
     # basic fields
+    # indexing fields
+    index_node_id: Mapped[str | None] = mapped_column(String(255), nullable=True, default=None)
+    index_node_hash: Mapped[str | None] = mapped_column(String(255), nullable=True, default=None)
+    enabled: Mapped[bool] = mapped_column(sa.Boolean, nullable=False, server_default=sa.text("true"), default=True)
+    answer: Mapped[str | None] = mapped_column(LongText, nullable=True, default=None)
+    keywords: Mapped[Any] = mapped_column(sa.JSON, nullable=True, default=None)
+    disabled_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True, default=None)
+    disabled_by: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)
+    status: Mapped[SegmentStatus] = mapped_column(
+        EnumText(SegmentStatus, length=255), server_default=sa.text("'waiting'"), default=SegmentStatus.WAITING
+    )
+    created_at: Mapped[datetime] = mapped_column(
+        DateTime, nullable=False, server_default=func.current_timestamp(), init=False
+    )
+    updated_by: Mapped[str | None] = mapped_column(StringUUID, nullable=True, default=None)
+    updated_at: Mapped[datetime] = mapped_column(
+        DateTime, nullable=False, server_default=func.current_timestamp(), init=False
+    )
+    indexing_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True, default=None)
+    completed_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True, default=None)
+    error: Mapped[str | None] = mapped_column(LongText, nullable=True, default=None)
+    stopped_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True, default=None)
     hit_count: Mapped[int] = mapped_column(sa.Integer, nullable=False, default=0)
-    enabled: Mapped[bool] = mapped_column(sa.Boolean, nullable=False, server_default=sa.text("true"))
-    disabled_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
-    disabled_by = mapped_column(StringUUID, nullable=True)
-    status: Mapped[str] = mapped_column(EnumText(SegmentStatus, length=255), server_default=sa.text("'waiting'"))
-    created_by = mapped_column(StringUUID, nullable=False)
-    created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, server_default=func.current_timestamp())
-    updated_by = mapped_column(StringUUID, nullable=True)
-    updated_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, server_default=func.current_timestamp())
-    indexing_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
-    completed_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
-    error = mapped_column(LongText, nullable=True)
-    stopped_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
 
     @property
     def dataset(self):
@@ -895,7 +903,7 @@ class DocumentSegment(Base):
         )
 
     @property
-    def child_chunks(self) -> Sequence[Any]:
+    def child_chunks(self):
         if not self.document:
             return []
         process_rule = self.document.dataset_process_rule
@@ -910,7 +918,7 @@ class DocumentSegment(Base):
                     return child_chunks or []
         return []
 
-    def get_child_chunks(self) -> Sequence[Any]:
+    def get_child_chunks(self):
         if not self.document:
             return []
         process_rule = self.document.dataset_process_rule
@@ -941,7 +949,7 @@ class DocumentSegment(Base):
             nonce = os.urandom(16).hex()
             timestamp = str(int(time.time()))
             data_to_sign = f"image-preview|{upload_file_id}|{timestamp}|{nonce}"
-            secret_key = dify_config.SECRET_KEY.encode() if dify_config.SECRET_KEY else b""
+            secret_key = dify_config.SECRET_KEY.encode()
             sign = hmac.new(secret_key, data_to_sign.encode(), hashlib.sha256).digest()
             encoded_sign = base64.urlsafe_b64encode(sign).decode()
 
@@ -958,7 +966,7 @@ class DocumentSegment(Base):
             nonce = os.urandom(16).hex()
             timestamp = str(int(time.time()))
             data_to_sign = f"file-preview|{upload_file_id}|{timestamp}|{nonce}"
-            secret_key = dify_config.SECRET_KEY.encode() if dify_config.SECRET_KEY else b""
+            secret_key = dify_config.SECRET_KEY.encode()
             sign = hmac.new(secret_key, data_to_sign.encode(), hashlib.sha256).digest()
             encoded_sign = base64.urlsafe_b64encode(sign).decode()
 
@@ -977,7 +985,7 @@ class DocumentSegment(Base):
             nonce = os.urandom(16).hex()
             timestamp = str(int(time.time()))
             data_to_sign = f"file-preview|{upload_file_id}|{timestamp}|{nonce}"
-            secret_key = dify_config.SECRET_KEY.encode() if dify_config.SECRET_KEY else b""
+            secret_key = dify_config.SECRET_KEY.encode()
             sign = hmac.new(secret_key, data_to_sign.encode(), hashlib.sha256).digest()
             encoded_sign = base64.urlsafe_b64encode(sign).decode()
 
@@ -1015,12 +1023,12 @@ class DocumentSegment(Base):
             nonce = os.urandom(16).hex()
             timestamp = str(int(time.time()))
             data_to_sign = f"image-preview|{upload_file_id}|{timestamp}|{nonce}"
-            secret_key = dify_config.SECRET_KEY.encode() if dify_config.SECRET_KEY else b""
+            secret_key = dify_config.SECRET_KEY.encode()
             sign = hmac.new(secret_key, data_to_sign.encode(), hashlib.sha256).digest()
             encoded_sign = base64.urlsafe_b64encode(sign).decode()
 
             params = f"timestamp={timestamp}&nonce={nonce}&sign={encoded_sign}"
-            reference_url = dify_config.CONSOLE_API_URL or ""
+            reference_url = dify_config.FILES_URL or dify_config.CONSOLE_API_URL or ""
             base_url = f"{reference_url}/files/{upload_file_id}/image-preview"
             source_url = f"{base_url}?{params}"
             attachment_list.append(
@@ -1162,7 +1170,7 @@ class DatasetQuery(TypeBase):
                                 "size": file_info.size,
                                 "extension": file_info.extension,
                                 "mime_type": file_info.mime_type,
-                                "source_url": sign_upload_file(file_info.id, file_info.extension),
+                                "source_url": sign_upload_file_preview_url(file_info.id, file_info.extension),
                             }
                     else:
                         query["file_info"] = None
diff --git a/api/models/model.py b/api/models/model.py
index 25c330b062..f7f90465cf 100644
--- a/api/models/model.py
+++ b/api/models/model.py
@@ -878,6 +878,7 @@ class RecommendedApp(TypeBase):
     copyright: Mapped[str] = mapped_column(String(255), nullable=False)
     privacy_policy: Mapped[str] = mapped_column(String(255), nullable=False)
     category: Mapped[str] = mapped_column(String(255), nullable=False)
+    categories: Mapped[list[str] | None] = mapped_column(sa.JSON, nullable=True, default=None)
     custom_disclaimer: Mapped[str] = mapped_column(LongText, default="")
     position: Mapped[int] = mapped_column(sa.Integer, nullable=False, default=0)
     is_listed: Mapped[bool] = mapped_column(sa.Boolean, nullable=False, default=True)
diff --git a/api/models/provider.py b/api/models/provider.py
index 2bb67d605b..8dc3ce4ff6 100644
--- a/api/models/provider.py
+++ b/api/models/provider.py
@@ -9,11 +9,11 @@ import sqlalchemy as sa
 from sqlalchemy import DateTime, String, func, select, text
 from sqlalchemy.orm import Mapped, mapped_column
 
+from core.db.session_factory import session_factory
 from graphon.model_runtime.entities.model_entities import ModelType
 from libs.uuid_utils import uuidv7
 
 from .base import TypeBase
-from .engine import db
 from .enums import CredentialSourceType, PaymentStatus, ProviderQuotaType
 from .types import EnumText, LongText, StringUUID
 
@@ -82,7 +82,8 @@ class Provider(TypeBase):
     @cached_property
     def credential(self):
         if self.credential_id:
-            return db.session.scalar(select(ProviderCredential).where(ProviderCredential.id == self.credential_id))
+            with session_factory.create_session() as session:
+                return session.scalar(select(ProviderCredential).where(ProviderCredential.id == self.credential_id))
 
     @property
     def credential_name(self):
@@ -145,9 +146,10 @@ class ProviderModel(TypeBase):
     @cached_property
     def credential(self):
         if self.credential_id:
-            return db.session.scalar(
-                select(ProviderModelCredential).where(ProviderModelCredential.id == self.credential_id)
-            )
+            with session_factory.create_session() as session:
+                return session.scalar(
+                    select(ProviderModelCredential).where(ProviderModelCredential.id == self.credential_id)
+                )
 
     @property
     def credential_name(self):
diff --git a/api/models/utils/file_input_compat.py b/api/models/utils/file_input_compat.py
index 77dcbd13d4..04aea9f7f6 100644
--- a/api/models/utils/file_input_compat.py
+++ b/api/models/utils/file_input_compat.py
@@ -48,20 +48,23 @@ def build_file_from_mapping_without_lookup(*, file_mapping: Mapping[str, Any]) -
     """Build a graph `File` directly from serialized metadata."""
 
     def _coerce_file_type(value: Any) -> FileType:
-        if isinstance(value, FileType):
-            return value
-        if isinstance(value, str):
-            return FileType.value_of(value)
-        raise ValueError("file type is required in file mapping")
+        match value:
+            case FileType():
+                return value
+            case str():
+                return FileType.value_of(value)
+            case _:
+                raise ValueError("file type is required in file mapping")
 
     mapping = dict(file_mapping)
     transfer_method_value = mapping.get("transfer_method")
-    if isinstance(transfer_method_value, FileTransferMethod):
-        transfer_method = transfer_method_value
-    elif isinstance(transfer_method_value, str):
-        transfer_method = FileTransferMethod.value_of(transfer_method_value)
-    else:
-        raise ValueError("transfer_method is required in file mapping")
+    match transfer_method_value:
+        case FileTransferMethod():
+            transfer_method = transfer_method_value
+        case str():
+            transfer_method = FileTransferMethod.value_of(transfer_method_value)
+        case _:
+            raise ValueError("transfer_method is required in file mapping")
 
     file_id = mapping.get("file_id")
     if not isinstance(file_id, str) or not file_id:
@@ -151,15 +154,15 @@ def rebuild_serialized_graph_files_without_lookup(value: Any) -> Any:
     so historical JSON blobs remain readable without reintroducing global graph
     patches or test-local coercion.
     """
-    if isinstance(value, list):
-        return [rebuild_serialized_graph_files_without_lookup(item) for item in value]
-
-    if isinstance(value, dict):
-        if maybe_file_object(value):
-            return build_file_from_mapping_without_lookup(file_mapping=value)
-        return {key: rebuild_serialized_graph_files_without_lookup(item) for key, item in value.items()}
-
-    return value
+    match value:
+        case list():
+            return [rebuild_serialized_graph_files_without_lookup(item) for item in value]
+        case dict():
+            if maybe_file_object(value):
+                return build_file_from_mapping_without_lookup(file_mapping=value)
+            return {key: rebuild_serialized_graph_files_without_lookup(item) for key, item in value.items()}
+        case _:
+            return value
 
 
 def build_file_from_stored_mapping(
diff --git a/api/openapi/markdown/console-swagger.md b/api/openapi/markdown/console-swagger.md
new file mode 100644
index 0000000000..dc055c5823
--- /dev/null
+++ b/api/openapi/markdown/console-swagger.md
@@ -0,0 +1,14728 @@
+# Console API
+Console management APIs for app configuration, monitoring, and administration
+
+## Version: 1.0
+
+### Security
+**Bearer**  
+
+| apiKey | *API Key* |
+| ------ | --------- |
+| Description | Type: Bearer {your-api-key} |
+| In | header |
+| Name | Authorization |
+
+---
+## console
+Console management API operations
+
+### /account/avatar
+
+#### GET
+##### Description
+
+Get account avatar url
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [AccountAvatarQuery](#accountavatarquery) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [AccountAvatarPayload](#accountavatarpayload) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [Account](#account) |
+
+### /account/change-email
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ChangeEmailSendPayload](#changeemailsendpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /account/change-email/check-email-unique
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [CheckEmailUniquePayload](#checkemailuniquepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /account/change-email/reset
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ChangeEmailResetPayload](#changeemailresetpayload) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [Account](#account) |
+
+### /account/change-email/validity
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ChangeEmailValidityPayload](#changeemailvaliditypayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /account/delete
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [AccountDeletePayload](#accountdeletepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /account/delete/feedback
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [AccountDeletionFeedbackPayload](#accountdeletionfeedbackpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /account/delete/verify
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /account/education
+
+#### GET
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [EducationStatusResponse](#educationstatusresponse) |
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [EducationActivatePayload](#educationactivatepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /account/education/autocomplete
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [EducationAutocompleteQuery](#educationautocompletequery) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [EducationAutocompleteResponse](#educationautocompleteresponse) |
+
+### /account/education/verify
+
+#### GET
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [EducationVerifyResponse](#educationverifyresponse) |
+
+### /account/init
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [AccountInitPayload](#accountinitpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /account/integrates
+
+#### GET
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [AccountIntegrateListResponse](#accountintegratelistresponse) |
+
+### /account/interface-language
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [AccountInterfaceLanguagePayload](#accountinterfacelanguagepayload) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [Account](#account) |
+
+### /account/interface-theme
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [AccountInterfaceThemePayload](#accountinterfacethemepayload) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [Account](#account) |
+
+### /account/name
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [AccountNamePayload](#accountnamepayload) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [Account](#account) |
+
+### /account/password
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [AccountPasswordPayload](#accountpasswordpayload) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [Account](#account) |
+
+### /account/profile
+
+#### GET
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [Account](#account) |
+
+### /account/timezone
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [AccountTimezonePayload](#accounttimezonepayload) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [Account](#account) |
+
+### /activate
+
+#### POST
+##### Description
+
+Activate account with invitation token
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ActivatePayload](#activatepayload) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Account activated successfully | [ActivationResponse](#activationresponse) |
+| 400 | Already activated or invalid token |  |
+
+### /activate/check
+
+#### GET
+##### Description
+
+Check if activation token is valid
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ActivateCheckQuery](#activatecheckquery) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [ActivationCheckResponse](#activationcheckresponse) |
+
+### /all-workspaces
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [WorkspaceListQuery](#workspacelistquery) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /api-based-extension
+
+#### GET
+##### Description
+
+Get all API-based extensions for current tenant
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [APIBasedExtensionListResponse](#apibasedextensionlistresponse) |
+
+#### POST
+##### Description
+
+Create a new API-based extension
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [APIBasedExtensionPayload](#apibasedextensionpayload) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 201 | Extension created successfully | [APIBasedExtensionResponse](#apibasedextensionresponse) |
+
+### /api-based-extension/{id}
+
+#### DELETE
+##### Description
+
+Delete API-based extension
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| id | path | Extension ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 204 | Extension deleted successfully |
+
+#### GET
+##### Description
+
+Get API-based extension by ID
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| id | path | Extension ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [APIBasedExtensionResponse](#apibasedextensionresponse) |
+
+#### POST
+##### Description
+
+Update API-based extension
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [APIBasedExtensionPayload](#apibasedextensionpayload) |
+| id | path | Extension ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Extension updated successfully | [APIBasedExtensionResponse](#apibasedextensionresponse) |
+
+### /api-key-auth/data-source
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /api-key-auth/data-source/binding
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ApiKeyAuthBindingPayload](#apikeyauthbindingpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /api-key-auth/data-source/{binding_id}
+
+#### DELETE
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| binding_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /app/prompt-templates
+
+#### GET
+##### Description
+
+Get advanced prompt templates based on app mode and model configuration
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [AdvancedPromptTemplateQuery](#advancedprompttemplatequery) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Prompt templates retrieved successfully | [ object ] |
+| 400 | Invalid request parameters |  |
+
+### /apps
+
+#### GET
+##### Summary
+
+Get app list
+
+##### Description
+
+Get list of applications with pagination and filtering
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [AppListQuery](#applistquery) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [AppPagination](#apppagination) |
+
+#### POST
+##### Summary
+
+Create app
+
+##### Description
+
+Create a new application
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [CreateAppPayload](#createapppayload) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 201 | App created successfully | [AppDetail](#appdetail) |
+| 400 | Invalid request parameters |  |
+| 403 | Insufficient permissions |  |
+
+### /apps/imports
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [AppImportPayload](#appimportpayload) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Import completed | [Import](#import) |
+| 202 | Import pending confirmation | [Import](#import) |
+| 400 | Import failed | [Import](#import) |
+
+### /apps/imports/{app_id}/check-dependencies
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Dependencies checked | [CheckDependenciesResult](#checkdependenciesresult) |
+
+### /apps/imports/{import_id}/confirm
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| import_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Import confirmed | [Import](#import) |
+| 400 | Import failed | [Import](#import) |
+
+### /apps/workflows/online-users
+
+#### POST
+##### Description
+
+Get workflow online users
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [WorkflowOnlineUsersPayload](#workflowonlineuserspayload) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Workflow online users retrieved successfully | [WorkflowOnlineUsersResponse](#workflowonlineusersresponse) |
+
+### /apps/{app_id}
+
+#### DELETE
+##### Summary
+
+Delete app
+
+##### Description
+
+Delete application
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 204 | App deleted successfully |
+| 403 | Insufficient permissions |
+
+#### GET
+##### Summary
+
+Get app detail
+
+##### Description
+
+Get application details
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [AppDetailWithSite](#appdetailwithsite) |
+
+#### PUT
+##### Summary
+
+Update app
+
+##### Description
+
+Update application details
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [UpdateAppPayload](#updateapppayload) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | App updated successfully | [AppDetailWithSite](#appdetailwithsite) |
+| 400 | Invalid request parameters |  |
+| 403 | Insufficient permissions |  |
+
+### /apps/{app_id}/advanced-chat/workflow-runs
+
+#### GET
+##### Summary
+
+Get advanced chat app workflow run list
+
+##### Description
+
+Get advanced chat workflow run list
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+| last_id | query | Last run ID for pagination | No | string |
+| limit | query | Number of items per page (1-100) | No | integer |
+| status | query | Workflow run status filter | No | string |
+| triggered_from | query | Filter by trigger source: debugging or app-run. Default: debugging | No | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Workflow runs retrieved successfully | [AdvancedChatWorkflowRunPaginationResponse](#advancedchatworkflowrunpaginationresponse) |
+
+### /apps/{app_id}/advanced-chat/workflow-runs/count
+
+#### GET
+##### Summary
+
+Get advanced chat workflow runs count statistics
+
+##### Description
+
+Get advanced chat workflow runs count statistics
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+| status | query | Workflow run status filter | No | string |
+| time_range | query | Filter by time range (optional): e.g., 7d (7 days), 4h (4 hours), 30m (30 minutes), 30s (30 seconds). Filters by created_at field. | No | string |
+| triggered_from | query | Filter by trigger source: debugging or app-run. Default: debugging | No | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Workflow runs count retrieved successfully | [WorkflowRunCountResponse](#workflowruncountresponse) |
+
+### /apps/{app_id}/advanced-chat/workflows/draft/human-input/nodes/{node_id}/form/preview
+
+#### POST
+##### Summary
+
+Preview human input form content and placeholders
+
+##### Description
+
+Get human input form preview for advanced chat workflow
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [HumanInputFormPreviewPayload](#humaninputformpreviewpayload) |
+| app_id | path | Application ID | Yes | string |
+| node_id | path | Node ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /apps/{app_id}/advanced-chat/workflows/draft/human-input/nodes/{node_id}/form/run
+
+#### POST
+##### Summary
+
+Submit human input form preview
+
+##### Description
+
+Submit human input form preview for advanced chat workflow
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [HumanInputFormSubmitPayload](#humaninputformsubmitpayload) |
+| app_id | path | Application ID | Yes | string |
+| node_id | path | Node ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /apps/{app_id}/advanced-chat/workflows/draft/iteration/nodes/{node_id}/run
+
+#### POST
+##### Summary
+
+Run draft workflow iteration node
+
+##### Description
+
+Run draft workflow iteration node for advanced chat
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [IterationNodeRunPayload](#iterationnoderunpayload) |
+| app_id | path | Application ID | Yes | string |
+| node_id | path | Node ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Iteration node run started successfully |
+| 403 | Permission denied |
+| 404 | Node not found |
+
+### /apps/{app_id}/advanced-chat/workflows/draft/loop/nodes/{node_id}/run
+
+#### POST
+##### Summary
+
+Run draft workflow loop node
+
+##### Description
+
+Run draft workflow loop node for advanced chat
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [LoopNodeRunPayload](#loopnoderunpayload) |
+| app_id | path | Application ID | Yes | string |
+| node_id | path | Node ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Loop node run started successfully |
+| 403 | Permission denied |
+| 404 | Node not found |
+
+### /apps/{app_id}/advanced-chat/workflows/draft/run
+
+#### POST
+##### Summary
+
+Run draft workflow
+
+##### Description
+
+Run draft workflow for advanced chat application
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [AdvancedChatWorkflowRunPayload](#advancedchatworkflowrunpayload) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Workflow run started successfully |
+| 400 | Invalid request parameters |
+| 403 | Permission denied |
+
+### /apps/{app_id}/agent/logs
+
+#### GET
+##### Summary
+
+Get agent logs
+
+##### Description
+
+Get agent execution logs for an application
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [AgentLogQuery](#agentlogquery) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Agent logs retrieved successfully | [ object ] |
+| 400 | Invalid request parameters |  |
+
+### /apps/{app_id}/annotation-reply/{action}
+
+#### POST
+##### Description
+
+Enable or disable annotation reply for an app
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [AnnotationReplyPayload](#annotationreplypayload) |
+| action | path | Action to perform (enable/disable) | Yes | string |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Action completed successfully |
+| 403 | Insufficient permissions |
+
+### /apps/{app_id}/annotation-reply/{action}/status/{job_id}
+
+#### GET
+##### Description
+
+Get status of annotation reply action job
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| action | path | Action type | Yes | string |
+| app_id | path | Application ID | Yes | string |
+| job_id | path | Job ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Job status retrieved successfully |
+| 403 | Insufficient permissions |
+
+### /apps/{app_id}/annotation-setting
+
+#### GET
+##### Description
+
+Get annotation settings for an app
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Annotation settings retrieved successfully |
+| 403 | Insufficient permissions |
+
+### /apps/{app_id}/annotation-settings/{annotation_setting_id}
+
+#### POST
+##### Description
+
+Update annotation settings for an app
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [AnnotationSettingUpdatePayload](#annotationsettingupdatepayload) |
+| annotation_setting_id | path | Annotation setting ID | Yes | string |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Settings updated successfully |
+| 403 | Insufficient permissions |
+
+### /apps/{app_id}/annotations
+
+#### DELETE
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### GET
+##### Description
+
+Get annotations for an app with pagination
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [AnnotationListQuery](#annotationlistquery) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Annotations retrieved successfully |
+| 403 | Insufficient permissions |
+
+#### POST
+##### Description
+
+Create a new annotation for an app
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [CreateAnnotationPayload](#createannotationpayload) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 201 | Annotation created successfully | [Annotation](#annotation) |
+| 403 | Insufficient permissions |  |
+
+### /apps/{app_id}/annotations/batch-import
+
+#### POST
+##### Description
+
+Batch import annotations from CSV file with rate limiting and security checks
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Batch import started successfully |
+| 400 | No file uploaded or too many files |
+| 403 | Insufficient permissions |
+| 413 | File too large |
+| 429 | Too many requests or concurrent imports |
+
+### /apps/{app_id}/annotations/batch-import-status/{job_id}
+
+#### GET
+##### Description
+
+Get status of batch import job
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+| job_id | path | Job ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Job status retrieved successfully |
+| 403 | Insufficient permissions |
+
+### /apps/{app_id}/annotations/count
+
+#### GET
+##### Description
+
+Get count of message annotations for the app
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Annotation count retrieved successfully | [AnnotationCountResponse](#annotationcountresponse) |
+
+### /apps/{app_id}/annotations/export
+
+#### GET
+##### Description
+
+Export all annotations for an app with CSV injection protection
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Annotations exported successfully | [AnnotationExportList](#annotationexportlist) |
+| 403 | Insufficient permissions |  |
+
+### /apps/{app_id}/annotations/{annotation_id}
+
+#### DELETE
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| annotation_id | path |  | Yes | string |
+| app_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### POST
+##### Description
+
+Update or delete an annotation
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [UpdateAnnotationPayload](#updateannotationpayload) |
+| annotation_id | path | Annotation ID | Yes | string |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Annotation updated successfully | [Annotation](#annotation) |
+| 204 | Annotation deleted successfully |  |
+| 403 | Insufficient permissions |  |
+
+### /apps/{app_id}/annotations/{annotation_id}/hit-histories
+
+#### GET
+##### Description
+
+Get hit histories for an annotation
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| annotation_id | path | Annotation ID | Yes | string |
+| app_id | path | Application ID | Yes | string |
+| limit | query | Page size | No | integer |
+| page | query | Page number | No | integer |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Hit histories retrieved successfully | [AnnotationHitHistoryList](#annotationhithistorylist) |
+| 403 | Insufficient permissions |  |
+
+### /apps/{app_id}/api-enable
+
+#### POST
+##### Description
+
+Enable or disable app API
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [AppApiStatusPayload](#appapistatuspayload) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | API status updated successfully | [AppDetail](#appdetail) |
+| 403 | Insufficient permissions |  |
+
+### /apps/{app_id}/audio-to-text
+
+#### POST
+##### Description
+
+Transcript audio to text for chat messages
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | App ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Audio transcription successful | [AudioTranscriptResponse](#audiotranscriptresponse) |
+| 400 | Bad request - No audio uploaded or unsupported type |  |
+| 413 | Audio file too large |  |
+
+### /apps/{app_id}/chat-conversations
+
+#### GET
+##### Description
+
+Get chat conversations with pagination, filtering and summary
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ChatConversationQuery](#chatconversationquery) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [ConversationWithSummaryPagination](#conversationwithsummarypagination) |
+| 403 | Insufficient permissions |  |
+
+### /apps/{app_id}/chat-conversations/{conversation_id}
+
+#### DELETE
+##### Description
+
+Delete a chat conversation
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+| conversation_id | path | Conversation ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 204 | Conversation deleted successfully |
+| 403 | Insufficient permissions |
+| 404 | Conversation not found |
+
+#### GET
+##### Description
+
+Get chat conversation details
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+| conversation_id | path | Conversation ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [ConversationDetail](#conversationdetail) |
+| 403 | Insufficient permissions |  |
+| 404 | Conversation not found |  |
+
+### /apps/{app_id}/chat-messages
+
+#### GET
+##### Description
+
+Get chat messages for a conversation with pagination
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ChatMessagesQuery](#chatmessagesquery) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [MessageInfiniteScrollPaginationResponse](#messageinfinitescrollpaginationresponse) |
+| 404 | Conversation not found |  |
+
+### /apps/{app_id}/chat-messages/{message_id}/suggested-questions
+
+#### GET
+##### Description
+
+Get suggested questions for a message
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+| message_id | path | Message ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Suggested questions retrieved successfully | [SuggestedQuestionsResponse](#suggestedquestionsresponse) |
+| 404 | Message or conversation not found |  |
+
+### /apps/{app_id}/chat-messages/{task_id}/stop
+
+#### POST
+##### Description
+
+Stop a running chat message generation
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+| task_id | path | Task ID to stop | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Task stopped successfully |
+
+### /apps/{app_id}/completion-conversations
+
+#### GET
+##### Description
+
+Get completion conversations with pagination and filtering
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [CompletionConversationQuery](#completionconversationquery) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [ConversationPagination](#conversationpagination) |
+| 403 | Insufficient permissions |  |
+
+### /apps/{app_id}/completion-conversations/{conversation_id}
+
+#### DELETE
+##### Description
+
+Delete a completion conversation
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+| conversation_id | path | Conversation ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 204 | Conversation deleted successfully |
+| 403 | Insufficient permissions |
+| 404 | Conversation not found |
+
+#### GET
+##### Description
+
+Get completion conversation details with messages
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+| conversation_id | path | Conversation ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [ConversationMessageDetail](#conversationmessagedetail) |
+| 403 | Insufficient permissions |  |
+| 404 | Conversation not found |  |
+
+### /apps/{app_id}/completion-messages
+
+#### POST
+##### Description
+
+Generate completion message for debugging
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [CompletionMessagePayload](#completionmessagepayload) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Completion generated successfully |
+| 400 | Invalid request parameters |
+| 404 | App not found |
+
+### /apps/{app_id}/completion-messages/{task_id}/stop
+
+#### POST
+##### Description
+
+Stop a running completion message generation
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+| task_id | path | Task ID to stop | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Task stopped successfully |
+
+### /apps/{app_id}/conversation-variables
+
+#### GET
+##### Description
+
+Get conversation variables for an application
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ConversationVariablesQuery](#conversationvariablesquery) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Conversation variables retrieved successfully | [PaginatedConversationVariableResponse](#paginatedconversationvariableresponse) |
+
+### /apps/{app_id}/convert-to-workflow
+
+#### POST
+##### Summary
+
+Convert basic mode of chatbot app to workflow mode
+
+##### Description
+
+Convert application to workflow mode
+Convert expert mode of chatbot app to workflow mode
+Convert Completion App to Workflow App
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ConvertToWorkflowPayload](#converttoworkflowpayload) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Application converted to workflow successfully |
+| 400 | Application cannot be converted |
+| 403 | Permission denied |
+
+### /apps/{app_id}/copy
+
+#### POST
+##### Summary
+
+Copy app
+
+##### Description
+
+Create a copy of an existing application
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [CopyAppPayload](#copyapppayload) |
+| app_id | path | Application ID to copy | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 201 | App copied successfully | [AppDetailWithSite](#appdetailwithsite) |
+| 403 | Insufficient permissions |  |
+
+### /apps/{app_id}/export
+
+#### GET
+##### Summary
+
+Export app
+
+##### Description
+
+Export application configuration as DSL
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [AppExportQuery](#appexportquery) |
+| app_id | path | Application ID to export | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | App exported successfully | [AppExportResponse](#appexportresponse) |
+| 403 | Insufficient permissions |  |
+
+### /apps/{app_id}/feedbacks
+
+#### POST
+##### Description
+
+Create or update message feedback (like/dislike)
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [MessageFeedbackPayload](#messagefeedbackpayload) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Feedback updated successfully |
+| 403 | Insufficient permissions |
+| 404 | Message not found |
+
+### /apps/{app_id}/feedbacks/export
+
+#### GET
+##### Description
+
+Export user feedback data for Google Sheets
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [FeedbackExportQuery](#feedbackexportquery) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Feedback data exported successfully |
+| 400 | Invalid parameters |
+| 500 | Internal server error |
+
+### /apps/{app_id}/icon
+
+#### POST
+##### Description
+
+Update application icon
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [AppIconPayload](#appiconpayload) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Icon updated successfully |
+| 403 | Insufficient permissions |
+
+### /apps/{app_id}/messages/{message_id}
+
+#### GET
+##### Description
+
+Get message details by ID
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+| message_id | path | Message ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Message retrieved successfully | [MessageDetailResponse](#messagedetailresponse) |
+| 404 | Message not found |  |
+
+### /apps/{app_id}/model-config
+
+#### POST
+##### Summary
+
+Modify app model config
+
+##### Description
+
+Update application model configuration
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ModelConfigRequest](#modelconfigrequest) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Model configuration updated successfully |
+| 400 | Invalid configuration |
+| 404 | App not found |
+
+### /apps/{app_id}/name
+
+#### POST
+##### Description
+
+Check if app name is available
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [AppNamePayload](#appnamepayload) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Name availability checked | [AppDetail](#appdetail) |
+
+### /apps/{app_id}/publish-to-creators-platform
+
+#### POST
+##### Summary
+
+Publish app to Creators Platform
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /apps/{app_id}/server
+
+#### GET
+##### Description
+
+Get MCP server configuration for an application
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | MCP server configuration retrieved successfully | [AppMCPServerResponse](#appmcpserverresponse) |
+
+#### POST
+##### Description
+
+Create MCP server configuration for an application
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [MCPServerCreatePayload](#mcpservercreatepayload) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 201 | MCP server configuration created successfully | [AppMCPServerResponse](#appmcpserverresponse) |
+| 403 | Insufficient permissions |  |
+
+#### PUT
+##### Description
+
+Update MCP server configuration for an application
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [MCPServerUpdatePayload](#mcpserverupdatepayload) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | MCP server configuration updated successfully | [AppMCPServerResponse](#appmcpserverresponse) |
+| 403 | Insufficient permissions |  |
+| 404 | Server not found |  |
+
+### /apps/{app_id}/site
+
+#### POST
+##### Description
+
+Update application site configuration
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [AppSiteUpdatePayload](#appsiteupdatepayload) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Site configuration updated successfully | [AppSiteResponse](#appsiteresponse) |
+| 403 | Insufficient permissions |  |
+| 404 | App not found |  |
+
+### /apps/{app_id}/site-enable
+
+#### POST
+##### Description
+
+Enable or disable app site
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [AppSiteStatusPayload](#appsitestatuspayload) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Site status updated successfully | [AppDetail](#appdetail) |
+| 403 | Insufficient permissions |  |
+
+### /apps/{app_id}/site/access-token-reset
+
+#### POST
+##### Description
+
+Reset access token for application site
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Access token reset successfully | [AppSiteResponse](#appsiteresponse) |
+| 403 | Insufficient permissions (admin/owner required) |  |
+| 404 | App or site not found |  |
+
+### /apps/{app_id}/statistics/average-response-time
+
+#### GET
+##### Description
+
+Get average response time statistics for an application
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [StatisticTimeRangeQuery](#statistictimerangequery) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Average response time statistics retrieved successfully | [ object ] |
+
+### /apps/{app_id}/statistics/average-session-interactions
+
+#### GET
+##### Description
+
+Get average session interaction statistics for an application
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [StatisticTimeRangeQuery](#statistictimerangequery) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Average session interaction statistics retrieved successfully | [ object ] |
+
+### /apps/{app_id}/statistics/daily-conversations
+
+#### GET
+##### Description
+
+Get daily conversation statistics for an application
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [StatisticTimeRangeQuery](#statistictimerangequery) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Daily conversation statistics retrieved successfully | [ object ] |
+
+### /apps/{app_id}/statistics/daily-end-users
+
+#### GET
+##### Description
+
+Get daily terminal/end-user statistics for an application
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [StatisticTimeRangeQuery](#statistictimerangequery) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Daily terminal statistics retrieved successfully | [ object ] |
+
+### /apps/{app_id}/statistics/daily-messages
+
+#### GET
+##### Description
+
+Get daily message statistics for an application
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [StatisticTimeRangeQuery](#statistictimerangequery) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Daily message statistics retrieved successfully | [ object ] |
+
+### /apps/{app_id}/statistics/token-costs
+
+#### GET
+##### Description
+
+Get daily token cost statistics for an application
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [StatisticTimeRangeQuery](#statistictimerangequery) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Daily token cost statistics retrieved successfully | [ object ] |
+
+### /apps/{app_id}/statistics/tokens-per-second
+
+#### GET
+##### Description
+
+Get tokens per second statistics for an application
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [StatisticTimeRangeQuery](#statistictimerangequery) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Tokens per second statistics retrieved successfully | [ object ] |
+
+### /apps/{app_id}/statistics/user-satisfaction-rate
+
+#### GET
+##### Description
+
+Get user satisfaction rate statistics for an application
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [StatisticTimeRangeQuery](#statistictimerangequery) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | User satisfaction rate statistics retrieved successfully | [ object ] |
+
+### /apps/{app_id}/text-to-audio
+
+#### POST
+##### Description
+
+Convert text to speech for chat messages
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [TextToSpeechPayload](#texttospeechpayload) |
+| app_id | path | App ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Text to speech conversion successful |
+| 400 | Bad request - Invalid parameters |
+
+### /apps/{app_id}/text-to-audio/voices
+
+#### GET
+##### Description
+
+Get available TTS voices for a specific language
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [TextToSpeechVoiceQuery](#texttospeechvoicequery) |
+| app_id | path | App ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | TTS voices retrieved successfully | [ object ] |
+| 400 | Invalid language parameter |  |
+
+### /apps/{app_id}/trace
+
+#### GET
+##### Summary
+
+Get app trace
+
+##### Description
+
+Get app tracing configuration
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Trace configuration retrieved successfully |
+
+#### POST
+##### Description
+
+Update app tracing configuration
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [AppTracePayload](#apptracepayload) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Trace configuration updated successfully |
+| 403 | Insufficient permissions |
+
+### /apps/{app_id}/trace-config
+
+#### DELETE
+##### Summary
+
+Delete an existing trace app configuration
+
+##### Description
+
+Delete an existing tracing configuration for an application
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [TraceProviderQuery](#traceproviderquery) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 204 | Tracing configuration deleted successfully |
+| 400 | Invalid request parameters or configuration not found |
+
+#### GET
+##### Description
+
+Get tracing configuration for an application
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [TraceProviderQuery](#traceproviderquery) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Tracing configuration retrieved successfully | object |
+| 400 | Invalid request parameters |  |
+
+#### PATCH
+##### Summary
+
+Update an existing trace app configuration
+
+##### Description
+
+Update an existing tracing configuration for an application
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [TraceConfigPayload](#traceconfigpayload) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Tracing configuration updated successfully | object |
+| 400 | Invalid request parameters or configuration not found |  |
+
+#### POST
+##### Summary
+
+Create a new trace app configuration
+
+##### Description
+
+Create a new tracing configuration for an application
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [TraceConfigPayload](#traceconfigpayload) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 201 | Tracing configuration created successfully | object |
+| 400 | Invalid request parameters or configuration already exists |  |
+
+### /apps/{app_id}/trigger-enable
+
+#### POST
+##### Summary
+
+Update app trigger (enable/disable)
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path |  | Yes | string |
+| payload | body |  | Yes | [ParserEnable](#parserenable) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [WorkflowTriggerResponse](#workflowtriggerresponse) |
+
+### /apps/{app_id}/triggers
+
+#### GET
+##### Summary
+
+Get app triggers list
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [WorkflowTriggerListResponse](#workflowtriggerlistresponse) |
+
+### /apps/{app_id}/workflow-app-logs
+
+#### GET
+##### Summary
+
+Get workflow app logs
+
+##### Description
+
+Get workflow application execution logs
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [WorkflowAppLogQuery](#workflowapplogquery) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Workflow app logs retrieved successfully | [WorkflowAppLogPaginationResponse](#workflowapplogpaginationresponse) |
+
+### /apps/{app_id}/workflow-archived-logs
+
+#### GET
+##### Summary
+
+Get workflow archived logs
+
+##### Description
+
+Get workflow archived execution logs
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [WorkflowAppLogQuery](#workflowapplogquery) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Workflow archived logs retrieved successfully | [WorkflowArchivedLogPaginationResponse](#workflowarchivedlogpaginationresponse) |
+
+### /apps/{app_id}/workflow-runs
+
+#### GET
+##### Summary
+
+Get workflow run list
+
+##### Description
+
+Get workflow run list
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+| last_id | query | Last run ID for pagination | No | string |
+| limit | query | Number of items per page (1-100) | No | integer |
+| status | query | Workflow run status filter | No | string |
+| triggered_from | query | Filter by trigger source: debugging or app-run. Default: debugging | No | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Workflow runs retrieved successfully | [WorkflowRunPaginationResponse](#workflowrunpaginationresponse) |
+
+### /apps/{app_id}/workflow-runs/count
+
+#### GET
+##### Summary
+
+Get workflow runs count statistics
+
+##### Description
+
+Get workflow runs count statistics
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+| status | query | Workflow run status filter | No | string |
+| time_range | query | Filter by time range (optional): e.g., 7d (7 days), 4h (4 hours), 30m (30 minutes), 30s (30 seconds). Filters by created_at field. | No | string |
+| triggered_from | query | Filter by trigger source: debugging or app-run. Default: debugging | No | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Workflow runs count retrieved successfully | [WorkflowRunCountResponse](#workflowruncountresponse) |
+
+### /apps/{app_id}/workflow-runs/tasks/{task_id}/stop
+
+#### POST
+##### Summary
+
+Stop workflow task
+
+##### Description
+
+Stop running workflow task
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+| task_id | path | Task ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Task stopped successfully |
+| 403 | Permission denied |
+| 404 | Task not found |
+
+### /apps/{app_id}/workflow-runs/{run_id}
+
+#### GET
+##### Summary
+
+Get workflow run detail
+
+##### Description
+
+Get workflow run detail
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+| run_id | path | Workflow run ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Workflow run detail retrieved successfully | [WorkflowRunDetailResponse](#workflowrundetailresponse) |
+| 404 | Workflow run not found |  |
+
+### /apps/{app_id}/workflow-runs/{run_id}/export
+
+#### GET
+##### Description
+
+Generate a download URL for an archived workflow run.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+| run_id | path | Workflow run ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Export URL generated | [WorkflowRunExportResponse](#workflowrunexportresponse) |
+
+### /apps/{app_id}/workflow-runs/{run_id}/node-executions
+
+#### GET
+##### Summary
+
+Get workflow run node execution list
+
+##### Description
+
+Get workflow run node execution list
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+| run_id | path | Workflow run ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Node executions retrieved successfully | [WorkflowRunNodeExecutionListResponse](#workflowrunnodeexecutionlistresponse) |
+| 404 | Workflow run not found |  |
+
+### /apps/{app_id}/workflow/comments
+
+#### GET
+##### Summary
+
+Get all comments for a workflow
+
+##### Description
+
+Get all comments for a workflow
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Comments retrieved successfully | [WorkflowCommentBasicList](#workflowcommentbasiclist) |
+
+#### POST
+##### Summary
+
+Create a new workflow comment
+
+##### Description
+
+Create a new workflow comment
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [WorkflowCommentCreatePayload](#workflowcommentcreatepayload) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 201 | Comment created successfully | [WorkflowCommentCreate](#workflowcommentcreate) |
+
+### /apps/{app_id}/workflow/comments/mention-users
+
+#### GET
+##### Summary
+
+Get all users in current tenant for mentions
+
+##### Description
+
+Get all users in current tenant for mentions
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Mentionable users retrieved successfully | [WorkflowCommentMentionUsersPayload](#workflowcommentmentionuserspayload) |
+
+### /apps/{app_id}/workflow/comments/{comment_id}
+
+#### DELETE
+##### Summary
+
+Delete a workflow comment
+
+##### Description
+
+Delete a workflow comment
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+| comment_id | path | Comment ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 204 | Comment deleted successfully |
+
+#### GET
+##### Summary
+
+Get a specific workflow comment
+
+##### Description
+
+Get a specific workflow comment
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+| comment_id | path | Comment ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Comment retrieved successfully | [WorkflowCommentDetail](#workflowcommentdetail) |
+
+#### PUT
+##### Summary
+
+Update a workflow comment
+
+##### Description
+
+Update a workflow comment
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [WorkflowCommentUpdatePayload](#workflowcommentupdatepayload) |
+| app_id | path | Application ID | Yes | string |
+| comment_id | path | Comment ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Comment updated successfully | [WorkflowCommentUpdate](#workflowcommentupdate) |
+
+### /apps/{app_id}/workflow/comments/{comment_id}/replies
+
+#### POST
+##### Summary
+
+Add a reply to a workflow comment
+
+##### Description
+
+Add a reply to a workflow comment
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [WorkflowCommentReplyPayload](#workflowcommentreplypayload) |
+| app_id | path | Application ID | Yes | string |
+| comment_id | path | Comment ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 201 | Reply created successfully | [WorkflowCommentReplyCreate](#workflowcommentreplycreate) |
+
+### /apps/{app_id}/workflow/comments/{comment_id}/replies/{reply_id}
+
+#### DELETE
+##### Summary
+
+Delete a comment reply
+
+##### Description
+
+Delete a comment reply
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+| comment_id | path | Comment ID | Yes | string |
+| reply_id | path | Reply ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 204 | Reply deleted successfully |
+
+#### PUT
+##### Summary
+
+Update a comment reply
+
+##### Description
+
+Update a comment reply
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [WorkflowCommentReplyPayload](#workflowcommentreplypayload) |
+| app_id | path | Application ID | Yes | string |
+| comment_id | path | Comment ID | Yes | string |
+| reply_id | path | Reply ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Reply updated successfully | [WorkflowCommentReplyUpdate](#workflowcommentreplyupdate) |
+
+### /apps/{app_id}/workflow/comments/{comment_id}/resolve
+
+#### POST
+##### Summary
+
+Resolve a workflow comment
+
+##### Description
+
+Resolve a workflow comment
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+| comment_id | path | Comment ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Comment resolved successfully | [WorkflowCommentResolve](#workflowcommentresolve) |
+
+### /apps/{app_id}/workflow/statistics/average-app-interactions
+
+#### GET
+##### Description
+
+Get workflow average app interaction statistics
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [WorkflowStatisticQuery](#workflowstatisticquery) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Average app interaction statistics retrieved successfully |
+
+### /apps/{app_id}/workflow/statistics/daily-conversations
+
+#### GET
+##### Description
+
+Get workflow daily runs statistics
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [WorkflowStatisticQuery](#workflowstatisticquery) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Daily runs statistics retrieved successfully |
+
+### /apps/{app_id}/workflow/statistics/daily-terminals
+
+#### GET
+##### Description
+
+Get workflow daily terminals statistics
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [WorkflowStatisticQuery](#workflowstatisticquery) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Daily terminals statistics retrieved successfully |
+
+### /apps/{app_id}/workflow/statistics/token-costs
+
+#### GET
+##### Description
+
+Get workflow daily token cost statistics
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [WorkflowStatisticQuery](#workflowstatisticquery) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Daily token cost statistics retrieved successfully |
+
+### /apps/{app_id}/workflows
+
+#### GET
+##### Summary
+
+Get published workflows
+
+##### Description
+
+Get all published workflows for an application
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [WorkflowListQuery](#workflowlistquery) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Published workflows retrieved successfully | [WorkflowPaginationResponse](#workflowpaginationresponse) |
+
+### /apps/{app_id}/workflows/default-workflow-block-configs
+
+#### GET
+##### Summary
+
+Get default block config
+
+##### Description
+
+Get default block configurations for workflow
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Default block configurations retrieved successfully |
+
+### /apps/{app_id}/workflows/default-workflow-block-configs/{block_type}
+
+#### GET
+##### Summary
+
+Get default block config
+
+##### Description
+
+Get default block configuration by type
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [DefaultBlockConfigQuery](#defaultblockconfigquery) |
+| app_id | path | Application ID | Yes | string |
+| block_type | path | Block type | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Default block configuration retrieved successfully |
+| 404 | Block type not found |
+
+### /apps/{app_id}/workflows/draft
+
+#### GET
+##### Summary
+
+Get draft workflow
+
+##### Description
+
+Get draft workflow for an application
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Draft workflow retrieved successfully | [WorkflowResponse](#workflowresponse) |
+| 404 | Draft workflow not found |  |
+
+#### POST
+##### Summary
+
+Sync draft workflow
+
+##### Description
+
+Sync draft workflow configuration
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [SyncDraftWorkflowPayload](#syncdraftworkflowpayload) |
+| app_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Draft workflow synced successfully | [SyncDraftWorkflowResponse](#syncdraftworkflowresponse) |
+| 400 | Invalid workflow configuration |  |
+| 403 | Permission denied |  |
+
+### /apps/{app_id}/workflows/draft/conversation-variables
+
+#### GET
+##### Description
+
+Get conversation variables for workflow
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Conversation variables retrieved successfully | [WorkflowDraftVariableList](#workflowdraftvariablelist) |
+| 404 | Draft workflow not found |  |
+
+#### POST
+##### Description
+
+Update conversation variables for workflow draft
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ConversationVariableUpdatePayload](#conversationvariableupdatepayload) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Conversation variables updated successfully |
+
+### /apps/{app_id}/workflows/draft/environment-variables
+
+#### GET
+##### Summary
+
+Get draft workflow
+
+##### Description
+
+Get environment variables for workflow
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Environment variables retrieved successfully |
+| 404 | Draft workflow not found |
+
+#### POST
+##### Description
+
+Update environment variables for workflow draft
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [EnvironmentVariableUpdatePayload](#environmentvariableupdatepayload) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Environment variables updated successfully |
+
+### /apps/{app_id}/workflows/draft/features
+
+#### POST
+##### Description
+
+Update draft workflow features
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [WorkflowFeaturesPayload](#workflowfeaturespayload) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Workflow features updated successfully |
+
+### /apps/{app_id}/workflows/draft/human-input/nodes/{node_id}/delivery-test
+
+#### POST
+##### Summary
+
+Test human input delivery
+
+##### Description
+
+Test human input delivery for workflow
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [HumanInputDeliveryTestPayload](#humaninputdeliverytestpayload) |
+| app_id | path | Application ID | Yes | string |
+| node_id | path | Node ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /apps/{app_id}/workflows/draft/human-input/nodes/{node_id}/form/preview
+
+#### POST
+##### Summary
+
+Preview human input form content and placeholders
+
+##### Description
+
+Get human input form preview for workflow
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [HumanInputFormPreviewPayload](#humaninputformpreviewpayload) |
+| app_id | path | Application ID | Yes | string |
+| node_id | path | Node ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /apps/{app_id}/workflows/draft/human-input/nodes/{node_id}/form/run
+
+#### POST
+##### Summary
+
+Submit human input form preview
+
+##### Description
+
+Submit human input form preview for workflow
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [HumanInputFormSubmitPayload](#humaninputformsubmitpayload) |
+| app_id | path | Application ID | Yes | string |
+| node_id | path | Node ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /apps/{app_id}/workflows/draft/iteration/nodes/{node_id}/run
+
+#### POST
+##### Summary
+
+Run draft workflow iteration node
+
+##### Description
+
+Run draft workflow iteration node
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [IterationNodeRunPayload](#iterationnoderunpayload) |
+| app_id | path | Application ID | Yes | string |
+| node_id | path | Node ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Workflow iteration node run started successfully |
+| 403 | Permission denied |
+| 404 | Node not found |
+
+### /apps/{app_id}/workflows/draft/loop/nodes/{node_id}/run
+
+#### POST
+##### Summary
+
+Run draft workflow loop node
+
+##### Description
+
+Run draft workflow loop node
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [LoopNodeRunPayload](#loopnoderunpayload) |
+| app_id | path | Application ID | Yes | string |
+| node_id | path | Node ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Workflow loop node run started successfully |
+| 403 | Permission denied |
+| 404 | Node not found |
+
+### /apps/{app_id}/workflows/draft/nodes/{node_id}/last-run
+
+#### GET
+##### Description
+
+Get last run result for draft workflow node
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+| node_id | path | Node ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Node last run retrieved successfully | [WorkflowRunNodeExecutionResponse](#workflowrunnodeexecutionresponse) |
+| 403 | Permission denied |  |
+| 404 | Node last run not found |  |
+
+### /apps/{app_id}/workflows/draft/nodes/{node_id}/run
+
+#### POST
+##### Summary
+
+Run draft workflow node
+
+##### Description
+
+Run draft workflow node
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [DraftWorkflowNodeRunPayload](#draftworkflownoderunpayload) |
+| app_id | path | Application ID | Yes | string |
+| node_id | path | Node ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Node run started successfully | [WorkflowRunNodeExecutionResponse](#workflowrunnodeexecutionresponse) |
+| 403 | Permission denied |  |
+| 404 | Node not found |  |
+
+### /apps/{app_id}/workflows/draft/nodes/{node_id}/trigger/run
+
+#### POST
+##### Summary
+
+Poll for trigger events and execute single node when event arrives
+
+##### Description
+
+Poll for trigger events and execute single node when event arrives
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+| node_id | path | Node ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Trigger event received and node executed successfully |
+| 403 | Permission denied |
+| 500 | Internal server error |
+
+### /apps/{app_id}/workflows/draft/nodes/{node_id}/variables
+
+#### DELETE
+##### Description
+
+Delete all variables for a specific node
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path |  | Yes | string |
+| node_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 204 | Node variables deleted successfully |
+
+#### GET
+##### Description
+
+Get variables for a specific node
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+| node_id | path | Node ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Node variables retrieved successfully | [WorkflowDraftVariableList](#workflowdraftvariablelist) |
+
+### /apps/{app_id}/workflows/draft/run
+
+#### POST
+##### Summary
+
+Run draft workflow
+
+##### Description
+
+Run draft workflow
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [DraftWorkflowRunPayload](#draftworkflowrunpayload) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Draft workflow run started successfully |
+| 403 | Permission denied |
+
+### /apps/{app_id}/workflows/draft/system-variables
+
+#### GET
+##### Description
+
+Get system variables for workflow
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | System variables retrieved successfully | [WorkflowDraftVariableList](#workflowdraftvariablelist) |
+
+### /apps/{app_id}/workflows/draft/trigger/run
+
+#### POST
+##### Summary
+
+Poll for trigger events and execute full workflow when event arrives
+
+##### Description
+
+Poll for trigger events and execute full workflow when event arrives
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [DraftWorkflowTriggerRunRequest](#draftworkflowtriggerrunrequest) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Trigger event received and workflow executed successfully |
+| 403 | Permission denied |
+| 500 | Internal server error |
+
+### /apps/{app_id}/workflows/draft/trigger/run-all
+
+#### POST
+##### Summary
+
+Full workflow debug when the start node is a trigger
+
+##### Description
+
+Full workflow debug when the start node is a trigger
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [DraftWorkflowTriggerRunAllPayload](#draftworkflowtriggerrunallpayload) |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Workflow executed successfully |
+| 403 | Permission denied |
+| 500 | Internal server error |
+
+### /apps/{app_id}/workflows/draft/variables
+
+#### DELETE
+##### Description
+
+Delete all draft workflow variables
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 204 | Workflow variables deleted successfully |
+
+#### GET
+##### Summary
+
+Get draft workflow
+
+##### Description
+
+Get draft workflow variables
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [WorkflowDraftVariableListQuery](#workflowdraftvariablelistquery) |
+| app_id | path | Application ID | Yes | string |
+| limit | query | Number of items per page (1-100) | No | string |
+| page | query | Page number (1-100000) | No | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Workflow variables retrieved successfully | [WorkflowDraftVariableListWithoutValue](#workflowdraftvariablelistwithoutvalue) |
+
+### /apps/{app_id}/workflows/draft/variables/{variable_id}
+
+#### DELETE
+##### Description
+
+Delete a workflow variable
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path |  | Yes | string |
+| variable_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 204 | Variable deleted successfully |
+| 404 | Variable not found |
+
+#### GET
+##### Description
+
+Get a specific workflow variable
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+| variable_id | path | Variable ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Variable retrieved successfully | [WorkflowDraftVariable](#workflowdraftvariable) |
+| 404 | Variable not found |  |
+
+#### PATCH
+##### Description
+
+Update a workflow variable
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [WorkflowDraftVariableUpdatePayload](#workflowdraftvariableupdatepayload) |
+| app_id | path |  | Yes | string |
+| variable_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Variable updated successfully | [WorkflowDraftVariable](#workflowdraftvariable) |
+| 404 | Variable not found |  |
+
+### /apps/{app_id}/workflows/draft/variables/{variable_id}/reset
+
+#### PUT
+##### Description
+
+Reset a workflow variable to its default value
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+| variable_id | path | Variable ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Variable reset successfully | [WorkflowDraftVariable](#workflowdraftvariable) |
+| 204 | Variable reset (no content) |  |
+| 404 | Variable not found |  |
+
+### /apps/{app_id}/workflows/publish
+
+#### GET
+##### Summary
+
+Get published workflow
+
+##### Description
+
+Get published workflow for an application
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Published workflow retrieved successfully, or null if not found | [WorkflowResponse](#workflowresponse) |
+
+#### POST
+##### Summary
+
+Publish workflow
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [PublishWorkflowPayload](#publishworkflowpayload) |
+| app_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /apps/{app_id}/workflows/triggers/webhook
+
+#### GET
+##### Summary
+
+Get webhook trigger for a node
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path |  | Yes | string |
+| payload | body |  | Yes | [Parser](#parser) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [WebhookTriggerResponse](#webhooktriggerresponse) |
+
+### /apps/{app_id}/workflows/{workflow_id}
+
+#### DELETE
+##### Summary
+
+Delete workflow
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path |  | Yes | string |
+| workflow_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### PATCH
+##### Summary
+
+Update workflow attributes
+
+##### Description
+
+Update workflow by ID
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [WorkflowUpdatePayload](#workflowupdatepayload) |
+| app_id | path | Application ID | Yes | string |
+| workflow_id | path | Workflow ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Workflow updated successfully | [WorkflowResponse](#workflowresponse) |
+| 403 | Permission denied |  |
+| 404 | Workflow not found |  |
+
+### /apps/{app_id}/workflows/{workflow_id}/restore
+
+#### POST
+##### Description
+
+Restore a published workflow version into the draft workflow
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path | Application ID | Yes | string |
+| workflow_id | path | Published workflow ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Workflow restored successfully |
+| 400 | Source workflow must be published |
+| 404 | Workflow not found |
+
+### /apps/{resource_id}/api-keys
+
+#### GET
+##### Summary
+
+Get all API keys for an app
+
+##### Description
+
+Get all API keys for an app
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| resource_id | path | App ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | API keys retrieved successfully | [ApiKeyList](#apikeylist) |
+
+#### POST
+##### Summary
+
+Create a new API key for an app
+
+##### Description
+
+Create a new API key for an app
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| resource_id | path | App ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 201 | API key created successfully | [ApiKeyItem](#apikeyitem) |
+| 400 | Maximum keys exceeded |  |
+
+### /apps/{resource_id}/api-keys/{api_key_id}
+
+#### DELETE
+##### Summary
+
+Delete an API key for an app
+
+##### Description
+
+Delete an API key for an app
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| api_key_id | path | API key ID | Yes | string |
+| resource_id | path | App ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 204 | API key deleted successfully |
+
+### /apps/{server_id}/server/refresh
+
+#### GET
+##### Description
+
+Refresh MCP server configuration and regenerate server code
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| server_id | path | Server ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | MCP server refreshed successfully | [AppMCPServerResponse](#appmcpserverresponse) |
+| 403 | Insufficient permissions |  |
+| 404 | Server not found |  |
+
+### /auth/plugin/datasource/default-list
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /auth/plugin/datasource/list
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /auth/plugin/datasource/{provider_id}
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider_id | path |  | Yes | string |
+| payload | body |  | Yes | [DatasourceCredentialPayload](#datasourcecredentialpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /auth/plugin/datasource/{provider_id}/custom-client
+
+#### DELETE
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider_id | path |  | Yes | string |
+| payload | body |  | Yes | [DatasourceCustomClientPayload](#datasourcecustomclientpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /auth/plugin/datasource/{provider_id}/default
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider_id | path |  | Yes | string |
+| payload | body |  | Yes | [DatasourceDefaultPayload](#datasourcedefaultpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /auth/plugin/datasource/{provider_id}/delete
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider_id | path |  | Yes | string |
+| payload | body |  | Yes | [DatasourceCredentialDeletePayload](#datasourcecredentialdeletepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /auth/plugin/datasource/{provider_id}/update
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider_id | path |  | Yes | string |
+| payload | body |  | Yes | [DatasourceCredentialUpdatePayload](#datasourcecredentialupdatepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /auth/plugin/datasource/{provider_id}/update-name
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider_id | path |  | Yes | string |
+| payload | body |  | Yes | [DatasourceUpdateNamePayload](#datasourceupdatenamepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /billing/invoices
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /billing/partners/{partner_key}/tenants
+
+#### PUT
+##### Description
+
+Sync partner tenants bindings
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [PartnerTenantsPayload](#partnertenantspayload) |
+| partner_key | path | Partner key | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Tenants synced to partner successfully |
+| 400 | Invalid partner information |
+
+### /billing/subscription
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /code-based-extension
+
+#### GET
+##### Description
+
+Get code-based extension data by module name
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| module | query | Extension module name | No | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [CodeBasedExtensionResponse](#codebasedextensionresponse) |
+
+### /compliance/download
+
+#### GET
+##### Description
+
+Get compliance document download link
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ComplianceDownloadQuery](#compliancedownloadquery) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /data-source/integrates
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### PATCH
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /data-source/integrates/{binding_id}/{action}
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| action | path |  | Yes | string |
+| binding_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### PATCH
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| action | path |  | Yes | string |
+| binding_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets
+
+#### GET
+##### Description
+
+Get list of datasets
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| ids | query | Filter by dataset IDs (list) | No | string |
+| include_all | query | Include all datasets (default: false) | No | string |
+| keyword | query | Search keyword | No | string |
+| limit | query | Number of items per page (default: 20) | No | string |
+| page | query | Page number (default: 1) | No | string |
+| tag_ids | query | Filter by tag IDs (list) | No | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Datasets retrieved successfully |
+
+#### POST
+##### Description
+
+Create a new dataset
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [DatasetCreatePayload](#datasetcreatepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 201 | Dataset created successfully |
+| 400 | Invalid request parameters |
+
+### /datasets/api-base-info
+
+#### GET
+##### Description
+
+Get dataset API base information
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | API base info retrieved successfully |
+
+### /datasets/api-keys
+
+#### GET
+##### Description
+
+Get dataset API keys
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | API keys retrieved successfully | [ApiKeyList](#apikeylist) |
+
+#### POST
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | API key created successfully | [ApiKeyItem](#apikeyitem) |
+| 400 | Maximum keys exceeded |  |
+
+### /datasets/api-keys/{api_key_id}
+
+#### DELETE
+##### Description
+
+Delete dataset API key
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| api_key_id | path | API key ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 204 | API key deleted successfully |
+
+### /datasets/batch_import_status/{job_id}
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| job_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| job_id | path |  | Yes | string |
+| payload | body |  | Yes | [BatchImportPayload](#batchimportpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/external
+
+#### POST
+##### Description
+
+Create external knowledge dataset
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ExternalDatasetCreatePayload](#externaldatasetcreatepayload) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 201 | External dataset created successfully | [DatasetDetail](#datasetdetail) |
+| 400 | Invalid parameters |  |
+| 403 | Permission denied |  |
+
+### /datasets/external-knowledge-api
+
+#### GET
+##### Description
+
+Get external knowledge API templates
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| keyword | query | Search keyword | No | string |
+| limit | query | Number of items per page (default: 20) | No | string |
+| page | query | Page number (default: 1) | No | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | External API templates retrieved successfully |
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ExternalKnowledgeApiPayload](#externalknowledgeapipayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/external-knowledge-api/{external_knowledge_api_id}
+
+#### DELETE
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| external_knowledge_api_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### GET
+##### Description
+
+Get external knowledge API template details
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| external_knowledge_api_id | path | External knowledge API ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | External API template retrieved successfully |
+| 404 | Template not found |
+
+#### PATCH
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ExternalKnowledgeApiPayload](#externalknowledgeapipayload) |
+| external_knowledge_api_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/external-knowledge-api/{external_knowledge_api_id}/use-check
+
+#### GET
+##### Description
+
+Check if external knowledge API is being used
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| external_knowledge_api_id | path | External knowledge API ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Usage check completed successfully |
+
+### /datasets/indexing-estimate
+
+#### POST
+##### Description
+
+Estimate dataset indexing cost
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [IndexingEstimatePayload](#indexingestimatepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Indexing estimate calculated successfully |
+
+### /datasets/init
+
+#### POST
+##### Description
+
+Initialize dataset with documents
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [KnowledgeConfig](#knowledgeconfig) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 201 | Dataset initialized successfully | [DatasetAndDocumentResponse](#datasetanddocumentresponse) |
+| 400 | Invalid request parameters |  |
+
+### /datasets/metadata/built-in
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/notion-indexing-estimate
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [NotionEstimatePayload](#notionestimatepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/process-rule
+
+#### GET
+##### Description
+
+Get dataset document processing rules
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| document_id | query | Document ID (optional) | No | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Process rules retrieved successfully |
+
+### /datasets/retrieval-setting
+
+#### GET
+##### Description
+
+Get dataset retrieval settings
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Retrieval settings retrieved successfully |
+
+### /datasets/retrieval-setting/{vector_type}
+
+#### GET
+##### Description
+
+Get mock dataset retrieval settings by vector type
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| vector_type | path | Vector store type | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Mock retrieval settings retrieved successfully |
+
+### /datasets/{dataset_id}
+
+#### DELETE
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### GET
+##### Description
+
+Get dataset details
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Dataset retrieved successfully | [DatasetDetail](#datasetdetail) |
+| 403 | Permission denied |  |
+| 404 | Dataset not found |  |
+
+#### PATCH
+##### Description
+
+Update dataset details
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [DatasetUpdatePayload](#datasetupdatepayload) |
+| dataset_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Dataset updated successfully | [DatasetDetail](#datasetdetail) |
+| 403 | Permission denied |  |
+| 404 | Dataset not found |  |
+
+### /datasets/{dataset_id}/api-keys/{status}
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+| status | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/{dataset_id}/auto-disable-logs
+
+#### GET
+##### Description
+
+Get dataset auto disable logs
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Auto disable logs retrieved successfully |
+| 404 | Dataset not found |
+
+### /datasets/{dataset_id}/batch/{batch}/indexing-estimate
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| batch | path |  | Yes | string |
+| dataset_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/{dataset_id}/batch/{batch}/indexing-status
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| batch | path |  | Yes | string |
+| dataset_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/{dataset_id}/documents
+
+#### DELETE
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### GET
+##### Description
+
+Get documents in a dataset
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | Dataset ID | Yes | string |
+| fetch | query | Fetch full details (default: false) | No | string |
+| keyword | query | Search keyword | No | string |
+| limit | query | Number of items per page (default: 20) | No | string |
+| page | query | Page number (default: 1) | No | string |
+| sort | query | Sort order (default: -created_at) | No | string |
+| status | query | Filter documents by display status | No | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Documents retrieved successfully |
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [KnowledgeConfig](#knowledgeconfig) |
+| dataset_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Documents created successfully | [DatasetAndDocumentResponse](#datasetanddocumentresponse) |
+
+### /datasets/{dataset_id}/documents/download-zip
+
+#### POST
+##### Summary
+
+Stream a ZIP archive containing the requested uploaded documents
+
+##### Description
+
+Download selected dataset documents as a single ZIP archive (upload-file only)
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+| payload | body |  | Yes | [DocumentBatchDownloadZipPayload](#documentbatchdownloadzippayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/{dataset_id}/documents/generate-summary
+
+#### POST
+##### Summary
+
+Generate summary index for specified documents
+
+##### Description
+
+Generate summary index for documents
+This endpoint checks if the dataset configuration supports summary generation
+(indexing_technique must be 'high_quality' and summary_index_setting.enable must be true),
+then asynchronously generates summary indexes for the provided documents.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [GenerateSummaryPayload](#generatesummarypayload) |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Summary generation started successfully |
+| 400 | Invalid request or dataset configuration |
+| 403 | Permission denied |
+| 404 | Dataset not found |
+
+### /datasets/{dataset_id}/documents/metadata
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+| payload | body |  | Yes | [MetadataOperationData](#metadataoperationdata) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/{dataset_id}/documents/status/{action}/batch
+
+#### PATCH
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| action | path |  | Yes | string |
+| dataset_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/{dataset_id}/documents/{document_id}
+
+#### DELETE
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+| document_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### GET
+##### Description
+
+Get document details
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | Dataset ID | Yes | string |
+| document_id | path | Document ID | Yes | string |
+| metadata | query | Metadata inclusion (all/only/without) | No | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Document retrieved successfully |
+| 404 | Document not found |
+
+### /datasets/{dataset_id}/documents/{document_id}/download
+
+#### GET
+##### Description
+
+Get a signed download URL for a dataset document's original uploaded file
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+| document_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/{dataset_id}/documents/{document_id}/indexing-estimate
+
+#### GET
+##### Description
+
+Estimate document indexing cost
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | Dataset ID | Yes | string |
+| document_id | path | Document ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Indexing estimate calculated successfully |
+| 400 | Document already finished |
+| 404 | Document not found |
+
+### /datasets/{dataset_id}/documents/{document_id}/indexing-status
+
+#### GET
+##### Description
+
+Get document indexing status
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | Dataset ID | Yes | string |
+| document_id | path | Document ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Indexing status retrieved successfully |
+| 404 | Document not found |
+
+### /datasets/{dataset_id}/documents/{document_id}/metadata
+
+#### PUT
+##### Description
+
+Update document metadata
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [DocumentMetadataUpdatePayload](#documentmetadataupdatepayload) |
+| dataset_id | path | Dataset ID | Yes | string |
+| document_id | path | Document ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Document metadata updated successfully |
+| 403 | Permission denied |
+| 404 | Document not found |
+
+### /datasets/{dataset_id}/documents/{document_id}/notion/sync
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+| document_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/{dataset_id}/documents/{document_id}/pipeline-execution-log
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+| document_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/{dataset_id}/documents/{document_id}/processing/pause
+
+#### PATCH
+##### Summary
+
+pause document
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+| document_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/{dataset_id}/documents/{document_id}/processing/resume
+
+#### PATCH
+##### Summary
+
+recover document
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+| document_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/{dataset_id}/documents/{document_id}/processing/{action}
+
+#### PATCH
+##### Description
+
+Update document processing status (pause/resume)
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| action | path | Action to perform (pause/resume) | Yes | string |
+| dataset_id | path | Dataset ID | Yes | string |
+| document_id | path | Document ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Processing status updated successfully |
+| 400 | Invalid action |
+| 404 | Document not found |
+
+### /datasets/{dataset_id}/documents/{document_id}/rename
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+| document_id | path |  | Yes | string |
+| payload | body |  | Yes | [DocumentRenamePayload](#documentrenamepayload) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Document renamed successfully | [DocumentResponse](#documentresponse) |
+
+### /datasets/{dataset_id}/documents/{document_id}/segment
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+| document_id | path |  | Yes | string |
+| payload | body |  | Yes | [SegmentCreatePayload](#segmentcreatepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/{dataset_id}/documents/{document_id}/segment/{action}
+
+#### PATCH
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| action | path |  | Yes | string |
+| dataset_id | path |  | Yes | string |
+| document_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/{dataset_id}/documents/{document_id}/segments
+
+#### DELETE
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+| document_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+| document_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/{dataset_id}/documents/{document_id}/segments/batch_import
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+| document_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+| document_id | path |  | Yes | string |
+| payload | body |  | Yes | [BatchImportPayload](#batchimportpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/{dataset_id}/documents/{document_id}/segments/{segment_id}
+
+#### DELETE
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+| document_id | path |  | Yes | string |
+| segment_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### PATCH
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+| document_id | path |  | Yes | string |
+| segment_id | path |  | Yes | string |
+| payload | body |  | Yes | [SegmentUpdatePayload](#segmentupdatepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/{dataset_id}/documents/{document_id}/segments/{segment_id}/child_chunks
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+| document_id | path |  | Yes | string |
+| segment_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### PATCH
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+| document_id | path |  | Yes | string |
+| segment_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+| document_id | path |  | Yes | string |
+| segment_id | path |  | Yes | string |
+| payload | body |  | Yes | [ChildChunkCreatePayload](#childchunkcreatepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/{dataset_id}/documents/{document_id}/segments/{segment_id}/child_chunks/{child_chunk_id}
+
+#### DELETE
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| child_chunk_id | path |  | Yes | string |
+| dataset_id | path |  | Yes | string |
+| document_id | path |  | Yes | string |
+| segment_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### PATCH
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| child_chunk_id | path |  | Yes | string |
+| dataset_id | path |  | Yes | string |
+| document_id | path |  | Yes | string |
+| segment_id | path |  | Yes | string |
+| payload | body |  | Yes | [ChildChunkUpdatePayload](#childchunkupdatepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/{dataset_id}/documents/{document_id}/summary-status
+
+#### GET
+##### Summary
+
+Get summary index generation status for a document
+
+##### Description
+
+Get summary index generation status for a document
+Returns:
+- total_segments: Total number of segments in the document
+- summary_status: Dictionary with status counts
+  - completed: Number of summaries completed
+  - generating: Number of summaries being generated
+  - error: Number of summaries with errors
+  - not_started: Number of segments without summary records
+- summaries: List of summary records with status and content preview
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | Dataset ID | Yes | string |
+| document_id | path | Document ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Summary status retrieved successfully |
+| 404 | Document not found |
+
+### /datasets/{dataset_id}/documents/{document_id}/website-sync
+
+#### GET
+##### Summary
+
+sync website document
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+| document_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/{dataset_id}/error-docs
+
+#### GET
+##### Description
+
+Get dataset error documents
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Error documents retrieved successfully |
+| 404 | Dataset not found |
+
+### /datasets/{dataset_id}/external-hit-testing
+
+#### POST
+##### Description
+
+Test external knowledge retrieval for dataset
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ExternalHitTestingPayload](#externalhittestingpayload) |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | External hit testing completed successfully |
+| 400 | Invalid parameters |
+| 404 | Dataset not found |
+
+### /datasets/{dataset_id}/hit-testing
+
+#### POST
+##### Description
+
+Test dataset knowledge retrieval
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [HitTestingPayload](#hittestingpayload) |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Hit testing completed successfully | [HitTestingResponse](#hittestingresponse) |
+| 400 | Invalid parameters |  |
+| 404 | Dataset not found |  |
+
+### /datasets/{dataset_id}/indexing-status
+
+#### GET
+##### Description
+
+Get dataset indexing status
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Indexing status retrieved successfully |
+
+### /datasets/{dataset_id}/metadata
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+| payload | body |  | Yes | [MetadataArgs](#metadataargs) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/{dataset_id}/metadata/built-in/{action}
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| action | path |  | Yes | string |
+| dataset_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/{dataset_id}/metadata/{metadata_id}
+
+#### DELETE
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+| metadata_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### PATCH
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+| metadata_id | path |  | Yes | string |
+| payload | body |  | Yes | [MetadataUpdatePayload](#metadataupdatepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/{dataset_id}/notion/sync
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/{dataset_id}/permission-part-users
+
+#### GET
+##### Description
+
+Get dataset permission user list
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Permission users retrieved successfully |
+| 403 | Permission denied |
+| 404 | Dataset not found |
+
+### /datasets/{dataset_id}/queries
+
+#### GET
+##### Description
+
+Get dataset query history
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Query history retrieved successfully | [DatasetQueryDetail](#datasetquerydetail) |
+
+### /datasets/{dataset_id}/related-apps
+
+#### GET
+##### Description
+
+Get applications related to dataset
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Related apps retrieved successfully | [RelatedAppList](#relatedapplist) |
+
+### /datasets/{dataset_id}/retry
+
+#### POST
+##### Summary
+
+retry document
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+| payload | body |  | Yes | [DocumentRetryPayload](#documentretrypayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /datasets/{dataset_id}/use-check
+
+#### GET
+##### Description
+
+Check if dataset is in use
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Dataset use status retrieved successfully |
+
+### /datasets/{resource_id}/api-keys
+
+#### GET
+##### Summary
+
+Get all API keys for a dataset
+
+##### Description
+
+Get all API keys for a dataset
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| resource_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | API keys retrieved successfully | [ApiKeyList](#apikeylist) |
+
+#### POST
+##### Summary
+
+Create a new API key for a dataset
+
+##### Description
+
+Create a new API key for a dataset
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| resource_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 201 | API key created successfully | [ApiKeyItem](#apikeyitem) |
+| 400 | Maximum keys exceeded |  |
+
+### /datasets/{resource_id}/api-keys/{api_key_id}
+
+#### DELETE
+##### Summary
+
+Delete an API key for a dataset
+
+##### Description
+
+Delete an API key for a dataset
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| api_key_id | path | API key ID | Yes | string |
+| resource_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 204 | API key deleted successfully |
+
+### /email-code-login
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [EmailPayload](#emailpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /email-code-login/validity
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [EmailCodeLoginPayload](#emailcodeloginpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /email-register
+
+#### POST
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /email-register/send-email
+
+#### POST
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /email-register/validity
+
+#### POST
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /explore/apps
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| language | query | Language code for recommended app localization | No | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [RecommendedAppListResponse](#recommendedapplistresponse) |
+
+### /explore/apps/{app_id}
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /features
+
+#### GET
+##### Summary
+
+Get feature configuration for current tenant
+
+##### Description
+
+Get feature configuration for current tenant
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [FeatureResponse](#featureresponse) |
+
+### /files/support-type
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /files/upload
+
+#### GET
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [UploadConfig](#uploadconfig) |
+
+#### POST
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 201 | File uploaded successfully | [FileResponse](#fileresponse) |
+
+### /files/{file_id}/preview
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| file_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /forgot-password
+
+#### POST
+##### Description
+
+Send password reset email
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ForgotPasswordSendPayload](#forgotpasswordsendpayload) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Email sent successfully | [ForgotPasswordEmailResponse](#forgotpasswordemailresponse) |
+| 400 | Invalid email or rate limit exceeded |  |
+
+### /forgot-password/resets
+
+#### POST
+##### Description
+
+Reset password with verification token
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ForgotPasswordResetPayload](#forgotpasswordresetpayload) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Password reset successfully | [ForgotPasswordResetResponse](#forgotpasswordresetresponse) |
+| 400 | Invalid token or password mismatch |  |
+
+### /forgot-password/validity
+
+#### POST
+##### Description
+
+Verify password reset code
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ForgotPasswordCheckPayload](#forgotpasswordcheckpayload) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Code verified successfully | [ForgotPasswordCheckResponse](#forgotpasswordcheckresponse) |
+| 400 | Invalid code or token |  |
+
+### /form/human_input/{form_token}
+
+#### GET
+##### Summary
+
+Get human input form definition by form token
+
+##### Description
+
+GET /console/api/form/human_input/<form_token>
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| form_token | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### POST
+##### Summary
+
+Submit human input form by form token
+
+##### Description
+
+POST /console/api/form/human_input/<form_token>
+
+Request body:
+{
+    "inputs": {
+        "content": "User input content"
+    },
+    "action": "Approve"
+}
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| form_token | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /info
+
+#### POST
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [TenantInfoResponse](#tenantinforesponse) |
+
+### /installed-apps
+
+#### GET
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [InstalledAppListResponse](#installedapplistresponse) |
+
+#### POST
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /installed-apps/{installed_app_id}
+
+#### DELETE
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| installed_app_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### PATCH
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| installed_app_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /installed-apps/{installed_app_id}/audio-to-text
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| installed_app_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /installed-apps/{installed_app_id}/chat-messages
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| installed_app_id | path |  | Yes | string |
+| payload | body |  | Yes | [ChatMessagePayload](#chatmessagepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /installed-apps/{installed_app_id}/chat-messages/{task_id}/stop
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| installed_app_id | path |  | Yes | string |
+| task_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /installed-apps/{installed_app_id}/completion-messages
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| installed_app_id | path |  | Yes | string |
+| payload | body |  | Yes | [CompletionMessageExplorePayload](#completionmessageexplorepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /installed-apps/{installed_app_id}/completion-messages/{task_id}/stop
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| installed_app_id | path |  | Yes | string |
+| task_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /installed-apps/{installed_app_id}/conversations
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| installed_app_id | path |  | Yes | string |
+| payload | body |  | Yes | [ConversationListQuery](#conversationlistquery) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /installed-apps/{installed_app_id}/conversations/{c_id}
+
+#### DELETE
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| c_id | path |  | Yes | string |
+| installed_app_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /installed-apps/{installed_app_id}/conversations/{c_id}/name
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| c_id | path |  | Yes | string |
+| installed_app_id | path |  | Yes | string |
+| payload | body |  | Yes | [ConversationRenamePayload](#conversationrenamepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /installed-apps/{installed_app_id}/conversations/{c_id}/pin
+
+#### PATCH
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| c_id | path |  | Yes | string |
+| installed_app_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /installed-apps/{installed_app_id}/conversations/{c_id}/unpin
+
+#### PATCH
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| c_id | path |  | Yes | string |
+| installed_app_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /installed-apps/{installed_app_id}/messages
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| installed_app_id | path |  | Yes | string |
+| payload | body |  | Yes | [MessageListQuery](#messagelistquery) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /installed-apps/{installed_app_id}/messages/{message_id}/feedbacks
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| installed_app_id | path |  | Yes | string |
+| message_id | path |  | Yes | string |
+| payload | body |  | Yes | [MessageFeedbackPayload](#messagefeedbackpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /installed-apps/{installed_app_id}/messages/{message_id}/more-like-this
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| installed_app_id | path |  | Yes | string |
+| message_id | path |  | Yes | string |
+| payload | body |  | Yes | [MoreLikeThisQuery](#morelikethisquery) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /installed-apps/{installed_app_id}/messages/{message_id}/suggested-questions
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| installed_app_id | path |  | Yes | string |
+| message_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /installed-apps/{installed_app_id}/meta
+
+#### GET
+##### Summary
+
+Get app meta
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| installed_app_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /installed-apps/{installed_app_id}/parameters
+
+#### GET
+##### Summary
+
+Retrieve app parameters
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| installed_app_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /installed-apps/{installed_app_id}/saved-messages
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| installed_app_id | path |  | Yes | string |
+| payload | body |  | Yes | [SavedMessageListQuery](#savedmessagelistquery) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| installed_app_id | path |  | Yes | string |
+| payload | body |  | Yes | [SavedMessageCreatePayload](#savedmessagecreatepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /installed-apps/{installed_app_id}/saved-messages/{message_id}
+
+#### DELETE
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| installed_app_id | path |  | Yes | string |
+| message_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /installed-apps/{installed_app_id}/text-to-audio
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| installed_app_id | path |  | Yes | string |
+| payload | body |  | Yes | [TextToAudioPayload](#texttoaudiopayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /installed-apps/{installed_app_id}/workflows/run
+
+#### POST
+##### Summary
+
+Run workflow
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| installed_app_id | path |  | Yes | string |
+| payload | body |  | Yes | [WorkflowRunPayload](#workflowrunpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /installed-apps/{installed_app_id}/workflows/tasks/{task_id}/stop
+
+#### POST
+##### Summary
+
+Stop workflow task
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| installed_app_id | path |  | Yes | string |
+| task_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /instruction-generate
+
+#### POST
+##### Description
+
+Generate instruction for workflow nodes or general use
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [InstructionGeneratePayload](#instructiongeneratepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Instruction generated successfully |
+| 400 | Invalid request parameters or flow/workflow not found |
+| 402 | Provider quota exceeded |
+
+### /instruction-generate/template
+
+#### POST
+##### Description
+
+Get instruction generation template
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [InstructionTemplatePayload](#instructiontemplatepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Template retrieved successfully |
+| 400 | Invalid request parameters |
+
+### /login
+
+#### POST
+##### Summary
+
+Authenticate user and login
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [LoginPayload](#loginpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /logout
+
+#### POST
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /mcp/oauth/callback
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /notification
+
+#### GET
+##### Description
+
+Return the active in-product notification for the current user in their interface language (falls back to English if unavailable). The notification is NOT marked as seen here; call POST /notification/dismiss when the user explicitly closes the modal.
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success — inspect should_show to decide whether to render the modal |
+| 401 | Unauthorized |
+
+### /notification/dismiss
+
+#### POST
+##### Description
+
+Mark a notification as dismissed for the current user.
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+| 401 | Unauthorized |
+
+### /notion/pages/{page_id}/{page_type}/preview
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| page_id | path |  | Yes | string |
+| page_type | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| page_id | path |  | Yes | string |
+| page_type | path |  | Yes | string |
+| payload | body |  | Yes | [NotionEstimatePayload](#notionestimatepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /notion/pre-import/pages
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /oauth/authorize/{provider}
+
+#### GET
+##### Description
+
+Handle OAuth callback and complete login process
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path | OAuth provider name (github/google) | Yes | string |
+| code | query | Authorization code from OAuth provider | No | string |
+| state | query | Optional state parameter (used for invite token) | No | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 302 | Redirect to console with access token |
+| 400 | OAuth process failed |
+
+### /oauth/data-source/binding/{provider}
+
+#### GET
+##### Description
+
+Bind OAuth data source with authorization code
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path | Data source provider name (notion) | Yes | string |
+| code | query | Authorization code from OAuth provider | No | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Data source binding success | [OAuthDataSourceBindingResponse](#oauthdatasourcebindingresponse) |
+| 400 | Invalid provider or code |  |
+
+### /oauth/data-source/callback/{provider}
+
+#### GET
+##### Description
+
+Handle OAuth callback from data source provider
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path | Data source provider name (notion) | Yes | string |
+| code | query | Authorization code from OAuth provider | No | string |
+| error | query | Error message from OAuth provider | No | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 302 | Redirect to console with result |
+| 400 | Invalid provider |
+
+### /oauth/data-source/{provider}
+
+#### GET
+##### Description
+
+Get OAuth authorization URL for data source provider
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path | Data source provider name (notion) | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Authorization URL or internal setup success | [OAuthDataSourceResponse](#oauthdatasourceresponse) |
+| 400 | Invalid provider |  |
+| 403 | Admin privileges required |  |
+
+### /oauth/data-source/{provider}/{binding_id}/sync
+
+#### GET
+##### Description
+
+Sync data from OAuth data source
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| binding_id | path | Data source binding ID | Yes | string |
+| provider | path | Data source provider name (notion) | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Data source sync success | [OAuthDataSourceSyncResponse](#oauthdatasourcesyncresponse) |
+| 400 | Invalid provider or sync failed |  |
+
+### /oauth/login/{provider}
+
+#### GET
+##### Description
+
+Initiate OAuth login process
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path | OAuth provider name (github/google) | Yes | string |
+| invite_token | query | Optional invitation token | No | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 302 | Redirect to OAuth authorization URL |
+| 400 | Invalid provider |
+
+### /oauth/plugin/{provider_id}/datasource/callback
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /oauth/plugin/{provider_id}/datasource/get-authorization-url
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /oauth/plugin/{provider}/tool/authorization-url
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /oauth/plugin/{provider}/tool/callback
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /oauth/plugin/{provider}/trigger/callback
+
+#### GET
+##### Summary
+
+Handle OAuth callback for trigger provider
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /oauth/provider
+
+#### POST
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /oauth/provider/account
+
+#### POST
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /oauth/provider/authorize
+
+#### POST
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /oauth/provider/token
+
+#### POST
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipeline/customized/templates/{template_id}
+
+#### DELETE
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| template_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### PATCH
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| template_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| template_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipeline/dataset
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [RagPipelineDatasetImportPayload](#ragpipelinedatasetimportpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipeline/empty-dataset
+
+#### POST
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipeline/templates
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipeline/templates/{template_id}
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| template_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/datasource-plugins
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/imports
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [RagPipelineImportPayload](#ragpipelineimportpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/imports/{import_id}/confirm
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| import_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/imports/{pipeline_id}/check-dependencies
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/recommended-plugins
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/transform/datasets/{dataset_id}
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/{pipeline_id}/customized/publish
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+| payload | body |  | Yes | [Payload](#payload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/{pipeline_id}/exports
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/{pipeline_id}/workflow-runs
+
+#### GET
+##### Summary
+
+Get workflow run list
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Workflow runs retrieved successfully | [WorkflowRunPaginationResponse](#workflowrunpaginationresponse) |
+
+### /rag/pipelines/{pipeline_id}/workflow-runs/tasks/{task_id}/stop
+
+#### POST
+##### Summary
+
+Stop workflow task
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+| task_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/{pipeline_id}/workflow-runs/{run_id}
+
+#### GET
+##### Summary
+
+Get workflow run detail
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+| run_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Workflow run detail retrieved successfully | [WorkflowRunDetailResponse](#workflowrundetailresponse) |
+
+### /rag/pipelines/{pipeline_id}/workflow-runs/{run_id}/node-executions
+
+#### GET
+##### Summary
+
+Get workflow run node execution list
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+| run_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Node executions retrieved successfully | [WorkflowRunNodeExecutionListResponse](#workflowrunnodeexecutionlistresponse) |
+
+### /rag/pipelines/{pipeline_id}/workflows
+
+#### GET
+##### Summary
+
+Get published workflows
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Published workflows retrieved successfully | [WorkflowPaginationResponse](#workflowpaginationresponse) |
+| 403 | Permission denied |  |
+
+### /rag/pipelines/{pipeline_id}/workflows/default-workflow-block-configs
+
+#### GET
+##### Summary
+
+Get default block config
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/{pipeline_id}/workflows/default-workflow-block-configs/{block_type}
+
+#### GET
+##### Summary
+
+Get default block config
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| block_type | path |  | Yes | string |
+| pipeline_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/{pipeline_id}/workflows/draft
+
+#### GET
+##### Summary
+
+Get draft rag pipeline's workflow
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Draft workflow retrieved successfully | [WorkflowResponse](#workflowresponse) |
+| 404 | Draft workflow not found |  |
+
+#### POST
+##### Summary
+
+Sync draft workflow
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/{pipeline_id}/workflows/draft/datasource/nodes/{node_id}/run
+
+#### POST
+##### Summary
+
+Run rag pipeline datasource
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| node_id | path |  | Yes | string |
+| pipeline_id | path |  | Yes | string |
+| payload | body |  | Yes | [DatasourceNodeRunPayload](#datasourcenoderunpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/{pipeline_id}/workflows/draft/datasource/variables-inspect
+
+#### POST
+##### Summary
+
+Set datasource variables
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+| payload | body |  | Yes | [DatasourceVariablesPayload](#datasourcevariablespayload) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Datasource variables set successfully | [WorkflowRunNodeExecutionResponse](#workflowrunnodeexecutionresponse) |
+
+### /rag/pipelines/{pipeline_id}/workflows/draft/environment-variables
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/{pipeline_id}/workflows/draft/iteration/nodes/{node_id}/run
+
+#### POST
+##### Summary
+
+Run draft workflow iteration node
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| node_id | path |  | Yes | string |
+| pipeline_id | path |  | Yes | string |
+| payload | body |  | Yes | [NodeRunPayload](#noderunpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/{pipeline_id}/workflows/draft/loop/nodes/{node_id}/run
+
+#### POST
+##### Summary
+
+Run draft workflow loop node
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| node_id | path |  | Yes | string |
+| pipeline_id | path |  | Yes | string |
+| payload | body |  | Yes | [NodeRunPayload](#noderunpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/{pipeline_id}/workflows/draft/nodes/{node_id}/last-run
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| node_id | path |  | Yes | string |
+| pipeline_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Node last run retrieved successfully | [WorkflowRunNodeExecutionResponse](#workflowrunnodeexecutionresponse) |
+
+### /rag/pipelines/{pipeline_id}/workflows/draft/nodes/{node_id}/run
+
+#### POST
+##### Summary
+
+Run draft workflow node
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| node_id | path |  | Yes | string |
+| pipeline_id | path |  | Yes | string |
+| payload | body |  | Yes | [NodeRunRequiredPayload](#noderunrequiredpayload) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Node run started successfully | [WorkflowRunNodeExecutionResponse](#workflowrunnodeexecutionresponse) |
+
+### /rag/pipelines/{pipeline_id}/workflows/draft/nodes/{node_id}/variables
+
+#### DELETE
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| node_id | path |  | Yes | string |
+| pipeline_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| node_id | path |  | Yes | string |
+| pipeline_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/{pipeline_id}/workflows/draft/pre-processing/parameters
+
+#### GET
+##### Summary
+
+Get first step parameters of rag pipeline
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/{pipeline_id}/workflows/draft/processing/parameters
+
+#### GET
+##### Summary
+
+Get second step parameters of rag pipeline
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/{pipeline_id}/workflows/draft/run
+
+#### POST
+##### Summary
+
+Run draft workflow
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+| payload | body |  | Yes | [DraftWorkflowRunPayload](#draftworkflowrunpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/{pipeline_id}/workflows/draft/system-variables
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/{pipeline_id}/workflows/draft/variables
+
+#### DELETE
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/{pipeline_id}/workflows/draft/variables/{variable_id}
+
+#### DELETE
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+| variable_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+| variable_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### PATCH
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+| variable_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/{pipeline_id}/workflows/draft/variables/{variable_id}/reset
+
+#### PUT
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+| variable_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/{pipeline_id}/workflows/publish
+
+#### GET
+##### Summary
+
+Get published pipeline
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Published workflow retrieved successfully, or null if not exist | [WorkflowResponse](#workflowresponse) |
+
+#### POST
+##### Summary
+
+Publish workflow
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/{pipeline_id}/workflows/published/datasource/nodes/{node_id}/preview
+
+#### POST
+##### Summary
+
+Run datasource content preview
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| node_id | path |  | Yes | string |
+| pipeline_id | path |  | Yes | string |
+| payload | body |  | Yes | [Parser](#parser) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/{pipeline_id}/workflows/published/datasource/nodes/{node_id}/run
+
+#### POST
+##### Summary
+
+Run rag pipeline datasource
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| node_id | path |  | Yes | string |
+| pipeline_id | path |  | Yes | string |
+| payload | body |  | Yes | [DatasourceNodeRunPayload](#datasourcenoderunpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/{pipeline_id}/workflows/published/pre-processing/parameters
+
+#### GET
+##### Summary
+
+Get first step parameters of rag pipeline
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/{pipeline_id}/workflows/published/processing/parameters
+
+#### GET
+##### Summary
+
+Get second step parameters of rag pipeline
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/{pipeline_id}/workflows/published/run
+
+#### POST
+##### Summary
+
+Run published workflow
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+| payload | body |  | Yes | [PublishedWorkflowRunPayload](#publishedworkflowrunpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rag/pipelines/{pipeline_id}/workflows/{workflow_id}
+
+#### DELETE
+##### Summary
+
+Delete a published workflow version that is not currently active on the pipeline
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+| workflow_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### PATCH
+##### Summary
+
+Update workflow attributes
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+| workflow_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Workflow updated successfully | [WorkflowResponse](#workflowresponse) |
+| 400 | No valid fields to update |  |
+| 403 | Permission denied |  |
+| 404 | Workflow not found |  |
+
+### /rag/pipelines/{pipeline_id}/workflows/{workflow_id}/restore
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| pipeline_id | path |  | Yes | string |
+| workflow_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /refresh-token
+
+#### POST
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /remote-files/upload
+
+#### POST
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /remote-files/{url}
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| url | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /reset-password
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [EmailPayload](#emailpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /rule-code-generate
+
+#### POST
+##### Description
+
+Generate code rules using LLM
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [RuleCodeGeneratePayload](#rulecodegeneratepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Code rules generated successfully |
+| 400 | Invalid request parameters |
+| 402 | Provider quota exceeded |
+
+### /rule-generate
+
+#### POST
+##### Description
+
+Generate rule configuration using LLM
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [RuleGeneratePayload](#rulegeneratepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Rule configuration generated successfully |
+| 400 | Invalid request parameters |
+| 402 | Provider quota exceeded |
+
+### /rule-structured-output-generate
+
+#### POST
+##### Description
+
+Generate structured output rules using LLM
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [RuleStructuredOutputPayload](#rulestructuredoutputpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Structured output generated successfully |
+| 400 | Invalid request parameters |
+| 402 | Provider quota exceeded |
+
+### /spec/schema-definitions
+
+#### GET
+##### Summary
+
+Get system JSON Schema definitions specification
+
+##### Description
+
+Used for frontend component type mapping
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /system-features
+
+#### GET
+##### Summary
+
+Get system-wide feature configuration
+
+##### Description
+
+Get system-wide feature configuration
+NOTE: This endpoint is unauthenticated by design, as it provides system features
+data required for dashboard initialization.
+
+Authentication would create circular dependency (can't login without dashboard loading).
+
+Only non-sensitive configuration data should be returned by this endpoint.
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [SystemFeatureResponse](#systemfeatureresponse) |
+
+### /tag-bindings
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [TagBindingPayload](#tagbindingpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /tag-bindings/remove
+
+#### POST
+##### Description
+
+Remove one or more tag bindings from a target.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [TagBindingRemovePayload](#tagbindingremovepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /tags
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| keyword | query | Search keyword for tag name. | No | string |
+| type | query | Tag type filter. Can be "knowledge" or "app". | No | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [ [TagResponse](#tagresponse) ] |
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [TagBasePayload](#tagbasepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /tags/{tag_id}
+
+#### DELETE
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| tag_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### PATCH
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| tag_id | path |  | Yes | string |
+| payload | body |  | Yes | [TagUpdateRequestPayload](#tagupdaterequestpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /test/retrieval
+
+#### POST
+##### Description
+
+Bedrock retrieval test (internal use only)
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [BedrockRetrievalPayload](#bedrockretrievalpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Bedrock retrieval test completed |
+
+### /trial-apps/{app_id}
+
+#### GET
+##### Summary
+
+Get app detail
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /trial-apps/{app_id}/audio-to-text
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /trial-apps/{app_id}/chat-messages
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path |  | Yes | string |
+| payload | body |  | Yes | [ChatRequest](#chatrequest) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /trial-apps/{app_id}/completion-messages
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path |  | Yes | string |
+| payload | body |  | Yes | [CompletionRequest](#completionrequest) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /trial-apps/{app_id}/datasets
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /trial-apps/{app_id}/messages/{message_id}/suggested-questions
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path |  | Yes | string |
+| message_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /trial-apps/{app_id}/parameters
+
+#### GET
+##### Summary
+
+Retrieve app parameters
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /trial-apps/{app_id}/site
+
+#### GET
+##### Summary
+
+Retrieve app site info
+
+##### Description
+
+Returns the site configuration for the application including theme, icons, and text.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /trial-apps/{app_id}/text-to-audio
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path |  | Yes | string |
+| payload | body |  | Yes | [TextToSpeechRequest](#texttospeechrequest) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /trial-apps/{app_id}/workflows
+
+#### GET
+##### Summary
+
+Get workflow detail
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /trial-apps/{app_id}/workflows/run
+
+#### POST
+##### Summary
+
+Run workflow
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path |  | Yes | string |
+| payload | body |  | Yes | [WorkflowRunRequest](#workflowrunrequest) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /trial-apps/{app_id}/workflows/tasks/{task_id}/stop
+
+#### POST
+##### Summary
+
+Stop workflow task
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| app_id | path |  | Yes | string |
+| task_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /website/crawl
+
+#### POST
+##### Description
+
+Crawl website content
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [WebsiteCrawlPayload](#websitecrawlpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Website crawl initiated successfully |
+| 400 | Invalid crawl parameters |
+
+### /website/crawl/status/{job_id}
+
+#### GET
+##### Description
+
+Get website crawl status
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [WebsiteCrawlStatusQuery](#websitecrawlstatusquery) |
+| job_id | path | Crawl job ID | Yes | string |
+| provider | query | Crawl provider (firecrawl/watercrawl/jinareader) | No | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Crawl status retrieved successfully |
+| 400 | Invalid provider |
+| 404 | Crawl job not found |
+
+### /workflow/{workflow_run_id}/events
+
+#### GET
+##### Summary
+
+Get workflow execution events stream after resume
+
+##### Description
+
+GET /console/api/workflow/<workflow_run_id>/events
+
+Returns Server-Sent Events stream.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| workflow_run_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workflow/{workflow_run_id}/pause-details
+
+#### GET
+##### Summary
+
+Get workflow pause details
+
+##### Description
+
+Get workflow pause details
+GET /console/api/workflow/<workflow_run_id>/pause-details
+
+Returns information about why and where the workflow is paused.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| workflow_run_id | path | Workflow run ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Workflow pause details retrieved successfully | [WorkflowPauseDetailsResponse](#workflowpausedetailsresponse) |
+| 404 | Workflow run not found |  |
+
+### /workspaces
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current
+
+#### POST
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [TenantInfoResponse](#tenantinforesponse) |
+
+### /workspaces/current/agent-provider/{provider_name}
+
+#### GET
+##### Description
+
+Get specific agent provider details
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider_name | path | Agent provider name | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | object |
+
+### /workspaces/current/agent-providers
+
+#### GET
+##### Description
+
+Get list of available agent providers
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [ object ] |
+
+### /workspaces/current/dataset-operators
+
+#### GET
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [AccountWithRoleList](#accountwithrolelist) |
+
+### /workspaces/current/default-model
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ParserGetDefault](#parsergetdefault) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ParserPostDefault](#parserpostdefault) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/endpoints
+
+#### POST
+##### Description
+
+Create a new plugin endpoint
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [EndpointCreatePayload](#endpointcreatepayload) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Endpoint created successfully | [EndpointCreateResponse](#endpointcreateresponse) |
+| 403 | Admin privileges required |  |
+
+### /workspaces/current/endpoints/create
+
+#### POST
+***DEPRECATED***
+##### Description
+
+Deprecated legacy alias for creating a plugin endpoint. Use POST /workspaces/current/endpoints instead.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [EndpointCreatePayload](#endpointcreatepayload) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Endpoint created successfully | [EndpointCreateResponse](#endpointcreateresponse) |
+| 403 | Admin privileges required |  |
+
+### /workspaces/current/endpoints/delete
+
+#### POST
+***DEPRECATED***
+##### Description
+
+Deprecated legacy alias for deleting a plugin endpoint. Use DELETE /workspaces/current/endpoints/{id} instead.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [EndpointIdPayload](#endpointidpayload) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Endpoint deleted successfully | [EndpointDeleteResponse](#endpointdeleteresponse) |
+| 403 | Admin privileges required |  |
+
+### /workspaces/current/endpoints/disable
+
+#### POST
+##### Description
+
+Disable a plugin endpoint
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [EndpointIdPayload](#endpointidpayload) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Endpoint disabled successfully | [EndpointDisableResponse](#endpointdisableresponse) |
+| 403 | Admin privileges required |  |
+
+### /workspaces/current/endpoints/enable
+
+#### POST
+##### Description
+
+Enable a plugin endpoint
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [EndpointIdPayload](#endpointidpayload) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Endpoint enabled successfully | [EndpointEnableResponse](#endpointenableresponse) |
+| 403 | Admin privileges required |  |
+
+### /workspaces/current/endpoints/list
+
+#### GET
+##### Description
+
+List plugin endpoints with pagination
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [EndpointListQuery](#endpointlistquery) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [EndpointListResponse](#endpointlistresponse) |
+
+### /workspaces/current/endpoints/list/plugin
+
+#### GET
+##### Description
+
+List endpoints for a specific plugin
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [EndpointListForPluginQuery](#endpointlistforpluginquery) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [PluginEndpointListResponse](#pluginendpointlistresponse) |
+
+### /workspaces/current/endpoints/update
+
+#### POST
+***DEPRECATED***
+##### Description
+
+Deprecated legacy alias for updating a plugin endpoint. Use PATCH /workspaces/current/endpoints/{id} instead.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [LegacyEndpointUpdatePayload](#legacyendpointupdatepayload) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Endpoint updated successfully | [EndpointUpdateResponse](#endpointupdateresponse) |
+| 403 | Admin privileges required |  |
+
+### /workspaces/current/endpoints/{id}
+
+#### DELETE
+##### Description
+
+Delete a plugin endpoint
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| id | path | Endpoint ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Endpoint deleted successfully | [EndpointDeleteResponse](#endpointdeleteresponse) |
+| 403 | Admin privileges required |  |
+
+#### PATCH
+##### Description
+
+Update a plugin endpoint
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [EndpointUpdatePayload](#endpointupdatepayload) |
+| id | path | Endpoint ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Endpoint updated successfully | [EndpointUpdateResponse](#endpointupdateresponse) |
+| 403 | Admin privileges required |  |
+
+### /workspaces/current/members
+
+#### GET
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Success | [AccountWithRoleList](#accountwithrolelist) |
+
+### /workspaces/current/members/invite-email
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [MemberInvitePayload](#memberinvitepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/members/owner-transfer-check
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [OwnerTransferCheckPayload](#ownertransfercheckpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/members/send-owner-transfer-confirm-email
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [OwnerTransferEmailPayload](#ownertransferemailpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/members/{member_id}
+
+#### DELETE
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| member_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/members/{member_id}/owner-transfer
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| member_id | path |  | Yes | string |
+| payload | body |  | Yes | [OwnerTransferPayload](#ownertransferpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/members/{member_id}/update-role
+
+#### PUT
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| member_id | path |  | Yes | string |
+| payload | body |  | Yes | [MemberRoleUpdatePayload](#memberroleupdatepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/model-providers
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ParserModelList](#parsermodellist) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/model-providers/{provider}/checkout-url
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/model-providers/{provider}/credentials
+
+#### DELETE
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| payload | body |  | Yes | [ParserCredentialDelete](#parsercredentialdelete) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| payload | body |  | Yes | [ParserCredentialId](#parsercredentialid) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| payload | body |  | Yes | [ParserCredentialCreate](#parsercredentialcreate) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### PUT
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| payload | body |  | Yes | [ParserCredentialUpdate](#parsercredentialupdate) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/model-providers/{provider}/credentials/switch
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| payload | body |  | Yes | [ParserCredentialSwitch](#parsercredentialswitch) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/model-providers/{provider}/credentials/validate
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| payload | body |  | Yes | [ParserCredentialValidate](#parsercredentialvalidate) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/model-providers/{provider}/models
+
+#### DELETE
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| payload | body |  | Yes | [ParserDeleteModels](#parserdeletemodels) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| payload | body |  | Yes | [ParserPostModels](#parserpostmodels) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/model-providers/{provider}/models/credentials
+
+#### DELETE
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| payload | body |  | Yes | [ParserDeleteCredential](#parserdeletecredential) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| payload | body |  | Yes | [ParserGetCredentials](#parsergetcredentials) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| payload | body |  | Yes | [ParserCreateCredential](#parsercreatecredential) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### PUT
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| payload | body |  | Yes | [ParserUpdateCredential](#parserupdatecredential) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/model-providers/{provider}/models/credentials/switch
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| payload | body |  | Yes | [ParserSwitch](#parserswitch) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/model-providers/{provider}/models/credentials/validate
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| payload | body |  | Yes | [ParserValidate](#parservalidate) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/model-providers/{provider}/models/disable
+
+#### PATCH
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| payload | body |  | Yes | [ParserDeleteModels](#parserdeletemodels) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/model-providers/{provider}/models/enable
+
+#### PATCH
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| payload | body |  | Yes | [ParserDeleteModels](#parserdeletemodels) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/model-providers/{provider}/models/load-balancing-configs/credentials-validate
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| payload | body |  | Yes | [LoadBalancingCredentialPayload](#loadbalancingcredentialpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/model-providers/{provider}/models/load-balancing-configs/{config_id}/credentials-validate
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| config_id | path |  | Yes | string |
+| provider | path |  | Yes | string |
+| payload | body |  | Yes | [LoadBalancingCredentialPayload](#loadbalancingcredentialpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/model-providers/{provider}/models/parameter-rules
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| payload | body |  | Yes | [ParserParameter](#parserparameter) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/model-providers/{provider}/preferred-provider-type
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| payload | body |  | Yes | [ParserPreferredProviderType](#parserpreferredprovidertype) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/models/model-types/{model_type}
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| model_type | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/permission
+
+#### GET
+##### Summary
+
+Get workspace permission settings
+
+##### Description
+
+Returns permission flags that control workspace features like member invitations and owner transfer.
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/asset
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ParserAsset](#parserasset) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/debugging-key
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/fetch-manifest
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ParserPluginIdentifierQuery](#parserpluginidentifierquery) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/icon
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ParserIcon](#parsericon) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/install/github
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ParserGithubInstall](#parsergithubinstall) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/install/marketplace
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ParserPluginIdentifiers](#parserpluginidentifiers) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/install/pkg
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ParserPluginIdentifiers](#parserpluginidentifiers) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/list
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ParserList](#parserlist) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/list/installations/ids
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ParserLatest](#parserlatest) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/list/latest-versions
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ParserLatest](#parserlatest) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/marketplace/pkg
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ParserPluginIdentifierQuery](#parserpluginidentifierquery) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/parameters/dynamic-options
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ParserDynamicOptions](#parserdynamicoptions) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/parameters/dynamic-options-with-credentials
+
+#### POST
+##### Summary
+
+Fetch dynamic options using credentials directly (for edit mode)
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ParserDynamicOptionsWithCredentials](#parserdynamicoptionswithcredentials) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/permission/change
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ParserPermissionChange](#parserpermissionchange) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/permission/fetch
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/preferences/autoupgrade/exclude
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ParserExcludePlugin](#parserexcludeplugin) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/preferences/change
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ParserPreferencesChange](#parserpreferenceschange) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/preferences/fetch
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/readme
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ParserReadme](#parserreadme) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/tasks
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ParserTasks](#parsertasks) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/tasks/delete_all
+
+#### POST
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/tasks/{task_id}
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| task_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/tasks/{task_id}/delete
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| task_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/tasks/{task_id}/delete/{identifier}
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| identifier | path |  | Yes | string |
+| task_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/uninstall
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ParserUninstall](#parseruninstall) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/upgrade/github
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ParserGithubUpgrade](#parsergithubupgrade) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/upgrade/marketplace
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ParserMarketplaceUpgrade](#parsermarketplaceupgrade) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/upload/bundle
+
+#### POST
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/upload/github
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ParserGithubUpload](#parsergithubupload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/plugin/upload/pkg
+
+#### POST
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-labels
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/api/add
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ApiToolProviderAddPayload](#apitoolprovideraddpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/api/delete
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ApiToolProviderDeletePayload](#apitoolproviderdeletepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/api/get
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/api/remote
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/api/schema
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ApiToolSchemaPayload](#apitoolschemapayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/api/test/pre
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ApiToolTestPayload](#apitooltestpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/api/tools
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/api/update
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ApiToolProviderUpdatePayload](#apitoolproviderupdatepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/builtin/{provider}/add
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| payload | body |  | Yes | [BuiltinToolAddPayload](#builtintooladdpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/builtin/{provider}/credential/info
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/builtin/{provider}/credential/schema/{credential_type}
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| credential_type | path |  | Yes | string |
+| provider | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/builtin/{provider}/credentials
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/builtin/{provider}/default-credential
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| payload | body |  | Yes | [BuiltinProviderDefaultCredentialPayload](#builtinproviderdefaultcredentialpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/builtin/{provider}/delete
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| payload | body |  | Yes | [BuiltinToolCredentialDeletePayload](#builtintoolcredentialdeletepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/builtin/{provider}/icon
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/builtin/{provider}/info
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/builtin/{provider}/oauth/client-schema
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/builtin/{provider}/oauth/custom-client
+
+#### DELETE
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| payload | body |  | Yes | [ToolOAuthCustomClientPayload](#tooloauthcustomclientpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/builtin/{provider}/tools
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/builtin/{provider}/update
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| payload | body |  | Yes | [BuiltinToolUpdatePayload](#builtintoolupdatepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/mcp
+
+#### DELETE
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [MCPProviderDeletePayload](#mcpproviderdeletepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [MCPProviderCreatePayload](#mcpprovidercreatepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### PUT
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [MCPProviderUpdatePayload](#mcpproviderupdatepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/mcp/auth
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [MCPAuthPayload](#mcpauthpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/mcp/tools/{provider_id}
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/mcp/update/{provider_id}
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/workflow/create
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [WorkflowToolCreatePayload](#workflowtoolcreatepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/workflow/delete
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [WorkflowToolDeletePayload](#workflowtooldeletepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/workflow/get
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/workflow/tools
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-provider/workflow/update
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [WorkflowToolUpdatePayload](#workflowtoolupdatepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tool-providers
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tools/api
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tools/builtin
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tools/mcp
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/tools/workflow
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/trigger-provider/{provider}/icon
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/trigger-provider/{provider}/info
+
+#### GET
+##### Summary
+
+Get info for a trigger provider
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/trigger-provider/{provider}/oauth/client
+
+#### DELETE
+##### Summary
+
+Remove custom OAuth client configuration
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### GET
+##### Summary
+
+Get OAuth client configuration for a provider
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### POST
+##### Summary
+
+Configure custom OAuth client for a provider
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| payload | body |  | Yes | [TriggerOAuthClientPayload](#triggeroauthclientpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/trigger-provider/{provider}/subscriptions/builder/build/{subscription_builder_id}
+
+#### POST
+##### Summary
+
+Build a subscription instance for a trigger provider
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| subscription_builder_id | path |  | Yes | string |
+| payload | body |  | Yes | [TriggerSubscriptionBuilderUpdatePayload](#triggersubscriptionbuilderupdatepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/trigger-provider/{provider}/subscriptions/builder/create
+
+#### POST
+##### Summary
+
+Add a new subscription instance for a trigger provider
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| payload | body |  | Yes | [TriggerSubscriptionBuilderCreatePayload](#triggersubscriptionbuildercreatepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/trigger-provider/{provider}/subscriptions/builder/logs/{subscription_builder_id}
+
+#### GET
+##### Summary
+
+Get the request logs for a subscription instance for a trigger provider
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| subscription_builder_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/trigger-provider/{provider}/subscriptions/builder/update/{subscription_builder_id}
+
+#### POST
+##### Summary
+
+Update a subscription instance for a trigger provider
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| subscription_builder_id | path |  | Yes | string |
+| payload | body |  | Yes | [TriggerSubscriptionBuilderUpdatePayload](#triggersubscriptionbuilderupdatepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/trigger-provider/{provider}/subscriptions/builder/verify-and-update/{subscription_builder_id}
+
+#### POST
+##### Summary
+
+Verify and update a subscription instance for a trigger provider
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| subscription_builder_id | path |  | Yes | string |
+| payload | body |  | Yes | [TriggerSubscriptionBuilderVerifyPayload](#triggersubscriptionbuilderverifypayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/trigger-provider/{provider}/subscriptions/builder/{subscription_builder_id}
+
+#### GET
+##### Summary
+
+Get a subscription instance for a trigger provider
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| subscription_builder_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/trigger-provider/{provider}/subscriptions/list
+
+#### GET
+##### Summary
+
+List all trigger subscriptions for the current tenant's provider
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/trigger-provider/{provider}/subscriptions/oauth/authorize
+
+#### GET
+##### Summary
+
+Initiate OAuth authorization flow for a trigger provider
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/trigger-provider/{provider}/subscriptions/verify/{subscription_id}
+
+#### POST
+##### Summary
+
+Verify credentials for an existing subscription (edit mode only)
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| provider | path |  | Yes | string |
+| subscription_id | path |  | Yes | string |
+| payload | body |  | Yes | [TriggerSubscriptionBuilderVerifyPayload](#triggersubscriptionbuilderverifypayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/trigger-provider/{subscription_id}/subscriptions/delete
+
+#### POST
+##### Summary
+
+Delete a subscription instance
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| subscription_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/trigger-provider/{subscription_id}/subscriptions/update
+
+#### POST
+##### Summary
+
+Update a subscription instance
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| subscription_id | path |  | Yes | string |
+| payload | body |  | Yes | [TriggerSubscriptionBuilderUpdatePayload](#triggersubscriptionbuilderupdatepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/current/triggers
+
+#### GET
+##### Summary
+
+List all trigger providers for the current tenant
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/custom-config
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [WorkspaceCustomConfigPayload](#workspacecustomconfigpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/custom-config/webapp-logo/upload
+
+#### POST
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/info
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [WorkspaceInfoPayload](#workspaceinfopayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/switch
+
+#### POST
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [SwitchWorkspacePayload](#switchworkspacepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /workspaces/{tenant_id}/model-providers/{provider}/{icon_type}/{lang}
+
+#### GET
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| icon_type | path |  | Yes | string |
+| lang | path |  | Yes | string |
+| provider | path |  | Yes | string |
+| tenant_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+---
+## default
+Default namespace
+
+### /explore/banners
+
+#### GET
+##### Summary
+
+Get banner list
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+---
+### Models
+
+#### APIBasedExtensionListResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| APIBasedExtensionListResponse | array |  |  |
+
+#### APIBasedExtensionPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| api_endpoint | string | API endpoint URL | Yes |
+| api_key | string | API key for authentication | Yes |
+| name | string | Extension name | Yes |
+
+#### APIBasedExtensionResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| api_endpoint | string |  | Yes |
+| api_key | string |  | Yes |
+| created_at | integer |  | No |
+| id | string |  | Yes |
+| name | string |  | Yes |
+
+#### Account
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| avatar | string |  | No |
+| created_at | integer |  | No |
+| email | string |  | Yes |
+| id | string |  | Yes |
+| interface_language | string |  | No |
+| interface_theme | string |  | No |
+| is_password_set | boolean |  | Yes |
+| last_login_at | integer |  | No |
+| last_login_ip | string |  | No |
+| name | string |  | Yes |
+| timezone | string |  | No |
+
+#### AccountAvatarPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| avatar | string |  | Yes |
+
+#### AccountAvatarQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| avatar | string | Avatar file ID | Yes |
+
+#### AccountDeletePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| code | string |  | Yes |
+| token | string |  | Yes |
+
+#### AccountDeletionFeedbackPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| email | string |  | Yes |
+| feedback | string |  | Yes |
+
+#### AccountInitPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| interface_language | string |  | Yes |
+| invitation_code | string |  | No |
+| timezone | string |  | Yes |
+
+#### AccountIntegrateListResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data | [ [AccountIntegrateResponse](#accountintegrateresponse) ] |  | Yes |
+
+#### AccountIntegrateResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at | integer |  | No |
+| is_bound | boolean |  | Yes |
+| link | string |  | No |
+| provider | string |  | Yes |
+
+#### AccountInterfaceLanguagePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| interface_language | string |  | Yes |
+
+#### AccountInterfaceThemePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| interface_theme | string | *Enum:* `"dark"`, `"light"` | Yes |
+
+#### AccountNamePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| name | string |  | Yes |
+
+#### AccountPasswordPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| new_password | string |  | Yes |
+| password | string |  | No |
+| repeat_new_password | string |  | Yes |
+
+#### AccountTimezonePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| timezone | string |  | Yes |
+
+#### AccountWithRole
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| avatar | string |  | No |
+| created_at | integer |  | No |
+| email | string |  | Yes |
+| id | string |  | Yes |
+| last_active_at | integer |  | No |
+| last_login_at | integer |  | No |
+| name | string |  | Yes |
+| role | string |  | Yes |
+| status | string |  | Yes |
+
+#### AccountWithRoleList
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| accounts | [ [AccountWithRole](#accountwithrole) ] |  | Yes |
+
+#### ActivateCheckQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| email | string |  | No |
+| token | string |  | Yes |
+| workspace_id | string |  | No |
+
+#### ActivatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| email | string |  | No |
+| interface_language | string |  | Yes |
+| name | string |  | Yes |
+| timezone | string |  | Yes |
+| token | string |  | Yes |
+| workspace_id | string |  | No |
+
+#### ActivationCheckResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data | object | Activation data if valid | No |
+| is_valid | boolean | Whether token is valid | Yes |
+
+#### ActivationResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| result | string | Operation result | Yes |
+
+#### AdvancedChatWorkflowRunForListResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| conversation_id | string |  | No |
+| created_at | integer |  | No |
+| created_by_account | [SimpleAccount](#simpleaccount) |  | No |
+| elapsed_time | number |  | No |
+| exceptions_count | integer |  | No |
+| finished_at | integer |  | No |
+| id | string |  | Yes |
+| message_id | string |  | No |
+| retry_index | integer |  | No |
+| status | string |  | No |
+| total_steps | integer |  | No |
+| total_tokens | integer |  | No |
+| version | string |  | No |
+
+#### AdvancedChatWorkflowRunPaginationResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data | [ [AdvancedChatWorkflowRunForListResponse](#advancedchatworkflowrunforlistresponse) ] |  | Yes |
+| has_more | boolean |  | Yes |
+| limit | integer |  | Yes |
+
+#### AdvancedChatWorkflowRunPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| conversation_id | string |  | No |
+| files | [ object ] |  | No |
+| inputs | object |  | No |
+| parent_message_id | string |  | No |
+| query | string |  | No |
+
+#### AdvancedPromptTemplateQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| app_mode | string | Application mode | Yes |
+| has_context | string | Whether has context | No |
+| model_mode | string | Model mode | Yes |
+| model_name | string | Model name | Yes |
+
+#### AgentLogQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| conversation_id | string | Conversation UUID | Yes |
+| message_id | string | Message UUID | Yes |
+
+#### AgentThought
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| chain_id | string |  | No |
+| created_at | integer |  | No |
+| files | [ string ] |  | Yes |
+| id | string |  | Yes |
+| message_chain_id | string |  | No |
+| message_id | string |  | Yes |
+| observation | string |  | No |
+| position | integer |  | Yes |
+| thought | string |  | No |
+| tool | string |  | No |
+| tool_input | string |  | No |
+| tool_labels | [JSONValue](#jsonvalue) |  | Yes |
+
+#### Annotation
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| content | string |  | No |
+| created_at | integer |  | No |
+| hit_count | integer |  | No |
+| id | string |  | Yes |
+| question | string |  | No |
+
+#### AnnotationCountResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| count | integer | Number of annotations | Yes |
+
+#### AnnotationExportList
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data | [ [Annotation](#annotation) ] |  | Yes |
+
+#### AnnotationFilePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| message_id | string | Message ID | Yes |
+
+#### AnnotationHitHistory
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| annotation_content | string |  | No |
+| annotation_question | string |  | No |
+| created_at | integer |  | No |
+| id | string |  | Yes |
+| question | string |  | No |
+| score | number |  | No |
+| source | string |  | No |
+
+#### AnnotationHitHistoryList
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data | [ [AnnotationHitHistory](#annotationhithistory) ] |  | Yes |
+| has_more | boolean |  | Yes |
+| limit | integer |  | Yes |
+| page | integer |  | Yes |
+| total | integer |  | Yes |
+
+#### AnnotationList
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data | [ [Annotation](#annotation) ] |  | Yes |
+| has_more | boolean |  | Yes |
+| limit | integer |  | Yes |
+| page | integer |  | Yes |
+| total | integer |  | Yes |
+
+#### AnnotationListQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| keyword | string | Search keyword | No |
+| limit | integer | Page size | No |
+| page | integer | Page number | No |
+
+#### AnnotationReplyPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| embedding_model_name | string | Embedding model name | Yes |
+| embedding_provider_name | string | Embedding provider name | Yes |
+| score_threshold | number | Score threshold for annotation matching | Yes |
+
+#### AnnotationReplyStatusQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| action | string | *Enum:* `"disable"`, `"enable"` | Yes |
+
+#### AnnotationSettingUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| score_threshold | number | Score threshold | Yes |
+
+#### ApiKeyAuthBindingPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| category | string |  | Yes |
+| credentials | object |  | Yes |
+| provider | string |  | Yes |
+
+#### ApiKeyItem
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at | integer |  | No |
+| id | string |  | Yes |
+| last_used_at | integer |  | No |
+| token | string |  | Yes |
+| type | string |  | Yes |
+
+#### ApiKeyList
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data | [ [ApiKeyItem](#apikeyitem) ] |  | Yes |
+
+#### ApiProviderSchemaType
+
+Enum class for api provider schema type.
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| ApiProviderSchemaType | string | Enum class for api provider schema type. |  |
+
+#### ApiToolProviderAddPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credentials | object |  | Yes |
+| custom_disclaimer | string |  | No |
+| icon | object |  | Yes |
+| labels | [ string ] |  | No |
+| privacy_policy | string |  | No |
+| provider | string |  | Yes |
+| schema | string |  | Yes |
+| schema_type | [ApiProviderSchemaType](#apiproviderschematype) |  | Yes |
+
+#### ApiToolProviderDeletePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| provider | string |  | Yes |
+
+#### ApiToolProviderUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credentials | object |  | Yes |
+| custom_disclaimer | string |  | No |
+| icon | object |  | Yes |
+| labels | [ string ] |  | No |
+| original_provider | string |  | Yes |
+| privacy_policy | string |  | No |
+| provider | string |  | Yes |
+| schema | string |  | Yes |
+| schema_type | [ApiProviderSchemaType](#apiproviderschematype) |  | Yes |
+
+#### ApiToolSchemaPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| schema | string |  | Yes |
+
+#### ApiToolTestPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credentials | object |  | Yes |
+| parameters | object |  | Yes |
+| provider_name | string |  | No |
+| schema | string |  | Yes |
+| schema_type | [ApiProviderSchemaType](#apiproviderschematype) |  | Yes |
+| tool_name | string |  | Yes |
+
+#### AppApiStatusPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| enable_api | boolean | Enable or disable API | Yes |
+
+#### AppDetail
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| access_mode | string |  | No |
+| app_model_config | [ModelConfig](#modelconfig) |  | No |
+| created_at | integer |  | No |
+| created_by | string |  | No |
+| description | string |  | No |
+| enable_api | boolean |  | Yes |
+| enable_site | boolean |  | Yes |
+| icon | string |  | No |
+| icon_background | string |  | No |
+| id | string |  | Yes |
+| mode_compatible_with_agent | string |  | Yes |
+| name | string |  | Yes |
+| tags | [ [Tag](#tag) ] |  | No |
+| tracing | [JSONValue](#jsonvalue) |  | No |
+| updated_at | integer |  | No |
+| updated_by | string |  | No |
+| use_icon_as_answer_icon | boolean |  | No |
+| workflow | [WorkflowPartial](#workflowpartial) |  | No |
+
+#### AppDetailKernel
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| description | string |  | No |
+| icon | string |  | No |
+| icon_background | string |  | No |
+| icon_type | string |  | No |
+| icon_url | object |  | No |
+| id | string |  | No |
+| mode | string |  | No |
+| name | string |  | No |
+
+#### AppDetailWithSite
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| access_mode | string |  | No |
+| api_base_url | string |  | No |
+| app_model_config | [ModelConfig](#modelconfig) |  | No |
+| created_at | integer |  | No |
+| created_by | string |  | No |
+| deleted_tools | [ [DeletedTool](#deletedtool) ] |  | No |
+| description | string |  | No |
+| enable_api | boolean |  | Yes |
+| enable_site | boolean |  | Yes |
+| icon | string |  | No |
+| icon_background | string |  | No |
+| icon_type | string |  | No |
+| id | string |  | Yes |
+| max_active_requests | integer |  | No |
+| mode_compatible_with_agent | string |  | Yes |
+| name | string |  | Yes |
+| site | [Site](#site) |  | No |
+| tags | [ [Tag](#tag) ] |  | No |
+| tracing | [JSONValue](#jsonvalue) |  | No |
+| updated_at | integer |  | No |
+| updated_by | string |  | No |
+| use_icon_as_answer_icon | boolean |  | No |
+| workflow | [WorkflowPartial](#workflowpartial) |  | No |
+
+#### AppExportQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| include_secret | boolean | Include secrets in export | No |
+| workflow_id | string | Specific workflow ID to export | No |
+
+#### AppExportResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data | string |  | Yes |
+
+#### AppIconPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| icon | string | Icon data | No |
+| icon_background | string | Icon background color | No |
+| icon_type | [IconType](#icontype) | Icon type | No |
+
+#### AppImportPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| app_id | string |  | No |
+| description | string |  | No |
+| icon | string |  | No |
+| icon_background | string |  | No |
+| icon_type | string |  | No |
+| mode | string | Import mode | Yes |
+| name | string |  | No |
+| yaml_content | string |  | No |
+| yaml_url | string |  | No |
+
+#### AppListQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| is_created_by_me | boolean | Filter by creator | No |
+| limit | integer | Page size (1-100) | No |
+| mode | string | App mode filter<br>*Enum:* `"advanced-chat"`, `"agent-chat"`, `"all"`, `"channel"`, `"chat"`, `"completion"`, `"workflow"` | No |
+| name | string | Filter by app name | No |
+| page | integer | Page number (1-99999) | No |
+| tag_ids | [ string ] | Filter by tag IDs | No |
+
+#### AppMCPServerResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at | integer |  | No |
+| description | string |  | Yes |
+| id | string |  | Yes |
+| name | string |  | Yes |
+| parameters |  |  | Yes |
+| server_code | string |  | Yes |
+| status | [AppMCPServerStatus](#appmcpserverstatus) |  | Yes |
+| updated_at | integer |  | No |
+
+#### AppMCPServerStatus
+
+AppMCPServer Status Enum
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| AppMCPServerStatus | string | AppMCPServer Status Enum |  |
+
+#### AppNamePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| name | string | Name to check | Yes |
+
+#### AppPagination
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| has_next | boolean |  | Yes |
+| items | [ [AppPartial](#apppartial) ] |  | Yes |
+| page | integer |  | Yes |
+| per_page | integer |  | Yes |
+| total | integer |  | Yes |
+
+#### AppPartial
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| access_mode | string |  | No |
+| app_model_config | [ModelConfigPartial](#modelconfigpartial) |  | No |
+| author_name | string |  | No |
+| create_user_name | string |  | No |
+| created_at | integer |  | No |
+| created_by | string |  | No |
+| desc_or_prompt | string |  | No |
+| has_draft_trigger | boolean |  | No |
+| icon | string |  | No |
+| icon_background | string |  | No |
+| icon_type | string |  | No |
+| id | string |  | Yes |
+| max_active_requests | integer |  | No |
+| mode_compatible_with_agent | string |  | Yes |
+| name | string |  | Yes |
+| tags | [ [Tag](#tag) ] |  | No |
+| updated_at | integer |  | No |
+| updated_by | string |  | No |
+| use_icon_as_answer_icon | boolean |  | No |
+| workflow | [WorkflowPartial](#workflowpartial) |  | No |
+
+#### AppSiteResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| app_id | string |  | Yes |
+| code | string |  | No |
+| copyright | string |  | No |
+| custom_disclaimer | string |  | No |
+| customize_domain | string |  | No |
+| customize_token_strategy | string |  | Yes |
+| default_language | string |  | Yes |
+| description | string |  | No |
+| icon | string |  | No |
+| icon_background | string |  | No |
+| privacy_policy | string |  | No |
+| prompt_public | boolean |  | Yes |
+| show_workflow_steps | boolean |  | Yes |
+| title | string |  | Yes |
+| use_icon_as_answer_icon | boolean |  | Yes |
+
+#### AppSiteStatusPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| enable_site | boolean | Enable or disable site | Yes |
+
+#### AppSiteUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| chat_color_theme | string |  | No |
+| chat_color_theme_inverted | boolean |  | No |
+| copyright | string |  | No |
+| custom_disclaimer | string |  | No |
+| customize_domain | string |  | No |
+| customize_token_strategy | string | *Enum:* `"allow"`, `"must"`, `"not_allow"` | No |
+| default_language | string |  | No |
+| description | string |  | No |
+| icon | string |  | No |
+| icon_background | string |  | No |
+| icon_type | string |  | No |
+| privacy_policy | string |  | No |
+| prompt_public | boolean |  | No |
+| show_workflow_steps | boolean |  | No |
+| title | string |  | No |
+| use_icon_as_answer_icon | boolean |  | No |
+
+#### AppTracePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| enabled | boolean | Enable or disable tracing | Yes |
+| tracing_provider | string | Tracing provider | No |
+
+#### AudioTranscriptResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| text | string | Transcribed text from audio | Yes |
+
+#### BatchImportPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| upload_file_id | string |  | Yes |
+
+#### BedrockRetrievalPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| knowledge_id | string |  | Yes |
+| query | string |  | Yes |
+| retrieval_setting | [BedrockRetrievalSetting](#bedrockretrievalsetting) |  | Yes |
+
+#### BedrockRetrievalSetting
+
+Retrieval settings for Amazon Bedrock knowledge base queries.
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| score_threshold | number | Minimum relevance score threshold | No |
+| top_k | integer | Maximum number of results to retrieve | No |
+
+#### BuiltinProviderDefaultCredentialPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| id | string |  | Yes |
+
+#### BuiltinToolAddPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credentials | object |  | Yes |
+| name | string |  | No |
+| type | [CredentialType](#credentialtype) |  | Yes |
+
+#### BuiltinToolCredentialDeletePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credential_id | string |  | Yes |
+
+#### BuiltinToolUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credential_id | string |  | Yes |
+| credentials | object |  | No |
+| name | string |  | No |
+
+#### ButtonStyle
+
+Button styles for user actions.
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| ButtonStyle | string | Button styles for user actions. |  |
+
+#### ChangeEmailResetPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| new_email | string |  | Yes |
+| token | string |  | Yes |
+
+#### ChangeEmailSendPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| email | string |  | Yes |
+| language | string |  | No |
+| phase | string |  | No |
+| token | string |  | No |
+
+#### ChangeEmailValidityPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| code | string |  | Yes |
+| email | string |  | Yes |
+| token | string |  | Yes |
+
+#### ChatConversationQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| annotation_status | string | Annotation status filter<br>*Enum:* `"all"`, `"annotated"`, `"not_annotated"` | No |
+| end | string | End date (YYYY-MM-DD HH:MM) | No |
+| keyword | string | Search keyword | No |
+| limit | integer | Page size (1-100) | No |
+| page | integer | Page number | No |
+| sort_by | string | Sort field and direction<br>*Enum:* `"-created_at"`, `"-updated_at"`, `"created_at"`, `"updated_at"` | No |
+| start | string | Start date (YYYY-MM-DD HH:MM) | No |
+
+#### ChatMessagePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| conversation_id | string | Conversation ID | No |
+| files | [  ] | Uploaded files | No |
+| inputs | object |  | Yes |
+| model_config | object |  | Yes |
+| parent_message_id | string | Parent message ID | No |
+| query | string | User query | Yes |
+| response_mode | string | Response mode<br>*Enum:* `"blocking"`, `"streaming"` | No |
+| retriever_from | string | Retriever source | No |
+
+#### ChatMessagesQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| conversation_id | string | Conversation ID | Yes |
+| first_id | string | First message ID for pagination | No |
+| limit | integer | Number of messages to return (1-100) | No |
+
+#### ChatRequest
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| conversation_id | string |  | No |
+| files | [  ] |  | No |
+| inputs | object |  | Yes |
+| parent_message_id | string |  | No |
+| query | string |  | Yes |
+| retriever_from | string |  | No |
+
+#### CheckDependenciesResult
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| leaked_dependencies | [ [PluginDependency](#plugindependency) ] |  | No |
+
+#### CheckEmailUniquePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| email | string |  | Yes |
+
+#### ChildChunkBatchUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| chunks | [ [ChildChunkUpdateArgs](#childchunkupdateargs) ] |  | Yes |
+
+#### ChildChunkCreatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| content | string |  | Yes |
+
+#### ChildChunkUpdateArgs
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| content | string |  | Yes |
+| id | string |  | No |
+
+#### ChildChunkUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| content | string |  | Yes |
+
+#### CodeBasedExtensionResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data |  | Extension data | Yes |
+| module | string | Module name | Yes |
+
+#### CompletionConversationQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| annotation_status | string | Annotation status filter<br>*Enum:* `"all"`, `"annotated"`, `"not_annotated"` | No |
+| end | string | End date (YYYY-MM-DD HH:MM) | No |
+| keyword | string | Search keyword | No |
+| limit | integer | Page size (1-100) | No |
+| page | integer | Page number | No |
+| start | string | Start date (YYYY-MM-DD HH:MM) | No |
+
+#### CompletionMessageExplorePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| files | [ object ] |  | No |
+| inputs | object |  | Yes |
+| query | string |  | No |
+| response_mode | string | *Enum:* `"blocking"`, `"streaming"` | No |
+| retriever_from | string |  | No |
+
+#### CompletionMessagePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| files | [  ] | Uploaded files | No |
+| inputs | object |  | Yes |
+| model_config | object |  | Yes |
+| query | string | Query text | No |
+| response_mode | string | Response mode<br>*Enum:* `"blocking"`, `"streaming"` | No |
+| retriever_from | string | Retriever source | No |
+
+#### CompletionRequest
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| files | [  ] |  | No |
+| inputs | object |  | Yes |
+| query | string |  | No |
+| response_mode | string | *Enum:* `"blocking"`, `"streaming"` | No |
+| retriever_from | string |  | No |
+
+#### ComplianceDownloadQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| doc_name | string | Compliance document name | Yes |
+
+#### Condition
+
+Condition detail
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| comparison_operator | string | *Enum:* `"<"`, `"="`, `">"`, `"after"`, `"before"`, `"contains"`, `"empty"`, `"end with"`, `"in"`, `"is"`, `"is not"`, `"not contains"`, `"not empty"`, `"not in"`, `"start with"`, `"≠"`, `"≤"`, `"≥"` | Yes |
+| name | string |  | Yes |
+| value |  |  | No |
+
+#### ConsoleDatasetListQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| ids | [ string ] | Filter by dataset IDs | No |
+| include_all | boolean | Include all datasets | No |
+| keyword | string | Search keyword | No |
+| limit | integer | Number of items per page | No |
+| page | integer | Page number | No |
+| tag_ids | [ string ] | Filter by tag IDs | No |
+
+#### Conversation
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| admin_feedback_stats | [FeedbackStat](#feedbackstat) |  | No |
+| annotation | [ConversationAnnotation](#conversationannotation) |  | No |
+| created_at | integer |  | No |
+| first_message | [SimpleMessageDetail](#simplemessagedetail) |  | No |
+| from_account_id | string |  | No |
+| from_account_name | string |  | No |
+| from_end_user_id | string |  | No |
+| from_end_user_session_id | string |  | No |
+| from_source | string |  | Yes |
+| id | string |  | Yes |
+| model_config | [SimpleModelConfig](#simplemodelconfig) |  | No |
+| read_at | integer |  | No |
+| status | string |  | Yes |
+| updated_at | integer |  | No |
+| user_feedback_stats | [FeedbackStat](#feedbackstat) |  | No |
+
+#### ConversationAnnotation
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| account | [SimpleAccount](#simpleaccount) |  | No |
+| content | string |  | Yes |
+| created_at | integer |  | No |
+| id | string |  | Yes |
+| question | string |  | No |
+
+#### ConversationAnnotationHitHistory
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| annotation_create_account | [SimpleAccount](#simpleaccount) |  | No |
+| created_at | integer |  | No |
+| id | string |  | Yes |
+
+#### ConversationDetail
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| admin_feedback_stats | [FeedbackStat](#feedbackstat) |  | No |
+| annotated | boolean |  | Yes |
+| created_at | integer |  | No |
+| from_account_id | string |  | No |
+| from_end_user_id | string |  | No |
+| from_source | string |  | Yes |
+| id | string |  | Yes |
+| introduction | string |  | No |
+| message_count | integer |  | Yes |
+| model_config | [ModelConfig](#modelconfig) |  | No |
+| status | string |  | Yes |
+| updated_at | integer |  | No |
+| user_feedback_stats | [FeedbackStat](#feedbackstat) |  | No |
+
+#### ConversationListQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| last_id | string |  | No |
+| limit | integer |  | No |
+| pinned | boolean |  | No |
+
+#### ConversationMessageDetail
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at | integer |  | No |
+| first_message | [MessageDetail](#messagedetail) |  | No |
+| from_account_id | string |  | No |
+| from_end_user_id | string |  | No |
+| from_source | string |  | Yes |
+| id | string |  | Yes |
+| model_config | [ModelConfig](#modelconfig) |  | No |
+| status | string |  | Yes |
+
+#### ConversationPagination
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| has_next | boolean |  | Yes |
+| items | [ [Conversation](#conversation) ] |  | Yes |
+| page | integer |  | Yes |
+| per_page | integer |  | Yes |
+| total | integer |  | Yes |
+
+#### ConversationRenamePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| auto_generate | boolean |  | No |
+| name | string |  | No |
+
+#### ConversationVariableResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at | integer |  | No |
+| description | string |  | No |
+| id | string |  | Yes |
+| name | string |  | Yes |
+| updated_at | integer |  | No |
+| value | string |  | No |
+| value_type | string |  | Yes |
+
+#### ConversationVariableUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| conversation_variables | [ object ] | Conversation variables for the draft workflow | Yes |
+
+#### ConversationVariablesQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| conversation_id | string | Conversation ID to filter variables | Yes |
+
+#### ConversationWithSummary
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| admin_feedback_stats | [FeedbackStat](#feedbackstat) |  | No |
+| annotated | boolean |  | Yes |
+| created_at | integer |  | No |
+| from_account_id | string |  | No |
+| from_account_name | string |  | No |
+| from_end_user_id | string |  | No |
+| from_end_user_session_id | string |  | No |
+| from_source | string |  | Yes |
+| id | string |  | Yes |
+| message_count | integer |  | Yes |
+| model_config | [SimpleModelConfig](#simplemodelconfig) |  | No |
+| name | string |  | Yes |
+| read_at | integer |  | No |
+| status | string |  | Yes |
+| status_count | [StatusCount](#statuscount) |  | No |
+| summary_or_query | string |  | Yes |
+| updated_at | integer |  | No |
+| user_feedback_stats | [FeedbackStat](#feedbackstat) |  | No |
+
+#### ConversationWithSummaryPagination
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| has_next | boolean |  | Yes |
+| items | [ [ConversationWithSummary](#conversationwithsummary) ] |  | Yes |
+| page | integer |  | Yes |
+| per_page | integer |  | Yes |
+| total | integer |  | Yes |
+
+#### ConvertToWorkflowPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| icon | string |  | No |
+| icon_background | string |  | No |
+| icon_type | string |  | No |
+| name | string |  | No |
+
+#### CopyAppPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| description | string | Description for the copied app | No |
+| icon | string | Icon | No |
+| icon_background | string | Icon background color | No |
+| icon_type | [IconType](#icontype) | Icon type | No |
+| name | string | Name for the copied app | No |
+
+#### CreateAnnotationPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| annotation_reply | object | Annotation reply data | No |
+| answer | string | Answer text | No |
+| content | string | Content text | No |
+| message_id | string | Message ID | No |
+| question | string | Question text | No |
+
+#### CreateAppPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| description | string | App description (max 400 chars) | No |
+| icon | string | Icon | No |
+| icon_background | string | Icon background color | No |
+| icon_type | [IconType](#icontype) | Icon type | No |
+| mode | string | App mode<br>*Enum:* `"advanced-chat"`, `"agent-chat"`, `"chat"`, `"completion"`, `"workflow"` | Yes |
+| name | string | App name | Yes |
+
+#### CredentialType
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| CredentialType | string |  |  |
+
+#### DataSource
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| info_list | [InfoList](#infolist) |  | Yes |
+
+#### DataSourceIntegrate
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at | object |  | No |
+| disabled | boolean |  | No |
+| id | string |  | No |
+| is_bound | boolean |  | No |
+| link | string |  | No |
+| provider | string |  | No |
+| source_info | [DataSourceIntegrateWorkspace](#datasourceintegrateworkspace) |  | No |
+
+#### DataSourceIntegrateIcon
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| emoji | string |  | No |
+| type | string |  | No |
+| url | string |  | No |
+
+#### DataSourceIntegrateList
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data | [ [DataSourceIntegrate](#datasourceintegrate) ] |  | No |
+
+#### DataSourceIntegratePage
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| page_icon | [DataSourceIntegrateIcon](#datasourceintegrateicon) |  | No |
+| page_id | string |  | No |
+| page_name | string |  | No |
+| parent_id | string |  | No |
+| type | string |  | No |
+
+#### DataSourceIntegrateWorkspace
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| pages | [ [DataSourceIntegratePage](#datasourceintegratepage) ] |  | No |
+| total | integer |  | No |
+| workspace_icon | string |  | No |
+| workspace_id | string |  | No |
+| workspace_name | string |  | No |
+
+#### DatasetAndDocumentResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| batch | string |  | Yes |
+| dataset | [DatasetResponse](#datasetresponse) |  | Yes |
+| documents | [ [DocumentResponse](#documentresponse) ] |  | Yes |
+
+#### DatasetBase
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at | object |  | No |
+| created_by | string |  | No |
+| data_source_type | string |  | No |
+| description | string |  | No |
+| id | string |  | No |
+| indexing_technique | string |  | No |
+| name | string |  | No |
+| permission | string |  | No |
+
+#### DatasetContent
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| content | string |  | No |
+| content_type | string |  | No |
+| file_info | [DatasetFileInfo](#datasetfileinfo) |  | No |
+
+#### DatasetCreatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| description | string |  | No |
+| external_knowledge_api_id | string |  | No |
+| external_knowledge_id | string |  | No |
+| indexing_technique | string |  | No |
+| name | string |  | Yes |
+| permission | [DatasetPermissionEnum](#datasetpermissionenum) |  | No |
+| provider | string |  | No |
+
+#### DatasetDetail
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| app_count | integer |  | No |
+| author_name | string |  | No |
+| built_in_field_enabled | boolean |  | No |
+| chunk_structure | string |  | No |
+| created_at | object |  | No |
+| created_by | string |  | No |
+| data_source_type | string |  | No |
+| description | string |  | No |
+| doc_form | string |  | No |
+| doc_metadata | [ [DatasetDocMetadata](#datasetdocmetadata) ] |  | No |
+| document_count | integer |  | No |
+| embedding_available | boolean |  | No |
+| embedding_model | string |  | No |
+| embedding_model_provider | string |  | No |
+| enable_api | boolean |  | No |
+| external_knowledge_info | [ExternalKnowledgeInfo](#externalknowledgeinfo) |  | No |
+| external_retrieval_model | [ExternalRetrievalModel](#externalretrievalmodel) |  | No |
+| icon_info | [DatasetIconInfo](#dataseticoninfo) |  | No |
+| id | string |  | No |
+| indexing_technique | string |  | No |
+| is_multimodal | boolean |  | No |
+| is_published | boolean |  | No |
+| name | string |  | No |
+| permission | string |  | No |
+| pipeline_id | string |  | No |
+| provider | string |  | No |
+| retrieval_model_dict | [DatasetRetrievalModel](#datasetretrievalmodel) |  | No |
+| runtime_mode | string |  | No |
+| summary_index_setting | [_AnonymousInlineModel_b1954337d565](#_anonymousinlinemodel_b1954337d565) |  | No |
+| tags | [ [Tag](#tag) ] |  | No |
+| total_available_documents | integer |  | No |
+| total_documents | integer |  | No |
+| updated_at | object |  | No |
+| updated_by | string |  | No |
+| word_count | integer |  | No |
+
+#### DatasetDocMetadata
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| id | string |  | No |
+| name | string |  | No |
+| type | string |  | No |
+
+#### DatasetFileInfo
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| extension | string |  | No |
+| id | string |  | No |
+| mime_type | string |  | No |
+| name | string |  | No |
+| size | integer |  | No |
+| source_url | string |  | No |
+
+#### DatasetIconInfo
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| icon | string |  | No |
+| icon_background | string |  | No |
+| icon_type | string |  | No |
+| icon_url | string |  | No |
+
+#### DatasetKeywordSetting
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| keyword_weight | number |  | No |
+
+#### DatasetPermissionEnum
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| DatasetPermissionEnum | string |  |  |
+
+#### DatasetQueryDetail
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at | object |  | No |
+| created_by | string |  | No |
+| created_by_role | string |  | No |
+| id | string |  | No |
+| queries | [DatasetContent](#datasetcontent) |  | No |
+| source | string |  | No |
+| source_app_id | string |  | No |
+
+#### DatasetRerankingModel
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| reranking_model_name | string |  | No |
+| reranking_provider_name | string |  | No |
+
+#### DatasetResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at | integer |  | No |
+| created_by | string |  | No |
+| data_source_type | string |  | No |
+| description | string |  | No |
+| id | string |  | Yes |
+| indexing_technique | string |  | No |
+| name | string |  | Yes |
+| permission | string |  | No |
+
+#### DatasetRetrievalModel
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| reranking_enable | boolean |  | No |
+| reranking_mode | string |  | No |
+| reranking_model | [DatasetRerankingModel](#datasetrerankingmodel) |  | No |
+| score_threshold | number |  | No |
+| score_threshold_enabled | boolean |  | No |
+| search_method | string |  | No |
+| top_k | integer |  | No |
+| weights | [DatasetWeightedScore](#datasetweightedscore) |  | No |
+
+#### DatasetUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| description | string |  | No |
+| embedding_model | string |  | No |
+| embedding_model_provider | string |  | No |
+| external_knowledge_api_id | string |  | No |
+| external_knowledge_id | string |  | No |
+| external_retrieval_model | object |  | No |
+| icon_info | object |  | No |
+| indexing_technique | string |  | No |
+| is_multimodal | boolean |  | No |
+| name | string |  | No |
+| partial_member_list | [ object ] |  | No |
+| permission | [DatasetPermissionEnum](#datasetpermissionenum) |  | No |
+| retrieval_model | object |  | No |
+| summary_index_setting | object |  | No |
+
+#### DatasetVectorSetting
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| embedding_model_name | string |  | No |
+| embedding_provider_name | string |  | No |
+| vector_weight | number |  | No |
+
+#### DatasetWeightedScore
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| keyword_setting | [DatasetKeywordSetting](#datasetkeywordsetting) |  | No |
+| vector_setting | [DatasetVectorSetting](#datasetvectorsetting) |  | No |
+| weight_type | string |  | No |
+
+#### DatasourceCredentialDeletePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credential_id | string |  | Yes |
+
+#### DatasourceCredentialPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credentials | object |  | Yes |
+| name | string |  | No |
+
+#### DatasourceCredentialUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credential_id | string |  | Yes |
+| credentials | object |  | No |
+| name | string |  | No |
+
+#### DatasourceCustomClientPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| client_params | object |  | No |
+| enable_oauth_custom_client | boolean |  | No |
+
+#### DatasourceDefaultPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| id | string |  | Yes |
+
+#### DatasourceNodeRunPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credential_id | string |  | No |
+| datasource_type | string |  | Yes |
+| inputs | object |  | Yes |
+
+#### DatasourceUpdateNamePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credential_id | string |  | Yes |
+| name | string |  | Yes |
+
+#### DatasourceVariablesPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| datasource_info | object |  | Yes |
+| datasource_type | string |  | Yes |
+| start_node_id | string |  | Yes |
+| start_node_title | string |  | Yes |
+
+#### DebugPermission
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| DebugPermission | string |  |  |
+
+#### DefaultBlockConfigQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| q | string |  | No |
+
+#### DeletedTool
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| provider_id | string |  | Yes |
+| tool_name | string |  | Yes |
+| type | string |  | Yes |
+
+#### DocumentBatchDownloadZipPayload
+
+Request payload for bulk downloading documents as a zip archive.
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| document_ids | [ string (uuid) ] |  | Yes |
+
+#### DocumentMetadataOperation
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| document_id | string |  | Yes |
+| metadata_list | [ [MetadataDetail](#metadatadetail) ] |  | Yes |
+| partial_update | boolean |  | No |
+
+#### DocumentMetadataResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| id | string |  | Yes |
+| name | string |  | Yes |
+| type | string |  | Yes |
+| value | string |  | No |
+
+#### DocumentMetadataUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| doc_metadata |  |  | No |
+| doc_type | string |  | No |
+
+#### DocumentRenamePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| name | string |  | Yes |
+
+#### DocumentResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| archived | boolean |  | No |
+| created_at | integer |  | No |
+| created_by | string |  | No |
+| created_from | string |  | No |
+| data_source_detail_dict |  |  | No |
+| data_source_info_dict |  |  | No |
+| data_source_type | string |  | No |
+| dataset_process_rule_id | string |  | No |
+| disabled_at | integer |  | No |
+| disabled_by | string |  | No |
+| display_status | string |  | No |
+| doc_form | string |  | No |
+| doc_metadata_details | [ [DocumentMetadataResponse](#documentmetadataresponse) ] |  | No |
+| enabled | boolean |  | No |
+| error | string |  | No |
+| hit_count | integer |  | No |
+| id | string |  | Yes |
+| indexing_status | string |  | No |
+| name | string |  | Yes |
+| need_summary | boolean |  | No |
+| position | integer |  | No |
+| summary_index_status | string |  | No |
+| tokens | integer |  | No |
+| word_count | integer |  | No |
+
+#### DocumentRetryPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| document_ids | [ string ] |  | Yes |
+
+#### DocumentWithSegmentsResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| archived | boolean |  | No |
+| completed_segments | integer |  | No |
+| created_at | integer |  | No |
+| created_by | string |  | No |
+| created_from | string |  | No |
+| data_source_detail_dict |  |  | No |
+| data_source_info_dict |  |  | No |
+| data_source_type | string |  | No |
+| dataset_process_rule_id | string |  | No |
+| disabled_at | integer |  | No |
+| disabled_by | string |  | No |
+| display_status | string |  | No |
+| doc_form | string |  | No |
+| doc_metadata_details | [ [DocumentMetadataResponse](#documentmetadataresponse) ] |  | No |
+| enabled | boolean |  | No |
+| error | string |  | No |
+| hit_count | integer |  | No |
+| id | string |  | Yes |
+| indexing_status | string |  | No |
+| name | string |  | Yes |
+| need_summary | boolean |  | No |
+| position | integer |  | No |
+| process_rule_dict |  |  | No |
+| summary_index_status | string |  | No |
+| tokens | integer |  | No |
+| total_segments | integer |  | No |
+| word_count | integer |  | No |
+
+#### DraftWorkflowNodeRunPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| files | [ object ] |  | No |
+| inputs | object |  | Yes |
+| query | string |  | No |
+
+#### DraftWorkflowRunPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| datasource_info_list | [ object ] |  | Yes |
+| datasource_type | string |  | Yes |
+| inputs | object |  | Yes |
+| start_node_id | string |  | Yes |
+
+#### DraftWorkflowSyncPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| conversation_variables | [ object ] |  | No |
+| environment_variables | [ object ] |  | No |
+| features | object |  | No |
+| graph | object |  | Yes |
+| hash | string |  | No |
+| rag_pipeline_variables | [ object ] |  | No |
+
+#### DraftWorkflowTriggerRunAllPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| node_ids | [ string ] |  | Yes |
+
+#### DraftWorkflowTriggerRunPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| node_id | string |  | Yes |
+
+#### DraftWorkflowTriggerRunRequest
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| node_id | string | Node ID | Yes |
+
+#### EducationActivatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| institution | string |  | Yes |
+| role | string |  | Yes |
+| token | string |  | Yes |
+
+#### EducationAutocompleteQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| keywords | string |  | Yes |
+| limit | integer |  | No |
+| page | integer |  | No |
+
+#### EducationAutocompleteResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| curr_page | integer |  | No |
+| data | [ string ] |  | No |
+| has_next | boolean |  | No |
+
+#### EducationStatusResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| allow_refresh | boolean |  | No |
+| expire_at | integer |  | No |
+| is_student | boolean |  | No |
+| result | boolean |  | No |
+
+#### EducationVerifyResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| token | string |  | No |
+
+#### EmailCodeLoginPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| code | string |  | Yes |
+| email | string |  | Yes |
+| language | string |  | No |
+| timezone | string |  | No |
+| token | string |  | Yes |
+
+#### EmailPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| email | string |  | Yes |
+| language | string |  | No |
+
+#### EmailRegisterResetPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| language | string |  | No |
+| new_password | string |  | Yes |
+| password_confirm | string |  | Yes |
+| timezone | string |  | No |
+| token | string |  | Yes |
+
+#### EmailRegisterSendPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| email | string | Email address | Yes |
+| language | string | Language code | No |
+
+#### EmailRegisterValidityPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| code | string |  | Yes |
+| email | string |  | Yes |
+| token | string |  | Yes |
+
+#### EndpointCreatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| name | string |  | Yes |
+| plugin_unique_identifier | string |  | Yes |
+| settings | object |  | Yes |
+
+#### EndpointCreateResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| success | boolean | Operation success | Yes |
+
+#### EndpointDeleteResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| success | boolean | Operation success | Yes |
+
+#### EndpointDisableResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| success | boolean | Operation success | Yes |
+
+#### EndpointEnableResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| success | boolean | Operation success | Yes |
+
+#### EndpointIdPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| endpoint_id | string |  | Yes |
+
+#### EndpointListForPluginQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| page | integer |  | Yes |
+| page_size | integer |  | Yes |
+| plugin_id | string |  | Yes |
+
+#### EndpointListQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| page | integer |  | Yes |
+| page_size | integer |  | Yes |
+
+#### EndpointListResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| endpoints | [ object ] | Endpoint information | Yes |
+
+#### EndpointUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| name | string |  | Yes |
+| settings | object |  | Yes |
+
+#### EndpointUpdateResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| success | boolean | Operation success | Yes |
+
+#### EnvironmentVariableUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| environment_variables | [ object ] | Environment variables for the draft workflow | Yes |
+
+#### ExecutionContentType
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| ExecutionContentType | string |  |  |
+
+#### ExternalApiTemplateListQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| keyword | string | Search keyword | No |
+| limit | integer | Number of items per page | No |
+| page | integer | Page number | No |
+
+#### ExternalDatasetCreatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| description | string |  | No |
+| external_knowledge_api_id | string |  | Yes |
+| external_knowledge_id | string |  | Yes |
+| external_retrieval_model | object |  | No |
+| name | string |  | Yes |
+
+#### ExternalHitTestingPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| external_retrieval_model | object |  | No |
+| metadata_filtering_conditions | object |  | No |
+| query | string |  | Yes |
+
+#### ExternalKnowledgeApiPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| name | string |  | Yes |
+| settings | object |  | Yes |
+
+#### ExternalKnowledgeInfo
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| external_knowledge_api_endpoint | string |  | No |
+| external_knowledge_api_id | string |  | No |
+| external_knowledge_api_name | string |  | No |
+| external_knowledge_id | string |  | No |
+
+#### ExternalRetrievalModel
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| score_threshold | number |  | No |
+| score_threshold_enabled | boolean |  | No |
+| top_k | integer |  | No |
+
+#### FeatureResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| features | object | Feature configuration object | No |
+
+#### Feedback
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| content | string |  | No |
+| from_account | [SimpleAccount](#simpleaccount) |  | No |
+| from_end_user_id | string |  | No |
+| from_source | string |  | Yes |
+| rating | string |  | Yes |
+
+#### FeedbackExportQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| end_date | string | End date (YYYY-MM-DD) | No |
+| format | string | Export format<br>*Enum:* `"csv"`, `"json"` | No |
+| from_source | string | Filter by feedback source<br>*Enum:* `"admin"`, `"user"` | No |
+| has_comment | boolean | Only include feedback with comments | No |
+| rating | string | Filter by rating<br>*Enum:* `"dislike"`, `"like"` | No |
+| start_date | string | Start date (YYYY-MM-DD) | No |
+
+#### FeedbackStat
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| dislike | integer |  | Yes |
+| like | integer |  | Yes |
+
+#### FileInfo
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| file_ids | [ string ] |  | Yes |
+
+#### FileInputConfig
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| allowed_file_extensions | [ string ] |  | No |
+| allowed_file_types | [ [FileType](#filetype) ] |  | No |
+| allowed_file_upload_methods | [ [FileTransferMethod](#filetransfermethod) ] |  | No |
+| output_variable_name | string |  | Yes |
+| type | string |  | No |
+
+#### FileListInputConfig
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| allowed_file_extensions | [ string ] |  | No |
+| allowed_file_types | [ [FileType](#filetype) ] |  | No |
+| allowed_file_upload_methods | [ [FileTransferMethod](#filetransfermethod) ] |  | No |
+| number_limits | integer |  | No |
+| output_variable_name | string |  | Yes |
+| type | string |  | No |
+
+#### FileResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| conversation_id | string |  | No |
+| created_at | integer |  | No |
+| created_by | string |  | No |
+| extension | string |  | No |
+| file_key | string |  | No |
+| id | string |  | Yes |
+| mime_type | string |  | No |
+| name | string |  | Yes |
+| original_url | string |  | No |
+| preview_url | string |  | No |
+| size | integer |  | Yes |
+| source_url | string |  | No |
+| tenant_id | string |  | No |
+| user_id | string |  | No |
+
+#### FileTransferMethod
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| FileTransferMethod | string |  |  |
+
+#### FileType
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| FileType | string |  |  |
+
+#### ForgotPasswordCheckPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| code | string |  | Yes |
+| email | string |  | Yes |
+| token | string |  | Yes |
+
+#### ForgotPasswordCheckResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| email | string | Email address | Yes |
+| is_valid | boolean | Whether code is valid | Yes |
+| token | string | New reset token | Yes |
+
+#### ForgotPasswordEmailResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| code | string | Error code if account not found | No |
+| data | string | Reset token | No |
+| result | string | Operation result | Yes |
+
+#### ForgotPasswordResetPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| new_password | string |  | Yes |
+| password_confirm | string |  | Yes |
+| token | string |  | Yes |
+
+#### ForgotPasswordResetResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| result | string | Operation result | Yes |
+
+#### ForgotPasswordSendPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| email | string |  | Yes |
+| language | string |  | No |
+
+#### FormInputConfig
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| FormInputConfig | [ParagraphInputConfig](#paragraphinputconfig)<br>[SelectInputConfig](#selectinputconfig)<br>[FileInputConfig](#fileinputconfig)<br>[FileListInputConfig](#filelistinputconfig) |  |  |
+
+#### GenerateSummaryPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| document_list | [ string ] |  | Yes |
+
+#### Github
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| github_plugin_unique_identifier | string |  | Yes |
+| package | string |  | Yes |
+| repo | string |  | Yes |
+| version | string |  | Yes |
+
+#### HitTestingChildChunk
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| content | string |  | No |
+| id | string |  | No |
+| position | integer |  | No |
+| score | number |  | No |
+
+#### HitTestingDocument
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data_source_type | string |  | No |
+| doc_metadata |  |  | No |
+| doc_type | string |  | No |
+| id | string |  | No |
+| name | string |  | No |
+
+#### HitTestingFile
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| extension | string |  | No |
+| id | string |  | No |
+| mime_type | string |  | No |
+| name | string |  | No |
+| size | integer |  | No |
+| source_url | string |  | No |
+
+#### HitTestingPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| attachment_ids | [ string ] |  | No |
+| external_retrieval_model | object |  | No |
+| query | string |  | Yes |
+| retrieval_model | [RetrievalModel](#retrievalmodel) |  | No |
+
+#### HitTestingRecord
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| child_chunks | [ [HitTestingChildChunk](#hittestingchildchunk) ] |  | No |
+| files | [ [HitTestingFile](#hittestingfile) ] |  | No |
+| score | number |  | No |
+| segment | [HitTestingSegment](#hittestingsegment) |  | No |
+| summary | string |  | No |
+| tsne_position |  |  | No |
+
+#### HitTestingResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| query | string |  | Yes |
+| records | [ [HitTestingRecord](#hittestingrecord) ] |  | No |
+
+#### HitTestingSegment
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| answer | string |  | No |
+| completed_at | integer |  | No |
+| content | string |  | No |
+| created_at | integer |  | No |
+| created_by | string |  | No |
+| disabled_at | integer |  | No |
+| disabled_by | string |  | No |
+| document | [HitTestingDocument](#hittestingdocument) |  | No |
+| document_id | string |  | No |
+| enabled | boolean |  | No |
+| error | string |  | No |
+| hit_count | integer |  | No |
+| id | string |  | No |
+| index_node_hash | string |  | No |
+| index_node_id | string |  | No |
+| indexing_at | integer |  | No |
+| keywords | [ string ] |  | No |
+| position | integer |  | No |
+| sign_content | string |  | No |
+| status | string |  | No |
+| stopped_at | integer |  | No |
+| tokens | integer |  | No |
+| word_count | integer |  | No |
+
+#### HumanInputContent
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| form_definition | [HumanInputFormDefinition](#humaninputformdefinition) |  | No |
+| form_submission_data | [HumanInputFormSubmissionData](#humaninputformsubmissiondata) |  | No |
+| submitted | boolean |  | Yes |
+| type | [ExecutionContentType](#executioncontenttype) |  | No |
+| workflow_run_id | string |  | Yes |
+
+#### HumanInputDeliveryTestPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| delivery_method_id | string | Delivery method ID | Yes |
+| inputs | object | Values used to fill missing upstream variables referenced in form_content | No |
+
+#### HumanInputFormDefinition
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| actions | [ [UserActionConfig](#useractionconfig) ] |  | No |
+| display_in_ui | boolean |  | No |
+| expiration_time | integer |  | Yes |
+| form_content | string |  | Yes |
+| form_id | string |  | Yes |
+| form_token | string |  | No |
+| inputs | [ [FormInputConfig](#forminputconfig) ] |  | No |
+| node_id | string |  | Yes |
+| node_title | string |  | Yes |
+| resolved_default_values | object |  | No |
+
+#### HumanInputFormPreviewPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| inputs | object | Values used to fill missing upstream variables referenced in form_content | No |
+
+#### HumanInputFormSubmissionData
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| action_id | string |  | Yes |
+| action_text | string |  | Yes |
+| node_id | string |  | Yes |
+| node_title | string |  | Yes |
+| rendered_content | string |  | Yes |
+
+#### HumanInputFormSubmitPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| action | string | Selected action ID | Yes |
+| form_inputs | object | Values the user provides for the form's own fields | Yes |
+| inputs | object | Values used to fill missing upstream variables referenced in form_content | Yes |
+
+#### HumanInputPauseTypeResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| backstage_input_url | string |  | No |
+| form_id | string |  | Yes |
+| type | string |  | Yes |
+
+#### IconType
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| IconType | string |  |  |
+
+#### Import
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| app_id | string |  | No |
+| app_mode | string |  | No |
+| current_dsl_version | string |  | No |
+| error | string |  | No |
+| id | string |  | Yes |
+| imported_dsl_version | string |  | No |
+| status | [ImportStatus](#importstatus) |  | Yes |
+
+#### ImportStatus
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| ImportStatus | string |  |  |
+
+#### IncludeSecretQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| include_secret | string |  | No |
+
+#### IndexingEstimatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| dataset_id | string |  | No |
+| doc_form | string |  | No |
+| doc_language | string |  | No |
+| indexing_technique | string |  | Yes |
+| info_list | object |  | Yes |
+| process_rule | object |  | Yes |
+
+#### InfoList
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data_source_type | string | *Enum:* `"notion_import"`, `"upload_file"`, `"website_crawl"` | Yes |
+| file_info_list | [FileInfo](#fileinfo) |  | No |
+| notion_info_list | [ [NotionInfo](#notioninfo) ] |  | No |
+| website_info_list | [WebsiteInfo](#websiteinfo) |  | No |
+
+#### Inner
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| model | string |  | No |
+| model_type | [ModelType](#modeltype) |  | Yes |
+| provider | string |  | No |
+
+#### InstallPermission
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| InstallPermission | string |  |  |
+
+#### InstalledAppCreatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| app_id | string |  | Yes |
+
+#### InstalledAppInfoResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| icon | string |  | No |
+| icon_background | string |  | No |
+| icon_type | string |  | No |
+| id | string |  | Yes |
+| mode | string |  | No |
+| name | string |  | No |
+| use_icon_as_answer_icon | boolean |  | No |
+
+#### InstalledAppListResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| installed_apps | [ [InstalledAppResponse](#installedappresponse) ] |  | Yes |
+
+#### InstalledAppResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| app | [InstalledAppInfoResponse](#installedappinforesponse) |  | Yes |
+| app_owner_tenant_id | string |  | Yes |
+| editable | boolean |  | Yes |
+| id | string |  | Yes |
+| is_pinned | boolean |  | Yes |
+| last_used_at | integer |  | No |
+| uninstallable | boolean |  | Yes |
+
+#### InstalledAppUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| is_pinned | boolean |  | No |
+
+#### InstalledAppsListQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| app_id | string | App ID to filter by | No |
+
+#### InstructionGeneratePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| current | string | Current instruction text | No |
+| flow_id | string | Workflow/Flow ID | Yes |
+| ideal_output | string | Expected ideal output | No |
+| instruction | string | Instruction for generation | Yes |
+| language | string | Programming language (javascript/python) | No |
+| model_config | [ModelConfig](#modelconfig) | Model configuration | Yes |
+| node_id | string | Node ID for workflow context | No |
+
+#### InstructionTemplatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| type | string | Instruction template type | Yes |
+
+#### IterationNodeRunPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| inputs | object |  | No |
+
+#### JSONValue
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| JSONValue |  |  |  |
+
+#### KnowledgeConfig
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data_source | [DataSource](#datasource) |  | No |
+| doc_form | string |  | No |
+| doc_language | string |  | No |
+| duplicate | boolean |  | No |
+| embedding_model | string |  | No |
+| embedding_model_provider | string |  | No |
+| indexing_technique | string | *Enum:* `"economy"`, `"high_quality"` | Yes |
+| is_multimodal | boolean |  | No |
+| name | string |  | No |
+| original_document_id | string |  | No |
+| process_rule | [ProcessRule](#processrule) |  | No |
+| retrieval_model | [RetrievalModel](#retrievalmodel) |  | No |
+| summary_index_setting | object |  | No |
+
+#### LLMMode
+
+Enum class for large language model mode.
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| LLMMode | string | Enum class for large language model mode. |  |
+
+#### LegacyEndpointUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| endpoint_id | string |  | Yes |
+| name | string |  | Yes |
+| settings | object |  | Yes |
+
+#### LoadBalancingCredentialPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credentials | object |  | Yes |
+| model | string |  | Yes |
+| model_type | [ModelType](#modeltype) |  | Yes |
+
+#### LoadBalancingPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| configs | [ object ] |  | No |
+| enabled | boolean |  | No |
+
+#### LoginPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| email | string |  | Yes |
+| invite_token | string | Invitation token | No |
+| password | string |  | Yes |
+| remember_me | boolean | Remember me flag | No |
+
+#### LoopNodeRunPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| inputs | object |  | No |
+
+#### MCPAuthPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| authorization_code | string |  | No |
+| provider_id | string |  | Yes |
+
+#### MCPProviderCreatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| authentication | object |  | No |
+| configuration | object |  | No |
+| headers | object |  | No |
+| icon | string |  | Yes |
+| icon_background | string |  | No |
+| icon_type | string |  | Yes |
+| name | string |  | Yes |
+| server_identifier | string |  | Yes |
+| server_url | string |  | Yes |
+
+#### MCPProviderDeletePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| provider_id | string |  | Yes |
+
+#### MCPProviderUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| authentication | object |  | No |
+| configuration | object |  | No |
+| headers | object |  | No |
+| icon | string |  | Yes |
+| icon_background | string |  | No |
+| icon_type | string |  | Yes |
+| name | string |  | Yes |
+| provider_id | string |  | Yes |
+| server_identifier | string |  | Yes |
+| server_url | string |  | Yes |
+
+#### MCPServerCreatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| description | string | Server description | No |
+| parameters | object | Server parameters configuration | Yes |
+
+#### MCPServerUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| description | string | Server description | No |
+| id | string | Server ID | Yes |
+| parameters | object | Server parameters configuration | Yes |
+| status | string | Server status | No |
+
+#### Marketplace
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| marketplace_plugin_unique_identifier | string |  | Yes |
+| version | string |  | No |
+
+#### MemberInvitePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| emails | [ string ] |  | No |
+| language | string |  | No |
+| role | [TenantAccountRole](#tenantaccountrole) |  | Yes |
+
+#### MemberRoleUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| role | string |  | Yes |
+
+#### MessageDetail
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| agent_thoughts | [ [AgentThought](#agentthought) ] |  | Yes |
+| annotation | [ConversationAnnotation](#conversationannotation) |  | No |
+| annotation_hit_history | [ConversationAnnotationHitHistory](#conversationannotationhithistory) |  | No |
+| answer_tokens | integer |  | Yes |
+| conversation_id | string |  | Yes |
+| created_at | integer |  | No |
+| error | string |  | No |
+| feedbacks | [ [Feedback](#feedback) ] |  | Yes |
+| from_account_id | string |  | No |
+| from_end_user_id | string |  | No |
+| from_source | string |  | Yes |
+| id | string |  | Yes |
+| inputs | object |  | Yes |
+| message | [JSONValue](#jsonvalue) |  | Yes |
+| message_files | [ [MessageFile](#messagefile) ] |  | Yes |
+| message_metadata_dict | [JSONValue](#jsonvalue) |  | Yes |
+| message_tokens | integer |  | Yes |
+| parent_message_id | string |  | No |
+| provider_response_latency | number |  | Yes |
+| query | string |  | Yes |
+| re_sign_file_url_answer | string |  | Yes |
+| status | string |  | Yes |
+| workflow_run_id | string |  | No |
+
+#### MessageDetailResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| agent_thoughts | [ [AgentThought](#agentthought) ] |  | No |
+| annotation | [ConversationAnnotation](#conversationannotation) |  | No |
+| annotation_hit_history | [ConversationAnnotationHitHistory](#conversationannotationhithistory) |  | No |
+| answer_tokens | integer |  | No |
+| conversation_id | string |  | Yes |
+| created_at | integer |  | No |
+| error | string |  | No |
+| extra_contents | [ [HumanInputContent](#humaninputcontent) ] |  | No |
+| feedbacks | [ [Feedback](#feedback) ] |  | No |
+| from_account_id | string |  | No |
+| from_end_user_id | string |  | No |
+| from_source | string |  | Yes |
+| id | string |  | Yes |
+| inputs | object |  | Yes |
+| message | [JSONValue](#jsonvalue) |  | No |
+| message_files | [ [MessageFile](#messagefile) ] |  | No |
+| message_metadata_dict | [JSONValue](#jsonvalue) |  | No |
+| message_tokens | integer |  | No |
+| parent_message_id | string |  | No |
+| provider_response_latency | number |  | No |
+| query | string |  | Yes |
+| re_sign_file_url_answer | string |  | Yes |
+| status | string |  | Yes |
+| workflow_run_id | string |  | No |
+
+#### MessageFeedbackPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| content | string |  | No |
+| message_id | string | Message ID | Yes |
+| rating | string | *Enum:* `"dislike"`, `"like"` | No |
+
+#### MessageFile
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| belongs_to | string |  | No |
+| filename | string |  | Yes |
+| id | string |  | Yes |
+| mime_type | string |  | No |
+| size | integer |  | No |
+| transfer_method | string |  | Yes |
+| type | string |  | Yes |
+| upload_file_id | string |  | No |
+| url | string |  | No |
+
+#### MessageInfiniteScrollPaginationResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data | [ [MessageDetailResponse](#messagedetailresponse) ] |  | Yes |
+| has_more | boolean |  | Yes |
+| limit | integer |  | Yes |
+
+#### MessageListQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| conversation_id | string | Conversation UUID | Yes |
+| first_id | string | First message ID for pagination | No |
+| limit | integer | Number of messages to return (1-100) | No |
+
+#### MetadataArgs
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| name | string |  | Yes |
+| type | string | *Enum:* `"number"`, `"string"`, `"time"` | Yes |
+
+#### MetadataDetail
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| id | string |  | Yes |
+| name | string |  | Yes |
+| value |  |  | No |
+
+#### MetadataFilteringCondition
+
+Metadata Filtering Condition.
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| conditions | [ [Condition](#condition) ] |  | No |
+| logical_operator | string | *Enum:* `"and"`, `"or"` | No |
+
+#### MetadataOperationData
+
+Metadata operation data
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| operation_data | [ [DocumentMetadataOperation](#documentmetadataoperation) ] |  | Yes |
+
+#### MetadataUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| name | string |  | Yes |
+
+#### ModelConfig
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| completion_params | object |  | No |
+| mode | [LLMMode](#llmmode) |  | Yes |
+| name | string |  | Yes |
+| provider | string |  | Yes |
+
+#### ModelConfigPartial
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at | integer |  | No |
+| created_by | string |  | No |
+| model_dict | [JSONValue](#jsonvalue) |  | No |
+| pre_prompt | string |  | No |
+| updated_at | integer |  | No |
+| updated_by | string |  | No |
+
+#### ModelConfigRequest
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| agent_mode | object | Agent mode configuration | No |
+| configs | object | Model configuration parameters | No |
+| dataset_configs | object | Dataset configurations | No |
+| model | string | Model name | No |
+| more_like_this | object | More like this configuration | No |
+| opening_statement | string | Opening statement | No |
+| provider | string | Model provider | No |
+| retrieval_model | object | Retrieval model configuration | No |
+| speech_to_text | object | Speech to text configuration | No |
+| suggested_questions | [ string ] | Suggested questions | No |
+| text_to_speech | object | Text to speech configuration | No |
+| tools | [ object ] | Available tools | No |
+
+#### ModelType
+
+Enum class for model type.
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| ModelType | string | Enum class for model type. |  |
+
+#### MoreLikeThisQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| response_mode | string | *Enum:* `"blocking"`, `"streaming"` | Yes |
+
+#### NodeIdQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| node_id | string |  | Yes |
+
+#### NodeRunPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| inputs | object |  | No |
+
+#### NodeRunRequiredPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| inputs | object |  | Yes |
+
+#### NotionEstimatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| doc_form | string |  | No |
+| doc_language | string |  | No |
+| notion_info_list | [ object ] |  | Yes |
+| process_rule | object |  | Yes |
+
+#### NotionIcon
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| emoji | string |  | No |
+| type | string |  | Yes |
+| url | string |  | No |
+
+#### NotionInfo
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credential_id | string |  | Yes |
+| pages | [ [NotionPage](#notionpage) ] |  | Yes |
+| workspace_id | string |  | Yes |
+
+#### NotionIntegrateInfoList
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| notion_info | [ [NotionIntegrateWorkspace](#notionintegrateworkspace) ] |  | No |
+
+#### NotionIntegratePage
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| is_bound | boolean |  | No |
+| page_icon | [DataSourceIntegrateIcon](#datasourceintegrateicon) |  | No |
+| page_id | string |  | No |
+| page_name | string |  | No |
+| parent_id | string |  | No |
+| type | string |  | No |
+
+#### NotionIntegrateWorkspace
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| pages | [ [NotionIntegratePage](#notionintegratepage) ] |  | No |
+| workspace_icon | string |  | No |
+| workspace_id | string |  | No |
+| workspace_name | string |  | No |
+
+#### NotionPage
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| page_icon | [NotionIcon](#notionicon) |  | No |
+| page_id | string |  | Yes |
+| page_name | string |  | Yes |
+| type | string |  | Yes |
+
+#### OAuthDataSourceBindingResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| result | string | Operation result | Yes |
+
+#### OAuthDataSourceResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data | string | Authorization URL or 'internal' for internal setup | Yes |
+
+#### OAuthDataSourceSyncResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| result | string | Operation result | Yes |
+
+#### OwnerTransferCheckPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| code | string |  | Yes |
+| token | string |  | Yes |
+
+#### OwnerTransferEmailPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| language | string |  | No |
+
+#### OwnerTransferPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| token | string |  | Yes |
+
+#### Package
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| plugin_unique_identifier | string |  | Yes |
+| version | string |  | No |
+
+#### PaginatedConversationVariableResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data | [ [ConversationVariableResponse](#conversationvariableresponse) ] |  | Yes |
+| has_more | boolean |  | Yes |
+| limit | integer |  | Yes |
+| page | integer |  | Yes |
+| total | integer |  | Yes |
+
+#### ParagraphInputConfig
+
+Form input definition.
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| default | [StringSource](#stringsource) |  | No |
+| output_variable_name | string |  | Yes |
+| type | string |  | No |
+
+#### Parser
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credential_id | string |  | No |
+| datasource_type | string |  | Yes |
+| inputs | object |  | Yes |
+
+#### ParserAsset
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| file_name | string |  | Yes |
+| plugin_unique_identifier | string |  | Yes |
+
+#### ParserCreateCredential
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credentials | object |  | Yes |
+| model | string |  | Yes |
+| model_type | [ModelType](#modeltype) |  | Yes |
+| name | string |  | No |
+
+#### ParserCredentialCreate
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credentials | object |  | Yes |
+| name | string |  | No |
+
+#### ParserCredentialDelete
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credential_id | string |  | Yes |
+
+#### ParserCredentialId
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credential_id | string |  | No |
+
+#### ParserCredentialSwitch
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credential_id | string |  | Yes |
+
+#### ParserCredentialUpdate
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credential_id | string |  | Yes |
+| credentials | object |  | Yes |
+| name | string |  | No |
+
+#### ParserCredentialValidate
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credentials | object |  | Yes |
+
+#### ParserDeleteCredential
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credential_id | string |  | Yes |
+| model | string |  | Yes |
+| model_type | [ModelType](#modeltype) |  | Yes |
+
+#### ParserDeleteModels
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| model | string |  | Yes |
+| model_type | [ModelType](#modeltype) |  | Yes |
+
+#### ParserDynamicOptions
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| action | string |  | Yes |
+| credential_id | string |  | No |
+| parameter | string |  | Yes |
+| plugin_id | string |  | Yes |
+| provider | string |  | Yes |
+| provider_type | string | *Enum:* `"tool"`, `"trigger"` | Yes |
+
+#### ParserDynamicOptionsWithCredentials
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| action | string |  | Yes |
+| credential_id | string |  | Yes |
+| credentials | object |  | Yes |
+| parameter | string |  | Yes |
+| plugin_id | string |  | Yes |
+| provider | string |  | Yes |
+
+#### ParserEnable
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| enable_trigger | boolean |  | Yes |
+| trigger_id | string |  | Yes |
+
+#### ParserExcludePlugin
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| plugin_id | string |  | Yes |
+
+#### ParserGetCredentials
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| config_from | string |  | No |
+| credential_id | string |  | No |
+| model | string |  | Yes |
+| model_type | [ModelType](#modeltype) |  | Yes |
+
+#### ParserGetDefault
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| model_type | [ModelType](#modeltype) |  | Yes |
+
+#### ParserGithubInstall
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| package | string |  | Yes |
+| plugin_unique_identifier | string |  | Yes |
+| repo | string |  | Yes |
+| version | string |  | Yes |
+
+#### ParserGithubUpgrade
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| new_plugin_unique_identifier | string |  | Yes |
+| original_plugin_unique_identifier | string |  | Yes |
+| package | string |  | Yes |
+| repo | string |  | Yes |
+| version | string |  | Yes |
+
+#### ParserGithubUpload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| package | string |  | Yes |
+| repo | string |  | Yes |
+| version | string |  | Yes |
+
+#### ParserIcon
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| filename | string |  | Yes |
+| tenant_id | string |  | Yes |
+
+#### ParserLatest
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| plugin_ids | [ string ] |  | Yes |
+
+#### ParserList
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| page | integer | Page number | No |
+| page_size | integer | Page size (1-256) | No |
+
+#### ParserMarketplaceUpgrade
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| new_plugin_unique_identifier | string |  | Yes |
+| original_plugin_unique_identifier | string |  | Yes |
+
+#### ParserModelList
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| model_type | [ModelType](#modeltype) |  | No |
+
+#### ParserParameter
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| model | string |  | Yes |
+
+#### ParserPermissionChange
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| debug_permission | [DebugPermission](#debugpermission) |  | Yes |
+| install_permission | [InstallPermission](#installpermission) |  | Yes |
+
+#### ParserPluginIdentifierQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| plugin_unique_identifier | string |  | Yes |
+
+#### ParserPluginIdentifiers
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| plugin_unique_identifiers | [ string ] |  | Yes |
+
+#### ParserPostDefault
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| model_settings | [ [Inner](#inner) ] |  | Yes |
+
+#### ParserPostModels
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| config_from | string |  | No |
+| credential_id | string |  | No |
+| load_balancing | [LoadBalancingPayload](#loadbalancingpayload) |  | No |
+| model | string |  | Yes |
+| model_type | [ModelType](#modeltype) |  | Yes |
+
+#### ParserPreferencesChange
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| auto_upgrade | [PluginAutoUpgradeSettingsPayload](#pluginautoupgradesettingspayload) |  | Yes |
+| permission | [PluginPermissionSettingsPayload](#pluginpermissionsettingspayload) |  | Yes |
+
+#### ParserPreferredProviderType
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| preferred_provider_type | string | *Enum:* `"custom"`, `"system"` | Yes |
+
+#### ParserReadme
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| language | string |  | No |
+| plugin_unique_identifier | string |  | Yes |
+
+#### ParserSwitch
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credential_id | string |  | Yes |
+| model | string |  | Yes |
+| model_type | [ModelType](#modeltype) |  | Yes |
+
+#### ParserTasks
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| page | integer | Page number | No |
+| page_size | integer | Page size (1-256) | No |
+
+#### ParserUninstall
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| plugin_installation_id | string |  | Yes |
+
+#### ParserUpdateCredential
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credential_id | string |  | Yes |
+| credentials | object |  | Yes |
+| model | string |  | Yes |
+| model_type | [ModelType](#modeltype) |  | Yes |
+| name | string |  | No |
+
+#### ParserValidate
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credentials | object |  | Yes |
+| model | string |  | Yes |
+| model_type | [ModelType](#modeltype) |  | Yes |
+
+#### PartnerTenantsPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| click_id | string | Click Id from partner referral link | Yes |
+
+#### PausedNodeResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| node_id | string |  | Yes |
+| node_title | string |  | Yes |
+| pause_type | [HumanInputPauseTypeResponse](#humaninputpausetyperesponse) |  | Yes |
+
+#### Payload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| description | string |  | No |
+| icon_info | object |  | No |
+| name | string |  | Yes |
+
+#### PipelineVariableResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| allowed_file_extensions | [ string ] |  | No |
+| allowed_file_types | [ string ] |  | No |
+| allowed_file_upload_methods | [ string ] |  | No |
+| belong_to_node_id | string |  | Yes |
+| default_value | object |  | No |
+| label | string |  | Yes |
+| max_length | integer |  | No |
+| options | [ string ] |  | No |
+| placeholder | string |  | No |
+| required | boolean |  | Yes |
+| tooltips | string |  | No |
+| type | string |  | Yes |
+| unit | string |  | No |
+| variable | string |  | Yes |
+
+#### PluginAutoUpgradeSettingsPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| exclude_plugins | [ string ] |  | No |
+| include_plugins | [ string ] |  | No |
+| strategy_setting | [StrategySetting](#strategysetting) |  | No |
+| upgrade_mode | [UpgradeMode](#upgrademode) |  | No |
+| upgrade_time_of_day | integer |  | No |
+
+#### PluginDependency
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| current_identifier | string |  | No |
+| type | [Type](#type) |  | Yes |
+| value |  |  | Yes |
+
+#### PluginEndpointListResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| endpoints | [ object ] | Endpoint information | Yes |
+
+#### PluginPermissionSettingsPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| debug_permission | [DebugPermission](#debugpermission) |  | No |
+| install_permission | [InstallPermission](#installpermission) |  | No |
+
+#### PreProcessingRule
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| enabled | boolean |  | Yes |
+| id | string |  | Yes |
+
+#### ProcessRule
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| mode | string | *Enum:* `"automatic"`, `"custom"`, `"hierarchical"` | Yes |
+| rules | [Rule](#rule) |  | No |
+
+#### PublishWorkflowPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| marked_comment | string |  | No |
+| marked_name | string |  | No |
+
+#### PublishedWorkflowRunPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| datasource_info_list | [ object ] |  | Yes |
+| datasource_type | string |  | Yes |
+| inputs | object |  | Yes |
+| is_preview | boolean |  | No |
+| original_document_id | string |  | No |
+| response_mode | string | *Enum:* `"blocking"`, `"streaming"` | No |
+| start_node_id | string |  | Yes |
+
+#### RagPipelineDatasetImportPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| yaml_content | string |  | Yes |
+
+#### RagPipelineImport
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| current_dsl_version | string |  | No |
+| dataset_id | string |  | No |
+| error | string |  | No |
+| id | string |  | No |
+| imported_dsl_version | string |  | No |
+| pipeline_id | string |  | No |
+| status | string |  | No |
+
+#### RagPipelineImportCheckDependencies
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| leaked_dependencies | [ [RagPipelineLeakedDependency](#ragpipelineleakeddependency) ] |  | No |
+
+#### RagPipelineImportPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| description | string |  | No |
+| icon | string |  | No |
+| icon_background | string |  | No |
+| icon_type | string |  | No |
+| mode | string |  | Yes |
+| name | string |  | No |
+| pipeline_id | string |  | No |
+| yaml_content | string |  | No |
+| yaml_url | string |  | No |
+
+#### RagPipelineLeakedDependency
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| current_identifier | string |  | No |
+| type | string |  | No |
+| value | object |  | No |
+
+#### RagPipelineRecommendedPluginQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| type | string |  | No |
+
+#### RecommendedAppInfoResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| icon | string |  | No |
+| icon_background | string |  | No |
+| icon_type | string |  | No |
+| id | string |  | Yes |
+| mode | string |  | No |
+| name | string |  | No |
+
+#### RecommendedAppListResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| categories | [ string ] |  | Yes |
+| recommended_apps | [ [RecommendedAppResponse](#recommendedappresponse) ] |  | Yes |
+
+#### RecommendedAppResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| app | [RecommendedAppInfoResponse](#recommendedappinforesponse) |  | No |
+| app_id | string |  | Yes |
+| can_trial | boolean |  | No |
+| categories | [ string ] |  | No |
+| copyright | string |  | No |
+| custom_disclaimer | string |  | No |
+| description | string |  | No |
+| is_listed | boolean |  | No |
+| position | integer |  | No |
+| privacy_policy | string |  | No |
+
+#### RecommendedAppsQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| language | string | Language code for recommended app localization | No |
+
+#### RelatedAppList
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data | [ [AppDetailKernel](#appdetailkernel) ] |  | No |
+| total | integer |  | No |
+
+#### RerankingModel
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| reranking_model_name | string |  | No |
+| reranking_provider_name | string |  | No |
+
+#### ResultResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| result | string |  | Yes |
+
+#### RetrievalMethod
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| RetrievalMethod | string |  |  |
+
+#### RetrievalModel
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| metadata_filtering_conditions | [MetadataFilteringCondition](#metadatafilteringcondition) |  | No |
+| reranking_enable | boolean |  | Yes |
+| reranking_mode | string |  | No |
+| reranking_model | [RerankingModel](#rerankingmodel) |  | No |
+| score_threshold | number |  | No |
+| score_threshold_enabled | boolean |  | Yes |
+| search_method | [RetrievalMethod](#retrievalmethod) |  | Yes |
+| top_k | integer |  | Yes |
+| weights | [WeightModel](#weightmodel) |  | No |
+
+#### Rule
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| parent_mode | string | *Enum:* `"full-doc"`, `"paragraph"` | No |
+| pre_processing_rules | [ [PreProcessingRule](#preprocessingrule) ] |  | No |
+| segmentation | [Segmentation](#segmentation) |  | No |
+| subchunk_segmentation | [Segmentation](#segmentation) |  | No |
+
+#### RuleCodeGeneratePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| code_language | string | Programming language for code generation | No |
+| instruction | string | Rule generation instruction | Yes |
+| model_config | [ModelConfig](#modelconfig) | Model configuration | Yes |
+| no_variable | boolean | Whether to exclude variables | No |
+
+#### RuleGeneratePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| instruction | string | Rule generation instruction | Yes |
+| model_config | [ModelConfig](#modelconfig) | Model configuration | Yes |
+| no_variable | boolean | Whether to exclude variables | No |
+
+#### RuleStructuredOutputPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| instruction | string | Structured output generation instruction | Yes |
+| model_config | [ModelConfig](#modelconfig) | Model configuration | Yes |
+
+#### SavedMessageCreatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| message_id | string |  | Yes |
+
+#### SavedMessageListQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| last_id | string |  | No |
+| limit | integer |  | No |
+
+#### SegmentCreatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| answer | string |  | No |
+| attachment_ids | [ string ] |  | No |
+| content | string |  | Yes |
+| keywords | [ string ] |  | No |
+
+#### SegmentListQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| enabled | string |  | No |
+| hit_count_gte | integer |  | No |
+| keyword | string |  | No |
+| limit | integer |  | No |
+| page | integer |  | No |
+| status | [ string ] |  | No |
+
+#### SegmentUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| answer | string |  | No |
+| attachment_ids | [ string ] |  | No |
+| content | string |  | Yes |
+| keywords | [ string ] |  | No |
+| regenerate_child_chunks | boolean |  | No |
+| summary | string |  | No |
+
+#### Segmentation
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| chunk_overlap | integer |  | No |
+| max_tokens | integer |  | Yes |
+| separator | string |  | No |
+
+#### SelectInputConfig
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| option_source | [StringListSource](#stringlistsource) |  | Yes |
+| output_variable_name | string |  | Yes |
+| type | string |  | No |
+
+#### SimpleAccount
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| email | string |  | Yes |
+| id | string |  | Yes |
+| name | string |  | Yes |
+
+#### SimpleEndUser
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| id | string |  | Yes |
+| is_anonymous | boolean |  | Yes |
+| session_id | string |  | No |
+| type | string |  | Yes |
+
+#### SimpleMessageDetail
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| answer | string |  | Yes |
+| inputs | object |  | Yes |
+| message | string |  | Yes |
+| query | string |  | Yes |
+
+#### SimpleModelConfig
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| model_dict | [JSONValue](#jsonvalue) |  | No |
+| pre_prompt | string |  | No |
+
+#### Site
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| app_base_url | string |  | No |
+| chat_color_theme | string |  | No |
+| chat_color_theme_inverted | boolean |  | No |
+| code | string |  | No |
+| copyright | string |  | No |
+| created_at | integer |  | No |
+| created_by | string |  | No |
+| custom_disclaimer | string |  | No |
+| customize_domain | string |  | No |
+| customize_token_strategy | string |  | No |
+| default_language | string |  | No |
+| description | string |  | No |
+| icon | string |  | No |
+| icon_background | string |  | No |
+| icon_type |  |  | No |
+| privacy_policy | string |  | No |
+| prompt_public | boolean |  | No |
+| show_workflow_steps | boolean |  | No |
+| title | string |  | No |
+| updated_at | integer |  | No |
+| updated_by | string |  | No |
+| use_icon_as_answer_icon | boolean |  | No |
+
+#### StatisticTimeRangeQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| end | string | End date (YYYY-MM-DD HH:MM) | No |
+| start | string | Start date (YYYY-MM-DD HH:MM) | No |
+
+#### StatusCount
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| failed | integer |  | Yes |
+| partial_success | integer |  | Yes |
+| paused | integer |  | Yes |
+| success | integer |  | Yes |
+
+#### StrategySetting
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| StrategySetting | string |  |  |
+
+#### StringListSource
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| selector | [ string ] |  | No |
+| type | [ValueSourceType](#valuesourcetype) |  | Yes |
+| value | [ string ] |  | No |
+
+#### StringSource
+
+Default configuration for form inputs.
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| selector | [ string ] |  | No |
+| type | [ValueSourceType](#valuesourcetype) |  | Yes |
+| value | string |  | No |
+
+#### SubscriptionQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| interval | string | Billing interval<br>*Enum:* `"month"`, `"year"` | Yes |
+| plan | string | Subscription plan<br>*Enum:* `"professional"`, `"team"` | Yes |
+
+#### SuggestedQuestionsResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data | [ string ] | Suggested question | Yes |
+
+#### SwitchWorkspacePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| tenant_id | string |  | Yes |
+
+#### SyncDraftWorkflowPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| conversation_variables | [ object ] |  | No |
+| environment_variables | [ object ] |  | No |
+| features | object |  | Yes |
+| graph | object |  | Yes |
+| hash | string |  | No |
+
+#### SyncDraftWorkflowResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| hash | string |  | No |
+| result | string |  | No |
+| updated_at | string |  | No |
+
+#### SystemFeatureResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| features | object | System feature configuration object | No |
+
+#### Tag
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| id | string |  | Yes |
+| name | string |  | Yes |
+| type | string |  | Yes |
+
+#### TagBasePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| name | string | Tag name | Yes |
+| type | [TagType](#tagtype) |  | Yes |
+
+#### TagBindingPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| tag_ids | [ string ] | Tag IDs to bind | Yes |
+| target_id | string | Target ID to bind tags to | Yes |
+| type | [TagType](#tagtype) |  | Yes |
+
+#### TagBindingRemovePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| tag_ids | [ string ] | Tag IDs to remove | Yes |
+| target_id | string | Target ID to unbind tag from | Yes |
+| type | [TagType](#tagtype) |  | Yes |
+
+#### TagListQueryParam
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| keyword | string | Search keyword | No |
+| type | string | Tag type filter<br>*Enum:* `""`, `"app"`, `"knowledge"` | No |
+
+#### TagResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| binding_count | string |  | No |
+| id | string |  | Yes |
+| name | string |  | Yes |
+| type | string |  | No |
+
+#### TagType
+
+Tag type
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| TagType | string | Tag type |  |
+
+#### TagUpdateRequestPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| name | string | Tag name | Yes |
+
+#### TenantAccountRole
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| TenantAccountRole | string |  |  |
+
+#### TenantInfoResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at | integer |  | No |
+| custom_config | object |  | No |
+| id | string |  | Yes |
+| in_trial | boolean |  | No |
+| name | string |  | No |
+| next_credit_reset_date | integer |  | No |
+| plan | string |  | No |
+| role | string |  | No |
+| status | string |  | No |
+| trial_credits | integer |  | No |
+| trial_credits_used | integer |  | No |
+| trial_end_reason | string |  | No |
+
+#### TextToAudioPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| message_id | string | Message ID | No |
+| streaming | boolean | Enable streaming response | No |
+| text | string | Text to convert to audio | No |
+| voice | string | Voice to use for TTS | No |
+
+#### TextToSpeechPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| message_id | string | Message ID | No |
+| streaming | boolean | Whether to stream audio | No |
+| text | string | Text to convert | Yes |
+| voice | string | Voice name | No |
+
+#### TextToSpeechRequest
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| message_id | string |  | No |
+| streaming | boolean |  | No |
+| text | string |  | No |
+| voice | string |  | No |
+
+#### TextToSpeechVoiceQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| language | string | Language code | Yes |
+
+#### ToolOAuthCustomClientPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| client_params | object |  | No |
+| enable_oauth_custom_client | boolean |  | No |
+
+#### ToolParameterForm
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| ToolParameterForm | string |  |  |
+
+#### TraceConfigPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| tracing_config | object | Tracing configuration data | Yes |
+| tracing_provider | string | Tracing provider name | Yes |
+
+#### TraceProviderQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| tracing_provider | string | Tracing provider name | Yes |
+
+#### TrialAppDetailWithSite
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| access_mode | string |  | No |
+| api_base_url | string |  | No |
+| created_at | object |  | No |
+| created_by | string |  | No |
+| deleted_tools | [ [TrialDeletedTool](#trialdeletedtool) ] |  | No |
+| description | string |  | No |
+| enable_api | boolean |  | No |
+| enable_site | boolean |  | No |
+| icon | string |  | No |
+| icon_background | string |  | No |
+| icon_type | string |  | No |
+| icon_url | object |  | No |
+| id | string |  | No |
+| max_active_requests | integer |  | No |
+| mode | string |  | No |
+| model_config | [TrialAppModelConfig](#trialappmodelconfig) |  | No |
+| name | string |  | No |
+| site | [TrialSite](#trialsite) |  | No |
+| tags | [ [TrialTag](#trialtag) ] |  | No |
+| updated_at | object |  | No |
+| updated_by | string |  | No |
+| use_icon_as_answer_icon | boolean |  | No |
+| workflow | [TrialWorkflowPartial](#trialworkflowpartial) |  | No |
+
+#### TrialAppModelConfig
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| agent_mode | object |  | No |
+| annotation_reply | object |  | No |
+| chat_prompt_config | object |  | No |
+| completion_prompt_config | object |  | No |
+| created_at | object |  | No |
+| created_by | string |  | No |
+| dataset_configs | object |  | No |
+| dataset_query_variable | string |  | No |
+| external_data_tools | object |  | No |
+| file_upload | object |  | No |
+| model | object |  | No |
+| more_like_this | object |  | No |
+| opening_statement | string |  | No |
+| pre_prompt | string |  | No |
+| prompt_type | string |  | No |
+| retriever_resource | object |  | No |
+| sensitive_word_avoidance | object |  | No |
+| speech_to_text | object |  | No |
+| suggested_questions | object |  | No |
+| suggested_questions_after_answer | object |  | No |
+| text_to_speech | object |  | No |
+| updated_at | object |  | No |
+| updated_by | string |  | No |
+| user_input_form | object |  | No |
+
+#### TrialConversationVariable
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| description | string |  | No |
+| id | string |  | No |
+| name | string |  | No |
+| value | object |  | No |
+| value_type | string |  | No |
+
+#### TrialDeletedTool
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| provider_id | string |  | No |
+| tool_name | string |  | No |
+| type | string |  | No |
+
+#### TrialPipelineVariable
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| allow_file_extension | [ string ] |  | No |
+| allow_file_upload_methods | [ string ] |  | No |
+| allowed_file_types | [ string ] |  | No |
+| belong_to_node_id | string |  | No |
+| default_value | object |  | No |
+| label | string |  | No |
+| max_length | integer |  | No |
+| options | [ string ] |  | No |
+| placeholder | string |  | No |
+| required | boolean |  | No |
+| tooltips | string |  | No |
+| type | string |  | No |
+| unit | string |  | No |
+| variable | string |  | No |
+
+#### TrialSimpleAccount
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| email | string |  | No |
+| id | string |  | No |
+| name | string |  | No |
+
+#### TrialSite
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| access_token | string |  | No |
+| app_base_url | string |  | No |
+| chat_color_theme | string |  | No |
+| chat_color_theme_inverted | boolean |  | No |
+| code | string |  | No |
+| copyright | string |  | No |
+| created_at | object |  | No |
+| created_by | string |  | No |
+| custom_disclaimer | string |  | No |
+| customize_domain | string |  | No |
+| customize_token_strategy | string |  | No |
+| default_language | string |  | No |
+| description | string |  | No |
+| icon | string |  | No |
+| icon_background | string |  | No |
+| icon_type | string |  | No |
+| icon_url | object |  | No |
+| privacy_policy | string |  | No |
+| prompt_public | boolean |  | No |
+| show_workflow_steps | boolean |  | No |
+| title | string |  | No |
+| updated_at | object |  | No |
+| updated_by | string |  | No |
+| use_icon_as_answer_icon | boolean |  | No |
+
+#### TrialTag
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| id | string |  | No |
+| name | string |  | No |
+| type | string |  | No |
+
+#### TrialWorkflow
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| conversation_variables | [ [TrialConversationVariable](#trialconversationvariable) ] |  | No |
+| created_at | object |  | No |
+| created_by | [TrialSimpleAccount](#trialsimpleaccount) |  | No |
+| environment_variables | [ object ] |  | No |
+| features | object |  | No |
+| graph | object |  | No |
+| hash | string |  | No |
+| id | string |  | No |
+| marked_comment | string |  | No |
+| marked_name | string |  | No |
+| rag_pipeline_variables | [ [TrialPipelineVariable](#trialpipelinevariable) ] |  | No |
+| tool_published | boolean |  | No |
+| updated_at | object |  | No |
+| updated_by | [TrialSimpleAccount](#trialsimpleaccount) |  | No |
+| version | string |  | No |
+
+#### TrialWorkflowPartial
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at | object |  | No |
+| created_by | string |  | No |
+| id | string |  | No |
+| updated_at | object |  | No |
+| updated_by | string |  | No |
+
+#### TriggerOAuthClientPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| client_params | object |  | No |
+| enabled | boolean |  | No |
+
+#### TriggerSubscriptionBuilderCreatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credential_type | string |  | No |
+
+#### TriggerSubscriptionBuilderUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credentials | object |  | No |
+| name | string |  | No |
+| parameters | object |  | No |
+| properties | object |  | No |
+
+#### TriggerSubscriptionBuilderVerifyPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credentials | object |  | Yes |
+
+#### Type
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| Type | string |  |  |
+
+#### UpdateAnnotationPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| annotation_reply | object |  | No |
+| answer | string |  | No |
+| content | string |  | No |
+| question | string |  | No |
+
+#### UpdateAppPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| description | string | App description (max 400 chars) | No |
+| icon | string | Icon | No |
+| icon_background | string | Icon background color | No |
+| icon_type | [IconType](#icontype) | Icon type | No |
+| max_active_requests | integer | Maximum active requests | No |
+| name | string | App name | Yes |
+| use_icon_as_answer_icon | boolean | Use icon as answer icon | No |
+
+#### UpgradeMode
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| UpgradeMode | string |  |  |
+
+#### UploadConfig
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| attachment_image_file_size_limit | integer |  | No |
+| audio_file_size_limit | integer |  | Yes |
+| batch_count_limit | integer |  | Yes |
+| file_size_limit | integer |  | Yes |
+| file_upload_limit | integer |  | No |
+| image_file_batch_limit | integer |  | Yes |
+| image_file_size_limit | integer |  | Yes |
+| single_chunk_attachment_limit | integer |  | Yes |
+| video_file_size_limit | integer |  | Yes |
+| workflow_file_upload_limit | integer |  | Yes |
+
+#### UserActionConfig
+
+User action configuration.
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| button_style | [ButtonStyle](#buttonstyle) |  | No |
+| id | string |  | Yes |
+| title | string |  | Yes |
+
+#### ValueSourceType
+
+ValueSourceType records whether the value comes from a static setting
+in form definiton, or a variable while the workflow is running.
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| ValueSourceType | string | ValueSourceType records whether the value comes from a static setting in form definiton, or a variable while the workflow is running. |  |
+
+#### WebhookTriggerResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at | dateTime |  | No |
+| id | string |  | Yes |
+| node_id | string |  | Yes |
+| webhook_debug_url | string |  | Yes |
+| webhook_id | string |  | Yes |
+| webhook_url | string |  | Yes |
+
+#### WebsiteCrawlPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| options | object |  | Yes |
+| provider | string | *Enum:* `"firecrawl"`, `"jinareader"`, `"watercrawl"` | Yes |
+| url | string |  | Yes |
+
+#### WebsiteCrawlStatusQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| provider | string | *Enum:* `"firecrawl"`, `"jinareader"`, `"watercrawl"` | Yes |
+
+#### WebsiteInfo
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| job_id | string |  | Yes |
+| only_main_content | boolean |  | No |
+| provider | string |  | Yes |
+| urls | [ string ] |  | Yes |
+
+#### WeightKeywordSetting
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| keyword_weight | number |  | Yes |
+
+#### WeightModel
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| keyword_setting | [WeightKeywordSetting](#weightkeywordsetting) |  | No |
+| vector_setting | [WeightVectorSetting](#weightvectorsetting) |  | No |
+| weight_type | string | *Enum:* `"customized"`, `"keyword_first"`, `"semantic_first"` | No |
+
+#### WeightVectorSetting
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| embedding_model_name | string |  | Yes |
+| embedding_provider_name | string |  | Yes |
+| vector_weight | number |  | Yes |
+
+#### WorkflowAppLogPaginationResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data | [ [WorkflowAppLogPartialResponse](#workflowapplogpartialresponse) ] |  | Yes |
+| has_more | boolean |  | Yes |
+| limit | integer |  | Yes |
+| page | integer |  | Yes |
+| total | integer |  | Yes |
+
+#### WorkflowAppLogPartialResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at | integer |  | No |
+| created_by_account | [SimpleAccount](#simpleaccount) |  | No |
+| created_by_end_user | [SimpleEndUser](#simpleenduser) |  | No |
+| created_by_role | string |  | No |
+| created_from | string |  | No |
+| details |  |  | No |
+| id | string |  | Yes |
+| workflow_run | [WorkflowRunForLogResponse](#workflowrunforlogresponse) |  | No |
+
+#### WorkflowAppLogQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at__after | dateTime | Filter logs created after this timestamp | No |
+| created_at__before | dateTime | Filter logs created before this timestamp | No |
+| created_by_account | string | Filter by account | No |
+| created_by_end_user_session_id | string | Filter by end user session ID | No |
+| detail | boolean | Whether to return detailed logs | No |
+| keyword | string | Search keyword for filtering logs | No |
+| limit | integer | Number of items per page (1-100) | No |
+| page | integer | Page number (1-99999) | No |
+| status | [WorkflowExecutionStatus](#workflowexecutionstatus) | Execution status filter (succeeded, failed, stopped, partial-succeeded) | No |
+
+#### WorkflowArchivedLogPaginationResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data | [ [WorkflowArchivedLogPartialResponse](#workflowarchivedlogpartialresponse) ] |  | Yes |
+| has_more | boolean |  | Yes |
+| limit | integer |  | Yes |
+| page | integer |  | Yes |
+| total | integer |  | Yes |
+
+#### WorkflowArchivedLogPartialResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at | integer |  | No |
+| created_by_account | [SimpleAccount](#simpleaccount) |  | No |
+| created_by_end_user | [SimpleEndUser](#simpleenduser) |  | No |
+| id | string |  | Yes |
+| trigger_metadata |  |  | No |
+| workflow_run | [WorkflowRunForArchivedLogResponse](#workflowrunforarchivedlogresponse) |  | No |
+
+#### WorkflowCommentAccount
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| avatar_url | string |  | Yes |
+| email | string |  | Yes |
+| id | string |  | Yes |
+| name | string |  | Yes |
+
+#### WorkflowCommentBasic
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| content | string |  | Yes |
+| created_at | integer |  | No |
+| created_by | string |  | Yes |
+| created_by_account | [WorkflowCommentAccount](#workflowcommentaccount) |  | No |
+| id | string |  | Yes |
+| mention_count | integer |  | Yes |
+| participants | [ [WorkflowCommentAccount](#workflowcommentaccount) ] |  | Yes |
+| position_x | number |  | Yes |
+| position_y | number |  | Yes |
+| reply_count | integer |  | Yes |
+| resolved | boolean |  | Yes |
+| resolved_at | integer |  | No |
+| resolved_by | string |  | No |
+| resolved_by_account | [WorkflowCommentAccount](#workflowcommentaccount) |  | No |
+| updated_at | integer |  | No |
+
+#### WorkflowCommentBasicList
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data | [ [WorkflowCommentBasic](#workflowcommentbasic) ] |  | Yes |
+
+#### WorkflowCommentCreate
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at | integer |  | No |
+| id | string |  | Yes |
+
+#### WorkflowCommentCreatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| content | string | Comment content | Yes |
+| mentioned_user_ids | [ string ] | Mentioned user IDs | No |
+| position_x | number | Comment X position | Yes |
+| position_y | number | Comment Y position | Yes |
+
+#### WorkflowCommentDetail
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| content | string |  | Yes |
+| created_at | integer |  | No |
+| created_by | string |  | Yes |
+| created_by_account | [WorkflowCommentAccount](#workflowcommentaccount) |  | No |
+| id | string |  | Yes |
+| mentions | [ [WorkflowCommentMention](#workflowcommentmention) ] |  | Yes |
+| position_x | number |  | Yes |
+| position_y | number |  | Yes |
+| replies | [ [WorkflowCommentReply](#workflowcommentreply) ] |  | Yes |
+| resolved | boolean |  | Yes |
+| resolved_at | integer |  | No |
+| resolved_by | string |  | No |
+| resolved_by_account | [WorkflowCommentAccount](#workflowcommentaccount) |  | No |
+| updated_at | integer |  | No |
+
+#### WorkflowCommentMention
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| mentioned_user_account | [WorkflowCommentAccount](#workflowcommentaccount) |  | No |
+| mentioned_user_id | string |  | Yes |
+| reply_id | string |  | No |
+
+#### WorkflowCommentMentionUsersPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| users | [ [AccountWithRole](#accountwithrole) ] |  | Yes |
+
+#### WorkflowCommentReply
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| content | string |  | Yes |
+| created_at | integer |  | No |
+| created_by | string |  | Yes |
+| created_by_account | [WorkflowCommentAccount](#workflowcommentaccount) |  | No |
+| id | string |  | Yes |
+
+#### WorkflowCommentReplyCreate
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at | integer |  | No |
+| id | string |  | Yes |
+
+#### WorkflowCommentReplyPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| content | string | Reply content | Yes |
+| mentioned_user_ids | [ string ] | Mentioned user IDs | No |
+
+#### WorkflowCommentReplyUpdate
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| id | string |  | Yes |
+| updated_at | integer |  | No |
+
+#### WorkflowCommentResolve
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| id | string |  | Yes |
+| resolved | boolean |  | Yes |
+| resolved_at | integer |  | No |
+| resolved_by | string |  | No |
+
+#### WorkflowCommentUpdate
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| id | string |  | Yes |
+| updated_at | integer |  | No |
+
+#### WorkflowCommentUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| content | string | Comment content | Yes |
+| mentioned_user_ids | [ string ] | Mentioned user IDs. Omit to keep existing mentions. | No |
+| position_x | number | Comment X position | No |
+| position_y | number | Comment Y position | No |
+
+#### WorkflowConversationVariableResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| description | string |  | Yes |
+| id | string |  | Yes |
+| name | string |  | Yes |
+| value | object |  | Yes |
+| value_type | string |  | Yes |
+
+#### WorkflowDraftEnvVariable
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| description | string |  | No |
+| edited | boolean |  | No |
+| id | string |  | No |
+| name | string |  | No |
+| selector | [ string ] |  | No |
+| type | string |  | No |
+| value_type | string |  | No |
+| visible | boolean |  | No |
+
+#### WorkflowDraftEnvVariableList
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| items | [ [WorkflowDraftEnvVariable](#workflowdraftenvvariable) ] |  | No |
+
+#### WorkflowDraftVariable
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| description | string |  | No |
+| edited | boolean |  | No |
+| full_content | object |  | No |
+| id | string |  | No |
+| is_truncated | boolean |  | No |
+| name | string |  | No |
+| selector | [ string ] |  | No |
+| type | string |  | No |
+| value | object |  | No |
+| value_type | string |  | No |
+| visible | boolean |  | No |
+
+#### WorkflowDraftVariableList
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| items | [ [WorkflowDraftVariable](#workflowdraftvariable) ] |  | No |
+
+#### WorkflowDraftVariableListQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| limit | integer | Items per page | No |
+| page | integer | Page number | No |
+
+#### WorkflowDraftVariableListWithoutValue
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| items | [ [WorkflowDraftVariableWithoutValue](#workflowdraftvariablewithoutvalue) ] |  | No |
+| total | object |  | No |
+
+#### WorkflowDraftVariablePatchPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| name | string |  | No |
+| value |  |  | No |
+
+#### WorkflowDraftVariableUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| name | string | Variable name | No |
+| value |  | Variable value | No |
+
+#### WorkflowDraftVariableWithoutValue
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| description | string |  | No |
+| edited | boolean |  | No |
+| id | string |  | No |
+| is_truncated | boolean |  | No |
+| name | string |  | No |
+| selector | [ string ] |  | No |
+| type | string |  | No |
+| value_type | string |  | No |
+| visible | boolean |  | No |
+
+#### WorkflowEnvironmentVariableResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| description | string |  | Yes |
+| id | string |  | Yes |
+| name | string |  | Yes |
+| value | object |  | Yes |
+| value_type | string |  | Yes |
+
+#### WorkflowExecutionStatus
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| WorkflowExecutionStatus | string |  |  |
+
+#### WorkflowFeaturesPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| features | object | Workflow feature configuration | Yes |
+
+#### WorkflowListQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| limit | integer |  | No |
+| named_only | boolean |  | No |
+| page | integer |  | No |
+| user_id | string |  | No |
+
+#### WorkflowOnlineUser
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| avatar | string |  | No |
+| user_id | string |  | Yes |
+| username | string |  | Yes |
+
+#### WorkflowOnlineUsersByApp
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| app_id | string |  | Yes |
+| users | [ [WorkflowOnlineUser](#workflowonlineuser) ] |  | Yes |
+
+#### WorkflowOnlineUsersPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| app_ids | [ string ] | App IDs | No |
+
+#### WorkflowOnlineUsersResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data | [ [WorkflowOnlineUsersByApp](#workflowonlineusersbyapp) ] |  | Yes |
+
+#### WorkflowPaginationResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| has_more | boolean |  | Yes |
+| items | [ [WorkflowResponse](#workflowresponse) ] |  | Yes |
+| limit | integer |  | Yes |
+| page | integer |  | Yes |
+
+#### WorkflowPartial
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at | integer |  | No |
+| created_by | string |  | No |
+| id | string |  | Yes |
+| updated_at | integer |  | No |
+| updated_by | string |  | No |
+
+#### WorkflowPauseDetailsResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| paused_at | string |  | No |
+| paused_nodes | [ [PausedNodeResponse](#pausednoderesponse) ] |  | Yes |
+
+#### WorkflowResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| conversation_variables | [ [WorkflowConversationVariableResponse](#workflowconversationvariableresponse) ] |  | Yes |
+| created_at | integer |  | Yes |
+| created_by | [SimpleAccount](#simpleaccount) |  | No |
+| environment_variables | [ [WorkflowEnvironmentVariableResponse](#workflowenvironmentvariableresponse) ] |  | Yes |
+| features | object |  | Yes |
+| graph | object |  | Yes |
+| hash | string |  | Yes |
+| id | string |  | Yes |
+| marked_comment | string |  | Yes |
+| marked_name | string |  | Yes |
+| rag_pipeline_variables | [ [PipelineVariableResponse](#pipelinevariableresponse) ] |  | Yes |
+| tool_published | boolean |  | Yes |
+| updated_at | integer |  | Yes |
+| updated_by | [SimpleAccount](#simpleaccount) |  | No |
+| version | string |  | Yes |
+
+#### WorkflowRunCountQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| status | string | Workflow run status filter<br>*Enum:* `"failed"`, `"partial-succeeded"`, `"running"`, `"stopped"`, `"succeeded"` | No |
+| time_range | string | Filter by time range (optional): e.g., 7d (7 days), 4h (4 hours), 30m (30 minutes), 30s (30 seconds). Filters by created_at field. | No |
+| triggered_from | string | Filter by trigger source: debugging or app-run. Default: debugging<br>*Enum:* `"app-run"`, `"debugging"` | No |
+
+#### WorkflowRunCountResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| failed | integer |  | Yes |
+| partial_succeeded | integer |  | Yes |
+| running | integer |  | Yes |
+| stopped | integer |  | Yes |
+| succeeded | integer |  | Yes |
+| total | integer |  | Yes |
+
+#### WorkflowRunDetailResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at | integer |  | No |
+| created_by_account | [SimpleAccount](#simpleaccount) |  | No |
+| created_by_end_user | [SimpleEndUser](#simpleenduser) |  | No |
+| created_by_role | string |  | No |
+| elapsed_time | number |  | No |
+| error | string |  | No |
+| exceptions_count | integer |  | No |
+| finished_at | integer |  | No |
+| graph |  |  | Yes |
+| id | string |  | Yes |
+| inputs |  |  | Yes |
+| outputs |  |  | Yes |
+| status | string |  | No |
+| total_steps | integer |  | No |
+| total_tokens | integer |  | No |
+| version | string |  | No |
+
+#### WorkflowRunExportResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| presigned_url | string | Pre-signed URL for download | No |
+| presigned_url_expires_at | string | Pre-signed URL expiration time | No |
+| status | string | Export status: success/failed | Yes |
+
+#### WorkflowRunForArchivedLogResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| elapsed_time | number |  | No |
+| id | string |  | Yes |
+| status | string |  | No |
+| total_tokens | integer |  | No |
+| triggered_from | string |  | No |
+
+#### WorkflowRunForListResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at | integer |  | No |
+| created_by_account | [SimpleAccount](#simpleaccount) |  | No |
+| elapsed_time | number |  | No |
+| exceptions_count | integer |  | No |
+| finished_at | integer |  | No |
+| id | string |  | Yes |
+| retry_index | integer |  | No |
+| status | string |  | No |
+| total_steps | integer |  | No |
+| total_tokens | integer |  | No |
+| version | string |  | No |
+
+#### WorkflowRunForLogResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at | integer |  | No |
+| elapsed_time | number |  | No |
+| error | string |  | No |
+| exceptions_count | integer |  | No |
+| finished_at | integer |  | No |
+| id | string |  | Yes |
+| status | string |  | No |
+| total_steps | integer |  | No |
+| total_tokens | integer |  | No |
+| triggered_from | string |  | No |
+| version | string |  | No |
+
+#### WorkflowRunListQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| last_id | string | Last run ID for pagination | No |
+| limit | integer | Number of items per page (1-100) | No |
+| status | string | Workflow run status filter<br>*Enum:* `"failed"`, `"partial-succeeded"`, `"running"`, `"stopped"`, `"succeeded"` | No |
+| triggered_from | string | Filter by trigger source: debugging or app-run. Default: debugging<br>*Enum:* `"app-run"`, `"debugging"` | No |
+
+#### WorkflowRunNodeExecutionListResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data | [ [WorkflowRunNodeExecutionResponse](#workflowrunnodeexecutionresponse) ] |  | Yes |
+
+#### WorkflowRunNodeExecutionResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at | integer |  | No |
+| created_by_account | [SimpleAccount](#simpleaccount) |  | No |
+| created_by_end_user | [SimpleEndUser](#simpleenduser) |  | No |
+| created_by_role | string |  | No |
+| elapsed_time | number |  | No |
+| error | string |  | No |
+| execution_metadata |  |  | No |
+| extras |  |  | No |
+| finished_at | integer |  | No |
+| id | string |  | Yes |
+| index | integer |  | No |
+| inputs |  |  | No |
+| inputs_truncated | boolean |  | No |
+| node_id | string |  | No |
+| node_type | string |  | No |
+| outputs |  |  | No |
+| outputs_truncated | boolean |  | No |
+| predecessor_node_id | string |  | No |
+| process_data |  |  | No |
+| process_data_truncated | boolean |  | No |
+| status | string |  | No |
+| title | string |  | No |
+
+#### WorkflowRunPaginationResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data | [ [WorkflowRunForListResponse](#workflowrunforlistresponse) ] |  | Yes |
+| has_more | boolean |  | Yes |
+| limit | integer |  | Yes |
+
+#### WorkflowRunPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| files | [ object ] |  | No |
+| inputs | object |  | Yes |
+
+#### WorkflowRunQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| last_id | string |  | No |
+| limit | integer |  | No |
+
+#### WorkflowRunRequest
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| files | [  ] |  | No |
+| inputs | object |  | Yes |
+
+#### WorkflowStatisticQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| end | string | End date and time (YYYY-MM-DD HH:MM) | No |
+| start | string | Start date and time (YYYY-MM-DD HH:MM) | No |
+
+#### WorkflowToolCreatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| description | string |  | Yes |
+| icon | object |  | Yes |
+| label | string |  | Yes |
+| labels | [ string ] |  | No |
+| name | string |  | Yes |
+| parameters | [ [WorkflowToolParameterConfiguration](#workflowtoolparameterconfiguration) ] |  | No |
+| privacy_policy | string |  | No |
+| workflow_app_id | string |  | Yes |
+
+#### WorkflowToolDeletePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| workflow_tool_id | string |  | Yes |
+
+#### WorkflowToolParameterConfiguration
+
+Workflow tool configuration
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| description | string | The description of the parameter | Yes |
+| form | [ToolParameterForm](#toolparameterform) | The form of the parameter | Yes |
+| name | string | The name of the parameter | Yes |
+
+#### WorkflowToolUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| description | string |  | Yes |
+| icon | object |  | Yes |
+| label | string |  | Yes |
+| labels | [ string ] |  | No |
+| name | string |  | Yes |
+| parameters | [ [WorkflowToolParameterConfiguration](#workflowtoolparameterconfiguration) ] |  | No |
+| privacy_policy | string |  | No |
+| workflow_tool_id | string |  | Yes |
+
+#### WorkflowTriggerListResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data | [ [WorkflowTriggerResponse](#workflowtriggerresponse) ] |  | Yes |
+
+#### WorkflowTriggerResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at | dateTime |  | No |
+| icon | string |  | Yes |
+| id | string |  | Yes |
+| node_id | string |  | Yes |
+| provider_name | string |  | Yes |
+| status | string |  | Yes |
+| title | string |  | Yes |
+| trigger_type | string |  | Yes |
+| updated_at | dateTime |  | No |
+
+#### WorkflowUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| marked_comment | string |  | No |
+| marked_name | string |  | No |
+
+#### WorkspaceCustomConfigPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| remove_webapp_brand | boolean |  | No |
+| replace_webapp_logo | string |  | No |
+
+#### WorkspaceInfoPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| name | string |  | Yes |
+
+#### WorkspaceListQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| limit | integer |  | No |
+| page | integer |  | No |
+
+#### _AnonymousInlineModel_b1954337d565
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| enable | boolean |  | No |
+| model_name | string |  | No |
+| model_provider_name | string |  | No |
+| summary_prompt | string |  | No |
+
+## FastOpenAPI Preview (OpenAPI 3.0)
+
+### Dify API (FastOpenAPI PoC)
+FastOpenAPI proof of concept for Dify API
+
+#### Version: 1.0
+
+---
+
+##### [GET] /console/api/init
+**Get initialization validation status.**
+
+###### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | OK | **application/json**: [InitStatusResponse](#initstatusresponse)<br> |
+
+##### [POST] /console/api/init
+**Validate initialization password.**
+
+###### Request Body
+
+| Required | Schema |
+| -------- | ------ |
+|  Yes | **application/json**: [InitValidatePayload](#initvalidatepayload)<br> |
+
+###### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 201 | Created | **application/json**: [InitValidateResponse](#initvalidateresponse)<br> |
+
+##### [GET] /console/api/ping
+**Health check endpoint for connection testing.**
+
+###### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | OK | **application/json**: [PingResponse](#pingresponse)<br> |
+
+##### [GET] /console/api/setup
+**Get system setup status.
+
+    NOTE: This endpoint is unauthenticated by design.
+
+    During first-time bootstrap there is no admin account yet, so frontend initialization must be
+    able to query setup progress before any login flow exists.
+
+    Only bootstrap-safe status information should be returned by this endpoint.
+    **
+
+###### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | OK | **application/json**: [SetupStatusResponse](#setupstatusresponse)<br> |
+
+##### [POST] /console/api/setup
+**Initialize system setup with admin account.
+
+    NOTE: This endpoint is unauthenticated by design for first-time bootstrap.
+    Access is restricted by deployment mode (`SELF_HOSTED`), one-time setup guards,
+    and init-password validation rather than user session authentication.
+    **
+
+###### Request Body
+
+| Required | Schema |
+| -------- | ------ |
+|  Yes | **application/json**: [SetupRequestPayload](#setuprequestpayload)<br> |
+
+###### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 201 | Created | **application/json**: [SetupResponse](#setupresponse)<br> |
+
+##### [GET] /console/api/version
+**Check for application version updates.**
+
+###### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| current_version | query |  | Yes | string |
+
+###### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | OK | **application/json**: [VersionResponse](#versionresponse)<br> |
+
+---
+##### Schemas
+
+###### ErrorSchema
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| error | { **"details"**: string, **"message"**: string, **"status"**: integer, **"type"**: string } |  | Yes |
+
+###### InitStatusResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| status | string, <br>**Available values:** "finished", "not_started" | Initialization status<br>*Enum:* `"finished"`, `"not_started"` | Yes |
+
+###### InitValidatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| password | string | Initialization password | Yes |
+
+###### InitValidateResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| result | string | Operation result | Yes |
+
+###### PingResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| result | string | Health check result | Yes |
+
+###### SetupRequestPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| email | string | Admin email address | Yes |
+| language |  | Admin language | No |
+| name | string | Admin name (max 30 characters) | Yes |
+| password | string | Admin password | Yes |
+
+###### SetupResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| result | string | Setup result | Yes |
+
+###### SetupStatusResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| setup_at |  | Setup completion time (ISO format) | No |
+| step | string, <br>**Available values:** "finished", "not_started" | Setup step status<br>*Enum:* `"finished"`, `"not_started"` | Yes |
+
+###### VersionFeatures
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| can_replace_logo | boolean | Whether logo replacement is supported | Yes |
+| model_load_balancing_enabled | boolean | Whether model load balancing is enabled | Yes |
+
+###### VersionResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| can_auto_update | boolean | Whether auto-update is supported | Yes |
+| features | [VersionFeatures](#versionfeatures) | Feature flags and capabilities | Yes |
+| release_date | string | Release date of latest version | Yes |
+| release_notes | string | Release notes for latest version | Yes |
+| version | string | Latest version number | Yes |
diff --git a/api/openapi/markdown/service-swagger.md b/api/openapi/markdown/service-swagger.md
new file mode 100644
index 0000000000..72bea2a1aa
--- /dev/null
+++ b/api/openapi/markdown/service-swagger.md
@@ -0,0 +1,2754 @@
+# Service API
+API for application services
+
+## Version: 1.0
+
+### Security
+**Bearer**  
+
+| apiKey | *API Key* |
+| ------ | --------- |
+| Description | Type: Bearer {your-api-key} |
+| In | header |
+| Name | Authorization |
+
+---
+## service_api
+Service operations
+
+### /
+
+#### GET
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /app/feedbacks
+
+#### GET
+##### Summary
+
+Get all feedbacks for the application
+
+##### Description
+
+Get all feedbacks for the application
+Returns paginated list of all feedback submitted for messages in this app.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [FeedbackListQuery](#feedbacklistquery) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Feedbacks retrieved successfully |
+| 401 | Unauthorized - invalid API token |
+
+### /apps/annotation-reply/{action}
+
+#### POST
+##### Summary
+
+Enable or disable annotation reply feature
+
+##### Description
+
+Enable or disable annotation reply feature
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [AnnotationReplyActionPayload](#annotationreplyactionpayload) |
+| action | path | Action to perform: 'enable' or 'disable' | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Action completed successfully |
+| 401 | Unauthorized - invalid API token |
+
+### /apps/annotation-reply/{action}/status/{job_id}
+
+#### GET
+##### Summary
+
+Get the status of an annotation reply action job
+
+##### Description
+
+Get the status of an annotation reply action job
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| action | path | Action type | Yes | string |
+| job_id | path | Job ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Job status retrieved successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Job not found |
+
+### /apps/annotations
+
+#### GET
+##### Summary
+
+List annotations for the application
+
+##### Description
+
+List annotations for the application
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Annotations retrieved successfully | [AnnotationList](#annotationlist) |
+| 401 | Unauthorized - invalid API token |  |
+
+#### POST
+##### Summary
+
+Create a new annotation
+
+##### Description
+
+Create a new annotation
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [AnnotationCreatePayload](#annotationcreatepayload) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 201 | Annotation created successfully | [Annotation](#annotation) |
+| 401 | Unauthorized - invalid API token |  |
+
+### /apps/annotations/{annotation_id}
+
+#### DELETE
+##### Summary
+
+Delete an annotation
+
+##### Description
+
+Delete an annotation
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| annotation_id | path | Annotation ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 204 | Annotation deleted successfully |
+| 401 | Unauthorized - invalid API token |
+| 403 | Forbidden - insufficient permissions |
+| 404 | Annotation not found |
+
+#### PUT
+##### Summary
+
+Update an existing annotation
+
+##### Description
+
+Update an existing annotation
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [AnnotationCreatePayload](#annotationcreatepayload) |
+| annotation_id | path | Annotation ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Annotation updated successfully | [Annotation](#annotation) |
+| 401 | Unauthorized - invalid API token |  |
+| 403 | Forbidden - insufficient permissions |  |
+| 404 | Annotation not found |  |
+
+### /audio-to-text
+
+#### POST
+##### Summary
+
+Convert audio to text using speech-to-text
+
+##### Description
+
+Convert audio to text using speech-to-text
+Accepts an audio file upload and returns the transcribed text.
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Audio successfully transcribed |
+| 400 | Bad request - no audio or invalid audio |
+| 401 | Unauthorized - invalid API token |
+| 413 | Audio file too large |
+| 415 | Unsupported audio type |
+| 500 | Internal server error |
+
+### /chat-messages
+
+#### POST
+##### Summary
+
+Send a message in a chat conversation
+
+##### Description
+
+Send a message in a chat conversation
+This endpoint handles chat messages for chat, agent chat, and advanced chat applications.
+Supports conversation management and both blocking and streaming response modes.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ChatRequestPayload](#chatrequestpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Message sent successfully |
+| 400 | Bad request - invalid parameters or workflow issues |
+| 401 | Unauthorized - invalid API token |
+| 404 | Conversation or workflow not found |
+| 429 | Rate limit exceeded |
+| 500 | Internal server error |
+
+### /chat-messages/{task_id}/stop
+
+#### POST
+##### Summary
+
+Stop a running chat message generation
+
+##### Description
+
+Stop a running chat message generation
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| task_id | path | The ID of the task to stop | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Task stopped successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Task not found |
+
+### /completion-messages
+
+#### POST
+##### Summary
+
+Create a completion for the given prompt
+
+##### Description
+
+Create a completion for the given prompt
+This endpoint generates a completion based on the provided inputs and query.
+Supports both blocking and streaming response modes.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [CompletionRequestPayload](#completionrequestpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Completion created successfully |
+| 400 | Bad request - invalid parameters |
+| 401 | Unauthorized - invalid API token |
+| 404 | Conversation not found |
+| 500 | Internal server error |
+
+### /completion-messages/{task_id}/stop
+
+#### POST
+##### Summary
+
+Stop a running completion task
+
+##### Description
+
+Stop a running completion task
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| task_id | path | The ID of the task to stop | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Task stopped successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Task not found |
+
+### /conversations
+
+#### GET
+##### Summary
+
+List all conversations for the current user
+
+##### Description
+
+List all conversations for the current user
+Supports pagination using last_id and limit parameters.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ConversationListQuery](#conversationlistquery) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Conversations retrieved successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Last conversation not found |
+
+### /conversations/{c_id}
+
+#### DELETE
+##### Summary
+
+Delete a specific conversation
+
+##### Description
+
+Delete a specific conversation
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| c_id | path | Conversation ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 204 | Conversation deleted successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Conversation not found |
+
+### /conversations/{c_id}/name
+
+#### POST
+##### Summary
+
+Rename a conversation or auto-generate a name
+
+##### Description
+
+Rename a conversation or auto-generate a name
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ConversationRenamePayload](#conversationrenamepayload) |
+| c_id | path | Conversation ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Conversation renamed successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Conversation not found |
+
+### /conversations/{c_id}/variables
+
+#### GET
+##### Summary
+
+List all variables for a conversation
+
+##### Description
+
+List all variables for a conversation
+Conversational variables are only available for chat applications.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ConversationVariablesQuery](#conversationvariablesquery) |
+| c_id | path | Conversation ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Variables retrieved successfully | [ConversationVariableInfiniteScrollPaginationResponse](#conversationvariableinfinitescrollpaginationresponse) |
+| 401 | Unauthorized - invalid API token |  |
+| 404 | Conversation not found |  |
+
+### /conversations/{c_id}/variables/{variable_id}
+
+#### PUT
+##### Summary
+
+Update a conversation variable's value
+
+##### Description
+
+Update a conversation variable's value
+Allows updating the value of a specific conversation variable.
+The value must match the variable's expected type.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ConversationVariableUpdatePayload](#conversationvariableupdatepayload) |
+| c_id | path | Conversation ID | Yes | string |
+| variable_id | path | Variable ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Variable updated successfully | [ConversationVariableResponse](#conversationvariableresponse) |
+| 400 | Bad request - type mismatch |  |
+| 401 | Unauthorized - invalid API token |  |
+| 404 | Conversation or variable not found |  |
+
+### /datasets
+
+#### GET
+##### Summary
+
+Resource for getting datasets
+
+##### Description
+
+List all datasets
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Datasets retrieved successfully |
+| 401 | Unauthorized - invalid API token |
+
+#### POST
+##### Summary
+
+Resource for creating datasets
+
+##### Description
+
+Create a new dataset
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [DatasetCreatePayload](#datasetcreatepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Dataset created successfully |
+| 400 | Bad request - invalid parameters |
+| 401 | Unauthorized - invalid API token |
+
+### /datasets/pipeline/file-upload
+
+#### POST
+##### Summary
+
+Upload a file for use in conversations
+
+##### Description
+
+Upload a file to a knowledgebase pipeline
+Accepts a single file upload via multipart/form-data.
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 201 | File uploaded successfully |
+| 400 | Bad request - no file or invalid file |
+| 401 | Unauthorized - invalid API token |
+| 413 | File too large |
+| 415 | Unsupported file type |
+
+### /datasets/tags
+
+#### DELETE
+##### Summary
+
+Delete a knowledge type tag
+
+##### Description
+
+Delete a knowledge type tag
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [TagDeletePayload](#tagdeletepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 204 | Tag deleted successfully |
+| 401 | Unauthorized - invalid API token |
+| 403 | Forbidden - insufficient permissions |
+
+#### GET
+##### Summary
+
+Get all knowledge type tags
+
+##### Description
+
+Get all knowledge type tags
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Tags retrieved successfully |
+| 401 | Unauthorized - invalid API token |
+
+#### PATCH
+##### Description
+
+Update a knowledge type tag
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [TagUpdatePayload](#tagupdatepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Tag updated successfully |
+| 401 | Unauthorized - invalid API token |
+| 403 | Forbidden - insufficient permissions |
+
+#### POST
+##### Summary
+
+Add a knowledge type tag
+
+##### Description
+
+Add a knowledge type tag
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [TagCreatePayload](#tagcreatepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Tag created successfully |
+| 401 | Unauthorized - invalid API token |
+| 403 | Forbidden - insufficient permissions |
+
+### /datasets/tags/binding
+
+#### POST
+##### Description
+
+Bind tags to a dataset
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [TagBindingPayload](#tagbindingpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 204 | Tags bound successfully |
+| 401 | Unauthorized - invalid API token |
+| 403 | Forbidden - insufficient permissions |
+
+### /datasets/tags/unbinding
+
+#### POST
+##### Description
+
+Unbind tags from a dataset
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [TagUnbindingPayload](#tagunbindingpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 204 | Tags unbound successfully |
+| 401 | Unauthorized - invalid API token |
+| 403 | Forbidden - insufficient permissions |
+
+### /datasets/{dataset_id}
+
+#### DELETE
+##### Summary
+
+Deletes a dataset given its ID
+
+##### Description
+
+Delete a dataset
+Args:
+    _: ignore
+    dataset_id (UUID): The ID of the dataset to be deleted.
+
+Returns:
+    dict: A dictionary with a key 'result' and a value 'success'
+          if the dataset was successfully deleted. Omitted in HTTP response.
+    int: HTTP status code 204 indicating that the operation was successful.
+
+Raises:
+    NotFound: If the dataset with the given ID does not exist.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 204 | Dataset deleted successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Dataset not found |
+| 409 | Conflict - dataset is in use |
+
+#### GET
+##### Description
+
+Get a specific dataset by ID
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Dataset retrieved successfully |
+| 401 | Unauthorized - invalid API token |
+| 403 | Forbidden - insufficient permissions |
+| 404 | Dataset not found |
+
+#### PATCH
+##### Description
+
+Update an existing dataset
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [DatasetUpdatePayload](#datasetupdatepayload) |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Dataset updated successfully |
+| 401 | Unauthorized - invalid API token |
+| 403 | Forbidden - insufficient permissions |
+| 404 | Dataset not found |
+
+### /datasets/{dataset_id}/document/create-by-file
+
+#### POST
+##### Description
+
+Create a new document by uploading a file
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Document created successfully |
+| 400 | Bad request - invalid file or parameters |
+| 401 | Unauthorized - invalid API token |
+
+### /datasets/{dataset_id}/document/create-by-text
+
+#### POST
+##### Description
+
+Create a new document by providing text content
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [DocumentTextCreatePayload](#documenttextcreatepayload) |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Document created successfully |
+| 400 | Bad request - invalid parameters |
+| 401 | Unauthorized - invalid API token |
+
+### /datasets/{dataset_id}/document/create_by_file
+
+#### POST
+##### Description
+
+Create a new document by uploading a file
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Document created successfully |
+| 400 | Bad request - invalid file or parameters |
+| 401 | Unauthorized - invalid API token |
+
+### /datasets/{dataset_id}/document/create_by_text
+
+#### POST
+***DEPRECATED***
+##### Description
+
+Deprecated legacy alias for creating a new document by providing text content. Use /datasets/{dataset_id}/document/create-by-text instead.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [DocumentTextCreatePayload](#documenttextcreatepayload) |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Document created successfully |
+| 400 | Bad request - invalid parameters |
+| 401 | Unauthorized - invalid API token |
+
+### /datasets/{dataset_id}/documents
+
+#### GET
+##### Description
+
+List all documents in a dataset
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Documents retrieved successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Dataset not found |
+
+### /datasets/{dataset_id}/documents/download-zip
+
+#### POST
+##### Description
+
+Download selected uploaded documents as a single ZIP archive
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [DocumentBatchDownloadZipPayload](#documentbatchdownloadzippayload) |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | ZIP archive generated successfully |
+| 401 | Unauthorized - invalid API token |
+| 403 | Forbidden - insufficient permissions |
+| 404 | Document or dataset not found |
+
+### /datasets/{dataset_id}/documents/metadata
+
+#### POST
+##### Summary
+
+Update metadata for multiple documents
+
+##### Description
+
+Update metadata for multiple documents
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [MetadataOperationData](#metadataoperationdata) |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Documents metadata updated successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Dataset not found |
+
+### /datasets/{dataset_id}/documents/status/{action}
+
+#### PATCH
+##### Summary
+
+Batch update document status
+
+##### Description
+
+Batch update document status
+Args:
+    tenant_id: tenant id
+    dataset_id: dataset id
+    action: action to perform (Literal["enable", "disable", "archive", "un_archive"])
+
+Returns:
+    dict: A dictionary with a key 'result' and a value 'success'
+    int: HTTP status code 200 indicating that the operation was successful.
+
+Raises:
+    NotFound: If the dataset with the given ID does not exist.
+    Forbidden: If the user does not have permission.
+    InvalidActionError: If the action is invalid or cannot be performed.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| action | path | Action to perform: 'enable', 'disable', 'archive', or 'un_archive' | Yes | string |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Document status updated successfully |
+| 400 | Bad request - invalid action |
+| 401 | Unauthorized - invalid API token |
+| 403 | Forbidden - insufficient permissions |
+| 404 | Dataset not found |
+
+### /datasets/{dataset_id}/documents/{batch}/indexing-status
+
+#### GET
+##### Description
+
+Get indexing status for documents in a batch
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| batch | path | Batch ID | Yes | string |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Indexing status retrieved successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Dataset or documents not found |
+
+### /datasets/{dataset_id}/documents/{document_id}
+
+#### DELETE
+##### Summary
+
+Delete document
+
+##### Description
+
+Delete a document
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | Dataset ID | Yes | string |
+| document_id | path | Document ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 204 | Document deleted successfully |
+| 401 | Unauthorized - invalid API token |
+| 403 | Forbidden - document is archived |
+| 404 | Document not found |
+
+#### GET
+##### Description
+
+Get a specific document by ID
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | Dataset ID | Yes | string |
+| document_id | path | Document ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Document retrieved successfully |
+| 401 | Unauthorized - invalid API token |
+| 403 | Forbidden - insufficient permissions |
+| 404 | Document not found |
+
+#### PATCH
+##### Description
+
+Update an existing document by uploading a file
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | Dataset ID | Yes | string |
+| document_id | path | Document ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Document updated successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Document not found |
+
+### /datasets/{dataset_id}/documents/{document_id}/download
+
+#### GET
+##### Description
+
+Get a signed download URL for a document's original uploaded file
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | Dataset ID | Yes | string |
+| document_id | path | Document ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Download URL generated successfully |
+| 401 | Unauthorized - invalid API token |
+| 403 | Forbidden - insufficient permissions |
+| 404 | Document or upload file not found |
+
+### /datasets/{dataset_id}/documents/{document_id}/segments
+
+#### GET
+##### Description
+
+List segments in a document
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [SegmentListQuery](#segmentlistquery) |
+| dataset_id | path | Dataset ID | Yes | string |
+| document_id | path | Document ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Segments retrieved successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Dataset or document not found |
+
+#### POST
+##### Description
+
+Create segments in a document
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [SegmentCreatePayload](#segmentcreatepayload) |
+| dataset_id | path | Dataset ID | Yes | string |
+| document_id | path | Document ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Segments created successfully |
+| 400 | Bad request - segments data is missing |
+| 401 | Unauthorized - invalid API token |
+| 404 | Dataset or document not found |
+
+### /datasets/{dataset_id}/documents/{document_id}/segments/{segment_id}
+
+#### DELETE
+##### Description
+
+Delete a specific segment
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | Dataset ID | Yes | string |
+| document_id | path | Document ID | Yes | string |
+| segment_id | path | Segment ID to delete | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 204 | Segment deleted successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Dataset, document, or segment not found |
+
+#### GET
+##### Description
+
+Get a specific segment by ID
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+| document_id | path |  | Yes | string |
+| segment_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Segment retrieved successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Dataset, document, or segment not found |
+
+#### POST
+##### Description
+
+Update a specific segment
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [SegmentUpdatePayload](#segmentupdatepayload) |
+| dataset_id | path | Dataset ID | Yes | string |
+| document_id | path | Document ID | Yes | string |
+| segment_id | path | Segment ID to update | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Segment updated successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Dataset, document, or segment not found |
+
+### /datasets/{dataset_id}/documents/{document_id}/segments/{segment_id}/child_chunks
+
+#### GET
+##### Description
+
+List child chunks for a segment
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ChildChunkListQuery](#childchunklistquery) |
+| dataset_id | path | Dataset ID | Yes | string |
+| document_id | path | Document ID | Yes | string |
+| segment_id | path | Parent segment ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Child chunks retrieved successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Dataset, document, or segment not found |
+
+#### POST
+##### Description
+
+Create a new child chunk for a segment
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ChildChunkCreatePayload](#childchunkcreatepayload) |
+| dataset_id | path | Dataset ID | Yes | string |
+| document_id | path | Document ID | Yes | string |
+| segment_id | path | Parent segment ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Child chunk created successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Dataset, document, or segment not found |
+
+### /datasets/{dataset_id}/documents/{document_id}/segments/{segment_id}/child_chunks/{child_chunk_id}
+
+#### DELETE
+##### Description
+
+Delete a specific child chunk
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| child_chunk_id | path | Child chunk ID to delete | Yes | string |
+| dataset_id | path | Dataset ID | Yes | string |
+| document_id | path | Document ID | Yes | string |
+| segment_id | path | Parent segment ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 204 | Child chunk deleted successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Dataset, document, segment, or child chunk not found |
+
+#### PATCH
+##### Description
+
+Update a specific child chunk
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ChildChunkUpdatePayload](#childchunkupdatepayload) |
+| child_chunk_id | path | Child chunk ID to update | Yes | string |
+| dataset_id | path | Dataset ID | Yes | string |
+| document_id | path | Document ID | Yes | string |
+| segment_id | path | Parent segment ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Child chunk updated successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Dataset, document, segment, or child chunk not found |
+
+### /datasets/{dataset_id}/documents/{document_id}/update-by-file
+
+#### POST
+***DEPRECATED***
+##### Description
+
+Deprecated legacy alias for updating an existing document by uploading a file. Use PATCH /datasets/{dataset_id}/documents/{document_id} instead.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | Dataset ID | Yes | string |
+| document_id | path | Document ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Document updated successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Document not found |
+
+### /datasets/{dataset_id}/documents/{document_id}/update-by-text
+
+#### POST
+##### Description
+
+Update an existing document by providing text content
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [DocumentTextUpdate](#documenttextupdate) |
+| dataset_id | path | Dataset ID | Yes | string |
+| document_id | path | Document ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Document updated successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Document not found |
+
+### /datasets/{dataset_id}/documents/{document_id}/update_by_file
+
+#### POST
+***DEPRECATED***
+##### Description
+
+Deprecated legacy alias for updating an existing document by uploading a file. Use PATCH /datasets/{dataset_id}/documents/{document_id} instead.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | Dataset ID | Yes | string |
+| document_id | path | Document ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Document updated successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Document not found |
+
+### /datasets/{dataset_id}/documents/{document_id}/update_by_text
+
+#### POST
+***DEPRECATED***
+##### Description
+
+Deprecated legacy alias for updating an existing document by providing text content. Use /datasets/{dataset_id}/documents/{document_id}/update-by-text instead.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [DocumentTextUpdate](#documenttextupdate) |
+| dataset_id | path | Dataset ID | Yes | string |
+| document_id | path | Document ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Document updated successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Document not found |
+
+### /datasets/{dataset_id}/hit-testing
+
+#### POST
+##### Summary
+
+Perform hit testing on a dataset
+
+##### Description
+
+Perform hit testing on a dataset
+Tests retrieval performance for the specified dataset.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [HitTestingPayload](#hittestingpayload) |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Hit testing results |
+| 401 | Unauthorized - invalid API token |
+| 404 | Dataset not found |
+
+### /datasets/{dataset_id}/metadata
+
+#### GET
+##### Summary
+
+Get all metadata for a dataset
+
+##### Description
+
+Get all metadata for a dataset
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Metadata retrieved successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Dataset not found |
+
+#### POST
+##### Summary
+
+Create metadata for a dataset
+
+##### Description
+
+Create metadata for a dataset
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [MetadataArgs](#metadataargs) |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 201 | Metadata created successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Dataset not found |
+
+### /datasets/{dataset_id}/metadata/built-in
+
+#### GET
+##### Summary
+
+Get all built-in metadata fields
+
+##### Description
+
+Get all built-in metadata fields
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Built-in fields retrieved successfully |
+| 401 | Unauthorized - invalid API token |
+
+### /datasets/{dataset_id}/metadata/built-in/{action}
+
+#### POST
+##### Summary
+
+Enable or disable built-in metadata field
+
+##### Description
+
+Enable or disable built-in metadata field
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| action | path | Action to perform: 'enable' or 'disable' | Yes | string |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Action completed successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Dataset not found |
+
+### /datasets/{dataset_id}/metadata/{metadata_id}
+
+#### DELETE
+##### Summary
+
+Delete metadata
+
+##### Description
+
+Delete metadata
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | Dataset ID | Yes | string |
+| metadata_id | path | Metadata ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 204 | Metadata deleted successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Dataset or metadata not found |
+
+#### PATCH
+##### Summary
+
+Update metadata name
+
+##### Description
+
+Update metadata name
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [MetadataUpdatePayload](#metadataupdatepayload) |
+| dataset_id | path | Dataset ID | Yes | string |
+| metadata_id | path | Metadata ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Metadata updated successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Dataset or metadata not found |
+
+### /datasets/{dataset_id}/pipeline/datasource-plugins
+
+#### GET
+##### Summary
+
+Resource for getting datasource plugins
+
+##### Description
+
+List all datasource plugins for a rag pipeline
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+| is_published | query | Whether to get published or draft datasource plugins (true for published, false for draft, default: true) | No | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Datasource plugins retrieved successfully |
+| 401 | Unauthorized - invalid API token |
+
+### /datasets/{dataset_id}/pipeline/datasource/nodes/{node_id}/run
+
+#### POST
+##### Summary
+
+Resource for getting datasource plugins
+
+##### Description
+
+Run a datasource node for a rag pipeline
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+| node_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Datasource node run successfully |
+| 401 | Unauthorized - invalid API token |
+
+### /datasets/{dataset_id}/pipeline/run
+
+#### POST
+##### Summary
+
+Resource for running a rag pipeline
+
+##### Description
+
+Run a datasource node for a rag pipeline
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Pipeline run successfully |
+| 401 | Unauthorized - invalid API token |
+
+### /datasets/{dataset_id}/retrieve
+
+#### POST
+##### Summary
+
+Perform hit testing on a dataset
+
+##### Description
+
+Perform hit testing on a dataset
+Tests retrieval performance for the specified dataset.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [HitTestingPayload](#hittestingpayload) |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Hit testing results |
+| 401 | Unauthorized - invalid API token |
+| 404 | Dataset not found |
+
+### /datasets/{dataset_id}/tags
+
+#### GET
+##### Summary
+
+Get all knowledge type tags
+
+##### Description
+
+Get tags bound to a specific dataset
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| dataset_id | path | Dataset ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Tags retrieved successfully |
+| 401 | Unauthorized - invalid API token |
+
+### /end-users/{end_user_id}
+
+#### GET
+##### Summary
+
+Get end user detail
+
+##### Description
+
+Get an end user by ID
+This endpoint is scoped to the current app token's tenant/app to prevent
+cross-tenant/app access when an end-user ID is known.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| end_user_id | path | End user ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | End user retrieved successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | End user not found |
+
+### /files/upload
+
+#### POST
+##### Summary
+
+Upload a file for use in conversations
+
+##### Description
+
+Upload a file for use in conversations
+Accepts a single file upload via multipart/form-data.
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 201 | File uploaded successfully | [FileResponse](#fileresponse) |
+| 400 | Bad request - no file or invalid file |  |
+| 401 | Unauthorized - invalid API token |  |
+| 413 | File too large |  |
+| 415 | Unsupported file type |  |
+
+### /files/{file_id}/preview
+
+#### GET
+##### Summary
+
+Preview/Download a file that was uploaded via Service API
+
+##### Description
+
+Preview or download a file uploaded via Service API
+Provides secure file preview/download functionality.
+Files can only be accessed if they belong to messages within the requesting app's context.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [FilePreviewQuery](#filepreviewquery) |
+| file_id | path | UUID of the file to preview | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | File retrieved successfully |
+| 401 | Unauthorized - invalid API token |
+| 403 | Forbidden - file access denied |
+| 404 | File not found |
+
+### /form/human_input/{form_token}
+
+#### GET
+##### Description
+
+Get a paused human input form by token
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| form_token | path | Human input form token | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Form retrieved successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Form not found |
+| 412 | Form already submitted or expired |
+
+#### POST
+##### Description
+
+Submit a paused human input form by token
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [HumanInputFormSubmitPayload](#humaninputformsubmitpayload) |
+| form_token | path | Human input form token | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Form submitted successfully |
+| 400 | Bad request - invalid submission data |
+| 401 | Unauthorized - invalid API token |
+| 404 | Form not found |
+| 412 | Form already submitted or expired |
+
+### /info
+
+#### GET
+##### Summary
+
+Get app information
+
+##### Description
+
+Get basic application information
+Returns basic information about the application including name, description, tags, and mode.
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Application info retrieved successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Application not found |
+
+### /messages
+
+#### GET
+##### Summary
+
+List messages in a conversation
+
+##### Description
+
+List messages in a conversation
+Retrieves messages with pagination support using first_id.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [MessageListQuery](#messagelistquery) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Messages retrieved successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Conversation or first message not found |
+
+### /messages/{message_id}/feedbacks
+
+#### POST
+##### Summary
+
+Submit feedback for a message
+
+##### Description
+
+Submit feedback for a message
+Allows users to rate messages as like/dislike and provide optional feedback content.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [MessageFeedbackPayload](#messagefeedbackpayload) |
+| message_id | path | Message ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Feedback submitted successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Message not found |
+
+### /messages/{message_id}/suggested
+
+#### GET
+##### Summary
+
+Get suggested follow-up questions for a message
+
+##### Description
+
+Get suggested follow-up questions for a message
+Returns AI-generated follow-up questions based on the message content.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| message_id | path | Message ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Suggested questions retrieved successfully |
+| 400 | Suggested questions feature is disabled |
+| 401 | Unauthorized - invalid API token |
+| 404 | Message not found |
+| 500 | Internal server error |
+
+### /meta
+
+#### GET
+##### Summary
+
+Get app metadata
+
+##### Description
+
+Get application metadata
+Returns metadata about the application including configuration and settings.
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Metadata retrieved successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Application not found |
+
+### /parameters
+
+#### GET
+##### Summary
+
+Retrieve app parameters
+
+##### Description
+
+Retrieve application input parameters and configuration
+Returns the input form parameters and configuration for the application.
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Parameters retrieved successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Application not found |
+
+### /site
+
+#### GET
+##### Summary
+
+Retrieve app site info
+
+##### Description
+
+Get application site configuration
+Returns the site configuration for the application including theme, icons, and text.
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Site configuration retrieved successfully |
+| 401 | Unauthorized - invalid API token |
+| 403 | Forbidden - site not found or tenant archived |
+
+### /text-to-audio
+
+#### POST
+##### Summary
+
+Convert text to audio using text-to-speech
+
+##### Description
+
+Convert text to audio using text-to-speech
+Converts the provided text to audio using the specified voice.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [TextToAudioPayload](#texttoaudiopayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Text successfully converted to audio |
+| 400 | Bad request - invalid parameters |
+| 401 | Unauthorized - invalid API token |
+| 500 | Internal server error |
+
+### /workflow/{task_id}/events
+
+#### GET
+##### Description
+
+Get workflow execution events stream after resume
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| task_id | path | Workflow run ID | Yes | string |
+| continue_on_pause | query | Whether to keep the stream open across workflow_paused events,specify `"true"` to keep the stream open for `workflow_paused` events. | No | string |
+| include_state_snapshot | query | Whether to replay from persisted state snapshot, specify `"true"` to include a status snapshot of executed nodes | No | string |
+| user | query | End user identifier (query param) | No | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | SSE event stream |
+| 401 | Unauthorized - invalid API token |
+| 404 | Workflow run not found |
+
+### /workflows/logs
+
+#### GET
+##### Summary
+
+Get workflow app logs
+
+##### Description
+
+Get workflow execution logs
+Returns paginated workflow execution logs with filtering options.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [WorkflowLogQuery](#workflowlogquery) |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Logs retrieved successfully | [WorkflowAppLogPaginationResponse](#workflowapplogpaginationresponse) |
+| 401 | Unauthorized - invalid API token |  |
+
+### /workflows/run
+
+#### POST
+##### Summary
+
+Execute a workflow
+
+##### Description
+
+Execute a workflow
+Runs a workflow with the provided inputs and returns the results.
+Supports both blocking and streaming response modes.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [WorkflowRunPayload](#workflowrunpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Workflow executed successfully |
+| 400 | Bad request - invalid parameters or workflow issues |
+| 401 | Unauthorized - invalid API token |
+| 404 | Workflow not found |
+| 429 | Rate limit exceeded |
+| 500 | Internal server error |
+
+### /workflows/run/{workflow_run_id}
+
+#### GET
+##### Summary
+
+Get a workflow task running detail
+
+##### Description
+
+Get workflow run details
+Returns detailed information about a specific workflow run.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| workflow_run_id | path | Workflow run ID | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Workflow run details retrieved successfully | [WorkflowRunResponse](#workflowrunresponse) |
+| 401 | Unauthorized - invalid API token |  |
+| 404 | Workflow run not found |  |
+
+### /workflows/tasks/{task_id}/stop
+
+#### POST
+##### Summary
+
+Stop a running workflow task
+
+##### Description
+
+Stop a running workflow task
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| task_id | path | Task ID to stop | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Task stopped successfully |
+| 401 | Unauthorized - invalid API token |
+| 404 | Task not found |
+
+### /workflows/{workflow_id}/run
+
+#### POST
+##### Summary
+
+Run specific workflow by ID
+
+##### Description
+
+Execute a specific workflow by ID
+Executes a specific workflow version identified by its ID.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [WorkflowRunPayload](#workflowrunpayload) |
+| workflow_id | path | Workflow ID to execute | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Workflow executed successfully |
+| 400 | Bad request - invalid parameters or workflow issues |
+| 401 | Unauthorized - invalid API token |
+| 404 | Workflow not found |
+| 429 | Rate limit exceeded |
+| 500 | Internal server error |
+
+### /workspaces/current/models/model-types/{model_type}
+
+#### GET
+##### Summary
+
+Get available models by model type
+
+##### Description
+
+Get available models by model type
+Returns a list of available models for the specified model type.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| model_type | path | Type of model to retrieve | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Models retrieved successfully |
+| 401 | Unauthorized - invalid API token |
+
+---
+### Models
+
+#### Annotation
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| content | string |  | No |
+| created_at | integer |  | No |
+| hit_count | integer |  | No |
+| id | string |  | Yes |
+| question | string |  | No |
+
+#### AnnotationCreatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| answer | string | Annotation answer | Yes |
+| question | string | Annotation question | Yes |
+
+#### AnnotationList
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data | [ [Annotation](#annotation) ] |  | Yes |
+| has_more | boolean |  | Yes |
+| limit | integer |  | Yes |
+| page | integer |  | Yes |
+| total | integer |  | Yes |
+
+#### AnnotationReplyActionPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| embedding_model_name | string | Embedding model name | Yes |
+| embedding_provider_name | string | Embedding provider name | Yes |
+| score_threshold | number | Score threshold for annotation matching | Yes |
+
+#### ChatRequestPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| auto_generate_name | boolean | Auto generate conversation name | No |
+| conversation_id | string | Conversation UUID | No |
+| files | [ object ] |  | No |
+| inputs | object |  | Yes |
+| query | string |  | Yes |
+| response_mode | string | *Enum:* `"blocking"`, `"streaming"` | No |
+| retriever_from | string |  | No |
+| workflow_id | string | Workflow ID for advanced chat | No |
+
+#### ChildChunkCreatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| content | string |  | Yes |
+
+#### ChildChunkListQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| keyword | string |  | No |
+| limit | integer |  | No |
+| page | integer |  | No |
+
+#### ChildChunkUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| content | string |  | Yes |
+
+#### CompletionRequestPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| files | [ object ] |  | No |
+| inputs | object |  | Yes |
+| query | string |  | No |
+| response_mode | string | *Enum:* `"blocking"`, `"streaming"` | No |
+| retriever_from | string |  | No |
+
+#### Condition
+
+Condition detail
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| comparison_operator | string | *Enum:* `"<"`, `"="`, `">"`, `"after"`, `"before"`, `"contains"`, `"empty"`, `"end with"`, `"in"`, `"is"`, `"is not"`, `"not contains"`, `"not empty"`, `"not in"`, `"start with"`, `"≠"`, `"≤"`, `"≥"` | Yes |
+| name | string |  | Yes |
+| value |  |  | No |
+
+#### ConversationListQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| last_id | string | Last conversation ID for pagination | No |
+| limit | integer | Number of conversations to return | No |
+| sort_by | string | Sort order for conversations<br>*Enum:* `"-created_at"`, `"-updated_at"`, `"created_at"`, `"updated_at"` | No |
+
+#### ConversationRenamePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| auto_generate | boolean |  | No |
+| name | string |  | No |
+
+#### ConversationVariableInfiniteScrollPaginationResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data | [ [ConversationVariableResponse](#conversationvariableresponse) ] |  | Yes |
+| has_more | boolean |  | Yes |
+| limit | integer |  | Yes |
+
+#### ConversationVariableResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at | integer |  | No |
+| description | string |  | No |
+| id | string |  | Yes |
+| name | string |  | Yes |
+| updated_at | integer |  | No |
+| value | string |  | No |
+| value_type | string |  | Yes |
+
+#### ConversationVariableUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| value |  |  | Yes |
+
+#### ConversationVariablesQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| last_id | string | Last variable ID for pagination | No |
+| limit | integer | Number of variables to return | No |
+| variable_name | string | Filter variables by name | No |
+
+#### DataSetTag
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| binding_count | string |  | No |
+| id | string |  | Yes |
+| name | string |  | Yes |
+| type | string |  | Yes |
+
+#### DatasetCreatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| description | string | Dataset description (max 400 chars) | No |
+| embedding_model | string |  | No |
+| embedding_model_provider | string |  | No |
+| external_knowledge_api_id | string |  | No |
+| external_knowledge_id | string |  | No |
+| indexing_technique | string | *Enum:* `"economy"`, `"high_quality"` | No |
+| name | string |  | Yes |
+| permission | [DatasetPermissionEnum](#datasetpermissionenum) |  | No |
+| provider | string |  | No |
+| retrieval_model | [RetrievalModel](#retrievalmodel) |  | No |
+| summary_index_setting | object |  | No |
+
+#### DatasetListQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| include_all | boolean | Include all datasets | No |
+| keyword | string | Search keyword | No |
+| limit | integer | Number of items per page | No |
+| page | integer | Page number | No |
+| tag_ids | [ string ] | Filter by tag IDs | No |
+
+#### DatasetPermissionEnum
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| DatasetPermissionEnum | string |  |  |
+
+#### DatasetUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| description | string | Dataset description (max 400 chars) | No |
+| embedding_model | string |  | No |
+| embedding_model_provider | string |  | No |
+| external_knowledge_api_id | string |  | No |
+| external_knowledge_id | string |  | No |
+| external_retrieval_model | object |  | No |
+| indexing_technique | string | *Enum:* `"economy"`, `"high_quality"` | No |
+| name | string |  | No |
+| partial_member_list | [ object ] |  | No |
+| permission | [DatasetPermissionEnum](#datasetpermissionenum) |  | No |
+| retrieval_model | [RetrievalModel](#retrievalmodel) |  | No |
+
+#### DatasourceNodeRunPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| credential_id | string |  | No |
+| datasource_type | string |  | Yes |
+| inputs | object |  | Yes |
+| is_published | boolean |  | Yes |
+
+#### DocumentBatchDownloadZipPayload
+
+Request payload for bulk downloading documents as a zip archive.
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| document_ids | [ string (uuid) ] |  | Yes |
+
+#### DocumentListQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| keyword | string | Search keyword | No |
+| limit | integer | Number of items per page | No |
+| page | integer | Page number | No |
+| status | string | Document status filter | No |
+
+#### DocumentMetadataOperation
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| document_id | string |  | Yes |
+| metadata_list | [ [MetadataDetail](#metadatadetail) ] |  | Yes |
+| partial_update | boolean |  | No |
+
+#### DocumentTextCreatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| doc_form | string |  | No |
+| doc_language | string |  | No |
+| embedding_model | string |  | No |
+| embedding_model_provider | string |  | No |
+| indexing_technique | string |  | No |
+| name | string |  | Yes |
+| original_document_id | string |  | No |
+| process_rule | [ProcessRule](#processrule) |  | No |
+| retrieval_model | [RetrievalModel](#retrievalmodel) |  | No |
+| text | string |  | Yes |
+
+#### DocumentTextUpdate
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| doc_form | string |  | No |
+| doc_language | string |  | No |
+| name | string |  | No |
+| process_rule | [ProcessRule](#processrule) |  | No |
+| retrieval_model | [RetrievalModel](#retrievalmodel) |  | No |
+| text | string |  | No |
+
+#### FeedbackListQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| limit | integer | Number of feedbacks per page | No |
+| page | integer | Page number | No |
+
+#### FilePreviewQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| as_attachment | boolean | Download as attachment | No |
+
+#### FileResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| conversation_id | string |  | No |
+| created_at | integer |  | No |
+| created_by | string |  | No |
+| extension | string |  | No |
+| file_key | string |  | No |
+| id | string |  | Yes |
+| mime_type | string |  | No |
+| name | string |  | Yes |
+| original_url | string |  | No |
+| preview_url | string |  | No |
+| size | integer |  | Yes |
+| source_url | string |  | No |
+| tenant_id | string |  | No |
+| user_id | string |  | No |
+
+#### HitTestingPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| attachment_ids | [ string ] |  | No |
+| external_retrieval_model | object |  | No |
+| query | string |  | Yes |
+| retrieval_model | [RetrievalModel](#retrievalmodel) |  | No |
+
+#### HumanInputFormSubmitPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| action | string |  | Yes |
+| inputs | object |  | Yes |
+
+#### JsonValue
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| JsonValue |  |  |  |
+
+#### MessageFeedbackPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| content | string |  | No |
+| rating | string | *Enum:* `"dislike"`, `"like"` | No |
+
+#### MessageListQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| conversation_id | string | Conversation UUID | Yes |
+| first_id | string | First message ID for pagination | No |
+| limit | integer | Number of messages to return (1-100) | No |
+
+#### MetadataArgs
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| name | string |  | Yes |
+| type | string | *Enum:* `"number"`, `"string"`, `"time"` | Yes |
+
+#### MetadataDetail
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| id | string |  | Yes |
+| name | string |  | Yes |
+| value |  |  | No |
+
+#### MetadataFilteringCondition
+
+Metadata Filtering Condition.
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| conditions | [ [Condition](#condition) ] |  | No |
+| logical_operator | string | *Enum:* `"and"`, `"or"` | No |
+
+#### MetadataOperationData
+
+Metadata operation data
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| operation_data | [ [DocumentMetadataOperation](#documentmetadataoperation) ] |  | Yes |
+
+#### MetadataUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| name | string |  | Yes |
+
+#### PipelineRunApiEntity
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| datasource_info_list | [ object ] |  | Yes |
+| datasource_type | string |  | Yes |
+| inputs | object |  | Yes |
+| is_published | boolean |  | Yes |
+| response_mode | string |  | Yes |
+| start_node_id | string |  | Yes |
+
+#### PreProcessingRule
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| enabled | boolean |  | Yes |
+| id | string |  | Yes |
+
+#### ProcessRule
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| mode | string | *Enum:* `"automatic"`, `"custom"`, `"hierarchical"` | Yes |
+| rules | [Rule](#rule) |  | No |
+
+#### RerankingModel
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| reranking_model_name | string |  | No |
+| reranking_provider_name | string |  | No |
+
+#### RetrievalMethod
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| RetrievalMethod | string |  |  |
+
+#### RetrievalModel
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| metadata_filtering_conditions | [MetadataFilteringCondition](#metadatafilteringcondition) |  | No |
+| reranking_enable | boolean |  | Yes |
+| reranking_mode | string |  | No |
+| reranking_model | [RerankingModel](#rerankingmodel) |  | No |
+| score_threshold | number |  | No |
+| score_threshold_enabled | boolean |  | Yes |
+| search_method | [RetrievalMethod](#retrievalmethod) |  | Yes |
+| top_k | integer |  | Yes |
+| weights | [WeightModel](#weightmodel) |  | No |
+
+#### Rule
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| parent_mode | string | *Enum:* `"full-doc"`, `"paragraph"` | No |
+| pre_processing_rules | [ [PreProcessingRule](#preprocessingrule) ] |  | No |
+| segmentation | [Segmentation](#segmentation) |  | No |
+| subchunk_segmentation | [Segmentation](#segmentation) |  | No |
+
+#### SegmentCreatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| segments | [ object ] |  | No |
+
+#### SegmentListQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| keyword | string |  | No |
+| status | [ string ] |  | No |
+
+#### SegmentUpdateArgs
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| answer | string |  | No |
+| attachment_ids | [ string ] |  | No |
+| content | string |  | No |
+| enabled | boolean |  | No |
+| keywords | [ string ] |  | No |
+| regenerate_child_chunks | boolean |  | No |
+| summary | string |  | No |
+
+#### SegmentUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| segment | [SegmentUpdateArgs](#segmentupdateargs) |  | Yes |
+
+#### Segmentation
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| chunk_overlap | integer |  | No |
+| max_tokens | integer |  | Yes |
+| separator | string |  | No |
+
+#### SimpleAccount
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| email | string |  | Yes |
+| id | string |  | Yes |
+| name | string |  | Yes |
+
+#### SimpleEndUser
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| id | string |  | Yes |
+| is_anonymous | boolean |  | Yes |
+| session_id | string |  | No |
+| type | string |  | Yes |
+
+#### TagBindingPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| tag_ids | [ string ] |  | Yes |
+| target_id | string |  | Yes |
+
+#### TagCreatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| name | string |  | Yes |
+
+#### TagDeletePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| tag_id | string |  | Yes |
+
+#### TagUnbindingPayload
+
+Accept the legacy single-tag Service API payload while exposing a normalized tag_ids list internally.
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| tag_id | string |  | No |
+| tag_ids | [ string ] |  | No |
+| target_id | string |  | Yes |
+
+#### TagUpdatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| name | string |  | Yes |
+| tag_id | string |  | Yes |
+
+#### TextToAudioPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| message_id | string | Message ID | No |
+| streaming | boolean | Enable streaming response | No |
+| text | string | Text to convert to audio | No |
+| voice | string | Voice to use for TTS | No |
+
+#### WeightKeywordSetting
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| keyword_weight | number |  | Yes |
+
+#### WeightModel
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| keyword_setting | [WeightKeywordSetting](#weightkeywordsetting) |  | No |
+| vector_setting | [WeightVectorSetting](#weightvectorsetting) |  | No |
+| weight_type | string | *Enum:* `"customized"`, `"keyword_first"`, `"semantic_first"` | No |
+
+#### WeightVectorSetting
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| embedding_model_name | string |  | Yes |
+| embedding_provider_name | string |  | Yes |
+| vector_weight | number |  | Yes |
+
+#### WorkflowAppLogPaginationResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| data | [ [WorkflowAppLogPartialResponse](#workflowapplogpartialresponse) ] |  | Yes |
+| has_more | boolean |  | Yes |
+| limit | integer |  | Yes |
+| page | integer |  | Yes |
+| total | integer |  | Yes |
+
+#### WorkflowAppLogPartialResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at | integer |  | No |
+| created_by_account | [SimpleAccount](#simpleaccount) |  | No |
+| created_by_end_user | [SimpleEndUser](#simpleenduser) |  | No |
+| created_by_role | string |  | No |
+| created_from | string |  | No |
+| details |  |  | No |
+| id | string |  | Yes |
+| workflow_run | [WorkflowRunForLogResponse](#workflowrunforlogresponse) |  | No |
+
+#### WorkflowLogQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at__after | string |  | No |
+| created_at__before | string |  | No |
+| created_by_account | string |  | No |
+| created_by_end_user_session_id | string |  | No |
+| keyword | string |  | No |
+| limit | integer |  | No |
+| page | integer |  | No |
+| status | string | *Enum:* `"failed"`, `"stopped"`, `"succeeded"` | No |
+
+#### WorkflowRunForLogResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at | integer |  | No |
+| elapsed_time |  |  | No |
+| error | string |  | No |
+| exceptions_count | integer |  | No |
+| finished_at | integer |  | No |
+| id | string |  | Yes |
+| status | string |  | No |
+| total_steps | integer |  | No |
+| total_tokens | integer |  | No |
+| triggered_from | string |  | No |
+| version | string |  | No |
+
+#### WorkflowRunPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| files | [ object ] |  | No |
+| inputs | object |  | Yes |
+| response_mode | string | *Enum:* `"blocking"`, `"streaming"` | No |
+
+#### WorkflowRunResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at | integer |  | No |
+| elapsed_time |  |  | No |
+| error | string |  | No |
+| finished_at | integer |  | No |
+| id | string |  | Yes |
+| inputs |  |  | No |
+| outputs | object |  | No |
+| status | string |  | Yes |
+| total_steps | integer |  | No |
+| total_tokens | integer |  | No |
+| workflow_id | string |  | Yes |
diff --git a/api/openapi/markdown/web-swagger.md b/api/openapi/markdown/web-swagger.md
new file mode 100644
index 0000000000..f8745d3135
--- /dev/null
+++ b/api/openapi/markdown/web-swagger.md
@@ -0,0 +1,1224 @@
+# Web API
+Public APIs for web applications including file uploads, chat interactions, and app management
+
+## Version: 1.0
+
+### Security
+**Bearer**  
+
+| apiKey | *API Key* |
+| ------ | --------- |
+| Description | Type: Bearer {your-api-key} |
+| In | header |
+| Name | Authorization |
+
+---
+## web
+Web application API operations
+
+### /audio-to-text
+
+#### POST
+##### Summary
+
+Convert audio to text
+
+##### Description
+
+Convert audio file to text using speech-to-text service.
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+| 400 | Bad Request |
+| 401 | Unauthorized |
+| 403 | Forbidden |
+| 413 | Audio file too large |
+| 415 | Unsupported audio type |
+| 500 | Internal Server Error |
+
+### /chat-messages
+
+#### POST
+##### Description
+
+Create a chat message for conversational applications.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ChatMessagePayload](#chatmessagepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+| 400 | Bad Request |
+| 401 | Unauthorized |
+| 403 | Forbidden |
+| 404 | App Not Found |
+| 500 | Internal Server Error |
+
+### /chat-messages/{task_id}/stop
+
+#### POST
+##### Description
+
+Stop a running chat message task.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| task_id | path | Task ID to stop | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+| 400 | Bad Request |
+| 401 | Unauthorized |
+| 403 | Forbidden |
+| 404 | Task Not Found |
+| 500 | Internal Server Error |
+
+### /completion-messages
+
+#### POST
+##### Description
+
+Create a completion message for text generation applications.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [CompletionMessagePayload](#completionmessagepayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+| 400 | Bad Request |
+| 401 | Unauthorized |
+| 403 | Forbidden |
+| 404 | App Not Found |
+| 500 | Internal Server Error |
+
+### /completion-messages/{task_id}/stop
+
+#### POST
+##### Description
+
+Stop a running completion message task.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| task_id | path | Task ID to stop | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+| 400 | Bad Request |
+| 401 | Unauthorized |
+| 403 | Forbidden |
+| 404 | Task Not Found |
+| 500 | Internal Server Error |
+
+### /conversations
+
+#### GET
+##### Description
+
+Retrieve paginated list of conversations for a chat application.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| last_id | query | Last conversation ID for pagination | No | string |
+| limit | query | Number of conversations to return (1-100) | No | integer |
+| pinned | query | Filter by pinned status | No | string |
+| sort_by | query | Sort order | No | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+| 400 | Bad Request |
+| 401 | Unauthorized |
+| 403 | Forbidden |
+| 404 | App Not Found or Not a Chat App |
+| 500 | Internal Server Error |
+
+### /conversations/{c_id}
+
+#### DELETE
+##### Description
+
+Delete a specific conversation.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| c_id | path | Conversation UUID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 204 | Conversation deleted successfully |
+| 400 | Bad Request |
+| 401 | Unauthorized |
+| 403 | Forbidden |
+| 404 | Conversation Not Found or Not a Chat App |
+| 500 | Internal Server Error |
+
+### /conversations/{c_id}/name
+
+#### POST
+##### Description
+
+Rename a specific conversation with a custom name or auto-generate one.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| c_id | path | Conversation UUID | Yes | string |
+| auto_generate | query | Auto-generate conversation name | No | boolean |
+| name | query | New conversation name | No | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Conversation renamed successfully |
+| 400 | Bad Request |
+| 401 | Unauthorized |
+| 403 | Forbidden |
+| 404 | Conversation Not Found or Not a Chat App |
+| 500 | Internal Server Error |
+
+### /conversations/{c_id}/pin
+
+#### PATCH
+##### Description
+
+Pin a specific conversation to keep it at the top of the list.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| c_id | path | Conversation UUID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Conversation pinned successfully |
+| 400 | Bad Request |
+| 401 | Unauthorized |
+| 403 | Forbidden |
+| 404 | Conversation Not Found or Not a Chat App |
+| 500 | Internal Server Error |
+
+### /conversations/{c_id}/unpin
+
+#### PATCH
+##### Description
+
+Unpin a specific conversation to remove it from the top of the list.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| c_id | path | Conversation UUID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Conversation unpinned successfully |
+| 400 | Bad Request |
+| 401 | Unauthorized |
+| 403 | Forbidden |
+| 404 | Conversation Not Found or Not a Chat App |
+| 500 | Internal Server Error |
+
+### /email-code-login
+
+#### POST
+##### Description
+
+Send email verification code for login
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [EmailCodeLoginSendPayload](#emailcodeloginsendpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Email code sent successfully |
+| 400 | Bad request - invalid email format |
+| 404 | Account not found |
+
+### /email-code-login/validity
+
+#### POST
+##### Description
+
+Verify email code and complete login
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [EmailCodeLoginVerifyPayload](#emailcodeloginverifypayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Email code verified and login successful |
+| 400 | Bad request - invalid code or token |
+| 401 | Invalid token or expired code |
+| 404 | Account not found |
+
+### /files/upload
+
+#### POST
+##### Summary
+
+Upload a file for use in web applications
+
+##### Description
+
+Upload a file for use in web applications
+Accepts file uploads for use within web applications, supporting
+multiple file types with automatic validation and storage.
+
+Args:
+    app_model: The associated application model
+    end_user: The end user uploading the file
+
+Form Parameters:
+    file: The file to upload (required)
+    source: Optional source type (datasets or None)
+
+Returns:
+    dict: File information including ID, URL, and metadata
+    int: HTTP status code 201 for success
+
+Raises:
+    NoFileUploadedError: No file provided in request
+    TooManyFilesError: Multiple files provided (only one allowed)
+    FilenameNotExistsError: File has no filename
+    FileTooLargeError: File exceeds size limit
+    UnsupportedFileTypeError: File type not supported
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 201 | File uploaded successfully | [FileResponse](#fileresponse) |
+| 400 | Bad request - invalid file or parameters |  |
+| 413 | File too large |  |
+| 415 | Unsupported file type |  |
+
+### /forgot-password
+
+#### POST
+##### Description
+
+Send password reset email
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ForgotPasswordSendPayload](#forgotpasswordsendpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Password reset email sent successfully |
+| 400 | Bad request - invalid email format |
+| 404 | Account not found |
+| 429 | Too many requests - rate limit exceeded |
+
+### /forgot-password/resets
+
+#### POST
+##### Description
+
+Reset user password with verification token
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ForgotPasswordResetPayload](#forgotpasswordresetpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Password reset successfully |
+| 400 | Bad request - invalid parameters or password mismatch |
+| 401 | Invalid or expired token |
+| 404 | Account not found |
+
+### /forgot-password/validity
+
+#### POST
+##### Description
+
+Verify password reset token validity
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [ForgotPasswordCheckPayload](#forgotpasswordcheckpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Token is valid |
+| 400 | Bad request - invalid token format |
+| 401 | Invalid or expired token |
+
+### /form/human_input/{form_token}
+
+#### GET
+##### Summary
+
+Get human input form definition by token
+
+##### Description
+
+GET /api/form/human_input/<form_token>
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| form_token | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+#### POST
+##### Summary
+
+Submit human input form by token
+
+##### Description
+
+POST /api/form/human_input/<form_token>
+
+Request body:
+{
+    "inputs": {
+        "content": "User input content"
+    },
+    "action": "Approve"
+}
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| form_token | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+### /login
+
+#### POST
+##### Summary
+
+Authenticate user and login
+
+##### Description
+
+Authenticate user for web application access
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [LoginPayload](#loginpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Authentication successful |
+| 400 | Bad request - invalid email or password format |
+| 401 | Authentication failed - email or password mismatch |
+| 403 | Account banned or login disabled |
+| 404 | Account not found |
+
+### /login/status
+
+#### GET
+##### Description
+
+Check login status
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Login status |
+| 401 | Login status |
+
+### /logout
+
+#### POST
+##### Description
+
+Logout user from web application
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Logout successful |
+
+### /messages
+
+#### GET
+##### Description
+
+Retrieve paginated list of messages from a conversation in a chat application.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| conversation_id | query | Conversation UUID | Yes | string |
+| first_id | query | First message ID for pagination | No | string |
+| limit | query | Number of messages to return (1-100) | No | integer |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+| 400 | Bad Request |
+| 401 | Unauthorized |
+| 403 | Forbidden |
+| 404 | Conversation Not Found or Not a Chat App |
+| 500 | Internal Server Error |
+
+### /messages/{message_id}/feedbacks
+
+#### POST
+##### Description
+
+Submit feedback (like/dislike) for a specific message.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| message_id | path | Message UUID | Yes | string |
+| content | query | Feedback content | No | string |
+| rating | query | Feedback rating | No | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Feedback submitted successfully |
+| 400 | Bad Request |
+| 401 | Unauthorized |
+| 403 | Forbidden |
+| 404 | Message Not Found |
+| 500 | Internal Server Error |
+
+### /messages/{message_id}/more-like-this
+
+#### GET
+##### Description
+
+Generate a new completion similar to an existing message (completion apps only).
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| message_id | path |  | Yes | string |
+| payload | body |  | Yes | [MessageMoreLikeThisQuery](#messagemorelikethisquery) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+| 400 | Bad Request - Not a completion app or feature disabled |
+| 401 | Unauthorized |
+| 403 | Forbidden |
+| 404 | Message Not Found |
+| 500 | Internal Server Error |
+
+### /messages/{message_id}/suggested-questions
+
+#### GET
+##### Description
+
+Get suggested follow-up questions after a message (chat apps only).
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| message_id | path | Message UUID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+| 400 | Bad Request - Not a chat app or feature disabled |
+| 401 | Unauthorized |
+| 403 | Forbidden |
+| 404 | Message Not Found or Conversation Not Found |
+| 500 | Internal Server Error |
+
+### /meta
+
+#### GET
+##### Summary
+
+Get app meta
+
+##### Description
+
+Retrieve the metadata for a specific app.
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+| 400 | Bad Request |
+| 401 | Unauthorized |
+| 403 | Forbidden |
+| 404 | App Not Found |
+| 500 | Internal Server Error |
+
+### /parameters
+
+#### GET
+##### Summary
+
+Retrieve app parameters
+
+##### Description
+
+Retrieve the parameters for a specific app.
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+| 400 | Bad Request |
+| 401 | Unauthorized |
+| 403 | Forbidden |
+| 404 | App Not Found |
+| 500 | Internal Server Error |
+
+### /passport
+
+#### GET
+##### Description
+
+Get authentication passport for web application access
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Passport retrieved successfully |
+| 401 | Unauthorized - missing app code or invalid authentication |
+| 404 | Application or user not found |
+
+### /remote-files/upload
+
+#### POST
+##### Summary
+
+Upload a file from a remote URL
+
+##### Description
+
+Upload a file from a remote URL
+Downloads a file from the provided remote URL and uploads it
+to the platform storage for use in web applications.
+
+Args:
+    app_model: The associated application model
+    end_user: The end user making the request
+
+JSON Parameters:
+    url: The remote URL to download the file from (required)
+
+Returns:
+    dict: File information including ID, signed URL, and metadata
+    int: HTTP status code 201 for success
+
+Raises:
+    RemoteFileUploadError: Failed to fetch file from remote URL
+    FileTooLargeError: File exceeds size limit
+    UnsupportedFileTypeError: File type not supported
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 201 | Remote file uploaded successfully | [FileWithSignedUrl](#filewithsignedurl) |
+| 400 | Bad request - invalid URL or parameters |  |
+| 413 | File too large |  |
+| 415 | Unsupported file type |  |
+| 500 | Failed to fetch remote file |  |
+
+### /remote-files/{url}
+
+#### GET
+##### Summary
+
+Get information about a remote file
+
+##### Description
+
+Get information about a remote file
+Retrieves basic information about a file located at a remote URL,
+including content type and content length.
+
+Args:
+    app_model: The associated application model
+    end_user: The end user making the request
+    url: URL-encoded path to the remote file
+
+Returns:
+    dict: Remote file information including type and length
+
+Raises:
+    HTTPException: If the remote file cannot be accessed
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| url | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description | Schema |
+| ---- | ----------- | ------ |
+| 200 | Remote file information retrieved successfully | [RemoteFileInfo](#remotefileinfo) |
+| 400 | Bad request - invalid URL |  |
+| 404 | Remote file not found |  |
+| 500 | Failed to fetch remote file |  |
+
+### /saved-messages
+
+#### GET
+##### Description
+
+Retrieve paginated list of saved messages for a completion application.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| last_id | query | Last message ID for pagination | No | string |
+| limit | query | Number of messages to return (1-100) | No | integer |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+| 400 | Bad Request - Not a completion app |
+| 401 | Unauthorized |
+| 403 | Forbidden |
+| 404 | App Not Found |
+| 500 | Internal Server Error |
+
+#### POST
+##### Description
+
+Save a specific message for later reference.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| message_id | query | Message UUID to save | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Message saved successfully |
+| 400 | Bad Request - Not a completion app |
+| 401 | Unauthorized |
+| 403 | Forbidden |
+| 404 | Message Not Found |
+| 500 | Internal Server Error |
+
+### /saved-messages/{message_id}
+
+#### DELETE
+##### Description
+
+Remove a message from saved messages.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| message_id | path | Message UUID to delete | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 204 | Message removed successfully |
+| 400 | Bad Request - Not a completion app |
+| 401 | Unauthorized |
+| 403 | Forbidden |
+| 404 | Message Not Found |
+| 500 | Internal Server Error |
+
+### /site
+
+#### GET
+##### Summary
+
+Retrieve app site info
+
+##### Description
+
+Retrieve app site information and configuration.
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+| 400 | Bad Request |
+| 401 | Unauthorized |
+| 403 | Forbidden |
+| 404 | App Not Found |
+| 500 | Internal Server Error |
+
+### /system-features
+
+#### GET
+##### Summary
+
+Get system feature flags and configuration
+
+##### Description
+
+Get system feature flags and configuration
+Returns the current system feature flags and configuration
+that control various functionalities across the platform.
+
+Returns:
+    dict: System feature configuration object
+
+This endpoint is akin to the `SystemFeatureApi` endpoint in api/controllers/console/feature.py,
+except it is intended for use by the web app, instead of the console dashboard.
+
+NOTE: This endpoint is unauthenticated by design, as it provides system features
+data required for webapp initialization.
+
+Authentication would create circular dependency (can't authenticate without webapp loading).
+
+Only non-sensitive configuration data should be returned by this endpoint.
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | System features retrieved successfully |
+| 500 | Internal server error |
+
+### /text-to-audio
+
+#### POST
+##### Summary
+
+Convert text to audio
+
+##### Description
+
+Convert text to audio using text-to-speech service.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [TextToAudioPayload](#texttoaudiopayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+| 400 | Bad Request |
+| 401 | Unauthorized |
+| 403 | Forbidden |
+| 500 | Internal Server Error |
+
+### /webapp/access-mode
+
+#### GET
+##### Description
+
+Retrieve the access mode for a web application (public or restricted).
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| appCode | query | Application code | No | string |
+| appId | query | Application ID | No | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+| 400 | Bad Request |
+| 500 | Internal Server Error |
+
+### /webapp/permission
+
+#### GET
+##### Description
+
+Check if user has permission to access a web application.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| appId | query | Application ID | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+| 400 | Bad Request |
+| 401 | Unauthorized |
+| 500 | Internal Server Error |
+
+### /workflows/run
+
+#### POST
+##### Summary
+
+Run workflow
+
+##### Description
+
+Execute a workflow with provided inputs and files.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| payload | body |  | Yes | [WorkflowRunPayload](#workflowrunpayload) |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+| 400 | Bad Request |
+| 401 | Unauthorized |
+| 403 | Forbidden |
+| 404 | App Not Found |
+| 500 | Internal Server Error |
+
+### /workflows/tasks/{task_id}/stop
+
+#### POST
+##### Summary
+
+Stop workflow task
+
+##### Description
+
+Stop a running workflow task.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| task_id | path | Task ID to stop | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+| 400 | Bad Request |
+| 401 | Unauthorized |
+| 403 | Forbidden |
+| 404 | Task Not Found |
+| 500 | Internal Server Error |
+
+---
+## default
+Default namespace
+
+### /workflow/{task_id}/events
+
+#### GET
+##### Summary
+
+Get workflow execution events stream after resume
+
+##### Description
+
+GET /api/workflow/<task_id>/events
+
+Returns Server-Sent Events stream.
+
+##### Parameters
+
+| Name | Located in | Description | Required | Schema |
+| ---- | ---------- | ----------- | -------- | ------ |
+| task_id | path |  | Yes | string |
+
+##### Responses
+
+| Code | Description |
+| ---- | ----------- |
+| 200 | Success |
+
+---
+### Models
+
+#### AppAccessModeQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| appCode | string | Application code | No |
+| appId | string | Application ID | No |
+
+#### ChatMessagePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| conversation_id | string | Conversation ID | No |
+| files | [ object ] | Files to be processed | No |
+| inputs | object | Input variables for the chat | Yes |
+| parent_message_id | string | Parent message ID | No |
+| query | string | User query/message | Yes |
+| response_mode | string | Response mode: blocking or streaming<br>*Enum:* `"blocking"`, `"streaming"` | No |
+| retriever_from | string | Source of retriever | No |
+
+#### CompletionMessagePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| files | [ object ] | Files to be processed | No |
+| inputs | object | Input variables for the completion | Yes |
+| query | string | Query text for completion | No |
+| response_mode | string | Response mode: blocking or streaming<br>*Enum:* `"blocking"`, `"streaming"` | No |
+| retriever_from | string | Source of retriever | No |
+
+#### ConversationListQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| last_id | string |  | No |
+| limit | integer |  | No |
+| pinned | boolean |  | No |
+| sort_by | string | *Enum:* `"-created_at"`, `"-updated_at"`, `"created_at"`, `"updated_at"` | No |
+
+#### ConversationRenamePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| auto_generate | boolean |  | No |
+| name | string |  | No |
+
+#### EmailCodeLoginSendPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| email | string |  | Yes |
+| language | string |  | No |
+
+#### EmailCodeLoginVerifyPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| code | string |  | Yes |
+| email | string |  | Yes |
+| token | string |  | Yes |
+
+#### FileResponse
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| conversation_id | string |  | No |
+| created_at | integer |  | No |
+| created_by | string |  | No |
+| extension | string |  | No |
+| file_key | string |  | No |
+| id | string |  | Yes |
+| mime_type | string |  | No |
+| name | string |  | Yes |
+| original_url | string |  | No |
+| preview_url | string |  | No |
+| size | integer |  | Yes |
+| source_url | string |  | No |
+| tenant_id | string |  | No |
+| user_id | string |  | No |
+
+#### FileWithSignedUrl
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| created_at | integer |  | No |
+| created_by | string |  | No |
+| extension | string |  | No |
+| id | string |  | Yes |
+| mime_type | string |  | No |
+| name | string |  | Yes |
+| size | integer |  | Yes |
+| url | string |  | No |
+
+#### ForgotPasswordCheckPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| code | string |  | Yes |
+| email | string |  | Yes |
+| token | string |  | Yes |
+
+#### ForgotPasswordResetPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| new_password | string |  | Yes |
+| password_confirm | string |  | Yes |
+| token | string |  | Yes |
+
+#### ForgotPasswordSendPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| email | string |  | Yes |
+| language | string |  | No |
+
+#### LoginPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| email | string |  | Yes |
+| password | string |  | Yes |
+
+#### MessageFeedbackPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| content | string |  | No |
+| rating | string | *Enum:* `"dislike"`, `"like"` | No |
+
+#### MessageListQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| conversation_id | string | Conversation UUID | Yes |
+| first_id | string | First message ID for pagination | No |
+| limit | integer | Number of messages to return (1-100) | No |
+
+#### MessageMoreLikeThisQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| response_mode | string | Response mode<br>*Enum:* `"blocking"`, `"streaming"` | Yes |
+
+#### RemoteFileInfo
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| file_length | integer |  | Yes |
+| file_type | string |  | Yes |
+
+#### RemoteFileUploadPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| url | string (uri) | Remote file URL | Yes |
+
+#### SavedMessageCreatePayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| message_id | string |  | Yes |
+
+#### SavedMessageListQuery
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| last_id | string |  | No |
+| limit | integer |  | No |
+
+#### TextToAudioPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| message_id | string | Message ID | No |
+| streaming | boolean | Enable streaming response | No |
+| text | string | Text to convert to audio | No |
+| voice | string | Voice to use for TTS | No |
+
+#### WorkflowRunPayload
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| files | [ object ] |  | No |
+| inputs | object |  | Yes |
diff --git a/api/providers/trace/trace-aliyun/tests/unit_tests/aliyun_trace/test_aliyun_trace_utils.py b/api/providers/trace/trace-aliyun/tests/unit_tests/aliyun_trace/test_aliyun_trace_utils.py
index 1b97746dea..0900dfda97 100644
--- a/api/providers/trace/trace-aliyun/tests/unit_tests/aliyun_trace/test_aliyun_trace_utils.py
+++ b/api/providers/trace/trace-aliyun/tests/unit_tests/aliyun_trace/test_aliyun_trace_utils.py
@@ -3,6 +3,7 @@ from collections.abc import Mapping
 from typing import Any, cast
 from unittest.mock import MagicMock
 
+import pytest
 from dify_trace_aliyun.entities.semconv import (
     GEN_AI_FRAMEWORK,
     GEN_AI_SESSION_ID,
@@ -31,7 +32,7 @@ from graphon.enums import WorkflowNodeExecutionStatus
 from models import EndUser
 
 
-def test_get_user_id_from_message_data_no_end_user(monkeypatch):
+def test_get_user_id_from_message_data_no_end_user(monkeypatch: pytest.MonkeyPatch):
     message_data = MagicMock()
     message_data.from_account_id = "account_id"
     message_data.from_end_user_id = None
@@ -39,7 +40,7 @@ def test_get_user_id_from_message_data_no_end_user(monkeypatch):
     assert get_user_id_from_message_data(message_data) == "account_id"
 
 
-def test_get_user_id_from_message_data_with_end_user(monkeypatch):
+def test_get_user_id_from_message_data_with_end_user(monkeypatch: pytest.MonkeyPatch):
     message_data = MagicMock()
     message_data.from_account_id = "account_id"
     message_data.from_end_user_id = "end_user_id"
@@ -57,7 +58,7 @@ def test_get_user_id_from_message_data_with_end_user(monkeypatch):
     assert get_user_id_from_message_data(message_data) == "session_id"
 
 
-def test_get_user_id_from_message_data_end_user_not_found(monkeypatch):
+def test_get_user_id_from_message_data_end_user_not_found(monkeypatch: pytest.MonkeyPatch):
     message_data = MagicMock()
     message_data.from_account_id = "account_id"
     message_data.from_end_user_id = "end_user_id"
@@ -111,7 +112,7 @@ def test_get_workflow_node_status():
     assert status.status_code == StatusCode.UNSET
 
 
-def test_create_links_from_trace_id(monkeypatch):
+def test_create_links_from_trace_id(monkeypatch: pytest.MonkeyPatch):
     # Mock create_link
     mock_link = MagicMock(spec=Link)
     import dify_trace_aliyun.data_exporter.traceclient
diff --git a/api/providers/trace/trace-arize-phoenix/src/dify_trace_arize_phoenix/arize_phoenix_trace.py b/api/providers/trace/trace-arize-phoenix/src/dify_trace_arize_phoenix/arize_phoenix_trace.py
index 96df49ed0e..9b35612b52 100644
--- a/api/providers/trace/trace-arize-phoenix/src/dify_trace_arize_phoenix/arize_phoenix_trace.py
+++ b/api/providers/trace/trace-arize-phoenix/src/dify_trace_arize_phoenix/arize_phoenix_trace.py
@@ -1,9 +1,11 @@
 import json
 import logging
 import os
+import re
 import traceback
+from collections.abc import Mapping, Sequence
 from datetime import datetime, timedelta
-from typing import Any, Union, cast
+from typing import Any, Protocol, Union, cast
 from urllib.parse import urlparse
 
 from openinference.semconv.trace import (
@@ -13,13 +15,14 @@ from openinference.semconv.trace import (
     SpanAttributes,
     ToolCallAttributes,
 )
+from opentelemetry.context import Context
 from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter as GrpcOTLPSpanExporter
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter as HttpOTLPSpanExporter
 from opentelemetry.sdk import trace as trace_sdk
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.sdk.trace.export import SimpleSpanProcessor
 from opentelemetry.semconv.attributes import exception_attributes
-from opentelemetry.trace import Span, Status, StatusCode, set_span_in_context, use_span
+from opentelemetry.trace import Span, Status, StatusCode, get_current_span, set_span_in_context, use_span
 from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator
 from opentelemetry.util.types import AttributeValue
 from sqlalchemy.orm import sessionmaker
@@ -36,16 +39,148 @@ from core.ops.entities.trace_entity import (
     TraceTaskName,
     WorkflowTraceInfo,
 )
+from core.ops.exceptions import PendingTraceParentContextError
 from core.ops.utils import JSON_DICT_ADAPTER
 from core.repositories import DifyCoreRepositoryFactory
 from dify_trace_arize_phoenix.config import ArizeConfig, PhoenixConfig
 from extensions.ext_database import db
+from extensions.ext_redis import redis_client
 from graphon.enums import WorkflowNodeExecutionStatus
-from models.model import EndUser, MessageFile
-from models.workflow import WorkflowNodeExecutionTriggeredFrom
+from models.model import App, EndUser, MessageFile
+from models.workflow import WorkflowNodeExecutionTriggeredFrom, WorkflowRun
 
 logger = logging.getLogger(__name__)
 
+# This parent-span carrier store is intentionally Phoenix-local for the current
+# nested workflow tracing feature. If other trace providers need the same
+# cross-task parent restoration behavior, move the storage and retry signaling
+# behind a core trace coordination interface instead of duplicating it here.
+_PHOENIX_PARENT_SPAN_CONTEXT_TTL_SECONDS = 300
+_TRACEPARENT_PATTERN = re.compile(
+    r"^(?P<version>[0-9a-f]{2})-(?P<trace_id>[0-9a-f]{32})-(?P<span_id>[0-9a-f]{16})-(?P<flags>[0-9a-f]{2})$"
+)
+
+
+def _phoenix_parent_span_redis_key(parent_node_execution_id: str) -> str:
+    """Build the Redis key that stores a restorable Phoenix parent span carrier."""
+    return f"trace:phoenix:parent_span:{parent_node_execution_id}"
+
+
+def _publish_parent_span_context(parent_node_execution_id: str, carrier: Mapping[str, str]) -> None:
+    """Persist a tracecontext carrier so nested workflow spans can restore the tool span parent."""
+    redis_client.setex(
+        _phoenix_parent_span_redis_key(parent_node_execution_id),
+        _PHOENIX_PARENT_SPAN_CONTEXT_TTL_SECONDS,
+        safe_json_dumps(dict(carrier)),
+    )
+
+
+def _resolve_published_parent_span_context(parent_node_execution_id: str) -> dict[str, str]:
+    """Load a previously published tool-span carrier for nested workflow parenting."""
+    raw_carrier = redis_client.get(_phoenix_parent_span_redis_key(parent_node_execution_id))
+    if raw_carrier is None:
+        raise PendingTraceParentContextError(parent_node_execution_id)
+
+    if isinstance(raw_carrier, bytes):
+        raw_carrier = raw_carrier.decode("utf-8")
+
+    carrier = json.loads(raw_carrier)
+    if not isinstance(carrier, dict):
+        raise ValueError(
+            "Phoenix parent span context must be stored as a JSON object: "
+            f"parent_node_execution_id={parent_node_execution_id}"
+        )
+
+    normalized_carrier = {str(key): str(value) for key, value in carrier.items()}
+    if not normalized_carrier:
+        raise ValueError(
+            f"Phoenix parent span context payload is empty: parent_node_execution_id={parent_node_execution_id}"
+        )
+
+    traceparent = normalized_carrier.get("traceparent")
+    if not isinstance(traceparent, str):
+        raise ValueError(
+            "Phoenix parent span context payload is missing traceparent: "
+            f"parent_node_execution_id={parent_node_execution_id}"
+        )
+
+    traceparent_match = _TRACEPARENT_PATTERN.fullmatch(traceparent)
+    if traceparent_match is None:
+        raise ValueError(
+            "Phoenix parent span context payload has invalid traceparent format: "
+            f"parent_node_execution_id={parent_node_execution_id}"
+        )
+
+    if traceparent_match.group("version") == "ff":
+        raise ValueError(
+            "Phoenix parent span context payload has unsupported traceparent version: "
+            f"parent_node_execution_id={parent_node_execution_id}"
+        )
+
+    if traceparent_match.group("trace_id") == "0" * 32:
+        raise ValueError(
+            "Phoenix parent span context payload has zero trace_id in traceparent: "
+            f"parent_node_execution_id={parent_node_execution_id}"
+        )
+
+    if traceparent_match.group("span_id") == "0" * 16:
+        raise ValueError(
+            "Phoenix parent span context payload has zero span_id in traceparent: "
+            f"parent_node_execution_id={parent_node_execution_id}"
+        )
+
+    extracted_context = TraceContextTextMapPropagator().extract(carrier=normalized_carrier)
+    extracted_span_context = get_current_span(extracted_context).get_span_context()
+    if not extracted_span_context.is_valid or not extracted_span_context.is_remote:
+        raise ValueError(
+            "Phoenix parent span context payload could not be restored into a valid parent span: "
+            f"parent_node_execution_id={parent_node_execution_id}"
+        )
+
+    return normalized_carrier
+
+
+def _app_uses_phoenix_provider(app_tracing_config: Mapping[str, Any] | None) -> bool:
+    if not app_tracing_config or not app_tracing_config.get("enabled"):
+        return False
+    return app_tracing_config.get("tracing_provider") in {"arize", "phoenix"}
+
+
+def _parent_workflow_can_publish_span_context(parent_workflow_run_id: str) -> bool:
+    parent_run = db.session.query(WorkflowRun).where(WorkflowRun.id == parent_workflow_run_id).first()
+    if parent_run is None:
+        return True
+
+    parent_app = db.session.query(App).where(App.id == parent_run.app_id).first()
+    if parent_app is None or not parent_app.tracing:
+        return False
+
+    try:
+        app_tracing_config = json.loads(parent_app.tracing)
+    except (TypeError, json.JSONDecodeError):
+        return False
+    if not isinstance(app_tracing_config, Mapping):
+        return False
+
+    return _app_uses_phoenix_provider(app_tracing_config)
+
+
+def _resolve_workflow_parent_carrier(
+    parent_node_execution_id: str, parent_workflow_run_id: str | None
+) -> dict[str, str] | None:
+    try:
+        return _resolve_published_parent_span_context(parent_node_execution_id)
+    except PendingTraceParentContextError:
+        if parent_workflow_run_id and not _parent_workflow_can_publish_span_context(parent_workflow_run_id):
+            logger.info(
+                "[Arize/Phoenix] Parent workflow cannot publish Phoenix span context; falling back to root span: "
+                "parent_workflow_run_id=%s parent_node_execution_id=%s",
+                parent_workflow_run_id,
+                parent_node_execution_id,
+            )
+            return None
+        raise
+
 
 def setup_tracer(arize_phoenix_config: ArizeConfig | PhoenixConfig) -> tuple[trace_sdk.Tracer, SimpleSpanProcessor]:
     """Configure OpenTelemetry tracer with OTLP exporter for Arize/Phoenix."""
@@ -177,6 +312,246 @@ def _get_node_span_kind(node_type: str) -> OpenInferenceSpanKindValues:
     return _NODE_TYPE_TO_SPAN_KIND.get(node_type, OpenInferenceSpanKindValues.CHAIN)
 
 
+def _resolve_workflow_session_id(trace_info: WorkflowTraceInfo) -> str:
+    """Resolve the workflow session ID for Phoenix workflow spans."""
+    if trace_info.conversation_id:
+        return trace_info.conversation_id
+
+    parent_workflow_run_id, _ = _resolve_workflow_parent_context(trace_info)
+    if parent_workflow_run_id:
+        return parent_workflow_run_id
+
+    return trace_info.workflow_run_id
+
+
+def _resolve_workflow_parent_context(trace_info: BaseTraceInfo) -> tuple[str | None, str | None]:
+    """Expose the typed parent context already resolved on the trace info."""
+    return trace_info.resolved_parent_context
+
+
+def _resolve_workflow_root_trace_id(trace_info: WorkflowTraceInfo) -> str:
+    """Resolve the canonical root trace ID for Phoenix workflow spans."""
+    trace_correlation_override, _ = _resolve_workflow_parent_context(trace_info)
+    return trace_correlation_override or trace_info.resolved_trace_id or trace_info.workflow_run_id
+
+
+class _NodeExecutionIdentityLike(Protocol):
+    @property
+    def node_execution_id(self) -> str | None: ...
+
+    @property
+    def node_id(self) -> str: ...
+
+    @property
+    def predecessor_node_id(self) -> str | None: ...
+
+
+class _NodeExecutionLike(_NodeExecutionIdentityLike, Protocol):
+    @property
+    def id(self) -> str: ...
+
+    @property
+    def node_type(self) -> str: ...
+
+    @property
+    def title(self) -> str | None: ...
+
+    @property
+    def inputs(self) -> Mapping[str, Any] | None: ...
+
+    @property
+    def process_data(self) -> Mapping[str, Any] | None: ...
+
+    @property
+    def outputs(self) -> Mapping[str, Any] | None: ...
+
+    @property
+    def status(self) -> WorkflowNodeExecutionStatus: ...
+
+    @property
+    def error(self) -> str | None: ...
+
+    @property
+    def elapsed_time(self) -> float | None: ...
+
+    @property
+    def metadata(self) -> Mapping[Any, Any] | None: ...
+
+    @property
+    def created_at(self) -> datetime | None: ...
+
+
+_PHOENIX_STRUCTURED_NODE_TYPES = frozenset({"start", "end", "loop", "iteration"})
+
+
+def _resolve_workflow_span_name(trace_info: WorkflowTraceInfo) -> str:
+    """Resolve the Phoenix workflow span display name."""
+    workflow_run_id = trace_info.workflow_run_id.strip() if trace_info.workflow_run_id else ""
+    if workflow_run_id:
+        return f"{TraceTaskName.WORKFLOW_TRACE.value}_{workflow_run_id}"
+    return TraceTaskName.WORKFLOW_TRACE.value
+
+
+def _build_node_title_by_id(trace_info: WorkflowTraceInfo) -> dict[str, str]:
+    """Build an authoritative node-title index from the persisted workflow graph."""
+    workflow_data = trace_info.workflow_data
+    workflow_graph = getattr(workflow_data, "graph_dict", None)
+    if not isinstance(workflow_graph, Mapping):
+        workflow_graph = workflow_data.get("graph") if isinstance(workflow_data, Mapping) else None
+    if not isinstance(workflow_graph, Mapping):
+        return {}
+
+    graph_nodes = workflow_graph.get("nodes")
+    if not isinstance(graph_nodes, Sequence):
+        return {}
+
+    node_title_by_id: dict[str, str] = {}
+    for graph_node in graph_nodes:
+        if not isinstance(graph_node, Mapping):
+            continue
+        node_id = graph_node.get("id")
+        node_data = graph_node.get("data")
+        if not isinstance(node_id, str) or not isinstance(node_data, Mapping):
+            continue
+        node_title = node_data.get("title")
+        if isinstance(node_title, str) and node_title.strip():
+            node_title_by_id[node_id] = node_title.strip()
+
+    return node_title_by_id
+
+
+def _resolve_workflow_node_span_name(
+    node_execution: _NodeExecutionLike,
+    node_title_by_id: Mapping[str, str] | None = None,
+) -> str:
+    """Resolve the Phoenix workflow node span display name."""
+    node_type = str(node_execution.node_type or "")
+    graph_node_title = None
+    if node_title_by_id is not None and isinstance(node_execution.node_id, str):
+        graph_node_title = node_title_by_id.get(node_execution.node_id)
+
+    node_title = graph_node_title or (node_execution.title.strip() if isinstance(node_execution.title, str) else "")
+    if node_title:
+        return f"{node_type}_{node_title}"
+    return node_type
+
+
+def _get_node_execution_id(node_execution: _NodeExecutionIdentityLike) -> str:
+    """Return the stable execution identifier for a workflow node execution."""
+    return str(getattr(node_execution, "id", None) or node_execution.node_execution_id)
+
+
+def _build_execution_id_by_node_id(node_executions: Sequence[_NodeExecutionIdentityLike]) -> dict[str, str]:
+    """Index unique workflow graph node ids by execution id.
+
+    This Phoenix-local hierarchy reconstruction intentionally drops ambiguous
+    node ids instead of guessing based on repository order. That keeps parent
+    selection deterministic until upstream tracing exposes explicit parent span
+    data for repeated executions.
+    """
+    execution_id_by_node_id: dict[str, str] = {}
+    ambiguous_node_ids: set[str] = set()
+
+    for node_execution in node_executions:
+        node_id = node_execution.node_id
+        if not isinstance(node_id, str):
+            continue
+        execution_id = _get_node_execution_id(node_execution)
+
+        if node_id in ambiguous_node_ids:
+            continue
+
+        existing_execution_id = execution_id_by_node_id.get(node_id)
+        if existing_execution_id is None:
+            execution_id_by_node_id[node_id] = execution_id
+            continue
+
+        if existing_execution_id != execution_id:
+            ambiguous_node_ids.add(node_id)
+            execution_id_by_node_id.pop(node_id, None)
+
+    return execution_id_by_node_id
+
+
+def _build_graph_parent_index(node_executions: Sequence[_NodeExecutionIdentityLike]) -> dict[str, str]:
+    """Build an execution-id parent index from predecessor node ids."""
+    execution_id_by_node_id = _build_execution_id_by_node_id(node_executions)
+    graph_parent_index: dict[str, str] = {}
+
+    for node_execution in node_executions:
+        predecessor_node_id = node_execution.predecessor_node_id
+        if not isinstance(predecessor_node_id, str):
+            continue
+
+        predecessor_execution_id = execution_id_by_node_id.get(predecessor_node_id)
+        if predecessor_execution_id is not None:
+            execution_id = _get_node_execution_id(node_execution)
+            graph_parent_index[execution_id] = predecessor_execution_id
+
+    return graph_parent_index
+
+
+def _resolve_structured_parent_execution_id(
+    node_execution: object, execution_id_by_node_id: Mapping[str, str]
+) -> str | None:
+    """Resolve Phoenix-local structured parents from loop/iteration node ids.
+
+    Any execution carrying ``iteration_id`` or ``loop_id`` belongs to an
+    enclosing structured node. When predecessor node ids are ambiguous because
+    the graph node repeats inside that structure, Phoenix can still keep the
+    child span under the enclosing loop/iteration span without relying on
+    execution-order heuristics.
+    """
+    execution_metadata = getattr(node_execution, "execution_metadata_dict", None)
+    if not isinstance(execution_metadata, Mapping):
+        execution_metadata = getattr(node_execution, "metadata", None)
+    if not isinstance(execution_metadata, Mapping):
+        execution_metadata = {}
+
+    for enclosing_node_id in (
+        getattr(node_execution, "iteration_id", None),
+        getattr(node_execution, "loop_id", None),
+        execution_metadata.get("iteration_id"),
+        execution_metadata.get("loop_id"),
+    ):
+        if not isinstance(enclosing_node_id, str):
+            continue
+
+        enclosing_execution_id = execution_id_by_node_id.get(enclosing_node_id)
+        if enclosing_execution_id is not None:
+            return enclosing_execution_id
+
+    return None
+
+
+def _resolve_node_parent(
+    execution_id: str,
+    predecessor_execution_id: str | None,
+    structured_parent_execution_id: str | None,
+    span_by_execution_id: Mapping[str, Span],
+    graph_parent_index: Mapping[str, str],
+    workflow_span: Span,
+) -> Span:
+    """Resolve the parent span for a workflow node execution."""
+    if predecessor_execution_id is not None:
+        predecessor_span = span_by_execution_id.get(predecessor_execution_id)
+        if predecessor_span is not None:
+            return predecessor_span
+
+    graph_parent_execution_id = graph_parent_index.get(execution_id)
+    if graph_parent_execution_id is not None:
+        graph_parent_span = span_by_execution_id.get(graph_parent_execution_id)
+        if graph_parent_span is not None:
+            return graph_parent_span
+
+    if structured_parent_execution_id is not None:
+        structured_parent_span = span_by_execution_id.get(structured_parent_execution_id)
+        if structured_parent_span is not None:
+            return structured_parent_span
+
+    return workflow_span
+
+
 class ArizePhoenixDataTrace(BaseTraceInstance):
     def __init__(
         self,
@@ -189,6 +564,8 @@ class ArizePhoenixDataTrace(BaseTraceInstance):
         self.file_base_url = os.getenv("FILES_URL", "http://127.0.0.1:5001")
         self.propagator = TraceContextTextMapPropagator()
         self.dify_trace_ids: set[str] = set()
+        self.root_span_carriers: dict[str, dict[str, str]] = {}
+        self.carrier: dict[str, str] = {}
 
     def trace(self, trace_info: BaseTraceInfo):
         logger.info("[Arize/Phoenix] Trace Entity Info: %s", trace_info)
@@ -235,13 +612,43 @@ class ArizePhoenixDataTrace(BaseTraceInstance):
             file_list=safe_json_dumps(file_list),
             query=trace_info.query or "",
         )
+        workflow_session_id = _resolve_workflow_session_id(trace_info)
+        parent_workflow_run_id, parent_node_execution_id = _resolve_workflow_parent_context(trace_info)
+        logger.info(
+            "[Arize/Phoenix] Workflow session resolution: workflow_run_id=%s conversation_id=%s "
+            "parent_workflow_run_id=%s parent_node_execution_id=%s resolved_session_id=%s",
+            trace_info.workflow_run_id,
+            trace_info.conversation_id,
+            parent_workflow_run_id,
+            parent_node_execution_id,
+            workflow_session_id,
+        )
 
-        dify_trace_id = trace_info.trace_id or trace_info.message_id or trace_info.workflow_run_id
-        self.ensure_root_span(dify_trace_id)
-        root_span_context = self.propagator.extract(carrier=self.carrier)
+        workflow_parent_carrier: dict[str, str] | None = None
+        if parent_node_execution_id:
+            workflow_parent_carrier = _resolve_workflow_parent_carrier(parent_node_execution_id, parent_workflow_run_id)
+
+        if workflow_parent_carrier is None:
+            root_trace_id = _resolve_workflow_root_trace_id(trace_info)
+            workflow_root_span_name: str | None = trace_info.workflow_run_id
+            if not isinstance(workflow_root_span_name, str) or not workflow_root_span_name.strip():
+                workflow_root_span_name = None
+
+            workflow_parent_carrier = self.ensure_root_span(
+                root_trace_id,
+                root_span_name=workflow_root_span_name,
+                root_span_attributes={
+                    SpanAttributes.INPUT_VALUE: safe_json_dumps(trace_info.workflow_run_inputs),
+                    SpanAttributes.INPUT_MIME_TYPE: OpenInferenceMimeTypeValues.JSON.value,
+                    SpanAttributes.OUTPUT_VALUE: safe_json_dumps(trace_info.workflow_run_outputs),
+                    SpanAttributes.OUTPUT_MIME_TYPE: OpenInferenceMimeTypeValues.JSON.value,
+                },
+            )
+
+        workflow_span_context = self.propagator.extract(carrier=workflow_parent_carrier)
 
         workflow_span = self.tracer.start_span(
-            name=TraceTaskName.WORKFLOW_TRACE.value,
+            name=_resolve_workflow_span_name(trace_info),
             attributes={
                 SpanAttributes.OPENINFERENCE_SPAN_KIND: OpenInferenceSpanKindValues.CHAIN.value,
                 SpanAttributes.INPUT_VALUE: safe_json_dumps(trace_info.workflow_run_inputs),
@@ -249,10 +656,10 @@ class ArizePhoenixDataTrace(BaseTraceInstance):
                 SpanAttributes.OUTPUT_VALUE: safe_json_dumps(trace_info.workflow_run_outputs),
                 SpanAttributes.OUTPUT_MIME_TYPE: OpenInferenceMimeTypeValues.JSON.value,
                 SpanAttributes.METADATA: safe_json_dumps(metadata),
-                SpanAttributes.SESSION_ID: trace_info.conversation_id or "",
+                SpanAttributes.SESSION_ID: workflow_session_id or "",
             },
             start_time=datetime_to_nanos(trace_info.start_time),
-            context=root_span_context,
+            context=workflow_span_context,
         )
 
         # Through workflow_run_id, get all_nodes_execution using repository
@@ -276,16 +683,50 @@ class ArizePhoenixDataTrace(BaseTraceInstance):
         workflow_node_executions = workflow_node_execution_repository.get_by_workflow_execution(
             workflow_execution_id=trace_info.workflow_run_id
         )
+        node_title_by_id = _build_node_title_by_id(trace_info)
+        execution_id_by_node_id = _build_execution_id_by_node_id(workflow_node_executions)
+        graph_parent_index = _build_graph_parent_index(workflow_node_executions)
+        node_execution_by_execution_id = {
+            _get_node_execution_id(node_execution): node_execution for node_execution in workflow_node_executions
+        }
+        span_by_execution_id: dict[str, Span] = {}
+        emitting_execution_ids: set[str] = set()
 
+        workflow_span_error: Exception | str | None = trace_info.error
         try:
-            for node_execution in workflow_node_executions:
+
+            def emit_node_span(node_execution: _NodeExecutionLike) -> Span:
+                execution_id = _get_node_execution_id(node_execution)
+                existing_span = span_by_execution_id.get(execution_id)
+                if existing_span is not None:
+                    return existing_span
+
+                graph_parent_execution_id = graph_parent_index.get(execution_id)
+                structured_parent_execution_id = _resolve_structured_parent_execution_id(
+                    node_execution, execution_id_by_node_id
+                )
+
+                if execution_id not in emitting_execution_ids:
+                    emitting_execution_ids.add(execution_id)
+                    try:
+                        for parent_execution_id in (graph_parent_execution_id, structured_parent_execution_id):
+                            if parent_execution_id is None or parent_execution_id == execution_id:
+                                continue
+                            if parent_execution_id in span_by_execution_id:
+                                continue
+                            parent_node_execution = node_execution_by_execution_id.get(parent_execution_id)
+                            if parent_node_execution is not None:
+                                emit_node_span(parent_node_execution)
+                    finally:
+                        emitting_execution_ids.discard(execution_id)
+
                 tenant_id = trace_info.tenant_id  # Use from trace_info instead
                 app_id = trace_info.metadata.get("app_id")  # Use from trace_info instead
                 inputs_value = node_execution.inputs or {}
                 outputs_value = node_execution.outputs or {}
 
                 created_at = node_execution.created_at or datetime.now()
-                elapsed_time = node_execution.elapsed_time
+                elapsed_time = node_execution.elapsed_time or 0
                 finished_at = created_at + timedelta(seconds=elapsed_time)
 
                 process_data = node_execution.process_data or {}
@@ -324,9 +765,17 @@ class ArizePhoenixDataTrace(BaseTraceInstance):
                         node_metadata["prompt_tokens"] = usage_data.get("prompt_tokens", 0)
                         node_metadata["completion_tokens"] = usage_data.get("completion_tokens", 0)
 
-                workflow_span_context = set_span_in_context(workflow_span)
+                parent_span = _resolve_node_parent(
+                    execution_id=execution_id,
+                    predecessor_execution_id=None,
+                    structured_parent_execution_id=structured_parent_execution_id,
+                    span_by_execution_id=span_by_execution_id,
+                    graph_parent_index=graph_parent_index,
+                    workflow_span=workflow_span,
+                )
+                workflow_span_context = set_span_in_context(parent_span)
                 node_span = self.tracer.start_span(
-                    name=node_execution.node_type,
+                    name=_resolve_workflow_node_span_name(node_execution, node_title_by_id),
                     attributes={
                         SpanAttributes.OPENINFERENCE_SPAN_KIND: span_kind.value,
                         SpanAttributes.INPUT_VALUE: safe_json_dumps(inputs_value),
@@ -334,13 +783,20 @@ class ArizePhoenixDataTrace(BaseTraceInstance):
                         SpanAttributes.OUTPUT_VALUE: safe_json_dumps(outputs_value),
                         SpanAttributes.OUTPUT_MIME_TYPE: OpenInferenceMimeTypeValues.JSON.value,
                         SpanAttributes.METADATA: safe_json_dumps(node_metadata),
-                        SpanAttributes.SESSION_ID: trace_info.conversation_id or "",
+                        SpanAttributes.SESSION_ID: workflow_session_id or "",
                     },
                     start_time=datetime_to_nanos(created_at),
                     context=workflow_span_context,
                 )
-
+                span_by_execution_id[execution_id] = node_span
+                node_span_error: Exception | str | None = None
                 try:
+                    if node_execution.node_type == "tool":
+                        parent_span_carrier: dict[str, str] = {}
+                        with use_span(node_span, end_on_exit=False):
+                            self.propagator.inject(carrier=parent_span_carrier)
+                        _publish_parent_span_context(execution_id, parent_span_carrier)
+
                     if node_execution.node_type == "llm":
                         llm_attributes: dict[str, Any] = {
                             SpanAttributes.INPUT_VALUE: json.dumps(process_data.get("prompts", []), ensure_ascii=False),
@@ -362,17 +818,26 @@ class ArizePhoenixDataTrace(BaseTraceInstance):
                             )
                         llm_attributes.update(self._construct_llm_attributes(process_data.get("prompts", [])))
                         node_span.set_attributes(llm_attributes)
+                except Exception as e:
+                    node_span_error = e
+                    raise
                 finally:
-                    if node_execution.status == WorkflowNodeExecutionStatus.FAILED:
+                    if node_span_error is not None:
+                        set_span_status(node_span, node_span_error)
+                    elif node_execution.status == WorkflowNodeExecutionStatus.FAILED:
                         set_span_status(node_span, node_execution.error)
                     else:
                         set_span_status(node_span)
                     node_span.end(end_time=datetime_to_nanos(finished_at))
+                return node_span
+
+            for node_execution in workflow_node_executions:
+                emit_node_span(node_execution)
+        except Exception as e:
+            workflow_span_error = e
+            raise
         finally:
-            if trace_info.error:
-                set_span_status(workflow_span, trace_info.error)
-            else:
-                set_span_status(workflow_span)
+            set_span_status(workflow_span, workflow_span_error)
             workflow_span.end(end_time=datetime_to_nanos(trace_info.end_time))
 
     def message_trace(self, trace_info: MessageTraceInfo):
@@ -735,22 +1200,39 @@ class ArizePhoenixDataTrace(BaseTraceInstance):
         finally:
             span.end(end_time=datetime_to_nanos(trace_info.end_time))
 
-    def ensure_root_span(self, dify_trace_id: str | None):
+    def ensure_root_span(
+        self,
+        dify_trace_id: str | None,
+        *,
+        root_span_name: str | None = None,
+        root_span_attributes: Mapping[str, AttributeValue] | None = None,
+    ):
         """Ensure a unique root span exists for the given Dify trace ID."""
-        if str(dify_trace_id) not in self.dify_trace_ids:
-            self.carrier: dict[str, str] = {}
+        trace_key = str(dify_trace_id)
+        if trace_key not in self.dify_trace_ids:
+            carrier: dict[str, str] = {}
 
-            root_span = self.tracer.start_span(name="Dify")
-            root_span.set_attribute(SpanAttributes.OPENINFERENCE_SPAN_KIND, OpenInferenceSpanKindValues.CHAIN.value)
-            root_span.set_attribute("dify_project_name", str(self.project))
-            root_span.set_attribute("dify_trace_id", str(dify_trace_id))
+            span_name = root_span_name.strip() if isinstance(root_span_name, str) and root_span_name.strip() else "Dify"
+            root_span_attributes_dict: dict[str, AttributeValue] = {
+                SpanAttributes.OPENINFERENCE_SPAN_KIND: OpenInferenceSpanKindValues.CHAIN.value,
+                "dify_project_name": str(self.project),
+                "dify_trace_id": trace_key,
+            }
+            if root_span_attributes:
+                root_span_attributes_dict.update(root_span_attributes)
+
+            root_span = self.tracer.start_span(name=span_name, attributes=root_span_attributes_dict, context=Context())
 
             with use_span(root_span, end_on_exit=False):
-                self.propagator.inject(carrier=self.carrier)
+                self.propagator.inject(carrier=carrier)
 
             set_span_status(root_span)
             root_span.end()
-            self.dify_trace_ids.add(str(dify_trace_id))
+            self.dify_trace_ids.add(trace_key)
+            self.root_span_carriers[trace_key] = carrier
+
+        self.carrier = self.root_span_carriers[trace_key]
+        return self.carrier
 
     def api_check(self):
         try:
diff --git a/api/providers/trace/trace-arize-phoenix/tests/unit_tests/arize_phoenix_trace/test_arize_phoenix_trace.py b/api/providers/trace/trace-arize-phoenix/tests/unit_tests/arize_phoenix_trace/test_arize_phoenix_trace.py
index e9ecc2e083..9b244e3008 100644
--- a/api/providers/trace/trace-arize-phoenix/tests/unit_tests/arize_phoenix_trace/test_arize_phoenix_trace.py
+++ b/api/providers/trace/trace-arize-phoenix/tests/unit_tests/arize_phoenix_trace/test_arize_phoenix_trace.py
@@ -1,10 +1,25 @@
+import json
+from collections.abc import Sequence
 from datetime import UTC, datetime, timedelta
-from typing import cast
+from types import SimpleNamespace
+from typing import Any, cast
 from unittest.mock import MagicMock, patch
 
+import dify_trace_arize_phoenix.arize_phoenix_trace as arize_phoenix_trace_module
 import pytest
 from dify_trace_arize_phoenix.arize_phoenix_trace import (
+    _NODE_TYPE_TO_SPAN_KIND,
     ArizePhoenixDataTrace,
+    _app_uses_phoenix_provider,
+    _build_graph_parent_index,
+    _get_node_span_kind,
+    _parent_workflow_can_publish_span_context,
+    _phoenix_parent_span_redis_key,
+    _resolve_node_parent,
+    _resolve_published_parent_span_context,
+    _resolve_structured_parent_execution_id,
+    _resolve_workflow_parent_context,
+    _resolve_workflow_session_id,
     datetime_to_nanos,
     error_to_string,
     safe_json_dumps,
@@ -13,9 +28,14 @@ from dify_trace_arize_phoenix.arize_phoenix_trace import (
     wrap_span_metadata,
 )
 from dify_trace_arize_phoenix.config import ArizeConfig, PhoenixConfig
-from opentelemetry.sdk.trace import Tracer
+from openinference.semconv.trace import OpenInferenceSpanKindValues, SpanAttributes
+from opentelemetry.context import Context
+from opentelemetry.sdk import trace as trace_sdk
+from opentelemetry.sdk.trace import ReadableSpan, Tracer
+from opentelemetry.sdk.trace.export import SimpleSpanProcessor, SpanExporter, SpanExportResult
 from opentelemetry.semconv.trace import SpanAttributes as OTELSpanAttributes
-from opentelemetry.trace import StatusCode
+from opentelemetry.trace import NonRecordingSpan, SpanContext, StatusCode, TraceFlags, TraceState, use_span
+from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator
 
 from core.ops.entities.trace_entity import (
     DatasetRetrievalTraceInfo,
@@ -24,8 +44,12 @@ from core.ops.entities.trace_entity import (
     ModerationTraceInfo,
     SuggestedQuestionTraceInfo,
     ToolTraceInfo,
+    TraceTaskName,
+    WorkflowNodeTraceInfo,
     WorkflowTraceInfo,
 )
+from core.ops.exceptions import PendingTraceParentContextError
+from graphon.enums import BUILT_IN_NODE_TYPES, BuiltinNodeTypes
 
 # --- Helpers ---
 
@@ -73,6 +97,106 @@ def _make_message_info(**kwargs):
     return MessageTraceInfo(**defaults)
 
 
+def _get_start_span_call(start_span_mock, *, span_name: str):
+    for call in start_span_mock.call_args_list:
+        if call.kwargs.get("name") == span_name:
+            return call
+    raise AssertionError(f"Could not find start_span call with name={span_name!r}")
+
+
+class _FakeQuery:
+    def __init__(self, result):
+        self._result = result
+
+    def filter(self, *args, **kwargs):
+        return self
+
+    def where(self, *args, **kwargs):
+        return self
+
+    def first(self):
+        return self._result
+
+
+class _CollectingSpanExporter(SpanExporter):
+    def __init__(self):
+        self.spans: list[ReadableSpan] = []
+
+    def export(self, spans: Sequence[ReadableSpan]) -> SpanExportResult:
+        self.spans.extend(spans)
+        return SpanExportResult.SUCCESS
+
+    def shutdown(self) -> None:
+        return None
+
+
+def _make_node_execution(**kwargs):
+    defaults = {
+        "node_type": "tool",
+        "status": "succeeded",
+        "inputs": {},
+        "outputs": {},
+        "created_at": _dt(),
+        "elapsed_time": 1.0,
+        "process_data": {},
+        "metadata": {},
+        "title": "Node",
+        "id": "node-execution-1",
+        "node_execution_id": "node-execution-1",
+        "node_id": "node-1",
+        "predecessor_node_id": None,
+        "iteration_id": None,
+        "loop_id": None,
+        "error": None,
+    }
+    defaults.update(kwargs)
+    node_execution = MagicMock()
+    for key, value in defaults.items():
+        setattr(node_execution, key, value)
+    return node_execution
+
+
+def _make_workflow_trace_info(**kwargs) -> WorkflowTraceInfo:
+    defaults = {
+        "workflow_id": "workflow-1",
+        "tenant_id": "tenant-1",
+        "workflow_run_id": "workflow-run-1",
+        "workflow_run_elapsed_time": 1.0,
+        "workflow_run_status": "succeeded",
+        "workflow_run_inputs": {"input": "value"},
+        "workflow_run_outputs": {"output": "value"},
+        "workflow_run_version": "1.0",
+        "total_tokens": 10,
+        "file_list": ["file-1"],
+        "query": "hello",
+        "metadata": {"app_id": "app-1"},
+        "start_time": _dt(),
+        "end_time": _dt() + timedelta(seconds=1),
+    }
+    defaults.update(kwargs)
+    return WorkflowTraceInfo(**defaults)
+
+
+def _make_workflow_node_trace_info(**kwargs) -> WorkflowNodeTraceInfo:
+    defaults = {
+        "workflow_id": "workflow-1",
+        "workflow_run_id": "workflow-run-1",
+        "tenant_id": "tenant-1",
+        "node_execution_id": "node-execution-1",
+        "node_id": "node-1",
+        "node_type": "tool",
+        "title": "Node 1",
+        "status": "succeeded",
+        "elapsed_time": 1.0,
+        "index": 1,
+        "metadata": {"app_id": "app-1"},
+        "start_time": _dt(),
+        "end_time": _dt() + timedelta(seconds=1),
+    }
+    defaults.update(kwargs)
+    return WorkflowNodeTraceInfo(**defaults)
+
+
 # --- Utility Function Tests ---
 
 
@@ -143,6 +267,297 @@ def test_wrap_span_metadata():
     assert res == {"a": 1, "b": 2, "created_from": "Dify"}
 
 
+def test_app_uses_phoenix_provider_only_for_enabled_arize_or_phoenix():
+    assert _app_uses_phoenix_provider({"enabled": True, "tracing_provider": "phoenix"}) is True
+    assert _app_uses_phoenix_provider({"enabled": True, "tracing_provider": "arize"}) is True
+    assert _app_uses_phoenix_provider({"enabled": False, "tracing_provider": "phoenix"}) is False
+    assert _app_uses_phoenix_provider({"enabled": True, "tracing_provider": "langfuse"}) is False
+    assert _app_uses_phoenix_provider(None) is False
+
+
+def test_parent_workflow_can_publish_span_context_keeps_unknown_parent_retryable(monkeypatch):
+    monkeypatch.setattr(
+        "dify_trace_arize_phoenix.arize_phoenix_trace.db.session.query",
+        lambda model: _FakeQuery(None),
+    )
+
+    assert _parent_workflow_can_publish_span_context("missing-run") is True
+
+
+def test_parent_workflow_can_publish_span_context_checks_parent_app_tracing(monkeypatch):
+    parent_run = SimpleNamespace(app_id="parent-app")
+    parent_app = SimpleNamespace(tracing=json.dumps({"enabled": True, "tracing_provider": "phoenix"}))
+
+    def fake_query(model):
+        if getattr(model, "__tablename__", None) == "workflow_runs":
+            return _FakeQuery(parent_run)
+        if getattr(model, "__tablename__", None) == "apps":
+            return _FakeQuery(parent_app)
+        raise AssertionError(f"Unexpected model query: {model}")
+
+    monkeypatch.setattr("dify_trace_arize_phoenix.arize_phoenix_trace.db.session.query", fake_query)
+
+    assert _parent_workflow_can_publish_span_context("parent-run") is True
+
+    parent_app.tracing = json.dumps({"enabled": False, "tracing_provider": "phoenix"})
+    assert _parent_workflow_can_publish_span_context("parent-run") is False
+
+    parent_app.tracing = json.dumps({"enabled": True, "tracing_provider": "langfuse"})
+    assert _parent_workflow_can_publish_span_context("parent-run") is False
+
+
+class TestGetNodeSpanKind:
+    def test_all_node_types_are_mapped_correctly(self):
+        special_mappings = {
+            BuiltinNodeTypes.LLM: OpenInferenceSpanKindValues.LLM,
+            BuiltinNodeTypes.KNOWLEDGE_RETRIEVAL: OpenInferenceSpanKindValues.RETRIEVER,
+            BuiltinNodeTypes.TOOL: OpenInferenceSpanKindValues.TOOL,
+            BuiltinNodeTypes.AGENT: OpenInferenceSpanKindValues.AGENT,
+        }
+
+        for node_type in BUILT_IN_NODE_TYPES:
+            expected_span_kind = special_mappings.get(node_type, OpenInferenceSpanKindValues.CHAIN)
+            actual_span_kind = _get_node_span_kind(node_type)
+            assert actual_span_kind == expected_span_kind, (
+                f"Node type {node_type!r} was mapped to {actual_span_kind}, but {expected_span_kind} was expected."
+            )
+
+    def test_unknown_string_defaults_to_chain(self):
+        assert _get_node_span_kind("some-future-node-type") == OpenInferenceSpanKindValues.CHAIN
+
+    def test_stale_dataset_retrieval_not_in_mapping(self):
+        assert "dataset_retrieval" not in _NODE_TYPE_TO_SPAN_KIND
+
+
+class TestWorkflowSessionResolution:
+    def test_prefers_conversation_id(self):
+        info = _make_workflow_trace_info(conversation_id="conversation-1")
+
+        assert _resolve_workflow_session_id(info) == "conversation-1"
+
+    def test_nested_workflow_keeps_own_conversation_id_when_parent_context_exists(self):
+        info = _make_workflow_trace_info(
+            conversation_id="conversation-1",
+            metadata={
+                "app_id": "app-1",
+                "parent_trace_context": {
+                    "parent_workflow_run_id": "outer-workflow-run-1",
+                    "parent_node_execution_id": "outer-node-execution-1",
+                },
+            },
+        )
+
+        assert _resolve_workflow_session_id(info) == "conversation-1"
+
+    def test_uses_parent_workflow_run_id_for_nested_parent_trace_context(self):
+        info = _make_workflow_trace_info(
+            conversation_id=None,
+            metadata={
+                "app_id": "app-1",
+                "parent_trace_context": {
+                    "parent_workflow_run_id": "outer-workflow-run-1",
+                    "parent_node_execution_id": "outer-node-execution-1",
+                },
+            },
+        )
+
+        assert _resolve_workflow_session_id(info) == "outer-workflow-run-1"
+
+    def test_falls_back_to_workflow_run_id(self):
+        info = _make_workflow_trace_info(conversation_id=None)
+
+        assert _resolve_workflow_session_id(info) == "workflow-run-1"
+
+    def test_parent_context_helper_delegates_to_resolved_parent_context(self):
+        info = MagicMock()
+        info.resolved_parent_context = ("outer-workflow-run-1", "outer-node-execution-1")
+
+        assert _resolve_workflow_parent_context(info) == info.resolved_parent_context
+
+
+class TestPhoenixParentSpanBridgeHelpers:
+    def test_parent_span_redis_key_is_stable(self):
+        assert _phoenix_parent_span_redis_key("outer-node-execution-1") == (
+            "trace:phoenix:parent_span:outer-node-execution-1"
+        )
+
+    def test_pending_parent_exception_exposes_execution_id(self):
+        error = PendingTraceParentContextError("outer-node-execution-1")
+
+        assert error.parent_node_execution_id == "outer-node-execution-1"
+        assert "outer-node-execution-1" in str(error)
+
+    def test_resolve_parent_span_context_rejects_payload_without_traceparent(self, monkeypatch):
+        mock_redis = MagicMock()
+        mock_redis.get.return_value = '{"tracestate": "vendor=value"}'
+        monkeypatch.setattr(arize_phoenix_trace_module, "redis_client", mock_redis)
+
+        with pytest.raises(ValueError, match="traceparent"):
+            _resolve_published_parent_span_context("outer-node-execution-1")
+
+    @pytest.mark.parametrize(
+        "stored_payload",
+        [
+            '{"traceparent": ""}',
+            '{"traceparent": "not-a-traceparent"}',
+            '{"traceparent": "00-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bbbbbbbbbbbbbbbb"}',
+        ],
+    )
+    def test_resolve_parent_span_context_rejects_malformed_traceparent(self, monkeypatch, stored_payload):
+        mock_redis = MagicMock()
+        mock_redis.get.return_value = stored_payload
+        monkeypatch.setattr(arize_phoenix_trace_module, "redis_client", mock_redis)
+
+        with pytest.raises(ValueError, match="traceparent"):
+            _resolve_published_parent_span_context("outer-node-execution-1")
+
+
+class TestWorkflowHierarchyHelpers:
+    def test_build_graph_parent_index_uses_predecessor_nodes_without_order_heuristics(self):
+        later_node = _make_workflow_node_trace_info(
+            node_execution_id="node-execution-3",
+            node_id="node-3",
+            predecessor_node_id="node-2",
+            index=3,
+        )
+        root_node = _make_workflow_node_trace_info(
+            node_execution_id="node-execution-1",
+            node_id="node-1",
+            predecessor_node_id=None,
+            index=1,
+        )
+        middle_node = _make_workflow_node_trace_info(
+            node_execution_id="node-execution-2",
+            node_id="node-2",
+            predecessor_node_id="node-1",
+            index=2,
+        )
+
+        graph_parent_index = _build_graph_parent_index([later_node, root_node, middle_node])
+
+        assert graph_parent_index == {
+            "node-execution-2": "node-execution-1",
+            "node-execution-3": "node-execution-2",
+        }
+
+    def test_build_graph_parent_index_drops_ambiguous_parallel_like_predecessors(self):
+        first_parallel_node = _make_workflow_node_trace_info(
+            node_execution_id="parallel-node-execution-1",
+            node_id="parallel-node-1",
+            predecessor_node_id=None,
+            index=1,
+            parallel_id="parallel-1",
+        )
+        second_parallel_node = _make_workflow_node_trace_info(
+            node_execution_id="parallel-node-execution-2",
+            node_id="parallel-node-1",
+            predecessor_node_id=None,
+            index=2,
+            parallel_id="parallel-2",
+        )
+        child_node = _make_workflow_node_trace_info(
+            node_execution_id="child-node-execution-1",
+            node_id="child-node-1",
+            predecessor_node_id="parallel-node-1",
+            index=3,
+        )
+
+        graph_parent_index = _build_graph_parent_index([child_node, first_parallel_node, second_parallel_node])
+
+        assert graph_parent_index == {}
+
+    def test_resolve_node_parent_prefers_predecessor_span(self):
+        workflow_span = MagicMock(name="workflow-span")
+        predecessor_span = MagicMock(name="predecessor-span")
+        graph_parent_span = MagicMock(name="graph-parent-span")
+
+        parent = _resolve_node_parent(
+            execution_id="node-execution-2",
+            predecessor_execution_id="node-execution-1",
+            structured_parent_execution_id=None,
+            span_by_execution_id={
+                "node-execution-1": predecessor_span,
+                "node-execution-0": graph_parent_span,
+            },
+            graph_parent_index={
+                "node-execution-2": "node-execution-0",
+            },
+            workflow_span=workflow_span,
+        )
+
+        assert parent is predecessor_span
+
+    def test_resolve_node_parent_falls_back_to_graph_parent_span(self):
+        workflow_span = MagicMock(name="workflow-span")
+        graph_parent_span = MagicMock(name="graph-parent-span")
+
+        parent = _resolve_node_parent(
+            execution_id="node-execution-2",
+            predecessor_execution_id="missing-predecessor",
+            structured_parent_execution_id=None,
+            span_by_execution_id={
+                "node-execution-0": graph_parent_span,
+            },
+            graph_parent_index={
+                "node-execution-2": "node-execution-0",
+            },
+            workflow_span=workflow_span,
+        )
+
+        assert parent is graph_parent_span
+
+    def test_resolve_node_parent_falls_back_to_workflow_span(self):
+        workflow_span = MagicMock(name="workflow-span")
+
+        parent = _resolve_node_parent(
+            execution_id="node-execution-2",
+            predecessor_execution_id=None,
+            structured_parent_execution_id=None,
+            span_by_execution_id={},
+            graph_parent_index={},
+            workflow_span=workflow_span,
+        )
+
+        assert parent is workflow_span
+
+    def test_resolve_structured_parent_execution_id_allows_body_nodes_to_use_enclosing_structure(self):
+        body_node = _make_workflow_node_trace_info(
+            node_execution_id="body-execution-1",
+            node_id="body-node-1",
+            node_type="tool",
+            loop_id="loop-node-1",
+        )
+
+        structured_parent_execution_id = _resolve_structured_parent_execution_id(
+            body_node,
+            execution_id_by_node_id={
+                "loop-node-1": "loop-execution-1",
+            },
+        )
+
+        assert structured_parent_execution_id == "loop-execution-1"
+
+    def test_resolve_structured_parent_execution_id_reads_execution_metadata_dict_for_models(self):
+        body_node = SimpleNamespace(
+            node_execution_id="body-execution-1",
+            node_id="body-node-1",
+            execution_metadata_dict={
+                "iteration_id": "iteration-node-1",
+                "loop_id": "loop-node-1",
+            },
+        )
+
+        structured_parent_execution_id = _resolve_structured_parent_execution_id(
+            body_node,
+            execution_id_by_node_id={
+                "iteration-node-1": "iteration-execution-1",
+                "loop-node-1": "loop-execution-1",
+            },
+        )
+
+        assert structured_parent_execution_id == "iteration-execution-1"
+
+
 @patch("dify_trace_arize_phoenix.arize_phoenix_trace.GrpcOTLPSpanExporter")
 @patch("dify_trace_arize_phoenix.arize_phoenix_trace.trace_sdk.TracerProvider")
 def test_setup_tracer_arize(mock_provider, mock_exporter):
@@ -173,12 +588,17 @@ def test_setup_tracer_exception():
 
 @pytest.fixture
 def trace_instance():
-    with patch("dify_trace_arize_phoenix.arize_phoenix_trace.setup_tracer") as mock_setup:
+    with (
+        patch("dify_trace_arize_phoenix.arize_phoenix_trace.setup_tracer") as mock_setup,
+        patch("dify_trace_arize_phoenix.arize_phoenix_trace.redis_client", new=MagicMock()) as mock_redis,
+    ):
         mock_tracer = MagicMock(spec=Tracer)
         mock_processor = MagicMock()
         mock_setup.return_value = (mock_tracer, mock_processor)
         config = ArizeConfig(endpoint="http://a.com", api_key="k", space_id="s", project="p")
-        return ArizePhoenixDataTrace(config)
+        instance = ArizePhoenixDataTrace(config)
+        cast(Any, instance)._mock_redis_client = mock_redis
+        yield instance
 
 
 def test_trace_dispatch(trace_instance):
@@ -273,23 +693,921 @@ def test_workflow_trace_no_app_id(mock_db, trace_instance):
 
 
 @patch("dify_trace_arize_phoenix.arize_phoenix_trace.db")
-def test_message_trace_success(mock_db, trace_instance):
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.DifyCoreRepositoryFactory")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.sessionmaker")
+def test_workflow_trace_uses_canonical_root_context_for_top_level_workflow(
+    mock_sessionmaker, mock_repo_factory, mock_db, trace_instance
+):
+    mock_db.engine = MagicMock()
+    info = _make_workflow_info(message_id="message-1", workflow_run_id="workflow-run-1")
+    repo = MagicMock()
+    repo.get_by_workflow_execution.return_value = []
+    mock_repo_factory.create_workflow_node_execution_repository.return_value = repo
+
+    root_carrier = {}
+    root_context = object()
+
+    with (
+        patch.object(trace_instance, "get_service_account_with_tenant", return_value=MagicMock()),
+        patch.object(trace_instance, "ensure_root_span", return_value=root_carrier) as mock_ensure_root_span,
+        patch.object(trace_instance.propagator, "extract", return_value=root_context) as mock_extract,
+    ):
+        trace_instance.workflow_trace(info)
+
+    mock_ensure_root_span.assert_called_once_with(
+        info.resolved_trace_id,
+        root_span_name="workflow-run-1",
+        root_span_attributes={
+            SpanAttributes.INPUT_VALUE: safe_json_dumps(info.workflow_run_inputs),
+            SpanAttributes.INPUT_MIME_TYPE: "application/json",
+            SpanAttributes.OUTPUT_VALUE: safe_json_dumps(info.workflow_run_outputs),
+            SpanAttributes.OUTPUT_MIME_TYPE: "application/json",
+        },
+    )
+    mock_extract.assert_called_once_with(carrier=root_carrier)
+    workflow_span_call = _get_start_span_call(trace_instance.tracer.start_span, span_name="workflow_workflow-run-1")
+    assert workflow_span_call.kwargs["context"] is root_context
+
+
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.db")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.DifyCoreRepositoryFactory")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.sessionmaker")
+def test_workflow_trace_uses_workflow_run_id_for_root_span_and_populates_root_inputs_outputs(
+    mock_sessionmaker,
+    mock_repo_factory,
+    mock_db,
+    trace_instance,
+):
+    mock_db.engine = MagicMock()
+    info = _make_workflow_info(
+        workflow_run_inputs={"prompt": "hello"},
+        workflow_run_outputs={"result": "world"},
+        metadata={
+            "app_id": "app1",
+            "app_name": "Workflow Name",
+        },
+        workflow_run_id="workflow-run-xyz",
+    )
+    repo = MagicMock()
+    repo.get_by_workflow_execution.return_value = []
+    mock_repo_factory.create_workflow_node_execution_repository.return_value = repo
+
+    with patch.object(trace_instance, "get_service_account_with_tenant", return_value=MagicMock()):
+        trace_instance.workflow_trace(info)
+
+    root_span_call = _get_start_span_call(trace_instance.tracer.start_span, span_name="workflow-run-xyz")
+    assert root_span_call.kwargs["attributes"][SpanAttributes.INPUT_VALUE] == safe_json_dumps(info.workflow_run_inputs)
+    assert root_span_call.kwargs["attributes"][SpanAttributes.OUTPUT_VALUE] == safe_json_dumps(
+        info.workflow_run_outputs
+    )
+    assert root_span_call.kwargs["attributes"][SpanAttributes.INPUT_MIME_TYPE] == "application/json"
+    assert root_span_call.kwargs["attributes"][SpanAttributes.OUTPUT_MIME_TYPE] == "application/json"
+
+
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.db")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.DifyCoreRepositoryFactory")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.sessionmaker")
+def test_workflow_trace_falls_back_to_dify_name_when_workflow_run_id_is_blank(
+    mock_sessionmaker,
+    mock_repo_factory,
+    mock_db,
+    trace_instance,
+):
+    mock_db.engine = MagicMock()
+    info = _make_workflow_info(
+        metadata={
+            "app_id": "app1",
+            "app_name": "",
+        },
+        workflow_run_id="",
+    )
+    repo = MagicMock()
+    repo.get_by_workflow_execution.return_value = []
+    mock_repo_factory.create_workflow_node_execution_repository.return_value = repo
+
+    with patch.object(trace_instance, "get_service_account_with_tenant", return_value=MagicMock()):
+        trace_instance.workflow_trace(info)
+
+    root_span_call = _get_start_span_call(trace_instance.tracer.start_span, span_name="Dify")
+    assert root_span_call.kwargs["attributes"]["dify_trace_id"] == ""
+
+
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.db")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.DifyCoreRepositoryFactory")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.sessionmaker")
+def test_workflow_trace_reuses_upstream_parent_workflow_context_when_no_parent_node_execution_id_is_available(
+    mock_sessionmaker, mock_repo_factory, mock_db, trace_instance
+):
+    mock_db.engine = MagicMock()
+    info = _make_workflow_info(
+        message_id="message-1",
+        workflow_run_id="workflow-run-1",
+        metadata={
+            "app_id": "app1",
+            "parent_trace_context": {
+                "parent_workflow_run_id": "outer-workflow-run-1",
+            },
+        },
+    )
+    repo = MagicMock()
+    repo.get_by_workflow_execution.return_value = []
+    mock_repo_factory.create_workflow_node_execution_repository.return_value = repo
+
+    parent_carrier = {}
+    parent_context = object()
+
+    with (
+        patch.object(trace_instance, "get_service_account_with_tenant", return_value=MagicMock()),
+        patch.object(trace_instance, "ensure_root_span", return_value=parent_carrier) as mock_ensure_root_span,
+        patch.object(trace_instance.propagator, "extract", return_value=parent_context) as mock_extract,
+    ):
+        trace_instance.workflow_trace(info)
+
+    mock_ensure_root_span.assert_called_once_with(
+        "outer-workflow-run-1",
+        root_span_name="workflow-run-1",
+        root_span_attributes={
+            SpanAttributes.INPUT_VALUE: safe_json_dumps(info.workflow_run_inputs),
+            SpanAttributes.INPUT_MIME_TYPE: "application/json",
+            SpanAttributes.OUTPUT_VALUE: safe_json_dumps(info.workflow_run_outputs),
+            SpanAttributes.OUTPUT_MIME_TYPE: "application/json",
+        },
+    )
+    mock_extract.assert_called_once_with(carrier=parent_carrier)
+    workflow_span_call = _get_start_span_call(trace_instance.tracer.start_span, span_name="workflow_workflow-run-1")
+    assert workflow_span_call.kwargs["context"] is parent_context
+
+
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.db")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.DifyCoreRepositoryFactory")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.sessionmaker")
+def test_workflow_trace_uses_published_parent_node_context_for_nested_workflow(
+    mock_sessionmaker,
+    mock_repo_factory,
+    mock_db,
+    trace_instance,
+):
+    mock_db.engine = MagicMock()
+    info = _make_workflow_info(
+        message_id="message-1",
+        workflow_run_id="workflow-run-1",
+        metadata={
+            "app_id": "app1",
+            "parent_trace_context": {
+                "parent_workflow_run_id": "outer-workflow-run-1",
+                "parent_node_execution_id": "outer-node-execution-1",
+            },
+        },
+    )
+    repo = MagicMock()
+    repo.get_by_workflow_execution.return_value = []
+    mock_repo_factory.create_workflow_node_execution_repository.return_value = repo
+    stored_carrier = '{"traceparent":"00-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bbbbbbbbbbbbbbbb-01"}'
+    trace_instance._mock_redis_client.get.return_value = stored_carrier
+    parent_context = object()
+
+    with (
+        patch.object(trace_instance, "get_service_account_with_tenant", return_value=MagicMock()),
+        patch.object(trace_instance, "ensure_root_span") as mock_ensure_root_span,
+        patch.object(trace_instance.propagator, "extract", return_value=parent_context) as mock_extract,
+    ):
+        trace_instance.workflow_trace(info)
+
+    trace_instance._mock_redis_client.get.assert_called_once_with(
+        _phoenix_parent_span_redis_key("outer-node-execution-1")
+    )
+    mock_ensure_root_span.assert_not_called()
+    mock_extract.assert_called_once_with(
+        carrier={"traceparent": "00-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bbbbbbbbbbbbbbbb-01"}
+    )
+    workflow_span_call = _get_start_span_call(trace_instance.tracer.start_span, span_name="workflow_workflow-run-1")
+    assert workflow_span_call.kwargs["context"] is parent_context
+
+
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.db")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.DifyCoreRepositoryFactory")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.sessionmaker")
+def test_workflow_trace_raises_pending_parent_error_when_parent_node_context_is_missing(
+    mock_sessionmaker,
+    mock_repo_factory,
+    mock_db,
+    trace_instance,
+):
+    mock_db.engine = MagicMock()
+    info = _make_workflow_info(
+        message_id="message-1",
+        workflow_run_id="workflow-run-1",
+        metadata={
+            "app_id": "app1",
+            "parent_trace_context": {
+                "parent_workflow_run_id": "outer-workflow-run-1",
+                "parent_node_execution_id": "outer-node-execution-1",
+            },
+        },
+    )
+    repo = MagicMock()
+    repo.get_by_workflow_execution.return_value = []
+    mock_repo_factory.create_workflow_node_execution_repository.return_value = repo
+    trace_instance._mock_redis_client.get.return_value = None
+
+    with (
+        patch.object(trace_instance, "get_service_account_with_tenant", return_value=MagicMock()),
+        patch(
+            "dify_trace_arize_phoenix.arize_phoenix_trace._parent_workflow_can_publish_span_context",
+            return_value=True,
+        ),
+        patch.object(trace_instance, "ensure_root_span") as mock_ensure_root_span,
+        pytest.raises(PendingTraceParentContextError) as exc_info,
+    ):
+        trace_instance.workflow_trace(info)
+
+    assert exc_info.value.parent_node_execution_id == "outer-node-execution-1"
+    trace_instance._mock_redis_client.get.assert_called_once_with(
+        _phoenix_parent_span_redis_key("outer-node-execution-1")
+    )
+    mock_ensure_root_span.assert_not_called()
+
+
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.db")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.DifyCoreRepositoryFactory")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.sessionmaker")
+def test_workflow_trace_falls_back_when_parent_app_tracing_cannot_publish_parent_context(
+    mock_sessionmaker,
+    mock_repo_factory,
+    mock_db,
+    trace_instance,
+):
+    mock_db.engine = MagicMock()
+    info = _make_workflow_info(
+        message_id="message-1",
+        workflow_run_id="workflow-run-1",
+        metadata={
+            "app_id": "app1",
+            "parent_trace_context": {
+                "parent_workflow_run_id": "outer-workflow-run-1",
+                "parent_node_execution_id": "outer-node-execution-1",
+            },
+        },
+    )
+    repo = MagicMock()
+    repo.get_by_workflow_execution.return_value = []
+    mock_repo_factory.create_workflow_node_execution_repository.return_value = repo
+    trace_instance._mock_redis_client.get.return_value = None
+
+    parent_carrier = {}
+    parent_context = object()
+
+    with (
+        patch.object(trace_instance, "get_service_account_with_tenant", return_value=MagicMock()),
+        patch(
+            "dify_trace_arize_phoenix.arize_phoenix_trace._parent_workflow_can_publish_span_context",
+            return_value=False,
+        ),
+        patch.object(trace_instance, "ensure_root_span", return_value=parent_carrier) as mock_ensure_root_span,
+        patch.object(trace_instance.propagator, "extract", return_value=parent_context) as mock_extract,
+    ):
+        trace_instance.workflow_trace(info)
+
+    mock_ensure_root_span.assert_called_once_with(
+        "outer-workflow-run-1",
+        root_span_name="workflow-run-1",
+        root_span_attributes={
+            SpanAttributes.INPUT_VALUE: safe_json_dumps(info.workflow_run_inputs),
+            SpanAttributes.INPUT_MIME_TYPE: "application/json",
+            SpanAttributes.OUTPUT_VALUE: safe_json_dumps(info.workflow_run_outputs),
+            SpanAttributes.OUTPUT_MIME_TYPE: "application/json",
+        },
+    )
+    mock_extract.assert_called_once_with(carrier=parent_carrier)
+    workflow_span_call = _get_start_span_call(trace_instance.tracer.start_span, span_name="workflow_workflow-run-1")
+    assert workflow_span_call.kwargs["context"] is parent_context
+
+
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.db")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.DifyCoreRepositoryFactory")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.sessionmaker")
+def test_workflow_trace_still_retries_when_parent_app_can_publish_parent_context(
+    mock_sessionmaker,
+    mock_repo_factory,
+    mock_db,
+    trace_instance,
+):
+    mock_db.engine = MagicMock()
+    info = _make_workflow_info(
+        message_id="message-1",
+        workflow_run_id="workflow-run-1",
+        metadata={
+            "app_id": "app1",
+            "parent_trace_context": {
+                "parent_workflow_run_id": "outer-workflow-run-1",
+                "parent_node_execution_id": "outer-node-execution-1",
+            },
+        },
+    )
+    repo = MagicMock()
+    repo.get_by_workflow_execution.return_value = []
+    mock_repo_factory.create_workflow_node_execution_repository.return_value = repo
+    trace_instance._mock_redis_client.get.return_value = None
+
+    with (
+        patch.object(trace_instance, "get_service_account_with_tenant", return_value=MagicMock()),
+        patch(
+            "dify_trace_arize_phoenix.arize_phoenix_trace._parent_workflow_can_publish_span_context",
+            return_value=True,
+        ),
+        patch.object(trace_instance, "ensure_root_span") as mock_ensure_root_span,
+        pytest.raises(PendingTraceParentContextError) as exc_info,
+    ):
+        trace_instance.workflow_trace(info)
+
+    assert exc_info.value.parent_node_execution_id == "outer-node-execution-1"
+    mock_ensure_root_span.assert_not_called()
+
+
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.db")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.DifyCoreRepositoryFactory")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.sessionmaker")
+def test_workflow_trace_uses_parent_workflow_run_id_for_workflow_and_nodes_when_nested_context_is_present(
+    mock_sessionmaker, mock_repo_factory, mock_db, trace_instance
+):
+    mock_db.engine = MagicMock()
+    info = _make_workflow_info(
+        conversation_id=None,
+        metadata={
+            "app_id": "app1",
+            "parent_trace_context": {
+                "parent_workflow_run_id": "outer-workflow-run-1",
+            },
+        },
+    )
+    repo = MagicMock()
+    node_execution = MagicMock()
+    node_execution.node_type = "tool"
+    node_execution.status = "succeeded"
+    node_execution.inputs = {"tool_input": "value"}
+    node_execution.outputs = {"tool_output": "value"}
+    node_execution.created_at = _dt()
+    node_execution.elapsed_time = 1.0
+    node_execution.process_data = {}
+    node_execution.metadata = {}
+    node_execution.title = "Tool node"
+    node_execution.id = "node-1"
+    node_execution.error = None
+    repo.get_by_workflow_execution.return_value = [node_execution]
+    mock_repo_factory.create_workflow_node_execution_repository.return_value = repo
+
+    with patch.object(trace_instance, "get_service_account_with_tenant", return_value=MagicMock()):
+        trace_instance.workflow_trace(info)
+
+    workflow_span_call = _get_start_span_call(trace_instance.tracer.start_span, span_name="workflow_r1")
+    node_span_call = _get_start_span_call(trace_instance.tracer.start_span, span_name="tool_Tool node")
+
+    assert workflow_span_call.kwargs["attributes"][SpanAttributes.SESSION_ID] == "outer-workflow-run-1"
+    assert node_span_call.kwargs["attributes"][SpanAttributes.SESSION_ID] == "outer-workflow-run-1"
+
+
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.db")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.DifyCoreRepositoryFactory")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.sessionmaker")
+def test_workflow_trace_falls_back_to_node_type_when_node_title_is_blank(
+    mock_sessionmaker, mock_repo_factory, mock_db, trace_instance
+):
+    mock_db.engine = MagicMock()
+    info = _make_workflow_info()
+    repo = MagicMock()
+    node_execution = _make_node_execution(
+        id="node-execution-1",
+        node_execution_id="node-execution-1",
+        node_id="node-1",
+        node_type="tool",
+        title=" ",
+    )
+    repo.get_by_workflow_execution.return_value = [node_execution]
+    mock_repo_factory.create_workflow_node_execution_repository.return_value = repo
+
+    with patch.object(trace_instance, "get_service_account_with_tenant", return_value=MagicMock()):
+        trace_instance.workflow_trace(info)
+
+    node_span_call = _get_start_span_call(trace_instance.tracer.start_span, span_name="tool")
+    assert node_span_call.kwargs["attributes"][SpanAttributes.SESSION_ID] == "r1"
+
+
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.db")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.DifyCoreRepositoryFactory")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.sessionmaker")
+def test_workflow_trace_prefers_workflow_graph_node_title_over_execution_title(
+    mock_sessionmaker, mock_repo_factory, mock_db, trace_instance
+):
+    mock_db.engine = MagicMock()
+    info = _make_workflow_info(
+        workflow_data={
+            "graph": {
+                "nodes": [
+                    {
+                        "id": "nested-tool-node",
+                        "data": {
+                            "type": "tool",
+                            "title": "nested workflow tool",
+                        },
+                    }
+                ]
+            }
+        }
+    )
+    repo = MagicMock()
+    node_execution = _make_node_execution(
+        id="node-execution-1",
+        node_execution_id="node-execution-1",
+        node_id="nested-tool-node",
+        node_type="tool",
+        title="2",
+    )
+    repo.get_by_workflow_execution.return_value = [node_execution]
+    mock_repo_factory.create_workflow_node_execution_repository.return_value = repo
+
+    with patch.object(trace_instance, "get_service_account_with_tenant", return_value=MagicMock()):
+        trace_instance.workflow_trace(info)
+
+    node_span_call = _get_start_span_call(trace_instance.tracer.start_span, span_name="tool_nested workflow tool")
+    assert node_span_call.kwargs["attributes"][SpanAttributes.SESSION_ID] == "r1"
+
+
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.db")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.DifyCoreRepositoryFactory")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.sessionmaker")
+def test_workflow_trace_keeps_nested_conversation_session_while_reusing_parent_root_context(
+    mock_sessionmaker, mock_repo_factory, mock_db, trace_instance
+):
+    mock_db.engine = MagicMock()
+    info = _make_workflow_info(
+        conversation_id="conversation-1",
+        message_id="message-1",
+        workflow_run_id="workflow-run-1",
+        metadata={
+            "app_id": "app1",
+            "parent_trace_context": {
+                "parent_workflow_run_id": "outer-workflow-run-1",
+            },
+        },
+    )
+    repo = MagicMock()
+    node_execution = _make_node_execution(
+        id="node-execution-1",
+        node_execution_id="node-execution-1",
+        node_id="node-1",
+        node_type="tool",
+    )
+    repo.get_by_workflow_execution.return_value = [node_execution]
+    mock_repo_factory.create_workflow_node_execution_repository.return_value = repo
+
+    parent_carrier = {}
+    parent_context = object()
+
+    with (
+        patch.object(trace_instance, "get_service_account_with_tenant", return_value=MagicMock()),
+        patch.object(trace_instance, "ensure_root_span", return_value=parent_carrier) as mock_ensure_root_span,
+        patch.object(trace_instance.propagator, "extract", return_value=parent_context) as mock_extract,
+    ):
+        trace_instance.workflow_trace(info)
+
+    mock_ensure_root_span.assert_called_once_with(
+        "outer-workflow-run-1",
+        root_span_name="workflow-run-1",
+        root_span_attributes={
+            SpanAttributes.INPUT_VALUE: safe_json_dumps(info.workflow_run_inputs),
+            SpanAttributes.INPUT_MIME_TYPE: "application/json",
+            SpanAttributes.OUTPUT_VALUE: safe_json_dumps(info.workflow_run_outputs),
+            SpanAttributes.OUTPUT_MIME_TYPE: "application/json",
+        },
+    )
+    mock_extract.assert_called_once_with(carrier=parent_carrier)
+    workflow_span_call = _get_start_span_call(trace_instance.tracer.start_span, span_name="workflow_workflow-run-1")
+    node_span_call = _get_start_span_call(trace_instance.tracer.start_span, span_name="tool_Node")
+    assert workflow_span_call.kwargs["context"] is parent_context
+    assert workflow_span_call.kwargs["attributes"][SpanAttributes.SESSION_ID] == "conversation-1"
+    assert node_span_call.kwargs["attributes"][SpanAttributes.SESSION_ID] == "conversation-1"
+
+
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.db")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.DifyCoreRepositoryFactory")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.sessionmaker")
+def test_workflow_trace_publishes_tool_node_parent_span_context_to_redis(
+    mock_sessionmaker,
+    mock_repo_factory,
+    mock_db,
+    trace_instance,
+):
+    mock_db.engine = MagicMock()
+    info = _make_workflow_info()
+    repo = MagicMock()
+    node_execution = _make_node_execution(
+        id="tool-execution-1",
+        node_execution_id="tool-execution-1",
+        node_id="tool-node-1",
+        node_type="tool",
+    )
+    repo.get_by_workflow_execution.return_value = [node_execution]
+    mock_repo_factory.create_workflow_node_execution_repository.return_value = repo
+
+    workflow_span = MagicMock(name="workflow-span")
+    workflow_span._context_label = "workflow"
+    tool_span = MagicMock(name="tool-span")
+    tool_span._context_label = "tool"
+    trace_instance.tracer.start_span.side_effect = [workflow_span, tool_span]
+
+    def inject_side_effect(carrier):
+        carrier["traceparent"] = "00-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bbbbbbbbbbbbbbbb-01"
+
+    with (
+        patch.object(trace_instance, "get_service_account_with_tenant", return_value=MagicMock()),
+        patch.object(trace_instance, "ensure_root_span", return_value={}),
+        patch.object(trace_instance.propagator, "extract", return_value="root-context"),
+        patch.object(trace_instance.propagator, "inject", side_effect=inject_side_effect) as mock_inject,
+        patch(
+            "dify_trace_arize_phoenix.arize_phoenix_trace.set_span_in_context",
+            side_effect=lambda span: f"context:{span._context_label}",
+        ),
+    ):
+        trace_instance.workflow_trace(info)
+
+    mock_inject.assert_called_once()
+    trace_instance._mock_redis_client.setex.assert_called_once_with(
+        _phoenix_parent_span_redis_key("tool-execution-1"),
+        300,
+        '{"traceparent": "00-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bbbbbbbbbbbbbbbb-01"}',
+    )
+
+
+@pytest.mark.parametrize(
+    ("failing_step", "expected_message"),
+    [
+        ("inject", "inject failed"),
+        ("publish", "publish failed"),
+    ],
+)
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.db")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.DifyCoreRepositoryFactory")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.sessionmaker")
+def test_workflow_trace_cleans_up_tool_span_when_parent_context_publish_fails(
+    mock_sessionmaker,
+    mock_repo_factory,
+    mock_db,
+    trace_instance,
+    failing_step,
+    expected_message,
+):
+    mock_db.engine = MagicMock()
+    info = _make_workflow_info()
+    repo = MagicMock()
+    node_execution = _make_node_execution(
+        id="tool-execution-1",
+        node_execution_id="tool-execution-1",
+        node_id="tool-node-1",
+        node_type="tool",
+    )
+    repo.get_by_workflow_execution.return_value = [node_execution]
+    mock_repo_factory.create_workflow_node_execution_repository.return_value = repo
+
+    workflow_span = MagicMock(name="workflow-span")
+    workflow_span._context_label = "workflow"
+    tool_span = MagicMock(name="tool-span")
+    tool_span._context_label = "tool"
+    trace_instance.tracer.start_span.side_effect = [workflow_span, tool_span]
+
+    inject_side_effect = None
+    if failing_step == "inject":
+        inject_side_effect = RuntimeError(expected_message)
+    else:
+        trace_instance._mock_redis_client.setex.side_effect = RuntimeError(expected_message)
+
+        def inject_side_effect(carrier):
+            carrier["traceparent"] = "00-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-bbbbbbbbbbbbbbbb-01"
+
+    with (
+        patch.object(trace_instance, "get_service_account_with_tenant", return_value=MagicMock()),
+        patch.object(trace_instance, "ensure_root_span", return_value={}),
+        patch.object(trace_instance.propagator, "extract", return_value="root-context"),
+        patch.object(trace_instance.propagator, "inject", side_effect=inject_side_effect),
+        patch(
+            "dify_trace_arize_phoenix.arize_phoenix_trace.set_span_in_context",
+            side_effect=lambda span: f"context:{span._context_label}",
+        ),
+        pytest.raises(RuntimeError, match=expected_message),
+    ):
+        trace_instance.workflow_trace(info)
+
+    tool_span.end.assert_called_once()
+    workflow_span.end.assert_called_once()
+
+
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.db")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.DifyCoreRepositoryFactory")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.sessionmaker")
+def test_workflow_trace_parents_serial_nodes_to_resolved_predecessor_span(
+    mock_sessionmaker, mock_repo_factory, mock_db, trace_instance
+):
+    mock_db.engine = MagicMock()
+    info = _make_workflow_info()
+    repo = MagicMock()
+    second_node = _make_node_execution(
+        id="node-execution-2",
+        node_execution_id="node-execution-2",
+        node_id="node-2",
+        node_type="llm",
+        predecessor_node_id="node-1",
+        process_data={
+            "prompts": [{"role": "user", "content": "hi"}],
+            "model_provider": "openai",
+            "model_name": "gpt-4",
+        },
+    )
+    first_node = _make_node_execution(
+        id="node-execution-1",
+        node_execution_id="node-execution-1",
+        node_id="node-1",
+        node_type="tool",
+    )
+    repo.get_by_workflow_execution.return_value = [second_node, first_node]
+    mock_repo_factory.create_workflow_node_execution_repository.return_value = repo
+
+    workflow_span = MagicMock(name="workflow-span")
+    workflow_span._context_label = "workflow"
+    first_node_span = MagicMock(name="first-node-span")
+    first_node_span._context_label = "node-1"
+    second_node_span = MagicMock(name="second-node-span")
+    second_node_span._context_label = "node-2"
+    trace_instance.tracer.start_span.side_effect = [workflow_span, first_node_span, second_node_span]
+
+    with (
+        patch.object(trace_instance, "get_service_account_with_tenant", return_value=MagicMock()),
+        patch.object(trace_instance, "ensure_root_span", return_value={}),
+        patch.object(trace_instance.propagator, "extract", return_value="root-context"),
+        patch(
+            "dify_trace_arize_phoenix.arize_phoenix_trace.set_span_in_context",
+            side_effect=lambda span: f"context:{span._context_label}",
+        ),
+    ):
+        trace_instance.workflow_trace(info)
+
+    first_node_call = _get_start_span_call(trace_instance.tracer.start_span, span_name="tool_Node")
+    second_node_call = _get_start_span_call(trace_instance.tracer.start_span, span_name="llm_Node")
+    assert first_node_call.kwargs["context"] == "context:workflow"
+    assert second_node_call.kwargs["context"] == "context:node-1"
+
+
+@pytest.mark.parametrize(
+    ("enclosing_node_type", "structured_field"),
+    [
+        ("loop", "loop_id"),
+        ("iteration", "iteration_id"),
+    ],
+)
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.db")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.DifyCoreRepositoryFactory")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.sessionmaker")
+def test_workflow_trace_parents_structured_start_nodes_to_enclosing_structure_span(
+    mock_sessionmaker,
+    mock_repo_factory,
+    mock_db,
+    trace_instance,
+    enclosing_node_type,
+    structured_field,
+):
+    mock_db.engine = MagicMock()
+    info = _make_workflow_info()
+    repo = MagicMock()
+    enclosing_node = _make_node_execution(
+        id=f"{enclosing_node_type}-execution-1",
+        node_execution_id=f"{enclosing_node_type}-execution-1",
+        node_id=f"{enclosing_node_type}-node-1",
+        node_type=enclosing_node_type,
+    )
+    structured_kwargs = {structured_field: f"{enclosing_node_type}-node-1"}
+    start_node = _make_node_execution(
+        id="start-execution-1",
+        node_execution_id="start-execution-1",
+        node_id="start-node-1",
+        node_type="start",
+        **structured_kwargs,
+    )
+    repo.get_by_workflow_execution.return_value = [start_node, enclosing_node]
+    mock_repo_factory.create_workflow_node_execution_repository.return_value = repo
+
+    workflow_span = MagicMock(name="workflow-span")
+    workflow_span._context_label = "workflow"
+    enclosing_node_span = MagicMock(name="enclosing-node-span")
+    enclosing_node_span._context_label = enclosing_node_type
+    start_node_span = MagicMock(name="start-node-span")
+    start_node_span._context_label = "start"
+    trace_instance.tracer.start_span.side_effect = [workflow_span, enclosing_node_span, start_node_span]
+
+    with (
+        patch.object(trace_instance, "get_service_account_with_tenant", return_value=MagicMock()),
+        patch.object(trace_instance, "ensure_root_span", return_value={}),
+        patch.object(trace_instance.propagator, "extract", return_value="root-context"),
+        patch(
+            "dify_trace_arize_phoenix.arize_phoenix_trace.set_span_in_context",
+            side_effect=lambda span: f"context:{span._context_label}",
+        ),
+    ):
+        trace_instance.workflow_trace(info)
+
+    start_node_call = _get_start_span_call(trace_instance.tracer.start_span, span_name="start_Node")
+    assert start_node_call.kwargs["context"] == f"context:{enclosing_node_type}"
+
+
+@pytest.mark.parametrize(
+    ("enclosing_node_type", "structured_field"),
+    [
+        ("loop", "loop_id"),
+        ("iteration", "iteration_id"),
+    ],
+)
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.db")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.DifyCoreRepositoryFactory")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.sessionmaker")
+def test_workflow_trace_keeps_duplicate_body_node_children_under_enclosing_structure(
+    mock_sessionmaker,
+    mock_repo_factory,
+    mock_db,
+    trace_instance,
+    enclosing_node_type,
+    structured_field,
+):
+    mock_db.engine = MagicMock()
+    info = _make_workflow_info()
+    repo = MagicMock()
+    enclosing_node = _make_node_execution(
+        id=f"{enclosing_node_type}-execution-1",
+        node_execution_id=f"{enclosing_node_type}-execution-1",
+        node_id=f"{enclosing_node_type}-node-1",
+        node_type=enclosing_node_type,
+    )
+    structured_kwargs = {structured_field: f"{enclosing_node_type}-node-1"}
+    repeated_body_node_1 = _make_node_execution(
+        id="body-execution-1",
+        node_execution_id="body-execution-1",
+        node_id="body-node-1",
+        node_type="tool",
+        **structured_kwargs,
+    )
+    repeated_body_node_2 = _make_node_execution(
+        id="body-execution-2",
+        node_execution_id="body-execution-2",
+        node_id="body-node-1",
+        node_type="tool",
+        **structured_kwargs,
+    )
+    child_node = _make_node_execution(
+        id="child-execution-1",
+        node_execution_id="child-execution-1",
+        node_id="child-node-1",
+        node_type="llm",
+        predecessor_node_id="body-node-1",
+        process_data={
+            "prompts": [{"role": "user", "content": "hi"}],
+            "model_provider": "openai",
+            "model_name": "gpt-4",
+        },
+        **structured_kwargs,
+    )
+    repo.get_by_workflow_execution.return_value = [
+        child_node,
+        repeated_body_node_1,
+        repeated_body_node_2,
+        enclosing_node,
+    ]
+    mock_repo_factory.create_workflow_node_execution_repository.return_value = repo
+
+    workflow_span = MagicMock(name="workflow-span")
+    workflow_span._context_label = "workflow"
+    enclosing_node_span = MagicMock(name="enclosing-node-span")
+    enclosing_node_span._context_label = enclosing_node_type
+    child_node_span = MagicMock(name="child-node-span")
+    child_node_span._context_label = "child"
+    repeated_body_node_1_span = MagicMock(name="repeated-body-node-1-span")
+    repeated_body_node_1_span._context_label = "body-1"
+    repeated_body_node_2_span = MagicMock(name="repeated-body-node-2-span")
+    repeated_body_node_2_span._context_label = "body-2"
+    trace_instance.tracer.start_span.side_effect = [
+        workflow_span,
+        enclosing_node_span,
+        child_node_span,
+        repeated_body_node_1_span,
+        repeated_body_node_2_span,
+    ]
+
+    with (
+        patch.object(trace_instance, "get_service_account_with_tenant", return_value=MagicMock()),
+        patch.object(trace_instance, "ensure_root_span", return_value={}),
+        patch.object(trace_instance.propagator, "extract", return_value="root-context"),
+        patch(
+            "dify_trace_arize_phoenix.arize_phoenix_trace.set_span_in_context",
+            side_effect=lambda span: f"context:{span._context_label}",
+        ),
+    ):
+        trace_instance.workflow_trace(info)
+
+    child_node_call = _get_start_span_call(trace_instance.tracer.start_span, span_name="llm_Node")
+    assert child_node_call.kwargs["context"] == f"context:{enclosing_node_type}"
+
+
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.db")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.DifyCoreRepositoryFactory")
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.sessionmaker")
+def test_workflow_trace_falls_back_to_workflow_span_for_parallel_like_ambiguous_predecessors(
+    mock_sessionmaker, mock_repo_factory, mock_db, trace_instance
+):
+    mock_db.engine = MagicMock()
+    info = _make_workflow_info()
+    repo = MagicMock()
+    child_node = _make_node_execution(
+        id="child-execution-1",
+        node_execution_id="child-execution-1",
+        node_id="child-node-1",
+        node_type="llm",
+        predecessor_node_id="parallel-node-1",
+        process_data={
+            "prompts": [{"role": "user", "content": "hi"}],
+            "model_provider": "openai",
+            "model_name": "gpt-4",
+        },
+    )
+    first_parallel_node = _make_node_execution(
+        id="parallel-execution-1",
+        node_execution_id="parallel-execution-1",
+        node_id="parallel-node-1",
+        node_type="tool",
+        parallel_id="parallel-1",
+    )
+    second_parallel_node = _make_node_execution(
+        id="parallel-execution-2",
+        node_execution_id="parallel-execution-2",
+        node_id="parallel-node-1",
+        node_type="tool",
+        parallel_id="parallel-2",
+    )
+    repo.get_by_workflow_execution.return_value = [child_node, first_parallel_node, second_parallel_node]
+    mock_repo_factory.create_workflow_node_execution_repository.return_value = repo
+
+    workflow_span = MagicMock(name="workflow-span")
+    workflow_span._context_label = "workflow"
+    child_node_span = MagicMock(name="child-node-span")
+    child_node_span._context_label = "child"
+    first_parallel_node_span = MagicMock(name="first-parallel-node-span")
+    first_parallel_node_span._context_label = "parallel-1"
+    second_parallel_node_span = MagicMock(name="second-parallel-node-span")
+    second_parallel_node_span._context_label = "parallel-2"
+    trace_instance.tracer.start_span.side_effect = [
+        workflow_span,
+        child_node_span,
+        first_parallel_node_span,
+        second_parallel_node_span,
+    ]
+
+    with (
+        patch.object(trace_instance, "get_service_account_with_tenant", return_value=MagicMock()),
+        patch.object(trace_instance, "ensure_root_span", return_value={}),
+        patch.object(trace_instance.propagator, "extract", return_value="root-context"),
+        patch(
+            "dify_trace_arize_phoenix.arize_phoenix_trace.set_span_in_context",
+            side_effect=lambda span: f"context:{span._context_label}",
+        ),
+    ):
+        trace_instance.workflow_trace(info)
+
+    child_node_call = _get_start_span_call(trace_instance.tracer.start_span, span_name="llm_Node")
+    assert child_node_call.kwargs["context"] == "context:workflow"
+
+
+@patch("dify_trace_arize_phoenix.arize_phoenix_trace.db")
+def test_message_trace_keeps_conversation_id_as_session(mock_db, trace_instance):
     mock_db.engine = MagicMock()
     info = _make_message_info()
     info.message_data = MagicMock()
-    info.message_data.from_account_id = "acc1"
+    info.message_data.conversation_id = "conversation-2"
+    info.message_data.from_account_id = "acc2"
     info.message_data.from_end_user_id = None
-    info.message_data.query = "q"
-    info.message_data.answer = "a"
-    info.message_data.status = "s"
-    info.message_data.model_id = "m"
-    info.message_data.model_provider = "p"
+    info.message_data.query = "q2"
+    info.message_data.answer = "a2"
+    info.message_data.status = "s2"
+    info.message_data.model_id = "m2"
+    info.message_data.model_provider = "p2"
     info.message_data.message_metadata = "{}"
     info.message_data.error = None
     info.error = None
 
+    root_span = MagicMock()
+    message_span = MagicMock()
+    llm_span = MagicMock()
+    trace_instance.tracer.start_span.side_effect = [root_span, message_span, llm_span]
+
     trace_instance.message_trace(info)
-    assert trace_instance.tracer.start_span.call_count >= 1
+
+    message_span_call = _get_start_span_call(
+        trace_instance.tracer.start_span, span_name=TraceTaskName.MESSAGE_TRACE.value
+    )
+    assert message_span_call.kwargs["attributes"][SpanAttributes.SESSION_ID] == "conversation-2"
 
 
 @patch("dify_trace_arize_phoenix.arize_phoenix_trace.db")
@@ -397,3 +1715,63 @@ def test_api_check_success(trace_instance):
 def test_ensure_root_span_basic(trace_instance):
     trace_instance.ensure_root_span("tid")
     assert "tid" in trace_instance.dify_trace_ids
+
+
+def test_ensure_root_span_ignores_unsampled_ambient_otel_parent():
+    exporter = _CollectingSpanExporter()
+    provider = trace_sdk.TracerProvider()
+    provider.add_span_processor(SimpleSpanProcessor(exporter))
+    trace_instance = ArizePhoenixDataTrace.__new__(ArizePhoenixDataTrace)
+    trace_instance.tracer = cast(Tracer, provider.get_tracer("test-phoenix-root-span"))
+    trace_instance.propagator = TraceContextTextMapPropagator()
+    trace_instance.project = "p"
+    trace_instance.dify_trace_ids = set()
+    trace_instance.root_span_carriers = {}
+    trace_instance.carrier = {}
+
+    ambient_span_context = SpanContext(
+        trace_id=0x11111111111111111111111111111111,
+        span_id=0x2222222222222222,
+        is_remote=True,
+        trace_flags=TraceFlags(0),
+        trace_state=TraceState(),
+    )
+
+    with use_span(NonRecordingSpan(ambient_span_context), end_on_exit=False):
+        carrier = trace_instance.ensure_root_span("tid")
+
+    assert len(exporter.spans) == 1
+    root_span = exporter.spans[0]
+    root_span_context = root_span.get_span_context()
+    assert root_span_context is not None
+    assert root_span.parent is None
+    assert root_span_context.trace_id != ambient_span_context.trace_id
+    assert carrier["traceparent"].split("-")[1] == f"{root_span_context.trace_id:032x}"
+
+
+def test_ensure_root_span_uses_custom_name_and_attributes(trace_instance):
+    root_attributes = {
+        SpanAttributes.INPUT_VALUE: '{"input":"value"}',
+        SpanAttributes.OUTPUT_VALUE: '{"output":"value"}',
+    }
+
+    trace_instance.ensure_root_span("tid", root_span_name="Workflow Name", root_span_attributes=root_attributes)
+
+    trace_instance.tracer.start_span.assert_called_once_with(
+        name="Workflow Name",
+        attributes={
+            SpanAttributes.OPENINFERENCE_SPAN_KIND: "CHAIN",
+            "dify_project_name": "p",
+            "dify_trace_id": "tid",
+            SpanAttributes.INPUT_VALUE: '{"input":"value"}',
+            SpanAttributes.OUTPUT_VALUE: '{"output":"value"}',
+        },
+        context=Context(),
+    )
+
+
+def test_ensure_root_span_falls_back_to_dify_name_when_custom_name_is_blank(trace_instance):
+    trace_instance.ensure_root_span("tid", root_span_name=" ")
+
+    trace_instance.tracer.start_span.assert_called_once()
+    assert trace_instance.tracer.start_span.call_args.kwargs["name"] == "Dify"
diff --git a/api/providers/trace/trace-arize-phoenix/tests/unit_tests/test_arize_phoenix_trace.py b/api/providers/trace/trace-arize-phoenix/tests/unit_tests/test_arize_phoenix_trace.py
deleted file mode 100644
index a01c63ae61..0000000000
--- a/api/providers/trace/trace-arize-phoenix/tests/unit_tests/test_arize_phoenix_trace.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from dify_trace_arize_phoenix.arize_phoenix_trace import _NODE_TYPE_TO_SPAN_KIND, _get_node_span_kind
-from openinference.semconv.trace import OpenInferenceSpanKindValues
-
-from graphon.enums import BUILT_IN_NODE_TYPES, BuiltinNodeTypes
-
-
-class TestGetNodeSpanKind:
-    """Tests for _get_node_span_kind helper."""
-
-    def test_all_node_types_are_mapped_correctly(self):
-        """Ensure every built-in node type is mapped to the correct span kind."""
-        # Mappings for node types that have a specialised span kind.
-        special_mappings = {
-            BuiltinNodeTypes.LLM: OpenInferenceSpanKindValues.LLM,
-            BuiltinNodeTypes.KNOWLEDGE_RETRIEVAL: OpenInferenceSpanKindValues.RETRIEVER,
-            BuiltinNodeTypes.TOOL: OpenInferenceSpanKindValues.TOOL,
-            BuiltinNodeTypes.AGENT: OpenInferenceSpanKindValues.AGENT,
-        }
-
-        # Test that every built-in node type is mapped to the correct span kind.
-        # Node types not in `special_mappings` should default to CHAIN.
-        for node_type in BUILT_IN_NODE_TYPES:
-            expected_span_kind = special_mappings.get(node_type, OpenInferenceSpanKindValues.CHAIN)
-            actual_span_kind = _get_node_span_kind(node_type)
-            assert actual_span_kind == expected_span_kind, (
-                f"Node type {node_type!r} was mapped to {actual_span_kind}, but {expected_span_kind} was expected."
-            )
-
-    def test_unknown_string_defaults_to_chain(self):
-        """An unrecognised node type string should still return CHAIN."""
-        assert _get_node_span_kind("some-future-node-type") == OpenInferenceSpanKindValues.CHAIN
-
-    def test_stale_dataset_retrieval_not_in_mapping(self):
-        """The old 'dataset_retrieval' string was never a valid NodeType value;
-        make sure it is not present in the mapping dictionary."""
-        assert "dataset_retrieval" not in _NODE_TYPE_TO_SPAN_KIND
diff --git a/api/providers/trace/trace-langfuse/src/dify_trace_langfuse/langfuse_trace.py b/api/providers/trace/trace-langfuse/src/dify_trace_langfuse/langfuse_trace.py
index 68881378a7..9b19b1100c 100644
--- a/api/providers/trace/trace-langfuse/src/dify_trace_langfuse/langfuse_trace.py
+++ b/api/providers/trace/trace-langfuse/src/dify_trace_langfuse/langfuse_trace.py
@@ -13,6 +13,8 @@ from langfuse.api import (
     TraceBody,
 )
 from langfuse.api.commons.types.usage import Usage
+from opentelemetry.sdk.resources import Resource
+from opentelemetry.sdk.trace import TracerProvider
 from sqlalchemy.orm import sessionmaker
 
 from core.ops.base_trace_instance import BaseTraceInstance
@@ -52,13 +54,40 @@ class LangFuseDataTrace(BaseTraceInstance):
         langfuse_config: LangfuseConfig,
     ):
         super().__init__(langfuse_config)
+        # Isolated TracerProvider prevents the langfuse v3 SDK from attaching its
+        # SpanProcessor to the global OpenTelemetry TracerProvider, which would
+        # otherwise siphon every Flask/Celery/SQLAlchemy span in the process into
+        # this tenant's Langfuse project. See langfuse upgrade guide v2 -> v3.
+        self._tracer_provider: TracerProvider | None = TracerProvider(
+            resource=Resource.create({"service.name": "dify-langfuse-app-trace"}),
+        )
         self.langfuse_client = Langfuse(
             public_key=langfuse_config.public_key,
             secret_key=langfuse_config.secret_key,
             host=langfuse_config.host,
+            tracer_provider=self._tracer_provider,
         )
         self.file_base_url = os.getenv("FILES_URL", "http://127.0.0.1:5001")
 
+    def close(self) -> None:
+        """Flush and shut down the isolated TracerProvider.
+
+        Called explicitly when the trace instance is evicted from the cache, or
+        implicitly via ``__del__`` on garbage collection. Idempotent.
+        """
+        provider = getattr(self, "_tracer_provider", None)
+        if provider is None:
+            return
+        try:
+            provider.shutdown()
+        except Exception:
+            logger.debug("Failed to shut down Langfuse TracerProvider", exc_info=True)
+        finally:
+            self._tracer_provider = None
+
+    def __del__(self) -> None:
+        self.close()
+
     @staticmethod
     def _get_completion_start_time(
         start_time: datetime | None, time_to_first_token: float | int | None
diff --git a/api/providers/trace/trace-langfuse/tests/unit_tests/langfuse_trace/test_langfuse_trace.py b/api/providers/trace/trace-langfuse/tests/unit_tests/langfuse_trace/test_langfuse_trace.py
index 952f10c34f..0580051f54 100644
--- a/api/providers/trace/trace-langfuse/tests/unit_tests/langfuse_trace/test_langfuse_trace.py
+++ b/api/providers/trace/trace-langfuse/tests/unit_tests/langfuse_trace/test_langfuse_trace.py
@@ -40,7 +40,7 @@ def langfuse_config():
 
 
 @pytest.fixture
-def trace_instance(langfuse_config, monkeypatch):
+def trace_instance(langfuse_config, monkeypatch: pytest.MonkeyPatch):
     # Mock Langfuse client to avoid network calls
     mock_client = MagicMock()
     monkeypatch.setattr("dify_trace_langfuse.langfuse_trace.Langfuse", lambda **kwargs: mock_client)
@@ -49,22 +49,94 @@ def trace_instance(langfuse_config, monkeypatch):
     return instance
 
 
-def test_init(langfuse_config, monkeypatch):
+def test_init(langfuse_config, monkeypatch: pytest.MonkeyPatch):
+    from opentelemetry.sdk.trace import TracerProvider
+
     mock_langfuse = MagicMock()
     monkeypatch.setattr("dify_trace_langfuse.langfuse_trace.Langfuse", mock_langfuse)
     monkeypatch.setenv("FILES_URL", "http://test.url")
 
     instance = LangFuseDataTrace(langfuse_config)
 
-    mock_langfuse.assert_called_once_with(
-        public_key=langfuse_config.public_key,
-        secret_key=langfuse_config.secret_key,
-        host=langfuse_config.host,
-    )
+    mock_langfuse.assert_called_once()
+    kwargs = mock_langfuse.call_args.kwargs
+    assert kwargs["public_key"] == langfuse_config.public_key
+    assert kwargs["secret_key"] == langfuse_config.secret_key
+    assert kwargs["host"] == langfuse_config.host
+    assert isinstance(kwargs["tracer_provider"], TracerProvider)
+    assert kwargs["tracer_provider"] is instance._tracer_provider
     assert instance.file_base_url == "http://test.url"
 
 
-def test_trace_dispatch(trace_instance, monkeypatch):
+def test_init_passes_isolated_tracer_provider_to_langfuse(langfuse_config, monkeypatch: pytest.MonkeyPatch):
+    """Regression test for langfuse v3 SDK side effect.
+
+    Without an explicit ``tracer_provider=`` kwarg, the Langfuse v3 SDK
+    attaches a ``LangfuseSpanProcessor`` to the *global* OpenTelemetry
+    TracerProvider — siphoning every Flask / Celery / SQLAlchemy span in the
+    process into the tenant's Langfuse project. See langfuse upgrade-path
+    docs (v2 -> v3) and GitHub discussion #9136.
+
+    The fix is to construct an isolated ``TracerProvider`` and pass it via
+    ``tracer_provider=`` so the SDK never touches the global one.
+    """
+    from opentelemetry import trace as otel_trace_api
+    from opentelemetry.sdk.trace import TracerProvider
+
+    captured: dict[str, object] = {}
+
+    def fake_langfuse(**kwargs):
+        captured.update(kwargs)
+        return MagicMock()
+
+    monkeypatch.setattr("dify_trace_langfuse.langfuse_trace.Langfuse", fake_langfuse)
+
+    instance = LangFuseDataTrace(langfuse_config)
+
+    # 1. tracer_provider kwarg must be supplied (drives the no-pollution branch
+    #    in langfuse.LangfuseResourceManager._init_tracer_provider).
+    assert "tracer_provider" in captured, (
+        "Langfuse() must receive an explicit tracer_provider=; without it the "
+        "v3 SDK attaches its SpanProcessor to the global OTEL TracerProvider."
+    )
+
+    passed_provider = captured["tracer_provider"]
+    assert isinstance(passed_provider, TracerProvider)
+    assert passed_provider is instance._tracer_provider
+
+    # 2. The instance's provider must not be the global one.
+    global_provider = otel_trace_api.get_tracer_provider()
+    assert passed_provider is not global_provider
+
+
+def test_close_shuts_down_tracer_provider(langfuse_config, monkeypatch: pytest.MonkeyPatch):
+    monkeypatch.setattr("dify_trace_langfuse.langfuse_trace.Langfuse", lambda **kwargs: MagicMock())
+
+    instance = LangFuseDataTrace(langfuse_config)
+    provider = instance._tracer_provider
+    provider_shutdown = MagicMock()
+    monkeypatch.setattr(provider, "shutdown", provider_shutdown)
+
+    instance.close()
+
+    provider_shutdown.assert_called_once()
+    assert instance._tracer_provider is None
+
+
+def test_close_is_idempotent(langfuse_config, monkeypatch: pytest.MonkeyPatch):
+    monkeypatch.setattr("dify_trace_langfuse.langfuse_trace.Langfuse", lambda **kwargs: MagicMock())
+
+    instance = LangFuseDataTrace(langfuse_config)
+    provider_shutdown = MagicMock()
+    monkeypatch.setattr(instance._tracer_provider, "shutdown", provider_shutdown)
+
+    instance.close()
+    instance.close()
+
+    provider_shutdown.assert_called_once()
+
+
+def test_trace_dispatch(trace_instance, monkeypatch: pytest.MonkeyPatch):
     methods = [
         "workflow_trace",
         "message_trace",
@@ -114,7 +186,7 @@ def test_trace_dispatch(trace_instance, monkeypatch):
     mocks["generate_name_trace"].assert_called_once_with(info)
 
 
-def test_workflow_trace_with_message_id(trace_instance, monkeypatch):
+def test_workflow_trace_with_message_id(trace_instance, monkeypatch: pytest.MonkeyPatch):
     # Setup trace info
     trace_info = WorkflowTraceInfo(
         workflow_id="wf-1",
@@ -218,7 +290,7 @@ def test_workflow_trace_with_message_id(trace_instance, monkeypatch):
     assert other_span.level == LevelEnum.ERROR
 
 
-def test_workflow_trace_no_message_id(trace_instance, monkeypatch):
+def test_workflow_trace_no_message_id(trace_instance, monkeypatch: pytest.MonkeyPatch):
     trace_info = WorkflowTraceInfo(
         workflow_id="wf-1",
         tenant_id="tenant-1",
@@ -259,7 +331,7 @@ def test_workflow_trace_no_message_id(trace_instance, monkeypatch):
     assert trace_data.name == TraceTaskName.WORKFLOW_TRACE
 
 
-def test_workflow_trace_missing_app_id(trace_instance, monkeypatch):
+def test_workflow_trace_missing_app_id(trace_instance, monkeypatch: pytest.MonkeyPatch):
     trace_info = WorkflowTraceInfo(
         workflow_id="wf-1",
         tenant_id="tenant-1",
@@ -287,7 +359,7 @@ def test_workflow_trace_missing_app_id(trace_instance, monkeypatch):
         trace_instance.workflow_trace(trace_info)
 
 
-def test_message_trace_basic(trace_instance, monkeypatch):
+def test_message_trace_basic(trace_instance, monkeypatch: pytest.MonkeyPatch):
     message_data = MagicMock()
     message_data.id = "msg-1"
     message_data.from_account_id = "acc-1"
@@ -331,7 +403,7 @@ def test_message_trace_basic(trace_instance, monkeypatch):
     assert gen_data.usage.total == 30
 
 
-def test_message_trace_with_end_user(trace_instance, monkeypatch):
+def test_message_trace_with_end_user(trace_instance, monkeypatch: pytest.MonkeyPatch):
     message_data = MagicMock()
     message_data.id = "msg-1"
     message_data.from_account_id = "acc-1"
@@ -636,7 +708,7 @@ def test_langfuse_trace_entity_with_list_dict_input():
     assert data.input[0]["content"] == "hello"
 
 
-def test_workflow_trace_handles_usage_extraction_error(trace_instance, monkeypatch, caplog):
+def test_workflow_trace_handles_usage_extraction_error(trace_instance, monkeypatch: pytest.MonkeyPatch, caplog):
     # Setup trace info to trigger LLM node usage extraction
     trace_info = WorkflowTraceInfo(
         workflow_id="wf-1",
diff --git a/api/providers/trace/trace-langsmith/src/dify_trace_langsmith/entities/langsmith_trace_entity.py b/api/providers/trace/trace-langsmith/src/dify_trace_langsmith/entities/langsmith_trace_entity.py
index f73ba01c8b..be9d64ae01 100644
--- a/api/providers/trace/trace-langsmith/src/dify_trace_langsmith/entities/langsmith_trace_entity.py
+++ b/api/providers/trace/trace-langsmith/src/dify_trace_langsmith/entities/langsmith_trace_entity.py
@@ -65,35 +65,18 @@ class LangSmithRunModel(LangSmithTokenUsage, LangSmithMultiModel):
         }
         file_list = values.get("file_list", [])
         if isinstance(v, str):
-            if field_name == "inputs":
-                return {
-                    "messages": {
-                        "role": "user",
-                        "content": v,
-                        "usage_metadata": usage_metadata,
-                        "file_list": file_list,
-                    },
-                }
-            elif field_name == "outputs":
-                return {
-                    "choices": {
-                        "role": "ai",
-                        "content": v,
-                        "usage_metadata": usage_metadata,
-                        "file_list": file_list,
-                    },
-                }
-        elif isinstance(v, list):
-            data = {}
-            if len(v) > 0 and isinstance(v[0], dict):
-                # rename text to content
-                v = replace_text_with_content(data=v)
-                if field_name == "inputs":
-                    data = {
-                        "messages": v,
+            match field_name:
+                case "inputs":
+                    return {
+                        "messages": {
+                            "role": "user",
+                            "content": v,
+                            "usage_metadata": usage_metadata,
+                            "file_list": file_list,
+                        },
                     }
-                elif field_name == "outputs":
-                    data = {
+                case "outputs":
+                    return {
                         "choices": {
                             "role": "ai",
                             "content": v,
@@ -101,6 +84,29 @@ class LangSmithRunModel(LangSmithTokenUsage, LangSmithMultiModel):
                             "file_list": file_list,
                         },
                     }
+                case _:
+                    pass
+        elif isinstance(v, list):
+            data = {}
+            if len(v) > 0 and isinstance(v[0], dict):
+                # rename text to content
+                v = replace_text_with_content(data=v)
+                match field_name:
+                    case "inputs":
+                        data = {
+                            "messages": v,
+                        }
+                    case "outputs":
+                        data = {
+                            "choices": {
+                                "role": "ai",
+                                "content": v,
+                                "usage_metadata": usage_metadata,
+                                "file_list": file_list,
+                            },
+                        }
+                    case _:
+                        pass
                 return data
             else:
                 return {
diff --git a/api/providers/trace/trace-langsmith/src/dify_trace_langsmith/langsmith_trace.py b/api/providers/trace/trace-langsmith/src/dify_trace_langsmith/langsmith_trace.py
index 145bd70dbc..045ec44e4e 100644
--- a/api/providers/trace/trace-langsmith/src/dify_trace_langsmith/langsmith_trace.py
+++ b/api/providers/trace/trace-langsmith/src/dify_trace_langsmith/langsmith_trace.py
@@ -64,7 +64,9 @@ class LangSmithDataTrace(BaseTraceInstance):
             self.generate_name_trace(trace_info)
 
     def workflow_trace(self, trace_info: WorkflowTraceInfo):
-        trace_id = trace_info.trace_id or trace_info.message_id or trace_info.workflow_run_id
+        # trace_id must equal the root run's run_id (LangSmith protocol); external trace_id
+        # cannot be used here as it would cause HTTP 400.
+        trace_id = trace_info.message_id or trace_info.workflow_run_id
         if trace_info.start_time is None:
             trace_info.start_time = datetime.now()
         message_dotted_order = (
@@ -77,6 +79,8 @@ class LangSmithDataTrace(BaseTraceInstance):
         )
         metadata = trace_info.metadata
         metadata["workflow_app_log_id"] = trace_info.workflow_app_log_id
+        if trace_info.trace_id:
+            metadata["external_trace_id"] = trace_info.trace_id
 
         if trace_info.message_id:
             message_run = LangSmithRunModel(
diff --git a/api/providers/trace/trace-langsmith/tests/unit_tests/langsmith_trace/test_langsmith_trace.py b/api/providers/trace/trace-langsmith/tests/unit_tests/langsmith_trace/test_langsmith_trace.py
index 45e5894e4a..edc4aafd87 100644
--- a/api/providers/trace/trace-langsmith/tests/unit_tests/langsmith_trace/test_langsmith_trace.py
+++ b/api/providers/trace/trace-langsmith/tests/unit_tests/langsmith_trace/test_langsmith_trace.py
@@ -35,7 +35,7 @@ def langsmith_config():
 
 
 @pytest.fixture
-def trace_instance(langsmith_config, monkeypatch):
+def trace_instance(langsmith_config, monkeypatch: pytest.MonkeyPatch):
     # Mock LangSmith client
     mock_client = MagicMock()
     monkeypatch.setattr("dify_trace_langsmith.langsmith_trace.Client", lambda **kwargs: mock_client)
@@ -44,7 +44,7 @@ def trace_instance(langsmith_config, monkeypatch):
     return instance
 
 
-def test_init(langsmith_config, monkeypatch):
+def test_init(langsmith_config, monkeypatch: pytest.MonkeyPatch):
     mock_client_class = MagicMock()
     monkeypatch.setattr("dify_trace_langsmith.langsmith_trace.Client", mock_client_class)
     monkeypatch.setenv("FILES_URL", "http://test.url")
@@ -57,7 +57,7 @@ def test_init(langsmith_config, monkeypatch):
     assert instance.file_base_url == "http://test.url"
 
 
-def test_trace_dispatch(trace_instance, monkeypatch):
+def test_trace_dispatch(trace_instance, monkeypatch: pytest.MonkeyPatch):
     methods = [
         "workflow_trace",
         "message_trace",
@@ -107,7 +107,7 @@ def test_trace_dispatch(trace_instance, monkeypatch):
     mocks["generate_name_trace"].assert_called_once_with(info)
 
 
-def test_workflow_trace(trace_instance, monkeypatch):
+def test_workflow_trace(trace_instance, monkeypatch: pytest.MonkeyPatch):
     # Setup trace info
     workflow_data = MagicMock()
     workflow_data.created_at = _dt()
@@ -208,13 +208,17 @@ def test_workflow_trace(trace_instance, monkeypatch):
 
     assert call_args[0].id == "msg-1"
     assert call_args[0].name == TraceTaskName.MESSAGE_TRACE
+    # trace_id must equal root run's id (message_id), not the external trace_id "trace-1"
+    assert call_args[0].trace_id == "msg-1"
 
     assert call_args[1].id == "run-1"
     assert call_args[1].name == TraceTaskName.WORKFLOW_TRACE
     assert call_args[1].parent_run_id == "msg-1"
+    assert call_args[1].trace_id == "msg-1"
 
     assert call_args[2].id == "node-llm"
     assert call_args[2].run_type == LangSmithRunType.llm
+    assert call_args[2].trace_id == "msg-1"
 
     assert call_args[3].id == "node-other"
     assert call_args[3].run_type == LangSmithRunType.tool
@@ -223,7 +227,7 @@ def test_workflow_trace(trace_instance, monkeypatch):
     assert call_args[4].run_type == LangSmithRunType.retriever
 
 
-def test_workflow_trace_no_start_time(trace_instance, monkeypatch):
+def test_workflow_trace_no_start_time(trace_instance, monkeypatch: pytest.MonkeyPatch):
     workflow_data = MagicMock()
     workflow_data.created_at = _dt()
     workflow_data.finished_at = _dt() + timedelta(seconds=1)
@@ -266,7 +270,7 @@ def test_workflow_trace_no_start_time(trace_instance, monkeypatch):
     assert trace_instance.add_run.called
 
 
-def test_workflow_trace_missing_app_id(trace_instance, monkeypatch):
+def test_workflow_trace_missing_app_id(trace_instance, monkeypatch: pytest.MonkeyPatch):
     trace_info = MagicMock(spec=WorkflowTraceInfo)
     trace_info.trace_id = "trace-1"
     trace_info.message_id = None
@@ -290,7 +294,7 @@ def test_workflow_trace_missing_app_id(trace_instance, monkeypatch):
         trace_instance.workflow_trace(trace_info)
 
 
-def test_message_trace(trace_instance, monkeypatch):
+def test_message_trace(trace_instance, monkeypatch: pytest.MonkeyPatch):
     message_data = MagicMock()
     message_data.id = "msg-1"
     message_data.from_account_id = "acc-1"
@@ -516,7 +520,7 @@ def test_update_run_error(trace_instance):
         trace_instance.update_run(update_data)
 
 
-def test_workflow_trace_usage_extraction_error(trace_instance, monkeypatch, caplog):
+def test_workflow_trace_usage_extraction_error(trace_instance, monkeypatch: pytest.MonkeyPatch, caplog):
     workflow_data = MagicMock()
     workflow_data.created_at = _dt()
     workflow_data.finished_at = _dt() + timedelta(seconds=1)
@@ -604,3 +608,83 @@ def test_get_project_url_error(trace_instance):
     trace_instance.langsmith_client.get_run_url.side_effect = Exception("error")
     with pytest.raises(ValueError, match="LangSmith get run url failed: error"):
         trace_instance.get_project_url()
+
+
+def _make_workflow_trace_info(
+    *, message_id: str | None, workflow_run_id: str, trace_id: str | None
+) -> WorkflowTraceInfo:
+    workflow_data = MagicMock()
+    workflow_data.created_at = _dt()
+    workflow_data.finished_at = _dt() + timedelta(seconds=1)
+    return WorkflowTraceInfo(
+        tenant_id="tenant-1",
+        workflow_id="wf-1",
+        workflow_run_id=workflow_run_id,
+        workflow_run_inputs={},
+        workflow_run_outputs={},
+        workflow_run_status="succeeded",
+        workflow_run_version="1.0",
+        workflow_run_elapsed_time=1.0,
+        total_tokens=0,
+        file_list=[],
+        query="q",
+        message_id=message_id,
+        conversation_id="conv-1" if message_id else None,
+        start_time=_dt(),
+        end_time=_dt() + timedelta(seconds=1),
+        trace_id=trace_id,
+        metadata={"app_id": "app-1"},
+        workflow_app_log_id=None,
+        error=None,
+        workflow_data=workflow_data,
+    )
+
+
+def _patch_workflow_trace_deps(monkeypatch, trace_instance):
+    monkeypatch.setattr("dify_trace_langsmith.langsmith_trace.sessionmaker", lambda bind: lambda: MagicMock())
+    monkeypatch.setattr("dify_trace_langsmith.langsmith_trace.db", MagicMock(engine="engine"))
+    repo = MagicMock()
+    repo.get_by_workflow_execution.return_value = []
+    factory = MagicMock()
+    factory.create_workflow_node_execution_repository.return_value = repo
+    monkeypatch.setattr("dify_trace_langsmith.langsmith_trace.DifyCoreRepositoryFactory", factory)
+    monkeypatch.setattr(trace_instance, "get_service_account_with_tenant", lambda app_id: MagicMock())
+    trace_instance.add_run = MagicMock()
+
+
+def test_workflow_trace_id_uses_message_id_not_external(trace_instance, monkeypatch):
+    """Chatflow with external trace_id: LangSmith trace_id must be message_id, not external."""
+    trace_info = _make_workflow_trace_info(
+        message_id="msg-abc",
+        workflow_run_id="run-xyz",
+        trace_id="external-999",
+    )
+    _patch_workflow_trace_deps(monkeypatch, trace_instance)
+
+    trace_instance.workflow_trace(trace_info)
+
+    calls = [c[0][0] for c in trace_instance.add_run.call_args_list]
+    # message run (root) and workflow run (child) must both use message_id as trace_id
+    assert calls[0].id == "msg-abc"
+    assert calls[0].trace_id == "msg-abc"
+    assert calls[1].id == "run-xyz"
+    assert calls[1].trace_id == "msg-abc"
+    # external_trace_id preserved in metadata
+    assert trace_info.metadata.get("external_trace_id") == "external-999"
+
+
+def test_workflow_trace_id_pure_workflow_uses_run_id(trace_instance, monkeypatch):
+    """Pure workflow (no message_id) with external trace_id: trace_id must be workflow_run_id."""
+    trace_info = _make_workflow_trace_info(
+        message_id=None,
+        workflow_run_id="run-xyz",
+        trace_id="external-999",
+    )
+    _patch_workflow_trace_deps(monkeypatch, trace_instance)
+
+    trace_instance.workflow_trace(trace_info)
+
+    calls = [c[0][0] for c in trace_instance.add_run.call_args_list]
+    # workflow run is the root; trace_id must equal its run_id
+    assert calls[0].id == "run-xyz"
+    assert calls[0].trace_id == "run-xyz"
diff --git a/api/providers/trace/trace-mlflow/src/dify_trace_mlflow/mlflow_trace.py b/api/providers/trace/trace-mlflow/src/dify_trace_mlflow/mlflow_trace.py
index 4e4c45a532..e36b3dee40 100644
--- a/api/providers/trace/trace-mlflow/src/dify_trace_mlflow/mlflow_trace.py
+++ b/api/providers/trace/trace-mlflow/src/dify_trace_mlflow/mlflow_trace.py
@@ -89,20 +89,21 @@ class MLflowDataTrace(BaseTraceInstance):
     def trace(self, trace_info: BaseTraceInfo):
         """Simple dispatch to trace methods"""
         try:
-            if isinstance(trace_info, WorkflowTraceInfo):
-                self.workflow_trace(trace_info)
-            elif isinstance(trace_info, MessageTraceInfo):
-                self.message_trace(trace_info)
-            elif isinstance(trace_info, ToolTraceInfo):
-                self.tool_trace(trace_info)
-            elif isinstance(trace_info, ModerationTraceInfo):
-                self.moderation_trace(trace_info)
-            elif isinstance(trace_info, DatasetRetrievalTraceInfo):
-                self.dataset_retrieval_trace(trace_info)
-            elif isinstance(trace_info, SuggestedQuestionTraceInfo):
-                self.suggested_question_trace(trace_info)
-            elif isinstance(trace_info, GenerateNameTraceInfo):
-                self.generate_name_trace(trace_info)
+            match trace_info:
+                case WorkflowTraceInfo():
+                    self.workflow_trace(trace_info)
+                case MessageTraceInfo():
+                    self.message_trace(trace_info)
+                case ToolTraceInfo():
+                    self.tool_trace(trace_info)
+                case ModerationTraceInfo():
+                    self.moderation_trace(trace_info)
+                case DatasetRetrievalTraceInfo():
+                    self.dataset_retrieval_trace(trace_info)
+                case SuggestedQuestionTraceInfo():
+                    self.suggested_question_trace(trace_info)
+                case GenerateNameTraceInfo():
+                    self.generate_name_trace(trace_info)
         except Exception:
             logger.exception("[MLflow] Trace error")
             raise
@@ -480,14 +481,15 @@ class MLflowDataTrace(BaseTraceInstance):
 
     def _parse_prompts(self, prompts):
         """Postprocess prompts format to be standard chat messages"""
-        if isinstance(prompts, str):
-            return prompts
-        elif isinstance(prompts, dict):
-            return self._parse_single_message(prompts)
-        elif isinstance(prompts, list):
-            messages = [self._parse_single_message(item) for item in prompts]
-            messages = self._resolve_tool_call_ids(messages)
-            return messages
+        match prompts:
+            case str():
+                return prompts
+            case dict():
+                return self._parse_single_message(prompts)
+            case list():
+                messages = [self._parse_single_message(item) for item in prompts]
+                messages = self._resolve_tool_call_ids(messages)
+                return messages
         return prompts  # Fallback to original format
 
     def _parse_single_message(self, item: dict[str, Any]):
diff --git a/api/providers/trace/trace-mlflow/tests/unit_tests/mlflow_trace/test_mlflow_trace.py b/api/providers/trace/trace-mlflow/tests/unit_tests/mlflow_trace/test_mlflow_trace.py
index 46c9750a5d..324f894b25 100644
--- a/api/providers/trace/trace-mlflow/tests/unit_tests/mlflow_trace/test_mlflow_trace.py
+++ b/api/providers/trace/trace-mlflow/tests/unit_tests/mlflow_trace/test_mlflow_trace.py
@@ -614,7 +614,7 @@ class TestMessageTrace:
         span.set_status.assert_called_once()
         span.add_event.assert_called_once()
 
-    def test_message_trace_with_file_data(self, trace_instance, mock_tracing, mock_db, monkeypatch):
+    def test_message_trace_with_file_data(self, trace_instance, mock_tracing, mock_db, monkeypatch: pytest.MonkeyPatch):
         span = MagicMock()
         mock_tracing["start"].return_value = span
         mock_tracing["set"].return_value = "token"
diff --git a/api/providers/trace/trace-opik/tests/unit_tests/opik_trace/test_opik_trace.py b/api/providers/trace/trace-opik/tests/unit_tests/opik_trace/test_opik_trace.py
index eefed3c78c..5daaa7132c 100644
--- a/api/providers/trace/trace-opik/tests/unit_tests/opik_trace/test_opik_trace.py
+++ b/api/providers/trace/trace-opik/tests/unit_tests/opik_trace/test_opik_trace.py
@@ -35,7 +35,7 @@ def opik_config():
 
 
 @pytest.fixture
-def trace_instance(opik_config, monkeypatch):
+def trace_instance(opik_config, monkeypatch: pytest.MonkeyPatch):
     mock_client = MagicMock()
     monkeypatch.setattr("dify_trace_opik.opik_trace.Opik", lambda **kwargs: mock_client)
 
@@ -65,7 +65,7 @@ def test_prepare_opik_uuid():
     assert result is not None
 
 
-def test_init(opik_config, monkeypatch):
+def test_init(opik_config, monkeypatch: pytest.MonkeyPatch):
     mock_opik = MagicMock()
     monkeypatch.setattr("dify_trace_opik.opik_trace.Opik", mock_opik)
     monkeypatch.setenv("FILES_URL", "http://test.url")
@@ -82,7 +82,7 @@ def test_init(opik_config, monkeypatch):
     assert instance.project == opik_config.project
 
 
-def test_trace_dispatch(trace_instance, monkeypatch):
+def test_trace_dispatch(trace_instance, monkeypatch: pytest.MonkeyPatch):
     methods = [
         "workflow_trace",
         "message_trace",
@@ -132,7 +132,7 @@ def test_trace_dispatch(trace_instance, monkeypatch):
     mocks["generate_name_trace"].assert_called_once_with(info)
 
 
-def test_workflow_trace_with_message_id(trace_instance, monkeypatch):
+def test_workflow_trace_with_message_id(trace_instance, monkeypatch: pytest.MonkeyPatch):
     # Define constants for better readability
     WORKFLOW_ID = "fb05c7cd-6cec-4add-8a84-df03a408b4ce"
     WORKFLOW_RUN_ID = "33c67568-7a8a-450e-8916-a5f135baeaef"
@@ -221,7 +221,7 @@ def test_workflow_trace_with_message_id(trace_instance, monkeypatch):
     assert trace_instance.add_span.call_count >= 1
 
 
-def test_workflow_trace_no_message_id(trace_instance, monkeypatch):
+def test_workflow_trace_no_message_id(trace_instance, monkeypatch: pytest.MonkeyPatch):
     # Define constants for better readability
     WORKFLOW_ID = "f0708b36-b1d7-42b3-a876-1d01b7d8f1a3"
     WORKFLOW_RUN_ID = "d42ec285-c2fd-4248-8866-5c9386b101ac"
@@ -265,7 +265,7 @@ def test_workflow_trace_no_message_id(trace_instance, monkeypatch):
     trace_instance.add_trace.assert_called_once()
 
 
-def test_workflow_trace_missing_app_id(trace_instance, monkeypatch):
+def test_workflow_trace_missing_app_id(trace_instance, monkeypatch: pytest.MonkeyPatch):
     trace_info = WorkflowTraceInfo(
         workflow_id="5745f1b8-f8e6-4859-8110-996acb6c8d6a",
         tenant_id="tenant-1",
@@ -293,7 +293,7 @@ def test_workflow_trace_missing_app_id(trace_instance, monkeypatch):
         trace_instance.workflow_trace(trace_info)
 
 
-def test_message_trace_basic(trace_instance, monkeypatch):
+def test_message_trace_basic(trace_instance, monkeypatch: pytest.MonkeyPatch):
     # Define constants for better readability
     MESSAGE_DATA_ID = "e3a26712-8cac-4a25-94a4-a3bff21ee3ab"
     CONVERSATION_ID = "9d3f3751-7521-4c19-9307-20e3cf6789a3"
@@ -340,7 +340,7 @@ def test_message_trace_basic(trace_instance, monkeypatch):
     trace_instance.add_span.assert_called_once()
 
 
-def test_message_trace_with_end_user(trace_instance, monkeypatch):
+def test_message_trace_with_end_user(trace_instance, monkeypatch: pytest.MonkeyPatch):
     message_data = MagicMock()
     message_data.id = "85411059-79fb-4deb-a76c-c2e215f1b97e"
     message_data.from_account_id = "acc-1"
@@ -614,7 +614,7 @@ def test_get_project_url_error(trace_instance):
         trace_instance.get_project_url()
 
 
-def test_workflow_trace_usage_extraction_error_fixed(trace_instance, monkeypatch, caplog):
+def test_workflow_trace_usage_extraction_error_fixed(trace_instance, monkeypatch: pytest.MonkeyPatch, caplog):
     trace_info = WorkflowTraceInfo(
         workflow_id="86a52565-4a6b-4a1b-9bfd-98e4595e70de",
         tenant_id="66e8e918-472e-4b69-8051-12502c34fc07",
diff --git a/api/providers/trace/trace-tencent/src/dify_trace_tencent/tencent_trace.py b/api/providers/trace/trace-tencent/src/dify_trace_tencent/tencent_trace.py
index a8c480e4a5..3e1dc1d9f6 100644
--- a/api/providers/trace/trace-tencent/src/dify_trace_tencent/tencent_trace.py
+++ b/api/providers/trace/trace-tencent/src/dify_trace_tencent/tencent_trace.py
@@ -58,20 +58,21 @@ class TencentDataTrace(BaseTraceInstance):
 
     def trace(self, trace_info: BaseTraceInfo) -> None:
         """Main tracing entry point - coordinates different trace types."""
-        if isinstance(trace_info, WorkflowTraceInfo):
-            self.workflow_trace(trace_info)
-        elif isinstance(trace_info, MessageTraceInfo):
-            self.message_trace(trace_info)
-        elif isinstance(trace_info, ModerationTraceInfo):
-            pass
-        elif isinstance(trace_info, SuggestedQuestionTraceInfo):
-            self.suggested_question_trace(trace_info)
-        elif isinstance(trace_info, DatasetRetrievalTraceInfo):
-            self.dataset_retrieval_trace(trace_info)
-        elif isinstance(trace_info, ToolTraceInfo):
-            self.tool_trace(trace_info)
-        elif isinstance(trace_info, GenerateNameTraceInfo):
-            pass
+        match trace_info:
+            case WorkflowTraceInfo():
+                self.workflow_trace(trace_info)
+            case MessageTraceInfo():
+                self.message_trace(trace_info)
+            case ModerationTraceInfo():
+                pass
+            case SuggestedQuestionTraceInfo():
+                self.suggested_question_trace(trace_info)
+            case DatasetRetrievalTraceInfo():
+                self.dataset_retrieval_trace(trace_info)
+            case ToolTraceInfo():
+                self.tool_trace(trace_info)
+            case GenerateNameTraceInfo():
+                pass
 
     def api_check(self) -> bool:
         return self.trace_client.api_check()
diff --git a/api/providers/trace/trace-tencent/tests/unit_tests/tencent_trace/test_client.py b/api/providers/trace/trace-tencent/tests/unit_tests/tencent_trace/test_client.py
index 3cd918f408..b6bc5b8606 100644
--- a/api/providers/trace/trace-tencent/tests/unit_tests/tencent_trace/test_client.py
+++ b/api/providers/trace/trace-tencent/tests/unit_tests/tencent_trace/test_client.py
@@ -94,29 +94,29 @@ class PatchedCoreComponents(TypedDict):
 def _add_stub_modules(monkeypatch: pytest.MonkeyPatch) -> None:
     """Drop fake metric modules into sys.modules so the client imports resolve."""
 
-    metrics_module = types.ModuleType("opentelemetry.sdk.metrics")
+    metrics_module = cast(Any, types.ModuleType("opentelemetry.sdk.metrics"))
     metrics_module.Histogram = DummyHistogram
     metrics_module.MeterProvider = DummyMeterProvider
     monkeypatch.setitem(sys.modules, "opentelemetry.sdk.metrics", metrics_module)
 
-    metrics_export_module = types.ModuleType("opentelemetry.sdk.metrics.export")
+    metrics_export_module = cast(Any, types.ModuleType("opentelemetry.sdk.metrics.export"))
     metrics_export_module.AggregationTemporality = AggregationTemporality
     metrics_export_module.PeriodicExportingMetricReader = DummyMetricReader
     monkeypatch.setitem(sys.modules, "opentelemetry.sdk.metrics.export", metrics_export_module)
 
-    grpc_module = types.ModuleType("opentelemetry.exporter.otlp.proto.grpc.metric_exporter")
+    grpc_module = cast(Any, types.ModuleType("opentelemetry.exporter.otlp.proto.grpc.metric_exporter"))
     grpc_module.OTLPMetricExporter = DummyGrpcMetricExporter
     monkeypatch.setitem(sys.modules, "opentelemetry.exporter.otlp.proto.grpc.metric_exporter", grpc_module)
 
-    http_module = types.ModuleType("opentelemetry.exporter.otlp.proto.http.metric_exporter")
+    http_module = cast(Any, types.ModuleType("opentelemetry.exporter.otlp.proto.http.metric_exporter"))
     http_module.OTLPMetricExporter = DummyHttpMetricExporter
     monkeypatch.setitem(sys.modules, "opentelemetry.exporter.otlp.proto.http.metric_exporter", http_module)
 
-    http_json_module = types.ModuleType("opentelemetry.exporter.otlp.http.json.metric_exporter")
+    http_json_module = cast(Any, types.ModuleType("opentelemetry.exporter.otlp.http.json.metric_exporter"))
     http_json_module.OTLPMetricExporter = DummyJsonMetricExporter
     monkeypatch.setitem(sys.modules, "opentelemetry.exporter.otlp.http.json.metric_exporter", http_json_module)
 
-    legacy_json_module = types.ModuleType("opentelemetry.exporter.otlp.json.metric_exporter")
+    legacy_json_module = cast(Any, types.ModuleType("opentelemetry.exporter.otlp.json.metric_exporter"))
     legacy_json_module.OTLPMetricExporter = DummyJsonMetricExporter
     monkeypatch.setitem(sys.modules, "opentelemetry.exporter.otlp.json.metric_exporter", legacy_json_module)
 
diff --git a/api/providers/trace/trace-weave/tests/unit_tests/weave_trace/test_weave_trace.py b/api/providers/trace/trace-weave/tests/unit_tests/weave_trace/test_weave_trace.py
index 6028d0c550..30646815d8 100644
--- a/api/providers/trace/trace-weave/tests/unit_tests/weave_trace/test_weave_trace.py
+++ b/api/providers/trace/trace-weave/tests/unit_tests/weave_trace/test_weave_trace.py
@@ -267,14 +267,14 @@ class TestInit:
         with pytest.raises(ValueError, match="Weave login failed"):
             WeaveDataTrace(config)
 
-    def test_init_files_url_from_env(self, mock_wandb, mock_weave, monkeypatch):
+    def test_init_files_url_from_env(self, mock_wandb, mock_weave, monkeypatch: pytest.MonkeyPatch):
         """Test FILES_URL is read from environment."""
         monkeypatch.setenv("FILES_URL", "http://files.example.com")
         config = _make_weave_config()
         instance = WeaveDataTrace(config)
         assert instance.file_base_url == "http://files.example.com"
 
-    def test_init_files_url_default(self, mock_wandb, mock_weave, monkeypatch):
+    def test_init_files_url_default(self, mock_wandb, mock_weave, monkeypatch: pytest.MonkeyPatch):
         """Test FILES_URL defaults to http://127.0.0.1:5001."""
         monkeypatch.delenv("FILES_URL", raising=False)
         config = _make_weave_config()
@@ -302,7 +302,7 @@ class TestGetProjectUrl:
         url = instance.get_project_url()
         assert url == "https://wandb.ai/my-project"
 
-    def test_get_project_url_exception_raises(self, trace_instance, monkeypatch):
+    def test_get_project_url_exception_raises(self, trace_instance, monkeypatch: pytest.MonkeyPatch):
         """Raises ValueError when exception occurs in get_project_url."""
         monkeypatch.setattr(trace_instance, "entity", None)
         monkeypatch.setattr(trace_instance, "project_name", None)
@@ -583,7 +583,7 @@ class TestFinishCall:
 
 
 class TestWorkflowTrace:
-    def _setup_repo(self, monkeypatch, nodes=None):
+    def _setup_repo(self, monkeypatch: pytest.MonkeyPatch, nodes=None):
         """Helper to patch session/repo dependencies."""
         if nodes is None:
             nodes = []
@@ -599,7 +599,7 @@ class TestWorkflowTrace:
         monkeypatch.setattr("dify_trace_weave.weave_trace.db", MagicMock(engine="engine"))
         return repo
 
-    def test_workflow_trace_no_nodes_no_message_id(self, trace_instance, monkeypatch):
+    def test_workflow_trace_no_nodes_no_message_id(self, trace_instance, monkeypatch: pytest.MonkeyPatch):
         """Workflow trace with no nodes and no message_id."""
         self._setup_repo(monkeypatch, nodes=[])
         monkeypatch.setattr(trace_instance, "get_service_account_with_tenant", lambda app_id: MagicMock())
@@ -614,7 +614,7 @@ class TestWorkflowTrace:
         assert trace_instance.start_call.call_count == 1
         assert trace_instance.finish_call.call_count == 1
 
-    def test_workflow_trace_with_message_id(self, trace_instance, monkeypatch):
+    def test_workflow_trace_with_message_id(self, trace_instance, monkeypatch: pytest.MonkeyPatch):
         """Workflow trace with message_id creates both message and workflow runs."""
         self._setup_repo(monkeypatch, nodes=[])
         monkeypatch.setattr(trace_instance, "get_service_account_with_tenant", lambda app_id: MagicMock())
@@ -629,7 +629,7 @@ class TestWorkflowTrace:
         assert trace_instance.start_call.call_count == 2
         assert trace_instance.finish_call.call_count == 2
 
-    def test_workflow_trace_with_node_execution(self, trace_instance, monkeypatch):
+    def test_workflow_trace_with_node_execution(self, trace_instance, monkeypatch: pytest.MonkeyPatch):
         """Workflow trace iterates node executions and creates node runs."""
         node = _make_node(
             id="node-1",
@@ -652,7 +652,7 @@ class TestWorkflowTrace:
         # workflow run + node run = 2 calls
         assert trace_instance.start_call.call_count == 2
 
-    def test_workflow_trace_with_llm_node(self, trace_instance, monkeypatch):
+    def test_workflow_trace_with_llm_node(self, trace_instance, monkeypatch: pytest.MonkeyPatch):
         """LLM node uses process_data prompts as inputs."""
         node = _make_node(
             node_type=BuiltinNodeTypes.LLM,
@@ -680,7 +680,7 @@ class TestWorkflowTrace:
         # The key "messages" should be present (validator transforms the list)
         assert "messages" in node_run.inputs
 
-    def test_workflow_trace_with_non_llm_node_uses_inputs(self, trace_instance, monkeypatch):
+    def test_workflow_trace_with_non_llm_node_uses_inputs(self, trace_instance, monkeypatch: pytest.MonkeyPatch):
         """Non-LLM node uses node_execution.inputs directly."""
         node = _make_node(
             node_type=BuiltinNodeTypes.TOOL,
@@ -701,7 +701,7 @@ class TestWorkflowTrace:
         node_run = node_call_args[0][0]
         assert node_run.inputs.get("tool_input") == "val"
 
-    def test_workflow_trace_missing_app_id_raises(self, trace_instance, monkeypatch):
+    def test_workflow_trace_missing_app_id_raises(self, trace_instance, monkeypatch: pytest.MonkeyPatch):
         """Raises ValueError when app_id is missing from metadata."""
         monkeypatch.setattr("dify_trace_weave.weave_trace.sessionmaker", lambda bind: MagicMock())
         monkeypatch.setattr("dify_trace_weave.weave_trace.db", MagicMock(engine="engine"))
@@ -714,7 +714,7 @@ class TestWorkflowTrace:
         with pytest.raises(ValueError, match="No app_id found in trace_info metadata"):
             trace_instance.workflow_trace(trace_info)
 
-    def test_workflow_trace_start_time_none_defaults_to_now(self, trace_instance, monkeypatch):
+    def test_workflow_trace_start_time_none_defaults_to_now(self, trace_instance, monkeypatch: pytest.MonkeyPatch):
         """start_time defaults to datetime.now() when None."""
         self._setup_repo(monkeypatch, nodes=[])
         monkeypatch.setattr(trace_instance, "get_service_account_with_tenant", lambda app_id: MagicMock())
@@ -727,7 +727,7 @@ class TestWorkflowTrace:
 
         assert trace_instance.start_call.call_count == 1
 
-    def test_workflow_trace_node_created_at_none(self, trace_instance, monkeypatch):
+    def test_workflow_trace_node_created_at_none(self, trace_instance, monkeypatch: pytest.MonkeyPatch):
         """Node with created_at=None uses datetime.now()."""
         node = _make_node(created_at=None, elapsed_time=0.5)
         self._setup_repo(monkeypatch, nodes=[node])
@@ -740,7 +740,7 @@ class TestWorkflowTrace:
         trace_instance.workflow_trace(trace_info)
         assert trace_instance.start_call.call_count == 2
 
-    def test_workflow_trace_chat_mode_llm_node_adds_provider(self, trace_instance, monkeypatch):
+    def test_workflow_trace_chat_mode_llm_node_adds_provider(self, trace_instance, monkeypatch: pytest.MonkeyPatch):
         """Chat mode LLM node adds ls_provider and ls_model_name to attributes."""
         node = _make_node(
             node_type=BuiltinNodeTypes.LLM,
@@ -765,7 +765,7 @@ class TestWorkflowTrace:
         assert node_run.attributes.get("ls_provider") == "openai"
         assert node_run.attributes.get("ls_model_name") == "gpt-4"
 
-    def test_workflow_trace_nodes_sorted_by_created_at(self, trace_instance, monkeypatch):
+    def test_workflow_trace_nodes_sorted_by_created_at(self, trace_instance, monkeypatch: pytest.MonkeyPatch):
         """Nodes are sorted by created_at before processing."""
         node1 = _make_node(id="node-b", created_at=_dt() + timedelta(seconds=2))
         node2 = _make_node(id="node-a", created_at=_dt())
@@ -799,7 +799,7 @@ class TestMessageTrace:
         trace_instance.message_trace(trace_info)
         trace_instance.start_call.assert_not_called()
 
-    def test_basic_message_trace(self, trace_instance, monkeypatch):
+    def test_basic_message_trace(self, trace_instance, monkeypatch: pytest.MonkeyPatch):
         """message_trace creates message run and llm child run."""
         monkeypatch.setattr(
             "dify_trace_weave.weave_trace.db.session.get",
@@ -816,7 +816,7 @@ class TestMessageTrace:
         assert trace_instance.start_call.call_count == 2
         assert trace_instance.finish_call.call_count == 2
 
-    def test_message_trace_with_file_data(self, trace_instance, monkeypatch):
+    def test_message_trace_with_file_data(self, trace_instance, monkeypatch: pytest.MonkeyPatch):
         """message_trace appends file URL to file_list."""
         file_data = MagicMock()
         file_data.url = "path/to/file.png"
@@ -839,7 +839,7 @@ class TestMessageTrace:
         message_run = trace_instance.start_call.call_args_list[0][0][0]
         assert "http://files.test/path/to/file.png" in message_run.file_list
 
-    def test_message_trace_with_end_user(self, trace_instance, monkeypatch):
+    def test_message_trace_with_end_user(self, trace_instance, monkeypatch: pytest.MonkeyPatch):
         """message_trace looks up end user and sets end_user_id attribute."""
         end_user = MagicMock()
         end_user.session_id = "session-xyz"
@@ -862,7 +862,7 @@ class TestMessageTrace:
         message_run = trace_instance.start_call.call_args_list[0][0][0]
         assert message_run.attributes.get("end_user_id") == "session-xyz"
 
-    def test_message_trace_no_end_user(self, trace_instance, monkeypatch):
+    def test_message_trace_no_end_user(self, trace_instance, monkeypatch: pytest.MonkeyPatch):
         """message_trace handles when from_end_user_id is None."""
         mock_db = MagicMock()
         mock_db.session.get.return_value = None
@@ -880,7 +880,7 @@ class TestMessageTrace:
         trace_instance.message_trace(trace_info)
         assert trace_instance.start_call.call_count == 2
 
-    def test_message_trace_trace_id_fallback_to_message_id(self, trace_instance, monkeypatch):
+    def test_message_trace_trace_id_fallback_to_message_id(self, trace_instance, monkeypatch: pytest.MonkeyPatch):
         """trace_id falls back to message_id when trace_id is None."""
         mock_db = MagicMock()
         mock_db.session.get.return_value = None
@@ -895,7 +895,7 @@ class TestMessageTrace:
         message_run = trace_instance.start_call.call_args_list[0][0][0]
         assert message_run.id == "msg-1"
 
-    def test_message_trace_file_list_none(self, trace_instance, monkeypatch):
+    def test_message_trace_file_list_none(self, trace_instance, monkeypatch: pytest.MonkeyPatch):
         """message_trace handles file_list=None gracefully."""
         mock_db = MagicMock()
         mock_db.session.get.return_value = None
diff --git a/api/providers/vdb/vdb-alibabacloud-mysql/tests/unit_tests/test_alibabacloud_mysql_factory.py b/api/providers/vdb/vdb-alibabacloud-mysql/tests/unit_tests/test_alibabacloud_mysql_factory.py
index a907f918c3..37b2331f0f 100644
--- a/api/providers/vdb/vdb-alibabacloud-mysql/tests/unit_tests/test_alibabacloud_mysql_factory.py
+++ b/api/providers/vdb/vdb-alibabacloud-mysql/tests/unit_tests/test_alibabacloud_mysql_factory.py
@@ -20,7 +20,7 @@ def test_validate_distance_function_rejects_unsupported_values():
         factory._validate_distance_function("dot_product")
 
 
-def test_factory_init_vector_uses_existing_index_struct_class_prefix(monkeypatch):
+def test_factory_init_vector_uses_existing_index_struct_class_prefix(monkeypatch: pytest.MonkeyPatch):
     factory = AlibabaCloudMySQLVectorFactory()
     dataset = SimpleNamespace(
         id="dataset-1",
@@ -45,7 +45,7 @@ def test_factory_init_vector_uses_existing_index_struct_class_prefix(monkeypatch
     assert vector_cls.call_args.kwargs["collection_name"] == "existing_collection"
 
 
-def test_factory_init_vector_generates_collection_name_when_index_struct_is_missing(monkeypatch):
+def test_factory_init_vector_generates_collection_name_when_index_struct_is_missing(monkeypatch: pytest.MonkeyPatch):
     factory = AlibabaCloudMySQLVectorFactory()
     dataset = SimpleNamespace(
         id="dataset-2",
diff --git a/api/providers/vdb/vdb-analyticdb/tests/unit_tests/test_analyticdb_vector.py b/api/providers/vdb/vdb-analyticdb/tests/unit_tests/test_analyticdb_vector.py
index d1d471761d..2e8052b7dc 100644
--- a/api/providers/vdb/vdb-analyticdb/tests/unit_tests/test_analyticdb_vector.py
+++ b/api/providers/vdb/vdb-analyticdb/tests/unit_tests/test_analyticdb_vector.py
@@ -83,7 +83,7 @@ def test_get_type_is_analyticdb():
     assert vector.get_type() == "analyticdb"
 
 
-def test_factory_builds_openapi_config_when_host_is_missing(monkeypatch):
+def test_factory_builds_openapi_config_when_host_is_missing(monkeypatch: pytest.MonkeyPatch):
     factory = AnalyticdbVectorFactory()
     dataset = SimpleNamespace(id="dataset-1", index_struct_dict=None, index_struct=None)
 
@@ -109,7 +109,7 @@ def test_factory_builds_openapi_config_when_host_is_missing(monkeypatch):
     assert dataset.index_struct is not None
 
 
-def test_factory_builds_sql_config_when_host_is_present(monkeypatch):
+def test_factory_builds_sql_config_when_host_is_present(monkeypatch: pytest.MonkeyPatch):
     factory = AnalyticdbVectorFactory()
     dataset = SimpleNamespace(
         id="dataset-2", index_struct_dict={"vector_store": {"class_prefix": "EXISTING"}}, index_struct=None
diff --git a/api/providers/vdb/vdb-analyticdb/tests/unit_tests/test_analyticdb_vector_openapi.py b/api/providers/vdb/vdb-analyticdb/tests/unit_tests/test_analyticdb_vector_openapi.py
index d2d735ae3e..26bd385333 100644
--- a/api/providers/vdb/vdb-analyticdb/tests/unit_tests/test_analyticdb_vector_openapi.py
+++ b/api/providers/vdb/vdb-analyticdb/tests/unit_tests/test_analyticdb_vector_openapi.py
@@ -24,7 +24,7 @@ def _request_class(name: str):
     return _Request
 
 
-def _install_openapi_stubs(monkeypatch):
+def _install_openapi_stubs(monkeypatch: pytest.MonkeyPatch):
     gpdb_package = types.ModuleType("alibabacloud_gpdb20160503")
     gpdb_package.__path__ = []
     gpdb_models = types.ModuleType("alibabacloud_gpdb20160503.models")
@@ -130,7 +130,7 @@ def test_openapi_config_to_client_params():
     assert params["read_timeout"] == 60000
 
 
-def test_init_creates_openapi_client_and_runs_initialize(monkeypatch):
+def test_init_creates_openapi_client_and_runs_initialize(monkeypatch: pytest.MonkeyPatch):
     stubs = _install_openapi_stubs(monkeypatch)
     initialize_mock = MagicMock()
     monkeypatch.setattr(openapi_module.AnalyticdbVectorOpenAPI, "_initialize", initialize_mock)
@@ -145,7 +145,7 @@ def test_init_creates_openapi_client_and_runs_initialize(monkeypatch):
     initialize_mock.assert_called_once_with()
 
 
-def test_initialize_skips_when_cached(monkeypatch):
+def test_initialize_skips_when_cached(monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = None
@@ -164,7 +164,7 @@ def test_initialize_skips_when_cached(monkeypatch):
     vector._create_namespace_if_not_exists.assert_not_called()
 
 
-def test_initialize_runs_when_cache_is_missing(monkeypatch):
+def test_initialize_runs_when_cache_is_missing(monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = None
@@ -184,7 +184,7 @@ def test_initialize_runs_when_cache_is_missing(monkeypatch):
     openapi_module.redis_client.set.assert_called_once()
 
 
-def test_initialize_vector_database_calls_openapi_client(monkeypatch):
+def test_initialize_vector_database_calls_openapi_client(monkeypatch: pytest.MonkeyPatch):
     _install_openapi_stubs(monkeypatch)
     vector = AnalyticdbVectorOpenAPI.__new__(AnalyticdbVectorOpenAPI)
     vector.config = _config()
@@ -199,7 +199,7 @@ def test_initialize_vector_database_calls_openapi_client(monkeypatch):
     assert request.manager_account_password == "password"
 
 
-def test_create_namespace_creates_when_namespace_not_found(monkeypatch):
+def test_create_namespace_creates_when_namespace_not_found(monkeypatch: pytest.MonkeyPatch):
     stubs = _install_openapi_stubs(monkeypatch)
     vector = AnalyticdbVectorOpenAPI.__new__(AnalyticdbVectorOpenAPI)
     vector.config = _config()
@@ -211,7 +211,7 @@ def test_create_namespace_creates_when_namespace_not_found(monkeypatch):
     vector._client.create_namespace.assert_called_once()
 
 
-def test_create_namespace_raises_on_unexpected_api_error(monkeypatch):
+def test_create_namespace_raises_on_unexpected_api_error(monkeypatch: pytest.MonkeyPatch):
     stubs = _install_openapi_stubs(monkeypatch)
     vector = AnalyticdbVectorOpenAPI.__new__(AnalyticdbVectorOpenAPI)
     vector.config = _config()
@@ -222,7 +222,7 @@ def test_create_namespace_raises_on_unexpected_api_error(monkeypatch):
         vector._create_namespace_if_not_exists()
 
 
-def test_create_namespace_noop_when_namespace_exists(monkeypatch):
+def test_create_namespace_noop_when_namespace_exists(monkeypatch: pytest.MonkeyPatch):
     _install_openapi_stubs(monkeypatch)
     vector = AnalyticdbVectorOpenAPI.__new__(AnalyticdbVectorOpenAPI)
     vector.config = _config()
@@ -234,7 +234,7 @@ def test_create_namespace_noop_when_namespace_exists(monkeypatch):
     vector._client.create_namespace.assert_not_called()
 
 
-def test_create_collection_if_not_exists_creates_when_missing(monkeypatch):
+def test_create_collection_if_not_exists_creates_when_missing(monkeypatch: pytest.MonkeyPatch):
     stubs = _install_openapi_stubs(monkeypatch)
     lock = MagicMock()
     lock.__enter__.return_value = None
@@ -255,7 +255,7 @@ def test_create_collection_if_not_exists_creates_when_missing(monkeypatch):
     openapi_module.redis_client.set.assert_called_once()
 
 
-def test_create_collection_if_not_exists_skips_when_cached(monkeypatch):
+def test_create_collection_if_not_exists_skips_when_cached(monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = None
@@ -274,7 +274,7 @@ def test_create_collection_if_not_exists_skips_when_cached(monkeypatch):
     vector._client.create_collection.assert_not_called()
 
 
-def test_create_collection_if_not_exists_raises_on_non_404_errors(monkeypatch):
+def test_create_collection_if_not_exists_raises_on_non_404_errors(monkeypatch: pytest.MonkeyPatch):
     stubs = _install_openapi_stubs(monkeypatch)
     lock = MagicMock()
     lock.__enter__.return_value = None
@@ -293,7 +293,7 @@ def test_create_collection_if_not_exists_raises_on_non_404_errors(monkeypatch):
         vector.create_collection_if_not_exists(embedding_dimension=512)
 
 
-def test_openapi_add_delete_and_search_methods(monkeypatch):
+def test_openapi_add_delete_and_search_methods(monkeypatch: pytest.MonkeyPatch):
     _install_openapi_stubs(monkeypatch)
     vector = AnalyticdbVectorOpenAPI.__new__(AnalyticdbVectorOpenAPI)
     vector._collection_name = "collection_1"
@@ -348,7 +348,7 @@ def test_openapi_add_delete_and_search_methods(monkeypatch):
     assert docs_by_text[0].page_content == "high"
 
 
-def test_text_exists_returns_false_when_matches_empty(monkeypatch):
+def test_text_exists_returns_false_when_matches_empty(monkeypatch: pytest.MonkeyPatch):
     _install_openapi_stubs(monkeypatch)
     vector = AnalyticdbVectorOpenAPI.__new__(AnalyticdbVectorOpenAPI)
     vector._collection_name = "collection_1"
@@ -361,7 +361,7 @@ def test_text_exists_returns_false_when_matches_empty(monkeypatch):
     assert vector.text_exists("missing-id") is False
 
 
-def test_openapi_delete_success(monkeypatch):
+def test_openapi_delete_success(monkeypatch: pytest.MonkeyPatch):
     _install_openapi_stubs(monkeypatch)
     vector = AnalyticdbVectorOpenAPI.__new__(AnalyticdbVectorOpenAPI)
     vector._collection_name = "collection_1"
@@ -372,7 +372,7 @@ def test_openapi_delete_success(monkeypatch):
     vector._client.delete_collection.assert_called_once()
 
 
-def test_openapi_delete_propagates_errors(monkeypatch):
+def test_openapi_delete_propagates_errors(monkeypatch: pytest.MonkeyPatch):
     _install_openapi_stubs(monkeypatch)
     vector = AnalyticdbVectorOpenAPI.__new__(AnalyticdbVectorOpenAPI)
     vector._collection_name = "collection_1"
diff --git a/api/providers/vdb/vdb-analyticdb/tests/unit_tests/test_analyticdb_vector_sql.py b/api/providers/vdb/vdb-analyticdb/tests/unit_tests/test_analyticdb_vector_sql.py
index 49a2ae72d0..cd255b37cf 100644
--- a/api/providers/vdb/vdb-analyticdb/tests/unit_tests/test_analyticdb_vector_sql.py
+++ b/api/providers/vdb/vdb-analyticdb/tests/unit_tests/test_analyticdb_vector_sql.py
@@ -53,7 +53,7 @@ def test_sql_config_rejects_min_connection_greater_than_max_connection():
         AnalyticdbVectorBySqlConfig.model_validate(values)
 
 
-def test_initialize_skips_when_cache_exists(monkeypatch):
+def test_initialize_skips_when_cache_exists(monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = None
@@ -70,7 +70,7 @@ def test_initialize_skips_when_cache_exists(monkeypatch):
     vector._initialize_vector_database.assert_not_called()
 
 
-def test_initialize_runs_when_cache_is_missing(monkeypatch):
+def test_initialize_runs_when_cache_is_missing(monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = None
@@ -88,7 +88,7 @@ def test_initialize_runs_when_cache_is_missing(monkeypatch):
     sql_module.redis_client.set.assert_called_once()
 
 
-def test_create_connection_pool_uses_psycopg2_pool(monkeypatch):
+def test_create_connection_pool_uses_psycopg2_pool(monkeypatch: pytest.MonkeyPatch):
     vector = AnalyticdbVectorBySql.__new__(AnalyticdbVectorBySql)
     vector.config = AnalyticdbVectorBySqlConfig(**_config_values())
     vector.databaseName = "knowledgebase"
@@ -119,7 +119,7 @@ def test_get_cursor_context_manager_handles_connection_lifecycle():
     pool.putconn.assert_called_once_with(connection)
 
 
-def test_add_texts_inserts_only_documents_with_metadata(monkeypatch):
+def test_add_texts_inserts_only_documents_with_metadata(monkeypatch: pytest.MonkeyPatch):
     vector = AnalyticdbVectorBySql.__new__(AnalyticdbVectorBySql)
     vector.table_name = "dify.collection"
 
@@ -273,7 +273,7 @@ def test_delete_drops_table():
     cursor.execute.assert_called_once()
 
 
-def test_init_normalizes_collection_name_and_creates_pool_when_missing(monkeypatch):
+def test_init_normalizes_collection_name_and_creates_pool_when_missing(monkeypatch: pytest.MonkeyPatch):
     config = AnalyticdbVectorBySqlConfig(**_config_values())
     created_pool = MagicMock()
 
@@ -288,7 +288,7 @@ def test_init_normalizes_collection_name_and_creates_pool_when_missing(monkeypat
     assert vector.pool is created_pool
 
 
-def test_initialize_vector_database_handles_existing_database_and_search_config(monkeypatch):
+def test_initialize_vector_database_handles_existing_database_and_search_config(monkeypatch: pytest.MonkeyPatch):
     vector = AnalyticdbVectorBySql.__new__(AnalyticdbVectorBySql)
     vector.config = AnalyticdbVectorBySqlConfig(**_config_values())
     vector.databaseName = "knowledgebase"
@@ -326,7 +326,7 @@ def test_initialize_vector_database_handles_existing_database_and_search_config(
     assert any("CREATE SCHEMA IF NOT EXISTS dify" in call.args[0] for call in worker_cursor.execute.call_args_list)
 
 
-def test_initialize_vector_database_raises_runtime_error_when_zhparser_fails(monkeypatch):
+def test_initialize_vector_database_raises_runtime_error_when_zhparser_fails(monkeypatch: pytest.MonkeyPatch):
     vector = AnalyticdbVectorBySql.__new__(AnalyticdbVectorBySql)
     vector.config = AnalyticdbVectorBySqlConfig(**_config_values())
     vector.databaseName = "knowledgebase"
@@ -353,7 +353,7 @@ def test_initialize_vector_database_raises_runtime_error_when_zhparser_fails(mon
     worker_connection.rollback.assert_called_once()
 
 
-def test_create_collection_if_not_exists_creates_table_indexes_and_cache(monkeypatch):
+def test_create_collection_if_not_exists_creates_table_indexes_and_cache(monkeypatch: pytest.MonkeyPatch):
     vector = AnalyticdbVectorBySql.__new__(AnalyticdbVectorBySql)
     vector.config = AnalyticdbVectorBySqlConfig(**_config_values())
     vector._collection_name = "collection"
@@ -381,7 +381,7 @@ def test_create_collection_if_not_exists_creates_table_indexes_and_cache(monkeyp
     sql_module.redis_client.set.assert_called_once()
 
 
-def test_create_collection_if_not_exists_raises_for_non_existing_error(monkeypatch):
+def test_create_collection_if_not_exists_raises_for_non_existing_error(monkeypatch: pytest.MonkeyPatch):
     vector = AnalyticdbVectorBySql.__new__(AnalyticdbVectorBySql)
     vector.config = AnalyticdbVectorBySqlConfig(**_config_values())
     vector._collection_name = "collection"
diff --git a/api/providers/vdb/vdb-baidu/tests/unit_tests/test_baidu_vector.py b/api/providers/vdb/vdb-baidu/tests/unit_tests/test_baidu_vector.py
index 851c09f47a..f0dddee3b9 100644
--- a/api/providers/vdb/vdb-baidu/tests/unit_tests/test_baidu_vector.py
+++ b/api/providers/vdb/vdb-baidu/tests/unit_tests/test_baidu_vector.py
@@ -121,7 +121,7 @@ def _build_fake_pymochow_modules():
 
 
 @pytest.fixture
-def baidu_module(monkeypatch):
+def baidu_module(monkeypatch: pytest.MonkeyPatch):
     for name, module in _build_fake_pymochow_modules().items():
         monkeypatch.setitem(sys.modules, name, module)
     import dify_vdb_baidu.baidu_vector as module
@@ -254,7 +254,7 @@ def test_search_methods_delegate_to_database_table(baidu_module):
     assert vector._get_search_res.call_count == 2
 
 
-def test_factory_initializes_collection_name_and_index_struct(baidu_module, monkeypatch):
+def test_factory_initializes_collection_name_and_index_struct(baidu_module, monkeypatch: pytest.MonkeyPatch):
     factory = baidu_module.BaiduVectorFactory()
     dataset = SimpleNamespace(id="dataset-1", index_struct_dict=None, index_struct=None)
     monkeypatch.setattr(baidu_module.Dataset, "gen_collection_name_by_id", lambda _id: "AUTO_COLLECTION")
@@ -279,7 +279,7 @@ def test_factory_initializes_collection_name_and_index_struct(baidu_module, monk
     assert dataset.index_struct is not None
 
 
-def test_init_get_type_to_index_struct_and_create_delegate(baidu_module, monkeypatch):
+def test_init_get_type_to_index_struct_and_create_delegate(baidu_module, monkeypatch: pytest.MonkeyPatch):
     init_client = MagicMock(return_value="client")
     init_database = MagicMock(return_value="database")
     monkeypatch.setattr(baidu_module.BaiduVector, "_init_client", init_client)
@@ -372,7 +372,7 @@ def test_get_search_result_handles_invalid_metadata_json(baidu_module):
     assert "document_id" not in docs[0].metadata
 
 
-def test_init_client_constructs_configuration_and_client(baidu_module, monkeypatch):
+def test_init_client_constructs_configuration_and_client(baidu_module, monkeypatch: pytest.MonkeyPatch):
     credentials = MagicMock(return_value="credentials")
     configuration = MagicMock(return_value="configuration")
     client_cls = MagicMock(return_value="client")
@@ -411,7 +411,7 @@ def test_init_database_raises_for_unknown_create_database_error(baidu_module):
         vector._init_database()
 
 
-def test_create_table_handles_cache_and_validation_paths(baidu_module, monkeypatch):
+def test_create_table_handles_cache_and_validation_paths(baidu_module, monkeypatch: pytest.MonkeyPatch):
     vector = baidu_module.BaiduVector.__new__(baidu_module.BaiduVector)
     vector._collection_name = "collection_1"
     vector._client_config = SimpleNamespace(
@@ -460,7 +460,7 @@ def test_create_table_handles_cache_and_validation_paths(baidu_module, monkeypat
     vector._wait_for_index_ready.assert_called_once_with(table, 3600)
 
 
-def test_create_table_raises_for_invalid_index_or_metric(baidu_module, monkeypatch):
+def test_create_table_raises_for_invalid_index_or_metric(baidu_module, monkeypatch: pytest.MonkeyPatch):
     vector = baidu_module.BaiduVector.__new__(baidu_module.BaiduVector)
     vector._collection_name = "collection_1"
     vector._db = MagicMock()
@@ -493,7 +493,7 @@ def test_create_table_raises_for_invalid_index_or_metric(baidu_module, monkeypat
         vector._create_table(3)
 
 
-def test_create_table_raises_timeout_if_table_never_becomes_normal(baidu_module, monkeypatch):
+def test_create_table_raises_timeout_if_table_never_becomes_normal(baidu_module, monkeypatch: pytest.MonkeyPatch):
     vector = baidu_module.BaiduVector.__new__(baidu_module.BaiduVector)
     vector._collection_name = "collection_1"
     vector._client_config = SimpleNamespace(
@@ -524,7 +524,9 @@ def test_create_table_raises_timeout_if_table_never_becomes_normal(baidu_module,
         vector._create_table(3)
 
 
-def test_factory_uses_existing_collection_prefix_when_index_struct_exists(baidu_module, monkeypatch):
+def test_factory_uses_existing_collection_prefix_when_index_struct_exists(
+    baidu_module, monkeypatch: pytest.MonkeyPatch
+):
     factory = baidu_module.BaiduVectorFactory()
     dataset = SimpleNamespace(
         id="dataset-1",
diff --git a/api/providers/vdb/vdb-chroma/src/dify_vdb_chroma/chroma_vector.py b/api/providers/vdb/vdb-chroma/src/dify_vdb_chroma/chroma_vector.py
index 5b0cfbea15..754b1e8a89 100644
--- a/api/providers/vdb/vdb-chroma/src/dify_vdb_chroma/chroma_vector.py
+++ b/api/providers/vdb/vdb-chroma/src/dify_vdb_chroma/chroma_vector.py
@@ -2,7 +2,7 @@ import json
 from typing import Any, TypedDict
 
 import chromadb
-from chromadb import QueryResult, Settings  # pyright: ignore[reportPrivateImportUsage]
+from chromadb import QueryResult, Settings
 from pydantic import BaseModel
 
 from configs import dify_config
@@ -166,8 +166,8 @@ class ChromaVectorFactory(AbstractVectorFactory):
             config=ChromaConfig(
                 host=dify_config.CHROMA_HOST or "",
                 port=dify_config.CHROMA_PORT,
-                tenant=dify_config.CHROMA_TENANT or chromadb.DEFAULT_TENANT,  # pyright: ignore[reportPrivateImportUsage]
-                database=dify_config.CHROMA_DATABASE or chromadb.DEFAULT_DATABASE,  # pyright: ignore[reportPrivateImportUsage]
+                tenant=dify_config.CHROMA_TENANT or chromadb.DEFAULT_TENANT,
+                database=dify_config.CHROMA_DATABASE or chromadb.DEFAULT_DATABASE,
                 auth_provider=dify_config.CHROMA_AUTH_PROVIDER,
                 auth_credentials=dify_config.CHROMA_AUTH_CREDENTIALS,
             ),
diff --git a/api/providers/vdb/vdb-chroma/tests/unit_tests/test_chroma_vector.py b/api/providers/vdb/vdb-chroma/tests/unit_tests/test_chroma_vector.py
index b209c9df96..f18f9a6561 100644
--- a/api/providers/vdb/vdb-chroma/tests/unit_tests/test_chroma_vector.py
+++ b/api/providers/vdb/vdb-chroma/tests/unit_tests/test_chroma_vector.py
@@ -44,7 +44,7 @@ def _build_fake_chroma_modules():
 
 
 @pytest.fixture
-def chroma_module(monkeypatch):
+def chroma_module(monkeypatch: pytest.MonkeyPatch):
     fake_chroma = _build_fake_chroma_modules()
     monkeypatch.setitem(sys.modules, "chromadb", fake_chroma)
     import dify_vdb_chroma.chroma_vector as module
@@ -73,7 +73,7 @@ def test_chroma_config_to_params_builds_expected_payload(chroma_module):
     assert params["settings"].chroma_client_auth_credentials == "credentials"
 
 
-def test_create_collection_uses_redis_lock_and_cache(chroma_module, monkeypatch):
+def test_create_collection_uses_redis_lock_and_cache(chroma_module, monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = None
@@ -173,7 +173,7 @@ def test_search_by_full_text_returns_empty_list(chroma_module):
     assert vector.search_by_full_text("query") == []
 
 
-def test_factory_init_vector_uses_existing_or_generated_collection(chroma_module, monkeypatch):
+def test_factory_init_vector_uses_existing_or_generated_collection(chroma_module, monkeypatch: pytest.MonkeyPatch):
     factory = chroma_module.ChromaVectorFactory()
     dataset_with_index = SimpleNamespace(
         id="dataset-1", index_struct_dict={"vector_store": {"class_prefix": "EXISTING"}}, index_struct=None
diff --git a/api/providers/vdb/vdb-clickzetta/tests/unit_tests/test_clickzetta_vector.py b/api/providers/vdb/vdb-clickzetta/tests/unit_tests/test_clickzetta_vector.py
index a7473f1b91..4f8395e475 100644
--- a/api/providers/vdb/vdb-clickzetta/tests/unit_tests/test_clickzetta_vector.py
+++ b/api/providers/vdb/vdb-clickzetta/tests/unit_tests/test_clickzetta_vector.py
@@ -45,7 +45,7 @@ def _build_fake_clickzetta_module():
 
 
 @pytest.fixture
-def clickzetta_module(monkeypatch):
+def clickzetta_module(monkeypatch: pytest.MonkeyPatch):
     monkeypatch.setitem(sys.modules, "clickzetta", _build_fake_clickzetta_module())
     import dify_vdb_clickzetta.clickzetta_vector as module
 
@@ -218,7 +218,7 @@ def test_search_by_like_returns_documents_with_default_score(clickzetta_module):
     assert docs[0].metadata["score"] == 0.5
 
 
-def test_factory_initializes_clickzetta_vector(clickzetta_module, monkeypatch):
+def test_factory_initializes_clickzetta_vector(clickzetta_module, monkeypatch: pytest.MonkeyPatch):
     factory = clickzetta_module.ClickzettaVectorFactory()
     dataset = SimpleNamespace(id="dataset-1")
 
@@ -243,7 +243,7 @@ def test_factory_initializes_clickzetta_vector(clickzetta_module, monkeypatch):
     assert vector_cls.call_args.kwargs["collection_name"] == "collection"
 
 
-def test_connection_pool_singleton_and_config_key(clickzetta_module, monkeypatch):
+def test_connection_pool_singleton_and_config_key(clickzetta_module, monkeypatch: pytest.MonkeyPatch):
     clickzetta_module.ClickzettaConnectionPool._instance = None
     monkeypatch.setattr(clickzetta_module.ClickzettaConnectionPool, "_start_cleanup_thread", MagicMock())
 
@@ -255,7 +255,7 @@ def test_connection_pool_singleton_and_config_key(clickzetta_module, monkeypatch
     assert "username:instance:service:workspace:cluster:dify" in key
 
 
-def test_connection_pool_create_connection_retries_and_configures(clickzetta_module, monkeypatch):
+def test_connection_pool_create_connection_retries_and_configures(clickzetta_module, monkeypatch: pytest.MonkeyPatch):
     monkeypatch.setattr(clickzetta_module.ClickzettaConnectionPool, "_start_cleanup_thread", MagicMock())
     pool = clickzetta_module.ClickzettaConnectionPool()
     config = _config(clickzetta_module)
@@ -274,7 +274,7 @@ def test_connection_pool_create_connection_retries_and_configures(clickzetta_mod
     pool._configure_connection.assert_called_once_with(connection)
 
 
-def test_connection_pool_create_connection_raises_after_retries(clickzetta_module, monkeypatch):
+def test_connection_pool_create_connection_raises_after_retries(clickzetta_module, monkeypatch: pytest.MonkeyPatch):
     monkeypatch.setattr(clickzetta_module.ClickzettaConnectionPool, "_start_cleanup_thread", MagicMock())
     pool = clickzetta_module.ClickzettaConnectionPool()
     config = _config(clickzetta_module)
@@ -318,7 +318,7 @@ def test_connection_pool_configure_connection_swallows_errors(clickzetta_module)
     monkeypatch.undo()
 
 
-def test_connection_pool_get_return_cleanup_and_shutdown(clickzetta_module, monkeypatch):
+def test_connection_pool_get_return_cleanup_and_shutdown(clickzetta_module, monkeypatch: pytest.MonkeyPatch):
     monkeypatch.setattr(clickzetta_module.ClickzettaConnectionPool, "_start_cleanup_thread", MagicMock())
     pool = clickzetta_module.ClickzettaConnectionPool()
     config = _config(clickzetta_module)
@@ -360,7 +360,7 @@ def test_connection_pool_get_return_cleanup_and_shutdown(clickzetta_module, monk
     assert pool._shutdown is True
 
 
-def test_connection_pool_start_cleanup_thread_runs_worker_once(clickzetta_module, monkeypatch):
+def test_connection_pool_start_cleanup_thread_runs_worker_once(clickzetta_module, monkeypatch: pytest.MonkeyPatch):
     pool = clickzetta_module.ClickzettaConnectionPool.__new__(clickzetta_module.ClickzettaConnectionPool)
     pool._shutdown = False
     pool._cleanup_expired_connections = MagicMock(side_effect=lambda: setattr(pool, "_shutdown", True))
@@ -384,7 +384,7 @@ def test_connection_pool_start_cleanup_thread_runs_worker_once(clickzetta_module
     pool._cleanup_expired_connections.assert_called_once()
 
 
-def test_vector_init_connection_context_and_helpers(clickzetta_module, monkeypatch):
+def test_vector_init_connection_context_and_helpers(clickzetta_module, monkeypatch: pytest.MonkeyPatch):
     pool = MagicMock()
     pool.get_connection.return_value = "conn"
     monkeypatch.setattr(clickzetta_module.ClickzettaConnectionPool, "get_instance", MagicMock(return_value=pool))
@@ -405,7 +405,7 @@ def test_vector_init_connection_context_and_helpers(clickzetta_module, monkeypat
     assert vector._ensure_connection() == "conn"
 
 
-def test_write_queue_initialization_worker_and_execute_write(clickzetta_module, monkeypatch):
+def test_write_queue_initialization_worker_and_execute_write(clickzetta_module, monkeypatch: pytest.MonkeyPatch):
     class _Thread:
         def __init__(self, target, daemon):
             self.target = target
@@ -579,7 +579,7 @@ def test_create_inverted_index_branches(clickzetta_module):
     vector._create_inverted_index(cursor)
 
 
-def test_add_texts_batches_and_insert_batch_behaviors(clickzetta_module, monkeypatch):
+def test_add_texts_batches_and_insert_batch_behaviors(clickzetta_module, monkeypatch: pytest.MonkeyPatch):
     vector = clickzetta_module.ClickzettaVector.__new__(clickzetta_module.ClickzettaVector)
     vector._config = _config(clickzetta_module)
     vector._config.batch_size = 2
@@ -811,7 +811,7 @@ def test_clickzetta_pool_cleanup_and_shutdown_edge_paths(clickzetta_module):
     assert pool._shutdown is True
 
 
-def test_clickzetta_pool_cleanup_thread_and_worker_exception_paths(clickzetta_module, monkeypatch):
+def test_clickzetta_pool_cleanup_thread_and_worker_exception_paths(clickzetta_module, monkeypatch: pytest.MonkeyPatch):
     pool = clickzetta_module.ClickzettaConnectionPool.__new__(clickzetta_module.ClickzettaConnectionPool)
     pool._shutdown = False
 
diff --git a/api/providers/vdb/vdb-couchbase/src/dify_vdb_couchbase/couchbase_vector.py b/api/providers/vdb/vdb-couchbase/src/dify_vdb_couchbase/couchbase_vector.py
index bab176e285..5deac59dc9 100644
--- a/api/providers/vdb/vdb-couchbase/src/dify_vdb_couchbase/couchbase_vector.py
+++ b/api/providers/vdb/vdb-couchbase/src/dify_vdb_couchbase/couchbase_vector.py
@@ -59,7 +59,7 @@ class CouchbaseVector(BaseVector):
 
         auth = PasswordAuthenticator(config.user, config.password)
         options = ClusterOptions(auth)
-        self._cluster = Cluster(config.connection_string, options)  # pyright: ignore[reportArgumentType]
+        self._cluster = Cluster(config.connection_string, options)
         self._bucket = self._cluster.bucket(config.bucket_name)
         self._scope = self._bucket.scope(config.scope_name)
         self._bucket_name = config.bucket_name
@@ -306,7 +306,7 @@ class CouchbaseVector(BaseVector):
     def search_by_full_text(self, query: str, **kwargs: Any) -> list[Document]:
         top_k = kwargs.get("top_k", 4)
         try:
-            CBrequest = search.SearchRequest.create(search.QueryStringQuery("text:" + query))  # pyright: ignore[reportCallIssue]
+            CBrequest = search.SearchRequest.create(search.QueryStringQuery("text:" + query))  # pyrefly: ignore[bad-argument-count]
             search_iter = self._scope.search(
                 self._collection_name + "_search", CBrequest, SearchOptions(limit=top_k, fields=["*"])
             )
diff --git a/api/providers/vdb/vdb-couchbase/tests/unit_tests/test_couchbase_vector.py b/api/providers/vdb/vdb-couchbase/tests/unit_tests/test_couchbase_vector.py
index 7e5c40b8f2..d474b566d3 100644
--- a/api/providers/vdb/vdb-couchbase/tests/unit_tests/test_couchbase_vector.py
+++ b/api/providers/vdb/vdb-couchbase/tests/unit_tests/test_couchbase_vector.py
@@ -150,7 +150,7 @@ def _build_fake_couchbase_modules():
 
 
 @pytest.fixture
-def couchbase_module(monkeypatch):
+def couchbase_module(monkeypatch: pytest.MonkeyPatch):
     for name, module in _build_fake_couchbase_modules().items():
         monkeypatch.setitem(sys.modules, name, module)
 
@@ -194,7 +194,7 @@ def test_init_sets_cluster_handles(couchbase_module):
     vector._cluster.wait_until_ready.assert_called_once()
 
 
-def test_create_and_create_collection_branches(couchbase_module, monkeypatch):
+def test_create_and_create_collection_branches(couchbase_module, monkeypatch: pytest.MonkeyPatch):
     vector = couchbase_module.CouchbaseVector.__new__(couchbase_module.CouchbaseVector)
     vector._collection_name = "collection_1"
     vector._client_config = _config(couchbase_module)
@@ -319,7 +319,7 @@ def test_search_methods_and_format_metadata(couchbase_module):
     assert vector._format_metadata({"metadata.a": 1, "plain": 2}) == {"a": 1, "plain": 2}
 
 
-def test_delete_collection_and_factory(couchbase_module, monkeypatch):
+def test_delete_collection_and_factory(couchbase_module, monkeypatch: pytest.MonkeyPatch):
     vector = couchbase_module.CouchbaseVector("collection_1", _config(couchbase_module))
     scopes = [
         SimpleNamespace(collections=[SimpleNamespace(name="other")]),
diff --git a/api/providers/vdb/vdb-elasticsearch/tests/unit_tests/test_elasticsearch_ja_vector.py b/api/providers/vdb/vdb-elasticsearch/tests/unit_tests/test_elasticsearch_ja_vector.py
index f81ed6beea..91cc2e0fdb 100644
--- a/api/providers/vdb/vdb-elasticsearch/tests/unit_tests/test_elasticsearch_ja_vector.py
+++ b/api/providers/vdb/vdb-elasticsearch/tests/unit_tests/test_elasticsearch_ja_vector.py
@@ -28,7 +28,7 @@ def _build_fake_elasticsearch_modules():
 
 
 @pytest.fixture
-def elasticsearch_ja_module(monkeypatch):
+def elasticsearch_ja_module(monkeypatch: pytest.MonkeyPatch):
     for name, module in _build_fake_elasticsearch_modules().items():
         monkeypatch.setitem(sys.modules, name, module)
 
@@ -39,7 +39,7 @@ def elasticsearch_ja_module(monkeypatch):
     return importlib.reload(ja_module)
 
 
-def test_create_collection_cache_hit(elasticsearch_ja_module, monkeypatch):
+def test_create_collection_cache_hit(elasticsearch_ja_module, monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = None
@@ -57,7 +57,7 @@ def test_create_collection_cache_hit(elasticsearch_ja_module, monkeypatch):
     elasticsearch_ja_module.redis_client.set.assert_not_called()
 
 
-def test_create_collection_create_and_exists_paths(elasticsearch_ja_module, monkeypatch):
+def test_create_collection_create_and_exists_paths(elasticsearch_ja_module, monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = None
@@ -87,7 +87,7 @@ def test_create_collection_create_and_exists_paths(elasticsearch_ja_module, monk
     elasticsearch_ja_module.redis_client.set.assert_called_once()
 
 
-def test_ja_factory_uses_existing_or_generated_collection(elasticsearch_ja_module, monkeypatch):
+def test_ja_factory_uses_existing_or_generated_collection(elasticsearch_ja_module, monkeypatch: pytest.MonkeyPatch):
     factory = elasticsearch_ja_module.ElasticSearchJaVectorFactory()
     dataset_with_index = SimpleNamespace(
         id="dataset-1",
diff --git a/api/providers/vdb/vdb-elasticsearch/tests/unit_tests/test_elasticsearch_vector.py b/api/providers/vdb/vdb-elasticsearch/tests/unit_tests/test_elasticsearch_vector.py
index 48f1f6dc26..d54c105a0f 100644
--- a/api/providers/vdb/vdb-elasticsearch/tests/unit_tests/test_elasticsearch_vector.py
+++ b/api/providers/vdb/vdb-elasticsearch/tests/unit_tests/test_elasticsearch_vector.py
@@ -38,7 +38,7 @@ def _build_fake_elasticsearch_modules():
 
 
 @pytest.fixture
-def elasticsearch_module(monkeypatch):
+def elasticsearch_module(monkeypatch: pytest.MonkeyPatch):
     for name, module in _build_fake_elasticsearch_modules().items():
         monkeypatch.setitem(sys.modules, name, module)
 
@@ -287,7 +287,7 @@ def test_search_by_vector_and_full_text(elasticsearch_module):
     assert "bool" in query
 
 
-def test_create_and_create_collection_paths(elasticsearch_module, monkeypatch):
+def test_create_and_create_collection_paths(elasticsearch_module, monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = None
@@ -331,7 +331,7 @@ def test_create_and_create_collection_paths(elasticsearch_module, monkeypatch):
     elasticsearch_module.redis_client.set.assert_called_once()
 
 
-def test_elasticsearch_factory_branches(elasticsearch_module, monkeypatch):
+def test_elasticsearch_factory_branches(elasticsearch_module, monkeypatch: pytest.MonkeyPatch):
     factory = elasticsearch_module.ElasticSearchVectorFactory()
     dataset_with_index = SimpleNamespace(
         id="dataset-1",
diff --git a/api/providers/vdb/vdb-hologres/tests/unit_tests/test_hologres_vector.py b/api/providers/vdb/vdb-hologres/tests/unit_tests/test_hologres_vector.py
index f9a557ecce..8b197662e3 100644
--- a/api/providers/vdb/vdb-hologres/tests/unit_tests/test_hologres_vector.py
+++ b/api/providers/vdb/vdb-hologres/tests/unit_tests/test_hologres_vector.py
@@ -38,7 +38,7 @@ def _build_fake_hologres_modules():
 
 
 @pytest.fixture
-def hologres_module(monkeypatch):
+def hologres_module(monkeypatch: pytest.MonkeyPatch):
     for name, module in _build_fake_hologres_modules().items():
         monkeypatch.setitem(sys.modules, name, module)
 
@@ -266,7 +266,7 @@ def test_delete_handles_existing_and_missing_tables(hologres_module):
     vector._client.drop_table.assert_called_once_with(vector.table_name)
 
 
-def test_create_collection_returns_early_when_cache_hits(hologres_module, monkeypatch):
+def test_create_collection_returns_early_when_cache_hits(hologres_module, monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = False
@@ -281,7 +281,7 @@ def test_create_collection_returns_early_when_cache_hits(hologres_module, monkey
     hologres_module.redis_client.set.assert_not_called()
 
 
-def test_create_collection_creates_table_and_indexes(hologres_module, monkeypatch):
+def test_create_collection_creates_table_and_indexes(hologres_module, monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = False
@@ -313,7 +313,7 @@ def test_create_collection_creates_table_and_indexes(hologres_module, monkeypatc
     hologres_module.redis_client.set.assert_called_once()
 
 
-def test_create_collection_raises_when_table_never_becomes_ready(hologres_module, monkeypatch):
+def test_create_collection_raises_when_table_never_becomes_ready(hologres_module, monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = False
@@ -331,7 +331,7 @@ def test_create_collection_raises_when_table_never_becomes_ready(hologres_module
     hologres_module.redis_client.set.assert_not_called()
 
 
-def test_hologres_factory_uses_existing_or_generated_collection(hologres_module, monkeypatch):
+def test_hologres_factory_uses_existing_or_generated_collection(hologres_module, monkeypatch: pytest.MonkeyPatch):
     factory = hologres_module.HologresVectorFactory()
     dataset_with_index = SimpleNamespace(
         id="dataset-1",
diff --git a/api/providers/vdb/vdb-huawei-cloud/tests/unit_tests/test_huawei_cloud_vector.py b/api/providers/vdb/vdb-huawei-cloud/tests/unit_tests/test_huawei_cloud_vector.py
index ba3f14912b..a1617b6d43 100644
--- a/api/providers/vdb/vdb-huawei-cloud/tests/unit_tests/test_huawei_cloud_vector.py
+++ b/api/providers/vdb/vdb-huawei-cloud/tests/unit_tests/test_huawei_cloud_vector.py
@@ -29,7 +29,7 @@ def _build_fake_elasticsearch_modules():
 
 
 @pytest.fixture
-def huawei_module(monkeypatch):
+def huawei_module(monkeypatch: pytest.MonkeyPatch):
     for name, module in _build_fake_elasticsearch_modules().items():
         monkeypatch.setitem(sys.modules, name, module)
 
@@ -155,7 +155,7 @@ def test_search_by_vector_and_full_text(huawei_module):
     assert docs[0].page_content == "text-hit"
 
 
-def test_search_by_vector_skips_hits_without_metadata(huawei_module, monkeypatch):
+def test_search_by_vector_skips_hits_without_metadata(huawei_module, monkeypatch: pytest.MonkeyPatch):
     class FakeDocument:
         def __init__(self, page_content, vector, metadata):
             self.page_content = page_content
@@ -185,7 +185,7 @@ def test_search_by_vector_skips_hits_without_metadata(huawei_module, monkeypatch
     assert docs == []
 
 
-def test_create_and_create_collection_paths(huawei_module, monkeypatch):
+def test_create_and_create_collection_paths(huawei_module, monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = None
@@ -218,7 +218,7 @@ def test_create_and_create_collection_paths(huawei_module, monkeypatch):
     huawei_module.redis_client.set.assert_called_once()
 
 
-def test_huawei_factory_branches(huawei_module, monkeypatch):
+def test_huawei_factory_branches(huawei_module, monkeypatch: pytest.MonkeyPatch):
     factory = huawei_module.HuaweiCloudVectorFactory()
     dataset_with_index = SimpleNamespace(
         id="dataset-1",
diff --git a/api/providers/vdb/vdb-iris/tests/unit_tests/test_iris_vector.py b/api/providers/vdb/vdb-iris/tests/unit_tests/test_iris_vector.py
index 8c038e82b9..b4ea6ea6c1 100644
--- a/api/providers/vdb/vdb-iris/tests/unit_tests/test_iris_vector.py
+++ b/api/providers/vdb/vdb-iris/tests/unit_tests/test_iris_vector.py
@@ -23,7 +23,7 @@ def _build_fake_iris_module():
 
 
 @pytest.fixture
-def iris_module(monkeypatch):
+def iris_module(monkeypatch: pytest.MonkeyPatch):
     monkeypatch.setitem(sys.modules, "iris", _build_fake_iris_module())
 
     import dify_vdb_iris.iris_vector as module
@@ -249,7 +249,7 @@ def test_iris_vector_init_get_cursor_and_create(iris_module):
     vector._create_collection.assert_called_once_with(2)
 
 
-def test_iris_vector_crud_and_vector_search(iris_module, monkeypatch):
+def test_iris_vector_crud_and_vector_search(iris_module, monkeypatch: pytest.MonkeyPatch):
     with patch.object(iris_module, "get_iris_pool", return_value=MagicMock()):
         vector = iris_module.IrisVector("collection", _config(iris_module))
 
@@ -297,7 +297,7 @@ def test_iris_vector_crud_and_vector_search(iris_module, monkeypatch):
     assert docs[0].metadata["score"] == pytest.approx(0.9)
 
 
-def test_iris_vector_full_text_search_paths(iris_module, monkeypatch):
+def test_iris_vector_full_text_search_paths(iris_module, monkeypatch: pytest.MonkeyPatch):
     cfg = _config(iris_module, IRIS_TEXT_INDEX=True)
     with patch.object(iris_module, "get_iris_pool", return_value=MagicMock()):
         vector = iris_module.IrisVector("collection", cfg)
@@ -344,7 +344,7 @@ def test_iris_vector_full_text_search_paths(iris_module, monkeypatch):
     assert vector_like.search_by_full_text("100%", top_k=1) == []
 
 
-def test_iris_vector_delete_create_collection_and_factory(iris_module, monkeypatch):
+def test_iris_vector_delete_create_collection_and_factory(iris_module, monkeypatch: pytest.MonkeyPatch):
     with patch.object(iris_module, "get_iris_pool", return_value=MagicMock()):
         vector = iris_module.IrisVector("collection", _config(iris_module, IRIS_TEXT_INDEX=True))
 
diff --git a/api/providers/vdb/vdb-lindorm/tests/unit_tests/test_lindorm_vector.py b/api/providers/vdb/vdb-lindorm/tests/unit_tests/test_lindorm_vector.py
index 238145c1d6..4a408d1b10 100644
--- a/api/providers/vdb/vdb-lindorm/tests/unit_tests/test_lindorm_vector.py
+++ b/api/providers/vdb/vdb-lindorm/tests/unit_tests/test_lindorm_vector.py
@@ -47,7 +47,7 @@ def _build_fake_opensearch_modules():
 
 
 @pytest.fixture
-def lindorm_module(monkeypatch):
+def lindorm_module(monkeypatch: pytest.MonkeyPatch):
     for name, module in _build_fake_opensearch_modules().items():
         monkeypatch.setitem(sys.modules, name, module)
 
@@ -100,7 +100,7 @@ def test_to_opensearch_params_and_init(lindorm_module):
     assert vector_ugc._routing == "route"
 
 
-def test_create_refresh_and_add_texts_success(lindorm_module, monkeypatch):
+def test_create_refresh_and_add_texts_success(lindorm_module, monkeypatch: pytest.MonkeyPatch):
     vector = lindorm_module.LindormVectorStore(
         "collection", _config(lindorm_module), using_ugc=True, routing_value="route"
     )
@@ -301,7 +301,7 @@ def test_search_by_full_text_success_and_error(lindorm_module):
         vector.search_by_full_text("hello")
 
 
-def test_create_collection_paths(lindorm_module, monkeypatch):
+def test_create_collection_paths(lindorm_module, monkeypatch: pytest.MonkeyPatch):
     vector = lindorm_module.LindormVectorStore("collection", _config(lindorm_module), using_ugc=False)
 
     with pytest.raises(ValueError, match="cannot be empty"):
@@ -331,7 +331,7 @@ def test_create_collection_paths(lindorm_module, monkeypatch):
     vector._client.indices.create.assert_not_called()
 
 
-def test_lindorm_factory_branches(lindorm_module, monkeypatch):
+def test_lindorm_factory_branches(lindorm_module, monkeypatch: pytest.MonkeyPatch):
     factory = lindorm_module.LindormVectorStoreFactory()
 
     monkeypatch.setattr(lindorm_module.dify_config, "LINDORM_URL", "http://localhost:9200")
diff --git a/api/providers/vdb/vdb-matrixone/tests/unit_tests/test_matrixone_vector.py b/api/providers/vdb/vdb-matrixone/tests/unit_tests/test_matrixone_vector.py
index c22f4304e5..762ec330b2 100644
--- a/api/providers/vdb/vdb-matrixone/tests/unit_tests/test_matrixone_vector.py
+++ b/api/providers/vdb/vdb-matrixone/tests/unit_tests/test_matrixone_vector.py
@@ -32,7 +32,7 @@ def _build_fake_mo_vector_modules():
 
 
 @pytest.fixture
-def matrixone_module(monkeypatch):
+def matrixone_module(monkeypatch: pytest.MonkeyPatch):
     for name, module in _build_fake_mo_vector_modules().items():
         monkeypatch.setitem(sys.modules, name, module)
 
@@ -70,7 +70,7 @@ def test_matrixone_config_validation(matrixone_module, field, value, message):
         matrixone_module.MatrixoneConfig.model_validate(values)
 
 
-def test_get_client_creates_full_text_index_when_cache_misses(matrixone_module, monkeypatch):
+def test_get_client_creates_full_text_index_when_cache_misses(matrixone_module, monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = None
@@ -86,7 +86,7 @@ def test_get_client_creates_full_text_index_when_cache_misses(matrixone_module,
     matrixone_module.redis_client.set.assert_called_once()
 
 
-def test_get_client_skips_index_creation_when_cache_hits(matrixone_module, monkeypatch):
+def test_get_client_skips_index_creation_when_cache_hits(matrixone_module, monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = None
@@ -146,7 +146,7 @@ def test_get_type_and_create_delegate_to_add_texts(matrixone_module):
     vector.add_texts.assert_called_once_with(docs, [[0.1, 0.2]])
 
 
-def test_get_client_handles_full_text_index_creation_error(matrixone_module, monkeypatch):
+def test_get_client_handles_full_text_index_creation_error(matrixone_module, monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = None
@@ -165,7 +165,7 @@ def test_get_client_handles_full_text_index_creation_error(matrixone_module, mon
     matrixone_module.redis_client.set.assert_not_called()
 
 
-def test_add_texts_generates_ids_and_inserts(matrixone_module, monkeypatch):
+def test_add_texts_generates_ids_and_inserts(matrixone_module, monkeypatch: pytest.MonkeyPatch):
     vector = matrixone_module.MatrixoneVector("collection_1", _valid_config(matrixone_module))
     vector.client = MagicMock()
     monkeypatch.setattr(matrixone_module.uuid, "uuid4", lambda: "generated-uuid")
@@ -224,7 +224,7 @@ def test_search_by_vector_builds_documents(matrixone_module):
     assert vector.client.query.call_args.kwargs["filter"] == {"document_id": {"$in": ["d-1"]}}
 
 
-def test_matrixone_factory_uses_existing_or_generated_collection(matrixone_module, monkeypatch):
+def test_matrixone_factory_uses_existing_or_generated_collection(matrixone_module, monkeypatch: pytest.MonkeyPatch):
     factory = matrixone_module.MatrixoneVectorFactory()
     dataset_with_index = SimpleNamespace(
         id="dataset-1",
diff --git a/api/providers/vdb/vdb-milvus/tests/unit_tests/test_milvus.py b/api/providers/vdb/vdb-milvus/tests/unit_tests/test_milvus.py
index 36c0ed8f6f..730ff9f296 100644
--- a/api/providers/vdb/vdb-milvus/tests/unit_tests/test_milvus.py
+++ b/api/providers/vdb/vdb-milvus/tests/unit_tests/test_milvus.py
@@ -99,7 +99,7 @@ def _build_fake_pymilvus_modules():
 
 
 @pytest.fixture
-def milvus_module(monkeypatch):
+def milvus_module(monkeypatch: pytest.MonkeyPatch):
     for name, module in _build_fake_pymilvus_modules().items():
         monkeypatch.setitem(sys.modules, name, module)
 
@@ -327,7 +327,7 @@ def test_process_search_results_and_search_methods(milvus_module):
     assert "document_id" in vector._client.search.call_args.kwargs["filter"]
 
 
-def test_create_collection_cache_and_existing_collection(milvus_module, monkeypatch):
+def test_create_collection_cache_and_existing_collection(milvus_module, monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = None
@@ -351,7 +351,7 @@ def test_create_collection_cache_and_existing_collection(milvus_module, monkeypa
     milvus_module.redis_client.set.assert_called()
 
 
-def test_create_collection_builds_schema_and_indexes(milvus_module, monkeypatch):
+def test_create_collection_builds_schema_and_indexes(milvus_module, monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = None
@@ -385,7 +385,7 @@ def test_create_collection_builds_schema_and_indexes(milvus_module, monkeypatch)
     assert call_kwargs["consistency_level"] == "Session"
 
 
-def test_factory_initializes_milvus_vector(milvus_module, monkeypatch):
+def test_factory_initializes_milvus_vector(milvus_module, monkeypatch: pytest.MonkeyPatch):
     factory = milvus_module.MilvusVectorFactory()
     dataset_with_index = SimpleNamespace(
         id="dataset-1",
diff --git a/api/providers/vdb/vdb-myscale/tests/unit_tests/test_myscale_vector.py b/api/providers/vdb/vdb-myscale/tests/unit_tests/test_myscale_vector.py
index 228ea92639..900c75fdab 100644
--- a/api/providers/vdb/vdb-myscale/tests/unit_tests/test_myscale_vector.py
+++ b/api/providers/vdb/vdb-myscale/tests/unit_tests/test_myscale_vector.py
@@ -38,7 +38,7 @@ def _build_fake_clickhouse_connect_module():
 
 
 @pytest.fixture
-def myscale_module(monkeypatch):
+def myscale_module(monkeypatch: pytest.MonkeyPatch):
     fake_module = _build_fake_clickhouse_connect_module()
     monkeypatch.setitem(sys.modules, "clickhouse_connect", fake_module)
 
@@ -90,7 +90,7 @@ def test_delete_by_ids_short_circuits_on_empty_list(myscale_module):
     vector._client.command.assert_not_called()
 
 
-def test_factory_initializes_lower_case_collection_name(myscale_module, monkeypatch):
+def test_factory_initializes_lower_case_collection_name(myscale_module, monkeypatch: pytest.MonkeyPatch):
     factory = myscale_module.MyScaleVectorFactory()
     dataset_with_index = SimpleNamespace(
         id="dataset-1",
@@ -160,7 +160,7 @@ def test_create_collection_builds_expected_sql(myscale_module):
     assert "INDEX text_idx text TYPE fts('tokenizer=unicode')" in sql
 
 
-def test_add_texts_inserts_rows_and_returns_ids(myscale_module, monkeypatch):
+def test_add_texts_inserts_rows_and_returns_ids(myscale_module, monkeypatch: pytest.MonkeyPatch):
     vector = myscale_module.MyScaleVector("collection_1", _config(myscale_module))
     monkeypatch.setattr(myscale_module.uuid, "uuid4", lambda: "generated-uuid")
     docs = [
diff --git a/api/providers/vdb/vdb-oceanbase/tests/unit_tests/test_oceanbase_vector.py b/api/providers/vdb/vdb-oceanbase/tests/unit_tests/test_oceanbase_vector.py
index 31f9ff3e56..36393cc486 100644
--- a/api/providers/vdb/vdb-oceanbase/tests/unit_tests/test_oceanbase_vector.py
+++ b/api/providers/vdb/vdb-oceanbase/tests/unit_tests/test_oceanbase_vector.py
@@ -53,7 +53,7 @@ def _build_fake_pyobvector_module():
 
 
 @pytest.fixture
-def oceanbase_module(monkeypatch):
+def oceanbase_module(monkeypatch: pytest.MonkeyPatch):
     monkeypatch.setitem(sys.modules, "pyobvector", _build_fake_pyobvector_module())
 
     import dify_vdb_oceanbase.oceanbase_vector as module
@@ -208,7 +208,7 @@ def test_create_delegates_to_collection_and_insert(oceanbase_module):
     vector.add_texts.assert_called_once_with(docs, [[0.1, 0.2]])
 
 
-def test_create_collection_cache_and_existing_table_short_circuits(oceanbase_module, monkeypatch):
+def test_create_collection_cache_and_existing_table_short_circuits(oceanbase_module, monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = None
@@ -234,7 +234,7 @@ def test_create_collection_cache_and_existing_table_short_circuits(oceanbase_mod
     vector.delete.assert_not_called()
 
 
-def test_create_collection_happy_path_with_hybrid_and_index(oceanbase_module, monkeypatch):
+def test_create_collection_happy_path_with_hybrid_and_index(oceanbase_module, monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = None
@@ -271,7 +271,7 @@ def test_create_collection_happy_path_with_hybrid_and_index(oceanbase_module, mo
     oceanbase_module.redis_client.set.assert_called_once()
 
 
-def test_create_collection_error_paths(oceanbase_module, monkeypatch):
+def test_create_collection_error_paths(oceanbase_module, monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = None
@@ -308,7 +308,7 @@ def test_create_collection_error_paths(oceanbase_module, monkeypatch):
         vector._create_collection()
 
 
-def test_create_collection_fulltext_and_metadata_index_exceptions(oceanbase_module, monkeypatch):
+def test_create_collection_fulltext_and_metadata_index_exceptions(oceanbase_module, monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = None
@@ -517,7 +517,7 @@ def test_delete_success_and_exception(oceanbase_module):
         vector.delete()
 
 
-def test_oceanbase_factory_uses_existing_or_generated_collection(oceanbase_module, monkeypatch):
+def test_oceanbase_factory_uses_existing_or_generated_collection(oceanbase_module, monkeypatch: pytest.MonkeyPatch):
     factory = oceanbase_module.OceanBaseVectorFactory()
     dataset_with_index = SimpleNamespace(
         id="dataset-1",
diff --git a/api/providers/vdb/vdb-opengauss/tests/unit_tests/test_opengauss.py b/api/providers/vdb/vdb-opengauss/tests/unit_tests/test_opengauss.py
index 09abd625fc..57c9b14d9f 100644
--- a/api/providers/vdb/vdb-opengauss/tests/unit_tests/test_opengauss.py
+++ b/api/providers/vdb/vdb-opengauss/tests/unit_tests/test_opengauss.py
@@ -37,7 +37,7 @@ def _build_fake_psycopg2_modules():
 
 
 @pytest.fixture
-def opengauss_module(monkeypatch):
+def opengauss_module(monkeypatch: pytest.MonkeyPatch):
     for name, module in _build_fake_psycopg2_modules().items():
         monkeypatch.setitem(sys.modules, name, module)
 
@@ -88,7 +88,7 @@ def test_opengauss_config_validation_rejects_min_greater_than_max(opengauss_modu
         opengauss_module.OpenGaussConfig.model_validate(values)
 
 
-def test_init_sets_table_name_and_vector_type(opengauss_module, monkeypatch):
+def test_init_sets_table_name_and_vector_type(opengauss_module, monkeypatch: pytest.MonkeyPatch):
     pool = MagicMock()
     monkeypatch.setattr(opengauss_module.psycopg2.pool, "SimpleConnectionPool", MagicMock(return_value=pool))
 
@@ -99,7 +99,7 @@ def test_init_sets_table_name_and_vector_type(opengauss_module, monkeypatch):
     assert vector.pool is pool
 
 
-def test_create_index_with_pq_executes_pq_sql(opengauss_module, monkeypatch):
+def test_create_index_with_pq_executes_pq_sql(opengauss_module, monkeypatch: pytest.MonkeyPatch):
     pool = MagicMock()
     monkeypatch.setattr(opengauss_module.psycopg2.pool, "SimpleConnectionPool", MagicMock(return_value=pool))
 
@@ -126,7 +126,7 @@ def test_create_index_with_pq_executes_pq_sql(opengauss_module, monkeypatch):
     opengauss_module.redis_client.set.assert_called_once()
 
 
-def test_create_index_skips_index_sql_for_large_dimension(opengauss_module, monkeypatch):
+def test_create_index_skips_index_sql_for_large_dimension(opengauss_module, monkeypatch: pytest.MonkeyPatch):
     pool = MagicMock()
     monkeypatch.setattr(opengauss_module.psycopg2.pool, "SimpleConnectionPool", MagicMock(return_value=pool))
 
@@ -158,7 +158,7 @@ def test_search_by_vector_validates_top_k(opengauss_module):
         vector.search_by_vector([0.1, 0.2], top_k=0)
 
 
-def test_delete_by_ids_short_circuits_with_empty_input(opengauss_module, monkeypatch):
+def test_delete_by_ids_short_circuits_with_empty_input(opengauss_module, monkeypatch: pytest.MonkeyPatch):
     pool = MagicMock()
     monkeypatch.setattr(opengauss_module.psycopg2.pool, "SimpleConnectionPool", MagicMock(return_value=pool))
     vector = opengauss_module.OpenGauss("collection_1", _config(opengauss_module))
@@ -200,7 +200,7 @@ def test_create_calls_collection_insert_and_index(opengauss_module):
     vector._create_index.assert_called_once_with(2)
 
 
-def test_create_index_returns_early_on_cache_hit(opengauss_module, monkeypatch):
+def test_create_index_returns_early_on_cache_hit(opengauss_module, monkeypatch: pytest.MonkeyPatch):
     pool = MagicMock()
     monkeypatch.setattr(opengauss_module.psycopg2.pool, "SimpleConnectionPool", MagicMock(return_value=pool))
 
@@ -220,7 +220,7 @@ def test_create_index_returns_early_on_cache_hit(opengauss_module, monkeypatch):
     opengauss_module.redis_client.set.assert_not_called()
 
 
-def test_create_index_without_pq_executes_standard_index_sql(opengauss_module, monkeypatch):
+def test_create_index_without_pq_executes_standard_index_sql(opengauss_module, monkeypatch: pytest.MonkeyPatch):
     pool = MagicMock()
     monkeypatch.setattr(opengauss_module.psycopg2.pool, "SimpleConnectionPool", MagicMock(return_value=pool))
 
@@ -245,7 +245,7 @@ def test_create_index_without_pq_executes_standard_index_sql(opengauss_module, m
     assert any("embedding_cosine_embedding_collection_1_idx" in query for query in sql)
 
 
-def test_add_texts_uses_execute_values(opengauss_module, monkeypatch):
+def test_add_texts_uses_execute_values(opengauss_module, monkeypatch: pytest.MonkeyPatch):
     pool = MagicMock()
     monkeypatch.setattr(opengauss_module.psycopg2.pool, "SimpleConnectionPool", MagicMock(return_value=pool))
     vector = opengauss_module.OpenGauss("collection_1", _config(opengauss_module))
@@ -342,7 +342,7 @@ def test_search_by_full_text_validates_top_k(opengauss_module):
         vector.search_by_full_text("query", top_k=0)
 
 
-def test_create_collection_cache_and_create_path(opengauss_module, monkeypatch):
+def test_create_collection_cache_and_create_path(opengauss_module, monkeypatch: pytest.MonkeyPatch):
     pool = MagicMock()
     monkeypatch.setattr(opengauss_module.psycopg2.pool, "SimpleConnectionPool", MagicMock(return_value=pool))
     lock = MagicMock()
@@ -370,7 +370,7 @@ def test_create_collection_cache_and_create_path(opengauss_module, monkeypatch):
     opengauss_module.redis_client.set.assert_called_once()
 
 
-def test_opengauss_factory_uses_existing_or_generated_collection(opengauss_module, monkeypatch):
+def test_opengauss_factory_uses_existing_or_generated_collection(opengauss_module, monkeypatch: pytest.MonkeyPatch):
     factory = opengauss_module.OpenGaussFactory()
     dataset_with_index = SimpleNamespace(
         id="dataset-1",
diff --git a/api/providers/vdb/vdb-opensearch/src/dify_vdb_opensearch/opensearch_vector.py b/api/providers/vdb/vdb-opensearch/src/dify_vdb_opensearch/opensearch_vector.py
index 843c495d82..d6998f6672 100644
--- a/api/providers/vdb/vdb-opensearch/src/dify_vdb_opensearch/opensearch_vector.py
+++ b/api/providers/vdb/vdb-opensearch/src/dify_vdb_opensearch/opensearch_vector.py
@@ -81,14 +81,15 @@ class OpenSearchConfig(BaseModel):
             pool_maxsize=20,
         )
 
-        if self.auth_method == "basic":
-            logger.info("Using basic authentication for OpenSearch Vector DB")
+        match self.auth_method:
+            case AuthMethod.BASIC:
+                logger.info("Using basic authentication for OpenSearch Vector DB")
 
-            params["http_auth"] = (self.user, self.password)
-        elif self.auth_method == "aws_managed_iam":
-            logger.info("Using AWS managed IAM role for OpenSearch Vector DB")
+                params["http_auth"] = (self.user, self.password)
+            case AuthMethod.AWS_MANAGED_IAM:
+                logger.info("Using AWS managed IAM role for OpenSearch Vector DB")
 
-            params["http_auth"] = self.create_aws_managed_iam_auth()
+                params["http_auth"] = self.create_aws_managed_iam_auth()
 
         return params
 
diff --git a/api/providers/vdb/vdb-opensearch/tests/unit_tests/test_opensearch.py b/api/providers/vdb/vdb-opensearch/tests/unit_tests/test_opensearch.py
index f2ed7cb6fb..b2b004a4de 100644
--- a/api/providers/vdb/vdb-opensearch/tests/unit_tests/test_opensearch.py
+++ b/api/providers/vdb/vdb-opensearch/tests/unit_tests/test_opensearch.py
@@ -59,7 +59,7 @@ def _build_fake_opensearch_modules():
 
 
 @pytest.fixture
-def opensearch_module(monkeypatch):
+def opensearch_module(monkeypatch: pytest.MonkeyPatch):
     for name, module in _build_fake_opensearch_modules().items():
         monkeypatch.setitem(sys.modules, name, module)
 
@@ -95,7 +95,7 @@ class TestOpenSearchConfig:
         assert params["connection_class"].__name__ == "Urllib3HttpConnection"
         assert params["http_auth"] == ("admin", "password")
 
-    def test_to_opensearch_params_with_aws_managed_iam(self, opensearch_module, monkeypatch):
+    def test_to_opensearch_params_with_aws_managed_iam(self, opensearch_module, monkeypatch: pytest.MonkeyPatch):
         class _Session:
             def get_credentials(self):
                 return "creds"
diff --git a/api/providers/vdb/vdb-opensearch/tests/unit_tests/test_opensearch_vector.py b/api/providers/vdb/vdb-opensearch/tests/unit_tests/test_opensearch_vector.py
index 1c2921f85b..80bf20e820 100644
--- a/api/providers/vdb/vdb-opensearch/tests/unit_tests/test_opensearch_vector.py
+++ b/api/providers/vdb/vdb-opensearch/tests/unit_tests/test_opensearch_vector.py
@@ -58,7 +58,7 @@ def _build_fake_opensearch_modules():
 
 
 @pytest.fixture
-def opensearch_module(monkeypatch):
+def opensearch_module(monkeypatch: pytest.MonkeyPatch):
     for name, module in _build_fake_opensearch_modules().items():
         monkeypatch.setitem(sys.modules, name, module)
 
@@ -116,7 +116,7 @@ def test_config_validation_for_aws_auth_and_https_fields(opensearch_module):
         opensearch_module.OpenSearchConfig.model_validate(values)
 
 
-def test_create_aws_managed_iam_auth(opensearch_module, monkeypatch):
+def test_create_aws_managed_iam_auth(opensearch_module, monkeypatch: pytest.MonkeyPatch):
     class _Session:
         def get_credentials(self):
             return "creds"
@@ -167,7 +167,7 @@ def test_init_and_create_delegate_calls(opensearch_module):
     vector.add_texts.assert_called_once_with(docs, [[0.1, 0.2]])
 
 
-def test_add_texts_supports_regular_and_aoss_clients(opensearch_module, monkeypatch):
+def test_add_texts_supports_regular_and_aoss_clients(opensearch_module, monkeypatch: pytest.MonkeyPatch):
     vector = opensearch_module.OpenSearchVector("Collection_1", _config(opensearch_module, aws_service="es"))
     docs = [
         Document(page_content="a", metadata={"doc_id": "1"}),
@@ -308,7 +308,7 @@ def test_search_by_full_text_and_filters(opensearch_module):
     assert query["query"]["bool"]["filter"] == [{"terms": {"metadata.document_id": ["d-1"]}}]
 
 
-def test_create_collection_cache_and_create_path(opensearch_module, monkeypatch):
+def test_create_collection_cache_and_create_path(opensearch_module, monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = None
@@ -331,7 +331,7 @@ def test_create_collection_cache_and_create_path(opensearch_module, monkeypatch)
     opensearch_module.redis_client.set.assert_called()
 
 
-def test_opensearch_factory_initializes_expected_collection_name(opensearch_module, monkeypatch):
+def test_opensearch_factory_initializes_expected_collection_name(opensearch_module, monkeypatch: pytest.MonkeyPatch):
     factory = opensearch_module.OpenSearchVectorFactory()
     dataset_with_index = SimpleNamespace(
         id="dataset-1",
diff --git a/api/providers/vdb/vdb-oracle/tests/unit_tests/test_oraclevector.py b/api/providers/vdb/vdb-oracle/tests/unit_tests/test_oraclevector.py
index 678cf876b0..46027c7e44 100644
--- a/api/providers/vdb/vdb-oracle/tests/unit_tests/test_oraclevector.py
+++ b/api/providers/vdb/vdb-oracle/tests/unit_tests/test_oraclevector.py
@@ -51,7 +51,7 @@ def _connection_with_cursor(cursor):
 
 
 @pytest.fixture
-def oracle_module(monkeypatch):
+def oracle_module(monkeypatch: pytest.MonkeyPatch):
     for name, module in _build_fake_oracle_modules().items():
         monkeypatch.setitem(sys.modules, name, module)
 
@@ -94,7 +94,7 @@ def test_oracle_config_validation_autonomous_requirements(oracle_module):
         )
 
 
-def test_init_and_get_type(oracle_module, monkeypatch):
+def test_init_and_get_type(oracle_module, monkeypatch: pytest.MonkeyPatch):
     pool = MagicMock()
     monkeypatch.setattr(oracle_module.oracledb, "create_pool", MagicMock(return_value=pool))
     vector = oracle_module.OracleVector("collection_1", _config(oracle_module))
@@ -139,7 +139,7 @@ def test_numpy_converters_and_type_handlers(oracle_module):
     assert out_float64.dtype == numpy.float64
 
 
-def test_get_connection_supports_standard_and_autonomous_paths(oracle_module, monkeypatch):
+def test_get_connection_supports_standard_and_autonomous_paths(oracle_module, monkeypatch: pytest.MonkeyPatch):
     connect = MagicMock(return_value="connection")
     monkeypatch.setattr(oracle_module.oracledb, "connect", connect)
 
@@ -173,7 +173,7 @@ def test_create_delegates_collection_and_insert(oracle_module):
     vector.add_texts.assert_called_once_with(docs, [[0.1, 0.2]])
 
 
-def test_add_texts_inserts_and_logs_on_failures(oracle_module, monkeypatch):
+def test_add_texts_inserts_and_logs_on_failures(oracle_module, monkeypatch: pytest.MonkeyPatch):
     vector = oracle_module.OracleVector.__new__(oracle_module.OracleVector)
     vector.table_name = "embedding_collection_1"
     vector.input_type_handler = MagicMock()
@@ -279,7 +279,7 @@ def _fake_nltk_module(*, missing_data=False):
     return nltk, nltk_corpus
 
 
-def test_search_by_full_text_chinese_and_english_paths(oracle_module, monkeypatch):
+def test_search_by_full_text_chinese_and_english_paths(oracle_module, monkeypatch: pytest.MonkeyPatch):
     vector = oracle_module.OracleVector.__new__(oracle_module.OracleVector)
     vector.table_name = "embedding_collection_1"
 
@@ -305,7 +305,7 @@ def test_search_by_full_text_chinese_and_english_paths(oracle_module, monkeypatc
     assert "doc_id_0" in en_params
 
 
-def test_search_by_full_text_empty_query_and_missing_nltk(oracle_module, monkeypatch):
+def test_search_by_full_text_empty_query_and_missing_nltk(oracle_module, monkeypatch: pytest.MonkeyPatch):
     vector = oracle_module.OracleVector.__new__(oracle_module.OracleVector)
     vector.table_name = "embedding_collection_1"
     vector._get_connection = MagicMock()
@@ -320,7 +320,7 @@ def test_search_by_full_text_empty_query_and_missing_nltk(oracle_module, monkeyp
         vector.search_by_full_text("english query")
 
 
-def test_create_collection_cache_and_execute_path(oracle_module, monkeypatch):
+def test_create_collection_cache_and_execute_path(oracle_module, monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = None
@@ -346,7 +346,9 @@ def test_create_collection_cache_and_execute_path(oracle_module, monkeypatch):
     oracle_module.redis_client.set.assert_called_once()
 
 
-def test_oracle_factory_init_vector_uses_existing_or_generated_collection(oracle_module, monkeypatch):
+def test_oracle_factory_init_vector_uses_existing_or_generated_collection(
+    oracle_module, monkeypatch: pytest.MonkeyPatch
+):
     factory = oracle_module.OracleVectorFactory()
     dataset_with_index = SimpleNamespace(
         id="dataset-1",
diff --git a/api/providers/vdb/vdb-pgvecto-rs/tests/unit_tests/test_pgvecto_rs.py b/api/providers/vdb/vdb-pgvecto-rs/tests/unit_tests/test_pgvecto_rs.py
index c3291f7f12..1841e88139 100644
--- a/api/providers/vdb/vdb-pgvecto-rs/tests/unit_tests/test_pgvecto_rs.py
+++ b/api/providers/vdb/vdb-pgvecto-rs/tests/unit_tests/test_pgvecto_rs.py
@@ -79,7 +79,7 @@ def _patch_both(monkeypatch, module, calls, execute_results=None):
 
 
 @pytest.fixture
-def pgvecto_module(monkeypatch):
+def pgvecto_module(monkeypatch: pytest.MonkeyPatch):
     for name, module in _build_fake_pgvecto_modules().items():
         monkeypatch.setitem(sys.modules, name, module)
 
@@ -126,7 +126,7 @@ def test_collection_base_has_expected_annotations(pgvecto_module):
     assert {"id", "text", "meta", "vector"} <= set(annotations)
 
 
-def test_init_get_type_and_create_delegate(pgvecto_module, monkeypatch):
+def test_init_get_type_and_create_delegate(pgvecto_module, monkeypatch: pytest.MonkeyPatch):
     module, _ = pgvecto_module
     session_calls = []
     monkeypatch.setattr(module, "create_engine", MagicMock(return_value="engine"))
@@ -145,7 +145,7 @@ def test_init_get_type_and_create_delegate(pgvecto_module, monkeypatch):
     vector.add_texts.assert_called_once_with(docs, [[0.1, 0.2]])
 
 
-def test_create_collection_cache_and_sql_execution(pgvecto_module, monkeypatch):
+def test_create_collection_cache_and_sql_execution(pgvecto_module, monkeypatch: pytest.MonkeyPatch):
     module, _ = pgvecto_module
     session_calls = []
     monkeypatch.setattr(module, "create_engine", MagicMock(return_value="engine"))
@@ -169,7 +169,7 @@ def test_create_collection_cache_and_sql_execution(pgvecto_module, monkeypatch):
     module.redis_client.set.assert_called()
 
 
-def test_add_texts_get_ids_and_delete_methods(pgvecto_module, monkeypatch):
+def test_add_texts_get_ids_and_delete_methods(pgvecto_module, monkeypatch: pytest.MonkeyPatch):
     module, _ = pgvecto_module
     init_calls = []
     runtime_calls = []
@@ -241,7 +241,7 @@ def test_add_texts_get_ids_and_delete_methods(pgvecto_module, monkeypatch):
     assert any("DROP TABLE IF EXISTS collection_1" in str(args[0]) for args, _ in runtime_calls)
 
 
-def test_text_exists_search_and_full_text(pgvecto_module, monkeypatch):
+def test_text_exists_search_and_full_text(pgvecto_module, monkeypatch: pytest.MonkeyPatch):
     module, _ = pgvecto_module
     init_calls = []
     monkeypatch.setattr(module, "create_engine", MagicMock(return_value="engine"))
@@ -313,7 +313,7 @@ def test_text_exists_search_and_full_text(pgvecto_module, monkeypatch):
     assert vector.search_by_full_text("hello") == []
 
 
-def test_factory_uses_existing_or_generated_collection(pgvecto_module, monkeypatch):
+def test_factory_uses_existing_or_generated_collection(pgvecto_module, monkeypatch: pytest.MonkeyPatch):
     module, _ = pgvecto_module
     factory = module.PGVectoRSFactory()
     dataset_with_index = SimpleNamespace(
diff --git a/api/providers/vdb/vdb-pgvector/tests/unit_tests/test_pgvector.py b/api/providers/vdb/vdb-pgvector/tests/unit_tests/test_pgvector.py
index 99a6e00c16..38e472df63 100644
--- a/api/providers/vdb/vdb-pgvector/tests/unit_tests/test_pgvector.py
+++ b/api/providers/vdb/vdb-pgvector/tests/unit_tests/test_pgvector.py
@@ -336,7 +336,7 @@ def test_create_delegates_collection_creation_and_insert():
     vector.add_texts.assert_called_once_with(docs, [[0.1, 0.2]])
 
 
-def test_add_texts_uses_execute_values_and_returns_ids(monkeypatch):
+def test_add_texts_uses_execute_values_and_returns_ids(monkeypatch: pytest.MonkeyPatch):
     vector = PGVector.__new__(PGVector)
     vector.table_name = "embedding_collection_1"
 
@@ -387,7 +387,7 @@ def test_text_get_and_delete_methods():
     assert any("DROP TABLE IF EXISTS embedding_collection_1" in sql for sql in executed_sql)
 
 
-def test_delete_by_ids_handles_empty_undefined_table_and_generic_exception(monkeypatch):
+def test_delete_by_ids_handles_empty_undefined_table_and_generic_exception(monkeypatch: pytest.MonkeyPatch):
     vector = PGVector.__new__(PGVector)
     vector.table_name = "embedding_collection_1"
     cursor = MagicMock()
@@ -464,7 +464,7 @@ def test_search_by_full_text_branches_for_bigm_and_standard():
     assert "bigm_similarity" in cursor.execute.call_args_list[1].args[0]
 
 
-def test_pgvector_factory_initializes_expected_collection_name(monkeypatch):
+def test_pgvector_factory_initializes_expected_collection_name(monkeypatch: pytest.MonkeyPatch):
     factory = pgvector_module.PGVectorFactory()
     dataset_with_index = SimpleNamespace(
         id="dataset-1",
diff --git a/api/providers/vdb/vdb-qdrant/src/dify_vdb_qdrant/qdrant_vector.py b/api/providers/vdb/vdb-qdrant/src/dify_vdb_qdrant/qdrant_vector.py
index b5ff87fc5d..6b0216441b 100644
--- a/api/providers/vdb/vdb-qdrant/src/dify_vdb_qdrant/qdrant_vector.py
+++ b/api/providers/vdb/vdb-qdrant/src/dify_vdb_qdrant/qdrant_vector.py
@@ -471,7 +471,7 @@ class QdrantVector(BaseVector):
 
     def _reload_if_needed(self):
         if isinstance(self._client, QdrantLocal):
-            self._client._load()  # pyright: ignore[reportPrivateUsage]
+            self._client._load()
 
     @classmethod
     def _document_from_scored_point(
diff --git a/api/providers/vdb/vdb-qdrant/tests/unit_tests/test_qdrant_vector.py b/api/providers/vdb/vdb-qdrant/tests/unit_tests/test_qdrant_vector.py
index 0ed5491fbe..89ee0a47f1 100644
--- a/api/providers/vdb/vdb-qdrant/tests/unit_tests/test_qdrant_vector.py
+++ b/api/providers/vdb/vdb-qdrant/tests/unit_tests/test_qdrant_vector.py
@@ -121,7 +121,7 @@ def _build_fake_qdrant_modules():
 
 
 @pytest.fixture
-def qdrant_module(monkeypatch):
+def qdrant_module(monkeypatch: pytest.MonkeyPatch):
     for name, module in _build_fake_qdrant_modules().items():
         monkeypatch.setitem(sys.modules, name, module)
 
@@ -170,7 +170,7 @@ def test_init_and_basic_behaviour(qdrant_module):
     vector.add_texts.assert_called_once()
 
 
-def test_create_collection_and_add_texts(qdrant_module, monkeypatch):
+def test_create_collection_and_add_texts(qdrant_module, monkeypatch: pytest.MonkeyPatch):
     vector = qdrant_module.QdrantVector("collection_1", "group-1", _config(qdrant_module))
     lock = MagicMock()
     lock.__enter__.return_value = None
@@ -288,7 +288,7 @@ def test_search_and_helper_methods(qdrant_module):
     assert doc.page_content == "doc"
 
 
-def test_qdrant_factory_paths(qdrant_module, monkeypatch):
+def test_qdrant_factory_paths(qdrant_module, monkeypatch: pytest.MonkeyPatch):
     factory = qdrant_module.QdrantVectorFactory()
     dataset = SimpleNamespace(
         id="dataset-1",
diff --git a/api/providers/vdb/vdb-relyt/tests/unit_tests/test_relyt_vector.py b/api/providers/vdb/vdb-relyt/tests/unit_tests/test_relyt_vector.py
index f97ad1400a..c5f3a9f847 100644
--- a/api/providers/vdb/vdb-relyt/tests/unit_tests/test_relyt_vector.py
+++ b/api/providers/vdb/vdb-relyt/tests/unit_tests/test_relyt_vector.py
@@ -59,7 +59,7 @@ def _patch_both(monkeypatch, module, session):
 
 
 @pytest.fixture
-def relyt_module(monkeypatch):
+def relyt_module(monkeypatch: pytest.MonkeyPatch):
     for name, module in _build_fake_relyt_modules().items():
         monkeypatch.setitem(sys.modules, name, module)
 
@@ -97,7 +97,7 @@ def test_relyt_config_validation(relyt_module, field, value, message):
         relyt_module.RelytConfig.model_validate(values)
 
 
-def test_init_get_type_and_create_delegate(relyt_module, monkeypatch):
+def test_init_get_type_and_create_delegate(relyt_module, monkeypatch: pytest.MonkeyPatch):
     engine = MagicMock()
     monkeypatch.setattr(relyt_module, "create_engine", MagicMock(return_value=engine))
     vector = relyt_module.RelytVector("collection_1", _config(relyt_module), group_id="group-1")
@@ -114,7 +114,7 @@ def test_init_get_type_and_create_delegate(relyt_module, monkeypatch):
     vector.add_texts.assert_called_once_with(docs, [[0.1, 0.2]])
 
 
-def test_create_collection_cache_and_sql_execution(relyt_module, monkeypatch):
+def test_create_collection_cache_and_sql_execution(relyt_module, monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = None
@@ -142,7 +142,7 @@ def test_create_collection_cache_and_sql_execution(relyt_module, monkeypatch):
     relyt_module.redis_client.set.assert_called_once()
 
 
-def test_add_texts_and_metadata_queries(relyt_module, monkeypatch):
+def test_add_texts_and_metadata_queries(relyt_module, monkeypatch: pytest.MonkeyPatch):
     vector = relyt_module.RelytVector.__new__(relyt_module.RelytVector)
     vector._collection_name = "collection_1"
     vector._group_id = "group-1"
@@ -212,7 +212,7 @@ def test_delete_by_metadata_field_calls_delete_by_uuids(relyt_module):
 
 
 # 3. delete_by_ids translates to uuids
-def test_delete_by_ids_translates_to_uuids(relyt_module, monkeypatch):
+def test_delete_by_ids_translates_to_uuids(relyt_module, monkeypatch: pytest.MonkeyPatch):
     vector = relyt_module.RelytVector.__new__(relyt_module.RelytVector)
     vector._collection_name = "collection_1"
     vector.client = MagicMock()
@@ -225,7 +225,7 @@ def test_delete_by_ids_translates_to_uuids(relyt_module, monkeypatch):
 
 
 # 4. text_exists True
-def test_text_exists_true(relyt_module, monkeypatch):
+def test_text_exists_true(relyt_module, monkeypatch: pytest.MonkeyPatch):
     vector = relyt_module.RelytVector.__new__(relyt_module.RelytVector)
     vector._collection_name = "collection_1"
     vector.client = MagicMock()
@@ -236,7 +236,7 @@ def test_text_exists_true(relyt_module, monkeypatch):
 
 
 # 5. text_exists False
-def test_text_exists_false(relyt_module, monkeypatch):
+def test_text_exists_false(relyt_module, monkeypatch: pytest.MonkeyPatch):
     vector = relyt_module.RelytVector.__new__(relyt_module.RelytVector)
     vector._collection_name = "collection_1"
     vector.client = MagicMock()
@@ -284,7 +284,7 @@ def test_search_by_vector_filters_by_score_and_ids(relyt_module):
 
 
 # 8. delete commits session
-def test_delete_drops_table(relyt_module, monkeypatch):
+def test_delete_drops_table(relyt_module, monkeypatch: pytest.MonkeyPatch):
     vector = relyt_module.RelytVector.__new__(relyt_module.RelytVector)
     vector._collection_name = "collection_1"
     vector.client = MagicMock()
@@ -295,7 +295,7 @@ def test_delete_drops_table(relyt_module, monkeypatch):
     session.execute.assert_called_once()
 
 
-def test_relyt_factory_existing_and_generated_collection(relyt_module, monkeypatch):
+def test_relyt_factory_existing_and_generated_collection(relyt_module, monkeypatch: pytest.MonkeyPatch):
     factory = relyt_module.RelytVectorFactory()
     dataset_with_index = SimpleNamespace(
         id="dataset-1",
diff --git a/api/providers/vdb/vdb-tablestore/tests/unit_tests/test_tablestore_vector.py b/api/providers/vdb/vdb-tablestore/tests/unit_tests/test_tablestore_vector.py
index 62a11e0445..49d4b160cf 100644
--- a/api/providers/vdb/vdb-tablestore/tests/unit_tests/test_tablestore_vector.py
+++ b/api/providers/vdb/vdb-tablestore/tests/unit_tests/test_tablestore_vector.py
@@ -77,7 +77,7 @@ def _build_fake_tablestore_module():
 
 
 @pytest.fixture
-def tablestore_module(monkeypatch):
+def tablestore_module(monkeypatch: pytest.MonkeyPatch):
     fake_module = _build_fake_tablestore_module()
     monkeypatch.setitem(sys.modules, "tablestore", fake_module)
 
@@ -177,7 +177,7 @@ def test_get_by_ids_text_exists_delete_and_wrappers(tablestore_module):
     vector._delete_table_if_exist.assert_called_once()
 
 
-def test_create_collection_and_table_index_lifecycle(tablestore_module, monkeypatch):
+def test_create_collection_and_table_index_lifecycle(tablestore_module, monkeypatch: pytest.MonkeyPatch):
     vector = tablestore_module.TableStoreVector("collection_1", _config(tablestore_module))
     lock = MagicMock()
     lock.__enter__.return_value = None
@@ -289,7 +289,7 @@ def test_write_row_and_search_helpers(tablestore_module):
     assert "score" not in docs[0].metadata
 
 
-def test_tablestore_factory_uses_existing_or_generated_collection(tablestore_module, monkeypatch):
+def test_tablestore_factory_uses_existing_or_generated_collection(tablestore_module, monkeypatch: pytest.MonkeyPatch):
     factory = tablestore_module.TableStoreVectorFactory()
     dataset_with_index = SimpleNamespace(
         id="dataset-1",
diff --git a/api/providers/vdb/vdb-tencent/tests/unit_tests/test_tencent_vector.py b/api/providers/vdb/vdb-tencent/tests/unit_tests/test_tencent_vector.py
index 299e40ee1e..e1fe227a29 100644
--- a/api/providers/vdb/vdb-tencent/tests/unit_tests/test_tencent_vector.py
+++ b/api/providers/vdb/vdb-tencent/tests/unit_tests/test_tencent_vector.py
@@ -136,7 +136,7 @@ def _build_fake_tencent_modules():
 
 
 @pytest.fixture
-def tencent_module(monkeypatch):
+def tencent_module(monkeypatch: pytest.MonkeyPatch):
     for name, module in _build_fake_tencent_modules().items():
         monkeypatch.setitem(sys.modules, name, module)
 
@@ -187,7 +187,7 @@ def test_config_and_init_paths(tencent_module):
     assert vector._enable_hybrid_search is False
 
 
-def test_create_collection_branches(tencent_module, monkeypatch):
+def test_create_collection_branches(tencent_module, monkeypatch: pytest.MonkeyPatch):
     vector = tencent_module.TencentVector("collection_1", _config(tencent_module))
 
     lock = MagicMock()
@@ -279,7 +279,7 @@ def test_create_add_delete_and_search_behaviour(tencent_module):
     vector._client.drop_collection.assert_called_once()
 
 
-def test_tencent_factory_existing_and_generated_collection(tencent_module, monkeypatch):
+def test_tencent_factory_existing_and_generated_collection(tencent_module, monkeypatch: pytest.MonkeyPatch):
     factory = tencent_module.TencentVectorFactory()
     dataset_with_index = SimpleNamespace(
         id="dataset-1",
diff --git a/api/providers/vdb/vdb-tidb-on-qdrant/src/dify_vdb_tidb_on_qdrant/tidb_service.py b/api/providers/vdb/vdb-tidb-on-qdrant/src/dify_vdb_tidb_on_qdrant/tidb_service.py
index ece061db67..6283dbb986 100644
--- a/api/providers/vdb/vdb-tidb-on-qdrant/src/dify_vdb_tidb_on_qdrant/tidb_service.py
+++ b/api/providers/vdb/vdb-tidb-on-qdrant/src/dify_vdb_tidb_on_qdrant/tidb_service.py
@@ -246,8 +246,18 @@ class TidbService:
                 userPrefix = item["userPrefix"]
                 if state == "ACTIVE" and len(userPrefix) > 0:
                     cluster_info = tidb_serverless_list_map[item["clusterId"]]
-                    cluster_info.status = TidbAuthBindingStatus.ACTIVE
                     cluster_info.account = f"{userPrefix}.root"
+                    if not cluster_info.qdrant_endpoint:
+                        cluster_info.qdrant_endpoint = TidbService.extract_qdrant_endpoint(
+                            item
+                        ) or TidbService.fetch_qdrant_endpoint(api_url, public_key, private_key, item["clusterId"])
+                    if cluster_info.qdrant_endpoint:
+                        cluster_info.status = TidbAuthBindingStatus.ACTIVE
+                    else:
+                        logger.warning(
+                            "Cluster %s is ACTIVE but qdrant endpoint is not ready; will retry later",
+                            item["clusterId"],
+                        )
                     db.session.add(cluster_info)
             db.session.commit()
         else:
diff --git a/api/providers/vdb/vdb-tidb-on-qdrant/tests/unit_tests/test_tidb_service.py b/api/providers/vdb/vdb-tidb-on-qdrant/tests/unit_tests/test_tidb_service.py
index c1ffbacbbc..20a42f6cc3 100644
--- a/api/providers/vdb/vdb-tidb-on-qdrant/tests/unit_tests/test_tidb_service.py
+++ b/api/providers/vdb/vdb-tidb-on-qdrant/tests/unit_tests/test_tidb_service.py
@@ -1,8 +1,11 @@
+from types import SimpleNamespace
 from unittest.mock import MagicMock, patch
 
 import pytest
 from dify_vdb_tidb_on_qdrant.tidb_service import TidbService
 
+from models.enums import TidbAuthBindingStatus
+
 
 class TestExtractQdrantEndpoint:
     """Unit tests for TidbService.extract_qdrant_endpoint."""
@@ -216,3 +219,86 @@ class TestBatchCreateEdgeCases:
                 private_key="priv",
                 region="us-east-1",
             )
+
+
+class TestBatchUpdateTidbServerlessClusterStatus:
+    """Verify that status updates only expose clusters after qdrant endpoint is ready."""
+
+    @patch("dify_vdb_tidb_on_qdrant.tidb_service.db")
+    @patch("dify_vdb_tidb_on_qdrant.tidb_service._tidb_http_client")
+    def test_sets_active_when_batch_response_contains_endpoint(self, mock_http, mock_db):
+        binding = SimpleNamespace(
+            cluster_id="c-1",
+            status=TidbAuthBindingStatus.CREATING,
+            account="root",
+            qdrant_endpoint=None,
+        )
+        mock_http.get.return_value = MagicMock(
+            status_code=200,
+            json=lambda: {
+                "clusters": [
+                    {
+                        "clusterId": "c-1",
+                        "state": "ACTIVE",
+                        "userPrefix": "pfx",
+                        "endpoints": {"public": {"host": "gw.tidbcloud.com"}},
+                    }
+                ]
+            },
+        )
+
+        TidbService.batch_update_tidb_serverless_cluster_status([binding], "proj", "url", "iam", "pub", "priv")
+
+        assert binding.account == "pfx.root"
+        assert binding.qdrant_endpoint == "https://qdrant-gw.tidbcloud.com"
+        assert binding.status == TidbAuthBindingStatus.ACTIVE
+        mock_db.session.add.assert_called_once_with(binding)
+        mock_db.session.commit.assert_called_once()
+
+    @patch.object(TidbService, "fetch_qdrant_endpoint", return_value="https://qdrant-gw.tidbcloud.com")
+    @patch("dify_vdb_tidb_on_qdrant.tidb_service.db")
+    @patch("dify_vdb_tidb_on_qdrant.tidb_service._tidb_http_client")
+    def test_fetches_endpoint_when_batch_response_omits_it(self, mock_http, mock_db, mock_fetch_endpoint):
+        binding = SimpleNamespace(
+            cluster_id="c-1",
+            status=TidbAuthBindingStatus.CREATING,
+            account="root",
+            qdrant_endpoint=None,
+        )
+        mock_http.get.return_value = MagicMock(
+            status_code=200,
+            json=lambda: {"clusters": [{"clusterId": "c-1", "state": "ACTIVE", "userPrefix": "pfx", "endpoints": {}}]},
+        )
+
+        TidbService.batch_update_tidb_serverless_cluster_status([binding], "proj", "url", "iam", "pub", "priv")
+
+        assert binding.account == "pfx.root"
+        assert binding.qdrant_endpoint == "https://qdrant-gw.tidbcloud.com"
+        assert binding.status == TidbAuthBindingStatus.ACTIVE
+        mock_fetch_endpoint.assert_called_once_with("url", "pub", "priv", "c-1")
+        mock_db.session.add.assert_called_once_with(binding)
+        mock_db.session.commit.assert_called_once()
+
+    @patch.object(TidbService, "fetch_qdrant_endpoint", return_value=None)
+    @patch("dify_vdb_tidb_on_qdrant.tidb_service.db")
+    @patch("dify_vdb_tidb_on_qdrant.tidb_service._tidb_http_client")
+    def test_keeps_creating_when_endpoint_is_not_ready(self, mock_http, mock_db, mock_fetch_endpoint):
+        binding = SimpleNamespace(
+            cluster_id="c-1",
+            status=TidbAuthBindingStatus.CREATING,
+            account="root",
+            qdrant_endpoint=None,
+        )
+        mock_http.get.return_value = MagicMock(
+            status_code=200,
+            json=lambda: {"clusters": [{"clusterId": "c-1", "state": "ACTIVE", "userPrefix": "pfx", "endpoints": {}}]},
+        )
+
+        TidbService.batch_update_tidb_serverless_cluster_status([binding], "proj", "url", "iam", "pub", "priv")
+
+        assert binding.account == "pfx.root"
+        assert binding.qdrant_endpoint is None
+        assert binding.status == TidbAuthBindingStatus.CREATING
+        mock_fetch_endpoint.assert_called_once_with("url", "pub", "priv", "c-1")
+        mock_db.session.add.assert_called_once_with(binding)
+        mock_db.session.commit.assert_called_once()
diff --git a/api/providers/vdb/vdb-tidb-vector/tests/unit_tests/test_tidb_vector.py b/api/providers/vdb/vdb-tidb-vector/tests/unit_tests/test_tidb_vector.py
index bdbed2f740..ed03cbee88 100644
--- a/api/providers/vdb/vdb-tidb-vector/tests/unit_tests/test_tidb_vector.py
+++ b/api/providers/vdb/vdb-tidb-vector/tests/unit_tests/test_tidb_vector.py
@@ -46,7 +46,7 @@ def test_tidb_config_validation(tidb_module, field, value, message):
         tidb_module.TiDBVectorConfig.model_validate(values)
 
 
-def test_init_get_type_and_distance_func(tidb_module, monkeypatch):
+def test_init_get_type_and_distance_func(tidb_module, monkeypatch: pytest.MonkeyPatch):
     monkeypatch.setattr(tidb_module, "create_engine", MagicMock(return_value="engine"))
 
     vector = tidb_module.TiDBVector("collection_1", _config(tidb_module), distance_func="L2")
@@ -63,7 +63,7 @@ def test_init_get_type_and_distance_func(tidb_module, monkeypatch):
     assert vector._get_distance_func() == "VEC_COSINE_DISTANCE"
 
 
-def test_table_builds_columns_with_tidb_vector_type(tidb_module, monkeypatch):
+def test_table_builds_columns_with_tidb_vector_type(tidb_module, monkeypatch: pytest.MonkeyPatch):
     fake_tidb_vector = types.ModuleType("tidb_vector")
     fake_tidb_sqlalchemy = types.ModuleType("tidb_vector.sqlalchemy")
 
@@ -107,7 +107,7 @@ def test_create_calls_collection_and_add_texts(tidb_module):
     assert vector._dimension == 2
 
 
-def test_create_collection_skips_when_cache_hit(tidb_module, monkeypatch):
+def test_create_collection_skips_when_cache_hit(tidb_module, monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = None
@@ -127,7 +127,7 @@ def test_create_collection_skips_when_cache_hit(tidb_module, monkeypatch):
     tidb_module.redis_client.set.assert_not_called()
 
 
-def test_create_collection_executes_create_sql_and_sets_cache(tidb_module, monkeypatch):
+def test_create_collection_executes_create_sql_and_sets_cache(tidb_module, monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = None
@@ -160,7 +160,7 @@ def test_create_collection_executes_create_sql_and_sets_cache(tidb_module, monke
     tidb_module.redis_client.set.assert_called_once()
 
 
-def test_add_texts_batches_inserts_and_returns_ids(tidb_module, monkeypatch):
+def test_add_texts_batches_inserts_and_returns_ids(tidb_module, monkeypatch: pytest.MonkeyPatch):
     class _InsertStmt:
         def __init__(self, table):
             self.table = table
@@ -198,7 +198,7 @@ def test_add_texts_batches_inserts_and_returns_ids(tidb_module, monkeypatch):
 
 
 @pytest.fixture
-def tidb_vector_with_session(tidb_module, monkeypatch):
+def tidb_vector_with_session(tidb_module, monkeypatch: pytest.MonkeyPatch):
     vector = tidb_module.TiDBVector.__new__(tidb_module.TiDBVector)
     vector._collection_name = "collection_1"
     vector._engine = MagicMock()
@@ -354,7 +354,7 @@ def test_delete_by_metadata_field_does_nothing_when_no_ids(tidb_module):
 
 
 # Test search_by_vector filters and scores
-def test_search_by_vector_filters_and_scores(tidb_module, monkeypatch):
+def test_search_by_vector_filters_and_scores(tidb_module, monkeypatch: pytest.MonkeyPatch):
     session = MagicMock()
     session.execute.return_value = [
         ('{"doc_id":"id-1","document_id":"d-1"}', "text-1", 0.2),
@@ -392,7 +392,7 @@ def test_search_by_vector_filters_and_scores(tidb_module, monkeypatch):
 
 
 # Test delete drops table
-def test_delete_drops_table(tidb_module, monkeypatch):
+def test_delete_drops_table(tidb_module, monkeypatch: pytest.MonkeyPatch):
     session = MagicMock()
     session.execute.return_value = None
 
@@ -413,7 +413,7 @@ def test_delete_drops_table(tidb_module, monkeypatch):
     assert "DROP TABLE IF EXISTS collection_1" in drop_sql
 
 
-def test_tidb_factory_uses_existing_or_generated_collection(tidb_module, monkeypatch):
+def test_tidb_factory_uses_existing_or_generated_collection(tidb_module, monkeypatch: pytest.MonkeyPatch):
     factory = tidb_module.TiDBVectorFactory()
     dataset_with_index = SimpleNamespace(
         id="dataset-1",
diff --git a/api/providers/vdb/vdb-upstash/tests/unit_tests/test_upstash_vector.py b/api/providers/vdb/vdb-upstash/tests/unit_tests/test_upstash_vector.py
index a884275c89..55d27ad264 100644
--- a/api/providers/vdb/vdb-upstash/tests/unit_tests/test_upstash_vector.py
+++ b/api/providers/vdb/vdb-upstash/tests/unit_tests/test_upstash_vector.py
@@ -36,7 +36,7 @@ def _build_fake_upstash_module():
 
 
 @pytest.fixture
-def upstash_module(monkeypatch):
+def upstash_module(monkeypatch: pytest.MonkeyPatch):
     # Remove patched modules if present
     for modname in ["upstash_vector", "dify_vdb_upstash.upstash_vector"]:
         if modname in sys.modules:
@@ -65,7 +65,7 @@ def test_upstash_config_validation(upstash_module, field, value, message):
         upstash_module.UpstashVectorConfig.model_validate(values)
 
 
-def test_init_get_type_and_dimension(upstash_module, monkeypatch):
+def test_init_get_type_and_dimension(upstash_module, monkeypatch: pytest.MonkeyPatch):
     vector = upstash_module.UpstashVector("collection_1", _config(upstash_module))
 
     assert vector.get_type() == upstash_module.VectorType.UPSTASH
@@ -162,7 +162,7 @@ def test_search_by_vector_filter_threshold_and_delete(upstash_module):
     vector.index.reset.assert_called_once()
 
 
-def test_upstash_factory_uses_existing_or_generated_collection(upstash_module, monkeypatch):
+def test_upstash_factory_uses_existing_or_generated_collection(upstash_module, monkeypatch: pytest.MonkeyPatch):
     factory = upstash_module.UpstashVectorFactory()
     dataset_with_index = SimpleNamespace(
         id="dataset-1",
diff --git a/api/providers/vdb/vdb-vastbase/tests/unit_tests/test_vastbase_vector.py b/api/providers/vdb/vdb-vastbase/tests/unit_tests/test_vastbase_vector.py
index 4dfb956c00..32f47c67ed 100644
--- a/api/providers/vdb/vdb-vastbase/tests/unit_tests/test_vastbase_vector.py
+++ b/api/providers/vdb/vdb-vastbase/tests/unit_tests/test_vastbase_vector.py
@@ -37,7 +37,7 @@ def _build_fake_psycopg2_modules():
 
 
 @pytest.fixture
-def vastbase_module(monkeypatch):
+def vastbase_module(monkeypatch: pytest.MonkeyPatch):
     for name, module in _build_fake_psycopg2_modules().items():
         monkeypatch.setitem(sys.modules, name, module)
 
@@ -93,7 +93,7 @@ def test_vastbase_config_rejects_invalid_connection_window(vastbase_module):
         )
 
 
-def test_init_and_get_cursor_context_manager(vastbase_module, monkeypatch):
+def test_init_and_get_cursor_context_manager(vastbase_module, monkeypatch: pytest.MonkeyPatch):
     pool = MagicMock()
     monkeypatch.setattr(vastbase_module.psycopg2.pool, "SimpleConnectionPool", MagicMock(return_value=pool))
 
@@ -114,7 +114,7 @@ def test_init_and_get_cursor_context_manager(vastbase_module, monkeypatch):
     pool.putconn.assert_called_once_with(conn)
 
 
-def test_create_and_add_texts(vastbase_module, monkeypatch):
+def test_create_and_add_texts(vastbase_module, monkeypatch: pytest.MonkeyPatch):
     vector = vastbase_module.VastbaseVector.__new__(vastbase_module.VastbaseVector)
     vector.table_name = "embedding_collection_1"
     vector._create_collection = MagicMock()
@@ -205,7 +205,7 @@ def test_search_by_vector_and_full_text(vastbase_module):
     assert full_docs[0].page_content == "full-text"
 
 
-def test_create_collection_cache_and_dimension_branches(vastbase_module, monkeypatch):
+def test_create_collection_cache_and_dimension_branches(vastbase_module, monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = None
@@ -240,7 +240,7 @@ def test_create_collection_cache_and_dimension_branches(vastbase_module, monkeyp
     vastbase_module.redis_client.set.assert_called()
 
 
-def test_vastbase_factory_uses_existing_or_generated_collection(vastbase_module, monkeypatch):
+def test_vastbase_factory_uses_existing_or_generated_collection(vastbase_module, monkeypatch: pytest.MonkeyPatch):
     factory = vastbase_module.VastbaseVectorFactory()
     dataset_with_index = SimpleNamespace(
         id="dataset-1",
diff --git a/api/providers/vdb/vdb-vikingdb/tests/unit_tests/test_vikingdb_vector.py b/api/providers/vdb/vdb-vikingdb/tests/unit_tests/test_vikingdb_vector.py
index 544b8163be..6559ad97d2 100644
--- a/api/providers/vdb/vdb-vikingdb/tests/unit_tests/test_vikingdb_vector.py
+++ b/api/providers/vdb/vdb-vikingdb/tests/unit_tests/test_vikingdb_vector.py
@@ -79,7 +79,7 @@ def _build_fake_vikingdb_modules():
 
 
 @pytest.fixture
-def vikingdb_module(monkeypatch):
+def vikingdb_module(monkeypatch: pytest.MonkeyPatch):
     for name, module in _build_fake_vikingdb_modules().items():
         monkeypatch.setitem(sys.modules, name, module)
 
@@ -117,7 +117,7 @@ def test_init_get_type_and_has_checks(vikingdb_module):
     assert vector._has_index() is False
 
 
-def test_create_collection_cache_and_creation_paths(vikingdb_module, monkeypatch):
+def test_create_collection_cache_and_creation_paths(vikingdb_module, monkeypatch: pytest.MonkeyPatch):
     lock = MagicMock()
     lock.__enter__.return_value = None
     lock.__exit__.return_value = None
@@ -253,7 +253,7 @@ def test_delete_drops_index_and_collection_when_present(vikingdb_module):
     vector._client.drop_collection.assert_not_called()
 
 
-def test_vikingdb_factory_validates_config_and_builds_vector(vikingdb_module, monkeypatch):
+def test_vikingdb_factory_validates_config_and_builds_vector(vikingdb_module, monkeypatch: pytest.MonkeyPatch):
     factory = vikingdb_module.VikingDBVectorFactory()
     dataset_with_index = SimpleNamespace(
         id="dataset-1",
@@ -293,7 +293,9 @@ def test_vikingdb_factory_validates_config_and_builds_vector(vikingdb_module, mo
         ("VIKINGDB_SCHEME", "VIKINGDB_SCHEME should not be None"),
     ],
 )
-def test_vikingdb_factory_raises_when_required_config_missing(vikingdb_module, monkeypatch, field, message):
+def test_vikingdb_factory_raises_when_required_config_missing(
+    vikingdb_module, monkeypatch: pytest.MonkeyPatch, field, message
+):
     factory = vikingdb_module.VikingDBVectorFactory()
     dataset = SimpleNamespace(
         id="dataset-1", index_struct_dict={"vector_store": {"class_prefix": "existing"}}, index_struct=None
diff --git a/api/pyproject.toml b/api/pyproject.toml
index bcbde0842b..95fc38e2c8 100644
--- a/api/pyproject.toml
+++ b/api/pyproject.toml
@@ -1,12 +1,12 @@
 [project]
 name = "dify-api"
-version = "1.14.0"
+version = "1.14.2"
 requires-python = "~=3.12.0"
 
 dependencies = [
     # Legacy: mature and widely deployed
     "bleach>=6.3.0",
-    "boto3>=1.43.3",
+    "boto3>=1.43.6",
     "celery>=5.6.3",
     "croniter>=6.2.2",
     "flask>=3.1.3,<4.0.0",
@@ -14,15 +14,14 @@ dependencies = [
     "gevent>=26.4.0",
     "gevent-websocket>=0.10.1",
     "gmpy2>=2.3.0",
-    "google-api-python-client>=2.195.0",
-    "gunicorn>=25.3.0",
+    "google-api-python-client>=2.196.0",
+    "gunicorn>=26.0.0",
     "psycogreen>=1.0.2",
     "psycopg2-binary>=2.9.12",
     "python-socketio>=5.13.0",
     "redis[hiredis]>=7.4.0",
     "sendgrid>=6.12.5",
     "sseclient-py>=1.8.0",
-
     # Stable: production-proven, cap below the next major
     "aliyun-log-python-sdk>=0.9.44,<1.0.0",
     "azure-identity>=1.25.3,<2.0.0",
@@ -31,7 +30,7 @@ dependencies = [
     "flask-migrate>=4.1.0,<5.0.0",
     "flask-orjson>=2.0.0,<3.0.0",
     "flask-restx>=1.3.2,<2.0.0",
-    "google-cloud-aiplatform>=1.149.0,<2.0.0",
+    "google-cloud-aiplatform>=1.151.0,<2.0.0",
     "httpx[socks]>=0.28.1,<1.0.0",
     "opentelemetry-distro>=0.62b1,<1.0.0",
     "opentelemetry-instrumentation-celery>=0.62b0,<1.0.0",
@@ -42,10 +41,9 @@ dependencies = [
     "opentelemetry-propagator-b3>=1.41.1,<2.0.0",
     "readabilipy>=0.3.0,<1.0.0",
     "resend>=2.27.0,<3.0.0",
-
     # Emerging: newer and fast-moving, use compatible pins
     "fastopenapi[flask]~=0.7.0",
-    "graphon~=0.2.2",
+    "graphon~=0.4.0",
     "httpx-sse~=0.4.0",
     "json-repair~=0.59.4",
 ]
@@ -60,6 +58,7 @@ members = ["providers/vdb/*", "providers/trace/*"]
 exclude = ["providers/vdb/__pycache__", "providers/trace/__pycache__"]
 
 [tool.uv.sources]
+dify-agent = { path = "../dify-agent" }
 dify-vdb-alibabacloud-mysql = { workspace = true }
 dify-vdb-analyticdb = { workspace = true }
 dify-vdb-baidu = { workspace = true }
@@ -103,6 +102,7 @@ dify-trace-weave = { workspace = true }
 default-groups = ["storage", "tools", "vdb-all", "trace-all"]
 package = false
 override-dependencies = [
+    "litellm>=1.83.7",
     "pyarrow>=18.0.0",
 ]
 
@@ -114,10 +114,10 @@ override-dependencies = [
 ############################################################
 dev = [
     "coverage>=7.13.4",
+    "dify-agent",
     "dotenv-linter>=0.7.0",
     "faker>=40.15.0",
     "lxml-stubs>=0.5.1",
-    "basedpyright>=1.39.3",
     "ruff>=0.15.12",
     "pytest>=9.0.3",
     "pytest-benchmark>=5.2.3",
@@ -174,7 +174,7 @@ dev = [
     # "locust>=2.40.4",  # Temporarily removed due to compatibility issues. Uncomment when resolved.
     "pytest-timeout>=2.4.0",
     "pytest-xdist>=3.8.0",
-    "pyrefly>=0.62.0",
+    "pyrefly>=1.0.0",
     "xinference-client>=2.7.0",
 ]
 
@@ -190,7 +190,7 @@ storage = [
     "google-cloud-storage>=3.10.1",
     "opendal>=0.46.0",
     "oss2>=2.19.1",
-    "supabase>=2.29.0",
+    "supabase>=2.30.0",
     "tos>=2.9.0",
 ]
 
diff --git a/api/pyrightconfig.json b/api/pyrightconfig.json
deleted file mode 100644
index ac0e2a3a53..0000000000
--- a/api/pyrightconfig.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "include": ["."],
-  "exclude": [
-    "tests/",
-    ".venv",
-    "migrations/",
-    "core/rag",
-    "providers/vdb/",
-    "providers/trace/*/tests",
-  ],
-  "typeCheckingMode": "strict",
-  "allowedUntypedLibraries": [
-    "fastopenapi",
-    "flask_restx",
-    "flask_login",
-    "opentelemetry.instrumentation.celery",
-    "opentelemetry.instrumentation.flask",
-    "opentelemetry.instrumentation.httpx",
-    "opentelemetry.instrumentation.requests",
-    "opentelemetry.instrumentation.sqlalchemy",
-    "opentelemetry.instrumentation.redis",
-    "langfuse",
-    "cloudscraper",
-    "readabilipy",
-    "pypandoc",
-    "pypdfium2",
-    "webvtt",
-    "flask_compress",
-    "oss2",
-    "baidubce.auth.bce_credentials",
-    "baidubce.bce_client_configuration",
-    "baidubce.services.bos.bos_client",
-    "clickzetta",
-    "google.cloud",
-    "obs",
-    "qcloud_cos",
-    "tos",
-    "gmpy2",
-    "sendgrid",
-    "sendgrid.helpers.mail",
-    "holo_search_sdk.types",
-    "dify_vdb_qdrant",
-    "dify_vdb_tidb_on_qdrant"
-  ],
-  "reportUnknownMemberType": "hint",
-  "reportUnknownParameterType": "hint",
-  "reportUnknownArgumentType": "hint",
-  "reportUnknownVariableType": "hint",
-  "reportUnknownLambdaType": "hint",
-  "reportMissingParameterType": "hint",
-  "reportMissingTypeArgument": "hint",
-  "reportUnnecessaryComparison": "hint",
-  "reportUnnecessaryIsInstance": "hint",
-  "reportUnnecessaryTypeIgnoreComment": "hint",
-  "reportAttributeAccessIssue": "hint",
-  "pythonVersion": "3.12",
-  "pythonPlatform": "All"
-}
diff --git a/api/schedule/trigger_provider_refresh_task.py b/api/schedule/trigger_provider_refresh_task.py
index df5058d70a..1fefdb9e5a 100644
--- a/api/schedule/trigger_provider_refresh_task.py
+++ b/api/schedule/trigger_provider_refresh_task.py
@@ -1,6 +1,5 @@
 import logging
 import math
-import time
 from collections.abc import Iterable, Sequence
 
 from celery import group
@@ -13,16 +12,13 @@ from configs import dify_config
 from core.trigger.utils.locks import build_trigger_refresh_lock_keys
 from extensions.ext_database import db
 from extensions.ext_redis import redis_client
+from libs.helper import current_timestamp
 from models.trigger import TriggerSubscription
 from tasks.trigger_subscription_refresh_tasks import trigger_subscription_refresh
 
 logger = logging.getLogger(__name__)
 
 
-def _now_ts() -> int:
-    return int(time.time())
-
-
 def _build_due_filter(now_ts: int):
     """Build SQLAlchemy filter for due credential or subscription refresh."""
     credential_due: ColumnElement[bool] = and_(
@@ -54,7 +50,7 @@ def trigger_provider_refresh() -> None:
     """
     Scan due trigger subscriptions and enqueue refresh tasks with in-flight locks.
     """
-    now: int = _now_ts()
+    now: int = current_timestamp()
 
     batch_size: int = int(dify_config.TRIGGER_PROVIDER_REFRESH_BATCH_SIZE)
     lock_ttl: int = max(300, int(dify_config.TRIGGER_PROVIDER_SUBSCRIPTION_THRESHOLD_SECONDS))
diff --git a/api/services/account_service.py b/api/services/account_service.py
index b6554a3de7..6533526b60 100644
--- a/api/services/account_service.py
+++ b/api/services/account_service.py
@@ -29,6 +29,7 @@ from extensions.ext_database import db
 from extensions.ext_redis import redis_client, redis_fallback
 from libs.datetime_utils import naive_utc_now
 from libs.helper import RateLimiter, TokenManager
+from libs.helper import timezone as validate_timezone
 from libs.passport import PassportService
 from libs.password import compare_password, hash_password, valid_password
 from libs.rsa import generate_key_pair
@@ -271,8 +272,9 @@ class AccountService:
         password: str | None = None,
         interface_theme: str = "light",
         is_setup: bool | None = False,
+        timezone: str | None = None,
     ) -> Account:
-        """create account"""
+        """Create an account, preferring explicit user timezone over language-derived defaults."""
         if not FeatureService.get_system_features().is_allow_register and not is_setup:
             from controllers.console.error import AccountNotFound
 
@@ -302,6 +304,10 @@ class AccountService:
             password_to_set = base64_password_hashed
             salt_to_set = base64_salt
 
+        resolved_timezone = language_timezone_mapping.get(interface_language, "UTC")
+        if timezone is not None:
+            resolved_timezone = validate_timezone(timezone)
+
         account = Account(
             name=name,
             email=email,
@@ -309,7 +315,7 @@ class AccountService:
             password_salt=salt_to_set,
             interface_language=interface_language,
             interface_theme=interface_theme,
-            timezone=language_timezone_mapping.get(interface_language, "UTC"),
+            timezone=resolved_timezone,
         )
 
         db.session.add(account)
@@ -318,11 +324,15 @@ class AccountService:
 
     @staticmethod
     def create_account_and_tenant(
-        email: str, name: str, interface_language: str, password: str | None = None
+        email: str, name: str, interface_language: str, password: str | None = None, timezone: str | None = None
     ) -> Account:
-        """create account"""
+        """Create an account and owner workspace."""
         account = AccountService.create_account(
-            email=email, name=name, interface_language=interface_language, password=password
+            email=email,
+            name=name,
+            interface_language=interface_language,
+            password=password,
+            timezone=timezone,
         )
 
         try:
@@ -1280,8 +1290,8 @@ class TenantService:
         """Check member permission"""
         perms = {
             "add": [TenantAccountRole.OWNER, TenantAccountRole.ADMIN],
-            "remove": [TenantAccountRole.OWNER],
-            "update": [TenantAccountRole.OWNER],
+            "remove": [TenantAccountRole.OWNER, TenantAccountRole.ADMIN],
+            "update": [TenantAccountRole.OWNER, TenantAccountRole.ADMIN],
         }
         if action not in {"add", "remove", "update"}:
             raise InvalidActionError("Invalid action.")
@@ -1299,6 +1309,15 @@ class TenantService:
         if not ta_operator or ta_operator.role not in perms[action]:
             raise NoPermissionError(f"No permission to {action} member.")
 
+        if action == "remove" and ta_operator.role == TenantAccountRole.ADMIN and member:
+            ta_member = db.session.scalar(
+                select(TenantAccountJoin)
+                .where(TenantAccountJoin.tenant_id == tenant.id, TenantAccountJoin.account_id == member.id)
+                .limit(1)
+            )
+            if ta_member and ta_member.role == TenantAccountRole.OWNER:
+                raise NoPermissionError(f"No permission to {action} member.")
+
     @staticmethod
     def remove_member_from_tenant(tenant: Tenant, account: Account, operator: Account):
         """Remove member from tenant.
@@ -1370,6 +1389,7 @@ class TenantService:
     def update_member_role(tenant: Tenant, member: Account, new_role: str, operator: Account):
         """Update member role"""
         TenantService.check_member_permission(tenant, operator, member, "update")
+        new_tenant_role = TenantAccountRole(new_role)
 
         target_member_join = db.session.scalar(
             select(TenantAccountJoin)
@@ -1380,6 +1400,11 @@ class TenantService:
         if not target_member_join:
             raise MemberNotInTenantError("Member not in tenant.")
 
+        operator_role = TenantService.get_user_role(operator, tenant)
+        target_role = TenantAccountRole(target_member_join.role)
+        if operator_role == TenantAccountRole.ADMIN and (TenantAccountRole.OWNER in {target_role, new_tenant_role}):
+            raise NoPermissionError("No permission to update member.")
+
         if target_member_join.role == new_role:
             raise RoleAlreadyAssignedError("The provided role is already assigned to the member.")
 
@@ -1394,7 +1419,7 @@ class TenantService:
                 current_owner_join.role = TenantAccountRole.ADMIN
 
         # Update the role of the target member
-        target_member_join.role = TenantAccountRole(new_role)
+        target_member_join.role = new_tenant_role
         db.session.commit()
 
     @staticmethod
@@ -1459,8 +1484,8 @@ class RegisterService:
     @classmethod
     def register(
         cls,
-        email,
-        name,
+        email: str,
+        name: str,
         password: str | None = None,
         open_id: str | None = None,
         provider: str | None = None,
@@ -1468,16 +1493,19 @@ class RegisterService:
         status: AccountStatus | None = None,
         is_setup: bool | None = False,
         create_workspace_required: bool | None = True,
+        timezone: str | None = None,
     ) -> Account:
-        db.session.begin_nested()
         """Register account"""
+        db.session.begin_nested()
         try:
+            interface_language = get_valid_language(language)
             account = AccountService.create_account(
                 email=email,
                 name=name,
-                interface_language=get_valid_language(language),
+                interface_language=interface_language,
                 password=password,
                 is_setup=is_setup,
+                timezone=timezone,
             )
             account.status = status or AccountStatus.ACTIVE
             account.initialized_at = naive_utc_now()
diff --git a/api/services/annotation_service.py b/api/services/annotation_service.py
index 0229a1f43a..aa6b8ffc6e 100644
--- a/api/services/annotation_service.py
+++ b/api/services/annotation_service.py
@@ -425,7 +425,7 @@ class AppAnnotationService:
         return {"deleted_count": deleted_count}
 
     @classmethod
-    def batch_import_app_annotations(cls, app_id, file: FileStorage):
+    def batch_import_app_annotations(cls, app_id: str, file: FileStorage):
         """
         Batch import annotations from CSV file with enhanced security checks.
 
diff --git a/api/services/app_dsl_service.py b/api/services/app_dsl_service.py
index 97aaea3395..7ba2b64c74 100644
--- a/api/services/app_dsl_service.py
+++ b/api/services/app_dsl_service.py
@@ -10,7 +10,6 @@ from uuid import uuid4
 import yaml
 from Crypto.Cipher import AES
 from Crypto.Util.Padding import pad, unpad
-from packaging import version
 from packaging.version import parse as parse_version
 from pydantic import BaseModel
 from sqlalchemy import select
@@ -40,6 +39,7 @@ from libs.datetime_utils import naive_utc_now
 from models import Account, App, AppMode
 from models.model import AppModelConfig, AppModelConfigDict, IconType
 from models.workflow import Workflow
+from services.dsl_version import check_version_compatibility
 from services.entities.dsl_entities import CheckDependenciesResult, ImportMode, ImportStatus
 from services.plugin.dependencies_analysis import DependenciesAnalysisService
 from services.workflow_draft_variable_service import WorkflowDraftVariableService
@@ -64,30 +64,6 @@ class Import(BaseModel):
     error: str = ""
 
 
-def _check_version_compatibility(imported_version: str) -> ImportStatus:
-    """Determine import status based on version comparison"""
-    try:
-        current_ver = version.parse(CURRENT_DSL_VERSION)
-        imported_ver = version.parse(imported_version)
-    except version.InvalidVersion:
-        return ImportStatus.FAILED
-
-    # If imported version is newer than current, always return PENDING
-    if imported_ver > current_ver:
-        return ImportStatus.PENDING
-
-    # If imported version is older than current's major, return PENDING
-    if imported_ver.major < current_ver.major:
-        return ImportStatus.PENDING
-
-    # If imported version is older than current's minor, return COMPLETED_WITH_WARNINGS
-    if imported_ver.minor < current_ver.minor:
-        return ImportStatus.COMPLETED_WITH_WARNINGS
-
-    # If imported version equals or is older than current's micro, return COMPLETED
-    return ImportStatus.COMPLETED
-
-
 class PendingData(BaseModel):
     import_mode: str
     yaml_content: str
@@ -203,7 +179,7 @@ class AppDslService:
             # check if imported_version is a float-like string
             if not isinstance(imported_version, str):
                 raise ValueError(f"Invalid version type, expected str, got {type(imported_version)}")
-            status = _check_version_compatibility(imported_version)
+            status = check_version_compatibility(imported_version, CURRENT_DSL_VERSION)
 
             # Extract app data
             app_data = data.get("app")
diff --git a/api/services/app_service.py b/api/services/app_service.py
index a046b909b3..6716833f6c 100644
--- a/api/services/app_service.py
+++ b/api/services/app_service.py
@@ -1,9 +1,10 @@
 import json
 import logging
-from typing import Any, TypedDict, cast
+from typing import Any, Literal, TypedDict, cast
 
 import sqlalchemy as sa
 from flask_sqlalchemy.pagination import Pagination
+from pydantic import BaseModel, Field
 from sqlalchemy import select
 
 from configs import dify_config
@@ -31,39 +32,59 @@ from tasks.remove_app_and_related_data_task import remove_app_and_related_data_t
 logger = logging.getLogger(__name__)
 
 
+class AppListParams(BaseModel):
+    page: int = Field(default=1, ge=1)
+    limit: int = Field(default=20, ge=1, le=100)
+    mode: Literal["completion", "chat", "advanced-chat", "workflow", "agent-chat", "channel", "all"] = "all"
+    name: str | None = None
+    tag_ids: list[str] | None = None
+    is_created_by_me: bool | None = None
+
+
+class CreateAppParams(BaseModel):
+    name: str = Field(min_length=1)
+    description: str | None = None
+    mode: Literal["chat", "agent-chat", "advanced-chat", "workflow", "completion"]
+    icon_type: str | None = None
+    icon: str | None = None
+    icon_background: str | None = None
+    api_rph: int = 0
+    api_rpm: int = 0
+    max_active_requests: int | None = None
+
+
 class AppService:
-    def get_paginate_apps(self, user_id: str, tenant_id: str, args: dict[str, Any]) -> Pagination | None:
+    def get_paginate_apps(self, user_id: str, tenant_id: str, params: AppListParams) -> Pagination | None:
         """
         Get app list with pagination
         :param user_id: user id
         :param tenant_id: tenant id
-        :param args: request args
+        :param params: query parameters
         :return:
         """
         filters = [App.tenant_id == tenant_id, App.is_universal == False]
 
-        if args["mode"] == "workflow":
+        if params.mode == "workflow":
             filters.append(App.mode == AppMode.WORKFLOW)
-        elif args["mode"] == "completion":
+        elif params.mode == "completion":
             filters.append(App.mode == AppMode.COMPLETION)
-        elif args["mode"] == "chat":
+        elif params.mode == "chat":
             filters.append(App.mode == AppMode.CHAT)
-        elif args["mode"] == "advanced-chat":
+        elif params.mode == "advanced-chat":
             filters.append(App.mode == AppMode.ADVANCED_CHAT)
-        elif args["mode"] == "agent-chat":
+        elif params.mode == "agent-chat":
             filters.append(App.mode == AppMode.AGENT_CHAT)
 
-        if args.get("is_created_by_me", False):
+        if params.is_created_by_me:
             filters.append(App.created_by == user_id)
-        if args.get("name"):
+        if params.name:
             from libs.helper import escape_like_pattern
 
-            name = args["name"][:30]
+            name = params.name[:30]
             escaped_name = escape_like_pattern(name)
             filters.append(App.name.ilike(f"%{escaped_name}%", escape="\\"))
-        # Check if tag_ids is not empty to avoid WHERE false condition
-        if args.get("tag_ids") and len(args["tag_ids"]) > 0:
-            target_ids = TagService.get_target_ids_by_tag_ids("app", tenant_id, args["tag_ids"])
+        if params.tag_ids and len(params.tag_ids) > 0:
+            target_ids = TagService.get_target_ids_by_tag_ids("app", tenant_id, params.tag_ids)
             if target_ids and len(target_ids) > 0:
                 filters.append(App.id.in_(target_ids))
             else:
@@ -71,21 +92,21 @@ class AppService:
 
         app_models = db.paginate(
             sa.select(App).where(*filters).order_by(App.created_at.desc()),
-            page=args["page"],
-            per_page=args["limit"],
+            page=params.page,
+            per_page=params.limit,
             error_out=False,
         )
 
         return app_models
 
-    def create_app(self, tenant_id: str, args: dict[str, Any], account: Account) -> App:
+    def create_app(self, tenant_id: str, params: CreateAppParams, account: Account) -> App:
         """
         Create app
         :param tenant_id: tenant id
-        :param args: request args
+        :param params: app creation parameters
         :param account: Account instance
         """
-        app_mode = AppMode.value_of(args["mode"])
+        app_mode = AppMode.value_of(params.mode)
         app_template = default_app_templates[app_mode]
 
         # get model config
@@ -143,15 +164,16 @@ class AppService:
             default_model_config["model"] = json.dumps(default_model_dict)
 
         app = App(**app_template["app"])
-        app.name = args["name"]
-        app.description = args.get("description", "")
-        app.mode = args["mode"]
-        app.icon_type = args.get("icon_type", "emoji")
-        app.icon = args["icon"]
-        app.icon_background = args["icon_background"]
+        app.name = params.name
+        app.description = params.description or ""
+        app.mode = app_mode
+        app.icon_type = IconType(params.icon_type) if params.icon_type else IconType.EMOJI
+        app.icon = params.icon
+        app.icon_background = params.icon_background
         app.tenant_id = tenant_id
-        app.api_rph = args.get("api_rph", 0)
-        app.api_rpm = args.get("api_rpm", 0)
+        app.api_rph = params.api_rph
+        app.api_rpm = params.api_rpm
+        app.max_active_requests = params.max_active_requests
         app.created_by = account.id
         app.updated_by = account.id
 
diff --git a/api/services/attachment_service.py b/api/services/attachment_service.py
index 54e664e944..dad7163739 100644
--- a/api/services/attachment_service.py
+++ b/api/services/attachment_service.py
@@ -22,10 +22,11 @@ class AttachmentService:
             raise AssertionError("must be a sessionmaker or an Engine.")
 
     def get_file_base64(self, file_id: str) -> str:
-        upload_file = self._session_maker(expire_on_commit=False).scalar(
-            select(UploadFile).where(UploadFile.id == file_id).limit(1)
-        )
-        if not upload_file:
-            raise NotFound("File not found")
-        blob = storage.load_once(upload_file.key)
+        with self._session_maker(expire_on_commit=False) as session:
+            upload_file = session.scalar(select(UploadFile).where(UploadFile.id == file_id).limit(1))
+            if not upload_file:
+                raise NotFound("File not found")
+            upload_file_key = upload_file.key
+
+        blob = storage.load_once(upload_file_key)
         return base64.b64encode(blob).decode()
diff --git a/api/services/audio_service.py b/api/services/audio_service.py
index 60948e652b..c80b2f43fd 100644
--- a/api/services/audio_service.py
+++ b/api/services/audio_service.py
@@ -54,7 +54,7 @@ class AudioService:
         if extension not in [f"audio/{ext}" for ext in AUDIO_EXTENSIONS]:
             raise UnsupportedAudioTypeServiceError()
 
-        file_content = file.read()
+        file_content = file.stream.read()
         file_size = len(file_content)
 
         if file_size > FILE_SIZE_LIMIT:
diff --git a/api/services/clear_free_plan_tenant_expired_logs.py b/api/services/clear_free_plan_tenant_expired_logs.py
index dcc93b4b0f..3fb340d3a7 100644
--- a/api/services/clear_free_plan_tenant_expired_logs.py
+++ b/api/services/clear_free_plan_tenant_expired_logs.py
@@ -35,6 +35,21 @@ logger = logging.getLogger(__name__)
 
 
 class ClearFreePlanTenantExpiredLogs:
+    @staticmethod
+    def _serialize_record(record: object) -> dict[str, object]:
+        if hasattr(record, "to_dict"):
+            return record.to_dict()  # type: ignore[no-any-return]
+
+        table = getattr(record, "__table__", None)
+        columns = getattr(table, "columns", None)
+        if columns is None:
+            raise TypeError(f"Unsupported record type for serialization: {type(record)!r}")
+
+        record_dict: dict[str, object] = {}
+        for column in columns:
+            record_dict[column.name] = getattr(record, column.name)
+        return record_dict
+
     @classmethod
     def _clear_message_related_tables(cls, session: Session, tenant_id: str, batch_message_ids: list[str]):
         """
@@ -77,14 +92,7 @@ class ClearFreePlanTenantExpiredLogs:
                 record_data = []
                 for record in records:
                     try:
-                        if hasattr(record, "to_dict"):
-                            record_data.append(record.to_dict())
-                        else:
-                            # if record doesn't have to_dict method, we need to transform it to dict manually
-                            record_dict = {}
-                            for column in record.__table__.columns:
-                                record_dict[column.name] = getattr(record, column.name)
-                            record_data.append(record_dict)
+                        record_data.append(cls._serialize_record(record))
                     except Exception:
                         logger.exception("Failed to transform %s record: %s", table_name, record.id)
                         continue
@@ -222,7 +230,12 @@ class ClearFreePlanTenantExpiredLogs:
                     f"{tenant_id}/workflow_node_executions/{datetime.datetime.now().strftime('%Y-%m-%d')}"
                     f"-{time.time()}.json",
                     json.dumps(
-                        jsonable_encoder(workflow_node_executions),
+                        jsonable_encoder(
+                            [
+                                cls._serialize_record(workflow_node_execution)
+                                for workflow_node_execution in workflow_node_executions
+                            ]
+                        ),
                     ).encode("utf-8"),
                 )
 
diff --git a/api/services/credit_pool_service.py b/api/services/credit_pool_service.py
index 2d210db121..2e103dec15 100644
--- a/api/services/credit_pool_service.py
+++ b/api/services/credit_pool_service.py
@@ -1,9 +1,10 @@
 import logging
 
-from sqlalchemy import select, update
-from sqlalchemy.orm import sessionmaker
+from sqlalchemy import select
+from sqlalchemy.orm import Session
 
 from configs import dify_config
+from core.db.session_factory import session_factory
 from core.errors.error import QuotaExceededError
 from extensions.ext_database import db
 from models import TenantCreditPool
@@ -13,6 +14,18 @@ logger = logging.getLogger(__name__)
 
 
 class CreditPoolService:
+    @staticmethod
+    def _get_locked_pool(session: Session, tenant_id: str, pool_type: str) -> TenantCreditPool | None:
+        return session.scalar(
+            select(TenantCreditPool)
+            .where(
+                TenantCreditPool.tenant_id == tenant_id,
+                TenantCreditPool.pool_type == pool_type,
+            )
+            .limit(1)
+            .with_for_update()
+        )
+
     @classmethod
     def create_default_pool(cls, tenant_id: str) -> TenantCreditPool:
         """create default credit pool for new tenant"""
@@ -29,7 +42,7 @@ class CreditPoolService:
     @classmethod
     def get_pool(cls, tenant_id: str, pool_type: str = "trial") -> TenantCreditPool | None:
         """get tenant credit pool"""
-        with sessionmaker(db.engine, expire_on_commit=False).begin() as session:
+        with session_factory.get_session_maker().begin() as session:
             return session.scalar(
                 select(TenantCreditPool)
                 .where(
@@ -59,31 +72,57 @@ class CreditPoolService:
         credits_required: int,
         pool_type: str = "trial",
     ) -> int:
-        """check and deduct credits, returns actual credits deducted"""
-
-        pool = cls.get_pool(tenant_id, pool_type)
-        if not pool:
-            raise QuotaExceededError("Credit pool not found")
-
-        if pool.remaining_credits <= 0:
-            raise QuotaExceededError("No credits remaining")
-
-        # deduct all remaining credits if less than required
-        actual_credits = min(credits_required, pool.remaining_credits)
+        """Deduct exactly the requested credits or raise without mutating the pool."""
+        if credits_required <= 0:
+            return 0
 
         try:
-            with sessionmaker(db.engine).begin() as session:
-                stmt = (
-                    update(TenantCreditPool)
-                    .where(
-                        TenantCreditPool.tenant_id == tenant_id,
-                        TenantCreditPool.pool_type == pool_type,
-                    )
-                    .values(quota_used=TenantCreditPool.quota_used + actual_credits)
-                )
-                session.execute(stmt)
+            with session_factory.get_session_maker().begin() as session:
+                pool = cls._get_locked_pool(session=session, tenant_id=tenant_id, pool_type=pool_type)
+                if not pool:
+                    raise QuotaExceededError("Credit pool not found")
+
+                remaining_credits = pool.remaining_credits
+                if remaining_credits <= 0:
+                    raise QuotaExceededError("No credits remaining")
+                if remaining_credits < credits_required:
+                    raise QuotaExceededError("Insufficient credits remaining")
+
+                pool.quota_used += credits_required
+        except QuotaExceededError:
+            raise
         except Exception:
             logger.exception("Failed to deduct credits for tenant %s", tenant_id)
             raise QuotaExceededError("Failed to deduct credits")
 
-        return actual_credits
+        return credits_required
+
+    @classmethod
+    def deduct_credits_capped(
+        cls,
+        tenant_id: str,
+        credits_required: int,
+        pool_type: str = "trial",
+    ) -> int:
+        """Deduct up to the available balance and return the actual deducted credits."""
+        if credits_required <= 0:
+            return 0
+
+        try:
+            with session_factory.get_session_maker().begin() as session:
+                pool = cls._get_locked_pool(session=session, tenant_id=tenant_id, pool_type=pool_type)
+                if not pool:
+                    logger.warning("Credit pool not found, tenant_id=%s, pool_type=%s", tenant_id, pool_type)
+                    return 0
+
+                deducted_credits = min(credits_required, pool.remaining_credits)
+                if deducted_credits <= 0:
+                    return 0
+
+                pool.quota_used += deducted_credits
+                return deducted_credits
+        except QuotaExceededError:
+            raise
+        except Exception:
+            logger.exception("Failed to deduct capped credits for tenant %s", tenant_id)
+            raise QuotaExceededError("Failed to deduct credits")
diff --git a/api/services/dataset_service.py b/api/services/dataset_service.py
index eef38f1ce2..ea8896a5aa 100644
--- a/api/services/dataset_service.py
+++ b/api/services/dataset_service.py
@@ -7,9 +7,10 @@ import time
 import uuid
 from collections import Counter
 from collections.abc import Sequence
-from typing import Any, Literal, TypedDict, cast
+from typing import Annotated, Any, Literal, TypedDict, cast
 
 import sqlalchemy as sa
+from pydantic import BaseModel, ConfigDict, Field, ValidationError, field_validator
 from redis.exceptions import LockNotOwnedError
 from sqlalchemy import delete, exists, func, select, update
 from sqlalchemy.orm import Session, sessionmaker
@@ -108,7 +109,7 @@ logger = logging.getLogger(__name__)
 
 
 class ProcessRulesDict(TypedDict):
-    mode: str
+    mode: ProcessRuleMode
     rules: dict[str, Any]
 
 
@@ -117,6 +118,86 @@ class AutoDisableLogsDict(TypedDict):
     count: int
 
 
+class _EstimatePreProcessingRule(BaseModel):
+    id: str = Field(min_length=1)
+    enabled: bool
+
+    @field_validator("id")
+    @classmethod
+    def _validate_id(cls, v: str) -> str:
+        if v not in DatasetProcessRule.PRE_PROCESSING_RULES:
+            raise ValueError("Process rule pre_processing_rules id is invalid")
+        return v
+
+
+class _EstimateSegmentation(BaseModel):
+    separator: str = Field(min_length=1)
+    max_tokens: int = Field(gt=0)
+
+
+class _EstimateRules(BaseModel):
+    pre_processing_rules: list[_EstimatePreProcessingRule]
+    segmentation: _EstimateSegmentation
+
+    @field_validator("pre_processing_rules")
+    @classmethod
+    def _deduplicate(cls, v: list[_EstimatePreProcessingRule]) -> list[_EstimatePreProcessingRule]:
+        seen: dict[str, _EstimatePreProcessingRule] = {}
+        for rule in v:
+            seen[rule.id] = rule
+        return list(seen.values())
+
+
+class _SummaryIndexSettingDisabled(BaseModel):
+    enable: Literal[False] = False
+
+
+class _SummaryIndexSettingEnabled(BaseModel):
+    enable: Literal[True]
+    model_name: str = Field(min_length=1)
+    model_provider_name: str = Field(min_length=1)
+
+
+_SummaryIndexSetting = Annotated[
+    _SummaryIndexSettingDisabled | _SummaryIndexSettingEnabled,
+    Field(discriminator="enable"),
+]
+
+
+class _AutomaticProcessRule(BaseModel):
+    model_config = ConfigDict(extra="allow")
+
+    mode: Literal[ProcessRuleMode.AUTOMATIC]
+    summary_index_setting: _SummaryIndexSetting | None = None
+
+
+class _CustomProcessRule(BaseModel):
+    model_config = ConfigDict(extra="allow")
+
+    mode: Literal[ProcessRuleMode.CUSTOM]
+    rules: _EstimateRules
+    summary_index_setting: _SummaryIndexSetting | None = None
+
+
+class _HierarchicalProcessRule(BaseModel):
+    model_config = ConfigDict(extra="allow")
+
+    mode: Literal[ProcessRuleMode.HIERARCHICAL]
+    rules: _EstimateRules
+    summary_index_setting: _SummaryIndexSetting | None = None
+
+
+_EstimateProcessRule = Annotated[
+    _AutomaticProcessRule | _CustomProcessRule | _HierarchicalProcessRule,
+    Field(discriminator="mode"),
+]
+
+
+class _EstimateArgs(BaseModel):
+    info_list: dict[str, Any]
+    process_rule: _EstimateProcessRule
+
+
 class DatasetService:
     @staticmethod
     def get_datasets(page, per_page, tenant_id=None, user=None, search=None, tag_ids=None, include_all=False):
@@ -204,7 +285,7 @@ class DatasetService:
             mode = dataset_process_rule.mode
             rules = dataset_process_rule.rules_dict or {}
         else:
-            mode = str(DocumentService.DEFAULT_RULES["mode"])
+            mode = ProcessRuleMode(DocumentService.DEFAULT_RULES["mode"])
             rules = dict(DocumentService.DEFAULT_RULES.get("rules") or {})
         return {"mode": mode, "rules": rules}
 
@@ -669,7 +750,7 @@ class DatasetService:
                             knowledge_index_node_data["embedding_model_provider"] = dataset.embedding_model_provider
                             knowledge_index_node_data["retrieval_model"] = dataset.retrieval_model
                             knowledge_index_node_data["chunk_structure"] = dataset.chunk_structure
-                            knowledge_index_node_data["indexing_technique"] = dataset.indexing_technique  # pyright: ignore[reportAttributeAccessIssue]
+                            knowledge_index_node_data["indexing_technique"] = dataset.indexing_technique
                             knowledge_index_node_data["keyword_number"] = dataset.keyword_number
                             knowledge_index_node_data["summary_index_setting"] = dataset.summary_index_setting
                             node["data"] = knowledge_index_node_data
@@ -1984,7 +2065,7 @@ class DocumentService:
                         if process_rule.rules:
                             dataset_process_rule = DatasetProcessRule(
                                 dataset_id=dataset.id,
-                                mode=process_rule.mode,
+                                mode=ProcessRuleMode(process_rule.mode),
                                 rules=process_rule.rules.model_dump_json() if process_rule.rules else None,
                                 created_by=account.id,
                             )
@@ -1995,7 +2076,7 @@ class DocumentService:
                     elif process_rule.mode == ProcessRuleMode.AUTOMATIC:
                         dataset_process_rule = DatasetProcessRule(
                             dataset_id=dataset.id,
-                            mode=process_rule.mode,
+                            mode=ProcessRuleMode.AUTOMATIC,
                             rules=json.dumps(DatasetProcessRule.AUTOMATIC_RULES),
                             created_by=account.id,
                         )
@@ -2572,14 +2653,14 @@ class DocumentService:
             if process_rule.mode in {ProcessRuleMode.CUSTOM, ProcessRuleMode.HIERARCHICAL}:
                 dataset_process_rule = DatasetProcessRule(
                     dataset_id=dataset.id,
-                    mode=process_rule.mode,
+                    mode=ProcessRuleMode(process_rule.mode),
                     rules=process_rule.rules.model_dump_json() if process_rule.rules else None,
                     created_by=account.id,
                 )
             elif process_rule.mode == ProcessRuleMode.AUTOMATIC:
                 dataset_process_rule = DatasetProcessRule(
                     dataset_id=dataset.id,
-                    mode=process_rule.mode,
+                    mode=ProcessRuleMode.AUTOMATIC,
                     rules=json.dumps(DatasetProcessRule.AUTOMATIC_RULES),
                     created_by=account.id,
                 )
@@ -2851,94 +2932,16 @@ class DocumentService:
 
     @classmethod
     def estimate_args_validate(cls, args: dict[str, Any]):
-        if "info_list" not in args or not args["info_list"]:
-            raise ValueError("Data source info is required")
-
-        if not isinstance(args["info_list"], dict):
-            raise ValueError("Data info is invalid")
-
-        if "process_rule" not in args or not args["process_rule"]:
-            raise ValueError("Process rule is required")
-
-        if not isinstance(args["process_rule"], dict):
-            raise ValueError("Process rule is invalid")
-
-        if "mode" not in args["process_rule"] or not args["process_rule"]["mode"]:
-            raise ValueError("Process rule mode is required")
-
-        if args["process_rule"]["mode"] not in DatasetProcessRule.MODES:
-            raise ValueError("Process rule mode is invalid")
-
-        if args["process_rule"]["mode"] == ProcessRuleMode.AUTOMATIC:
-            args["process_rule"]["rules"] = {}
-        else:
-            if "rules" not in args["process_rule"] or not args["process_rule"]["rules"]:
-                raise ValueError("Process rule rules is required")
-
-            if not isinstance(args["process_rule"]["rules"], dict):
-                raise ValueError("Process rule rules is invalid")
-
-            if (
-                "pre_processing_rules" not in args["process_rule"]["rules"]
-                or args["process_rule"]["rules"]["pre_processing_rules"] is None
-            ):
-                raise ValueError("Process rule pre_processing_rules is required")
-
-            if not isinstance(args["process_rule"]["rules"]["pre_processing_rules"], list):
-                raise ValueError("Process rule pre_processing_rules is invalid")
-
-            unique_pre_processing_rule_dicts = {}
-            for pre_processing_rule in args["process_rule"]["rules"]["pre_processing_rules"]:
-                if "id" not in pre_processing_rule or not pre_processing_rule["id"]:
-                    raise ValueError("Process rule pre_processing_rules id is required")
-
-                if pre_processing_rule["id"] not in DatasetProcessRule.PRE_PROCESSING_RULES:
-                    raise ValueError("Process rule pre_processing_rules id is invalid")
-
-                if "enabled" not in pre_processing_rule or pre_processing_rule["enabled"] is None:
-                    raise ValueError("Process rule pre_processing_rules enabled is required")
-
-                if not isinstance(pre_processing_rule["enabled"], bool):
-                    raise ValueError("Process rule pre_processing_rules enabled is invalid")
-
-                unique_pre_processing_rule_dicts[pre_processing_rule["id"]] = pre_processing_rule
-
-            args["process_rule"]["rules"]["pre_processing_rules"] = list(unique_pre_processing_rule_dicts.values())
-
-            if (
-                "segmentation" not in args["process_rule"]["rules"]
-                or args["process_rule"]["rules"]["segmentation"] is None
-            ):
-                raise ValueError("Process rule segmentation is required")
-
-            if not isinstance(args["process_rule"]["rules"]["segmentation"], dict):
-                raise ValueError("Process rule segmentation is invalid")
-
-            if (
-                "separator" not in args["process_rule"]["rules"]["segmentation"]
-                or not args["process_rule"]["rules"]["segmentation"]["separator"]
-            ):
-                raise ValueError("Process rule segmentation separator is required")
-
-            if not isinstance(args["process_rule"]["rules"]["segmentation"]["separator"], str):
-                raise ValueError("Process rule segmentation separator is invalid")
-
-            if (
-                "max_tokens" not in args["process_rule"]["rules"]["segmentation"]
-                or not args["process_rule"]["rules"]["segmentation"]["max_tokens"]
-            ):
-                raise ValueError("Process rule segmentation max_tokens is required")
-
-            if not isinstance(args["process_rule"]["rules"]["segmentation"]["max_tokens"], int):
-                raise ValueError("Process rule segmentation max_tokens is invalid")
-
-        # valid summary index setting
-        summary_index_setting = args["process_rule"].get("summary_index_setting")
-        if summary_index_setting and summary_index_setting.get("enable"):
-            if "model_name" not in summary_index_setting or not summary_index_setting["model_name"]:
-                raise ValueError("Summary index model name is required")
-            if "model_provider_name" not in summary_index_setting or not summary_index_setting["model_provider_name"]:
-                raise ValueError("Summary index model provider name is required")
+        try:
+            validated = _EstimateArgs.model_validate(args)
+        except ValidationError as e:
+            first = e.errors()[0]
+            original = first.get("ctx", {}).get("error")
+            raise ValueError(str(original) if isinstance(original, ValueError) else first["msg"]) from e
+        process_rule_dict = validated.process_rule.model_dump(exclude_none=True)
+        if validated.process_rule.mode == ProcessRuleMode.AUTOMATIC:
+            process_rule_dict["rules"] = {}
+        args["process_rule"] = process_rule_dict
 
     @staticmethod
     def batch_update_document_status(
diff --git a/api/services/datasource_provider_service.py b/api/services/datasource_provider_service.py
index 416bc8cef9..2245adb681 100644
--- a/api/services/datasource_provider_service.py
+++ b/api/services/datasource_provider_service.py
@@ -49,6 +49,94 @@ class DatasourceProviderService:
     def __init__(self) -> None:
         self.provider_manager = PluginDatasourceManager()
 
+    @staticmethod
+    def _should_refresh_credentials(datasource_provider: DatasourceProvider, now: int | None = None) -> bool:
+        current_time = int(time.time()) if now is None else now
+        if datasource_provider.expires_at == -1:
+            return False
+        return (datasource_provider.expires_at - 60) < current_time
+
+    def _refresh_datasource_credentials(
+        self,
+        tenant_id: str,
+        provider: str,
+        plugin_id: str,
+        datasource_provider: DatasourceProvider,
+        current_user: Any,
+    ) -> tuple[dict[str, Any], int]:
+        datasource_provider_id = DatasourceProviderID(f"{plugin_id}/{provider}")
+        provider_name = datasource_provider_id.provider_name
+        credential_id = getattr(datasource_provider, "id", None)
+        credential_name = getattr(datasource_provider, "name", None)
+        logger.info(
+            "Refreshing datasource credentials for provider %s",
+            provider_name,
+            extra={
+                "tenant_id": tenant_id,
+                "plugin_id": datasource_provider_id.plugin_id,
+                "provider": provider_name,
+                "credential_id": credential_id,
+                "credential_name": credential_name,
+                "expires_at": datasource_provider.expires_at,
+            },
+        )
+        decrypted_credentials = self.decrypt_datasource_provider_credentials(
+            tenant_id=tenant_id,
+            datasource_provider=datasource_provider,
+            plugin_id=plugin_id,
+            provider=provider,
+        )
+        redirect_uri = (
+            f"{dify_config.CONSOLE_API_URL}/console/api/oauth/plugin/{datasource_provider_id}/datasource/callback"
+        )
+        system_credentials = self.get_oauth_client(tenant_id, datasource_provider_id)
+        try:
+            refreshed_credentials = OAuthHandler().refresh_credentials(
+                tenant_id=tenant_id,
+                user_id=current_user.id,
+                plugin_id=datasource_provider_id.plugin_id,
+                provider=provider_name,
+                redirect_uri=redirect_uri,
+                system_credentials=system_credentials or {},
+                credentials=decrypted_credentials,
+            )
+        except Exception as exc:
+            message = (
+                f"Failed to refresh datasource credentials for provider {provider_name}"
+                f" (credential: {credential_name or credential_id or 'unknown'})"
+            )
+            logger.exception(
+                message,
+                extra={
+                    "tenant_id": tenant_id,
+                    "plugin_id": datasource_provider_id.plugin_id,
+                    "provider": provider_name,
+                    "credential_id": credential_id,
+                    "credential_name": credential_name,
+                },
+            )
+            raise ValueError(f"{message}: {exc}") from exc
+        encrypted_credentials = self.encrypt_datasource_provider_credentials(
+            tenant_id=tenant_id,
+            raw_credentials=refreshed_credentials.credentials,
+            provider=provider,
+            plugin_id=plugin_id,
+            datasource_provider=datasource_provider,
+        )
+        logger.info(
+            "Refreshed datasource credentials for provider %s",
+            provider_name,
+            extra={
+                "tenant_id": tenant_id,
+                "plugin_id": datasource_provider_id.plugin_id,
+                "provider": provider_name,
+                "credential_id": credential_id,
+                "credential_name": credential_name,
+                "expires_at": refreshed_credentials.expires_at,
+            },
+        )
+        return encrypted_credentials, refreshed_credentials.expires_at
+
     def remove_oauth_custom_client_params(self, tenant_id: str, datasource_provider_id: DatasourceProviderID):
         """
         remove oauth custom client params
@@ -108,7 +196,10 @@ class DatasourceProviderService:
         credential_id: str | None = None,
     ) -> dict[str, Any]:
         """
-        get credential by id
+        Return decrypted datasource credentials.
+
+        If the stored credential is expired or about to expire, this method refreshes
+        it through plugin-daemon and persists the refreshed credential before returning.
         """
         with sessionmaker(bind=db.engine).begin() as session:
             if credential_id:
@@ -130,39 +221,17 @@ class DatasourceProviderService:
                 )
             if not datasource_provider:
                 return {}
-            # refresh the credentials
-            if datasource_provider.expires_at != -1 and (datasource_provider.expires_at - 60) < int(time.time()):
+            if self._should_refresh_credentials(datasource_provider):
                 current_user = get_current_user()
-                decrypted_credentials = self.decrypt_datasource_provider_credentials(
+                encrypted_credentials, expires_at = self._refresh_datasource_credentials(
                     tenant_id=tenant_id,
-                    datasource_provider=datasource_provider,
-                    plugin_id=plugin_id,
-                    provider=provider,
-                )
-                datasource_provider_id = DatasourceProviderID(f"{plugin_id}/{provider}")
-                provider_name = datasource_provider_id.provider_name
-                redirect_uri = (
-                    f"{dify_config.CONSOLE_API_URL}/console/api/oauth/plugin/"
-                    f"{datasource_provider_id}/datasource/callback"
-                )
-                system_credentials = self.get_oauth_client(tenant_id, datasource_provider_id)
-                refreshed_credentials = OAuthHandler().refresh_credentials(
-                    tenant_id=tenant_id,
-                    user_id=current_user.id,
-                    plugin_id=datasource_provider_id.plugin_id,
-                    provider=provider_name,
-                    redirect_uri=redirect_uri,
-                    system_credentials=system_credentials or {},
-                    credentials=decrypted_credentials,
-                )
-                datasource_provider.encrypted_credentials = self.encrypt_datasource_provider_credentials(
-                    tenant_id=tenant_id,
-                    raw_credentials=refreshed_credentials.credentials,
                     provider=provider,
                     plugin_id=plugin_id,
                     datasource_provider=datasource_provider,
+                    current_user=current_user,
                 )
-                datasource_provider.expires_at = refreshed_credentials.expires_at
+                datasource_provider.encrypted_credentials = encrypted_credentials
+                datasource_provider.expires_at = expires_at
 
             return self.decrypt_datasource_provider_credentials(
                 tenant_id=tenant_id,
@@ -178,7 +247,10 @@ class DatasourceProviderService:
         plugin_id: str,
     ) -> list[dict[str, Any]]:
         """
-        get all datasource credentials by provider
+        Return all decrypted datasource credentials for a provider.
+
+        Expired credentials are refreshed independently. A failed credential refresh is
+        logged and skipped so one broken authorization does not block other credentials.
         """
         with sessionmaker(bind=db.engine).begin() as session:
             datasource_providers = session.scalars(
@@ -193,46 +265,39 @@ class DatasourceProviderService:
             if not datasource_providers:
                 return []
             current_user = get_current_user()
-            # refresh the credentials
             real_credentials_list = []
             for datasource_provider in datasource_providers:
-                decrypted_credentials = self.decrypt_datasource_provider_credentials(
-                    tenant_id=tenant_id,
-                    datasource_provider=datasource_provider,
-                    plugin_id=plugin_id,
-                    provider=provider,
-                )
-                datasource_provider_id = DatasourceProviderID(f"{plugin_id}/{provider}")
-                provider_name = datasource_provider_id.provider_name
-                redirect_uri = (
-                    f"{dify_config.CONSOLE_API_URL}/console/api/oauth/plugin/"
-                    f"{datasource_provider_id}/datasource/callback"
-                )
-                system_credentials = self.get_oauth_client(tenant_id, datasource_provider_id)
-                refreshed_credentials = OAuthHandler().refresh_credentials(
-                    tenant_id=tenant_id,
-                    user_id=current_user.id,
-                    plugin_id=datasource_provider_id.plugin_id,
-                    provider=provider_name,
-                    redirect_uri=redirect_uri,
-                    system_credentials=system_credentials or {},
-                    credentials=decrypted_credentials,
-                )
-                datasource_provider.encrypted_credentials = self.encrypt_datasource_provider_credentials(
-                    tenant_id=tenant_id,
-                    raw_credentials=refreshed_credentials.credentials,
-                    provider=provider,
-                    plugin_id=plugin_id,
-                    datasource_provider=datasource_provider,
-                )
-                datasource_provider.expires_at = refreshed_credentials.expires_at
-                real_credentials = self.decrypt_datasource_provider_credentials(
-                    tenant_id=tenant_id,
-                    datasource_provider=datasource_provider,
-                    plugin_id=plugin_id,
-                    provider=provider,
-                )
-                real_credentials_list.append(real_credentials)
+                try:
+                    if self._should_refresh_credentials(datasource_provider):
+                        encrypted_credentials, expires_at = self._refresh_datasource_credentials(
+                            tenant_id=tenant_id,
+                            provider=provider,
+                            plugin_id=plugin_id,
+                            datasource_provider=datasource_provider,
+                            current_user=current_user,
+                        )
+                        datasource_provider.encrypted_credentials = encrypted_credentials
+                        datasource_provider.expires_at = expires_at
+                    real_credentials = self.decrypt_datasource_provider_credentials(
+                        tenant_id=tenant_id,
+                        datasource_provider=datasource_provider,
+                        plugin_id=plugin_id,
+                        provider=provider,
+                    )
+                    real_credentials_list.append(real_credentials)
+                except Exception:
+                    logger.exception(
+                        "Skipping datasource credentials for provider %s after refresh or decrypt failure",
+                        provider,
+                        extra={
+                            "tenant_id": tenant_id,
+                            "plugin_id": plugin_id,
+                            "provider": provider,
+                            "credential_id": getattr(datasource_provider, "id", None),
+                            "credential_name": getattr(datasource_provider, "name", None),
+                            "expires_at": getattr(datasource_provider, "expires_at", None),
+                        },
+                    )
 
             return real_credentials_list
 
diff --git a/api/services/dsl_version.py b/api/services/dsl_version.py
new file mode 100644
index 0000000000..cb7384df70
--- /dev/null
+++ b/api/services/dsl_version.py
@@ -0,0 +1,20 @@
+from packaging import version
+
+from services.entities.dsl_entities import ImportStatus
+
+
+def check_version_compatibility(imported_version: str, current_version: str) -> ImportStatus:
+    """Determine DSL import status based on imported and current versions."""
+    try:
+        current_ver = version.parse(current_version)
+        imported_ver = version.parse(imported_version)
+    except version.InvalidVersion:
+        return ImportStatus.FAILED
+
+    if imported_ver > current_ver:
+        return ImportStatus.PENDING
+    if imported_ver.major < current_ver.major:
+        return ImportStatus.PENDING
+    if imported_ver.minor < current_ver.minor:
+        return ImportStatus.COMPLETED_WITH_WARNINGS
+    return ImportStatus.COMPLETED
diff --git a/api/services/errors/base.py b/api/services/errors/base.py
index 0f9631190f..12eb6f51d0 100644
--- a/api/services/errors/base.py
+++ b/api/services/errors/base.py
@@ -1,3 +1,3 @@
 class BaseServiceError(ValueError):
-    def __init__(self, description: str | None = None):
+    def __init__(self, description: str = ""):
         self.description = description
diff --git a/api/services/errors/enterprise.py b/api/services/errors/enterprise.py
index c9126199fd..60f518dd3c 100644
--- a/api/services/errors/enterprise.py
+++ b/api/services/errors/enterprise.py
@@ -6,7 +6,7 @@ from services.errors.base import BaseServiceError
 class EnterpriseServiceError(BaseServiceError):
     """Base exception for enterprise service errors."""
 
-    def __init__(self, description: str | None = None, status_code: int | None = None):
+    def __init__(self, description: str = "", status_code: int | None = None):
         super().__init__(description)
         self.status_code = status_code
 
@@ -20,26 +20,26 @@ class EnterpriseAPIError(EnterpriseServiceError):
 class EnterpriseAPINotFoundError(EnterpriseServiceError):
     """Enterprise API returned 404 Not Found."""
 
-    def __init__(self, description: str | None = None):
+    def __init__(self, description: str = ""):
         super().__init__(description, status_code=404)
 
 
 class EnterpriseAPIForbiddenError(EnterpriseServiceError):
     """Enterprise API returned 403 Forbidden."""
 
-    def __init__(self, description: str | None = None):
+    def __init__(self, description: str = ""):
         super().__init__(description, status_code=403)
 
 
 class EnterpriseAPIUnauthorizedError(EnterpriseServiceError):
     """Enterprise API returned 401 Unauthorized."""
 
-    def __init__(self, description: str | None = None):
+    def __init__(self, description: str = ""):
         super().__init__(description, status_code=401)
 
 
 class EnterpriseAPIBadRequestError(EnterpriseServiceError):
     """Enterprise API returned 400 Bad Request."""
 
-    def __init__(self, description: str | None = None):
+    def __init__(self, description: str = ""):
         super().__init__(description, status_code=400)
diff --git a/api/services/errors/llm.py b/api/services/errors/llm.py
index 5bf34f3aa6..407779d795 100644
--- a/api/services/errors/llm.py
+++ b/api/services/errors/llm.py
@@ -1,9 +1,9 @@
 class InvokeError(Exception):
     """Base class for all LLM exceptions."""
 
-    description: str | None = None
+    description: str = ""
 
-    def __init__(self, description: str | None = None):
+    def __init__(self, description: str = ""):
         self.description = description
 
     def __str__(self):
diff --git a/api/services/feature_service.py b/api/services/feature_service.py
index 9477c28bf3..257c4bea9a 100644
--- a/api/services/feature_service.py
+++ b/api/services/feature_service.py
@@ -166,7 +166,7 @@ class SystemFeatureModel(BaseModel):
     enable_email_code_login: bool = False
     enable_email_password_login: bool = True
     enable_social_oauth_login: bool = False
-    enable_collaboration_mode: bool = False
+    enable_collaboration_mode: bool = True
     is_allow_register: bool = False
     is_allow_create_workspace: bool = False
     is_email_setup: bool = False
diff --git a/api/services/file_service.py b/api/services/file_service.py
index f60afe2f19..4d3afcc9ad 100644
--- a/api/services/file_service.py
+++ b/api/services/file_service.py
@@ -107,15 +107,14 @@ class FileService:
             hash=hashlib.sha3_256(content).hexdigest(),
             source_url=source_url,
         )
-        # The `UploadFile` ID is generated within its constructor, so flushing to retrieve the ID is unnecessary.
-        # We can directly generate the `source_url` here before committing.
-        if not upload_file.source_url:
-            upload_file.source_url = file_helpers.get_signed_file_url(upload_file_id=upload_file.id)
 
         with self._session_maker(expire_on_commit=False) as session:
             session.add(upload_file)
             session.commit()
 
+        if not upload_file.source_url:
+            upload_file.source_url = file_helpers.get_signed_file_url(upload_file_id=upload_file.id)
+
         return upload_file
 
     @staticmethod
@@ -132,12 +131,13 @@ class FileService:
         return file_size <= file_size_limit
 
     def get_file_base64(self, file_id: str) -> str:
-        upload_file = self._session_maker(expire_on_commit=False).scalar(
-            select(UploadFile).where(UploadFile.id == file_id).limit(1)
-        )
-        if not upload_file:
-            raise NotFound("File not found")
-        blob = storage.load_once(upload_file.key)
+        with self._session_maker(expire_on_commit=False) as session:
+            upload_file = session.scalar(select(UploadFile).where(UploadFile.id == file_id).limit(1))
+            if not upload_file:
+                raise NotFound("File not found")
+            upload_file_key = upload_file.key
+
+        blob = storage.load_once(upload_file_key)
         return base64.b64encode(blob).decode()
 
     def upload_text(self, text: str, text_name: str, user_id: str, tenant_id: str) -> UploadFile:
@@ -173,12 +173,14 @@ class FileService:
 
         return upload_file
 
-    def get_file_preview(self, file_id: str):
+    def get_file_preview(self, file_id: str, tenant_id: str):
         """
         Return a short text preview extracted from a document file.
         """
         with self._session_maker(expire_on_commit=False) as session:
-            upload_file = session.scalar(select(UploadFile).where(UploadFile.id == file_id).limit(1))
+            upload_file = session.scalar(
+                select(UploadFile).where(UploadFile.id == file_id, UploadFile.tenant_id == tenant_id).limit(1)
+            )
 
         if not upload_file:
             raise NotFound("File not found")
diff --git a/api/services/hit_testing_service.py b/api/services/hit_testing_service.py
index 2e5987dd28..42c531ae48 100644
--- a/api/services/hit_testing_service.py
+++ b/api/services/hit_testing_service.py
@@ -3,6 +3,8 @@ import logging
 import time
 from typing import Any, TypedDict, cast
 
+from sqlalchemy import select
+
 from core.app.app_config.entities import ModelConfig
 from core.rag.datasource.retrieval_service import DefaultRetrievalModelDict, RetrievalService
 from core.rag.index_processor.constant.query_type import QueryType
@@ -13,6 +15,7 @@ from extensions.ext_database import db
 from graphon.model_runtime.entities import LLMMode
 from models import Account
 from models.dataset import Dataset, DatasetQuery
+from models.dataset import Document as DatasetDocument
 from models.enums import CreatorUserRole, DatasetQuerySource
 
 logger = logging.getLogger(__name__)
@@ -41,6 +44,59 @@ class HitTestingRetrievalModelDict(DefaultRetrievalModelDict, total=False):
 
 
 class HitTestingService:
+    @staticmethod
+    def _dump_dataset_document(document: DatasetDocument) -> dict[str, Any]:
+        return {
+            "id": document.id,
+            "data_source_type": document.data_source_type,
+            "name": document.name,
+            "doc_type": document.doc_type,
+            "doc_metadata": document.doc_metadata,
+        }
+
+    @classmethod
+    def _dump_retrieval_records(cls, records: list[Any]) -> list[dict[str, Any]]:
+        dumped_records = [record.model_dump() for record in records]
+        document_ids = {
+            segment.get("document_id")
+            for record in dumped_records
+            if isinstance(record, dict)
+            for segment in [record.get("segment")]
+            if isinstance(segment, dict) and segment.get("document_id")
+        }
+        if not document_ids:
+            return dumped_records
+
+        documents = {
+            document.id: cls._dump_dataset_document(document)
+            for document in db.session.scalars(
+                select(DatasetDocument).where(DatasetDocument.id.in_(document_ids))
+            ).all()
+        }
+
+        records_with_documents: list[dict[str, Any]] = []
+        missing_document_ids: set[str] = set()
+        for record in dumped_records:
+            segment = record.get("segment")
+            if not isinstance(segment, dict):
+                records_with_documents.append(record)
+                continue
+
+            document_id = segment.get("document_id")
+            if document_id in documents:
+                segment["document"] = documents[document_id]
+                records_with_documents.append(record)
+            elif document_id:
+                missing_document_ids.add(document_id)
+
+        if missing_document_ids:
+            logger.warning(
+                "Skipping hit-testing records with missing documents, document_ids=%s",
+                sorted(missing_document_ids),
+            )
+
+        return records_with_documents
+
     @classmethod
     def retrieve(
         cls,
@@ -174,7 +230,7 @@ class HitTestingService:
             "query": {
                 "content": query,
             },
-            "records": [record.model_dump() for record in records],
+            "records": cls._dump_retrieval_records(records),
         }
 
     @classmethod
diff --git a/api/services/model_load_balancing_service.py b/api/services/model_load_balancing_service.py
index c269346f5f..15be7d5af3 100644
--- a/api/services/model_load_balancing_service.py
+++ b/api/services/model_load_balancing_service.py
@@ -1,6 +1,6 @@
 import json
 import logging
-from typing import Any, TypedDict
+from typing import Any, TypedDict, cast
 
 from sqlalchemy import or_, select
 
@@ -620,7 +620,7 @@ class ModelLoadBalancingService:
 
         for key, value in credentials.items():
             if key in provider_credential_secret_variables:
-                credentials[key] = encrypter.encrypt_token(tenant_id, value)
+                credentials[key] = encrypter.encrypt_token(tenant_id, cast(str, value))
 
         return credentials
 
diff --git a/api/services/plugin/plugin_migration.py b/api/services/plugin/plugin_migration.py
index 43a726b100..8fa3c3d4ef 100644
--- a/api/services/plugin/plugin_migration.py
+++ b/api/services/plugin/plugin_migration.py
@@ -16,6 +16,7 @@ from pydantic import TypeAdapter
 from sqlalchemy import func, select
 from sqlalchemy.orm import Session
 
+from configs import dify_config
 from core.agent.entities import AgentToolEntity
 from core.helper import marketplace
 from core.plugin.entities.plugin import PluginInstallationSource
@@ -310,6 +311,8 @@ class PluginMigration:
         """
         Fetch plugin unique identifier using plugin id.
         """
+        if not dify_config.MARKETPLACE_ENABLED:
+            return None
         plugin_manifest = marketplace.batch_fetch_plugin_manifests([plugin_id])
         if not plugin_manifest:
             return None
@@ -542,6 +545,11 @@ class PluginMigration:
         """
         Install plugins for a tenant.
         """
+        if plugin_identifiers_map and not dify_config.MARKETPLACE_ENABLED:
+            raise ValueError(
+                "Marketplace disabled in offline mode; cannot bulk-install plugins. "
+                "Pre-upload plugin packages via Console first."
+            )
         manager = PluginInstaller()
 
         # download all the plugins and upload
diff --git a/api/services/plugin/plugin_service.py b/api/services/plugin/plugin_service.py
index ca83742d65..72271c55d8 100644
--- a/api/services/plugin/plugin_service.py
+++ b/api/services/plugin/plugin_service.py
@@ -73,35 +73,43 @@ class PluginService:
                     cache_not_exists.append(plugin_id)
 
             if cache_not_exists:
-                manifests = {
-                    manifest.plugin_id: manifest
-                    for manifest in marketplace.batch_fetch_plugin_manifests(cache_not_exists)
-                }
-
-                for plugin_id, manifest in manifests.items():
-                    latest_plugin = PluginService.LatestPluginCache(
-                        plugin_id=plugin_id,
-                        version=manifest.latest_version,
-                        unique_identifier=manifest.latest_package_identifier,
-                        status=manifest.status,
-                        deprecated_reason=manifest.deprecated_reason,
-                        alternative_plugin_id=manifest.alternative_plugin_id,
+                if not dify_config.MARKETPLACE_ENABLED:
+                    logger.info(
+                        "Marketplace disabled; skipping latest-plugins metadata fetch for %d ids",
+                        len(cache_not_exists),
                     )
+                    for plugin_id in cache_not_exists:
+                        result[plugin_id] = None
+                else:
+                    manifests = {
+                        manifest.plugin_id: manifest
+                        for manifest in marketplace.batch_fetch_plugin_manifests(cache_not_exists)
+                    }
 
-                    # Store in Redis
-                    redis_client.setex(
-                        f"{PluginService.REDIS_KEY_PREFIX}{plugin_id}",
-                        PluginService.REDIS_TTL,
-                        latest_plugin.model_dump_json(),
-                    )
+                    for plugin_id, manifest in manifests.items():
+                        latest_plugin = PluginService.LatestPluginCache(
+                            plugin_id=plugin_id,
+                            version=manifest.latest_version,
+                            unique_identifier=manifest.latest_package_identifier,
+                            status=manifest.status,
+                            deprecated_reason=manifest.deprecated_reason,
+                            alternative_plugin_id=manifest.alternative_plugin_id,
+                        )
 
-                    result[plugin_id] = latest_plugin
+                        # Store in Redis
+                        redis_client.setex(
+                            f"{PluginService.REDIS_KEY_PREFIX}{plugin_id}",
+                            PluginService.REDIS_TTL,
+                            latest_plugin.model_dump_json(),
+                        )
 
-                    # pop plugin_id from cache_not_exists
-                    cache_not_exists.remove(plugin_id)
+                        result[plugin_id] = latest_plugin
 
-                for plugin_id in cache_not_exists:
-                    result[plugin_id] = None
+                        # pop plugin_id from cache_not_exists
+                        cache_not_exists.remove(plugin_id)
+
+                    for plugin_id in cache_not_exists:
+                        result[plugin_id] = None
 
             return result
         except Exception:
diff --git a/api/services/rag_pipeline/rag_pipeline.py b/api/services/rag_pipeline/rag_pipeline.py
index 9db6682e10..91d917b0b1 100644
--- a/api/services/rag_pipeline/rag_pipeline.py
+++ b/api/services/rag_pipeline/rag_pipeline.py
@@ -1350,6 +1350,12 @@ class RagPipelineService:
         )
         return workflow_node_execution_db_model
 
+    def _fetch_recommended_plugin_manifests(self, plugin_ids: list[str]) -> list[Any]:
+        if not dify_config.MARKETPLACE_ENABLED:
+            logger.info("Marketplace disabled; recommended-plugins list empty")
+            return []
+        return marketplace.batch_fetch_plugin_by_ids(plugin_ids)
+
     def get_recommended_plugins(self, type: str) -> dict[str, Any]:
         # Query active recommended plugins
         stmt = select(PipelineRecommendedPlugin).where(PipelineRecommendedPlugin.active == True)
@@ -1372,7 +1378,7 @@ class RagPipelineService:
         )
         providers_map = {provider.plugin_id: provider.to_dict() for provider in providers}
 
-        plugin_manifests = marketplace.batch_fetch_plugin_by_ids(plugin_ids)
+        plugin_manifests = self._fetch_recommended_plugin_manifests(plugin_ids)
         plugin_manifests_map = {manifest["plugin_id"]: manifest for manifest in plugin_manifests}
 
         installed_plugin_list = []
diff --git a/api/services/rag_pipeline/rag_pipeline_dsl_service.py b/api/services/rag_pipeline/rag_pipeline_dsl_service.py
index f315d053cb..37ebffbeb4 100644
--- a/api/services/rag_pipeline/rag_pipeline_dsl_service.py
+++ b/api/services/rag_pipeline/rag_pipeline_dsl_service.py
@@ -13,7 +13,6 @@ import yaml  # type: ignore
 from Crypto.Cipher import AES
 from Crypto.Util.Padding import pad, unpad
 from flask_login import current_user
-from packaging import version
 from pydantic import BaseModel
 from sqlalchemy import select
 from sqlalchemy.orm import Session
@@ -37,6 +36,7 @@ from models import Account
 from models.dataset import Dataset, DatasetCollectionBinding, Pipeline
 from models.enums import CollectionBindingType, DatasetRuntimeMode
 from models.workflow import Workflow, WorkflowType
+from services.dsl_version import check_version_compatibility
 from services.entities.dsl_entities import CheckDependenciesResult, ImportMode, ImportStatus
 from services.entities.knowledge_entities.rag_pipeline_entities import (
     IconInfo,
@@ -64,30 +64,6 @@ class RagPipelineImportInfo(BaseModel):
     dataset_id: str | None = None
 
 
-def _check_version_compatibility(imported_version: str) -> ImportStatus:
-    """Determine import status based on version comparison"""
-    try:
-        current_ver = version.parse(CURRENT_DSL_VERSION)
-        imported_ver = version.parse(imported_version)
-    except version.InvalidVersion:
-        return ImportStatus.FAILED
-
-    # If imported version is newer than current, always return PENDING
-    if imported_ver > current_ver:
-        return ImportStatus.PENDING
-
-    # If imported version is older than current's major, return PENDING
-    if imported_ver.major < current_ver.major:
-        return ImportStatus.PENDING
-
-    # If imported version is older than current's minor, return COMPLETED_WITH_WARNINGS
-    if imported_ver.minor < current_ver.minor:
-        return ImportStatus.COMPLETED_WITH_WARNINGS
-
-    # If imported version equals or is older than current's micro, return COMPLETED
-    return ImportStatus.COMPLETED
-
-
 class RagPipelinePendingData(BaseModel):
     import_mode: str
     yaml_content: str
@@ -100,6 +76,13 @@ class CheckDependenciesPendingData(BaseModel):
 
 
 class RagPipelineDslService:
+    """Import, export, and inspect RAG pipeline DSL using the caller-owned session.
+
+    Controllers wrap this service in a SQLAlchemy transaction context, so methods must only flush interim changes when
+    generated IDs are needed. Committing inside the service would close the caller's transaction and break later work in
+    the same context manager.
+    """
+
     def __init__(self, session: Session):
         self._session = session
 
@@ -195,7 +178,7 @@ class RagPipelineDslService:
             # check if imported_version is a float-like string
             if not isinstance(imported_version, str):
                 raise ValueError(f"Invalid version type, expected str, got {type(imported_version)}")
-            status = _check_version_compatibility(imported_version)
+            status = check_version_compatibility(imported_version, CURRENT_DSL_VERSION)
 
             # Extract app data
             pipeline_data = data.get("rag_pipeline")
@@ -325,7 +308,7 @@ class RagPipelineDslService:
                                 type=CollectionBindingType.DATASET,
                             )
                             self._session.add(dataset_collection_binding)
-                            self._session.commit()
+                            self._session.flush()
                         dataset_collection_binding_id = dataset_collection_binding.id
                         dataset.collection_binding_id = dataset_collection_binding_id
                         dataset.embedding_model = knowledge_configuration.embedding_model
@@ -337,7 +320,7 @@ class RagPipelineDslService:
                         dataset.summary_index_setting = knowledge_configuration.summary_index_setting
                     dataset.pipeline_id = pipeline.id
                     self._session.add(dataset)
-                    self._session.commit()
+                    self._session.flush()
                     dataset_id = dataset.id
             if not dataset_id:
                 raise ValueError("DSL is not valid, please check the Knowledge Index node.")
@@ -462,7 +445,7 @@ class RagPipelineDslService:
                                 type=CollectionBindingType.DATASET,
                             )
                             self._session.add(dataset_collection_binding)
-                            self._session.commit()
+                            self._session.flush()
                         dataset_collection_binding_id = dataset_collection_binding.id
                         dataset.collection_binding_id = dataset_collection_binding_id
                         dataset.embedding_model = knowledge_configuration.embedding_model
@@ -474,7 +457,7 @@ class RagPipelineDslService:
                         dataset.summary_index_setting = knowledge_configuration.summary_index_setting
                     dataset.pipeline_id = pipeline.id
                     self._session.add(dataset)
-                    self._session.commit()
+                    self._session.flush()
                     dataset_id = dataset.id
             if not dataset_id:
                 raise ValueError("DSL is not valid, please check the Knowledge Index node.")
@@ -585,7 +568,7 @@ class RagPipelineDslService:
             pipeline.id = str(uuid4())
 
             self._session.add(pipeline)
-            self._session.commit()
+            self._session.flush()
         # save dependencies
         if dependencies:
             redis_client.setex(
@@ -627,8 +610,8 @@ class RagPipelineDslService:
             workflow.environment_variables = environment_variables
             workflow.conversation_variables = conversation_variables
             workflow.rag_pipeline_variables = rag_pipeline_variables_list
-        # commit db session changes
-        self._session.commit()
+        # Keep transaction ownership with the caller while materializing IDs and constraint checks before returning.
+        self._session.flush()
 
         return pipeline
 
diff --git a/api/services/rag_pipeline/rag_pipeline_manage_service.py b/api/services/rag_pipeline/rag_pipeline_manage_service.py
index 0908d30c12..eaf797760f 100644
--- a/api/services/rag_pipeline/rag_pipeline_manage_service.py
+++ b/api/services/rag_pipeline/rag_pipeline_manage_service.py
@@ -1,7 +1,11 @@
+import logging
+
 from core.plugin.entities.plugin_daemon import PluginDatasourceProviderEntity
 from core.plugin.impl.datasource import PluginDatasourceManager
 from services.datasource_provider_service import DatasourceProviderService
 
+logger = logging.getLogger(__name__)
+
 
 class RagPipelineManageService:
     @staticmethod
@@ -15,9 +19,21 @@ class RagPipelineManageService:
         datasources = manager.fetch_datasource_providers(tenant_id)
         for datasource in datasources:
             datasource_provider_service = DatasourceProviderService()
-            credentials = datasource_provider_service.get_datasource_credentials(
-                tenant_id=tenant_id, provider=datasource.provider, plugin_id=datasource.plugin_id
-            )
-            if credentials:
-                datasource.is_authorized = True
+            try:
+                credentials = datasource_provider_service.get_datasource_credentials(
+                    tenant_id=tenant_id, provider=datasource.provider, plugin_id=datasource.plugin_id
+                )
+                if credentials:
+                    datasource.is_authorized = True
+            except Exception:
+                logger.exception(
+                    "Skipping datasource credentials for provider %s after refresh or decrypt failure",
+                    datasource.provider,
+                    extra={
+                        "tenant_id": tenant_id,
+                        "plugin_id": datasource.plugin_id,
+                        "provider": datasource.provider,
+                    },
+                )
+
         return datasources
diff --git a/api/services/rag_pipeline/rag_pipeline_transform_service.py b/api/services/rag_pipeline/rag_pipeline_transform_service.py
index f08ec7474b..f95519fc9e 100644
--- a/api/services/rag_pipeline/rag_pipeline_transform_service.py
+++ b/api/services/rag_pipeline/rag_pipeline_transform_service.py
@@ -9,6 +9,7 @@ import yaml
 from flask_login import current_user
 from sqlalchemy import select
 
+from configs import dify_config
 from constants import DOCUMENT_EXTENSIONS
 from core.plugin.impl.plugin import PluginInstaller
 from core.rag.index_processor.constant.index_type import IndexStructureType, IndexTechniqueType
@@ -273,6 +274,13 @@ class RagPipelineTransformService:
                 plugin_unique_identifier = dependency.get("value", {}).get("plugin_unique_identifier")
                 plugin_id = plugin_unique_identifier.split(":")[0]
                 if plugin_id not in installed_plugins_ids:
+                    if not dify_config.MARKETPLACE_ENABLED:
+                        logger.warning(
+                            "Marketplace disabled; skipping auto-install of %s. "
+                            "Pre-install via Console if pipeline requires it.",
+                            plugin_id,
+                        )
+                        continue
                     plugin_unique_identifier = plugin_migration._fetch_plugin_unique_identifier(plugin_id)  # type: ignore
                     if plugin_unique_identifier:
                         need_install_plugin_unique_identifiers.append(plugin_unique_identifier)
diff --git a/api/services/recommend_app/category_order.py b/api/services/recommend_app/category_order.py
new file mode 100644
index 0000000000..be6b112aa4
--- /dev/null
+++ b/api/services/recommend_app/category_order.py
@@ -0,0 +1,49 @@
+"""Apply Redis-backed category ordering for DB-backed Explore apps."""
+
+import json
+import logging
+from collections.abc import Collection
+from typing import Any
+
+from extensions.ext_redis import redis_client
+
+logger = logging.getLogger(__name__)
+
+EXPLORE_APP_CATEGORY_ORDER_KEY_PREFIX = "explore:apps:category_order"
+
+
+def _category_order_key(language: str) -> str:
+    return f"{EXPLORE_APP_CATEGORY_ORDER_KEY_PREFIX}:{language}"
+
+
+def get_explore_app_category_order(language: str) -> list[str]:
+    try:
+        raw_categories = redis_client.get(_category_order_key(language))
+    except Exception:
+        logger.exception("Failed to read explore app category order from Redis.")
+        return []
+
+    if not raw_categories:
+        return []
+
+    if isinstance(raw_categories, bytes):
+        raw_categories = raw_categories.decode("utf-8")
+
+    try:
+        categories: Any = json.loads(raw_categories)
+    except (TypeError, json.JSONDecodeError):
+        logger.warning("Invalid explore app category order payload for language %s.", language)
+        return []
+
+    if not isinstance(categories, list):
+        return []
+
+    return [category for category in categories if isinstance(category, str)]
+
+
+def order_categories(categories: Collection[str], language: str) -> list[str]:
+    configured_order = get_explore_app_category_order(language)
+    if configured_order:
+        return configured_order
+
+    return sorted(categories)
diff --git a/api/services/recommend_app/database/database_retrieval.py b/api/services/recommend_app/database/database_retrieval.py
index 1df5fd13b6..ac870f0700 100644
--- a/api/services/recommend_app/database/database_retrieval.py
+++ b/api/services/recommend_app/database/database_retrieval.py
@@ -6,6 +6,7 @@ from constants.languages import languages
 from extensions.ext_database import db
 from models.model import App, RecommendedApp
 from services.app_dsl_service import AppDslService
+from services.recommend_app.category_order import order_categories
 from services.recommend_app.recommend_app_base import RecommendAppRetrievalBase
 from services.recommend_app.recommend_app_type import RecommendAppType
 
@@ -18,7 +19,7 @@ class RecommendedAppItemDict(TypedDict):
     copyright: Any
     privacy_policy: Any
     custom_disclaimer: str
-    category: str
+    categories: list[str]
     position: int
     is_listed: bool
 
@@ -80,6 +81,7 @@ class DatabaseRecommendAppRetrieval(RecommendAppRetrievalBase):
             if not site:
                 continue
 
+            app_categories = recommended_app.categories or []
             recommended_app_result: RecommendedAppItemDict = {
                 "id": recommended_app.id,
                 "app": recommended_app.app,
@@ -88,15 +90,18 @@ class DatabaseRecommendAppRetrieval(RecommendAppRetrievalBase):
                 "copyright": site.copyright,
                 "privacy_policy": site.privacy_policy,
                 "custom_disclaimer": site.custom_disclaimer,
-                "category": recommended_app.category,
+                "categories": app_categories,
                 "position": recommended_app.position,
                 "is_listed": recommended_app.is_listed,
             }
             recommended_apps_result.append(recommended_app_result)
 
-            categories.add(recommended_app.category)
+            categories.update(app_categories)
 
-        return RecommendedAppsResultDict(recommended_apps=recommended_apps_result, categories=sorted(categories))
+        return RecommendedAppsResultDict(
+            recommended_apps=recommended_apps_result,
+            categories=order_categories(categories, language),
+        )
 
     @classmethod
     def fetch_recommended_app_detail_from_db(cls, app_id: str) -> RecommendedAppDetailDict | None:
diff --git a/api/services/recommend_app/remote/remote_retrieval.py b/api/services/recommend_app/remote/remote_retrieval.py
index 5818be0480..0603e4c482 100644
--- a/api/services/recommend_app/remote/remote_retrieval.py
+++ b/api/services/recommend_app/remote/remote_retrieval.py
@@ -13,7 +13,10 @@ logger = logging.getLogger(__name__)
 
 class RemoteRecommendAppRetrieval(RecommendAppRetrievalBase):
     """
-    Retrieval recommended app from dify official
+    Retrieval recommended app from dify official.
+
+    The remote `/apps` payload is already curated for display, including category order.
+    Keep the response order intact so Explore matches the template service.
     """
 
     def get_recommend_app_detail(self, app_id: str):
@@ -64,8 +67,4 @@ class RemoteRecommendAppRetrieval(RecommendAppRetrievalBase):
             raise ValueError(f"fetch recommended apps failed, status code: {response.status_code}")
 
         result: dict[str, Any] = response.json()
-
-        if "categories" in result:
-            result["categories"] = sorted(result["categories"])
-
         return result
diff --git a/api/services/recommended_app_service.py b/api/services/recommended_app_service.py
index 134dd37a3e..4e189e6e7c 100644
--- a/api/services/recommended_app_service.py
+++ b/api/services/recommended_app_service.py
@@ -47,7 +47,9 @@ class RecommendedAppService:
         """
         mode = dify_config.HOSTED_FETCH_APP_TEMPLATES_MODE
         retrieval_instance = RecommendAppRetrievalFactory.get_recommend_app_factory(mode)()
-        result: dict[str, Any] = retrieval_instance.get_recommend_app_detail(app_id)
+        result: dict[str, Any] | None = retrieval_instance.get_recommend_app_detail(app_id)
+        if result is None:
+            return None
         if FeatureService.get_system_features().enable_trial_app:
             app_id = result["id"]
             trial_app_model = db.session.scalar(select(TrialApp).where(TrialApp.app_id == app_id).limit(1))
diff --git a/api/services/retention/conversation/message_export_service.py b/api/services/retention/conversation/message_export_service.py
index fbe0d2795d..8d7fedf2c1 100644
--- a/api/services/retention/conversation/message_export_service.py
+++ b/api/services/retention/conversation/message_export_service.py
@@ -228,7 +228,7 @@ class AppMessageExportService:
                     Message.conversation_id,
                     Message.query,
                     Message.answer,
-                    Message._inputs,  # pyright: ignore[reportPrivateUsage]
+                    Message._inputs,
                     Message.message_metadata,
                     Message.created_at,
                 )
diff --git a/api/services/tag_service.py b/api/services/tag_service.py
index 1882c855ea..09d49d8b3e 100644
--- a/api/services/tag_service.py
+++ b/api/services/tag_service.py
@@ -1,9 +1,11 @@
 import uuid
+from typing import cast
 
 import sqlalchemy as sa
 from flask_login import current_user
 from pydantic import BaseModel, Field
-from sqlalchemy import func, select
+from sqlalchemy import delete, func, select
+from sqlalchemy.engine import CursorResult
 from werkzeug.exceptions import NotFound
 
 from extensions.ext_database import db
@@ -19,7 +21,6 @@ class SaveTagPayload(BaseModel):
 
 class UpdateTagPayload(BaseModel):
     name: str = Field(min_length=1, max_length=50)
-    type: TagType
 
 
 class TagBindingCreatePayload(BaseModel):
@@ -29,7 +30,7 @@ class TagBindingCreatePayload(BaseModel):
 
 
 class TagBindingDeletePayload(BaseModel):
-    tag_id: str
+    tag_ids: list[str] = Field(min_length=1)
     target_id: str
     type: TagType
 
@@ -178,13 +179,18 @@ class TagService:
     @staticmethod
     def delete_tag_binding(payload: TagBindingDeletePayload):
         TagService.check_target_exists(payload.type, payload.target_id)
-        tag_binding = db.session.scalar(
-            select(TagBinding)
-            .where(TagBinding.target_id == payload.target_id, TagBinding.tag_id == payload.tag_id)
-            .limit(1)
+        result = cast(
+            CursorResult,
+            db.session.execute(
+                delete(TagBinding).where(
+                    TagBinding.target_id == payload.target_id,
+                    TagBinding.tag_id.in_(payload.tag_ids),
+                    TagBinding.tenant_id == current_user.current_tenant_id,
+                )
+            ),
         )
-        if tag_binding:
-            db.session.delete(tag_binding)
+
+        if result.rowcount:
             db.session.commit()
 
     @staticmethod
diff --git a/api/services/tools/builtin_tools_manage_service.py b/api/services/tools/builtin_tools_manage_service.py
index b8242ab3a5..20de1f4058 100644
--- a/api/services/tools/builtin_tools_manage_service.py
+++ b/api/services/tools/builtin_tools_manage_service.py
@@ -408,7 +408,7 @@ class BuiltinToolManageService:
         return {"result": "success"}
 
     @staticmethod
-    def set_default_provider(tenant_id: str, user_id: str, provider: str, id: str):
+    def set_default_provider(tenant_id: str, provider: str, id: str):
         """
         set default provider
         """
@@ -422,12 +422,11 @@ class BuiltinToolManageService:
             if target_provider is None:
                 raise ValueError("provider not found")
 
-            # clear default provider
+            # clear default provider (tenant-scoped: only one default per provider per workspace)
             session.execute(
                 update(BuiltinToolProvider)
                 .where(
                     BuiltinToolProvider.tenant_id == tenant_id,
-                    BuiltinToolProvider.user_id == user_id,
                     BuiltinToolProvider.provider == provider,
                     BuiltinToolProvider.is_default.is_(True),
                 )
diff --git a/api/services/trigger/trigger_subscription_builder_service.py b/api/services/trigger/trigger_subscription_builder_service.py
index 889717df72..cff735b39d 100644
--- a/api/services/trigger/trigger_subscription_builder_service.py
+++ b/api/services/trigger/trigger_subscription_builder_service.py
@@ -121,9 +121,7 @@ class TriggerSubscriptionBuilderService:
             if not subscription_builder.name:
                 raise ValueError("Subscription builder name is required")
 
-            credential_type = CredentialType.of(
-                subscription_builder.credential_type or CredentialType.UNAUTHORIZED.value
-            )
+            credential_type = CredentialType.of(subscription_builder.credential_type or CredentialType.UNAUTHORIZED)
             if credential_type == CredentialType.UNAUTHORIZED:
                 # manually create
                 TriggerProviderService.add_trigger_subscription(
@@ -321,9 +319,7 @@ class TriggerSubscriptionBuilderService:
                 raise ValueError("Subscription builder name is required")
 
             # Build
-            credential_type = CredentialType.of(
-                subscription_builder.credential_type or CredentialType.UNAUTHORIZED.value
-            )
+            credential_type = CredentialType.of(subscription_builder.credential_type or CredentialType.UNAUTHORIZED)
             if credential_type == CredentialType.UNAUTHORIZED:
                 # manually create
                 TriggerProviderService.add_trigger_subscription(
diff --git a/api/services/trigger/webhook_service.py b/api/services/trigger/webhook_service.py
index 5d99900a04..592f678421 100644
--- a/api/services/trigger/webhook_service.py
+++ b/api/services/trigger/webhook_service.py
@@ -402,7 +402,7 @@ class WebhookService:
         for name, file in files.items():
             if file and file.filename:
                 try:
-                    file_content = file.read()
+                    file_content = file.stream.read()
                     mimetype = file.content_type or mimetypes.guess_type(file.filename)[0] or "application/octet-stream"
                     file_obj = cls._create_file_from_binary(file_content, mimetype, webhook_trigger)
                     processed_files[name] = file_obj.to_dict()
diff --git a/api/services/variable_truncator.py b/api/services/variable_truncator.py
index 1529c2b98f..5dd5f6873f 100644
--- a/api/services/variable_truncator.py
+++ b/api/services/variable_truncator.py
@@ -194,14 +194,15 @@ class VariableTruncator(BaseTruncator):
 
         result: _PartResult[Any]
         # Apply type-specific truncation with target size
-        if isinstance(segment, ArraySegment):
-            result = self._truncate_array(segment.value, target_size)
-        elif isinstance(segment, StringSegment):
-            result = self._truncate_string(segment.value, target_size)
-        elif isinstance(segment, ObjectSegment):
-            result = self._truncate_object(segment.value, target_size)
-        else:
-            raise AssertionError("this should be unreachable.")
+        match segment:
+            case ArraySegment():
+                result = self._truncate_array(segment.value, target_size)
+            case StringSegment():
+                result = self._truncate_string(segment.value, target_size)
+            case ObjectSegment():
+                result = self._truncate_object(segment.value, target_size)
+            case _:
+                raise AssertionError("this should be unreachable.")
 
         return _PartResult(
             value=segment.model_copy(update={"value": result.value}),
@@ -219,40 +220,41 @@ class VariableTruncator(BaseTruncator):
             return VariableTruncator.calculate_json_size(value.model_dump(), depth=depth + 1)
         if depth > _MAX_DEPTH:
             raise MaxDepthExceededError()
-        if isinstance(value, str):
-            # Ideally, the size of strings should be calculated based on their utf-8 encoded length.
-            # However, this adds complexity as we would need to compute encoded sizes consistently
-            # throughout the code. Therefore, we approximate the size using the string's length.
-            # Rough estimate: number of characters, plus 2 for quotes
-            return len(value) + 2
-        elif isinstance(value, (int, float)):
-            return len(str(value))
-        elif isinstance(value, bool):
-            return 4 if value else 5  # "true" or "false"
-        elif value is None:
-            return 4  # "null"
-        elif isinstance(value, list):
-            # Size = sum of elements + separators + brackets
-            total = 2  # "[]"
-            for i, item in enumerate(value):
-                if i > 0:
-                    total += 1  # ","
-                total += VariableTruncator.calculate_json_size(item, depth=depth + 1)
-            return total
-        elif isinstance(value, dict):
-            # Size = sum of keys + values + separators + brackets
-            total = 2  # "{}"
-            for index, key in enumerate(value.keys()):
-                if index > 0:
-                    total += 1  # ","
-                total += VariableTruncator.calculate_json_size(str(key), depth=depth + 1)  # Key as string
-                total += 1  # ":"
-                total += VariableTruncator.calculate_json_size(value[key], depth=depth + 1)
-            return total
-        elif isinstance(value, File):
-            return VariableTruncator.calculate_json_size(value.model_dump(), depth=depth + 1)
-        else:
-            raise UnknownTypeError(f"got unknown type {type(value)}")
+        match value:
+            case str():
+                # Ideally, the size of strings should be calculated based on their utf-8 encoded length.
+                # However, this adds complexity as we would need to compute encoded sizes consistently
+                # throughout the code. Therefore, we approximate the size using the string's length.
+                # Rough estimate: number of characters, plus 2 for quotes
+                return len(value) + 2
+            case bool():
+                return 4 if value else 5  # "true" or "false"
+            case int() | float():
+                return len(str(value))
+            case None:
+                return 4  # "null"
+            case list():
+                # Size = sum of elements + separators + brackets
+                total = 2  # "[]"
+                for i, item in enumerate(value):
+                    if i > 0:
+                        total += 1  # ","
+                    total += VariableTruncator.calculate_json_size(item, depth=depth + 1)
+                return total
+            case dict():
+                # Size = sum of keys + values + separators + brackets
+                total = 2  # "{}"
+                for index, key in enumerate(value.keys()):
+                    if index > 0:
+                        total += 1  # ","
+                    total += VariableTruncator.calculate_json_size(str(key), depth=depth + 1)  # Key as string
+                    total += 1  # ":"
+                    total += VariableTruncator.calculate_json_size(value[key], depth=depth + 1)
+                return total
+            case File():
+                return VariableTruncator.calculate_json_size(value.model_dump(), depth=depth + 1)
+            case _:
+                raise UnknownTypeError(f"got unknown type {type(value)}")
 
     def _truncate_string(self, value: str, target_size: int) -> _PartResult[str]:
         if (size := self.calculate_json_size(value)) < target_size:
@@ -419,22 +421,23 @@ class VariableTruncator(BaseTruncator):
         target_size: int,
     ) -> _PartResult[Any]:
         """Truncate a value within an object to fit within budget."""
-        if isinstance(val, UpdatedVariable):
-            # TODO(Workflow): push UpdatedVariable normalization closer to its producer.
-            return self._truncate_object(val.model_dump(), target_size)
-        elif isinstance(val, str):
-            return self._truncate_string(val, target_size)
-        elif isinstance(val, list):
-            return self._truncate_array(val, target_size)
-        elif isinstance(val, dict):
-            return self._truncate_object(val, target_size)
-        elif isinstance(val, File):
-            # File objects should not be truncated, return as-is
-            return _PartResult(val, self.calculate_json_size(val), False)
-        elif val is None or isinstance(val, (bool, int, float)):
-            return _PartResult(val, self.calculate_json_size(val), False)
-        else:
-            raise AssertionError("this statement should be unreachable.")
+        match val:
+            case UpdatedVariable():
+                # TODO(Workflow): push UpdatedVariable normalization closer to its producer.
+                return self._truncate_object(val.model_dump(), target_size)
+            case str():
+                return self._truncate_string(val, target_size)
+            case list():
+                return self._truncate_array(val, target_size)
+            case dict():
+                return self._truncate_object(val, target_size)
+            case File():
+                # File objects should not be truncated, return as-is
+                return _PartResult(val, self.calculate_json_size(val), False)
+            case None | bool() | int() | float():
+                return _PartResult(val, self.calculate_json_size(val), False)
+            case _:
+                raise AssertionError("this statement should be unreachable.")
 
 
 class DummyVariableTruncator(BaseTruncator):
diff --git a/api/services/vector_service.py b/api/services/vector_service.py
index 7e689af35d..49c3b85831 100644
--- a/api/services/vector_service.py
+++ b/api/services/vector_service.py
@@ -111,6 +111,7 @@ class VectorService:
                 "dataset_id": segment.dataset_id,
             },
         )
+        assert segment.index_node_id
         if dataset.indexing_technique == IndexTechniqueType.HIGH_QUALITY:
             # update vector index
             vector = Vector(dataset=dataset)
@@ -138,6 +139,7 @@ class VectorService:
         regenerate: bool = False,
     ):
         index_processor = IndexProcessorFactory(dataset.doc_form).init_index_processor()
+        assert segment.index_node_id
         if regenerate:
             # delete child chunks
             index_processor.clean(dataset, [segment.index_node_id], with_keywords=True, delete_child_chunks=True)
diff --git a/api/services/workflow_draft_variable_service.py b/api/services/workflow_draft_variable_service.py
index a55448e352..59db147576 100644
--- a/api/services/workflow_draft_variable_service.py
+++ b/api/services/workflow_draft_variable_service.py
@@ -157,8 +157,8 @@ class DraftVarLoader(VariableLoader):
         # This approach reduces loading time by querying external systems concurrently.
         with ThreadPoolExecutor(max_workers=10) as executor:
             offloaded_variables = executor.map(self._load_offloaded_variable, offloaded_draft_vars)
-            for selector, variable in offloaded_variables:
-                variable_by_selector[selector] = variable
+            for selector, offloaded_variable in offloaded_variables:
+                variable_by_selector[selector] = offloaded_variable
 
         return list(variable_by_selector.values())
 
diff --git a/api/services/workflow_service.py b/api/services/workflow_service.py
index f97b85dc2b..1b0e10d784 100644
--- a/api/services/workflow_service.py
+++ b/api/services/workflow_service.py
@@ -29,7 +29,11 @@ from core.workflow.node_factory import (
     get_node_type_classes_mapping,
     is_start_node_type,
 )
-from core.workflow.node_runtime import DifyHumanInputNodeRuntime, apply_dify_debug_email_recipient
+from core.workflow.node_runtime import (
+    DifyFileReferenceFactory,
+    DifyHumanInputNodeRuntime,
+    apply_dify_debug_email_recipient,
+)
 from core.workflow.system_variables import build_bootstrap_variables, build_system_variables, default_system_variables
 from core.workflow.variable_pool_initializer import add_node_inputs_to_pool, add_variables_to_pool
 from core.workflow.workflow_entry import WorkflowEntry
@@ -1066,8 +1070,13 @@ class WorkflowService:
         )
 
         rendered_content = node.render_form_content_before_submission()
+        selected_action = next(
+            (user_action for user_action in node_data.user_actions if user_action.id == action),
+            None,
+        )
         outputs: dict[str, Any] = dict(form_inputs)
         outputs["__action_id"] = action
+        outputs["__action_value"] = selected_action.title if selected_action else ""
         outputs["__rendered_content"] = node.render_form_content_with_outputs(
             rendered_content, outputs, node_data.outputs_field_names()
         )
@@ -1251,9 +1260,10 @@ class WorkflowService:
         node_data = HumanInputNode.validate_node_data(adapt_human_input_node_data_for_graph(node_config["data"]))
         node = HumanInputNode(
             node_id=node_config["id"],
-            config=node_data,
+            data=node_data,
             graph_init_params=graph_init_params,
             graph_runtime_state=graph_runtime_state,
+            file_reference_factory=DifyFileReferenceFactory(graph_init_params.run_context),
             runtime=DifyHumanInputNodeRuntime(run_context),
         )
         return node
diff --git a/api/tasks/batch_clean_document_task.py b/api/tasks/batch_clean_document_task.py
index 56c371fcc1..5794726716 100644
--- a/api/tasks/batch_clean_document_task.py
+++ b/api/tasks/batch_clean_document_task.py
@@ -50,7 +50,7 @@ def batch_clean_document_task(document_ids: list[str], dataset_id: str, doc_form
             ).all()
 
             if segments:
-                index_node_ids = [segment.index_node_id for segment in segments]
+                index_node_ids = [segment.index_node_id for segment in segments if segment.index_node_id]
                 segment_ids = [segment.id for segment in segments]
 
                 # Collect image file IDs from segment content
diff --git a/api/tasks/batch_create_segment_to_index_task.py b/api/tasks/batch_create_segment_to_index_task.py
index beb23d8354..9f19b03544 100644
--- a/api/tasks/batch_create_segment_to_index_task.py
+++ b/api/tasks/batch_create_segment_to_index_task.py
@@ -19,6 +19,7 @@ from graphon.model_runtime.entities.model_entities import ModelType
 from libs import helper
 from libs.datetime_utils import naive_utc_now
 from models.dataset import Dataset, Document, DocumentSegment
+from models.enums import SegmentStatus
 from models.model import UploadFile
 from services.vector_service import VectorService
 
@@ -156,7 +157,7 @@ def batch_create_segment_to_index_task(
                 tokens=tokens,
                 created_by=user_id,
                 indexing_at=naive_utc_now(),
-                status="completed",
+                status=SegmentStatus.COMPLETED,
                 completed_at=naive_utc_now(),
             )
             if document_config["doc_form"] == IndexStructureType.QA_INDEX:
diff --git a/api/tasks/clean_document_task.py b/api/tasks/clean_document_task.py
index c8d0e31c06..869e2b3028 100644
--- a/api/tasks/clean_document_task.py
+++ b/api/tasks/clean_document_task.py
@@ -53,7 +53,7 @@ def clean_document_task(document_id: str, dataset_id: str, doc_form: str, file_i
             binding_ids = [binding.id for binding, _ in attachments_with_bindings]
             total_attachment_files.extend([attachment_file.key for _, attachment_file in attachments_with_bindings])
 
-            index_node_ids = [segment.index_node_id for segment in segments]
+            index_node_ids = [segment.index_node_id for segment in segments if segment.index_node_id]
             segment_contents = [segment.content for segment in segments]
         except Exception:
             logger.exception("Cleaned document when document deleted failed")
diff --git a/api/tasks/clean_notion_document_task.py b/api/tasks/clean_notion_document_task.py
index 017d60efac..782d7d0226 100644
--- a/api/tasks/clean_notion_document_task.py
+++ b/api/tasks/clean_notion_document_task.py
@@ -38,7 +38,7 @@ def clean_notion_document_task(document_ids: list[str], dataset_id: str):
 
         for document_id in document_ids:
             segments = session.scalars(select(DocumentSegment).where(DocumentSegment.document_id == document_id)).all()
-            total_index_node_ids.extend([segment.index_node_id for segment in segments])
+            total_index_node_ids.extend([segment.index_node_id for segment in segments if segment.index_node_id])
 
     # Wrap vector / keyword index cleanup in try/except so that a transient
     # failure here (e.g. billing API hiccup propagated via FeatureService when
diff --git a/api/tasks/disable_segment_from_index_task.py b/api/tasks/disable_segment_from_index_task.py
index dd1a40844b..d00e143093 100644
--- a/api/tasks/disable_segment_from_index_task.py
+++ b/api/tasks/disable_segment_from_index_task.py
@@ -9,6 +9,7 @@ from core.db.session_factory import session_factory
 from core.rag.index_processor.index_processor_factory import IndexProcessorFactory
 from extensions.ext_redis import redis_client
 from models.dataset import DocumentSegment
+from models.enums import SegmentStatus
 
 logger = logging.getLogger(__name__)
 
@@ -30,7 +31,7 @@ def disable_segment_from_index_task(segment_id: str):
             logger.info(click.style(f"Segment not found: {segment_id}", fg="red"))
             return
 
-        if segment.status != "completed":
+        if segment.status != SegmentStatus.COMPLETED:
             logger.info(click.style(f"Segment is not completed, disable is not allowed: {segment_id}", fg="red"))
             return
 
@@ -59,6 +60,7 @@ def disable_segment_from_index_task(segment_id: str):
 
             index_type = dataset_document.doc_form
             index_processor = IndexProcessorFactory(index_type).init_index_processor()
+            assert segment.index_node_id
             index_processor.clean(dataset, [segment.index_node_id])
 
             # Disable summary index for this segment
diff --git a/api/tasks/disable_segments_from_index_task.py b/api/tasks/disable_segments_from_index_task.py
index 86e96ea3f0..cd91ddd074 100644
--- a/api/tasks/disable_segments_from_index_task.py
+++ b/api/tasks/disable_segments_from_index_task.py
@@ -55,7 +55,7 @@ def disable_segments_from_index_task(segment_ids: list, dataset_id: str, documen
             return
 
         try:
-            index_node_ids = [segment.index_node_id for segment in segments]
+            index_node_ids = [segment.index_node_id for segment in segments if segment.index_node_id]
             if dataset.is_multimodal:
                 segment_ids = [segment.id for segment in segments]
                 segment_attachment_bindings = session.scalars(
diff --git a/api/tasks/document_indexing_sync_task.py b/api/tasks/document_indexing_sync_task.py
index 90c80be3a1..842e7dcdb2 100644
--- a/api/tasks/document_indexing_sync_task.py
+++ b/api/tasks/document_indexing_sync_task.py
@@ -69,7 +69,7 @@ def document_indexing_sync_task(dataset_id: str, document_id: str):
         index_type = document.doc_form
 
         segments = session.scalars(select(DocumentSegment).where(DocumentSegment.document_id == document_id)).all()
-        index_node_ids = [segment.index_node_id for segment in segments]
+        index_node_ids = [segment.index_node_id for segment in segments if segment.index_node_id]
 
     # Get credentials from datasource provider
     datasource_provider_service = DatasourceProviderService()
diff --git a/api/tasks/document_indexing_update_task.py b/api/tasks/document_indexing_update_task.py
index 15f0e0162b..ba26c20331 100644
--- a/api/tasks/document_indexing_update_task.py
+++ b/api/tasks/document_indexing_update_task.py
@@ -7,10 +7,12 @@ from sqlalchemy import delete, select
 
 from core.db.session_factory import session_factory
 from core.indexing_runner import DocumentIsPausedError, IndexingRunner
+from core.rag.index_processor.constant.index_type import IndexStructureType, IndexTechniqueType
 from core.rag.index_processor.index_processor_factory import IndexProcessorFactory
 from libs.datetime_utils import naive_utc_now
 from models.dataset import Dataset, Document, DocumentSegment
 from models.enums import IndexingStatus
+from tasks.generate_summary_index_task import generate_summary_index_task
 
 logger = logging.getLogger(__name__)
 
@@ -45,7 +47,7 @@ def document_indexing_update_task(dataset_id: str, document_id: str):
 
         index_type = document.doc_form
         segments = session.scalars(select(DocumentSegment).where(DocumentSegment.document_id == document_id)).all()
-        index_node_ids = [segment.index_node_id for segment in segments]
+        index_node_ids = [segment.index_node_id for segment in segments if segment.index_node_id]
 
     clean_success = False
     try:
@@ -70,6 +72,7 @@ def document_indexing_update_task(dataset_id: str, document_id: str):
             segment_delete_stmt = delete(DocumentSegment).where(DocumentSegment.document_id == document_id)
             session.execute(segment_delete_stmt)
 
+    has_error = False
     try:
         indexing_runner = IndexingRunner()
         indexing_runner.run([document])
@@ -77,5 +80,45 @@ def document_indexing_update_task(dataset_id: str, document_id: str):
         logger.info(click.style(f"update document: {document.id} latency: {end_at - start_at}", fg="green"))
     except DocumentIsPausedError as ex:
         logger.info(click.style(str(ex), fg="yellow"))
+        has_error = True
     except Exception:
         logger.exception("document_indexing_update_task failed, document_id: %s", document_id)
+        has_error = True
+
+    if has_error:
+        return
+
+    # Trigger summary index generation for the updated document if enabled.
+    # Only generate for high_quality indexing technique and when summary_index_setting is enabled.
+    with session_factory.create_session() as session:
+        dataset = session.scalar(select(Dataset).where(Dataset.id == dataset_id).limit(1))
+        if not dataset:
+            logger.warning("Dataset %s not found after update indexing", dataset_id)
+            return
+
+        if dataset.indexing_technique == IndexTechniqueType.HIGH_QUALITY:
+            summary_index_setting = dataset.summary_index_setting
+            if summary_index_setting and summary_index_setting.get("enable"):
+                session.expire_all()
+                document = session.scalar(
+                    select(Document).where(Document.id == document_id, Document.dataset_id == dataset_id).limit(1)
+                )
+                if (
+                    document
+                    and document.indexing_status == IndexingStatus.COMPLETED
+                    and document.doc_form != IndexStructureType.QA_INDEX
+                    and document.need_summary is True
+                ):
+                    try:
+                        generate_summary_index_task.delay(dataset.id, document.id, None)
+                        logger.info(
+                            "Queued summary index generation task for document %s in dataset %s "
+                            "after update indexing completed",
+                            document.id,
+                            dataset.id,
+                        )
+                    except Exception:
+                        logger.exception(
+                            "Failed to queue summary index generation task for document %s after update",
+                            document.id,
+                        )
diff --git a/api/tasks/duplicate_document_indexing_task.py b/api/tasks/duplicate_document_indexing_task.py
index 6bc58bdf9c..71f367c5e7 100644
--- a/api/tasks/duplicate_document_indexing_task.py
+++ b/api/tasks/duplicate_document_indexing_task.py
@@ -137,7 +137,7 @@ def _duplicate_document_indexing_task(dataset_id: str, document_ids: Sequence[st
                     select(DocumentSegment).where(DocumentSegment.document_id == document.id)
                 ).all()
                 if segments:
-                    index_node_ids = [segment.index_node_id for segment in segments]
+                    index_node_ids = [segment.index_node_id for segment in segments if segment.index_node_id]
 
                     # delete from vector index
                     index_processor.clean(dataset, index_node_ids, with_keywords=True, delete_child_chunks=True)
diff --git a/api/tasks/ops_trace_task.py b/api/tasks/ops_trace_task.py
index c95b8db078..49fe68ad7e 100644
--- a/api/tasks/ops_trace_task.py
+++ b/api/tasks/ops_trace_task.py
@@ -1,11 +1,31 @@
+"""
+Celery task for asynchronous ops trace dispatch.
+
+Trace providers may report explicitly retryable dispatch failures through the
+core retryable exception contract. The task preserves the payload file only
+when Celery accepts the retry request; successful dispatches and terminal
+failures clean up the stored payload.
+
+One concrete producer today is Phoenix nested workflow tracing. The outer
+workflow tool span publishes a restorable parent span context asynchronously,
+while the nested workflow trace may be picked up by Celery first. In that
+ordering window, the provider raises a retryable core exception instead of
+dropping the trace or emitting it under the wrong parent. The task intentionally
+does not know that the provider is Phoenix; it only honors the core retryable
+dispatch contract.
+"""
+
 import json
 import logging
 
 from celery import shared_task
+from celery.exceptions import Retry
 from flask import current_app
 
+from configs import dify_config
 from core.ops.entities.config_entity import OPS_FILE_PATH, OPS_TRACE_FAILED_KEY
 from core.ops.entities.trace_entity import trace_info_info_map
+from core.ops.exceptions import RetryableTraceDispatchError
 from core.rag.models.document import Document
 from extensions.ext_redis import redis_client
 from extensions.ext_storage import storage
@@ -14,9 +34,17 @@ from models.workflow import WorkflowRun
 
 logger = logging.getLogger(__name__)
 
+_RETRYABLE_TRACE_DISPATCH_LIMIT = dify_config.OPS_TRACE_RETRYABLE_DISPATCH_MAX_RETRIES
+_RETRYABLE_TRACE_DISPATCH_DELAY_SECONDS = dify_config.OPS_TRACE_RETRYABLE_DISPATCH_DELAY_SECONDS
 
-@shared_task(queue="ops_trace")
-def process_trace_tasks(file_info):
+
+@shared_task(
+    queue="ops_trace",
+    bind=True,
+    max_retries=_RETRYABLE_TRACE_DISPATCH_LIMIT,
+    default_retry_delay=_RETRYABLE_TRACE_DISPATCH_DELAY_SECONDS,
+)
+def process_trace_tasks(self, file_info):
     """
     Async process trace tasks
     Usage: process_trace_tasks.delay(tasks_data)
@@ -29,6 +57,7 @@ def process_trace_tasks(file_info):
     file_data = json.loads(storage.load(file_path))
     trace_info = file_data.get("trace_info")
     trace_info_type = file_data.get("trace_info_type")
+    enterprise_trace_dispatched = bool(file_data.get("_enterprise_trace_dispatched"))
     trace_instance = OpsTraceManager.get_ops_trace_instance(app_id)
 
     if trace_info.get("message_data"):
@@ -38,6 +67,8 @@ def process_trace_tasks(file_info):
     if trace_info.get("documents"):
         trace_info["documents"] = [Document.model_validate(doc) for doc in trace_info["documents"]]
 
+    should_delete_file = True
+
     try:
         trace_type = trace_info_info_map.get(trace_info_type)
         if trace_type:
@@ -45,30 +76,66 @@ def process_trace_tasks(file_info):
 
         from extensions.ext_enterprise_telemetry import is_enabled as is_ee_telemetry_enabled
 
-        if is_ee_telemetry_enabled():
+        if is_ee_telemetry_enabled() and not enterprise_trace_dispatched:
             from enterprise.telemetry.enterprise_trace import EnterpriseOtelTrace
 
             try:
                 EnterpriseOtelTrace().trace(trace_info)
             except Exception:
                 logger.exception("Enterprise trace failed for app_id: %s", app_id)
+            else:
+                file_data["_enterprise_trace_dispatched"] = True
+                enterprise_trace_dispatched = True
 
         if trace_instance:
             with current_app.app_context():
                 trace_instance.trace(trace_info)
 
         logger.info("Processing trace tasks success, app_id: %s", app_id)
+    except RetryableTraceDispatchError as e:
+        # Retryable dispatch failures represent a transient provider-side
+        # ordering gap, not corrupt payload data. Keep the payload only after
+        # Celery accepts the retry request; otherwise this attempt becomes a
+        # terminal failure and the stored file is cleaned up in `finally`.
+        #
+        # Enterprise telemetry runs before provider dispatch. If it already ran
+        # and provider dispatch asks for a retry, persist that private flag so
+        # the next attempt does not emit the same enterprise trace twice.
+        if self.request.retries >= _RETRYABLE_TRACE_DISPATCH_LIMIT:
+            logger.exception("Retryable trace dispatch budget exhausted, app_id: %s", app_id)
+            failed_key = f"{OPS_TRACE_FAILED_KEY}_{app_id}"
+            redis_client.incr(failed_key)
+        else:
+            logger.warning(
+                "Retryable trace dispatch failure, scheduling retry %s/%s for app_id %s: %s",
+                self.request.retries + 1,
+                _RETRYABLE_TRACE_DISPATCH_LIMIT,
+                app_id,
+                e,
+            )
+            try:
+                if enterprise_trace_dispatched:
+                    storage.save(file_path, json.dumps(file_data).encode("utf-8"))
+                raise self.retry(exc=e, countdown=_RETRYABLE_TRACE_DISPATCH_DELAY_SECONDS)
+            except Retry:
+                should_delete_file = False
+                raise
+            except Exception:
+                logger.exception("Failed to schedule trace dispatch retry, app_id: %s", app_id)
+                failed_key = f"{OPS_TRACE_FAILED_KEY}_{app_id}"
+                redis_client.incr(failed_key)
     except Exception as e:
         logger.exception("Processing trace tasks failed, app_id: %s", app_id)
         failed_key = f"{OPS_TRACE_FAILED_KEY}_{app_id}"
         redis_client.incr(failed_key)
     finally:
-        try:
-            storage.delete(file_path)
-        except Exception as e:
-            logger.warning(
-                "Failed to delete trace file %s for app_id %s: %s",
-                file_path,
-                app_id,
-                e,
-            )
+        if should_delete_file:
+            try:
+                storage.delete(file_path)
+            except Exception as e:
+                logger.warning(
+                    "Failed to delete trace file %s for app_id %s: %s",
+                    file_path,
+                    app_id,
+                    e,
+                )
diff --git a/api/tasks/remove_document_from_index_task.py b/api/tasks/remove_document_from_index_task.py
index 74e8a012cf..2314d32232 100644
--- a/api/tasks/remove_document_from_index_task.py
+++ b/api/tasks/remove_document_from_index_task.py
@@ -61,7 +61,7 @@ def remove_document_from_index_task(document_id: str):
                 except Exception as e:
                     logger.warning("Failed to disable summaries for document %s: %s", document.id, str(e))
 
-            index_node_ids = [segment.index_node_id for segment in segments]
+            index_node_ids = [segment.index_node_id for segment in segments if segment.index_node_id]
             if index_node_ids:
                 try:
                     index_processor.clean(dataset, index_node_ids, with_keywords=True, delete_child_chunks=False)
diff --git a/api/tasks/retry_document_indexing_task.py b/api/tasks/retry_document_indexing_task.py
index 7cc28d5226..0df5896ce3 100644
--- a/api/tasks/retry_document_indexing_task.py
+++ b/api/tasks/retry_document_indexing_task.py
@@ -85,7 +85,7 @@ def retry_document_indexing_task(dataset_id: str, document_ids: list[str], user_
                         select(DocumentSegment).where(DocumentSegment.document_id == document_id)
                     ).all()
                     if segments:
-                        index_node_ids = [segment.index_node_id for segment in segments]
+                        index_node_ids = [segment.index_node_id for segment in segments if segment.index_node_id]
                         # delete from vector index
                         index_processor.clean(dataset, index_node_ids, with_keywords=True, delete_child_chunks=True)
 
diff --git a/api/tasks/sync_website_document_indexing_task.py b/api/tasks/sync_website_document_indexing_task.py
index ab21f63f7e..06eb460311 100644
--- a/api/tasks/sync_website_document_indexing_task.py
+++ b/api/tasks/sync_website_document_indexing_task.py
@@ -70,7 +70,7 @@ def sync_website_document_indexing_task(dataset_id: str, document_id: str):
 
             segments = session.scalars(select(DocumentSegment).where(DocumentSegment.document_id == document_id)).all()
             if segments:
-                index_node_ids = [segment.index_node_id for segment in segments]
+                index_node_ids = [segment.index_node_id for segment in segments if segment.index_node_id]
                 # delete from vector index
                 index_processor.clean(dataset, index_node_ids, with_keywords=True, delete_child_chunks=True)
 
diff --git a/api/tasks/trigger_subscription_refresh_tasks.py b/api/tasks/trigger_subscription_refresh_tasks.py
index 1daf8f302c..f6552fb294 100644
--- a/api/tasks/trigger_subscription_refresh_tasks.py
+++ b/api/tasks/trigger_subscription_refresh_tasks.py
@@ -1,5 +1,4 @@
 import logging
-import time
 from collections.abc import Mapping
 from typing import Any
 
@@ -12,16 +11,13 @@ from core.db.session_factory import session_factory
 from core.plugin.entities.plugin_daemon import CredentialType
 from core.trigger.utils.locks import build_trigger_refresh_lock_key
 from extensions.ext_redis import redis_client
+from libs.helper import current_timestamp
 from models.trigger import TriggerSubscription
 from services.trigger.trigger_provider_service import TriggerProviderService
 
 logger = logging.getLogger(__name__)
 
 
-def _now_ts() -> int:
-    return int(time.time())
-
-
 def _load_subscription(session: Session, tenant_id: str, subscription_id: str) -> TriggerSubscription | None:
     return session.scalar(
         select(TriggerSubscription)
@@ -96,7 +92,7 @@ def trigger_subscription_refresh(tenant_id: str, subscription_id: str) -> None:
 
     logger.info("Begin subscription refresh: tenant=%s id=%s", tenant_id, subscription_id)
     try:
-        now: int = _now_ts()
+        now: int = current_timestamp()
         with session_factory.create_session() as session:
             subscription: TriggerSubscription | None = _load_subscription(session, tenant_id, subscription_id)
 
diff --git a/api/tests/integration_tests/controllers/console/app/test_chat_message_permissions.py b/api/tests/integration_tests/controllers/console/app/test_chat_message_permissions.py
index 3b5e822b90..90131fe98d 100644
--- a/api/tests/integration_tests/controllers/console/app/test_chat_message_permissions.py
+++ b/api/tests/integration_tests/controllers/console/app/test_chat_message_permissions.py
@@ -13,7 +13,7 @@ from controllers.console.app import wraps
 from libs.datetime_utils import naive_utc_now
 from models import App, Tenant
 from models.account import Account, TenantAccountJoin, TenantAccountRole
-from models.enums import ConversationFromSource
+from models.enums import AppStatus, ConversationFromSource
 from models.model import AppMode
 from services.app_generate_service import AppGenerateService
 
@@ -28,7 +28,7 @@ class TestChatMessageApiPermissions:
         app.id = str(uuid.uuid4())
         app.mode = AppMode.CHAT
         app.tenant_id = str(uuid.uuid4())
-        app.status = "normal"
+        app.status = AppStatus.NORMAL
         return app
 
     @pytest.fixture
@@ -78,7 +78,7 @@ class TestChatMessageApiPermissions:
         self,
         test_client: FlaskClient,
         auth_header,
-        monkeypatch,
+        monkeypatch: pytest.MonkeyPatch,
         mock_app_model,
         mock_account,
         role: TenantAccountRole,
@@ -130,7 +130,7 @@ class TestChatMessageApiPermissions:
         self,
         test_client: FlaskClient,
         auth_header,
-        monkeypatch,
+        monkeypatch: pytest.MonkeyPatch,
         mock_app_model,
         mock_account,
         role: TenantAccountRole,
diff --git a/api/tests/integration_tests/controllers/console/app/test_feedback_export_api.py b/api/tests/integration_tests/controllers/console/app/test_feedback_export_api.py
index 309a0b015a..c4db0d5111 100644
--- a/api/tests/integration_tests/controllers/console/app/test_feedback_export_api.py
+++ b/api/tests/integration_tests/controllers/console/app/test_feedback_export_api.py
@@ -14,7 +14,7 @@ from controllers.console.app import wraps
 from libs.datetime_utils import naive_utc_now
 from models import App, Tenant
 from models.account import Account, TenantAccountJoin, TenantAccountRole
-from models.enums import FeedbackFromSource, FeedbackRating
+from models.enums import AppStatus, FeedbackFromSource, FeedbackRating
 from models.model import AppMode, MessageFeedback
 from services.feedback_service import FeedbackService
 
@@ -29,7 +29,7 @@ class TestFeedbackExportApi:
         app.id = str(uuid.uuid4())
         app.mode = AppMode.CHAT
         app.tenant_id = str(uuid.uuid4())
-        app.status = "normal"
+        app.status = AppStatus.NORMAL
         app.name = "Test App"
         return app
 
@@ -135,7 +135,7 @@ class TestFeedbackExportApi:
         self,
         test_client: FlaskClient,
         auth_header,
-        monkeypatch,
+        monkeypatch: pytest.MonkeyPatch,
         mock_app_model,
         mock_account,
         role: TenantAccountRole,
@@ -167,7 +167,13 @@ class TestFeedbackExportApi:
             mock_export_feedbacks.assert_called_once()
 
     def test_feedback_export_csv_format(
-        self, test_client: FlaskClient, auth_header, monkeypatch, mock_app_model, mock_account, sample_feedback_data
+        self,
+        test_client: FlaskClient,
+        auth_header,
+        monkeypatch: pytest.MonkeyPatch,
+        mock_app_model,
+        mock_account,
+        sample_feedback_data,
     ):
         """Test feedback export in CSV format."""
 
@@ -202,7 +208,13 @@ class TestFeedbackExportApi:
         assert "text/csv" in response.content_type
 
     def test_feedback_export_json_format(
-        self, test_client: FlaskClient, auth_header, monkeypatch, mock_app_model, mock_account, sample_feedback_data
+        self,
+        test_client: FlaskClient,
+        auth_header,
+        monkeypatch: pytest.MonkeyPatch,
+        mock_app_model,
+        mock_account,
+        sample_feedback_data,
     ):
         """Test feedback export in JSON format."""
 
@@ -246,7 +258,7 @@ class TestFeedbackExportApi:
         assert "application/json" in response.content_type
 
     def test_feedback_export_with_filters(
-        self, test_client: FlaskClient, auth_header, monkeypatch, mock_app_model, mock_account
+        self, test_client: FlaskClient, auth_header, monkeypatch: pytest.MonkeyPatch, mock_app_model, mock_account
     ):
         """Test feedback export with various filters."""
 
@@ -287,7 +299,7 @@ class TestFeedbackExportApi:
         )
 
     def test_feedback_export_invalid_date_format(
-        self, test_client: FlaskClient, auth_header, monkeypatch, mock_app_model, mock_account
+        self, test_client: FlaskClient, auth_header, monkeypatch: pytest.MonkeyPatch, mock_app_model, mock_account
     ):
         """Test feedback export with invalid date format."""
 
@@ -312,7 +324,7 @@ class TestFeedbackExportApi:
         assert "Parameter validation error" in response_json["error"]
 
     def test_feedback_export_server_error(
-        self, test_client: FlaskClient, auth_header, monkeypatch, mock_app_model, mock_account
+        self, test_client: FlaskClient, auth_header, monkeypatch: pytest.MonkeyPatch, mock_app_model, mock_account
     ):
         """Test feedback export with server error."""
 
diff --git a/api/tests/integration_tests/controllers/console/app/test_model_config_permissions.py b/api/tests/integration_tests/controllers/console/app/test_model_config_permissions.py
index 04945e57a0..ab08c7a6d8 100644
--- a/api/tests/integration_tests/controllers/console/app/test_model_config_permissions.py
+++ b/api/tests/integration_tests/controllers/console/app/test_model_config_permissions.py
@@ -11,6 +11,7 @@ from controllers.console.app import wraps
 from libs.datetime_utils import naive_utc_now
 from models import App, Tenant
 from models.account import Account, TenantAccountJoin, TenantAccountRole
+from models.enums import AppStatus
 from models.model import AppMode
 from services.app_model_config_service import AppModelConfigService
 
@@ -25,7 +26,7 @@ class TestModelConfigResourcePermissions:
         app.id = str(uuid.uuid4())
         app.mode = AppMode.CHAT
         app.tenant_id = str(uuid.uuid4())
-        app.status = "normal"
+        app.status = AppStatus.NORMAL
         app.app_model_config_id = str(uuid.uuid4())
         return app
 
@@ -73,7 +74,7 @@ class TestModelConfigResourcePermissions:
         self,
         test_client: FlaskClient,
         auth_header,
-        monkeypatch,
+        monkeypatch: pytest.MonkeyPatch,
         mock_app_model,
         mock_account,
         role: TenantAccountRole,
diff --git a/api/tests/integration_tests/core/datasource/test_datasource_manager_integration.py b/api/tests/integration_tests/core/datasource/test_datasource_manager_integration.py
index a876b0c4aa..7d0b575262 100644
--- a/api/tests/integration_tests/core/datasource/test_datasource_manager_integration.py
+++ b/api/tests/integration_tests/core/datasource/test_datasource_manager_integration.py
@@ -1,5 +1,7 @@
 from collections.abc import Generator
 
+from pytest_mock import MockerFixture
+
 from core.datasource.datasource_manager import DatasourceManager
 from core.datasource.entities.datasource_entities import DatasourceMessage
 from graphon.node_events import StreamCompletedEvent
@@ -19,7 +21,7 @@ def _gen_var_stream() -> Generator[DatasourceMessage, None, None]:
     )
 
 
-def test_stream_node_events_accumulates_variables(mocker):
+def test_stream_node_events_accumulates_variables(mocker: MockerFixture):
     mocker.patch.object(DatasourceManager, "stream_online_results", return_value=_gen_var_stream())
     events = list(
         DatasourceManager.stream_node_events(
diff --git a/api/tests/integration_tests/core/workflow/nodes/datasource/test_datasource_node_integration.py b/api/tests/integration_tests/core/workflow/nodes/datasource/test_datasource_node_integration.py
index 2392084c36..b9f09ccadd 100644
--- a/api/tests/integration_tests/core/workflow/nodes/datasource/test_datasource_node_integration.py
+++ b/api/tests/integration_tests/core/workflow/nodes/datasource/test_datasource_node_integration.py
@@ -1,3 +1,5 @@
+from pytest_mock import MockerFixture
+
 from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY
 from core.workflow.nodes.datasource.datasource_node import DatasourceNode
 from core.workflow.nodes.datasource.entities import DatasourceNodeData
@@ -44,7 +46,7 @@ class _GP:
     call_depth = 0
 
 
-def test_node_integration_minimal_stream(mocker):
+def test_node_integration_minimal_stream(mocker: MockerFixture):
     sys_d = {
         "sys": {
             "datasource_type": "online_document",
@@ -71,7 +73,7 @@ def test_node_integration_minimal_stream(mocker):
 
     node = DatasourceNode(
         node_id="n",
-        config=DatasourceNodeData(
+        data=DatasourceNodeData(
             type="datasource",
             version="1",
             title="Datasource",
diff --git a/api/tests/integration_tests/workflow/nodes/__mock/model.py b/api/tests/integration_tests/workflow/nodes/__mock/model.py
index a9a2617bae..a77fe5970a 100644
--- a/api/tests/integration_tests/workflow/nodes/__mock/model.py
+++ b/api/tests/integration_tests/workflow/nodes/__mock/model.py
@@ -4,7 +4,7 @@ from core.app.entities.app_invoke_entities import ModelConfigWithCredentialsEnti
 from core.entities.provider_configuration import ProviderConfiguration, ProviderModelBundle
 from core.entities.provider_entities import CustomConfiguration, CustomProviderConfiguration, SystemConfiguration
 from core.model_manager import ModelInstance
-from core.plugin.impl.model_runtime_factory import create_plugin_model_provider_factory
+from core.plugin.impl.model_runtime_factory import create_plugin_model_assembly
 from graphon.model_runtime.entities.model_entities import ModelType
 from models.provider import ProviderType
 
@@ -15,8 +15,9 @@ def get_mocked_fetch_model_config(
     mode: str,
     credentials: dict,
 ):
-    model_provider_factory = create_plugin_model_provider_factory(tenant_id="9d2074fc-6f86-45a9-b09d-6ecc63b9056b")
-    model_type_instance = model_provider_factory.get_model_type_instance(provider, ModelType.LLM)
+    model_assembly = create_plugin_model_assembly(tenant_id="9d2074fc-6f86-45a9-b09d-6ecc63b9056b")
+    model_provider_factory = model_assembly.model_provider_factory
+    model_type_instance = model_assembly.create_model_type_instance(provider=provider, model_type=ModelType.LLM)
     provider_model_bundle = ProviderModelBundle(
         configuration=ProviderConfiguration(
             tenant_id="1",
diff --git a/api/tests/integration_tests/workflow/nodes/test_code.py b/api/tests/integration_tests/workflow/nodes/test_code.py
index aaa6092993..9345113aa3 100644
--- a/api/tests/integration_tests/workflow/nodes/test_code.py
+++ b/api/tests/integration_tests/workflow/nodes/test_code.py
@@ -45,7 +45,7 @@ def init_code_node(code_config: dict):
     )
 
     # construct variable pool
-    variable_pool = VariablePool(
+    variable_pool = VariablePool.from_bootstrap(
         system_variables=build_system_variables(user_id="aaa", files=[]),
         user_inputs={},
         environment_variables=[],
@@ -66,7 +66,7 @@ def init_code_node(code_config: dict):
 
     node = CodeNode(
         node_id=str(uuid.uuid4()),
-        config=CodeNodeData.model_validate(code_config["data"]),
+        data=CodeNodeData.model_validate(code_config["data"]),
         graph_init_params=init_params,
         graph_runtime_state=graph_runtime_state,
         code_executor=node_factory._code_executor,
diff --git a/api/tests/integration_tests/workflow/nodes/test_http.py b/api/tests/integration_tests/workflow/nodes/test_http.py
index b9f7b9575b..7cd7f50b77 100644
--- a/api/tests/integration_tests/workflow/nodes/test_http.py
+++ b/api/tests/integration_tests/workflow/nodes/test_http.py
@@ -55,7 +55,7 @@ def init_http_node(config: dict):
     )
 
     # construct variable pool
-    variable_pool = VariablePool(
+    variable_pool = VariablePool.from_bootstrap(
         system_variables=build_system_variables(user_id="aaa", files=[]),
         user_inputs={},
         environment_variables=[],
@@ -76,7 +76,7 @@ def init_http_node(config: dict):
 
     node = HttpRequestNode(
         node_id=str(uuid.uuid4()),
-        config=HttpRequestNodeData.model_validate(config["data"]),
+        data=HttpRequestNodeData.model_validate(config["data"]),
         graph_init_params=init_params,
         graph_runtime_state=graph_runtime_state,
         http_request_config=HTTP_REQUEST_CONFIG,
@@ -204,7 +204,7 @@ def test_custom_auth_with_empty_api_key_raises_error(setup_http_mock):
     from graphon.runtime import VariablePool
 
     # Create variable pool
-    variable_pool = VariablePool(
+    variable_pool = VariablePool.from_bootstrap(
         system_variables=build_system_variables(user_id="test", files=[]),
         user_inputs={},
         environment_variables=[],
@@ -702,7 +702,7 @@ def test_nested_object_variable_selector(setup_http_mock):
     )
 
     # Create independent variable pool for this test only
-    variable_pool = VariablePool(
+    variable_pool = VariablePool.from_bootstrap(
         system_variables=build_system_variables(user_id="aaa", files=[]),
         user_inputs={},
         environment_variables=[],
@@ -724,7 +724,7 @@ def test_nested_object_variable_selector(setup_http_mock):
 
     node = HttpRequestNode(
         node_id=str(uuid.uuid4()),
-        config=HttpRequestNodeData.model_validate(graph_config["nodes"][1]["data"]),
+        data=HttpRequestNodeData.model_validate(graph_config["nodes"][1]["data"]),
         graph_init_params=init_params,
         graph_runtime_state=graph_runtime_state,
         http_request_config=HTTP_REQUEST_CONFIG,
diff --git a/api/tests/integration_tests/workflow/nodes/test_llm.py b/api/tests/integration_tests/workflow/nodes/test_llm.py
index 3eead70163..5b7790f6f4 100644
--- a/api/tests/integration_tests/workflow/nodes/test_llm.py
+++ b/api/tests/integration_tests/workflow/nodes/test_llm.py
@@ -53,7 +53,7 @@ def init_llm_node(config: dict) -> LLMNode:
     )
 
     # construct variable pool
-    variable_pool = VariablePool(
+    variable_pool = VariablePool.from_bootstrap(
         system_variables=build_system_variables(
             user_id="aaa",
             app_id=app_id,
@@ -77,7 +77,7 @@ def init_llm_node(config: dict) -> LLMNode:
 
     node = LLMNode(
         node_id=str(uuid.uuid4()),
-        config=LLMNodeData.model_validate(config["data"]),
+        data=LLMNodeData.model_validate(config["data"]),
         graph_init_params=init_params,
         graph_runtime_state=graph_runtime_state,
         credentials_provider=MagicMock(spec=CredentialsProvider),
@@ -91,7 +91,11 @@ def init_llm_node(config: dict) -> LLMNode:
     return node
 
 
-def test_execute_llm():
+def _mock_db_session_close(monkeypatch) -> None:
+    monkeypatch.setattr(db.session, "close", MagicMock())
+
+
+def test_execute_llm(monkeypatch):
     node = init_llm_node(
         config={
             "id": "llm",
@@ -118,7 +122,7 @@ def test_execute_llm():
         },
     )
 
-    db.session.close = MagicMock()
+    _mock_db_session_close(monkeypatch)
 
     def build_mock_model_instance() -> MagicMock:
         from decimal import Decimal
@@ -195,7 +199,7 @@ def test_execute_llm():
                 assert item.node_run_result.outputs.get("usage", {})["total_tokens"] > 0
 
 
-def test_execute_llm_with_jinja2():
+def test_execute_llm_with_jinja2(monkeypatch):
     """
     Test execute LLM node with jinja2
     """
@@ -233,8 +237,7 @@ def test_execute_llm_with_jinja2():
         },
     )
 
-    # Mock db.session.close()
-    db.session.close = MagicMock()
+    _mock_db_session_close(monkeypatch)
 
     def build_mock_model_instance() -> MagicMock:
         from decimal import Decimal
diff --git a/api/tests/integration_tests/workflow/nodes/test_parameter_extractor.py b/api/tests/integration_tests/workflow/nodes/test_parameter_extractor.py
index f2eabb86c3..fc230a2a68 100644
--- a/api/tests/integration_tests/workflow/nodes/test_parameter_extractor.py
+++ b/api/tests/integration_tests/workflow/nodes/test_parameter_extractor.py
@@ -56,7 +56,7 @@ def init_parameter_extractor_node(config: dict, memory=None):
     )
 
     # construct variable pool
-    variable_pool = VariablePool(
+    variable_pool = VariablePool.from_bootstrap(
         system_variables=build_system_variables(
             user_id="aaa", files=[], query="what's the weather in SF", conversation_id="abababa"
         ),
@@ -71,7 +71,7 @@ def init_parameter_extractor_node(config: dict, memory=None):
 
     node = ParameterExtractorNode(
         node_id=str(uuid.uuid4()),
-        config=ParameterExtractorNodeData.model_validate(config["data"]),
+        data=ParameterExtractorNodeData.model_validate(config["data"]),
         graph_init_params=init_params,
         graph_runtime_state=graph_runtime_state,
         credentials_provider=MagicMock(spec=CredentialsProvider),
@@ -83,7 +83,11 @@ def init_parameter_extractor_node(config: dict, memory=None):
     return node
 
 
-def test_function_calling_parameter_extractor(setup_model_mock):
+def _mock_db_session_close(monkeypatch) -> None:
+    monkeypatch.setattr(db.session, "close", MagicMock())
+
+
+def test_function_calling_parameter_extractor(setup_model_mock, monkeypatch):
     """
     Test function calling for parameter extractor.
     """
@@ -114,7 +118,7 @@ def test_function_calling_parameter_extractor(setup_model_mock):
         mode="chat",
         credentials={"openai_api_key": os.environ.get("OPENAI_API_KEY")},
     )()
-    db.session.close = MagicMock()
+    _mock_db_session_close(monkeypatch)
 
     result = node._run()
 
@@ -124,7 +128,7 @@ def test_function_calling_parameter_extractor(setup_model_mock):
     assert result.outputs.get("__reason") == None
 
 
-def test_instructions(setup_model_mock):
+def test_instructions(setup_model_mock, monkeypatch):
     """
     Test chat parameter extractor.
     """
@@ -155,7 +159,7 @@ def test_instructions(setup_model_mock):
         mode="chat",
         credentials={"openai_api_key": os.environ.get("OPENAI_API_KEY")},
     )()
-    db.session.close = MagicMock()
+    _mock_db_session_close(monkeypatch)
 
     result = node._run()
 
@@ -174,7 +178,7 @@ def test_instructions(setup_model_mock):
             assert "what's the weather in SF" in prompt.get("text")
 
 
-def test_chat_parameter_extractor(setup_model_mock):
+def test_chat_parameter_extractor(setup_model_mock, monkeypatch):
     """
     Test chat parameter extractor.
     """
@@ -205,7 +209,7 @@ def test_chat_parameter_extractor(setup_model_mock):
         mode="chat",
         credentials={"openai_api_key": os.environ.get("OPENAI_API_KEY")},
     )()
-    db.session.close = MagicMock()
+    _mock_db_session_close(monkeypatch)
 
     result = node._run()
 
@@ -225,7 +229,7 @@ def test_chat_parameter_extractor(setup_model_mock):
                 assert '<structure>\n{"type": "object"' in prompt.get("text")
 
 
-def test_completion_parameter_extractor(setup_model_mock):
+def test_completion_parameter_extractor(setup_model_mock, monkeypatch):
     """
     Test completion parameter extractor.
     """
@@ -256,7 +260,7 @@ def test_completion_parameter_extractor(setup_model_mock):
         mode="completion",
         credentials={"openai_api_key": os.environ.get("OPENAI_API_KEY")},
     )()
-    db.session.close = MagicMock()
+    _mock_db_session_close(monkeypatch)
 
     result = node._run()
 
@@ -350,7 +354,7 @@ def test_extract_json_from_tool_call():
     assert result["location"] == "kawaii"
 
 
-def test_chat_parameter_extractor_with_memory(setup_model_mock):
+def test_chat_parameter_extractor_with_memory(setup_model_mock, monkeypatch):
     """
     Test chat parameter extractor with memory.
     """
@@ -382,7 +386,7 @@ def test_chat_parameter_extractor_with_memory(setup_model_mock):
         mode="chat",
         credentials={"openai_api_key": os.environ.get("OPENAI_API_KEY")},
     )()
-    db.session.close = MagicMock()
+    _mock_db_session_close(monkeypatch)
 
     result = node._run()
 
diff --git a/api/tests/integration_tests/workflow/nodes/test_template_transform.py b/api/tests/integration_tests/workflow/nodes/test_template_transform.py
index e2e0723fb8..80489e6809 100644
--- a/api/tests/integration_tests/workflow/nodes/test_template_transform.py
+++ b/api/tests/integration_tests/workflow/nodes/test_template_transform.py
@@ -66,7 +66,7 @@ def test_execute_template_transform():
     )
 
     # construct variable pool
-    variable_pool = VariablePool(
+    variable_pool = VariablePool.from_bootstrap(
         system_variables=build_system_variables(user_id="aaa", files=[]),
         user_inputs={},
         environment_variables=[],
@@ -88,7 +88,7 @@ def test_execute_template_transform():
 
     node = TemplateTransformNode(
         node_id=str(uuid.uuid4()),
-        config=TemplateTransformNodeData.model_validate(config["data"]),
+        data=TemplateTransformNodeData.model_validate(config["data"]),
         graph_init_params=init_params,
         graph_runtime_state=graph_runtime_state,
         jinja2_template_renderer=_SimpleJinja2Renderer(),
diff --git a/api/tests/integration_tests/workflow/nodes/test_tool.py b/api/tests/integration_tests/workflow/nodes/test_tool.py
index a8e9422c1e..c109be9fae 100644
--- a/api/tests/integration_tests/workflow/nodes/test_tool.py
+++ b/api/tests/integration_tests/workflow/nodes/test_tool.py
@@ -2,6 +2,8 @@ import time
 import uuid
 from unittest.mock import MagicMock, patch
 
+import pytest
+
 from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
 from core.tools.utils.configuration import ToolParameterConfigurationManager
 from core.workflow.node_factory import DifyNodeFactory
@@ -41,7 +43,7 @@ def init_tool_node(config: dict):
     )
 
     # construct variable pool
-    variable_pool = VariablePool(
+    variable_pool = VariablePool.from_bootstrap(
         system_variables=build_system_variables(user_id="aaa", files=[]),
         user_inputs={},
         environment_variables=[],
@@ -58,20 +60,20 @@ def init_tool_node(config: dict):
 
     graph = Graph.init(graph_config=graph_config, node_factory=node_factory, root_node_id="start")
 
-    tool_file_manager_factory = MagicMock(spec=ToolFileManagerProtocol)
+    tool_file_manager = MagicMock(spec=ToolFileManagerProtocol)
 
     node = ToolNode(
         node_id=str(uuid.uuid4()),
-        config=ToolNodeData.model_validate(config["data"]),
+        data=ToolNodeData.model_validate(config["data"]),
         graph_init_params=init_params,
         graph_runtime_state=graph_runtime_state,
-        tool_file_manager_factory=tool_file_manager_factory,
+        tool_file_manager=tool_file_manager,
         runtime=DifyToolNodeRuntime(init_params.run_context),
     )
     return node
 
 
-def test_tool_variable_invoke(monkeypatch):
+def test_tool_variable_invoke(monkeypatch: pytest.MonkeyPatch):
     node = init_tool_node(
         config={
             "id": "1",
@@ -106,7 +108,7 @@ def test_tool_variable_invoke(monkeypatch):
                 assert item.node_run_result.outputs.get("text") is not None
 
 
-def test_tool_mixed_invoke(monkeypatch):
+def test_tool_mixed_invoke(monkeypatch: pytest.MonkeyPatch):
     node = init_tool_node(
         config={
             "id": "1",
diff --git a/api/tests/test_containers_integration_tests/conftest.py b/api/tests/test_containers_integration_tests/conftest.py
index 66a25e5daf..ee953fcbfe 100644
--- a/api/tests/test_containers_integration_tests/conftest.py
+++ b/api/tests/test_containers_integration_tests/conftest.py
@@ -22,7 +22,7 @@ from sqlalchemy import Engine, text
 from sqlalchemy.orm import Session
 from testcontainers.core.container import DockerContainer
 from testcontainers.core.network import Network
-from testcontainers.core.waiting_utils import wait_for_logs
+from testcontainers.core.wait_strategies import LogMessageWaitStrategy
 from testcontainers.postgres import PostgresContainer
 from testcontainers.redis import RedisContainer
 
@@ -54,6 +54,10 @@ def _auto_close[T: _CloserProtocol](closer: T) -> Generator[T, None, None]:
     closer.close()
 
 
+def _wait_for_log_message(message: str, timeout: int) -> LogMessageWaitStrategy:
+    return LogMessageWaitStrategy(message).with_startup_timeout(timeout)
+
+
 class DifyTestContainers:
     """
     Manages all test containers required for Dify integration tests.
@@ -99,6 +103,7 @@ class DifyTestContainers:
         self.postgres = PostgresContainer(
             image="postgres:14-alpine",
         ).with_network(self.network)
+        self.postgres.waiting_for(_wait_for_log_message("is ready to accept connections", 30))
         self.postgres.start()
         db_host = self.postgres.get_container_host_ip()
         db_port = self.postgres.get_exposed_port(5432)
@@ -115,9 +120,6 @@ class DifyTestContainers:
             self.postgres.dbname,
         )
 
-        # Wait for PostgreSQL to be ready
-        logger.info("Waiting for PostgreSQL to be ready to accept connections...")
-        wait_for_logs(self.postgres, "is ready to accept connections", timeout=30)
         logger.info("PostgreSQL container is ready and accepting connections")
 
         conn = psycopg2.connect(
@@ -152,6 +154,7 @@ class DifyTestContainers:
         # Redis is used for storing session data, cache entries, and temporary data
         logger.info("Initializing Redis container...")
         self.redis = RedisContainer(image="redis:6-alpine", port=6379).with_network(self.network)
+        self.redis.waiting_for(_wait_for_log_message("Ready to accept connections", 30))
         self.redis.start()
         redis_host = self.redis.get_container_host_ip()
         redis_port = self.redis.get_exposed_port(6379)
@@ -159,9 +162,6 @@ class DifyTestContainers:
         os.environ["REDIS_PORT"] = str(redis_port)
         logger.info("Redis container started successfully - Host: %s, Port: %s", redis_host, redis_port)
 
-        # Wait for Redis to be ready
-        logger.info("Waiting for Redis to be ready to accept connections...")
-        wait_for_logs(self.redis, "Ready to accept connections", timeout=30)
         logger.info("Redis container is ready and accepting connections")
 
         # Start Dify Sandbox container for code execution environment.
@@ -170,6 +170,7 @@ class DifyTestContainers:
         sandbox_image = os.getenv(SANDBOX_TEST_IMAGE_ENV, DEFAULT_SANDBOX_TEST_IMAGE)
         self.dify_sandbox = DockerContainer(image=sandbox_image).with_network(self.network)
         self.dify_sandbox.with_exposed_ports(8194)
+        self.dify_sandbox.waiting_for(_wait_for_log_message("config init success", 60))
         self.dify_sandbox.env = {
             "API_KEY": "test_api_key",
         }
@@ -185,9 +186,6 @@ class DifyTestContainers:
             sandbox_port,
         )
 
-        # Wait for Dify Sandbox to be ready
-        logger.info("Waiting for Dify Sandbox to be ready to accept connections...")
-        wait_for_logs(self.dify_sandbox, "config init success", timeout=60)
         logger.info("Dify Sandbox container is ready and accepting connections")
 
         # Start Dify Plugin Daemon container for plugin management
@@ -197,6 +195,7 @@ class DifyTestContainers:
             self.network
         )
         self.dify_plugin_daemon.with_exposed_ports(5002)
+        self.dify_plugin_daemon.waiting_for(_wait_for_log_message("start plugin manager daemon", 60))
         # Get container internal network addresses
         postgres_container_name = self.postgres.get_wrapped_container().name
         redis_container_name = self.redis.get_wrapped_container().name
@@ -243,9 +242,6 @@ class DifyTestContainers:
                 plugin_daemon_port,
             )
 
-            # Wait for Dify Plugin Daemon to be ready
-            logger.info("Waiting for Dify Plugin Daemon to be ready to accept connections...")
-            wait_for_logs(self.dify_plugin_daemon, "start plugin manager daemon", timeout=60)
             logger.info("Dify Plugin Daemon container is ready and accepting connections")
         except Exception as e:
             logger.warning("Failed to start Dify Plugin Daemon container: %s", e)
@@ -433,7 +429,7 @@ def flask_app_with_containers(set_up_containers_and_env) -> Flask:
 
 
 @pytest.fixture
-def flask_req_ctx_with_containers(flask_app_with_containers) -> Generator[None, None, None]:
+def flask_req_ctx_with_containers(flask_app_with_containers: Flask) -> Generator[None, None, None]:
     """
     Request context fixture for containerized Flask application.
 
@@ -454,7 +450,7 @@ def flask_req_ctx_with_containers(flask_app_with_containers) -> Generator[None,
 
 
 @pytest.fixture
-def test_client_with_containers(flask_app_with_containers) -> Generator[FlaskClient, None, None]:
+def test_client_with_containers(flask_app_with_containers: Flask) -> Generator[FlaskClient, None, None]:
     """
     Test client fixture for containerized Flask application.
 
@@ -475,7 +471,7 @@ def test_client_with_containers(flask_app_with_containers) -> Generator[FlaskCli
 
 
 @pytest.fixture
-def db_session_with_containers(flask_app_with_containers) -> Generator[Session, None, None]:
+def db_session_with_containers(flask_app_with_containers: Flask) -> Generator[Session, None, None]:
     """
     Database session fixture for containerized testing.
 
@@ -500,6 +496,51 @@ def db_session_with_containers(flask_app_with_containers) -> Generator[Session,
             logger.debug("Database session closed")
 
 
+def _truncate_container_database(app: Flask) -> None:
+    """
+    Reset application tables after a container integration test.
+
+    Tests in this package share one PostgreSQL container for performance, while
+    application code may commit through db.session, Session(db.engine), or
+    session_factory-created sessions. Truncating after each test gives the suite
+    a central DB isolation contract that does not depend on which session a test used.
+    This only covers SQLAlchemy application tables in db.metadata for now;
+    Redis, object storage, and custom ad hoc metadata still need their own cleanup.
+    """
+    with app.app_context():
+        db.session.remove()
+
+        tables = db.metadata.sorted_tables
+        if not tables:
+            return
+
+        preparer = db.engine.dialect.identifier_preparer
+        table_names = ", ".join(preparer.format_table(table) for table in tables)
+
+        with db.engine.begin() as conn:
+            conn.execute(text("SET LOCAL lock_timeout = '5s'"))
+            conn.execute(text(f"TRUNCATE TABLE {table_names} RESTART IDENTITY CASCADE"))
+
+        db.session.remove()
+
+
+@pytest.fixture(autouse=True)
+def isolate_container_database(request: pytest.FixtureRequest) -> Generator[None, None, None]:
+    """
+    Clean DB state after tests that use the containerized Flask app.
+
+    This fixture intentionally does not depend on flask_app_with_containers so
+    non-DB tests under this package do not start the full app/container stack.
+    """
+    yield
+
+    if "flask_app_with_containers" not in request.fixturenames:
+        return
+
+    app = request.getfixturevalue("flask_app_with_containers")
+    _truncate_container_database(app)
+
+
 @pytest.fixture(scope="package", autouse=True)
 def mock_ssrf_proxy_requests():
     """
diff --git a/api/tests/test_containers_integration_tests/controllers/console/app/test_app_apis.py b/api/tests/test_containers_integration_tests/controllers/console/app/test_app_apis.py
index 18755ef012..b13bdba2bc 100644
--- a/api/tests/test_containers_integration_tests/controllers/console/app/test_app_apis.py
+++ b/api/tests/test_containers_integration_tests/controllers/console/app/test_app_apis.py
@@ -7,7 +7,10 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock, patch
 
 import pytest
+from flask import Flask
+from flask.testing import FlaskClient
 from pydantic import ValidationError
+from sqlalchemy.orm import Session
 from werkzeug.exceptions import BadRequest, NotFound
 
 from controllers.console import console_ns
@@ -56,6 +59,12 @@ from controllers.console.app.workflow_app_log import WorkflowAppLogQuery
 from controllers.console.app.workflow_draft_variable import WorkflowDraftVariableUpdatePayload
 from controllers.console.app.workflow_statistic import WorkflowStatisticQuery
 from controllers.console.app.workflow_trigger import Parser, ParserEnable
+from models.model import AppMode
+from tests.test_containers_integration_tests.controllers.console.helpers import (
+    authenticate_console_client,
+    create_console_account_and_tenant,
+    create_console_app,
+)
 
 
 def _unwrap(func):
@@ -69,7 +78,7 @@ def _unwrap(func):
 
 class TestCompletionEndpoints:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
     def test_completion_create_payload(self):
@@ -86,7 +95,7 @@ class TestCompletionEndpoints:
         )
         assert payload.query == "hi"
 
-    def test_completion_api_success(self, app, monkeypatch):
+    def test_completion_api_success(self, app: Flask, monkeypatch: pytest.MonkeyPatch):
         api = completion_module.CompletionMessageApi()
         method = _unwrap(api.post)
 
@@ -116,7 +125,7 @@ class TestCompletionEndpoints:
 
         assert resp == {"result": {"text": "ok"}}
 
-    def test_completion_api_conversation_not_exists(self, app, monkeypatch):
+    def test_completion_api_conversation_not_exists(self, app: Flask, monkeypatch: pytest.MonkeyPatch):
         api = completion_module.CompletionMessageApi()
         method = _unwrap(api.post)
 
@@ -142,7 +151,7 @@ class TestCompletionEndpoints:
             with pytest.raises(NotFound):
                 method(app_model=MagicMock(id="app-1"))
 
-    def test_completion_api_provider_not_initialized(self, app, monkeypatch):
+    def test_completion_api_provider_not_initialized(self, app: Flask, monkeypatch: pytest.MonkeyPatch):
         api = completion_module.CompletionMessageApi()
         method = _unwrap(api.post)
 
@@ -166,7 +175,7 @@ class TestCompletionEndpoints:
             with pytest.raises(completion_module.ProviderNotInitializeError):
                 method(app_model=MagicMock(id="app-1"))
 
-    def test_completion_api_quota_exceeded(self, app, monkeypatch):
+    def test_completion_api_quota_exceeded(self, app: Flask, monkeypatch: pytest.MonkeyPatch):
         api = completion_module.CompletionMessageApi()
         method = _unwrap(api.post)
 
@@ -193,10 +202,10 @@ class TestCompletionEndpoints:
 
 class TestAppEndpoints:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_app_put_should_preserve_icon_type_when_payload_omits_it(self, app, monkeypatch):
+    def test_app_put_should_preserve_icon_type_when_payload_omits_it(self, app: Flask, monkeypatch: pytest.MonkeyPatch):
         api = app_module.AppApi()
         method = _unwrap(api.put)
         payload = {
@@ -234,7 +243,7 @@ class TestAppEndpoints:
                 }
             )
 
-    def test_app_icon_post_should_forward_icon_type(self, app, monkeypatch):
+    def test_app_icon_post_should_forward_icon_type(self, app: Flask, monkeypatch: pytest.MonkeyPatch):
         api = app_module.AppIconApi()
         method = _unwrap(api.post)
         payload = {
@@ -266,9 +275,38 @@ class TestAppEndpoints:
 
 class TestOpsTraceEndpoints:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
+    @pytest.mark.parametrize(
+        "path_template",
+        [
+            "/console/api/apps/{app_id}/trace-config?tracing_provider=langfuse",
+            "/console/api/apps/{app_id}/trace",
+        ],
+    )
+    def test_trace_endpoints_hide_apps_from_other_tenants(
+        self,
+        db_session_with_containers: Session,
+        test_client_with_containers: FlaskClient,
+        path_template: str,
+    ):
+        account, _tenant = create_console_account_and_tenant(db_session_with_containers)
+        foreign_account, foreign_tenant = create_console_account_and_tenant(db_session_with_containers)
+        foreign_app = create_console_app(
+            db_session_with_containers,
+            tenant_id=foreign_tenant.id,
+            account_id=foreign_account.id,
+            mode=AppMode.CHAT,
+        )
+
+        response = test_client_with_containers.get(
+            path_template.format(app_id=foreign_app.id),
+            headers=authenticate_console_client(test_client_with_containers, account),
+        )
+
+        assert response.status_code == 404
+
     def test_ops_trace_query_basic(self):
         query = TraceProviderQuery(tracing_provider="langfuse")
         assert query.tracing_provider == "langfuse"
@@ -277,7 +315,7 @@ class TestOpsTraceEndpoints:
         payload = TraceConfigPayload(tracing_provider="langfuse", tracing_config={"api_key": "k"})
         assert payload.tracing_config["api_key"] == "k"
 
-    def test_trace_app_config_get_empty(self, app, monkeypatch):
+    def test_trace_app_config_get_empty(self, app: Flask, monkeypatch: pytest.MonkeyPatch):
         api = ops_trace_module.TraceAppConfigApi()
         method = _unwrap(api.get)
 
@@ -288,11 +326,11 @@ class TestOpsTraceEndpoints:
         )
 
         with app.test_request_context("/?tracing_provider=langfuse"):
-            result = method(app_id="app-1")
+            result = method(app_model=MagicMock(id="app-1"))
 
         assert result == {"has_not_configured": True}
 
-    def test_trace_app_config_post_invalid(self, app, monkeypatch):
+    def test_trace_app_config_post_invalid(self, app: Flask, monkeypatch: pytest.MonkeyPatch):
         api = ops_trace_module.TraceAppConfigApi()
         method = _unwrap(api.post)
 
@@ -307,9 +345,9 @@ class TestOpsTraceEndpoints:
             json={"tracing_provider": "langfuse", "tracing_config": {"api_key": "k"}},
         ):
             with pytest.raises(BadRequest):
-                method(app_id="app-1")
+                method(app_model=MagicMock(id="app-1"))
 
-    def test_trace_app_config_delete_not_found(self, app, monkeypatch):
+    def test_trace_app_config_delete_not_found(self, app: Flask, monkeypatch: pytest.MonkeyPatch):
         api = ops_trace_module.TraceAppConfigApi()
         method = _unwrap(api.delete)
 
@@ -321,12 +359,12 @@ class TestOpsTraceEndpoints:
 
         with app.test_request_context("/?tracing_provider=langfuse"):
             with pytest.raises(BadRequest):
-                method(app_id="app-1")
+                method(app_model=MagicMock(id="app-1"))
 
 
 class TestSiteEndpoints:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
     def test_site_response_structure(self):
@@ -337,7 +375,7 @@ class TestSiteEndpoints:
         payload = AppSiteUpdatePayload(default_language="en-US")
         assert payload.default_language == "en-US"
 
-    def test_app_site_update_post(self, app, monkeypatch):
+    def test_app_site_update_post(self, app: Flask, monkeypatch: pytest.MonkeyPatch):
         api = site_module.AppSite()
         method = _unwrap(api.post)
 
@@ -375,7 +413,7 @@ class TestSiteEndpoints:
         assert isinstance(result, dict)
         assert result["title"] == "My Site"
 
-    def test_app_site_access_token_reset(self, app, monkeypatch):
+    def test_app_site_access_token_reset(self, app: Flask, monkeypatch: pytest.MonkeyPatch):
         api = site_module.AppSiteAccessTokenReset()
         method = _unwrap(api.post)
 
@@ -427,7 +465,7 @@ class TestWorkflowEndpoints:
 
 class TestWorkflowAppLogEndpoints:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
     def test_workflow_app_log_query(self):
@@ -438,7 +476,7 @@ class TestWorkflowAppLogEndpoints:
         query = WorkflowAppLogQuery(detail="true")
         assert query.detail is True
 
-    def test_workflow_app_log_api_get(self, app, monkeypatch):
+    def test_workflow_app_log_api_get(self, app: Flask, monkeypatch: pytest.MonkeyPatch):
         api = workflow_app_log_module.WorkflowAppLogApi()
         method = _unwrap(api.get)
 
@@ -477,14 +515,14 @@ class TestWorkflowAppLogEndpoints:
 
 class TestWorkflowDraftVariableEndpoints:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
     def test_workflow_variable_creation(self):
         payload = WorkflowDraftVariableUpdatePayload(name="var1", value="test")
         assert payload.name == "var1"
 
-    def test_workflow_variable_collection_get(self, app, monkeypatch):
+    def test_workflow_variable_collection_get(self, app: Flask, monkeypatch: pytest.MonkeyPatch):
         api = workflow_draft_variable_module.WorkflowVariableCollectionApi()
         method = _unwrap(api.get)
 
@@ -529,7 +567,7 @@ class TestWorkflowDraftVariableEndpoints:
 
 class TestWorkflowStatisticEndpoints:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
     def test_workflow_statistic_time_range(self):
@@ -541,7 +579,7 @@ class TestWorkflowStatisticEndpoints:
         assert query.start is None
         assert query.end is None
 
-    def test_workflow_daily_runs_statistic(self, app, monkeypatch):
+    def test_workflow_daily_runs_statistic(self, app: Flask, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(workflow_statistic_module, "db", SimpleNamespace(engine=MagicMock()))
         monkeypatch.setattr(
             workflow_statistic_module.DifyAPIRepositoryFactory,
@@ -567,7 +605,7 @@ class TestWorkflowStatisticEndpoints:
 
         assert response.get_json() == {"data": [{"date": "2024-01-01"}]}
 
-    def test_workflow_daily_terminals_statistic(self, app, monkeypatch):
+    def test_workflow_daily_terminals_statistic(self, app: Flask, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(workflow_statistic_module, "db", SimpleNamespace(engine=MagicMock()))
         monkeypatch.setattr(
             workflow_statistic_module.DifyAPIRepositoryFactory,
@@ -598,7 +636,7 @@ class TestWorkflowStatisticEndpoints:
 
 class TestWorkflowTriggerEndpoints:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
     def test_webhook_trigger_payload(self):
@@ -608,7 +646,7 @@ class TestWorkflowTriggerEndpoints:
         enable_payload = ParserEnable(trigger_id="trigger-1", enable_trigger=True)
         assert enable_payload.enable_trigger is True
 
-    def test_webhook_trigger_api_get(self, app, monkeypatch):
+    def test_webhook_trigger_api_get(self, app: Flask, monkeypatch: pytest.MonkeyPatch):
         api = workflow_trigger_module.WebhookTriggerApi()
         method = _unwrap(api.get)
 
diff --git a/api/tests/test_containers_integration_tests/controllers/console/app/test_app_import_api.py b/api/tests/test_containers_integration_tests/controllers/console/app/test_app_import_api.py
index 25d19cf35a..bcb6e41ef7 100644
--- a/api/tests/test_containers_integration_tests/controllers/console/app/test_app_import_api.py
+++ b/api/tests/test_containers_integration_tests/controllers/console/app/test_app_import_api.py
@@ -6,6 +6,7 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock
 
 import pytest
+from flask import Flask
 
 from controllers.console.app import app_import as app_import_module
 from services.app_dsl_service import ImportStatus
@@ -36,10 +37,10 @@ def _install_features(monkeypatch: pytest.MonkeyPatch, enabled: bool) -> None:
 
 class TestAppImportApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_import_post_returns_failed_status(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_import_post_returns_failed_status(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         api = app_import_module.AppImportApi()
         method = _unwrap(api.post)
 
@@ -57,7 +58,7 @@ class TestAppImportApi:
         assert status == 400
         assert response["status"] == ImportStatus.FAILED
 
-    def test_import_post_returns_pending_status(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_import_post_returns_pending_status(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         api = app_import_module.AppImportApi()
         method = _unwrap(api.post)
 
@@ -75,7 +76,7 @@ class TestAppImportApi:
         assert status == 202
         assert response["status"] == ImportStatus.PENDING
 
-    def test_import_post_updates_webapp_auth_when_enabled(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_import_post_updates_webapp_auth_when_enabled(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         api = app_import_module.AppImportApi()
         method = _unwrap(api.post)
 
@@ -96,7 +97,7 @@ class TestAppImportApi:
         assert status == 200
         assert response["status"] == ImportStatus.COMPLETED
 
-    def test_import_post_commits_session_on_success(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_import_post_commits_session_on_success(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         api = app_import_module.AppImportApi()
         method = _unwrap(api.post)
 
@@ -121,7 +122,7 @@ class TestAppImportApi:
         assert status == 200
         assert response["status"] == ImportStatus.COMPLETED
 
-    def test_import_post_rolls_back_session_on_failure(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_import_post_rolls_back_session_on_failure(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         api = app_import_module.AppImportApi()
         method = _unwrap(api.post)
 
@@ -149,10 +150,10 @@ class TestAppImportApi:
 
 class TestAppImportConfirmApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_import_confirm_returns_failed_status(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_import_confirm_returns_failed_status(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         api = app_import_module.AppImportConfirmApi()
         method = _unwrap(api.post)
 
@@ -172,10 +173,10 @@ class TestAppImportConfirmApi:
 
 class TestAppImportCheckDependenciesApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_import_check_dependencies_returns_result(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_import_check_dependencies_returns_result(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         api = app_import_module.AppImportCheckDependenciesApi()
         method = _unwrap(api.get)
 
diff --git a/api/tests/test_containers_integration_tests/controllers/console/app/test_chat_conversation_status_count_api.py b/api/tests/test_containers_integration_tests/controllers/console/app/test_chat_conversation_status_count_api.py
index 5a22f81a69..0efd77934e 100644
--- a/api/tests/test_containers_integration_tests/controllers/console/app/test_chat_conversation_status_count_api.py
+++ b/api/tests/test_containers_integration_tests/controllers/console/app/test_chat_conversation_status_count_api.py
@@ -6,17 +6,17 @@ import uuid
 from flask.testing import FlaskClient
 from sqlalchemy.orm import Session
 
-from configs import dify_config
 from constants import HEADER_NAME_CSRF_TOKEN
 from graphon.enums import WorkflowExecutionStatus
 from libs.datetime_utils import naive_utc_now
 from libs.token import _real_cookie_name, generate_csrf_token
-from models import Account, DifySetup, Tenant, TenantAccountJoin
+from models import Account, Tenant, TenantAccountJoin
 from models.account import AccountStatus, TenantAccountRole, TenantStatus
 from models.enums import ConversationFromSource, CreatorUserRole
 from models.model import App, AppMode, Conversation, Message
 from models.workflow import WorkflowRun
 from services.account_service import AccountService
+from tests.test_containers_integration_tests.controllers.console.helpers import ensure_dify_setup
 
 
 def _create_account_and_tenant(db_session: Session) -> tuple[Account, Tenant]:
@@ -47,9 +47,7 @@ def _create_account_and_tenant(db_session: Session) -> tuple[Account, Tenant]:
     account.timezone = "UTC"
     db_session.commit()
 
-    dify_setup = DifySetup(version=dify_config.project.version)
-    db_session.add(dify_setup)
-    db_session.commit()
+    ensure_dify_setup(db_session)
 
     return account, tenant
 
diff --git a/api/tests/test_containers_integration_tests/controllers/console/app/test_workflow_draft_variable.py b/api/tests/test_containers_integration_tests/controllers/console/app/test_workflow_draft_variable.py
index 290be87697..a071d22ee9 100644
--- a/api/tests/test_containers_integration_tests/controllers/console/app/test_workflow_draft_variable.py
+++ b/api/tests/test_containers_integration_tests/controllers/console/app/test_workflow_draft_variable.py
@@ -168,6 +168,7 @@ def test_node_variable_collection_get_success(
     account, tenant = create_console_account_and_tenant(db_session_with_containers)
     app = create_console_app(db_session_with_containers, tenant.id, account.id, AppMode.WORKFLOW)
     node_variable = _create_node_variable(db_session_with_containers, app.id, account.id, node_id="node_123")
+    node_variable_id = node_variable.id
     _create_node_variable(db_session_with_containers, app.id, account.id, node_id="node_456", name="other")
 
     response = test_client_with_containers.get(
@@ -178,7 +179,7 @@ def test_node_variable_collection_get_success(
     assert response.status_code == 200
     payload = response.get_json()
     assert payload is not None
-    assert [item["id"] for item in payload["items"]] == [node_variable.id]
+    assert [item["id"] for item in payload["items"]] == [node_variable_id]
 
 
 def test_node_variable_collection_get_invalid_node_id(
@@ -377,6 +378,7 @@ def test_system_variable_collection_get(
     account, tenant = create_console_account_and_tenant(db_session_with_containers)
     app = create_console_app(db_session_with_containers, tenant.id, account.id, AppMode.WORKFLOW)
     variable = _create_system_variable(db_session_with_containers, app.id, account.id)
+    variable_id = variable.id
 
     response = test_client_with_containers.get(
         f"/console/api/apps/{app.id}/workflows/draft/system-variables",
@@ -386,7 +388,7 @@ def test_system_variable_collection_get(
     assert response.status_code == 200
     payload = response.get_json()
     assert payload is not None
-    assert [item["id"] for item in payload["items"]] == [variable.id]
+    assert [item["id"] for item in payload["items"]] == [variable_id]
 
 
 def test_environment_variable_collection_get(
diff --git a/api/tests/test_containers_integration_tests/controllers/console/auth/test_data_source_oauth.py b/api/tests/test_containers_integration_tests/controllers/console/auth/test_data_source_oauth.py
index 81b5423261..f2c45f76da 100644
--- a/api/tests/test_containers_integration_tests/controllers/console/auth/test_data_source_oauth.py
+++ b/api/tests/test_containers_integration_tests/controllers/console/auth/test_data_source_oauth.py
@@ -17,6 +17,8 @@ def test_get_oauth_url_successful(
     test_client_with_containers: FlaskClient,
 ) -> None:
     account, tenant = create_console_account_and_tenant(db_session_with_containers)
+    tenant_id = tenant.id
+    current_tenant_id = account.current_tenant_id
     provider = MagicMock()
     provider.get_authorization_url.return_value = "http://oauth.provider/auth"
 
@@ -29,7 +31,7 @@ def test_get_oauth_url_successful(
             headers=authenticate_console_client(test_client_with_containers, account),
         )
 
-    assert tenant.id == account.current_tenant_id
+    assert tenant_id == current_tenant_id
     assert response.status_code == 200
     assert response.get_json() == {"data": "http://oauth.provider/auth"}
     provider.get_authorization_url.assert_called_once()
diff --git a/api/tests/test_containers_integration_tests/controllers/console/auth/test_email_register.py b/api/tests/test_containers_integration_tests/controllers/console/auth/test_email_register.py
index 320da85b60..bb7921a5f4 100644
--- a/api/tests/test_containers_integration_tests/controllers/console/auth/test_email_register.py
+++ b/api/tests/test_containers_integration_tests/controllers/console/auth/test_email_register.py
@@ -6,6 +6,7 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock, patch
 
 import pytest
+from flask import Flask
 
 from controllers.console.auth.email_register import (
     EmailRegisterCheckApi,
@@ -16,7 +17,7 @@ from services.account_service import AccountService
 
 
 @pytest.fixture
-def app(flask_app_with_containers):
+def app(flask_app_with_containers: Flask):
     return flask_app_with_containers
 
 
@@ -33,7 +34,7 @@ class TestEmailRegisterSendEmailApi:
         mock_is_freeze,
         mock_send_mail,
         mock_get_account,
-        app,
+        app: Flask,
     ):
         mock_send_mail.return_value = "token-123"
         mock_is_freeze.return_value = False
@@ -75,7 +76,7 @@ class TestEmailRegisterCheckApi:
         mock_revoke,
         mock_generate_token,
         mock_reset_rate,
-        app,
+        app: Flask,
     ):
         mock_rate_limit_check.return_value = False
         mock_get_data.return_value = {"email": "User@Example.com", "code": "4321"}
@@ -120,7 +121,7 @@ class TestEmailRegisterResetApi:
         mock_create_account,
         mock_login,
         mock_reset_login_rate,
-        app,
+        app: Flask,
     ):
         mock_get_data.return_value = {"phase": "register", "email": "Invitee@Example.com"}
         mock_create_account.return_value = MagicMock()
@@ -142,7 +143,118 @@ class TestEmailRegisterResetApi:
                 response = EmailRegisterResetApi().post()
 
         assert response == {"result": "success", "data": {"access_token": "a", "refresh_token": "r"}}
-        mock_create_account.assert_called_once_with("invitee@example.com", "ValidPass123!")
+        mock_create_account.assert_called_once_with(
+            email="invitee@example.com",
+            password="ValidPass123!",
+            timezone=None,
+            language=None,
+        )
+        mock_reset_login_rate.assert_called_once_with("invitee@example.com")
+        mock_revoke_token.assert_called_once_with("token-123")
+        mock_extract_ip.assert_called_once()
+
+    @patch("controllers.console.auth.email_register.AccountService.reset_login_error_rate_limit")
+    @patch("controllers.console.auth.email_register.AccountService.login")
+    @patch("controllers.console.auth.email_register.EmailRegisterResetApi._create_new_account")
+    @patch("controllers.console.auth.email_register.AccountService.get_account_by_email_with_case_fallback")
+    @patch("controllers.console.auth.email_register.AccountService.revoke_email_register_token")
+    @patch("controllers.console.auth.email_register.AccountService.get_email_register_data")
+    @patch("controllers.console.auth.email_register.extract_remote_ip", return_value="127.0.0.1")
+    def test_reset_passes_timezone_to_new_account(
+        self,
+        mock_extract_ip,
+        mock_get_data,
+        mock_revoke_token,
+        mock_get_account,
+        mock_create_account,
+        mock_login,
+        mock_reset_login_rate,
+        app: Flask,
+    ):
+        mock_get_data.return_value = {"phase": "register", "email": "Invitee@Example.com"}
+        mock_create_account.return_value = MagicMock()
+        token_pair = MagicMock()
+        token_pair.model_dump.return_value = {"access_token": "a", "refresh_token": "r"}
+        mock_login.return_value = token_pair
+        mock_get_account.return_value = None
+
+        feature_flags = SimpleNamespace(enable_email_password_login=True, is_allow_register=True)
+        with (
+            patch("controllers.console.wraps.dify_config", SimpleNamespace(EDITION="CLOUD")),
+            patch("controllers.console.wraps.FeatureService.get_system_features", return_value=feature_flags),
+        ):
+            with app.test_request_context(
+                "/email-register",
+                method="POST",
+                json={
+                    "token": "token-123",
+                    "new_password": "ValidPass123!",
+                    "password_confirm": "ValidPass123!",
+                    "timezone": "Asia/Shanghai",
+                },
+            ):
+                response = EmailRegisterResetApi().post()
+
+        assert response == {"result": "success", "data": {"access_token": "a", "refresh_token": "r"}}
+        mock_create_account.assert_called_once_with(
+            email="invitee@example.com",
+            password="ValidPass123!",
+            timezone="Asia/Shanghai",
+            language=None,
+        )
+        mock_reset_login_rate.assert_called_once_with("invitee@example.com")
+        mock_revoke_token.assert_called_once_with("token-123")
+        mock_extract_ip.assert_called_once()
+
+    @patch("controllers.console.auth.email_register.AccountService.reset_login_error_rate_limit")
+    @patch("controllers.console.auth.email_register.AccountService.login")
+    @patch("controllers.console.auth.email_register.EmailRegisterResetApi._create_new_account")
+    @patch("controllers.console.auth.email_register.AccountService.get_account_by_email_with_case_fallback")
+    @patch("controllers.console.auth.email_register.AccountService.revoke_email_register_token")
+    @patch("controllers.console.auth.email_register.AccountService.get_email_register_data")
+    @patch("controllers.console.auth.email_register.extract_remote_ip", return_value="127.0.0.1")
+    def test_reset_passes_language_to_new_account(
+        self,
+        mock_extract_ip,
+        mock_get_data,
+        mock_revoke_token,
+        mock_get_account,
+        mock_create_account,
+        mock_login,
+        mock_reset_login_rate,
+        app: Flask,
+    ):
+        mock_get_data.return_value = {"phase": "register", "email": "Invitee@Example.com"}
+        mock_create_account.return_value = MagicMock()
+        token_pair = MagicMock()
+        token_pair.model_dump.return_value = {"access_token": "a", "refresh_token": "r"}
+        mock_login.return_value = token_pair
+        mock_get_account.return_value = None
+
+        feature_flags = SimpleNamespace(enable_email_password_login=True, is_allow_register=True)
+        with (
+            patch("controllers.console.wraps.dify_config", SimpleNamespace(EDITION="CLOUD")),
+            patch("controllers.console.wraps.FeatureService.get_system_features", return_value=feature_flags),
+        ):
+            with app.test_request_context(
+                "/email-register",
+                method="POST",
+                json={
+                    "token": "token-123",
+                    "new_password": "ValidPass123!",
+                    "password_confirm": "ValidPass123!",
+                    "language": "zh-Hans",
+                },
+            ):
+                response = EmailRegisterResetApi().post()
+
+        assert response == {"result": "success", "data": {"access_token": "a", "refresh_token": "r"}}
+        mock_create_account.assert_called_once_with(
+            email="invitee@example.com",
+            password="ValidPass123!",
+            timezone=None,
+            language="zh-Hans",
+        )
         mock_reset_login_rate.assert_called_once_with("invitee@example.com")
         mock_revoke_token.assert_called_once_with("token-123")
         mock_extract_ip.assert_called_once()
diff --git a/api/tests/test_containers_integration_tests/controllers/console/auth/test_forgot_password.py b/api/tests/test_containers_integration_tests/controllers/console/auth/test_forgot_password.py
index d2703ed5cc..014c1588fe 100644
--- a/api/tests/test_containers_integration_tests/controllers/console/auth/test_forgot_password.py
+++ b/api/tests/test_containers_integration_tests/controllers/console/auth/test_forgot_password.py
@@ -6,6 +6,7 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock, patch
 
 import pytest
+from flask import Flask
 
 from controllers.console.auth.forgot_password import (
     ForgotPasswordCheckApi,
@@ -16,7 +17,7 @@ from services.account_service import AccountService
 
 
 @pytest.fixture
-def app(flask_app_with_containers):
+def app(flask_app_with_containers: Flask):
     return flask_app_with_containers
 
 
@@ -31,7 +32,7 @@ class TestForgotPasswordSendEmailApi:
         mock_is_ip_limit,
         mock_send_email,
         mock_get_account,
-        app,
+        app: Flask,
     ):
         mock_account = MagicMock()
         mock_get_account.return_value = mock_account
@@ -80,7 +81,7 @@ class TestForgotPasswordCheckApi:
         mock_revoke_token,
         mock_generate_token,
         mock_reset_rate,
-        app,
+        app: Flask,
     ):
         mock_rate_limit_check.return_value = False
         mock_get_data.return_value = {"email": "Admin@Example.com", "code": "4321"}
@@ -123,7 +124,7 @@ class TestForgotPasswordResetApi:
         mock_db,
         mock_get_account,
         mock_update_account,
-        app,
+        app: Flask,
     ):
         mock_get_reset_data.return_value = {"phase": "reset", "email": "User@Example.com"}
         mock_account = MagicMock()
diff --git a/api/tests/test_containers_integration_tests/controllers/console/auth/test_oauth.py b/api/tests/test_containers_integration_tests/controllers/console/auth/test_oauth.py
index 1eabb45422..a5ae83739c 100644
--- a/api/tests/test_containers_integration_tests/controllers/console/auth/test_oauth.py
+++ b/api/tests/test_containers_integration_tests/controllers/console/auth/test_oauth.py
@@ -5,6 +5,7 @@ from __future__ import annotations
 from unittest.mock import MagicMock, patch
 
 import pytest
+from flask import Flask
 
 from controllers.console.auth.oauth import (
     OAuthCallback,
@@ -13,7 +14,7 @@ from controllers.console.auth.oauth import (
     _get_account_by_openid_or_email,
     get_oauth_providers,
 )
-from libs.oauth import OAuthUserInfo
+from libs.oauth import OAuthUserInfo, encode_oauth_state
 from models.account import AccountStatus
 from services.account_service import AccountService
 from services.errors.account import AccountRegisterError
@@ -21,7 +22,7 @@ from services.errors.account import AccountRegisterError
 
 class TestGetOAuthProviders:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
     @pytest.mark.parametrize(
@@ -65,7 +66,7 @@ class TestOAuthLogin:
         return OAuthLogin()
 
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
     @pytest.fixture
@@ -89,7 +90,7 @@ class TestOAuthLogin:
         mock_redirect,
         mock_get_providers,
         resource,
-        app,
+        app: Flask,
         mock_oauth_provider,
         invite_token,
         expected_token,
@@ -100,7 +101,55 @@ class TestOAuthLogin:
         with app.test_request_context(f"/auth/oauth/github?{query_string}"):
             resource.get("github")
 
-        mock_oauth_provider.get_authorization_url.assert_called_once_with(invite_token=expected_token)
+        mock_oauth_provider.get_authorization_url.assert_called_once_with(
+            invite_token=expected_token,
+            timezone=None,
+            language=None,
+        )
+        mock_redirect.assert_called_once_with("https://github.com/login/oauth/authorize?...")
+
+    @patch("controllers.console.auth.oauth.get_oauth_providers")
+    @patch("controllers.console.auth.oauth.redirect")
+    def test_should_pass_timezone_to_oauth_state(
+        self,
+        mock_redirect,
+        mock_get_providers,
+        resource,
+        app: Flask,
+        mock_oauth_provider,
+    ):
+        mock_get_providers.return_value = {"github": mock_oauth_provider, "google": None}
+
+        with app.test_request_context("/auth/oauth/github?timezone=Asia/Shanghai"):
+            resource.get("github")
+
+        mock_oauth_provider.get_authorization_url.assert_called_once_with(
+            invite_token=None,
+            timezone="Asia/Shanghai",
+            language=None,
+        )
+        mock_redirect.assert_called_once_with("https://github.com/login/oauth/authorize?...")
+
+    @patch("controllers.console.auth.oauth.get_oauth_providers")
+    @patch("controllers.console.auth.oauth.redirect")
+    def test_should_pass_language_to_oauth_state(
+        self,
+        mock_redirect,
+        mock_get_providers,
+        resource,
+        app: Flask,
+        mock_oauth_provider,
+    ):
+        mock_get_providers.return_value = {"github": mock_oauth_provider, "google": None}
+
+        with app.test_request_context("/auth/oauth/github?language=zh-Hans"):
+            resource.get("github")
+
+        mock_oauth_provider.get_authorization_url.assert_called_once_with(
+            invite_token=None,
+            timezone=None,
+            language="zh-Hans",
+        )
         mock_redirect.assert_called_once_with("https://github.com/login/oauth/authorize?...")
 
     @pytest.mark.parametrize(
@@ -130,7 +179,7 @@ class TestOAuthCallback:
         return OAuthCallback()
 
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
     @pytest.fixture
@@ -164,7 +213,7 @@ class TestOAuthCallback:
         mock_get_providers,
         mock_config,
         resource,
-        app,
+        app: Flask,
         oauth_setup,
     ):
         mock_config.CONSOLE_WEB_URL = "http://localhost:3000"
@@ -217,7 +266,7 @@ class TestOAuthCallback:
         mock_get_providers,
         mock_config,
         resource,
-        app,
+        app: Flask,
         oauth_setup,
     ):
         mock_config.CONSOLE_WEB_URL = "http://localhost:3000"
@@ -228,7 +277,8 @@ class TestOAuthCallback:
         mock_register_service.is_valid_invite_token.return_value = True
         mock_register_service.get_invitation_by_token.return_value = {"email": "user@example.com"}
 
-        with app.test_request_context("/auth/oauth/github/callback?code=test_code&state=invite123"):
+        state = encode_oauth_state(invite_token="invite123", timezone="Asia/Shanghai")
+        with app.test_request_context(f"/auth/oauth/github/callback?code=test_code&state={state}"):
             resource.get("github")
 
         mock_register_service.get_invitation_by_token.assert_called_once_with(token="invite123")
@@ -261,7 +311,7 @@ class TestOAuthCallback:
         mock_tenant_service,
         mock_account_service,
         resource,
-        app,
+        app: Flask,
         oauth_setup,
         account_status,
         expected_redirect,
@@ -300,7 +350,7 @@ class TestOAuthCallback:
         mock_get_providers,
         mock_config,
         resource,
-        app,
+        app: Flask,
         oauth_setup,
     ):
         mock_get_providers.return_value = {"github": oauth_setup["provider"]}
@@ -336,7 +386,7 @@ class TestOAuthCallback:
         mock_get_providers,
         mock_config,
         resource,
-        app,
+        app: Flask,
         oauth_setup,
     ):
         """Defensive test for CLOSED account status handling in OAuth callback.
@@ -394,7 +444,7 @@ class TestOAuthCallback:
 
 class TestAccountGeneration:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
     @pytest.fixture
@@ -465,7 +515,7 @@ class TestAccountGeneration:
         mock_register_service,
         mock_feature_service,
         mock_get_account,
-        app,
+        app: Flask,
         user_info,
         mock_account,
         allow_register,
@@ -487,7 +537,13 @@ class TestAccountGeneration:
 
                 if should_create:
                     mock_register_service.register.assert_called_once_with(
-                        email="test@example.com", name="Test User", password=None, open_id="123", provider="github"
+                        email="test@example.com",
+                        name="Test User",
+                        password=None,
+                        open_id="123",
+                        provider="github",
+                        language="en-US",
+                        timezone=None,
                     )
                 else:
                     mock_register_service.register.assert_not_called()
@@ -504,7 +560,7 @@ class TestAccountGeneration:
         mock_register_service,
         mock_feature_service,
         mock_get_account,
-        app,
+        app: Flask,
     ):
         user_info = OAuthUserInfo(id="123", name="Test User", email="Upper@Example.com")
         mock_feature_service.get_system_features.return_value.is_allow_register = True
@@ -514,7 +570,75 @@ class TestAccountGeneration:
             _generate_account("github", user_info)
 
         mock_register_service.register.assert_called_once_with(
-            email="upper@example.com", name="Test User", password=None, open_id="123", provider="github"
+            email="upper@example.com",
+            name="Test User",
+            password=None,
+            open_id="123",
+            provider="github",
+            language="en-US",
+            timezone=None,
+        )
+
+    @patch("controllers.console.auth.oauth._get_account_by_openid_or_email", return_value=None)
+    @patch("controllers.console.auth.oauth.FeatureService")
+    @patch("controllers.console.auth.oauth.RegisterService")
+    @patch("controllers.console.auth.oauth.AccountService")
+    @patch("controllers.console.auth.oauth.TenantService")
+    def test_should_register_with_browser_timezone(
+        self,
+        mock_tenant_service,
+        mock_account_service,
+        mock_register_service,
+        mock_feature_service,
+        mock_get_account,
+        app: Flask,
+        user_info,
+    ):
+        mock_feature_service.get_system_features.return_value.is_allow_register = True
+        mock_register_service.register.return_value = MagicMock()
+
+        with app.test_request_context(headers={"Accept-Language": "zh-Hans,zh;q=0.9"}):
+            _generate_account("github", user_info, timezone="Asia/Shanghai")
+
+        mock_register_service.register.assert_called_once_with(
+            email="test@example.com",
+            name="Test User",
+            password=None,
+            open_id="123",
+            provider="github",
+            language="zh-Hans",
+            timezone="Asia/Shanghai",
+        )
+
+    @patch("controllers.console.auth.oauth._get_account_by_openid_or_email", return_value=None)
+    @patch("controllers.console.auth.oauth.FeatureService")
+    @patch("controllers.console.auth.oauth.RegisterService")
+    @patch("controllers.console.auth.oauth.AccountService")
+    @patch("controllers.console.auth.oauth.TenantService")
+    def test_should_register_with_state_language(
+        self,
+        mock_tenant_service,
+        mock_account_service,
+        mock_register_service,
+        mock_feature_service,
+        mock_get_account,
+        app: Flask,
+        user_info,
+    ):
+        mock_feature_service.get_system_features.return_value.is_allow_register = True
+        mock_register_service.register.return_value = MagicMock()
+
+        with app.test_request_context(headers={"Accept-Language": "en-US,en;q=0.9"}):
+            _generate_account("github", user_info, language="zh-Hans")
+
+        mock_register_service.register.assert_called_once_with(
+            email="test@example.com",
+            name="Test User",
+            password=None,
+            open_id="123",
+            provider="github",
+            language="zh-Hans",
+            timezone=None,
         )
 
     @patch("controllers.console.auth.oauth._get_account_by_openid_or_email")
@@ -529,7 +653,7 @@ class TestAccountGeneration:
         mock_feature_service,
         mock_tenant_service,
         mock_get_account,
-        app,
+        app: Flask,
         user_info,
         mock_account,
     ):
diff --git a/api/tests/test_containers_integration_tests/controllers/console/auth/test_password_reset.py b/api/tests/test_containers_integration_tests/controllers/console/auth/test_password_reset.py
index 50249bcd74..5fc3b3084a 100644
--- a/api/tests/test_containers_integration_tests/controllers/console/auth/test_password_reset.py
+++ b/api/tests/test_containers_integration_tests/controllers/console/auth/test_password_reset.py
@@ -5,6 +5,8 @@ from __future__ import annotations
 from unittest.mock import MagicMock, patch
 
 import pytest
+from flask import Flask
+from sqlalchemy.orm import Session
 
 from controllers.console.auth.error import (
     EmailCodeError,
@@ -19,13 +21,15 @@ from controllers.console.auth.forgot_password import (
     ForgotPasswordSendEmailApi,
 )
 from controllers.console.error import AccountNotFound, EmailSendIpLimitError
+from tests.test_containers_integration_tests.controllers.console.helpers import ensure_dify_setup
 
 
 class TestForgotPasswordSendEmailApi:
     """Test cases for sending password reset emails."""
 
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask, db_session_with_containers: Session):
+        ensure_dify_setup(db_session_with_containers)
         return flask_app_with_containers
 
     @pytest.fixture
@@ -46,7 +50,7 @@ class TestForgotPasswordSendEmailApi:
         mock_send_email,
         mock_get_account,
         mock_is_ip_limit,
-        app,
+        app: Flask,
         mock_account,
     ):
         # Arrange
@@ -68,7 +72,7 @@ class TestForgotPasswordSendEmailApi:
         mock_send_email.assert_called_once()
 
     @patch("controllers.console.auth.forgot_password.AccountService.is_email_send_ip_limit")
-    def test_send_reset_email_ip_rate_limited(self, mock_is_ip_limit, app):
+    def test_send_reset_email_ip_rate_limited(self, mock_is_ip_limit, app: Flask):
         """
         Test password reset email blocked by IP rate limit.
 
@@ -104,7 +108,7 @@ class TestForgotPasswordSendEmailApi:
         mock_send_email,
         mock_get_account,
         mock_is_ip_limit,
-        app,
+        app: Flask,
         mock_account,
         language_input,
         expected_language,
@@ -138,7 +142,8 @@ class TestForgotPasswordCheckApi:
     """Test cases for verifying password reset codes."""
 
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask, db_session_with_containers: Session):
+        ensure_dify_setup(db_session_with_containers)
         return flask_app_with_containers
 
     @patch("controllers.console.auth.forgot_password.AccountService.is_forgot_password_error_rate_limit")
@@ -153,7 +158,7 @@ class TestForgotPasswordCheckApi:
         mock_revoke_token,
         mock_get_data,
         mock_is_rate_limit,
-        app,
+        app: Flask,
     ):
         """
         Test successful verification code validation.
@@ -200,7 +205,7 @@ class TestForgotPasswordCheckApi:
         mock_revoke_token,
         mock_get_data,
         mock_is_rate_limit,
-        app,
+        app: Flask,
     ):
         mock_is_rate_limit.return_value = False
         mock_get_data.return_value = {"email": "User@Example.com", "code": "999888"}
@@ -221,7 +226,7 @@ class TestForgotPasswordCheckApi:
         mock_reset_rate_limit.assert_called_once_with("user@example.com")
 
     @patch("controllers.console.auth.forgot_password.AccountService.is_forgot_password_error_rate_limit")
-    def test_verify_code_rate_limited(self, mock_is_rate_limit, app):
+    def test_verify_code_rate_limited(self, mock_is_rate_limit, app: Flask):
         """
         Test code verification blocked by rate limit.
 
@@ -244,7 +249,7 @@ class TestForgotPasswordCheckApi:
 
     @patch("controllers.console.auth.forgot_password.AccountService.is_forgot_password_error_rate_limit")
     @patch("controllers.console.auth.forgot_password.AccountService.get_reset_password_data")
-    def test_verify_code_invalid_token(self, mock_get_data, mock_is_rate_limit, app):
+    def test_verify_code_invalid_token(self, mock_get_data, mock_is_rate_limit, app: Flask):
         """
         Test code verification with invalid token.
 
@@ -267,7 +272,7 @@ class TestForgotPasswordCheckApi:
 
     @patch("controllers.console.auth.forgot_password.AccountService.is_forgot_password_error_rate_limit")
     @patch("controllers.console.auth.forgot_password.AccountService.get_reset_password_data")
-    def test_verify_code_email_mismatch(self, mock_get_data, mock_is_rate_limit, app):
+    def test_verify_code_email_mismatch(self, mock_get_data, mock_is_rate_limit, app: Flask):
         """
         Test code verification with mismatched email.
 
@@ -292,7 +297,7 @@ class TestForgotPasswordCheckApi:
     @patch("controllers.console.auth.forgot_password.AccountService.is_forgot_password_error_rate_limit")
     @patch("controllers.console.auth.forgot_password.AccountService.get_reset_password_data")
     @patch("controllers.console.auth.forgot_password.AccountService.add_forgot_password_error_rate_limit")
-    def test_verify_code_wrong_code(self, mock_add_rate_limit, mock_get_data, mock_is_rate_limit, app):
+    def test_verify_code_wrong_code(self, mock_add_rate_limit, mock_get_data, mock_is_rate_limit, app: Flask):
         """
         Test code verification with incorrect code.
 
@@ -321,7 +326,8 @@ class TestForgotPasswordResetApi:
     """Test cases for resetting password with verified token."""
 
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask, db_session_with_containers: Session):
+        ensure_dify_setup(db_session_with_containers)
         return flask_app_with_containers
 
     @pytest.fixture
@@ -344,7 +350,7 @@ class TestForgotPasswordResetApi:
         mock_get_account,
         mock_revoke_token,
         mock_get_data,
-        app,
+        app: Flask,
         mock_account,
     ):
         """
@@ -375,7 +381,7 @@ class TestForgotPasswordResetApi:
         mock_revoke_token.assert_called_once_with("valid_token")
 
     @patch("controllers.console.auth.forgot_password.AccountService.get_reset_password_data")
-    def test_reset_password_mismatch(self, mock_get_data, app):
+    def test_reset_password_mismatch(self, mock_get_data, app: Flask):
         """
         Test password reset with mismatched passwords.
 
@@ -397,7 +403,7 @@ class TestForgotPasswordResetApi:
                 api.post()
 
     @patch("controllers.console.auth.forgot_password.AccountService.get_reset_password_data")
-    def test_reset_password_invalid_token(self, mock_get_data, app):
+    def test_reset_password_invalid_token(self, mock_get_data, app: Flask):
         """
         Test password reset with invalid token.
 
@@ -418,7 +424,7 @@ class TestForgotPasswordResetApi:
                 api.post()
 
     @patch("controllers.console.auth.forgot_password.AccountService.get_reset_password_data")
-    def test_reset_password_wrong_phase(self, mock_get_data, app):
+    def test_reset_password_wrong_phase(self, mock_get_data, app: Flask):
         """
         Test password reset with token not in reset phase.
 
@@ -442,7 +448,7 @@ class TestForgotPasswordResetApi:
     @patch("controllers.console.auth.forgot_password.AccountService.get_reset_password_data")
     @patch("controllers.console.auth.forgot_password.AccountService.revoke_reset_password_token")
     @patch("controllers.console.auth.forgot_password.AccountService.get_account_by_email_with_case_fallback")
-    def test_reset_password_account_not_found(self, mock_get_account, mock_revoke_token, mock_get_data, app):
+    def test_reset_password_account_not_found(self, mock_get_account, mock_revoke_token, mock_get_data, app: Flask):
         """
         Test password reset for non-existent account.
 
diff --git a/api/tests/test_containers_integration_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline.py b/api/tests/test_containers_integration_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline.py
index d5ae95dfb7..7aa4aff1cc 100644
--- a/api/tests/test_containers_integration_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline.py
+++ b/api/tests/test_containers_integration_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline.py
@@ -6,6 +6,7 @@ from unittest.mock import MagicMock, patch
 from uuid import uuid4
 
 import pytest
+from flask import Flask
 from sqlalchemy.orm import Session
 
 from controllers.console import console_ns
@@ -26,10 +27,10 @@ def unwrap(func):
 
 class TestPipelineTemplateListApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_get_success(self, app):
+    def test_get_success(self, app: Flask):
         api = PipelineTemplateListApi()
         method = unwrap(api.get)
 
@@ -50,10 +51,10 @@ class TestPipelineTemplateListApi:
 
 class TestPipelineTemplateDetailApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_get_success(self, app):
+    def test_get_success(self, app: Flask):
         api = PipelineTemplateDetailApi()
         method = unwrap(api.get)
 
@@ -74,7 +75,7 @@ class TestPipelineTemplateDetailApi:
         assert status == 200
         assert response == template
 
-    def test_get_returns_404_when_template_not_found(self, app):
+    def test_get_returns_404_when_template_not_found(self, app: Flask):
         api = PipelineTemplateDetailApi()
         method = unwrap(api.get)
 
@@ -93,7 +94,7 @@ class TestPipelineTemplateDetailApi:
         assert status == 404
         assert "error" in response
 
-    def test_get_returns_404_for_customized_type_not_found(self, app):
+    def test_get_returns_404_for_customized_type_not_found(self, app: Flask):
         api = PipelineTemplateDetailApi()
         method = unwrap(api.get)
 
@@ -115,10 +116,10 @@ class TestPipelineTemplateDetailApi:
 
 class TestCustomizedPipelineTemplateApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_patch_success(self, app):
+    def test_patch_success(self, app: Flask):
         api = CustomizedPipelineTemplateApi()
         method = unwrap(api.patch)
 
@@ -140,7 +141,7 @@ class TestCustomizedPipelineTemplateApi:
         update_mock.assert_called_once()
         assert response == 200
 
-    def test_delete_success(self, app):
+    def test_delete_success(self, app: Flask):
         api = CustomizedPipelineTemplateApi()
         method = unwrap(api.delete)
 
@@ -155,7 +156,7 @@ class TestCustomizedPipelineTemplateApi:
         delete_mock.assert_called_once_with("tpl-1")
         assert response == 200
 
-    def test_post_success(self, app, db_session_with_containers: Session):
+    def test_post_success(self, app: Flask, db_session_with_containers: Session):
         api = CustomizedPipelineTemplateApi()
         method = unwrap(api.post)
 
@@ -182,7 +183,7 @@ class TestCustomizedPipelineTemplateApi:
         assert status == 200
         assert response == {"data": "yaml-data"}
 
-    def test_post_template_not_found(self, app):
+    def test_post_template_not_found(self, app: Flask):
         api = CustomizedPipelineTemplateApi()
         method = unwrap(api.post)
 
@@ -193,10 +194,10 @@ class TestCustomizedPipelineTemplateApi:
 
 class TestPublishCustomizedPipelineTemplateApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_post_success(self, app):
+    def test_post_success(self, app: Flask):
         api = PublishCustomizedPipelineTemplateApi()
         method = unwrap(api.post)
 
diff --git a/api/tests/test_containers_integration_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_datasets.py b/api/tests/test_containers_integration_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_datasets.py
index 64e3de2ca3..7624c1150f 100644
--- a/api/tests/test_containers_integration_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_datasets.py
+++ b/api/tests/test_containers_integration_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_datasets.py
@@ -5,6 +5,7 @@ from __future__ import annotations
 from unittest.mock import MagicMock, patch
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import Forbidden
 
 import services
@@ -24,13 +25,13 @@ def unwrap(func):
 
 class TestCreateRagPipelineDatasetApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
     def _valid_payload(self):
         return {"yaml_content": "name: test"}
 
-    def test_post_success(self, app):
+    def test_post_success(self, app: Flask):
         api = CreateRagPipelineDatasetApi()
         method = unwrap(api.post)
 
@@ -58,7 +59,7 @@ class TestCreateRagPipelineDatasetApi:
         assert status == 201
         assert response == import_info
 
-    def test_post_forbidden_non_editor(self, app):
+    def test_post_forbidden_non_editor(self, app: Flask):
         api = CreateRagPipelineDatasetApi()
         method = unwrap(api.post)
 
@@ -76,7 +77,7 @@ class TestCreateRagPipelineDatasetApi:
             with pytest.raises(Forbidden):
                 method(api)
 
-    def test_post_dataset_name_duplicate(self, app):
+    def test_post_dataset_name_duplicate(self, app: Flask):
         api = CreateRagPipelineDatasetApi()
         method = unwrap(api.post)
 
@@ -101,7 +102,7 @@ class TestCreateRagPipelineDatasetApi:
             with pytest.raises(DatasetNameDuplicateError):
                 method(api)
 
-    def test_post_invalid_payload(self, app):
+    def test_post_invalid_payload(self, app: Flask):
         api = CreateRagPipelineDatasetApi()
         method = unwrap(api.post)
 
@@ -122,10 +123,10 @@ class TestCreateRagPipelineDatasetApi:
 
 class TestCreateEmptyRagPipelineDatasetApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_post_success(self, app):
+    def test_post_success(self, app: Flask):
         api = CreateEmptyRagPipelineDatasetApi()
         method = unwrap(api.post)
 
@@ -152,7 +153,7 @@ class TestCreateEmptyRagPipelineDatasetApi:
         assert status == 201
         assert response == {"id": "ds-1"}
 
-    def test_post_forbidden_non_editor(self, app):
+    def test_post_forbidden_non_editor(self, app: Flask):
         api = CreateEmptyRagPipelineDatasetApi()
         method = unwrap(api.post)
 
diff --git a/api/tests/test_containers_integration_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_import.py b/api/tests/test_containers_integration_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_import.py
index cb67892878..44eb5c336c 100644
--- a/api/tests/test_containers_integration_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_import.py
+++ b/api/tests/test_containers_integration_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_import.py
@@ -5,6 +5,7 @@ from __future__ import annotations
 from unittest.mock import MagicMock, patch
 
 import pytest
+from flask import Flask
 
 from controllers.console import console_ns
 from controllers.console.datasets.rag_pipeline.rag_pipeline_import import (
@@ -25,7 +26,7 @@ def unwrap(func):
 
 class TestRagPipelineImportApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
     def _payload(self, mode="create"):
@@ -35,7 +36,7 @@ class TestRagPipelineImportApi:
             "name": "Test",
         }
 
-    def test_post_success_200(self, app):
+    def test_post_success_200(self, app: Flask):
         api = RagPipelineImportApi()
         method = unwrap(api.post)
 
@@ -65,7 +66,7 @@ class TestRagPipelineImportApi:
         assert status == 200
         assert response == {"status": "success"}
 
-    def test_post_failed_400(self, app):
+    def test_post_failed_400(self, app: Flask):
         api = RagPipelineImportApi()
         method = unwrap(api.post)
 
@@ -95,7 +96,7 @@ class TestRagPipelineImportApi:
         assert status == 400
         assert response == {"status": "failed"}
 
-    def test_post_pending_202(self, app):
+    def test_post_pending_202(self, app: Flask):
         api = RagPipelineImportApi()
         method = unwrap(api.post)
 
@@ -128,10 +129,10 @@ class TestRagPipelineImportApi:
 
 class TestRagPipelineImportConfirmApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_confirm_success(self, app):
+    def test_confirm_success(self, app: Flask):
         api = RagPipelineImportConfirmApi()
         method = unwrap(api.post)
 
@@ -159,7 +160,7 @@ class TestRagPipelineImportConfirmApi:
         assert status == 200
         assert response == {"ok": True}
 
-    def test_confirm_failed(self, app):
+    def test_confirm_failed(self, app: Flask):
         api = RagPipelineImportConfirmApi()
         method = unwrap(api.post)
 
@@ -190,10 +191,10 @@ class TestRagPipelineImportConfirmApi:
 
 class TestRagPipelineImportCheckDependenciesApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_get_success(self, app):
+    def test_get_success(self, app: Flask):
         api = RagPipelineImportCheckDependenciesApi()
         method = unwrap(api.get)
 
@@ -219,10 +220,10 @@ class TestRagPipelineImportCheckDependenciesApi:
 
 class TestRagPipelineExportApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_get_with_include_secret(self, app):
+    def test_get_with_include_secret(self, app: Flask):
         api = RagPipelineExportApi()
         method = unwrap(api.get)
 
diff --git a/api/tests/test_containers_integration_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_workflow.py b/api/tests/test_containers_integration_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_workflow.py
index c1f3122c2b..77b3c72e5e 100644
--- a/api/tests/test_containers_integration_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_workflow.py
+++ b/api/tests/test_containers_integration_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_workflow.py
@@ -2,11 +2,15 @@
 
 from __future__ import annotations
 
+import json
 from datetime import datetime
+from types import SimpleNamespace
+from typing import TypedDict, Unpack
 from unittest.mock import MagicMock, patch
 from uuid import uuid4
 
 import pytest
+from flask import Flask
 from sqlalchemy.orm import Session
 from werkzeug.exceptions import BadRequest, Forbidden, HTTPException, NotFound
 
@@ -33,9 +37,54 @@ from controllers.console.datasets.rag_pipeline.rag_pipeline_workflow import (
 )
 from controllers.web.error import InvokeRateLimitError as InvokeRateLimitHttpError
 from libs.datetime_utils import naive_utc_now
+from models.account import Account
+from models.workflow import Workflow
 from services.errors.app import IsDraftWorkflowError, WorkflowHashNotEqualError, WorkflowNotFoundError
 from services.errors.llm import InvokeRateLimitError
 
+DEFAULT_WORKFLOW_TENANT_ID = "00000000-0000-0000-0000-000000000001"
+DEFAULT_WORKFLOW_APP_ID = "00000000-0000-0000-0000-000000000002"
+DEFAULT_WORKFLOW_CREATED_BY = "00000000-0000-0000-0000-000000000003"
+type WorkflowVariablePayload = dict[str, object]
+
+
+class WorkflowFactoryPayload(TypedDict):
+    id: str
+    tenant_id: str
+    app_id: str
+    type: str
+    version: str
+    marked_name: str
+    marked_comment: str
+    graph: str
+    features: str
+    created_by: str
+    created_at: datetime
+    updated_by: str | None
+    updated_at: datetime
+    environment_variables: list[WorkflowVariablePayload]
+    conversation_variables: list[WorkflowVariablePayload]
+    rag_pipeline_variables: list[WorkflowVariablePayload]
+
+
+class WorkflowFactoryOverrides(TypedDict, total=False):
+    id: str
+    tenant_id: str
+    app_id: str
+    type: str
+    version: str
+    marked_name: str
+    marked_comment: str
+    graph: str
+    features: str
+    created_by: str
+    created_at: datetime
+    updated_by: str | None
+    updated_at: datetime
+    environment_variables: list[WorkflowVariablePayload]
+    conversation_variables: list[WorkflowVariablePayload]
+    rag_pipeline_variables: list[WorkflowVariablePayload]
+
 
 def unwrap(func):
     while hasattr(func, "__wrapped__"):
@@ -43,17 +92,81 @@ def unwrap(func):
     return func
 
 
+def make_node_execution(**overrides):
+    payload = {
+        "id": "node-exec-1",
+        "index": 1,
+        "predecessor_node_id": None,
+        "node_id": "node1",
+        "node_type": "start",
+        "title": "Start",
+        "inputs_dict": {"query": "hello"},
+        "process_data_dict": {},
+        "outputs_dict": {"answer": "world"},
+        "status": "succeeded",
+        "error": None,
+        "elapsed_time": 1.0,
+        "execution_metadata_dict": {},
+        "extras": {},
+        "created_at": datetime(2026, 1, 1, 0, 0, 0),
+        "created_by_role": "account",
+        "created_by_account": None,
+        "created_by_end_user": None,
+        "finished_at": datetime(2026, 1, 1, 0, 0, 1),
+        "inputs_truncated": False,
+        "outputs_truncated": False,
+        "process_data_truncated": False,
+    }
+    payload.update(overrides)
+    return SimpleNamespace(**payload)
+
+
+def default_workflow_payload() -> WorkflowFactoryPayload:
+    return {
+        "id": "workflow-1",
+        "tenant_id": DEFAULT_WORKFLOW_TENANT_ID,
+        "app_id": DEFAULT_WORKFLOW_APP_ID,
+        "type": "workflow",
+        "version": "1",
+        "marked_name": "Release 1",
+        "marked_comment": "Initial release",
+        "graph": json.dumps({"nodes": [], "edges": []}),
+        "features": json.dumps({"file_upload": {"enabled": False}}),
+        "created_by": DEFAULT_WORKFLOW_CREATED_BY,
+        "created_at": datetime(2024, 1, 1, 12, 0, 0),
+        "updated_by": None,
+        "updated_at": datetime(2024, 1, 1, 12, 1, 0),
+        "environment_variables": [],
+        "conversation_variables": [],
+        "rag_pipeline_variables": [],
+    }
+
+
+def make_workflow(**overrides: Unpack[WorkflowFactoryOverrides]) -> Workflow:
+    payload = default_workflow_payload()
+    payload.update(overrides)
+    return Workflow(**payload)
+
+
+@pytest.fixture
+def workflow_author(db_session_with_containers: Session) -> Account:
+    account = Account(name="Alice", email=f"alice-{uuid4()}@example.com")
+    db_session_with_containers.add(account)
+    db_session_with_containers.commit()
+    return account
+
+
 class TestDraftWorkflowApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_get_draft_success(self, app):
+    def test_get_draft_success(self, app: Flask, workflow_author: Account):
         api = DraftRagPipelineApi()
         method = unwrap(api.get)
 
         pipeline = MagicMock()
-        workflow = MagicMock()
+        workflow = make_workflow(created_by=workflow_author.id)
 
         service = MagicMock()
         service.get_draft_workflow.return_value = workflow
@@ -66,9 +179,19 @@ class TestDraftWorkflowApi:
             ),
         ):
             result = method(api, pipeline)
-            assert result == workflow
 
-    def test_get_draft_not_exist(self, app):
+        assert result["id"] == "workflow-1"
+        assert result["graph"] == {"nodes": [], "edges": []}
+        assert result["features"] == {"file_upload": {"enabled": False}}
+        assert result["hash"] == workflow.unique_hash
+        assert result["created_by"] == {
+            "id": workflow_author.id,
+            "name": workflow_author.name,
+            "email": workflow_author.email,
+        }
+        assert result["updated_by"] is None
+
+    def test_get_draft_not_exist(self, app: Flask):
         api = DraftRagPipelineApi()
         method = unwrap(api.get)
 
@@ -86,7 +209,7 @@ class TestDraftWorkflowApi:
             with pytest.raises(DraftWorkflowNotExist):
                 method(api, pipeline)
 
-    def test_sync_hash_not_match(self, app):
+    def test_sync_hash_not_match(self, app: Flask):
         api = DraftRagPipelineApi()
         method = unwrap(api.post)
 
@@ -111,7 +234,7 @@ class TestDraftWorkflowApi:
             with pytest.raises(DraftWorkflowNotSync):
                 method(api, pipeline)
 
-    def test_sync_invalid_text_plain(self, app):
+    def test_sync_invalid_text_plain(self, app: Flask):
         api = DraftRagPipelineApi()
         method = unwrap(api.post)
 
@@ -128,7 +251,7 @@ class TestDraftWorkflowApi:
             response, status = method(api, pipeline)
             assert status == 400
 
-    def test_restore_published_workflow_to_draft_success(self, app):
+    def test_restore_published_workflow_to_draft_success(self, app: Flask):
         api = RagPipelineDraftWorkflowRestoreApi()
         method = unwrap(api.post)
 
@@ -155,7 +278,7 @@ class TestDraftWorkflowApi:
         assert result["result"] == "success"
         assert result["hash"] == "restored-hash"
 
-    def test_restore_published_workflow_to_draft_not_found(self, app):
+    def test_restore_published_workflow_to_draft_not_found(self, app: Flask):
         api = RagPipelineDraftWorkflowRestoreApi()
         method = unwrap(api.post)
 
@@ -179,7 +302,7 @@ class TestDraftWorkflowApi:
             with pytest.raises(NotFound):
                 method(api, pipeline, "published-workflow")
 
-    def test_restore_published_workflow_to_draft_returns_400_for_draft_source(self, app):
+    def test_restore_published_workflow_to_draft_returns_400_for_draft_source(self, app: Flask):
         api = RagPipelineDraftWorkflowRestoreApi()
         method = unwrap(api.post)
 
@@ -211,10 +334,10 @@ class TestDraftWorkflowApi:
 
 class TestDraftRunNodes:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_iteration_node_success(self, app):
+    def test_iteration_node_success(self, app: Flask):
         api = RagPipelineDraftRunIterationNodeApi()
         method = unwrap(api.post)
 
@@ -240,7 +363,7 @@ class TestDraftRunNodes:
             result = method(api, pipeline, "node")
             assert result == {"ok": True}
 
-    def test_iteration_node_conversation_not_exists(self, app):
+    def test_iteration_node_conversation_not_exists(self, app: Flask):
         api = RagPipelineDraftRunIterationNodeApi()
         method = unwrap(api.post)
 
@@ -262,7 +385,7 @@ class TestDraftRunNodes:
             with pytest.raises(NotFound):
                 method(api, pipeline, "node")
 
-    def test_loop_node_success(self, app):
+    def test_loop_node_success(self, app: Flask):
         api = RagPipelineDraftRunLoopNodeApi()
         method = unwrap(api.post)
 
@@ -290,10 +413,10 @@ class TestDraftRunNodes:
 
 class TestPipelineRunApis:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_draft_run_success(self, app):
+    def test_draft_run_success(self, app: Flask):
         api = DraftRagPipelineRunApi()
         method = unwrap(api.post)
 
@@ -325,7 +448,7 @@ class TestPipelineRunApis:
         ):
             assert method(api, pipeline) == {"ok": True}
 
-    def test_draft_run_rate_limit(self, app):
+    def test_draft_run_rate_limit(self, app: Flask):
         api = DraftRagPipelineRunApi()
         method = unwrap(api.post)
 
@@ -356,10 +479,10 @@ class TestPipelineRunApis:
 
 class TestDraftNodeRun:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_execution_not_found(self, app):
+    def test_execution_not_found(self, app: Flask):
         api = RagPipelineDraftNodeRunApi()
         method = unwrap(api.post)
 
@@ -387,10 +510,10 @@ class TestDraftNodeRun:
 
 class TestPublishedPipelineApis:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_publish_success(self, app, db_session_with_containers: Session):
+    def test_publish_success(self, app: Flask, db_session_with_containers: Session):
         from models.dataset import Pipeline
 
         api = PublishedRagPipelineApi()
@@ -436,10 +559,10 @@ class TestPublishedPipelineApis:
 
 class TestMiscApis:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_task_stop(self, app):
+    def test_task_stop(self, app: Flask):
         api = RagPipelineTaskStopApi()
         method = unwrap(api.post)
 
@@ -460,7 +583,7 @@ class TestMiscApis:
             stop_mock.assert_called_once()
             assert result["result"] == "success"
 
-    def test_transform_forbidden(self, app):
+    def test_transform_forbidden(self, app: Flask):
         api = RagPipelineTransformApi()
         method = unwrap(api.post)
 
@@ -476,7 +599,7 @@ class TestMiscApis:
             with pytest.raises(Forbidden):
                 method(api, "ds1")
 
-    def test_recommended_plugins(self, app):
+    def test_recommended_plugins(self, app: Flask):
         api = RagPipelineRecommendedPluginApi()
         method = unwrap(api.get)
 
@@ -496,10 +619,10 @@ class TestMiscApis:
 
 class TestPublishedRagPipelineRunApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_published_run_success(self, app):
+    def test_published_run_success(self, app: Flask):
         api = PublishedRagPipelineRunApi()
         method = unwrap(api.post)
 
@@ -533,7 +656,7 @@ class TestPublishedRagPipelineRunApi:
             result = method(api, pipeline)
             assert result == {"ok": True}
 
-    def test_published_run_rate_limit(self, app):
+    def test_published_run_rate_limit(self, app: Flask):
         api = PublishedRagPipelineRunApi()
         method = unwrap(api.post)
 
@@ -565,10 +688,10 @@ class TestPublishedRagPipelineRunApi:
 
 class TestDefaultBlockConfigApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_get_block_config_success(self, app):
+    def test_get_block_config_success(self, app: Flask):
         api = DefaultRagPipelineBlockConfigApi()
         method = unwrap(api.get)
 
@@ -587,7 +710,7 @@ class TestDefaultBlockConfigApi:
             result = method(api, pipeline, "llm")
             assert result == {"k": "v"}
 
-    def test_get_block_config_invalid_json(self, app):
+    def test_get_block_config_invalid_json(self, app: Flask):
         api = DefaultRagPipelineBlockConfigApi()
         method = unwrap(api.get)
 
@@ -600,10 +723,10 @@ class TestDefaultBlockConfigApi:
 
 class TestPublishedAllRagPipelineApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_get_published_workflows_success(self, app):
+    def test_get_published_workflows_success(self, app: Flask):
         api = PublishedAllRagPipelineApi()
         method = unwrap(api.get)
 
@@ -611,7 +734,7 @@ class TestPublishedAllRagPipelineApi:
         user = MagicMock(id="u1")
 
         service = MagicMock()
-        service.get_all_published_workflow.return_value = ([{"id": "w1"}], False)
+        service.get_all_published_workflow.return_value = ([make_workflow(id="w1")], False)
 
         with (
             app.test_request_context("/"),
@@ -626,10 +749,11 @@ class TestPublishedAllRagPipelineApi:
         ):
             result = method(api, pipeline)
 
-        assert result["items"] == [{"id": "w1"}]
+        assert result["items"][0]["id"] == "w1"
+        assert result["items"][0]["graph"] == {"nodes": [], "edges": []}
         assert result["has_more"] is False
 
-    def test_get_published_workflows_forbidden(self, app):
+    def test_get_published_workflows_forbidden(self, app: Flask):
         api = PublishedAllRagPipelineApi()
         method = unwrap(api.get)
 
@@ -649,17 +773,17 @@ class TestPublishedAllRagPipelineApi:
 
 class TestRagPipelineByIdApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_patch_success(self, app):
+    def test_patch_success(self, app: Flask):
         api = RagPipelineByIdApi()
         method = unwrap(api.patch)
 
         pipeline = MagicMock(tenant_id="t1")
         user = MagicMock(id="u1")
 
-        workflow = MagicMock()
+        workflow = make_workflow(id="w1", marked_name="test")
 
         service = MagicMock()
         service.update_workflow.return_value = workflow
@@ -680,9 +804,11 @@ class TestRagPipelineByIdApi:
         ):
             result = method(api, pipeline, "w1")
 
-        assert result == workflow
+        assert result["id"] == "w1"
+        assert result["marked_name"] == "test"
+        assert result["hash"] == workflow.unique_hash
 
-    def test_patch_no_fields(self, app):
+    def test_patch_no_fields(self, app: Flask):
         api = RagPipelineByIdApi()
         method = unwrap(api.patch)
 
@@ -700,7 +826,7 @@ class TestRagPipelineByIdApi:
             result, status = method(api, pipeline, "w1")
             assert status == 400
 
-    def test_delete_success(self, app):
+    def test_delete_success(self, app: Flask):
         api = RagPipelineByIdApi()
         method = unwrap(api.delete)
 
@@ -720,7 +846,7 @@ class TestRagPipelineByIdApi:
         workflow_service.delete_workflow.assert_called_once()
         assert result == (None, 204)
 
-    def test_delete_active_workflow_rejected(self, app):
+    def test_delete_active_workflow_rejected(self, app: Flask):
         api = RagPipelineByIdApi()
         method = unwrap(api.delete)
 
@@ -733,16 +859,16 @@ class TestRagPipelineByIdApi:
 
 class TestRagPipelineWorkflowLastRunApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_last_run_success(self, app):
+    def test_last_run_success(self, app: Flask):
         api = RagPipelineWorkflowLastRunApi()
         method = unwrap(api.get)
 
         pipeline = MagicMock()
         workflow = MagicMock()
-        node_exec = MagicMock()
+        node_exec = make_node_execution()
 
         service = MagicMock()
         service.get_draft_workflow.return_value = workflow
@@ -756,9 +882,11 @@ class TestRagPipelineWorkflowLastRunApi:
             ),
         ):
             result = method(api, pipeline, "node1")
-            assert result == node_exec
+            assert result["id"] == "node-exec-1"
+            assert result["inputs"] == {"query": "hello"}
+            assert result["outputs"] == {"answer": "world"}
 
-    def test_last_run_not_found(self, app):
+    def test_last_run_not_found(self, app: Flask):
         api = RagPipelineWorkflowLastRunApi()
         method = unwrap(api.get)
 
@@ -780,10 +908,10 @@ class TestRagPipelineWorkflowLastRunApi:
 
 class TestRagPipelineDatasourceVariableApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_set_datasource_variables_success(self, app):
+    def test_set_datasource_variables_success(self, app: Flask):
         api = RagPipelineDatasourceVariableApi()
         method = unwrap(api.post)
 
@@ -798,7 +926,7 @@ class TestRagPipelineDatasourceVariableApi:
         }
 
         service = MagicMock()
-        service.set_datasource_variables.return_value = MagicMock()
+        service.set_datasource_variables.return_value = make_node_execution(node_id="n1")
 
         with (
             app.test_request_context("/", json=payload),
@@ -813,4 +941,5 @@ class TestRagPipelineDatasourceVariableApi:
             ),
         ):
             result = method(api, pipeline)
-            assert result is not None
+            assert result["node_id"] == "n1"
+            assert result["process_data"] == {}
diff --git a/api/tests/test_containers_integration_tests/controllers/console/datasets/test_data_source.py b/api/tests/test_containers_integration_tests/controllers/console/datasets/test_data_source.py
index 1c4c6a899f..b59009f7c4 100644
--- a/api/tests/test_containers_integration_tests/controllers/console/datasets/test_data_source.py
+++ b/api/tests/test_containers_integration_tests/controllers/console/datasets/test_data_source.py
@@ -5,6 +5,7 @@ from __future__ import annotations
 from unittest.mock import MagicMock, PropertyMock, patch
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import NotFound
 
 from controllers.console.datasets import data_source
@@ -51,10 +52,10 @@ def mock_engine():
 
 class TestDataSourceApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_get_success(self, app, patch_tenant):
+    def test_get_success(self, app: Flask, patch_tenant):
         api = DataSourceApi()
         method = unwrap(api.get)
 
@@ -78,7 +79,7 @@ class TestDataSourceApi:
         assert status == 200
         assert response["data"][0]["is_bound"] is True
 
-    def test_get_no_bindings(self, app, patch_tenant):
+    def test_get_no_bindings(self, app: Flask, patch_tenant):
         api = DataSourceApi()
         method = unwrap(api.get)
 
@@ -94,7 +95,7 @@ class TestDataSourceApi:
         assert status == 200
         assert response["data"] == []
 
-    def test_patch_enable_binding(self, app, patch_tenant, mock_engine):
+    def test_patch_enable_binding(self, app: Flask, patch_tenant, mock_engine):
         api = DataSourceApi()
         method = unwrap(api.patch)
 
@@ -115,7 +116,7 @@ class TestDataSourceApi:
         assert status == 200
         assert binding.disabled is False
 
-    def test_patch_disable_binding(self, app, patch_tenant, mock_engine):
+    def test_patch_disable_binding(self, app: Flask, patch_tenant, mock_engine):
         api = DataSourceApi()
         method = unwrap(api.patch)
 
@@ -136,7 +137,7 @@ class TestDataSourceApi:
         assert status == 200
         assert binding.disabled is True
 
-    def test_patch_binding_not_found(self, app, patch_tenant, mock_engine):
+    def test_patch_binding_not_found(self, app: Flask, patch_tenant, mock_engine):
         api = DataSourceApi()
         method = unwrap(api.patch)
 
@@ -151,7 +152,7 @@ class TestDataSourceApi:
             with pytest.raises(NotFound):
                 method(api, "b1", "enable")
 
-    def test_patch_enable_already_enabled(self, app, patch_tenant, mock_engine):
+    def test_patch_enable_already_enabled(self, app: Flask, patch_tenant, mock_engine):
         api = DataSourceApi()
         method = unwrap(api.patch)
 
@@ -168,7 +169,7 @@ class TestDataSourceApi:
             with pytest.raises(ValueError):
                 method(api, "b1", "enable")
 
-    def test_patch_disable_already_disabled(self, app, patch_tenant, mock_engine):
+    def test_patch_disable_already_disabled(self, app: Flask, patch_tenant, mock_engine):
         api = DataSourceApi()
         method = unwrap(api.patch)
 
@@ -188,10 +189,10 @@ class TestDataSourceApi:
 
 class TestDataSourceNotionListApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_get_credential_not_found(self, app, patch_tenant):
+    def test_get_credential_not_found(self, app: Flask, patch_tenant):
         api = DataSourceNotionListApi()
         method = unwrap(api.get)
 
@@ -205,7 +206,7 @@ class TestDataSourceNotionListApi:
             with pytest.raises(NotFound):
                 method(api)
 
-    def test_get_success_no_dataset_id(self, app, patch_tenant, mock_engine):
+    def test_get_success_no_dataset_id(self, app: Flask, patch_tenant, mock_engine):
         api = DataSourceNotionListApi()
         method = unwrap(api.get)
 
@@ -246,7 +247,7 @@ class TestDataSourceNotionListApi:
 
         assert status == 200
 
-    def test_get_success_with_dataset_id(self, app, patch_tenant, mock_engine):
+    def test_get_success_with_dataset_id(self, app: Flask, patch_tenant, mock_engine):
         api = DataSourceNotionListApi()
         method = unwrap(api.get)
 
@@ -299,7 +300,7 @@ class TestDataSourceNotionListApi:
 
         assert status == 200
 
-    def test_get_invalid_dataset_type(self, app, patch_tenant, mock_engine):
+    def test_get_invalid_dataset_type(self, app: Flask, patch_tenant, mock_engine):
         api = DataSourceNotionListApi()
         method = unwrap(api.get)
 
@@ -323,10 +324,10 @@ class TestDataSourceNotionListApi:
 
 class TestDataSourceNotionApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_get_preview_success(self, app, patch_tenant):
+    def test_get_preview_success(self, app: Flask, patch_tenant):
         api = DataSourceNotionApi()
         method = unwrap(api.get)
 
@@ -347,7 +348,7 @@ class TestDataSourceNotionApi:
 
         assert status == 200
 
-    def test_post_indexing_estimate_success(self, app, patch_tenant):
+    def test_post_indexing_estimate_success(self, app: Flask, patch_tenant):
         api = DataSourceNotionApi()
         method = unwrap(api.post)
 
@@ -381,10 +382,10 @@ class TestDataSourceNotionApi:
 
 class TestDataSourceNotionDatasetSyncApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_get_success(self, app, patch_tenant):
+    def test_get_success(self, app: Flask, patch_tenant):
         api = DataSourceNotionDatasetSyncApi()
         method = unwrap(api.get)
 
@@ -407,7 +408,7 @@ class TestDataSourceNotionDatasetSyncApi:
 
         assert status == 200
 
-    def test_get_dataset_not_found(self, app, patch_tenant):
+    def test_get_dataset_not_found(self, app: Flask, patch_tenant):
         api = DataSourceNotionDatasetSyncApi()
         method = unwrap(api.get)
 
@@ -424,10 +425,10 @@ class TestDataSourceNotionDatasetSyncApi:
 
 class TestDataSourceNotionDocumentSyncApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_get_success(self, app, patch_tenant):
+    def test_get_success(self, app: Flask, patch_tenant):
         api = DataSourceNotionDocumentSyncApi()
         method = unwrap(api.get)
 
@@ -450,7 +451,7 @@ class TestDataSourceNotionDocumentSyncApi:
 
         assert status == 200
 
-    def test_get_document_not_found(self, app, patch_tenant):
+    def test_get_document_not_found(self, app: Flask, patch_tenant):
         api = DataSourceNotionDocumentSyncApi()
         method = unwrap(api.get)
 
diff --git a/api/tests/test_containers_integration_tests/controllers/console/explore/test_conversation.py b/api/tests/test_containers_integration_tests/controllers/console/explore/test_conversation.py
index 83492048ef..917aa35fe6 100644
--- a/api/tests/test_containers_integration_tests/controllers/console/explore/test_conversation.py
+++ b/api/tests/test_containers_integration_tests/controllers/console/explore/test_conversation.py
@@ -5,6 +5,7 @@ from __future__ import annotations
 from unittest.mock import MagicMock, patch
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import NotFound
 
 import controllers.console.explore.conversation as conversation_module
@@ -53,10 +54,10 @@ def user():
 
 class TestConversationListApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_get_success(self, app, chat_app, user):
+    def test_get_success(self, app: Flask, chat_app, user):
         api = conversation_module.ConversationListApi()
         method = unwrap(api.get)
 
@@ -81,7 +82,7 @@ class TestConversationListApi:
         assert result["has_more"] is False
         assert len(result["data"]) == 2
 
-    def test_last_conversation_not_exists(self, app, chat_app, user):
+    def test_last_conversation_not_exists(self, app: Flask, chat_app, user):
         api = conversation_module.ConversationListApi()
         method = unwrap(api.get)
 
@@ -97,7 +98,7 @@ class TestConversationListApi:
             with pytest.raises(NotFound):
                 method(chat_app)
 
-    def test_wrong_app_mode(self, app, non_chat_app):
+    def test_wrong_app_mode(self, app: Flask, non_chat_app):
         api = conversation_module.ConversationListApi()
         method = unwrap(api.get)
 
@@ -108,10 +109,10 @@ class TestConversationListApi:
 
 class TestConversationApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_delete_success(self, app, chat_app, user):
+    def test_delete_success(self, app: Flask, chat_app, user):
         api = conversation_module.ConversationApi()
         method = unwrap(api.delete)
 
@@ -129,7 +130,7 @@ class TestConversationApi:
         assert status == 204
         assert body["result"] == "success"
 
-    def test_delete_not_found(self, app, chat_app, user):
+    def test_delete_not_found(self, app: Flask, chat_app, user):
         api = conversation_module.ConversationApi()
         method = unwrap(api.delete)
 
@@ -145,7 +146,7 @@ class TestConversationApi:
             with pytest.raises(NotFound):
                 method(chat_app, "cid")
 
-    def test_delete_wrong_app_mode(self, app, non_chat_app):
+    def test_delete_wrong_app_mode(self, app: Flask, non_chat_app):
         api = conversation_module.ConversationApi()
         method = unwrap(api.delete)
 
@@ -156,10 +157,10 @@ class TestConversationApi:
 
 class TestConversationRenameApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_rename_success(self, app, chat_app, user):
+    def test_rename_success(self, app: Flask, chat_app, user):
         api = conversation_module.ConversationRenameApi()
         method = unwrap(api.post)
 
@@ -178,7 +179,7 @@ class TestConversationRenameApi:
 
         assert result["id"] == "cid"
 
-    def test_rename_not_found(self, app, chat_app, user):
+    def test_rename_not_found(self, app: Flask, chat_app, user):
         api = conversation_module.ConversationRenameApi()
         method = unwrap(api.post)
 
@@ -197,10 +198,10 @@ class TestConversationRenameApi:
 
 class TestConversationPinApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_pin_success(self, app, chat_app, user):
+    def test_pin_success(self, app: Flask, chat_app, user):
         api = conversation_module.ConversationPinApi()
         method = unwrap(api.patch)
 
@@ -219,10 +220,10 @@ class TestConversationPinApi:
 
 class TestConversationUnPinApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_unpin_success(self, app, chat_app, user):
+    def test_unpin_success(self, app: Flask, chat_app, user):
         api = conversation_module.ConversationUnPinApi()
         method = unwrap(api.patch)
 
diff --git a/api/tests/test_containers_integration_tests/controllers/console/test_apikey.py b/api/tests/test_containers_integration_tests/controllers/console/test_apikey.py
index 7df63aae1a..b55eaa1d58 100644
--- a/api/tests/test_containers_integration_tests/controllers/console/test_apikey.py
+++ b/api/tests/test_containers_integration_tests/controllers/console/test_apikey.py
@@ -5,6 +5,7 @@ from __future__ import annotations
 from unittest.mock import MagicMock, patch
 
 import pytest
+from flask import Flask
 from flask.testing import FlaskClient
 from sqlalchemy import delete
 from sqlalchemy.orm import Session
@@ -126,7 +127,7 @@ class TestAppApiKeyResource:
 
     def test_delete_forbidden_for_non_admin(
         self,
-        flask_app_with_containers,
+        flask_app_with_containers: Flask,
     ) -> None:
         """A non-admin member cannot delete API keys via the controller permission check."""
         from werkzeug.exceptions import Forbidden
diff --git a/api/tests/test_containers_integration_tests/controllers/console/workspace/test_tool_provider.py b/api/tests/test_containers_integration_tests/controllers/console/workspace/test_tool_provider.py
index f2e7104b18..d944613886 100644
--- a/api/tests/test_containers_integration_tests/controllers/console/workspace/test_tool_provider.py
+++ b/api/tests/test_containers_integration_tests/controllers/console/workspace/test_tool_provider.py
@@ -6,6 +6,7 @@ import json
 from unittest.mock import MagicMock, patch
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import Forbidden
 
 from controllers.console.workspace.tool_providers import (
@@ -60,7 +61,7 @@ def _mock_user_tenant():
 
 
 @pytest.fixture
-def client(flask_app_with_containers):
+def client(flask_app_with_containers: Flask):
     return flask_app_with_containers.test_client()
 
 
@@ -147,10 +148,10 @@ class TestUtils:
 
 class TestToolProviderListApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_get_success(self, app):
+    def test_get_success(self, app: Flask):
         api = ToolProviderListApi()
         method = unwrap(api.get)
 
@@ -170,10 +171,10 @@ class TestToolProviderListApi:
 
 class TestBuiltinProviderApis:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_list_tools(self, app):
+    def test_list_tools(self, app: Flask):
         api = ToolBuiltinProviderListToolsApi()
         method = unwrap(api.get)
 
@@ -190,7 +191,7 @@ class TestBuiltinProviderApis:
         ):
             assert method(api, "provider") == [{"a": 1}]
 
-    def test_info(self, app):
+    def test_info(self, app: Flask):
         api = ToolBuiltinProviderInfoApi()
         method = unwrap(api.get)
 
@@ -207,7 +208,7 @@ class TestBuiltinProviderApis:
         ):
             assert method(api, "provider") == {"x": 1}
 
-    def test_delete(self, app):
+    def test_delete(self, app: Flask):
         api = ToolBuiltinProviderDeleteApi()
         method = unwrap(api.post)
 
@@ -224,7 +225,7 @@ class TestBuiltinProviderApis:
         ):
             assert method(api, "provider")["result"] == "success"
 
-    def test_add_invalid_type(self, app):
+    def test_add_invalid_type(self, app: Flask):
         api = ToolBuiltinProviderAddApi()
         method = unwrap(api.post)
 
@@ -238,7 +239,7 @@ class TestBuiltinProviderApis:
             with pytest.raises(ValueError):
                 method(api, "provider")
 
-    def test_add_success(self, app):
+    def test_add_success(self, app: Flask):
         api = ToolBuiltinProviderAddApi()
         method = unwrap(api.post)
 
@@ -257,7 +258,7 @@ class TestBuiltinProviderApis:
         ):
             assert method(api, "provider")["id"] == 1
 
-    def test_update(self, app):
+    def test_update(self, app: Flask):
         api = ToolBuiltinProviderUpdateApi()
         method = unwrap(api.post)
 
@@ -276,7 +277,7 @@ class TestBuiltinProviderApis:
         ):
             assert method(api, "provider")["ok"]
 
-    def test_get_credentials(self, app):
+    def test_get_credentials(self, app: Flask):
         api = ToolBuiltinProviderGetCredentialsApi()
         method = unwrap(api.get)
 
@@ -293,7 +294,7 @@ class TestBuiltinProviderApis:
         ):
             assert method(api, "provider") == {"k": "v"}
 
-    def test_icon(self, app):
+    def test_icon(self, app: Flask):
         api = ToolBuiltinProviderIconApi()
         method = unwrap(api.get)
 
@@ -307,7 +308,7 @@ class TestBuiltinProviderApis:
             response = method(api, "provider")
             assert response.mimetype == "image/png"
 
-    def test_credentials_schema(self, app):
+    def test_credentials_schema(self, app: Flask):
         api = ToolBuiltinProviderCredentialsSchemaApi()
         method = unwrap(api.get)
 
@@ -324,7 +325,7 @@ class TestBuiltinProviderApis:
         ):
             assert method(api, "provider", "oauth2") == {"schema": {}}
 
-    def test_set_default_credential(self, app):
+    def test_set_default_credential(self, app: Flask):
         api = ToolBuiltinProviderSetDefaultApi()
         method = unwrap(api.post)
 
@@ -341,7 +342,7 @@ class TestBuiltinProviderApis:
         ):
             assert method(api, "provider")["ok"]
 
-    def test_get_credential_info(self, app):
+    def test_get_credential_info(self, app: Flask):
         api = ToolBuiltinProviderGetCredentialInfoApi()
         method = unwrap(api.get)
 
@@ -358,7 +359,7 @@ class TestBuiltinProviderApis:
         ):
             assert method(api, "provider") == {"info": "x"}
 
-    def test_get_oauth_client_schema(self, app):
+    def test_get_oauth_client_schema(self, app: Flask):
         api = ToolBuiltinProviderGetOauthClientSchemaApi()
         method = unwrap(api.get)
 
@@ -378,10 +379,10 @@ class TestBuiltinProviderApis:
 
 class TestApiProviderApis:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_add(self, app):
+    def test_add(self, app: Flask):
         api = ToolApiProviderAddApi()
         method = unwrap(api.post)
 
@@ -406,7 +407,7 @@ class TestApiProviderApis:
         ):
             assert method(api)["id"] == 1
 
-    def test_remote_schema(self, app):
+    def test_remote_schema(self, app: Flask):
         api = ToolApiProviderGetRemoteSchemaApi()
         method = unwrap(api.get)
 
@@ -423,7 +424,7 @@ class TestApiProviderApis:
         ):
             assert method(api)["schema"] == "x"
 
-    def test_list_tools(self, app):
+    def test_list_tools(self, app: Flask):
         api = ToolApiProviderListToolsApi()
         method = unwrap(api.get)
 
@@ -440,7 +441,7 @@ class TestApiProviderApis:
         ):
             assert method(api) == [{"tool": 1}]
 
-    def test_update(self, app):
+    def test_update(self, app: Flask):
         api = ToolApiProviderUpdateApi()
         method = unwrap(api.post)
 
@@ -468,7 +469,7 @@ class TestApiProviderApis:
         ):
             assert method(api)["ok"]
 
-    def test_delete(self, app):
+    def test_delete(self, app: Flask):
         api = ToolApiProviderDeleteApi()
         method = unwrap(api.post)
 
@@ -485,7 +486,7 @@ class TestApiProviderApis:
         ):
             assert method(api)["result"] == "success"
 
-    def test_get(self, app):
+    def test_get(self, app: Flask):
         api = ToolApiProviderGetApi()
         method = unwrap(api.get)
 
@@ -505,10 +506,10 @@ class TestApiProviderApis:
 
 class TestWorkflowApis:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_create(self, app):
+    def test_create(self, app: Flask):
         api = ToolWorkflowProviderCreateApi()
         method = unwrap(api.post)
 
@@ -534,7 +535,7 @@ class TestWorkflowApis:
         ):
             assert method(api)["id"] == 1
 
-    def test_update_invalid(self, app):
+    def test_update_invalid(self, app: Flask):
         api = ToolWorkflowProviderUpdateApi()
         method = unwrap(api.post)
 
@@ -560,7 +561,7 @@ class TestWorkflowApis:
             result = method(api)
             assert result["ok"]
 
-    def test_delete(self, app):
+    def test_delete(self, app: Flask):
         api = ToolWorkflowProviderDeleteApi()
         method = unwrap(api.post)
 
@@ -577,7 +578,7 @@ class TestWorkflowApis:
         ):
             assert method(api)["ok"]
 
-    def test_get_error(self, app):
+    def test_get_error(self, app: Flask):
         api = ToolWorkflowProviderGetApi()
         method = unwrap(api.get)
 
@@ -594,10 +595,10 @@ class TestWorkflowApis:
 
 class TestLists:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_builtin_list(self, app):
+    def test_builtin_list(self, app: Flask):
         api = ToolBuiltinListApi()
         method = unwrap(api.get)
 
@@ -617,7 +618,7 @@ class TestLists:
         ):
             assert method(api) == [{"x": 1}]
 
-    def test_api_list(self, app):
+    def test_api_list(self, app: Flask):
         api = ToolApiListApi()
         method = unwrap(api.get)
 
@@ -637,7 +638,7 @@ class TestLists:
         ):
             assert method(api) == [{"x": 1}]
 
-    def test_workflow_list(self, app):
+    def test_workflow_list(self, app: Flask):
         api = ToolWorkflowListApi()
         method = unwrap(api.get)
 
@@ -660,10 +661,10 @@ class TestLists:
 
 class TestLabels:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_labels(self, app):
+    def test_labels(self, app: Flask):
         api = ToolLabelsApi()
         method = unwrap(api.get)
 
@@ -679,10 +680,10 @@ class TestLabels:
 
 class TestOAuth:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_oauth_no_client(self, app):
+    def test_oauth_no_client(self, app: Flask):
         api = ToolPluginOAuthApi()
         method = unwrap(api.get)
 
@@ -700,7 +701,7 @@ class TestOAuth:
             with pytest.raises(Forbidden):
                 method(api, "provider")
 
-    def test_oauth_callback_no_cookie(self, app):
+    def test_oauth_callback_no_cookie(self, app: Flask):
         api = ToolOAuthCallback()
         method = unwrap(api.get)
 
@@ -711,10 +712,10 @@ class TestOAuth:
 
 class TestOAuthCustomClient:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_save_custom_client(self, app):
+    def test_save_custom_client(self, app: Flask):
         api = ToolOAuthCustomClient()
         method = unwrap(api.post)
 
@@ -731,7 +732,7 @@ class TestOAuthCustomClient:
         ):
             assert method(api, "provider")["ok"]
 
-    def test_get_custom_client(self, app):
+    def test_get_custom_client(self, app: Flask):
         api = ToolOAuthCustomClient()
         method = unwrap(api.get)
 
@@ -748,7 +749,7 @@ class TestOAuthCustomClient:
         ):
             assert method(api, "provider") == {"client_id": "x"}
 
-    def test_delete_custom_client(self, app):
+    def test_delete_custom_client(self, app: Flask):
         api = ToolOAuthCustomClient()
         method = unwrap(api.delete)
 
diff --git a/api/tests/test_containers_integration_tests/controllers/console/workspace/test_trigger_providers.py b/api/tests/test_containers_integration_tests/controllers/console/workspace/test_trigger_providers.py
index ca8195af53..e155b711a7 100644
--- a/api/tests/test_containers_integration_tests/controllers/console/workspace/test_trigger_providers.py
+++ b/api/tests/test_containers_integration_tests/controllers/console/workspace/test_trigger_providers.py
@@ -5,6 +5,7 @@ from __future__ import annotations
 from unittest.mock import MagicMock, patch
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import BadRequest, Forbidden
 
 from controllers.console.workspace.trigger_providers import (
@@ -45,10 +46,10 @@ def mock_user():
 
 class TestTriggerProviderApis:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_icon_success(self, app):
+    def test_icon_success(self, app: Flask):
         api = TriggerProviderIconApi()
         method = unwrap(api.get)
 
@@ -62,7 +63,7 @@ class TestTriggerProviderApis:
         ):
             assert method(api, "github") == "icon"
 
-    def test_list_providers(self, app):
+    def test_list_providers(self, app: Flask):
         api = TriggerProviderListApi()
         method = unwrap(api.get)
 
@@ -76,7 +77,7 @@ class TestTriggerProviderApis:
         ):
             assert method(api) == []
 
-    def test_provider_info(self, app):
+    def test_provider_info(self, app: Flask):
         api = TriggerProviderInfoApi()
         method = unwrap(api.get)
 
@@ -93,10 +94,10 @@ class TestTriggerProviderApis:
 
 class TestTriggerSubscriptionListApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_list_success(self, app):
+    def test_list_success(self, app: Flask):
         api = TriggerSubscriptionListApi()
         method = unwrap(api.get)
 
@@ -110,7 +111,7 @@ class TestTriggerSubscriptionListApi:
         ):
             assert method(api, "github") == []
 
-    def test_list_invalid_provider(self, app):
+    def test_list_invalid_provider(self, app: Flask):
         api = TriggerSubscriptionListApi()
         method = unwrap(api.get)
 
@@ -128,10 +129,10 @@ class TestTriggerSubscriptionListApi:
 
 class TestTriggerSubscriptionBuilderApis:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_create_builder(self, app):
+    def test_create_builder(self, app: Flask):
         api = TriggerSubscriptionBuilderCreateApi()
         method = unwrap(api.post)
 
@@ -146,7 +147,7 @@ class TestTriggerSubscriptionBuilderApis:
             result = method(api, "github")
             assert "subscription_builder" in result
 
-    def test_get_builder(self, app):
+    def test_get_builder(self, app: Flask):
         api = TriggerSubscriptionBuilderGetApi()
         method = unwrap(api.get)
 
@@ -159,7 +160,7 @@ class TestTriggerSubscriptionBuilderApis:
         ):
             assert method(api, "github", "b1") == {"id": "b1"}
 
-    def test_verify_builder(self, app):
+    def test_verify_builder(self, app: Flask):
         api = TriggerSubscriptionBuilderVerifyApi()
         method = unwrap(api.post)
 
@@ -173,7 +174,7 @@ class TestTriggerSubscriptionBuilderApis:
         ):
             assert method(api, "github", "b1") == {"ok": True}
 
-    def test_verify_builder_error(self, app):
+    def test_verify_builder_error(self, app: Flask):
         api = TriggerSubscriptionBuilderVerifyApi()
         method = unwrap(api.post)
 
@@ -188,7 +189,7 @@ class TestTriggerSubscriptionBuilderApis:
             with pytest.raises(ValueError):
                 method(api, "github", "b1")
 
-    def test_update_builder(self, app):
+    def test_update_builder(self, app: Flask):
         api = TriggerSubscriptionBuilderUpdateApi()
         method = unwrap(api.post)
 
@@ -202,7 +203,7 @@ class TestTriggerSubscriptionBuilderApis:
         ):
             assert method(api, "github", "b1") == {"id": "b1"}
 
-    def test_logs(self, app):
+    def test_logs(self, app: Flask):
         api = TriggerSubscriptionBuilderLogsApi()
         method = unwrap(api.get)
 
@@ -219,7 +220,7 @@ class TestTriggerSubscriptionBuilderApis:
         ):
             assert "logs" in method(api, "github", "b1")
 
-    def test_build(self, app):
+    def test_build(self, app: Flask):
         api = TriggerSubscriptionBuilderBuildApi()
         method = unwrap(api.post)
 
@@ -236,10 +237,10 @@ class TestTriggerSubscriptionBuilderApis:
 
 class TestTriggerSubscriptionCrud:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_update_rename_only(self, app):
+    def test_update_rename_only(self, app: Flask):
         api = TriggerSubscriptionUpdateApi()
         method = unwrap(api.post)
 
@@ -258,7 +259,7 @@ class TestTriggerSubscriptionCrud:
         ):
             assert method(api, "s1") == 200
 
-    def test_update_not_found(self, app):
+    def test_update_not_found(self, app: Flask):
         api = TriggerSubscriptionUpdateApi()
         method = unwrap(api.post)
 
@@ -273,7 +274,7 @@ class TestTriggerSubscriptionCrud:
             with pytest.raises(NotFoundError):
                 method(api, "x")
 
-    def test_update_rebuild(self, app):
+    def test_update_rebuild(self, app: Flask):
         api = TriggerSubscriptionUpdateApi()
         method = unwrap(api.post)
 
@@ -296,7 +297,7 @@ class TestTriggerSubscriptionCrud:
         ):
             assert method(api, "s1") == 200
 
-    def test_delete_subscription(self, app):
+    def test_delete_subscription(self, app: Flask):
         api = TriggerSubscriptionDeleteApi()
         method = unwrap(api.post)
 
@@ -319,7 +320,7 @@ class TestTriggerSubscriptionCrud:
 
         assert result["result"] == "success"
 
-    def test_delete_subscription_value_error(self, app):
+    def test_delete_subscription_value_error(self, app: Flask):
         api = TriggerSubscriptionDeleteApi()
         method = unwrap(api.post)
 
@@ -342,10 +343,10 @@ class TestTriggerSubscriptionCrud:
 
 class TestTriggerOAuthApis:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_oauth_authorize_success(self, app):
+    def test_oauth_authorize_success(self, app: Flask):
         api = TriggerOAuthAuthorizeApi()
         method = unwrap(api.get)
 
@@ -372,7 +373,7 @@ class TestTriggerOAuthApis:
             resp = method(api, "github")
             assert resp.status_code == 200
 
-    def test_oauth_authorize_no_client(self, app):
+    def test_oauth_authorize_no_client(self, app: Flask):
         api = TriggerOAuthAuthorizeApi()
         method = unwrap(api.get)
 
@@ -387,7 +388,7 @@ class TestTriggerOAuthApis:
             with pytest.raises(NotFoundError):
                 method(api, "github")
 
-    def test_oauth_callback_forbidden(self, app):
+    def test_oauth_callback_forbidden(self, app: Flask):
         api = TriggerOAuthCallbackApi()
         method = unwrap(api.get)
 
@@ -395,7 +396,7 @@ class TestTriggerOAuthApis:
             with pytest.raises(Forbidden):
                 method(api, "github")
 
-    def test_oauth_callback_success(self, app):
+    def test_oauth_callback_success(self, app: Flask):
         api = TriggerOAuthCallbackApi()
         method = unwrap(api.get)
 
@@ -425,7 +426,7 @@ class TestTriggerOAuthApis:
             resp = method(api, "github")
             assert resp.status_code == 302
 
-    def test_oauth_callback_no_oauth_client(self, app):
+    def test_oauth_callback_no_oauth_client(self, app: Flask):
         api = TriggerOAuthCallbackApi()
         method = unwrap(api.get)
 
@@ -449,7 +450,7 @@ class TestTriggerOAuthApis:
             with pytest.raises(Forbidden):
                 method(api, "github")
 
-    def test_oauth_callback_empty_credentials(self, app):
+    def test_oauth_callback_empty_credentials(self, app: Flask):
         api = TriggerOAuthCallbackApi()
         method = unwrap(api.get)
 
@@ -480,10 +481,10 @@ class TestTriggerOAuthApis:
 
 class TestTriggerOAuthClientManageApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_get_client(self, app):
+    def test_get_client(self, app: Flask):
         api = TriggerOAuthClientManageApi()
         method = unwrap(api.get)
 
@@ -510,7 +511,7 @@ class TestTriggerOAuthClientManageApi:
             result = method(api, "github")
             assert "configured" in result
 
-    def test_post_client(self, app):
+    def test_post_client(self, app: Flask):
         api = TriggerOAuthClientManageApi()
         method = unwrap(api.post)
 
@@ -524,7 +525,7 @@ class TestTriggerOAuthClientManageApi:
         ):
             assert method(api, "github") == {"ok": True}
 
-    def test_delete_client(self, app):
+    def test_delete_client(self, app: Flask):
         api = TriggerOAuthClientManageApi()
         method = unwrap(api.delete)
 
@@ -538,7 +539,7 @@ class TestTriggerOAuthClientManageApi:
         ):
             assert method(api, "github") == {"ok": True}
 
-    def test_oauth_client_post_value_error(self, app):
+    def test_oauth_client_post_value_error(self, app: Flask):
         api = TriggerOAuthClientManageApi()
         method = unwrap(api.post)
 
@@ -556,10 +557,10 @@ class TestTriggerOAuthClientManageApi:
 
 class TestTriggerSubscriptionVerifyApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_verify_success(self, app):
+    def test_verify_success(self, app: Flask):
         api = TriggerSubscriptionVerifyApi()
         method = unwrap(api.post)
 
@@ -574,7 +575,7 @@ class TestTriggerSubscriptionVerifyApi:
             assert method(api, "github", "s1") == {"ok": True}
 
     @pytest.mark.parametrize("raised_exception", [ValueError("bad"), Exception("boom")])
-    def test_verify_errors(self, app, raised_exception):
+    def test_verify_errors(self, app: Flask, raised_exception):
         api = TriggerSubscriptionVerifyApi()
         method = unwrap(api.post)
 
diff --git a/api/tests/test_containers_integration_tests/controllers/service_api/dataset/test_dataset.py b/api/tests/test_containers_integration_tests/controllers/service_api/dataset/test_dataset.py
index 9b913d6d3d..b73d28e4c4 100644
--- a/api/tests/test_containers_integration_tests/controllers/service_api/dataset/test_dataset.py
+++ b/api/tests/test_containers_integration_tests/controllers/service_api/dataset/test_dataset.py
@@ -18,6 +18,7 @@ from types import SimpleNamespace
 from unittest.mock import Mock, patch
 
 import pytest
+from flask import Flask
 from sqlalchemy.orm import Session
 from werkzeug.exceptions import Forbidden, NotFound
 
@@ -217,10 +218,20 @@ class TestTagUnbindingPayload:
     """Test suite for TagUnbindingPayload Pydantic model."""
 
     def test_payload_with_valid_data(self):
-        payload = TagUnbindingPayload(tag_id="tag_123", target_id="dataset_456")
-        assert payload.tag_id == "tag_123"
+        payload = TagUnbindingPayload(tag_ids=["tag_123"], target_id="dataset_456")
+        assert payload.tag_ids == ["tag_123"]
         assert payload.target_id == "dataset_456"
 
+    def test_payload_normalizes_legacy_tag_id(self):
+        payload = TagUnbindingPayload(tag_id="tag_123", target_id="dataset_456")
+        assert payload.tag_ids == ["tag_123"]
+        assert payload.target_id == "dataset_456"
+
+    def test_payload_rejects_empty_tag_ids(self):
+        with pytest.raises(ValueError) as exc_info:
+            TagUnbindingPayload(tag_ids=[], target_id="dataset_456")
+        assert "Tag IDs is required" in str(exc_info.value)
+
 
 # ---------------------------------------------------------------------------
 # Helpers
@@ -236,7 +247,7 @@ def _unwrap(method):
 
 
 @pytest.fixture
-def app(flask_app_with_containers):
+def app(flask_app_with_containers: Flask):
     # Uses the full containerised app so that Flask config, extensions, and
     # blueprint registrations match production.  Most tests mock the service
     # layer to isolate controller logic; a few (e.g. test_list_tags_from_db)
@@ -280,7 +291,7 @@ class TestDatasetListApiGet:
         mock_current_user,
         mock_provider_mgr,
         mock_marshal,
-        app,
+        app: Flask,
         mock_tenant,
     ):
         from controllers.service_api.dataset.dataset import DatasetListApi
@@ -315,7 +326,7 @@ class TestDatasetListApiPost:
         mock_dataset_svc,
         mock_current_user,
         mock_marshal,
-        app,
+        app: Flask,
         mock_tenant,
     ):
         from controllers.service_api.dataset.dataset import DatasetListApi
@@ -341,7 +352,7 @@ class TestDatasetListApiPost:
         self,
         mock_dataset_svc,
         mock_current_user,
-        app,
+        app: Flask,
         mock_tenant,
     ):
         from controllers.service_api.dataset.dataset import DatasetListApi
@@ -379,7 +390,7 @@ class TestDatasetApiGet:
         mock_provider_mgr,
         mock_marshal,
         mock_perm_svc,
-        app,
+        app: Flask,
         mock_dataset,
     ):
         from controllers.service_api.dataset.dataset import DatasetApi
@@ -429,7 +440,7 @@ class TestDatasetApiGet:
         self,
         mock_dataset_svc,
         mock_current_user,
-        app,
+        app: Flask,
         mock_dataset,
     ):
         from controllers.service_api.dataset.dataset import DatasetApi
@@ -457,7 +468,7 @@ class TestDatasetApiDelete:
         mock_dataset_svc,
         mock_current_user,
         mock_perm_svc,
-        app,
+        app: Flask,
         mock_dataset,
     ):
         from controllers.service_api.dataset.dataset import DatasetApi
@@ -479,7 +490,7 @@ class TestDatasetApiDelete:
         self,
         mock_dataset_svc,
         mock_current_user,
-        app,
+        app: Flask,
         mock_dataset,
     ):
         from controllers.service_api.dataset.dataset import DatasetApi
@@ -500,7 +511,7 @@ class TestDatasetApiDelete:
         self,
         mock_dataset_svc,
         mock_current_user,
-        app,
+        app: Flask,
         mock_dataset,
     ):
         from controllers.service_api.dataset.dataset import DatasetApi
@@ -532,7 +543,7 @@ class TestDocumentStatusApiPatch:
         mock_dataset_svc,
         mock_current_user,
         mock_doc_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -563,7 +574,7 @@ class TestDocumentStatusApiPatch:
     def test_batch_update_status_dataset_not_found(
         self,
         mock_dataset_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -592,7 +603,7 @@ class TestDocumentStatusApiPatch:
         mock_dataset_svc,
         mock_current_user,
         mock_doc_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -625,7 +636,7 @@ class TestDocumentStatusApiPatch:
         mock_dataset_svc,
         mock_current_user,
         mock_doc_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -658,7 +669,7 @@ class TestDocumentStatusApiPatch:
         mock_dataset_svc,
         mock_current_user,
         mock_doc_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -698,7 +709,7 @@ class TestDatasetTagsApiGet:
         self,
         mock_current_user,
         mock_tag_svc,
-        app,
+        app: Flask,
     ):
         from controllers.service_api.dataset.dataset import DatasetTagsApi
 
@@ -720,7 +731,7 @@ class TestDatasetTagsApiGet:
     def test_list_tags_from_db(
         self,
         mock_current_user,
-        app,
+        app: Flask,
         db_session_with_containers: Session,
     ):
         """Integration test: creates real Tag rows and retrieves them
@@ -763,7 +774,7 @@ class TestDatasetTagsApiPost:
         self,
         mock_current_user,
         mock_tag_svc,
-        app,
+        app: Flask,
     ):
         from controllers.service_api.dataset.dataset import DatasetTagsApi
 
@@ -786,7 +797,7 @@ class TestDatasetTagsApiPost:
         mock_tag_svc.save_tags.assert_called_once()
 
     @patch("controllers.service_api.dataset.dataset.current_user")
-    def test_create_tag_forbidden(self, mock_current_user, app):
+    def test_create_tag_forbidden(self, mock_current_user, app: Flask):
         from controllers.service_api.dataset.dataset import DatasetTagsApi
 
         mock_current_user.__class__ = Account
@@ -815,7 +826,7 @@ class TestDatasetTagsApiPatch:
         mock_current_user,
         mock_service_api_ns,
         mock_tag_svc,
-        app,
+        app: Flask,
     ):
         from controllers.service_api.dataset.dataset import DatasetTagsApi
 
@@ -841,7 +852,7 @@ class TestDatasetTagsApiPatch:
         mock_tag_svc.update_tags.assert_called_once_with({"name": "Updated Tag", "type": "knowledge"}, "tag-1")
 
     @patch("controllers.service_api.dataset.dataset.current_user")
-    def test_update_tag_forbidden(self, mock_current_user, app):
+    def test_update_tag_forbidden(self, mock_current_user, app: Flask):
         from controllers.service_api.dataset.dataset import DatasetTagsApi
 
         mock_current_user.__class__ = Account
@@ -869,7 +880,7 @@ class TestDatasetTagsApiDelete:
         mock_current_user,
         mock_service_api_ns,
         mock_tag_svc,
-        app,
+        app: Flask,
     ):
         from controllers.service_api.dataset.dataset import DatasetTagsApi
 
@@ -894,7 +905,7 @@ class TestDatasetTagsApiDelete:
         mock_tag_svc.delete_tag.assert_called_once_with("tag-1")
 
     @patch("libs.login.current_user")
-    def test_delete_tag_forbidden(self, mock_current_user, app):
+    def test_delete_tag_forbidden(self, mock_current_user, app: Flask):
         from controllers.service_api.dataset.dataset import DatasetTagsApi
 
         user_obj = Mock(spec=Account)
@@ -922,7 +933,7 @@ class TestDatasetTagsBindingStatusApi:
         self,
         mock_current_user,
         mock_tag_svc,
-        app,
+        app: Flask,
     ):
         from controllers.service_api.dataset.dataset import DatasetTagsBindingStatusApi
 
@@ -952,7 +963,7 @@ class TestDatasetTagBindingApiPost:
         self,
         mock_current_user,
         mock_tag_svc,
-        app,
+        app: Flask,
     ):
         from controllers.service_api.dataset.dataset import DatasetTagBindingApi
 
@@ -977,7 +988,7 @@ class TestDatasetTagBindingApiPost:
         )
 
     @patch("controllers.service_api.dataset.dataset.current_user")
-    def test_bind_tags_forbidden(self, mock_current_user, app):
+    def test_bind_tags_forbidden(self, mock_current_user, app: Flask):
         from controllers.service_api.dataset.dataset import DatasetTagBindingApi
 
         mock_current_user.__class__ = Account
@@ -1003,7 +1014,37 @@ class TestDatasetTagUnbindingApiPost:
         self,
         mock_current_user,
         mock_tag_svc,
-        app,
+        app: Flask,
+    ):
+        from controllers.service_api.dataset.dataset import DatasetTagUnbindingApi
+
+        mock_current_user.__class__ = Account
+        mock_current_user.has_edit_permission = True
+        mock_current_user.is_dataset_editor = True
+        mock_tag_svc.delete_tag_binding.return_value = None
+
+        with app.test_request_context(
+            "/datasets/tags/unbinding",
+            method="POST",
+            json={"tag_ids": ["tag-1"], "target_id": "ds-1"},
+        ):
+            api = DatasetTagUnbindingApi()
+            result = api.post(_=None)
+
+        assert result == ("", 204)
+        from services.tag_service import TagBindingDeletePayload
+
+        mock_tag_svc.delete_tag_binding.assert_called_once_with(
+            TagBindingDeletePayload(tag_ids=["tag-1"], target_id="ds-1", type="knowledge")
+        )
+
+    @patch("controllers.service_api.dataset.dataset.TagService")
+    @patch("controllers.service_api.dataset.dataset.current_user")
+    def test_unbind_legacy_tag_id_success(
+        self,
+        mock_current_user,
+        mock_tag_svc,
+        app: Flask,
     ):
         from controllers.service_api.dataset.dataset import DatasetTagUnbindingApi
 
@@ -1024,11 +1065,11 @@ class TestDatasetTagUnbindingApiPost:
         from services.tag_service import TagBindingDeletePayload
 
         mock_tag_svc.delete_tag_binding.assert_called_once_with(
-            TagBindingDeletePayload(tag_id="tag-1", target_id="ds-1", type="knowledge")
+            TagBindingDeletePayload(tag_ids=["tag-1"], target_id="ds-1", type="knowledge")
         )
 
     @patch("controllers.service_api.dataset.dataset.current_user")
-    def test_unbind_tag_forbidden(self, mock_current_user, app):
+    def test_unbind_tag_forbidden(self, mock_current_user, app: Flask):
         from controllers.service_api.dataset.dataset import DatasetTagUnbindingApi
 
         mock_current_user.__class__ = Account
@@ -1038,7 +1079,7 @@ class TestDatasetTagUnbindingApiPost:
         with app.test_request_context(
             "/datasets/tags/unbinding",
             method="POST",
-            json={"tag_id": "tag-1", "target_id": "ds-1"},
+            json={"tag_ids": ["tag-1"], "target_id": "ds-1"},
         ):
             api = DatasetTagUnbindingApi()
             with pytest.raises(Forbidden):
diff --git a/api/tests/test_containers_integration_tests/controllers/web/test_conversation.py b/api/tests/test_containers_integration_tests/controllers/web/test_conversation.py
index e1e6741014..c34da27ebe 100644
--- a/api/tests/test_containers_integration_tests/controllers/web/test_conversation.py
+++ b/api/tests/test_containers_integration_tests/controllers/web/test_conversation.py
@@ -7,6 +7,7 @@ from unittest.mock import MagicMock, patch
 from uuid import uuid4
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import NotFound
 
 from controllers.web.conversation import (
@@ -34,16 +35,16 @@ def _end_user() -> SimpleNamespace:
 
 class TestConversationListApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_non_chat_mode_raises(self, app) -> None:
+    def test_non_chat_mode_raises(self, app: Flask) -> None:
         with app.test_request_context("/conversations"):
             with pytest.raises(NotChatAppError):
                 ConversationListApi().get(_completion_app(), _end_user())
 
     @patch("controllers.web.conversation.WebConversationService.pagination_by_last_id")
-    def test_happy_path(self, mock_paginate: MagicMock, app) -> None:
+    def test_happy_path(self, mock_paginate: MagicMock, app: Flask) -> None:
         conv_id = str(uuid4())
         conv = SimpleNamespace(
             id=conv_id,
@@ -65,16 +66,16 @@ class TestConversationListApi:
 
 class TestConversationApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_non_chat_mode_raises(self, app) -> None:
+    def test_non_chat_mode_raises(self, app: Flask) -> None:
         with app.test_request_context(f"/conversations/{uuid4()}"):
             with pytest.raises(NotChatAppError):
                 ConversationApi().delete(_completion_app(), _end_user(), uuid4())
 
     @patch("controllers.web.conversation.ConversationService.delete")
-    def test_delete_success(self, mock_delete: MagicMock, app) -> None:
+    def test_delete_success(self, mock_delete: MagicMock, app: Flask) -> None:
         c_id = uuid4()
         with app.test_request_context(f"/conversations/{c_id}"):
             result, status = ConversationApi().delete(_chat_app(), _end_user(), c_id)
@@ -83,7 +84,7 @@ class TestConversationApi:
         assert result["result"] == "success"
 
     @patch("controllers.web.conversation.ConversationService.delete", side_effect=ConversationNotExistsError())
-    def test_delete_not_found(self, mock_delete: MagicMock, app) -> None:
+    def test_delete_not_found(self, mock_delete: MagicMock, app: Flask) -> None:
         c_id = uuid4()
         with app.test_request_context(f"/conversations/{c_id}"):
             with pytest.raises(NotFound, match="Conversation Not Exists"):
@@ -92,17 +93,17 @@ class TestConversationApi:
 
 class TestConversationRenameApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_non_chat_mode_raises(self, app) -> None:
+    def test_non_chat_mode_raises(self, app: Flask) -> None:
         with app.test_request_context(f"/conversations/{uuid4()}/name", method="POST", json={"name": "x"}):
             with pytest.raises(NotChatAppError):
                 ConversationRenameApi().post(_completion_app(), _end_user(), uuid4())
 
     @patch("controllers.web.conversation.ConversationService.rename")
     @patch("controllers.web.conversation.web_ns")
-    def test_rename_success(self, mock_ns: MagicMock, mock_rename: MagicMock, app) -> None:
+    def test_rename_success(self, mock_ns: MagicMock, mock_rename: MagicMock, app: Flask) -> None:
         c_id = uuid4()
         mock_ns.payload = {"name": "New Name", "auto_generate": False}
         conv = SimpleNamespace(
@@ -126,7 +127,7 @@ class TestConversationRenameApi:
         side_effect=ConversationNotExistsError(),
     )
     @patch("controllers.web.conversation.web_ns")
-    def test_rename_not_found(self, mock_ns: MagicMock, mock_rename: MagicMock, app) -> None:
+    def test_rename_not_found(self, mock_ns: MagicMock, mock_rename: MagicMock, app: Flask) -> None:
         c_id = uuid4()
         mock_ns.payload = {"name": "X", "auto_generate": False}
 
@@ -137,16 +138,16 @@ class TestConversationRenameApi:
 
 class TestConversationPinApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_non_chat_mode_raises(self, app) -> None:
+    def test_non_chat_mode_raises(self, app: Flask) -> None:
         with app.test_request_context(f"/conversations/{uuid4()}/pin", method="PATCH"):
             with pytest.raises(NotChatAppError):
                 ConversationPinApi().patch(_completion_app(), _end_user(), uuid4())
 
     @patch("controllers.web.conversation.WebConversationService.pin")
-    def test_pin_success(self, mock_pin: MagicMock, app) -> None:
+    def test_pin_success(self, mock_pin: MagicMock, app: Flask) -> None:
         c_id = uuid4()
         with app.test_request_context(f"/conversations/{c_id}/pin", method="PATCH"):
             result = ConversationPinApi().patch(_chat_app(), _end_user(), c_id)
@@ -154,7 +155,7 @@ class TestConversationPinApi:
         assert result["result"] == "success"
 
     @patch("controllers.web.conversation.WebConversationService.pin", side_effect=ConversationNotExistsError())
-    def test_pin_not_found(self, mock_pin: MagicMock, app) -> None:
+    def test_pin_not_found(self, mock_pin: MagicMock, app: Flask) -> None:
         c_id = uuid4()
         with app.test_request_context(f"/conversations/{c_id}/pin", method="PATCH"):
             with pytest.raises(NotFound):
@@ -163,16 +164,16 @@ class TestConversationPinApi:
 
 class TestConversationUnPinApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
-    def test_non_chat_mode_raises(self, app) -> None:
+    def test_non_chat_mode_raises(self, app: Flask) -> None:
         with app.test_request_context(f"/conversations/{uuid4()}/unpin", method="PATCH"):
             with pytest.raises(NotChatAppError):
                 ConversationUnPinApi().patch(_completion_app(), _end_user(), uuid4())
 
     @patch("controllers.web.conversation.WebConversationService.unpin")
-    def test_unpin_success(self, mock_unpin: MagicMock, app) -> None:
+    def test_unpin_success(self, mock_unpin: MagicMock, app: Flask) -> None:
         c_id = uuid4()
         with app.test_request_context(f"/conversations/{c_id}/unpin", method="PATCH"):
             result = ConversationUnPinApi().patch(_chat_app(), _end_user(), c_id)
diff --git a/api/tests/test_containers_integration_tests/controllers/web/test_web_forgot_password.py b/api/tests/test_containers_integration_tests/controllers/web/test_web_forgot_password.py
index 635cfee2da..2c6a990240 100644
--- a/api/tests/test_containers_integration_tests/controllers/web/test_web_forgot_password.py
+++ b/api/tests/test_containers_integration_tests/controllers/web/test_web_forgot_password.py
@@ -7,6 +7,7 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock, patch
 
 import pytest
+from flask import Flask
 
 from controllers.web.forgot_password import (
     ForgotPasswordCheckApi,
@@ -29,7 +30,7 @@ def _patch_wraps():
 
 class TestForgotPasswordSendEmailApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
     @patch("controllers.web.forgot_password.AccountService.send_reset_password_email")
@@ -42,7 +43,7 @@ class TestForgotPasswordSendEmailApi:
         mock_rate_limit,
         mock_get_account,
         mock_send_mail,
-        app,
+        app: Flask,
     ):
         mock_account = MagicMock()
         mock_get_account.return_value = mock_account
@@ -64,7 +65,7 @@ class TestForgotPasswordSendEmailApi:
 
 class TestForgotPasswordCheckApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
     @patch("controllers.web.forgot_password.AccountService.reset_forgot_password_error_rate_limit")
@@ -81,7 +82,7 @@ class TestForgotPasswordCheckApi:
         mock_revoke_token,
         mock_generate_token,
         mock_reset_rate,
-        app,
+        app: Flask,
     ):
         mock_is_rate_limit.return_value = False
         mock_get_data.return_value = {"email": "User@Example.com", "code": "1234"}
@@ -117,7 +118,7 @@ class TestForgotPasswordCheckApi:
         mock_revoke_token,
         mock_generate_token,
         mock_reset_rate,
-        app,
+        app: Flask,
     ):
         mock_is_rate_limit.return_value = False
         mock_get_data.return_value = {"email": "MixedCase@Example.com", "code": "5678"}
@@ -142,7 +143,7 @@ class TestForgotPasswordCheckApi:
 
 class TestForgotPasswordResetApi:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
     @patch("controllers.web.forgot_password.ForgotPasswordResetApi._update_existing_account")
@@ -157,7 +158,7 @@ class TestForgotPasswordResetApi:
         mock_db,
         mock_get_account,
         mock_update_account,
-        app,
+        app: Flask,
     ):
         mock_get_reset_data.return_value = {"phase": "reset", "email": "User@Example.com", "code": "1234"}
         mock_account = MagicMock()
@@ -194,7 +195,7 @@ class TestForgotPasswordResetApi:
         mock_db,
         mock_token_bytes,
         mock_hash_password,
-        app,
+        app: Flask,
     ):
         mock_get_reset_data.return_value = {"phase": "reset", "email": "user@example.com"}
         account = MagicMock()
diff --git a/api/tests/test_containers_integration_tests/controllers/web/test_wraps.py b/api/tests/test_containers_integration_tests/controllers/web/test_wraps.py
index 19833cc772..1bc4253cb9 100644
--- a/api/tests/test_containers_integration_tests/controllers/web/test_wraps.py
+++ b/api/tests/test_containers_integration_tests/controllers/web/test_wraps.py
@@ -8,6 +8,7 @@ from unittest.mock import MagicMock, patch
 from uuid import uuid4
 
 import pytest
+from flask import Flask
 from sqlalchemy.orm import Session
 from werkzeug.exceptions import BadRequest, NotFound, Unauthorized
 
@@ -182,7 +183,7 @@ class TestValidateUserAccessibility:
 
 class TestDecodeJwtToken:
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
     def _create_app_site_enduser(self, db_session: Session, *, enable_site: bool = True):
@@ -239,7 +240,7 @@ class TestDecodeJwtToken:
         mock_access_mode: MagicMock,
         mock_validate_token: MagicMock,
         mock_validate_user: MagicMock,
-        app,
+        app: Flask,
         db_session_with_containers: Session,
     ) -> None:
         app_model, site, end_user = self._create_app_site_enduser(db_session_with_containers)
@@ -276,7 +277,7 @@ class TestDecodeJwtToken:
         mock_extract: MagicMock,
         mock_passport_cls: MagicMock,
         mock_features: MagicMock,
-        app,
+        app: Flask,
     ) -> None:
         non_existent_id = str(uuid4())
         mock_extract.return_value = "jwt-token"
@@ -299,7 +300,7 @@ class TestDecodeJwtToken:
         mock_extract: MagicMock,
         mock_passport_cls: MagicMock,
         mock_features: MagicMock,
-        app,
+        app: Flask,
         db_session_with_containers: Session,
     ) -> None:
         app_model, site, end_user = self._create_app_site_enduser(db_session_with_containers, enable_site=False)
@@ -324,7 +325,7 @@ class TestDecodeJwtToken:
         mock_extract: MagicMock,
         mock_passport_cls: MagicMock,
         mock_features: MagicMock,
-        app,
+        app: Flask,
         db_session_with_containers: Session,
     ) -> None:
         app_model, site, _ = self._create_app_site_enduser(db_session_with_containers)
@@ -350,7 +351,7 @@ class TestDecodeJwtToken:
         mock_extract: MagicMock,
         mock_passport_cls: MagicMock,
         mock_features: MagicMock,
-        app,
+        app: Flask,
         db_session_with_containers: Session,
     ) -> None:
         app_model, site, end_user = self._create_app_site_enduser(db_session_with_containers)
diff --git a/api/tests/test_containers_integration_tests/core/app/layers/test_pause_state_persist_layer.py b/api/tests/test_containers_integration_tests/core/app/layers/test_pause_state_persist_layer.py
index c342e8994b..66b3392a4b 100644
--- a/api/tests/test_containers_integration_tests/core/app/layers/test_pause_state_persist_layer.py
+++ b/api/tests/test_containers_integration_tests/core/app/layers/test_pause_state_persist_layer.py
@@ -85,7 +85,7 @@ class TestPauseStatePersistenceLayerTestContainers:
         return WorkflowRunService(engine)
 
     @pytest.fixture(autouse=True)
-    def setup_test_data(self, db_session_with_containers, file_service, workflow_run_service):
+    def setup_test_data(self, db_session_with_containers: Session, file_service, workflow_run_service):
         """Set up test data for each test method using TestContainers."""
         # Create test tenant and account
         from models.account import AccountStatus, Tenant, TenantAccountJoin, TenantAccountRole, TenantStatus
@@ -210,7 +210,9 @@ class TestPauseStatePersistenceLayerTestContainers:
         execution_id = workflow_run_id or getattr(self, "test_workflow_run_id", None) or str(uuid.uuid4())
 
         # Create variable pool
-        variable_pool = VariablePool(system_variables=build_system_variables(workflow_execution_id=execution_id))
+        variable_pool = VariablePool.from_bootstrap(
+            system_variables=build_system_variables(workflow_execution_id=execution_id)
+        )
         if variables:
             for (node_id, var_key), value in variables.items():
                 variable_pool.add([node_id, var_key], value)
@@ -295,7 +297,7 @@ class TestPauseStatePersistenceLayerTestContainers:
             generate_entity=entity,
         )
 
-    def test_complete_pause_flow_with_real_dependencies(self, db_session_with_containers):
+    def test_complete_pause_flow_with_real_dependencies(self, db_session_with_containers: Session):
         """Test complete pause flow: event -> state serialization -> database save -> storage save."""
         # Arrange
         layer = self._create_pause_state_persistence_layer()
@@ -352,7 +354,7 @@ class TestPauseStatePersistenceLayerTestContainers:
         assert isinstance(persisted_entity, WorkflowAppGenerateEntity)
         assert persisted_entity.workflow_execution_id == self.test_workflow_run_id
 
-    def test_state_persistence_and_retrieval(self, db_session_with_containers):
+    def test_state_persistence_and_retrieval(self, db_session_with_containers: Session):
         """Test that pause state can be persisted and retrieved correctly."""
         # Arrange
         layer = self._create_pause_state_persistence_layer()
@@ -402,7 +404,7 @@ class TestPauseStatePersistenceLayerTestContainers:
         assert retrieved_state["node_run_steps"] == 10
         assert resumption_context.get_generate_entity().workflow_execution_id == self.test_workflow_run_id
 
-    def test_database_transaction_handling(self, db_session_with_containers):
+    def test_database_transaction_handling(self, db_session_with_containers: Session):
         """Test that database transactions are handled correctly."""
         # Arrange
         layer = self._create_pause_state_persistence_layer()
@@ -433,7 +435,7 @@ class TestPauseStatePersistenceLayerTestContainers:
             assert pause_model.resumed_at is None
             assert pause_model.state_object_key != ""
 
-    def test_file_storage_integration(self, db_session_with_containers):
+    def test_file_storage_integration(self, db_session_with_containers: Session):
         """Test integration with file storage system."""
         # Arrange
         layer = self._create_pause_state_persistence_layer()
@@ -467,7 +469,7 @@ class TestPauseStatePersistenceLayerTestContainers:
         assert resumption_context.serialized_graph_runtime_state == graph_runtime_state.dumps()
         assert resumption_context.get_generate_entity().workflow_execution_id == self.test_workflow_run_id
 
-    def test_workflow_with_different_creators(self, db_session_with_containers):
+    def test_workflow_with_different_creators(self, db_session_with_containers: Session):
         """Test pause state with workflows created by different users."""
         # Arrange - Create workflow with different creator
         different_user_id = str(uuid.uuid4())
@@ -532,7 +534,7 @@ class TestPauseStatePersistenceLayerTestContainers:
         resumption_context = WorkflowResumptionContext.loads(pause_entity.get_state().decode())
         assert resumption_context.get_generate_entity().workflow_execution_id == different_workflow_run.id
 
-    def test_layer_ignores_non_pause_events(self, db_session_with_containers):
+    def test_layer_ignores_non_pause_events(self, db_session_with_containers: Session):
         """Test that layer ignores non-pause events."""
         # Arrange
         layer = self._create_pause_state_persistence_layer()
@@ -562,7 +564,7 @@ class TestPauseStatePersistenceLayerTestContainers:
         ).all()
         assert len(pause_states) == 0
 
-    def test_layer_requires_initialization(self, db_session_with_containers):
+    def test_layer_requires_initialization(self, db_session_with_containers: Session):
         """Test that layer requires proper initialization before handling events."""
         # Arrange
         layer = self._create_pause_state_persistence_layer()
diff --git a/api/tests/test_containers_integration_tests/core/rag/pipeline/test_queue_integration.py b/api/tests/test_containers_integration_tests/core/rag/pipeline/test_queue_integration.py
index a60159c66a..d1af0a56ef 100644
--- a/api/tests/test_containers_integration_tests/core/rag/pipeline/test_queue_integration.py
+++ b/api/tests/test_containers_integration_tests/core/rag/pipeline/test_queue_integration.py
@@ -15,11 +15,14 @@ from uuid import uuid4
 
 import pytest
 from faker import Faker
+from sqlalchemy.orm import Session
 
 from core.rag.pipeline.queue import TaskWrapper, TenantIsolatedTaskQueue
 from extensions.ext_redis import redis_client
 from models import Account, AccountStatus, Tenant, TenantAccountJoin, TenantAccountRole, TenantStatus
 
+TenantAndAccount = tuple[Tenant, Account]
+
 
 @dataclass
 class TestTask:
@@ -40,7 +43,7 @@ class TestTenantIsolatedTaskQueueIntegration:
         return Faker()
 
     @pytest.fixture
-    def test_tenant_and_account(self, db_session_with_containers, fake):
+    def test_tenant_and_account(self, db_session_with_containers: Session, fake: Faker):
         """Create test tenant and account for testing."""
         # Create account
         account = Account(
@@ -73,18 +76,18 @@ class TestTenantIsolatedTaskQueueIntegration:
         return tenant, account
 
     @pytest.fixture
-    def test_queue(self, test_tenant_and_account):
+    def test_queue(self, test_tenant_and_account: TenantAndAccount):
         """Create a generic test queue for testing."""
         tenant, _ = test_tenant_and_account
         return TenantIsolatedTaskQueue(tenant.id, "test_queue")
 
     @pytest.fixture
-    def secondary_queue(self, test_tenant_and_account):
+    def secondary_queue(self, test_tenant_and_account: TenantAndAccount):
         """Create a secondary test queue for testing isolation."""
         tenant, _ = test_tenant_and_account
         return TenantIsolatedTaskQueue(tenant.id, "secondary_queue")
 
-    def test_queue_initialization(self, test_tenant_and_account):
+    def test_queue_initialization(self, test_tenant_and_account: TenantAndAccount):
         """Test queue initialization with correct key generation."""
         tenant, _ = test_tenant_and_account
         queue = TenantIsolatedTaskQueue(tenant.id, "test-key")
@@ -94,7 +97,9 @@ class TestTenantIsolatedTaskQueueIntegration:
         assert queue._queue == f"tenant_self_test-key_task_queue:{tenant.id}"
         assert queue._task_key == f"tenant_test-key_task:{tenant.id}"
 
-    def test_tenant_isolation(self, test_tenant_and_account, db_session_with_containers, fake):
+    def test_tenant_isolation(
+        self, test_tenant_and_account: TenantAndAccount, db_session_with_containers: Session, fake: Faker
+    ):
         """Test that different tenants have isolated queues."""
         tenant1, _ = test_tenant_and_account
 
@@ -114,7 +119,7 @@ class TestTenantIsolatedTaskQueueIntegration:
         assert queue1._queue == f"tenant_self_same-key_task_queue:{tenant1.id}"
         assert queue2._queue == f"tenant_self_same-key_task_queue:{tenant2.id}"
 
-    def test_key_isolation(self, test_tenant_and_account):
+    def test_key_isolation(self, test_tenant_and_account: TenantAndAccount):
         """Test that different keys have isolated queues."""
         tenant, _ = test_tenant_and_account
         queue1 = TenantIsolatedTaskQueue(tenant.id, "key1")
@@ -176,7 +181,7 @@ class TestTenantIsolatedTaskQueueIntegration:
         assert len(remaining_tasks) == 2
         assert remaining_tasks == ["task4", "task5"]
 
-    def test_push_and_pull_complex_objects(self, test_queue, fake):
+    def test_push_and_pull_complex_objects(self, test_queue, fake: Faker):
         """Test pushing and pulling complex object tasks."""
         # Create complex task objects as dictionaries (not dataclass instances)
         tasks = [
@@ -218,7 +223,7 @@ class TestTenantIsolatedTaskQueueIntegration:
             assert pulled_task["data"] == original_task["data"]
             assert pulled_task["metadata"] == original_task["metadata"]
 
-    def test_mixed_task_types(self, test_queue, fake):
+    def test_mixed_task_types(self, test_queue, fake: Faker):
         """Test pushing and pulling mixed string and object tasks."""
         string_task = "simple_string_task"
         object_task = {
@@ -267,7 +272,7 @@ class TestTenantIsolatedTaskQueueIntegration:
         # Verify task key has expired
         assert test_queue.get_task_key() is None
 
-    def test_large_task_batch(self, test_queue, fake):
+    def test_large_task_batch(self, test_queue, fake: Faker):
         """Test handling large batches of tasks."""
         # Create large batch of tasks
         large_batch = []
@@ -292,7 +297,7 @@ class TestTenantIsolatedTaskQueueIntegration:
             assert isinstance(task, dict)
             assert task["index"] == i  # FIFO order
 
-    def test_queue_operations_isolation(self, test_tenant_and_account, fake):
+    def test_queue_operations_isolation(self, test_tenant_and_account: TenantAndAccount, fake: Faker):
         """Test concurrent operations on different queues."""
         tenant, _ = test_tenant_and_account
 
@@ -312,7 +317,7 @@ class TestTenantIsolatedTaskQueueIntegration:
         assert tasks2 == ["task1_queue2", "task2_queue2"]
         assert tasks1 != tasks2
 
-    def test_task_wrapper_serialization_roundtrip(self, test_queue, fake):
+    def test_task_wrapper_serialization_roundtrip(self, test_queue, fake: Faker):
         """Test TaskWrapper serialization and deserialization roundtrip."""
         # Create complex nested data
         complex_data = {
@@ -346,7 +351,7 @@ class TestTenantIsolatedTaskQueueIntegration:
         task = test_queue.pull_tasks(1)
         assert task[0] == invalid_json_task
 
-    def test_real_world_batch_processing_scenario(self, test_queue, fake):
+    def test_real_world_batch_processing_scenario(self, test_queue, fake: Faker):
         """Test realistic batch processing scenario."""
         # Simulate batch processing tasks
         batch_tasks = []
@@ -403,7 +408,7 @@ class TestTenantIsolatedTaskQueueCompatibility:
         return Faker()
 
     @pytest.fixture
-    def test_tenant_and_account(self, db_session_with_containers, fake):
+    def test_tenant_and_account(self, db_session_with_containers: Session, fake: Faker):
         """Create test tenant and account for testing."""
         # Create account
         account = Account(
@@ -435,7 +440,7 @@ class TestTenantIsolatedTaskQueueCompatibility:
 
         return tenant, account
 
-    def test_legacy_string_queue_compatibility(self, test_tenant_and_account, fake):
+    def test_legacy_string_queue_compatibility(self, test_tenant_and_account: TenantAndAccount, fake: Faker):
         """
         Test compatibility with legacy queues containing only string data.
 
@@ -465,7 +470,7 @@ class TestTenantIsolatedTaskQueueCompatibility:
         expected_order = ["legacy_task_1", "legacy_task_2", "legacy_task_3", "legacy_task_4", "legacy_task_5"]
         assert pulled_tasks == expected_order
 
-    def test_legacy_queue_migration_scenario(self, test_tenant_and_account, fake):
+    def test_legacy_queue_migration_scenario(self, test_tenant_and_account: TenantAndAccount, fake: Faker):
         """
         Test complete migration scenario from legacy to new system.
 
@@ -546,7 +551,7 @@ class TestTenantIsolatedTaskQueueCompatibility:
             assert task["tenant_id"] == tenant.id
             assert task["processing_type"] == "new_system"
 
-    def test_legacy_queue_error_recovery(self, test_tenant_and_account, fake):
+    def test_legacy_queue_error_recovery(self, test_tenant_and_account: TenantAndAccount, fake: Faker):
         """
         Test error recovery when legacy queue contains malformed data.
 
diff --git a/api/tests/test_containers_integration_tests/core/rag/retrieval/test_dataset_retrieval_integration.py b/api/tests/test_containers_integration_tests/core/rag/retrieval/test_dataset_retrieval_integration.py
index 00d7496a40..9da6b04a2c 100644
--- a/api/tests/test_containers_integration_tests/core/rag/retrieval/test_dataset_retrieval_integration.py
+++ b/api/tests/test_containers_integration_tests/core/rag/retrieval/test_dataset_retrieval_integration.py
@@ -3,6 +3,7 @@ from unittest.mock import patch
 
 import pytest
 from faker import Faker
+from sqlalchemy.orm import Session
 
 from core.rag.index_processor.constant.index_type import IndexStructureType, IndexTechniqueType
 from core.rag.retrieval.dataset_retrieval import DatasetRetrieval
@@ -15,7 +16,7 @@ from tests.test_containers_integration_tests.helpers import generate_valid_passw
 
 class TestGetAvailableDatasetsIntegration:
     def test_returns_datasets_with_available_documents(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         # Arrange
         fake = Faker()
@@ -77,7 +78,7 @@ class TestGetAvailableDatasetsIntegration:
         assert result[0].name == dataset.name
 
     def test_filters_out_datasets_with_only_archived_documents(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         # Arrange
         fake = Faker()
@@ -130,7 +131,7 @@ class TestGetAvailableDatasetsIntegration:
         assert len(result) == 0
 
     def test_filters_out_datasets_with_only_disabled_documents(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         # Arrange
         fake = Faker()
@@ -183,7 +184,7 @@ class TestGetAvailableDatasetsIntegration:
         assert len(result) == 0
 
     def test_filters_out_datasets_with_non_completed_documents(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         # Arrange
         fake = Faker()
@@ -236,7 +237,7 @@ class TestGetAvailableDatasetsIntegration:
         assert len(result) == 0
 
     def test_includes_external_datasets_without_documents(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test that external datasets are returned even with no available documents.
@@ -280,7 +281,7 @@ class TestGetAvailableDatasetsIntegration:
         assert result[0].id == dataset.id
         assert result[0].provider == "external"
 
-    def test_filters_by_tenant_id(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_filters_by_tenant_id(self, db_session_with_containers: Session, mock_external_service_dependencies):
         # Arrange
         fake = Faker()
 
@@ -356,7 +357,7 @@ class TestGetAvailableDatasetsIntegration:
         assert result[0].tenant_id == tenant1.id
 
     def test_returns_empty_list_when_no_datasets_found(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         # Arrange
         fake = Faker()
@@ -379,7 +380,9 @@ class TestGetAvailableDatasetsIntegration:
         # Assert
         assert result == []
 
-    def test_returns_only_requested_dataset_ids(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_returns_only_requested_dataset_ids(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         # Arrange
         fake = Faker()
 
@@ -439,7 +442,7 @@ class TestGetAvailableDatasetsIntegration:
 
 class TestKnowledgeRetrievalIntegration:
     def test_knowledge_retrieval_with_available_datasets(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         # Arrange
         fake = Faker()
@@ -507,7 +510,7 @@ class TestKnowledgeRetrievalIntegration:
                     assert isinstance(result, list)
 
     def test_knowledge_retrieval_no_available_datasets(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         # Arrange
         fake = Faker()
@@ -555,7 +558,7 @@ class TestKnowledgeRetrievalIntegration:
             assert result == []
 
     def test_knowledge_retrieval_rate_limit_exceeded(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         # Arrange
         fake = Faker()
diff --git a/api/tests/test_containers_integration_tests/core/repositories/test_human_input_form_repository_impl.py b/api/tests/test_containers_integration_tests/core/repositories/test_human_input_form_repository_impl.py
index 6524d6ce61..676833ce98 100644
--- a/api/tests/test_containers_integration_tests/core/repositories/test_human_input_form_repository_impl.py
+++ b/api/tests/test_containers_integration_tests/core/repositories/test_human_input_form_repository_impl.py
@@ -17,7 +17,7 @@ from core.workflow.human_input_adapter import (
     MemberRecipient,
     WebAppDeliveryMethod,
 )
-from graphon.nodes.human_input.entities import FormDefinition, HumanInputNodeData, UserAction
+from graphon.nodes.human_input.entities import FormDefinition, HumanInputNodeData, UserActionConfig
 from models.account import (
     Account,
     AccountStatus,
@@ -69,7 +69,7 @@ def _build_form_params(delivery_methods: list[DeliveryChannelConfig]) -> FormCre
         title="Human Approval",
         delivery_methods=delivery_methods,
         form_content="<p>Approve?</p>",
-        user_actions=[UserAction(id="approve", title="Approve")],
+        user_actions=[UserActionConfig(id="approve", title="Approve")],
     )
     return FormCreateParams(
         workflow_execution_id=str(uuid4()),
@@ -185,7 +185,7 @@ class TestHumanInputFormRepositoryImplWithContainers:
                 title="Human Approval",
                 form_content="<p>Approve?</p>",
                 inputs=[],
-                user_actions=[UserAction(id="approve", title="Approve")],
+                user_actions=[UserActionConfig(id="approve", title="Approve")],
             ),
             rendered_content="<p>Approve?</p>",
             delivery_methods=[],
@@ -220,7 +220,7 @@ class TestHumanInputFormRepositoryImplWithContainers:
                 title="Human Approval",
                 form_content="<p>Approve?</p>",
                 inputs=[],
-                user_actions=[UserAction(id="approve", title="Approve")],
+                user_actions=[UserActionConfig(id="approve", title="Approve")],
                 delivery_methods=[WebAppDeliveryMethod()],
             ),
             rendered_content="<p>Approve?</p>",
diff --git a/api/tests/test_containers_integration_tests/core/workflow/test_human_input_resume_node_execution.py b/api/tests/test_containers_integration_tests/core/workflow/test_human_input_resume_node_execution.py
index 5aed230cd4..103fe88df7 100644
--- a/api/tests/test_containers_integration_tests/core/workflow/test_human_input_resume_node_execution.py
+++ b/api/tests/test_containers_integration_tests/core/workflow/test_human_input_resume_node_execution.py
@@ -13,7 +13,7 @@ from core.app.workflow.layers import PersistenceWorkflowInfo, WorkflowPersistenc
 from core.repositories.human_input_repository import HumanInputFormEntity, HumanInputFormRepository
 from core.repositories.sqlalchemy_workflow_execution_repository import SQLAlchemyWorkflowExecutionRepository
 from core.repositories.sqlalchemy_workflow_node_execution_repository import SQLAlchemyWorkflowNodeExecutionRepository
-from core.workflow.node_runtime import DifyHumanInputNodeRuntime
+from core.workflow.node_runtime import DifyFileReferenceFactory, DifyHumanInputNodeRuntime
 from core.workflow.system_variables import build_system_variables
 from graphon.enums import WorkflowType
 from graphon.graph import Graph
@@ -21,7 +21,7 @@ from graphon.graph_engine import GraphEngine
 from graphon.graph_engine.command_channels import InMemoryChannel
 from graphon.nodes.end.end_node import EndNode
 from graphon.nodes.end.entities import EndNodeData
-from graphon.nodes.human_input.entities import HumanInputNodeData, UserAction
+from graphon.nodes.human_input.entities import HumanInputNodeData, UserActionConfig
 from graphon.nodes.human_input.enums import HumanInputFormStatus
 from graphon.nodes.human_input.human_input_node import HumanInputNode
 from graphon.nodes.start.entities import StartNodeData
@@ -66,7 +66,7 @@ def _mock_form_repository_with_submission(action_id: str) -> HumanInputFormRepos
 
 
 def _build_runtime_state(workflow_execution_id: str, app_id: str, workflow_id: str, user_id: str) -> GraphRuntimeState:
-    variable_pool = VariablePool(
+    variable_pool = VariablePool.from_bootstrap(
         system_variables=build_system_variables(
             workflow_execution_id=workflow_execution_id,
             app_id=app_id,
@@ -102,7 +102,7 @@ def _build_graph(
     start_data = StartNodeData(title="start", variables=[])
     start_node = StartNode(
         node_id="start",
-        config=start_data,
+        data=start_data,
         graph_init_params=params,
         graph_runtime_state=runtime_state,
     )
@@ -112,15 +112,16 @@ def _build_graph(
         form_content="Awaiting human input",
         inputs=[],
         user_actions=[
-            UserAction(id="continue", title="Continue"),
+            UserActionConfig(id="continue", title="Continue"),
         ],
     )
     human_node = HumanInputNode(
         node_id="human",
-        config=human_data,
+        data=human_data,
         graph_init_params=params,
         graph_runtime_state=runtime_state,
         form_repository=form_repository,
+        file_reference_factory=DifyFileReferenceFactory(params.run_context),
         runtime=DifyHumanInputNodeRuntime(params.run_context),
     )
 
@@ -131,7 +132,7 @@ def _build_graph(
     )
     end_node = EndNode(
         node_id="end",
-        config=end_data,
+        data=end_data,
         graph_init_params=params,
         graph_runtime_state=runtime_state,
     )
diff --git a/api/tests/test_containers_integration_tests/helpers/execution_extra_content.py b/api/tests/test_containers_integration_tests/helpers/execution_extra_content.py
index 2fd289dfbc..2a1638d126 100644
--- a/api/tests/test_containers_integration_tests/helpers/execution_extra_content.py
+++ b/api/tests/test_containers_integration_tests/helpers/execution_extra_content.py
@@ -5,7 +5,7 @@ from datetime import timedelta
 from decimal import Decimal
 from uuid import uuid4
 
-from graphon.nodes.human_input.entities import FormDefinition, UserAction
+from graphon.nodes.human_input.entities import FormDefinition, UserActionConfig
 from libs.datetime_utils import naive_utc_now
 from models.account import Account, Tenant, TenantAccountJoin
 from models.enums import ConversationFromSource, InvokeFrom
@@ -116,7 +116,7 @@ def create_human_input_message_fixture(db_session) -> HumanInputMessageFixture:
     form_definition = FormDefinition(
         form_content="content",
         inputs=[],
-        user_actions=[UserAction(id=action_id, title=action_text)],
+        user_actions=[UserActionConfig(id=action_id, title=action_text)],
         rendered_content="Rendered block",
         expiration_time=naive_utc_now() + timedelta(days=1),
         node_title=node_title,
diff --git a/api/tests/test_containers_integration_tests/libs/broadcast_channel/redis/test_sharded_channel.py b/api/tests/test_containers_integration_tests/libs/broadcast_channel/redis/test_sharded_channel.py
index 43915a204d..84c1d0ca41 100644
--- a/api/tests/test_containers_integration_tests/libs/broadcast_channel/redis/test_sharded_channel.py
+++ b/api/tests/test_containers_integration_tests/libs/broadcast_channel/redis/test_sharded_channel.py
@@ -8,6 +8,7 @@ Covers real Redis 7+ sharded pub/sub interactions including:
 - Resource cleanup accounting via PUBSUB SHARDNUMSUB
 """
 
+import socket
 import threading
 import time
 import uuid
@@ -356,10 +357,17 @@ class TestShardedRedisBroadcastChannelClusterIntegration:
     def _get_test_topic_name(cls) -> str:
         return f"test_sharded_cluster_topic_{uuid.uuid4()}"
 
+    @staticmethod
+    def _resolve_announced_ip(host: str) -> str:
+        """Resolve the container host name to a literal IP accepted by Redis cluster config."""
+        return socket.getaddrinfo(host, None, type=socket.SOCK_STREAM)[0][4][0]
+
     @staticmethod
     def _ensure_single_node_cluster(host: str, port: int) -> None:
+        """Bootstrap a single-node cluster using a literal IP for Redis node advertisement."""
         client = redis.Redis(host=host, port=port, decode_responses=False)
-        client.config_set("cluster-announce-ip", host)
+        announced_ip = TestShardedRedisBroadcastChannelClusterIntegration._resolve_announced_ip(host)
+        client.config_set("cluster-announce-ip", announced_ip)
         client.config_set("cluster-announce-port", port)
         slots = client.execute_command("CLUSTER", "SLOTS")
         if not slots:
diff --git a/api/tests/test_containers_integration_tests/libs/test_rate_limiter_integration.py b/api/tests/test_containers_integration_tests/libs/test_rate_limiter_integration.py
index 178fc2e4fb..390795486b 100644
--- a/api/tests/test_containers_integration_tests/libs/test_rate_limiter_integration.py
+++ b/api/tests/test_containers_integration_tests/libs/test_rate_limiter_integration.py
@@ -11,7 +11,7 @@ from libs import helper as helper_module
 
 
 @pytest.mark.usefixtures("flask_app_with_containers")
-def test_rate_limiter_counts_multiple_attempts_in_same_second(monkeypatch):
+def test_rate_limiter_counts_multiple_attempts_in_same_second(monkeypatch: pytest.MonkeyPatch):
     prefix = f"test_rate_limit:{uuid.uuid4().hex}"
     limiter = helper_module.RateLimiter(prefix=prefix, max_attempts=2, time_window=60)
     key = limiter._get_key("203.0.113.10")
diff --git a/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py b/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py
index d9828e19c5..1ffc84c167 100644
--- a/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py
+++ b/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py
@@ -17,7 +17,7 @@ from extensions.ext_storage import storage
 from graphon.entities import WorkflowExecution
 from graphon.entities.pause_reason import HumanInputRequired, PauseReasonType
 from graphon.enums import WorkflowExecutionStatus
-from graphon.nodes.human_input.entities import FormDefinition, FormInput, UserAction
+from graphon.nodes.human_input.entities import FormDefinition, ParagraphInputConfig, UserActionConfig
 from graphon.nodes.human_input.enums import FormInputType, HumanInputFormStatus
 from libs.datetime_utils import naive_utc_now
 from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom
@@ -642,8 +642,8 @@ class TestBuildHumanInputRequiredReason:
         expiration_time = naive_utc_now()
         form_definition = FormDefinition(
             form_content="content",
-            inputs=[FormInput(type=FormInputType.TEXT_INPUT, output_variable_name="name")],
-            user_actions=[UserAction(id="approve", title="Approve")],
+            inputs=[ParagraphInputConfig(type=FormInputType.PARAGRAPH, output_variable_name="name")],
+            user_actions=[UserActionConfig(id="approve", title="Approve")],
             rendered_content="rendered",
             expiration_time=expiration_time,
             default_values={"name": "Alice"},
@@ -754,8 +754,8 @@ class TestBuildHumanInputRequiredReason:
         expiration_time = naive_utc_now()
         form_definition = FormDefinition(
             form_content="content",
-            inputs=[FormInput(type=FormInputType.TEXT_INPUT, output_variable_name="name")],
-            user_actions=[UserAction(id="approve", title="Approve")],
+            inputs=[ParagraphInputConfig(type=FormInputType.PARAGRAPH, output_variable_name="name")],
+            user_actions=[UserActionConfig(id="approve", title="Approve")],
             rendered_content="rendered",
             expiration_time=expiration_time,
             default_values={"name": "Alice"},
diff --git a/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_execution_extra_content_repository.py b/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_execution_extra_content_repository.py
index 54b7afc018..7da6f4a32d 100644
--- a/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_execution_extra_content_repository.py
+++ b/api/tests/test_containers_integration_tests/repositories/test_sqlalchemy_execution_extra_content_repository.py
@@ -15,7 +15,7 @@ import pytest
 from sqlalchemy import Engine, delete, select
 from sqlalchemy.orm import Session, sessionmaker
 
-from graphon.nodes.human_input.entities import FormDefinition, UserAction
+from graphon.nodes.human_input.entities import FormDefinition, UserActionConfig
 from graphon.nodes.human_input.enums import HumanInputFormStatus
 from libs.datetime_utils import naive_utc_now
 from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
@@ -179,7 +179,7 @@ def _create_submitted_form(
     form_definition = FormDefinition(
         form_content="content",
         inputs=[],
-        user_actions=[UserAction(id=action_id, title=action_title)],
+        user_actions=[UserActionConfig(id=action_id, title=action_title)],
         rendered_content="rendered",
         expiration_time=expiration_time,
         node_title=node_title,
@@ -212,7 +212,7 @@ def _create_waiting_form(
     form_definition = FormDefinition(
         form_content="content",
         inputs=[],
-        user_actions=[UserAction(id="approve", title="Approve")],
+        user_actions=[UserActionConfig(id="approve", title="Approve")],
         rendered_content="rendered",
         expiration_time=expiration_time,
         default_values=default_values or {"name": "John"},
diff --git a/api/tests/test_containers_integration_tests/services/auth/test_api_key_auth_service.py b/api/tests/test_containers_integration_tests/services/auth/test_api_key_auth_service.py
index 177fb95ff3..9d588d4c73 100644
--- a/api/tests/test_containers_integration_tests/services/auth/test_api_key_auth_service.py
+++ b/api/tests/test_containers_integration_tests/services/auth/test_api_key_auth_service.py
@@ -5,6 +5,8 @@ from unittest.mock import Mock, patch
 from uuid import uuid4
 
 import pytest
+from flask import Flask
+from sqlalchemy.orm import Session
 
 from models.source import DataSourceApiKeyAuthBinding
 from services.auth.api_key_auth_service import ApiKeyAuthService
@@ -31,7 +33,7 @@ class TestApiKeyAuthService:
     def mock_args(self, category, provider, mock_credentials) -> dict:
         return {"category": category, "provider": provider, "credentials": mock_credentials}
 
-    def _create_binding(self, db_session, *, tenant_id, category, provider, credentials=None, disabled=False):
+    def _create_binding(self, db_session: Session, *, tenant_id, category, provider, credentials=None, disabled=False):
         binding = DataSourceApiKeyAuthBinding(
             tenant_id=tenant_id,
             category=category,
@@ -44,7 +46,7 @@ class TestApiKeyAuthService:
         return binding
 
     def test_get_provider_auth_list_success(
-        self, flask_app_with_containers, db_session_with_containers, tenant_id, category, provider
+        self, flask_app_with_containers: Flask, db_session_with_containers: Session, tenant_id, category, provider
     ):
         self._create_binding(db_session_with_containers, tenant_id=tenant_id, category=category, provider=provider)
         db_session_with_containers.expire_all()
@@ -56,14 +58,16 @@ class TestApiKeyAuthService:
         assert len(tenant_results) == 1
         assert tenant_results[0].provider == provider
 
-    def test_get_provider_auth_list_empty(self, flask_app_with_containers, db_session_with_containers, tenant_id):
+    def test_get_provider_auth_list_empty(
+        self, flask_app_with_containers: Flask, db_session_with_containers: Session, tenant_id
+    ):
         result = ApiKeyAuthService.get_provider_auth_list(tenant_id)
 
         tenant_results = [r for r in result if r.tenant_id == tenant_id]
         assert tenant_results == []
 
     def test_get_provider_auth_list_filters_disabled(
-        self, flask_app_with_containers, db_session_with_containers, tenant_id, category, provider
+        self, flask_app_with_containers: Flask, db_session_with_containers: Session, tenant_id, category, provider
     ):
         self._create_binding(
             db_session_with_containers, tenant_id=tenant_id, category=category, provider=provider, disabled=True
@@ -78,7 +82,13 @@ class TestApiKeyAuthService:
     @patch("services.auth.api_key_auth_service.ApiKeyAuthFactory")
     @patch("services.auth.api_key_auth_service.encrypter")
     def test_create_provider_auth_success(
-        self, mock_encrypter, mock_factory, flask_app_with_containers, db_session_with_containers, tenant_id, mock_args
+        self,
+        mock_encrypter,
+        mock_factory,
+        flask_app_with_containers: Flask,
+        db_session_with_containers: Session,
+        tenant_id,
+        mock_args,
     ):
         mock_auth_instance = Mock()
         mock_auth_instance.validate_credentials.return_value = True
@@ -97,7 +107,7 @@ class TestApiKeyAuthService:
 
     @patch("services.auth.api_key_auth_service.ApiKeyAuthFactory")
     def test_create_provider_auth_validation_failed(
-        self, mock_factory, flask_app_with_containers, db_session_with_containers, tenant_id, mock_args
+        self, mock_factory, flask_app_with_containers: Flask, db_session_with_containers: Session, tenant_id, mock_args
     ):
         mock_auth_instance = Mock()
         mock_auth_instance.validate_credentials.return_value = False
@@ -112,7 +122,13 @@ class TestApiKeyAuthService:
     @patch("services.auth.api_key_auth_service.ApiKeyAuthFactory")
     @patch("services.auth.api_key_auth_service.encrypter")
     def test_create_provider_auth_encrypts_api_key(
-        self, mock_encrypter, mock_factory, flask_app_with_containers, db_session_with_containers, tenant_id, mock_args
+        self,
+        mock_encrypter,
+        mock_factory,
+        flask_app_with_containers: Flask,
+        db_session_with_containers: Session,
+        tenant_id,
+        mock_args,
     ):
         mock_auth_instance = Mock()
         mock_auth_instance.validate_credentials.return_value = True
@@ -128,7 +144,13 @@ class TestApiKeyAuthService:
         mock_encrypter.encrypt_token.assert_called_once_with(tenant_id, original_key)
 
     def test_get_auth_credentials_success(
-        self, flask_app_with_containers, db_session_with_containers, tenant_id, category, provider, mock_credentials
+        self,
+        flask_app_with_containers: Flask,
+        db_session_with_containers: Session,
+        tenant_id,
+        category,
+        provider,
+        mock_credentials,
     ):
         self._create_binding(
             db_session_with_containers,
@@ -144,14 +166,14 @@ class TestApiKeyAuthService:
         assert result == mock_credentials
 
     def test_get_auth_credentials_not_found(
-        self, flask_app_with_containers, db_session_with_containers, tenant_id, category, provider
+        self, flask_app_with_containers: Flask, db_session_with_containers: Session, tenant_id, category, provider
     ):
         result = ApiKeyAuthService.get_auth_credentials(tenant_id, category, provider)
 
         assert result is None
 
     def test_get_auth_credentials_json_parsing(
-        self, flask_app_with_containers, db_session_with_containers, tenant_id, category, provider
+        self, flask_app_with_containers: Flask, db_session_with_containers: Session, tenant_id, category, provider
     ):
         special_credentials = {"auth_type": "api_key", "config": {"api_key": "key_with_中文_and_special_chars_!@#$%"}}
         self._create_binding(
@@ -169,7 +191,7 @@ class TestApiKeyAuthService:
         assert result["config"]["api_key"] == "key_with_中文_and_special_chars_!@#$%"
 
     def test_delete_provider_auth_success(
-        self, flask_app_with_containers, db_session_with_containers, tenant_id, category, provider
+        self, flask_app_with_containers: Flask, db_session_with_containers: Session, tenant_id, category, provider
     ):
         binding = self._create_binding(
             db_session_with_containers, tenant_id=tenant_id, category=category, provider=provider
@@ -183,7 +205,9 @@ class TestApiKeyAuthService:
         remaining = db_session_with_containers.query(DataSourceApiKeyAuthBinding).filter_by(id=binding_id).first()
         assert remaining is None
 
-    def test_delete_provider_auth_not_found(self, flask_app_with_containers, db_session_with_containers, tenant_id):
+    def test_delete_provider_auth_not_found(
+        self, flask_app_with_containers: Flask, db_session_with_containers: Session, tenant_id
+    ):
         # Should not raise when binding not found
         ApiKeyAuthService.delete_provider_auth(tenant_id, str(uuid4()))
 
@@ -252,7 +276,7 @@ class TestApiKeyAuthService:
     @patch("services.auth.api_key_auth_service.ApiKeyAuthFactory")
     @patch("services.auth.api_key_auth_service.encrypter")
     def test_create_provider_auth_database_error_handling(
-        self, mock_encrypter, mock_factory, flask_app_with_containers, tenant_id, mock_args
+        self, mock_encrypter, mock_factory, flask_app_with_containers: Flask, tenant_id, mock_args
     ):
         mock_auth_instance = Mock()
         mock_auth_instance.validate_credentials.return_value = True
diff --git a/api/tests/test_containers_integration_tests/services/auth/test_auth_integration.py b/api/tests/test_containers_integration_tests/services/auth/test_auth_integration.py
index f48c6da690..1de9ce38a0 100644
--- a/api/tests/test_containers_integration_tests/services/auth/test_auth_integration.py
+++ b/api/tests/test_containers_integration_tests/services/auth/test_auth_integration.py
@@ -10,6 +10,8 @@ from uuid import uuid4
 
 import httpx
 import pytest
+from flask import Flask
+from sqlalchemy.orm import Session
 
 from models.source import DataSourceApiKeyAuthBinding
 from services.auth.api_key_auth_factory import ApiKeyAuthFactory
@@ -44,8 +46,8 @@ class TestAuthIntegration:
         self,
         mock_encrypt,
         mock_http,
-        flask_app_with_containers,
-        db_session_with_containers,
+        flask_app_with_containers: Flask,
+        db_session_with_containers: Session,
         tenant_id_1,
         category,
         firecrawl_credentials,
@@ -85,8 +87,8 @@ class TestAuthIntegration:
         mock_jina_http,
         mock_fc_http,
         mock_encrypt,
-        flask_app_with_containers,
-        db_session_with_containers,
+        flask_app_with_containers: Flask,
+        db_session_with_containers: Session,
         tenant_id_1,
         tenant_id_2,
         category,
@@ -114,7 +116,7 @@ class TestAuthIntegration:
         assert result2[0].tenant_id == tenant_id_2
 
     def test_cross_tenant_access_prevention(
-        self, flask_app_with_containers, db_session_with_containers, tenant_id_2, category
+        self, flask_app_with_containers: Flask, db_session_with_containers: Session, tenant_id_2, category
     ):
         result = ApiKeyAuthService.get_auth_credentials(tenant_id_2, category, AuthType.FIRECRAWL)
 
@@ -138,8 +140,8 @@ class TestAuthIntegration:
         self,
         mock_encrypt,
         mock_http,
-        flask_app_with_containers,
-        db_session_with_containers,
+        flask_app_with_containers: Flask,
+        db_session_with_containers: Session,
         tenant_id_1,
         category,
         firecrawl_credentials,
@@ -200,8 +202,8 @@ class TestAuthIntegration:
     def test_network_failure_recovery(
         self,
         mock_http,
-        flask_app_with_containers,
-        db_session_with_containers,
+        flask_app_with_containers: Flask,
+        db_session_with_containers: Session,
         tenant_id_1,
         category,
         firecrawl_credentials,
@@ -238,8 +240,8 @@ class TestAuthIntegration:
         self,
         mock_http,
         mock_encrypt,
-        flask_app_with_containers,
-        db_session_with_containers,
+        flask_app_with_containers: Flask,
+        db_session_with_containers: Session,
         tenant_id_1,
         category,
         firecrawl_credentials,
diff --git a/api/tests/test_containers_integration_tests/services/dataset_service_update_delete.py b/api/tests/test_containers_integration_tests/services/dataset_service_update_delete.py
index 02c3d1a80e..1cffc43658 100644
--- a/api/tests/test_containers_integration_tests/services/dataset_service_update_delete.py
+++ b/api/tests/test_containers_integration_tests/services/dataset_service_update_delete.py
@@ -14,7 +14,7 @@ from sqlalchemy.orm import Session
 from werkzeug.exceptions import NotFound
 
 from core.rag.index_processor.constant.index_type import IndexTechniqueType
-from models import Account, Tenant, TenantAccountJoin, TenantAccountRole
+from models import Account, AccountStatus, Tenant, TenantAccountJoin, TenantAccountRole, TenantStatus
 from models.dataset import AppDatasetJoin, Dataset, DatasetPermissionEnum
 from models.enums import DataSourceType
 from models.model import App
@@ -38,13 +38,13 @@ class DatasetUpdateDeleteTestDataFactory:
             email=f"{uuid4()}@example.com",
             name=f"user-{uuid4()}",
             interface_language="en-US",
-            status="active",
+            status=AccountStatus.ACTIVE,
         )
         db_session_with_containers.add(account)
         db_session_with_containers.commit()
 
         if tenant is None:
-            tenant = Tenant(name=f"tenant-{uuid4()}", status="normal")
+            tenant = Tenant(name=f"tenant-{uuid4()}", status=TenantStatus.NORMAL)
             db_session_with_containers.add(tenant)
             db_session_with_containers.commit()
 
diff --git a/api/tests/test_containers_integration_tests/services/document_service_status.py b/api/tests/test_containers_integration_tests/services/document_service_status.py
index 42d587b7f7..327f14ddfe 100644
--- a/api/tests/test_containers_integration_tests/services/document_service_status.py
+++ b/api/tests/test_containers_integration_tests/services/document_service_status.py
@@ -12,6 +12,7 @@ from unittest.mock import create_autospec, patch
 from uuid import uuid4
 
 import pytest
+from sqlalchemy.orm import Session
 
 from core.rag.index_processor.constant.index_type import IndexStructureType
 from extensions.storage.storage_type import StorageType
@@ -273,7 +274,9 @@ class TestDocumentServicePauseDocument:
                 "user_id": user_id,
             }
 
-    def test_pause_document_waiting_state_success(self, db_session_with_containers, mock_document_service_dependencies):
+    def test_pause_document_waiting_state_success(
+        self, db_session_with_containers: Session, mock_document_service_dependencies
+    ):
         """
         Test successful pause of document in waiting state.
 
@@ -310,7 +313,7 @@ class TestDocumentServicePauseDocument:
         mock_document_service_dependencies["redis_client"].setnx.assert_called_once_with(expected_cache_key, "True")
 
     def test_pause_document_indexing_state_success(
-        self, db_session_with_containers, mock_document_service_dependencies
+        self, db_session_with_containers: Session, mock_document_service_dependencies
     ):
         """
         Test successful pause of document in indexing state.
@@ -340,7 +343,9 @@ class TestDocumentServicePauseDocument:
         assert document.is_paused is True
         assert document.paused_by == mock_document_service_dependencies["user_id"]
 
-    def test_pause_document_parsing_state_success(self, db_session_with_containers, mock_document_service_dependencies):
+    def test_pause_document_parsing_state_success(
+        self, db_session_with_containers: Session, mock_document_service_dependencies
+    ):
         """
         Test successful pause of document in parsing state.
 
@@ -367,7 +372,9 @@ class TestDocumentServicePauseDocument:
         db_session_with_containers.refresh(document)
         assert document.is_paused is True
 
-    def test_pause_document_completed_state_error(self, db_session_with_containers, mock_document_service_dependencies):
+    def test_pause_document_completed_state_error(
+        self, db_session_with_containers: Session, mock_document_service_dependencies
+    ):
         """
         Test error when trying to pause completed document.
 
@@ -396,7 +403,9 @@ class TestDocumentServicePauseDocument:
         db_session_with_containers.refresh(document)
         assert document.is_paused is False
 
-    def test_pause_document_error_state_error(self, db_session_with_containers, mock_document_service_dependencies):
+    def test_pause_document_error_state_error(
+        self, db_session_with_containers: Session, mock_document_service_dependencies
+    ):
         """
         Test error when trying to pause document in error state.
 
@@ -467,7 +476,9 @@ class TestDocumentServiceRecoverDocument:
                 "recover_task": mock_task,
             }
 
-    def test_recover_document_paused_success(self, db_session_with_containers, mock_document_service_dependencies):
+    def test_recover_document_paused_success(
+        self, db_session_with_containers: Session, mock_document_service_dependencies
+    ):
         """
         Test successful recovery of paused document.
 
@@ -510,7 +521,9 @@ class TestDocumentServiceRecoverDocument:
             document.dataset_id, document.id
         )
 
-    def test_recover_document_not_paused_error(self, db_session_with_containers, mock_document_service_dependencies):
+    def test_recover_document_not_paused_error(
+        self, db_session_with_containers: Session, mock_document_service_dependencies
+    ):
         """
         Test error when trying to recover non-paused document.
 
@@ -590,7 +603,9 @@ class TestDocumentServiceRetryDocument:
                 "user_id": user_id,
             }
 
-    def test_retry_document_single_success(self, db_session_with_containers, mock_document_service_dependencies):
+    def test_retry_document_single_success(
+        self, db_session_with_containers: Session, mock_document_service_dependencies
+    ):
         """
         Test successful retry of single document.
 
@@ -629,7 +644,9 @@ class TestDocumentServiceRetryDocument:
             dataset.id, [document.id], mock_document_service_dependencies["user_id"]
         )
 
-    def test_retry_document_multiple_success(self, db_session_with_containers, mock_document_service_dependencies):
+    def test_retry_document_multiple_success(
+        self, db_session_with_containers: Session, mock_document_service_dependencies
+    ):
         """
         Test successful retry of multiple documents.
 
@@ -675,7 +692,7 @@ class TestDocumentServiceRetryDocument:
         )
 
     def test_retry_document_concurrent_retry_error(
-        self, db_session_with_containers, mock_document_service_dependencies
+        self, db_session_with_containers: Session, mock_document_service_dependencies
     ):
         """
         Test error when document is already being retried.
@@ -708,7 +725,7 @@ class TestDocumentServiceRetryDocument:
         assert document.indexing_status == IndexingStatus.ERROR
 
     def test_retry_document_missing_current_user_error(
-        self, db_session_with_containers, mock_document_service_dependencies
+        self, db_session_with_containers: Session, mock_document_service_dependencies
     ):
         """
         Test error when current_user is missing.
@@ -794,7 +811,7 @@ class TestDocumentServiceBatchUpdateDocumentStatus:
             }
 
     def test_batch_update_document_status_enable_success(
-        self, db_session_with_containers, mock_document_service_dependencies
+        self, db_session_with_containers: Session, mock_document_service_dependencies
     ):
         """
         Test successful batch enabling of documents.
@@ -844,7 +861,7 @@ class TestDocumentServiceBatchUpdateDocumentStatus:
         assert mock_document_service_dependencies["add_task"].delay.call_count == 2
 
     def test_batch_update_document_status_disable_success(
-        self, db_session_with_containers, mock_document_service_dependencies
+        self, db_session_with_containers: Session, mock_document_service_dependencies
     ):
         """
         Test successful batch disabling of documents.
@@ -886,7 +903,7 @@ class TestDocumentServiceBatchUpdateDocumentStatus:
         mock_document_service_dependencies["remove_task"].delay.assert_called_once_with(document.id)
 
     def test_batch_update_document_status_archive_success(
-        self, db_session_with_containers, mock_document_service_dependencies
+        self, db_session_with_containers: Session, mock_document_service_dependencies
     ):
         """
         Test successful batch archiving of documents.
@@ -928,7 +945,7 @@ class TestDocumentServiceBatchUpdateDocumentStatus:
         mock_document_service_dependencies["remove_task"].delay.assert_called_once_with(document.id)
 
     def test_batch_update_document_status_unarchive_success(
-        self, db_session_with_containers, mock_document_service_dependencies
+        self, db_session_with_containers: Session, mock_document_service_dependencies
     ):
         """
         Test successful batch unarchiving of documents.
@@ -970,7 +987,7 @@ class TestDocumentServiceBatchUpdateDocumentStatus:
         mock_document_service_dependencies["add_task"].delay.assert_called_once_with(document.id)
 
     def test_batch_update_document_status_empty_list(
-        self, db_session_with_containers, mock_document_service_dependencies
+        self, db_session_with_containers: Session, mock_document_service_dependencies
     ):
         """
         Test handling of empty document list.
@@ -996,7 +1013,7 @@ class TestDocumentServiceBatchUpdateDocumentStatus:
         mock_document_service_dependencies["remove_task"].delay.assert_not_called()
 
     def test_batch_update_document_status_document_indexing_error(
-        self, db_session_with_containers, mock_document_service_dependencies
+        self, db_session_with_containers: Session, mock_document_service_dependencies
     ):
         """
         Test error when document is being indexed.
@@ -1073,7 +1090,7 @@ class TestDocumentServiceRenameDocument:
                 "current_user": mock_current_user,
             }
 
-    def test_rename_document_success(self, db_session_with_containers, mock_document_service_dependencies):
+    def test_rename_document_success(self, db_session_with_containers: Session, mock_document_service_dependencies):
         """
         Test successful document renaming.
 
@@ -1111,7 +1128,9 @@ class TestDocumentServiceRenameDocument:
         assert result == document
         assert document.name == new_name
 
-    def test_rename_document_with_built_in_fields(self, db_session_with_containers, mock_document_service_dependencies):
+    def test_rename_document_with_built_in_fields(
+        self, db_session_with_containers: Session, mock_document_service_dependencies
+    ):
         """
         Test document renaming with built-in fields enabled.
 
@@ -1154,7 +1173,9 @@ class TestDocumentServiceRenameDocument:
         assert document.doc_metadata["document_name"] == new_name
         assert document.doc_metadata["existing_key"] == "existing_value"
 
-    def test_rename_document_with_upload_file(self, db_session_with_containers, mock_document_service_dependencies):
+    def test_rename_document_with_upload_file(
+        self, db_session_with_containers: Session, mock_document_service_dependencies
+    ):
         """
         Test document renaming with associated upload file.
 
@@ -1202,7 +1223,7 @@ class TestDocumentServiceRenameDocument:
         assert upload_file.name == new_name
 
     def test_rename_document_dataset_not_found_error(
-        self, db_session_with_containers, mock_document_service_dependencies
+        self, db_session_with_containers: Session, mock_document_service_dependencies
     ):
         """
         Test error when dataset is not found.
@@ -1224,7 +1245,9 @@ class TestDocumentServiceRenameDocument:
         with pytest.raises(ValueError, match="Dataset not found"):
             DocumentService.rename_document(dataset_id, document_id, new_name)
 
-    def test_rename_document_not_found_error(self, db_session_with_containers, mock_document_service_dependencies):
+    def test_rename_document_not_found_error(
+        self, db_session_with_containers: Session, mock_document_service_dependencies
+    ):
         """
         Test error when document is not found.
 
@@ -1251,7 +1274,9 @@ class TestDocumentServiceRenameDocument:
         with pytest.raises(ValueError, match="Document not found"):
             DocumentService.rename_document(dataset.id, document_id, new_name)
 
-    def test_rename_document_permission_error(self, db_session_with_containers, mock_document_service_dependencies):
+    def test_rename_document_permission_error(
+        self, db_session_with_containers: Session, mock_document_service_dependencies
+    ):
         """
         Test error when user lacks permission.
 
diff --git a/api/tests/test_containers_integration_tests/services/enterprise/test_account_deletion_sync.py b/api/tests/test_containers_integration_tests/services/enterprise/test_account_deletion_sync.py
index 4e8255d8ed..075f43d63a 100644
--- a/api/tests/test_containers_integration_tests/services/enterprise/test_account_deletion_sync.py
+++ b/api/tests/test_containers_integration_tests/services/enterprise/test_account_deletion_sync.py
@@ -10,7 +10,9 @@ from unittest.mock import patch
 from uuid import uuid4
 
 import pytest
+from flask import Flask
 from redis import RedisError
+from sqlalchemy.orm import Session
 
 from extensions.ext_redis import redis_client
 from models.account import TenantAccountJoin
@@ -122,7 +124,7 @@ class TestSyncAccountDeletion:
             mock_queue_task.assert_not_called()
 
     def test_sync_account_deletion_multiple_workspaces(
-        self, flask_app_with_containers, db_session_with_containers, mock_queue_task
+        self, flask_app_with_containers: Flask, db_session_with_containers: Session, mock_queue_task
     ):
         account_id = str(uuid4())
         tenant_ids = [str(uuid4()) for _ in range(3)]
@@ -144,7 +146,7 @@ class TestSyncAccountDeletion:
             assert queued_workspace_ids == set(tenant_ids)
 
     def test_sync_account_deletion_no_workspaces(
-        self, flask_app_with_containers, db_session_with_containers, mock_queue_task
+        self, flask_app_with_containers: Flask, db_session_with_containers: Session, mock_queue_task
     ):
         with patch("services.enterprise.account_deletion_sync.dify_config") as mock_config:
             mock_config.ENTERPRISE_ENABLED = True
@@ -155,7 +157,7 @@ class TestSyncAccountDeletion:
             mock_queue_task.assert_not_called()
 
     def test_sync_account_deletion_partial_failure(
-        self, flask_app_with_containers, db_session_with_containers, mock_queue_task
+        self, flask_app_with_containers: Flask, db_session_with_containers: Session, mock_queue_task
     ):
         account_id = str(uuid4())
         tenant_ids = [str(uuid4()) for _ in range(3)]
@@ -180,7 +182,7 @@ class TestSyncAccountDeletion:
             assert mock_queue_task.call_count == 3
 
     def test_sync_account_deletion_all_failures(
-        self, flask_app_with_containers, db_session_with_containers, mock_queue_task
+        self, flask_app_with_containers: Flask, db_session_with_containers: Session, mock_queue_task
     ):
         account_id = str(uuid4())
         tenant_id = str(uuid4())
diff --git a/api/tests/test_containers_integration_tests/services/plugin/test_plugin_parameter_service.py b/api/tests/test_containers_integration_tests/services/plugin/test_plugin_parameter_service.py
index ce9f10e207..48830c0f43 100644
--- a/api/tests/test_containers_integration_tests/services/plugin/test_plugin_parameter_service.py
+++ b/api/tests/test_containers_integration_tests/services/plugin/test_plugin_parameter_service.py
@@ -11,6 +11,7 @@ from unittest.mock import MagicMock, patch
 from uuid import uuid4
 
 import pytest
+from flask import Flask
 
 from core.plugin.entities.plugin_daemon import CredentialType
 from models.tools import BuiltinToolProvider
@@ -49,8 +50,8 @@ class TestGetDynamicSelectOptionsTool:
         mock_tool_mgr,
         mock_encrypter_fn,
         mock_client_cls,
-        flask_app_with_containers,
-        db_session_with_containers,
+        flask_app_with_containers: Flask,
+        db_session_with_containers: Session,
     ):
         tenant_id = str(uuid4())
         provider_ctrl = MagicMock()
@@ -91,8 +92,8 @@ class TestGetDynamicSelectOptionsTool:
         self,
         mock_tool_mgr,
         mock_encrypter_fn,
-        flask_app_with_containers,
-        db_session_with_containers,
+        flask_app_with_containers: Flask,
+        db_session_with_containers: Session,
     ):
         provider_ctrl = MagicMock()
         provider_ctrl.need_credentials = True
diff --git a/api/tests/test_containers_integration_tests/services/plugin/test_plugin_permission_service.py b/api/tests/test_containers_integration_tests/services/plugin/test_plugin_permission_service.py
new file mode 100644
index 0000000000..49d06986fd
--- /dev/null
+++ b/api/tests/test_containers_integration_tests/services/plugin/test_plugin_permission_service.py
@@ -0,0 +1,94 @@
+from __future__ import annotations
+
+from uuid import uuid4
+
+from sqlalchemy import func, select
+from sqlalchemy.orm import Session
+
+from models.account import TenantPluginPermission
+from services.plugin.plugin_permission_service import PluginPermissionService
+
+
+def _tenant_id() -> str:
+    return str(uuid4())
+
+
+def _get_permission(session: Session, tenant_id: str) -> TenantPluginPermission | None:
+    session.expire_all()
+    stmt = select(TenantPluginPermission).where(TenantPluginPermission.tenant_id == tenant_id)
+    return session.scalars(stmt).one_or_none()
+
+
+def _count_permissions(session: Session, tenant_id: str) -> int:
+    stmt = select(func.count()).select_from(TenantPluginPermission).where(TenantPluginPermission.tenant_id == tenant_id)
+    return session.scalar(stmt) or 0
+
+
+class TestGetPermission:
+    """Integration tests for PluginPermissionService.get_permission using testcontainers."""
+
+    def test_returns_permission_when_found(self, db_session_with_containers: Session):
+        tenant_id = _tenant_id()
+        permission = TenantPluginPermission(
+            tenant_id=tenant_id,
+            install_permission=TenantPluginPermission.InstallPermission.ADMINS,
+            debug_permission=TenantPluginPermission.DebugPermission.EVERYONE,
+        )
+        db_session_with_containers.add(permission)
+        db_session_with_containers.commit()
+
+        result = PluginPermissionService.get_permission(tenant_id)
+
+        assert result is not None
+        assert result.id == permission.id
+        assert result.tenant_id == tenant_id
+        assert result.install_permission == TenantPluginPermission.InstallPermission.ADMINS
+        assert result.debug_permission == TenantPluginPermission.DebugPermission.EVERYONE
+
+    def test_returns_none_when_not_found(self, db_session_with_containers: Session):
+        result = PluginPermissionService.get_permission(_tenant_id())
+
+        assert result is None
+
+
+class TestChangePermission:
+    """Integration tests for PluginPermissionService.change_permission using testcontainers."""
+
+    def test_creates_new_permission_when_not_exists(self, db_session_with_containers: Session):
+        tenant_id = _tenant_id()
+
+        result = PluginPermissionService.change_permission(
+            tenant_id,
+            TenantPluginPermission.InstallPermission.EVERYONE,
+            TenantPluginPermission.DebugPermission.EVERYONE,
+        )
+
+        permission = _get_permission(db_session_with_containers, tenant_id)
+        assert result is True
+        assert permission is not None
+        assert permission.install_permission == TenantPluginPermission.InstallPermission.EVERYONE
+        assert permission.debug_permission == TenantPluginPermission.DebugPermission.EVERYONE
+
+    def test_updates_existing_permission(self, db_session_with_containers: Session):
+        tenant_id = _tenant_id()
+        existing = TenantPluginPermission(
+            tenant_id=tenant_id,
+            install_permission=TenantPluginPermission.InstallPermission.EVERYONE,
+            debug_permission=TenantPluginPermission.DebugPermission.EVERYONE,
+        )
+        db_session_with_containers.add(existing)
+        db_session_with_containers.commit()
+
+        result = PluginPermissionService.change_permission(
+            tenant_id,
+            TenantPluginPermission.InstallPermission.ADMINS,
+            TenantPluginPermission.DebugPermission.ADMINS,
+        )
+
+        permission = _get_permission(db_session_with_containers, tenant_id)
+        assert result is True
+        assert permission is not None
+        assert permission.id == existing.id
+        assert permission.install_permission == TenantPluginPermission.InstallPermission.ADMINS
+        assert permission.debug_permission == TenantPluginPermission.DebugPermission.ADMINS
+        assert _count_permissions(db_session_with_containers, tenant_id) == 1
diff --git a/api/tests/test_containers_integration_tests/services/plugin/test_plugin_service.py b/api/tests/test_containers_integration_tests/services/plugin/test_plugin_service.py
index 0cdae572fb..0fa4d9043b 100644
--- a/api/tests/test_containers_integration_tests/services/plugin/test_plugin_service.py
+++ b/api/tests/test_containers_integration_tests/services/plugin/test_plugin_service.py
@@ -11,10 +11,13 @@ from unittest.mock import MagicMock, patch
 from uuid import uuid4
 
 import pytest
+from flask import Flask
 from sqlalchemy import select
+from sqlalchemy.orm import Session
 
 from core.plugin.entities.plugin import PluginInstallationSource
 from core.plugin.entities.plugin_daemon import PluginVerification
+from models import ProviderType
 from models.provider import Provider, ProviderCredential, TenantPreferredModelProvider
 from services.errors.plugin import PluginInstallationForbiddenError
 from services.feature_service import PluginInstallationScope
@@ -346,7 +349,7 @@ class TestUninstall:
 
     @patch("services.plugin.plugin_service.PluginInstaller")
     def test_cleans_credentials_when_plugin_found(
-        self, mock_installer_cls, flask_app_with_containers, db_session_with_containers
+        self, mock_installer_cls, flask_app_with_containers: Flask, db_session_with_containers: Session
     ):
         tenant_id = str(uuid4())
         plugin_id = "org/myplugin"
@@ -374,7 +377,7 @@ class TestUninstall:
         pref = TenantPreferredModelProvider(
             tenant_id=tenant_id,
             provider_name=provider_name,
-            preferred_provider_type="custom",
+            preferred_provider_type=ProviderType.CUSTOM,
         )
         db_session_with_containers.add(pref)
         db_session_with_containers.commit()
diff --git a/api/tests/test_containers_integration_tests/services/recommend_app/test_database_retrieval.py b/api/tests/test_containers_integration_tests/services/recommend_app/test_database_retrieval.py
index 2b842629a7..e4a106694b 100644
--- a/api/tests/test_containers_integration_tests/services/recommend_app/test_database_retrieval.py
+++ b/api/tests/test_containers_integration_tests/services/recommend_app/test_database_retrieval.py
@@ -3,12 +3,15 @@ from __future__ import annotations
 from unittest.mock import patch
 from uuid import uuid4
 
+from flask import Flask
+from sqlalchemy.orm import Session
+
 from models.model import App, RecommendedApp, Site
 from services.recommend_app.database.database_retrieval import DatabaseRecommendAppRetrieval
 from services.recommend_app.recommend_app_type import RecommendAppType
 
 
-def _create_app(db_session, *, tenant_id: str, is_public: bool = True) -> App:
+def _create_app(db_session: Session, *, tenant_id: str, is_public: bool = True) -> App:
     app = App(
         tenant_id=tenant_id,
         name=f"app-{uuid4()}",
@@ -23,7 +26,7 @@ def _create_app(db_session, *, tenant_id: str, is_public: bool = True) -> App:
     return app
 
 
-def _create_site(db_session, *, app_id: str) -> Site:
+def _create_site(db_session: Session, *, app_id: str) -> Site:
     site = Site(
         app_id=app_id,
         title=f"site-{uuid4()}",
@@ -45,6 +48,7 @@ def _create_recommended_app(
     *,
     app_id: str,
     category: str = "chat",
+    categories: list[str] | None = None,
     language: str = "en-US",
     is_listed: bool = True,
     position: int = 1,
@@ -55,6 +59,7 @@ def _create_recommended_app(
         copyright="copy",
         privacy_policy="pp",
         category=category,
+        categories=[category] if categories is None else categories,
         language=language,
         is_listed=is_listed,
         position=position,
@@ -91,7 +96,9 @@ class TestDatabaseRecommendAppRetrieval:
 
 
 class TestFetchRecommendedAppsFromDb:
-    def test_returns_apps_and_sorted_categories(self, flask_app_with_containers, db_session_with_containers):
+    def test_returns_apps_and_sorted_categories(
+        self, flask_app_with_containers: Flask, db_session_with_containers: Session
+    ):
         tenant_id = str(uuid4())
         app1 = _create_app(db_session_with_containers, tenant_id=tenant_id)
         _create_site(db_session_with_containers, app_id=app1.id)
@@ -111,7 +118,56 @@ class TestFetchRecommendedAppsFromDb:
         assert "assistant" in result["categories"]
         assert "writing" in result["categories"]
 
-    def test_falls_back_to_default_language_when_empty(self, flask_app_with_containers, db_session_with_containers):
+    def test_returns_multiple_categories_for_one_app(
+        self, flask_app_with_containers: Flask, db_session_with_containers: Session
+    ):
+        tenant_id = str(uuid4())
+        created_app = _create_app(db_session_with_containers, tenant_id=tenant_id)
+        _create_site(db_session_with_containers, app_id=created_app.id)
+        _create_recommended_app(
+            db_session_with_containers,
+            app_id=created_app.id,
+            category="writing",
+            categories=["writing", "assistant"],
+        )
+
+        db_session_with_containers.expire_all()
+
+        result = DatabaseRecommendAppRetrieval.fetch_recommended_apps_from_db("en-US")
+
+        recommended_app = next(item for item in result["recommended_apps"] if item["app_id"] == created_app.id)
+        assert recommended_app["categories"] == ["writing", "assistant"]
+        assert "writing" in result["categories"]
+        assert "assistant" in result["categories"]
+
+    def test_ignores_legacy_category_when_categories_are_empty(
+        self,
+        flask_app_with_containers: Flask,
+        db_session_with_containers: Session,
+    ):
+        legacy_category = f"legacy-empty-{uuid4()}"
+        tenant_id = str(uuid4())
+        created_app = _create_app(db_session_with_containers, tenant_id=tenant_id)
+        _create_site(db_session_with_containers, app_id=created_app.id)
+        _create_recommended_app(
+            db_session_with_containers,
+            app_id=created_app.id,
+            category=legacy_category,
+            categories=[],
+        )
+
+        db_session_with_containers.expire_all()
+
+        result = DatabaseRecommendAppRetrieval.fetch_recommended_apps_from_db("en-US")
+
+        recommended_app = next(item for item in result["recommended_apps"] if item["app_id"] == created_app.id)
+        assert "category" not in recommended_app
+        assert recommended_app["categories"] == []
+        assert legacy_category not in result["categories"]
+
+    def test_falls_back_to_default_language_when_empty(
+        self, flask_app_with_containers: Flask, db_session_with_containers: Session
+    ):
         tenant_id = str(uuid4())
         app1 = _create_app(db_session_with_containers, tenant_id=tenant_id)
         _create_site(db_session_with_containers, app_id=app1.id)
@@ -124,7 +180,7 @@ class TestFetchRecommendedAppsFromDb:
         app_ids = {r["app_id"] for r in result["recommended_apps"]}
         assert app1.id in app_ids
 
-    def test_skips_non_public_apps(self, flask_app_with_containers, db_session_with_containers):
+    def test_skips_non_public_apps(self, flask_app_with_containers: Flask, db_session_with_containers: Session):
         tenant_id = str(uuid4())
         app1 = _create_app(db_session_with_containers, tenant_id=tenant_id, is_public=False)
         _create_site(db_session_with_containers, app_id=app1.id)
@@ -137,7 +193,7 @@ class TestFetchRecommendedAppsFromDb:
         app_ids = {r["app_id"] for r in result["recommended_apps"]}
         assert app1.id not in app_ids
 
-    def test_skips_apps_without_site(self, flask_app_with_containers, db_session_with_containers):
+    def test_skips_apps_without_site(self, flask_app_with_containers: Flask, db_session_with_containers: Session):
         tenant_id = str(uuid4())
         app1 = _create_app(db_session_with_containers, tenant_id=tenant_id)
         _create_recommended_app(db_session_with_containers, app_id=app1.id)
@@ -151,12 +207,14 @@ class TestFetchRecommendedAppsFromDb:
 
 
 class TestFetchRecommendedAppDetailFromDb:
-    def test_returns_none_when_not_listed(self, flask_app_with_containers, db_session_with_containers):
+    def test_returns_none_when_not_listed(self, flask_app_with_containers: Flask, db_session_with_containers: Session):
         result = DatabaseRecommendAppRetrieval.fetch_recommended_app_detail_from_db(str(uuid4()))
 
         assert result is None
 
-    def test_returns_none_when_app_not_public(self, flask_app_with_containers, db_session_with_containers):
+    def test_returns_none_when_app_not_public(
+        self, flask_app_with_containers: Flask, db_session_with_containers: Session
+    ):
         tenant_id = str(uuid4())
         app1 = _create_app(db_session_with_containers, tenant_id=tenant_id, is_public=False)
         _create_recommended_app(db_session_with_containers, app_id=app1.id)
@@ -168,7 +226,9 @@ class TestFetchRecommendedAppDetailFromDb:
         assert result is None
 
     @patch("services.recommend_app.database.database_retrieval.AppDslService")
-    def test_returns_detail_on_success(self, mock_dsl, flask_app_with_containers, db_session_with_containers):
+    def test_returns_detail_on_success(
+        self, mock_dsl, flask_app_with_containers: Flask, db_session_with_containers: Session
+    ):
         tenant_id = str(uuid4())
         app1 = _create_app(db_session_with_containers, tenant_id=tenant_id)
         _create_site(db_session_with_containers, app_id=app1.id)
diff --git a/api/tests/test_containers_integration_tests/services/test_advanced_prompt_template_service.py b/api/tests/test_containers_integration_tests/services/test_advanced_prompt_template_service.py
index 3ec265d009..f78037e503 100644
--- a/api/tests/test_containers_integration_tests/services/test_advanced_prompt_template_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_advanced_prompt_template_service.py
@@ -2,6 +2,7 @@ import copy
 
 import pytest
 from faker import Faker
+from sqlalchemy.orm import Session
 
 from core.prompt.prompt_templates.advanced_prompt_templates import (
     BAICHUAN_CHAT_APP_CHAT_PROMPT_CONFIG,
@@ -29,7 +30,9 @@ class TestAdvancedPromptTemplateService:
         # for consistency with other test files
         return {}
 
-    def test_get_prompt_baichuan_model_success(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_get_prompt_baichuan_model_success(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test successful prompt generation for Baichuan model.
 
@@ -64,7 +67,9 @@ class TestAdvancedPromptTemplateService:
         assert "{{#histories#}}" in prompt_text
         assert "{{#query#}}" in prompt_text
 
-    def test_get_prompt_common_model_success(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_get_prompt_common_model_success(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test successful prompt generation for common models.
 
@@ -100,7 +105,7 @@ class TestAdvancedPromptTemplateService:
         assert "{{#query#}}" in prompt_text
 
     def test_get_prompt_case_insensitive_baichuan_detection(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test Baichuan model detection is case insensitive.
@@ -131,7 +136,7 @@ class TestAdvancedPromptTemplateService:
             assert BAICHUAN_CONTEXT in prompt_text
 
     def test_get_common_prompt_chat_app_completion_mode(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test common prompt generation for chat app with completion mode.
@@ -161,7 +166,9 @@ class TestAdvancedPromptTemplateService:
         assert "{{#histories#}}" in prompt_text
         assert "{{#query#}}" in prompt_text
 
-    def test_get_common_prompt_chat_app_chat_mode(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_get_common_prompt_chat_app_chat_mode(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test common prompt generation for chat app with chat mode.
 
@@ -189,7 +196,7 @@ class TestAdvancedPromptTemplateService:
         assert "{{#pre_prompt#}}" in prompt_text
 
     def test_get_common_prompt_completion_app_completion_mode(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test common prompt generation for completion app with completion mode.
@@ -217,7 +224,7 @@ class TestAdvancedPromptTemplateService:
         assert "{{#pre_prompt#}}" in prompt_text
 
     def test_get_common_prompt_completion_app_chat_mode(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test common prompt generation for completion app with chat mode.
@@ -245,7 +252,9 @@ class TestAdvancedPromptTemplateService:
         assert CONTEXT in prompt_text
         assert "{{#pre_prompt#}}" in prompt_text
 
-    def test_get_common_prompt_no_context(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_get_common_prompt_no_context(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test common prompt generation without context.
 
@@ -273,7 +282,7 @@ class TestAdvancedPromptTemplateService:
         assert "{{#query#}}" in prompt_text
 
     def test_get_common_prompt_unsupported_app_mode(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test common prompt generation with unsupported app mode.
@@ -291,7 +300,7 @@ class TestAdvancedPromptTemplateService:
         assert result == {}
 
     def test_get_common_prompt_unsupported_model_mode(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test common prompt generation with unsupported model mode.
@@ -308,7 +317,9 @@ class TestAdvancedPromptTemplateService:
         # Assert: Verify empty dict is returned
         assert result == {}
 
-    def test_get_completion_prompt_with_context(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_get_completion_prompt_with_context(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test completion prompt generation with context.
 
@@ -339,7 +350,7 @@ class TestAdvancedPromptTemplateService:
         assert result_text == CONTEXT + original_text
 
     def test_get_completion_prompt_without_context(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test completion prompt generation without context.
@@ -368,7 +379,9 @@ class TestAdvancedPromptTemplateService:
         assert result_text == original_text
         assert CONTEXT not in result_text
 
-    def test_get_chat_prompt_with_context(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_get_chat_prompt_with_context(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test chat prompt generation with context.
 
@@ -399,7 +412,9 @@ class TestAdvancedPromptTemplateService:
         assert original_text in result_text
         assert result_text == CONTEXT + original_text
 
-    def test_get_chat_prompt_without_context(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_get_chat_prompt_without_context(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test chat prompt generation without context.
 
@@ -429,7 +444,7 @@ class TestAdvancedPromptTemplateService:
         assert CONTEXT not in result_text
 
     def test_get_baichuan_prompt_chat_app_completion_mode(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test Baichuan prompt generation for chat app with completion mode.
@@ -460,7 +475,7 @@ class TestAdvancedPromptTemplateService:
         assert "{{#query#}}" in prompt_text
 
     def test_get_baichuan_prompt_chat_app_chat_mode(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test Baichuan prompt generation for chat app with chat mode.
@@ -489,7 +504,7 @@ class TestAdvancedPromptTemplateService:
         assert "{{#pre_prompt#}}" in prompt_text
 
     def test_get_baichuan_prompt_completion_app_completion_mode(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test Baichuan prompt generation for completion app with completion mode.
@@ -517,7 +532,7 @@ class TestAdvancedPromptTemplateService:
         assert "{{#pre_prompt#}}" in prompt_text
 
     def test_get_baichuan_prompt_completion_app_chat_mode(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test Baichuan prompt generation for completion app with chat mode.
@@ -545,7 +560,9 @@ class TestAdvancedPromptTemplateService:
         assert BAICHUAN_CONTEXT in prompt_text
         assert "{{#pre_prompt#}}" in prompt_text
 
-    def test_get_baichuan_prompt_no_context(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_get_baichuan_prompt_no_context(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test Baichuan prompt generation without context.
 
@@ -573,7 +590,7 @@ class TestAdvancedPromptTemplateService:
         assert "{{#query#}}" in prompt_text
 
     def test_get_baichuan_prompt_unsupported_app_mode(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test Baichuan prompt generation with unsupported app mode.
@@ -591,7 +608,7 @@ class TestAdvancedPromptTemplateService:
         assert result == {}
 
     def test_get_baichuan_prompt_unsupported_model_mode(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test Baichuan prompt generation with unsupported model mode.
@@ -609,7 +626,7 @@ class TestAdvancedPromptTemplateService:
         assert result == {}
 
     def test_get_prompt_all_app_modes_common_model(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test prompt generation for all app modes with common model.
@@ -641,7 +658,7 @@ class TestAdvancedPromptTemplateService:
                 assert result != {}
 
     def test_get_prompt_all_app_modes_baichuan_model(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test prompt generation for all app modes with Baichuan model.
@@ -672,7 +689,7 @@ class TestAdvancedPromptTemplateService:
                 assert result is not None
                 assert result != {}
 
-    def test_get_prompt_edge_cases(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_get_prompt_edge_cases(self, db_session_with_containers: Session, mock_external_service_dependencies):
         """
         Test prompt generation with edge cases.
 
@@ -704,7 +721,7 @@ class TestAdvancedPromptTemplateService:
             # Should either return a valid result or empty dict, but not crash
             assert result is not None
 
-    def test_template_immutability(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_template_immutability(self, db_session_with_containers: Session, mock_external_service_dependencies):
         """
         Test that original templates are not modified.
 
@@ -738,7 +755,9 @@ class TestAdvancedPromptTemplateService:
         assert original_completion_completion == COMPLETION_APP_COMPLETION_PROMPT_CONFIG
         assert original_completion_chat == COMPLETION_APP_CHAT_PROMPT_CONFIG
 
-    def test_baichuan_template_immutability(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_baichuan_template_immutability(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test that original Baichuan templates are not modified.
 
@@ -772,7 +791,9 @@ class TestAdvancedPromptTemplateService:
         assert original_baichuan_completion_completion == BAICHUAN_COMPLETION_APP_COMPLETION_PROMPT_CONFIG
         assert original_baichuan_completion_chat == BAICHUAN_COMPLETION_APP_CHAT_PROMPT_CONFIG
 
-    def test_context_integration_consistency(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_context_integration_consistency(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test consistency of context integration across different scenarios.
 
@@ -828,7 +849,7 @@ class TestAdvancedPromptTemplateService:
                 assert prompt_text.startswith(CONTEXT)
 
     def test_baichuan_context_integration_consistency(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test consistency of Baichuan context integration across different scenarios.
diff --git a/api/tests/test_containers_integration_tests/services/test_agent_service.py b/api/tests/test_containers_integration_tests/services/test_agent_service.py
index 00a2f9a59f..27e793915a 100644
--- a/api/tests/test_containers_integration_tests/services/test_agent_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_agent_service.py
@@ -6,12 +6,12 @@ from faker import Faker
 from sqlalchemy.orm import Session
 
 from core.plugin.impl.exc import PluginDaemonClientSideError
-from models import Account
+from models import Account, AppMode, CreatorUserRole
 from models.enums import ConversationFromSource, MessageFileBelongsTo
 from models.model import AppModelConfig, Conversation, EndUser, Message, MessageAgentThought
 from services.account_service import AccountService, TenantService
 from services.agent_service import AgentService
-from services.app_service import AppService
+from services.app_service import AppService, CreateAppParams
 from tests.test_containers_integration_tests.helpers import generate_valid_password
 
 
@@ -119,22 +119,22 @@ class TestAgentService:
         tenant = account.current_tenant
 
         # Create app with realistic data
-        app_args = {
-            "name": fake.company(),
-            "description": fake.text(max_nb_chars=100),
-            "mode": "agent-chat",
-            "icon_type": "emoji",
-            "icon": "🤖",
-            "icon_background": "#FF6B6B",
-            "api_rph": 100,
-            "api_rpm": 10,
-        }
+        app_args = CreateAppParams(
+            name=fake.company(),
+            description=fake.text(max_nb_chars=100),
+            mode="agent-chat",
+            icon_type="emoji",
+            icon="🤖",
+            icon_background="#FF6B6B",
+            api_rph=100,
+            api_rpm=10,
+        )
 
         app_service = AppService()
         app = app_service.create_app(tenant.id, app_args, account)
 
         # Update the app model config to set agent_mode for agent-chat mode
-        if app.mode == "agent-chat" and app.app_model_config:
+        if app.mode == AppMode.AGENT_CHAT and app.app_model_config:
             app.app_model_config.agent_mode = json.dumps({"enabled": True, "strategy": "react", "tools": []})
 
             db_session_with_containers.commit()
@@ -246,7 +246,7 @@ class TestAgentService:
             tool_input=json.dumps({"test_tool": {"input": "test_input"}}),
             observation=json.dumps({"test_tool": {"output": "test_output"}}),
             tokens=50,
-            created_by_role="account",
+            created_by_role=CreatorUserRole.ACCOUNT,
             created_by=message.from_account_id,
         )
         db_session_with_containers.add(thought1)
@@ -272,7 +272,7 @@ class TestAgentService:
             tool_input=json.dumps({"dataset_tool": {"query": "test_query"}}),
             observation=json.dumps({"dataset_tool": {"results": "test_results"}}),
             tokens=30,
-            created_by_role="account",
+            created_by_role=CreatorUserRole.ACCOUNT,
             created_by=message.from_account_id,
         )
         db_session_with_containers.add(thought2)
@@ -294,7 +294,7 @@ class TestAgentService:
         agent_thoughts = self._create_test_agent_thoughts(db_session_with_containers, message)
 
         # Execute the method under test
-        result = AgentService.get_agent_logs(app, str(conversation.id), str(message.id))
+        result = AgentService.get_agent_logs(app, conversation.id, message.id)
 
         # Verify the result structure
         assert result is not None
@@ -370,7 +370,7 @@ class TestAgentService:
 
         # Execute the method under test with non-existent message
         with pytest.raises(ValueError, match="Message not found"):
-            AgentService.get_agent_logs(app, str(conversation.id), fake.uuid4())
+            AgentService.get_agent_logs(app, conversation.id, fake.uuid4())
 
     def test_get_agent_logs_with_end_user(
         self, db_session_with_containers: Session, mock_external_service_dependencies
@@ -451,7 +451,7 @@ class TestAgentService:
         db_session_with_containers.commit()
 
         # Execute the method under test
-        result = AgentService.get_agent_logs(app, str(conversation.id), str(message.id))
+        result = AgentService.get_agent_logs(app, conversation.id, message.id)
 
         # Verify the result
         assert result is not None
@@ -523,7 +523,7 @@ class TestAgentService:
         db_session_with_containers.commit()
 
         # Execute the method under test
-        result = AgentService.get_agent_logs(app, str(conversation.id), str(message.id))
+        result = AgentService.get_agent_logs(app, conversation.id, message.id)
 
         # Verify the result
         assert result is not None
@@ -561,14 +561,14 @@ class TestAgentService:
             tool_input=json.dumps({"error_tool": {"input": "test_input"}}),
             observation=json.dumps({"error_tool": {"output": "error_output"}}),
             tokens=50,
-            created_by_role="account",
+            created_by_role=CreatorUserRole.ACCOUNT,
             created_by=message.from_account_id,
         )
         db_session_with_containers.add(thought_with_error)
         db_session_with_containers.commit()
 
         # Execute the method under test
-        result = AgentService.get_agent_logs(app, str(conversation.id), str(message.id))
+        result = AgentService.get_agent_logs(app, conversation.id, message.id)
 
         # Verify the result
         assert result is not None
@@ -592,7 +592,7 @@ class TestAgentService:
         conversation, message = self._create_test_conversation_and_message(db_session_with_containers, app, account)
 
         # Execute the method under test
-        result = AgentService.get_agent_logs(app, str(conversation.id), str(message.id))
+        result = AgentService.get_agent_logs(app, conversation.id, message.id)
 
         # Verify the result
         assert result is not None
@@ -654,7 +654,7 @@ class TestAgentService:
 
         # Execute the method under test
         with pytest.raises(ValueError, match="App model config not found"):
-            AgentService.get_agent_logs(app, str(conversation.id), str(message.id))
+            AgentService.get_agent_logs(app, conversation.id, message.id)
 
     def test_get_agent_logs_agent_config_not_found(
         self, db_session_with_containers: Session, mock_external_service_dependencies
@@ -673,7 +673,7 @@ class TestAgentService:
 
         # Execute the method under test
         with pytest.raises(ValueError, match="Agent config not found"):
-            AgentService.get_agent_logs(app, str(conversation.id), str(message.id))
+            AgentService.get_agent_logs(app, conversation.id, message.id)
 
     def test_list_agent_providers_success(
         self, db_session_with_containers: Session, mock_external_service_dependencies
@@ -687,7 +687,7 @@ class TestAgentService:
         app, account = self._create_test_app_and_account(db_session_with_containers, mock_external_service_dependencies)
 
         # Execute the method under test
-        result = AgentService.list_agent_providers(str(account.id), str(app.tenant_id))
+        result = AgentService.list_agent_providers(account.id, app.tenant_id)
 
         # Verify the result
         assert result is not None
@@ -696,7 +696,7 @@ class TestAgentService:
 
         # Verify the mock was called correctly
         mock_plugin_client = mock_external_service_dependencies["plugin_agent_client"].return_value
-        mock_plugin_client.fetch_agent_strategy_providers.assert_called_once_with(str(app.tenant_id))
+        mock_plugin_client.fetch_agent_strategy_providers.assert_called_once_with(app.tenant_id)
 
     def test_get_agent_provider_success(self, db_session_with_containers: Session, mock_external_service_dependencies):
         """
@@ -710,7 +710,7 @@ class TestAgentService:
         provider_name = "test_provider"
 
         # Execute the method under test
-        result = AgentService.get_agent_provider(str(account.id), str(app.tenant_id), provider_name)
+        result = AgentService.get_agent_provider(account.id, app.tenant_id, provider_name)
 
         # Verify the result
         assert result is not None
@@ -718,7 +718,7 @@ class TestAgentService:
 
         # Verify the mock was called correctly
         mock_plugin_client = mock_external_service_dependencies["plugin_agent_client"].return_value
-        mock_plugin_client.fetch_agent_strategy_provider.assert_called_once_with(str(app.tenant_id), provider_name)
+        mock_plugin_client.fetch_agent_strategy_provider.assert_called_once_with(app.tenant_id, provider_name)
 
     def test_get_agent_provider_plugin_error(
         self, db_session_with_containers: Session, mock_external_service_dependencies
@@ -740,7 +740,7 @@ class TestAgentService:
 
         # Execute the method under test
         with pytest.raises(ValueError, match=error_message):
-            AgentService.get_agent_provider(str(account.id), str(app.tenant_id), provider_name)
+            AgentService.get_agent_provider(account.id, app.tenant_id, provider_name)
 
     def test_get_agent_logs_with_complex_tool_data(
         self, db_session_with_containers: Session, mock_external_service_dependencies
@@ -796,14 +796,14 @@ class TestAgentService:
                 {"tool1": {"output1": "result1"}, "tool2": {"output2": "result2"}, "tool3": {"output3": "result3"}}
             ),
             tokens=100,
-            created_by_role="account",
+            created_by_role=CreatorUserRole.ACCOUNT,
             created_by=message.from_account_id,
         )
         db_session_with_containers.add(complex_thought)
         db_session_with_containers.commit()
 
         # Execute the method under test
-        result = AgentService.get_agent_logs(app, str(conversation.id), str(message.id))
+        result = AgentService.get_agent_logs(app, conversation.id, message.id)
 
         # Verify the result
         assert result is not None
@@ -891,14 +891,14 @@ class TestAgentService:
             observation=json.dumps({"file_tool": {"output": "test_output"}}),
             message_files=json.dumps(["file1", "file2"]),
             tokens=50,
-            created_by_role="account",
+            created_by_role=CreatorUserRole.ACCOUNT,
             created_by=message.from_account_id,
         )
         db_session_with_containers.add(thought_with_files)
         db_session_with_containers.commit()
 
         # Execute the method under test
-        result = AgentService.get_agent_logs(app, str(conversation.id), str(message.id))
+        result = AgentService.get_agent_logs(app, conversation.id, message.id)
 
         # Verify the result
         assert result is not None
@@ -926,7 +926,7 @@ class TestAgentService:
         mock_external_service_dependencies["current_user"].timezone = "Asia/Shanghai"
 
         # Execute the method under test
-        result = AgentService.get_agent_logs(app, str(conversation.id), str(message.id))
+        result = AgentService.get_agent_logs(app, conversation.id, message.id)
 
         # Verify the result
         assert result is not None
@@ -960,14 +960,14 @@ class TestAgentService:
             tool_input="",  # Empty input
             observation="",  # Empty observation
             tokens=50,
-            created_by_role="account",
+            created_by_role=CreatorUserRole.ACCOUNT,
             created_by=message.from_account_id,
         )
         db_session_with_containers.add(empty_thought)
         db_session_with_containers.commit()
 
         # Execute the method under test
-        result = AgentService.get_agent_logs(app, str(conversation.id), str(message.id))
+        result = AgentService.get_agent_logs(app, conversation.id, message.id)
 
         # Verify the result
         assert result is not None
@@ -1001,14 +1001,14 @@ class TestAgentService:
             tool_input="invalid json",  # Malformed JSON
             observation="invalid json",  # Malformed JSON
             tokens=50,
-            created_by_role="account",
+            created_by_role=CreatorUserRole.ACCOUNT,
             created_by=message.from_account_id,
         )
         db_session_with_containers.add(malformed_thought)
         db_session_with_containers.commit()
 
         # Execute the method under test
-        result = AgentService.get_agent_logs(app, str(conversation.id), str(message.id))
+        result = AgentService.get_agent_logs(app, conversation.id, message.id)
 
         # Verify the result - should handle malformed JSON gracefully
         assert result is not None
diff --git a/api/tests/test_containers_integration_tests/services/test_annotation_service.py b/api/tests/test_containers_integration_tests/services/test_annotation_service.py
index 95fc73f45a..bc75562d15 100644
--- a/api/tests/test_containers_integration_tests/services/test_annotation_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_annotation_service.py
@@ -9,7 +9,7 @@ from models import Account
 from models.enums import ConversationFromSource, InvokeFrom
 from models.model import MessageAnnotation
 from services.annotation_service import AppAnnotationService
-from services.app_service import AppService
+from services.app_service import AppService, CreateAppParams
 from tests.test_containers_integration_tests.helpers import generate_valid_password
 
 
@@ -86,16 +86,16 @@ class TestAnnotationService:
         tenant = account.current_tenant
 
         # Setup app creation arguments
-        app_args = {
-            "name": fake.company(),
-            "description": fake.text(max_nb_chars=100),
-            "mode": "chat",
-            "icon_type": "emoji",
-            "icon": "🤖",
-            "icon_background": "#FF6B6B",
-            "api_rph": 100,
-            "api_rpm": 10,
-        }
+        app_args = CreateAppParams(
+            name=fake.company(),
+            description=fake.text(max_nb_chars=100),
+            mode="chat",
+            icon_type="emoji",
+            icon="🤖",
+            icon_background="#FF6B6B",
+            api_rph=100,
+            api_rpm=10,
+        )
 
         # Create app
         app_service = AppService()
diff --git a/api/tests/test_containers_integration_tests/services/test_api_token_service.py b/api/tests/test_containers_integration_tests/services/test_api_token_service.py
index a2028d3ed3..9d0082a421 100644
--- a/api/tests/test_containers_integration_tests/services/test_api_token_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_api_token_service.py
@@ -5,6 +5,7 @@ from unittest.mock import MagicMock, patch
 from uuid import uuid4
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import Unauthorized
 
 import services.api_token_service as api_token_service_module
@@ -14,7 +15,7 @@ from services.api_token_service import ApiTokenCache, CachedApiToken
 
 class TestQueryTokenFromDb:
     def test_should_return_api_token_and_cache_when_token_exists(
-        self, flask_app_with_containers, db_session_with_containers
+        self, flask_app_with_containers: Flask, db_session_with_containers
     ):
         tenant_id = str(uuid4())
         app_id = str(uuid4())
@@ -41,7 +42,7 @@ class TestQueryTokenFromDb:
         mock_record_usage.assert_called_once_with(token_value, "app")
 
     def test_should_cache_null_and_raise_unauthorized_when_token_not_found(
-        self, flask_app_with_containers, db_session_with_containers
+        self, flask_app_with_containers: Flask, db_session_with_containers
     ):
         with (
             patch.object(api_token_service_module.ApiTokenCache, "set") as mock_cache_set,
diff --git a/api/tests/test_containers_integration_tests/services/test_app_dsl_service.py b/api/tests/test_containers_integration_tests/services/test_app_dsl_service.py
index 1835650c42..ca3ae6d0cf 100644
--- a/api/tests/test_containers_integration_tests/services/test_app_dsl_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_app_dsl_service.py
@@ -3,13 +3,15 @@ from __future__ import annotations
 import base64
 import json
 from types import SimpleNamespace
-from typing import Any, cast
+from typing import Any
 from unittest.mock import MagicMock, patch
 from uuid import uuid4
 
 import pytest
 import yaml
 from faker import Faker
+from flask import Flask
+from sqlalchemy.orm import Session
 
 from core.trigger.constants import (
     TRIGGER_PLUGIN_NODE_TYPE,
@@ -33,9 +35,9 @@ from services.app_dsl_service import (
     ImportMode,
     ImportStatus,
     PendingData,
-    _check_version_compatibility,
 )
-from services.app_service import AppService
+from services.app_service import AppService, CreateAppParams
+from services.dsl_version import check_version_compatibility
 from tests.test_containers_integration_tests.helpers import generate_valid_password
 
 _DEFAULT_TENANT_ID = "00000000-0000-0000-0000-000000000001"
@@ -69,6 +71,7 @@ def _pending_yaml_content(version: str = "99.0.0") -> bytes:
 
 
 def _app_stub(**overrides: Any) -> App:
+    """Create a stub App object for testing without hitting the database."""
     defaults = {
         "id": str(uuid4()),
         "tenant_id": _DEFAULT_TENANT_ID,
@@ -81,14 +84,17 @@ def _app_stub(**overrides: Any) -> App:
         "use_icon_as_answer_icon": False,
         "app_model_config": None,
     }
-    return cast(App, SimpleNamespace(**(defaults | overrides)))
+    app = MagicMock(spec=App)
+    for key, value in (defaults | overrides).items():
+        object.__setattr__(app, key, value)
+    return app
 
 
 class TestAppDslService:
     """Integration tests for AppDslService using testcontainers."""
 
     @pytest.fixture
-    def app(self, flask_app_with_containers):
+    def app(self, flask_app_with_containers: Flask):
         return flask_app_with_containers
 
     @pytest.fixture
@@ -129,7 +135,7 @@ class TestAppDslService:
                 "enterprise_service": mock_enterprise_service,
             }
 
-    def _create_test_app_and_account(self, db_session_with_containers, mock_external_service_dependencies):
+    def _create_test_app_and_account(self, db_session_with_containers: Session, mock_external_service_dependencies):
         fake = Faker()
         with patch("services.account_service.FeatureService") as mock_account_feature_service:
             mock_account_feature_service.get_system_features.return_value.is_allow_register = True
@@ -141,16 +147,16 @@ class TestAppDslService:
             )
             TenantService.create_owner_tenant_if_not_exist(account, name=fake.company())
             tenant = account.current_tenant
-            app_args = {
-                "name": fake.company(),
-                "description": fake.text(max_nb_chars=100),
-                "mode": "chat",
-                "icon_type": "emoji",
-                "icon": "🤖",
-                "icon_background": "#FF6B6B",
-                "api_rph": 100,
-                "api_rpm": 10,
-            }
+            app_args = CreateAppParams(
+                name=fake.company(),
+                description=fake.text(max_nb_chars=100),
+                mode="chat",
+                icon_type="emoji",
+                icon="🤖",
+                icon_background="#FF6B6B",
+                api_rph=100,
+                api_rpm=10,
+            )
             app_service = AppService()
             app = app_service.create_app(tenant.id, app_args, account)
             return app, account
@@ -187,26 +193,29 @@ class TestAppDslService:
     # ── Version Compatibility ─────────────────────────────────────────
 
     def test_check_version_compatibility_invalid_version_returns_failed(self):
-        assert _check_version_compatibility("not-a-version") == ImportStatus.FAILED
+        assert check_version_compatibility("not-a-version", app_dsl_service.CURRENT_DSL_VERSION) == ImportStatus.FAILED
 
     def test_check_version_compatibility_newer_version_returns_pending(self):
-        assert _check_version_compatibility("99.0.0") == ImportStatus.PENDING
+        assert check_version_compatibility("99.0.0", app_dsl_service.CURRENT_DSL_VERSION) == ImportStatus.PENDING
 
-    def test_check_version_compatibility_major_older_returns_pending(self, monkeypatch):
+    def test_check_version_compatibility_major_older_returns_pending(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(app_dsl_service, "CURRENT_DSL_VERSION", "1.0.0")
-        assert _check_version_compatibility("0.9.9") == ImportStatus.PENDING
+        assert check_version_compatibility("0.9.9", app_dsl_service.CURRENT_DSL_VERSION) == ImportStatus.PENDING
 
     def test_check_version_compatibility_minor_older_returns_completed_with_warnings(
         self,
     ):
-        assert _check_version_compatibility("0.5.0") == ImportStatus.COMPLETED_WITH_WARNINGS
+        assert (
+            check_version_compatibility("0.5.0", app_dsl_service.CURRENT_DSL_VERSION)
+            == ImportStatus.COMPLETED_WITH_WARNINGS
+        )
 
     def test_check_version_compatibility_equal_returns_completed(self):
-        assert _check_version_compatibility(CURRENT_DSL_VERSION) == ImportStatus.COMPLETED
+        assert check_version_compatibility(CURRENT_DSL_VERSION, CURRENT_DSL_VERSION) == ImportStatus.COMPLETED
 
     # ── Import: Validation ────────────────────────────────────────────
 
-    def test_import_app_invalid_import_mode_raises_value_error(self, db_session_with_containers):
+    def test_import_app_invalid_import_mode_raises_value_error(self, db_session_with_containers: Session):
         service = AppDslService(db_session_with_containers)
         with pytest.raises(ValueError, match="Invalid import_mode"):
             service.import_app(
@@ -215,7 +224,7 @@ class TestAppDslService:
                 yaml_content="version: '0.1.0'",
             )
 
-    def test_import_app_missing_yaml_content(self, db_session_with_containers):
+    def test_import_app_missing_yaml_content(self, db_session_with_containers: Session):
         service = AppDslService(db_session_with_containers)
         result = service.import_app(
             account=_account_mock(),
@@ -225,7 +234,7 @@ class TestAppDslService:
         assert result.status == ImportStatus.FAILED
         assert "yaml_content is required" in result.error
 
-    def test_import_app_missing_yaml_url(self, db_session_with_containers):
+    def test_import_app_missing_yaml_url(self, db_session_with_containers: Session):
         service = AppDslService(db_session_with_containers)
         result = service.import_app(
             account=_account_mock(),
@@ -235,7 +244,7 @@ class TestAppDslService:
         assert result.status == ImportStatus.FAILED
         assert "yaml_url is required" in result.error
 
-    def test_import_app_yaml_not_mapping_returns_failed(self, db_session_with_containers):
+    def test_import_app_yaml_not_mapping_returns_failed(self, db_session_with_containers: Session):
         service = AppDslService(db_session_with_containers)
         result = service.import_app(
             account=_account_mock(),
@@ -245,7 +254,7 @@ class TestAppDslService:
         assert result.status == ImportStatus.FAILED
         assert "content must be a mapping" in result.error
 
-    def test_import_app_version_not_str_returns_failed(self, db_session_with_containers):
+    def test_import_app_version_not_str_returns_failed(self, db_session_with_containers: Session):
         service = AppDslService(db_session_with_containers)
         yaml_content = _yaml_dump({"version": 1, "kind": "app", "app": {"name": "x", "mode": "workflow"}})
         result = service.import_app(
@@ -256,7 +265,7 @@ class TestAppDslService:
         assert result.status == ImportStatus.FAILED
         assert "Invalid version type" in result.error
 
-    def test_import_app_missing_app_data_returns_failed(self, db_session_with_containers):
+    def test_import_app_missing_app_data_returns_failed(self, db_session_with_containers: Session):
         service = AppDslService(db_session_with_containers)
         result = service.import_app(
             account=_account_mock(),
@@ -266,7 +275,9 @@ class TestAppDslService:
         assert result.status == ImportStatus.FAILED
         assert "Missing app data" in result.error
 
-    def test_import_app_yaml_error_returns_failed(self, db_session_with_containers, monkeypatch):
+    def test_import_app_yaml_error_returns_failed(
+        self, db_session_with_containers: Session, monkeypatch: pytest.MonkeyPatch
+    ):
         def bad_safe_load(_content: str):
             raise yaml.YAMLError("bad")
 
@@ -281,7 +292,9 @@ class TestAppDslService:
         assert result.status == ImportStatus.FAILED
         assert result.error.startswith("Invalid YAML format:")
 
-    def test_import_app_unexpected_error_returns_failed(self, db_session_with_containers, monkeypatch):
+    def test_import_app_unexpected_error_returns_failed(
+        self, db_session_with_containers: Session, monkeypatch: pytest.MonkeyPatch
+    ):
         monkeypatch.setattr(
             AppDslService,
             "_create_or_update_app",
@@ -299,7 +312,9 @@ class TestAppDslService:
 
     # ── Import: YAML URL ──────────────────────────────────────────────
 
-    def test_import_app_yaml_url_fetch_error_returns_failed(self, db_session_with_containers, monkeypatch):
+    def test_import_app_yaml_url_fetch_error_returns_failed(
+        self, db_session_with_containers: Session, monkeypatch: pytest.MonkeyPatch
+    ):
         monkeypatch.setattr(
             app_dsl_service.ssrf_proxy,
             "get",
@@ -315,7 +330,9 @@ class TestAppDslService:
         assert result.status == ImportStatus.FAILED
         assert "Error fetching YAML from URL: boom" in result.error
 
-    def test_import_app_yaml_url_empty_content_returns_failed(self, db_session_with_containers, monkeypatch):
+    def test_import_app_yaml_url_empty_content_returns_failed(
+        self, db_session_with_containers: Session, monkeypatch: pytest.MonkeyPatch
+    ):
         response = MagicMock()
         response.content = b""
         response.raise_for_status.return_value = None
@@ -330,7 +347,9 @@ class TestAppDslService:
         assert result.status == ImportStatus.FAILED
         assert "Empty content" in result.error
 
-    def test_import_app_yaml_url_file_too_large_returns_failed(self, db_session_with_containers, monkeypatch):
+    def test_import_app_yaml_url_file_too_large_returns_failed(
+        self, db_session_with_containers: Session, monkeypatch: pytest.MonkeyPatch
+    ):
         response = MagicMock()
         response.content = b"x" * (DSL_MAX_SIZE + 1)
         response.raise_for_status.return_value = None
@@ -345,7 +364,9 @@ class TestAppDslService:
         assert result.status == ImportStatus.FAILED
         assert "File size exceeds" in result.error
 
-    def test_import_app_yaml_url_user_attachments_keeps_original_url(self, db_session_with_containers, monkeypatch):
+    def test_import_app_yaml_url_user_attachments_keeps_original_url(
+        self, db_session_with_containers: Session, monkeypatch
+    ):
         yaml_url = "https://github.com/user-attachments/files/24290802/loop-test.yml"
         yaml_bytes = _pending_yaml_content()
 
@@ -371,7 +392,9 @@ class TestAppDslService:
         assert result.imported_dsl_version == "99.0.0"
         assert requested_urls == [yaml_url]
 
-    def test_import_app_yaml_url_github_blob_rewrites_to_raw(self, db_session_with_containers, monkeypatch):
+    def test_import_app_yaml_url_github_blob_rewrites_to_raw(
+        self, db_session_with_containers: Session, monkeypatch: pytest.MonkeyPatch
+    ):
         yaml_url = "https://github.com/acme/repo/blob/main/app.yml"
         raw_url = "https://raw.githubusercontent.com/acme/repo/main/app.yml"
         yaml_bytes = _pending_yaml_content()
@@ -400,7 +423,7 @@ class TestAppDslService:
 
     # ── Import: App ID checks ────────────────────────────────────────
 
-    def test_import_app_app_id_not_found_returns_failed(self, db_session_with_containers):
+    def test_import_app_app_id_not_found_returns_failed(self, db_session_with_containers: Session):
         service = AppDslService(db_session_with_containers)
         result = service.import_app(
             account=_account_mock(),
@@ -412,7 +435,7 @@ class TestAppDslService:
         assert result.error == "App not found"
 
     def test_import_app_overwrite_only_allows_workflow_and_advanced_chat(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         app, account = self._create_test_app_and_account(db_session_with_containers, mock_external_service_dependencies)
         assert app.mode == "chat"
@@ -429,7 +452,7 @@ class TestAppDslService:
 
     # ── Import: Flow ──────────────────────────────────────────────────
 
-    def test_import_app_pending_stores_import_info_in_redis(self, db_session_with_containers):
+    def test_import_app_pending_stores_import_info_in_redis(self, db_session_with_containers: Session):
         service = AppDslService(db_session_with_containers)
         result = service.import_app(
             account=_account_mock(),
@@ -449,7 +472,7 @@ class TestAppDslService:
         assert stored is not None
 
     def test_import_app_completed_uses_declared_dependencies(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         _, account = self._create_test_app_and_account(db_session_with_containers, mock_external_service_dependencies)
 
@@ -483,7 +506,7 @@ class TestAppDslService:
 
     @pytest.mark.parametrize("has_workflow", [True, False])
     def test_import_app_legacy_versions_extract_dependencies(
-        self, db_session_with_containers, monkeypatch, has_workflow: bool
+        self, db_session_with_containers: Session, monkeypatch: pytest.MonkeyPatch, has_workflow: bool
     ):
         monkeypatch.setattr(
             AppDslService,
@@ -540,13 +563,15 @@ class TestAppDslService:
 
     # ── Confirm Import ────────────────────────────────────────────────
 
-    def test_confirm_import_expired_returns_failed(self, db_session_with_containers):
+    def test_confirm_import_expired_returns_failed(self, db_session_with_containers: Session):
         service = AppDslService(db_session_with_containers)
         result = service.confirm_import(import_id=str(uuid4()), account=_account_mock())
         assert result.status == ImportStatus.FAILED
         assert "expired" in result.error
 
-    def test_confirm_import_success_deletes_redis_key(self, db_session_with_containers, monkeypatch):
+    def test_confirm_import_success_deletes_redis_key(
+        self, db_session_with_containers: Session, monkeypatch: pytest.MonkeyPatch
+    ):
         import_id = str(uuid4())
         redis_key = f"{IMPORT_INFO_REDIS_KEY_PREFIX}{import_id}"
 
@@ -579,7 +604,7 @@ class TestAppDslService:
         assert result.app_id == created_app.id
         assert redis_client.get(redis_key) is None
 
-    def test_confirm_import_invalid_pending_data_type_returns_failed(self, db_session_with_containers):
+    def test_confirm_import_invalid_pending_data_type_returns_failed(self, db_session_with_containers: Session):
         import_id = str(uuid4())
         redis_key = f"{IMPORT_INFO_REDIS_KEY_PREFIX}{import_id}"
         redis_client.setex(redis_key, IMPORT_INFO_REDIS_EXPIRY, "123")
@@ -589,7 +614,7 @@ class TestAppDslService:
         assert result.status == ImportStatus.FAILED
         assert "validation error" in result.error
 
-    def test_confirm_import_exception_returns_failed(self, db_session_with_containers):
+    def test_confirm_import_exception_returns_failed(self, db_session_with_containers: Session):
         import_id = str(uuid4())
         redis_key = f"{IMPORT_INFO_REDIS_KEY_PREFIX}{import_id}"
         redis_client.setex(redis_key, IMPORT_INFO_REDIS_EXPIRY, "not-valid-json")
@@ -600,13 +625,15 @@ class TestAppDslService:
 
     # ── Check Dependencies ────────────────────────────────────────────
 
-    def test_check_dependencies_returns_empty_when_no_redis_data(self, db_session_with_containers):
+    def test_check_dependencies_returns_empty_when_no_redis_data(self, db_session_with_containers: Session):
         service = AppDslService(db_session_with_containers)
         app_model = _app_stub()
         result = service.check_dependencies(app_model=app_model)
         assert result.leaked_dependencies == []
 
-    def test_check_dependencies_calls_analysis_service(self, db_session_with_containers, monkeypatch):
+    def test_check_dependencies_calls_analysis_service(
+        self, db_session_with_containers: Session, monkeypatch: pytest.MonkeyPatch
+    ):
         app_id = str(uuid4())
         pending = CheckDependenciesPendingData(dependencies=[], app_id=app_id)
         redis_client.setex(
@@ -634,7 +661,9 @@ class TestAppDslService:
         result = service.check_dependencies(app_model=_app_stub(id=app_id))
         assert len(result.leaked_dependencies) == 1
 
-    def test_check_dependencies_with_real_app(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_check_dependencies_with_real_app(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         app, account = self._create_test_app_and_account(db_session_with_containers, mock_external_service_dependencies)
 
         mock_dependencies_json = '{"app_id": "' + app.id + '", "dependencies": []}'
@@ -650,12 +679,14 @@ class TestAppDslService:
 
     # ── Create/Update App ─────────────────────────────────────────────
 
-    def test_create_or_update_app_missing_mode_raises(self, db_session_with_containers):
+    def test_create_or_update_app_missing_mode_raises(self, db_session_with_containers: Session):
         service = AppDslService(db_session_with_containers)
         with pytest.raises(ValueError, match="loss app mode"):
             service._create_or_update_app(app=None, data={"app": {}}, account=_account_mock())
 
-    def test_create_or_update_app_existing_app_updates_fields(self, db_session_with_containers, monkeypatch):
+    def test_create_or_update_app_existing_app_updates_fields(
+        self, db_session_with_containers: Session, monkeypatch: pytest.MonkeyPatch
+    ):
         fixed_now = object()
         monkeypatch.setattr(app_dsl_service, "naive_utc_now", lambda: fixed_now)
 
@@ -707,7 +738,7 @@ class TestAppDslService:
         assert app.icon_background == "#222222"
         assert app.updated_at is fixed_now
 
-    def test_create_or_update_app_new_app_requires_tenant(self, db_session_with_containers):
+    def test_create_or_update_app_new_app_requires_tenant(self, db_session_with_containers: Session):
         account = _account_mock()
         account.current_tenant_id = None
         service = AppDslService(db_session_with_containers)
@@ -719,7 +750,7 @@ class TestAppDslService:
             )
 
     def test_create_or_update_app_creates_workflow_app_and_saves_dependencies(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         _, account = self._create_test_app_and_account(db_session_with_containers, mock_external_service_dependencies)
 
@@ -755,7 +786,7 @@ class TestAppDslService:
         stored = redis_client.get(f"{CHECK_DEPENDENCIES_REDIS_KEY_PREFIX}{app.id}")
         assert stored is not None
 
-    def test_create_or_update_app_workflow_missing_workflow_data_raises(self, db_session_with_containers):
+    def test_create_or_update_app_workflow_missing_workflow_data_raises(self, db_session_with_containers: Session):
         service = AppDslService(db_session_with_containers)
         with pytest.raises(ValueError, match="Missing workflow data"):
             service._create_or_update_app(
@@ -764,17 +795,17 @@ class TestAppDslService:
                 account=_account_mock(),
             )
 
-    def test_create_or_update_app_chat_requires_model_config(self, db_session_with_containers):
+    def test_create_or_update_app_chat_requires_model_config(self, db_session_with_containers: Session):
         service = AppDslService(db_session_with_containers)
         with pytest.raises(ValueError, match="Missing model_config"):
             service._create_or_update_app(
-                app=_app_stub(mode=AppMode.CHAT.value),
-                data={"app": {"mode": AppMode.CHAT.value}},
+                app=_app_stub(mode=AppMode.CHAT),
+                data={"app": {"mode": AppMode.CHAT}},
                 account=_account_mock(),
             )
 
     def test_create_or_update_app_chat_creates_model_config_and_sends_event(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         app, account = self._create_test_app_and_account(db_session_with_containers, mock_external_service_dependencies)
         app.app_model_config_id = None
@@ -784,7 +815,7 @@ class TestAppDslService:
         service._create_or_update_app(
             app=app,
             data={
-                "app": {"mode": AppMode.CHAT.value},
+                "app": {"mode": AppMode.CHAT},
                 "model_config": {"model": {"provider": "openai"}},
             },
             account=account,
@@ -793,18 +824,18 @@ class TestAppDslService:
         db_session_with_containers.expire_all()
         assert app.app_model_config_id is not None
 
-    def test_create_or_update_app_invalid_mode_raises(self, db_session_with_containers):
+    def test_create_or_update_app_invalid_mode_raises(self, db_session_with_containers: Session):
         service = AppDslService(db_session_with_containers)
         with pytest.raises(ValueError, match="Invalid app mode"):
             service._create_or_update_app(
-                app=_app_stub(mode=AppMode.RAG_PIPELINE.value),
-                data={"app": {"mode": AppMode.RAG_PIPELINE.value}},
+                app=_app_stub(mode=AppMode.RAG_PIPELINE),
+                data={"app": {"mode": AppMode.RAG_PIPELINE}},
                 account=_account_mock(),
             )
 
     # ── Export ─────────────────────────────────────────────────────────
 
-    def test_export_dsl_delegates_by_mode(self, monkeypatch):
+    def test_export_dsl_delegates_by_mode(self, monkeypatch: pytest.MonkeyPatch):
         workflow_calls: list[bool] = []
         model_calls: list[bool] = []
         monkeypatch.setattr(
@@ -826,14 +857,14 @@ class TestAppDslService:
         assert workflow_calls == [True]
 
         chat_app = _app_stub(
-            mode=AppMode.CHAT.value,
+            mode=AppMode.CHAT,
             icon_type="emoji",
             app_model_config=SimpleNamespace(to_dict=lambda: {"agent_mode": {"tools": []}}),
         )
         AppDslService.export_dsl(chat_app)
         assert model_calls == [True]
 
-    def test_export_dsl_preserves_icon_and_icon_type(self, monkeypatch):
+    def test_export_dsl_preserves_icon_and_icon_type(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(
             AppDslService,
             "_append_workflow_export_data",
@@ -870,7 +901,7 @@ class TestAppDslService:
         assert data["app"]["icon_type"] == "image"
         assert data["app"]["icon_background"] == "#FFEAD5"
 
-    def test_export_dsl_chat_app_success(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_export_dsl_chat_app_success(self, db_session_with_containers: Session, mock_external_service_dependencies):
         app, account = self._create_test_app_and_account(db_session_with_containers, mock_external_service_dependencies)
 
         model_config = AppModelConfig(
@@ -908,7 +939,9 @@ class TestAppDslService:
         assert "model_config" in exported_data
         assert "dependencies" in exported_data
 
-    def test_export_dsl_workflow_app_success(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_export_dsl_workflow_app_success(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         app, account = self._create_test_app_and_account(db_session_with_containers, mock_external_service_dependencies)
         app.mode = "workflow"
         db_session_with_containers.commit()
@@ -941,7 +974,9 @@ class TestAppDslService:
         assert "workflow" in exported_data
         assert "dependencies" in exported_data
 
-    def test_export_dsl_with_workflow_id_success(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_export_dsl_with_workflow_id_success(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         app, account = self._create_test_app_and_account(db_session_with_containers, mock_external_service_dependencies)
         app.mode = "workflow"
         db_session_with_containers.commit()
@@ -981,7 +1016,7 @@ class TestAppDslService:
         assert "workflow" in exported_data
 
     def test_export_dsl_with_invalid_workflow_id_raises_error(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         app, account = self._create_test_app_and_account(db_session_with_containers, mock_external_service_dependencies)
         app.mode = "workflow"
@@ -997,7 +1032,7 @@ class TestAppDslService:
 
     # ── Workflow Export Data ───────────────────────────────────────────
 
-    def test_append_workflow_export_data_filters_and_overrides(self, monkeypatch):
+    def test_append_workflow_export_data_filters_and_overrides(self, monkeypatch: pytest.MonkeyPatch):
         workflow_dict = {
             "graph": {
                 "nodes": [
@@ -1097,7 +1132,7 @@ class TestAppDslService:
         assert nodes[5]["data"]["subscription_id"] == ""
         assert export_data["dependencies"] == [{"tenant": _DEFAULT_TENANT_ID, "dep": "dep-1"}]
 
-    def test_append_workflow_export_data_missing_workflow_raises(self, monkeypatch):
+    def test_append_workflow_export_data_missing_workflow_raises(self, monkeypatch: pytest.MonkeyPatch):
         workflow_service = MagicMock()
         workflow_service.get_draft_workflow.return_value = None
         monkeypatch.setattr(app_dsl_service, "WorkflowService", lambda: workflow_service)
@@ -1112,7 +1147,7 @@ class TestAppDslService:
 
     # ── Model Config Export Data ──────────────────────────────────────
 
-    def test_append_model_config_export_data_filters_credential_id(self, monkeypatch):
+    def test_append_model_config_export_data_filters_credential_id(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(
             AppDslService,
             "_extract_dependencies_from_model_config",
@@ -1146,7 +1181,7 @@ class TestAppDslService:
 
     # ── Dependency Extraction ─────────────────────────────────────────
 
-    def test_extract_dependencies_from_workflow_graph_covers_all_node_types(self, monkeypatch):
+    def test_extract_dependencies_from_workflow_graph_covers_all_node_types(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(
             app_dsl_service.DependenciesAnalysisService,
             "analyze_tool_dependency",
@@ -1216,7 +1251,7 @@ class TestAppDslService:
             "model:m4",
         ]
 
-    def test_extract_dependencies_from_workflow_graph_handles_exceptions(self, monkeypatch):
+    def test_extract_dependencies_from_workflow_graph_handles_exceptions(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(
             app_dsl_service.ToolNodeData,
             "model_validate",
@@ -1227,7 +1262,7 @@ class TestAppDslService:
         )
         assert deps == []
 
-    def test_extract_dependencies_from_model_config_parses_providers(self, monkeypatch):
+    def test_extract_dependencies_from_model_config_parses_providers(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(
             app_dsl_service.DependenciesAnalysisService,
             "analyze_model_provider_dependency",
@@ -1250,7 +1285,7 @@ class TestAppDslService:
         )
         assert deps == ["model:p1", "model:p2", "tool:t1"]
 
-    def test_extract_dependencies_from_model_config_handles_exceptions(self, monkeypatch):
+    def test_extract_dependencies_from_model_config_handles_exceptions(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(
             app_dsl_service.DependenciesAnalysisService,
             "analyze_model_provider_dependency",
@@ -1264,7 +1299,7 @@ class TestAppDslService:
     def test_get_leaked_dependencies_empty_returns_empty(self):
         assert AppDslService.get_leaked_dependencies(_DEFAULT_TENANT_ID, []) == []
 
-    def test_get_leaked_dependencies_delegates(self, monkeypatch):
+    def test_get_leaked_dependencies_delegates(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(
             app_dsl_service.DependenciesAnalysisService,
             "get_leaked_dependencies",
@@ -1275,7 +1310,7 @@ class TestAppDslService:
 
     # ── Encryption/Decryption ─────────────────────────────────────────
 
-    def test_encrypt_decrypt_dataset_id_respects_config(self, monkeypatch):
+    def test_encrypt_decrypt_dataset_id_respects_config(self, monkeypatch: pytest.MonkeyPatch):
         tenant_id = _DEFAULT_TENANT_ID
         dataset_uuid = "00000000-0000-0000-0000-000000000000"
 
@@ -1300,7 +1335,7 @@ class TestAppDslService:
         value = "00000000-0000-0000-0000-000000000000"
         assert AppDslService.decrypt_dataset_id(encrypted_data=value, tenant_id=_DEFAULT_TENANT_ID) == value
 
-    def test_decrypt_dataset_id_returns_none_on_invalid_data(self, monkeypatch):
+    def test_decrypt_dataset_id_returns_none_on_invalid_data(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(
             app_dsl_service.dify_config,
             "DSL_EXPORT_ENCRYPT_DATASET_ID",
@@ -1308,7 +1343,7 @@ class TestAppDslService:
         )
         assert AppDslService.decrypt_dataset_id(encrypted_data="not-base64", tenant_id=_DEFAULT_TENANT_ID) is None
 
-    def test_decrypt_dataset_id_returns_none_when_decrypted_is_not_uuid(self, monkeypatch):
+    def test_decrypt_dataset_id_returns_none_when_decrypted_is_not_uuid(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(
             app_dsl_service.dify_config,
             "DSL_EXPORT_ENCRYPT_DATASET_ID",
diff --git a/api/tests/test_containers_integration_tests/services/test_app_generate_service.py b/api/tests/test_containers_integration_tests/services/test_app_generate_service.py
index 3229693fd4..8be4c040b7 100644
--- a/api/tests/test_containers_integration_tests/services/test_app_generate_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_app_generate_service.py
@@ -1,4 +1,5 @@
 import uuid
+from typing import Literal
 from unittest.mock import ANY, MagicMock, patch
 
 import pytest
@@ -7,6 +8,7 @@ from faker import Faker
 from sqlalchemy.orm import Session
 
 from core.app.entities.app_invoke_entities import InvokeFrom
+from models import App
 from models.model import EndUser
 from models.workflow import Workflow
 from services.app_generate_service import AppGenerateService
@@ -132,7 +134,10 @@ class TestAppGenerateService:
             }
 
     def _create_test_app_and_account(
-        self, db_session_with_containers: Session, mock_external_service_dependencies, mode="chat"
+        self,
+        db_session_with_containers: Session,
+        mock_external_service_dependencies,
+        mode: Literal["chat", "agent-chat", "advanced-chat", "workflow", "completion"] = "chat",
     ):
         """
         Helper method to create a test app and account for testing.
@@ -164,27 +169,27 @@ class TestAppGenerateService:
         TenantService.create_owner_tenant_if_not_exist(account, name=fake.company())
         tenant = account.current_tenant
 
-        # Create app with realistic data
-        app_args = {
-            "name": fake.company(),
-            "description": fake.text(max_nb_chars=100),
-            "mode": mode,
-            "icon_type": "emoji",
-            "icon": "🤖",
-            "icon_background": "#FF6B6B",
-            "api_rph": 100,
-            "api_rpm": 10,
-            "max_active_requests": 5,
-        }
+        from services.app_service import AppService, CreateAppParams
 
-        from services.app_service import AppService
+        # Create app with realistic data
+        app_args = CreateAppParams(
+            name=fake.company(),
+            description=fake.text(max_nb_chars=100),
+            mode=mode,
+            icon_type="emoji",
+            icon="🤖",
+            icon_background="#FF6B6B",
+            api_rph=100,
+            api_rpm=10,
+            max_active_requests=5,
+        )
 
         app_service = AppService()
         app = app_service.create_app(tenant.id, app_args, account)
 
         return app, account
 
-    def _create_test_workflow(self, db_session_with_containers: Session, app):
+    def _create_test_workflow(self, db_session_with_containers: Session, app: App):
         """
         Helper method to create a test workflow for testing.
 
diff --git a/api/tests/test_containers_integration_tests/services/test_app_service.py b/api/tests/test_containers_integration_tests/services/test_app_service.py
index b695ae9fd9..c37fce296f 100644
--- a/api/tests/test_containers_integration_tests/services/test_app_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_app_service.py
@@ -2,16 +2,18 @@ from unittest.mock import create_autospec, patch
 
 import pytest
 from faker import Faker
+from pydantic import ValidationError
 from sqlalchemy.orm import Session
 
 from constants.model_template import default_app_templates
 from models import Account
+from models.enums import AppStatus, CustomizeTokenStrategy
 from models.model import App, IconType, Site
 from services.account_service import AccountService, TenantService
 from tests.test_containers_integration_tests.helpers import generate_valid_password
 
 # Delay import of AppService to avoid circular dependency
-# from services.app_service import AppService
+# from services.app_service import AppService, AppListParams, CreateAppParams
 
 
 class TestAppService:
@@ -63,34 +65,34 @@ class TestAppService:
         tenant = account.current_tenant
 
         # Setup app creation arguments
-        app_args = {
-            "name": fake.company(),
-            "description": fake.text(max_nb_chars=100),
-            "mode": "chat",
-            "icon_type": "emoji",
-            "icon": "🤖",
-            "icon_background": "#FF6B6B",
-            "api_rph": 100,
-            "api_rpm": 10,
-        }
+        # Import here to avoid circular dependency
+        from services.app_service import AppService, CreateAppParams
+
+        app_params = CreateAppParams(
+            name=fake.company(),
+            description=fake.text(max_nb_chars=100),
+            mode="chat",
+            icon_type="emoji",
+            icon="🤖",
+            icon_background="#FF6B6B",
+            api_rph=100,
+            api_rpm=10,
+        )
 
         # Create app
-        # Import here to avoid circular dependency
-        from services.app_service import AppService
-
         app_service = AppService()
-        app = app_service.create_app(tenant.id, app_args, account)
+        app = app_service.create_app(tenant.id, app_params, account)
 
         # Verify app was created correctly
-        assert app.name == app_args["name"]
-        assert app.description == app_args["description"]
-        assert app.mode == app_args["mode"]
-        assert app.icon_type == app_args["icon_type"]
-        assert app.icon == app_args["icon"]
-        assert app.icon_background == app_args["icon_background"]
+        assert app.name == app_params.name
+        assert app.description == app_params.description
+        assert app.mode == app_params.mode
+        assert app.icon_type == app_params.icon_type
+        assert app.icon == app_params.icon
+        assert app.icon_background == app_params.icon_background
         assert app.tenant_id == tenant.id
-        assert app.api_rph == app_args["api_rph"]
-        assert app.api_rpm == app_args["api_rpm"]
+        assert app.api_rph == app_params.api_rph
+        assert app.api_rpm == app_params.api_rpm
         assert app.created_by == account.id
         assert app.updated_by == account.id
         assert app.status == "normal"
@@ -119,7 +121,7 @@ class TestAppService:
         tenant = account.current_tenant
 
         # Import here to avoid circular dependency
-        from services.app_service import AppService
+        from services.app_service import AppService, CreateAppParams
 
         app_service = AppService()
 
@@ -128,20 +130,20 @@ class TestAppService:
         app_modes = [v.value for v in default_app_templates]
 
         for mode in app_modes:
-            app_args = {
-                "name": f"{fake.company()} {mode}",
-                "description": f"Test app for {mode} mode",
-                "mode": mode,
-                "icon_type": "emoji",
-                "icon": "🚀",
-                "icon_background": "#4ECDC4",
-            }
+            app_params = CreateAppParams(
+                name=f"{fake.company()} {mode}",
+                description=f"Test app for {mode} mode",
+                mode=mode,
+                icon_type="emoji",
+                icon="🚀",
+                icon_background="#4ECDC4",
+            )
 
-            app = app_service.create_app(tenant.id, app_args, account)
+            app = app_service.create_app(tenant.id, app_params, account)
 
             # Verify app mode was set correctly
             assert app.mode == mode
-            assert app.name == app_args["name"]
+            assert app.name == app_params.name
             assert app.tenant_id == tenant.id
             assert app.created_by == account.id
 
@@ -162,20 +164,20 @@ class TestAppService:
         tenant = account.current_tenant
 
         # Create app first
-        app_args = {
-            "name": fake.company(),
-            "description": fake.text(max_nb_chars=100),
-            "mode": "chat",
-            "icon_type": "emoji",
-            "icon": "🎯",
-            "icon_background": "#45B7D1",
-        }
-
         # Import here to avoid circular dependency
-        from services.app_service import AppService
+        from services.app_service import AppService, CreateAppParams
+
+        app_params = CreateAppParams(
+            name=fake.company(),
+            description=fake.text(max_nb_chars=100),
+            mode="chat",
+            icon_type="emoji",
+            icon="🎯",
+            icon_background="#45B7D1",
+        )
 
         app_service = AppService()
-        created_app = app_service.create_app(tenant.id, app_args, account)
+        created_app = app_service.create_app(tenant.id, app_params, account)
 
         # Get app using the service - needs current_user mock
         mock_current_user = create_autospec(Account, instance=True)
@@ -210,31 +212,27 @@ class TestAppService:
         tenant = account.current_tenant
 
         # Import here to avoid circular dependency
-        from services.app_service import AppService
+        from services.app_service import AppListParams, AppService, CreateAppParams
 
         app_service = AppService()
 
         # Create multiple apps
         app_names = [fake.company() for _ in range(5)]
         for name in app_names:
-            app_args = {
-                "name": name,
-                "description": fake.text(max_nb_chars=100),
-                "mode": "chat",
-                "icon_type": "emoji",
-                "icon": "📱",
-                "icon_background": "#96CEB4",
-            }
-            app_service.create_app(tenant.id, app_args, account)
+            app_params = CreateAppParams(
+                name=name,
+                description=fake.text(max_nb_chars=100),
+                mode="chat",
+                icon_type="emoji",
+                icon="📱",
+                icon_background="#96CEB4",
+            )
+            app_service.create_app(tenant.id, app_params, account)
 
         # Get paginated apps
-        args = {
-            "page": 1,
-            "limit": 10,
-            "mode": "chat",
-        }
+        params = AppListParams(page=1, limit=10, mode="chat")
 
-        paginated_apps = app_service.get_paginate_apps(account.id, tenant.id, args)
+        paginated_apps = app_service.get_paginate_apps(account.id, tenant.id, params)
 
         # Verify pagination results
         assert paginated_apps is not None
@@ -266,60 +264,47 @@ class TestAppService:
         tenant = account.current_tenant
 
         # Import here to avoid circular dependency
-        from services.app_service import AppService
+        from services.app_service import AppListParams, AppService, CreateAppParams
 
         app_service = AppService()
 
         # Create apps with different modes
-        chat_app_args = {
-            "name": "Chat App",
-            "description": "A chat application",
-            "mode": "chat",
-            "icon_type": "emoji",
-            "icon": "💬",
-            "icon_background": "#FF6B6B",
-        }
-        completion_app_args = {
-            "name": "Completion App",
-            "description": "A completion application",
-            "mode": "completion",
-            "icon_type": "emoji",
-            "icon": "✍️",
-            "icon_background": "#4ECDC4",
-        }
+        chat_app_params = CreateAppParams(
+            name="Chat App",
+            description="A chat application",
+            mode="chat",
+            icon_type="emoji",
+            icon="💬",
+            icon_background="#FF6B6B",
+        )
+        completion_app_params = CreateAppParams(
+            name="Completion App",
+            description="A completion application",
+            mode="completion",
+            icon_type="emoji",
+            icon="✍️",
+            icon_background="#4ECDC4",
+        )
 
-        chat_app = app_service.create_app(tenant.id, chat_app_args, account)
-        completion_app = app_service.create_app(tenant.id, completion_app_args, account)
+        chat_app = app_service.create_app(tenant.id, chat_app_params, account)
+        completion_app = app_service.create_app(tenant.id, completion_app_params, account)
 
         # Test filter by mode
-        chat_args = {
-            "page": 1,
-            "limit": 10,
-            "mode": "chat",
-        }
-        chat_apps = app_service.get_paginate_apps(account.id, tenant.id, chat_args)
+        chat_apps = app_service.get_paginate_apps(account.id, tenant.id, AppListParams(page=1, limit=10, mode="chat"))
         assert len(chat_apps.items) == 1
         assert chat_apps.items[0].mode == "chat"
 
         # Test filter by name
-        name_args = {
-            "page": 1,
-            "limit": 10,
-            "mode": "chat",
-            "name": "Chat",
-        }
-        filtered_apps = app_service.get_paginate_apps(account.id, tenant.id, name_args)
+        filtered_apps = app_service.get_paginate_apps(
+            account.id, tenant.id, AppListParams(page=1, limit=10, mode="chat", name="Chat")
+        )
         assert len(filtered_apps.items) == 1
         assert "Chat" in filtered_apps.items[0].name
 
         # Test filter by created_by_me
-        created_by_me_args = {
-            "page": 1,
-            "limit": 10,
-            "mode": "completion",
-            "is_created_by_me": True,
-        }
-        my_apps = app_service.get_paginate_apps(account.id, tenant.id, created_by_me_args)
+        my_apps = app_service.get_paginate_apps(
+            account.id, tenant.id, AppListParams(page=1, limit=10, mode="completion", is_created_by_me=True)
+        )
         assert len(my_apps.items) == 1
 
     def test_get_paginate_apps_with_tag_filters(
@@ -341,34 +326,29 @@ class TestAppService:
         tenant = account.current_tenant
 
         # Import here to avoid circular dependency
-        from services.app_service import AppService
+        from services.app_service import AppListParams, AppService, CreateAppParams
 
         app_service = AppService()
 
         # Create an app
-        app_args = {
-            "name": fake.company(),
-            "description": fake.text(max_nb_chars=100),
-            "mode": "chat",
-            "icon_type": "emoji",
-            "icon": "🏷️",
-            "icon_background": "#FFEAA7",
-        }
-        app = app_service.create_app(tenant.id, app_args, account)
+        app_params = CreateAppParams(
+            name=fake.company(),
+            description=fake.text(max_nb_chars=100),
+            mode="chat",
+            icon_type="emoji",
+            icon="🏷️",
+            icon_background="#FFEAA7",
+        )
+        app = app_service.create_app(tenant.id, app_params, account)
 
         # Mock TagService to return the app ID for tag filtering
         with patch("services.app_service.TagService.get_target_ids_by_tag_ids") as mock_tag_service:
             mock_tag_service.return_value = [app.id]
 
             # Test with tag filter
-            args = {
-                "page": 1,
-                "limit": 10,
-                "mode": "chat",
-                "tag_ids": ["tag1", "tag2"],
-            }
+            params = AppListParams(page=1, limit=10, mode="chat", tag_ids=["tag1", "tag2"])
 
-            paginated_apps = app_service.get_paginate_apps(account.id, tenant.id, args)
+            paginated_apps = app_service.get_paginate_apps(account.id, tenant.id, params)
 
             # Verify tag service was called
             mock_tag_service.assert_called_once_with("app", tenant.id, ["tag1", "tag2"])
@@ -382,14 +362,9 @@ class TestAppService:
         with patch("services.app_service.TagService.get_target_ids_by_tag_ids") as mock_tag_service:
             mock_tag_service.return_value = []
 
-            args = {
-                "page": 1,
-                "limit": 10,
-                "mode": "chat",
-                "tag_ids": ["nonexistent_tag"],
-            }
+            params = AppListParams(page=1, limit=10, mode="chat", tag_ids=["nonexistent_tag"])
 
-            paginated_apps = app_service.get_paginate_apps(account.id, tenant.id, args)
+            paginated_apps = app_service.get_paginate_apps(account.id, tenant.id, params)
 
             # Should return None when no apps match tag filter
             assert paginated_apps is None
@@ -411,20 +386,20 @@ class TestAppService:
         tenant = account.current_tenant
 
         # Create app first
-        app_args = {
-            "name": fake.company(),
-            "description": fake.text(max_nb_chars=100),
-            "mode": "chat",
-            "icon_type": "emoji",
-            "icon": "🎯",
-            "icon_background": "#45B7D1",
-        }
-
         # Import here to avoid circular dependency
-        from services.app_service import AppService
+        from services.app_service import AppService, CreateAppParams
+
+        app_params = CreateAppParams(
+            name=fake.company(),
+            description=fake.text(max_nb_chars=100),
+            mode="chat",
+            icon_type="emoji",
+            icon="🎯",
+            icon_background="#45B7D1",
+        )
 
         app_service = AppService()
-        app = app_service.create_app(tenant.id, app_args, account)
+        app = app_service.create_app(tenant.id, app_params, account)
 
         # Store original values
         original_name = app.name
@@ -480,19 +455,19 @@ class TestAppService:
         TenantService.create_owner_tenant_if_not_exist(account, name=fake.company())
         tenant = account.current_tenant
 
-        from services.app_service import AppService
+        from services.app_service import AppService, CreateAppParams
 
         app_service = AppService()
         app = app_service.create_app(
             tenant.id,
-            {
-                "name": fake.company(),
-                "description": fake.text(max_nb_chars=100),
-                "mode": "chat",
-                "icon_type": "emoji",
-                "icon": "🎯",
-                "icon_background": "#45B7D1",
-            },
+            CreateAppParams(
+                name=fake.company(),
+                description=fake.text(max_nb_chars=100),
+                mode="chat",
+                icon_type="emoji",
+                icon="🎯",
+                icon_background="#45B7D1",
+            ),
             account,
         )
 
@@ -532,19 +507,19 @@ class TestAppService:
         TenantService.create_owner_tenant_if_not_exist(account, name=fake.company())
         tenant = account.current_tenant
 
-        from services.app_service import AppService
+        from services.app_service import AppService, CreateAppParams
 
         app_service = AppService()
         app = app_service.create_app(
             tenant.id,
-            {
-                "name": fake.company(),
-                "description": fake.text(max_nb_chars=100),
-                "mode": "chat",
-                "icon_type": "emoji",
-                "icon": "🎯",
-                "icon_background": "#45B7D1",
-            },
+            CreateAppParams(
+                name=fake.company(),
+                description=fake.text(max_nb_chars=100),
+                mode="chat",
+                icon_type="emoji",
+                icon="🎯",
+                icon_background="#45B7D1",
+            ),
             account,
         )
 
@@ -583,20 +558,20 @@ class TestAppService:
         tenant = account.current_tenant
 
         # Create app first
-        app_args = {
-            "name": fake.company(),
-            "description": fake.text(max_nb_chars=100),
-            "mode": "chat",
-            "icon_type": "emoji",
-            "icon": "🎯",
-            "icon_background": "#45B7D1",
-        }
-
         # Import here to avoid circular dependency
-        from services.app_service import AppService
+        from services.app_service import AppService, CreateAppParams
+
+        app_params = CreateAppParams(
+            name=fake.company(),
+            description=fake.text(max_nb_chars=100),
+            mode="chat",
+            icon_type="emoji",
+            icon="🎯",
+            icon_background="#45B7D1",
+        )
 
         app_service = AppService()
-        app = app_service.create_app(tenant.id, app_args, account)
+        app = app_service.create_app(tenant.id, app_params, account)
 
         # Store original name
         original_name = app.name
@@ -636,20 +611,20 @@ class TestAppService:
         tenant = account.current_tenant
 
         # Create app first
-        app_args = {
-            "name": fake.company(),
-            "description": fake.text(max_nb_chars=100),
-            "mode": "chat",
-            "icon_type": "emoji",
-            "icon": "🎯",
-            "icon_background": "#45B7D1",
-        }
-
         # Import here to avoid circular dependency
-        from services.app_service import AppService
+        from services.app_service import AppService, CreateAppParams
+
+        app_params = CreateAppParams(
+            name=fake.company(),
+            description=fake.text(max_nb_chars=100),
+            mode="chat",
+            icon_type="emoji",
+            icon="🎯",
+            icon_background="#45B7D1",
+        )
 
         app_service = AppService()
-        app = app_service.create_app(tenant.id, app_args, account)
+        app = app_service.create_app(tenant.id, app_params, account)
 
         # Store original values
         original_icon = app.icon
@@ -697,18 +672,17 @@ class TestAppService:
         tenant = account.current_tenant
 
         # Create app first
-        app_args = {
-            "name": fake.company(),
-            "description": fake.text(max_nb_chars=100),
-            "mode": "chat",
-            "icon_type": "emoji",
-            "icon": "🌐",
-            "icon_background": "#74B9FF",
-        }
-
         # Import here to avoid circular dependency
-        from services.app_service import AppService
+        from services.app_service import AppService, CreateAppParams
 
+        app_args = CreateAppParams(
+            name=fake.company(),
+            description=fake.text(max_nb_chars=100),
+            mode="chat",
+            icon_type="emoji",
+            icon="🌐",
+            icon_background="#74B9FF",
+        )
         app_service = AppService()
         app = app_service.create_app(tenant.id, app_args, account)
 
@@ -757,18 +731,17 @@ class TestAppService:
         tenant = account.current_tenant
 
         # Create app first
-        app_args = {
-            "name": fake.company(),
-            "description": fake.text(max_nb_chars=100),
-            "mode": "chat",
-            "icon_type": "emoji",
-            "icon": "🔌",
-            "icon_background": "#A29BFE",
-        }
-
         # Import here to avoid circular dependency
-        from services.app_service import AppService
+        from services.app_service import AppService, CreateAppParams
 
+        app_args = CreateAppParams(
+            name=fake.company(),
+            description=fake.text(max_nb_chars=100),
+            mode="chat",
+            icon_type="emoji",
+            icon="🔌",
+            icon_background="#A29BFE",
+        )
         app_service = AppService()
         app = app_service.create_app(tenant.id, app_args, account)
 
@@ -817,18 +790,17 @@ class TestAppService:
         tenant = account.current_tenant
 
         # Create app first
-        app_args = {
-            "name": fake.company(),
-            "description": fake.text(max_nb_chars=100),
-            "mode": "chat",
-            "icon_type": "emoji",
-            "icon": "🔄",
-            "icon_background": "#FD79A8",
-        }
-
         # Import here to avoid circular dependency
-        from services.app_service import AppService
+        from services.app_service import AppService, CreateAppParams
 
+        app_args = CreateAppParams(
+            name=fake.company(),
+            description=fake.text(max_nb_chars=100),
+            mode="chat",
+            icon_type="emoji",
+            icon="🔄",
+            icon_background="#FD79A8",
+        )
         app_service = AppService()
         app = app_service.create_app(tenant.id, app_args, account)
 
@@ -868,18 +840,17 @@ class TestAppService:
         tenant = account.current_tenant
 
         # Create app first
-        app_args = {
-            "name": fake.company(),
-            "description": fake.text(max_nb_chars=100),
-            "mode": "chat",
-            "icon_type": "emoji",
-            "icon": "🗑️",
-            "icon_background": "#E17055",
-        }
-
         # Import here to avoid circular dependency
-        from services.app_service import AppService
+        from services.app_service import AppService, CreateAppParams
 
+        app_args = CreateAppParams(
+            name=fake.company(),
+            description=fake.text(max_nb_chars=100),
+            mode="chat",
+            icon_type="emoji",
+            icon="🗑️",
+            icon_background="#E17055",
+        )
         app_service = AppService()
         app = app_service.create_app(tenant.id, app_args, account)
 
@@ -920,18 +891,17 @@ class TestAppService:
         tenant = account.current_tenant
 
         # Create app first
-        app_args = {
-            "name": fake.company(),
-            "description": fake.text(max_nb_chars=100),
-            "mode": "chat",
-            "icon_type": "emoji",
-            "icon": "🧹",
-            "icon_background": "#00B894",
-        }
-
         # Import here to avoid circular dependency
-        from services.app_service import AppService
+        from services.app_service import AppService, CreateAppParams
 
+        app_args = CreateAppParams(
+            name=fake.company(),
+            description=fake.text(max_nb_chars=100),
+            mode="chat",
+            icon_type="emoji",
+            icon="🧹",
+            icon_background="#00B894",
+        )
         app_service = AppService()
         app = app_service.create_app(tenant.id, app_args, account)
 
@@ -980,18 +950,17 @@ class TestAppService:
         tenant = account.current_tenant
 
         # Create app first
-        app_args = {
-            "name": fake.company(),
-            "description": fake.text(max_nb_chars=100),
-            "mode": "chat",
-            "icon_type": "emoji",
-            "icon": "📊",
-            "icon_background": "#6C5CE7",
-        }
-
         # Import here to avoid circular dependency
-        from services.app_service import AppService
+        from services.app_service import AppService, CreateAppParams
 
+        app_args = CreateAppParams(
+            name=fake.company(),
+            description=fake.text(max_nb_chars=100),
+            mode="chat",
+            icon_type="emoji",
+            icon="📊",
+            icon_background="#6C5CE7",
+        )
         app_service = AppService()
         app = app_service.create_app(tenant.id, app_args, account)
 
@@ -1019,18 +988,17 @@ class TestAppService:
         tenant = account.current_tenant
 
         # Create app first
-        app_args = {
-            "name": fake.company(),
-            "description": fake.text(max_nb_chars=100),
-            "mode": "chat",
-            "icon_type": "emoji",
-            "icon": "🔗",
-            "icon_background": "#FDCB6E",
-        }
-
         # Import here to avoid circular dependency
-        from services.app_service import AppService
+        from services.app_service import AppService, CreateAppParams
 
+        app_args = CreateAppParams(
+            name=fake.company(),
+            description=fake.text(max_nb_chars=100),
+            mode="chat",
+            icon_type="emoji",
+            icon="🔗",
+            icon_background="#FDCB6E",
+        )
         app_service = AppService()
         app = app_service.create_app(tenant.id, app_args, account)
 
@@ -1059,18 +1027,17 @@ class TestAppService:
         tenant = account.current_tenant
 
         # Create app first
-        app_args = {
-            "name": fake.company(),
-            "description": fake.text(max_nb_chars=100),
-            "mode": "chat",
-            "icon_type": "emoji",
-            "icon": "🆔",
-            "icon_background": "#E84393",
-        }
-
         # Import here to avoid circular dependency
-        from services.app_service import AppService
+        from services.app_service import AppService, CreateAppParams
 
+        app_args = CreateAppParams(
+            name=fake.company(),
+            description=fake.text(max_nb_chars=100),
+            mode="chat",
+            icon_type="emoji",
+            icon="🆔",
+            icon_background="#E84393",
+        )
         app_service = AppService()
         app = app_service.create_app(tenant.id, app_args, account)
 
@@ -1079,9 +1046,9 @@ class TestAppService:
         site.app_id = app.id
         site.code = fake.postalcode()
         site.title = fake.company()
-        site.status = "normal"
+        site.status = AppStatus.NORMAL
         site.default_language = "en-US"
-        site.customize_token_strategy = "uuid"
+        site.customize_token_strategy = CustomizeTokenStrategy.UUID
 
         db_session_with_containers.add(site)
         db_session_with_containers.commit()
@@ -1106,26 +1073,20 @@ class TestAppService:
             password=generate_valid_password(fake),
         )
         TenantService.create_owner_tenant_if_not_exist(account, name=fake.company())
-        tenant = account.current_tenant
-
-        # Setup app creation arguments with invalid mode
-        app_args = {
-            "name": fake.company(),
-            "description": fake.text(max_nb_chars=100),
-            "mode": "invalid_mode",  # Invalid mode
-            "icon_type": "emoji",
-            "icon": "❌",
-            "icon_background": "#D63031",
-        }
 
         # Import here to avoid circular dependency
-        from services.app_service import AppService
+        from services.app_service import CreateAppParams
 
-        app_service = AppService()
-
-        # Attempt to create app with invalid mode
-        with pytest.raises(ValueError, match="invalid mode value"):
-            app_service.create_app(tenant.id, app_args, account)
+        # Attempt to create app with invalid mode - Pydantic will reject invalid literal
+        with pytest.raises(ValidationError):
+            CreateAppParams(
+                name=fake.company(),
+                description=fake.text(max_nb_chars=100),
+                mode="invalid_mode",  # type: ignore[arg-type]
+                icon_type="emoji",
+                icon="❌",
+                icon_background="#D63031",
+            )
 
     def test_get_apps_with_special_characters_in_name(
         self, db_session_with_containers: Session, mock_external_service_dependencies
@@ -1151,99 +1112,103 @@ class TestAppService:
         tenant = account.current_tenant
 
         # Import here to avoid circular dependency
-        from services.app_service import AppService
+        from services.app_service import AppListParams, AppService, CreateAppParams
 
         app_service = AppService()
 
         # Create apps with special characters in names
         app_with_percent = app_service.create_app(
             tenant.id,
-            {
-                "name": "App with 50% discount",
-                "description": fake.text(max_nb_chars=100),
-                "mode": "chat",
-                "icon_type": "emoji",
-                "icon": "🤖",
-                "icon_background": "#FF6B6B",
-                "api_rph": 100,
-                "api_rpm": 10,
-            },
+            CreateAppParams(
+                name="App with 50% discount",
+                description=fake.text(max_nb_chars=100),
+                mode="chat",
+                icon_type="emoji",
+                icon="🤖",
+                icon_background="#FF6B6B",
+                api_rph=100,
+                api_rpm=10,
+            ),
             account,
         )
 
         app_with_underscore = app_service.create_app(
             tenant.id,
-            {
-                "name": "test_data_app",
-                "description": fake.text(max_nb_chars=100),
-                "mode": "chat",
-                "icon_type": "emoji",
-                "icon": "🤖",
-                "icon_background": "#FF6B6B",
-                "api_rph": 100,
-                "api_rpm": 10,
-            },
+            CreateAppParams(
+                name="test_data_app",
+                description=fake.text(max_nb_chars=100),
+                mode="chat",
+                icon_type="emoji",
+                icon="🤖",
+                icon_background="#FF6B6B",
+                api_rph=100,
+                api_rpm=10,
+            ),
             account,
         )
 
         app_with_backslash = app_service.create_app(
             tenant.id,
-            {
-                "name": "path\\to\\app",
-                "description": fake.text(max_nb_chars=100),
-                "mode": "chat",
-                "icon_type": "emoji",
-                "icon": "🤖",
-                "icon_background": "#FF6B6B",
-                "api_rph": 100,
-                "api_rpm": 10,
-            },
+            CreateAppParams(
+                name="path\\to\\app",
+                description=fake.text(max_nb_chars=100),
+                mode="chat",
+                icon_type="emoji",
+                icon="🤖",
+                icon_background="#FF6B6B",
+                api_rph=100,
+                api_rpm=10,
+            ),
             account,
         )
 
         # Create app that should NOT match
         app_no_match = app_service.create_app(
             tenant.id,
-            {
-                "name": "100% different",
-                "description": fake.text(max_nb_chars=100),
-                "mode": "chat",
-                "icon_type": "emoji",
-                "icon": "🤖",
-                "icon_background": "#FF6B6B",
-                "api_rph": 100,
-                "api_rpm": 10,
-            },
+            CreateAppParams(
+                name="100% different",
+                description=fake.text(max_nb_chars=100),
+                mode="chat",
+                icon_type="emoji",
+                icon="🤖",
+                icon_background="#FF6B6B",
+                api_rph=100,
+                api_rpm=10,
+            ),
             account,
         )
 
         # Test 1: Search with % character
-        args = {"name": "50%", "mode": "chat", "page": 1, "limit": 10}
-        paginated_apps = app_service.get_paginate_apps(account.id, tenant.id, args)
+        paginated_apps = app_service.get_paginate_apps(
+            account.id, tenant.id, AppListParams(name="50%", mode="chat", page=1, limit=10)
+        )
         assert paginated_apps is not None
         assert paginated_apps.total == 1
         assert len(paginated_apps.items) == 1
         assert paginated_apps.items[0].name == "App with 50% discount"
 
         # Test 2: Search with _ character
-        args = {"name": "test_data", "mode": "chat", "page": 1, "limit": 10}
-        paginated_apps = app_service.get_paginate_apps(account.id, tenant.id, args)
+        paginated_apps = app_service.get_paginate_apps(
+            account.id, tenant.id, AppListParams(name="test_data", mode="chat", page=1, limit=10)
+        )
         assert paginated_apps is not None
         assert paginated_apps.total == 1
         assert len(paginated_apps.items) == 1
         assert paginated_apps.items[0].name == "test_data_app"
 
         # Test 3: Search with \ character
-        args = {"name": "path\\to\\app", "mode": "chat", "page": 1, "limit": 10}
-        paginated_apps = app_service.get_paginate_apps(account.id, tenant.id, args)
+        paginated_apps = app_service.get_paginate_apps(
+            account.id, tenant.id, AppListParams(name="path\\to\\app", mode="chat", page=1, limit=10)
+        )
         assert paginated_apps is not None
         assert paginated_apps.total == 1
         assert len(paginated_apps.items) == 1
         assert paginated_apps.items[0].name == "path\\to\\app"
 
         # Test 4: Search with % should NOT match 100% (verifies escaping works)
-        args = {"name": "50%", "mode": "chat", "page": 1, "limit": 10}
-        paginated_apps = app_service.get_paginate_apps(account.id, tenant.id, args)
+        paginated_apps = app_service.get_paginate_apps(
+            account.id, tenant.id, AppListParams(name="50%", mode="chat", page=1, limit=10)
+        )
         assert paginated_apps is not None
         assert paginated_apps.total == 1
         assert all("50%" in app.name for app in paginated_apps.items)
diff --git a/api/tests/test_containers_integration_tests/services/test_attachment_service.py b/api/tests/test_containers_integration_tests/services/test_attachment_service.py
index 768a8baee2..d0c07f0de8 100644
--- a/api/tests/test_containers_integration_tests/services/test_attachment_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_attachment_service.py
@@ -7,7 +7,7 @@ from uuid import uuid4
 
 import pytest
 from sqlalchemy import create_engine
-from sqlalchemy.orm import sessionmaker
+from sqlalchemy.orm import Session, sessionmaker
 from werkzeug.exceptions import NotFound
 
 import services.attachment_service as attachment_service_module
@@ -19,7 +19,7 @@ from services.attachment_service import AttachmentService
 
 
 class TestAttachmentService:
-    def _create_upload_file(self, db_session_with_containers, *, tenant_id: str | None = None) -> UploadFile:
+    def _create_upload_file(self, db_session_with_containers: Session, *, tenant_id: str | None = None) -> UploadFile:
         upload_file = UploadFile(
             tenant_id=tenant_id or str(uuid4()),
             storage_type=StorageType.OPENDAL,
@@ -60,7 +60,7 @@ class TestAttachmentService:
         with pytest.raises(AssertionError, match="must be a sessionmaker or an Engine."):
             AttachmentService(session_factory=invalid_session_factory)
 
-    def test_should_return_base64_when_file_exists(self, db_session_with_containers):
+    def test_should_return_base64_when_file_exists(self, db_session_with_containers: Session):
         upload_file = self._create_upload_file(db_session_with_containers)
         service = AttachmentService(session_factory=sessionmaker(bind=db.engine))
 
@@ -70,7 +70,7 @@ class TestAttachmentService:
         assert result == base64.b64encode(b"binary-content").decode()
         mock_load.assert_called_once_with(upload_file.key)
 
-    def test_should_raise_not_found_when_file_missing(self, db_session_with_containers):
+    def test_should_raise_not_found_when_file_missing(self, db_session_with_containers: Session):
         service = AttachmentService(session_factory=sessionmaker(bind=db.engine))
 
         with patch.object(attachment_service_module.storage, "load_once") as mock_load:
diff --git a/api/tests/test_containers_integration_tests/services/test_billing_service.py b/api/tests/test_containers_integration_tests/services/test_billing_service.py
index 8092c7ad75..4893126d7f 100644
--- a/api/tests/test_containers_integration_tests/services/test_billing_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_billing_service.py
@@ -4,6 +4,7 @@ from unittest.mock import patch
 from uuid import uuid4
 
 import pytest
+from flask import Flask
 from sqlalchemy.orm import Session
 
 from extensions.ext_redis import redis_client
@@ -24,7 +25,7 @@ class TestBillingServiceGetPlanBulkWithCache:
     """
 
     @pytest.fixture(autouse=True)
-    def setup_redis_cleanup(self, flask_app_with_containers):
+    def setup_redis_cleanup(self, flask_app_with_containers: Flask):
         """Clean up Redis cache before and after each test."""
         with flask_app_with_containers.app_context():
             # Clean up before test
@@ -56,7 +57,7 @@ class TestBillingServiceGetPlanBulkWithCache:
             return value
         return None
 
-    def test_get_plan_bulk_with_cache_all_cache_hit(self, flask_app_with_containers):
+    def test_get_plan_bulk_with_cache_all_cache_hit(self, flask_app_with_containers: Flask):
         """Test bulk plan retrieval when all tenants are in cache."""
         with flask_app_with_containers.app_context():
             # Arrange
@@ -87,7 +88,7 @@ class TestBillingServiceGetPlanBulkWithCache:
             # Verify API was not called
             mock_get_plan_bulk.assert_not_called()
 
-    def test_get_plan_bulk_with_cache_all_cache_miss(self, flask_app_with_containers):
+    def test_get_plan_bulk_with_cache_all_cache_miss(self, flask_app_with_containers: Flask):
         """Test bulk plan retrieval when all tenants are not in cache."""
         with flask_app_with_containers.app_context():
             # Arrange
@@ -127,7 +128,7 @@ class TestBillingServiceGetPlanBulkWithCache:
             assert ttl_1 > 0
             assert ttl_1 <= 600  # Should be <= 600 seconds
 
-    def test_get_plan_bulk_with_cache_partial_cache_hit(self, flask_app_with_containers):
+    def test_get_plan_bulk_with_cache_partial_cache_hit(self, flask_app_with_containers: Flask):
         """Test bulk plan retrieval when some tenants are in cache, some are not."""
         with flask_app_with_containers.app_context():
             # Arrange
@@ -158,7 +159,7 @@ class TestBillingServiceGetPlanBulkWithCache:
             cached_data_3 = json.loads(cached_3)
             assert cached_data_3 == missing_plan["tenant-3"]
 
-    def test_get_plan_bulk_with_cache_redis_mget_failure(self, flask_app_with_containers):
+    def test_get_plan_bulk_with_cache_redis_mget_failure(self, flask_app_with_containers: Flask):
         """Test fallback to API when Redis mget fails."""
         with flask_app_with_containers.app_context():
             # Arrange
@@ -189,7 +190,7 @@ class TestBillingServiceGetPlanBulkWithCache:
             assert cached_1 is not None
             assert cached_2 is not None
 
-    def test_get_plan_bulk_with_cache_invalid_json_in_cache(self, flask_app_with_containers):
+    def test_get_plan_bulk_with_cache_invalid_json_in_cache(self, flask_app_with_containers: Flask):
         """Test fallback to API when cache contains invalid JSON."""
         with flask_app_with_containers.app_context():
             # Arrange
@@ -241,7 +242,7 @@ class TestBillingServiceGetPlanBulkWithCache:
             cached_data_3 = json.loads(cached_3)
             assert cached_data_3 == expected_plans["tenant-3"]
 
-    def test_get_plan_bulk_with_cache_invalid_plan_data_in_cache(self, flask_app_with_containers):
+    def test_get_plan_bulk_with_cache_invalid_plan_data_in_cache(self, flask_app_with_containers: Flask):
         """Test fallback to API when cache data doesn't match SubscriptionPlan schema."""
         with flask_app_with_containers.app_context():
             # Arrange
@@ -274,7 +275,7 @@ class TestBillingServiceGetPlanBulkWithCache:
             # Verify API was called for tenant-2 and tenant-3
             mock_get_plan_bulk.assert_called_once_with(["tenant-2", "tenant-3"])
 
-    def test_get_plan_bulk_with_cache_redis_pipeline_failure(self, flask_app_with_containers):
+    def test_get_plan_bulk_with_cache_redis_pipeline_failure(self, flask_app_with_containers: Flask):
         """Test that pipeline failure doesn't affect return value."""
         with flask_app_with_containers.app_context():
             # Arrange
@@ -303,7 +304,7 @@ class TestBillingServiceGetPlanBulkWithCache:
             # Verify pipeline was attempted
             mock_pipeline.assert_called_once()
 
-    def test_get_plan_bulk_with_cache_empty_tenant_ids(self, flask_app_with_containers):
+    def test_get_plan_bulk_with_cache_empty_tenant_ids(self, flask_app_with_containers: Flask):
         """Test with empty tenant_ids list."""
         with flask_app_with_containers.app_context():
             # Act
@@ -321,7 +322,7 @@ class TestBillingServiceGetPlanBulkWithCache:
             # But we should check that mget was not called at all
             # Since we can't easily verify this without more mocking, we just verify the result
 
-    def test_get_plan_bulk_with_cache_ttl_expired(self, flask_app_with_containers):
+    def test_get_plan_bulk_with_cache_ttl_expired(self, flask_app_with_containers: Flask):
         """Test that expired cache keys are treated as cache misses."""
         with flask_app_with_containers.app_context():
             # Arrange
diff --git a/api/tests/test_containers_integration_tests/services/test_conversation_service.py b/api/tests/test_containers_integration_tests/services/test_conversation_service.py
index 98c38f2b5f..5f3914eb19 100644
--- a/api/tests/test_containers_integration_tests/services/test_conversation_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_conversation_service.py
@@ -7,8 +7,10 @@ from uuid import uuid4
 
 import pytest
 from sqlalchemy import select
+from sqlalchemy.orm import Session
 
 from core.app.entities.app_invoke_entities import InvokeFrom
+from models import TenantAccountRole
 from models.account import Account, Tenant, TenantAccountJoin
 from models.enums import ConversationFromSource
 from models.model import App, Conversation, EndUser, Message, MessageAnnotation
@@ -21,7 +23,7 @@ from services.message_service import MessageService
 
 class ConversationServiceIntegrationTestDataFactory:
     @staticmethod
-    def create_app_and_account(db_session_with_containers):
+    def create_app_and_account(db_session_with_containers: Session):
         tenant = Tenant(name=f"Tenant {uuid4()}")
         db_session_with_containers.add(tenant)
         db_session_with_containers.flush()
@@ -40,7 +42,7 @@ class ConversationServiceIntegrationTestDataFactory:
         tenant_join = TenantAccountJoin(
             tenant_id=tenant.id,
             account_id=account.id,
-            role="owner",
+            role=TenantAccountRole.OWNER,
             current=True,
         )
         db_session_with_containers.add(tenant_join)
@@ -154,7 +156,7 @@ class ConversationServiceIntegrationTestDataFactory:
             total_price=Decimal(0),
             currency="USD",
             status="normal",
-            invoke_from=InvokeFrom.WEB_APP.value,
+            invoke_from=InvokeFrom.WEB_APP,
             from_source=ConversationFromSource.API if isinstance(user, EndUser) else ConversationFromSource.CONSOLE,
             from_end_user_id=user.id if isinstance(user, EndUser) else None,
             from_account_id=user.id if isinstance(user, Account) else None,
@@ -170,7 +172,7 @@ class ConversationServiceIntegrationTestDataFactory:
 class TestConversationServicePagination:
     """Test conversation pagination operations."""
 
-    def test_pagination_with_non_empty_include_ids(self, db_session_with_containers):
+    def test_pagination_with_non_empty_include_ids(self, db_session_with_containers: Session):
         """
         Test that non-empty include_ids filters properly.
 
@@ -204,7 +206,7 @@ class TestConversationServicePagination:
         returned_ids = {conversation.id for conversation in result.data}
         assert returned_ids == {conversations[0].id, conversations[1].id}
 
-    def test_pagination_with_empty_exclude_ids(self, db_session_with_containers):
+    def test_pagination_with_empty_exclude_ids(self, db_session_with_containers: Session):
         """
         Test that empty exclude_ids doesn't filter.
 
@@ -237,7 +239,7 @@ class TestConversationServicePagination:
         # Assert
         assert len(result.data) == len(conversations)
 
-    def test_pagination_with_non_empty_exclude_ids(self, db_session_with_containers):
+    def test_pagination_with_non_empty_exclude_ids(self, db_session_with_containers: Session):
         """
         Test that non-empty exclude_ids filters properly.
 
@@ -271,7 +273,7 @@ class TestConversationServicePagination:
         returned_ids = {conversation.id for conversation in result.data}
         assert returned_ids == {conversations[2].id}
 
-    def test_pagination_with_sorting_descending(self, db_session_with_containers):
+    def test_pagination_with_sorting_descending(self, db_session_with_containers: Session):
         """
         Test pagination with descending sort order.
 
@@ -316,7 +318,7 @@ class TestConversationServiceMessageCreation:
     within conversations.
     """
 
-    def test_pagination_by_first_id_without_first_id(self, db_session_with_containers):
+    def test_pagination_by_first_id_without_first_id(self, db_session_with_containers: Session):
         """
         Test message pagination without specifying first_id.
 
@@ -354,7 +356,7 @@ class TestConversationServiceMessageCreation:
         assert len(result.data) == 3  # All 3 messages returned
         assert result.has_more is False  # No more messages available (3 < limit of 10)
 
-    def test_pagination_by_first_id_with_first_id(self, db_session_with_containers):
+    def test_pagination_by_first_id_with_first_id(self, db_session_with_containers: Session):
         """
         Test message pagination with first_id specified.
 
@@ -399,7 +401,9 @@ class TestConversationServiceMessageCreation:
         assert len(result.data) == 2  # Only 2 messages returned after first_id
         assert result.has_more is False  # No more messages available (2 < limit of 10)
 
-    def test_pagination_by_first_id_raises_error_when_first_message_not_found(self, db_session_with_containers):
+    def test_pagination_by_first_id_raises_error_when_first_message_not_found(
+        self, db_session_with_containers: Session
+    ):
         """
         Test that FirstMessageNotExistsError is raised when first_id doesn't exist.
 
@@ -424,7 +428,7 @@ class TestConversationServiceMessageCreation:
                 limit=10,
             )
 
-    def test_pagination_with_has_more_flag(self, db_session_with_containers):
+    def test_pagination_with_has_more_flag(self, db_session_with_containers: Session):
         """
         Test that has_more flag is correctly set when there are more messages.
 
@@ -463,7 +467,7 @@ class TestConversationServiceMessageCreation:
         assert len(result.data) == limit  # Extra message should be removed
         assert result.has_more is True  # Flag should be set
 
-    def test_pagination_with_ascending_order(self, db_session_with_containers):
+    def test_pagination_with_ascending_order(self, db_session_with_containers: Session):
         """
         Test message pagination with ascending order.
 
@@ -512,7 +516,7 @@ class TestConversationServiceSummarization:
     """
 
     @patch("services.conversation_service.LLMGenerator.generate_conversation_name")
-    def test_auto_generate_name_success(self, mock_llm_generator, db_session_with_containers):
+    def test_auto_generate_name_success(self, mock_llm_generator, db_session_with_containers: Session):
         """
         Test successful auto-generation of conversation name.
 
@@ -552,7 +556,7 @@ class TestConversationServiceSummarization:
             app_model.tenant_id, first_message.query, conversation.id, app_model.id
         )
 
-    def test_auto_generate_name_raises_error_when_no_message(self, db_session_with_containers):
+    def test_auto_generate_name_raises_error_when_no_message(self, db_session_with_containers: Session):
         """
         Test that MessageNotExistsError is raised when conversation has no messages.
 
@@ -571,7 +575,9 @@ class TestConversationServiceSummarization:
             ConversationService.auto_generate_name(app_model, conversation)
 
     @patch("services.conversation_service.LLMGenerator.generate_conversation_name")
-    def test_auto_generate_name_handles_llm_failure_gracefully(self, mock_llm_generator, db_session_with_containers):
+    def test_auto_generate_name_handles_llm_failure_gracefully(
+        self, mock_llm_generator, db_session_with_containers: Session
+    ):
         """
         Test that LLM generation failures are suppressed and don't crash.
 
@@ -604,7 +610,7 @@ class TestConversationServiceSummarization:
         assert conversation.name == original_name  # Name remains unchanged
 
     @patch("services.conversation_service.naive_utc_now")
-    def test_rename_with_manual_name(self, mock_naive_utc_now, db_session_with_containers):
+    def test_rename_with_manual_name(self, mock_naive_utc_now, db_session_with_containers: Session):
         """
         Test renaming conversation with manual name.
 
@@ -638,7 +644,7 @@ class TestConversationServiceSummarization:
         assert conversation.updated_at == mock_time
 
     @patch("services.conversation_service.LLMGenerator.generate_conversation_name")
-    def test_rename_with_auto_generate(self, mock_llm_generator, db_session_with_containers):
+    def test_rename_with_auto_generate(self, mock_llm_generator, db_session_with_containers: Session):
         """
         Test rename delegates to auto_generate_name when auto_generate is True.
 
@@ -682,7 +688,9 @@ class TestConversationServiceMessageAnnotation:
 
     @patch("services.annotation_service.add_annotation_to_index_task")
     @patch("services.annotation_service.current_account_with_tenant")
-    def test_create_annotation_from_message(self, mock_current_account, mock_add_task, db_session_with_containers):
+    def test_create_annotation_from_message(
+        self, mock_current_account, mock_add_task, db_session_with_containers: Session
+    ):
         """
         Test creating annotation from existing message.
 
@@ -721,7 +729,9 @@ class TestConversationServiceMessageAnnotation:
 
     @patch("services.annotation_service.add_annotation_to_index_task")
     @patch("services.annotation_service.current_account_with_tenant")
-    def test_create_annotation_without_message(self, mock_current_account, mock_add_task, db_session_with_containers):
+    def test_create_annotation_without_message(
+        self, mock_current_account, mock_add_task, db_session_with_containers: Session
+    ):
         """
         Test creating standalone annotation without message.
 
@@ -753,7 +763,7 @@ class TestConversationServiceMessageAnnotation:
 
     @patch("services.annotation_service.add_annotation_to_index_task")
     @patch("services.annotation_service.current_account_with_tenant")
-    def test_update_existing_annotation(self, mock_current_account, mock_add_task, db_session_with_containers):
+    def test_update_existing_annotation(self, mock_current_account, mock_add_task, db_session_with_containers: Session):
         """
         Test updating an existing annotation.
 
@@ -800,7 +810,7 @@ class TestConversationServiceMessageAnnotation:
         mock_add_task.delay.assert_not_called()
 
     @patch("services.annotation_service.current_account_with_tenant")
-    def test_get_annotation_list(self, mock_current_account, db_session_with_containers):
+    def test_get_annotation_list(self, mock_current_account, db_session_with_containers: Session):
         """
         Test retrieving paginated annotation list.
 
@@ -836,7 +846,7 @@ class TestConversationServiceMessageAnnotation:
         assert result_total == 5
 
     @patch("services.annotation_service.current_account_with_tenant")
-    def test_get_annotation_list_with_keyword_search(self, mock_current_account, db_session_with_containers):
+    def test_get_annotation_list_with_keyword_search(self, mock_current_account, db_session_with_containers: Session):
         """
         Test retrieving annotations with keyword filtering.
 
@@ -885,7 +895,7 @@ class TestConversationServiceMessageAnnotation:
 
     @patch("services.annotation_service.add_annotation_to_index_task")
     @patch("services.annotation_service.current_account_with_tenant")
-    def test_insert_annotation_directly(self, mock_current_account, mock_add_task, db_session_with_containers):
+    def test_insert_annotation_directly(self, mock_current_account, mock_add_task, db_session_with_containers: Session):
         """
         Test direct annotation insertion without message reference.
 
@@ -919,7 +929,7 @@ class TestConversationServiceExport:
     Tests retrieving conversation data for export purposes.
     """
 
-    def test_get_conversation_success(self, db_session_with_containers):
+    def test_get_conversation_success(self, db_session_with_containers: Session):
         """Test successful retrieval of conversation."""
         # Arrange
         app_model, user = ConversationServiceIntegrationTestDataFactory.create_app_and_account(
@@ -937,7 +947,7 @@ class TestConversationServiceExport:
         # Assert
         assert result == conversation
 
-    def test_get_conversation_not_found(self, db_session_with_containers):
+    def test_get_conversation_not_found(self, db_session_with_containers: Session):
         """Test ConversationNotExistsError when conversation doesn't exist."""
         # Arrange
         app_model, user = ConversationServiceIntegrationTestDataFactory.create_app_and_account(
@@ -949,7 +959,7 @@ class TestConversationServiceExport:
             ConversationService.get_conversation(app_model=app_model, conversation_id=str(uuid4()), user=user)
 
     @patch("services.annotation_service.current_account_with_tenant")
-    def test_export_annotation_list(self, mock_current_account, db_session_with_containers):
+    def test_export_annotation_list(self, mock_current_account, db_session_with_containers: Session):
         """Test exporting all annotations for an app."""
         # Arrange
         app_model, account = ConversationServiceIntegrationTestDataFactory.create_app_and_account(
@@ -977,7 +987,7 @@ class TestConversationServiceExport:
         # Assert
         assert len(result) == 10
 
-    def test_get_message_success(self, db_session_with_containers):
+    def test_get_message_success(self, db_session_with_containers: Session):
         """Test successful retrieval of a message."""
         # Arrange
         app_model, user = ConversationServiceIntegrationTestDataFactory.create_app_and_account(
@@ -1001,7 +1011,7 @@ class TestConversationServiceExport:
         # Assert
         assert result == message
 
-    def test_get_message_not_found(self, db_session_with_containers):
+    def test_get_message_not_found(self, db_session_with_containers: Session):
         """Test MessageNotExistsError when message doesn't exist."""
         # Arrange
         app_model, user = ConversationServiceIntegrationTestDataFactory.create_app_and_account(
@@ -1012,7 +1022,7 @@ class TestConversationServiceExport:
         with pytest.raises(MessageNotExistsError):
             MessageService.get_message(app_model=app_model, user=user, message_id=str(uuid4()))
 
-    def test_get_conversation_for_end_user(self, db_session_with_containers):
+    def test_get_conversation_for_end_user(self, db_session_with_containers: Session):
         """
         Test retrieving conversation created by end user via API.
 
@@ -1038,7 +1048,7 @@ class TestConversationServiceExport:
         assert result == conversation
 
     @patch("services.conversation_service.delete_conversation_related_data")
-    def test_delete_conversation(self, mock_delete_task, db_session_with_containers):
+    def test_delete_conversation(self, mock_delete_task, db_session_with_containers: Session):
         """
         Test conversation deletion with async cleanup.
 
@@ -1071,7 +1081,7 @@ class TestConversationServiceExport:
         mock_delete_task.delay.assert_called_once_with(conversation_id)
 
     @patch("services.conversation_service.delete_conversation_related_data")
-    def test_delete_conversation_not_owned_by_account(self, mock_delete_task, db_session_with_containers):
+    def test_delete_conversation_not_owned_by_account(self, mock_delete_task, db_session_with_containers: Session):
         """
         Test deletion is denied when conversation belongs to a different account.
         """
@@ -1102,7 +1112,7 @@ class TestConversationServiceExport:
         mock_delete_task.delay.assert_not_called()
 
     @patch("services.conversation_service.delete_conversation_related_data")
-    def test_delete_handles_exception_and_rollback(self, mock_delete_task, db_session_with_containers):
+    def test_delete_handles_exception_and_rollback(self, mock_delete_task, db_session_with_containers: Session):
         """
         Test that delete propagates exceptions and does not trigger the cleanup task.
 
diff --git a/api/tests/test_containers_integration_tests/services/test_conversation_service_variables.py b/api/tests/test_containers_integration_tests/services/test_conversation_service_variables.py
index 0b7bd9ca64..853630ad65 100644
--- a/api/tests/test_containers_integration_tests/services/test_conversation_service_variables.py
+++ b/api/tests/test_containers_integration_tests/services/test_conversation_service_variables.py
@@ -5,7 +5,8 @@ from unittest.mock import patch
 from uuid import uuid4
 
 import pytest
-from sqlalchemy.orm import sessionmaker
+from flask import Flask
+from sqlalchemy.orm import Session, sessionmaker
 
 from core.app.entities.app_invoke_entities import InvokeFrom
 from extensions.ext_database import db
@@ -24,7 +25,7 @@ from services.errors.conversation import (
 
 class ConversationServiceVariableIntegrationFactory:
     @staticmethod
-    def create_app_and_account(db_session_with_containers):
+    def create_app_and_account(db_session_with_containers: Session):
         tenant = Tenant(name=f"Tenant {uuid4()}")
         db_session_with_containers.add(tenant)
         db_session_with_containers.flush()
@@ -149,7 +150,7 @@ class ConversationServiceVariableIntegrationFactory:
 
 
 @pytest.fixture
-def real_conversation_service_session_factory(flask_app_with_containers):
+def real_conversation_service_session_factory(flask_app_with_containers: Flask):
     del flask_app_with_containers
     real_session_maker = sessionmaker(bind=db.engine, expire_on_commit=False)
 
@@ -162,7 +163,7 @@ def real_conversation_service_session_factory(flask_app_with_containers):
 
 class TestConversationServiceVariables:
     def test_get_conversational_variable_success(
-        self, db_session_with_containers, real_conversation_service_session_factory
+        self, db_session_with_containers: Session, real_conversation_service_session_factory
     ):
         del real_conversation_service_session_factory
         factory = ConversationServiceVariableIntegrationFactory
@@ -200,7 +201,7 @@ class TestConversationServiceVariables:
         assert result.has_more is False
 
     def test_get_conversational_variable_with_last_id(
-        self, db_session_with_containers, real_conversation_service_session_factory
+        self, db_session_with_containers: Session, real_conversation_service_session_factory
     ):
         del real_conversation_service_session_factory
         factory = ConversationServiceVariableIntegrationFactory
@@ -242,7 +243,7 @@ class TestConversationServiceVariables:
         assert result.has_more is False
 
     def test_get_conversational_variable_last_id_not_found_raises_error(
-        self, db_session_with_containers, real_conversation_service_session_factory
+        self, db_session_with_containers: Session, real_conversation_service_session_factory
     ):
         del real_conversation_service_session_factory
         factory = ConversationServiceVariableIntegrationFactory
@@ -259,7 +260,7 @@ class TestConversationServiceVariables:
             )
 
     def test_get_conversational_variable_sets_has_more(
-        self, db_session_with_containers, real_conversation_service_session_factory
+        self, db_session_with_containers: Session, real_conversation_service_session_factory
     ):
         del real_conversation_service_session_factory
         factory = ConversationServiceVariableIntegrationFactory
@@ -287,7 +288,7 @@ class TestConversationServiceVariables:
         assert result.has_more is True
 
     def test_update_conversation_variable_success(
-        self, db_session_with_containers, real_conversation_service_session_factory
+        self, db_session_with_containers: Session, real_conversation_service_session_factory
     ):
         del real_conversation_service_session_factory
         factory = ConversationServiceVariableIntegrationFactory
@@ -320,7 +321,7 @@ class TestConversationServiceVariables:
         assert result["updated_at"] == updated_at
 
     def test_update_conversation_variable_not_found_raises_error(
-        self, db_session_with_containers, real_conversation_service_session_factory
+        self, db_session_with_containers: Session, real_conversation_service_session_factory
     ):
         del real_conversation_service_session_factory
         factory = ConversationServiceVariableIntegrationFactory
@@ -337,7 +338,7 @@ class TestConversationServiceVariables:
             )
 
     def test_update_conversation_variable_type_mismatch_raises_error(
-        self, db_session_with_containers, real_conversation_service_session_factory
+        self, db_session_with_containers: Session, real_conversation_service_session_factory
     ):
         del real_conversation_service_session_factory
         factory = ConversationServiceVariableIntegrationFactory
@@ -360,7 +361,7 @@ class TestConversationServiceVariables:
             )
 
     def test_update_conversation_variable_integer_number_compatibility(
-        self, db_session_with_containers, real_conversation_service_session_factory
+        self, db_session_with_containers: Session, real_conversation_service_session_factory
     ):
         del real_conversation_service_session_factory
         factory = ConversationServiceVariableIntegrationFactory
@@ -390,7 +391,7 @@ class TestConversationServiceVariables:
 
 
 class TestConversationServicePaginationWithContainers:
-    def test_pagination_by_last_id_raises_error_when_last_id_missing(self, db_session_with_containers):
+    def test_pagination_by_last_id_raises_error_when_last_id_missing(self, db_session_with_containers: Session):
         factory = ConversationServiceVariableIntegrationFactory
         app, account = factory.create_app_and_account(db_session_with_containers)
 
@@ -404,7 +405,7 @@ class TestConversationServicePaginationWithContainers:
                 invoke_from=InvokeFrom.WEB_APP,
             )
 
-    def test_pagination_by_last_id_with_default_desc_updated_at(self, db_session_with_containers):
+    def test_pagination_by_last_id_with_default_desc_updated_at(self, db_session_with_containers: Session):
         factory = ConversationServiceVariableIntegrationFactory
         app, account = factory.create_app_and_account(db_session_with_containers)
         base_time = datetime(2024, 1, 1, 8, 0, 0)
@@ -442,7 +443,7 @@ class TestConversationServicePaginationWithContainers:
         assert newest.id != middle.id
         assert [conversation.id for conversation in result.data] == [oldest.id]
 
-    def test_pagination_by_last_id_with_name_sort(self, db_session_with_containers):
+    def test_pagination_by_last_id_with_name_sort(self, db_session_with_containers: Session):
         factory = ConversationServiceVariableIntegrationFactory
         app, account = factory.create_app_and_account(db_session_with_containers)
         alpha = factory.create_conversation(db_session_with_containers, app, account, name="Alpha")
@@ -462,7 +463,7 @@ class TestConversationServicePaginationWithContainers:
         assert alpha.id != beta.id
         assert [conversation.id for conversation in result.data] == [gamma.id]
 
-    def test_pagination_filters_to_end_user_api_source(self, db_session_with_containers):
+    def test_pagination_filters_to_end_user_api_source(self, db_session_with_containers: Session):
         factory = ConversationServiceVariableIntegrationFactory
         app, account = factory.create_app_and_account(db_session_with_containers)
         end_user = factory.create_end_user(db_session_with_containers, app)
@@ -493,7 +494,7 @@ class TestConversationServicePaginationWithContainers:
         assert account_conversation.id != end_user_conversation.id
         assert [conversation.id for conversation in result.data] == [end_user_conversation.id]
 
-    def test_pagination_filters_to_account_console_source(self, db_session_with_containers):
+    def test_pagination_filters_to_account_console_source(self, db_session_with_containers: Session):
         factory = ConversationServiceVariableIntegrationFactory
         app, account = factory.create_app_and_account(db_session_with_containers)
         end_user = factory.create_end_user(db_session_with_containers, app)
diff --git a/api/tests/test_containers_integration_tests/services/test_conversation_variable_updater.py b/api/tests/test_containers_integration_tests/services/test_conversation_variable_updater.py
index 02ab3f8314..638a962f18 100644
--- a/api/tests/test_containers_integration_tests/services/test_conversation_variable_updater.py
+++ b/api/tests/test_containers_integration_tests/services/test_conversation_variable_updater.py
@@ -3,7 +3,7 @@
 from uuid import uuid4
 
 import pytest
-from sqlalchemy.orm import sessionmaker
+from sqlalchemy.orm import Session, sessionmaker
 
 from extensions.ext_database import db
 from graphon.variables import StringVariable
@@ -13,7 +13,12 @@ from services.conversation_variable_updater import ConversationVariableNotFoundE
 
 class TestConversationVariableUpdater:
     def _create_conversation_variable(
-        self, db_session_with_containers, *, conversation_id: str, variable: StringVariable, app_id: str | None = None
+        self,
+        db_session_with_containers: Session,
+        *,
+        conversation_id: str,
+        variable: StringVariable,
+        app_id: str | None = None,
     ) -> ConversationVariable:
         row = ConversationVariable(
             id=variable.id,
@@ -25,7 +30,7 @@ class TestConversationVariableUpdater:
         db_session_with_containers.commit()
         return row
 
-    def test_should_update_conversation_variable_data_and_commit(self, db_session_with_containers):
+    def test_should_update_conversation_variable_data_and_commit(self, db_session_with_containers: Session):
         conversation_id = str(uuid4())
         variable = StringVariable(id=str(uuid4()), name="topic", value="old value")
         self._create_conversation_variable(
@@ -42,7 +47,7 @@ class TestConversationVariableUpdater:
         assert row is not None
         assert row.data == updated_variable.model_dump_json()
 
-    def test_should_raise_not_found_when_variable_missing(self, db_session_with_containers):
+    def test_should_raise_not_found_when_variable_missing(self, db_session_with_containers: Session):
         conversation_id = str(uuid4())
         variable = StringVariable(id=str(uuid4()), name="topic", value="value")
         updater = ConversationVariableUpdater(sessionmaker(bind=db.engine))
@@ -50,7 +55,7 @@ class TestConversationVariableUpdater:
         with pytest.raises(ConversationVariableNotFoundError, match="conversation variable not found in the database"):
             updater.update(conversation_id=conversation_id, variable=variable)
 
-    def test_should_do_nothing_when_flush_is_called(self, db_session_with_containers):
+    def test_should_do_nothing_when_flush_is_called(self, db_session_with_containers: Session):
         updater = ConversationVariableUpdater(sessionmaker(bind=db.engine))
 
         result = updater.flush()
diff --git a/api/tests/test_containers_integration_tests/services/test_credit_pool_service.py b/api/tests/test_containers_integration_tests/services/test_credit_pool_service.py
index 0f63d98642..07dc3a4e9e 100644
--- a/api/tests/test_containers_integration_tests/services/test_credit_pool_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_credit_pool_service.py
@@ -3,6 +3,7 @@
 from uuid import uuid4
 
 import pytest
+from sqlalchemy.orm import Session
 
 from core.errors.error import QuotaExceededError
 from models import TenantCreditPool
@@ -14,7 +15,7 @@ class TestCreditPoolService:
     def _create_tenant_id(self) -> str:
         return str(uuid4())
 
-    def test_create_default_pool(self, db_session_with_containers):
+    def test_create_default_pool(self, db_session_with_containers: Session):
         tenant_id = self._create_tenant_id()
 
         pool = CreditPoolService.create_default_pool(tenant_id)
@@ -25,7 +26,7 @@ class TestCreditPoolService:
         assert pool.quota_used == 0
         assert pool.quota_limit > 0
 
-    def test_get_pool_returns_pool_when_exists(self, db_session_with_containers):
+    def test_get_pool_returns_pool_when_exists(self, db_session_with_containers: Session):
         tenant_id = self._create_tenant_id()
         CreditPoolService.create_default_pool(tenant_id)
 
@@ -35,17 +36,17 @@ class TestCreditPoolService:
         assert result.tenant_id == tenant_id
         assert result.pool_type == ProviderQuotaType.TRIAL
 
-    def test_get_pool_returns_none_when_not_exists(self, db_session_with_containers):
+    def test_get_pool_returns_none_when_not_exists(self, db_session_with_containers: Session):
         result = CreditPoolService.get_pool(tenant_id=self._create_tenant_id(), pool_type=ProviderQuotaType.TRIAL)
 
         assert result is None
 
-    def test_check_credits_available_returns_false_when_no_pool(self, db_session_with_containers):
+    def test_check_credits_available_returns_false_when_no_pool(self, db_session_with_containers: Session):
         result = CreditPoolService.check_credits_available(tenant_id=self._create_tenant_id(), credits_required=10)
 
         assert result is False
 
-    def test_check_credits_available_returns_true_when_sufficient(self, db_session_with_containers):
+    def test_check_credits_available_returns_true_when_sufficient(self, db_session_with_containers: Session):
         tenant_id = self._create_tenant_id()
         CreditPoolService.create_default_pool(tenant_id)
 
@@ -53,7 +54,7 @@ class TestCreditPoolService:
 
         assert result is True
 
-    def test_check_credits_available_returns_false_when_insufficient(self, db_session_with_containers):
+    def test_check_credits_available_returns_false_when_insufficient(self, db_session_with_containers: Session):
         tenant_id = self._create_tenant_id()
         pool = CreditPoolService.create_default_pool(tenant_id)
         # Exhaust credits
@@ -64,11 +65,11 @@ class TestCreditPoolService:
 
         assert result is False
 
-    def test_check_and_deduct_credits_raises_when_no_pool(self, db_session_with_containers):
+    def test_check_and_deduct_credits_raises_when_no_pool(self, db_session_with_containers: Session):
         with pytest.raises(QuotaExceededError, match="Credit pool not found"):
             CreditPoolService.check_and_deduct_credits(tenant_id=self._create_tenant_id(), credits_required=10)
 
-    def test_check_and_deduct_credits_raises_when_no_remaining(self, db_session_with_containers):
+    def test_check_and_deduct_credits_raises_when_no_remaining(self, db_session_with_containers: Session):
         tenant_id = self._create_tenant_id()
         pool = CreditPoolService.create_default_pool(tenant_id)
         pool.quota_used = pool.quota_limit
@@ -77,7 +78,7 @@ class TestCreditPoolService:
         with pytest.raises(QuotaExceededError, match="No credits remaining"):
             CreditPoolService.check_and_deduct_credits(tenant_id=tenant_id, credits_required=10)
 
-    def test_check_and_deduct_credits_deducts_required_amount(self, db_session_with_containers):
+    def test_check_and_deduct_credits_deducts_required_amount(self, db_session_with_containers: Session):
         tenant_id = self._create_tenant_id()
         CreditPoolService.create_default_pool(tenant_id)
         credits_required = 10
@@ -89,16 +90,34 @@ class TestCreditPoolService:
         pool = CreditPoolService.get_pool(tenant_id=tenant_id)
         assert pool.quota_used == credits_required
 
-    def test_check_and_deduct_credits_caps_at_remaining(self, db_session_with_containers):
+    def test_check_and_deduct_credits_raises_without_deducting_when_insufficient(
+        self, db_session_with_containers: Session
+    ):
         tenant_id = self._create_tenant_id()
         pool = CreditPoolService.create_default_pool(tenant_id)
         remaining = 5
         pool.quota_used = pool.quota_limit - remaining
+        quota_used = pool.quota_used
         db_session_with_containers.commit()
 
-        result = CreditPoolService.check_and_deduct_credits(tenant_id=tenant_id, credits_required=200)
+        with pytest.raises(QuotaExceededError, match="Insufficient credits remaining"):
+            CreditPoolService.check_and_deduct_credits(tenant_id=tenant_id, credits_required=200)
+
+        db_session_with_containers.expire_all()
+        updated_pool = CreditPoolService.get_pool(tenant_id=tenant_id)
+        assert updated_pool.quota_used == quota_used
+
+    def test_deduct_credits_capped_depletes_available_balance(self, db_session_with_containers: Session):
+        tenant_id = self._create_tenant_id()
+        pool = CreditPoolService.create_default_pool(tenant_id)
+        remaining = 5
+        pool.quota_used = pool.quota_limit - remaining
+        quota_limit = pool.quota_limit
+        db_session_with_containers.commit()
+
+        result = CreditPoolService.deduct_credits_capped(tenant_id=tenant_id, credits_required=200)
 
         assert result == remaining
         db_session_with_containers.expire_all()
         updated_pool = CreditPoolService.get_pool(tenant_id=tenant_id)
-        assert updated_pool.quota_used == pool.quota_limit
+        assert updated_pool.quota_used == quota_limit
diff --git a/api/tests/test_containers_integration_tests/services/test_dataset_permission_service.py b/api/tests/test_containers_integration_tests/services/test_dataset_permission_service.py
index 71c8874f79..f9898e2cfa 100644
--- a/api/tests/test_containers_integration_tests/services/test_dataset_permission_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_dataset_permission_service.py
@@ -8,6 +8,7 @@ checks with testcontainers-backed infrastructure instead of database-chain mocks
 from uuid import uuid4
 
 import pytest
+from sqlalchemy.orm import Session
 
 from core.rag.index_processor.constant.index_type import IndexTechniqueType
 from extensions.ext_database import db
@@ -107,7 +108,7 @@ class DatasetPermissionTestDataFactory:
 class TestDatasetPermissionServiceGetPartialMemberList:
     """Verify partial-member list reads against persisted DatasetPermission rows."""
 
-    def test_get_dataset_partial_member_list_with_members(self, db_session_with_containers):
+    def test_get_dataset_partial_member_list_with_members(self, db_session_with_containers: Session):
         """
         Test retrieving partial member list with multiple members.
         """
@@ -138,7 +139,7 @@ class TestDatasetPermissionServiceGetPartialMemberList:
         assert set(result) == set(expected_account_ids)
         assert len(result) == 3
 
-    def test_get_dataset_partial_member_list_with_single_member(self, db_session_with_containers):
+    def test_get_dataset_partial_member_list_with_single_member(self, db_session_with_containers: Session):
         """
         Test retrieving partial member list with single member.
         """
@@ -160,7 +161,7 @@ class TestDatasetPermissionServiceGetPartialMemberList:
         assert set(result) == set(expected_account_ids)
         assert len(result) == 1
 
-    def test_get_dataset_partial_member_list_empty(self, db_session_with_containers):
+    def test_get_dataset_partial_member_list_empty(self, db_session_with_containers: Session):
         """
         Test retrieving partial member list when no members exist.
         """
@@ -179,7 +180,7 @@ class TestDatasetPermissionServiceGetPartialMemberList:
 class TestDatasetPermissionServiceUpdatePartialMemberList:
     """Verify partial-member list updates against persisted DatasetPermission rows."""
 
-    def test_update_partial_member_list_add_new_members(self, db_session_with_containers):
+    def test_update_partial_member_list_add_new_members(self, db_session_with_containers: Session):
         """
         Test adding new partial members to a dataset.
         """
@@ -203,7 +204,7 @@ class TestDatasetPermissionServiceUpdatePartialMemberList:
         result = DatasetPermissionService.get_dataset_partial_member_list(dataset.id)
         assert set(result) == {member_1.id, member_2.id}
 
-    def test_update_partial_member_list_replace_existing(self, db_session_with_containers):
+    def test_update_partial_member_list_replace_existing(self, db_session_with_containers: Session):
         """
         Test replacing existing partial members with new ones.
         """
@@ -239,7 +240,7 @@ class TestDatasetPermissionServiceUpdatePartialMemberList:
         result = DatasetPermissionService.get_dataset_partial_member_list(dataset.id)
         assert set(result) == {new_member_1.id, new_member_2.id}
 
-    def test_update_partial_member_list_empty_list(self, db_session_with_containers):
+    def test_update_partial_member_list_empty_list(self, db_session_with_containers: Session):
         """
         Test updating with empty member list (clearing all members).
         """
@@ -264,7 +265,7 @@ class TestDatasetPermissionServiceUpdatePartialMemberList:
         result = DatasetPermissionService.get_dataset_partial_member_list(dataset.id)
         assert result == []
 
-    def test_update_partial_member_list_database_error_rollback(self, db_session_with_containers):
+    def test_update_partial_member_list_database_error_rollback(self, db_session_with_containers: Session):
         """
         Test error handling and rollback on database error.
         """
@@ -313,7 +314,7 @@ class TestDatasetPermissionServiceUpdatePartialMemberList:
 class TestDatasetPermissionServiceClearPartialMemberList:
     """Verify partial-member clearing against persisted DatasetPermission rows."""
 
-    def test_clear_partial_member_list_success(self, db_session_with_containers):
+    def test_clear_partial_member_list_success(self, db_session_with_containers: Session):
         """
         Test successful clearing of partial member list.
         """
@@ -338,7 +339,7 @@ class TestDatasetPermissionServiceClearPartialMemberList:
         result = DatasetPermissionService.get_dataset_partial_member_list(dataset.id)
         assert result == []
 
-    def test_clear_partial_member_list_empty_list(self, db_session_with_containers):
+    def test_clear_partial_member_list_empty_list(self, db_session_with_containers: Session):
         """
         Test clearing partial member list when no members exist.
         """
@@ -353,7 +354,7 @@ class TestDatasetPermissionServiceClearPartialMemberList:
         result = DatasetPermissionService.get_dataset_partial_member_list(dataset.id)
         assert result == []
 
-    def test_clear_partial_member_list_database_error_rollback(self, db_session_with_containers):
+    def test_clear_partial_member_list_database_error_rollback(self, db_session_with_containers: Session):
         """
         Test error handling and rollback on database error.
         """
@@ -398,7 +399,7 @@ class TestDatasetPermissionServiceClearPartialMemberList:
 class TestDatasetServiceCheckDatasetPermission:
     """Verify dataset access checks against persisted partial-member permissions."""
 
-    def test_check_dataset_permission_different_tenant_should_fail(self, db_session_with_containers):
+    def test_check_dataset_permission_different_tenant_should_fail(self, db_session_with_containers: Session):
         """Test that users from different tenants cannot access dataset."""
         owner, tenant = DatasetPermissionTestDataFactory.create_account_with_tenant(role=TenantAccountRole.OWNER)
         other_user, _ = DatasetPermissionTestDataFactory.create_account_with_tenant(role=TenantAccountRole.EDITOR)
@@ -410,7 +411,7 @@ class TestDatasetServiceCheckDatasetPermission:
         with pytest.raises(NoPermissionError):
             DatasetService.check_dataset_permission(dataset, other_user)
 
-    def test_check_dataset_permission_owner_can_access_any_dataset(self, db_session_with_containers):
+    def test_check_dataset_permission_owner_can_access_any_dataset(self, db_session_with_containers: Session):
         """Test that tenant owners can access any dataset regardless of permission level."""
         owner, tenant = DatasetPermissionTestDataFactory.create_account_with_tenant(role=TenantAccountRole.OWNER)
         creator, _ = DatasetPermissionTestDataFactory.create_account_with_tenant(
@@ -423,7 +424,7 @@ class TestDatasetServiceCheckDatasetPermission:
 
         DatasetService.check_dataset_permission(dataset, owner)
 
-    def test_check_dataset_permission_only_me_creator_can_access(self, db_session_with_containers):
+    def test_check_dataset_permission_only_me_creator_can_access(self, db_session_with_containers: Session):
         """Test ONLY_ME permission allows only the dataset creator to access."""
         creator, tenant = DatasetPermissionTestDataFactory.create_account_with_tenant(role=TenantAccountRole.EDITOR)
 
@@ -433,7 +434,7 @@ class TestDatasetServiceCheckDatasetPermission:
 
         DatasetService.check_dataset_permission(dataset, creator)
 
-    def test_check_dataset_permission_only_me_others_cannot_access(self, db_session_with_containers):
+    def test_check_dataset_permission_only_me_others_cannot_access(self, db_session_with_containers: Session):
         """Test ONLY_ME permission denies access to non-creators."""
         creator, tenant = DatasetPermissionTestDataFactory.create_account_with_tenant(role=TenantAccountRole.NORMAL)
         other, _ = DatasetPermissionTestDataFactory.create_account_with_tenant(
@@ -447,7 +448,7 @@ class TestDatasetServiceCheckDatasetPermission:
         with pytest.raises(NoPermissionError):
             DatasetService.check_dataset_permission(dataset, other)
 
-    def test_check_dataset_permission_all_team_allows_access(self, db_session_with_containers):
+    def test_check_dataset_permission_all_team_allows_access(self, db_session_with_containers: Session):
         """Test ALL_TEAM permission allows any team member to access the dataset."""
         creator, tenant = DatasetPermissionTestDataFactory.create_account_with_tenant(role=TenantAccountRole.NORMAL)
         member, _ = DatasetPermissionTestDataFactory.create_account_with_tenant(
@@ -460,7 +461,9 @@ class TestDatasetServiceCheckDatasetPermission:
 
         DatasetService.check_dataset_permission(dataset, member)
 
-    def test_check_dataset_permission_partial_members_with_permission_success(self, db_session_with_containers):
+    def test_check_dataset_permission_partial_members_with_permission_success(
+        self, db_session_with_containers: Session
+    ):
         """
         Test that user with explicit permission can access partial_members dataset.
         """
@@ -485,7 +488,9 @@ class TestDatasetServiceCheckDatasetPermission:
         permissions = DatasetPermissionService.get_dataset_partial_member_list(dataset.id)
         assert user.id in permissions
 
-    def test_check_dataset_permission_partial_members_without_permission_error(self, db_session_with_containers):
+    def test_check_dataset_permission_partial_members_without_permission_error(
+        self, db_session_with_containers: Session
+    ):
         """
         Test error when user without permission tries to access partial_members dataset.
         """
@@ -506,7 +511,7 @@ class TestDatasetServiceCheckDatasetPermission:
         with pytest.raises(NoPermissionError, match="You do not have permission to access this dataset"):
             DatasetService.check_dataset_permission(dataset, user)
 
-    def test_check_dataset_permission_partial_team_creator_can_access(self, db_session_with_containers):
+    def test_check_dataset_permission_partial_team_creator_can_access(self, db_session_with_containers: Session):
         """Test PARTIAL_TEAM permission allows creator to access without explicit permission."""
         creator, tenant = DatasetPermissionTestDataFactory.create_account_with_tenant(role=TenantAccountRole.EDITOR)
 
diff --git a/api/tests/test_containers_integration_tests/services/test_dataset_service.py b/api/tests/test_containers_integration_tests/services/test_dataset_service.py
index 0de3c64c4f..e6ee896a52 100644
--- a/api/tests/test_containers_integration_tests/services/test_dataset_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_dataset_service.py
@@ -712,7 +712,7 @@ class TestDatasetServiceRetrievalConfiguration:
 class TestDocumentServicePauseRecoverRetry:
     """Tests for pause/recover/retry orchestration using real DB and Redis."""
 
-    def _create_indexing_document(self, db_session_with_containers, indexing_status="indexing"):
+    def _create_indexing_document(self, db_session_with_containers: Session, indexing_status="indexing"):
         factory = DatasetServiceIntegrationDataFactory
         account, tenant = factory.create_account_with_tenant(db_session_with_containers)
         dataset = factory.create_dataset(db_session_with_containers, tenant.id, account.id)
@@ -721,7 +721,7 @@ class TestDocumentServicePauseRecoverRetry:
         db_session_with_containers.commit()
         return doc, account
 
-    def test_pause_document_success(self, db_session_with_containers):
+    def test_pause_document_success(self, db_session_with_containers: Session):
         from extensions.ext_redis import redis_client
         from services.dataset_service import DocumentService
 
@@ -740,7 +740,7 @@ class TestDocumentServicePauseRecoverRetry:
         assert redis_client.get(cache_key) is not None
         redis_client.delete(cache_key)
 
-    def test_pause_document_invalid_status_error(self, db_session_with_containers):
+    def test_pause_document_invalid_status_error(self, db_session_with_containers: Session):
         from services.dataset_service import DocumentService
         from services.errors.document import DocumentIndexingError
 
@@ -751,7 +751,7 @@ class TestDocumentServicePauseRecoverRetry:
             with pytest.raises(DocumentIndexingError):
                 DocumentService.pause_document(doc)
 
-    def test_recover_document_success(self, db_session_with_containers):
+    def test_recover_document_success(self, db_session_with_containers: Session):
         from extensions.ext_redis import redis_client
         from services.dataset_service import DocumentService
 
@@ -775,7 +775,7 @@ class TestDocumentServicePauseRecoverRetry:
         assert redis_client.get(cache_key) is None
         recover_task.delay.assert_called_once_with(doc.dataset_id, doc.id)
 
-    def test_retry_document_indexing_success(self, db_session_with_containers):
+    def test_retry_document_indexing_success(self, db_session_with_containers: Session):
         from extensions.ext_redis import redis_client
         from services.dataset_service import DocumentService
 
diff --git a/api/tests/test_containers_integration_tests/services/test_dataset_service_create_dataset.py b/api/tests/test_containers_integration_tests/services/test_dataset_service_create_dataset.py
index c486ff5613..08de79f4b7 100644
--- a/api/tests/test_containers_integration_tests/services/test_dataset_service_create_dataset.py
+++ b/api/tests/test_containers_integration_tests/services/test_dataset_service_create_dataset.py
@@ -6,6 +6,7 @@ from unittest.mock import Mock, patch
 from uuid import uuid4
 
 import pytest
+from sqlalchemy.orm import Session
 
 from models.account import Account, Tenant, TenantAccountJoin
 from services.dataset_service import DatasetService
@@ -48,7 +49,7 @@ class TestDatasetServiceCreateRagPipelineDataset:
             permission="only_me",
         )
 
-    def test_create_rag_pipeline_dataset_raises_when_current_user_id_is_none(self, db_session_with_containers):
+    def test_create_rag_pipeline_dataset_raises_when_current_user_id_is_none(self, db_session_with_containers: Session):
         tenant, _ = self._create_tenant_and_account(db_session_with_containers)
 
         mock_user = Mock(id=None)
diff --git a/api/tests/test_containers_integration_tests/services/test_dataset_service_delete_dataset.py b/api/tests/test_containers_integration_tests/services/test_dataset_service_delete_dataset.py
index 3cac964d89..c43a5d5978 100644
--- a/api/tests/test_containers_integration_tests/services/test_dataset_service_delete_dataset.py
+++ b/api/tests/test_containers_integration_tests/services/test_dataset_service_delete_dataset.py
@@ -3,6 +3,8 @@
 from unittest.mock import patch
 from uuid import uuid4
 
+from sqlalchemy.orm import Session
+
 from core.rag.index_processor.constant.index_type import IndexStructureType, IndexTechniqueType
 from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
 from models.dataset import Dataset, Document
@@ -101,7 +103,7 @@ class DatasetDeleteIntegrationDataFactory:
 class TestDatasetServiceDeleteDataset:
     """Integration coverage for DatasetService.delete_dataset using testcontainers."""
 
-    def test_delete_dataset_with_documents_success(self, db_session_with_containers):
+    def test_delete_dataset_with_documents_success(self, db_session_with_containers: Session):
         """Delete a dataset with documents and dispatch cleanup through the real signal handler."""
         # Arrange
         owner, tenant = DatasetDeleteIntegrationDataFactory.create_account_with_tenant(db_session_with_containers)
@@ -144,7 +146,7 @@ class TestDatasetServiceDeleteDataset:
             dataset.pipeline_id,
         )
 
-    def test_delete_empty_dataset_success(self, db_session_with_containers):
+    def test_delete_empty_dataset_success(self, db_session_with_containers: Session):
         """Delete an empty dataset without scheduling cleanup when both gating fields are absent."""
         # Arrange
         owner, tenant = DatasetDeleteIntegrationDataFactory.create_account_with_tenant(db_session_with_containers)
@@ -172,7 +174,7 @@ class TestDatasetServiceDeleteDataset:
         assert db_session_with_containers.get(Dataset, dataset.id) is None
         clean_dataset_delay.assert_not_called()
 
-    def test_delete_dataset_with_partial_none_values(self, db_session_with_containers):
+    def test_delete_dataset_with_partial_none_values(self, db_session_with_containers: Session):
         """Delete a dataset without cleanup when indexing_technique is missing but doc_form resolves."""
         # Arrange
         owner, tenant = DatasetDeleteIntegrationDataFactory.create_account_with_tenant(db_session_with_containers)
@@ -200,7 +202,7 @@ class TestDatasetServiceDeleteDataset:
         assert db_session_with_containers.get(Dataset, dataset.id) is None
         clean_dataset_delay.assert_not_called()
 
-    def test_delete_dataset_with_doc_form_none_indexing_technique_exists(self, db_session_with_containers):
+    def test_delete_dataset_with_doc_form_none_indexing_technique_exists(self, db_session_with_containers: Session):
         """Delete a dataset without cleanup when indexing exists but doc_form resolves to None."""
         # Arrange
         owner, tenant = DatasetDeleteIntegrationDataFactory.create_account_with_tenant(db_session_with_containers)
@@ -228,7 +230,7 @@ class TestDatasetServiceDeleteDataset:
         assert db_session_with_containers.get(Dataset, dataset.id) is None
         clean_dataset_delay.assert_not_called()
 
-    def test_delete_dataset_not_found(self, db_session_with_containers):
+    def test_delete_dataset_not_found(self, db_session_with_containers: Session):
         """Return False without scheduling cleanup when the target dataset does not exist."""
         # Arrange
         owner, _ = DatasetDeleteIntegrationDataFactory.create_account_with_tenant(db_session_with_containers)
diff --git a/api/tests/test_containers_integration_tests/services/test_dataset_service_document.py b/api/tests/test_containers_integration_tests/services/test_dataset_service_document.py
index 2bec703f0c..0c089e506b 100644
--- a/api/tests/test_containers_integration_tests/services/test_dataset_service_document.py
+++ b/api/tests/test_containers_integration_tests/services/test_dataset_service_document.py
@@ -6,6 +6,7 @@ from unittest.mock import create_autospec, patch
 from uuid import uuid4
 
 import pytest
+from sqlalchemy.orm import Session
 from werkzeug.exceptions import Forbidden, NotFound
 
 from core.rag.index_processor.constant.index_type import IndexStructureType
@@ -119,13 +120,13 @@ def current_user_mock():
         yield current_user
 
 
-def test_get_document_returns_none_when_document_id_is_missing(db_session_with_containers):
+def test_get_document_returns_none_when_document_id_is_missing(db_session_with_containers: Session):
     dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
 
     assert DocumentService.get_document(dataset.id, None) is None
 
 
-def test_get_document_queries_by_dataset_and_document_id(db_session_with_containers):
+def test_get_document_queries_by_dataset_and_document_id(db_session_with_containers: Session):
     dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
     document = DocumentServiceIntegrationFactory.create_document(db_session_with_containers, dataset=dataset)
 
@@ -135,7 +136,7 @@ def test_get_document_queries_by_dataset_and_document_id(db_session_with_contain
     assert result.id == document.id
 
 
-def test_get_documents_by_ids_returns_empty_for_empty_input(db_session_with_containers):
+def test_get_documents_by_ids_returns_empty_for_empty_input(db_session_with_containers: Session):
     dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
 
     result = DocumentService.get_documents_by_ids(dataset.id, [])
@@ -143,7 +144,7 @@ def test_get_documents_by_ids_returns_empty_for_empty_input(db_session_with_cont
     assert result == []
 
 
-def test_get_documents_by_ids_uses_single_batch_query(db_session_with_containers):
+def test_get_documents_by_ids_uses_single_batch_query(db_session_with_containers: Session):
     dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
     doc_a = DocumentServiceIntegrationFactory.create_document(db_session_with_containers, dataset=dataset, name="a.txt")
     doc_b = DocumentServiceIntegrationFactory.create_document(
@@ -158,13 +159,13 @@ def test_get_documents_by_ids_uses_single_batch_query(db_session_with_containers
     assert {document.id for document in result} == {doc_a.id, doc_b.id}
 
 
-def test_update_documents_need_summary_returns_zero_for_empty_input(db_session_with_containers):
+def test_update_documents_need_summary_returns_zero_for_empty_input(db_session_with_containers: Session):
     dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
 
     assert DocumentService.update_documents_need_summary(dataset.id, []) == 0
 
 
-def test_update_documents_need_summary_updates_matching_non_qa_documents(db_session_with_containers):
+def test_update_documents_need_summary_updates_matching_non_qa_documents(db_session_with_containers: Session):
     dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
     paragraph_doc = DocumentServiceIntegrationFactory.create_document(
         db_session_with_containers,
@@ -195,7 +196,7 @@ def test_update_documents_need_summary_updates_matching_non_qa_documents(db_sess
     assert refreshed_qa.need_summary is True
 
 
-def test_get_document_download_url_uses_signed_url_helper(db_session_with_containers):
+def test_get_document_download_url_uses_signed_url_helper(db_session_with_containers: Session):
     dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
     upload_file = DocumentServiceIntegrationFactory.create_upload_file(
         db_session_with_containers,
@@ -215,7 +216,7 @@ def test_get_document_download_url_uses_signed_url_helper(db_session_with_contai
     get_url.assert_called_once_with(upload_file_id=upload_file.id, as_attachment=True)
 
 
-def test_get_upload_file_id_for_upload_file_document_rejects_invalid_source_type(db_session_with_containers):
+def test_get_upload_file_id_for_upload_file_document_rejects_invalid_source_type(db_session_with_containers: Session):
     dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
     document = DocumentServiceIntegrationFactory.create_document(
         db_session_with_containers,
@@ -232,7 +233,9 @@ def test_get_upload_file_id_for_upload_file_document_rejects_invalid_source_type
         )
 
 
-def test_get_upload_file_id_for_upload_file_document_rejects_missing_upload_file_id(db_session_with_containers):
+def test_get_upload_file_id_for_upload_file_document_rejects_missing_upload_file_id(
+    db_session_with_containers: Session,
+):
     dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
     document = DocumentServiceIntegrationFactory.create_document(
         db_session_with_containers,
@@ -248,7 +251,7 @@ def test_get_upload_file_id_for_upload_file_document_rejects_missing_upload_file
         )
 
 
-def test_get_upload_file_id_for_upload_file_document_returns_string_id(db_session_with_containers):
+def test_get_upload_file_id_for_upload_file_document_returns_string_id(db_session_with_containers: Session):
     dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
     document = DocumentServiceIntegrationFactory.create_document(
         db_session_with_containers,
@@ -265,7 +268,9 @@ def test_get_upload_file_id_for_upload_file_document_returns_string_id(db_sessio
     assert result == "99"
 
 
-def test_get_upload_file_for_upload_file_document_raises_when_file_service_returns_nothing(db_session_with_containers):
+def test_get_upload_file_for_upload_file_document_raises_when_file_service_returns_nothing(
+    db_session_with_containers: Session,
+):
     dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
     document = DocumentServiceIntegrationFactory.create_document(
         db_session_with_containers,
@@ -278,7 +283,7 @@ def test_get_upload_file_for_upload_file_document_raises_when_file_service_retur
             DocumentService._get_upload_file_for_upload_file_document(document)
 
 
-def test_get_upload_file_for_upload_file_document_returns_upload_file(db_session_with_containers):
+def test_get_upload_file_for_upload_file_document_returns_upload_file(db_session_with_containers: Session):
     dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
     upload_file = DocumentServiceIntegrationFactory.create_upload_file(
         db_session_with_containers,
@@ -296,7 +301,9 @@ def test_get_upload_file_for_upload_file_document_returns_upload_file(db_session
     assert result.id == upload_file.id
 
 
-def test_get_upload_files_by_document_id_for_zip_download_raises_for_missing_documents(db_session_with_containers):
+def test_get_upload_files_by_document_id_for_zip_download_raises_for_missing_documents(
+    db_session_with_containers: Session,
+):
     dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
 
     with pytest.raises(NotFound, match="Document not found"):
@@ -307,7 +314,9 @@ def test_get_upload_files_by_document_id_for_zip_download_raises_for_missing_doc
         )
 
 
-def test_get_upload_files_by_document_id_for_zip_download_rejects_cross_tenant_access(db_session_with_containers):
+def test_get_upload_files_by_document_id_for_zip_download_rejects_cross_tenant_access(
+    db_session_with_containers: Session,
+):
     dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
     upload_file = DocumentServiceIntegrationFactory.create_upload_file(
         db_session_with_containers,
@@ -329,7 +338,9 @@ def test_get_upload_files_by_document_id_for_zip_download_rejects_cross_tenant_a
         )
 
 
-def test_get_upload_files_by_document_id_for_zip_download_rejects_missing_upload_files(db_session_with_containers):
+def test_get_upload_files_by_document_id_for_zip_download_rejects_missing_upload_files(
+    db_session_with_containers: Session,
+):
     dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
     document = DocumentServiceIntegrationFactory.create_document(
         db_session_with_containers,
@@ -345,7 +356,9 @@ def test_get_upload_files_by_document_id_for_zip_download_rejects_missing_upload
         )
 
 
-def test_get_upload_files_by_document_id_for_zip_download_returns_document_keyed_mapping(db_session_with_containers):
+def test_get_upload_files_by_document_id_for_zip_download_returns_document_keyed_mapping(
+    db_session_with_containers: Session,
+):
     dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
     upload_file_a = DocumentServiceIntegrationFactory.create_upload_file(
         db_session_with_containers,
@@ -395,7 +408,7 @@ def test_prepare_document_batch_download_zip_raises_not_found_for_missing_datase
 
 
 def test_prepare_document_batch_download_zip_translates_permission_error_to_forbidden(
-    db_session_with_containers,
+    db_session_with_containers: Session,
     current_user_mock,
 ):
     dataset = DocumentServiceIntegrationFactory.create_dataset(
@@ -418,7 +431,7 @@ def test_prepare_document_batch_download_zip_translates_permission_error_to_forb
 
 
 def test_prepare_document_batch_download_zip_returns_upload_files_in_requested_order(
-    db_session_with_containers,
+    db_session_with_containers: Session,
     current_user_mock,
 ):
     dataset = DocumentServiceIntegrationFactory.create_dataset(
@@ -461,7 +474,7 @@ def test_prepare_document_batch_download_zip_returns_upload_files_in_requested_o
     assert download_name.endswith(".zip")
 
 
-def test_get_document_by_dataset_id_returns_enabled_documents(db_session_with_containers):
+def test_get_document_by_dataset_id_returns_enabled_documents(db_session_with_containers: Session):
     dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
     enabled_document = DocumentServiceIntegrationFactory.create_document(
         db_session_with_containers,
@@ -480,7 +493,9 @@ def test_get_document_by_dataset_id_returns_enabled_documents(db_session_with_co
     assert [document.id for document in result] == [enabled_document.id]
 
 
-def test_get_working_documents_by_dataset_id_returns_completed_enabled_unarchived_documents(db_session_with_containers):
+def test_get_working_documents_by_dataset_id_returns_completed_enabled_unarchived_documents(
+    db_session_with_containers: Session,
+):
     dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
     available_document = DocumentServiceIntegrationFactory.create_document(
         db_session_with_containers,
@@ -501,7 +516,7 @@ def test_get_working_documents_by_dataset_id_returns_completed_enabled_unarchive
     assert [document.id for document in result] == [available_document.id]
 
 
-def test_get_error_documents_by_dataset_id_returns_error_and_paused_documents(db_session_with_containers):
+def test_get_error_documents_by_dataset_id_returns_error_and_paused_documents(db_session_with_containers: Session):
     dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
     error_document = DocumentServiceIntegrationFactory.create_document(
         db_session_with_containers,
@@ -526,7 +541,7 @@ def test_get_error_documents_by_dataset_id_returns_error_and_paused_documents(db
     assert {document.id for document in result} == {error_document.id, paused_document.id}
 
 
-def test_get_batch_documents_filters_by_current_user_tenant(db_session_with_containers):
+def test_get_batch_documents_filters_by_current_user_tenant(db_session_with_containers: Session):
     dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
     batch = f"batch-{uuid4()}"
     matching_document = DocumentServiceIntegrationFactory.create_document(
@@ -549,7 +564,7 @@ def test_get_batch_documents_filters_by_current_user_tenant(db_session_with_cont
     assert [document.id for document in result] == [matching_document.id]
 
 
-def test_get_document_file_detail_returns_upload_file(db_session_with_containers):
+def test_get_document_file_detail_returns_upload_file(db_session_with_containers: Session):
     dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
     upload_file = DocumentServiceIntegrationFactory.create_upload_file(
         db_session_with_containers,
@@ -563,7 +578,7 @@ def test_get_document_file_detail_returns_upload_file(db_session_with_containers
     assert result.id == upload_file.id
 
 
-def test_delete_document_emits_signal_and_commits(db_session_with_containers):
+def test_delete_document_emits_signal_and_commits(db_session_with_containers: Session):
     dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
     upload_file = DocumentServiceIntegrationFactory.create_upload_file(
         db_session_with_containers,
@@ -588,7 +603,7 @@ def test_delete_document_emits_signal_and_commits(db_session_with_containers):
     )
 
 
-def test_delete_documents_ignores_empty_input(db_session_with_containers):
+def test_delete_documents_ignores_empty_input(db_session_with_containers: Session):
     dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
 
     with patch("services.dataset_service.batch_clean_document_task.delay") as delay:
@@ -597,7 +612,7 @@ def test_delete_documents_ignores_empty_input(db_session_with_containers):
     delay.assert_not_called()
 
 
-def test_delete_documents_deletes_rows_and_dispatches_cleanup_task(db_session_with_containers):
+def test_delete_documents_deletes_rows_and_dispatches_cleanup_task(db_session_with_containers: Session):
     dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
     dataset.chunk_structure = IndexStructureType.PARAGRAPH_INDEX
     db_session_with_containers.commit()
@@ -637,14 +652,14 @@ def test_delete_documents_deletes_rows_and_dispatches_cleanup_task(db_session_wi
     assert set(args[3]) == {upload_file_a.id, upload_file_b.id}
 
 
-def test_get_documents_position_returns_next_position_when_documents_exist(db_session_with_containers):
+def test_get_documents_position_returns_next_position_when_documents_exist(db_session_with_containers: Session):
     dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
     DocumentServiceIntegrationFactory.create_document(db_session_with_containers, dataset=dataset, position=3)
 
     assert DocumentService.get_documents_position(dataset.id) == 4
 
 
-def test_get_documents_position_defaults_to_one_when_dataset_is_empty(db_session_with_containers):
+def test_get_documents_position_defaults_to_one_when_dataset_is_empty(db_session_with_containers: Session):
     dataset = DocumentServiceIntegrationFactory.create_dataset(db_session_with_containers)
 
     assert DocumentService.get_documents_position(dataset.id) == 1
diff --git a/api/tests/test_containers_integration_tests/services/test_dataset_service_get_segments.py b/api/tests/test_containers_integration_tests/services/test_dataset_service_get_segments.py
index 87239b2cb3..bd8f5371b8 100644
--- a/api/tests/test_containers_integration_tests/services/test_dataset_service_get_segments.py
+++ b/api/tests/test_containers_integration_tests/services/test_dataset_service_get_segments.py
@@ -13,9 +13,9 @@ from uuid import uuid4
 from sqlalchemy.orm import Session
 
 from core.rag.index_processor.constant.index_type import IndexTechniqueType
-from models import Account, Tenant, TenantAccountJoin, TenantAccountRole
+from models import Account, AccountStatus, Tenant, TenantAccountJoin, TenantAccountRole, TenantStatus
 from models.dataset import Dataset, DatasetPermissionEnum, Document, DocumentSegment
-from models.enums import DataSourceType, DocumentCreatedFrom
+from models.enums import DataSourceType, DocumentCreatedFrom, SegmentStatus
 from services.dataset_service import SegmentService
 
 
@@ -35,13 +35,13 @@ class SegmentServiceTestDataFactory:
             email=f"{uuid4()}@example.com",
             name=f"user-{uuid4()}",
             interface_language="en-US",
-            status="active",
+            status=AccountStatus.ACTIVE,
         )
         db_session_with_containers.add(account)
         db_session_with_containers.commit()
 
         if tenant is None:
-            tenant = Tenant(name=f"tenant-{uuid4()}", status="normal")
+            tenant = Tenant(name=f"tenant-{uuid4()}", status=TenantStatus.NORMAL)
             db_session_with_containers.add(tenant)
             db_session_with_containers.commit()
 
@@ -103,7 +103,7 @@ class SegmentServiceTestDataFactory:
         created_by: str,
         position: int = 1,
         content: str = "Test content",
-        status: str = "completed",
+        status: SegmentStatus = SegmentStatus.COMPLETED,
         word_count: int = 10,
         tokens: int = 15,
     ) -> DocumentSegment:
@@ -203,7 +203,7 @@ class TestSegmentServiceGetSegments:
             document_id=document.id,
             created_by=owner.id,
             position=1,
-            status="completed",
+            status=SegmentStatus.COMPLETED,
         )
         SegmentServiceTestDataFactory.create_segment(
             db_session_with_containers,
@@ -212,7 +212,7 @@ class TestSegmentServiceGetSegments:
             document_id=document.id,
             created_by=owner.id,
             position=2,
-            status="indexing",
+            status=SegmentStatus.INDEXING,
         )
         SegmentServiceTestDataFactory.create_segment(
             db_session_with_containers,
@@ -221,7 +221,7 @@ class TestSegmentServiceGetSegments:
             document_id=document.id,
             created_by=owner.id,
             position=3,
-            status="waiting",
+            status=SegmentStatus.WAITING,
         )
 
         # Act
@@ -257,7 +257,7 @@ class TestSegmentServiceGetSegments:
             document_id=document.id,
             created_by=owner.id,
             position=1,
-            status="completed",
+            status=SegmentStatus.COMPLETED,
         )
         SegmentServiceTestDataFactory.create_segment(
             db_session_with_containers,
@@ -266,7 +266,7 @@ class TestSegmentServiceGetSegments:
             document_id=document.id,
             created_by=owner.id,
             position=2,
-            status="indexing",
+            status=SegmentStatus.INDEXING,
         )
 
         # Act
@@ -415,7 +415,7 @@ class TestSegmentServiceGetSegments:
             document_id=document.id,
             created_by=owner.id,
             position=1,
-            status="completed",
+            status=SegmentStatus.COMPLETED,
             content="This is important information",
         )
         SegmentServiceTestDataFactory.create_segment(
@@ -425,7 +425,7 @@ class TestSegmentServiceGetSegments:
             document_id=document.id,
             created_by=owner.id,
             position=2,
-            status="indexing",
+            status=SegmentStatus.INDEXING,
             content="This is also important",
         )
         SegmentServiceTestDataFactory.create_segment(
@@ -435,7 +435,7 @@ class TestSegmentServiceGetSegments:
             document_id=document.id,
             created_by=owner.id,
             position=3,
-            status="completed",
+            status=SegmentStatus.COMPLETED,
             content="This is irrelevant",
         )
 
@@ -477,7 +477,7 @@ class TestSegmentServiceGetSegments:
             document_id=document.id,
             created_by=owner.id,
             position=1,
-            status="completed",
+            status=SegmentStatus.COMPLETED,
         )
         SegmentServiceTestDataFactory.create_segment(
             db_session_with_containers,
@@ -486,7 +486,7 @@ class TestSegmentServiceGetSegments:
             document_id=document.id,
             created_by=owner.id,
             position=2,
-            status="waiting",
+            status=SegmentStatus.WAITING,
         )
 
         # Act
diff --git a/api/tests/test_containers_integration_tests/services/test_dataset_service_permissions.py b/api/tests/test_containers_integration_tests/services/test_dataset_service_permissions.py
index 1b4179c9c7..0603a1e27f 100644
--- a/api/tests/test_containers_integration_tests/services/test_dataset_service_permissions.py
+++ b/api/tests/test_containers_integration_tests/services/test_dataset_service_permissions.py
@@ -6,6 +6,7 @@ from unittest.mock import patch
 from uuid import uuid4
 
 import pytest
+from flask import Flask
 from sqlalchemy.orm import Session
 from werkzeug.exceptions import NotFound
 
@@ -363,7 +364,7 @@ class TestDatasetServicePermissionsAndLifecycle:
 
         DatasetService.check_dataset_operator_permission(user=operator, dataset=dataset)
 
-    def test_update_dataset_api_status_raises_not_found_for_missing_dataset(self, flask_app_with_containers):
+    def test_update_dataset_api_status_raises_not_found_for_missing_dataset(self, flask_app_with_containers: Flask):
         with flask_app_with_containers.app_context():
             with pytest.raises(NotFound, match="Dataset not found"):
                 DatasetService.update_dataset_api_status(str(uuid4()), True)
@@ -473,7 +474,7 @@ class TestDatasetCollectionBindingServiceIntegration:
         assert persisted.type == "dataset"
         assert persisted.collection_name
 
-    def test_get_dataset_collection_binding_by_id_and_type_raises_when_missing(self, flask_app_with_containers):
+    def test_get_dataset_collection_binding_by_id_and_type_raises_when_missing(self, flask_app_with_containers: Flask):
         with flask_app_with_containers.app_context():
             with pytest.raises(ValueError, match="Dataset collection binding not found"):
                 DatasetCollectionBindingService.get_dataset_collection_binding_by_id_and_type(str(uuid4()))
diff --git a/api/tests/test_containers_integration_tests/services/test_dataset_service_retrieval.py b/api/tests/test_containers_integration_tests/services/test_dataset_service_retrieval.py
index 2f90d16176..0c610311bb 100644
--- a/api/tests/test_containers_integration_tests/services/test_dataset_service_retrieval.py
+++ b/api/tests/test_containers_integration_tests/services/test_dataset_service_retrieval.py
@@ -16,6 +16,7 @@ from uuid import uuid4
 from sqlalchemy.orm import Session
 
 from core.rag.index_processor.constant.index_type import IndexTechniqueType
+from models import AccountStatus, CreatorUserRole, TenantStatus
 from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
 from models.dataset import (
     AppDatasetJoin,
@@ -25,7 +26,7 @@ from models.dataset import (
     DatasetProcessRule,
     DatasetQuery,
 )
-from models.enums import DatasetQuerySource, DataSourceType, ProcessRuleMode
+from models.enums import DatasetQuerySource, DataSourceType, ProcessRuleMode, TagType
 from models.model import Tag, TagBinding
 from services.dataset_service import DatasetService, DocumentService
 
@@ -42,11 +43,11 @@ class DatasetRetrievalTestDataFactory:
             email=f"{uuid4()}@example.com",
             name=f"user-{uuid4()}",
             interface_language="en-US",
-            status="active",
+            status=AccountStatus.ACTIVE,
         )
         tenant = Tenant(
             name=f"tenant-{uuid4()}",
-            status="normal",
+            status=TenantStatus.NORMAL,
         )
         db_session_with_containers.add_all([account, tenant])
         db_session_with_containers.flush()
@@ -72,7 +73,7 @@ class DatasetRetrievalTestDataFactory:
             email=f"{uuid4()}@example.com",
             name=f"user-{uuid4()}",
             interface_language="en-US",
-            status="active",
+            status=AccountStatus.ACTIVE,
         )
         db_session_with_containers.add(account)
         db_session_with_containers.flush()
@@ -130,7 +131,7 @@ class DatasetRetrievalTestDataFactory:
 
     @staticmethod
     def create_process_rule(
-        db_session_with_containers: Session, dataset_id: str, created_by: str, mode: str, rules: dict
+        db_session_with_containers: Session, dataset_id: str, created_by: str, mode: ProcessRuleMode, rules: dict
     ) -> DatasetProcessRule:
         """Create a dataset process rule."""
         process_rule = DatasetProcessRule(
@@ -153,7 +154,7 @@ class DatasetRetrievalTestDataFactory:
             content=content,
             source=DatasetQuerySource.APP,
             source_app_id=None,
-            created_by_role="account",
+            created_by_role=CreatorUserRole.ACCOUNT,
             created_by=created_by,
         )
         db_session_with_containers.add(dataset_query)
@@ -176,7 +177,7 @@ class DatasetRetrievalTestDataFactory:
         """Create a knowledge tag and bind it to the target dataset."""
         tag = Tag(
             tenant_id=tenant_id,
-            type="knowledge",
+            type=TagType.KNOWLEDGE,
             name=f"tag-{uuid4()}",
             created_by=created_by,
         )
diff --git a/api/tests/test_containers_integration_tests/services/test_delete_archived_workflow_run.py b/api/tests/test_containers_integration_tests/services/test_delete_archived_workflow_run.py
index fe426ae516..69c39b8bfb 100644
--- a/api/tests/test_containers_integration_tests/services/test_delete_archived_workflow_run.py
+++ b/api/tests/test_containers_integration_tests/services/test_delete_archived_workflow_run.py
@@ -6,6 +6,7 @@ from datetime import UTC, datetime, timedelta
 from uuid import uuid4
 
 from sqlalchemy import select
+from sqlalchemy.orm import Session
 
 from graphon.enums import WorkflowExecutionStatus
 from models.enums import CreatorUserRole, WorkflowRunTriggeredFrom
@@ -46,7 +47,7 @@ class TestArchivedWorkflowRunDeletion:
         db_session_with_containers.commit()
         return run
 
-    def _create_archive_log(self, db_session_with_containers, *, run: WorkflowRun) -> None:
+    def _create_archive_log(self, db_session_with_containers: Session, *, run: WorkflowRun) -> None:
         archive_log = WorkflowArchiveLog(
             tenant_id=run.tenant_id,
             app_id=run.app_id,
@@ -72,7 +73,7 @@ class TestArchivedWorkflowRunDeletion:
         db_session_with_containers.add(archive_log)
         db_session_with_containers.commit()
 
-    def test_delete_by_run_id_returns_error_when_run_missing(self, db_session_with_containers):
+    def test_delete_by_run_id_returns_error_when_run_missing(self, db_session_with_containers: Session):
         deleter = ArchivedWorkflowRunDeletion()
         missing_run_id = str(uuid4())
 
@@ -81,7 +82,7 @@ class TestArchivedWorkflowRunDeletion:
         assert result.success is False
         assert result.error == f"Workflow run {missing_run_id} not found"
 
-    def test_delete_by_run_id_returns_error_when_not_archived(self, db_session_with_containers):
+    def test_delete_by_run_id_returns_error_when_not_archived(self, db_session_with_containers: Session):
         tenant_id = str(uuid4())
         run = self._create_workflow_run(
             db_session_with_containers,
@@ -95,7 +96,7 @@ class TestArchivedWorkflowRunDeletion:
         assert result.success is False
         assert result.error == f"Workflow run {run.id} is not archived"
 
-    def test_delete_batch_uses_repo(self, db_session_with_containers):
+    def test_delete_batch_uses_repo(self, db_session_with_containers: Session):
         tenant_id = str(uuid4())
         base_time = datetime.now(UTC)
         run1 = self._create_workflow_run(db_session_with_containers, tenant_id=tenant_id, created_at=base_time)
@@ -124,7 +125,7 @@ class TestArchivedWorkflowRunDeletion:
         ).all()
         assert remaining_runs == []
 
-    def test_delete_run_calls_repo(self, db_session_with_containers):
+    def test_delete_run_calls_repo(self, db_session_with_containers: Session):
         tenant_id = str(uuid4())
         run = self._create_workflow_run(
             db_session_with_containers,
@@ -142,7 +143,7 @@ class TestArchivedWorkflowRunDeletion:
         deleted_run = db_session_with_containers.get(WorkflowRun, run_id)
         assert deleted_run is None
 
-    def test_delete_run_dry_run(self, db_session_with_containers):
+    def test_delete_run_dry_run(self, db_session_with_containers: Session):
         """Dry run should return success without actually deleting."""
         tenant_id = str(uuid4())
         run = self._create_workflow_run(
@@ -161,7 +162,7 @@ class TestArchivedWorkflowRunDeletion:
         db_session_with_containers.expire_all()
         assert db_session_with_containers.get(WorkflowRun, run_id) is not None
 
-    def test_delete_run_exception_returns_error(self, db_session_with_containers):
+    def test_delete_run_exception_returns_error(self, db_session_with_containers: Session):
         """Exception during deletion should return failure result."""
         from unittest.mock import MagicMock, patch
 
@@ -183,7 +184,7 @@ class TestArchivedWorkflowRunDeletion:
         assert result.success is False
         assert result.error == "Database error"
 
-    def test_delete_by_run_id_success(self, db_session_with_containers):
+    def test_delete_by_run_id_success(self, db_session_with_containers: Session):
         """Successfully delete an archived workflow run by ID."""
         tenant_id = str(uuid4())
         base_time = datetime.now(UTC)
@@ -202,7 +203,7 @@ class TestArchivedWorkflowRunDeletion:
         db_session_with_containers.expunge_all()
         assert db_session_with_containers.get(WorkflowRun, run_id) is None
 
-    def test_get_workflow_run_repo_caches_instance(self, db_session_with_containers):
+    def test_get_workflow_run_repo_caches_instance(self, db_session_with_containers: Session):
         """_get_workflow_run_repo should return a cached repo on subsequent calls."""
         deleter = ArchivedWorkflowRunDeletion()
 
diff --git a/api/tests/test_containers_integration_tests/services/test_document_service_display_status.py b/api/tests/test_containers_integration_tests/services/test_document_service_display_status.py
index c0047df810..383a5f6374 100644
--- a/api/tests/test_containers_integration_tests/services/test_document_service_display_status.py
+++ b/api/tests/test_containers_integration_tests/services/test_document_service_display_status.py
@@ -2,6 +2,7 @@ import datetime
 from uuid import uuid4
 
 from sqlalchemy import select
+from sqlalchemy.orm import Session
 
 from core.rag.index_processor.constant.index_type import IndexStructureType
 from models.dataset import Dataset, Document
@@ -58,7 +59,7 @@ def _create_document(
     return document
 
 
-def test_build_display_status_filters_available(db_session_with_containers):
+def test_build_display_status_filters_available(db_session_with_containers: Session):
     dataset = _create_dataset(db_session_with_containers)
     available_doc = _create_document(
         db_session_with_containers,
@@ -97,7 +98,7 @@ def test_build_display_status_filters_available(db_session_with_containers):
     assert [row.id for row in rows] == [available_doc.id]
 
 
-def test_apply_display_status_filter_applies_when_status_present(db_session_with_containers):
+def test_apply_display_status_filter_applies_when_status_present(db_session_with_containers: Session):
     dataset = _create_dataset(db_session_with_containers)
     waiting_doc = _create_document(
         db_session_with_containers,
@@ -121,7 +122,7 @@ def test_apply_display_status_filter_applies_when_status_present(db_session_with
     assert [row.id for row in rows] == [waiting_doc.id]
 
 
-def test_apply_display_status_filter_returns_same_when_invalid(db_session_with_containers):
+def test_apply_display_status_filter_returns_same_when_invalid(db_session_with_containers: Session):
     dataset = _create_dataset(db_session_with_containers)
     doc1 = _create_document(
         db_session_with_containers,
diff --git a/api/tests/test_containers_integration_tests/services/test_end_user_service.py b/api/tests/test_containers_integration_tests/services/test_end_user_service.py
index cafabc939b..3f611d92f7 100644
--- a/api/tests/test_containers_integration_tests/services/test_end_user_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_end_user_service.py
@@ -4,8 +4,10 @@ from unittest.mock import patch
 from uuid import uuid4
 
 import pytest
+from sqlalchemy.orm import Session
 
 from core.app.entities.app_invoke_entities import InvokeFrom
+from models import TenantAccountRole
 from models.account import Account, Tenant, TenantAccountJoin
 from models.model import App, DefaultEndUserSessionID, EndUser
 from services.end_user_service import EndUserService
@@ -15,7 +17,7 @@ class TestEndUserServiceFactory:
     """Factory class for creating test data and mock objects for end user service tests."""
 
     @staticmethod
-    def create_app_and_account(db_session_with_containers):
+    def create_app_and_account(db_session_with_containers: Session):
         tenant = Tenant(name=f"Tenant {uuid4()}")
         db_session_with_containers.add(tenant)
         db_session_with_containers.flush()
@@ -34,7 +36,7 @@ class TestEndUserServiceFactory:
         tenant_join = TenantAccountJoin(
             tenant_id=tenant.id,
             account_id=account.id,
-            role="owner",
+            role=TenantAccountRole.OWNER,
             current=True,
         )
         db_session_with_containers.add(tenant_join)
@@ -102,7 +104,7 @@ class TestEndUserServiceGetOrCreateEndUser:
         """Provide test data factory."""
         return TestEndUserServiceFactory()
 
-    def test_get_or_create_end_user_with_custom_user_id(self, db_session_with_containers, factory):
+    def test_get_or_create_end_user_with_custom_user_id(self, db_session_with_containers: Session, factory):
         """Test getting or creating end user with custom user_id."""
         # Arrange
         app = factory.create_app_and_account(db_session_with_containers)
@@ -118,7 +120,7 @@ class TestEndUserServiceGetOrCreateEndUser:
         assert result.type == InvokeFrom.SERVICE_API
         assert result.is_anonymous is False
 
-    def test_get_or_create_end_user_without_user_id(self, db_session_with_containers, factory):
+    def test_get_or_create_end_user_without_user_id(self, db_session_with_containers: Session, factory):
         """Test getting or creating end user without user_id uses default session."""
         # Arrange
         app = factory.create_app_and_account(db_session_with_containers)
@@ -131,7 +133,7 @@ class TestEndUserServiceGetOrCreateEndUser:
         # Verify _is_anonymous is set correctly (property always returns False)
         assert result._is_anonymous is True
 
-    def test_get_existing_end_user(self, db_session_with_containers, factory):
+    def test_get_existing_end_user(self, db_session_with_containers: Session, factory):
         """Test retrieving an existing end user."""
         # Arrange
         app = factory.create_app_and_account(db_session_with_containers)
@@ -167,7 +169,7 @@ class TestEndUserServiceGetOrCreateEndUserByType:
         """Provide test data factory."""
         return TestEndUserServiceFactory()
 
-    def test_create_end_user_service_api_type(self, db_session_with_containers, factory):
+    def test_create_end_user_service_api_type(self, db_session_with_containers: Session, factory):
         """Test creating new end user with SERVICE_API type."""
         # Arrange
         app = factory.create_app_and_account(db_session_with_containers)
@@ -189,7 +191,7 @@ class TestEndUserServiceGetOrCreateEndUserByType:
         assert result.app_id == app_id
         assert result.session_id == user_id
 
-    def test_create_end_user_web_app_type(self, db_session_with_containers, factory):
+    def test_create_end_user_web_app_type(self, db_session_with_containers: Session, factory):
         """Test creating new end user with WEB_APP type."""
         # Arrange
         app = factory.create_app_and_account(db_session_with_containers)
@@ -209,7 +211,7 @@ class TestEndUserServiceGetOrCreateEndUserByType:
         assert result.type == InvokeFrom.WEB_APP
 
     @patch("services.end_user_service.logger")
-    def test_upgrade_legacy_end_user_type(self, mock_logger, db_session_with_containers, factory):
+    def test_upgrade_legacy_end_user_type(self, mock_logger, db_session_with_containers: Session, factory):
         """Test upgrading legacy end user with different type."""
         # Arrange
         app = factory.create_app_and_account(db_session_with_containers)
@@ -243,7 +245,7 @@ class TestEndUserServiceGetOrCreateEndUserByType:
         assert "Upgrading legacy EndUser" in log_call
 
     @patch("services.end_user_service.logger")
-    def test_get_existing_end_user_matching_type(self, mock_logger, db_session_with_containers, factory):
+    def test_get_existing_end_user_matching_type(self, mock_logger, db_session_with_containers: Session, factory):
         """Test retrieving existing end user with matching type."""
         # Arrange
         app = factory.create_app_and_account(db_session_with_containers)
@@ -272,7 +274,7 @@ class TestEndUserServiceGetOrCreateEndUserByType:
         assert result.type == InvokeFrom.SERVICE_API
         mock_logger.info.assert_not_called()
 
-    def test_create_anonymous_user_with_default_session(self, db_session_with_containers, factory):
+    def test_create_anonymous_user_with_default_session(self, db_session_with_containers: Session, factory):
         """Test creating anonymous user when user_id is None."""
         # Arrange
         app = factory.create_app_and_account(db_session_with_containers)
@@ -293,7 +295,7 @@ class TestEndUserServiceGetOrCreateEndUserByType:
         assert result._is_anonymous is True
         assert result.external_user_id == DefaultEndUserSessionID.DEFAULT_SESSION_ID
 
-    def test_query_ordering_prioritizes_matching_type(self, db_session_with_containers, factory):
+    def test_query_ordering_prioritizes_matching_type(self, db_session_with_containers: Session, factory):
         """Test that query ordering prioritizes records with matching type."""
         # Arrange
         app = factory.create_app_and_account(db_session_with_containers)
@@ -328,7 +330,7 @@ class TestEndUserServiceGetOrCreateEndUserByType:
         assert result.id == matching.id
         assert result.id != non_matching.id
 
-    def test_external_user_id_matches_session_id(self, db_session_with_containers, factory):
+    def test_external_user_id_matches_session_id(self, db_session_with_containers: Session, factory):
         """Test that external_user_id is set to match session_id."""
         # Arrange
         app = factory.create_app_and_account(db_session_with_containers)
@@ -357,7 +359,9 @@ class TestEndUserServiceGetOrCreateEndUserByType:
             InvokeFrom.DEBUGGER,
         ],
     )
-    def test_create_end_user_with_different_invoke_types(self, db_session_with_containers, invoke_type, factory):
+    def test_create_end_user_with_different_invoke_types(
+        self, db_session_with_containers: Session, invoke_type, factory
+    ):
         """Test creating end users with different InvokeFrom types."""
         # Arrange
         app = factory.create_app_and_account(db_session_with_containers)
@@ -385,7 +389,7 @@ class TestEndUserServiceGetEndUserById:
         """Provide test data factory."""
         return TestEndUserServiceFactory()
 
-    def test_get_end_user_by_id_returns_end_user(self, db_session_with_containers, factory):
+    def test_get_end_user_by_id_returns_end_user(self, db_session_with_containers: Session, factory):
         app = factory.create_app_and_account(db_session_with_containers)
         existing_user = factory.create_end_user(
             db_session_with_containers,
@@ -404,7 +408,7 @@ class TestEndUserServiceGetEndUserById:
         assert result is not None
         assert result.id == existing_user.id
 
-    def test_get_end_user_by_id_returns_none(self, db_session_with_containers, factory):
+    def test_get_end_user_by_id_returns_none(self, db_session_with_containers: Session, factory):
         app = factory.create_app_and_account(db_session_with_containers)
 
         result = EndUserService.get_end_user_by_id(
@@ -423,7 +427,7 @@ class TestEndUserServiceCreateBatch:
     def factory(self):
         return TestEndUserServiceFactory()
 
-    def _create_multiple_apps(self, db_session_with_containers, factory, count: int = 3):
+    def _create_multiple_apps(self, db_session_with_containers: Session, factory, count: int = 3):
         """Create multiple apps under the same tenant."""
         first_app = factory.create_app_and_account(db_session_with_containers)
         tenant_id = first_app.tenant_id
@@ -452,13 +456,13 @@ class TestEndUserServiceCreateBatch:
         all_apps = db_session_with_containers.query(App).filter(App.tenant_id == tenant_id).all()
         return tenant_id, all_apps
 
-    def test_create_batch_empty_app_ids(self, db_session_with_containers):
+    def test_create_batch_empty_app_ids(self, db_session_with_containers: Session):
         result = EndUserService.create_end_user_batch(
             type=InvokeFrom.SERVICE_API, tenant_id=str(uuid4()), app_ids=[], user_id="user-1"
         )
         assert result == {}
 
-    def test_create_batch_creates_users_for_all_apps(self, db_session_with_containers, factory):
+    def test_create_batch_creates_users_for_all_apps(self, db_session_with_containers: Session, factory):
         tenant_id, apps = self._create_multiple_apps(db_session_with_containers, factory, count=3)
         app_ids = [a.id for a in apps]
         user_id = f"user-{uuid4()}"
@@ -473,7 +477,7 @@ class TestEndUserServiceCreateBatch:
             assert result[app_id].session_id == user_id
             assert result[app_id].type == InvokeFrom.SERVICE_API
 
-    def test_create_batch_default_session_id(self, db_session_with_containers, factory):
+    def test_create_batch_default_session_id(self, db_session_with_containers: Session, factory):
         tenant_id, apps = self._create_multiple_apps(db_session_with_containers, factory, count=2)
         app_ids = [a.id for a in apps]
 
@@ -486,7 +490,7 @@ class TestEndUserServiceCreateBatch:
             assert end_user.session_id == DefaultEndUserSessionID.DEFAULT_SESSION_ID
             assert end_user._is_anonymous is True
 
-    def test_create_batch_deduplicate_app_ids(self, db_session_with_containers, factory):
+    def test_create_batch_deduplicate_app_ids(self, db_session_with_containers: Session, factory):
         tenant_id, apps = self._create_multiple_apps(db_session_with_containers, factory, count=2)
         app_ids = [apps[0].id, apps[1].id, apps[0].id, apps[1].id]
         user_id = f"user-{uuid4()}"
@@ -497,7 +501,7 @@ class TestEndUserServiceCreateBatch:
 
         assert len(result) == 2
 
-    def test_create_batch_returns_existing_users(self, db_session_with_containers, factory):
+    def test_create_batch_returns_existing_users(self, db_session_with_containers: Session, factory):
         tenant_id, apps = self._create_multiple_apps(db_session_with_containers, factory, count=2)
         app_ids = [a.id for a in apps]
         user_id = f"user-{uuid4()}"
@@ -516,7 +520,7 @@ class TestEndUserServiceCreateBatch:
         for app_id in app_ids:
             assert first_result[app_id].id == second_result[app_id].id
 
-    def test_create_batch_partial_existing_users(self, db_session_with_containers, factory):
+    def test_create_batch_partial_existing_users(self, db_session_with_containers: Session, factory):
         tenant_id, apps = self._create_multiple_apps(db_session_with_containers, factory, count=3)
         user_id = f"user-{uuid4()}"
 
@@ -545,7 +549,7 @@ class TestEndUserServiceCreateBatch:
         "invoke_type",
         [InvokeFrom.SERVICE_API, InvokeFrom.WEB_APP, InvokeFrom.EXPLORE, InvokeFrom.DEBUGGER],
     )
-    def test_create_batch_all_invoke_types(self, db_session_with_containers, invoke_type, factory):
+    def test_create_batch_all_invoke_types(self, db_session_with_containers: Session, invoke_type, factory):
         tenant_id, apps = self._create_multiple_apps(db_session_with_containers, factory, count=1)
         user_id = f"user-{uuid4()}"
 
diff --git a/api/tests/test_containers_integration_tests/services/test_feature_service.py b/api/tests/test_containers_integration_tests/services/test_feature_service.py
index 315936d721..a678e37b41 100644
--- a/api/tests/test_containers_integration_tests/services/test_feature_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_feature_service.py
@@ -2,6 +2,7 @@ from unittest.mock import patch
 
 import pytest
 from faker import Faker
+from sqlalchemy.orm import Session
 
 from enums.cloud_plan import CloudPlan
 from services.feature_service import (
@@ -81,7 +82,7 @@ class TestFeatureService:
         fake = Faker()
         return fake.uuid4()
 
-    def test_get_features_success(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_get_features_success(self, db_session_with_containers: Session, mock_external_service_dependencies):
         """
         Test successful feature retrieval with billing and enterprise enabled.
 
@@ -156,7 +157,7 @@ class TestFeatureService:
                 tenant_id
             )
 
-    def test_get_features_sandbox_plan(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_get_features_sandbox_plan(self, db_session_with_containers: Session, mock_external_service_dependencies):
         """
         Test feature retrieval for sandbox plan with specific limitations.
 
@@ -222,7 +223,9 @@ class TestFeatureService:
         # Verify mock interactions
         mock_external_service_dependencies["billing_service"].get_info.assert_called_once_with(tenant_id)
 
-    def test_get_knowledge_rate_limit_success(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_get_knowledge_rate_limit_success(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test successful knowledge rate limit retrieval with billing enabled.
 
@@ -255,7 +258,7 @@ class TestFeatureService:
                 tenant_id
             )
 
-    def test_get_system_features_success(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_get_system_features_success(self, db_session_with_containers: Session, mock_external_service_dependencies):
         """
         Test successful system features retrieval with enterprise and marketplace enabled.
 
@@ -332,7 +335,9 @@ class TestFeatureService:
         # Verify mock interactions
         mock_external_service_dependencies["enterprise_service"].get_info.assert_called_once()
 
-    def test_get_system_features_unauthenticated(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_get_system_features_unauthenticated(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test system features retrieval for an unauthenticated user.
 
@@ -386,7 +391,9 @@ class TestFeatureService:
         # Marketplace should be visible
         assert result.enable_marketplace is True
 
-    def test_get_system_features_basic_config(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_get_system_features_basic_config(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test system features retrieval with basic configuration (no enterprise).
 
@@ -436,7 +443,9 @@ class TestFeatureService:
             # Verify plugin package size (uses default value from dify_config)
             assert result.max_plugin_package_size == 15728640
 
-    def test_get_features_billing_disabled(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_get_features_billing_disabled(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test feature retrieval when billing is disabled.
 
@@ -492,7 +501,7 @@ class TestFeatureService:
             assert result.webapp_copyright_enabled is False
 
     def test_get_knowledge_rate_limit_billing_disabled(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test knowledge rate limit retrieval when billing is disabled.
@@ -523,7 +532,9 @@ class TestFeatureService:
             # Verify no billing service calls
             mock_external_service_dependencies["billing_service"].get_knowledge_rate_limit.assert_not_called()
 
-    def test_get_features_enterprise_only(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_get_features_enterprise_only(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test feature retrieval with enterprise enabled but billing disabled.
 
@@ -583,7 +594,7 @@ class TestFeatureService:
             mock_external_service_dependencies["billing_service"].get_info.assert_not_called()
 
     def test_get_system_features_enterprise_disabled(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test system features retrieval when enterprise is disabled.
@@ -633,14 +644,14 @@ class TestFeatureService:
             assert result.max_plugin_package_size == 15728640
 
             # Verify default license status
-            assert result.license.status.value == "none"
+            assert result.license.status == "none"
             assert result.license.expired_at == ""
             assert result.license.workspaces.enabled is False
 
             # Verify no enterprise service calls
             mock_external_service_dependencies["enterprise_service"].get_info.assert_not_called()
 
-    def test_get_features_no_tenant_id(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_get_features_no_tenant_id(self, db_session_with_containers: Session, mock_external_service_dependencies):
         """
         Test feature retrieval without tenant ID (billing disabled).
 
@@ -686,7 +697,9 @@ class TestFeatureService:
             # Verify no billing service calls
             mock_external_service_dependencies["billing_service"].get_info.assert_not_called()
 
-    def test_get_features_partial_billing_info(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_get_features_partial_billing_info(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test feature retrieval with partial billing information.
 
@@ -746,7 +759,9 @@ class TestFeatureService:
         # Verify mock interactions
         mock_external_service_dependencies["billing_service"].get_info.assert_called_once_with(tenant_id)
 
-    def test_get_features_edge_case_vector_space(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_get_features_edge_case_vector_space(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test feature retrieval with edge case vector space configuration.
 
@@ -807,7 +822,7 @@ class TestFeatureService:
         mock_external_service_dependencies["billing_service"].get_info.assert_called_once_with(tenant_id)
 
     def test_get_system_features_edge_case_webapp_auth(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test system features retrieval with edge case webapp auth configuration.
@@ -863,7 +878,9 @@ class TestFeatureService:
         # Verify mock interactions
         mock_external_service_dependencies["enterprise_service"].get_info.assert_called_once()
 
-    def test_get_features_edge_case_members_quota(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_get_features_edge_case_members_quota(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test feature retrieval with edge case members quota configuration.
 
@@ -924,7 +941,7 @@ class TestFeatureService:
         mock_external_service_dependencies["billing_service"].get_info.assert_called_once_with(tenant_id)
 
     def test_plugin_installation_permission_scopes(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test system features retrieval with different plugin installation permission scopes.
@@ -1023,7 +1040,7 @@ class TestFeatureService:
             assert result.plugin_installation_permission.restrict_to_marketplace_only is True
 
     def test_get_features_workspace_members_missing(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test feature retrieval when workspace members info is missing from enterprise.
@@ -1064,7 +1081,9 @@ class TestFeatureService:
                 tenant_id
             )
 
-    def test_get_system_features_license_inactive(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_get_system_features_license_inactive(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test system features retrieval with inactive license.
 
@@ -1117,7 +1136,7 @@ class TestFeatureService:
         mock_external_service_dependencies["enterprise_service"].get_info.assert_called_once()
 
     def test_get_system_features_partial_enterprise_info(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test system features retrieval with partial enterprise information.
@@ -1186,7 +1205,9 @@ class TestFeatureService:
         # Verify mock interactions
         mock_external_service_dependencies["enterprise_service"].get_info.assert_called_once()
 
-    def test_get_features_edge_case_limits(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_get_features_edge_case_limits(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test feature retrieval with edge case limit values.
 
@@ -1244,7 +1265,7 @@ class TestFeatureService:
         mock_external_service_dependencies["billing_service"].get_info.assert_called_once_with(tenant_id)
 
     def test_get_system_features_edge_case_protocols(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test system features retrieval with edge case protocol values.
@@ -1297,7 +1318,9 @@ class TestFeatureService:
         # Verify mock interactions
         mock_external_service_dependencies["enterprise_service"].get_info.assert_called_once()
 
-    def test_get_features_edge_case_education(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_get_features_edge_case_education(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test feature retrieval with edge case education configuration.
 
@@ -1353,7 +1376,7 @@ class TestFeatureService:
             mock_external_service_dependencies["billing_service"].get_info.assert_called_once_with(tenant_id)
 
     def test_license_limitation_model_is_available(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test LicenseLimitationModel.is_available method with various scenarios.
@@ -1394,7 +1417,7 @@ class TestFeatureService:
         assert exact_limit.is_available(3) is True
 
     def test_get_features_workspace_members_disabled(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test feature retrieval when workspace members are disabled in enterprise.
@@ -1433,7 +1456,9 @@ class TestFeatureService:
         # Verify mock interactions
         mock_external_service_dependencies["enterprise_service"].get_workspace_info.assert_called_once_with(tenant_id)
 
-    def test_get_system_features_license_expired(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_get_system_features_license_expired(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test system features retrieval with expired license.
 
@@ -1486,7 +1511,7 @@ class TestFeatureService:
         mock_external_service_dependencies["enterprise_service"].get_info.assert_called_once()
 
     def test_get_features_edge_case_docs_processing(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test feature retrieval with edge case document processing configuration.
@@ -1544,7 +1569,7 @@ class TestFeatureService:
         mock_external_service_dependencies["billing_service"].get_info.assert_called_once_with(tenant_id)
 
     def test_get_system_features_edge_case_branding(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test system features retrieval with edge case branding configuration.
@@ -1606,7 +1631,7 @@ class TestFeatureService:
         mock_external_service_dependencies["enterprise_service"].get_info.assert_called_once()
 
     def test_get_features_edge_case_annotation_quota(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test feature retrieval with edge case annotation quota configuration.
@@ -1668,7 +1693,7 @@ class TestFeatureService:
         mock_external_service_dependencies["billing_service"].get_info.assert_called_once_with(tenant_id)
 
     def test_get_features_edge_case_documents_upload(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test feature retrieval with edge case documents upload settings.
@@ -1733,7 +1758,7 @@ class TestFeatureService:
         mock_external_service_dependencies["billing_service"].get_info.assert_called_once_with(tenant_id)
 
     def test_get_system_features_edge_case_license_lost(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test system features with lost license status.
@@ -1784,7 +1809,7 @@ class TestFeatureService:
         mock_external_service_dependencies["enterprise_service"].get_info.assert_called_once()
 
     def test_get_features_edge_case_education_disabled(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test feature retrieval with education feature disabled.
diff --git a/api/tests/test_containers_integration_tests/services/test_feedback_service.py b/api/tests/test_containers_integration_tests/services/test_feedback_service.py
index 3dcd6586e2..a4663450d4 100644
--- a/api/tests/test_containers_integration_tests/services/test_feedback_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_feedback_service.py
@@ -23,7 +23,7 @@ class TestFeedbackService:
     """Test FeedbackService methods."""
 
     @pytest.fixture
-    def mock_db_session(self, monkeypatch):
+    def mock_db_session(self, monkeypatch: pytest.MonkeyPatch):
         """Mock database session."""
         mock_session = mock.Mock()
         monkeypatch.setattr(db, "session", mock_session)
diff --git a/api/tests/test_containers_integration_tests/services/test_file_service.py b/api/tests/test_containers_integration_tests/services/test_file_service.py
index 42dbdef1c9..4532005836 100644
--- a/api/tests/test_containers_integration_tests/services/test_file_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_file_service.py
@@ -514,7 +514,7 @@ class TestFileService:
 
         db_session_with_containers.commit()
 
-        result = FileService(engine).get_file_preview(file_id=upload_file.id)
+        result = FileService(engine).get_file_preview(file_id=upload_file.id, tenant_id=upload_file.tenant_id)
 
         assert result == "extracted text content"
         mock_external_service_dependencies["extract_processor"].load_from_upload_file.assert_called_once()
@@ -529,7 +529,7 @@ class TestFileService:
         non_existent_id = str(fake.uuid4())
 
         with pytest.raises(NotFound, match="File not found"):
-            FileService(engine).get_file_preview(file_id=non_existent_id)
+            FileService(engine).get_file_preview(file_id=non_existent_id, tenant_id=str(fake.uuid4()))
 
     def test_get_file_preview_unsupported_file_type(
         self, db_session_with_containers: Session, engine, mock_external_service_dependencies
@@ -549,7 +549,7 @@ class TestFileService:
         db_session_with_containers.commit()
 
         with pytest.raises(UnsupportedFileTypeError):
-            FileService(engine).get_file_preview(file_id=upload_file.id)
+            FileService(engine).get_file_preview(file_id=upload_file.id, tenant_id=upload_file.tenant_id)
 
     def test_get_file_preview_text_truncation(
         self, db_session_with_containers: Session, engine, mock_external_service_dependencies
@@ -572,7 +572,7 @@ class TestFileService:
         long_text = "x" * 5000  # Longer than PREVIEW_WORDS_LIMIT
         mock_external_service_dependencies["extract_processor"].load_from_upload_file.return_value = long_text
 
-        result = FileService(engine).get_file_preview(file_id=upload_file.id)
+        result = FileService(engine).get_file_preview(file_id=upload_file.id, tenant_id=upload_file.tenant_id)
 
         assert len(result) == 3000  # PREVIEW_WORDS_LIMIT
         assert result == "x" * 3000
diff --git a/api/tests/test_containers_integration_tests/services/test_file_service_zip_and_lookup.py b/api/tests/test_containers_integration_tests/services/test_file_service_zip_and_lookup.py
index 4e0a726cc7..1101d834a0 100644
--- a/api/tests/test_containers_integration_tests/services/test_file_service_zip_and_lookup.py
+++ b/api/tests/test_containers_integration_tests/services/test_file_service_zip_and_lookup.py
@@ -15,6 +15,7 @@ from uuid import uuid4
 from zipfile import ZipFile
 
 import pytest
+from sqlalchemy.orm import Session
 
 import services.file_service as file_service_module
 from extensions.storage.storage_type import StorageType
@@ -23,7 +24,7 @@ from models.model import UploadFile
 from services.file_service import FileService
 
 
-def _create_upload_file(db_session, *, tenant_id: str, key: str, name: str) -> UploadFile:
+def _create_upload_file(db_session: Session, *, tenant_id: str, key: str, name: str) -> UploadFile:
     upload_file = UploadFile(
         tenant_id=tenant_id,
         storage_type=StorageType.OPENDAL,
@@ -66,12 +67,12 @@ def test_build_upload_files_zip_tempfile_sanitizes_and_dedupes_names(monkeypatch
             assert zf.read("b (2).txt") == b"three"
 
 
-def test_get_upload_files_by_ids_returns_empty_when_no_ids(db_session_with_containers) -> None:
+def test_get_upload_files_by_ids_returns_empty_when_no_ids(db_session_with_containers: Session) -> None:
     """Ensure empty input returns an empty mapping without hitting the database."""
     assert FileService.get_upload_files_by_ids(str(uuid4()), []) == {}
 
 
-def test_get_upload_files_by_ids_returns_id_keyed_mapping(db_session_with_containers) -> None:
+def test_get_upload_files_by_ids_returns_id_keyed_mapping(db_session_with_containers: Session) -> None:
     """Ensure batch lookup returns a dict keyed by stringified UploadFile ids."""
     tenant_id = str(uuid4())
     file1 = _create_upload_file(db_session_with_containers, tenant_id=tenant_id, key="k1", name="file1.txt")
@@ -84,7 +85,7 @@ def test_get_upload_files_by_ids_returns_id_keyed_mapping(db_session_with_contai
     assert result[file2.id].id == file2.id
 
 
-def test_get_upload_files_by_ids_filters_by_tenant(db_session_with_containers) -> None:
+def test_get_upload_files_by_ids_filters_by_tenant(db_session_with_containers: Session) -> None:
     """Ensure files from other tenants are not returned."""
     tenant_a = str(uuid4())
     tenant_b = str(uuid4())
diff --git a/api/tests/test_containers_integration_tests/services/test_human_input_delivery_test_service.py b/api/tests/test_containers_integration_tests/services/test_human_input_delivery_test_service.py
index ed75363f3b..454b8096d1 100644
--- a/api/tests/test_containers_integration_tests/services/test_human_input_delivery_test_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_human_input_delivery_test_service.py
@@ -5,7 +5,9 @@ from unittest.mock import MagicMock, patch
 from uuid import uuid4
 
 import pytest
+from flask import Flask
 from sqlalchemy.engine import Engine
+from sqlalchemy.orm import Session
 
 from configs import dify_config
 from core.workflow.human_input_adapter import (
@@ -88,7 +90,7 @@ class TestDeliveryTestRegistry:
         with pytest.raises(DeliveryTestUnsupportedError, match="Delivery method does not support test send."):
             registry.dispatch(context=context, method=method)
 
-    def test_default(self, flask_app_with_containers, db_session_with_containers):
+    def test_default(self, flask_app_with_containers: Flask, db_session_with_containers: Session):
         registry = DeliveryTestRegistry.default()
         assert len(registry._handlers) == 1
         assert isinstance(registry._handlers[0], EmailDeliveryTestHandler)
@@ -121,7 +123,7 @@ class TestEmailDeliveryTestHandler:
         with pytest.raises(DeliveryTestUnsupportedError):
             handler.send_test(context=MagicMock(), method=MagicMock())
 
-    def test_send_test_feature_disabled(self, monkeypatch):
+    def test_send_test_feature_disabled(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(
             service_module.FeatureService,
             "get_features",
@@ -136,7 +138,7 @@ class TestEmailDeliveryTestHandler:
         with pytest.raises(DeliveryTestError, match="Email delivery is not available"):
             handler.send_test(context=context, method=method)
 
-    def test_send_test_mail_not_inited(self, monkeypatch):
+    def test_send_test_mail_not_inited(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(
             service_module.FeatureService,
             "get_features",
@@ -153,7 +155,7 @@ class TestEmailDeliveryTestHandler:
         with pytest.raises(DeliveryTestError, match="Mail client is not initialized."):
             handler.send_test(context=context, method=method)
 
-    def test_send_test_no_recipients(self, monkeypatch):
+    def test_send_test_no_recipients(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(
             service_module.FeatureService,
             "get_features",
@@ -172,7 +174,7 @@ class TestEmailDeliveryTestHandler:
         with pytest.raises(DeliveryTestError, match="No recipients configured"):
             handler.send_test(context=context, method=method)
 
-    def test_send_test_success(self, monkeypatch):
+    def test_send_test_success(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(
             service_module.FeatureService,
             "get_features",
@@ -208,7 +210,7 @@ class TestEmailDeliveryTestHandler:
         assert kwargs["to"] == "test@example.com"
         assert "RENDERED_Subj" in kwargs["subject"]
 
-    def test_send_test_sanitizes_subject(self, monkeypatch):
+    def test_send_test_sanitizes_subject(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(
             service_module.FeatureService,
             "get_features",
@@ -260,7 +262,7 @@ class TestEmailDeliveryTestHandler:
         )
         assert handler._resolve_recipients(tenant_id="t1", method=method) == ["ext@example.com"]
 
-    def test_resolve_recipients_member(self, flask_app_with_containers, db_session_with_containers):
+    def test_resolve_recipients_member(self, flask_app_with_containers: Flask, db_session_with_containers: Session):
         tenant_id = str(uuid4())
         account = Account(name="Test User", email="member@example.com")
         db_session_with_containers.add(account)
@@ -282,7 +284,9 @@ class TestEmailDeliveryTestHandler:
         )
         assert handler._resolve_recipients(tenant_id=tenant_id, method=method) == ["member@example.com"]
 
-    def test_resolve_recipients_whole_workspace(self, flask_app_with_containers, db_session_with_containers):
+    def test_resolve_recipients_whole_workspace(
+        self, flask_app_with_containers: Flask, db_session_with_containers: Session
+    ):
         tenant_id = str(uuid4())
         account1 = Account(name="User 1", email=f"u1-{uuid4()}@example.com")
         account2 = Account(name="User 2", email=f"u2-{uuid4()}@example.com")
diff --git a/api/tests/test_containers_integration_tests/services/test_message_service.py b/api/tests/test_containers_integration_tests/services/test_message_service.py
index bdf6d9b951..6d0d281c6b 100644
--- a/api/tests/test_containers_integration_tests/services/test_message_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_message_service.py
@@ -6,7 +6,7 @@ from sqlalchemy.orm import Session
 
 from models.enums import ConversationFromSource, FeedbackRating, InvokeFrom
 from models.model import MessageFeedback
-from services.app_service import AppService
+from services.app_service import AppService, CreateAppParams
 from services.errors.message import (
     FirstMessageNotExistsError,
     LastMessageNotExistsError,
@@ -103,16 +103,16 @@ class TestMessageService:
         tenant = account.current_tenant
 
         # Setup app creation arguments
-        app_args = {
-            "name": fake.company(),
-            "description": fake.text(max_nb_chars=100),
-            "mode": "advanced-chat",  # Use advanced-chat mode to use mocked workflow
-            "icon_type": "emoji",
-            "icon": "🤖",
-            "icon_background": "#FF6B6B",
-            "api_rph": 100,
-            "api_rpm": 10,
-        }
+        app_args = CreateAppParams(
+            name=fake.company(),
+            description=fake.text(max_nb_chars=100),
+            mode="advanced-chat",  # Use advanced-chat mode to use mocked workflow,
+            icon_type="emoji",
+            icon="🤖",
+            icon_background="#FF6B6B",
+            api_rph=100,
+            api_rpm=10,
+        )
 
         # Create app
         app_service = AppService()
diff --git a/api/tests/test_containers_integration_tests/services/test_message_service_execution_extra_content.py b/api/tests/test_containers_integration_tests/services/test_message_service_execution_extra_content.py
index 44e5a82868..52ebc0131f 100644
--- a/api/tests/test_containers_integration_tests/services/test_message_service_execution_extra_content.py
+++ b/api/tests/test_containers_integration_tests/services/test_message_service_execution_extra_content.py
@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import pytest
+from sqlalchemy.orm import Session
 
 from services.message_service import MessageService
 from tests.test_containers_integration_tests.helpers.execution_extra_content import (
@@ -9,7 +10,7 @@ from tests.test_containers_integration_tests.helpers.execution_extra_content imp
 
 
 @pytest.mark.usefixtures("flask_req_ctx_with_containers")
-def test_pagination_returns_extra_contents(db_session_with_containers):
+def test_pagination_returns_extra_contents(db_session_with_containers: Session):
     fixture = create_human_input_message_fixture(db_session_with_containers)
 
     pagination = MessageService.pagination_by_first_id(
diff --git a/api/tests/test_containers_integration_tests/services/test_messages_clean_service.py b/api/tests/test_containers_integration_tests/services/test_messages_clean_service.py
index cd63d3ad6c..1a1efe0337 100644
--- a/api/tests/test_containers_integration_tests/services/test_messages_clean_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_messages_clean_service.py
@@ -165,7 +165,7 @@ class TestMessagesCleanServiceIntegration:
 
         return app
 
-    def _create_conversation(self, db_session_with_containers: Session, app):
+    def _create_conversation(self, db_session_with_containers: Session, app: App):
         """Helper to create a conversation."""
         conversation = Conversation(
             app_id=app.id,
diff --git a/api/tests/test_containers_integration_tests/services/test_metadata_partial_update.py b/api/tests/test_containers_integration_tests/services/test_metadata_partial_update.py
index b55a19eaa9..f3ab9eb3da 100644
--- a/api/tests/test_containers_integration_tests/services/test_metadata_partial_update.py
+++ b/api/tests/test_containers_integration_tests/services/test_metadata_partial_update.py
@@ -4,7 +4,9 @@ from unittest.mock import Mock, patch
 from uuid import uuid4
 
 import pytest
+from flask import Flask
 from sqlalchemy import select
+from sqlalchemy.orm import Session
 
 from models.dataset import Dataset, DatasetMetadataBinding, Document
 from models.enums import DataSourceType, DocumentCreatedFrom
@@ -16,7 +18,7 @@ from services.entities.knowledge_entities.knowledge_entities import (
 from services.metadata_service import MetadataService
 
 
-def _create_dataset(db_session, *, tenant_id: str, built_in_field_enabled: bool = False) -> Dataset:
+def _create_dataset(db_session: Session, *, tenant_id: str, built_in_field_enabled: bool = False) -> Dataset:
     dataset = Dataset(
         tenant_id=tenant_id,
         name=f"dataset-{uuid4()}",
@@ -30,7 +32,9 @@ def _create_dataset(db_session, *, tenant_id: str, built_in_field_enabled: bool
     return dataset
 
 
-def _create_document(db_session, *, dataset_id: str, tenant_id: str, doc_metadata: dict | None = None) -> Document:
+def _create_document(
+    db_session: Session, *, dataset_id: str, tenant_id: str, doc_metadata: dict | None = None
+) -> Document:
     document = Document(
         tenant_id=tenant_id,
         dataset_id=dataset_id,
@@ -65,7 +69,11 @@ class TestMetadataPartialUpdate:
             yield account
 
     def test_partial_update_merges_metadata(
-        self, flask_app_with_containers, db_session_with_containers, tenant_id, mock_current_account
+        self,
+        flask_app_with_containers: Flask,
+        db_session_with_containers: Session,
+        tenant_id: str,
+        mock_current_account,
     ):
         dataset = _create_dataset(db_session_with_containers, tenant_id=tenant_id)
         document = _create_document(
@@ -92,7 +100,11 @@ class TestMetadataPartialUpdate:
         assert updated_doc.doc_metadata["new_key"] == "new_value"
 
     def test_full_update_replaces_metadata(
-        self, flask_app_with_containers, db_session_with_containers, tenant_id, mock_current_account
+        self,
+        flask_app_with_containers: Flask,
+        db_session_with_containers: Session,
+        tenant_id: str,
+        mock_current_account,
     ):
         dataset = _create_dataset(db_session_with_containers, tenant_id=tenant_id)
         document = _create_document(
@@ -119,7 +131,12 @@ class TestMetadataPartialUpdate:
         assert "existing_key" not in updated_doc.doc_metadata
 
     def test_partial_update_skips_existing_binding(
-        self, flask_app_with_containers, db_session_with_containers, tenant_id, user_id, mock_current_account
+        self,
+        flask_app_with_containers: Flask,
+        db_session_with_containers: Session,
+        tenant_id,
+        user_id,
+        mock_current_account,
     ):
         dataset = _create_dataset(db_session_with_containers, tenant_id=tenant_id)
         document = _create_document(
@@ -159,7 +176,11 @@ class TestMetadataPartialUpdate:
         assert len(bindings) == 1
 
     def test_rollback_called_on_commit_failure(
-        self, flask_app_with_containers, db_session_with_containers, tenant_id, mock_current_account
+        self,
+        flask_app_with_containers: Flask,
+        db_session_with_containers: Session,
+        tenant_id: str,
+        mock_current_account,
     ):
         dataset = _create_dataset(db_session_with_containers, tenant_id=tenant_id)
         document = _create_document(
diff --git a/api/tests/test_containers_integration_tests/services/test_oauth_server_service.py b/api/tests/test_containers_integration_tests/services/test_oauth_server_service.py
index c146a5924b..5fa5de6d80 100644
--- a/api/tests/test_containers_integration_tests/services/test_oauth_server_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_oauth_server_service.py
@@ -8,6 +8,7 @@ from unittest.mock import MagicMock, patch
 from uuid import uuid4
 
 import pytest
+from sqlalchemy.orm import Session
 from werkzeug.exceptions import BadRequest
 
 from models.model import OAuthProviderApp
@@ -25,7 +26,7 @@ from services.oauth_server import (
 class TestOAuthServerServiceGetProviderApp:
     """DB-backed tests for get_oauth_provider_app."""
 
-    def _create_oauth_provider_app(self, db_session_with_containers, *, client_id: str) -> OAuthProviderApp:
+    def _create_oauth_provider_app(self, db_session_with_containers: Session, *, client_id: str) -> OAuthProviderApp:
         app = OAuthProviderApp(
             app_icon="icon.png",
             client_id=client_id,
@@ -38,7 +39,7 @@ class TestOAuthServerServiceGetProviderApp:
         db_session_with_containers.commit()
         return app
 
-    def test_get_oauth_provider_app_returns_app_when_exists(self, db_session_with_containers):
+    def test_get_oauth_provider_app_returns_app_when_exists(self, db_session_with_containers: Session):
         client_id = f"client-{uuid4()}"
         created = self._create_oauth_provider_app(db_session_with_containers, client_id=client_id)
 
@@ -48,7 +49,7 @@ class TestOAuthServerServiceGetProviderApp:
         assert result.client_id == client_id
         assert result.id == created.id
 
-    def test_get_oauth_provider_app_returns_none_when_not_exists(self, db_session_with_containers):
+    def test_get_oauth_provider_app_returns_none_when_not_exists(self, db_session_with_containers: Session):
         result = OAuthServerService.get_oauth_provider_app(f"nonexistent-{uuid4()}")
 
         assert result is None
diff --git a/api/tests/test_containers_integration_tests/services/test_ops_service.py b/api/tests/test_containers_integration_tests/services/test_ops_service.py
index e2e1a228b2..ff76bce416 100644
--- a/api/tests/test_containers_integration_tests/services/test_ops_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_ops_service.py
@@ -11,7 +11,7 @@ from sqlalchemy.orm import Session
 from core.ops.entities.config_entity import TracingProviderEnum
 from models.model import TraceAppConfig
 from services.account_service import AccountService, TenantService
-from services.app_service import AppService
+from services.app_service import AppService, CreateAppParams
 from services.ops_service import OpsService
 from tests.test_containers_integration_tests.helpers import generate_valid_password
 
@@ -57,14 +57,14 @@ class TestOpsService:
         app_service = AppService()
         app = app_service.create_app(
             tenant.id,
-            {
-                "name": fake.company(),
-                "description": fake.text(max_nb_chars=100),
-                "mode": "chat",
-                "icon_type": "emoji",
-                "icon": "🤖",
-                "icon_background": "#FF6B6B",
-            },
+            CreateAppParams(
+                name=fake.company(),
+                description=fake.text(max_nb_chars=100),
+                mode="chat",
+                icon_type="emoji",
+                icon="🤖",
+                icon_background="#FF6B6B",
+            ),
             account,
         )
         return app, account
diff --git a/api/tests/test_containers_integration_tests/services/test_recommended_app_service.py b/api/tests/test_containers_integration_tests/services/test_recommended_app_service.py
index ccc4188dbf..ddaf08c0a0 100644
--- a/api/tests/test_containers_integration_tests/services/test_recommended_app_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_recommended_app_service.py
@@ -352,6 +352,32 @@ class TestRecommendedAppServiceTrialFeatures:
         assert result["id"] == app_id
         assert result["can_trial"] is has_trial_app
 
+    def test_get_detail_returns_none_when_not_found_and_trial_enabled(
+        self,
+        db_session_with_containers: Session,
+        monkeypatch: pytest.MonkeyPatch,
+    ):
+        """Regression: accessing result['id'] when result is None must not crash."""
+        retrieval_instance = MagicMock()
+        retrieval_instance.get_recommend_app_detail.return_value = None
+        retrieval_factory = MagicMock(return_value=retrieval_instance)
+        monkeypatch.setattr(service_module.dify_config, "HOSTED_FETCH_APP_TEMPLATES_MODE", "remote", raising=False)
+        monkeypatch.setattr(
+            service_module.RecommendAppRetrievalFactory,
+            "get_recommend_app_factory",
+            MagicMock(return_value=retrieval_factory),
+        )
+        monkeypatch.setattr(
+            service_module.FeatureService,
+            "get_system_features",
+            MagicMock(return_value=SimpleNamespace(enable_trial_app=True)),
+        )
+
+        result = RecommendedAppService.get_recommend_app_detail("nonexistent")
+
+        assert result is None
+        retrieval_instance.get_recommend_app_detail.assert_called_once_with("nonexistent")
+
     def test_add_trial_app_record_increments_count_for_existing(self, db_session_with_containers: Session):
         app_id = str(uuid.uuid4())
         account_id = str(uuid.uuid4())
diff --git a/api/tests/test_containers_integration_tests/services/test_restore_archived_workflow_run.py b/api/tests/test_containers_integration_tests/services/test_restore_archived_workflow_run.py
index 7036524918..2f20949611 100644
--- a/api/tests/test_containers_integration_tests/services/test_restore_archived_workflow_run.py
+++ b/api/tests/test_containers_integration_tests/services/test_restore_archived_workflow_run.py
@@ -8,6 +8,7 @@ from datetime import datetime
 from uuid import uuid4
 
 from sqlalchemy import select
+from sqlalchemy.orm import Session
 
 from models.workflow import WorkflowPause, WorkflowRun
 from services.retention.workflow_run.restore_archived_workflow_run import WorkflowRunRestore
@@ -39,7 +40,7 @@ class TestWorkflowRunRestore:
         assert result["created_at"].month == 1
         assert result["name"] == "test"
 
-    def test_restore_table_records_returns_rowcount(self, db_session_with_containers):
+    def test_restore_table_records_returns_rowcount(self, db_session_with_containers: Session):
         """Restore should return inserted rowcount."""
         restore = WorkflowRunRestore()
         record_id = str(uuid4())
@@ -65,7 +66,7 @@ class TestWorkflowRunRestore:
         restored_pause = db_session_with_containers.scalar(select(WorkflowPause).where(WorkflowPause.id == record_id))
         assert restored_pause is not None
 
-    def test_restore_table_records_unknown_table(self, db_session_with_containers):
+    def test_restore_table_records_unknown_table(self, db_session_with_containers: Session):
         """Unknown table names should be ignored gracefully."""
         restore = WorkflowRunRestore()
 
diff --git a/api/tests/test_containers_integration_tests/services/test_saved_message_service.py b/api/tests/test_containers_integration_tests/services/test_saved_message_service.py
index 70aa813142..7368ad4249 100644
--- a/api/tests/test_containers_integration_tests/services/test_saved_message_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_saved_message_service.py
@@ -4,10 +4,11 @@ import pytest
 from faker import Faker
 from sqlalchemy.orm import Session
 
+from models import App, CreatorUserRole
 from models.enums import ConversationFromSource
 from models.model import EndUser, Message
 from models.web import SavedMessage
-from services.app_service import AppService
+from services.app_service import AppService, CreateAppParams
 from services.saved_message_service import SavedMessageService
 from tests.test_containers_integration_tests.helpers import generate_valid_password
 
@@ -72,23 +73,23 @@ class TestSavedMessageService:
         tenant = account.current_tenant
 
         # Create app with realistic data
-        app_args = {
-            "name": fake.company(),
-            "description": fake.text(max_nb_chars=100),
-            "mode": "chat",
-            "icon_type": "emoji",
-            "icon": "🤖",
-            "icon_background": "#FF6B6B",
-            "api_rph": 100,
-            "api_rpm": 10,
-        }
+        app_args = CreateAppParams(
+            name=fake.company(),
+            description=fake.text(max_nb_chars=100),
+            mode="chat",
+            icon_type="emoji",
+            icon="🤖",
+            icon_background="#FF6B6B",
+            api_rph=100,
+            api_rpm=10,
+        )
 
         app_service = AppService()
         app = app_service.create_app(tenant.id, app_args, account)
 
         return app, account
 
-    def _create_test_end_user(self, db_session_with_containers: Session, app):
+    def _create_test_end_user(self, db_session_with_containers: Session, app: App):
         """
         Helper method to create a test end user for testing.
 
@@ -116,7 +117,7 @@ class TestSavedMessageService:
 
         return end_user
 
-    def _create_test_message(self, db_session_with_containers: Session, app, user):
+    def _create_test_message(self, db_session_with_containers: Session, app: App, user):
         """
         Helper method to create a test message for testing.
 
@@ -199,13 +200,13 @@ class TestSavedMessageService:
         saved_message1 = SavedMessage(
             app_id=app.id,
             message_id=message1.id,
-            created_by_role="account",
+            created_by_role=CreatorUserRole.ACCOUNT,
             created_by=account.id,
         )
         saved_message2 = SavedMessage(
             app_id=app.id,
             message_id=message2.id,
-            created_by_role="account",
+            created_by_role=CreatorUserRole.ACCOUNT,
             created_by=account.id,
         )
 
@@ -272,13 +273,13 @@ class TestSavedMessageService:
         saved_message1 = SavedMessage(
             app_id=app.id,
             message_id=message1.id,
-            created_by_role="end_user",
+            created_by_role=CreatorUserRole.END_USER,
             created_by=end_user.id,
         )
         saved_message2 = SavedMessage(
             app_id=app.id,
             message_id=message2.id,
-            created_by_role="end_user",
+            created_by_role=CreatorUserRole.END_USER,
             created_by=end_user.id,
         )
 
@@ -449,7 +450,7 @@ class TestSavedMessageService:
         saved_message = SavedMessage(
             app_id=app.id,
             message_id=message.id,
-            created_by_role="account",
+            created_by_role=CreatorUserRole.ACCOUNT,
             created_by=account.id,
         )
 
@@ -540,7 +541,9 @@ class TestSavedMessageService:
         message = self._create_test_message(db_session_with_containers, app, account)
 
         # Pre-create a saved message
-        saved = SavedMessage(app_id=app.id, message_id=message.id, created_by_role="account", created_by=account.id)
+        saved = SavedMessage(
+            app_id=app.id, message_id=message.id, created_by_role=CreatorUserRole.ACCOUNT, created_by=account.id
+        )
         db_session_with_containers.add(saved)
         db_session_with_containers.commit()
 
@@ -571,7 +574,9 @@ class TestSavedMessageService:
         end_user = self._create_test_end_user(db_session_with_containers, app)
         message = self._create_test_message(db_session_with_containers, app, end_user)
 
-        saved = SavedMessage(app_id=app.id, message_id=message.id, created_by_role="end_user", created_by=end_user.id)
+        saved = SavedMessage(
+            app_id=app.id, message_id=message.id, created_by_role=CreatorUserRole.END_USER, created_by=end_user.id
+        )
         db_session_with_containers.add(saved)
         db_session_with_containers.commit()
 
@@ -596,10 +601,10 @@ class TestSavedMessageService:
 
         # Both users save the same message
         saved_account = SavedMessage(
-            app_id=app.id, message_id=message.id, created_by_role="account", created_by=account1.id
+            app_id=app.id, message_id=message.id, created_by_role=CreatorUserRole.ACCOUNT, created_by=account1.id
         )
         saved_end_user = SavedMessage(
-            app_id=app.id, message_id=message.id, created_by_role="end_user", created_by=end_user.id
+            app_id=app.id, message_id=message.id, created_by_role=CreatorUserRole.END_USER, created_by=end_user.id
         )
         db_session_with_containers.add_all([saved_account, saved_end_user])
         db_session_with_containers.commit()
diff --git a/api/tests/test_containers_integration_tests/services/test_tag_service.py b/api/tests/test_containers_integration_tests/services/test_tag_service.py
index 5a6bf0466e..f088cc964d 100644
--- a/api/tests/test_containers_integration_tests/services/test_tag_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_tag_service.py
@@ -759,7 +759,7 @@ class TestTagService:
         tag = TagService.save_tags(tag_args)
 
         # Update args
-        update_args = UpdateTagPayload(name="updated_name", type="knowledge")
+        update_args = UpdateTagPayload(name="updated_name")
 
         # Act: Execute the method under test
         result = TagService.update_tags(update_args, tag.id)
@@ -799,7 +799,7 @@ class TestTagService:
 
         non_existent_tag_id = str(uuid.uuid4())
 
-        update_args = UpdateTagPayload(name="updated_name", type="knowledge")
+        update_args = UpdateTagPayload(name="updated_name")
 
         # Act & Assert: Verify proper error handling
         with pytest.raises(NotFound) as exc_info:
@@ -830,7 +830,7 @@ class TestTagService:
         tag2 = TagService.save_tags(tag2_args)
 
         # Try to update second tag with first tag's name
-        update_args = UpdateTagPayload(name="first_tag", type="app")
+        update_args = UpdateTagPayload(name="first_tag")
 
         # Act & Assert: Verify proper error handling
         with pytest.raises(ValueError) as exc_info:
@@ -1099,38 +1099,39 @@ class TestTagService:
             db_session_with_containers, mock_external_service_dependencies
         )
 
-        # Create tag
-        tag = self._create_test_tags(
-            db_session_with_containers, mock_external_service_dependencies, tenant.id, "knowledge", 1
-        )[0]
+        # Create tags
+        tags = self._create_test_tags(
+            db_session_with_containers, mock_external_service_dependencies, tenant.id, "knowledge", 2
+        )
 
-        # Create dataset and bind tag
+        # Create dataset and bind tags
         dataset = self._create_test_dataset(db_session_with_containers, mock_external_service_dependencies, tenant.id)
         self._create_test_tag_bindings(
-            db_session_with_containers, mock_external_service_dependencies, [tag], dataset.id, tenant.id
+            db_session_with_containers, mock_external_service_dependencies, tags, dataset.id, tenant.id
         )
 
-        # Verify binding exists before deletion
-
-        binding_before = (
+        # Verify bindings exist before deletion
+        bindings_before = (
             db_session_with_containers.query(TagBinding)
-            .where(TagBinding.tag_id == tag.id, TagBinding.target_id == dataset.id)
-            .first()
+            .where(TagBinding.tag_id.in_([tag.id for tag in tags]), TagBinding.target_id == dataset.id)
+            .all()
         )
-        assert binding_before is not None
+        assert len(bindings_before) == 2
 
         # Act: Execute the method under test
-        delete_payload = TagBindingDeletePayload(type="knowledge", target_id=dataset.id, tag_id=tag.id)
+        delete_payload = TagBindingDeletePayload(
+            type="knowledge", target_id=dataset.id, tag_ids=[tag.id for tag in tags]
+        )
         TagService.delete_tag_binding(delete_payload)
 
         # Assert: Verify the expected outcomes
-        # Verify tag binding was deleted
-        binding_after = (
+        # Verify tag bindings were deleted
+        bindings_after = (
             db_session_with_containers.query(TagBinding)
-            .where(TagBinding.tag_id == tag.id, TagBinding.target_id == dataset.id)
-            .first()
+            .where(TagBinding.tag_id.in_([tag.id for tag in tags]), TagBinding.target_id == dataset.id)
+            .all()
         )
-        assert binding_after is None
+        assert len(bindings_after) == 0
 
     def test_delete_tag_binding_non_existent_binding(
         self, db_session_with_containers: Session, mock_external_service_dependencies
@@ -1156,7 +1157,7 @@ class TestTagService:
         app = self._create_test_app(db_session_with_containers, mock_external_service_dependencies, tenant.id)
 
         # Act: Try to delete non-existent binding
-        delete_payload = TagBindingDeletePayload(type="app", target_id=app.id, tag_id=tag.id)
+        delete_payload = TagBindingDeletePayload(type="app", target_id=app.id, tag_ids=[tag.id])
         TagService.delete_tag_binding(delete_payload)
 
         # Assert: Verify the expected outcomes
diff --git a/api/tests/test_containers_integration_tests/services/test_web_conversation_service.py b/api/tests/test_containers_integration_tests/services/test_web_conversation_service.py
index f2307fbd7d..8e53a2d6cd 100644
--- a/api/tests/test_containers_integration_tests/services/test_web_conversation_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_web_conversation_service.py
@@ -6,12 +6,12 @@ from sqlalchemy import select
 from sqlalchemy.orm import Session
 
 from core.app.entities.app_invoke_entities import InvokeFrom
-from models import Account
+from models import Account, App
 from models.enums import ConversationFromSource
 from models.model import Conversation, EndUser
 from models.web import PinnedConversation
 from services.account_service import AccountService, TenantService
-from services.app_service import AppService
+from services.app_service import AppService, CreateAppParams
 from services.web_conversation_service import WebConversationService
 from tests.test_containers_integration_tests.helpers import generate_valid_password
 
@@ -77,23 +77,23 @@ class TestWebConversationService:
         tenant = account.current_tenant
 
         # Create app with realistic data
-        app_args = {
-            "name": fake.company(),
-            "description": fake.text(max_nb_chars=100),
-            "mode": "chat",
-            "icon_type": "emoji",
-            "icon": "🤖",
-            "icon_background": "#FF6B6B",
-            "api_rph": 100,
-            "api_rpm": 10,
-        }
+        app_args = CreateAppParams(
+            name=fake.company(),
+            description=fake.text(max_nb_chars=100),
+            mode="chat",
+            icon_type="emoji",
+            icon="🤖",
+            icon_background="#FF6B6B",
+            api_rph=100,
+            api_rpm=10,
+        )
 
         app_service = AppService()
         app = app_service.create_app(tenant.id, app_args, account)
 
         return app, account
 
-    def _create_test_end_user(self, db_session_with_containers: Session, app):
+    def _create_test_end_user(self, db_session_with_containers: Session, app: App):
         """
         Helper method to create a test end user for testing.
 
diff --git a/api/tests/test_containers_integration_tests/services/test_webhook_service.py b/api/tests/test_containers_integration_tests/services/test_webhook_service.py
index 970da98c55..52b1229302 100644
--- a/api/tests/test_containers_integration_tests/services/test_webhook_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_webhook_service.py
@@ -5,6 +5,7 @@ from unittest.mock import MagicMock, patch
 import pytest
 from faker import Faker
 from flask import Flask
+from sqlalchemy.orm import Session
 from werkzeug.datastructures import FileStorage
 
 from models.enums import AppTriggerStatus, AppTriggerType
@@ -52,7 +53,7 @@ class TestWebhookService:
             }
 
     @pytest.fixture
-    def test_data(self, db_session_with_containers, mock_external_dependencies):
+    def test_data(self, db_session_with_containers: Session, mock_external_dependencies):
         """Create test data for webhook service tests."""
         fake = Faker()
 
@@ -160,7 +161,7 @@ class TestWebhookService:
             "app_trigger": app_trigger,
         }
 
-    def test_get_webhook_trigger_and_workflow_success(self, test_data, flask_app_with_containers):
+    def test_get_webhook_trigger_and_workflow_success(self, test_data, flask_app_with_containers: Flask):
         """Test successful retrieval of webhook trigger and workflow."""
         webhook_id = test_data["webhook_id"]
 
@@ -175,7 +176,7 @@ class TestWebhookService:
             assert node_config["id"] == "webhook_node"
             assert node_config["data"].title == "Test Webhook"
 
-    def test_get_webhook_trigger_and_workflow_not_found(self, flask_app_with_containers):
+    def test_get_webhook_trigger_and_workflow_not_found(self, flask_app_with_containers: Flask):
         """Test webhook trigger not found scenario."""
         with flask_app_with_containers.app_context():
             with pytest.raises(ValueError, match="Webhook not found"):
@@ -421,7 +422,9 @@ class TestWebhookService:
 
             assert result["files"] == {}
 
-    def test_trigger_workflow_execution_success(self, test_data, mock_external_dependencies, flask_app_with_containers):
+    def test_trigger_workflow_execution_success(
+        self, test_data, mock_external_dependencies, flask_app_with_containers: Flask
+    ):
         """Test successful workflow execution trigger."""
         webhook_data = {
             "method": "POST",
@@ -452,7 +455,7 @@ class TestWebhookService:
                     mock_external_dependencies["async_service"].trigger_workflow_async.assert_called_once()
 
     def test_trigger_workflow_execution_end_user_service_failure(
-        self, test_data, mock_external_dependencies, flask_app_with_containers
+        self, test_data, mock_external_dependencies, flask_app_with_containers: Flask
     ):
         """Test workflow execution trigger when EndUserService fails."""
         webhook_data = {"method": "POST", "headers": {}, "query_params": {}, "body": {}, "files": {}}
@@ -540,8 +543,8 @@ class TestWebhookService:
             "bad_file": MagicMock(filename="test.bad", content_type="text/plain"),
         }
 
-        files["good_file"].read.return_value = b"content"
-        files["bad_file"].read.side_effect = Exception("Read error")
+        files["good_file"].stream.read.return_value = b"content"
+        files["bad_file"].stream.read.side_effect = Exception("Read error")
 
         webhook_trigger = MagicMock()
         webhook_trigger.tenant_id = "test_tenant"
diff --git a/api/tests/test_containers_integration_tests/services/test_webhook_service_relationships.py b/api/tests/test_containers_integration_tests/services/test_webhook_service_relationships.py
index 85ce3a6ba6..69cde847f8 100644
--- a/api/tests/test_containers_integration_tests/services/test_webhook_service_relationships.py
+++ b/api/tests/test_containers_integration_tests/services/test_webhook_service_relationships.py
@@ -6,6 +6,7 @@ from unittest.mock import MagicMock, patch
 from uuid import uuid4
 
 import pytest
+from flask import Flask
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
@@ -165,7 +166,7 @@ class WebhookServiceRelationshipFactory:
 
 class TestWebhookServiceLookupWithContainers:
     def test_get_webhook_trigger_and_workflow_raises_when_app_trigger_missing(
-        self, db_session_with_containers: Session, flask_app_with_containers
+        self, db_session_with_containers: Session, flask_app_with_containers: Flask
     ):
         del flask_app_with_containers
         factory = WebhookServiceRelationshipFactory
@@ -182,7 +183,7 @@ class TestWebhookServiceLookupWithContainers:
             WebhookService.get_webhook_trigger_and_workflow(webhook_trigger.webhook_id)
 
     def test_get_webhook_trigger_and_workflow_raises_when_app_trigger_rate_limited(
-        self, db_session_with_containers: Session, flask_app_with_containers
+        self, db_session_with_containers: Session, flask_app_with_containers: Flask
     ):
         del flask_app_with_containers
         factory = WebhookServiceRelationshipFactory
@@ -202,7 +203,7 @@ class TestWebhookServiceLookupWithContainers:
             WebhookService.get_webhook_trigger_and_workflow(webhook_trigger.webhook_id)
 
     def test_get_webhook_trigger_and_workflow_raises_when_app_trigger_disabled(
-        self, db_session_with_containers: Session, flask_app_with_containers
+        self, db_session_with_containers: Session, flask_app_with_containers: Flask
     ):
         del flask_app_with_containers
         factory = WebhookServiceRelationshipFactory
@@ -222,7 +223,7 @@ class TestWebhookServiceLookupWithContainers:
             WebhookService.get_webhook_trigger_and_workflow(webhook_trigger.webhook_id)
 
     def test_get_webhook_trigger_and_workflow_raises_when_workflow_missing(
-        self, db_session_with_containers: Session, flask_app_with_containers
+        self, db_session_with_containers: Session, flask_app_with_containers: Flask
     ):
         del flask_app_with_containers
         factory = WebhookServiceRelationshipFactory
@@ -239,7 +240,7 @@ class TestWebhookServiceLookupWithContainers:
             WebhookService.get_webhook_trigger_and_workflow(webhook_trigger.webhook_id)
 
     def test_get_webhook_trigger_and_workflow_returns_debug_draft_workflow(
-        self, db_session_with_containers: Session, flask_app_with_containers
+        self, db_session_with_containers: Session, flask_app_with_containers: Flask
     ):
         del flask_app_with_containers
         factory = WebhookServiceRelationshipFactory
@@ -275,7 +276,7 @@ class TestWebhookServiceLookupWithContainers:
 
 class TestWebhookServiceTriggerExecutionWithContainers:
     def test_trigger_workflow_execution_triggers_async_workflow_successfully(
-        self, db_session_with_containers: Session, flask_app_with_containers
+        self, db_session_with_containers: Session, flask_app_with_containers: Flask
     ):
         del flask_app_with_containers
         factory = WebhookServiceRelationshipFactory
@@ -318,7 +319,7 @@ class TestWebhookServiceTriggerExecutionWithContainers:
         assert trigger_args[2].root_node_id == webhook_trigger.node_id
 
     def test_trigger_workflow_execution_marks_tenant_rate_limited_when_quota_exceeded(
-        self, db_session_with_containers: Session, flask_app_with_containers
+        self, db_session_with_containers: Session, flask_app_with_containers: Flask
     ):
         del flask_app_with_containers
         factory = WebhookServiceRelationshipFactory
@@ -354,7 +355,7 @@ class TestWebhookServiceTriggerExecutionWithContainers:
         mock_mark_rate_limited.assert_called_once_with(tenant.id)
 
     def test_trigger_workflow_execution_logs_and_reraises_unexpected_errors(
-        self, db_session_with_containers: Session, flask_app_with_containers
+        self, db_session_with_containers: Session, flask_app_with_containers: Flask
     ):
         del flask_app_with_containers
         factory = WebhookServiceRelationshipFactory
@@ -386,7 +387,7 @@ class TestWebhookServiceTriggerExecutionWithContainers:
 
 class TestWebhookServiceRelationshipSyncWithContainers:
     def test_sync_webhook_relationships_raises_when_workflow_exceeds_node_limit(
-        self, db_session_with_containers: Session, flask_app_with_containers
+        self, db_session_with_containers: Session, flask_app_with_containers: Flask
     ):
         del flask_app_with_containers
         factory = WebhookServiceRelationshipFactory
@@ -401,7 +402,7 @@ class TestWebhookServiceRelationshipSyncWithContainers:
             WebhookService.sync_webhook_relationships(app, workflow)
 
     def test_sync_webhook_relationships_raises_when_lock_not_acquired(
-        self, db_session_with_containers: Session, flask_app_with_containers
+        self, db_session_with_containers: Session, flask_app_with_containers: Flask
     ):
         del flask_app_with_containers
         factory = WebhookServiceRelationshipFactory
@@ -418,7 +419,7 @@ class TestWebhookServiceRelationshipSyncWithContainers:
                 WebhookService.sync_webhook_relationships(app, workflow)
 
     def test_sync_webhook_relationships_creates_missing_records_and_deletes_stale_records(
-        self, db_session_with_containers: Session, flask_app_with_containers
+        self, db_session_with_containers: Session, flask_app_with_containers: Flask
     ):
         del flask_app_with_containers
         factory = WebhookServiceRelationshipFactory
@@ -455,7 +456,7 @@ class TestWebhookServiceRelationshipSyncWithContainers:
         assert db_session_with_containers.get(WorkflowWebhookTrigger, stale_trigger_id) is None
 
     def test_sync_webhook_relationships_sets_redis_cache_for_new_record(
-        self, db_session_with_containers: Session, flask_app_with_containers
+        self, db_session_with_containers: Session, flask_app_with_containers: Flask
     ):
         del flask_app_with_containers
         factory = WebhookServiceRelationshipFactory
@@ -481,7 +482,7 @@ class TestWebhookServiceRelationshipSyncWithContainers:
         assert cached_payload["webhook_id"] == "cache-webhook-id-00001"
 
     def test_sync_webhook_relationships_logs_when_lock_release_fails(
-        self, db_session_with_containers: Session, flask_app_with_containers
+        self, db_session_with_containers: Session, flask_app_with_containers: Flask
     ):
         del flask_app_with_containers
         factory = WebhookServiceRelationshipFactory
diff --git a/api/tests/test_containers_integration_tests/services/test_workflow_app_service.py b/api/tests/test_containers_integration_tests/services/test_workflow_app_service.py
index 1e57b5603d..07a49130d0 100644
--- a/api/tests/test_containers_integration_tests/services/test_workflow_app_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_workflow_app_service.py
@@ -17,7 +17,7 @@ from models.workflow import WorkflowAppLogCreatedFrom
 from services.account_service import AccountService, TenantService
 
 # Delay import of AppService to avoid circular dependency
-# from services.app_service import AppService
+# from services.app_service import AppService, CreateAppParams
 from services.workflow_app_service import LogView, WorkflowAppService
 from tests.test_containers_integration_tests.helpers import generate_valid_password
 
@@ -82,20 +82,20 @@ class TestWorkflowAppService:
         TenantService.create_owner_tenant_if_not_exist(account, name=fake.company())
         tenant = account.current_tenant
 
-        # Create app with realistic data
-        app_args = {
-            "name": fake.company(),
-            "description": fake.text(max_nb_chars=100),
-            "mode": "workflow",
-            "icon_type": "emoji",
-            "icon": "🤖",
-            "icon_background": "#FF6B6B",
-            "api_rph": 100,
-            "api_rpm": 10,
-        }
-
         # Import here to avoid circular dependency
-        from services.app_service import AppService
+        from services.app_service import AppService, CreateAppParams
+
+        # Create app with realistic data
+        app_args = CreateAppParams(
+            name=fake.company(),
+            description=fake.text(max_nb_chars=100),
+            mode="workflow",
+            icon_type="emoji",
+            icon="🤖",
+            icon_background="#FF6B6B",
+            api_rph=100,
+            api_rpm=10,
+        )
 
         app_service = AppService()
         app = app_service.create_app(tenant.id, app_args, account)
@@ -146,20 +146,20 @@ class TestWorkflowAppService:
         """
         fake = Faker()
 
-        # Create app with realistic data
-        app_args = {
-            "name": fake.company(),
-            "description": fake.text(max_nb_chars=100),
-            "mode": "workflow",
-            "icon_type": "emoji",
-            "icon": "🤖",
-            "icon_background": "#FF6B6B",
-            "api_rph": 100,
-            "api_rpm": 10,
-        }
-
         # Import here to avoid circular dependency
-        from services.app_service import AppService
+        from services.app_service import AppService, CreateAppParams
+
+        # Create app with realistic data
+        app_args = CreateAppParams(
+            name=fake.company(),
+            description=fake.text(max_nb_chars=100),
+            mode="workflow",
+            icon_type="emoji",
+            icon="🤖",
+            icon_background="#FF6B6B",
+            api_rph=100,
+            api_rpm=10,
+        )
 
         app_service = AppService()
         app = app_service.create_app(tenant.id, app_args, account)
@@ -1530,7 +1530,7 @@ class TestWorkflowAppService:
         assert result_cross_tenant["total"] == 0
 
     def test_get_paginate_workflow_app_logs_raises_when_account_filter_email_not_found(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         app, account = self._create_test_app_and_account(db_session_with_containers, mock_external_service_dependencies)
         service = WorkflowAppService()
@@ -1543,7 +1543,7 @@ class TestWorkflowAppService:
             )
 
     def test_get_paginate_workflow_app_logs_filters_by_account(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         app, account = self._create_test_app_and_account(db_session_with_containers, mock_external_service_dependencies)
         service = WorkflowAppService()
@@ -1558,7 +1558,9 @@ class TestWorkflowAppService:
         assert result["total"] >= 0
         assert isinstance(result["data"], list)
 
-    def test_get_paginate_workflow_archive_logs(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_get_paginate_workflow_archive_logs(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         app, account = self._create_test_app_and_account(db_session_with_containers, mock_external_service_dependencies)
         service = WorkflowAppService()
 
diff --git a/api/tests/test_containers_integration_tests/services/test_workflow_draft_variable_service.py b/api/tests/test_containers_integration_tests/services/test_workflow_draft_variable_service.py
index 86cf2327c7..82fe391b08 100644
--- a/api/tests/test_containers_integration_tests/services/test_workflow_draft_variable_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_workflow_draft_variable_service.py
@@ -45,7 +45,9 @@ class TestWorkflowDraftVariableService:
         # WorkflowDraftVariableService doesn't have external dependencies that need mocking
         return {}
 
-    def _create_test_app(self, db_session_with_containers: Session, mock_external_service_dependencies, fake=None):
+    def _create_test_app(
+        self, db_session_with_containers: Session, mock_external_service_dependencies, fake: Faker | None = None
+    ):
         """
         Helper method to create a test app with realistic data for testing.
 
@@ -80,7 +82,7 @@ class TestWorkflowDraftVariableService:
         db_session_with_containers.commit()
         return app
 
-    def _create_test_workflow(self, db_session_with_containers: Session, app, fake=None):
+    def _create_test_workflow(self, db_session_with_containers: Session, app, fake: Faker | None = None):
         """
         Helper method to create a test workflow associated with an app.
 
diff --git a/api/tests/test_containers_integration_tests/services/test_workflow_run_service.py b/api/tests/test_containers_integration_tests/services/test_workflow_run_service.py
index d02a078281..09fe1570bc 100644
--- a/api/tests/test_containers_integration_tests/services/test_workflow_run_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_workflow_run_service.py
@@ -13,7 +13,7 @@ from models.model import (
 )
 from models.workflow import WorkflowRun
 from services.account_service import AccountService, TenantService
-from services.app_service import AppService
+from services.app_service import AppService, CreateAppParams
 from services.workflow_run_service import WorkflowRunService
 from tests.test_containers_integration_tests.helpers import generate_valid_password
 
@@ -79,16 +79,16 @@ class TestWorkflowRunService:
         tenant = account.current_tenant
 
         # Create app with realistic data
-        app_args = {
-            "name": fake.company(),
-            "description": fake.text(max_nb_chars=100),
-            "mode": "chat",
-            "icon_type": "emoji",
-            "icon": "🤖",
-            "icon_background": "#FF6B6B",
-            "api_rph": 100,
-            "api_rpm": 10,
-        }
+        app_args = CreateAppParams(
+            name=fake.company(),
+            description=fake.text(max_nb_chars=100),
+            mode="chat",
+            icon_type="emoji",
+            icon="🤖",
+            icon_background="#FF6B6B",
+            api_rph=100,
+            api_rpm=10,
+        )
 
         app_service = AppService()
         app = app_service.create_app(tenant.id, app_args, account)
@@ -535,13 +535,13 @@ class TestWorkflowRunService:
         tenant = account.current_tenant
 
         # Create app
-        app_args = {
-            "name": "Test App",
-            "mode": "chat",
-            "icon_type": "emoji",
-            "icon": "🚀",
-            "icon_background": "#4ECDC4",
-        }
+        app_args = CreateAppParams(
+            name="Test App",
+            mode="chat",
+            icon_type="emoji",
+            icon="🚀",
+            icon_background="#4ECDC4",
+        )
         app = app_service.create_app(tenant.id, app_args, account)
 
         # Create workflow run without node executions
@@ -586,13 +586,13 @@ class TestWorkflowRunService:
         tenant = account.current_tenant
 
         # Create app
-        app_args = {
-            "name": "Test App",
-            "mode": "chat",
-            "icon_type": "emoji",
-            "icon": "🚀",
-            "icon_background": "#4ECDC4",
-        }
+        app_args = CreateAppParams(
+            name="Test App",
+            mode="chat",
+            icon_type="emoji",
+            icon="🚀",
+            icon_background="#4ECDC4",
+        )
         app = app_service.create_app(tenant.id, app_args, account)
 
         # Use invalid workflow run ID
@@ -637,13 +637,13 @@ class TestWorkflowRunService:
         tenant = account.current_tenant
 
         # Create app
-        app_args = {
-            "name": "Test App",
-            "mode": "chat",
-            "icon_type": "emoji",
-            "icon": "🚀",
-            "icon_background": "#4ECDC4",
-        }
+        app_args = CreateAppParams(
+            name="Test App",
+            mode="chat",
+            icon_type="emoji",
+            icon="🚀",
+            icon_background="#4ECDC4",
+        )
         app = app_service.create_app(tenant.id, app_args, account)
 
         # Create workflow run
diff --git a/api/tests/test_containers_integration_tests/services/test_workflow_service.py b/api/tests/test_containers_integration_tests/services/test_workflow_service.py
index b5ce8a53de..9ba1fda08b 100644
--- a/api/tests/test_containers_integration_tests/services/test_workflow_service.py
+++ b/api/tests/test_containers_integration_tests/services/test_workflow_service.py
@@ -12,7 +12,7 @@ import pytest
 from faker import Faker
 from sqlalchemy.orm import Session
 
-from models import Account, App, Workflow
+from models import Account, AccountStatus, App, TenantStatus, Workflow
 from models.model import AppMode
 from models.workflow import WorkflowType
 from services.workflow_service import WorkflowService
@@ -33,7 +33,7 @@ class TestWorkflowService:
     and realistic testing environment with actual database interactions.
     """
 
-    def _create_test_account(self, db_session_with_containers: Session, fake=None):
+    def _create_test_account(self, db_session_with_containers: Session, fake: Faker | None = None):
         """
         Helper method to create a test account with realistic data.
 
@@ -49,7 +49,7 @@ class TestWorkflowService:
             email=fake.email(),
             name=fake.name(),
             avatar=fake.url(),
-            status="active",
+            status=AccountStatus.ACTIVE,
             interface_language="en-US",  # Set interface language for Site creation
         )
         account.created_at = fake.date_time_this_year()
@@ -62,7 +62,7 @@ class TestWorkflowService:
         tenant = Tenant(
             name=f"Test Tenant {fake.company()}",
             plan="basic",
-            status="normal",
+            status=TenantStatus.NORMAL,
         )
         tenant.id = account.current_tenant_id
         tenant.created_at = fake.date_time_this_year()
@@ -77,7 +77,7 @@ class TestWorkflowService:
 
         return account
 
-    def _create_test_app(self, db_session_with_containers: Session, fake=None):
+    def _create_test_app(self, db_session_with_containers: Session, fake: Faker | None = None):
         """
         Helper method to create a test app with realistic data.
 
@@ -109,7 +109,7 @@ class TestWorkflowService:
         db_session_with_containers.commit()
         return app
 
-    def _create_test_workflow(self, db_session_with_containers: Session, app, account, fake=None):
+    def _create_test_workflow(self, db_session_with_containers: Session, app, account, fake: Faker | None = None):
         """
         Helper method to create a test workflow associated with an app.
 
diff --git a/api/tests/test_containers_integration_tests/services/tools/test_workflow_tools_manage_service.py b/api/tests/test_containers_integration_tests/services/tools/test_workflow_tools_manage_service.py
index 21a1975879..9b574fe2df 100644
--- a/api/tests/test_containers_integration_tests/services/tools/test_workflow_tools_manage_service.py
+++ b/api/tests/test_containers_integration_tests/services/tools/test_workflow_tools_manage_service.py
@@ -11,7 +11,7 @@ from core.tools.errors import WorkflowToolHumanInputNotSupportedError
 from models.tools import WorkflowToolProvider
 from models.workflow import Workflow as WorkflowModel
 from services.account_service import AccountService, TenantService
-from services.app_service import AppService
+from services.app_service import AppService, CreateAppParams
 from services.tools.workflow_tools_manage_service import WorkflowToolManageService
 from tests.test_containers_integration_tests.helpers import generate_valid_password
 
@@ -94,16 +94,16 @@ class TestWorkflowToolManageService:
         tenant = account.current_tenant
 
         # Create app with realistic data
-        app_args = {
-            "name": fake.company(),
-            "description": fake.text(max_nb_chars=100),
-            "mode": "workflow",
-            "icon_type": "emoji",
-            "icon": "🤖",
-            "icon_background": "#FF6B6B",
-            "api_rph": 100,
-            "api_rpm": 10,
-        }
+        app_args = CreateAppParams(
+            name=fake.company(),
+            description=fake.text(max_nb_chars=100),
+            mode="workflow",
+            icon_type="emoji",
+            icon="🤖",
+            icon_background="#FF6B6B",
+            api_rph=100,
+            api_rpm=10,
+        )
 
         app_service = AppService()
         app = app_service.create_app(tenant.id, app_args, account)
diff --git a/api/tests/test_containers_integration_tests/services/workflow/test_workflow_deletion.py b/api/tests/test_containers_integration_tests/services/workflow/test_workflow_deletion.py
index 29e1e240b4..afc4908c15 100644
--- a/api/tests/test_containers_integration_tests/services/workflow/test_workflow_deletion.py
+++ b/api/tests/test_containers_integration_tests/services/workflow/test_workflow_deletion.py
@@ -100,7 +100,7 @@ class TestWorkflowDeletion:
         session.flush()
         return provider
 
-    def test_delete_workflow_success(self, db_session_with_containers):
+    def test_delete_workflow_success(self, db_session_with_containers: Session):
         tenant, account = self._create_tenant_and_account(db_session_with_containers)
         app = self._create_app(db_session_with_containers, tenant=tenant, account=account)
         workflow = self._create_workflow(
@@ -118,7 +118,7 @@ class TestWorkflowDeletion:
         db_session_with_containers.expire_all()
         assert db_session_with_containers.get(Workflow, workflow_id) is None
 
-    def test_delete_draft_workflow_raises_error(self, db_session_with_containers):
+    def test_delete_draft_workflow_raises_error(self, db_session_with_containers: Session):
         tenant, account = self._create_tenant_and_account(db_session_with_containers)
         app = self._create_app(db_session_with_containers, tenant=tenant, account=account)
         workflow = self._create_workflow(
@@ -130,7 +130,7 @@ class TestWorkflowDeletion:
         with pytest.raises(DraftWorkflowDeletionError):
             service.delete_workflow(session=db_session_with_containers, workflow_id=workflow.id, tenant_id=tenant.id)
 
-    def test_delete_workflow_in_use_by_app_raises_error(self, db_session_with_containers):
+    def test_delete_workflow_in_use_by_app_raises_error(self, db_session_with_containers: Session):
         tenant, account = self._create_tenant_and_account(db_session_with_containers)
         app = self._create_app(db_session_with_containers, tenant=tenant, account=account)
         workflow = self._create_workflow(
@@ -144,7 +144,7 @@ class TestWorkflowDeletion:
         with pytest.raises(WorkflowInUseError, match="currently in use by app"):
             service.delete_workflow(session=db_session_with_containers, workflow_id=workflow.id, tenant_id=tenant.id)
 
-    def test_delete_workflow_published_as_tool_raises_error(self, db_session_with_containers):
+    def test_delete_workflow_published_as_tool_raises_error(self, db_session_with_containers: Session):
         tenant, account = self._create_tenant_and_account(db_session_with_containers)
         app = self._create_app(db_session_with_containers, tenant=tenant, account=account)
         workflow = self._create_workflow(
diff --git a/api/tests/test_containers_integration_tests/services/workflow/test_workflow_node_execution_service_repository.py b/api/tests/test_containers_integration_tests/services/workflow/test_workflow_node_execution_service_repository.py
index 4dab895135..32b76c3469 100644
--- a/api/tests/test_containers_integration_tests/services/workflow/test_workflow_node_execution_service_repository.py
+++ b/api/tests/test_containers_integration_tests/services/workflow/test_workflow_node_execution_service_repository.py
@@ -64,7 +64,7 @@ class TestSQLAlchemyWorkflowNodeExecutionServiceRepository:
         db_session_with_containers.commit()
         return execution
 
-    def test_get_node_last_execution_found(self, db_session_with_containers):
+    def test_get_node_last_execution_found(self, db_session_with_containers: Session):
         """Test getting the last execution for a node when it exists."""
         # Arrange
         tenant_id = str(uuid4())
@@ -110,7 +110,7 @@ class TestSQLAlchemyWorkflowNodeExecutionServiceRepository:
         assert result.id == expected.id
         assert result.status == WorkflowNodeExecutionStatus.SUCCEEDED
 
-    def test_get_node_last_execution_not_found(self, db_session_with_containers):
+    def test_get_node_last_execution_not_found(self, db_session_with_containers: Session):
         """Test getting the last execution for a node when it doesn't exist."""
         # Arrange
         tenant_id = str(uuid4())
@@ -129,7 +129,7 @@ class TestSQLAlchemyWorkflowNodeExecutionServiceRepository:
         # Assert
         assert result is None
 
-    def test_get_executions_by_workflow_run_empty(self, db_session_with_containers):
+    def test_get_executions_by_workflow_run_empty(self, db_session_with_containers: Session):
         """Test getting executions for a workflow run when none exist."""
         # Arrange
         tenant_id = str(uuid4())
@@ -147,7 +147,7 @@ class TestSQLAlchemyWorkflowNodeExecutionServiceRepository:
         # Assert
         assert result == []
 
-    def test_get_execution_by_id_found(self, db_session_with_containers):
+    def test_get_execution_by_id_found(self, db_session_with_containers: Session):
         """Test getting execution by ID when it exists."""
         # Arrange
         execution = self._create_execution(
@@ -170,7 +170,7 @@ class TestSQLAlchemyWorkflowNodeExecutionServiceRepository:
         assert result is not None
         assert result.id == execution.id
 
-    def test_get_execution_by_id_not_found(self, db_session_with_containers):
+    def test_get_execution_by_id_not_found(self, db_session_with_containers: Session):
         """Test getting execution by ID when it doesn't exist."""
         # Arrange
         repository = self._create_repository(db_session_with_containers)
@@ -182,7 +182,7 @@ class TestSQLAlchemyWorkflowNodeExecutionServiceRepository:
         # Assert
         assert result is None
 
-    def test_delete_expired_executions(self, db_session_with_containers):
+    def test_delete_expired_executions(self, db_session_with_containers: Session):
         """Test deleting expired executions."""
         # Arrange
         tenant_id = str(uuid4())
@@ -248,7 +248,7 @@ class TestSQLAlchemyWorkflowNodeExecutionServiceRepository:
         assert old_execution_2_id not in remaining_ids
         assert kept_execution_id in remaining_ids
 
-    def test_delete_executions_by_app(self, db_session_with_containers):
+    def test_delete_executions_by_app(self, db_session_with_containers: Session):
         """Test deleting executions by app."""
         # Arrange
         tenant_id = str(uuid4())
@@ -313,7 +313,7 @@ class TestSQLAlchemyWorkflowNodeExecutionServiceRepository:
         assert deleted_2_id not in remaining_ids
         assert kept_id in remaining_ids
 
-    def test_get_expired_executions_batch(self, db_session_with_containers):
+    def test_get_expired_executions_batch(self, db_session_with_containers: Session):
         """Test getting expired executions batch for backup."""
         # Arrange
         tenant_id = str(uuid4())
@@ -370,7 +370,7 @@ class TestSQLAlchemyWorkflowNodeExecutionServiceRepository:
         assert old_execution_1.id in result_ids
         assert old_execution_2.id in result_ids
 
-    def test_delete_executions_by_ids(self, db_session_with_containers):
+    def test_delete_executions_by_ids(self, db_session_with_containers: Session):
         """Test deleting executions by IDs."""
         # Arrange
         tenant_id = str(uuid4())
@@ -424,7 +424,7 @@ class TestSQLAlchemyWorkflowNodeExecutionServiceRepository:
         ).all()
         assert remaining == []
 
-    def test_delete_executions_by_ids_empty_list(self, db_session_with_containers):
+    def test_delete_executions_by_ids_empty_list(self, db_session_with_containers: Session):
         """Test deleting executions with empty ID list."""
         # Arrange
         repository = self._create_repository(db_session_with_containers)
diff --git a/api/tests/test_containers_integration_tests/tasks/test_add_document_to_index_task.py b/api/tests/test_containers_integration_tests/tasks/test_add_document_to_index_task.py
index fcc15aad42..94fd7602f5 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_add_document_to_index_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_add_document_to_index_task.py
@@ -128,7 +128,6 @@ class TestAddDocumentToIndexTask:
 
         for i in range(3):
             segment = DocumentSegment(
-                id=fake.uuid4(),
                 tenant_id=document.tenant_id,
                 dataset_id=dataset.id,
                 document_id=document.id,
@@ -451,7 +450,6 @@ class TestAddDocumentToIndexTask:
         segments = []
         for i in range(3):
             segment = DocumentSegment(
-                id=fake.uuid4(),
                 tenant_id=document.tenant_id,
                 dataset_id=dataset.id,
                 document_id=document.id,
@@ -630,7 +628,6 @@ class TestAddDocumentToIndexTask:
 
         # Segment 1: Should be processed (enabled=False, status=SegmentStatus.COMPLETED)
         segment1 = DocumentSegment(
-            id=fake.uuid4(),
             tenant_id=document.tenant_id,
             dataset_id=dataset.id,
             document_id=document.id,
@@ -650,7 +647,6 @@ class TestAddDocumentToIndexTask:
         # Segment 2: Should be processed (enabled=True, status=SegmentStatus.COMPLETED)
         # Note: Implementation doesn't filter by enabled status, only by status=SegmentStatus.COMPLETED
         segment2 = DocumentSegment(
-            id=fake.uuid4(),
             tenant_id=document.tenant_id,
             dataset_id=dataset.id,
             document_id=document.id,
@@ -669,7 +665,6 @@ class TestAddDocumentToIndexTask:
 
         # Segment 3: Should NOT be processed (enabled=False, status="processing")
         segment3 = DocumentSegment(
-            id=fake.uuid4(),
             tenant_id=document.tenant_id,
             dataset_id=dataset.id,
             document_id=document.id,
@@ -688,7 +683,6 @@ class TestAddDocumentToIndexTask:
 
         # Segment 4: Should be processed (enabled=False, status=SegmentStatus.COMPLETED)
         segment4 = DocumentSegment(
-            id=fake.uuid4(),
             tenant_id=document.tenant_id,
             dataset_id=dataset.id,
             document_id=document.id,
diff --git a/api/tests/test_containers_integration_tests/tasks/test_batch_clean_document_task.py b/api/tests/test_containers_integration_tests/tasks/test_batch_clean_document_task.py
index e29ca7ebab..436c8f11b0 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_batch_clean_document_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_batch_clean_document_task.py
@@ -177,7 +177,6 @@ class TestBatchCleanDocumentTask:
         fake = Faker()
 
         segment = DocumentSegment(
-            id=str(uuid.uuid4()),
             tenant_id=account.current_tenant.id,
             dataset_id=document.dataset_id,
             document_id=document.id,
@@ -290,10 +289,9 @@ class TestBatchCleanDocumentTask:
         account = self._create_test_account(db_session_with_containers)
         dataset = self._create_test_dataset(db_session_with_containers, account)
         document = self._create_test_document(db_session_with_containers, dataset, account)
-
+        assert account.current_tenant
         # Create segment with simple content (no image references)
         segment = DocumentSegment(
-            id=str(uuid.uuid4()),
             tenant_id=account.current_tenant.id,
             dataset_id=document.dataset_id,
             document_id=document.id,
@@ -692,9 +690,9 @@ class TestBatchCleanDocumentTask:
 
         # Create multiple segments for the document
         segments = []
+        assert account.current_tenant
         for i in range(3):
             segment = DocumentSegment(
-                id=str(uuid.uuid4()),
                 tenant_id=account.current_tenant.id,
                 dataset_id=document.dataset_id,
                 document_id=document.id,
diff --git a/api/tests/test_containers_integration_tests/tasks/test_clean_dataset_task.py b/api/tests/test_containers_integration_tests/tasks/test_clean_dataset_task.py
index 32bc2fc0bd..a31552a09e 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_clean_dataset_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_clean_dataset_task.py
@@ -220,7 +220,6 @@ class TestCleanDatasetTask:
             DocumentSegment: Created document segment instance
         """
         segment = DocumentSegment(
-            id=str(uuid.uuid4()),
             tenant_id=tenant.id,
             dataset_id=dataset.id,
             document_id=document.id,
@@ -232,8 +231,6 @@ class TestCleanDatasetTask:
             status=SegmentStatus.COMPLETED,
             index_node_id=str(uuid.uuid4()),
             index_node_hash="test_hash",
-            created_at=datetime.now(),
-            updated_at=datetime.now(),
         )
 
         db_session_with_containers.add(segment)
@@ -614,7 +611,6 @@ class TestCleanDatasetTask:
         """
 
         segment = DocumentSegment(
-            id=str(uuid.uuid4()),
             tenant_id=tenant.id,
             dataset_id=dataset.id,
             document_id=document.id,
@@ -626,8 +622,6 @@ class TestCleanDatasetTask:
             status=SegmentStatus.COMPLETED,
             index_node_id=str(uuid.uuid4()),
             index_node_hash="test_hash",
-            created_at=datetime.now(),
-            updated_at=datetime.now(),
         )
 
         db_session_with_containers.add(segment)
@@ -729,8 +723,6 @@ class TestCleanDatasetTask:
                 type=DatasetMetadataType.STRING,
                 created_by=account.id,
             )
-            metadata.id = str(uuid.uuid4())
-            metadata.created_at = datetime.now()
             metadata_items.append(metadata)
 
             # Create binding for each metadata item
@@ -741,8 +733,6 @@ class TestCleanDatasetTask:
                 document_id=documents[i % len(documents)].id,
                 created_by=account.id,
             )
-            binding.id = str(uuid.uuid4())
-            binding.created_at = datetime.now()
             bindings.append(binding)
 
         db_session_with_containers.add_all(metadata_items)
@@ -946,7 +936,6 @@ class TestCleanDatasetTask:
         long_content = "Very long content " * 100  # Long content within reasonable limits
         segment_content = f"Segment with special chars: {special_content}\n{long_content}"
         segment = DocumentSegment(
-            id=str(uuid.uuid4()),
             tenant_id=tenant.id,
             dataset_id=dataset.id,
             document_id=document.id,
@@ -958,8 +947,6 @@ class TestCleanDatasetTask:
             status=SegmentStatus.COMPLETED,
             index_node_id=str(uuid.uuid4()),
             index_node_hash="test_hash_" + "x" * 50,  # Long hash within limits
-            created_at=datetime.now(),
-            updated_at=datetime.now(),
         )
         db_session_with_containers.add(segment)
         db_session_with_containers.commit()
diff --git a/api/tests/test_containers_integration_tests/tasks/test_clean_notion_document_task.py b/api/tests/test_containers_integration_tests/tasks/test_clean_notion_document_task.py
index 7e5c374b5d..ef65b90508 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_clean_notion_document_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_clean_notion_document_task.py
@@ -71,7 +71,7 @@ class TestCleanNotionDocumentTask:
             yield mock_factory
 
     def test_clean_notion_document_task_success(
-        self, db_session_with_containers, mock_index_processor_factory, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_index_processor_factory, mock_external_service_dependencies
     ):
         """
         Test successful cleanup of Notion documents with proper database operations.
@@ -132,11 +132,10 @@ class TestCleanNotionDocumentTask:
             db_session_with_containers.add(document)
             db_session_with_containers.flush()
             document_ids.append(document.id)
-
+            assert tenant
             # Create segments for each document
             for j in range(2):
                 segment = DocumentSegment(
-                    id=str(uuid.uuid4()),
                     tenant_id=tenant.id,
                     dataset_id=dataset.id,
                     document_id=document.id,
@@ -176,7 +175,7 @@ class TestCleanNotionDocumentTask:
         # 5. The task completes without errors
 
     def test_clean_notion_document_task_dataset_not_found(
-        self, db_session_with_containers, mock_index_processor_factory, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_index_processor_factory, mock_external_service_dependencies
     ):
         """
         Test cleanup task behavior when dataset is not found.
@@ -196,7 +195,7 @@ class TestCleanNotionDocumentTask:
         mock_index_processor_factory.return_value.init_index_processor.assert_not_called()
 
     def test_clean_notion_document_task_empty_document_list(
-        self, db_session_with_containers, mock_index_processor_factory, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_index_processor_factory, mock_external_service_dependencies
     ):
         """
         Test cleanup task behavior with empty document list.
@@ -240,7 +239,7 @@ class TestCleanNotionDocumentTask:
         assert args[1] == []
 
     def test_clean_notion_document_task_with_different_index_types(
-        self, db_session_with_containers, mock_index_processor_factory, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_index_processor_factory, mock_external_service_dependencies
     ):
         """
         Test cleanup task with different dataset index types.
@@ -297,10 +296,9 @@ class TestCleanNotionDocumentTask:
             )
             db_session_with_containers.add(document)
             db_session_with_containers.flush()
-
+            assert tenant
             # Create test segment
             segment = DocumentSegment(
-                id=str(uuid.uuid4()),
                 tenant_id=tenant.id,
                 dataset_id=dataset.id,
                 document_id=document.id,
@@ -328,7 +326,7 @@ class TestCleanNotionDocumentTask:
             mock_index_processor_factory.reset_mock()
 
     def test_clean_notion_document_task_with_segments_no_index_node_ids(
-        self, db_session_with_containers, mock_index_processor_factory, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_index_processor_factory, mock_external_service_dependencies
     ):
         """
         Test cleanup task with segments that have no index_node_ids.
@@ -379,12 +377,11 @@ class TestCleanNotionDocumentTask:
         )
         db_session_with_containers.add(document)
         db_session_with_containers.flush()
-
+        assert tenant
         # Create segments without index_node_ids
         segments = []
         for i in range(3):
             segment = DocumentSegment(
-                id=str(uuid.uuid4()),
                 tenant_id=tenant.id,
                 dataset_id=dataset.id,
                 document_id=document.id,
@@ -411,7 +408,7 @@ class TestCleanNotionDocumentTask:
         # are properly deleted from the database.
 
     def test_clean_notion_document_task_partial_document_cleanup(
-        self, db_session_with_containers, mock_index_processor_factory, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_index_processor_factory, mock_external_service_dependencies
     ):
         """
         Test cleanup task with partial document cleanup scenario.
@@ -468,11 +465,10 @@ class TestCleanNotionDocumentTask:
             db_session_with_containers.add(document)
             db_session_with_containers.flush()
             documents.append(document)
-
+            assert tenant
             # Create segments for each document
             for j in range(2):
                 segment = DocumentSegment(
-                    id=str(uuid.uuid4()),
                     tenant_id=tenant.id,
                     dataset_id=dataset.id,
                     document_id=document.id,
@@ -513,7 +509,7 @@ class TestCleanNotionDocumentTask:
         # The database operations work correctly, isolating only the specified documents.
 
     def test_clean_notion_document_task_with_mixed_segment_statuses(
-        self, db_session_with_containers, mock_index_processor_factory, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_index_processor_factory, mock_external_service_dependencies
     ):
         """
         Test cleanup task with segments in different statuses.
@@ -569,10 +565,9 @@ class TestCleanNotionDocumentTask:
         segment_statuses = [SegmentStatus.WAITING, SegmentStatus.INDEXING, SegmentStatus.COMPLETED, SegmentStatus.ERROR]
         segments = []
         index_node_ids = []
-
+        assert tenant
         for i, status in enumerate(segment_statuses):
             segment = DocumentSegment(
-                id=str(uuid.uuid4()),
                 tenant_id=tenant.id,
                 dataset_id=dataset.id,
                 document_id=document.id,
@@ -603,7 +598,7 @@ class TestCleanNotionDocumentTask:
         # IndexProcessor verification would require more sophisticated mocking.
 
     def test_clean_notion_document_task_continues_when_index_processor_fails(
-        self, db_session_with_containers, mock_index_processor_factory, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_index_processor_factory, mock_external_service_dependencies
     ):
         """
         Index processor failure (e.g. transient billing API error propagated via
@@ -665,10 +660,9 @@ class TestCleanNotionDocumentTask:
         )
         db_session_with_containers.add(document)
         db_session_with_containers.flush()
-
+        assert tenant
         # Create segment
         segment = DocumentSegment(
-            id=str(uuid.uuid4()),
             tenant_id=tenant.id,
             dataset_id=dataset.id,
             document_id=document.id,
@@ -707,7 +701,7 @@ class TestCleanNotionDocumentTask:
         assert _count_segments(db_session_with_containers, DocumentSegment.document_id == document.id) == 0
 
     def test_clean_notion_document_task_with_large_number_of_documents(
-        self, db_session_with_containers, mock_index_processor_factory, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_index_processor_factory, mock_external_service_dependencies
     ):
         """
         Test cleanup task with a large number of documents and segments.
@@ -765,12 +759,11 @@ class TestCleanNotionDocumentTask:
             db_session_with_containers.add(document)
             db_session_with_containers.flush()
             documents.append(document)
-
+            assert tenant
             # Create multiple segments for each document
             num_segments_per_doc = 5
             for j in range(num_segments_per_doc):
                 segment = DocumentSegment(
-                    id=str(uuid.uuid4()),
                     tenant_id=tenant.id,
                     dataset_id=dataset.id,
                     document_id=document.id,
@@ -806,7 +799,7 @@ class TestCleanNotionDocumentTask:
         # The database efficiently handles large-scale deletions.
 
     def test_clean_notion_document_task_with_documents_from_different_tenants(
-        self, db_session_with_containers, mock_index_processor_factory, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_index_processor_factory, mock_external_service_dependencies
     ):
         """
         Test cleanup task with documents from different tenants.
@@ -875,7 +868,6 @@ class TestCleanNotionDocumentTask:
             # Create segments for each document
             for j in range(3):
                 segment = DocumentSegment(
-                    id=str(uuid.uuid4()),
                     tenant_id=account.current_tenant.id,
                     dataset_id=dataset.id,
                     document_id=document.id,
@@ -918,7 +910,7 @@ class TestCleanNotionDocumentTask:
         # Only documents from the target dataset are affected, maintaining tenant separation.
 
     def test_clean_notion_document_task_with_documents_in_different_states(
-        self, db_session_with_containers, mock_index_processor_factory, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_index_processor_factory, mock_external_service_dependencies
     ):
         """
         Test cleanup task with documents in different indexing states.
@@ -984,11 +976,10 @@ class TestCleanNotionDocumentTask:
             db_session_with_containers.add(document)
             db_session_with_containers.flush()
             documents.append(document)
-
+            assert tenant
             # Create segments for each document
             for j in range(2):
                 segment = DocumentSegment(
-                    id=str(uuid.uuid4()),
                     tenant_id=tenant.id,
                     dataset_id=dataset.id,
                     document_id=document.id,
@@ -1024,7 +1015,7 @@ class TestCleanNotionDocumentTask:
         # All documents are deleted regardless of their indexing status.
 
     def test_clean_notion_document_task_with_documents_having_metadata(
-        self, db_session_with_containers, mock_index_processor_factory, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_index_processor_factory, mock_external_service_dependencies
     ):
         """
         Test cleanup task with documents that have rich metadata.
@@ -1093,10 +1084,9 @@ class TestCleanNotionDocumentTask:
         # Create segments with metadata
         segments = []
         index_node_ids = []
-
+        assert tenant
         for i in range(3):
             segment = DocumentSegment(
-                id=str(uuid.uuid4()),
                 tenant_id=tenant.id,
                 dataset_id=dataset.id,
                 document_id=document.id,
diff --git a/api/tests/test_containers_integration_tests/tasks/test_create_segment_to_index_task.py b/api/tests/test_containers_integration_tests/tasks/test_create_segment_to_index_task.py
index 9084667c31..a8d295e6a9 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_create_segment_to_index_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_create_segment_to_index_task.py
@@ -12,10 +12,11 @@ from uuid import uuid4
 import pytest
 from faker import Faker
 from sqlalchemy import delete
+from sqlalchemy.orm import Session
 
 from core.rag.index_processor.constant.index_type import IndexStructureType, IndexTechniqueType
 from extensions.ext_redis import redis_client
-from models import Account, Tenant, TenantAccountJoin, TenantAccountRole
+from models import Account, AccountStatus, Tenant, TenantAccountJoin, TenantAccountRole, TenantStatus
 from models.dataset import Dataset, Document, DocumentSegment
 from models.enums import DataSourceType, DocumentCreatedFrom, IndexingStatus, SegmentStatus
 from tasks.create_segment_to_index_task import create_segment_to_index_task
@@ -25,7 +26,7 @@ class TestCreateSegmentToIndexTask:
     """Integration tests for create_segment_to_index_task using testcontainers."""
 
     @pytest.fixture(autouse=True)
-    def cleanup_database(self, db_session_with_containers):
+    def cleanup_database(self, db_session_with_containers: Session):
         """Clean up database and Redis before each test to ensure isolation."""
 
         # Clear all test data using fixture session
@@ -55,7 +56,7 @@ class TestCreateSegmentToIndexTask:
                 "index_processor": mock_processor,
             }
 
-    def _create_test_account_and_tenant(self, db_session_with_containers):
+    def _create_test_account_and_tenant(self, db_session_with_containers: Session):
         """
         Helper method to create a test account and tenant for testing.
 
@@ -72,7 +73,7 @@ class TestCreateSegmentToIndexTask:
             email=fake.email(),
             name=fake.name(),
             interface_language="en-US",
-            status="active",
+            status=AccountStatus.ACTIVE,
         )
 
         db_session_with_containers.add(account)
@@ -81,7 +82,7 @@ class TestCreateSegmentToIndexTask:
         # Create tenant
         tenant = Tenant(
             name=fake.company(),
-            status="normal",
+            status=TenantStatus.NORMAL,
             plan="basic",
         )
         db_session_with_containers.add(tenant)
@@ -102,7 +103,7 @@ class TestCreateSegmentToIndexTask:
 
         return account, tenant
 
-    def _create_test_dataset_and_document(self, db_session_with_containers, tenant_id, account_id):
+    def _create_test_dataset_and_document(self, db_session_with_containers: Session, tenant_id, account_id):
         """
         Helper method to create a test dataset and document for testing.
 
@@ -151,7 +152,13 @@ class TestCreateSegmentToIndexTask:
         return dataset, document
 
     def _create_test_segment(
-        self, db_session_with_containers, dataset_id, document_id, tenant_id, account_id, status=SegmentStatus.WAITING
+        self,
+        db_session_with_containers: Session,
+        dataset_id,
+        document_id,
+        tenant_id,
+        account_id,
+        status=SegmentStatus.WAITING,
     ):
         """
         Helper method to create a test document segment for testing.
@@ -189,7 +196,9 @@ class TestCreateSegmentToIndexTask:
 
         return segment
 
-    def test_create_segment_to_index_success(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_create_segment_to_index_success(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test successful creation of segment to index.
 
@@ -225,7 +234,7 @@ class TestCreateSegmentToIndexTask:
         assert redis_client.exists(cache_key) == 0
 
     def test_create_segment_to_index_segment_not_found(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test handling of non-existent segment ID.
@@ -246,7 +255,7 @@ class TestCreateSegmentToIndexTask:
         mock_external_service_dependencies["index_processor_factory"].assert_not_called()
 
     def test_create_segment_to_index_invalid_status(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test handling of segment with invalid status.
@@ -277,7 +286,9 @@ class TestCreateSegmentToIndexTask:
         # Verify no index processor calls were made
         mock_external_service_dependencies["index_processor_factory"].assert_not_called()
 
-    def test_create_segment_to_index_no_dataset(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_create_segment_to_index_no_dataset(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test handling of segment without associated dataset.
 
@@ -330,7 +341,9 @@ class TestCreateSegmentToIndexTask:
         # Verify no index processor calls were made
         mock_external_service_dependencies["index_processor_factory"].assert_not_called()
 
-    def test_create_segment_to_index_no_document(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_create_segment_to_index_no_document(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test handling of segment without associated document.
 
@@ -367,7 +380,7 @@ class TestCreateSegmentToIndexTask:
         mock_external_service_dependencies["index_processor_factory"].assert_not_called()
 
     def test_create_segment_to_index_document_disabled(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test handling of segment with disabled document.
@@ -403,7 +416,7 @@ class TestCreateSegmentToIndexTask:
         mock_external_service_dependencies["index_processor_factory"].assert_not_called()
 
     def test_create_segment_to_index_document_archived(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test handling of segment with archived document.
@@ -439,7 +452,7 @@ class TestCreateSegmentToIndexTask:
         mock_external_service_dependencies["index_processor_factory"].assert_not_called()
 
     def test_create_segment_to_index_document_indexing_incomplete(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test handling of segment with document that has incomplete indexing.
@@ -475,7 +488,7 @@ class TestCreateSegmentToIndexTask:
         mock_external_service_dependencies["index_processor_factory"].assert_not_called()
 
     def test_create_segment_to_index_processor_exception(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test handling of index processor exceptions.
@@ -511,7 +524,7 @@ class TestCreateSegmentToIndexTask:
         assert redis_client.exists(cache_key) == 0
 
     def test_create_segment_to_index_with_keywords(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test segment indexing with custom keywords.
@@ -543,7 +556,7 @@ class TestCreateSegmentToIndexTask:
         mock_external_service_dependencies["index_processor"].load.assert_called_once()
 
     def test_create_segment_to_index_different_doc_forms(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test segment indexing with different document forms.
@@ -586,7 +599,7 @@ class TestCreateSegmentToIndexTask:
             mock_external_service_dependencies["index_processor_factory"].assert_called_with(doc_form)
 
     def test_create_segment_to_index_performance_timing(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test segment indexing performance and timing.
@@ -617,7 +630,7 @@ class TestCreateSegmentToIndexTask:
         assert segment.status == SegmentStatus.COMPLETED
 
     def test_create_segment_to_index_concurrent_execution(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test concurrent execution of segment indexing tasks.
@@ -654,7 +667,7 @@ class TestCreateSegmentToIndexTask:
         assert mock_external_service_dependencies["index_processor_factory"].call_count == 3
 
     def test_create_segment_to_index_large_content(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test segment indexing with large content.
@@ -703,7 +716,7 @@ class TestCreateSegmentToIndexTask:
         assert segment.completed_at is not None
 
     def test_create_segment_to_index_redis_failure(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test segment indexing when Redis operations fail.
@@ -743,7 +756,7 @@ class TestCreateSegmentToIndexTask:
         assert redis_client.exists(cache_key) == 1
 
     def test_create_segment_to_index_database_transaction_rollback(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test segment indexing with database transaction handling.
@@ -775,7 +788,7 @@ class TestCreateSegmentToIndexTask:
         assert segment.error is not None
 
     def test_create_segment_to_index_metadata_validation(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test segment indexing with metadata validation.
@@ -817,7 +830,7 @@ class TestCreateSegmentToIndexTask:
         assert doc is not None
 
     def test_create_segment_to_index_status_transition_flow(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test complete status transition flow during indexing.
@@ -852,7 +865,7 @@ class TestCreateSegmentToIndexTask:
         assert segment.indexing_at <= segment.completed_at
 
     def test_create_segment_to_index_with_empty_content(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test segment indexing with empty or minimal content.
@@ -894,7 +907,7 @@ class TestCreateSegmentToIndexTask:
         assert segment.completed_at is not None
 
     def test_create_segment_to_index_with_special_characters(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test segment indexing with special characters and unicode content.
@@ -940,7 +953,7 @@ class TestCreateSegmentToIndexTask:
         assert segment.completed_at is not None
 
     def test_create_segment_to_index_with_long_keywords(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test segment indexing with long keyword lists.
@@ -974,7 +987,7 @@ class TestCreateSegmentToIndexTask:
         mock_external_service_dependencies["index_processor"].load.assert_called_once()
 
     def test_create_segment_to_index_tenant_isolation(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test segment indexing with proper tenant isolation.
@@ -1017,7 +1030,7 @@ class TestCreateSegmentToIndexTask:
         assert segment1.tenant_id != segment2.tenant_id
 
     def test_create_segment_to_index_with_none_keywords(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test segment indexing with None keywords parameter.
@@ -1048,7 +1061,7 @@ class TestCreateSegmentToIndexTask:
         mock_external_service_dependencies["index_processor"].load.assert_called_once()
 
     def test_create_segment_to_index_comprehensive_integration(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Comprehensive integration test covering multiple scenarios.
diff --git a/api/tests/test_containers_integration_tests/tasks/test_dataset_indexing_task.py b/api/tests/test_containers_integration_tests/tasks/test_dataset_indexing_task.py
index 684097851b..5287cd06db 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_dataset_indexing_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_dataset_indexing_task.py
@@ -7,11 +7,12 @@ from unittest.mock import MagicMock, patch
 import pytest
 from faker import Faker
 from sqlalchemy import select
+from sqlalchemy.orm import Session
 
 from core.indexing_runner import DocumentIsPausedError
 from core.rag.index_processor.constant.index_type import IndexTechniqueType
 from enums.cloud_plan import CloudPlan
-from models import Account, Tenant, TenantAccountJoin, TenantAccountRole
+from models import Account, AccountStatus, Tenant, TenantAccountJoin, TenantAccountRole, TenantStatus
 from models.dataset import Dataset, Document
 from models.enums import DataSourceType, DocumentCreatedFrom, IndexingStatus
 from tasks.document_indexing_task import (
@@ -53,7 +54,7 @@ class _TrackedSessionContext:
 
 
 @pytest.fixture(autouse=True)
-def _ensure_testcontainers_db(db_session_with_containers):
+def _ensure_testcontainers_db(db_session_with_containers: Session):
     """Ensure this suite always runs on testcontainers infrastructure."""
     return db_session_with_containers
 
@@ -120,12 +121,12 @@ class TestDatasetIndexingTaskIntegration:
             email=fake.email(),
             name=fake.name(),
             interface_language="en-US",
-            status="active",
+            status=AccountStatus.ACTIVE,
         )
         db_session_with_containers.add(account)
         db_session_with_containers.flush()
 
-        tenant = Tenant(name=fake.company(), status="normal")
+        tenant = Tenant(name=fake.company(), status=TenantStatus.NORMAL)
         db_session_with_containers.add(tenant)
         db_session_with_containers.flush()
 
@@ -174,11 +175,11 @@ class TestDatasetIndexingTaskIntegration:
 
         return dataset, documents
 
-    def _query_document(self, db_session_with_containers, document_id: str) -> Document | None:
+    def _query_document(self, db_session_with_containers: Session, document_id: str) -> Document | None:
         """Return the latest persisted document state."""
         return db_session_with_containers.scalar(select(Document).where(Document.id == document_id).limit(1))
 
-    def _assert_documents_parsing(self, db_session_with_containers, document_ids: Sequence[str]) -> None:
+    def _assert_documents_parsing(self, db_session_with_containers: Session, document_ids: Sequence[str]) -> None:
         """Assert all target documents are persisted in parsing status."""
         db_session_with_containers.expire_all()
         for document_id in document_ids:
@@ -212,7 +213,9 @@ class TestDatasetIndexingTaskIntegration:
         assert len(opened) >= 2
         assert opened_ids <= closed_ids
 
-    def test_legacy_document_indexing_task_still_works(self, db_session_with_containers, patched_external_dependencies):
+    def test_legacy_document_indexing_task_still_works(
+        self, db_session_with_containers: Session, patched_external_dependencies
+    ):
         """Ensure the legacy task entrypoint still updates parsing status."""
         # Arrange
         dataset, documents = self._create_test_dataset_and_documents(db_session_with_containers, document_count=2)
@@ -225,7 +228,9 @@ class TestDatasetIndexingTaskIntegration:
         patched_external_dependencies["indexing_runner_instance"].run.assert_called_once()
         self._assert_documents_parsing(db_session_with_containers, document_ids)
 
-    def test_batch_processing_multiple_documents(self, db_session_with_containers, patched_external_dependencies):
+    def test_batch_processing_multiple_documents(
+        self, db_session_with_containers: Session, patched_external_dependencies
+    ):
         """Process multiple documents in one batch."""
         # Arrange
         dataset, documents = self._create_test_dataset_and_documents(db_session_with_containers, document_count=3)
@@ -240,7 +245,9 @@ class TestDatasetIndexingTaskIntegration:
         assert len(run_args) == len(document_ids)
         self._assert_documents_parsing(db_session_with_containers, document_ids)
 
-    def test_batch_processing_with_limit_check(self, db_session_with_containers, patched_external_dependencies):
+    def test_batch_processing_with_limit_check(
+        self, db_session_with_containers: Session, patched_external_dependencies
+    ):
         """Reject batches larger than configured upload limit.
 
         This test patches config only to force a deterministic limit branch while keeping SQL writes real.
@@ -263,7 +270,7 @@ class TestDatasetIndexingTaskIntegration:
         self._assert_documents_error_contains(db_session_with_containers, document_ids, "batch upload limit")
 
     def test_batch_processing_sandbox_plan_single_document_only(
-        self, db_session_with_containers, patched_external_dependencies
+        self, db_session_with_containers: Session, patched_external_dependencies
     ):
         """Reject multi-document upload under sandbox plan."""
         # Arrange
@@ -280,7 +287,9 @@ class TestDatasetIndexingTaskIntegration:
         patched_external_dependencies["indexing_runner_instance"].run.assert_not_called()
         self._assert_documents_error_contains(db_session_with_containers, document_ids, "does not support batch upload")
 
-    def test_batch_processing_empty_document_list(self, db_session_with_containers, patched_external_dependencies):
+    def test_batch_processing_empty_document_list(
+        self, db_session_with_containers: Session, patched_external_dependencies
+    ):
         """Handle empty list input without failing."""
         # Arrange
         dataset, _ = self._create_test_dataset_and_documents(db_session_with_containers, document_count=0)
@@ -292,7 +301,7 @@ class TestDatasetIndexingTaskIntegration:
         patched_external_dependencies["indexing_runner_instance"].run.assert_called_once_with([])
 
     def test_tenant_queue_dispatches_next_task_after_completion(
-        self, db_session_with_containers, patched_external_dependencies
+        self, db_session_with_containers: Session, patched_external_dependencies
     ):
         """Dispatch the next queued task after current tenant task completes.
 
@@ -337,7 +346,7 @@ class TestDatasetIndexingTaskIntegration:
         delete_key_spy.assert_not_called()
 
     def test_tenant_queue_deletes_running_key_when_no_follow_up_tasks(
-        self, db_session_with_containers, patched_external_dependencies
+        self, db_session_with_containers: Session, patched_external_dependencies
     ):
         """Delete tenant running flag when queue has no pending tasks.
 
@@ -362,7 +371,7 @@ class TestDatasetIndexingTaskIntegration:
         delete_key_spy.assert_called_once()
 
     def test_validation_failure_sets_error_status_when_vector_space_at_limit(
-        self, db_session_with_containers, patched_external_dependencies
+        self, db_session_with_containers: Session, patched_external_dependencies
     ):
         """Set error status when vector space validation fails before runner phase."""
         # Arrange
@@ -382,7 +391,7 @@ class TestDatasetIndexingTaskIntegration:
         self._assert_documents_error_contains(db_session_with_containers, document_ids, "over the limit")
 
     def test_runner_exception_does_not_crash_indexing_task(
-        self, db_session_with_containers, patched_external_dependencies
+        self, db_session_with_containers: Session, patched_external_dependencies
     ):
         """Catch generic runner exceptions without crashing the task."""
         # Arrange
@@ -397,7 +406,7 @@ class TestDatasetIndexingTaskIntegration:
         patched_external_dependencies["indexing_runner_instance"].run.assert_called_once()
         self._assert_documents_parsing(db_session_with_containers, document_ids)
 
-    def test_document_paused_error_handling(self, db_session_with_containers, patched_external_dependencies):
+    def test_document_paused_error_handling(self, db_session_with_containers: Session, patched_external_dependencies):
         """Handle DocumentIsPausedError and keep persisted state consistent."""
         # Arrange
         dataset, documents = self._create_test_dataset_and_documents(db_session_with_containers, document_count=2)
@@ -424,7 +433,7 @@ class TestDatasetIndexingTaskIntegration:
         patched_external_dependencies["indexing_runner_instance"].run.assert_not_called()
 
     def test_tenant_queue_error_handling_still_processes_next_task(
-        self, db_session_with_containers, patched_external_dependencies
+        self, db_session_with_containers: Session, patched_external_dependencies
     ):
         """Even on current task failure, enqueue the next waiting tenant task.
 
@@ -491,7 +500,7 @@ class TestDatasetIndexingTaskIntegration:
         self._assert_all_opened_sessions_closed(session_close_tracker)
 
     def test_multiple_documents_with_mixed_success_and_failure(
-        self, db_session_with_containers, patched_external_dependencies
+        self, db_session_with_containers: Session, patched_external_dependencies
     ):
         """Process only existing documents when request includes missing ids."""
         # Arrange
@@ -508,7 +517,7 @@ class TestDatasetIndexingTaskIntegration:
         self._assert_documents_parsing(db_session_with_containers, existing_ids)
 
     def test_tenant_queue_dispatches_up_to_concurrency_limit(
-        self, db_session_with_containers, patched_external_dependencies
+        self, db_session_with_containers: Session, patched_external_dependencies
     ):
         """Dispatch only up to configured concurrency under queued backlog burst.
 
@@ -543,7 +552,7 @@ class TestDatasetIndexingTaskIntegration:
         assert task_dispatch_spy.apply_async.call_count == concurrency_limit
         assert set_waiting_spy.call_count == concurrency_limit
 
-    def test_task_queue_fifo_ordering(self, db_session_with_containers, patched_external_dependencies):
+    def test_task_queue_fifo_ordering(self, db_session_with_containers: Session, patched_external_dependencies):
         """Keep FIFO ordering when dispatching next queued tasks.
 
         Queue APIs are patched to isolate dispatch side effects while preserving DB assertions.
@@ -576,7 +585,9 @@ class TestDatasetIndexingTaskIntegration:
             call_kwargs = task_dispatch_spy.apply_async.call_args_list[index].kwargs.get("kwargs", {})
             assert call_kwargs.get("document_ids") == expected_task["document_ids"]
 
-    def test_billing_disabled_skips_limit_checks(self, db_session_with_containers, patched_external_dependencies):
+    def test_billing_disabled_skips_limit_checks(
+        self, db_session_with_containers: Session, patched_external_dependencies
+    ):
         """Skip limit checks when billing feature is disabled."""
         # Arrange
         large_document_ids = [str(uuid.uuid4()) for _ in range(100)]
@@ -595,7 +606,7 @@ class TestDatasetIndexingTaskIntegration:
         assert len(run_args) == 100
         self._assert_documents_parsing(db_session_with_containers, large_document_ids)
 
-    def test_complete_workflow_normal_task(self, db_session_with_containers, patched_external_dependencies):
+    def test_complete_workflow_normal_task(self, db_session_with_containers: Session, patched_external_dependencies):
         """Run end-to-end normal queue workflow with tenant queue cleanup.
 
         Queue APIs are patched to isolate dispatch side effects while preserving DB assertions.
@@ -618,7 +629,7 @@ class TestDatasetIndexingTaskIntegration:
         self._assert_documents_parsing(db_session_with_containers, document_ids)
         delete_key_spy.assert_called_once()
 
-    def test_complete_workflow_priority_task(self, db_session_with_containers, patched_external_dependencies):
+    def test_complete_workflow_priority_task(self, db_session_with_containers: Session, patched_external_dependencies):
         """Run end-to-end priority queue workflow with tenant queue cleanup.
 
         Queue APIs are patched to isolate dispatch side effects while preserving DB assertions.
@@ -641,7 +652,7 @@ class TestDatasetIndexingTaskIntegration:
         self._assert_documents_parsing(db_session_with_containers, document_ids)
         delete_key_spy.assert_called_once()
 
-    def test_single_document_processing(self, db_session_with_containers, patched_external_dependencies):
+    def test_single_document_processing(self, db_session_with_containers: Session, patched_external_dependencies):
         """Process the minimum batch size (single document)."""
         # Arrange
         dataset, documents = self._create_test_dataset_and_documents(db_session_with_containers, document_count=1)
@@ -655,7 +666,9 @@ class TestDatasetIndexingTaskIntegration:
         assert len(run_args) == 1
         self._assert_documents_parsing(db_session_with_containers, [document_id])
 
-    def test_document_with_special_characters_in_id(self, db_session_with_containers, patched_external_dependencies):
+    def test_document_with_special_characters_in_id(
+        self, db_session_with_containers: Session, patched_external_dependencies
+    ):
         """Handle standard UUID ids with hyphen characters safely."""
         # Arrange
         special_document_id = str(uuid.uuid4())
@@ -670,7 +683,9 @@ class TestDatasetIndexingTaskIntegration:
         # Assert
         self._assert_documents_parsing(db_session_with_containers, [special_document_id])
 
-    def test_zero_vector_space_limit_allows_unlimited(self, db_session_with_containers, patched_external_dependencies):
+    def test_zero_vector_space_limit_allows_unlimited(
+        self, db_session_with_containers: Session, patched_external_dependencies
+    ):
         """Treat vector limit 0 as unlimited and continue indexing."""
         # Arrange
         dataset, documents = self._create_test_dataset_and_documents(db_session_with_containers, document_count=3)
@@ -689,7 +704,7 @@ class TestDatasetIndexingTaskIntegration:
         self._assert_documents_parsing(db_session_with_containers, document_ids)
 
     def test_negative_vector_space_values_handled_gracefully(
-        self, db_session_with_containers, patched_external_dependencies
+        self, db_session_with_containers: Session, patched_external_dependencies
     ):
         """Treat negative vector limits as non-blocking and continue indexing."""
         # Arrange
@@ -708,7 +723,7 @@ class TestDatasetIndexingTaskIntegration:
         patched_external_dependencies["indexing_runner_instance"].run.assert_called_once()
         self._assert_documents_parsing(db_session_with_containers, document_ids)
 
-    def test_large_document_batch_processing(self, db_session_with_containers, patched_external_dependencies):
+    def test_large_document_batch_processing(self, db_session_with_containers: Session, patched_external_dependencies):
         """Process a batch exactly at configured upload limit.
 
         This test patches config only to force a deterministic limit branch while keeping SQL writes real.
diff --git a/api/tests/test_containers_integration_tests/tasks/test_deal_dataset_vector_index_task.py b/api/tests/test_containers_integration_tests/tasks/test_deal_dataset_vector_index_task.py
index 48fec441c5..aba2458d55 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_deal_dataset_vector_index_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_deal_dataset_vector_index_task.py
@@ -12,6 +12,7 @@ from unittest.mock import ANY, Mock, patch
 import pytest
 from faker import Faker
 from sqlalchemy import select
+from sqlalchemy.orm import Session
 
 from core.rag.index_processor.constant.index_type import IndexStructureType
 from models.dataset import Dataset, Document, DocumentSegment
@@ -55,7 +56,7 @@ class TestDealDatasetVectorIndexTask:
             yield mock_factory
 
     @pytest.fixture
-    def account_and_tenant(self, db_session_with_containers, mock_external_service_dependencies):
+    def account_and_tenant(self, db_session_with_containers: Session, mock_external_service_dependencies):
         """Create an account with an owner tenant for testing.
 
         Returns a tuple of (account, tenant) where tenant is guaranteed to be non-None.
@@ -73,7 +74,7 @@ class TestDealDatasetVectorIndexTask:
         return account, tenant
 
     def test_deal_dataset_vector_index_task_remove_action_success(
-        self, db_session_with_containers, mock_index_processor_factory, account_and_tenant
+        self, db_session_with_containers: Session, mock_index_processor_factory, account_and_tenant
     ):
         """
         Test successful removal of dataset vector index.
@@ -89,7 +90,6 @@ class TestDealDatasetVectorIndexTask:
 
         # Create dataset
         dataset = Dataset(
-            id=str(uuid.uuid4()),
             tenant_id=tenant.id,
             name=fake.company(),
             description=fake.text(max_nb_chars=100),
@@ -131,7 +131,7 @@ class TestDealDatasetVectorIndexTask:
         assert mock_processor.clean.call_count >= 0  # For now, just check it doesn't fail
 
     def test_deal_dataset_vector_index_task_add_action_success(
-        self, db_session_with_containers, mock_index_processor_factory, account_and_tenant
+        self, db_session_with_containers: Session, mock_index_processor_factory, account_and_tenant
     ):
         """
         Test successful addition of dataset vector index.
@@ -149,7 +149,6 @@ class TestDealDatasetVectorIndexTask:
 
         # Create dataset
         dataset = Dataset(
-            id=str(uuid.uuid4()),
             tenant_id=tenant.id,
             name=fake.company(),
             description=fake.text(max_nb_chars=100),
@@ -201,7 +200,6 @@ class TestDealDatasetVectorIndexTask:
 
         # Create segments
         segment = DocumentSegment(
-            id=str(uuid.uuid4()),
             tenant_id=tenant.id,
             dataset_id=dataset.id,
             document_id=document.id,
@@ -233,7 +231,7 @@ class TestDealDatasetVectorIndexTask:
         mock_processor.load.assert_called_once()
 
     def test_deal_dataset_vector_index_task_update_action_success(
-        self, db_session_with_containers, mock_index_processor_factory, account_and_tenant
+        self, db_session_with_containers: Session, mock_index_processor_factory, account_and_tenant
     ):
         """
         Test successful update of dataset vector index.
@@ -252,7 +250,6 @@ class TestDealDatasetVectorIndexTask:
 
         # Create dataset with parent-child index
         dataset = Dataset(
-            id=str(uuid.uuid4()),
             tenant_id=tenant.id,
             name=fake.company(),
             description=fake.text(max_nb_chars=100),
@@ -304,7 +301,6 @@ class TestDealDatasetVectorIndexTask:
 
         # Create segments
         segment = DocumentSegment(
-            id=str(uuid.uuid4()),
             tenant_id=tenant.id,
             dataset_id=dataset.id,
             document_id=document.id,
@@ -337,7 +333,7 @@ class TestDealDatasetVectorIndexTask:
         mock_processor.load.assert_called_once()
 
     def test_deal_dataset_vector_index_task_dataset_not_found_error(
-        self, db_session_with_containers, mock_index_processor_factory, account_and_tenant
+        self, db_session_with_containers: Session, mock_index_processor_factory, account_and_tenant
     ):
         """
         Test task behavior when dataset is not found.
@@ -357,7 +353,7 @@ class TestDealDatasetVectorIndexTask:
         mock_processor.load.assert_not_called()
 
     def test_deal_dataset_vector_index_task_add_action_no_documents(
-        self, db_session_with_containers, mock_index_processor_factory, account_and_tenant
+        self, db_session_with_containers: Session, mock_index_processor_factory, account_and_tenant
     ):
         """
         Test add action when no documents exist for the dataset.
@@ -370,7 +366,6 @@ class TestDealDatasetVectorIndexTask:
 
         # Create dataset without documents
         dataset = Dataset(
-            id=str(uuid.uuid4()),
             tenant_id=tenant.id,
             name=fake.company(),
             description=fake.text(max_nb_chars=100),
@@ -389,7 +384,7 @@ class TestDealDatasetVectorIndexTask:
         mock_processor.load.assert_not_called()
 
     def test_deal_dataset_vector_index_task_add_action_no_segments(
-        self, db_session_with_containers, mock_index_processor_factory, account_and_tenant
+        self, db_session_with_containers: Session, mock_index_processor_factory, account_and_tenant
     ):
         """
         Test add action when documents exist but have no segments.
@@ -402,7 +397,6 @@ class TestDealDatasetVectorIndexTask:
 
         # Create dataset
         dataset = Dataset(
-            id=str(uuid.uuid4()),
             tenant_id=tenant.id,
             name=fake.company(),
             description=fake.text(max_nb_chars=100),
@@ -447,7 +441,7 @@ class TestDealDatasetVectorIndexTask:
         mock_processor.load.assert_not_called()
 
     def test_deal_dataset_vector_index_task_update_action_no_documents(
-        self, db_session_with_containers, mock_index_processor_factory, account_and_tenant
+        self, db_session_with_containers: Session, mock_index_processor_factory, account_and_tenant
     ):
         """
         Test update action when no documents exist for the dataset.
@@ -460,7 +454,6 @@ class TestDealDatasetVectorIndexTask:
 
         # Create dataset without documents
         dataset = Dataset(
-            id=str(uuid.uuid4()),
             tenant_id=tenant.id,
             name=fake.company(),
             description=fake.text(max_nb_chars=100),
@@ -480,7 +473,7 @@ class TestDealDatasetVectorIndexTask:
         mock_processor.load.assert_not_called()
 
     def test_deal_dataset_vector_index_task_add_action_with_exception_handling(
-        self, db_session_with_containers, mock_index_processor_factory, account_and_tenant
+        self, db_session_with_containers: Session, mock_index_processor_factory, account_and_tenant
     ):
         """
         Test add action with exception handling during processing.
@@ -493,7 +486,6 @@ class TestDealDatasetVectorIndexTask:
 
         # Create dataset
         dataset = Dataset(
-            id=str(uuid.uuid4()),
             tenant_id=tenant.id,
             name=fake.company(),
             description=fake.text(max_nb_chars=100),
@@ -545,7 +537,6 @@ class TestDealDatasetVectorIndexTask:
 
         # Create segments
         segment = DocumentSegment(
-            id=str(uuid.uuid4()),
             tenant_id=tenant.id,
             dataset_id=dataset.id,
             document_id=document.id,
@@ -578,7 +569,7 @@ class TestDealDatasetVectorIndexTask:
         assert "Test exception during indexing" in updated_document.error
 
     def test_deal_dataset_vector_index_task_with_custom_index_type(
-        self, db_session_with_containers, mock_index_processor_factory, account_and_tenant
+        self, db_session_with_containers: Session, mock_index_processor_factory, account_and_tenant
     ):
         """
         Test task behavior with custom index type (QA_INDEX).
@@ -591,7 +582,6 @@ class TestDealDatasetVectorIndexTask:
 
         # Create dataset with custom index type
         dataset = Dataset(
-            id=str(uuid.uuid4()),
             tenant_id=tenant.id,
             name=fake.company(),
             description=fake.text(max_nb_chars=100),
@@ -623,7 +613,6 @@ class TestDealDatasetVectorIndexTask:
 
         # Create segments
         segment = DocumentSegment(
-            id=str(uuid.uuid4()),
             tenant_id=tenant.id,
             dataset_id=dataset.id,
             document_id=document.id,
@@ -656,7 +645,7 @@ class TestDealDatasetVectorIndexTask:
         mock_processor.load.assert_called_once()
 
     def test_deal_dataset_vector_index_task_with_default_index_type(
-        self, db_session_with_containers, mock_index_processor_factory, account_and_tenant
+        self, db_session_with_containers: Session, mock_index_processor_factory, account_and_tenant
     ):
         """
         Test task behavior with default index type (PARAGRAPH_INDEX).
@@ -669,7 +658,6 @@ class TestDealDatasetVectorIndexTask:
 
         # Create dataset without doc_form (should use default)
         dataset = Dataset(
-            id=str(uuid.uuid4()),
             tenant_id=tenant.id,
             name=fake.company(),
             description=fake.text(max_nb_chars=100),
@@ -701,7 +689,6 @@ class TestDealDatasetVectorIndexTask:
 
         # Create segments
         segment = DocumentSegment(
-            id=str(uuid.uuid4()),
             tenant_id=tenant.id,
             dataset_id=dataset.id,
             document_id=document.id,
@@ -734,7 +721,7 @@ class TestDealDatasetVectorIndexTask:
         mock_processor.load.assert_called_once()
 
     def test_deal_dataset_vector_index_task_multiple_documents_processing(
-        self, db_session_with_containers, mock_index_processor_factory, account_and_tenant
+        self, db_session_with_containers: Session, mock_index_processor_factory, account_and_tenant
     ):
         """
         Test task processing with multiple documents and segments.
@@ -747,7 +734,6 @@ class TestDealDatasetVectorIndexTask:
 
         # Create dataset
         dataset = Dataset(
-            id=str(uuid.uuid4()),
             tenant_id=tenant.id,
             name=fake.company(),
             description=fake.text(max_nb_chars=100),
@@ -805,7 +791,6 @@ class TestDealDatasetVectorIndexTask:
         for i, document in enumerate(documents):
             for j in range(2):
                 segment = DocumentSegment(
-                    id=str(uuid.uuid4()),
                     tenant_id=tenant.id,
                     dataset_id=dataset.id,
                     document_id=document.id,
@@ -831,6 +816,7 @@ class TestDealDatasetVectorIndexTask:
             updated_document = db_session_with_containers.scalar(
                 select(Document).where(Document.id == document.id).limit(1)
             )
+            assert updated_document
             assert updated_document.indexing_status == IndexingStatus.COMPLETED
 
         # Verify index processor load was called multiple times
@@ -839,7 +825,7 @@ class TestDealDatasetVectorIndexTask:
         assert mock_processor.load.call_count == 3
 
     def test_deal_dataset_vector_index_task_document_status_transitions(
-        self, db_session_with_containers, mock_index_processor_factory, account_and_tenant
+        self, db_session_with_containers: Session, mock_index_processor_factory, account_and_tenant
     ):
         """
         Test document status transitions during task execution.
@@ -852,7 +838,6 @@ class TestDealDatasetVectorIndexTask:
 
         # Create dataset
         dataset = Dataset(
-            id=str(uuid.uuid4()),
             tenant_id=tenant.id,
             name=fake.company(),
             description=fake.text(max_nb_chars=100),
@@ -904,7 +889,6 @@ class TestDealDatasetVectorIndexTask:
 
         # Create segments
         segment = DocumentSegment(
-            id=str(uuid.uuid4()),
             tenant_id=tenant.id,
             dataset_id=dataset.id,
             document_id=document.id,
@@ -938,7 +922,7 @@ class TestDealDatasetVectorIndexTask:
         assert updated_document.indexing_status == IndexingStatus.COMPLETED
 
     def test_deal_dataset_vector_index_task_with_disabled_documents(
-        self, db_session_with_containers, mock_index_processor_factory, account_and_tenant
+        self, db_session_with_containers: Session, mock_index_processor_factory, account_and_tenant
     ):
         """
         Test task behavior with disabled documents.
@@ -951,7 +935,6 @@ class TestDealDatasetVectorIndexTask:
 
         # Create dataset
         dataset = Dataset(
-            id=str(uuid.uuid4()),
             tenant_id=tenant.id,
             name=fake.company(),
             description=fake.text(max_nb_chars=100),
@@ -1023,7 +1006,6 @@ class TestDealDatasetVectorIndexTask:
 
         # Create segments for enabled document only
         segment = DocumentSegment(
-            id=str(uuid.uuid4()),
             tenant_id=tenant.id,
             dataset_id=dataset.id,
             document_id=enabled_document.id,
@@ -1061,7 +1043,7 @@ class TestDealDatasetVectorIndexTask:
         mock_processor.load.assert_called_once()
 
     def test_deal_dataset_vector_index_task_with_archived_documents(
-        self, db_session_with_containers, mock_index_processor_factory, account_and_tenant
+        self, db_session_with_containers: Session, mock_index_processor_factory, account_and_tenant
     ):
         """
         Test task behavior with archived documents.
@@ -1074,7 +1056,6 @@ class TestDealDatasetVectorIndexTask:
 
         # Create dataset
         dataset = Dataset(
-            id=str(uuid.uuid4()),
             tenant_id=tenant.id,
             name=fake.company(),
             description=fake.text(max_nb_chars=100),
@@ -1146,7 +1127,6 @@ class TestDealDatasetVectorIndexTask:
 
         # Create segments for active document only
         segment = DocumentSegment(
-            id=str(uuid.uuid4()),
             tenant_id=tenant.id,
             dataset_id=dataset.id,
             document_id=active_document.id,
@@ -1184,7 +1164,7 @@ class TestDealDatasetVectorIndexTask:
         mock_processor.load.assert_called_once()
 
     def test_deal_dataset_vector_index_task_with_incomplete_documents(
-        self, db_session_with_containers, mock_index_processor_factory, account_and_tenant
+        self, db_session_with_containers: Session, mock_index_processor_factory, account_and_tenant
     ):
         """
         Test task behavior with documents that have incomplete indexing status.
@@ -1197,7 +1177,6 @@ class TestDealDatasetVectorIndexTask:
 
         # Create dataset
         dataset = Dataset(
-            id=str(uuid.uuid4()),
             tenant_id=tenant.id,
             name=fake.company(),
             description=fake.text(max_nb_chars=100),
@@ -1269,7 +1248,6 @@ class TestDealDatasetVectorIndexTask:
 
         # Create segments for completed document only
         segment = DocumentSegment(
-            id=str(uuid.uuid4()),
             tenant_id=tenant.id,
             dataset_id=dataset.id,
             document_id=completed_document.id,
diff --git a/api/tests/test_containers_integration_tests/tasks/test_delete_segment_from_index_task.py b/api/tests/test_containers_integration_tests/tasks/test_delete_segment_from_index_task.py
index 8a69707b38..a7edf4f77a 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_delete_segment_from_index_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_delete_segment_from_index_task.py
@@ -11,9 +11,19 @@ import logging
 from unittest.mock import MagicMock, patch
 
 from faker import Faker
+from sqlalchemy.orm import Session
 
 from core.rag.index_processor.constant.index_type import IndexStructureType, IndexTechniqueType
-from models import Account, Dataset, Document, DocumentSegment, Tenant
+from models import (
+    Account,
+    AccountStatus,
+    Dataset,
+    DatasetPermissionEnum,
+    Document,
+    DocumentSegment,
+    Tenant,
+    TenantStatus,
+)
 from models.enums import DataSourceType, DocumentCreatedFrom, DocumentDocType, IndexingStatus, SegmentStatus
 from tasks.delete_segment_from_index_task import delete_segment_from_index_task
 
@@ -37,7 +47,7 @@ class TestDeleteSegmentFromIndexTask:
     and realistic testing environment with actual database interactions.
     """
 
-    def _create_test_tenant(self, db_session_with_containers, fake=None):
+    def _create_test_tenant(self, db_session_with_containers: Session, fake: Faker | None = None):
         """
         Helper method to create a test tenant with realistic data.
 
@@ -49,7 +59,7 @@ class TestDeleteSegmentFromIndexTask:
             Tenant: Created test tenant instance
         """
         fake = fake or Faker()
-        tenant = Tenant(name=f"Test Tenant {fake.company()}", plan="basic", status="normal")
+        tenant = Tenant(name=f"Test Tenant {fake.company()}", plan="basic", status=TenantStatus.NORMAL)
         tenant.id = fake.uuid4()
         tenant.created_at = fake.date_time_this_year()
         tenant.updated_at = tenant.created_at
@@ -58,7 +68,7 @@ class TestDeleteSegmentFromIndexTask:
         db_session_with_containers.commit()
         return tenant
 
-    def _create_test_account(self, db_session_with_containers, tenant, fake=None):
+    def _create_test_account(self, db_session_with_containers: Session, tenant, fake: Faker | None = None):
         """
         Helper method to create a test account with realistic data.
 
@@ -75,7 +85,7 @@ class TestDeleteSegmentFromIndexTask:
             name=fake.name(),
             email=fake.email(),
             avatar=fake.url(),
-            status="active",
+            status=AccountStatus.ACTIVE,
             interface_language="en-US",
         )
         account.id = fake.uuid4()
@@ -86,7 +96,9 @@ class TestDeleteSegmentFromIndexTask:
         db_session_with_containers.commit()
         return account
 
-    def _create_test_dataset(self, db_session_with_containers, tenant, account, fake=None):
+    def _create_test_dataset(
+        self, db_session_with_containers: Session, tenant: Tenant, account: Account, fake: Faker | None = None
+    ):
         """
         Helper method to create a test dataset with realistic data.
 
@@ -106,7 +118,7 @@ class TestDeleteSegmentFromIndexTask:
         dataset.name = f"Test Dataset {fake.word()}"
         dataset.description = fake.text(max_nb_chars=200)
         dataset.provider = "vendor"
-        dataset.permission = "only_me"
+        dataset.permission = DatasetPermissionEnum.ONLY_ME
         dataset.data_source_type = DataSourceType.UPLOAD_FILE
         dataset.indexing_technique = IndexTechniqueType.HIGH_QUALITY
         dataset.index_struct = '{"type": "paragraph"}'
@@ -122,7 +134,7 @@ class TestDeleteSegmentFromIndexTask:
         db_session_with_containers.commit()
         return dataset
 
-    def _create_test_document(self, db_session_with_containers, dataset, account, fake=None, **kwargs):
+    def _create_test_document(self, db_session_with_containers: Session, dataset, account, fake=None, **kwargs):
         """
         Helper method to create a test document with realistic data.
 
@@ -172,7 +184,14 @@ class TestDeleteSegmentFromIndexTask:
         db_session_with_containers.commit()
         return document
 
-    def _create_test_document_segments(self, db_session_with_containers, document, account, count=3, fake=None):
+    def _create_test_document_segments(
+        self,
+        db_session_with_containers: Session,
+        document: Document,
+        account: Account,
+        count: int = 3,
+        fake: Faker | None = None,
+    ):
         """
         Helper method to create test document segments with realistic data.
 
@@ -190,26 +209,25 @@ class TestDeleteSegmentFromIndexTask:
         segments = []
 
         for i in range(count):
-            segment = DocumentSegment()
-            segment.id = fake.uuid4()
-            segment.tenant_id = document.tenant_id
-            segment.dataset_id = document.dataset_id
-            segment.document_id = document.id
-            segment.position = i + 1
-            segment.content = f"Test segment content {i + 1}: {fake.text(max_nb_chars=200)}"
-            segment.answer = f"Test segment answer {i + 1}: {fake.text(max_nb_chars=100)}"
-            segment.word_count = fake.random_int(min=10, max=100)
-            segment.tokens = fake.random_int(min=5, max=50)
-            segment.keywords = [fake.word() for _ in range(3)]
-            segment.index_node_id = f"node_{fake.uuid4()}"
-            segment.index_node_hash = fake.sha256()
-            segment.hit_count = 0
-            segment.enabled = True
-            segment.status = SegmentStatus.COMPLETED
-            segment.created_by = account.id
-            segment.created_at = fake.date_time_this_year()
-            segment.updated_by = account.id
-            segment.updated_at = segment.created_at
+            created_at = fake.date_time_this_year()
+            segment = DocumentSegment(
+                tenant_id=document.tenant_id,
+                dataset_id=document.dataset_id,
+                document_id=document.id,
+                position=i + 1,
+                content=f"Test segment content {i + 1}: {fake.text(max_nb_chars=200)}",
+                answer=f"Test segment answer {i + 1}: {fake.text(max_nb_chars=100)}",
+                word_count=fake.random_int(min=10, max=100),
+                tokens=fake.random_int(min=5, max=50),
+                keywords=[fake.word() for _ in range(3)],
+                index_node_id=f"node_{fake.uuid4()}",
+                index_node_hash=fake.sha256(),
+                hit_count=0,
+                enabled=True,
+                status=SegmentStatus.COMPLETED,
+                created_by=account.id,
+                updated_by=account.id,
+            )
 
             db_session_with_containers.add(segment)
             segments.append(segment)
@@ -218,7 +236,9 @@ class TestDeleteSegmentFromIndexTask:
         return segments
 
     @patch("tasks.delete_segment_from_index_task.IndexProcessorFactory", autospec=True)
-    def test_delete_segment_from_index_task_success(self, mock_index_processor_factory, db_session_with_containers):
+    def test_delete_segment_from_index_task_success(
+        self, mock_index_processor_factory, db_session_with_containers: Session
+    ):
         """
         Test successful segment deletion from index with comprehensive verification.
 
@@ -267,7 +287,7 @@ class TestDeleteSegmentFromIndexTask:
         assert call_args[1]["with_keywords"] is True
         assert call_args[1]["delete_child_chunks"] is True
 
-    def test_delete_segment_from_index_task_dataset_not_found(self, db_session_with_containers):
+    def test_delete_segment_from_index_task_dataset_not_found(self, db_session_with_containers: Session):
         """
         Test task behavior when dataset is not found.
 
@@ -288,7 +308,7 @@ class TestDeleteSegmentFromIndexTask:
         # Verify the task completed without exceptions
         assert result is None  # Task should return None when dataset not found
 
-    def test_delete_segment_from_index_task_document_not_found(self, db_session_with_containers):
+    def test_delete_segment_from_index_task_document_not_found(self, db_session_with_containers: Session):
         """
         Test task behavior when document is not found.
 
@@ -314,7 +334,7 @@ class TestDeleteSegmentFromIndexTask:
         # Verify the task completed without exceptions
         assert result is None  # Task should return None when document not found
 
-    def test_delete_segment_from_index_task_document_disabled(self, db_session_with_containers):
+    def test_delete_segment_from_index_task_document_disabled(self, db_session_with_containers: Session):
         """
         Test task behavior when document is disabled.
 
@@ -342,7 +362,7 @@ class TestDeleteSegmentFromIndexTask:
         # Verify the task completed without exceptions
         assert result is None  # Task should return None when document is disabled
 
-    def test_delete_segment_from_index_task_document_archived(self, db_session_with_containers):
+    def test_delete_segment_from_index_task_document_archived(self, db_session_with_containers: Session):
         """
         Test task behavior when document is archived.
 
@@ -370,7 +390,7 @@ class TestDeleteSegmentFromIndexTask:
         # Verify the task completed without exceptions
         assert result is None  # Task should return None when document is archived
 
-    def test_delete_segment_from_index_task_document_not_completed(self, db_session_with_containers):
+    def test_delete_segment_from_index_task_document_not_completed(self, db_session_with_containers: Session):
         """
         Test task behavior when document indexing is not completed.
 
diff --git a/api/tests/test_containers_integration_tests/tasks/test_disable_segment_from_index_task.py b/api/tests/test_containers_integration_tests/tasks/test_disable_segment_from_index_task.py
index 5bdf7d1389..34e2ce4e80 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_disable_segment_from_index_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_disable_segment_from_index_task.py
@@ -159,7 +159,7 @@ class TestDisableSegmentFromIndexTask:
         dataset: Dataset,
         tenant: Tenant,
         account: Account,
-        status: str = "completed",
+        status: SegmentStatus = SegmentStatus.COMPLETED,
         enabled: bool = True,
     ) -> DocumentSegment:
         """
diff --git a/api/tests/test_containers_integration_tests/tasks/test_disable_segments_from_index_task.py b/api/tests/test_containers_integration_tests/tasks/test_disable_segments_from_index_task.py
index 6e03bd9351..cb5fb5483c 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_disable_segments_from_index_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_disable_segments_from_index_task.py
@@ -7,13 +7,14 @@ The task is responsible for removing document segments from the search index whe
 """
 
 from unittest.mock import MagicMock, patch
+from uuid import uuid4
 
 from faker import Faker
 from sqlalchemy import select
 from sqlalchemy.orm import Session
 
 from core.rag.index_processor.constant.index_type import IndexStructureType, IndexTechniqueType
-from models import Account, Dataset, DocumentSegment
+from models import Account, AccountStatus, Dataset, DocumentSegment, TenantAccountRole, TenantStatus
 from models import Document as DatasetDocument
 from models.dataset import DatasetProcessRule
 from models.enums import DataSourceType, DocumentCreatedFrom, ProcessRuleMode, SegmentStatus
@@ -35,7 +36,7 @@ class TestDisableSegmentsFromIndexTask:
     and realistic testing environment with actual database interactions.
     """
 
-    def _create_test_account(self, db_session_with_containers: Session, fake=None):
+    def _create_test_account(self, db_session_with_containers: Session, fake: Faker | None = None):
         """
         Helper method to create a test account with realistic data.
 
@@ -51,24 +52,23 @@ class TestDisableSegmentsFromIndexTask:
             email=fake.email(),
             name=fake.name(),
             avatar=fake.url(),
-            status="active",
+            status=AccountStatus.ACTIVE,
             interface_language="en-US",
         )
-        account.id = fake.uuid4()
         # monkey-patch attributes for test setup
+        account.updated_at = fake.date_time_this_year()
+        account.created_at = fake.date_time_this_year()
+        account.role = TenantAccountRole.OWNER
+        account.id = fake.uuid4()
         account.tenant_id = fake.uuid4()
         account.type = "normal"
-        account.role = "owner"
-        account.created_at = fake.date_time_this_year()
-        account.updated_at = account.created_at
-
         # Create a tenant for the account
         from models.account import Tenant
 
         tenant = Tenant(
             name=f"Test Tenant {fake.company()}",
             plan="basic",
-            status="normal",
+            status=TenantStatus.NORMAL,
         )
         tenant.id = account.tenant_id
         tenant.created_at = fake.date_time_this_year()
@@ -83,7 +83,7 @@ class TestDisableSegmentsFromIndexTask:
 
         return account
 
-    def _create_test_dataset(self, db_session_with_containers: Session, account, fake=None):
+    def _create_test_dataset(self, db_session_with_containers: Session, account: Account, fake: Faker | None = None):
         """
         Helper method to create a test dataset with realistic data.
 
@@ -117,7 +117,9 @@ class TestDisableSegmentsFromIndexTask:
 
         return dataset
 
-    def _create_test_document(self, db_session_with_containers: Session, dataset, account, fake=None):
+    def _create_test_document(
+        self, db_session_with_containers: Session, dataset: Dataset, account: Account, fake: Faker | None = None
+    ):
         """
         Helper method to create a test document with realistic data.
 
@@ -163,7 +165,7 @@ class TestDisableSegmentsFromIndexTask:
         return document
 
     def _create_test_segments(
-        self, db_session_with_containers: Session, document, dataset, account, count=3, fake=None
+        self, db_session_with_containers: Session, document, dataset: Dataset, account: Account, count=3, fake=None
     ):
         """
         Helper method to create test document segments with realistic data.
@@ -183,30 +185,31 @@ class TestDisableSegmentsFromIndexTask:
         segments = []
 
         for i in range(count):
-            segment = DocumentSegment()
-            segment.id = fake.uuid4()
-            segment.tenant_id = dataset.tenant_id
-            segment.dataset_id = dataset.id
-            segment.document_id = document.id
-            segment.position = i + 1
-            segment.content = f"Test segment content {i + 1}: {fake.text(max_nb_chars=200)}"
-            segment.answer = f"Test answer {i + 1}" if i % 2 == 0 else None
-            segment.word_count = fake.random_int(min=10, max=100)
-            segment.tokens = fake.random_int(min=5, max=50)
-            segment.keywords = [fake.word() for _ in range(3)]
-            segment.index_node_id = f"node_{segment.id}"
-            segment.index_node_hash = fake.sha256()
-            segment.hit_count = 0
-            segment.enabled = True
-            segment.disabled_at = None
-            segment.disabled_by = None
-            segment.status = SegmentStatus.COMPLETED
-            segment.created_by = account.id
-            segment.updated_by = account.id
-            segment.indexing_at = fake.date_time_this_year()
-            segment.completed_at = fake.date_time_this_year()
-            segment.error = None
-            segment.stopped_at = None
+            id = fake.uuid4()
+            segment = DocumentSegment(
+                tenant_id=dataset.tenant_id,
+                dataset_id=dataset.id,
+                document_id=document.id,
+                position=i + 1,
+                content=f"Test segment content {i + 1}: {fake.text(max_nb_chars=200)}",
+                answer=f"Test answer {i + 1}" if i % 2 == 0 else None,
+                word_count=fake.random_int(min=10, max=100),
+                tokens=fake.random_int(min=5, max=50),
+                keywords=[fake.word() for _ in range(3)],
+                index_node_id=f"node_{id}",
+                index_node_hash=fake.sha256(),
+                hit_count=0,
+                enabled=True,
+                disabled_at=None,
+                disabled_by=None,
+                status=SegmentStatus.COMPLETED,
+                created_by=account.id,
+                updated_by=account.id,
+                indexing_at=fake.date_time_this_year(),
+                completed_at=fake.date_time_this_year(),
+                error=None,
+                stopped_at=None,
+            )
 
             segments.append(segment)
 
@@ -216,7 +219,9 @@ class TestDisableSegmentsFromIndexTask:
 
         return segments
 
-    def _create_dataset_process_rule(self, db_session_with_containers: Session, dataset, fake=None):
+    def _create_dataset_process_rule(
+        self, db_session_with_containers: Session, dataset: Dataset, fake: Faker | None = None
+    ):
         """
         Helper method to create a dataset process rule.
 
@@ -229,21 +234,19 @@ class TestDisableSegmentsFromIndexTask:
             DatasetProcessRule: Created process rule instance
         """
         fake = fake or Faker()
-        process_rule = DatasetProcessRule()
-        process_rule.id = fake.uuid4()
-        process_rule.tenant_id = dataset.tenant_id
-        process_rule.dataset_id = dataset.id
-        process_rule.mode = ProcessRuleMode.AUTOMATIC
-        process_rule.rules = (
-            "{"
-            '"mode": "automatic", '
-            '"rules": {'
-            '"pre_processing_rules": [], "segmentation": '
-            '{"separator": "\\n\\n", "max_tokens": 1000, "chunk_overlap": 50}}'
-            "}"
+        process_rule = DatasetProcessRule(
+            dataset_id=dataset.id,
+            mode=ProcessRuleMode.AUTOMATIC,
+            rules=(
+                "{"
+                '"mode": "automatic", '
+                '"rules": {'
+                '"pre_processing_rules": [], "segmentation": '
+                '{"separator": "\\n\\n", "max_tokens": 1000, "chunk_overlap": 50}}'
+                "}"
+            ),
+            created_by=str(uuid4()),
         )
-        process_rule.created_by = dataset.created_by
-        process_rule.updated_by = dataset.updated_by
 
         db_session_with_containers.add(process_rule)
         db_session_with_containers.commit()
diff --git a/api/tests/test_containers_integration_tests/tasks/test_document_indexing_sync_task.py b/api/tests/test_containers_integration_tests/tasks/test_document_indexing_sync_task.py
index b6e7e6e5c9..77cd259833 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_document_indexing_sync_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_document_indexing_sync_task.py
@@ -13,6 +13,7 @@ from uuid import uuid4
 
 import pytest
 from sqlalchemy import delete, func, select, update
+from sqlalchemy.orm import Session
 
 from core.indexing_runner import DocumentIsPausedError, IndexingRunner
 from core.rag.index_processor.constant.index_type import IndexStructureType, IndexTechniqueType
@@ -162,7 +163,7 @@ class TestDocumentIndexingSyncTask:
                 "indexing_runner": indexing_runner,
             }
 
-    def _create_notion_sync_context(self, db_session_with_containers, *, data_source_info: dict | None = None):
+    def _create_notion_sync_context(self, db_session_with_containers: Session, *, data_source_info: dict | None = None):
         account, tenant = DocumentIndexingSyncTaskTestDataFactory.create_account_with_tenant(db_session_with_containers)
         dataset = DocumentIndexingSyncTaskTestDataFactory.create_dataset(
             db_session_with_containers,
@@ -206,7 +207,7 @@ class TestDocumentIndexingSyncTask:
             "notion_info": notion_info,
         }
 
-    def test_document_not_found(self, db_session_with_containers, mock_external_dependencies):
+    def test_document_not_found(self, db_session_with_containers: Session, mock_external_dependencies):
         """Test that task handles missing document gracefully."""
         # Arrange
         dataset_id = str(uuid4())
@@ -219,7 +220,7 @@ class TestDocumentIndexingSyncTask:
         mock_external_dependencies["datasource_service"].get_datasource_credentials.assert_not_called()
         mock_external_dependencies["indexing_runner"].run.assert_not_called()
 
-    def test_missing_notion_workspace_id(self, db_session_with_containers, mock_external_dependencies):
+    def test_missing_notion_workspace_id(self, db_session_with_containers: Session, mock_external_dependencies):
         """Test that task raises error when notion_workspace_id is missing."""
         # Arrange
         context = self._create_notion_sync_context(
@@ -235,7 +236,7 @@ class TestDocumentIndexingSyncTask:
         with pytest.raises(ValueError, match="no notion page found"):
             document_indexing_sync_task(context["dataset"].id, context["document"].id)
 
-    def test_missing_notion_page_id(self, db_session_with_containers, mock_external_dependencies):
+    def test_missing_notion_page_id(self, db_session_with_containers: Session, mock_external_dependencies):
         """Test that task raises error when notion_page_id is missing."""
         # Arrange
         context = self._create_notion_sync_context(
@@ -251,7 +252,7 @@ class TestDocumentIndexingSyncTask:
         with pytest.raises(ValueError, match="no notion page found"):
             document_indexing_sync_task(context["dataset"].id, context["document"].id)
 
-    def test_empty_data_source_info(self, db_session_with_containers, mock_external_dependencies):
+    def test_empty_data_source_info(self, db_session_with_containers: Session, mock_external_dependencies):
         """Test that task raises error when data_source_info is empty."""
         # Arrange
         context = self._create_notion_sync_context(db_session_with_containers, data_source_info=None)
@@ -264,7 +265,7 @@ class TestDocumentIndexingSyncTask:
         with pytest.raises(ValueError, match="no notion page found"):
             document_indexing_sync_task(context["dataset"].id, context["document"].id)
 
-    def test_credential_not_found(self, db_session_with_containers, mock_external_dependencies):
+    def test_credential_not_found(self, db_session_with_containers: Session, mock_external_dependencies):
         """Test that task sets document error state when credential is missing."""
         # Arrange
         context = self._create_notion_sync_context(db_session_with_containers)
@@ -284,7 +285,7 @@ class TestDocumentIndexingSyncTask:
         assert updated_document.stopped_at is not None
         mock_external_dependencies["indexing_runner"].run.assert_not_called()
 
-    def test_page_not_updated(self, db_session_with_containers, mock_external_dependencies):
+    def test_page_not_updated(self, db_session_with_containers: Session, mock_external_dependencies):
         """Test that task exits early when notion page is unchanged."""
         # Arrange
         context = self._create_notion_sync_context(db_session_with_containers)
@@ -310,7 +311,7 @@ class TestDocumentIndexingSyncTask:
         mock_external_dependencies["index_processor"].clean.assert_not_called()
         mock_external_dependencies["indexing_runner"].run.assert_not_called()
 
-    def test_successful_sync_when_page_updated(self, db_session_with_containers, mock_external_dependencies):
+    def test_successful_sync_when_page_updated(self, db_session_with_containers: Session, mock_external_dependencies):
         """Test full successful sync flow with SQL state updates and side effects."""
         # Arrange
         context = self._create_notion_sync_context(db_session_with_containers)
@@ -349,7 +350,7 @@ class TestDocumentIndexingSyncTask:
         assert len(run_documents) == 1
         assert getattr(run_documents[0], "id", None) == context["document"].id
 
-    def test_dataset_not_found_during_cleaning(self, db_session_with_containers, mock_external_dependencies):
+    def test_dataset_not_found_during_cleaning(self, db_session_with_containers: Session, mock_external_dependencies):
         """Test that task still updates document and reindexes if dataset vanishes before clean."""
         # Arrange
         context = self._create_notion_sync_context(db_session_with_containers)
@@ -376,7 +377,9 @@ class TestDocumentIndexingSyncTask:
         mock_external_dependencies["index_processor"].clean.assert_not_called()
         mock_external_dependencies["indexing_runner"].run.assert_called_once()
 
-    def test_cleaning_error_continues_to_indexing(self, db_session_with_containers, mock_external_dependencies):
+    def test_cleaning_error_continues_to_indexing(
+        self, db_session_with_containers: Session, mock_external_dependencies
+    ):
         """Test that indexing continues when index cleanup fails."""
         # Arrange
         context = self._create_notion_sync_context(db_session_with_containers)
@@ -400,7 +403,9 @@ class TestDocumentIndexingSyncTask:
         assert remaining_segments == 0
         mock_external_dependencies["indexing_runner"].run.assert_called_once()
 
-    def test_indexing_runner_document_paused_error(self, db_session_with_containers, mock_external_dependencies):
+    def test_indexing_runner_document_paused_error(
+        self, db_session_with_containers: Session, mock_external_dependencies
+    ):
         """Test that DocumentIsPausedError does not flip document into error state."""
         # Arrange
         context = self._create_notion_sync_context(db_session_with_containers)
@@ -418,7 +423,7 @@ class TestDocumentIndexingSyncTask:
         assert updated_document.indexing_status == IndexingStatus.PARSING
         assert updated_document.error is None
 
-    def test_indexing_runner_general_error(self, db_session_with_containers, mock_external_dependencies):
+    def test_indexing_runner_general_error(self, db_session_with_containers: Session, mock_external_dependencies):
         """Test that indexing errors are persisted to document state."""
         # Arrange
         context = self._create_notion_sync_context(db_session_with_containers)
diff --git a/api/tests/test_containers_integration_tests/tasks/test_document_indexing_task.py b/api/tests/test_containers_integration_tests/tasks/test_document_indexing_task.py
index cf1a8666f3..6c1454b6d8 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_document_indexing_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_document_indexing_task.py
@@ -3,11 +3,12 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 from faker import Faker
+from sqlalchemy.orm import Session
 
 from core.entities.document_task import DocumentTask
 from core.rag.index_processor.constant.index_type import IndexTechniqueType
 from enums.cloud_plan import CloudPlan
-from models import Account, Tenant, TenantAccountJoin, TenantAccountRole
+from models import Account, AccountStatus, Tenant, TenantAccountJoin, TenantAccountRole, TenantStatus
 from models.dataset import Dataset, Document
 from models.enums import DataSourceType, DocumentCreatedFrom, IndexingStatus
 from tasks.document_indexing_task import (
@@ -51,7 +52,7 @@ class TestDocumentIndexingTasks:
             }
 
     def _create_test_dataset_and_documents(
-        self, db_session_with_containers, mock_external_service_dependencies, document_count=3
+        self, db_session_with_containers: Session, mock_external_service_dependencies, document_count=3
     ):
         """
         Helper method to create a test dataset and documents for testing.
@@ -71,14 +72,14 @@ class TestDocumentIndexingTasks:
             email=fake.email(),
             name=fake.name(),
             interface_language="en-US",
-            status="active",
+            status=AccountStatus.ACTIVE,
         )
         db_session_with_containers.add(account)
         db_session_with_containers.commit()
 
         tenant = Tenant(
             name=fake.company(),
-            status="normal",
+            status=TenantStatus.NORMAL,
         )
         db_session_with_containers.add(tenant)
         db_session_with_containers.commit()
@@ -133,7 +134,7 @@ class TestDocumentIndexingTasks:
         return dataset, documents
 
     def _create_test_dataset_with_billing_features(
-        self, db_session_with_containers, mock_external_service_dependencies, billing_enabled=True
+        self, db_session_with_containers: Session, mock_external_service_dependencies, billing_enabled=True
     ):
         """
         Helper method to create a test dataset with billing features configured.
@@ -153,14 +154,14 @@ class TestDocumentIndexingTasks:
             email=fake.email(),
             name=fake.name(),
             interface_language="en-US",
-            status="active",
+            status=AccountStatus.ACTIVE,
         )
         db_session_with_containers.add(account)
         db_session_with_containers.commit()
 
         tenant = Tenant(
             name=fake.company(),
-            status="normal",
+            status=TenantStatus.NORMAL,
         )
         db_session_with_containers.add(tenant)
         db_session_with_containers.commit()
@@ -221,7 +222,9 @@ class TestDocumentIndexingTasks:
 
         return dataset, documents
 
-    def test_document_indexing_task_success(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_document_indexing_task_success(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test successful document indexing with multiple documents.
 
@@ -262,7 +265,7 @@ class TestDocumentIndexingTasks:
         assert len(processed_documents) == 3
 
     def test_document_indexing_task_dataset_not_found(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test handling of non-existent dataset.
@@ -286,7 +289,7 @@ class TestDocumentIndexingTasks:
         mock_external_service_dependencies["indexing_runner_instance"].run.assert_not_called()
 
     def test_document_indexing_task_document_not_found_in_dataset(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test handling when some documents don't exist in the dataset.
@@ -332,7 +335,7 @@ class TestDocumentIndexingTasks:
         assert len(processed_documents) == 2  # Only existing documents
 
     def test_document_indexing_task_indexing_runner_exception(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test handling of IndexingRunner exceptions.
@@ -373,7 +376,7 @@ class TestDocumentIndexingTasks:
             assert updated_document.processing_started_at is not None
 
     def test_document_indexing_task_mixed_document_states(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test processing documents with mixed initial states.
@@ -456,7 +459,7 @@ class TestDocumentIndexingTasks:
         assert len(processed_documents) == 4
 
     def test_document_indexing_task_billing_sandbox_plan_batch_limit(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test billing validation for sandbox plan batch upload limit.
@@ -518,7 +521,7 @@ class TestDocumentIndexingTasks:
         mock_external_service_dependencies["indexing_runner"].assert_not_called()
 
     def test_document_indexing_task_billing_disabled_success(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test successful processing when billing is disabled.
@@ -554,7 +557,7 @@ class TestDocumentIndexingTasks:
             assert updated_document.processing_started_at is not None
 
     def test_document_indexing_task_document_is_paused_error(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test handling of DocumentIsPausedError from IndexingRunner.
@@ -597,7 +600,9 @@ class TestDocumentIndexingTasks:
             assert updated_document.processing_started_at is not None
 
     # ==================== NEW TESTS FOR REFACTORED FUNCTIONS ====================
-    def test_old_document_indexing_task_success(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_old_document_indexing_task_success(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test document_indexing_task basic functionality.
 
@@ -619,7 +624,7 @@ class TestDocumentIndexingTasks:
         mock_external_service_dependencies["indexing_runner_instance"].run.assert_called_once()
 
     def test_normal_document_indexing_task_success(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test normal_document_indexing_task basic functionality.
@@ -643,7 +648,7 @@ class TestDocumentIndexingTasks:
         mock_external_service_dependencies["indexing_runner_instance"].run.assert_called_once()
 
     def test_priority_document_indexing_task_success(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test priority_document_indexing_task basic functionality.
@@ -667,7 +672,7 @@ class TestDocumentIndexingTasks:
         mock_external_service_dependencies["indexing_runner_instance"].run.assert_called_once()
 
     def test_document_indexing_with_tenant_queue_success(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test _document_indexing_with_tenant_queue function with no waiting tasks.
@@ -717,7 +722,7 @@ class TestDocumentIndexingTasks:
         mock_task_func.delay.assert_not_called()
 
     def test_document_indexing_with_tenant_queue_with_waiting_tasks(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test _document_indexing_with_tenant_queue function with waiting tasks in queue using real Redis.
@@ -776,7 +781,7 @@ class TestDocumentIndexingTasks:
         assert len(remaining_tasks) == 1
 
     def test_document_indexing_with_tenant_queue_error_handling(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test error handling in _document_indexing_with_tenant_queue using real Redis.
@@ -848,7 +853,7 @@ class TestDocumentIndexingTasks:
         assert len(remaining_tasks) == 0
 
     def test_document_indexing_with_tenant_queue_tenant_isolation(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test tenant isolation in _document_indexing_with_tenant_queue using real Redis.
diff --git a/api/tests/test_containers_integration_tests/tasks/test_document_indexing_update_task.py b/api/tests/test_containers_integration_tests/tasks/test_document_indexing_update_task.py
index a9a8c0f30c..208fc1aa1d 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_document_indexing_update_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_document_indexing_update_task.py
@@ -3,9 +3,10 @@ from unittest.mock import MagicMock, patch
 import pytest
 from faker import Faker
 from sqlalchemy import func, select
+from sqlalchemy.orm import Session
 
 from core.rag.index_processor.constant.index_type import IndexStructureType, IndexTechniqueType
-from models import Account, Tenant, TenantAccountJoin, TenantAccountRole
+from models import Account, AccountStatus, Tenant, TenantAccountJoin, TenantAccountRole, TenantStatus
 from models.dataset import Dataset, Document, DocumentSegment
 from models.enums import DataSourceType, DocumentCreatedFrom, IndexingStatus, SegmentStatus
 from tasks.document_indexing_update_task import document_indexing_update_task
@@ -33,7 +34,7 @@ class TestDocumentIndexingUpdateTask:
                 "runner_instance": runner_instance,
             }
 
-    def _create_dataset_document_with_segments(self, db_session_with_containers, *, segment_count: int = 2):
+    def _create_dataset_document_with_segments(self, db_session_with_containers: Session, *, segment_count: int = 2):
         fake = Faker()
 
         # Account and tenant
@@ -41,12 +42,12 @@ class TestDocumentIndexingUpdateTask:
             email=fake.email(),
             name=fake.name(),
             interface_language="en-US",
-            status="active",
+            status=AccountStatus.ACTIVE,
         )
         db_session_with_containers.add(account)
         db_session_with_containers.commit()
 
-        tenant = Tenant(name=fake.company(), status="normal")
+        tenant = Tenant(name=fake.company(), status=TenantStatus.NORMAL)
         db_session_with_containers.add(tenant)
         db_session_with_containers.commit()
 
@@ -114,7 +115,7 @@ class TestDocumentIndexingUpdateTask:
 
         return dataset, document, node_ids
 
-    def test_cleans_segments_and_reindexes(self, db_session_with_containers, mock_external_dependencies):
+    def test_cleans_segments_and_reindexes(self, db_session_with_containers: Session, mock_external_dependencies):
         dataset, document, node_ids = self._create_dataset_document_with_segments(db_session_with_containers)
 
         # Act
@@ -153,7 +154,9 @@ class TestDocumentIndexingUpdateTask:
         first = run_docs[0]
         assert getattr(first, "id", None) == document.id
 
-    def test_clean_error_is_logged_and_indexing_continues(self, db_session_with_containers, mock_external_dependencies):
+    def test_clean_error_is_logged_and_indexing_continues(
+        self, db_session_with_containers: Session, mock_external_dependencies
+    ):
         dataset, document, node_ids = self._create_dataset_document_with_segments(db_session_with_containers)
 
         # Force clean to raise; task should continue to indexing
@@ -173,7 +176,7 @@ class TestDocumentIndexingUpdateTask:
         )
         assert remaining > 0
 
-    def test_document_not_found_noop(self, db_session_with_containers, mock_external_dependencies):
+    def test_document_not_found_noop(self, db_session_with_containers: Session, mock_external_dependencies):
         fake = Faker()
         # Act with non-existent document id
         document_indexing_update_task(dataset_id=fake.uuid4(), document_id=fake.uuid4())
diff --git a/api/tests/test_containers_integration_tests/tasks/test_duplicate_document_indexing_task.py b/api/tests/test_containers_integration_tests/tasks/test_duplicate_document_indexing_task.py
index 39c58987fd..e1c7e3e09a 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_duplicate_document_indexing_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_duplicate_document_indexing_task.py
@@ -3,6 +3,7 @@ from unittest.mock import MagicMock, patch
 import pytest
 from faker import Faker
 from sqlalchemy import select
+from sqlalchemy.orm import Session
 
 from core.indexing_runner import DocumentIsPausedError
 from core.rag.index_processor.constant.index_type import IndexStructureType, IndexTechniqueType
@@ -62,7 +63,7 @@ class TestDuplicateDocumentIndexingTasks:
             }
 
     def _create_test_dataset_and_documents(
-        self, db_session_with_containers, mock_external_service_dependencies, document_count=3
+        self, db_session_with_containers: Session, mock_external_service_dependencies, document_count=3
     ):
         """
         Helper method to create a test dataset and documents for testing.
@@ -145,7 +146,11 @@ class TestDuplicateDocumentIndexingTasks:
         return dataset, documents
 
     def _create_test_dataset_with_segments(
-        self, db_session_with_containers, mock_external_service_dependencies, document_count=3, segments_per_doc=2
+        self,
+        db_session_with_containers: Session,
+        mock_external_service_dependencies,
+        document_count=3,
+        segments_per_doc=2,
     ):
         """
         Helper method to create a test dataset with documents and segments.
@@ -170,7 +175,6 @@ class TestDuplicateDocumentIndexingTasks:
         for document in documents:
             for i in range(segments_per_doc):
                 segment = DocumentSegment(
-                    id=fake.uuid4(),
                     tenant_id=dataset.tenant_id,
                     dataset_id=dataset.id,
                     document_id=document.id,
@@ -197,7 +201,7 @@ class TestDuplicateDocumentIndexingTasks:
         return dataset, documents, segments
 
     def _create_test_dataset_with_billing_features(
-        self, db_session_with_containers, mock_external_service_dependencies, billing_enabled=True
+        self, db_session_with_containers: Session, mock_external_service_dependencies, billing_enabled=True
     ):
         """
         Helper method to create a test dataset with billing features configured.
@@ -287,7 +291,7 @@ class TestDuplicateDocumentIndexingTasks:
         return dataset, documents
 
     def _test_duplicate_document_indexing_task_success(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test successful duplicate document indexing with multiple documents.
@@ -329,7 +333,7 @@ class TestDuplicateDocumentIndexingTasks:
         assert len(processed_documents) == 3
 
     def _test_duplicate_document_indexing_task_with_segment_cleanup(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test duplicate document indexing with existing segments that need cleanup.
@@ -379,7 +383,7 @@ class TestDuplicateDocumentIndexingTasks:
         mock_external_service_dependencies["indexing_runner_instance"].run.assert_called_once()
 
     def _test_duplicate_document_indexing_task_dataset_not_found(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test handling of non-existent dataset.
@@ -404,7 +408,7 @@ class TestDuplicateDocumentIndexingTasks:
         mock_external_service_dependencies["index_processor"].clean.assert_not_called()
 
     def test_duplicate_document_indexing_task_document_not_found_in_dataset(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test handling when some documents don't exist in the dataset.
@@ -450,7 +454,7 @@ class TestDuplicateDocumentIndexingTasks:
         assert len(processed_documents) == 2  # Only existing documents
 
     def _test_duplicate_document_indexing_task_indexing_runner_exception(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test handling of IndexingRunner exceptions.
@@ -491,7 +495,7 @@ class TestDuplicateDocumentIndexingTasks:
             assert updated_document.processing_started_at is not None
 
     def _test_duplicate_document_indexing_task_billing_sandbox_plan_batch_limit(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test billing validation for sandbox plan batch upload limit.
@@ -554,7 +558,7 @@ class TestDuplicateDocumentIndexingTasks:
         mock_external_service_dependencies["indexing_runner_instance"].run.assert_not_called()
 
     def _test_duplicate_document_indexing_task_billing_vector_space_limit_exceeded(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test billing validation for vector space limit.
@@ -596,7 +600,7 @@ class TestDuplicateDocumentIndexingTasks:
         mock_external_service_dependencies["indexing_runner_instance"].run.assert_not_called()
 
     def test_duplicate_document_indexing_task_with_empty_document_list(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test handling of empty document list.
@@ -622,7 +626,7 @@ class TestDuplicateDocumentIndexingTasks:
         mock_external_service_dependencies["indexing_runner_instance"].run.assert_called_once_with([])
 
     def test_deprecated_duplicate_document_indexing_task_delegates_to_core(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test that deprecated duplicate_document_indexing_task delegates to core function.
@@ -655,7 +659,7 @@ class TestDuplicateDocumentIndexingTasks:
 
     @patch("tasks.duplicate_document_indexing_task.TenantIsolatedTaskQueue", autospec=True)
     def test_normal_duplicate_document_indexing_task_with_tenant_queue(
-        self, mock_queue_class, db_session_with_containers, mock_external_service_dependencies
+        self, mock_queue_class, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test normal_duplicate_document_indexing_task with tenant isolation queue.
@@ -698,7 +702,7 @@ class TestDuplicateDocumentIndexingTasks:
 
     @patch("tasks.duplicate_document_indexing_task.TenantIsolatedTaskQueue", autospec=True)
     def test_priority_duplicate_document_indexing_task_with_tenant_queue(
-        self, mock_queue_class, db_session_with_containers, mock_external_service_dependencies
+        self, mock_queue_class, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test priority_duplicate_document_indexing_task with tenant isolation queue.
@@ -742,7 +746,7 @@ class TestDuplicateDocumentIndexingTasks:
 
     @patch("tasks.duplicate_document_indexing_task.TenantIsolatedTaskQueue", autospec=True)
     def test_tenant_queue_wrapper_processes_next_tasks(
-        self, mock_queue_class, db_session_with_containers, mock_external_service_dependencies
+        self, mock_queue_class, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test tenant queue wrapper processes next queued tasks.
@@ -789,7 +793,7 @@ class TestDuplicateDocumentIndexingTasks:
         mock_queue.delete_task_key.assert_not_called()
 
     def test_successful_duplicate_document_indexing(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """Test successful duplicate document indexing flow."""
         self._test_duplicate_document_indexing_task_success(
@@ -797,7 +801,7 @@ class TestDuplicateDocumentIndexingTasks:
         )
 
     def test_duplicate_document_indexing_dataset_not_found(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """Test duplicate document indexing when dataset is not found."""
         self._test_duplicate_document_indexing_task_dataset_not_found(
@@ -805,7 +809,7 @@ class TestDuplicateDocumentIndexingTasks:
         )
 
     def test_duplicate_document_indexing_with_billing_enabled_sandbox_plan(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """Test duplicate document indexing with billing enabled and sandbox plan."""
         self._test_duplicate_document_indexing_task_billing_sandbox_plan_batch_limit(
@@ -813,7 +817,7 @@ class TestDuplicateDocumentIndexingTasks:
         )
 
     def test_duplicate_document_indexing_with_billing_limit_exceeded(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """Test duplicate document indexing when billing limit is exceeded."""
         self._test_duplicate_document_indexing_task_billing_vector_space_limit_exceeded(
@@ -821,7 +825,7 @@ class TestDuplicateDocumentIndexingTasks:
         )
 
     def test_duplicate_document_indexing_runner_error(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """Test duplicate document indexing when IndexingRunner raises an error."""
         self._test_duplicate_document_indexing_task_indexing_runner_exception(
@@ -829,7 +833,7 @@ class TestDuplicateDocumentIndexingTasks:
         )
 
     def _test_duplicate_document_indexing_task_document_is_paused(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """Test duplicate document indexing when document is paused."""
         # Arrange
@@ -860,7 +864,7 @@ class TestDuplicateDocumentIndexingTasks:
         mock_external_service_dependencies["indexing_runner_instance"].run.assert_called_once()
 
     def test_duplicate_document_indexing_document_is_paused(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """Test duplicate document indexing when document is paused."""
         self._test_duplicate_document_indexing_task_document_is_paused(
@@ -868,7 +872,7 @@ class TestDuplicateDocumentIndexingTasks:
         )
 
     def test_duplicate_document_indexing_cleans_old_segments(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """Test that duplicate document indexing cleans old segments."""
         self._test_duplicate_document_indexing_task_with_segment_cleanup(
diff --git a/api/tests/test_containers_integration_tests/tasks/test_enable_segments_to_index_task.py b/api/tests/test_containers_integration_tests/tasks/test_enable_segments_to_index_task.py
index e2f35067e3..6d3b90d41c 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_enable_segments_to_index_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_enable_segments_to_index_task.py
@@ -139,7 +139,6 @@ class TestEnableSegmentsToIndexTask:
         for i in range(count):
             text = fake.text(max_nb_chars=200)
             segment = DocumentSegment(
-                id=fake.uuid4(),
                 tenant_id=document.tenant_id,
                 dataset_id=dataset.id,
                 document_id=document.id,
diff --git a/api/tests/test_containers_integration_tests/tasks/test_mail_account_deletion_task.py b/api/tests/test_containers_integration_tests/tasks/test_mail_account_deletion_task.py
index ff72232d12..c4895839c9 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_mail_account_deletion_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_mail_account_deletion_task.py
@@ -5,6 +5,7 @@ from faker import Faker
 from sqlalchemy.orm import Session
 
 from libs.email_i18n import EmailType
+from models import TenantStatus
 from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
 from tasks.mail_account_deletion_task import send_account_deletion_verification_code, send_deletion_success_task
 
@@ -55,7 +56,7 @@ class TestMailAccountDeletionTask:
         # Create tenant
         tenant = Tenant(
             name=fake.company(),
-            status="normal",
+            status=TenantStatus.NORMAL,
         )
         db_session_with_containers.add(tenant)
         db_session_with_containers.commit()
diff --git a/api/tests/test_containers_integration_tests/tasks/test_mail_change_mail_task.py b/api/tests/test_containers_integration_tests/tasks/test_mail_change_mail_task.py
index 177af266fb..a697878bb6 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_mail_change_mail_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_mail_change_mail_task.py
@@ -2,6 +2,7 @@ from unittest.mock import patch
 
 import pytest
 from faker import Faker
+from sqlalchemy.orm import Session
 
 from libs.email_i18n import EmailType
 from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
@@ -29,7 +30,7 @@ class TestMailChangeMailTask:
                 "get_email_i18n_service": mock_get_email_i18n_service,
             }
 
-    def _create_test_account(self, db_session_with_containers):
+    def _create_test_account(self, db_session_with_containers: Session):
         """
         Helper method to create a test account for testing.
 
@@ -72,7 +73,7 @@ class TestMailChangeMailTask:
         return account
 
     def test_send_change_mail_task_success_old_email_phase(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test successful change email task execution for old_email phase.
@@ -103,7 +104,7 @@ class TestMailChangeMailTask:
         )
 
     def test_send_change_mail_task_success_new_email_phase(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test successful change email task execution for new_email phase.
@@ -134,7 +135,7 @@ class TestMailChangeMailTask:
         )
 
     def test_send_change_mail_task_mail_not_initialized(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test change email task when mail service is not initialized.
@@ -159,7 +160,7 @@ class TestMailChangeMailTask:
         mock_external_service_dependencies["email_i18n_service"].send_change_email.assert_not_called()
 
     def test_send_change_mail_task_email_service_exception(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test change email task when email service raises an exception.
@@ -191,7 +192,7 @@ class TestMailChangeMailTask:
         )
 
     def test_send_change_mail_completed_notification_task_success(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test successful change email completed notification task execution.
@@ -224,7 +225,7 @@ class TestMailChangeMailTask:
         )
 
     def test_send_change_mail_completed_notification_task_mail_not_initialized(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test change email completed notification task when mail service is not initialized.
@@ -247,7 +248,7 @@ class TestMailChangeMailTask:
         mock_external_service_dependencies["email_i18n_service"].send_email.assert_not_called()
 
     def test_send_change_mail_completed_notification_task_email_service_exception(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test change email completed notification task when email service raises an exception.
diff --git a/api/tests/test_containers_integration_tests/tasks/test_mail_email_code_login_task.py b/api/tests/test_containers_integration_tests/tasks/test_mail_email_code_login_task.py
index 8343711998..0eec166fe2 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_mail_email_code_login_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_mail_email_code_login_task.py
@@ -15,8 +15,10 @@ from unittest.mock import MagicMock, patch
 import pytest
 from faker import Faker
 from sqlalchemy import delete
+from sqlalchemy.orm import Session
 
 from libs.email_i18n import EmailType
+from models import AccountStatus, TenantStatus
 from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
 from tasks.mail_email_code_login import send_email_code_login_mail_task
 
@@ -37,7 +39,7 @@ class TestSendEmailCodeLoginMailTask:
     """
 
     @pytest.fixture(autouse=True)
-    def cleanup_database(self, db_session_with_containers):
+    def cleanup_database(self, db_session_with_containers: Session):
         """Clean up database before each test to ensure isolation."""
         from extensions.ext_redis import redis_client
 
@@ -71,7 +73,7 @@ class TestSendEmailCodeLoginMailTask:
                 "email_service_instance": mock_email_service_instance,
             }
 
-    def _create_test_account(self, db_session_with_containers, fake=None):
+    def _create_test_account(self, db_session_with_containers: Session, fake: Faker | None = None):
         """
         Helper method to create a test account for testing.
 
@@ -90,7 +92,7 @@ class TestSendEmailCodeLoginMailTask:
             email=fake.email(),
             name=fake.name(),
             interface_language="en-US",
-            status="active",
+            status=AccountStatus.ACTIVE,
         )
 
         db_session_with_containers.add(account)
@@ -98,7 +100,7 @@ class TestSendEmailCodeLoginMailTask:
 
         return account
 
-    def _create_test_tenant_and_account(self, db_session_with_containers, fake=None):
+    def _create_test_tenant_and_account(self, db_session_with_containers: Session, fake: Faker | None = None):
         """
         Helper method to create a test tenant and account for testing.
 
@@ -119,7 +121,7 @@ class TestSendEmailCodeLoginMailTask:
         tenant = Tenant(
             name=fake.company(),
             plan="basic",
-            status="normal",
+            status=TenantStatus.NORMAL,
         )
 
         db_session_with_containers.add(tenant)
@@ -138,7 +140,7 @@ class TestSendEmailCodeLoginMailTask:
         return account, tenant
 
     def test_send_email_code_login_mail_task_success_english(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test successful email code login mail sending in English.
@@ -182,7 +184,7 @@ class TestSendEmailCodeLoginMailTask:
         )
 
     def test_send_email_code_login_mail_task_success_chinese(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test successful email code login mail sending in Chinese.
@@ -221,7 +223,7 @@ class TestSendEmailCodeLoginMailTask:
         )
 
     def test_send_email_code_login_mail_task_success_multiple_languages(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test successful email code login mail sending with multiple languages.
@@ -261,7 +263,7 @@ class TestSendEmailCodeLoginMailTask:
             assert call_args[1]["template_context"]["code"] == test_codes[i]
 
     def test_send_email_code_login_mail_task_mail_not_initialized(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test email code login mail task when mail service is not initialized.
@@ -299,7 +301,7 @@ class TestSendEmailCodeLoginMailTask:
         mock_email_service_instance.send_email.assert_not_called()
 
     def test_send_email_code_login_mail_task_email_service_exception(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test email code login mail task when email service raises an exception.
@@ -346,7 +348,7 @@ class TestSendEmailCodeLoginMailTask:
         )
 
     def test_send_email_code_login_mail_task_invalid_parameters(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test email code login mail task with invalid parameters.
@@ -388,7 +390,7 @@ class TestSendEmailCodeLoginMailTask:
             mock_email_service_instance.send_email.assert_called_once()
 
     def test_send_email_code_login_mail_task_edge_cases(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test email code login mail task with edge cases and boundary conditions.
@@ -451,7 +453,7 @@ class TestSendEmailCodeLoginMailTask:
             )
 
     def test_send_email_code_login_mail_task_database_integration(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test email code login mail task with database integration.
@@ -497,7 +499,7 @@ class TestSendEmailCodeLoginMailTask:
         assert account.status == "active"
 
     def test_send_email_code_login_mail_task_redis_integration(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test email code login mail task with Redis integration.
@@ -541,7 +543,7 @@ class TestSendEmailCodeLoginMailTask:
         redis_client.delete(cache_key)
 
     def test_send_email_code_login_mail_task_error_handling_comprehensive(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test comprehensive error handling for email code login mail task.
diff --git a/api/tests/test_containers_integration_tests/tasks/test_mail_human_input_delivery_task.py b/api/tests/test_containers_integration_tests/tasks/test_mail_human_input_delivery_task.py
index 95a867dbb5..a452bee9f8 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_mail_human_input_delivery_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_mail_human_input_delivery_task.py
@@ -4,6 +4,7 @@ from unittest.mock import patch
 
 import pytest
 from sqlalchemy import delete
+from sqlalchemy.orm import Session
 
 from configs import dify_config
 from core.app.app_config.entities import WorkflowUIBasedAppConfig
@@ -30,7 +31,7 @@ from tasks.mail_human_input_delivery_task import dispatch_human_input_email_task
 
 
 @pytest.fixture(autouse=True)
-def cleanup_database(db_session_with_containers):
+def cleanup_database(db_session_with_containers: Session):
     db_session_with_containers.execute(delete(HumanInputFormRecipient))
     db_session_with_containers.execute(delete(HumanInputDelivery))
     db_session_with_containers.execute(delete(HumanInputForm))
@@ -42,7 +43,7 @@ def cleanup_database(db_session_with_containers):
     db_session_with_containers.commit()
 
 
-def _create_workspace_member(db_session_with_containers):
+def _create_workspace_member(db_session_with_containers: Session):
     account = Account(
         email="owner@example.com",
         name="Owner",
@@ -172,7 +173,9 @@ def _create_workflow_pause_state(
     db_session_with_containers.commit()
 
 
-def test_dispatch_human_input_email_task_integration(monkeypatch: pytest.MonkeyPatch, db_session_with_containers):
+def test_dispatch_human_input_email_task_integration(
+    monkeypatch: pytest.MonkeyPatch, db_session_with_containers: Session
+):
     tenant, account = _create_workspace_member(db_session_with_containers)
     workflow_run_id = str(uuid.uuid4())
     workflow_id = str(uuid.uuid4())
diff --git a/api/tests/test_containers_integration_tests/tasks/test_mail_inner_task.py b/api/tests/test_containers_integration_tests/tasks/test_mail_inner_task.py
index 1a20b6deec..f8e54ea9e6 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_mail_inner_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_mail_inner_task.py
@@ -2,6 +2,7 @@ from unittest.mock import patch
 
 import pytest
 from faker import Faker
+from sqlalchemy.orm import Session
 
 from tasks.mail_inner_task import send_inner_email_task
 
@@ -51,7 +52,7 @@ class TestMailInnerTask:
             },
         }
 
-    def test_send_inner_email_success(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_send_inner_email_success(self, db_session_with_containers: Session, mock_external_service_dependencies):
         """
         Test successful email sending with valid data.
 
@@ -90,7 +91,9 @@ class TestMailInnerTask:
             html_content="<html>Test email content</html>",
         )
 
-    def test_send_inner_email_single_recipient(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_send_inner_email_single_recipient(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test email sending with single recipient.
 
@@ -126,7 +129,9 @@ class TestMailInnerTask:
             html_content="<html>Test email content</html>",
         )
 
-    def test_send_inner_email_empty_substitutions(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_send_inner_email_empty_substitutions(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test email sending with empty substitutions.
 
@@ -163,7 +168,7 @@ class TestMailInnerTask:
         )
 
     def test_send_inner_email_mail_not_initialized(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test email sending when mail service is not initialized.
@@ -193,7 +198,7 @@ class TestMailInnerTask:
         mock_external_service_dependencies["email_service"].send_raw_email.assert_not_called()
 
     def test_send_inner_email_template_rendering_error(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test email sending when template rendering fails.
@@ -222,7 +227,9 @@ class TestMailInnerTask:
         # Verify no email service calls due to exception
         mock_external_service_dependencies["email_service"].send_raw_email.assert_not_called()
 
-    def test_send_inner_email_service_error(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_send_inner_email_service_error(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test email sending when email service fails.
 
diff --git a/api/tests/test_containers_integration_tests/tasks/test_mail_invite_member_task.py b/api/tests/test_containers_integration_tests/tasks/test_mail_invite_member_task.py
index d34828c4b1..c8c7a4d961 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_mail_invite_member_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_mail_invite_member_task.py
@@ -18,6 +18,7 @@ from unittest.mock import MagicMock, patch
 import pytest
 from faker import Faker
 from sqlalchemy import delete, select
+from sqlalchemy.orm import Session
 
 from extensions.ext_redis import redis_client
 from libs.email_i18n import EmailType
@@ -42,7 +43,7 @@ class TestMailInviteMemberTask:
     """
 
     @pytest.fixture(autouse=True)
-    def cleanup_database(self, db_session_with_containers):
+    def cleanup_database(self, db_session_with_containers: Session):
         """Clean up database before each test to ensure isolation."""
         # Clear all test data
         db_session_with_containers.execute(delete(TenantAccountJoin))
@@ -78,7 +79,7 @@ class TestMailInviteMemberTask:
                 "config": mock_config,
             }
 
-    def _create_test_account_and_tenant(self, db_session_with_containers):
+    def _create_test_account_and_tenant(self, db_session_with_containers: Session):
         """
         Helper method to create a test account and tenant for testing.
 
@@ -147,7 +148,7 @@ class TestMailInviteMemberTask:
         redis_client.setex(cache_key, 24 * 60 * 60, json.dumps(invitation_data))  # 24 hours
         return token
 
-    def _create_pending_account_for_invitation(self, db_session_with_containers, email, tenant):
+    def _create_pending_account_for_invitation(self, db_session_with_containers: Session, email, tenant):
         """
         Helper method to create a pending account for invitation testing.
 
@@ -185,7 +186,9 @@ class TestMailInviteMemberTask:
 
         return account
 
-    def test_send_invite_member_mail_success(self, db_session_with_containers, mock_external_service_dependencies):
+    def test_send_invite_member_mail_success(
+        self, db_session_with_containers: Session, mock_external_service_dependencies
+    ):
         """
         Test successful invitation email sending with all parameters.
 
@@ -231,7 +234,7 @@ class TestMailInviteMemberTask:
         assert template_context["url"] == f"https://console.dify.ai/activate?token={token}"
 
     def test_send_invite_member_mail_different_languages(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test invitation email sending with different language codes.
@@ -263,7 +266,7 @@ class TestMailInviteMemberTask:
             assert call_args[1]["language_code"] == language
 
     def test_send_invite_member_mail_mail_not_initialized(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test behavior when mail service is not initialized.
@@ -292,7 +295,7 @@ class TestMailInviteMemberTask:
         mock_email_service.send_email.assert_not_called()
 
     def test_send_invite_member_mail_email_service_exception(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test error handling when email service raises an exception.
@@ -322,7 +325,7 @@ class TestMailInviteMemberTask:
             assert "Send invite member mail to %s failed" in error_call
 
     def test_send_invite_member_mail_template_context_validation(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test template context contains all required fields for email rendering.
@@ -368,7 +371,7 @@ class TestMailInviteMemberTask:
         assert template_context["url"] == f"https://console.dify.ai/activate?token={token}"
 
     def test_send_invite_member_mail_integration_with_redis_token(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test integration with Redis token validation.
@@ -407,7 +410,7 @@ class TestMailInviteMemberTask:
         assert invitation_data["workspace_id"] == tenant.id
 
     def test_send_invite_member_mail_with_special_characters(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test email sending with special characters in names and workspace names.
@@ -449,7 +452,7 @@ class TestMailInviteMemberTask:
             assert template_context["workspace_name"] == workspace_name
 
     def test_send_invite_member_mail_real_database_integration(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test real database integration with actual invitation flow.
@@ -501,7 +504,7 @@ class TestMailInviteMemberTask:
         assert tenant_join.role == TenantAccountRole.NORMAL
 
     def test_send_invite_member_mail_token_lifecycle_management(
-        self, db_session_with_containers, mock_external_service_dependencies
+        self, db_session_with_containers: Session, mock_external_service_dependencies
     ):
         """
         Test token lifecycle management and validation.
diff --git a/api/tests/test_containers_integration_tests/tasks/test_mail_owner_transfer_task.py b/api/tests/test_containers_integration_tests/tasks/test_mail_owner_transfer_task.py
index e08b099480..176645a4ab 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_mail_owner_transfer_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_mail_owner_transfer_task.py
@@ -11,6 +11,7 @@ from unittest.mock import patch
 
 import pytest
 from faker import Faker
+from sqlalchemy.orm import Session
 
 from libs.email_i18n import EmailType
 from models.account import Account, Tenant, TenantAccountJoin, TenantAccountRole
@@ -44,7 +45,7 @@ class TestMailOwnerTransferTask:
                 "get_email_service": mock_get_email_service,
             }
 
-    def _create_test_account_and_tenant(self, db_session_with_containers):
+    def _create_test_account_and_tenant(self, db_session_with_containers: Session):
         """
         Helper method to create test account and tenant for testing.
 
@@ -86,7 +87,9 @@ class TestMailOwnerTransferTask:
 
         return account, tenant
 
-    def test_send_owner_transfer_confirm_task_success(self, db_session_with_containers, mock_mail_dependencies):
+    def test_send_owner_transfer_confirm_task_success(
+        self, db_session_with_containers: Session, mock_mail_dependencies
+    ):
         """
         Test successful owner transfer confirmation email sending.
 
@@ -127,7 +130,7 @@ class TestMailOwnerTransferTask:
         assert call_args[1]["template_context"]["WorkspaceName"] == test_workspace
 
     def test_send_owner_transfer_confirm_task_mail_not_initialized(
-        self, db_session_with_containers, mock_mail_dependencies
+        self, db_session_with_containers: Session, mock_mail_dependencies
     ):
         """
         Test owner transfer confirmation email when mail service is not initialized.
@@ -158,7 +161,7 @@ class TestMailOwnerTransferTask:
         mock_mail_dependencies["email_service"].send_email.assert_not_called()
 
     def test_send_owner_transfer_confirm_task_exception_handling(
-        self, db_session_with_containers, mock_mail_dependencies
+        self, db_session_with_containers: Session, mock_mail_dependencies
     ):
         """
         Test exception handling in owner transfer confirmation email.
@@ -192,7 +195,7 @@ class TestMailOwnerTransferTask:
         mock_mail_dependencies["email_service"].send_email.assert_called_once()
 
     def test_send_old_owner_transfer_notify_email_task_success(
-        self, db_session_with_containers, mock_mail_dependencies
+        self, db_session_with_containers: Session, mock_mail_dependencies
     ):
         """
         Test successful old owner transfer notification email sending.
@@ -234,7 +237,7 @@ class TestMailOwnerTransferTask:
         assert call_args[1]["template_context"]["NewOwnerEmail"] == test_new_owner_email
 
     def test_send_old_owner_transfer_notify_email_task_mail_not_initialized(
-        self, db_session_with_containers, mock_mail_dependencies
+        self, db_session_with_containers: Session, mock_mail_dependencies
     ):
         """
         Test old owner transfer notification email when mail service is not initialized.
@@ -265,7 +268,7 @@ class TestMailOwnerTransferTask:
         mock_mail_dependencies["email_service"].send_email.assert_not_called()
 
     def test_send_old_owner_transfer_notify_email_task_exception_handling(
-        self, db_session_with_containers, mock_mail_dependencies
+        self, db_session_with_containers: Session, mock_mail_dependencies
     ):
         """
         Test exception handling in old owner transfer notification email.
@@ -299,7 +302,7 @@ class TestMailOwnerTransferTask:
         mock_mail_dependencies["email_service"].send_email.assert_called_once()
 
     def test_send_new_owner_transfer_notify_email_task_success(
-        self, db_session_with_containers, mock_mail_dependencies
+        self, db_session_with_containers: Session, mock_mail_dependencies
     ):
         """
         Test successful new owner transfer notification email sending.
@@ -338,7 +341,7 @@ class TestMailOwnerTransferTask:
         assert call_args[1]["template_context"]["WorkspaceName"] == test_workspace
 
     def test_send_new_owner_transfer_notify_email_task_mail_not_initialized(
-        self, db_session_with_containers, mock_mail_dependencies
+        self, db_session_with_containers: Session, mock_mail_dependencies
     ):
         """
         Test new owner transfer notification email when mail service is not initialized.
@@ -367,7 +370,7 @@ class TestMailOwnerTransferTask:
         mock_mail_dependencies["email_service"].send_email.assert_not_called()
 
     def test_send_new_owner_transfer_notify_email_task_exception_handling(
-        self, db_session_with_containers, mock_mail_dependencies
+        self, db_session_with_containers: Session, mock_mail_dependencies
     ):
         """
         Test exception handling in new owner transfer notification email.
diff --git a/api/tests/test_containers_integration_tests/tasks/test_mail_register_task.py b/api/tests/test_containers_integration_tests/tasks/test_mail_register_task.py
index cced6f7780..071971f324 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_mail_register_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_mail_register_task.py
@@ -9,6 +9,7 @@ from unittest.mock import patch
 
 import pytest
 from faker import Faker
+from sqlalchemy.orm import Session
 
 from libs.email_i18n import EmailType
 from tasks.mail_register_task import send_email_register_mail_task, send_email_register_mail_task_when_account_exist
@@ -35,7 +36,7 @@ class TestMailRegisterTask:
                 "get_email_service": mock_get_email_service,
             }
 
-    def test_send_email_register_mail_task_success(self, db_session_with_containers, mock_mail_dependencies):
+    def test_send_email_register_mail_task_success(self, db_session_with_containers: Session, mock_mail_dependencies):
         """Test successful email registration mail sending."""
         fake = Faker()
         language = "en-US"
@@ -56,7 +57,7 @@ class TestMailRegisterTask:
         )
 
     def test_send_email_register_mail_task_mail_not_initialized(
-        self, db_session_with_containers, mock_mail_dependencies
+        self, db_session_with_containers: Session, mock_mail_dependencies
     ):
         """Test email registration task when mail service is not initialized."""
         mock_mail_dependencies["mail"].is_inited.return_value = False
@@ -66,7 +67,9 @@ class TestMailRegisterTask:
         mock_mail_dependencies["get_email_service"].assert_not_called()
         mock_mail_dependencies["email_service"].send_email.assert_not_called()
 
-    def test_send_email_register_mail_task_exception_handling(self, db_session_with_containers, mock_mail_dependencies):
+    def test_send_email_register_mail_task_exception_handling(
+        self, db_session_with_containers: Session, mock_mail_dependencies
+    ):
         """Test email registration task exception handling."""
         mock_mail_dependencies["email_service"].send_email.side_effect = Exception("Email service error")
 
@@ -79,7 +82,7 @@ class TestMailRegisterTask:
             mock_logger.exception.assert_called_once_with("Send email register mail to %s failed", to_email)
 
     def test_send_email_register_mail_task_when_account_exist_success(
-        self, db_session_with_containers, mock_mail_dependencies
+        self, db_session_with_containers: Session, mock_mail_dependencies
     ):
         """Test successful email registration mail sending when account exists."""
         fake = Faker()
@@ -105,7 +108,7 @@ class TestMailRegisterTask:
             )
 
     def test_send_email_register_mail_task_when_account_exist_mail_not_initialized(
-        self, db_session_with_containers, mock_mail_dependencies
+        self, db_session_with_containers: Session, mock_mail_dependencies
     ):
         """Test account exist email task when mail service is not initialized."""
         mock_mail_dependencies["mail"].is_inited.return_value = False
@@ -118,7 +121,7 @@ class TestMailRegisterTask:
         mock_mail_dependencies["email_service"].send_email.assert_not_called()
 
     def test_send_email_register_mail_task_when_account_exist_exception_handling(
-        self, db_session_with_containers, mock_mail_dependencies
+        self, db_session_with_containers: Session, mock_mail_dependencies
     ):
         """Test account exist email task exception handling."""
         mock_mail_dependencies["email_service"].send_email.side_effect = Exception("Email service error")
diff --git a/api/tests/test_containers_integration_tests/tasks/test_rag_pipeline_run_tasks.py b/api/tests/test_containers_integration_tests/tasks/test_rag_pipeline_run_tasks.py
index f01fcc1742..5eea985fdc 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_rag_pipeline_run_tasks.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_rag_pipeline_run_tasks.py
@@ -4,12 +4,13 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 from faker import Faker
+from flask import Flask
 from sqlalchemy.orm import Session
 
 from core.app.entities.app_invoke_entities import InvokeFrom, RagPipelineGenerateEntity
 from core.app.entities.rag_pipeline_invoke_entities import RagPipelineInvokeEntity
 from core.rag.pipeline.queue import TenantIsolatedTaskQueue
-from models import Account, Tenant, TenantAccountJoin, TenantAccountRole
+from models import Account, AccountStatus, Tenant, TenantAccountJoin, TenantAccountRole, TenantStatus
 from models.dataset import Pipeline
 from models.workflow import Workflow
 from tasks.rag_pipeline.priority_rag_pipeline_run_task import (
@@ -69,14 +70,14 @@ class TestRagPipelineRunTasks:
             email=fake.email(),
             name=fake.name(),
             interface_language="en-US",
-            status="active",
+            status=AccountStatus.ACTIVE,
         )
         db_session_with_containers.add(account)
         db_session_with_containers.commit()
 
         tenant = Tenant(
             name=fake.company(),
-            status="normal",
+            status=TenantStatus.NORMAL,
         )
         db_session_with_containers.add(tenant)
         db_session_with_containers.commit()
@@ -725,7 +726,7 @@ class TestRagPipelineRunTasks:
             assert queue1._task_key != queue2._task_key
 
     def test_run_single_rag_pipeline_task_success(
-        self, db_session_with_containers: Session, mock_pipeline_generator, flask_app_with_containers
+        self, db_session_with_containers: Session, mock_pipeline_generator, flask_app_with_containers: Flask
     ):
         """
         Test successful run_single_rag_pipeline_task execution.
@@ -760,7 +761,7 @@ class TestRagPipelineRunTasks:
         assert isinstance(call_kwargs["application_generate_entity"], RagPipelineGenerateEntity)
 
     def test_run_single_rag_pipeline_task_entity_validation_error(
-        self, db_session_with_containers: Session, mock_pipeline_generator, flask_app_with_containers
+        self, db_session_with_containers: Session, mock_pipeline_generator, flask_app_with_containers: Flask
     ):
         """
         Test run_single_rag_pipeline_task with invalid entity data.
@@ -805,7 +806,7 @@ class TestRagPipelineRunTasks:
         mock_pipeline_generator.assert_not_called()
 
     def test_run_single_rag_pipeline_task_database_entity_not_found(
-        self, db_session_with_containers: Session, mock_pipeline_generator, flask_app_with_containers
+        self, db_session_with_containers: Session, mock_pipeline_generator, flask_app_with_containers: Flask
     ):
         """
         Test run_single_rag_pipeline_task with non-existent database entities.
diff --git a/api/tests/test_containers_integration_tests/tasks/test_remove_app_and_related_data_task.py b/api/tests/test_containers_integration_tests/tasks/test_remove_app_and_related_data_task.py
index b43b622870..204f533978 100644
--- a/api/tests/test_containers_integration_tests/tasks/test_remove_app_and_related_data_task.py
+++ b/api/tests/test_containers_integration_tests/tasks/test_remove_app_and_related_data_task.py
@@ -3,6 +3,7 @@ from unittest.mock import ANY, call, patch
 
 import pytest
 from sqlalchemy import delete, func, select
+from sqlalchemy.orm import Session
 
 from core.db.session_factory import session_factory
 from extensions.storage.storage_type import StorageType
@@ -20,7 +21,7 @@ from tasks.remove_app_and_related_data_task import (
 
 
 @pytest.fixture(autouse=True)
-def cleanup_database(db_session_with_containers):
+def cleanup_database(db_session_with_containers: Session):
     db_session_with_containers.execute(delete(WorkflowDraftVariable))
     db_session_with_containers.execute(delete(WorkflowDraftVariableFile))
     db_session_with_containers.execute(delete(UploadFile))
@@ -29,7 +30,7 @@ def cleanup_database(db_session_with_containers):
     db_session_with_containers.commit()
 
 
-def _create_tenant_and_app(db_session_with_containers):
+def _create_tenant_and_app(db_session_with_containers: Session):
     tenant = Tenant(name=f"test_tenant_{uuid.uuid4()}")
     db_session_with_containers.add(tenant)
     db_session_with_containers.flush()
@@ -117,7 +118,7 @@ def _create_offload_data(db_session_with_containers, *, tenant_id: str, app_id:
 
 
 class TestDeleteDraftVariablesBatch:
-    def test_delete_draft_variables_batch_success(self, db_session_with_containers):
+    def test_delete_draft_variables_batch_success(self, db_session_with_containers: Session):
         """Test successful deletion of draft variables in batches."""
         _, app1 = _create_tenant_and_app(db_session_with_containers)
         _, app2 = _create_tenant_and_app(db_session_with_containers)
@@ -137,7 +138,7 @@ class TestDeleteDraftVariablesBatch:
         assert app1_remaining_count == 0
         assert app2_remaining_count == 100
 
-    def test_delete_draft_variables_batch_empty_result(self, db_session_with_containers):
+    def test_delete_draft_variables_batch_empty_result(self, db_session_with_containers: Session):
         """Test deletion when no draft variables exist for the app."""
         result = delete_draft_variables_batch(str(uuid.uuid4()), 1000)
 
@@ -176,7 +177,7 @@ class TestDeleteDraftVariableOffloadData:
     """Test the Offload data cleanup functionality."""
 
     @patch("extensions.ext_storage.storage")
-    def test_delete_draft_variable_offload_data_success(self, mock_storage, db_session_with_containers):
+    def test_delete_draft_variable_offload_data_success(self, mock_storage, db_session_with_containers: Session):
         """Test successful deletion of offload data."""
         tenant, app = _create_tenant_and_app(db_session_with_containers)
         offload_data = _create_offload_data(db_session_with_containers, tenant_id=tenant.id, app_id=app.id, count=3)
diff --git a/api/tests/test_containers_integration_tests/test_opendal_fs_default_root.py b/api/tests/test_containers_integration_tests/test_opendal_fs_default_root.py
index 34a1941c39..6365207661 100644
--- a/api/tests/test_containers_integration_tests/test_opendal_fs_default_root.py
+++ b/api/tests/test_containers_integration_tests/test_opendal_fs_default_root.py
@@ -1,12 +1,14 @@
 from pathlib import Path
 
+import pytest
+
 from extensions.storage.opendal_storage import OpenDALStorage
 
 
 class TestOpenDALFsDefaultRoot:
     """Test that OpenDALStorage with scheme='fs' works correctly when no root is provided."""
 
-    def test_fs_without_root_uses_default(self, tmp_path, monkeypatch):
+    def test_fs_without_root_uses_default(self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch):
         """When no root is specified, the default 'storage' should be used and passed to the Operator."""
         # Change to tmp_path so the default "storage" dir is created there
         monkeypatch.chdir(tmp_path)
@@ -25,7 +27,7 @@ class TestOpenDALFsDefaultRoot:
         # Cleanup
         storage.delete("test_default_root.txt")
 
-    def test_fs_with_explicit_root(self, tmp_path):
+    def test_fs_with_explicit_root(self, tmp_path: Path):
         """When root is explicitly provided, it should be used."""
         custom_root = str(tmp_path / "custom_storage")
         storage = OpenDALStorage(scheme="fs", root=custom_root)
@@ -38,7 +40,7 @@ class TestOpenDALFsDefaultRoot:
         # Cleanup
         storage.delete("test_explicit_root.txt")
 
-    def test_fs_with_env_var_root(self, tmp_path, monkeypatch):
+    def test_fs_with_env_var_root(self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch):
         """When OPENDAL_FS_ROOT env var is set, it should be picked up via _get_opendal_kwargs."""
         env_root = str(tmp_path / "env_storage")
         monkeypatch.setenv("OPENDAL_FS_ROOT", env_root)
diff --git a/api/tests/test_containers_integration_tests/test_workflow_pause_integration.py b/api/tests/test_containers_integration_tests/test_workflow_pause_integration.py
index b00d827e37..6402e7da2b 100644
--- a/api/tests/test_containers_integration_tests/test_workflow_pause_integration.py
+++ b/api/tests/test_containers_integration_tests/test_workflow_pause_integration.py
@@ -175,7 +175,7 @@ class TestWorkflowPauseIntegration:
     """Comprehensive integration tests for workflow pause functionality."""
 
     @pytest.fixture(autouse=True)
-    def setup_test_data(self, db_session_with_containers):
+    def setup_test_data(self, db_session_with_containers: Session):
         """Set up test data for each test method using TestContainers."""
         # Create test tenant and account
 
diff --git a/api/tests/test_containers_integration_tests/workflow/nodes/code_executor/test_code_javascript.py b/api/tests/test_containers_integration_tests/workflow/nodes/code_executor/test_code_javascript.py
index 19a41b6186..a5086b4c5d 100644
--- a/api/tests/test_containers_integration_tests/workflow/nodes/code_executor/test_code_javascript.py
+++ b/api/tests/test_containers_integration_tests/workflow/nodes/code_executor/test_code_javascript.py
@@ -1,12 +1,14 @@
 from textwrap import dedent
 
+from flask import Flask
+
 from .test_utils import CodeExecutorTestMixin
 
 
 class TestJavaScriptCodeExecutor(CodeExecutorTestMixin):
     """Test class for JavaScript code executor functionality."""
 
-    def test_javascript_plain(self, flask_app_with_containers):
+    def test_javascript_plain(self, flask_app_with_containers: Flask):
         """Test basic JavaScript code execution with console.log output"""
         CodeExecutor, CodeLanguage = self.code_executor_imports
 
@@ -14,7 +16,7 @@ class TestJavaScriptCodeExecutor(CodeExecutorTestMixin):
         result_message = CodeExecutor.execute_code(language=CodeLanguage.JAVASCRIPT, preload="", code=code)
         assert result_message == "Hello World\n"
 
-    def test_javascript_json(self, flask_app_with_containers):
+    def test_javascript_json(self, flask_app_with_containers: Flask):
         """Test JavaScript code execution with JSON output"""
         CodeExecutor, CodeLanguage = self.code_executor_imports
 
@@ -25,7 +27,7 @@ class TestJavaScriptCodeExecutor(CodeExecutorTestMixin):
         result = CodeExecutor.execute_code(language=CodeLanguage.JAVASCRIPT, preload="", code=code)
         assert result == '{"Hello":"World"}\n'
 
-    def test_javascript_with_code_template(self, flask_app_with_containers):
+    def test_javascript_with_code_template(self, flask_app_with_containers: Flask):
         """Test JavaScript workflow code template execution with inputs"""
         CodeExecutor, CodeLanguage = self.code_executor_imports
         JavascriptCodeProvider, _ = self.javascript_imports
@@ -37,7 +39,7 @@ class TestJavaScriptCodeExecutor(CodeExecutorTestMixin):
         )
         assert result == {"result": "HelloWorld"}
 
-    def test_javascript_get_runner_script(self, flask_app_with_containers):
+    def test_javascript_get_runner_script(self, flask_app_with_containers: Flask):
         """Test JavaScript template transformer runner script generation"""
         _, NodeJsTemplateTransformer = self.javascript_imports
 
diff --git a/api/tests/test_containers_integration_tests/workflow/nodes/code_executor/test_code_jinja2.py b/api/tests/test_containers_integration_tests/workflow/nodes/code_executor/test_code_jinja2.py
index ddb079f00c..8b4c3c3d4a 100644
--- a/api/tests/test_containers_integration_tests/workflow/nodes/code_executor/test_code_jinja2.py
+++ b/api/tests/test_containers_integration_tests/workflow/nodes/code_executor/test_code_jinja2.py
@@ -1,12 +1,14 @@
 import base64
 
+from flask import Flask
+
 from .test_utils import CodeExecutorTestMixin
 
 
 class TestJinja2CodeExecutor(CodeExecutorTestMixin):
     """Test class for Jinja2 code executor functionality."""
 
-    def test_jinja2(self, flask_app_with_containers):
+    def test_jinja2(self, flask_app_with_containers: Flask):
         """Test basic Jinja2 template execution with variable substitution"""
         CodeExecutor, CodeLanguage = self.code_executor_imports
         _, Jinja2TemplateTransformer = self.jinja2_imports
@@ -25,7 +27,7 @@ class TestJinja2CodeExecutor(CodeExecutorTestMixin):
         )
         assert result == "<<RESULT>>Hello World<<RESULT>>\n"
 
-    def test_jinja2_with_code_template(self, flask_app_with_containers):
+    def test_jinja2_with_code_template(self, flask_app_with_containers: Flask):
         """Test Jinja2 workflow code template execution with inputs"""
         CodeExecutor, CodeLanguage = self.code_executor_imports
 
@@ -34,7 +36,7 @@ class TestJinja2CodeExecutor(CodeExecutorTestMixin):
         )
         assert result == {"result": "Hello World"}
 
-    def test_jinja2_get_runner_script(self, flask_app_with_containers):
+    def test_jinja2_get_runner_script(self, flask_app_with_containers: Flask):
         """Test Jinja2 template transformer runner script generation"""
         _, Jinja2TemplateTransformer = self.jinja2_imports
 
@@ -43,7 +45,7 @@ class TestJinja2CodeExecutor(CodeExecutorTestMixin):
         assert runner_script.count(Jinja2TemplateTransformer._inputs_placeholder) == 1
         assert runner_script.count(Jinja2TemplateTransformer._result_tag) == 2
 
-    def test_jinja2_template_with_special_characters(self, flask_app_with_containers):
+    def test_jinja2_template_with_special_characters(self, flask_app_with_containers: Flask):
         """
         Test that templates with special characters (quotes, newlines) render correctly.
         This is a regression test for issue #26818 where textarea pre-fill values
diff --git a/api/tests/test_containers_integration_tests/workflow/nodes/code_executor/test_code_python3.py b/api/tests/test_containers_integration_tests/workflow/nodes/code_executor/test_code_python3.py
index 6d93df2472..0de41e1312 100644
--- a/api/tests/test_containers_integration_tests/workflow/nodes/code_executor/test_code_python3.py
+++ b/api/tests/test_containers_integration_tests/workflow/nodes/code_executor/test_code_python3.py
@@ -1,12 +1,14 @@
 from textwrap import dedent
 
+from flask import Flask
+
 from .test_utils import CodeExecutorTestMixin
 
 
 class TestPython3CodeExecutor(CodeExecutorTestMixin):
     """Test class for Python3 code executor functionality."""
 
-    def test_python3_plain(self, flask_app_with_containers):
+    def test_python3_plain(self, flask_app_with_containers: Flask):
         """Test basic Python3 code execution with print output"""
         CodeExecutor, CodeLanguage = self.code_executor_imports
 
@@ -14,7 +16,7 @@ class TestPython3CodeExecutor(CodeExecutorTestMixin):
         result = CodeExecutor.execute_code(language=CodeLanguage.PYTHON3, preload="", code=code)
         assert result == "Hello World\n"
 
-    def test_python3_json(self, flask_app_with_containers):
+    def test_python3_json(self, flask_app_with_containers: Flask):
         """Test Python3 code execution with JSON output"""
         CodeExecutor, CodeLanguage = self.code_executor_imports
 
@@ -25,7 +27,7 @@ class TestPython3CodeExecutor(CodeExecutorTestMixin):
         result = CodeExecutor.execute_code(language=CodeLanguage.PYTHON3, preload="", code=code)
         assert result == '{"Hello": "World"}\n'
 
-    def test_python3_with_code_template(self, flask_app_with_containers):
+    def test_python3_with_code_template(self, flask_app_with_containers: Flask):
         """Test Python3 workflow code template execution with inputs"""
         CodeExecutor, CodeLanguage = self.code_executor_imports
         Python3CodeProvider, _ = self.python3_imports
@@ -37,7 +39,7 @@ class TestPython3CodeExecutor(CodeExecutorTestMixin):
         )
         assert result == {"result": "HelloWorld"}
 
-    def test_python3_get_runner_script(self, flask_app_with_containers):
+    def test_python3_get_runner_script(self, flask_app_with_containers: Flask):
         """Test Python3 template transformer runner script generation"""
         _, Python3TemplateTransformer = self.python3_imports
 
diff --git a/api/tests/unit_tests/commands/test_generate_swagger_markdown_docs.py b/api/tests/unit_tests/commands/test_generate_swagger_markdown_docs.py
new file mode 100644
index 0000000000..b65db70b50
--- /dev/null
+++ b/api/tests/unit_tests/commands/test_generate_swagger_markdown_docs.py
@@ -0,0 +1,296 @@
+"""Unit tests for the Markdown API docs generator."""
+
+import importlib.util
+import json
+import sys
+from pathlib import Path
+
+
+def _load_generate_swagger_markdown_docs_module():
+    api_dir = Path(__file__).resolve().parents[3]
+    script_path = api_dir / "dev" / "generate_swagger_markdown_docs.py"
+
+    spec = importlib.util.spec_from_file_location("generate_swagger_markdown_docs", script_path)
+    assert spec
+    assert spec.loader
+
+    module = importlib.util.module_from_spec(spec)
+    sys.modules[spec.name] = module
+    spec.loader.exec_module(module)  # type: ignore[attr-defined]
+    return module
+
+
+def test_generate_markdown_docs_keeps_split_docs_and_merges_fastopenapi_into_console(tmp_path, monkeypatch):
+    module = _load_generate_swagger_markdown_docs_module()
+    swagger_dir = tmp_path / "openapi"
+    markdown_dir = tmp_path / "markdown"
+    stale_combined_doc = markdown_dir / "api-reference.md"
+    markdown_dir.mkdir()
+    stale_combined_doc.write_text("stale", encoding="utf-8")
+
+    def write_specs(output_dir: Path) -> list[Path]:
+        output_dir.mkdir(parents=True, exist_ok=True)
+        paths = []
+        for target in module.SPEC_TARGETS:
+            path = output_dir / target.filename
+            path.write_text("{}", encoding="utf-8")
+            paths.append(path)
+        return paths
+
+    def write_fastopenapi_specs(output_dir: Path) -> list[Path]:
+        output_dir.mkdir(parents=True, exist_ok=True)
+        path = output_dir / module.FASTOPENAPI_SPEC_TARGETS[0].filename
+        path.write_text("{}", encoding="utf-8")
+        return [path]
+
+    def convert_spec_to_markdown(spec_path: Path, markdown_path: Path) -> None:
+        markdown_path.write_text(f"# {spec_path.stem}\n\n## Routes\n", encoding="utf-8")
+
+    monkeypatch.setattr(module, "generate_specs", write_specs)
+    monkeypatch.setattr(module, "generate_fastopenapi_specs", write_fastopenapi_specs)
+    monkeypatch.setattr(module, "_convert_spec_to_markdown", convert_spec_to_markdown)
+
+    written_paths = module.generate_markdown_docs(swagger_dir, markdown_dir)
+
+    assert [path.name for path in written_paths] == [
+        "console-swagger.md",
+        "web-swagger.md",
+        "service-swagger.md",
+    ]
+    assert not stale_combined_doc.exists()
+    assert not list(swagger_dir.glob("*.json"))
+
+    console_markdown = (markdown_dir / "console-swagger.md").read_text(encoding="utf-8")
+    assert "## FastOpenAPI Preview (OpenAPI 3.0)" in console_markdown
+    assert "### fastopenapi-console-openapi" in console_markdown
+    assert "#### Routes" in console_markdown
+    assert "FastOpenAPI Preview" not in (markdown_dir / "web-swagger.md").read_text(encoding="utf-8")
+    assert "FastOpenAPI Preview" not in (markdown_dir / "service-swagger.md").read_text(encoding="utf-8")
+
+
+def test_generate_markdown_docs_only_removes_generated_specs_from_separate_swagger_dir(tmp_path, monkeypatch):
+    module = _load_generate_swagger_markdown_docs_module()
+    swagger_dir = tmp_path / "swagger"
+    markdown_dir = tmp_path / "markdown"
+    swagger_dir.mkdir()
+    existing_file = swagger_dir / "existing.txt"
+    existing_file.write_text("keep me", encoding="utf-8")
+
+    def write_specs(output_dir: Path) -> list[Path]:
+        output_dir.mkdir(parents=True, exist_ok=True)
+        paths = []
+        for target in module.SPEC_TARGETS:
+            path = output_dir / target.filename
+            path.write_text("{}", encoding="utf-8")
+            paths.append(path)
+        return paths
+
+    def write_fastopenapi_specs(output_dir: Path) -> list[Path]:
+        output_dir.mkdir(parents=True, exist_ok=True)
+        path = output_dir / module.FASTOPENAPI_SPEC_TARGETS[0].filename
+        path.write_text("{}", encoding="utf-8")
+        return [path]
+
+    def convert_spec_to_markdown(spec_path: Path, markdown_path: Path) -> None:
+        markdown_path.write_text(f"# {spec_path.stem}\n", encoding="utf-8")
+
+    monkeypatch.setattr(module, "generate_specs", write_specs)
+    monkeypatch.setattr(module, "generate_fastopenapi_specs", write_fastopenapi_specs)
+    monkeypatch.setattr(module, "_convert_spec_to_markdown", convert_spec_to_markdown)
+
+    module.generate_markdown_docs(swagger_dir, markdown_dir)
+
+    assert existing_file.read_text(encoding="utf-8") == "keep me"
+    assert not list(swagger_dir.glob("*.json"))
+
+
+def test_patch_union_schema_markdown_fills_converter_blank_schema_types(tmp_path):
+    module = _load_generate_swagger_markdown_docs_module()
+    spec_path = tmp_path / "console-swagger.json"
+    spec_path.write_text(
+        json.dumps(
+            {
+                "definitions": {
+                    "FormInputConfig": {
+                        "oneOf": [
+                            {"$ref": "#/definitions/ParagraphInputConfig"},
+                            {"$ref": "#/definitions/SelectInputConfig"},
+                            {"$ref": "#/definitions/FileInputConfig"},
+                        ],
+                    },
+                    "ParagraphInputConfig": {
+                        "properties": {
+                            "default": {
+                                "anyOf": [
+                                    {"$ref": "#/definitions/StringSource"},
+                                    {"type": "null"},
+                                ],
+                            },
+                            "output_variable_name": {"type": "string"},
+                        },
+                    },
+                    "SelectInputConfig": {
+                        "properties": {
+                            "option_source": {"$ref": "#/definitions/StringListSource"},
+                        },
+                    },
+                    "FileInputConfig": {
+                        "properties": {
+                            "allowed_file_types": {
+                                "type": "array",
+                                "items": {"$ref": "#/definitions/FileType"},
+                            },
+                        },
+                    },
+                }
+            }
+        ),
+        encoding="utf-8",
+    )
+    markdown = """#### FormInputConfig
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| FormInputConfig |  |  |  |
+
+#### ParagraphInputConfig
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| default |  |  | No |
+| output_variable_name | string |  | Yes |
+
+#### SelectInputConfig
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| option_source |  |  | Yes |
+
+#### FileInputConfig
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| allowed_file_types |  |  | No |
+"""
+
+    patched = module._patch_union_schema_markdown(markdown, spec_path)
+
+    assert (
+        "| FormInputConfig | "
+        "[ParagraphInputConfig](#paragraphinputconfig)<br>"
+        "[SelectInputConfig](#selectinputconfig)<br>"
+        "[FileInputConfig](#fileinputconfig) |  |  |"
+    ) in patched
+    assert "| default | [StringSource](#stringsource) |  | No |" in patched
+    assert "| output_variable_name | string |  | Yes |" in patched
+    assert "| option_source | [StringListSource](#stringlistsource) |  | Yes |" in patched
+    assert "| allowed_file_types | [ [FileType](#filetype) ] |  | No |" in patched
+
+
+def test_patch_union_schema_markdown_ignores_specs_without_definitions(tmp_path):
+    module = _load_generate_swagger_markdown_docs_module()
+    spec_path = tmp_path / "console-swagger.json"
+    spec_path.write_text("{}", encoding="utf-8")
+
+    assert module._patch_union_schema_markdown("unchanged", spec_path) == "unchanged"
+
+
+def test_patch_union_schema_markdown_ignores_unrenderable_shapes(tmp_path):
+    module = _load_generate_swagger_markdown_docs_module()
+    spec_path = tmp_path / "console-swagger.json"
+    spec_path.write_text(
+        json.dumps(
+            {
+                "definitions": {
+                    "NotAMapping": [],
+                    "BrokenUnion": {
+                        "oneOf": [
+                            {},
+                            {"$ref": "#/definitions/Missing"},
+                            {"$ref": "#/definitions/NoPropertyMapping"},
+                        ],
+                    },
+                    "NoPropertyMapping": {"properties": []},
+                }
+            }
+        ),
+        encoding="utf-8",
+    )
+
+    assert module._definition_ref_name(None) is None
+    assert module._schema_markdown_type(None) == ""
+    assert module._schema_markdown_type({"anyOf": [{"type": "null"}]}) == ""
+    assert module._replace_schema_table_type("unchanged", "Definition", "field", "") == "unchanged"
+    assert (
+        module._replace_schema_table_type(
+            "#### Definition\n#### Next\n| field |  |  | No |",
+            "Definition",
+            "field",
+            "string",
+        )
+        == "#### Definition\n#### Next\n| field |  |  | No |"
+    )
+    assert (
+        module._replace_schema_table_type("#### Definition\n| field |", "Definition", "field", "string")
+        == "#### Definition\n| field |"
+    )
+
+    assert module._patch_union_schema_markdown("#### BrokenUnion\n", spec_path) == "#### BrokenUnion"
+
+
+def test_convert_spec_to_markdown_patches_generated_union_tables(tmp_path, monkeypatch):
+    module = _load_generate_swagger_markdown_docs_module()
+    spec_path = tmp_path / "console-swagger.json"
+    output_path = tmp_path / "console-swagger.md"
+    spec_path.write_text(
+        json.dumps(
+            {
+                "definitions": {
+                    "FormInputConfig": {
+                        "oneOf": [
+                            {"$ref": "#/definitions/ParagraphInputConfig"},
+                        ],
+                    },
+                    "ParagraphInputConfig": {
+                        "properties": {
+                            "default": {
+                                "anyOf": [
+                                    {"$ref": "#/definitions/StringSource"},
+                                    {"type": "null"},
+                                ],
+                            },
+                        },
+                    },
+                }
+            }
+        ),
+        encoding="utf-8",
+    )
+
+    def run_converter(args, **kwargs):
+        assert kwargs["check"] is False
+        markdown_path = Path(args[args.index("-o") + 1])
+        markdown_path.write_text(
+            """#### FormInputConfig
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| FormInputConfig |  |  |  |
+
+#### ParagraphInputConfig
+
+| Name | Type | Description | Required |
+| ---- | ---- | ----------- | -------- |
+| default |  |  | No |
+""",
+            encoding="utf-8",
+        )
+        return module.subprocess.CompletedProcess(args=args, returncode=0, stdout="", stderr="")
+
+    monkeypatch.setattr(module.subprocess, "run", run_converter)
+
+    module._convert_spec_to_markdown(spec_path, output_path)
+
+    converted = output_path.read_text(encoding="utf-8")
+    assert "| FormInputConfig | [ParagraphInputConfig](#paragraphinputconfig) |  |  |" in converted
+    assert "| default | [StringSource](#stringsource) |  | No |" in converted
diff --git a/api/tests/unit_tests/commands/test_generate_swagger_specs.py b/api/tests/unit_tests/commands/test_generate_swagger_specs.py
index e77e875081..79a577087d 100644
--- a/api/tests/unit_tests/commands/test_generate_swagger_specs.py
+++ b/api/tests/unit_tests/commands/test_generate_swagger_specs.py
@@ -6,6 +6,16 @@ import sys
 from pathlib import Path
 
 
+def _walk_values(value):
+    yield value
+    if isinstance(value, dict):
+        for child in value.values():
+            yield from _walk_values(child)
+    elif isinstance(value, list):
+        for child in value:
+            yield from _walk_values(child)
+
+
 def _load_generate_swagger_specs_module():
     api_dir = Path(__file__).resolve().parents[3]
     script_path = api_dir / "dev" / "generate_swagger_specs.py"
@@ -35,3 +45,32 @@ def test_generate_specs_writes_console_web_and_service_swagger_files(tmp_path):
         payload = json.loads(path.read_text(encoding="utf-8"))
         assert payload["swagger"] == "2.0"
         assert "paths" in payload
+
+
+def test_generate_specs_writes_swagger_with_resolvable_references_and_no_nulls(tmp_path):
+    module = _load_generate_swagger_specs_module()
+
+    written_paths = module.generate_specs(tmp_path)
+
+    for path in written_paths:
+        payload = json.loads(path.read_text(encoding="utf-8"))
+        definitions = payload["definitions"]
+        refs = {
+            item["$ref"].removeprefix("#/definitions/")
+            for item in _walk_values(payload)
+            if isinstance(item, dict) and isinstance(item.get("$ref"), str)
+        }
+
+        assert refs <= set(definitions)
+        assert all(value is not None for value in _walk_values(payload))
+
+
+def test_generate_specs_is_idempotent(tmp_path):
+    module = _load_generate_swagger_specs_module()
+
+    first_paths = module.generate_specs(tmp_path / "first")
+    second_paths = module.generate_specs(tmp_path / "second")
+
+    assert [path.name for path in first_paths] == [path.name for path in second_paths]
+    for first_path, second_path in zip(first_paths, second_paths):
+        assert first_path.read_text(encoding="utf-8") == second_path.read_text(encoding="utf-8")
diff --git a/api/tests/unit_tests/commands/test_reset_encrypt_key_pair.py b/api/tests/unit_tests/commands/test_reset_encrypt_key_pair.py
new file mode 100644
index 0000000000..31b4d71d0f
--- /dev/null
+++ b/api/tests/unit_tests/commands/test_reset_encrypt_key_pair.py
@@ -0,0 +1,108 @@
+"""Unit tests for the reset-encrypt-key-pair CLI command (#35396).
+
+The command must purge every table that stores ciphertext encrypted with the
+tenant's asymmetric key, otherwise stale rows cause downstream API failures
+such as `/console/api/workspaces/current/tool-providers` returning 500.
+"""
+
+from unittest.mock import MagicMock, patch
+
+import commands
+from commands import system as system_commands
+from models.provider import Provider, ProviderModel
+from models.tools import ApiToolProvider, BuiltinToolProvider, MCPToolProvider
+
+
+def _invoke_reset() -> int:
+    try:
+        commands.reset_encrypt_key_pair.callback()
+    except SystemExit as e:
+        return int(e.code or 0)
+    return 0
+
+
+def _delete_targets(session_mock: MagicMock) -> list:
+    """Extract the model class targeted by each `delete(...)` call on the session."""
+    targets = []
+    for call in session_mock.execute.call_args_list:
+        stmt = call.args[0]
+        # `delete(Foo)` constructs a `Delete` statement whose entity is `Foo`.
+        try:
+            targets.append(stmt.table.name)
+        except AttributeError:
+            targets.append(repr(stmt))
+    return targets
+
+
+def test_reset_aborts_when_not_self_hosted(monkeypatch, capsys):
+    monkeypatch.setattr(system_commands.dify_config, "EDITION", "CLOUD")
+
+    exit_code = _invoke_reset()
+    captured = capsys.readouterr()
+
+    assert exit_code == 0
+    assert "only for SELF_HOSTED" in captured.out
+
+
+def test_reset_purges_provider_and_tool_tables_for_each_tenant(monkeypatch, capsys):
+    """The command must purge LLM provider rows AND every tool provider table
+    that stores ciphertext encrypted under the tenant key (#35396)."""
+    monkeypatch.setattr(system_commands.dify_config, "EDITION", "SELF_HOSTED")
+    monkeypatch.setattr(system_commands, "generate_key_pair", lambda tenant_id: f"new-key-{tenant_id}")
+
+    fake_tenant = MagicMock(id="tenant-abc", encrypt_public_key="old-key")
+    session = MagicMock()
+    session.scalars.return_value.all.return_value = [fake_tenant]
+
+    fake_sessionmaker = MagicMock()
+    fake_sessionmaker.begin.return_value.__enter__.return_value = session
+    fake_sessionmaker.begin.return_value.__exit__.return_value = False
+
+    with (
+        patch.object(system_commands, "db", MagicMock()),
+        patch.object(system_commands, "sessionmaker", return_value=fake_sessionmaker),
+    ):
+        exit_code = _invoke_reset()
+
+    captured = capsys.readouterr()
+    assert exit_code == 0
+    assert "tenant-abc" in captured.out
+
+    # New key pair generated and assigned.
+    assert fake_tenant.encrypt_public_key == "new-key-tenant-abc"
+
+    # Every encrypted-credential table should have been purged for this tenant.
+    table_names = _delete_targets(session)
+    expected = {
+        Provider.__tablename__,
+        ProviderModel.__tablename__,
+        BuiltinToolProvider.__tablename__,
+        ApiToolProvider.__tablename__,
+        MCPToolProvider.__tablename__,
+    }
+    assert expected.issubset(set(table_names)), f"missing purges: expected {expected}, got {table_names}"
+
+
+def test_reset_iterates_all_tenants(monkeypatch, capsys):
+    """Multi-tenant deployments must purge every tenant, not just the first."""
+    monkeypatch.setattr(system_commands.dify_config, "EDITION", "SELF_HOSTED")
+    monkeypatch.setattr(system_commands, "generate_key_pair", lambda tenant_id: f"new-key-{tenant_id}")
+
+    tenants = [MagicMock(id=f"tenant-{i}", encrypt_public_key="old") for i in range(3)]
+    session = MagicMock()
+    session.scalars.return_value.all.return_value = tenants
+
+    fake_sessionmaker = MagicMock()
+    fake_sessionmaker.begin.return_value.__enter__.return_value = session
+    fake_sessionmaker.begin.return_value.__exit__.return_value = False
+
+    with (
+        patch.object(system_commands, "db", MagicMock()),
+        patch.object(system_commands, "sessionmaker", return_value=fake_sessionmaker),
+    ):
+        _invoke_reset()
+
+    # Five purges per tenant × 3 tenants = 15 execute calls.
+    assert session.execute.call_count == 15
+    for tenant in tenants:
+        assert tenant.encrypt_public_key == f"new-key-{tenant.id}"
diff --git a/api/tests/unit_tests/configs/test_dify_config.py b/api/tests/unit_tests/configs/test_dify_config.py
index bad246a4bb..81f3f92a7c 100644
--- a/api/tests/unit_tests/configs/test_dify_config.py
+++ b/api/tests/unit_tests/configs/test_dify_config.py
@@ -8,6 +8,47 @@ from yarl import URL
 from configs.app_config import DifyConfig
 
 
+def _set_basic_config_env(monkeypatch: pytest.MonkeyPatch) -> None:
+    os.environ.clear()
+    monkeypatch.setenv("CONSOLE_API_URL", "https://example.com")
+    monkeypatch.setenv("CONSOLE_WEB_URL", "https://example.com")
+    monkeypatch.setenv("DB_TYPE", "postgresql")
+    monkeypatch.setenv("DB_USERNAME", "postgres")
+    monkeypatch.setenv("DB_PASSWORD", "postgres")
+    monkeypatch.setenv("DB_HOST", "localhost")
+    monkeypatch.setenv("DB_PORT", "5432")
+    monkeypatch.setenv("DB_DATABASE", "dify")
+
+
+def test_dify_config_keeps_secret_key_empty_when_missing(
+    monkeypatch: pytest.MonkeyPatch,
+    tmp_path,
+) -> None:
+    _set_basic_config_env(monkeypatch)
+    monkeypatch.delenv("SECRET_KEY", raising=False)
+    monkeypatch.setenv("OPENDAL_FS_ROOT", str(tmp_path))
+
+    config = DifyConfig(_env_file=None)
+
+    assert config.SECRET_KEY == ""
+    assert not hasattr(config, "OPENDAL_FS_ROOT")
+    assert not (tmp_path / ".dify_secret_key").exists()
+
+
+def test_dify_config_preserves_explicit_secret_key(
+    monkeypatch: pytest.MonkeyPatch,
+    tmp_path,
+) -> None:
+    _set_basic_config_env(monkeypatch)
+    monkeypatch.setenv("SECRET_KEY", "explicit")
+    monkeypatch.setenv("OPENDAL_FS_ROOT", str(tmp_path))
+
+    config = DifyConfig(_env_file=None)
+
+    assert config.SECRET_KEY == "explicit"
+    assert not (tmp_path / ".dify_secret_key").exists()
+
+
 def test_dify_config(monkeypatch: pytest.MonkeyPatch):
     # clear system environment variables
     os.environ.clear()
@@ -89,7 +130,7 @@ def test_flask_configs(monkeypatch: pytest.MonkeyPatch):
     monkeypatch.setenv("CODE_EXECUTION_ENDPOINT", "http://127.0.0.1:8194/")
 
     # Disable `.env` loading to ensure test stability across environments
-    flask_app.config.from_mapping(DifyConfig(_env_file=None).model_dump())  # pyright: ignore
+    flask_app.config.from_mapping(DifyConfig(_env_file=None).model_dump())
     config = flask_app.config
 
     # configs read from pydantic-settings
@@ -114,8 +155,8 @@ def test_flask_configs(monkeypatch: pytest.MonkeyPatch):
         "pool_recycle": 3600,
         "pool_size": 30,
         "pool_use_lifo": False,
-        "pool_reset_on_return": None,
         "pool_timeout": 30,
+        "pool_reset_on_return": "rollback",
     }
 
     assert config["CONSOLE_WEB_URL"] == "https://example.com"
diff --git a/api/tests/unit_tests/controllers/common/test_helpers.py b/api/tests/unit_tests/controllers/common/test_helpers.py
index 59c463177c..376a7a90c5 100644
--- a/api/tests/unit_tests/controllers/common/test_helpers.py
+++ b/api/tests/unit_tests/controllers/common/test_helpers.py
@@ -57,7 +57,7 @@ class TestGuessFileInfoFromResponse:
             (False, "bin"),
         ],
     )
-    def test_generated_filename_when_missing(self, monkeypatch, magic_available, expected_ext):
+    def test_generated_filename_when_missing(self, monkeypatch: pytest.MonkeyPatch, magic_available, expected_ext):
         if magic_available:
             if helpers.magic is None:
                 pytest.skip("python-magic is not installed, cannot run 'magic_available=True' test variant")
@@ -155,7 +155,7 @@ class TestMagicImportWarnings:
     )
     def test_magic_import_warning_per_platform(
         self,
-        monkeypatch,
+        monkeypatch: pytest.MonkeyPatch,
         platform_name,
         expected_message,
     ):
diff --git a/api/tests/unit_tests/controllers/common/test_schema.py b/api/tests/unit_tests/controllers/common/test_schema.py
index 56c8160f02..14b0833dcf 100644
--- a/api/tests/unit_tests/controllers/common/test_schema.py
+++ b/api/tests/unit_tests/controllers/common/test_schema.py
@@ -1,10 +1,11 @@
 import sys
 from enum import StrEnum
+from typing import Literal
 from unittest.mock import MagicMock, patch
 
 import pytest
 from flask_restx import Namespace
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict, Field
 
 
 class UserModel(BaseModel):
@@ -17,6 +18,46 @@ class ProductModel(BaseModel):
     price: float
 
 
+class ChildModel(BaseModel):
+    value: str
+
+
+class ParentModel(BaseModel):
+    child: ChildModel
+
+
+class StatusEnum(StrEnum):
+    ACTIVE = "active"
+    INACTIVE = "inactive"
+
+
+class PriorityEnum(StrEnum):
+    HIGH = "high"
+    LOW = "low"
+
+
+class QueryModel(BaseModel):
+    model_config = ConfigDict(populate_by_name=True)
+
+    page: int = Field(default=1, ge=1, le=100, description="Page number")
+    keyword: str | None = Field(default=None, min_length=1, max_length=50, description="Search keyword")
+    status: Literal["active", "inactive"] | None = Field(default=None, description="Status filter")
+    app_id: str = Field(..., alias="appId", description="Application ID")
+    tag_ids: list[str] = Field(default_factory=list, min_length=1, max_length=3, description="Tag IDs")
+    ambiguous: int | str | None = Field(default=None, description="Ambiguous query parameter")
+
+
+class NullableSchemaModel(BaseModel):
+    name: str | None = None
+    tags: list[str] | None = None
+    owner: UserModel | None = None
+    ambiguous: int | str | None = None
+
+
+class ResponseAliasModel(BaseModel):
+    public_name: str = Field(validation_alias="internal_name")
+
+
 @pytest.fixture(autouse=True)
 def mock_console_ns():
     """Mock the console_ns to avoid circular imports during test collection."""
@@ -64,6 +105,22 @@ def test_register_schema_model_passes_schema_from_pydantic():
     assert schema == expected_schema
 
 
+def test_register_schema_model_promotes_nested_pydantic_definitions():
+    from controllers.common.schema import DEFAULT_REF_TEMPLATE_SWAGGER_2_0, register_schema_model
+
+    namespace = MagicMock(spec=Namespace)
+
+    register_schema_model(namespace, ParentModel)
+
+    called_schemas = {call.args[0]: call.args[1] for call in namespace.schema_model.call_args_list}
+    parent_schema = ParentModel.model_json_schema(ref_template=DEFAULT_REF_TEMPLATE_SWAGGER_2_0)
+
+    assert set(called_schemas) == {"ParentModel", "ChildModel"}
+    assert "$defs" not in called_schemas["ParentModel"]
+    assert called_schemas["ParentModel"]["properties"]["child"]["$ref"] == "#/definitions/ChildModel"
+    assert called_schemas["ChildModel"] == parent_schema["$defs"]["ChildModel"]
+
+
 def test_register_schema_models_registers_multiple_models():
     from controllers.common.schema import register_schema_models
 
@@ -77,7 +134,7 @@ def test_register_schema_models_registers_multiple_models():
     assert called_names == ["UserModel", "ProductModel"]
 
 
-def test_register_schema_models_calls_register_schema_model(monkeypatch):
+def test_register_schema_models_calls_register_schema_model(monkeypatch: pytest.MonkeyPatch):
     from controllers.common.schema import register_schema_models
 
     namespace = MagicMock(spec=Namespace)
@@ -100,14 +157,39 @@ def test_register_schema_models_calls_register_schema_model(monkeypatch):
     ]
 
 
-class StatusEnum(StrEnum):
-    ACTIVE = "active"
-    INACTIVE = "inactive"
+def test_register_response_schema_model_uses_serialized_field_names():
+    from controllers.common.schema import register_response_schema_model
+
+    namespace = MagicMock(spec=Namespace)
+
+    register_response_schema_model(namespace, ResponseAliasModel)
+
+    model_name, schema = namespace.schema_model.call_args.args
+
+    assert model_name == "ResponseAliasModel"
+    assert "public_name" in schema["properties"]
+    assert "internal_name" not in schema["properties"]
 
 
-class PriorityEnum(StrEnum):
-    HIGH = "high"
-    LOW = "low"
+def test_register_schema_model_flattens_simple_nullable_any_of_for_swagger_2():
+    from controllers.common.schema import register_schema_model
+
+    namespace = MagicMock(spec=Namespace)
+
+    register_schema_model(namespace, NullableSchemaModel)
+
+    called_schemas = {call.args[0]: call.args[1] for call in namespace.schema_model.call_args_list}
+    properties = called_schemas["NullableSchemaModel"]["properties"]
+
+    assert properties["name"]["type"] == "string"
+    assert properties["name"]["x-nullable"] is True
+    assert "anyOf" not in properties["name"]
+    assert properties["tags"]["type"] == "array"
+    assert properties["tags"]["items"] == {"type": "string"}
+    assert properties["tags"]["x-nullable"] is True
+    assert properties["owner"]["$ref"] == "#/definitions/UserModel"
+    assert properties["owner"]["x-nullable"] is True
+    assert "anyOf" in properties["ambiguous"]
 
 
 def test_get_or_create_model_returns_existing_model(mock_console_ns):
@@ -187,3 +269,54 @@ def test_register_enum_models_uses_correct_ref_template():
 
     # Verify the schema contains enum values
     assert "enum" in schema or "anyOf" in schema
+
+
+def test_query_params_from_model_builds_flask_restx_doc_params():
+    from controllers.common.schema import query_params_from_model
+
+    params = query_params_from_model(QueryModel)
+
+    assert params["page"] == {
+        "in": "query",
+        "required": False,
+        "description": "Page number",
+        "type": "integer",
+        "default": 1,
+        "minimum": 1,
+        "maximum": 100,
+    }
+    assert params["keyword"] == {
+        "in": "query",
+        "required": False,
+        "description": "Search keyword",
+        "type": "string",
+        "minLength": 1,
+        "maxLength": 50,
+    }
+    assert params["status"] == {
+        "in": "query",
+        "required": False,
+        "description": "Status filter",
+        "type": "string",
+        "enum": ["active", "inactive"],
+    }
+    assert params["appId"] == {
+        "in": "query",
+        "required": True,
+        "description": "Application ID",
+        "type": "string",
+    }
+    assert params["tag_ids"] == {
+        "in": "query",
+        "required": False,
+        "description": "Tag IDs",
+        "type": "array",
+        "items": {"type": "string"},
+        "minItems": 1,
+        "maxItems": 3,
+    }
+    assert params["ambiguous"] == {
+        "in": "query",
+        "required": False,
+        "description": "Ambiguous query parameter",
+    }
diff --git a/api/tests/unit_tests/controllers/console/app/test_app_import_api.py b/api/tests/unit_tests/controllers/console/app/test_app_import_api.py
index 9c4678aed3..e690968ffb 100644
--- a/api/tests/unit_tests/controllers/console/app/test_app_import_api.py
+++ b/api/tests/unit_tests/controllers/console/app/test_app_import_api.py
@@ -6,6 +6,7 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock
 
 import pytest
+from flask import Flask
 
 from controllers.console.app import app_import as app_import_module
 from services.app_dsl_service import ImportStatus
@@ -48,7 +49,9 @@ class TestAppImportApi:
     def api(self):
         return app_import_module.AppImportApi()
 
-    def test_import_post_returns_failed_status_and_rolls_back(self, api, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_import_post_returns_failed_status_and_rolls_back(
+        self, api, app: Flask, monkeypatch: pytest.MonkeyPatch
+    ) -> None:
         method = _unwrap(api.post)
 
         _install_features(monkeypatch, enabled=False)
@@ -68,7 +71,9 @@ class TestAppImportApi:
         assert status == 400
         assert response["status"] == ImportStatus.FAILED
 
-    def test_import_post_returns_pending_status_and_commits(self, api, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_import_post_returns_pending_status_and_commits(
+        self, api, app: Flask, monkeypatch: pytest.MonkeyPatch
+    ) -> None:
         method = _unwrap(api.post)
 
         _install_features(monkeypatch, enabled=False)
@@ -88,7 +93,9 @@ class TestAppImportApi:
         assert status == 202
         assert response["status"] == ImportStatus.PENDING
 
-    def test_import_post_updates_webapp_auth_when_enabled(self, api, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_import_post_updates_webapp_auth_when_enabled(
+        self, api, app: Flask, monkeypatch: pytest.MonkeyPatch
+    ) -> None:
         method = _unwrap(api.post)
 
         _install_features(monkeypatch, enabled=True)
@@ -118,7 +125,7 @@ class TestAppImportConfirmApi:
         return app_import_module.AppImportConfirmApi()
 
     def test_import_confirm_returns_failed_status_and_rolls_back(
-        self, api, app, monkeypatch: pytest.MonkeyPatch
+        self, api, app: Flask, monkeypatch: pytest.MonkeyPatch
     ) -> None:
         method = _unwrap(api.post)
 
diff --git a/api/tests/unit_tests/controllers/console/app/test_app_response_models.py b/api/tests/unit_tests/controllers/console/app/test_app_response_models.py
index 35d07a987d..80e7c41a9e 100644
--- a/api/tests/unit_tests/controllers/console/app/test_app_response_models.py
+++ b/api/tests/unit_tests/controllers/console/app/test_app_response_models.py
@@ -10,6 +10,8 @@ from typing import Any
 
 import pytest
 from flask.views import MethodView
+from pydantic import ValidationError
+from werkzeug.datastructures import MultiDict
 
 # kombu references MethodView as a global when importing celery/kombu pools.
 if not hasattr(builtins, "MethodView"):
@@ -174,6 +176,101 @@ def _dummy_workflow():
     )
 
 
+def test_app_list_query_normalizes_orpc_bracket_tag_ids(app_module):
+    first_tag_id = "8c4ef3d1-58a1-4d94-8a1c-1c171d889e08"
+    second_tag_id = "3c39395b-6d1f-4030-8b17-eaa7cc85221c"
+    query_args = MultiDict(
+        [
+            ("page", "1"),
+            ("limit", "30"),
+            ("tag_ids[1]", second_tag_id),
+            ("tag_ids[0]", first_tag_id),
+        ]
+    )
+
+    normalized = app_module._normalize_app_list_query_args(query_args)
+    query = app_module.AppListQuery.model_validate(normalized)
+
+    assert query.tag_ids == [first_tag_id, second_tag_id]
+
+
+def test_app_list_query_preserves_regular_query_params(app_module):
+    query_args = MultiDict(
+        [
+            ("page", "2"),
+            ("limit", "50"),
+            ("mode", "chat"),
+            ("name", "Sales Copilot"),
+            ("is_created_by_me", "true"),
+        ]
+    )
+
+    normalized = app_module._normalize_app_list_query_args(query_args)
+    query = app_module.AppListQuery.model_validate(normalized)
+
+    assert normalized == {
+        "page": "2",
+        "limit": "50",
+        "mode": "chat",
+        "name": "Sales Copilot",
+        "is_created_by_me": "true",
+    }
+    assert query.page == 2
+    assert query.limit == 50
+    assert query.mode == "chat"
+    assert query.name == "Sales Copilot"
+    assert query.is_created_by_me is True
+    assert query.tag_ids is None
+
+
+def test_app_list_query_normalizes_empty_bracket_tag_ids_to_none(app_module):
+    query_args = MultiDict(
+        [
+            ("tag_ids[0]", ""),
+            ("tag_ids[1]", "   "),
+        ]
+    )
+
+    normalized = app_module._normalize_app_list_query_args(query_args)
+    query = app_module.AppListQuery.model_validate(normalized)
+
+    assert normalized == {"tag_ids": ["", "   "]}
+    assert query.tag_ids is None
+
+
+def test_app_list_query_rejects_invalid_bracket_tag_id(app_module):
+    normalized = app_module._normalize_app_list_query_args(MultiDict([("tag_ids[0]", "not-a-uuid")]))
+
+    with pytest.raises(ValidationError):
+        app_module.AppListQuery.model_validate(normalized)
+
+
+def test_app_list_query_sorts_bracket_tag_ids_by_index(app_module):
+    first_tag_id = "8c4ef3d1-58a1-4d94-8a1c-1c171d889e08"
+    second_tag_id = "3c39395b-6d1f-4030-8b17-eaa7cc85221c"
+    third_tag_id = "9d5ec0f7-4f2b-4e7f-9c13-1e7a034d0eb1"
+    query_args = MultiDict(
+        [
+            ("tag_ids[2]", third_tag_id),
+            ("tag_ids[1]", second_tag_id),
+            ("tag_ids[0]", first_tag_id),
+        ]
+    )
+
+    normalized = app_module._normalize_app_list_query_args(query_args)
+    query = app_module.AppListQuery.model_validate(normalized)
+
+    assert query.tag_ids == [first_tag_id, second_tag_id, third_tag_id]
+
+
+def test_app_list_query_rejects_flat_tag_ids(app_module):
+    tag_id = "8c4ef3d1-58a1-4d94-8a1c-1c171d889e08"
+    normalized = app_module._normalize_app_list_query_args(MultiDict([("tag_ids", tag_id)]))
+
+    with pytest.raises(ValidationError):
+        app_module.AppListQuery.model_validate(normalized)
+
+
 def test_app_partial_serialization_uses_aliases(app_models):
     AppPartial = app_models.AppPartial
     created_at = _ts()
diff --git a/api/tests/unit_tests/controllers/console/app/test_conversation_variables_api.py b/api/tests/unit_tests/controllers/console/app/test_conversation_variables_api.py
index 1a412aff29..71b6a1aa37 100644
--- a/api/tests/unit_tests/controllers/console/app/test_conversation_variables_api.py
+++ b/api/tests/unit_tests/controllers/console/app/test_conversation_variables_api.py
@@ -5,6 +5,7 @@ from datetime import UTC, datetime
 from types import SimpleNamespace
 
 import pytest
+from flask import Flask
 from pydantic import ValidationError
 
 from controllers.console.app import conversation_variables as conversation_variables_module
@@ -20,7 +21,7 @@ def _unwrap(func):
     return func
 
 
-def test_get_conversation_variables_returns_paginated_response(app, monkeypatch: pytest.MonkeyPatch) -> None:
+def test_get_conversation_variables_returns_paginated_response(app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
     api = conversation_variables_module.ConversationVariablesApi()
     method = _unwrap(api.get)
 
@@ -63,7 +64,9 @@ def test_get_conversation_variables_returns_paginated_response(app, monkeypatch:
     assert response["data"][0]["updated_at"] == int(updated_at.timestamp())
 
 
-def test_get_conversation_variables_normalizes_value_type_and_value(app, monkeypatch: pytest.MonkeyPatch) -> None:
+def test_get_conversation_variables_normalizes_value_type_and_value(
+    app: Flask, monkeypatch: pytest.MonkeyPatch
+) -> None:
     api = conversation_variables_module.ConversationVariablesApi()
     method = _unwrap(api.get)
 
diff --git a/api/tests/unit_tests/controllers/console/app/test_workflow.py b/api/tests/unit_tests/controllers/console/app/test_workflow.py
index 7c470eb9a8..e7fc1f8042 100644
--- a/api/tests/unit_tests/controllers/console/app/test_workflow.py
+++ b/api/tests/unit_tests/controllers/console/app/test_workflow.py
@@ -3,14 +3,18 @@ from __future__ import annotations
 import json
 from datetime import datetime
 from types import SimpleNamespace
+from typing import cast
 from unittest.mock import Mock
 
 import pytest
+from pydantic import ValidationError
 from werkzeug.exceptions import HTTPException, NotFound
 
 from controllers.console.app import workflow as workflow_module
 from controllers.console.app.error import DraftWorkflowNotExist, DraftWorkflowNotSync
 from graphon.file import File, FileTransferMethod, FileType
+from graphon.variables import SecretVariable, StringVariable
+from graphon.variables.variables import RAGPipelineVariable
 
 
 def _unwrap(func):
@@ -19,11 +23,67 @@ def _unwrap(func):
     return func
 
 
+def _make_workflow(**overrides):
+    workflow = SimpleNamespace(
+        id="workflow-1",
+        graph_dict={"nodes": [], "edges": []},
+        features_dict={"file_upload": {"enabled": False}},
+        unique_hash="hash-1",
+        version="1",
+        marked_name="Release 1",
+        marked_comment="Initial release",
+        created_by_account=SimpleNamespace(id="user-1", name="Alice", email="alice@example.com"),
+        created_at=datetime(2024, 1, 1, 12, 0, 0),
+        updated_by_account=None,
+        updated_at=datetime(2024, 1, 1, 12, 1, 0),
+        tool_published=False,
+        environment_variables=[
+            {
+                "id": "env-1",
+                "name": "API_KEY",
+                "value": "[__HIDDEN__]",
+                "value_type": "secret",
+                "description": "API key",
+            }
+        ],
+        conversation_variables=[
+            {
+                "id": "conv-1",
+                "name": "topic",
+                "value": "hello",
+                "value_type": "string",
+                "description": "Topic",
+            }
+        ],
+        rag_pipeline_variables=[
+            {
+                "variable": "query",
+                "type": "text-input",
+                "label": "Query",
+                "belong_to_node_id": "shared",
+                "max_length": 0,
+                "required": False,
+                "unit": "",
+                "default_value": "",
+                "options": [],
+                "placeholder": "",
+                "tooltips": "",
+                "allowed_file_types": ["custom"],
+                "allowed_file_extensions": [".pdf"],
+                "allowed_file_upload_methods": ["local_file"],
+            }
+        ],
+    )
+    for key, value in overrides.items():
+        setattr(workflow, key, value)
+    return workflow
+
+
 def test_parse_file_no_config(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setattr(workflow_module.FileUploadConfigManager, "convert", lambda *_args, **_kwargs: None)
     workflow = SimpleNamespace(features_dict={}, tenant_id="t1")
 
-    assert workflow_module._parse_file(workflow, files=[{"id": "f"}]) == []
+    assert workflow_module._parse_file(cast(workflow_module.Workflow, workflow), files=[{"id": "f"}]) == []
 
 
 def test_parse_file_with_config(monkeypatch: pytest.MonkeyPatch) -> None:
@@ -41,7 +101,7 @@ def test_parse_file_with_config(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setattr(workflow_module.file_factory, "build_from_mappings", build_mock)
 
     workflow = SimpleNamespace(features_dict={}, tenant_id="t1")
-    result = workflow_module._parse_file(workflow, files=[{"id": "f"}])
+    result = workflow_module._parse_file(cast(workflow_module.Workflow, workflow), files=[{"id": "f"}])
 
     assert result == file_list
     build_mock.assert_called_once()
@@ -259,7 +319,7 @@ def test_restore_published_workflow_to_draft_returns_400_for_invalid_structure(
     assert exc.value.description == "invalid workflow graph"
 
 
-def test_get_published_workflows_marshals_items_before_session_closes(app, monkeypatch: pytest.MonkeyPatch) -> None:
+def test_get_published_workflows_serializes_items_before_session_closes(app, monkeypatch: pytest.MonkeyPatch) -> None:
     api = workflow_module.PublishedAllWorkflowApi()
     handler = _unwrap(api.get)
 
@@ -278,7 +338,12 @@ def test_get_published_workflows_marshals_items_before_session_closes(app, monke
         def begin(self):
             return _SessionContext()
 
+    base_workflow = _make_workflow()
+
     class _Workflow:
+        def __getattr__(self, name):
+            return getattr(base_workflow, name)
+
         @property
         def id(self):
             assert session_state["open"] is True
@@ -295,12 +360,6 @@ def test_get_published_workflows_marshals_items_before_session_closes(app, monke
         ),
     )
 
-    def _fake_marshal(items, fields):
-        assert session_state["open"] is True
-        return [{"id": item.id} for item in items]
-
-    monkeypatch.setattr(workflow_module, "marshal", _fake_marshal)
-
     with app.test_request_context(
         "/apps/app/workflows",
         method="GET",
@@ -308,12 +367,153 @@ def test_get_published_workflows_marshals_items_before_session_closes(app, monke
     ):
         response = handler(api, app_model=SimpleNamespace(id="app", workflow_id="wf-1"))
 
-    assert response == {
-        "items": [{"id": "w1"}],
-        "page": 1,
-        "limit": 10,
-        "has_more": False,
-    }
+    assert response["items"][0]["id"] == "w1"
+    assert response["page"] == 1
+    assert response["limit"] == 10
+    assert response["has_more"] is False
+
+
+def test_draft_workflow_get_serializes_response_model(monkeypatch: pytest.MonkeyPatch) -> None:
+    workflow = _make_workflow()
+    monkeypatch.setattr(
+        workflow_module, "WorkflowService", lambda: SimpleNamespace(get_draft_workflow=lambda **_kwargs: workflow)
+    )
+
+    api = workflow_module.DraftWorkflowApi()
+    handler = _unwrap(api.get)
+
+    response = handler(api, app_model=SimpleNamespace(id="app"))
+
+    assert response["id"] == "workflow-1"
+    assert response["graph"] == {"nodes": [], "edges": []}
+    assert response["features"] == {"file_upload": {"enabled": False}}
+    assert response["hash"] == "hash-1"
+    assert response["created_by"] == {"id": "user-1", "name": "Alice", "email": "alice@example.com"}
+    assert response["updated_by"] is None
+    assert response["created_at"] == int(datetime(2024, 1, 1, 12, 0, 0).timestamp())
+    assert response["updated_at"] == int(datetime(2024, 1, 1, 12, 1, 0).timestamp())
+    assert response["environment_variables"] == [
+        {
+            "id": "env-1",
+            "name": "API_KEY",
+            "value": "[__HIDDEN__]",
+            "value_type": "secret",
+            "description": "API key",
+        }
+    ]
+    assert response["conversation_variables"] == [
+        {
+            "id": "conv-1",
+            "name": "topic",
+            "value": "hello",
+            "value_type": "string",
+            "description": "Topic",
+        }
+    ]
+    assert response["rag_pipeline_variables"] == [
+        {
+            "label": "Query",
+            "variable": "query",
+            "type": "text-input",
+            "belong_to_node_id": "shared",
+            "max_length": 0,
+            "required": False,
+            "unit": "",
+            "default_value": "",
+            "options": [],
+            "placeholder": "",
+            "tooltips": "",
+            "allowed_file_types": ["custom"],
+            "allowed_file_extensions": [".pdf"],
+            "allowed_file_upload_methods": ["local_file"],
+        }
+    ]
+
+
+def test_pipeline_variable_response_accepts_legacy_file_field_names() -> None:
+    response = workflow_module.PipelineVariableResponse.model_validate(
+        {
+            "label": "Query",
+            "variable": "query",
+            "type": "single-file",
+            "belong_to_node_id": "shared",
+            "max_length": 0,
+            "required": False,
+            "unit": "",
+            "default_value": "",
+            "options": [],
+            "placeholder": "",
+            "tooltips": "",
+            "allowed_file_types": [],
+            "allow_file_extension": [".txt"],
+            "allow_file_upload_methods": ["remote_url"],
+        }
+    ).model_dump(mode="json")
+
+    assert response["allowed_file_extensions"] == [".txt"]
+    assert response["allowed_file_upload_methods"] == ["remote_url"]
+
+
+def test_pipeline_variable_response_accepts_explicit_null_optional_fields() -> None:
+    pipeline_variable = RAGPipelineVariable.model_validate(
+        {
+            "label": "Query",
+            "variable": "query",
+            "type": "text-input",
+            "belong_to_node_id": "shared",
+            "max_length": None,
+            "unit": None,
+            "default_value": None,
+            "options": None,
+            "placeholder": None,
+            "tooltips": None,
+            "allowed_file_types": None,
+            "allowed_file_extensions": None,
+            "allowed_file_upload_methods": None,
+        }
+    ).model_dump(mode="json")
+
+    response = workflow_module.PipelineVariableResponse.model_validate(pipeline_variable).model_dump(mode="json")
+
+    assert response["max_length"] is None
+    assert response["allowed_file_types"] is None
+    assert response["allowed_file_extensions"] is None
+    assert response["allowed_file_upload_methods"] is None
+
+
+def test_workflow_response_masks_secret_environment_variables() -> None:
+    workflow = _make_workflow(
+        environment_variables=[
+            SecretVariable(id="env-secret", name="API_KEY", value="plain-token", selector=["env", "API_KEY"]),
+            StringVariable(id="env-string", name="REGION", value="us-east-1", selector=["env", "REGION"]),
+        ]
+    )
+
+    response = workflow_module.WorkflowResponse.model_validate(workflow, from_attributes=True).model_dump(mode="json")
+
+    assert response["environment_variables"] == [
+        {
+            "id": "env-secret",
+            "name": "API_KEY",
+            "value": workflow_module.encrypter.full_mask_token(),
+            "value_type": "secret",
+            "description": "",
+        },
+        {
+            "id": "env-string",
+            "name": "REGION",
+            "value": "us-east-1",
+            "value_type": "string",
+            "description": "",
+        },
+    ]
+
+
+def test_workflow_response_rejects_invalid_environment_variable_dict() -> None:
+    workflow = _make_workflow(environment_variables=[{"value_type": "not-a-segment-type"}])
+
+    with pytest.raises(ValidationError):
+        workflow_module.WorkflowResponse.model_validate(workflow, from_attributes=True)
 
 
 def test_draft_workflow_get_not_found(monkeypatch: pytest.MonkeyPatch) -> None:
@@ -373,10 +573,33 @@ def test_workflow_online_users_filters_inaccessible_workflow(app, monkeypatch: p
                     "avatar": "avatar-file-id",
                     "sid": "sid-1",
                 }
-            )
+            ),
+            b"sid-malformed": json.dumps({"avatar": "avatar-file-id", "sid": "sid-malformed"}),
+            b"sid-invalid-avatar": json.dumps(
+                {
+                    "user_id": "u-2",
+                    "username": "Bob",
+                    "avatar": {"file_id": "avatar-file-id"},
+                }
+            ),
+            b"sid-invalid-user-id": json.dumps(
+                {
+                    "user_id": 42,
+                    "username": "Carol",
+                    "avatar": "avatar-file-id",
+                }
+            ),
+            b"sid-invalid-username": json.dumps(
+                {
+                    "user_id": "u-4",
+                    "username": ["Dave"],
+                    "avatar": "avatar-file-id",
+                }
+            ),
         }
     ]
-    workflow_module.redis_client.pipeline.return_value = redis_pipeline
+    redis_pipeline_factory = Mock(return_value=redis_pipeline)
+    monkeypatch.setattr(workflow_module.redis_client, "pipeline", redis_pipeline_factory)
 
     api = workflow_module.WorkflowOnlineUsersApi()
     handler = _unwrap(api.post)
@@ -397,13 +620,17 @@ def test_workflow_online_users_filters_inaccessible_workflow(app, monkeypatch: p
                         "user_id": "u-1",
                         "username": "Alice",
                         "avatar": signed_avatar_url,
-                        "sid": "sid-1",
-                    }
+                    },
+                    {
+                        "user_id": "u-2",
+                        "username": "Bob",
+                        "avatar": None,
+                    },
                 ],
             }
         ]
     }
-    workflow_module.redis_client.pipeline.assert_called_once_with(transaction=False)
+    redis_pipeline_factory.assert_called_once_with(transaction=False)
     redis_pipeline.hgetall.assert_called_once_with(f"{workflow_module.WORKFLOW_ONLINE_USERS_PREFIX}{app_id_1}")
     redis_pipeline.execute.assert_called_once_with()
     sign_avatar.assert_called_once_with("avatar-file-id")
@@ -422,7 +649,8 @@ def test_workflow_online_users_batches_redis_reads(app, monkeypatch: pytest.Monk
     first_pipeline.execute.return_value = [{} for _ in range(workflow_module.WORKFLOW_ONLINE_USERS_REDIS_BATCH_SIZE)]
     second_pipeline = Mock()
     second_pipeline.execute.return_value = [{}]
-    workflow_module.redis_client.pipeline.side_effect = [first_pipeline, second_pipeline]
+    redis_pipeline_factory = Mock(side_effect=[first_pipeline, second_pipeline])
+    monkeypatch.setattr(workflow_module.redis_client, "pipeline", redis_pipeline_factory)
 
     api = workflow_module.WorkflowOnlineUsersApi()
     handler = _unwrap(api.post)
@@ -435,7 +663,7 @@ def test_workflow_online_users_batches_redis_reads(app, monkeypatch: pytest.Monk
         response = handler(api)
 
     assert len(response["data"]) == len(app_ids)
-    assert workflow_module.redis_client.pipeline.call_count == 2
+    assert redis_pipeline_factory.call_count == 2
     assert first_pipeline.hgetall.call_count == workflow_module.WORKFLOW_ONLINE_USERS_REDIS_BATCH_SIZE
     assert second_pipeline.hgetall.call_count == 1
 
@@ -463,5 +691,6 @@ def test_workflow_online_users_rejects_excessive_workflow_ids(app, monkeypatch:
             handler(api)
 
     assert exc.value.code == 400
+    assert exc.value.description is not None
     assert "Maximum" in exc.value.description
     accessible_app_ids.assert_not_called()
diff --git a/api/tests/unit_tests/controllers/console/app/test_workflow_comment_api.py b/api/tests/unit_tests/controllers/console/app/test_workflow_comment_api.py
index 85afcf0e60..baa21999f9 100644
--- a/api/tests/unit_tests/controllers/console/app/test_workflow_comment_api.py
+++ b/api/tests/unit_tests/controllers/console/app/test_workflow_comment_api.py
@@ -17,6 +17,15 @@ from controllers.console.app import wraps as app_wraps
 from libs import login as login_lib
 from models.account import Account, AccountStatus, TenantAccountRole
 
+JAN_1_2024_NOON = datetime(2024, 1, 1, 12, 0, 0)
+JAN_1_2024_NOON_TS = int(JAN_1_2024_NOON.timestamp())
+JAN_1_2024_1201 = datetime(2024, 1, 1, 12, 1, 0)
+JAN_1_2024_1201_TS = int(JAN_1_2024_1201.timestamp())
+JAN_1_2024_1202 = datetime(2024, 1, 1, 12, 2, 0)
+JAN_1_2024_1202_TS = int(JAN_1_2024_1202.timestamp())
+JAN_1_2024_1203 = datetime(2024, 1, 1, 12, 3, 0)
+JAN_1_2024_1203_TS = int(JAN_1_2024_1203.timestamp())
+
 
 def _make_account(role: TenantAccountRole) -> Account:
     account = Account(name="tester", email="tester@example.com")
@@ -78,6 +87,30 @@ class WriteCase:
     payload: dict[str, object] | None = None
 
 
+@dataclass(frozen=True)
+class MutationResponseCase:
+    resource_cls: type
+    method_name: str
+    path: str
+    kwargs: dict[str, str]
+    service_method_name: str
+    service_return: object
+    expected_response: dict[str, object]
+    payload: dict[str, object] | None = None
+    expected_status: int | None = None
+
+
+def _unwrap_response(result: object) -> tuple[dict[str, object], int | None]:
+    if isinstance(result, tuple):
+        response, status = result
+        assert isinstance(response, dict)
+        assert isinstance(status, int)
+        return response, status
+
+    assert isinstance(result, dict)
+    return result, None
+
+
 @pytest.mark.parametrize(
     "case",
     [
@@ -151,17 +184,20 @@ def test_create_comment_allows_editor(app: Flask, monkeypatch: pytest.MonkeyPatc
 
     create_comment_mock = MagicMock(return_value={"id": "comment-1"})
     monkeypatch.setattr(workflow_comment_module.WorkflowCommentService, "create_comment", create_comment_mock)
-    payload = {"content": "hello", "position_x": 1.0, "position_y": 2.0, "mentioned_user_ids": []}
+    payload: dict[str, object] = {
+        "content": "hello",
+        "position_x": 1.0,
+        "position_y": 2.0,
+        "mentioned_user_ids": [],
+    }
 
     with app.test_request_context("/console/api/apps/app-123/workflow/comments", method="POST", json=payload):
         with _patch_payload(payload):
             result = workflow_comment_module.WorkflowCommentListApi().post(app_id="app-123")
 
-    if isinstance(result, tuple):
-        response = result[0]
-    else:
-        response = result
+    response, status = _unwrap_response(result)
     assert response["id"] == "comment-1"
+    assert status == 201
     create_comment_mock.assert_called_once_with(
         tenant_id="tenant-123",
         app_id="app-123",
@@ -181,14 +217,17 @@ def test_update_comment_omits_mentions_when_payload_does_not_include_them(
     app_model = _make_app()
     _patch_console_guards(monkeypatch, account, app_model)
 
-    update_comment_mock = MagicMock(return_value={"id": "comment-1", "updated_at": datetime(2024, 1, 1, 12, 0, 0)})
+    update_comment_mock = MagicMock(return_value={"id": "comment-1", "updated_at": JAN_1_2024_NOON})
     monkeypatch.setattr(workflow_comment_module.WorkflowCommentService, "update_comment", update_comment_mock)
-    payload = {"content": "hello", "position_x": 10.0, "position_y": 20.0}
+    payload: dict[str, object] = {"content": "hello", "position_x": 10.0, "position_y": 20.0}
 
     with app.test_request_context("/console/api/apps/app-123/workflow/comments/comment-1", method="PUT", json=payload):
         with _patch_payload(payload):
-            workflow_comment_module.WorkflowCommentDetailApi().put(app_id="app-123", comment_id="comment-1")
+            result = workflow_comment_module.WorkflowCommentDetailApi().put(app_id="app-123", comment_id="comment-1")
 
+    response, status = _unwrap_response(result)
+    assert response == {"id": "comment-1", "updated_at": JAN_1_2024_NOON_TS}
+    assert status is None
     update_comment_mock.assert_called_once_with(
         tenant_id="tenant-123",
         app_id="app-123",
@@ -199,3 +238,254 @@ def test_update_comment_omits_mentions_when_payload_does_not_include_them(
         position_y=20.0,
         mentioned_user_ids=None,
     )
+
+
+def test_list_comments_serializes_response_model(app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
+    app.config.setdefault("RESTX_MASK_HEADER", "X-Fields")
+    account = _make_account(TenantAccountRole.NORMAL)
+    app_model = _make_app()
+    _patch_console_guards(monkeypatch, account, app_model)
+
+    comment_author = SimpleNamespace(
+        id="account-123",
+        name="tester",
+        email="tester@example.com",
+        avatar="https://example.com/avatar.png",
+    )
+    comment = SimpleNamespace(
+        id="comment-1",
+        position_x=1.5,
+        position_y=2.5,
+        content="hello",
+        created_by="account-123",
+        created_by_account=comment_author,
+        created_at=1_700_000_000,
+        updated_at=1_700_000_001,
+        resolved=False,
+        resolved_at=None,
+        resolved_by=None,
+        resolved_by_account=None,
+        reply_count=0,
+        mention_count=0,
+        participants=[comment_author],
+    )
+    get_comments_mock = MagicMock(return_value=[comment])
+    monkeypatch.setattr(workflow_comment_module.WorkflowCommentService, "get_comments", get_comments_mock)
+
+    with app.test_request_context("/console/api/apps/app-123/workflow/comments", method="GET"):
+        response = workflow_comment_module.WorkflowCommentListApi().get(app_id="app-123")
+
+    assert response == {
+        "data": [
+            {
+                "id": "comment-1",
+                "position_x": 1.5,
+                "position_y": 2.5,
+                "content": "hello",
+                "created_by": "account-123",
+                "created_by_account": {
+                    "id": "account-123",
+                    "name": "tester",
+                    "email": "tester@example.com",
+                    "avatar_url": "https://example.com/avatar.png",
+                },
+                "created_at": 1_700_000_000,
+                "updated_at": 1_700_000_001,
+                "resolved": False,
+                "resolved_at": None,
+                "resolved_by": None,
+                "resolved_by_account": None,
+                "reply_count": 0,
+                "mention_count": 0,
+                "participants": [
+                    {
+                        "id": "account-123",
+                        "name": "tester",
+                        "email": "tester@example.com",
+                        "avatar_url": "https://example.com/avatar.png",
+                    }
+                ],
+            }
+        ]
+    }
+    get_comments_mock.assert_called_once_with(tenant_id="tenant-123", app_id="app-123")
+
+
+def test_get_comment_serializes_detail_response_model(app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
+    app.config.setdefault("RESTX_MASK_HEADER", "X-Fields")
+    account = _make_account(TenantAccountRole.NORMAL)
+    app_model = _make_app()
+    _patch_console_guards(monkeypatch, account, app_model)
+
+    comment_author = SimpleNamespace(
+        id="account-123",
+        name="tester",
+        email="tester@example.com",
+        avatar="https://example.com/avatar.png",
+    )
+    mentioned_user = SimpleNamespace(
+        id="account-456",
+        name="mentioned",
+        email="mentioned@example.com",
+        avatar=None,
+    )
+    comment = SimpleNamespace(
+        id="comment-1",
+        position_x=1.5,
+        position_y=2.5,
+        content="hello",
+        created_by="account-123",
+        created_by_account=comment_author,
+        created_at=JAN_1_2024_NOON,
+        updated_at=JAN_1_2024_1201,
+        resolved=True,
+        resolved_at=JAN_1_2024_1202,
+        resolved_by="account-123",
+        resolved_by_account=comment_author,
+        replies=[
+            SimpleNamespace(
+                id="reply-1",
+                content="reply",
+                created_by="account-456",
+                created_by_account=mentioned_user,
+                created_at=JAN_1_2024_1203,
+            )
+        ],
+        mentions=[
+            SimpleNamespace(
+                mentioned_user_id="account-456",
+                mentioned_user_account=mentioned_user,
+                reply_id="reply-1",
+            )
+        ],
+    )
+    get_comment_mock = MagicMock(return_value=comment)
+    monkeypatch.setattr(workflow_comment_module.WorkflowCommentService, "get_comment", get_comment_mock)
+
+    with app.test_request_context("/console/api/apps/app-123/workflow/comments/comment-1", method="GET"):
+        response = workflow_comment_module.WorkflowCommentDetailApi().get(app_id="app-123", comment_id="comment-1")
+
+    assert response == {
+        "id": "comment-1",
+        "position_x": 1.5,
+        "position_y": 2.5,
+        "content": "hello",
+        "created_by": "account-123",
+        "created_by_account": {
+            "id": "account-123",
+            "name": "tester",
+            "email": "tester@example.com",
+            "avatar_url": "https://example.com/avatar.png",
+        },
+        "created_at": JAN_1_2024_NOON_TS,
+        "updated_at": JAN_1_2024_1201_TS,
+        "resolved": True,
+        "resolved_at": JAN_1_2024_1202_TS,
+        "resolved_by": "account-123",
+        "resolved_by_account": {
+            "id": "account-123",
+            "name": "tester",
+            "email": "tester@example.com",
+            "avatar_url": "https://example.com/avatar.png",
+        },
+        "replies": [
+            {
+                "id": "reply-1",
+                "content": "reply",
+                "created_by": "account-456",
+                "created_by_account": {
+                    "id": "account-456",
+                    "name": "mentioned",
+                    "email": "mentioned@example.com",
+                    "avatar_url": None,
+                },
+                "created_at": JAN_1_2024_1203_TS,
+            }
+        ],
+        "mentions": [
+            {
+                "mentioned_user_id": "account-456",
+                "mentioned_user_account": {
+                    "id": "account-456",
+                    "name": "mentioned",
+                    "email": "mentioned@example.com",
+                    "avatar_url": None,
+                },
+                "reply_id": "reply-1",
+            }
+        ],
+    }
+    get_comment_mock.assert_called_once_with(tenant_id="tenant-123", app_id="app-123", comment_id="comment-1")
+
+
+@pytest.mark.parametrize(
+    "case",
+    [
+        MutationResponseCase(
+            resource_cls=workflow_comment_module.WorkflowCommentResolveApi,
+            method_name="post",
+            path="/console/api/apps/app-123/workflow/comments/comment-1/resolve",
+            kwargs={"app_id": "app-123", "comment_id": "comment-1"},
+            service_method_name="resolve_comment",
+            service_return={
+                "id": "comment-1",
+                "resolved": True,
+                "resolved_at": JAN_1_2024_NOON,
+                "resolved_by": "account-123",
+            },
+            expected_response={
+                "id": "comment-1",
+                "resolved": True,
+                "resolved_at": JAN_1_2024_NOON_TS,
+                "resolved_by": "account-123",
+            },
+        ),
+        MutationResponseCase(
+            resource_cls=workflow_comment_module.WorkflowCommentReplyApi,
+            method_name="post",
+            path="/console/api/apps/app-123/workflow/comments/comment-1/replies",
+            kwargs={"app_id": "app-123", "comment_id": "comment-1"},
+            payload={"content": "reply", "mentioned_user_ids": []},
+            service_method_name="create_reply",
+            service_return={"id": "reply-1", "created_at": JAN_1_2024_NOON},
+            expected_response={"id": "reply-1", "created_at": JAN_1_2024_NOON_TS},
+            expected_status=201,
+        ),
+        MutationResponseCase(
+            resource_cls=workflow_comment_module.WorkflowCommentReplyDetailApi,
+            method_name="put",
+            path="/console/api/apps/app-123/workflow/comments/comment-1/replies/reply-1",
+            kwargs={"app_id": "app-123", "comment_id": "comment-1", "reply_id": "reply-1"},
+            payload={"content": "reply", "mentioned_user_ids": []},
+            service_method_name="update_reply",
+            service_return={"id": "reply-1", "updated_at": JAN_1_2024_NOON},
+            expected_response={"id": "reply-1", "updated_at": JAN_1_2024_NOON_TS},
+        ),
+    ],
+)
+def test_mutation_endpoints_serialize_response_models(
+    app: Flask, monkeypatch: pytest.MonkeyPatch, case: MutationResponseCase
+) -> None:
+    app.config.setdefault("RESTX_MASK_HEADER", "X-Fields")
+    account = _make_account(TenantAccountRole.EDITOR)
+    app_model = _make_app()
+    _patch_console_guards(monkeypatch, account, app_model)
+    _patch_write_services(monkeypatch)
+    monkeypatch.setattr(
+        workflow_comment_module.WorkflowCommentService,
+        case.service_method_name,
+        MagicMock(return_value=case.service_return),
+    )
+
+    with app.test_request_context(case.path, method=case.method_name.upper(), json=case.payload):
+        with _patch_payload(case.payload):
+            result = getattr(case.resource_cls(), case.method_name)(**case.kwargs)
+
+    response, status = _unwrap_response(result)
+    assert response == case.expected_response
+    assert status == case.expected_status
+
+
+def test_workflow_comment_response_schemas_are_registered() -> None:
+    assert workflow_comment_module.WorkflowCommentBasicList.__name__ in workflow_comment_module.console_ns.models
+    assert workflow_comment_module.WorkflowCommentDetail.__name__ in workflow_comment_module.console_ns.models
diff --git a/api/tests/unit_tests/controllers/console/app/test_workflow_pause_details_api.py b/api/tests/unit_tests/controllers/console/app/test_workflow_pause_details_api.py
index c4a8148446..58274f1688 100644
--- a/api/tests/unit_tests/controllers/console/app/test_workflow_pause_details_api.py
+++ b/api/tests/unit_tests/controllers/console/app/test_workflow_pause_details_api.py
@@ -12,7 +12,7 @@ from controllers.console.app import workflow_run as workflow_run_module
 from controllers.web.error import NotFoundError
 from graphon.entities.pause_reason import HumanInputRequired
 from graphon.enums import WorkflowExecutionStatus
-from graphon.nodes.human_input.entities import FormInput, UserAction
+from graphon.nodes.human_input.entities import ParagraphInputConfig, UserActionConfig
 from graphon.nodes.human_input.enums import FormInputType
 from libs import login as login_lib
 from models.account import Account, AccountStatus, TenantAccountRole
@@ -20,8 +20,11 @@ from models.workflow import WorkflowRun
 
 
 def _make_account() -> Account:
-    account = Account(name="tester", email="tester@example.com")
-    account.status = AccountStatus.ACTIVE
+    account = Account(
+        name="tester",
+        email="tester@example.com",
+        status=AccountStatus.ACTIVE,
+    )
     account.role = TenantAccountRole.OWNER
     account.id = "account-123"  # type: ignore[assignment]
     account._current_tenant = SimpleNamespace(id="tenant-123")  # type: ignore[attr-defined]
@@ -63,8 +66,8 @@ def test_pause_details_returns_backstage_input_url(app: Flask, monkeypatch: pyte
     reason = HumanInputRequired(
         form_id="form-1",
         form_content="content",
-        inputs=[FormInput(type=FormInputType.TEXT_INPUT, output_variable_name="name")],
-        actions=[UserAction(id="approve", title="Approve")],
+        inputs=[ParagraphInputConfig(type=FormInputType.PARAGRAPH, output_variable_name="name")],
+        actions=[UserActionConfig(id="approve", title="Approve")],
         node_id="node-1",
         node_title="Ask Name",
     )
@@ -112,3 +115,24 @@ def test_pause_details_tenant_isolation(app: Flask, monkeypatch: pytest.MonkeyPa
     with pytest.raises(NotFoundError):
         with app.test_request_context("/console/api/workflow/run-1/pause-details", method="GET"):
             response, status = workflow_run_module.ConsoleWorkflowPauseDetailsApi().get(workflow_run_id="run-1")
+
+
+def test_pause_details_returns_empty_response_for_non_paused_run(app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
+    account = _make_account()
+    _patch_console_guards(monkeypatch, account)
+
+    workflow_run = Mock(spec=WorkflowRun)
+    workflow_run.tenant_id = "tenant-123"
+    workflow_run.status = WorkflowExecutionStatus.RUNNING
+    fake_db = SimpleNamespace(engine=Mock(), session=SimpleNamespace(get=lambda *_: workflow_run))
+    monkeypatch.setattr(workflow_run_module, "db", fake_db)
+
+    with app.test_request_context("/console/api/workflow/run-1/pause-details", method="GET"):
+        response, status = workflow_run_module.ConsoleWorkflowPauseDetailsApi().get(workflow_run_id="run-1")
+
+    assert status == 200
+    assert response == {"paused_at": None, "paused_nodes": []}
+
+
+def test_pause_details_response_schema_is_registered() -> None:
+    assert workflow_run_module.WorkflowPauseDetailsResponse.__name__ in workflow_run_module.console_ns.models
diff --git a/api/tests/unit_tests/controllers/console/app/test_workflow_run_api.py b/api/tests/unit_tests/controllers/console/app/test_workflow_run_api.py
new file mode 100644
index 0000000000..e225e31563
--- /dev/null
+++ b/api/tests/unit_tests/controllers/console/app/test_workflow_run_api.py
@@ -0,0 +1,248 @@
+from __future__ import annotations
+
+from datetime import UTC, datetime
+from types import SimpleNamespace
+from typing import Any
+
+import pytest
+from flask import Flask
+from flask_restx import marshal
+
+from controllers.console.app import workflow_run as workflow_run_module
+
+
+def _unwrap(func):
+    while hasattr(func, "__wrapped__"):
+        func = func.__wrapped__
+    return func
+
+
+def _serialize_200_response(handler, payload: Any) -> Any:
+    response_doc = getattr(handler, "__apidoc__", {}).get("responses", {}).get("200")
+    if response_doc is None:
+        return payload
+
+    response_model = response_doc[1]
+    if isinstance(response_model, dict):
+        return marshal(payload, response_model)
+    return payload
+
+
+def _account() -> SimpleNamespace:
+    return SimpleNamespace(id="account-1", name="Alice", email="alice@example.com")
+
+
+def _workflow_run_summary(**overrides) -> SimpleNamespace:
+    created_at = datetime(2026, 1, 2, 3, 4, 5, tzinfo=UTC)
+    payload = {
+        "id": "run-1",
+        "version": "v1",
+        "status": "succeeded",
+        "elapsed_time": 1.5,
+        "total_tokens": 10,
+        "total_steps": 2,
+        "created_by_account": _account(),
+        "created_at": created_at,
+        "finished_at": created_at,
+        "exceptions_count": 0,
+        "retry_index": 0,
+    }
+    payload.update(overrides)
+    return SimpleNamespace(**payload)
+
+
+def _workflow_run_node_execution(**overrides) -> SimpleNamespace:
+    created_at = datetime(2026, 1, 2, 3, 4, 5, tzinfo=UTC)
+    payload = {
+        "id": "node-exec-1",
+        "index": 1,
+        "predecessor_node_id": None,
+        "node_id": "node-1",
+        "node_type": "start",
+        "title": "Start",
+        "inputs_dict": {"query": "hello"},
+        "process_data_dict": {"step": "prepared"},
+        "outputs_dict": {"answer": "world"},
+        "status": "succeeded",
+        "error": None,
+        "elapsed_time": 1.0,
+        "execution_metadata_dict": {"total_tokens": 3},
+        "extras": {},
+        "created_at": created_at,
+        "created_by_role": "account",
+        "created_by_account": _account(),
+        "created_by_end_user": None,
+        "finished_at": created_at,
+        "inputs_truncated": False,
+        "outputs_truncated": False,
+        "process_data_truncated": False,
+    }
+    payload.update(overrides)
+    return SimpleNamespace(**payload)
+
+
+def test_workflow_run_list_returns_frontend_history_contract(app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
+    class WorkflowRunService:
+        def get_paginate_workflow_runs(self, **_kwargs):
+            return {
+                "limit": 10,
+                "has_more": False,
+                "data": [_workflow_run_summary()],
+            }
+
+    monkeypatch.setattr(workflow_run_module, "WorkflowRunService", WorkflowRunService)
+
+    api = workflow_run_module.WorkflowRunListApi()
+    handler = _unwrap(api.get)
+
+    with app.test_request_context("/apps/app-1/workflow-runs?limit=10", method="GET"):
+        payload = handler(api, app_model=SimpleNamespace(id="app-1", tenant_id="tenant-1"))
+
+    response = _serialize_200_response(api.get, payload)
+
+    assert response["limit"] == 10
+    assert response["has_more"] is False
+    assert response["data"][0] == {
+        "id": "run-1",
+        "version": "v1",
+        "status": "succeeded",
+        "elapsed_time": 1.5,
+        "total_tokens": 10,
+        "total_steps": 2,
+        "created_by_account": {"id": "account-1", "name": "Alice", "email": "alice@example.com"},
+        "created_at": 1767323045,
+        "finished_at": 1767323045,
+        "exceptions_count": 0,
+        "retry_index": 0,
+    }
+
+
+def test_advanced_chat_workflow_run_list_keeps_message_fields(app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
+    class WorkflowRunService:
+        def get_paginate_advanced_chat_workflow_runs(self, **_kwargs):
+            return {
+                "limit": 1,
+                "has_more": True,
+                "data": [
+                    _workflow_run_summary(
+                        conversation_id="conversation-1",
+                        message_id="message-1",
+                    )
+                ],
+            }
+
+    monkeypatch.setattr(workflow_run_module, "WorkflowRunService", WorkflowRunService)
+
+    api = workflow_run_module.AdvancedChatAppWorkflowRunListApi()
+    handler = _unwrap(api.get)
+
+    with app.test_request_context("/apps/app-1/advanced-chat/workflow-runs?limit=1", method="GET"):
+        payload = handler(api, app_model=SimpleNamespace(id="app-1", tenant_id="tenant-1"))
+
+    response = _serialize_200_response(api.get, payload)
+
+    assert response["data"][0]["conversation_id"] == "conversation-1"
+    assert response["data"][0]["message_id"] == "message-1"
+
+
+def test_workflow_run_detail_returns_frontend_detail_contract(app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
+    created_at = datetime(2026, 1, 2, 3, 4, 5, tzinfo=UTC)
+    workflow_run = SimpleNamespace(
+        id="run-1",
+        version="v1",
+        graph_dict={"nodes": []},
+        inputs_dict={"query": "hello"},
+        status="succeeded",
+        outputs_dict={"answer": "world"},
+        error=None,
+        elapsed_time=1.5,
+        total_tokens=10,
+        total_steps=2,
+        created_by_role="account",
+        created_by_account=_account(),
+        created_by_end_user=None,
+        created_at=created_at,
+        finished_at=created_at,
+        exceptions_count=0,
+    )
+
+    class WorkflowRunService:
+        def get_workflow_run(self, **_kwargs):
+            return workflow_run
+
+    monkeypatch.setattr(workflow_run_module, "WorkflowRunService", WorkflowRunService)
+
+    api = workflow_run_module.WorkflowRunDetailApi()
+    handler = _unwrap(api.get)
+
+    with app.test_request_context("/apps/app-1/workflow-runs/run-1", method="GET"):
+        payload = handler(api, app_model=SimpleNamespace(id="app-1", tenant_id="tenant-1"), run_id="run-1")
+
+    response = _serialize_200_response(api.get, payload)
+
+    assert response == {
+        "id": "run-1",
+        "version": "v1",
+        "graph": {"nodes": []},
+        "inputs": {"query": "hello"},
+        "status": "succeeded",
+        "outputs": {"answer": "world"},
+        "error": None,
+        "elapsed_time": 1.5,
+        "total_tokens": 10,
+        "total_steps": 2,
+        "created_by_role": "account",
+        "created_by_account": {"id": "account-1", "name": "Alice", "email": "alice@example.com"},
+        "created_by_end_user": None,
+        "created_at": 1767323045,
+        "finished_at": 1767323045,
+        "exceptions_count": 0,
+    }
+
+
+def test_workflow_run_node_executions_return_frontend_trace_contract(
+    app: Flask, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    class WorkflowRunService:
+        def get_workflow_run_node_executions(self, **_kwargs):
+            return [_workflow_run_node_execution()]
+
+    monkeypatch.setattr(workflow_run_module, "WorkflowRunService", WorkflowRunService)
+    monkeypatch.setattr(workflow_run_module, "current_user", SimpleNamespace(id="account-1"))
+
+    api = workflow_run_module.WorkflowRunNodeExecutionListApi()
+    handler = _unwrap(api.get)
+
+    with app.test_request_context("/apps/app-1/workflow-runs/run-1/node-executions", method="GET"):
+        payload = handler(api, app_model=SimpleNamespace(id="app-1", tenant_id="tenant-1"), run_id="run-1")
+
+    response = _serialize_200_response(api.get, payload)
+
+    assert response == {
+        "data": [
+            {
+                "id": "node-exec-1",
+                "index": 1,
+                "predecessor_node_id": None,
+                "node_id": "node-1",
+                "node_type": "start",
+                "title": "Start",
+                "inputs": {"query": "hello"},
+                "process_data": {"step": "prepared"},
+                "outputs": {"answer": "world"},
+                "status": "succeeded",
+                "error": None,
+                "elapsed_time": 1.0,
+                "execution_metadata": {"total_tokens": 3},
+                "extras": {},
+                "created_at": 1767323045,
+                "created_by_role": "account",
+                "created_by_account": {"id": "account-1", "name": "Alice", "email": "alice@example.com"},
+                "created_by_end_user": None,
+                "finished_at": 1767323045,
+                "inputs_truncated": False,
+                "outputs_truncated": False,
+                "process_data_truncated": False,
+            }
+        ]
+    }
diff --git a/api/tests/unit_tests/controllers/console/auth/test_account_activation.py b/api/tests/unit_tests/controllers/console/auth/test_account_activation.py
index d3e864a75a..0fb0ebc330 100644
--- a/api/tests/unit_tests/controllers/console/auth/test_account_activation.py
+++ b/api/tests/unit_tests/controllers/console/auth/test_account_activation.py
@@ -67,7 +67,7 @@ class TestActivateCheckApi:
         assert response["data"]["email"] == "invitee@example.com"
 
     @patch("controllers.console.auth.activate.RegisterService.get_invitation_with_case_fallback")
-    def test_check_invalid_invitation_token(self, mock_get_invitation, app):
+    def test_check_invalid_invitation_token(self, mock_get_invitation, app: Flask):
         """
         Test checking invalid invitation token.
 
@@ -185,7 +185,7 @@ class TestActivateApi:
         mock_db,
         mock_revoke_token,
         mock_get_invitation,
-        app,
+        app: Flask,
         mock_invitation,
         mock_account,
     ):
@@ -227,7 +227,7 @@ class TestActivateApi:
         mock_db.session.commit.assert_called_once()
 
     @patch("controllers.console.auth.activate.RegisterService.get_invitation_with_case_fallback")
-    def test_activation_with_invalid_token(self, mock_get_invitation, app):
+    def test_activation_with_invalid_token(self, mock_get_invitation, app: Flask):
         """
         Test account activation with invalid token.
 
@@ -263,7 +263,7 @@ class TestActivateApi:
         mock_db,
         mock_revoke_token,
         mock_get_invitation,
-        app,
+        app: Flask,
         mock_invitation,
         mock_account,
     ):
@@ -312,7 +312,7 @@ class TestActivateApi:
         mock_db,
         mock_revoke_token,
         mock_get_invitation,
-        app,
+        app: Flask,
         mock_invitation,
         mock_account,
         language,
@@ -358,7 +358,7 @@ class TestActivateApi:
         mock_db,
         mock_revoke_token,
         mock_get_invitation,
-        app,
+        app: Flask,
         mock_invitation,
     ):
         """
@@ -398,7 +398,7 @@ class TestActivateApi:
         mock_db,
         mock_revoke_token,
         mock_get_invitation,
-        app,
+        app: Flask,
         mock_invitation,
     ):
         """
@@ -438,7 +438,7 @@ class TestActivateApi:
         mock_db,
         mock_revoke_token,
         mock_get_invitation,
-        app,
+        app: Flask,
         mock_invitation,
         mock_account,
     ):
diff --git a/api/tests/unit_tests/controllers/console/auth/test_email_register_language.py b/api/tests/unit_tests/controllers/console/auth/test_email_register_language.py
new file mode 100644
index 0000000000..df282880af
--- /dev/null
+++ b/api/tests/unit_tests/controllers/console/auth/test_email_register_language.py
@@ -0,0 +1,40 @@
+from unittest.mock import MagicMock, patch
+
+import pytest
+from pydantic import ValidationError
+
+from controllers.console.auth.email_register import EmailRegisterResetApi, EmailRegisterResetPayload
+
+
+@patch("controllers.console.auth.email_register.AccountService.create_account_and_tenant")
+def test_create_new_account_uses_requested_language(mock_create_account):
+    account = MagicMock()
+    mock_create_account.return_value = account
+
+    result = EmailRegisterResetApi()._create_new_account(
+        "invitee@example.com",
+        "ValidPass123!",
+        timezone="Asia/Shanghai",
+        language="zh-Hans",
+    )
+
+    assert result is account
+    mock_create_account.assert_called_once_with(
+        email="invitee@example.com",
+        name="invitee@example.com",
+        password="ValidPass123!",
+        interface_language="zh-Hans",
+        timezone="Asia/Shanghai",
+    )
+
+
+def test_reset_payload_rejects_invalid_timezone():
+    with pytest.raises(ValidationError):
+        EmailRegisterResetPayload.model_validate(
+            {
+                "token": "token-123",
+                "new_password": "ValidPass123!",
+                "password_confirm": "ValidPass123!",
+                "timezone": "",
+            }
+        )
diff --git a/api/tests/unit_tests/controllers/console/auth/test_email_verification.py b/api/tests/unit_tests/controllers/console/auth/test_email_verification.py
index b7bc73da5f..fa23942c65 100644
--- a/api/tests/unit_tests/controllers/console/auth/test_email_verification.py
+++ b/api/tests/unit_tests/controllers/console/auth/test_email_verification.py
@@ -13,9 +13,10 @@ from unittest.mock import MagicMock, patch
 
 import pytest
 from flask import Flask
+from pydantic import ValidationError
 
 from controllers.console.auth.error import EmailCodeError, InvalidEmailError, InvalidTokenError
-from controllers.console.auth.login import EmailCodeLoginApi, EmailCodeLoginSendEmailApi
+from controllers.console.auth.login import EmailCodeLoginApi, EmailCodeLoginPayload, EmailCodeLoginSendEmailApi
 from controllers.console.error import (
     AccountInFreezeError,
     AccountNotFound,
@@ -31,6 +32,18 @@ def encode_code(code: str) -> str:
     return base64.b64encode(code.encode("utf-8")).decode()
 
 
+def test_email_code_login_payload_rejects_invalid_timezone():
+    with pytest.raises(ValidationError):
+        EmailCodeLoginPayload.model_validate(
+            {
+                "email": "newuser@example.com",
+                "code": "123456",
+                "token": "token-123",
+                "timezone": "",
+            }
+        )
+
+
 class TestEmailCodeLoginSendEmailApi:
     """Test cases for sending email verification codes."""
 
@@ -140,7 +153,7 @@ class TestEmailCodeLoginSendEmailApi:
 
     @patch("controllers.console.wraps.db")
     @patch("controllers.console.auth.login.AccountService.is_email_send_ip_limit")
-    def test_send_email_code_ip_rate_limited(self, mock_is_ip_limit, mock_db, app):
+    def test_send_email_code_ip_rate_limited(self, mock_is_ip_limit, mock_db, app: Flask):
         """
         Test email code sending blocked by IP rate limit.
 
@@ -160,7 +173,7 @@ class TestEmailCodeLoginSendEmailApi:
     @patch("controllers.console.wraps.db")
     @patch("controllers.console.auth.login.AccountService.is_email_send_ip_limit")
     @patch("controllers.console.auth.login.AccountService.get_user_through_email")
-    def test_send_email_code_frozen_account(self, mock_get_user, mock_is_ip_limit, mock_db, app):
+    def test_send_email_code_frozen_account(self, mock_get_user, mock_is_ip_limit, mock_db, app: Flask):
         """
         Test email code sending to frozen account.
 
@@ -195,7 +208,7 @@ class TestEmailCodeLoginSendEmailApi:
         mock_get_user,
         mock_is_ip_limit,
         mock_db,
-        app,
+        app: Flask,
         mock_account,
         language_input,
         expected_language,
@@ -267,7 +280,7 @@ class TestEmailCodeLoginApi:
         mock_revoke_token,
         mock_get_data,
         mock_db,
-        app,
+        app: Flask,
         mock_account,
         mock_token_pair,
     ):
@@ -315,7 +328,7 @@ class TestEmailCodeLoginApi:
         mock_revoke_token,
         mock_get_data,
         mock_db,
-        app,
+        app: Flask,
         mock_account,
         mock_token_pair,
     ):
@@ -342,6 +355,7 @@ class TestEmailCodeLoginApi:
                 "code": encode_code("123456"),
                 "token": "valid_token",
                 "language": "en-US",
+                "timezone": "Asia/Shanghai",
             },
         ):
             api = EmailCodeLoginApi()
@@ -349,11 +363,16 @@ class TestEmailCodeLoginApi:
 
         # Assert
         assert response.json["result"] == "success"
-        mock_create_account.assert_called_once()
+        mock_create_account.assert_called_once_with(
+            email="newuser@example.com",
+            name="newuser@example.com",
+            interface_language="en-US",
+            timezone="Asia/Shanghai",
+        )
 
     @patch("controllers.console.wraps.db")
     @patch("controllers.console.auth.login.AccountService.get_email_code_login_data")
-    def test_email_code_login_invalid_token(self, mock_get_data, mock_db, app):
+    def test_email_code_login_invalid_token(self, mock_get_data, mock_db, app: Flask):
         """
         Test email code login with invalid token.
 
@@ -375,7 +394,7 @@ class TestEmailCodeLoginApi:
 
     @patch("controllers.console.wraps.db")
     @patch("controllers.console.auth.login.AccountService.get_email_code_login_data")
-    def test_email_code_login_email_mismatch(self, mock_get_data, mock_db, app):
+    def test_email_code_login_email_mismatch(self, mock_get_data, mock_db, app: Flask):
         """
         Test email code login with mismatched email.
 
@@ -397,7 +416,7 @@ class TestEmailCodeLoginApi:
 
     @patch("controllers.console.wraps.db")
     @patch("controllers.console.auth.login.AccountService.get_email_code_login_data")
-    def test_email_code_login_wrong_code(self, mock_get_data, mock_db, app):
+    def test_email_code_login_wrong_code(self, mock_get_data, mock_db, app: Flask):
         """
         Test email code login with incorrect code.
 
@@ -431,7 +450,7 @@ class TestEmailCodeLoginApi:
         mock_revoke_token,
         mock_get_data,
         mock_db,
-        app,
+        app: Flask,
         mock_account,
     ):
         """
@@ -474,7 +493,7 @@ class TestEmailCodeLoginApi:
         mock_revoke_token,
         mock_get_data,
         mock_db,
-        app,
+        app: Flask,
         mock_account,
     ):
         """
@@ -515,7 +534,7 @@ class TestEmailCodeLoginApi:
         mock_revoke_token,
         mock_get_data,
         mock_db,
-        app,
+        app: Flask,
         mock_account,
     ):
         """
diff --git a/api/tests/unit_tests/controllers/console/auth/test_login_logout.py b/api/tests/unit_tests/controllers/console/auth/test_login_logout.py
index d089be8905..ace2ce5706 100644
--- a/api/tests/unit_tests/controllers/console/auth/test_login_logout.py
+++ b/api/tests/unit_tests/controllers/console/auth/test_login_logout.py
@@ -9,7 +9,7 @@ This module tests the core authentication endpoints including:
 """
 
 import base64
-from unittest.mock import MagicMock, patch
+from unittest.mock import MagicMock, Mock, patch
 
 import pytest
 from flask import Flask
@@ -52,12 +52,12 @@ class TestLoginApi:
         return app
 
     @pytest.fixture
-    def api(self, app):
+    def api(self, app: Flask):
         """Create Flask-RESTX API instance."""
         return Api(app)
 
     @pytest.fixture
-    def client(self, app, api):
+    def client(self, app: Flask, api: Api):
         """Create test client."""
         api.add_resource(LoginApi, "/login")
         return app.test_client()
@@ -97,7 +97,7 @@ class TestLoginApi:
         mock_get_invitation,
         mock_is_rate_limit,
         mock_db,
-        app,
+        app: Flask,
         mock_account,
         mock_token_pair,
     ):
@@ -141,14 +141,14 @@ class TestLoginApi:
     @patch("controllers.console.auth.login.AccountService.reset_login_error_rate_limit")
     def test_successful_login_with_valid_invitation(
         self,
-        mock_reset_rate_limit,
+        mock_reset_rate_limit: Mock,
         mock_login,
         mock_get_tenants,
         mock_authenticate,
         mock_get_invitation,
         mock_is_rate_limit,
         mock_db,
-        app,
+        app: Flask,
         mock_account,
         mock_token_pair,
     ):
@@ -188,7 +188,7 @@ class TestLoginApi:
     @patch("controllers.console.auth.login.dify_config.BILLING_ENABLED", False)
     @patch("controllers.console.auth.login.AccountService.is_login_error_rate_limit")
     @patch("controllers.console.auth.login.RegisterService.get_invitation_with_case_fallback")
-    def test_login_fails_when_rate_limited(self, mock_get_invitation, mock_is_rate_limit, mock_db, app):
+    def test_login_fails_when_rate_limited(self, mock_get_invitation, mock_is_rate_limit, mock_db, app: Flask):
         """
         Test login rejection when rate limit is exceeded.
 
@@ -216,7 +216,7 @@ class TestLoginApi:
     @patch("controllers.console.wraps.db")
     @patch("controllers.console.auth.login.dify_config.BILLING_ENABLED", True)
     @patch("controllers.console.auth.login.BillingService.is_email_in_freeze")
-    def test_login_fails_when_account_frozen(self, mock_is_frozen, mock_db, app):
+    def test_login_fails_when_account_frozen(self, mock_is_frozen, mock_db, app: Flask):
         """
         Test login rejection for frozen accounts.
 
@@ -253,7 +253,7 @@ class TestLoginApi:
         mock_get_invitation,
         mock_is_rate_limit,
         mock_db,
-        app,
+        app: Flask,
     ):
         """
         Test login failure with invalid credentials.
@@ -290,7 +290,7 @@ class TestLoginApi:
     @patch("controllers.console.auth.login.RegisterService.get_invitation_with_case_fallback")
     @patch("controllers.console.auth.login.AccountService.authenticate")
     def test_login_fails_for_banned_account(
-        self, mock_authenticate, mock_get_invitation, mock_is_rate_limit, mock_db, app
+        self, mock_authenticate, mock_get_invitation, mock_is_rate_limit, mock_db, app: Flask
     ):
         """
         Test login rejection for banned accounts.
@@ -328,14 +328,14 @@ class TestLoginApi:
     @patch("controllers.console.auth.login.FeatureService.get_system_features")
     def test_login_fails_when_no_workspace_and_limit_exceeded(
         self,
-        mock_get_features,
-        mock_get_tenants,
-        mock_authenticate,
-        mock_get_invitation,
-        mock_is_rate_limit,
-        mock_db,
-        app,
-        mock_account,
+        mock_get_features: MagicMock,
+        mock_get_tenants: MagicMock,
+        mock_authenticate: MagicMock,
+        mock_get_invitation: MagicMock,
+        mock_is_rate_limit: MagicMock,
+        mock_db: MagicMock,
+        app: Flask,
+        mock_account: MagicMock,
     ):
         """
         Test login failure when user has no workspace and workspace limit exceeded.
@@ -367,7 +367,7 @@ class TestLoginApi:
     @patch("controllers.console.auth.login.dify_config.BILLING_ENABLED", False)
     @patch("controllers.console.auth.login.AccountService.is_login_error_rate_limit")
     @patch("controllers.console.auth.login.RegisterService.get_invitation_with_case_fallback")
-    def test_login_invitation_email_mismatch(self, mock_get_invitation, mock_is_rate_limit, mock_db, app):
+    def test_login_invitation_email_mismatch(self, mock_get_invitation, mock_is_rate_limit, mock_db, app: Flask):
         """
         Test login failure when invitation email doesn't match login email.
 
@@ -412,7 +412,7 @@ class TestLoginApi:
         mock_get_invitation,
         mock_is_rate_limit,
         mock_db,
-        app,
+        app: Flask,
         mock_account,
         mock_token_pair,
     ):
@@ -448,7 +448,7 @@ class TestLoginApi:
         mock_revoke_token,
         mock_get_token_data,
         mock_db,
-        app,
+        app: Flask,
     ):
         mock_get_token_data.return_value = {"email": "User@Example.com", "code": "123456"}
         mock_get_account.side_effect = Unauthorized("Account is banned.")
@@ -491,7 +491,7 @@ class TestLogoutApi:
     @patch("controllers.console.auth.login.AccountService.logout")
     @patch("controllers.console.auth.login.flask_login.logout_user")
     def test_successful_logout(
-        self, mock_logout_user, mock_service_logout, mock_current_account, mock_db, app, mock_account
+        self, mock_logout_user, mock_service_logout, mock_current_account, mock_db, app: Flask, mock_account
     ):
         """
         Test successful logout flow.
@@ -518,7 +518,7 @@ class TestLogoutApi:
     @patch("controllers.console.wraps.db")
     @patch("controllers.console.auth.login.current_account_with_tenant")
     @patch("controllers.console.auth.login.flask_login")
-    def test_logout_anonymous_user(self, mock_flask_login, mock_current_account, mock_db, app):
+    def test_logout_anonymous_user(self, mock_flask_login, mock_current_account, mock_db, app: Flask):
         """
         Test logout for anonymous (not logged in) user.
 
diff --git a/api/tests/unit_tests/controllers/console/auth/test_oauth_timezone.py b/api/tests/unit_tests/controllers/console/auth/test_oauth_timezone.py
new file mode 100644
index 0000000000..36c707dbf9
--- /dev/null
+++ b/api/tests/unit_tests/controllers/console/auth/test_oauth_timezone.py
@@ -0,0 +1,123 @@
+from unittest.mock import MagicMock, patch
+
+import pytest
+from flask import Flask
+
+from controllers.console.auth.oauth import OAuthLogin, _generate_account
+from libs.oauth import OAuthUserInfo
+from services.errors.account import AccountRegisterError
+
+
+@pytest.fixture
+def app() -> Flask:
+    app = Flask(__name__)
+    app.config["TESTING"] = True
+    return app
+
+
+@patch("controllers.console.auth.oauth.redirect")
+@patch("controllers.console.auth.oauth.get_oauth_providers")
+def test_oauth_login_passes_language_and_timezone_to_authorization_url(
+    mock_get_oauth_providers,
+    mock_redirect,
+    app: Flask,
+):
+    oauth_provider = MagicMock()
+    oauth_provider.get_authorization_url.return_value = "https://github.com/login/oauth/authorize?state=..."
+    mock_get_oauth_providers.return_value = {"github": oauth_provider}
+
+    with app.test_request_context("/oauth/login/github?language=zh-Hans&timezone=Asia/Shanghai"):
+        OAuthLogin().get("github")
+
+    oauth_provider.get_authorization_url.assert_called_once_with(
+        invite_token=None,
+        timezone="Asia/Shanghai",
+        language="zh-Hans",
+    )
+    mock_redirect.assert_called_once_with("https://github.com/login/oauth/authorize?state=...")
+
+
+@patch("controllers.console.auth.oauth.AccountService.link_account_integrate")
+@patch("controllers.console.auth.oauth.RegisterService")
+@patch("controllers.console.auth.oauth.FeatureService")
+@patch("controllers.console.auth.oauth._get_account_by_openid_or_email", return_value=None)
+def test_generate_account_registers_with_browser_timezone(
+    mock_get_account,
+    mock_feature_service,
+    mock_register_service,
+    mock_link_account,
+    app: Flask,
+):
+    account = MagicMock()
+    mock_register_service.register.return_value = account
+    mock_feature_service.get_system_features.return_value.is_allow_register = True
+    user_info = OAuthUserInfo(id="github-123", name="Test User", email="User@Example.com")
+
+    with app.test_request_context(headers={"Accept-Language": "zh-Hans,zh;q=0.9"}):
+        result, oauth_new_user = _generate_account("github", user_info, timezone="Asia/Shanghai")
+
+    assert result is account
+    assert oauth_new_user is True
+    mock_register_service.register.assert_called_once_with(
+        email="user@example.com",
+        name="Test User",
+        password=None,
+        open_id="github-123",
+        provider="github",
+        language="zh-Hans",
+        timezone="Asia/Shanghai",
+    )
+    mock_link_account.assert_called_once_with("github", "github-123", account)
+
+
+@patch("controllers.console.auth.oauth.AccountService.link_account_integrate")
+@patch("controllers.console.auth.oauth.RegisterService")
+@patch("controllers.console.auth.oauth.FeatureService")
+@patch("controllers.console.auth.oauth._get_account_by_openid_or_email", return_value=None)
+def test_generate_account_prefers_state_language_over_accept_language(
+    mock_get_account,
+    mock_feature_service,
+    mock_register_service,
+    mock_link_account,
+    app: Flask,
+):
+    account = MagicMock()
+    mock_register_service.register.return_value = account
+    mock_feature_service.get_system_features.return_value.is_allow_register = True
+    user_info = OAuthUserInfo(id="github-123", name="Test User", email="User@Example.com")
+
+    with app.test_request_context(headers={"Accept-Language": "en-US,en;q=0.9"}):
+        _generate_account("github", user_info, language="zh-Hans")
+
+    mock_register_service.register.assert_called_once_with(
+        email="user@example.com",
+        name="Test User",
+        password=None,
+        open_id="github-123",
+        provider="github",
+        language="zh-Hans",
+        timezone=None,
+    )
+    mock_link_account.assert_called_once_with("github", "github-123", account)
+
+
+@patch("controllers.console.auth.oauth.dify_config")
+@patch("controllers.console.auth.oauth.RegisterService")
+@patch("controllers.console.auth.oauth.FeatureService")
+@patch("controllers.console.auth.oauth._get_account_by_openid_or_email", return_value=None)
+def test_generate_account_rejects_new_user_when_registration_disabled(
+    mock_get_account,
+    mock_feature_service,
+    mock_register_service,
+    mock_config,
+    app: Flask,
+):
+    mock_feature_service.get_system_features.return_value.is_allow_register = False
+    mock_config.BILLING_ENABLED = False
+    user_info = OAuthUserInfo(id="github-123", name="Test User", email="user@example.com")
+
+    with app.test_request_context(headers={"Accept-Language": "en-US,en;q=0.9"}):
+        with pytest.raises(AccountRegisterError):
+            _generate_account("github", user_info)
+
+    mock_register_service.register.assert_not_called()
diff --git a/api/tests/unit_tests/controllers/console/auth/test_token_refresh.py b/api/tests/unit_tests/controllers/console/auth/test_token_refresh.py
index d010f60866..22974ca416 100644
--- a/api/tests/unit_tests/controllers/console/auth/test_token_refresh.py
+++ b/api/tests/unit_tests/controllers/console/auth/test_token_refresh.py
@@ -28,12 +28,12 @@ class TestRefreshTokenApi:
         return app
 
     @pytest.fixture
-    def api(self, app):
+    def api(self, app: Flask):
         """Create Flask-RESTX API instance."""
         return Api(app)
 
     @pytest.fixture
-    def client(self, app, api):
+    def client(self, app: Flask, api: Api):
         """Create test client."""
         api.add_resource(RefreshTokenApi, "/refresh-token")
         return app.test_client()
@@ -74,7 +74,7 @@ class TestRefreshTokenApi:
         assert response.json["result"] == "success"
 
     @patch("controllers.console.auth.login.extract_refresh_token", autospec=True)
-    def test_refresh_fails_without_token(self, mock_extract_token, app):
+    def test_refresh_fails_without_token(self, mock_extract_token, app: Flask):
         """
         Test token refresh failure when no refresh token provided.
 
@@ -98,7 +98,7 @@ class TestRefreshTokenApi:
 
     @patch("controllers.console.auth.login.extract_refresh_token", autospec=True)
     @patch("controllers.console.auth.login.AccountService.refresh_token", autospec=True)
-    def test_refresh_fails_with_invalid_token(self, mock_refresh_token, mock_extract_token, app):
+    def test_refresh_fails_with_invalid_token(self, mock_refresh_token, mock_extract_token, app: Flask):
         """
         Test token refresh failure with invalid refresh token.
 
@@ -123,7 +123,7 @@ class TestRefreshTokenApi:
 
     @patch("controllers.console.auth.login.extract_refresh_token", autospec=True)
     @patch("controllers.console.auth.login.AccountService.refresh_token", autospec=True)
-    def test_refresh_fails_with_expired_token(self, mock_refresh_token, mock_extract_token, app):
+    def test_refresh_fails_with_expired_token(self, mock_refresh_token, mock_extract_token, app: Flask):
         """
         Test token refresh failure with expired refresh token.
 
@@ -148,7 +148,7 @@ class TestRefreshTokenApi:
 
     @patch("controllers.console.auth.login.extract_refresh_token", autospec=True)
     @patch("controllers.console.auth.login.AccountService.refresh_token", autospec=True)
-    def test_refresh_with_empty_token(self, mock_refresh_token, mock_extract_token, app):
+    def test_refresh_with_empty_token(self, mock_refresh_token, mock_extract_token, app: Flask):
         """
         Test token refresh with empty string token.
 
diff --git a/api/tests/unit_tests/controllers/console/billing/test_billing.py b/api/tests/unit_tests/controllers/console/billing/test_billing.py
index 810f1b94fc..defa9064fd 100644
--- a/api/tests/unit_tests/controllers/console/billing/test_billing.py
+++ b/api/tests/unit_tests/controllers/console/billing/test_billing.py
@@ -49,7 +49,7 @@ class TestPartnerTenants:
             mock_csrf.return_value = None
             yield {"db": mock_db, "csrf": mock_csrf}
 
-    def test_put_success(self, app, mock_account, mock_billing_service, mock_decorators):
+    def test_put_success(self, app: Flask, mock_account, mock_billing_service, mock_decorators):
         """Test successful partner tenants bindings sync."""
         # Arrange
         partner_key_encoded = base64.b64encode(b"partner-key-123").decode("utf-8")
@@ -79,7 +79,7 @@ class TestPartnerTenants:
             mock_account.id, "partner-key-123", click_id
         )
 
-    def test_put_invalid_partner_key_base64(self, app, mock_account, mock_billing_service, mock_decorators):
+    def test_put_invalid_partner_key_base64(self, app: Flask, mock_account, mock_billing_service, mock_decorators):
         """Test that invalid base64 partner_key raises BadRequest."""
         # Arrange
         invalid_partner_key = "invalid-base64-!@#$"
@@ -104,7 +104,7 @@ class TestPartnerTenants:
                     resource.put(invalid_partner_key)
                 assert "Invalid partner_key" in str(exc_info.value)
 
-    def test_put_missing_click_id(self, app, mock_account, mock_billing_service, mock_decorators):
+    def test_put_missing_click_id(self, app: Flask, mock_account, mock_billing_service, mock_decorators):
         """Test that missing click_id raises BadRequest."""
         # Arrange
         partner_key_encoded = base64.b64encode(b"partner-key-123").decode("utf-8")
@@ -128,7 +128,9 @@ class TestPartnerTenants:
                 with pytest.raises(BadRequest):
                     resource.put(partner_key_encoded)
 
-    def test_put_billing_service_json_decode_error(self, app, mock_account, mock_billing_service, mock_decorators):
+    def test_put_billing_service_json_decode_error(
+        self, app: Flask, mock_account, mock_billing_service, mock_decorators
+    ):
         """Test handling of billing service JSON decode error.
 
         When billing service returns non-200 status code with invalid JSON response,
@@ -174,7 +176,7 @@ class TestPartnerTenants:
                 assert isinstance(exc_info.value, json.JSONDecodeError)
                 assert "Expecting value" in str(exc_info.value)
 
-    def test_put_empty_click_id(self, app, mock_account, mock_billing_service, mock_decorators):
+    def test_put_empty_click_id(self, app: Flask, mock_account, mock_billing_service, mock_decorators):
         """Test that empty click_id raises BadRequest."""
         # Arrange
         partner_key_encoded = base64.b64encode(b"partner-key-123").decode("utf-8")
@@ -199,7 +201,7 @@ class TestPartnerTenants:
                     resource.put(partner_key_encoded)
                 assert "Invalid partner information" in str(exc_info.value)
 
-    def test_put_empty_partner_key_after_decode(self, app, mock_account, mock_billing_service, mock_decorators):
+    def test_put_empty_partner_key_after_decode(self, app: Flask, mock_account, mock_billing_service, mock_decorators):
         """Test that empty partner_key after decode raises BadRequest."""
         # Arrange
         # Base64 encode an empty string
@@ -225,7 +227,7 @@ class TestPartnerTenants:
                     resource.put(empty_partner_key_encoded)
                 assert "Invalid partner information" in str(exc_info.value)
 
-    def test_put_empty_user_id(self, app, mock_account, mock_billing_service, mock_decorators):
+    def test_put_empty_user_id(self, app: Flask, mock_account, mock_billing_service, mock_decorators):
         """Test that empty user id raises BadRequest."""
         # Arrange
         partner_key_encoded = base64.b64encode(b"partner-key-123").decode("utf-8")
diff --git a/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_datasource_auth.py b/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_datasource_auth.py
index 5136922e88..9c5b5ec256 100644
--- a/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_datasource_auth.py
+++ b/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_datasource_auth.py
@@ -1,6 +1,7 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import Forbidden, NotFound
 
 from controllers.console import console_ns
@@ -29,7 +30,7 @@ def unwrap(func):
 
 
 class TestDatasourcePluginOAuthAuthorizationUrl:
-    def test_get_success(self, app):
+    def test_get_success(self, app: Flask):
         api = DatasourcePluginOAuthAuthorizationUrl()
         method = unwrap(api.get)
 
@@ -61,7 +62,7 @@ class TestDatasourcePluginOAuthAuthorizationUrl:
 
         assert response.status_code == 200
 
-    def test_get_no_oauth_config(self, app):
+    def test_get_no_oauth_config(self, app: Flask):
         api = DatasourcePluginOAuthAuthorizationUrl()
         method = unwrap(api.get)
 
@@ -80,7 +81,7 @@ class TestDatasourcePluginOAuthAuthorizationUrl:
             with pytest.raises(ValueError):
                 method(api, "notion")
 
-    def test_get_without_credential_id_sets_cookie(self, app):
+    def test_get_without_credential_id_sets_cookie(self, app: Flask):
         api = DatasourcePluginOAuthAuthorizationUrl()
         method = unwrap(api.get)
 
@@ -115,7 +116,7 @@ class TestDatasourcePluginOAuthAuthorizationUrl:
 
 
 class TestDatasourceOAuthCallback:
-    def test_callback_success_new_credential(self, app):
+    def test_callback_success_new_credential(self, app: Flask):
         api = DatasourceOAuthCallback()
         method = unwrap(api.get)
 
@@ -157,7 +158,7 @@ class TestDatasourceOAuthCallback:
 
         assert response.status_code == 302
 
-    def test_callback_missing_context(self, app):
+    def test_callback_missing_context(self, app: Flask):
         api = DatasourceOAuthCallback()
         method = unwrap(api.get)
 
@@ -165,7 +166,7 @@ class TestDatasourceOAuthCallback:
             with pytest.raises(Forbidden):
                 method(api, "notion")
 
-    def test_callback_invalid_context(self, app):
+    def test_callback_invalid_context(self, app: Flask):
         api = DatasourceOAuthCallback()
         method = unwrap(api.get)
 
@@ -180,7 +181,7 @@ class TestDatasourceOAuthCallback:
             with pytest.raises(Forbidden):
                 method(api, "notion")
 
-    def test_callback_oauth_config_not_found(self, app):
+    def test_callback_oauth_config_not_found(self, app: Flask):
         api = DatasourceOAuthCallback()
         method = unwrap(api.get)
 
@@ -202,7 +203,7 @@ class TestDatasourceOAuthCallback:
             with pytest.raises(NotFound):
                 method(api, "notion")
 
-    def test_callback_reauthorize_existing_credential(self, app):
+    def test_callback_reauthorize_existing_credential(self, app: Flask):
         api = DatasourceOAuthCallback()
         method = unwrap(api.get)
 
@@ -245,7 +246,7 @@ class TestDatasourceOAuthCallback:
         assert response.status_code == 302
         assert "/oauth-callback" in response.location
 
-    def test_callback_context_id_from_cookie(self, app):
+    def test_callback_context_id_from_cookie(self, app: Flask):
         api = DatasourceOAuthCallback()
         method = unwrap(api.get)
 
@@ -289,7 +290,7 @@ class TestDatasourceOAuthCallback:
 
 
 class TestDatasourceAuth:
-    def test_post_success(self, app):
+    def test_post_success(self, app: Flask):
         api = DatasourceAuth()
         method = unwrap(api.post)
 
@@ -312,7 +313,7 @@ class TestDatasourceAuth:
 
         assert status == 200
 
-    def test_post_invalid_credentials(self, app):
+    def test_post_invalid_credentials(self, app: Flask):
         api = DatasourceAuth()
         method = unwrap(api.post)
 
@@ -334,7 +335,7 @@ class TestDatasourceAuth:
             with pytest.raises(ValueError):
                 method(api, "notion")
 
-    def test_get_success(self, app):
+    def test_get_success(self, app: Flask):
         api = DatasourceAuth()
         method = unwrap(api.get)
 
@@ -355,7 +356,7 @@ class TestDatasourceAuth:
         assert status == 200
         assert response["result"]
 
-    def test_post_missing_credentials(self, app):
+    def test_post_missing_credentials(self, app: Flask):
         api = DatasourceAuth()
         method = unwrap(api.post)
 
@@ -372,7 +373,7 @@ class TestDatasourceAuth:
             with pytest.raises(ValueError):
                 method(api, "notion")
 
-    def test_get_empty_list(self, app):
+    def test_get_empty_list(self, app: Flask):
         api = DatasourceAuth()
         method = unwrap(api.get)
 
@@ -395,7 +396,7 @@ class TestDatasourceAuth:
 
 
 class TestDatasourceAuthDeleteApi:
-    def test_delete_success(self, app):
+    def test_delete_success(self, app: Flask):
         api = DatasourceAuthDeleteApi()
         method = unwrap(api.post)
 
@@ -418,7 +419,7 @@ class TestDatasourceAuthDeleteApi:
 
         assert status == 200
 
-    def test_delete_missing_credential_id(self, app):
+    def test_delete_missing_credential_id(self, app: Flask):
         api = DatasourceAuthDeleteApi()
         method = unwrap(api.post)
 
@@ -437,7 +438,7 @@ class TestDatasourceAuthDeleteApi:
 
 
 class TestDatasourceAuthUpdateApi:
-    def test_update_success(self, app):
+    def test_update_success(self, app: Flask):
         api = DatasourceAuthUpdateApi()
         method = unwrap(api.post)
 
@@ -460,7 +461,7 @@ class TestDatasourceAuthUpdateApi:
 
         assert status == 201
 
-    def test_update_with_credentials_none(self, app):
+    def test_update_with_credentials_none(self, app: Flask):
         api = DatasourceAuthUpdateApi()
         method = unwrap(api.post)
 
@@ -484,7 +485,7 @@ class TestDatasourceAuthUpdateApi:
         update_mock.assert_called_once()
         assert status == 201
 
-    def test_update_name_only(self, app):
+    def test_update_name_only(self, app: Flask):
         api = DatasourceAuthUpdateApi()
         method = unwrap(api.post)
 
@@ -507,7 +508,7 @@ class TestDatasourceAuthUpdateApi:
 
         assert status == 201
 
-    def test_update_with_empty_credentials_dict(self, app):
+    def test_update_with_empty_credentials_dict(self, app: Flask):
         api = DatasourceAuthUpdateApi()
         method = unwrap(api.post)
 
@@ -533,7 +534,7 @@ class TestDatasourceAuthUpdateApi:
 
 
 class TestDatasourceAuthListApi:
-    def test_list_success(self, app):
+    def test_list_success(self, app: Flask):
         api = DatasourceAuthListApi()
         method = unwrap(api.get)
 
@@ -553,7 +554,7 @@ class TestDatasourceAuthListApi:
 
         assert status == 200
 
-    def test_auth_list_empty(self, app):
+    def test_auth_list_empty(self, app: Flask):
         api = DatasourceAuthListApi()
         method = unwrap(api.get)
 
@@ -574,7 +575,7 @@ class TestDatasourceAuthListApi:
         assert status == 200
         assert response["result"] == []
 
-    def test_hardcode_list_empty(self, app):
+    def test_hardcode_list_empty(self, app: Flask):
         api = DatasourceHardCodeAuthListApi()
         method = unwrap(api.get)
 
@@ -597,7 +598,7 @@ class TestDatasourceAuthListApi:
 
 
 class TestDatasourceHardCodeAuthListApi:
-    def test_list_success(self, app):
+    def test_list_success(self, app: Flask):
         api = DatasourceHardCodeAuthListApi()
         method = unwrap(api.get)
 
@@ -619,7 +620,7 @@ class TestDatasourceHardCodeAuthListApi:
 
 
 class TestDatasourceAuthOauthCustomClient:
-    def test_post_success(self, app):
+    def test_post_success(self, app: Flask):
         api = DatasourceAuthOauthCustomClient()
         method = unwrap(api.post)
 
@@ -642,7 +643,7 @@ class TestDatasourceAuthOauthCustomClient:
 
         assert status == 200
 
-    def test_delete_success(self, app):
+    def test_delete_success(self, app: Flask):
         api = DatasourceAuthOauthCustomClient()
         method = unwrap(api.delete)
 
@@ -662,7 +663,7 @@ class TestDatasourceAuthOauthCustomClient:
 
         assert status == 200
 
-    def test_post_empty_payload(self, app):
+    def test_post_empty_payload(self, app: Flask):
         api = DatasourceAuthOauthCustomClient()
         method = unwrap(api.post)
 
@@ -685,7 +686,7 @@ class TestDatasourceAuthOauthCustomClient:
 
         assert status == 200
 
-    def test_post_disabled_flag(self, app):
+    def test_post_disabled_flag(self, app: Flask):
         api = DatasourceAuthOauthCustomClient()
         method = unwrap(api.post)
 
@@ -714,7 +715,7 @@ class TestDatasourceAuthOauthCustomClient:
 
 
 class TestDatasourceAuthDefaultApi:
-    def test_set_default_success(self, app):
+    def test_set_default_success(self, app: Flask):
         api = DatasourceAuthDefaultApi()
         method = unwrap(api.post)
 
@@ -737,7 +738,7 @@ class TestDatasourceAuthDefaultApi:
 
         assert status == 200
 
-    def test_default_missing_id(self, app):
+    def test_default_missing_id(self, app: Flask):
         api = DatasourceAuthDefaultApi()
         method = unwrap(api.post)
 
@@ -756,7 +757,7 @@ class TestDatasourceAuthDefaultApi:
 
 
 class TestDatasourceUpdateProviderNameApi:
-    def test_update_name_success(self, app):
+    def test_update_name_success(self, app: Flask):
         api = DatasourceUpdateProviderNameApi()
         method = unwrap(api.post)
 
@@ -779,7 +780,7 @@ class TestDatasourceUpdateProviderNameApi:
 
         assert status == 200
 
-    def test_update_name_too_long(self, app):
+    def test_update_name_too_long(self, app: Flask):
         api = DatasourceUpdateProviderNameApi()
         method = unwrap(api.post)
 
@@ -799,7 +800,7 @@ class TestDatasourceUpdateProviderNameApi:
             with pytest.raises(ValueError):
                 method(api, "notion")
 
-    def test_update_name_missing_credential_id(self, app):
+    def test_update_name_missing_credential_id(self, app: Flask):
         api = DatasourceUpdateProviderNameApi()
         method = unwrap(api.post)
 
diff --git a/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_datasource_content_preview.py b/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_datasource_content_preview.py
index 7a8ccde55a..d4c6a775ec 100644
--- a/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_datasource_content_preview.py
+++ b/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_datasource_content_preview.py
@@ -1,6 +1,7 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import Forbidden
 
 from controllers.console import console_ns
@@ -25,7 +26,7 @@ class TestDataSourceContentPreviewApi:
             "credential_id": "cred-1",
         }
 
-    def test_post_success(self, app):
+    def test_post_success(self, app: Flask):
         api = DataSourceContentPreviewApi()
         method = unwrap(api.post)
 
@@ -66,7 +67,7 @@ class TestDataSourceContentPreviewApi:
         assert status == 200
         assert response == preview_result
 
-    def test_post_forbidden_non_account_user(self, app):
+    def test_post_forbidden_non_account_user(self, app: Flask):
         api = DataSourceContentPreviewApi()
         method = unwrap(api.post)
 
@@ -85,7 +86,7 @@ class TestDataSourceContentPreviewApi:
             with pytest.raises(Forbidden):
                 method(api, pipeline, "node-1")
 
-    def test_post_invalid_payload(self, app):
+    def test_post_invalid_payload(self, app: Flask):
         api = DataSourceContentPreviewApi()
         method = unwrap(api.post)
 
@@ -108,7 +109,7 @@ class TestDataSourceContentPreviewApi:
             with pytest.raises(ValueError):
                 method(api, pipeline, "node-1")
 
-    def test_post_without_credential_id(self, app):
+    def test_post_without_credential_id(self, app: Flask):
         api = DataSourceContentPreviewApi()
         method = unwrap(api.post)
 
diff --git a/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_draft_variable.py b/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_draft_variable.py
index 63950736c5..8a65c4bbe5 100644
--- a/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_draft_variable.py
+++ b/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_draft_variable.py
@@ -1,7 +1,7 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
-from flask import Response
+from flask import Flask, Response
 
 from controllers.console import console_ns
 from controllers.console.app.error import DraftWorkflowNotExist
@@ -46,7 +46,7 @@ def restx_config(app):
 
 
 class TestRagPipelineVariableCollectionApi:
-    def test_get_variables_success(self, app, fake_db, editor_user, restx_config):
+    def test_get_variables_success(self, app: Flask, fake_db, editor_user, restx_config):
         api = RagPipelineVariableCollectionApi()
         method = unwrap(api.get)
 
@@ -80,7 +80,7 @@ class TestRagPipelineVariableCollectionApi:
 
         assert result["items"] == []
 
-    def test_get_variables_workflow_not_exist(self, app, fake_db, editor_user):
+    def test_get_variables_workflow_not_exist(self, app: Flask, fake_db, editor_user):
         api = RagPipelineVariableCollectionApi()
         method = unwrap(api.get)
 
@@ -101,7 +101,7 @@ class TestRagPipelineVariableCollectionApi:
             with pytest.raises(DraftWorkflowNotExist):
                 method(api, pipeline)
 
-    def test_delete_variables_success(self, app, fake_db, editor_user):
+    def test_delete_variables_success(self, app: Flask, fake_db, editor_user):
         api = RagPipelineVariableCollectionApi()
         method = unwrap(api.delete)
 
@@ -120,7 +120,7 @@ class TestRagPipelineVariableCollectionApi:
 
 
 class TestRagPipelineNodeVariableCollectionApi:
-    def test_get_node_variables_success(self, app, fake_db, editor_user, restx_config):
+    def test_get_node_variables_success(self, app: Flask, fake_db, editor_user, restx_config):
         api = RagPipelineNodeVariableCollectionApi()
         method = unwrap(api.get)
 
@@ -146,7 +146,7 @@ class TestRagPipelineNodeVariableCollectionApi:
 
         assert result["items"] == []
 
-    def test_get_node_variables_invalid_node(self, app, editor_user):
+    def test_get_node_variables_invalid_node(self, app: Flask, editor_user):
         api = RagPipelineNodeVariableCollectionApi()
         method = unwrap(api.get)
 
@@ -159,7 +159,7 @@ class TestRagPipelineNodeVariableCollectionApi:
 
 
 class TestRagPipelineVariableApi:
-    def test_get_variable_not_found(self, app, fake_db, editor_user):
+    def test_get_variable_not_found(self, app: Flask, fake_db, editor_user):
         api = RagPipelineVariableApi()
         method = unwrap(api.get)
 
@@ -178,7 +178,7 @@ class TestRagPipelineVariableApi:
             with pytest.raises(NotFoundError):
                 method(api, MagicMock(), "v1")
 
-    def test_patch_variable_invalid_file_payload(self, app, fake_db, editor_user):
+    def test_patch_variable_invalid_file_payload(self, app: Flask, fake_db, editor_user):
         api = RagPipelineVariableApi()
         method = unwrap(api.patch)
 
@@ -203,7 +203,7 @@ class TestRagPipelineVariableApi:
             with pytest.raises(InvalidArgumentError):
                 method(api, pipeline, "v1")
 
-    def test_delete_variable_success(self, app, fake_db, editor_user):
+    def test_delete_variable_success(self, app: Flask, fake_db, editor_user):
         api = RagPipelineVariableApi()
         method = unwrap(api.delete)
 
@@ -228,7 +228,7 @@ class TestRagPipelineVariableApi:
 
 
 class TestRagPipelineVariableResetApi:
-    def test_reset_variable_success(self, app, fake_db, editor_user):
+    def test_reset_variable_success(self, app: Flask, fake_db, editor_user):
         api = RagPipelineVariableResetApi()
         method = unwrap(api.put)
 
@@ -266,7 +266,7 @@ class TestRagPipelineVariableResetApi:
 
 
 class TestSystemAndEnvironmentVariablesApi:
-    def test_system_variables_success(self, app, fake_db, editor_user, restx_config):
+    def test_system_variables_success(self, app: Flask, fake_db, editor_user, restx_config):
         api = RagPipelineSystemVariableCollectionApi()
         method = unwrap(api.get)
 
@@ -292,7 +292,7 @@ class TestSystemAndEnvironmentVariablesApi:
 
         assert result["items"] == []
 
-    def test_environment_variables_success(self, app, editor_user):
+    def test_environment_variables_success(self, app: Flask, editor_user):
         api = RagPipelineEnvironmentVariableCollectionApi()
         method = unwrap(api.get)
 
diff --git a/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_workflow.py b/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_workflow.py
new file mode 100644
index 0000000000..322f1baa96
--- /dev/null
+++ b/api/tests/unit_tests/controllers/console/datasets/rag_pipeline/test_rag_pipeline_workflow.py
@@ -0,0 +1,150 @@
+from __future__ import annotations
+
+from datetime import datetime
+from types import SimpleNamespace
+from unittest.mock import PropertyMock, patch
+
+import pytest
+
+from controllers.console.datasets.rag_pipeline import rag_pipeline_workflow as module
+
+
+def _unwrap(func):
+    while hasattr(func, "__wrapped__"):
+        func = func.__wrapped__
+    return func
+
+
+def _make_workflow(**overrides):
+    workflow = SimpleNamespace(
+        id="workflow-1",
+        graph_dict={"nodes": [], "edges": []},
+        features_dict={"file_upload": {"enabled": False}},
+        unique_hash="hash-1",
+        version="1",
+        marked_name="Release 1",
+        marked_comment="Initial release",
+        created_by_account=SimpleNamespace(id="user-1", name="Alice", email="alice@example.com"),
+        created_at=datetime(2024, 1, 1, 12, 0, 0),
+        updated_by_account=None,
+        updated_at=datetime(2024, 1, 1, 12, 1, 0),
+        tool_published=False,
+        environment_variables=[],
+        conversation_variables=[],
+        rag_pipeline_variables=[],
+    )
+    for key, value in overrides.items():
+        setattr(workflow, key, value)
+    return workflow
+
+
+def test_draft_rag_pipeline_workflow_get_serializes_response_model(monkeypatch: pytest.MonkeyPatch) -> None:
+    workflow = _make_workflow()
+    monkeypatch.setattr(
+        module, "RagPipelineService", lambda: SimpleNamespace(get_draft_workflow=lambda **_kwargs: workflow)
+    )
+
+    api = module.DraftRagPipelineApi()
+    handler = _unwrap(api.get)
+
+    response = handler(api, pipeline=SimpleNamespace(id="pipeline-1"))
+
+    assert response["id"] == "workflow-1"
+    assert response["graph"] == {"nodes": [], "edges": []}
+    assert response["features"] == {"file_upload": {"enabled": False}}
+    assert response["hash"] == "hash-1"
+    assert response["created_by"] == {"id": "user-1", "name": "Alice", "email": "alice@example.com"}
+    assert response["updated_by"] is None
+    assert response["created_at"] == int(datetime(2024, 1, 1, 12, 0, 0).timestamp())
+    assert response["updated_at"] == int(datetime(2024, 1, 1, 12, 1, 0).timestamp())
+
+
+def test_published_rag_pipeline_workflows_serialize_items_before_session_closes(
+    app, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    api = module.PublishedAllRagPipelineApi()
+    handler = _unwrap(api.get)
+    session_state = {"open": False}
+
+    class _SessionContext:
+        def __enter__(self):
+            session_state["open"] = True
+            return object()
+
+        def __exit__(self, exc_type, exc, tb):
+            session_state["open"] = False
+            return False
+
+    class _SessionMaker:
+        def begin(self):
+            return _SessionContext()
+
+    base_workflow = _make_workflow()
+
+    class _Workflow:
+        def __getattr__(self, name: str):
+            assert session_state["open"] is True
+            return getattr(base_workflow, name)
+
+    monkeypatch.setattr(module, "db", SimpleNamespace(engine=object()))
+    monkeypatch.setattr(module, "sessionmaker", lambda *_args, **_kwargs: _SessionMaker())
+    monkeypatch.setattr(module, "current_account_with_tenant", lambda: (SimpleNamespace(id="user-1"), "tenant-1"))
+    monkeypatch.setattr(
+        module,
+        "RagPipelineService",
+        lambda: SimpleNamespace(get_all_published_workflow=lambda **_kwargs: ([_Workflow()], False)),
+    )
+
+    with app.test_request_context(
+        "/rag/pipelines/pipeline-1/workflows",
+        method="GET",
+        query_string={"page": 1, "limit": 10, "user_id": "", "named_only": "false"},
+    ):
+        response = handler(api, pipeline=SimpleNamespace(id="pipeline-1"))
+
+    assert response["items"][0]["id"] == "workflow-1"
+    assert response["page"] == 1
+    assert response["limit"] == 10
+    assert response["has_more"] is False
+
+
+def test_rag_pipeline_workflow_patch_serializes_response_model(app, monkeypatch: pytest.MonkeyPatch) -> None:
+    workflow = _make_workflow(marked_name="Updated release")
+    monkeypatch.setattr(module, "current_account_with_tenant", lambda: (SimpleNamespace(id="user-1"), "tenant-1"))
+
+    class _SessionContext:
+        def __enter__(self):
+            return object()
+
+        def __exit__(self, exc_type, exc, tb):
+            return False
+
+    class _SessionMaker:
+        def begin(self):
+            return _SessionContext()
+
+    monkeypatch.setattr(module, "db", SimpleNamespace(engine=object()))
+    monkeypatch.setattr(module, "sessionmaker", lambda *_args, **_kwargs: _SessionMaker())
+    monkeypatch.setattr(
+        module,
+        "RagPipelineService",
+        lambda: SimpleNamespace(update_workflow=lambda **_kwargs: workflow),
+    )
+    payload: dict[str, object] = {"marked_name": "Updated release"}
+
+    api = module.RagPipelineByIdApi()
+    handler = _unwrap(api.patch)
+
+    with (
+        app.test_request_context("/rag/pipelines/pipeline-1/workflows/workflow-1", method="PATCH", json=payload),
+        patch.object(type(module.console_ns), "payload", new_callable=PropertyMock, return_value=payload),
+    ):
+        response = handler(
+            api,
+            pipeline=SimpleNamespace(id="pipeline-1", tenant_id="tenant-1"),
+            workflow_id="workflow-1",
+        )
+
+    assert response["id"] == "workflow-1"
+    assert response["marked_name"] == "Updated release"
+    assert response["hash"] == "hash-1"
diff --git a/api/tests/unit_tests/controllers/console/datasets/test_datasets.py b/api/tests/unit_tests/controllers/console/datasets/test_datasets.py
index 9465936f28..e28d68ee5a 100644
--- a/api/tests/unit_tests/controllers/console/datasets/test_datasets.py
+++ b/api/tests/unit_tests/controllers/console/datasets/test_datasets.py
@@ -2,6 +2,7 @@ import datetime
 from unittest.mock import MagicMock, PropertyMock, patch
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import BadRequest, Forbidden, NotFound
 
 import services
@@ -58,7 +59,7 @@ class TestDatasetList:
         user.is_dataset_editor = True
         return user
 
-    def test_get_success_basic(self, app):
+    def test_get_success_basic(self, app: Flask):
         api = DatasetListApi()
         method = unwrap(api.get)
 
@@ -93,7 +94,7 @@ class TestDatasetList:
         assert resp["total"] == 1
         assert resp["data"][0]["embedding_available"] is True
 
-    def test_get_with_ids_filter(self, app):
+    def test_get_with_ids_filter(self, app: Flask):
         api = DatasetListApi()
         method = unwrap(api.get)
 
@@ -128,7 +129,7 @@ class TestDatasetList:
         assert status == 200
         assert resp["total"] == 2
 
-    def test_get_with_tag_ids(self, app):
+    def test_get_with_tag_ids(self, app: Flask):
         api = DatasetListApi()
         method = unwrap(api.get)
 
@@ -161,7 +162,7 @@ class TestDatasetList:
 
         assert status == 200
 
-    def test_embedding_available_false(self, app):
+    def test_embedding_available_false(self, app: Flask):
         api = DatasetListApi()
         method = unwrap(api.get)
 
@@ -203,7 +204,7 @@ class TestDatasetList:
 
         assert resp["data"][0]["embedding_available"] is False
 
-    def test_partial_members_permission(self, app):
+    def test_partial_members_permission(self, app: Flask):
         api = DatasetListApi()
         method = unwrap(api.get)
 
@@ -242,7 +243,7 @@ class TestDatasetList:
 
 
 class TestDatasetListApiPost:
-    def test_post_success(self, app):
+    def test_post_success(self, app: Flask):
         api = DatasetListApi()
         method = unwrap(api.post)
 
@@ -290,7 +291,7 @@ class TestDatasetListApiPost:
 
         assert status == 201
 
-    def test_post_forbidden(self, app):
+    def test_post_forbidden(self, app: Flask):
         api = DatasetListApi()
         method = unwrap(api.post)
 
@@ -310,7 +311,7 @@ class TestDatasetListApiPost:
             with pytest.raises(Forbidden):
                 method(api)
 
-    def test_post_duplicate_name(self, app):
+    def test_post_duplicate_name(self, app: Flask):
         api = DatasetListApi()
         method = unwrap(api.post)
 
@@ -335,7 +336,7 @@ class TestDatasetListApiPost:
             with pytest.raises(DatasetNameDuplicateError):
                 method(api)
 
-    def test_post_invalid_payload_missing_name(self, app):
+    def test_post_invalid_payload_missing_name(self, app: Flask):
         api = DatasetListApi()
         method = unwrap(api.post)
 
@@ -343,7 +344,7 @@ class TestDatasetListApiPost:
             with pytest.raises(ValueError):
                 method(api)
 
-    def test_post_invalid_indexing_technique(self, app):
+    def test_post_invalid_indexing_technique(self, app: Flask):
         api = DatasetListApi()
         method = unwrap(api.post)
 
@@ -356,7 +357,7 @@ class TestDatasetListApiPost:
             with pytest.raises(ValueError, match="Invalid indexing technique"):
                 method(api)
 
-    def test_post_invalid_provider(self, app):
+    def test_post_invalid_provider(self, app: Flask):
         api = DatasetListApi()
         method = unwrap(api.post)
 
@@ -371,7 +372,7 @@ class TestDatasetListApiPost:
 
 
 class TestDatasetApiGet:
-    def test_get_success_basic(self, app):
+    def test_get_success_basic(self, app: Flask):
         api = DatasetApi()
         method = unwrap(api.get)
 
@@ -427,7 +428,7 @@ class TestDatasetApiGet:
         assert status == 200
         assert data["embedding_available"] is True
 
-    def test_get_dataset_not_found(self, app):
+    def test_get_dataset_not_found(self, app: Flask):
         api = DatasetApi()
         method = unwrap(api.get)
 
@@ -448,7 +449,7 @@ class TestDatasetApiGet:
             with pytest.raises(NotFound, match="Dataset not found"):
                 method(api, dataset_id)
 
-    def test_get_permission_denied(self, app):
+    def test_get_permission_denied(self, app: Flask):
         api = DatasetApi()
         method = unwrap(api.get)
 
@@ -475,7 +476,7 @@ class TestDatasetApiGet:
             with pytest.raises(Forbidden, match="no access"):
                 method(api, dataset_id)
 
-    def test_get_high_quality_embedding_unavailable(self, app):
+    def test_get_high_quality_embedding_unavailable(self, app: Flask):
         api = DatasetApi()
         method = unwrap(api.get)
 
@@ -530,7 +531,7 @@ class TestDatasetApiGet:
 
         assert data["embedding_available"] is False
 
-    def test_get_partial_members_permission(self, app):
+    def test_get_partial_members_permission(self, app: Flask):
         api = DatasetApi()
         method = unwrap(api.get)
 
@@ -590,7 +591,7 @@ class TestDatasetApiGet:
 
 
 class TestDatasetApiPatch:
-    def test_patch_success_basic(self, app):
+    def test_patch_success_basic(self, app: Flask):
         api = DatasetApi()
         method = unwrap(api.patch)
 
@@ -659,7 +660,7 @@ class TestDatasetApiPatch:
         assert status == 200
         assert result["partial_member_list"] == []
 
-    def test_patch_dataset_not_found(self, app):
+    def test_patch_dataset_not_found(self, app: Flask):
         api = DatasetApi()
         method = unwrap(api.patch)
 
@@ -674,7 +675,7 @@ class TestDatasetApiPatch:
             with pytest.raises(NotFound, match="Dataset not found"):
                 method(api, "missing")
 
-    def test_patch_permission_denied(self, app):
+    def test_patch_permission_denied(self, app: Flask):
         api = DatasetApi()
         method = unwrap(api.patch)
 
@@ -704,7 +705,7 @@ class TestDatasetApiPatch:
             with pytest.raises(Forbidden):
                 method(api, dataset_id)
 
-    def test_patch_partial_members_update(self, app):
+    def test_patch_partial_members_update(self, app: Flask):
         api = DatasetApi()
         method = unwrap(api.patch)
 
@@ -773,7 +774,7 @@ class TestDatasetApiPatch:
 
         assert result["partial_member_list"] == payload["partial_member_list"]
 
-    def test_patch_clear_partial_members(self, app):
+    def test_patch_clear_partial_members(self, app: Flask):
         api = DatasetApi()
         method = unwrap(api.patch)
 
@@ -843,7 +844,7 @@ class TestDatasetApiPatch:
 
 
 class TestDatasetApiDelete:
-    def test_delete_success(self, app):
+    def test_delete_success(self, app: Flask):
         api = DatasetApi()
         method = unwrap(api.delete)
 
@@ -874,7 +875,7 @@ class TestDatasetApiDelete:
         assert status == 204
         assert result == {"result": "success"}
 
-    def test_delete_forbidden_no_permission(self, app):
+    def test_delete_forbidden_no_permission(self, app: Flask):
         api = DatasetApi()
         method = unwrap(api.delete)
 
@@ -893,7 +894,7 @@ class TestDatasetApiDelete:
             with pytest.raises(Forbidden):
                 method(api, dataset_id)
 
-    def test_delete_dataset_not_found(self, app):
+    def test_delete_dataset_not_found(self, app: Flask):
         api = DatasetApi()
         method = unwrap(api.delete)
 
@@ -917,7 +918,7 @@ class TestDatasetApiDelete:
             with pytest.raises(NotFound, match="Dataset not found"):
                 method(api, dataset_id)
 
-    def test_delete_dataset_in_use(self, app):
+    def test_delete_dataset_in_use(self, app: Flask):
         api = DatasetApi()
         method = unwrap(api.delete)
 
@@ -943,7 +944,7 @@ class TestDatasetApiDelete:
 
 
 class TestDatasetUseCheckApi:
-    def test_get_use_check_true(self, app):
+    def test_get_use_check_true(self, app: Flask):
         api = DatasetUseCheckApi()
         method = unwrap(api.get)
 
@@ -962,7 +963,7 @@ class TestDatasetUseCheckApi:
         assert status == 200
         assert result == {"is_using": True}
 
-    def test_get_use_check_false(self, app):
+    def test_get_use_check_false(self, app: Flask):
         api = DatasetUseCheckApi()
         method = unwrap(api.get)
 
@@ -983,7 +984,7 @@ class TestDatasetUseCheckApi:
 
 
 class TestDatasetQueryApi:
-    def test_get_queries_success(self, app):
+    def test_get_queries_success(self, app: Flask):
         api = DatasetQueryApi()
         method = unwrap(api.get)
 
@@ -1027,7 +1028,7 @@ class TestDatasetQueryApi:
         assert response["has_more"] is False
         assert len(response["data"]) == 2
 
-    def test_get_queries_dataset_not_found(self, app):
+    def test_get_queries_dataset_not_found(self, app: Flask):
         api = DatasetQueryApi()
         method = unwrap(api.get)
 
@@ -1049,7 +1050,7 @@ class TestDatasetQueryApi:
             with pytest.raises(NotFound, match="Dataset not found"):
                 method(api, dataset_id)
 
-    def test_get_queries_permission_denied(self, app):
+    def test_get_queries_permission_denied(self, app: Flask):
         api = DatasetQueryApi()
         method = unwrap(api.get)
 
@@ -1078,7 +1079,7 @@ class TestDatasetQueryApi:
             with pytest.raises(Forbidden):
                 method(api, dataset_id)
 
-    def test_get_queries_pagination_has_more(self, app):
+    def test_get_queries_pagination_has_more(self, app: Flask):
         api = DatasetQueryApi()
         method = unwrap(api.get)
 
@@ -1152,7 +1153,7 @@ class TestDatasetIndexingEstimateApi:
             "dataset_id": None,
         }
 
-    def test_post_success_upload_file(self, app):
+    def test_post_success_upload_file(self, app: Flask):
         api = DatasetIndexingEstimateApi()
         method = unwrap(api.post)
 
@@ -1193,7 +1194,7 @@ class TestDatasetIndexingEstimateApi:
         assert status == 200
         assert response == {"tokens": 100}
 
-    def test_post_file_not_found(self, app):
+    def test_post_file_not_found(self, app: Flask):
         api = DatasetIndexingEstimateApi()
         method = unwrap(api.post)
 
@@ -1223,7 +1224,7 @@ class TestDatasetIndexingEstimateApi:
             with pytest.raises(NotFound):
                 method(api)
 
-    def test_post_llm_bad_request_error(self, app):
+    def test_post_llm_bad_request_error(self, app: Flask):
         api = DatasetIndexingEstimateApi()
         method = unwrap(api.post)
         mock_file = self._upload_file()
@@ -1258,7 +1259,7 @@ class TestDatasetIndexingEstimateApi:
             with pytest.raises(ProviderNotInitializeError):
                 method(api)
 
-    def test_post_provider_token_not_init(self, app):
+    def test_post_provider_token_not_init(self, app: Flask):
         api = DatasetIndexingEstimateApi()
         method = unwrap(api.post)
         mock_file = self._upload_file()
@@ -1293,7 +1294,7 @@ class TestDatasetIndexingEstimateApi:
             with pytest.raises(ProviderNotInitializeError):
                 method(api)
 
-    def test_post_generic_exception(self, app):
+    def test_post_generic_exception(self, app: Flask):
         api = DatasetIndexingEstimateApi()
         method = unwrap(api.post)
         mock_file = self._upload_file()
@@ -1330,7 +1331,7 @@ class TestDatasetIndexingEstimateApi:
 
 
 class TestDatasetRelatedAppListApi:
-    def test_get_success(self, app):
+    def test_get_success(self, app: Flask):
         api = DatasetRelatedAppListApi()
         method = unwrap(api.get)
 
@@ -1368,7 +1369,7 @@ class TestDatasetRelatedAppListApi:
         assert response["total"] == 2
         assert response["data"] == [app1, app2]
 
-    def test_get_dataset_not_found(self, app):
+    def test_get_dataset_not_found(self, app: Flask):
         api = DatasetRelatedAppListApi()
         method = unwrap(api.get)
 
@@ -1386,7 +1387,7 @@ class TestDatasetRelatedAppListApi:
             with pytest.raises(NotFound):
                 method(api, "dataset-1")
 
-    def test_get_permission_denied(self, app):
+    def test_get_permission_denied(self, app: Flask):
         api = DatasetRelatedAppListApi()
         method = unwrap(api.get)
 
@@ -1410,7 +1411,7 @@ class TestDatasetRelatedAppListApi:
             with pytest.raises(Forbidden):
                 method(api, "dataset-1")
 
-    def test_get_filters_none_apps(self, app):
+    def test_get_filters_none_apps(self, app: Flask):
         api = DatasetRelatedAppListApi()
         method = unwrap(api.get)
 
@@ -1449,7 +1450,7 @@ class TestDatasetRelatedAppListApi:
 
 
 class TestDatasetIndexingStatusApi:
-    def test_get_success_with_documents(self, app):
+    def test_get_success_with_documents(self, app: Flask):
         api = DatasetIndexingStatusApi()
         method = unwrap(api.get)
 
@@ -1490,7 +1491,7 @@ class TestDatasetIndexingStatusApi:
         assert item["completed_segments"] == 3
         assert item["total_segments"] == 3
 
-    def test_get_success_no_documents(self, app):
+    def test_get_success_no_documents(self, app: Flask):
         api = DatasetIndexingStatusApi()
         method = unwrap(api.get)
 
@@ -1510,7 +1511,7 @@ class TestDatasetIndexingStatusApi:
         assert status == 200
         assert response == {"data": []}
 
-    def test_segment_counts_different_values(self, app):
+    def test_segment_counts_different_values(self, app: Flask):
         api = DatasetIndexingStatusApi()
         method = unwrap(api.get)
 
@@ -1550,7 +1551,7 @@ class TestDatasetIndexingStatusApi:
 
 
 class TestDatasetApiKeyApi:
-    def test_get_api_keys_success(self, app):
+    def test_get_api_keys_success(self, app: Flask):
         api = DatasetApiKeyApi()
         method = unwrap(api.get)
 
@@ -1587,7 +1588,7 @@ class TestDatasetApiKeyApi:
         assert response["data"][1]["id"] == "key-2"
         assert response["data"][1]["token"] == "ds-def"
 
-    def test_post_create_api_key_success(self, app):
+    def test_post_create_api_key_success(self, app: Flask):
         api = DatasetApiKeyApi()
         method = unwrap(api.post)
 
@@ -1632,7 +1633,7 @@ class TestDatasetApiKeyApi:
         assert response["type"] == "dataset"
         assert response["created_at"] is not None
 
-    def test_post_exceed_max_keys(self, app):
+    def test_post_exceed_max_keys(self, app: Flask):
         api = DatasetApiKeyApi()
         method = unwrap(api.post)
 
@@ -1658,7 +1659,7 @@ class TestDatasetApiKeyApi:
 
 
 class TestDatasetApiDeleteApi:
-    def test_delete_success(self, app):
+    def test_delete_success(self, app: Flask):
         api = DatasetApiDeleteApi()
         method = unwrap(api.delete)
 
@@ -1688,7 +1689,7 @@ class TestDatasetApiDeleteApi:
         assert status == 204
         assert response["result"] == "success"
 
-    def test_delete_key_not_found(self, app):
+    def test_delete_key_not_found(self, app: Flask):
         api = DatasetApiDeleteApi()
         method = unwrap(api.delete)
 
@@ -1708,7 +1709,7 @@ class TestDatasetApiDeleteApi:
 
 
 class TestDatasetEnableApiApi:
-    def test_enable_api(self, app):
+    def test_enable_api(self, app: Flask):
         api = DatasetEnableApiApi()
         method = unwrap(api.post)
 
@@ -1724,7 +1725,7 @@ class TestDatasetEnableApiApi:
         assert status == 200
         assert response["result"] == "success"
 
-    def test_disable_api(self, app):
+    def test_disable_api(self, app: Flask):
         api = DatasetEnableApiApi()
         method = unwrap(api.post)
 
@@ -1742,7 +1743,7 @@ class TestDatasetEnableApiApi:
 
 
 class TestDatasetApiBaseUrlApi:
-    def test_get_api_base_url_from_config(self, app):
+    def test_get_api_base_url_from_config(self, app: Flask):
         api = DatasetApiBaseUrlApi()
         method = unwrap(api.get)
 
@@ -1757,7 +1758,7 @@ class TestDatasetApiBaseUrlApi:
 
         assert response["api_base_url"] == "https://example.com/v1"
 
-    def test_get_api_base_url_from_request(self, app):
+    def test_get_api_base_url_from_request(self, app: Flask):
         api = DatasetApiBaseUrlApi()
         method = unwrap(api.get)
 
@@ -1772,7 +1773,7 @@ class TestDatasetApiBaseUrlApi:
 
         assert response["api_base_url"] == "http://localhost:5000/v1"
 
-    def test_get_api_base_url_no_double_v1(self, app):
+    def test_get_api_base_url_no_double_v1(self, app: Flask):
         api = DatasetApiBaseUrlApi()
         method = unwrap(api.get)
 
@@ -1789,7 +1790,7 @@ class TestDatasetApiBaseUrlApi:
 
 
 class TestDatasetRetrievalSettingApi:
-    def test_get_success(self, app):
+    def test_get_success(self, app: Flask):
         api = DatasetRetrievalSettingApi()
         method = unwrap(api.get)
 
@@ -1810,7 +1811,7 @@ class TestDatasetRetrievalSettingApi:
 
 
 class TestDatasetRetrievalSettingMockApi:
-    def test_get_success(self, app):
+    def test_get_success(self, app: Flask):
         api = DatasetRetrievalSettingMockApi()
         method = unwrap(api.get)
 
@@ -1827,7 +1828,7 @@ class TestDatasetRetrievalSettingMockApi:
 
 
 class TestDatasetErrorDocs:
-    def test_get_success(self, app):
+    def test_get_success(self, app: Flask):
         api = DatasetErrorDocs()
         method = unwrap(api.get)
 
@@ -1850,7 +1851,7 @@ class TestDatasetErrorDocs:
         assert status == 200
         assert response["total"] == 1
 
-    def test_get_dataset_not_found(self, app):
+    def test_get_dataset_not_found(self, app: Flask):
         api = DatasetErrorDocs()
         method = unwrap(api.get)
 
@@ -1866,7 +1867,7 @@ class TestDatasetErrorDocs:
 
 
 class TestDatasetPermissionUserListApi:
-    def test_get_success(self, app):
+    def test_get_success(self, app: Flask):
         api = DatasetPermissionUserListApi()
         method = unwrap(api.get)
 
@@ -1897,7 +1898,7 @@ class TestDatasetPermissionUserListApi:
         assert status == 200
         assert response["data"] == users
 
-    def test_get_permission_denied(self, app):
+    def test_get_permission_denied(self, app: Flask):
         api = DatasetPermissionUserListApi()
         method = unwrap(api.get)
 
@@ -1923,7 +1924,7 @@ class TestDatasetPermissionUserListApi:
 
 
 class TestDatasetAutoDisableLogApi:
-    def test_get_success(self, app):
+    def test_get_success(self, app: Flask):
         api = DatasetAutoDisableLogApi()
         method = unwrap(api.get)
 
@@ -1946,7 +1947,7 @@ class TestDatasetAutoDisableLogApi:
         assert status == 200
         assert response == logs
 
-    def test_get_dataset_not_found(self, app):
+    def test_get_dataset_not_found(self, app: Flask):
         api = DatasetAutoDisableLogApi()
         method = unwrap(api.get)
 
diff --git a/api/tests/unit_tests/controllers/console/datasets/test_datasets_document.py b/api/tests/unit_tests/controllers/console/datasets/test_datasets_document.py
index d9b02ac453..c77895d940 100644
--- a/api/tests/unit_tests/controllers/console/datasets/test_datasets_document.py
+++ b/api/tests/unit_tests/controllers/console/datasets/test_datasets_document.py
@@ -2,6 +2,7 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock, patch
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import Forbidden, NotFound
 
 import services
@@ -94,7 +95,7 @@ def patch_permission():
 
 
 class TestGetProcessRuleApi:
-    def test_get_default_success(self, app, patch_tenant):
+    def test_get_default_success(self, app: Flask, patch_tenant):
         api = GetProcessRuleApi()
         method = unwrap(api.get)
 
@@ -103,7 +104,7 @@ class TestGetProcessRuleApi:
 
         assert "rules" in response
 
-    def test_get_with_document_dataset_not_found(self, app, patch_tenant):
+    def test_get_with_document_dataset_not_found(self, app: Flask, patch_tenant):
         api = GetProcessRuleApi()
         method = unwrap(api.get)
 
@@ -125,7 +126,7 @@ class TestGetProcessRuleApi:
 
 
 class TestDatasetDocumentListApi:
-    def test_get_with_fetch_true_counts_segments(self, app, patch_tenant, patch_dataset, patch_permission):
+    def test_get_with_fetch_true_counts_segments(self, app: Flask, patch_tenant, patch_dataset, patch_permission):
         api = DatasetDocumentListApi()
         method = unwrap(api.get)
 
@@ -157,7 +158,9 @@ class TestDatasetDocumentListApi:
 
         assert resp["data"]
 
-    def test_get_with_search_status_and_created_at_sort(self, app, patch_tenant, patch_dataset, patch_permission):
+    def test_get_with_search_status_and_created_at_sort(
+        self, app: Flask, patch_tenant, patch_dataset, patch_permission
+    ):
         api = DatasetDocumentListApi()
         method = unwrap(api.get)
 
@@ -186,7 +189,7 @@ class TestDatasetDocumentListApi:
 
         assert resp["total"] == 1
 
-    def test_get_success(self, app, patch_tenant, patch_dataset, patch_permission):
+    def test_get_success(self, app: Flask, patch_tenant, patch_dataset, patch_permission):
         api = DatasetDocumentListApi()
         method = unwrap(api.get)
 
@@ -211,7 +214,7 @@ class TestDatasetDocumentListApi:
 
         assert response["total"] == 1
 
-    def test_post_success(self, app, patch_tenant, patch_dataset, patch_permission):
+    def test_post_success(self, app: Flask, patch_tenant, patch_dataset, patch_permission):
         api = DatasetDocumentListApi()
         method = unwrap(api.post)
 
@@ -239,7 +242,7 @@ class TestDatasetDocumentListApi:
 
         assert "documents" in response
 
-    def test_post_forbidden(self, app):
+    def test_post_forbidden(self, app: Flask):
         api = DatasetDocumentListApi()
         method = unwrap(api.post)
 
@@ -260,7 +263,7 @@ class TestDatasetDocumentListApi:
             with pytest.raises(Forbidden):
                 method(api, "ds-1")
 
-    def test_get_with_fetch_true_and_invalid_fetch(self, app, patch_tenant, patch_dataset, patch_permission):
+    def test_get_with_fetch_true_and_invalid_fetch(self, app: Flask, patch_tenant, patch_dataset, patch_permission):
         api = DatasetDocumentListApi()
         method = unwrap(api.get)
 
@@ -285,7 +288,7 @@ class TestDatasetDocumentListApi:
 
         assert response["total"] == 1
 
-    def test_get_sort_hit_count(self, app, patch_tenant, patch_dataset, patch_permission):
+    def test_get_sort_hit_count(self, app: Flask, patch_tenant, patch_dataset, patch_permission):
         api = DatasetDocumentListApi()
         method = unwrap(api.get)
 
@@ -308,7 +311,7 @@ class TestDatasetDocumentListApi:
 
 
 class TestDocumentApi:
-    def test_get_success(self, app, patch_tenant):
+    def test_get_success(self, app: Flask, patch_tenant):
         api = DocumentApi()
         method = unwrap(api.get)
 
@@ -326,7 +329,7 @@ class TestDocumentApi:
 
         assert status == 200
 
-    def test_get_invalid_metadata(self, app, patch_tenant):
+    def test_get_invalid_metadata(self, app: Flask, patch_tenant):
         api = DocumentApi()
         method = unwrap(api.get)
 
@@ -334,7 +337,7 @@ class TestDocumentApi:
             with pytest.raises(InvalidMetadataError):
                 method(api, "ds-1", "doc-1")
 
-    def test_delete_success(self, app, patch_tenant, patch_dataset):
+    def test_delete_success(self, app: Flask, patch_tenant, patch_dataset):
         api = DocumentApi()
         method = unwrap(api.delete)
 
@@ -354,7 +357,7 @@ class TestDocumentApi:
 
         assert status == 204
 
-    def test_delete_indexing_error(self, app, patch_tenant, patch_dataset):
+    def test_delete_indexing_error(self, app: Flask, patch_tenant, patch_dataset):
         api = DocumentApi()
         method = unwrap(api.delete)
 
@@ -375,7 +378,7 @@ class TestDocumentApi:
 
 
 class TestDocumentDownloadApi:
-    def test_download_success(self, app, patch_tenant):
+    def test_download_success(self, app: Flask, patch_tenant):
         api = DocumentDownloadApi()
         method = unwrap(api.get)
 
@@ -395,7 +398,7 @@ class TestDocumentDownloadApi:
 
 
 class TestDocumentProcessingApi:
-    def test_processing_forbidden_when_not_editor(self, app):
+    def test_processing_forbidden_when_not_editor(self, app: Flask):
         api = DocumentProcessingApi()
         method = unwrap(api.patch)
 
@@ -412,7 +415,7 @@ class TestDocumentProcessingApi:
             with pytest.raises(Forbidden):
                 method(api, "ds-1", "doc-1", "pause")
 
-    def test_resume_from_error_state(self, app, patch_tenant):
+    def test_resume_from_error_state(self, app: Flask, patch_tenant):
         api = DocumentProcessingApi()
         method = unwrap(api.patch)
 
@@ -430,7 +433,7 @@ class TestDocumentProcessingApi:
 
         assert status == 200
 
-    def test_resume_success(self, app, patch_tenant):
+    def test_resume_success(self, app: Flask, patch_tenant):
         api = DocumentProcessingApi()
         method = unwrap(api.patch)
 
@@ -448,7 +451,7 @@ class TestDocumentProcessingApi:
 
         assert status == 200
 
-    def test_pause_success(self, app, patch_tenant):
+    def test_pause_success(self, app: Flask, patch_tenant):
         api = DocumentProcessingApi()
         method = unwrap(api.patch)
 
@@ -466,7 +469,7 @@ class TestDocumentProcessingApi:
 
         assert status == 200
 
-    def test_pause_invalid(self, app, patch_tenant):
+    def test_pause_invalid(self, app: Flask, patch_tenant):
         api = DocumentProcessingApi()
         method = unwrap(api.patch)
 
@@ -478,7 +481,7 @@ class TestDocumentProcessingApi:
 
 
 class TestDocumentMetadataApi:
-    def test_put_metadata_schema_filtering(self, app, patch_tenant):
+    def test_put_metadata_schema_filtering(self, app: Flask, patch_tenant):
         api = DocumentMetadataApi()
         method = unwrap(api.put)
 
@@ -507,7 +510,7 @@ class TestDocumentMetadataApi:
 
         assert doc.doc_metadata == {"amount": 10}
 
-    def test_put_success(self, app, patch_tenant):
+    def test_put_success(self, app: Flask, patch_tenant):
         api = DocumentMetadataApi()
         method = unwrap(api.put)
 
@@ -531,7 +534,7 @@ class TestDocumentMetadataApi:
 
         assert status == 200
 
-    def test_put_invalid_payload(self, app, patch_tenant):
+    def test_put_invalid_payload(self, app: Flask, patch_tenant):
         api = DocumentMetadataApi()
         method = unwrap(api.put)
 
@@ -539,7 +542,7 @@ class TestDocumentMetadataApi:
             with pytest.raises(ValueError):
                 method(api, "ds-1", "doc-1")
 
-    def test_put_invalid_doc_type(self, app, patch_tenant):
+    def test_put_invalid_doc_type(self, app: Flask, patch_tenant):
         api = DocumentMetadataApi()
         method = unwrap(api.put)
 
@@ -558,7 +561,7 @@ class TestDocumentMetadataApi:
 
 
 class TestDocumentStatusApi:
-    def test_patch_success(self, app, patch_tenant, patch_dataset):
+    def test_patch_success(self, app: Flask, patch_tenant, patch_dataset):
         api = DocumentStatusApi()
         method = unwrap(api.patch)
 
@@ -581,7 +584,7 @@ class TestDocumentStatusApi:
 
         assert status == 200
 
-    def test_patch_invalid_action(self, app, patch_tenant, patch_dataset):
+    def test_patch_invalid_action(self, app: Flask, patch_tenant, patch_dataset):
         api = DocumentStatusApi()
         method = unwrap(api.patch)
 
@@ -605,7 +608,7 @@ class TestDocumentStatusApi:
 
 
 class TestDocumentRetryApi:
-    def test_retry_archived_document_skipped(self, app, patch_tenant, patch_dataset):
+    def test_retry_archived_document_skipped(self, app: Flask, patch_tenant, patch_dataset):
         api = DocumentRetryApi()
         method = unwrap(api.post)
 
@@ -633,7 +636,7 @@ class TestDocumentRetryApi:
         assert status == 204
         retry_mock.assert_called_once_with("ds-1", [])
 
-    def test_retry_success(self, app, patch_tenant, patch_dataset):
+    def test_retry_success(self, app: Flask, patch_tenant, patch_dataset):
         api = DocumentRetryApi()
         method = unwrap(api.post)
 
@@ -662,7 +665,7 @@ class TestDocumentRetryApi:
         assert status == 204
         retry_mock.assert_called_once_with("ds-1", [document])
 
-    def test_retry_skips_completed_document(self, app, patch_tenant, patch_dataset):
+    def test_retry_skips_completed_document(self, app: Flask, patch_tenant, patch_dataset):
         api = DocumentRetryApi()
         method = unwrap(api.post)
 
@@ -689,7 +692,7 @@ class TestDocumentRetryApi:
 
 
 class TestDocumentPipelineExecutionLogApi:
-    def test_get_log_success(self, app, patch_tenant, patch_dataset):
+    def test_get_log_success(self, app: Flask, patch_tenant, patch_dataset):
         api = DocumentPipelineExecutionLogApi()
         method = unwrap(api.get)
 
@@ -717,7 +720,7 @@ class TestDocumentPipelineExecutionLogApi:
 
 
 class TestDocumentGenerateSummaryApi:
-    def test_generate_summary_missing_documents(self, app, patch_tenant, patch_permission):
+    def test_generate_summary_missing_documents(self, app: Flask, patch_tenant, patch_permission):
         api = DocumentGenerateSummaryApi()
         method = unwrap(api.post)
 
@@ -743,7 +746,7 @@ class TestDocumentGenerateSummaryApi:
             with pytest.raises(NotFound):
                 method(api, "ds-1")
 
-    def test_generate_not_enabled(self, app, patch_tenant, patch_permission):
+    def test_generate_not_enabled(self, app: Flask, patch_tenant, patch_permission):
         api = DocumentGenerateSummaryApi()
         method = unwrap(api.post)
 
@@ -762,7 +765,7 @@ class TestDocumentGenerateSummaryApi:
             with pytest.raises(ValueError):
                 method(api, "ds-1")
 
-    def test_generate_summary_success_with_qa_skip(self, app, patch_tenant, patch_permission):
+    def test_generate_summary_success_with_qa_skip(self, app: Flask, patch_tenant, patch_permission):
         api = DocumentGenerateSummaryApi()
         method = unwrap(api.post)
 
@@ -798,7 +801,7 @@ class TestDocumentGenerateSummaryApi:
 
 
 class TestDocumentSummaryStatusApi:
-    def test_get_success(self, app, patch_tenant, patch_permission):
+    def test_get_success(self, app: Flask, patch_tenant, patch_permission):
         api = DocumentSummaryStatusApi()
         method = unwrap(api.get)
 
@@ -819,7 +822,7 @@ class TestDocumentSummaryStatusApi:
 
 
 class TestDocumentIndexingEstimateApi:
-    def test_indexing_estimate_file_not_found(self, app, patch_tenant):
+    def test_indexing_estimate_file_not_found(self, app: Flask, patch_tenant):
         api = DocumentIndexingEstimateApi()
         method = unwrap(api.get)
 
@@ -843,7 +846,7 @@ class TestDocumentIndexingEstimateApi:
             with pytest.raises(NotFound):
                 method(api, "ds-1", "doc-1")
 
-    def test_indexing_estimate_generic_exception(self, app, patch_tenant):
+    def test_indexing_estimate_generic_exception(self, app: Flask, patch_tenant):
         api = DocumentIndexingEstimateApi()
         method = unwrap(api.get)
 
@@ -880,7 +883,7 @@ class TestDocumentIndexingEstimateApi:
             with pytest.raises(IndexingEstimateError):
                 method(api, "ds-1", "doc-1")
 
-    def test_get_finished(self, app, patch_tenant):
+    def test_get_finished(self, app: Flask, patch_tenant):
         api = DocumentIndexingEstimateApi()
         method = unwrap(api.get)
 
@@ -892,7 +895,7 @@ class TestDocumentIndexingEstimateApi:
 
 
 class TestDocumentBatchDownloadZipApi:
-    def test_post_no_documents(self, app, patch_tenant):
+    def test_post_no_documents(self, app: Flask, patch_tenant):
         api = DocumentBatchDownloadZipApi()
         method = unwrap(api.post)
 
@@ -904,7 +907,7 @@ class TestDocumentBatchDownloadZipApi:
 
 
 class TestDatasetDocumentListApiDelete:
-    def test_delete_success(self, app, patch_tenant, patch_dataset):
+    def test_delete_success(self, app: Flask, patch_tenant, patch_dataset):
         """Test successful deletion of documents"""
         api = DatasetDocumentListApi()
         method = unwrap(api.delete)
@@ -924,7 +927,7 @@ class TestDatasetDocumentListApiDelete:
 
         assert status == 204
 
-    def test_delete_indexing_error(self, app, patch_tenant, patch_dataset):
+    def test_delete_indexing_error(self, app: Flask, patch_tenant, patch_dataset):
         """Test deletion with indexing error"""
         api = DatasetDocumentListApi()
         method = unwrap(api.delete)
@@ -943,7 +946,7 @@ class TestDatasetDocumentListApiDelete:
             with pytest.raises(DocumentIndexingError):
                 method(api, "ds-1")
 
-    def test_delete_dataset_not_found(self, app, patch_tenant):
+    def test_delete_dataset_not_found(self, app: Flask, patch_tenant):
         """Test deletion when dataset not found"""
         api = DatasetDocumentListApi()
         method = unwrap(api.delete)
@@ -960,7 +963,7 @@ class TestDatasetDocumentListApiDelete:
 
 
 class TestDocumentBatchIndexingEstimateApi:
-    def test_batch_indexing_estimate_website(self, app, patch_tenant):
+    def test_batch_indexing_estimate_website(self, app: Flask, patch_tenant):
         api = DocumentBatchIndexingEstimateApi()
         method = unwrap(api.get)
 
@@ -989,7 +992,7 @@ class TestDocumentBatchIndexingEstimateApi:
 
         assert status == 200
 
-    def test_batch_indexing_estimate_notion(self, app, patch_tenant):
+    def test_batch_indexing_estimate_notion(self, app: Flask, patch_tenant):
         api = DocumentBatchIndexingEstimateApi()
         method = unwrap(api.get)
 
@@ -1017,7 +1020,7 @@ class TestDocumentBatchIndexingEstimateApi:
 
         assert status == 200
 
-    def test_batch_estimate_unsupported_datasource(self, app, patch_tenant):
+    def test_batch_estimate_unsupported_datasource(self, app: Flask, patch_tenant):
         api = DocumentBatchIndexingEstimateApi()
         method = unwrap(api.get)
 
@@ -1032,7 +1035,7 @@ class TestDocumentBatchIndexingEstimateApi:
             with pytest.raises(ValueError):
                 method(api, "ds-1", "batch-1")
 
-    def test_get_batch_estimate_invalid_batch(self, app, patch_tenant):
+    def test_get_batch_estimate_invalid_batch(self, app: Flask, patch_tenant):
         """Test batch estimation with invalid batch"""
         api = DocumentBatchIndexingEstimateApi()
         method = unwrap(api.get)
@@ -1043,7 +1046,7 @@ class TestDocumentBatchIndexingEstimateApi:
 
 
 class TestDocumentBatchIndexingStatusApi:
-    def test_get_batch_status_invalid_batch(self, app, patch_tenant):
+    def test_get_batch_status_invalid_batch(self, app: Flask, patch_tenant):
         """Test batch status with invalid batch"""
         api = DocumentBatchIndexingStatusApi()
         method = unwrap(api.get)
@@ -1054,7 +1057,7 @@ class TestDocumentBatchIndexingStatusApi:
 
 
 class TestDocumentIndexingStatusApi:
-    def test_get_status_document_not_found(self, app, patch_tenant):
+    def test_get_status_document_not_found(self, app: Flask, patch_tenant):
         """Test getting status for non-existent document"""
         api = DocumentIndexingStatusApi()
         method = unwrap(api.get)
@@ -1065,7 +1068,7 @@ class TestDocumentIndexingStatusApi:
 
 
 class TestDocumentApiMetadata:
-    def test_get_with_only_option(self, app, patch_tenant):
+    def test_get_with_only_option(self, app: Flask, patch_tenant):
         """Test get with 'only' metadata option"""
         api = DocumentApi()
         method = unwrap(api.get)
@@ -1084,7 +1087,7 @@ class TestDocumentApiMetadata:
 
         assert status == 200
 
-    def test_get_with_without_option(self, app, patch_tenant):
+    def test_get_with_without_option(self, app: Flask, patch_tenant):
         """Test get with 'without' metadata option"""
         api = DocumentApi()
         method = unwrap(api.get)
@@ -1105,7 +1108,7 @@ class TestDocumentApiMetadata:
 
 
 class TestDocumentGenerateSummaryApiSuccess:
-    def test_generate_not_enabled_high_quality(self, app, patch_tenant, patch_permission):
+    def test_generate_not_enabled_high_quality(self, app: Flask, patch_tenant, patch_permission):
         """Test summary generation on non-high-quality dataset"""
         api = DocumentGenerateSummaryApi()
         method = unwrap(api.post)
@@ -1127,7 +1130,7 @@ class TestDocumentGenerateSummaryApiSuccess:
 
 
 class TestDocumentProcessingApiResume:
-    def test_resume_invalid_status(self, app, patch_tenant):
+    def test_resume_invalid_status(self, app: Flask, patch_tenant):
         """Test resume on non-paused document"""
         api = DocumentProcessingApi()
         method = unwrap(api.patch)
@@ -1140,7 +1143,7 @@ class TestDocumentProcessingApiResume:
 
 
 class TestDocumentPermissionCases:
-    def test_document_batch_get_permission_denied(self, app, patch_tenant):
+    def test_document_batch_get_permission_denied(self, app: Flask, patch_tenant):
         api = DocumentBatchIndexingEstimateApi()
         method = unwrap(api.get)
 
@@ -1158,7 +1161,7 @@ class TestDocumentPermissionCases:
             with pytest.raises(Forbidden):
                 method(api, "ds-1", "batch-1")
 
-    def test_document_batch_get_documents_not_found(self, app, patch_tenant):
+    def test_document_batch_get_documents_not_found(self, app: Flask, patch_tenant):
         api = DocumentBatchIndexingEstimateApi()
         method = unwrap(api.get)
 
@@ -1185,7 +1188,7 @@ class TestDocumentPermissionCases:
             "preview": [],
         }
 
-    def test_document_tenant_mismatch(self, app):
+    def test_document_tenant_mismatch(self, app: Flask):
         api = DocumentApi()
         method = unwrap(api.get)
 
@@ -1217,7 +1220,7 @@ class TestDocumentPermissionCases:
             with pytest.raises(Forbidden):
                 method(api, "ds-1", "doc-1")
 
-    def test_process_rule_get_by_document_success(self, app, patch_tenant):
+    def test_process_rule_get_by_document_success(self, app: Flask, patch_tenant):
         api = GetProcessRuleApi()
         method = unwrap(api.get)
 
@@ -1253,7 +1256,7 @@ class TestDocumentPermissionCases:
         assert status == 200
         assert response["mode"] == "custom"
 
-    def test_process_rule_permission_denied(self, app):
+    def test_process_rule_permission_denied(self, app: Flask):
         api = GetProcessRuleApi()
         method = unwrap(api.get)
 
@@ -1283,7 +1286,7 @@ class TestDocumentPermissionCases:
 
 
 class TestDocumentListAdvancedCases:
-    def test_document_list_with_multiple_sort_options(self, app, patch_tenant, patch_dataset, patch_permission):
+    def test_document_list_with_multiple_sort_options(self, app: Flask, patch_tenant, patch_dataset, patch_permission):
         """Test document list with different sort options"""
         api = DatasetDocumentListApi()
         method = unwrap(api.get)
@@ -1309,7 +1312,7 @@ class TestDocumentListAdvancedCases:
 
         assert response["total"] == 1
 
-    def test_document_metadata_with_schema_validation(self, app, patch_tenant):
+    def test_document_metadata_with_schema_validation(self, app: Flask, patch_tenant):
         """Test document metadata update with schema validation"""
         api = DocumentMetadataApi()
         method = unwrap(api.put)
@@ -1341,7 +1344,7 @@ class TestDocumentListAdvancedCases:
 
 
 class TestDocumentIndexingEdgeCases:
-    def test_document_indexing_with_extraction_setting(self, app, patch_tenant):
+    def test_document_indexing_with_extraction_setting(self, app: Flask, patch_tenant):
         api = DocumentIndexingEstimateApi()
         method = unwrap(api.get)
 
diff --git a/api/tests/unit_tests/controllers/console/datasets/test_datasets_segments.py b/api/tests/unit_tests/controllers/console/datasets/test_datasets_segments.py
index 693b06e95b..66d257ee66 100644
--- a/api/tests/unit_tests/controllers/console/datasets/test_datasets_segments.py
+++ b/api/tests/unit_tests/controllers/console/datasets/test_datasets_segments.py
@@ -2,6 +2,7 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock, patch
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import Forbidden, NotFound
 
 import services
@@ -67,7 +68,7 @@ def _segment():
     )
 
 
-def test_get_segment_with_summary(monkeypatch):
+def test_get_segment_with_summary(monkeypatch: pytest.MonkeyPatch):
     segment = _segment()
     summary = SimpleNamespace(summary_content="summary")
 
@@ -82,7 +83,7 @@ def test_get_segment_with_summary(monkeypatch):
 
 
 class TestDatasetDocumentSegmentListApi:
-    def test_get_success(self, app):
+    def test_get_success(self, app: Flask):
         api = DatasetDocumentSegmentListApi()
         method = unwrap(api.get)
 
@@ -132,7 +133,7 @@ class TestDatasetDocumentSegmentListApi:
 
         assert status == 200
 
-    def test_get_dataset_not_found(self, app):
+    def test_get_dataset_not_found(self, app: Flask):
         api = DatasetDocumentSegmentListApi()
         method = unwrap(api.get)
 
@@ -150,7 +151,7 @@ class TestDatasetDocumentSegmentListApi:
             with pytest.raises(NotFound):
                 method(api, "ds-1", "doc-1")
 
-    def test_get_permission_denied(self, app):
+    def test_get_permission_denied(self, app: Flask):
         api = DatasetDocumentSegmentListApi()
         method = unwrap(api.get)
 
@@ -176,7 +177,7 @@ class TestDatasetDocumentSegmentListApi:
 
 
 class TestDatasetDocumentSegmentApi:
-    def test_patch_success(self, app):
+    def test_patch_success(self, app: Flask):
         api = DatasetDocumentSegmentApi()
         method = unwrap(api.patch)
 
@@ -221,7 +222,7 @@ class TestDatasetDocumentSegmentApi:
         assert status == 200
         assert response["result"] == "success"
 
-    def test_patch_document_indexing_in_progress(self, app):
+    def test_patch_document_indexing_in_progress(self, app: Flask):
         api = DatasetDocumentSegmentApi()
         method = unwrap(api.patch)
 
@@ -264,7 +265,7 @@ class TestDatasetDocumentSegmentApi:
             with pytest.raises(InvalidActionError):
                 method(api, "ds-1", "doc-1", "disable")
 
-    def test_patch_llm_bad_request(self, app):
+    def test_patch_llm_bad_request(self, app: Flask):
         api = DatasetDocumentSegmentApi()
         method = unwrap(api.patch)
 
@@ -308,7 +309,7 @@ class TestDatasetDocumentSegmentApi:
             with pytest.raises(ProviderNotInitializeError):
                 method(api, "ds-1", "doc-1", "enable")
 
-    def test_patch_provider_token_not_init(self, app):
+    def test_patch_provider_token_not_init(self, app: Flask):
         api = DatasetDocumentSegmentApi()
         method = unwrap(api.patch)
 
@@ -354,7 +355,7 @@ class TestDatasetDocumentSegmentApi:
 
 
 class TestDatasetDocumentSegmentAddApi:
-    def test_post_success(self, app):
+    def test_post_success(self, app: Flask):
         api = DatasetDocumentSegmentAddApi()
         method = unwrap(api.post)
 
@@ -413,7 +414,7 @@ class TestDatasetDocumentSegmentAddApi:
         assert status == 200
         assert response["data"]["id"] == "seg-1"
 
-    def test_post_llm_bad_request(self, app):
+    def test_post_llm_bad_request(self, app: Flask):
         api = DatasetDocumentSegmentAddApi()
         method = unwrap(api.post)
 
@@ -452,7 +453,7 @@ class TestDatasetDocumentSegmentAddApi:
             with pytest.raises(ProviderNotInitializeError):
                 method(api, "ds-1", "doc-1")
 
-    def test_post_provider_token_not_init(self, app):
+    def test_post_provider_token_not_init(self, app: Flask):
         api = DatasetDocumentSegmentAddApi()
         method = unwrap(api.post)
 
@@ -493,7 +494,7 @@ class TestDatasetDocumentSegmentAddApi:
 
 
 class TestDatasetDocumentSegmentUpdateApi:
-    def test_patch_success(self, app):
+    def test_patch_success(self, app: Flask):
         api = DatasetDocumentSegmentUpdateApi()
         method = unwrap(api.patch)
 
@@ -551,7 +552,7 @@ class TestDatasetDocumentSegmentUpdateApi:
         assert status == 200
         assert "data" in response
 
-    def test_patch_llm_bad_request(self, app):
+    def test_patch_llm_bad_request(self, app: Flask):
         api = DatasetDocumentSegmentUpdateApi()
         method = unwrap(api.patch)
 
@@ -596,7 +597,7 @@ class TestDatasetDocumentSegmentUpdateApi:
 
 
 class TestDatasetDocumentSegmentBatchImportApi:
-    def test_post_success(self, app):
+    def test_post_success(self, app: Flask):
         api = DatasetDocumentSegmentBatchImportApi()
         method = unwrap(api.post)
 
@@ -638,7 +639,7 @@ class TestDatasetDocumentSegmentBatchImportApi:
         assert status == 200
         assert response["job_status"] == "waiting"
 
-    def test_post_dataset_not_found(self, app):
+    def test_post_dataset_not_found(self, app: Flask):
         api = DatasetDocumentSegmentBatchImportApi()
         method = unwrap(api.post)
 
@@ -659,7 +660,7 @@ class TestDatasetDocumentSegmentBatchImportApi:
             with pytest.raises(NotFound):
                 method(api, "ds-1", "doc-1")
 
-    def test_post_document_not_found(self, app):
+    def test_post_document_not_found(self, app: Flask):
         api = DatasetDocumentSegmentBatchImportApi()
         method = unwrap(api.post)
 
@@ -684,7 +685,7 @@ class TestDatasetDocumentSegmentBatchImportApi:
             with pytest.raises(NotFound):
                 method(api, "ds-1", "doc-1")
 
-    def test_post_upload_file_not_found(self, app):
+    def test_post_upload_file_not_found(self, app: Flask):
         api = DatasetDocumentSegmentBatchImportApi()
         method = unwrap(api.post)
 
@@ -713,7 +714,7 @@ class TestDatasetDocumentSegmentBatchImportApi:
             with pytest.raises(NotFound):
                 method(api, "ds-1", "doc-1")
 
-    def test_post_invalid_file_type(self, app):
+    def test_post_invalid_file_type(self, app: Flask):
         api = DatasetDocumentSegmentBatchImportApi()
         method = unwrap(api.post)
 
@@ -745,7 +746,7 @@ class TestDatasetDocumentSegmentBatchImportApi:
             with pytest.raises(ValueError):
                 method(api, "ds-1", "doc-1")
 
-    def test_post_async_task_failure(self, app):
+    def test_post_async_task_failure(self, app: Flask):
         api = DatasetDocumentSegmentBatchImportApi()
         method = unwrap(api.post)
 
@@ -783,7 +784,7 @@ class TestDatasetDocumentSegmentBatchImportApi:
         assert status == 500
         assert "error" in response
 
-    def test_get_job_not_found_in_redis(self, app):
+    def test_get_job_not_found_in_redis(self, app: Flask):
         api = DatasetDocumentSegmentBatchImportApi()
         method = unwrap(api.get)
 
@@ -799,7 +800,7 @@ class TestDatasetDocumentSegmentBatchImportApi:
 
 
 class TestChildChunkAddApi:
-    def test_post_success(self, app):
+    def test_post_success(self, app: Flask):
         api = ChildChunkAddApi()
         method = unwrap(api.post)
 
@@ -852,7 +853,7 @@ class TestChildChunkAddApi:
         assert status == 200
         assert response["data"]["id"] == "cc-1"
 
-    def test_post_child_chunk_indexing_error(self, app):
+    def test_post_child_chunk_indexing_error(self, app: Flask):
         api = ChildChunkAddApi()
         method = unwrap(api.post)
 
@@ -897,7 +898,7 @@ class TestChildChunkAddApi:
 
 
 class TestChildChunkUpdateApi:
-    def test_delete_success(self, app):
+    def test_delete_success(self, app: Flask):
         api = ChildChunkUpdateApi()
         method = unwrap(api.delete)
 
@@ -941,7 +942,7 @@ class TestChildChunkUpdateApi:
         assert status == 204
         assert response["result"] == "success"
 
-    def test_delete_child_chunk_index_error(self, app):
+    def test_delete_child_chunk_index_error(self, app: Flask):
         api = ChildChunkUpdateApi()
         method = unwrap(api.delete)
 
@@ -984,7 +985,7 @@ class TestChildChunkUpdateApi:
 
 
 class TestSegmentListAdvancedCases:
-    def test_segment_list_with_keyword_filter(self, app):
+    def test_segment_list_with_keyword_filter(self, app: Flask):
         api = DatasetDocumentSegmentListApi()
         method = unwrap(api.get)
 
@@ -1035,7 +1036,7 @@ class TestSegmentListAdvancedCases:
         assert status == 200
         assert response["total"] == 1
 
-    def test_segment_list_permission_denied(self, app):
+    def test_segment_list_permission_denied(self, app: Flask):
         """Test segment list with permission denied"""
         api = DatasetDocumentSegmentListApi()
         method = unwrap(api.get)
@@ -1058,7 +1059,7 @@ class TestSegmentListAdvancedCases:
             with pytest.raises(Forbidden):
                 method(api, "ds-1", "doc-1")
 
-    def test_segment_list_dataset_not_found(self, app):
+    def test_segment_list_dataset_not_found(self, app: Flask):
         """Test segment list with dataset not found"""
         api = DatasetDocumentSegmentListApi()
         method = unwrap(api.get)
@@ -1079,7 +1080,7 @@ class TestSegmentListAdvancedCases:
 
 
 class TestSegmentOperationCases:
-    def test_segment_add_with_provider_token_error(self, app):
+    def test_segment_add_with_provider_token_error(self, app: Flask):
         """Test segment add with provider token not initialized"""
         api = DatasetDocumentSegmentAddApi()
         method = unwrap(api.post)
@@ -1117,7 +1118,7 @@ class TestSegmentOperationCases:
             with pytest.raises(ProviderTokenNotInitError):
                 method(api, "ds-1", "doc-1")
 
-    def test_batch_import_with_document_not_found(self, app):
+    def test_batch_import_with_document_not_found(self, app: Flask):
         """Test batch import with document not found"""
         api = DatasetDocumentSegmentBatchImportApi()
         method = unwrap(api.post)
@@ -1146,7 +1147,7 @@ class TestSegmentOperationCases:
             with pytest.raises(NotFound):
                 method(api, "ds-1", "doc-1")
 
-    def test_batch_import_with_invalid_file(self, app):
+    def test_batch_import_with_invalid_file(self, app: Flask):
         """Test batch import with invalid file type"""
         api = DatasetDocumentSegmentBatchImportApi()
         method = unwrap(api.post)
@@ -1181,7 +1182,7 @@ class TestSegmentOperationCases:
             with pytest.raises(NotFound):
                 method(api, "ds-1", "doc-1")
 
-    def test_batch_import_with_async_task_failure(self, app):
+    def test_batch_import_with_async_task_failure(self, app: Flask):
         api = DatasetDocumentSegmentBatchImportApi()
         method = unwrap(api.post)
 
@@ -1226,7 +1227,7 @@ class TestSegmentOperationCases:
         assert status == 500
         assert "error" in response
 
-    def test_batch_import_get_job_not_found(self, app):
+    def test_batch_import_get_job_not_found(self, app: Flask):
         api = DatasetDocumentSegmentBatchImportApi()
         method = unwrap(api.get)
 
diff --git a/api/tests/unit_tests/controllers/console/datasets/test_external.py b/api/tests/unit_tests/controllers/console/datasets/test_external.py
index 514bbbe040..186b379cbc 100644
--- a/api/tests/unit_tests/controllers/console/datasets/test_external.py
+++ b/api/tests/unit_tests/controllers/console/datasets/test_external.py
@@ -57,7 +57,7 @@ def mock_auth(monkeypatch, current_user):
 
 
 class TestExternalApiTemplateListApi:
-    def test_get_success(self, app):
+    def test_get_success(self, app: Flask):
         api = ExternalApiTemplateListApi()
         method = unwrap(api.get)
 
@@ -78,7 +78,7 @@ class TestExternalApiTemplateListApi:
         assert resp["total"] == 1
         assert resp["data"][0]["id"] == "1"
 
-    def test_post_forbidden(self, app, current_user):
+    def test_post_forbidden(self, app: Flask, current_user):
         current_user.is_dataset_editor = False
         api = ExternalApiTemplateListApi()
         method = unwrap(api.post)
@@ -93,7 +93,7 @@ class TestExternalApiTemplateListApi:
             with pytest.raises(Forbidden):
                 method(api)
 
-    def test_post_duplicate_name(self, app):
+    def test_post_duplicate_name(self, app: Flask):
         api = ExternalApiTemplateListApi()
         method = unwrap(api.post)
 
@@ -114,7 +114,7 @@ class TestExternalApiTemplateListApi:
 
 
 class TestExternalApiTemplateApi:
-    def test_get_not_found(self, app):
+    def test_get_not_found(self, app: Flask):
         api = ExternalApiTemplateApi()
         method = unwrap(api.get)
 
@@ -129,7 +129,7 @@ class TestExternalApiTemplateApi:
             with pytest.raises(NotFound):
                 method(api, "api-id")
 
-    def test_delete_forbidden(self, app, current_user):
+    def test_delete_forbidden(self, app: Flask, current_user):
         current_user.has_edit_permission = False
         current_user.is_dataset_operator = False
 
@@ -142,7 +142,7 @@ class TestExternalApiTemplateApi:
 
 
 class TestExternalApiUseCheckApi:
-    def test_get_scopes_usage_check_to_current_tenant(self, app):
+    def test_get_scopes_usage_check_to_current_tenant(self, app: Flask):
         api = ExternalApiUseCheckApi()
         method = unwrap(api.get)
 
@@ -162,7 +162,7 @@ class TestExternalApiUseCheckApi:
 
 
 class TestExternalDatasetCreateApi:
-    def test_create_success(self, app):
+    def test_create_success(self, app: Flask):
         api = ExternalDatasetCreateApi()
         method = unwrap(api.post)
 
@@ -206,7 +206,7 @@ class TestExternalDatasetCreateApi:
 
         assert status == 201
 
-    def test_create_forbidden(self, app, current_user):
+    def test_create_forbidden(self, app: Flask, current_user):
         current_user.is_dataset_editor = False
         api = ExternalDatasetCreateApi()
         method = unwrap(api.post)
@@ -226,7 +226,7 @@ class TestExternalDatasetCreateApi:
 
 
 class TestExternalKnowledgeHitTestingApi:
-    def test_hit_testing_dataset_not_found(self, app):
+    def test_hit_testing_dataset_not_found(self, app: Flask):
         api = ExternalKnowledgeHitTestingApi()
         method = unwrap(api.post)
 
@@ -241,7 +241,7 @@ class TestExternalKnowledgeHitTestingApi:
             with pytest.raises(NotFound):
                 method(api, "dataset-id")
 
-    def test_hit_testing_success(self, app):
+    def test_hit_testing_success(self, app: Flask):
         api = ExternalKnowledgeHitTestingApi()
         method = unwrap(api.post)
 
@@ -266,7 +266,7 @@ class TestExternalKnowledgeHitTestingApi:
 
 
 class TestBedrockRetrievalApi:
-    def test_bedrock_retrieval(self, app):
+    def test_bedrock_retrieval(self, app: Flask):
         api = BedrockRetrievalApi()
         method = unwrap(api.post)
 
@@ -292,7 +292,7 @@ class TestBedrockRetrievalApi:
 
 
 class TestExternalApiTemplateListApiAdvanced:
-    def test_post_duplicate_name_error(self, app, mock_auth, current_user):
+    def test_post_duplicate_name_error(self, app: Flask, mock_auth, current_user):
         api = ExternalApiTemplateListApi()
         method = unwrap(api.post)
 
@@ -310,7 +310,7 @@ class TestExternalApiTemplateListApiAdvanced:
             with pytest.raises(DatasetNameDuplicateError):
                 method(api)
 
-    def test_get_with_pagination(self, app, mock_auth, current_user):
+    def test_get_with_pagination(self, app: Flask, mock_auth, current_user):
         api = ExternalApiTemplateListApi()
         method = unwrap(api.get)
 
@@ -331,7 +331,7 @@ class TestExternalApiTemplateListApiAdvanced:
 
 
 class TestExternalDatasetCreateApiAdvanced:
-    def test_create_forbidden(self, app, mock_auth, current_user):
+    def test_create_forbidden(self, app: Flask, mock_auth, current_user):
         """Test creating external dataset without permission"""
         api = ExternalDatasetCreateApi()
         method = unwrap(api.post)
@@ -351,7 +351,7 @@ class TestExternalDatasetCreateApiAdvanced:
 
 
 class TestExternalKnowledgeHitTestingApiAdvanced:
-    def test_hit_testing_dataset_not_found(self, app, mock_auth, current_user):
+    def test_hit_testing_dataset_not_found(self, app: Flask, mock_auth, current_user):
         """Test hit testing on non-existent dataset"""
         api = ExternalKnowledgeHitTestingApi()
         method = unwrap(api.post)
@@ -372,7 +372,7 @@ class TestExternalKnowledgeHitTestingApiAdvanced:
             with pytest.raises(NotFound):
                 method(api, "ds-1")
 
-    def test_hit_testing_with_custom_retrieval_model(self, app, mock_auth, current_user):
+    def test_hit_testing_with_custom_retrieval_model(self, app: Flask, mock_auth, current_user):
         api = ExternalKnowledgeHitTestingApi()
         method = unwrap(api.post)
 
@@ -402,7 +402,7 @@ class TestExternalKnowledgeHitTestingApiAdvanced:
 
 
 class TestBedrockRetrievalApiAdvanced:
-    def test_bedrock_retrieval_with_invalid_setting(self, app, mock_auth, current_user):
+    def test_bedrock_retrieval_with_invalid_setting(self, app: Flask, mock_auth, current_user):
         api = BedrockRetrievalApi()
         method = unwrap(api.post)
 
diff --git a/api/tests/unit_tests/controllers/console/datasets/test_hit_testing.py b/api/tests/unit_tests/controllers/console/datasets/test_hit_testing.py
index 09ed2aaf69..4fa5d21493 100644
--- a/api/tests/unit_tests/controllers/console/datasets/test_hit_testing.py
+++ b/api/tests/unit_tests/controllers/console/datasets/test_hit_testing.py
@@ -3,6 +3,7 @@ from unittest.mock import MagicMock, PropertyMock, patch
 
 import pytest
 from flask import Flask
+from pytest_mock import MockerFixture
 from werkzeug.exceptions import NotFound
 
 from controllers.console import console_ns
@@ -35,7 +36,7 @@ def dataset():
 
 
 @pytest.fixture(autouse=True)
-def bypass_decorators(mocker):
+def bypass_decorators(mocker: MockerFixture):
     """Bypass all decorators on the API method."""
     mocker.patch(
         "controllers.console.datasets.hit_testing.setup_required",
@@ -56,7 +57,7 @@ def bypass_decorators(mocker):
 
 
 class TestHitTestingApi:
-    def test_hit_testing_success(self, app, dataset, dataset_id):
+    def test_hit_testing_success(self, app: Flask, dataset, dataset_id):
         api = HitTestingApi()
         method = unwrap(api.post)
 
@@ -99,7 +100,7 @@ class TestHitTestingApi:
         assert "records" in result
         assert result["records"] == []
 
-    def test_hit_testing_success_with_optional_record_fields(self, app, dataset, dataset_id):
+    def test_hit_testing_success_with_optional_record_fields(self, app: Flask, dataset, dataset_id):
         api = HitTestingApi()
         method = unwrap(api.post)
 
@@ -150,7 +151,7 @@ class TestHitTestingApi:
         assert result["query"] == payload["query"]
         assert result["records"] == records
 
-    def test_hit_testing_dataset_not_found(self, app, dataset_id):
+    def test_hit_testing_dataset_not_found(self, app: Flask, dataset_id):
         api = HitTestingApi()
         method = unwrap(api.post)
 
@@ -175,7 +176,7 @@ class TestHitTestingApi:
             with pytest.raises(NotFound, match="Dataset not found"):
                 method(api, dataset_id)
 
-    def test_hit_testing_invalid_args(self, app, dataset, dataset_id):
+    def test_hit_testing_invalid_args(self, app: Flask, dataset, dataset_id):
         api = HitTestingApi()
         method = unwrap(api.post)
 
diff --git a/api/tests/unit_tests/controllers/console/datasets/test_hit_testing_base.py b/api/tests/unit_tests/controllers/console/datasets/test_hit_testing_base.py
index d29b34beb2..77e9cfeb5b 100644
--- a/api/tests/unit_tests/controllers/console/datasets/test_hit_testing_base.py
+++ b/api/tests/unit_tests/controllers/console/datasets/test_hit_testing_base.py
@@ -120,7 +120,7 @@ class TestParseArgs:
 class TestPerformHitTesting:
     def test_success(self, dataset):
         response = {
-            "query": "hello",
+            "query": {"content": "hello"},
             "records": [],
         }
 
@@ -134,7 +134,7 @@ class TestPerformHitTesting:
         assert result["query"] == "hello"
         assert result["records"] == []
 
-    def test_success_normalizes_legacy_query_and_nullable_list_fields(self, dataset):
+    def test_success_prepares_nullable_list_fields(self, dataset):
         response = {
             "query": {"content": "hello"},
             "records": [
@@ -170,6 +170,18 @@ class TestPerformHitTesting:
             }
         ]
 
+    def test_invalid_query_response_raises_value_error(self):
+        with pytest.raises(ValueError, match="Invalid hit testing query response"):
+            DatasetsHitTestingBase._extract_hit_testing_query("hello")
+
+    def test_invalid_records_response_raises_value_error(self):
+        with pytest.raises(ValueError, match="Invalid hit testing records response"):
+            DatasetsHitTestingBase._prepare_hit_testing_records({"records": []})
+
+    def test_invalid_record_response_raises_value_error(self):
+        with pytest.raises(ValueError, match="Invalid hit testing record response"):
+            DatasetsHitTestingBase._prepare_hit_testing_records(["record"])
+
     def test_index_not_initialized(self, dataset):
         with patch.object(
             HitTestingService,
diff --git a/api/tests/unit_tests/controllers/console/datasets/test_metadata.py b/api/tests/unit_tests/controllers/console/datasets/test_metadata.py
index de834c2d4d..6322133536 100644
--- a/api/tests/unit_tests/controllers/console/datasets/test_metadata.py
+++ b/api/tests/unit_tests/controllers/console/datasets/test_metadata.py
@@ -3,6 +3,7 @@ from unittest.mock import MagicMock, PropertyMock, patch
 
 import pytest
 from flask import Flask
+from pytest_mock import MockerFixture
 from werkzeug.exceptions import NotFound
 
 from controllers.console import console_ns
@@ -60,7 +61,7 @@ def metadata_id():
 
 
 @pytest.fixture(autouse=True)
-def bypass_decorators(mocker):
+def bypass_decorators(mocker: MockerFixture):
     """Bypass setup/login/license decorators."""
     mocker.patch(
         "controllers.console.datasets.metadata.setup_required",
@@ -81,7 +82,7 @@ def bypass_decorators(mocker):
 
 
 class TestDatasetMetadataCreateApi:
-    def test_create_metadata_success(self, app, current_user, dataset, dataset_id):
+    def test_create_metadata_success(self, app: Flask, current_user, dataset, dataset_id):
         api = DatasetMetadataCreateApi()
         method = unwrap(api.post)
 
@@ -124,7 +125,7 @@ class TestDatasetMetadataCreateApi:
         assert status == 201
         assert result["name"] == "author"
 
-    def test_create_metadata_dataset_not_found(self, app, current_user, dataset_id):
+    def test_create_metadata_dataset_not_found(self, app: Flask, current_user, dataset_id):
         api = DatasetMetadataCreateApi()
         method = unwrap(api.post)
 
@@ -161,7 +162,7 @@ class TestDatasetMetadataCreateApi:
 
 
 class TestDatasetMetadataGetApi:
-    def test_get_metadata_success(self, app, dataset, dataset_id):
+    def test_get_metadata_success(self, app: Flask, dataset, dataset_id):
         api = DatasetMetadataCreateApi()
         method = unwrap(api.get)
 
@@ -183,7 +184,7 @@ class TestDatasetMetadataGetApi:
         assert status == 200
         assert isinstance(result, list)
 
-    def test_get_metadata_dataset_not_found(self, app, dataset_id):
+    def test_get_metadata_dataset_not_found(self, app: Flask, dataset_id):
         api = DatasetMetadataCreateApi()
         method = unwrap(api.get)
 
@@ -200,7 +201,7 @@ class TestDatasetMetadataGetApi:
 
 
 class TestDatasetMetadataApi:
-    def test_update_metadata_success(self, app, current_user, dataset, dataset_id, metadata_id):
+    def test_update_metadata_success(self, app: Flask, current_user, dataset, dataset_id, metadata_id):
         api = DatasetMetadataApi()
         method = unwrap(api.patch)
 
@@ -238,7 +239,7 @@ class TestDatasetMetadataApi:
         assert status == 200
         assert result["name"] == "updated-name"
 
-    def test_delete_metadata_success(self, app, current_user, dataset, dataset_id, metadata_id):
+    def test_delete_metadata_success(self, app: Flask, current_user, dataset, dataset_id, metadata_id):
         api = DatasetMetadataApi()
         method = unwrap(api.delete)
 
@@ -269,7 +270,7 @@ class TestDatasetMetadataApi:
 
 
 class TestDatasetMetadataBuiltInFieldApi:
-    def test_get_built_in_fields(self, app):
+    def test_get_built_in_fields(self, app: Flask):
         api = DatasetMetadataBuiltInFieldApi()
         method = unwrap(api.get)
 
@@ -288,7 +289,7 @@ class TestDatasetMetadataBuiltInFieldApi:
 
 
 class TestDatasetMetadataBuiltInFieldActionApi:
-    def test_enable_built_in_field(self, app, current_user, dataset, dataset_id):
+    def test_enable_built_in_field(self, app: Flask, current_user, dataset, dataset_id):
         api = DatasetMetadataBuiltInFieldActionApi()
         method = unwrap(api.post)
 
@@ -319,7 +320,7 @@ class TestDatasetMetadataBuiltInFieldActionApi:
 
 
 class TestDocumentMetadataEditApi:
-    def test_update_document_metadata_success(self, app, current_user, dataset, dataset_id):
+    def test_update_document_metadata_success(self, app: Flask, current_user, dataset, dataset_id):
         api = DocumentMetadataEditApi()
         method = unwrap(api.post)
 
diff --git a/api/tests/unit_tests/controllers/console/datasets/test_website.py b/api/tests/unit_tests/controllers/console/datasets/test_website.py
index 9f0da6e76f..5c7b857c20 100644
--- a/api/tests/unit_tests/controllers/console/datasets/test_website.py
+++ b/api/tests/unit_tests/controllers/console/datasets/test_website.py
@@ -2,6 +2,7 @@ from unittest.mock import Mock, PropertyMock, patch
 
 import pytest
 from flask import Flask
+from pytest_mock import MockerFixture
 
 from controllers.console import console_ns
 from controllers.console.datasets.error import WebsiteCrawlError
@@ -31,7 +32,7 @@ def app():
 
 
 @pytest.fixture(autouse=True)
-def bypass_auth_and_setup(mocker):
+def bypass_auth_and_setup(mocker: MockerFixture):
     """Bypass setup/login/account decorators."""
     mocker.patch(
         "controllers.console.datasets.website.login_required",
@@ -48,7 +49,7 @@ def bypass_auth_and_setup(mocker):
 
 
 class TestWebsiteCrawlApi:
-    def test_crawl_success(self, app, mocker):
+    def test_crawl_success(self, app: Flask, mocker: MockerFixture):
         api = WebsiteCrawlApi()
         method = unwrap(api.post)
 
@@ -85,7 +86,7 @@ class TestWebsiteCrawlApi:
         assert status == 200
         assert result["job_id"] == "job-1"
 
-    def test_crawl_invalid_payload(self, app, mocker):
+    def test_crawl_invalid_payload(self, app: Flask, mocker: MockerFixture):
         api = WebsiteCrawlApi()
         method = unwrap(api.post)
 
@@ -113,7 +114,7 @@ class TestWebsiteCrawlApi:
             with pytest.raises(WebsiteCrawlError, match="invalid payload"):
                 method(api)
 
-    def test_crawl_service_error(self, app, mocker):
+    def test_crawl_service_error(self, app: Flask, mocker: MockerFixture):
         api = WebsiteCrawlApi()
         method = unwrap(api.post)
 
@@ -150,7 +151,7 @@ class TestWebsiteCrawlApi:
 
 
 class TestWebsiteCrawlStatusApi:
-    def test_get_status_success(self, app, mocker):
+    def test_get_status_success(self, app: Flask, mocker: MockerFixture):
         api = WebsiteCrawlStatusApi()
         method = unwrap(api.get)
 
@@ -181,7 +182,7 @@ class TestWebsiteCrawlStatusApi:
         assert status == 200
         assert result["status"] == "completed"
 
-    def test_get_status_invalid_provider(self, app, mocker):
+    def test_get_status_invalid_provider(self, app: Flask, mocker: MockerFixture):
         api = WebsiteCrawlStatusApi()
         method = unwrap(api.get)
 
@@ -203,7 +204,7 @@ class TestWebsiteCrawlStatusApi:
             with pytest.raises(WebsiteCrawlError, match="invalid provider"):
                 method(api, job_id)
 
-    def test_get_status_service_error(self, app, mocker):
+    def test_get_status_service_error(self, app: Flask, mocker: MockerFixture):
         api = WebsiteCrawlStatusApi()
         method = unwrap(api.get)
 
diff --git a/api/tests/unit_tests/controllers/console/datasets/test_wraps.py b/api/tests/unit_tests/controllers/console/datasets/test_wraps.py
index e358435de4..2cfa938af8 100644
--- a/api/tests/unit_tests/controllers/console/datasets/test_wraps.py
+++ b/api/tests/unit_tests/controllers/console/datasets/test_wraps.py
@@ -1,6 +1,7 @@
 from unittest.mock import Mock
 
 import pytest
+from pytest_mock import MockerFixture
 
 from controllers.console.datasets.error import PipelineNotFoundError
 from controllers.console.datasets.wraps import get_rag_pipeline
@@ -16,7 +17,7 @@ class TestGetRagPipeline:
         with pytest.raises(ValueError, match="missing pipeline_id"):
             dummy_view()
 
-    def test_pipeline_not_found(self, mocker):
+    def test_pipeline_not_found(self, mocker: MockerFixture):
         @get_rag_pipeline
         def dummy_view(**kwargs):
             return "ok"
@@ -34,7 +35,7 @@ class TestGetRagPipeline:
         with pytest.raises(PipelineNotFoundError):
             dummy_view(pipeline_id="pipeline-1")
 
-    def test_pipeline_found_and_injected(self, mocker):
+    def test_pipeline_found_and_injected(self, mocker: MockerFixture):
         pipeline = Mock(spec=Pipeline)
         pipeline.id = "pipeline-1"
         pipeline.tenant_id = "tenant-1"
@@ -57,7 +58,7 @@ class TestGetRagPipeline:
 
         assert result is pipeline
 
-    def test_pipeline_id_removed_from_kwargs(self, mocker):
+    def test_pipeline_id_removed_from_kwargs(self, mocker: MockerFixture):
         pipeline = Mock(spec=Pipeline)
 
         @get_rag_pipeline
@@ -79,7 +80,7 @@ class TestGetRagPipeline:
 
         assert result == "ok"
 
-    def test_pipeline_id_cast_to_string(self, mocker):
+    def test_pipeline_id_cast_to_string(self, mocker: MockerFixture):
         pipeline = Mock(spec=Pipeline)
 
         @get_rag_pipeline
diff --git a/api/tests/unit_tests/controllers/console/explore/test_audio.py b/api/tests/unit_tests/controllers/console/explore/test_audio.py
index b4b57022e2..a6642f8582 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_audio.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_audio.py
@@ -2,6 +2,7 @@ from io import BytesIO
 from unittest.mock import MagicMock, patch
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import InternalServerError
 
 import controllers.console.explore.audio as audio_module
@@ -52,7 +53,7 @@ class TestChatAudioApi:
         self.api = audio_module.ChatAudioApi()
         self.method = unwrap(self.api.post)
 
-    def test_post_success(self, app, installed_app, audio_file):
+    def test_post_success(self, app: Flask, installed_app, audio_file):
         with (
             app.test_request_context(
                 "/",
@@ -69,7 +70,7 @@ class TestChatAudioApi:
 
         assert resp == {"text": "ok"}
 
-    def test_app_unavailable(self, app, installed_app, audio_file):
+    def test_app_unavailable(self, app: Flask, installed_app, audio_file):
         with (
             app.test_request_context(
                 "/",
@@ -85,7 +86,7 @@ class TestChatAudioApi:
             with pytest.raises(AppUnavailableError):
                 self.method(installed_app)
 
-    def test_no_audio_uploaded(self, app, installed_app, audio_file):
+    def test_no_audio_uploaded(self, app: Flask, installed_app, audio_file):
         with (
             app.test_request_context(
                 "/",
@@ -101,7 +102,7 @@ class TestChatAudioApi:
             with pytest.raises(NoAudioUploadedError):
                 self.method(installed_app)
 
-    def test_audio_too_large(self, app, installed_app, audio_file):
+    def test_audio_too_large(self, app: Flask, installed_app, audio_file):
         with (
             app.test_request_context(
                 "/",
@@ -117,7 +118,7 @@ class TestChatAudioApi:
             with pytest.raises(AudioTooLargeError):
                 self.method(installed_app)
 
-    def test_provider_quota_exceeded(self, app, installed_app, audio_file):
+    def test_provider_quota_exceeded(self, app: Flask, installed_app, audio_file):
         with (
             app.test_request_context(
                 "/",
@@ -133,7 +134,7 @@ class TestChatAudioApi:
             with pytest.raises(ProviderQuotaExceededError):
                 self.method(installed_app)
 
-    def test_unknown_exception(self, app, installed_app, audio_file):
+    def test_unknown_exception(self, app: Flask, installed_app, audio_file):
         with (
             app.test_request_context(
                 "/",
@@ -149,7 +150,7 @@ class TestChatAudioApi:
             with pytest.raises(InternalServerError):
                 self.method(installed_app)
 
-    def test_unsupported_audio_type(self, app, installed_app, audio_file):
+    def test_unsupported_audio_type(self, app: Flask, installed_app, audio_file):
         with (
             app.test_request_context(
                 "/",
@@ -165,7 +166,7 @@ class TestChatAudioApi:
             with pytest.raises(audio_module.UnsupportedAudioTypeError):
                 self.method(installed_app)
 
-    def test_provider_not_support_speech_to_text(self, app, installed_app, audio_file):
+    def test_provider_not_support_speech_to_text(self, app: Flask, installed_app, audio_file):
         with (
             app.test_request_context(
                 "/",
@@ -181,7 +182,7 @@ class TestChatAudioApi:
             with pytest.raises(audio_module.ProviderNotSupportSpeechToTextError):
                 self.method(installed_app)
 
-    def test_provider_not_initialized(self, app, installed_app, audio_file):
+    def test_provider_not_initialized(self, app: Flask, installed_app, audio_file):
         with (
             app.test_request_context(
                 "/",
@@ -197,7 +198,7 @@ class TestChatAudioApi:
             with pytest.raises(ProviderNotInitializeError):
                 self.method(installed_app)
 
-    def test_model_currently_not_supported(self, app, installed_app, audio_file):
+    def test_model_currently_not_supported(self, app: Flask, installed_app, audio_file):
         with (
             app.test_request_context(
                 "/",
@@ -213,7 +214,7 @@ class TestChatAudioApi:
             with pytest.raises(ProviderModelCurrentlyNotSupportError):
                 self.method(installed_app)
 
-    def test_invoke_error_asr(self, app, installed_app, audio_file):
+    def test_invoke_error_asr(self, app: Flask, installed_app, audio_file):
         with (
             app.test_request_context(
                 "/",
@@ -235,7 +236,7 @@ class TestChatTextApi:
         self.api = audio_module.ChatTextApi()
         self.method = unwrap(self.api.post)
 
-    def test_post_success(self, app, installed_app):
+    def test_post_success(self, app: Flask, installed_app):
         with (
             app.test_request_context(
                 "/",
@@ -251,7 +252,7 @@ class TestChatTextApi:
 
         assert resp == {"audio": "ok"}
 
-    def test_provider_not_initialized(self, app, installed_app):
+    def test_provider_not_initialized(self, app: Flask, installed_app):
         with (
             app.test_request_context(
                 "/",
@@ -266,7 +267,7 @@ class TestChatTextApi:
             with pytest.raises(ProviderNotInitializeError):
                 self.method(installed_app)
 
-    def test_model_not_supported(self, app, installed_app):
+    def test_model_not_supported(self, app: Flask, installed_app):
         with (
             app.test_request_context(
                 "/",
@@ -281,7 +282,7 @@ class TestChatTextApi:
             with pytest.raises(ProviderModelCurrentlyNotSupportError):
                 self.method(installed_app)
 
-    def test_invoke_error(self, app, installed_app):
+    def test_invoke_error(self, app: Flask, installed_app):
         with (
             app.test_request_context(
                 "/",
@@ -296,7 +297,7 @@ class TestChatTextApi:
             with pytest.raises(CompletionRequestError):
                 self.method(installed_app)
 
-    def test_unknown_exception(self, app, installed_app):
+    def test_unknown_exception(self, app: Flask, installed_app):
         with (
             app.test_request_context(
                 "/",
@@ -311,7 +312,7 @@ class TestChatTextApi:
             with pytest.raises(InternalServerError):
                 self.method(installed_app)
 
-    def test_app_unavailable_tts(self, app, installed_app):
+    def test_app_unavailable_tts(self, app: Flask, installed_app):
         with (
             app.test_request_context(
                 "/",
@@ -326,7 +327,7 @@ class TestChatTextApi:
             with pytest.raises(AppUnavailableError):
                 self.method(installed_app)
 
-    def test_no_audio_uploaded_tts(self, app, installed_app):
+    def test_no_audio_uploaded_tts(self, app: Flask, installed_app):
         with (
             app.test_request_context(
                 "/",
@@ -341,7 +342,7 @@ class TestChatTextApi:
             with pytest.raises(NoAudioUploadedError):
                 self.method(installed_app)
 
-    def test_audio_too_large_tts(self, app, installed_app):
+    def test_audio_too_large_tts(self, app: Flask, installed_app):
         with (
             app.test_request_context(
                 "/",
@@ -356,7 +357,7 @@ class TestChatTextApi:
             with pytest.raises(AudioTooLargeError):
                 self.method(installed_app)
 
-    def test_unsupported_audio_type_tts(self, app, installed_app):
+    def test_unsupported_audio_type_tts(self, app: Flask, installed_app):
         with (
             app.test_request_context(
                 "/",
@@ -371,7 +372,7 @@ class TestChatTextApi:
             with pytest.raises(audio_module.UnsupportedAudioTypeError):
                 self.method(installed_app)
 
-    def test_provider_not_support_speech_to_text_tts(self, app, installed_app):
+    def test_provider_not_support_speech_to_text_tts(self, app: Flask, installed_app):
         with (
             app.test_request_context(
                 "/",
@@ -386,7 +387,7 @@ class TestChatTextApi:
             with pytest.raises(audio_module.ProviderNotSupportSpeechToTextError):
                 self.method(installed_app)
 
-    def test_quota_exceeded_tts(self, app, installed_app):
+    def test_quota_exceeded_tts(self, app: Flask, installed_app):
         with (
             app.test_request_context(
                 "/",
diff --git a/api/tests/unit_tests/controllers/console/explore/test_banner.py b/api/tests/unit_tests/controllers/console/explore/test_banner.py
index c8f674f515..d1cb6b6a03 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_banner.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_banner.py
@@ -1,6 +1,8 @@
 from datetime import datetime
 from unittest.mock import MagicMock, patch
 
+from flask import Flask
+
 import controllers.console.explore.banner as banner_module
 from models.enums import BannerStatus
 
@@ -12,7 +14,7 @@ def unwrap(func):
 
 
 class TestBannerApi:
-    def test_get_banners_with_requested_language(self, app):
+    def test_get_banners_with_requested_language(self, app: Flask):
         api = banner_module.BannerApi()
         method = unwrap(api.get)
 
@@ -41,7 +43,7 @@ class TestBannerApi:
             }
         ]
 
-    def test_get_banners_fallback_to_en_us(self, app):
+    def test_get_banners_fallback_to_en_us(self, app: Flask):
         api = banner_module.BannerApi()
         method = unwrap(api.get)
 
@@ -76,7 +78,7 @@ class TestBannerApi:
             }
         ]
 
-    def test_get_banners_default_language_en_us(self, app):
+    def test_get_banners_default_language_en_us(self, app: Flask):
         api = banner_module.BannerApi()
         method = unwrap(api.get)
 
diff --git a/api/tests/unit_tests/controllers/console/explore/test_completion.py b/api/tests/unit_tests/controllers/console/explore/test_completion.py
index 1dd16f3c59..eac93b1c46 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_completion.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_completion.py
@@ -1,6 +1,7 @@
 from unittest.mock import MagicMock, PropertyMock, patch
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import InternalServerError
 
 import controllers.console.explore.completion as completion_module
@@ -51,7 +52,7 @@ def payload_patch(payload_data):
 
 
 class TestCompletionApi:
-    def test_post_success(self, app, completion_app, user, payload_patch):
+    def test_post_success(self, app: Flask, completion_app, user, payload_patch):
         api = completion_module.CompletionApi()
         method = unwrap(api.post)
 
@@ -83,7 +84,7 @@ class TestCompletionApi:
         with pytest.raises(NotCompletionAppError):
             method(installed_app)
 
-    def test_conversation_completed(self, app, completion_app, user, payload_patch):
+    def test_conversation_completed(self, app: Flask, completion_app, user, payload_patch):
         api = completion_module.CompletionApi()
         method = unwrap(api.post)
 
@@ -100,7 +101,7 @@ class TestCompletionApi:
             with pytest.raises(ConversationCompletedError):
                 method(completion_app)
 
-    def test_internal_error(self, app, completion_app, user, payload_patch):
+    def test_internal_error(self, app: Flask, completion_app, user, payload_patch):
         api = completion_module.CompletionApi()
         method = unwrap(api.post)
 
@@ -117,7 +118,7 @@ class TestCompletionApi:
             with pytest.raises(InternalServerError):
                 method(completion_app)
 
-    def test_conversation_not_exists(self, app, completion_app, user, payload_patch):
+    def test_conversation_not_exists(self, app: Flask, completion_app, user, payload_patch):
         api = completion_module.CompletionApi()
         method = unwrap(api.post)
 
@@ -134,7 +135,7 @@ class TestCompletionApi:
             with pytest.raises(completion_module.NotFound):
                 method(completion_app)
 
-    def test_app_unavailable(self, app, completion_app, user, payload_patch):
+    def test_app_unavailable(self, app: Flask, completion_app, user, payload_patch):
         api = completion_module.CompletionApi()
         method = unwrap(api.post)
 
@@ -151,7 +152,7 @@ class TestCompletionApi:
             with pytest.raises(completion_module.AppUnavailableError):
                 method(completion_app)
 
-    def test_provider_not_initialized(self, app, completion_app, user, payload_patch):
+    def test_provider_not_initialized(self, app: Flask, completion_app, user, payload_patch):
         api = completion_module.CompletionApi()
         method = unwrap(api.post)
 
@@ -168,7 +169,7 @@ class TestCompletionApi:
             with pytest.raises(completion_module.ProviderNotInitializeError):
                 method(completion_app)
 
-    def test_quota_exceeded(self, app, completion_app, user, payload_patch):
+    def test_quota_exceeded(self, app: Flask, completion_app, user, payload_patch):
         api = completion_module.CompletionApi()
         method = unwrap(api.post)
 
@@ -185,7 +186,7 @@ class TestCompletionApi:
             with pytest.raises(completion_module.ProviderQuotaExceededError):
                 method(completion_app)
 
-    def test_model_not_supported(self, app, completion_app, user, payload_patch):
+    def test_model_not_supported(self, app: Flask, completion_app, user, payload_patch):
         api = completion_module.CompletionApi()
         method = unwrap(api.post)
 
@@ -202,7 +203,7 @@ class TestCompletionApi:
             with pytest.raises(completion_module.ProviderModelCurrentlyNotSupportError):
                 method(completion_app)
 
-    def test_invoke_error(self, app, completion_app, user, payload_patch):
+    def test_invoke_error(self, app: Flask, completion_app, user, payload_patch):
         api = completion_module.CompletionApi()
         method = unwrap(api.post)
 
@@ -247,7 +248,7 @@ class TestCompletionStopApi:
 
 
 class TestChatApi:
-    def test_post_success(self, app, chat_app, user, payload_patch):
+    def test_post_success(self, app: Flask, chat_app, user, payload_patch):
         api = completion_module.ChatApi()
         method = unwrap(api.post)
 
@@ -279,7 +280,7 @@ class TestChatApi:
         with pytest.raises(NotChatAppError):
             method(installed_app)
 
-    def test_rate_limit_error(self, app, chat_app, user, payload_patch):
+    def test_rate_limit_error(self, app: Flask, chat_app, user, payload_patch):
         api = completion_module.ChatApi()
         method = unwrap(api.post)
 
@@ -296,7 +297,7 @@ class TestChatApi:
             with pytest.raises(InvokeRateLimitHttpError):
                 method(chat_app)
 
-    def test_conversation_completed_chat(self, app, chat_app, user, payload_patch):
+    def test_conversation_completed_chat(self, app: Flask, chat_app, user, payload_patch):
         api = completion_module.ChatApi()
         method = unwrap(api.post)
 
@@ -313,7 +314,7 @@ class TestChatApi:
             with pytest.raises(ConversationCompletedError):
                 method(chat_app)
 
-    def test_conversation_not_exists_chat(self, app, chat_app, user, payload_patch):
+    def test_conversation_not_exists_chat(self, app: Flask, chat_app, user, payload_patch):
         api = completion_module.ChatApi()
         method = unwrap(api.post)
 
@@ -330,7 +331,7 @@ class TestChatApi:
             with pytest.raises(completion_module.NotFound):
                 method(chat_app)
 
-    def test_app_unavailable_chat(self, app, chat_app, user, payload_patch):
+    def test_app_unavailable_chat(self, app: Flask, chat_app, user, payload_patch):
         api = completion_module.ChatApi()
         method = unwrap(api.post)
 
@@ -347,7 +348,7 @@ class TestChatApi:
             with pytest.raises(completion_module.AppUnavailableError):
                 method(chat_app)
 
-    def test_provider_not_initialized_chat(self, app, chat_app, user, payload_patch):
+    def test_provider_not_initialized_chat(self, app: Flask, chat_app, user, payload_patch):
         api = completion_module.ChatApi()
         method = unwrap(api.post)
 
@@ -364,7 +365,7 @@ class TestChatApi:
             with pytest.raises(completion_module.ProviderNotInitializeError):
                 method(chat_app)
 
-    def test_quota_exceeded_chat(self, app, chat_app, user, payload_patch):
+    def test_quota_exceeded_chat(self, app: Flask, chat_app, user, payload_patch):
         api = completion_module.ChatApi()
         method = unwrap(api.post)
 
@@ -381,7 +382,7 @@ class TestChatApi:
             with pytest.raises(completion_module.ProviderQuotaExceededError):
                 method(chat_app)
 
-    def test_model_not_supported_chat(self, app, chat_app, user, payload_patch):
+    def test_model_not_supported_chat(self, app: Flask, chat_app, user, payload_patch):
         api = completion_module.ChatApi()
         method = unwrap(api.post)
 
@@ -398,7 +399,7 @@ class TestChatApi:
             with pytest.raises(completion_module.ProviderModelCurrentlyNotSupportError):
                 method(chat_app)
 
-    def test_invoke_error_chat(self, app, chat_app, user, payload_patch):
+    def test_invoke_error_chat(self, app: Flask, chat_app, user, payload_patch):
         api = completion_module.ChatApi()
         method = unwrap(api.post)
 
@@ -415,7 +416,7 @@ class TestChatApi:
             with pytest.raises(completion_module.CompletionRequestError):
                 method(chat_app)
 
-    def test_internal_error_chat(self, app, chat_app, user, payload_patch):
+    def test_internal_error_chat(self, app: Flask, chat_app, user, payload_patch):
         api = completion_module.ChatApi()
         method = unwrap(api.post)
 
diff --git a/api/tests/unit_tests/controllers/console/explore/test_installed_app.py b/api/tests/unit_tests/controllers/console/explore/test_installed_app.py
index 93652e75d2..ec82803be4 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_installed_app.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_installed_app.py
@@ -2,6 +2,7 @@ from datetime import datetime
 from unittest.mock import MagicMock, PropertyMock, patch
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import BadRequest, Forbidden, NotFound
 
 import controllers.console.explore.installed_app as module
@@ -51,7 +52,7 @@ def payload_patch():
 
 
 class TestInstalledAppsListApi:
-    def test_get_installed_apps(self, app, current_user, tenant_id, installed_app):
+    def test_get_installed_apps(self, app: Flask, current_user, tenant_id, installed_app):
         api = module.InstalledAppsListApi()
         method = unwrap(api.get)
 
@@ -75,7 +76,7 @@ class TestInstalledAppsListApi:
         assert result["installed_apps"][0]["editable"] is True
         assert result["installed_apps"][0]["uninstallable"] is False
 
-    def test_get_installed_apps_with_app_id_filter(self, app, current_user, tenant_id):
+    def test_get_installed_apps_with_app_id_filter(self, app: Flask, current_user, tenant_id):
         api = module.InstalledAppsListApi()
         method = unwrap(api.get)
 
@@ -97,7 +98,7 @@ class TestInstalledAppsListApi:
 
         assert result == {"installed_apps": []}
 
-    def test_get_installed_apps_with_webapp_auth_enabled(self, app, current_user, tenant_id, installed_app):
+    def test_get_installed_apps_with_webapp_auth_enabled(self, app: Flask, current_user, tenant_id, installed_app):
         """Test filtering when webapp_auth is enabled."""
         api = module.InstalledAppsListApi()
         method = unwrap(api.get)
@@ -133,7 +134,7 @@ class TestInstalledAppsListApi:
 
         assert len(result["installed_apps"]) == 1
 
-    def test_get_installed_apps_with_webapp_auth_user_denied(self, app, current_user, tenant_id, installed_app):
+    def test_get_installed_apps_with_webapp_auth_user_denied(self, app: Flask, current_user, tenant_id, installed_app):
         """Test filtering when user doesn't have access."""
         api = module.InstalledAppsListApi()
         method = unwrap(api.get)
@@ -169,7 +170,7 @@ class TestInstalledAppsListApi:
 
         assert result["installed_apps"] == []
 
-    def test_get_installed_apps_with_sso_verified_access(self, app, current_user, tenant_id, installed_app):
+    def test_get_installed_apps_with_sso_verified_access(self, app: Flask, current_user, tenant_id, installed_app):
         """Test that sso_verified access mode apps are skipped in filtering."""
         api = module.InstalledAppsListApi()
         method = unwrap(api.get)
@@ -200,7 +201,7 @@ class TestInstalledAppsListApi:
 
         assert len(result["installed_apps"]) == 0
 
-    def test_get_installed_apps_filters_null_apps(self, app, current_user, tenant_id):
+    def test_get_installed_apps_filters_null_apps(self, app: Flask, current_user, tenant_id):
         """Test that installed apps with null app are filtered out."""
         api = module.InstalledAppsListApi()
         method = unwrap(api.get)
@@ -226,7 +227,7 @@ class TestInstalledAppsListApi:
 
         assert result["installed_apps"] == []
 
-    def test_get_installed_apps_current_tenant_none(self, app, tenant_id, installed_app):
+    def test_get_installed_apps_current_tenant_none(self, app: Flask, tenant_id, installed_app):
         """Test error when current_user.current_tenant is None."""
         api = module.InstalledAppsListApi()
         method = unwrap(api.get)
@@ -247,7 +248,7 @@ class TestInstalledAppsListApi:
 
 
 class TestInstalledAppsCreateApi:
-    def test_post_success(self, app, tenant_id, payload_patch):
+    def test_post_success(self, app: Flask, tenant_id, payload_patch):
         api = module.InstalledAppsListApi()
         method = unwrap(api.post)
 
@@ -276,7 +277,7 @@ class TestInstalledAppsCreateApi:
         assert result == {"message": "App installed successfully"}
         assert recommended.install_count == 1
 
-    def test_post_recommended_not_found(self, app, payload_patch):
+    def test_post_recommended_not_found(self, app: Flask, payload_patch):
         api = module.InstalledAppsListApi()
         method = unwrap(api.post)
 
@@ -291,7 +292,7 @@ class TestInstalledAppsCreateApi:
             with pytest.raises(NotFound):
                 method(api)
 
-    def test_post_app_not_public(self, app, tenant_id, payload_patch):
+    def test_post_app_not_public(self, app: Flask, tenant_id, payload_patch):
         api = module.InstalledAppsListApi()
         method = unwrap(api.post)
 
@@ -315,7 +316,7 @@ class TestInstalledAppsCreateApi:
 
 
 class TestInstalledAppApi:
-    def test_delete_success(self, tenant_id, installed_app):
+    def test_delete_success(self, tenant_id: str, installed_app):
         api = module.InstalledAppApi()
         method = unwrap(api.delete)
 
@@ -328,7 +329,7 @@ class TestInstalledAppApi:
         assert status == 204
         assert resp["result"] == "success"
 
-    def test_delete_owned_by_current_tenant(self, tenant_id):
+    def test_delete_owned_by_current_tenant(self, tenant_id: str):
         api = module.InstalledAppApi()
         method = unwrap(api.delete)
 
@@ -338,7 +339,7 @@ class TestInstalledAppApi:
             with pytest.raises(BadRequest):
                 method(installed_app)
 
-    def test_patch_update_pin(self, app, payload_patch, installed_app):
+    def test_patch_update_pin(self, app: Flask, payload_patch, installed_app):
         api = module.InstalledAppApi()
         method = unwrap(api.patch)
 
@@ -352,7 +353,7 @@ class TestInstalledAppApi:
         assert installed_app.is_pinned is True
         assert result["result"] == "success"
 
-    def test_patch_no_change(self, app, payload_patch, installed_app):
+    def test_patch_no_change(self, app: Flask, payload_patch, installed_app):
         api = module.InstalledAppApi()
         method = unwrap(api.patch)
 
diff --git a/api/tests/unit_tests/controllers/console/explore/test_message.py b/api/tests/unit_tests/controllers/console/explore/test_message.py
index 145cc9cdd7..3d41489435 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_message.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_message.py
@@ -1,6 +1,7 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import InternalServerError, NotFound
 
 import controllers.console.explore.message as module
@@ -54,7 +55,7 @@ def make_message():
 
 
 class TestMessageListApi:
-    def test_get_success(self, app):
+    def test_get_success(self, app: Flask):
         api = module.MessageListApi()
         method = unwrap(api.get)
 
@@ -96,7 +97,7 @@ class TestMessageListApi:
             with pytest.raises(NotChatAppError):
                 method(installed_app)
 
-    def test_conversation_not_exists(self, app):
+    def test_conversation_not_exists(self, app: Flask):
         api = module.MessageListApi()
         method = unwrap(api.get)
 
@@ -118,7 +119,7 @@ class TestMessageListApi:
             with pytest.raises(NotFound):
                 method(installed_app)
 
-    def test_first_message_not_exists(self, app):
+    def test_first_message_not_exists(self, app: Flask):
         api = module.MessageListApi()
         method = unwrap(api.get)
 
@@ -142,7 +143,7 @@ class TestMessageListApi:
 
 
 class TestMessageFeedbackApi:
-    def test_post_success(self, app):
+    def test_post_success(self, app: Flask):
         api = module.MessageFeedbackApi()
         method = unwrap(api.post)
 
@@ -161,7 +162,7 @@ class TestMessageFeedbackApi:
 
         assert result["result"] == "success"
 
-    def test_message_not_exists(self, app):
+    def test_message_not_exists(self, app: Flask):
         api = module.MessageFeedbackApi()
         method = unwrap(api.post)
 
@@ -182,7 +183,7 @@ class TestMessageFeedbackApi:
 
 
 class TestMessageMoreLikeThisApi:
-    def test_get_success(self, app):
+    def test_get_success(self, app: Flask):
         api = module.MessageMoreLikeThisApi()
         method = unwrap(api.get)
 
@@ -221,7 +222,7 @@ class TestMessageMoreLikeThisApi:
             with pytest.raises(NotCompletionAppError):
                 method(installed_app, "mid")
 
-    def test_more_like_this_disabled(self, app):
+    def test_more_like_this_disabled(self, app: Flask):
         api = module.MessageMoreLikeThisApi()
         method = unwrap(api.get)
 
@@ -243,7 +244,7 @@ class TestMessageMoreLikeThisApi:
             with pytest.raises(AppMoreLikeThisDisabledError):
                 method(installed_app, "mid")
 
-    def test_message_not_exists_more_like_this(self, app):
+    def test_message_not_exists_more_like_this(self, app: Flask):
         api = module.MessageMoreLikeThisApi()
         method = unwrap(api.get)
 
@@ -265,7 +266,7 @@ class TestMessageMoreLikeThisApi:
             with pytest.raises(NotFound):
                 method(installed_app, "mid")
 
-    def test_provider_not_init_more_like_this(self, app):
+    def test_provider_not_init_more_like_this(self, app: Flask):
         api = module.MessageMoreLikeThisApi()
         method = unwrap(api.get)
 
@@ -287,7 +288,7 @@ class TestMessageMoreLikeThisApi:
             with pytest.raises(ProviderNotInitializeError):
                 method(installed_app, "mid")
 
-    def test_quota_exceeded_more_like_this(self, app):
+    def test_quota_exceeded_more_like_this(self, app: Flask):
         api = module.MessageMoreLikeThisApi()
         method = unwrap(api.get)
 
@@ -309,7 +310,7 @@ class TestMessageMoreLikeThisApi:
             with pytest.raises(ProviderQuotaExceededError):
                 method(installed_app, "mid")
 
-    def test_model_not_support_more_like_this(self, app):
+    def test_model_not_support_more_like_this(self, app: Flask):
         api = module.MessageMoreLikeThisApi()
         method = unwrap(api.get)
 
@@ -331,7 +332,7 @@ class TestMessageMoreLikeThisApi:
             with pytest.raises(ProviderModelCurrentlyNotSupportError):
                 method(installed_app, "mid")
 
-    def test_invoke_error_more_like_this(self, app):
+    def test_invoke_error_more_like_this(self, app: Flask):
         api = module.MessageMoreLikeThisApi()
         method = unwrap(api.get)
 
@@ -353,7 +354,7 @@ class TestMessageMoreLikeThisApi:
             with pytest.raises(CompletionRequestError):
                 method(installed_app, "mid")
 
-    def test_unexpected_error_more_like_this(self, app):
+    def test_unexpected_error_more_like_this(self, app: Flask):
         api = module.MessageMoreLikeThisApi()
         method = unwrap(api.get)
 
diff --git a/api/tests/unit_tests/controllers/console/explore/test_recommended_app.py b/api/tests/unit_tests/controllers/console/explore/test_recommended_app.py
index 76c863577a..89cbea5ddc 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_recommended_app.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_recommended_app.py
@@ -1,5 +1,7 @@
 from unittest.mock import MagicMock, patch
 
+from flask import Flask
+
 import controllers.console.explore.recommended_app as module
 from models.model import AppMode, IconType
 
@@ -11,7 +13,7 @@ def unwrap(func):
 
 
 class TestRecommendedAppListApi:
-    def test_get_with_language_param(self, app):
+    def test_get_with_language_param(self, app: Flask):
         api = module.RecommendedAppListApi()
         method = unwrap(api.get)
 
@@ -31,7 +33,7 @@ class TestRecommendedAppListApi:
         service_mock.assert_called_once_with("en-US")
         assert result == result_data
 
-    def test_get_fallback_to_user_language(self, app):
+    def test_get_fallback_to_user_language(self, app: Flask):
         api = module.RecommendedAppListApi()
         method = unwrap(api.get)
 
@@ -51,7 +53,7 @@ class TestRecommendedAppListApi:
         service_mock.assert_called_once_with("fr-FR")
         assert result == result_data
 
-    def test_get_fallback_to_default_language(self, app):
+    def test_get_fallback_to_default_language(self, app: Flask):
         api = module.RecommendedAppListApi()
         method = unwrap(api.get)
 
@@ -73,7 +75,7 @@ class TestRecommendedAppListApi:
 
 
 class TestRecommendedAppApi:
-    def test_get_success(self, app):
+    def test_get_success(self, app: Flask):
         api = module.RecommendedAppApi()
         method = unwrap(api.get)
 
@@ -124,7 +126,7 @@ class TestRecommendedAppResponseModels:
                         },
                         "app_id": "app-1",
                         "description": "desc",
-                        "category": "cat",
+                        "categories": ["cat", "other"],
                         "position": 1,
                         "is_listed": True,
                         "can_trial": False,
@@ -135,4 +137,5 @@ class TestRecommendedAppResponseModels:
         ).model_dump(mode="json")
 
         assert response["recommended_apps"][0]["app_id"] == "app-1"
+        assert response["recommended_apps"][0]["categories"] == ["cat", "other"]
         assert response["categories"] == ["cat"]
diff --git a/api/tests/unit_tests/controllers/console/explore/test_saved_message.py b/api/tests/unit_tests/controllers/console/explore/test_saved_message.py
index bb7cdd55c4..49e5695e60 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_saved_message.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_saved_message.py
@@ -2,6 +2,7 @@ from unittest.mock import MagicMock, PropertyMock, patch
 from uuid import uuid4
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import NotFound
 
 import controllers.console.explore.saved_message as module
@@ -42,7 +43,7 @@ def payload_patch():
 
 
 class TestSavedMessageListApi:
-    def test_get_success(self, app):
+    def test_get_success(self, app: Flask):
         api = module.SavedMessageListApi()
         method = unwrap(api.get)
 
@@ -81,7 +82,7 @@ class TestSavedMessageListApi:
             with pytest.raises(NotCompletionAppError):
                 method(installed_app)
 
-    def test_post_success(self, app, payload_patch):
+    def test_post_success(self, app: Flask, payload_patch):
         api = module.SavedMessageListApi()
         method = unwrap(api.post)
 
@@ -101,7 +102,7 @@ class TestSavedMessageListApi:
         save_mock.assert_called_once()
         assert result == {"result": "success"}
 
-    def test_post_message_not_exists(self, app, payload_patch):
+    def test_post_message_not_exists(self, app: Flask, payload_patch):
         api = module.SavedMessageListApi()
         method = unwrap(api.post)
 
diff --git a/api/tests/unit_tests/controllers/console/explore/test_trial.py b/api/tests/unit_tests/controllers/console/explore/test_trial.py
index 3625056af9..641209d1de 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_trial.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_trial.py
@@ -3,6 +3,7 @@ from unittest.mock import MagicMock, patch
 from uuid import uuid4
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import Forbidden, InternalServerError, NotFound
 
 import controllers.console.explore.trial as module
@@ -87,8 +88,13 @@ def valid_parameters():
     }
 
 
+def test_trial_workflow_uses_trial_scoped_simple_account_model():
+    assert module.simple_account_model.name == "TrialSimpleAccount"
+    assert hasattr(module.simple_account_model, "items")
+
+
 class TestTrialAppWorkflowRunApi:
-    def test_not_workflow_app(self, app):
+    def test_not_workflow_app(self, app: Flask):
         api = module.TrialAppWorkflowRunApi()
         method = unwrap(api.post)
 
@@ -96,7 +102,7 @@ class TestTrialAppWorkflowRunApi:
             with pytest.raises(NotWorkflowAppError):
                 method(api, MagicMock(mode=AppMode.CHAT))
 
-    def test_success(self, app, trial_app_workflow, account):
+    def test_success(self, app: Flask, trial_app_workflow, account):
         api = module.TrialAppWorkflowRunApi()
         method = unwrap(api.post)
 
@@ -110,7 +116,7 @@ class TestTrialAppWorkflowRunApi:
 
         assert result is not None
 
-    def test_workflow_provider_not_init(self, app, trial_app_workflow, account):
+    def test_workflow_provider_not_init(self, app: Flask, trial_app_workflow, account):
         api = module.TrialAppWorkflowRunApi()
         method = unwrap(api.post)
 
@@ -126,7 +132,7 @@ class TestTrialAppWorkflowRunApi:
             with pytest.raises(ProviderNotInitializeError):
                 method(api, trial_app_workflow)
 
-    def test_workflow_quota_exceeded(self, app, trial_app_workflow, account):
+    def test_workflow_quota_exceeded(self, app: Flask, trial_app_workflow, account):
         api = module.TrialAppWorkflowRunApi()
         method = unwrap(api.post)
 
@@ -142,7 +148,7 @@ class TestTrialAppWorkflowRunApi:
             with pytest.raises(ProviderQuotaExceededError):
                 method(api, trial_app_workflow)
 
-    def test_workflow_model_not_support(self, app, trial_app_workflow, account):
+    def test_workflow_model_not_support(self, app: Flask, trial_app_workflow, account):
         api = module.TrialAppWorkflowRunApi()
         method = unwrap(api.post)
 
@@ -158,7 +164,7 @@ class TestTrialAppWorkflowRunApi:
             with pytest.raises(ProviderModelCurrentlyNotSupportError):
                 method(api, trial_app_workflow)
 
-    def test_workflow_invoke_error(self, app, trial_app_workflow, account):
+    def test_workflow_invoke_error(self, app: Flask, trial_app_workflow, account):
         api = module.TrialAppWorkflowRunApi()
         method = unwrap(api.post)
 
@@ -174,7 +180,7 @@ class TestTrialAppWorkflowRunApi:
             with pytest.raises(CompletionRequestError):
                 method(api, trial_app_workflow)
 
-    def test_workflow_rate_limit_error(self, app, trial_app_workflow, account):
+    def test_workflow_rate_limit_error(self, app: Flask, trial_app_workflow, account):
         api = module.TrialAppWorkflowRunApi()
         method = unwrap(api.post)
 
@@ -190,7 +196,7 @@ class TestTrialAppWorkflowRunApi:
             with pytest.raises(InvokeRateLimitHttpError):
                 method(api, trial_app_workflow)
 
-    def test_workflow_value_error(self, app, trial_app_workflow, account):
+    def test_workflow_value_error(self, app: Flask, trial_app_workflow, account):
         api = module.TrialAppWorkflowRunApi()
         method = unwrap(api.post)
 
@@ -206,7 +212,7 @@ class TestTrialAppWorkflowRunApi:
             with pytest.raises(ValueError):
                 method(api, trial_app_workflow)
 
-    def test_workflow_generic_exception(self, app, trial_app_workflow, account):
+    def test_workflow_generic_exception(self, app: Flask, trial_app_workflow, account):
         api = module.TrialAppWorkflowRunApi()
         method = unwrap(api.post)
 
@@ -224,7 +230,7 @@ class TestTrialAppWorkflowRunApi:
 
 
 class TestTrialChatApi:
-    def test_not_chat_app(self, app):
+    def test_not_chat_app(self, app: Flask):
         api = module.TrialChatApi()
         method = unwrap(api.post)
 
@@ -232,7 +238,7 @@ class TestTrialChatApi:
             with pytest.raises(NotChatAppError):
                 method(api, MagicMock(mode="completion"))
 
-    def test_success(self, app, trial_app_chat, account):
+    def test_success(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatApi()
         method = unwrap(api.post)
 
@@ -246,7 +252,7 @@ class TestTrialChatApi:
 
         assert result is not None
 
-    def test_chat_conversation_not_exists(self, app, trial_app_chat, account):
+    def test_chat_conversation_not_exists(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatApi()
         method = unwrap(api.post)
 
@@ -262,7 +268,7 @@ class TestTrialChatApi:
             with pytest.raises(NotFound):
                 method(api, trial_app_chat)
 
-    def test_chat_conversation_completed(self, app, trial_app_chat, account):
+    def test_chat_conversation_completed(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatApi()
         method = unwrap(api.post)
 
@@ -278,7 +284,7 @@ class TestTrialChatApi:
             with pytest.raises(ConversationCompletedError):
                 method(api, trial_app_chat)
 
-    def test_chat_app_config_broken(self, app, trial_app_chat, account):
+    def test_chat_app_config_broken(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatApi()
         method = unwrap(api.post)
 
@@ -294,7 +300,7 @@ class TestTrialChatApi:
             with pytest.raises(AppUnavailableError):
                 method(api, trial_app_chat)
 
-    def test_chat_provider_not_init(self, app, trial_app_chat, account):
+    def test_chat_provider_not_init(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatApi()
         method = unwrap(api.post)
 
@@ -310,7 +316,7 @@ class TestTrialChatApi:
             with pytest.raises(ProviderNotInitializeError):
                 method(api, trial_app_chat)
 
-    def test_chat_quota_exceeded(self, app, trial_app_chat, account):
+    def test_chat_quota_exceeded(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatApi()
         method = unwrap(api.post)
 
@@ -326,7 +332,7 @@ class TestTrialChatApi:
             with pytest.raises(ProviderQuotaExceededError):
                 method(api, trial_app_chat)
 
-    def test_chat_model_not_support(self, app, trial_app_chat, account):
+    def test_chat_model_not_support(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatApi()
         method = unwrap(api.post)
 
@@ -342,7 +348,7 @@ class TestTrialChatApi:
             with pytest.raises(ProviderModelCurrentlyNotSupportError):
                 method(api, trial_app_chat)
 
-    def test_chat_invoke_error(self, app, trial_app_chat, account):
+    def test_chat_invoke_error(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatApi()
         method = unwrap(api.post)
 
@@ -358,7 +364,7 @@ class TestTrialChatApi:
             with pytest.raises(CompletionRequestError):
                 method(api, trial_app_chat)
 
-    def test_chat_rate_limit_error(self, app, trial_app_chat, account):
+    def test_chat_rate_limit_error(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatApi()
         method = unwrap(api.post)
 
@@ -374,7 +380,7 @@ class TestTrialChatApi:
             with pytest.raises(InvokeRateLimitHttpError):
                 method(api, trial_app_chat)
 
-    def test_chat_value_error(self, app, trial_app_chat, account):
+    def test_chat_value_error(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatApi()
         method = unwrap(api.post)
 
@@ -390,7 +396,7 @@ class TestTrialChatApi:
             with pytest.raises(ValueError):
                 method(api, trial_app_chat)
 
-    def test_chat_generic_exception(self, app, trial_app_chat, account):
+    def test_chat_generic_exception(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatApi()
         method = unwrap(api.post)
 
@@ -408,7 +414,7 @@ class TestTrialChatApi:
 
 
 class TestTrialCompletionApi:
-    def test_not_completion_app(self, app):
+    def test_not_completion_app(self, app: Flask):
         api = module.TrialCompletionApi()
         method = unwrap(api.post)
 
@@ -416,7 +422,7 @@ class TestTrialCompletionApi:
             with pytest.raises(NotCompletionAppError):
                 method(api, MagicMock(mode=AppMode.CHAT))
 
-    def test_success(self, app, trial_app_completion, account):
+    def test_success(self, app: Flask, trial_app_completion, account):
         api = module.TrialCompletionApi()
         method = unwrap(api.post)
 
@@ -430,7 +436,7 @@ class TestTrialCompletionApi:
 
         assert result is not None
 
-    def test_completion_app_config_broken(self, app, trial_app_completion, account):
+    def test_completion_app_config_broken(self, app: Flask, trial_app_completion, account):
         api = module.TrialCompletionApi()
         method = unwrap(api.post)
 
@@ -446,7 +452,7 @@ class TestTrialCompletionApi:
             with pytest.raises(AppUnavailableError):
                 method(api, trial_app_completion)
 
-    def test_completion_provider_not_init(self, app, trial_app_completion, account):
+    def test_completion_provider_not_init(self, app: Flask, trial_app_completion, account):
         api = module.TrialCompletionApi()
         method = unwrap(api.post)
 
@@ -462,7 +468,7 @@ class TestTrialCompletionApi:
             with pytest.raises(ProviderNotInitializeError):
                 method(api, trial_app_completion)
 
-    def test_completion_quota_exceeded(self, app, trial_app_completion, account):
+    def test_completion_quota_exceeded(self, app: Flask, trial_app_completion, account):
         api = module.TrialCompletionApi()
         method = unwrap(api.post)
 
@@ -478,7 +484,7 @@ class TestTrialCompletionApi:
             with pytest.raises(ProviderQuotaExceededError):
                 method(api, trial_app_completion)
 
-    def test_completion_model_not_support(self, app, trial_app_completion, account):
+    def test_completion_model_not_support(self, app: Flask, trial_app_completion, account):
         api = module.TrialCompletionApi()
         method = unwrap(api.post)
 
@@ -494,7 +500,7 @@ class TestTrialCompletionApi:
             with pytest.raises(ProviderModelCurrentlyNotSupportError):
                 method(api, trial_app_completion)
 
-    def test_completion_invoke_error(self, app, trial_app_completion, account):
+    def test_completion_invoke_error(self, app: Flask, trial_app_completion, account):
         api = module.TrialCompletionApi()
         method = unwrap(api.post)
 
@@ -510,7 +516,7 @@ class TestTrialCompletionApi:
             with pytest.raises(CompletionRequestError):
                 method(api, trial_app_completion)
 
-    def test_completion_rate_limit_error(self, app, trial_app_completion, account):
+    def test_completion_rate_limit_error(self, app: Flask, trial_app_completion, account):
         api = module.TrialCompletionApi()
         method = unwrap(api.post)
 
@@ -526,7 +532,7 @@ class TestTrialCompletionApi:
             with pytest.raises(InternalServerError):
                 method(api, trial_app_completion)
 
-    def test_completion_value_error(self, app, trial_app_completion, account):
+    def test_completion_value_error(self, app: Flask, trial_app_completion, account):
         api = module.TrialCompletionApi()
         method = unwrap(api.post)
 
@@ -542,7 +548,7 @@ class TestTrialCompletionApi:
             with pytest.raises(ValueError):
                 method(api, trial_app_completion)
 
-    def test_completion_generic_exception(self, app, trial_app_completion, account):
+    def test_completion_generic_exception(self, app: Flask, trial_app_completion, account):
         api = module.TrialCompletionApi()
         method = unwrap(api.post)
 
@@ -560,7 +566,7 @@ class TestTrialCompletionApi:
 
 
 class TestTrialMessageSuggestedQuestionApi:
-    def test_not_chat_app(self, app):
+    def test_not_chat_app(self, app: Flask):
         api = module.TrialMessageSuggestedQuestionApi()
         method = unwrap(api.get)
 
@@ -568,7 +574,7 @@ class TestTrialMessageSuggestedQuestionApi:
             with pytest.raises(NotChatAppError):
                 method(MagicMock(mode="completion"), str(uuid4()))
 
-    def test_success(self, app, trial_app_chat, account):
+    def test_success(self, app: Flask, trial_app_chat, account):
         api = module.TrialMessageSuggestedQuestionApi()
         method = unwrap(api.get)
 
@@ -585,7 +591,7 @@ class TestTrialMessageSuggestedQuestionApi:
 
         assert result == {"data": ["q1", "q2"]}
 
-    def test_conversation_not_exists(self, app, trial_app_chat, account):
+    def test_conversation_not_exists(self, app: Flask, trial_app_chat, account):
         api = module.TrialMessageSuggestedQuestionApi()
         method = unwrap(api.get)
 
@@ -637,7 +643,7 @@ class TestTrialAppParameterApi:
 
 
 class TestTrialChatAudioApi:
-    def test_success(self, app, trial_app_chat, account):
+    def test_success(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatAudioApi()
         method = unwrap(api.post)
 
@@ -656,7 +662,7 @@ class TestTrialChatAudioApi:
 
         assert result == {"text": "hello"}
 
-    def test_app_config_broken(self, app, trial_app_chat, account):
+    def test_app_config_broken(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatAudioApi()
         method = unwrap(api.post)
 
@@ -677,7 +683,7 @@ class TestTrialChatAudioApi:
             with pytest.raises(module.AppUnavailableError):
                 method(api, trial_app_chat)
 
-    def test_no_audio_uploaded(self, app, trial_app_chat, account):
+    def test_no_audio_uploaded(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatAudioApi()
         method = unwrap(api.post)
 
@@ -698,7 +704,7 @@ class TestTrialChatAudioApi:
             with pytest.raises(module.NoAudioUploadedError):
                 method(api, trial_app_chat)
 
-    def test_audio_too_large(self, app, trial_app_chat, account):
+    def test_audio_too_large(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatAudioApi()
         method = unwrap(api.post)
 
@@ -719,7 +725,7 @@ class TestTrialChatAudioApi:
             with pytest.raises(module.AudioTooLargeError):
                 method(api, trial_app_chat)
 
-    def test_unsupported_audio_type(self, app, trial_app_chat, account):
+    def test_unsupported_audio_type(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatAudioApi()
         method = unwrap(api.post)
 
@@ -740,7 +746,7 @@ class TestTrialChatAudioApi:
             with pytest.raises(module.UnsupportedAudioTypeError):
                 method(api, trial_app_chat)
 
-    def test_provider_not_support_tts(self, app, trial_app_chat, account):
+    def test_provider_not_support_tts(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatAudioApi()
         method = unwrap(api.post)
 
@@ -761,7 +767,7 @@ class TestTrialChatAudioApi:
             with pytest.raises(module.ProviderNotSupportSpeechToTextError):
                 method(api, trial_app_chat)
 
-    def test_provider_not_init(self, app, trial_app_chat, account):
+    def test_provider_not_init(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatAudioApi()
         method = unwrap(api.post)
 
@@ -778,7 +784,7 @@ class TestTrialChatAudioApi:
             with pytest.raises(ProviderNotInitializeError):
                 method(api, trial_app_chat)
 
-    def test_quota_exceeded(self, app, trial_app_chat, account):
+    def test_quota_exceeded(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatAudioApi()
         method = unwrap(api.post)
 
@@ -797,7 +803,7 @@ class TestTrialChatAudioApi:
 
 
 class TestTrialChatTextApi:
-    def test_success(self, app, trial_app_chat, account):
+    def test_success(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatTextApi()
         method = unwrap(api.post)
 
@@ -811,7 +817,7 @@ class TestTrialChatTextApi:
 
         assert result == {"audio": "base64_data"}
 
-    def test_app_config_broken(self, app, trial_app_chat, account):
+    def test_app_config_broken(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatTextApi()
         method = unwrap(api.post)
 
@@ -827,7 +833,7 @@ class TestTrialChatTextApi:
             with pytest.raises(module.AppUnavailableError):
                 method(api, trial_app_chat)
 
-    def test_provider_not_support(self, app, trial_app_chat, account):
+    def test_provider_not_support(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatTextApi()
         method = unwrap(api.post)
 
@@ -843,7 +849,7 @@ class TestTrialChatTextApi:
             with pytest.raises(module.ProviderNotSupportSpeechToTextError):
                 method(api, trial_app_chat)
 
-    def test_audio_too_large(self, app, trial_app_chat, account):
+    def test_audio_too_large(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatTextApi()
         method = unwrap(api.post)
 
@@ -859,7 +865,7 @@ class TestTrialChatTextApi:
             with pytest.raises(module.AudioTooLargeError):
                 method(api, trial_app_chat)
 
-    def test_no_audio_uploaded(self, app, trial_app_chat, account):
+    def test_no_audio_uploaded(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatTextApi()
         method = unwrap(api.post)
 
@@ -875,7 +881,7 @@ class TestTrialChatTextApi:
             with pytest.raises(module.NoAudioUploadedError):
                 method(api, trial_app_chat)
 
-    def test_provider_not_init(self, app, trial_app_chat, account):
+    def test_provider_not_init(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatTextApi()
         method = unwrap(api.post)
 
@@ -887,7 +893,7 @@ class TestTrialChatTextApi:
             with pytest.raises(ProviderNotInitializeError):
                 method(api, trial_app_chat)
 
-    def test_quota_exceeded(self, app, trial_app_chat, account):
+    def test_quota_exceeded(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatTextApi()
         method = unwrap(api.post)
 
@@ -899,7 +905,7 @@ class TestTrialChatTextApi:
             with pytest.raises(ProviderQuotaExceededError):
                 method(api, trial_app_chat)
 
-    def test_model_not_support(self, app, trial_app_chat, account):
+    def test_model_not_support(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatTextApi()
         method = unwrap(api.post)
 
@@ -911,7 +917,7 @@ class TestTrialChatTextApi:
             with pytest.raises(ProviderModelCurrentlyNotSupportError):
                 method(api, trial_app_chat)
 
-    def test_invoke_error(self, app, trial_app_chat, account):
+    def test_invoke_error(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatTextApi()
         method = unwrap(api.post)
 
@@ -925,7 +931,7 @@ class TestTrialChatTextApi:
 
 
 class TestTrialAppWorkflowTaskStopApi:
-    def test_not_workflow_app(self, app, trial_app_chat):
+    def test_not_workflow_app(self, app: Flask, trial_app_chat):
         api = module.TrialAppWorkflowTaskStopApi()
         method = unwrap(api.post)
 
@@ -933,7 +939,7 @@ class TestTrialAppWorkflowTaskStopApi:
             with pytest.raises(NotWorkflowAppError):
                 method(api, trial_app_chat, str(uuid4()))
 
-    def test_success(self, app, trial_app_workflow, account):
+    def test_success(self, app: Flask, trial_app_workflow, account):
         api = module.TrialAppWorkflowTaskStopApi()
         method = unwrap(api.post)
 
@@ -952,7 +958,7 @@ class TestTrialAppWorkflowTaskStopApi:
 
 
 class TestTrialSitApi:
-    def test_no_site(self, app):
+    def test_no_site(self, app: Flask):
         api = module.TrialSitApi()
         method = unwrap(api.get)
         app_model = MagicMock()
@@ -963,7 +969,7 @@ class TestTrialSitApi:
             with pytest.raises(Forbidden):
                 method(api, app_model)
 
-    def test_archived_tenant(self, app):
+    def test_archived_tenant(self, app: Flask):
         api = module.TrialSitApi()
         method = unwrap(api.get)
 
@@ -978,7 +984,7 @@ class TestTrialSitApi:
             with pytest.raises(Forbidden):
                 method(api, app_model)
 
-    def test_success(self, app):
+    def test_success(self, app: Flask):
         api = module.TrialSitApi()
         method = unwrap(api.get)
 
@@ -1003,7 +1009,7 @@ class TestTrialSitApi:
 
 
 class TestTrialChatAudioApiExceptionHandlers:
-    def test_provider_not_init(self, app, trial_app_chat, account):
+    def test_provider_not_init(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatAudioApi()
         method = unwrap(api.post)
 
@@ -1024,7 +1030,7 @@ class TestTrialChatAudioApiExceptionHandlers:
             with pytest.raises(ProviderNotInitializeError):
                 method(api, trial_app_chat)
 
-    def test_quota_exceeded(self, app, trial_app_chat, account):
+    def test_quota_exceeded(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatAudioApi()
         method = unwrap(api.post)
 
@@ -1045,7 +1051,7 @@ class TestTrialChatAudioApiExceptionHandlers:
             with pytest.raises(ProviderQuotaExceededError):
                 method(api, trial_app_chat)
 
-    def test_invoke_error(self, app, trial_app_chat, account):
+    def test_invoke_error(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatAudioApi()
         method = unwrap(api.post)
 
@@ -1068,7 +1074,7 @@ class TestTrialChatAudioApiExceptionHandlers:
 
 
 class TestTrialChatTextApiExceptionHandlers:
-    def test_app_config_broken(self, app, trial_app_chat, account):
+    def test_app_config_broken(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatTextApi()
         method = unwrap(api.post)
 
@@ -1084,7 +1090,7 @@ class TestTrialChatTextApiExceptionHandlers:
             with pytest.raises(module.AppUnavailableError):
                 method(api, trial_app_chat)
 
-    def test_unsupported_audio_type(self, app, trial_app_chat, account):
+    def test_unsupported_audio_type(self, app: Flask, trial_app_chat, account):
         api = module.TrialChatTextApi()
         method = unwrap(api.post)
 
diff --git a/api/tests/unit_tests/controllers/console/explore/test_workflow.py b/api/tests/unit_tests/controllers/console/explore/test_workflow.py
index 445f887fd3..3a01925204 100644
--- a/api/tests/unit_tests/controllers/console/explore/test_workflow.py
+++ b/api/tests/unit_tests/controllers/console/explore/test_workflow.py
@@ -57,7 +57,7 @@ def payload():
 
 
 class TestInstalledAppWorkflowRunApi:
-    def test_not_workflow_app(self, app, non_workflow_installed_app):
+    def test_not_workflow_app(self, app: Flask, non_workflow_installed_app):
         api = InstalledAppWorkflowRunApi()
         method = unwrap(api.post)
 
@@ -71,7 +71,7 @@ class TestInstalledAppWorkflowRunApi:
             with pytest.raises(NotWorkflowAppError):
                 method(non_workflow_installed_app)
 
-    def test_success(self, app, installed_workflow_app, user, payload):
+    def test_success(self, app: Flask, installed_workflow_app, user, payload):
         api = InstalledAppWorkflowRunApi()
         method = unwrap(api.post)
 
@@ -91,7 +91,7 @@ class TestInstalledAppWorkflowRunApi:
             generate_mock.assert_called_once()
             assert result is not None
 
-    def test_rate_limit_error(self, app, installed_workflow_app, user, payload):
+    def test_rate_limit_error(self, app: Flask, installed_workflow_app, user, payload):
         api = InstalledAppWorkflowRunApi()
         method = unwrap(api.post)
 
@@ -109,7 +109,7 @@ class TestInstalledAppWorkflowRunApi:
             with pytest.raises(InvokeRateLimitHttpError):
                 method(installed_workflow_app)
 
-    def test_unexpected_exception(self, app, installed_workflow_app, user, payload):
+    def test_unexpected_exception(self, app: Flask, installed_workflow_app, user, payload):
         api = InstalledAppWorkflowRunApi()
         method = unwrap(api.post)
 
diff --git a/api/tests/unit_tests/controllers/console/tag/test_tags.py b/api/tests/unit_tests/controllers/console/tag/test_tags.py
index 6405558bb4..f4916f013c 100644
--- a/api/tests/unit_tests/controllers/console/tag/test_tags.py
+++ b/api/tests/unit_tests/controllers/console/tag/test_tags.py
@@ -8,14 +8,13 @@ from werkzeug.exceptions import Forbidden
 import controllers.console.tag.tags as module
 from controllers.console import console_ns
 from controllers.console.tag.tags import (
-    DeprecatedTagBindingCreateApi,
-    DeprecatedTagBindingRemoveApi,
     TagBindingCollectionApi,
-    TagBindingItemApi,
+    TagBindingRemoveApi,
     TagListApi,
     TagUpdateDeleteApi,
 )
 from models.enums import TagType
+from services.tag_service import UpdateTagPayload
 
 
 def unwrap(func):
@@ -75,7 +74,7 @@ def payload_patch():
 
 
 class TestTagListApi:
-    def test_get_success(self, app):
+    def test_get_success(self, app: Flask):
         api = TagListApi()
         method = unwrap(api.get)
 
@@ -102,7 +101,7 @@ class TestTagListApi:
         assert status == 200
         assert result == [{"id": "1", "name": "tag", "type": "knowledge", "binding_count": "1"}]
 
-    def test_post_success(self, app, admin_user, tag, payload_patch):
+    def test_post_success(self, app: Flask, admin_user, tag, payload_patch):
         api = TagListApi()
         method = unwrap(api.post)
 
@@ -126,7 +125,7 @@ class TestTagListApi:
         assert result["name"] == "test-tag"
         assert result["binding_count"] == "0"
 
-    def test_post_forbidden(self, app, readonly_user, payload_patch):
+    def test_post_forbidden(self, app: Flask, readonly_user, payload_patch):
         api = TagListApi()
         method = unwrap(api.post)
 
@@ -145,11 +144,11 @@ class TestTagListApi:
 
 
 class TestTagUpdateDeleteApi:
-    def test_patch_success(self, app, admin_user, tag, payload_patch):
+    def test_patch_success(self, app: Flask, admin_user, tag, payload_patch):
         api = TagUpdateDeleteApi()
         method = unwrap(api.patch)
 
-        payload = {"name": "updated", "type": "knowledge"}
+        payload = {"name": "updated"}
 
         with app.test_request_context("/", json=payload):
             with (
@@ -161,7 +160,7 @@ class TestTagUpdateDeleteApi:
                 patch(
                     "controllers.console.tag.tags.TagService.update_tags",
                     return_value=tag,
-                ),
+                ) as update_tags_mock,
                 patch(
                     "controllers.console.tag.tags.TagService.get_tag_binding_count",
                     return_value=3,
@@ -170,9 +169,12 @@ class TestTagUpdateDeleteApi:
                 result, status = method(api, "tag-1")
 
         assert status == 200
+        update_payload, tag_id = update_tags_mock.call_args.args
+        assert update_payload == UpdateTagPayload(name="updated")
+        assert tag_id == "tag-1"
         assert result["binding_count"] == "3"
 
-    def test_patch_forbidden(self, app, readonly_user, payload_patch):
+    def test_patch_forbidden(self, app: Flask, readonly_user, payload_patch):
         api = TagUpdateDeleteApi()
         method = unwrap(api.patch)
 
@@ -189,7 +191,7 @@ class TestTagUpdateDeleteApi:
                 with pytest.raises(Forbidden):
                     method(api, "tag-1")
 
-    def test_delete_success(self, app, admin_user):
+    def test_delete_success(self, app: Flask, admin_user):
         api = TagUpdateDeleteApi()
         method = unwrap(api.delete)
 
@@ -208,7 +210,7 @@ class TestTagUpdateDeleteApi:
 
 
 class TestTagBindingCollectionApi:
-    def test_create_success(self, app, admin_user, payload_patch):
+    def test_create_success(self, app: Flask, admin_user, payload_patch):
         api = TagBindingCollectionApi()
         method = unwrap(api.post)
 
@@ -233,7 +235,7 @@ class TestTagBindingCollectionApi:
         assert status == 200
         assert result["result"] == "success"
 
-    def test_create_forbidden(self, app, readonly_user, payload_patch):
+    def test_create_forbidden(self, app: Flask, readonly_user, payload_patch):
         api = TagBindingCollectionApi()
         method = unwrap(api.post)
 
@@ -249,39 +251,13 @@ class TestTagBindingCollectionApi:
                     method(api)
 
 
-class TestDeprecatedTagBindingCreateApi:
-    def test_create_success(self, app, admin_user, payload_patch):
-        api = DeprecatedTagBindingCreateApi()
+class TestTagBindingRemoveApi:
+    def test_remove_success(self, app: Flask, admin_user, payload_patch):
+        api = TagBindingRemoveApi()
         method = unwrap(api.post)
 
         payload = {
-            "tag_ids": ["tag-1"],
-            "target_id": "target-1",
-            "type": "knowledge",
-        }
-
-        with app.test_request_context("/", json=payload):
-            with (
-                patch(
-                    "controllers.console.tag.tags.current_account_with_tenant",
-                    return_value=(admin_user, None),
-                ),
-                payload_patch(payload),
-                patch("controllers.console.tag.tags.TagService.save_tag_binding") as save_mock,
-            ):
-                result, status = method(api)
-
-        save_mock.assert_called_once()
-        assert status == 200
-        assert result["result"] == "success"
-
-
-class TestTagBindingItemApi:
-    def test_delete_success(self, app, admin_user, payload_patch):
-        api = TagBindingItemApi()
-        method = unwrap(api.delete)
-
-        payload = {
+            "tag_ids": ["tag-1", "tag-2"],
             "target_id": "target-1",
             "type": "knowledge",
         }
@@ -295,57 +271,16 @@ class TestTagBindingItemApi:
                 payload_patch(payload),
                 patch("controllers.console.tag.tags.TagService.delete_tag_binding") as delete_mock,
             ):
-                result, status = method(api, "tag-1")
+                result, status = method(api)
 
         delete_mock.assert_called_once()
         delete_payload = delete_mock.call_args.args[0]
-        assert delete_payload.tag_id == "tag-1"
-        assert delete_payload.target_id == "target-1"
-        assert delete_payload.type == TagType.KNOWLEDGE
+        assert delete_payload.tag_ids == ["tag-1", "tag-2"]
         assert status == 200
         assert result["result"] == "success"
 
-    def test_delete_forbidden(self, app, readonly_user):
-        api = TagBindingItemApi()
-        method = unwrap(api.delete)
-
-        with app.test_request_context("/"):
-            with patch(
-                "controllers.console.tag.tags.current_account_with_tenant",
-                return_value=(readonly_user, None),
-            ):
-                with pytest.raises(Forbidden):
-                    method(api, "tag-1")
-
-
-class TestDeprecatedTagBindingRemoveApi:
-    def test_remove_success(self, app, admin_user, payload_patch):
-        api = DeprecatedTagBindingRemoveApi()
-        method = unwrap(api.post)
-
-        payload = {
-            "tag_id": "tag-1",
-            "target_id": "target-1",
-            "type": "knowledge",
-        }
-
-        with app.test_request_context("/", json=payload):
-            with (
-                patch(
-                    "controllers.console.tag.tags.current_account_with_tenant",
-                    return_value=(admin_user, None),
-                ),
-                payload_patch(payload),
-                patch("controllers.console.tag.tags.TagService.delete_tag_binding") as delete_mock,
-            ):
-                result, status = method(api)
-
-        delete_mock.assert_called_once()
-        assert status == 200
-        assert result["result"] == "success"
-
-    def test_remove_forbidden(self, app, readonly_user, payload_patch):
-        api = DeprecatedTagBindingRemoveApi()
+    def test_remove_forbidden(self, app: Flask, readonly_user, payload_patch):
+        api = TagBindingRemoveApi()
         method = unwrap(api.post)
 
         with app.test_request_context("/", json={}):
@@ -371,32 +306,30 @@ class TestTagResponseModel:
 
 
 class TestTagBindingRouteMetadata:
-    def test_legacy_write_routes_are_marked_deprecated(self):
-        assert DeprecatedTagBindingCreateApi.post.__apidoc__["deprecated"] is True
-        assert DeprecatedTagBindingRemoveApi.post.__apidoc__["deprecated"] is True
+    def test_write_routes_are_not_deprecated(self):
         assert TagBindingCollectionApi.post.__apidoc__.get("deprecated") is not True
-        assert TagBindingItemApi.delete.__apidoc__.get("deprecated") is not True
+        assert TagBindingRemoveApi.post.__apidoc__.get("deprecated") is not True
 
     def test_write_routes_have_stable_operation_ids(self):
         assert TagBindingCollectionApi.post.__apidoc__["id"] == "create_tag_binding"
-        assert TagBindingItemApi.delete.__apidoc__["id"] == "delete_tag_binding"
-        assert DeprecatedTagBindingCreateApi.post.__apidoc__["id"] == "create_tag_binding_deprecated"
-        assert DeprecatedTagBindingRemoveApi.post.__apidoc__["id"] == "delete_tag_binding_deprecated"
+        assert TagBindingRemoveApi.post.__apidoc__["id"] == "remove_tag_bindings"
 
-    def test_canonical_and_legacy_write_routes_are_registered(self):
+    def test_write_routes_are_registered(self):
         route_map = {
             resource.__name__: urls
             for resource, urls, _route_doc, _kwargs in console_ns.resources
             if resource.__name__
             in {
                 "TagBindingCollectionApi",
-                "TagBindingItemApi",
-                "DeprecatedTagBindingCreateApi",
-                "DeprecatedTagBindingRemoveApi",
+                "TagBindingRemoveApi",
             }
         }
 
         assert route_map["TagBindingCollectionApi"] == ("/tag-bindings",)
-        assert route_map["TagBindingItemApi"] == ("/tag-bindings/<uuid:id>",)
-        assert route_map["DeprecatedTagBindingCreateApi"] == ("/tag-bindings/create",)
-        assert route_map["DeprecatedTagBindingRemoveApi"] == ("/tag-bindings/remove",)
+        assert route_map["TagBindingRemoveApi"] == ("/tag-bindings/remove",)
+
+    def test_legacy_write_routes_are_not_registered(self):
+        urls = {url for _resource, resource_urls, _route_doc, _kwargs in console_ns.resources for url in resource_urls}
+
+        assert "/tag-bindings/create" not in urls
+        assert "/tag-bindings/<uuid:id>" not in urls
diff --git a/api/tests/unit_tests/controllers/console/test_admin.py b/api/tests/unit_tests/controllers/console/test_admin.py
deleted file mode 100644
index 16197fcd0c..0000000000
--- a/api/tests/unit_tests/controllers/console/test_admin.py
+++ /dev/null
@@ -1,877 +0,0 @@
-"""Final working unit tests for admin endpoints - tests business logic directly."""
-
-import uuid
-from unittest.mock import Mock, PropertyMock, patch
-
-import pytest
-from werkzeug.exceptions import NotFound, Unauthorized
-
-from controllers.console.admin import (
-    DeleteExploreBannerApi,
-    InsertExploreAppApi,
-    InsertExploreAppListApi,
-    InsertExploreAppPayload,
-    InsertExploreBannerApi,
-    InsertExploreBannerPayload,
-)
-from models.model import App, InstalledApp, RecommendedApp
-
-
-@pytest.fixture(autouse=True)
-def bypass_only_edition_cloud(mocker):
-    """
-    Bypass only_edition_cloud decorator by setting EDITION to "CLOUD".
-    """
-    mocker.patch(
-        "controllers.console.wraps.dify_config.EDITION",
-        new="CLOUD",
-    )
-
-
-@pytest.fixture
-def mock_admin_auth(mocker):
-    """
-    Provide valid admin authentication for controller tests.
-    """
-    mocker.patch(
-        "controllers.console.admin.dify_config.ADMIN_API_KEY",
-        "test-admin-key",
-    )
-    mocker.patch(
-        "controllers.console.admin.extract_access_token",
-        return_value="test-admin-key",
-    )
-
-
-@pytest.fixture
-def mock_console_payload(mocker):
-    payload = {
-        "app_id": str(uuid.uuid4()),
-        "language": "en-US",
-        "category": "Productivity",
-        "position": 1,
-    }
-
-    mocker.patch(
-        "flask_restx.namespace.Namespace.payload",
-        new_callable=PropertyMock,
-        return_value=payload,
-    )
-
-    return payload
-
-
-@pytest.fixture
-def mock_banner_payload(mocker):
-    mocker.patch(
-        "flask_restx.namespace.Namespace.payload",
-        new_callable=PropertyMock,
-        return_value={
-            "title": "Test Banner",
-            "description": "Banner description",
-            "img-src": "https://example.com/banner.png",
-            "link": "https://example.com",
-            "sort": 1,
-            "category": "homepage",
-        },
-    )
-
-
-@pytest.fixture
-def mock_session_factory(mocker):
-    mock_session = Mock()
-    mock_session.execute = Mock()
-    mock_session.add = Mock()
-    mock_session.commit = Mock()
-
-    mocker.patch(
-        "controllers.console.admin.session_factory.create_session",
-        return_value=Mock(
-            __enter__=lambda s: mock_session,
-            __exit__=Mock(return_value=False),
-        ),
-    )
-
-
-class TestDeleteExploreBannerApi:
-    def setup_method(self):
-        self.api = DeleteExploreBannerApi()
-
-    def test_delete_banner_not_found(self, mocker, mock_admin_auth):
-        mocker.patch(
-            "controllers.console.admin.db.session.execute",
-            return_value=Mock(scalar_one_or_none=lambda: None),
-        )
-
-        with pytest.raises(NotFound, match="is not found"):
-            self.api.delete(uuid.uuid4())
-
-    def test_delete_banner_success(self, mocker, mock_admin_auth):
-        mock_banner = Mock()
-
-        mocker.patch(
-            "controllers.console.admin.db.session.execute",
-            return_value=Mock(scalar_one_or_none=lambda: mock_banner),
-        )
-        mocker.patch("controllers.console.admin.db.session.delete")
-        mocker.patch("controllers.console.admin.db.session.commit")
-
-        response, status = self.api.delete(uuid.uuid4())
-
-        assert status == 204
-        assert response["result"] == "success"
-
-
-class TestInsertExploreBannerApi:
-    def setup_method(self):
-        self.api = InsertExploreBannerApi()
-
-    def test_insert_banner_success(self, mocker, mock_admin_auth, mock_banner_payload):
-        mocker.patch("controllers.console.admin.db.session.add")
-        mocker.patch("controllers.console.admin.db.session.commit")
-
-        response, status = self.api.post()
-
-        assert status == 201
-        assert response["result"] == "success"
-
-    def test_banner_payload_valid_language(self):
-        payload = {
-            "title": "Test Banner",
-            "description": "Banner description",
-            "img-src": "https://example.com/banner.png",
-            "link": "https://example.com",
-            "sort": 1,
-            "category": "homepage",
-            "language": "en-US",
-        }
-
-        model = InsertExploreBannerPayload.model_validate(payload)
-        assert model.language == "en-US"
-
-    def test_banner_payload_invalid_language(self):
-        payload = {
-            "title": "Test Banner",
-            "description": "Banner description",
-            "img-src": "https://example.com/banner.png",
-            "link": "https://example.com",
-            "sort": 1,
-            "category": "homepage",
-            "language": "invalid-lang",
-        }
-
-        with pytest.raises(ValueError, match="invalid-lang is not a valid language"):
-            InsertExploreBannerPayload.model_validate(payload)
-
-
-class TestInsertExploreAppApiDelete:
-    def setup_method(self):
-        self.api = InsertExploreAppApi()
-
-    def test_delete_when_not_in_explore(self, mocker, mock_admin_auth):
-        mocker.patch(
-            "controllers.console.admin.session_factory.create_session",
-            return_value=Mock(
-                __enter__=lambda s: s,
-                __exit__=Mock(return_value=False),
-                execute=lambda *_: Mock(scalar_one_or_none=lambda: None),
-            ),
-        )
-
-        response, status = self.api.delete(uuid.uuid4())
-
-        assert status == 204
-        assert response["result"] == "success"
-
-    def test_delete_when_in_explore_with_trial_app(self, mocker, mock_admin_auth):
-        """Test deleting an app from explore that has a trial app."""
-        app_id = uuid.uuid4()
-
-        mock_recommended = Mock(spec=RecommendedApp)
-        mock_recommended.app_id = "app-123"
-
-        mock_app = Mock(spec=App)
-        mock_app.is_public = True
-
-        mock_trial = Mock()
-
-        # Mock session context manager and its execute
-        mock_session = Mock()
-        mock_session.execute = Mock()
-        mock_session.delete = Mock()
-
-        # Set up side effects for execute calls
-        mock_session.execute.side_effect = [
-            Mock(scalar_one_or_none=lambda: mock_recommended),
-            Mock(scalar_one_or_none=lambda: mock_app),
-            Mock(scalars=Mock(return_value=Mock(all=lambda: []))),
-            Mock(scalar_one_or_none=lambda: mock_trial),
-        ]
-
-        mocker.patch(
-            "controllers.console.admin.session_factory.create_session",
-            return_value=Mock(
-                __enter__=lambda s: mock_session,
-                __exit__=Mock(return_value=False),
-            ),
-        )
-
-        mocker.patch("controllers.console.admin.db.session.delete")
-        mocker.patch("controllers.console.admin.db.session.commit")
-
-        response, status = self.api.delete(app_id)
-
-        assert status == 204
-        assert response["result"] == "success"
-        assert mock_app.is_public is False
-
-    def test_delete_with_installed_apps(self, mocker, mock_admin_auth):
-        """Test deleting an app that has installed apps in other tenants."""
-        app_id = uuid.uuid4()
-
-        mock_recommended = Mock(spec=RecommendedApp)
-        mock_recommended.app_id = "app-123"
-
-        mock_app = Mock(spec=App)
-        mock_app.is_public = True
-
-        mock_installed_app = Mock(spec=InstalledApp)
-
-        # Mock session
-        mock_session = Mock()
-        mock_session.execute = Mock()
-        mock_session.delete = Mock()
-
-        mock_session.execute.side_effect = [
-            Mock(scalar_one_or_none=lambda: mock_recommended),
-            Mock(scalar_one_or_none=lambda: mock_app),
-            Mock(scalars=Mock(return_value=Mock(all=lambda: [mock_installed_app]))),
-            Mock(scalar_one_or_none=lambda: None),
-        ]
-
-        mocker.patch(
-            "controllers.console.admin.session_factory.create_session",
-            return_value=Mock(
-                __enter__=lambda s: mock_session,
-                __exit__=Mock(return_value=False),
-            ),
-        )
-
-        mocker.patch("controllers.console.admin.db.session.delete")
-        mocker.patch("controllers.console.admin.db.session.commit")
-
-        response, status = self.api.delete(app_id)
-
-        assert status == 204
-        assert mock_session.delete.called
-
-
-class TestInsertExploreAppListApi:
-    def setup_method(self):
-        self.api = InsertExploreAppListApi()
-
-    def test_app_not_found(self, mocker, mock_admin_auth, mock_console_payload):
-        mocker.patch(
-            "controllers.console.admin.db.session.execute",
-            return_value=Mock(scalar_one_or_none=lambda: None),
-        )
-
-        with pytest.raises(NotFound, match="is not found"):
-            self.api.post()
-
-    def test_create_recommended_app(
-        self,
-        mocker,
-        mock_admin_auth,
-        mock_console_payload,
-    ):
-        mock_app = Mock(spec=App)
-        mock_app.id = "app-id"
-        mock_app.site = None
-        mock_app.tenant_id = "tenant"
-        mock_app.is_public = False
-
-        # db.session.execute → fetch App
-        mocker.patch(
-            "controllers.console.admin.db.session.execute",
-            return_value=Mock(scalar_one_or_none=lambda: mock_app),
-        )
-
-        # session_factory.create_session → recommended_app lookup
-        mock_session = Mock()
-        mock_session.execute = Mock(return_value=Mock(scalar_one_or_none=lambda: None))
-
-        mocker.patch(
-            "controllers.console.admin.session_factory.create_session",
-            return_value=Mock(
-                __enter__=lambda s: mock_session,
-                __exit__=Mock(return_value=False),
-            ),
-        )
-
-        mocker.patch("controllers.console.admin.db.session.add")
-        mocker.patch("controllers.console.admin.db.session.commit")
-
-        response, status = self.api.post()
-
-        assert status == 201
-        assert response["result"] == "success"
-        assert mock_app.is_public is True
-
-    def test_update_recommended_app(self, mocker, mock_admin_auth, mock_console_payload, mock_session_factory):
-        mock_app = Mock(spec=App)
-        mock_app.id = "app-id"
-        mock_app.site = None
-        mock_app.is_public = False
-
-        mock_recommended = Mock(spec=RecommendedApp)
-
-        mocker.patch(
-            "controllers.console.admin.db.session.execute",
-            side_effect=[
-                Mock(scalar_one_or_none=lambda: mock_app),
-                Mock(scalar_one_or_none=lambda: mock_recommended),
-            ],
-        )
-
-        mocker.patch("controllers.console.admin.db.session.commit")
-
-        response, status = self.api.post()
-
-        assert status == 200
-        assert response["result"] == "success"
-        assert mock_app.is_public is True
-
-    def test_site_data_overrides_payload(
-        self,
-        mocker,
-        mock_admin_auth,
-        mock_console_payload,
-        mock_session_factory,
-    ):
-        site = Mock()
-        site.description = "Site Desc"
-        site.copyright = "Site Copyright"
-        site.privacy_policy = "Site Privacy"
-        site.custom_disclaimer = "Site Disclaimer"
-
-        mock_app = Mock(spec=App)
-        mock_app.id = "app-id"
-        mock_app.site = site
-        mock_app.tenant_id = "tenant"
-        mock_app.is_public = False
-
-        mocker.patch(
-            "controllers.console.admin.db.session.execute",
-            side_effect=[
-                Mock(scalar_one_or_none=lambda: mock_app),
-                Mock(scalar_one_or_none=lambda: None),
-                Mock(scalar_one_or_none=lambda: None),
-            ],
-        )
-
-        commit_spy = mocker.patch("controllers.console.admin.db.session.commit")
-
-        response, status = self.api.post()
-
-        assert status == 200
-        assert response["result"] == "success"
-        assert mock_app.is_public is True
-        commit_spy.assert_called_once()
-
-    def test_create_trial_app_when_can_trial_enabled(
-        self,
-        mocker,
-        mock_admin_auth,
-        mock_console_payload,
-        mock_session_factory,
-    ):
-        mock_console_payload["can_trial"] = True
-        mock_console_payload["trial_limit"] = 5
-
-        mock_app = Mock(spec=App)
-        mock_app.id = "app-id"
-        mock_app.site = None
-        mock_app.tenant_id = "tenant"
-        mock_app.is_public = False
-
-        mocker.patch(
-            "controllers.console.admin.db.session.execute",
-            side_effect=[
-                Mock(scalar_one_or_none=lambda: mock_app),
-                Mock(scalar_one_or_none=lambda: None),
-                Mock(scalar_one_or_none=lambda: None),
-            ],
-        )
-
-        add_spy = mocker.patch("controllers.console.admin.db.session.add")
-        mocker.patch("controllers.console.admin.db.session.commit")
-
-        self.api.post()
-
-        assert any(call.args[0].__class__.__name__ == "TrialApp" for call in add_spy.call_args_list)
-
-    def test_update_recommended_app_with_trial(
-        self,
-        mocker,
-        mock_admin_auth,
-        mock_console_payload,
-        mock_session_factory,
-    ):
-        """Test updating a recommended app when trial is enabled."""
-        mock_console_payload["can_trial"] = True
-        mock_console_payload["trial_limit"] = 10
-
-        mock_app = Mock(spec=App)
-        mock_app.id = "app-id"
-        mock_app.site = None
-        mock_app.is_public = False
-        mock_app.tenant_id = "tenant-123"
-
-        mock_recommended = Mock(spec=RecommendedApp)
-
-        mocker.patch(
-            "controllers.console.admin.db.session.execute",
-            side_effect=[
-                Mock(scalar_one_or_none=lambda: mock_app),
-                Mock(scalar_one_or_none=lambda: mock_recommended),
-                Mock(scalar_one_or_none=lambda: None),
-            ],
-        )
-
-        add_spy = mocker.patch("controllers.console.admin.db.session.add")
-        mocker.patch("controllers.console.admin.db.session.commit")
-
-        response, status = self.api.post()
-
-        assert status == 200
-        assert response["result"] == "success"
-        assert mock_app.is_public is True
-
-    def test_update_recommended_app_without_trial(
-        self,
-        mocker,
-        mock_admin_auth,
-        mock_console_payload,
-        mock_session_factory,
-    ):
-        """Test updating a recommended app without trial enabled."""
-        mock_app = Mock(spec=App)
-        mock_app.id = "app-id"
-        mock_app.site = None
-        mock_app.is_public = False
-
-        mock_recommended = Mock(spec=RecommendedApp)
-
-        mocker.patch(
-            "controllers.console.admin.db.session.execute",
-            side_effect=[
-                Mock(scalar_one_or_none=lambda: mock_app),
-                Mock(scalar_one_or_none=lambda: mock_recommended),
-            ],
-        )
-
-        mocker.patch("controllers.console.admin.db.session.commit")
-
-        response, status = self.api.post()
-
-        assert status == 200
-        assert response["result"] == "success"
-        assert mock_app.is_public is True
-
-
-class TestInsertExploreAppPayload:
-    """Test InsertExploreAppPayload validation."""
-
-    def test_valid_payload(self):
-        """Test creating payload with valid data."""
-        payload_data = {
-            "app_id": str(uuid.uuid4()),
-            "desc": "Test app description",
-            "copyright": "© 2024 Test Company",
-            "privacy_policy": "https://example.com/privacy",
-            "custom_disclaimer": "Custom disclaimer text",
-            "language": "en-US",
-            "category": "Productivity",
-            "position": 1,
-        }
-
-        payload = InsertExploreAppPayload.model_validate(payload_data)
-
-        assert payload.app_id == payload_data["app_id"]
-        assert payload.desc == payload_data["desc"]
-        assert payload.copyright == payload_data["copyright"]
-        assert payload.privacy_policy == payload_data["privacy_policy"]
-        assert payload.custom_disclaimer == payload_data["custom_disclaimer"]
-        assert payload.language == payload_data["language"]
-        assert payload.category == payload_data["category"]
-        assert payload.position == payload_data["position"]
-
-    def test_minimal_payload(self):
-        """Test creating payload with only required fields."""
-        payload_data = {
-            "app_id": str(uuid.uuid4()),
-            "language": "en-US",
-            "category": "Productivity",
-            "position": 1,
-        }
-
-        payload = InsertExploreAppPayload.model_validate(payload_data)
-
-        assert payload.app_id == payload_data["app_id"]
-        assert payload.desc is None
-        assert payload.copyright is None
-        assert payload.privacy_policy is None
-        assert payload.custom_disclaimer is None
-        assert payload.language == payload_data["language"]
-        assert payload.category == payload_data["category"]
-        assert payload.position == payload_data["position"]
-
-    def test_invalid_language(self):
-        """Test payload with invalid language code."""
-        payload_data = {
-            "app_id": str(uuid.uuid4()),
-            "language": "invalid-lang",
-            "category": "Productivity",
-            "position": 1,
-        }
-
-        with pytest.raises(ValueError, match="invalid-lang is not a valid language"):
-            InsertExploreAppPayload.model_validate(payload_data)
-
-
-class TestAdminRequiredDecorator:
-    """Test admin_required decorator."""
-
-    def setup_method(self):
-        """Set up test fixtures."""
-        # Mock dify_config
-        self.dify_config_patcher = patch("controllers.console.admin.dify_config")
-        self.mock_dify_config = self.dify_config_patcher.start()
-        self.mock_dify_config.ADMIN_API_KEY = "test-admin-key"
-
-        # Mock extract_access_token
-        self.token_patcher = patch("controllers.console.admin.extract_access_token")
-        self.mock_extract_token = self.token_patcher.start()
-
-    def teardown_method(self):
-        """Clean up test fixtures."""
-        self.dify_config_patcher.stop()
-        self.token_patcher.stop()
-
-    def test_admin_required_success(self):
-        """Test successful admin authentication."""
-        from controllers.console.admin import admin_required
-
-        @admin_required
-        def test_view():
-            return {"success": True}
-
-        self.mock_extract_token.return_value = "test-admin-key"
-        result = test_view()
-        assert result["success"] is True
-
-    def test_admin_required_invalid_token(self):
-        """Test admin_required with invalid token."""
-        from controllers.console.admin import admin_required
-
-        @admin_required
-        def test_view():
-            return {"success": True}
-
-        self.mock_extract_token.return_value = "wrong-key"
-        with pytest.raises(Unauthorized, match="API key is invalid"):
-            test_view()
-
-    def test_admin_required_no_api_key_configured(self):
-        """Test admin_required when no API key is configured."""
-        from controllers.console.admin import admin_required
-
-        self.mock_dify_config.ADMIN_API_KEY = None
-
-        @admin_required
-        def test_view():
-            return {"success": True}
-
-        with pytest.raises(Unauthorized, match="API key is invalid"):
-            test_view()
-
-    def test_admin_required_missing_authorization_header(self):
-        """Test admin_required with missing authorization header."""
-        from controllers.console.admin import admin_required
-
-        @admin_required
-        def test_view():
-            return {"success": True}
-
-        self.mock_extract_token.return_value = None
-        with pytest.raises(Unauthorized, match="Authorization header is missing"):
-            test_view()
-
-
-class TestExploreAppBusinessLogicDirect:
-    """Test the core business logic of explore app management directly."""
-
-    def test_data_fusion_logic(self):
-        """Test the data fusion logic between payload and site data."""
-        # Test cases for different data scenarios
-        test_cases = [
-            {
-                "name": "site_data_overrides_payload",
-                "payload": {"desc": "Payload desc", "copyright": "Payload copyright"},
-                "site": {"description": "Site desc", "copyright": "Site copyright"},
-                "expected": {
-                    "desc": "Site desc",
-                    "copyright": "Site copyright",
-                    "privacy_policy": "",
-                    "custom_disclaimer": "",
-                },
-            },
-            {
-                "name": "payload_used_when_no_site",
-                "payload": {"desc": "Payload desc", "copyright": "Payload copyright"},
-                "site": None,
-                "expected": {
-                    "desc": "Payload desc",
-                    "copyright": "Payload copyright",
-                    "privacy_policy": "",
-                    "custom_disclaimer": "",
-                },
-            },
-            {
-                "name": "empty_defaults_when_no_data",
-                "payload": {},
-                "site": None,
-                "expected": {"desc": "", "copyright": "", "privacy_policy": "", "custom_disclaimer": ""},
-            },
-        ]
-
-        for case in test_cases:
-            # Simulate the data fusion logic
-            payload_desc = case["payload"].get("desc")
-            payload_copyright = case["payload"].get("copyright")
-            payload_privacy_policy = case["payload"].get("privacy_policy")
-            payload_custom_disclaimer = case["payload"].get("custom_disclaimer")
-
-            if case["site"]:
-                site_desc = case["site"].get("description")
-                site_copyright = case["site"].get("copyright")
-                site_privacy_policy = case["site"].get("privacy_policy")
-                site_custom_disclaimer = case["site"].get("custom_disclaimer")
-
-                # Site data takes precedence
-                desc = site_desc or payload_desc or ""
-                copyright = site_copyright or payload_copyright or ""
-                privacy_policy = site_privacy_policy or payload_privacy_policy or ""
-                custom_disclaimer = site_custom_disclaimer or payload_custom_disclaimer or ""
-            else:
-                # Use payload data or empty defaults
-                desc = payload_desc or ""
-                copyright = payload_copyright or ""
-                privacy_policy = payload_privacy_policy or ""
-                custom_disclaimer = payload_custom_disclaimer or ""
-
-            result = {
-                "desc": desc,
-                "copyright": copyright,
-                "privacy_policy": privacy_policy,
-                "custom_disclaimer": custom_disclaimer,
-            }
-
-            assert result == case["expected"], f"Failed test case: {case['name']}"
-
-    def test_app_visibility_logic(self):
-        """Test that apps are made public when added to explore list."""
-        # Create a mock app
-        mock_app = Mock(spec=App)
-        mock_app.is_public = False
-
-        # Simulate the business logic
-        mock_app.is_public = True
-
-        assert mock_app.is_public is True
-
-    def test_recommended_app_creation_logic(self):
-        """Test the creation of RecommendedApp objects."""
-        app_id = str(uuid.uuid4())
-        payload_data = {
-            "app_id": app_id,
-            "desc": "Test app description",
-            "copyright": "© 2024 Test Company",
-            "privacy_policy": "https://example.com/privacy",
-            "custom_disclaimer": "Custom disclaimer",
-            "language": "en-US",
-            "category": "Productivity",
-            "position": 1,
-        }
-
-        # Simulate the creation logic
-        recommended_app = Mock(spec=RecommendedApp)
-        recommended_app.app_id = payload_data["app_id"]
-        recommended_app.description = payload_data["desc"]
-        recommended_app.copyright = payload_data["copyright"]
-        recommended_app.privacy_policy = payload_data["privacy_policy"]
-        recommended_app.custom_disclaimer = payload_data["custom_disclaimer"]
-        recommended_app.language = payload_data["language"]
-        recommended_app.category = payload_data["category"]
-        recommended_app.position = payload_data["position"]
-
-        # Verify the data
-        assert recommended_app.app_id == app_id
-        assert recommended_app.description == "Test app description"
-        assert recommended_app.copyright == "© 2024 Test Company"
-        assert recommended_app.privacy_policy == "https://example.com/privacy"
-        assert recommended_app.custom_disclaimer == "Custom disclaimer"
-        assert recommended_app.language == "en-US"
-        assert recommended_app.category == "Productivity"
-        assert recommended_app.position == 1
-
-    def test_recommended_app_update_logic(self):
-        """Test the update logic for existing RecommendedApp objects."""
-        mock_recommended_app = Mock(spec=RecommendedApp)
-
-        update_data = {
-            "desc": "Updated description",
-            "copyright": "© 2024 Updated",
-            "language": "fr-FR",
-            "category": "Tools",
-            "position": 2,
-        }
-
-        # Simulate the update logic
-        mock_recommended_app.description = update_data["desc"]
-        mock_recommended_app.copyright = update_data["copyright"]
-        mock_recommended_app.language = update_data["language"]
-        mock_recommended_app.category = update_data["category"]
-        mock_recommended_app.position = update_data["position"]
-
-        # Verify the updates
-        assert mock_recommended_app.description == "Updated description"
-        assert mock_recommended_app.copyright == "© 2024 Updated"
-        assert mock_recommended_app.language == "fr-FR"
-        assert mock_recommended_app.category == "Tools"
-        assert mock_recommended_app.position == 2
-
-    def test_app_not_found_error_logic(self):
-        """Test error handling when app is not found."""
-        app_id = str(uuid.uuid4())
-
-        # Simulate app lookup returning None
-        found_app = None
-
-        # Test the error condition
-        if not found_app:
-            with pytest.raises(NotFound, match=f"App '{app_id}' is not found"):
-                raise NotFound(f"App '{app_id}' is not found")
-
-    def test_recommended_app_not_found_error_logic(self):
-        """Test error handling when recommended app is not found for deletion."""
-        app_id = str(uuid.uuid4())
-
-        # Simulate recommended app lookup returning None
-        found_recommended_app = None
-
-        # Test the error condition
-        if not found_recommended_app:
-            with pytest.raises(NotFound, match=f"App '{app_id}' is not found in the explore list"):
-                raise NotFound(f"App '{app_id}' is not found in the explore list")
-
-    def test_database_session_usage_patterns(self):
-        """Test the expected database session usage patterns."""
-        # Mock session usage patterns
-        mock_session = Mock()
-
-        # Test session.add pattern
-        mock_recommended_app = Mock(spec=RecommendedApp)
-        mock_session.add(mock_recommended_app)
-        mock_session.commit()
-
-        # Verify session was used correctly
-        mock_session.add.assert_called_once_with(mock_recommended_app)
-        mock_session.commit.assert_called_once()
-
-        # Test session.delete pattern
-        mock_recommended_app_to_delete = Mock(spec=RecommendedApp)
-        mock_session.delete(mock_recommended_app_to_delete)
-        mock_session.commit()
-
-        # Verify delete pattern
-        mock_session.delete.assert_called_once_with(mock_recommended_app_to_delete)
-
-    def test_payload_validation_integration(self):
-        """Test payload validation in the context of the business logic."""
-        # Test valid payload
-        valid_payload_data = {
-            "app_id": str(uuid.uuid4()),
-            "desc": "Test app description",
-            "language": "en-US",
-            "category": "Productivity",
-            "position": 1,
-        }
-
-        # This should succeed
-        payload = InsertExploreAppPayload.model_validate(valid_payload_data)
-        assert payload.app_id == valid_payload_data["app_id"]
-
-        # Test invalid payload
-        invalid_payload_data = {
-            "app_id": str(uuid.uuid4()),
-            "language": "invalid-lang",  # This should fail validation
-            "category": "Productivity",
-            "position": 1,
-        }
-
-        # This should raise an exception
-        with pytest.raises(ValueError, match="invalid-lang is not a valid language"):
-            InsertExploreAppPayload.model_validate(invalid_payload_data)
-
-
-class TestExploreAppDataHandling:
-    """Test specific data handling scenarios."""
-
-    def test_uuid_validation(self):
-        """Test UUID validation and handling."""
-        # Test valid UUID
-        valid_uuid = str(uuid.uuid4())
-
-        # This should be a valid UUID
-        assert uuid.UUID(valid_uuid) is not None
-
-        # Test invalid UUID
-        invalid_uuid = "not-a-valid-uuid"
-
-        # This should raise a ValueError
-        with pytest.raises(ValueError):
-            uuid.UUID(invalid_uuid)
-
-    def test_language_validation(self):
-        """Test language validation against supported languages."""
-        from constants.languages import supported_language
-
-        # Test supported language
-        assert supported_language("en-US") == "en-US"
-        assert supported_language("fr-FR") == "fr-FR"
-
-        # Test unsupported language
-        with pytest.raises(ValueError, match="invalid-lang is not a valid language"):
-            supported_language("invalid-lang")
-
-    def test_response_formatting(self):
-        """Test API response formatting."""
-        # Test success responses
-        create_response = {"result": "success"}
-        update_response = {"result": "success"}
-        delete_response = None  # 204 No Content returns None
-
-        assert create_response["result"] == "success"
-        assert update_response["result"] == "success"
-        assert delete_response is None
-
-        # Test status codes
-        create_status = 201  # Created
-        update_status = 200  # OK
-        delete_status = 204  # No Content
-
-        assert create_status == 201
-        assert update_status == 200
-        assert delete_status == 204
diff --git a/api/tests/unit_tests/controllers/console/test_feature.py b/api/tests/unit_tests/controllers/console/test_feature.py
index d8debc1f2c..1711aede61 100644
--- a/api/tests/unit_tests/controllers/console/test_feature.py
+++ b/api/tests/unit_tests/controllers/console/test_feature.py
@@ -1,3 +1,4 @@
+from pytest_mock import MockerFixture
 from werkzeug.exceptions import Unauthorized
 
 
@@ -11,7 +12,7 @@ def unwrap(func):
 
 
 class TestFeatureApi:
-    def test_get_tenant_features_success(self, mocker):
+    def test_get_tenant_features_success(self, mocker: MockerFixture):
         from controllers.console.feature import FeatureApi
 
         mocker.patch(
@@ -32,7 +33,7 @@ class TestFeatureApi:
 
 
 class TestSystemFeatureApi:
-    def test_get_system_features_authenticated(self, mocker):
+    def test_get_system_features_authenticated(self, mocker: MockerFixture):
         """
         current_user.is_authenticated == True
         """
@@ -56,7 +57,7 @@ class TestSystemFeatureApi:
 
         assert result == {"features": {"sys_feature": True}}
 
-    def test_get_system_features_unauthenticated(self, mocker):
+    def test_get_system_features_unauthenticated(self, mocker: MockerFixture):
         """
         current_user.is_authenticated raises Unauthorized
         """
diff --git a/api/tests/unit_tests/controllers/console/test_files.py b/api/tests/unit_tests/controllers/console/test_files.py
index 5df9daa7f8..9274f6cf61 100644
--- a/api/tests/unit_tests/controllers/console/test_files.py
+++ b/api/tests/unit_tests/controllers/console/test_files.py
@@ -82,7 +82,7 @@ def mock_file_service(mock_db):
 
 
 class TestFileApiGet:
-    def test_get_upload_config(self, app):
+    def test_get_upload_config(self, app: Flask):
         api = FileApi()
         get_method = unwrap(api.get)
 
@@ -95,7 +95,7 @@ class TestFileApiGet:
 
 
 class TestFileApiPost:
-    def test_no_file_uploaded(self, app, mock_account_context):
+    def test_no_file_uploaded(self, app: Flask, mock_account_context):
         api = FileApi()
         post_method = unwrap(api.post)
 
@@ -103,7 +103,7 @@ class TestFileApiPost:
             with pytest.raises(NoFileUploadedError):
                 post_method(api)
 
-    def test_too_many_files(self, app, mock_account_context):
+    def test_too_many_files(self, app: Flask, mock_account_context):
         api = FileApi()
         post_method = unwrap(api.post)
 
@@ -120,7 +120,7 @@ class TestFileApiPost:
                 with pytest.raises(TooManyFilesError):
                     post_method(api)
 
-    def test_filename_missing(self, app, mock_account_context):
+    def test_filename_missing(self, app: Flask, mock_account_context):
         api = FileApi()
         post_method = unwrap(api.post)
 
@@ -132,7 +132,7 @@ class TestFileApiPost:
             with pytest.raises(FilenameNotExistsError):
                 post_method(api)
 
-    def test_dataset_upload_without_permission(self, app, mock_current_user):
+    def test_dataset_upload_without_permission(self, app: Flask, mock_current_user):
         mock_current_user.is_dataset_editor = False
 
         with patch(
@@ -151,7 +151,7 @@ class TestFileApiPost:
                 with pytest.raises(Forbidden):
                     post_method(api)
 
-    def test_successful_upload(self, app, mock_account_context, mock_file_service):
+    def test_successful_upload(self, app: Flask, mock_account_context, mock_file_service):
         api = FileApi()
         post_method = unwrap(api.post)
 
@@ -185,7 +185,7 @@ class TestFileApiPost:
         assert response["id"] == "file-id-123"
         assert response["name"] == "test.txt"
 
-    def test_upload_with_invalid_source(self, app, mock_account_context, mock_file_service):
+    def test_upload_with_invalid_source(self, app: Flask, mock_account_context, mock_file_service):
         """Test that invalid source parameter gets normalized to None"""
         api = FileApi()
         post_method = unwrap(api.post)
@@ -225,7 +225,7 @@ class TestFileApiPost:
         call_kwargs = mock_file_service.upload_file.call_args[1]
         assert call_kwargs["source"] is None
 
-    def test_file_too_large_error(self, app, mock_account_context, mock_file_service):
+    def test_file_too_large_error(self, app: Flask, mock_account_context, mock_file_service):
         api = FileApi()
         post_method = unwrap(api.post)
 
@@ -242,7 +242,7 @@ class TestFileApiPost:
             with pytest.raises(FileTooLargeError):
                 post_method(api)
 
-    def test_unsupported_file_type(self, app, mock_account_context, mock_file_service):
+    def test_unsupported_file_type(self, app: Flask, mock_account_context, mock_file_service):
         api = FileApi()
         post_method = unwrap(api.post)
 
@@ -259,7 +259,7 @@ class TestFileApiPost:
             with pytest.raises(UnsupportedFileTypeError):
                 post_method(api)
 
-    def test_blocked_extension(self, app, mock_account_context, mock_file_service):
+    def test_blocked_extension(self, app: Flask, mock_account_context, mock_file_service):
         api = FileApi()
         post_method = unwrap(api.post)
 
@@ -278,7 +278,7 @@ class TestFileApiPost:
 
 
 class TestFilePreviewApi:
-    def test_get_preview(self, app, mock_file_service):
+    def test_get_preview(self, app: Flask, mock_account_context, mock_file_service):
         api = FilePreviewApi()
         get_method = unwrap(api.get)
         mock_file_service.get_file_preview.return_value = "preview text"
@@ -290,7 +290,7 @@ class TestFilePreviewApi:
 
 
 class TestFileSupportTypeApi:
-    def test_get_supported_types(self, app):
+    def test_get_supported_types(self, app: Flask):
         api = FileSupportTypeApi()
         get_method = unwrap(api.get)
 
diff --git a/api/tests/unit_tests/controllers/console/test_workspace_account.py b/api/tests/unit_tests/controllers/console/test_workspace_account.py
index 0b1a32581a..4b4f968c8f 100644
--- a/api/tests/unit_tests/controllers/console/test_workspace_account.py
+++ b/api/tests/unit_tests/controllers/console/test_workspace_account.py
@@ -58,7 +58,7 @@ class TestChangeEmailSend:
         mock_get_change_data,
         mock_current_account,
         mock_db,
-        app,
+        app: Flask,
     ):
         mock_features.return_value = SimpleNamespace(enable_change_email=True)
         mock_account = _build_account("current@example.com", "acc1")
@@ -107,7 +107,7 @@ class TestChangeEmailSend:
         mock_get_change_data,
         mock_current_account,
         mock_db,
-        app,
+        app: Flask,
     ):
         """GHSA-4q3w-q5mc-45rq: a phase-1 token must not unlock the new-email send step."""
         from controllers.console.auth.error import InvalidTokenError
@@ -155,7 +155,7 @@ class TestChangeEmailValidity:
         mock_reset_rate,
         mock_current_account,
         mock_db,
-        app,
+        app: Flask,
     ):
         mock_features.return_value = SimpleNamespace(enable_change_email=True)
         mock_account = _build_account("user@example.com", "acc2")
@@ -214,7 +214,7 @@ class TestChangeEmailValidity:
         mock_reset_rate,
         mock_current_account,
         mock_db,
-        app,
+        app: Flask,
     ):
         mock_features.return_value = SimpleNamespace(enable_change_email=True)
         mock_current_account.return_value = (_build_account("old@example.com", "acc"), None)
@@ -267,7 +267,7 @@ class TestChangeEmailValidity:
         mock_reset_rate,
         mock_current_account,
         mock_db,
-        app,
+        app: Flask,
     ):
         """A token whose phase marker is a string but not a known transition must be rejected."""
         from controllers.console.auth.error import InvalidTokenError
@@ -316,7 +316,7 @@ class TestChangeEmailValidity:
         mock_reset_rate,
         mock_current_account,
         mock_db,
-        app,
+        app: Flask,
     ):
         """A token minted without a phase marker (e.g. a hand-crafted token) must not validate."""
         from controllers.console.auth.error import InvalidTokenError
@@ -366,7 +366,7 @@ class TestChangeEmailReset:
         mock_send_notify,
         mock_current_account,
         mock_db,
-        app,
+        app: Flask,
     ):
         mock_features.return_value = SimpleNamespace(enable_change_email=True)
         current_user = _build_account("old@example.com", "acc3")
@@ -418,7 +418,7 @@ class TestChangeEmailReset:
         mock_send_notify,
         mock_current_account,
         mock_db,
-        app,
+        app: Flask,
     ):
         """GHSA-4q3w-q5mc-45rq PoC: phase-1 token must not be usable against /reset."""
         from controllers.console.auth.error import InvalidTokenError
@@ -471,7 +471,7 @@ class TestChangeEmailReset:
         mock_send_notify,
         mock_current_account,
         mock_db,
-        app,
+        app: Flask,
     ):
         """A verified token for address A must not be replayed to change to address B."""
         from controllers.console.auth.error import InvalidTokenError
@@ -547,7 +547,7 @@ class TestAccountServiceSendChangeEmailEmail:
 class TestAccountDeletionFeedback:
     @patch("controllers.console.wraps.db")
     @patch("controllers.console.workspace.account.BillingService.update_account_deletion_feedback")
-    def test_should_normalize_feedback_email(self, mock_update, mock_db, app):
+    def test_should_normalize_feedback_email(self, mock_update, mock_db, app: Flask):
         with app.test_request_context(
             "/account/delete/feedback",
             method="POST",
@@ -563,7 +563,7 @@ class TestCheckEmailUnique:
     @patch("controllers.console.wraps.db")
     @patch("controllers.console.workspace.account.AccountService.check_email_unique")
     @patch("controllers.console.workspace.account.AccountService.is_account_in_freeze")
-    def test_should_normalize_email(self, mock_is_freeze, mock_check_unique, mock_db, app):
+    def test_should_normalize_email(self, mock_is_freeze, mock_check_unique, mock_db, app: Flask):
         mock_is_freeze.return_value = False
         mock_check_unique.return_value = True
 
diff --git a/api/tests/unit_tests/controllers/console/test_workspace_members.py b/api/tests/unit_tests/controllers/console/test_workspace_members.py
index 811bf5b1e7..412d6a6c52 100644
--- a/api/tests/unit_tests/controllers/console/test_workspace_members.py
+++ b/api/tests/unit_tests/controllers/console/test_workspace_members.py
@@ -43,7 +43,7 @@ class TestMemberInviteEmailApi:
         mock_current_account,
         mock_invite_member,
         mock_get_features,
-        app,
+        app: Flask,
     ):
         mock_get_features.return_value = _build_feature_flags()
         mock_invite_member.return_value = "token-abc"
diff --git a/api/tests/unit_tests/controllers/console/workspace/test_accounts.py b/api/tests/unit_tests/controllers/console/workspace/test_accounts.py
index bbe9d09521..df0d2bda49 100644
--- a/api/tests/unit_tests/controllers/console/workspace/test_accounts.py
+++ b/api/tests/unit_tests/controllers/console/workspace/test_accounts.py
@@ -1,6 +1,7 @@
 from unittest.mock import MagicMock, PropertyMock, patch
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import NotFound
 
 from controllers.console import console_ns
@@ -41,7 +42,7 @@ def unwrap(func):
 
 
 class TestAccountInitApi:
-    def test_init_success(self, app):
+    def test_init_success(self, app: Flask):
         api = AccountInitApi()
         method = unwrap(api.post)
 
@@ -64,7 +65,7 @@ class TestAccountInitApi:
 
         assert resp["result"] == "success"
 
-    def test_init_already_initialized(self, app):
+    def test_init_already_initialized(self, app: Flask):
         api = AccountInitApi()
         method = unwrap(api.post)
 
@@ -79,7 +80,7 @@ class TestAccountInitApi:
 
 
 class TestAccountProfileApi:
-    def test_get_profile_success(self, app):
+    def test_get_profile_success(self, app: Flask):
         api = AccountProfileApi()
         method = unwrap(api.get)
 
@@ -113,7 +114,7 @@ class TestAccountUpdateApis:
             (AccountTimezoneApi, {"timezone": "UTC"}),
         ],
     )
-    def test_update_success(self, app, api_cls, payload):
+    def test_update_success(self, app: Flask, api_cls, payload):
         api = api_cls()
         method = unwrap(api.post)
 
@@ -140,7 +141,7 @@ class TestAccountUpdateApis:
 class TestAccountAvatarApiGet:
     """GET /account/avatar must not sign arbitrary upload_file IDs (IDOR)."""
 
-    def test_get_avatar_signed_url_when_upload_owned_by_current_account(self, app):
+    def test_get_avatar_signed_url_when_upload_owned_by_current_account(self, app: Flask):
         api = AccountAvatarApi()
         method = unwrap(api.get)
 
@@ -172,7 +173,7 @@ class TestAccountAvatarApiGet:
         assert result == {"avatar_url": "https://signed/example"}
         sign_mock.assert_called_once_with(upload_file_id=file_id)
 
-    def test_get_avatar_not_found_when_upload_created_by_other_account_same_tenant(self, app):
+    def test_get_avatar_not_found_when_upload_created_by_other_account_same_tenant(self, app: Flask):
         api = AccountAvatarApi()
         method = unwrap(api.get)
 
@@ -204,7 +205,7 @@ class TestAccountAvatarApiGet:
 
         sign_mock.assert_not_called()
 
-    def test_get_avatar_not_found_when_upload_belongs_to_other_tenant(self, app):
+    def test_get_avatar_not_found_when_upload_belongs_to_other_tenant(self, app: Flask):
         api = AccountAvatarApi()
         method = unwrap(api.get)
 
@@ -236,7 +237,7 @@ class TestAccountAvatarApiGet:
 
         sign_mock.assert_not_called()
 
-    def test_get_avatar_https_pass_through_without_signing(self, app):
+    def test_get_avatar_https_pass_through_without_signing(self, app: Flask):
         api = AccountAvatarApi()
         method = unwrap(api.get)
 
@@ -263,7 +264,7 @@ class TestAccountAvatarApiGet:
 
 
 class TestAccountPasswordApi:
-    def test_password_success(self, app):
+    def test_password_success(self, app: Flask):
         api = AccountPasswordApi()
         method = unwrap(api.post)
 
@@ -292,7 +293,7 @@ class TestAccountPasswordApi:
 
         assert result["id"] == "u1"
 
-    def test_password_wrong_current(self, app):
+    def test_password_wrong_current(self, app: Flask):
         api = AccountPasswordApi()
         method = unwrap(api.post)
 
@@ -317,7 +318,7 @@ class TestAccountPasswordApi:
 
 
 class TestAccountIntegrateApi:
-    def test_get_integrates(self, app):
+    def test_get_integrates(self, app: Flask):
         api = AccountIntegrateApi()
         method = unwrap(api.get)
 
@@ -336,7 +337,7 @@ class TestAccountIntegrateApi:
 
 
 class TestAccountDeleteApi:
-    def test_delete_verify_success(self, app):
+    def test_delete_verify_success(self, app: Flask):
         api = AccountDeleteVerifyApi()
         method = unwrap(api.get)
 
@@ -358,7 +359,7 @@ class TestAccountDeleteApi:
 
         assert result["result"] == "success"
 
-    def test_delete_invalid_code(self, app):
+    def test_delete_invalid_code(self, app: Flask):
         api = AccountDeleteApi()
         method = unwrap(api.post)
 
@@ -379,7 +380,7 @@ class TestAccountDeleteApi:
 
 
 class TestChangeEmailApis:
-    def test_check_email_code_invalid(self, app):
+    def test_check_email_code_invalid(self, app: Flask):
         api = ChangeEmailCheckApi()
         method = unwrap(api.post)
 
@@ -405,7 +406,7 @@ class TestChangeEmailApis:
             with pytest.raises(EmailCodeError):
                 method(api)
 
-    def test_reset_email_already_used(self, app):
+    def test_reset_email_already_used(self, app: Flask):
         api = ChangeEmailResetApi()
         method = unwrap(api.post)
 
@@ -427,7 +428,7 @@ class TestChangeEmailApis:
 
 
 class TestCheckEmailUniqueApi:
-    def test_email_unique_success(self, app):
+    def test_email_unique_success(self, app: Flask):
         api = CheckEmailUnique()
         method = unwrap(api.post)
 
@@ -448,7 +449,7 @@ class TestCheckEmailUniqueApi:
 
         assert result["result"] == "success"
 
-    def test_email_in_freeze(self, app):
+    def test_email_in_freeze(self, app: Flask):
         api = CheckEmailUnique()
         method = unwrap(api.post)
 
diff --git a/api/tests/unit_tests/controllers/console/workspace/test_agent_providers.py b/api/tests/unit_tests/controllers/console/workspace/test_agent_providers.py
index b4e03f681d..eb0ca15d2e 100644
--- a/api/tests/unit_tests/controllers/console/workspace/test_agent_providers.py
+++ b/api/tests/unit_tests/controllers/console/workspace/test_agent_providers.py
@@ -1,6 +1,7 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
+from flask import Flask
 
 from controllers.console.error import AccountNotFound
 from controllers.console.workspace.agent_providers import (
@@ -16,7 +17,7 @@ def unwrap(func):
 
 
 class TestAgentProviderListApi:
-    def test_get_success(self, app):
+    def test_get_success(self, app: Flask):
         api = AgentProviderListApi()
         method = unwrap(api.get)
 
@@ -39,7 +40,7 @@ class TestAgentProviderListApi:
 
         assert result == providers
 
-    def test_get_empty_list(self, app):
+    def test_get_empty_list(self, app: Flask):
         api = AgentProviderListApi()
         method = unwrap(api.get)
 
@@ -61,7 +62,7 @@ class TestAgentProviderListApi:
 
         assert result == []
 
-    def test_get_account_not_found(self, app):
+    def test_get_account_not_found(self, app: Flask):
         api = AgentProviderListApi()
         method = unwrap(api.get)
 
@@ -77,7 +78,7 @@ class TestAgentProviderListApi:
 
 
 class TestAgentProviderApi:
-    def test_get_success(self, app):
+    def test_get_success(self, app: Flask):
         api = AgentProviderApi()
         method = unwrap(api.get)
 
@@ -101,7 +102,7 @@ class TestAgentProviderApi:
 
         assert result == provider_data
 
-    def test_get_provider_not_found(self, app):
+    def test_get_provider_not_found(self, app: Flask):
         api = AgentProviderApi()
         method = unwrap(api.get)
 
@@ -124,7 +125,7 @@ class TestAgentProviderApi:
 
         assert result is None
 
-    def test_get_account_not_found(self, app):
+    def test_get_account_not_found(self, app: Flask):
         api = AgentProviderApi()
         method = unwrap(api.get)
 
diff --git a/api/tests/unit_tests/controllers/console/workspace/test_endpoint.py b/api/tests/unit_tests/controllers/console/workspace/test_endpoint.py
index 0b3d7ef6d7..ed7b2d606f 100644
--- a/api/tests/unit_tests/controllers/console/workspace/test_endpoint.py
+++ b/api/tests/unit_tests/controllers/console/workspace/test_endpoint.py
@@ -1,6 +1,7 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
+from flask import Flask
 
 from controllers.console import console_ns
 from controllers.console.workspace.endpoint import (
@@ -39,7 +40,7 @@ def patch_current_account(user_and_tenant):
 
 @pytest.mark.usefixtures("patch_current_account")
 class TestEndpointCollectionApi:
-    def test_create_success(self, app):
+    def test_create_success(self, app: Flask):
         api = EndpointCollectionApi()
         method = unwrap(api.post)
 
@@ -57,7 +58,7 @@ class TestEndpointCollectionApi:
 
         assert result["success"] is True
 
-    def test_create_permission_denied(self, app):
+    def test_create_permission_denied(self, app: Flask):
         api = EndpointCollectionApi()
         method = unwrap(api.post)
 
@@ -77,7 +78,7 @@ class TestEndpointCollectionApi:
             with pytest.raises(ValueError):
                 method(api)
 
-    def test_create_validation_error(self, app):
+    def test_create_validation_error(self, app: Flask):
         api = EndpointCollectionApi()
         method = unwrap(api.post)
 
@@ -96,7 +97,7 @@ class TestEndpointCollectionApi:
 
 @pytest.mark.usefixtures("patch_current_account")
 class TestDeprecatedEndpointCreateApi:
-    def test_create_success(self, app):
+    def test_create_success(self, app: Flask):
         api = DeprecatedEndpointCreateApi()
         method = unwrap(api.post)
 
@@ -117,7 +118,7 @@ class TestDeprecatedEndpointCreateApi:
 
 @pytest.mark.usefixtures("patch_current_account")
 class TestEndpointListApi:
-    def test_list_success(self, app):
+    def test_list_success(self, app: Flask):
         api = EndpointListApi()
         method = unwrap(api.get)
 
@@ -130,7 +131,7 @@ class TestEndpointListApi:
         assert "endpoints" in result
         assert len(result["endpoints"]) == 1
 
-    def test_list_invalid_query(self, app):
+    def test_list_invalid_query(self, app: Flask):
         api = EndpointListApi()
         method = unwrap(api.get)
 
@@ -143,7 +144,7 @@ class TestEndpointListApi:
 
 @pytest.mark.usefixtures("patch_current_account")
 class TestEndpointListForSinglePluginApi:
-    def test_list_for_plugin_success(self, app):
+    def test_list_for_plugin_success(self, app: Flask):
         api = EndpointListForSinglePluginApi()
         method = unwrap(api.get)
 
@@ -158,7 +159,7 @@ class TestEndpointListForSinglePluginApi:
 
         assert "endpoints" in result
 
-    def test_list_for_plugin_missing_param(self, app):
+    def test_list_for_plugin_missing_param(self, app: Flask):
         api = EndpointListForSinglePluginApi()
         method = unwrap(api.get)
 
@@ -171,7 +172,7 @@ class TestEndpointListForSinglePluginApi:
 
 @pytest.mark.usefixtures("patch_current_account")
 class TestEndpointItemApi:
-    def test_delete_success(self, app):
+    def test_delete_success(self, app: Flask):
         api = EndpointItemApi()
         method = unwrap(api.delete)
 
@@ -187,7 +188,7 @@ class TestEndpointItemApi:
         assert result["success"] is True
         mock_delete.assert_called_once_with(tenant_id="t1", user_id="u1", endpoint_id="e1")
 
-    def test_delete_service_failure(self, app):
+    def test_delete_service_failure(self, app: Flask):
         api = EndpointItemApi()
         method = unwrap(api.delete)
 
@@ -199,7 +200,7 @@ class TestEndpointItemApi:
 
         assert result["success"] is False
 
-    def test_update_success(self, app):
+    def test_update_success(self, app: Flask):
         api = EndpointItemApi()
         method = unwrap(api.patch)
 
@@ -226,7 +227,7 @@ class TestEndpointItemApi:
             settings={"x": 1},
         )
 
-    def test_update_validation_error(self, app):
+    def test_update_validation_error(self, app: Flask):
         api = EndpointItemApi()
         method = unwrap(api.patch)
 
@@ -238,7 +239,7 @@ class TestEndpointItemApi:
             with pytest.raises(ValueError):
                 method(api, "e1")
 
-    def test_update_service_failure(self, app):
+    def test_update_service_failure(self, app: Flask):
         api = EndpointItemApi()
         method = unwrap(api.patch)
 
@@ -258,7 +259,7 @@ class TestEndpointItemApi:
 
 @pytest.mark.usefixtures("patch_current_account")
 class TestDeprecatedEndpointDeleteApi:
-    def test_delete_success(self, app):
+    def test_delete_success(self, app: Flask):
         api = DeprecatedEndpointDeleteApi()
         method = unwrap(api.post)
 
@@ -272,7 +273,7 @@ class TestDeprecatedEndpointDeleteApi:
 
         assert result["success"] is True
 
-    def test_delete_invalid_payload(self, app):
+    def test_delete_invalid_payload(self, app: Flask):
         api = DeprecatedEndpointDeleteApi()
         method = unwrap(api.post)
 
@@ -282,7 +283,7 @@ class TestDeprecatedEndpointDeleteApi:
             with pytest.raises(ValueError):
                 method(api)
 
-    def test_delete_service_failure(self, app):
+    def test_delete_service_failure(self, app: Flask):
         api = DeprecatedEndpointDeleteApi()
         method = unwrap(api.post)
 
@@ -299,7 +300,7 @@ class TestDeprecatedEndpointDeleteApi:
 
 @pytest.mark.usefixtures("patch_current_account")
 class TestDeprecatedEndpointUpdateApi:
-    def test_update_success(self, app):
+    def test_update_success(self, app: Flask):
         api = DeprecatedEndpointUpdateApi()
         method = unwrap(api.post)
 
@@ -317,7 +318,7 @@ class TestDeprecatedEndpointUpdateApi:
 
         assert result["success"] is True
 
-    def test_update_validation_error(self, app):
+    def test_update_validation_error(self, app: Flask):
         api = DeprecatedEndpointUpdateApi()
         method = unwrap(api.post)
 
@@ -329,7 +330,7 @@ class TestDeprecatedEndpointUpdateApi:
             with pytest.raises(ValueError):
                 method(api)
 
-    def test_update_service_failure(self, app):
+    def test_update_service_failure(self, app: Flask):
         api = DeprecatedEndpointUpdateApi()
         method = unwrap(api.post)
 
@@ -380,7 +381,7 @@ class TestEndpointRouteMetadata:
 
 @pytest.mark.usefixtures("patch_current_account")
 class TestEndpointEnableApi:
-    def test_enable_success(self, app):
+    def test_enable_success(self, app: Flask):
         api = EndpointEnableApi()
         method = unwrap(api.post)
 
@@ -394,7 +395,7 @@ class TestEndpointEnableApi:
 
         assert result["success"] is True
 
-    def test_enable_invalid_payload(self, app):
+    def test_enable_invalid_payload(self, app: Flask):
         api = EndpointEnableApi()
         method = unwrap(api.post)
 
@@ -404,7 +405,7 @@ class TestEndpointEnableApi:
             with pytest.raises(ValueError):
                 method(api)
 
-    def test_enable_service_failure(self, app):
+    def test_enable_service_failure(self, app: Flask):
         api = EndpointEnableApi()
         method = unwrap(api.post)
 
@@ -421,7 +422,7 @@ class TestEndpointEnableApi:
 
 @pytest.mark.usefixtures("patch_current_account")
 class TestEndpointDisableApi:
-    def test_disable_success(self, app):
+    def test_disable_success(self, app: Flask):
         api = EndpointDisableApi()
         method = unwrap(api.post)
 
@@ -435,7 +436,7 @@ class TestEndpointDisableApi:
 
         assert result["success"] is True
 
-    def test_disable_invalid_payload(self, app):
+    def test_disable_invalid_payload(self, app: Flask):
         api = EndpointDisableApi()
         method = unwrap(api.post)
 
diff --git a/api/tests/unit_tests/controllers/console/workspace/test_members.py b/api/tests/unit_tests/controllers/console/workspace/test_members.py
index 718b57ba6b..0788ff603c 100644
--- a/api/tests/unit_tests/controllers/console/workspace/test_members.py
+++ b/api/tests/unit_tests/controllers/console/workspace/test_members.py
@@ -1,6 +1,7 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import HTTPException
 
 import services
@@ -34,7 +35,7 @@ def unwrap(func):
 
 
 class TestMemberListApi:
-    def test_get_success(self, app):
+    def test_get_success(self, app: Flask):
         api = MemberListApi()
         method = unwrap(api.get)
 
@@ -59,7 +60,7 @@ class TestMemberListApi:
         assert status == 200
         assert len(result["accounts"]) == 1
 
-    def test_get_no_tenant(self, app):
+    def test_get_no_tenant(self, app: Flask):
         api = MemberListApi()
         method = unwrap(api.get)
 
@@ -74,7 +75,7 @@ class TestMemberListApi:
 
 
 class TestMemberInviteEmailApi:
-    def test_invite_success(self, app):
+    def test_invite_success(self, app: Flask):
         api = MemberInviteEmailApi()
         method = unwrap(api.post)
 
@@ -101,7 +102,7 @@ class TestMemberInviteEmailApi:
         assert status == 201
         assert result["result"] == "success"
 
-    def test_invite_limit_exceeded(self, app):
+    def test_invite_limit_exceeded(self, app: Flask):
         api = MemberInviteEmailApi()
         method = unwrap(api.post)
 
@@ -123,7 +124,7 @@ class TestMemberInviteEmailApi:
             with pytest.raises(WorkspaceMembersLimitExceeded):
                 method(api)
 
-    def test_invite_already_member(self, app):
+    def test_invite_already_member(self, app: Flask):
         api = MemberInviteEmailApi()
         method = unwrap(api.post)
 
@@ -151,7 +152,7 @@ class TestMemberInviteEmailApi:
 
         assert result["invitation_results"][0]["status"] == "success"
 
-    def test_invite_invalid_role(self, app):
+    def test_invite_invalid_role(self, app: Flask):
         api = MemberInviteEmailApi()
         method = unwrap(api.post)
 
@@ -166,7 +167,7 @@ class TestMemberInviteEmailApi:
         assert status == 400
         assert result["code"] == "invalid-role"
 
-    def test_invite_generic_exception(self, app):
+    def test_invite_generic_exception(self, app: Flask):
         api = MemberInviteEmailApi()
         method = unwrap(api.post)
 
@@ -196,7 +197,7 @@ class TestMemberInviteEmailApi:
 
 
 class TestMemberCancelInviteApi:
-    def test_cancel_success(self, app):
+    def test_cancel_success(self, app: Flask):
         api = MemberCancelInviteApi()
         method = unwrap(api.delete)
 
@@ -216,7 +217,7 @@ class TestMemberCancelInviteApi:
         assert status == 200
         assert result["result"] == "success"
 
-    def test_cancel_not_found(self, app):
+    def test_cancel_not_found(self, app: Flask):
         api = MemberCancelInviteApi()
         method = unwrap(api.delete)
 
@@ -233,7 +234,7 @@ class TestMemberCancelInviteApi:
             with pytest.raises(HTTPException):
                 method(api, "x")
 
-    def test_cancel_cannot_operate_self(self, app):
+    def test_cancel_cannot_operate_self(self, app: Flask):
         api = MemberCancelInviteApi()
         method = unwrap(api.delete)
 
@@ -255,7 +256,7 @@ class TestMemberCancelInviteApi:
 
         assert status == 400
 
-    def test_cancel_no_permission(self, app):
+    def test_cancel_no_permission(self, app: Flask):
         api = MemberCancelInviteApi()
         method = unwrap(api.delete)
 
@@ -277,7 +278,7 @@ class TestMemberCancelInviteApi:
 
         assert status == 403
 
-    def test_cancel_member_not_in_tenant(self, app):
+    def test_cancel_member_not_in_tenant(self, app: Flask):
         api = MemberCancelInviteApi()
         method = unwrap(api.delete)
 
@@ -301,7 +302,7 @@ class TestMemberCancelInviteApi:
 
 
 class TestMemberUpdateRoleApi:
-    def test_update_success(self, app):
+    def test_update_success(self, app: Flask):
         api = MemberUpdateRoleApi()
         method = unwrap(api.put)
 
@@ -324,7 +325,7 @@ class TestMemberUpdateRoleApi:
 
         assert result["result"] == "success"
 
-    def test_update_invalid_role(self, app):
+    def test_update_invalid_role(self, app: Flask):
         api = MemberUpdateRoleApi()
         method = unwrap(api.put)
 
@@ -335,7 +336,7 @@ class TestMemberUpdateRoleApi:
 
         assert status == 400
 
-    def test_update_member_not_found(self, app):
+    def test_update_member_not_found(self, app: Flask):
         api = MemberUpdateRoleApi()
         method = unwrap(api.put)
 
@@ -354,7 +355,7 @@ class TestMemberUpdateRoleApi:
 
 
 class TestDatasetOperatorMemberListApi:
-    def test_get_success(self, app):
+    def test_get_success(self, app: Flask):
         api = DatasetOperatorMemberListApi()
         method = unwrap(api.get)
 
@@ -381,7 +382,7 @@ class TestDatasetOperatorMemberListApi:
         assert status == 200
         assert len(result["accounts"]) == 1
 
-    def test_get_no_tenant(self, app):
+    def test_get_no_tenant(self, app: Flask):
         api = DatasetOperatorMemberListApi()
         method = unwrap(api.get)
 
@@ -396,7 +397,7 @@ class TestDatasetOperatorMemberListApi:
 
 
 class TestSendOwnerTransferEmailApi:
-    def test_send_success(self, app):
+    def test_send_success(self, app: Flask):
         api = SendOwnerTransferEmailApi()
         method = unwrap(api.post)
 
@@ -419,7 +420,7 @@ class TestSendOwnerTransferEmailApi:
 
         assert result["result"] == "success"
 
-    def test_send_ip_limit(self, app):
+    def test_send_ip_limit(self, app: Flask):
         api = SendOwnerTransferEmailApi()
         method = unwrap(api.post)
 
@@ -433,7 +434,7 @@ class TestSendOwnerTransferEmailApi:
             with pytest.raises(EmailSendIpLimitError):
                 method(api)
 
-    def test_send_not_owner(self, app):
+    def test_send_not_owner(self, app: Flask):
         api = SendOwnerTransferEmailApi()
         method = unwrap(api.post)
 
@@ -452,7 +453,7 @@ class TestSendOwnerTransferEmailApi:
 
 
 class TestOwnerTransferCheckApi:
-    def test_check_invalid_code(self, app):
+    def test_check_invalid_code(self, app: Flask):
         api = OwnerTransferCheckApi()
         method = unwrap(api.post)
 
@@ -477,7 +478,7 @@ class TestOwnerTransferCheckApi:
             with pytest.raises(EmailCodeError):
                 method(api)
 
-    def test_rate_limited(self, app):
+    def test_rate_limited(self, app: Flask):
         api = OwnerTransferCheckApi()
         method = unwrap(api.post)
 
@@ -498,7 +499,7 @@ class TestOwnerTransferCheckApi:
             with pytest.raises(OwnerTransferLimitError):
                 method(api)
 
-    def test_invalid_token(self, app):
+    def test_invalid_token(self, app: Flask):
         api = OwnerTransferCheckApi()
         method = unwrap(api.post)
 
@@ -520,7 +521,7 @@ class TestOwnerTransferCheckApi:
             with pytest.raises(InvalidTokenError):
                 method(api)
 
-    def test_invalid_email(self, app):
+    def test_invalid_email(self, app: Flask):
         api = OwnerTransferCheckApi()
         method = unwrap(api.post)
 
@@ -547,7 +548,7 @@ class TestOwnerTransferCheckApi:
 
 
 class TestOwnerTransferApi:
-    def test_transfer_self(self, app):
+    def test_transfer_self(self, app: Flask):
         api = OwnerTransfer()
         method = unwrap(api.post)
 
@@ -564,7 +565,7 @@ class TestOwnerTransferApi:
             with pytest.raises(CannotTransferOwnerToSelfError):
                 method(api, "1")
 
-    def test_invalid_token(self, app):
+    def test_invalid_token(self, app: Flask):
         api = OwnerTransfer()
         method = unwrap(api.post)
 
@@ -582,7 +583,7 @@ class TestOwnerTransferApi:
             with pytest.raises(InvalidTokenError):
                 method(api, "2")
 
-    def test_member_not_in_tenant(self, app):
+    def test_member_not_in_tenant(self, app: Flask):
         api = OwnerTransfer()
         method = unwrap(api.post)
 
diff --git a/api/tests/unit_tests/controllers/console/workspace/test_model_providers.py b/api/tests/unit_tests/controllers/console/workspace/test_model_providers.py
index 168479af1e..e836a3cc55 100644
--- a/api/tests/unit_tests/controllers/console/workspace/test_model_providers.py
+++ b/api/tests/unit_tests/controllers/console/workspace/test_model_providers.py
@@ -1,6 +1,7 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
+from flask import Flask
 from pydantic_core import ValidationError
 from werkzeug.exceptions import Forbidden
 
@@ -26,7 +27,7 @@ def unwrap(func):
 
 
 class TestModelProviderListApi:
-    def test_get_success(self, app):
+    def test_get_success(self, app: Flask):
         api = ModelProviderListApi()
         method = unwrap(api.get)
 
@@ -47,7 +48,7 @@ class TestModelProviderListApi:
 
 
 class TestModelProviderCredentialApi:
-    def test_get_success(self, app):
+    def test_get_success(self, app: Flask):
         api = ModelProviderCredentialApi()
         method = unwrap(api.get)
 
@@ -66,7 +67,7 @@ class TestModelProviderCredentialApi:
 
         assert "credentials" in result
 
-    def test_get_invalid_uuid(self, app):
+    def test_get_invalid_uuid(self, app: Flask):
         api = ModelProviderCredentialApi()
         method = unwrap(api.get)
 
@@ -80,7 +81,7 @@ class TestModelProviderCredentialApi:
             with pytest.raises(ValidationError):
                 method(api, provider="openai")
 
-    def test_post_create_success(self, app):
+    def test_post_create_success(self, app: Flask):
         api = ModelProviderCredentialApi()
         method = unwrap(api.post)
 
@@ -102,7 +103,7 @@ class TestModelProviderCredentialApi:
         assert result["result"] == "success"
         assert status == 201
 
-    def test_post_create_validation_error(self, app):
+    def test_post_create_validation_error(self, app: Flask):
         api = ModelProviderCredentialApi()
         method = unwrap(api.post)
 
@@ -122,7 +123,7 @@ class TestModelProviderCredentialApi:
             with pytest.raises(ValueError):
                 method(api, provider="openai")
 
-    def test_put_update_success(self, app):
+    def test_put_update_success(self, app: Flask):
         api = ModelProviderCredentialApi()
         method = unwrap(api.put)
 
@@ -143,7 +144,7 @@ class TestModelProviderCredentialApi:
 
         assert result["result"] == "success"
 
-    def test_put_invalid_uuid(self, app):
+    def test_put_invalid_uuid(self, app: Flask):
         api = ModelProviderCredentialApi()
         method = unwrap(api.put)
 
@@ -159,7 +160,7 @@ class TestModelProviderCredentialApi:
             with pytest.raises(ValidationError):
                 method(api, provider="openai")
 
-    def test_delete_success(self, app):
+    def test_delete_success(self, app: Flask):
         api = ModelProviderCredentialApi()
         method = unwrap(api.delete)
 
@@ -183,7 +184,7 @@ class TestModelProviderCredentialApi:
 
 
 class TestModelProviderCredentialSwitchApi:
-    def test_switch_success(self, app):
+    def test_switch_success(self, app: Flask):
         api = ModelProviderCredentialSwitchApi()
         method = unwrap(api.post)
 
@@ -204,7 +205,7 @@ class TestModelProviderCredentialSwitchApi:
 
         assert result["result"] == "success"
 
-    def test_switch_invalid_uuid(self, app):
+    def test_switch_invalid_uuid(self, app: Flask):
         api = ModelProviderCredentialSwitchApi()
         method = unwrap(api.post)
 
@@ -222,7 +223,7 @@ class TestModelProviderCredentialSwitchApi:
 
 
 class TestModelProviderValidateApi:
-    def test_validate_success(self, app):
+    def test_validate_success(self, app: Flask):
         api = ModelProviderValidateApi()
         method = unwrap(api.post)
 
@@ -243,7 +244,7 @@ class TestModelProviderValidateApi:
 
         assert result["result"] == "success"
 
-    def test_validate_failure(self, app):
+    def test_validate_failure(self, app: Flask):
         api = ModelProviderValidateApi()
         method = unwrap(api.post)
 
@@ -266,7 +267,7 @@ class TestModelProviderValidateApi:
 
 
 class TestModelProviderIconApi:
-    def test_icon_success(self, app):
+    def test_icon_success(self, app: Flask):
         api = ModelProviderIconApi()
 
         with (
@@ -280,7 +281,7 @@ class TestModelProviderIconApi:
 
         assert response.mimetype == "image/png"
 
-    def test_icon_not_found(self, app):
+    def test_icon_not_found(self, app: Flask):
         api = ModelProviderIconApi()
 
         with (
@@ -295,7 +296,7 @@ class TestModelProviderIconApi:
 
 
 class TestPreferredProviderTypeUpdateApi:
-    def test_update_success(self, app):
+    def test_update_success(self, app: Flask):
         api = PreferredProviderTypeUpdateApi()
         method = unwrap(api.post)
 
@@ -316,7 +317,7 @@ class TestPreferredProviderTypeUpdateApi:
 
         assert result["result"] == "success"
 
-    def test_invalid_enum(self, app):
+    def test_invalid_enum(self, app: Flask):
         api = PreferredProviderTypeUpdateApi()
         method = unwrap(api.post)
 
@@ -334,7 +335,7 @@ class TestPreferredProviderTypeUpdateApi:
 
 
 class TestModelProviderPaymentCheckoutUrlApi:
-    def test_checkout_success(self, app):
+    def test_checkout_success(self, app: Flask):
         api = ModelProviderPaymentCheckoutUrlApi()
         method = unwrap(api.get)
 
@@ -359,7 +360,7 @@ class TestModelProviderPaymentCheckoutUrlApi:
 
         assert "url" in result
 
-    def test_invalid_provider(self, app):
+    def test_invalid_provider(self, app: Flask):
         api = ModelProviderPaymentCheckoutUrlApi()
         method = unwrap(api.get)
 
@@ -367,7 +368,7 @@ class TestModelProviderPaymentCheckoutUrlApi:
             with pytest.raises(ValueError):
                 method(api, provider="openai")
 
-    def test_permission_denied(self, app):
+    def test_permission_denied(self, app: Flask):
         api = ModelProviderPaymentCheckoutUrlApi()
         method = unwrap(api.get)
 
diff --git a/api/tests/unit_tests/controllers/console/workspace/test_models.py b/api/tests/unit_tests/controllers/console/workspace/test_models.py
index f0d32f81fb..3c4acbab44 100644
--- a/api/tests/unit_tests/controllers/console/workspace/test_models.py
+++ b/api/tests/unit_tests/controllers/console/workspace/test_models.py
@@ -32,7 +32,7 @@ class TestDefaultModelApi:
         with (
             app.test_request_context(
                 "/",
-                query_string={"model_type": ModelType.LLM.value},
+                query_string={"model_type": ModelType.LLM},
             ),
             patch(
                 "controllers.console.workspace.models.current_account_with_tenant",
@@ -53,7 +53,7 @@ class TestDefaultModelApi:
         payload = {
             "model_settings": [
                 {
-                    "model_type": ModelType.LLM.value,
+                    "model_type": ModelType.LLM,
                     "provider": "openai",
                     "model": "gpt-4",
                 }
@@ -72,12 +72,12 @@ class TestDefaultModelApi:
 
         assert result["result"] == "success"
 
-    def test_get_returns_empty_when_no_default(self, app):
+    def test_get_returns_empty_when_no_default(self, app: Flask):
         api = DefaultModelApi()
         method = unwrap(api.get)
 
         with (
-            app.test_request_context("/", query_string={"model_type": ModelType.LLM.value}),
+            app.test_request_context("/", query_string={"model_type": ModelType.LLM}),
             patch("controllers.console.workspace.models.current_account_with_tenant", return_value=(MagicMock(), "t1")),
             patch("controllers.console.workspace.models.ModelProviderService") as service,
         ):
@@ -113,7 +113,7 @@ class TestModelProviderModelApi:
 
         payload = {
             "model": "gpt-4",
-            "model_type": ModelType.LLM.value,
+            "model_type": ModelType.LLM,
             "load_balancing": {
                 "configs": [{"weight": 1}],
                 "enabled": True,
@@ -139,7 +139,7 @@ class TestModelProviderModelApi:
 
         payload = {
             "model": "gpt-4",
-            "model_type": ModelType.LLM.value,
+            "model_type": ModelType.LLM,
         }
 
         with (
@@ -154,7 +154,7 @@ class TestModelProviderModelApi:
 
         assert status == 204
 
-    def test_get_models_returns_empty(self, app):
+    def test_get_models_returns_empty(self, app: Flask):
         api = ModelProviderModelApi()
         method = unwrap(api.get)
 
@@ -180,7 +180,7 @@ class TestModelProviderModelCredentialApi:
                 "/",
                 query_string={
                     "model": "gpt-4",
-                    "model_type": ModelType.LLM.value,
+                    "model_type": ModelType.LLM,
                 },
             ),
             patch(
@@ -208,7 +208,7 @@ class TestModelProviderModelCredentialApi:
 
         payload = {
             "model": "gpt-4",
-            "model_type": ModelType.LLM.value,
+            "model_type": ModelType.LLM,
             "credentials": {"key": "val"},
         }
 
@@ -224,12 +224,12 @@ class TestModelProviderModelCredentialApi:
 
         assert status == 201
 
-    def test_get_empty_credentials(self, app):
+    def test_get_empty_credentials(self, app: Flask):
         api = ModelProviderModelCredentialApi()
         method = unwrap(api.get)
 
         with (
-            app.test_request_context("/", query_string={"model": "gpt", "model_type": ModelType.LLM.value}),
+            app.test_request_context("/", query_string={"model": "gpt", "model_type": ModelType.LLM}),
             patch("controllers.console.workspace.models.current_account_with_tenant", return_value=(MagicMock(), "t1")),
             patch("controllers.console.workspace.models.ModelProviderService") as service,
             patch("controllers.console.workspace.models.ModelLoadBalancingService") as lb,
@@ -242,13 +242,13 @@ class TestModelProviderModelCredentialApi:
 
         assert result["credentials"] == {}
 
-    def test_delete_success(self, app):
+    def test_delete_success(self, app: Flask):
         api = ModelProviderModelCredentialApi()
         method = unwrap(api.delete)
 
         payload = {
             "model": "gpt",
-            "model_type": ModelType.LLM.value,
+            "model_type": ModelType.LLM,
             "credential_id": "123e4567-e89b-12d3-a456-426614174000",
         }
 
@@ -269,7 +269,7 @@ class TestModelProviderModelCredentialSwitchApi:
 
         payload = {
             "model": "gpt-4",
-            "model_type": ModelType.LLM.value,
+            "model_type": ModelType.LLM,
             "credential_id": "abc",
         }
 
@@ -293,7 +293,7 @@ class TestModelEnableDisableApis:
 
         payload = {
             "model": "gpt-4",
-            "model_type": ModelType.LLM.value,
+            "model_type": ModelType.LLM,
         }
 
         with (
@@ -314,7 +314,7 @@ class TestModelEnableDisableApis:
 
         payload = {
             "model": "gpt-4",
-            "model_type": ModelType.LLM.value,
+            "model_type": ModelType.LLM,
         }
 
         with (
@@ -337,7 +337,7 @@ class TestModelProviderModelValidateApi:
 
         payload = {
             "model": "gpt-4",
-            "model_type": ModelType.LLM.value,
+            "model_type": ModelType.LLM,
             "credentials": {"key": "val"},
         }
 
@@ -360,7 +360,7 @@ class TestModelProviderModelValidateApi:
 
         payload = {
             "model": model_name,
-            "model_type": ModelType.LLM.value,
+            "model_type": ModelType.LLM,
             "credentials": {},
         }
 
@@ -412,11 +412,11 @@ class TestParameterAndAvailableModels:
         ):
             service_mock.return_value.get_models_by_model_type.return_value = []
 
-            result = method(api, ModelType.LLM.value)
+            result = method(api, ModelType.LLM)
 
         assert "data" in result
 
-    def test_empty_rules(self, app):
+    def test_empty_rules(self, app: Flask):
         api = ModelProviderModelParameterRuleApi()
         method = unwrap(api.get)
 
@@ -431,7 +431,7 @@ class TestParameterAndAvailableModels:
 
         assert result["data"] == []
 
-    def test_no_models(self, app):
+    def test_no_models(self, app: Flask):
         api = ModelProviderAvailableModelApi()
         method = unwrap(api.get)
 
@@ -442,6 +442,6 @@ class TestParameterAndAvailableModels:
         ):
             service.return_value.get_models_by_model_type.return_value = []
 
-            result = method(api, ModelType.LLM.value)
+            result = method(api, ModelType.LLM)
 
         assert result["data"] == []
diff --git a/api/tests/unit_tests/controllers/console/workspace/test_plugin.py b/api/tests/unit_tests/controllers/console/workspace/test_plugin.py
index ce5fd1c466..83915a0b74 100644
--- a/api/tests/unit_tests/controllers/console/workspace/test_plugin.py
+++ b/api/tests/unit_tests/controllers/console/workspace/test_plugin.py
@@ -2,6 +2,7 @@ import io
 from unittest.mock import MagicMock, patch
 
 import pytest
+from flask import Flask
 from werkzeug.datastructures import FileStorage
 from werkzeug.exceptions import Forbidden
 
@@ -61,7 +62,7 @@ def tenant():
 
 
 class TestPluginListLatestVersionsApi:
-    def test_success(self, app):
+    def test_success(self, app: Flask):
         api = PluginListLatestVersionsApi()
         method = unwrap(api.post)
 
@@ -77,7 +78,7 @@ class TestPluginListLatestVersionsApi:
 
         assert "versions" in result
 
-    def test_daemon_error(self, app):
+    def test_daemon_error(self, app: Flask):
         api = PluginListLatestVersionsApi()
         method = unwrap(api.post)
 
@@ -95,7 +96,7 @@ class TestPluginListLatestVersionsApi:
 
 
 class TestPluginDebuggingKeyApi:
-    def test_debugging_key_success(self, app):
+    def test_debugging_key_success(self, app: Flask):
         api = PluginDebuggingKeyApi()
         method = unwrap(api.get)
 
@@ -108,7 +109,7 @@ class TestPluginDebuggingKeyApi:
 
         assert result["key"] == "k"
 
-    def test_debugging_key_error(self, app):
+    def test_debugging_key_error(self, app: Flask):
         api = PluginDebuggingKeyApi()
         method = unwrap(api.get)
 
@@ -125,7 +126,7 @@ class TestPluginDebuggingKeyApi:
 
 
 class TestPluginListApi:
-    def test_plugin_list(self, app):
+    def test_plugin_list(self, app: Flask):
         api = PluginListApi()
         method = unwrap(api.get)
 
@@ -142,7 +143,7 @@ class TestPluginListApi:
 
 
 class TestPluginIconApi:
-    def test_plugin_icon(self, app):
+    def test_plugin_icon(self, app: Flask):
         api = PluginIconApi()
         method = unwrap(api.get)
 
@@ -156,7 +157,7 @@ class TestPluginIconApi:
 
 
 class TestPluginAssetApi:
-    def test_plugin_asset(self, app):
+    def test_plugin_asset(self, app: Flask):
         api = PluginAssetApi()
         method = unwrap(api.get)
 
@@ -171,7 +172,7 @@ class TestPluginAssetApi:
 
 
 class TestPluginUploadFromPkgApi:
-    def test_upload_pkg_success(self, app):
+    def test_upload_pkg_success(self, app: Flask):
         api = PluginUploadFromPkgApi()
         method = unwrap(api.post)
 
@@ -188,7 +189,7 @@ class TestPluginUploadFromPkgApi:
 
         assert result["ok"] is True
 
-    def test_upload_pkg_too_large(self, app):
+    def test_upload_pkg_too_large(self, app: Flask):
         api = PluginUploadFromPkgApi()
         method = unwrap(api.post)
 
@@ -210,7 +211,7 @@ class TestPluginUploadFromPkgApi:
 
 
 class TestPluginInstallFromPkgApi:
-    def test_install_from_pkg(self, app):
+    def test_install_from_pkg(self, app: Flask):
         api = PluginInstallFromPkgApi()
         method = unwrap(api.post)
 
@@ -229,7 +230,7 @@ class TestPluginInstallFromPkgApi:
 
 
 class TestPluginUninstallApi:
-    def test_uninstall(self, app):
+    def test_uninstall(self, app: Flask):
         api = PluginUninstallApi()
         method = unwrap(api.post)
 
@@ -246,7 +247,7 @@ class TestPluginUninstallApi:
 
 
 class TestPluginChangePermissionApi:
-    def test_change_permission_forbidden(self, app):
+    def test_change_permission_forbidden(self, app: Flask):
         api = PluginChangePermissionApi()
         method = unwrap(api.post)
 
@@ -264,7 +265,7 @@ class TestPluginChangePermissionApi:
             with pytest.raises(Forbidden):
                 method(api)
 
-    def test_change_permission_success(self, app):
+    def test_change_permission_success(self, app: Flask):
         api = PluginChangePermissionApi()
         method = unwrap(api.post)
 
@@ -286,7 +287,7 @@ class TestPluginChangePermissionApi:
 
 
 class TestPluginFetchPermissionApi:
-    def test_fetch_permission_default(self, app):
+    def test_fetch_permission_default(self, app: Flask):
         api = PluginFetchPermissionApi()
         method = unwrap(api.get)
 
@@ -301,7 +302,7 @@ class TestPluginFetchPermissionApi:
 
 
 class TestPluginFetchDynamicSelectOptionsApi:
-    def test_fetch_dynamic_options(self, app, user):
+    def test_fetch_dynamic_options(self, app: Flask, user):
         api = PluginFetchDynamicSelectOptionsApi()
         method = unwrap(api.get)
 
@@ -319,7 +320,7 @@ class TestPluginFetchDynamicSelectOptionsApi:
 
 
 class TestPluginReadmeApi:
-    def test_fetch_readme(self, app):
+    def test_fetch_readme(self, app: Flask):
         api = PluginReadmeApi()
         method = unwrap(api.get)
 
@@ -334,7 +335,7 @@ class TestPluginReadmeApi:
 
 
 class TestPluginListInstallationsFromIdsApi:
-    def test_success(self, app):
+    def test_success(self, app: Flask):
         api = PluginListInstallationsFromIdsApi()
         method = unwrap(api.post)
 
@@ -352,7 +353,7 @@ class TestPluginListInstallationsFromIdsApi:
 
         assert "plugins" in result
 
-    def test_daemon_error(self, app):
+    def test_daemon_error(self, app: Flask):
         api = PluginListInstallationsFromIdsApi()
         method = unwrap(api.post)
 
@@ -371,7 +372,7 @@ class TestPluginListInstallationsFromIdsApi:
 
 
 class TestPluginUploadFromGithubApi:
-    def test_success(self, app):
+    def test_success(self, app: Flask):
         api = PluginUploadFromGithubApi()
         method = unwrap(api.post)
 
@@ -388,7 +389,7 @@ class TestPluginUploadFromGithubApi:
 
         assert result["ok"] is True
 
-    def test_daemon_error(self, app):
+    def test_daemon_error(self, app: Flask):
         api = PluginUploadFromGithubApi()
         method = unwrap(api.post)
 
@@ -407,7 +408,7 @@ class TestPluginUploadFromGithubApi:
 
 
 class TestPluginUploadFromBundleApi:
-    def test_success(self, app):
+    def test_success(self, app: Flask):
         api = PluginUploadFromBundleApi()
         method = unwrap(api.post)
 
@@ -430,7 +431,7 @@ class TestPluginUploadFromBundleApi:
 
         assert result["ok"] is True
 
-    def test_too_large(self, app):
+    def test_too_large(self, app: Flask):
         api = PluginUploadFromBundleApi()
         method = unwrap(api.post)
 
@@ -458,7 +459,7 @@ class TestPluginUploadFromBundleApi:
 
 
 class TestPluginInstallFromGithubApi:
-    def test_success(self, app):
+    def test_success(self, app: Flask):
         api = PluginInstallFromGithubApi()
         method = unwrap(api.post)
 
@@ -478,7 +479,7 @@ class TestPluginInstallFromGithubApi:
 
         assert result["ok"] is True
 
-    def test_daemon_error(self, app):
+    def test_daemon_error(self, app: Flask):
         api = PluginInstallFromGithubApi()
         method = unwrap(api.post)
 
@@ -502,7 +503,7 @@ class TestPluginInstallFromGithubApi:
 
 
 class TestPluginInstallFromMarketplaceApi:
-    def test_success(self, app):
+    def test_success(self, app: Flask):
         api = PluginInstallFromMarketplaceApi()
         method = unwrap(api.post)
 
@@ -520,7 +521,7 @@ class TestPluginInstallFromMarketplaceApi:
 
         assert result["ok"] is True
 
-    def test_daemon_error(self, app):
+    def test_daemon_error(self, app: Flask):
         api = PluginInstallFromMarketplaceApi()
         method = unwrap(api.post)
 
@@ -539,7 +540,7 @@ class TestPluginInstallFromMarketplaceApi:
 
 
 class TestPluginFetchMarketplacePkgApi:
-    def test_success(self, app):
+    def test_success(self, app: Flask):
         api = PluginFetchMarketplacePkgApi()
         method = unwrap(api.get)
 
@@ -552,7 +553,7 @@ class TestPluginFetchMarketplacePkgApi:
 
         assert "manifest" in result
 
-    def test_daemon_error(self, app):
+    def test_daemon_error(self, app: Flask):
         api = PluginFetchMarketplacePkgApi()
         method = unwrap(api.get)
 
@@ -569,7 +570,7 @@ class TestPluginFetchMarketplacePkgApi:
 
 
 class TestPluginFetchManifestApi:
-    def test_success(self, app):
+    def test_success(self, app: Flask):
         api = PluginFetchManifestApi()
         method = unwrap(api.get)
 
@@ -585,7 +586,7 @@ class TestPluginFetchManifestApi:
 
         assert "manifest" in result
 
-    def test_daemon_error(self, app):
+    def test_daemon_error(self, app: Flask):
         api = PluginFetchManifestApi()
         method = unwrap(api.get)
 
@@ -602,7 +603,7 @@ class TestPluginFetchManifestApi:
 
 
 class TestPluginFetchInstallTasksApi:
-    def test_success(self, app):
+    def test_success(self, app: Flask):
         api = PluginFetchInstallTasksApi()
         method = unwrap(api.get)
 
@@ -615,7 +616,7 @@ class TestPluginFetchInstallTasksApi:
 
         assert "tasks" in result
 
-    def test_daemon_error(self, app):
+    def test_daemon_error(self, app: Flask):
         api = PluginFetchInstallTasksApi()
         method = unwrap(api.get)
 
@@ -632,7 +633,7 @@ class TestPluginFetchInstallTasksApi:
 
 
 class TestPluginFetchInstallTaskApi:
-    def test_success(self, app):
+    def test_success(self, app: Flask):
         api = PluginFetchInstallTaskApi()
         method = unwrap(api.get)
 
@@ -645,7 +646,7 @@ class TestPluginFetchInstallTaskApi:
 
         assert "task" in result
 
-    def test_daemon_error(self, app):
+    def test_daemon_error(self, app: Flask):
         api = PluginFetchInstallTaskApi()
         method = unwrap(api.get)
 
@@ -662,7 +663,7 @@ class TestPluginFetchInstallTaskApi:
 
 
 class TestPluginDeleteInstallTaskApi:
-    def test_success(self, app):
+    def test_success(self, app: Flask):
         api = PluginDeleteInstallTaskApi()
         method = unwrap(api.post)
 
@@ -675,7 +676,7 @@ class TestPluginDeleteInstallTaskApi:
 
         assert result["success"] is True
 
-    def test_daemon_error(self, app):
+    def test_daemon_error(self, app: Flask):
         api = PluginDeleteInstallTaskApi()
         method = unwrap(api.post)
 
@@ -692,7 +693,7 @@ class TestPluginDeleteInstallTaskApi:
 
 
 class TestPluginDeleteAllInstallTaskItemsApi:
-    def test_success(self, app):
+    def test_success(self, app: Flask):
         api = PluginDeleteAllInstallTaskItemsApi()
         method = unwrap(api.post)
 
@@ -707,7 +708,7 @@ class TestPluginDeleteAllInstallTaskItemsApi:
 
         assert result["success"] is True
 
-    def test_daemon_error(self, app):
+    def test_daemon_error(self, app: Flask):
         api = PluginDeleteAllInstallTaskItemsApi()
         method = unwrap(api.post)
 
@@ -724,7 +725,7 @@ class TestPluginDeleteAllInstallTaskItemsApi:
 
 
 class TestPluginDeleteInstallTaskItemApi:
-    def test_success(self, app):
+    def test_success(self, app: Flask):
         api = PluginDeleteInstallTaskItemApi()
         method = unwrap(api.post)
 
@@ -737,7 +738,7 @@ class TestPluginDeleteInstallTaskItemApi:
 
         assert result["success"] is True
 
-    def test_daemon_error(self, app):
+    def test_daemon_error(self, app: Flask):
         api = PluginDeleteInstallTaskItemApi()
         method = unwrap(api.post)
 
@@ -754,7 +755,7 @@ class TestPluginDeleteInstallTaskItemApi:
 
 
 class TestPluginUpgradeFromMarketplaceApi:
-    def test_success(self, app):
+    def test_success(self, app: Flask):
         api = PluginUpgradeFromMarketplaceApi()
         method = unwrap(api.post)
 
@@ -775,7 +776,7 @@ class TestPluginUpgradeFromMarketplaceApi:
 
         assert result["ok"] is True
 
-    def test_daemon_error(self, app):
+    def test_daemon_error(self, app: Flask):
         api = PluginUpgradeFromMarketplaceApi()
         method = unwrap(api.post)
 
@@ -797,7 +798,7 @@ class TestPluginUpgradeFromMarketplaceApi:
 
 
 class TestPluginUpgradeFromGithubApi:
-    def test_success(self, app):
+    def test_success(self, app: Flask):
         api = PluginUpgradeFromGithubApi()
         method = unwrap(api.post)
 
@@ -821,7 +822,7 @@ class TestPluginUpgradeFromGithubApi:
 
         assert result["ok"] is True
 
-    def test_daemon_error(self, app):
+    def test_daemon_error(self, app: Flask):
         api = PluginUpgradeFromGithubApi()
         method = unwrap(api.post)
 
@@ -846,7 +847,7 @@ class TestPluginUpgradeFromGithubApi:
 
 
 class TestPluginFetchDynamicSelectOptionsWithCredentialsApi:
-    def test_success(self, app):
+    def test_success(self, app: Flask):
         api = PluginFetchDynamicSelectOptionsWithCredentialsApi()
         method = unwrap(api.post)
 
@@ -873,7 +874,7 @@ class TestPluginFetchDynamicSelectOptionsWithCredentialsApi:
 
         assert result["options"] == [1]
 
-    def test_daemon_error(self, app):
+    def test_daemon_error(self, app: Flask):
         api = PluginFetchDynamicSelectOptionsWithCredentialsApi()
         method = unwrap(api.post)
 
@@ -901,7 +902,7 @@ class TestPluginFetchDynamicSelectOptionsWithCredentialsApi:
 
 
 class TestPluginChangePreferencesApi:
-    def test_success(self, app):
+    def test_success(self, app: Flask):
         api = PluginChangePreferencesApi()
         method = unwrap(api.post)
 
@@ -931,7 +932,7 @@ class TestPluginChangePreferencesApi:
 
         assert result["success"] is True
 
-    def test_permission_fail(self, app):
+    def test_permission_fail(self, app: Flask):
         api = PluginChangePreferencesApi()
         method = unwrap(api.post)
 
@@ -962,7 +963,7 @@ class TestPluginChangePreferencesApi:
 
 
 class TestPluginFetchPreferencesApi:
-    def test_success(self, app):
+    def test_success(self, app: Flask):
         api = PluginFetchPreferencesApi()
         method = unwrap(api.get)
 
@@ -996,7 +997,7 @@ class TestPluginFetchPreferencesApi:
 
 
 class TestPluginAutoUpgradeExcludePluginApi:
-    def test_success(self, app):
+    def test_success(self, app: Flask):
         api = PluginAutoUpgradeExcludePluginApi()
         method = unwrap(api.post)
 
@@ -1011,7 +1012,7 @@ class TestPluginAutoUpgradeExcludePluginApi:
 
         assert result["success"] is True
 
-    def test_fail(self, app):
+    def test_fail(self, app: Flask):
         api = PluginAutoUpgradeExcludePluginApi()
         method = unwrap(api.post)
 
diff --git a/api/tests/unit_tests/controllers/console/workspace/test_workspace.py b/api/tests/unit_tests/controllers/console/workspace/test_workspace.py
index e82a29f045..0ee1877630 100644
--- a/api/tests/unit_tests/controllers/console/workspace/test_workspace.py
+++ b/api/tests/unit_tests/controllers/console/workspace/test_workspace.py
@@ -2,6 +2,7 @@ from io import BytesIO
 from unittest.mock import MagicMock, patch
 
 import pytest
+from flask import Flask
 from werkzeug.datastructures import FileStorage
 from werkzeug.exceptions import Unauthorized
 
@@ -37,7 +38,7 @@ def unwrap(func):
 
 
 class TestTenantListApi:
-    def test_get_success_saas_path(self, app):
+    def test_get_success_saas_path(self, app: Flask):
         api = TenantListApi()
         method = unwrap(api.get)
 
@@ -85,7 +86,7 @@ class TestTenantListApi:
         get_plan_bulk_mock.assert_called_once_with(["t1", "t2"])
         get_features_mock.assert_not_called()
 
-    def test_get_saas_path_partial_fallback_does_not_gate_plan_on_billing_enabled(self, app):
+    def test_get_saas_path_partial_fallback_does_not_gate_plan_on_billing_enabled(self, app: Flask):
         """Bulk omits a tenant: resolve plan via subscription.plan only; billing.enabled is not used.
 
         billing.enabled is mocked False to prove the endpoint does not gate on it for this path
@@ -140,7 +141,7 @@ class TestTenantListApi:
         get_plan_bulk_mock.assert_called_once_with(["t1", "t2"])
         get_features_mock.assert_called_once_with("t2")
 
-    def test_get_saas_path_falls_back_to_legacy_feature_path_on_bulk_error(self, app):
+    def test_get_saas_path_falls_back_to_legacy_feature_path_on_bulk_error(self, app: Flask):
         """Test fallback to FeatureService when bulk billing returns empty result.
 
         BillingService.get_plan_bulk catches exceptions internally and returns empty dict,
@@ -197,7 +198,7 @@ class TestTenantListApi:
         assert get_features_mock.call_count == 2
         logger_warning_mock.assert_called_once()
 
-    def test_get_billing_disabled_community_path(self, app):
+    def test_get_billing_disabled_community_path(self, app: Flask):
         api = TenantListApi()
         method = unwrap(api.get)
 
@@ -236,7 +237,7 @@ class TestTenantListApi:
         assert result["workspaces"][0]["plan"] == CloudPlan.SANDBOX
         get_features_mock.assert_called_once_with("t1")
 
-    def test_get_enterprise_only_skips_feature_service(self, app):
+    def test_get_enterprise_only_skips_feature_service(self, app: Flask):
         api = TenantListApi()
         method = unwrap(api.get)
 
@@ -276,7 +277,7 @@ class TestTenantListApi:
         assert result["workspaces"][1]["current"] is True
         get_features_mock.assert_not_called()
 
-    def test_get_enterprise_only_with_empty_tenants(self, app):
+    def test_get_enterprise_only_with_empty_tenants(self, app: Flask):
         api = TenantListApi()
         method = unwrap(api.get)
 
@@ -302,17 +303,12 @@ class TestTenantListApi:
 
 
 class TestWorkspaceListApi:
-    def test_get_success(self, app):
+    def test_get_success(self, app: Flask):
         api = WorkspaceListApi()
         method = unwrap(api.get)
 
         tenant = MagicMock(id="t1", name="T", status="active", created_at=naive_utc_now())
-
-        paginate_result = MagicMock(
-            items=[tenant],
-            has_next=False,
-            total=1,
-        )
+        paginate_result = MagicMock(items=[tenant], has_next=False, total=1)
 
         with (
             app.test_request_context("/all-workspaces", query_string={"page": 1, "limit": 20}),
@@ -324,29 +320,16 @@ class TestWorkspaceListApi:
         assert result["total"] == 1
         assert result["has_more"] is False
 
-    def test_get_has_next_true(self, app):
+    def test_get_has_next_true(self, app: Flask):
         api = WorkspaceListApi()
         method = unwrap(api.get)
 
-        tenant = MagicMock(
-            id="t1",
-            name="T",
-            status="active",
-            created_at=naive_utc_now(),
-        )
-
-        paginate_result = MagicMock(
-            items=[tenant],
-            has_next=True,
-            total=10,
-        )
+        tenant = MagicMock(id="t1", name="T", status="active", created_at=naive_utc_now())
+        paginate_result = MagicMock(items=[tenant], has_next=True, total=10)
 
         with (
             app.test_request_context("/all-workspaces", query_string={"page": 1, "limit": 1}),
-            patch(
-                "controllers.console.workspace.workspace.db.paginate",
-                return_value=paginate_result,
-            ),
+            patch("controllers.console.workspace.workspace.db.paginate", return_value=paginate_result),
         ):
             result, status = method(api)
 
@@ -355,7 +338,7 @@ class TestWorkspaceListApi:
 
 
 class TestTenantApi:
-    def test_post_active_tenant(self, app):
+    def test_post_active_tenant(self, app: Flask):
         api = TenantApi()
         method = unwrap(api.post)
 
@@ -375,7 +358,7 @@ class TestTenantApi:
         assert status == 200
         assert result["id"] == "t1"
 
-    def test_post_archived_with_switch(self, app):
+    def test_post_archived_with_switch(self, app: Flask):
         api = TenantApi()
         method = unwrap(api.post)
 
@@ -397,7 +380,7 @@ class TestTenantApi:
 
         assert result["id"] == "new"
 
-    def test_post_archived_no_tenant(self, app):
+    def test_post_archived_no_tenant(self, app: Flask):
         api = TenantApi()
         method = unwrap(api.post)
 
@@ -411,7 +394,7 @@ class TestTenantApi:
             with pytest.raises(Unauthorized):
                 method(api)
 
-    def test_post_info_path(self, app):
+    def test_post_info_path(self, app: Flask):
         api = TenantApi()
         method = unwrap(api.post)
 
@@ -454,7 +437,7 @@ class TestTenantInfoResponse:
 
 
 class TestSwitchWorkspaceApi:
-    def test_switch_success(self, app):
+    def test_switch_success(self, app: Flask):
         api = SwitchWorkspaceApi()
         method = unwrap(api.post)
 
@@ -477,7 +460,7 @@ class TestSwitchWorkspaceApi:
 
         assert result["result"] == "success"
 
-    def test_switch_not_linked(self, app):
+    def test_switch_not_linked(self, app: Flask):
         api = SwitchWorkspaceApi()
         method = unwrap(api.post)
 
@@ -493,7 +476,7 @@ class TestSwitchWorkspaceApi:
             with pytest.raises(AccountNotLinkTenantError):
                 method(api)
 
-    def test_switch_tenant_not_found(self, app):
+    def test_switch_tenant_not_found(self, app: Flask):
         api = SwitchWorkspaceApi()
         method = unwrap(api.post)
 
@@ -515,7 +498,7 @@ class TestSwitchWorkspaceApi:
 
 
 class TestCustomConfigWorkspaceApi:
-    def test_post_success(self, app):
+    def test_post_success(self, app: Flask):
         api = CustomConfigWorkspaceApi()
         method = unwrap(api.post)
 
@@ -538,7 +521,7 @@ class TestCustomConfigWorkspaceApi:
 
         assert result["result"] == "success"
 
-    def test_logo_fallback(self, app):
+    def test_logo_fallback(self, app: Flask):
         api = CustomConfigWorkspaceApi()
         method = unwrap(api.post)
 
@@ -569,7 +552,7 @@ class TestCustomConfigWorkspaceApi:
 
 
 class TestWebappLogoWorkspaceApi:
-    def test_no_file(self, app):
+    def test_no_file(self, app: Flask):
         api = WebappLogoWorkspaceApi()
         method = unwrap(api.post)
 
@@ -582,7 +565,7 @@ class TestWebappLogoWorkspaceApi:
             with pytest.raises(NoFileUploadedError):
                 method(api)
 
-    def test_too_many_files(self, app):
+    def test_too_many_files(self, app: Flask):
         api = WebappLogoWorkspaceApi()
         method = unwrap(api.post)
 
@@ -601,7 +584,7 @@ class TestWebappLogoWorkspaceApi:
             with pytest.raises(TooManyFilesError):
                 method(api)
 
-    def test_invalid_extension(self, app):
+    def test_invalid_extension(self, app: Flask):
         api = WebappLogoWorkspaceApi()
         method = unwrap(api.post)
 
@@ -616,7 +599,7 @@ class TestWebappLogoWorkspaceApi:
             with pytest.raises(UnsupportedFileTypeError):
                 method(api)
 
-    def test_upload_success(self, app):
+    def test_upload_success(self, app: Flask):
         api = WebappLogoWorkspaceApi()
         method = unwrap(api.post)
 
@@ -648,7 +631,7 @@ class TestWebappLogoWorkspaceApi:
         assert status == 201
         assert result["id"] == "file1"
 
-    def test_filename_missing(self, app):
+    def test_filename_missing(self, app: Flask):
         api = WebappLogoWorkspaceApi()
         method = unwrap(api.post)
 
@@ -672,7 +655,7 @@ class TestWebappLogoWorkspaceApi:
             with pytest.raises(FilenameNotExistsError):
                 method(api)
 
-    def test_file_too_large(self, app):
+    def test_file_too_large(self, app: Flask):
         api = WebappLogoWorkspaceApi()
         method = unwrap(api.post)
 
@@ -701,7 +684,7 @@ class TestWebappLogoWorkspaceApi:
             with pytest.raises(FileTooLargeError):
                 method(api)
 
-    def test_service_unsupported_file(self, app):
+    def test_service_unsupported_file(self, app: Flask):
         api = WebappLogoWorkspaceApi()
         method = unwrap(api.post)
 
@@ -732,7 +715,7 @@ class TestWebappLogoWorkspaceApi:
 
 
 class TestWorkspaceInfoApi:
-    def test_post_success(self, app):
+    def test_post_success(self, app: Flask):
         api = WorkspaceInfoApi()
         method = unwrap(api.post)
 
@@ -756,7 +739,7 @@ class TestWorkspaceInfoApi:
 
         assert result["result"] == "success"
 
-    def test_no_current_tenant(self, app):
+    def test_no_current_tenant(self, app: Flask):
         api = WorkspaceInfoApi()
         method = unwrap(api.post)
 
@@ -774,7 +757,7 @@ class TestWorkspaceInfoApi:
 
 
 class TestWorkspacePermissionApi:
-    def test_get_success(self, app):
+    def test_get_success(self, app: Flask):
         api = WorkspacePermissionApi()
         method = unwrap(api.get)
 
@@ -799,7 +782,7 @@ class TestWorkspacePermissionApi:
         assert status == 200
         assert result["workspace_id"] == "t1"
 
-    def test_no_current_tenant(self, app):
+    def test_no_current_tenant(self, app: Flask):
         api = WorkspacePermissionApi()
         method = unwrap(api.get)
 
diff --git a/api/tests/unit_tests/controllers/files/test_upload.py b/api/tests/unit_tests/controllers/files/test_upload.py
index e8f3cd4b66..ff6ba0e9a1 100644
--- a/api/tests/unit_tests/controllers/files/test_upload.py
+++ b/api/tests/unit_tests/controllers/files/test_upload.py
@@ -1,3 +1,4 @@
+import io
 import types
 from unittest.mock import patch
 
@@ -30,9 +31,10 @@ class DummyFile:
         self.filename = filename
         self.mimetype = mimetype
         self._content = content
+        self.stream = io.BytesIO(content)
 
     def read(self):
-        return self._content
+        return self.stream.read()
 
 
 class DummyToolFile:
diff --git a/api/tests/unit_tests/controllers/inner_api/plugin/test_plugin_wraps.py b/api/tests/unit_tests/controllers/inner_api/plugin/test_plugin_wraps.py
index d1b09c3a58..598677faff 100644
--- a/api/tests/unit_tests/controllers/inner_api/plugin/test_plugin_wraps.py
+++ b/api/tests/unit_tests/controllers/inner_api/plugin/test_plugin_wraps.py
@@ -189,7 +189,7 @@ class TestGetUserTenant:
     """Test get_user_tenant decorator"""
 
     @patch("controllers.inner_api.plugin.wraps.Tenant")
-    def test_should_inject_tenant_and_user_models(self, mock_tenant_class, app: Flask, monkeypatch):
+    def test_should_inject_tenant_and_user_models(self, mock_tenant_class, app: Flask, monkeypatch: pytest.MonkeyPatch):
         """Test that decorator injects tenant_model and user_model into kwargs"""
 
         # Arrange
@@ -244,7 +244,9 @@ class TestGetUserTenant:
                     protected_view()
 
     @patch("controllers.inner_api.plugin.wraps.Tenant")
-    def test_should_use_default_session_id_when_user_id_empty(self, mock_tenant_class, app: Flask, monkeypatch):
+    def test_should_use_default_session_id_when_user_id_empty(
+        self, mock_tenant_class, app: Flask, monkeypatch: pytest.MonkeyPatch
+    ):
         """Test that default session ID is used when user_id is empty string"""
 
         # Arrange
diff --git a/api/tests/unit_tests/controllers/service_api/app/test_annotation.py b/api/tests/unit_tests/controllers/service_api/app/test_annotation.py
index b16ad38c7c..2ab5547cd4 100644
--- a/api/tests/unit_tests/controllers/service_api/app/test_annotation.py
+++ b/api/tests/unit_tests/controllers/service_api/app/test_annotation.py
@@ -17,6 +17,7 @@ from types import SimpleNamespace
 from unittest.mock import Mock
 
 import pytest
+from flask import Flask
 from flask_restx.api import HTTPStatus
 
 from controllers.service_api.app.annotation import (
@@ -163,7 +164,7 @@ class TestAnnotationErrorPatterns:
 
 
 class TestAnnotationReplyActionApi:
-    def test_enable(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_enable(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         enable_mock = Mock()
         monkeypatch.setattr(AppAnnotationService, "enable_app_annotation", enable_mock)
 
@@ -181,7 +182,7 @@ class TestAnnotationReplyActionApi:
         assert status == 200
         enable_mock.assert_called_once()
 
-    def test_disable(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_disable(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         disable_mock = Mock()
         monkeypatch.setattr(AppAnnotationService, "disable_app_annotation", disable_mock)
 
@@ -231,7 +232,7 @@ class TestAnnotationReplyActionStatusApi:
 
 
 class TestAnnotationListApi:
-    def test_get(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_get(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         annotation = SimpleNamespace(id="a1", question="q", content="a", created_at=0)
         monkeypatch.setattr(
             AppAnnotationService,
@@ -248,7 +249,7 @@ class TestAnnotationListApi:
 
         assert response["total"] == 1
 
-    def test_create(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_create(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         annotation = SimpleNamespace(id="a1", question="q", content="a", created_at=0)
         monkeypatch.setattr(
             AppAnnotationService,
@@ -268,7 +269,7 @@ class TestAnnotationListApi:
 
 
 class TestAnnotationUpdateDeleteApi:
-    def test_update_delete(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_update_delete(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         annotation = SimpleNamespace(id="a1", question="q", content="a", created_at=0)
         monkeypatch.setattr(
             AppAnnotationService,
diff --git a/api/tests/unit_tests/controllers/service_api/app/test_app.py b/api/tests/unit_tests/controllers/service_api/app/test_app.py
index f5d93b5ac3..ae0edcf382 100644
--- a/api/tests/unit_tests/controllers/service_api/app/test_app.py
+++ b/api/tests/unit_tests/controllers/service_api/app/test_app.py
@@ -41,7 +41,7 @@ class TestAppParameterApi:
     @patch("controllers.service_api.wraps.validate_and_get_api_token")
     @patch("controllers.service_api.wraps.db")
     def test_get_parameters_for_chat_app(
-        self, mock_db, mock_validate_token, mock_current_app, mock_user_logged_in, app, mock_app_model
+        self, mock_db, mock_validate_token, mock_current_app, mock_user_logged_in, app: Flask, mock_app_model
     ):
         """Test retrieving parameters for a chat app."""
         # Arrange
@@ -91,7 +91,7 @@ class TestAppParameterApi:
     @patch("controllers.service_api.wraps.validate_and_get_api_token")
     @patch("controllers.service_api.wraps.db")
     def test_get_parameters_for_workflow_app(
-        self, mock_db, mock_validate_token, mock_current_app, mock_user_logged_in, app, mock_app_model
+        self, mock_db, mock_validate_token, mock_current_app, mock_user_logged_in, app: Flask, mock_app_model
     ):
         """Test retrieving parameters for a workflow app."""
         # Arrange
@@ -136,7 +136,7 @@ class TestAppParameterApi:
     @patch("controllers.service_api.wraps.validate_and_get_api_token")
     @patch("controllers.service_api.wraps.db")
     def test_get_parameters_raises_error_when_chat_config_missing(
-        self, mock_db, mock_validate_token, mock_current_app, mock_user_logged_in, app, mock_app_model
+        self, mock_db, mock_validate_token, mock_current_app, mock_user_logged_in, app: Flask, mock_app_model
     ):
         """Test that AppUnavailableError is raised when chat app has no config."""
         # Arrange
@@ -174,7 +174,7 @@ class TestAppParameterApi:
     @patch("controllers.service_api.wraps.validate_and_get_api_token")
     @patch("controllers.service_api.wraps.db")
     def test_get_parameters_raises_error_when_workflow_missing(
-        self, mock_db, mock_validate_token, mock_current_app, mock_user_logged_in, app, mock_app_model
+        self, mock_db, mock_validate_token, mock_current_app, mock_user_logged_in, app: Flask, mock_app_model
     ):
         """Test that AppUnavailableError is raised when workflow app has no workflow."""
         # Arrange
@@ -234,7 +234,14 @@ class TestAppMetaApi:
     @patch("controllers.service_api.wraps.db")
     @patch("controllers.service_api.app.app.AppService")
     def test_get_app_meta(
-        self, mock_app_service, mock_db, mock_validate_token, mock_current_app, mock_user_logged_in, app, mock_app_model
+        self,
+        mock_app_service,
+        mock_db,
+        mock_validate_token,
+        mock_current_app,
+        mock_user_logged_in,
+        app: Flask,
+        mock_app_model,
     ):
         """Test retrieving app metadata via AppService."""
         # Arrange
@@ -310,7 +317,7 @@ class TestAppInfoApi:
     @patch("controllers.service_api.wraps.validate_and_get_api_token")
     @patch("controllers.service_api.wraps.db")
     def test_get_app_info(
-        self, mock_db, mock_validate_token, mock_current_app, mock_user_logged_in, app, mock_app_model
+        self, mock_db, mock_validate_token, mock_current_app, mock_user_logged_in, app: Flask, mock_app_model
     ):
         """Test retrieving basic app information."""
         mock_current_app.login_manager = Mock()
@@ -402,7 +409,9 @@ class TestAppInfoApi:
     @patch("controllers.service_api.wraps.current_app")
     @patch("controllers.service_api.wraps.validate_and_get_api_token")
     @patch("controllers.service_api.wraps.db")
-    def test_get_app_info_with_no_tags(self, mock_db, mock_validate_token, mock_current_app, mock_user_logged_in, app):
+    def test_get_app_info_with_no_tags(
+        self, mock_db, mock_validate_token, mock_current_app, mock_user_logged_in, app: Flask
+    ):
         """Test retrieving app info when app has no tags."""
         # Arrange
         mock_current_app.login_manager = Mock()
@@ -453,7 +462,7 @@ class TestAppInfoApi:
     @patch("controllers.service_api.wraps.validate_and_get_api_token")
     @patch("controllers.service_api.wraps.db")
     def test_get_app_info_returns_correct_mode(
-        self, mock_db, mock_validate_token, mock_current_app, mock_user_logged_in, app, app_mode
+        self, mock_db, mock_validate_token, mock_current_app, mock_user_logged_in, app: Flask, app_mode
     ):
         """Test that all app modes are correctly returned."""
         # Arrange
diff --git a/api/tests/unit_tests/controllers/service_api/app/test_audio.py b/api/tests/unit_tests/controllers/service_api/app/test_audio.py
index c16ebad739..4741481ef6 100644
--- a/api/tests/unit_tests/controllers/service_api/app/test_audio.py
+++ b/api/tests/unit_tests/controllers/service_api/app/test_audio.py
@@ -13,6 +13,7 @@ from types import SimpleNamespace
 from unittest.mock import Mock, patch
 
 import pytest
+from flask import Flask
 from werkzeug.datastructures import FileStorage
 from werkzeug.exceptions import InternalServerError
 
@@ -190,7 +191,7 @@ class TestAudioServiceMockedBehavior:
 
 
 class TestAudioApi:
-    def test_success(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_success(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setattr(AudioService, "transcript_asr", lambda **_kwargs: {"text": "ok"})
         api = AudioApi()
         handler = _unwrap(api.post)
@@ -216,7 +217,7 @@ class TestAudioApi:
             (InvokeError("invoke"), CompletionRequestError),
         ],
     )
-    def test_error_mapping(self, app, monkeypatch: pytest.MonkeyPatch, exc, expected) -> None:
+    def test_error_mapping(self, app: Flask, monkeypatch: pytest.MonkeyPatch, exc, expected) -> None:
         monkeypatch.setattr(AudioService, "transcript_asr", lambda **_kwargs: (_ for _ in ()).throw(exc))
         api = AudioApi()
         handler = _unwrap(api.post)
@@ -227,7 +228,7 @@ class TestAudioApi:
             with pytest.raises(expected):
                 handler(api, app_model=app_model, end_user=end_user)
 
-    def test_unhandled_error(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_unhandled_error(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setattr(
             AudioService, "transcript_asr", lambda **_kwargs: (_ for _ in ()).throw(RuntimeError("boom"))
         )
@@ -242,7 +243,7 @@ class TestAudioApi:
 
 
 class TestTextApi:
-    def test_success(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_success(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setattr(AudioService, "transcript_tts", lambda **_kwargs: {"audio": "ok"})
 
         api = TextApi()
@@ -259,7 +260,7 @@ class TestTextApi:
 
         assert response == {"audio": "ok"}
 
-    def test_error_mapping(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_error_mapping(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setattr(
             AudioService, "transcript_tts", lambda **_kwargs: (_ for _ in ()).throw(QuotaExceededError())
         )
diff --git a/api/tests/unit_tests/controllers/service_api/app/test_completion.py b/api/tests/unit_tests/controllers/service_api/app/test_completion.py
index 3364c07e62..a60b3b18bd 100644
--- a/api/tests/unit_tests/controllers/service_api/app/test_completion.py
+++ b/api/tests/unit_tests/controllers/service_api/app/test_completion.py
@@ -16,6 +16,7 @@ from types import SimpleNamespace
 from unittest.mock import Mock, patch
 
 import pytest
+from flask import Flask
 from pydantic import ValidationError
 from werkzeug.exceptions import BadRequest, NotFound
 
@@ -295,7 +296,7 @@ class TestCompletionControllerLogic:
 
     @patch("controllers.service_api.app.completion.service_api_ns")
     @patch("controllers.service_api.app.completion.AppGenerateService")
-    def test_completion_api_post_success(self, mock_generate_service, mock_service_api_ns, app):
+    def test_completion_api_post_success(self, mock_generate_service, mock_service_api_ns, app: Flask):
         """Test CompletionApi.post success path."""
         from controllers.service_api.app.completion import CompletionApi
 
@@ -320,7 +321,7 @@ class TestCompletionControllerLogic:
                 mock_generate_service.generate.assert_called_once()
 
     @patch("controllers.service_api.app.completion.service_api_ns")
-    def test_completion_api_post_wrong_app_mode(self, mock_service_api_ns, app):
+    def test_completion_api_post_wrong_app_mode(self, mock_service_api_ns, app: Flask):
         """Test CompletionApi.post with wrong app mode."""
         from controllers.service_api.app.completion import CompletionApi
 
@@ -334,7 +335,7 @@ class TestCompletionControllerLogic:
 
     @patch("controllers.service_api.app.completion.service_api_ns")
     @patch("controllers.service_api.app.completion.AppGenerateService")
-    def test_chat_api_post_success(self, mock_generate_service, mock_service_api_ns, app):
+    def test_chat_api_post_success(self, mock_generate_service, mock_service_api_ns, app: Flask):
         """Test ChatApi.post success path."""
         from controllers.service_api.app.completion import ChatApi
 
@@ -355,7 +356,7 @@ class TestCompletionControllerLogic:
                 assert response == {"text": "compacted"}
 
     @patch("controllers.service_api.app.completion.service_api_ns")
-    def test_chat_api_post_wrong_app_mode(self, mock_service_api_ns, app):
+    def test_chat_api_post_wrong_app_mode(self, mock_service_api_ns, app: Flask):
         """Test ChatApi.post with wrong app mode."""
         from controllers.service_api.app.completion import ChatApi
 
@@ -368,7 +369,7 @@ class TestCompletionControllerLogic:
                 ChatApi().post.__wrapped__(ChatApi(), mock_app_model, mock_end_user)
 
     @patch("controllers.service_api.app.completion.AppTaskService")
-    def test_completion_stop_api_success(self, mock_task_service, app):
+    def test_completion_stop_api_success(self, mock_task_service, app: Flask):
         """Test CompletionStopApi.post success."""
         from controllers.service_api.app.completion import CompletionStopApi
 
@@ -385,7 +386,7 @@ class TestCompletionControllerLogic:
             mock_task_service.stop_task.assert_called_once()
 
     @patch("controllers.service_api.app.completion.AppTaskService")
-    def test_chat_stop_api_success(self, mock_task_service, app):
+    def test_chat_stop_api_success(self, mock_task_service, app: Flask):
         """Test ChatStopApi.post success."""
         from controllers.service_api.app.completion import ChatStopApi
 
@@ -414,7 +415,7 @@ class TestChatRequestPayloadController:
 
 
 class TestCompletionApiController:
-    def test_wrong_mode(self, app) -> None:
+    def test_wrong_mode(self, app: Flask) -> None:
         api = CompletionApi()
         handler = _unwrap(api.post)
         app_model = SimpleNamespace(mode=AppMode.CHAT.value)
@@ -424,7 +425,7 @@ class TestCompletionApiController:
             with pytest.raises(AppUnavailableError):
                 handler(api, app_model=app_model, end_user=end_user)
 
-    def test_conversation_not_found(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_conversation_not_found(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setattr(
             AppGenerateService,
             "generate",
@@ -442,7 +443,7 @@ class TestCompletionApiController:
 
 
 class TestCompletionStopApiController:
-    def test_wrong_mode(self, app) -> None:
+    def test_wrong_mode(self, app: Flask) -> None:
         api = CompletionStopApi()
         handler = _unwrap(api.post)
         app_model = SimpleNamespace(mode=AppMode.CHAT.value)
@@ -452,7 +453,7 @@ class TestCompletionStopApiController:
             with pytest.raises(AppUnavailableError):
                 handler(api, app_model=app_model, end_user=end_user, task_id="t1")
 
-    def test_success(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_success(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         stop_mock = Mock()
         monkeypatch.setattr(AppTaskService, "stop_task", stop_mock)
 
@@ -469,7 +470,7 @@ class TestCompletionStopApiController:
 
 
 class TestChatApiController:
-    def test_wrong_mode(self, app) -> None:
+    def test_wrong_mode(self, app: Flask) -> None:
         api = ChatApi()
         handler = _unwrap(api.post)
         app_model = SimpleNamespace(mode=AppMode.COMPLETION.value)
@@ -479,7 +480,7 @@ class TestChatApiController:
             with pytest.raises(NotChatAppError):
                 handler(api, app_model=app_model, end_user=end_user)
 
-    def test_workflow_not_found(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_workflow_not_found(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setattr(
             AppGenerateService,
             "generate",
@@ -495,7 +496,7 @@ class TestChatApiController:
             with pytest.raises(NotFound):
                 handler(api, app_model=app_model, end_user=end_user)
 
-    def test_draft_workflow(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_draft_workflow(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setattr(
             AppGenerateService,
             "generate",
@@ -513,10 +514,10 @@ class TestChatApiController:
 
 
 class TestChatStopApiController:
-    def test_wrong_mode(self, app) -> None:
+    def test_wrong_mode(self, app: Flask) -> None:
         api = ChatStopApi()
         handler = _unwrap(api.post)
-        app_model = SimpleNamespace(mode=AppMode.COMPLETION.value)
+        app_model = SimpleNamespace(mode=AppMode.COMPLETION)
         end_user = SimpleNamespace(id="u1")
 
         with app.test_request_context("/chat-messages/1/stop", method="POST"):
diff --git a/api/tests/unit_tests/controllers/service_api/app/test_conversation.py b/api/tests/unit_tests/controllers/service_api/app/test_conversation.py
index 4fb8ecf784..52a7aa2189 100644
--- a/api/tests/unit_tests/controllers/service_api/app/test_conversation.py
+++ b/api/tests/unit_tests/controllers/service_api/app/test_conversation.py
@@ -20,6 +20,7 @@ from types import SimpleNamespace
 from unittest.mock import Mock, patch
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import BadRequest, NotFound
 
 import services
@@ -339,7 +340,7 @@ class TestConversationAppModeValidation:
     @pytest.mark.parametrize(
         "mode",
         [
-            AppMode.CHAT.value,
+            AppMode.CHAT,
             AppMode.AGENT_CHAT.value,
             AppMode.ADVANCED_CHAT.value,
         ],
@@ -364,7 +365,7 @@ class TestConversationAppModeValidation:
         app raises NotChatAppError.
         """
         app = Mock(spec=App)
-        app.mode = AppMode.COMPLETION.value
+        app.mode = AppMode.COMPLETION
 
         app_mode = AppMode.value_of(app.mode)
         assert app_mode not in {AppMode.CHAT, AppMode.AGENT_CHAT, AppMode.ADVANCED_CHAT}
@@ -494,17 +495,17 @@ class TestConversationPayloadsController:
 
 
 class TestConversationApiController:
-    def test_list_not_chat(self, app) -> None:
+    def test_list_not_chat(self, app: Flask) -> None:
         api = ConversationApi()
         handler = _unwrap(api.get)
-        app_model = SimpleNamespace(mode=AppMode.COMPLETION.value)
+        app_model = SimpleNamespace(mode=AppMode.COMPLETION)
         end_user = SimpleNamespace()
 
         with app.test_request_context("/conversations", method="GET"):
             with pytest.raises(NotChatAppError):
                 handler(api, app_model=app_model, end_user=end_user)
 
-    def test_list_last_not_found(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_list_last_not_found(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         class _BeginStub:
             def __enter__(self):
                 return SimpleNamespace()
@@ -530,7 +531,7 @@ class TestConversationApiController:
 
         api = ConversationApi()
         handler = _unwrap(api.get)
-        app_model = SimpleNamespace(mode=AppMode.CHAT.value)
+        app_model = SimpleNamespace(mode=AppMode.CHAT)
         end_user = SimpleNamespace()
 
         with app.test_request_context(
@@ -542,17 +543,17 @@ class TestConversationApiController:
 
 
 class TestConversationDetailApiController:
-    def test_delete_not_chat(self, app) -> None:
+    def test_delete_not_chat(self, app: Flask) -> None:
         api = ConversationDetailApi()
         handler = _unwrap(api.delete)
-        app_model = SimpleNamespace(mode=AppMode.COMPLETION.value)
+        app_model = SimpleNamespace(mode=AppMode.COMPLETION)
         end_user = SimpleNamespace()
 
         with app.test_request_context("/conversations/1", method="DELETE"):
             with pytest.raises(NotChatAppError):
                 handler(api, app_model=app_model, end_user=end_user, c_id="00000000-0000-0000-0000-000000000001")
 
-    def test_delete_not_found(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_delete_not_found(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setattr(
             ConversationService,
             "delete",
@@ -561,7 +562,7 @@ class TestConversationDetailApiController:
 
         api = ConversationDetailApi()
         handler = _unwrap(api.delete)
-        app_model = SimpleNamespace(mode=AppMode.CHAT.value)
+        app_model = SimpleNamespace(mode=AppMode.CHAT)
         end_user = SimpleNamespace()
 
         with app.test_request_context("/conversations/1", method="DELETE"):
@@ -570,7 +571,7 @@ class TestConversationDetailApiController:
 
 
 class TestConversationRenameApiController:
-    def test_not_found(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_not_found(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setattr(
             ConversationService,
             "rename",
@@ -579,7 +580,7 @@ class TestConversationRenameApiController:
 
         api = ConversationRenameApi()
         handler = _unwrap(api.post)
-        app_model = SimpleNamespace(mode=AppMode.CHAT.value)
+        app_model = SimpleNamespace(mode=AppMode.CHAT)
         end_user = SimpleNamespace()
 
         with app.test_request_context(
@@ -592,17 +593,17 @@ class TestConversationRenameApiController:
 
 
 class TestConversationVariablesApiController:
-    def test_not_chat(self, app) -> None:
+    def test_not_chat(self, app: Flask) -> None:
         api = ConversationVariablesApi()
         handler = _unwrap(api.get)
-        app_model = SimpleNamespace(mode=AppMode.COMPLETION.value)
+        app_model = SimpleNamespace(mode=AppMode.COMPLETION)
         end_user = SimpleNamespace()
 
         with app.test_request_context("/conversations/1/variables", method="GET"):
             with pytest.raises(NotChatAppError):
                 handler(api, app_model=app_model, end_user=end_user, c_id="00000000-0000-0000-0000-000000000001")
 
-    def test_not_found(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_not_found(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setattr(
             ConversationService,
             "get_conversational_variable",
@@ -611,7 +612,7 @@ class TestConversationVariablesApiController:
 
         api = ConversationVariablesApi()
         handler = _unwrap(api.get)
-        app_model = SimpleNamespace(mode=AppMode.CHAT.value)
+        app_model = SimpleNamespace(mode=AppMode.CHAT)
         end_user = SimpleNamespace()
 
         with app.test_request_context(
@@ -621,7 +622,7 @@ class TestConversationVariablesApiController:
             with pytest.raises(NotFound):
                 handler(api, app_model=app_model, end_user=end_user, c_id="00000000-0000-0000-0000-000000000001")
 
-    def test_success_serializes_response(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_success_serializes_response(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         created_at = datetime(2026, 1, 2, 3, 4, 5, tzinfo=UTC)
         monkeypatch.setattr(
             ConversationService,
@@ -644,7 +645,7 @@ class TestConversationVariablesApiController:
 
         api = ConversationVariablesApi()
         handler = _unwrap(api.get)
-        app_model = SimpleNamespace(mode=AppMode.CHAT.value)
+        app_model = SimpleNamespace(mode=AppMode.CHAT)
         end_user = SimpleNamespace()
 
         with app.test_request_context(
@@ -661,7 +662,7 @@ class TestConversationVariablesApiController:
 
 
 class TestConversationVariableDetailApiController:
-    def test_update_type_mismatch(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_update_type_mismatch(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setattr(
             ConversationService,
             "update_conversation_variable",
@@ -670,7 +671,7 @@ class TestConversationVariableDetailApiController:
 
         api = ConversationVariableDetailApi()
         handler = _unwrap(api.put)
-        app_model = SimpleNamespace(mode=AppMode.CHAT.value)
+        app_model = SimpleNamespace(mode=AppMode.CHAT)
         end_user = SimpleNamespace()
 
         with app.test_request_context(
@@ -687,7 +688,7 @@ class TestConversationVariableDetailApiController:
                     variable_id="00000000-0000-0000-0000-000000000002",
                 )
 
-    def test_update_not_found(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_update_not_found(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setattr(
             ConversationService,
             "update_conversation_variable",
@@ -696,7 +697,7 @@ class TestConversationVariableDetailApiController:
 
         api = ConversationVariableDetailApi()
         handler = _unwrap(api.put)
-        app_model = SimpleNamespace(mode=AppMode.CHAT.value)
+        app_model = SimpleNamespace(mode=AppMode.CHAT)
         end_user = SimpleNamespace()
 
         with app.test_request_context(
@@ -713,7 +714,7 @@ class TestConversationVariableDetailApiController:
                     variable_id="00000000-0000-0000-0000-000000000002",
                 )
 
-    def test_update_success_serializes_response(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_update_success_serializes_response(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         created_at = datetime(2026, 1, 2, 3, 4, 5, tzinfo=UTC)
         monkeypatch.setattr(
             ConversationService,
@@ -730,7 +731,7 @@ class TestConversationVariableDetailApiController:
 
         api = ConversationVariableDetailApi()
         handler = _unwrap(api.put)
-        app_model = SimpleNamespace(mode=AppMode.CHAT.value)
+        app_model = SimpleNamespace(mode=AppMode.CHAT)
         end_user = SimpleNamespace()
 
         with app.test_request_context(
diff --git a/api/tests/unit_tests/controllers/service_api/app/test_file.py b/api/tests/unit_tests/controllers/service_api/app/test_file.py
index 7060bd79df..88ebe955a8 100644
--- a/api/tests/unit_tests/controllers/service_api/app/test_file.py
+++ b/api/tests/unit_tests/controllers/service_api/app/test_file.py
@@ -16,6 +16,7 @@ import uuid
 from unittest.mock import Mock, patch
 
 import pytest
+from flask import Flask
 
 from controllers.common.errors import (
     FilenameNotExistsError,
@@ -237,7 +238,7 @@ class TestFileApiPost:
         self,
         mock_db,
         mock_file_svc_cls,
-        app,
+        app: Flask,
         mock_app_model,
         mock_end_user,
     ):
@@ -282,7 +283,7 @@ class TestFileApiPost:
         assert status == 201
         mock_file_svc_cls.return_value.upload_file.assert_called_once()
 
-    def test_upload_no_file(self, app, mock_app_model, mock_end_user):
+    def test_upload_no_file(self, app: Flask, mock_app_model, mock_end_user):
         """Test NoFileUploadedError when no file in request."""
         from controllers.service_api.app.file import FileApi
 
@@ -296,7 +297,7 @@ class TestFileApiPost:
             with pytest.raises(NoFileUploadedError):
                 _unwrap(api.post)(api, app_model=mock_app_model, end_user=mock_end_user)
 
-    def test_upload_too_many_files(self, app, mock_app_model, mock_end_user):
+    def test_upload_too_many_files(self, app: Flask, mock_app_model, mock_end_user):
         """Test TooManyFilesError when multiple files uploaded."""
         from io import BytesIO
 
@@ -317,7 +318,7 @@ class TestFileApiPost:
             with pytest.raises(TooManyFilesError):
                 _unwrap(api.post)(api, app_model=mock_app_model, end_user=mock_end_user)
 
-    def test_upload_no_mimetype(self, app, mock_app_model, mock_end_user):
+    def test_upload_no_mimetype(self, app: Flask, mock_app_model, mock_end_user):
         """Test UnsupportedFileTypeError when file has no mimetype."""
         from io import BytesIO
 
@@ -341,7 +342,7 @@ class TestFileApiPost:
         self,
         mock_db,
         mock_file_svc_cls,
-        app,
+        app: Flask,
         mock_app_model,
         mock_end_user,
     ):
@@ -373,7 +374,7 @@ class TestFileApiPost:
         self,
         mock_db,
         mock_file_svc_cls,
-        app,
+        app: Flask,
         mock_app_model,
         mock_end_user,
     ):
diff --git a/api/tests/unit_tests/controllers/service_api/app/test_file_preview.py b/api/tests/unit_tests/controllers/service_api/app/test_file_preview.py
index d83c22f2cf..f5e8453c5c 100644
--- a/api/tests/unit_tests/controllers/service_api/app/test_file_preview.py
+++ b/api/tests/unit_tests/controllers/service_api/app/test_file_preview.py
@@ -66,7 +66,7 @@ class TestFilePreviewApi:
         return message
 
     def test_validate_file_ownership_success(
-        self, file_preview_api, mock_app, mock_upload_file, mock_message_file, mock_message
+        self, file_preview_api: FilePreviewApi, mock_app, mock_upload_file, mock_message_file, mock_message
     ):
         """Test successful file ownership validation"""
         file_id = str(uuid.uuid4())
@@ -97,7 +97,7 @@ class TestFilePreviewApi:
             assert result_message_file == mock_message_file
             assert result_upload_file == mock_upload_file
 
-    def test_validate_file_ownership_file_not_found(self, file_preview_api):
+    def test_validate_file_ownership_file_not_found(self, file_preview_api: FilePreviewApi):
         """Test file ownership validation when MessageFile not found"""
         file_id = str(uuid.uuid4())
         app_id = str(uuid.uuid4())
@@ -112,7 +112,7 @@ class TestFilePreviewApi:
 
             assert "File not found in message context" in str(exc_info.value)
 
-    def test_validate_file_ownership_access_denied(self, file_preview_api, mock_message_file):
+    def test_validate_file_ownership_access_denied(self, file_preview_api: FilePreviewApi, mock_message_file):
         """Test file ownership validation when Message not owned by app"""
         file_id = str(uuid.uuid4())
         app_id = str(uuid.uuid4())
@@ -130,7 +130,9 @@ class TestFilePreviewApi:
 
             assert "not owned by requesting app" in str(exc_info.value)
 
-    def test_validate_file_ownership_upload_file_not_found(self, file_preview_api, mock_message_file, mock_message):
+    def test_validate_file_ownership_upload_file_not_found(
+        self, file_preview_api: FilePreviewApi, mock_message_file, mock_message
+    ):
         """Test file ownership validation when UploadFile not found"""
         file_id = str(uuid.uuid4())
         app_id = str(uuid.uuid4())
@@ -151,7 +153,7 @@ class TestFilePreviewApi:
             assert "Upload file record not found" in str(exc_info.value)
 
     def test_validate_file_ownership_tenant_mismatch(
-        self, file_preview_api, mock_app, mock_upload_file, mock_message_file, mock_message
+        self, file_preview_api: FilePreviewApi, mock_app, mock_upload_file, mock_message_file, mock_message
     ):
         """Test file ownership validation with tenant mismatch"""
         file_id = str(uuid.uuid4())
@@ -182,7 +184,7 @@ class TestFilePreviewApi:
 
             assert "tenant mismatch" in str(exc_info.value)
 
-    def test_validate_file_ownership_invalid_input(self, file_preview_api):
+    def test_validate_file_ownership_invalid_input(self, file_preview_api: FilePreviewApi):
         """Test file ownership validation with invalid input"""
 
         # Test with empty file_id
@@ -195,7 +197,7 @@ class TestFilePreviewApi:
             file_preview_api._validate_file_ownership("file_id", "")
         assert "Invalid file or app identifier" in str(exc_info.value)
 
-    def test_build_file_response_basic(self, file_preview_api, mock_upload_file):
+    def test_build_file_response_basic(self, file_preview_api: FilePreviewApi, mock_upload_file):
         """Test basic file response building"""
         mock_generator = Mock()
 
@@ -207,7 +209,7 @@ class TestFilePreviewApi:
         assert response.headers["Content-Length"] == str(mock_upload_file.size)
         assert "Cache-Control" in response.headers
 
-    def test_build_file_response_as_attachment(self, file_preview_api, mock_upload_file):
+    def test_build_file_response_as_attachment(self, file_preview_api: FilePreviewApi, mock_upload_file):
         """Test file response building with attachment flag"""
         mock_generator = Mock()
 
@@ -218,7 +220,7 @@ class TestFilePreviewApi:
         assert mock_upload_file.name in response.headers["Content-Disposition"]
         assert response.headers["Content-Type"] == "application/octet-stream"
 
-    def test_build_file_response_html_forces_attachment(self, file_preview_api, mock_upload_file):
+    def test_build_file_response_html_forces_attachment(self, file_preview_api: FilePreviewApi, mock_upload_file):
         """Test HTML files are forced to download"""
         mock_generator = Mock()
         mock_upload_file.mime_type = "text/html"
@@ -231,7 +233,7 @@ class TestFilePreviewApi:
         assert response.headers["Content-Type"] == "application/octet-stream"
         assert response.headers["X-Content-Type-Options"] == "nosniff"
 
-    def test_build_file_response_audio_video(self, file_preview_api, mock_upload_file):
+    def test_build_file_response_audio_video(self, file_preview_api: FilePreviewApi, mock_upload_file):
         """Test file response building for audio/video files"""
         mock_generator = Mock()
         mock_upload_file.mime_type = "video/mp4"
@@ -241,7 +243,7 @@ class TestFilePreviewApi:
         # Check Range support for media files
         assert response.headers["Accept-Ranges"] == "bytes"
 
-    def test_build_file_response_no_size(self, file_preview_api, mock_upload_file):
+    def test_build_file_response_no_size(self, file_preview_api: FilePreviewApi, mock_upload_file):
         """Test file response building when size is unknown"""
         mock_generator = Mock()
         mock_upload_file.size = 0  # Unknown size
@@ -253,7 +255,14 @@ class TestFilePreviewApi:
 
     @patch("controllers.service_api.app.file_preview.storage")
     def test_get_method_integration(
-        self, mock_storage, file_preview_api, mock_app, mock_end_user, mock_upload_file, mock_message_file, mock_message
+        self,
+        mock_storage,
+        file_preview_api: FilePreviewApi,
+        mock_app,
+        mock_end_user,
+        mock_upload_file,
+        mock_message_file,
+        mock_message,
     ):
         """Test the full GET method integration (without decorator)"""
         file_id = str(uuid.uuid4())
@@ -295,7 +304,13 @@ class TestFilePreviewApi:
 
     @patch("controllers.service_api.app.file_preview.storage")
     def test_storage_error_handling(
-        self, mock_storage, file_preview_api, mock_app, mock_upload_file, mock_message_file, mock_message
+        self,
+        mock_storage,
+        file_preview_api: FilePreviewApi,
+        mock_app,
+        mock_upload_file,
+        mock_message_file,
+        mock_message,
     ):
         """Test storage error handling in the core logic"""
         file_id = str(uuid.uuid4())
@@ -334,7 +349,7 @@ class TestFilePreviewApi:
             assert "Storage error" in str(exc_info.value)
 
     @patch("controllers.service_api.app.file_preview.logger")
-    def test_validate_file_ownership_unexpected_error_logging(self, mock_logger, file_preview_api):
+    def test_validate_file_ownership_unexpected_error_logging(self, mock_logger, file_preview_api: FilePreviewApi):
         """Test that unexpected errors are logged properly"""
         file_id = str(uuid.uuid4())
         app_id = str(uuid.uuid4())
diff --git a/api/tests/unit_tests/controllers/service_api/app/test_hitl_service_api.py b/api/tests/unit_tests/controllers/service_api/app/test_hitl_service_api.py
index 846d5368f3..ff668ac60a 100644
--- a/api/tests/unit_tests/controllers/service_api/app/test_hitl_service_api.py
+++ b/api/tests/unit_tests/controllers/service_api/app/test_hitl_service_api.py
@@ -11,6 +11,7 @@ from types import SimpleNamespace
 from unittest.mock import ANY, MagicMock, Mock
 
 import pytest
+from flask import Flask
 
 import services.app_generate_service as ags_module
 from controllers.service_api.app.workflow_events import WorkflowEventsApi
@@ -31,7 +32,7 @@ from core.workflow.system_variables import build_system_variables
 from graphon.entities import WorkflowStartReason
 from graphon.entities.pause_reason import HumanInputRequired, PauseReasonType
 from graphon.enums import WorkflowExecutionStatus, WorkflowNodeExecutionStatus
-from graphon.nodes.human_input.entities import FormInput, UserAction
+from graphon.nodes.human_input.entities import ParagraphInputConfig, UserActionConfig
 from graphon.nodes.human_input.enums import FormInputType
 from graphon.runtime import GraphRuntimeState, VariablePool
 from models.account import Account
@@ -248,7 +249,9 @@ def _build_resumption_context(task_id: str) -> WorkflowResumptionContext:
 
 class TestHitlServiceApi:
     # Service API event-stream continuation
-    def test_workflow_events_continue_on_pause_keeps_stream_open(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_workflow_events_continue_on_pause_keeps_stream_open(
+        self, app: Flask, monkeypatch: pytest.MonkeyPatch
+    ) -> None:
         workflow_run = SimpleNamespace(
             id="run-1",
             app_id="app-1",
@@ -281,7 +284,7 @@ class TestHitlServiceApi:
         workflow_generator.convert_to_event_stream.assert_called_once_with(["raw-event"])
 
     def test_workflow_events_snapshot_continue_on_pause_keeps_pause_open(
-        self, app, monkeypatch: pytest.MonkeyPatch
+        self, app: Flask, monkeypatch: pytest.MonkeyPatch
     ) -> None:
         workflow_run = SimpleNamespace(
             id="run-1",
@@ -449,7 +452,7 @@ class TestHitlServiceApi:
                     node_title="Approval",
                     form_content="Need approval",
                     inputs=[],
-                    actions=[UserAction(id="approve", title="Approve")],
+                    actions=[UserActionConfig(id="approve", title="Approve")],
                     display_in_ui=True,
                     form_token="token-1",
                     resolved_default_values={},
@@ -590,9 +593,9 @@ class TestHitlServiceApi:
             form_id="form-1",
             form_content="Rendered",
             inputs=[
-                FormInput(type=FormInputType.TEXT_INPUT, output_variable_name="field", default=None),
+                ParagraphInputConfig(type=FormInputType.PARAGRAPH, output_variable_name="field", default=None),
             ],
-            actions=[UserAction(id="approve", title="Approve")],
+            actions=[UserActionConfig(id="approve", title="Approve")],
             display_in_ui=True,
             node_id="node-id",
             node_title="Human Step",
diff --git a/api/tests/unit_tests/controllers/service_api/app/test_human_input_form.py b/api/tests/unit_tests/controllers/service_api/app/test_human_input_form.py
index 531f722ceb..5d1c4b4e26 100644
--- a/api/tests/unit_tests/controllers/service_api/app/test_human_input_form.py
+++ b/api/tests/unit_tests/controllers/service_api/app/test_human_input_form.py
@@ -9,6 +9,7 @@ from types import SimpleNamespace
 from unittest.mock import Mock
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import NotFound
 
 from controllers.service_api.app.human_input_form import WorkflowHumanInputFormApi
@@ -17,7 +18,7 @@ from tests.unit_tests.controllers.service_api.conftest import _unwrap
 
 
 class TestWorkflowHumanInputFormApi:
-    def test_get_success(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_get_success(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         definition = SimpleNamespace(
             model_dump=lambda: {
                 "rendered_content": "Rendered form content",
@@ -57,7 +58,7 @@ class TestWorkflowHumanInputFormApi:
         service_mock.get_form_by_token.assert_called_once_with("token-1")
         service_mock.ensure_form_active.assert_called_once_with(form)
 
-    def test_get_form_not_in_app(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_get_form_not_in_app(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         form = SimpleNamespace(
             app_id="another-app",
             tenant_id="tenant-1",
@@ -87,7 +88,7 @@ class TestWorkflowHumanInputFormApi:
         ],
     )
     def test_get_rejects_non_service_api_recipient_types(
-        self, app, monkeypatch: pytest.MonkeyPatch, recipient_type: RecipientType
+        self, app: Flask, monkeypatch: pytest.MonkeyPatch, recipient_type: RecipientType
     ) -> None:
         form = SimpleNamespace(
             app_id="app-1",
@@ -111,7 +112,7 @@ class TestWorkflowHumanInputFormApi:
 
         service_mock.ensure_form_active.assert_not_called()
 
-    def test_post_success(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_post_success(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         form = SimpleNamespace(
             app_id="app-1",
             tenant_id="tenant-1",
@@ -155,7 +156,7 @@ class TestWorkflowHumanInputFormApi:
         ],
     )
     def test_post_rejects_non_service_api_recipient_types(
-        self, app, monkeypatch: pytest.MonkeyPatch, recipient_type: RecipientType
+        self, app: Flask, monkeypatch: pytest.MonkeyPatch, recipient_type: RecipientType
     ) -> None:
         form = SimpleNamespace(
             app_id="app-1",
diff --git a/api/tests/unit_tests/controllers/service_api/app/test_message.py b/api/tests/unit_tests/controllers/service_api/app/test_message.py
index c2b8aed1ae..d44e92ce66 100644
--- a/api/tests/unit_tests/controllers/service_api/app/test_message.py
+++ b/api/tests/unit_tests/controllers/service_api/app/test_message.py
@@ -19,6 +19,7 @@ from types import SimpleNamespace
 from unittest.mock import Mock, patch
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import BadRequest, InternalServerError, NotFound
 
 from controllers.service_api.app.error import NotChatAppError
@@ -380,7 +381,7 @@ class TestMessageService:
 
 
 class TestMessageListApi:
-    def test_not_chat_app(self, app) -> None:
+    def test_not_chat_app(self, app: Flask) -> None:
         api = MessageListApi()
         handler = _unwrap(api.get)
         app_model = SimpleNamespace(mode=AppMode.COMPLETION.value)
@@ -390,7 +391,7 @@ class TestMessageListApi:
             with pytest.raises(NotChatAppError):
                 handler(api, app_model=app_model, end_user=end_user)
 
-    def test_conversation_not_found(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_conversation_not_found(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setattr(
             MessageService,
             "pagination_by_first_id",
@@ -409,7 +410,7 @@ class TestMessageListApi:
             with pytest.raises(NotFound):
                 handler(api, app_model=app_model, end_user=end_user)
 
-    def test_first_message_not_found(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_first_message_not_found(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setattr(
             MessageService,
             "pagination_by_first_id",
@@ -430,7 +431,7 @@ class TestMessageListApi:
 
 
 class TestMessageFeedbackApi:
-    def test_not_found(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_not_found(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setattr(
             MessageService,
             "create_feedback",
@@ -452,7 +453,7 @@ class TestMessageFeedbackApi:
 
 
 class TestAppGetFeedbacksApi:
-    def test_success(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_success(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setattr(MessageService, "get_all_messages_feedbacks", lambda *_args, **_kwargs: ["f1"])
 
         api = AppGetFeedbacksApi()
@@ -466,7 +467,7 @@ class TestAppGetFeedbacksApi:
 
 
 class TestMessageSuggestedApi:
-    def test_not_chat(self, app) -> None:
+    def test_not_chat(self, app: Flask) -> None:
         api = MessageSuggestedApi()
         handler = _unwrap(api.get)
         app_model = SimpleNamespace(mode=AppMode.COMPLETION.value)
@@ -476,7 +477,7 @@ class TestMessageSuggestedApi:
             with pytest.raises(NotChatAppError):
                 handler(api, app_model=app_model, end_user=end_user, message_id="m1")
 
-    def test_not_found(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_not_found(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setattr(
             MessageService,
             "get_suggested_questions_after_answer",
@@ -492,7 +493,7 @@ class TestMessageSuggestedApi:
             with pytest.raises(NotFound):
                 handler(api, app_model=app_model, end_user=end_user, message_id="m1")
 
-    def test_disabled(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_disabled(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setattr(
             MessageService,
             "get_suggested_questions_after_answer",
@@ -508,7 +509,7 @@ class TestMessageSuggestedApi:
             with pytest.raises(BadRequest):
                 handler(api, app_model=app_model, end_user=end_user, message_id="m1")
 
-    def test_internal_error(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_internal_error(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setattr(
             MessageService,
             "get_suggested_questions_after_answer",
@@ -524,7 +525,7 @@ class TestMessageSuggestedApi:
             with pytest.raises(InternalServerError):
                 handler(api, app_model=app_model, end_user=end_user, message_id="m1")
 
-    def test_success(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_success(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setattr(
             MessageService,
             "get_suggested_questions_after_answer",
diff --git a/api/tests/unit_tests/controllers/service_api/app/test_workflow.py b/api/tests/unit_tests/controllers/service_api/app/test_workflow.py
index da09ec13ce..7115ea1e12 100644
--- a/api/tests/unit_tests/controllers/service_api/app/test_workflow.py
+++ b/api/tests/unit_tests/controllers/service_api/app/test_workflow.py
@@ -20,6 +20,7 @@ from types import SimpleNamespace
 from unittest.mock import Mock, patch
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import BadRequest, NotFound
 
 from controllers.service_api.app.error import NotWorkflowAppError
@@ -366,7 +367,7 @@ class TestWorkflowRunRepository:
 
 
 class TestWorkflowRunDetailApi:
-    def test_not_workflow_app(self, app) -> None:
+    def test_not_workflow_app(self, app: Flask) -> None:
         api = WorkflowRunDetailApi()
         handler = _unwrap(api.get)
         app_model = SimpleNamespace(mode=AppMode.CHAT.value)
@@ -397,7 +398,7 @@ class TestWorkflowRunDetailApi:
 
 
 class TestWorkflowRunApi:
-    def test_not_workflow_app(self, app) -> None:
+    def test_not_workflow_app(self, app: Flask) -> None:
         api = WorkflowRunApi()
         handler = _unwrap(api.post)
         app_model = SimpleNamespace(mode=AppMode.CHAT.value)
@@ -407,7 +408,7 @@ class TestWorkflowRunApi:
             with pytest.raises(NotWorkflowAppError):
                 handler(api, app_model=app_model, end_user=end_user)
 
-    def test_rate_limit(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_rate_limit(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setattr(
             AppGenerateService,
             "generate",
@@ -425,7 +426,7 @@ class TestWorkflowRunApi:
 
 
 class TestWorkflowRunByIdApi:
-    def test_not_found(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_not_found(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setattr(
             AppGenerateService,
             "generate",
@@ -441,7 +442,7 @@ class TestWorkflowRunByIdApi:
             with pytest.raises(NotFound):
                 handler(api, app_model=app_model, end_user=end_user, workflow_id="w1")
 
-    def test_draft_workflow(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_draft_workflow(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         monkeypatch.setattr(
             AppGenerateService,
             "generate",
@@ -459,7 +460,7 @@ class TestWorkflowRunByIdApi:
 
 
 class TestWorkflowTaskStopApi:
-    def test_wrong_mode(self, app) -> None:
+    def test_wrong_mode(self, app: Flask) -> None:
         api = WorkflowTaskStopApi()
         handler = _unwrap(api.post)
         app_model = SimpleNamespace(mode=AppMode.CHAT.value)
@@ -469,7 +470,7 @@ class TestWorkflowTaskStopApi:
             with pytest.raises(NotWorkflowAppError):
                 handler(api, app_model=app_model, end_user=end_user, task_id="t1")
 
-    def test_success(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_success(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         stop_mock = Mock()
         send_mock = Mock()
         monkeypatch.setattr(AppQueueManager, "set_stop_flag_no_user_check", stop_mock)
@@ -489,7 +490,7 @@ class TestWorkflowTaskStopApi:
 
 
 class TestWorkflowAppLogApi:
-    def test_success(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_success(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         class _BeginStub:
             def __enter__(self):
                 return SimpleNamespace()
@@ -557,7 +558,7 @@ class TestWorkflowRunDetailApiGet:
         self,
         mock_db,
         mock_repo_factory,
-        app,
+        app: Flask,
         mock_workflow_app,
     ):
         """Test successful workflow run detail retrieval."""
@@ -579,7 +580,7 @@ class TestWorkflowRunDetailApiGet:
         assert result["status"] == "succeeded"
 
     @patch("controllers.service_api.app.workflow.db")
-    def test_get_workflow_run_wrong_app_mode(self, mock_db, app):
+    def test_get_workflow_run_wrong_app_mode(self, mock_db, app: Flask):
         """Test NotWorkflowAppError when app mode is not workflow or advanced_chat."""
         from controllers.service_api.app.workflow import WorkflowRunDetailApi
 
@@ -604,7 +605,7 @@ class TestWorkflowTaskStopApiPost:
         self,
         mock_queue_mgr,
         mock_graph_mgr,
-        app,
+        app: Flask,
         mock_workflow_app,
     ):
         """Test successful workflow task stop."""
@@ -624,7 +625,7 @@ class TestWorkflowTaskStopApiPost:
         mock_graph_mgr.assert_called_once()
         mock_graph_mgr.return_value.send_stop_command.assert_called_once_with("task-1")
 
-    def test_stop_workflow_task_wrong_app_mode(self, app):
+    def test_stop_workflow_task_wrong_app_mode(self, app: Flask):
         """Test NotWorkflowAppError when app mode is not workflow."""
         from controllers.service_api.app.workflow import WorkflowTaskStopApi
 
@@ -649,7 +650,7 @@ class TestWorkflowAppLogApiGet:
         self,
         mock_db,
         mock_wf_svc_cls,
-        app,
+        app: Flask,
         mock_workflow_app,
     ):
         """Test successful workflow log retrieval."""
diff --git a/api/tests/unit_tests/controllers/service_api/app/test_workflow_events.py b/api/tests/unit_tests/controllers/service_api/app/test_workflow_events.py
index f45a7f9632..a1aca06570 100644
--- a/api/tests/unit_tests/controllers/service_api/app/test_workflow_events.py
+++ b/api/tests/unit_tests/controllers/service_api/app/test_workflow_events.py
@@ -9,6 +9,7 @@ from types import SimpleNamespace
 from unittest.mock import Mock
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import NotFound
 
 from controllers.service_api.app.error import NotWorkflowAppError
@@ -31,7 +32,7 @@ def _mock_repo_for_run(monkeypatch: pytest.MonkeyPatch, workflow_run):
 
 
 class TestWorkflowEventsApi:
-    def test_wrong_app_mode(self, app) -> None:
+    def test_wrong_app_mode(self, app: Flask) -> None:
         api = WorkflowEventsApi()
         handler = _unwrap(api.get)
         app_model = SimpleNamespace(mode=AppMode.CHAT.value)
@@ -41,7 +42,7 @@ class TestWorkflowEventsApi:
             with pytest.raises(NotWorkflowAppError):
                 handler(api, app_model=app_model, end_user=end_user, task_id="run-1")
 
-    def test_workflow_run_not_found(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_workflow_run_not_found(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         _mock_repo_for_run(monkeypatch, workflow_run=None)
         api = WorkflowEventsApi()
         handler = _unwrap(api.get)
@@ -52,7 +53,7 @@ class TestWorkflowEventsApi:
             with pytest.raises(NotFound):
                 handler(api, app_model=app_model, end_user=end_user, task_id="run-1")
 
-    def test_workflow_run_permission_denied(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_workflow_run_permission_denied(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         workflow_run = SimpleNamespace(
             id="run-1",
             app_id="app-1",
@@ -70,7 +71,7 @@ class TestWorkflowEventsApi:
             with pytest.raises(NotFound):
                 handler(api, app_model=app_model, end_user=end_user, task_id="run-1")
 
-    def test_finished_run_returns_sse(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_finished_run_returns_sse(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         workflow_run = SimpleNamespace(
             id="run-1",
             app_id="app-1",
@@ -103,7 +104,7 @@ class TestWorkflowEventsApi:
         assert payload["task_id"] == "run-1"
         assert payload["event"] == "workflow_finished"
 
-    def test_running_run_streams_events(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_running_run_streams_events(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         workflow_run = SimpleNamespace(
             id="run-1",
             app_id="app-1",
@@ -135,7 +136,7 @@ class TestWorkflowEventsApi:
         )
         workflow_generator.convert_to_event_stream.assert_called_once_with(["raw-event"])
 
-    def test_running_run_with_snapshot(self, app, monkeypatch: pytest.MonkeyPatch) -> None:
+    def test_running_run_with_snapshot(self, app: Flask, monkeypatch: pytest.MonkeyPatch) -> None:
         workflow_run = SimpleNamespace(
             id="run-1",
             app_id="app-1",
diff --git a/api/tests/unit_tests/controllers/service_api/dataset/rag_pipeline/test_rag_pipeline_workflow.py b/api/tests/unit_tests/controllers/service_api/dataset/rag_pipeline/test_rag_pipeline_workflow.py
index f33c482d04..362af883ed 100644
--- a/api/tests/unit_tests/controllers/service_api/dataset/rag_pipeline/test_rag_pipeline_workflow.py
+++ b/api/tests/unit_tests/controllers/service_api/dataset/rag_pipeline/test_rag_pipeline_workflow.py
@@ -23,6 +23,7 @@ from datetime import UTC, datetime
 from unittest.mock import Mock, patch
 
 import pytest
+from flask import Flask
 from werkzeug.datastructures import FileStorage
 from werkzeug.exceptions import Forbidden, NotFound
 
@@ -373,7 +374,7 @@ class TestDatasourcePluginsApiGet:
 
     @patch("controllers.service_api.dataset.rag_pipeline.rag_pipeline_workflow.db")
     @patch("controllers.service_api.dataset.rag_pipeline.rag_pipeline_workflow.RagPipelineService")
-    def test_get_plugins_success(self, mock_svc_cls, mock_db, app):
+    def test_get_plugins_success(self, mock_svc_cls, mock_db, app: Flask):
         """Test successful retrieval of datasource plugins."""
         tenant_id = str(uuid.uuid4())
         dataset_id = str(uuid.uuid4())
@@ -396,7 +397,7 @@ class TestDatasourcePluginsApiGet:
         )
 
     @patch("controllers.service_api.dataset.rag_pipeline.rag_pipeline_workflow.db")
-    def test_get_plugins_not_found(self, mock_db, app):
+    def test_get_plugins_not_found(self, mock_db, app: Flask):
         """Test NotFound when dataset check fails."""
         mock_db.session.scalar.return_value = None
 
@@ -407,7 +408,7 @@ class TestDatasourcePluginsApiGet:
 
     @patch("controllers.service_api.dataset.rag_pipeline.rag_pipeline_workflow.db")
     @patch("controllers.service_api.dataset.rag_pipeline.rag_pipeline_workflow.RagPipelineService")
-    def test_get_plugins_empty_list(self, mock_svc_cls, mock_db, app):
+    def test_get_plugins_empty_list(self, mock_svc_cls, mock_db, app: Flask):
         """Test empty plugin list."""
         mock_db.session.scalar.return_value = Mock()
         mock_svc_instance = Mock()
@@ -439,7 +440,7 @@ class TestDatasourceNodeRunApiPost:
     @patch("controllers.service_api.dataset.rag_pipeline.rag_pipeline_workflow.RagPipelineService")
     @patch("controllers.service_api.dataset.rag_pipeline.rag_pipeline_workflow.db")
     @patch("controllers.service_api.dataset.rag_pipeline.rag_pipeline_workflow.service_api_ns")
-    def test_post_success(self, mock_ns, mock_db, mock_svc_cls, mock_current_user, mock_gen, mock_helper, app):
+    def test_post_success(self, mock_ns, mock_db, mock_svc_cls, mock_current_user, mock_gen, mock_helper, app: Flask):
         """Test successful datasource node run."""
         tenant_id = str(uuid.uuid4())
         dataset_id = str(uuid.uuid4())
@@ -473,7 +474,7 @@ class TestDatasourceNodeRunApiPost:
         mock_svc_instance.run_datasource_workflow_node.assert_called_once()
 
     @patch("controllers.service_api.dataset.rag_pipeline.rag_pipeline_workflow.db")
-    def test_post_not_found(self, mock_db, app):
+    def test_post_not_found(self, mock_db, app: Flask):
         """Test NotFound when dataset check fails."""
         mock_db.session.scalar.return_value = None
 
@@ -488,7 +489,7 @@ class TestDatasourceNodeRunApiPost:
     )
     @patch("controllers.service_api.dataset.rag_pipeline.rag_pipeline_workflow.db")
     @patch("controllers.service_api.dataset.rag_pipeline.rag_pipeline_workflow.service_api_ns")
-    def test_post_fails_when_current_user_not_account(self, mock_ns, mock_db, app):
+    def test_post_fails_when_current_user_not_account(self, mock_ns, mock_db, app: Flask):
         """Test AssertionError when current_user is not an Account instance."""
         mock_db.session.scalar.return_value = Mock()
         mock_ns.payload = {
@@ -549,7 +550,7 @@ class TestPipelineRunApiPost:
         mock_gen_svc.generate.assert_called_once()
 
     @patch("controllers.service_api.dataset.rag_pipeline.rag_pipeline_workflow.db")
-    def test_post_not_found(self, mock_db, app):
+    def test_post_not_found(self, mock_db, app: Flask):
         """Test NotFound when dataset check fails."""
         mock_db.session.scalar.return_value = None
 
@@ -561,7 +562,7 @@ class TestPipelineRunApiPost:
     @patch("controllers.service_api.dataset.rag_pipeline.rag_pipeline_workflow.current_user", new="not_account")
     @patch("controllers.service_api.dataset.rag_pipeline.rag_pipeline_workflow.db")
     @patch("controllers.service_api.dataset.rag_pipeline.rag_pipeline_workflow.service_api_ns")
-    def test_post_forbidden_non_account_user(self, mock_ns, mock_db, app):
+    def test_post_forbidden_non_account_user(self, mock_ns, mock_db, app: Flask):
         """Test Forbidden when current_user is not an Account."""
         mock_db.session.scalar.return_value = Mock()
         mock_ns.payload = {
@@ -585,7 +586,7 @@ class TestFileUploadApiPost:
     @patch("controllers.service_api.dataset.rag_pipeline.rag_pipeline_workflow.FileService")
     @patch("controllers.service_api.dataset.rag_pipeline.rag_pipeline_workflow.current_user")
     @patch("controllers.service_api.dataset.rag_pipeline.rag_pipeline_workflow.db")
-    def test_upload_success(self, mock_db, mock_current_user, mock_file_svc_cls, app):
+    def test_upload_success(self, mock_db, mock_current_user, mock_file_svc_cls, app: Flask):
         """Test successful file upload."""
         mock_current_user.__bool__ = Mock(return_value=True)
 
@@ -621,7 +622,7 @@ class TestFileUploadApiPost:
         assert response["name"] == "doc.pdf"
         assert response["extension"] == "pdf"
 
-    def test_upload_no_file(self, app):
+    def test_upload_no_file(self, app: Flask):
         """Test error when no file is uploaded."""
         with app.test_request_context(
             "/datasets/pipeline/file-upload",
diff --git a/api/tests/unit_tests/controllers/service_api/dataset/test_dataset_segment.py b/api/tests/unit_tests/controllers/service_api/dataset/test_dataset_segment.py
index e9c3e6d376..fe8fc02548 100644
--- a/api/tests/unit_tests/controllers/service_api/dataset/test_dataset_segment.py
+++ b/api/tests/unit_tests/controllers/service_api/dataset/test_dataset_segment.py
@@ -18,6 +18,7 @@ import uuid
 from unittest.mock import Mock, patch
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import NotFound
 
 from controllers.service_api.dataset.segment import (
@@ -782,7 +783,7 @@ class TestSegmentApiGet:
         mock_seg_svc,
         mock_marshal,
         mock_summary_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
         mock_segment,
@@ -893,7 +894,7 @@ class TestSegmentApiPost:
         mock_seg_svc,
         mock_marshal,
         mock_summary_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
         mock_segment,
@@ -946,7 +947,7 @@ class TestSegmentApiPost:
         mock_db,
         mock_account_fn,
         mock_doc_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -989,7 +990,7 @@ class TestSegmentApiPost:
         mock_db,
         mock_account_fn,
         mock_doc_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1041,7 +1042,7 @@ class TestDatasetSegmentApiDelete:
         mock_doc_svc,
         mock_dataset_svc,
         mock_seg_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
         mock_segment,
@@ -1086,7 +1087,7 @@ class TestDatasetSegmentApiDelete:
         mock_account_fn,
         mock_doc_svc,
         mock_seg_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1128,7 +1129,7 @@ class TestDatasetSegmentApiDelete:
         mock_account_fn,
         mock_doc_svc,
         mock_dataset_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1162,7 +1163,7 @@ class TestDatasetSegmentApiDelete:
         mock_account_fn,
         mock_dataset_svc,
         mock_doc_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1232,7 +1233,7 @@ class TestDatasetSegmentApiUpdate:
         mock_seg_svc,
         mock_marshal,
         mock_summary_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
         mock_segment,
@@ -1282,7 +1283,7 @@ class TestDatasetSegmentApiUpdate:
         mock_account_fn,
         mock_dataset_svc,
         mock_doc_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1322,7 +1323,7 @@ class TestDatasetSegmentApiUpdate:
         mock_dataset_svc,
         mock_doc_svc,
         mock_seg_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1374,7 +1375,7 @@ class TestDatasetSegmentApiGetSingle:
         mock_seg_svc,
         mock_marshal,
         mock_summary_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
         mock_segment,
@@ -1421,7 +1422,7 @@ class TestDatasetSegmentApiGetSingle:
         mock_seg_svc,
         mock_marshal,
         mock_summary_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
         mock_segment,
@@ -1460,7 +1461,7 @@ class TestDatasetSegmentApiGetSingle:
         self,
         mock_db,
         mock_account_fn,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1491,7 +1492,7 @@ class TestDatasetSegmentApiGetSingle:
         mock_account_fn,
         mock_dataset_svc,
         mock_doc_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1526,7 +1527,7 @@ class TestDatasetSegmentApiGetSingle:
         mock_dataset_svc,
         mock_doc_svc,
         mock_seg_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1570,7 +1571,7 @@ class TestChildChunkApiGet:
         mock_doc_svc,
         mock_seg_svc,
         mock_marshal,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1609,7 +1610,7 @@ class TestChildChunkApiGet:
         self,
         mock_db,
         mock_account_fn,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1638,7 +1639,7 @@ class TestChildChunkApiGet:
         mock_db,
         mock_account_fn,
         mock_doc_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1670,7 +1671,7 @@ class TestChildChunkApiGet:
         mock_account_fn,
         mock_doc_svc,
         mock_seg_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1729,7 +1730,7 @@ class TestChildChunkApiPost:
         mock_doc_svc,
         mock_seg_svc,
         mock_marshal,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1771,7 +1772,7 @@ class TestChildChunkApiPost:
         mock_feature_svc,
         mock_db,
         mock_account_fn,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1809,7 +1810,7 @@ class TestChildChunkApiPost:
         mock_account_fn,
         mock_doc_svc,
         mock_seg_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1863,7 +1864,7 @@ class TestDatasetChildChunkApiDelete:
         mock_account_fn,
         mock_doc_svc,
         mock_seg_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1913,7 +1914,7 @@ class TestDatasetChildChunkApiDelete:
         mock_account_fn,
         mock_doc_svc,
         mock_seg_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1954,7 +1955,7 @@ class TestDatasetChildChunkApiDelete:
         mock_account_fn,
         mock_doc_svc,
         mock_seg_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1994,7 +1995,7 @@ class TestDatasetChildChunkApiDelete:
         mock_account_fn,
         mock_doc_svc,
         mock_seg_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
diff --git a/api/tests/unit_tests/controllers/service_api/dataset/test_document.py b/api/tests/unit_tests/controllers/service_api/dataset/test_document.py
index 230c51161f..61ec397193 100644
--- a/api/tests/unit_tests/controllers/service_api/dataset/test_document.py
+++ b/api/tests/unit_tests/controllers/service_api/dataset/test_document.py
@@ -19,6 +19,7 @@ import uuid
 from unittest.mock import Mock, patch
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import Forbidden, NotFound
 
 from controllers.service_api.dataset.document import (
@@ -550,7 +551,7 @@ class TestDocumentApiGet:
     @patch("controllers.service_api.dataset.document.DatasetService")
     @patch("controllers.service_api.dataset.document.DocumentService")
     def test_get_document_success_with_all_metadata(
-        self, mock_doc_svc, mock_dataset_svc, app, mock_tenant, mock_doc_detail
+        self, mock_doc_svc, mock_dataset_svc, app: Flask, mock_tenant, mock_doc_detail
     ):
         """Test successful document retrieval with metadata='all'."""
         # Arrange
@@ -579,7 +580,7 @@ class TestDocumentApiGet:
         assert "doc_metadata" in response
 
     @patch("controllers.service_api.dataset.document.DocumentService")
-    def test_get_document_not_found(self, mock_doc_svc, app, mock_tenant):
+    def test_get_document_not_found(self, mock_doc_svc, app: Flask, mock_tenant):
         """Test 404 when document is not found."""
         # Arrange
         dataset_id = str(uuid.uuid4())
@@ -599,7 +600,7 @@ class TestDocumentApiGet:
                 api.get(tenant_id=mock_tenant.id, dataset_id=dataset_id, document_id="nonexistent")
 
     @patch("controllers.service_api.dataset.document.DocumentService")
-    def test_get_document_forbidden_wrong_tenant(self, mock_doc_svc, app, mock_tenant, mock_doc_detail):
+    def test_get_document_forbidden_wrong_tenant(self, mock_doc_svc, app: Flask, mock_tenant, mock_doc_detail):
         """Test 403 when document tenant doesn't match request tenant."""
         # Arrange
         dataset_id = str(uuid.uuid4())
@@ -620,7 +621,7 @@ class TestDocumentApiGet:
                 api.get(tenant_id=mock_tenant.id, dataset_id=dataset_id, document_id=mock_doc_detail.id)
 
     @patch("controllers.service_api.dataset.document.DocumentService")
-    def test_get_document_metadata_only(self, mock_doc_svc, app, mock_tenant, mock_doc_detail):
+    def test_get_document_metadata_only(self, mock_doc_svc, app: Flask, mock_tenant, mock_doc_detail):
         """Test document retrieval with metadata='only'."""
         # Arrange
         dataset_id = str(uuid.uuid4())
@@ -647,7 +648,9 @@ class TestDocumentApiGet:
 
     @patch("controllers.service_api.dataset.document.DatasetService")
     @patch("controllers.service_api.dataset.document.DocumentService")
-    def test_get_document_metadata_without(self, mock_doc_svc, mock_dataset_svc, app, mock_tenant, mock_doc_detail):
+    def test_get_document_metadata_without(
+        self, mock_doc_svc, mock_dataset_svc, app: Flask, mock_tenant, mock_doc_detail
+    ):
         """Test document retrieval with metadata='without'."""
         # Arrange
         dataset_id = str(uuid.uuid4())
@@ -674,7 +677,7 @@ class TestDocumentApiGet:
         assert "name" in response
 
     @patch("controllers.service_api.dataset.document.DocumentService")
-    def test_get_document_invalid_metadata_value(self, mock_doc_svc, app, mock_tenant, mock_doc_detail):
+    def test_get_document_invalid_metadata_value(self, mock_doc_svc, app: Flask, mock_tenant, mock_doc_detail):
         """Test error when metadata parameter has invalid value."""
         # Arrange
         dataset_id = str(uuid.uuid4())
@@ -713,7 +716,7 @@ class TestDocumentApiDelete:
 
     @patch("controllers.service_api.dataset.document.DocumentService")
     @patch("controllers.service_api.dataset.document.db")
-    def test_delete_document_success(self, mock_db, mock_doc_svc, app, mock_tenant, mock_document):
+    def test_delete_document_success(self, mock_db, mock_doc_svc, app: Flask, mock_tenant, mock_document):
         """Test successful document deletion."""
         # Arrange
         dataset_id = str(uuid.uuid4())
@@ -741,7 +744,7 @@ class TestDocumentApiDelete:
 
     @patch("controllers.service_api.dataset.document.DocumentService")
     @patch("controllers.service_api.dataset.document.db")
-    def test_delete_document_not_found(self, mock_db, mock_doc_svc, app, mock_tenant):
+    def test_delete_document_not_found(self, mock_db, mock_doc_svc, app: Flask, mock_tenant):
         """Test 404 when document not found."""
         # Arrange
         dataset_id = str(uuid.uuid4())
@@ -763,7 +766,7 @@ class TestDocumentApiDelete:
 
     @patch("controllers.service_api.dataset.document.DocumentService")
     @patch("controllers.service_api.dataset.document.db")
-    def test_delete_document_archived_forbidden(self, mock_db, mock_doc_svc, app, mock_tenant, mock_document):
+    def test_delete_document_archived_forbidden(self, mock_db, mock_doc_svc, app: Flask, mock_tenant, mock_document):
         """Test ArchivedDocumentImmutableError when deleting archived document."""
         # Arrange
         dataset_id = str(uuid.uuid4())
@@ -785,7 +788,7 @@ class TestDocumentApiDelete:
 
     @patch("controllers.service_api.dataset.document.DocumentService")
     @patch("controllers.service_api.dataset.document.db")
-    def test_delete_document_dataset_not_found(self, mock_db, mock_doc_svc, app, mock_tenant):
+    def test_delete_document_dataset_not_found(self, mock_db, mock_doc_svc, app: Flask, mock_tenant):
         """Test ValueError when dataset not found."""
         # Arrange
         dataset_id = str(uuid.uuid4())
@@ -808,7 +811,7 @@ class TestDocumentListApi:
     @patch("controllers.service_api.dataset.document.marshal")
     @patch("controllers.service_api.dataset.document.DocumentService")
     @patch("controllers.service_api.dataset.document.db")
-    def test_list_documents_success(self, mock_db, mock_doc_svc, mock_marshal, app, mock_tenant, mock_dataset):
+    def test_list_documents_success(self, mock_db, mock_doc_svc, mock_marshal, app: Flask, mock_tenant, mock_dataset):
         """Test successful document list retrieval."""
         # Arrange
         mock_db.session.scalar.return_value = mock_dataset
@@ -837,7 +840,7 @@ class TestDocumentListApi:
         assert response["total"] == 2
 
     @patch("controllers.service_api.dataset.document.db")
-    def test_list_documents_dataset_not_found(self, mock_db, app, mock_tenant, mock_dataset):
+    def test_list_documents_dataset_not_found(self, mock_db, app: Flask, mock_tenant, mock_dataset):
         """Test 404 when dataset not found."""
         # Arrange
         mock_db.session.scalar.return_value = None
@@ -858,7 +861,9 @@ class TestDocumentIndexingStatusApi:
     @patch("controllers.service_api.dataset.document.marshal")
     @patch("controllers.service_api.dataset.document.DocumentService")
     @patch("controllers.service_api.dataset.document.db")
-    def test_get_indexing_status_success(self, mock_db, mock_doc_svc, mock_marshal, app, mock_tenant, mock_dataset):
+    def test_get_indexing_status_success(
+        self, mock_db, mock_doc_svc, mock_marshal, app: Flask, mock_tenant, mock_dataset
+    ):
         """Test successful indexing status retrieval."""
         # Arrange
         batch_id = "batch_123"
@@ -894,7 +899,7 @@ class TestDocumentIndexingStatusApi:
         assert len(response["data"]) == 1
 
     @patch("controllers.service_api.dataset.document.db")
-    def test_get_indexing_status_dataset_not_found(self, mock_db, app, mock_tenant, mock_dataset):
+    def test_get_indexing_status_dataset_not_found(self, mock_db, app: Flask, mock_tenant, mock_dataset):
         """Test 404 when dataset not found."""
         # Arrange
         batch_id = "batch_123"
@@ -911,7 +916,9 @@ class TestDocumentIndexingStatusApi:
 
     @patch("controllers.service_api.dataset.document.DocumentService")
     @patch("controllers.service_api.dataset.document.db")
-    def test_get_indexing_status_documents_not_found(self, mock_db, mock_doc_svc, app, mock_tenant, mock_dataset):
+    def test_get_indexing_status_documents_not_found(
+        self, mock_db, mock_doc_svc, app: Flask, mock_tenant, mock_dataset
+    ):
         """Test 404 when no documents found for batch."""
         # Arrange
         batch_id = "batch_empty"
@@ -978,7 +985,7 @@ class TestDocumentAddByTextApi:
         mock_knowledge_config,
         mock_doc_svc,
         mock_marshal,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1029,7 +1036,7 @@ class TestDocumentAddByTextApi:
     @patch("controllers.service_api.wraps.validate_and_get_api_token")
     @patch("controllers.service_api.dataset.document.db")
     def test_create_document_dataset_not_found(
-        self, mock_db, mock_validate_token, mock_feature_svc, app, mock_tenant, mock_dataset
+        self, mock_db, mock_validate_token, mock_feature_svc, app: Flask, mock_tenant, mock_dataset
     ):
         """Test ValueError when dataset not found."""
         # Arrange — neutralise billing decorators
@@ -1052,13 +1059,13 @@ class TestDocumentAddByTextApi:
     @patch("controllers.service_api.wraps.validate_and_get_api_token")
     @patch("controllers.service_api.dataset.document.db")
     def test_create_document_missing_indexing_technique(
-        self, mock_db, mock_validate_token, mock_feature_svc, app, mock_tenant, mock_dataset
+        self, mock_db, mock_validate_token, mock_feature_svc, app: Flask, mock_tenant, mock_dataset
     ):
         """Test error when both dataset and payload lack indexing_technique.
 
         When ``indexing_technique`` is ``None`` in the payload, ``model_dump(exclude_none=True)``
-        omits the key.  The production code accesses ``args["indexing_technique"]`` which raises
-        ``KeyError`` before the ``ValueError`` guard can fire.
+        omits the key.  The service API should still raise the same validation error as other
+        document creation paths instead of leaking a ``KeyError`` from the dumped payload dict.
         """
         # Arrange — neutralise billing decorators
         self._setup_billing_mocks(mock_validate_token, mock_feature_svc, mock_tenant.id)
@@ -1074,7 +1081,7 @@ class TestDocumentAddByTextApi:
             headers={"Authorization": "Bearer test_token"},
         ):
             api = DocumentAddByTextApi()
-            with pytest.raises(KeyError):
+            with pytest.raises(ValueError, match="indexing_technique is required."):
                 api.post(tenant_id=mock_tenant.id, dataset_id=mock_dataset.id)
 
 
@@ -1161,7 +1168,7 @@ class TestDocumentUpdateByTextApiPost:
         mock_file_svc_cls,
         mock_doc_svc,
         mock_marshal,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1206,7 +1213,7 @@ class TestDocumentUpdateByTextApiPost:
         mock_validate_token,
         mock_feature_svc,
         mock_db,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1245,7 +1252,7 @@ class TestDocumentAddByFileApiPost:
         mock_validate_token,
         mock_feature_svc,
         mock_db,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1275,7 +1282,7 @@ class TestDocumentAddByFileApiPost:
         mock_validate_token,
         mock_feature_svc,
         mock_db,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1306,7 +1313,7 @@ class TestDocumentAddByFileApiPost:
         mock_validate_token,
         mock_feature_svc,
         mock_db,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1338,7 +1345,7 @@ class TestDocumentAddByFileApiPost:
         mock_validate_token,
         mock_feature_svc,
         mock_db,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1381,7 +1388,7 @@ class TestDocumentUpdateByFileApiPatch:
         mock_feature_svc,
         mock_update_document_by_file,
         route_name,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1418,7 +1425,7 @@ class TestDocumentUpdateByFileApiPatch:
         mock_validate_token,
         mock_feature_svc,
         mock_db,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1453,7 +1460,7 @@ class TestDocumentUpdateByFileApiPatch:
         mock_validate_token,
         mock_feature_svc,
         mock_db,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -1497,7 +1504,7 @@ class TestDocumentUpdateByFileApiPatch:
         mock_file_svc_cls,
         mock_doc_svc,
         mock_marshal,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
diff --git a/api/tests/unit_tests/controllers/service_api/dataset/test_hit_testing.py b/api/tests/unit_tests/controllers/service_api/dataset/test_hit_testing.py
index a26cdf6563..38fcb55fc0 100644
--- a/api/tests/unit_tests/controllers/service_api/dataset/test_hit_testing.py
+++ b/api/tests/unit_tests/controllers/service_api/dataset/test_hit_testing.py
@@ -18,6 +18,7 @@ import uuid
 from unittest.mock import Mock, patch
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import Forbidden, NotFound
 
 import services
@@ -91,7 +92,7 @@ class TestHitTestingApiPost:
         mock_hit_svc,
         mock_marshal,
         mock_ns,
-        app,
+        app: Flask,
     ):
         """Test successful hit testing request."""
         dataset_id = str(uuid.uuid4())
@@ -103,7 +104,7 @@ class TestHitTestingApiPost:
         mock_dataset_svc.get_dataset.return_value = mock_dataset
         mock_dataset_svc.check_dataset_permission.return_value = None
 
-        mock_hit_svc.retrieve.return_value = {"query": "test query", "records": []}
+        mock_hit_svc.retrieve.return_value = {"query": {"content": "test query"}, "records": []}
         mock_hit_svc.hit_testing_args_check.return_value = None
         mock_marshal.return_value = []
 
@@ -129,7 +130,7 @@ class TestHitTestingApiPost:
         mock_hit_svc,
         mock_marshal,
         mock_ns,
-        app,
+        app: Flask,
     ):
         """Test hit testing with custom retrieval model."""
         dataset_id = str(uuid.uuid4())
@@ -149,7 +150,7 @@ class TestHitTestingApiPost:
             "score_threshold": 0.8,
         }
 
-        mock_hit_svc.retrieve.return_value = {"query": "complex query", "records": []}
+        mock_hit_svc.retrieve.return_value = {"query": {"content": "complex query"}, "records": []}
         mock_hit_svc.hit_testing_args_check.return_value = None
         mock_marshal.return_value = []
 
@@ -183,7 +184,7 @@ class TestHitTestingApiPost:
         mock_hit_svc,
         mock_marshal,
         mock_ns,
-        app,
+        app: Flask,
     ):
         """Service API retrieval payload should not drop metadata filters."""
         dataset_id = str(uuid.uuid4())
@@ -194,7 +195,7 @@ class TestHitTestingApiPost:
 
         mock_dataset_svc.get_dataset.return_value = mock_dataset
         mock_dataset_svc.check_dataset_permission.return_value = None
-        mock_hit_svc.retrieve.return_value = {"query": "filtered query", "records": []}
+        mock_hit_svc.retrieve.return_value = {"query": {"content": "filtered query"}, "records": []}
         mock_hit_svc.hit_testing_args_check.return_value = None
         mock_marshal.return_value = []
 
@@ -232,16 +233,16 @@ class TestHitTestingApiPost:
     @patch("controllers.console.datasets.hit_testing_base.HitTestingService")
     @patch("controllers.console.datasets.hit_testing_base.DatasetService")
     @patch("controllers.console.datasets.hit_testing_base.current_user", new_callable=lambda: Mock(spec=Account))
-    def test_post_normalizes_legacy_query_and_nullable_list_fields(
+    def test_post_prepares_nullable_list_fields(
         self,
         mock_current_user,
         mock_dataset_svc,
         mock_hit_svc,
         mock_marshal,
         mock_ns,
-        app,
+        app: Flask,
     ):
-        """Test service API normalizes legacy query shape and nullable list fields."""
+        """Test service API prepares nullable list fields from marshalled records."""
         dataset_id = str(uuid.uuid4())
         tenant_id = str(uuid.uuid4())
 
@@ -286,7 +287,7 @@ class TestHitTestingApiPost:
         mock_current_user,
         mock_dataset_svc,
         mock_ns,
-        app,
+        app: Flask,
     ):
         """Test hit testing with non-existent dataset."""
         dataset_id = str(uuid.uuid4())
@@ -308,7 +309,7 @@ class TestHitTestingApiPost:
         mock_current_user,
         mock_dataset_svc,
         mock_ns,
-        app,
+        app: Flask,
     ):
         """Test hit testing when user lacks dataset permission."""
         dataset_id = str(uuid.uuid4())
diff --git a/api/tests/unit_tests/controllers/service_api/dataset/test_metadata.py b/api/tests/unit_tests/controllers/service_api/dataset/test_metadata.py
index b93a1cf14b..b7e24f9201 100644
--- a/api/tests/unit_tests/controllers/service_api/dataset/test_metadata.py
+++ b/api/tests/unit_tests/controllers/service_api/dataset/test_metadata.py
@@ -19,6 +19,7 @@ import uuid
 from unittest.mock import Mock, patch
 
 import pytest
+from flask import Flask
 from werkzeug.exceptions import NotFound
 
 from controllers.service_api.dataset.metadata import (
@@ -76,7 +77,7 @@ class TestDatasetMetadataCreatePost:
         mock_dataset_svc,
         mock_meta_svc,
         mock_marshal,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -106,7 +107,7 @@ class TestDatasetMetadataCreatePost:
     def test_create_metadata_dataset_not_found(
         self,
         mock_dataset_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -136,7 +137,7 @@ class TestDatasetMetadataCreateGet:
         self,
         mock_dataset_svc,
         mock_meta_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -160,7 +161,7 @@ class TestDatasetMetadataCreateGet:
     def test_get_metadata_dataset_not_found(
         self,
         mock_dataset_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -201,7 +202,7 @@ class TestDatasetMetadataServiceApiPatch:
         mock_dataset_svc,
         mock_meta_svc,
         mock_marshal,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -232,7 +233,7 @@ class TestDatasetMetadataServiceApiPatch:
     def test_update_metadata_dataset_not_found(
         self,
         mock_dataset_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -273,7 +274,7 @@ class TestDatasetMetadataServiceApiDelete:
         mock_current_user,
         mock_dataset_svc,
         mock_meta_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -302,7 +303,7 @@ class TestDatasetMetadataServiceApiDelete:
     def test_delete_metadata_dataset_not_found(
         self,
         mock_dataset_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -336,7 +337,7 @@ class TestDatasetMetadataBuiltInFieldGet:
     def test_get_built_in_fields_success(
         self,
         mock_meta_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -382,7 +383,7 @@ class TestDatasetMetadataBuiltInFieldAction:
         mock_current_user,
         mock_dataset_svc,
         mock_meta_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -414,7 +415,7 @@ class TestDatasetMetadataBuiltInFieldAction:
         mock_current_user,
         mock_dataset_svc,
         mock_meta_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -441,7 +442,7 @@ class TestDatasetMetadataBuiltInFieldAction:
     def test_action_dataset_not_found(
         self,
         mock_dataset_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -485,7 +486,7 @@ class TestDocumentMetadataEditPost:
         mock_current_user,
         mock_dataset_svc,
         mock_meta_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
@@ -513,7 +514,7 @@ class TestDocumentMetadataEditPost:
     def test_update_documents_metadata_dataset_not_found(
         self,
         mock_dataset_svc,
-        app,
+        app: Flask,
         mock_tenant,
         mock_dataset,
     ):
diff --git a/api/tests/unit_tests/controllers/service_api/end_user/test_end_user.py b/api/tests/unit_tests/controllers/service_api/end_user/test_end_user.py
index 3cc444e467..9c310a4f45 100644
--- a/api/tests/unit_tests/controllers/service_api/end_user/test_end_user.py
+++ b/api/tests/unit_tests/controllers/service_api/end_user/test_end_user.py
@@ -3,6 +3,7 @@ from unittest.mock import Mock
 from uuid import UUID, uuid4
 
 import pytest
+from pytest_mock import MockerFixture
 
 from controllers.service_api.end_user.end_user import EndUserApi
 from controllers.service_api.end_user.error import EndUserNotFoundError
@@ -21,7 +22,9 @@ class TestEndUserApi:
         app.tenant_id = str(uuid4())
         return app
 
-    def test_get_end_user_returns_all_attributes(self, mocker, resource: EndUserApi, app_model: App) -> None:
+    def test_get_end_user_returns_all_attributes(
+        self, mocker: MockerFixture, resource: EndUserApi, app_model: App
+    ) -> None:
         end_user = Mock(spec=EndUser)
         end_user.id = str(uuid4())
         end_user.tenant_id = app_model.tenant_id
@@ -54,7 +57,7 @@ class TestEndUserApi:
         assert result["created_at"].startswith("2024-01-01T00:00:00")
         assert result["updated_at"].startswith("2024-01-02T00:00:00")
 
-    def test_get_end_user_not_found(self, mocker, resource: EndUserApi, app_model: App) -> None:
+    def test_get_end_user_not_found(self, mocker: MockerFixture, resource: EndUserApi, app_model: App) -> None:
         mocker.patch("controllers.service_api.end_user.end_user.EndUserService.get_end_user_by_id", return_value=None)
 
         with pytest.raises(EndUserNotFoundError):
diff --git a/api/tests/unit_tests/controllers/service_api/test_index.py b/api/tests/unit_tests/controllers/service_api/test_index.py
index c560a3c698..c4074c14dd 100644
--- a/api/tests/unit_tests/controllers/service_api/test_index.py
+++ b/api/tests/unit_tests/controllers/service_api/test_index.py
@@ -5,6 +5,7 @@ Unit tests for Service API Index endpoint
 from unittest.mock import MagicMock, patch
 
 import pytest
+from flask import Flask
 
 from controllers.service_api.index import IndexApi
 
@@ -13,7 +14,7 @@ class TestIndexApi:
     """Test suite for IndexApi resource."""
 
     @patch("controllers.service_api.index.dify_config", autospec=True)
-    def test_get_returns_api_info(self, mock_config, app):
+    def test_get_returns_api_info(self, mock_config, app: Flask):
         """Test that GET returns API metadata with correct structure."""
         # Arrange
         mock_config.project.version = "1.0.0-test"
@@ -32,7 +33,7 @@ class TestIndexApi:
         assert response["api_version"] == "v1"
         assert response["server_version"] == "1.0.0-test"
 
-    def test_get_response_has_required_fields(self, app):
+    def test_get_response_has_required_fields(self, app: Flask):
         """Test that response contains all required fields."""
         # Arrange
         mock_config = MagicMock()
@@ -53,7 +54,7 @@ class TestIndexApi:
         assert isinstance(response["server_version"], str)
 
     @pytest.mark.parametrize("version", ["0.0.1", "1.0.0", "2.0.0-beta", "1.11.4"])
-    def test_get_returns_correct_version(self, app, version):
+    def test_get_returns_correct_version(self, app: Flask, version):
         """Test that server_version matches config version."""
         # Arrange
         mock_config = MagicMock()
diff --git a/api/tests/unit_tests/controllers/service_api/test_wraps.py b/api/tests/unit_tests/controllers/service_api/test_wraps.py
index 6dfbdcf98e..30d7b92913 100644
--- a/api/tests/unit_tests/controllers/service_api/test_wraps.py
+++ b/api/tests/unit_tests/controllers/service_api/test_wraps.py
@@ -39,7 +39,7 @@ class TestValidateAndGetApiToken:
         app.config["TESTING"] = True
         return app
 
-    def test_missing_authorization_header(self, app):
+    def test_missing_authorization_header(self, app: Flask):
         """Test that Unauthorized is raised when Authorization header is missing."""
         # Arrange
         with app.test_request_context("/", method="GET"):
@@ -50,7 +50,7 @@ class TestValidateAndGetApiToken:
                 validate_and_get_api_token("app")
             assert "Authorization header must be provided" in str(exc_info.value)
 
-    def test_invalid_auth_scheme(self, app):
+    def test_invalid_auth_scheme(self, app: Flask):
         """Test that Unauthorized is raised when auth scheme is not Bearer."""
         # Arrange
         with app.test_request_context("/", method="GET", headers={"Authorization": "Basic token123"}):
@@ -62,7 +62,7 @@ class TestValidateAndGetApiToken:
     @patch("controllers.service_api.wraps.record_token_usage")
     @patch("controllers.service_api.wraps.ApiTokenCache")
     @patch("controllers.service_api.wraps.fetch_token_with_single_flight")
-    def test_valid_token_returns_api_token(self, mock_fetch_token, mock_cache_cls, mock_record_usage, app):
+    def test_valid_token_returns_api_token(self, mock_fetch_token, mock_cache_cls, mock_record_usage, app: Flask):
         """Test that valid token returns the ApiToken object."""
         # Arrange
         mock_api_token = Mock(spec=ApiToken)
@@ -84,7 +84,7 @@ class TestValidateAndGetApiToken:
     @patch("controllers.service_api.wraps.record_token_usage")
     @patch("controllers.service_api.wraps.ApiTokenCache")
     @patch("controllers.service_api.wraps.fetch_token_with_single_flight")
-    def test_invalid_token_raises_unauthorized(self, mock_fetch_token, mock_cache_cls, mock_record_usage, app):
+    def test_invalid_token_raises_unauthorized(self, mock_fetch_token, mock_cache_cls, mock_record_usage, app: Flask):
         """Test that invalid token raises Unauthorized."""
         # Arrange
         from werkzeug.exceptions import Unauthorized
@@ -161,7 +161,7 @@ class TestValidateAppToken:
 
     @patch("controllers.service_api.wraps.db")
     @patch("controllers.service_api.wraps.validate_and_get_api_token")
-    def test_app_not_found_raises_forbidden(self, mock_validate_token, mock_db, app):
+    def test_app_not_found_raises_forbidden(self, mock_validate_token, mock_db, app: Flask):
         """Test that Forbidden is raised when app no longer exists."""
         # Arrange
         mock_api_token = Mock()
@@ -182,7 +182,7 @@ class TestValidateAppToken:
 
     @patch("controllers.service_api.wraps.db")
     @patch("controllers.service_api.wraps.validate_and_get_api_token")
-    def test_app_status_abnormal_raises_forbidden(self, mock_validate_token, mock_db, app):
+    def test_app_status_abnormal_raises_forbidden(self, mock_validate_token, mock_db, app: Flask):
         """Test that Forbidden is raised when app status is abnormal."""
         # Arrange
         mock_api_token = Mock()
@@ -205,7 +205,7 @@ class TestValidateAppToken:
 
     @patch("controllers.service_api.wraps.db")
     @patch("controllers.service_api.wraps.validate_and_get_api_token")
-    def test_app_api_disabled_raises_forbidden(self, mock_validate_token, mock_db, app):
+    def test_app_api_disabled_raises_forbidden(self, mock_validate_token, mock_db, app: Flask):
         """Test that Forbidden is raised when app API is disabled."""
         # Arrange
         mock_api_token = Mock()
@@ -240,7 +240,7 @@ class TestCloudEditionBillingResourceCheck:
 
     @patch("controllers.service_api.wraps.validate_and_get_api_token")
     @patch("controllers.service_api.wraps.FeatureService.get_features")
-    def test_allows_when_under_limit(self, mock_get_features, mock_validate_token, app):
+    def test_allows_when_under_limit(self, mock_get_features, mock_validate_token, app: Flask):
         """Test that request is allowed when under resource limit."""
         # Arrange
         mock_validate_token.return_value = Mock(tenant_id="tenant123")
@@ -264,7 +264,7 @@ class TestCloudEditionBillingResourceCheck:
 
     @patch("controllers.service_api.wraps.validate_and_get_api_token")
     @patch("controllers.service_api.wraps.FeatureService.get_features")
-    def test_rejects_when_at_limit(self, mock_get_features, mock_validate_token, app):
+    def test_rejects_when_at_limit(self, mock_get_features, mock_validate_token, app: Flask):
         """Test that Forbidden is raised when at resource limit."""
         # Arrange
         mock_validate_token.return_value = Mock(tenant_id="tenant123")
@@ -287,7 +287,7 @@ class TestCloudEditionBillingResourceCheck:
 
     @patch("controllers.service_api.wraps.validate_and_get_api_token")
     @patch("controllers.service_api.wraps.FeatureService.get_features")
-    def test_allows_when_billing_disabled(self, mock_get_features, mock_validate_token, app):
+    def test_allows_when_billing_disabled(self, mock_get_features, mock_validate_token, app: Flask):
         """Test that request is allowed when billing is disabled."""
         # Arrange
         mock_validate_token.return_value = Mock(tenant_id="tenant123")
@@ -320,7 +320,7 @@ class TestCloudEditionBillingKnowledgeLimitCheck:
 
     @patch("controllers.service_api.wraps.validate_and_get_api_token")
     @patch("controllers.service_api.wraps.FeatureService.get_features")
-    def test_rejects_add_segment_in_sandbox(self, mock_get_features, mock_validate_token, app):
+    def test_rejects_add_segment_in_sandbox(self, mock_get_features, mock_validate_token, app: Flask):
         """Test that add_segment is rejected in SANDBOX plan."""
         # Arrange
         mock_validate_token.return_value = Mock(tenant_id="tenant123")
@@ -342,7 +342,7 @@ class TestCloudEditionBillingKnowledgeLimitCheck:
 
     @patch("controllers.service_api.wraps.validate_and_get_api_token")
     @patch("controllers.service_api.wraps.FeatureService.get_features")
-    def test_allows_other_operations_in_sandbox(self, mock_get_features, mock_validate_token, app):
+    def test_allows_other_operations_in_sandbox(self, mock_get_features, mock_validate_token, app: Flask):
         """Test that non-add_segment operations are allowed in SANDBOX."""
         # Arrange
         mock_validate_token.return_value = Mock(tenant_id="tenant123")
@@ -376,7 +376,7 @@ class TestCloudEditionBillingRateLimitCheck:
 
     @patch("controllers.service_api.wraps.validate_and_get_api_token")
     @patch("controllers.service_api.wraps.FeatureService.get_knowledge_rate_limit")
-    def test_allows_within_rate_limit(self, mock_get_rate_limit, mock_validate_token, app):
+    def test_allows_within_rate_limit(self, mock_get_rate_limit, mock_validate_token, app: Flask):
         """Test that request is allowed when within rate limit."""
         # Arrange
         mock_validate_token.return_value = Mock(tenant_id="tenant123")
@@ -406,7 +406,7 @@ class TestCloudEditionBillingRateLimitCheck:
     @patch("controllers.service_api.wraps.validate_and_get_api_token")
     @patch("controllers.service_api.wraps.FeatureService.get_knowledge_rate_limit")
     @patch("controllers.service_api.wraps.db")
-    def test_rejects_over_rate_limit(self, mock_db, mock_get_rate_limit, mock_validate_token, app):
+    def test_rejects_over_rate_limit(self, mock_db, mock_get_rate_limit, mock_validate_token, app: Flask):
         """Test that Forbidden is raised when over rate limit."""
         # Arrange
         mock_validate_token.return_value = Mock(tenant_id="tenant123")
@@ -445,7 +445,7 @@ class TestValidateDatasetToken:
     @patch("controllers.service_api.wraps.db")
     @patch("controllers.service_api.wraps.validate_and_get_api_token")
     @patch("controllers.service_api.wraps.current_app")
-    def test_valid_dataset_token(self, mock_current_app, mock_validate_token, mock_db, mock_user_logged_in, app):
+    def test_valid_dataset_token(self, mock_current_app, mock_validate_token, mock_db, mock_user_logged_in, app: Flask):
         """Test that valid dataset token allows access."""
         # Arrange
         # Use standard Mock for login_manager
@@ -487,7 +487,7 @@ class TestValidateDatasetToken:
 
     @patch("controllers.service_api.wraps.db")
     @patch("controllers.service_api.wraps.validate_and_get_api_token")
-    def test_dataset_not_found_raises_not_found(self, mock_validate_token, mock_db, app):
+    def test_dataset_not_found_raises_not_found(self, mock_validate_token, mock_db, app: Flask):
         """Test that NotFound is raised when dataset doesn't exist."""
         # Arrange
         mock_api_token = Mock()
diff --git a/api/tests/unit_tests/controllers/test_swagger.py b/api/tests/unit_tests/controllers/test_swagger.py
new file mode 100644
index 0000000000..999f1ae78d
--- /dev/null
+++ b/api/tests/unit_tests/controllers/test_swagger.py
@@ -0,0 +1,72 @@
+"""Swagger JSON rendering tests for Flask-RESTX API blueprints."""
+
+import pytest
+from flask import Flask
+
+
+def _definition_refs(value: object) -> set[str]:
+    refs: set[str] = set()
+    if isinstance(value, dict):
+        ref = value.get("$ref")
+        if isinstance(ref, str) and ref.startswith("#/definitions/"):
+            refs.add(ref.removeprefix("#/definitions/"))
+        for item in value.values():
+            refs.update(_definition_refs(item))
+    elif isinstance(value, list):
+        for item in value:
+            refs.update(_definition_refs(item))
+    return refs
+
+
+@pytest.mark.parametrize(
+    ("first_kwargs", "second_kwargs"),
+    [
+        ({"min_items": 1}, {"min_items": 2}),
+        ({"max_items": 1}, {"max_items": 2}),
+        ({"unique": True}, {"unique": False}),
+    ],
+)
+def test_inline_model_name_includes_list_constraints(
+    first_kwargs: dict[str, object],
+    second_kwargs: dict[str, object],
+):
+    from flask_restx import fields
+
+    from libs.flask_restx_compat import _inline_model_name
+
+    first_inline_model: dict[object, object] = {"items": fields.List(fields.String, **first_kwargs)}
+    second_inline_model: dict[object, object] = {"items": fields.List(fields.String, **second_kwargs)}
+
+    assert _inline_model_name(first_inline_model) != _inline_model_name(second_inline_model)
+
+
+def test_swagger_json_endpoints_render(monkeypatch: pytest.MonkeyPatch):
+    from configs import dify_config
+    from controllers.console import bp as console_bp
+    from controllers.service_api import bp as service_api_bp
+    from controllers.web import bp as web_bp
+
+    monkeypatch.setattr(dify_config, "SWAGGER_UI_ENABLED", True)
+
+    app = Flask(__name__)
+    app.config["TESTING"] = True
+    app.config["RESTX_INCLUDE_ALL_MODELS"] = True
+    app.register_blueprint(console_bp)
+    app.register_blueprint(web_bp)
+    app.register_blueprint(service_api_bp)
+
+    client = app.test_client()
+
+    for route in ("/console/api/swagger.json", "/api/swagger.json", "/v1/swagger.json"):
+        response = client.get(route)
+
+        assert response.status_code == 200
+        payload = response.get_json()
+        assert payload["swagger"] == "2.0"
+        assert "paths" in payload
+        assert "definitions" in payload
+        assert isinstance(payload["definitions"], dict)
+        missing_refs = _definition_refs(payload) - set(payload["definitions"])
+        assert not sorted(ref for ref in missing_refs if ref.startswith("_AnonymousInlineModel"))
+
+    assert app.config["RESTX_INCLUDE_ALL_MODELS"] is True
diff --git a/api/tests/unit_tests/controllers/web/test_web_login.py b/api/tests/unit_tests/controllers/web/test_web_login.py
index 13b953c04d..839939367c 100644
--- a/api/tests/unit_tests/controllers/web/test_web_login.py
+++ b/api/tests/unit_tests/controllers/web/test_web_login.py
@@ -44,7 +44,7 @@ class TestEmailCodeLoginSendEmailApi:
         self,
         mock_get_user,
         mock_send_email,
-        app,
+        app: Flask,
     ):
         mock_account = MagicMock()
         mock_get_user.return_value = mock_account
@@ -75,7 +75,7 @@ class TestEmailCodeLoginApi:
         mock_get_user,
         mock_login,
         mock_reset_login_rate,
-        app,
+        app: Flask,
     ):
         mock_get_token_data.return_value = {"email": "User@Example.com", "code": "123456"}
         mock_get_user.return_value = MagicMock()
diff --git a/api/tests/unit_tests/core/agent/output_parser/test_cot_output_parser.py b/api/tests/unit_tests/core/agent/output_parser/test_cot_output_parser.py
index 9073ae1044..c1a4da8cd3 100644
--- a/api/tests/unit_tests/core/agent/output_parser/test_cot_output_parser.py
+++ b/api/tests/unit_tests/core/agent/output_parser/test_cot_output_parser.py
@@ -12,12 +12,13 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock
 
 import pytest
+from pytest_mock import MockerFixture
 
 from core.agent.output_parser.cot_output_parser import CotAgentOutputParser
 
 
 @pytest.fixture
-def mock_action_class(mocker):
+def mock_action_class(mocker: MockerFixture):
     mock_action = MagicMock()
     mocker.patch(
         "core.agent.output_parser.cot_output_parser.AgentScratchpadUnit.Action",
diff --git a/api/tests/unit_tests/core/agent/strategy/test_plugin.py b/api/tests/unit_tests/core/agent/strategy/test_plugin.py
index e0894f1e90..0fea04845d 100644
--- a/api/tests/unit_tests/core/agent/strategy/test_plugin.py
+++ b/api/tests/unit_tests/core/agent/strategy/test_plugin.py
@@ -3,6 +3,7 @@
 from unittest.mock import MagicMock
 
 import pytest
+from pytest_mock import MockerFixture
 
 from core.agent.strategy.plugin import PluginAgentStrategy
 
@@ -213,7 +214,9 @@ class TestInvoke:
             (None, None, "msg"),
         ],
     )
-    def test_invoke_optional_arguments(self, strategy, mocker, conversation_id, app_id, message_id) -> None:
+    def test_invoke_optional_arguments(
+        self, strategy, mocker: MockerFixture, conversation_id, app_id, message_id
+    ) -> None:
         mock_manager = MagicMock()
         mock_manager.invoke = MagicMock(return_value=iter([]))
 
diff --git a/api/tests/unit_tests/core/agent/test_base_agent_runner.py b/api/tests/unit_tests/core/agent/test_base_agent_runner.py
index db4b293b16..d5fb853ee3 100644
--- a/api/tests/unit_tests/core/agent/test_base_agent_runner.py
+++ b/api/tests/unit_tests/core/agent/test_base_agent_runner.py
@@ -3,6 +3,7 @@ from decimal import Decimal
 from unittest.mock import MagicMock
 
 import pytest
+from pytest_mock import MockerFixture
 
 import core.agent.base_agent_runner as module
 from core.agent.base_agent_runner import BaseAgentRunner
@@ -13,7 +14,7 @@ from core.agent.base_agent_runner import BaseAgentRunner
 
 
 @pytest.fixture
-def mock_db_session(mocker):
+def mock_db_session(mocker: MockerFixture):
     session = mocker.MagicMock()
     mocker.patch.object(module.db, "session", session)
     return session
@@ -41,13 +42,13 @@ def runner(mocker, mock_db_session):
 
 
 class TestRepack:
-    def test_sets_empty_if_none(self, runner, mocker):
+    def test_sets_empty_if_none(self, runner, mocker: MockerFixture):
         entity = mocker.MagicMock()
         entity.app_config.prompt_template.simple_prompt_template = None
         result = runner._repack_app_generate_entity(entity)
         assert result.app_config.prompt_template.simple_prompt_template == ""
 
-    def test_keeps_existing(self, runner, mocker):
+    def test_keeps_existing(self, runner, mocker: MockerFixture):
         entity = mocker.MagicMock()
         entity.app_config.prompt_template.simple_prompt_template = "abc"
         result = runner._repack_app_generate_entity(entity)
@@ -60,7 +61,7 @@ class TestRepack:
 
 
 class TestUpdatePromptTool:
-    def build_param(self, mocker, **kwargs):
+    def build_param(self, mocker: MockerFixture, **kwargs):
         p = mocker.MagicMock()
         p.form = kwargs.get("form")
 
@@ -75,7 +76,7 @@ class TestUpdatePromptTool:
         p.required = kwargs.get("required", False)
         return p
 
-    def test_skip_non_llm(self, runner, mocker):
+    def test_skip_non_llm(self, runner, mocker: MockerFixture):
         tool = mocker.MagicMock()
         param = self.build_param(mocker, form="NOT_LLM")
         tool.get_runtime_parameters.return_value = [param]
@@ -86,7 +87,7 @@ class TestUpdatePromptTool:
         result = runner.update_prompt_message_tool(tool, prompt_tool)
         assert result.parameters["properties"] == {}
 
-    def test_enum_and_required(self, runner, mocker):
+    def test_enum_and_required(self, runner, mocker: MockerFixture):
         option = mocker.MagicMock(value="opt1")
         param = self.build_param(
             mocker,
@@ -104,7 +105,7 @@ class TestUpdatePromptTool:
         result = runner.update_prompt_message_tool(tool, prompt_tool)
         assert "p1" in result.parameters["required"]
 
-    def test_skip_file_type_param(self, runner, mocker):
+    def test_skip_file_type_param(self, runner, mocker: MockerFixture):
         tool = mocker.MagicMock()
         param = self.build_param(mocker, form=module.ToolParameter.ToolParameterForm.LLM)
         param.type = module.ToolParameter.ToolParameterType.FILE
@@ -116,7 +117,7 @@ class TestUpdatePromptTool:
         result = runner.update_prompt_message_tool(tool, prompt_tool)
         assert result.parameters["properties"] == {}
 
-    def test_duplicate_required_not_duplicated(self, runner, mocker):
+    def test_duplicate_required_not_duplicated(self, runner, mocker: MockerFixture):
         tool = mocker.MagicMock()
 
         param = self.build_param(
@@ -141,7 +142,7 @@ class TestUpdatePromptTool:
 
 
 class TestCreateAgentThought:
-    def test_with_files(self, runner, mock_db_session, mocker):
+    def test_with_files(self, runner, mock_db_session, mocker: MockerFixture):
         mock_thought = mocker.MagicMock(id=10)
         mocker.patch.object(module, "MessageAgentThought", return_value=mock_thought)
 
@@ -149,7 +150,7 @@ class TestCreateAgentThought:
         assert result == "10"
         assert runner.agent_thought_count == 1
 
-    def test_without_files(self, runner, mock_db_session, mocker):
+    def test_without_files(self, runner, mock_db_session, mocker: MockerFixture):
         mock_thought = mocker.MagicMock(id=11)
         mocker.patch.object(module, "MessageAgentThought", return_value=mock_thought)
 
@@ -163,7 +164,7 @@ class TestCreateAgentThought:
 
 
 class TestSaveAgentThought:
-    def setup_agent(self, mocker):
+    def setup_agent(self, mocker: MockerFixture):
         agent = mocker.MagicMock()
         agent.tool = "tool1;tool2"
         agent.tool_labels = {}
@@ -175,7 +176,7 @@ class TestSaveAgentThought:
         with pytest.raises(ValueError):
             runner.save_agent_thought("id", None, None, None, None, None, None, [], None)
 
-    def test_full_update(self, runner, mock_db_session, mocker):
+    def test_full_update(self, runner, mock_db_session, mocker: MockerFixture):
         agent = self.setup_agent(mocker)
         mock_db_session.scalar.return_value = agent
 
@@ -210,7 +211,7 @@ class TestSaveAgentThought:
         assert agent.tokens == 3
         assert "tool1" in json.loads(agent.tool_labels_str)
 
-    def test_label_fallback_when_none(self, runner, mock_db_session, mocker):
+    def test_label_fallback_when_none(self, runner, mock_db_session, mocker: MockerFixture):
         agent = self.setup_agent(mocker)
         agent.tool = "unknown_tool"
         mock_db_session.scalar.return_value = agent
@@ -220,7 +221,7 @@ class TestSaveAgentThought:
         labels = json.loads(agent.tool_labels_str)
         assert "unknown_tool" in labels
 
-    def test_json_failure_paths(self, runner, mock_db_session, mocker):
+    def test_json_failure_paths(self, runner, mock_db_session, mocker: MockerFixture):
         agent = self.setup_agent(mocker)
         mock_db_session.scalar.return_value = agent
 
@@ -241,13 +242,13 @@ class TestSaveAgentThought:
 
         assert mock_db_session.commit.called
 
-    def test_messages_ids_none(self, runner, mock_db_session, mocker):
+    def test_messages_ids_none(self, runner, mock_db_session, mocker: MockerFixture):
         agent = self.setup_agent(mocker)
         mock_db_session.scalar.return_value = agent
         runner.save_agent_thought("id", None, None, None, None, None, None, None, None)
         assert mock_db_session.commit.called
 
-    def test_success_dict_serialization(self, runner, mock_db_session, mocker):
+    def test_success_dict_serialization(self, runner, mock_db_session, mocker: MockerFixture):
         agent = self.setup_agent(mocker)
         mock_db_session.scalar.return_value = agent
 
@@ -273,19 +274,19 @@ class TestSaveAgentThought:
 
 
 class TestOrganizeUserPrompt:
-    def test_no_files(self, runner, mock_db_session, mocker):
+    def test_no_files(self, runner, mock_db_session, mocker: MockerFixture):
         mock_db_session.scalars.return_value.all.return_value = []
         msg = mocker.MagicMock(id="1", query="hello", app_model_config=None)
         result = runner.organize_agent_user_prompt(msg)
         assert result.content == "hello"
 
-    def test_with_files_no_config(self, runner, mock_db_session, mocker):
+    def test_with_files_no_config(self, runner, mock_db_session, mocker: MockerFixture):
         mock_db_session.scalars.return_value.all.return_value = [mocker.MagicMock()]
         msg = mocker.MagicMock(id="1", query="hello", app_model_config=None)
         result = runner.organize_agent_user_prompt(msg)
         assert result.content == "hello"
 
-    def test_image_detail_low_fallback(self, runner, mock_db_session, mocker):
+    def test_image_detail_low_fallback(self, runner, mock_db_session, mocker: MockerFixture):
         mock_db_session.scalars.return_value.all.return_value = [mocker.MagicMock()]
         file_config = mocker.MagicMock()
         file_config.image_config = mocker.MagicMock(detail=None)
@@ -305,27 +306,27 @@ class TestOrganizeUserPrompt:
 
 
 class TestOrganizeHistory:
-    def test_empty(self, runner, mock_db_session, mocker):
+    def test_empty(self, runner, mock_db_session, mocker: MockerFixture):
         mock_db_session.execute.return_value.scalars.return_value.all.return_value = []
         mocker.patch.object(module, "extract_thread_messages", return_value=[])
         result = runner.organize_agent_history([])
         assert result == []
 
-    def test_with_answer_only(self, runner, mock_db_session, mocker):
+    def test_with_answer_only(self, runner, mock_db_session, mocker: MockerFixture):
         msg = mocker.MagicMock(id="m1", answer="ans", agent_thoughts=[], app_model_config=None)
         mock_db_session.execute.return_value.scalars.return_value.all.return_value = [msg]
         mocker.patch.object(module, "extract_thread_messages", return_value=[msg])
         result = runner.organize_agent_history([])
         assert any(isinstance(x, module.AssistantPromptMessage) for x in result)
 
-    def test_skip_current_message(self, runner, mock_db_session, mocker):
+    def test_skip_current_message(self, runner, mock_db_session, mocker: MockerFixture):
         msg = mocker.MagicMock(id="msg_current", agent_thoughts=[], answer="ans", app_model_config=None)
         mock_db_session.execute.return_value.scalars.return_value.all.return_value = [msg]
         mocker.patch.object(module, "extract_thread_messages", return_value=[msg])
         result = runner.organize_agent_history([])
         assert result == []
 
-    def test_with_tool_calls_invalid_json(self, runner, mock_db_session, mocker):
+    def test_with_tool_calls_invalid_json(self, runner, mock_db_session, mocker: MockerFixture):
         thought = mocker.MagicMock(
             tool="tool1",
             tool_input="invalid",
@@ -341,7 +342,7 @@ class TestOrganizeHistory:
         result = runner.organize_agent_history([])
         assert isinstance(result, list)
 
-    def test_empty_tool_name_split(self, runner, mock_db_session, mocker):
+    def test_empty_tool_name_split(self, runner, mock_db_session, mocker: MockerFixture):
         thought = mocker.MagicMock(tool=";", thought="thinking")
         msg = mocker.MagicMock(id="m5", agent_thoughts=[thought], answer=None, app_model_config=None)
 
@@ -350,7 +351,7 @@ class TestOrganizeHistory:
         result = runner.organize_agent_history([])
         assert isinstance(result, list)
 
-    def test_valid_json_tool_flow(self, runner, mock_db_session, mocker):
+    def test_valid_json_tool_flow(self, runner, mock_db_session, mocker: MockerFixture):
         thought = mocker.MagicMock(
             tool="tool1",
             tool_input=json.dumps({"tool1": {"x": 1}}),
@@ -379,7 +380,7 @@ class TestOrganizeHistory:
 
 
 class TestConvertToolToPromptMessageTool:
-    def test_basic_conversion(self, runner, mocker):
+    def test_basic_conversion(self, runner, mocker: MockerFixture):
         tool = mocker.MagicMock(tool_name="tool1")
 
         runtime_param = mocker.MagicMock()
@@ -404,7 +405,7 @@ class TestConvertToolToPromptMessageTool:
         prompt_tool, entity = runner._convert_tool_to_prompt_message_tool(tool)
         assert entity == tool_entity
 
-    def test_full_conversion_multiple_params(self, runner, mocker):
+    def test_full_conversion_multiple_params(self, runner, mocker: MockerFixture):
         tool = mocker.MagicMock(tool_name="tool1")
 
         # LLM param with input_schema override
@@ -441,7 +442,7 @@ class TestConvertToolToPromptMessageTool:
 
 
 class TestInitPromptToolsExtended:
-    def test_agent_tool_branch(self, runner, mocker):
+    def test_agent_tool_branch(self, runner, mocker: MockerFixture):
         agent_tool = mocker.MagicMock(tool_name="agent_tool")
         runner.app_config.agent = mocker.MagicMock(tools=[agent_tool])
         mocker.patch.object(runner, "_convert_tool_to_prompt_message_tool", return_value=(MagicMock(), "entity"))
@@ -449,7 +450,7 @@ class TestInitPromptToolsExtended:
         tools, prompts = runner._init_prompt_tools()
         assert "agent_tool" in tools
 
-    def test_exception_in_conversion(self, runner, mocker):
+    def test_exception_in_conversion(self, runner, mocker: MockerFixture):
         agent_tool = mocker.MagicMock(tool_name="bad_tool")
         runner.app_config.agent = mocker.MagicMock(tools=[agent_tool])
         mocker.patch.object(runner, "_convert_tool_to_prompt_message_tool", side_effect=Exception)
@@ -464,7 +465,7 @@ class TestInitPromptToolsExtended:
 
 
 class TestAdditionalCoverage:
-    def test_update_prompt_with_input_schema(self, runner, mocker):
+    def test_update_prompt_with_input_schema(self, runner, mocker: MockerFixture):
         tool = mocker.MagicMock()
 
         param = mocker.MagicMock()
@@ -487,7 +488,7 @@ class TestAdditionalCoverage:
         result = runner.update_prompt_message_tool(tool, prompt_tool)
         assert result.parameters["properties"]["p1"]["type"] == "number"
 
-    def test_save_agent_thought_existing_labels(self, runner, mock_db_session, mocker):
+    def test_save_agent_thought_existing_labels(self, runner, mock_db_session, mocker: MockerFixture):
         agent = mocker.MagicMock()
         agent.tool = "tool1"
         agent.tool_labels = {"tool1": {"en_US": "existing"}}
@@ -498,7 +499,7 @@ class TestAdditionalCoverage:
         labels = json.loads(agent.tool_labels_str)
         assert labels["tool1"]["en_US"] == "existing"
 
-    def test_save_agent_thought_tool_meta_string(self, runner, mock_db_session, mocker):
+    def test_save_agent_thought_tool_meta_string(self, runner, mock_db_session, mocker: MockerFixture):
         agent = mocker.MagicMock()
         agent.tool = "tool1"
         agent.tool_labels = {}
@@ -508,7 +509,7 @@ class TestAdditionalCoverage:
         runner.save_agent_thought("id", None, None, None, None, "meta_string", None, [], None)
         assert agent.tool_meta_str == "meta_string"
 
-    def test_convert_dataset_retriever_tool(self, runner, mocker):
+    def test_convert_dataset_retriever_tool(self, runner, mocker: MockerFixture):
         ds_tool = mocker.MagicMock()
         ds_tool.entity.identity.name = "ds"
         ds_tool.entity.description.llm = "desc"
@@ -525,7 +526,7 @@ class TestAdditionalCoverage:
         prompt = runner._convert_dataset_retriever_tool_to_prompt_message_tool(ds_tool)
         assert prompt is not None
 
-    def test_organize_user_prompt_with_file_objects(self, runner, mock_db_session, mocker):
+    def test_organize_user_prompt_with_file_objects(self, runner, mock_db_session, mocker: MockerFixture):
         mock_db_session.scalars.return_value.all.return_value = [mocker.MagicMock()]
 
         file_config = mocker.MagicMock()
@@ -544,7 +545,7 @@ class TestAdditionalCoverage:
         result = runner.organize_agent_user_prompt(msg)
         assert result is not None
 
-    def test_organize_history_without_tool_names(self, runner, mock_db_session, mocker):
+    def test_organize_history_without_tool_names(self, runner, mock_db_session, mocker: MockerFixture):
         thought = mocker.MagicMock(tool=None, thought="thinking")
         msg = mocker.MagicMock(id="m3", agent_thoughts=[thought], answer=None, app_model_config=None)
 
@@ -554,7 +555,7 @@ class TestAdditionalCoverage:
         result = runner.organize_agent_history([])
         assert isinstance(result, list)
 
-    def test_organize_history_multiple_tools_split(self, runner, mock_db_session, mocker):
+    def test_organize_history_multiple_tools_split(self, runner, mock_db_session, mocker: MockerFixture):
         thought = mocker.MagicMock(
             tool="tool1;tool2",
             tool_input=json.dumps({"tool1": {}, "tool2": {}}),
@@ -572,7 +573,7 @@ class TestAdditionalCoverage:
 
     # ================= Additional Surgical Coverage =================
 
-    def test_convert_tool_select_enum_branch(self, runner, mocker):
+    def test_convert_tool_select_enum_branch(self, runner, mocker: MockerFixture):
         tool = mocker.MagicMock(tool_name="tool1")
 
         param = mocker.MagicMock()
@@ -599,7 +600,7 @@ class TestAdditionalCoverage:
 
 
 class TestConvertDatasetRetrieverTool:
-    def test_required_param_added(self, runner, mocker):
+    def test_required_param_added(self, runner, mocker: MockerFixture):
         ds_tool = mocker.MagicMock()
         ds_tool.entity.identity.name = "ds"
         ds_tool.entity.description.llm = "desc"
@@ -619,7 +620,7 @@ class TestConvertDatasetRetrieverTool:
 
 
 class TestBaseAgentRunnerInit:
-    def test_init_sets_stream_tool_call_and_files(self, mocker):
+    def test_init_sets_stream_tool_call_and_files(self, mocker: MockerFixture):
         session = mocker.MagicMock()
         session.scalar.return_value = 2
         mocker.patch.object(module.db, "session", session)
@@ -662,7 +663,7 @@ class TestBaseAgentRunnerInit:
 
 
 class TestBaseAgentRunnerCoverage:
-    def test_convert_tool_skips_non_llm_param(self, runner, mocker):
+    def test_convert_tool_skips_non_llm_param(self, runner, mocker: MockerFixture):
         tool = mocker.MagicMock(tool_name="tool1")
 
         param = mocker.MagicMock()
@@ -680,7 +681,7 @@ class TestBaseAgentRunnerCoverage:
 
         assert prompt_tool.parameters["properties"] == {}
 
-    def test_init_prompt_tools_adds_dataset_tools(self, runner, mocker):
+    def test_init_prompt_tools_adds_dataset_tools(self, runner, mocker: MockerFixture):
         dataset_tool = mocker.MagicMock()
         dataset_tool.entity.identity.name = "ds"
         runner.dataset_tools = [dataset_tool]
@@ -692,7 +693,7 @@ class TestBaseAgentRunnerCoverage:
         assert tools["ds"] == dataset_tool
         assert len(prompt_tools) == 1
 
-    def test_update_prompt_message_tool_select_enum(self, runner, mocker):
+    def test_update_prompt_message_tool_select_enum(self, runner, mocker: MockerFixture):
         tool = mocker.MagicMock()
 
         option1 = mocker.MagicMock(value="A")
@@ -716,7 +717,7 @@ class TestBaseAgentRunnerCoverage:
 
         assert result.parameters["properties"]["select_param"]["enum"] == ["A", "B"]
 
-    def test_save_agent_thought_json_dumps_fallbacks(self, runner, mock_db_session, mocker):
+    def test_save_agent_thought_json_dumps_fallbacks(self, runner, mock_db_session, mocker: MockerFixture):
         agent = mocker.MagicMock()
         agent.tool = "tool1"
         agent.tool_labels = {}
@@ -754,7 +755,7 @@ class TestBaseAgentRunnerCoverage:
         assert isinstance(agent.observation, str)
         assert isinstance(agent.tool_meta_str, str)
 
-    def test_save_agent_thought_skips_empty_tool_name(self, runner, mock_db_session, mocker):
+    def test_save_agent_thought_skips_empty_tool_name(self, runner, mock_db_session, mocker: MockerFixture):
         agent = mocker.MagicMock()
         agent.tool = "tool1;;"
         agent.tool_labels = {}
@@ -768,7 +769,7 @@ class TestBaseAgentRunnerCoverage:
         labels = json.loads(agent.tool_labels_str)
         assert "" not in labels
 
-    def test_organize_history_includes_system_prompt(self, runner, mock_db_session, mocker):
+    def test_organize_history_includes_system_prompt(self, runner, mock_db_session, mocker: MockerFixture):
         mock_db_session.execute.return_value.scalars.return_value.all.return_value = []
         mocker.patch.object(module, "extract_thread_messages", return_value=[])
 
@@ -778,7 +779,7 @@ class TestBaseAgentRunnerCoverage:
 
         assert system_message in result
 
-    def test_organize_history_tool_inputs_and_observation_none(self, runner, mock_db_session, mocker):
+    def test_organize_history_tool_inputs_and_observation_none(self, runner, mock_db_session, mocker: MockerFixture):
         thought = mocker.MagicMock(
             tool="tool1",
             tool_input=None,
diff --git a/api/tests/unit_tests/core/agent/test_cot_agent_runner.py b/api/tests/unit_tests/core/agent/test_cot_agent_runner.py
index cde8820e00..314305d371 100644
--- a/api/tests/unit_tests/core/agent/test_cot_agent_runner.py
+++ b/api/tests/unit_tests/core/agent/test_cot_agent_runner.py
@@ -2,6 +2,7 @@ import json
 from unittest.mock import MagicMock
 
 import pytest
+from pytest_mock import MockerFixture
 
 from core.agent.cot_agent_runner import CotAgentRunner
 from core.agent.entities import AgentScratchpadUnit
@@ -25,7 +26,7 @@ class DummyRunner(CotAgentRunner):
 
 
 @pytest.fixture
-def runner(mocker):
+def runner(mocker: MockerFixture):
     # Prevent BaseAgentRunner __init__ from hitting database
     mocker.patch(
         "core.agent.base_agent_runner.BaseAgentRunner.organize_agent_history",
@@ -165,7 +166,7 @@ class TestHandleInvokeAction:
         response, meta = runner._handle_invoke_action(action, {}, [])
         assert "there is not a tool named" in response
 
-    def test_tool_with_json_string_args(self, runner, mocker):
+    def test_tool_with_json_string_args(self, runner, mocker: MockerFixture):
         action = AgentScratchpadUnit.Action(action_name="tool", action_input=json.dumps({"a": 1}))
         tool_instance = MagicMock()
         tool_instances = {"tool": tool_instance}
@@ -180,7 +181,7 @@ class TestHandleInvokeAction:
 
 
 class TestOrganizeHistoricPromptMessages:
-    def test_empty_history(self, runner, mocker):
+    def test_empty_history(self, runner, mocker: MockerFixture):
         mocker.patch(
             "core.agent.cot_agent_runner.AgentHistoryPromptTransform.get_prompt",
             return_value=[],
@@ -190,7 +191,7 @@ class TestOrganizeHistoricPromptMessages:
 
 
 class TestRun:
-    def test_run_handles_empty_parser_output(self, runner, mocker):
+    def test_run_handles_empty_parser_output(self, runner, mocker: MockerFixture):
         message = MagicMock()
         message.id = "msg-id"
 
@@ -202,7 +203,7 @@ class TestRun:
         results = list(runner.run(message, "query", {}))
         assert isinstance(results, list)
 
-    def test_run_with_action_and_tool_invocation(self, runner, mocker):
+    def test_run_with_action_and_tool_invocation(self, runner, mocker: MockerFixture):
         message = MagicMock()
         message.id = "msg-id"
 
@@ -223,7 +224,7 @@ class TestRun:
         with pytest.raises(AgentMaxIterationError):
             list(runner.run(message, "query", {"tool": MagicMock()}))
 
-    def test_run_respects_max_iteration_boundary(self, runner, mocker):
+    def test_run_respects_max_iteration_boundary(self, runner, mocker: MockerFixture):
         runner.app_config.agent.max_iteration = 1
         message = MagicMock()
         message.id = "msg-id"
@@ -245,7 +246,7 @@ class TestRun:
         with pytest.raises(AgentMaxIterationError):
             list(runner.run(message, "query", {"tool": MagicMock()}))
 
-    def test_run_basic_flow(self, runner, mocker):
+    def test_run_basic_flow(self, runner, mocker: MockerFixture):
         message = MagicMock()
         message.id = "msg-id"
 
@@ -257,7 +258,7 @@ class TestRun:
         results = list(runner.run(message, "query", {"name": "John"}))
         assert results
 
-    def test_run_max_iteration_error(self, runner, mocker):
+    def test_run_max_iteration_error(self, runner, mocker: MockerFixture):
         runner.app_config.agent.max_iteration = 0
         message = MagicMock()
         message.id = "msg-id"
@@ -272,7 +273,7 @@ class TestRun:
         with pytest.raises(AgentMaxIterationError):
             list(runner.run(message, "query", {}))
 
-    def test_run_increase_usage_aggregation(self, runner, mocker):
+    def test_run_increase_usage_aggregation(self, runner, mocker: MockerFixture):
         message = MagicMock()
         message.id = "msg-id"
         runner.app_config.agent.max_iteration = 2
@@ -329,7 +330,7 @@ class TestRun:
         assert final_usage.completion_price == 2
         assert final_usage.total_price == 4
 
-    def test_run_when_no_action_branch(self, runner, mocker):
+    def test_run_when_no_action_branch(self, runner, mocker: MockerFixture):
         message = MagicMock()
         message.id = "msg-id"
 
@@ -341,7 +342,7 @@ class TestRun:
         results = list(runner.run(message, "query", {}))
         assert results[-1].delta.message.content == ""
 
-    def test_run_usage_missing_key_branch(self, runner, mocker):
+    def test_run_usage_missing_key_branch(self, runner, mocker: MockerFixture):
         message = MagicMock()
         message.id = "msg-id"
 
@@ -354,7 +355,7 @@ class TestRun:
 
         list(runner.run(message, "query", {}))
 
-    def test_run_prompt_tool_update_branch(self, runner, mocker):
+    def test_run_prompt_tool_update_branch(self, runner, mocker: MockerFixture):
         message = MagicMock()
         message.id = "msg-id"
 
@@ -410,7 +411,7 @@ class TestRun:
 
 
 class TestInitReactState:
-    def test_init_react_state_resets_state(self, runner, mocker):
+    def test_init_react_state_resets_state(self, runner, mocker: MockerFixture):
         mocker.patch.object(runner, "_organize_historic_prompt_messages", return_value=["historic"])
         runner._agent_scratchpad = ["old"]
         runner._query = "old"
@@ -423,7 +424,7 @@ class TestInitReactState:
 
 
 class TestHandleInvokeActionExtended:
-    def test_tool_with_invalid_json_string_args(self, runner, mocker):
+    def test_tool_with_invalid_json_string_args(self, runner, mocker: MockerFixture):
         action = AgentScratchpadUnit.Action(action_name="tool", action_input="not-json")
         tool_instance = MagicMock()
         tool_instances = {"tool": tool_instance}
@@ -457,7 +458,7 @@ class TestFillInputsEdgeCases:
 
 
 class TestOrganizeHistoricPromptMessagesExtended:
-    def test_user_message_flushes_scratchpad(self, runner, mocker):
+    def test_user_message_flushes_scratchpad(self, runner, mocker: MockerFixture):
         from graphon.model_runtime.entities.message_entities import UserPromptMessage
 
         user_message = UserPromptMessage(content="Hi")
@@ -480,7 +481,7 @@ class TestOrganizeHistoricPromptMessagesExtended:
         with pytest.raises(NotImplementedError):
             runner._organize_historic_prompt_messages([])
 
-    def test_agent_history_transform_invocation(self, runner, mocker):
+    def test_agent_history_transform_invocation(self, runner, mocker: MockerFixture):
         mock_transform = MagicMock()
         mock_transform.get_prompt.return_value = []
 
@@ -495,7 +496,7 @@ class TestOrganizeHistoricPromptMessagesExtended:
 
 
 class TestRunAdditionalBranches:
-    def test_run_with_no_action_final_answer_empty(self, runner, mocker):
+    def test_run_with_no_action_final_answer_empty(self, runner, mocker: MockerFixture):
         message = MagicMock()
         message.id = "msg-id"
 
@@ -507,7 +508,7 @@ class TestRunAdditionalBranches:
         results = list(runner.run(message, "query", {}))
         assert any(hasattr(r, "delta") for r in results)
 
-    def test_run_with_final_answer_action_string(self, runner, mocker):
+    def test_run_with_final_answer_action_string(self, runner, mocker: MockerFixture):
         message = MagicMock()
         message.id = "msg-id"
 
@@ -521,7 +522,7 @@ class TestRunAdditionalBranches:
         results = list(runner.run(message, "query", {}))
         assert results[-1].delta.message.content == "done"
 
-    def test_run_with_final_answer_action_dict(self, runner, mocker):
+    def test_run_with_final_answer_action_dict(self, runner, mocker: MockerFixture):
         message = MagicMock()
         message.id = "msg-id"
 
@@ -535,7 +536,7 @@ class TestRunAdditionalBranches:
         results = list(runner.run(message, "query", {}))
         assert json.loads(results[-1].delta.message.content) == {"a": 1}
 
-    def test_run_with_string_final_answer(self, runner, mocker):
+    def test_run_with_string_final_answer(self, runner, mocker: MockerFixture):
         message = MagicMock()
         message.id = "msg-id"
 
diff --git a/api/tests/unit_tests/core/agent/test_cot_chat_agent_runner.py b/api/tests/unit_tests/core/agent/test_cot_chat_agent_runner.py
index ea8cc8aa86..8e7093fd12 100644
--- a/api/tests/unit_tests/core/agent/test_cot_chat_agent_runner.py
+++ b/api/tests/unit_tests/core/agent/test_cot_chat_agent_runner.py
@@ -1,6 +1,7 @@
 from unittest.mock import MagicMock, patch
 
 import pytest
+from pytest_mock import MockerFixture
 
 from core.agent.cot_chat_agent_runner import CotChatAgentRunner
 from graphon.model_runtime.entities.message_entities import TextPromptMessageContent
@@ -55,7 +56,7 @@ def runner():
 
 
 class TestOrganizeSystemPrompt:
-    def test_organize_system_prompt_success(self, runner, mocker):
+    def test_organize_system_prompt_success(self, runner, mocker: MockerFixture):
         first_prompt = "Instruction: {{instruction}}, Tools: {{tools}}, Names: {{tool_names}}"
         runner.app_config = DummyAppConfig(DummyAgentConfig(DummyPrompt(first_prompt)))
 
@@ -154,7 +155,7 @@ class TestOrganizeUserQuery:
 
 
 class TestOrganizePromptMessages:
-    def test_no_scratchpad(self, runner, mocker):
+    def test_no_scratchpad(self, runner, mocker: MockerFixture):
         runner.app_config = DummyAppConfig(DummyAgentConfig(DummyPrompt("{{instruction}}")))
         runner._organize_system_prompt = MagicMock(return_value="system")
         runner._organize_user_query = MagicMock(return_value=["query"])
@@ -164,7 +165,7 @@ class TestOrganizePromptMessages:
         assert "query" in result
         runner._organize_historic_prompt_messages.assert_called_once()
 
-    def test_with_final_scratchpad(self, runner, mocker):
+    def test_with_final_scratchpad(self, runner, mocker: MockerFixture):
         runner.app_config = DummyAppConfig(DummyAgentConfig(DummyPrompt("{{instruction}}")))
         runner._organize_system_prompt = MagicMock(return_value="system")
         runner._organize_user_query = MagicMock(return_value=["query"])
@@ -177,7 +178,7 @@ class TestOrganizePromptMessages:
         combined = "".join([m.content for m in assistant_msgs if isinstance(m.content, str)])
         assert "Final Answer: done" in combined
 
-    def test_with_thought_action_observation(self, runner, mocker):
+    def test_with_thought_action_observation(self, runner, mocker: MockerFixture):
         runner.app_config = DummyAppConfig(DummyAgentConfig(DummyPrompt("{{instruction}}")))
         runner._organize_system_prompt = MagicMock(return_value="system")
         runner._organize_user_query = MagicMock(return_value=["query"])
@@ -197,7 +198,7 @@ class TestOrganizePromptMessages:
         assert "Action: action" in combined
         assert "Observation: observe" in combined
 
-    def test_multiple_units_mixed(self, runner, mocker):
+    def test_multiple_units_mixed(self, runner, mocker: MockerFixture):
         runner.app_config = DummyAppConfig(DummyAgentConfig(DummyPrompt("{{instruction}}")))
         runner._organize_system_prompt = MagicMock(return_value="system")
         runner._organize_user_query = MagicMock(return_value=["query"])
diff --git a/api/tests/unit_tests/core/agent/test_cot_completion_agent_runner.py b/api/tests/unit_tests/core/agent/test_cot_completion_agent_runner.py
index 2f5873d865..0d949c357d 100644
--- a/api/tests/unit_tests/core/agent/test_cot_completion_agent_runner.py
+++ b/api/tests/unit_tests/core/agent/test_cot_completion_agent_runner.py
@@ -1,6 +1,7 @@
 import json
 
 import pytest
+from pytest_mock import MockerFixture
 
 from core.agent.cot_completion_agent_runner import CotCompletionAgentRunner
 from graphon.model_runtime.entities.message_entities import (
@@ -74,7 +75,7 @@ class TestOrganizeInstructionPrompt:
 
 
 class TestOrganizeHistoricPrompt:
-    def test_with_user_and_assistant_string(self, runner, mocker):
+    def test_with_user_and_assistant_string(self, runner, mocker: MockerFixture):
         user_msg = UserPromptMessage(content="Hello")
         assistant_msg = AssistantPromptMessage(content="Hi there")
 
@@ -89,7 +90,7 @@ class TestOrganizeHistoricPrompt:
         assert "Question: Hello" in result
         assert "Hi there" in result
 
-    def test_assistant_list_with_text_content(self, runner, mocker):
+    def test_assistant_list_with_text_content(self, runner, mocker: MockerFixture):
         text_content = TextPromptMessageContent(data="Partial answer")
         assistant_msg = AssistantPromptMessage(content=[text_content])
 
@@ -103,7 +104,7 @@ class TestOrganizeHistoricPrompt:
 
         assert "Partial answer" in result
 
-    def test_assistant_list_with_non_text_content_ignored(self, runner, mocker):
+    def test_assistant_list_with_non_text_content_ignored(self, runner, mocker: MockerFixture):
         non_text_content = ImagePromptMessageContent(format="url", mime_type="image/png")
         assistant_msg = AssistantPromptMessage(content=[non_text_content])
 
@@ -116,7 +117,7 @@ class TestOrganizeHistoricPrompt:
         result = runner._organize_historic_prompt()
         assert result == ""
 
-    def test_empty_history(self, runner, mocker):
+    def test_empty_history(self, runner, mocker: MockerFixture):
         mocker.patch.object(
             runner,
             "_organize_historic_prompt_messages",
@@ -136,7 +137,7 @@ class TestOrganizePromptMessages:
     def test_full_flow_with_scratchpad(
         self,
         runner,
-        mocker,
+        mocker: MockerFixture,
         dummy_app_config_factory,
         dummy_agent_config_factory,
         dummy_prompt_entity_factory,
@@ -171,7 +172,12 @@ class TestOrganizePromptMessages:
         assert "Question: What is Python?" in content
 
     def test_no_scratchpad(
-        self, runner, mocker, dummy_app_config_factory, dummy_agent_config_factory, dummy_prompt_entity_factory
+        self,
+        runner,
+        mocker: MockerFixture,
+        dummy_app_config_factory,
+        dummy_agent_config_factory,
+        dummy_prompt_entity_factory,
     ):
         template = "SYS {{historic_messages}} {{agent_scratchpad}} {{query}}"
 
@@ -198,7 +204,7 @@ class TestOrganizePromptMessages:
     def test_partial_scratchpad_units(
         self,
         runner,
-        mocker,
+        mocker: MockerFixture,
         thought,
         action,
         observation,
diff --git a/api/tests/unit_tests/core/agent/test_fc_agent_runner.py b/api/tests/unit_tests/core/agent/test_fc_agent_runner.py
index 17ab5babcb..3a4347e723 100644
--- a/api/tests/unit_tests/core/agent/test_fc_agent_runner.py
+++ b/api/tests/unit_tests/core/agent/test_fc_agent_runner.py
@@ -3,6 +3,7 @@ from typing import Any
 from unittest.mock import MagicMock
 
 import pytest
+from pytest_mock import MockerFixture
 
 from core.agent.errors import AgentMaxIterationError
 from core.agent.fc_agent_runner import FunctionCallAgentRunner
@@ -68,7 +69,7 @@ class DummyResult:
 
 
 @pytest.fixture
-def runner(mocker):
+def runner(mocker: MockerFixture):
     # Completely bypass BaseAgentRunner __init__ to avoid DB / Flask context
     mocker.patch(
         "core.agent.base_agent_runner.BaseAgentRunner.__init__",
@@ -230,7 +231,7 @@ class TestOrganizeUserQuery:
         result = runner._organize_user_query(None, [])
         assert len(result) == 1
 
-    def test_with_files_uses_image_detail_config(self, runner, mocker):
+    def test_with_files_uses_image_detail_config(self, runner, mocker: MockerFixture):
         file_content = TextPromptMessageContent(data="file-content")
         mock_to_prompt = mocker.patch(
             "core.agent.fc_agent_runner.file_manager.to_prompt_message_content",
@@ -352,7 +353,7 @@ class TestRunMethod:
         assert len(outputs) == 1
         assert runner.save_agent_thought.call_args.kwargs["thought"] == "hi"
 
-    def test_run_streaming_tool_call_inputs_type_error(self, runner, mocker):
+    def test_run_streaming_tool_call_inputs_type_error(self, runner, mocker: MockerFixture):
         message = MagicMock(id="m1")
         runner.stream_tool_call = True
 
@@ -398,7 +399,7 @@ class TestRunMethod:
         outputs = list(runner.run(message, "query"))
         assert len(outputs) >= 1
 
-    def test_run_with_tool_instance_and_files(self, runner, mocker):
+    def test_run_with_tool_instance_and_files(self, runner, mocker: MockerFixture):
         message = MagicMock(id="m1")
 
         tool_call = MagicMock()
diff --git a/api/tests/unit_tests/core/agent/test_plugin_entities.py b/api/tests/unit_tests/core/agent/test_plugin_entities.py
index 9955190aca..aa3098a2a1 100644
--- a/api/tests/unit_tests/core/agent/test_plugin_entities.py
+++ b/api/tests/unit_tests/core/agent/test_plugin_entities.py
@@ -9,6 +9,7 @@ mocking; ensure entity invariants and validation rules remain stable.
 
 import pytest
 from pydantic import ValidationError
+from pytest_mock import MockerFixture
 
 from core.agent.plugin_entities import (
     AgentFeature,
@@ -28,12 +29,12 @@ from core.tools.entities.tool_entities import ToolIdentity, ToolProviderIdentity
 
 
 @pytest.fixture
-def mock_identity(mocker):
+def mock_identity(mocker: MockerFixture):
     return mocker.MagicMock(spec=AgentStrategyIdentity)
 
 
 @pytest.fixture
-def mock_provider_identity(mocker):
+def mock_provider_identity(mocker: MockerFixture):
     return mocker.MagicMock(spec=AgentStrategyProviderIdentity)
 
 
@@ -47,7 +48,7 @@ class TestAgentStrategyParameterType:
         "enum_member",
         list(AgentStrategyParameter.AgentStrategyParameterType),
     )
-    def test_as_normal_type_calls_external_function(self, mocker, enum_member) -> None:
+    def test_as_normal_type_calls_external_function(self, mocker: MockerFixture, enum_member) -> None:
         mock_func = mocker.patch(
             "core.agent.plugin_entities.as_normal_type",
             return_value="normalized",
@@ -58,7 +59,7 @@ class TestAgentStrategyParameterType:
         mock_func.assert_called_once_with(enum_member)
         assert result == "normalized"
 
-    def test_as_normal_type_propagates_exception(self, mocker) -> None:
+    def test_as_normal_type_propagates_exception(self, mocker: MockerFixture) -> None:
         enum_member = AgentStrategyParameter.AgentStrategyParameterType.STRING
         mocker.patch(
             "core.agent.plugin_entities.as_normal_type",
@@ -79,7 +80,7 @@ class TestAgentStrategyParameterType:
             (AgentStrategyParameter.AgentStrategyParameterType.FILES, []),
         ],
     )
-    def test_cast_value_calls_external_function(self, mocker, enum_member, value) -> None:
+    def test_cast_value_calls_external_function(self, mocker: MockerFixture, enum_member, value) -> None:
         mock_func = mocker.patch(
             "core.agent.plugin_entities.cast_parameter_value",
             return_value="casted",
@@ -90,7 +91,7 @@ class TestAgentStrategyParameterType:
         mock_func.assert_called_once_with(enum_member, value)
         assert result == "casted"
 
-    def test_cast_value_propagates_exception(self, mocker) -> None:
+    def test_cast_value_propagates_exception(self, mocker: MockerFixture) -> None:
         enum_member = AgentStrategyParameter.AgentStrategyParameterType.STRING
         mocker.patch(
             "core.agent.plugin_entities.cast_parameter_value",
@@ -136,7 +137,7 @@ class TestAgentStrategyParameter:
 
         assert any(error["loc"] == ("type",) for error in exc_info.value.errors())
 
-    def test_init_frontend_parameter_calls_external(self, mocker) -> None:
+    def test_init_frontend_parameter_calls_external(self, mocker: MockerFixture) -> None:
         mock_func = mocker.patch(
             "core.agent.plugin_entities.init_frontend_parameter",
             return_value="frontend",
@@ -153,7 +154,7 @@ class TestAgentStrategyParameter:
         mock_func.assert_called_once_with(param, param.type, "value")
         assert result == "frontend"
 
-    def test_init_frontend_parameter_propagates_exception(self, mocker) -> None:
+    def test_init_frontend_parameter_propagates_exception(self, mocker: MockerFixture) -> None:
         mocker.patch(
             "core.agent.plugin_entities.init_frontend_parameter",
             side_effect=RuntimeError("error"),
diff --git a/api/tests/unit_tests/core/app/app_config/common/test_parameters_mapping.py b/api/tests/unit_tests/core/app/app_config/common/test_parameters_mapping.py
index 1c5b6ed944..6dbf301f65 100644
--- a/api/tests/unit_tests/core/app/app_config/common/test_parameters_mapping.py
+++ b/api/tests/unit_tests/core/app/app_config/common/test_parameters_mapping.py
@@ -10,7 +10,7 @@ class TestGetParametersFromFeatureDict:
     """Test suite for get_parameters_from_feature_dict"""
 
     @pytest.fixture
-    def mock_config(self, monkeypatch):
+    def mock_config(self, monkeypatch: pytest.MonkeyPatch):
         """Mock dify_config values"""
         mock = MagicMock()
         mock.UPLOAD_IMAGE_FILE_SIZE_LIMIT = 1
@@ -23,7 +23,7 @@ class TestGetParametersFromFeatureDict:
         return mock
 
     @pytest.fixture
-    def mock_default_file_limits(self, monkeypatch):
+    def mock_default_file_limits(self, monkeypatch: pytest.MonkeyPatch):
         """Mock DEFAULT_FILE_NUMBER_LIMITS constant"""
         monkeypatch.setattr(parameters_mapping, "DEFAULT_FILE_NUMBER_LIMITS", 99)
         return 99
diff --git a/api/tests/unit_tests/core/app/app_config/common/test_sensitive_word_avoidance_manager.py b/api/tests/unit_tests/core/app/app_config/common/test_sensitive_word_avoidance_manager.py
index 013ed0cbc4..bd4ca5ff85 100644
--- a/api/tests/unit_tests/core/app/app_config/common/test_sensitive_word_avoidance_manager.py
+++ b/api/tests/unit_tests/core/app/app_config/common/test_sensitive_word_avoidance_manager.py
@@ -1,6 +1,7 @@
 from unittest.mock import MagicMock
 
 import pytest
+from pytest_mock import MockerFixture
 
 from core.app.app_config.common.sensitive_word_avoidance.manager import (
     SensitiveWordAvoidanceConfigManager,
@@ -26,7 +27,7 @@ class TestSensitiveWordAvoidanceConfigManagerConvert:
         # Assert
         assert result is None
 
-    def test_convert_returns_entity_when_enabled(self, mocker):
+    def test_convert_returns_entity_when_enabled(self, mocker: MockerFixture):
         # Arrange
         mock_entity = MagicMock()
         mocker.patch(
@@ -48,7 +49,7 @@ class TestSensitiveWordAvoidanceConfigManagerConvert:
         # Assert
         assert result == mock_entity
 
-    def test_convert_enabled_without_type_or_config(self, mocker):
+    def test_convert_enabled_without_type_or_config(self, mocker: MockerFixture):
         # Arrange
         mock_entity = MagicMock()
         patched = mocker.patch(
@@ -135,7 +136,7 @@ class TestSensitiveWordAvoidanceConfigManagerValidateAndSetDefaults:
         with pytest.raises(ValueError, match="must be a dict"):
             SensitiveWordAvoidanceConfigManager.validate_and_set_defaults(tenant_id="tenant1", config=config)
 
-    def test_validate_calls_moderation_factory(self, mocker):
+    def test_validate_calls_moderation_factory(self, mocker: MockerFixture):
         # Arrange
         mock_validate = mocker.patch(
             "core.app.app_config.common.sensitive_word_avoidance.manager.ModerationFactory.validate_config"
@@ -159,7 +160,7 @@ class TestSensitiveWordAvoidanceConfigManagerValidateAndSetDefaults:
         assert result_config["sensitive_word_avoidance"]["enabled"] is True
         assert fields == ["sensitive_word_avoidance"]
 
-    def test_validate_sets_empty_dict_when_config_none(self, mocker):
+    def test_validate_sets_empty_dict_when_config_none(self, mocker: MockerFixture):
         # Arrange
         mock_validate = mocker.patch(
             "core.app.app_config.common.sensitive_word_avoidance.manager.ModerationFactory.validate_config"
@@ -179,7 +180,7 @@ class TestSensitiveWordAvoidanceConfigManagerValidateAndSetDefaults:
         # Assert
         mock_validate.assert_called_once_with(name="mock_type", tenant_id="tenant1", config={})
 
-    def test_validate_only_structure_validate_skips_factory(self, mocker):
+    def test_validate_only_structure_validate_skips_factory(self, mocker: MockerFixture):
         # Arrange
         mock_validate = mocker.patch(
             "core.app.app_config.common.sensitive_word_avoidance.manager.ModerationFactory.validate_config"
diff --git a/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_agent_manager.py b/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_agent_manager.py
index 992b580376..359b04070b 100644
--- a/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_agent_manager.py
+++ b/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_agent_manager.py
@@ -1,6 +1,7 @@
 from unittest.mock import MagicMock
 
 import pytest
+from pytest_mock import MockerFixture
 
 from core.app.app_config.easy_ui_based_app.agent.manager import AgentConfigManager
 
@@ -84,7 +85,7 @@ class TestAgentConfigManagerConvert:
 
         assert result.strategy.name == "CHAIN_OF_THOUGHT"
 
-    def test_convert_skips_disabled_tools(self, mocker, base_config):
+    def test_convert_skips_disabled_tools(self, mocker: MockerFixture, base_config):
         # Patch AgentEntity to bypass pydantic validation
         mock_agent_entity = mocker.patch(
             "core.app.app_config.easy_ui_based_app.agent.manager.AgentEntity",
@@ -128,7 +129,7 @@ class TestAgentConfigManagerConvert:
         mock_validate.assert_called_once()
         mock_agent_entity.assert_called_once()
 
-    def test_convert_tool_requires_minimum_keys(self, mocker, base_config):
+    def test_convert_tool_requires_minimum_keys(self, mocker: MockerFixture, base_config):
         mock_validate = mocker.patch(
             "core.app.app_config.easy_ui_based_app.agent.manager.AgentToolEntity.model_validate",
             return_value=MagicMock(),
diff --git a/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_dataset_manager.py b/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_dataset_manager.py
index a688e2a5c5..3a239eac0e 100644
--- a/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_dataset_manager.py
+++ b/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_dataset_manager.py
@@ -2,6 +2,7 @@ import uuid
 from unittest.mock import MagicMock
 
 import pytest
+from pytest_mock import MockerFixture
 
 from core.app.app_config.easy_ui_based_app.dataset.manager import DatasetConfigManager
 from core.entities.agent_entities import PlanningStrategy
@@ -69,7 +70,7 @@ class TestDatasetConfigManagerConvert:
         assert result.dataset_ids == [valid_uuid]
         assert result.retrieve_config.query_variable == "query"
 
-    def test_convert_single_with_metadata_configs(self, valid_uuid, mocker):
+    def test_convert_single_with_metadata_configs(self, valid_uuid, mocker: MockerFixture):
         mock_retrieve_config = MagicMock()
         mock_entity = MagicMock()
         mock_entity.dataset_ids = [valid_uuid]
@@ -258,7 +259,7 @@ class TestExtractDatasetConfig:
         with pytest.raises(ValueError):
             DatasetConfigManager.extract_dataset_config_for_legacy_compatibility("tenant1", AppMode.CHAT, config)
 
-    def test_extract_invalid_uuid(self, mocker):
+    def test_extract_invalid_uuid(self, mocker: MockerFixture):
         invalid_uuid = "not-a-uuid"
         config = {
             "agent_mode": {
@@ -270,7 +271,7 @@ class TestExtractDatasetConfig:
         with pytest.raises(ValueError):
             DatasetConfigManager.extract_dataset_config_for_legacy_compatibility("tenant1", AppMode.CHAT, config)
 
-    def test_extract_dataset_not_exists(self, valid_uuid, mocker):
+    def test_extract_dataset_not_exists(self, valid_uuid, mocker: MockerFixture):
         mocker.patch(
             "core.app.app_config.easy_ui_based_app.dataset.manager.DatasetService.get_dataset",
             return_value=None,
@@ -292,7 +293,7 @@ class TestExtractDatasetConfig:
 
 
 class TestIsDatasetExists:
-    def test_dataset_exists_true(self, mocker, valid_uuid):
+    def test_dataset_exists_true(self, mocker: MockerFixture, valid_uuid):
         mock_dataset = MagicMock()
         mock_dataset.tenant_id = "tenant1"
         mocker.patch(
@@ -302,14 +303,14 @@ class TestIsDatasetExists:
 
         assert DatasetConfigManager.is_dataset_exists("tenant1", valid_uuid)
 
-    def test_dataset_exists_false_when_not_found(self, mocker, valid_uuid):
+    def test_dataset_exists_false_when_not_found(self, mocker: MockerFixture, valid_uuid):
         mocker.patch(
             "core.app.app_config.easy_ui_based_app.dataset.manager.DatasetService.get_dataset",
             return_value=None,
         )
         assert not DatasetConfigManager.is_dataset_exists("tenant1", valid_uuid)
 
-    def test_dataset_exists_false_when_tenant_mismatch(self, mocker, valid_uuid):
+    def test_dataset_exists_false_when_tenant_mismatch(self, mocker: MockerFixture, valid_uuid):
         mock_dataset = MagicMock()
         mock_dataset.tenant_id = "other"
         mocker.patch(
diff --git a/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_model_config_converter.py b/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_model_config_converter.py
index 186b4a501d..e5b581b6a0 100644
--- a/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_model_config_converter.py
+++ b/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_model_config_converter.py
@@ -2,6 +2,7 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock
 
 import pytest
+from pytest_mock import MockerFixture
 
 from core.app.app_config.easy_ui_based_app.model_config.converter import ModelConfigConverter
 from core.entities.model_entities import ModelStatus
@@ -16,7 +17,7 @@ from graphon.model_runtime.entities.model_entities import ModelPropertyKey
 
 class TestModelConfigConverter:
     @pytest.fixture(autouse=True)
-    def patch_response_entity(self, mocker):
+    def patch_response_entity(self, mocker: MockerFixture):
         """
         Patch ModelConfigWithCredentialsEntity to bypass Pydantic validation
         and return a simple namespace object instead.
@@ -69,7 +70,7 @@ class TestModelConfigConverter:
         return bundle
 
     @pytest.fixture
-    def patch_provider_manager(self, mocker, mock_provider_bundle):
+    def patch_provider_manager(self, mocker: MockerFixture, mock_provider_bundle):
         mock_manager = MagicMock()
         mock_manager.get_provider_model_bundle.return_value = mock_provider_bundle
         mocker.patch(
@@ -99,7 +100,7 @@ class TestModelConfigConverter:
         assert result.parameters == {"temperature": 0.7}
         assert result.stop == ["\n"]
 
-    def test_convert_mode_from_schema_valid(self, mock_app_config, mock_provider_bundle, mocker):
+    def test_convert_mode_from_schema_valid(self, mock_app_config, mock_provider_bundle, mocker: MockerFixture):
         mock_app_config.model.mode = None
 
         mock_provider_bundle.model_type_instance.get_model_schema.return_value.model_properties = {
@@ -116,7 +117,9 @@ class TestModelConfigConverter:
         result = ModelConfigConverter.convert(mock_app_config)
         assert result.mode == LLMMode.COMPLETION
 
-    def test_convert_mode_from_schema_invalid_fallback(self, mock_app_config, mock_provider_bundle, mocker):
+    def test_convert_mode_from_schema_invalid_fallback(
+        self, mock_app_config, mock_provider_bundle, mocker: MockerFixture
+    ):
         mock_provider_bundle.model_type_instance.get_model_schema.return_value.model_properties = {
             ModelPropertyKey.MODE: "invalid"
         }
@@ -135,7 +138,7 @@ class TestModelConfigConverter:
     # Credential Errors
     # =============================
 
-    def test_convert_credentials_none_raises(self, mock_app_config, mock_provider_bundle, mocker):
+    def test_convert_credentials_none_raises(self, mock_app_config, mock_provider_bundle, mocker: MockerFixture):
         mock_provider_bundle.configuration.get_current_credentials.return_value = None
 
         mock_manager = MagicMock()
@@ -152,7 +155,7 @@ class TestModelConfigConverter:
     # Provider Model Errors
     # =============================
 
-    def test_convert_provider_model_none_raises(self, mock_app_config, mock_provider_bundle, mocker):
+    def test_convert_provider_model_none_raises(self, mock_app_config, mock_provider_bundle, mocker: MockerFixture):
         mock_provider_bundle.configuration.get_provider_model.return_value = None
 
         mock_manager = MagicMock()
@@ -174,7 +177,7 @@ class TestModelConfigConverter:
         ],
     )
     def test_convert_provider_model_status_errors(
-        self, mock_app_config, mock_provider_bundle, mocker, status, expected_exception
+        self, mock_app_config, mock_provider_bundle, mocker: MockerFixture, status, expected_exception
     ):
         mock_provider = MagicMock()
         mock_provider.status = status
@@ -194,7 +197,7 @@ class TestModelConfigConverter:
     # Schema Errors
     # =============================
 
-    def test_convert_model_schema_none_raises(self, mock_app_config, mock_provider_bundle, mocker):
+    def test_convert_model_schema_none_raises(self, mock_app_config, mock_provider_bundle, mocker: MockerFixture):
         mock_provider_bundle.model_type_instance.get_model_schema.return_value = None
 
         mock_manager = MagicMock()
diff --git a/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_model_config_manager.py b/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_model_config_manager.py
index 68bca485bb..72e334004e 100644
--- a/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_model_config_manager.py
+++ b/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_model_config_manager.py
@@ -1,6 +1,7 @@
 from unittest.mock import MagicMock
 
 import pytest
+from pytest_mock import MockerFixture
 
 # Target
 from core.app.app_config.easy_ui_based_app.model_config.manager import ModelConfigManager
@@ -107,7 +108,9 @@ class TestModelConfigManager:
     # validate_and_set_defaults
     # ==========================================================
 
-    def test_validate_and_set_defaults_success(self, mocker, valid_config, provider_entities, valid_model_list):
+    def test_validate_and_set_defaults_success(
+        self, mocker: MockerFixture, valid_config, provider_entities, valid_model_list
+    ):
         self._patch_model_assembly(
             mocker,
             provider_entities=provider_entities,
@@ -127,35 +130,37 @@ class TestModelConfigManager:
         with pytest.raises(ValueError, match="object type"):
             ModelConfigManager.validate_and_set_defaults("tenant1", {"model": "invalid"})
 
-    def test_validate_and_set_defaults_missing_provider(self, mocker, provider_entities):
+    def test_validate_and_set_defaults_missing_provider(self, mocker: MockerFixture, provider_entities):
         config = {"model": {"name": "gpt-4", "completion_params": {}}}
         self._patch_model_assembly(mocker, provider_entities=provider_entities, model_list=[])
 
         with pytest.raises(ValueError, match="model.provider is required"):
             ModelConfigManager.validate_and_set_defaults("tenant1", config)
 
-    def test_validate_and_set_defaults_invalid_provider(self, mocker, provider_entities):
+    def test_validate_and_set_defaults_invalid_provider(self, mocker: MockerFixture, provider_entities):
         config = {"model": {"provider": "invalid/provider", "name": "gpt-4", "completion_params": {}}}
         self._patch_model_assembly(mocker, provider_entities=provider_entities, model_list=[])
 
         with pytest.raises(ValueError, match="model.provider is required"):
             ModelConfigManager.validate_and_set_defaults("tenant1", config)
 
-    def test_validate_and_set_defaults_missing_name(self, mocker, provider_entities):
+    def test_validate_and_set_defaults_missing_name(self, mocker: MockerFixture, provider_entities):
         config = {"model": {"provider": "openai/gpt", "completion_params": {}}}
         self._patch_model_assembly(mocker, provider_entities=provider_entities, model_list=[])
 
         with pytest.raises(ValueError, match="model.name is required"):
             ModelConfigManager.validate_and_set_defaults("tenant1", config)
 
-    def test_validate_and_set_defaults_empty_models(self, mocker, provider_entities):
+    def test_validate_and_set_defaults_empty_models(self, mocker: MockerFixture, provider_entities):
         config = {"model": {"provider": "openai/gpt", "name": "gpt-4", "completion_params": {}}}
         self._patch_model_assembly(mocker, provider_entities=provider_entities, model_list=[])
 
         with pytest.raises(ValueError, match="must be in the specified model list"):
             ModelConfigManager.validate_and_set_defaults("tenant1", config)
 
-    def test_validate_and_set_defaults_invalid_model_name(self, mocker, provider_entities, valid_model_list):
+    def test_validate_and_set_defaults_invalid_model_name(
+        self, mocker: MockerFixture, provider_entities, valid_model_list
+    ):
         config = {"model": {"provider": "openai/gpt", "name": "invalid", "completion_params": {}}}
         self._patch_model_assembly(
             mocker,
@@ -166,7 +171,7 @@ class TestModelConfigManager:
         with pytest.raises(ValueError, match="must be in the specified model list"):
             ModelConfigManager.validate_and_set_defaults("tenant1", config)
 
-    def test_validate_and_set_defaults_default_mode_when_missing(self, mocker, provider_entities):
+    def test_validate_and_set_defaults_default_mode_when_missing(self, mocker: MockerFixture, provider_entities):
         model = MagicMock()
         model.model = "gpt-4"
         model.model_properties = {}
@@ -178,7 +183,9 @@ class TestModelConfigManager:
 
         assert updated_config["model"]["mode"] == "completion"
 
-    def test_validate_and_set_defaults_missing_completion_params(self, mocker, provider_entities, valid_model_list):
+    def test_validate_and_set_defaults_missing_completion_params(
+        self, mocker: MockerFixture, provider_entities, valid_model_list
+    ):
         config = {"model": {"provider": "openai/gpt", "name": "gpt-4"}}
         self._patch_model_assembly(
             mocker,
@@ -189,7 +196,7 @@ class TestModelConfigManager:
         with pytest.raises(ValueError, match="completion_params is required"):
             ModelConfigManager.validate_and_set_defaults("tenant1", config)
 
-    def test_validate_and_set_defaults_provider_without_slash_converted(self, mocker, valid_model_list):
+    def test_validate_and_set_defaults_provider_without_slash_converted(self, mocker: MockerFixture, valid_model_list):
         """
         Covers branch where provider does not contain '/' and
         ModelProviderID conversion is triggered (line 64).
diff --git a/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_prompt_template_manager.py b/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_prompt_template_manager.py
index fd49072cd5..62e1d22129 100644
--- a/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_prompt_template_manager.py
+++ b/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_prompt_template_manager.py
@@ -1,6 +1,8 @@
+from collections import UserString
 from unittest.mock import MagicMock
 
 import pytest
+from pytest_mock import MockerFixture
 
 from core.app.app_config.easy_ui_based_app.prompt_template.manager import (
     PromptTemplateConfigManager,
@@ -11,21 +13,25 @@ from core.app.app_config.easy_ui_based_app.prompt_template.manager import (
 # -----------------------------
 
 
-class DummyEnumValue:
+class DummyEnumValue(UserString):
     def __init__(self, value):
+        super().__init__(value)
         self.value = value
 
 
 class DummyPromptType:
     def __init__(self):
-        self.SIMPLE = "simple"
-        self.ADVANCED = "advanced"
+        self.SIMPLE = DummyEnumValue("simple")
+        self.ADVANCED = DummyEnumValue("advanced")
 
     def value_of(self, value):
-        return value
+        for enum_value in self:
+            if enum_value.value == value:
+                return enum_value
+        raise ValueError(f"invalid prompt type value {value}")
 
     def __iter__(self):
-        return iter([DummyEnumValue("simple"), DummyEnumValue("advanced")])
+        return iter([self.SIMPLE, self.ADVANCED])
 
 
 # -----------------------------
@@ -38,7 +44,7 @@ class TestPromptTemplateConfigManagerConvert:
         with pytest.raises(ValueError, match="prompt_type is required"):
             PromptTemplateConfigManager.convert({})
 
-    def test_convert_simple_prompt(self, mocker):
+    def test_convert_simple_prompt(self, mocker: MockerFixture):
         mock_prompt_entity_cls = MagicMock()
         mock_prompt_entity_cls.PromptType = DummyPromptType()
 
@@ -56,7 +62,7 @@ class TestPromptTemplateConfigManagerConvert:
         assert result == "simple_entity"
         mock_prompt_entity_cls.assert_called_once_with(prompt_type="simple", simple_prompt_template="hello")
 
-    def test_convert_advanced_chat_valid(self, mocker):
+    def test_convert_advanced_chat_valid(self, mocker: MockerFixture):
         mock_prompt_entity_cls = MagicMock()
         mock_prompt_entity_cls.PromptType = DummyPromptType()
         mock_prompt_entity_cls.return_value = "advanced_entity"
@@ -97,7 +103,7 @@ class TestPromptTemplateConfigManagerConvert:
             {"text": "hi", "role": 123},
         ],
     )
-    def test_convert_advanced_invalid_message_fields(self, mocker, message):
+    def test_convert_advanced_invalid_message_fields(self, mocker: MockerFixture, message):
         mock_prompt_entity_cls = MagicMock()
         mock_prompt_entity_cls.PromptType = DummyPromptType()
 
@@ -114,7 +120,7 @@ class TestPromptTemplateConfigManagerConvert:
         with pytest.raises(ValueError):
             PromptTemplateConfigManager.convert(config)
 
-    def test_convert_advanced_completion_with_roles(self, mocker):
+    def test_convert_advanced_completion_with_roles(self, mocker: MockerFixture):
         mock_prompt_entity_cls = MagicMock()
         mock_prompt_entity_cls.PromptType = DummyPromptType()
         mock_prompt_entity_cls.return_value = "advanced_entity"
@@ -154,7 +160,7 @@ class TestValidateAndSetDefaults:
     def setup_method(self):
         self.valid_model = {"mode": "chat"}
 
-    def _patch_prompt_type(self, mocker):
+    def _patch_prompt_type(self, mocker: MockerFixture):
         mock_prompt_entity_cls = MagicMock()
         mock_prompt_entity_cls.PromptType = DummyPromptType()
         mocker.patch(
@@ -163,7 +169,7 @@ class TestValidateAndSetDefaults:
         )
         return mock_prompt_entity_cls
 
-    def test_default_prompt_type_set(self, mocker):
+    def test_default_prompt_type_set(self, mocker: MockerFixture):
         self._patch_prompt_type(mocker)
 
         config = {"model": self.valid_model}
@@ -173,7 +179,7 @@ class TestValidateAndSetDefaults:
         assert result["prompt_type"] == "simple"
         assert isinstance(keys, list)
 
-    def test_invalid_prompt_type_raises(self, mocker):
+    def test_invalid_prompt_type_raises(self, mocker: MockerFixture):
         class InvalidEnum(DummyPromptType):
             def __iter__(self):
                 return iter([DummyEnumValue("valid")])
@@ -191,7 +197,7 @@ class TestValidateAndSetDefaults:
         with pytest.raises(ValueError):
             PromptTemplateConfigManager.validate_and_set_defaults("chat_app", config)
 
-    def test_invalid_chat_prompt_config_type(self, mocker):
+    def test_invalid_chat_prompt_config_type(self, mocker: MockerFixture):
         self._patch_prompt_type(mocker)
 
         config = {
@@ -203,7 +209,7 @@ class TestValidateAndSetDefaults:
         with pytest.raises(ValueError):
             PromptTemplateConfigManager.validate_and_set_defaults("chat_app", config)
 
-    def test_simple_mode_invalid_pre_prompt_type(self, mocker):
+    def test_simple_mode_invalid_pre_prompt_type(self, mocker: MockerFixture):
         self._patch_prompt_type(mocker)
 
         config = {
@@ -215,7 +221,7 @@ class TestValidateAndSetDefaults:
         with pytest.raises(ValueError):
             PromptTemplateConfigManager.validate_and_set_defaults("chat_app", config)
 
-    def test_advanced_requires_one_config(self, mocker):
+    def test_advanced_requires_one_config(self, mocker: MockerFixture):
         self._patch_prompt_type(mocker)
 
         config = {
@@ -228,7 +234,7 @@ class TestValidateAndSetDefaults:
         with pytest.raises(ValueError):
             PromptTemplateConfigManager.validate_and_set_defaults("chat_app", config)
 
-    def test_advanced_invalid_model_mode(self, mocker):
+    def test_advanced_invalid_model_mode(self, mocker: MockerFixture):
         self._patch_prompt_type(mocker)
 
         config = {
@@ -240,7 +246,7 @@ class TestValidateAndSetDefaults:
         with pytest.raises(ValueError):
             PromptTemplateConfigManager.validate_and_set_defaults("chat_app", config)
 
-    def test_advanced_chat_prompt_length_exceeds(self, mocker):
+    def test_advanced_chat_prompt_length_exceeds(self, mocker: MockerFixture):
         self._patch_prompt_type(mocker)
 
         config = {
@@ -252,7 +258,7 @@ class TestValidateAndSetDefaults:
         with pytest.raises(ValueError):
             PromptTemplateConfigManager.validate_and_set_defaults("chat_app", config)
 
-    def test_completion_prefix_defaults_set_when_empty(self, mocker):
+    def test_completion_prefix_defaults_set_when_empty(self, mocker: MockerFixture):
         self._patch_prompt_type(mocker)
 
         config = {
diff --git a/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_variables_manager.py b/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_variables_manager.py
index d9fe7004ff..b82417cfed 100644
--- a/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_variables_manager.py
+++ b/api/tests/unit_tests/core/app/app_config/easy_ui_based_app/test_variables_manager.py
@@ -1,4 +1,5 @@
 import pytest
+from pytest_mock import MockerFixture
 
 from core.app.app_config.easy_ui_based_app.variables.manager import (
     BasicVariablesConfigManager,
@@ -15,7 +16,7 @@ class TestBasicVariablesConfigManagerConvert:
         assert variables == []
         assert external == []
 
-    def test_convert_external_data_tools_enabled_and_disabled(self, mocker):
+    def test_convert_external_data_tools_enabled_and_disabled(self, mocker: MockerFixture):
         config = {
             "external_data_tools": [
                 {"enabled": False},
@@ -232,7 +233,7 @@ class TestValidateExternalDataToolsAndSetDefaults:
         with pytest.raises(ValueError):
             BasicVariablesConfigManager.validate_external_data_tools_and_set_defaults("tenant", config)
 
-    def test_validate_disabled_tool_skipped(self, mocker):
+    def test_validate_disabled_tool_skipped(self, mocker: MockerFixture):
         config = {"external_data_tools": [{"enabled": False}]}
 
         spy = mocker.patch(
@@ -250,7 +251,7 @@ class TestValidateExternalDataToolsAndSetDefaults:
         with pytest.raises(ValueError):
             BasicVariablesConfigManager.validate_external_data_tools_and_set_defaults("tenant", config)
 
-    def test_validate_enabled_tool_calls_factory(self, mocker):
+    def test_validate_enabled_tool_calls_factory(self, mocker: MockerFixture):
         config = {"external_data_tools": [{"enabled": True, "type": "tool", "config": {"a": 1}}]}
 
         spy = mocker.patch(
@@ -263,7 +264,7 @@ class TestValidateExternalDataToolsAndSetDefaults:
 
 
 class TestValidateAndSetDefaultsIntegration:
-    def test_validate_and_set_defaults_calls_both(self, mocker):
+    def test_validate_and_set_defaults_calls_both(self, mocker: MockerFixture):
         config = {}
 
         spy_var = mocker.patch.object(
diff --git a/api/tests/unit_tests/core/app/app_config/test_base_app_config_manager.py b/api/tests/unit_tests/core/app/app_config/test_base_app_config_manager.py
index e99852cf76..e2ab3e2192 100644
--- a/api/tests/unit_tests/core/app/app_config/test_base_app_config_manager.py
+++ b/api/tests/unit_tests/core/app/app_config/test_base_app_config_manager.py
@@ -2,6 +2,7 @@ from collections import UserDict
 from unittest.mock import MagicMock
 
 import pytest
+from pytest_mock import MockerFixture
 
 from core.app.app_config.base_app_config_manager import BaseAppConfigManager
 
@@ -12,7 +13,7 @@ class TestBaseAppConfigManager:
         return {"key": "value", "another": 123}
 
     @pytest.fixture
-    def mock_app_additional_features(self, mocker):
+    def mock_app_additional_features(self, mocker: MockerFixture):
         mock_instance = MagicMock()
         mocker.patch(
             "core.app.app_config.base_app_config_manager.AppAdditionalFeatures",
@@ -21,7 +22,7 @@ class TestBaseAppConfigManager:
         return mock_instance
 
     @pytest.fixture
-    def mock_managers(self, mocker):
+    def mock_managers(self, mocker: MockerFixture):
         retrieval = mocker.patch(
             "core.app.app_config.base_app_config_manager.RetrievalResourceConfigManager.convert",
             return_value="retrieval_result",
@@ -72,7 +73,7 @@ class TestBaseAppConfigManager:
     )
     def test_convert_features_all_modes(
         self,
-        mocker,
+        mocker: MockerFixture,
         mock_config_dict,
         mock_app_additional_features,
         mock_managers,
@@ -107,7 +108,7 @@ class TestBaseAppConfigManager:
         mock_managers["speech_to_text"].assert_called_once_with(config=dict(mock_config_dict.items()))
         mock_managers["text_to_speech"].assert_called_once_with(config=dict(mock_config_dict.items()))
 
-    def test_convert_features_empty_config(self, mocker, mock_app_additional_features, mock_managers):
+    def test_convert_features_empty_config(self, mocker: MockerFixture, mock_app_additional_features, mock_managers):
         # Arrange
         empty_config = {}
         mock_app_mode = MagicMock()
@@ -143,7 +144,7 @@ class TestBaseAppConfigManager:
         with pytest.raises((TypeError, AttributeError)):
             BaseAppConfigManager.convert_features(invalid_config, "CHAT")
 
-    def test_convert_features_manager_exception_propagates(self, mocker, mock_config_dict):
+    def test_convert_features_manager_exception_propagates(self, mocker: MockerFixture, mock_config_dict):
         # Arrange
         mocker.patch(
             "core.app.app_config.base_app_config_manager.RetrievalResourceConfigManager.convert",
@@ -154,7 +155,9 @@ class TestBaseAppConfigManager:
         with pytest.raises(RuntimeError):
             BaseAppConfigManager.convert_features(mock_config_dict, "CHAT")
 
-    def test_convert_features_mapping_subclass(self, mocker, mock_app_additional_features, mock_managers):
+    def test_convert_features_mapping_subclass(
+        self, mocker: MockerFixture, mock_app_additional_features, mock_managers
+    ):
         # Arrange
         class CustomMapping(UserDict):
             pass
diff --git a/api/tests/unit_tests/core/app/app_config/workflow_ui_based_app/test_workflow_ui_based_app_manager.py b/api/tests/unit_tests/core/app/app_config/workflow_ui_based_app/test_workflow_ui_based_app_manager.py
index fa128aca87..dacd69a578 100644
--- a/api/tests/unit_tests/core/app/app_config/workflow_ui_based_app/test_workflow_ui_based_app_manager.py
+++ b/api/tests/unit_tests/core/app/app_config/workflow_ui_based_app/test_workflow_ui_based_app_manager.py
@@ -1,4 +1,5 @@
 import pytest
+from pytest_mock import MockerFixture
 
 from core.app.app_config.workflow_ui_based_app.variables.manager import (
     WorkflowVariablesConfigManager,
@@ -10,19 +11,19 @@ from core.app.app_config.workflow_ui_based_app.variables.manager import (
 
 
 @pytest.fixture
-def mock_workflow(mocker):
+def mock_workflow(mocker: MockerFixture):
     workflow = mocker.MagicMock()
     workflow.graph_dict = {"nodes": []}
     return workflow
 
 
 @pytest.fixture
-def mock_variable_entity(mocker):
+def mock_variable_entity(mocker: MockerFixture):
     return mocker.patch("core.app.app_config.workflow_ui_based_app.variables.manager.VariableEntity")
 
 
 @pytest.fixture
-def mock_rag_entity(mocker):
+def mock_rag_entity(mocker: MockerFixture):
     return mocker.patch("core.app.app_config.workflow_ui_based_app.variables.manager.RagPipelineVariableEntity")
 
 
diff --git a/api/tests/unit_tests/core/app/apps/advanced_chat/test_app_generator.py b/api/tests/unit_tests/core/app/apps/advanced_chat/test_app_generator.py
index af5d203f12..5df064030b 100644
--- a/api/tests/unit_tests/core/app/apps/advanced_chat/test_app_generator.py
+++ b/api/tests/unit_tests/core/app/apps/advanced_chat/test_app_generator.py
@@ -111,7 +111,7 @@ class TestAdvancedChatAppGeneratorInternals:
             workflow_id="workflow-id",
         )
 
-    def test_generate_loads_conversation_and_files(self, monkeypatch):
+    def test_generate_loads_conversation_and_files(self, monkeypatch: pytest.MonkeyPatch):
         generator = AdvancedChatAppGenerator()
         app_config = self._build_app_config()
 
@@ -195,8 +195,9 @@ class TestAdvancedChatAppGeneratorInternals:
         assert captured["application_generate_entity"].files == built_files
         assert build_files_called["called"] is True
 
-    def test_resume_delegates_to_generate(self, monkeypatch):
+    def test_resume_delegates_to_generate(self, monkeypatch: pytest.MonkeyPatch):
         generator = AdvancedChatAppGenerator()
+        existing_trace_manager = SimpleNamespace(app_id="existing-app", user_id="existing-user")
         application_generate_entity = AdvancedChatAppGenerateEntity.model_construct(
             task_id="task",
             app_config=self._build_app_config(),
@@ -207,22 +208,25 @@ class TestAdvancedChatAppGeneratorInternals:
             stream=True,
             invoke_from=InvokeFrom.WEB_APP,
             extras={},
-            trace_manager=None,
+            trace_manager=existing_trace_manager,
             workflow_run_id="run-id",
         )
 
-        captured: dict[str, object] = {}
+        captured_entity: AdvancedChatAppGenerateEntity | None = None
+        captured_graph_runtime_state: object | None = None
 
         def _fake_generate(**kwargs):
-            captured.update(kwargs)
-            return {"resumed": True}
+            nonlocal captured_entity, captured_graph_runtime_state
+            captured_entity = kwargs["application_generate_entity"]
+            captured_graph_runtime_state = kwargs["graph_runtime_state"]
+            return SimpleNamespace(resumed=True)
 
         monkeypatch.setattr(generator, "_generate", _fake_generate)
 
         result = generator.resume(
-            app_model=SimpleNamespace(),
+            app_model=SimpleNamespace(id="app-id"),
             workflow=SimpleNamespace(),
-            user=SimpleNamespace(),
+            user=SimpleNamespace(id="end-user-id", session_id="session-id"),
             conversation=SimpleNamespace(id="conversation-id"),
             message=SimpleNamespace(id="message-id"),
             application_generate_entity=application_generate_entity,
@@ -232,10 +236,12 @@ class TestAdvancedChatAppGeneratorInternals:
             pause_state_config=None,
         )
 
-        assert result == {"resumed": True}
-        assert captured["graph_runtime_state"] is not None
+        assert result.resumed is True
+        assert captured_entity is not None
+        assert captured_entity.trace_manager is existing_trace_manager
+        assert captured_graph_runtime_state is not None
 
-    def test_single_iteration_generate_builds_debug_task(self, monkeypatch):
+    def test_single_iteration_generate_builds_debug_task(self, monkeypatch: pytest.MonkeyPatch):
         generator = AdvancedChatAppGenerator()
         app_config = self._build_app_config()
         captured: dict[str, object] = {}
@@ -293,7 +299,7 @@ class TestAdvancedChatAppGeneratorInternals:
         assert captured["variable_loader"] is var_loader
         assert captured["application_generate_entity"].single_iteration_run.node_id == "node-1"
 
-    def test_single_loop_generate_builds_debug_task(self, monkeypatch):
+    def test_single_loop_generate_builds_debug_task(self, monkeypatch: pytest.MonkeyPatch):
         generator = AdvancedChatAppGenerator()
         app_config = self._build_app_config()
         captured: dict[str, object] = {}
@@ -351,7 +357,7 @@ class TestAdvancedChatAppGeneratorInternals:
         assert captured["variable_loader"] is var_loader
         assert captured["application_generate_entity"].single_loop_run.node_id == "node-2"
 
-    def test_generate_internal_flow_initial_conversation_with_pause_layer(self, monkeypatch):
+    def test_generate_internal_flow_initial_conversation_with_pause_layer(self, monkeypatch: pytest.MonkeyPatch):
         generator = AdvancedChatAppGenerator()
         generator._dialogue_count = 0
         app_config = self._build_app_config()
@@ -449,7 +455,7 @@ class TestAdvancedChatAppGeneratorInternals:
         assert isinstance(captured["conversation"], ConversationSnapshot)
         assert isinstance(captured["message"], MessageSnapshot)
 
-    def test_generate_internal_flow_with_existing_records_skips_init(self, monkeypatch):
+    def test_generate_internal_flow_with_existing_records_skips_init(self, monkeypatch: pytest.MonkeyPatch):
         generator = AdvancedChatAppGenerator()
         generator._dialogue_count = 0
         app_config = self._build_app_config()
@@ -535,7 +541,7 @@ class TestAdvancedChatAppGeneratorInternals:
         db_session.refresh.assert_not_called()
         db_session.close.assert_called_once()
 
-    def test_generate_worker_raises_when_workflow_not_found(self, monkeypatch):
+    def test_generate_worker_raises_when_workflow_not_found(self, monkeypatch: pytest.MonkeyPatch):
         generator = AdvancedChatAppGenerator()
         generator._dialogue_count = 1
         app_config = self._build_app_config()
@@ -594,7 +600,7 @@ class TestAdvancedChatAppGeneratorInternals:
                 graph_runtime_state=None,
             )
 
-    def test_generate_worker_raises_when_app_not_found_for_internal_call(self, monkeypatch):
+    def test_generate_worker_raises_when_app_not_found_for_internal_call(self, monkeypatch: pytest.MonkeyPatch):
         generator = AdvancedChatAppGenerator()
         generator._dialogue_count = 1
         app_config = self._build_app_config()
@@ -658,7 +664,7 @@ class TestAdvancedChatAppGeneratorInternals:
                 graph_runtime_state=None,
             )
 
-    def test_generate_worker_handles_stopped_error(self, monkeypatch):
+    def test_generate_worker_handles_stopped_error(self, monkeypatch: pytest.MonkeyPatch):
         generator = AdvancedChatAppGenerator()
         generator._dialogue_count = 1
         app_config = self._build_app_config()
@@ -732,7 +738,7 @@ class TestAdvancedChatAppGeneratorInternals:
 
         queue_manager.publish_error.assert_not_called()
 
-    def test_generate_worker_handles_validation_error(self, monkeypatch):
+    def test_generate_worker_handles_validation_error(self, monkeypatch: pytest.MonkeyPatch):
         generator = AdvancedChatAppGenerator()
         generator._dialogue_count = 1
         app_config = self._build_app_config()
@@ -816,7 +822,7 @@ class TestAdvancedChatAppGeneratorInternals:
 
         queue_manager.publish_error.assert_called_once()
 
-    def test_generate_worker_handles_value_and_unknown_errors(self, monkeypatch):
+    def test_generate_worker_handles_value_and_unknown_errors(self, monkeypatch: pytest.MonkeyPatch):
         app_config = self._build_app_config()
 
         @contextmanager
@@ -897,7 +903,7 @@ class TestAdvancedChatAppGeneratorInternals:
 
             queue_manager.publish_error.assert_called_once()
 
-    def test_handle_response_closed_file_raises_stopped(self, monkeypatch):
+    def test_handle_response_closed_file_raises_stopped(self, monkeypatch: pytest.MonkeyPatch):
         generator = AdvancedChatAppGenerator()
         generator._dialogue_count = 1
 
@@ -953,7 +959,7 @@ class TestAdvancedChatAppGeneratorInternals:
                 stream=False,
             )
 
-    def test_handle_response_re_raises_value_error(self, monkeypatch):
+    def test_handle_response_re_raises_value_error(self, monkeypatch: pytest.MonkeyPatch):
         generator = AdvancedChatAppGenerator()
         generator._dialogue_count = 1
         app_config = self._build_app_config()
@@ -1002,7 +1008,7 @@ class TestAdvancedChatAppGeneratorInternals:
 
         logger_exception.assert_called_once()
 
-    def test_generate_worker_handles_invoke_auth_error(self, monkeypatch):
+    def test_generate_worker_handles_invoke_auth_error(self, monkeypatch: pytest.MonkeyPatch):
         generator = AdvancedChatAppGenerator()
         generator._dialogue_count = 1
 
@@ -1088,7 +1094,7 @@ class TestAdvancedChatAppGeneratorInternals:
 
         assert queue_manager.publish_error.called
 
-    def test_generate_debugger_enables_retrieve_source(self, monkeypatch):
+    def test_generate_debugger_enables_retrieve_source(self, monkeypatch: pytest.MonkeyPatch):
         generator = AdvancedChatAppGenerator()
 
         app_config = WorkflowUIBasedAppConfig(
@@ -1167,7 +1173,7 @@ class TestAdvancedChatAppGeneratorInternals:
         assert app_config.additional_features.show_retrieve_source is True
         assert captured["application_generate_entity"].query == "hello"
 
-    def test_generate_service_api_sets_parent_message_id(self, monkeypatch):
+    def test_generate_service_api_sets_parent_message_id(self, monkeypatch: pytest.MonkeyPatch):
         generator = AdvancedChatAppGenerator()
 
         app_config = WorkflowUIBasedAppConfig(
@@ -1243,3 +1249,119 @@ class TestAdvancedChatAppGeneratorInternals:
         )
 
         assert captured["application_generate_entity"].parent_message_id == UUID_NIL
+
+
+class TestAdvancedChatAppGeneratorResume:
+    @staticmethod
+    def _build_app_config() -> WorkflowUIBasedAppConfig:
+        return WorkflowUIBasedAppConfig(
+            tenant_id="tenant",
+            app_id="app",
+            app_mode=AppMode.ADVANCED_CHAT,
+            additional_features=AppAdditionalFeatures(),
+            variables=[],
+            workflow_id="workflow-id",
+        )
+
+    def test_resume_restores_trace_manager_when_missing(self, monkeypatch: pytest.MonkeyPatch):
+        generator = AdvancedChatAppGenerator()
+        application_generate_entity = AdvancedChatAppGenerateEntity.model_construct(
+            task_id="task",
+            app_config=self._build_app_config(),
+            file_upload_config=None,
+            conversation_id="conversation-id",
+            inputs={},
+            query="hello",
+            files=[],
+            parent_message_id="parent-message-id",
+            user_id="user",
+            stream=False,
+            invoke_from=InvokeFrom.WEB_APP,
+            extras={},
+            trace_manager=None,
+            workflow_run_id="run-id",
+        )
+        DummyTraceQueueManager = type(
+            "_DummyTraceQueueManager",
+            (TraceQueueManager,),
+            {
+                "__init__": lambda self, app_id=None, user_id=None: (
+                    setattr(self, "app_id", app_id) or setattr(self, "user_id", user_id)
+                )
+            },
+        )
+        monkeypatch.setattr(
+            "core.app.apps.advanced_chat.app_generator.TraceQueueManager",
+            DummyTraceQueueManager,
+        )
+        captured_entity: AdvancedChatAppGenerateEntity | None = None
+
+        def _fake_generate(**kwargs):
+            nonlocal captured_entity
+            captured_entity = kwargs["application_generate_entity"]
+            return SimpleNamespace(ok=True)
+
+        monkeypatch.setattr(generator, "_generate", _fake_generate)
+
+        result = generator.resume(
+            app_model=SimpleNamespace(id="app-id"),
+            workflow=SimpleNamespace(),
+            user=SimpleNamespace(id="end-user-id", session_id="session-id"),
+            conversation=SimpleNamespace(id="conversation-id"),
+            message=SimpleNamespace(id="message-id"),
+            application_generate_entity=application_generate_entity,
+            workflow_execution_repository=SimpleNamespace(),
+            workflow_node_execution_repository=SimpleNamespace(),
+            graph_runtime_state=SimpleNamespace(),
+        )
+
+        assert result.ok is True
+        assert captured_entity is not None
+        trace_manager = captured_entity.trace_manager
+        assert isinstance(trace_manager, DummyTraceQueueManager)
+        assert trace_manager.app_id == "app-id"
+        assert trace_manager.user_id == "session-id"
+
+    def test_resume_preserves_existing_trace_manager(self, monkeypatch: pytest.MonkeyPatch):
+        generator = AdvancedChatAppGenerator()
+        existing_trace_manager = SimpleNamespace(app_id="existing-app", user_id="existing-user")
+        application_generate_entity = AdvancedChatAppGenerateEntity.model_construct(
+            task_id="task",
+            app_config=self._build_app_config(),
+            file_upload_config=None,
+            conversation_id="conversation-id",
+            inputs={},
+            query="hello",
+            files=[],
+            parent_message_id="parent-message-id",
+            user_id="user",
+            stream=False,
+            invoke_from=InvokeFrom.WEB_APP,
+            extras={},
+            trace_manager=existing_trace_manager,
+            workflow_run_id="run-id",
+        )
+        captured_entity: AdvancedChatAppGenerateEntity | None = None
+
+        def _fake_generate(**kwargs):
+            nonlocal captured_entity
+            captured_entity = kwargs["application_generate_entity"]
+            return SimpleNamespace(ok=True)
+
+        monkeypatch.setattr(generator, "_generate", _fake_generate)
+
+        result = generator.resume(
+            app_model=SimpleNamespace(id="app-id"),
+            workflow=SimpleNamespace(),
+            user=SimpleNamespace(id="end-user-id", session_id="session-id"),
+            conversation=SimpleNamespace(id="conversation-id"),
+            message=SimpleNamespace(id="message-id"),
+            application_generate_entity=application_generate_entity,
+            workflow_execution_repository=SimpleNamespace(),
+            workflow_node_execution_repository=SimpleNamespace(),
+            graph_runtime_state=SimpleNamespace(),
+        )
+
+        assert result.ok is True
+        assert captured_entity is not None
+        assert captured_entity.trace_manager is existing_trace_manager
diff --git a/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline_core.py b/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline_core.py
index 64bcfa9a18..9726c939e9 100644
--- a/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline_core.py
+++ b/api/tests/unit_tests/core/app/apps/advanced_chat/test_generate_task_pipeline_core.py
@@ -51,7 +51,7 @@ from core.base.tts.app_generator_tts_publisher import AudioTrunk
 from core.workflow.system_variables import build_system_variables
 from graphon.entities.pause_reason import PauseReasonType
 from graphon.enums import BuiltinNodeTypes
-from graphon.nodes.human_input.entities import UserAction
+from graphon.nodes.human_input.entities import UserActionConfig
 from graphon.runtime import GraphRuntimeState, VariablePool
 from libs.datetime_utils import naive_utc_now
 from models.enums import MessageStatus
@@ -132,7 +132,9 @@ class TestAdvancedChatGenerateTaskPipeline:
         pipeline._task_state.answer = "partial answer"
         pipeline._workflow_run_id = "run-id"
         pipeline._graph_runtime_state = GraphRuntimeState(
-            variable_pool=VariablePool(system_variables=build_system_variables(workflow_execution_id="run-id")),
+            variable_pool=build_test_variable_pool(
+                variables=build_system_variables(workflow_execution_id="run-id"),
+            ),
             start_at=0.0,
             total_tokens=7,
             node_run_steps=3,
@@ -148,7 +150,7 @@ class TestAdvancedChatGenerateTaskPipeline:
                     node_title="Approval",
                     form_content="Need approval",
                     inputs=[],
-                    actions=[UserAction(id="approve", title="Approve")],
+                    actions=[UserActionConfig(id="approve", title="Approve")],
                     display_in_ui=True,
                     form_token="token-1",
                     resolved_default_values={},
@@ -224,7 +226,7 @@ class TestAdvancedChatGenerateTaskPipeline:
 
         assert isinstance(responses[0], ValueError)
 
-    def test_handle_workflow_started_event_sets_run_id(self, monkeypatch):
+    def test_handle_workflow_started_event_sets_run_id(self, monkeypatch: pytest.MonkeyPatch):
         pipeline = _make_pipeline()
         pipeline._graph_runtime_state = GraphRuntimeState(
             variable_pool=build_test_variable_pool(variables=build_system_variables(workflow_execution_id="run-id")),
@@ -232,9 +234,19 @@ class TestAdvancedChatGenerateTaskPipeline:
         )
         pipeline._workflow_response_converter.workflow_start_to_stream_response = lambda **kwargs: "started"
 
+        # Track database operations for verification
+        executed_statements = []
+
         @contextmanager
         def _fake_session():
-            yield SimpleNamespace()
+            sess = SimpleNamespace()
+
+            def _execute(stmt):
+                executed_statements.append(stmt)
+                return SimpleNamespace()
+
+            sess.execute = _execute
+            yield sess
 
         monkeypatch.setattr(pipeline, "_database_session", _fake_session)
         monkeypatch.setattr(pipeline, "_get_message", lambda **kwargs: SimpleNamespace())
@@ -244,6 +256,14 @@ class TestAdvancedChatGenerateTaskPipeline:
         assert pipeline._workflow_run_id == "run-id"
         assert responses == ["started"]
 
+        # Verify database operation was executed
+        assert len(executed_statements) == 1
+        # Verify the UPDATE statement targets the correct message and sets workflow_run_id
+        update_stmt = executed_statements[0]
+        stmt_str = str(update_stmt)
+        assert "UPDATE messages" in stmt_str
+        assert "WHERE messages.id" in stmt_str
+
     def test_message_end_to_stream_response_strips_annotation_reply(self):
         pipeline = _make_pipeline()
         pipeline._task_state.metadata.annotation_reply = AnnotationReply(
@@ -368,11 +388,13 @@ class TestAdvancedChatGenerateTaskPipeline:
         assert list(pipeline._handle_loop_next_event(loop_next)) == ["loop_next"]
         assert list(pipeline._handle_loop_completed_event(loop_done)) == ["loop_done"]
 
-    def test_workflow_finish_handlers(self, monkeypatch):
+    def test_workflow_finish_handlers(self, monkeypatch: pytest.MonkeyPatch):
         pipeline = _make_pipeline()
         pipeline._workflow_run_id = "run-id"
         pipeline._graph_runtime_state = GraphRuntimeState(
-            variable_pool=VariablePool(system_variables=build_system_variables(workflow_execution_id="run-id")),
+            variable_pool=VariablePool.from_bootstrap(
+                system_variables=build_system_variables(workflow_execution_id="run-id")
+            ),
             start_at=0.0,
         )
         pipeline._workflow_response_converter.workflow_finish_to_stream_response = lambda **kwargs: "finish"
@@ -583,7 +605,9 @@ class TestAdvancedChatGenerateTaskPipeline:
                 self.items = items
 
         graph_runtime_state = GraphRuntimeState(
-            variable_pool=VariablePool(system_variables=build_system_variables(workflow_execution_id="run-id")),
+            variable_pool=VariablePool.from_bootstrap(
+                system_variables=build_system_variables(workflow_execution_id="run-id")
+            ),
             start_at=0.0,
         )
 
@@ -593,7 +617,7 @@ class TestAdvancedChatGenerateTaskPipeline:
         assert message.answer == "hello"
         assert message.message_metadata
 
-    def test_handle_stop_event_saves_message_for_moderation(self, monkeypatch):
+    def test_handle_stop_event_saves_message_for_moderation(self, monkeypatch: pytest.MonkeyPatch):
         pipeline = _make_pipeline()
         pipeline._message_end_to_stream_response = lambda: "end"
         saved: list[str] = []
@@ -614,10 +638,12 @@ class TestAdvancedChatGenerateTaskPipeline:
         assert responses == ["end"]
         assert saved == ["saved"]
 
-    def test_handle_message_end_event_applies_output_moderation(self, monkeypatch):
+    def test_handle_message_end_event_applies_output_moderation(self, monkeypatch: pytest.MonkeyPatch):
         pipeline = _make_pipeline()
         pipeline._graph_runtime_state = GraphRuntimeState(
-            variable_pool=VariablePool(system_variables=build_system_variables(workflow_execution_id="run-id")),
+            variable_pool=VariablePool.from_bootstrap(
+                system_variables=build_system_variables(workflow_execution_id="run-id")
+            ),
             start_at=0.0,
         )
         pipeline._base_task_pipeline.handle_output_moderation_when_task_finished = lambda answer: "safe"
diff --git a/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_config_manager.py b/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_config_manager.py
index a871e8d93b..d47b70e950 100644
--- a/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_config_manager.py
+++ b/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_config_manager.py
@@ -2,6 +2,7 @@ import uuid
 from types import SimpleNamespace
 
 import pytest
+from pytest_mock import MockerFixture
 
 from core.app.app_config.entities import EasyUIBasedAppModelConfigFrom
 from core.app.apps.agent_chat.app_config_manager import (
@@ -11,7 +12,7 @@ from core.entities.agent_entities import PlanningStrategy
 
 
 class TestAgentChatAppConfigManagerGetAppConfig:
-    def test_get_app_config_override_config(self, mocker):
+    def test_get_app_config_override_config(self, mocker: MockerFixture):
         app_model = mocker.MagicMock(id="app1", tenant_id="tenant", mode="agent-chat")
         app_model_config = mocker.MagicMock(id="cfg1")
         app_model_config.to_dict.return_value = {"ignored": True}
@@ -45,7 +46,7 @@ class TestAgentChatAppConfigManagerGetAppConfig:
         assert result.variables == "variables"
         assert result.external_data_variables == "external"
 
-    def test_get_app_config_conversation_specific(self, mocker):
+    def test_get_app_config_conversation_specific(self, mocker: MockerFixture):
         app_model = mocker.MagicMock(id="app1", tenant_id="tenant", mode="agent-chat")
         app_model_config = mocker.MagicMock(id="cfg1")
         app_model_config.to_dict.return_value = {"model": {"provider": "p"}}
@@ -76,7 +77,7 @@ class TestAgentChatAppConfigManagerGetAppConfig:
         assert result.app_model_config_dict == app_model_config.to_dict.return_value
         assert result.app_model_config_from.value == "conversation-specific-config"
 
-    def test_get_app_config_latest_config(self, mocker):
+    def test_get_app_config_latest_config(self, mocker: MockerFixture):
         app_model = mocker.MagicMock(id="app1", tenant_id="tenant", mode="agent-chat")
         app_model_config = mocker.MagicMock(id="cfg1")
         app_model_config.to_dict.return_value = {"model": {"provider": "p"}}
@@ -107,7 +108,7 @@ class TestAgentChatAppConfigManagerGetAppConfig:
 
 
 class TestAgentChatAppConfigManagerConfigValidate:
-    def test_config_validate_filters_related_keys(self, mocker):
+    def test_config_validate_filters_related_keys(self, mocker: MockerFixture):
         config = {
             "model": {},
             "user_input_form": {},
@@ -247,7 +248,7 @@ class TestValidateAgentModeAndSetDefaults:
                 {"agent_mode": {"enabled": True, "tools": [{"dataset": {"enabled": True, "id": "bad"}}]}},
             )
 
-    def test_old_tool_dataset_id_not_exists(self, mocker):
+    def test_old_tool_dataset_id_not_exists(self, mocker: MockerFixture):
         mocker.patch(
             "core.app.apps.agent_chat.app_config_manager.DatasetConfigManager.is_dataset_exists",
             return_value=False,
@@ -275,7 +276,7 @@ class TestValidateAgentModeAndSetDefaults:
                 "tenant", {"agent_mode": {"enabled": True, "tools": [tool]}}
             )
 
-    def test_valid_old_and_new_style_tools(self, mocker):
+    def test_valid_old_and_new_style_tools(self, mocker: MockerFixture):
         mocker.patch(
             "core.app.apps.agent_chat.app_config_manager.DatasetConfigManager.is_dataset_exists",
             return_value=True,
diff --git a/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_generator.py b/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_generator.py
index 80f7f94b1a..6cd62c933a 100644
--- a/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_generator.py
+++ b/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_generator.py
@@ -2,6 +2,7 @@ import contextlib
 
 import pytest
 from pydantic import ValidationError
+from pytest_mock import MockerFixture
 
 from core.app.apps.agent_chat.app_generator import AgentChatAppGenerator
 from core.app.apps.exc import GenerateTaskStoppedError
@@ -16,7 +17,7 @@ class DummyAccount:
 
 
 @pytest.fixture
-def generator(mocker):
+def generator(mocker: MockerFixture):
     gen = AgentChatAppGenerator()
     mocker.patch(
         "core.app.apps.agent_chat.app_generator.current_app",
@@ -27,19 +28,19 @@ def generator(mocker):
 
 
 class TestAgentChatAppGeneratorGenerate:
-    def test_generate_rejects_blocking_mode(self, generator, mocker):
+    def test_generate_rejects_blocking_mode(self, generator, mocker: MockerFixture):
         app_model = mocker.MagicMock()
         user = DummyAccount("user")
         with pytest.raises(ValueError):
             generator.generate(app_model=app_model, user=user, args={}, invoke_from=mocker.MagicMock(), streaming=False)
 
-    def test_generate_requires_query(self, generator, mocker):
+    def test_generate_requires_query(self, generator, mocker: MockerFixture):
         app_model = mocker.MagicMock()
         user = DummyAccount("user")
         with pytest.raises(ValueError):
             generator.generate(app_model=app_model, user=user, args={"inputs": {}}, invoke_from=mocker.MagicMock())
 
-    def test_generate_rejects_non_string_query(self, generator, mocker):
+    def test_generate_rejects_non_string_query(self, generator, mocker: MockerFixture):
         app_model = mocker.MagicMock()
         user = DummyAccount("user")
         with pytest.raises(ValueError):
@@ -50,7 +51,7 @@ class TestAgentChatAppGeneratorGenerate:
                 invoke_from=mocker.MagicMock(),
             )
 
-    def test_generate_override_requires_debugger(self, generator, mocker):
+    def test_generate_override_requires_debugger(self, generator, mocker: MockerFixture):
         app_model = mocker.MagicMock()
         user = DummyAccount("user")
 
@@ -62,7 +63,7 @@ class TestAgentChatAppGeneratorGenerate:
                 invoke_from=InvokeFrom.WEB_APP,
             )
 
-    def test_generate_success_with_debugger_override(self, generator, mocker):
+    def test_generate_success_with_debugger_override(self, generator, mocker: MockerFixture):
         app_model = mocker.MagicMock(id="app1", tenant_id="tenant", mode="agent-chat")
         app_model_config = mocker.MagicMock(id="cfg1")
         app_model_config.to_dict.return_value = {"model": {"provider": "p"}}
@@ -142,7 +143,7 @@ class TestAgentChatAppGeneratorGenerate:
         assert result == {"result": "ok"}
         thread_obj.start.assert_called_once()
 
-    def test_generate_without_file_config(self, generator, mocker):
+    def test_generate_without_file_config(self, generator, mocker: MockerFixture):
         app_model = mocker.MagicMock(id="app1", tenant_id="tenant", mode="agent-chat")
         app_model_config = mocker.MagicMock(id="cfg1")
         app_model_config.to_dict.return_value = {"model": {"provider": "p"}}
@@ -213,14 +214,14 @@ class TestAgentChatAppGeneratorGenerate:
 
 class TestAgentChatAppGeneratorWorker:
     @pytest.fixture(autouse=True)
-    def patch_context(self, mocker):
+    def patch_context(self, mocker: MockerFixture):
         @contextlib.contextmanager
         def ctx_manager(*args, **kwargs):
             yield
 
         mocker.patch("core.app.apps.agent_chat.app_generator.preserve_flask_contexts", ctx_manager)
 
-    def test_generate_worker_handles_generate_task_stopped(self, generator, mocker):
+    def test_generate_worker_handles_generate_task_stopped(self, generator, mocker: MockerFixture):
         queue_manager = mocker.MagicMock()
         generator._get_conversation = mocker.MagicMock(return_value=mocker.MagicMock())
         generator._get_message = mocker.MagicMock(return_value=mocker.MagicMock())
@@ -250,7 +251,7 @@ class TestAgentChatAppGeneratorWorker:
             Exception("bad"),
         ],
     )
-    def test_generate_worker_publishes_errors(self, generator, mocker, error):
+    def test_generate_worker_publishes_errors(self, generator, mocker: MockerFixture, error):
         queue_manager = mocker.MagicMock()
         generator._get_conversation = mocker.MagicMock(return_value=mocker.MagicMock())
         generator._get_message = mocker.MagicMock(return_value=mocker.MagicMock())
@@ -271,7 +272,7 @@ class TestAgentChatAppGeneratorWorker:
 
         assert queue_manager.publish_error.called
 
-    def test_generate_worker_logs_value_error_when_debug(self, generator, mocker):
+    def test_generate_worker_logs_value_error_when_debug(self, generator, mocker: MockerFixture):
         queue_manager = mocker.MagicMock()
         generator._get_conversation = mocker.MagicMock(return_value=mocker.MagicMock())
         generator._get_message = mocker.MagicMock(return_value=mocker.MagicMock())
diff --git a/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_runner.py b/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_runner.py
index 4567b35480..0260235b03 100644
--- a/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_runner.py
+++ b/api/tests/unit_tests/core/app/apps/agent_chat/test_agent_chat_app_runner.py
@@ -1,4 +1,5 @@
 import pytest
+from pytest_mock import MockerFixture
 
 from core.agent.entities import AgentEntity
 from core.app.apps.agent_chat.app_runner import AgentChatAppRunner
@@ -13,7 +14,7 @@ def runner():
 
 
 class TestAgentChatAppRunnerRun:
-    def test_run_app_not_found(self, runner, mocker):
+    def test_run_app_not_found(self, runner, mocker: MockerFixture):
         app_config = mocker.MagicMock(app_id="app1", tenant_id="tenant", agent=mocker.MagicMock())
         generate_entity = mocker.MagicMock(app_config=app_config, inputs={}, query="q", files=[], stream=True)
 
@@ -22,7 +23,7 @@ class TestAgentChatAppRunnerRun:
         with pytest.raises(ValueError):
             runner.run(generate_entity, mocker.MagicMock(), mocker.MagicMock(), mocker.MagicMock())
 
-    def test_run_moderation_error_direct_output(self, runner, mocker):
+    def test_run_moderation_error_direct_output(self, runner, mocker: MockerFixture):
         app_record = mocker.MagicMock(id="app1", tenant_id="tenant")
         app_config = mocker.MagicMock(app_id="app1", tenant_id="tenant", prompt_template=mocker.MagicMock())
         app_config.agent = mocker.MagicMock()
@@ -45,7 +46,7 @@ class TestAgentChatAppRunnerRun:
 
         runner.direct_output.assert_called_once()
 
-    def test_run_annotation_reply_short_circuits(self, runner, mocker):
+    def test_run_annotation_reply_short_circuits(self, runner, mocker: MockerFixture):
         app_record = mocker.MagicMock(id="app1", tenant_id="tenant")
         app_config = mocker.MagicMock(app_id="app1", tenant_id="tenant", prompt_template=mocker.MagicMock())
         app_config.agent = mocker.MagicMock()
@@ -74,7 +75,7 @@ class TestAgentChatAppRunnerRun:
         queue_manager.publish.assert_called_once()
         runner.direct_output.assert_called_once()
 
-    def test_run_hosting_moderation_short_circuits(self, runner, mocker):
+    def test_run_hosting_moderation_short_circuits(self, runner, mocker: MockerFixture):
         app_record = mocker.MagicMock(id="app1", tenant_id="tenant")
         app_config = mocker.MagicMock(app_id="app1", tenant_id="tenant", prompt_template=mocker.MagicMock())
         app_config.agent = mocker.MagicMock()
@@ -98,7 +99,7 @@ class TestAgentChatAppRunnerRun:
 
         runner.run(generate_entity, mocker.MagicMock(), mocker.MagicMock(), mocker.MagicMock())
 
-    def test_run_model_schema_missing(self, runner, mocker):
+    def test_run_model_schema_missing(self, runner, mocker: MockerFixture):
         app_record = mocker.MagicMock(id="app1", tenant_id="tenant")
         app_config = mocker.MagicMock(app_id="app1", tenant_id="tenant", prompt_template=mocker.MagicMock())
         app_config.agent = AgentEntity(provider="p", model="m", strategy=AgentEntity.Strategy.CHAIN_OF_THOUGHT)
@@ -140,7 +141,7 @@ class TestAgentChatAppRunnerRun:
             (LLMMode.COMPLETION, "CotCompletionAgentRunner"),
         ],
     )
-    def test_run_chain_of_thought_modes(self, runner, mocker, mode, expected_runner):
+    def test_run_chain_of_thought_modes(self, runner, mocker: MockerFixture, mode, expected_runner):
         app_record = mocker.MagicMock(id="app1", tenant_id="tenant")
         app_config = mocker.MagicMock(app_id="app1", tenant_id="tenant", prompt_template=mocker.MagicMock())
         app_config.agent = AgentEntity(provider="p", model="m", strategy=AgentEntity.Strategy.CHAIN_OF_THOUGHT)
@@ -196,7 +197,7 @@ class TestAgentChatAppRunnerRun:
         runner_instance.run.assert_called_once()
         runner._handle_invoke_result.assert_called_once()
 
-    def test_run_invalid_llm_mode_raises(self, runner, mocker):
+    def test_run_invalid_llm_mode_raises(self, runner, mocker: MockerFixture):
         app_record = mocker.MagicMock(id="app1", tenant_id="tenant")
         app_config = mocker.MagicMock(app_id="app1", tenant_id="tenant", prompt_template=mocker.MagicMock())
         app_config.agent = AgentEntity(provider="p", model="m", strategy=AgentEntity.Strategy.CHAIN_OF_THOUGHT)
@@ -242,7 +243,7 @@ class TestAgentChatAppRunnerRun:
         with pytest.raises(ValueError):
             runner.run(generate_entity, mocker.MagicMock(), conversation, message)
 
-    def test_run_function_calling_strategy_selected_by_features(self, runner, mocker):
+    def test_run_function_calling_strategy_selected_by_features(self, runner, mocker: MockerFixture):
         app_record = mocker.MagicMock(id="app1", tenant_id="tenant")
         app_config = mocker.MagicMock(app_id="app1", tenant_id="tenant", prompt_template=mocker.MagicMock())
         app_config.agent = AgentEntity(provider="p", model="m", strategy=AgentEntity.Strategy.CHAIN_OF_THOUGHT)
@@ -298,7 +299,7 @@ class TestAgentChatAppRunnerRun:
         assert app_config.agent.strategy == AgentEntity.Strategy.FUNCTION_CALLING
         runner_instance.run.assert_called_once()
 
-    def test_run_conversation_not_found(self, runner, mocker):
+    def test_run_conversation_not_found(self, runner, mocker: MockerFixture):
         app_record = mocker.MagicMock(id="app1", tenant_id="tenant")
         app_config = mocker.MagicMock(app_id="app1", tenant_id="tenant", prompt_template=mocker.MagicMock())
         app_config.agent = AgentEntity(provider="p", model="m", strategy=AgentEntity.Strategy.FUNCTION_CALLING)
@@ -332,7 +333,7 @@ class TestAgentChatAppRunnerRun:
         with pytest.raises(ValueError):
             runner.run(generate_entity, mocker.MagicMock(), mocker.MagicMock(id="conv"), mocker.MagicMock(id="msg"))
 
-    def test_run_message_not_found(self, runner, mocker):
+    def test_run_message_not_found(self, runner, mocker: MockerFixture):
         app_record = mocker.MagicMock(id="app1", tenant_id="tenant")
         app_config = mocker.MagicMock(app_id="app1", tenant_id="tenant", prompt_template=mocker.MagicMock())
         app_config.agent = AgentEntity(provider="p", model="m", strategy=AgentEntity.Strategy.FUNCTION_CALLING)
@@ -366,7 +367,7 @@ class TestAgentChatAppRunnerRun:
         with pytest.raises(ValueError):
             runner.run(generate_entity, mocker.MagicMock(), mocker.MagicMock(id="conv"), mocker.MagicMock(id="msg"))
 
-    def test_run_invalid_agent_strategy_raises(self, runner, mocker):
+    def test_run_invalid_agent_strategy_raises(self, runner, mocker: MockerFixture):
         app_record = mocker.MagicMock(id="app1", tenant_id="tenant")
         app_config = mocker.MagicMock(app_id="app1", tenant_id="tenant", prompt_template=mocker.MagicMock())
         app_config.agent = mocker.MagicMock(strategy="invalid", provider="p", model="m")
diff --git a/api/tests/unit_tests/core/app/apps/completion/test_app_runner.py b/api/tests/unit_tests/core/app/apps/completion/test_app_runner.py
index aa2085177e..8dcf6e9193 100644
--- a/api/tests/unit_tests/core/app/apps/completion/test_app_runner.py
+++ b/api/tests/unit_tests/core/app/apps/completion/test_app_runner.py
@@ -2,6 +2,7 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock
 
 import pytest
+from pytest_mock import MockerFixture
 
 import core.app.apps.completion.app_runner as module
 from core.app.apps.completion.app_runner import CompletionAppRunner
@@ -47,7 +48,7 @@ def _build_generate_entity(app_config, file_upload_config=None):
 
 
 class TestCompletionAppRunner:
-    def test_run_app_not_found(self, runner, mocker):
+    def test_run_app_not_found(self, runner, mocker: MockerFixture):
         session = mocker.MagicMock()
         session.scalar.return_value = None
         mocker.patch.object(module.db, "session", session)
@@ -58,7 +59,7 @@ class TestCompletionAppRunner:
         with pytest.raises(ValueError):
             runner.run(app_generate_entity, MagicMock(), MagicMock())
 
-    def test_run_moderation_error_outputs_direct(self, runner, mocker):
+    def test_run_moderation_error_outputs_direct(self, runner, mocker: MockerFixture):
         app_record = MagicMock(id="app1", tenant_id="tenant")
 
         session = mocker.MagicMock()
@@ -78,7 +79,7 @@ class TestCompletionAppRunner:
         runner.direct_output.assert_called_once()
         runner._handle_invoke_result.assert_not_called()
 
-    def test_run_hosting_moderation_stops(self, runner, mocker):
+    def test_run_hosting_moderation_stops(self, runner, mocker: MockerFixture):
         app_record = MagicMock(id="app1", tenant_id="tenant")
 
         session = mocker.MagicMock()
@@ -97,7 +98,7 @@ class TestCompletionAppRunner:
 
         runner._handle_invoke_result.assert_not_called()
 
-    def test_run_dataset_and_external_tools_flow(self, runner, mocker):
+    def test_run_dataset_and_external_tools_flow(self, runner, mocker: MockerFixture):
         app_record = MagicMock(id="app1", tenant_id="tenant")
 
         session = mocker.MagicMock()
@@ -140,7 +141,7 @@ class TestCompletionAppRunner:
         assert dataset_retrieval.retrieve.call_args.kwargs["query"] == "query_from_input"
         runner._handle_invoke_result.assert_called_once()
 
-    def test_run_uses_low_image_detail_default(self, runner, mocker):
+    def test_run_uses_low_image_detail_default(self, runner, mocker: MockerFixture):
         app_record = MagicMock(id="app1", tenant_id="tenant")
 
         session = mocker.MagicMock()
diff --git a/api/tests/unit_tests/core/app/apps/completion/test_completion_app_config_manager.py b/api/tests/unit_tests/core/app/apps/completion/test_completion_app_config_manager.py
index 024bd8f302..353162be8c 100644
--- a/api/tests/unit_tests/core/app/apps/completion/test_completion_app_config_manager.py
+++ b/api/tests/unit_tests/core/app/apps/completion/test_completion_app_config_manager.py
@@ -1,6 +1,8 @@
 from types import SimpleNamespace
 from unittest.mock import MagicMock
 
+from pytest_mock import MockerFixture
+
 import core.app.apps.completion.app_config_manager as module
 from core.app.app_config.entities import EasyUIBasedAppModelConfigFrom
 from core.app.apps.completion.app_config_manager import CompletionAppConfigManager
@@ -8,7 +10,7 @@ from models.model import AppMode
 
 
 class TestCompletionAppConfigManager:
-    def test_get_app_config_with_override(self, mocker):
+    def test_get_app_config_with_override(self, mocker: MockerFixture):
         app_model = MagicMock(tenant_id="tenant", id="app1", mode=AppMode.COMPLETION.value)
         app_model_config = MagicMock(id="cfg1")
         app_model_config.to_dict.return_value = {"model": {"provider": "x"}}
@@ -35,8 +37,8 @@ class TestCompletionAppConfigManager:
         assert result.external_data_variables == ["ext1"]
         assert result.app_mode == AppMode.COMPLETION
 
-    def test_get_app_config_without_override_uses_model_config(self, mocker):
-        app_model = MagicMock(tenant_id="tenant", id="app1", mode=AppMode.COMPLETION.value)
+    def test_get_app_config_without_override_uses_model_config(self, mocker: MockerFixture):
+        app_model = MagicMock(tenant_id="tenant", id="app1", mode=AppMode.COMPLETION)
         app_model_config = MagicMock(id="cfg1")
         app_model_config.to_dict.return_value = {"model": {"provider": "x"}}
 
@@ -53,7 +55,7 @@ class TestCompletionAppConfigManager:
         assert result.app_model_config_from == EasyUIBasedAppModelConfigFrom.APP_LATEST_CONFIG
         assert result.app_model_config_dict == {"model": {"provider": "x"}}
 
-    def test_config_validate_filters_related_keys(self, mocker):
+    def test_config_validate_filters_related_keys(self, mocker: MockerFixture):
         config = {
             "model": {"provider": "x"},
             "variables": ["v"],
diff --git a/api/tests/unit_tests/core/app/apps/completion/test_completion_completion_app_generator.py b/api/tests/unit_tests/core/app/apps/completion/test_completion_completion_app_generator.py
index f2e35f9900..de20dde677 100644
--- a/api/tests/unit_tests/core/app/apps/completion/test_completion_completion_app_generator.py
+++ b/api/tests/unit_tests/core/app/apps/completion/test_completion_completion_app_generator.py
@@ -4,6 +4,7 @@ from unittest.mock import MagicMock
 
 import pytest
 from pydantic import ValidationError
+from pytest_mock import MockerFixture
 
 import core.app.apps.completion.app_generator as module
 from core.app.apps.completion.app_generator import CompletionAppGenerator
@@ -15,7 +16,7 @@ from services.errors.message import MessageNotExistsError
 
 
 @pytest.fixture
-def generator(mocker):
+def generator(mocker: MockerFixture):
     gen = CompletionAppGenerator()
 
     mocker.patch.object(module, "copy_current_request_context", side_effect=lambda fn: fn)
@@ -69,7 +70,7 @@ class TestCompletionAppGenerator:
                 streaming=False,
             )
 
-    def test_generate_success_no_file_config(self, generator, mocker):
+    def test_generate_success_no_file_config(self, generator, mocker: MockerFixture):
         app_model_config = _build_app_model_config()
         mocker.patch.object(generator, "_get_app_model_config", return_value=app_model_config)
         mocker.patch.object(module.FileUploadConfigManager, "convert", return_value=None)
@@ -99,7 +100,7 @@ class TestCompletionAppGenerator:
         assert result == "converted"
         module.file_factory.build_from_mappings.assert_not_called()
 
-    def test_generate_success_with_files(self, generator, mocker):
+    def test_generate_success_with_files(self, generator, mocker: MockerFixture):
         app_model_config = _build_app_model_config()
         mocker.patch.object(generator, "_get_app_model_config", return_value=app_model_config)
 
@@ -131,7 +132,7 @@ class TestCompletionAppGenerator:
         assert result == "converted"
         module.file_factory.build_from_mappings.assert_called_once()
 
-    def test_generate_override_model_config_debugger(self, generator, mocker):
+    def test_generate_override_model_config_debugger(self, generator, mocker: MockerFixture):
         app_model_config = _build_app_model_config()
         mocker.patch.object(generator, "_get_app_model_config", return_value=app_model_config)
 
@@ -165,7 +166,7 @@ class TestCompletionAppGenerator:
 
         assert get_app_config.call_args.kwargs["override_config_dict"] == override_config
 
-    def test_generate_more_like_this_message_not_found(self, generator, mocker):
+    def test_generate_more_like_this_message_not_found(self, generator, mocker: MockerFixture):
         session = mocker.MagicMock()
         session.scalar.return_value = None
         mocker.patch.object(module.db, "session", session)
@@ -178,7 +179,7 @@ class TestCompletionAppGenerator:
                 invoke_from=InvokeFrom.WEB_APP,
             )
 
-    def test_generate_more_like_this_disabled(self, generator, mocker):
+    def test_generate_more_like_this_disabled(self, generator, mocker: MockerFixture):
         app_model = _build_app_model()
         app_model.app_model_config = MagicMock(more_like_this=False, more_like_this_dict={"enabled": False})
 
@@ -195,7 +196,7 @@ class TestCompletionAppGenerator:
                 invoke_from=InvokeFrom.WEB_APP,
             )
 
-    def test_generate_more_like_this_app_model_config_missing(self, generator, mocker):
+    def test_generate_more_like_this_app_model_config_missing(self, generator, mocker: MockerFixture):
         app_model = _build_app_model()
         app_model.app_model_config = None
 
@@ -212,7 +213,7 @@ class TestCompletionAppGenerator:
                 invoke_from=InvokeFrom.WEB_APP,
             )
 
-    def test_generate_more_like_this_message_config_none(self, generator, mocker):
+    def test_generate_more_like_this_message_config_none(self, generator, mocker: MockerFixture):
         app_model = _build_app_model()
         app_model.app_model_config = MagicMock(more_like_this=True, more_like_this_dict={"enabled": True})
 
@@ -229,7 +230,7 @@ class TestCompletionAppGenerator:
                 invoke_from=InvokeFrom.WEB_APP,
             )
 
-    def test_generate_more_like_this_success(self, generator, mocker):
+    def test_generate_more_like_this_success(self, generator, mocker: MockerFixture):
         app_model = _build_app_model()
         app_model.app_model_config = MagicMock(more_like_this=True, more_like_this_dict={"enabled": True})
 
@@ -297,7 +298,7 @@ class TestCompletionAppGenerator:
             (RuntimeError("boom"), True),
         ],
     )
-    def test_generate_worker_error_handling(self, generator, mocker, error, should_publish):
+    def test_generate_worker_error_handling(self, generator, mocker: MockerFixture, error, should_publish):
         flask_app = MagicMock()
         flask_app.app_context.return_value = contextlib.nullcontext()
 
diff --git a/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_config_manager.py b/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_config_manager.py
index 5d4c9bcde0..6c1ee20ffb 100644
--- a/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_config_manager.py
+++ b/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_config_manager.py
@@ -1,12 +1,14 @@
 from types import SimpleNamespace
 from unittest.mock import MagicMock
 
+from pytest_mock import MockerFixture
+
 import core.app.apps.pipeline.pipeline_config_manager as module
 from core.app.apps.pipeline.pipeline_config_manager import PipelineConfigManager
 from models.model import AppMode
 
 
-def test_get_pipeline_config(mocker):
+def test_get_pipeline_config(mocker: MockerFixture):
     pipeline = MagicMock(tenant_id="tenant", id="pipe1")
     workflow = MagicMock(id="wf1")
 
@@ -26,7 +28,7 @@ def test_get_pipeline_config(mocker):
     assert result.rag_pipeline_variables == ["var1"]
 
 
-def test_config_validate_filters_related_keys(mocker):
+def test_config_validate_filters_related_keys(mocker: MockerFixture):
     config = {
         "file_upload": {"enabled": True},
         "tts": {"enabled": True},
diff --git a/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_generator.py b/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_generator.py
index c36edf48fc..dd91243a37 100644
--- a/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_generator.py
+++ b/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_generator.py
@@ -3,6 +3,7 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock, PropertyMock
 
 import pytest
+from pytest_mock import MockerFixture
 
 import core.app.apps.pipeline.pipeline_generator as module
 from core.app.apps.exc import GenerateTaskStoppedError
@@ -23,7 +24,7 @@ class FakeRagPipelineGenerateEntity(SimpleNamespace):
 
 
 @pytest.fixture
-def generator(mocker):
+def generator(mocker: MockerFixture):
     gen = module.PipelineGenerator()
 
     mocker.patch.object(module, "RagPipelineGenerateEntity", FakeRagPipelineGenerateEntity)
@@ -88,7 +89,7 @@ class DummySession:
         return False
 
 
-def test_generate_dataset_missing(generator, mocker):
+def test_generate_dataset_missing(generator, mocker: MockerFixture):
     pipeline = _build_pipeline()
     pipeline.retrieve_dataset.return_value = None
 
@@ -106,7 +107,7 @@ def test_generate_dataset_missing(generator, mocker):
         )
 
 
-def test_generate_debugger_calls_generate(generator, mocker):
+def test_generate_debugger_calls_generate(generator, mocker: MockerFixture):
     pipeline = _build_pipeline()
     workflow = _build_workflow()
 
@@ -150,7 +151,7 @@ def test_generate_debugger_calls_generate(generator, mocker):
     assert result == {"result": "ok"}
 
 
-def test_generate_published_pipeline_creates_documents_and_delay(generator, mocker):
+def test_generate_published_pipeline_creates_documents_and_delay(generator, mocker: MockerFixture):
     pipeline = _build_pipeline()
     workflow = _build_workflow()
 
@@ -228,7 +229,7 @@ def test_generate_published_pipeline_creates_documents_and_delay(generator, mock
     task_proxy.delay.assert_called_once()
 
 
-def test_generate_is_retry_calls_generate(generator, mocker):
+def test_generate_is_retry_calls_generate(generator, mocker: MockerFixture):
     pipeline = _build_pipeline()
     workflow = _build_workflow()
 
@@ -273,7 +274,7 @@ def test_generate_is_retry_calls_generate(generator, mocker):
     assert result == {"result": "ok"}
 
 
-def test_generate_worker_handles_errors(generator, mocker):
+def test_generate_worker_handles_errors(generator, mocker: MockerFixture):
     flask_app = MagicMock()
     flask_app.app_context.return_value = contextlib.nullcontext()
     mocker.patch.object(module, "preserve_flask_contexts", _dummy_preserve)
@@ -308,7 +309,7 @@ def test_generate_worker_handles_errors(generator, mocker):
     queue_manager.publish_error.assert_called_once()
 
 
-def test_generate_worker_sets_system_user_id_for_external_call(generator, mocker):
+def test_generate_worker_sets_system_user_id_for_external_call(generator, mocker: MockerFixture):
     flask_app = MagicMock()
     flask_app.app_context.return_value = contextlib.nullcontext()
     mocker.patch.object(module, "preserve_flask_contexts", _dummy_preserve)
@@ -341,7 +342,7 @@ def test_generate_worker_sets_system_user_id_for_external_call(generator, mocker
     assert module.PipelineRunner.call_args.kwargs["system_user_id"] == "session"
 
 
-def test_generate_raises_when_workflow_not_found(generator, mocker):
+def test_generate_raises_when_workflow_not_found(generator, mocker: MockerFixture):
     flask_app = MagicMock()
     mocker.patch.object(module, "preserve_flask_contexts", _dummy_preserve)
 
@@ -369,7 +370,7 @@ def test_generate_raises_when_workflow_not_found(generator, mocker):
         )
 
 
-def test_generate_success_returns_converted(generator, mocker):
+def test_generate_success_returns_converted(generator, mocker: MockerFixture):
     flask_app = MagicMock()
     mocker.patch.object(module, "preserve_flask_contexts", _dummy_preserve)
 
@@ -409,7 +410,7 @@ def test_generate_success_returns_converted(generator, mocker):
     assert result == "converted"
 
 
-def test_single_iteration_generate_validates_inputs(generator, mocker):
+def test_single_iteration_generate_validates_inputs(generator, mocker: MockerFixture):
     with pytest.raises(ValueError):
         generator.single_iteration_generate(_build_pipeline(), _build_workflow(), "", _build_user(), {})
 
@@ -419,7 +420,7 @@ def test_single_iteration_generate_validates_inputs(generator, mocker):
         )
 
 
-def test_single_iteration_generate_dataset_required(generator, mocker):
+def test_single_iteration_generate_dataset_required(generator, mocker: MockerFixture):
     pipeline = _build_pipeline()
     pipeline.retrieve_dataset.return_value = None
 
@@ -436,7 +437,7 @@ def test_single_iteration_generate_dataset_required(generator, mocker):
         )
 
 
-def test_single_iteration_generate_success(generator, mocker):
+def test_single_iteration_generate_success(generator, mocker: MockerFixture):
     pipeline = _build_pipeline()
 
     session = DummySession()
@@ -476,7 +477,7 @@ def test_single_iteration_generate_success(generator, mocker):
     assert result == {"ok": True}
 
 
-def test_single_loop_generate_success(generator, mocker):
+def test_single_loop_generate_success(generator, mocker: MockerFixture):
     pipeline = _build_pipeline()
 
     session = DummySession()
@@ -516,7 +517,7 @@ def test_single_loop_generate_success(generator, mocker):
     assert result == {"ok": True}
 
 
-def test_handle_response_value_error_triggers_generate_task_stopped(generator, mocker):
+def test_handle_response_value_error_triggers_generate_task_stopped(generator, mocker: MockerFixture):
     pipeline = _build_pipeline()
     workflow = _build_workflow()
     app_entity = FakeRagPipelineGenerateEntity(task_id="t")
@@ -536,7 +537,7 @@ def test_handle_response_value_error_triggers_generate_task_stopped(generator, m
         )
 
 
-def test_build_document_sets_metadata_for_builtin_fields(generator, mocker):
+def test_build_document_sets_metadata_for_builtin_fields(generator, mocker: MockerFixture):
     class DummyDocument(SimpleNamespace):
         pass
 
@@ -620,7 +621,7 @@ def test_format_datasource_info_list_missing_node_data(generator):
         )
 
 
-def test_format_datasource_info_list_online_drive_folder(generator, mocker):
+def test_format_datasource_info_list_online_drive_folder(generator, mocker: MockerFixture):
     workflow = MagicMock(
         graph_dict={
             "nodes": [
diff --git a/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_queue_manager.py b/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_queue_manager.py
index 9db83f5531..abfc76afa0 100644
--- a/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_queue_manager.py
+++ b/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_queue_manager.py
@@ -1,4 +1,5 @@
 import pytest
+from pytest_mock import MockerFixture
 
 import core.app.apps.pipeline.pipeline_queue_manager as module
 from core.app.apps.base_app_queue_manager import PublishFrom
@@ -16,7 +17,7 @@ from core.app.entities.queue_entities import (
 from graphon.model_runtime.entities.llm_entities import LLMResult
 
 
-def test_publish_sets_stop_listen_and_raises_on_stopped(mocker):
+def test_publish_sets_stop_listen_and_raises_on_stopped(mocker: MockerFixture):
     manager = PipelineQueueManager(task_id="t", user_id="u", invoke_from=InvokeFrom.WEB_APP, app_mode="rag")
     manager._q = mocker.MagicMock()
     manager.stop_listen = mocker.MagicMock()
@@ -28,7 +29,7 @@ def test_publish_sets_stop_listen_and_raises_on_stopped(mocker):
     manager.stop_listen.assert_called_once()
 
 
-def test_publish_stop_events_trigger_stop_listen(mocker):
+def test_publish_stop_events_trigger_stop_listen(mocker: MockerFixture):
     manager = PipelineQueueManager(task_id="t", user_id="u", invoke_from=InvokeFrom.WEB_APP, app_mode="rag")
     manager._q = mocker.MagicMock()
     manager.stop_listen = mocker.MagicMock()
@@ -46,7 +47,7 @@ def test_publish_stop_events_trigger_stop_listen(mocker):
         manager.stop_listen.assert_called_once()
 
 
-def test_publish_non_stop_event_no_stop_listen(mocker):
+def test_publish_non_stop_event_no_stop_listen(mocker: MockerFixture):
     manager = PipelineQueueManager(task_id="t", user_id="u", invoke_from=InvokeFrom.WEB_APP, app_mode="rag")
     manager._q = mocker.MagicMock()
     manager.stop_listen = mocker.MagicMock()
diff --git a/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_runner.py b/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_runner.py
index 603062a51c..1eed76cf84 100644
--- a/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_runner.py
+++ b/api/tests/unit_tests/core/app/apps/pipeline/test_pipeline_runner.py
@@ -22,6 +22,7 @@ from types import SimpleNamespace
 from unittest.mock import MagicMock
 
 import pytest
+from pytest_mock import MockerFixture
 
 import core.app.apps.pipeline.pipeline_runner as module
 from core.app.apps.pipeline.pipeline_runner import PipelineRunner
@@ -126,7 +127,7 @@ def test_update_document_status_on_failure(mocker, runner):
     session.commit.assert_called_once()
 
 
-def test_run_pipeline_not_found(mocker):
+def test_run_pipeline_not_found(mocker: MockerFixture):
     app_generate_entity = _build_app_generate_entity()
     app_generate_entity.invoke_from = InvokeFrom.WEB_APP
     app_generate_entity.single_iteration_run = None
@@ -150,7 +151,7 @@ def test_run_pipeline_not_found(mocker):
         runner.run()
 
 
-def test_run_workflow_not_initialized(mocker):
+def test_run_workflow_not_initialized(mocker: MockerFixture):
     app_generate_entity = _build_app_generate_entity()
 
     pipeline = MagicMock(id="pipe")
@@ -174,7 +175,7 @@ def test_run_workflow_not_initialized(mocker):
         runner.run()
 
 
-def test_run_single_iteration_path(mocker):
+def test_run_single_iteration_path(mocker: MockerFixture):
     app_generate_entity = _build_app_generate_entity()
     app_generate_entity.single_iteration_run = MagicMock()
 
@@ -223,7 +224,7 @@ def test_run_single_iteration_path(mocker):
     runner._handle_event.assert_called()
 
 
-def test_run_normal_path_builds_graph(mocker):
+def test_run_normal_path_builds_graph(mocker: MockerFixture):
     app_generate_entity = _build_app_generate_entity()
 
     pipeline = MagicMock(id="pipe")
diff --git a/api/tests/unit_tests/core/app/apps/test_advanced_chat_app_generator.py b/api/tests/unit_tests/core/app/apps/test_advanced_chat_app_generator.py
index f48a7fb38e..835c9a8576 100644
--- a/api/tests/unit_tests/core/app/apps/test_advanced_chat_app_generator.py
+++ b/api/tests/unit_tests/core/app/apps/test_advanced_chat_app_generator.py
@@ -45,7 +45,7 @@ def _make_generate_entity(app_config: WorkflowUIBasedAppConfig) -> AdvancedChatA
 
 
 @pytest.fixture(autouse=True)
-def _mock_db_session(monkeypatch):
+def _mock_db_session(monkeypatch: pytest.MonkeyPatch):
     session = MagicMock()
 
     def refresh_side_effect(obj):
@@ -108,7 +108,7 @@ def test_init_generate_records_marks_existing_conversation():
     assert entity.is_new_conversation is False
 
 
-def test_message_cycle_manager_uses_new_conversation_flag(monkeypatch):
+def test_message_cycle_manager_uses_new_conversation_flag(monkeypatch: pytest.MonkeyPatch):
     app_config = _make_app_config()
     entity = _make_generate_entity(app_config)
     entity.conversation_id = "existing-conversation-id"
diff --git a/api/tests/unit_tests/core/app/apps/test_base_app_generator.py b/api/tests/unit_tests/core/app/apps/test_base_app_generator.py
index b0f8b423e1..f2a1700664 100644
--- a/api/tests/unit_tests/core/app/apps/test_base_app_generator.py
+++ b/api/tests/unit_tests/core/app/apps/test_base_app_generator.py
@@ -369,7 +369,7 @@ def test_validate_inputs_optional_file_with_empty_string_ignores_default():
 
 
 class TestBaseAppGeneratorExtras:
-    def test_prepare_user_inputs_converts_files_and_lists(self, monkeypatch):
+    def test_prepare_user_inputs_converts_files_and_lists(self, monkeypatch: pytest.MonkeyPatch):
         base_app_generator = BaseAppGenerator()
 
         variables = [
diff --git a/api/tests/unit_tests/core/app/apps/test_base_app_runner.py b/api/tests/unit_tests/core/app/apps/test_base_app_runner.py
index 17de39ca99..c6eedf7be7 100644
--- a/api/tests/unit_tests/core/app/apps/test_base_app_runner.py
+++ b/api/tests/unit_tests/core/app/apps/test_base_app_runner.py
@@ -42,7 +42,7 @@ class _QueueRecorder:
 
 
 class TestAppRunner:
-    def test_recalc_llm_max_tokens_updates_parameters(self, monkeypatch):
+    def test_recalc_llm_max_tokens_updates_parameters(self, monkeypatch: pytest.MonkeyPatch):
         runner = AppRunner()
 
         model_schema = SimpleNamespace(
@@ -65,7 +65,7 @@ class TestAppRunner:
 
         assert model_config.parameters["max_tokens"] == 20
 
-    def test_recalc_llm_max_tokens_returns_minus_one_when_no_context(self, monkeypatch):
+    def test_recalc_llm_max_tokens_returns_minus_one_when_no_context(self, monkeypatch: pytest.MonkeyPatch):
         runner = AppRunner()
 
         model_schema = SimpleNamespace(
@@ -86,7 +86,7 @@ class TestAppRunner:
 
         assert runner.recalc_llm_max_tokens(model_config, prompt_messages=[]) == -1
 
-    def test_direct_output_streaming_publishes_chunks_and_end(self, monkeypatch):
+    def test_direct_output_streaming_publishes_chunks_and_end(self, monkeypatch: pytest.MonkeyPatch):
         runner = AppRunner()
         queue = _QueueRecorder()
         app_generate_entity = SimpleNamespace(model_conf=SimpleNamespace(model="mock"), stream=True)
@@ -133,7 +133,7 @@ class TestAppRunner:
                 stream=True,
             )
 
-    def test_organize_prompt_messages_simple_template(self, monkeypatch):
+    def test_organize_prompt_messages_simple_template(self, monkeypatch: pytest.MonkeyPatch):
         runner = AppRunner()
         model_config = SimpleNamespace(mode="chat", stop=["STOP"])
         prompt_template_entity = PromptTemplateEntity(
@@ -158,7 +158,7 @@ class TestAppRunner:
         assert prompt_messages == ["simple-message"]
         assert stop == ["simple-stop"]
 
-    def test_organize_prompt_messages_advanced_completion_template(self, monkeypatch):
+    def test_organize_prompt_messages_advanced_completion_template(self, monkeypatch: pytest.MonkeyPatch):
         runner = AppRunner()
         model_config = SimpleNamespace(mode="completion", stop=["<END>"])
         captured: dict[str, object] = {}
@@ -191,7 +191,7 @@ class TestAppRunner:
         assert memory_config.role_prefix.user == "U"
         assert memory_config.role_prefix.assistant == "A"
 
-    def test_organize_prompt_messages_advanced_chat_template(self, monkeypatch):
+    def test_organize_prompt_messages_advanced_chat_template(self, monkeypatch: pytest.MonkeyPatch):
         runner = AppRunner()
         model_config = SimpleNamespace(mode="chat", stop=["<END>"])
         captured: dict[str, object] = {}
@@ -245,7 +245,7 @@ class TestAppRunner:
                 files=[],
             )
 
-    def test_handle_invoke_result_stream_routes_chunks_and_builds_message(self, monkeypatch):
+    def test_handle_invoke_result_stream_routes_chunks_and_builds_message(self, monkeypatch: pytest.MonkeyPatch):
         runner = AppRunner()
         queue = _QueueRecorder()
         warning_logger = MagicMock()
@@ -284,7 +284,7 @@ class TestAppRunner:
         assert queue.events[-1].llm_result.message.content == "abc"
         warning_logger.assert_called_once()
 
-    def test_handle_invoke_result_stream_agent_mode_handles_multimodal_errors(self, monkeypatch):
+    def test_handle_invoke_result_stream_agent_mode_handles_multimodal_errors(self, monkeypatch: pytest.MonkeyPatch):
         runner = AppRunner()
         queue = _QueueRecorder()
         exception_logger = MagicMock()
@@ -331,7 +331,7 @@ class TestAppRunner:
         assert queue.events[-1].llm_result.usage == usage
         exception_logger.assert_called_once()
 
-    def test_handle_multimodal_image_content_fallback_return_branch(self, monkeypatch):
+    def test_handle_multimodal_image_content_fallback_return_branch(self, monkeypatch: pytest.MonkeyPatch):
         runner = AppRunner()
 
         class _ToggleBool:
@@ -367,7 +367,7 @@ class TestAppRunner:
         db_session.add.assert_not_called()
         queue_manager.publish.assert_not_called()
 
-    def test_check_hosting_moderation_direct_output_called(self, monkeypatch):
+    def test_check_hosting_moderation_direct_output_called(self, monkeypatch: pytest.MonkeyPatch):
         runner = AppRunner()
         queue = _QueueRecorder()
         app_generate_entity = SimpleNamespace(stream=False)
@@ -388,7 +388,7 @@ class TestAppRunner:
         assert result is True
         assert direct_output.called
 
-    def test_fill_in_inputs_from_external_data_tools(self, monkeypatch):
+    def test_fill_in_inputs_from_external_data_tools(self, monkeypatch: pytest.MonkeyPatch):
         runner = AppRunner()
         monkeypatch.setattr(
             "core.app.apps.base_app_runner.ExternalDataFetch.fetch",
@@ -405,7 +405,7 @@ class TestAppRunner:
 
         assert result == {"foo": "bar"}
 
-    def test_moderation_for_inputs_returns_result(self, monkeypatch):
+    def test_moderation_for_inputs_returns_result(self, monkeypatch: pytest.MonkeyPatch):
         runner = AppRunner()
         monkeypatch.setattr(
             "core.app.apps.base_app_runner.InputModeration.check",
@@ -424,7 +424,7 @@ class TestAppRunner:
 
         assert result == (True, {}, "")
 
-    def test_query_app_annotations_to_reply(self, monkeypatch):
+    def test_query_app_annotations_to_reply(self, monkeypatch: pytest.MonkeyPatch):
         runner = AppRunner()
         monkeypatch.setattr(
             "core.app.apps.base_app_runner.AnnotationReplyFeature.query",
diff --git a/api/tests/unit_tests/core/app/apps/test_message_based_app_generator.py b/api/tests/unit_tests/core/app/apps/test_message_based_app_generator.py
index 1250ac5ecf..6a9b5e7619 100644
--- a/api/tests/unit_tests/core/app/apps/test_message_based_app_generator.py
+++ b/api/tests/unit_tests/core/app/apps/test_message_based_app_generator.py
@@ -85,7 +85,7 @@ def _make_chat_generate_entity(app_config: EasyUIBasedAppConfig) -> ChatAppGener
 
 
 @pytest.fixture(autouse=True)
-def _mock_db_session(monkeypatch):
+def _mock_db_session(monkeypatch: pytest.MonkeyPatch):
     session = MagicMock()
 
     def refresh_side_effect(obj):
@@ -130,7 +130,7 @@ def test_init_generate_records_sets_conversation_fields_for_chat_entity():
 
 
 class TestMessageBasedAppGeneratorExtras:
-    def test_handle_response_closed_file_raises_stopped(self, monkeypatch):
+    def test_handle_response_closed_file_raises_stopped(self, monkeypatch: pytest.MonkeyPatch):
         generator = MessageBasedAppGenerator()
 
         class _Pipeline:
@@ -155,7 +155,7 @@ class TestMessageBasedAppGeneratorExtras:
                 stream=False,
             )
 
-    def test_get_app_model_config_requires_valid_config(self, monkeypatch):
+    def test_get_app_model_config_requires_valid_config(self, monkeypatch: pytest.MonkeyPatch):
         generator = MessageBasedAppGenerator()
         app_model = SimpleNamespace(id="app", app_model_config_id=None, app_model_config=None)
 
diff --git a/api/tests/unit_tests/core/app/apps/test_pause_resume.py b/api/tests/unit_tests/core/app/apps/test_pause_resume.py
index 6104b8d6ca..5f13c6aff6 100644
--- a/api/tests/unit_tests/core/app/apps/test_pause_resume.py
+++ b/api/tests/unit_tests/core/app/apps/test_pause_resume.py
@@ -3,6 +3,8 @@ import time
 from types import ModuleType, SimpleNamespace
 from typing import Any
 
+from pytest_mock import MockerFixture
+
 import graphon.nodes.human_input.entities  # noqa: F401
 from core.app.apps.advanced_chat import app_generator as adv_app_gen_module
 from core.app.apps.workflow import app_generator as wf_app_gen_module
@@ -58,7 +60,7 @@ class _StubToolNode(Node[_StubToolNodeData]):
     def __init__(
         self,
         node_id: str,
-        config: _StubToolNodeData,
+        data: _StubToolNodeData,
         *,
         graph_init_params,
         graph_runtime_state,
@@ -66,7 +68,7 @@ class _StubToolNode(Node[_StubToolNodeData]):
     ) -> None:
         super().__init__(
             node_id=node_id,
-            config=config,
+            data=data,
             graph_init_params=graph_init_params,
             graph_runtime_state=graph_runtime_state,
         )
@@ -101,7 +103,7 @@ class _StubToolNode(Node[_StubToolNodeData]):
         yield self._convert_node_run_result_to_graph_node_event(result)
 
 
-def _patch_tool_node(mocker):
+def _patch_tool_node(mocker: MockerFixture):
     original_resolve_node_class = node_factory_module.resolve_workflow_node_class
 
     def _patched_resolve_node_class(*, node_type: NodeType, node_version: str) -> type[Node]:
@@ -167,7 +169,7 @@ def _build_graph(runtime_state: GraphRuntimeState, *, pause_on: str | None) -> G
 
 
 def _build_runtime_state(run_id: str) -> GraphRuntimeState:
-    variable_pool = VariablePool(
+    variable_pool = VariablePool.from_bootstrap(
         system_variables=build_system_variables(user_id="user", app_id="app", workflow_id="workflow"),
         user_inputs={},
         conversation_variables=[],
@@ -196,7 +198,7 @@ def _node_successes(events: list[GraphEngineEvent]) -> list[str]:
     return [evt.node_id for evt in events if isinstance(evt, NodeRunSucceededEvent)]
 
 
-def test_workflow_app_pause_resume_matches_baseline(mocker):
+def test_workflow_app_pause_resume_matches_baseline(mocker: MockerFixture):
     _patch_tool_node(mocker)
 
     baseline_state = _build_runtime_state("baseline")
@@ -226,7 +228,11 @@ def test_workflow_app_pause_resume_matches_baseline(mocker):
         app_model=SimpleNamespace(mode="workflow"),
         workflow=SimpleNamespace(),
         user=SimpleNamespace(),
-        application_generate_entity=SimpleNamespace(stream=False, invoke_from=InvokeFrom.SERVICE_API),
+        application_generate_entity=SimpleNamespace(
+            stream=False,
+            invoke_from=InvokeFrom.SERVICE_API,
+            trace_manager=SimpleNamespace(),
+        ),
         graph_runtime_state=resumed_state,
         workflow_execution_repository=SimpleNamespace(),
         workflow_node_execution_repository=SimpleNamespace(),
@@ -236,7 +242,7 @@ def test_workflow_app_pause_resume_matches_baseline(mocker):
     assert resumed_state.outputs == baseline_outputs
 
 
-def test_advanced_chat_pause_resume_matches_baseline(mocker):
+def test_advanced_chat_pause_resume_matches_baseline(mocker: MockerFixture):
     _patch_tool_node(mocker)
 
     baseline_state = _build_runtime_state("adv-baseline")
@@ -268,7 +274,11 @@ def test_advanced_chat_pause_resume_matches_baseline(mocker):
         user=SimpleNamespace(),
         conversation=SimpleNamespace(id="conv"),
         message=SimpleNamespace(id="msg"),
-        application_generate_entity=SimpleNamespace(stream=False, invoke_from=InvokeFrom.SERVICE_API),
+        application_generate_entity=SimpleNamespace(
+            stream=False,
+            invoke_from=InvokeFrom.SERVICE_API,
+            trace_manager=SimpleNamespace(),
+        ),
         workflow_execution_repository=SimpleNamespace(),
         workflow_node_execution_repository=SimpleNamespace(),
         graph_runtime_state=resumed_state,
diff --git a/api/tests/unit_tests/core/app/apps/test_streaming_utils.py b/api/tests/unit_tests/core/app/apps/test_streaming_utils.py
index 58f0e47a4b..12f3ed9f07 100644
--- a/api/tests/unit_tests/core/app/apps/test_streaming_utils.py
+++ b/api/tests/unit_tests/core/app/apps/test_streaming_utils.py
@@ -54,7 +54,7 @@ class FakeTopic:
         return self._state["subscribed"]
 
 
-def test_retrieve_events_calls_on_subscribe_after_subscription(monkeypatch):
+def test_retrieve_events_calls_on_subscribe_after_subscription(monkeypatch: pytest.MonkeyPatch):
     topic = FakeTopic()
 
     def fake_get_response_topic(cls, app_mode, workflow_run_id):
@@ -92,7 +92,7 @@ def test_normalize_terminal_events_empty_values():
     assert _normalize_terminal_events([]) == set({})
 
 
-def test_stream_topic_events_emits_ping_and_idle_timeout(monkeypatch):
+def test_stream_topic_events_emits_ping_and_idle_timeout(monkeypatch: pytest.MonkeyPatch):
     topic = FakeTopic()
     times = [1000.0, 1000.0, 1001.0, 1001.0, 1002.0]
 
diff --git a/api/tests/unit_tests/core/app/apps/test_workflow_app_generator.py b/api/tests/unit_tests/core/app/apps/test_workflow_app_generator.py
index 7e8367c6c4..44c34a0142 100644
--- a/api/tests/unit_tests/core/app/apps/test_workflow_app_generator.py
+++ b/api/tests/unit_tests/core/app/apps/test_workflow_app_generator.py
@@ -1,6 +1,9 @@
+import contextlib
 from types import SimpleNamespace
 from unittest.mock import MagicMock
 
+from pytest_mock import MockerFixture
+
 from core.app.apps.workflow.app_generator import SKIP_PREPARE_USER_INPUTS_KEY, WorkflowAppGenerator
 
 
@@ -22,11 +25,81 @@ def test_should_prepare_user_inputs_keeps_validation_when_flag_false():
     assert WorkflowAppGenerator()._should_prepare_user_inputs(args)
 
 
-def test_resume_delegates_to_generate(mocker):
+def test_generate_includes_parent_trace_context_in_extras(monkeypatch):
+    generator = WorkflowAppGenerator()
+
+    monkeypatch.setattr(
+        "core.app.apps.workflow.app_generator.WorkflowAppGenerator._bind_file_access_scope",
+        lambda *args, **kwargs: contextlib.nullcontext(),
+    )
+    monkeypatch.setattr(
+        "core.app.apps.workflow.app_generator.WorkflowAppConfigManager.get_app_config",
+        lambda *args, **kwargs: SimpleNamespace(
+            app_id="app-1", tenant_id="tenant-1", workflow_id="workflow-1", variables=[]
+        ),
+    )
+    monkeypatch.setattr(
+        "core.app.apps.workflow.app_generator.file_factory.build_from_mappings", lambda *args, **kwargs: []
+    )
+    monkeypatch.setattr("core.app.apps.workflow.app_generator.TraceQueueManager", MagicMock())
+    monkeypatch.setattr(
+        "core.app.apps.workflow.app_generator.DifyCoreRepositoryFactory.create_workflow_execution_repository",
+        MagicMock(return_value=MagicMock()),
+    )
+    monkeypatch.setattr(
+        "core.app.apps.workflow.app_generator.DifyCoreRepositoryFactory.create_workflow_node_execution_repository",
+        MagicMock(return_value=MagicMock()),
+    )
+    monkeypatch.setattr("core.app.apps.workflow.app_generator.db", SimpleNamespace(engine=MagicMock()))
+    monkeypatch.setattr(generator, "_prepare_user_inputs", lambda *, user_inputs, **kwargs: user_inputs)
+
+    captured = {}
+
+    def fake_workflow_app_generate_entity(**kwargs):
+        captured["workflow_app_generate_entity_kwargs"] = kwargs
+        return SimpleNamespace(**kwargs)
+
+    def fake_generate(**kwargs):
+        captured["application_generate_entity"] = kwargs["application_generate_entity"]
+        return {"data": {}}
+
+    monkeypatch.setattr(
+        "core.app.apps.workflow.app_generator.WorkflowAppGenerateEntity", fake_workflow_app_generate_entity
+    )
+    monkeypatch.setattr(generator, "_generate", fake_generate)
+
+    result = generator.generate(
+        app_model=SimpleNamespace(tenant_id="tenant-1", id="app-1"),
+        workflow=SimpleNamespace(features_dict={}),
+        user=SimpleNamespace(id="user-1", session_id="session-1"),
+        args={
+            "inputs": {"query": "hello"},
+            "files": [],
+            "external_trace_id": "trace-1",
+            "parent_trace_context": {
+                "parent_workflow_run_id": "outer-workflow-run-1",
+                "parent_node_execution_id": "outer-node-execution-1",
+            },
+        },
+        invoke_from="service-api",
+        streaming=False,
+        call_depth=0,
+    )
+
+    assert result == {"data": {}}
+    extras = captured["workflow_app_generate_entity_kwargs"]["extras"]
+    assert extras["external_trace_id"] == "trace-1"
+    assert extras["parent_trace_context"].model_dump() == {
+        "parent_workflow_run_id": "outer-workflow-run-1",
+        "parent_node_execution_id": "outer-node-execution-1",
+    }
+
+
+def test_resume_delegates_to_generate(mocker: MockerFixture):
     generator = WorkflowAppGenerator()
     mock_generate = mocker.patch.object(generator, "_generate", return_value="ok")
 
-    application_generate_entity = SimpleNamespace(stream=False, invoke_from="debugger")
+    application_generate_entity = SimpleNamespace(stream=False, invoke_from="debugger", trace_manager=MagicMock())
     runtime_state = MagicMock(name="runtime-state")
     pause_config = MagicMock(name="pause-config")
 
@@ -52,7 +125,7 @@ def test_resume_delegates_to_generate(mocker):
     assert kwargs["invoke_from"] == "debugger"
 
 
-def test_generate_appends_pause_layer_and_forwards_state(mocker):
+def test_generate_appends_pause_layer_and_forwards_state(mocker: MockerFixture):
     generator = WorkflowAppGenerator()
 
     mock_queue_manager = MagicMock()
@@ -124,7 +197,7 @@ def test_generate_appends_pause_layer_and_forwards_state(mocker):
     assert worker_kwargs["kwargs"]["graph_runtime_state"] is graph_runtime_state
 
 
-def test_resume_path_runs_worker_with_runtime_state(mocker):
+def test_resume_path_runs_worker_with_runtime_state(mocker: MockerFixture):
     generator = WorkflowAppGenerator()
     runtime_state = MagicMock(name="runtime-state")
 
diff --git a/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_core.py b/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_core.py
index 58c7bfa4bc..3949c41eae 100644
--- a/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_core.py
+++ b/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_core.py
@@ -54,7 +54,7 @@ class TestWorkflowBasedAppRunner:
         runner = WorkflowBasedAppRunner(queue_manager=SimpleNamespace(), app_id="app")
 
         runtime_state = GraphRuntimeState(
-            variable_pool=VariablePool(system_variables=default_system_variables()),
+            variable_pool=VariablePool.from_bootstrap(system_variables=default_system_variables()),
             start_at=0.0,
         )
 
@@ -90,10 +90,10 @@ class TestWorkflowBasedAppRunner:
         with pytest.raises(ValueError, match="Neither single_iteration_run nor single_loop_run"):
             runner._prepare_single_node_execution(workflow, None, None, user_id="00000000-0000-0000-0000-000000000001")
 
-    def test_get_graph_and_variable_pool_for_single_node_run(self, monkeypatch):
+    def test_get_graph_and_variable_pool_for_single_node_run(self, monkeypatch: pytest.MonkeyPatch):
         runner = WorkflowBasedAppRunner(queue_manager=SimpleNamespace(), app_id="app")
         graph_runtime_state = GraphRuntimeState(
-            variable_pool=VariablePool(system_variables=default_system_variables()),
+            variable_pool=VariablePool.from_bootstrap(system_variables=default_system_variables()),
             start_at=0.0,
         )
 
@@ -142,7 +142,9 @@ class TestWorkflowBasedAppRunner:
         assert graph is not None
         assert variable_pool is graph_runtime_state.variable_pool
 
-    def test_get_graph_and_variable_pool_preloads_constructor_variables_before_graph_init(self, monkeypatch):
+    def test_get_graph_and_variable_pool_preloads_constructor_variables_before_graph_init(
+        self, monkeypatch: pytest.MonkeyPatch
+    ):
         variable_loader = SimpleNamespace(
             load_variables=lambda selectors: (
                 [
@@ -162,7 +164,7 @@ class TestWorkflowBasedAppRunner:
             app_id="app",
         )
         graph_runtime_state = GraphRuntimeState(
-            variable_pool=VariablePool(system_variables=default_system_variables()),
+            variable_pool=VariablePool.from_bootstrap(system_variables=default_system_variables()),
             start_at=0.0,
         )
 
@@ -232,7 +234,7 @@ class TestWorkflowBasedAppRunner:
         assert graph is not None
         assert variable_pool.get(["sys", "conversation_id"]).value == "conv-1"
 
-    def test_handle_graph_run_events_and_pause_notifications(self, monkeypatch):
+    def test_handle_graph_run_events_and_pause_notifications(self, monkeypatch: pytest.MonkeyPatch):
         published: list[object] = []
 
         class _QueueManager:
@@ -241,7 +243,7 @@ class TestWorkflowBasedAppRunner:
 
         runner = WorkflowBasedAppRunner(queue_manager=_QueueManager(), app_id="app")
         graph_runtime_state = GraphRuntimeState(
-            variable_pool=VariablePool(system_variables=default_system_variables()),
+            variable_pool=VariablePool.from_bootstrap(system_variables=default_system_variables()),
             start_at=0.0,
         )
         graph_runtime_state.register_paused_node("node-1")
@@ -284,7 +286,7 @@ class TestWorkflowBasedAppRunner:
 
         runner = WorkflowBasedAppRunner(queue_manager=_QueueManager(), app_id="app")
         graph_runtime_state = GraphRuntimeState(
-            variable_pool=VariablePool(system_variables=default_system_variables()),
+            variable_pool=VariablePool.from_bootstrap(system_variables=default_system_variables()),
             start_at=0.0,
         )
         workflow_entry = SimpleNamespace(graph_engine=SimpleNamespace(graph_runtime_state=graph_runtime_state))
@@ -423,7 +425,7 @@ class TestWorkflowBasedAppRunner:
 
         runner = WorkflowBasedAppRunner(queue_manager=_QueueManager(), app_id="app")
         graph_runtime_state = GraphRuntimeState(
-            variable_pool=VariablePool(system_variables=default_system_variables()),
+            variable_pool=VariablePool.from_bootstrap(system_variables=default_system_variables()),
             start_at=0.0,
         )
         workflow_entry = SimpleNamespace(graph_engine=SimpleNamespace(graph_runtime_state=graph_runtime_state))
diff --git a/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_single_node.py b/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_single_node.py
index 620a153204..248fed5388 100644
--- a/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_single_node.py
+++ b/api/tests/unit_tests/core/app/apps/test_workflow_app_runner_single_node.py
@@ -16,7 +16,7 @@ from models.workflow import Workflow
 
 
 def _make_graph_state():
-    variable_pool = VariablePool(
+    variable_pool = VariablePool.from_bootstrap(
         system_variables=default_system_variables(),
         user_inputs={},
         environment_variables=[],
diff --git a/api/tests/unit_tests/core/app/apps/test_workflow_pause_events.py b/api/tests/unit_tests/core/app/apps/test_workflow_pause_events.py
index a3ab379b66..72a46a74c9 100644
--- a/api/tests/unit_tests/core/app/apps/test_workflow_pause_events.py
+++ b/api/tests/unit_tests/core/app/apps/test_workflow_pause_events.py
@@ -14,7 +14,7 @@ from core.workflow.system_variables import build_system_variables
 from graphon.entities import WorkflowStartReason
 from graphon.entities.pause_reason import HumanInputRequired
 from graphon.graph_events import GraphRunPausedEvent
-from graphon.nodes.human_input.entities import FormInput, UserAction
+from graphon.nodes.human_input.entities import ParagraphInputConfig, UserActionConfig
 from graphon.nodes.human_input.enums import FormInputType
 from models.account import Account
 from models.human_input import RecipientType
@@ -157,9 +157,9 @@ def test_queue_workflow_paused_event_to_stream_responses(monkeypatch: pytest.Mon
         form_id="form-1",
         form_content="Rendered",
         inputs=[
-            FormInput(type=FormInputType.TEXT_INPUT, output_variable_name="field", default=None),
+            ParagraphInputConfig(type=FormInputType.PARAGRAPH, output_variable_name="field", default=None),
         ],
-        actions=[UserAction(id="approve", title="Approve")],
+        actions=[UserActionConfig(id="approve", title="Approve")],
         node_id="node-id",
         node_title="Human Step",
     )
diff --git a/api/tests/unit_tests/core/app/apps/workflow/test_app_generator_extra.py b/api/tests/unit_tests/core/app/apps/workflow/test_app_generator_extra.py
index 09ad078a70..941a47b572 100644
--- a/api/tests/unit_tests/core/app/apps/workflow/test_app_generator_extra.py
+++ b/api/tests/unit_tests/core/app/apps/workflow/test_app_generator_extra.py
@@ -67,7 +67,7 @@ class TestWorkflowAppGeneratorValidation:
 
 
 class TestWorkflowAppGeneratorHandleResponse:
-    def test_handle_response_closed_file_raises_stopped(self, monkeypatch):
+    def test_handle_response_closed_file_raises_stopped(self, monkeypatch: pytest.MonkeyPatch):
         generator = WorkflowAppGenerator()
 
         app_config = WorkflowUIBasedAppConfig(
@@ -116,7 +116,7 @@ class TestWorkflowAppGeneratorHandleResponse:
 
 
 class TestWorkflowAppGeneratorGenerate:
-    def test_generate_skips_prepare_inputs_when_flag_set(self, monkeypatch):
+    def test_generate_skips_prepare_inputs_when_flag_set(self, monkeypatch: pytest.MonkeyPatch):
         generator = WorkflowAppGenerator()
 
         app_config = WorkflowUIBasedAppConfig(
@@ -186,3 +186,114 @@ class TestWorkflowAppGeneratorGenerate:
         )
 
         assert result == {"ok": True}
+
+
+class TestWorkflowAppGeneratorResume:
+    def test_resume_restores_trace_manager_when_missing(self, monkeypatch: pytest.MonkeyPatch):
+        generator = WorkflowAppGenerator()
+        app_config = WorkflowUIBasedAppConfig(
+            tenant_id="tenant",
+            app_id="app",
+            app_mode=AppMode.WORKFLOW,
+            additional_features=AppAdditionalFeatures(),
+            variables=[],
+            workflow_id="workflow-id",
+        )
+        application_generate_entity = WorkflowAppGenerateEntity.model_construct(
+            task_id="task",
+            app_config=app_config,
+            inputs={},
+            files=[],
+            user_id="user",
+            stream=False,
+            invoke_from=InvokeFrom.WEB_APP,
+            extras={},
+            trace_manager=None,
+            workflow_execution_id="run-id",
+            call_depth=0,
+        )
+        DummyTraceQueueManager = type(
+            "_DummyTraceQueueManager",
+            (TraceQueueManager,),
+            {
+                "__init__": lambda self, app_id=None, user_id=None: (
+                    setattr(self, "app_id", app_id) or setattr(self, "user_id", user_id)
+                )
+            },
+        )
+        monkeypatch.setattr(
+            "core.app.apps.workflow.app_generator.TraceQueueManager",
+            DummyTraceQueueManager,
+        )
+        captured_entity: WorkflowAppGenerateEntity | None = None
+
+        def _fake_generate(**kwargs):
+            nonlocal captured_entity
+            captured_entity = kwargs["application_generate_entity"]
+            return SimpleNamespace(ok=True)
+
+        monkeypatch.setattr(generator, "_generate", _fake_generate)
+
+        result = generator.resume(
+            app_model=SimpleNamespace(id="app-id"),
+            workflow=SimpleNamespace(),
+            user=SimpleNamespace(id="end-user-id", session_id="session-id"),
+            application_generate_entity=application_generate_entity,
+            graph_runtime_state=SimpleNamespace(),
+            workflow_execution_repository=SimpleNamespace(),
+            workflow_node_execution_repository=SimpleNamespace(),
+        )
+
+        assert result.ok is True
+        assert captured_entity is not None
+        trace_manager = captured_entity.trace_manager
+        assert isinstance(trace_manager, DummyTraceQueueManager)
+        assert trace_manager.app_id == "app-id"
+        assert trace_manager.user_id == "session-id"
+
+    def test_resume_preserves_existing_trace_manager(self, monkeypatch: pytest.MonkeyPatch):
+        generator = WorkflowAppGenerator()
+        app_config = WorkflowUIBasedAppConfig(
+            tenant_id="tenant",
+            app_id="app",
+            app_mode=AppMode.WORKFLOW,
+            additional_features=AppAdditionalFeatures(),
+            variables=[],
+            workflow_id="workflow-id",
+        )
+        existing_trace_manager = SimpleNamespace(app_id="existing-app", user_id="existing-user")
+        application_generate_entity = WorkflowAppGenerateEntity.model_construct(
+            task_id="task",
+            app_config=app_config,
+            inputs={},
+            files=[],
+            user_id="user",
+            stream=False,
+            invoke_from=InvokeFrom.WEB_APP,
+            extras={},
+            trace_manager=existing_trace_manager,
+            workflow_execution_id="run-id",
+            call_depth=0,
+        )
+        captured_entity: WorkflowAppGenerateEntity | None = None
+
+        def _fake_generate(**kwargs):
+            nonlocal captured_entity
+            captured_entity = kwargs["application_generate_entity"]
+            return SimpleNamespace(ok=True)
+
+        monkeypatch.setattr(generator, "_generate", _fake_generate)
+
+        result = generator.resume(
+            app_model=SimpleNamespace(id="app-id"),
+            workflow=SimpleNamespace(),
+            user=SimpleNamespace(id="end-user-id", session_id="session-id"),
+            application_generate_entity=application_generate_entity,
+            graph_runtime_state=SimpleNamespace(),
+            workflow_execution_repository=SimpleNamespace(),
+            workflow_node_execution_repository=SimpleNamespace(),
+        )
+
+        assert result.ok is True
+        assert captured_entity is not None
+        assert captured_entity.trace_manager is existing_trace_manager
diff --git a/api/tests/unit_tests/core/app/apps/workflow/test_generate_task_pipeline_core.py b/api/tests/unit_tests/core/app/apps/workflow/test_generate_task_pipeline_core.py
index 0bcc1029b0..ea21a1cc1a 100644
--- a/api/tests/unit_tests/core/app/apps/workflow/test_generate_task_pipeline_core.py
+++ b/api/tests/unit_tests/core/app/apps/workflow/test_generate_task_pipeline_core.py
@@ -95,7 +95,9 @@ class TestWorkflowGenerateTaskPipeline:
     def test_to_blocking_response_falls_back_to_human_input_required_when_pause_event_missing(self):
         pipeline = _make_pipeline()
         pipeline._graph_runtime_state = GraphRuntimeState(
-            variable_pool=VariablePool(system_variables=build_system_variables(workflow_execution_id="run-id")),
+            variable_pool=build_test_variable_pool(
+                variables=build_system_variables(workflow_execution_id="run-id"),
+            ),
             start_at=0.0,
             total_tokens=5,
             node_run_steps=2,
@@ -187,7 +189,7 @@ class TestWorkflowGenerateTaskPipeline:
 
         assert isinstance(responses[0], ValueError)
 
-    def test_handle_workflow_started_event_sets_run_id(self, monkeypatch):
+    def test_handle_workflow_started_event_sets_run_id(self, monkeypatch: pytest.MonkeyPatch):
         pipeline = _make_pipeline()
         pipeline._graph_runtime_state = GraphRuntimeState(
             variable_pool=build_test_variable_pool(variables=build_system_variables(workflow_execution_id="run-id")),
@@ -283,7 +285,9 @@ class TestWorkflowGenerateTaskPipeline:
         pipeline = _make_pipeline()
         pipeline._workflow_execution_id = "run-id"
         pipeline._graph_runtime_state = GraphRuntimeState(
-            variable_pool=VariablePool(system_variables=build_system_variables(workflow_execution_id="run-id")),
+            variable_pool=VariablePool.from_bootstrap(
+                system_variables=build_system_variables(workflow_execution_id="run-id")
+            ),
             start_at=0.0,
         )
         pipeline._workflow_response_converter.workflow_finish_to_stream_response = lambda **kwargs: "finish"
@@ -408,7 +412,7 @@ class TestWorkflowGenerateTaskPipeline:
         assert list(pipeline._handle_human_input_form_timeout_event(timeout_event)) == ["timeout"]
         assert list(pipeline._handle_agent_log_event(agent_event)) == ["log"]
 
-    def test_wrapper_process_stream_response_emits_audio_end(self, monkeypatch):
+    def test_wrapper_process_stream_response_emits_audio_end(self, monkeypatch: pytest.MonkeyPatch):
         pipeline = _make_pipeline()
         pipeline._workflow_features_dict = {
             "text_to_speech": {"enabled": True, "autoPlay": "enabled", "voice": "v", "language": "en"}
@@ -560,7 +564,7 @@ class TestWorkflowGenerateTaskPipeline:
         responses = list(pipeline._wrapper_process_stream_response())
         assert responses == [PingStreamResponse(task_id="task")]
 
-    def test_wrapper_process_stream_response_final_audio_none_then_finish(self, monkeypatch):
+    def test_wrapper_process_stream_response_final_audio_none_then_finish(self, monkeypatch: pytest.MonkeyPatch):
         pipeline = _make_pipeline()
         pipeline._workflow_features_dict = {
             "text_to_speech": {"enabled": True, "autoPlay": "enabled", "voice": "v", "language": "en"}
@@ -597,7 +601,7 @@ class TestWorkflowGenerateTaskPipeline:
         assert sleep_spy
         assert any(isinstance(item, MessageAudioEndStreamResponse) for item in responses)
 
-    def test_wrapper_process_stream_response_handles_audio_exception(self, monkeypatch):
+    def test_wrapper_process_stream_response_handles_audio_exception(self, monkeypatch: pytest.MonkeyPatch):
         pipeline = _make_pipeline()
         pipeline._workflow_features_dict = {
             "text_to_speech": {"enabled": True, "autoPlay": "enabled", "voice": "v", "language": "en"}
@@ -633,7 +637,7 @@ class TestWorkflowGenerateTaskPipeline:
         assert logger_exception
         assert any(isinstance(item, MessageAudioEndStreamResponse) for item in responses)
 
-    def test_database_session_rolls_back_on_error(self, monkeypatch):
+    def test_database_session_rolls_back_on_error(self, monkeypatch: pytest.MonkeyPatch):
         pipeline = _make_pipeline()
         calls = {"enter": 0, "exit_exc": None}
 
@@ -725,7 +729,9 @@ class TestWorkflowGenerateTaskPipeline:
         pipeline = _make_pipeline()
         pipeline._workflow_execution_id = "run-id"
         pipeline._graph_runtime_state = GraphRuntimeState(
-            variable_pool=VariablePool(system_variables=build_system_variables(workflow_execution_id="run-id")),
+            variable_pool=VariablePool.from_bootstrap(
+                system_variables=build_system_variables(workflow_execution_id="run-id")
+            ),
             start_at=0.0,
         )
 
@@ -753,7 +759,9 @@ class TestWorkflowGenerateTaskPipeline:
         pipeline = _make_pipeline()
         pipeline._workflow_execution_id = "run-id"
         pipeline._graph_runtime_state = GraphRuntimeState(
-            variable_pool=VariablePool(system_variables=build_system_variables(workflow_execution_id="run-id")),
+            variable_pool=VariablePool.from_bootstrap(
+                system_variables=build_system_variables(workflow_execution_id="run-id")
+            ),
             start_at=0.0,
         )
         pipeline._handle_ping_event = lambda event, **kwargs: iter(["ping"])
@@ -769,7 +777,9 @@ class TestWorkflowGenerateTaskPipeline:
     def test_process_stream_response_main_match_paths_and_cleanup(self):
         pipeline = _make_pipeline()
         pipeline._graph_runtime_state = GraphRuntimeState(
-            variable_pool=VariablePool(system_variables=build_system_variables(workflow_execution_id="run-id")),
+            variable_pool=VariablePool.from_bootstrap(
+                system_variables=build_system_variables(workflow_execution_id="run-id")
+            ),
             start_at=0.0,
         )
         pipeline._base_task_pipeline.queue_manager.listen = lambda: iter(
diff --git a/api/tests/unit_tests/core/app/layers/test_trigger_post_layer.py b/api/tests/unit_tests/core/app/layers/test_trigger_post_layer.py
index d3bd15b6f3..320a3bc42c 100644
--- a/api/tests/unit_tests/core/app/layers/test_trigger_post_layer.py
+++ b/api/tests/unit_tests/core/app/layers/test_trigger_post_layer.py
@@ -21,7 +21,9 @@ class TestTriggerPostLayer:
         )
         runtime_state = SimpleNamespace(
             outputs={"answer": "ok"},
-            variable_pool=VariablePool(system_variables=build_system_variables(workflow_execution_id="run-1")),
+            variable_pool=VariablePool.from_bootstrap(
+                system_variables=build_system_variables(workflow_execution_id="run-1")
+            ),
             total_tokens=12,
         )
 
@@ -60,7 +62,9 @@ class TestTriggerPostLayer:
     def test_on_event_handles_missing_trigger_log(self):
         runtime_state = SimpleNamespace(
             outputs={},
-            variable_pool=VariablePool(system_variables=build_system_variables(workflow_execution_id="run-1")),
+            variable_pool=VariablePool.from_bootstrap(
+                system_variables=build_system_variables(workflow_execution_id="run-1")
+            ),
             total_tokens=0,
         )
 
@@ -91,7 +95,9 @@ class TestTriggerPostLayer:
     def test_on_event_ignores_non_status_events(self):
         runtime_state = SimpleNamespace(
             outputs={},
-            variable_pool=VariablePool(system_variables=build_system_variables(workflow_execution_id="run-1")),
+            variable_pool=VariablePool.from_bootstrap(
+                system_variables=build_system_variables(workflow_execution_id="run-1")
+            ),
             total_tokens=0,
         )
 
diff --git a/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline_core.py b/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline_core.py
index a20d89d807..f10e0084d0 100644
--- a/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline_core.py
+++ b/api/tests/unit_tests/core/app/task_pipeline/test_easy_ui_based_generate_task_pipeline_core.py
@@ -143,7 +143,7 @@ class TestEasyUiBasedGenerateTaskPipeline:
 
         assert pipeline._listen_audio_msg(publisher=None, task_id="task") is None
 
-    def test_process_stream_response_handles_chunks_and_end(self, monkeypatch):
+    def test_process_stream_response_handles_chunks_and_end(self, monkeypatch: pytest.MonkeyPatch):
         conversation = SimpleNamespace(id="conv", mode=AppMode.CHAT)
         message = SimpleNamespace(id="msg", created_at=datetime.now(UTC))
 
@@ -245,7 +245,7 @@ class TestEasyUiBasedGenerateTaskPipeline:
         assert any(isinstance(event, QueueLLMChunkEvent) for event in events)
         assert any(isinstance(event, QueueStopEvent) for event in events)
 
-    def test_handle_stop_updates_usage(self, monkeypatch):
+    def test_handle_stop_updates_usage(self, monkeypatch: pytest.MonkeyPatch):
         conversation = SimpleNamespace(id="conv", mode=AppMode.CHAT)
         message = SimpleNamespace(id="msg", created_at=datetime.now(UTC))
 
@@ -313,7 +313,7 @@ class TestEasyUiBasedGenerateTaskPipeline:
         assert pipeline._task_state.llm_result.usage.prompt_tokens == 10
         assert pipeline._task_state.llm_result.usage.completion_tokens == 5
 
-    def test_record_files_builds_file_payloads(self, monkeypatch):
+    def test_record_files_builds_file_payloads(self, monkeypatch: pytest.MonkeyPatch):
         conversation = SimpleNamespace(id="conv", mode=AppMode.CHAT)
         message = SimpleNamespace(id="msg", created_at=datetime.now(UTC))
 
@@ -405,7 +405,7 @@ class TestEasyUiBasedGenerateTaskPipeline:
         assert files
         assert len(files) == 3
 
-    def test_process_stream_response_handles_annotation_and_error(self, monkeypatch):
+    def test_process_stream_response_handles_annotation_and_error(self, monkeypatch: pytest.MonkeyPatch):
         conversation = SimpleNamespace(id="conv", mode=AppMode.CHAT)
         message = SimpleNamespace(id="msg", created_at=datetime.now(UTC))
 
@@ -472,7 +472,7 @@ class TestEasyUiBasedGenerateTaskPipeline:
         assert isinstance(responses[-1], ValueError)
         assert pipeline._task_state.llm_result.message.content == "annotatedagent"
 
-    def test_agent_thought_to_stream_response_returns_payload(self, monkeypatch):
+    def test_agent_thought_to_stream_response_returns_payload(self, monkeypatch: pytest.MonkeyPatch):
         conversation = SimpleNamespace(id="conv", mode=AppMode.CHAT)
         message = SimpleNamespace(id="msg", created_at=datetime.now(UTC))
 
@@ -681,7 +681,7 @@ class TestEasyUiBasedGenerateTaskPipeline:
 
         assert responses == ["payload"]
 
-    def test_wrapper_process_stream_response_with_tts_publisher(self, monkeypatch):
+    def test_wrapper_process_stream_response_with_tts_publisher(self, monkeypatch: pytest.MonkeyPatch):
         conversation = SimpleNamespace(id="conv", mode=AppMode.CHAT)
         message = SimpleNamespace(id="msg", created_at=datetime.now(UTC))
         entity = _make_entity(ChatAppGenerateEntity, AppMode.CHAT)
@@ -715,7 +715,7 @@ class TestEasyUiBasedGenerateTaskPipeline:
         assert responses[1] == "payload"
         assert isinstance(responses[-1], MessageAudioEndStreamResponse)
 
-    def test_wrapper_process_stream_response_timeout_yields_audio_chunk(self, monkeypatch):
+    def test_wrapper_process_stream_response_timeout_yields_audio_chunk(self, monkeypatch: pytest.MonkeyPatch):
         conversation = SimpleNamespace(id="conv", mode=AppMode.CHAT)
         message = SimpleNamespace(id="msg", created_at=datetime.now(UTC))
         entity = _make_entity(ChatAppGenerateEntity, AppMode.CHAT)
@@ -756,7 +756,7 @@ class TestEasyUiBasedGenerateTaskPipeline:
         assert any(isinstance(item, MessageAudioStreamResponse) for item in responses)
         assert isinstance(responses[-1], MessageAudioEndStreamResponse)
 
-    def test_process_stream_response_handles_stop_event_and_output_replacement(self, monkeypatch):
+    def test_process_stream_response_handles_stop_event_and_output_replacement(self, monkeypatch: pytest.MonkeyPatch):
         conversation = SimpleNamespace(id="conv", mode=AppMode.CHAT)
         message = SimpleNamespace(id="msg", created_at=datetime.now(UTC))
         pipeline = EasyUIBasedGenerateTaskPipeline(
@@ -896,7 +896,7 @@ class TestEasyUiBasedGenerateTaskPipeline:
 
         assert list(pipeline._process_stream_response(publisher=None)) == []
 
-    def test_save_message_persists_fields_and_emits_trace(self, monkeypatch):
+    def test_save_message_persists_fields_and_emits_trace(self, monkeypatch: pytest.MonkeyPatch):
         conversation = SimpleNamespace(id="conv", mode=AppMode.CHAT)
         message = SimpleNamespace(id="msg", created_at=datetime.now(UTC))
         pipeline = EasyUIBasedGenerateTaskPipeline(
@@ -981,7 +981,7 @@ class TestEasyUiBasedGenerateTaskPipeline:
         with pytest.raises(ValueError, match="Conversation conv not found"):
             pipeline._save_message(session=session)
 
-    def test_message_end_to_stream_response_includes_usage_metadata(self, monkeypatch):
+    def test_message_end_to_stream_response_includes_usage_metadata(self, monkeypatch: pytest.MonkeyPatch):
         conversation = SimpleNamespace(id="conv", mode=AppMode.CHAT)
         message = SimpleNamespace(id="msg", created_at=datetime.now(UTC))
         pipeline = EasyUIBasedGenerateTaskPipeline(
@@ -1021,7 +1021,7 @@ class TestEasyUiBasedGenerateTaskPipeline:
         assert response.id == "msg"
         assert response.metadata["usage"]["prompt_tokens"] == 1
 
-    def test_record_files_returns_none_when_message_has_no_files(self, monkeypatch):
+    def test_record_files_returns_none_when_message_has_no_files(self, monkeypatch: pytest.MonkeyPatch):
         conversation = SimpleNamespace(id="conv", mode=AppMode.CHAT)
         message = SimpleNamespace(id="msg", created_at=datetime.now(UTC))
         pipeline = EasyUIBasedGenerateTaskPipeline(
@@ -1059,7 +1059,7 @@ class TestEasyUiBasedGenerateTaskPipeline:
 
         assert response.files is None
 
-    def test_record_files_handles_local_fallback_and_tool_url_variants(self, monkeypatch):
+    def test_record_files_handles_local_fallback_and_tool_url_variants(self, monkeypatch: pytest.MonkeyPatch):
         conversation = SimpleNamespace(id="conv", mode=AppMode.CHAT)
         message = SimpleNamespace(id="msg", created_at=datetime.now(UTC))
         pipeline = EasyUIBasedGenerateTaskPipeline(
@@ -1155,7 +1155,7 @@ class TestEasyUiBasedGenerateTaskPipeline:
         assert response.id == "msg"
         assert response.answer == "hello"
 
-    def test_agent_thought_to_stream_response_returns_none_when_not_found(self, monkeypatch):
+    def test_agent_thought_to_stream_response_returns_none_when_not_found(self, monkeypatch: pytest.MonkeyPatch):
         conversation = SimpleNamespace(id="conv", mode=AppMode.CHAT)
         message = SimpleNamespace(id="msg", created_at=datetime.now(UTC))
         pipeline = EasyUIBasedGenerateTaskPipeline(
diff --git a/api/tests/unit_tests/core/app/test_llm_quota.py b/api/tests/unit_tests/core/app/test_llm_quota.py
new file mode 100644
index 0000000000..13bdf76535
--- /dev/null
+++ b/api/tests/unit_tests/core/app/test_llm_quota.py
@@ -0,0 +1,628 @@
+from collections.abc import Generator
+from contextlib import contextmanager
+from types import SimpleNamespace
+from unittest.mock import MagicMock, patch
+
+import pytest
+from sqlalchemy import create_engine, select
+from sqlalchemy.engine import Engine
+from sqlalchemy.orm import sessionmaker
+
+from configs import dify_config
+from core.app.llm.quota import (
+    deduct_llm_quota,
+    deduct_llm_quota_for_model,
+    ensure_llm_quota_available,
+    ensure_llm_quota_available_for_model,
+)
+from core.entities.model_entities import ModelStatus
+from core.entities.provider_entities import ProviderQuotaType, QuotaUnit
+from core.errors.error import QuotaExceededError
+from graphon.model_runtime.entities.llm_entities import LLMUsage
+from graphon.model_runtime.entities.model_entities import ModelType
+from models import TenantCreditPool
+from models.enums import ProviderQuotaType as ModelProviderQuotaType
+from models.provider import Provider, ProviderType
+
+
+@contextmanager
+def _patched_credit_pool_session_factory(engine: Engine) -> Generator[None, None, None]:
+    session_maker = sessionmaker(bind=engine, expire_on_commit=False)
+    with patch("services.credit_pool_service.session_factory.get_session_maker", return_value=session_maker):
+        yield
+
+
+def test_ensure_llm_quota_available_for_model_raises_when_system_model_is_exhausted() -> None:
+    provider_configuration = SimpleNamespace(
+        using_provider_type=ProviderType.SYSTEM,
+        get_provider_model=MagicMock(return_value=SimpleNamespace(status=ModelStatus.QUOTA_EXCEEDED)),
+    )
+    provider_manager = MagicMock()
+    provider_manager.get_configurations.return_value.get.return_value = provider_configuration
+
+    with (
+        patch("core.app.llm.quota.create_plugin_provider_manager", return_value=provider_manager),
+        pytest.raises(QuotaExceededError, match="Model provider openai quota exceeded."),
+    ):
+        ensure_llm_quota_available_for_model(
+            tenant_id="tenant-id",
+            provider="openai",
+            model="gpt-4o",
+        )
+
+    provider_configuration.get_provider_model.assert_called_once_with(
+        model_type=ModelType.LLM,
+        model="gpt-4o",
+    )
+
+
+def test_ensure_llm_quota_available_for_model_raises_when_provider_is_missing() -> None:
+    provider_manager = MagicMock()
+    provider_manager.get_configurations.return_value.get.return_value = None
+
+    with (
+        patch("core.app.llm.quota.create_plugin_provider_manager", return_value=provider_manager),
+        pytest.raises(ValueError, match="Provider openai does not exist."),
+    ):
+        ensure_llm_quota_available_for_model(
+            tenant_id="tenant-id",
+            provider="openai",
+            model="gpt-4o",
+        )
+
+
+def test_ensure_llm_quota_available_for_model_ignores_custom_provider_configuration() -> None:
+    provider_configuration = SimpleNamespace(
+        using_provider_type=ProviderType.CUSTOM,
+        get_provider_model=MagicMock(),
+    )
+    provider_manager = MagicMock()
+    provider_manager.get_configurations.return_value.get.return_value = provider_configuration
+
+    with patch("core.app.llm.quota.create_plugin_provider_manager", return_value=provider_manager):
+        ensure_llm_quota_available_for_model(
+            tenant_id="tenant-id",
+            provider="openai",
+            model="gpt-4o",
+        )
+
+    provider_configuration.get_provider_model.assert_not_called()
+
+
+def test_deduct_llm_quota_for_model_uses_identity_based_trial_billing() -> None:
+    usage = LLMUsage.empty_usage()
+    usage.total_tokens = 42
+    provider_configuration = SimpleNamespace(
+        using_provider_type=ProviderType.SYSTEM,
+        system_configuration=SimpleNamespace(
+            current_quota_type=ProviderQuotaType.TRIAL,
+            quota_configurations=[
+                SimpleNamespace(
+                    quota_type=ProviderQuotaType.TRIAL,
+                    quota_unit=QuotaUnit.TOKENS,
+                    quota_limit=100,
+                )
+            ],
+        ),
+    )
+    provider_manager = MagicMock()
+    provider_manager.get_configurations.return_value.get.return_value = provider_configuration
+
+    with (
+        patch("core.app.llm.quota.create_plugin_provider_manager", return_value=provider_manager),
+        patch("services.credit_pool_service.CreditPoolService.deduct_credits_capped") as mock_deduct_credits,
+    ):
+        deduct_llm_quota_for_model(
+            tenant_id="tenant-id",
+            provider="openai",
+            model="gpt-4o",
+            usage=usage,
+        )
+
+    mock_deduct_credits.assert_called_once_with(
+        tenant_id="tenant-id",
+        credits_required=42,
+    )
+
+
+def test_deduct_llm_quota_for_model_caps_trial_pool_when_usage_exceeds_remaining() -> None:
+    usage = LLMUsage.empty_usage()
+    usage.total_tokens = 3
+    provider_configuration = SimpleNamespace(
+        using_provider_type=ProviderType.SYSTEM,
+        system_configuration=SimpleNamespace(
+            current_quota_type=ProviderQuotaType.TRIAL,
+            quota_configurations=[
+                SimpleNamespace(
+                    quota_type=ProviderQuotaType.TRIAL,
+                    quota_unit=QuotaUnit.TOKENS,
+                    quota_limit=100,
+                )
+            ],
+        ),
+    )
+    provider_manager = MagicMock()
+    provider_manager.get_configurations.return_value.get.return_value = provider_configuration
+    engine = create_engine("sqlite:///:memory:")
+    TenantCreditPool.__table__.create(engine)
+    with engine.begin() as connection:
+        connection.execute(
+            TenantCreditPool.__table__.insert(),
+            {
+                "id": "trial-pool",
+                "tenant_id": "tenant-id",
+                "pool_type": ModelProviderQuotaType.TRIAL,
+                "quota_limit": 10,
+                "quota_used": 9,
+            },
+        )
+
+    with (
+        patch("core.app.llm.quota.create_plugin_provider_manager", return_value=provider_manager),
+        _patched_credit_pool_session_factory(engine),
+    ):
+        deduct_llm_quota_for_model(
+            tenant_id="tenant-id",
+            provider="openai",
+            model="gpt-4o",
+            usage=usage,
+        )
+
+    with engine.connect() as connection:
+        quota_used = connection.scalar(select(TenantCreditPool.quota_used).where(TenantCreditPool.id == "trial-pool"))
+
+    assert quota_used == 10
+
+
+def test_deduct_llm_quota_for_model_returns_for_unbounded_quota() -> None:
+    usage = LLMUsage.empty_usage()
+    usage.total_tokens = 42
+    provider_configuration = SimpleNamespace(
+        using_provider_type=ProviderType.SYSTEM,
+        system_configuration=SimpleNamespace(
+            current_quota_type=ProviderQuotaType.TRIAL,
+            quota_configurations=[
+                SimpleNamespace(
+                    quota_type=ProviderQuotaType.TRIAL,
+                    quota_unit=QuotaUnit.TOKENS,
+                    quota_limit=-1,
+                )
+            ],
+        ),
+    )
+    provider_manager = MagicMock()
+    provider_manager.get_configurations.return_value.get.return_value = provider_configuration
+
+    with (
+        patch("core.app.llm.quota.create_plugin_provider_manager", return_value=provider_manager),
+        patch("services.credit_pool_service.CreditPoolService.deduct_credits_capped") as mock_deduct_credits,
+    ):
+        deduct_llm_quota_for_model(
+            tenant_id="tenant-id",
+            provider="openai",
+            model="gpt-4o",
+            usage=usage,
+        )
+
+    mock_deduct_credits.assert_not_called()
+
+
+def test_deduct_llm_quota_for_model_uses_credit_configuration() -> None:
+    usage = LLMUsage.empty_usage()
+    provider_configuration = SimpleNamespace(
+        using_provider_type=ProviderType.SYSTEM,
+        system_configuration=SimpleNamespace(
+            current_quota_type=ProviderQuotaType.TRIAL,
+            quota_configurations=[
+                SimpleNamespace(
+                    quota_type=ProviderQuotaType.TRIAL,
+                    quota_unit=QuotaUnit.CREDITS,
+                    quota_limit=100,
+                )
+            ],
+        ),
+    )
+    provider_manager = MagicMock()
+    provider_manager.get_configurations.return_value.get.return_value = provider_configuration
+
+    with (
+        patch("core.app.llm.quota.create_plugin_provider_manager", return_value=provider_manager),
+        patch.object(type(dify_config), "get_model_credits", return_value=9) as mock_get_model_credits,
+        patch("services.credit_pool_service.CreditPoolService.deduct_credits_capped") as mock_deduct_credits,
+    ):
+        deduct_llm_quota_for_model(
+            tenant_id="tenant-id",
+            provider="openai",
+            model="gpt-4o",
+            usage=usage,
+        )
+
+    mock_get_model_credits.assert_called_once_with("gpt-4o")
+    mock_deduct_credits.assert_called_once_with(
+        tenant_id="tenant-id",
+        credits_required=9,
+    )
+
+
+def test_deduct_llm_quota_for_model_uses_single_charge_for_times_quota() -> None:
+    usage = LLMUsage.empty_usage()
+    provider_configuration = SimpleNamespace(
+        using_provider_type=ProviderType.SYSTEM,
+        system_configuration=SimpleNamespace(
+            current_quota_type=ProviderQuotaType.TRIAL,
+            quota_configurations=[
+                SimpleNamespace(
+                    quota_type=ProviderQuotaType.TRIAL,
+                    quota_unit=QuotaUnit.TIMES,
+                    quota_limit=100,
+                )
+            ],
+        ),
+    )
+    provider_manager = MagicMock()
+    provider_manager.get_configurations.return_value.get.return_value = provider_configuration
+
+    with (
+        patch("core.app.llm.quota.create_plugin_provider_manager", return_value=provider_manager),
+        patch("services.credit_pool_service.CreditPoolService.deduct_credits_capped") as mock_deduct_credits,
+    ):
+        deduct_llm_quota_for_model(
+            tenant_id="tenant-id",
+            provider="openai",
+            model="gpt-4o",
+            usage=usage,
+        )
+
+    mock_deduct_credits.assert_called_once_with(
+        tenant_id="tenant-id",
+        credits_required=1,
+    )
+
+
+def test_deduct_llm_quota_for_model_uses_paid_billing_pool() -> None:
+    usage = LLMUsage.empty_usage()
+    usage.total_tokens = 5
+    provider_configuration = SimpleNamespace(
+        using_provider_type=ProviderType.SYSTEM,
+        system_configuration=SimpleNamespace(
+            current_quota_type=ProviderQuotaType.PAID,
+            quota_configurations=[
+                SimpleNamespace(
+                    quota_type=ProviderQuotaType.PAID,
+                    quota_unit=QuotaUnit.TOKENS,
+                    quota_limit=100,
+                )
+            ],
+        ),
+    )
+    provider_manager = MagicMock()
+    provider_manager.get_configurations.return_value.get.return_value = provider_configuration
+
+    with (
+        patch("core.app.llm.quota.create_plugin_provider_manager", return_value=provider_manager),
+        patch("services.credit_pool_service.CreditPoolService.deduct_credits_capped") as mock_deduct_credits,
+    ):
+        deduct_llm_quota_for_model(
+            tenant_id="tenant-id",
+            provider="openai",
+            model="gpt-4o",
+            usage=usage,
+        )
+
+    mock_deduct_credits.assert_called_once_with(
+        tenant_id="tenant-id",
+        credits_required=5,
+        pool_type="paid",
+    )
+
+
+def test_deduct_llm_quota_for_model_updates_free_quota_usage() -> None:
+    usage = LLMUsage.empty_usage()
+    usage.total_tokens = 3
+    provider_configuration = SimpleNamespace(
+        using_provider_type=ProviderType.SYSTEM,
+        system_configuration=SimpleNamespace(
+            current_quota_type=ProviderQuotaType.FREE,
+            quota_configurations=[
+                SimpleNamespace(
+                    quota_type=ProviderQuotaType.FREE,
+                    quota_unit=QuotaUnit.TOKENS,
+                    quota_limit=100,
+                )
+            ],
+        ),
+    )
+    provider_manager = MagicMock()
+    provider_manager.get_configurations.return_value.get.return_value = provider_configuration
+    engine = create_engine("sqlite:///:memory:")
+    Provider.__table__.create(engine)
+    with engine.begin() as connection:
+        connection.execute(
+            Provider.__table__.insert(),
+            [
+                {
+                    "id": "matching-provider",
+                    "tenant_id": "tenant-id",
+                    "provider_name": "openai",
+                    "provider_type": ProviderType.SYSTEM,
+                    "quota_type": ProviderQuotaType.FREE,
+                    "quota_limit": 100,
+                    "quota_used": 10,
+                    "is_valid": True,
+                },
+                {
+                    "id": "other-tenant",
+                    "tenant_id": "other-tenant-id",
+                    "provider_name": "openai",
+                    "provider_type": ProviderType.SYSTEM,
+                    "quota_type": ProviderQuotaType.FREE,
+                    "quota_limit": 100,
+                    "quota_used": 20,
+                    "is_valid": True,
+                },
+                {
+                    "id": "other-provider",
+                    "tenant_id": "tenant-id",
+                    "provider_name": "anthropic",
+                    "provider_type": ProviderType.SYSTEM,
+                    "quota_type": ProviderQuotaType.FREE,
+                    "quota_limit": 100,
+                    "quota_used": 30,
+                    "is_valid": True,
+                },
+                {
+                    "id": "custom-provider",
+                    "tenant_id": "tenant-id",
+                    "provider_name": "openai",
+                    "provider_type": ProviderType.CUSTOM,
+                    "quota_type": ProviderQuotaType.FREE,
+                    "quota_limit": 100,
+                    "quota_used": 40,
+                    "is_valid": True,
+                },
+            ],
+        )
+
+    with (
+        patch("core.app.llm.quota.create_plugin_provider_manager", return_value=provider_manager),
+        patch("core.app.llm.quota.db", SimpleNamespace(engine=engine)),
+    ):
+        deduct_llm_quota_for_model(
+            tenant_id="tenant-id",
+            provider="openai",
+            model="gpt-4o",
+            usage=usage,
+        )
+
+    with engine.connect() as connection:
+        quota_used_by_id = dict(connection.execute(select(Provider.id, Provider.quota_used)).all())
+
+    assert quota_used_by_id == {
+        "matching-provider": 13,
+        "other-tenant": 20,
+        "other-provider": 30,
+        "custom-provider": 40,
+    }
+
+    with engine.begin() as connection:
+        connection.execute(
+            Provider.__table__.update().where(Provider.id == "matching-provider").values(quota_limit=13, quota_used=13)
+        )
+
+    with (
+        patch("core.app.llm.quota.create_plugin_provider_manager", return_value=provider_manager),
+        patch("core.app.llm.quota.db", SimpleNamespace(engine=engine)),
+        pytest.raises(QuotaExceededError, match="Model provider openai quota exceeded."),
+    ):
+        deduct_llm_quota_for_model(
+            tenant_id="tenant-id",
+            provider="openai",
+            model="gpt-4o",
+            usage=usage,
+        )
+
+    with engine.connect() as connection:
+        exhausted_quota_used = connection.scalar(select(Provider.quota_used).where(Provider.id == "matching-provider"))
+
+    assert exhausted_quota_used == 13
+
+
+def test_deduct_llm_quota_for_model_caps_free_quota_and_raises_when_usage_exceeds_remaining() -> None:
+    usage = LLMUsage.empty_usage()
+    usage.total_tokens = 3
+    provider_configuration = SimpleNamespace(
+        using_provider_type=ProviderType.SYSTEM,
+        system_configuration=SimpleNamespace(
+            current_quota_type=ProviderQuotaType.FREE,
+            quota_configurations=[
+                SimpleNamespace(
+                    quota_type=ProviderQuotaType.FREE,
+                    quota_unit=QuotaUnit.TOKENS,
+                    quota_limit=100,
+                )
+            ],
+        ),
+    )
+    provider_manager = MagicMock()
+    provider_manager.get_configurations.return_value.get.return_value = provider_configuration
+    engine = create_engine("sqlite:///:memory:")
+    Provider.__table__.create(engine)
+    with engine.begin() as connection:
+        connection.execute(
+            Provider.__table__.insert(),
+            {
+                "id": "matching-provider",
+                "tenant_id": "tenant-id",
+                "provider_name": "openai",
+                "provider_type": ProviderType.SYSTEM,
+                "quota_type": ProviderQuotaType.FREE,
+                "quota_limit": 15,
+                "quota_used": 13,
+                "is_valid": True,
+            },
+        )
+
+    with (
+        patch("core.app.llm.quota.create_plugin_provider_manager", return_value=provider_manager),
+        patch("core.app.llm.quota.db", SimpleNamespace(engine=engine)),
+        pytest.raises(QuotaExceededError, match="Model provider openai quota exceeded."),
+    ):
+        deduct_llm_quota_for_model(
+            tenant_id="tenant-id",
+            provider="openai",
+            model="gpt-4o",
+            usage=usage,
+        )
+
+    with engine.connect() as connection:
+        quota_used = connection.scalar(select(Provider.quota_used).where(Provider.id == "matching-provider"))
+
+    assert quota_used == 15
+
+
+def test_deduct_llm_quota_for_model_ignores_unknown_quota_type() -> None:
+    usage = LLMUsage.empty_usage()
+    usage.total_tokens = 2
+    provider_configuration = SimpleNamespace(
+        using_provider_type=ProviderType.SYSTEM,
+        system_configuration=SimpleNamespace(
+            current_quota_type="unexpected",
+            quota_configurations=[
+                SimpleNamespace(
+                    quota_type="unexpected",
+                    quota_unit=QuotaUnit.TOKENS,
+                    quota_limit=100,
+                )
+            ],
+        ),
+    )
+    provider_manager = MagicMock()
+    provider_manager.get_configurations.return_value.get.return_value = provider_configuration
+
+    with (
+        patch("core.app.llm.quota.create_plugin_provider_manager", return_value=provider_manager),
+        patch("services.credit_pool_service.CreditPoolService.deduct_credits_capped") as mock_deduct_credits,
+        patch("core.app.llm.quota.sessionmaker") as mock_sessionmaker,
+    ):
+        deduct_llm_quota_for_model(
+            tenant_id="tenant-id",
+            provider="openai",
+            model="gpt-4o",
+            usage=usage,
+        )
+
+    mock_deduct_credits.assert_not_called()
+    mock_sessionmaker.assert_not_called()
+
+
+def test_deduct_llm_quota_for_model_ignores_custom_provider_configuration() -> None:
+    usage = LLMUsage.empty_usage()
+    usage.total_tokens = 2
+    provider_configuration = SimpleNamespace(
+        using_provider_type=ProviderType.CUSTOM,
+        system_configuration=SimpleNamespace(
+            current_quota_type=ProviderQuotaType.TRIAL,
+            quota_configurations=[],
+        ),
+    )
+    provider_manager = MagicMock()
+    provider_manager.get_configurations.return_value.get.return_value = provider_configuration
+
+    with (
+        patch("core.app.llm.quota.create_plugin_provider_manager", return_value=provider_manager),
+        patch("services.credit_pool_service.CreditPoolService.deduct_credits_capped") as mock_deduct_credits,
+        patch("core.app.llm.quota.sessionmaker") as mock_sessionmaker,
+    ):
+        deduct_llm_quota_for_model(
+            tenant_id="tenant-id",
+            provider="openai",
+            model="gpt-4o",
+            usage=usage,
+        )
+
+    mock_deduct_credits.assert_not_called()
+    mock_sessionmaker.assert_not_called()
+
+
+def test_ensure_llm_quota_available_wrapper_warns_and_delegates() -> None:
+    model_instance = SimpleNamespace(
+        provider="openai",
+        model_name="gpt-4o",
+        provider_model_bundle=SimpleNamespace(configuration=SimpleNamespace(tenant_id="tenant-id")),
+        model_type_instance=SimpleNamespace(model_type=ModelType.LLM),
+    )
+
+    with (
+        pytest.deprecated_call(match="ensure_llm_quota_available\\(model_instance=.*deprecated"),
+        patch("core.app.llm.quota.ensure_llm_quota_available_for_model") as mock_ensure,
+    ):
+        ensure_llm_quota_available(model_instance=model_instance)
+
+    mock_ensure.assert_called_once_with(
+        tenant_id="tenant-id",
+        provider="openai",
+        model="gpt-4o",
+    )
+
+
+def test_ensure_llm_quota_available_wrapper_rejects_non_llm_model_instances() -> None:
+    model_instance = SimpleNamespace(
+        provider="openai",
+        model_name="gpt-4o",
+        provider_model_bundle=SimpleNamespace(configuration=SimpleNamespace(tenant_id="tenant-id")),
+        model_type_instance=SimpleNamespace(model_type=ModelType.TEXT_EMBEDDING),
+    )
+
+    with (
+        pytest.deprecated_call(match="ensure_llm_quota_available\\(model_instance=.*deprecated"),
+        pytest.raises(ValueError, match="only support LLM model instances"),
+    ):
+        ensure_llm_quota_available(model_instance=model_instance)
+
+
+def test_deduct_llm_quota_wrapper_warns_and_delegates() -> None:
+    usage = LLMUsage.empty_usage()
+    usage.total_tokens = 7
+    model_instance = SimpleNamespace(
+        provider="openai",
+        model_name="gpt-4o",
+        model_type_instance=SimpleNamespace(model_type=ModelType.LLM),
+        provider_model_bundle=SimpleNamespace(configuration=SimpleNamespace()),
+    )
+
+    with (
+        pytest.deprecated_call(match="deduct_llm_quota\\(tenant_id=.*deprecated"),
+        patch("core.app.llm.quota.deduct_llm_quota_for_model") as mock_deduct,
+    ):
+        deduct_llm_quota(
+            tenant_id="tenant-id",
+            model_instance=model_instance,
+            usage=usage,
+        )
+
+    mock_deduct.assert_called_once_with(
+        tenant_id="tenant-id",
+        provider="openai",
+        model="gpt-4o",
+        usage=usage,
+    )
+
+
+def test_deduct_llm_quota_wrapper_rejects_non_llm_model_instances() -> None:
+    usage = LLMUsage.empty_usage()
+    model_instance = SimpleNamespace(
+        provider="openai",
+        model_name="gpt-4o",
+        model_type_instance=SimpleNamespace(model_type=ModelType.TEXT_EMBEDDING),
+        provider_model_bundle=SimpleNamespace(configuration=SimpleNamespace()),
+    )
+
+    with (
+        pytest.deprecated_call(match="deduct_llm_quota\\(tenant_id=.*deprecated"),
+        pytest.raises(ValueError, match="only support LLM model instances"),
+    ):
+        deduct_llm_quota(
+            tenant_id="tenant-id",
+            model_instance=model_instance,
+            usage=usage,
+        )
diff --git a/api/tests/unit_tests/core/app/workflow/test_node_factory.py b/api/tests/unit_tests/core/app/workflow/test_node_factory.py
index 30a068f4c5..addce649d5 100644
--- a/api/tests/unit_tests/core/app/workflow/test_node_factory.py
+++ b/api/tests/unit_tests/core/app/workflow/test_node_factory.py
@@ -8,9 +8,9 @@ from graphon.enums import BuiltinNodeTypes
 
 
 class DummyNode:
-    def __init__(self, *, node_id, config, graph_init_params, graph_runtime_state, **kwargs):
+    def __init__(self, *, node_id, data, graph_init_params, graph_runtime_state, **kwargs):
         self.id = node_id
-        self.config = config
+        self.data = data
         self.graph_init_params = graph_init_params
         self.graph_runtime_state = graph_runtime_state
         self.kwargs = kwargs
@@ -46,7 +46,7 @@ class TestDifyNodeFactory:
             lambda **_kwargs: node_class,
         )
 
-    def _factory(self, monkeypatch):
+    def _factory(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr("core.workflow.node_factory.dify_config.CODE_MAX_STRING_LENGTH", 10)
         monkeypatch.setattr("core.workflow.node_factory.dify_config.CODE_MAX_NUMBER", 10)
         monkeypatch.setattr("core.workflow.node_factory.dify_config.CODE_MIN_NUMBER", -10)
@@ -72,20 +72,20 @@ class TestDifyNodeFactory:
             graph_runtime_state=SimpleNamespace(),
         )
 
-    def test_create_node_unknown_type(self, monkeypatch):
+    def test_create_node_unknown_type(self, monkeypatch: pytest.MonkeyPatch):
         factory = self._factory(monkeypatch)
 
         with pytest.raises(ValueError):
             factory.create_node({"id": "node-1", "data": {"type": "unknown"}})
 
-    def test_create_node_missing_mapping(self, monkeypatch):
+    def test_create_node_missing_mapping(self, monkeypatch: pytest.MonkeyPatch):
         factory = self._factory(monkeypatch)
         monkeypatch.setattr("core.workflow.node_factory.get_node_type_classes_mapping", lambda: {})
 
         with pytest.raises(ValueError):
             factory.create_node({"id": "node-1", "data": {"type": BuiltinNodeTypes.START}})
 
-    def test_create_node_missing_latest_class(self, monkeypatch):
+    def test_create_node_missing_latest_class(self, monkeypatch: pytest.MonkeyPatch):
         factory = self._factory(monkeypatch)
         monkeypatch.setattr(
             "core.workflow.node_factory.get_node_type_classes_mapping",
@@ -96,7 +96,7 @@ class TestDifyNodeFactory:
         with pytest.raises(ValueError):
             factory.create_node({"id": "node-1", "data": {"type": BuiltinNodeTypes.START}})
 
-    def test_create_node_selects_versioned_class(self, monkeypatch):
+    def test_create_node_selects_versioned_class(self, monkeypatch: pytest.MonkeyPatch):
         factory = self._factory(monkeypatch)
         selected_versions: list[tuple[str, str]] = []
 
@@ -115,7 +115,7 @@ class TestDifyNodeFactory:
         assert node.id == "node-1"
         assert selected_versions == [("snapshot", "called")]
 
-    def test_create_node_code_branch(self, monkeypatch):
+    def test_create_node_code_branch(self, monkeypatch: pytest.MonkeyPatch):
         factory = self._factory(monkeypatch)
         self._stub_node_resolution(monkeypatch, DummyCodeNode)
 
@@ -124,7 +124,7 @@ class TestDifyNodeFactory:
         assert isinstance(node, DummyCodeNode)
         assert node.id == "node-1"
 
-    def test_create_node_template_transform_branch(self, monkeypatch):
+    def test_create_node_template_transform_branch(self, monkeypatch: pytest.MonkeyPatch):
         factory = self._factory(monkeypatch)
         self._stub_node_resolution(monkeypatch, DummyTemplateTransformNode)
 
@@ -133,7 +133,7 @@ class TestDifyNodeFactory:
         assert isinstance(node, DummyTemplateTransformNode)
         assert "jinja2_template_renderer" in node.kwargs
 
-    def test_create_node_http_request_branch(self, monkeypatch):
+    def test_create_node_http_request_branch(self, monkeypatch: pytest.MonkeyPatch):
         factory = self._factory(monkeypatch)
         self._stub_node_resolution(monkeypatch, DummyHttpRequestNode)
 
@@ -142,7 +142,7 @@ class TestDifyNodeFactory:
         assert isinstance(node, DummyHttpRequestNode)
         assert "http_request_config" in node.kwargs
 
-    def test_create_node_knowledge_retrieval_branch(self, monkeypatch):
+    def test_create_node_knowledge_retrieval_branch(self, monkeypatch: pytest.MonkeyPatch):
         factory = self._factory(monkeypatch)
         self._stub_node_resolution(monkeypatch, DummyKnowledgeRetrievalNode)
 
@@ -151,7 +151,7 @@ class TestDifyNodeFactory:
         assert isinstance(node, DummyKnowledgeRetrievalNode)
         assert node.kwargs == {}
 
-    def test_create_node_document_extractor_branch(self, monkeypatch):
+    def test_create_node_document_extractor_branch(self, monkeypatch: pytest.MonkeyPatch):
         factory = self._factory(monkeypatch)
         self._stub_node_resolution(monkeypatch, DummyDocumentExtractorNode)
 
diff --git a/api/tests/unit_tests/core/app/workflow/test_observability_layer_extra.py b/api/tests/unit_tests/core/app/workflow/test_observability_layer_extra.py
index 82552470a9..04ce524904 100644
--- a/api/tests/unit_tests/core/app/workflow/test_observability_layer_extra.py
+++ b/api/tests/unit_tests/core/app/workflow/test_observability_layer_extra.py
@@ -2,12 +2,14 @@ from __future__ import annotations
 
 from types import SimpleNamespace
 
+import pytest
+
 from core.app.workflow.layers.observability import ObservabilityLayer
 from graphon.enums import BuiltinNodeTypes
 
 
 class TestObservabilityLayerExtras:
-    def test_init_tracer_enabled_sets_tracer(self, monkeypatch):
+    def test_init_tracer_enabled_sets_tracer(self, monkeypatch: pytest.MonkeyPatch):
         tracer = object()
         monkeypatch.setattr("core.app.workflow.layers.observability.dify_config.ENABLE_OTEL", True)
         monkeypatch.setattr("core.app.workflow.layers.observability.is_instrument_flag_enabled", lambda: False)
@@ -18,7 +20,7 @@ class TestObservabilityLayerExtras:
         assert layer._is_disabled is False
         assert layer._tracer is tracer
 
-    def test_init_tracer_disables_when_get_tracer_fails(self, monkeypatch, caplog):
+    def test_init_tracer_disables_when_get_tracer_fails(self, monkeypatch: pytest.MonkeyPatch, caplog):
         monkeypatch.setattr("core.app.workflow.layers.observability.dify_config.ENABLE_OTEL", True)
         monkeypatch.setattr("core.app.workflow.layers.observability.is_instrument_flag_enabled", lambda: False)
 
@@ -33,7 +35,7 @@ class TestObservabilityLayerExtras:
         assert layer._tracer is None
         assert "Failed to get OpenTelemetry tracer" in caplog.text
 
-    def test_init_tracer_disables_when_otel_disabled(self, monkeypatch):
+    def test_init_tracer_disables_when_otel_disabled(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr("core.app.workflow.layers.observability.dify_config.ENABLE_OTEL", False)
         monkeypatch.setattr("core.app.workflow.layers.observability.is_instrument_flag_enabled", lambda: False)
 
@@ -143,7 +145,7 @@ class TestObservabilityLayerExtras:
 
         assert layer._node_contexts == {}
 
-    def test_on_node_run_end_calls_span_end(self, monkeypatch):
+    def test_on_node_run_end_calls_span_end(self, monkeypatch: pytest.MonkeyPatch):
         layer = ObservabilityLayer()
         layer._is_disabled = False
         ended: list[str] = []
@@ -164,7 +166,7 @@ class TestObservabilityLayerExtras:
         assert ended == ["ended"]
         assert "exec" not in layer._node_contexts
 
-    def test_on_node_run_end_logs_detach_failure(self, monkeypatch, caplog):
+    def test_on_node_run_end_logs_detach_failure(self, monkeypatch: pytest.MonkeyPatch, caplog):
         layer = ObservabilityLayer()
         layer._is_disabled = False
 
@@ -186,7 +188,7 @@ class TestObservabilityLayerExtras:
         assert "Failed to detach OpenTelemetry token" in caplog.text
         assert "exec" not in layer._node_contexts
 
-    def test_on_node_run_start_and_end_creates_span(self, monkeypatch):
+    def test_on_node_run_start_and_end_creates_span(self, monkeypatch: pytest.MonkeyPatch):
         layer = ObservabilityLayer()
         layer._is_disabled = False
 
diff --git a/api/tests/unit_tests/core/app/workflow/test_persistence_layer.py b/api/tests/unit_tests/core/app/workflow/test_persistence_layer.py
index cacb4dd4fa..9cefa97bef 100644
--- a/api/tests/unit_tests/core/app/workflow/test_persistence_layer.py
+++ b/api/tests/unit_tests/core/app/workflow/test_persistence_layer.py
@@ -7,6 +7,7 @@ import pytest
 
 from core.app.entities.app_invoke_entities import WorkflowAppGenerateEntity
 from core.app.workflow.layers.persistence import PersistenceWorkflowInfo, WorkflowPersistenceLayer
+from core.ops.ops_trace_manager import TraceTask, TraceTaskName
 from core.workflow.system_variables import SystemVariableKey, build_system_variables
 from graphon.entities import WorkflowNodeExecution
 from graphon.entities.pause_reason import SchedulingPause
@@ -60,7 +61,10 @@ def _make_layer(
         workflow_execution_id="run-id",
         conversation_id="conv-id",
     )
-    runtime_state = GraphRuntimeState(variable_pool=VariablePool(system_variables=system_variables), start_at=0.0)
+    runtime_state = GraphRuntimeState(
+        variable_pool=VariablePool.from_bootstrap(system_variables=system_variables),
+        start_at=0.0,
+    )
     read_only_state = ReadOnlyGraphRuntimeStateWrapper(runtime_state)
 
     application_generate_entity = WorkflowAppGenerateEntity.model_construct(
@@ -120,7 +124,7 @@ class TestWorkflowPersistenceLayer:
         with pytest.raises(ValueError, match="workflow_execution_id must be provided"):
             layer._get_execution_id()
 
-    def test_prepare_workflow_inputs_excludes_conversation_id(self, monkeypatch):
+    def test_prepare_workflow_inputs_excludes_conversation_id(self, monkeypatch: pytest.MonkeyPatch):
         layer, _, _, _ = _make_layer()
 
         monkeypatch.setattr(
@@ -214,6 +218,59 @@ class TestWorkflowPersistenceLayer:
         assert exec_repo.saved[-1].status == WorkflowExecutionStatus.FAILED
         assert trace_tasks
 
+    def test_handle_graph_run_succeeded_enqueues_parent_trace_context(self, monkeypatch):
+        trace_tasks: list[TraceTask] = []
+        trace_manager = SimpleNamespace(user_id="user", add_trace_task=lambda task: trace_tasks.append(task))
+        layer, _, _, _ = _make_layer(
+            extras={
+                "external_trace_id": "trace",
+                "parent_trace_context": {
+                    "parent_workflow_run_id": "outer-workflow-run-1",
+                    "parent_node_execution_id": "outer-node-execution-1",
+                },
+            },
+            trace_manager=trace_manager,
+        )
+        layer._handle_graph_run_started()
+
+        captured: dict[str, object] = {}
+
+        def fake_workflow_trace(
+            self: TraceTask,
+            *,
+            workflow_run_id: str | None,
+            conversation_id: str | None,
+            user_id: str | None,
+            total_tokens_override: int | None = None,
+        ):
+            captured["trace_type"] = self.trace_type
+            captured["external_trace_id"] = self.kwargs.get("external_trace_id")
+            captured["parent_trace_context"] = self.kwargs.get("parent_trace_context")
+            captured["workflow_run_id"] = workflow_run_id
+            return {"ok": True}
+
+        monkeypatch.setattr(TraceTask, "workflow_trace", fake_workflow_trace)
+
+        layer._handle_graph_run_succeeded(GraphRunSucceededEvent(outputs={"ok": True}))
+
+        assert trace_tasks
+        trace_task = trace_tasks[0]
+        assert trace_task.trace_type == TraceTaskName.WORKFLOW_TRACE
+        assert trace_task.kwargs["external_trace_id"] == "trace"
+        assert trace_task.kwargs["parent_trace_context"] == {
+            "parent_workflow_run_id": "outer-workflow-run-1",
+            "parent_node_execution_id": "outer-node-execution-1",
+        }
+
+        trace_task.execute()
+
+        assert captured["trace_type"] == TraceTaskName.WORKFLOW_TRACE
+        assert captured["external_trace_id"] == "trace"
+        assert captured["parent_trace_context"] == {
+            "parent_workflow_run_id": "outer-workflow-run-1",
+            "parent_node_execution_id": "outer-node-execution-1",
+        }
+
     def test_handle_graph_run_aborted_sets_status(self):
         layer, exec_repo, _, _ = _make_layer()
         layer._handle_graph_run_started()
diff --git a/api/tests/unit_tests/core/base/test_app_generator_tts_publisher.py b/api/tests/unit_tests/core/base/test_app_generator_tts_publisher.py
index 7b433ab57b..1125ce6dbc 100644
--- a/api/tests/unit_tests/core/base/test_app_generator_tts_publisher.py
+++ b/api/tests/unit_tests/core/base/test_app_generator_tts_publisher.py
@@ -3,6 +3,7 @@ import queue
 from unittest.mock import MagicMock
 
 import pytest
+from pytest_mock import MockerFixture
 
 from core.base.tts.app_generator_tts_publisher import (
     AppGeneratorTTSPublisher,
@@ -17,7 +18,7 @@ from core.base.tts.app_generator_tts_publisher import (
 
 
 @pytest.fixture
-def mock_model_instance(mocker):
+def mock_model_instance(mocker: MockerFixture):
     model = mocker.MagicMock()
     model.invoke_tts.return_value = [b"audio1", b"audio2"]
     model.get_tts_voices.return_value = [{"value": "voice1"}, {"value": "voice2"}]
@@ -33,7 +34,7 @@ def mock_model_manager(mocker, mock_model_instance):
 
 
 @pytest.fixture(autouse=True)
-def patch_threads(mocker):
+def patch_threads(mocker: MockerFixture):
     """Prevent real threads from starting during tests"""
     mocker.patch("threading.Thread.start", return_value=None)
 
@@ -114,7 +115,7 @@ class TestProcessFuture:
         finish = audio_queue.get()
         assert finish.status == "finish"
 
-    def test_process_future_exception(self, mocker):
+    def test_process_future_exception(self, mocker: MockerFixture):
         future_queue = queue.Queue()
         audio_queue = queue.Queue()
 
@@ -222,7 +223,7 @@ class TestAppGeneratorTTSPublisher:
 
         publisher.executor.submit.assert_not_called()
 
-    def test_runtime_sentence_threshold_triggers_submit(self, mock_model_manager, mocker):
+    def test_runtime_sentence_threshold_triggers_submit(self, mock_model_manager, mocker: MockerFixture):
         publisher = AppGeneratorTTSPublisher("tenant", "voice1")
         publisher.executor = MagicMock()
 
@@ -297,7 +298,7 @@ class TestAppGeneratorTTSPublisher:
 
         publisher.executor.submit.assert_not_called()
 
-    def test_runtime_handles_agent_message_event_list_content(self, mock_model_manager, mocker):
+    def test_runtime_handles_agent_message_event_list_content(self, mock_model_manager, mocker: MockerFixture):
         publisher = AppGeneratorTTSPublisher("tenant", "voice1")
         publisher.executor = MagicMock()
 
@@ -332,7 +333,7 @@ class TestAppGeneratorTTSPublisher:
 
         assert publisher.msg_text == "Hello "
 
-    def test_runtime_handles_agent_message_event_empty_content(self, mock_model_manager, mocker):
+    def test_runtime_handles_agent_message_event_empty_content(self, mock_model_manager, mocker: MockerFixture):
         publisher = AppGeneratorTTSPublisher("tenant", "voice1")
         publisher.executor = MagicMock()
 
@@ -358,7 +359,7 @@ class TestAppGeneratorTTSPublisher:
 
         assert publisher.msg_text == ""
 
-    def test_runtime_resets_msg_text_when_text_tmp_not_str(self, mock_model_manager, mocker):
+    def test_runtime_resets_msg_text_when_text_tmp_not_str(self, mock_model_manager, mocker: MockerFixture):
         publisher = AppGeneratorTTSPublisher("tenant", "voice1")
         publisher.executor = MagicMock()
 
diff --git a/api/tests/unit_tests/core/callback_handler/test_agent_tool_callback_handler.py b/api/tests/unit_tests/core/callback_handler/test_agent_tool_callback_handler.py
index 4c1aa33540..f9b3b1864e 100644
--- a/api/tests/unit_tests/core/callback_handler/test_agent_tool_callback_handler.py
+++ b/api/tests/unit_tests/core/callback_handler/test_agent_tool_callback_handler.py
@@ -1,8 +1,10 @@
 from unittest.mock import MagicMock
 
 import pytest
+from pytest_mock import MockerFixture
 
 import core.callback_handler.agent_tool_callback_handler as module
+from core.callback_handler.agent_tool_callback_handler import DifyAgentCallbackHandler
 
 # -----------------------------
 # Fixtures
@@ -10,17 +12,17 @@ import core.callback_handler.agent_tool_callback_handler as module
 
 
 @pytest.fixture
-def enable_debug(mocker):
+def enable_debug(mocker: MockerFixture):
     mocker.patch.object(module.dify_config, "DEBUG", True)
 
 
 @pytest.fixture
-def disable_debug(mocker):
+def disable_debug(mocker: MockerFixture):
     mocker.patch.object(module.dify_config, "DEBUG", False)
 
 
 @pytest.fixture
-def mock_print(mocker):
+def mock_print(mocker: MockerFixture):
     return mocker.patch("builtins.print")
 
 
@@ -71,7 +73,7 @@ class TestPrintText:
         module.print_text("hello")
         mock_print.assert_called_once_with("hello", end="", file=None)
 
-    def test_print_text_with_color(self, mocker, mock_print):
+    def test_print_text_with_color(self, mocker: MockerFixture, mock_print):
         mock_get_color = mocker.patch(
             "core.callback_handler.agent_tool_callback_handler.get_colored_text",
             return_value="colored_text",
@@ -82,7 +84,7 @@ class TestPrintText:
         mock_get_color.assert_called_once_with("hello", "green")
         mock_print.assert_called_once_with("colored_text", end="", file=None)
 
-    def test_print_text_with_file_flush(self, mocker):
+    def test_print_text_with_file_flush(self, mocker: MockerFixture):
         mock_file = MagicMock()
         mock_print = mocker.patch("builtins.print")
 
@@ -107,21 +109,25 @@ class TestDifyAgentCallbackHandler:
         assert handler.color == "green"
         assert handler.current_loop == 1
 
-    def test_on_tool_start_debug_enabled(self, handler, enable_debug, mocker):
+    def test_on_tool_start_debug_enabled(self, handler: DifyAgentCallbackHandler, enable_debug, mocker: MockerFixture):
         mock_print_text = mocker.patch("core.callback_handler.agent_tool_callback_handler.print_text")
 
         handler.on_tool_start("tool1", {"a": 1})
 
         mock_print_text.assert_called()
 
-    def test_on_tool_start_debug_disabled(self, handler, disable_debug, mocker):
+    def test_on_tool_start_debug_disabled(
+        self, handler: DifyAgentCallbackHandler, disable_debug, mocker: MockerFixture
+    ):
         mock_print_text = mocker.patch("core.callback_handler.agent_tool_callback_handler.print_text")
 
         handler.on_tool_start("tool1", {"a": 1})
 
         mock_print_text.assert_not_called()
 
-    def test_on_tool_end_debug_enabled_and_trace(self, handler, enable_debug, mocker):
+    def test_on_tool_end_debug_enabled_and_trace(
+        self, handler: DifyAgentCallbackHandler, enable_debug, mocker: MockerFixture
+    ):
         mock_print_text = mocker.patch("core.callback_handler.agent_tool_callback_handler.print_text")
         mock_trace_manager = MagicMock()
 
@@ -137,7 +143,9 @@ class TestDifyAgentCallbackHandler:
         assert mock_print_text.call_count >= 1
         mock_trace_manager.add_trace_task.assert_called_once()
 
-    def test_on_tool_end_without_trace_manager(self, handler, enable_debug, mocker):
+    def test_on_tool_end_without_trace_manager(
+        self, handler: DifyAgentCallbackHandler, enable_debug, mocker: MockerFixture
+    ):
         mock_print_text = mocker.patch("core.callback_handler.agent_tool_callback_handler.print_text")
 
         handler.on_tool_end(
@@ -148,14 +156,16 @@ class TestDifyAgentCallbackHandler:
 
         assert mock_print_text.call_count >= 1
 
-    def test_on_tool_error_debug_enabled(self, handler, enable_debug, mocker):
+    def test_on_tool_error_debug_enabled(self, handler: DifyAgentCallbackHandler, enable_debug, mocker: MockerFixture):
         mock_print_text = mocker.patch("core.callback_handler.agent_tool_callback_handler.print_text")
 
         handler.on_tool_error(Exception("error"))
 
         mock_print_text.assert_called_once()
 
-    def test_on_tool_error_debug_disabled(self, handler, disable_debug, mocker):
+    def test_on_tool_error_debug_disabled(
+        self, handler: DifyAgentCallbackHandler, disable_debug, mocker: MockerFixture
+    ):
         mock_print_text = mocker.patch("core.callback_handler.agent_tool_callback_handler.print_text")
 
         handler.on_tool_error(Exception("error"))
@@ -163,14 +173,16 @@ class TestDifyAgentCallbackHandler:
         mock_print_text.assert_not_called()
 
     @pytest.mark.parametrize("thought", ["thinking", ""])
-    def test_on_agent_start(self, handler, enable_debug, mocker, thought):
+    def test_on_agent_start(self, handler: DifyAgentCallbackHandler, enable_debug, mocker: MockerFixture, thought):
         mock_print_text = mocker.patch("core.callback_handler.agent_tool_callback_handler.print_text")
 
         handler.on_agent_start(thought)
 
         mock_print_text.assert_called()
 
-    def test_on_agent_finish_increments_loop(self, handler, enable_debug, mocker):
+    def test_on_agent_finish_increments_loop(
+        self, handler: DifyAgentCallbackHandler, enable_debug, mocker: MockerFixture
+    ):
         mock_print_text = mocker.patch("core.callback_handler.agent_tool_callback_handler.print_text")
 
         current_loop = handler.current_loop
@@ -179,19 +191,21 @@ class TestDifyAgentCallbackHandler:
         assert handler.current_loop == current_loop + 1
         mock_print_text.assert_called()
 
-    def test_on_datasource_start_debug_enabled(self, handler, enable_debug, mocker):
+    def test_on_datasource_start_debug_enabled(
+        self, handler: DifyAgentCallbackHandler, enable_debug, mocker: MockerFixture
+    ):
         mock_print_text = mocker.patch("core.callback_handler.agent_tool_callback_handler.print_text")
 
         handler.on_datasource_start("ds1", {"x": 1})
 
         mock_print_text.assert_called_once()
 
-    def test_ignore_agent_property(self, disable_debug, handler):
+    def test_ignore_agent_property(self, disable_debug, handler: DifyAgentCallbackHandler):
         assert handler.ignore_agent is True
 
-    def test_ignore_chat_model_property(self, disable_debug, handler):
+    def test_ignore_chat_model_property(self, disable_debug, handler: DifyAgentCallbackHandler):
         assert handler.ignore_chat_model is True
 
-    def test_ignore_properties_when_debug_enabled(self, enable_debug, handler):
+    def test_ignore_properties_when_debug_enabled(self, enable_debug, handler: DifyAgentCallbackHandler):
         assert handler.ignore_agent is False
         assert handler.ignore_chat_model is False
diff --git a/api/tests/unit_tests/core/callback_handler/test_index_tool_callback_handler.py b/api/tests/unit_tests/core/callback_handler/test_index_tool_callback_handler.py
index 8e5670e9be..f23669c3c7 100644
--- a/api/tests/unit_tests/core/callback_handler/test_index_tool_callback_handler.py
+++ b/api/tests/unit_tests/core/callback_handler/test_index_tool_callback_handler.py
@@ -1,4 +1,5 @@
 import pytest
+from pytest_mock import MockerFixture
 
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.callback_handler.index_tool_callback_handler import (
@@ -7,12 +8,12 @@ from core.callback_handler.index_tool_callback_handler import (
 
 
 @pytest.fixture
-def mock_queue_manager(mocker):
+def mock_queue_manager(mocker: MockerFixture):
     return mocker.Mock()
 
 
 @pytest.fixture
-def handler(mock_queue_manager, mocker):
+def handler(mock_queue_manager, mocker: MockerFixture):
     mocker.patch(
         "core.callback_handler.index_tool_callback_handler.db",
     )
@@ -34,7 +35,7 @@ class TestOnQuery:
             (InvokeFrom.WEB_APP, "end_user"),
         ],
     )
-    def test_on_query_success_roles(self, mocker, mock_queue_manager, invoke_from, expected_role):
+    def test_on_query_success_roles(self, mocker: MockerFixture, mock_queue_manager, invoke_from, expected_role):
         # Arrange
         mock_db = mocker.patch("core.callback_handler.index_tool_callback_handler.db")
 
@@ -57,7 +58,7 @@ class TestOnQuery:
         assert dataset_query.created_by_role == expected_role
         mock_db.session.commit.assert_called_once()
 
-    def test_on_query_none_values(self, mocker, mock_queue_manager):
+    def test_on_query_none_values(self, mocker: MockerFixture, mock_queue_manager):
         mock_db = mocker.patch("core.callback_handler.index_tool_callback_handler.db")
 
         handler = DatasetIndexToolCallbackHandler(
@@ -75,7 +76,7 @@ class TestOnQuery:
 
 
 class TestOnToolEnd:
-    def test_on_tool_end_no_metadata(self, handler, mocker):
+    def test_on_tool_end_no_metadata(self, handler: DatasetIndexToolCallbackHandler, mocker: MockerFixture):
         mock_db = mocker.patch("core.callback_handler.index_tool_callback_handler.db")
 
         document = mocker.Mock()
@@ -85,7 +86,9 @@ class TestOnToolEnd:
 
         mock_db.session.commit.assert_not_called()
 
-    def test_on_tool_end_dataset_document_not_found(self, handler, mocker):
+    def test_on_tool_end_dataset_document_not_found(
+        self, handler: DatasetIndexToolCallbackHandler, mocker: MockerFixture
+    ):
         mock_db = mocker.patch("core.callback_handler.index_tool_callback_handler.db")
         mock_db.session.scalar.return_value = None
 
@@ -96,7 +99,9 @@ class TestOnToolEnd:
 
         mock_db.session.scalar.assert_called_once()
 
-    def test_on_tool_end_parent_child_index_with_child(self, handler, mocker):
+    def test_on_tool_end_parent_child_index_with_child(
+        self, handler: DatasetIndexToolCallbackHandler, mocker: MockerFixture
+    ):
         mock_db = mocker.patch("core.callback_handler.index_tool_callback_handler.db")
 
         mock_dataset_doc = mocker.Mock()
@@ -119,7 +124,7 @@ class TestOnToolEnd:
         mock_db.session.execute.assert_called_once()
         mock_db.session.commit.assert_called_once()
 
-    def test_on_tool_end_non_parent_child_index(self, handler, mocker):
+    def test_on_tool_end_non_parent_child_index(self, handler: DatasetIndexToolCallbackHandler, mocker: MockerFixture):
         mock_db = mocker.patch("core.callback_handler.index_tool_callback_handler.db")
 
         mock_dataset_doc = mocker.Mock()
@@ -139,12 +144,12 @@ class TestOnToolEnd:
         mock_db.session.execute.assert_called_once()
         mock_db.session.commit.assert_called_once()
 
-    def test_on_tool_end_empty_documents(self, handler):
+    def test_on_tool_end_empty_documents(self, handler: DatasetIndexToolCallbackHandler):
         handler.on_tool_end([])
 
 
 class TestReturnRetrieverResourceInfo:
-    def test_publish_called(self, handler, mock_queue_manager, mocker):
+    def test_publish_called(self, handler: DatasetIndexToolCallbackHandler, mock_queue_manager, mocker: MockerFixture):
         mock_event = mocker.patch("core.callback_handler.index_tool_callback_handler.QueueRetrieverResourcesEvent")
 
         resources = [mocker.Mock()]
diff --git a/api/tests/unit_tests/core/callback_handler/test_workflow_tool_callback_handler.py b/api/tests/unit_tests/core/callback_handler/test_workflow_tool_callback_handler.py
index 131fb006ed..5b53c5965c 100644
--- a/api/tests/unit_tests/core/callback_handler/test_workflow_tool_callback_handler.py
+++ b/api/tests/unit_tests/core/callback_handler/test_workflow_tool_callback_handler.py
@@ -1,6 +1,7 @@
 from unittest.mock import MagicMock, call
 
 import pytest
+from pytest_mock import MockerFixture
 
 from core.callback_handler.workflow_tool_callback_handler import (
     DifyWorkflowCallbackHandler,
@@ -26,13 +27,13 @@ def handler():
 
 
 @pytest.fixture
-def mock_print_text(mocker):
+def mock_print_text(mocker: MockerFixture):
     """Mock print_text to avoid real stdout printing."""
     return mocker.patch("core.callback_handler.workflow_tool_callback_handler.print_text")
 
 
 class TestDifyWorkflowCallbackHandler:
-    def test_on_tool_execution_single_output_success(self, handler, mock_print_text):
+    def test_on_tool_execution_single_output_success(self, handler: DifyWorkflowCallbackHandler, mock_print_text):
         # Arrange
         tool_name = "test_tool"
         tool_inputs = {"a": 1}
@@ -62,7 +63,7 @@ class TestDifyWorkflowCallbackHandler:
             ]
         )
 
-    def test_on_tool_execution_multiple_outputs(self, handler, mock_print_text):
+    def test_on_tool_execution_multiple_outputs(self, handler: DifyWorkflowCallbackHandler, mock_print_text):
         # Arrange
         tool_name = "multi_tool"
         outputs = [
@@ -83,7 +84,7 @@ class TestDifyWorkflowCallbackHandler:
         assert results == outputs
         assert mock_print_text.call_count == 4 * len(outputs)
 
-    def test_on_tool_execution_empty_iterable(self, handler, mock_print_text):
+    def test_on_tool_execution_empty_iterable(self, handler: DifyWorkflowCallbackHandler, mock_print_text):
         # Arrange
         tool_name = "empty_tool"
 
@@ -108,7 +109,9 @@ class TestDifyWorkflowCallbackHandler:
             ("not_iterable", AttributeError),
         ],
     )
-    def test_on_tool_execution_invalid_outputs_type(self, handler, invalid_outputs, expected_exception):
+    def test_on_tool_execution_invalid_outputs_type(
+        self, handler: DifyWorkflowCallbackHandler, invalid_outputs, expected_exception
+    ):
         # Arrange
         tool_name = "invalid_tool"
 
@@ -122,7 +125,7 @@ class TestDifyWorkflowCallbackHandler:
                 )
             )
 
-    def test_on_tool_execution_long_json_truncation(self, handler, mock_print_text):
+    def test_on_tool_execution_long_json_truncation(self, handler: DifyWorkflowCallbackHandler, mock_print_text):
         # Arrange
         tool_name = "long_json_tool"
         long_json = "x" * 1500
@@ -144,7 +147,7 @@ class TestDifyWorkflowCallbackHandler:
             color="blue",
         )
 
-    def test_on_tool_execution_model_dump_json_exception(self, handler, mock_print_text):
+    def test_on_tool_execution_model_dump_json_exception(self, handler: DifyWorkflowCallbackHandler, mock_print_text):
         # Arrange
         tool_name = "exception_tool"
         bad_message = MagicMock()
@@ -163,7 +166,9 @@ class TestDifyWorkflowCallbackHandler:
         # Ensure first two prints happened before failure
         assert mock_print_text.call_count >= 2
 
-    def test_on_tool_execution_none_message_id_and_trace_manager(self, handler, mock_print_text):
+    def test_on_tool_execution_none_message_id_and_trace_manager(
+        self, handler: DifyWorkflowCallbackHandler, mock_print_text
+    ):
         # Arrange
         tool_name = "optional_params_tool"
         message = DummyToolInvokeMessage('{"data": "ok"}')
diff --git a/api/tests/unit_tests/core/datasource/test_datasource_file_manager.py b/api/tests/unit_tests/core/datasource/test_datasource_file_manager.py
index 4f39d38831..cee7d46083 100644
--- a/api/tests/unit_tests/core/datasource/test_datasource_file_manager.py
+++ b/api/tests/unit_tests/core/datasource/test_datasource_file_manager.py
@@ -34,20 +34,6 @@ class TestDatasourceFileManager:
         assert f"nonce={mock_urandom.return_value.hex()}" in signed_url
         assert "sign=" in signed_url
 
-    @patch("core.datasource.datasource_file_manager.time.time")
-    @patch("core.datasource.datasource_file_manager.os.urandom")
-    @patch("core.datasource.datasource_file_manager.dify_config")
-    def test_sign_file_empty_secret(self, mock_config, mock_urandom, mock_time):
-        # Setup
-        mock_config.FILES_URL = "http://localhost:5001"
-        mock_config.SECRET_KEY = None  # Empty secret
-        mock_time.return_value = 1700000000
-        mock_urandom.return_value = b"1234567890abcdef"
-
-        # Execute
-        signed_url = DatasourceFileManager.sign_file("file_id", ".png")
-        assert "sign=" in signed_url
-
     @patch("core.datasource.datasource_file_manager.time.time")
     @patch("core.datasource.datasource_file_manager.dify_config")
     def test_verify_file(self, mock_config, mock_time):
@@ -76,25 +62,6 @@ class TestDatasourceFileManager:
         mock_time.return_value = 1700000500  # 700 seconds after timestamp (300 is timeout)
         assert DatasourceFileManager.verify_file(datasource_file_id, timestamp, nonce, encoded_sign) is False
 
-    @patch("core.datasource.datasource_file_manager.time.time")
-    @patch("core.datasource.datasource_file_manager.dify_config")
-    def test_verify_file_empty_secret(self, mock_config, mock_time):
-        # Setup
-        mock_config.SECRET_KEY = ""  # Empty string secret
-        mock_config.FILES_ACCESS_TIMEOUT = 300
-        mock_time.return_value = 1700000000
-
-        datasource_file_id = "file_id_123"
-        timestamp = "1699999800"
-        nonce = "some_nonce"
-
-        # Calculate with empty secret
-        data_to_sign = f"file-preview|{datasource_file_id}|{timestamp}|{nonce}"
-        sign = hmac.new(b"", data_to_sign.encode(), hashlib.sha256).digest()
-        encoded_sign = base64.urlsafe_b64encode(sign).decode()
-
-        assert DatasourceFileManager.verify_file(datasource_file_id, timestamp, nonce, encoded_sign) is True
-
     @patch("core.datasource.datasource_file_manager.db")
     @patch("core.datasource.datasource_file_manager.storage")
     @patch("core.datasource.datasource_file_manager.uuid4")
diff --git a/api/tests/unit_tests/core/datasource/test_datasource_manager.py b/api/tests/unit_tests/core/datasource/test_datasource_manager.py
index deeac49bbc..8842d678c7 100644
--- a/api/tests/unit_tests/core/datasource/test_datasource_manager.py
+++ b/api/tests/unit_tests/core/datasource/test_datasource_manager.py
@@ -2,6 +2,7 @@ import types
 from collections.abc import Generator
 
 import pytest
+from pytest_mock import MockerFixture
 
 from contexts.wrapper import RecyclableContextVar
 from core.datasource.datasource_manager import DatasourceManager
@@ -37,7 +38,7 @@ def _invalidate_recyclable_contextvars() -> None:
     RecyclableContextVar.increment_thread_recycles()
 
 
-def test_get_icon_url_calls_runtime(mocker):
+def test_get_icon_url_calls_runtime(mocker: MockerFixture):
     fake_runtime = mocker.Mock()
     fake_runtime.get_icon_url.return_value = "https://icon"
     mocker.patch.object(DatasourceManager, "get_datasource_runtime", return_value=fake_runtime)
@@ -52,7 +53,7 @@ def test_get_icon_url_calls_runtime(mocker):
     DatasourceManager.get_datasource_runtime.assert_called_once()
 
 
-def test_get_datasource_runtime_delegates_to_provider_controller(mocker):
+def test_get_datasource_runtime_delegates_to_provider_controller(mocker: MockerFixture):
     provider_controller = mocker.Mock()
     provider_controller.get_datasource.return_value = object()
     mocker.patch.object(DatasourceManager, "get_datasource_plugin_provider", return_value=provider_controller)
@@ -114,7 +115,7 @@ def test_get_datasource_plugin_provider_creates_controller_and_caches(mocker, da
     assert ctrl_cls.call_count == 1
 
 
-def test_get_datasource_plugin_provider_raises_when_provider_entity_missing(mocker):
+def test_get_datasource_plugin_provider_raises_when_provider_entity_missing(mocker: MockerFixture):
     _invalidate_recyclable_contextvars()
     mocker.patch(
         "core.datasource.datasource_manager.PluginDatasourceManager.fetch_datasource_provider",
@@ -129,7 +130,7 @@ def test_get_datasource_plugin_provider_raises_when_provider_entity_missing(mock
         )
 
 
-def test_get_datasource_plugin_provider_raises_for_unsupported_type(mocker):
+def test_get_datasource_plugin_provider_raises_for_unsupported_type(mocker: MockerFixture):
     _invalidate_recyclable_contextvars()
     provider_entity = types.SimpleNamespace(declaration=object(), plugin_id="plugin", plugin_unique_identifier="uniq")
     mocker.patch(
@@ -145,7 +146,7 @@ def test_get_datasource_plugin_provider_raises_for_unsupported_type(mocker):
         )
 
 
-def test_get_datasource_plugin_provider_raises_when_controller_none(mocker):
+def test_get_datasource_plugin_provider_raises_when_controller_none(mocker: MockerFixture):
     _invalidate_recyclable_contextvars()
     provider_entity = types.SimpleNamespace(declaration=object(), plugin_id="plugin", plugin_unique_identifier="uniq")
     mocker.patch(
@@ -165,7 +166,7 @@ def test_get_datasource_plugin_provider_raises_when_controller_none(mocker):
         )
 
 
-def test_stream_online_results_yields_messages_online_document(mocker):
+def test_stream_online_results_yields_messages_online_document(mocker: MockerFixture):
     # stub runtime to yield a text message
     def _doc_messages(**_):
         yield from _gen_messages_text_only("hello")
@@ -195,7 +196,7 @@ def test_stream_online_results_yields_messages_online_document(mocker):
     assert msgs[0].message.text == "hello"
 
 
-def test_stream_online_results_sets_credentials_and_returns_empty_dict_online_document(mocker):
+def test_stream_online_results_sets_credentials_and_returns_empty_dict_online_document(mocker: MockerFixture):
     class _Runtime:
         def __init__(self) -> None:
             self.runtime = types.SimpleNamespace(credentials=None)
@@ -229,7 +230,7 @@ def test_stream_online_results_sets_credentials_and_returns_empty_dict_online_do
     assert final_value == {}
 
 
-def test_stream_online_results_raises_when_missing_params(mocker):
+def test_stream_online_results_raises_when_missing_params(mocker: MockerFixture):
     class _Runtime:
         def __init__(self) -> None:
             self.runtime = types.SimpleNamespace(credentials=None)
@@ -279,7 +280,7 @@ def test_stream_online_results_raises_when_missing_params(mocker):
         )
 
 
-def test_stream_online_results_yields_messages_and_returns_empty_dict_online_drive(mocker):
+def test_stream_online_results_yields_messages_and_returns_empty_dict_online_drive(mocker: MockerFixture):
     class _Runtime:
         def __init__(self) -> None:
             self.runtime = types.SimpleNamespace(credentials=None)
@@ -313,7 +314,7 @@ def test_stream_online_results_yields_messages_and_returns_empty_dict_online_dri
     assert final_value == {}
 
 
-def test_stream_online_results_raises_for_unsupported_stream_type(mocker):
+def test_stream_online_results_raises_for_unsupported_stream_type(mocker: MockerFixture):
     mocker.patch.object(DatasourceManager, "get_datasource_runtime", return_value=mocker.Mock())
     mocker.patch(
         "core.datasource.datasource_manager.DatasourceProviderService.get_datasource_credentials",
@@ -337,7 +338,7 @@ def test_stream_online_results_raises_for_unsupported_stream_type(mocker):
         )
 
 
-def test_stream_node_events_emits_events_online_document(mocker):
+def test_stream_node_events_emits_events_online_document(mocker: MockerFixture):
     # make manager's low-level stream produce TEXT only
     mocker.patch.object(
         DatasourceManager,
@@ -370,7 +371,7 @@ def test_stream_node_events_emits_events_online_document(mocker):
     assert events[-1].node_run_result.status == WorkflowNodeExecutionStatus.SUCCEEDED
 
 
-def test_stream_node_events_builds_file_and_variables_from_messages(mocker):
+def test_stream_node_events_builds_file_and_variables_from_messages(mocker: MockerFixture):
     mocker.patch.object(DatasourceManager, "stream_online_results", return_value=_gen_messages_text_only("ignored"))
 
     def _transformed(**_kwargs):
@@ -478,7 +479,7 @@ def test_stream_node_events_builds_file_and_variables_from_messages(mocker):
     assert events[-1].node_run_result.outputs["x"] == 1
 
 
-def test_stream_node_events_raises_when_toolfile_missing(mocker):
+def test_stream_node_events_raises_when_toolfile_missing(mocker: MockerFixture):
     mocker.patch.object(DatasourceManager, "stream_online_results", return_value=_gen_messages_text_only("ignored"))
 
     def _transformed(**_kwargs):
@@ -526,7 +527,7 @@ def test_stream_node_events_raises_when_toolfile_missing(mocker):
         )
 
 
-def test_stream_node_events_online_drive_sets_variable_pool_file_and_outputs(mocker):
+def test_stream_node_events_online_drive_sets_variable_pool_file_and_outputs(mocker: MockerFixture):
     mocker.patch.object(DatasourceManager, "stream_online_results", return_value=_gen_messages_text_only("ignored"))
 
     file_in = File(
@@ -580,7 +581,7 @@ def test_stream_node_events_online_drive_sets_variable_pool_file_and_outputs(moc
     assert completed.node_run_result.outputs["datasource_type"] == DatasourceProviderType.ONLINE_DRIVE
 
 
-def test_stream_node_events_skips_file_build_for_non_online_types(mocker):
+def test_stream_node_events_skips_file_build_for_non_online_types(mocker: MockerFixture):
     mocker.patch.object(DatasourceManager, "stream_online_results", return_value=_gen_messages_text_only("ignored"))
 
     def _transformed(**_kwargs):
@@ -620,7 +621,7 @@ def test_stream_node_events_skips_file_build_for_non_online_types(mocker):
     assert events[-1].node_run_result.outputs["file"] is None
 
 
-def test_get_upload_file_by_id_builds_file(mocker):
+def test_get_upload_file_by_id_builds_file(mocker: MockerFixture):
     # fake UploadFile row
     fake_row = types.SimpleNamespace(
         id="fid",
@@ -654,7 +655,7 @@ def test_get_upload_file_by_id_builds_file(mocker):
     assert f.storage_key == "k"
 
 
-def test_get_upload_file_by_id_raises_when_missing(mocker):
+def test_get_upload_file_by_id_raises_when_missing(mocker: MockerFixture):
     class _S:
         def __enter__(self):
             return self
diff --git a/api/tests/unit_tests/core/entities/test_entities_execution_extra_content.py b/api/tests/unit_tests/core/entities/test_entities_execution_extra_content.py
index ef8f360dbf..2642179992 100644
--- a/api/tests/unit_tests/core/entities/test_entities_execution_extra_content.py
+++ b/api/tests/unit_tests/core/entities/test_entities_execution_extra_content.py
@@ -4,7 +4,7 @@ from core.entities.execution_extra_content import (
     HumanInputFormDefinition,
     HumanInputFormSubmissionData,
 )
-from graphon.nodes.human_input.entities import FormInput, UserAction
+from graphon.nodes.human_input.entities import ParagraphInputConfig, UserActionConfig
 from graphon.nodes.human_input.enums import FormInputType
 from models.execution_extra_content import ExecutionContentType
 
@@ -16,8 +16,8 @@ def test_human_input_content_defaults_and_domain_alias() -> None:
         node_id="node-1",
         node_title="Human Input",
         form_content="Please confirm",
-        inputs=[FormInput(type=FormInputType.TEXT_INPUT, output_variable_name="answer")],
-        actions=[UserAction(id="confirm", title="Confirm")],
+        inputs=[ParagraphInputConfig(type=FormInputType.PARAGRAPH, output_variable_name="answer")],
+        actions=[UserActionConfig(id="confirm", title="Confirm")],
         resolved_default_values={"answer": "yes"},
         expiration_time=1_700_000_000,
     )
diff --git a/api/tests/unit_tests/core/entities/test_entities_provider_configuration.py b/api/tests/unit_tests/core/entities/test_entities_provider_configuration.py
index a28143026f..1b714d6830 100644
--- a/api/tests/unit_tests/core/entities/test_entities_provider_configuration.py
+++ b/api/tests/unit_tests/core/entities/test_entities_provider_configuration.py
@@ -354,7 +354,8 @@ def test_validate_provider_credentials_handles_hidden_secret_value() -> None:
 
     with _patched_session(mock_session):
         with patch(
-            "core.entities.provider_configuration.create_plugin_model_provider_factory", return_value=mock_factory
+            "core.entities.provider_configuration.create_plugin_model_assembly",
+            return_value=SimpleNamespace(model_runtime=Mock(), model_provider_factory=mock_factory),
         ):
             with patch("core.entities.provider_configuration.encrypter.decrypt_token", return_value="restored-key"):
                 with patch(
@@ -379,7 +380,10 @@ def test_validate_provider_credentials_without_credential_id() -> None:
     mock_factory = Mock()
     mock_factory.provider_credentials_validate.return_value = {"region": "us"}
 
-    with patch("core.entities.provider_configuration.create_plugin_model_provider_factory", return_value=mock_factory):
+    with patch(
+        "core.entities.provider_configuration.create_plugin_model_assembly",
+        return_value=SimpleNamespace(model_runtime=Mock(), model_provider_factory=mock_factory),
+    ):
         validated = configuration.validate_provider_credentials(credentials={"region": "us"})
 
     assert validated == {"region": "us"}
@@ -426,23 +430,37 @@ def test_switch_preferred_provider_type_creates_record_when_missing() -> None:
 
 def test_get_model_type_instance_and_schema_delegate_to_factory() -> None:
     configuration = _build_provider_configuration()
-    mock_factory = Mock()
     mock_model_type_instance = Mock()
     mock_schema = _build_ai_model("gpt-4o")
-    mock_factory.get_model_type_instance.return_value = mock_model_type_instance
+    mock_factory = Mock()
+    mock_factory.get_provider_schema.return_value = configuration.provider
     mock_factory.get_model_schema.return_value = mock_schema
+    mock_assembly = Mock()
+    mock_assembly.model_runtime = Mock()
+    mock_assembly.model_provider_factory = mock_factory
 
-    with patch(
-        "core.entities.provider_configuration.create_plugin_model_provider_factory",
-        return_value=mock_factory,
-    ) as mock_factory_builder:
+    with (
+        patch(
+            "core.entities.provider_configuration.create_plugin_model_assembly",
+            return_value=mock_assembly,
+        ) as mock_assembly_builder,
+        patch(
+            "core.entities.provider_configuration.create_model_type_instance",
+            return_value=mock_model_type_instance,
+        ) as mock_model_builder,
+    ):
         model_type_instance = configuration.get_model_type_instance(ModelType.LLM)
         model_schema = configuration.get_model_schema(ModelType.LLM, "gpt-4o", {"api_key": "x"})
 
     assert model_type_instance is mock_model_type_instance
     assert model_schema is mock_schema
-    assert mock_factory_builder.call_count == 2
-    mock_factory.get_model_type_instance.assert_called_once_with(provider="openai", model_type=ModelType.LLM)
+    assert mock_assembly_builder.call_count == 2
+    mock_factory.get_provider_schema.assert_called_once_with(provider="openai")
+    mock_model_builder.assert_called_once_with(
+        runtime=mock_assembly.model_runtime,
+        provider_schema=configuration.provider,
+        model_type=ModelType.LLM,
+    )
     mock_factory.get_model_schema.assert_called_once_with(
         provider="openai",
         model_type=ModelType.LLM,
@@ -456,17 +474,21 @@ def test_get_model_type_instance_and_schema_reuse_bound_runtime_factory() -> Non
     bound_runtime = Mock()
     configuration.bind_model_runtime(bound_runtime)
 
-    mock_factory = Mock()
     mock_model_type_instance = Mock()
     mock_schema = _build_ai_model("gpt-4o")
-    mock_factory.get_model_type_instance.return_value = mock_model_type_instance
+    mock_factory = Mock()
+    mock_factory.get_provider_schema.return_value = configuration.provider
     mock_factory.get_model_schema.return_value = mock_schema
 
     with (
         patch(
             "core.entities.provider_configuration.ModelProviderFactory", return_value=mock_factory
         ) as mock_factory_cls,
-        patch("core.entities.provider_configuration.create_plugin_model_provider_factory") as mock_factory_builder,
+        patch("core.entities.provider_configuration.create_plugin_model_assembly") as mock_assembly_builder,
+        patch(
+            "core.entities.provider_configuration.create_model_type_instance",
+            return_value=mock_model_type_instance,
+        ) as mock_model_builder,
     ):
         model_type_instance = configuration.get_model_type_instance(ModelType.LLM)
         model_schema = configuration.get_model_schema(ModelType.LLM, "gpt-4o", {"api_key": "x"})
@@ -474,8 +496,14 @@ def test_get_model_type_instance_and_schema_reuse_bound_runtime_factory() -> Non
     assert model_type_instance is mock_model_type_instance
     assert model_schema is mock_schema
     assert mock_factory_cls.call_count == 2
-    mock_factory_cls.assert_called_with(model_runtime=bound_runtime)
-    mock_factory_builder.assert_not_called()
+    mock_factory_cls.assert_called_with(runtime=bound_runtime)
+    mock_assembly_builder.assert_not_called()
+    mock_factory.get_provider_schema.assert_called_once_with(provider="openai")
+    mock_model_builder.assert_called_once_with(
+        runtime=bound_runtime,
+        provider_schema=configuration.provider,
+        model_type=ModelType.LLM,
+    )
 
 
 def test_get_provider_model_returns_none_when_model_not_found() -> None:
@@ -504,7 +532,10 @@ def test_get_provider_models_system_deduplicates_sorts_and_filters_active() -> N
     mock_factory = Mock()
     mock_factory.get_provider_schema.return_value = provider_schema
 
-    with patch("core.entities.provider_configuration.create_plugin_model_provider_factory", return_value=mock_factory):
+    with patch(
+        "core.entities.provider_configuration.create_plugin_model_assembly",
+        return_value=SimpleNamespace(model_runtime=Mock(), model_provider_factory=mock_factory),
+    ):
         all_models = configuration.get_provider_models(model_type=ModelType.LLM, only_active=False)
         active_models = configuration.get_provider_models(model_type=ModelType.LLM, only_active=True)
 
@@ -722,7 +753,8 @@ def test_validate_provider_credentials_handles_invalid_original_json() -> None:
 
     with _patched_session(mock_session):
         with patch(
-            "core.entities.provider_configuration.create_plugin_model_provider_factory", return_value=mock_factory
+            "core.entities.provider_configuration.create_plugin_model_assembly",
+            return_value=SimpleNamespace(model_runtime=Mock(), model_provider_factory=mock_factory),
         ):
             with patch("core.entities.provider_configuration.encrypter.encrypt_token", return_value="enc-key"):
                 validated = configuration.validate_provider_credentials(
@@ -1069,7 +1101,8 @@ def test_validate_custom_model_credentials_supports_hidden_reuse_and_sessionless
 
     with _patched_session(mock_session):
         with patch(
-            "core.entities.provider_configuration.create_plugin_model_provider_factory", return_value=mock_factory
+            "core.entities.provider_configuration.create_plugin_model_assembly",
+            return_value=SimpleNamespace(model_runtime=Mock(), model_provider_factory=mock_factory),
         ):
             with patch("core.entities.provider_configuration.encrypter.decrypt_token", return_value="raw"):
                 with patch("core.entities.provider_configuration.encrypter.encrypt_token", return_value="enc-new"):
@@ -1083,7 +1116,10 @@ def test_validate_custom_model_credentials_supports_hidden_reuse_and_sessionless
 
     mock_factory2 = Mock()
     mock_factory2.model_credentials_validate.return_value = {"region": "us"}
-    with patch("core.entities.provider_configuration.create_plugin_model_provider_factory", return_value=mock_factory2):
+    with patch(
+        "core.entities.provider_configuration.create_plugin_model_assembly",
+        return_value=SimpleNamespace(model_runtime=Mock(), model_provider_factory=mock_factory2),
+    ):
         validated = configuration.validate_custom_model_credentials(
             model_type=ModelType.LLM,
             model="gpt-4o",
@@ -1575,7 +1611,8 @@ def test_validate_provider_credentials_uses_empty_original_when_record_missing()
 
     with _patched_session(mock_session):
         with patch(
-            "core.entities.provider_configuration.create_plugin_model_provider_factory", return_value=mock_factory
+            "core.entities.provider_configuration.create_plugin_model_assembly",
+            return_value=SimpleNamespace(model_runtime=Mock(), model_provider_factory=mock_factory),
         ):
             with patch("core.entities.provider_configuration.encrypter.encrypt_token", return_value="enc-new"):
                 validated = configuration.validate_provider_credentials(
@@ -1701,7 +1738,8 @@ def test_validate_custom_model_credentials_handles_invalid_original_json() -> No
 
     with _patched_session(mock_session):
         with patch(
-            "core.entities.provider_configuration.create_plugin_model_provider_factory", return_value=mock_factory
+            "core.entities.provider_configuration.create_plugin_model_assembly",
+            return_value=SimpleNamespace(model_runtime=Mock(), model_provider_factory=mock_factory),
         ):
             with patch("core.entities.provider_configuration.encrypter.encrypt_token", return_value="enc-new"):
                 validated = configuration.validate_custom_model_credentials(
diff --git a/api/tests/unit_tests/core/extension/test_api_based_extension_requestor.py b/api/tests/unit_tests/core/extension/test_api_based_extension_requestor.py
index 399b531205..9c1cbe82a0 100644
--- a/api/tests/unit_tests/core/extension/test_api_based_extension_requestor.py
+++ b/api/tests/unit_tests/core/extension/test_api_based_extension_requestor.py
@@ -1,11 +1,12 @@
 import httpx
 import pytest
+from pytest_mock import MockerFixture
 
 from core.extension.api_based_extension_requestor import APIBasedExtensionRequestor
 from models.api_based_extension import APIBasedExtensionPoint
 
 
-def test_request_success(mocker):
+def test_request_success(mocker: MockerFixture):
     # Mock httpx.Client and its context manager
     mock_client = mocker.MagicMock()
     mock_client_instance = mock_client.__enter__.return_value
@@ -28,7 +29,7 @@ def test_request_success(mocker):
     )
 
 
-def test_request_with_ssrf_proxy(mocker):
+def test_request_with_ssrf_proxy(mocker: MockerFixture):
     # Mock dify_config
     mocker.patch("configs.dify_config.SSRF_PROXY_HTTP_URL", "http://proxy:8080")
     mocker.patch("configs.dify_config.SSRF_PROXY_HTTPS_URL", "https://proxy:8081")
@@ -59,7 +60,7 @@ def test_request_with_ssrf_proxy(mocker):
     assert mock_transport.call_count == 2
 
 
-def test_request_with_only_one_proxy_config(mocker):
+def test_request_with_only_one_proxy_config(mocker: MockerFixture):
     # Mock dify_config with only one proxy
     mocker.patch("configs.dify_config.SSRF_PROXY_HTTP_URL", "http://proxy:8080")
     mocker.patch("configs.dify_config.SSRF_PROXY_HTTPS_URL", None)
@@ -84,7 +85,7 @@ def test_request_with_only_one_proxy_config(mocker):
     assert kwargs.get("mounts") is None
 
 
-def test_request_timeout(mocker):
+def test_request_timeout(mocker: MockerFixture):
     mock_client = mocker.MagicMock()
     mock_client_instance = mock_client.__enter__.return_value
     mocker.patch("httpx.Client", return_value=mock_client)
@@ -95,7 +96,7 @@ def test_request_timeout(mocker):
         requestor.request(APIBasedExtensionPoint.PING, {})
 
 
-def test_request_connection_error(mocker):
+def test_request_connection_error(mocker: MockerFixture):
     mock_client = mocker.MagicMock()
     mock_client_instance = mock_client.__enter__.return_value
     mocker.patch("httpx.Client", return_value=mock_client)
@@ -106,7 +107,7 @@ def test_request_connection_error(mocker):
         requestor.request(APIBasedExtensionPoint.PING, {})
 
 
-def test_request_error_status_code(mocker):
+def test_request_error_status_code(mocker: MockerFixture):
     mock_client = mocker.MagicMock()
     mock_client_instance = mock_client.__enter__.return_value
     mocker.patch("httpx.Client", return_value=mock_client)
@@ -121,7 +122,7 @@ def test_request_error_status_code(mocker):
         requestor.request(APIBasedExtensionPoint.PING, {})
 
 
-def test_request_error_status_code_long_content(mocker):
+def test_request_error_status_code_long_content(mocker: MockerFixture):
     mock_client = mocker.MagicMock()
     mock_client_instance = mock_client.__enter__.return_value
     mocker.patch("httpx.Client", return_value=mock_client)
diff --git a/api/tests/unit_tests/core/external_data_tool/test_external_data_fetch.py b/api/tests/unit_tests/core/external_data_tool/test_external_data_fetch.py
index 86b461cf04..c1c1291281 100644
--- a/api/tests/unit_tests/core/external_data_tool/test_external_data_fetch.py
+++ b/api/tests/unit_tests/core/external_data_tool/test_external_data_fetch.py
@@ -13,7 +13,7 @@ class TestExternalDataFetch:
         app = Flask(__name__)
         return app
 
-    def test_fetch_success(self, app):
+    def test_fetch_success(self, app: Flask):
         with app.app_context():
             fetcher = ExternalDataFetch()
 
@@ -79,7 +79,7 @@ class TestExternalDataFetch:
         assert result_inputs == inputs
         assert result_inputs is not inputs  # Should be a copy
 
-    def test_fetch_with_none_variable(self, app):
+    def test_fetch_with_none_variable(self, app: Flask):
         with app.app_context():
             fetcher = ExternalDataFetch()
             tool = ExternalDataVariableEntity(variable="var1", type="type1", config={})
@@ -95,7 +95,7 @@ class TestExternalDataFetch:
                 assert "var1" not in result_inputs
                 assert result_inputs == {"in": "val"}
 
-    def test_query_external_data_tool(self, app):
+    def test_query_external_data_tool(self, app: Flask):
         fetcher = ExternalDataFetch()
         tool = ExternalDataVariableEntity(variable="var1", type="type1", config={"k": "v"})
 
diff --git a/api/tests/unit_tests/core/helper/test_creators.py b/api/tests/unit_tests/core/helper/test_creators.py
index df67d3f513..8750f6d907 100644
--- a/api/tests/unit_tests/core/helper/test_creators.py
+++ b/api/tests/unit_tests/core/helper/test_creators.py
@@ -8,7 +8,7 @@ from yarl import URL
 
 
 @pytest.fixture(autouse=True)
-def _patch_creators_url(monkeypatch):
+def _patch_creators_url(monkeypatch: pytest.MonkeyPatch):
     """Patch the module-level creators_platform_api_url for all tests."""
     monkeypatch.setattr(
         "core.helper.creators.creators_platform_api_url",
diff --git a/api/tests/unit_tests/core/helper/test_moderation.py b/api/tests/unit_tests/core/helper/test_moderation.py
index a0dfa86d20..c33002329b 100644
--- a/api/tests/unit_tests/core/helper/test_moderation.py
+++ b/api/tests/unit_tests/core/helper/test_moderation.py
@@ -68,8 +68,8 @@ def test_check_moderation_returns_true_when_model_accepts_text(mocker: MockerFix
     mocker.patch("core.helper.moderation.secrets.choice", return_value="chunk")
 
     moderation_model = SimpleNamespace(invoke=lambda **invoke_kwargs: invoke_kwargs["text"] == "chunk")
-    factory = SimpleNamespace(get_model_type_instance=lambda **_factory_kwargs: moderation_model)
-    mocker.patch("core.helper.moderation.create_plugin_model_provider_factory", return_value=factory)
+    assembly = SimpleNamespace(create_model_type_instance=lambda **_factory_kwargs: moderation_model)
+    mocker.patch("core.helper.moderation.create_plugin_model_assembly", return_value=assembly)
 
     assert (
         check_moderation(
@@ -91,7 +91,7 @@ def test_check_moderation_returns_true_when_text_is_empty(mocker: MockerFixture)
             provider_map={openai_provider: hosting_openai},
         ),
     )
-    factory_mock = mocker.patch("core.helper.moderation.create_plugin_model_provider_factory")
+    factory_mock = mocker.patch("core.helper.moderation.create_plugin_model_assembly")
     choice_mock = mocker.patch("core.helper.moderation.secrets.choice")
 
     assert (
@@ -119,8 +119,8 @@ def test_check_moderation_returns_false_when_model_rejects_text(mocker: MockerFi
     mocker.patch("core.helper.moderation.secrets.choice", return_value="chunk")
 
     moderation_model = SimpleNamespace(invoke=lambda **_invoke_kwargs: False)
-    factory = SimpleNamespace(get_model_type_instance=lambda **_factory_kwargs: moderation_model)
-    mocker.patch("core.helper.moderation.create_plugin_model_provider_factory", return_value=factory)
+    assembly = SimpleNamespace(create_model_type_instance=lambda **_factory_kwargs: moderation_model)
+    mocker.patch("core.helper.moderation.create_plugin_model_assembly", return_value=assembly)
 
     assert (
         check_moderation(
@@ -147,8 +147,8 @@ def test_check_moderation_raises_bad_request_when_provider_call_fails(mocker: Mo
     failing_model = SimpleNamespace(
         invoke=lambda **_invoke_kwargs: (_ for _ in ()).throw(RuntimeError("boom")),
     )
-    factory = SimpleNamespace(get_model_type_instance=lambda **_factory_kwargs: failing_model)
-    mocker.patch("core.helper.moderation.create_plugin_model_provider_factory", return_value=factory)
+    assembly = SimpleNamespace(create_model_type_instance=lambda **_factory_kwargs: failing_model)
+    mocker.patch("core.helper.moderation.create_plugin_model_assembly", return_value=assembly)
 
     with pytest.raises(InvokeBadRequestError, match="Rate limit exceeded, please try again later."):
         check_moderation(
diff --git a/api/tests/unit_tests/core/helper/test_trace_id_helper.py b/api/tests/unit_tests/core/helper/test_trace_id_helper.py
index 27bfe1af05..96e2d44730 100644
--- a/api/tests/unit_tests/core/helper/test_trace_id_helper.py
+++ b/api/tests/unit_tests/core/helper/test_trace_id_helper.py
@@ -1,6 +1,12 @@
 import pytest
 
-from core.helper.trace_id_helper import extract_external_trace_id_from_args, get_external_trace_id, is_valid_trace_id
+from core.helper.trace_id_helper import (
+    ParentTraceContext,
+    extract_external_trace_id_from_args,
+    extract_parent_trace_context_from_args,
+    get_external_trace_id,
+    is_valid_trace_id,
+)
 
 
 class DummyRequest:
@@ -84,3 +90,92 @@ class TestTraceIdHelper:
     def test_extract_external_trace_id_from_args(self, args, expected):
         """Test extraction of external_trace_id from args mapping"""
         assert extract_external_trace_id_from_args(args) == expected
+
+    @pytest.mark.parametrize(
+        ("args", "expected"),
+        [
+            (
+                {
+                    "parent_trace_context": {
+                        "parent_workflow_run_id": "workflow-run-1",
+                        "parent_node_execution_id": "node-execution-1",
+                    }
+                },
+                {
+                    "parent_trace_context": ParentTraceContext(
+                        parent_workflow_run_id="workflow-run-1",
+                        parent_node_execution_id="node-execution-1",
+                    )
+                },
+            ),
+            (
+                {
+                    "parent_trace_context": {
+                        "parent_workflow_run_id": "workflow-run-1",
+                    }
+                },
+                {},
+            ),
+            (
+                {
+                    "parent_trace_context": {
+                        "parent_node_execution_id": "node-execution-1",
+                    }
+                },
+                {},
+            ),
+            (
+                {
+                    "parent_trace_context": {
+                        "parent_workflow_run_id": 123,
+                        "parent_node_execution_id": "node-execution-1",
+                    }
+                },
+                {},
+            ),
+            (
+                {
+                    "parent_trace_context": {
+                        "parent_workflow_run_id": "workflow-run-1",
+                        "parent_node_execution_id": None,
+                    }
+                },
+                {},
+            ),
+            ({}, {}),
+        ],
+    )
+    def test_extract_parent_trace_context_from_args(self, args, expected):
+        """Test extraction of parent_trace_context from args mapping"""
+        assert extract_parent_trace_context_from_args(args) == expected
+
+    def test_extract_parent_trace_context_returns_typed_context(self):
+        """Parent trace context is parsed into a Pydantic value object."""
+        result = extract_parent_trace_context_from_args(
+            {
+                "parent_trace_context": {
+                    "parent_workflow_run_id": "workflow-run-1",
+                    "parent_node_execution_id": "node-execution-1",
+                }
+            }
+        )
+
+        assert result == {
+            "parent_trace_context": ParentTraceContext(
+                parent_workflow_run_id="workflow-run-1",
+                parent_node_execution_id="node-execution-1",
+            )
+        }
+
+    def test_extract_parent_trace_context_rejects_incomplete_typed_context(self):
+        """Typed parent trace context follows the same completeness rule as raw mappings."""
+        result = extract_parent_trace_context_from_args(
+            {
+                "parent_trace_context": ParentTraceContext(
+                    parent_workflow_run_id="workflow-run-1",
+                    parent_node_execution_id=None,
+                )
+            }
+        )
+
+        assert result == {}
diff --git a/api/tests/unit_tests/core/mcp/client/test_sse.py b/api/tests/unit_tests/core/mcp/client/test_sse.py
index e6eeb6cd59..ea0ff7395d 100644
--- a/api/tests/unit_tests/core/mcp/client/test_sse.py
+++ b/api/tests/unit_tests/core/mcp/client/test_sse.py
@@ -34,6 +34,17 @@ def test_sse_message_id_coercion():
     assert msg.root.jsonrpc == expected.root.jsonrpc
 
 
+def test_sse_message_without_id_stays_notification():
+    """Test that method messages without an ID still parse as notifications."""
+    json_message = '{"jsonrpc": "2.0", "method": "ping", "params": null}'
+
+    msg = types.JSONRPCMessage.model_validate_json(json_message)
+
+    assert isinstance(msg.root, types.JSONRPCNotification)
+    assert msg.root.method == "ping"
+    assert msg.root.jsonrpc == "2.0"
+
+
 class MockSSEClient:
     """Mock SSE client for testing."""
 
diff --git a/api/tests/unit_tests/core/memory/test_token_buffer_memory.py b/api/tests/unit_tests/core/memory/test_token_buffer_memory.py
index f459250b8e..72c24bda96 100644
--- a/api/tests/unit_tests/core/memory/test_token_buffer_memory.py
+++ b/api/tests/unit_tests/core/memory/test_token_buffer_memory.py
@@ -198,6 +198,48 @@ class TestBuildPromptMessageWithFiles:
         assert isinstance(result.content[-1], TextPromptMessageContent)
         assert result.content[-1].data == "user text"
 
+    def test_replay_does_not_pass_config_to_file_factory(self):
+        """Replay contract: history files were validated on upload, so this
+        path must not forward a FileUploadConfig. The factory's signature
+        no longer accepts ``config``; this test guards against a future
+        regression that re-introduces it."""
+        conv = _make_conversation(AppMode.CHAT)
+        mem = TokenBufferMemory(conversation=conv, model_instance=_make_model_instance())
+
+        mock_file_extra_config = MagicMock()
+        mock_file_extra_config.image_config = None
+
+        real_image_content = ImagePromptMessageContent(
+            url="http://example.com/img.png", format="png", mime_type="image/png"
+        )
+        mock_app_record = MagicMock()
+        mock_app_record.tenant_id = "tenant-1"
+
+        with (
+            patch(
+                "core.memory.token_buffer_memory.FileUploadConfigManager.convert",
+                return_value=mock_file_extra_config,
+            ),
+            patch(
+                "core.memory.token_buffer_memory.file_factory.build_from_message_file",
+                return_value=MagicMock(),
+            ) as mock_build,
+            patch(
+                "core.memory.token_buffer_memory.file_manager.to_prompt_message_content",
+                return_value=real_image_content,
+            ),
+        ):
+            mem._build_prompt_message_with_files(
+                message_files=[MagicMock()],
+                text_content="user text",
+                message=_make_message(),
+                app_record=mock_app_record,
+                is_user_message=True,
+            )
+
+        mock_build.assert_called_once()
+        assert "config" not in mock_build.call_args.kwargs
+
     @pytest.mark.parametrize("mode", [AppMode.CHAT, AppMode.AGENT_CHAT, AppMode.COMPLETION])
     def test_chat_mode_with_files_assistant_message(self, mode):
         """When files are present, returns AssistantPromptMessage with list content."""
diff --git a/api/tests/unit_tests/core/model_runtime/test_model_provider_factory.py b/api/tests/unit_tests/core/model_runtime/test_model_provider_factory.py
index c4fd970562..2b51dc8182 100644
--- a/api/tests/unit_tests/core/model_runtime/test_model_provider_factory.py
+++ b/api/tests/unit_tests/core/model_runtime/test_model_provider_factory.py
@@ -2,6 +2,7 @@ from unittest.mock import Mock
 
 import pytest
 
+from core.plugin.impl.model_runtime_factory import create_model_type_instance
 from graphon.model_runtime.entities.common_entities import I18nObject
 from graphon.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType
 from graphon.model_runtime.entities.provider_entities import (
@@ -73,7 +74,7 @@ def test_model_provider_factory_resolves_runtime_provider_name() -> None:
         supported_model_types=[ModelType.LLM],
         configurate_methods=[ConfigurateMethod.PREDEFINED_MODEL],
     )
-    factory = ModelProviderFactory(model_runtime=_FakeModelRuntime([provider]))
+    factory = ModelProviderFactory(runtime=_FakeModelRuntime([provider]))
 
     provider_schema = factory.get_model_provider("openai")
 
@@ -98,7 +99,7 @@ def test_model_provider_factory_resolves_canonical_short_name_independent_of_pro
             configurate_methods=[ConfigurateMethod.PREDEFINED_MODEL],
         ),
     ]
-    factory = ModelProviderFactory(model_runtime=_FakeModelRuntime(providers))
+    factory = ModelProviderFactory(runtime=_FakeModelRuntime(providers))
 
     provider_schema = factory.get_model_provider("openai")
 
@@ -107,8 +108,8 @@ def test_model_provider_factory_resolves_canonical_short_name_independent_of_pro
 
 
 def test_model_provider_factory_requires_runtime() -> None:
-    with pytest.raises(ValueError, match="model_runtime is required"):
-        ModelProviderFactory(model_runtime=None)  # type: ignore[arg-type]
+    with pytest.raises(ValueError, match="runtime is required"):
+        ModelProviderFactory(runtime=None)  # type: ignore[arg-type]
 
 
 def test_model_provider_factory_get_providers_returns_runtime_providers() -> None:
@@ -119,7 +120,7 @@ def test_model_provider_factory_get_providers_returns_runtime_providers() -> Non
             supported_model_types=[ModelType.LLM],
         )
     ]
-    factory = ModelProviderFactory(model_runtime=_FakeModelRuntime(providers))
+    factory = ModelProviderFactory(runtime=_FakeModelRuntime(providers))
 
     result = factory.get_providers()
 
@@ -133,7 +134,7 @@ def test_model_provider_factory_get_provider_schema_delegates_to_provider_lookup
         provider_name="openai",
         supported_model_types=[ModelType.LLM],
     )
-    factory = ModelProviderFactory(model_runtime=_FakeModelRuntime([provider]))
+    factory = ModelProviderFactory(runtime=_FakeModelRuntime([provider]))
 
     result = factory.get_provider_schema("openai")
 
@@ -142,7 +143,7 @@ def test_model_provider_factory_get_provider_schema_delegates_to_provider_lookup
 
 def test_model_provider_factory_raises_for_unknown_provider() -> None:
     factory = ModelProviderFactory(
-        model_runtime=_FakeModelRuntime(
+        runtime=_FakeModelRuntime(
             [
                 _build_provider(
                     provider="langgenius/openai/openai",
@@ -172,7 +173,7 @@ def test_model_provider_factory_get_models_filters_provider_and_model_type() ->
             models=[_build_model("rerank-v3", ModelType.RERANK)],
         ),
     ]
-    factory = ModelProviderFactory(model_runtime=_FakeModelRuntime(providers))
+    factory = ModelProviderFactory(runtime=_FakeModelRuntime(providers))
 
     results = factory.get_models(provider="openai", model_type=ModelType.LLM)
 
@@ -196,7 +197,7 @@ def test_model_provider_factory_get_models_skips_providers_without_requested_mod
             models=[_build_model("eleven_multilingual_v2", ModelType.TTS)],
         ),
     ]
-    factory = ModelProviderFactory(model_runtime=_FakeModelRuntime(providers))
+    factory = ModelProviderFactory(runtime=_FakeModelRuntime(providers))
 
     results = factory.get_models(model_type=ModelType.TTS)
 
@@ -214,7 +215,7 @@ def test_model_provider_factory_get_models_without_model_type_keeps_all_provider
             models=[_build_model("gpt-4o-mini", ModelType.LLM), _build_model("tts-1", ModelType.TTS)],
         )
     ]
-    factory = ModelProviderFactory(model_runtime=_FakeModelRuntime(providers))
+    factory = ModelProviderFactory(runtime=_FakeModelRuntime(providers))
 
     results = factory.get_models(provider="openai")
 
@@ -242,7 +243,7 @@ def test_model_provider_factory_validates_provider_credentials() -> None:
             )
         ]
     )
-    factory = ModelProviderFactory(model_runtime=runtime)
+    factory = ModelProviderFactory(runtime=runtime)
 
     filtered = factory.provider_credentials_validate(
         provider="openai",
@@ -258,7 +259,7 @@ def test_model_provider_factory_validates_provider_credentials() -> None:
 
 def test_model_provider_factory_provider_credentials_validate_requires_schema() -> None:
     factory = ModelProviderFactory(
-        model_runtime=_FakeModelRuntime(
+        runtime=_FakeModelRuntime(
             [
                 _build_provider(
                     provider="langgenius/openai/openai",
@@ -294,7 +295,7 @@ def test_model_provider_factory_validates_model_credentials() -> None:
             )
         ]
     )
-    factory = ModelProviderFactory(model_runtime=runtime)
+    factory = ModelProviderFactory(runtime=runtime)
 
     filtered = factory.model_credentials_validate(
         provider="openai",
@@ -314,7 +315,7 @@ def test_model_provider_factory_validates_model_credentials() -> None:
 
 def test_model_provider_factory_model_credentials_validate_requires_schema() -> None:
     factory = ModelProviderFactory(
-        model_runtime=_FakeModelRuntime(
+        runtime=_FakeModelRuntime(
             [
                 _build_provider(
                     provider="langgenius/openai/openai",
@@ -346,7 +347,7 @@ def test_model_provider_factory_get_model_schema_and_icon_use_canonical_provider
     )
     runtime.get_model_schema.return_value = "schema"
     runtime.get_provider_icon.return_value = (b"icon", "image/png")
-    factory = ModelProviderFactory(model_runtime=runtime)
+    factory = ModelProviderFactory(runtime=runtime)
 
     assert (
         factory.get_model_schema(
@@ -382,39 +383,43 @@ def test_model_provider_factory_get_model_schema_and_icon_use_canonical_provider
         (ModelType.TTS, TTSModel),
     ],
 )
-def test_model_provider_factory_builds_model_type_instances(
+def test_create_model_type_instance_builds_model_wrappers(
     model_type: ModelType,
     expected_type: type[object],
 ) -> None:
-    factory = ModelProviderFactory(
-        model_runtime=_FakeModelRuntime(
-            [
-                _build_provider(
-                    provider="langgenius/openai/openai",
-                    provider_name="openai",
-                    supported_model_types=[model_type],
-                )
-            ]
-        )
+    runtime = _FakeModelRuntime(
+        [
+            _build_provider(
+                provider="langgenius/openai/openai",
+                provider_name="openai",
+                supported_model_types=[model_type],
+            )
+        ]
     )
 
-    instance = factory.get_model_type_instance("openai", model_type)
+    instance = create_model_type_instance(
+        runtime=runtime,
+        provider_schema=runtime.fetch_model_providers()[0],
+        model_type=model_type,
+    )
 
     assert isinstance(instance, expected_type)
 
 
-def test_model_provider_factory_rejects_unsupported_model_type() -> None:
-    factory = ModelProviderFactory(
-        model_runtime=_FakeModelRuntime(
-            [
-                _build_provider(
-                    provider="langgenius/openai/openai",
-                    provider_name="openai",
-                    supported_model_types=[ModelType.LLM],
-                )
-            ]
-        )
+def test_create_model_type_instance_rejects_unsupported_model_type() -> None:
+    runtime = _FakeModelRuntime(
+        [
+            _build_provider(
+                provider="langgenius/openai/openai",
+                provider_name="openai",
+                supported_model_types=[ModelType.LLM],
+            )
+        ]
     )
 
     with pytest.raises(ValueError, match="Unsupported model type: unsupported"):
-        factory.get_model_type_instance("openai", "unsupported")  # type: ignore[arg-type]
+        create_model_type_instance(
+            runtime=runtime,
+            provider_schema=runtime.fetch_model_providers()[0],
+            model_type="unsupported",  # type: ignore[arg-type]
+        )
diff --git a/api/tests/unit_tests/core/ops/test_base_trace_instance.py b/api/tests/unit_tests/core/ops/test_base_trace_instance.py
index ac65d13454..15a2af17ca 100644
--- a/api/tests/unit_tests/core/ops/test_base_trace_instance.py
+++ b/api/tests/unit_tests/core/ops/test_base_trace_instance.py
@@ -18,7 +18,7 @@ class ConcreteTraceInstance(BaseTraceInstance):
 
 
 @pytest.fixture
-def mock_db_session(monkeypatch):
+def mock_db_session(monkeypatch: pytest.MonkeyPatch):
     mock_session = MagicMock(spec=Session)
     mock_session.__enter__.return_value = mock_session
     mock_session.__exit__.return_value = None
diff --git a/api/tests/unit_tests/core/ops/test_ops_trace_manager.py b/api/tests/unit_tests/core/ops/test_ops_trace_manager.py
index e47df0121e..33a3293682 100644
--- a/api/tests/unit_tests/core/ops/test_ops_trace_manager.py
+++ b/api/tests/unit_tests/core/ops/test_ops_trace_manager.py
@@ -203,7 +203,7 @@ class DummySessionContext:
 
 
 @pytest.fixture(autouse=True)
-def patch_provider_map(monkeypatch):
+def patch_provider_map(monkeypatch: pytest.MonkeyPatch):
     monkeypatch.setattr(
         "core.ops.ops_trace_manager.provider_config_map", FakeProviderMap({"dummy": FAKE_PROVIDER_ENTRY})
     )
@@ -212,7 +212,7 @@ def patch_provider_map(monkeypatch):
 
 
 @pytest.fixture(autouse=True)
-def patch_timer_and_current_app(monkeypatch):
+def patch_timer_and_current_app(monkeypatch: pytest.MonkeyPatch):
     monkeypatch.setattr("core.ops.ops_trace_manager.threading.Timer", DummyTimer)
     monkeypatch.setattr("core.ops.ops_trace_manager.trace_manager_queue", queue.Queue())
     monkeypatch.setattr("core.ops.ops_trace_manager.trace_manager_timer", None)
@@ -227,12 +227,12 @@ def patch_timer_and_current_app(monkeypatch):
 
 
 @pytest.fixture(autouse=True)
-def patch_sqlalchemy_session(monkeypatch):
+def patch_sqlalchemy_session(monkeypatch: pytest.MonkeyPatch):
     monkeypatch.setattr("core.ops.ops_trace_manager.Session", DummySessionContext)
 
 
 @pytest.fixture
-def encryption_mocks(monkeypatch):
+def encryption_mocks(monkeypatch: pytest.MonkeyPatch):
     encrypt_mock = MagicMock(side_effect=lambda tenant, value: f"enc-{value}")
     batch_decrypt_mock = MagicMock(side_effect=lambda tenant, values: [f"dec-{value}" for value in values])
     obfuscate_mock = MagicMock(side_effect=lambda value: f"ob-{value}")
@@ -243,7 +243,7 @@ def encryption_mocks(monkeypatch):
 
 
 @pytest.fixture
-def mock_db(monkeypatch):
+def mock_db(monkeypatch: pytest.MonkeyPatch):
     session = MagicMock()
     session.scalars.return_value.all.return_value = ["chat"]
     db_mock = MagicMock()
@@ -254,7 +254,7 @@ def mock_db(monkeypatch):
 
 
 @pytest.fixture
-def workflow_repo_fixture(monkeypatch):
+def workflow_repo_fixture(monkeypatch: pytest.MonkeyPatch):
     repo = MagicMock()
     repo.get_workflow_run_by_id_without_tenant.return_value = make_workflow_run()
     monkeypatch.setattr(TraceTask, "_get_workflow_run_repo", classmethod(lambda cls: repo))
@@ -340,13 +340,13 @@ def test_get_ops_trace_instance_handles_none_app(mock_db):
     assert OpsTraceManager.get_ops_trace_instance("app-id") is None
 
 
-def test_get_ops_trace_instance_returns_none_when_disabled(mock_db, monkeypatch):
+def test_get_ops_trace_instance_returns_none_when_disabled(mock_db, monkeypatch: pytest.MonkeyPatch):
     app = SimpleNamespace(id="app-id", tracing=json.dumps({"enabled": False}))
     mock_db.get.return_value = app
     assert OpsTraceManager.get_ops_trace_instance("app-id") is None
 
 
-def test_get_ops_trace_instance_invalid_provider(mock_db, monkeypatch):
+def test_get_ops_trace_instance_invalid_provider(mock_db, monkeypatch: pytest.MonkeyPatch):
     app = SimpleNamespace(id="app-id", tracing=json.dumps({"enabled": True, "tracing_provider": "missing"}))
     mock_db.get.return_value = app
     monkeypatch.setattr("core.ops.ops_trace_manager.provider_config_map", FakeProviderMap({}))
@@ -388,7 +388,7 @@ def test_get_app_config_through_message_id_app_model_config(mock_db):
     assert result.id == "cfg"
 
 
-def test_update_app_tracing_config_invalid_provider(mock_db, monkeypatch):
+def test_update_app_tracing_config_invalid_provider(mock_db, monkeypatch: pytest.MonkeyPatch):
     mock_db.get.return_value = None
     with pytest.raises(ValueError, match="Invalid tracing provider"):
         OpsTraceManager.update_app_tracing_config("app", True, "bad")
@@ -407,21 +407,21 @@ def test_update_app_tracing_config_success(mock_db):
 def test_get_app_tracing_config_errors_when_missing(mock_db):
     mock_db.get.return_value = None
     with pytest.raises(ValueError, match="App not found"):
-        OpsTraceManager.get_app_tracing_config("app")
+        OpsTraceManager.get_app_tracing_config("app", mock_db)
 
 
 def test_get_app_tracing_config_returns_defaults(mock_db):
     mock_db.get.return_value = SimpleNamespace(tracing=None)
-    assert OpsTraceManager.get_app_tracing_config("app-id") == {"enabled": False, "tracing_provider": None}
+    assert OpsTraceManager.get_app_tracing_config("app-id", mock_db) == {"enabled": False, "tracing_provider": None}
 
 
 def test_get_app_tracing_config_returns_payload(mock_db):
     payload = {"enabled": True, "tracing_provider": "dummy"}
     mock_db.get.return_value = SimpleNamespace(tracing=json.dumps(payload))
-    assert OpsTraceManager.get_app_tracing_config("app-id") == payload
+    assert OpsTraceManager.get_app_tracing_config("app-id", mock_db) == payload
 
 
-def test_check_and_project_helpers(monkeypatch):
+def test_check_and_project_helpers(monkeypatch: pytest.MonkeyPatch):
     monkeypatch.setattr(
         "core.ops.ops_trace_manager.provider_config_map",
         FakeProviderMap(
@@ -449,7 +449,7 @@ def test_check_and_project_helpers(monkeypatch):
     assert OpsTraceManager.get_trace_config_project_url({}, "dummy") == "url"
 
 
-def test_trace_task_conversation_and_extract(monkeypatch):
+def test_trace_task_conversation_and_extract(monkeypatch: pytest.MonkeyPatch):
     task = TraceTask(trace_type=TraceTaskName.CONVERSATION_TRACE, message_id="msg")
     assert task.conversation_trace(foo="bar") == {"foo": "bar"}
     assert task._extract_streaming_metrics(make_message_data(message_metadata="not json")) == {}
@@ -525,7 +525,7 @@ def test_extract_streaming_metrics_invalid_json():
     assert task._extract_streaming_metrics(fake_message) == {}
 
 
-def test_trace_queue_manager_add_and_collect(monkeypatch):
+def test_trace_queue_manager_add_and_collect(monkeypatch: pytest.MonkeyPatch):
     monkeypatch.setattr(
         "core.ops.ops_trace_manager.OpsTraceManager.get_ops_trace_instance", classmethod(lambda cls, aid: True)
     )
@@ -536,7 +536,7 @@ def test_trace_queue_manager_add_and_collect(monkeypatch):
     assert tasks == [task]
 
 
-def test_trace_queue_manager_run_invokes_send(monkeypatch):
+def test_trace_queue_manager_run_invokes_send(monkeypatch: pytest.MonkeyPatch):
     monkeypatch.setattr(
         "core.ops.ops_trace_manager.OpsTraceManager.get_ops_trace_instance", classmethod(lambda cls, aid: True)
     )
@@ -556,7 +556,7 @@ def test_trace_queue_manager_run_invokes_send(monkeypatch):
     assert called["tasks"] == [task]
 
 
-def test_trace_queue_manager_send_to_celery(monkeypatch):
+def test_trace_queue_manager_send_to_celery(monkeypatch: pytest.MonkeyPatch):
     monkeypatch.setattr(
         "core.ops.ops_trace_manager.OpsTraceManager.get_ops_trace_instance", classmethod(lambda cls, aid: True)
     )
diff --git a/api/tests/unit_tests/core/ops/test_trace_queue_manager.py b/api/tests/unit_tests/core/ops/test_trace_queue_manager.py
index a4903054e0..13cf01651e 100644
--- a/api/tests/unit_tests/core/ops/test_trace_queue_manager.py
+++ b/api/tests/unit_tests/core/ops/test_trace_queue_manager.py
@@ -19,7 +19,7 @@ import pytest
 
 
 @pytest.fixture
-def trace_queue_manager_and_task(monkeypatch):
+def trace_queue_manager_and_task(monkeypatch: pytest.MonkeyPatch):
     """Fixture to provide TraceQueueManager and TraceTask with delayed imports."""
     module_name = "core.ops.ops_trace_manager"
     if module_name not in sys.modules:
diff --git a/api/tests/unit_tests/core/plugin/impl/test_agent_client.py b/api/tests/unit_tests/core/plugin/impl/test_agent_client.py
index 1537ffacf5..d8843f0eeb 100644
--- a/api/tests/unit_tests/core/plugin/impl/test_agent_client.py
+++ b/api/tests/unit_tests/core/plugin/impl/test_agent_client.py
@@ -1,5 +1,7 @@
 from types import SimpleNamespace
 
+from pytest_mock import MockerFixture
+
 from core.plugin.entities.request import PluginInvokeContext
 from core.plugin.impl.agent import PluginAgentClient
 
@@ -15,7 +17,7 @@ def _agent_provider(name: str = "agent") -> SimpleNamespace:
 
 
 class TestPluginAgentClient:
-    def test_fetch_agent_strategy_providers(self, mocker):
+    def test_fetch_agent_strategy_providers(self, mocker: MockerFixture):
         client = PluginAgentClient()
         provider = _agent_provider("remote")
 
@@ -43,7 +45,7 @@ class TestPluginAgentClient:
         assert result[0].declaration.identity.name == "org/plugin/remote"
         assert result[0].declaration.strategies[0].identity.provider == "org/plugin/remote"
 
-    def test_fetch_agent_strategy_provider(self, mocker):
+    def test_fetch_agent_strategy_provider(self, mocker: MockerFixture):
         client = PluginAgentClient()
         provider = _agent_provider("provider")
 
@@ -63,7 +65,7 @@ class TestPluginAgentClient:
         assert result.declaration.identity.name == "org/plugin/provider"
         assert result.declaration.strategies[0].identity.provider == "org/plugin/provider"
 
-    def test_invoke_merges_chunks_and_passes_context(self, mocker):
+    def test_invoke_merges_chunks_and_passes_context(self, mocker: MockerFixture):
         client = PluginAgentClient()
         stream_mock = mocker.patch.object(
             client, "_request_with_plugin_daemon_response_stream", return_value=iter(["raw"])
diff --git a/api/tests/unit_tests/core/plugin/impl/test_asset_manager.py b/api/tests/unit_tests/core/plugin/impl/test_asset_manager.py
index 5f564062d5..c2cce5d691 100644
--- a/api/tests/unit_tests/core/plugin/impl/test_asset_manager.py
+++ b/api/tests/unit_tests/core/plugin/impl/test_asset_manager.py
@@ -1,12 +1,13 @@
 from unittest.mock import MagicMock
 
 import pytest
+from pytest_mock import MockerFixture
 
 from core.plugin.impl.asset import PluginAssetManager
 
 
 class TestPluginAssetManager:
-    def test_fetch_asset_success(self, mocker):
+    def test_fetch_asset_success(self, mocker: MockerFixture):
         manager = PluginAssetManager()
         response = MagicMock(status_code=200, content=b"asset-bytes")
         request_mock = mocker.patch.object(manager, "_request", return_value=response)
@@ -16,14 +17,14 @@ class TestPluginAssetManager:
         assert result == b"asset-bytes"
         request_mock.assert_called_once_with(method="GET", path="plugin/tenant-1/asset/asset-1")
 
-    def test_fetch_asset_not_found_raises(self, mocker):
+    def test_fetch_asset_not_found_raises(self, mocker: MockerFixture):
         manager = PluginAssetManager()
         mocker.patch.object(manager, "_request", return_value=MagicMock(status_code=404, content=b""))
 
         with pytest.raises(ValueError, match="can not found asset asset-1"):
             manager.fetch_asset("tenant-1", "asset-1")
 
-    def test_extract_asset_success(self, mocker):
+    def test_extract_asset_success(self, mocker: MockerFixture):
         manager = PluginAssetManager()
         response = MagicMock(status_code=200, content=b"file-content")
         request_mock = mocker.patch.object(manager, "_request", return_value=response)
@@ -37,7 +38,7 @@ class TestPluginAssetManager:
             params={"plugin_unique_identifier": "org/plugin:1", "file_path": "README.md"},
         )
 
-    def test_extract_asset_not_found_raises(self, mocker):
+    def test_extract_asset_not_found_raises(self, mocker: MockerFixture):
         manager = PluginAssetManager()
         mocker.patch.object(manager, "_request", return_value=MagicMock(status_code=404, content=b""))
 
diff --git a/api/tests/unit_tests/core/plugin/impl/test_base_client_impl.py b/api/tests/unit_tests/core/plugin/impl/test_base_client_impl.py
index 23894bd417..b154f056ca 100644
--- a/api/tests/unit_tests/core/plugin/impl/test_base_client_impl.py
+++ b/api/tests/unit_tests/core/plugin/impl/test_base_client_impl.py
@@ -1,6 +1,7 @@
 import json
 
 import pytest
+from pytest_mock import MockerFixture
 
 from core.plugin.endpoint.exc import EndpointSetupFailedError
 from core.plugin.entities.plugin_daemon import PluginDaemonInnerError
@@ -39,7 +40,7 @@ class _StreamContext:
 
 
 class TestBasePluginClientImpl:
-    def test_inject_trace_headers(self, mocker):
+    def test_inject_trace_headers(self, mocker: MockerFixture):
         client = BasePluginClient()
         mocker.patch("core.plugin.impl.base.dify_config.ENABLE_OTEL", True)
         trace_header = "00-abc-xyz-01"
@@ -54,7 +55,7 @@ class TestBasePluginClientImpl:
         client._inject_trace_headers(headers_with_existing)
         assert headers_with_existing["TraceParent"] == "exists"
 
-    def test_stream_request_handles_data_lines_and_dict_payload(self, mocker):
+    def test_stream_request_handles_data_lines_and_dict_payload(self, mocker: MockerFixture):
         client = BasePluginClient()
         stream_mock = mocker.patch(
             "httpx.Client.stream",
@@ -66,14 +67,14 @@ class TestBasePluginClientImpl:
         assert result == ["hello", "world"]
         assert stream_mock.call_args.kwargs["data"] == {"k": "v"}
 
-    def test_request_with_plugin_daemon_response_handles_request_exception(self, mocker):
+    def test_request_with_plugin_daemon_response_handles_request_exception(self, mocker: MockerFixture):
         client = BasePluginClient()
         mocker.patch.object(client, "_request", side_effect=RuntimeError("boom"))
 
         with pytest.raises(ValueError, match="Failed to request plugin daemon"):
             client._request_with_plugin_daemon_response("GET", "plugin/tenant/path", bool)
 
-    def test_request_with_plugin_daemon_response_applies_transformer(self, mocker):
+    def test_request_with_plugin_daemon_response_applies_transformer(self, mocker: MockerFixture):
         client = BasePluginClient()
         mocker.patch.object(client, "_request", return_value=_ResponseStub({"code": 0, "message": "", "data": True}))
 
@@ -88,14 +89,14 @@ class TestBasePluginClientImpl:
         assert result is True
         assert transformed == {"code": 0, "message": "", "data": True}
 
-    def test_request_with_plugin_daemon_response_stream_malformed_json_error(self, mocker):
+    def test_request_with_plugin_daemon_response_stream_malformed_json_error(self, mocker: MockerFixture):
         client = BasePluginClient()
         mocker.patch.object(client, "_stream_request", return_value=iter(['{"error":"bad-line"}']))
 
         with pytest.raises(ValueError, match="bad-line"):
             list(client._request_with_plugin_daemon_response_stream("GET", "p", bool))
 
-    def test_request_with_plugin_daemon_response_stream_plugin_daemon_inner_error(self, mocker):
+    def test_request_with_plugin_daemon_response_stream_plugin_daemon_inner_error(self, mocker: MockerFixture):
         client = BasePluginClient()
         mocker.patch.object(
             client, "_stream_request", return_value=iter(['{"code":-500,"message":"not-json","data":null}'])
@@ -105,14 +106,14 @@ class TestBasePluginClientImpl:
             list(client._request_with_plugin_daemon_response_stream("GET", "p", bool))
         assert exc_info.value.message == "not-json"
 
-    def test_request_with_plugin_daemon_response_stream_plugin_daemon_error(self, mocker):
+    def test_request_with_plugin_daemon_response_stream_plugin_daemon_error(self, mocker: MockerFixture):
         client = BasePluginClient()
         mocker.patch.object(client, "_stream_request", return_value=iter(['{"code":-1,"message":"err","data":null}']))
 
         with pytest.raises(ValueError, match="plugin daemon: err, code: -1"):
             list(client._request_with_plugin_daemon_response_stream("GET", "p", bool))
 
-    def test_request_with_plugin_daemon_response_stream_empty_data_error(self, mocker):
+    def test_request_with_plugin_daemon_response_stream_empty_data_error(self, mocker: MockerFixture):
         client = BasePluginClient()
         mocker.patch.object(client, "_stream_request", return_value=iter(['{"code":0,"message":"","data":null}']))
 
diff --git a/api/tests/unit_tests/core/plugin/impl/test_datasource_manager.py b/api/tests/unit_tests/core/plugin/impl/test_datasource_manager.py
index 4c5987d759..94723dcfe2 100644
--- a/api/tests/unit_tests/core/plugin/impl/test_datasource_manager.py
+++ b/api/tests/unit_tests/core/plugin/impl/test_datasource_manager.py
@@ -1,5 +1,7 @@
 from types import SimpleNamespace
 
+from pytest_mock import MockerFixture
+
 from core.datasource.entities.datasource_entities import (
     GetOnlineDocumentPageContentRequest,
     OnlineDriveBrowseFilesRequest,
@@ -19,7 +21,7 @@ def _datasource_provider(name: str = "provider") -> SimpleNamespace:
 
 
 class TestPluginDatasourceManager:
-    def test_fetch_datasource_providers(self, mocker):
+    def test_fetch_datasource_providers(self, mocker: MockerFixture):
         manager = PluginDatasourceManager()
         provider = _datasource_provider("remote")
         repack = mocker.patch("core.plugin.impl.datasource.ToolTransformService.repack_provider")
@@ -52,7 +54,7 @@ class TestPluginDatasourceManager:
         assert result[1].declaration.datasources[0].identity.provider == "org/plugin/remote"
         repack.assert_called_once_with(tenant_id="tenant-1", provider=provider)
 
-    def test_fetch_installed_datasource_providers(self, mocker):
+    def test_fetch_installed_datasource_providers(self, mocker: MockerFixture):
         manager = PluginDatasourceManager()
         provider = _datasource_provider("remote")
         repack = mocker.patch("core.plugin.impl.datasource.ToolTransformService.repack_provider")
@@ -83,7 +85,7 @@ class TestPluginDatasourceManager:
         assert result[0].declaration.datasources[0].identity.provider == "org/plugin/remote"
         repack.assert_called_once_with(tenant_id="tenant-1", provider=provider)
 
-    def test_fetch_datasource_provider_local_and_remote(self, mocker):
+    def test_fetch_datasource_provider_local_and_remote(self, mocker: MockerFixture):
         manager = PluginDatasourceManager()
 
         local = manager.fetch_datasource_provider("tenant-1", "langgenius/file/file")
@@ -113,7 +115,7 @@ class TestPluginDatasourceManager:
         assert result.declaration.identity.name == "org/plugin/provider"
         assert result.declaration.datasources[0].identity.provider == "org/plugin/provider"
 
-    def test_get_website_crawl_streaming(self, mocker):
+    def test_get_website_crawl_streaming(self, mocker: MockerFixture):
         manager = PluginDatasourceManager()
         stream_mock = mocker.patch.object(manager, "_request_with_plugin_daemon_response_stream")
         stream_mock.return_value = iter(["crawl"])
@@ -132,7 +134,7 @@ class TestPluginDatasourceManager:
 
         assert stream_mock.call_count == 1
 
-    def test_get_online_document_pages_streaming(self, mocker):
+    def test_get_online_document_pages_streaming(self, mocker: MockerFixture):
         manager = PluginDatasourceManager()
         stream_mock = mocker.patch.object(manager, "_request_with_plugin_daemon_response_stream")
         stream_mock.return_value = iter(["pages"])
@@ -151,7 +153,7 @@ class TestPluginDatasourceManager:
 
         assert stream_mock.call_count == 1
 
-    def test_get_online_document_page_content_streaming(self, mocker):
+    def test_get_online_document_page_content_streaming(self, mocker: MockerFixture):
         manager = PluginDatasourceManager()
         stream_mock = mocker.patch.object(manager, "_request_with_plugin_daemon_response_stream")
         stream_mock.return_value = iter(["content"])
@@ -170,7 +172,7 @@ class TestPluginDatasourceManager:
 
         assert stream_mock.call_count == 1
 
-    def test_online_drive_browse_files_streaming(self, mocker):
+    def test_online_drive_browse_files_streaming(self, mocker: MockerFixture):
         manager = PluginDatasourceManager()
         stream_mock = mocker.patch.object(manager, "_request_with_plugin_daemon_response_stream")
         stream_mock.return_value = iter(["browse"])
@@ -189,7 +191,7 @@ class TestPluginDatasourceManager:
 
         assert stream_mock.call_count == 1
 
-    def test_online_drive_download_file_streaming(self, mocker):
+    def test_online_drive_download_file_streaming(self, mocker: MockerFixture):
         manager = PluginDatasourceManager()
         stream_mock = mocker.patch.object(manager, "_request_with_plugin_daemon_response_stream")
         stream_mock.return_value = iter(["download"])
@@ -208,14 +210,14 @@ class TestPluginDatasourceManager:
 
         assert stream_mock.call_count == 1
 
-    def test_validate_provider_credentials_returns_true_when_stream_yields_result(self, mocker):
+    def test_validate_provider_credentials_returns_true_when_stream_yields_result(self, mocker: MockerFixture):
         manager = PluginDatasourceManager()
         stream_mock = mocker.patch.object(manager, "_request_with_plugin_daemon_response_stream")
         stream_mock.return_value = iter([SimpleNamespace(result=True)])
 
         assert manager.validate_provider_credentials("tenant-1", "user-1", "provider", "org/plugin", {"k": "v"}) is True
 
-    def test_validate_provider_credentials_returns_false_when_stream_empty(self, mocker):
+    def test_validate_provider_credentials_returns_false_when_stream_empty(self, mocker: MockerFixture):
         manager = PluginDatasourceManager()
         stream_mock = mocker.patch.object(manager, "_request_with_plugin_daemon_response_stream")
         stream_mock.return_value = iter([])
diff --git a/api/tests/unit_tests/core/plugin/impl/test_debugging_client.py b/api/tests/unit_tests/core/plugin/impl/test_debugging_client.py
index c80785aee0..05959207b1 100644
--- a/api/tests/unit_tests/core/plugin/impl/test_debugging_client.py
+++ b/api/tests/unit_tests/core/plugin/impl/test_debugging_client.py
@@ -1,10 +1,12 @@
 from types import SimpleNamespace
 
+from pytest_mock import MockerFixture
+
 from core.plugin.impl.debugging import PluginDebuggingClient
 
 
 class TestPluginDebuggingClient:
-    def test_get_debugging_key(self, mocker):
+    def test_get_debugging_key(self, mocker: MockerFixture):
         client = PluginDebuggingClient()
         request_mock = mocker.patch.object(
             client,
diff --git a/api/tests/unit_tests/core/plugin/impl/test_endpoint_client_impl.py b/api/tests/unit_tests/core/plugin/impl/test_endpoint_client_impl.py
index 4cf657a050..7a24cc01d1 100644
--- a/api/tests/unit_tests/core/plugin/impl/test_endpoint_client_impl.py
+++ b/api/tests/unit_tests/core/plugin/impl/test_endpoint_client_impl.py
@@ -1,11 +1,12 @@
 import pytest
+from pytest_mock import MockerFixture
 
 from core.plugin.impl.endpoint import PluginEndpointClient
 from core.plugin.impl.exc import PluginDaemonInternalServerError
 
 
 class TestPluginEndpointClientImpl:
-    def test_create_endpoint(self, mocker):
+    def test_create_endpoint(self, mocker: MockerFixture):
         client = PluginEndpointClient()
         request_mock = mocker.patch.object(client, "_request_with_plugin_daemon_response", return_value=True)
 
@@ -18,7 +19,7 @@ class TestPluginEndpointClientImpl:
         assert args[:3] == ("POST", "plugin/tenant-1/endpoint/setup", bool)
         assert kwargs["data"]["plugin_unique_identifier"] == "org/plugin:1"
 
-    def test_list_endpoints(self, mocker):
+    def test_list_endpoints(self, mocker: MockerFixture):
         client = PluginEndpointClient()
         request_mock = mocker.patch.object(client, "_request_with_plugin_daemon_response", return_value=["endpoint"])
 
@@ -28,7 +29,7 @@ class TestPluginEndpointClientImpl:
         assert request_mock.call_args.args[1] == "plugin/tenant-1/endpoint/list"
         assert request_mock.call_args.kwargs["params"] == {"page": 2, "page_size": 20}
 
-    def test_list_endpoints_for_single_plugin(self, mocker):
+    def test_list_endpoints_for_single_plugin(self, mocker: MockerFixture):
         client = PluginEndpointClient()
         request_mock = mocker.patch.object(client, "_request_with_plugin_daemon_response", return_value=["endpoint"])
 
@@ -38,7 +39,7 @@ class TestPluginEndpointClientImpl:
         assert request_mock.call_args.args[1] == "plugin/tenant-1/endpoint/list/plugin"
         assert request_mock.call_args.kwargs["params"] == {"plugin_id": "org/plugin", "page": 1, "page_size": 10}
 
-    def test_update_endpoint(self, mocker):
+    def test_update_endpoint(self, mocker: MockerFixture):
         client = PluginEndpointClient()
         request_mock = mocker.patch.object(client, "_request_with_plugin_daemon_response", return_value=True)
 
@@ -47,7 +48,7 @@ class TestPluginEndpointClientImpl:
         assert result is True
         assert request_mock.call_args.args[:3] == ("POST", "plugin/tenant-1/endpoint/update", bool)
 
-    def test_enable_and_disable_endpoint(self, mocker):
+    def test_enable_and_disable_endpoint(self, mocker: MockerFixture):
         client = PluginEndpointClient()
         request_mock = mocker.patch.object(client, "_request_with_plugin_daemon_response", return_value=True)
 
@@ -58,7 +59,7 @@ class TestPluginEndpointClientImpl:
         assert calls[0].args[1] == "plugin/tenant-1/endpoint/enable"
         assert calls[1].args[1] == "plugin/tenant-1/endpoint/disable"
 
-    def test_delete_endpoint_idempotent_and_re_raise(self, mocker):
+    def test_delete_endpoint_idempotent_and_re_raise(self, mocker: MockerFixture):
         client = PluginEndpointClient()
         request_mock = mocker.patch.object(client, "_request_with_plugin_daemon_response")
 
diff --git a/api/tests/unit_tests/core/plugin/impl/test_exc_impl.py b/api/tests/unit_tests/core/plugin/impl/test_exc_impl.py
index 8c6f1c6b7f..d99a8c114f 100644
--- a/api/tests/unit_tests/core/plugin/impl/test_exc_impl.py
+++ b/api/tests/unit_tests/core/plugin/impl/test_exc_impl.py
@@ -1,11 +1,13 @@
 import json
 
+from pytest_mock import MockerFixture
+
 from core.plugin.impl import exc as exc_module
 from core.plugin.impl.exc import PluginDaemonError, PluginInvokeError
 
 
 class TestPluginImplExceptions:
-    def test_plugin_daemon_error_str_contains_request_id(self, mocker):
+    def test_plugin_daemon_error_str_contains_request_id(self, mocker: MockerFixture):
         mocker.patch("core.plugin.impl.exc.get_request_id", return_value="req-123")
         error = PluginDaemonError("bad")
 
@@ -21,7 +23,7 @@ class TestPluginImplExceptions:
         assert "RateLimit" in friendly
         assert "too many" in friendly
 
-    def test_plugin_invoke_error_invalid_json_and_fallback(self, mocker):
+    def test_plugin_invoke_error_invalid_json_and_fallback(self, mocker: MockerFixture):
         err = PluginInvokeError("plain text")
 
         assert err._get_error_object() == {}
@@ -32,7 +34,7 @@ class TestPluginImplExceptions:
         err2 = PluginInvokeError("plain text")
         assert err2.get_error_message() == "plain text"
 
-    def test_plugin_invoke_error_get_error_object_handles_adapter_exception(self, mocker):
+    def test_plugin_invoke_error_get_error_object_handles_adapter_exception(self, mocker: MockerFixture):
         adapter = mocker.patch.object(exc_module, "TypeAdapter")
         adapter.return_value.validate_json.side_effect = RuntimeError("invalid")
 
diff --git a/api/tests/unit_tests/core/plugin/impl/test_model_client.py b/api/tests/unit_tests/core/plugin/impl/test_model_client.py
index bcbebbb38b..6dc572310c 100644
--- a/api/tests/unit_tests/core/plugin/impl/test_model_client.py
+++ b/api/tests/unit_tests/core/plugin/impl/test_model_client.py
@@ -4,13 +4,14 @@ import io
 from types import SimpleNamespace
 
 import pytest
+from pytest_mock import MockerFixture
 
 from core.plugin.entities.plugin_daemon import PluginDaemonInnerError
 from core.plugin.impl.model import PluginModelClient
 
 
 class TestPluginModelClient:
-    def test_fetch_model_providers(self, mocker):
+    def test_fetch_model_providers(self, mocker: MockerFixture):
         client = PluginModelClient()
         request_mock = mocker.patch.object(client, "_request_with_plugin_daemon_response", return_value=["provider-a"])
 
@@ -23,7 +24,7 @@ class TestPluginModelClient:
         )
         assert request_mock.call_args.kwargs["params"] == {"page": 1, "page_size": 256}
 
-    def test_get_model_schema(self, mocker):
+    def test_get_model_schema(self, mocker: MockerFixture):
         client = PluginModelClient()
         schema = SimpleNamespace(name="schema")
         stream_mock = mocker.patch.object(
@@ -45,7 +46,7 @@ class TestPluginModelClient:
         assert result is schema
         assert stream_mock.call_args.args[:2] == ("POST", "plugin/tenant-1/dispatch/model/schema")
 
-    def test_get_model_schema_empty_stream_returns_none(self, mocker):
+    def test_get_model_schema_empty_stream_returns_none(self, mocker: MockerFixture):
         client = PluginModelClient()
         mocker.patch.object(client, "_request_with_plugin_daemon_response_stream", return_value=iter([]))
 
@@ -53,7 +54,7 @@ class TestPluginModelClient:
 
         assert result is None
 
-    def test_validate_provider_credentials(self, mocker):
+    def test_validate_provider_credentials(self, mocker: MockerFixture):
         client = PluginModelClient()
         stream_mock = mocker.patch.object(
             client,
@@ -77,7 +78,7 @@ class TestPluginModelClient:
             "plugin/tenant-1/dispatch/model/validate_provider_credentials",
         )
 
-    def test_validate_provider_credentials_without_dict_update(self, mocker):
+    def test_validate_provider_credentials_without_dict_update(self, mocker: MockerFixture):
         client = PluginModelClient()
         mocker.patch.object(
             client,
@@ -91,13 +92,13 @@ class TestPluginModelClient:
         assert result is False
         assert credentials == {"api_key": "same"}
 
-    def test_validate_provider_credentials_empty_returns_false(self, mocker):
+    def test_validate_provider_credentials_empty_returns_false(self, mocker: MockerFixture):
         client = PluginModelClient()
         mocker.patch.object(client, "_request_with_plugin_daemon_response_stream", return_value=iter([]))
 
         assert client.validate_provider_credentials("tenant-1", "user-1", "org/plugin:1", "provider-a", {}) is False
 
-    def test_validate_model_credentials(self, mocker):
+    def test_validate_model_credentials(self, mocker: MockerFixture):
         client = PluginModelClient()
         stream_mock = mocker.patch.object(
             client,
@@ -123,7 +124,7 @@ class TestPluginModelClient:
             "plugin/tenant-1/dispatch/model/validate_model_credentials",
         )
 
-    def test_validate_model_credentials_empty_returns_false(self, mocker):
+    def test_validate_model_credentials_empty_returns_false(self, mocker: MockerFixture):
         client = PluginModelClient()
         mocker.patch.object(client, "_request_with_plugin_daemon_response_stream", return_value=iter([]))
 
@@ -132,7 +133,7 @@ class TestPluginModelClient:
             is False
         )
 
-    def test_invoke_llm(self, mocker):
+    def test_invoke_llm(self, mocker: MockerFixture):
         client = PluginModelClient()
         stream_mock = mocker.patch.object(
             client, "_request_with_plugin_daemon_response_stream", return_value=iter(["chunk-1"])
@@ -160,7 +161,7 @@ class TestPluginModelClient:
         assert call_kwargs["data"]["data"]["stream"] is False
         assert call_kwargs["data"]["data"]["model_parameters"] == {"temperature": 0.1}
 
-    def test_invoke_llm_wraps_plugin_daemon_inner_error(self, mocker):
+    def test_invoke_llm_wraps_plugin_daemon_inner_error(self, mocker: MockerFixture):
         client = PluginModelClient()
 
         def _boom():
@@ -182,7 +183,7 @@ class TestPluginModelClient:
                 )
             )
 
-    def test_get_llm_num_tokens(self, mocker):
+    def test_get_llm_num_tokens(self, mocker: MockerFixture):
         client = PluginModelClient()
         mocker.patch.object(
             client,
@@ -204,7 +205,7 @@ class TestPluginModelClient:
 
         assert result == 42
 
-    def test_get_llm_num_tokens_empty_returns_zero(self, mocker):
+    def test_get_llm_num_tokens_empty_returns_zero(self, mocker: MockerFixture):
         client = PluginModelClient()
         mocker.patch.object(client, "_request_with_plugin_daemon_response_stream", return_value=iter([]))
 
@@ -213,7 +214,7 @@ class TestPluginModelClient:
             == 0
         )
 
-    def test_invoke_text_embedding(self, mocker):
+    def test_invoke_text_embedding(self, mocker: MockerFixture):
         client = PluginModelClient()
         embedding_result = SimpleNamespace(data=[[0.1, 0.2]])
         mocker.patch.object(
@@ -233,7 +234,7 @@ class TestPluginModelClient:
 
         assert result is embedding_result
 
-    def test_invoke_text_embedding_empty_raises(self, mocker):
+    def test_invoke_text_embedding_empty_raises(self, mocker: MockerFixture):
         client = PluginModelClient()
         mocker.patch.object(client, "_request_with_plugin_daemon_response_stream", return_value=iter([]))
 
@@ -242,7 +243,7 @@ class TestPluginModelClient:
                 "tenant-1", "user-1", "org/plugin:1", "provider-a", "embedding-a", {}, ["hello"], "x"
             )
 
-    def test_invoke_multimodal_embedding(self, mocker):
+    def test_invoke_multimodal_embedding(self, mocker: MockerFixture):
         client = PluginModelClient()
         embedding_result = SimpleNamespace(data=[[0.3, 0.4]])
         mocker.patch.object(
@@ -262,7 +263,7 @@ class TestPluginModelClient:
 
         assert result is embedding_result
 
-    def test_invoke_multimodal_embedding_empty_raises(self, mocker):
+    def test_invoke_multimodal_embedding_empty_raises(self, mocker: MockerFixture):
         client = PluginModelClient()
         mocker.patch.object(client, "_request_with_plugin_daemon_response_stream", return_value=iter([]))
 
@@ -271,7 +272,7 @@ class TestPluginModelClient:
                 "tenant-1", "user-1", "org/plugin:1", "provider-a", "embedding-a", {}, [{"type": "image"}], "x"
             )
 
-    def test_get_text_embedding_num_tokens(self, mocker):
+    def test_get_text_embedding_num_tokens(self, mocker: MockerFixture):
         client = PluginModelClient()
         mocker.patch.object(
             client,
@@ -287,7 +288,7 @@ class TestPluginModelClient:
             3,
         ]
 
-    def test_get_text_embedding_num_tokens_empty_returns_list(self, mocker):
+    def test_get_text_embedding_num_tokens_empty_returns_list(self, mocker: MockerFixture):
         client = PluginModelClient()
         mocker.patch.object(client, "_request_with_plugin_daemon_response_stream", return_value=iter([]))
 
@@ -298,7 +299,7 @@ class TestPluginModelClient:
             == []
         )
 
-    def test_invoke_rerank(self, mocker):
+    def test_invoke_rerank(self, mocker: MockerFixture):
         client = PluginModelClient()
         rerank_result = SimpleNamespace(scores=[0.9])
         mocker.patch.object(client, "_request_with_plugin_daemon_response_stream", return_value=iter([rerank_result]))
@@ -318,14 +319,14 @@ class TestPluginModelClient:
 
         assert result is rerank_result
 
-    def test_invoke_rerank_empty_raises(self, mocker):
+    def test_invoke_rerank_empty_raises(self, mocker: MockerFixture):
         client = PluginModelClient()
         mocker.patch.object(client, "_request_with_plugin_daemon_response_stream", return_value=iter([]))
 
         with pytest.raises(ValueError, match="Failed to invoke rerank"):
             client.invoke_rerank("tenant-1", "user-1", "org/plugin:1", "provider-a", "rerank-a", {}, "q", ["doc-1"])
 
-    def test_invoke_multimodal_rerank(self, mocker):
+    def test_invoke_multimodal_rerank(self, mocker: MockerFixture):
         client = PluginModelClient()
         rerank_result = SimpleNamespace(scores=[0.8])
         mocker.patch.object(client, "_request_with_plugin_daemon_response_stream", return_value=iter([rerank_result]))
@@ -345,7 +346,7 @@ class TestPluginModelClient:
 
         assert result is rerank_result
 
-    def test_invoke_multimodal_rerank_empty_raises(self, mocker):
+    def test_invoke_multimodal_rerank_empty_raises(self, mocker: MockerFixture):
         client = PluginModelClient()
         mocker.patch.object(client, "_request_with_plugin_daemon_response_stream", return_value=iter([]))
 
@@ -361,7 +362,7 @@ class TestPluginModelClient:
                 [{"type": "image"}],
             )
 
-    def test_invoke_tts(self, mocker):
+    def test_invoke_tts(self, mocker: MockerFixture):
         client = PluginModelClient()
         mocker.patch.object(
             client,
@@ -384,7 +385,7 @@ class TestPluginModelClient:
 
         assert result == [b"hello", b"!"]
 
-    def test_invoke_tts_wraps_plugin_daemon_inner_error(self, mocker):
+    def test_invoke_tts_wraps_plugin_daemon_inner_error(self, mocker: MockerFixture):
         client = PluginModelClient()
 
         def _boom():
@@ -396,7 +397,7 @@ class TestPluginModelClient:
         with pytest.raises(ValueError, match="tts error-400"):
             list(client.invoke_tts("tenant-1", "user-1", "org/plugin:1", "provider-a", "tts-a", {}, "hello", "alloy"))
 
-    def test_get_tts_model_voices(self, mocker):
+    def test_get_tts_model_voices(self, mocker: MockerFixture):
         client = PluginModelClient()
         mocker.patch.object(
             client,
@@ -425,13 +426,13 @@ class TestPluginModelClient:
 
         assert result == [{"name": "Alloy", "value": "alloy"}, {"name": "Echo", "value": "echo"}]
 
-    def test_get_tts_model_voices_empty_returns_list(self, mocker):
+    def test_get_tts_model_voices_empty_returns_list(self, mocker: MockerFixture):
         client = PluginModelClient()
         mocker.patch.object(client, "_request_with_plugin_daemon_response_stream", return_value=iter([]))
 
         assert client.get_tts_model_voices("tenant-1", "user-1", "org/plugin:1", "provider-a", "tts-a", {}) == []
 
-    def test_invoke_speech_to_text(self, mocker):
+    def test_invoke_speech_to_text(self, mocker: MockerFixture):
         client = PluginModelClient()
         stream_mock = mocker.patch.object(
             client,
@@ -452,7 +453,7 @@ class TestPluginModelClient:
         assert result == "transcribed text"
         assert stream_mock.call_args.kwargs["data"]["data"]["file"] == "616263"
 
-    def test_invoke_speech_to_text_empty_raises(self, mocker):
+    def test_invoke_speech_to_text_empty_raises(self, mocker: MockerFixture):
         client = PluginModelClient()
         mocker.patch.object(client, "_request_with_plugin_daemon_response_stream", return_value=iter([]))
 
@@ -461,7 +462,7 @@ class TestPluginModelClient:
                 "tenant-1", "user-1", "org/plugin:1", "provider-a", "stt-a", {}, io.BytesIO(b"abc")
             )
 
-    def test_invoke_moderation(self, mocker):
+    def test_invoke_moderation(self, mocker: MockerFixture):
         client = PluginModelClient()
         stream_mock = mocker.patch.object(
             client,
@@ -482,7 +483,7 @@ class TestPluginModelClient:
         assert result is True
         assert stream_mock.call_args.kwargs["path"] == "plugin/tenant-1/dispatch/moderation/invoke"
 
-    def test_invoke_moderation_empty_raises(self, mocker):
+    def test_invoke_moderation_empty_raises(self, mocker: MockerFixture):
         client = PluginModelClient()
         mocker.patch.object(client, "_request_with_plugin_daemon_response_stream", return_value=iter([]))
 
diff --git a/api/tests/unit_tests/core/plugin/impl/test_model_runtime_factory.py b/api/tests/unit_tests/core/plugin/impl/test_model_runtime_factory.py
index 7491e79f30..52da674f06 100644
--- a/api/tests/unit_tests/core/plugin/impl/test_model_runtime_factory.py
+++ b/api/tests/unit_tests/core/plugin/impl/test_model_runtime_factory.py
@@ -31,6 +31,6 @@ def test_plugin_model_assembly_reuses_single_runtime_across_views():
         assert assembly.model_manager is model_manager
 
     mock_runtime_factory.assert_called_once_with(tenant_id="tenant-1", user_id="user-1")
-    mock_provider_factory_cls.assert_called_once_with(model_runtime=runtime)
+    mock_provider_factory_cls.assert_called_once_with(runtime=runtime)
     mock_provider_manager_cls.assert_called_once_with(model_runtime=runtime)
     mock_model_manager_cls.assert_called_once_with(provider_manager=provider_manager)
diff --git a/api/tests/unit_tests/core/plugin/impl/test_oauth_handler.py b/api/tests/unit_tests/core/plugin/impl/test_oauth_handler.py
index 6fb4c99432..f6c9b1c669 100644
--- a/api/tests/unit_tests/core/plugin/impl/test_oauth_handler.py
+++ b/api/tests/unit_tests/core/plugin/impl/test_oauth_handler.py
@@ -2,6 +2,7 @@ from io import BytesIO
 from types import SimpleNamespace
 
 import pytest
+from pytest_mock import MockerFixture
 from werkzeug import Request
 
 from core.plugin.impl.oauth import OAuthHandler
@@ -25,7 +26,7 @@ def _build_request(body: bytes = b"payload") -> Request:
 
 
 class TestOAuthHandler:
-    def test_get_authorization_url(self, mocker):
+    def test_get_authorization_url(self, mocker: MockerFixture):
         handler = OAuthHandler()
         stream_mock = mocker.patch.object(
             handler,
@@ -45,7 +46,7 @@ class TestOAuthHandler:
         assert response.authorization_url == "https://auth.example.com"
         assert stream_mock.call_count == 1
 
-    def test_get_authorization_url_no_response_raises(self, mocker):
+    def test_get_authorization_url_no_response_raises(self, mocker: MockerFixture):
         handler = OAuthHandler()
         mocker.patch.object(handler, "_request_with_plugin_daemon_response_stream", return_value=iter([]))
 
@@ -59,7 +60,7 @@ class TestOAuthHandler:
                 system_credentials={},
             )
 
-    def test_get_credentials(self, mocker):
+    def test_get_credentials(self, mocker: MockerFixture):
         handler = OAuthHandler()
         captured_data = {}
 
@@ -85,7 +86,7 @@ class TestOAuthHandler:
         assert "raw_http_request" in captured_data["data"]
         assert stream_mock.call_count == 1
 
-    def test_get_credentials_no_response_raises(self, mocker):
+    def test_get_credentials_no_response_raises(self, mocker: MockerFixture):
         handler = OAuthHandler()
         mocker.patch.object(handler, "_request_with_plugin_daemon_response_stream", return_value=iter([]))
 
@@ -100,7 +101,7 @@ class TestOAuthHandler:
                 request=_build_request(),
             )
 
-    def test_refresh_credentials(self, mocker):
+    def test_refresh_credentials(self, mocker: MockerFixture):
         handler = OAuthHandler()
         stream_mock = mocker.patch.object(
             handler,
@@ -121,7 +122,7 @@ class TestOAuthHandler:
         assert response.credentials == {"token": "new"}
         assert stream_mock.call_count == 1
 
-    def test_refresh_credentials_no_response_raises(self, mocker):
+    def test_refresh_credentials_no_response_raises(self, mocker: MockerFixture):
         handler = OAuthHandler()
         mocker.patch.object(handler, "_request_with_plugin_daemon_response_stream", return_value=iter([]))
 
diff --git a/api/tests/unit_tests/core/plugin/impl/test_tool_manager.py b/api/tests/unit_tests/core/plugin/impl/test_tool_manager.py
index 80cf46f9bb..3ae3cc18e4 100644
--- a/api/tests/unit_tests/core/plugin/impl/test_tool_manager.py
+++ b/api/tests/unit_tests/core/plugin/impl/test_tool_manager.py
@@ -1,5 +1,7 @@
 from types import SimpleNamespace
 
+from pytest_mock import MockerFixture
+
 from core.plugin.entities.plugin_daemon import CredentialType
 from core.plugin.impl.tool import PluginToolManager
 
@@ -15,7 +17,7 @@ def _tool_provider(name: str = "provider") -> SimpleNamespace:
 
 
 class TestPluginToolManager:
-    def test_fetch_tool_providers(self, mocker):
+    def test_fetch_tool_providers(self, mocker: MockerFixture):
         manager = PluginToolManager()
         provider = _tool_provider("remote")
         mocker.patch("core.plugin.impl.tool.resolve_dify_schema_refs", return_value={"resolved": True})
@@ -44,7 +46,7 @@ class TestPluginToolManager:
         assert result[0].declaration.identity.name == "org/plugin/remote"
         assert result[0].declaration.tools[0].identity.provider == "org/plugin/remote"
 
-    def test_fetch_tool_provider(self, mocker):
+    def test_fetch_tool_provider(self, mocker: MockerFixture):
         manager = PluginToolManager()
         provider = _tool_provider("provider")
         mocker.patch("core.plugin.impl.tool.resolve_dify_schema_refs", return_value={"resolved": True})
@@ -68,7 +70,7 @@ class TestPluginToolManager:
         assert result.declaration.identity.name == "org/plugin/provider"
         assert result.declaration.tools[0].identity.provider == "org/plugin/provider"
 
-    def test_invoke_merges_chunks(self, mocker):
+    def test_invoke_merges_chunks(self, mocker: MockerFixture):
         manager = PluginToolManager()
         stream_mock = mocker.patch.object(
             manager, "_request_with_plugin_daemon_response_stream", return_value=iter(["chunk"])
@@ -92,7 +94,7 @@ class TestPluginToolManager:
         assert merge_mock.call_count == 1
         assert stream_mock.call_args.kwargs["headers"]["X-Plugin-ID"] == "org/plugin"
 
-    def test_validate_credentials_paths(self, mocker):
+    def test_validate_credentials_paths(self, mocker: MockerFixture):
         manager = PluginToolManager()
         stream_mock = mocker.patch.object(manager, "_request_with_plugin_daemon_response_stream")
 
@@ -108,7 +110,7 @@ class TestPluginToolManager:
         stream_mock.return_value = iter([])
         assert manager.validate_datasource_credentials("tenant-1", "user-1", "org/plugin/provider", {"k": "v"}) is False
 
-    def test_get_runtime_parameters_paths(self, mocker):
+    def test_get_runtime_parameters_paths(self, mocker: MockerFixture):
         manager = PluginToolManager()
         stream_mock = mocker.patch.object(manager, "_request_with_plugin_daemon_response_stream")
 
diff --git a/api/tests/unit_tests/core/plugin/impl/test_trigger_client.py b/api/tests/unit_tests/core/plugin/impl/test_trigger_client.py
index 76da51c2c8..811bb7e50d 100644
--- a/api/tests/unit_tests/core/plugin/impl/test_trigger_client.py
+++ b/api/tests/unit_tests/core/plugin/impl/test_trigger_client.py
@@ -2,6 +2,7 @@ from io import BytesIO
 from types import SimpleNamespace
 
 import pytest
+from pytest_mock import MockerFixture
 from werkzeug import Request
 
 from core.plugin.entities.plugin_daemon import CredentialType
@@ -62,7 +63,7 @@ def _subscription_call_kwargs(method_name: str) -> dict:
 
 
 class TestPluginTriggerClient:
-    def test_fetch_trigger_providers(self, mocker):
+    def test_fetch_trigger_providers(self, mocker: MockerFixture):
         client = PluginTriggerClient()
         provider = _trigger_provider("remote")
 
@@ -89,7 +90,7 @@ class TestPluginTriggerClient:
         assert result[0].declaration.identity.name == "org/plugin/remote"
         assert result[0].declaration.events[0].identity.provider == "org/plugin/remote"
 
-    def test_fetch_trigger_provider(self, mocker):
+    def test_fetch_trigger_provider(self, mocker: MockerFixture):
         client = PluginTriggerClient()
         provider = _trigger_provider("provider")
 
@@ -108,7 +109,7 @@ class TestPluginTriggerClient:
         assert result.declaration.identity.name == "org/plugin/provider"
         assert result.declaration.events[0].identity.provider == "org/plugin/provider"
 
-    def test_invoke_trigger_event(self, mocker):
+    def test_invoke_trigger_event(self, mocker: MockerFixture):
         client = PluginTriggerClient()
         stream_mock = mocker.patch.object(
             client,
@@ -132,7 +133,7 @@ class TestPluginTriggerClient:
         assert result.variables == {"ok": True}
         assert stream_mock.call_count == 1
 
-    def test_invoke_trigger_event_no_response_raises(self, mocker):
+    def test_invoke_trigger_event_no_response_raises(self, mocker: MockerFixture):
         client = PluginTriggerClient()
         mocker.patch.object(client, "_request_with_plugin_daemon_response_stream", return_value=iter([]))
 
@@ -150,7 +151,7 @@ class TestPluginTriggerClient:
                 payload={"payload": 1},
             )
 
-    def test_validate_provider_credentials(self, mocker):
+    def test_validate_provider_credentials(self, mocker: MockerFixture):
         client = PluginTriggerClient()
         stream_mock = mocker.patch.object(client, "_request_with_plugin_daemon_response_stream")
 
@@ -163,7 +164,7 @@ class TestPluginTriggerClient:
         ):
             client.validate_provider_credentials("tenant-1", "user-1", "org/plugin/provider", {"k": "v"})
 
-    def test_dispatch_event(self, mocker):
+    def test_dispatch_event(self, mocker: MockerFixture):
         client = PluginTriggerClient()
         stream_mock = mocker.patch.object(
             client,
@@ -195,7 +196,7 @@ class TestPluginTriggerClient:
             )
 
     @pytest.mark.parametrize("method_name", ["subscribe", "unsubscribe", "refresh"])
-    def test_subscription_operations_success(self, mocker, method_name):
+    def test_subscription_operations_success(self, mocker: MockerFixture, method_name):
         client = PluginTriggerClient()
         stream_mock = mocker.patch.object(
             client,
@@ -217,7 +218,7 @@ class TestPluginTriggerClient:
             ("refresh", "No response received from plugin daemon for refresh"),
         ],
     )
-    def test_subscription_operations_no_response(self, mocker, method_name, expected):
+    def test_subscription_operations_no_response(self, mocker: MockerFixture, method_name, expected):
         client = PluginTriggerClient()
         mocker.patch.object(client, "_request_with_plugin_daemon_response_stream", return_value=iter([]))
         method = getattr(client, method_name)
diff --git a/api/tests/unit_tests/core/plugin/test_backwards_invocation_app.py b/api/tests/unit_tests/core/plugin/test_backwards_invocation_app.py
index 3feb4159ad..2ed7c70ed9 100644
--- a/api/tests/unit_tests/core/plugin/test_backwards_invocation_app.py
+++ b/api/tests/unit_tests/core/plugin/test_backwards_invocation_app.py
@@ -4,6 +4,7 @@ from unittest.mock import MagicMock
 
 import pytest
 from pydantic import BaseModel
+from pytest_mock import MockerFixture
 
 from core.app.layers.pause_state_persist_layer import PauseStateLayerConfig
 from core.plugin.backwards_invocation.app import PluginAppBackwardsInvocation
@@ -41,7 +42,7 @@ class TestBaseBackwardsInvocation:
 
 
 class TestPluginAppBackwardsInvocation:
-    def test_fetch_app_info_workflow_path(self, mocker):
+    def test_fetch_app_info_workflow_path(self, mocker: MockerFixture):
         workflow = MagicMock()
         workflow.features_dict = {"feature": "v"}
         workflow.user_input_form.return_value = [{"name": "foo"}]
@@ -57,7 +58,7 @@ class TestPluginAppBackwardsInvocation:
         assert result == {"data": {"mapped": True}}
         mapper.assert_called_once_with(features_dict={"feature": "v"}, user_input_form=[{"name": "foo"}])
 
-    def test_fetch_app_info_model_config_path(self, mocker):
+    def test_fetch_app_info_model_config_path(self, mocker: MockerFixture):
         model_config = MagicMock()
         model_config.to_dict.return_value = {"user_input_form": [{"name": "bar"}], "k": "v"}
         app = MagicMock(mode=AppMode.COMPLETION, app_model_config=model_config)
@@ -81,7 +82,7 @@ class TestPluginAppBackwardsInvocation:
             (AppMode.COMPLETION, "invoke_completion_app"),
         ],
     )
-    def test_invoke_app_routes_by_mode(self, mocker, mode, route_method):
+    def test_invoke_app_routes_by_mode(self, mocker: MockerFixture, mode, route_method):
         app = MagicMock(mode=mode)
         user = MagicMock()
         mocker.patch.object(PluginAppBackwardsInvocation, "_get_app", return_value=app)
@@ -102,7 +103,7 @@ class TestPluginAppBackwardsInvocation:
         assert result == {"routed": True}
         assert route.call_count == 1
 
-    def test_invoke_app_uses_end_user_when_user_id_missing(self, mocker):
+    def test_invoke_app_uses_end_user_when_user_id_missing(self, mocker: MockerFixture):
         app = MagicMock(mode=AppMode.WORKFLOW)
         end_user = MagicMock()
         mocker.patch.object(PluginAppBackwardsInvocation, "_get_app", return_value=app)
@@ -127,7 +128,7 @@ class TestPluginAppBackwardsInvocation:
         get_or_create.assert_called_once_with(app)
         assert route.call_args.args[1] is end_user
 
-    def test_invoke_app_missing_query_for_chat_raises(self, mocker):
+    def test_invoke_app_missing_query_for_chat_raises(self, mocker: MockerFixture):
         mocker.patch.object(PluginAppBackwardsInvocation, "_get_app", return_value=MagicMock(mode=AppMode.CHAT))
         mocker.patch.object(PluginAppBackwardsInvocation, "_get_user", return_value=MagicMock())
 
@@ -143,7 +144,7 @@ class TestPluginAppBackwardsInvocation:
                 files=[],
             )
 
-    def test_invoke_app_unexpected_mode_raises(self, mocker):
+    def test_invoke_app_unexpected_mode_raises(self, mocker: MockerFixture):
         mocker.patch.object(PluginAppBackwardsInvocation, "_get_app", return_value=MagicMock(mode="other"))
         mocker.patch.object(PluginAppBackwardsInvocation, "_get_user", return_value=MagicMock())
 
@@ -166,7 +167,7 @@ class TestPluginAppBackwardsInvocation:
             (AppMode.CHAT, "core.plugin.backwards_invocation.app.ChatAppGenerator.generate"),
         ],
     )
-    def test_invoke_chat_app_agent_and_chat(self, mocker, mode, generator_path):
+    def test_invoke_chat_app_agent_and_chat(self, mocker: MockerFixture, mode, generator_path):
         app = MagicMock(mode=mode, workflow=None)
         spy = mocker.patch(generator_path, return_value={"result": "ok"})
 
@@ -183,7 +184,7 @@ class TestPluginAppBackwardsInvocation:
         assert result == {"result": "ok"}
         assert spy.call_count == 1
 
-    def test_invoke_chat_app_advanced_chat_injects_pause_state_config(self, mocker):
+    def test_invoke_chat_app_advanced_chat_injects_pause_state_config(self, mocker: MockerFixture):
         workflow = MagicMock()
         workflow.created_by = "owner-id"
 
@@ -242,7 +243,7 @@ class TestPluginAppBackwardsInvocation:
                 files=[],
             )
 
-    def test_invoke_workflow_app_injects_pause_state_config(self, mocker):
+    def test_invoke_workflow_app_injects_pause_state_config(self, mocker: MockerFixture):
         workflow = MagicMock()
         workflow.created_by = "owner-id"
 
@@ -284,7 +285,7 @@ class TestPluginAppBackwardsInvocation:
                 files=[],
             )
 
-    def test_invoke_completion_app(self, mocker):
+    def test_invoke_completion_app(self, mocker: MockerFixture):
         spy = mocker.patch(
             "core.plugin.backwards_invocation.app.CompletionAppGenerator.generate", return_value={"ok": 1}
         )
@@ -295,7 +296,7 @@ class TestPluginAppBackwardsInvocation:
         assert result == {"ok": 1}
         assert spy.call_count == 1
 
-    def test_get_user_returns_end_user(self, mocker):
+    def test_get_user_returns_end_user(self, mocker: MockerFixture):
         session = MagicMock()
         session.scalar.side_effect = [MagicMock(id="end-user")]
         session_ctx = MagicMock()
@@ -307,7 +308,7 @@ class TestPluginAppBackwardsInvocation:
         user = PluginAppBackwardsInvocation._get_user("uid")
         assert user.id == "end-user"
 
-    def test_get_user_falls_back_to_account_user(self, mocker):
+    def test_get_user_falls_back_to_account_user(self, mocker: MockerFixture):
         session = MagicMock()
         session.scalar.side_effect = [None, MagicMock(id="account-user")]
         session_ctx = MagicMock()
@@ -319,7 +320,7 @@ class TestPluginAppBackwardsInvocation:
         user = PluginAppBackwardsInvocation._get_user("uid")
         assert user.id == "account-user"
 
-    def test_get_user_raises_when_user_not_found(self, mocker):
+    def test_get_user_raises_when_user_not_found(self, mocker: MockerFixture):
         session = MagicMock()
         session.scalar.side_effect = [None, None]
         session_ctx = MagicMock()
@@ -331,21 +332,21 @@ class TestPluginAppBackwardsInvocation:
         with pytest.raises(ValueError, match="user not found"):
             PluginAppBackwardsInvocation._get_user("uid")
 
-    def test_get_app_returns_app(self, mocker):
+    def test_get_app_returns_app(self, mocker: MockerFixture):
         app_obj = MagicMock(id="app")
         db = SimpleNamespace(session=MagicMock(scalar=MagicMock(return_value=app_obj)))
         mocker.patch("core.plugin.backwards_invocation.app.db", db)
 
         assert PluginAppBackwardsInvocation._get_app("app", "tenant") is app_obj
 
-    def test_get_app_raises_when_missing(self, mocker):
+    def test_get_app_raises_when_missing(self, mocker: MockerFixture):
         db = SimpleNamespace(session=MagicMock(scalar=MagicMock(return_value=None)))
         mocker.patch("core.plugin.backwards_invocation.app.db", db)
 
         with pytest.raises(ValueError, match="app not found"):
             PluginAppBackwardsInvocation._get_app("app", "tenant")
 
-    def test_get_app_raises_when_query_fails(self, mocker):
+    def test_get_app_raises_when_query_fails(self, mocker: MockerFixture):
         db = SimpleNamespace(session=MagicMock(scalar=MagicMock(side_effect=RuntimeError("db down"))))
         mocker.patch("core.plugin.backwards_invocation.app.db", db)
 
diff --git a/api/tests/unit_tests/core/plugin/test_model_runtime_adapter.py b/api/tests/unit_tests/core/plugin/test_model_runtime_adapter.py
index 88bf555594..b1ecaa4ead 100644
--- a/api/tests/unit_tests/core/plugin/test_model_runtime_adapter.py
+++ b/api/tests/unit_tests/core/plugin/test_model_runtime_adapter.py
@@ -3,7 +3,7 @@
 import datetime
 import uuid
 from types import SimpleNamespace
-from unittest.mock import Mock, sentinel
+from unittest.mock import Mock, patch, sentinel
 
 import pytest
 
@@ -13,6 +13,8 @@ from core.plugin.impl.model import PluginModelClient
 from core.plugin.impl.model_runtime import TENANT_SCOPE_SCHEMA_CACHE_USER_ID, PluginModelRuntime
 from core.plugin.impl.model_runtime_factory import create_plugin_model_runtime
 from graphon.model_runtime.entities.common_entities import I18nObject
+from graphon.model_runtime.entities.llm_entities import LLMResultChunk, LLMResultChunkDelta, LLMUsage
+from graphon.model_runtime.entities.message_entities import AssistantPromptMessage
 from graphon.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType
 from graphon.model_runtime.entities.provider_entities import ConfigurateMethod, ProviderEntity
 
@@ -146,7 +148,31 @@ class TestPluginModelRuntime:
 
     def test_invoke_llm_resolves_plugin_fields(self) -> None:
         client = Mock(spec=PluginModelClient)
-        client.invoke_llm.return_value = sentinel.result
+        usage = LLMUsage.empty_usage()
+        client.invoke_llm.return_value = iter(
+            [
+                LLMResultChunk(
+                    model="gpt-4o-mini",
+                    prompt_messages=[],
+                    system_fingerprint="fp-plugin",
+                    delta=LLMResultChunkDelta(
+                        index=0,
+                        message=AssistantPromptMessage(content="plugin "),
+                    ),
+                ),
+                LLMResultChunk(
+                    model="gpt-4o-mini",
+                    prompt_messages=[],
+                    system_fingerprint="fp-plugin",
+                    delta=LLMResultChunkDelta(
+                        index=1,
+                        message=AssistantPromptMessage(content="response"),
+                        usage=usage,
+                        finish_reason="stop",
+                    ),
+                ),
+            ]
+        )
         runtime = PluginModelRuntime(tenant_id="tenant", user_id="user", client=client)
 
         result = runtime.invoke_llm(
@@ -160,7 +186,11 @@ class TestPluginModelRuntime:
             stream=False,
         )
 
-        assert result is sentinel.result
+        assert result.model == "gpt-4o-mini"
+        assert result.prompt_messages == []
+        assert result.message.content == "plugin response"
+        assert result.usage == usage
+        assert result.system_fingerprint == "fp-plugin"
         client.invoke_llm.assert_called_once_with(
             tenant_id="tenant",
             user_id="user",
@@ -175,6 +205,38 @@ class TestPluginModelRuntime:
             stream=False,
         )
 
+    def test_invoke_llm_returns_plugin_stream_directly(self) -> None:
+        client = Mock(spec=PluginModelClient)
+        stream_result = iter([])
+        client.invoke_llm.return_value = stream_result
+        runtime = PluginModelRuntime(tenant_id="tenant", user_id="user", client=client)
+
+        result = runtime.invoke_llm(
+            provider="langgenius/openai/openai",
+            model="gpt-4o-mini",
+            credentials={"api_key": "secret"},
+            model_parameters={"temperature": 0.3},
+            prompt_messages=[],
+            tools=None,
+            stop=("END",),
+            stream=True,
+        )
+
+        assert result is stream_result
+        client.invoke_llm.assert_called_once_with(
+            tenant_id="tenant",
+            user_id="user",
+            plugin_id="langgenius/openai",
+            provider="openai",
+            model="gpt-4o-mini",
+            credentials={"api_key": "secret"},
+            model_parameters={"temperature": 0.3},
+            prompt_messages=[],
+            tools=None,
+            stop=["END"],
+            stream=True,
+        )
+
     def test_invoke_llm_rejects_per_call_user_override(self) -> None:
         client = Mock(spec=PluginModelClient)
         client.invoke_llm.return_value = sentinel.result
@@ -267,6 +329,129 @@ def test_get_model_schema_uses_cached_schema_without_hitting_client(monkeypatch:
     client.get_model_schema.assert_not_called()
 
 
+def test_structured_output_adapter_invokes_bound_runtime_streaming() -> None:
+    runtime = Mock()
+    runtime.invoke_llm.return_value = sentinel.stream_result
+    adapter = model_runtime_module._PluginStructuredOutputModelInstance(
+        runtime=runtime,
+        provider="langgenius/openai/openai",
+        model="gpt-4o-mini",
+        credentials={"api_key": "secret"},
+    )
+    tool = Mock()
+
+    result = adapter.invoke_llm(
+        prompt_messages=[],
+        model_parameters=None,
+        tools=[tool],
+        stop=["END"],
+        stream=True,
+        callbacks=sentinel.callbacks,
+    )
+
+    assert result is sentinel.stream_result
+    runtime.invoke_llm.assert_called_once_with(
+        provider="langgenius/openai/openai",
+        model="gpt-4o-mini",
+        credentials={"api_key": "secret"},
+        model_parameters={},
+        prompt_messages=[],
+        tools=[tool],
+        stop=["END"],
+        stream=True,
+    )
+
+
+def test_structured_output_adapter_invokes_bound_runtime_non_streaming() -> None:
+    runtime = Mock()
+    runtime.invoke_llm.return_value = sentinel.result
+    adapter = model_runtime_module._PluginStructuredOutputModelInstance(
+        runtime=runtime,
+        provider="langgenius/openai/openai",
+        model="gpt-4o-mini",
+        credentials={"api_key": "secret"},
+    )
+
+    result = adapter.invoke_llm(
+        prompt_messages=[],
+        model_parameters={"temperature": 0},
+        tools=None,
+        stop=None,
+        stream=False,
+    )
+
+    assert result is sentinel.result
+    runtime.invoke_llm.assert_called_once_with(
+        provider="langgenius/openai/openai",
+        model="gpt-4o-mini",
+        credentials={"api_key": "secret"},
+        model_parameters={"temperature": 0},
+        prompt_messages=[],
+        tools=None,
+        stop=None,
+        stream=False,
+    )
+
+
+def test_invoke_llm_with_structured_output_delegates_with_bound_adapter() -> None:
+    client = Mock(spec=PluginModelClient)
+    runtime = PluginModelRuntime(tenant_id="tenant", user_id="user", client=client)
+    schema = _build_model_schema()
+    runtime.get_model_schema = Mock(return_value=schema)  # type: ignore[method-assign]
+
+    with patch.object(
+        model_runtime_module,
+        "invoke_llm_with_structured_output_helper",
+        return_value=sentinel.structured_result,
+    ) as mock_helper:
+        result = runtime.invoke_llm_with_structured_output(
+            provider="langgenius/openai/openai",
+            model="gpt-4o-mini",
+            credentials={"api_key": "secret"},
+            json_schema={"type": "object"},
+            model_parameters={"temperature": 0},
+            prompt_messages=[],
+            stop=("END",),
+            stream=False,
+        )
+
+    assert result is sentinel.structured_result
+    runtime.get_model_schema.assert_called_once_with(
+        provider="langgenius/openai/openai",
+        model_type=ModelType.LLM,
+        model="gpt-4o-mini",
+        credentials={"api_key": "secret"},
+    )
+    helper_kwargs = mock_helper.call_args.kwargs
+    assert helper_kwargs["provider"] == "langgenius/openai/openai"
+    assert helper_kwargs["model_schema"] == schema
+    assert helper_kwargs["json_schema"] == {"type": "object"}
+    assert helper_kwargs["model_parameters"] == {"temperature": 0}
+    assert helper_kwargs["prompt_messages"] == []
+    assert helper_kwargs["tools"] is None
+    assert helper_kwargs["stop"] == ["END"]
+    assert helper_kwargs["stream"] is False
+    assert isinstance(helper_kwargs["model_instance"], model_runtime_module._PluginStructuredOutputModelInstance)
+
+
+def test_invoke_llm_with_structured_output_raises_when_model_schema_is_missing() -> None:
+    client = Mock(spec=PluginModelClient)
+    runtime = PluginModelRuntime(tenant_id="tenant", user_id="user", client=client)
+    runtime.get_model_schema = Mock(return_value=None)  # type: ignore[method-assign]
+
+    with pytest.raises(ValueError, match="Model schema not found for gpt-4o-mini"):
+        runtime.invoke_llm_with_structured_output(
+            provider="langgenius/openai/openai",
+            model="gpt-4o-mini",
+            credentials={"api_key": "secret"},
+            json_schema={"type": "object"},
+            model_parameters={},
+            prompt_messages=[],
+            stop=None,
+            stream=False,
+        )
+
+
 def test_get_model_schema_deletes_invalid_cache_and_refetches(monkeypatch: pytest.MonkeyPatch) -> None:
     client = Mock(spec=PluginModelClient)
     schema = _build_model_schema()
diff --git a/api/tests/unit_tests/core/plugin/test_plugin_entities.py b/api/tests/unit_tests/core/plugin/test_plugin_entities.py
index f1c4c7e700..deac0ba1da 100644
--- a/api/tests/unit_tests/core/plugin/test_plugin_entities.py
+++ b/api/tests/unit_tests/core/plugin/test_plugin_entities.py
@@ -5,6 +5,7 @@ from enum import StrEnum
 import pytest
 from flask import Response
 from pydantic import ValidationError
+from pytest_mock import MockerFixture
 
 from core.plugin.entities.endpoint import EndpointEntityWithInstance
 from core.plugin.entities.marketplace import MarketplacePluginDeclaration, MarketplacePluginSnapshot
@@ -34,7 +35,7 @@ from graphon.model_runtime.entities.message_entities import (
 
 
 class TestEndpointEntity:
-    def test_endpoint_entity_with_instance_renders_url(self, mocker):
+    def test_endpoint_entity_with_instance_renders_url(self, mocker: MockerFixture):
         mocker.patch("core.plugin.entities.endpoint.dify_config.ENDPOINT_URL_TEMPLATE", "https://dify.test/{hook_id}")
         now = datetime.datetime.now(datetime.UTC)
 
diff --git a/api/tests/unit_tests/core/prompt/test_extract_thread_messages.py b/api/tests/unit_tests/core/prompt/test_extract_thread_messages.py
index 1b114b369a..1f46634b89 100644
--- a/api/tests/unit_tests/core/prompt/test_extract_thread_messages.py
+++ b/api/tests/unit_tests/core/prompt/test_extract_thread_messages.py
@@ -1,5 +1,7 @@
 from uuid import uuid4
 
+from pytest_mock import MockerFixture
+
 from constants import UUID_NIL
 from core.prompt.utils.extract_thread_messages import extract_thread_messages
 from core.prompt.utils.get_thread_messages_length import get_thread_messages_length
@@ -103,7 +105,7 @@ def test_extract_thread_messages_breaks_when_parent_is_none():
     assert result[0].id == id2
 
 
-def test_get_thread_messages_length_excludes_newly_created_empty_answer(mocker):
+def test_get_thread_messages_length_excludes_newly_created_empty_answer(mocker: MockerFixture):
     id1, id2 = str(uuid4()), str(uuid4())
     messages = [
         MockMessage(id2, id1, answer=""),  # newest generated message should be excluded
@@ -119,7 +121,7 @@ def test_get_thread_messages_length_excludes_newly_created_empty_answer(mocker):
     mock_scalars.assert_called_once()
 
 
-def test_get_thread_messages_length_keeps_non_empty_latest_answer(mocker):
+def test_get_thread_messages_length_keeps_non_empty_latest_answer(mocker: MockerFixture):
     id1, id2 = str(uuid4()), str(uuid4())
     messages = [
         MockMessage(id2, id1, answer="latest-answer"),
diff --git a/api/tests/unit_tests/core/prompt/test_prompt_transform.py b/api/tests/unit_tests/core/prompt/test_prompt_transform.py
index 5308c8e7b3..3d71e73496 100644
--- a/api/tests/unit_tests/core/prompt/test_prompt_transform.py
+++ b/api/tests/unit_tests/core/prompt/test_prompt_transform.py
@@ -209,7 +209,7 @@ class TestPromptTransform:
         assert result == ["only"]
         memory.get_history_prompt_messages.assert_called_with(max_token_limit=10, message_limit=None)
 
-    def test_append_chat_histories_extends_prompt_messages(self, monkeypatch):
+    def test_append_chat_histories_extends_prompt_messages(self, monkeypatch: pytest.MonkeyPatch):
         transform = PromptTransform()
         memory = MagicMock()
         memory_config = SimpleNamespace(window=SimpleNamespace(enabled=False, size=None))
diff --git a/api/tests/unit_tests/core/rag/datasource/keyword/jieba/test_jieba.py b/api/tests/unit_tests/core/rag/datasource/keyword/jieba/test_jieba.py
index 1e91c2dd88..e233bd2ef0 100644
--- a/api/tests/unit_tests/core/rag/datasource/keyword/jieba/test_jieba.py
+++ b/api/tests/unit_tests/core/rag/datasource/keyword/jieba/test_jieba.py
@@ -67,7 +67,7 @@ def _dataset(dataset_keyword_table=None, keyword_number=None):
 
 
 @pytest.fixture
-def patched_runtime(monkeypatch):
+def patched_runtime(monkeypatch: pytest.MonkeyPatch):
     session = MagicMock()
     db = SimpleNamespace(session=session)
     storage = MagicMock()
@@ -151,7 +151,7 @@ def test_add_texts_without_keywords_list_always_uses_extractor(monkeypatch, patc
     assert set(keyword._update_segment_keywords.call_args.args[2]) == {"from-extractor"}
 
 
-def test_text_exists_handles_missing_and_existing_keyword_table(monkeypatch):
+def test_text_exists_handles_missing_and_existing_keyword_table(monkeypatch: pytest.MonkeyPatch):
     keyword = Jieba(_dataset(_dataset_keyword_table()))
 
     monkeypatch.setattr(keyword, "_get_dataset_keyword_table", MagicMock(return_value=None))
@@ -308,7 +308,7 @@ def test_add_and_delete_ids_from_keyword_table_helpers():
     assert deleted["kw2"] == {"node-2"}
 
 
-def test_retrieve_ids_by_query_ranks_by_keyword_frequency(monkeypatch):
+def test_retrieve_ids_by_query_ranks_by_keyword_frequency(monkeypatch: pytest.MonkeyPatch):
     keyword = Jieba(_dataset(_dataset_keyword_table()))
     handler = MagicMock()
     handler.extract_keywords.return_value = ["kw-a", "kw-b"]
@@ -350,7 +350,7 @@ def test_update_segment_keywords_updates_when_segment_exists(monkeypatch, patche
     patched_runtime.session.commit.assert_not_called()
 
 
-def test_create_segment_keywords_and_update_segment_keywords_index(monkeypatch):
+def test_create_segment_keywords_and_update_segment_keywords_index(monkeypatch: pytest.MonkeyPatch):
     keyword = Jieba(_dataset(_dataset_keyword_table()))
     monkeypatch.setattr(keyword, "_get_dataset_keyword_table", MagicMock(return_value={}))
     monkeypatch.setattr(keyword, "_update_segment_keywords", MagicMock())
@@ -365,7 +365,7 @@ def test_create_segment_keywords_and_update_segment_keywords_index(monkeypatch):
     keyword._save_dataset_keyword_table.assert_called_once()
 
 
-def test_multi_create_segment_keywords_uses_provided_and_extracted_keywords(monkeypatch):
+def test_multi_create_segment_keywords_uses_provided_and_extracted_keywords(monkeypatch: pytest.MonkeyPatch):
     keyword = Jieba(_dataset(_dataset_keyword_table(), keyword_number=2))
     handler = MagicMock()
     handler.extract_keywords.return_value = {"auto"}
diff --git a/api/tests/unit_tests/core/rag/datasource/keyword/jieba/test_jieba_keyword_table_handler.py b/api/tests/unit_tests/core/rag/datasource/keyword/jieba/test_jieba_keyword_table_handler.py
index a4586c141b..c8ee75bf43 100644
--- a/api/tests/unit_tests/core/rag/datasource/keyword/jieba/test_jieba_keyword_table_handler.py
+++ b/api/tests/unit_tests/core/rag/datasource/keyword/jieba/test_jieba_keyword_table_handler.py
@@ -2,6 +2,8 @@ import sys
 import types
 from types import SimpleNamespace
 
+import pytest
+
 from core.rag.datasource.keyword.jieba.jieba_keyword_table_handler import JiebaKeywordTableHandler
 from core.rag.datasource.keyword.jieba.stopwords import STOPWORDS
 
@@ -38,7 +40,7 @@ def _install_fake_jieba_modules(
         monkeypatch.delitem(sys.modules, "jieba.analyse.tfidf", raising=False)
 
 
-def test_init_uses_existing_default_tfidf(monkeypatch):
+def test_init_uses_existing_default_tfidf(monkeypatch: pytest.MonkeyPatch):
     analyse_module = types.ModuleType("jieba.analyse")
     default_tfidf = _DummyTFIDF()
     analyse_module.default_tfidf = default_tfidf
@@ -51,7 +53,7 @@ def test_init_uses_existing_default_tfidf(monkeypatch):
     assert handler._tfidf.stop_words == STOPWORDS
 
 
-def test_load_tfidf_extractor_uses_tfidf_class_and_caches_default(monkeypatch):
+def test_load_tfidf_extractor_uses_tfidf_class_and_caches_default(monkeypatch: pytest.MonkeyPatch):
     analyse_module = types.ModuleType("jieba.analyse")
     analyse_module.default_tfidf = None
 
@@ -67,7 +69,7 @@ def test_load_tfidf_extractor_uses_tfidf_class_and_caches_default(monkeypatch):
     assert analyse_module.default_tfidf is handler._tfidf
 
 
-def test_load_tfidf_extractor_imports_from_tfidf_submodule(monkeypatch):
+def test_load_tfidf_extractor_imports_from_tfidf_submodule(monkeypatch: pytest.MonkeyPatch):
     analyse_module = types.ModuleType("jieba.analyse")
     analyse_module.default_tfidf = None
 
@@ -85,7 +87,7 @@ def test_load_tfidf_extractor_imports_from_tfidf_submodule(monkeypatch):
     assert analyse_module.default_tfidf is handler._tfidf
 
 
-def test_load_tfidf_extractor_falls_back_when_tfidf_unavailable(monkeypatch):
+def test_load_tfidf_extractor_falls_back_when_tfidf_unavailable(monkeypatch: pytest.MonkeyPatch):
     analyse_module = types.ModuleType("jieba.analyse")
     analyse_module.default_tfidf = None
     _install_fake_jieba_modules(monkeypatch, analyse_module)
@@ -96,7 +98,7 @@ def test_load_tfidf_extractor_falls_back_when_tfidf_unavailable(monkeypatch):
     assert fallback_keywords == ["two"]
 
 
-def test_build_fallback_tfidf_uses_lcut_when_available(monkeypatch):
+def test_build_fallback_tfidf_uses_lcut_when_available(monkeypatch: pytest.MonkeyPatch):
     analyse_module = types.ModuleType("jieba.analyse")
     _install_fake_jieba_modules(monkeypatch, analyse_module, jieba_attrs={"lcut": lambda _: ["x", "x", "y"]})
 
@@ -105,7 +107,7 @@ def test_build_fallback_tfidf_uses_lcut_when_available(monkeypatch):
     assert tfidf.extract_tags("ignored", topK=1) == ["x"]
 
 
-def test_build_fallback_tfidf_uses_cut_when_lcut_is_missing(monkeypatch):
+def test_build_fallback_tfidf_uses_cut_when_lcut_is_missing(monkeypatch: pytest.MonkeyPatch):
     analyse_module = types.ModuleType("jieba.analyse")
     _install_fake_jieba_modules(
         monkeypatch,
diff --git a/api/tests/unit_tests/core/rag/datasource/keyword/test_keyword_factory.py b/api/tests/unit_tests/core/rag/datasource/keyword/test_keyword_factory.py
index 0d969a3270..e1765b17cb 100644
--- a/api/tests/unit_tests/core/rag/datasource/keyword/test_keyword_factory.py
+++ b/api/tests/unit_tests/core/rag/datasource/keyword/test_keyword_factory.py
@@ -10,7 +10,7 @@ from core.rag.datasource.keyword.keyword_type import KeyWordType
 from core.rag.models.document import Document
 
 
-def test_get_keyword_factory_returns_jieba_factory(monkeypatch):
+def test_get_keyword_factory_returns_jieba_factory(monkeypatch: pytest.MonkeyPatch):
     fake_module = types.ModuleType("core.rag.datasource.keyword.jieba.jieba")
 
     class FakeJieba:
@@ -27,7 +27,7 @@ def test_get_keyword_factory_raises_for_unsupported_type():
         Keyword.get_keyword_factory("unsupported")
 
 
-def test_keyword_initialization_uses_configured_factory(monkeypatch):
+def test_keyword_initialization_uses_configured_factory(monkeypatch: pytest.MonkeyPatch):
     dataset = SimpleNamespace(id="dataset-1")
     fake_processor = MagicMock()
 
diff --git a/api/tests/unit_tests/core/rag/datasource/test_datasource_retrieval.py b/api/tests/unit_tests/core/rag/datasource/test_datasource_retrieval.py
index b0ecad4d0c..f72351ffa2 100644
--- a/api/tests/unit_tests/core/rag/datasource/test_datasource_retrieval.py
+++ b/api/tests/unit_tests/core/rag/datasource/test_datasource_retrieval.py
@@ -182,7 +182,7 @@ class TestRetrievalServiceInternals:
         app.app_context.return_value.__exit__.return_value = False
         return app
 
-    def test_retrieve_with_attachment_ids_only(self, monkeypatch, internal_dataset):
+    def test_retrieve_with_attachment_ids_only(self, monkeypatch: pytest.MonkeyPatch, internal_dataset):
         with (
             patch("core.rag.datasource.retrieval_service.RetrievalService._get_dataset", return_value=internal_dataset),
             patch("core.rag.datasource.retrieval_service.RetrievalService._retrieve") as mock_retrieve,
@@ -699,7 +699,9 @@ class TestRetrievalServiceInternals:
 
         assert RetrievalService.format_retrieval_documents(documents) == []
 
-    def test_format_retrieval_documents_with_parent_child_summary_and_attachments(self, monkeypatch):
+    def test_format_retrieval_documents_with_parent_child_summary_and_attachments(
+        self, monkeypatch: pytest.MonkeyPatch
+    ):
         dataset_doc_parent = SimpleNamespace(
             id="doc-parent",
             doc_form=IndexStructureType.PARENT_CHILD_INDEX,
@@ -877,7 +879,7 @@ class TestRetrievalServiceInternals:
         assert result_by_segment_id["segment-parent-summary"].summary == "summary for parent"
         assert result_by_segment_id["segment-parent-summary"].child_chunks == []
 
-    def test_format_retrieval_documents_rolls_back_and_raises_when_db_fails(self, monkeypatch):
+    def test_format_retrieval_documents_rolls_back_and_raises_when_db_fails(self, monkeypatch: pytest.MonkeyPatch):
         rollback = Mock()
         monkeypatch.setattr(retrieval_service_module.db.session, "rollback", rollback)
         monkeypatch.setattr(retrieval_service_module.db.session, "scalars", Mock(side_effect=RuntimeError("db error")))
@@ -936,7 +938,7 @@ class TestRetrievalServiceInternals:
         future_ok.cancel.assert_called()
 
     def test_retrieve_internal_raises_value_error_when_exceptions_exist(
-        self, monkeypatch, internal_dataset, internal_flask_app
+        self, monkeypatch: pytest.MonkeyPatch, internal_dataset, internal_flask_app
     ):
         executor = _ImmediateExecutor()
         monkeypatch.setattr(retrieval_service_module, "ThreadPoolExecutor", lambda *args, **kwargs: executor)
@@ -958,7 +960,9 @@ class TestRetrievalServiceInternals:
                     query="query",
                 )
 
-    def test_retrieve_internal_hybrid_weighted_attachment_flow(self, monkeypatch, internal_dataset, internal_flask_app):
+    def test_retrieve_internal_hybrid_weighted_attachment_flow(
+        self, monkeypatch: pytest.MonkeyPatch, internal_dataset, internal_flask_app
+    ):
         executor = _ImmediateExecutor()
         monkeypatch.setattr(retrieval_service_module, "ThreadPoolExecutor", lambda *args, **kwargs: executor)
         monkeypatch.setattr(
@@ -1034,7 +1038,7 @@ class TestRetrievalServiceInternals:
         assert any(doc.metadata["doc_id"] == "processed-doc" for doc in all_documents)
         processor_instance.invoke.assert_called_once()
 
-    @patch("core.rag.datasource.retrieval_service.sign_upload_file", return_value="signed://file")
+    @patch("core.rag.datasource.retrieval_service.sign_upload_file_preview_url", return_value="signed://file")
     def test_get_segment_attachment_info_success(self, mock_sign):
         upload_file = SimpleNamespace(
             id="upload-1",
@@ -1114,7 +1118,7 @@ class TestRetrievalServiceInternals:
 
         assert result == []
 
-    @patch("core.rag.datasource.retrieval_service.sign_upload_file", return_value="signed://file")
+    @patch("core.rag.datasource.retrieval_service.sign_upload_file_preview_url", return_value="signed://file")
     def test_get_segment_attachment_infos_success(self, mock_sign):
         upload_file_1 = SimpleNamespace(
             id="upload-1",
diff --git a/api/tests/unit_tests/core/rag/datasource/test_retrieval_attachment_access.py b/api/tests/unit_tests/core/rag/datasource/test_retrieval_attachment_access.py
new file mode 100644
index 0000000000..426ffc498b
--- /dev/null
+++ b/api/tests/unit_tests/core/rag/datasource/test_retrieval_attachment_access.py
@@ -0,0 +1,164 @@
+from __future__ import annotations
+
+from types import SimpleNamespace
+from uuid import uuid4
+
+from sqlalchemy import select
+
+from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
+from core.app.file_access import (
+    DatabaseFileAccessController,
+    FileAccessScope,
+    bind_file_access_scope,
+    get_current_file_access_scope,
+    grant_retriever_segment_access,
+    grant_upload_file_access,
+    is_retriever_segment_access_granted,
+)
+from core.rag.datasource.retrieval_service import RetrievalService
+from core.rag.retrieval import dataset_retrieval as dataset_retrieval_module
+from core.rag.retrieval.dataset_retrieval import DatasetRetrieval
+from core.workflow.nodes.knowledge_retrieval.retrieval import KnowledgeRetrievalRequest
+from models import UploadFile
+
+
+class _ScalarResult:
+    def __init__(self, values):
+        self._values = values
+
+    def all(self):
+        return self._values
+
+
+class _AttachmentSession:
+    def __init__(self, upload_file, binding):
+        self._results = [
+            _ScalarResult([upload_file]),
+            _ScalarResult([binding]),
+        ]
+
+    def scalars(self, _stmt):
+        return self._results.pop(0)
+
+
+class _DatasetRetrievalSession:
+    def __init__(self, datasets, documents):
+        self._results = [
+            _ScalarResult(datasets),
+            _ScalarResult(documents),
+        ]
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc, tb):
+        return False
+
+    def scalars(self, _stmt):
+        return self._results.pop(0)
+
+
+def test_file_access_grants_ignore_empty_inputs_and_missing_scope() -> None:
+    grant_upload_file_access(["upload-file-id"])
+    grant_retriever_segment_access(["segment-id"])
+    assert is_retriever_segment_access_granted("segment-id") is True
+
+    scope = FileAccessScope(
+        tenant_id=str(uuid4()),
+        user_id=str(uuid4()),
+        user_from=UserFrom.END_USER,
+        invoke_from=InvokeFrom.WEB_APP,
+    )
+
+    with bind_file_access_scope(scope):
+        grant_upload_file_access([""])
+        grant_retriever_segment_access([""])
+        current_scope = get_current_file_access_scope()
+
+    assert current_scope is not None
+    assert current_scope.granted_upload_file_ids == frozenset()
+    assert current_scope.granted_retriever_segment_ids == frozenset()
+
+
+def test_segment_attachment_lookup_grants_returned_upload_files_to_current_scope() -> None:
+    tenant_id = str(uuid4())
+    upload_file_id = str(uuid4())
+    segment_id = str(uuid4())
+    upload_file = SimpleNamespace(
+        id=upload_file_id,
+        name="chart.png",
+        extension="png",
+        mime_type="image/png",
+        size=1024,
+    )
+    binding = SimpleNamespace(attachment_id=upload_file_id, segment_id=segment_id)
+    session = _AttachmentSession(upload_file, binding)
+    scope = FileAccessScope(
+        tenant_id=tenant_id,
+        user_id=str(uuid4()),
+        user_from=UserFrom.END_USER,
+        invoke_from=InvokeFrom.WEB_APP,
+    )
+
+    with bind_file_access_scope(scope):
+        result = RetrievalService.get_segment_attachment_infos([upload_file_id], session)  # type: ignore[arg-type]
+        scoped_stmt = DatabaseFileAccessController().apply_upload_file_filters(
+            select(UploadFile).where(UploadFile.id == upload_file_id)
+        )
+
+    assert result[0]["attachment_id"] == upload_file_id
+    whereclause = str(scoped_stmt.whereclause)
+    assert "upload_files.created_by_role" in whereclause
+    assert "upload_files.id IN" in whereclause
+
+
+def test_knowledge_retrieval_grants_returned_segments_to_current_scope(monkeypatch) -> None:
+    tenant_id = str(uuid4())
+    dataset_id = str(uuid4())
+    document_id = str(uuid4())
+    segment_id = str(uuid4())
+    segment = SimpleNamespace(
+        id=segment_id,
+        dataset_id=dataset_id,
+        document_id=document_id,
+        hit_count=1,
+        word_count=10,
+        position=1,
+        index_node_hash="hash",
+        answer=None,
+        get_sign_content=lambda: "segment content",
+    )
+    record = SimpleNamespace(segment=segment, score=0.8, child_chunks=None, files=None, summary=None)
+    dataset = SimpleNamespace(id=dataset_id, name="Dataset")
+    document = SimpleNamespace(id=document_id, name="Document", data_source_type="upload_file", doc_metadata={})
+    retrieval = DatasetRetrieval()
+    monkeypatch.setattr(retrieval, "_check_knowledge_rate_limit", lambda tenant_id: None)
+    monkeypatch.setattr(retrieval, "_get_available_datasets", lambda tenant_id, dataset_ids: [dataset])
+    monkeypatch.setattr(retrieval, "multiple_retrieve", lambda **kwargs: [SimpleNamespace(provider="dify")])
+    monkeypatch.setattr(RetrievalService, "format_retrieval_documents", lambda documents: [record])
+    session = _DatasetRetrievalSession([dataset], [document])
+    monkeypatch.setattr(dataset_retrieval_module.session_factory, "create_session", lambda: session)
+    scope = FileAccessScope(
+        tenant_id=tenant_id,
+        user_id=str(uuid4()),
+        user_from=UserFrom.END_USER,
+        invoke_from=InvokeFrom.WEB_APP,
+    )
+
+    with bind_file_access_scope(scope):
+        results = retrieval.knowledge_retrieval(
+            KnowledgeRetrievalRequest(
+                tenant_id=tenant_id,
+                user_id=str(uuid4()),
+                app_id=str(uuid4()),
+                user_from=UserFrom.END_USER.value,
+                dataset_ids=[dataset_id],
+                query="desktop picture",
+                retrieval_mode="multiple",
+            )
+        )
+        current_scope = get_current_file_access_scope()
+
+    assert results[0].metadata.segment_id == segment_id
+    assert current_scope is not None
+    assert segment_id in current_scope.granted_retriever_segment_ids
diff --git a/api/tests/unit_tests/core/rag/datasource/vdb/test_vector_factory.py b/api/tests/unit_tests/core/rag/datasource/vdb/test_vector_factory.py
index 7b6ee97f1c..067159398d 100644
--- a/api/tests/unit_tests/core/rag/datasource/vdb/test_vector_factory.py
+++ b/api/tests/unit_tests/core/rag/datasource/vdb/test_vector_factory.py
@@ -102,7 +102,9 @@ def test_gen_index_struct_dict(vector_factory_module):
         ("HOLOGRES", "dify_vdb_hologres.hologres_vector", "HologresVectorFactory"),
     ],
 )
-def test_get_vector_factory_supported(vector_factory_module, monkeypatch, vector_type, module_path, class_name):
+def test_get_vector_factory_supported(
+    vector_factory_module, monkeypatch: pytest.MonkeyPatch, vector_type, module_path, class_name
+):
     expected_cls = _register_fake_factory_module(monkeypatch, module_path, class_name)
 
     result_cls = vector_factory_module.Vector.get_vector_factory(getattr(vector_factory_module.VectorType, vector_type))
@@ -119,7 +121,7 @@ class _PluginChromaFactory:
     """Stub used only for entry-point override test."""
 
 
-def test_get_vector_factory_entry_point_overrides_builtin(vector_factory_module, monkeypatch):
+def test_get_vector_factory_entry_point_overrides_builtin(vector_factory_module, monkeypatch: pytest.MonkeyPatch):
     from importlib.metadata import EntryPoint
 
     from core.rag.datasource.vdb import vector_backend_registry as reg
@@ -171,7 +173,7 @@ def test_vector_init_uses_default_and_custom_attributes(vector_factory_module):
     assert default_vector._vector_processor == "processor"
 
 
-def test_lazy_embeddings_defer_real_load_until_first_embed_call(vector_factory_module, monkeypatch):
+def test_lazy_embeddings_defer_real_load_until_first_embed_call(vector_factory_module, monkeypatch: pytest.MonkeyPatch):
     """``Vector(dataset)`` must not transitively call ``ModelManager`` during
     construction. The real embedding model should only be materialized on the
     first ``embed_*`` call (i.e. create / search paths) so cleanup paths
@@ -214,7 +216,7 @@ def test_lazy_embeddings_defer_real_load_until_first_embed_call(vector_factory_m
     inner_model.embed_documents.assert_called_once_with(["world"])
 
 
-def test_init_vector_prefers_dataset_index_struct(vector_factory_module, monkeypatch):
+def test_init_vector_prefers_dataset_index_struct(vector_factory_module, monkeypatch: pytest.MonkeyPatch):
     calls = {"vector_type": None, "init_args": None}
 
     class _Factory:
@@ -242,7 +244,7 @@ def test_init_vector_prefers_dataset_index_struct(vector_factory_module, monkeyp
     assert calls["init_args"] == (vector._dataset, ["doc_id"], "embeddings")
 
 
-def test_init_vector_uses_whitelist_override(vector_factory_module, monkeypatch):
+def test_init_vector_uses_whitelist_override(vector_factory_module, monkeypatch: pytest.MonkeyPatch):
     class _Expr:
         def __eq__(self, _other):
             return "expr"
@@ -279,7 +281,7 @@ def test_init_vector_uses_whitelist_override(vector_factory_module, monkeypatch)
     assert calls["vector_type"] == vector_factory_module.VectorType.TIDB_ON_QDRANT
 
 
-def test_init_vector_raises_when_vector_store_missing(vector_factory_module, monkeypatch):
+def test_init_vector_raises_when_vector_store_missing(vector_factory_module, monkeypatch: pytest.MonkeyPatch):
     monkeypatch.setattr(vector_factory_module.dify_config, "VECTOR_STORE", None)
     monkeypatch.setattr(vector_factory_module.dify_config, "VECTOR_STORE_WHITELIST_ENABLE", False)
 
@@ -343,7 +345,7 @@ def test_create_skips_empty_text_documents_before_embedding(vector_factory_modul
     vector._vector_processor.create.assert_not_called()
 
 
-def test_create_multimodal_filters_missing_uploads(vector_factory_module, monkeypatch):
+def test_create_multimodal_filters_missing_uploads(vector_factory_module, monkeypatch: pytest.MonkeyPatch):
     class _Field:
         def in_(self, value):
             return value
@@ -484,7 +486,7 @@ def test_vector_delegation_methods(vector_factory_module):
     vector._vector_processor.delete_by_metadata_field.assert_called_once_with("doc_id", "doc-1")
 
 
-def test_search_by_file_handles_missing_and_existing_upload(vector_factory_module, monkeypatch):
+def test_search_by_file_handles_missing_and_existing_upload(vector_factory_module, monkeypatch: pytest.MonkeyPatch):
     vector = vector_factory_module.Vector.__new__(vector_factory_module.Vector)
     vector._embeddings = MagicMock()
     vector._vector_processor = MagicMock()
@@ -507,7 +509,7 @@ def test_search_by_file_handles_missing_and_existing_upload(vector_factory_modul
     assert payload["file_id"] == "file-2"
 
 
-def test_delete_clears_redis_cache_when_collection_exists(vector_factory_module, monkeypatch):
+def test_delete_clears_redis_cache_when_collection_exists(vector_factory_module, monkeypatch: pytest.MonkeyPatch):
     delete_mock = MagicMock()
     redis_delete = MagicMock()
     monkeypatch.setattr(vector_factory_module.redis_client, "delete", redis_delete)
@@ -526,7 +528,7 @@ def test_delete_clears_redis_cache_when_collection_exists(vector_factory_module,
     redis_delete.assert_not_called()
 
 
-def test_get_embeddings_builds_cache_embedding(vector_factory_module, monkeypatch):
+def test_get_embeddings_builds_cache_embedding(vector_factory_module, monkeypatch: pytest.MonkeyPatch):
     model_manager = MagicMock()
     model_manager.get_model_instance.return_value = "model-instance"
 
diff --git a/api/tests/unit_tests/core/rag/extractor/test_csv_extractor.py b/api/tests/unit_tests/core/rag/extractor/test_csv_extractor.py
index e6a06f163e..2e1c5715c2 100644
--- a/api/tests/unit_tests/core/rag/extractor/test_csv_extractor.py
+++ b/api/tests/unit_tests/core/rag/extractor/test_csv_extractor.py
@@ -39,7 +39,7 @@ class TestCSVExtractor:
         with pytest.raises(ValueError, match="Source column 'missing_col' not found"):
             extractor.extract()
 
-    def test_extract_wraps_unicode_error_when_autodetect_disabled(self, monkeypatch):
+    def test_extract_wraps_unicode_error_when_autodetect_disabled(self, monkeypatch: pytest.MonkeyPatch):
         extractor = CSVExtractor("dummy.csv", autodetect_encoding=False)
 
         def raise_decode(*args, **kwargs):
@@ -50,7 +50,7 @@ class TestCSVExtractor:
         with pytest.raises(RuntimeError, match="Error loading dummy.csv"):
             extractor.extract()
 
-    def test_extract_autodetect_encoding_success(self, monkeypatch):
+    def test_extract_autodetect_encoding_success(self, monkeypatch: pytest.MonkeyPatch):
         extractor = CSVExtractor("dummy.csv", autodetect_encoding=True)
         attempted_encodings: list[str | None] = []
 
@@ -75,7 +75,7 @@ class TestCSVExtractor:
         assert docs[0].page_content == "id: source-1;body: hello"
         assert attempted_encodings == [None, "bad", "utf-8"]
 
-    def test_extract_autodetect_encoding_all_attempts_fail_returns_empty(self, monkeypatch):
+    def test_extract_autodetect_encoding_all_attempts_fail_returns_empty(self, monkeypatch: pytest.MonkeyPatch):
         extractor = CSVExtractor("dummy.csv", autodetect_encoding=True)
 
         def always_raise(*args, **kwargs):
@@ -86,7 +86,7 @@ class TestCSVExtractor:
 
         assert extractor.extract() == []
 
-    def test_read_from_file_re_raises_csv_error(self, monkeypatch):
+    def test_read_from_file_re_raises_csv_error(self, monkeypatch: pytest.MonkeyPatch):
         extractor = CSVExtractor("dummy.csv")
 
         monkeypatch.setattr(pd, "read_csv", lambda *args, **kwargs: (_ for _ in ()).throw(csv.Error("bad csv")))
diff --git a/api/tests/unit_tests/core/rag/extractor/test_excel_extractor.py b/api/tests/unit_tests/core/rag/extractor/test_excel_extractor.py
index d2bcc1e2c4..2b42adc716 100644
--- a/api/tests/unit_tests/core/rag/extractor/test_excel_extractor.py
+++ b/api/tests/unit_tests/core/rag/extractor/test_excel_extractor.py
@@ -45,7 +45,7 @@ class _FakeWorkbook:
 
 
 class TestExcelExtractor:
-    def test_extract_xlsx_with_hyperlinks_and_sheet_skip(self, monkeypatch):
+    def test_extract_xlsx_with_hyperlinks_and_sheet_skip(self, monkeypatch: pytest.MonkeyPatch):
         sheet_with_data = _FakeSheet(
             header_rows=[("Name", "Link")],
             data_rows=[
@@ -68,7 +68,7 @@ class TestExcelExtractor:
         assert docs[1].page_content == '"Name":"";"Link":"123"'
         assert all(doc.metadata["source"] == "/tmp/sample.xlsx" for doc in docs)
 
-    def test_extract_xls_path(self, monkeypatch):
+    def test_extract_xls_path(self, monkeypatch: pytest.MonkeyPatch):
         class FakeExcelFile:
             sheet_names = ["Sheet1"]
 
diff --git a/api/tests/unit_tests/core/rag/extractor/test_extract_processor.py b/api/tests/unit_tests/core/rag/extractor/test_extract_processor.py
index 5beed88971..b4b08f57ec 100644
--- a/api/tests/unit_tests/core/rag/extractor/test_extract_processor.py
+++ b/api/tests/unit_tests/core/rag/extractor/test_extract_processor.py
@@ -56,7 +56,7 @@ def _patch_all_extractors(monkeypatch) -> _ExtractorFactory:
 
 
 class TestExtractProcessorLoaders:
-    def test_load_from_upload_file_return_docs_and_text(self, monkeypatch):
+    def test_load_from_upload_file_return_docs_and_text(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(processor_module, "ExtractSetting", lambda **kwargs: SimpleNamespace(**kwargs))
 
         monkeypatch.setattr(
@@ -93,7 +93,9 @@ class TestExtractProcessorLoaders:
             ),
         ],
     )
-    def test_load_from_url_builds_temp_file_with_correct_suffix(self, monkeypatch, url, headers, expected_suffix):
+    def test_load_from_url_builds_temp_file_with_correct_suffix(
+        self, monkeypatch: pytest.MonkeyPatch, url, headers, expected_suffix
+    ):
         response = SimpleNamespace(headers=headers, content=b"body")
         monkeypatch.setattr(processor_module.ssrf_proxy, "get", lambda *args, **kwargs: response)
         monkeypatch.setattr(processor_module, "ExtractSetting", lambda **kwargs: SimpleNamespace(**kwargs))
@@ -119,11 +121,13 @@ class TestExtractProcessorLoaders:
 
 class TestExtractProcessorFileRouting:
     @pytest.fixture(autouse=True)
-    def _set_unstructured_config(self, monkeypatch):
+    def _set_unstructured_config(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(processor_module.dify_config, "UNSTRUCTURED_API_URL", "https://unstructured")
         monkeypatch.setattr(processor_module.dify_config, "UNSTRUCTURED_API_KEY", "key")
 
-    def _run_extract_for_extension(self, monkeypatch, extension: str, etl_type: str, is_automatic: bool = False):
+    def _run_extract_for_extension(
+        self, monkeypatch: pytest.MonkeyPatch, extension: str, etl_type: str, is_automatic: bool = False
+    ):
         factory = _patch_all_extractors(monkeypatch)
         monkeypatch.setattr(processor_module.dify_config, "ETL_TYPE", etl_type)
 
@@ -167,7 +171,7 @@ class TestExtractProcessorFileRouting:
         ],
     )
     def test_extract_routes_file_extensions_for_unstructured_mode(
-        self, monkeypatch, extension, expected_extractor, is_automatic
+        self, monkeypatch: pytest.MonkeyPatch, extension, expected_extractor, is_automatic
     ):
         extractor_name, args, kwargs = self._run_extract_for_extension(
             monkeypatch, extension, etl_type="Unstructured", is_automatic=is_automatic
@@ -189,7 +193,9 @@ class TestExtractProcessorFileRouting:
             (".txt", "TextExtractor"),
         ],
     )
-    def test_extract_routes_file_extensions_for_default_mode(self, monkeypatch, extension, expected_extractor):
+    def test_extract_routes_file_extensions_for_default_mode(
+        self, monkeypatch: pytest.MonkeyPatch, extension, expected_extractor
+    ):
         extractor_name, _, _ = self._run_extract_for_extension(monkeypatch, extension, etl_type="SelfHosted")
 
         assert extractor_name == expected_extractor
@@ -202,7 +208,7 @@ class TestExtractProcessorFileRouting:
 
 
 class TestExtractProcessorDatasourceRouting:
-    def test_extract_routes_notion_datasource(self, monkeypatch):
+    def test_extract_routes_notion_datasource(self, monkeypatch: pytest.MonkeyPatch):
         factory = _patch_all_extractors(monkeypatch)
 
         notion_info = SimpleNamespace(
@@ -228,7 +234,9 @@ class TestExtractProcessorDatasourceRouting:
             ("jinareader", "JinaReaderWebExtractor"),
         ],
     )
-    def test_extract_routes_website_datasource_providers(self, monkeypatch, provider: str, expected: str):
+    def test_extract_routes_website_datasource_providers(
+        self, monkeypatch: pytest.MonkeyPatch, provider: str, expected: str
+    ):
         factory = _patch_all_extractors(monkeypatch)
 
         website_info = SimpleNamespace(
diff --git a/api/tests/unit_tests/core/rag/extractor/test_helpers.py b/api/tests/unit_tests/core/rag/extractor/test_helpers.py
index 74387f749d..1c6f97ec53 100644
--- a/api/tests/unit_tests/core/rag/extractor/test_helpers.py
+++ b/api/tests/unit_tests/core/rag/extractor/test_helpers.py
@@ -21,7 +21,7 @@ class TestHelpers:
         # Assert the language field for full coverage
         assert encodings[0].language is not None
 
-    def test_detect_file_encodings_timeout(self, monkeypatch):
+    def test_detect_file_encodings_timeout(self, monkeypatch: pytest.MonkeyPatch):
         class FakeFuture:
             def result(self, timeout=None):
                 raise helpers.concurrent.futures.TimeoutError()
@@ -41,7 +41,7 @@ class TestHelpers:
         with pytest.raises(TimeoutError, match="Timeout reached while detecting encoding"):
             detect_file_encodings("file.txt", timeout=1)
 
-    def test_detect_file_encodings_raises_when_encoding_not_detected(self, monkeypatch):
+    def test_detect_file_encodings_raises_when_encoding_not_detected(self, monkeypatch: pytest.MonkeyPatch):
         class FakeResult:
             encoding = None
             coherence = 0.0
diff --git a/api/tests/unit_tests/core/rag/extractor/test_markdown_extractor.py b/api/tests/unit_tests/core/rag/extractor/test_markdown_extractor.py
index 7e78c86c7d..8ede44ec04 100644
--- a/api/tests/unit_tests/core/rag/extractor/test_markdown_extractor.py
+++ b/api/tests/unit_tests/core/rag/extractor/test_markdown_extractor.py
@@ -74,7 +74,7 @@ after
         assert "[link]" not in tups[1][1]
         assert "img.png" not in tups[1][1]
 
-    def test_parse_tups_autodetects_encoding_after_decode_error(self, monkeypatch):
+    def test_parse_tups_autodetects_encoding_after_decode_error(self, monkeypatch: pytest.MonkeyPatch):
         extractor = MarkdownExtractor(file_path="dummy_path", autodetect_encoding=True)
 
         calls: list[str | None] = []
@@ -99,7 +99,7 @@ after
         assert len(tups) == 2
         assert calls == [None, "bad-encoding", "utf-8"]
 
-    def test_parse_tups_decode_error_with_autodetect_disabled_raises(self, monkeypatch):
+    def test_parse_tups_decode_error_with_autodetect_disabled_raises(self, monkeypatch: pytest.MonkeyPatch):
         extractor = MarkdownExtractor(file_path="dummy_path", autodetect_encoding=False)
 
         def raise_decode(self, encoding=None):
@@ -110,7 +110,7 @@ after
         with pytest.raises(RuntimeError, match="Error loading dummy_path"):
             extractor.parse_tups("dummy_path")
 
-    def test_parse_tups_other_exceptions_are_wrapped(self, monkeypatch):
+    def test_parse_tups_other_exceptions_are_wrapped(self, monkeypatch: pytest.MonkeyPatch):
         extractor = MarkdownExtractor(file_path="dummy_path")
 
         def raise_other(self, encoding=None):
@@ -121,7 +121,7 @@ after
         with pytest.raises(RuntimeError, match="Error loading dummy_path"):
             extractor.parse_tups("dummy_path")
 
-    def test_extract_builds_documents_for_header_and_non_header(self, monkeypatch):
+    def test_extract_builds_documents_for_header_and_non_header(self, monkeypatch: pytest.MonkeyPatch):
         extractor = MarkdownExtractor(file_path="dummy_path")
         monkeypatch.setattr(extractor, "parse_tups", lambda _: [(None, "plain"), ("Header", "value")])
 
diff --git a/api/tests/unit_tests/core/rag/extractor/test_notion_extractor.py b/api/tests/unit_tests/core/rag/extractor/test_notion_extractor.py
index 808e41867e..49f7b592dc 100644
--- a/api/tests/unit_tests/core/rag/extractor/test_notion_extractor.py
+++ b/api/tests/unit_tests/core/rag/extractor/test_notion_extractor.py
@@ -28,7 +28,7 @@ class TestNotionExtractorInitAndPublicMethods:
 
         assert extractor._notion_access_token == "token"
 
-    def test_init_falls_back_to_env_token_when_credential_lookup_fails(self, monkeypatch):
+    def test_init_falls_back_to_env_token_when_credential_lookup_fails(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(
             notion_extractor.NotionExtractor,
             "_get_access_token",
@@ -46,7 +46,7 @@ class TestNotionExtractorInitAndPublicMethods:
 
         assert extractor._notion_access_token == "env-token"
 
-    def test_init_raises_if_no_credential_and_no_env_token(self, monkeypatch):
+    def test_init_raises_if_no_credential_and_no_env_token(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(
             notion_extractor.NotionExtractor,
             "_get_access_token",
@@ -63,7 +63,7 @@ class TestNotionExtractorInitAndPublicMethods:
                 credential_id="cred",
             )
 
-    def test_extract_updates_last_edited_and_loads_documents(self, monkeypatch):
+    def test_extract_updates_last_edited_and_loads_documents(self, monkeypatch: pytest.MonkeyPatch):
         extractor = notion_extractor.NotionExtractor(
             notion_workspace_id="ws",
             notion_obj_id="obj",
@@ -83,7 +83,7 @@ class TestNotionExtractorInitAndPublicMethods:
         load_mock.assert_called_once_with("obj", "page")
         assert len(docs) == 1
 
-    def test_load_data_as_documents_page_database_and_invalid(self, monkeypatch):
+    def test_load_data_as_documents_page_database_and_invalid(self, monkeypatch: pytest.MonkeyPatch):
         extractor = notion_extractor.NotionExtractor(
             notion_workspace_id="ws",
             notion_obj_id="obj",
@@ -394,7 +394,7 @@ class TestNotionMetadataAndCredentialMethods:
 
         assert extractor.update_last_edited_time(None) is None
 
-    def test_update_last_edited_time_updates_document_and_commits(self, monkeypatch):
+    def test_update_last_edited_time_updates_document_and_commits(self, monkeypatch: pytest.MonkeyPatch):
         extractor = notion_extractor.NotionExtractor(
             notion_workspace_id="ws",
             notion_obj_id="obj",
@@ -479,7 +479,7 @@ class TestNotionMetadataAndCredentialMethods:
         with pytest.raises(AssertionError, match="Notion access token is required"):
             extractor.get_notion_last_edited_time()
 
-    def test_get_access_token_success_and_errors(self, monkeypatch):
+    def test_get_access_token_success_and_errors(self, monkeypatch: pytest.MonkeyPatch):
         with pytest.raises(Exception, match="No credential id found"):
             notion_extractor.NotionExtractor._get_access_token("tenant", None)
 
diff --git a/api/tests/unit_tests/core/rag/extractor/test_pdf_extractor.py b/api/tests/unit_tests/core/rag/extractor/test_pdf_extractor.py
index 47222a23a2..f2caf02d5e 100644
--- a/api/tests/unit_tests/core/rag/extractor/test_pdf_extractor.py
+++ b/api/tests/unit_tests/core/rag/extractor/test_pdf_extractor.py
@@ -7,7 +7,7 @@ import core.rag.extractor.pdf_extractor as pe
 
 
 @pytest.fixture
-def mock_dependencies(monkeypatch):
+def mock_dependencies(monkeypatch: pytest.MonkeyPatch):
     # Mock storage
     saves = []
 
@@ -61,7 +61,9 @@ def mock_dependencies(monkeypatch):
         (b"\x89PNG\r\n\x1a\n some png", "image/png", "png", "test_file_id_png"),
     ],
 )
-def test_extract_images_formats(mock_dependencies, monkeypatch, image_bytes, expected_mime, expected_ext, file_id):
+def test_extract_images_formats(
+    mock_dependencies, monkeypatch: pytest.MonkeyPatch, image_bytes, expected_mime, expected_ext, file_id
+):
     saves = mock_dependencies.saves
     db_stub = mock_dependencies.db
 
@@ -122,7 +124,7 @@ def test_extract_images_get_objects_scenarios(mock_dependencies, get_objects_sid
     assert result == ""
 
 
-def test_extract_calls_extract_images(mock_dependencies, monkeypatch):
+def test_extract_calls_extract_images(mock_dependencies, monkeypatch: pytest.MonkeyPatch):
     # Mock pypdfium2
     mock_pdf_doc = MagicMock()
     mock_page = MagicMock()
diff --git a/api/tests/unit_tests/core/rag/extractor/test_text_extractor.py b/api/tests/unit_tests/core/rag/extractor/test_text_extractor.py
index fb3c6e52c6..71046d73af 100644
--- a/api/tests/unit_tests/core/rag/extractor/test_text_extractor.py
+++ b/api/tests/unit_tests/core/rag/extractor/test_text_extractor.py
@@ -19,7 +19,7 @@ class TestTextExtractor:
         assert docs[0].page_content == "hello world"
         assert docs[0].metadata == {"source": str(file_path)}
 
-    def test_extract_autodetect_success_after_decode_error(self, monkeypatch):
+    def test_extract_autodetect_success_after_decode_error(self, monkeypatch: pytest.MonkeyPatch):
         extractor = TextExtractor("dummy.txt", autodetect_encoding=True)
 
         calls = []
@@ -44,7 +44,7 @@ class TestTextExtractor:
         assert docs[0].page_content == "decoded text"
         assert calls == [None, "bad", "utf-8"]
 
-    def test_extract_autodetect_all_fail_raises_runtime_error(self, monkeypatch):
+    def test_extract_autodetect_all_fail_raises_runtime_error(self, monkeypatch: pytest.MonkeyPatch):
         extractor = TextExtractor("dummy.txt", autodetect_encoding=True)
 
         def always_decode_error(self, encoding=None):
@@ -56,7 +56,7 @@ class TestTextExtractor:
         with pytest.raises(RuntimeError, match="all detected encodings failed"):
             extractor.extract()
 
-    def test_extract_decode_error_without_autodetect_raises_runtime_error(self, monkeypatch):
+    def test_extract_decode_error_without_autodetect_raises_runtime_error(self, monkeypatch: pytest.MonkeyPatch):
         extractor = TextExtractor("dummy.txt", autodetect_encoding=False)
 
         def always_decode_error(self, encoding=None):
@@ -67,7 +67,7 @@ class TestTextExtractor:
         with pytest.raises(RuntimeError, match="specified encoding failed"):
             extractor.extract()
 
-    def test_extract_wraps_non_decode_exceptions(self, monkeypatch):
+    def test_extract_wraps_non_decode_exceptions(self, monkeypatch: pytest.MonkeyPatch):
         extractor = TextExtractor("dummy.txt")
 
         def raise_other(self, encoding=None):
diff --git a/api/tests/unit_tests/core/rag/extractor/test_word_extractor.py b/api/tests/unit_tests/core/rag/extractor/test_word_extractor.py
index b9f2449cfb..513d232d7f 100644
--- a/api/tests/unit_tests/core/rag/extractor/test_word_extractor.py
+++ b/api/tests/unit_tests/core/rag/extractor/test_word_extractor.py
@@ -61,7 +61,7 @@ def test_parse_row():
         assert extractor._parse_row(row, {}, 3) == gt[idx]
 
 
-def test_init_downloads_via_ssrf_proxy(monkeypatch):
+def test_init_downloads_via_ssrf_proxy(monkeypatch: pytest.MonkeyPatch):
     doc = Document()
     doc.add_paragraph("hello")
     buf = io.BytesIO()
@@ -97,7 +97,7 @@ def test_init_downloads_via_ssrf_proxy(monkeypatch):
         extractor.temp_file.close()
 
 
-def test_extract_images_from_docx(monkeypatch):
+def test_extract_images_from_docx(monkeypatch: pytest.MonkeyPatch):
     external_bytes = b"ext-bytes"
     internal_bytes = b"int-bytes"
 
@@ -210,7 +210,7 @@ def test_extract_images_from_docx_uses_internal_files_url():
         dify_config.INTERNAL_FILES_URL = original_internal_files_url
 
 
-def test_extract_hyperlinks(monkeypatch):
+def test_extract_hyperlinks(monkeypatch: pytest.MonkeyPatch):
     # Mock db and storage to avoid issues during image extraction (even if no images are present)
     monkeypatch.setattr(we, "storage", SimpleNamespace(save=lambda k, d: None))
     db_stub = SimpleNamespace(session=SimpleNamespace(add=lambda o: None, commit=lambda: None))
@@ -255,7 +255,7 @@ def test_extract_hyperlinks(monkeypatch):
             os.remove(tmp_path)
 
 
-def test_extract_legacy_hyperlinks(monkeypatch):
+def test_extract_legacy_hyperlinks(monkeypatch: pytest.MonkeyPatch):
     # Mock db and storage
     monkeypatch.setattr(we, "storage", SimpleNamespace(save=lambda k, d: None))
     db_stub = SimpleNamespace(session=SimpleNamespace(add=lambda o: None, commit=lambda: None))
@@ -317,7 +317,7 @@ def test_extract_legacy_hyperlinks(monkeypatch):
             os.remove(tmp_path)
 
 
-def test_init_rejects_invalid_url_status(monkeypatch):
+def test_init_rejects_invalid_url_status(monkeypatch: pytest.MonkeyPatch):
     class FakeResponse:
         status_code = 404
         content = b""
@@ -392,7 +392,7 @@ def test_close_closes_awaitable_close_result():
     extractor.temp_file.close.assert_called_once()
 
 
-def test_extract_images_handles_invalid_external_cases(monkeypatch):
+def test_extract_images_handles_invalid_external_cases(monkeypatch: pytest.MonkeyPatch):
     class FakeTargetRef:
         def __contains__(self, item):
             return item == "image"
@@ -437,7 +437,7 @@ def test_extract_images_handles_invalid_external_cases(monkeypatch):
     db_stub.session.commit.assert_called_once()
 
 
-def test_table_to_markdown_and_parse_helpers(monkeypatch):
+def test_table_to_markdown_and_parse_helpers(monkeypatch: pytest.MonkeyPatch):
     extractor = object.__new__(WordExtractor)
 
     table = SimpleNamespace(
@@ -500,7 +500,7 @@ def test_table_to_markdown_and_parse_helpers(monkeypatch):
     assert extractor._parse_cell(cell, image_map) == "EXT-IMGINT-IMGplain"
 
 
-def test_parse_docx_covers_drawing_shapes_hyperlink_error_and_table_branch(monkeypatch):
+def test_parse_docx_covers_drawing_shapes_hyperlink_error_and_table_branch(monkeypatch: pytest.MonkeyPatch):
     extractor = object.__new__(WordExtractor)
 
     ext_image_id = "ext-image"
diff --git a/api/tests/unit_tests/core/rag/extractor/unstructured/test_unstructured_extractors.py b/api/tests/unit_tests/core/rag/extractor/unstructured/test_unstructured_extractors.py
index 26ce333e11..19fb385a6d 100644
--- a/api/tests/unit_tests/core/rag/extractor/unstructured/test_unstructured_extractors.py
+++ b/api/tests/unit_tests/core/rag/extractor/unstructured/test_unstructured_extractors.py
@@ -45,7 +45,7 @@ def _install_chunk_by_title(monkeypatch: pytest.MonkeyPatch, chunks: list[Simple
 
 
 class TestUnstructuredMarkdownMsgXml:
-    def test_markdown_extractor_without_api(self, monkeypatch):
+    def test_markdown_extractor_without_api(self, monkeypatch: pytest.MonkeyPatch):
         _install_chunk_by_title(monkeypatch, [SimpleNamespace(text=" chunk-1 "), SimpleNamespace(text=" chunk-2 ")])
         _register_module(
             monkeypatch, "unstructured.partition.md", partition_md=lambda filename: [SimpleNamespace(text="x")]
@@ -55,7 +55,7 @@ class TestUnstructuredMarkdownMsgXml:
 
         assert [doc.page_content for doc in docs] == ["chunk-1", "chunk-2"]
 
-    def test_markdown_extractor_with_api(self, monkeypatch):
+    def test_markdown_extractor_with_api(self, monkeypatch: pytest.MonkeyPatch):
         _install_chunk_by_title(monkeypatch, [SimpleNamespace(text=" via-api ")])
         calls = {}
 
@@ -70,7 +70,7 @@ class TestUnstructuredMarkdownMsgXml:
         assert docs[0].page_content == "via-api"
         assert calls == {"filename": "/tmp/file.md", "api_url": "https://u", "api_key": "k"}
 
-    def test_msg_extractor_local(self, monkeypatch):
+    def test_msg_extractor_local(self, monkeypatch: pytest.MonkeyPatch):
         _install_chunk_by_title(monkeypatch, [SimpleNamespace(text="msg-doc")])
         _register_module(
             monkeypatch, "unstructured.partition.msg", partition_msg=lambda filename: [SimpleNamespace(text="x")]
@@ -78,7 +78,7 @@ class TestUnstructuredMarkdownMsgXml:
 
         assert UnstructuredMsgExtractor("/tmp/file.msg").extract()[0].page_content == "msg-doc"
 
-    def test_msg_extractor_with_api(self, monkeypatch):
+    def test_msg_extractor_with_api(self, monkeypatch: pytest.MonkeyPatch):
         _install_chunk_by_title(monkeypatch, [SimpleNamespace(text="msg-doc")])
         calls = {}
 
@@ -94,7 +94,7 @@ class TestUnstructuredMarkdownMsgXml:
         )
         assert calls["filename"] == "/tmp/file.msg"
 
-    def test_xml_extractor_local_and_api(self, monkeypatch):
+    def test_xml_extractor_local_and_api(self, monkeypatch: pytest.MonkeyPatch):
         _install_chunk_by_title(monkeypatch, [SimpleNamespace(text="xml-doc")])
 
         xml_calls = {}
@@ -124,7 +124,7 @@ class TestUnstructuredMarkdownMsgXml:
 
 
 class TestUnstructuredEmailAndEpub:
-    def test_email_extractor_local_decodes_html_and_suppresses_decode_errors(self, monkeypatch):
+    def test_email_extractor_local_decodes_html_and_suppresses_decode_errors(self, monkeypatch: pytest.MonkeyPatch):
         _register_unstructured_packages(monkeypatch)
         captured = {}
 
@@ -150,7 +150,7 @@ class TestUnstructuredEmailAndEpub:
         assert "Hello Email" in chunk_elements[0].text
         assert chunk_elements[1].text == bad_base64
 
-    def test_email_extractor_with_api(self, monkeypatch):
+    def test_email_extractor_with_api(self, monkeypatch: pytest.MonkeyPatch):
         _install_chunk_by_title(monkeypatch, [SimpleNamespace(text="api-email")])
         _register_module(
             monkeypatch,
@@ -162,7 +162,7 @@ class TestUnstructuredEmailAndEpub:
 
         assert docs[0].page_content == "api-email"
 
-    def test_epub_extractor_local_and_api(self, monkeypatch):
+    def test_epub_extractor_local_and_api(self, monkeypatch: pytest.MonkeyPatch):
         _install_chunk_by_title(monkeypatch, [SimpleNamespace(text="epub-doc")])
 
         calls = {"download": 0, "partition": 0}
@@ -198,7 +198,7 @@ class TestUnstructuredPPTAndPPTX:
         with pytest.raises(NotImplementedError, match="Unstructured API Url is not configured"):
             UnstructuredPPTExtractor("/tmp/file.ppt").extract()
 
-    def test_ppt_extractor_groups_text_by_page(self, monkeypatch):
+    def test_ppt_extractor_groups_text_by_page(self, monkeypatch: pytest.MonkeyPatch):
         _register_unstructured_packages(monkeypatch)
         _register_module(
             monkeypatch,
@@ -215,7 +215,7 @@ class TestUnstructuredPPTAndPPTX:
 
         assert [doc.page_content for doc in docs] == ["A\nB", "C"]
 
-    def test_pptx_extractor_local_and_api(self, monkeypatch):
+    def test_pptx_extractor_local_and_api(self, monkeypatch: pytest.MonkeyPatch):
         _register_unstructured_packages(monkeypatch)
         _register_module(
             monkeypatch,
@@ -244,7 +244,7 @@ class TestUnstructuredPPTAndPPTX:
 
 
 class TestUnstructuredWord:
-    def _install_doc_modules(self, monkeypatch, version: str, filetype_value):
+    def _install_doc_modules(self, monkeypatch: pytest.MonkeyPatch, version: str, filetype_value):
         _register_unstructured_packages(monkeypatch)
 
         class FileType:
@@ -276,13 +276,13 @@ class TestUnstructuredWord:
             ],
         )
 
-    def test_word_extractor_rejects_doc_on_old_unstructured_version(self, monkeypatch):
+    def test_word_extractor_rejects_doc_on_old_unstructured_version(self, monkeypatch: pytest.MonkeyPatch):
         self._install_doc_modules(monkeypatch, version="0.4.10", filetype_value="doc")
 
         with pytest.raises(ValueError, match="Partitioning .doc files is only supported"):
             UnstructuredWordExtractor("/tmp/file.doc", "https://u", "k").extract()
 
-    def test_word_extractor_doc_and_docx_paths(self, monkeypatch):
+    def test_word_extractor_doc_and_docx_paths(self, monkeypatch: pytest.MonkeyPatch):
         self._install_doc_modules(monkeypatch, version="0.4.11", filetype_value="doc")
 
         docs = UnstructuredWordExtractor("/tmp/file.doc", "https://u", "k").extract()
@@ -292,7 +292,7 @@ class TestUnstructuredWord:
         docs = UnstructuredWordExtractor("/tmp/file.docx", "https://u", "k").extract()
         assert [doc.page_content for doc in docs] == ["chunk-1", "chunk-2"]
 
-    def test_word_extractor_magic_import_error_fallback_to_extension(self, monkeypatch):
+    def test_word_extractor_magic_import_error_fallback_to_extension(self, monkeypatch: pytest.MonkeyPatch):
         self._install_doc_modules(monkeypatch, version="0.4.10", filetype_value="not-used")
         monkeypatch.setitem(sys.modules, "magic", None)
 
diff --git a/api/tests/unit_tests/core/rag/extractor/watercrawl/test_watercrawl.py b/api/tests/unit_tests/core/rag/extractor/watercrawl/test_watercrawl.py
index d758be218a..95878fc688 100644
--- a/api/tests/unit_tests/core/rag/extractor/watercrawl/test_watercrawl.py
+++ b/api/tests/unit_tests/core/rag/extractor/watercrawl/test_watercrawl.py
@@ -59,7 +59,7 @@ class TestWaterCrawlExceptions:
 
 
 class TestBaseAPIClient:
-    def test_init_session_builds_expected_headers(self, monkeypatch):
+    def test_init_session_builds_expected_headers(self, monkeypatch: pytest.MonkeyPatch):
         captured = {}
 
         def fake_client(**kwargs):
@@ -74,7 +74,7 @@ class TestBaseAPIClient:
         assert captured["headers"]["X-API-Key"] == "k"
         assert captured["headers"]["User-Agent"] == "WaterCrawl-Plugin"
 
-    def test_request_stream_and_non_stream_paths(self, monkeypatch):
+    def test_request_stream_and_non_stream_paths(self, monkeypatch: pytest.MonkeyPatch):
         class FakeSession:
             def __init__(self):
                 self.request_calls = []
@@ -106,7 +106,7 @@ class TestBaseAPIClient:
         assert fake_session.build_calls
         assert fake_session.send_calls[0][1] is True
 
-    def test_http_method_helpers_delegate_to_request(self, monkeypatch):
+    def test_http_method_helpers_delegate_to_request(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(BaseAPIClient, "init_session", lambda self: MagicMock())
         client = BaseAPIClient(api_key="k", base_url="https://watercrawl.dev")
 
@@ -127,7 +127,7 @@ class TestBaseAPIClient:
 
 
 class TestWaterCrawlAPIClient:
-    def test_process_eventstream_and_download(self, monkeypatch):
+    def test_process_eventstream_and_download(self, monkeypatch: pytest.MonkeyPatch):
         client = WaterCrawlAPIClient(api_key="k")
 
         response = MagicMock()
@@ -174,7 +174,7 @@ class TestWaterCrawlAPIClient:
             client.process_response(_response(200, content_type="application/octet-stream", content=b"bin")) == b"bin"
         )
 
-    def test_process_response_event_stream_returns_generator(self, monkeypatch):
+    def test_process_response_event_stream_returns_generator(self, monkeypatch: pytest.MonkeyPatch):
         client = WaterCrawlAPIClient(api_key="k")
         generator = (item for item in [{"type": "result", "data": {}}])
         monkeypatch.setattr(client, "process_eventstream", lambda response, download=False: generator)
@@ -193,7 +193,7 @@ class TestWaterCrawlAPIClient:
         with pytest.raises(RuntimeError, match="http error"):
             client.process_response(response)
 
-    def test_endpoint_wrappers(self, monkeypatch):
+    def test_endpoint_wrappers(self, monkeypatch: pytest.MonkeyPatch):
         client = WaterCrawlAPIClient(api_key="k")
 
         monkeypatch.setattr(client, "process_response", lambda resp: "processed")
@@ -208,7 +208,7 @@ class TestWaterCrawlAPIClient:
         assert client.download_crawl_request("id") == "processed"
         assert client.get_crawl_request_results("id") == "processed"
 
-    def test_monitor_crawl_request_generator_and_validation(self, monkeypatch):
+    def test_monitor_crawl_request_generator_and_validation(self, monkeypatch: pytest.MonkeyPatch):
         client = WaterCrawlAPIClient(api_key="k")
 
         monkeypatch.setattr(client, "process_response", lambda _: (x for x in [{"type": "result", "data": 1}]))
@@ -221,7 +221,7 @@ class TestWaterCrawlAPIClient:
         with pytest.raises(ValueError, match="Generator expected"):
             list(client.monitor_crawl_request("job-1"))
 
-    def test_scrape_url_sync_and_async(self, monkeypatch):
+    def test_scrape_url_sync_and_async(self, monkeypatch: pytest.MonkeyPatch):
         client = WaterCrawlAPIClient(api_key="k")
         monkeypatch.setattr(client, "create_crawl_request", lambda **kwargs: {"uuid": "job-1"})
 
@@ -238,7 +238,7 @@ class TestWaterCrawlAPIClient:
         sync_result = client.scrape_url("https://example.com", sync=True)
         assert sync_result == {"url": "https://example.com"}
 
-    def test_download_result_fetches_json_and_closes(self, monkeypatch):
+    def test_download_result_fetches_json_and_closes(self, monkeypatch: pytest.MonkeyPatch):
         client = WaterCrawlAPIClient(api_key="k")
 
         response = _response(200, {"markdown": "body"})
@@ -251,7 +251,7 @@ class TestWaterCrawlAPIClient:
 
 
 class TestWaterCrawlProvider:
-    def test_crawl_url_builds_options_and_min_wait_time(self, monkeypatch):
+    def test_crawl_url_builds_options_and_min_wait_time(self, monkeypatch: pytest.MonkeyPatch):
         provider = WaterCrawlProvider(api_key="k")
         captured_kwargs = {}
 
@@ -290,7 +290,7 @@ class TestWaterCrawlProvider:
         assert captured_kwargs["page_options"]["only_main_content"] is False
         assert captured_kwargs["page_options"]["wait_time"] == 1000
 
-    def test_get_crawl_status_active_and_completed(self, monkeypatch):
+    def test_get_crawl_status_active_and_completed(self, monkeypatch: pytest.MonkeyPatch):
         provider = WaterCrawlProvider(api_key="k")
 
         monkeypatch.setattr(
@@ -327,7 +327,7 @@ class TestWaterCrawlProvider:
         assert completed["status"] == "completed"
         assert completed["data"] == [{"url": "u"}]
 
-    def test_get_crawl_url_data_and_scrape(self, monkeypatch):
+    def test_get_crawl_url_data_and_scrape(self, monkeypatch: pytest.MonkeyPatch):
         provider = WaterCrawlProvider(api_key="k")
 
         monkeypatch.setattr(provider, "scrape_url", lambda url: {"source_url": url})
@@ -339,7 +339,7 @@ class TestWaterCrawlProvider:
         monkeypatch.setattr(provider, "_get_results", lambda job_id, query_params=None: iter([]))
         assert provider.get_crawl_url_data("job", "u1") is None
 
-    def test_structure_data_validation_and_get_results_pagination(self, monkeypatch):
+    def test_structure_data_validation_and_get_results_pagination(self, monkeypatch: pytest.MonkeyPatch):
         provider = WaterCrawlProvider(api_key="k")
 
         with pytest.raises(ValueError, match="Invalid result object"):
@@ -380,7 +380,7 @@ class TestWaterCrawlProvider:
         assert len(results) == 1
         assert results[0]["source_url"] == "https://a"
 
-    def test_scrape_url_uses_client_and_structure(self, monkeypatch):
+    def test_scrape_url_uses_client_and_structure(self, monkeypatch: pytest.MonkeyPatch):
         provider = WaterCrawlProvider(api_key="k")
         monkeypatch.setattr(
             provider.client, "scrape_url", lambda **kwargs: {"result": {"metadata": {}, "markdown": "m"}, "url": "u"}
@@ -392,7 +392,7 @@ class TestWaterCrawlProvider:
 
 
 class TestWaterCrawlWebExtractor:
-    def test_extract_crawl_and_scrape_modes(self, monkeypatch):
+    def test_extract_crawl_and_scrape_modes(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(
             "core.rag.extractor.watercrawl.extractor.WebsiteService.get_crawl_url_data",
             lambda job_id, provider, url, tenant_id: {
@@ -418,7 +418,7 @@ class TestWaterCrawlWebExtractor:
         assert crawl_extractor.extract()[0].page_content == "crawl"
         assert scrape_extractor.extract()[0].page_content == "scrape"
 
-    def test_extract_crawl_returns_empty_when_service_returns_none(self, monkeypatch):
+    def test_extract_crawl_returns_empty_when_service_returns_none(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(
             "core.rag.extractor.watercrawl.extractor.WebsiteService.get_crawl_url_data",
             lambda job_id, provider, url, tenant_id: None,
diff --git a/api/tests/unit_tests/core/rag/retrieval/test_dataset_retrieval.py b/api/tests/unit_tests/core/rag/retrieval/test_dataset_retrieval.py
index b556ddf528..9334ad9b2f 100644
--- a/api/tests/unit_tests/core/rag/retrieval/test_dataset_retrieval.py
+++ b/api/tests/unit_tests/core/rag/retrieval/test_dataset_retrieval.py
@@ -4562,7 +4562,7 @@ class TestRetrieveCoverage:
                 "core.rag.retrieval.dataset_retrieval.RetrievalService.format_retrieval_documents",
                 return_value=[record],
             ),
-            patch("core.rag.retrieval.dataset_retrieval.sign_upload_file", return_value="https://signed"),
+            patch("core.rag.retrieval.dataset_retrieval.sign_upload_file_preview_url", return_value="https://signed"),
             patch("core.rag.retrieval.dataset_retrieval.db.session.execute") as mock_execute,
         ):
             bound_model_instance = Mock()
diff --git a/api/tests/unit_tests/core/repositories/test_human_input_form_repository_impl.py b/api/tests/unit_tests/core/repositories/test_human_input_form_repository_impl.py
index 18ae9fafc8..a2e10d924c 100644
--- a/api/tests/unit_tests/core/repositories/test_human_input_form_repository_impl.py
+++ b/api/tests/unit_tests/core/repositories/test_human_input_form_repository_impl.py
@@ -23,7 +23,7 @@ from core.workflow.human_input_adapter import (
 )
 from graphon.nodes.human_input.entities import (
     FormDefinition,
-    UserAction,
+    UserActionConfig,
 )
 from graphon.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
 from libs.datetime_utils import naive_utc_now
@@ -272,7 +272,7 @@ def _make_form_definition() -> str:
     return FormDefinition(
         form_content="hello",
         inputs=[],
-        user_actions=[UserAction(id="submit", title="Submit")],
+        user_actions=[UserActionConfig(id="submit", title="Submit")],
         rendered_content="<p>hello</p>",
         expiration_time=naive_utc_now(),
     ).model_dump_json()
diff --git a/api/tests/unit_tests/core/repositories/test_human_input_repository.py b/api/tests/unit_tests/core/repositories/test_human_input_repository.py
index 4248782d93..418537675d 100644
--- a/api/tests/unit_tests/core/repositories/test_human_input_repository.py
+++ b/api/tests/unit_tests/core/repositories/test_human_input_repository.py
@@ -29,7 +29,7 @@ from core.workflow.human_input_adapter import (
     MemberRecipient,
     WebAppDeliveryMethod,
 )
-from graphon.nodes.human_input.entities import HumanInputNodeData, UserAction
+from graphon.nodes.human_input.entities import HumanInputNodeData, UserActionConfig
 from graphon.nodes.human_input.enums import HumanInputFormKind, HumanInputFormStatus
 from libs.datetime_utils import naive_utc_now
 from models.human_input import HumanInputFormRecipient, RecipientType
@@ -467,7 +467,7 @@ def test_create_form_adds_console_and_backstage_recipients(monkeypatch: pytest.M
         delivery_methods=[],
         form_content="hello",
         inputs=[],
-        user_actions=[UserAction(id="submit", title="Submit")],
+        user_actions=[UserActionConfig(id="submit", title="Submit")],
     )
     params = FormCreateParams(
         workflow_execution_id=None,
diff --git a/api/tests/unit_tests/core/telemetry/test_facade.py b/api/tests/unit_tests/core/telemetry/test_facade.py
index 36e8e1bbb1..95d653f55b 100644
--- a/api/tests/unit_tests/core/telemetry/test_facade.py
+++ b/api/tests/unit_tests/core/telemetry/test_facade.py
@@ -14,7 +14,7 @@ from core.telemetry.events import TelemetryContext, TelemetryEvent
 
 
 @pytest.fixture
-def telemetry_test_setup(monkeypatch):
+def telemetry_test_setup(monkeypatch: pytest.MonkeyPatch):
     module_name = "core.ops.ops_trace_manager"
     ops_stub = types.ModuleType(module_name)
 
diff --git a/api/tests/unit_tests/core/test_provider_manager.py b/api/tests/unit_tests/core/test_provider_manager.py
index a5a542c94f..e84fcba3d9 100644
--- a/api/tests/unit_tests/core/test_provider_manager.py
+++ b/api/tests/unit_tests/core/test_provider_manager.py
@@ -289,7 +289,7 @@ def test_get_default_model_uses_injected_runtime_for_existing_default_record(moc
 
         result = manager.get_default_model("tenant-id", ModelType.LLM)
 
-    mock_factory_cls.assert_called_once_with(model_runtime=manager._model_runtime)
+    mock_factory_cls.assert_called_once_with(runtime=manager._model_runtime)
     assert result is not None
     assert result.model == "gpt-4"
     assert result.provider.provider == "openai"
@@ -316,7 +316,7 @@ def test_get_configurations_uses_injected_runtime_and_adds_provider_aliases(mock
         result = manager.get_configurations("tenant-id")
 
     expected_alias = str(ModelProviderID("openai"))
-    mock_factory_cls.assert_called_once_with(model_runtime=manager._model_runtime)
+    mock_factory_cls.assert_called_once_with(runtime=manager._model_runtime)
     assert result.tenant_id == "tenant-id"
     assert expected_alias in provider_records
     assert expected_alias in provider_model_records
@@ -402,7 +402,7 @@ def test_get_configurations_reuses_cached_result_for_same_tenant(mocker: MockerF
 
     assert first is second
     mock_get_all_providers.assert_called_once_with("tenant-id")
-    mock_factory_cls.assert_called_once_with(model_runtime=manager._model_runtime)
+    mock_factory_cls.assert_called_once_with(runtime=manager._model_runtime)
     mock_provider_configuration.assert_called_once()
     provider_configuration.bind_model_runtime.assert_called_once_with(manager._model_runtime)
 
@@ -570,8 +570,7 @@ def test_get_all_providers_normalizes_provider_names_with_model_provider_id() ->
     session.scalars.return_value = [openai_provider, gemini_provider]
 
     with (
-        patch("core.provider_manager.db", SimpleNamespace(engine=object())),
-        patch("core.provider_manager.Session", return_value=_build_session_context(session)),
+        patch("core.provider_manager.session_factory.create_session", return_value=_build_session_context(session)),
     ):
         result = ProviderManager._get_all_providers("tenant-id")
 
@@ -595,8 +594,7 @@ def test_provider_grouping_helpers_group_records_by_provider_name(method_name: s
     session.scalars.return_value = [openai_primary, openai_secondary, anthropic_record]
 
     with (
-        patch("core.provider_manager.db", SimpleNamespace(engine=object())),
-        patch("core.provider_manager.Session", return_value=_build_session_context(session)),
+        patch("core.provider_manager.session_factory.create_session", return_value=_build_session_context(session)),
     ):
         result = getattr(ProviderManager, method_name)("tenant-id")
 
@@ -611,8 +609,7 @@ def test_get_all_preferred_model_providers_returns_mapping_by_provider_name() ->
     session.scalars.return_value = [openai_preference, anthropic_preference]
 
     with (
-        patch("core.provider_manager.db", SimpleNamespace(engine=object())),
-        patch("core.provider_manager.Session", return_value=_build_session_context(session)),
+        patch("core.provider_manager.session_factory.create_session", return_value=_build_session_context(session)),
     ):
         result = ProviderManager._get_all_preferred_model_providers("tenant-id")
 
@@ -626,13 +623,13 @@ def test_get_all_provider_load_balancing_configs_returns_empty_when_cached_flag_
     with (
         patch("core.provider_manager.redis_client.get", return_value=b"False"),
         patch("core.provider_manager.FeatureService.get_features") as mock_get_features,
-        patch("core.provider_manager.Session") as mock_session_cls,
+        patch("core.provider_manager.session_factory.create_session") as mock_create_session,
     ):
         result = ProviderManager._get_all_provider_load_balancing_configs("tenant-id")
 
     assert result == {}
     mock_get_features.assert_not_called()
-    mock_session_cls.assert_not_called()
+    mock_create_session.assert_not_called()
 
 
 def test_get_all_provider_load_balancing_configs_populates_cache_and_groups_configs() -> None:
@@ -642,14 +639,13 @@ def test_get_all_provider_load_balancing_configs_populates_cache_and_groups_conf
     session.scalars.return_value = [openai_config, anthropic_config]
 
     with (
-        patch("core.provider_manager.db", SimpleNamespace(engine=object())),
         patch("core.provider_manager.redis_client.get", return_value=None),
         patch("core.provider_manager.redis_client.setex") as mock_setex,
         patch(
             "core.provider_manager.FeatureService.get_features",
             return_value=SimpleNamespace(model_load_balancing_enabled=True),
         ),
-        patch("core.provider_manager.Session", return_value=_build_session_context(session)),
+        patch("core.provider_manager.session_factory.create_session", return_value=_build_session_context(session)),
     ):
         result = ProviderManager._get_all_provider_load_balancing_configs("tenant-id")
 
diff --git a/api/tests/unit_tests/core/tools/test_builtin_tool_provider.py b/api/tests/unit_tests/core/tools/test_builtin_tool_provider.py
index ad6d5906ae..b21a5c3e24 100644
--- a/api/tests/unit_tests/core/tools/test_builtin_tool_provider.py
+++ b/api/tests/unit_tests/core/tools/test_builtin_tool_provider.py
@@ -78,7 +78,7 @@ def _tool_yaml() -> dict[str, Any]:
     }
 
 
-def test_builtin_tool_provider_init_load_tools_and_basic_accessors(monkeypatch):
+def test_builtin_tool_provider_init_load_tools_and_basic_accessors(monkeypatch: pytest.MonkeyPatch):
     yaml_payloads = [_provider_yaml(), _tool_yaml()]
 
     def _load_yaml(*args, **kwargs):
diff --git a/api/tests/unit_tests/core/tools/test_builtin_tools_extra.py b/api/tests/unit_tests/core/tools/test_builtin_tools_extra.py
index c7829fc0d7..3f6b1ec154 100644
--- a/api/tests/unit_tests/core/tools/test_builtin_tools_extra.py
+++ b/api/tests/unit_tests/core/tools/test_builtin_tools_extra.py
@@ -115,7 +115,7 @@ def test_weekday_tool():
         list(weekday_tool.invoke(user_id="u", tool_parameters={"year": 2024, "day": 1}))
 
 
-def test_simple_code_valid_execution(monkeypatch):
+def test_simple_code_valid_execution(monkeypatch: pytest.MonkeyPatch):
     simple_code = _build_builtin_tool(SimpleCode)
 
     monkeypatch.setattr(
@@ -138,7 +138,7 @@ def test_simple_code_invalid_language():
         list(simple_code.invoke(user_id="u", tool_parameters={"language": "go", "code": "fmt.Println(1)"}))
 
 
-def test_simple_code_execution_error(monkeypatch):
+def test_simple_code_execution_error(monkeypatch: pytest.MonkeyPatch):
     simple_code = _build_builtin_tool(SimpleCode)
 
     monkeypatch.setattr(
@@ -155,14 +155,14 @@ def test_webscraper_empty_url():
     assert empty == "Please input url"
 
 
-def test_webscraper_fetch(monkeypatch):
+def test_webscraper_fetch(monkeypatch: pytest.MonkeyPatch):
     webscraper = _build_builtin_tool(WebscraperTool)
     monkeypatch.setattr("core.tools.builtin_tool.providers.webscraper.tools.webscraper.get_url", lambda *a, **k: "page")
     full = list(webscraper.invoke(user_id="u", tool_parameters={"url": "https://example.com"}))[0].message.text
     assert full == "page"
 
 
-def test_webscraper_summary(monkeypatch):
+def test_webscraper_summary(monkeypatch: pytest.MonkeyPatch):
     webscraper = _build_builtin_tool(WebscraperTool)
     monkeypatch.setattr("core.tools.builtin_tool.providers.webscraper.tools.webscraper.get_url", lambda *a, **k: "page")
     monkeypatch.setattr(webscraper, "summary", lambda user_id, content: "summary")
@@ -175,7 +175,7 @@ def test_webscraper_summary(monkeypatch):
     assert summarized == "summary"
 
 
-def test_webscraper_fetch_error(monkeypatch):
+def test_webscraper_fetch_error(monkeypatch: pytest.MonkeyPatch):
     webscraper = _build_builtin_tool(WebscraperTool)
     monkeypatch.setattr(
         "core.tools.builtin_tool.providers.webscraper.tools.webscraper.get_url",
@@ -192,7 +192,7 @@ def test_asr_invalid_file():
     assert "not a valid audio file" in invalid_file
 
 
-def test_asr_valid_file_invocation(monkeypatch):
+def test_asr_valid_file_invocation(monkeypatch: pytest.MonkeyPatch):
     asr = _build_builtin_tool(ASRTool)
     model_instance = type("M", (), {"invoke_speech2text": lambda self, file: "transcript"})()
     model_manager = type("Mgr", (), {"get_model_instance": lambda *a, **k: model_instance})()
@@ -209,7 +209,7 @@ def test_asr_valid_file_invocation(monkeypatch):
     assert captured_manager_kwargs == {"tenant_id": "tenant-1", "user_id": "u"}
 
 
-def test_asr_available_models_and_runtime_parameters(monkeypatch):
+def test_asr_available_models_and_runtime_parameters(monkeypatch: pytest.MonkeyPatch):
     asr = _build_builtin_tool(ASRTool)
     provider_model = type("PM", (), {"provider": "p", "models": [type("Model", (), {"model": "m"})()]})()
     monkeypatch.setattr(
@@ -220,7 +220,7 @@ def test_asr_available_models_and_runtime_parameters(monkeypatch):
     assert asr.get_runtime_parameters()[0].name == "model"
 
 
-def test_tts_invoke_returns_messages(monkeypatch):
+def test_tts_invoke_returns_messages(monkeypatch: pytest.MonkeyPatch):
     tts = _build_builtin_tool(TTSTool)
     captured_manager_kwargs = {}
     voices_model_instance = type(
@@ -280,7 +280,7 @@ def test_tts_tool_raises_when_voice_unavailable(monkeypatch, voices):
         list(tts.invoke(user_id="u", tool_parameters={"model": "p#m", "text": "hello"}))
 
 
-def test_tts_tool_get_available_models_and_runtime_parameters(monkeypatch):
+def test_tts_tool_get_available_models_and_runtime_parameters(monkeypatch: pytest.MonkeyPatch):
     tts = _build_builtin_tool(TTSTool)
 
     model_1 = SimpleNamespace(
@@ -307,7 +307,7 @@ def test_tts_tool_get_available_models_and_runtime_parameters(monkeypatch):
     assert runtime_parameters[1].name == "voice#provider-a#model-a"
 
 
-def test_provider_classes_and_builtin_sort(monkeypatch):
+def test_provider_classes_and_builtin_sort(monkeypatch: pytest.MonkeyPatch):
     # Use object.__new__ to avoid YAML-loading __init__; only pass-through validation is exercised.
     # Ensure pass-through _validate_credentials methods are executed.
     AudioToolProvider._validate_credentials(object.__new__(AudioToolProvider), "u", {})
diff --git a/api/tests/unit_tests/core/tools/test_custom_tool.py b/api/tests/unit_tests/core/tools/test_custom_tool.py
index f35546b025..f525baeaf2 100644
--- a/api/tests/unit_tests/core/tools/test_custom_tool.py
+++ b/api/tests/unit_tests/core/tools/test_custom_tool.py
@@ -47,7 +47,7 @@ def test_parsed_response_to_string():
     assert ParsedResponse("ok", False).to_string() == "ok"
 
 
-def test_api_tool_fork_runtime_and_validate_credentials(monkeypatch):
+def test_api_tool_fork_runtime_and_validate_credentials(monkeypatch: pytest.MonkeyPatch):
     tool = _build_tool()
     forked = tool.fork_tool_runtime(ToolRuntime(tenant_id="tenant-2"))
     assert isinstance(forked, ApiTool)
@@ -184,7 +184,7 @@ def test_get_parameter_value_and_type_conversion_helpers():
     assert tool._convert_body_property_type({"anyOf": [{"type": "integer"}]}, "2") == 2
 
 
-def test_do_http_request_builds_arguments_and_handles_invalid_method(monkeypatch):
+def test_do_http_request_builds_arguments_and_handles_invalid_method(monkeypatch: pytest.MonkeyPatch):
     openapi = {
         "parameters": [
             {"name": "id", "in": "path", "required": True, "schema": {"type": "string"}},
@@ -236,7 +236,7 @@ def test_do_http_request_builds_arguments_and_handles_invalid_method(monkeypatch
         invalid_method_tool.do_http_request("https://api.example.com", "TRACE", headers={}, parameters={})
 
 
-def test_do_http_request_handles_file_upload_and_invoke_paths(monkeypatch):
+def test_do_http_request_handles_file_upload_and_invoke_paths(monkeypatch: pytest.MonkeyPatch):
     openapi = {
         "parameters": [],
         "requestBody": {
diff --git a/api/tests/unit_tests/core/tools/test_signature.py b/api/tests/unit_tests/core/tools/test_signature.py
index 353988d7a6..a75fdee908 100644
--- a/api/tests/unit_tests/core/tools/test_signature.py
+++ b/api/tests/unit_tests/core/tools/test_signature.py
@@ -9,7 +9,7 @@ import pytest
 from core.tools.signature import (
     get_signed_file_url_for_plugin,
     sign_tool_file,
-    sign_upload_file,
+    sign_upload_file_preview_url,
     verify_plugin_file_signature,
     verify_tool_file_signature,
 )
@@ -89,32 +89,32 @@ def test_verify_tool_file_signature_rejects_expired_signature(monkeypatch: pytes
     assert verify_tool_file_signature("tool-file-id", timestamp, nonce, sign) is False
 
 
-def test_sign_upload_file_prefers_internal_url(monkeypatch: pytest.MonkeyPatch) -> None:
+def test_sign_upload_file_preview_url_uses_files_url(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setattr("core.tools.signature.time.time", lambda: 1700000000)
     monkeypatch.setattr("core.tools.signature.os.urandom", lambda _: b"\x03" * 16)
     monkeypatch.setattr("core.tools.signature.dify_config.SECRET_KEY", "unit-secret")
     monkeypatch.setattr("core.tools.signature.dify_config.FILES_URL", "https://files.example.com")
     monkeypatch.setattr("core.tools.signature.dify_config.INTERNAL_FILES_URL", "https://internal.example.com")
 
-    url = sign_upload_file("upload-id", ".png")
+    url = sign_upload_file_preview_url("upload-id", ".png")
     parsed = urlparse(url)
     query = parse_qs(parsed.query)
 
-    assert parsed.netloc == "internal.example.com"
+    assert parsed.netloc == "files.example.com"
     assert parsed.path == "/files/upload-id/image-preview"
     assert query["timestamp"][0]
     assert query["nonce"][0]
     assert query["sign"][0]
 
 
-def test_sign_upload_file_uses_files_url_fallback(monkeypatch: pytest.MonkeyPatch) -> None:
+def test_sign_upload_file_preview_url_ignores_internal_files_url(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setattr("core.tools.signature.time.time", lambda: 1700000000)
     monkeypatch.setattr("core.tools.signature.os.urandom", lambda _: b"\x05" * 16)
     monkeypatch.setattr("core.tools.signature.dify_config.SECRET_KEY", "unit-secret")
     monkeypatch.setattr("core.tools.signature.dify_config.FILES_URL", "https://files.example.com")
-    monkeypatch.setattr("core.tools.signature.dify_config.INTERNAL_FILES_URL", "")
+    monkeypatch.setattr("core.tools.signature.dify_config.INTERNAL_FILES_URL", "https://internal.example.com")
 
-    url = sign_upload_file("upload-id", ".png")
+    url = sign_upload_file_preview_url("upload-id", ".png")
     parsed = urlparse(url)
     query = parse_qs(parsed.query)
 
diff --git a/api/tests/unit_tests/core/tools/test_tool_manager.py b/api/tests/unit_tests/core/tools/test_tool_manager.py
index 9ebaa0417b..7c7d6eec2d 100644
--- a/api/tests/unit_tests/core/tools/test_tool_manager.py
+++ b/api/tests/unit_tests/core/tools/test_tool_manager.py
@@ -648,7 +648,7 @@ def test_list_default_builtin_providers_for_postgres_and_mysql():
         assert providers == provider_records
 
 
-def test_list_providers_from_api_covers_builtin_api_workflow_and_mcp(monkeypatch):
+def test_list_providers_from_api_covers_builtin_api_workflow_and_mcp(monkeypatch: pytest.MonkeyPatch):
     hardcoded_controller = SimpleNamespace(entity=SimpleNamespace(identity=SimpleNamespace(name="hardcoded")))
     plugin_controller = object.__new__(PluginToolProviderController)
     plugin_controller.entity = SimpleNamespace(identity=SimpleNamespace(name="plugin-provider"))
@@ -925,3 +925,78 @@ def test_convert_tool_parameters_type_constant_branch():
     )
 
     assert constant == {"text": "fixed"}
+
+
+def test_convert_tool_parameters_type_model_selector_from_legacy_top_level_config():
+    model_param = ToolParameter.get_simple_instance(
+        name="vision_llm_model",
+        llm_description="vision model",
+        typ=ToolParameter.ToolParameterType.MODEL_SELECTOR,
+        required=True,
+    )
+    model_param.form = ToolParameter.ToolParameterForm.FORM
+    variable_pool = Mock()
+
+    runtime_parameters = ToolManager._convert_tool_parameters_type(
+        parameters=[model_param],
+        variable_pool=variable_pool,
+        tool_configurations={
+            "vision_llm_model": {
+                "type": "constant",
+                "value": "",
+                "provider": "langgenius/tongyi/tongyi",
+                "model": "qwen3-vl-plus",
+                "model_type": "llm",
+                "mode": "chat",
+            }
+        },
+        typ="workflow",
+    )
+
+    assert runtime_parameters == {
+        "vision_llm_model": {
+            "provider": "langgenius/tongyi/tongyi",
+            "model": "qwen3-vl-plus",
+            "model_type": "llm",
+            "mode": "chat",
+        }
+    }
+
+
+def test_convert_tool_parameters_type_model_selector_from_constant_value_config():
+    model_param = ToolParameter.get_simple_instance(
+        name="tts_model",
+        llm_description="tts model",
+        typ=ToolParameter.ToolParameterType.MODEL_SELECTOR,
+        required=True,
+    )
+    model_param.form = ToolParameter.ToolParameterForm.FORM
+    variable_pool = Mock()
+
+    runtime_parameters = ToolManager._convert_tool_parameters_type(
+        parameters=[model_param],
+        variable_pool=variable_pool,
+        tool_configurations={
+            "tts_model": {
+                "type": "constant",
+                "value": {
+                    "provider": "langgenius/tongyi/tongyi",
+                    "model": "qwen3-tts-flash",
+                    "model_type": "tts",
+                    "language": "Chinese",
+                    "voice": "Cherry",
+                },
+            }
+        },
+        typ="workflow",
+    )
+
+    assert runtime_parameters == {
+        "tts_model": {
+            "provider": "langgenius/tongyi/tongyi",
+            "model": "qwen3-tts-flash",
+            "model_type": "tts",
+            "language": "Chinese",
+            "voice": "Cherry",
+        }
+    }
diff --git a/api/tests/unit_tests/core/tools/utils/test_configuration.py b/api/tests/unit_tests/core/tools/utils/test_configuration.py
index ae5638784c..9e179536de 100644
--- a/api/tests/unit_tests/core/tools/utils/test_configuration.py
+++ b/api/tests/unit_tests/core/tools/utils/test_configuration.py
@@ -4,6 +4,8 @@ from collections.abc import Generator
 from typing import Any
 from unittest.mock import patch
 
+import pytest
+
 from core.app.entities.app_invoke_entities import InvokeFrom
 from core.helper.tool_parameter_cache import ToolParameterCache
 from core.tools.__base.tool import Tool
@@ -110,7 +112,7 @@ def test_encrypt_tool_parameters():
     assert encrypted["plain"] == "x"
 
 
-def test_decrypt_tool_parameters_cache_hit_and_miss(monkeypatch):
+def test_decrypt_tool_parameters_cache_hit_and_miss(monkeypatch: pytest.MonkeyPatch):
     manager = _build_manager()
 
     with (
@@ -139,7 +141,7 @@ def test_delete_tool_parameters_cache():
     mock_delete.assert_called_once()
 
 
-def test_configuration_manager_decrypt_suppresses_errors(monkeypatch):
+def test_configuration_manager_decrypt_suppresses_errors(monkeypatch: pytest.MonkeyPatch):
     manager = _build_manager()
     with (
         patch.object(ToolParameterCache, "get", return_value=None),
diff --git a/api/tests/unit_tests/core/tools/utils/test_message_transformer.py b/api/tests/unit_tests/core/tools/utils/test_message_transformer.py
index 5f34135af4..354b395504 100644
--- a/api/tests/unit_tests/core/tools/utils/test_message_transformer.py
+++ b/api/tests/unit_tests/core/tools/utils/test_message_transformer.py
@@ -42,7 +42,7 @@ class _FakeToolFileManager:
 
 
 @pytest.fixture(autouse=True)
-def _patch_tool_file_manager(monkeypatch):
+def _patch_tool_file_manager(monkeypatch: pytest.MonkeyPatch):
     # Patch the manager used inside the transformer module
     monkeypatch.setattr(mt, "ToolFileManager", _FakeToolFileManager)
     # also ensure predictable URL generation (no need to patch; uses id and extension only)
diff --git a/api/tests/unit_tests/core/tools/utils/test_parser.py b/api/tests/unit_tests/core/tools/utils/test_parser.py
index 032b1377a4..99a90f3b67 100644
--- a/api/tests/unit_tests/core/tools/utils/test_parser.py
+++ b/api/tests/unit_tests/core/tools/utils/test_parser.py
@@ -17,7 +17,7 @@ def app():
     return app
 
 
-def test_parse_openapi_to_tool_bundle_operation_id(app):
+def test_parse_openapi_to_tool_bundle_operation_id(app: Flask):
     openapi = {
         "openapi": "3.0.0",
         "info": {"title": "Simple API", "version": "1.0.0"},
@@ -63,7 +63,7 @@ def test_parse_openapi_to_tool_bundle_operation_id(app):
     assert tool_bundles[2].operation_id == "createResource"
 
 
-def test_parse_openapi_to_tool_bundle_properties_all_of(app):
+def test_parse_openapi_to_tool_bundle_properties_all_of(app: Flask):
     openapi = {
         "openapi": "3.0.0",
         "info": {"title": "Simple API", "version": "1.0.0"},
@@ -118,7 +118,7 @@ def test_parse_openapi_to_tool_bundle_properties_all_of(app):
     # assert set(tool_bundles[0].parameters[0].options) == {"option1", "option2", "option3"}
 
 
-def test_parse_openapi_to_tool_bundle_default_value_type_casting(app):
+def test_parse_openapi_to_tool_bundle_default_value_type_casting(app: Flask):
     """
     Test that default values are properly cast to match parameter types.
     This addresses the issue where array default values like [] cause validation errors
diff --git a/api/tests/unit_tests/core/tools/utils/test_system_oauth_encryption.py b/api/tests/unit_tests/core/tools/utils/test_system_oauth_encryption.py
index 6bb86ebe78..081b189745 100644
--- a/api/tests/unit_tests/core/tools/utils/test_system_oauth_encryption.py
+++ b/api/tests/unit_tests/core/tools/utils/test_system_oauth_encryption.py
@@ -34,7 +34,7 @@ def test_system_encrypter_raises_error_for_invalid_ciphertext():
         encrypter.decrypt_params("not-base64")
 
 
-def test_system_helpers_use_global_cached_instance(monkeypatch):
+def test_system_helpers_use_global_cached_instance(monkeypatch: pytest.MonkeyPatch):
     monkeypatch.setattr(encryption, "_encrypter", None)
     monkeypatch.setattr("core.tools.utils.system_encryption.dify_config.SECRET_KEY", "global-secret")
 
diff --git a/api/tests/unit_tests/core/tools/workflow_as_tool/test_tool.py b/api/tests/unit_tests/core/tools/workflow_as_tool/test_tool.py
index 72a73dd936..6c563b0912 100644
--- a/api/tests/unit_tests/core/tools/workflow_as_tool/test_tool.py
+++ b/api/tests/unit_tests/core/tools/workflow_as_tool/test_tool.py
@@ -147,6 +147,142 @@ def test_workflow_tool_does_not_use_pause_state_config(monkeypatch: pytest.Monke
     assert call_kwargs["pause_state_config"] is None
 
 
+def test_workflow_tool_passes_parent_trace_context_from_runtime(monkeypatch: pytest.MonkeyPatch):
+    """Ensure nested workflow runtime metadata is forwarded as parent trace context."""
+    tool = _build_tool()
+    tool.set_parent_trace_context(
+        parent_workflow_run_id="outer-workflow-run-1",
+        parent_node_execution_id="outer-node-execution-1",
+    )
+
+    monkeypatch.setattr(tool, "_get_app", lambda *args, **kwargs: None)
+    monkeypatch.setattr(tool, "_get_workflow", lambda *args, **kwargs: None)
+
+    mock_user = Mock()
+    monkeypatch.setattr(tool, "_resolve_user", lambda *args, **kwargs: mock_user)
+
+    generate_mock = MagicMock(return_value={"data": {}})
+    monkeypatch.setattr("core.app.apps.workflow.app_generator.WorkflowAppGenerator.generate", generate_mock)
+    monkeypatch.setattr("libs.login.current_user", lambda *args, **kwargs: None)
+
+    list(tool.invoke("test_user", {}))
+
+    call_kwargs = generate_mock.call_args.kwargs
+    assert call_kwargs["args"]["parent_trace_context"].model_dump() == {
+        "parent_workflow_run_id": "outer-workflow-run-1",
+        "parent_node_execution_id": "outer-node-execution-1",
+    }
+
+
+def test_workflow_tool_keeps_user_inputs_named_like_trace_runtime_keys(monkeypatch: pytest.MonkeyPatch):
+    """Ensure private trace context does not overwrite same-named workflow inputs."""
+    tool = _build_tool()
+    tool.entity.parameters = [
+        ToolParameter.get_simple_instance(
+            name="outer_workflow_run_id",
+            llm_description="User workflow input",
+            typ=ToolParameter.ToolParameterType.STRING,
+            required=False,
+        ),
+        ToolParameter.get_simple_instance(
+            name="outer_node_execution_id",
+            llm_description="User node input",
+            typ=ToolParameter.ToolParameterType.STRING,
+            required=False,
+        ),
+    ]
+    tool.set_parent_trace_context(
+        parent_workflow_run_id="outer-workflow-run-1",
+        parent_node_execution_id="outer-node-execution-1",
+    )
+
+    monkeypatch.setattr(tool, "_get_app", lambda *args, **kwargs: None)
+    monkeypatch.setattr(tool, "_get_workflow", lambda *args, **kwargs: None)
+
+    mock_user = Mock()
+    monkeypatch.setattr(tool, "_resolve_user", lambda *args, **kwargs: mock_user)
+
+    generate_mock = MagicMock(return_value={"data": {}})
+    monkeypatch.setattr("core.app.apps.workflow.app_generator.WorkflowAppGenerator.generate", generate_mock)
+    monkeypatch.setattr("libs.login.current_user", lambda *args, **kwargs: None)
+
+    list(
+        tool.invoke(
+            "test_user",
+            {
+                "outer_workflow_run_id": "user-workflow-input",
+                "outer_node_execution_id": "user-node-input",
+            },
+        )
+    )
+
+    call_kwargs = generate_mock.call_args.kwargs
+    assert call_kwargs["args"]["inputs"]["outer_workflow_run_id"] == "user-workflow-input"
+    assert call_kwargs["args"]["inputs"]["outer_node_execution_id"] == "user-node-input"
+    assert call_kwargs["args"]["parent_trace_context"].model_dump() == {
+        "parent_workflow_run_id": "outer-workflow-run-1",
+        "parent_node_execution_id": "outer-node-execution-1",
+    }
+
+
+def test_workflow_tool_can_clear_parent_trace_context(monkeypatch: pytest.MonkeyPatch):
+    """Ensure reused WorkflowTool instances do not keep stale parent trace context."""
+    tool = _build_tool()
+    tool.set_parent_trace_context(
+        parent_workflow_run_id="outer-workflow-run-1",
+        parent_node_execution_id="outer-node-execution-1",
+    )
+    tool.clear_parent_trace_context()
+
+    monkeypatch.setattr(tool, "_get_app", lambda *args, **kwargs: None)
+    monkeypatch.setattr(tool, "_get_workflow", lambda *args, **kwargs: None)
+
+    mock_user = Mock()
+    monkeypatch.setattr(tool, "_resolve_user", lambda *args, **kwargs: mock_user)
+
+    generate_mock = MagicMock(return_value={"data": {}})
+    monkeypatch.setattr("core.app.apps.workflow.app_generator.WorkflowAppGenerator.generate", generate_mock)
+    monkeypatch.setattr("libs.login.current_user", lambda *args, **kwargs: None)
+
+    list(tool.invoke("test_user", {}))
+
+    call_kwargs = generate_mock.call_args.kwargs
+    assert "parent_trace_context" not in call_kwargs["args"]
+
+
+@pytest.mark.parametrize(
+    "runtime_parameters",
+    [
+        {},
+        {"outer_workflow_run_id": "outer-workflow-run-1"},
+        {"outer_node_execution_id": "outer-node-execution-1"},
+        {"outer_workflow_run_id": None, "outer_node_execution_id": None},
+    ],
+)
+def test_workflow_tool_omits_parent_trace_context_when_runtime_is_incomplete(
+    monkeypatch: pytest.MonkeyPatch,
+    runtime_parameters: dict[str, Any],
+):
+    """Ensure incomplete runtime metadata does not leak parent trace context into generator args."""
+    tool = _build_tool()
+    tool.runtime.runtime_parameters = runtime_parameters
+
+    monkeypatch.setattr(tool, "_get_app", lambda *args, **kwargs: None)
+    monkeypatch.setattr(tool, "_get_workflow", lambda *args, **kwargs: None)
+
+    mock_user = Mock()
+    monkeypatch.setattr(tool, "_resolve_user", lambda *args, **kwargs: mock_user)
+
+    generate_mock = MagicMock(return_value={"data": {}})
+    monkeypatch.setattr("core.app.apps.workflow.app_generator.WorkflowAppGenerator.generate", generate_mock)
+    monkeypatch.setattr("libs.login.current_user", lambda *args, **kwargs: None)
+
+    list(tool.invoke("test_user", {}))
+
+    call_kwargs = generate_mock.call_args.kwargs
+    assert "parent_trace_context" not in call_kwargs["args"]
+
+
 def test_workflow_tool_should_generate_variable_messages_for_outputs(monkeypatch: pytest.MonkeyPatch):
     """Test that WorkflowTool should generate variable messages when there are outputs"""
     tool = _build_tool()
diff --git a/api/tests/unit_tests/core/variables/test_segment_type.py b/api/tests/unit_tests/core/variables/test_segment_type.py
index d4e862220a..009899a92d 100644
--- a/api/tests/unit_tests/core/variables/test_segment_type.py
+++ b/api/tests/unit_tests/core/variables/test_segment_type.py
@@ -233,8 +233,6 @@ class TestSegmentTypeAdditionalMethods:
         assert SegmentType.GROUP.is_valid([StringSegment(value="b")]) is True
         assert SegmentType.GROUP.is_valid(["not-segment"]) is False
 
-    def test_unreachable_assertion_branch(self, monkeypatch):
-        monkeypatch.setattr(SegmentType, "is_array_type", lambda self: False)
-
-        with pytest.raises(AssertionError, match="unreachable"):
-            SegmentType.ARRAY_STRING.is_valid(["a"])
+    def test_unreachable_assertion_branch(self):
+        with pytest.raises(AssertionError, match="Expected code to be unreachable"):
+            SegmentType.is_valid("not-a-segment-type", None)  # type: ignore[arg-type]
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/layers/test_llm_quota.py b/api/tests/unit_tests/core/workflow/graph_engine/layers/test_llm_quota.py
index 5d6667257f..12c7f8113c 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/layers/test_llm_quota.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/layers/test_llm_quota.py
@@ -1,12 +1,11 @@
+import logging
 import threading
 from datetime import datetime
 from types import SimpleNamespace
 from unittest.mock import MagicMock, patch
 
-from core.app.entities.app_invoke_entities import DifyRunContext, InvokeFrom, UserFrom
 from core.app.workflow.layers.llm_quota import LLMQuotaLayer
 from core.errors.error import QuotaExceededError
-from core.model_manager import ModelInstance
 from graphon.enums import BuiltinNodeTypes, WorkflowNodeExecutionStatus
 from graphon.graph_engine.entities.commands import CommandType
 from graphon.graph_events import NodeRunSucceededEvent
@@ -14,17 +13,7 @@ from graphon.model_runtime.entities.llm_entities import LLMUsage
 from graphon.node_events import NodeRunResult
 
 
-def _build_dify_context() -> DifyRunContext:
-    return DifyRunContext(
-        tenant_id="tenant-id",
-        app_id="app-id",
-        user_id="user-id",
-        user_from=UserFrom.ACCOUNT,
-        invoke_from=InvokeFrom.DEBUGGER,
-    )
-
-
-def _build_succeeded_event() -> NodeRunSucceededEvent:
+def _build_succeeded_event(*, provider: str = "openai", model_name: str = "gpt-4o") -> NodeRunSucceededEvent:
     return NodeRunSucceededEvent(
         id="execution-id",
         node_id="llm-node-id",
@@ -32,113 +21,162 @@ def _build_succeeded_event() -> NodeRunSucceededEvent:
         start_at=datetime.now(),
         node_run_result=NodeRunResult(
             status=WorkflowNodeExecutionStatus.SUCCEEDED,
-            inputs={"question": "hello"},
+            inputs={
+                "question": "hello",
+                "model_provider": provider,
+                "model_name": model_name,
+            },
             llm_usage=LLMUsage.empty_usage(),
         ),
     )
 
 
-def _build_wrapped_model_instance() -> tuple[SimpleNamespace, ModelInstance]:
-    raw_model_instance = ModelInstance.__new__(ModelInstance)
-    return SimpleNamespace(_model_instance=raw_model_instance), raw_model_instance
+def _build_public_model_identity(*, provider: str = "openai", model_name: str = "gpt-4o") -> SimpleNamespace:
+    return SimpleNamespace(provider=provider, name=model_name)
+
+
+def _build_node_data(*, model: SimpleNamespace | None = None) -> SimpleNamespace:
+    return SimpleNamespace(
+        error_strategy=None,
+        retry_config=SimpleNamespace(retry_enabled=False),
+        model=model,
+    )
+
+
+def _build_node(*, node_type: BuiltinNodeTypes = BuiltinNodeTypes.LLM) -> MagicMock:
+    node = MagicMock()
+    node.id = "node-id"
+    node.execution_id = "execution-id"
+    node.node_type = node_type
+    node.node_data = _build_node_data(model=_build_public_model_identity())
+    node.model_instance = SimpleNamespace(provider="stale-provider", model_name="stale-model")
+    return node
+
+
+class _RunnableQuotaNode:
+    id = "node-id"
+    execution_id = "execution-id"
+    node_type = BuiltinNodeTypes.LLM
+    title = "LLM node"
+
+    def __init__(self, *, stop_event: threading.Event, node_data: SimpleNamespace | None = None) -> None:
+        self.node_data = node_data or _build_node_data(model=_build_public_model_identity())
+        self.graph_runtime_state = SimpleNamespace(stop_event=stop_event)
+        self.original_run_called = False
+
+    def _run(self) -> NodeRunResult:
+        self.original_run_called = True
+        return NodeRunResult(status=WorkflowNodeExecutionStatus.SUCCEEDED)
 
 
 def test_deduct_quota_called_for_successful_llm_node() -> None:
-    layer = LLMQuotaLayer()
-    node = MagicMock()
-    node.id = "llm-node-id"
-    node.execution_id = "execution-id"
-    node.node_type = BuiltinNodeTypes.LLM
-    node.tenant_id = "tenant-id"
-    node.require_run_context_value.return_value = _build_dify_context()
-    node.model_instance, raw_model_instance = _build_wrapped_model_instance()
-
+    layer = LLMQuotaLayer(tenant_id="tenant-id")
+    node = _build_node(node_type=BuiltinNodeTypes.LLM)
     result_event = _build_succeeded_event()
-    with patch("core.app.workflow.layers.llm_quota.deduct_llm_quota", autospec=True) as mock_deduct:
+
+    with patch("core.app.workflow.layers.llm_quota.deduct_llm_quota_for_model", autospec=True) as mock_deduct:
         layer.on_node_run_end(node=node, error=None, result_event=result_event)
 
     mock_deduct.assert_called_once_with(
         tenant_id="tenant-id",
-        model_instance=raw_model_instance,
+        provider="openai",
+        model="gpt-4o",
         usage=result_event.node_run_result.llm_usage,
     )
 
 
 def test_deduct_quota_called_for_question_classifier_node() -> None:
-    layer = LLMQuotaLayer()
-    node = MagicMock()
-    node.id = "question-classifier-node-id"
-    node.execution_id = "execution-id"
-    node.node_type = BuiltinNodeTypes.QUESTION_CLASSIFIER
-    node.tenant_id = "tenant-id"
-    node.require_run_context_value.return_value = _build_dify_context()
-    node.model_instance, raw_model_instance = _build_wrapped_model_instance()
+    layer = LLMQuotaLayer(tenant_id="tenant-id")
+    node = _build_node(node_type=BuiltinNodeTypes.QUESTION_CLASSIFIER)
+    result_event = _build_succeeded_event(provider="anthropic", model_name="claude-3-7-sonnet")
 
-    result_event = _build_succeeded_event()
-    with patch("core.app.workflow.layers.llm_quota.deduct_llm_quota", autospec=True) as mock_deduct:
+    with patch("core.app.workflow.layers.llm_quota.deduct_llm_quota_for_model", autospec=True) as mock_deduct:
         layer.on_node_run_end(node=node, error=None, result_event=result_event)
 
     mock_deduct.assert_called_once_with(
         tenant_id="tenant-id",
-        model_instance=raw_model_instance,
+        provider="anthropic",
+        model="claude-3-7-sonnet",
         usage=result_event.node_run_result.llm_usage,
     )
 
 
 def test_non_llm_node_is_ignored() -> None:
-    layer = LLMQuotaLayer()
-    node = MagicMock()
-    node.id = "start-node-id"
-    node.execution_id = "execution-id"
-    node.node_type = BuiltinNodeTypes.START
-    node.tenant_id = "tenant-id"
-    node.require_run_context_value.return_value = _build_dify_context()
-    node._model_instance = object()
-
+    layer = LLMQuotaLayer(tenant_id="tenant-id")
+    node = _build_node(node_type=BuiltinNodeTypes.START)
     result_event = _build_succeeded_event()
-    with patch("core.app.workflow.layers.llm_quota.deduct_llm_quota", autospec=True) as mock_deduct:
+
+    with patch("core.app.workflow.layers.llm_quota.deduct_llm_quota_for_model", autospec=True) as mock_deduct:
         layer.on_node_run_end(node=node, error=None, result_event=result_event)
 
     mock_deduct.assert_not_called()
 
 
-def test_quota_error_is_handled_in_layer() -> None:
-    layer = LLMQuotaLayer()
-    node = MagicMock()
-    node.id = "llm-node-id"
-    node.execution_id = "execution-id"
-    node.node_type = BuiltinNodeTypes.LLM
-    node.tenant_id = "tenant-id"
-    node.require_run_context_value.return_value = _build_dify_context()
-    node.model_instance = object()
+def test_precheck_ignores_non_quota_node() -> None:
+    layer = LLMQuotaLayer(tenant_id="tenant-id")
+    node = _build_node(node_type=BuiltinNodeTypes.START)
 
-    result_event = _build_succeeded_event()
-    with patch(
-        "core.app.workflow.layers.llm_quota.deduct_llm_quota",
-        autospec=True,
-        side_effect=ValueError("quota exceeded"),
-    ):
-        layer.on_node_run_end(node=node, error=None, result_event=result_event)
+    with patch("core.app.workflow.layers.llm_quota.ensure_llm_quota_available_for_model", autospec=True) as mock_check:
+        layer.on_node_run_start(node)
+
+    mock_check.assert_not_called()
 
 
-def test_quota_deduction_exceeded_aborts_workflow_immediately() -> None:
-    layer = LLMQuotaLayer()
+def test_quota_error_is_handled_in_layer(caplog) -> None:
+    layer = LLMQuotaLayer(tenant_id="tenant-id")
     stop_event = threading.Event()
     layer.command_channel = MagicMock()
 
-    node = MagicMock()
-    node.id = "llm-node-id"
-    node.execution_id = "execution-id"
-    node.node_type = BuiltinNodeTypes.LLM
-    node.tenant_id = "tenant-id"
-    node.require_run_context_value.return_value = _build_dify_context()
-    node.model_instance, _ = _build_wrapped_model_instance()
+    node = _build_node(node_type=BuiltinNodeTypes.LLM)
+    node.graph_runtime_state = MagicMock()
+    node.graph_runtime_state.stop_event = stop_event
+    result_event = _build_succeeded_event()
+
+    with (
+        caplog.at_level(logging.ERROR, logger="core.app.workflow.layers.llm_quota"),
+        patch(
+            "core.app.workflow.layers.llm_quota.deduct_llm_quota_for_model",
+            autospec=True,
+            side_effect=ValueError("quota exceeded"),
+        ) as mock_deduct,
+    ):
+        layer.on_node_run_end(node=node, error=None, result_event=result_event)
+
+    mock_deduct.assert_called_once_with(
+        tenant_id="tenant-id",
+        provider="openai",
+        model="gpt-4o",
+        usage=result_event.node_run_result.llm_usage,
+    )
+    assert "LLM quota deduction failed, node_id=node-id" in caplog.text
+    assert not stop_event.is_set()
+    layer.command_channel.send_command.assert_not_called()
+
+
+def test_send_abort_command_is_noop_without_channel_or_after_abort() -> None:
+    layer = LLMQuotaLayer(tenant_id="tenant-id")
+
+    layer._send_abort_command(reason="no channel")
+
+    layer.command_channel = MagicMock()
+    layer._abort_sent = True
+    layer._send_abort_command(reason="already aborted")
+
+    layer.command_channel.send_command.assert_not_called()
+
+
+def test_quota_deduction_exceeded_aborts_workflow_immediately() -> None:
+    layer = LLMQuotaLayer(tenant_id="tenant-id")
+    stop_event = threading.Event()
+    layer.command_channel = MagicMock()
+
+    node = _build_node(node_type=BuiltinNodeTypes.LLM)
     node.graph_runtime_state = MagicMock()
     node.graph_runtime_state.stop_event = stop_event
 
     result_event = _build_succeeded_event()
     with patch(
-        "core.app.workflow.layers.llm_quota.deduct_llm_quota",
+        "core.app.workflow.layers.llm_quota.deduct_llm_quota_for_model",
         autospec=True,
         side_effect=QuotaExceededError("No credits remaining"),
     ):
@@ -152,19 +190,16 @@ def test_quota_deduction_exceeded_aborts_workflow_immediately() -> None:
 
 
 def test_quota_precheck_failure_aborts_workflow_immediately() -> None:
-    layer = LLMQuotaLayer()
+    layer = LLMQuotaLayer(tenant_id="tenant-id")
     stop_event = threading.Event()
     layer.command_channel = MagicMock()
 
-    node = MagicMock()
-    node.id = "llm-node-id"
-    node.node_type = BuiltinNodeTypes.LLM
-    node.model_instance, _ = _build_wrapped_model_instance()
+    node = _build_node(node_type=BuiltinNodeTypes.LLM)
     node.graph_runtime_state = MagicMock()
     node.graph_runtime_state.stop_event = stop_event
 
     with patch(
-        "core.app.workflow.layers.llm_quota.ensure_llm_quota_available",
+        "core.app.workflow.layers.llm_quota.ensure_llm_quota_available_for_model",
         autospec=True,
         side_effect=QuotaExceededError("Model provider openai quota exceeded."),
     ):
@@ -177,21 +212,140 @@ def test_quota_precheck_failure_aborts_workflow_immediately() -> None:
     assert abort_command.reason == "Model provider openai quota exceeded."
 
 
-def test_quota_precheck_passes_without_abort() -> None:
-    layer = LLMQuotaLayer()
+def test_quota_precheck_failure_blocks_current_node_run() -> None:
+    layer = LLMQuotaLayer(tenant_id="tenant-id")
     stop_event = threading.Event()
     layer.command_channel = MagicMock()
 
-    node = MagicMock()
-    node.id = "llm-node-id"
-    node.node_type = BuiltinNodeTypes.LLM
-    node.model_instance, raw_model_instance = _build_wrapped_model_instance()
+    node = _RunnableQuotaNode(stop_event=stop_event)
+
+    with patch(
+        "core.app.workflow.layers.llm_quota.ensure_llm_quota_available_for_model",
+        autospec=True,
+        side_effect=QuotaExceededError("Model provider openai quota exceeded."),
+    ):
+        layer.on_node_run_start(node)
+
+    result = node._run()
+    assert not node.original_run_called
+    assert result.status == WorkflowNodeExecutionStatus.FAILED
+    assert result.error == "Model provider openai quota exceeded."
+    assert result.error_type == QuotaExceededError.__name__
+
+
+def test_missing_model_identity_blocks_current_node_run() -> None:
+    layer = LLMQuotaLayer(tenant_id="tenant-id")
+    stop_event = threading.Event()
+    layer.command_channel = MagicMock()
+
+    node = _RunnableQuotaNode(stop_event=stop_event, node_data=_build_node_data())
+
+    with patch("core.app.workflow.layers.llm_quota.ensure_llm_quota_available_for_model", autospec=True) as mock_check:
+        layer.on_node_run_start(node)
+
+    result = node._run()
+    assert not node.original_run_called
+    assert result.status == WorkflowNodeExecutionStatus.FAILED
+    assert result.error == "LLM quota check requires public node model identity before execution."
+    assert result.error_type == "LLMQuotaIdentityError"
+    mock_check.assert_not_called()
+
+
+def test_quota_precheck_passes_without_abort() -> None:
+    layer = LLMQuotaLayer(tenant_id="tenant-id")
+    stop_event = threading.Event()
+    layer.command_channel = MagicMock()
+
+    node = _build_node(node_type=BuiltinNodeTypes.LLM)
     node.graph_runtime_state = MagicMock()
     node.graph_runtime_state.stop_event = stop_event
 
-    with patch("core.app.workflow.layers.llm_quota.ensure_llm_quota_available", autospec=True) as mock_check:
+    with patch("core.app.workflow.layers.llm_quota.ensure_llm_quota_available_for_model", autospec=True) as mock_check:
         layer.on_node_run_start(node)
 
     assert not stop_event.is_set()
-    mock_check.assert_called_once_with(model_instance=raw_model_instance)
+    mock_check.assert_called_once_with(
+        tenant_id="tenant-id",
+        provider="openai",
+        model="gpt-4o",
+    )
     layer.command_channel.send_command.assert_not_called()
+
+
+def test_precheck_reads_model_identity_from_data_when_node_data_is_absent() -> None:
+    layer = LLMQuotaLayer(tenant_id="tenant-id")
+    node = SimpleNamespace(
+        id="node-id",
+        node_type=BuiltinNodeTypes.LLM,
+        data=_build_node_data(model=_build_public_model_identity(provider="anthropic", model_name="claude")),
+    )
+
+    with patch("core.app.workflow.layers.llm_quota.ensure_llm_quota_available_for_model", autospec=True) as mock_check:
+        layer.on_node_run_start(node)
+
+    mock_check.assert_called_once_with(
+        tenant_id="tenant-id",
+        provider="anthropic",
+        model="claude",
+    )
+
+
+def test_precheck_rejects_invalid_public_model_identity() -> None:
+    layer = LLMQuotaLayer(tenant_id="tenant-id")
+    stop_event = threading.Event()
+    layer.command_channel = MagicMock()
+
+    node = _build_node(node_type=BuiltinNodeTypes.LLM)
+    node.node_data = _build_node_data(model=_build_public_model_identity(provider="", model_name="gpt-4o"))
+    node.graph_runtime_state = MagicMock()
+    node.graph_runtime_state.stop_event = stop_event
+
+    with patch("core.app.workflow.layers.llm_quota.ensure_llm_quota_available_for_model", autospec=True) as mock_check:
+        layer.on_node_run_start(node)
+
+    assert stop_event.is_set()
+    mock_check.assert_not_called()
+    layer.command_channel.send_command.assert_called_once()
+
+
+def test_precheck_requires_public_node_model_config() -> None:
+    layer = LLMQuotaLayer(tenant_id="tenant-id")
+    stop_event = threading.Event()
+    layer.command_channel = MagicMock()
+
+    node = _build_node(node_type=BuiltinNodeTypes.LLM)
+    node.node_data = _build_node_data()
+    node.graph_runtime_state = MagicMock()
+    node.graph_runtime_state.stop_event = stop_event
+
+    with patch("core.app.workflow.layers.llm_quota.ensure_llm_quota_available_for_model", autospec=True) as mock_check:
+        layer.on_node_run_start(node)
+
+    assert stop_event.is_set()
+    mock_check.assert_not_called()
+    layer.command_channel.send_command.assert_called_once()
+    abort_command = layer.command_channel.send_command.call_args.args[0]
+    assert abort_command.command_type == CommandType.ABORT
+    assert abort_command.reason == "LLM quota check requires public node model identity before execution."
+
+
+def test_deduction_requires_public_event_model_identity() -> None:
+    layer = LLMQuotaLayer(tenant_id="tenant-id")
+    stop_event = threading.Event()
+    layer.command_channel = MagicMock()
+
+    node = _build_node(node_type=BuiltinNodeTypes.LLM)
+    node.graph_runtime_state = MagicMock()
+    node.graph_runtime_state.stop_event = stop_event
+    result_event = _build_succeeded_event()
+    result_event.node_run_result.inputs = {"question": "hello"}
+
+    with patch("core.app.workflow.layers.llm_quota.deduct_llm_quota_for_model", autospec=True) as mock_deduct:
+        layer.on_node_run_end(node=node, error=None, result_event=result_event)
+
+    assert stop_event.is_set()
+    mock_deduct.assert_not_called()
+    layer.command_channel.send_command.assert_called_once()
+    abort_command = layer.command_channel.send_command.call_args.args[0]
+    assert abort_command.command_type == CommandType.ABORT
+    assert abort_command.reason == "LLM quota deduction requires model identity in the node result event."
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_mock_factory.py b/api/tests/unit_tests/core/workflow/graph_engine/test_mock_factory.py
index 9f3e3b00b9..c721c7b0eb 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_mock_factory.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_mock_factory.py
@@ -96,7 +96,7 @@ class MockNodeFactory(DifyNodeFactory):
             if node_type == BuiltinNodeTypes.CODE:
                 mock_instance = mock_class(
                     node_id=node_id,
-                    config=resolved_node_data,
+                    data=resolved_node_data,
                     graph_init_params=self.graph_init_params,
                     graph_runtime_state=self.graph_runtime_state,
                     mock_config=self.mock_config,
@@ -106,7 +106,7 @@ class MockNodeFactory(DifyNodeFactory):
             elif node_type == BuiltinNodeTypes.HTTP_REQUEST:
                 mock_instance = mock_class(
                     node_id=node_id,
-                    config=resolved_node_data,
+                    data=resolved_node_data,
                     graph_init_params=self.graph_init_params,
                     graph_runtime_state=self.graph_runtime_state,
                     mock_config=self.mock_config,
@@ -122,7 +122,7 @@ class MockNodeFactory(DifyNodeFactory):
             }:
                 mock_instance = mock_class(
                     node_id=node_id,
-                    config=resolved_node_data,
+                    data=resolved_node_data,
                     graph_init_params=self.graph_init_params,
                     graph_runtime_state=self.graph_runtime_state,
                     mock_config=self.mock_config,
@@ -132,7 +132,7 @@ class MockNodeFactory(DifyNodeFactory):
             else:
                 mock_instance = mock_class(
                     node_id=node_id,
-                    config=resolved_node_data,
+                    data=resolved_node_data,
                     graph_init_params=self.graph_init_params,
                     graph_runtime_state=self.graph_runtime_state,
                     mock_config=self.mock_config,
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_mock_nodes.py b/api/tests/unit_tests/core/workflow/graph_engine/test_mock_nodes.py
index f9819c47ec..c3e6f5d76c 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_mock_nodes.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_mock_nodes.py
@@ -56,7 +56,7 @@ class MockNodeMixin:
     def __init__(
         self,
         node_id: str,
-        config: Any,
+        data: Any,
         *,
         graph_init_params: "GraphInitParams",
         graph_runtime_state: "GraphRuntimeState",
@@ -81,11 +81,11 @@ class MockNodeMixin:
         if isinstance(self, TemplateTransformNode):
             kwargs.setdefault("jinja2_template_renderer", _TestJinja2Renderer())
 
-        # Provide default tool_file_manager_factory for ToolNode subclasses
+        # Provide default ToolNode dependencies for ToolNode subclasses.
         from graphon.nodes.tool import ToolNode as _ToolNode  # local import to avoid cycles
 
         if isinstance(self, _ToolNode):
-            kwargs.setdefault("tool_file_manager_factory", MagicMock(spec=ToolFileManagerProtocol))
+            kwargs.setdefault("tool_file_manager", MagicMock(spec=ToolFileManagerProtocol))
             kwargs.setdefault("runtime", DifyToolNodeRuntime(graph_init_params.run_context))
 
         if isinstance(self, AgentNode):
@@ -98,7 +98,7 @@ class MockNodeMixin:
 
         super().__init__(
             node_id=node_id,
-            config=config,
+            data=data,
             graph_init_params=graph_init_params,
             graph_runtime_state=graph_runtime_state,
             **kwargs,
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_parallel_human_input_join_resume.py b/api/tests/unit_tests/core/workflow/graph_engine/test_parallel_human_input_join_resume.py
index 75bc6d05f7..fd6263be19 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_parallel_human_input_join_resume.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_parallel_human_input_join_resume.py
@@ -9,7 +9,7 @@ from core.repositories.human_input_repository import (
     HumanInputFormEntity,
     HumanInputFormRepository,
 )
-from core.workflow.node_runtime import DifyHumanInputNodeRuntime
+from core.workflow.node_runtime import DifyFileReferenceFactory, DifyHumanInputNodeRuntime
 from core.workflow.system_variables import build_system_variables
 from graphon.entities import WorkflowStartReason
 from graphon.graph import Graph
@@ -24,7 +24,7 @@ from graphon.graph_events import (
 from graphon.nodes.base.entities import OutputVariableEntity
 from graphon.nodes.end.end_node import EndNode
 from graphon.nodes.end.entities import EndNodeData
-from graphon.nodes.human_input.entities import HumanInputNodeData, UserAction
+from graphon.nodes.human_input.entities import HumanInputNodeData, UserActionConfig
 from graphon.nodes.human_input.enums import HumanInputFormStatus
 from graphon.nodes.human_input.human_input_node import HumanInputNode
 from graphon.nodes.start.entities import StartNodeData
@@ -111,7 +111,7 @@ class StaticRepo(HumanInputFormRepository):
 
 
 def _build_runtime_state() -> GraphRuntimeState:
-    variable_pool = VariablePool(
+    variable_pool = VariablePool.from_bootstrap(
         system_variables=build_system_variables(
             user_id="user",
             app_id="app",
@@ -140,7 +140,7 @@ def _build_graph(runtime_state: GraphRuntimeState, repo: HumanInputFormRepositor
     start_config = {"id": "start", "data": StartNodeData(title="Start", variables=[]).model_dump()}
     start_node = StartNode(
         node_id=start_config["id"],
-        config=StartNodeData(title="Start", variables=[]),
+        data=StartNodeData(title="Start", variables=[]),
         graph_init_params=graph_init_params,
         graph_runtime_state=runtime_state,
     )
@@ -149,26 +149,28 @@ def _build_graph(runtime_state: GraphRuntimeState, repo: HumanInputFormRepositor
         title="Human Input",
         form_content="Human input required",
         inputs=[],
-        user_actions=[UserAction(id="approve", title="Approve")],
+        user_actions=[UserActionConfig(id="approve", title="Approve")],
     )
 
     human_a_config = {"id": "human_a", "data": human_data.model_dump()}
     human_a = HumanInputNode(
         node_id=human_a_config["id"],
-        config=human_data,
+        data=human_data,
         graph_init_params=graph_init_params,
         graph_runtime_state=runtime_state,
         form_repository=repo,
+        file_reference_factory=DifyFileReferenceFactory(graph_init_params.run_context),
         runtime=DifyHumanInputNodeRuntime(graph_init_params.run_context),
     )
 
     human_b_config = {"id": "human_b", "data": human_data.model_dump()}
     human_b = HumanInputNode(
         node_id=human_b_config["id"],
-        config=human_data,
+        data=human_data,
         graph_init_params=graph_init_params,
         graph_runtime_state=runtime_state,
         form_repository=repo,
+        file_reference_factory=DifyFileReferenceFactory(graph_init_params.run_context),
         runtime=DifyHumanInputNodeRuntime(graph_init_params.run_context),
     )
 
@@ -183,7 +185,7 @@ def _build_graph(runtime_state: GraphRuntimeState, repo: HumanInputFormRepositor
     end_config = {"id": "end", "data": end_data.model_dump()}
     end_node = EndNode(
         node_id=end_config["id"],
-        config=end_data,
+        data=end_data,
         graph_init_params=graph_init_params,
         graph_runtime_state=runtime_state,
     )
diff --git a/api/tests/unit_tests/core/workflow/graph_engine/test_table_runner.py b/api/tests/unit_tests/core/workflow/graph_engine/test_table_runner.py
index 7d23b63049..100b294f52 100644
--- a/api/tests/unit_tests/core/workflow/graph_engine/test_table_runner.py
+++ b/api/tests/unit_tests/core/workflow/graph_engine/test_table_runner.py
@@ -297,7 +297,7 @@ class TableTestRunner:
         max_workers: int = 4,
         enable_logging: bool = False,
         log_level: str = "INFO",
-        graph_engine_min_workers: int = 1,
+        graph_engine_min_workers: int = 3,
         graph_engine_max_workers: int = 1,
         graph_engine_scale_up_threshold: int = 5,
         graph_engine_scale_down_idle_time: float = 30.0,
@@ -310,7 +310,7 @@ class TableTestRunner:
             max_workers: Maximum number of parallel workers for test execution
             enable_logging: Enable detailed logging
             log_level: Logging level (DEBUG, INFO, WARNING, ERROR)
-            graph_engine_min_workers: Minimum workers for GraphEngine (default: 1)
+            graph_engine_min_workers: Minimum workers for GraphEngine (default: 3)
             graph_engine_max_workers: Maximum workers for GraphEngine (default: 1)
             graph_engine_scale_up_threshold: Queue depth to trigger scale up
             graph_engine_scale_down_idle_time: Idle time before scaling down
diff --git a/api/tests/unit_tests/core/workflow/nodes/answer/test_answer.py b/api/tests/unit_tests/core/workflow/nodes/answer/test_answer.py
index ae9dae0646..2603e29be6 100644
--- a/api/tests/unit_tests/core/workflow/nodes/answer/test_answer.py
+++ b/api/tests/unit_tests/core/workflow/nodes/answer/test_answer.py
@@ -1,41 +1,36 @@
 import time
 import uuid
-from unittest.mock import MagicMock
 
 from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
-from core.workflow.node_factory import DifyNodeFactory
 from core.workflow.system_variables import build_system_variables
-from extensions.ext_database import db
 from graphon.enums import WorkflowNodeExecutionStatus
-from graphon.graph import Graph
 from graphon.nodes.answer.answer_node import AnswerNode
 from graphon.nodes.answer.entities import AnswerNodeData
 from graphon.runtime import GraphRuntimeState, VariablePool
 from tests.workflow_test_utils import build_test_graph_init_params
 
 
-def test_execute_answer():
+def _build_variable_pool() -> VariablePool:
+    return VariablePool.from_bootstrap(
+        system_variables=build_system_variables(user_id="aaa", files=[]),
+        user_inputs={},
+    )
+
+
+def _build_answer_node(*, answer: str, variable_pool: VariablePool) -> AnswerNode:
     graph_config = {
-        "edges": [
-            {
-                "id": "start-source-answer-target",
-                "source": "start",
-                "target": "answer",
-            },
-        ],
+        "edges": [],
         "nodes": [
-            {"data": {"type": "start", "title": "Start"}, "id": "start"},
             {
                 "data": {
-                    "title": "123",
+                    "title": "Answer",
                     "type": "answer",
-                    "answer": "Today's weather is {{#start.weather#}}\n{{#llm.text#}}\n{{img}}\nFin.",
+                    "answer": answer,
                 },
                 "id": "answer",
-            },
+            }
         ],
     }
-
     init_params = build_test_graph_init_params(
         workflow_id="1",
         graph_config=graph_config,
@@ -46,42 +41,31 @@ def test_execute_answer():
         invoke_from=InvokeFrom.DEBUGGER,
         call_depth=0,
     )
-
-    # construct variable pool
-    variable_pool = VariablePool(
-        system_variables=build_system_variables(user_id="aaa", files=[]),
-        user_inputs={},
-        environment_variables=[],
-        conversation_variables=[],
+    graph_runtime_state = GraphRuntimeState(
+        variable_pool=variable_pool,
+        start_at=time.perf_counter(),
     )
-    variable_pool.add(["start", "weather"], "sunny")
-    variable_pool.add(["llm", "text"], "You are a helpful AI.")
-
-    graph_runtime_state = GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter())
-
-    # create node factory
-    node_factory = DifyNodeFactory(
-        graph_init_params=init_params,
-        graph_runtime_state=graph_runtime_state,
-    )
-
-    graph = Graph.init(graph_config=graph_config, node_factory=node_factory, root_node_id="start")
-
-    node = AnswerNode(
+    return AnswerNode(
         node_id=str(uuid.uuid4()),
         graph_init_params=init_params,
         graph_runtime_state=graph_runtime_state,
-        config=AnswerNodeData(
-            title="123",
+        data=AnswerNodeData(
+            title="Answer",
             type="answer",
-            answer="Today's weather is {{#start.weather#}}\n{{#llm.text#}}\n{{img}}\nFin.",
+            answer=answer,
         ),
     )
 
-    # Mock db.session.close()
-    db.session.close = MagicMock()
 
-    # execute node
+def test_execute_answer_renders_variable_selectors() -> None:
+    variable_pool = _build_variable_pool()
+    variable_pool.add(["start", "weather"], "sunny")
+    variable_pool.add(["llm", "text"], "You are a helpful AI.")
+    node = _build_answer_node(
+        answer="Today's weather is {{#start.weather#}}\n{{#llm.text#}}\n{{img}}\nFin.",
+        variable_pool=variable_pool,
+    )
+
     result = node._run()
 
     assert result.status == WorkflowNodeExecutionStatus.SUCCEEDED
@@ -89,36 +73,11 @@ def test_execute_answer():
 
 
 def test_execute_answer_renders_structured_output_object_as_json() -> None:
-    init_params = build_test_graph_init_params(
-        workflow_id="1",
-        graph_config={"nodes": [], "edges": []},
-        tenant_id="1",
-        app_id="1",
-        user_id="1",
-        user_from=UserFrom.ACCOUNT,
-        invoke_from=InvokeFrom.DEBUGGER,
-        call_depth=0,
-    )
-
-    variable_pool = VariablePool(
-        system_variables=build_system_variables(user_id="aaa", files=[]),
-        user_inputs={},
-        environment_variables=[],
-        conversation_variables=[],
-    )
+    variable_pool = _build_variable_pool()
     variable_pool.add(["1777539038857", "structured_output"], {"type": "greeting"})
-
-    graph_runtime_state = GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter())
-
-    node = AnswerNode(
-        node_id=str(uuid.uuid4()),
-        graph_init_params=init_params,
-        graph_runtime_state=graph_runtime_state,
-        config=AnswerNodeData(
-            title="123",
-            type="answer",
-            answer="{{#1777539038857.structured_output#}}",
-        ),
+    node = _build_answer_node(
+        answer="{{#1777539038857.structured_output#}}",
+        variable_pool=variable_pool,
     )
 
     result = node._run()
@@ -128,35 +87,9 @@ def test_execute_answer_renders_structured_output_object_as_json() -> None:
 
 
 def test_execute_answer_falls_back_to_plain_selector_text_when_structured_output_missing() -> None:
-    init_params = build_test_graph_init_params(
-        workflow_id="1",
-        graph_config={"nodes": [], "edges": []},
-        tenant_id="1",
-        app_id="1",
-        user_id="1",
-        user_from=UserFrom.ACCOUNT,
-        invoke_from=InvokeFrom.DEBUGGER,
-        call_depth=0,
-    )
-
-    variable_pool = VariablePool(
-        system_variables=build_system_variables(user_id="aaa", files=[]),
-        user_inputs={},
-        environment_variables=[],
-        conversation_variables=[],
-    )
-
-    graph_runtime_state = GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter())
-
-    node = AnswerNode(
-        node_id=str(uuid.uuid4()),
-        graph_init_params=init_params,
-        graph_runtime_state=graph_runtime_state,
-        config=AnswerNodeData(
-            title="123",
-            type="answer",
-            answer="{{#1777539038857.structured_output#}}",
-        ),
+    node = _build_answer_node(
+        answer="{{#1777539038857.structured_output#}}",
+        variable_pool=_build_variable_pool(),
     )
 
     result = node._run()
diff --git a/api/tests/unit_tests/core/workflow/nodes/datasource/test_datasource_node.py b/api/tests/unit_tests/core/workflow/nodes/datasource/test_datasource_node.py
index d7ef781732..235d56e989 100644
--- a/api/tests/unit_tests/core/workflow/nodes/datasource/test_datasource_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/datasource/test_datasource_node.py
@@ -1,3 +1,5 @@
+from pytest_mock import MockerFixture
+
 from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY
 from core.workflow.nodes.datasource.datasource_node import DatasourceNode
 from core.workflow.nodes.datasource.entities import DatasourceNodeData
@@ -44,7 +46,7 @@ class _GraphParams:
     call_depth = 0
 
 
-def test_datasource_node_delegates_to_manager_stream(mocker):
+def test_datasource_node_delegates_to_manager_stream(mocker: MockerFixture):
     # prepare sys variables
     sys_vars = {
         "sys": {
@@ -79,7 +81,7 @@ def test_datasource_node_delegates_to_manager_stream(mocker):
 
     node = DatasourceNode(
         node_id="n",
-        config=DatasourceNodeData(
+        data=DatasourceNodeData(
             type="datasource",
             version="1",
             title="Datasource",
diff --git a/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_executor.py b/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_executor.py
index be7cc073db..796fc7719d 100644
--- a/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_executor.py
+++ b/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_executor.py
@@ -29,7 +29,7 @@ HTTP_REQUEST_CONFIG = HttpRequestNodeConfig(
 
 def test_executor_with_json_body_and_number_variable():
     # Prepare the variable pool
-    variable_pool = VariablePool(
+    variable_pool = VariablePool.from_bootstrap(
         system_variables=default_system_variables(),
         user_inputs={},
     )
@@ -85,7 +85,7 @@ def test_executor_with_json_body_and_number_variable():
 
 def test_executor_with_json_body_and_object_variable():
     # Prepare the variable pool
-    variable_pool = VariablePool(
+    variable_pool = VariablePool.from_bootstrap(
         system_variables=default_system_variables(),
         user_inputs={},
     )
@@ -143,7 +143,7 @@ def test_executor_with_json_body_and_object_variable():
 
 def test_executor_with_json_body_and_nested_object_variable():
     # Prepare the variable pool
-    variable_pool = VariablePool(
+    variable_pool = VariablePool.from_bootstrap(
         system_variables=default_system_variables(),
         user_inputs={},
     )
@@ -201,7 +201,7 @@ def test_executor_with_json_body_and_nested_object_variable():
 
 
 def test_extract_selectors_from_template_with_newline():
-    variable_pool = VariablePool(system_variables=default_system_variables())
+    variable_pool = VariablePool.from_bootstrap(system_variables=default_system_variables())
     variable_pool.add(("node_id", "custom_query"), "line1\nline2")
     node_data = HttpRequestNodeData(
         title="Test JSON Body with Nested Object Variable",
@@ -230,7 +230,7 @@ def test_extract_selectors_from_template_with_newline():
 
 def test_executor_with_form_data():
     # Prepare the variable pool
-    variable_pool = VariablePool(
+    variable_pool = VariablePool.from_bootstrap(
         system_variables=default_system_variables(),
         user_inputs={},
     )
@@ -320,7 +320,7 @@ def test_init_headers():
             node_data=node_data,
             timeout=timeout,
             http_request_config=HTTP_REQUEST_CONFIG,
-            variable_pool=VariablePool(system_variables=default_system_variables()),
+            variable_pool=VariablePool.from_bootstrap(system_variables=default_system_variables()),
             http_client=ssrf_proxy,
             file_manager=file_manager,
         )
@@ -357,7 +357,7 @@ def test_init_params():
             node_data=node_data,
             timeout=timeout,
             http_request_config=HTTP_REQUEST_CONFIG,
-            variable_pool=VariablePool(system_variables=default_system_variables()),
+            variable_pool=VariablePool.from_bootstrap(system_variables=default_system_variables()),
             http_client=ssrf_proxy,
             file_manager=file_manager,
         )
@@ -390,7 +390,7 @@ def test_init_params():
 
 def test_empty_api_key_raises_error_bearer():
     """Test that empty API key raises AuthorizationConfigError for bearer auth."""
-    variable_pool = VariablePool(system_variables=default_system_variables())
+    variable_pool = VariablePool.from_bootstrap(system_variables=default_system_variables())
     node_data = HttpRequestNodeData(
         title="test",
         method="get",
@@ -417,7 +417,7 @@ def test_empty_api_key_raises_error_bearer():
 
 def test_empty_api_key_raises_error_basic():
     """Test that empty API key raises AuthorizationConfigError for basic auth."""
-    variable_pool = VariablePool(system_variables=default_system_variables())
+    variable_pool = VariablePool.from_bootstrap(system_variables=default_system_variables())
     node_data = HttpRequestNodeData(
         title="test",
         method="get",
@@ -444,7 +444,7 @@ def test_empty_api_key_raises_error_basic():
 
 def test_empty_api_key_raises_error_custom():
     """Test that empty API key raises AuthorizationConfigError for custom auth."""
-    variable_pool = VariablePool(system_variables=default_system_variables())
+    variable_pool = VariablePool.from_bootstrap(system_variables=default_system_variables())
     node_data = HttpRequestNodeData(
         title="test",
         method="get",
@@ -471,7 +471,7 @@ def test_empty_api_key_raises_error_custom():
 
 def test_whitespace_only_api_key_raises_error():
     """Test that whitespace-only API key raises AuthorizationConfigError."""
-    variable_pool = VariablePool(system_variables=default_system_variables())
+    variable_pool = VariablePool.from_bootstrap(system_variables=default_system_variables())
     node_data = HttpRequestNodeData(
         title="test",
         method="get",
@@ -498,7 +498,7 @@ def test_whitespace_only_api_key_raises_error():
 
 def test_valid_api_key_works():
     """Test that valid API key works correctly for bearer auth."""
-    variable_pool = VariablePool(system_variables=default_system_variables())
+    variable_pool = VariablePool.from_bootstrap(system_variables=default_system_variables())
     node_data = HttpRequestNodeData(
         title="test",
         method="get",
@@ -536,7 +536,7 @@ def test_executor_with_json_body_and_unquoted_uuid_variable():
     # UUID that triggers the json_repair truncation bug
     test_uuid = "57eeeeb1-450b-482c-81b9-4be77e95dee2"
 
-    variable_pool = VariablePool(
+    variable_pool = VariablePool.from_bootstrap(
         system_variables=default_system_variables(),
         user_inputs={},
     )
@@ -583,7 +583,7 @@ def test_executor_with_json_body_and_unquoted_uuid_with_newlines():
     """
     test_uuid = "57eeeeb1-450b-482c-81b9-4be77e95dee2"
 
-    variable_pool = VariablePool(
+    variable_pool = VariablePool.from_bootstrap(
         system_variables=default_system_variables(),
         user_inputs={},
     )
@@ -624,7 +624,7 @@ def test_executor_with_json_body_and_unquoted_uuid_with_newlines():
 
 def test_executor_with_json_body_preserves_numbers_and_strings():
     """Test that numbers are preserved and string values are properly quoted."""
-    variable_pool = VariablePool(
+    variable_pool = VariablePool.from_bootstrap(
         system_variables=default_system_variables(),
         user_inputs={},
     )
diff --git a/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_node.py b/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_node.py
index 2e89a2da3c..afde541beb 100644
--- a/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_node.py
@@ -110,12 +110,15 @@ def _build_http_node(
         call_depth=0,
     )
     graph_runtime_state = GraphRuntimeState(
-        variable_pool=VariablePool(system_variables=build_system_variables(user_id="user", files=[]), user_inputs={}),
+        variable_pool=VariablePool.from_bootstrap(
+            system_variables=build_system_variables(user_id="user", files=[]),
+            user_inputs={},
+        ),
         start_at=time.perf_counter(),
     )
     return HttpRequestNode(
         node_id="http-node",
-        config=HttpRequestNodeData.model_validate(node_data),
+        data=HttpRequestNodeData.model_validate(node_data),
         graph_init_params=graph_init_params,
         graph_runtime_state=graph_runtime_state,
         http_request_config=HTTP_REQUEST_CONFIG,
diff --git a/api/tests/unit_tests/core/workflow/nodes/human_input/test_entities.py b/api/tests/unit_tests/core/workflow/nodes/human_input/test_entities.py
index 0659984c76..a5a8e877f2 100644
--- a/api/tests/unit_tests/core/workflow/nodes/human_input/test_entities.py
+++ b/api/tests/unit_tests/core/workflow/nodes/human_input/test_entities.py
@@ -30,23 +30,23 @@ from core.workflow.human_input_adapter import (
     WebAppDeliveryMethod,
     _WebAppDeliveryConfig,
 )
-from core.workflow.node_runtime import DifyHumanInputNodeRuntime
+from core.workflow.node_runtime import DifyFileReferenceFactory, DifyHumanInputNodeRuntime
 from core.workflow.system_variables import build_system_variables
 from graphon.entities import GraphInitParams
 from graphon.node_events import PauseRequestedEvent
 from graphon.node_events.node import StreamCompletedEvent
 from graphon.nodes.human_input.entities import (
-    FormInput,
-    FormInputDefault,
     HumanInputNodeData,
-    UserAction,
+    ParagraphInputConfig,
+    StringSource,
+    UserActionConfig,
 )
 from graphon.nodes.human_input.enums import (
     ButtonStyle,
     FormInputType,
     HumanInputFormStatus,
-    PlaceholderType,
     TimeoutUnit,
+    ValueSourceType,
 )
 from graphon.nodes.human_input.human_input_node import HumanInputNode
 from graphon.runtime import GraphRuntimeState, VariablePool
@@ -149,9 +149,10 @@ def _build_human_input_node(
     )
     return HumanInputNode(
         node_id=node_id,
-        config=typed_node_data,
+        data=typed_node_data,
         graph_init_params=graph_init_params,
         graph_runtime_state=graph_runtime_state,
+        file_reference_factory=DifyFileReferenceFactory(graph_init_params.run_context),
         runtime=runtime,
     )
 
@@ -190,32 +191,36 @@ class TestDeliveryMethod:
         assert len(delivery_method.config.recipients.items) == 2
 
 
-class TestFormInput:
-    """Test FormInput entity."""
+class TestParagraphInputConfig:
+    """Test ParagraphInputConfig entity."""
 
-    def test_text_input_with_constant_default(self):
-        """Test text input with constant default value."""
-        default = FormInputDefault(type=PlaceholderType.CONSTANT, value="Enter your response here...")
+    def test_paragraph_input_with_constant_default(self):
+        """Test paragraph input with constant default value."""
+        default = StringSource(type=ValueSourceType.CONSTANT, value="Enter your response here...")
 
-        form_input = FormInput(type=FormInputType.TEXT_INPUT, output_variable_name="user_input", default=default)
+        form_input = ParagraphInputConfig(
+            type=FormInputType.PARAGRAPH, output_variable_name="user_input", default=default
+        )
 
-        assert form_input.type == FormInputType.TEXT_INPUT
+        assert form_input.type == FormInputType.PARAGRAPH
         assert form_input.output_variable_name == "user_input"
-        assert form_input.default.type == PlaceholderType.CONSTANT
+        assert form_input.default.type == ValueSourceType.CONSTANT
         assert form_input.default.value == "Enter your response here..."
 
-    def test_text_input_with_variable_default(self):
-        """Test text input with variable default value."""
-        default = FormInputDefault(type=PlaceholderType.VARIABLE, selector=["node_123", "output_var"])
+    def test_paragraph_input_with_variable_default(self):
+        """Test paragraph input with variable default value."""
+        default = StringSource(type=ValueSourceType.VARIABLE, selector=["node_123", "output_var"])
 
-        form_input = FormInput(type=FormInputType.TEXT_INPUT, output_variable_name="user_input", default=default)
+        form_input = ParagraphInputConfig(
+            type=FormInputType.PARAGRAPH, output_variable_name="user_input", default=default
+        )
 
-        assert form_input.default.type == PlaceholderType.VARIABLE
+        assert form_input.default.type == ValueSourceType.VARIABLE
         assert form_input.default.selector == ["node_123", "output_var"]
 
     def test_form_input_without_default(self):
         """Test form input without default value."""
-        form_input = FormInput(type=FormInputType.PARAGRAPH, output_variable_name="description")
+        form_input = ParagraphInputConfig(type=FormInputType.PARAGRAPH, output_variable_name="description")
 
         assert form_input.type == FormInputType.PARAGRAPH
         assert form_input.output_variable_name == "description"
@@ -223,11 +228,11 @@ class TestFormInput:
 
 
 class TestUserAction:
-    """Test UserAction entity."""
+    """Test UserActionConfig entity."""
 
     def test_user_action_creation(self):
         """Test user action creation."""
-        action = UserAction(id="approve", title="Approve", button_style=ButtonStyle.PRIMARY)
+        action = UserActionConfig(id="approve", title="Approve", button_style=ButtonStyle.PRIMARY)
 
         assert action.id == "approve"
         assert action.title == "Approve"
@@ -235,22 +240,22 @@ class TestUserAction:
 
     def test_user_action_default_button_style(self):
         """Test user action with default button style."""
-        action = UserAction(id="cancel", title="Cancel")
+        action = UserActionConfig(id="cancel", title="Cancel")
 
         assert action.button_style == ButtonStyle.DEFAULT
 
     def test_user_action_length_boundaries(self):
         """Test user action id and title length boundaries."""
-        action = UserAction(id="a" * 20, title="b" * 20)
+        action = UserActionConfig(id="a" * 20, title="b" * 100)
 
         assert action.id == "a" * 20
-        assert action.title == "b" * 20
+        assert action.title == "b" * 100
 
     @pytest.mark.parametrize(
         ("field_name", "value"),
         [
             ("id", "a" * 21),
-            ("title", "b" * 21),
+            ("title", "b" * 101),
         ],
     )
     def test_user_action_length_limits(self, field_name: str, value: str):
@@ -259,7 +264,7 @@ class TestUserAction:
         data[field_name] = value
 
         with pytest.raises(ValidationError) as exc_info:
-            UserAction.model_validate(data)
+            UserActionConfig.model_validate(data)
 
         errors = exc_info.value.errors()
         assert any(error["loc"] == (field_name,) and error["type"] == "string_too_long" for error in errors)
@@ -273,14 +278,14 @@ class TestHumanInputNodeData:
         delivery_methods = [WebAppDeliveryMethod(enabled=True, config=_WebAppDeliveryConfig())]
 
         inputs = [
-            FormInput(
-                type=FormInputType.TEXT_INPUT,
+            ParagraphInputConfig(
+                type=FormInputType.PARAGRAPH,
                 output_variable_name="content",
-                default=FormInputDefault(type=PlaceholderType.CONSTANT, value="Enter content..."),
+                default=StringSource(type=ValueSourceType.CONSTANT, value="Enter content..."),
             )
         ]
 
-        user_actions = [UserAction(id="submit", title="Submit", button_style=ButtonStyle.PRIMARY)]
+        user_actions = [UserActionConfig(id="submit", title="Submit", button_style=ButtonStyle.PRIMARY)]
 
         node_data = HumanInputNodeData(
             title="Human Input Test",
@@ -338,8 +343,8 @@ class TestHumanInputNodeData:
     def test_duplicate_input_output_variable_name_raises_validation_error(self):
         """Duplicate form input output_variable_name should raise validation error."""
         duplicate_inputs = [
-            FormInput(type=FormInputType.TEXT_INPUT, output_variable_name="content"),
-            FormInput(type=FormInputType.TEXT_INPUT, output_variable_name="content"),
+            ParagraphInputConfig(type=FormInputType.PARAGRAPH, output_variable_name="content"),
+            ParagraphInputConfig(type=FormInputType.PARAGRAPH, output_variable_name="content"),
         ]
 
         with pytest.raises(ValidationError, match="duplicated output_variable_name 'content'"):
@@ -348,8 +353,8 @@ class TestHumanInputNodeData:
     def test_duplicate_user_action_ids_raise_validation_error(self):
         """Duplicate user action ids should raise validation error."""
         duplicate_actions = [
-            UserAction(id="submit", title="Submit"),
-            UserAction(id="submit", title="Submit Again"),
+            UserActionConfig(id="submit", title="Submit"),
+            UserActionConfig(id="submit", title="Submit Again"),
         ]
 
         with pytest.raises(ValidationError, match="duplicated user action id 'submit'"):
@@ -427,7 +432,7 @@ class TestHumanInputNodeVariableResolution:
     """Tests for resolving variable-based defaults in HumanInputNode."""
 
     def test_resolves_variable_defaults(self):
-        variable_pool = VariablePool(
+        variable_pool = VariablePool.from_bootstrap(
             system_variables=build_system_variables(
                 user_id="user",
                 app_id="app",
@@ -458,18 +463,18 @@ class TestHumanInputNodeVariableResolution:
             title="Human Input",
             form_content="Provide your name",
             inputs=[
-                FormInput(
-                    type=FormInputType.TEXT_INPUT,
+                ParagraphInputConfig(
+                    type=FormInputType.PARAGRAPH,
                     output_variable_name="user_name",
-                    default=FormInputDefault(type=PlaceholderType.VARIABLE, selector=["start", "name"]),
+                    default=StringSource(type=ValueSourceType.VARIABLE, selector=["start", "name"]),
                 ),
-                FormInput(
-                    type=FormInputType.TEXT_INPUT,
+                ParagraphInputConfig(
+                    type=FormInputType.PARAGRAPH,
                     output_variable_name="user_email",
-                    default=FormInputDefault(type=PlaceholderType.CONSTANT, value="foo@example.com"),
+                    default=StringSource(type=ValueSourceType.CONSTANT, value="foo@example.com"),
                 ),
             ],
-            user_actions=[UserAction(id="submit", title="Submit")],
+            user_actions=[UserActionConfig(id="submit", title="Submit")],
         )
         config = {"id": "human", "data": node_data.model_dump()}
 
@@ -504,7 +509,7 @@ class TestHumanInputNodeVariableResolution:
         assert params.resolved_default_values == expected_values
 
     def test_debugger_falls_back_to_recipient_token_when_webapp_disabled(self):
-        variable_pool = VariablePool(
+        variable_pool = VariablePool.from_bootstrap(
             system_variables=build_system_variables(
                 user_id="user",
                 app_id="app",
@@ -534,7 +539,7 @@ class TestHumanInputNodeVariableResolution:
             title="Human Input",
             form_content="Provide your name",
             inputs=[],
-            user_actions=[UserAction(id="submit", title="Submit")],
+            user_actions=[UserActionConfig(id="submit", title="Submit")],
         )
         config = {"id": "human", "data": node_data.model_dump()}
 
@@ -565,7 +570,7 @@ class TestHumanInputNodeVariableResolution:
         assert not hasattr(pause_event.reason, "form_token")
 
     def test_webapp_runtime_keeps_form_visible_in_ui_when_webapp_delivery_is_enabled(self):
-        variable_pool = VariablePool(
+        variable_pool = VariablePool.from_bootstrap(
             system_variables=build_system_variables(
                 user_id="user",
                 app_id="app",
@@ -631,7 +636,7 @@ class TestHumanInputNodeVariableResolution:
         assert params.display_in_ui is True
 
     def test_debugger_debug_mode_overrides_email_recipients(self):
-        variable_pool = VariablePool(
+        variable_pool = VariablePool.from_bootstrap(
             system_variables=build_system_variables(
                 user_id="user-123",
                 app_id="app",
@@ -661,7 +666,7 @@ class TestHumanInputNodeVariableResolution:
             title="Human Input",
             form_content="Provide your name",
             inputs=[],
-            user_actions=[UserAction(id="submit", title="Submit")],
+            user_actions=[UserActionConfig(id="submit", title="Submit")],
             delivery_methods=[
                 EmailDeliveryMethod(
                     enabled=True,
@@ -721,7 +726,7 @@ class TestValidation:
     def test_invalid_form_input_type(self):
         """Test validation with invalid form input type."""
         with pytest.raises(ValidationError):
-            FormInput(
+            ParagraphInputConfig(
                 type="invalid-type",  # Invalid type
                 output_variable_name="test",
             )
@@ -729,7 +734,7 @@ class TestValidation:
     def test_invalid_button_style(self):
         """Test validation with invalid button style."""
         with pytest.raises(ValidationError):
-            UserAction(
+            UserActionConfig(
                 id="test",
                 title="Test",
                 button_style="invalid-style",  # Invalid style
@@ -748,7 +753,7 @@ class TestHumanInputNodeRenderedContent:
     """Tests for rendering submitted content."""
 
     def test_replaces_outputs_placeholders_after_submission(self):
-        variable_pool = VariablePool(
+        variable_pool = VariablePool.from_bootstrap(
             system_variables=build_system_variables(
                 user_id="user",
                 app_id="app",
@@ -778,12 +783,12 @@ class TestHumanInputNodeRenderedContent:
             title="Human Input",
             form_content="Name: {{#$output.name#}}",
             inputs=[
-                FormInput(
-                    type=FormInputType.TEXT_INPUT,
+                ParagraphInputConfig(
+                    type=FormInputType.PARAGRAPH,
                     output_variable_name="name",
                 )
             ],
-            user_actions=[UserAction(id="approve", title="Approve")],
+            user_actions=[UserActionConfig(id="approve", title="Approve")],
         )
         config = {"id": "human", "data": node_data.model_dump()}
 
@@ -810,4 +815,4 @@ class TestHumanInputNodeRenderedContent:
         last_event = events[-1]
         assert isinstance(last_event, StreamCompletedEvent)
         node_run_result = last_event.node_run_result
-        assert node_run_result.outputs["__rendered_content"] == "Name: Alice"
+        assert node_run_result.outputs["__rendered_content"].to_object() == "Name: Alice"
diff --git a/api/tests/unit_tests/core/workflow/nodes/human_input/test_human_input_form_filled_event.py b/api/tests/unit_tests/core/workflow/nodes/human_input/test_human_input_form_filled_event.py
index 4a9438b14f..40522a0d4f 100644
--- a/api/tests/unit_tests/core/workflow/nodes/human_input/test_human_input_form_filled_event.py
+++ b/api/tests/unit_tests/core/workflow/nodes/human_input/test_human_input_form_filled_event.py
@@ -2,7 +2,7 @@ import datetime
 from types import SimpleNamespace
 
 from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, InvokeFrom, UserFrom
-from core.workflow.node_runtime import DifyHumanInputNodeRuntime
+from core.workflow.node_runtime import DifyFileReferenceFactory, DifyHumanInputNodeRuntime
 from core.workflow.system_variables import default_system_variables
 from graphon.entities import GraphInitParams
 from graphon.enums import BuiltinNodeTypes
@@ -40,10 +40,11 @@ def _create_human_input_node(
     )
     return HumanInputNode(
         node_id=config["id"],
-        config=node_data,
+        data=node_data,
         graph_init_params=graph_init_params,
         graph_runtime_state=graph_runtime_state,
         form_repository=repo,
+        file_reference_factory=DifyFileReferenceFactory(graph_init_params.run_context),
         runtime=DifyHumanInputNodeRuntime(graph_init_params.run_context),
     )
 
@@ -51,7 +52,11 @@ def _create_human_input_node(
 def _build_node(form_content: str = "Please enter your name:\n\n{{#$output.name#}}") -> HumanInputNode:
     system_variables = default_system_variables()
     graph_runtime_state = GraphRuntimeState(
-        variable_pool=VariablePool(system_variables=system_variables, user_inputs={}, environment_variables=[]),
+        variable_pool=VariablePool.from_bootstrap(
+            system_variables=system_variables,
+            user_inputs={},
+            environment_variables=[],
+        ),
         start_at=0.0,
     )
     graph_init_params = GraphInitParams(
@@ -77,7 +82,7 @@ def _build_node(form_content: str = "Please enter your name:\n\n{{#$output.name#
             "form_content": form_content,
             "inputs": [
                 {
-                    "type": "text_input",
+                    "type": "paragraph",
                     "output_variable_name": "name",
                     "default": {"type": "constant", "value": ""},
                 }
@@ -114,7 +119,11 @@ def _build_node(form_content: str = "Please enter your name:\n\n{{#$output.name#
 def _build_timeout_node() -> HumanInputNode:
     system_variables = default_system_variables()
     graph_runtime_state = GraphRuntimeState(
-        variable_pool=VariablePool(system_variables=system_variables, user_inputs={}, environment_variables=[]),
+        variable_pool=VariablePool.from_bootstrap(
+            system_variables=system_variables,
+            user_inputs={},
+            environment_variables=[],
+        ),
         start_at=0.0,
     )
     graph_init_params = GraphInitParams(
@@ -140,7 +149,7 @@ def _build_timeout_node() -> HumanInputNode:
             "form_content": "Please enter your name:\n\n{{#$output.name#}}",
             "inputs": [
                 {
-                    "type": "text_input",
+                    "type": "paragraph",
                     "output_variable_name": "name",
                     "default": {"type": "constant", "value": ""},
                 }
diff --git a/api/tests/unit_tests/core/workflow/nodes/iteration/test_iteration_child_engine_errors.py b/api/tests/unit_tests/core/workflow/nodes/iteration/test_iteration_child_engine_errors.py
index 8ffce39cd6..18ed7a0b1d 100644
--- a/api/tests/unit_tests/core/workflow/nodes/iteration/test_iteration_child_engine_errors.py
+++ b/api/tests/unit_tests/core/workflow/nodes/iteration/test_iteration_child_engine_errors.py
@@ -32,7 +32,7 @@ class _MissingGraphBuilder:
 
 def _build_runtime_state() -> GraphRuntimeState:
     return GraphRuntimeState(
-        variable_pool=VariablePool(system_variables=default_system_variables(), user_inputs={}),
+        variable_pool=VariablePool.from_bootstrap(system_variables=default_system_variables(), user_inputs={}),
         start_at=0.0,
     )
 
@@ -46,7 +46,7 @@ def _build_iteration_node(
     init_params = build_test_graph_init_params(graph_config=graph_config)
     return IterationNode(
         node_id="iteration-node",
-        config=IterationNodeData(
+        data=IterationNodeData(
             type="iteration",
             title="Iteration",
             iterator_selector=["start", "items"],
diff --git a/api/tests/unit_tests/core/workflow/nodes/knowledge_index/test_knowledge_index_node.py b/api/tests/unit_tests/core/workflow/nodes/knowledge_index/test_knowledge_index_node.py
index f254fc3d09..0d760a2db7 100644
--- a/api/tests/unit_tests/core/workflow/nodes/knowledge_index/test_knowledge_index_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/knowledge_index/test_knowledge_index_node.py
@@ -3,6 +3,7 @@ import uuid
 from unittest.mock import Mock
 
 import pytest
+from pytest_mock import MockerFixture
 
 from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
 from core.rag.index_processor.constant.index_type import IndexTechniqueType
@@ -40,7 +41,7 @@ def mock_graph_init_params():
 @pytest.fixture
 def mock_graph_runtime_state():
     """Create mock GraphRuntimeState."""
-    variable_pool = VariablePool(
+    variable_pool = VariablePool.from_bootstrap(
         system_variables=build_system_variables(user_id=str(uuid.uuid4()), files=[]),
         user_inputs={},
         environment_variables=[],
@@ -50,7 +51,7 @@ def mock_graph_runtime_state():
 
 
 @pytest.fixture
-def mock_index_processor(mocker):
+def mock_index_processor(mocker: MockerFixture):
     """Create mock IndexProcessorProtocol."""
     mock_processor = Mock(spec=IndexProcessorProtocol)
     mocker.patch(
@@ -61,7 +62,7 @@ def mock_index_processor(mocker):
 
 
 @pytest.fixture
-def mock_summary_index_service(mocker):
+def mock_summary_index_service(mocker: MockerFixture):
     """Create mock SummaryIndexServiceProtocol."""
     mock_service = Mock(spec=SummaryIndexServiceProtocol)
     mocker.patch(
@@ -102,7 +103,7 @@ def _build_node(
 ) -> KnowledgeIndexNode:
     return KnowledgeIndexNode(
         node_id=node_id,
-        config=(
+        data=(
             node_data
             if isinstance(node_data, KnowledgeIndexNodeData)
             else KnowledgeIndexNodeData.model_validate(node_data)
diff --git a/api/tests/unit_tests/core/workflow/nodes/knowledge_retrieval/test_knowledge_retrieval_node.py b/api/tests/unit_tests/core/workflow/nodes/knowledge_retrieval/test_knowledge_retrieval_node.py
index e923ee761b..3c821e75ba 100644
--- a/api/tests/unit_tests/core/workflow/nodes/knowledge_retrieval/test_knowledge_retrieval_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/knowledge_retrieval/test_knowledge_retrieval_node.py
@@ -3,6 +3,7 @@ import uuid
 from unittest.mock import Mock
 
 import pytest
+from pytest_mock import MockerFixture
 
 from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
 from core.workflow.nodes.knowledge_retrieval.entities import (
@@ -46,7 +47,7 @@ def mock_graph_init_params():
 @pytest.fixture
 def mock_graph_runtime_state():
     """Create mock GraphRuntimeState."""
-    variable_pool = VariablePool(
+    variable_pool = VariablePool.from_bootstrap(
         system_variables=build_system_variables(user_id=str(uuid.uuid4()), files=[]),
         user_inputs={},
         environment_variables=[],
@@ -56,7 +57,7 @@ def mock_graph_runtime_state():
 
 
 @pytest.fixture
-def mock_rag_retrieval(mocker):
+def mock_rag_retrieval(mocker: MockerFixture):
     """Create mock RAGRetrievalProtocol."""
     mock_retrieval = Mock(spec=RAGRetrievalProtocol)
     mock_retrieval.knowledge_retrieval.return_value = []
@@ -117,7 +118,7 @@ class TestKnowledgeRetrievalNode:
         # Act
         node = KnowledgeRetrievalNode(
             node_id=node_id,
-            config=KnowledgeRetrievalNodeData.model_validate(config["data"]),
+            data=KnowledgeRetrievalNodeData.model_validate(config["data"]),
             graph_init_params=mock_graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
@@ -146,7 +147,7 @@ class TestKnowledgeRetrievalNode:
 
         node = KnowledgeRetrievalNode(
             node_id=node_id,
-            config=KnowledgeRetrievalNodeData.model_validate(config["data"]),
+            data=KnowledgeRetrievalNodeData.model_validate(config["data"]),
             graph_init_params=mock_graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
@@ -205,7 +206,7 @@ class TestKnowledgeRetrievalNode:
 
         node = KnowledgeRetrievalNode(
             node_id=node_id,
-            config=KnowledgeRetrievalNodeData.model_validate(config["data"]),
+            data=KnowledgeRetrievalNodeData.model_validate(config["data"]),
             graph_init_params=mock_graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
@@ -249,7 +250,7 @@ class TestKnowledgeRetrievalNode:
 
         node = KnowledgeRetrievalNode(
             node_id=node_id,
-            config=KnowledgeRetrievalNodeData.model_validate(config["data"]),
+            data=KnowledgeRetrievalNodeData.model_validate(config["data"]),
             graph_init_params=mock_graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
@@ -285,7 +286,7 @@ class TestKnowledgeRetrievalNode:
 
         node = KnowledgeRetrievalNode(
             node_id=node_id,
-            config=KnowledgeRetrievalNodeData.model_validate(config["data"]),
+            data=KnowledgeRetrievalNodeData.model_validate(config["data"]),
             graph_init_params=mock_graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
@@ -320,7 +321,7 @@ class TestKnowledgeRetrievalNode:
 
         node = KnowledgeRetrievalNode(
             node_id=node_id,
-            config=KnowledgeRetrievalNodeData.model_validate(config["data"]),
+            data=KnowledgeRetrievalNodeData.model_validate(config["data"]),
             graph_init_params=mock_graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
@@ -361,7 +362,7 @@ class TestKnowledgeRetrievalNode:
 
         node = KnowledgeRetrievalNode(
             node_id=node_id,
-            config=KnowledgeRetrievalNodeData.model_validate(config["data"]),
+            data=KnowledgeRetrievalNodeData.model_validate(config["data"]),
             graph_init_params=mock_graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
@@ -400,7 +401,7 @@ class TestKnowledgeRetrievalNode:
 
         node = KnowledgeRetrievalNode(
             node_id=node_id,
-            config=KnowledgeRetrievalNodeData.model_validate(config["data"]),
+            data=KnowledgeRetrievalNodeData.model_validate(config["data"]),
             graph_init_params=mock_graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
@@ -481,7 +482,7 @@ class TestFetchDatasetRetriever:
 
         node = KnowledgeRetrievalNode(
             node_id=node_id,
-            config=KnowledgeRetrievalNodeData.model_validate(config["data"]),
+            data=KnowledgeRetrievalNodeData.model_validate(config["data"]),
             graph_init_params=mock_graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
@@ -518,7 +519,7 @@ class TestFetchDatasetRetriever:
 
         node = KnowledgeRetrievalNode(
             node_id=node_id,
-            config=KnowledgeRetrievalNodeData.model_validate(config["data"]),
+            data=KnowledgeRetrievalNodeData.model_validate(config["data"]),
             graph_init_params=mock_graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
@@ -573,7 +574,7 @@ class TestFetchDatasetRetriever:
 
         node = KnowledgeRetrievalNode(
             node_id=node_id,
-            config=KnowledgeRetrievalNodeData.model_validate(config["data"]),
+            data=KnowledgeRetrievalNodeData.model_validate(config["data"]),
             graph_init_params=mock_graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
@@ -621,7 +622,7 @@ class TestFetchDatasetRetriever:
 
         node = KnowledgeRetrievalNode(
             node_id=node_id,
-            config=KnowledgeRetrievalNodeData.model_validate(config["data"]),
+            data=KnowledgeRetrievalNodeData.model_validate(config["data"]),
             graph_init_params=mock_graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
@@ -682,7 +683,7 @@ class TestFetchDatasetRetriever:
         config = {"id": node_id, "data": node_data.model_dump()}
         node = KnowledgeRetrievalNode(
             node_id=node_id,
-            config=KnowledgeRetrievalNodeData.model_validate(config["data"]),
+            data=KnowledgeRetrievalNodeData.model_validate(config["data"]),
             graph_init_params=mock_graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
diff --git a/api/tests/unit_tests/core/workflow/nodes/list_operator/node_spec.py b/api/tests/unit_tests/core/workflow/nodes/list_operator/node_spec.py
index 388654f279..20b94d5d50 100644
--- a/api/tests/unit_tests/core/workflow/nodes/list_operator/node_spec.py
+++ b/api/tests/unit_tests/core/workflow/nodes/list_operator/node_spec.py
@@ -16,10 +16,10 @@ class TestListOperatorNode:
     """Comprehensive tests for ListOperatorNode."""
 
     @staticmethod
-    def _build_node(*, config, graph_init_params, graph_runtime_state):
+    def _build_node(*, data, graph_init_params, graph_runtime_state):
         return ListOperatorNode(
             node_id="test",
-            config=config if isinstance(config, ListOperatorNodeData) else ListOperatorNodeData.model_validate(config),
+            data=data if isinstance(data, ListOperatorNodeData) else ListOperatorNodeData.model_validate(data),
             graph_init_params=graph_init_params,
             graph_runtime_state=graph_runtime_state,
         )
@@ -65,7 +65,7 @@ class TestListOperatorNode:
         def _create_node(config, mock_variable):
             mock_graph_runtime_state.variable_pool.get.return_value = mock_variable
             return self._build_node(
-                config=config,
+                data=config,
                 graph_init_params=graph_init_params,
                 graph_runtime_state=mock_graph_runtime_state,
             )
@@ -83,7 +83,7 @@ class TestListOperatorNode:
         }
 
         node = self._build_node(
-            config=config,
+            data=config,
             graph_init_params=graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
@@ -127,7 +127,7 @@ class TestListOperatorNode:
         mock_graph_runtime_state.variable_pool.get.return_value = mock_var
 
         node = self._build_node(
-            config=config,
+            data=config,
             graph_init_params=graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
@@ -153,7 +153,7 @@ class TestListOperatorNode:
         mock_graph_runtime_state.variable_pool.get.return_value = mock_var
 
         node = self._build_node(
-            config=config,
+            data=config,
             graph_init_params=graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
@@ -177,7 +177,7 @@ class TestListOperatorNode:
         mock_graph_runtime_state.variable_pool.get.return_value = mock_var
 
         node = self._build_node(
-            config=config,
+            data=config,
             graph_init_params=graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
@@ -201,7 +201,7 @@ class TestListOperatorNode:
         mock_graph_runtime_state.variable_pool.get.return_value = mock_var
 
         node = self._build_node(
-            config=config,
+            data=config,
             graph_init_params=graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
@@ -228,7 +228,7 @@ class TestListOperatorNode:
         mock_graph_runtime_state.variable_pool.get.return_value = mock_var
 
         node = self._build_node(
-            config=config,
+            data=config,
             graph_init_params=graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
@@ -255,7 +255,7 @@ class TestListOperatorNode:
         mock_graph_runtime_state.variable_pool.get.return_value = mock_var
 
         node = self._build_node(
-            config=config,
+            data=config,
             graph_init_params=graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
@@ -282,7 +282,7 @@ class TestListOperatorNode:
         mock_graph_runtime_state.variable_pool.get.return_value = mock_var
 
         node = self._build_node(
-            config=config,
+            data=config,
             graph_init_params=graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
@@ -312,7 +312,7 @@ class TestListOperatorNode:
         mock_graph_runtime_state.variable_pool.get.return_value = mock_var
 
         node = self._build_node(
-            config=config,
+            data=config,
             graph_init_params=graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
@@ -335,7 +335,7 @@ class TestListOperatorNode:
         mock_graph_runtime_state.variable_pool.get.return_value = None
 
         node = self._build_node(
-            config=config,
+            data=config,
             graph_init_params=graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
@@ -359,7 +359,7 @@ class TestListOperatorNode:
         mock_graph_runtime_state.variable_pool.get.return_value = mock_var
 
         node = self._build_node(
-            config=config,
+            data=config,
             graph_init_params=graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
@@ -384,7 +384,7 @@ class TestListOperatorNode:
         mock_graph_runtime_state.variable_pool.get.return_value = mock_var
 
         node = self._build_node(
-            config=config,
+            data=config,
             graph_init_params=graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
@@ -408,7 +408,7 @@ class TestListOperatorNode:
         mock_graph_runtime_state.variable_pool.get.return_value = mock_var
 
         node = self._build_node(
-            config=config,
+            data=config,
             graph_init_params=graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
@@ -432,7 +432,7 @@ class TestListOperatorNode:
         mock_graph_runtime_state.variable_pool.get.return_value = mock_var
 
         node = self._build_node(
-            config=config,
+            data=config,
             graph_init_params=graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
@@ -456,7 +456,7 @@ class TestListOperatorNode:
         mock_graph_runtime_state.variable_pool.get.return_value = mock_var
 
         node = self._build_node(
-            config=config,
+            data=config,
             graph_init_params=graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
@@ -483,7 +483,7 @@ class TestListOperatorNode:
         mock_graph_runtime_state.variable_pool.get.return_value = mock_var
 
         node = self._build_node(
-            config=config,
+            data=config,
             graph_init_params=graph_init_params,
             graph_runtime_state=mock_graph_runtime_state,
         )
diff --git a/api/tests/unit_tests/core/workflow/nodes/llm/test_llm_utils.py b/api/tests/unit_tests/core/workflow/nodes/llm/test_llm_utils.py
index 212ad07bd3..6a2fc81fef 100644
--- a/api/tests/unit_tests/core/workflow/nodes/llm/test_llm_utils.py
+++ b/api/tests/unit_tests/core/workflow/nodes/llm/test_llm_utils.py
@@ -613,7 +613,7 @@ def test_combine_message_content_with_role_handles_all_supported_roles():
         SystemPromptMessage(content=contents)
     )
 
-    with pytest.raises(NotImplementedError, match="Role custom is not supported"):
+    with pytest.raises(AssertionError, match="Expected code to be unreachable"):
         llm_utils.combine_message_content_with_role(contents=contents, role="custom")  # type: ignore[arg-type]
 
 
diff --git a/api/tests/unit_tests/core/workflow/nodes/llm/test_node.py b/api/tests/unit_tests/core/workflow/nodes/llm/test_node.py
index c707cf28cd..fb50723402 100644
--- a/api/tests/unit_tests/core/workflow/nodes/llm/test_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/llm/test_node.py
@@ -15,7 +15,7 @@ from core.app.llm.model_access import (
 )
 from core.entities.provider_configuration import ProviderConfiguration, ProviderModelBundle
 from core.entities.provider_entities import CustomConfiguration, SystemConfiguration
-from core.plugin.impl.model_runtime_factory import create_plugin_model_runtime
+from core.plugin.impl.model_runtime_factory import create_plugin_model_assembly
 from core.prompt.entities.advanced_prompt_entities import MemoryConfig
 from core.workflow.system_variables import default_system_variables
 from graphon.entities import GraphInitParams
@@ -187,7 +187,7 @@ def graph_init_params() -> GraphInitParams:
 
 @pytest.fixture
 def graph_runtime_state() -> GraphRuntimeState:
-    variable_pool = VariablePool(
+    variable_pool = VariablePool.from_bootstrap(
         system_variables=default_system_variables(),
         user_inputs={},
     )
@@ -208,7 +208,7 @@ def llm_node(
     http_client = mock.MagicMock()
     node = LLMNode(
         node_id="1",
-        config=llm_node_data,
+        data=llm_node_data,
         graph_init_params=graph_init_params,
         graph_runtime_state=graph_runtime_state,
         credentials_provider=mock_credentials_provider,
@@ -222,7 +222,7 @@ def llm_node(
 
 
 @pytest.fixture
-def model_config(monkeypatch):
+def model_config(monkeypatch: pytest.MonkeyPatch):
     from tests.integration_tests.model_runtime.__mock.plugin_model import MockModelClass
 
     def mock_model_providers(_self):
@@ -241,9 +241,10 @@ def model_config(monkeypatch):
     )
 
     # Create actual provider and model type instances
-    model_provider_factory = ModelProviderFactory(model_runtime=create_plugin_model_runtime(tenant_id="test"))
+    model_assembly = create_plugin_model_assembly(tenant_id="test")
+    model_provider_factory = model_assembly.model_provider_factory
     provider_instance = model_provider_factory.get_model_provider("openai")
-    model_type_instance = model_provider_factory.get_model_type_instance("openai", ModelType.LLM)
+    model_type_instance = model_assembly.create_model_type_instance(provider="openai", model_type=ModelType.LLM)
 
     # Create a ProviderModelBundle
     provider_model_bundle = ProviderModelBundle(
@@ -1173,7 +1174,7 @@ def llm_node_for_multimodal(llm_node_data, graph_init_params, graph_runtime_stat
     http_client = mock.MagicMock()
     node = LLMNode(
         node_id="1",
-        config=llm_node_data,
+        data=llm_node_data,
         graph_init_params=graph_init_params,
         graph_runtime_state=graph_runtime_state,
         credentials_provider=mock_credentials_provider,
@@ -1276,7 +1277,7 @@ class TestSaveMultimodalOutputAndConvertResultToMarkdown:
         mock_file_saver.save_binary_string.assert_not_called()
         mock_file_saver.save_remote_url.assert_not_called()
 
-    def test_image_content_with_inline_data(self, llm_node_for_multimodal, monkeypatch):
+    def test_image_content_with_inline_data(self, llm_node_for_multimodal, monkeypatch: pytest.MonkeyPatch):
         llm_node, mock_file_saver = llm_node_for_multimodal
 
         image_raw_data = b"PNG_DATA"
diff --git a/api/tests/unit_tests/core/workflow/nodes/parameter_extractor/test_parameter_extractor_node.py b/api/tests/unit_tests/core/workflow/nodes/parameter_extractor/test_parameter_extractor_node.py
index 8f8ec49f14..cd3b0b130b 100644
--- a/api/tests/unit_tests/core/workflow/nodes/parameter_extractor/test_parameter_extractor_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/parameter_extractor/test_parameter_extractor_node.py
@@ -122,7 +122,7 @@ class TestValidateResult:
                 parameters=[
                     ParameterConfig(
                         name="status",
-                        type="select",  # pyright: ignore[reportArgumentType]
+                        type="select",
                         description="Status",
                         required=True,
                         options=["active", "inactive"],
diff --git a/api/tests/unit_tests/core/workflow/nodes/template_transform/template_transform_node_spec.py b/api/tests/unit_tests/core/workflow/nodes/template_transform/template_transform_node_spec.py
index 892f6cc586..dd57dde1fe 100644
--- a/api/tests/unit_tests/core/workflow/nodes/template_transform/template_transform_node_spec.py
+++ b/api/tests/unit_tests/core/workflow/nodes/template_transform/template_transform_node_spec.py
@@ -28,7 +28,7 @@ def _build_template_transform_node(
     )
     return TemplateTransformNode(
         node_id=node_id,
-        config=typed_node_data,
+        data=typed_node_data,
         graph_init_params=graph_init_params,
         graph_runtime_state=graph_runtime_state,
         **kwargs,
diff --git a/api/tests/unit_tests/core/workflow/nodes/template_transform/test_template_transform_node.py b/api/tests/unit_tests/core/workflow/nodes/template_transform/test_template_transform_node.py
index a846efbb43..c25ac7da0f 100644
--- a/api/tests/unit_tests/core/workflow/nodes/template_transform/test_template_transform_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/template_transform/test_template_transform_node.py
@@ -39,7 +39,7 @@ def mock_graph_runtime_state():
 def test_node_uses_default_max_output_length_when_not_overridden(graph_init_params, mock_graph_runtime_state):
     node = TemplateTransformNode(
         node_id="test_node",
-        config=TemplateTransformNodeData(
+        data=TemplateTransformNodeData(
             title="Template Transform",
             type="template-transform",
             variables=[],
diff --git a/api/tests/unit_tests/core/workflow/nodes/test_base_node.py b/api/tests/unit_tests/core/workflow/nodes/test_base_node.py
index 364408ead6..a05151f79b 100644
--- a/api/tests/unit_tests/core/workflow/nodes/test_base_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/test_base_node.py
@@ -35,7 +35,10 @@ def _build_context(graph_config: Mapping[str, object]) -> tuple[GraphInitParams,
         invoke_from="debugger",
     )
     runtime_state = GraphRuntimeState(
-        variable_pool=VariablePool(system_variables=build_system_variables(user_id="user", files=[]), user_inputs={}),
+        variable_pool=VariablePool.from_bootstrap(
+            system_variables=build_system_variables(user_id="user", files=[]),
+            user_inputs={},
+        ),
         start_at=0.0,
     )
     return init_params, runtime_state
@@ -62,7 +65,7 @@ def test_node_hydrates_data_during_initialization():
 
     node = _SampleNode(
         node_id="node-1",
-        config=_build_node_data(),
+        data=_build_node_data(),
         graph_init_params=init_params,
         graph_runtime_state=runtime_state,
     )
@@ -82,13 +85,16 @@ def test_node_accepts_invoke_from_enum():
         invoke_from=InvokeFrom.DEBUGGER,
     )
     runtime_state = GraphRuntimeState(
-        variable_pool=VariablePool(system_variables=build_system_variables(user_id="user", files=[]), user_inputs={}),
+        variable_pool=VariablePool.from_bootstrap(
+            system_variables=build_system_variables(user_id="user", files=[]),
+            user_inputs={},
+        ),
         start_at=0.0,
     )
 
     node = _SampleNode(
         node_id="node-1",
-        config=_build_node_data(),
+        data=_build_node_data(),
         graph_init_params=init_params,
         graph_runtime_state=runtime_state,
     )
@@ -140,7 +146,7 @@ def test_node_hydration_preserves_compatibility_extra_fields():
 
     node = _SampleNode(
         node_id="node-1",
-        config=node_config["data"],
+        data=node_config["data"],
         graph_init_params=init_params,
         graph_runtime_state=runtime_state,
     )
diff --git a/api/tests/unit_tests/core/workflow/nodes/test_document_extractor_node.py b/api/tests/unit_tests/core/workflow/nodes/test_document_extractor_node.py
index dd75b32593..4c67f3fb02 100644
--- a/api/tests/unit_tests/core/workflow/nodes/test_document_extractor_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/test_document_extractor_node.py
@@ -49,7 +49,7 @@ def document_extractor_node(graph_init_params):
     http_client = Mock()
     node = DocumentExtractorNode(
         node_id="test_node_id",
-        config=node_data,
+        data=node_data,
         graph_init_params=graph_init_params,
         graph_runtime_state=Mock(),
         http_client=http_client,
@@ -186,12 +186,13 @@ def test_run_extract_text(
 
     monkeypatch.setattr("graphon.file.file_manager.download", mock_download)
 
+    dispatch_mock = None
     if mime_type == "application/pdf":
-        mock_pdf_extract = Mock(return_value=expected_text[0])
-        monkeypatch.setattr("graphon.nodes.document_extractor.node._extract_text_from_pdf", mock_pdf_extract)
+        dispatch_mock = Mock(return_value=expected_text[0])
+        monkeypatch.setattr("graphon.nodes.document_extractor.node._extract_text_by_file_extension", dispatch_mock)
     elif mime_type.startswith("application/vnd.openxmlformats"):
-        mock_docx_extract = Mock(return_value=expected_text[0])
-        monkeypatch.setattr("graphon.nodes.document_extractor.node._extract_text_from_docx", mock_docx_extract)
+        dispatch_mock = Mock(return_value=expected_text[0])
+        monkeypatch.setattr("graphon.nodes.document_extractor.node._extract_text_by_mime_type", dispatch_mock)
 
     result = document_extractor_node._run()
 
@@ -200,6 +201,19 @@ def test_run_extract_text(
     assert result.outputs is not None
     assert result.outputs["text"] == ArrayStringSegment(value=expected_text)
 
+    if mime_type == "application/pdf":
+        dispatch_mock.assert_called_once_with(
+            file_content=file_content,
+            file_extension=extension,
+            unstructured_api_config=document_extractor_node._unstructured_api_config,
+        )
+    elif mime_type.startswith("application/vnd.openxmlformats"):
+        dispatch_mock.assert_called_once_with(
+            file_content=file_content,
+            mime_type=mime_type,
+            unstructured_api_config=document_extractor_node._unstructured_api_config,
+        )
+
     if transfer_method == FileTransferMethod.REMOTE_URL:
         document_extractor_node._http_client.get.assert_called_once_with("https://example.com/file.txt")
     elif transfer_method == FileTransferMethod.LOCAL_FILE:
@@ -439,24 +453,42 @@ def test_extract_text_from_file_routes_excel_inputs(document_extractor_node, ext
     file.extension = extension
     file.mime_type = mime_type
 
-    with (
-        patch(
-            "graphon.nodes.document_extractor.node._download_file_content",
-            return_value=b"excel",
-        ),
-        patch(
-            "graphon.nodes.document_extractor.node._extract_text_from_excel",
-            return_value="excel text",
-        ) as mock_extract,
+    with patch(
+        "graphon.nodes.document_extractor.node._download_file_content",
+        return_value=b"excel",
     ):
-        result = _extract_text_from_file(
-            document_extractor_node.http_client,
-            file,
-            unstructured_api_config=document_extractor_node._unstructured_api_config,
-        )
+        if extension:
+            with patch(
+                "graphon.nodes.document_extractor.node._extract_text_by_file_extension",
+                return_value="excel text",
+            ) as mock_extract:
+                result = _extract_text_from_file(
+                    document_extractor_node.http_client,
+                    file,
+                    unstructured_api_config=document_extractor_node._unstructured_api_config,
+                )
+            mock_extract.assert_called_once_with(
+                file_content=b"excel",
+                file_extension=extension,
+                unstructured_api_config=document_extractor_node._unstructured_api_config,
+            )
+        else:
+            with patch(
+                "graphon.nodes.document_extractor.node._extract_text_by_mime_type",
+                return_value="excel text",
+            ) as mock_extract:
+                result = _extract_text_from_file(
+                    document_extractor_node.http_client,
+                    file,
+                    unstructured_api_config=document_extractor_node._unstructured_api_config,
+                )
+            mock_extract.assert_called_once_with(
+                file_content=b"excel",
+                mime_type=mime_type,
+                unstructured_api_config=document_extractor_node._unstructured_api_config,
+            )
 
     assert result == "excel text"
-    mock_extract.assert_called_once_with(b"excel")
 
 
 def test_extract_text_from_file_rejects_missing_extension_and_mime_type(document_extractor_node):
diff --git a/api/tests/unit_tests/core/workflow/nodes/test_if_else.py b/api/tests/unit_tests/core/workflow/nodes/test_if_else.py
index aa9a1360b0..5965645c4f 100644
--- a/api/tests/unit_tests/core/workflow/nodes/test_if_else.py
+++ b/api/tests/unit_tests/core/workflow/nodes/test_if_else.py
@@ -29,7 +29,7 @@ def _build_if_else_node(
         node_id=str(uuid.uuid4()),
         graph_init_params=init_params,
         graph_runtime_state=graph_runtime_state,
-        config=node_data if isinstance(node_data, IfElseNodeData) else IfElseNodeData.model_validate(node_data),
+        data=node_data if isinstance(node_data, IfElseNodeData) else IfElseNodeData.model_validate(node_data),
     )
 
 
@@ -48,7 +48,10 @@ def test_execute_if_else_result_true():
     )
 
     # construct variable pool
-    pool = VariablePool(system_variables=build_system_variables(user_id="aaa", files=[]), user_inputs={})
+    pool = VariablePool.from_bootstrap(
+        system_variables=build_system_variables(user_id="aaa", files=[]),
+        user_inputs={},
+    )
     pool.add(["start", "array_contains"], ["ab", "def"])
     pool.add(["start", "array_not_contains"], ["ac", "def"])
     pool.add(["start", "contains"], "cabcde")
@@ -148,7 +151,7 @@ def test_execute_if_else_result_false():
     )
 
     # construct variable pool
-    pool = VariablePool(
+    pool = VariablePool.from_bootstrap(
         system_variables=build_system_variables(user_id="aaa", files=[]),
         user_inputs={},
         environment_variables=[],
@@ -305,7 +308,7 @@ def test_execute_if_else_boolean_conditions(condition: Condition):
     )
 
     # construct variable pool with boolean values
-    pool = VariablePool(
+    pool = VariablePool.from_bootstrap(
         system_variables=build_system_variables(files=[], user_id="aaa"),
     )
     pool.add(["start", "bool_true"], True)
@@ -359,7 +362,7 @@ def test_execute_if_else_boolean_false_conditions():
     )
 
     # construct variable pool with boolean values
-    pool = VariablePool(
+    pool = VariablePool.from_bootstrap(
         system_variables=build_system_variables(files=[], user_id="aaa"),
     )
     pool.add(["start", "bool_true"], True)
@@ -424,7 +427,7 @@ def test_execute_if_else_boolean_cases_structure():
     )
 
     # construct variable pool with boolean values
-    pool = VariablePool(
+    pool = VariablePool.from_bootstrap(
         system_variables=build_system_variables(files=[], user_id="aaa"),
     )
     pool.add(["start", "bool_true"], True)
diff --git a/api/tests/unit_tests/core/workflow/nodes/test_list_operator.py b/api/tests/unit_tests/core/workflow/nodes/test_list_operator.py
index 465a4c0ff4..1b4cecc757 100644
--- a/api/tests/unit_tests/core/workflow/nodes/test_list_operator.py
+++ b/api/tests/unit_tests/core/workflow/nodes/test_list_operator.py
@@ -22,7 +22,7 @@ from graphon.variables import ArrayFileSegment
 def _build_list_operator_node(node_data: ListOperatorNodeData, graph_init_params) -> ListOperatorNode:
     return ListOperatorNode(
         node_id="test_node_id",
-        config=node_data,
+        data=node_data,
         graph_init_params=graph_init_params,
         graph_runtime_state=MagicMock(),
     )
diff --git a/api/tests/unit_tests/core/workflow/nodes/test_start_node_json_object.py b/api/tests/unit_tests/core/workflow/nodes/test_start_node_json_object.py
index 5655f80737..f890f79511 100644
--- a/api/tests/unit_tests/core/workflow/nodes/test_start_node_json_object.py
+++ b/api/tests/unit_tests/core/workflow/nodes/test_start_node_json_object.py
@@ -31,7 +31,7 @@ def make_start_node(user_inputs, variables):
 
     return StartNode(
         node_id="start",
-        config=node_data,
+        data=node_data,
         graph_init_params=build_test_graph_init_params(
             workflow_id="wf",
             graph_config={},
@@ -260,7 +260,7 @@ def test_start_node_outputs_full_variable_pool_snapshot():
     graph_runtime_state = GraphRuntimeState(variable_pool=variable_pool, start_at=time.perf_counter())
     node = StartNode(
         node_id="start",
-        config=node_data,
+        data=node_data,
         graph_init_params=build_test_graph_init_params(
             workflow_id="wf",
             graph_config={},
diff --git a/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node.py b/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node.py
index 284af68319..0ee70256d7 100644
--- a/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node.py
@@ -15,16 +15,23 @@ from graphon.model_runtime.entities.llm_entities import LLMUsage
 from graphon.node_events import StreamChunkEvent, StreamCompletedEvent
 from graphon.nodes.tool.entities import ToolNodeData
 from graphon.nodes.tool_runtime_entities import ToolRuntimeHandle, ToolRuntimeMessage
-from graphon.runtime import GraphRuntimeState, VariablePool
+from graphon.runtime import GraphRuntimeState
 from graphon.variables.segments import ArrayFileSegment
-from tests.workflow_test_utils import build_test_graph_init_params
+from tests.workflow_test_utils import build_test_graph_init_params, build_test_variable_pool
 
 if TYPE_CHECKING:  # pragma: no cover - imported for type checking only
     from graphon.nodes.tool.tool_node import ToolNode
 
 
 class _StubToolRuntime:
-    def get_runtime(self, *, node_id: str, node_data: Any, variable_pool: Any) -> ToolRuntimeHandle:
+    def get_runtime(
+        self,
+        *,
+        node_id: str,
+        node_data: Any,
+        variable_pool: Any,
+        node_execution_id: str | None = None,
+    ) -> ToolRuntimeHandle:
         raise NotImplementedError
 
     def get_runtime_parameters(self, *, tool_runtime: ToolRuntimeHandle) -> list[Any]:
@@ -99,21 +106,21 @@ def tool_node(monkeypatch) -> ToolNode:
         call_depth=0,
     )
 
-    variable_pool = VariablePool(system_variables=build_system_variables(user_id="user-id"))
+    variable_pool = build_test_variable_pool(variables=build_system_variables(user_id="user-id"))
     graph_runtime_state = GraphRuntimeState(variable_pool=variable_pool, start_at=0.0)
 
     config = graph_config["nodes"][0]
 
-    # Provide a stub ToolFileManager to satisfy the updated ToolNode constructor
-    tool_file_manager_factory = MagicMock(spec=ToolFileManagerProtocol)
+    # Provide a stub ToolFileManager to satisfy the ToolNode constructor.
+    tool_file_manager = MagicMock(spec=ToolFileManagerProtocol)
     runtime = _StubToolRuntime()
 
     node = ToolNode(
         node_id="node-instance",
-        config=ToolNodeData.model_validate(config["data"]),
+        data=ToolNodeData.model_validate(config["data"]),
         graph_init_params=init_params,
         graph_runtime_state=graph_runtime_state,
-        tool_file_manager_factory=tool_file_manager_factory,
+        tool_file_manager=tool_file_manager,
         runtime=runtime,
     )
     return node
@@ -208,7 +215,7 @@ def test_image_link_messages_use_tool_file_id_metadata(tool_node: ToolNode):
         size=123,
         storage_key="file-key",
     )
-    tool_node._tool_file_manager_factory.get_file_generator_by_tool_file_id.return_value = (
+    tool_node._tool_file_manager.get_file_generator_by_tool_file_id.return_value = (
         None,
         SimpleNamespace(mime_type="application/pdf"),
     )
@@ -221,9 +228,28 @@ def test_image_link_messages_use_tool_file_id_metadata(tool_node: ToolNode):
 
     events, _ = _run_transform(tool_node, message)
 
-    tool_node._tool_file_manager_factory.get_file_generator_by_tool_file_id.assert_called_once_with("file-id")
+    tool_node._tool_file_manager.get_file_generator_by_tool_file_id.assert_called_once_with("file-id")
     completed_events = [event for event in events if isinstance(event, StreamCompletedEvent)]
     assert len(completed_events) == 1
     files_segment = completed_events[0].node_run_result.outputs["files"]
     assert isinstance(files_segment, ArrayFileSegment)
     assert files_segment.value == [file_obj]
+
+
+def test_tool_node_passes_node_execution_id_when_runtime_accepts_it(tool_node: ToolNode):
+    runtime_handle = ToolRuntimeHandle(raw=object())
+    tool_node._runtime.get_runtime = MagicMock(return_value=runtime_handle)
+    tool_node.ensure_execution_id = MagicMock(return_value="node-execution-id")
+
+    result = tool_node._get_tool_runtime(
+        variable_pool=tool_node.graph_runtime_state.variable_pool,
+        node_execution_id="node-execution-id",
+    )
+
+    assert result is runtime_handle
+    tool_node._runtime.get_runtime.assert_called_once_with(
+        node_id="node-instance",
+        node_data=tool_node.node_data,
+        variable_pool=tool_node.graph_runtime_state.variable_pool,
+        node_execution_id="node-execution-id",
+    )
diff --git a/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node_runtime.py b/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node_runtime.py
index 438af211f3..aece73ce8c 100644
--- a/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node_runtime.py
+++ b/api/tests/unit_tests/core/workflow/nodes/tool/test_tool_node_runtime.py
@@ -147,6 +147,69 @@ def test_get_runtime_converts_graph_provider_type_for_tool_manager(runtime: Dify
     assert workflow_tool.provider_type == CoreToolProviderType.BUILT_IN
 
 
+def test_get_runtime_stores_parent_trace_context_for_workflow_tools(
+    runtime: DifyToolNodeRuntime,
+) -> None:
+    variable_pool: VariablePool = build_test_variable_pool(
+        variables=build_system_variables(
+            conversation_id="conversation-id",
+            workflow_execution_id="workflow-run-id",
+        )
+    )
+    workflow_runtime = MagicMock()
+    workflow_runtime.runtime.runtime_parameters = {}
+    node_data = ToolNodeData.model_validate(
+        {
+            "type": "tool",
+            "title": "Tool",
+            "provider_id": "provider",
+            "provider_type": ToolProviderType.WORKFLOW,
+            "provider_name": "provider",
+            "tool_name": "lookup",
+            "tool_label": "Lookup",
+            "tool_configurations": {},
+            "tool_parameters": {},
+        }
+    )
+
+    with patch.object(ToolManager, "get_workflow_tool_runtime", return_value=workflow_runtime):
+        tool_runtime = runtime.get_runtime(
+            node_id="node-id",
+            node_data=node_data,
+            variable_pool=variable_pool,
+            node_execution_id="node-execution-id",
+        )
+
+    assert tool_runtime.raw.parent_trace_context.model_dump() == {
+        "parent_workflow_run_id": "workflow-run-id",
+        "parent_node_execution_id": "node-execution-id",
+    }
+    assert workflow_runtime.runtime.runtime_parameters == {}
+
+
+def test_get_runtime_leaves_non_workflow_tool_runtime_parameters_unchanged(
+    runtime: DifyToolNodeRuntime,
+) -> None:
+    variable_pool: VariablePool = build_test_variable_pool(
+        variables=build_system_variables(
+            conversation_id="conversation-id",
+            workflow_execution_id="workflow-run-id",
+        )
+    )
+    builtin_runtime = MagicMock()
+    builtin_runtime.runtime.runtime_parameters = {}
+
+    with patch.object(ToolManager, "get_workflow_tool_runtime", return_value=builtin_runtime):
+        runtime.get_runtime(
+            node_id="node-id",
+            node_data=_build_tool_node_data(),
+            variable_pool=variable_pool,
+            node_execution_id="node-execution-id",
+        )
+
+    assert builtin_runtime.runtime.runtime_parameters == {}
+
+
 def test_get_runtime_parameters_reads_required_flags(runtime: DifyToolNodeRuntime) -> None:
     tool_runtime = ToolRuntimeHandle(
         raw=SimpleNamespace(
diff --git a/api/tests/unit_tests/core/workflow/nodes/trigger_plugin/test_trigger_event_node.py b/api/tests/unit_tests/core/workflow/nodes/trigger_plugin/test_trigger_event_node.py
index e3b5e3b591..c5ac8d2ce2 100644
--- a/api/tests/unit_tests/core/workflow/nodes/trigger_plugin/test_trigger_event_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/trigger_plugin/test_trigger_event_node.py
@@ -44,7 +44,7 @@ def test_trigger_event_node_run_populates_trigger_info_metadata() -> None:
     init_params, runtime_state = _build_context(graph_config={})
     node = TriggerEventNode(
         node_id="node-1",
-        config=_build_node_data(),
+        data=_build_node_data(),
         graph_init_params=init_params,
         graph_runtime_state=runtime_state,
     )
diff --git a/api/tests/unit_tests/core/workflow/nodes/webhook/test_webhook_file_conversion.py b/api/tests/unit_tests/core/workflow/nodes/webhook/test_webhook_file_conversion.py
index 07d03bec05..fccb5ab1c3 100644
--- a/api/tests/unit_tests/core/workflow/nodes/webhook/test_webhook_file_conversion.py
+++ b/api/tests/unit_tests/core/workflow/nodes/webhook/test_webhook_file_conversion.py
@@ -52,7 +52,7 @@ def create_webhook_node(
 
     node = TriggerWebhookNode(
         node_id="webhook-node-1",
-        config=webhook_data,
+        data=webhook_data,
         graph_init_params=graph_init_params,
         graph_runtime_state=runtime_state,
     )
diff --git a/api/tests/unit_tests/core/workflow/nodes/webhook/test_webhook_node.py b/api/tests/unit_tests/core/workflow/nodes/webhook/test_webhook_node.py
index b839490d3c..c5ae542d8b 100644
--- a/api/tests/unit_tests/core/workflow/nodes/webhook/test_webhook_node.py
+++ b/api/tests/unit_tests/core/workflow/nodes/webhook/test_webhook_node.py
@@ -44,7 +44,7 @@ def create_webhook_node(webhook_data: WebhookData, variable_pool: VariablePool)
     )
     node = TriggerWebhookNode(
         node_id="1",
-        config=webhook_data,
+        data=webhook_data,
         graph_init_params=graph_init_params,
         graph_runtime_state=runtime_state,
     )
diff --git a/api/tests/unit_tests/core/workflow/test_human_input_adapter.py b/api/tests/unit_tests/core/workflow/test_human_input_adapter.py
index 8b5fceeb37..51049f8792 100644
--- a/api/tests/unit_tests/core/workflow/test_human_input_adapter.py
+++ b/api/tests/unit_tests/core/workflow/test_human_input_adapter.py
@@ -166,6 +166,71 @@ def test_adapt_node_data_for_graph_migrates_legacy_tool_configurations() -> None
     }
 
 
+def test_adapt_node_data_for_graph_preserves_model_selector_top_level_configurations() -> None:
+    normalized = adapt_node_data_for_graph(
+        {
+            "type": BuiltinNodeTypes.TOOL,
+            "tool_configurations": {
+                "vision_llm_model": {
+                    "type": "constant",
+                    "value": "",
+                    "provider": "langgenius/tongyi/tongyi",
+                    "model": "qwen3-vl-plus",
+                    "model_type": "llm",
+                    "mode": "chat",
+                },
+            },
+        }
+    )
+
+    assert normalized["tool_configurations"] == {}
+    assert normalized["tool_parameters"] == {
+        "vision_llm_model": {
+            "type": "constant",
+            "value": {
+                "provider": "langgenius/tongyi/tongyi",
+                "model": "qwen3-vl-plus",
+                "model_type": "llm",
+                "mode": "chat",
+            },
+        }
+    }
+
+
+def test_adapt_node_data_for_graph_flattens_constant_model_selector_value() -> None:
+    normalized = adapt_node_data_for_graph(
+        {
+            "type": BuiltinNodeTypes.TOOL,
+            "tool_configurations": {
+                "tts_model": {
+                    "type": "constant",
+                    "value": {
+                        "provider": "langgenius/tongyi/tongyi",
+                        "model": "qwen3-tts-flash",
+                        "model_type": "tts",
+                        "language": "Chinese",
+                        "voice": "Cherry",
+                    },
+                },
+            },
+        }
+    )
+
+    assert normalized["tool_configurations"] == {}
+    assert normalized["tool_parameters"] == {
+        "tts_model": {
+            "type": "constant",
+            "value": {
+                "provider": "langgenius/tongyi/tongyi",
+                "model": "qwen3-tts-flash",
+                "model_type": "tts",
+                "language": "Chinese",
+                "voice": "Cherry",
+            },
+        }
+    }
+
+
 def test_adapt_node_config_for_graph_rewrites_nested_node_data() -> None:
     normalized = adapt_node_config_for_graph(
         {
diff --git a/api/tests/unit_tests/core/workflow/test_node_factory.py b/api/tests/unit_tests/core/workflow/test_node_factory.py
index 1821f72e0c..62e1a50291 100644
--- a/api/tests/unit_tests/core/workflow/test_node_factory.py
+++ b/api/tests/unit_tests/core/workflow/test_node_factory.py
@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from types import SimpleNamespace
 from unittest.mock import MagicMock, patch, sentinel
 
@@ -11,19 +12,21 @@ from graphon.entities.base_node_data import BaseNodeData
 from graphon.enums import BuiltinNodeTypes, NodeType
 from graphon.nodes.code.entities import CodeLanguage
 from graphon.nodes.llm.entities import LLMNodeData
-from graphon.variables.segments import StringSegment
+from graphon.nodes.llm.node import LLMNode
+from graphon.nodes.parameter_extractor.entities import ParameterExtractorNodeData
+from graphon.variables.segments import ArrayObjectSegment, StringSegment
 
 
-def _assert_typed_node_config(config, *, node_id: str, node_type: NodeType, version: str = "1") -> None:
+def _assert_constructor_node_data(data, *, node_id: str, node_type: NodeType, version: str = "1") -> None:
     _ = node_id
-    if isinstance(config, BaseNodeData):
-        assert config.type == node_type
-        assert config.version == version
+    if isinstance(data, BaseNodeData):
+        assert data.type == node_type
+        assert data.version == version
         return
 
-    assert isinstance(config, dict)
-    assert config["type"] == node_type
-    assert config["version"] == version
+    assert isinstance(data, Mapping)
+    assert data["type"] == node_type
+    assert data.get("version", "1") == version
 
 
 def _node_constructor(*, return_value):
@@ -88,7 +91,7 @@ class TestFetchMemory:
 
         assert result is None
 
-    def test_returns_none_when_conversation_does_not_exist(self, monkeypatch):
+    def test_returns_none_when_conversation_does_not_exist(self, monkeypatch: pytest.MonkeyPatch):
         class FakeSelect:
             def where(self, *_args):
                 return self
@@ -106,9 +109,8 @@ class TestFetchMemory:
             def scalar(self, _stmt):
                 return None
 
-        monkeypatch.setattr(node_factory, "db", SimpleNamespace(engine=sentinel.engine))
+        monkeypatch.setattr(node_factory, "session_factory", SimpleNamespace(create_session=FakeSession))
         monkeypatch.setattr(node_factory, "select", MagicMock(return_value=FakeSelect()))
-        monkeypatch.setattr(node_factory, "Session", FakeSession)
 
         result = node_factory.fetch_memory(
             conversation_id="conversation-id",
@@ -119,7 +121,7 @@ class TestFetchMemory:
 
         assert result is None
 
-    def test_builds_token_buffer_memory_for_existing_conversation(self, monkeypatch):
+    def test_builds_token_buffer_memory_for_existing_conversation(self, monkeypatch: pytest.MonkeyPatch):
         conversation = sentinel.conversation
         memory = sentinel.memory
 
@@ -141,9 +143,8 @@ class TestFetchMemory:
                 return conversation
 
         token_buffer_memory = MagicMock(return_value=memory)
-        monkeypatch.setattr(node_factory, "db", SimpleNamespace(engine=sentinel.engine))
+        monkeypatch.setattr(node_factory, "session_factory", SimpleNamespace(create_session=FakeSession))
         monkeypatch.setattr(node_factory, "select", MagicMock(return_value=FakeSelect()))
-        monkeypatch.setattr(node_factory, "Session", FakeSession)
         monkeypatch.setattr(node_factory, "TokenBufferMemory", token_buffer_memory)
 
         result = node_factory.fetch_memory(
@@ -159,6 +160,41 @@ class TestFetchMemory:
             model_instance=sentinel.model_instance,
         )
 
+    def test_uses_configured_session_factory_without_flask_app_context(self, monkeypatch: pytest.MonkeyPatch):
+        class FakeSelect:
+            def where(self, *_args):
+                return self
+
+        class FakeSession:
+            def __enter__(self):
+                return self
+
+            def __exit__(self, *_args):
+                return False
+
+            def scalar(self, _stmt):
+                return sentinel.conversation
+
+        class RaisingDB:
+            @property
+            def engine(self):
+                raise RuntimeError("Working outside of application context.")
+
+        token_buffer_memory = MagicMock(return_value=sentinel.memory)
+        monkeypatch.setattr(node_factory, "db", RaisingDB(), raising=False)
+        monkeypatch.setattr(node_factory, "session_factory", SimpleNamespace(create_session=FakeSession))
+        monkeypatch.setattr(node_factory, "select", MagicMock(return_value=FakeSelect()))
+        monkeypatch.setattr(node_factory, "TokenBufferMemory", token_buffer_memory)
+
+        result = node_factory.fetch_memory(
+            conversation_id="conversation-id",
+            app_id="app-id",
+            node_data_memory=object(),
+            model_instance=sentinel.model_instance,
+        )
+
+        assert result is sentinel.memory
+
 
 class TestDifyGraphInitContext:
     def test_to_graph_init_params_preserves_explicit_values(self):
@@ -189,7 +225,7 @@ class TestDifyGraphInitContext:
 
 
 class TestDefaultWorkflowCodeExecutor:
-    def test_execute_delegates_to_code_executor(self, monkeypatch):
+    def test_execute_delegates_to_code_executor(self, monkeypatch: pytest.MonkeyPatch):
         executor = node_factory.DefaultWorkflowCodeExecutor()
         execute_workflow_code_template = MagicMock(return_value={"answer": "ok"})
         monkeypatch.setattr(
@@ -219,7 +255,7 @@ class TestDefaultWorkflowCodeExecutor:
 
 
 class TestCodeExecutorJinja2TemplateRenderer:
-    def test_render_template_delegates_to_code_executor(self, monkeypatch):
+    def test_render_template_delegates_to_code_executor(self, monkeypatch: pytest.MonkeyPatch):
         renderer = workflow_template_rendering.CodeExecutorJinja2TemplateRenderer()
         execute_workflow_code_template = MagicMock(return_value={"result": "Hello workflow"})
         monkeypatch.setattr(
@@ -237,7 +273,7 @@ class TestCodeExecutorJinja2TemplateRenderer:
             inputs={"name": "workflow"},
         )
 
-    def test_render_template_wraps_code_execution_errors(self, monkeypatch):
+    def test_render_template_wraps_code_execution_errors(self, monkeypatch: pytest.MonkeyPatch):
         renderer = workflow_template_rendering.CodeExecutorJinja2TemplateRenderer()
         monkeypatch.setattr(
             workflow_template_rendering.CodeExecutor,
@@ -416,7 +452,7 @@ class TestDifyNodeFactoryCreateNode:
         factory._jinja2_template_renderer = sentinel.jinja2_template_renderer
         factory._template_transform_max_output_length = 2048
         factory._http_request_http_client = sentinel.http_client
-        factory._bound_tool_file_manager_factory = sentinel.tool_file_manager_factory
+        factory._bound_tool_file_manager_factory = MagicMock(return_value=sentinel.tool_file_manager)
         factory._file_reference_factory = sentinel.file_reference_factory
         factory._prompt_message_serializer = sentinel.prompt_message_serializer
         factory._retriever_attachment_loader = sentinel.retriever_attachment_loader
@@ -428,13 +464,14 @@ class TestDifyNodeFactoryCreateNode:
         factory._http_request_config = sentinel.http_request_config
         factory._llm_credentials_provider = sentinel.credentials_provider
         factory._llm_model_factory = sentinel.model_factory
+        factory._build_retriever_attachment_loader = MagicMock(return_value=sentinel.retriever_attachment_loader)
         return factory
 
     def test_rejects_unknown_node_type(self, factory):
         with pytest.raises(ValueError, match="No class mapping found for node type: missing"):
             factory.create_node({"id": "node-id", "data": {"type": "missing"}})
 
-    def test_rejects_missing_class_mapping(self, monkeypatch, factory):
+    def test_rejects_missing_class_mapping(self, monkeypatch: pytest.MonkeyPatch, factory):
         monkeypatch.setattr(
             factory,
             "_resolve_node_class",
@@ -444,7 +481,7 @@ class TestDifyNodeFactoryCreateNode:
         with pytest.raises(ValueError, match="No class mapping found for node type: start"):
             factory.create_node({"id": "node-id", "data": {"type": BuiltinNodeTypes.START}})
 
-    def test_rejects_missing_latest_class(self, monkeypatch, factory):
+    def test_rejects_missing_latest_class(self, monkeypatch: pytest.MonkeyPatch, factory):
         monkeypatch.setattr(
             factory,
             "_resolve_node_class",
@@ -454,7 +491,7 @@ class TestDifyNodeFactoryCreateNode:
         with pytest.raises(ValueError, match="No latest version class found for node type: start"):
             factory.create_node({"id": "node-id", "data": {"type": BuiltinNodeTypes.START}})
 
-    def test_uses_version_specific_class_when_available(self, monkeypatch, factory):
+    def test_uses_version_specific_class_when_available(self, monkeypatch: pytest.MonkeyPatch, factory):
         matched_node = sentinel.matched_node
         latest_node_class = _node_constructor(return_value=sentinel.latest_node)
         matched_node_class = _node_constructor(return_value=matched_node)
@@ -470,12 +507,14 @@ class TestDifyNodeFactoryCreateNode:
         matched_node_class.assert_called_once()
         kwargs = matched_node_class.call_args.kwargs
         assert kwargs["node_id"] == "node-id"
-        _assert_typed_node_config(kwargs["config"], node_id="node-id", node_type=BuiltinNodeTypes.START, version="9")
+        _assert_constructor_node_data(kwargs["data"], node_id="node-id", node_type=BuiltinNodeTypes.START, version="9")
         assert kwargs["graph_init_params"] is sentinel.graph_init_params
         assert kwargs["graph_runtime_state"] is factory.graph_runtime_state
         latest_node_class.assert_not_called()
 
-    def test_falls_back_to_latest_class_when_version_specific_mapping_is_missing(self, monkeypatch, factory):
+    def test_falls_back_to_latest_class_when_version_specific_mapping_is_missing(
+        self, monkeypatch: pytest.MonkeyPatch, factory
+    ):
         latest_node = sentinel.latest_node
         latest_node_class = _node_constructor(return_value=latest_node)
         monkeypatch.setattr(
@@ -490,7 +529,7 @@ class TestDifyNodeFactoryCreateNode:
         latest_node_class.assert_called_once()
         kwargs = latest_node_class.call_args.kwargs
         assert kwargs["node_id"] == "node-id"
-        _assert_typed_node_config(kwargs["config"], node_id="node-id", node_type=BuiltinNodeTypes.START, version="9")
+        _assert_constructor_node_data(kwargs["data"], node_id="node-id", node_type=BuiltinNodeTypes.START, version="9")
         assert kwargs["graph_init_params"] is sentinel.graph_init_params
         assert kwargs["graph_runtime_state"] is factory.graph_runtime_state
 
@@ -501,13 +540,14 @@ class TestDifyNodeFactoryCreateNode:
             (BuiltinNodeTypes.TEMPLATE_TRANSFORM, "TemplateTransformNode"),
             (BuiltinNodeTypes.HTTP_REQUEST, "HttpRequestNode"),
             (BuiltinNodeTypes.HUMAN_INPUT, "HumanInputNode"),
+            (BuiltinNodeTypes.TOOL, "ToolNode"),
             (KNOWLEDGE_INDEX_NODE_TYPE, "KnowledgeIndexNode"),
             (BuiltinNodeTypes.DATASOURCE, "DatasourceNode"),
             (BuiltinNodeTypes.KNOWLEDGE_RETRIEVAL, "KnowledgeRetrievalNode"),
             (BuiltinNodeTypes.DOCUMENT_EXTRACTOR, "DocumentExtractorNode"),
         ],
     )
-    def test_creates_specialized_nodes(self, monkeypatch, factory, node_type, constructor_name):
+    def test_creates_specialized_nodes(self, monkeypatch: pytest.MonkeyPatch, factory, node_type, constructor_name):
         created_node = object()
         constructor = _node_constructor(return_value=created_node)
         constructor._mock_name = constructor_name
@@ -528,7 +568,7 @@ class TestDifyNodeFactoryCreateNode:
         assert result is created_node
         kwargs = constructor.call_args.kwargs
         assert kwargs["node_id"] == "node-id"
-        _assert_typed_node_config(kwargs["config"], node_id="node-id", node_type=node_type)
+        _assert_constructor_node_data(kwargs["data"], node_id="node-id", node_type=node_type)
         assert kwargs["graph_init_params"] is sentinel.graph_init_params
         assert kwargs["graph_runtime_state"] is factory.graph_runtime_state
 
@@ -541,13 +581,19 @@ class TestDifyNodeFactoryCreateNode:
         elif constructor_name == "HttpRequestNode":
             assert kwargs["http_request_config"] is sentinel.http_request_config
             assert kwargs["http_client"] is sentinel.http_client
-            assert kwargs["tool_file_manager_factory"] is sentinel.tool_file_manager_factory
+            assert kwargs["tool_file_manager_factory"] is factory._bound_tool_file_manager_factory
             assert kwargs["file_manager"] is sentinel.file_manager
             assert kwargs["file_reference_factory"] is sentinel.file_reference_factory
+            factory._bound_tool_file_manager_factory.assert_not_called()
         elif constructor_name == "HumanInputNode":
             assert kwargs["form_repository"] is form_repository
+            assert kwargs["file_reference_factory"] is sentinel.file_reference_factory
             assert kwargs["runtime"] is factory._human_input_runtime
             factory._human_input_runtime.build_form_repository.assert_called_once_with()
+        elif constructor_name == "ToolNode":
+            assert kwargs["tool_file_manager"] is sentinel.tool_file_manager
+            assert kwargs["runtime"] is sentinel.tool_runtime
+            factory._bound_tool_file_manager_factory.assert_called_once_with()
         elif constructor_name == "DocumentExtractorNode":
             assert kwargs["unstructured_api_config"] is sentinel.unstructured_api_config
             assert kwargs["http_client"] is sentinel.http_client
@@ -597,9 +643,12 @@ class TestDifyNodeFactoryCreateNode:
         prepared_llm.assert_called_once_with(sentinel.model_instance)
         assert kwargs["model_instance"] is wrapped_model_instance
 
-    def test_create_node_passes_alias_preserving_llm_config_to_constructor(self, monkeypatch, factory):
+    def test_create_node_passes_alias_preserving_llm_data_to_constructor(self, monkeypatch, factory):
         created_node = object()
         constructor = _node_constructor(return_value=created_node)
+        constructor.validate_node_data.side_effect = lambda node_data: LLMNodeData.model_validate(
+            node_data.model_dump(mode="python") if isinstance(node_data, BaseNodeData) else node_data
+        )
         monkeypatch.setattr(factory, "_resolve_node_class", MagicMock(return_value=constructor))
         monkeypatch.setattr(factory, "_build_llm_compatible_node_init_kwargs", MagicMock(return_value={}))
 
@@ -625,10 +674,56 @@ class TestDifyNodeFactoryCreateNode:
 
         factory.create_node(node_config)
 
-        config = constructor.call_args.kwargs["config"]
-        assert isinstance(config, dict)
-        assert config["structured_output_enabled"] is True
-        assert "structured_output_switch_on" not in config
+        data = constructor.call_args.kwargs["data"]
+        assert isinstance(data, Mapping)
+        assert data["structured_output_enabled"] is True
+        assert "structured_output_switch_on" not in data
+        assert LLMNodeData.model_validate(data).structured_output_enabled is True
+
+    def test_create_node_preserves_structured_output_switch_after_graphon_constructor(self, monkeypatch, factory):
+        factory.graph_init_params = SimpleNamespace(
+            workflow_id="workflow-id",
+            graph_config={},
+            run_context={},
+            call_depth=0,
+        )
+        monkeypatch.setattr(factory, "_resolve_node_class", MagicMock(return_value=LLMNode))
+        monkeypatch.setattr(
+            factory,
+            "_build_llm_compatible_node_init_kwargs",
+            MagicMock(
+                return_value={
+                    "model_instance": sentinel.model_instance,
+                    "llm_file_saver": sentinel.llm_file_saver,
+                    "prompt_message_serializer": sentinel.prompt_message_serializer,
+                }
+            ),
+        )
+
+        node_config = {
+            "id": "llm-node-id",
+            "data": {
+                "type": BuiltinNodeTypes.LLM,
+                "title": "LLM",
+                "model": {"provider": "provider", "name": "model", "mode": "chat", "completion_params": {}},
+                "prompt_template": [{"role": "system", "text": "x"}],
+                "context": {"enabled": False, "variable_selector": []},
+                "vision": {"enabled": False},
+                "structured_output_enabled": True,
+                "structured_output": {
+                    "schema": {
+                        "type": "object",
+                        "properties": {"type": {"type": "string"}},
+                        "required": ["type"],
+                    }
+                },
+            },
+        }
+
+        node = factory.create_node(node_config)
+
+        assert node.node_data.structured_output_switch_on is True
+        assert node.node_data.structured_output_enabled is True
 
     @pytest.mark.parametrize(
         ("node_type", "constructor_name", "expected_extra_kwargs"),
@@ -665,7 +760,7 @@ class TestDifyNodeFactoryCreateNode:
     )
     def test_creates_model_backed_nodes(
         self,
-        monkeypatch,
+        monkeypatch: pytest.MonkeyPatch,
         factory,
         node_type,
         constructor_name,
@@ -707,7 +802,7 @@ class TestDifyNodeFactoryCreateNode:
 
         constructor_kwargs = constructor.call_args.kwargs
         assert constructor_kwargs["node_id"] == "node-id"
-        _assert_typed_node_config(constructor_kwargs["config"], node_id="node-id", node_type=node_type)
+        _assert_constructor_node_data(constructor_kwargs["data"], node_id="node-id", node_type=node_type)
         assert constructor_kwargs["graph_init_params"] is sentinel.graph_init_params
         assert constructor_kwargs["graph_runtime_state"] is factory.graph_runtime_state
         assert constructor_kwargs["credentials_provider"] is sentinel.credentials_provider
@@ -717,6 +812,128 @@ class TestDifyNodeFactoryCreateNode:
         for key, value in expected_extra_kwargs.items():
             assert constructor_kwargs[key] is value
 
+    def test_parameter_extractor_init_does_not_require_retriever_context(self, factory):
+        node_data = ParameterExtractorNodeData.model_validate(
+            {
+                "type": BuiltinNodeTypes.PARAMETER_EXTRACTOR,
+                "title": "Parameter Extractor",
+                "model": {"provider": "provider", "name": "model", "mode": "chat", "completion_params": {}},
+                "query": ["sys", "query"],
+                "parameters": [
+                    {
+                        "name": "topic",
+                        "type": "string",
+                        "description": "Topic",
+                        "required": True,
+                    }
+                ],
+                "reasoning_mode": "prompt",
+            }
+        )
+        factory._build_model_instance_for_llm_node = MagicMock(return_value=sentinel.model_instance)
+        factory._build_memory_for_llm_node = MagicMock(return_value=sentinel.memory)
+        factory._build_retriever_attachment_loader = MagicMock(side_effect=AssertionError("unexpected loader build"))
+
+        kwargs = factory._build_llm_compatible_node_init_kwargs(
+            node_class=sentinel.node_class,
+            node_data=node_data,
+            wrap_model_instance=True,
+            include_http_client=False,
+            include_llm_file_saver=False,
+            include_prompt_message_serializer=True,
+            include_retriever_attachment_loader=False,
+            include_jinja2_template_renderer=False,
+        )
+
+        assert "retriever_attachment_loader" not in kwargs
+        assert kwargs["prompt_message_serializer"] is sentinel.prompt_message_serializer
+        factory._build_retriever_attachment_loader.assert_not_called()
+
+
+class TestDifyNodeFactoryRetrieverAttachmentAccess:
+    @pytest.fixture
+    def factory(self):
+        factory = object.__new__(node_factory.DifyNodeFactory)
+        factory.graph_runtime_state = SimpleNamespace(variable_pool=MagicMock())
+        return factory
+
+    def test_retriever_attachment_loader_is_typed_for_llm_node_data_only(self):
+        annotations = node_factory.DifyNodeFactory._build_retriever_attachment_loader.__annotations__
+
+        assert annotations["node_data"] is LLMNodeData
+
+    def test_build_retriever_attachment_loader_uses_llm_context_selector(self, factory):
+        factory._file_reference_factory = sentinel.file_reference_factory
+        factory.graph_runtime_state.variable_pool.get.return_value = ArrayObjectSegment(
+            value=[
+                {
+                    "metadata": {
+                        "_source": "knowledge",
+                        "segment_id": "allowed-segment",
+                    }
+                }
+            ]
+        )
+        node_data = LLMNodeData.model_validate(
+            {
+                "type": BuiltinNodeTypes.LLM,
+                "title": "LLM",
+                "model": {"provider": "provider", "name": "model", "mode": "chat", "completion_params": {}},
+                "prompt_template": [{"role": "system", "text": "x"}],
+                "context": {"enabled": True, "variable_selector": ["knowledge-node", "result"]},
+                "vision": {"enabled": False},
+            }
+        )
+
+        loader = factory._build_retriever_attachment_loader(node_data)
+
+        assert loader._segment_access_checker is not None
+        assert loader._segment_access_checker("allowed-segment") is True
+        factory.graph_runtime_state.variable_pool.get.assert_called_once_with(["knowledge-node", "result"])
+
+    def test_checker_rejects_missing_context_selector_without_reading_variable_pool(self, factory):
+        checker = factory._build_retriever_segment_access_checker(None)
+
+        assert checker("segment-id") is False
+        factory.graph_runtime_state.variable_pool.get.assert_not_called()
+
+    def test_checker_rejects_non_knowledge_context_items(self, factory):
+        factory.graph_runtime_state.variable_pool.get.return_value = ArrayObjectSegment.model_construct(
+            value=[
+                "plain-text",
+                {"metadata": "not-a-mapping"},
+            ]
+        )
+
+        checker = factory._build_retriever_segment_access_checker(["knowledge-node", "result"])
+
+        assert checker("segment-id") is False
+
+    def test_checker_rejects_non_array_context_value(self, factory):
+        factory.graph_runtime_state.variable_pool.get.return_value = StringSegment(value="not knowledge context")
+
+        checker = factory._build_retriever_segment_access_checker(["knowledge-node", "result"])
+
+        assert checker("segment-id") is False
+
+    def test_checker_allows_only_segments_from_selected_knowledge_context(self, factory):
+        factory.graph_runtime_state.variable_pool.get.return_value = ArrayObjectSegment(
+            value=[
+                {
+                    "metadata": {
+                        "_source": "knowledge",
+                        "segment_id": "allowed-segment",
+                    }
+                }
+            ]
+        )
+
+        checker = factory._build_retriever_segment_access_checker(["knowledge-node", "result"])
+
+        assert checker("allowed-segment") is True
+        assert checker("other-segment") is False
+        factory.graph_runtime_state.variable_pool.get.assert_any_call(["knowledge-node", "result"])
+
 
 class TestDifyNodeFactoryModelInstance:
     @pytest.fixture
@@ -726,7 +943,7 @@ class TestDifyNodeFactoryModelInstance:
         factory._llm_model_factory = sentinel.model_factory
         return factory
 
-    def test_delegates_to_fetch_model_config(self, monkeypatch, factory):
+    def test_delegates_to_fetch_model_config(self, monkeypatch: pytest.MonkeyPatch, factory):
         node_data_model = SimpleNamespace(
             provider="provider",
             name="model",
@@ -755,7 +972,7 @@ class TestDifyNodeFactoryModelInstance:
             model_factory=sentinel.model_factory,
         )
 
-    def test_propagates_fetch_model_config_errors(self, monkeypatch, factory):
+    def test_propagates_fetch_model_config_errors(self, monkeypatch: pytest.MonkeyPatch, factory):
         fetch_model_config = MagicMock(side_effect=ValueError("broken model config"))
         monkeypatch.setattr(node_factory, "fetch_model_config", fetch_model_config)
 
@@ -780,7 +997,7 @@ class TestDifyNodeFactoryMemory:
         assert result is None
         factory.graph_runtime_state.variable_pool.get.assert_not_called()
 
-    def test_uses_string_segment_conversation_id(self, monkeypatch, factory):
+    def test_uses_string_segment_conversation_id(self, monkeypatch: pytest.MonkeyPatch, factory):
         memory_config = sentinel.memory_config
         factory.graph_runtime_state.variable_pool.get.return_value = StringSegment(value="conversation-id")
         fetch_memory = MagicMock(return_value=sentinel.memory)
@@ -800,7 +1017,7 @@ class TestDifyNodeFactoryMemory:
             model_instance=sentinel.model_instance,
         )
 
-    def test_ignores_non_string_segment_conversation_ids(self, monkeypatch, factory):
+    def test_ignores_non_string_segment_conversation_ids(self, monkeypatch: pytest.MonkeyPatch, factory):
         memory_config = sentinel.memory_config
         factory.graph_runtime_state.variable_pool.get.return_value = sentinel.segment
         fetch_memory = MagicMock(return_value=sentinel.memory)
diff --git a/api/tests/unit_tests/core/workflow/test_node_mapping_bootstrap.py b/api/tests/unit_tests/core/workflow/test_node_mapping_bootstrap.py
index d18fc262ef..2dd3953d9a 100644
--- a/api/tests/unit_tests/core/workflow/test_node_mapping_bootstrap.py
+++ b/api/tests/unit_tests/core/workflow/test_node_mapping_bootstrap.py
@@ -7,6 +7,17 @@ from pathlib import Path
 
 def test_moved_core_nodes_resolve_after_importing_production_entrypoints():
     api_root = Path(__file__).resolve().parents[4]
+
+    # `PYTHONSAFEPATH=1` enables Python's safe-path mode, which suppresses the
+    # usual implicit insertion of the working directory into `sys.path`.
+    # Set `PYTHONPATH` explicitly so this subprocess test stays deterministic in
+    # both CI and local shells that may export `PYTHONSAFEPATH`.
+    env = os.environ.copy()
+    existing_pythonpath = env.get("PYTHONPATH")
+    env["PYTHONPATH"] = (
+        str(api_root) if not existing_pythonpath else os.pathsep.join([str(api_root), existing_pythonpath])
+    )
+    env["PYTHONSAFEPATH"] = "1"
     script = textwrap.dedent(
         """
         from core.app.apps import workflow_app_runner
@@ -34,7 +45,7 @@ def test_moved_core_nodes_resolve_after_importing_production_entrypoints():
     completed = subprocess.run(
         [sys.executable, "-c", script],
         cwd=api_root,
-        env=os.environ.copy(),
+        env=env,
         capture_output=True,
         text=True,
         check=False,
diff --git a/api/tests/unit_tests/core/workflow/test_node_runtime.py b/api/tests/unit_tests/core/workflow/test_node_runtime.py
index 5a43369a1a..5e83863dc2 100644
--- a/api/tests/unit_tests/core/workflow/test_node_runtime.py
+++ b/api/tests/unit_tests/core/workflow/test_node_runtime.py
@@ -1,9 +1,11 @@
 from types import SimpleNamespace
 from unittest.mock import MagicMock, Mock, sentinel
+from uuid import uuid4
 
 import pytest
 
 from core.app.entities.app_invoke_entities import DIFY_RUN_CONTEXT_KEY, DifyRunContext, InvokeFrom, UserFrom
+from core.app.file_access import FileAccessScope, bind_file_access_scope, grant_retriever_segment_access
 from core.llm_generator.output_parser.errors import OutputParserError
 from core.workflow import node_runtime
 from core.workflow.file_reference import parse_file_reference
@@ -22,6 +24,7 @@ from core.workflow.node_runtime import (
     DifyPromptMessageSerializer,
     DifyRetrieverAttachmentLoader,
     DifyToolFileManager,
+    DifyToolNodeRuntime,
     apply_dify_debug_email_recipient,
     build_dify_llm_file_saver,
     resolve_dify_run_context,
@@ -30,6 +33,7 @@ from graphon.file import FileTransferMethod, FileType
 from graphon.model_runtime.entities.common_entities import I18nObject
 from graphon.model_runtime.entities.model_entities import AIModelEntity, FetchFrom, ModelType
 from graphon.nodes.human_input.entities import HumanInputNodeData
+from graphon.nodes.tool.entities import ToolNodeData, ToolProviderType
 from tests.workflow_test_utils import build_test_run_context
 
 
@@ -266,6 +270,114 @@ def test_dify_retriever_attachment_loader_builds_graph_files(monkeypatch: pytest
     assert parse_file_reference(mapping["reference"]).storage_key is None
 
 
+def test_dify_retriever_attachment_loader_grants_upload_files_for_allowed_segment(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    from factories.file_factory import builders as file_builders
+
+    upload_file_id = str(uuid4())
+    segment_id = str(uuid4())
+    upload_file = SimpleNamespace(
+        id=upload_file_id,
+        tenant_id="tenant-id",
+        name="diagram.png",
+        extension="png",
+        mime_type="image/png",
+        source_url="https://example.com/diagram.png",
+        key="storage-key",
+        size=128,
+    )
+    attachment_session = MagicMock()
+    attachment_session.execute.return_value.all.return_value = [(None, upload_file)]
+
+    class _AttachmentSessionContext:
+        def __enter__(self):
+            return attachment_session
+
+        def __exit__(self, exc_type, exc, tb):
+            return False
+
+    upload_session = MagicMock()
+    upload_session.__enter__.return_value = upload_session
+    upload_session.__exit__.return_value = False
+    upload_session.scalar.return_value = upload_file
+
+    monkeypatch.setattr(node_runtime, "db", SimpleNamespace(engine=object()))
+    monkeypatch.setattr(node_runtime, "Session", MagicMock(return_value=_AttachmentSessionContext()))
+    monkeypatch.setattr(file_builders, "session_factory", SimpleNamespace(create_session=lambda: upload_session))
+
+    loader = DifyRetrieverAttachmentLoader(file_reference_factory=DifyFileReferenceFactory(_build_run_context()))
+    scope = FileAccessScope(
+        tenant_id="tenant-id",
+        user_id="end-user-id",
+        user_from=UserFrom.END_USER,
+        invoke_from=InvokeFrom.WEB_APP,
+    )
+
+    with bind_file_access_scope(scope):
+        grant_retriever_segment_access([segment_id])
+        files = loader.load(segment_id=segment_id)
+
+    assert files[0].related_id == upload_file_id
+    stmt = upload_session.scalar.call_args.args[0]
+    whereclause = str(stmt.whereclause)
+    assert "upload_files.tenant_id" in whereclause
+    assert "upload_files.id IN" in whereclause
+
+
+def test_dify_retriever_attachment_loader_skips_ungranted_segment_for_end_user(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    build_from_mapping = MagicMock()
+    session_factory = MagicMock()
+    monkeypatch.setattr(node_runtime, "Session", session_factory)
+    loader = DifyRetrieverAttachmentLoader(
+        file_reference_factory=SimpleNamespace(build_from_mapping=build_from_mapping)
+    )
+    scope = FileAccessScope(
+        tenant_id="tenant-id",
+        user_id="end-user-id",
+        user_from=UserFrom.END_USER,
+        invoke_from=InvokeFrom.WEB_APP,
+    )
+
+    with bind_file_access_scope(scope):
+        files = loader.load(segment_id=str(uuid4()))
+
+    assert files == []
+    session_factory.assert_not_called()
+    build_from_mapping.assert_not_called()
+
+
+def test_dify_retriever_attachment_loader_skips_segment_rejected_by_checker(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    segment_id = str(uuid4())
+    build_from_mapping = MagicMock()
+    session_factory = MagicMock()
+    segment_access_checker = MagicMock(return_value=False)
+    monkeypatch.setattr(node_runtime, "Session", session_factory)
+    loader = DifyRetrieverAttachmentLoader(
+        file_reference_factory=SimpleNamespace(build_from_mapping=build_from_mapping),
+        segment_access_checker=segment_access_checker,
+    )
+    scope = FileAccessScope(
+        tenant_id="tenant-id",
+        user_id="end-user-id",
+        user_from=UserFrom.END_USER,
+        invoke_from=InvokeFrom.WEB_APP,
+    )
+
+    with bind_file_access_scope(scope):
+        grant_retriever_segment_access([segment_id])
+        files = loader.load(segment_id=segment_id)
+
+    assert files == []
+    segment_access_checker.assert_called_once_with(segment_id)
+    session_factory.assert_not_called()
+    build_from_mapping.assert_not_called()
+
+
 def test_dify_tool_file_manager_resolves_conversation_id_for_tool_files(monkeypatch: pytest.MonkeyPatch) -> None:
     create_file_by_raw = MagicMock(return_value=SimpleNamespace(id="tool-file-id"))
     manager_instance = SimpleNamespace(create_file_by_raw=create_file_by_raw)
@@ -314,6 +426,81 @@ def test_dify_tool_file_manager_delegates_file_generator_lookup(monkeypatch: pyt
     get_file_generator.assert_called_once_with("tool-file-id")
 
 
+def test_dify_tool_node_runtime_injects_outer_workflow_run_id_for_workflow_tools(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    runtime_tool = SimpleNamespace(runtime=SimpleNamespace(runtime_parameters={}))
+    get_runtime = MagicMock(return_value=runtime_tool)
+    monkeypatch.setattr(node_runtime.ToolManager, "get_workflow_tool_runtime", get_runtime)
+    monkeypatch.setattr(
+        node_runtime,
+        "get_system_text",
+        lambda _pool, key: (
+            "outer-workflow-run-id" if key == node_runtime.SystemVariableKey.WORKFLOW_EXECUTION_ID else None
+        ),
+    )
+
+    runtime = node_runtime.DifyToolNodeRuntime(_build_run_context())
+    node_data = ToolNodeData(
+        title="Workflow Tool Node",
+        desc=None,
+        provider_id="workflow-provider-id",
+        provider_type=ToolProviderType.WORKFLOW,
+        provider_name="workflow-provider",
+        tool_name="workflow-tool",
+        tool_label="Workflow Tool",
+        tool_configurations={},
+        tool_parameters={},
+    )
+
+    handle = runtime.get_runtime(
+        node_id="tool-node",
+        node_data=node_data,
+        variable_pool=object(),
+        node_execution_id="node-execution-id",
+    )
+
+    assert handle.raw.tool is runtime_tool
+    assert handle.raw.parent_trace_context.model_dump() == {
+        "parent_workflow_run_id": "outer-workflow-run-id",
+        "parent_node_execution_id": "node-execution-id",
+    }
+    assert runtime_tool.runtime.runtime_parameters == {}
+    get_runtime.assert_called_once()
+
+
+def test_dify_tool_node_runtime_does_not_inject_outer_workflow_run_id_for_non_workflow_tools(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    runtime_tool = SimpleNamespace(runtime=SimpleNamespace(runtime_parameters={}))
+    get_runtime = MagicMock(return_value=runtime_tool)
+    monkeypatch.setattr(node_runtime.ToolManager, "get_workflow_tool_runtime", get_runtime)
+    monkeypatch.setattr(node_runtime, "get_system_text", lambda _pool, _key: None)
+
+    runtime = node_runtime.DifyToolNodeRuntime(_build_run_context())
+    node_data = ToolNodeData(
+        title="Builtin Tool Node",
+        desc=None,
+        provider_id="builtin-provider-id",
+        provider_type=ToolProviderType.BUILT_IN,
+        provider_name="builtin-provider",
+        tool_name="builtin-tool",
+        tool_label="Builtin Tool",
+        tool_configurations={},
+        tool_parameters={},
+    )
+
+    handle = runtime.get_runtime(
+        node_id="tool-node",
+        node_data=node_data,
+        variable_pool=object(),
+    )
+
+    assert handle.raw.tool is runtime_tool
+    assert "outer_workflow_run_id" not in runtime_tool.runtime.runtime_parameters
+    get_runtime.assert_called_once()
+
+
 def test_dify_human_input_runtime_builds_debug_repository(monkeypatch: pytest.MonkeyPatch) -> None:
     repository = MagicMock()
     repository_cls = MagicMock(return_value=repository)
@@ -334,6 +521,41 @@ def test_dify_human_input_runtime_builds_debug_repository(monkeypatch: pytest.Mo
     )
 
 
+def test_dify_tool_runtime_spec_prefers_tool_parameters_for_runtime_form_values() -> None:
+    node_data = ToolNodeData(
+        provider_id="video-mixcut-agent",
+        provider_type=ToolProviderType.PLUGIN,
+        provider_name="sawyer-shi/video-mixcut-agent",
+        tool_name="mixcut",
+        tool_label="MixCut",
+        tool_configurations={"count": 2},
+        tool_parameters={
+            "vision_llm_model": {
+                "type": "constant",
+                "value": {
+                    "provider": "langgenius/tongyi/tongyi",
+                    "model": "qwen3-vl-plus",
+                    "model_type": "llm",
+                },
+            }
+        },
+    )
+
+    spec = DifyToolNodeRuntime._build_tool_runtime_spec(node_data)
+
+    assert spec.tool_configurations == {
+        "count": 2,
+        "vision_llm_model": {
+            "type": "constant",
+            "value": {
+                "provider": "langgenius/tongyi/tongyi",
+                "model": "qwen3-vl-plus",
+                "model_type": "llm",
+            },
+        },
+    }
+
+
 def test_dify_human_input_runtime_create_form_filters_debugger_delivery_methods() -> None:
     repository = MagicMock()
     repository.create_form.return_value = sentinel.form
diff --git a/api/tests/unit_tests/core/workflow/test_variable_pool.py b/api/tests/unit_tests/core/workflow/test_variable_pool.py
index 9dab38ed8e..0017cd8d3f 100644
--- a/api/tests/unit_tests/core/workflow/test_variable_pool.py
+++ b/api/tests/unit_tests/core/workflow/test_variable_pool.py
@@ -109,8 +109,8 @@ class TestVariablePool:
         assert pool.get([ENVIRONMENT_VARIABLE_NODE_ID, "env_var_1"]) is not None
         assert pool.get([CONVERSATION_VARIABLE_NODE_ID, "conv_var_1"]) is not None
 
-    def test_constructor_loads_legacy_bootstrap_kwargs(self):
-        pool = VariablePool(
+    def test_from_bootstrap_loads_legacy_bootstrap_kwargs(self):
+        pool = VariablePool.from_bootstrap(
             system_variables=build_system_variables(user_id="test_user_id"),
             environment_variables=[StringVariable(name="env_var", value="env-value")],
             conversation_variables=[StringVariable(name="conv_var", value="conv-value")],
diff --git a/api/tests/unit_tests/core/workflow/test_workflow_entry.py b/api/tests/unit_tests/core/workflow/test_workflow_entry.py
index 041c5cc612..661882f013 100644
--- a/api/tests/unit_tests/core/workflow/test_workflow_entry.py
+++ b/api/tests/unit_tests/core/workflow/test_workflow_entry.py
@@ -19,7 +19,7 @@ from graphon.variables.variables import StringVariable
 
 
 @pytest.fixture(autouse=True)
-def _mock_ssrf_head(monkeypatch):
+def _mock_ssrf_head(monkeypatch: pytest.MonkeyPatch):
     """Avoid any real network requests during tests.
 
     factories.file_factory.remote.get_remote_file_info() uses ssrf_proxy.head
@@ -55,7 +55,7 @@ class TestWorkflowEntry:
     def test_mapping_user_inputs_to_variable_pool_with_system_variables(self):
         """Test mapping system variables from user inputs to variable pool."""
         # Initialize variable pool with system variables
-        variable_pool = VariablePool(
+        variable_pool = VariablePool.from_bootstrap(
             system_variables=build_system_variables(
                 user_id="test_user_id",
                 app_id="test_app_id",
@@ -128,7 +128,7 @@ class TestWorkflowEntry:
                 return NodeConfigDictAdapter.validate_python(node_config)
 
         workflow = StubWorkflow()
-        variable_pool = VariablePool(system_variables=default_system_variables(), user_inputs={})
+        variable_pool = VariablePool.from_bootstrap(system_variables=default_system_variables(), user_inputs={})
         expected_limits = CodeNodeLimits(
             max_string_length=dify_config.CODE_MAX_STRING_LENGTH,
             max_number=dify_config.CODE_MAX_NUMBER,
@@ -157,7 +157,7 @@ class TestWorkflowEntry:
         """Test mapping environment variables from user inputs to variable pool."""
         # Initialize variable pool with environment variables
         env_var = StringVariable(name="API_KEY", value="existing_key")
-        variable_pool = VariablePool(
+        variable_pool = VariablePool.from_bootstrap(
             system_variables=default_system_variables(),
             environment_variables=[env_var],
             user_inputs={},
@@ -198,7 +198,7 @@ class TestWorkflowEntry:
         """Test mapping conversation variables from user inputs to variable pool."""
         # Initialize variable pool with conversation variables
         conv_var = StringVariable(name="last_message", value="Hello")
-        variable_pool = VariablePool(
+        variable_pool = VariablePool.from_bootstrap(
             system_variables=default_system_variables(),
             conversation_variables=[conv_var],
             user_inputs={},
@@ -239,7 +239,7 @@ class TestWorkflowEntry:
     def test_mapping_user_inputs_to_variable_pool_with_regular_variables(self):
         """Test mapping regular node variables from user inputs to variable pool."""
         # Initialize empty variable pool
-        variable_pool = VariablePool(
+        variable_pool = VariablePool.from_bootstrap(
             system_variables=default_system_variables(),
             user_inputs={},
         )
@@ -281,7 +281,7 @@ class TestWorkflowEntry:
 
     def test_mapping_user_inputs_with_file_handling(self):
         """Test mapping file inputs from user inputs to variable pool."""
-        variable_pool = VariablePool(
+        variable_pool = VariablePool.from_bootstrap(
             system_variables=default_system_variables(),
             user_inputs={},
         )
@@ -340,7 +340,7 @@ class TestWorkflowEntry:
 
     def test_mapping_user_inputs_missing_variable_error(self):
         """Test that mapping raises error when required variable is missing."""
-        variable_pool = VariablePool(
+        variable_pool = VariablePool.from_bootstrap(
             system_variables=default_system_variables(),
             user_inputs={},
         )
@@ -366,7 +366,7 @@ class TestWorkflowEntry:
 
     def test_mapping_user_inputs_with_alternative_key_format(self):
         """Test mapping with alternative key format (without node prefix)."""
-        variable_pool = VariablePool(
+        variable_pool = VariablePool.from_bootstrap(
             system_variables=default_system_variables(),
             user_inputs={},
         )
@@ -396,7 +396,7 @@ class TestWorkflowEntry:
 
     def test_mapping_user_inputs_with_complex_selectors(self):
         """Test mapping with complex node variable keys."""
-        variable_pool = VariablePool(
+        variable_pool = VariablePool.from_bootstrap(
             system_variables=default_system_variables(),
             user_inputs={},
         )
@@ -432,7 +432,7 @@ class TestWorkflowEntry:
 
     def test_mapping_user_inputs_invalid_node_variable(self):
         """Test that mapping handles invalid node variable format."""
-        variable_pool = VariablePool(
+        variable_pool = VariablePool.from_bootstrap(
             system_variables=default_system_variables(),
             user_inputs={},
         )
@@ -463,7 +463,7 @@ class TestWorkflowEntry:
         env_var = StringVariable(name="API_KEY", value="existing_key")
         conv_var = StringVariable(name="session_id", value="session123")
 
-        variable_pool = VariablePool(
+        variable_pool = VariablePool.from_bootstrap(
             system_variables=build_system_variables(
                 user_id="test_user",
                 app_id="test_app",
diff --git a/api/tests/unit_tests/core/workflow/test_workflow_entry_helpers.py b/api/tests/unit_tests/core/workflow/test_workflow_entry_helpers.py
index 270d0bf90d..a57cdd1337 100644
--- a/api/tests/unit_tests/core/workflow/test_workflow_entry_helpers.py
+++ b/api/tests/unit_tests/core/workflow/test_workflow_entry_helpers.py
@@ -7,7 +7,6 @@ import pytest
 
 from core.app.apps.exc import GenerateTaskStoppedError
 from core.app.entities.app_invoke_entities import InvokeFrom, UserFrom
-from core.model_manager import ModelInstance
 from core.workflow import workflow_entry
 from core.workflow.system_variables import default_system_variables
 from graphon.entities.base_node_data import BaseNodeData
@@ -16,10 +15,12 @@ from graphon.errors import WorkflowNodeRunFailedError
 from graphon.file import File, FileTransferMethod, FileType
 from graphon.graph import Graph
 from graphon.graph_events import GraphRunFailedEvent
-from graphon.model_runtime.entities.llm_entities import LLMUsage
+from graphon.model_runtime.entities.llm_entities import LLMMode, LLMUsage
 from graphon.node_events import NodeRunResult
 from graphon.nodes import BuiltinNodeTypes
 from graphon.nodes.base.node import Node
+from graphon.nodes.llm.entities import ContextConfig, LLMNodeData, ModelConfig
+from graphon.nodes.question_classifier.entities import QuestionClassifierNodeData
 from graphon.runtime import ChildGraphNotFoundError, VariablePool
 from graphon.variables.variables import StringVariable
 from tests.workflow_test_utils import build_test_graph_init_params, build_test_variable_pool
@@ -29,9 +30,30 @@ def _build_typed_node_config(node_type: NodeType):
     return {"id": "node-id", "data": BaseNodeData(type=node_type)}
 
 
-def _build_wrapped_model_instance() -> tuple[SimpleNamespace, ModelInstance]:
-    raw_model_instance = ModelInstance.__new__(ModelInstance)
-    return SimpleNamespace(_model_instance=raw_model_instance), raw_model_instance
+def _build_model_config(*, provider: str = "openai", model_name: str = "gpt-4o") -> ModelConfig:
+    return ModelConfig(provider=provider, name=model_name, mode=LLMMode.CHAT)
+
+
+def _build_llm_node_data(*, provider: str = "openai", model_name: str = "gpt-4o") -> LLMNodeData:
+    return LLMNodeData(
+        type=BuiltinNodeTypes.LLM,
+        title="Child Model",
+        model=_build_model_config(provider=provider, model_name=model_name),
+        prompt_template=[],
+        context=ContextConfig(enabled=False),
+    )
+
+
+def _build_question_classifier_node_data(
+    *, provider: str = "openai", model_name: str = "gpt-4o"
+) -> QuestionClassifierNodeData:
+    return QuestionClassifierNodeData(
+        type=BuiltinNodeTypes.QUESTION_CLASSIFIER,
+        title="Child Model",
+        query_variable_selector=["sys", "query"],
+        model=_build_model_config(provider=provider, model_name=model_name),
+        classes=[],
+    )
 
 
 class _FakeModelNodeMixin:
@@ -40,22 +62,26 @@ class _FakeModelNodeMixin:
         return "1"
 
     def post_init(self) -> None:
-        self.model_instance, self.raw_model_instance = _build_wrapped_model_instance()
+        self.model_instance = SimpleNamespace(provider="stale-provider", model_name="stale-model")
         self.usage_snapshot = LLMUsage.empty_usage()
         self.usage_snapshot.total_tokens = 1
 
     def _run(self) -> NodeRunResult:
         return NodeRunResult(
             status=WorkflowNodeExecutionStatus.SUCCEEDED,
+            inputs={
+                "model_provider": self.node_data.model.provider,
+                "model_name": self.node_data.model.name,
+            },
             llm_usage=self.usage_snapshot,
         )
 
 
-class _FakeLLMNode(_FakeModelNodeMixin, Node[BaseNodeData]):
+class _FakeLLMNode(_FakeModelNodeMixin, Node[LLMNodeData]):
     node_type = BuiltinNodeTypes.LLM
 
 
-class _FakeQuestionClassifierNode(_FakeModelNodeMixin, Node[BaseNodeData]):
+class _FakeQuestionClassifierNode(_FakeModelNodeMixin, Node[QuestionClassifierNodeData]):
     node_type = BuiltinNodeTypes.QUESTION_CLASSIFIER
 
 
@@ -75,7 +101,7 @@ class TestWorkflowChildEngineBuilder:
         assert result is expected
 
     def test_build_child_engine_raises_when_root_node_is_missing(self):
-        builder = workflow_entry._WorkflowChildEngineBuilder()
+        builder = workflow_entry._WorkflowChildEngineBuilder(tenant_id="tenant-id")
         graph_init_params = SimpleNamespace(graph_config={"nodes": []})
         parent_graph_runtime_state = SimpleNamespace(
             execution_context=sentinel.execution_context,
@@ -92,7 +118,7 @@ class TestWorkflowChildEngineBuilder:
                 )
 
     def test_build_child_engine_constructs_graph_engine_with_quota_layer_only(self):
-        builder = workflow_entry._WorkflowChildEngineBuilder()
+        builder = workflow_entry._WorkflowChildEngineBuilder(tenant_id="tenant-id")
         graph_init_params = SimpleNamespace(graph_config={"nodes": [{"id": "root"}]})
         parent_graph_runtime_state = SimpleNamespace(
             execution_context=sentinel.execution_context,
@@ -114,7 +140,7 @@ class TestWorkflowChildEngineBuilder:
             patch.object(workflow_entry, "GraphEngine", return_value=child_engine) as graph_engine_cls,
             patch.object(workflow_entry, "GraphEngineConfig", return_value=sentinel.graph_engine_config),
             patch.object(workflow_entry, "InMemoryChannel", return_value=sentinel.command_channel),
-            patch.object(workflow_entry, "LLMQuotaLayer", return_value=sentinel.llm_quota_layer),
+            patch.object(workflow_entry, "LLMQuotaLayer", return_value=sentinel.llm_quota_layer) as llm_quota_layer_cls,
         ):
             result = builder.build_child_engine(
                 workflow_id="workflow-id",
@@ -147,11 +173,12 @@ class TestWorkflowChildEngineBuilder:
             config=sentinel.graph_engine_config,
             child_engine_builder=builder,
         )
+        llm_quota_layer_cls.assert_called_once_with(tenant_id="tenant-id")
         assert child_engine.layer.call_args_list == [((sentinel.llm_quota_layer,), {})]
 
     @pytest.mark.parametrize("node_cls", [_FakeLLMNode, _FakeQuestionClassifierNode])
     def test_build_child_engine_runs_llm_quota_layer_for_child_model_nodes(self, node_cls):
-        builder = workflow_entry._WorkflowChildEngineBuilder()
+        builder = workflow_entry._WorkflowChildEngineBuilder(tenant_id="tenant-id")
         graph_init_params = build_test_graph_init_params(
             graph_config={"nodes": [{"id": "root"}], "edges": []},
         )
@@ -163,12 +190,10 @@ class TestWorkflowChildEngineBuilder:
 
         def build_graph(*, graph_config, node_factory, root_node_id):
             _ = graph_config
+            node_data = _build_llm_node_data() if node_cls is _FakeLLMNode else _build_question_classifier_node_data()
             node = node_cls(
                 node_id=root_node_id,
-                config=BaseNodeData(
-                    type=node_cls.node_type,
-                    title="Child Model",
-                ),
+                data=node_data,
                 graph_init_params=node_factory.graph_init_params,
                 graph_runtime_state=node_factory.graph_runtime_state,
             )
@@ -191,8 +216,8 @@ class TestWorkflowChildEngineBuilder:
                 ),
             ),
             patch.object(workflow_entry.Graph, "init", side_effect=build_graph),
-            patch("core.app.workflow.layers.llm_quota.ensure_llm_quota_available") as ensure_quota,
-            patch("core.app.workflow.layers.llm_quota.deduct_llm_quota") as deduct_quota,
+            patch("core.app.workflow.layers.llm_quota.ensure_llm_quota_available_for_model") as ensure_quota,
+            patch("core.app.workflow.layers.llm_quota.deduct_llm_quota_for_model") as deduct_quota,
         ):
             child_engine = builder.build_child_engine(
                 workflow_id="workflow-id",
@@ -203,10 +228,15 @@ class TestWorkflowChildEngineBuilder:
             list(child_engine.run())
 
         node = created_node["node"]
-        ensure_quota.assert_called_once_with(model_instance=node.raw_model_instance)
+        ensure_quota.assert_called_once_with(
+            tenant_id="tenant-id",
+            provider=node.node_data.model.provider,
+            model=node.node_data.model.name,
+        )
         deduct_quota.assert_called_once_with(
-            tenant_id="tenant",
-            model_instance=node.raw_model_instance,
+            tenant_id="tenant-id",
+            provider=node.node_data.model.provider,
+            model=node.node_data.model.name,
             usage=node.usage_snapshot,
         )
 
@@ -252,7 +282,7 @@ class TestWorkflowEntryInit:
                 "ExecutionLimitsLayer",
                 return_value=execution_limits_layer,
             ) as execution_limits_layer_cls,
-            patch.object(workflow_entry, "LLMQuotaLayer", return_value=llm_quota_layer),
+            patch.object(workflow_entry, "LLMQuotaLayer", return_value=llm_quota_layer) as llm_quota_layer_cls,
             patch.object(workflow_entry, "ObservabilityLayer", return_value=observability_layer),
         ):
             entry = workflow_entry.WorkflowEntry(
@@ -291,6 +321,7 @@ class TestWorkflowEntryInit:
             max_steps=workflow_entry.dify_config.WORKFLOW_MAX_EXECUTION_STEPS,
             max_time=workflow_entry.dify_config.WORKFLOW_MAX_EXECUTION_TIME,
         )
+        llm_quota_layer_cls.assert_called_once_with(tenant_id="tenant-id")
         assert graph_engine.layer.call_args_list == [
             ((debug_layer,), {}),
             ((execution_limits_layer,), {}),
@@ -334,7 +365,7 @@ class TestWorkflowEntrySingleStepRun:
             def extract_variable_selector_to_variable_mapping(**_kwargs):
                 return {}
 
-        variable_pool = VariablePool(system_variables=default_system_variables(), user_inputs={})
+        variable_pool = VariablePool.from_bootstrap(system_variables=default_system_variables(), user_inputs={})
         variable_loader = MagicMock()
         variable_loader.load_variables.return_value = [
             StringVariable(
@@ -603,7 +634,7 @@ class TestWorkflowEntryHelpers:
                 user_inputs={},
             )
 
-    def test_run_free_node_rejects_missing_node_class(self, monkeypatch):
+    def test_run_free_node_rejects_missing_node_class(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(
             workflow_entry,
             "resolve_workflow_node_class",
@@ -619,7 +650,9 @@ class TestWorkflowEntryHelpers:
                 user_inputs={},
             )
 
-    def test_run_free_node_uses_empty_mapping_when_selector_extraction_is_not_implemented(self, monkeypatch):
+    def test_run_free_node_uses_empty_mapping_when_selector_extraction_is_not_implemented(
+        self, monkeypatch: pytest.MonkeyPatch
+    ):
         class FakeNodeClass:
             @staticmethod
             def extract_variable_selector_to_variable_mapping(**_kwargs):
@@ -707,7 +740,7 @@ class TestWorkflowEntryHelpers:
             tenant_id="tenant-id",
         )
 
-    def test_run_free_node_wraps_execution_failures(self, monkeypatch):
+    def test_run_free_node_wraps_execution_failures(self, monkeypatch: pytest.MonkeyPatch):
         class FakeNodeClass:
             @staticmethod
             def extract_variable_selector_to_variable_mapping(**_kwargs):
diff --git a/api/tests/unit_tests/events/test_update_provider_when_message_created.py b/api/tests/unit_tests/events/test_update_provider_when_message_created.py
new file mode 100644
index 0000000000..4b2a6438f4
--- /dev/null
+++ b/api/tests/unit_tests/events/test_update_provider_when_message_created.py
@@ -0,0 +1,141 @@
+from collections.abc import Generator
+from contextlib import contextmanager
+from types import SimpleNamespace
+from unittest.mock import patch
+from uuid import uuid4
+
+from sqlalchemy import create_engine, select
+from sqlalchemy.engine import Engine
+from sqlalchemy.orm import sessionmaker
+
+from core.app.entities.app_invoke_entities import ChatAppGenerateEntity
+from core.entities.provider_entities import ProviderQuotaType, QuotaUnit
+from events.event_handlers import update_provider_when_message_created
+from models import TenantCreditPool
+from models.provider import ProviderType
+
+
+@contextmanager
+def _patched_credit_pool_session_factory(engine: Engine) -> Generator[None, None, None]:
+    session_maker = sessionmaker(bind=engine, expire_on_commit=False)
+    with patch("services.credit_pool_service.session_factory.get_session_maker", return_value=session_maker):
+        yield
+
+
+def test_message_created_trial_credit_accounting_does_not_raise_when_balance_is_insufficient() -> None:
+    engine = create_engine("sqlite:///:memory:")
+    TenantCreditPool.__table__.create(engine)
+    tenant_id = str(uuid4())
+    pool_id = str(uuid4())
+    with engine.begin() as connection:
+        connection.execute(
+            TenantCreditPool.__table__.insert(),
+            {
+                "id": pool_id,
+                "tenant_id": tenant_id,
+                "pool_type": ProviderQuotaType.TRIAL,
+                "quota_limit": 10,
+                "quota_used": 9,
+            },
+        )
+
+    system_configuration = SimpleNamespace(
+        current_quota_type=ProviderQuotaType.TRIAL,
+        quota_configurations=[
+            SimpleNamespace(
+                quota_type=ProviderQuotaType.TRIAL,
+                quota_unit=QuotaUnit.TOKENS,
+                quota_limit=10,
+            )
+        ],
+    )
+    application_generate_entity = ChatAppGenerateEntity.model_construct(
+        app_config=SimpleNamespace(tenant_id=tenant_id),
+        model_conf=SimpleNamespace(
+            provider="openai",
+            model="gpt-4o",
+            provider_model_bundle=SimpleNamespace(
+                configuration=SimpleNamespace(
+                    using_provider_type=ProviderType.SYSTEM,
+                    system_configuration=system_configuration,
+                )
+            ),
+        ),
+    )
+    message = SimpleNamespace(message_tokens=2, answer_tokens=1)
+
+    with (
+        _patched_credit_pool_session_factory(engine),
+        patch.object(update_provider_when_message_created, "_execute_provider_updates"),
+    ):
+        update_provider_when_message_created.handle(
+            sender=message,
+            application_generate_entity=application_generate_entity,
+        )
+
+    with engine.connect() as connection:
+        quota_used = connection.scalar(select(TenantCreditPool.quota_used).where(TenantCreditPool.id == pool_id))
+
+    assert quota_used == 10
+
+
+def test_message_created_paid_credit_accounting_uses_paid_pool() -> None:
+    tenant_id = str(uuid4())
+    system_configuration = SimpleNamespace(
+        current_quota_type=ProviderQuotaType.PAID,
+        quota_configurations=[
+            SimpleNamespace(
+                quota_type=ProviderQuotaType.PAID,
+                quota_unit=QuotaUnit.TOKENS,
+                quota_limit=10,
+            )
+        ],
+    )
+    application_generate_entity = ChatAppGenerateEntity.model_construct(
+        app_config=SimpleNamespace(tenant_id=tenant_id),
+        model_conf=SimpleNamespace(
+            provider="openai",
+            model="gpt-4o",
+            provider_model_bundle=SimpleNamespace(
+                configuration=SimpleNamespace(
+                    using_provider_type=ProviderType.SYSTEM,
+                    system_configuration=system_configuration,
+                )
+            ),
+        ),
+    )
+    message = SimpleNamespace(message_tokens=2, answer_tokens=1)
+
+    with (
+        patch.object(update_provider_when_message_created, "_deduct_credit_pool_quota_capped") as mock_deduct,
+        patch.object(update_provider_when_message_created, "_execute_provider_updates"),
+    ):
+        update_provider_when_message_created.handle(
+            sender=message,
+            application_generate_entity=application_generate_entity,
+        )
+
+    mock_deduct.assert_called_once_with(
+        tenant_id=tenant_id,
+        credits_required=3,
+        pool_type="paid",
+    )
+
+
+def test_capped_credit_pool_accounting_skips_exhaustion_warning_when_full_amount_is_deducted(caplog) -> None:
+    with patch(
+        "services.credit_pool_service.CreditPoolService.deduct_credits_capped",
+        return_value=3,
+    ) as mock_deduct:
+        update_provider_when_message_created._deduct_credit_pool_quota_capped(
+            tenant_id="tenant-id",
+            credits_required=3,
+            pool_type="trial",
+        )
+
+    mock_deduct.assert_called_once_with(
+        tenant_id="tenant-id",
+        credits_required=3,
+        pool_type="trial",
+    )
+    assert "Credit pool exhausted during message-created accounting" not in caplog.text
diff --git a/api/tests/unit_tests/extensions/test_ext_request_logging.py b/api/tests/unit_tests/extensions/test_ext_request_logging.py
index dcb457c806..03479686bb 100644
--- a/api/tests/unit_tests/extensions/test_ext_request_logging.py
+++ b/api/tests/unit_tests/extensions/test_ext_request_logging.py
@@ -71,7 +71,7 @@ def enable_request_logging(monkeypatch: pytest.MonkeyPatch):
 class TestRequestLoggingExtension:
     def test_receiver_should_not_be_invoked_if_configuration_is_disabled(
         self,
-        monkeypatch,
+        monkeypatch: pytest.MonkeyPatch,
         mock_request_receiver,
         mock_response_receiver,
     ):
@@ -266,7 +266,9 @@ class TestResponseUnmodified:
 
 
 class TestRequestFinishedInfoAccessLine:
-    def test_info_access_log_includes_method_path_status_duration_trace_id(self, monkeypatch, caplog):
+    def test_info_access_log_includes_method_path_status_duration_trace_id(
+        self, monkeypatch: pytest.MonkeyPatch, caplog
+    ):
         """Ensure INFO access line contains expected fields with computed duration and trace id."""
         app = _get_test_app()
         # Push a real request context so flask.request and g are available
@@ -299,7 +301,7 @@ class TestRequestFinishedInfoAccessLine:
             assert "123.456" in msg  # rounded to 3 decimals
             assert "trace-xyz" in msg
 
-    def test_info_access_log_uses_dash_without_start_timestamp(self, monkeypatch, caplog):
+    def test_info_access_log_uses_dash_without_start_timestamp(self, monkeypatch: pytest.MonkeyPatch, caplog):
         app = _get_test_app()
         with app.test_request_context("/bar", method="POST"):
             # No g.__request_started_ts set -> duration should be '-'
diff --git a/api/tests/unit_tests/extensions/test_pubsub_channel.py b/api/tests/unit_tests/extensions/test_pubsub_channel.py
index 926c406ad4..24bbf55cb3 100644
--- a/api/tests/unit_tests/extensions/test_pubsub_channel.py
+++ b/api/tests/unit_tests/extensions/test_pubsub_channel.py
@@ -1,10 +1,12 @@
+import pytest
+
 from configs import dify_config
 from extensions import ext_redis
 from libs.broadcast_channel.redis.channel import BroadcastChannel as RedisBroadcastChannel
 from libs.broadcast_channel.redis.sharded_channel import ShardedRedisBroadcastChannel
 
 
-def test_get_pubsub_broadcast_channel_defaults_to_pubsub(monkeypatch):
+def test_get_pubsub_broadcast_channel_defaults_to_pubsub(monkeypatch: pytest.MonkeyPatch):
     monkeypatch.setattr(dify_config, "PUBSUB_REDIS_CHANNEL_TYPE", "pubsub")
     monkeypatch.setattr(ext_redis, "_pubsub_redis_client", object())
 
@@ -13,7 +15,7 @@ def test_get_pubsub_broadcast_channel_defaults_to_pubsub(monkeypatch):
     assert isinstance(channel, RedisBroadcastChannel)
 
 
-def test_get_pubsub_broadcast_channel_sharded(monkeypatch):
+def test_get_pubsub_broadcast_channel_sharded(monkeypatch: pytest.MonkeyPatch):
     monkeypatch.setattr(dify_config, "PUBSUB_REDIS_CHANNEL_TYPE", "sharded")
     monkeypatch.setattr(ext_redis, "_pubsub_redis_client", object())
 
diff --git a/api/tests/unit_tests/extensions/test_set_secretkey.py b/api/tests/unit_tests/extensions/test_set_secretkey.py
new file mode 100644
index 0000000000..8a8e4e2b19
--- /dev/null
+++ b/api/tests/unit_tests/extensions/test_set_secretkey.py
@@ -0,0 +1,74 @@
+from __future__ import annotations
+
+import pytest
+from flask import Flask
+
+from extensions import ext_set_secretkey
+
+
+class InMemoryStorage:
+    def __init__(self, files: dict[str, bytes] | None = None) -> None:
+        self.files = files or {}
+        self.saved_files: list[tuple[str, bytes]] = []
+
+    def load_once(self, filename: str) -> bytes:
+        try:
+            return self.files[filename]
+        except KeyError:
+            raise FileNotFoundError(filename)
+
+    def save(self, filename: str, data: bytes) -> None:
+        self.files[filename] = data
+        self.saved_files.append((filename, data))
+
+
+def test_init_app_uses_configured_secret_key(monkeypatch: pytest.MonkeyPatch) -> None:
+    secret_key = "configured-secret-key"
+    storage = InMemoryStorage()
+    monkeypatch.setattr("extensions.ext_set_secretkey.dify_config.SECRET_KEY", secret_key)
+    monkeypatch.setattr("configs.secret_key.storage", storage)
+    app = Flask(__name__)
+    app.config["SECRET_KEY"] = secret_key
+
+    ext_set_secretkey.init_app(app)
+
+    assert app.secret_key == secret_key
+    assert app.config["SECRET_KEY"] == secret_key
+    assert storage.saved_files == []
+
+
+def test_init_app_generates_and_persists_secret_key_when_missing(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    storage = InMemoryStorage()
+    monkeypatch.setattr("extensions.ext_set_secretkey.dify_config.SECRET_KEY", "")
+    monkeypatch.setattr("configs.secret_key.storage", storage)
+    app = Flask(__name__)
+    app.config["SECRET_KEY"] = ""
+
+    ext_set_secretkey.init_app(app)
+
+    persisted_key = storage.files[".dify_secret_key"].decode("utf-8").strip()
+    assert persisted_key
+    assert storage.saved_files == [(".dify_secret_key", f"{persisted_key}\n".encode())]
+    assert persisted_key == ext_set_secretkey.dify_config.SECRET_KEY
+    assert persisted_key == app.config["SECRET_KEY"]
+    assert persisted_key == app.secret_key
+
+
+def test_init_app_reuses_persisted_secret_key_when_missing(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    persisted_key = "persisted-secret-key"
+    storage = InMemoryStorage({".dify_secret_key": f"{persisted_key}\n".encode()})
+    monkeypatch.setattr("extensions.ext_set_secretkey.dify_config.SECRET_KEY", "")
+    monkeypatch.setattr("configs.secret_key.storage", storage)
+    app = Flask(__name__)
+    app.config["SECRET_KEY"] = ""
+
+    ext_set_secretkey.init_app(app)
+
+    assert persisted_key == ext_set_secretkey.dify_config.SECRET_KEY
+    assert persisted_key == app.config["SECRET_KEY"]
+    assert persisted_key == app.secret_key
+    assert storage.saved_files == []
diff --git a/api/tests/unit_tests/factories/test_file_factory.py b/api/tests/unit_tests/factories/test_file_factory.py
index c2835c4124..293be925ae 100644
--- a/api/tests/unit_tests/factories/test_file_factory.py
+++ b/api/tests/unit_tests/factories/test_file_factory.py
@@ -1,8 +1,11 @@
 import re
+from unittest.mock import MagicMock
 
 import pytest
 
+from factories.file_factory import builders
 from factories.file_factory.remote import extract_filename, get_remote_file_info
+from graphon.file import FileTransferMethod
 
 
 class _FakeResponse:
@@ -291,3 +294,92 @@ class TestExtractFilename:
         """Test bare path (not full URL) with query string."""
         result = extract_filename("/path/to/file.txt?extra=params", None)
         assert result == "file.txt"
+
+
+class TestBuildFromDatasourceFile:
+    """Tests for _build_from_datasource_file extension handling."""
+
+    @staticmethod
+    def _patch_session(monkeypatch: pytest.MonkeyPatch, datasource_file):
+        """Stub session_factory.create_session() so it returns the given UploadFile-shaped record."""
+        session = MagicMock()
+        session.scalar.return_value = datasource_file
+        ctx = MagicMock()
+        ctx.__enter__ = MagicMock(return_value=session)
+        ctx.__exit__ = MagicMock(return_value=False)
+        monkeypatch.setattr(builders.session_factory, "create_session", lambda: ctx)
+
+    def _make_datasource_file(self, *, key: str, mime_type: str = "text/csv"):
+        f = MagicMock()
+        f.id = "file-id"
+        f.key = key
+        f.name = key.split("/")[-1]
+        f.mime_type = mime_type
+        f.size = 123
+        f.source_url = f"https://example.com/{key}"
+        return f
+
+    def test_extension_passed_without_doubled_dot(self, monkeypatch: pytest.MonkeyPatch):
+        """Regression: standardize_file_type must receive the extension exactly once-prefixed.
+
+        Previously the call was ``standardize_file_type(extension="." + extension, ...)`` while
+        ``extension`` already had a leading dot, producing ``"..csv"``. The mitigating
+        ``lstrip(".")`` inside ``standardize_file_type`` masked the bug from end users, but the
+        argument shape itself was wrong and showed up in any caller that didn't strip dots.
+        """
+        captured: dict = {}
+
+        def fake_standardize(*, extension: str = "", mime_type: str = ""):
+            from graphon.file import FileType
+
+            captured["extension"] = extension
+            captured["mime_type"] = mime_type
+            return FileType.DOCUMENT
+
+        monkeypatch.setattr(builders, "standardize_file_type", fake_standardize)
+
+        datasource_file = self._make_datasource_file(key="folder/data.csv", mime_type="text/csv")
+        self._patch_session(monkeypatch, datasource_file)
+
+        access_controller = MagicMock()
+        access_controller.apply_upload_file_filters = lambda stmt: stmt
+
+        file = builders._build_from_datasource_file(
+            mapping={"datasource_file_id": "file-id", "transfer_method": "datasource_file"},
+            tenant_id="tenant-id",
+            transfer_method=FileTransferMethod.DATASOURCE_FILE,
+            access_controller=access_controller,
+        )
+
+        assert captured["extension"] == ".csv", (
+            f"standardize_file_type received {captured['extension']!r}; expected single-dot '.csv'"
+        )
+        assert captured["mime_type"] == "text/csv"
+        assert file.extension == ".csv"
+
+    def test_extension_falls_back_to_bin_when_key_has_no_dot(self, monkeypatch: pytest.MonkeyPatch):
+        captured: dict = {}
+
+        def fake_standardize(*, extension: str = "", mime_type: str = ""):
+            from graphon.file import FileType
+
+            captured["extension"] = extension
+            return FileType.CUSTOM
+
+        monkeypatch.setattr(builders, "standardize_file_type", fake_standardize)
+
+        datasource_file = self._make_datasource_file(key="dotless-key", mime_type="application/octet-stream")
+        self._patch_session(monkeypatch, datasource_file)
+
+        access_controller = MagicMock()
+        access_controller.apply_upload_file_filters = lambda stmt: stmt
+
+        file = builders._build_from_datasource_file(
+            mapping={"datasource_file_id": "file-id", "transfer_method": "datasource_file"},
+            tenant_id="tenant-id",
+            transfer_method=FileTransferMethod.DATASOURCE_FILE,
+            access_controller=access_controller,
+        )
+
+        assert captured["extension"] == ".bin"
+        assert file.extension == ".bin"
diff --git a/api/tests/unit_tests/factories/test_file_validation.py b/api/tests/unit_tests/factories/test_file_validation.py
new file mode 100644
index 0000000000..61337fcf10
--- /dev/null
+++ b/api/tests/unit_tests/factories/test_file_validation.py
@@ -0,0 +1,159 @@
+"""Unit tests for is_file_valid_with_config."""
+
+from __future__ import annotations
+
+import pytest
+
+from factories.file_factory.validation import is_file_valid_with_config
+from graphon.file import FileTransferMethod, FileType, FileUploadConfig
+
+
+def _validate(
+    *,
+    input_file_type: str,
+    file_extension: str = ".png",
+    file_transfer_method: FileTransferMethod = FileTransferMethod.LOCAL_FILE,
+    config: FileUploadConfig,
+) -> bool:
+    return is_file_valid_with_config(
+        input_file_type=input_file_type,
+        file_extension=file_extension,
+        file_transfer_method=file_transfer_method,
+        config=config,
+    )
+
+
+@pytest.mark.parametrize(
+    ("input_file_type", "file_extension", "allowed_file_types", "allowed_file_extensions", "expected"),
+    [
+        # round-1 happy path: literal "custom" mapping, ext whitelisted
+        ("custom", ".png", [FileType.CUSTOM], [".png"], True),
+        # round-2 replay: MessageFile.type is the resolved type, but config still allows CUSTOM
+        ("image", ".png", [FileType.CUSTOM], [".png"], True),
+        ("document", ".pdf", [FileType.CUSTOM], [".pdf"], True),
+        # mixed bucket [IMAGE, CUSTOM]: document falls into CUSTOM bucket via extension
+        ("document", ".pdf", [FileType.IMAGE, FileType.CUSTOM], [".pdf"], True),
+        ("document", ".exe", [FileType.IMAGE, FileType.CUSTOM], [".pdf"], False),
+        ("image", ".jpg", [FileType.IMAGE], [], True),
+        ("video", ".mp4", [FileType.IMAGE, FileType.DOCUMENT], [], False),
+        ("custom", ".exe", [FileType.CUSTOM], [".png"], False),
+        # empty allowed_file_types == no type restriction
+        ("video", ".mp4", [], [], True),
+    ],
+)
+def test_bucket_semantics(input_file_type, file_extension, allowed_file_types, allowed_file_extensions, expected):
+    config = FileUploadConfig(
+        allowed_file_types=allowed_file_types,
+        allowed_file_extensions=allowed_file_extensions,
+    )
+    assert _validate(input_file_type=input_file_type, file_extension=file_extension, config=config) is expected
+
+
+@pytest.mark.parametrize("whitelist_entry", [".png", ".PNG", "png", "PNG", " .Png ", "PnG"])
+def test_extension_match_is_case_and_dot_insensitive(whitelist_entry):
+    config = FileUploadConfig(
+        allowed_file_types=[FileType.CUSTOM],
+        allowed_file_extensions=[whitelist_entry],
+    )
+    assert _validate(input_file_type="custom", file_extension=".png", config=config) is True
+
+
+def test_extension_mismatch_still_rejected_after_normalization():
+    config = FileUploadConfig(
+        allowed_file_types=[FileType.CUSTOM],
+        allowed_file_extensions=[".png", ".jpg"],
+    )
+    assert _validate(input_file_type="custom", file_extension=".pdf", config=config) is False
+
+
+def test_mixed_case_whitelist_replicating_real_user_config():
+    config = FileUploadConfig(
+        allowed_file_types=[FileType.CUSTOM],
+        allowed_file_extensions=[".PNG", "png", "JPG", ".WEBP", "SVG", "GIF"],
+    )
+    for ext in (".png", ".jpg", ".webp", ".svg", ".gif"):
+        assert _validate(input_file_type="custom", file_extension=ext, config=config) is True
+
+
+def test_tool_file_always_passes():
+    config = FileUploadConfig(allowed_file_types=[FileType.CUSTOM], allowed_file_extensions=[".pdf"])
+    assert (
+        _validate(
+            input_file_type="image",
+            file_extension=".png",
+            file_transfer_method=FileTransferMethod.TOOL_FILE,
+            config=config,
+        )
+        is True
+    )
+
+
+def test_transfer_method_gate_for_non_image():
+    config = FileUploadConfig(
+        allowed_file_types=[FileType.DOCUMENT],
+        allowed_file_upload_methods=[FileTransferMethod.LOCAL_FILE],
+    )
+    assert (
+        _validate(
+            input_file_type="document",
+            file_extension=".pdf",
+            file_transfer_method=FileTransferMethod.LOCAL_FILE,
+            config=config,
+        )
+        is True
+    )
+    assert (
+        _validate(
+            input_file_type="document",
+            file_extension=".pdf",
+            file_transfer_method=FileTransferMethod.REMOTE_URL,
+            config=config,
+        )
+        is False
+    )
+
+
+def test_history_replay_matches_round_1_outcome_under_unchanged_config():
+    """A file that passes round 1 must pass history replay when config is unchanged."""
+    config = FileUploadConfig(
+        allowed_file_types=[FileType.CUSTOM],
+        allowed_file_extensions=[".png"],
+    )
+    assert _validate(input_file_type="custom", file_extension=".png", config=config) is True
+    assert _validate(input_file_type="image", file_extension=".png", config=config) is True
+
+
+def test_empty_whitelist_in_custom_bucket_denies_by_default():
+    """Defensive: when a file lands in the CUSTOM bucket, an empty
+    allowed_file_extensions list rejects. The UI never submits empty;
+    this guards DSL / API paths that bypass the UI from accidentally
+    widening what's accepted."""
+    config = FileUploadConfig(
+        allowed_file_types=[FileType.CUSTOM],
+        allowed_file_extensions=[],
+    )
+    assert _validate(input_file_type="custom", file_extension=".png", config=config) is False
+    assert _validate(input_file_type="image", file_extension=".png", config=config) is False
+
+
+def test_normalize_handles_whitespace_and_empty_consistently():
+    """Whitespace-only or empty entries in the whitelist must not match real
+    extensions (regression guard for _normalize_extension edge cases)."""
+    for noisy_entry in ("", "   ", "\t"):
+        config = FileUploadConfig(
+            allowed_file_types=[FileType.CUSTOM],
+            allowed_file_extensions=[noisy_entry],
+        )
+        assert _validate(input_file_type="custom", file_extension=".png", config=config) is False
+
+
+def test_empty_extension_does_not_spuriously_match_empty_whitelist_entry():
+    """Defensive: even if the whitelist contains an empty / whitespace entry
+    (e.g., a stray comma in DSL), an extensionless file must not pass via
+    a both-sides-empty match. Real entries in the same whitelist still match."""
+    config = FileUploadConfig(
+        allowed_file_types=[FileType.CUSTOM],
+        allowed_file_extensions=["", ".png"],
+    )
+    assert _validate(input_file_type="custom", file_extension=".png", config=config) is True
+    assert _validate(input_file_type="custom", file_extension="", config=config) is False
diff --git a/api/tests/unit_tests/libs/_human_input/support.py b/api/tests/unit_tests/libs/_human_input/support.py
index e6cc23161e..6616cec9b8 100644
--- a/api/tests/unit_tests/libs/_human_input/support.py
+++ b/api/tests/unit_tests/libs/_human_input/support.py
@@ -4,7 +4,7 @@ from dataclasses import dataclass, field
 from datetime import datetime, timedelta
 from typing import Any
 
-from graphon.nodes.human_input.entities import FormInput
+from graphon.nodes.human_input.entities import ParagraphInputConfig
 from graphon.nodes.human_input.enums import TimeoutUnit
 from libs.datetime_utils import naive_utc_now
 
@@ -45,7 +45,7 @@ class HumanInputForm:
     tenant_id: str
     app_id: str | None
     form_content: str
-    inputs: list[FormInput]
+    inputs: list[ParagraphInputConfig]
     user_actions: list[dict[str, Any]]
     timeout: int
     timeout_unit: TimeoutUnit
diff --git a/api/tests/unit_tests/libs/_human_input/test_form_service.py b/api/tests/unit_tests/libs/_human_input/test_form_service.py
index fa2c02020b..cb4c2715d0 100644
--- a/api/tests/unit_tests/libs/_human_input/test_form_service.py
+++ b/api/tests/unit_tests/libs/_human_input/test_form_service.py
@@ -7,8 +7,8 @@ from datetime import timedelta
 import pytest
 
 from graphon.nodes.human_input.entities import (
-    FormInput,
-    UserAction,
+    ParagraphInputConfig,
+    UserActionConfig,
 )
 from graphon.nodes.human_input.enums import (
     FormInputType,
@@ -50,8 +50,8 @@ class TestFormService:
             "tenant_id": "tenant-abc",
             "app_id": "app-def",
             "form_content": "# Test Form\n\nInput: {{#$output.input#}}",
-            "inputs": [FormInput(type=FormInputType.TEXT_INPUT, output_variable_name="input", default=None)],
-            "user_actions": [UserAction(id="submit", title="Submit")],
+            "inputs": [ParagraphInputConfig(type=FormInputType.PARAGRAPH, output_variable_name="input", default=None)],
+            "user_actions": [UserActionConfig(id="submit", title="Submit")],
             "timeout": 1,
             "timeout_unit": TimeoutUnit.HOUR,
             "form_token": "token-xyz",
@@ -304,8 +304,10 @@ class TestFormValidation:
             "tenant_id": "tenant-abc",
             "app_id": "app-def",
             "form_content": "Test form",
-            "inputs": [FormInput(type=FormInputType.TEXT_INPUT, output_variable_name="required_input", default=None)],
-            "user_actions": [UserAction(id="submit", title="Submit")],
+            "inputs": [
+                ParagraphInputConfig(type=FormInputType.PARAGRAPH, output_variable_name="required_input", default=None)
+            ],
+            "user_actions": [UserActionConfig(id="submit", title="Submit")],
             "timeout": 1,
             "timeout_unit": TimeoutUnit.HOUR,
         }
diff --git a/api/tests/unit_tests/libs/_human_input/test_models.py b/api/tests/unit_tests/libs/_human_input/test_models.py
index 866ee61b3e..1413eed51f 100644
--- a/api/tests/unit_tests/libs/_human_input/test_models.py
+++ b/api/tests/unit_tests/libs/_human_input/test_models.py
@@ -7,8 +7,8 @@ from datetime import datetime, timedelta
 import pytest
 
 from graphon.nodes.human_input.entities import (
-    FormInput,
-    UserAction,
+    ParagraphInputConfig,
+    UserActionConfig,
 )
 from graphon.nodes.human_input.enums import (
     FormInputType,
@@ -32,8 +32,8 @@ class TestHumanInputForm:
             "tenant_id": "tenant-abc",
             "app_id": "app-def",
             "form_content": "# Test Form\n\nInput: {{#$output.input#}}",
-            "inputs": [FormInput(type=FormInputType.TEXT_INPUT, output_variable_name="input", default=None)],
-            "user_actions": [UserAction(id="submit", title="Submit")],
+            "inputs": [ParagraphInputConfig(type=FormInputType.PARAGRAPH, output_variable_name="input", default=None)],
+            "user_actions": [UserActionConfig(id="submit", title="Submit")],
             "timeout": 2,
             "timeout_unit": TimeoutUnit.HOUR,
             "form_token": "token-xyz",
@@ -132,7 +132,7 @@ class TestHumanInputForm:
         assert "site" not in response
         assert response["form_content"] == "# Test Form\n\nInput: {{#$output.input#}}"
         assert len(response["inputs"]) == 1
-        assert response["inputs"][0]["type"] == "text-input"
+        assert response["inputs"][0]["type"] == "paragraph"
         assert response["inputs"][0]["output_variable_name"] == "input"
 
     def test_form_to_response_dict_with_site_info(self, sample_form_data):
diff --git a/api/tests/unit_tests/libs/broadcast_channel/redis/test_channel_unit_tests.py b/api/tests/unit_tests/libs/broadcast_channel/redis/test_channel_unit_tests.py
index 8bef01c1ed..7c7f20374e 100644
--- a/api/tests/unit_tests/libs/broadcast_channel/redis/test_channel_unit_tests.py
+++ b/api/tests/unit_tests/libs/broadcast_channel/redis/test_channel_unit_tests.py
@@ -673,7 +673,7 @@ class TestRedisShardedSubscription:
     """Test cases for the _RedisShardedSubscription class."""
 
     @pytest.fixture(autouse=True)
-    def patch_sharded_redis_type(self, monkeypatch):
+    def patch_sharded_redis_type(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr("libs.broadcast_channel.redis.sharded_channel.Redis", FakeRedisClient)
 
     @pytest.fixture
@@ -889,7 +889,9 @@ class TestRedisShardedSubscription:
         assert not sharded_subscription._queue.empty()
         assert sharded_subscription._queue.get_nowait() == b"test sharded payload"
 
-    def test_get_message_uses_target_node_for_cluster_client(self, mock_pubsub: MagicMock, monkeypatch):
+    def test_get_message_uses_target_node_for_cluster_client(
+        self, mock_pubsub: MagicMock, monkeypatch: pytest.MonkeyPatch
+    ):
         """Test that cluster clients use target_node for sharded messages."""
 
         class DummyRedisCluster:
@@ -1177,7 +1179,7 @@ class TestRedisSubscriptionCommon:
         return request.param
 
     @pytest.fixture(autouse=True)
-    def patch_sharded_redis_type(self, monkeypatch):
+    def patch_sharded_redis_type(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr("libs.broadcast_channel.redis.sharded_channel.Redis", FakeRedisClient)
 
     @pytest.fixture
diff --git a/api/tests/unit_tests/libs/test_archive_storage.py b/api/tests/unit_tests/libs/test_archive_storage.py
index de3c9c4737..4363c23571 100644
--- a/api/tests/unit_tests/libs/test_archive_storage.py
+++ b/api/tests/unit_tests/libs/test_archive_storage.py
@@ -34,7 +34,7 @@ def _client_error(code: str) -> ClientError:
     return ClientError({"Error": {"Code": code}}, "Operation")
 
 
-def _mock_client(monkeypatch):
+def _mock_client(monkeypatch: pytest.MonkeyPatch):
     client = MagicMock()
     client.head_bucket.return_value = None
     # Configure put_object to return a proper ETag that matches the MD5 hash
@@ -56,19 +56,19 @@ def _mock_client(monkeypatch):
     return client, boto_client
 
 
-def test_init_disabled(monkeypatch):
+def test_init_disabled(monkeypatch: pytest.MonkeyPatch):
     _configure_storage(monkeypatch, ARCHIVE_STORAGE_ENABLED=False)
     with pytest.raises(ArchiveStorageNotConfiguredError, match="not enabled"):
         ArchiveStorage(bucket=BUCKET_NAME)
 
 
-def test_init_missing_config(monkeypatch):
+def test_init_missing_config(monkeypatch: pytest.MonkeyPatch):
     _configure_storage(monkeypatch, ARCHIVE_STORAGE_ENDPOINT=None)
     with pytest.raises(ArchiveStorageNotConfiguredError, match="incomplete"):
         ArchiveStorage(bucket=BUCKET_NAME)
 
 
-def test_init_bucket_not_found(monkeypatch):
+def test_init_bucket_not_found(monkeypatch: pytest.MonkeyPatch):
     _configure_storage(monkeypatch)
     client, _ = _mock_client(monkeypatch)
     client.head_bucket.side_effect = _client_error("404")
@@ -77,7 +77,7 @@ def test_init_bucket_not_found(monkeypatch):
         ArchiveStorage(bucket=BUCKET_NAME)
 
 
-def test_init_bucket_access_denied(monkeypatch):
+def test_init_bucket_access_denied(monkeypatch: pytest.MonkeyPatch):
     _configure_storage(monkeypatch)
     client, _ = _mock_client(monkeypatch)
     client.head_bucket.side_effect = _client_error("403")
@@ -86,7 +86,7 @@ def test_init_bucket_access_denied(monkeypatch):
         ArchiveStorage(bucket=BUCKET_NAME)
 
 
-def test_init_bucket_other_error(monkeypatch):
+def test_init_bucket_other_error(monkeypatch: pytest.MonkeyPatch):
     _configure_storage(monkeypatch)
     client, _ = _mock_client(monkeypatch)
     client.head_bucket.side_effect = _client_error("500")
@@ -95,7 +95,7 @@ def test_init_bucket_other_error(monkeypatch):
         ArchiveStorage(bucket=BUCKET_NAME)
 
 
-def test_init_sets_client(monkeypatch):
+def test_init_sets_client(monkeypatch: pytest.MonkeyPatch):
     _configure_storage(monkeypatch)
     client, boto_client = _mock_client(monkeypatch)
 
@@ -113,7 +113,7 @@ def test_init_sets_client(monkeypatch):
     assert storage.bucket == BUCKET_NAME
 
 
-def test_put_object_returns_checksum(monkeypatch):
+def test_put_object_returns_checksum(monkeypatch: pytest.MonkeyPatch):
     _configure_storage(monkeypatch)
     client, _ = _mock_client(monkeypatch)
     storage = ArchiveStorage(bucket=BUCKET_NAME)
@@ -132,7 +132,7 @@ def test_put_object_returns_checksum(monkeypatch):
     assert checksum == expected_md5
 
 
-def test_put_object_raises_on_error(monkeypatch):
+def test_put_object_raises_on_error(monkeypatch: pytest.MonkeyPatch):
     _configure_storage(monkeypatch)
     client, _ = _mock_client(monkeypatch)
     storage = ArchiveStorage(bucket=BUCKET_NAME)
@@ -142,7 +142,7 @@ def test_put_object_raises_on_error(monkeypatch):
         storage.put_object("key", b"data")
 
 
-def test_get_object_returns_bytes(monkeypatch):
+def test_get_object_returns_bytes(monkeypatch: pytest.MonkeyPatch):
     _configure_storage(monkeypatch)
     client, _ = _mock_client(monkeypatch)
     body = MagicMock()
@@ -153,7 +153,7 @@ def test_get_object_returns_bytes(monkeypatch):
     assert storage.get_object("key") == b"payload"
 
 
-def test_get_object_missing(monkeypatch):
+def test_get_object_missing(monkeypatch: pytest.MonkeyPatch):
     _configure_storage(monkeypatch)
     client, _ = _mock_client(monkeypatch)
     client.get_object.side_effect = _client_error("NoSuchKey")
@@ -163,7 +163,7 @@ def test_get_object_missing(monkeypatch):
         storage.get_object("missing")
 
 
-def test_get_object_stream(monkeypatch):
+def test_get_object_stream(monkeypatch: pytest.MonkeyPatch):
     _configure_storage(monkeypatch)
     client, _ = _mock_client(monkeypatch)
     body = MagicMock()
@@ -174,7 +174,7 @@ def test_get_object_stream(monkeypatch):
     assert list(storage.get_object_stream("key")) == [b"a", b"b"]
 
 
-def test_get_object_stream_missing(monkeypatch):
+def test_get_object_stream_missing(monkeypatch: pytest.MonkeyPatch):
     _configure_storage(monkeypatch)
     client, _ = _mock_client(monkeypatch)
     client.get_object.side_effect = _client_error("NoSuchKey")
@@ -184,7 +184,7 @@ def test_get_object_stream_missing(monkeypatch):
         list(storage.get_object_stream("missing"))
 
 
-def test_object_exists(monkeypatch):
+def test_object_exists(monkeypatch: pytest.MonkeyPatch):
     _configure_storage(monkeypatch)
     client, _ = _mock_client(monkeypatch)
     storage = ArchiveStorage(bucket=BUCKET_NAME)
@@ -194,7 +194,7 @@ def test_object_exists(monkeypatch):
     assert storage.object_exists("missing") is False
 
 
-def test_delete_object_error(monkeypatch):
+def test_delete_object_error(monkeypatch: pytest.MonkeyPatch):
     _configure_storage(monkeypatch)
     client, _ = _mock_client(monkeypatch)
     client.delete_object.side_effect = _client_error("500")
@@ -204,7 +204,7 @@ def test_delete_object_error(monkeypatch):
         storage.delete_object("key")
 
 
-def test_list_objects(monkeypatch):
+def test_list_objects(monkeypatch: pytest.MonkeyPatch):
     _configure_storage(monkeypatch)
     client, _ = _mock_client(monkeypatch)
     paginator = MagicMock()
@@ -219,7 +219,7 @@ def test_list_objects(monkeypatch):
     paginator.paginate.assert_called_once_with(Bucket="archive-bucket", Prefix="prefix")
 
 
-def test_list_objects_error(monkeypatch):
+def test_list_objects_error(monkeypatch: pytest.MonkeyPatch):
     _configure_storage(monkeypatch)
     client, _ = _mock_client(monkeypatch)
     paginator = MagicMock()
@@ -231,7 +231,7 @@ def test_list_objects_error(monkeypatch):
         storage.list_objects("prefix")
 
 
-def test_generate_presigned_url(monkeypatch):
+def test_generate_presigned_url(monkeypatch: pytest.MonkeyPatch):
     _configure_storage(monkeypatch)
     client, _ = _mock_client(monkeypatch)
     client.generate_presigned_url.return_value = "http://signed-url"
@@ -247,7 +247,7 @@ def test_generate_presigned_url(monkeypatch):
     assert url == "http://signed-url"
 
 
-def test_generate_presigned_url_error(monkeypatch):
+def test_generate_presigned_url_error(monkeypatch: pytest.MonkeyPatch):
     _configure_storage(monkeypatch)
     client, _ = _mock_client(monkeypatch)
     client.generate_presigned_url.side_effect = _client_error("500")
diff --git a/api/tests/unit_tests/libs/test_oauth_base.py b/api/tests/unit_tests/libs/test_oauth_base.py
index 7b7f086dac..1c0066ed9a 100644
--- a/api/tests/unit_tests/libs/test_oauth_base.py
+++ b/api/tests/unit_tests/libs/test_oauth_base.py
@@ -1,6 +1,6 @@
 import pytest
 
-from libs.oauth import OAuth
+from libs.oauth import OAuth, decode_oauth_state, encode_oauth_state
 
 
 def test_oauth_base_methods_raise_not_implemented():
@@ -17,3 +17,17 @@ def test_oauth_base_methods_raise_not_implemented():
 
     with pytest.raises(NotImplementedError):
         oauth._transform_user_info({})
+
+
+def test_oauth_state_round_trips_invite_token_timezone_and_language():
+    state = encode_oauth_state(invite_token="invite-123", timezone="Asia/Shanghai", language="zh-Hans")
+
+    assert decode_oauth_state(state) == {
+        "invite_token": "invite-123",
+        "timezone": "Asia/Shanghai",
+        "language": "zh-Hans",
+    }
+
+
+def test_oauth_state_returns_empty_payload_for_invalid_state():
+    assert decode_oauth_state("invalid-state") == {}
diff --git a/api/tests/unit_tests/libs/test_oauth_clients.py b/api/tests/unit_tests/libs/test_oauth_clients.py
index 830284e697..b3ecc5a06d 100644
--- a/api/tests/unit_tests/libs/test_oauth_clients.py
+++ b/api/tests/unit_tests/libs/test_oauth_clients.py
@@ -4,7 +4,7 @@ from unittest.mock import MagicMock, patch
 import httpx
 import pytest
 
-from libs.oauth import GitHubOAuth, GoogleOAuth, OAuthUserInfo
+from libs.oauth import GitHubOAuth, GoogleOAuth, OAuthUserInfo, decode_oauth_state
 
 
 class BaseOAuthTest:
@@ -37,15 +37,25 @@ class TestGitHubOAuth(BaseOAuthTest):
         return GitHubOAuth(oauth_config["client_id"], oauth_config["client_secret"], oauth_config["redirect_uri"])
 
     @pytest.mark.parametrize(
-        ("invite_token", "expected_state"),
+        ("invite_token", "timezone", "language", "expected_state"),
         [
-            (None, None),
-            ("test_invite_token", "test_invite_token"),
-            ("", None),
+            (None, None, None, None),
+            ("test_invite_token", None, None, {"invite_token": "test_invite_token"}),
+            ("", None, None, None),
+            (None, "Asia/Shanghai", None, {"timezone": "Asia/Shanghai"}),
+            (None, None, "zh-Hans", {"language": "zh-Hans"}),
+            (
+                "test_invite_token",
+                "Asia/Shanghai",
+                "zh-Hans",
+                {"invite_token": "test_invite_token", "timezone": "Asia/Shanghai", "language": "zh-Hans"},
+            ),
         ],
     )
-    def test_should_generate_authorization_url_correctly(self, oauth, oauth_config, invite_token, expected_state):
-        url = oauth.get_authorization_url(invite_token)
+    def test_should_generate_authorization_url_correctly(
+        self, oauth, oauth_config, invite_token, timezone, language, expected_state
+    ):
+        url = oauth.get_authorization_url(invite_token, timezone=timezone, language=language)
         parsed, params = self.parse_auth_url(url)
 
         assert parsed.scheme == "https"
@@ -56,7 +66,7 @@ class TestGitHubOAuth(BaseOAuthTest):
         assert params["scope"][0] == "user:email"
 
         if expected_state:
-            assert params["state"][0] == expected_state
+            assert decode_oauth_state(params["state"][0]) == expected_state
         else:
             assert "state" not in params
 
@@ -208,15 +218,25 @@ class TestGoogleOAuth(BaseOAuthTest):
         return GoogleOAuth(oauth_config["client_id"], oauth_config["client_secret"], oauth_config["redirect_uri"])
 
     @pytest.mark.parametrize(
-        ("invite_token", "expected_state"),
+        ("invite_token", "timezone", "language", "expected_state"),
         [
-            (None, None),
-            ("test_invite_token", "test_invite_token"),
-            ("", None),
+            (None, None, None, None),
+            ("test_invite_token", None, None, {"invite_token": "test_invite_token"}),
+            ("", None, None, None),
+            (None, "Asia/Shanghai", None, {"timezone": "Asia/Shanghai"}),
+            (None, None, "zh-Hans", {"language": "zh-Hans"}),
+            (
+                "test_invite_token",
+                "Asia/Shanghai",
+                "zh-Hans",
+                {"invite_token": "test_invite_token", "timezone": "Asia/Shanghai", "language": "zh-Hans"},
+            ),
         ],
     )
-    def test_should_generate_authorization_url_correctly(self, oauth, oauth_config, invite_token, expected_state):
-        url = oauth.get_authorization_url(invite_token)
+    def test_should_generate_authorization_url_correctly(
+        self, oauth, oauth_config, invite_token, timezone, language, expected_state
+    ):
+        url = oauth.get_authorization_url(invite_token, timezone=timezone, language=language)
         parsed, params = self.parse_auth_url(url)
 
         assert parsed.scheme == "https"
@@ -228,7 +248,7 @@ class TestGoogleOAuth(BaseOAuthTest):
         assert params["scope"][0] == "openid email"
 
         if expected_state:
-            assert params["state"][0] == expected_state
+            assert decode_oauth_state(params["state"][0]) == expected_state
         else:
             assert "state" not in params
 
diff --git a/api/tests/unit_tests/libs/test_pandas.py b/api/tests/unit_tests/libs/test_pandas.py
index 21c2f0781d..a4739dbbc2 100644
--- a/api/tests/unit_tests/libs/test_pandas.py
+++ b/api/tests/unit_tests/libs/test_pandas.py
@@ -1,7 +1,8 @@
 import pandas as pd
+import pytest
 
 
-def test_pandas_csv(tmp_path, monkeypatch):
+def test_pandas_csv(tmp_path, monkeypatch: pytest.MonkeyPatch):
     monkeypatch.chdir(tmp_path)
     data = {"col1": [1, 2.2, -3.3, 4.0, 5], "col2": ["A", "B", "C", "D", "E"]}
     df1 = pd.DataFrame(data)
@@ -16,7 +17,7 @@ def test_pandas_csv(tmp_path, monkeypatch):
     assert df2[df2.columns[1]].to_list() == data["col2"]
 
 
-def test_pandas_xlsx(tmp_path, monkeypatch):
+def test_pandas_xlsx(tmp_path, monkeypatch: pytest.MonkeyPatch):
     monkeypatch.chdir(tmp_path)
     data = {"col1": [1, 2.2, -3.3, 4.0, 5], "col2": ["A", "B", "C", "D", "E"]}
     df1 = pd.DataFrame(data)
@@ -31,7 +32,7 @@ def test_pandas_xlsx(tmp_path, monkeypatch):
     assert df2[df2.columns[1]].to_list() == data["col2"]
 
 
-def test_pandas_xlsx_with_sheets(tmp_path, monkeypatch):
+def test_pandas_xlsx_with_sheets(tmp_path, monkeypatch: pytest.MonkeyPatch):
     monkeypatch.chdir(tmp_path)
     data1 = {"col1": [1, 2, 3, 4, 5], "col2": ["A", "B", "C", "D", "E"]}
     df1 = pd.DataFrame(data1)
diff --git a/api/tests/unit_tests/libs/test_passport.py b/api/tests/unit_tests/libs/test_passport.py
index f33484c18d..90b58ae548 100644
--- a/api/tests/unit_tests/libs/test_passport.py
+++ b/api/tests/unit_tests/libs/test_passport.py
@@ -143,28 +143,13 @@ class TestPassportService:
         assert str(exc_info.value) == "401 Unauthorized: Token has expired."
 
     # Configuration tests
-    def test_should_handle_empty_secret_key(self):
-        """Test behavior when SECRET_KEY is empty"""
+    def test_should_use_configured_secret_key_without_policy_validation(self):
+        """Test that policy decisions are owned by config, not PassportService."""
         with patch("libs.passport.dify_config") as mock_config:
-            mock_config.SECRET_KEY = ""
+            mock_config.SECRET_KEY = "configured"
             service = PassportService()
 
-            # Empty secret key should still work but is insecure
-            payload = {"test": "data"}
-            token = service.issue(payload)
-            decoded = service.verify(token)
-            assert decoded == payload
-
-    def test_should_handle_none_secret_key(self):
-        """Test behavior when SECRET_KEY is None"""
-        with patch("libs.passport.dify_config") as mock_config:
-            mock_config.SECRET_KEY = None
-            service = PassportService()
-
-            payload = {"test": "data"}
-            # JWT library will raise TypeError when secret is None
-            with pytest.raises((TypeError, jwt.exceptions.InvalidKeyError)):
-                service.issue(payload)
+        assert service.sk == "configured"
 
     # Boundary condition tests
     def test_should_handle_large_payload(self, passport_service):
diff --git a/api/tests/unit_tests/libs/test_rate_limiter.py b/api/tests/unit_tests/libs/test_rate_limiter.py
index 9d44b07b5e..5052033db8 100644
--- a/api/tests/unit_tests/libs/test_rate_limiter.py
+++ b/api/tests/unit_tests/libs/test_rate_limiter.py
@@ -1,5 +1,7 @@
 from unittest.mock import MagicMock
 
+import pytest
+
 from libs import helper as helper_module
 
 
@@ -31,7 +33,7 @@ class _FakeRedis:
         return True
 
 
-def test_rate_limiter_counts_attempts_within_same_second(monkeypatch):
+def test_rate_limiter_counts_attempts_within_same_second(monkeypatch: pytest.MonkeyPatch):
     fake_redis = _FakeRedis()
     monkeypatch.setattr(helper_module.time, "time", lambda: 1000)
 
@@ -48,7 +50,7 @@ def test_rate_limiter_counts_attempts_within_same_second(monkeypatch):
     assert limiter.is_rate_limited("203.0.113.10") is True
 
 
-def test_rate_limiter_uses_injected_redis(monkeypatch):
+def test_rate_limiter_uses_injected_redis(monkeypatch: pytest.MonkeyPatch):
     redis_client = MagicMock()
     redis_client.zcard.return_value = 1
     monkeypatch.setattr(helper_module.time, "time", lambda: 1000)
diff --git a/api/tests/unit_tests/libs/test_token.py b/api/tests/unit_tests/libs/test_token.py
index 6a65b5faa0..6bd794b24d 100644
--- a/api/tests/unit_tests/libs/test_token.py
+++ b/api/tests/unit_tests/libs/test_token.py
@@ -1,5 +1,8 @@
+from typing import cast
 from unittest.mock import MagicMock
 
+import pytest
+from flask import Request
 from werkzeug.wrappers import Response
 
 from constants import COOKIE_NAME_ACCESS_TOKEN, COOKIE_NAME_WEBAPP_ACCESS_TOKEN
@@ -15,8 +18,8 @@ class MockRequest:
 
 
 def test_extract_access_token():
-    def _mock_request(headers: dict[str, str], cookies: dict[str, str], args: dict[str, str]):
-        return MockRequest(headers, cookies, args)
+    def _mock_request(headers: dict[str, str], cookies: dict[str, str], args: dict[str, str]) -> Request:
+        return cast(Request, MockRequest(headers, cookies, args))
 
     test_cases = [
         (_mock_request({"Authorization": "Bearer 123"}, {}, {}), "123", "123"),
@@ -26,11 +29,11 @@ def test_extract_access_token():
         (_mock_request({}, {COOKIE_NAME_WEBAPP_ACCESS_TOKEN: "123"}, {}), None, "123"),
     ]
     for request, expected_console, expected_webapp in test_cases:
-        assert extract_access_token(request) == expected_console  # pyright: ignore[reportArgumentType]
-        assert extract_webapp_access_token(request) == expected_webapp  # pyright: ignore[reportArgumentType]
+        assert extract_access_token(request) == expected_console
+        assert extract_webapp_access_token(request) == expected_webapp
 
 
-def test_real_cookie_name_uses_host_prefix_without_domain(monkeypatch):
+def test_real_cookie_name_uses_host_prefix_without_domain(monkeypatch: pytest.MonkeyPatch):
     monkeypatch.setattr(token.dify_config, "CONSOLE_WEB_URL", "https://console.example.com", raising=False)
     monkeypatch.setattr(token.dify_config, "CONSOLE_API_URL", "https://api.example.com", raising=False)
     monkeypatch.setattr(token.dify_config, "COOKIE_DOMAIN", "", raising=False)
@@ -38,7 +41,7 @@ def test_real_cookie_name_uses_host_prefix_without_domain(monkeypatch):
     assert token._real_cookie_name("csrf_token") == "__Host-csrf_token"
 
 
-def test_real_cookie_name_without_host_prefix_when_domain_present(monkeypatch):
+def test_real_cookie_name_without_host_prefix_when_domain_present(monkeypatch: pytest.MonkeyPatch):
     monkeypatch.setattr(token.dify_config, "CONSOLE_WEB_URL", "https://console.example.com", raising=False)
     monkeypatch.setattr(token.dify_config, "CONSOLE_API_URL", "https://api.example.com", raising=False)
     monkeypatch.setattr(token.dify_config, "COOKIE_DOMAIN", ".example.com", raising=False)
@@ -46,7 +49,7 @@ def test_real_cookie_name_without_host_prefix_when_domain_present(monkeypatch):
     assert token._real_cookie_name("csrf_token") == "csrf_token"
 
 
-def test_set_csrf_cookie_includes_domain_when_configured(monkeypatch):
+def test_set_csrf_cookie_includes_domain_when_configured(monkeypatch: pytest.MonkeyPatch):
     monkeypatch.setattr(token.dify_config, "CONSOLE_WEB_URL", "https://console.example.com", raising=False)
     monkeypatch.setattr(token.dify_config, "CONSOLE_API_URL", "https://api.example.com", raising=False)
     monkeypatch.setattr(token.dify_config, "COOKIE_DOMAIN", ".example.com", raising=False)
diff --git a/api/tests/unit_tests/libs/test_token_manager.py b/api/tests/unit_tests/libs/test_token_manager.py
new file mode 100644
index 0000000000..832210c7f2
--- /dev/null
+++ b/api/tests/unit_tests/libs/test_token_manager.py
@@ -0,0 +1,58 @@
+"""
+Regression tests for the `_TokenData` TypedDict used by
+`libs.helper.TokenManager`.
+
+These tests guard the contract that every field a caller writes via
+`generate_token` survives the TypedDict-validated round-trip performed
+by `get_token_data`. Specifically, the `phase` field that the console
+and web `forgot-password` + `change-email` controllers depend on for
+the security check introduced in PR #35425 (GHSA-4q3w-q5mc-45rq) must
+be preserved — otherwise downstream `if data.get("phase", "") != "reset"`
+checks always fail with `InvalidTokenError`.
+"""
+
+import json
+
+# pyright: reportPrivateUsage=false
+from libs.helper import _token_data_adapter
+
+
+def test_token_data_adapter_preserves_phase_field() -> None:
+    """`phase` written by callers like generate_reset_password_token must
+    survive the TypedDict-validated round-trip in get_token_data.
+
+    Regression: PR #34380 introduced `_TokenData` but did not list
+    `phase`, so the TypeAdapter silently dropped it and the security
+    gate from PR #35425 (GHSA-4q3w-q5mc-45rq) always failed.
+    """
+    payload = {
+        "account_id": None,
+        "email": "user@example.com",
+        "token_type": "reset_password",
+        "code": "123456",
+        "phase": "reset",
+    }
+    data = dict(_token_data_adapter.validate_json(json.dumps(payload)))
+
+    assert data.get("phase") == "reset", (
+        "phase field was stripped by the _TokenData TypedDict adapter; "
+        "the forgot-password phase-bound check (PR #35425) will always fail."
+    )
+
+
+def test_token_data_adapter_preserves_change_email_payload() -> None:
+    """Sanity round-trip for the change-email flow: every field set by
+    `generate_change_email_token` must come back, including the phase
+    string the controller branches on."""
+    payload = {
+        "account_id": "acc-1",
+        "email": "new@example.com",
+        "token_type": "change_email",
+        "code": "654321",
+        "old_email": "old@example.com",
+        "phase": "verify_old_email",
+    }
+    data = dict(_token_data_adapter.validate_json(json.dumps(payload)))
+
+    assert data.get("old_email") == "old@example.com"
+    assert data.get("phase") == "verify_old_email"
diff --git a/api/tests/unit_tests/models/test_comment_models.py b/api/tests/unit_tests/models/test_comment_models.py
index 277335cbef..8c8985aff8 100644
--- a/api/tests/unit_tests/models/test_comment_models.py
+++ b/api/tests/unit_tests/models/test_comment_models.py
@@ -4,7 +4,15 @@ from models.comment import WorkflowComment, WorkflowCommentMention, WorkflowComm
 
 
 def test_workflow_comment_account_properties_and_cache() -> None:
-    comment = WorkflowComment(created_by="user-1", resolved_by="user-2", content="hello", position_x=1, position_y=2)
+    comment = WorkflowComment(
+        created_by="user-1",
+        resolved_by="user-2",
+        content="hello",
+        position_x=1,
+        position_y=2,
+        tenant_id="xxx",
+        app_id="yyy",
+    )
     created_account = Mock(id="user-1")
     resolved_account = Mock(id="user-2")
 
@@ -21,6 +29,8 @@ def test_workflow_comment_account_properties_and_cache() -> None:
         get_mock.assert_not_called()
 
     comment_without_resolver = WorkflowComment(
+        tenant_id="xxx",
+        app_id="yyy",
         created_by="user-1",
         resolved_by=None,
         content="hello",
@@ -37,7 +47,15 @@ def test_workflow_comment_counts_and_participants() -> None:
     reply_2 = WorkflowCommentReply(comment_id="comment-1", content="reply-2", created_by="user-2")
     mention_1 = WorkflowCommentMention(comment_id="comment-1", mentioned_user_id="user-3")
     mention_2 = WorkflowCommentMention(comment_id="comment-1", mentioned_user_id="user-4")
-    comment = WorkflowComment(created_by="user-1", resolved_by=None, content="hello", position_x=1, position_y=2)
+    comment = WorkflowComment(
+        created_by="user-1",
+        resolved_by=None,
+        content="hello",
+        position_x=1,
+        position_y=2,
+        tenant_id="xxx",
+        app_id="yyy",
+    )
     comment.replies = [reply_1, reply_2]
     comment.mentions = [mention_1, mention_2]
 
@@ -63,7 +81,15 @@ def test_workflow_comment_counts_and_participants() -> None:
 def test_workflow_comment_participants_use_cached_accounts() -> None:
     reply = WorkflowCommentReply(comment_id="comment-1", content="reply-1", created_by="user-2")
     mention = WorkflowCommentMention(comment_id="comment-1", mentioned_user_id="user-3")
-    comment = WorkflowComment(created_by="user-1", resolved_by=None, content="hello", position_x=1, position_y=2)
+    comment = WorkflowComment(
+        created_by="user-1",
+        resolved_by=None,
+        content="hello",
+        position_x=1,
+        position_y=2,
+        tenant_id="xxx",
+        app_id="yyy",
+    )
     comment.replies = [reply]
     comment.mentions = [mention]
 
diff --git a/api/tests/unit_tests/models/test_dataset_models.py b/api/tests/unit_tests/models/test_dataset_models.py
index 51d95c4239..f4ccfb4191 100644
--- a/api/tests/unit_tests/models/test_dataset_models.py
+++ b/api/tests/unit_tests/models/test_dataset_models.py
@@ -12,7 +12,9 @@ This test suite covers:
 import json
 import pickle
 from datetime import UTC, datetime
+from types import SimpleNamespace
 from unittest.mock import Mock, patch
+from urllib.parse import parse_qs, urlparse
 from uuid import uuid4
 
 from core.rag.index_processor.constant.index_type import IndexTechniqueType
@@ -676,6 +678,51 @@ class TestDocumentSegmentIndexing:
         # Assert
         assert segment.hit_count == 5
 
+    def test_document_segment_attachments_prefers_files_url_for_source_url(self, monkeypatch):
+        """Test attachment source URLs use FILES_URL before falling back to CONSOLE_API_URL."""
+        # Arrange
+        segment = DocumentSegment(
+            tenant_id="tenant-1",
+            dataset_id="dataset-1",
+            document_id="document-1",
+            position=1,
+            content="Test",
+            word_count=1,
+            tokens=2,
+            created_by="user-1",
+        )
+        segment.id = "segment-1"
+        attachment = SimpleNamespace(
+            id="upload-1",
+            name="image.png",
+            size=128,
+            extension="png",
+            mime_type="image/png",
+        )
+
+        monkeypatch.setattr("models.dataset.time.time", lambda: 1700000000)
+        monkeypatch.setattr("models.dataset.os.urandom", lambda _: b"\x01" * 16)
+        monkeypatch.setattr("models.dataset.dify_config.SECRET_KEY", "unit-secret")
+        monkeypatch.setattr("models.dataset.dify_config.FILES_URL", "https://files.example.com")
+        monkeypatch.setattr("models.dataset.dify_config.CONSOLE_API_URL", "https://console.example.com")
+
+        with patch("models.dataset.db") as mock_db:
+            mock_db.session.execute.return_value.all.return_value = [(Mock(), attachment)]
+
+            # Act
+            attachments = segment.attachments
+
+        # Assert
+        assert len(attachments) == 1
+        source_url = attachments[0]["source_url"]
+        parsed = urlparse(source_url)
+        query = parse_qs(parsed.query)
+        assert parsed.netloc == "files.example.com"
+        assert parsed.path == "/files/upload-1/image-preview"
+        assert query["timestamp"] == ["1700000000"]
+        assert query["nonce"] == ["01010101010101010101010101010101"]
+        assert query["sign"][0]
+
     def test_document_segment_error_tracking(self):
         """Test document segment error tracking."""
         # Arrange
@@ -800,9 +847,7 @@ class TestDatasetProcessRule:
 
         # Act
         process_rule = DatasetProcessRule(
-            dataset_id=dataset_id,
-            mode=ProcessRuleMode.AUTOMATIC,
-            created_by=created_by,
+            dataset_id=dataset_id, mode=ProcessRuleMode.AUTOMATIC, created_by=created_by, rules=None
         )
 
         # Assert
diff --git a/api/tests/unit_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py b/api/tests/unit_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py
index ac4b087b91..8f27d0938d 100644
--- a/api/tests/unit_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py
+++ b/api/tests/unit_tests/repositories/test_sqlalchemy_api_workflow_run_repository.py
@@ -3,7 +3,7 @@ from __future__ import annotations
 from datetime import UTC, datetime
 from types import SimpleNamespace
 
-from graphon.nodes.human_input.entities import FormDefinition, FormInput, UserAction
+from graphon.nodes.human_input.entities import FormDefinition, ParagraphInputConfig, UserActionConfig
 from graphon.nodes.human_input.enums import FormInputType
 from models.human_input import RecipientType
 from repositories.sqlalchemy_api_workflow_run_repository import _build_human_input_required_reason
@@ -13,8 +13,8 @@ def _build_form_model() -> SimpleNamespace:
     expiration_time = datetime(2024, 1, 1, tzinfo=UTC)
     definition = FormDefinition(
         form_content="content",
-        inputs=[FormInput(type=FormInputType.TEXT_INPUT, output_variable_name="name")],
-        user_actions=[UserAction(id="approve", title="Approve")],
+        inputs=[ParagraphInputConfig(type=FormInputType.PARAGRAPH, output_variable_name="name")],
+        user_actions=[UserActionConfig(id="approve", title="Approve")],
         rendered_content="rendered",
         expiration_time=expiration_time,
         default_values={"name": "Alice"},
diff --git a/api/tests/unit_tests/services/controller_api.py b/api/tests/unit_tests/services/controller_api.py
index 762d7b9090..e7f7cabecd 100644
--- a/api/tests/unit_tests/services/controller_api.py
+++ b/api/tests/unit_tests/services/controller_api.py
@@ -146,7 +146,7 @@ class ControllerApiTestDataFactory:
         return app
 
     @staticmethod
-    def create_api_instance(app):
+    def create_api_instance(app: Flask):
         """
         Create a Flask-RESTX API instance.
 
@@ -160,7 +160,12 @@ class ControllerApiTestDataFactory:
         return api
 
     @staticmethod
-    def create_test_client(app, api, resource_class, route):
+    def create_test_client(
+        app: Flask,
+        api: Api,
+        resource_class: type,
+        route: str,
+    ):
         """
         Create a Flask test client with a resource registered.
 
@@ -302,7 +307,7 @@ class TestDatasetListApi:
         return ControllerApiTestDataFactory.create_flask_app()
 
     @pytest.fixture
-    def api(self, app):
+    def api(self, app: Flask):
         """
         Create Flask-RESTX API instance.
 
@@ -311,7 +316,7 @@ class TestDatasetListApi:
         return ControllerApiTestDataFactory.create_api_instance(app)
 
     @pytest.fixture
-    def client(self, app, api):
+    def client(self, app: Flask, api: Api):
         """
         Create test client with DatasetListApi registered.
 
@@ -472,12 +477,12 @@ class TestDatasetApiGet:
         return ControllerApiTestDataFactory.create_flask_app()
 
     @pytest.fixture
-    def api(self, app):
+    def api(self, app: Flask):
         """Create Flask-RESTX API instance."""
         return ControllerApiTestDataFactory.create_api_instance(app)
 
     @pytest.fixture
-    def client(self, app, api):
+    def client(self, app: Flask, api: Api):
         """Create test client with DatasetApi registered."""
         return ControllerApiTestDataFactory.create_test_client(app, api, DatasetApi, "/datasets/<uuid:dataset_id>")
 
@@ -588,12 +593,12 @@ class TestDatasetApiCreate:
         return ControllerApiTestDataFactory.create_flask_app()
 
     @pytest.fixture
-    def api(self, app):
+    def api(self, app: Flask):
         """Create Flask-RESTX API instance."""
         return ControllerApiTestDataFactory.create_api_instance(app)
 
     @pytest.fixture
-    def client(self, app, api):
+    def client(self, app: Flask, api: Api):
         """Create test client with DatasetApi registered."""
         return ControllerApiTestDataFactory.create_test_client(app, api, DatasetApi, "/datasets")
 
@@ -681,12 +686,12 @@ class TestHitTestingApi:
         return ControllerApiTestDataFactory.create_flask_app()
 
     @pytest.fixture
-    def api(self, app):
+    def api(self, app: Flask):
         """Create Flask-RESTX API instance."""
         return ControllerApiTestDataFactory.create_api_instance(app)
 
     @pytest.fixture
-    def client(self, app, api):
+    def client(self, app: Flask, api: Api):
         """Create test client with HitTestingApi registered."""
         return ControllerApiTestDataFactory.create_test_client(
             app, api, HitTestingApi, "/datasets/<uuid:dataset_id>/hit-testing"
@@ -799,12 +804,12 @@ class TestExternalDatasetApi:
         return ControllerApiTestDataFactory.create_flask_app()
 
     @pytest.fixture
-    def api(self, app):
+    def api(self, app: Flask):
         """Create Flask-RESTX API instance."""
         return ControllerApiTestDataFactory.create_api_instance(app)
 
     @pytest.fixture
-    def client_list(self, app, api):
+    def client_list(self, app: Flask, api: Api):
         """Create test client for external knowledge API list endpoint."""
         return ControllerApiTestDataFactory.create_test_client(
             app, api, ExternalApiTemplateListApi, "/datasets/external-knowledge-api"
diff --git a/api/tests/unit_tests/services/plugin/conftest.py b/api/tests/unit_tests/services/plugin/conftest.py
index 80c6077b0c..9dc4fa0390 100644
--- a/api/tests/unit_tests/services/plugin/conftest.py
+++ b/api/tests/unit_tests/services/plugin/conftest.py
@@ -21,7 +21,7 @@ def make_features(
 
 
 @pytest.fixture
-def mock_installer(monkeypatch):
+def mock_installer(monkeypatch: pytest.MonkeyPatch):
     """Patch PluginInstaller at the service import site."""
     mock = MagicMock()
     monkeypatch.setattr("services.plugin.plugin_service.PluginInstaller", lambda: mock)
diff --git a/api/tests/unit_tests/services/plugin/test_plugin_migration.py b/api/tests/unit_tests/services/plugin/test_plugin_migration.py
new file mode 100644
index 0000000000..12b6ea23a1
--- /dev/null
+++ b/api/tests/unit_tests/services/plugin/test_plugin_migration.py
@@ -0,0 +1,76 @@
+from unittest.mock import MagicMock, patch
+
+import pytest
+from pytest_mock import MockerFixture
+
+from services.plugin.plugin_migration import PluginMigration
+
+MIGRATION_MODULE = "services.plugin.plugin_migration"
+
+
+def test_fetch_plugin_unique_identifier_returns_none_when_disabled(mocker: MockerFixture) -> None:
+    mocker.patch("services.plugin.plugin_migration.dify_config.MARKETPLACE_ENABLED", False)
+    batch_fetch = mocker.patch("services.plugin.plugin_migration.marketplace.batch_fetch_plugin_manifests")
+
+    result = PluginMigration._fetch_plugin_unique_identifier("langgenius/openai")
+
+    assert result is None
+    batch_fetch.assert_not_called()
+
+
+def test_fetch_plugin_unique_identifier_calls_marketplace_when_enabled(mocker: MockerFixture) -> None:
+    mocker.patch("services.plugin.plugin_migration.dify_config.MARKETPLACE_ENABLED", True)
+    manifest = mocker.MagicMock()
+    manifest.latest_package_identifier = "langgenius/openai:1.0.0@abc"
+    mocker.patch(
+        "services.plugin.plugin_migration.marketplace.batch_fetch_plugin_manifests",
+        return_value=[manifest],
+    )
+
+    result = PluginMigration._fetch_plugin_unique_identifier("langgenius/openai")
+
+    assert result == "langgenius/openai:1.0.0@abc"
+
+
+class TestHandlePluginInstanceInstall:
+    def test_raises_when_disabled_and_map_nonempty(self) -> None:
+        with patch(f"{MIGRATION_MODULE}.dify_config") as mock_cfg:
+            mock_cfg.MARKETPLACE_ENABLED = False
+
+            with pytest.raises(ValueError, match="Marketplace disabled"):
+                PluginMigration.handle_plugin_instance_install(
+                    "tenant1", {"langgenius/openai": "langgenius/openai:1.0.0@abc"}
+                )
+
+    def test_no_raise_when_disabled_and_map_empty(self) -> None:
+        with (
+            patch(f"{MIGRATION_MODULE}.dify_config") as mock_cfg,
+            patch(f"{MIGRATION_MODULE}.PluginInstaller") as mock_installer_cls,
+        ):
+            mock_cfg.MARKETPLACE_ENABLED = False
+            mock_installer = MagicMock()
+            mock_installer_cls.return_value = mock_installer
+            mock_installer.install_from_identifiers.return_value = MagicMock(all_installed=True)
+
+            result = PluginMigration.handle_plugin_instance_install("tenant1", {})
+
+        assert isinstance(result, dict)
+
+    def test_proceeds_when_enabled(self) -> None:
+        with (
+            patch(f"{MIGRATION_MODULE}.dify_config") as mock_cfg,
+            patch(f"{MIGRATION_MODULE}.marketplace") as mock_marketplace,
+            patch(f"{MIGRATION_MODULE}.PluginInstaller") as mock_installer_cls,
+        ):
+            mock_cfg.MARKETPLACE_ENABLED = True
+            mock_marketplace.download_plugin_pkg.return_value = b"pkg_data"
+            mock_installer = MagicMock()
+            mock_installer_cls.return_value = mock_installer
+            mock_installer.install_from_identifiers.return_value = MagicMock(all_installed=True)
+
+            result = PluginMigration.handle_plugin_instance_install(
+                "tenant1", {"langgenius/openai": "langgenius/openai:1.0.0@abc"}
+            )
+
+        mock_marketplace.download_plugin_pkg.assert_called_once()
+        assert "success" in result or "failed" in result
diff --git a/api/tests/unit_tests/services/plugin/test_plugin_permission_service.py b/api/tests/unit_tests/services/plugin/test_plugin_permission_service.py
deleted file mode 100644
index 53a9e6210c..0000000000
--- a/api/tests/unit_tests/services/plugin/test_plugin_permission_service.py
+++ /dev/null
@@ -1,79 +0,0 @@
-from unittest.mock import MagicMock, patch
-
-from models.account import TenantPluginPermission
-
-MODULE = "services.plugin.plugin_permission_service"
-
-
-def _patched_session():
-    """Patch session_factory.create_session() to return a mock session as context manager."""
-    session = MagicMock()
-    session.__enter__ = MagicMock(return_value=session)
-    session.__exit__ = MagicMock(return_value=False)
-    session.begin.return_value.__enter__ = MagicMock(return_value=session)
-    session.begin.return_value.__exit__ = MagicMock(return_value=False)
-    mock_factory = MagicMock()
-    mock_factory.create_session.return_value = session
-    patcher = patch(f"{MODULE}.session_factory", mock_factory)
-    return patcher, session
-
-
-class TestGetPermission:
-    def test_returns_permission_when_found(self):
-        p1, session = _patched_session()
-        permission = MagicMock()
-        session.scalar.return_value = permission
-
-        with p1:
-            from services.plugin.plugin_permission_service import PluginPermissionService
-
-            result = PluginPermissionService.get_permission("t1")
-
-        assert result is permission
-
-    def test_returns_none_when_not_found(self):
-        p1, session = _patched_session()
-        session.scalar.return_value = None
-
-        with p1:
-            from services.plugin.plugin_permission_service import PluginPermissionService
-
-            result = PluginPermissionService.get_permission("t1")
-
-        assert result is None
-
-
-class TestChangePermission:
-    def test_creates_new_permission_when_not_exists(self):
-        p1, session = _patched_session()
-        session.scalar.return_value = None
-
-        with p1, patch(f"{MODULE}.select"), patch(f"{MODULE}.TenantPluginPermission") as perm_cls:
-            perm_cls.return_value = MagicMock()
-            from services.plugin.plugin_permission_service import PluginPermissionService
-
-            result = PluginPermissionService.change_permission(
-                "t1", TenantPluginPermission.InstallPermission.EVERYONE, TenantPluginPermission.DebugPermission.EVERYONE
-            )
-
-        assert result is True
-        session.begin.assert_called_once()
-        session.add.assert_called_once()
-
-    def test_updates_existing_permission(self):
-        p1, session = _patched_session()
-        existing = MagicMock()
-        session.scalar.return_value = existing
-
-        with p1:
-            from services.plugin.plugin_permission_service import PluginPermissionService
-
-            result = PluginPermissionService.change_permission(
-                "t1", TenantPluginPermission.InstallPermission.ADMINS, TenantPluginPermission.DebugPermission.ADMINS
-            )
-
-        assert result is True
-        session.begin.assert_called_once()
-        assert existing.install_permission == TenantPluginPermission.InstallPermission.ADMINS
-        assert existing.debug_permission == TenantPluginPermission.DebugPermission.ADMINS
-        session.add.assert_not_called()
diff --git a/api/tests/unit_tests/services/plugin/test_plugin_service.py b/api/tests/unit_tests/services/plugin/test_plugin_service.py
new file mode 100644
index 0000000000..05bb3b65c0
--- /dev/null
+++ b/api/tests/unit_tests/services/plugin/test_plugin_service.py
@@ -0,0 +1,50 @@
+from unittest.mock import MagicMock, patch
+
+MODULE = "services.plugin.plugin_service"
+
+
+class TestFetchLatestPluginVersion:
+    def test_skips_marketplace_fetch_when_disabled(self) -> None:
+        """Cache misses stay None; marketplace is never called when disabled."""
+        with (
+            patch(f"{MODULE}.dify_config") as mock_cfg,
+            patch(f"{MODULE}.redis_client") as mock_redis,
+            patch(f"{MODULE}.marketplace") as mock_marketplace,
+        ):
+            mock_cfg.MARKETPLACE_ENABLED = False
+            mock_redis.get.return_value = None  # all cache misses
+
+            from services.plugin.plugin_service import PluginService
+
+            result = PluginService.fetch_latest_plugin_version(["langgenius/openai", "langgenius/anthropic"])
+
+        mock_marketplace.batch_fetch_plugin_manifests.assert_not_called()
+        assert result == {"langgenius/openai": None, "langgenius/anthropic": None}
+
+    def test_calls_marketplace_fetch_when_enabled(self) -> None:
+        """Cache misses trigger marketplace fetch when enabled."""
+        manifest = MagicMock()
+        manifest.plugin_id = "langgenius/openai"
+        manifest.latest_version = "1.0.0"
+        manifest.latest_package_identifier = "langgenius/openai:1.0.0@abc"
+        manifest.status = "active"
+        manifest.deprecated_reason = ""
+        manifest.alternative_plugin_id = ""
+
+        with (
+            patch(f"{MODULE}.dify_config") as mock_cfg,
+            patch(f"{MODULE}.redis_client") as mock_redis,
+            patch(f"{MODULE}.marketplace") as mock_marketplace,
+        ):
+            mock_cfg.MARKETPLACE_ENABLED = True
+            mock_redis.get.return_value = None
+            mock_marketplace.batch_fetch_plugin_manifests.return_value = [manifest]
+
+            from services.plugin.plugin_service import PluginService
+
+            result = PluginService.fetch_latest_plugin_version(["langgenius/openai"])
+
+        # The list arg is mutated by remove() after the call, so check call count + result.
+        mock_marketplace.batch_fetch_plugin_manifests.assert_called_once()
+        assert result["langgenius/openai"] is not None
+        assert result["langgenius/openai"].version == "1.0.0"
diff --git a/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline.py b/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline.py
new file mode 100644
index 0000000000..2ddb1ea448
--- /dev/null
+++ b/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline.py
@@ -0,0 +1,36 @@
+from pytest_mock import MockerFixture
+
+from services.rag_pipeline.rag_pipeline import RagPipelineService
+
+
+def _make_service() -> RagPipelineService:
+    return RagPipelineService.__new__(RagPipelineService)
+
+
+def test_fetch_recommended_plugin_manifests_returns_empty_when_disabled(
+    mocker: MockerFixture,
+) -> None:
+    mocker.patch("services.rag_pipeline.rag_pipeline.dify_config.MARKETPLACE_ENABLED", False)
+    batch_fetch = mocker.patch("services.rag_pipeline.rag_pipeline.marketplace.batch_fetch_plugin_by_ids")
+
+    service = _make_service()
+    result = service._fetch_recommended_plugin_manifests(["langgenius/openai"])
+
+    assert result == []
+    batch_fetch.assert_not_called()
+
+
+def test_fetch_recommended_plugin_manifests_returns_data_when_enabled(
+    mocker: MockerFixture,
+) -> None:
+    mocker.patch("services.rag_pipeline.rag_pipeline.dify_config.MARKETPLACE_ENABLED", True)
+    expected = [{"plugin_id": "langgenius/openai", "name": "OpenAI"}]
+    mocker.patch(
+        "services.rag_pipeline.rag_pipeline.marketplace.batch_fetch_plugin_by_ids",
+        return_value=expected,
+    )
+
+    service = _make_service()
+    result = service._fetch_recommended_plugin_manifests(["langgenius/openai"])
+
+    assert result == expected
diff --git a/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline_dsl_service.py b/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline_dsl_service.py
index 337659b15f..e72ebb4907 100644
--- a/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline_dsl_service.py
+++ b/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline_dsl_service.py
@@ -8,11 +8,12 @@ from sqlalchemy.orm import Session
 
 from core.workflow.nodes.knowledge_index import KNOWLEDGE_INDEX_NODE_TYPE
 from graphon.enums import BuiltinNodeTypes
+from services.dsl_version import check_version_compatibility
 from services.entities.knowledge_entities.rag_pipeline_entities import IconInfo, RagPipelineDatasetCreateEntity
+from services.rag_pipeline import rag_pipeline_dsl_service
 from services.rag_pipeline.rag_pipeline_dsl_service import (
     ImportStatus,
     RagPipelineDslService,
-    _check_version_compatibility,
 )
 
 
@@ -26,7 +27,9 @@ from services.rag_pipeline.rag_pipeline_dsl_service import (
     ],
 )
 def test_check_version_compatibility(imported_version: str, expected_status: ImportStatus) -> None:
-    assert _check_version_compatibility(imported_version) == expected_status
+    assert (
+        check_version_compatibility(imported_version, rag_pipeline_dsl_service.CURRENT_DSL_VERSION) == expected_status
+    )
 
 
 def test_encrypt_decrypt_dataset_id_roundtrip() -> None:
@@ -259,6 +262,60 @@ workflow:
     if result.status == ImportStatus.FAILED:
         print(f"DEBUG: {result.error}")
     assert result.status == ImportStatus.COMPLETED
+    session.commit.assert_not_called()
+    session.flush.assert_called()
+
+
+def test_import_rag_pipeline_flushes_new_collection_binding_without_commit(mocker) -> None:
+    yaml_content = """
+version: 0.1.0
+kind: rag_pipeline
+rag_pipeline:
+    name: Test Pipeline
+workflow:
+    graph:
+        nodes:
+            - data:
+                type: knowledge-index
+"""
+    pipeline = Mock(id="p1", description="desc", is_published=False)
+    pipeline.name = "Test Pipeline"
+    mocker.patch.object(RagPipelineDslService, "_create_or_update_pipeline", return_value=pipeline)
+
+    config_mock = Mock()
+    config_mock.indexing_technique = "high_quality"
+    config_mock.embedding_model = "m"
+    config_mock.embedding_model_provider = "p"
+    config_mock.chunk_structure = "text_model"
+    config_mock.retrieval_model.model_dump.return_value = {}
+    config_mock.summary_index_setting = None
+    mocker.patch(
+        "services.rag_pipeline.rag_pipeline_dsl_service.KnowledgeConfiguration.model_validate",
+        return_value=config_mock,
+    )
+
+    dataset_mock = Mock(id="d1")
+    binding_mock = Mock(id="b1")
+    mocker.patch("services.rag_pipeline.rag_pipeline_dsl_service.Dataset", return_value=dataset_mock)
+    binding_cls = mocker.patch(
+        "services.rag_pipeline.rag_pipeline_dsl_service.DatasetCollectionBinding",
+        return_value=binding_mock,
+    )
+    mocker.patch("services.rag_pipeline.rag_pipeline_dsl_service.select", return_value=MagicMock())
+
+    session = cast(MagicMock, Mock())
+    session.scalar.return_value = None
+    session.scalars.return_value.all.return_value = []
+    service = RagPipelineDslService(session=cast(Session, session))
+    account = Mock(current_tenant_id="t1")
+
+    result = service.import_rag_pipeline(account=account, import_mode="yaml-content", yaml_content=yaml_content)
+
+    assert result.status == ImportStatus.COMPLETED
+    binding_cls.assert_called_once()
+    assert dataset_mock.collection_binding_id == "b1"
+    session.commit.assert_not_called()
+    assert session.flush.call_count >= 2
 
 
 def test_import_rag_pipeline_pending_version(mocker) -> None:
@@ -338,6 +395,67 @@ workflow:
     assert result.dataset_id == "d1"
 
 
+def test_confirm_import_flushes_new_collection_binding_without_commit(mocker) -> None:
+    from services.rag_pipeline.rag_pipeline_dsl_service import RagPipelinePendingData
+
+    yaml_content = """
+version: 0.1.0
+kind: rag_pipeline
+rag_pipeline:
+    name: Test Pipeline
+workflow:
+    graph:
+        nodes:
+            - data:
+                type: knowledge-index
+"""
+    pending = RagPipelinePendingData(import_mode="yaml-content", yaml_content=yaml_content, pipeline_id="p1")
+    mocker.patch(
+        "services.rag_pipeline.rag_pipeline_dsl_service.redis_client.get",
+        return_value=pending.model_dump_json(),
+    )
+    mocker.patch("services.rag_pipeline.rag_pipeline_dsl_service.redis_client.delete")
+
+    pipeline = Mock(id="p1", description="desc")
+    pipeline.name = "Test Pipeline"
+    pipeline.retrieve_dataset.return_value = None
+    mocker.patch.object(RagPipelineDslService, "_create_or_update_pipeline", return_value=pipeline)
+
+    config_mock = Mock()
+    config_mock.indexing_technique = "high_quality"
+    config_mock.embedding_model = "m"
+    config_mock.embedding_model_provider = "p"
+    config_mock.chunk_structure = "text_model"
+    config_mock.retrieval_model.model_dump.return_value = {}
+    config_mock.summary_index_setting = None
+    mocker.patch(
+        "services.rag_pipeline.rag_pipeline_dsl_service.KnowledgeConfiguration.model_validate",
+        return_value=config_mock,
+    )
+
+    dataset_mock = Mock(id="d1")
+    binding_mock = Mock(id="b1")
+    mocker.patch("services.rag_pipeline.rag_pipeline_dsl_service.Dataset", return_value=dataset_mock)
+    binding_cls = mocker.patch(
+        "services.rag_pipeline.rag_pipeline_dsl_service.DatasetCollectionBinding",
+        return_value=binding_mock,
+    )
+    mocker.patch("services.rag_pipeline.rag_pipeline_dsl_service.select", return_value=MagicMock())
+
+    session = cast(MagicMock, Mock())
+    session.scalar.side_effect = [pipeline, None]
+    service = RagPipelineDslService(session=cast(Session, session))
+    account = Mock(id="u1", current_tenant_id="t1")
+
+    result = service.confirm_import(account=account, import_id="imp-1")
+
+    assert result.status == ImportStatus.COMPLETED
+    binding_cls.assert_called_once()
+    assert dataset_mock.collection_binding_id == "b1"
+    session.commit.assert_not_called()
+    assert session.flush.call_count >= 2
+
+
 # --- _extract_dependencies_from_workflow_graph all types ---
 
 
@@ -421,6 +539,8 @@ def test_create_or_update_pipeline_create_new(mocker) -> None:
 
     assert result == pipeline_instance
     session.add.assert_called()
+    session.commit.assert_not_called()
+    session.flush.assert_called()
 
 
 # --- export_rag_pipeline_dsl comprehensive ---
@@ -984,7 +1104,7 @@ def test_extract_dependencies_from_model_config_includes_dataset_reranking_and_t
 def test_check_version_compatibility_hits_major_older_branch(mocker) -> None:
     mocker.patch("services.rag_pipeline.rag_pipeline_dsl_service.CURRENT_DSL_VERSION", "1.0.0")
 
-    status = _check_version_compatibility("0.9.0")
+    status = check_version_compatibility("0.9.0", rag_pipeline_dsl_service.CURRENT_DSL_VERSION)
 
     assert status == ImportStatus.PENDING
 
diff --git a/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline_task_proxy.py b/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline_task_proxy.py
index 1a2d062208..287391c24c 100644
--- a/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline_task_proxy.py
+++ b/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline_task_proxy.py
@@ -2,12 +2,13 @@ from types import SimpleNamespace
 from unittest.mock import Mock
 
 import pytest
+from pytest_mock import MockerFixture
 
 from services.rag_pipeline.rag_pipeline_task_proxy import RagPipelineTaskProxy
 
 
 @pytest.fixture
-def proxy(mocker):
+def proxy(mocker: MockerFixture):
     """Create a RagPipelineTaskProxy with mocked dependencies."""
     mocker.patch("services.rag_pipeline.rag_pipeline_task_proxy.TenantIsolatedTaskQueue")
     entity = Mock()
diff --git a/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline_transform_service.py b/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline_transform_service.py
index 82e5e973c1..3f511a109a 100644
--- a/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline_transform_service.py
+++ b/api/tests/unit_tests/services/rag_pipeline/test_rag_pipeline_transform_service.py
@@ -1,8 +1,10 @@
+import logging
 from datetime import UTC, datetime
 from types import SimpleNamespace
 from typing import cast
 
 import pytest
+from pytest_mock import MockerFixture
 
 from models.dataset import Dataset
 from services.entities.knowledge_entities.rag_pipeline_entities import KnowledgeConfiguration
@@ -514,3 +516,64 @@ def test_deal_document_data_upload_file_with_existing_file(mocker) -> None:
     assert document.data_source_type == "local_file"
     assert "real_file_id" in document.data_source_info
     assert add_mock.call_count >= 2
+
+
+def _make_service():
+    return RagPipelineTransformService.__new__(RagPipelineTransformService)
+
+
+def test_deal_dependencies_skips_marketplace_when_disabled(mocker: MockerFixture, caplog) -> None:
+    mocker.patch(
+        "services.rag_pipeline.rag_pipeline_transform_service.dify_config.MARKETPLACE_ENABLED",
+        False,
+    )
+    installer = mocker.patch("services.rag_pipeline.rag_pipeline_transform_service.PluginInstaller").return_value
+    installer.list_plugins.return_value = []
+    mocker.patch("services.rag_pipeline.rag_pipeline_transform_service.PluginMigration")
+    install_call = mocker.patch(
+        "services.rag_pipeline.rag_pipeline_transform_service.PluginService.install_from_marketplace_pkg"
+    )
+
+    pipeline_yaml = {
+        "dependencies": [
+            {
+                "type": "marketplace",
+                "value": {"plugin_unique_identifier": "langgenius/openai:1.0.0@abc"},
+            }
+        ]
+    }
+
+    service = _make_service()
+    with caplog.at_level(logging.WARNING):
+        service._deal_dependencies(pipeline_yaml, "tenant-1")
+
+    install_call.assert_not_called()
+    assert any("Marketplace disabled" in rec.message for rec in caplog.records)
+
+
+def test_deal_dependencies_installs_when_enabled(mocker: MockerFixture) -> None:
+    mocker.patch(
+        "services.rag_pipeline.rag_pipeline_transform_service.dify_config.MARKETPLACE_ENABLED",
+        True,
+    )
+    installer = mocker.patch("services.rag_pipeline.rag_pipeline_transform_service.PluginInstaller").return_value
+    installer.list_plugins.return_value = []
+    migration = mocker.patch("services.rag_pipeline.rag_pipeline_transform_service.PluginMigration").return_value
+    migration._fetch_plugin_unique_identifier.return_value = "langgenius/openai:1.0.0@abc"
+    install_call = mocker.patch(
+        "services.rag_pipeline.rag_pipeline_transform_service.PluginService.install_from_marketplace_pkg"
+    )
+
+    pipeline_yaml = {
+        "dependencies": [
+            {
+                "type": "marketplace",
+                "value": {"plugin_unique_identifier": "langgenius/openai:1.0.0@abc"},
+            }
+        ]
+    }
+
+    service = _make_service()
+    service._deal_dependencies(pipeline_yaml, "tenant-1")
+
+    install_call.assert_called_once_with("tenant-1", ["langgenius/openai:1.0.0@abc"])
diff --git a/api/tests/unit_tests/services/recommend_app/test_category_order.py b/api/tests/unit_tests/services/recommend_app/test_category_order.py
new file mode 100644
index 0000000000..3b94021f26
--- /dev/null
+++ b/api/tests/unit_tests/services/recommend_app/test_category_order.py
@@ -0,0 +1,26 @@
+import json
+from unittest.mock import patch
+
+from services.recommend_app.category_order import get_explore_app_category_order, order_categories
+
+
+@patch("services.recommend_app.category_order.redis_client.get")
+def test_get_explore_app_category_order_returns_redis_list(mock_get):
+    mock_get.return_value = json.dumps(["C", "A", "B"]).encode()
+
+    assert get_explore_app_category_order("en-US") == ["C", "A", "B"]
+    mock_get.assert_called_once_with("explore:apps:category_order:en-US")
+
+
+@patch("services.recommend_app.category_order.redis_client.get")
+def test_order_categories_uses_redis_order_as_source_of_truth(mock_get):
+    mock_get.return_value = json.dumps(["C", "A", "B"]).encode()
+
+    assert order_categories({"A", "B", "C", "D"}, "en-US") == ["C", "A", "B"]
+
+
+@patch("services.recommend_app.category_order.redis_client.get")
+def test_order_categories_falls_back_to_sorted_categories_without_redis_order(mock_get):
+    mock_get.return_value = None
+
+    assert order_categories({"B", "A", "C"}, "en-US") == ["A", "B", "C"]
diff --git a/api/tests/unit_tests/services/recommend_app/test_remote_retrieval.py b/api/tests/unit_tests/services/recommend_app/test_remote_retrieval.py
index e322fbed4c..c7b86e5743 100644
--- a/api/tests/unit_tests/services/recommend_app/test_remote_retrieval.py
+++ b/api/tests/unit_tests/services/recommend_app/test_remote_retrieval.py
@@ -85,7 +85,7 @@ class TestFetchFromDifyOfficial:
 
     @patch("services.recommend_app.remote.remote_retrieval.dify_config")
     @patch("services.recommend_app.remote.remote_retrieval.httpx.get")
-    def test_apps_returns_sorted_categories_on_200(self, mock_get, mock_config):
+    def test_apps_preserves_remote_categories_order_on_200(self, mock_get, mock_config):
         mock_config.HOSTED_FETCH_APP_TEMPLATES_REMOTE_DOMAIN = "https://example.com"
         mock_response = MagicMock(status_code=200)
         mock_response.json.return_value = {
@@ -96,7 +96,7 @@ class TestFetchFromDifyOfficial:
 
         result = RemoteRecommendAppRetrieval.fetch_recommended_apps_from_dify_official("en-US")
 
-        assert result["categories"] == ["agent", "chat", "writing"]
+        assert result["categories"] == ["writing", "agent", "chat"]
 
     @patch("services.recommend_app.remote.remote_retrieval.dify_config")
     @patch("services.recommend_app.remote.remote_retrieval.httpx.get")
diff --git a/api/tests/unit_tests/services/test_account_service.py b/api/tests/unit_tests/services/test_account_service.py
index e9d2f1481e..8c554e012d 100644
--- a/api/tests/unit_tests/services/test_account_service.py
+++ b/api/tests/unit_tests/services/test_account_service.py
@@ -13,6 +13,7 @@ from services.errors.account import (
     AccountPasswordError,
     AccountRegisterError,
     CurrentPasswordIncorrectError,
+    NoPermissionError,
 )
 
 
@@ -259,7 +260,7 @@ class TestAccountService:
         assert result.interface_theme == "light"
         assert result.password is not None
         assert result.password_salt is not None
-        assert result.timezone is not None
+        assert result.timezone == "America/New_York"
 
         # Verify database operations
         mock_db_dependencies["db"].session.add.assert_called_once()
@@ -270,7 +271,28 @@ class TestAccountService:
         assert added_account.interface_theme == "light"
         assert added_account.password is not None
         assert added_account.password_salt is not None
-        assert added_account.timezone is not None
+        assert added_account.timezone == "America/New_York"
+        self._assert_database_operations_called(mock_db_dependencies["db"])
+
+    def test_create_account_uses_explicit_timezone(
+        self, mock_db_dependencies, mock_password_dependencies, mock_external_service_dependencies
+    ):
+        """Test account creation prefers explicit browser timezone."""
+        mock_external_service_dependencies["feature_service"].get_system_features.return_value.is_allow_register = True
+        mock_external_service_dependencies["billing_service"].is_email_in_freeze.return_value = False
+        mock_password_dependencies["hash_password"].return_value = b"hashed_password"
+
+        result = AccountService.create_account(
+            email="test@example.com",
+            name="Test User",
+            interface_language="en-US",
+            password="password123",
+            timezone="Asia/Shanghai",
+        )
+
+        assert result.timezone == "Asia/Shanghai"
+        added_account = mock_db_dependencies["db"].session.add.call_args[0][0]
+        assert added_account.timezone == "Asia/Shanghai"
         self._assert_database_operations_called(mock_db_dependencies["db"])
 
     def test_create_account_registration_disabled(self, mock_external_service_dependencies):
@@ -817,8 +839,8 @@ class TestTenantService:
 
         # Mock the database queries in update_member_role method
         with patch("services.account_service.db") as mock_db:
-            # scalar calls: permission check, target member lookup
-            mock_db.session.scalar.side_effect = [mock_operator_join, mock_target_join]
+            # scalar calls: permission check, target member lookup, operator role lookup
+            mock_db.session.scalar.side_effect = [mock_operator_join, mock_target_join, mock_operator_join]
 
             # Execute test
             TenantService.update_member_role(mock_tenant, mock_member, "admin", mock_operator)
@@ -827,6 +849,65 @@ class TestTenantService:
             assert mock_target_join.role == "admin"
             self._assert_database_operations_called(mock_db)
 
+    def test_admin_can_update_admin_member_role(self):
+        """Test admin can update another non-owner member, including an admin."""
+        mock_tenant = MagicMock()
+        mock_tenant.id = "tenant-456"
+        mock_member = TestAccountAssociatedDataFactory.create_account_mock(account_id="member-789")
+        mock_operator = TestAccountAssociatedDataFactory.create_account_mock(account_id="operator-123")
+        mock_target_join = TestAccountAssociatedDataFactory.create_tenant_join_mock(
+            tenant_id="tenant-456", account_id="member-789", role="admin"
+        )
+        mock_operator_join = TestAccountAssociatedDataFactory.create_tenant_join_mock(
+            tenant_id="tenant-456", account_id="operator-123", role="admin"
+        )
+
+        with patch("services.account_service.db") as mock_db:
+            mock_db.session.scalar.side_effect = [mock_operator_join, mock_target_join, mock_operator_join]
+
+            TenantService.update_member_role(mock_tenant, mock_member, "editor", mock_operator)
+
+            assert mock_target_join.role == "editor"
+            self._assert_database_operations_called(mock_db)
+
+    def test_admin_cannot_update_owner_member_role(self):
+        """Test admin cannot update an owner member."""
+        mock_tenant = MagicMock()
+        mock_tenant.id = "tenant-456"
+        mock_member = TestAccountAssociatedDataFactory.create_account_mock(account_id="member-789")
+        mock_operator = TestAccountAssociatedDataFactory.create_account_mock(account_id="operator-123")
+        mock_target_join = TestAccountAssociatedDataFactory.create_tenant_join_mock(
+            tenant_id="tenant-456", account_id="member-789", role="owner"
+        )
+        mock_operator_join = TestAccountAssociatedDataFactory.create_tenant_join_mock(
+            tenant_id="tenant-456", account_id="operator-123", role="admin"
+        )
+
+        with patch("services.account_service.db") as mock_db:
+            mock_db.session.scalar.side_effect = [mock_operator_join, mock_target_join, mock_operator_join]
+
+            with pytest.raises(NoPermissionError):
+                TenantService.update_member_role(mock_tenant, mock_member, "editor", mock_operator)
+
+    def test_admin_cannot_promote_member_to_owner(self):
+        """Test admin cannot promote a non-owner member to owner."""
+        mock_tenant = MagicMock()
+        mock_tenant.id = "tenant-456"
+        mock_member = TestAccountAssociatedDataFactory.create_account_mock(account_id="member-789")
+        mock_operator = TestAccountAssociatedDataFactory.create_account_mock(account_id="operator-123")
+        mock_target_join = TestAccountAssociatedDataFactory.create_tenant_join_mock(
+            tenant_id="tenant-456", account_id="member-789", role="admin"
+        )
+        mock_operator_join = TestAccountAssociatedDataFactory.create_tenant_join_mock(
+            tenant_id="tenant-456", account_id="operator-123", role="admin"
+        )
+
+        with patch("services.account_service.db") as mock_db:
+            mock_db.session.scalar.side_effect = [mock_operator_join, mock_target_join, mock_operator_join]
+
+            with pytest.raises(NoPermissionError):
+                TenantService.update_member_role(mock_tenant, mock_member, "owner", mock_operator)
+
     # ==================== Permission Check Tests ====================
 
     def test_check_member_permission_success(self, mock_db_dependencies):
@@ -864,6 +945,39 @@ class TestTenantService:
             "add",
         )
 
+    def test_admin_can_remove_non_owner_member(self, mock_db_dependencies):
+        """Test admin can remove a non-owner member."""
+        mock_tenant = MagicMock()
+        mock_tenant.id = "tenant-456"
+        mock_operator = TestAccountAssociatedDataFactory.create_account_mock(account_id="operator-123")
+        mock_member = TestAccountAssociatedDataFactory.create_account_mock(account_id="member-789")
+        mock_operator_join = TestAccountAssociatedDataFactory.create_tenant_join_mock(
+            tenant_id="tenant-456", account_id="operator-123", role="admin"
+        )
+        mock_member_join = TestAccountAssociatedDataFactory.create_tenant_join_mock(
+            tenant_id="tenant-456", account_id="member-789", role="admin"
+        )
+        mock_db_dependencies["db"].session.scalar.side_effect = [mock_operator_join, mock_member_join]
+
+        TenantService.check_member_permission(mock_tenant, mock_operator, mock_member, "remove")
+
+    def test_admin_cannot_remove_owner_member(self, mock_db_dependencies):
+        """Test admin cannot remove an owner member."""
+        mock_tenant = MagicMock()
+        mock_tenant.id = "tenant-456"
+        mock_operator = TestAccountAssociatedDataFactory.create_account_mock(account_id="operator-123")
+        mock_member = TestAccountAssociatedDataFactory.create_account_mock(account_id="member-789")
+        mock_operator_join = TestAccountAssociatedDataFactory.create_tenant_join_mock(
+            tenant_id="tenant-456", account_id="operator-123", role="admin"
+        )
+        mock_member_join = TestAccountAssociatedDataFactory.create_tenant_join_mock(
+            tenant_id="tenant-456", account_id="member-789", role="owner"
+        )
+        mock_db_dependencies["db"].session.scalar.side_effect = [mock_operator_join, mock_member_join]
+
+        with pytest.raises(NoPermissionError):
+            TenantService.check_member_permission(mock_tenant, mock_operator, mock_member, "remove")
+
 
 class TestRegisterService:
     """
@@ -1128,6 +1242,7 @@ class TestRegisterService:
                     interface_language="en-US",
                     password="password123",
                     is_setup=False,
+                    timezone=None,
                 )
                 mock_create_tenant.assert_called_once_with("Test User's Workspace")
                 mock_create_member.assert_called_once_with(mock_tenant, mock_account, role="owner")
diff --git a/api/tests/unit_tests/services/test_app_generate_service.py b/api/tests/unit_tests/services/test_app_generate_service.py
index d3f9c5dd9f..216c5d9db6 100644
--- a/api/tests/unit_tests/services/test_app_generate_service.py
+++ b/api/tests/unit_tests/services/test_app_generate_service.py
@@ -20,6 +20,7 @@ from contextlib import contextmanager
 from unittest.mock import MagicMock
 
 import pytest
+from pytest_mock import MockerFixture
 
 import services.app_generate_service as ags_module
 from core.app.entities.app_invoke_entities import InvokeFrom
@@ -96,7 +97,7 @@ def _noop_rate_limit_context(rate_limit, request_id):
 class TestBuildStreamingTaskOnSubscribe:
     """Tests for AppGenerateService._build_streaming_task_on_subscribe."""
 
-    def test_streams_mode_starts_immediately(self, monkeypatch):
+    def test_streams_mode_starts_immediately(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(ags_module.dify_config, "PUBSUB_REDIS_CHANNEL_TYPE", "streams")
         called = []
         cb = AppGenerateService._build_streaming_task_on_subscribe(lambda: called.append(1))
@@ -106,7 +107,7 @@ class TestBuildStreamingTaskOnSubscribe:
         cb()
         assert called == [1]  # not called again
 
-    def test_pubsub_mode_starts_on_subscribe(self, monkeypatch):
+    def test_pubsub_mode_starts_on_subscribe(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(ags_module.dify_config, "PUBSUB_REDIS_CHANNEL_TYPE", "pubsub")
         monkeypatch.setattr(ags_module, "SSE_TASK_START_FALLBACK_MS", 60_000)  # large to prevent timer
         called = []
@@ -118,7 +119,7 @@ class TestBuildStreamingTaskOnSubscribe:
         cb()
         assert called == [1]
 
-    def test_sharded_mode_starts_on_subscribe(self, monkeypatch):
+    def test_sharded_mode_starts_on_subscribe(self, monkeypatch: pytest.MonkeyPatch):
         """sharded is treated like pubsub (i.e. not 'streams')."""
         monkeypatch.setattr(ags_module.dify_config, "PUBSUB_REDIS_CHANNEL_TYPE", "sharded")
         monkeypatch.setattr(ags_module, "SSE_TASK_START_FALLBACK_MS", 60_000)
@@ -128,7 +129,7 @@ class TestBuildStreamingTaskOnSubscribe:
         cb()
         assert called == [1]
 
-    def test_pubsub_fallback_timer_fires(self, monkeypatch):
+    def test_pubsub_fallback_timer_fires(self, monkeypatch: pytest.MonkeyPatch):
         """When nobody subscribes fast enough the fallback timer fires."""
         monkeypatch.setattr(ags_module.dify_config, "PUBSUB_REDIS_CHANNEL_TYPE", "pubsub")
         monkeypatch.setattr(ags_module, "SSE_TASK_START_FALLBACK_MS", 50)  # 50 ms
@@ -137,7 +138,7 @@ class TestBuildStreamingTaskOnSubscribe:
         time.sleep(0.2)  # give the timer time to fire
         assert called == [1]
 
-    def test_exception_in_start_task_returns_false(self, monkeypatch):
+    def test_exception_in_start_task_returns_false(self, monkeypatch: pytest.MonkeyPatch):
         """When start_task raises, _try_start returns False and next call retries."""
         monkeypatch.setattr(ags_module.dify_config, "PUBSUB_REDIS_CHANNEL_TYPE", "streams")
         call_count = 0
@@ -154,7 +155,7 @@ class TestBuildStreamingTaskOnSubscribe:
         cb()
         assert call_count == 2
 
-    def test_concurrent_subscribe_only_starts_once(self, monkeypatch):
+    def test_concurrent_subscribe_only_starts_once(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(ags_module.dify_config, "PUBSUB_REDIS_CHANNEL_TYPE", "pubsub")
         monkeypatch.setattr(ags_module, "SSE_TASK_START_FALLBACK_MS", 60_000)
         call_count = 0
@@ -176,31 +177,31 @@ class TestBuildStreamingTaskOnSubscribe:
 # _get_max_active_requests
 # ---------------------------------------------------------------------------
 class TestGetMaxActiveRequests:
-    def test_both_zero_returns_zero(self, monkeypatch):
+    def test_both_zero_returns_zero(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(ags_module.dify_config, "APP_MAX_ACTIVE_REQUESTS", 0)
         monkeypatch.setattr(ags_module.dify_config, "APP_DEFAULT_ACTIVE_REQUESTS", 0)
         app = _make_app(AppMode.CHAT, max_active_requests=0)
         assert AppGenerateService._get_max_active_requests(app) == 0
 
-    def test_app_limit_only(self, monkeypatch):
+    def test_app_limit_only(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(ags_module.dify_config, "APP_MAX_ACTIVE_REQUESTS", 0)
         monkeypatch.setattr(ags_module.dify_config, "APP_DEFAULT_ACTIVE_REQUESTS", 0)
         app = _make_app(AppMode.CHAT, max_active_requests=5)
         assert AppGenerateService._get_max_active_requests(app) == 5
 
-    def test_config_limit_only(self, monkeypatch):
+    def test_config_limit_only(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(ags_module.dify_config, "APP_MAX_ACTIVE_REQUESTS", 10)
         monkeypatch.setattr(ags_module.dify_config, "APP_DEFAULT_ACTIVE_REQUESTS", 0)
         app = _make_app(AppMode.CHAT, max_active_requests=0)
         assert AppGenerateService._get_max_active_requests(app) == 10
 
-    def test_both_non_zero_returns_min(self, monkeypatch):
+    def test_both_non_zero_returns_min(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(ags_module.dify_config, "APP_MAX_ACTIVE_REQUESTS", 20)
         monkeypatch.setattr(ags_module.dify_config, "APP_DEFAULT_ACTIVE_REQUESTS", 0)
         app = _make_app(AppMode.CHAT, max_active_requests=5)
         assert AppGenerateService._get_max_active_requests(app) == 5
 
-    def test_default_active_requests_used_when_app_has_none(self, monkeypatch):
+    def test_default_active_requests_used_when_app_has_none(self, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(ags_module.dify_config, "APP_MAX_ACTIVE_REQUESTS", 0)
         monkeypatch.setattr(ags_module.dify_config, "APP_DEFAULT_ACTIVE_REQUESTS", 15)
         app = _make_app(AppMode.CHAT, max_active_requests=0)
@@ -214,7 +215,7 @@ class TestGenerate:
     """Tests for AppGenerateService.generate covering each mode."""
 
     @pytest.fixture(autouse=True)
-    def _common(self, mocker, monkeypatch):
+    def _common(self, mocker: MockerFixture, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(ags_module.dify_config, "BILLING_ENABLED", False)
         mocker.patch("services.app_generate_service.RateLimit", _DummyRateLimit)
         # Prevent AppExecutionParams.new from touching real models via isinstance
@@ -224,7 +225,7 @@ class TestGenerate:
         )
 
     # -- COMPLETION ---------------------------------------------------------
-    def test_completion_mode(self, mocker):
+    def test_completion_mode(self, mocker: MockerFixture):
         gen_spy = mocker.patch(
             "services.app_generate_service.CompletionAppGenerator.generate",
             return_value={"result": "ok"},
@@ -244,7 +245,7 @@ class TestGenerate:
         gen_spy.assert_called_once()
 
     # -- AGENT_CHAT via mode ------------------------------------------------
-    def test_agent_chat_mode(self, mocker):
+    def test_agent_chat_mode(self, mocker: MockerFixture):
         gen_spy = mocker.patch(
             "services.app_generate_service.AgentChatAppGenerator.generate",
             return_value={"result": "agent"},
@@ -264,7 +265,7 @@ class TestGenerate:
         gen_spy.assert_called_once()
 
     # -- AGENT_CHAT via is_agent flag (non-AGENT_CHAT mode) -----------------
-    def test_agent_via_is_agent_flag(self, mocker):
+    def test_agent_via_is_agent_flag(self, mocker: MockerFixture):
         gen_spy = mocker.patch(
             "services.app_generate_service.AgentChatAppGenerator.generate",
             return_value={"result": "agent-via-flag"},
@@ -285,7 +286,7 @@ class TestGenerate:
         gen_spy.assert_called_once()
 
     # -- CHAT ---------------------------------------------------------------
-    def test_chat_mode(self, mocker):
+    def test_chat_mode(self, mocker: MockerFixture):
         gen_spy = mocker.patch(
             "services.app_generate_service.ChatAppGenerator.generate",
             return_value={"result": "chat"},
@@ -306,7 +307,7 @@ class TestGenerate:
         gen_spy.assert_called_once()
 
     # -- ADVANCED_CHAT blocking ---------------------------------------------
-    def test_advanced_chat_blocking(self, mocker):
+    def test_advanced_chat_blocking(self, mocker: MockerFixture):
         workflow = _make_workflow()
         mocker.patch.object(AppGenerateService, "_get_workflow", return_value=workflow)
 
@@ -333,7 +334,7 @@ class TestGenerate:
         retrieve_spy.assert_not_called()
 
     # -- ADVANCED_CHAT streaming --------------------------------------------
-    def test_advanced_chat_streaming(self, mocker, monkeypatch):
+    def test_advanced_chat_streaming(self, mocker: MockerFixture, monkeypatch: pytest.MonkeyPatch):
         workflow = _make_workflow()
         mocker.patch.object(AppGenerateService, "_get_workflow", return_value=workflow)
         mocker.patch(
@@ -365,7 +366,7 @@ class TestGenerate:
         delay_spy.assert_called_once()
 
     # -- WORKFLOW blocking --------------------------------------------------
-    def test_workflow_blocking(self, mocker):
+    def test_workflow_blocking(self, mocker: MockerFixture):
         workflow = _make_workflow()
         mocker.patch.object(AppGenerateService, "_get_workflow", return_value=workflow)
         gen_spy = mocker.patch(
@@ -390,7 +391,7 @@ class TestGenerate:
         assert call_kwargs["pause_state_config"].state_owner_user_id == "owner-id"
 
     # -- WORKFLOW streaming -------------------------------------------------
-    def test_workflow_streaming(self, mocker, monkeypatch):
+    def test_workflow_streaming(self, mocker: MockerFixture, monkeypatch: pytest.MonkeyPatch):
         workflow = _make_workflow()
         mocker.patch.object(AppGenerateService, "_get_workflow", return_value=workflow)
         mocker.patch(
@@ -422,7 +423,7 @@ class TestGenerate:
         delay_spy.assert_called_once()
 
     # -- Invalid mode -------------------------------------------------------
-    def test_invalid_mode_raises(self, mocker):
+    def test_invalid_mode_raises(self, mocker: MockerFixture):
         app = _make_app("invalid-mode", is_agent=False)
         with pytest.raises(ValueError, match="Invalid app mode"):
             AppGenerateService.generate(
@@ -439,14 +440,14 @@ class TestGenerate:
 # ---------------------------------------------------------------------------
 class TestGenerateBilling:
     @pytest.fixture(autouse=True)
-    def _common(self, mocker, monkeypatch):
+    def _common(self, mocker: MockerFixture, monkeypatch: pytest.MonkeyPatch):
         mocker.patch("services.app_generate_service.RateLimit", _DummyRateLimit)
         mocker.patch(
             "services.app_generate_service.rate_limit_context",
             _noop_rate_limit_context,
         )
 
-    def test_billing_enabled_consumes_quota(self, mocker, monkeypatch):
+    def test_billing_enabled_consumes_quota(self, mocker: MockerFixture, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(ags_module.dify_config, "BILLING_ENABLED", True)
         quota_charge = MagicMock()
         reserve_mock = mocker.patch(
@@ -472,7 +473,9 @@ class TestGenerateBilling:
         reserve_mock.assert_called_once_with(QuotaType.WORKFLOW, "tenant-id")
         quota_charge.commit.assert_called_once()
 
-    def test_billing_quota_exceeded_raises_rate_limit_error(self, mocker, monkeypatch):
+    def test_billing_quota_exceeded_raises_rate_limit_error(
+        self, mocker: MockerFixture, monkeypatch: pytest.MonkeyPatch
+    ):
         from services.errors.app import QuotaExceededError
         from services.errors.llm import InvokeRateLimitError
 
@@ -491,7 +494,7 @@ class TestGenerateBilling:
                 streaming=False,
             )
 
-    def test_exception_refunds_quota_and_exits_rate_limit(self, mocker, monkeypatch):
+    def test_exception_refunds_quota_and_exits_rate_limit(self, mocker: MockerFixture, monkeypatch: pytest.MonkeyPatch):
         monkeypatch.setattr(ags_module.dify_config, "BILLING_ENABLED", True)
         quota_charge = MagicMock()
         mocker.patch(
@@ -517,7 +520,9 @@ class TestGenerateBilling:
             )
         quota_charge.refund.assert_called_once()
 
-    def test_rate_limit_exit_called_in_finally_for_blocking(self, mocker, monkeypatch):
+    def test_rate_limit_exit_called_in_finally_for_blocking(
+        self, mocker: MockerFixture, monkeypatch: pytest.MonkeyPatch
+    ):
         """For non-streaming (blocking) calls, rate_limit.exit should be called in finally."""
         monkeypatch.setattr(ags_module.dify_config, "BILLING_ENABLED", False)
 
@@ -552,7 +557,7 @@ class TestGenerateBilling:
 # _get_workflow
 # ---------------------------------------------------------------------------
 class TestGetWorkflow:
-    def test_debugger_fetches_draft(self, mocker):
+    def test_debugger_fetches_draft(self, mocker: MockerFixture):
         draft_wf = _make_workflow()
         ws = MagicMock()
         ws.get_draft_workflow.return_value = draft_wf
@@ -562,7 +567,7 @@ class TestGetWorkflow:
         assert result is draft_wf
         ws.get_draft_workflow.assert_called_once()
 
-    def test_debugger_raises_when_no_draft(self, mocker):
+    def test_debugger_raises_when_no_draft(self, mocker: MockerFixture):
         ws = MagicMock()
         ws.get_draft_workflow.return_value = None
         mocker.patch("services.app_generate_service.WorkflowService", return_value=ws)
@@ -570,7 +575,7 @@ class TestGetWorkflow:
         with pytest.raises(ValueError, match="Workflow not initialized"):
             AppGenerateService._get_workflow(_make_app(AppMode.WORKFLOW), InvokeFrom.DEBUGGER)
 
-    def test_non_debugger_fetches_published(self, mocker):
+    def test_non_debugger_fetches_published(self, mocker: MockerFixture):
         pub_wf = _make_workflow()
         ws = MagicMock()
         ws.get_published_workflow.return_value = pub_wf
@@ -580,7 +585,7 @@ class TestGetWorkflow:
         assert result is pub_wf
         ws.get_published_workflow.assert_called_once()
 
-    def test_non_debugger_raises_when_no_published(self, mocker):
+    def test_non_debugger_raises_when_no_published(self, mocker: MockerFixture):
         ws = MagicMock()
         ws.get_published_workflow.return_value = None
         mocker.patch("services.app_generate_service.WorkflowService", return_value=ws)
@@ -588,7 +593,7 @@ class TestGetWorkflow:
         with pytest.raises(ValueError, match="Workflow not published"):
             AppGenerateService._get_workflow(_make_app(AppMode.WORKFLOW), InvokeFrom.SERVICE_API)
 
-    def test_specific_workflow_id_valid_uuid(self, mocker):
+    def test_specific_workflow_id_valid_uuid(self, mocker: MockerFixture):
         valid_uuid = str(uuid.uuid4())
         specific_wf = _make_workflow(workflow_id=valid_uuid)
         ws = MagicMock()
@@ -601,7 +606,7 @@ class TestGetWorkflow:
         assert result is specific_wf
         ws.get_published_workflow_by_id.assert_called_once()
 
-    def test_specific_workflow_id_invalid_uuid(self, mocker):
+    def test_specific_workflow_id_invalid_uuid(self, mocker: MockerFixture):
         ws = MagicMock()
         mocker.patch("services.app_generate_service.WorkflowService", return_value=ws)
 
@@ -610,7 +615,7 @@ class TestGetWorkflow:
                 _make_app(AppMode.WORKFLOW), InvokeFrom.SERVICE_API, workflow_id="not-a-uuid"
             )
 
-    def test_specific_workflow_id_not_found(self, mocker):
+    def test_specific_workflow_id_not_found(self, mocker: MockerFixture):
         valid_uuid = str(uuid.uuid4())
         ws = MagicMock()
         ws.get_published_workflow_by_id.return_value = None
@@ -626,7 +631,7 @@ class TestGetWorkflow:
 # generate_single_iteration
 # ---------------------------------------------------------------------------
 class TestGenerateSingleIteration:
-    def test_advanced_chat_mode(self, mocker):
+    def test_advanced_chat_mode(self, mocker: MockerFixture):
         workflow = _make_workflow()
         mocker.patch.object(AppGenerateService, "_get_workflow", return_value=workflow)
         gen_spy = mocker.patch(
@@ -644,7 +649,7 @@ class TestGenerateSingleIteration:
         iter_spy.assert_called_once()
         assert result == {"event": "iteration"}
 
-    def test_workflow_mode(self, mocker):
+    def test_workflow_mode(self, mocker: MockerFixture):
         workflow = _make_workflow()
         mocker.patch.object(AppGenerateService, "_get_workflow", return_value=workflow)
         mocker.patch(
@@ -662,7 +667,7 @@ class TestGenerateSingleIteration:
         iter_spy.assert_called_once()
         assert result == {"event": "wf-iteration"}
 
-    def test_invalid_mode_raises(self, mocker):
+    def test_invalid_mode_raises(self, mocker: MockerFixture):
         app = _make_app(AppMode.CHAT)
         with pytest.raises(ValueError, match="Invalid app mode"):
             AppGenerateService.generate_single_iteration(app_model=app, user=_make_user(), node_id="n1", args={})
@@ -672,7 +677,7 @@ class TestGenerateSingleIteration:
 # generate_single_loop
 # ---------------------------------------------------------------------------
 class TestGenerateSingleLoop:
-    def test_advanced_chat_mode(self, mocker):
+    def test_advanced_chat_mode(self, mocker: MockerFixture):
         workflow = _make_workflow()
         mocker.patch.object(AppGenerateService, "_get_workflow", return_value=workflow)
         mocker.patch(
@@ -690,7 +695,7 @@ class TestGenerateSingleLoop:
         loop_spy.assert_called_once()
         assert result == {"event": "loop"}
 
-    def test_workflow_mode(self, mocker):
+    def test_workflow_mode(self, mocker: MockerFixture):
         workflow = _make_workflow()
         mocker.patch.object(AppGenerateService, "_get_workflow", return_value=workflow)
         mocker.patch(
@@ -708,7 +713,7 @@ class TestGenerateSingleLoop:
         loop_spy.assert_called_once()
         assert result == {"event": "wf-loop"}
 
-    def test_invalid_mode_raises(self, mocker):
+    def test_invalid_mode_raises(self, mocker: MockerFixture):
         app = _make_app(AppMode.COMPLETION)
         with pytest.raises(ValueError, match="Invalid app mode"):
             AppGenerateService.generate_single_loop(app_model=app, user=_make_user(), node_id="n1", args=MagicMock())
@@ -718,7 +723,7 @@ class TestGenerateSingleLoop:
 # generate_more_like_this
 # ---------------------------------------------------------------------------
 class TestGenerateMoreLikeThis:
-    def test_delegates_to_completion_generator(self, mocker):
+    def test_delegates_to_completion_generator(self, mocker: MockerFixture):
         gen_spy = mocker.patch(
             "services.app_generate_service.CompletionAppGenerator.generate_more_like_this",
             return_value={"result": "similar"},
@@ -739,7 +744,7 @@ class TestGenerateMoreLikeThis:
 # get_response_generator
 # ---------------------------------------------------------------------------
 class TestGetResponseGenerator:
-    def test_non_ended_workflow_run(self, mocker):
+    def test_non_ended_workflow_run(self, mocker: MockerFixture):
         app = _make_app(AppMode.ADVANCED_CHAT)
         workflow_run = MagicMock()
         workflow_run.id = "run-1"
@@ -756,7 +761,7 @@ class TestGetResponseGenerator:
         result = AppGenerateService.get_response_generator(app_model=app, workflow_run=workflow_run)
         gen_instance.retrieve_events.assert_called_once()
 
-    def test_ended_workflow_run_still_returns_generator(self, mocker):
+    def test_ended_workflow_run_still_returns_generator(self, mocker: MockerFixture):
         """Even when the run is ended, the current code still returns a generator (TODO branch)."""
         app = _make_app(AppMode.WORKFLOW)
         workflow_run = MagicMock()
diff --git a/api/tests/unit_tests/services/test_app_generate_service_streaming_integration.py b/api/tests/unit_tests/services/test_app_generate_service_streaming_integration.py
index 30aa359b45..4293be8f72 100644
--- a/api/tests/unit_tests/services/test_app_generate_service_streaming_integration.py
+++ b/api/tests/unit_tests/services/test_app_generate_service_streaming_integration.py
@@ -89,7 +89,7 @@ class _FakeStreams:
 
 
 @pytest.fixture
-def _patch_get_channel_streams(monkeypatch):
+def _patch_get_channel_streams(monkeypatch: pytest.MonkeyPatch):
     from libs.broadcast_channel.redis.streams_channel import StreamsBroadcastChannel
 
     fake = _FakeStreams()
@@ -108,7 +108,7 @@ def _patch_get_channel_streams(monkeypatch):
 
 
 @pytest.fixture
-def _patch_get_channel_pubsub(monkeypatch):
+def _patch_get_channel_pubsub(monkeypatch: pytest.MonkeyPatch):
     from libs.broadcast_channel.redis.channel import BroadcastChannel as RedisBroadcastChannel
 
     store: dict[str, deque[bytes]] = defaultdict(deque)
@@ -163,7 +163,7 @@ def test_streams_full_flow_prepublish_and_replay():
 
 
 @pytest.mark.usefixtures("_patch_get_channel_pubsub")
-def test_pubsub_full_flow_start_on_subscribe_gated(monkeypatch):
+def test_pubsub_full_flow_start_on_subscribe_gated(monkeypatch: pytest.MonkeyPatch):
     # Speed up any potential timer if it accidentally triggers
     monkeypatch.setattr("services.app_generate_service.SSE_TASK_START_FALLBACK_MS", 50)
 
diff --git a/api/tests/unit_tests/services/test_audio_service.py b/api/tests/unit_tests/services/test_audio_service.py
index 83258fd1b7..5d148974f8 100644
--- a/api/tests/unit_tests/services/test_audio_service.py
+++ b/api/tests/unit_tests/services/test_audio_service.py
@@ -173,7 +173,8 @@ class AudioServiceTestDataFactory:
         file = Mock(spec=FileStorage)
         file.filename = filename
         file.mimetype = mimetype
-        file.read = Mock(return_value=content)
+        file.stream = Mock()
+        file.stream.read = Mock(return_value=content)
         for key, value in kwargs.items():
             setattr(file, key, value)
         return file
@@ -216,7 +217,7 @@ class TestAudioServiceASR:
     """Test speech-to-text (ASR) operations."""
 
     @patch("services.audio_service.ModelManager.for_tenant", autospec=True)
-    def test_transcript_asr_success_chat_mode(self, mock_model_manager_class, factory):
+    def test_transcript_asr_success_chat_mode(self, mock_model_manager_class, factory: AudioServiceTestDataFactory):
         """Test successful ASR transcription in CHAT mode."""
         # Arrange
         app_model_config = factory.create_app_model_config_mock(speech_to_text_dict={"enabled": True})
@@ -241,7 +242,9 @@ class TestAudioServiceASR:
         mock_model_manager_class.assert_called_once_with(tenant_id=app.tenant_id, user_id="user-123")
 
     @patch("services.audio_service.ModelManager.for_tenant", autospec=True)
-    def test_transcript_asr_success_advanced_chat_mode(self, mock_model_manager_class, factory):
+    def test_transcript_asr_success_advanced_chat_mode(
+        self, mock_model_manager_class, factory: AudioServiceTestDataFactory
+    ):
         """Test successful ASR transcription in ADVANCED_CHAT mode."""
         # Arrange
         workflow = factory.create_workflow_mock(features_dict={"speech_to_text": {"enabled": True}})
@@ -263,7 +266,7 @@ class TestAudioServiceASR:
         # Assert
         assert result == {"text": "Workflow transcribed text"}
 
-    def test_transcript_asr_raises_error_when_feature_disabled_chat_mode(self, factory):
+    def test_transcript_asr_raises_error_when_feature_disabled_chat_mode(self, factory: AudioServiceTestDataFactory):
         """Test that ASR raises error when speech-to-text is disabled in CHAT mode."""
         # Arrange
         app_model_config = factory.create_app_model_config_mock(speech_to_text_dict={"enabled": False})
@@ -277,7 +280,9 @@ class TestAudioServiceASR:
         with pytest.raises(ValueError, match="Speech to text is not enabled"):
             AudioService.transcript_asr(app_model=app, file=file)
 
-    def test_transcript_asr_raises_error_when_feature_disabled_workflow_mode(self, factory):
+    def test_transcript_asr_raises_error_when_feature_disabled_workflow_mode(
+        self, factory: AudioServiceTestDataFactory
+    ):
         """Test that ASR raises error when speech-to-text is disabled in WORKFLOW mode."""
         # Arrange
         workflow = factory.create_workflow_mock(features_dict={"speech_to_text": {"enabled": False}})
@@ -291,7 +296,7 @@ class TestAudioServiceASR:
         with pytest.raises(ValueError, match="Speech to text is not enabled"):
             AudioService.transcript_asr(app_model=app, file=file)
 
-    def test_transcript_asr_raises_error_when_workflow_missing(self, factory):
+    def test_transcript_asr_raises_error_when_workflow_missing(self, factory: AudioServiceTestDataFactory):
         """Test that ASR raises error when workflow is missing in WORKFLOW mode."""
         # Arrange
         app = factory.create_app_mock(
@@ -304,7 +309,7 @@ class TestAudioServiceASR:
         with pytest.raises(ValueError, match="Speech to text is not enabled"):
             AudioService.transcript_asr(app_model=app, file=file)
 
-    def test_transcript_asr_raises_error_when_no_file_uploaded(self, factory):
+    def test_transcript_asr_raises_error_when_no_file_uploaded(self, factory: AudioServiceTestDataFactory):
         """Test that ASR raises error when no file is uploaded."""
         # Arrange
         app_model_config = factory.create_app_model_config_mock(speech_to_text_dict={"enabled": True})
@@ -317,7 +322,7 @@ class TestAudioServiceASR:
         with pytest.raises(NoAudioUploadedServiceError):
             AudioService.transcript_asr(app_model=app, file=None)
 
-    def test_transcript_asr_raises_error_for_unsupported_audio_type(self, factory):
+    def test_transcript_asr_raises_error_for_unsupported_audio_type(self, factory: AudioServiceTestDataFactory):
         """Test that ASR raises error for unsupported audio file types."""
         # Arrange
         app_model_config = factory.create_app_model_config_mock(speech_to_text_dict={"enabled": True})
@@ -331,7 +336,7 @@ class TestAudioServiceASR:
         with pytest.raises(UnsupportedAudioTypeServiceError):
             AudioService.transcript_asr(app_model=app, file=file)
 
-    def test_transcript_asr_raises_error_for_large_file(self, factory):
+    def test_transcript_asr_raises_error_for_large_file(self, factory: AudioServiceTestDataFactory):
         """Test that ASR raises error when file exceeds size limit (30MB)."""
         # Arrange
         app_model_config = factory.create_app_model_config_mock(speech_to_text_dict={"enabled": True})
@@ -348,7 +353,9 @@ class TestAudioServiceASR:
             AudioService.transcript_asr(app_model=app, file=file)
 
     @patch("services.audio_service.ModelManager.for_tenant", autospec=True)
-    def test_transcript_asr_raises_error_when_no_model_instance(self, mock_model_manager_class, factory):
+    def test_transcript_asr_raises_error_when_no_model_instance(
+        self, mock_model_manager_class, factory: AudioServiceTestDataFactory
+    ):
         """Test that ASR raises error when no model instance is available."""
         # Arrange
         app_model_config = factory.create_app_model_config_mock(speech_to_text_dict={"enabled": True})
@@ -371,7 +378,7 @@ class TestAudioServiceTTS:
     """Test text-to-speech (TTS) operations."""
 
     @patch("services.audio_service.ModelManager.for_tenant", autospec=True)
-    def test_transcript_tts_with_text_success(self, mock_model_manager_class, factory):
+    def test_transcript_tts_with_text_success(self, mock_model_manager_class, factory: AudioServiceTestDataFactory):
         """Test successful TTS with text input."""
         # Arrange
         app_model_config = factory.create_app_model_config_mock(
@@ -405,7 +412,7 @@ class TestAudioServiceTTS:
         )
 
     @patch("services.audio_service.ModelManager.for_tenant", autospec=True)
-    def test_transcript_tts_with_default_voice(self, mock_model_manager_class, factory):
+    def test_transcript_tts_with_default_voice(self, mock_model_manager_class, factory: AudioServiceTestDataFactory):
         """Test TTS uses default voice when none specified."""
         # Arrange
         app_model_config = factory.create_app_model_config_mock(
@@ -435,7 +442,9 @@ class TestAudioServiceTTS:
         assert call_args.kwargs["voice"] == "default-voice"
 
     @patch("services.audio_service.ModelManager.for_tenant", autospec=True)
-    def test_transcript_tts_gets_first_available_voice_when_none_configured(self, mock_model_manager_class, factory):
+    def test_transcript_tts_gets_first_available_voice_when_none_configured(
+        self, mock_model_manager_class, factory: AudioServiceTestDataFactory
+    ):
         """Test TTS gets first available voice when none is configured."""
         # Arrange
         app_model_config = factory.create_app_model_config_mock(
@@ -467,7 +476,7 @@ class TestAudioServiceTTS:
     @patch("services.audio_service.WorkflowService", autospec=True)
     @patch("services.audio_service.ModelManager.for_tenant", autospec=True)
     def test_transcript_tts_workflow_mode_with_draft(
-        self, mock_model_manager_class, mock_workflow_service_class, factory
+        self, mock_model_manager_class, mock_workflow_service_class, factory: AudioServiceTestDataFactory
     ):
         """Test TTS in WORKFLOW mode with draft workflow."""
         # Arrange
@@ -499,7 +508,7 @@ class TestAudioServiceTTS:
         assert result == b"draft audio"
         mock_workflow_service.get_draft_workflow.assert_called_once_with(app_model=app)
 
-    def test_transcript_tts_raises_error_when_text_missing(self, factory):
+    def test_transcript_tts_raises_error_when_text_missing(self, factory: AudioServiceTestDataFactory):
         """Test that TTS raises error when text is missing."""
         # Arrange
         app = factory.create_app_mock()
@@ -509,7 +518,9 @@ class TestAudioServiceTTS:
             AudioService.transcript_tts(app_model=app, text=None)
 
     @patch("services.audio_service.ModelManager.for_tenant", autospec=True)
-    def test_transcript_tts_raises_error_when_no_voices_available(self, mock_model_manager_class, factory):
+    def test_transcript_tts_raises_error_when_no_voices_available(
+        self, mock_model_manager_class, factory: AudioServiceTestDataFactory
+    ):
         """Test that TTS raises error when no voices are available."""
         # Arrange
         app_model_config = factory.create_app_model_config_mock(
@@ -535,7 +546,7 @@ class TestAudioServiceTTSVoices:
     """Test TTS voice listing operations."""
 
     @patch("services.audio_service.ModelManager.for_tenant", autospec=True)
-    def test_transcript_tts_voices_success(self, mock_model_manager_class, factory):
+    def test_transcript_tts_voices_success(self, mock_model_manager_class, factory: AudioServiceTestDataFactory):
         """Test successful retrieval of TTS voices."""
         # Arrange
         tenant_id = "tenant-123"
@@ -560,7 +571,9 @@ class TestAudioServiceTTSVoices:
         mock_model_instance.get_tts_voices.assert_called_once_with(language)
 
     @patch("services.audio_service.ModelManager.for_tenant", autospec=True)
-    def test_transcript_tts_voices_raises_error_when_no_model_instance(self, mock_model_manager_class, factory):
+    def test_transcript_tts_voices_raises_error_when_no_model_instance(
+        self, mock_model_manager_class, factory: AudioServiceTestDataFactory
+    ):
         """Test that TTS voices raises error when no model instance is available."""
         # Arrange
         tenant_id = "tenant-123"
@@ -575,7 +588,9 @@ class TestAudioServiceTTSVoices:
             AudioService.transcript_tts_voices(tenant_id=tenant_id, language=language)
 
     @patch("services.audio_service.ModelManager.for_tenant", autospec=True)
-    def test_transcript_tts_voices_propagates_exceptions(self, mock_model_manager_class, factory):
+    def test_transcript_tts_voices_propagates_exceptions(
+        self, mock_model_manager_class, factory: AudioServiceTestDataFactory
+    ):
         """Test that TTS voices propagates exceptions from model instance."""
         # Arrange
         tenant_id = "tenant-123"
diff --git a/api/tests/unit_tests/services/test_clear_free_plan_tenant_expired_logs.py b/api/tests/unit_tests/services/test_clear_free_plan_tenant_expired_logs.py
index 1bbd214110..6c54e9c572 100644
--- a/api/tests/unit_tests/services/test_clear_free_plan_tenant_expired_logs.py
+++ b/api/tests/unit_tests/services/test_clear_free_plan_tenant_expired_logs.py
@@ -304,8 +304,11 @@ def test_process_tenant_processes_all_batches(monkeypatch: pytest.MonkeyPatch) -
     monkeypatch.setattr(service_module, "select", fake_select)
 
     # Repositories for workflow node executions and workflow runs
+    node_execution = SimpleNamespace(id="ne-1")
+    node_execution.__table__ = SimpleNamespace(columns=[SimpleNamespace(name="id")])
+
     node_repo = MagicMock()
-    node_repo.get_expired_executions_batch.side_effect = [[SimpleNamespace(id="ne-1")], []]
+    node_repo.get_expired_executions_batch.side_effect = [[node_execution], []]
     node_repo.delete_executions_by_ids.return_value = 1
 
     run_repo = MagicMock()
@@ -329,6 +332,21 @@ def test_process_tenant_processes_all_batches(monkeypatch: pytest.MonkeyPatch) -
     clear_related.assert_called()
 
 
+def test_serialize_record_falls_back_to_table_columns() -> None:
+    record = SimpleNamespace(id="ne-1", node_id="node-1")
+    record.__table__ = SimpleNamespace(
+        columns=[
+            SimpleNamespace(name="id"),
+            SimpleNamespace(name="node_id"),
+        ]
+    )
+
+    assert ClearFreePlanTenantExpiredLogs._serialize_record(record) == {
+        "id": "ne-1",
+        "node_id": "node-1",
+    }
+
+
 def test_process_with_tenant_ids_filters_by_plan_and_logs_errors(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setattr(service_module, "db", SimpleNamespace(engine=object()))
 
@@ -533,9 +551,14 @@ def test_process_tenant_repo_loops_break_on_empty_second_batch(monkeypatch: pyte
     monkeypatch.setattr(service_module, "select", fake_select)
 
     # Repos: first returns exactly batch items -> no "< batch" break, second returns [] -> hit the len==0 break.
+    node_execution_1 = SimpleNamespace(id="ne-1")
+    node_execution_1.__table__ = SimpleNamespace(columns=[SimpleNamespace(name="id")])
+    node_execution_2 = SimpleNamespace(id="ne-2")
+    node_execution_2.__table__ = SimpleNamespace(columns=[SimpleNamespace(name="id")])
+
     node_repo = MagicMock()
     node_repo.get_expired_executions_batch.side_effect = [
-        [SimpleNamespace(id="ne-1"), SimpleNamespace(id="ne-2")],
+        [node_execution_1, node_execution_2],
         [],
     ]
     node_repo.delete_executions_by_ids.return_value = 2
diff --git a/api/tests/unit_tests/services/test_credit_pool_service.py b/api/tests/unit_tests/services/test_credit_pool_service.py
new file mode 100644
index 0000000000..6956dbbd6e
--- /dev/null
+++ b/api/tests/unit_tests/services/test_credit_pool_service.py
@@ -0,0 +1,178 @@
+from collections.abc import Generator
+from contextlib import contextmanager
+from unittest.mock import patch
+from uuid import uuid4
+
+import pytest
+from sqlalchemy import create_engine, select
+from sqlalchemy.engine import Engine
+from sqlalchemy.orm import sessionmaker
+
+from core.errors.error import QuotaExceededError
+from models import TenantCreditPool
+from models.enums import ProviderQuotaType
+from services.credit_pool_service import CreditPoolService
+
+
+def _create_engine_with_pool(*, quota_limit: int, quota_used: int) -> tuple[Engine, str, str]:
+    engine = create_engine("sqlite:///:memory:")
+    TenantCreditPool.__table__.create(engine)
+    tenant_id = str(uuid4())
+    pool_id = str(uuid4())
+    with engine.begin() as connection:
+        connection.execute(
+            TenantCreditPool.__table__.insert(),
+            {
+                "id": pool_id,
+                "tenant_id": tenant_id,
+                "pool_type": ProviderQuotaType.TRIAL,
+                "quota_limit": quota_limit,
+                "quota_used": quota_used,
+            },
+        )
+    return engine, tenant_id, pool_id
+
+
+@contextmanager
+def _patched_session_factory(engine: Engine) -> Generator[None, None, None]:
+    session_maker = sessionmaker(bind=engine, expire_on_commit=False)
+    with patch("services.credit_pool_service.session_factory.get_session_maker", return_value=session_maker):
+        yield
+
+
+def _get_quota_used(*, engine: Engine, pool_id: str) -> int | None:
+    with engine.connect() as connection:
+        return connection.scalar(select(TenantCreditPool.quota_used).where(TenantCreditPool.id == pool_id))
+
+
+def test_get_pool_uses_configured_session_factory_without_flask_app_context() -> None:
+    engine, tenant_id, _ = _create_engine_with_pool(quota_limit=10, quota_used=2)
+
+    with _patched_session_factory(engine):
+        pool = CreditPoolService.get_pool(tenant_id=tenant_id, pool_type=ProviderQuotaType.TRIAL)
+
+    assert pool is not None
+    assert pool.tenant_id == tenant_id
+    assert pool.quota_used == 2
+
+
+def test_check_and_deduct_credits_deducts_exact_amount_when_sufficient() -> None:
+    engine, tenant_id, pool_id = _create_engine_with_pool(quota_limit=10, quota_used=2)
+
+    with _patched_session_factory(engine):
+        deducted_credits = CreditPoolService.check_and_deduct_credits(tenant_id=tenant_id, credits_required=3)
+
+    assert deducted_credits == 3
+    assert _get_quota_used(engine=engine, pool_id=pool_id) == 5
+
+
+def test_check_and_deduct_credits_returns_zero_for_non_positive_request() -> None:
+    assert CreditPoolService.check_and_deduct_credits(tenant_id=str(uuid4()), credits_required=0) == 0
+
+
+def test_check_and_deduct_credits_raises_when_pool_is_missing() -> None:
+    engine = create_engine("sqlite:///:memory:")
+    TenantCreditPool.__table__.create(engine)
+
+    with (
+        _patched_session_factory(engine),
+        pytest.raises(QuotaExceededError, match="Credit pool not found"),
+    ):
+        CreditPoolService.check_and_deduct_credits(tenant_id=str(uuid4()), credits_required=1)
+
+
+def test_check_and_deduct_credits_raises_when_pool_is_empty() -> None:
+    engine, tenant_id, pool_id = _create_engine_with_pool(quota_limit=10, quota_used=10)
+
+    with (
+        _patched_session_factory(engine),
+        pytest.raises(QuotaExceededError, match="No credits remaining"),
+    ):
+        CreditPoolService.check_and_deduct_credits(tenant_id=tenant_id, credits_required=1)
+
+    assert _get_quota_used(engine=engine, pool_id=pool_id) == 10
+
+
+def test_check_and_deduct_credits_raises_without_partial_deduction_when_insufficient() -> None:
+    engine, tenant_id, pool_id = _create_engine_with_pool(quota_limit=10, quota_used=9)
+
+    with (
+        _patched_session_factory(engine),
+        pytest.raises(QuotaExceededError, match="Insufficient credits remaining"),
+    ):
+        CreditPoolService.check_and_deduct_credits(tenant_id=tenant_id, credits_required=3)
+
+    assert _get_quota_used(engine=engine, pool_id=pool_id) == 9
+
+
+def test_check_and_deduct_credits_wraps_unexpected_deduction_errors() -> None:
+    engine, tenant_id, pool_id = _create_engine_with_pool(quota_limit=10, quota_used=2)
+
+    with (
+        _patched_session_factory(engine),
+        patch.object(CreditPoolService, "_get_locked_pool", side_effect=RuntimeError("database unavailable")),
+        pytest.raises(QuotaExceededError, match="Failed to deduct credits"),
+    ):
+        CreditPoolService.check_and_deduct_credits(tenant_id=tenant_id, credits_required=1)
+
+    assert _get_quota_used(engine=engine, pool_id=pool_id) == 2
+
+
+def test_deduct_credits_capped_returns_zero_for_non_positive_request() -> None:
+    assert CreditPoolService.deduct_credits_capped(tenant_id=str(uuid4()), credits_required=0) == 0
+
+
+def test_deduct_credits_capped_returns_zero_when_pool_is_missing() -> None:
+    engine = create_engine("sqlite:///:memory:")
+    TenantCreditPool.__table__.create(engine)
+
+    with _patched_session_factory(engine):
+        deducted_credits = CreditPoolService.deduct_credits_capped(tenant_id=str(uuid4()), credits_required=1)
+
+    assert deducted_credits == 0
+
+
+def test_deduct_credits_capped_returns_zero_when_pool_is_empty() -> None:
+    engine, tenant_id, pool_id = _create_engine_with_pool(quota_limit=10, quota_used=10)
+
+    with _patched_session_factory(engine):
+        deducted_credits = CreditPoolService.deduct_credits_capped(tenant_id=tenant_id, credits_required=1)
+
+    assert deducted_credits == 0
+    assert _get_quota_used(engine=engine, pool_id=pool_id) == 10
+
+
+def test_deduct_credits_capped_deducts_only_remaining_balance_when_insufficient() -> None:
+    engine, tenant_id, pool_id = _create_engine_with_pool(quota_limit=10, quota_used=9)
+
+    with _patched_session_factory(engine):
+        deducted_credits = CreditPoolService.deduct_credits_capped(tenant_id=tenant_id, credits_required=3)
+
+    assert deducted_credits == 1
+    assert _get_quota_used(engine=engine, pool_id=pool_id) == 10
+
+
+def test_deduct_credits_capped_wraps_unexpected_deduction_errors() -> None:
+    engine, tenant_id, pool_id = _create_engine_with_pool(quota_limit=10, quota_used=2)
+
+    with (
+        _patched_session_factory(engine),
+        patch.object(CreditPoolService, "_get_locked_pool", side_effect=RuntimeError("database unavailable")),
+        pytest.raises(QuotaExceededError, match="Failed to deduct credits"),
+    ):
+        CreditPoolService.deduct_credits_capped(tenant_id=tenant_id, credits_required=1)
+
+    assert _get_quota_used(engine=engine, pool_id=pool_id) == 2
+
+
+def test_deduct_credits_capped_reraises_quota_exceeded_errors() -> None:
+    engine, tenant_id, pool_id = _create_engine_with_pool(quota_limit=10, quota_used=2)
+
+    with (
+        _patched_session_factory(engine),
+        patch.object(CreditPoolService, "_get_locked_pool", side_effect=QuotaExceededError("quota unavailable")),
+        pytest.raises(QuotaExceededError, match="quota unavailable"),
+    ):
+        CreditPoolService.deduct_credits_capped(tenant_id=tenant_id, credits_required=1)
+
+    assert _get_quota_used(engine=engine, pool_id=pool_id) == 2
diff --git a/api/tests/unit_tests/services/test_dataset_service_document.py b/api/tests/unit_tests/services/test_dataset_service_document.py
index 1633194aa8..a78bc7f9d6 100644
--- a/api/tests/unit_tests/services/test_dataset_service_document.py
+++ b/api/tests/unit_tests/services/test_dataset_service_document.py
@@ -1297,7 +1297,7 @@ class TestDocumentServiceEstimateValidation:
     """Unit tests for estimate_args_validate branches."""
 
     def test_estimate_args_validate_rejects_missing_info_list(self):
-        with pytest.raises(ValueError, match="Data source info is required"):
+        with pytest.raises(ValueError, match="Field required"):
             DocumentService.estimate_args_validate({})
 
     def test_estimate_args_validate_sets_empty_rules_for_automatic_mode(self):
@@ -1357,7 +1357,7 @@ class TestDocumentServiceEstimateValidation:
             },
         }
 
-        with pytest.raises(ValueError, match="Summary index model provider name is required"):
+        with pytest.raises(ValueError, match="Field required"):
             DocumentService.estimate_args_validate(args)
 
 
diff --git a/api/tests/unit_tests/services/test_dataset_service_lock_not_owned.py b/api/tests/unit_tests/services/test_dataset_service_lock_not_owned.py
index 9a513c3fe6..f5879d973d 100644
--- a/api/tests/unit_tests/services/test_dataset_service_lock_not_owned.py
+++ b/api/tests/unit_tests/services/test_dataset_service_lock_not_owned.py
@@ -22,7 +22,7 @@ class FakeLock:
 
 
 @pytest.fixture
-def fake_current_user(monkeypatch):
+def fake_current_user(monkeypatch: pytest.MonkeyPatch):
     user = create_autospec(Account, instance=True)
     user.id = "user-1"
     user.current_tenant_id = "tenant-1"
@@ -31,7 +31,7 @@ def fake_current_user(monkeypatch):
 
 
 @pytest.fixture
-def fake_features(monkeypatch):
+def fake_features(monkeypatch: pytest.MonkeyPatch):
     """Features.billing.enabled == False to skip quota logic."""
     features = types.SimpleNamespace(
         billing=types.SimpleNamespace(enabled=False, subscription=types.SimpleNamespace(plan="ENTERPRISE")),
@@ -45,7 +45,7 @@ def fake_features(monkeypatch):
 
 
 @pytest.fixture
-def fake_lock(monkeypatch):
+def fake_lock(monkeypatch: pytest.MonkeyPatch):
     """Patch redis_client.lock to always raise LockNotOwnedError on enter."""
 
     def _fake_lock(name, timeout=None, *args, **kwargs):
@@ -61,7 +61,7 @@ def fake_lock(monkeypatch):
 
 
 def test_save_document_with_dataset_id_ignores_lock_not_owned(
-    monkeypatch,
+    monkeypatch: pytest.MonkeyPatch,
     fake_current_user,
     fake_features,
     fake_lock,
@@ -118,7 +118,7 @@ def test_save_document_with_dataset_id_ignores_lock_not_owned(
 
 
 def test_add_segment_ignores_lock_not_owned(
-    monkeypatch,
+    monkeypatch: pytest.MonkeyPatch,
     fake_current_user,
     fake_lock,
 ):
@@ -161,7 +161,7 @@ def test_add_segment_ignores_lock_not_owned(
 
 
 def test_multi_create_segment_ignores_lock_not_owned(
-    monkeypatch,
+    monkeypatch: pytest.MonkeyPatch,
     fake_current_user,
     fake_lock,
 ):
diff --git a/api/tests/unit_tests/services/test_dataset_service_segment.py b/api/tests/unit_tests/services/test_dataset_service_segment.py
index 6330e53765..1f8586e32f 100644
--- a/api/tests/unit_tests/services/test_dataset_service_segment.py
+++ b/api/tests/unit_tests/services/test_dataset_service_segment.py
@@ -282,7 +282,6 @@ class TestSegmentServiceQueries:
 
     def test_get_segment_by_id_returns_only_document_segment_instances(self):
         segment = DocumentSegment(
-            id="segment-1",
             tenant_id="tenant-1",
             dataset_id="dataset-1",
             document_id="doc-1",
@@ -292,7 +291,7 @@ class TestSegmentServiceQueries:
             tokens=2,
             created_by="user-1",
         )
-
+        segment.id = "segment-1"
         with patch("services.dataset_service.db") as mock_db:
             mock_db.session.scalar.return_value = segment
             result = SegmentService.get_segment_by_id("segment-1", "tenant-1")
@@ -307,7 +306,6 @@ class TestSegmentServiceQueries:
 
     def test_get_segments_by_document_and_dataset_returns_scalars_result(self):
         segment = DocumentSegment(
-            id="segment-1",
             tenant_id="tenant-1",
             dataset_id="dataset-1",
             document_id="doc-1",
@@ -318,6 +316,7 @@ class TestSegmentServiceQueries:
             created_by="user-1",
         )
 
+        segment.id = "segment-1"
         with patch("services.dataset_service.db") as mock_db:
             mock_db.session.scalars.return_value.all.return_value = [segment]
 
@@ -461,6 +460,7 @@ class TestSegmentServiceMutations:
             vector_service.create_segments_vector.side_effect = RuntimeError("vector failed")
 
             result = SegmentService.multi_create_segment(segments, document, dataset)
+            assert result
 
         assert len(result) == 2
         assert [segment.position for segment in result] == [2, 3]
diff --git a/api/tests/unit_tests/services/test_datasource_provider_service.py b/api/tests/unit_tests/services/test_datasource_provider_service.py
index c389c4a635..f374a29482 100644
--- a/api/tests/unit_tests/services/test_datasource_provider_service.py
+++ b/api/tests/unit_tests/services/test_datasource_provider_service.py
@@ -243,7 +243,7 @@ class TestDatasourceProviderService:
             assert service.get_datasource_credentials("t1", "prov", "org/plug") == {}
 
     def test_should_refresh_oauth_tokens_when_expired(self, service, mock_db_session, mock_user):
-        """Expired OAuth credential (expires_at near zero) triggers a silent refresh."""
+        """Expired OAuth credential (expires_at near zero) triggers a refresh."""
         p = MagicMock(spec=DatasourceProvider)
         p.auth_type = "oauth2"
         p.expires_at = 0  # expired
@@ -256,6 +256,24 @@ class TestDatasourceProviderService:
         ):
             service.get_datasource_credentials("t1", "prov", "org/plug")
 
+    def test_should_include_provider_name_when_refresh_fails(self, service, mock_db_session, mock_user):
+        p = MagicMock(spec=DatasourceProvider)
+        p.id = "cred-id"
+        p.name = "Credential"
+        p.auth_type = "oauth2"
+        p.expires_at = 0
+        p.encrypted_credentials = {"tok": "x"}
+        mock_db_session.scalar.return_value = p
+        with (
+            patch("services.datasource_provider_service.get_current_user", return_value=mock_user),
+            patch("services.datasource_provider_service.OAuthHandler") as oauth_handler,
+            patch.object(service, "get_oauth_client", return_value={"oc": "v"}),
+            patch.object(service, "decrypt_datasource_provider_credentials", return_value={"tok": "plain"}),
+        ):
+            oauth_handler.return_value.refresh_credentials.side_effect = RuntimeError("token endpoint failed")
+            with pytest.raises(ValueError, match="provider prov"):
+                service.get_datasource_credentials("t1", "prov", "org/plug")
+
     def test_should_return_decrypted_credentials_when_api_key_not_expired(self, service, mock_db_session, mock_user):
         """API key credentials with expires_at=-1 skip refresh and return directly."""
         p = MagicMock(spec=DatasourceProvider)
@@ -307,6 +325,51 @@ class TestDatasourceProviderService:
             result = service.get_all_datasource_credentials_by_provider("t1", "prov", "org/plug")
         assert len(result) == 1
 
+    def test_should_skip_failed_provider_when_refreshing_all_credentials(
+        self, service, mock_db_session, mock_user, caplog
+    ):
+        failed_provider = MagicMock(spec=DatasourceProvider)
+        failed_provider.id = "failed-cred"
+        failed_provider.name = "Failed"
+        failed_provider.auth_type = "oauth2"
+        failed_provider.expires_at = 0
+        working_provider = MagicMock(spec=DatasourceProvider)
+        working_provider.id = "working-cred"
+        working_provider.name = "Working"
+        working_provider.auth_type = "oauth2"
+        working_provider.expires_at = 0
+        mock_db_session.scalars.return_value.all.return_value = [failed_provider, working_provider]
+        with (
+            patch("services.datasource_provider_service.get_current_user", return_value=mock_user),
+            patch.object(
+                service,
+                "_refresh_datasource_credentials",
+                side_effect=[ValueError("refresh failed"), ({"t": "enc"}, 9999)],
+            ) as refresh_credentials,
+            patch.object(service, "decrypt_datasource_provider_credentials", return_value={"t": "plain"}),
+        ):
+            result = service.get_all_datasource_credentials_by_provider("t1", "prov", "org/plug")
+        assert result == [{"t": "plain"}]
+        assert refresh_credentials.call_count == 2
+        assert "Skipping datasource credentials for provider prov" in caplog.text
+
+    def test_should_return_valid_credentials_without_refresh_when_getting_all_credentials(
+        self, service, mock_db_session, mock_user
+    ):
+        p = MagicMock(spec=DatasourceProvider)
+        p.auth_type = "oauth2"
+        p.expires_at = -1
+        p.encrypted_credentials = {"t": "x"}
+        mock_db_session.scalars.return_value.all.return_value = [p]
+        with (
+            patch("services.datasource_provider_service.get_current_user", return_value=mock_user),
+            patch.object(service, "_refresh_datasource_credentials") as refresh_credentials,
+            patch.object(service, "decrypt_datasource_provider_credentials", return_value={"t": "plain"}),
+        ):
+            result = service.get_all_datasource_credentials_by_provider("t1", "prov", "org/plug")
+        assert result == [{"t": "plain"}]
+        refresh_credentials.assert_not_called()
+
     # -----------------------------------------------------------------------
     # update_datasource_provider_name (lines 236-303)
     # -----------------------------------------------------------------------
diff --git a/api/tests/unit_tests/services/test_file_service.py b/api/tests/unit_tests/services/test_file_service.py
index 8e1b22886b..69bd194a68 100644
--- a/api/tests/unit_tests/services/test_file_service.py
+++ b/api/tests/unit_tests/services/test_file_service.py
@@ -221,7 +221,7 @@ class TestFileService:
             mock_extract.return_value = "Extracted text content"
 
             # Execute
-            result = file_service.get_file_preview("file_id")
+            result = file_service.get_file_preview("file_id", "tenant_id")
 
             # Assert
             assert result == "Extracted text content"
@@ -229,7 +229,7 @@ class TestFileService:
     def test_get_file_preview_not_found(self, file_service, mock_db_session):
         mock_db_session.scalar.return_value = None
         with pytest.raises(NotFound, match="File not found"):
-            file_service.get_file_preview("non_existent")
+            file_service.get_file_preview("non_existent", "tenant_id")
 
     def test_get_file_preview_unsupported_type(self, file_service, mock_db_session):
         upload_file = MagicMock(spec=UploadFile)
@@ -237,7 +237,7 @@ class TestFileService:
         upload_file.extension = "exe"
         mock_db_session.scalar.return_value = upload_file
         with pytest.raises(UnsupportedFileTypeError):
-            file_service.get_file_preview("file_id")
+            file_service.get_file_preview("file_id", "tenant_id")
 
     def test_get_image_preview_success(self, file_service, mock_db_session):
         # Setup
diff --git a/api/tests/unit_tests/services/test_hit_testing_service_dump_records.py b/api/tests/unit_tests/services/test_hit_testing_service_dump_records.py
new file mode 100644
index 0000000000..f933c5e440
--- /dev/null
+++ b/api/tests/unit_tests/services/test_hit_testing_service_dump_records.py
@@ -0,0 +1,88 @@
+from unittest.mock import Mock, patch
+
+from services.hit_testing_service import HitTestingService
+
+
+def _retrieval_record(payload: dict):
+    record = Mock()
+    record.model_dump.return_value = payload
+    return record
+
+
+def _dataset_document(
+    document_id: str = "document-1",
+    name: str = "guide.md",
+    data_source_type: str = "upload_file",
+    doc_type: str | None = None,
+    doc_metadata: dict | None = None,
+):
+    document = Mock()
+    document.id = document_id
+    document.name = name
+    document.data_source_type = data_source_type
+    document.doc_type = doc_type
+    document.doc_metadata = doc_metadata
+    return document
+
+
+class TestHitTestingServiceDumpRecords:
+    def test_dump_dataset_document_returns_frontend_required_fields(self):
+        document = _dataset_document(doc_metadata={"source": "manual"})
+
+        assert HitTestingService._dump_dataset_document(document) == {
+            "id": "document-1",
+            "data_source_type": "upload_file",
+            "name": "guide.md",
+            "doc_type": None,
+            "doc_metadata": {"source": "manual"},
+        }
+
+    def test_dump_retrieval_records_returns_dumped_records_without_document_ids(self):
+        record = _retrieval_record({"segment": None, "score": 0.95})
+
+        assert HitTestingService._dump_retrieval_records([record]) == [{"segment": None, "score": 0.95}]
+
+    def test_dump_retrieval_records_injects_documents_and_keeps_non_segment_records(self):
+        record_without_segment = _retrieval_record({"segment": None, "score": 0.95})
+        record_with_document = _retrieval_record(
+            {
+                "segment": {
+                    "id": "segment-1",
+                    "document_id": "document-1",
+                },
+                "score": 0.9,
+            }
+        )
+        scalars_result = Mock()
+        scalars_result.all.return_value = [_dataset_document()]
+
+        with patch("services.hit_testing_service.db.session.scalars", return_value=scalars_result):
+            result = HitTestingService._dump_retrieval_records([record_without_segment, record_with_document])
+
+        assert result[0] == {"segment": None, "score": 0.95}
+        assert result[1]["segment"]["document"] == {
+            "id": "document-1",
+            "data_source_type": "upload_file",
+            "name": "guide.md",
+            "doc_type": None,
+            "doc_metadata": None,
+        }
+
+    def test_dump_retrieval_records_skips_records_with_missing_documents(self, caplog):
+        record = _retrieval_record(
+            {
+                "segment": {
+                    "id": "segment-1",
+                    "document_id": "missing-document",
+                },
+                "score": 0.95,
+            }
+        )
+        scalars_result = Mock()
+        scalars_result.all.return_value = []
+
+        with patch("services.hit_testing_service.db.session.scalars", return_value=scalars_result):
+            result = HitTestingService._dump_retrieval_records([record])
+
+        assert result == []
+        assert "Skipping hit-testing records with missing documents" in caplog.text
diff --git a/api/tests/unit_tests/services/test_human_input_service.py b/api/tests/unit_tests/services/test_human_input_service.py
index 55af564821..b6370c0365 100644
--- a/api/tests/unit_tests/services/test_human_input_service.py
+++ b/api/tests/unit_tests/services/test_human_input_service.py
@@ -3,6 +3,7 @@ from datetime import datetime, timedelta
 from unittest.mock import MagicMock
 
 import pytest
+from pytest_mock import MockerFixture
 
 import services.human_input_service as human_input_service_module
 from core.repositories.human_input_repository import (
@@ -11,8 +12,8 @@ from core.repositories.human_input_repository import (
 )
 from graphon.nodes.human_input.entities import (
     FormDefinition,
-    FormInput,
-    UserAction,
+    ParagraphInputConfig,
+    UserActionConfig,
 )
 from graphon.nodes.human_input.enums import FormInputType, HumanInputFormKind, HumanInputFormStatus
 from libs.datetime_utils import naive_utc_now
@@ -50,7 +51,7 @@ def sample_form_record():
         definition=FormDefinition(
             form_content="hello",
             inputs=[],
-            user_actions=[UserAction(id="submit", title="Submit")],
+            user_actions=[UserActionConfig(id="submit", title="Submit")],
             rendered_content="<p>hello</p>",
             expiration_time=naive_utc_now() + timedelta(hours=1),
         ),
@@ -177,7 +178,9 @@ def test_get_form_definition_by_token_for_console_uses_repository(sample_form_re
     assert form.get_definition() == console_record.definition
 
 
-def test_submit_form_by_token_calls_repository_and_enqueue(sample_form_record, mock_session_factory, mocker):
+def test_submit_form_by_token_calls_repository_and_enqueue(
+    sample_form_record, mock_session_factory, mocker: MockerFixture
+):
     session_factory, _ = mock_session_factory
     repo = MagicMock(spec=HumanInputFormSubmissionRepository)
     repo.get_by_token.return_value = sample_form_record
@@ -204,7 +207,9 @@ def test_submit_form_by_token_calls_repository_and_enqueue(sample_form_record, m
     enqueue_spy.assert_called_once_with(sample_form_record.workflow_run_id)
 
 
-def test_submit_form_by_token_skips_enqueue_for_delivery_test(sample_form_record, mock_session_factory, mocker):
+def test_submit_form_by_token_skips_enqueue_for_delivery_test(
+    sample_form_record, mock_session_factory, mocker: MockerFixture
+):
     session_factory, _ = mock_session_factory
     repo = MagicMock(spec=HumanInputFormSubmissionRepository)
     test_record = dataclasses.replace(
@@ -227,7 +232,9 @@ def test_submit_form_by_token_skips_enqueue_for_delivery_test(sample_form_record
     enqueue_spy.assert_not_called()
 
 
-def test_submit_form_by_token_passes_submission_user_id(sample_form_record, mock_session_factory, mocker):
+def test_submit_form_by_token_passes_submission_user_id(
+    sample_form_record, mock_session_factory, mocker: MockerFixture
+):
     session_factory, _ = mock_session_factory
     repo = MagicMock(spec=HumanInputFormSubmissionRepository)
     repo.get_by_token.return_value = sample_form_record
@@ -273,7 +280,7 @@ def test_submit_form_by_token_missing_inputs(sample_form_record, mock_session_fa
 
     definition_with_input = FormDefinition(
         form_content="hello",
-        inputs=[FormInput(type=FormInputType.TEXT_INPUT, output_variable_name="content")],
+        inputs=[ParagraphInputConfig(type=FormInputType.PARAGRAPH, output_variable_name="content")],
         user_actions=sample_form_record.definition.user_actions,
         rendered_content="<p>hello</p>",
         expiration_time=sample_form_record.expiration_time,
@@ -314,7 +321,7 @@ def test_form_submitted_error_init():
     assert error.code == 412
 
 
-def test_human_input_service_init_with_engine(mocker):
+def test_human_input_service_init_with_engine(mocker: MockerFixture):
     engine = MagicMock(spec=human_input_service_module.Engine)
     sessionmaker_mock = mocker.patch("services.human_input_service.sessionmaker")
 
@@ -371,7 +378,7 @@ def test_submit_form_by_token_delivery_not_enabled(mock_session_factory):
         service.submit_form_by_token(RecipientType.STANDALONE_WEB_APP, "token", "action", {})
 
 
-def test_submit_form_by_token_no_workflow_run_id(sample_form_record, mock_session_factory, mocker):
+def test_submit_form_by_token_no_workflow_run_id(sample_form_record, mock_session_factory, mocker: MockerFixture):
     session_factory, _ = mock_session_factory
     repo = MagicMock(spec=HumanInputFormSubmissionRepository)
     repo.get_by_token.return_value = sample_form_record
diff --git a/api/tests/unit_tests/services/test_message_service.py b/api/tests/unit_tests/services/test_message_service.py
index 7adc15d63e..51f8b3ef5b 100644
--- a/api/tests/unit_tests/services/test_message_service.py
+++ b/api/tests/unit_tests/services/test_message_service.py
@@ -906,7 +906,7 @@ class TestMessageServiceSuggestedQuestions:
     ):
         """Test successful suggested questions generation in basic Chat mode."""
         # Arrange
-        app = factory.create_app_mock(mode=AppMode.CHAT.value)
+        app = factory.create_app_mock(mode=AppMode.CHAT)
         user = factory.create_end_user_mock()
         message = factory.create_message_mock()
         mock_get_message.return_value = message
@@ -953,7 +953,7 @@ class TestMessageServiceSuggestedQuestions:
         """Test suggested question generation uses frontend configured model and prompt."""
         from core.app.entities.app_invoke_entities import InvokeFrom
 
-        app = factory.create_app_mock(mode=AppMode.CHAT.value)
+        app = factory.create_app_mock(mode=AppMode.CHAT)
         app.tenant_id = "tenant-123"
         user = factory.create_end_user_mock()
         message = factory.create_message_mock()
@@ -1024,7 +1024,7 @@ class TestMessageServiceSuggestedQuestions:
         factory,
     ):
         """Test invalid frontend configured model falls back to tenant default model."""
-        app = factory.create_app_mock(mode=AppMode.CHAT.value)
+        app = factory.create_app_mock(mode=AppMode.CHAT)
         app.tenant_id = "tenant-123"
         user = factory.create_end_user_mock()
         message = factory.create_message_mock()
diff --git a/api/tests/unit_tests/services/test_model_load_balancing_service.py b/api/tests/unit_tests/services/test_model_load_balancing_service.py
index 3119af40a2..beecf73caa 100644
--- a/api/tests/unit_tests/services/test_model_load_balancing_service.py
+++ b/api/tests/unit_tests/services/test_model_load_balancing_service.py
@@ -104,7 +104,7 @@ def test_enable_disable_model_load_balancing_should_call_provider_configuration_
     service.provider_manager.get_configurations.return_value = {"openai": provider_configuration}
 
     # Act
-    getattr(service, method_name)("tenant-1", "openai", "gpt-4o-mini", ModelType.LLM.value)
+    getattr(service, method_name)("tenant-1", "openai", "gpt-4o-mini", ModelType.LLM)
 
     # Assert
     getattr(provider_configuration, expected_provider_method).assert_called_once_with(
@@ -125,7 +125,7 @@ def test_enable_disable_model_load_balancing_should_raise_value_error_when_provi
 
     # Act + Assert
     with pytest.raises(ValueError, match="Provider openai does not exist"):
-        getattr(service, method_name)("tenant-1", "openai", "gpt-4o-mini", ModelType.LLM.value)
+        getattr(service, method_name)("tenant-1", "openai", "gpt-4o-mini", ModelType.LLM)
 
 
 def test_get_load_balancing_configs_should_raise_value_error_when_provider_missing(
@@ -136,7 +136,7 @@ def test_get_load_balancing_configs_should_raise_value_error_when_provider_missi
 
     # Act + Assert
     with pytest.raises(ValueError, match="Provider openai does not exist"):
-        service.get_load_balancing_configs("tenant-1", "openai", "gpt-4o-mini", ModelType.LLM.value)
+        service.get_load_balancing_configs("tenant-1", "openai", "gpt-4o-mini", ModelType.LLM)
 
 
 def test_get_load_balancing_configs_should_insert_inherit_config_when_missing_for_custom_provider(
@@ -177,7 +177,7 @@ def test_get_load_balancing_configs_should_insert_inherit_config_when_missing_fo
         "tenant-1",
         "openai",
         "gpt-4o-mini",
-        ModelType.LLM.value,
+        ModelType.LLM,
     )
 
     # Assert
@@ -238,7 +238,7 @@ def test_get_load_balancing_configs_should_reorder_existing_inherit_and_tolerate
         "tenant-1",
         "openai",
         "gpt-4o-mini",
-        ModelType.LLM.value,
+        ModelType.LLM,
         config_from="predefined-model",
     )
 
@@ -259,7 +259,7 @@ def test_get_load_balancing_config_should_raise_value_error_when_provider_missin
 
     # Act + Assert
     with pytest.raises(ValueError, match="Provider openai does not exist"):
-        service.get_load_balancing_config("tenant-1", "openai", "gpt-4o-mini", ModelType.LLM.value, "cfg-1")
+        service.get_load_balancing_config("tenant-1", "openai", "gpt-4o-mini", ModelType.LLM, "cfg-1")
 
 
 def test_get_load_balancing_config_should_return_none_when_config_not_found(
@@ -272,7 +272,7 @@ def test_get_load_balancing_config_should_return_none_when_config_not_found(
     mock_db.session.scalar.return_value = None
 
     # Act
-    result = service.get_load_balancing_config("tenant-1", "openai", "gpt-4o-mini", ModelType.LLM.value, "cfg-1")
+    result = service.get_load_balancing_config("tenant-1", "openai", "gpt-4o-mini", ModelType.LLM, "cfg-1")
 
     # Assert
     assert result is None
@@ -292,7 +292,7 @@ def test_get_load_balancing_config_should_return_obfuscated_payload_when_config_
     mock_db.session.scalar.return_value = config
 
     # Act
-    result = service.get_load_balancing_config("tenant-1", "openai", "gpt-4o-mini", ModelType.LLM.value, "cfg-1")
+    result = service.get_load_balancing_config("tenant-1", "openai", "gpt-4o-mini", ModelType.LLM, "cfg-1")
 
     # Assert
     assert result == {
@@ -335,7 +335,7 @@ def test_update_load_balancing_configs_should_raise_value_error_when_provider_mi
             "tenant-1",
             "openai",
             "gpt-4o-mini",
-            ModelType.LLM.value,
+            ModelType.LLM,
             [],
             "custom-model",
         )
@@ -354,7 +354,7 @@ def test_update_load_balancing_configs_should_raise_value_error_when_configs_is_
             "tenant-1",
             "openai",
             "gpt-4o-mini",
-            ModelType.LLM.value,
+            ModelType.LLM,
             cast(list[dict[str, object]], "invalid-configs"),
             "custom-model",
         )
@@ -375,7 +375,7 @@ def test_update_load_balancing_configs_should_raise_value_error_when_config_item
             "tenant-1",
             "openai",
             "gpt-4o-mini",
-            ModelType.LLM.value,
+            ModelType.LLM,
             cast(list[dict[str, object]], ["bad-item"]),
             "custom-model",
         )
@@ -397,7 +397,7 @@ def test_update_load_balancing_configs_should_raise_value_error_when_credential_
             "tenant-1",
             "openai",
             "gpt-4o-mini",
-            ModelType.LLM.value,
+            ModelType.LLM,
             [{"credential_id": "cred-1", "enabled": True}],
             "predefined-model",
         )
@@ -418,7 +418,7 @@ def test_update_load_balancing_configs_should_raise_value_error_when_name_or_ena
             "tenant-1",
             "openai",
             "gpt-4o-mini",
-            ModelType.LLM.value,
+            ModelType.LLM,
             [{"enabled": True}],
             "custom-model",
         )
@@ -428,7 +428,7 @@ def test_update_load_balancing_configs_should_raise_value_error_when_name_or_ena
             "tenant-1",
             "openai",
             "gpt-4o-mini",
-            ModelType.LLM.value,
+            ModelType.LLM,
             [{"name": "cfg-without-enabled"}],
             "custom-model",
         )
@@ -450,7 +450,7 @@ def test_update_load_balancing_configs_should_raise_value_error_when_existing_co
             "tenant-1",
             "openai",
             "gpt-4o-mini",
-            ModelType.LLM.value,
+            ModelType.LLM,
             [{"id": "cfg-2", "name": "invalid", "enabled": True}],
             "custom-model",
         )
@@ -472,7 +472,7 @@ def test_update_load_balancing_configs_should_raise_value_error_when_credentials
             "tenant-1",
             "openai",
             "gpt-4o-mini",
-            ModelType.LLM.value,
+            ModelType.LLM,
             [{"id": "cfg-1", "name": "new", "enabled": True, "credentials": "bad"}],
             "custom-model",
         )
@@ -482,7 +482,7 @@ def test_update_load_balancing_configs_should_raise_value_error_when_credentials
             "tenant-1",
             "openai",
             "gpt-4o-mini",
-            ModelType.LLM.value,
+            ModelType.LLM,
             [{"name": "new-config", "enabled": True, "credentials": "bad"}],
             "custom-model",
         )
@@ -519,7 +519,7 @@ def test_update_load_balancing_configs_should_update_existing_create_new_and_del
         "tenant-1",
         "openai",
         "gpt-4o-mini",
-        ModelType.LLM.value,
+        ModelType.LLM,
         [
             {"id": "cfg-1", "name": "updated-name", "enabled": False, "credentials": {"api_key": "plain"}},
             {"name": "new-config", "enabled": True, "credentials": {"api_key": "plain"}},
@@ -553,7 +553,7 @@ def test_update_load_balancing_configs_should_raise_value_error_for_invalid_new_
             "tenant-1",
             "openai",
             "gpt-4o-mini",
-            ModelType.LLM.value,
+            ModelType.LLM,
             [{"name": "__inherit__", "enabled": True, "credentials": {"api_key": "x"}}],
             "custom-model",
         )
@@ -563,7 +563,7 @@ def test_update_load_balancing_configs_should_raise_value_error_for_invalid_new_
             "tenant-1",
             "openai",
             "gpt-4o-mini",
-            ModelType.LLM.value,
+            ModelType.LLM,
             [{"name": "new", "enabled": True}],
             "custom-model",
         )
@@ -585,7 +585,7 @@ def test_update_load_balancing_configs_should_create_from_existing_provider_cred
         "tenant-1",
         "openai",
         "gpt-4o-mini",
-        ModelType.LLM.value,
+        ModelType.LLM,
         [{"credential_id": "cred-1", "enabled": True}],
         "predefined-model",
     )
@@ -611,7 +611,7 @@ def test_validate_load_balancing_credentials_should_raise_value_error_when_provi
             "tenant-1",
             "openai",
             "gpt-4o-mini",
-            ModelType.LLM.value,
+            ModelType.LLM,
             {"api_key": "plain"},
         )
 
@@ -631,7 +631,7 @@ def test_validate_load_balancing_credentials_should_raise_value_error_when_confi
             "tenant-1",
             "openai",
             "gpt-4o-mini",
-            ModelType.LLM.value,
+            ModelType.LLM,
             {"api_key": "plain"},
             config_id="cfg-1",
         )
@@ -654,7 +654,7 @@ def test_validate_load_balancing_credentials_should_delegate_to_custom_validate_
         "tenant-1",
         "openai",
         "gpt-4o-mini",
-        ModelType.LLM.value,
+        ModelType.LLM,
         {"api_key": "plain"},
         config_id="cfg-1",
     )
@@ -662,7 +662,7 @@ def test_validate_load_balancing_credentials_should_delegate_to_custom_validate_
         "tenant-1",
         "openai",
         "gpt-4o-mini",
-        ModelType.LLM.value,
+        ModelType.LLM,
         {"api_key": "plain"},
     )
 
diff --git a/api/tests/unit_tests/services/test_model_provider_service.py b/api/tests/unit_tests/services/test_model_provider_service.py
index 28d459eac9..9e4eeb2d6e 100644
--- a/api/tests/unit_tests/services/test_model_provider_service.py
+++ b/api/tests/unit_tests/services/test_model_provider_service.py
@@ -90,7 +90,7 @@ class TestModelProviderServiceConfiguration:
         )
         manager.get_configurations.return_value = {"openai": allowed, "embedding": filtered}
 
-        result = service.get_provider_list(tenant_id="tenant-1", model_type=ModelType.LLM.value)
+        result = service.get_provider_list(tenant_id="tenant-1", model_type=ModelType.LLM)
 
         assert len(result) == 1
         assert result[0].provider == "openai"
@@ -232,7 +232,7 @@ class TestModelProviderServiceDelegation:
                 {
                     "tenant_id": "tenant-1",
                     "provider": "openai",
-                    "model_type": ModelType.LLM.value,
+                    "model_type": ModelType.LLM,
                     "model": "gpt-4o",
                     "credential_id": "cred-1",
                 },
@@ -245,7 +245,7 @@ class TestModelProviderServiceDelegation:
                 {
                     "tenant_id": "tenant-1",
                     "provider": "openai",
-                    "model_type": ModelType.LLM.value,
+                    "model_type": ModelType.LLM,
                     "model": "gpt-4o",
                     "credentials": {"api_key": "x"},
                 },
@@ -258,7 +258,7 @@ class TestModelProviderServiceDelegation:
                 {
                     "tenant_id": "tenant-1",
                     "provider": "openai",
-                    "model_type": ModelType.LLM.value,
+                    "model_type": ModelType.LLM,
                     "model": "gpt-4o",
                     "credentials": {"api_key": "x"},
                     "credential_name": "cred-a",
@@ -277,7 +277,7 @@ class TestModelProviderServiceDelegation:
                 {
                     "tenant_id": "tenant-1",
                     "provider": "openai",
-                    "model_type": ModelType.LLM.value,
+                    "model_type": ModelType.LLM,
                     "model": "gpt-4o",
                     "credentials": {"api_key": "x"},
                     "credential_id": "cred-1",
@@ -298,7 +298,7 @@ class TestModelProviderServiceDelegation:
                 {
                     "tenant_id": "tenant-1",
                     "provider": "openai",
-                    "model_type": ModelType.LLM.value,
+                    "model_type": ModelType.LLM,
                     "model": "gpt-4o",
                     "credential_id": "cred-1",
                 },
@@ -311,7 +311,7 @@ class TestModelProviderServiceDelegation:
                 {
                     "tenant_id": "tenant-1",
                     "provider": "openai",
-                    "model_type": ModelType.LLM.value,
+                    "model_type": ModelType.LLM,
                     "model": "gpt-4o",
                     "credential_id": "cred-1",
                 },
@@ -324,7 +324,7 @@ class TestModelProviderServiceDelegation:
                 {
                     "tenant_id": "tenant-1",
                     "provider": "openai",
-                    "model_type": ModelType.LLM.value,
+                    "model_type": ModelType.LLM,
                     "model": "gpt-4o",
                     "credential_id": "cred-1",
                 },
@@ -337,7 +337,7 @@ class TestModelProviderServiceDelegation:
                 {
                     "tenant_id": "tenant-1",
                     "provider": "openai",
-                    "model_type": ModelType.LLM.value,
+                    "model_type": ModelType.LLM,
                     "model": "gpt-4o",
                 },
                 "delete_custom_model",
@@ -425,7 +425,7 @@ class TestModelProviderServiceListingsAndDefaults:
         provider_configurations = SimpleNamespace(get_models=MagicMock(return_value=models))
         manager.get_configurations.return_value = provider_configurations
 
-        result = service.get_models_by_model_type(tenant_id="tenant-1", model_type=ModelType.LLM.value)
+        result = service.get_models_by_model_type(tenant_id="tenant-1", model_type=ModelType.LLM)
 
         provider_configurations.get_models.assert_called_once_with(model_type=ModelType.LLM, only_active=True)
         assert len(result) == 1
@@ -495,7 +495,7 @@ class TestModelProviderServiceListingsAndDefaults:
             ),
         )
 
-        result = service.get_default_model_of_model_type(tenant_id="tenant-1", model_type=ModelType.LLM.value)
+        result = service.get_default_model_of_model_type(tenant_id="tenant-1", model_type=ModelType.LLM)
 
         assert result is not None
         assert result.model == "gpt-4o"
@@ -506,7 +506,7 @@ class TestModelProviderServiceListingsAndDefaults:
         service, manager = _create_service_with_mocked_manager()
         manager.get_default_model.return_value = None
 
-        result = service.get_default_model_of_model_type(tenant_id="tenant-1", model_type=ModelType.LLM.value)
+        result = service.get_default_model_of_model_type(tenant_id="tenant-1", model_type=ModelType.LLM)
 
         assert result is None
 
@@ -514,7 +514,7 @@ class TestModelProviderServiceListingsAndDefaults:
         service, manager = _create_service_with_mocked_manager()
         manager.get_default_model.side_effect = RuntimeError("boom")
 
-        result = service.get_default_model_of_model_type(tenant_id="tenant-1", model_type=ModelType.LLM.value)
+        result = service.get_default_model_of_model_type(tenant_id="tenant-1", model_type=ModelType.LLM)
 
         assert result is None
 
@@ -523,7 +523,7 @@ class TestModelProviderServiceListingsAndDefaults:
 
         service.update_default_model_of_model_type(
             tenant_id="tenant-1",
-            model_type=ModelType.LLM.value,
+            model_type=ModelType.LLM,
             provider="openai",
             model="gpt-4o",
         )
@@ -593,7 +593,7 @@ class TestModelProviderServiceListingsAndDefaults:
             tenant_id="tenant-1",
             provider="openai",
             model="gpt-4o",
-            model_type=ModelType.LLM.value,
+            model_type=ModelType.LLM,
         )
 
         getattr(provider_configuration, provider_method_name).assert_called_once_with(
diff --git a/api/tests/unit_tests/services/test_recommended_app_service.py b/api/tests/unit_tests/services/test_recommended_app_service.py
new file mode 100644
index 0000000000..030d0d73fe
--- /dev/null
+++ b/api/tests/unit_tests/services/test_recommended_app_service.py
@@ -0,0 +1,46 @@
+"""Unit tests for RecommendedAppService.get_recommend_app_detail null handling.
+
+Regression tests for #36096: accessing result['id'] when the retrieval
+returns None causes a TypeError / KeyError in self-hosted mode.
+"""
+
+from types import SimpleNamespace
+from unittest.mock import MagicMock, patch
+
+from services.recommended_app_service import RecommendedAppService
+
+
+class TestGetRecommendAppDetailNullCheck:
+    @patch("services.recommended_app_service.FeatureService", autospec=True)
+    @patch("services.recommended_app_service.RecommendAppRetrievalFactory", autospec=True)
+    @patch("services.recommended_app_service.dify_config", autospec=True)
+    def test_returns_none_when_retrieval_returns_none_and_trial_disabled(
+        self, mock_config, mock_factory_class, mock_feature_service
+    ):
+        mock_config.HOSTED_FETCH_APP_TEMPLATES_MODE = "remote"
+        mock_instance = MagicMock()
+        mock_instance.get_recommend_app_detail.return_value = None
+        mock_factory_class.get_recommend_app_factory.return_value = MagicMock(return_value=mock_instance)
+        mock_feature_service.get_system_features.return_value = SimpleNamespace(enable_trial_app=False)
+
+        result = RecommendedAppService.get_recommend_app_detail("nonexistent")
+
+        assert result is None
+
+    @patch("services.recommended_app_service.FeatureService", autospec=True)
+    @patch("services.recommended_app_service.RecommendAppRetrievalFactory", autospec=True)
+    @patch("services.recommended_app_service.dify_config", autospec=True)
+    def test_returns_none_when_retrieval_returns_none_and_trial_enabled(
+        self, mock_config, mock_factory_class, mock_feature_service
+    ):
+        """Regression for #36096: must not crash when result is None and enable_trial_app is True."""
+        mock_config.HOSTED_FETCH_APP_TEMPLATES_MODE = "remote"
+        mock_instance = MagicMock()
+        mock_instance.get_recommend_app_detail.return_value = None
+        mock_factory_class.get_recommend_app_factory.return_value = MagicMock(return_value=mock_instance)
+        mock_feature_service.get_system_features.return_value = SimpleNamespace(enable_trial_app=True)
+
+        result = RecommendedAppService.get_recommend_app_detail("nonexistent")
+
+        assert result is None
+        mock_instance.get_recommend_app_detail.assert_called_once_with("nonexistent")
diff --git a/api/tests/unit_tests/services/test_trigger_provider_service.py b/api/tests/unit_tests/services/test_trigger_provider_service.py
index 6eba60e5f1..4da4af2d93 100644
--- a/api/tests/unit_tests/services/test_trigger_provider_service.py
+++ b/api/tests/unit_tests/services/test_trigger_provider_service.py
@@ -325,7 +325,7 @@ def test_update_trigger_subscription_should_raise_error_when_name_conflicts(
         id="sub-1",
         name="old",
         provider_id="langgenius/github/github",
-        credential_type=CredentialType.API_KEY.value,
+        credential_type=CredentialType.API_KEY,
     )
     mock_session.scalar.side_effect = [subscription, object()]  # found sub, name conflict
     _mock_get_trigger_provider(mocker, provider_controller)
@@ -350,7 +350,7 @@ def test_update_trigger_subscription_should_update_fields_and_clear_cache(
         properties={"project": "enc-old"},
         parameters={"event": "old"},
         credentials={"api_key": "enc-old"},
-        credential_type=CredentialType.API_KEY.value,
+        credential_type=CredentialType.API_KEY,
         credential_expires_at=0,
         expires_at=0,
     )
@@ -456,7 +456,7 @@ def test_delete_trigger_provider_should_delete_and_clear_cache_even_if_unsubscri
         id="sub-1",
         user_id="user-1",
         provider_id=str(provider_id),
-        credential_type=CredentialType.OAUTH2.value,
+        credential_type=CredentialType.OAUTH2,
         credentials={"token": "enc"},
         to_entity=lambda: SimpleNamespace(id="sub-1"),
     )
@@ -492,7 +492,7 @@ def test_delete_trigger_provider_should_skip_unsubscribe_for_unauthorized(
         id="sub-2",
         user_id="user-1",
         provider_id=str(provider_id),
-        credential_type=CredentialType.UNAUTHORIZED.value,
+        credential_type=CredentialType.UNAUTHORIZED,
         credentials={},
         to_entity=lambda: SimpleNamespace(id="sub-2"),
     )
@@ -527,7 +527,7 @@ def test_refresh_oauth_token_should_raise_error_for_non_oauth_credentials(
     mocker: MockerFixture, mock_session: MagicMock
 ) -> None:
     # Arrange
-    subscription = SimpleNamespace(credential_type=CredentialType.API_KEY.value)
+    subscription = SimpleNamespace(credential_type=CredentialType.API_KEY)
     mock_session.scalar.return_value = subscription
 
     # Act + Assert
@@ -545,7 +545,7 @@ def test_refresh_oauth_token_should_refresh_and_persist_new_credentials(
     subscription = SimpleNamespace(
         provider_id=str(provider_id),
         user_id="user-1",
-        credential_type=CredentialType.OAUTH2.value,
+        credential_type=CredentialType.OAUTH2,
         credentials={"access_token": "enc"},
         credential_expires_at=0,
     )
@@ -613,7 +613,7 @@ def test_refresh_subscription_should_refresh_and_persist_properties(
         parameters={"event": "push"},
         properties={"p": "enc"},
         credentials={"c": "enc"},
-        credential_type=CredentialType.API_KEY.value,
+        credential_type=CredentialType.API_KEY,
     )
     mock_session.scalar.return_value = subscription
     _mock_get_trigger_provider(mocker, provider_controller)
@@ -989,7 +989,7 @@ def test_verify_subscription_credentials_should_raise_when_api_key_validation_fa
     provider_controller: MagicMock,
 ) -> None:
     # Arrange
-    subscription = SimpleNamespace(credential_type=CredentialType.API_KEY.value, credentials={"api_key": "old"})
+    subscription = SimpleNamespace(credential_type=CredentialType.API_KEY, credentials={"api_key": "old"})
     _mock_get_trigger_provider(mocker, provider_controller)
     mocker.patch.object(TriggerProviderService, "get_subscription_by_id", return_value=subscription)
     provider_controller.validate_credentials.side_effect = RuntimeError("bad credentials")
@@ -1012,7 +1012,7 @@ def test_verify_subscription_credentials_should_return_verified_when_api_key_val
     provider_controller: MagicMock,
 ) -> None:
     # Arrange
-    subscription = SimpleNamespace(credential_type=CredentialType.API_KEY.value, credentials={"api_key": "old"})
+    subscription = SimpleNamespace(credential_type=CredentialType.API_KEY, credentials={"api_key": "old"})
     _mock_get_trigger_provider(mocker, provider_controller)
     mocker.patch.object(TriggerProviderService, "get_subscription_by_id", return_value=subscription)
 
@@ -1036,7 +1036,7 @@ def test_verify_subscription_credentials_should_return_verified_for_non_api_key_
     provider_controller: MagicMock,
 ) -> None:
     # Arrange
-    subscription = SimpleNamespace(credential_type=CredentialType.OAUTH2.value, credentials={})
+    subscription = SimpleNamespace(credential_type=CredentialType.OAUTH2, credentials={})
     _mock_get_trigger_provider(mocker, provider_controller)
     mocker.patch.object(TriggerProviderService, "get_subscription_by_id", return_value=subscription)
 
@@ -1100,7 +1100,7 @@ def test_rebuild_trigger_subscription_should_raise_for_unsupported_credential_ty
     provider_controller: MagicMock,
 ) -> None:
     # Arrange
-    subscription = SimpleNamespace(credential_type=CredentialType.UNAUTHORIZED.value)
+    subscription = SimpleNamespace(credential_type=CredentialType.UNAUTHORIZED)
     _mock_get_trigger_provider(mocker, provider_controller)
     mocker.patch.object(TriggerProviderService, "get_subscription_by_id", return_value=subscription)
 
@@ -1126,7 +1126,7 @@ def test_rebuild_trigger_subscription_should_raise_when_unsubscribe_fails(
         id="sub-1",
         user_id="user-1",
         endpoint_id="endpoint-1",
-        credential_type=CredentialType.API_KEY.value,
+        credential_type=CredentialType.API_KEY,
         credentials={"api_key": "old"},
         to_entity=lambda: SimpleNamespace(id="sub-1"),
     )
@@ -1159,7 +1159,7 @@ def test_rebuild_trigger_subscription_should_resubscribe_and_update_existing_sub
         id="sub-1",
         user_id="user-1",
         endpoint_id="endpoint-1",
-        credential_type=CredentialType.API_KEY.value,
+        credential_type=CredentialType.API_KEY,
         credentials={"api_key": "old-key"},
         to_entity=lambda: SimpleNamespace(id="sub-1"),
     )
diff --git a/api/tests/unit_tests/services/test_webhook_service.py b/api/tests/unit_tests/services/test_webhook_service.py
index ffdcc046f9..a2b56fe777 100644
--- a/api/tests/unit_tests/services/test_webhook_service.py
+++ b/api/tests/unit_tests/services/test_webhook_service.py
@@ -140,7 +140,7 @@ class TestWebhookServiceUnit:
             assert args[1] == "text/plain"
             assert args[2] is webhook_trigger
 
-    def test_detect_binary_mimetype_uses_magic(self, monkeypatch):
+    def test_detect_binary_mimetype_uses_magic(self, monkeypatch: pytest.MonkeyPatch):
         """python-magic output should be used when available."""
         fake_magic = MagicMock()
         fake_magic.from_buffer.return_value = "image/png"
@@ -151,7 +151,7 @@ class TestWebhookServiceUnit:
         assert result == "image/png"
         fake_magic.from_buffer.assert_called_once()
 
-    def test_detect_binary_mimetype_fallback_without_magic(self, monkeypatch):
+    def test_detect_binary_mimetype_fallback_without_magic(self, monkeypatch: pytest.MonkeyPatch):
         """Fallback MIME type should be used when python-magic is unavailable."""
         monkeypatch.setattr("services.trigger.webhook_service.magic", None)
 
@@ -159,7 +159,7 @@ class TestWebhookServiceUnit:
 
         assert result == "application/octet-stream"
 
-    def test_detect_binary_mimetype_handles_magic_exception(self, monkeypatch):
+    def test_detect_binary_mimetype_handles_magic_exception(self, monkeypatch: pytest.MonkeyPatch):
         """Fallback MIME type should be used when python-magic raises an exception."""
         try:
             import magic as real_magic
@@ -268,8 +268,8 @@ class TestWebhookServiceUnit:
         }
 
         # Mock file reads
-        files["file1"].read.return_value = b"content1"
-        files["file2"].read.return_value = b"content2"
+        files["file1"].stream.read.return_value = b"content1"
+        files["file2"].stream.read.return_value = b"content2"
 
         webhook_trigger = MagicMock()
         webhook_trigger.tenant_id = "test_tenant"
@@ -304,8 +304,8 @@ class TestWebhookServiceUnit:
             "bad_file": MagicMock(filename="test.bad", content_type="text/plain"),
         }
 
-        files["good_file"].read.return_value = b"content"
-        files["bad_file"].read.side_effect = Exception("Read error")
+        files["good_file"].stream.read.return_value = b"content"
+        files["bad_file"].stream.read.side_effect = Exception("Read error")
 
         webhook_trigger = MagicMock()
         webhook_trigger.tenant_id = "test_tenant"
diff --git a/api/tests/unit_tests/services/test_workflow_service.py b/api/tests/unit_tests/services/test_workflow_service.py
index feafada59a..f105364094 100644
--- a/api/tests/unit_tests/services/test_workflow_service.py
+++ b/api/tests/unit_tests/services/test_workflow_service.py
@@ -11,6 +11,7 @@ This test suite covers:
 
 import json
 import uuid
+from types import SimpleNamespace
 from typing import Any, cast
 from unittest.mock import ANY, MagicMock, Mock, patch, sentinel
 
@@ -61,7 +62,7 @@ class TestWorkflowAssociatedDataFactory:
     def create_app_mock(
         app_id: str = "app-123",
         tenant_id: str = "tenant-456",
-        mode: str = AppMode.WORKFLOW.value,
+        mode: str = AppMode.WORKFLOW,
         workflow_id: str | None = None,
         **kwargs,
     ) -> MagicMock:
@@ -93,7 +94,7 @@ class TestWorkflowAssociatedDataFactory:
         tenant_id: str = "tenant-456",
         app_id: str = "app-123",
         version: str = Workflow.VERSION_DRAFT,
-        workflow_type: str = WorkflowType.WORKFLOW.value,
+        workflow_type: str = WorkflowType.WORKFLOW,
         graph: dict[str, Any] | None = None,
         features: dict[str, Any] | None = None,
         unique_hash: str | None = None,
@@ -584,7 +585,7 @@ class TestWorkflowService:
             id="published-workflow-id",
             tenant_id=app.tenant_id,
             app_id=app.id,
-            type=WorkflowType.WORKFLOW.value,
+            type=WorkflowType.WORKFLOW,
             version="2026-03-19T00:00:00",
             graph=json.dumps(TestWorkflowAssociatedDataFactory.create_valid_workflow_graph()),
             features=json.dumps(legacy_features),
@@ -597,7 +598,7 @@ class TestWorkflowService:
             id="draft-workflow-id",
             tenant_id=app.tenant_id,
             app_id=app.id,
-            type=WorkflowType.WORKFLOW.value,
+            type=WorkflowType.WORKFLOW,
             version=Workflow.VERSION_DRAFT,
             graph=json.dumps({"nodes": [], "edges": []}),
             features=json.dumps({}),
@@ -685,7 +686,7 @@ class TestWorkflowService:
         Different app modes have different feature configurations.
         This ensures the features match the expected schema for workflow apps.
         """
-        app = TestWorkflowAssociatedDataFactory.create_app_mock(mode=AppMode.WORKFLOW.value)
+        app = TestWorkflowAssociatedDataFactory.create_app_mock(mode=AppMode.WORKFLOW)
         features = {"file_upload": {"enabled": False}}
 
         with patch("services.workflow_service.WorkflowAppConfigManager.config_validate") as mock_validate:
@@ -696,7 +697,7 @@ class TestWorkflowService:
 
     def test_validate_features_structure_advanced_chat_mode(self, workflow_service):
         """Test validate_features_structure for advanced chat mode."""
-        app = TestWorkflowAssociatedDataFactory.create_app_mock(mode=AppMode.ADVANCED_CHAT.value)
+        app = TestWorkflowAssociatedDataFactory.create_app_mock(mode=AppMode.ADVANCED_CHAT)
         features = {"opening_statement": "Hello"}
 
         with patch("services.workflow_service.AdvancedChatAppConfigManager.config_validate") as mock_validate:
@@ -707,7 +708,7 @@ class TestWorkflowService:
 
     def test_validate_features_structure_invalid_mode_raises_error(self, workflow_service):
         """Test validate_features_structure raises error for invalid mode."""
-        app = TestWorkflowAssociatedDataFactory.create_app_mock(mode=AppMode.COMPLETION.value)
+        app = TestWorkflowAssociatedDataFactory.create_app_mock(mode=AppMode.COMPLETION)
         features = {}
 
         with pytest.raises(ValueError, match="Invalid app mode"):
@@ -1326,7 +1327,7 @@ class TestWorkflowService:
         The conversion creates equivalent workflow nodes from the chat configuration,
         giving users more control and customization options.
         """
-        app = TestWorkflowAssociatedDataFactory.create_app_mock(mode=AppMode.CHAT.value)
+        app = TestWorkflowAssociatedDataFactory.create_app_mock(mode=AppMode.CHAT)
         account = TestWorkflowAssociatedDataFactory.create_account_mock()
         args = {
             "name": "Converted Workflow",
@@ -1337,7 +1338,7 @@ class TestWorkflowService:
 
         with patch("services.workflow_service.WorkflowConverter") as MockConverter:
             mock_converter = MockConverter.return_value
-            mock_new_app = TestWorkflowAssociatedDataFactory.create_app_mock(mode=AppMode.WORKFLOW.value)
+            mock_new_app = TestWorkflowAssociatedDataFactory.create_app_mock(mode=AppMode.WORKFLOW)
             mock_converter.convert_to_workflow.return_value = mock_new_app
 
             result = workflow_service.convert_to_workflow(app, account, args)
@@ -1353,13 +1354,13 @@ class TestWorkflowService:
         Completion apps are simpler (single prompt-response), so the
         conversion creates a basic workflow with fewer nodes.
         """
-        app = TestWorkflowAssociatedDataFactory.create_app_mock(mode=AppMode.COMPLETION.value)
+        app = TestWorkflowAssociatedDataFactory.create_app_mock(mode=AppMode.COMPLETION)
         account = TestWorkflowAssociatedDataFactory.create_account_mock()
         args = {"name": "Converted Workflow"}
 
         with patch("services.workflow_service.WorkflowConverter") as MockConverter:
             mock_converter = MockConverter.return_value
-            mock_new_app = TestWorkflowAssociatedDataFactory.create_app_mock(mode=AppMode.WORKFLOW.value)
+            mock_new_app = TestWorkflowAssociatedDataFactory.create_app_mock(mode=AppMode.WORKFLOW)
             mock_converter.convert_to_workflow.return_value = mock_new_app
 
             result = workflow_service.convert_to_workflow(app, account, args)
@@ -1373,7 +1374,7 @@ class TestWorkflowService:
         Only chat and completion apps can be converted to workflows.
         Apps that are already workflows or have other modes cannot be converted.
         """
-        app = TestWorkflowAssociatedDataFactory.create_app_mock(mode=AppMode.WORKFLOW.value)
+        app = TestWorkflowAssociatedDataFactory.create_app_mock(mode=AppMode.WORKFLOW)
         account = TestWorkflowAssociatedDataFactory.create_account_mock()
         args = {}
 
@@ -2087,7 +2088,7 @@ class TestSetupVariablePool:
     This helper initialises the VariablePool used for single-step workflow execution.
     """
 
-    def _make_workflow(self, workflow_type: str = WorkflowType.WORKFLOW.value) -> MagicMock:
+    def _make_workflow(self, workflow_type: str = WorkflowType.WORKFLOW) -> MagicMock:
         wf = MagicMock(spec=Workflow)
         wf.app_id = "app-1"
         wf.id = "wf-1"
@@ -2176,7 +2177,7 @@ class TestSetupVariablePool:
         from models.workflow import WorkflowType
 
         # Arrange
-        workflow = self._make_workflow(workflow_type=WorkflowType.CHAT.value)
+        workflow = self._make_workflow(workflow_type=WorkflowType.CHAT)
 
         # Act
         with (
@@ -2649,7 +2650,12 @@ class TestWorkflowServiceHumanInputOperations:
 
         mock_node = MagicMock()
         mock_node.node_data = MagicMock()
+        mock_node.node_data.user_actions = [
+            SimpleNamespace(id="submit", title="card_visa_enterprise_001"),
+        ]
         mock_node.node_data.outputs_field_names.return_value = ["field1"]
+        mock_node.render_form_content_before_submission.return_value = "Ticket: {{#$output.field1#}}"
+        mock_node.render_form_content_with_outputs.return_value = "Ticket: val1"
 
         with (
             patch("services.workflow_service.db"),
@@ -2665,6 +2671,8 @@ class TestWorkflowServiceHumanInputOperations:
                 app_model=app_model, account=account, node_id="node-1", form_inputs={"field1": "val1"}, action="submit"
             )
             assert result["__action_id"] == "submit"
+            assert result["__action_value"] == "card_visa_enterprise_001"
+            assert result["__rendered_content"] == "Ticket: val1"
             mock_saver_cls.return_value.save.assert_called_once()
 
     def test_test_human_input_delivery_success(self, service: WorkflowService) -> None:
@@ -2825,6 +2833,7 @@ class TestWorkflowServiceFreeNodeExecution:
                 return_value=sentinel.adapted_node_data,
             ) as mock_adapt_node_data,
             patch("services.workflow_service.build_dify_run_context") as mock_build_dify_run_context,
+            patch("services.workflow_service.DifyFileReferenceFactory") as mock_file_reference_factory_cls,
             patch("services.workflow_service.DifyHumanInputNodeRuntime") as mock_runtime_cls,
             patch("services.workflow_service.HumanInputNode") as mock_node_cls,
         ):
@@ -2843,10 +2852,14 @@ class TestWorkflowServiceFreeNodeExecution:
             mock_runtime_cls.assert_called_once_with(mock_build_dify_run_context.return_value)
             mock_adapt_node_data.assert_called_once_with(node_config["data"])
             mock_node_cls.validate_node_data.assert_called_once_with(sentinel.adapted_node_data)
+            mock_file_reference_factory_cls.assert_called_once_with(
+                mock_graph_init_context_cls.return_value.to_graph_init_params.return_value.run_context
+            )
             mock_node_cls.assert_called_once_with(
                 node_id="n-1",
-                config=sentinel.node_data,
+                data=sentinel.node_data,
                 graph_init_params=mock_graph_init_context_cls.return_value.to_graph_init_params.return_value,
                 graph_runtime_state=ANY,
+                file_reference_factory=mock_file_reference_factory_cls.return_value,
                 runtime=mock_runtime_cls.return_value,
             )
diff --git a/api/tests/unit_tests/services/tools/test_builtin_tools_manage_service.py b/api/tests/unit_tests/services/tools/test_builtin_tools_manage_service.py
index ce0d94398d..c210db580e 100644
--- a/api/tests/unit_tests/services/tools/test_builtin_tools_manage_service.py
+++ b/api/tests/unit_tests/services/tools/test_builtin_tools_manage_service.py
@@ -180,7 +180,7 @@ class TestSetDefaultProvider:
         session.scalar.return_value = None
 
         with pytest.raises(ValueError, match="provider not found"):
-            BuiltinToolManageService.set_default_provider("t", "u", "p", "id")
+            BuiltinToolManageService.set_default_provider("t", "p", "id")
 
     @patch(f"{MODULE}.sessionmaker")
     @patch(f"{MODULE}.db")
@@ -189,11 +189,29 @@ class TestSetDefaultProvider:
         target = MagicMock()
         session.scalar.return_value = target
 
-        result = BuiltinToolManageService.set_default_provider("t", "u", "p", "id")
+        result = BuiltinToolManageService.set_default_provider("t", "p", "id")
 
         assert result == {"result": "success"}
         assert target.is_default is True
 
+    @patch(f"{MODULE}.sessionmaker")
+    @patch(f"{MODULE}.db")
+    def test_clear_default_is_tenant_scoped_not_user_scoped(self, mock_db, mock_sm_cls):
+        # Regression: clearing prior defaults must NOT filter by user_id, otherwise
+        # two workspace members can each leave their own credential as default at
+        # the same time (the default flag is tenant-scoped, not per-user).
+        session = _mock_sessionmaker(mock_sm_cls)
+        session.scalar.return_value = MagicMock()
+
+        BuiltinToolManageService.set_default_provider("tenant-1", "google", "cred-id")
+
+        session.execute.assert_called_once()
+        update_stmt = session.execute.call_args.args[0]
+        compiled = str(update_stmt.compile(compile_kwargs={"literal_binds": True}))
+        assert "user_id" not in compiled
+        assert "tenant_id" in compiled
+        assert "provider" in compiled
+
 
 class TestUpdateBuiltinToolProvider:
     @patch(f"{MODULE}.sessionmaker")
diff --git a/api/tests/unit_tests/services/workflow/test_workflow_draft_variable_service.py b/api/tests/unit_tests/services/workflow/test_workflow_draft_variable_service.py
index 663eec6a06..b5b9f0bd97 100644
--- a/api/tests/unit_tests/services/workflow/test_workflow_draft_variable_service.py
+++ b/api/tests/unit_tests/services/workflow/test_workflow_draft_variable_service.py
@@ -398,7 +398,7 @@ class TestWorkflowDraftVariableService:
         self,
         mock_engine,
         mock_session,
-        monkeypatch,
+        monkeypatch: pytest.MonkeyPatch,
     ):
         """Test resetting a node variable when execution record doesn't exist"""
         mock_repo_session = Mock(spec=Session)
@@ -435,7 +435,7 @@ class TestWorkflowDraftVariableService:
     def test_reset_node_variable_with_valid_execution_record(
         self,
         mock_session,
-        monkeypatch,
+        monkeypatch: pytest.MonkeyPatch,
     ):
         """Test resetting a node variable with valid execution record - should restore from execution"""
         mock_repo_session = Mock(spec=Session)
diff --git a/api/tests/unit_tests/services/workflow/test_workflow_event_snapshot_service.py b/api/tests/unit_tests/services/workflow/test_workflow_event_snapshot_service.py
index dfdbd9acd6..17e9a077d6 100644
--- a/api/tests/unit_tests/services/workflow/test_workflow_event_snapshot_service.py
+++ b/api/tests/unit_tests/services/workflow/test_workflow_event_snapshot_service.py
@@ -414,8 +414,8 @@ def test_parse_event_message_should_parse_only_json_object(
 
 def test_is_terminal_event_should_recognize_finished_and_optional_paused_events() -> None:
     # Arrange
-    finished_event = {"event": StreamEvent.WORKFLOW_FINISHED.value}
-    paused_event = {"event": StreamEvent.WORKFLOW_PAUSED.value}
+    finished_event = {"event": StreamEvent.WORKFLOW_FINISHED}
+    paused_event = {"event": StreamEvent.WORKFLOW_PAUSED}
 
     # Act
     is_finished = service_module._is_terminal_event(finished_event, close_on_pause=False)
@@ -426,7 +426,7 @@ def test_is_terminal_event_should_recognize_finished_and_optional_paused_events(
     assert is_finished is True
     assert paused_without_flag is False
     assert paused_with_flag is True
-    assert service_module._is_terminal_event(StreamEvent.PING.value, close_on_pause=True) is False
+    assert service_module._is_terminal_event(StreamEvent.PING, close_on_pause=True) is False
 
 
 def test_apply_message_context_should_update_payload_when_context_exists() -> None:
@@ -569,7 +569,7 @@ def test_build_workflow_event_stream_should_emit_ping_and_terminal_snapshot_even
     monkeypatch.setattr(
         service_module,
         "_build_snapshot_events",
-        MagicMock(return_value=[{"event": StreamEvent.WORKFLOW_FINISHED.value, "task_id": "task-1"}]),
+        MagicMock(return_value=[{"event": StreamEvent.WORKFLOW_FINISHED, "task_id": "task-1"}]),
     )
 
     # Act
@@ -584,9 +584,9 @@ def test_build_workflow_event_stream_should_emit_ping_and_terminal_snapshot_even
     )
 
     # Assert
-    assert events[0] == StreamEvent.PING.value
+    assert events[0] == StreamEvent.PING
     finished_event = cast(Mapping[str, Any], events[1])
-    assert finished_event["event"] == StreamEvent.WORKFLOW_FINISHED.value
+    assert finished_event["event"] == StreamEvent.WORKFLOW_FINISHED
     assert buffer_state.stop_event.is_set() is True
     node_repo.get_execution_snapshots_by_workflow_run.assert_called_once()
     called_kwargs = node_repo.get_execution_snapshots_by_workflow_run.call_args.kwargs
@@ -643,7 +643,7 @@ def test_build_workflow_event_stream_should_emit_periodic_ping_and_stop_after_id
     )
 
     # Assert
-    assert events == [StreamEvent.PING.value, StreamEvent.PING.value]
+    assert events == [StreamEvent.PING, StreamEvent.PING]
     assert buffer_state.stop_event.is_set() is True
 
 
@@ -686,7 +686,7 @@ def test_build_workflow_event_stream_should_exit_when_buffer_done_and_empty(
     )
 
     # Assert
-    assert events == [StreamEvent.PING.value]
+    assert events == [StreamEvent.PING]
     assert buffer_state.stop_event.is_set() is True
 
 
@@ -706,7 +706,7 @@ def test_build_workflow_event_stream_should_continue_when_pause_loading_fails(
     monkeypatch.setattr(service_module.MessageGenerator, "get_response_topic", MagicMock(return_value=topic))
     monkeypatch.setattr(service_module, "_load_resumption_context", MagicMock(return_value=None))
     monkeypatch.setattr(service_module, "_resolve_task_id", MagicMock(return_value="task-1"))
-    snapshot_builder = MagicMock(return_value=[{"event": StreamEvent.WORKFLOW_FINISHED.value}])
+    snapshot_builder = MagicMock(return_value=[{"event": StreamEvent.WORKFLOW_FINISHED}])
     monkeypatch.setattr(service_module, "_build_snapshot_events", snapshot_builder)
     buffer_state = BufferState(
         queue=queue.Queue(),
@@ -729,7 +729,7 @@ def test_build_workflow_event_stream_should_continue_when_pause_loading_fails(
     )
 
     # Assert
-    assert events[0] == StreamEvent.PING.value
+    assert events[0] == StreamEvent.PING
     assert snapshot_builder.call_args.kwargs["pause_entity"] is None
 
 
@@ -779,7 +779,7 @@ def test_build_snapshot_events_preserves_public_form_token(monkeypatch: pytest.M
         session_maker=cast(sessionmaker[Session], session_maker),
     )
 
-    assert events[-2]["event"] == StreamEvent.HUMAN_INPUT_REQUIRED.value
+    assert events[-2]["event"] == StreamEvent.HUMAN_INPUT_REQUIRED
     assert events[-2]["data"]["form_token"] == "wtok"
     assert events[-2]["data"]["expiration_time"] == int(datetime(2024, 1, 1, tzinfo=UTC).timestamp())
     pause_data = events[-1]["data"]
@@ -837,6 +837,6 @@ def test_build_workflow_event_stream_loads_pause_tokens_without_flask_app_contex
     )
 
     pause_event = cast(Mapping[str, Any], events[-1])
-    assert pause_event["event"] == StreamEvent.WORKFLOW_PAUSED.value
+    assert pause_event["event"] == StreamEvent.WORKFLOW_PAUSED
     assert pause_event["data"]["reasons"][0]["form_token"] == "wtok"
     assert pause_event["data"]["reasons"][0]["expiration_time"] == int(datetime(2024, 1, 1, tzinfo=UTC).timestamp())
diff --git a/api/tests/unit_tests/services/workflow/test_workflow_event_snapshot_service_additional.py b/api/tests/unit_tests/services/workflow/test_workflow_event_snapshot_service_additional.py
index d2634d7d7b..4d711f1bf8 100644
--- a/api/tests/unit_tests/services/workflow/test_workflow_event_snapshot_service_additional.py
+++ b/api/tests/unit_tests/services/workflow/test_workflow_event_snapshot_service_additional.py
@@ -215,8 +215,8 @@ class TestWorkflowEventSnapshotHelpers:
         assert result == expected
 
     def test_is_terminal_event_should_recognize_finished_and_optional_paused_events(self) -> None:
-        finished_event = {"event": StreamEvent.WORKFLOW_FINISHED.value}
-        paused_event = {"event": StreamEvent.WORKFLOW_PAUSED.value}
+        finished_event = {"event": StreamEvent.WORKFLOW_FINISHED}
+        paused_event = {"event": StreamEvent.WORKFLOW_PAUSED}
 
         is_finished = service_module._is_terminal_event(finished_event, include_paused=False)
         paused_without_flag = service_module._is_terminal_event(paused_event, include_paused=False)
@@ -225,7 +225,7 @@ class TestWorkflowEventSnapshotHelpers:
         assert is_finished is True
         assert paused_without_flag is False
         assert paused_with_flag is True
-        assert service_module._is_terminal_event(StreamEvent.PING.value, include_paused=True) is False
+        assert service_module._is_terminal_event(StreamEvent.PING, include_paused=True) is False
 
     def test_apply_message_context_should_update_payload_when_context_exists(self) -> None:
         payload: dict[str, Any] = {"event": "workflow_started"}
@@ -352,7 +352,7 @@ class TestBuildWorkflowEventStream:
         monkeypatch.setattr(
             service_module,
             "_build_snapshot_events",
-            MagicMock(return_value=[{"event": StreamEvent.WORKFLOW_FINISHED.value, "task_id": "task-1"}]),
+            MagicMock(return_value=[{"event": StreamEvent.WORKFLOW_FINISHED, "task_id": "task-1"}]),
         )
 
         events = list(
@@ -365,9 +365,9 @@ class TestBuildWorkflowEventStream:
             )
         )
 
-        assert events[0] == StreamEvent.PING.value
+        assert events[0] == StreamEvent.PING
         finished_event = cast(Mapping[str, Any], events[1])
-        assert finished_event["event"] == StreamEvent.WORKFLOW_FINISHED.value
+        assert finished_event["event"] == StreamEvent.WORKFLOW_FINISHED
         assert buffer_state.stop_event.is_set() is True
         node_repo.get_execution_snapshots_by_workflow_run.assert_called_once()
         called_kwargs = node_repo.get_execution_snapshots_by_workflow_run.call_args.kwargs
@@ -421,7 +421,7 @@ class TestBuildWorkflowEventStream:
             )
         )
 
-        assert events == [StreamEvent.PING.value, StreamEvent.PING.value]
+        assert events == [StreamEvent.PING, StreamEvent.PING]
         assert buffer_state.stop_event.is_set() is True
 
     def test_build_workflow_event_stream_should_exit_when_buffer_done_and_empty(
@@ -461,7 +461,7 @@ class TestBuildWorkflowEventStream:
             )
         )
 
-        assert events == [StreamEvent.PING.value]
+        assert events == [StreamEvent.PING]
         assert buffer_state.stop_event.is_set() is True
 
     def test_build_workflow_event_stream_should_continue_when_pause_loading_fails(
@@ -480,7 +480,7 @@ class TestBuildWorkflowEventStream:
         monkeypatch.setattr(service_module.MessageGenerator, "get_response_topic", MagicMock(return_value=topic))
         monkeypatch.setattr(service_module, "_load_resumption_context", MagicMock(return_value=None))
         monkeypatch.setattr(service_module, "_resolve_task_id", MagicMock(return_value="task-1"))
-        snapshot_builder = MagicMock(return_value=[{"event": StreamEvent.WORKFLOW_FINISHED.value}])
+        snapshot_builder = MagicMock(return_value=[{"event": StreamEvent.WORKFLOW_FINISHED}])
         monkeypatch.setattr(service_module, "_build_snapshot_events", snapshot_builder)
         buffer_state = BufferState(
             queue=queue.Queue(),
@@ -501,5 +501,5 @@ class TestBuildWorkflowEventStream:
             )
         )
 
-        assert events[0] == StreamEvent.PING.value
+        assert events[0] == StreamEvent.PING
         assert snapshot_builder.call_args.kwargs["pause_entity"] is None
diff --git a/api/tests/unit_tests/tasks/test_document_indexing_update_task.py b/api/tests/unit_tests/tasks/test_document_indexing_update_task.py
new file mode 100644
index 0000000000..b73275b97d
--- /dev/null
+++ b/api/tests/unit_tests/tasks/test_document_indexing_update_task.py
@@ -0,0 +1,524 @@
+"""
+Unit tests for document_indexing_update_task summary generation.
+
+After updating a document via the API, the summary index should be
+regenerated under the same conditions as during initial creation:
+- indexing_technique is HIGH_QUALITY
+- summary_index_setting has enable=True
+- document.indexing_status is COMPLETED
+- document.doc_form is not QA_INDEX
+- document.need_summary is True
+"""
+
+from contextlib import nullcontext
+from types import SimpleNamespace
+from unittest.mock import MagicMock
+
+import pytest
+
+from core.indexing_runner import DocumentIsPausedError
+from tasks.document_indexing_update_task import document_indexing_update_task
+
+
+class _SessionContext:
+    """Minimal context manager that yields a mock session."""
+
+    def __init__(self, session: MagicMock) -> None:
+        self._session = session
+
+    def __enter__(self) -> MagicMock:
+        return self._session
+
+    def __exit__(self, exc_type, exc, tb) -> None:  # type: ignore[override]
+        return None
+
+
+def _make_dataset_and_documents(
+    *,
+    dataset_id: str = "ds-1",
+    document_id: str = "doc-1",
+    indexing_technique: str = "high_quality",
+    summary_index_setting: dict | None = None,
+    doc_form: str = "text_model",
+    need_summary: bool = True,
+):
+    """Create mock dataset and document objects.
+
+    Returns (dataset, doc_for_session1, doc_for_session3).
+
+    session1 doc: before IndexingRunner runs (status irrelevant for summary).
+    session3 doc: re-queried after IndexingRunner completes — normally COMPLETED.
+    """
+    dataset = SimpleNamespace(
+        id=dataset_id,
+        indexing_technique=indexing_technique,
+        summary_index_setting=summary_index_setting,
+    )
+    doc_s1 = SimpleNamespace(
+        id=document_id,
+        dataset_id=dataset_id,
+        indexing_status="waiting",
+        doc_form=doc_form,
+        need_summary=need_summary,
+    )
+    # After IndexingRunner.run the document status is COMPLETED in the DB
+    doc_s3 = SimpleNamespace(
+        id=document_id,
+        dataset_id=dataset_id,
+        indexing_status="completed",
+        doc_form=doc_form,
+        need_summary=need_summary,
+    )
+    return dataset, doc_s1, doc_s3
+
+
+def _patch_all(monkeypatch: pytest.MonkeyPatch, *, sessions, runner, processor):
+    """Wire up all mocks for document_indexing_update_task."""
+    monkeypatch.setattr(
+        "tasks.document_indexing_update_task.session_factory.create_session",
+        MagicMock(side_effect=sessions),
+    )
+    monkeypatch.setattr(
+        "tasks.document_indexing_update_task.IndexProcessorFactory",
+        MagicMock(return_value=MagicMock(init_index_processor=MagicMock(return_value=processor))),
+    )
+    monkeypatch.setattr(
+        "tasks.document_indexing_update_task.IndexingRunner",
+        MagicMock(return_value=runner),
+    )
+
+
+def _session_with_begin():
+    """Create a mock session with a begin() context manager."""
+    s = MagicMock()
+    s.begin.return_value = nullcontext()
+    return s
+
+
+class TestUpdateTaskSummaryGeneration:
+    """Tests for summary index generation in the document update task.
+
+    The update task creates sessions in this order:
+      1. session1: fetch document + dataset + segments (uses begin())
+      2. session2: delete segments — only if segments exist (uses begin())
+      3. session3: summary check — only if indexing succeeded (no begin())
+
+    With empty segments (default), only sessions 1 and 3 are created.
+    """
+
+    def test_should_queue_summary_when_conditions_met(self, monkeypatch: pytest.MonkeyPatch) -> None:
+        """Summary task is queued when all conditions are met."""
+        dataset, doc_s1, doc_s3 = _make_dataset_and_documents(
+            summary_index_setting={"enable": True},
+        )
+
+        session1 = _session_with_begin()
+        session1.scalar.side_effect = [doc_s1, dataset]
+        session1.scalars.return_value = MagicMock(all=MagicMock(return_value=[]))
+
+        session3 = MagicMock()
+        session3.scalar.side_effect = [dataset, doc_s3]
+
+        runner = MagicMock()
+        processor = MagicMock()
+
+        _patch_all(
+            monkeypatch,
+            sessions=[_SessionContext(session1), _SessionContext(session3)],
+            runner=runner,
+            processor=processor,
+        )
+
+        delay_mock = MagicMock()
+        monkeypatch.setattr(
+            "tasks.document_indexing_update_task.generate_summary_index_task.delay",
+            delay_mock,
+        )
+
+        document_indexing_update_task("ds-1", "doc-1")
+
+        delay_mock.assert_called_once_with("ds-1", "doc-1", None)
+
+    def test_should_not_queue_when_not_high_quality(self, monkeypatch: pytest.MonkeyPatch) -> None:
+        """Summary is skipped when indexing_technique is not high_quality."""
+        dataset, doc_s1, _ = _make_dataset_and_documents(
+            indexing_technique="economy",
+            summary_index_setting={"enable": True},
+        )
+
+        session1 = _session_with_begin()
+        session1.scalar.side_effect = [doc_s1, dataset]
+        session1.scalars.return_value = MagicMock(all=MagicMock(return_value=[]))
+
+        session3 = MagicMock()
+        session3.scalar.return_value = dataset  # dataset.indexing_technique == "economy"
+
+        runner = MagicMock()
+        processor = MagicMock()
+
+        _patch_all(
+            monkeypatch,
+            sessions=[_SessionContext(session1), _SessionContext(session3)],
+            runner=runner,
+            processor=processor,
+        )
+
+        delay_mock = MagicMock()
+        monkeypatch.setattr(
+            "tasks.document_indexing_update_task.generate_summary_index_task.delay",
+            delay_mock,
+        )
+
+        document_indexing_update_task("ds-1", "doc-1")
+
+        delay_mock.assert_not_called()
+
+    def test_should_not_queue_when_summary_setting_disabled(self, monkeypatch: pytest.MonkeyPatch) -> None:
+        """Summary is skipped when summary_index_setting has enable=False."""
+        dataset, doc_s1, _ = _make_dataset_and_documents(
+            summary_index_setting={"enable": False},
+        )
+
+        session1 = _session_with_begin()
+        session1.scalar.side_effect = [doc_s1, dataset]
+        session1.scalars.return_value = MagicMock(all=MagicMock(return_value=[]))
+
+        session3 = MagicMock()
+        session3.scalar.return_value = dataset
+
+        runner = MagicMock()
+        processor = MagicMock()
+
+        _patch_all(
+            monkeypatch,
+            sessions=[_SessionContext(session1), _SessionContext(session3)],
+            runner=runner,
+            processor=processor,
+        )
+
+        delay_mock = MagicMock()
+        monkeypatch.setattr(
+            "tasks.document_indexing_update_task.generate_summary_index_task.delay",
+            delay_mock,
+        )
+
+        document_indexing_update_task("ds-1", "doc-1")
+
+        delay_mock.assert_not_called()
+
+    def test_should_not_queue_when_summary_setting_none(self, monkeypatch: pytest.MonkeyPatch) -> None:
+        """Summary is skipped when summary_index_setting is None."""
+        dataset, doc_s1, _ = _make_dataset_and_documents(
+            summary_index_setting=None,
+        )
+
+        session1 = _session_with_begin()
+        session1.scalar.side_effect = [doc_s1, dataset]
+        session1.scalars.return_value = MagicMock(all=MagicMock(return_value=[]))
+
+        session3 = MagicMock()
+        session3.scalar.return_value = dataset
+
+        runner = MagicMock()
+        processor = MagicMock()
+
+        _patch_all(
+            monkeypatch,
+            sessions=[_SessionContext(session1), _SessionContext(session3)],
+            runner=runner,
+            processor=processor,
+        )
+
+        delay_mock = MagicMock()
+        monkeypatch.setattr(
+            "tasks.document_indexing_update_task.generate_summary_index_task.delay",
+            delay_mock,
+        )
+
+        document_indexing_update_task("ds-1", "doc-1")
+
+        delay_mock.assert_not_called()
+
+    def test_should_not_queue_when_need_summary_false(self, monkeypatch: pytest.MonkeyPatch) -> None:
+        """Summary is skipped when document.need_summary is False."""
+        dataset, doc_s1, doc_s3 = _make_dataset_and_documents(
+            summary_index_setting={"enable": True},
+            need_summary=False,
+        )
+
+        session1 = _session_with_begin()
+        session1.scalar.side_effect = [doc_s1, dataset]
+        session1.scalars.return_value = MagicMock(all=MagicMock(return_value=[]))
+
+        session3 = MagicMock()
+        session3.scalar.side_effect = [dataset, doc_s3]
+
+        runner = MagicMock()
+        processor = MagicMock()
+
+        _patch_all(
+            monkeypatch,
+            sessions=[_SessionContext(session1), _SessionContext(session3)],
+            runner=runner,
+            processor=processor,
+        )
+
+        delay_mock = MagicMock()
+        monkeypatch.setattr(
+            "tasks.document_indexing_update_task.generate_summary_index_task.delay",
+            delay_mock,
+        )
+
+        document_indexing_update_task("ds-1", "doc-1")
+
+        delay_mock.assert_not_called()
+
+    def test_should_not_queue_when_qa_index_form(self, monkeypatch: pytest.MonkeyPatch) -> None:
+        """Summary is skipped when doc_form is QA_INDEX."""
+        dataset, doc_s1, doc_s3 = _make_dataset_and_documents(
+            summary_index_setting={"enable": True},
+            doc_form="qa_model",
+        )
+
+        session1 = _session_with_begin()
+        session1.scalar.side_effect = [doc_s1, dataset]
+        session1.scalars.return_value = MagicMock(all=MagicMock(return_value=[]))
+
+        session3 = MagicMock()
+        session3.scalar.side_effect = [dataset, doc_s3]
+
+        runner = MagicMock()
+        processor = MagicMock()
+
+        _patch_all(
+            monkeypatch,
+            sessions=[_SessionContext(session1), _SessionContext(session3)],
+            runner=runner,
+            processor=processor,
+        )
+
+        delay_mock = MagicMock()
+        monkeypatch.setattr(
+            "tasks.document_indexing_update_task.generate_summary_index_task.delay",
+            delay_mock,
+        )
+
+        document_indexing_update_task("ds-1", "doc-1")
+
+        delay_mock.assert_not_called()
+
+    def test_should_not_queue_when_indexing_fails(self, monkeypatch: pytest.MonkeyPatch) -> None:
+        """Summary is skipped when IndexingRunner.run raises."""
+        dataset, doc_s1, _ = _make_dataset_and_documents(
+            summary_index_setting={"enable": True},
+        )
+
+        session1 = _session_with_begin()
+        session1.scalar.side_effect = [doc_s1, dataset]
+        session1.scalars.return_value = MagicMock(all=MagicMock(return_value=[]))
+
+        runner = MagicMock()
+        runner.run.side_effect = Exception("indexing failed")
+        processor = MagicMock()
+
+        # Only session1 needed — task returns early after indexing failure
+        _patch_all(
+            monkeypatch,
+            sessions=[_SessionContext(session1)],
+            runner=runner,
+            processor=processor,
+        )
+
+        delay_mock = MagicMock()
+        monkeypatch.setattr(
+            "tasks.document_indexing_update_task.generate_summary_index_task.delay",
+            delay_mock,
+        )
+
+        document_indexing_update_task("ds-1", "doc-1")
+
+        delay_mock.assert_not_called()
+
+    def test_should_not_queue_when_document_is_paused(self, monkeypatch: pytest.MonkeyPatch) -> None:
+        """Summary is skipped when IndexingRunner raises DocumentIsPausedError."""
+
+        dataset, doc_s1, _ = _make_dataset_and_documents(
+            summary_index_setting={"enable": True},
+        )
+
+        session1 = _session_with_begin()
+        session1.scalar.side_effect = [doc_s1, dataset]
+        session1.scalars.return_value = MagicMock(all=MagicMock(return_value=[]))
+
+        runner = MagicMock()
+        runner.run.side_effect = DocumentIsPausedError("doc-1 is paused")
+        processor = MagicMock()
+
+        # Only session1 needed — task returns early after paused error
+        _patch_all(
+            monkeypatch,
+            sessions=[_SessionContext(session1)],
+            runner=runner,
+            processor=processor,
+        )
+
+        delay_mock = MagicMock()
+        monkeypatch.setattr(
+            "tasks.document_indexing_update_task.generate_summary_index_task.delay",
+            delay_mock,
+        )
+
+        document_indexing_update_task("ds-1", "doc-1")
+
+        delay_mock.assert_not_called()
+
+    def test_should_not_queue_when_dataset_not_found_after_indexing(self, monkeypatch: pytest.MonkeyPatch) -> None:
+        """Summary is skipped when the dataset disappears after indexing."""
+        dataset, doc_s1, _ = _make_dataset_and_documents(
+            summary_index_setting={"enable": True},
+        )
+
+        session1 = _session_with_begin()
+        session1.scalar.side_effect = [doc_s1, dataset]
+        session1.scalars.return_value = MagicMock(all=MagicMock(return_value=[]))
+
+        # Session 3: dataset is None
+        session3 = MagicMock()
+        session3.scalar.return_value = None
+
+        runner = MagicMock()
+        processor = MagicMock()
+
+        _patch_all(
+            monkeypatch,
+            sessions=[_SessionContext(session1), _SessionContext(session3)],
+            runner=runner,
+            processor=processor,
+        )
+
+        delay_mock = MagicMock()
+        monkeypatch.setattr(
+            "tasks.document_indexing_update_task.generate_summary_index_task.delay",
+            delay_mock,
+        )
+
+        document_indexing_update_task("ds-1", "doc-1")
+
+        delay_mock.assert_not_called()
+
+    def test_should_not_queue_when_document_not_completed_after_indexing(self, monkeypatch: pytest.MonkeyPatch) -> None:
+        """Summary is skipped when document indexing_status is not COMPLETED after indexing."""
+        dataset, doc_s1, _ = _make_dataset_and_documents(
+            summary_index_setting={"enable": True},
+        )
+
+        session1 = _session_with_begin()
+        session1.scalar.side_effect = [doc_s1, dataset]
+        session1.scalars.return_value = MagicMock(all=MagicMock(return_value=[]))
+
+        # Document still in error status after indexing
+        doc_s3_error = SimpleNamespace(
+            id="doc-1",
+            dataset_id="ds-1",
+            indexing_status="error",
+            doc_form="text_model",
+            need_summary=True,
+        )
+        session3 = MagicMock()
+        session3.scalar.side_effect = [dataset, doc_s3_error]
+
+        runner = MagicMock()
+        processor = MagicMock()
+
+        _patch_all(
+            monkeypatch,
+            sessions=[_SessionContext(session1), _SessionContext(session3)],
+            runner=runner,
+            processor=processor,
+        )
+
+        delay_mock = MagicMock()
+        monkeypatch.setattr(
+            "tasks.document_indexing_update_task.generate_summary_index_task.delay",
+            delay_mock,
+        )
+
+        document_indexing_update_task("ds-1", "doc-1")
+
+        delay_mock.assert_not_called()
+
+    def test_should_swallow_summary_queue_error(self, monkeypatch: pytest.MonkeyPatch) -> None:
+        """Task should not raise when generate_summary_index_task.delay raises."""
+        dataset, doc_s1, doc_s3 = _make_dataset_and_documents(
+            summary_index_setting={"enable": True},
+        )
+
+        session1 = _session_with_begin()
+        session1.scalar.side_effect = [doc_s1, dataset]
+        session1.scalars.return_value = MagicMock(all=MagicMock(return_value=[]))
+
+        session3 = MagicMock()
+        session3.scalar.side_effect = [dataset, doc_s3]
+
+        runner = MagicMock()
+        processor = MagicMock()
+
+        _patch_all(
+            monkeypatch,
+            sessions=[_SessionContext(session1), _SessionContext(session3)],
+            runner=runner,
+            processor=processor,
+        )
+
+        delay_mock = MagicMock(side_effect=Exception("queue full"))
+        monkeypatch.setattr(
+            "tasks.document_indexing_update_task.generate_summary_index_task.delay",
+            delay_mock,
+        )
+
+        # Should not raise
+        document_indexing_update_task("ds-1", "doc-1")
+
+        delay_mock.assert_called_once_with("ds-1", "doc-1", None)
+
+    def test_should_queue_summary_with_segments_and_session2(self, monkeypatch: pytest.MonkeyPatch) -> None:
+        """When segments exist, session2 is also created for deletion.
+        Verify summary generation still works correctly."""
+        dataset, doc_s1, doc_s3 = _make_dataset_and_documents(
+            summary_index_setting={"enable": True},
+        )
+
+        session1 = _session_with_begin()
+        session1.scalar.side_effect = [doc_s1, dataset]
+        seg = SimpleNamespace(index_node_id="node-1")
+        session1.scalars.return_value = MagicMock(all=MagicMock(return_value=[seg]))
+
+        # Session 2: segment deletion
+        session2 = _session_with_begin()
+
+        session3 = MagicMock()
+        session3.scalar.side_effect = [dataset, doc_s3]
+
+        runner = MagicMock()
+        processor = MagicMock()
+
+        _patch_all(
+            monkeypatch,
+            sessions=[
+                _SessionContext(session1),
+                _SessionContext(session2),
+                _SessionContext(session3),
+            ],
+            runner=runner,
+            processor=processor,
+        )
+
+        delay_mock = MagicMock()
+        monkeypatch.setattr(
+            "tasks.document_indexing_update_task.generate_summary_index_task.delay",
+            delay_mock,
+        )
+
+        document_indexing_update_task("ds-1", "doc-1")
+
+        delay_mock.assert_called_once_with("ds-1", "doc-1", None)
diff --git a/api/tests/unit_tests/tasks/test_ops_trace_task.py b/api/tests/unit_tests/tasks/test_ops_trace_task.py
new file mode 100644
index 0000000000..5844c55c04
--- /dev/null
+++ b/api/tests/unit_tests/tasks/test_ops_trace_task.py
@@ -0,0 +1,301 @@
+import json
+import sys
+from contextlib import contextmanager
+from types import ModuleType
+from unittest.mock import MagicMock, patch
+
+import pytest
+from celery.exceptions import Retry
+
+from core.ops.entities.config_entity import OPS_TRACE_FAILED_KEY
+from core.ops.exceptions import RetryableTraceDispatchError
+from tasks.ops_trace_task import process_trace_tasks
+
+
+@contextmanager
+def fake_app_context():
+    yield
+
+
+class FakeCurrentApp:
+    def app_context(self):
+        return fake_app_context()
+
+
+def _install_trace_manager(
+    trace_instance: MagicMock,
+    *,
+    enterprise_enabled: bool = False,
+    enterprise_trace_cls: MagicMock | None = None,
+) -> dict[str, ModuleType]:
+    ops_trace_manager_module = ModuleType("core.ops.ops_trace_manager")
+
+    class StubOpsTraceManager:
+        @staticmethod
+        def get_ops_trace_instance(app_id: str) -> MagicMock:
+            return trace_instance
+
+    telemetry_module = ModuleType("extensions.ext_enterprise_telemetry")
+    telemetry_module.is_enabled = lambda: enterprise_enabled
+
+    ops_trace_manager_module.OpsTraceManager = StubOpsTraceManager
+    modules = {
+        "core.ops.ops_trace_manager": ops_trace_manager_module,
+        "extensions.ext_enterprise_telemetry": telemetry_module,
+    }
+    if enterprise_trace_cls is not None:
+        enterprise_module = ModuleType("enterprise")
+        enterprise_telemetry_module = ModuleType("enterprise.telemetry")
+        enterprise_trace_module = ModuleType("enterprise.telemetry.enterprise_trace")
+        enterprise_trace_module.EnterpriseOtelTrace = enterprise_trace_cls
+        modules.update(
+            {
+                "enterprise": enterprise_module,
+                "enterprise.telemetry": enterprise_telemetry_module,
+                "enterprise.telemetry.enterprise_trace": enterprise_trace_module,
+            }
+        )
+    return modules
+
+
+def _make_payload() -> str:
+    return json.dumps({"trace_info": {}, "trace_info_type": None})
+
+
+def _decode_saved_payload(payload: bytes | str) -> dict[str, object]:
+    if isinstance(payload, bytes):
+        payload = payload.decode("utf-8")
+    return json.loads(payload)
+
+
+def _retryable_dispatch_error() -> RetryableTraceDispatchError:
+    return RetryableTraceDispatchError("transient trace dispatch failure")
+
+
+def _run_task(file_info: dict[str, str], retries: int = 0) -> None:
+    process_trace_tasks.push_request(retries=retries)
+    try:
+        process_trace_tasks.run(file_info)
+    finally:
+        process_trace_tasks.pop_request()
+
+
+def test_process_trace_tasks_retries_retryable_dispatch_failure_and_preserves_payload():
+    file_info = {"app_id": "app-id", "file_id": "file-id"}
+    trace_instance = MagicMock()
+    pending_error = _retryable_dispatch_error()
+    trace_instance.trace.side_effect = pending_error
+    retry_error = Retry()
+
+    with (
+        patch.dict(sys.modules, _install_trace_manager(trace_instance)),
+        patch("tasks.ops_trace_task.current_app", FakeCurrentApp()),
+        patch("tasks.ops_trace_task.storage.load", return_value=_make_payload()),
+        patch("tasks.ops_trace_task.storage.delete") as mock_delete,
+        patch("tasks.ops_trace_task.redis_client.incr") as mock_incr,
+        patch.object(process_trace_tasks, "retry", side_effect=retry_error) as mock_retry,
+        pytest.raises(Retry),
+    ):
+        _run_task(file_info)
+
+    mock_retry.assert_called_once_with(
+        exc=pending_error,
+        countdown=process_trace_tasks.default_retry_delay,
+    )
+    mock_delete.assert_not_called()
+    mock_incr.assert_not_called()
+
+
+def test_process_trace_tasks_marks_enterprise_trace_dispatched_before_retryable_dispatch_retry():
+    file_info = {"app_id": "app-id", "file_id": "file-id"}
+    trace_instance = MagicMock()
+    pending_error = _retryable_dispatch_error()
+    trace_instance.trace.side_effect = pending_error
+    retry_error = Retry()
+    enterprise_tracer = MagicMock()
+    enterprise_trace_cls = MagicMock(return_value=enterprise_tracer)
+
+    with (
+        patch.dict(
+            sys.modules,
+            _install_trace_manager(
+                trace_instance,
+                enterprise_enabled=True,
+                enterprise_trace_cls=enterprise_trace_cls,
+            ),
+        ),
+        patch("tasks.ops_trace_task.current_app", FakeCurrentApp()),
+        patch("tasks.ops_trace_task.storage.load", return_value=_make_payload()),
+        patch("tasks.ops_trace_task.storage.save") as mock_save,
+        patch("tasks.ops_trace_task.storage.delete") as mock_delete,
+        patch("tasks.ops_trace_task.redis_client.incr") as mock_incr,
+        patch.object(process_trace_tasks, "retry", side_effect=retry_error) as mock_retry,
+        pytest.raises(Retry),
+    ):
+        _run_task(file_info)
+
+    enterprise_tracer.trace.assert_called_once_with({})
+    saved_path, saved_payload = mock_save.call_args.args
+    assert saved_path == "ops_trace/app-id/file-id.json"
+    assert _decode_saved_payload(saved_payload)["_enterprise_trace_dispatched"] is True
+    mock_retry.assert_called_once_with(
+        exc=pending_error,
+        countdown=process_trace_tasks.default_retry_delay,
+    )
+    mock_delete.assert_not_called()
+    mock_incr.assert_not_called()
+
+
+def test_process_trace_tasks_does_not_mark_failed_enterprise_trace_as_dispatched_before_retry():
+    file_info = {"app_id": "app-id", "file_id": "file-id"}
+    trace_instance = MagicMock()
+    pending_error = _retryable_dispatch_error()
+    trace_instance.trace.side_effect = pending_error
+    retry_error = Retry()
+    enterprise_tracer = MagicMock()
+    enterprise_tracer.trace.side_effect = RuntimeError("enterprise trace failed")
+    enterprise_trace_cls = MagicMock(return_value=enterprise_tracer)
+
+    with (
+        patch.dict(
+            sys.modules,
+            _install_trace_manager(
+                trace_instance,
+                enterprise_enabled=True,
+                enterprise_trace_cls=enterprise_trace_cls,
+            ),
+        ),
+        patch("tasks.ops_trace_task.current_app", FakeCurrentApp()),
+        patch("tasks.ops_trace_task.storage.load", return_value=_make_payload()),
+        patch("tasks.ops_trace_task.storage.save") as mock_save,
+        patch("tasks.ops_trace_task.storage.delete") as mock_delete,
+        patch("tasks.ops_trace_task.redis_client.incr") as mock_incr,
+        patch.object(process_trace_tasks, "retry", side_effect=retry_error) as mock_retry,
+        pytest.raises(Retry),
+    ):
+        _run_task(file_info)
+
+    enterprise_tracer.trace.assert_called_once_with({})
+    mock_save.assert_not_called()
+    mock_retry.assert_called_once_with(
+        exc=pending_error,
+        countdown=process_trace_tasks.default_retry_delay,
+    )
+    mock_delete.assert_not_called()
+    mock_incr.assert_not_called()
+
+
+def test_process_trace_tasks_skips_enterprise_trace_when_retry_payload_was_already_dispatched():
+    file_info = {"app_id": "app-id", "file_id": "file-id"}
+    trace_instance = MagicMock()
+    enterprise_trace_cls = MagicMock()
+    payload = json.dumps({"trace_info": {}, "trace_info_type": None, "_enterprise_trace_dispatched": True})
+
+    with (
+        patch.dict(
+            sys.modules,
+            _install_trace_manager(
+                trace_instance,
+                enterprise_enabled=True,
+                enterprise_trace_cls=enterprise_trace_cls,
+            ),
+        ),
+        patch("tasks.ops_trace_task.current_app", FakeCurrentApp()),
+        patch("tasks.ops_trace_task.storage.load", return_value=payload),
+        patch("tasks.ops_trace_task.storage.save") as mock_save,
+        patch("tasks.ops_trace_task.storage.delete") as mock_delete,
+        patch("tasks.ops_trace_task.redis_client.incr") as mock_incr,
+    ):
+        _run_task(file_info)
+
+    enterprise_trace_cls.assert_not_called()
+    trace_instance.trace.assert_called_once_with({})
+    mock_save.assert_not_called()
+    mock_delete.assert_called_once_with("ops_trace/app-id/file-id.json")
+    mock_incr.assert_not_called()
+
+
+def test_process_trace_tasks_default_retry_window_covers_parent_span_context_ttl():
+    assert process_trace_tasks.max_retries * process_trace_tasks.default_retry_delay >= 300
+
+
+def test_process_trace_tasks_deletes_payload_on_success():
+    file_info = {"app_id": "app-id", "file_id": "file-id"}
+    trace_instance = MagicMock()
+
+    with (
+        patch.dict(sys.modules, _install_trace_manager(trace_instance)),
+        patch("tasks.ops_trace_task.current_app", FakeCurrentApp()),
+        patch("tasks.ops_trace_task.storage.load", return_value=_make_payload()),
+        patch("tasks.ops_trace_task.storage.delete") as mock_delete,
+        patch("tasks.ops_trace_task.redis_client.incr") as mock_incr,
+    ):
+        _run_task(file_info)
+
+    trace_instance.trace.assert_called_once_with({})
+    mock_delete.assert_called_once_with("ops_trace/app-id/file-id.json")
+    mock_incr.assert_not_called()
+
+
+def test_process_trace_tasks_deletes_payload_and_counts_terminal_failure():
+    file_info = {"app_id": "app-id", "file_id": "file-id"}
+    trace_instance = MagicMock()
+    trace_instance.trace.side_effect = RuntimeError("trace failed")
+
+    with (
+        patch.dict(sys.modules, _install_trace_manager(trace_instance)),
+        patch("tasks.ops_trace_task.current_app", FakeCurrentApp()),
+        patch("tasks.ops_trace_task.storage.load", return_value=_make_payload()),
+        patch("tasks.ops_trace_task.storage.delete") as mock_delete,
+        patch("tasks.ops_trace_task.redis_client.incr") as mock_incr,
+    ):
+        _run_task(file_info)
+
+    mock_delete.assert_called_once_with("ops_trace/app-id/file-id.json")
+    mock_incr.assert_called_once_with(f"{OPS_TRACE_FAILED_KEY}_app-id")
+
+
+def test_process_trace_tasks_treats_retry_enqueue_failure_as_terminal_failure():
+    file_info = {"app_id": "app-id", "file_id": "file-id"}
+    trace_instance = MagicMock()
+    pending_error = _retryable_dispatch_error()
+    retry_enqueue_error = RuntimeError("retry enqueue failed")
+    trace_instance.trace.side_effect = pending_error
+
+    with (
+        patch.dict(sys.modules, _install_trace_manager(trace_instance)),
+        patch("tasks.ops_trace_task.current_app", FakeCurrentApp()),
+        patch("tasks.ops_trace_task.storage.load", return_value=_make_payload()),
+        patch("tasks.ops_trace_task.storage.delete") as mock_delete,
+        patch("tasks.ops_trace_task.redis_client.incr") as mock_incr,
+        patch.object(process_trace_tasks, "retry", side_effect=retry_enqueue_error) as mock_retry,
+    ):
+        _run_task(file_info)
+
+    mock_retry.assert_called_once_with(
+        exc=pending_error,
+        countdown=process_trace_tasks.default_retry_delay,
+    )
+    mock_delete.assert_called_once_with("ops_trace/app-id/file-id.json")
+    mock_incr.assert_called_once_with(f"{OPS_TRACE_FAILED_KEY}_app-id")
+
+
+def test_process_trace_tasks_deletes_payload_and_counts_exhausted_retryable_dispatch_failure():
+    file_info = {"app_id": "app-id", "file_id": "file-id"}
+    trace_instance = MagicMock()
+    pending_error = _retryable_dispatch_error()
+    trace_instance.trace.side_effect = pending_error
+
+    with (
+        patch.dict(sys.modules, _install_trace_manager(trace_instance)),
+        patch("tasks.ops_trace_task.current_app", FakeCurrentApp()),
+        patch("tasks.ops_trace_task.storage.load", return_value=_make_payload()),
+        patch("tasks.ops_trace_task.storage.delete") as mock_delete,
+        patch("tasks.ops_trace_task.redis_client.incr") as mock_incr,
+        patch.object(process_trace_tasks, "retry") as mock_retry,
+    ):
+        _run_task(file_info, retries=process_trace_tasks.max_retries)
+
+    mock_retry.assert_not_called()
+    mock_delete.assert_called_once_with("ops_trace/app-id/file-id.json")
+    mock_incr.assert_called_once_with(f"{OPS_TRACE_FAILED_KEY}_app-id")
diff --git a/api/tests/unit_tests/tasks/test_workflow_execute_task.py b/api/tests/unit_tests/tasks/test_workflow_execute_task.py
index 72508bef52..2544c9d61a 100644
--- a/api/tests/unit_tests/tasks/test_workflow_execute_task.py
+++ b/api/tests/unit_tests/tasks/test_workflow_execute_task.py
@@ -122,7 +122,7 @@ def test_resume_app_execution_queries_message_by_conversation_and_workflow_run(m
     workflow_run = SimpleNamespace(
         workflow_id="wf-id",
         app_id="app-id",
-        created_by_role=CreatorUserRole.ACCOUNT.value,
+        created_by_role=CreatorUserRole.ACCOUNT,
         created_by="account-id",
         tenant_id="tenant-id",
     )
@@ -208,7 +208,7 @@ def test_resume_app_execution_returns_early_when_advanced_chat_missing_conversat
     workflow_run = SimpleNamespace(
         workflow_id="wf-id",
         app_id="app-id",
-        created_by_role=CreatorUserRole.ACCOUNT.value,
+        created_by_role=CreatorUserRole.ACCOUNT,
         created_by="account-id",
         tenant_id="tenant-id",
     )
diff --git a/api/uv.lock b/api/uv.lock
index 9806f506aa..5ffda81f39 100644
--- a/api/uv.lock
+++ b/api/uv.lock
@@ -50,7 +50,10 @@ members = [
     "dify-vdb-vikingdb",
     "dify-vdb-weaviate",
 ]
-overrides = [{ name = "pyarrow", specifier = ">=18.0.0" }]
+overrides = [
+    { name = "litellm", specifier = ">=1.83.7" },
+    { name = "pyarrow", specifier = ">=18.0.0" },
+]
 
 [[package]]
 name = "abnf"
@@ -379,14 +382,14 @@ wheels = [
 
 [[package]]
 name = "authlib"
-version = "1.6.11"
+version = "1.6.12"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "cryptography" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/28/10/b325d58ffe86815b399334a101e63bc6fa4e1953921cb23703b48a0a0220/authlib-1.6.11.tar.gz", hash = "sha256:64db35b9b01aeccb4715a6c9a6613a06f2bd7be2ab9d2eb89edd1dfc7580a38f", size = 165359, upload-time = "2026-04-16T07:22:50.279Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/d3/30/6691fdc63b35f54a5a65e04fa1e59d827f4d4e8f4a39678ba7d3088ce0c8/authlib-1.6.12.tar.gz", hash = "sha256:0656d8482f28fc8221929d5f35b2bde5d13e10555ebc06b4561b0d622e83b1bd", size = 165368, upload-time = "2026-05-04T08:11:31.826Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/57/2f/55fca558f925a51db046e5b929deb317ddb05afed74b22d89f4eca578980/authlib-1.6.11-py2.py3-none-any.whl", hash = "sha256:c8687a9a26451c51a34a06fa17bb97cb15bba46a6a626755e2d7f50da8bff3e3", size = 244469, upload-time = "2026-04-16T07:22:48.413Z" },
+    { url = "https://files.pythonhosted.org/packages/cd/51/9b0b5cd4cf683a02db937a6f9bbebcdc9c56558a7bb3763ce7d3512103c3/authlib-1.6.12-py2.py3-none-any.whl", hash = "sha256:e9229ad7fde610b139dd12f5edbe97eab9ee78bfb85691247e767727850b99ab", size = 244473, upload-time = "2026-05-04T08:11:30.354Z" },
 ]
 
 [[package]]
@@ -467,18 +470,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/4e/2f/babd02c9fc4ca35376ada7c291193a208165c7be2455f0f98bc1e1243f31/backports_zstd-1.3.0-cp312-cp312-win_arm64.whl", hash = "sha256:f6843ecb181480e423b02f60fe29e393cbc31a95fb532acdf0d3a2c87bd50ce3", size = 288927, upload-time = "2025-12-29T17:26:40.923Z" },
 ]
 
-[[package]]
-name = "basedpyright"
-version = "1.39.3"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "nodejs-wheel-binaries" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/04/19/5a5b9b9197973da732638957be3a65cf514d2f5a4964eeedbf33b6c65bbd/basedpyright-1.39.3.tar.gz", hash = "sha256:2f794e6b5f4260fb89f614ca6cd23c6f305373bb6b50c4ed7794ff2ae647fb14", size = 25503187, upload-time = "2026-04-20T22:14:47.424Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/54/5c/f950c1239ad26f3bb453e665428a2cf1893995de725a5eb0b64a2520b366/basedpyright-1.39.3-py3-none-any.whl", hash = "sha256:aba760dc83307727554f936d6b4381caa14482f30dbc2173167710e217c1f7ab", size = 12419181, upload-time = "2026-04-20T22:14:51.975Z" },
-]
-
 [[package]]
 name = "bce-python-sdk"
 version = "0.9.71"
@@ -604,16 +595,16 @@ wheels = [
 
 [[package]]
 name = "boto3"
-version = "1.43.3"
+version = "1.43.6"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "botocore" },
     { name = "jmespath" },
     { name = "s3transfer" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/f2/50/ea184e159c4ac64fef816a72094fb8656eb071361a39ed22c0e3b15a35b4/boto3-1.43.3.tar.gz", hash = "sha256:7c7777862ffc898f05efa566032bbabfe226dbb810e35ec11125817f128bc5c5", size = 113111, upload-time = "2026-05-04T19:34:09.731Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/0a/37/78c630d1308964aa9abf44951d9c4df776546ff37251ec2434944e205c4e/boto3-1.43.6.tar.gz", hash = "sha256:e6315effaf12b890b99956e6f8e2c3000a3f64e4ee91943cec3895ce9a836afb", size = 113153, upload-time = "2026-05-07T20:49:59.694Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/c8/ad/8a6946a329f0127322108e537dc1c0d9f8eea4f1d1231702c073d2e85f46/boto3-1.43.3-py3-none-any.whl", hash = "sha256:fb9fe51849ef2a78198d582756fc06f14f7de27f73e0fa90275d6aa4171eb4d0", size = 140501, upload-time = "2026-05-04T19:34:07.991Z" },
+    { url = "https://files.pythonhosted.org/packages/c8/e2/3c2eef44f55eafab256836d1d9479bd6a74f70c26cbfdc0639a0e23e4327/boto3-1.43.6-py3-none-any.whl", hash = "sha256:179601ec2992726a718053bf41e43c223ceba397d31ceab11f64d9c910d9fc3a", size = 140502, upload-time = "2026-05-07T20:49:57.8Z" },
 ]
 
 [[package]]
@@ -636,16 +627,16 @@ bedrock-runtime = [
 
 [[package]]
 name = "botocore"
-version = "1.43.3"
+version = "1.43.6"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "jmespath" },
     { name = "python-dateutil" },
     { name = "urllib3" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/74/ac/cd55f886e17b6b952dbc95b792d3645a73d58586a1400ababe54406073bd/botocore-1.43.3.tar.gz", hash = "sha256:eac6da0fffccf87888ebf4d89f0b2378218a707efa748cd955b838995e944695", size = 15308705, upload-time = "2026-05-04T19:33:56.28Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/79/a7/23d0f5028011455096a1eeac0ddf3cbe147b3e855e127342f8202552194d/botocore-1.43.6.tar.gz", hash = "sha256:b1e395b347356860398da42e61c808cf1e34b6fa7180cf2b9d87d986e1a06ba0", size = 15336070, upload-time = "2026-05-07T20:49:48.14Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/be/99/1d9e296edf244f47e0508032f20999f8fd40704dd3c5b601fed099424eb6/botocore-1.43.3-py3-none-any.whl", hash = "sha256:ec0769eb0f7c5034856bb406a92698dbc02a3d4be0f78a384747106b161d8ea3", size = 14989027, upload-time = "2026-05-04T19:33:50.81Z" },
+    { url = "https://files.pythonhosted.org/packages/e5/c8/6f47223840e8d8cfa8c9f7c0ec1b77970417f257fc885169ff4f6326ce09/botocore-1.43.6-py3-none-any.whl", hash = "sha256:b6d1fdbc6f65a5fe0b7e947823aa37535d3f39f3ba4d21110fab1f55bbbcc04b", size = 15017094, upload-time = "2026-05-07T20:49:44.964Z" },
 ]
 
 [[package]]
@@ -889,14 +880,14 @@ wheels = [
 
 [[package]]
 name = "click"
-version = "8.3.1"
+version = "8.1.8"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "colorama", marker = "sys_platform == 'win32'" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/3d/fa/656b739db8587d7b5dfa22e22ed02566950fbfbcdc20311993483657a5c0/click-8.3.1.tar.gz", hash = "sha256:12ff4785d337a1bb490bb7e9c2b1ee5da3112e94a8622f26a6c77f5d2fc6842a", size = 295065, upload-time = "2025-11-15T20:45:42.706Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/b9/2e/0090cbf739cee7d23781ad4b89a9894a41538e4fcf4c31dcdd705b78eb8b/click-8.1.8.tar.gz", hash = "sha256:ed53c9d8990d83c2a27deae68e4ee337473f6330c040a31d4225c9574d16096a", size = 226593, upload-time = "2024-12-21T18:38:44.339Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/98/78/01c019cdb5d6498122777c1a43056ebb3ebfeef2076d9d026bfe15583b2b/click-8.3.1-py3-none-any.whl", hash = "sha256:981153a64e25f12d547d3426c367a4857371575ee7ad18df2a6183ab0545b2a6", size = 108274, upload-time = "2025-11-15T20:45:41.139Z" },
+    { url = "https://files.pythonhosted.org/packages/7e/d4/7ebdbd03970677812aac39c869717059dbb71a4cfc033ca6e5221787892c/click-8.1.8-py3-none-any.whl", hash = "sha256:63c132bbbed01578a06712a2d1f497bb62d9c1c0d329b7903a866228027263b2", size = 98188, upload-time = "2024-12-21T18:38:41.666Z" },
 ]
 
 [[package]]
@@ -1287,9 +1278,52 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/02/c3/253a89ee03fc9b9682f1541728eb66db7db22148cd94f89ab22528cd1e1b/deprecation-2.1.0-py2.py3-none-any.whl", hash = "sha256:a10811591210e1fb0e768a8c25517cabeabcba6f0bf96564f8ff45189f90b14a", size = 11178, upload-time = "2020-04-20T14:23:36.581Z" },
 ]
 
+[[package]]
+name = "dify-agent"
+version = "0.1.0"
+source = { directory = "../dify-agent" }
+dependencies = [
+    { name = "httpx" },
+    { name = "pydantic" },
+    { name = "pydantic-ai-slim" },
+    { name = "typing-extensions" },
+]
+
+[package.metadata]
+requires-dist = [
+    { name = "fastapi", marker = "extra == 'server'", specifier = ">=0.136.0" },
+    { name = "graphon", marker = "extra == 'server'", specifier = "~=0.2.2" },
+    { name = "httpx", specifier = ">=0.28.1" },
+    { name = "jsonschema", marker = "extra == 'server'", specifier = ">=4.23.0" },
+    { name = "pydantic", specifier = ">=2.12.5,<2.13" },
+    { name = "pydantic-ai-slim", specifier = ">=1.85.1" },
+    { name = "pydantic-ai-slim", extras = ["anthropic", "google", "openai"], marker = "extra == 'server'", specifier = ">=1.85.1" },
+    { name = "pydantic-settings", marker = "extra == 'server'", specifier = ">=2.12.0" },
+    { name = "redis", marker = "extra == 'server'", specifier = ">=5" },
+    { name = "typing-extensions", specifier = ">=4.12.2" },
+    { name = "uvicorn", extras = ["standard"], marker = "extra == 'server'", specifier = ">=0.38.0" },
+]
+provides-extras = ["server"]
+
+[package.metadata.requires-dev]
+dev = [
+    { name = "basedpyright", specifier = ">=1.39.3" },
+    { name = "coverage", extras = ["toml"], specifier = ">=7.10.7" },
+    { name = "pytest", specifier = ">=9.0.3" },
+    { name = "pytest-examples", specifier = ">=0.0.18" },
+    { name = "pytest-mock", specifier = ">=3.14.0" },
+    { name = "ruff", specifier = ">=0.15.11" },
+]
+docs = [
+    { name = "mkdocs", specifier = ">=1.6.1,<2" },
+    { name = "mkdocs-glightbox", specifier = ">=0.4.0" },
+    { name = "mkdocs-material", specifier = ">=9.7.0" },
+    { name = "mkdocstrings-python", specifier = ">=2.0.0" },
+]
+
 [[package]]
 name = "dify-api"
-version = "1.14.0"
+version = "1.14.2"
 source = { virtual = "." }
 dependencies = [
     { name = "aliyun-log-python-sdk" },
@@ -1335,10 +1369,10 @@ dependencies = [
 
 [package.dev-dependencies]
 dev = [
-    { name = "basedpyright" },
     { name = "boto3-stubs" },
     { name = "celery-types" },
     { name = "coverage" },
+    { name = "dify-agent" },
     { name = "dotenv-linter" },
     { name = "faker" },
     { name = "hypothesis" },
@@ -1578,7 +1612,7 @@ requires-dist = [
     { name = "aliyun-log-python-sdk", specifier = ">=0.9.44,<1.0.0" },
     { name = "azure-identity", specifier = ">=1.25.3,<2.0.0" },
     { name = "bleach", specifier = ">=6.3.0" },
-    { name = "boto3", specifier = ">=1.43.3" },
+    { name = "boto3", specifier = ">=1.43.6" },
     { name = "celery", specifier = ">=5.6.3" },
     { name = "croniter", specifier = ">=6.2.2" },
     { name = "fastopenapi", extras = ["flask"], specifier = "~=0.7.0" },
@@ -1592,10 +1626,10 @@ requires-dist = [
     { name = "gevent", specifier = ">=26.4.0" },
     { name = "gevent-websocket", specifier = ">=0.10.1" },
     { name = "gmpy2", specifier = ">=2.3.0" },
-    { name = "google-api-python-client", specifier = ">=2.195.0" },
-    { name = "google-cloud-aiplatform", specifier = ">=1.149.0,<2.0.0" },
-    { name = "graphon", specifier = "~=0.2.2" },
-    { name = "gunicorn", specifier = ">=25.3.0" },
+    { name = "google-api-python-client", specifier = ">=2.196.0" },
+    { name = "google-cloud-aiplatform", specifier = ">=1.151.0,<2.0.0" },
+    { name = "graphon", specifier = "~=0.4.0" },
+    { name = "gunicorn", specifier = ">=26.0.0" },
     { name = "httpx", extras = ["socks"], specifier = ">=0.28.1,<1.0.0" },
     { name = "httpx-sse", specifier = "~=0.4.0" },
     { name = "json-repair", specifier = "~=0.59.4" },
@@ -1618,10 +1652,10 @@ requires-dist = [
 
 [package.metadata.requires-dev]
 dev = [
-    { name = "basedpyright", specifier = ">=1.39.3" },
     { name = "boto3-stubs", specifier = ">=1.43.2" },
     { name = "celery-types", specifier = ">=0.23.0" },
     { name = "coverage", specifier = ">=7.13.4" },
+    { name = "dify-agent", directory = "../dify-agent" },
     { name = "dotenv-linter", specifier = ">=0.7.0" },
     { name = "faker", specifier = ">=40.15.0" },
     { name = "hypothesis", specifier = ">=6.152.4" },
@@ -1629,7 +1663,7 @@ dev = [
     { name = "lxml-stubs", specifier = ">=0.5.1" },
     { name = "mypy", specifier = ">=1.20.2" },
     { name = "pandas-stubs", specifier = ">=3.0.0" },
-    { name = "pyrefly", specifier = ">=0.62.0" },
+    { name = "pyrefly", specifier = ">=1.0.0" },
     { name = "pytest", specifier = ">=9.0.3" },
     { name = "pytest-benchmark", specifier = ">=5.2.3" },
     { name = "pytest-cov", specifier = ">=7.1.0" },
@@ -1689,7 +1723,7 @@ storage = [
     { name = "google-cloud-storage", specifier = ">=3.10.1" },
     { name = "opendal", specifier = ">=0.46.0" },
     { name = "oss2", specifier = ">=2.19.1" },
-    { name = "supabase", specifier = ">=2.29.0" },
+    { name = "supabase", specifier = ">=2.30.0" },
     { name = "tos", specifier = ">=2.9.0" },
 ]
 tools = [
@@ -2609,6 +2643,19 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/da/71/ae30dadffc90b9006d77af76b393cb9dfbfc9629f339fc1574a1c52e6806/future-1.0.0-py3-none-any.whl", hash = "sha256:929292d34f5872e70396626ef385ec22355a1fae8ad29e1a734c3e43f9fbc216", size = 491326, upload-time = "2024-02-21T11:52:35.956Z" },
 ]
 
+[[package]]
+name = "genai-prices"
+version = "0.0.59"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "httpx" },
+    { name = "pydantic" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/cd/c8/b61a028b8d8ee286ffab3f9b9f1c9229087184e7d543cea4e349e11375b0/genai_prices-0.0.59.tar.gz", hash = "sha256:3e1c7dcd9b38163589c8cf4a9bcfd286c52ea57a3becdc062a2cbaa8295b08c4", size = 67406, upload-time = "2026-05-07T12:08:40.475Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/11/f9/4693c127f9fab0a8d39c47c198e378ecafcb043463e6dd73df205eacbc13/genai_prices-0.0.59-py3-none-any.whl", hash = "sha256:88fd8818e6807374e5a5c03f293b574ade5f18a3060622080cdd94a03cf43115", size = 70509, upload-time = "2026-05-07T12:08:39.075Z" },
+]
+
 [[package]]
 name = "gevent"
 version = "26.4.0"
@@ -2657,14 +2704,14 @@ wheels = [
 
 [[package]]
 name = "gitpython"
-version = "3.1.47"
+version = "3.1.50"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "gitdb" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/c1/bd/50db468e9b1310529a19fce651b3b0e753b5c07954d486cba31bbee9a5d5/gitpython-3.1.47.tar.gz", hash = "sha256:dba27f922bd2b42cb54c87a8ab3cb6beb6bf07f3d564e21ac848913a05a8a3cd", size = 216978, upload-time = "2026-04-22T02:44:44.059Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/33/f6/354ae6491228b5eb40e10d89c4d13c651fe1cf7556e35ebdded50cff57ce/gitpython-3.1.50.tar.gz", hash = "sha256:80da2d12504d52e1f998772dc5baf6e553f8d2fcfe1fcc226c9d9a2ee3372dcc", size = 219798, upload-time = "2026-05-06T04:01:26.571Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/f2/c5/a1bc0996af85757903cf2bf444a7824e68e0035ce63fb41d6f76f9def68b/gitpython-3.1.47-py3-none-any.whl", hash = "sha256:489f590edfd6d20571b2c0e72c6a6ac6915ee8b8cd04572330e3842207a78905", size = 209547, upload-time = "2026-04-22T02:44:41.271Z" },
+    { url = "https://files.pythonhosted.org/packages/20/7a/1c6e3562dfd8950adbb11ffbc65d21e7c89d01a6e4f137fa981056de25c5/gitpython-3.1.50-py3-none-any.whl", hash = "sha256:d352abe2908d07355014abdd21ddf798c2a961469239afec4962e9da884858f9", size = 212507, upload-time = "2026-05-06T04:01:23.799Z" },
 ]
 
 [[package]]
@@ -2719,7 +2766,7 @@ grpc = [
 
 [[package]]
 name = "google-api-python-client"
-version = "2.195.0"
+version = "2.196.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "google-api-core" },
@@ -2728,9 +2775,9 @@ dependencies = [
     { name = "httplib2" },
     { name = "uritemplate" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/69/07/08d759b9cb10f48af14b25262dd0d6685ca8cda6c1f9e8a8109f57457205/google_api_python_client-2.195.0.tar.gz", hash = "sha256:c72cf2661c3addf01c880ce60541e83e1df354644b874f7f9d8d5ed2070446ae", size = 14584819, upload-time = "2026-04-30T21:51:50.638Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/6d/f3/34ef8aca7909675fe327f96c1ed927f0520e7acf68af19157e96acc05e76/google_api_python_client-2.196.0.tar.gz", hash = "sha256:9f335d38f6caaa2747bcf64335ed1a9a19047d53e86538eda6a1b17d37f1743d", size = 14628129, upload-time = "2026-05-06T23:47:35.655Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/21/b9/2c71095e31fff57668fec7c07ac897df065f15521d070e63229e13689590/google_api_python_client-2.195.0-py3-none-any.whl", hash = "sha256:753e62057f23049a89534bea0162b60fe391b85fb86d80bcdf884d05ec91c5bf", size = 15162418, upload-time = "2026-04-30T21:51:47.444Z" },
+    { url = "https://files.pythonhosted.org/packages/99/c7/1817b4edf966d5afcac1c0781ca36d621bc0cb58104c4e7c2a475ab185f7/google_api_python_client-2.196.0-py3-none-any.whl", hash = "sha256:2591e9b47dcb17e4e62a09370aaee3bcf323af8f28ccecdabcd0a42a23ca4db5", size = 15206663, upload-time = "2026-05-06T23:47:32.886Z" },
 ]
 
 [[package]]
@@ -2766,7 +2813,7 @@ wheels = [
 
 [[package]]
 name = "google-cloud-aiplatform"
-version = "1.149.0"
+version = "1.151.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "docstring-parser" },
@@ -2782,9 +2829,9 @@ dependencies = [
     { name = "pydantic" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/42/2c/fba4adc56f74c0ee0fbd91a39d414ca2c3588dd8b71f9be8a507015ca886/google_cloud_aiplatform-1.149.0.tar.gz", hash = "sha256:a4d73485bf1d727a9e1bbbd13d08d7031490686bbf7d125eb905c1a6c1559a35", size = 10451466, upload-time = "2026-04-27T23:11:54.513Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/ec/f6/e2fbe175a011f5080da8c1f7d9169a6875a00ea2c7bee4193d952b097400/google_cloud_aiplatform-1.151.0.tar.gz", hash = "sha256:2f29b1853f790a7371a746c747bf1f664380b534254682441acd4b5ee26fafd2", size = 10617421, upload-time = "2026-05-07T21:56:52.91Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/bf/a0/27719ba23967ef62e52a1d54e013e0fc174bdab8dd84fb300bab9bf0d4a3/google_cloud_aiplatform-1.149.0-py2.py3-none-any.whl", hash = "sha256:e6b5299fa5d303e971cb29a19f03fdbb7b1e3b9d2faa3a788ca933341fba2f2e", size = 8570410, upload-time = "2026-04-27T23:11:50.495Z" },
+    { url = "https://files.pythonhosted.org/packages/f6/4a/cd35f8ba622d563b1335222284d2838aa789b953b40516b1b997e50fe5b6/google_cloud_aiplatform-1.151.0-py2.py3-none-any.whl", hash = "sha256:61372bb0923b14b8027f45b83393452df3a85bf4ea86fa48e08844fb5ec50049", size = 8732627, upload-time = "2026-05-07T21:56:49.014Z" },
 ]
 
 [[package]]
@@ -2937,7 +2984,7 @@ httpx = [
 
 [[package]]
 name = "graphon"
-version = "0.2.2"
+version = "0.4.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "charset-normalizer" },
@@ -2958,9 +3005,9 @@ dependencies = [
     { name = "unstructured", extra = ["docx", "epub", "md", "ppt", "pptx"] },
     { name = "webvtt-py" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/08/50/e745a79c5f742f88f6011a1f7c9ba2c2f9cc1beedd982f0b192f1ab8c748/graphon-0.2.2.tar.gz", hash = "sha256:141f0de536171850f1af6f738dc66f0285aadd3c097f1dad2a038636789e0aa5", size = 236360, upload-time = "2026-04-17T08:52:28.047Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/76/24/eb1e7983404dcac84816b76ea450e1bb97023e55e00c699d609340bc361e/graphon-0.4.0.tar.gz", hash = "sha256:afb0c7a58f89e09cfa585296429b4d08cd0df80b9ac54d550f88e7d76ec48ee0", size = 261812, upload-time = "2026-05-13T11:48:39.198Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/de/89/a6340afdaf5169d17a318e00fc685fb67ed99baa602c2cbbbf6af6a76096/graphon-0.2.2-py3-none-any.whl", hash = "sha256:754e544d08779138f99eac6547ab08559463680e2c76488b05e1c978210392b4", size = 340808, upload-time = "2026-04-17T08:52:26.5Z" },
+    { url = "https://files.pythonhosted.org/packages/b7/de/bad6b3fd1e4b4defc16e6ea106e55c44725a159f1d191a99877bce1c9931/graphon-0.4.0-py3-none-any.whl", hash = "sha256:b33f95886da823d5b1b53d663a4f5f8fa383c37740f3bd19297b8d140fcb804c", size = 372711, upload-time = "2026-05-13T11:48:37.712Z" },
 ]
 
 [[package]]
@@ -3000,6 +3047,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/e9/08/b0814846b79399e585f974bbeebf5580fbe59e258ea7be64d9dfb253c84f/greenlet-3.2.4-cp312-cp312-win_amd64.whl", hash = "sha256:a7d4e128405eea3814a12cc2605e0e6aedb4035bf32697f72deca74de4105e02", size = 299899, upload-time = "2025-08-07T13:38:53.448Z" },
 ]
 
+[[package]]
+name = "griffelib"
+version = "2.0.2"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/9d/82/74f4a3310cdabfbb10da554c3a672847f1ed33c6f61dd472681ce7f1fe67/griffelib-2.0.2.tar.gz", hash = "sha256:3cf20b3bc470e83763ffbf236e0076b1211bac1bc67de13daf494640f2de707e", size = 166461, upload-time = "2026-03-27T11:34:51.091Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/11/8c/c9138d881c79aa0ea9ed83cbd58d5ca75624378b38cee225dcf5c42cc91f/griffelib-2.0.2-py3-none-any.whl", hash = "sha256:925c857658fb1ba40c0772c37acbc2ab650bd794d9c1b9726922e36ea4117ea1", size = 142357, upload-time = "2026-03-27T11:34:46.275Z" },
+]
+
 [[package]]
 name = "grimp"
 version = "3.14"
@@ -3099,14 +3155,14 @@ wheels = [
 
 [[package]]
 name = "gunicorn"
-version = "25.3.0"
+version = "26.0.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "packaging" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/c4/f4/e78fa054248fab913e2eab0332c6c2cb07421fca1ce56d8fe43b6aef57a4/gunicorn-25.3.0.tar.gz", hash = "sha256:f74e1b2f9f76f6cd1ca01198968bd2dd65830edc24b6e8e4d78de8320e2fe889", size = 634883, upload-time = "2026-03-27T00:00:26.092Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/6d/b7/a4a3f632f823e432ce6bc65f62961b7980c898c77f075a2f7118cb3846fe/gunicorn-26.0.0.tar.gz", hash = "sha256:ca9346f85e3a4aeeb64d491045c16b9a35647abd37ea15efe53080eb8b090baf", size = 727286, upload-time = "2026-05-05T06:38:25.529Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/43/c8/8aaf447698c4d59aa853fd318eed300b5c9e44459f242ab8ead6c9c09792/gunicorn-25.3.0-py3-none-any.whl", hash = "sha256:cacea387dab08cd6776501621c295a904fe8e3b7aae9a1a3cbb26f4e7ed54660", size = 208403, upload-time = "2026-03-27T00:00:27.386Z" },
+    { url = "https://files.pythonhosted.org/packages/e6/40/9c2384fc2be4ad25dd4a49decd5ad9ea5a3639814c11bd40ab77cb9f0a14/gunicorn-26.0.0-py3-none-any.whl", hash = "sha256:40233d26a5f0d1872916188c276e21641155111c2853f0c2cd55260aec0d24fc", size = 212009, upload-time = "2026-05-05T06:38:23.007Z" },
 ]
 
 [[package]]
@@ -3355,14 +3411,14 @@ wheels = [
 
 [[package]]
 name = "importlib-metadata"
-version = "8.4.0"
+version = "8.5.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "zipp" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/c0/bd/fa8ce65b0a7d4b6d143ec23b0f5fd3f7ab80121078c465bc02baeaab22dc/importlib_metadata-8.4.0.tar.gz", hash = "sha256:9a547d3bc3608b025f93d403fdd1aae741c24fbb8314df4b155675742ce303c5", size = 54320, upload-time = "2024-08-20T17:11:42.348Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/cd/12/33e59336dca5be0c398a7482335911a33aa0e20776128f038019f1a95f1b/importlib_metadata-8.5.0.tar.gz", hash = "sha256:71522656f0abace1d072b9e5481a48f07c138e00f079c38c8f883823f9c26bd7", size = 55304, upload-time = "2024-09-11T14:56:08.937Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/c0/14/362d31bf1076b21e1bcdcb0dc61944822ff263937b804a79231df2774d28/importlib_metadata-8.4.0-py3-none-any.whl", hash = "sha256:66f342cc6ac9818fc6ff340576acd24d65ba0b3efabb2b4ac08b598965a4a2f1", size = 26269, upload-time = "2024-08-20T17:11:41.102Z" },
+    { url = "https://files.pythonhosted.org/packages/a0/d9/a1e041c5e7caa9a05c925f4bdbdfb7f006d1f74996af53467bc394c97be7/importlib_metadata-8.5.0-py3-none-any.whl", hash = "sha256:45e54197d28b7a7f1559e60b95e7c567032b602131fbd588f1497f47880aa68b", size = 26514, upload-time = "2024-09-11T14:56:07.019Z" },
 ]
 
 [[package]]
@@ -3503,7 +3559,7 @@ wheels = [
 
 [[package]]
 name = "jsonschema"
-version = "4.25.1"
+version = "4.23.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "attrs" },
@@ -3511,9 +3567,9 @@ dependencies = [
     { name = "referencing" },
     { name = "rpds-py" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/74/69/f7185de793a29082a9f3c7728268ffb31cb5095131a9c139a74078e27336/jsonschema-4.25.1.tar.gz", hash = "sha256:e4a9655ce0da0c0b67a085847e00a3a51449e1157f4f75e9fb5aa545e122eb85", size = 357342, upload-time = "2025-08-18T17:03:50.038Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/38/2e/03362ee4034a4c917f697890ccd4aec0800ccf9ded7f511971c75451deec/jsonschema-4.23.0.tar.gz", hash = "sha256:d71497fef26351a33265337fa77ffeb82423f3ea21283cd9467bb03999266bc4", size = 325778, upload-time = "2024-07-08T18:40:05.546Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/bf/9c/8c95d856233c1f82500c2450b8c68576b4cf1c871db3afac5c34ff84e6fd/jsonschema-4.25.1-py3-none-any.whl", hash = "sha256:3fba0169e345c7175110351d456342c364814cfcf3b964ba4587f22915230a63", size = 90040, upload-time = "2025-08-18T17:03:48.373Z" },
+    { url = "https://files.pythonhosted.org/packages/69/4a/4f9dbeb84e8850557c02365a0eee0649abe5eb1d84af92a25731c6c0f922/jsonschema-4.23.0-py3-none-any.whl", hash = "sha256:fbadb6f8b144a8f8cf9f0b89ba94501d143e50411a1278633f56a7acf7fd5566", size = 88462, upload-time = "2024-07-08T18:40:00.165Z" },
 ]
 
 [[package]]
@@ -3604,7 +3660,7 @@ wheels = [
 
 [[package]]
 name = "langsmith"
-version = "0.7.31"
+version = "0.7.38"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "httpx" },
@@ -3617,9 +3673,9 @@ dependencies = [
     { name = "xxhash" },
     { name = "zstandard" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/e6/11/696019490992db5c87774dc20515529ef42a01e1d770fb754ed6d9b12fb0/langsmith-0.7.31.tar.gz", hash = "sha256:331ee4f7c26bb5be4022b9859b7d7b122cbf8c9d01d9f530114c1914b0349ffb", size = 1178480, upload-time = "2026-04-14T17:55:41.242Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/af/c9/b3e54cfcb480876dfe33ecfdd64feeb621a86d9e6f4a6b9eb46851807018/langsmith-0.7.38.tar.gz", hash = "sha256:0db529b768d66c45f22fe959a0af7151342704fefafdecf3c60b14097c14fdb1", size = 4431914, upload-time = "2026-04-29T00:21:42.865Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/1d/a1/a013cf458c301cda86a213dd153ce0a01c93f1ab5833f951e6a44c9763ce/langsmith-0.7.31-py3-none-any.whl", hash = "sha256:0291d49203f6e80dda011af1afda61eb0595a4d697adb684590a8805e1d61fb6", size = 373276, upload-time = "2026-04-14T17:55:39.677Z" },
+    { url = "https://files.pythonhosted.org/packages/86/bc/a19d0a6d5575c637796675831dbef3555568e84d913f14ec579f92162ffa/langsmith-0.7.38-py3-none-any.whl", hash = "sha256:9c400ad508c0e4edc37bd55987047c6b8aac36ddd55f6096e3806f4d6a100618", size = 392310, upload-time = "2026-04-29T00:21:40.534Z" },
 ]
 
 [[package]]
@@ -3654,7 +3710,7 @@ wheels = [
 
 [[package]]
 name = "litellm"
-version = "1.83.0"
+version = "1.83.14"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "aiohttp" },
@@ -3670,9 +3726,9 @@ dependencies = [
     { name = "tiktoken" },
     { name = "tokenizers" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/22/92/6ce9737554994ca8e536e5f4f6a87cc7c4774b656c9eb9add071caf7d54b/litellm-1.83.0.tar.gz", hash = "sha256:860bebc76c4bb27b4cf90b4a77acd66dba25aced37e3db98750de8a1766bfb7a", size = 17333062, upload-time = "2026-03-31T05:08:25.331Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/8d/7c/c095649380adc96c8630273c1768c2ad1e74aa2ee1dd8dd05d218a60569f/litellm-1.83.14.tar.gz", hash = "sha256:24aef9b47cdc424c833e32f3727f411741c690832cd1fe4405e0077144fe09c9", size = 14836599, upload-time = "2026-04-26T03:16:10.176Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/19/2c/a670cc050fcd6f45c6199eb99e259c73aea92edba8d5c2fc1b3686d36217/litellm-1.83.0-py3-none-any.whl", hash = "sha256:88c536d339248f3987571493015784671ba3f193a328e1ea6780dbebaa2094a8", size = 15610306, upload-time = "2026-03-31T05:08:21.987Z" },
+    { url = "https://files.pythonhosted.org/packages/7f/5c/1b5691575420135e90578543b2bf219497caa33cfd0af64cb38f30288450/litellm-1.83.14-py3-none-any.whl", hash = "sha256:92b11ba2a32cf80707ddf388d18526696c7999a21b418c5e3b6eda1243d2cfdb", size = 16457054, upload-time = "2026-04-26T03:16:05.72Z" },
 ]
 
 [[package]]
@@ -3687,6 +3743,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/2f/f5/d281ae0f79378a5a91f308ea9fdb9f9cc068fddd09629edc0725a5a8fde1/llvmlite-0.47.0-cp312-cp312-win_amd64.whl", hash = "sha256:f3079f25bdc24cd9d27c4b2b5e68f5f60c4fdb7e8ad5ee2b9b006007558f9df7", size = 38138692, upload-time = "2026-03-31T18:28:57.147Z" },
 ]
 
+[[package]]
+name = "logfire-api"
+version = "4.32.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/58/1b/0c74ad85f977743ba4c589e46e0cb138d6a6e69487830f4e86ebbdb145a3/logfire_api-4.32.1.tar.gz", hash = "sha256:5e8714b2bb5fb5d1f4a4a833941e4ca711b75d2c1f98e76c5ad680fe6991af6a", size = 78788, upload-time = "2026-04-15T14:11:58.788Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/0c/ab/d5adeab6253c7ecd5904fc5ef3265859f218610caf4e1e55efe9aff6ac49/logfire_api-4.32.1-py3-none-any.whl", hash = "sha256:4b4c27cf6e27e8e26ef4b22a77f2a2988dd1d07e2d24ee70673ef34b234fb8a5", size = 124394, upload-time = "2026-04-15T14:11:56.157Z" },
+]
+
 [[package]]
 name = "lxml"
 version = "6.1.0"
@@ -3740,14 +3805,14 @@ wheels = [
 
 [[package]]
 name = "mako"
-version = "1.3.11"
+version = "1.3.12"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "markupsafe" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/59/8a/805404d0c0b9f3d7a326475ca008db57aea9c5c9f2e1e39ed0faa335571c/mako-1.3.11.tar.gz", hash = "sha256:071eb4ab4c5010443152255d77db7faa6ce5916f35226eb02dc34479b6858069", size = 399811, upload-time = "2026-04-14T20:19:51.493Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/00/62/791b31e69ae182791ec67f04850f2f062716bbd205483d63a215f3e062d3/mako-1.3.12.tar.gz", hash = "sha256:9f778e93289bd410bb35daadeb4fc66d95a746f0b75777b942088b7fd7af550a", size = 400219, upload-time = "2026-04-28T19:01:08.512Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/68/a5/19d7aaa7e433713ffe881df33705925a196afb9532efc8475d26593921a6/mako-1.3.11-py3-none-any.whl", hash = "sha256:e372c6e333cf004aa736a15f425087ec977e1fcbd2966aae7f17c8dc1da27a77", size = 78503, upload-time = "2026-04-14T20:19:53.233Z" },
+    { url = "https://files.pythonhosted.org/packages/bc/b1/a0ec7a5a9db730a08daef1fdfb8090435b82465abbf758a596f0ea88727e/mako-1.3.12-py3-none-any.whl", hash = "sha256:8f61569480282dbf557145ce441e4ba888be453c30989f879f0d652e39f53ea9", size = 78521, upload-time = "2026-04-28T19:01:10.393Z" },
 ]
 
 [[package]]
@@ -4023,22 +4088,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/9d/91/04e965f8e717ba0ab4bdca5c112deeab11c9e750d94c4d4602f050295d39/nltk-3.9.4-py3-none-any.whl", hash = "sha256:f2fa301c3a12718ce4a0e9305c5675299da5ad9e26068218b69d692fda84828f", size = 1552087, upload-time = "2026-03-24T06:13:38.47Z" },
 ]
 
-[[package]]
-name = "nodejs-wheel-binaries"
-version = "24.11.1"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/e4/89/da307731fdbb05a5f640b26de5b8ac0dc463fef059162accfc89e32f73bc/nodejs_wheel_binaries-24.11.1.tar.gz", hash = "sha256:413dfffeadfb91edb4d8256545dea797c237bba9b3faefea973cde92d96bb922", size = 8059, upload-time = "2025-11-18T18:21:58.207Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/e4/5f/be5a4112e678143d4c15264d918f9a2dc086905c6426eb44515cf391a958/nodejs_wheel_binaries-24.11.1-py2.py3-none-macosx_13_0_arm64.whl", hash = "sha256:0e14874c3579def458245cdbc3239e37610702b0aa0975c1dc55e2cb80e42102", size = 55114309, upload-time = "2025-11-18T18:21:21.697Z" },
-    { url = "https://files.pythonhosted.org/packages/fa/1c/2e9d6af2ea32b65928c42b3e5baa7a306870711d93c3536cb25fc090a80d/nodejs_wheel_binaries-24.11.1-py2.py3-none-macosx_13_0_x86_64.whl", hash = "sha256:c2741525c9874b69b3e5a6d6c9179a6fe484ea0c3d5e7b7c01121c8e5d78b7e2", size = 55285957, upload-time = "2025-11-18T18:21:27.177Z" },
-    { url = "https://files.pythonhosted.org/packages/d0/79/35696d7ba41b1bd35ef8682f13d46ba38c826c59e58b86b267458eb53d87/nodejs_wheel_binaries-24.11.1-py2.py3-none-manylinux_2_28_aarch64.whl", hash = "sha256:5ef598101b0fb1c2bf643abb76dfbf6f76f1686198ed17ae46009049ee83c546", size = 59645875, upload-time = "2025-11-18T18:21:33.004Z" },
-    { url = "https://files.pythonhosted.org/packages/b4/98/2a9694adee0af72bc602a046b0632a0c89e26586090c558b1c9199b187cc/nodejs_wheel_binaries-24.11.1-py2.py3-none-manylinux_2_28_x86_64.whl", hash = "sha256:cde41d5e4705266688a8d8071debf4f8a6fcea264c61292782672ee75a6905f9", size = 60140941, upload-time = "2025-11-18T18:21:37.228Z" },
-    { url = "https://files.pythonhosted.org/packages/d0/d6/573e5e2cba9d934f5f89d0beab00c3315e2e6604eb4df0fcd1d80c5a07a8/nodejs_wheel_binaries-24.11.1-py2.py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:78bc5bb889313b565df8969bb7423849a9c7fc218bf735ff0ce176b56b3e96f0", size = 61644243, upload-time = "2025-11-18T18:21:43.325Z" },
-    { url = "https://files.pythonhosted.org/packages/c7/e6/643234d5e94067df8ce8d7bba10f3804106668f7a1050aeb10fdd226ead4/nodejs_wheel_binaries-24.11.1-py2.py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:c79a7e43869ccecab1cae8183778249cceb14ca2de67b5650b223385682c6239", size = 62225657, upload-time = "2025-11-18T18:21:47.708Z" },
-    { url = "https://files.pythonhosted.org/packages/4d/1c/2fb05127102a80225cab7a75c0e9edf88a0a1b79f912e1e36c7c1aaa8f4e/nodejs_wheel_binaries-24.11.1-py2.py3-none-win_amd64.whl", hash = "sha256:10197b1c9c04d79403501766f76508b0dac101ab34371ef8a46fcf51773497d0", size = 41322308, upload-time = "2025-11-18T18:21:51.347Z" },
-    { url = "https://files.pythonhosted.org/packages/ad/b7/bc0cdbc2cc3a66fcac82c79912e135a0110b37b790a14c477f18e18d90cd/nodejs_wheel_binaries-24.11.1-py2.py3-none-win_arm64.whl", hash = "sha256:376b9ea1c4bc1207878975dfeb604f7aa5668c260c6154dcd2af9d42f7734116", size = 39026497, upload-time = "2025-11-18T18:21:54.634Z" },
-]
-
 [[package]]
 name = "numba"
 version = "0.65.0"
@@ -4135,7 +4184,7 @@ wheels = [
 
 [[package]]
 name = "openai"
-version = "2.8.1"
+version = "2.24.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "anyio" },
@@ -4147,9 +4196,9 @@ dependencies = [
     { name = "tqdm" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/d5/e4/42591e356f1d53c568418dc7e30dcda7be31dd5a4d570bca22acb0525862/openai-2.8.1.tar.gz", hash = "sha256:cb1b79eef6e809f6da326a7ef6038719e35aa944c42d081807bfa1be8060f15f", size = 602490, upload-time = "2025-11-17T22:39:59.549Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/55/13/17e87641b89b74552ed408a92b231283786523edddc95f3545809fab673c/openai-2.24.0.tar.gz", hash = "sha256:1e5769f540dbd01cb33bc4716a23e67b9d695161a734aff9c5f925e2bf99a673", size = 658717, upload-time = "2026-02-24T20:02:07.958Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/55/4f/dbc0c124c40cb390508a82770fb9f6e3ed162560181a85089191a851c59a/openai-2.8.1-py3-none-any.whl", hash = "sha256:c6c3b5a04994734386e8dad3c00a393f56d3b68a27cd2e8acae91a59e4122463", size = 1022688, upload-time = "2025-11-17T22:39:57.675Z" },
+    { url = "https://files.pythonhosted.org/packages/c9/30/844dc675ee6902579b8eef01ed23917cc9319a1c9c0c14ec6e39340c96d0/openai-2.24.0-py3-none-any.whl", hash = "sha256:fed30480d7d6c884303287bde864980a4b137b60553ffbcf9ab4a233b7a73d94", size = 1120122, upload-time = "2026-02-24T20:02:05.669Z" },
 ]
 
 [[package]]
@@ -4262,32 +4311,32 @@ wheels = [
 
 [[package]]
 name = "opentelemetry-exporter-otlp"
-version = "1.41.0"
+version = "1.41.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "opentelemetry-exporter-otlp-proto-grpc" },
     { name = "opentelemetry-exporter-otlp-proto-http" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/65/b7/845565a2ab5d22c1486bc7729a06b05cd0964c61539d766e1f107c9eea0c/opentelemetry_exporter_otlp-1.41.0.tar.gz", hash = "sha256:97ff847321f8d4c919032a67d20d3137fb7b34eac0c47f13f71112858927fc5b", size = 6152, upload-time = "2026-04-09T14:38:35.895Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/42/84/d55baf8e1a222f40282956083e67de9fa92d5fa451108df4839505fa2a24/opentelemetry_exporter_otlp-1.41.1.tar.gz", hash = "sha256:299a2f0541ca175df186f5ac58fd5db177ba1e9b72b0826049062f750d55b47f", size = 6152, upload-time = "2026-04-24T13:15:40.006Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/e0/f2/f1076fff152858773f22cda146713f9ae3661795af6bacd411a76f2151ac/opentelemetry_exporter_otlp-1.41.0-py3-none-any.whl", hash = "sha256:443b6a45c990ae4c55e147f97049a86c5f5b704f3d78b48b44a073a886ec4d6e", size = 7022, upload-time = "2026-04-09T14:38:13.934Z" },
+    { url = "https://files.pythonhosted.org/packages/6d/d5/ea4aa7dfc458fd537bd9519ea0e7226eef2a6212dfe952694984167daaba/opentelemetry_exporter_otlp-1.41.1-py3-none-any.whl", hash = "sha256:db276c5a80c02b063994e80950d00ca1bfddcf6520f608335b7dc2db0c0eb9c6", size = 7025, upload-time = "2026-04-24T13:15:17.839Z" },
 ]
 
 [[package]]
 name = "opentelemetry-exporter-otlp-proto-common"
-version = "1.41.0"
+version = "1.41.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "opentelemetry-proto" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/8c/28/e8eca94966fe9a1465f6094dc5ddc5398473682180279c94020bc23b4906/opentelemetry_exporter_otlp_proto_common-1.41.0.tar.gz", hash = "sha256:966bbce537e9edb166154779a7c4f8ab6b8654a03a28024aeaf1a3eacb07d6ee", size = 20411, upload-time = "2026-04-09T14:38:36.572Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/ae/fa/f9e3bd3c4d692b3ce9a2880a167d1f79681a1bea11f00d5bf76adc03e6ea/opentelemetry_exporter_otlp_proto_common-1.41.1.tar.gz", hash = "sha256:0e253156ea9c36b0bd3d2440c5c9ba7dd1f3fb64ba7a08fc85fbac536b56e1fb", size = 20409, upload-time = "2026-04-24T13:15:40.924Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/26/c4/78b9bf2d9c1d5e494f44932988d9d91c51a66b9a7b48adf99b62f7c65318/opentelemetry_exporter_otlp_proto_common-1.41.0-py3-none-any.whl", hash = "sha256:7a99177bf61f85f4f9ed2072f54d676364719c066f6d11f515acc6c745c7acf0", size = 18366, upload-time = "2026-04-09T14:38:15.135Z" },
+    { url = "https://files.pythonhosted.org/packages/29/48/bce76d3ea772b609757e9bc844e02ab408a6446609bf74fb562062ba6b71/opentelemetry_exporter_otlp_proto_common-1.41.1-py3-none-any.whl", hash = "sha256:10da74dad6a49344b9b7b21b6182e3060373a235fde1528616d5f01f92e66aa9", size = 18366, upload-time = "2026-04-24T13:15:18.917Z" },
 ]
 
 [[package]]
 name = "opentelemetry-exporter-otlp-proto-grpc"
-version = "1.41.0"
+version = "1.41.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "googleapis-common-protos" },
@@ -4298,14 +4347,14 @@ dependencies = [
     { name = "opentelemetry-sdk" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/42/46/d75a3f8c91915f2e58f61d0a2e4ada63891e7c7a37a20ff7949ba184a6b2/opentelemetry_exporter_otlp_proto_grpc-1.41.0.tar.gz", hash = "sha256:f704201251c6f65772b11bddea1c948000554459101bdbb0116e0a01b70592f6", size = 25754, upload-time = "2026-04-09T14:38:37.423Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/1e/9b/e4503060b8695579dbaad187dc8cef4554188de68748c88060599b77489e/opentelemetry_exporter_otlp_proto_grpc-1.41.1.tar.gz", hash = "sha256:b05df8fa1333dc9a3fda36b676b96b5095ab6016d3f0c3296d430d629ba1443b", size = 25755, upload-time = "2026-04-24T13:15:41.93Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/81/f6/b09e2e0c9f0b5750cebc6eaf31527b910821453cef40a5a0fe93550422b2/opentelemetry_exporter_otlp_proto_grpc-1.41.0-py3-none-any.whl", hash = "sha256:3a1a86bd24806ccf136ec9737dbfa4c09b069f9130ff66b0acb014f9c5255fd1", size = 20299, upload-time = "2026-04-09T14:38:17.01Z" },
+    { url = "https://files.pythonhosted.org/packages/ac/f2/c54f33c92443d087703e57e52e55f22f111373a5c4c4aa349ea60efe512e/opentelemetry_exporter_otlp_proto_grpc-1.41.1-py3-none-any.whl", hash = "sha256:537926dcef951136992479af1d9cd88f25e33d56c530e9f020ed57774dca2f94", size = 20297, upload-time = "2026-04-24T13:15:20.212Z" },
 ]
 
 [[package]]
 name = "opentelemetry-exporter-otlp-proto-http"
-version = "1.41.0"
+version = "1.41.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "googleapis-common-protos" },
@@ -4316,9 +4365,9 @@ dependencies = [
     { name = "requests" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/19/63/d9f43cd75f3fabb7e01148c89cfa9491fc18f6580a6764c554ff7c953c46/opentelemetry_exporter_otlp_proto_http-1.41.0.tar.gz", hash = "sha256:dcd6e0686f56277db4eecbadd5262124e8f2cc739cadbc3fae3d08a12c976cf5", size = 24139, upload-time = "2026-04-09T14:38:38.128Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/33/5b/9d3c7f70cca10136ba82a81e738dee626c8e7fc61c6887ea9a58bf34c606/opentelemetry_exporter_otlp_proto_http-1.41.1.tar.gz", hash = "sha256:4747a9604c8550ab38c6fd6180e2fcb80de3267060bef2c306bad3cb443302bc", size = 24139, upload-time = "2026-04-24T13:15:42.977Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/64/b5/a214cd907eedc17699d1c2d602288ae17cb775526df04db3a3b3585329d2/opentelemetry_exporter_otlp_proto_http-1.41.0-py3-none-any.whl", hash = "sha256:a9c4ee69cce9c3f4d7ee736ad1b44e3c9654002c0816900abbafd9f3cf289751", size = 22673, upload-time = "2026-04-09T14:38:18.349Z" },
+    { url = "https://files.pythonhosted.org/packages/ba/4d/ef07ff2fc630849f2080ae0ae73a61f67257905b7ac79066640bfa0c5739/opentelemetry_exporter_otlp_proto_http-1.41.1-py3-none-any.whl", hash = "sha256:1a21e8f49c7a946d935551e90947d6c3eb39236723c6624401da0f33d68edcb4", size = 22673, upload-time = "2026-04-24T13:15:21.313Z" },
 ]
 
 [[package]]
@@ -4476,14 +4525,14 @@ wheels = [
 
 [[package]]
 name = "opentelemetry-proto"
-version = "1.41.0"
+version = "1.41.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "protobuf" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/e0/d9/08e3dc6156878713e8c811682bc76151f5fe1a3cb7f3abda3966fd56e71e/opentelemetry_proto-1.41.0.tar.gz", hash = "sha256:95d2e576f9fb1800473a3e4cfcca054295d06bdb869fda4dc9f4f779dc68f7b6", size = 45669, upload-time = "2026-04-09T14:38:45.978Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/99/e8/633c6d8a9c8840338b105907e55c32d3da1983abab5e52f899f72a82c3d1/opentelemetry_proto-1.41.1.tar.gz", hash = "sha256:4b9d2eb631237ea43b80e16c073af438554e32bc7e9e3f8ca4a9582f900020e5", size = 45670, upload-time = "2026-04-24T13:15:49.768Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/49/8c/65ef7a9383a363864772022e822b5d5c6988e6f9dabeebb9278f5b86ebc3/opentelemetry_proto-1.41.0-py3-none-any.whl", hash = "sha256:b970ab537309f9eed296be482c3e7cca05d8aca8165346e929f658dbe153b247", size = 72074, upload-time = "2026-04-09T14:38:29.38Z" },
+    { url = "https://files.pythonhosted.org/packages/e4/1e/5cd77035e3e82070e2265a63a760f715aacd3cb16dddc7efee913f297fcc/opentelemetry_proto-1.41.1-py3-none-any.whl", hash = "sha256:0496713b804d127a4147e32849fbaf5683fac8ee98550e8e7679cd706c289720", size = 72076, upload-time = "2026-04-24T13:15:32.542Z" },
 ]
 
 [[package]]
@@ -4810,7 +4859,7 @@ wheels = [
 
 [[package]]
 name = "postgrest"
-version = "2.29.0"
+version = "2.30.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "deprecation" },
@@ -4818,9 +4867,9 @@ dependencies = [
     { name = "pydantic" },
     { name = "yarl" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/52/98/f216b8b5c4d116ab6a2fb21339b5821da279ee773e163612418e1c56c012/postgrest-2.29.0.tar.gz", hash = "sha256:a87081858f627fcd57e8e7137004a1ef0adbdf0dbdfed1384e9ea1d7a9c525ec", size = 14217, upload-time = "2026-04-24T13:13:00.281Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/56/7c/54e7be05adc9fd6fd98dc572ddfc8982d45bec314a55711e37277d440698/postgrest-2.30.0.tar.gz", hash = "sha256:4f89eec56ce605ab6fbddd9b96d526a9bb44962796d44a5d85cb77640eb766c3", size = 14430, upload-time = "2026-05-06T17:35:21.559Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/2c/0b/08b670a93a90d625c557b9e64b8a5fdeec80c3542d2d0265f0b4d6b16646/postgrest-2.29.0-py3-none-any.whl", hash = "sha256:3ee48e146f726272733d20e2b12de354cdb6cb9dd9cc3a61ed97ce69047aeb96", size = 22735, upload-time = "2026-04-24T13:12:58.405Z" },
+    { url = "https://files.pythonhosted.org/packages/22/aa/ff2e09f99f95ea96fddeb373646bf907dd89a24fc00b5d38e5674ca7c9ca/postgrest-2.30.0-py3-none-any.whl", hash = "sha256:30631e7993da542419f4217cf3b60aa641084731ea15e66a18526a3a52e40a7d", size = 23108, upload-time = "2026-05-06T17:35:20.531Z" },
 ]
 
 [[package]]
@@ -5096,6 +5145,24 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/5a/87/b70ad306ebb6f9b585f114d0ac2137d792b48be34d732d60e597c2f8465a/pydantic-2.12.5-py3-none-any.whl", hash = "sha256:e561593fccf61e8a20fc46dfc2dfe075b8be7d0188df33f221ad1f0139180f9d", size = 463580, upload-time = "2025-11-26T15:11:44.605Z" },
 ]
 
+[[package]]
+name = "pydantic-ai-slim"
+version = "1.94.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "genai-prices" },
+    { name = "griffelib" },
+    { name = "httpx" },
+    { name = "opentelemetry-api" },
+    { name = "pydantic" },
+    { name = "pydantic-graph" },
+    { name = "typing-inspection" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/23/0b/ce4992e0e29ba81ba48d5bba955c53b72e2cda3636f9b6417386ae7e45f7/pydantic_ai_slim-1.94.0.tar.gz", hash = "sha256:7d7b1d6aec4d0fd31533a4ef5848863e8513ec75e82910296247a08b737aa828", size = 640338, upload-time = "2026-05-12T07:03:55.486Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/e3/dd/b104641c2af7044a788b1071159679aa755e5c9281f110fdc54b4729117b/pydantic_ai_slim-1.94.0-py3-none-any.whl", hash = "sha256:f47cf89c61ef45a48dd575a8b32707edfec2b33ef7af80aa069bde1ce3fb6795", size = 805546, upload-time = "2026-05-12T07:03:46.535Z" },
+]
+
 [[package]]
 name = "pydantic-core"
 version = "2.41.5"
@@ -5138,6 +5205,21 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/17/c1/3226e6d7f5a4f736f38ac11a6fbb262d701889802595cdb0f53a885ac2e0/pydantic_extra_types-2.11.1-py3-none-any.whl", hash = "sha256:1722ea2bddae5628ace25f2aa685b69978ef533123e5638cfbddb999e0100ec1", size = 79526, upload-time = "2026-03-16T08:08:02.533Z" },
 ]
 
+[[package]]
+name = "pydantic-graph"
+version = "1.94.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "httpx" },
+    { name = "logfire-api" },
+    { name = "pydantic" },
+    { name = "typing-inspection" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/79/80/c41aa5ccf7104eba172ff45e617967b0075b3fa34ab76cd3795d7d62334a/pydantic_graph-1.94.0.tar.gz", hash = "sha256:8f991c05d412c9d12d6560c1e131de48bfde12ebd27a0b196440620210f2d52c", size = 59252, upload-time = "2026-05-12T07:03:58.26Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/8a/7e/edcc6177d89174024bca1fb85044bec4855b96f4b724a310638283dfc8c5/pydantic_graph-1.94.0-py3-none-any.whl", hash = "sha256:c6e285abbc8a55d1b65162c238006913edd1ef05e63a29401a580e51f798503e", size = 73063, upload-time = "2026-05-12T07:03:50.651Z" },
+]
+
 [[package]]
 name = "pydantic-settings"
 version = "2.13.1"
@@ -5359,19 +5441,19 @@ wheels = [
 
 [[package]]
 name = "pyrefly"
-version = "0.62.0"
+version = "1.0.0"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/bb/ad/8874ed25781e7dd561c6d75fb4a7becf10a18d75b074f25b845cc334f781/pyrefly-0.62.0.tar.gz", hash = "sha256:da1fbe1075dc1e6c8e3134e9370b0a0e7a296061d782cca5bf83dbb8e4c10d7c", size = 5537672, upload-time = "2026-04-20T17:12:15.718Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/9f/3a/9045b0097ac58979c7c30a4fa0e673db942d4adbc7b6d439bd54ae58c441/pyrefly-1.0.0.tar.gz", hash = "sha256:5c2b810ffcebd84be71de5df1223651edee951653a66935c6f091e957c452455", size = 5677995, upload-time = "2026-05-12T20:12:46.812Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/1b/ea/09bd9da7d5df294db800312fb415be2fefbaa5594178e9e49f44fa071aea/pyrefly-0.62.0-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:9d78ec4f126dee1fa76215b193b964490ce10e62a32d2787a72c51623658b803", size = 13020414, upload-time = "2026-04-20T17:11:43.617Z" },
-    { url = "https://files.pythonhosted.org/packages/4b/f0/f84afac4f220c4c8c801b779ee2ff28ad3f7731f4283c2e1b6ee9012e8c2/pyrefly-0.62.0-py3-none-macosx_11_0_arm64.whl", hash = "sha256:2a41a34902d20756264486f9e309f22633d100261bd960feea6e858a098d985d", size = 12515659, upload-time = "2026-04-20T17:11:46.59Z" },
-    { url = "https://files.pythonhosted.org/packages/40/0b/620c39cefa9ae1b25ee7a2da9d8d3c278b095649cb8435c5e01ea64f7c17/pyrefly-0.62.0-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4666c6b65aea662e5f77b64dc91c091b7ea5cede6aa66c0f4cbae26480403583", size = 36228332, upload-time = "2026-04-20T17:11:50.523Z" },
-    { url = "https://files.pythonhosted.org/packages/2d/fb/47b8b76438c12761e509a3666cd5a99d4af7f21976ba8385feb475cbfe30/pyrefly-0.62.0-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1aefab798f47d37c13ded791192fee9b39a6d2b12e31f38ae06a1f80c4b26e22", size = 38995741, upload-time = "2026-04-20T17:11:54.702Z" },
-    { url = "https://files.pythonhosted.org/packages/55/d2/03bd17673f61147cd5609cd7d6a1455eeccc17a07a7e141ed9931b0c42c0/pyrefly-0.62.0-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8fa986b50d56740da1d7ae7c660a505143cb9d286fa98cc7e5f4a759cc6eaa5d", size = 37205321, upload-time = "2026-04-20T17:11:58.9Z" },
-    { url = "https://files.pythonhosted.org/packages/75/14/20ba7b7f2d182f9b7c1e24a3041dac9b5730ae28cfe1614a2c98706650f2/pyrefly-0.62.0-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:32e9b175805c82ffb967e4708f4910bace7e1a12736907380cc9afdbaabb0efb", size = 41786834, upload-time = "2026-04-20T17:12:03.221Z" },
-    { url = "https://files.pythonhosted.org/packages/fa/c8/5a7ba88c4fa1b5090d877f70fa1b742b921b9e7d8d3f4b6b9b1ba1820850/pyrefly-0.62.0-py3-none-win32.whl", hash = "sha256:1cd98edc20cab5bac8016c9220ee66080e39bd22e7f0e9bb3e2c4e2be1555eed", size = 12010170, upload-time = "2026-04-20T17:12:06.791Z" },
-    { url = "https://files.pythonhosted.org/packages/2e/78/d8f810de010ff2ed594c630c724fd817ef430963249e9eb396ce8f785e9d/pyrefly-0.62.0-py3-none-win_amd64.whl", hash = "sha256:6994f8ee7d6720325ee52207fbdaca98a799a1efe462bb5ba90c47160f7f3e6e", size = 12861816, upload-time = "2026-04-20T17:12:09.689Z" },
-    { url = "https://files.pythonhosted.org/packages/c7/a9/ac824ef6a3f50b7c0ec5974471f8f2cb205cd1edd53a5abbcf7ba37feb5d/pyrefly-0.62.0-py3-none-win_arm64.whl", hash = "sha256:362a5d47a5ac5aaa5258091e878a1759ff8b687d8cf462af1c516144f7b0108a", size = 12352977, upload-time = "2026-04-20T17:12:12.736Z" },
+    { url = "https://files.pythonhosted.org/packages/f4/c6/90788819bac9c61dd7bacba53b79f3c12d47ccbe5e51b3d6d89f2387e1d2/pyrefly-1.0.0-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:e355a0908555348ed4b9585ef25c76ff566673e345c866c325f1633f44d890b6", size = 13122950, upload-time = "2026-05-12T20:12:20.711Z" },
+    { url = "https://files.pythonhosted.org/packages/82/91/a3cf2a1e87d336eaa804a1e6fc93266faf6dc2a97eecdbc7eae289628022/pyrefly-1.0.0-py3-none-macosx_11_0_arm64.whl", hash = "sha256:a7038efc3a40f8294edee339895633cf22db268c0d434cdbcbefc34f78a9ecc3", size = 12599494, upload-time = "2026-05-12T20:12:23.495Z" },
+    { url = "https://files.pythonhosted.org/packages/cd/ab/74d1e11e737e99b1c003ecc5d7d2e846c4ea1f328966bfdbbd0ac63fad0a/pyrefly-1.0.0-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:da331ca515ed1c08791da2b5f664cf9c1294c48fd802133262e7d5d51e0f4416", size = 12995507, upload-time = "2026-05-12T20:12:25.951Z" },
+    { url = "https://files.pythonhosted.org/packages/7c/ac/2df0899f8464c97e5d995f994c97c5cb5b0f58610432aa90d26d924e1db5/pyrefly-1.0.0-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c74219d8f3e63cdaa5501a0b21d1c9d37011820f9606728d0ed06f09ae86a878", size = 13947693, upload-time = "2026-05-12T20:12:29.188Z" },
+    { url = "https://files.pythonhosted.org/packages/6b/3e/b247c24321e36f04b7d51f9ccf3df93e5009e4b29939524b36ec2e17dc2a/pyrefly-1.0.0-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c0d05543b1bb6ee6d64149eb5d6b2fb15aa72d3962d6a97abca0afaca8b0c131", size = 13925803, upload-time = "2026-05-12T20:12:31.904Z" },
+    { url = "https://files.pythonhosted.org/packages/61/16/cfa2d61a4aa1e1f7bca48bb37acd01c6a09db4864b16a54f9587092765ff/pyrefly-1.0.0-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1382d5b1fcdb49a4de9f34d112d2bddf290a78ff93ee8149492ad5f1077ddffc", size = 13470398, upload-time = "2026-05-12T20:12:35.302Z" },
+    { url = "https://files.pythonhosted.org/packages/cb/2b/6372c7dddb326223e24a46b17efd0d4bd7b4fe22c821e523157577eed2d2/pyrefly-1.0.0-py3-none-win32.whl", hash = "sha256:aa8b5d0e47080e3202a2547b39f7a5a61d2c781c712b3b67884f745ca2c759d2", size = 12222643, upload-time = "2026-05-12T20:12:38.618Z" },
+    { url = "https://files.pythonhosted.org/packages/be/ad/1d23be700b6b2ddaeb362360c7145917a8edbbf7240ae428d40541772fce/pyrefly-1.0.0-py3-none-win_amd64.whl", hash = "sha256:c8abcb0f2082e83c890375128f9cff4aa4d3f210b85eea7b3046c1ae764e77f5", size = 13146369, upload-time = "2026-05-12T20:12:41.423Z" },
+    { url = "https://files.pythonhosted.org/packages/8c/38/16589134f3012fd097a10dcc85771555f1a5fb76e04b682597180743af30/pyrefly-1.0.0-py3-none-win_arm64.whl", hash = "sha256:d150fa9e40e8392832be81c3bcfc0497c146674ce4d0f8e04e1ec29e775ffb8c", size = 12538326, upload-time = "2026-05-12T20:12:43.996Z" },
 ]
 
 [[package]]
@@ -5723,16 +5805,16 @@ wheels = [
 
 [[package]]
 name = "realtime"
-version = "2.29.0"
+version = "2.30.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "pydantic" },
     { name = "typing-extensions" },
     { name = "websockets" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/6e/f1/08c42a42653942fadfbef495d5b0239356140e7186cc528704956c5f06d4/realtime-2.29.0.tar.gz", hash = "sha256:8efe4a1b3a548a5fda09de701bd041fa0970c5a2fe7d13db0b9861ce11828be2", size = 18715, upload-time = "2026-04-24T13:13:02.315Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/b2/a2/0328d49d3b5fb427068e9200e7de5b0d708d021a1ad98d004bc685d2529e/realtime-2.30.0.tar.gz", hash = "sha256:7aa593da52ed5f92c34ec4e50e32043afa62f219c94f717ad64a66ab0ef9f1ba", size = 18718, upload-time = "2026-05-06T17:35:23.925Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/77/48/f6375c0a24923beb988f0c71c052604c96641cf43c2d22b91ec1df86afa0/realtime-2.29.0-py3-none-any.whl", hash = "sha256:1a4891e6c82e88ac9d96ac715e435e086f6f8c7665212a8717346de829cbb509", size = 22374, upload-time = "2026-04-24T13:13:01.103Z" },
+    { url = "https://files.pythonhosted.org/packages/b4/75/1b2cfc949595e22d8c05a2aa2cfc222921f7f94177d7e8a90542f3f73b33/realtime-2.30.0-py3-none-any.whl", hash = "sha256:7c93b63d2cf99aa1da4fa8826b03b00cd32f7b38abb27ff47b19eb5dcb5707c6", size = 22376, upload-time = "2026-05-06T17:35:22.568Z" },
 ]
 
 [[package]]
@@ -6214,7 +6296,7 @@ wheels = [
 
 [[package]]
 name = "storage3"
-version = "2.29.0"
+version = "2.30.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "deprecation" },
@@ -6223,9 +6305,9 @@ dependencies = [
     { name = "pyiceberg" },
     { name = "yarl" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/d7/be/771246434b5caf3c6187bfdc932eaede00bf5f2937b47475ab25209ede3e/storage3-2.29.0.tar.gz", hash = "sha256:b0cc2f6714655d725c998d2c5ae8c6fb4f56a513bd31e4f85770df557fe021e3", size = 20160, upload-time = "2026-04-24T13:13:04.626Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/9b/b2/6df208d64630744704d00f2c07197170390d6b4d0098617740f6a7a4fa98/storage3-2.30.0.tar.gz", hash = "sha256:b74e3cac149f2c0553dcb5f4d55d8c35d420d88183a1a2df77727d482665972b", size = 20162, upload-time = "2026-05-06T17:35:25.71Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/fc/c3/790c31866f52c13b26f108b45759bf50dafae3a0bafb4511fadc98ba7c33/storage3-2.29.0-py3-none-any.whl", hash = "sha256:043ef7ff27cc8b9da12be403cf78ee4586180edfcf62b227ff61e1bd79594b06", size = 28284, upload-time = "2026-04-24T13:13:03.338Z" },
+    { url = "https://files.pythonhosted.org/packages/91/5c/bb8c8cc448cfae671c4ffee67f3651892ea59b341f27bed54666190eb8ef/storage3-2.30.0-py3-none-any.whl", hash = "sha256:2bd23a34011c018bd9c130d8a70a09ebd060ae80d946c6204a6fc08161ad728d", size = 28284, upload-time = "2026-05-06T17:35:24.659Z" },
 ]
 
 [[package]]
@@ -6251,7 +6333,7 @@ wheels = [
 
 [[package]]
 name = "supabase"
-version = "2.29.0"
+version = "2.30.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "httpx" },
@@ -6262,37 +6344,37 @@ dependencies = [
     { name = "supabase-functions" },
     { name = "yarl" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/51/a0/2407d616fdf68e8632bbbfb063d1685c38377ac0199e8ca11deaea1f3bf0/supabase-2.29.0.tar.gz", hash = "sha256:a88c4a4eb50fbb903e2e962fbc7c27733b00589140139f9e837bc9fe30dd3615", size = 9689, upload-time = "2026-04-24T13:13:06.728Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/5c/a6/d2b17021c2db1a9d219c383e0762ac03a62b25468e61ab126b6b561c2f21/supabase-2.30.0.tar.gz", hash = "sha256:efdba41d474038ed220736ba4e64946df56043057ad785c4c3499d27e459975c", size = 9689, upload-time = "2026-05-06T17:35:27.781Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/22/52/232f6bbf5326e04ae12e2ef04a24f011a0d7cab379a8b9698652bc8ff78f/supabase-2.29.0-py3-none-any.whl", hash = "sha256:16c3ec4b7094f6b92efc5cd3bb3f96826d3b6dd5d24fe15c89c81166efce88fe", size = 16633, upload-time = "2026-04-24T13:13:05.722Z" },
+    { url = "https://files.pythonhosted.org/packages/f0/82/d213be7d0ce0bb18018744c0ee38ba0d6648d41dbc46ac8558cffe80541f/supabase-2.30.0-py3-none-any.whl", hash = "sha256:f9b259194554f7bfd2dca6c23261f2df588016ca18b18e774f4d85bc941edb03", size = 16634, upload-time = "2026-05-06T17:35:26.696Z" },
 ]
 
 [[package]]
 name = "supabase-auth"
-version = "2.29.0"
+version = "2.30.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "httpx", extra = ["http2"] },
     { name = "pydantic" },
     { name = "pyjwt", extra = ["crypto"] },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/51/7f/7ceeb4c7a2caa188062e934897f0e08e1af0a0e47e376c7645c26b4c39d8/supabase_auth-2.29.0.tar.gz", hash = "sha256:46efc6a3455a23957b846dc974303a844ba0413718cfa899425477ac977f95b3", size = 39154, upload-time = "2026-04-24T13:13:08.509Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/8e/8a/48bbbe0b6703d0670b67e45b90d6a791fd01aace67443d286f760bf48895/supabase_auth-2.30.0.tar.gz", hash = "sha256:6138a53a306a95ed59c03d4e4975469dfc3343a0ade33cc4b37e4ef967ad83f8", size = 39135, upload-time = "2026-05-06T17:35:30.371Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/f1/ac/3c35cf52281f940b9497cf17abfc5c2050ca49f342d60cfafe22dac3482b/supabase_auth-2.29.0-py3-none-any.whl", hash = "sha256:64de6ef8cae80f97d3aa8d5ca507d5427dda5c89885c0bcfe9f8b0263b6fb9a4", size = 48379, upload-time = "2026-04-24T13:13:07.417Z" },
+    { url = "https://files.pythonhosted.org/packages/db/40/a99cb4373353bcbf302d962e51da9eac78b3b0f257eb0362c0852b1667f4/supabase_auth-2.30.0-py3-none-any.whl", hash = "sha256:e85e1f51ec0de2172c3a2a8514205f71731a9914f9a770ed199ac0cf054bc82c", size = 48352, upload-time = "2026-05-06T17:35:28.936Z" },
 ]
 
 [[package]]
 name = "supabase-functions"
-version = "2.29.0"
+version = "2.30.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "httpx", extra = ["http2"] },
     { name = "strenum" },
     { name = "yarl" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/e5/19/1a1d22749f38f2a6cbca93a6f5a35c9f816c2c3c06bfaa077fa336e90537/supabase_functions-2.29.0.tar.gz", hash = "sha256:0f8a14a2ea9f12b1c208f61dc6f55e2f4b1121f81bf01c08f9b487d22888744d", size = 4683, upload-time = "2026-04-24T13:13:10.432Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/f0/e6/5cd8559ec2bb332e6027840c1be292f9989c2fc7b47bf40800aec5586791/supabase_functions-2.30.0.tar.gz", hash = "sha256:025acfd25f1c000ba43d0f7b8e366b0d2e9dfc784b842528e21973eb33006113", size = 4683, upload-time = "2026-05-06T17:35:32.246Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/e0/10/6f8ef0b408ade76b5a439afab588ce5849e9604a23040ca73cfe0b90cb9e/supabase_functions-2.29.0-py3-none-any.whl", hash = "sha256:6f08de52eec5820eae53616868b85e849e181beffaa5d05b8ea1708ceae5e48e", size = 8799, upload-time = "2026-04-24T13:13:09.214Z" },
+    { url = "https://files.pythonhosted.org/packages/53/da/9dedab32775df04cc22ca72f194b78e895d940f195bed3e02882a65daa9b/supabase_functions-2.30.0-py3-none-any.whl", hash = "sha256:92419459f102767b954cd034856e4ded8e34c78660b32442d66c8b2899c68011", size = 8803, upload-time = "2026-05-06T17:35:31.342Z" },
 ]
 
 [[package]]
@@ -6447,27 +6529,28 @@ wheels = [
 
 [[package]]
 name = "tokenizers"
-version = "0.22.1"
+version = "0.22.2"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "huggingface-hub" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/1c/46/fb6854cec3278fbfa4a75b50232c77622bc517ac886156e6afbfa4d8fc6e/tokenizers-0.22.1.tar.gz", hash = "sha256:61de6522785310a309b3407bac22d99c4db5dba349935e99e4d15ea2226af2d9", size = 363123, upload-time = "2025-09-19T09:49:23.424Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/73/6f/f80cfef4a312e1fb34baf7d85c72d4411afde10978d4657f8cdd811d3ccc/tokenizers-0.22.2.tar.gz", hash = "sha256:473b83b915e547aa366d1eee11806deaf419e17be16310ac0a14077f1e28f917", size = 372115, upload-time = "2026-01-05T10:45:15.988Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/bf/33/f4b2d94ada7ab297328fc671fed209368ddb82f965ec2224eb1892674c3a/tokenizers-0.22.1-cp39-abi3-macosx_10_12_x86_64.whl", hash = "sha256:59fdb013df17455e5f950b4b834a7b3ee2e0271e6378ccb33aa74d178b513c73", size = 3069318, upload-time = "2025-09-19T09:49:11.848Z" },
-    { url = "https://files.pythonhosted.org/packages/1c/58/2aa8c874d02b974990e89ff95826a4852a8b2a273c7d1b4411cdd45a4565/tokenizers-0.22.1-cp39-abi3-macosx_11_0_arm64.whl", hash = "sha256:8d4e484f7b0827021ac5f9f71d4794aaef62b979ab7608593da22b1d2e3c4edc", size = 2926478, upload-time = "2025-09-19T09:49:09.759Z" },
-    { url = "https://files.pythonhosted.org/packages/1e/3b/55e64befa1e7bfea963cf4b787b2cea1011362c4193f5477047532ce127e/tokenizers-0.22.1-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:19d2962dd28bc67c1f205ab180578a78eef89ac60ca7ef7cbe9635a46a56422a", size = 3256994, upload-time = "2025-09-19T09:48:56.701Z" },
-    { url = "https://files.pythonhosted.org/packages/71/0b/fbfecf42f67d9b7b80fde4aabb2b3110a97fac6585c9470b5bff103a80cb/tokenizers-0.22.1-cp39-abi3-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:38201f15cdb1f8a6843e6563e6e79f4abd053394992b9bbdf5213ea3469b4ae7", size = 3153141, upload-time = "2025-09-19T09:48:59.749Z" },
-    { url = "https://files.pythonhosted.org/packages/17/a9/b38f4e74e0817af8f8ef925507c63c6ae8171e3c4cb2d5d4624bf58fca69/tokenizers-0.22.1-cp39-abi3-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d1cbe5454c9a15df1b3443c726063d930c16f047a3cc724b9e6e1a91140e5a21", size = 3508049, upload-time = "2025-09-19T09:49:05.868Z" },
-    { url = "https://files.pythonhosted.org/packages/d2/48/dd2b3dac46bb9134a88e35d72e1aa4869579eacc1a27238f1577270773ff/tokenizers-0.22.1-cp39-abi3-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e7d094ae6312d69cc2a872b54b91b309f4f6fbce871ef28eb27b52a98e4d0214", size = 3710730, upload-time = "2025-09-19T09:49:01.832Z" },
-    { url = "https://files.pythonhosted.org/packages/93/0e/ccabc8d16ae4ba84a55d41345207c1e2ea88784651a5a487547d80851398/tokenizers-0.22.1-cp39-abi3-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:afd7594a56656ace95cdd6df4cca2e4059d294c5cfb1679c57824b605556cb2f", size = 3412560, upload-time = "2025-09-19T09:49:03.867Z" },
-    { url = "https://files.pythonhosted.org/packages/d0/c6/dc3a0db5a6766416c32c034286d7c2d406da1f498e4de04ab1b8959edd00/tokenizers-0.22.1-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e2ef6063d7a84994129732b47e7915e8710f27f99f3a3260b8a38fc7ccd083f4", size = 3250221, upload-time = "2025-09-19T09:49:07.664Z" },
-    { url = "https://files.pythonhosted.org/packages/d7/a6/2c8486eef79671601ff57b093889a345dd3d576713ef047776015dc66de7/tokenizers-0.22.1-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:ba0a64f450b9ef412c98f6bcd2a50c6df6e2443b560024a09fa6a03189726879", size = 9345569, upload-time = "2025-09-19T09:49:14.214Z" },
-    { url = "https://files.pythonhosted.org/packages/6b/16/32ce667f14c35537f5f605fe9bea3e415ea1b0a646389d2295ec348d5657/tokenizers-0.22.1-cp39-abi3-musllinux_1_2_armv7l.whl", hash = "sha256:331d6d149fa9c7d632cde4490fb8bbb12337fa3a0232e77892be656464f4b446", size = 9271599, upload-time = "2025-09-19T09:49:16.639Z" },
-    { url = "https://files.pythonhosted.org/packages/51/7c/a5f7898a3f6baa3fc2685c705e04c98c1094c523051c805cdd9306b8f87e/tokenizers-0.22.1-cp39-abi3-musllinux_1_2_i686.whl", hash = "sha256:607989f2ea68a46cb1dfbaf3e3aabdf3f21d8748312dbeb6263d1b3b66c5010a", size = 9533862, upload-time = "2025-09-19T09:49:19.146Z" },
-    { url = "https://files.pythonhosted.org/packages/36/65/7e75caea90bc73c1dd8d40438adf1a7bc26af3b8d0a6705ea190462506e1/tokenizers-0.22.1-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:a0f307d490295717726598ef6fa4f24af9d484809223bbc253b201c740a06390", size = 9681250, upload-time = "2025-09-19T09:49:21.501Z" },
-    { url = "https://files.pythonhosted.org/packages/30/2c/959dddef581b46e6209da82df3b78471e96260e2bc463f89d23b1bf0e52a/tokenizers-0.22.1-cp39-abi3-win32.whl", hash = "sha256:b5120eed1442765cd90b903bb6cfef781fd8fe64e34ccaecbae4c619b7b12a82", size = 2472003, upload-time = "2025-09-19T09:49:27.089Z" },
-    { url = "https://files.pythonhosted.org/packages/b3/46/e33a8c93907b631a99377ef4c5f817ab453d0b34f93529421f42ff559671/tokenizers-0.22.1-cp39-abi3-win_amd64.whl", hash = "sha256:65fd6e3fb11ca1e78a6a93602490f134d1fdeb13bcef99389d5102ea318ed138", size = 2674684, upload-time = "2025-09-19T09:49:24.953Z" },
+    { url = "https://files.pythonhosted.org/packages/92/97/5dbfabf04c7e348e655e907ed27913e03db0923abb5dfdd120d7b25630e1/tokenizers-0.22.2-cp39-abi3-macosx_10_12_x86_64.whl", hash = "sha256:544dd704ae7238755d790de45ba8da072e9af3eea688f698b137915ae959281c", size = 3100275, upload-time = "2026-01-05T10:41:02.158Z" },
+    { url = "https://files.pythonhosted.org/packages/2e/47/174dca0502ef88b28f1c9e06b73ce33500eedfac7a7692108aec220464e7/tokenizers-0.22.2-cp39-abi3-macosx_11_0_arm64.whl", hash = "sha256:1e418a55456beedca4621dbab65a318981467a2b188e982a23e117f115ce5001", size = 2981472, upload-time = "2026-01-05T10:41:00.276Z" },
+    { url = "https://files.pythonhosted.org/packages/d6/84/7990e799f1309a8b87af6b948f31edaa12a3ed22d11b352eaf4f4b2e5753/tokenizers-0.22.2-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2249487018adec45d6e3554c71d46eb39fa8ea67156c640f7513eb26f318cec7", size = 3290736, upload-time = "2026-01-05T10:40:32.165Z" },
+    { url = "https://files.pythonhosted.org/packages/78/59/09d0d9ba94dcd5f4f1368d4858d24546b4bdc0231c2354aa31d6199f0399/tokenizers-0.22.2-cp39-abi3-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:25b85325d0815e86e0bac263506dd114578953b7b53d7de09a6485e4a160a7dd", size = 3168835, upload-time = "2026-01-05T10:40:38.847Z" },
+    { url = "https://files.pythonhosted.org/packages/47/50/b3ebb4243e7160bda8d34b731e54dd8ab8b133e50775872e7a434e524c28/tokenizers-0.22.2-cp39-abi3-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bfb88f22a209ff7b40a576d5324bf8286b519d7358663db21d6246fb17eea2d5", size = 3521673, upload-time = "2026-01-05T10:40:56.614Z" },
+    { url = "https://files.pythonhosted.org/packages/e0/fa/89f4cb9e08df770b57adb96f8cbb7e22695a4cb6c2bd5f0c4f0ebcf33b66/tokenizers-0.22.2-cp39-abi3-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1c774b1276f71e1ef716e5486f21e76333464f47bece56bbd554485982a9e03e", size = 3724818, upload-time = "2026-01-05T10:40:44.507Z" },
+    { url = "https://files.pythonhosted.org/packages/64/04/ca2363f0bfbe3b3d36e95bf67e56a4c88c8e3362b658e616d1ac185d47f2/tokenizers-0.22.2-cp39-abi3-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:df6c4265b289083bf710dff49bc51ef252f9d5be33a45ee2bed151114a56207b", size = 3379195, upload-time = "2026-01-05T10:40:51.139Z" },
+    { url = "https://files.pythonhosted.org/packages/2e/76/932be4b50ef6ccedf9d3c6639b056a967a86258c6d9200643f01269211ca/tokenizers-0.22.2-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:369cc9fc8cc10cb24143873a0d95438bb8ee257bb80c71989e3ee290e8d72c67", size = 3274982, upload-time = "2026-01-05T10:40:58.331Z" },
+    { url = "https://files.pythonhosted.org/packages/1d/28/5f9f5a4cc211b69e89420980e483831bcc29dade307955cc9dc858a40f01/tokenizers-0.22.2-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:29c30b83d8dcd061078b05ae0cb94d3c710555fbb44861139f9f83dcca3dc3e4", size = 9478245, upload-time = "2026-01-05T10:41:04.053Z" },
+    { url = "https://files.pythonhosted.org/packages/6c/fb/66e2da4704d6aadebf8cb39f1d6d1957df667ab24cff2326b77cda0dcb85/tokenizers-0.22.2-cp39-abi3-musllinux_1_2_armv7l.whl", hash = "sha256:37ae80a28c1d3265bb1f22464c856bd23c02a05bb211e56d0c5301a435be6c1a", size = 9560069, upload-time = "2026-01-05T10:45:10.673Z" },
+    { url = "https://files.pythonhosted.org/packages/16/04/fed398b05caa87ce9b1a1bb5166645e38196081b225059a6edaff6440fac/tokenizers-0.22.2-cp39-abi3-musllinux_1_2_i686.whl", hash = "sha256:791135ee325f2336f498590eb2f11dc5c295232f288e75c99a36c5dbce63088a", size = 9899263, upload-time = "2026-01-05T10:45:12.559Z" },
+    { url = "https://files.pythonhosted.org/packages/05/a1/d62dfe7376beaaf1394917e0f8e93ee5f67fea8fcf4107501db35996586b/tokenizers-0.22.2-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:38337540fbbddff8e999d59970f3c6f35a82de10053206a7562f1ea02d046fa5", size = 10033429, upload-time = "2026-01-05T10:45:14.333Z" },
+    { url = "https://files.pythonhosted.org/packages/fd/18/a545c4ea42af3df6effd7d13d250ba77a0a86fb20393143bbb9a92e434d4/tokenizers-0.22.2-cp39-abi3-win32.whl", hash = "sha256:a6bf3f88c554a2b653af81f3204491c818ae2ac6fbc09e76ef4773351292bc92", size = 2502363, upload-time = "2026-01-05T10:45:20.593Z" },
+    { url = "https://files.pythonhosted.org/packages/65/71/0670843133a43d43070abeb1949abfdef12a86d490bea9cd9e18e37c5ff7/tokenizers-0.22.2-cp39-abi3-win_amd64.whl", hash = "sha256:c9ea31edff2968b44a88f97d784c2f16dc0729b8b143ed004699ebca91f05c48", size = 2747786, upload-time = "2026-01-05T10:45:18.411Z" },
+    { url = "https://files.pythonhosted.org/packages/72/f4/0de46cfa12cdcbcd464cc59fde36912af405696f687e53a091fb432f694c/tokenizers-0.22.2-cp39-abi3-win_arm64.whl", hash = "sha256:9ce725d22864a1e965217204946f830c37876eee3b2ba6fc6255e8e903d5fcbc", size = 2612133, upload-time = "2026-01-05T10:45:17.232Z" },
 ]
 
 [[package]]
@@ -7029,26 +7112,24 @@ wheels = [
 
 [[package]]
 name = "ujson"
-version = "5.12.0"
+version = "5.12.1"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/cb/3e/c35530c5ffc25b71c59ae0cd7b8f99df37313daa162ce1e2f7925f7c2877/ujson-5.12.0.tar.gz", hash = "sha256:14b2e1eb528d77bc0f4c5bd1a7ebc05e02b5b41beefb7e8567c9675b8b13bcf4", size = 7158451, upload-time = "2026-03-11T22:19:30.397Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/bc/78/937198ea8708182dd1edbf0237bf255a96feab3f511691ad08b84da98e5d/ujson-5.12.1.tar.gz", hash = "sha256:5b7e96406c301a1366534479a7352ec40ec68bb327c0c119091635acd5925e35", size = 7164538, upload-time = "2026-05-05T22:05:01.354Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/84/f6/ac763d2108d28f3a40bb3ae7d2fafab52ca31b36c2908a4ad02cd3ceba2a/ujson-5.12.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:09b4beff9cc91d445d5818632907b85fb06943b61cb346919ce202668bf6794a", size = 56326, upload-time = "2026-03-11T22:18:18.467Z" },
-    { url = "https://files.pythonhosted.org/packages/25/46/d0b3af64dcdc549f9996521c8be6d860ac843a18a190ffc8affeb7259687/ujson-5.12.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:ca0c7ce828bb76ab78b3991904b477c2fd0f711d7815c252d1ef28ff9450b052", size = 53910, upload-time = "2026-03-11T22:18:19.502Z" },
-    { url = "https://files.pythonhosted.org/packages/9a/10/853c723bcabc3e9825a079019055fc99e71b85c6bae600607a2b9d31d18d/ujson-5.12.0-cp312-cp312-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a2d79c6635ccffcbfc1d5c045874ba36b594589be81d50d43472570bb8de9c57", size = 57754, upload-time = "2026-03-11T22:18:20.874Z" },
-    { url = "https://files.pythonhosted.org/packages/f9/c6/6e024830d988f521f144ead641981c1f7a82c17ad1927c22de3242565f5c/ujson-5.12.0-cp312-cp312-manylinux_2_24_i686.manylinux_2_28_i686.whl", hash = "sha256:7e07f6f644d2c44d53b7a320a084eef98063651912c1b9449b5f45fcbdc6ccd2", size = 59936, upload-time = "2026-03-11T22:18:21.924Z" },
-    { url = "https://files.pythonhosted.org/packages/34/c9/c5f236af5abe06b720b40b88819d00d10182d2247b1664e487b3ed9229cf/ujson-5.12.0-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:085b6ce182cdd6657481c7c4003a417e0655c4f6e58b76f26ee18f0ae21db827", size = 57463, upload-time = "2026-03-11T22:18:22.924Z" },
-    { url = "https://files.pythonhosted.org/packages/ae/04/41342d9ef68e793a87d84e4531a150c2b682f3bcedfe59a7a5e3f73e9213/ujson-5.12.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:16b4fe9c97dc605f5e1887a9e1224287291e35c56cbc379f8aa44b6b7bcfe2bb", size = 1037239, upload-time = "2026-03-11T22:18:24.04Z" },
-    { url = "https://files.pythonhosted.org/packages/d4/81/dc2b7617d5812670d4ff4a42f6dd77926430ee52df0dedb2aec7990b2034/ujson-5.12.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:0d2e8db5ade3736a163906154ca686203acc7d1d30736cbf577c730d13653d84", size = 1196713, upload-time = "2026-03-11T22:18:25.391Z" },
-    { url = "https://files.pythonhosted.org/packages/b6/9c/80acff0504f92459ed69e80a176286e32ca0147ac6a8252cd0659aad3227/ujson-5.12.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:93bc91fdadcf046da37a214eaa714574e7e9b1913568e93bb09527b2ceb7f759", size = 1089742, upload-time = "2026-03-11T22:18:26.738Z" },
-    { url = "https://files.pythonhosted.org/packages/e3/f0/123ffaac17e45ef2b915e3e3303f8f4ea78bb8d42afad828844e08622b1e/ujson-5.12.0-cp312-cp312-win32.whl", hash = "sha256:2a248750abce1c76fbd11b2e1d88b95401e72819295c3b851ec73399d6849b3d", size = 39773, upload-time = "2026-03-11T22:18:28.244Z" },
-    { url = "https://files.pythonhosted.org/packages/b5/20/f3bd2b069c242c2b22a69e033bfe224d1d15d3649e6cd7cc7085bb1412ff/ujson-5.12.0-cp312-cp312-win_amd64.whl", hash = "sha256:1b5c6ceb65fecd28a1d20d1eba9dbfa992612b86594e4b6d47bb580d2dd6bcb3", size = 44040, upload-time = "2026-03-11T22:18:29.236Z" },
-    { url = "https://files.pythonhosted.org/packages/f0/a7/01b5a0bcded14cd2522b218f2edc3533b0fcbccdea01f3e14a2b699071aa/ujson-5.12.0-cp312-cp312-win_arm64.whl", hash = "sha256:9a5fcbe7b949f2e95c47ea8a80b410fcdf2da61c98553b45a4ee875580418b68", size = 38526, upload-time = "2026-03-11T22:18:30.551Z" },
-    { url = "https://files.pythonhosted.org/packages/95/3c/5ee154d505d1aad2debc4ba38b1a60ae1949b26cdb5fa070e85e320d6b64/ujson-5.12.0-graalpy312-graalpy250_312_native-macosx_10_13_x86_64.whl", hash = "sha256:bf85a00ac3b56a1e7a19c5be7b02b5180a0895ac4d3c234d717a55e86960691c", size = 54494, upload-time = "2026-03-11T22:19:13.035Z" },
-    { url = "https://files.pythonhosted.org/packages/ce/b3/9496ec399ec921e434a93b340bd5052999030b7ac364be4cbe5365ac6b20/ujson-5.12.0-graalpy312-graalpy250_312_native-macosx_11_0_arm64.whl", hash = "sha256:64df53eef4ac857eb5816a56e2885ccf0d7dff6333c94065c93b39c51063e01d", size = 57999, upload-time = "2026-03-11T22:19:14.385Z" },
-    { url = "https://files.pythonhosted.org/packages/0e/da/e9ae98133336e7c0d50b43626c3f2327937cecfa354d844e02ac17379ed1/ujson-5.12.0-graalpy312-graalpy250_312_native-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6c0aed6a4439994c9666fb8a5b6c4eac94d4ef6ddc95f9b806a599ef83547e3b", size = 54518, upload-time = "2026-03-11T22:19:15.4Z" },
-    { url = "https://files.pythonhosted.org/packages/58/10/978d89dded6bb1558cd46ba78f4351198bd2346db8a8ee1a94119022ce40/ujson-5.12.0-graalpy312-graalpy250_312_native-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:efae5df7a8cc8bdb1037b0f786b044ce281081441df5418c3a0f0e1f86fe7bb3", size = 55736, upload-time = "2026-03-11T22:19:16.496Z" },
-    { url = "https://files.pythonhosted.org/packages/80/25/1df8e6217c92e57a1266bf5be750b1dddc126ee96e53fe959d5693503bc6/ujson-5.12.0-graalpy312-graalpy250_312_native-win_amd64.whl", hash = "sha256:8712b61eb1b74a4478cfd1c54f576056199e9f093659334aeb5c4a6b385338e5", size = 44615, upload-time = "2026-03-11T22:19:17.53Z" },
+    { url = "https://files.pythonhosted.org/packages/d7/40/dbb8e2fe6ee33769602fba203dacaa3963b6599f0d0aefdf2b8811af5f70/ujson-5.12.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:10f44bd08ae52ee23ca6e8b472692e5da1768af2d53ff1bad6f40b532e0bc7ee", size = 57951, upload-time = "2026-05-05T22:03:31.606Z" },
+    { url = "https://files.pythonhosted.org/packages/8d/db/627472e6b4ac34148ea52e6d3d15f6f366fc21c72fe7d6c7d3729d4b3ac5/ujson-5.12.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:6cc6ea753b7303fa5629fa9ac9257ea4b001c4d72583b2bb36ff1855a07db49f", size = 55562, upload-time = "2026-05-05T22:03:32.853Z" },
+    { url = "https://files.pythonhosted.org/packages/be/59/1248c966da197ae7d2673542444a2d9a1ff7c46e3ec2a302c3caf902b922/ujson-5.12.1-cp312-cp312-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:289f13095764d03734adfa10107da9b530ceb64dc1b02a5f507588d978d5b7df", size = 59448, upload-time = "2026-05-05T22:03:34.143Z" },
+    { url = "https://files.pythonhosted.org/packages/d5/d7/60c1ca71a09c0654c3edca1192a18fc55e6cc06107be86d7d3f2b39fb29b/ujson-5.12.1-cp312-cp312-manylinux_2_24_i686.manylinux_2_28_i686.whl", hash = "sha256:427893168d074e59214b0ee058337c57f5bb80175cdd5b4799a9c931aae22022", size = 61608, upload-time = "2026-05-05T22:03:35.386Z" },
+    { url = "https://files.pythonhosted.org/packages/d5/0a/c619525576219bfc50084100117481b1a732a16716a3878355570995de4e/ujson-5.12.1-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a7a81724d5d90a2da7155d15d8b156ce57eaed7cdd622df813f36a8e612fd4c8", size = 59113, upload-time = "2026-05-05T22:03:37.555Z" },
+    { url = "https://files.pythonhosted.org/packages/18/4d/79c1674036085e8dfdb77f8d87c1fd2896e97e6affd117c5e8ecc40f0ae4/ujson-5.12.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:3a6efff7dc6515416366819de4a1bc449b77107c5b48508b101fd40f7f8bec08", size = 1038914, upload-time = "2026-05-05T22:03:38.954Z" },
+    { url = "https://files.pythonhosted.org/packages/94/b1/9409bba17189ee282b6314cdf0ecdcc72e3d38cd565c870c0227d0494569/ujson-5.12.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:77a71fe53427a0cf49d56eafd801d9f7e203b784b7f99cc717783fd6f6f7b732", size = 1198408, upload-time = "2026-05-05T22:03:40.943Z" },
+    { url = "https://files.pythonhosted.org/packages/4b/ad/fafbce7ac59f1a10a83892d0a34add23cc06492308e1330493aab707dc20/ujson-5.12.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:ea3bed53d2ea8e5642e814a9e41f3e29420a8067874ba03ace8c0462e160490c", size = 1091451, upload-time = "2026-05-05T22:03:42.739Z" },
+    { url = "https://files.pythonhosted.org/packages/5a/1f/76fc9d5b1dcb9eb73ed45fd56e5114391bd30808eb1cea7f8bc5c9a64324/ujson-5.12.1-cp312-cp312-win32.whl", hash = "sha256:758e5c8fbe4e6d483041e03b307b01fb5d2f2dd4452d4d4b927ab902e188939e", size = 41049, upload-time = "2026-05-05T22:03:44.341Z" },
+    { url = "https://files.pythonhosted.org/packages/35/2a/7ce3b6fda10d05b79a245db03405734b521ba3da6c377f173b018dce6d4e/ujson-5.12.1-cp312-cp312-win_amd64.whl", hash = "sha256:f6074d3d3267ba1914c624b6e1fa3d8152648ff36b0ab77ddf83b92db488c30d", size = 45330, upload-time = "2026-05-05T22:03:45.828Z" },
+    { url = "https://files.pythonhosted.org/packages/d7/66/5a37bba7a2e2ab36ae467521c4511e6593ad74c869f62ec4ba6330f3f71e/ujson-5.12.1-cp312-cp312-win_arm64.whl", hash = "sha256:7642a41520ac1b2bc25ea282b66b8da522cc43424442e6fb5e039be4d4f96530", size = 39828, upload-time = "2026-05-05T22:03:47.123Z" },
+    { url = "https://files.pythonhosted.org/packages/6d/26/c9d0479236b3f5690d6a8bb45f708aabc2c91ca80d275eba24b1e9e464ab/ujson-5.12.1-graalpy312-graalpy250_312_native-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b2c419bf42ae40963fc27f70c59e24e9a97f5cf168dbce2c572f3c0ce3595912", size = 56153, upload-time = "2026-05-05T22:04:40.326Z" },
+    { url = "https://files.pythonhosted.org/packages/ee/c8/785f4e132500aff2f1fd2bd4a4b86fe396a5519f830a098358c90ebb92ee/ujson-5.12.1-graalpy312-graalpy250_312_native-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0be2b4f2f547b9f0f3d902640e410e5a2fc851576cbe033c88445a23e3e7aef1", size = 57352, upload-time = "2026-05-05T22:04:42.005Z" },
+    { url = "https://files.pythonhosted.org/packages/8f/13/b688a905653871b10b4ff0403c2ff562c17a0bd50be0d44324f3c85ca48f/ujson-5.12.1-graalpy312-graalpy250_312_native-win_amd64.whl", hash = "sha256:4ea0c490c702c20495e97345acfcf0c2f3153e658ef537ff111929c48b89e10a", size = 45988, upload-time = "2026-05-05T22:04:43.36Z" },
 ]
 
 [[package]]
@@ -7143,11 +7224,11 @@ wheels = [
 
 [[package]]
 name = "urllib3"
-version = "2.6.3"
+version = "2.7.0"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/c7/24/5f1b3bdffd70275f6661c76461e25f024d5a38a46f04aaca912426a2b1d3/urllib3-2.6.3.tar.gz", hash = "sha256:1b62b6884944a57dbe321509ab94fd4d3b307075e0c2eae991ac71ee15ad38ed", size = 435556, upload-time = "2026-01-07T16:24:43.925Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/53/0c/06f8b233b8fd13b9e5ee11424ef85419ba0d8ba0b3138bf360be2ff56953/urllib3-2.7.0.tar.gz", hash = "sha256:231e0ec3b63ceb14667c67be60f2f2c40a518cb38b03af60abc813da26505f4c", size = 433602, upload-time = "2026-05-07T16:13:18.596Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/39/08/aaaad47bc4e9dc8c725e68f9d04865dbcb2052843ff09c97b08904852d84/urllib3-2.6.3-py3-none-any.whl", hash = "sha256:bf272323e553dfb2e87d9bfd225ca7b0f467b919d7bbd355436d3fd37cb0acd4", size = 131584, upload-time = "2026-01-07T16:24:42.685Z" },
+    { url = "https://files.pythonhosted.org/packages/7f/3e/5db95bcf282c52709639744ca2a8b149baccf648e39c8cc87553df9eae0c/urllib3-2.7.0-py3-none-any.whl", hash = "sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897", size = 131087, upload-time = "2026-05-07T16:13:17.151Z" },
 ]
 
 [[package]]
diff --git a/dev/basedpyright-check b/dev/basedpyright-check
deleted file mode 100755
index 1b3d1df7ad..0000000000
--- a/dev/basedpyright-check
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-set -x
-
-SCRIPT_DIR="$(dirname "$(realpath "$0")")"
-cd "$SCRIPT_DIR/.."
-
-# Get the path argument if provided
-PATH_TO_CHECK="$1"
-
-# Determine CPU core count based on OS
-CPU_CORES=$(
-  if [[ "$(uname -s)" == "Darwin" ]]; then
-    sysctl -n hw.ncpu 2>/dev/null
-  else
-    nproc
-  fi
-)
-
-# Run basedpyright checks
-uv run --directory api --dev -- basedpyright --threads "$CPU_CORES" $PATH_TO_CHECK
diff --git a/dev/pyrefly-check-local b/dev/pyrefly-check-local
index 8fa5f121fc..be78230662 100755
--- a/dev/pyrefly-check-local
+++ b/dev/pyrefly-check-local
@@ -8,6 +8,15 @@ cd "$REPO_ROOT"
 
 EXCLUDES_FILE="api/pyrefly-local-excludes.txt"
 
+target_paths=()
+for target_path in "$@"; do
+  if [[ "$target_path" == api/* ]]; then
+    target_paths+=("${target_path#api/}")
+  else
+    target_paths+=("$target_path")
+  fi
+done
+
 pyrefly_args=(
   "--summary=none"
   "--use-ignore-files=false"
@@ -25,8 +34,16 @@ if [[ -f "$EXCLUDES_FILE" ]]; then
 fi
 
 tmp_output="$(mktemp)"
+pyrefly_command=(
+  uv run --directory api --dev pyrefly check
+  "${pyrefly_args[@]}"
+)
+if (( ${#target_paths[@]} > 0 )); then
+  pyrefly_command+=("${target_paths[@]}")
+fi
+
 set +e
-uv run --directory api --dev pyrefly check "${pyrefly_args[@]}" >"$tmp_output" 2>&1
+"${pyrefly_command[@]}" >"$tmp_output" 2>&1
 pyrefly_status=$?
 set -e
 
diff --git a/dev/pytest/pytest_config_tests.py b/dev/pytest/pytest_config_tests.py
index d56cceff5e..b136f09c61 100644
--- a/dev/pytest/pytest_config_tests.py
+++ b/dev/pytest/pytest_config_tests.py
@@ -93,10 +93,16 @@ BASE_API_AND_DOCKER_COMPOSE_CONFIG_SET_DIFF: frozenset[str] = frozenset(
 
 API_CONFIG_SET = set(dotenv_values(Path("api") / Path(".env.example")).keys())
 DOCKER_CONFIG_SET = set(dotenv_values(Path("docker") / Path(".env.example")).keys())
-DOCKER_COMPOSE_CONFIG_SET = set()
+DOCKER_COMPOSE_CONFIG_SET = set(DOCKER_CONFIG_SET)
 
-with open(Path("docker") / Path("docker-compose.yaml")) as f:
-    DOCKER_COMPOSE_CONFIG_SET = set(yaml.safe_load(f.read())["x-shared-env"].keys())
+# Read environment variables from the split env files used by docker-compose
+# Walk through all .env.example files in subdirectories (per-module structure)
+envs_dir = Path("docker") / Path("envs")
+if envs_dir.exists():
+    for env_file_path in envs_dir.rglob("*.env.example"):
+        env_keys = set(dotenv_values(env_file_path).keys())
+        DOCKER_CONFIG_SET.update(env_keys)
+        DOCKER_COMPOSE_CONFIG_SET.update(env_keys)
 
 
 def test_yaml_config():
diff --git a/dev/pytest/pytest_full.sh b/dev/pytest/pytest_full.sh
index 2989a74ad8..ca09aeb729 100755
--- a/dev/pytest/pytest_full.sh
+++ b/dev/pytest/pytest_full.sh
@@ -15,7 +15,7 @@ mkdir -p "${OPENDAL_FS_ROOT}"
 
 # Prepare env files like CI
 cp -n docker/.env.example docker/.env || true
-cp -n docker/middleware.env.example docker/middleware.env || true
+cp -n docker/envs/middleware.env.example docker/middleware.env || true
 cp -n api/tests/integration_tests/.env.example api/tests/integration_tests/.env || true
 
 # Expose service ports (same as CI) without leaving the repo dirty
diff --git a/dev/reformat b/dev/reformat
index 6966267193..f179b43ca0 100755
--- a/dev/reformat
+++ b/dev/reformat
@@ -17,5 +17,5 @@ uv run --directory api --dev ruff format ./
 # run dotenv-linter linter
 uv run --project api --dev dotenv-linter ./api/.env.example ./web/.env.example
 
-# run basedpyright check
-dev/basedpyright-check
+# run pyrefly check
+dev/pyrefly-check-local
diff --git a/dev/setup b/dev/setup
index 4236ff7fa7..1d2501a48b 100755
--- a/dev/setup
+++ b/dev/setup
@@ -8,7 +8,7 @@ API_ENV_EXAMPLE="$ROOT/api/.env.example"
 API_ENV="$ROOT/api/.env"
 WEB_ENV_EXAMPLE="$ROOT/web/.env.example"
 WEB_ENV="$ROOT/web/.env.local"
-MIDDLEWARE_ENV_EXAMPLE="$ROOT/docker/middleware.env.example"
+MIDDLEWARE_ENV_EXAMPLE="$ROOT/docker/envs/middleware.env.example"
 MIDDLEWARE_ENV="$ROOT/docker/middleware.env"
 
 # 1) Copy api/.env.example -> api/.env
@@ -17,7 +17,7 @@ cp "$API_ENV_EXAMPLE" "$API_ENV"
 # 2) Copy web/.env.example -> web/.env.local
 cp "$WEB_ENV_EXAMPLE" "$WEB_ENV"
 
-# 3) Copy docker/middleware.env.example -> docker/middleware.env
+# 3) Copy docker/envs/middleware.env.example -> docker/middleware.env
 cp "$MIDDLEWARE_ENV_EXAMPLE" "$MIDDLEWARE_ENV"
 
 # 4) Install deps
diff --git a/dify-agent/.example.env b/dify-agent/.example.env
new file mode 100644
index 0000000000..679a467488
--- /dev/null
+++ b/dify-agent/.example.env
@@ -0,0 +1,37 @@
+# Dify Agent run server settings template.
+# Mirrors dify_agent.server.settings.ServerSettings with the DIFY_AGENT_ prefix.
+# This template intentionally covers the current run-server settings only.
+
+# Redis
+# Redis connection URL for run records and per-run event streams.
+DIFY_AGENT_REDIS_URL=redis://localhost:6379/0
+# Prefix for Redis run-record and event-stream keys.
+DIFY_AGENT_REDIS_PREFIX=dify-agent
+
+# Shutdown and retention
+# Seconds to wait for active local runs during graceful shutdown before cancellation.
+DIFY_AGENT_SHUTDOWN_GRACE_SECONDS=30
+# Seconds to retain Redis run records and per-run event streams (default: 3 days).
+DIFY_AGENT_RUN_RETENTION_SECONDS=259200
+
+# Plugin daemon
+# Base URL for the Dify plugin daemon used by local runs.
+DIFY_AGENT_PLUGIN_DAEMON_URL=http://localhost:5002
+# API key sent to the Dify plugin daemon.
+DIFY_AGENT_PLUGIN_DAEMON_API_KEY=
+
+# Shared plugin-daemon HTTP client timeouts and limits.
+# Plugin-daemon HTTP connect timeout in seconds.
+DIFY_AGENT_PLUGIN_DAEMON_CONNECT_TIMEOUT=10
+# Plugin-daemon HTTP read timeout in seconds.
+DIFY_AGENT_PLUGIN_DAEMON_READ_TIMEOUT=600
+# Plugin-daemon HTTP write timeout in seconds.
+DIFY_AGENT_PLUGIN_DAEMON_WRITE_TIMEOUT=30
+# Plugin-daemon HTTP connection-pool wait timeout in seconds.
+DIFY_AGENT_PLUGIN_DAEMON_POOL_TIMEOUT=10
+# Maximum total plugin-daemon HTTP connections.
+DIFY_AGENT_PLUGIN_DAEMON_MAX_CONNECTIONS=100
+# Maximum idle keep-alive plugin-daemon HTTP connections.
+DIFY_AGENT_PLUGIN_DAEMON_MAX_KEEPALIVE_CONNECTIONS=20
+# Keep-alive expiry in seconds for idle plugin-daemon HTTP connections.
+DIFY_AGENT_PLUGIN_DAEMON_KEEPALIVE_EXPIRY=30
diff --git a/dify-agent/.gitignore b/dify-agent/.gitignore
new file mode 100644
index 0000000000..f644f2e545
--- /dev/null
+++ b/dify-agent/.gitignore
@@ -0,0 +1 @@
+dify-aio
diff --git a/dify-agent/AGENTS.md b/dify-agent/AGENTS.md
new file mode 100644
index 0000000000..43c68448f2
--- /dev/null
+++ b/dify-agent/AGENTS.md
@@ -0,0 +1,184 @@
+# Agent Guide
+
+## Notes for Agent (must-check)
+
+Before changing any source code under this folder, you MUST read the surrounding docstrings and comments. These notes contain required context (invariants, edge cases, trade-offs) and are treated as part of the spec.
+
+Look for:
+
+- The module (file) docstring at the top of a source code file
+- Docstrings on classes and functions/methods
+- Paragraph/block comments for non-obvious logic
+
+### What to write where
+
+- Keep notes scoped: module notes cover module-wide context, class notes cover class-wide context, function/method notes cover behavioural contracts, and paragraph/block comments cover local “why”. Avoid duplicating the same content across scopes unless repetition prevents misuse.
+- **Module (file) docstring**: purpose, boundaries, key invariants, and “gotchas” that a new reader must know before editing.
+  - Include cross-links to the key collaborators (modules/services) when discovery is otherwise hard.
+  - Prefer stable facts (invariants, contracts) over ephemeral “today we…” notes.
+- **Class docstring**: responsibility, lifecycle, invariants, and how it should be used (or not used).
+  - If the class is intentionally stateful, note what state exists and what methods mutate it.
+  - If concurrency/async assumptions matter, state them explicitly.
+- **Function/method docstring**: behavioural contract.
+  - Document arguments, return shape, side effects (DB writes, external I/O, task dispatch), and raised domain exceptions.
+  - Add examples only when they prevent misuse.
+- **Paragraph/block comments**: explain *why* (trade-offs, historical constraints, surprising edge cases), not what the code already states.
+  - Keep comments adjacent to the logic they justify; delete or rewrite comments that no longer match reality.
+
+### Rules (must follow)
+
+In this section, “notes” means module/class/function docstrings plus any relevant paragraph/block comments.
+
+- **Before working**
+  - Read the notes in the area you’ll touch; treat them as part of the spec.
+  - If a docstring or comment conflicts with the current code, treat the **code as the single source of truth** and update the docstring or comment to match reality.
+  - If important intent/invariants/edge cases are missing, add them in the closest docstring or comment (module for overall scope, function for behaviour).
+- **During working**
+  - Keep the notes in sync as you discover constraints, make decisions, or change approach.
+  - If you move/rename responsibilities across modules/classes, update the affected docstrings and comments so readers can still find the “why” and the invariants.
+  - Record non-obvious edge cases, trade-offs, and the test/verification plan in the nearest docstring or comment that will stay correct.
+  - Keep the notes **coherent**: integrate new findings into the relevant docstrings and comments; avoid append-only “recent fix” / changelog-style additions.
+- **When finishing**
+  - Update the notes to reflect what changed, why, and any new edge cases/tests.
+  - Remove or rewrite any comments that could be mistaken as current guidance but no longer apply.
+  - Keep docstrings and comments concise and accurate; they are meant to prevent repeated rediscovery.
+
+## Coding Style
+
+This is the default standard for backend code in this repo. Follow it for new code and use it as the checklist when reviewing changes.
+
+### Linting & Formatting
+
+- Use Ruff for formatting and linting (follow `.ruff.toml`).
+- Keep each line under 120 characters (including spaces).
+
+### Naming Conventions
+
+- Use `snake_case` for variables and functions.
+- Use `PascalCase` for classes.
+- Use `UPPER_CASE` for constants.
+
+### Typing & Class Layout
+
+- Code should usually include type annotations that match the repo’s current Python version (avoid untyped public APIs and “mystery” values).
+- Prefer modern typing forms (e.g. `list[str]`, `dict[str, int]`) and avoid `Any` unless there’s a strong reason.
+- For dictionary-like data with known keys and value types, prefer `TypedDict` over `dict[...]` or `Mapping[...]`.
+- For optional keys in typed payloads, use `NotRequired[...]` (or `total=False` when most fields are optional).
+- Keep `dict[...]` / `Mapping[...]` for truly dynamic key spaces where the key set is unknown.
+
+```python
+from datetime import datetime
+from typing import NotRequired, TypedDict
+
+
+class UserProfile(TypedDict):
+    user_id: str
+    email: str
+    created_at: datetime
+    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:
+
+```python
+from datetime import datetime
+
+
+class Example:
+    user_id: str
+    created_at: datetime
+
+    def __init__(self, user_id: str, created_at: datetime) -> None:
+        self.user_id = user_id
+        self.created_at = created_at
+```
+
+- For dataclasses, prefer `field(default_factory=...)` over `field(init=False)` when a default can be provided declaratively.
+- Prefer dataclasses with `slots=True` when defining lightweight data containers:
+
+```python
+from dataclasses import dataclass
+from datetime import datetime
+
+
+@dataclass(slots=True)
+class Example:
+    user_id: str
+    created_at: datetime
+```
+
+### General Rules
+
+- Use Pydantic v2 conventions.
+- Use `uv` for Python package management in this repo (usually with `--project dify-agent`).
+- Use `make typecheck` to run `basedpyright` against `dify-agent/src` and `dify-agent/tests`.
+- Keep type checking passing after every edit you make.
+- Use `pytest` for all tests in this package.
+- When integrating with, implementing, or mocking a dependency, inspect the dependency's source code to confirm its API shape and runtime behavior instead of guessing from names alone.
+- Prefer simple functions over small “utility classes” for lightweight helpers.
+- Avoid implementing dunder methods unless it’s clearly needed and matches existing patterns.
+- Keep code readable and explicit—avoid clever hacks.
+
+### Testing
+
+- Work in TDD style: write or update a failing test first when changing behavior, then make the implementation pass, then refactor while keeping tests and typecheck green.
+- Use `make test` to run the agent pytest suite.
+- Keep local tests under `dify-agent/tests/local/`.
+- Mirror the `dify-agent/src/` package structure inside `dify-agent/tests/local/` so test locations stay predictable.
+
+#### Local Tests
+
+- Write local tests for stable, externally observable behavior that can run quickly without real external services.
+- In this repo, code, comments, docs, and tests are expected to change together. Because of that, a local test is only useful if it would still be correct after an internal refactor that does not change the intended contract.
+- Local tests should verify:
+  - what callers and downstream code can observe and rely on
+  - how the unit is expected to use its dependencies at the boundary
+  - how the unit handles dependency success, failure, empty responses, malformed responses, and documented error cases
+  - documented invariants, error mapping, and output/input shape guarantees
+- When asserting dependency interactions, assert only the parts of the request or response that are part of the real boundary contract. Do not over-specify incidental details that callers or dependencies do not rely on.
+- It is acceptable to mock dependencies in local tests, but only when the mock represents a real contract, schema, documented behavior, or known regression.
+- Tests may use line-scoped type-ignore comments when intentionally exercising runtime validation paths that static typing would normally reject. Keep the ignore on the exact invalid call.
+- Do not use local tests to prove real integration, network wiring, serialization, framework configuration, or third-party runtime behavior; cover those in higher-level tests.
+- Meaningless local tests include:
+  - tests that only mirror the current implementation or must be updated whenever internal code changes even though the contract did not change
+  - tests of private helpers, local variables, temporary state, internal branching, or exact internal call order unless those details are part of the published contract
+  - tests with mocked dependency behavior that is invented only to make the current implementation pass
+  - tests that add no value beyond static type checking or linting
+
+### Logging & Errors
+
+- Never use `print`; use a module-level logger:
+  - `logger = logging.getLogger(__name__)`
+- Include tenant/app/workflow identifiers in log context when relevant.
+- Raise domain-specific exceptions and translate them into HTTP responses in controllers.
+- Log retryable events at `warning`, terminal failures at `error`.
+
+### Pydantic Usage
+
+- Define DTOs with Pydantic v2 models and forbid extras by default.
+- Use `@field_validator` / `@model_validator` for domain rules.
+
+Example:
+
+```python
+from pydantic import BaseModel, ConfigDict, HttpUrl, field_validator
+
+
+class TriggerConfig(BaseModel):
+    endpoint: HttpUrl
+    secret: str
+
+    model_config = ConfigDict(extra="forbid")
+
+    @field_validator("secret")
+    def ensure_secret_prefix(cls, value: str) -> str:
+        if not value.startswith("dify_"):
+            raise ValueError("secret must start with dify_")
+        return value
+```
+
+### Generics & Protocols
+
+- Use `typing.Protocol` to define behavioural contracts (e.g., cache interfaces).
+- Apply generics (`TypeVar`, `Generic`) for reusable utilities like caches or providers.
+- Validate dynamic inputs at runtime when generics cannot enforce safety alone.
diff --git a/dify-agent/Makefile b/dify-agent/Makefile
new file mode 100644
index 0000000000..a9b258fa5f
--- /dev/null
+++ b/dify-agent/Makefile
@@ -0,0 +1,45 @@
+.DEFAULT_GOAL := help
+
+PROJECT_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
+
+.PHONY: help serve dev check fix typecheck test update-examples docs docs-serve
+
+help:
+	@echo "Dify agent targets:"
+	@echo "  make serve          - Run the Dify Agent server"
+	@echo "  make dev            - Run the Dify Agent server with reload"
+	@echo "  make check           - Run Ruff for dify-agent"
+	@echo "  make fix             - Format and fix Ruff issues"
+	@echo "  make typecheck       - Run basedpyright for src, examples, and tests"
+	@echo "  make test            - Run local tests and docs/example tests"
+	@echo "  make update-examples - Rewrite docs example outputs when needed"
+	@echo "  make docs            - Build MkDocs documentation"
+	@echo "  make docs-serve      - Serve MkDocs documentation locally"
+
+serve:
+	@uv --directory "$(PROJECT_DIR)" run --project . --extra server uvicorn dify_agent.server.app:app --host 127.0.0.1 --port 8000
+
+dev:
+	@uv --directory "$(PROJECT_DIR)" run --project . --extra server uvicorn dify_agent.server.app:app --host 127.0.0.1 --port 8000 --reload
+
+check:
+	@uv --directory "$(PROJECT_DIR)" run --project . python -m ruff check .
+
+fix:
+	@uv --directory "$(PROJECT_DIR)" run --project . python -m ruff format .
+	@uv --directory "$(PROJECT_DIR)" run --project . python -m ruff check --fix .
+
+typecheck:
+	@uv --directory "$(PROJECT_DIR)" run --project . basedpyright --level error src examples tests
+
+test:
+	@uv --directory "$(PROJECT_DIR)" run --project . python -m pytest tests
+
+update-examples:
+	@uv --directory "$(PROJECT_DIR)" run --project . python -m pytest --update-examples tests/docs/test_examples.py
+
+docs:
+	@uv --directory "$(PROJECT_DIR)" run --project . --group docs python -m mkdocs build --no-strict
+
+docs-serve:
+	@uv --directory "$(PROJECT_DIR)" run --project . --group docs python -m mkdocs serve --no-strict
diff --git a/dify-agent/README.md b/dify-agent/README.md
new file mode 100644
index 0000000000..f370721775
--- /dev/null
+++ b/dify-agent/README.md
@@ -0,0 +1,7 @@
+# Dify Agent
+
+Agenton documentation lives in [`docs/agenton/guide/index.md`](docs/agenton/guide/index.md) and
+[`docs/agenton/api/index.md`](docs/agenton/api/index.md).
+
+Dify Agent runtime documentation lives in [`docs/dify-agent/index.md`](docs/dify-agent/index.md).
+Build all docs with `make docs` from this directory.
diff --git a/dify-agent/docs/.hooks/main.py b/dify-agent/docs/.hooks/main.py
new file mode 100644
index 0000000000..1000a80ab3
--- /dev/null
+++ b/dify-agent/docs/.hooks/main.py
@@ -0,0 +1,16 @@
+from __future__ import annotations
+
+from pathlib import Path
+
+from mkdocs.config.defaults import MkDocsConfig
+from mkdocs.structure.files import Files
+from mkdocs.structure.pages import Page
+from snippets import inject_snippets
+
+DOCS_ROOT = Path(__file__).resolve().parent.parent
+
+
+def on_page_markdown(markdown: str, page: Page, config: MkDocsConfig, files: Files) -> str:
+    """Inject repository snippets before MkDocs renders Markdown."""
+    relative_path = DOCS_ROOT / page.file.src_uri
+    return inject_snippets(markdown, relative_path.parent)
diff --git a/dify-agent/docs/.hooks/snippets.py b/dify-agent/docs/.hooks/snippets.py
new file mode 100644
index 0000000000..6c23a2438b
--- /dev/null
+++ b/dify-agent/docs/.hooks/snippets.py
@@ -0,0 +1,228 @@
+from __future__ import annotations
+
+import re
+from dataclasses import dataclass
+from pathlib import Path
+
+REPO_ROOT = Path(__file__).resolve().parents[2]
+SNIPPET_DIRECTIVE_PATTERN = re.compile(r"^```snippet\s+\{[^}]+\}\s*(?:```|\n```)$", re.MULTILINE)
+
+
+@dataclass(frozen=True, slots=True)
+class SnippetDirective:
+    path: str
+    title: str | None = None
+    fragment: str | None = None
+    highlight: str | None = None
+    extra_attrs: dict[str, str] | None = None
+
+
+@dataclass(frozen=True, slots=True)
+class LineRange:
+    start_line: int
+    end_line: int
+
+    def intersection(self, ranges: list[LineRange]) -> list[LineRange]:
+        intersections: list[LineRange] = []
+        for line_range in ranges:
+            start_line = max(self.start_line, line_range.start_line)
+            end_line = min(self.end_line, line_range.end_line)
+            if start_line < end_line:
+                intersections.append(LineRange(start_line, end_line))
+        return intersections
+
+    @staticmethod
+    def merge(ranges: list[LineRange]) -> list[LineRange]:
+        if not ranges:
+            return []
+
+        merged: list[LineRange] = []
+        for line_range in sorted(ranges, key=lambda item: item.start_line):
+            if not merged or merged[-1].end_line < line_range.start_line:
+                merged.append(line_range)
+            else:
+                previous = merged[-1]
+                merged[-1] = LineRange(previous.start_line, max(previous.end_line, line_range.end_line))
+        return merged
+
+
+@dataclass(frozen=True, slots=True)
+class RenderedSnippet:
+    content: str
+    highlights: list[LineRange]
+    original_range: LineRange
+
+
+@dataclass(frozen=True, slots=True)
+class ParsedFile:
+    lines: list[str]
+    sections: dict[str, list[LineRange]]
+    lines_mapping: dict[int, int]
+
+    def render(self, fragment_sections: list[str], highlight_sections: list[str]) -> RenderedSnippet:
+        fragment_ranges: list[LineRange] = []
+        if fragment_sections:
+            for section_name in fragment_sections:
+                fragment_ranges.extend(_section_ranges(self.sections, section_name))
+            fragment_ranges = LineRange.merge(fragment_ranges)
+        else:
+            fragment_ranges = [LineRange(0, len(self.lines))]
+
+        highlight_ranges: list[LineRange] = []
+        for section_name in highlight_sections:
+            highlight_ranges.extend(_section_ranges(self.sections, section_name))
+        highlight_ranges = LineRange.merge(highlight_ranges)
+
+        rendered_highlights: list[LineRange] = []
+        rendered_lines: list[str] = []
+        last_end_line = 0
+        current_line = 0
+        for fragment_range in fragment_ranges:
+            if fragment_range.start_line > last_end_line:
+                rendered_lines.append("..." if current_line == 0 else "\n...")
+                current_line += 1
+
+            for highlight_range in fragment_range.intersection(highlight_ranges):
+                rendered_highlights.append(
+                    LineRange(
+                        highlight_range.start_line - fragment_range.start_line + current_line,
+                        highlight_range.end_line - fragment_range.start_line + current_line,
+                    )
+                )
+
+            for line_number in range(fragment_range.start_line, fragment_range.end_line):
+                rendered_lines.append(self.lines[line_number])
+                current_line += 1
+            last_end_line = fragment_range.end_line
+
+        if last_end_line < len(self.lines):
+            rendered_lines.append("\n...")
+
+        return RenderedSnippet(
+            content="\n".join(rendered_lines),
+            highlights=LineRange.merge(rendered_highlights),
+            original_range=LineRange(
+                self.lines_mapping[fragment_ranges[0].start_line],
+                self.lines_mapping[fragment_ranges[-1].end_line - 1] + 1,
+            ),
+        )
+
+
+def parse_snippet_directive(line: str) -> SnippetDirective | None:
+    match = re.fullmatch(r"```snippet\s+\{([^}]+)\}\s*(?:```|\n```)", line.strip())
+    if not match:
+        return None
+
+    attrs = {key: value for key, value in re.findall(r'(\w+)="([^"]*)"', match.group(1))}
+    if "path" not in attrs:
+        raise ValueError('Missing required key "path" in snippet directive')
+
+    extra_attrs = {key: value for key, value in attrs.items() if key not in {"path", "title", "fragment", "highlight"}}
+    return SnippetDirective(
+        path=attrs["path"],
+        title=attrs.get("title"),
+        fragment=attrs.get("fragment"),
+        highlight=attrs.get("highlight"),
+        extra_attrs=extra_attrs or None,
+    )
+
+
+def parse_file_sections(file_path: Path) -> ParsedFile:
+    input_lines = file_path.read_text(encoding="utf-8").splitlines()
+    output_lines: list[str] = []
+    lines_mapping: dict[int, int] = {}
+    sections: dict[str, list[LineRange]] = {}
+    section_starts: dict[str, int] = {}
+
+    output_line_number = 0
+    for source_line_number, line in enumerate(input_lines):
+        section_match = re.search(r"\s*(?:###|///)\s*\[([^]]+)]\s*$", line)
+        if section_match is None:
+            output_lines.append(line)
+            lines_mapping[output_line_number] = source_line_number
+            output_line_number += 1
+            continue
+
+        line_before_marker = line[: section_match.start()]
+        for section_name in section_match.group(1).split(","):
+            section_name = section_name.strip()
+            if section_name.startswith("/"):
+                start_line = section_starts.pop(section_name[1:], None)
+                if start_line is None:
+                    raise ValueError(f"Cannot end unstarted section {section_name!r} at {file_path}")
+                end_line = output_line_number + 1 if line_before_marker else output_line_number
+                sections.setdefault(section_name[1:], []).append(LineRange(start_line, end_line))
+            else:
+                if section_name in section_starts:
+                    raise ValueError(f"Cannot nest section {section_name!r} at {file_path}")
+                section_starts[section_name] = output_line_number
+
+        if line_before_marker:
+            output_lines.append(line_before_marker)
+            lines_mapping[output_line_number] = source_line_number
+            output_line_number += 1
+
+    if section_starts:
+        raise ValueError(f"Some sections were not finished in {file_path}: {list(section_starts)}")
+
+    return ParsedFile(lines=output_lines, sections=sections, lines_mapping=lines_mapping)
+
+
+def format_highlight_lines(highlight_ranges: list[LineRange]) -> str:
+    parts: list[str] = []
+    for highlight_range in highlight_ranges:
+        start_line = highlight_range.start_line + 1
+        end_line = highlight_range.end_line
+        parts.append(str(start_line) if start_line == end_line else f"{start_line}-{end_line}")
+    return " ".join(parts)
+
+
+def inject_snippets(markdown: str, relative_path_root: Path) -> str:
+    def replace_snippet(match: re.Match[str]) -> str:
+        directive = parse_snippet_directive(match.group(0))
+        if directive is None:
+            return match.group(0)
+
+        file_path = _resolve_snippet_path(directive.path, relative_path_root)
+        parsed_file = parse_file_sections(file_path)
+        rendered = parsed_file.render(
+            directive.fragment.split() if directive.fragment else [],
+            directive.highlight.split() if directive.highlight else [],
+        )
+
+        attrs: list[str] = []
+        title = directive.title or _default_title(file_path, rendered.original_range, bool(directive.fragment))
+        if title:
+            attrs.append(f'title="{title}"')
+        if rendered.highlights:
+            attrs.append(f'hl_lines="{format_highlight_lines(rendered.highlights)}"')
+        if directive.extra_attrs:
+            attrs.extend(f'{key}="{value}"' for key, value in directive.extra_attrs.items())
+
+        attrs_text = f" {{{' '.join(attrs)}}}" if attrs else ""
+        file_extension = file_path.suffix.lstrip(".") or "text"
+        return f"```{file_extension}{attrs_text}\n{rendered.content}\n```"
+
+    return SNIPPET_DIRECTIVE_PATTERN.sub(replace_snippet, markdown)
+
+
+def _section_ranges(sections: dict[str, list[LineRange]], section_name: str) -> list[LineRange]:
+    if section_name not in sections:
+        raise ValueError(f"Unrecognized snippet section {section_name!r}; expected one of {list(sections)}")
+    return sections[section_name]
+
+
+def _resolve_snippet_path(path: str, relative_path_root: Path) -> Path:
+    file_path = (REPO_ROOT / path[1:]).resolve() if path.startswith("/") else (relative_path_root / path).resolve()
+    if not file_path.exists():
+        raise FileNotFoundError(f"Snippet file {file_path} not found")
+    if not file_path.is_relative_to(REPO_ROOT):
+        raise ValueError(f"Snippet file {file_path} must be inside {REPO_ROOT}")
+    return file_path
+
+
+def _default_title(file_path: Path, original_range: LineRange, has_fragment: bool) -> str:
+    relative_path = file_path.relative_to(REPO_ROOT)
+    if not has_fragment:
+        return str(relative_path)
+    return f"{relative_path} (L{original_range.start_line + 1}-L{original_range.end_line})"
diff --git a/dify-agent/docs/agenton/examples/index.md b/dify-agent/docs/agenton/examples/index.md
new file mode 100644
index 0000000000..61487f5a11
--- /dev/null
+++ b/dify-agent/docs/agenton/examples/index.md
@@ -0,0 +1,19 @@
+# Agenton examples
+
+The Agenton examples live under `examples/agenton/agenton_examples` and are kept
+importable as a package so documentation can reference real source files.
+
+## Basics
+
+```snippet {path="/examples/agenton/agenton_examples/basics.py"}
+```
+
+## Pydantic AI bridge
+
+```snippet {path="/examples/agenton/agenton_examples/pydantic_ai_bridge.py"}
+```
+
+## Session snapshots
+
+```snippet {path="/examples/agenton/agenton_examples/session_snapshot.py"}
+```
diff --git a/dify-agent/docs/agenton/guide/index.md b/dify-agent/docs/agenton/guide/index.md
new file mode 100644
index 0000000000..e9d322d7c8
--- /dev/null
+++ b/dify-agent/docs/agenton/guide/index.md
@@ -0,0 +1,187 @@
+# Agenton user guide
+
+Agenton composes reusable graph plans from `LayerNode`s and `LayerProvider`s.
+The core is state-only: a `Compositor` stores no live layer instances, clients,
+cleanup stacks, or run state. Each `Compositor.enter(...)` call creates a fresh
+`CompositorRun` with new layer instances, direct dependency bindings, lifecycle
+state, and an optional hydrated session snapshot.
+
+## Config and runtime state
+
+- **Graph config** is serializable topology: node `name`, provider `type`,
+  dependency mappings, and metadata. `LayerNodeConfig` deliberately contains no
+  layer config.
+- **Per-run layer config** is passed to `Compositor.enter(configs=...)` as a
+  mapping keyed by node name. Providers validate each value with the layer's
+  `config_type` before any factory runs.
+- **Runtime state** is serializable per-layer invocation state on
+  `layer.runtime_state`. Session snapshots persist only lifecycle state and this
+  model's JSON-safe data.
+- **Live Python resources** such as clients, files, sockets, or process handles
+  stay outside Agenton core. Own them in application code or integration-specific
+  context managers that wrap compositor entry.
+
+## Define a config-backed layer
+
+Use a `LayerConfig` model for per-run config and inherit from a typed layer family
+so `Layer.__init_subclass__` can infer schemas:
+
+```python {test="skip" lint="skip"}
+from dataclasses import dataclass
+
+from pydantic import ConfigDict
+from typing_extensions import Self, override
+
+from agenton.layers import LayerConfig, NoLayerDeps, PlainLayer
+
+
+class GreetingConfig(LayerConfig):
+    prefix: str
+
+    model_config = ConfigDict(extra="forbid")
+
+
+@dataclass(slots=True)
+class GreetingLayer(PlainLayer[NoLayerDeps, GreetingConfig]):
+    type_id = "example.greeting"
+
+    prefix: str
+
+    @classmethod
+    @override
+    def from_config(cls, config: GreetingConfig) -> Self:
+        return cls(prefix=config.prefix)
+
+    @property
+    @override
+    def prefix_prompts(self) -> list[str]:
+        return [self.prefix]
+```
+
+Omitted schema slots default to `EmptyLayerConfig` and `EmptyRuntimeState`.
+Lifecycle hooks are no-argument methods on the layer instance; use `self.deps`
+for dependencies and `self.runtime_state` for serializable mutable state.
+
+## Live resources
+
+Agenton does not own resource cleanup. Keep live resources in the surrounding
+application and pass them to capability methods explicitly:
+
+```python {test="skip" lint="skip"}
+@dataclass(slots=True)
+class ClientUserLayer(PlainLayer[NoLayerDeps]):
+    def make_client_user(self, *, http_client: httpx.AsyncClient) -> ClientUser:
+        return ClientUser(http_client)
+
+
+compositor = Compositor([LayerNode("client_user", ClientUserLayer)])
+async with httpx.AsyncClient() as http_client:
+    async with compositor.enter() as run:
+        layer = run.get_layer("client_user", ClientUserLayer)
+        user = layer.make_client_user(http_client=http_client)
+```
+
+This keeps deterministic cleanup at the integration boundary and leaves Agenton
+snapshots limited to serializable runtime state.
+
+## Build a compositor
+
+Use providers for config-backed layers and pass per-run config at entry time:
+
+```python {test="skip" lint="skip"}
+from agenton.compositor import Compositor, CompositorConfig, LayerNodeConfig, LayerProvider
+from agenton_collections.layers.plain import PromptLayer, PromptLayerConfig
+
+
+providers = (
+    LayerProvider.from_layer_type(PromptLayer),
+    LayerProvider.from_layer_type(GreetingLayer),
+)
+compositor = Compositor.from_config(
+    CompositorConfig(
+        layers=[
+            LayerNodeConfig(name="prompt", type="plain.prompt"),
+            LayerNodeConfig(name="greeting", type="example.greeting"),
+        ]
+    ),
+    providers=providers,
+)
+
+async with compositor.enter(
+    configs={
+        "prompt": PromptLayerConfig(user="Answer with examples."),
+        "greeting": GreetingConfig(prefix="Hi"),
+    }
+) as run:
+    prompts = run.prompts
+```
+
+Use `LayerProvider.from_factory(...)` when construction needs Python objects or
+callables. Provider factories receive only validated config and must return a
+fresh layer instance for every invocation. For node-specific construction with
+`Compositor.from_config`, pass a `node_providers={"node_name": provider}` mapping
+to override the provider selected by type id for that node.
+
+## Dependencies
+
+Layer dependencies bind direct layer instances onto `self.deps` for one run.
+Dependency mappings use dependency field names as keys and compositor node names
+as values:
+
+```python {test="skip" lint="skip"}
+class ModelDeps(LayerDeps):
+    plugin: PluginLayer
+
+
+@dataclass(slots=True)
+class ModelLayer(PlainLayer[ModelDeps]):
+    def make_model(self) -> Model:
+        return self.deps.plugin.make_provider()
+```
+
+Optional dependencies are assigned `None` when absent. Missing required
+dependencies, unknown dependency keys, and dependency targets with the wrong layer
+type fail before lifecycle hooks run.
+
+## System prompts, user prompts, and tools
+
+Layers expose four authoring surfaces:
+
+- `prefix_prompts`: system prompt fragments collected in layer order.
+- `suffix_prompts`: system prompt fragments collected in reverse layer order.
+- `user_prompts`: user-message fragments collected in layer order.
+- `tools`: tool entries collected in layer order.
+
+`PromptLayer` accepts `prefix`, `user`, and `suffix` config fields. Aggregation is
+available on the active `CompositorRun` as `run.prompts`, `run.user_prompts`, and
+`run.tools`. For pydantic-ai, import
+`agenton_collections.transformers.pydantic_ai.PYDANTIC_AI_TRANSFORMERS` and pass
+it to `Compositor(...)` or `Compositor.from_config(...)` so tagged layer items are
+converted to Pydantic AI prompt, user prompt, and tool values.
+
+## Session snapshot and restore
+
+Core Agenton run slots default to delete-on-exit. Call `run.suspend_on_exit()` or
+`run.suspend_layer_on_exit(name)` inside the active context when the next snapshot
+should be resumable:
+
+```python {test="skip" lint="skip"}
+async with compositor.enter(configs=configs) as run:
+    run.suspend_on_exit()
+
+snapshot = run.session_snapshot
+async with compositor.enter(configs=configs, session_snapshot=snapshot) as restored_run:
+    restored_layer = restored_run.get_layer("stateful", StatefulLayer)
+```
+
+`run.session_snapshot` is populated after context exit. Snapshots include ordered
+layer names, non-active lifecycle states, and JSON-safe runtime state only. Active
+state is rejected at the DTO boundary, and closed layers cannot be entered again.
+To resume, pass the snapshot to a later `Compositor.enter(...)` call with the same
+layer names and order.
+
+See also:
+
+- `examples/agenton/agenton_examples/basics.py`
+- `examples/agenton/agenton_examples/pydantic_ai_bridge.py`
+- `examples/agenton/agenton_examples/session_snapshot.py`
diff --git a/dify-agent/docs/agenton/index.md b/dify-agent/docs/agenton/index.md
new file mode 100644
index 0000000000..f96db54256
--- /dev/null
+++ b/dify-agent/docs/agenton/index.md
@@ -0,0 +1,6 @@
+# Agenton documentation
+
+- [User guide](guide/index.md) explains how to compose layers, register config-backed
+  plugins, use system/user prompts, and snapshot sessions.
+- [API reference](api/index.md) lists the public Agenton classes, methods, and extension
+  points.
diff --git a/dify-agent/docs/dify-agent/examples/index.md b/dify-agent/docs/dify-agent/examples/index.md
new file mode 100644
index 0000000000..8624dc790e
--- /dev/null
+++ b/dify-agent/docs/dify-agent/examples/index.md
@@ -0,0 +1,25 @@
+# Dify Agent examples
+
+These examples live under `examples/dify_agent/dify_agent_examples`. They are
+separated from Agenton examples because they depend on Dify Agent runtime services
+such as the FastAPI server, Redis, or the plugin daemon.
+
+## Run a Dify plugin-daemon backed model
+
+```snippet {path="/examples/dify_agent/dify_agent_examples/run_pydantic_ai_agent.py"}
+```
+
+## Poll run events
+
+```snippet {path="/examples/dify_agent/dify_agent_examples/run_server_consumer.py"}
+```
+
+## Use the synchronous client
+
+```snippet {path="/examples/dify_agent/dify_agent_examples/run_server_sync_client.py"}
+```
+
+## Stream run events with SSE
+
+```snippet {path="/examples/dify_agent/dify_agent_examples/run_server_sse_consumer.py"}
+```
diff --git a/dify-agent/docs/dify-agent/get-started/index.md b/dify-agent/docs/dify-agent/get-started/index.md
new file mode 100644
index 0000000000..466c3fe8c2
--- /dev/null
+++ b/dify-agent/docs/dify-agent/get-started/index.md
@@ -0,0 +1,268 @@
+# Get started with Dify Agent
+
+This guide walks through the smallest end-to-end path for the current Dify Agent
+runtime: install dependencies, configure the server, start it, then use the Python
+client to create one plugin-daemon-backed run.
+
+## Prerequisites
+
+Install or prepare:
+
+- Python 3.12 or newer
+- `uv`
+- Redis
+- a reachable Dify plugin daemon
+- a plugin/provider already available through that plugin daemon, such as
+  `langgenius/openai`
+
+## Install dependencies
+
+From the repository root, enter the `dify-agent` package and install all extras
+and dependency groups:
+
+```bash
+cd dify-agent
+uv sync --all-extras --all-groups
+```
+
+Only the `server` extra is required to run the API server, but installing all
+extras and groups gives you the local test, docs, and server dependencies in one
+environment.
+
+## Start Redis
+
+Skip this step if you already have a reachable Redis instance.
+
+```bash
+docker run -d \
+  --name dify-agent-redis \
+  -p 6379:6379 \
+  redis:7-alpine
+```
+
+## Configure the server
+
+Create or update `.env` in the `dify-agent` directory:
+
+```bash
+cat > .env <<'EOF'
+DIFY_AGENT_REDIS_URL=redis://localhost:6379/0
+DIFY_AGENT_REDIS_PREFIX=dify-agent
+
+DIFY_AGENT_PLUGIN_DAEMON_URL=http://localhost:5002
+DIFY_AGENT_PLUGIN_DAEMON_API_KEY=replace-with-plugin-daemon-server-key
+EOF
+```
+
+The minimum settings are:
+
+- `DIFY_AGENT_REDIS_URL`: Redis connection URL used for run records and event
+  streams.
+- `DIFY_AGENT_REDIS_PREFIX`: Redis key prefix for this server.
+- `DIFY_AGENT_PLUGIN_DAEMON_URL`: base URL for the Dify plugin daemon.
+- `DIFY_AGENT_PLUGIN_DAEMON_API_KEY`: API key sent by the server to the plugin
+  daemon. In a Dify Docker setup this is usually the value previously configured
+  as `PLUGIN_DAEMON_KEY`.
+
+See `.example.env` for the full server settings template.
+
+## Start the Dify Agent server
+
+For a normal local server process:
+
+```bash
+make serve
+```
+
+For development with uvicorn reload:
+
+```bash
+make dev
+```
+
+Both commands serve the API at:
+
+```text
+http://127.0.0.1:8000
+```
+
+The equivalent development command is:
+
+```bash
+uv run --extra server uvicorn dify_agent.server.app:app \
+  --host 127.0.0.1 \
+  --port 8000 \
+  --reload
+```
+
+`ServerSettings` reads `.env` from the current `dify-agent` directory, or from
+`dify-agent/.env` when the command is run from the repository root.
+
+## Create a one-file uv script client
+
+In another shell, keep working from the `dify-agent` directory and create this
+script. The script depends on the local `dify-agent` package only; it does not
+install the server extra because it talks to the already running server through
+the public Python client.
+
+```bash
+DIFY_AGENT_PACKAGE_URL="$(python3 - <<'PY'
+from pathlib import Path
+
+print(Path.cwd().resolve().as_uri())
+PY
+)"
+
+cat > ./run_dify_agent_client.py <<PY
+#!/usr/bin/env -S uv run --script
+# /// script
+# requires-python = ">=3.12"
+# dependencies = [
+#   "dify-agent @ ${DIFY_AGENT_PACKAGE_URL}",
+# ]
+# ///
+
+import asyncio
+import json
+import os
+import sys
+from typing import Any
+
+from agenton_collections.layers.plain import PLAIN_PROMPT_LAYER_TYPE_ID, PromptLayerConfig
+from dify_agent.client import Client
+from dify_agent.layers.dify_plugin import (
+    DIFY_PLUGIN_LAYER_TYPE_ID,
+    DIFY_PLUGIN_LLM_LAYER_TYPE_ID,
+    DifyPluginLLMLayerConfig,
+    DifyPluginLayerConfig,
+)
+from dify_agent.protocol import DIFY_AGENT_MODEL_LAYER_ID, CreateRunRequest, RunComposition, RunLayerSpec
+
+
+def env(name: str, default: str | None = None) -> str:
+    value = os.environ.get(name, default)
+    if value is None or value == "":
+        raise SystemExit(f"Missing required environment variable: {name}")
+    return value
+
+
+def load_credentials() -> dict[str, Any]:
+    raw = env("DIFY_AGENT_MODEL_CREDENTIALS_JSON")
+    try:
+        data = json.loads(raw)
+    except json.JSONDecodeError as exc:
+        raise SystemExit(f"DIFY_AGENT_MODEL_CREDENTIALS_JSON must be valid JSON: {exc}") from exc
+
+    if not isinstance(data, dict):
+        raise SystemExit("DIFY_AGENT_MODEL_CREDENTIALS_JSON must be a JSON object")
+
+    return data
+
+
+async def main() -> int:
+    api_base_url = env("DIFY_AGENT_SERVER_URL", "http://127.0.0.1:8000")
+
+    tenant_id = env("DIFY_AGENT_TENANT_ID")
+    plugin_id = env("DIFY_AGENT_PLUGIN_ID", "langgenius/openai")
+    user_id = os.environ.get("DIFY_AGENT_USER_ID") or None
+
+    model_provider = env("DIFY_AGENT_PROVIDER", "openai")
+    model_name = env("DIFY_AGENT_MODEL_NAME", "gpt-4o-mini")
+    model_credentials = load_credentials()
+
+    system_prompt = env("DIFY_AGENT_SYSTEM_PROMPT", "You are a concise assistant.")
+    user_prompt = env("DIFY_AGENT_PROMPT", "Say hello from the Dify Agent client.")
+
+    request = CreateRunRequest(
+        composition=RunComposition(
+            layers=[
+                RunLayerSpec(
+                    name="prompt",
+                    type=PLAIN_PROMPT_LAYER_TYPE_ID,
+                    config=PromptLayerConfig(prefix=system_prompt, user=user_prompt),
+                ),
+                RunLayerSpec(
+                    name="plugin",
+                    type=DIFY_PLUGIN_LAYER_TYPE_ID,
+                    config=DifyPluginLayerConfig(
+                        tenant_id=tenant_id,
+                        plugin_id=plugin_id,
+                        user_id=user_id,
+                    ),
+                ),
+                RunLayerSpec(
+                    name=DIFY_AGENT_MODEL_LAYER_ID,
+                    type=DIFY_PLUGIN_LLM_LAYER_TYPE_ID,
+                    deps={"plugin": "plugin"},
+                    config=DifyPluginLLMLayerConfig(
+                        model_provider=model_provider,
+                        model=model_name,
+                        credentials=model_credentials,
+                    ),
+                ),
+            ],
+        ),
+    )
+
+    async with Client(base_url=api_base_url, stream_timeout=None) as client:
+        run = await client.create_run(request)
+        print(f"created run: {run.run_id}, status={run.status}")
+
+        async for event in client.stream_events(run.run_id):
+            print(event.model_dump_json(indent=2))
+
+            if event.type == "run_succeeded":
+                print("final output:")
+                print(json.dumps(event.data.output, ensure_ascii=False, indent=2))
+                return 0
+
+            if event.type == "run_failed":
+                print(f"run failed: {event.data.error}", file=sys.stderr)
+                return 2
+
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(asyncio.run(main()))
+PY
+
+chmod +x ./run_dify_agent_client.py
+```
+
+## Configure the client request and run it
+
+The server-side `.env` controls how Dify Agent reaches the plugin daemon. The
+client request controls which tenant/plugin/provider/model and provider
+credentials the run uses. Configure those values before executing the script:
+
+```bash
+export DIFY_AGENT_SERVER_URL=http://127.0.0.1:8000
+
+export DIFY_AGENT_TENANT_ID=replace-with-tenant-id
+export DIFY_AGENT_PLUGIN_ID=langgenius/openai
+export DIFY_AGENT_PROVIDER=openai
+export DIFY_AGENT_MODEL_NAME=gpt-4o-mini
+
+export DIFY_AGENT_MODEL_CREDENTIALS_JSON='{"api_key":"replace-with-provider-key"}'
+
+export DIFY_AGENT_PROMPT='用一句话介绍 Dify Agent。'
+
+./run_dify_agent_client.py
+```
+
+The shape of `DIFY_AGENT_MODEL_CREDENTIALS_JSON` depends on the selected plugin
+provider's credential schema. The `{"api_key":"..."}` value above is only an
+OpenAI-style example.
+
+## Troubleshooting
+
+If the run fails, check these items first:
+
+1. Redis is running and reachable from the Dify Agent server.
+2. The Dify Agent server is listening on `127.0.0.1:8000`.
+3. `DIFY_AGENT_PLUGIN_DAEMON_URL` points to the correct plugin daemon.
+4. `DIFY_AGENT_PLUGIN_DAEMON_API_KEY` matches the plugin daemon server key.
+5. `DIFY_AGENT_PLUGIN_ID`, `DIFY_AGENT_PROVIDER`, and
+   `DIFY_AGENT_MODEL_NAME` match a provider available through the plugin daemon.
+6. `DIFY_AGENT_MODEL_CREDENTIALS_JSON` matches that provider's credential schema.
diff --git a/dify-agent/docs/dify-agent/guide/index.md b/dify-agent/docs/dify-agent/guide/index.md
new file mode 100644
index 0000000000..012bd3a598
--- /dev/null
+++ b/dify-agent/docs/dify-agent/guide/index.md
@@ -0,0 +1,140 @@
+# Operating the Dify Agent Run Server
+
+This guide describes how to run the MVP Dify Agent API server. The server is
+implemented in `dify-agent/src/dify_agent/server/app.py` and uses Redis for run
+records and per-run event streams only.
+
+## Default local startup
+
+Start Redis, then run one FastAPI/uvicorn process:
+
+```bash
+uv run --project dify-agent uvicorn dify_agent.server.app:app --reload
+```
+
+By default, the FastAPI lifespan creates:
+
+- one Redis-backed run store used by HTTP routes
+- one shared plugin-daemon `httpx.AsyncClient` used by local run tasks
+- one process-local scheduler that starts background `asyncio` run tasks
+
+This means local development needs one uvicorn process plus Redis, and
+plugin-backed runs also need a reachable Dify plugin daemon. Run execution still
+happens outside request handlers, so client disconnects do not cancel the agent
+run.
+
+## Configuration
+
+`ServerSettings` loads environment variables with the `DIFY_AGENT_` prefix. It
+also reads `.env` and `dify-agent/.env` when present.
+
+| Environment variable | Default | Description |
+| --- | --- | --- |
+| `DIFY_AGENT_REDIS_URL` | `redis://localhost:6379/0` | Redis connection URL. |
+| `DIFY_AGENT_REDIS_PREFIX` | `dify-agent` | Prefix for Redis record and event keys. |
+| `DIFY_AGENT_SHUTDOWN_GRACE_SECONDS` | `30` | Seconds to wait for active local runs during graceful shutdown before cancellation. |
+| `DIFY_AGENT_RUN_RETENTION_SECONDS` | `259200` | Seconds to retain Redis run records and per-run event streams; defaults to 3 days. |
+| `DIFY_AGENT_PLUGIN_DAEMON_URL` | `http://localhost:5002` | Base URL for the Dify plugin daemon. |
+| `DIFY_AGENT_PLUGIN_DAEMON_API_KEY` | empty | API key sent to the Dify plugin daemon. |
+| `DIFY_AGENT_PLUGIN_DAEMON_CONNECT_TIMEOUT` | `10` | Plugin-daemon HTTP connect timeout in seconds. |
+| `DIFY_AGENT_PLUGIN_DAEMON_READ_TIMEOUT` | `600` | Plugin-daemon HTTP read timeout in seconds. |
+| `DIFY_AGENT_PLUGIN_DAEMON_WRITE_TIMEOUT` | `30` | Plugin-daemon HTTP write timeout in seconds. |
+| `DIFY_AGENT_PLUGIN_DAEMON_POOL_TIMEOUT` | `10` | Plugin-daemon HTTP connection-pool wait timeout in seconds. |
+| `DIFY_AGENT_PLUGIN_DAEMON_MAX_CONNECTIONS` | `100` | Maximum total plugin-daemon HTTP connections. |
+| `DIFY_AGENT_PLUGIN_DAEMON_MAX_KEEPALIVE_CONNECTIONS` | `20` | Maximum idle keep-alive plugin-daemon HTTP connections. |
+| `DIFY_AGENT_PLUGIN_DAEMON_KEEPALIVE_EXPIRY` | `30` | Keep-alive expiry in seconds for idle plugin-daemon HTTP connections. |
+
+Example `.env`:
+
+```env
+DIFY_AGENT_REDIS_URL=redis://localhost:6379/0
+DIFY_AGENT_REDIS_PREFIX=dify-agent-dev
+DIFY_AGENT_SHUTDOWN_GRACE_SECONDS=30
+DIFY_AGENT_RUN_RETENTION_SECONDS=259200
+DIFY_AGENT_PLUGIN_DAEMON_URL=http://localhost:5002
+DIFY_AGENT_PLUGIN_DAEMON_API_KEY=replace-with-daemon-key
+```
+
+Run records and event streams use the same retention. Status writes refresh the
+record TTL, and event writes refresh both the stream TTL and the corresponding
+record TTL so active runs that keep producing events remain observable.
+
+## Scheduling and shutdown semantics
+
+`POST /runs` validates the composition, persists a `running` run record, and starts
+an `asyncio` task in the same process. There is no Redis job stream, consumer
+group, pending reclaim, or automatic retry layer.
+
+During FastAPI shutdown the scheduler rejects new runs, waits up to
+`DIFY_AGENT_SHUTDOWN_GRACE_SECONDS` for active tasks, then cancels remaining tasks
+and best-effort appends a `run_failed` event plus failed status. A hard process
+crash can still leave active runs stuck as `running`; there is no in-service
+recovery or worker handoff.
+
+Horizontal scaling is possible by running multiple API processes against the same
+Redis prefix, but each process executes only the runs it accepted. Redis provides
+shared status/event visibility, not load balancing or queued-job recovery.
+
+## Run inputs and session snapshots
+
+The API does not accept a top-level `user_prompt`. Submit a `RunComposition`
+whose Agenton layers provide user input. With the MVP provider set, use
+`plain.prompt` and its `config.user` field:
+
+```json
+{
+  "composition": {
+    "schema_version": 1,
+    "layers": [
+      {
+        "name": "prompt",
+        "type": "plain.prompt",
+        "config": {
+          "prefix": "You are concise.",
+          "user": "Summarize the current state."
+        }
+      }
+    ]
+  }
+}
+```
+
+`config.user` can be a string or a list of strings. Empty or whitespace-only
+effective prompts are rejected during create-run validation before the run is
+persisted or scheduled.
+
+There is no Pydantic AI history layer. To resume Agenton layer state, pass the
+`session_snapshot` from a previous `run_succeeded.data` payload together with a
+composition that has the same layer names and order.
+
+## Observing runs
+
+Use the HTTP status endpoint for coarse state and the event endpoints for detailed
+progress:
+
+- `POST /runs` creates a running run and schedules it locally.
+- `GET /runs/{run_id}` returns `running`, `succeeded`, or `failed`.
+- `GET /runs/{run_id}/events` polls the Redis Stream event log with `after` and
+  `next_cursor` cursors.
+- `GET /runs/{run_id}/events/sse` replays and streams events over SSE. The SSE
+  `id` is the event Redis Stream ID. `after` query cursors take precedence over
+  `Last-Event-ID` headers.
+
+Successful runs emit `run_started`, zero or more `pydantic_ai_event`, and
+`run_succeeded`. Failed runs end with `run_failed`. Event envelopes retain `id`,
+`run_id`, `type`, `data`, and `created_at`; `data` is typed per event type,
+including Pydantic AI's `AgentStreamEvent` payload for `pydantic_ai_event` and a
+terminal `run_succeeded.data` object containing JSON-safe `output` plus a
+`CompositorSessionSnapshot` for resumption.
+
+## Examples
+
+The repository includes simple consumers that print observed output/events:
+
+- `dify-agent/examples/dify_agent/dify_agent_examples/run_server_consumer.py`
+  creates a run and polls events.
+- `dify-agent/examples/dify_agent/dify_agent_examples/run_server_sse_consumer.py`
+  consumes raw SSE frames for an existing run id.
+
+The create-run examples submit Dify plugin model layers, so they require Redis,
+the API server, plugin-daemon settings, and provider credentials.
diff --git a/dify-agent/docs/dify-agent/index.md b/dify-agent/docs/dify-agent/index.md
new file mode 100644
index 0000000000..39cedf74b9
--- /dev/null
+++ b/dify-agent/docs/dify-agent/index.md
@@ -0,0 +1,8 @@
+# Dify Agent runtime
+
+Dify Agent hosts Agenton-composed Pydantic AI runs behind a FastAPI API. Its
+source code stays under `src/dify_agent`, while framework-neutral Agenton code
+stays under `src/agenton` and `src/agenton_collections`.
+
+See the [operations guide](guide/index.md) for local server behavior and the
+[run API](api/index.md) for request and event schemas.
diff --git a/dify-agent/docs/index.md b/dify-agent/docs/index.md
new file mode 100644
index 0000000000..0fd13b6cb6
--- /dev/null
+++ b/dify-agent/docs/index.md
@@ -0,0 +1,11 @@
+# Dify Agent
+
+This documentation is split by ownership boundary:
+
+- [Agenton](agenton/index.md) covers the framework-neutral layer compositor and reusable
+  collection layers.
+- [Dify Agent](dify-agent/index.md) covers the Dify runtime, HTTP API, Redis-backed run
+  storage, and server examples.
+
+The split mirrors the source tree so Agenton documentation and examples can be
+moved together if Agenton is published separately later.
diff --git a/dify-agent/examples/agenton/agenton_examples/__init__.py b/dify-agent/examples/agenton/agenton_examples/__init__.py
new file mode 100644
index 0000000000..048f5b8e02
--- /dev/null
+++ b/dify-agent/examples/agenton/agenton_examples/__init__.py
@@ -0,0 +1 @@
+"""Runnable Agenton examples kept separate from Dify Agent runtime examples."""
diff --git a/dify-agent/examples/agenton/agenton_examples/__main__.py b/dify-agent/examples/agenton/agenton_examples/__main__.py
new file mode 100644
index 0000000000..d0794fc2f0
--- /dev/null
+++ b/dify-agent/examples/agenton/agenton_examples/__main__.py
@@ -0,0 +1,50 @@
+"""Small CLI for listing or copying Agenton examples."""
+
+from __future__ import annotations
+
+import argparse
+import shutil
+import sys
+from pathlib import Path
+
+EXAMPLE_MODULES = (
+    "basics",
+    "pydantic_ai_bridge",
+    "session_snapshot",
+)
+
+
+def cli() -> None:
+    parser = argparse.ArgumentParser(
+        prog="agenton_examples",
+        description="List or copy Agenton examples.",
+    )
+    parser.add_argument("--copy-to", metavar="DEST", help="Copy example files to a new directory")
+    args = parser.parse_args()
+
+    examples_dir = Path(__file__).parent
+    if args.copy_to:
+        copy_to(examples_dir, Path(args.copy_to))
+        return
+
+    for module_name in EXAMPLE_MODULES:
+        print(f"python -m agenton_examples.{module_name}")
+
+
+def copy_to(examples_dir: Path, destination: Path) -> None:
+    if destination.exists():
+        print(f'Error: destination path "{destination}" already exists', file=sys.stderr)
+        sys.exit(1)
+
+    destination.mkdir(parents=True)
+    copied = 0
+    for source in examples_dir.glob("*.py"):
+        if source.name == "__init__.py":
+            continue
+        shutil.copy2(source, destination / source.name)
+        copied += 1
+    print(f'Copied {copied} Agenton example files to "{destination}"')
+
+
+if __name__ == "__main__":
+    cli()
diff --git a/dify-agent/examples/agenton/agenton_examples/basics.py b/dify-agent/examples/agenton/agenton_examples/basics.py
new file mode 100644
index 0000000000..81a3daeb18
--- /dev/null
+++ b/dify-agent/examples/agenton/agenton_examples/basics.py
@@ -0,0 +1,142 @@
+"""Run with: uv run --project dify-agent python -m agenton_examples.basics."""
+
+from __future__ import annotations
+
+import asyncio
+from dataclasses import dataclass, field
+from inspect import signature
+from typing import cast
+
+from typing_extensions import override
+
+from agenton.compositor import Compositor, LayerNode, LayerProvider
+from agenton.layers import LayerDeps, NoLayerDeps, PlainLayer, PlainToolType
+from agenton_collections.layers.plain import DynamicToolsLayer, ObjectLayer, PromptLayer, ToolsLayer, with_object
+from agenton_collections.layers.plain.basic import PromptLayerConfig
+
+
+@dataclass(frozen=True, slots=True)
+class AgentProfile:
+    name: str
+    audience: str
+    tone: str
+
+
+class ProfilePromptDeps(LayerDeps):
+    profile: ObjectLayer[AgentProfile]  # pyright: ignore[reportUninitializedInstanceVariable]
+
+
+@dataclass(slots=True)
+class ProfilePromptLayer(PlainLayer[ProfilePromptDeps]):
+    @property
+    @override
+    def prefix_prompts(self) -> list[str]:
+        profile = self.deps.profile.value
+        return [
+            f"You are {profile.name}, writing for {profile.audience}.",
+            f"Keep the tone {profile.tone}.",
+        ]
+
+
+@dataclass(slots=True)
+class TraceLayer(PlainLayer[NoLayerDeps]):
+    events: list[str] = field(default_factory=list)
+
+    @override
+    async def on_context_create(self) -> None:
+        self.events.append("create")
+
+    @override
+    async def on_context_suspend(self) -> None:
+        self.events.append("suspend")
+
+    @override
+    async def on_context_resume(self) -> None:
+        self.events.append("resume")
+
+    @override
+    async def on_context_delete(self) -> None:
+        self.events.append("delete")
+
+
+def count_words(text: str) -> int:
+    return len(text.split())
+
+
+@with_object(AgentProfile)
+def write_tagline(profile: AgentProfile, topic: str) -> str:
+    return f"{profile.name}: {topic} for {profile.audience}, in a {profile.tone} voice."
+
+
+async def main() -> None:
+    profile = AgentProfile(
+        name="Agenton Assistant",
+        audience="engineers composing agent capabilities",
+        tone="precise and friendly",
+    )
+    trace_events: list[str] = []
+    compositor = Compositor(
+        [
+            LayerNode("base_prompt", PromptLayer),
+            LayerNode("extra_prompt", PromptLayer),
+            LayerNode(
+                "profile",
+                LayerProvider.from_factory(
+                    layer_type=ObjectLayer,
+                    create=lambda _config: ObjectLayer[AgentProfile](profile),
+                ),
+            ),
+            LayerNode("profile_prompt", ProfilePromptLayer, deps={"profile": "profile"}),
+            LayerNode(
+                "tools",
+                LayerProvider.from_factory(
+                    layer_type=ToolsLayer,
+                    create=lambda _config: ToolsLayer(tool_entries=(count_words,)),
+                ),
+            ),
+            LayerNode(
+                "dynamic_tools",
+                LayerProvider.from_factory(
+                    layer_type=DynamicToolsLayer,
+                    create=lambda _config: DynamicToolsLayer[AgentProfile](tool_entries=(write_tagline,)),
+                ),
+                deps={"object_layer": "profile"},
+            ),
+            LayerNode(
+                "trace",
+                LayerProvider.from_factory(layer_type=TraceLayer, create=lambda _config: TraceLayer(trace_events)),
+            ),
+        ]
+    )
+    configs = {
+        "base_prompt": PromptLayerConfig(
+            prefix="Use config dicts for serializable layers.",
+            user="Explain how the composed agent should use its layers.",
+            suffix="Before finalizing, make the result easy to scan.",
+        ),
+        "extra_prompt": PromptLayerConfig(prefix="Use constructed instances for objects, local code, and callables."),
+    }
+
+    async with compositor.enter(configs=configs) as run:
+        print("Prompts:")
+        for prompt in run.prompts:
+            print(f"- {prompt.value}")
+
+        print("\nUser prompts:")
+        for prompt in run.user_prompts:
+            print(f"- {prompt.value}")
+
+        print("\nTools:")
+        plain_tools = [cast(PlainToolType, tool) for tool in run.tools]
+        for tool in plain_tools:
+            print(f"- {tool.value.__name__}{signature(tool.value)}")
+        print([tool.value("layer composition") for tool in plain_tools])
+        run.suspend_on_exit()
+
+    async with compositor.enter(configs=configs, session_snapshot=run.session_snapshot):
+        pass
+    print("\nLifecycle:", trace_events)
+
+
+if __name__ == "__main__":
+    asyncio.run(main())
diff --git a/dify-agent/examples/agenton/agenton_examples/pydantic_ai_bridge.py b/dify-agent/examples/agenton/agenton_examples/pydantic_ai_bridge.py
new file mode 100644
index 0000000000..0b6ff588d1
--- /dev/null
+++ b/dify-agent/examples/agenton/agenton_examples/pydantic_ai_bridge.py
@@ -0,0 +1,133 @@
+"""Pydantic AI bridge example for use from a source checkout.
+
+`agenton_examples` is not part of the published package, so run this module from
+the repository root with:
+
+    PYTHONPATH=dify-agent/src:dify-agent/examples/agenton \
+    uv run --project dify-agent python -m agenton_examples.pydantic_ai_bridge
+"""
+
+from __future__ import annotations
+
+import asyncio
+import json
+import os
+from dataclasses import dataclass
+
+from pydantic_ai import Agent, RunContext
+from pydantic_ai.messages import BuiltinToolCallPart, ModelMessage, ToolCallPart
+from pydantic_ai.models.openai import OpenAIChatModel  # pyright: ignore[reportDeprecated]
+from pydantic_ai.models.test import TestModel
+
+from agenton.compositor import Compositor, LayerNode, LayerProvider
+from agenton_collections.layers.plain import ObjectLayer, PromptLayer, PromptLayerConfig, ToolsLayer
+from agenton_collections.layers.pydantic_ai import PydanticAIBridgeLayer
+from agenton_collections.transformers.pydantic_ai import PYDANTIC_AI_TRANSFORMERS
+
+
+@dataclass(frozen=True, slots=True)
+class AgentProfile:
+    name: str
+    audience: str
+    tone: str
+
+
+def count_words(text: str) -> int:
+    return len(text.split())
+
+
+def profile_prompt(ctx: RunContext[AgentProfile]) -> str:
+    profile = ctx.deps
+    return f"You are {profile.name}, helping {profile.audience}."
+
+
+def tone_prompt(ctx: RunContext[AgentProfile]) -> str:
+    return f"Keep responses {ctx.deps.tone}."
+
+
+def write_tagline(ctx: RunContext[AgentProfile], topic: str) -> str:
+    profile = ctx.deps
+    return f"{profile.name}: {topic} for {profile.audience}, in a {profile.tone} voice."
+
+
+async def main() -> None:
+    profile = AgentProfile(
+        name="Agenton Assistant",
+        audience="engineers composing agent capabilities",
+        tone="precise and friendly",
+    )
+    compositor = Compositor(
+        [
+            LayerNode("base_prompt", PromptLayer),
+            LayerNode(
+                "profile",
+                LayerProvider.from_factory(
+                    layer_type=ObjectLayer,
+                    create=lambda _config: ObjectLayer[AgentProfile](profile),
+                ),
+            ),
+            LayerNode(
+                "plain_tools",
+                LayerProvider.from_factory(
+                    layer_type=ToolsLayer,
+                    create=lambda _config: ToolsLayer(tool_entries=(count_words,)),
+                ),
+            ),
+            LayerNode(
+                "pydantic_ai_bridge",
+                LayerProvider.from_factory(
+                    layer_type=PydanticAIBridgeLayer,
+                    create=lambda _config: PydanticAIBridgeLayer[AgentProfile](
+                        prefix=("Prefer concrete details.", profile_prompt, tone_prompt),
+                        user="Use the tools for 'layer composition'.",
+                        tool_entries=(write_tagline,),
+                    ),
+                ),
+                deps={"object_layer": "profile"},
+            ),
+        ],
+        **PYDANTIC_AI_TRANSFORMERS,
+    )
+
+    async with compositor.enter(
+        configs={
+            "base_prompt": PromptLayerConfig(
+                prefix="Use the available tools before answering.",
+                suffix="Return concise, inspectable output.",
+            )
+        }
+    ) as run:
+        model = (
+            OpenAIChatModel("gpt-5.5")  # pyright: ignore[reportDeprecated]
+            if os.getenv("OPENAI_API_KEY")
+            else TestModel()
+        )
+        agent = Agent[AgentProfile](
+            model=model,
+            deps_type=AgentProfile,
+            tools=run.tools,
+        )
+        for prompt in run.prompts:
+            _ = agent.system_prompt(prompt)
+
+        bridge_layer = run.get_layer("pydantic_ai_bridge", PydanticAIBridgeLayer)
+        result = await agent.run(run.user_prompts, deps=bridge_layer.run_deps)
+
+    for line in _format_messages(result.all_messages()):
+        print(line)
+
+
+def _format_messages(messages: list[ModelMessage]) -> list[str]:
+    lines: list[str] = []
+    for message in messages:
+        for part in message.parts:
+            if isinstance(part, ToolCallPart | BuiltinToolCallPart):
+                args = json.dumps(part.args, ensure_ascii=False)
+                lines.append(f"{type(part).__name__}: {part.tool_name}({args})")
+            else:
+                lines.append(f"{type(part).__name__}: {part.content}")
+    return lines
+
+
+if __name__ == "__main__":
+    asyncio.run(main())
diff --git a/dify-agent/examples/agenton/agenton_examples/session_snapshot.py b/dify-agent/examples/agenton/agenton_examples/session_snapshot.py
new file mode 100644
index 0000000000..4e5a9c3b9f
--- /dev/null
+++ b/dify-agent/examples/agenton/agenton_examples/session_snapshot.py
@@ -0,0 +1,50 @@
+"""Run with: uv run --project dify-agent python -m agenton_examples.session_snapshot."""
+
+from __future__ import annotations
+
+import asyncio
+from dataclasses import dataclass
+from typing import ClassVar
+
+from pydantic import BaseModel, ConfigDict
+
+from agenton.compositor import Compositor, LayerNode
+from agenton.layers import EmptyLayerConfig, NoLayerDeps, PlainLayer
+
+
+class ConnectionState(BaseModel):
+    connection_id: str = "demo-connection"
+
+    model_config = ConfigDict(extra="forbid", validate_assignment=True)
+
+
+class ConnectionHandle:
+    def __init__(self, connection_id: str) -> None:
+        self.connection_id = connection_id
+
+
+@dataclass(slots=True)
+class ConnectionLayer(PlainLayer[NoLayerDeps, EmptyLayerConfig, ConnectionState]):
+    runtime_state_type: ClassVar[type[BaseModel]] = ConnectionState
+
+
+async def main() -> None:
+    compositor = Compositor([LayerNode("connection", ConnectionLayer)])
+    async with compositor.enter() as run:
+        layer = run.get_layer("connection", ConnectionLayer)
+        connection = ConnectionHandle(layer.runtime_state.connection_id)
+        print("Active external handle:", connection.connection_id)
+        run.suspend_on_exit()
+
+    snapshot = run.session_snapshot
+    assert snapshot is not None
+    print("Snapshot:", snapshot.model_dump(mode="json"))
+
+    async with compositor.enter(session_snapshot=snapshot) as restored_run:
+        layer = restored_run.get_layer("connection", ConnectionLayer)
+        restored_connection = ConnectionHandle(f"restored:{layer.runtime_state.connection_id}")
+        print("Rehydrated external handle:", restored_connection.connection_id)
+
+
+if __name__ == "__main__":
+    asyncio.run(main())
diff --git a/dify-agent/examples/dify_agent/dify_agent_examples/__init__.py b/dify-agent/examples/dify_agent/dify_agent_examples/__init__.py
new file mode 100644
index 0000000000..629dd85368
--- /dev/null
+++ b/dify-agent/examples/dify_agent/dify_agent_examples/__init__.py
@@ -0,0 +1 @@
+"""Runnable Dify Agent runtime examples kept separate from Agenton examples."""
diff --git a/dify-agent/examples/dify_agent/dify_agent_examples/__main__.py b/dify-agent/examples/dify_agent/dify_agent_examples/__main__.py
new file mode 100644
index 0000000000..204d2b6b8a
--- /dev/null
+++ b/dify-agent/examples/dify_agent/dify_agent_examples/__main__.py
@@ -0,0 +1,51 @@
+"""Small CLI for listing or copying Dify Agent examples."""
+
+from __future__ import annotations
+
+import argparse
+import shutil
+import sys
+from pathlib import Path
+
+EXAMPLE_MODULES = (
+    "run_pydantic_ai_agent",
+    "run_server_consumer",
+    "run_server_sse_consumer",
+    "run_server_sync_client",
+)
+
+
+def cli() -> None:
+    parser = argparse.ArgumentParser(
+        prog="dify_agent_examples",
+        description="List or copy Dify Agent runtime examples.",
+    )
+    parser.add_argument("--copy-to", metavar="DEST", help="Copy example files to a new directory")
+    args = parser.parse_args()
+
+    examples_dir = Path(__file__).parent
+    if args.copy_to:
+        copy_to(examples_dir, Path(args.copy_to))
+        return
+
+    for module_name in EXAMPLE_MODULES:
+        print(f"python -m dify_agent_examples.{module_name}")
+
+
+def copy_to(examples_dir: Path, destination: Path) -> None:
+    if destination.exists():
+        print(f'Error: destination path "{destination}" already exists', file=sys.stderr)
+        sys.exit(1)
+
+    destination.mkdir(parents=True)
+    copied = 0
+    for source in examples_dir.glob("*.py"):
+        if source.name == "__init__.py":
+            continue
+        shutil.copy2(source, destination / source.name)
+        copied += 1
+    print(f'Copied {copied} Dify Agent example files to "{destination}"')
+
+
+if __name__ == "__main__":
+    cli()
diff --git a/dify-agent/examples/dify_agent/dify_agent_examples/run_pydantic_ai_agent.py b/dify-agent/examples/dify_agent/dify_agent_examples/run_pydantic_ai_agent.py
new file mode 100644
index 0000000000..12eb42dc1b
--- /dev/null
+++ b/dify-agent/examples/dify_agent/dify_agent_examples/run_pydantic_ai_agent.py
@@ -0,0 +1,83 @@
+"""Run a Pydantic AI agent through the Dify plugin-daemon adapter.
+
+Prerequisites:
+- Sync the server runtime dependencies first: `uv sync --project dify-agent --extra server`.
+- Start the plugin daemon from `dify-aio/dify/docker/docker-compose.middleware.yaml`.
+- Run the Dify API with `dify-aio/dify/api/.env` so the daemon can resolve tenants/plugins.
+- Fill `dify-agent/.env` with a real tenant, plugin, provider, model, and provider credentials.
+
+This example is meant to be run from a source checkout because
+`dify_agent_examples` is not part of the published package.
+
+Example from the repository root:
+    PYTHONPATH=dify-agent/src:dify-agent/examples/dify_agent \
+    uv run --project dify-agent python -m dify_agent_examples.run_pydantic_ai_agent
+"""
+
+from __future__ import annotations
+
+import asyncio
+import json
+import os
+from pathlib import Path
+from typing import Any
+
+from pydantic_ai import Agent
+
+from dify_agent.adapters.llm import DifyLLMAdapterModel, DifyPluginDaemonProvider
+
+
+PROJECT_ROOT = Path(__file__).resolve().parents[3]
+
+
+def load_env_file(path: Path) -> None:
+    """Load simple KEY=VALUE lines without adding a dotenv dependency."""
+    if not path.exists():
+        return
+
+    for raw_line in path.read_text(encoding="utf-8").splitlines():
+        line = raw_line.strip()
+        if not line or line.startswith("#") or "=" not in line:
+            continue
+        key, value = line.split("=", 1)
+        os.environ.setdefault(key.strip(), value.strip().strip('"').strip("'"))
+
+
+def required_env(name: str) -> str:
+    value = os.environ.get(name)
+    if value:
+        return value
+    raise RuntimeError(f"Missing required environment variable: {name}")
+
+
+def load_credentials() -> dict[str, Any]:
+    raw_credentials = required_env("DIFY_AGENT_MODEL_CREDENTIALS_JSON")
+    credentials = json.loads(raw_credentials)
+    if not isinstance(credentials, dict):
+        raise RuntimeError("DIFY_AGENT_MODEL_CREDENTIALS_JSON must be a JSON object")
+    return credentials
+
+
+async def main() -> None:
+    load_env_file(PROJECT_ROOT / ".env")
+
+    model = DifyLLMAdapterModel(
+        required_env("DIFY_AGENT_MODEL_NAME"),
+        DifyPluginDaemonProvider(
+            tenant_id=required_env("DIFY_AGENT_TENANT_ID"),
+            plugin_id=required_env("DIFY_AGENT_PLUGIN_ID"),
+            plugin_daemon_url=required_env("PLUGIN_DAEMON_URL"),
+            plugin_daemon_api_key=required_env("PLUGIN_DAEMON_KEY"),
+        ),
+        model_provider=required_env("DIFY_AGENT_PROVIDER"),
+        credentials=load_credentials(),
+    )
+    agent = Agent(model=model)
+    async with agent.run_stream("Explain the theory of relativity") as run:
+        async for piece in run.stream_output():
+            print(piece, end="", flush=True)
+        print(run.usage())
+
+
+if __name__ == "__main__":
+    asyncio.run(main())
diff --git a/dify-agent/examples/dify_agent/dify_agent_examples/run_server_consumer.py b/dify-agent/examples/dify_agent/dify_agent_examples/run_server_consumer.py
new file mode 100644
index 0000000000..a3d0474b46
--- /dev/null
+++ b/dify-agent/examples/dify_agent/dify_agent_examples/run_server_consumer.py
@@ -0,0 +1,85 @@
+"""Async Python client example for the Dify Agent run server.
+
+Requires Redis and a running API server. Before starting the server, sync the
+server runtime dependencies with `uv sync --project dify-agent --extra server`
+or install `dify-agent[server]`. The server schedules runs in-process, for
+example:
+
+    uv run --project dify-agent uvicorn dify_agent.server.app:app --reload
+
+The request carries Dify plugin model configuration in Agenton layers. This
+script prints the created run and every event observed through cursor polling.
+``Client.create_run`` performs one POST attempt only; use polling or SSE replay to
+recover after client-side uncertainty.
+"""
+
+import asyncio
+
+from agenton_collections.layers.plain import PLAIN_PROMPT_LAYER_TYPE_ID, PromptLayerConfig
+from dify_agent.client import Client
+from dify_agent.layers.dify_plugin import (
+    DIFY_PLUGIN_LAYER_TYPE_ID,
+    DIFY_PLUGIN_LLM_LAYER_TYPE_ID,
+    DifyPluginCredentialValue,
+    DifyPluginLLMLayerConfig,
+    DifyPluginLayerConfig,
+)
+from dify_agent.protocol import DIFY_AGENT_MODEL_LAYER_ID, CreateRunRequest, RunComposition, RunLayerSpec
+
+
+API_BASE_URL = "http://localhost:8000"
+TENANT_ID = "replace-with-tenant-id"
+PLUGIN_ID = "langgenius/openai"
+PLUGIN_PROVIDER = "openai"
+MODEL_NAME = "gpt-4o-mini"
+MODEL_CREDENTIALS: dict[str, DifyPluginCredentialValue] = {"api_key": "replace-with-provider-key"}
+
+
+async def main() -> None:
+    async with Client(base_url=API_BASE_URL) as client:
+        run = await client.create_run(
+            CreateRunRequest(
+                composition=RunComposition(
+                    layers=[
+                        RunLayerSpec(
+                            name="prompt",
+                            type=PLAIN_PROMPT_LAYER_TYPE_ID,
+                            config=PromptLayerConfig(
+                                prefix="You are a concise assistant.",
+                                user="Say hello from the Dify Agent API server example.",
+                            ),
+                        ),
+                        RunLayerSpec(
+                            name="plugin",
+                            type=DIFY_PLUGIN_LAYER_TYPE_ID,
+                            config=DifyPluginLayerConfig(tenant_id=TENANT_ID, plugin_id=PLUGIN_ID),
+                        ),
+                        RunLayerSpec(
+                            name=DIFY_AGENT_MODEL_LAYER_ID,
+                            type=DIFY_PLUGIN_LLM_LAYER_TYPE_ID,
+                            deps={"plugin": "plugin"},
+                            config=DifyPluginLLMLayerConfig(
+                                model_provider=PLUGIN_PROVIDER,
+                                model=MODEL_NAME,
+                                credentials=MODEL_CREDENTIALS,
+                            ),
+                        ),
+                    ],
+                ),
+            )
+        )
+        print("created run", run)
+
+        cursor = "0-0"
+        while True:
+            page = await client.get_events(run.run_id, after=cursor)
+            cursor = page.next_cursor or cursor
+            for event in page.events:
+                print("event", event)
+                if event.type in {"run_succeeded", "run_failed"}:
+                    return
+            await asyncio.sleep(0.5)
+
+
+if __name__ == "__main__":
+    asyncio.run(main())
diff --git a/dify-agent/examples/dify_agent/dify_agent_examples/run_server_sse_consumer.py b/dify-agent/examples/dify_agent/dify_agent_examples/run_server_sse_consumer.py
new file mode 100644
index 0000000000..8e0979973a
--- /dev/null
+++ b/dify-agent/examples/dify_agent/dify_agent_examples/run_server_sse_consumer.py
@@ -0,0 +1,25 @@
+"""Async SSE client example for the Dify Agent run server.
+
+Create a run with ``run_server_consumer.py`` or any HTTP client, then set RUN_ID
+below and run this script while the server is available. The Python client parses
+SSE frames into typed protocol events and reconnects with the latest event id by
+default. Malformed frames and HTTP 4xx responses fail without reconnecting.
+"""
+
+import asyncio
+
+from dify_agent.client import Client
+
+
+API_BASE_URL = "http://localhost:8000"
+RUN_ID = "replace-with-run-id"
+
+
+async def main() -> None:
+    async with Client(base_url=API_BASE_URL, stream_timeout=None) as client:
+        async for event in client.stream_events(RUN_ID):
+            print(event)
+
+
+if __name__ == "__main__":
+    asyncio.run(main())
diff --git a/dify-agent/examples/dify_agent/dify_agent_examples/run_server_sync_client.py b/dify-agent/examples/dify_agent/dify_agent_examples/run_server_sync_client.py
new file mode 100644
index 0000000000..3c789571f1
--- /dev/null
+++ b/dify-agent/examples/dify_agent/dify_agent_examples/run_server_sync_client.py
@@ -0,0 +1,70 @@
+"""Synchronous Python client example for the Dify Agent run server.
+
+Requires the same running FastAPI server as the async examples. Before starting
+that server, sync the server runtime dependencies with
+`uv sync --project dify-agent --extra server` or install
+`dify-agent[server]`. ``create_run_sync`` does not retry ``POST /runs``; if a
+timeout occurs, inspect server state or create a new run explicitly rather than
+assuming the original request was not accepted.
+"""
+
+from agenton_collections.layers.plain import PLAIN_PROMPT_LAYER_TYPE_ID, PromptLayerConfig
+from dify_agent.client import Client
+from dify_agent.layers.dify_plugin import (
+    DIFY_PLUGIN_LAYER_TYPE_ID,
+    DIFY_PLUGIN_LLM_LAYER_TYPE_ID,
+    DifyPluginCredentialValue,
+    DifyPluginLLMLayerConfig,
+    DifyPluginLayerConfig,
+)
+from dify_agent.protocol import DIFY_AGENT_MODEL_LAYER_ID, CreateRunRequest, RunComposition, RunLayerSpec
+
+
+API_BASE_URL = "http://localhost:8000"
+TENANT_ID = "replace-with-tenant-id"
+PLUGIN_ID = "langgenius/openai"
+PLUGIN_PROVIDER = "openai"
+MODEL_NAME = "gpt-4o-mini"
+MODEL_CREDENTIALS: dict[str, DifyPluginCredentialValue] = {"api_key": "replace-with-provider-key"}
+
+
+def main() -> None:
+    with Client(base_url=API_BASE_URL) as client:
+        run = client.create_run_sync(
+            CreateRunRequest(
+                composition=RunComposition(
+                    layers=[
+                        RunLayerSpec(
+                            name="prompt",
+                            type=PLAIN_PROMPT_LAYER_TYPE_ID,
+                            config=PromptLayerConfig(
+                                prefix="You are a concise assistant.",
+                                user="Say hello from the synchronous Dify Agent client example.",
+                            ),
+                        ),
+                        RunLayerSpec(
+                            name="plugin",
+                            type=DIFY_PLUGIN_LAYER_TYPE_ID,
+                            config=DifyPluginLayerConfig(tenant_id=TENANT_ID, plugin_id=PLUGIN_ID),
+                        ),
+                        RunLayerSpec(
+                            name=DIFY_AGENT_MODEL_LAYER_ID,
+                            type=DIFY_PLUGIN_LLM_LAYER_TYPE_ID,
+                            deps={"plugin": "plugin"},
+                            config=DifyPluginLLMLayerConfig(
+                                model_provider=PLUGIN_PROVIDER,
+                                model=MODEL_NAME,
+                                credentials=MODEL_CREDENTIALS,
+                            ),
+                        ),
+                    ],
+                ),
+            )
+        )
+        print("created run", run)
+        terminal = client.wait_run_sync(run.run_id, poll_interval_seconds=0.5)
+        print("terminal status", terminal)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/dify-agent/mkdocs.yml b/dify-agent/mkdocs.yml
new file mode 100644
index 0000000000..9675a5eda2
--- /dev/null
+++ b/dify-agent/mkdocs.yml
@@ -0,0 +1,65 @@
+site_name: Dify Agent
+site_description: Agent runtime and Agenton composition framework documentation
+strict: true
+
+repo_name: langgenius/dify
+repo_url: https://github.com/langgenius/dify
+edit_uri: edit/main/dify-agent/docs/
+
+nav:
+  - Home: index.md
+  - Agenton:
+      - Overview: agenton/index.md
+      - Guide: agenton/guide/index.md
+      - API Reference: agenton/api/index.md
+      - Examples: agenton/examples/index.md
+  - Dify Agent:
+      - Overview: dify-agent/index.md
+      - Get Started: dify-agent/get-started/index.md
+      - Operations Guide: dify-agent/guide/index.md
+      - Run API: dify-agent/api/index.md
+      - Examples: dify-agent/examples/index.md
+
+theme:
+  name: material
+  features:
+    - content.code.copy
+    - content.tabs.link
+    - navigation.indexes
+    - navigation.sections
+    - navigation.tracking
+    - toc.follow
+
+markdown_extensions:
+  - admonition
+  - attr_list
+  - md_in_html
+  - pymdownx.details
+  - pymdownx.highlight:
+      pygments_lang_class: true
+  - pymdownx.inlinehilite
+  - pymdownx.superfences
+  - pymdownx.tabbed:
+      alternate_style: true
+  - tables
+
+plugins:
+  - search
+  - mkdocstrings:
+      handlers:
+        python:
+          paths:
+            - src
+          options:
+            docstring_style: google
+            members_order: source
+            separate_signature: true
+            show_signature_annotations: true
+            signature_crossrefs: true
+
+watch:
+  - src
+  - examples
+
+hooks:
+  - docs/.hooks/main.py
diff --git a/dify-agent/pyproject.toml b/dify-agent/pyproject.toml
new file mode 100644
index 0000000000..d9b2796570
--- /dev/null
+++ b/dify-agent/pyproject.toml
@@ -0,0 +1,76 @@
+[project]
+name = "dify-agent"
+version = "0.1.0"
+description = "Add your description here"
+readme = "README.md"
+requires-python = ">=3.12"
+dependencies = [
+    "httpx>=0.28.1",
+    "pydantic>=2.12.5,<2.13",
+    "pydantic-ai-slim>=1.85.1",
+    "typing-extensions>=4.12.2",
+]
+
+[project.optional-dependencies]
+server = [
+    "fastapi>=0.136.0",
+    "graphon~=0.2.2",
+    "jsonschema>=4.23.0",
+    "pydantic-ai-slim[anthropic,google,openai]>=1.85.1",
+    "pydantic-settings>=2.12.0",
+    "redis>=5",
+    "uvicorn[standard]>=0.38.0",
+]
+
+[tool.setuptools.packages.find]
+where = ["src"]
+include = [
+    "agenton*",
+    "agenton_collections*",
+    "dify_agent*",
+]
+
+[tool.pyright]
+include = ["src", "examples", "tests"]
+venvPath = "."
+venv = ".venv"
+pythonVersion = "3.12"
+extraPaths = [
+    "src",
+    "examples/agenton",
+    "examples/dify_agent",
+]
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+python_files = ["test_*.py", "*_test.py"]
+
+[tool.ruff]
+line-length = 120
+target-version = "py312"
+include = [
+    "src/**/*.py",
+    "examples/**/*.py",
+    "tests/**/*.py",
+    "docs/**/*.py",
+]
+
+[dependency-groups]
+dev = [
+    "basedpyright>=1.39.3",
+    "coverage[toml]>=7.10.7",
+    "pytest>=9.0.3",
+    "pytest-examples>=0.0.18",
+    "pytest-mock>=3.14.0",
+    "ruff>=0.15.11",
+]
+docs = [
+    "mkdocs>=1.6.1,<2",
+    "mkdocs-glightbox>=0.4.0",
+    "mkdocs-material>=9.7.0",
+    "mkdocstrings-python>=2.0.0",
+]
+
+[build-system]
+requires = ["setuptools>=61"]
+build-backend = "setuptools.build_meta"
diff --git a/dify-agent/src/agenton/__init__.py b/dify-agent/src/agenton/__init__.py
new file mode 100644
index 0000000000..9c9bdfee40
--- /dev/null
+++ b/dify-agent/src/agenton/__init__.py
@@ -0,0 +1,18 @@
+"""Agenton state-only core.
+
+Agenton core composes reusable stateless layer graph plans, creates a fresh
+``CompositorRun`` for each invocation, hydrates and advances serializable layer
+``runtime_state`` through run slots, and emits session snapshots. It intentionally
+does not own resources, handles, clients, cleanup callbacks, or any other
+non-serializable runtime object.
+
+Each ``Compositor`` stores only graph nodes and layer providers. Every enter call
+creates new layer instances, binds direct dependencies for that run, and writes
+the next cross-call state to ``run.session_snapshot`` after exit. To resume a
+suspended call, reuse the same compositor plan and pass the prior snapshot to a
+new enter call.
+
+``LifecycleState.ACTIVE`` is internal-only while an entry is running. External
+session snapshots and hydrated input must contain only non-active lifecycle
+states; ``runtime_state`` is the only mutable layer data captured by snapshots.
+"""
diff --git a/dify-agent/src/agenton/compositor/__init__.py b/dify-agent/src/agenton/compositor/__init__.py
new file mode 100644
index 0000000000..55019d7b61
--- /dev/null
+++ b/dify-agent/src/agenton/compositor/__init__.py
@@ -0,0 +1,55 @@
+"""Stateless layer graph composition facade for the Agenton core.
+
+``agenton.compositor`` remains the stable import surface for reusable graph
+composition. ``core.py`` defines the state-only ``Compositor`` graph plan and
+``LayerNode`` orchestration, ``providers.py`` owns reusable construction plans
+and fresh-instance validation, ``run.py`` owns active invocation lifecycle plus
+prompt/tool aggregation, ``schemas.py`` owns serializable graph/snapshot DTOs
+and boundary revalidation, and ``types.py`` holds shared generic transformer
+types.
+
+``Compositor`` itself stores no live layer instances, run lifecycle state,
+session state, resources, or handles. Each ``enter(...)`` call creates a fresh
+``CompositorRun`` with new layer instances, direct dependency binding, optional
+snapshot hydration, and the next ``session_snapshot`` after exit.
+``LifecycleState.ACTIVE`` remains internal-only and session snapshots contain
+only ordered layer lifecycle state plus serializable ``runtime_state``.
+
+The facade also keeps true module-level aliases for ``LayerConfigInput`` and
+``LayerProviderInput`` so existing typed direct imports remain supported
+without expanding ``__all__``.
+"""
+
+from .core import Compositor, LayerNode
+from .providers import LayerConfigInput as _LayerConfigInput
+from .providers import LayerFactory, LayerProvider, LayerProviderInput as _LayerProviderInput
+from .run import CompositorRun, LayerRunSlot
+from .schemas import (
+    CompositorConfig,
+    CompositorConfigValue,
+    CompositorSessionSnapshot,
+    CompositorSessionSnapshotValue,
+    LayerNodeConfig,
+    LayerSessionSnapshot,
+)
+from .types import CompositorTransformer, CompositorTransformerKwargs
+
+type LayerConfigInput = _LayerConfigInput
+type LayerProviderInput = _LayerProviderInput
+
+__all__ = [
+    "Compositor",
+    "CompositorConfig",
+    "CompositorConfigValue",
+    "CompositorRun",
+    "CompositorSessionSnapshot",
+    "CompositorSessionSnapshotValue",
+    "CompositorTransformer",
+    "CompositorTransformerKwargs",
+    "LayerFactory",
+    "LayerNode",
+    "LayerNodeConfig",
+    "LayerProvider",
+    "LayerRunSlot",
+    "LayerSessionSnapshot",
+]
diff --git a/dify-agent/src/agenton/compositor/core.py b/dify-agent/src/agenton/compositor/core.py
new file mode 100644
index 0000000000..355b143356
--- /dev/null
+++ b/dify-agent/src/agenton/compositor/core.py
@@ -0,0 +1,308 @@
+"""Stateless compositor graph plans and run construction.
+
+``Compositor`` stores only reusable graph nodes and optional aggregation
+transformers. Each ``enter(...)`` call validates node-name keyed configs before
+any provider factory runs, optionally validates and hydrates a session snapshot,
+creates fresh layer instances, binds direct dependencies, and returns a new
+``CompositorRun`` for that invocation only.
+
+``Compositor.from_config(...)`` resolves serializable provider type ids rather
+than import paths. Named ``node_providers`` override type-id providers for the
+same graph node without passing graph node data into factories. Session
+snapshots must list layer names in compositor order so runtime state can be
+hydrated deterministically.
+"""
+
+from collections import OrderedDict
+from collections.abc import AsyncIterator, Mapping, Sequence
+from contextlib import asynccontextmanager
+from dataclasses import dataclass
+from typing import Any, Generic, cast
+
+from pydantic import JsonValue
+
+from agenton.layers.base import Layer, LayerConfig, LifecycleState
+
+from .providers import LayerConfigInput, LayerProvider, LayerProviderInput, _as_layer_provider
+from .run import CompositorRun, LayerRunSlot
+from .schemas import (
+    CompositorConfigValue,
+    CompositorSessionSnapshot,
+    CompositorSessionSnapshotValue,
+    _validate_compositor_config_input,
+    _validate_config_model_input,
+)
+from .types import (
+    CompositorTransformer,
+    LayerPromptT,
+    LayerToolT,
+    LayerUserPromptT,
+    PromptT,
+    ToolT,
+    UserPromptT,
+)
+
+
+@dataclass(frozen=True, slots=True, init=False)
+class LayerNode:
+    """Stateless graph node plan for one named layer provider.
+
+    ``implementation`` may be a layer class or an explicit ``LayerProvider``.
+    ``deps`` maps dependency field names on this node's layer class to other
+    compositor node names. ``metadata`` is graph description data only; it is
+    not passed to provider factories and is never included in session snapshots.
+    """
+
+    name: str
+    provider: LayerProvider[Any]
+    deps: Mapping[str, str]
+    metadata: Mapping[str, JsonValue]
+
+    def __init__(
+        self,
+        name: str,
+        implementation: LayerProviderInput,
+        *,
+        deps: Mapping[str, str] | None = None,
+        metadata: Mapping[str, JsonValue] | None = None,
+    ) -> None:
+        if not name:
+            raise ValueError("Layer node name must not be empty.")
+        object.__setattr__(self, "name", name)
+        object.__setattr__(self, "provider", _as_layer_provider(implementation))
+        object.__setattr__(self, "deps", dict(deps or {}))
+        object.__setattr__(self, "metadata", dict(metadata or {}))
+
+
+class Compositor(Generic[PromptT, ToolT, LayerPromptT, LayerToolT, UserPromptT, LayerUserPromptT]):
+    """Reusable, framework-neutral ordered layer graph plan.
+
+    A compositor stores only immutable graph nodes and provider construction
+    plans. It is safe to enter repeatedly or concurrently because every entry
+    creates a separate ``CompositorRun`` with fresh layer instances, run slots,
+    dependency bindings, and optional hydrated runtime state. Session
+    continuity is explicit: pass the previous ``CompositorSessionSnapshot`` to
+    the next ``enter`` call and read the next one from ``run.session_snapshot``
+    after exit.
+
+    ``prompt_transformer``, ``user_prompt_transformer``, and
+    ``tool_transformer`` are post-aggregation hooks on each run. Use two type
+    arguments for identity aggregation, four when prompt/tool layer item types
+    differ from exposed item types, or all six when user prompt item types also
+    differ.
+    """
+
+    __slots__ = ("_nodes", "prompt_transformer", "tool_transformer", "user_prompt_transformer")
+
+    _nodes: tuple[LayerNode, ...]
+    prompt_transformer: CompositorTransformer[LayerPromptT, PromptT] | None
+    user_prompt_transformer: CompositorTransformer[LayerUserPromptT, UserPromptT] | None
+    tool_transformer: CompositorTransformer[LayerToolT, ToolT] | None
+
+    def __init__(
+        self,
+        nodes: Sequence[LayerNode],
+        *,
+        prompt_transformer: CompositorTransformer[LayerPromptT, PromptT] | None = None,
+        user_prompt_transformer: CompositorTransformer[LayerUserPromptT, UserPromptT] | None = None,
+        tool_transformer: CompositorTransformer[LayerToolT, ToolT] | None = None,
+    ) -> None:
+        self._nodes = tuple(nodes)
+        self.prompt_transformer = prompt_transformer
+        self.user_prompt_transformer = user_prompt_transformer
+        self.tool_transformer = tool_transformer
+        self._validate_nodes()
+
+    @property
+    def nodes(self) -> tuple[LayerNode, ...]:
+        """Return the stateless graph plan nodes in compositor order."""
+        return self._nodes
+
+    @classmethod
+    def from_config(
+        cls,
+        conf: CompositorConfigValue,
+        *,
+        providers: Sequence[LayerProviderInput],
+        node_providers: Mapping[str, LayerProviderInput] | None = None,
+        prompt_transformer: CompositorTransformer[LayerPromptT, PromptT] | None = None,
+        user_prompt_transformer: CompositorTransformer[LayerUserPromptT, UserPromptT] | None = None,
+        tool_transformer: CompositorTransformer[LayerToolT, ToolT] | None = None,
+    ) -> "Compositor[PromptT, ToolT, LayerPromptT, LayerToolT, UserPromptT, LayerUserPromptT]":
+        """Create a reusable compositor plan from serializable graph config.
+
+        ``providers`` resolve graph node ``type`` ids. ``node_providers`` are
+        keyed by graph node name and take precedence over the type-id provider,
+        allowing node-specific construction without passing node data to factory
+        callables.
+        """
+        graph_config = _validate_compositor_config_input(conf)
+        if graph_config.schema_version != 1:
+            raise ValueError(f"Unsupported compositor config schema_version: {graph_config.schema_version}.")
+
+        provider_by_type = _build_provider_type_map(providers)
+        provider_by_node = {name: _as_layer_provider(provider) for name, provider in (node_providers or {}).items()}
+        graph_node_names = {node.name for node in graph_config.layers}
+        unknown_node_providers = provider_by_node.keys() - graph_node_names
+        if unknown_node_providers:
+            names = ", ".join(sorted(unknown_node_providers))
+            raise ValueError(f"node_providers contains unknown layer node names: {names}.")
+
+        nodes: list[LayerNode] = []
+        for node_config in graph_config.layers:
+            provider = provider_by_node.get(node_config.name)
+            if provider is None:
+                try:
+                    provider = provider_by_type[node_config.type]
+                except KeyError as e:
+                    raise KeyError(f"Layer type id '{node_config.type}' is not registered.") from e
+            nodes.append(
+                LayerNode(
+                    node_config.name,
+                    provider,
+                    deps=node_config.deps,
+                    metadata=node_config.metadata,
+                )
+            )
+
+        return cls(
+            nodes,
+            prompt_transformer=prompt_transformer,
+            user_prompt_transformer=user_prompt_transformer,
+            tool_transformer=tool_transformer,
+        )
+
+    @asynccontextmanager
+    async def enter(
+        self,
+        *,
+        configs: Mapping[str, LayerConfigInput] | None = None,
+        session_snapshot: CompositorSessionSnapshotValue | None = None,
+    ) -> AsyncIterator[CompositorRun[PromptT, ToolT, LayerPromptT, LayerToolT, UserPromptT, LayerUserPromptT]]:
+        """Create a fresh run, enter layers in graph order, and yield it.
+
+        Configs are keyed by layer node name and validated before factories run.
+        The optional session snapshot is validated and hydrated before any hook
+        runs. Layers exit in reverse graph order, and ``run.session_snapshot``
+        is populated after exit with the next non-active lifecycle states.
+        """
+        run = self._create_run(configs=configs, session_snapshot=session_snapshot)
+        await run._enter_layers()
+        try:
+            yield run
+        finally:
+            await run._exit_layers()
+
+    def _create_run(
+        self,
+        *,
+        configs: Mapping[str, LayerConfigInput] | None,
+        session_snapshot: CompositorSessionSnapshotValue | None,
+    ) -> CompositorRun[PromptT, ToolT, LayerPromptT, LayerToolT, UserPromptT, LayerUserPromptT]:
+        config_by_name = self._validate_run_configs(configs)
+        typed_config_by_name = self._validate_layer_configs(config_by_name)
+        snapshot = self._validate_session_snapshot(session_snapshot) if session_snapshot is not None else None
+        layer_by_name = self._create_layers(typed_config_by_name)
+
+        snapshot_by_name = (
+            {layer_snapshot.name: layer_snapshot for layer_snapshot in snapshot.layers} if snapshot else {}
+        )
+        lifecycle_by_name: dict[str, LifecycleState] = {}
+        for node in self._nodes:
+            layer = layer_by_name[node.name]
+            layer_snapshot = snapshot_by_name.get(node.name)
+            if layer_snapshot is None:
+                lifecycle_by_name[node.name] = LifecycleState.NEW
+                continue
+            layer.runtime_state = cast(Any, layer.runtime_state_type.model_validate(layer_snapshot.runtime_state))
+            lifecycle_by_name[node.name] = layer_snapshot.lifecycle_state
+
+        self._bind_deps(layer_by_name)
+        return CompositorRun(
+            slots=OrderedDict(
+                (node.name, LayerRunSlot(layer=layer_by_name[node.name], lifecycle_state=lifecycle_by_name[node.name]))
+                for node in self._nodes
+            ),
+            prompt_transformer=self.prompt_transformer,
+            user_prompt_transformer=self.user_prompt_transformer,
+            tool_transformer=self.tool_transformer,
+        )
+
+    def _create_layers(
+        self,
+        config_by_name: Mapping[str, LayerConfig],
+    ) -> OrderedDict[str, Layer[Any, Any, Any, Any, Any, Any]]:
+        return OrderedDict(
+            (node.name, node.provider.create_layer_from_config(config_by_name[node.name])) for node in self._nodes
+        )
+
+    def _validate_layer_configs(self, config_by_name: Mapping[str, LayerConfigInput]) -> dict[str, LayerConfig]:
+        """Validate every node config before any provider factory is invoked."""
+        return {node.name: node.provider.validate_config(config_by_name.get(node.name)) for node in self._nodes}
+
+    def _bind_deps(self, layer_by_name: Mapping[str, Layer[Any, Any, Any, Any, Any, Any]]) -> None:
+        """Resolve dependency-name mappings and bind direct layer dependencies."""
+        for node in self._nodes:
+            layer = layer_by_name[node.name]
+            resolved_deps = {dep_name: layer_by_name[target_name] for dep_name, target_name in node.deps.items()}
+            layer.bind_deps(resolved_deps)
+
+    def _validate_nodes(self) -> None:
+        layer_names: set[str] = set()
+        for node in self._nodes:
+            if node.name in layer_names:
+                raise ValueError(f"Duplicate layer name '{node.name}'.")
+            layer_names.add(node.name)
+
+        for node in self._nodes:
+            declared_deps = node.provider.layer_type.dependency_names()
+            unknown_dep_keys = set(node.deps) - declared_deps
+            if unknown_dep_keys:
+                names = ", ".join(sorted(unknown_dep_keys))
+                raise ValueError(f"Layer '{node.name}' declares unknown dependency keys: {names}.")
+            missing_targets = set(node.deps.values()) - layer_names
+            if missing_targets:
+                names = ", ".join(sorted(missing_targets))
+                raise ValueError(f"Layer '{node.name}' depends on undefined layer names: {names}.")
+
+    def _validate_run_configs(self, configs: Mapping[str, LayerConfigInput] | None) -> dict[str, LayerConfigInput]:
+        config_by_name = dict(configs or {})
+        known_names = {node.name for node in self._nodes}
+        unknown_names = config_by_name.keys() - known_names
+        if unknown_names:
+            names = ", ".join(sorted(unknown_names))
+            raise ValueError(f"Layer configs contain unknown layer node names: {names}.")
+        return config_by_name
+
+    def _validate_session_snapshot(
+        self,
+        snapshot: CompositorSessionSnapshotValue,
+    ) -> CompositorSessionSnapshot:
+        resolved_snapshot = _validate_config_model_input(CompositorSessionSnapshot, snapshot)
+        if resolved_snapshot.schema_version != 1:
+            raise ValueError(
+                f"Unsupported compositor session snapshot schema_version: {resolved_snapshot.schema_version}."
+            )
+        expected_layer_names = tuple(node.name for node in self._nodes)
+        actual_layer_names = tuple(layer.name for layer in resolved_snapshot.layers)
+        if actual_layer_names != expected_layer_names:
+            expected = ", ".join(expected_layer_names)
+            actual = ", ".join(actual_layer_names)
+            raise ValueError(
+                "CompositorSessionSnapshot layer names must match compositor layers in order. "
+                f"Expected [{expected}], got [{actual}]."
+            )
+        return resolved_snapshot
+
+
+def _build_provider_type_map(providers: Sequence[LayerProviderInput]) -> dict[str, LayerProvider[Any]]:
+    provider_by_type: dict[str, LayerProvider[Any]] = {}
+    for provider_input in providers:
+        provider = _as_layer_provider(provider_input)
+        type_id = provider.type_id
+        if type_id is None or not type_id:
+            raise ValueError(f"Layer provider for '{provider.layer_type.__qualname__}' must declare a type_id.")
+        if type_id in provider_by_type:
+            raise ValueError(f"Layer type id '{type_id}' is already registered.")
+        provider_by_type[type_id] = provider
+    return provider_by_type
diff --git a/dify-agent/src/agenton/compositor/providers.py b/dify-agent/src/agenton/compositor/providers.py
new file mode 100644
index 0000000000..7f176cec90
--- /dev/null
+++ b/dify-agent/src/agenton/compositor/providers.py
@@ -0,0 +1,138 @@
+"""Reusable layer providers and fresh-instance validation.
+
+Providers are construction plans, not live runtime owners. They validate raw
+per-enter config into a layer's declared ``config_type`` and then construct a
+fresh layer instance for one invocation. Provider factories receive only typed
+config, never graph node data; node-specific construction belongs in named
+``node_providers`` overrides on ``Compositor.from_config(...)``.
+
+Fresh-instance enforcement is global by weak reference so ``Compositor`` can
+stay stateless while still rejecting reused layer instances before dependency
+binding or lifecycle hooks run.
+"""
+
+from collections.abc import Callable, Mapping
+from typing import Any, Generic, cast
+import weakref
+
+from agenton.layers.base import Layer, LayerConfig, LayerConfigValue
+
+from .schemas import _validate_config_model_input
+from .types import LayerT
+
+type LayerConfigInput = LayerConfigValue | Mapping[str, object] | str | bytes | None
+type LayerFactory = Callable[[LayerConfig], Layer[Any, Any, Any, Any, Any, Any]]
+type LayerProviderInput = type[Layer[Any, Any, Any, Any, Any, Any]] | "LayerProvider[Any]"
+
+
+_USED_LAYER_INSTANCE_REFS: dict[int, weakref.ReferenceType[Layer[Any, Any, Any, Any, Any, Any]]] = {}
+
+
+def _claim_fresh_layer_instance(layer: Layer[Any, Any, Any, Any, Any, Any]) -> None:
+    """Reject provider factories that return a layer object used before.
+
+    The registry stores weak references, not live resources or run state. It is
+    intentionally global to keep ``Compositor`` stateless while still enforcing
+    the fresh-instance boundary before dependencies are bound or hooks run.
+    """
+    layer_identity = id(layer)
+    existing_ref = _USED_LAYER_INSTANCE_REFS.get(layer_identity)
+    if existing_ref is not None:
+        existing_layer = existing_ref()
+        if existing_layer is not None:
+            raise ValueError(
+                "LayerProvider factories must return a fresh layer instance for each invocation; "
+                f"got reused instance of '{type(layer).__name__}'."
+            )
+        _USED_LAYER_INSTANCE_REFS.pop(layer_identity, None)
+
+    def remove_ref(ref: weakref.ReferenceType[Layer[Any, Any, Any, Any, Any, Any]]) -> None:
+        if _USED_LAYER_INSTANCE_REFS.get(layer_identity) is ref:
+            _USED_LAYER_INSTANCE_REFS.pop(layer_identity, None)
+
+    _USED_LAYER_INSTANCE_REFS[layer_identity] = weakref.ref(layer, remove_ref)
+
+
+class LayerProvider(Generic[LayerT]):
+    """Validated layer factory for one concrete ``Layer`` class.
+
+    Providers are reusable construction plans. They validate per-call config
+    with ``layer_type.config_type`` before invoking either
+    ``layer_type.from_config`` or a custom factory. The factory receives only
+    typed config, never graph node data, and must return a fresh ``layer_type``
+    instance; reused instances are rejected before dependencies are bound or
+    hooks run.
+    """
+
+    __slots__ = ("_create", "layer_type")
+
+    layer_type: type[LayerT]
+    _create: Callable[[LayerConfig], LayerT]
+
+    def __init__(self, *, layer_type: type[LayerT], create: Callable[[LayerConfig], LayerT]) -> None:
+        self.layer_type = layer_type
+        self._create = create
+
+    @classmethod
+    def from_layer_type(cls, layer_type: type[LayerT]) -> "LayerProvider[LayerT]":
+        """Create a provider that constructs layers via ``layer_type.from_config``."""
+
+        def create(config: LayerConfig) -> LayerT:
+            return layer_type.from_config(cast(Any, config))
+
+        return cls(layer_type=layer_type, create=create)
+
+    @classmethod
+    def from_factory(
+        cls,
+        *,
+        layer_type: type[LayerT],
+        create: Callable[[Any], LayerT],
+    ) -> "LayerProvider[LayerT]":
+        """Create a provider from a custom typed-config factory.
+
+        ``create`` receives the validated instance of ``layer_type.config_type``.
+        It does not receive the graph node; node-specific construction should use
+        a dedicated provider in ``Compositor.from_config(node_providers=...)``.
+        """
+        return cls(layer_type=layer_type, create=cast(Callable[[LayerConfig], LayerT], create))
+
+    @property
+    def type_id(self) -> str | None:
+        """Return the serializable registry type id declared by ``layer_type``."""
+        return self.layer_type.type_id
+
+    def create_layer(self, config: LayerConfigInput = None) -> LayerT:
+        """Validate config, call the factory, and return a fresh layer instance."""
+        typed_config = self.validate_config(config)
+        return self.create_layer_from_config(typed_config)
+
+    def validate_config(self, config: LayerConfigInput = None) -> LayerConfig:
+        """Return typed config without invoking the layer factory.
+
+        ``Compositor.enter`` calls this for every node before creating any layer
+        so a later invalid node config cannot leave earlier factory side effects.
+        """
+        raw_config: LayerConfigValue | Mapping[str, object] | str | bytes = {} if config is None else config
+        return _validate_config_model_input(self.layer_type.config_type, raw_config)
+
+    def create_layer_from_config(self, config: LayerConfig) -> LayerT:
+        """Call the factory with validated config and enforce fresh instances."""
+        typed_config = self.validate_config(config)
+        layer = self._create(typed_config)
+        if not isinstance(layer, self.layer_type):
+            raise TypeError(
+                f"LayerProvider for '{self.layer_type.__name__}' returned '{type(layer).__name__}', "
+                f"expected '{self.layer_type.__name__}'."
+            )
+        _claim_fresh_layer_instance(layer)
+        layer.config = cast(Any, typed_config)
+        return layer
+
+
+def _as_layer_provider(implementation: LayerProviderInput) -> LayerProvider[Any]:
+    if isinstance(implementation, LayerProvider):
+        return implementation
+    if isinstance(implementation, type) and issubclass(implementation, Layer):
+        return LayerProvider.from_layer_type(implementation)
+    raise TypeError("LayerNode implementation must be a Layer subclass or LayerProvider.")
diff --git a/dify-agent/src/agenton/compositor/run.py b/dify-agent/src/agenton/compositor/run.py
new file mode 100644
index 0000000000..a50e017736
--- /dev/null
+++ b/dify-agent/src/agenton/compositor/run.py
@@ -0,0 +1,221 @@
+"""Active compositor run lifecycle, snapshots, and aggregation.
+
+``CompositorRun`` is the only compositor object that exposes live layer
+instances. It owns invocation-local lifecycle state, per-layer exit intent, and
+the next ``session_snapshot`` after exit. Layers enter in graph order and exit
+in reverse graph order. Prompt aggregation preserves graph ordering: prefix
+prompts first-to-last, suffix prompts last-to-first, user prompts first-to-last,
+and tools in graph order.
+
+Prompt, user prompt, and tool transformers run only after layer-level wrapping
+and run-level aggregation. When no transformer is installed, the wrapped items
+are returned unchanged.
+"""
+
+from collections import OrderedDict
+from collections.abc import Sequence
+from dataclasses import dataclass
+from typing import Any, Generic, cast, overload
+
+from pydantic import JsonValue
+
+from agenton.layers.base import ExitIntent, Layer, LifecycleState
+
+from .schemas import CompositorSessionSnapshot, LayerSessionSnapshot
+from .types import (
+    CompositorTransformer,
+    LayerPromptT,
+    LayerT,
+    LayerToolT,
+    LayerUserPromptT,
+    PromptT,
+    ToolT,
+    UserPromptT,
+)
+
+
+@dataclass(slots=True)
+class LayerRunSlot:
+    """Invocation-local lifecycle and exit state for one fresh layer instance."""
+
+    layer: Layer[Any, Any, Any, Any, Any, Any]
+    lifecycle_state: LifecycleState
+    exit_intent: ExitIntent = ExitIntent.DELETE
+
+
+@dataclass(slots=True)
+class CompositorRun(Generic[PromptT, ToolT, LayerPromptT, LayerToolT, UserPromptT, LayerUserPromptT]):
+    """Single-invocation runtime object created by ``Compositor.enter``.
+
+    The run owns ordered ``LayerRunSlot`` objects and the fresh layers inside
+    them. It is the only object that exposes live layers, lifecycle state, exit
+    intent, and prompt/user-prompt/tool aggregation for an active invocation.
+    After context exit, ``session_snapshot`` contains the next cross-call state.
+    """
+
+    slots: OrderedDict[str, LayerRunSlot]
+    prompt_transformer: CompositorTransformer[LayerPromptT, PromptT] | None = None
+    user_prompt_transformer: CompositorTransformer[LayerUserPromptT, UserPromptT] | None = None
+    tool_transformer: CompositorTransformer[LayerToolT, ToolT] | None = None
+    session_snapshot: CompositorSessionSnapshot | None = None
+
+    @overload
+    def get_layer(self, name: str) -> Layer[Any, Any, Any, Any, Any, Any]: ...
+
+    @overload
+    def get_layer(self, name: str, layer_type: type[LayerT]) -> LayerT: ...
+
+    def get_layer(
+        self,
+        name: str,
+        layer_type: type[LayerT] | None = None,
+    ) -> Layer[Any, Any, Any, Any, Any, Any] | LayerT:
+        """Return a live layer by node name and optionally validate its type."""
+        try:
+            layer = self.slots[name].layer
+        except KeyError as e:
+            raise KeyError(f"Layer '{name}' is not defined in this compositor run.") from e
+
+        if layer_type is not None and not isinstance(layer, layer_type):
+            raise TypeError(f"Layer '{name}' must be {layer_type.__name__}, got {type(layer).__name__}.")
+        return layer
+
+    def suspend_on_exit(self) -> None:
+        """Request suspend behavior for every active layer when the run exits."""
+        for name in self.slots:
+            self.suspend_layer_on_exit(name)
+
+    def delete_on_exit(self) -> None:
+        """Request delete behavior for every active layer when the run exits."""
+        for name in self.slots:
+            self.delete_layer_on_exit(name)
+
+    def suspend_layer_on_exit(self, name: str) -> None:
+        """Request suspend behavior for one active layer when the run exits."""
+        self._set_layer_exit_intent(name, ExitIntent.SUSPEND)
+
+    def delete_layer_on_exit(self, name: str) -> None:
+        """Request delete behavior for one active layer when the run exits."""
+        self._set_layer_exit_intent(name, ExitIntent.DELETE)
+
+    def snapshot_session(self) -> CompositorSessionSnapshot:
+        """Snapshot non-active layer lifecycle state and runtime state from this run."""
+        active_layers = [name for name, slot in self.slots.items() if slot.lifecycle_state is LifecycleState.ACTIVE]
+        if active_layers:
+            names = ", ".join(active_layers)
+            raise RuntimeError(f"Cannot snapshot active compositor run layers: {names}.")
+        return CompositorSessionSnapshot(
+            layers=[
+                LayerSessionSnapshot(
+                    name=name,
+                    lifecycle_state=slot.lifecycle_state,
+                    runtime_state=cast(dict[str, JsonValue], slot.layer.runtime_state.model_dump(mode="json")),
+                )
+                for name, slot in self.slots.items()
+            ]
+        )
+
+    async def _enter_layers(self) -> None:
+        self._ensure_layers_can_enter()
+        entered_slots: list[LayerRunSlot] = []
+        try:
+            for slot in self.slots.values():
+                await self._enter_slot(slot)
+                entered_slots.append(slot)
+        except BaseException as enter_error:
+            hook_error = await self._exit_slots_reversed(entered_slots)
+            self.session_snapshot = self.snapshot_session()
+            if hook_error is not None:
+                raise hook_error from enter_error
+            raise
+
+    async def _exit_layers(self) -> None:
+        hook_error = await self._exit_slots_reversed(list(self.slots.values()))
+        self.session_snapshot = self.snapshot_session()
+        if hook_error is not None:
+            raise hook_error
+
+    async def _enter_slot(self, slot: LayerRunSlot) -> None:
+        if slot.lifecycle_state is LifecycleState.NEW:
+            slot.exit_intent = ExitIntent.DELETE
+            await slot.layer.on_context_create()
+            slot.lifecycle_state = LifecycleState.ACTIVE
+            return
+        if slot.lifecycle_state is LifecycleState.SUSPENDED:
+            slot.exit_intent = ExitIntent.DELETE
+            await slot.layer.on_context_resume()
+            slot.lifecycle_state = LifecycleState.ACTIVE
+            return
+        raise RuntimeError(f"Cannot enter layer from lifecycle state '{slot.lifecycle_state}'.")
+
+    async def _exit_slots_reversed(self, slots: Sequence[LayerRunSlot]) -> BaseException | None:
+        hook_error: BaseException | None = None
+        for slot in reversed(slots):
+            if slot.lifecycle_state is not LifecycleState.ACTIVE:
+                continue
+            if slot.exit_intent is ExitIntent.SUSPEND:
+                try:
+                    await slot.layer.on_context_suspend()
+                except BaseException as exc:
+                    hook_error = hook_error or exc
+                finally:
+                    slot.lifecycle_state = LifecycleState.SUSPENDED
+            else:
+                try:
+                    await slot.layer.on_context_delete()
+                except BaseException as exc:
+                    hook_error = hook_error or exc
+                finally:
+                    slot.lifecycle_state = LifecycleState.CLOSED
+
+        return hook_error
+
+    def _set_layer_exit_intent(self, name: str, intent: ExitIntent) -> None:
+        try:
+            slot = self.slots[name]
+        except KeyError as e:
+            raise KeyError(f"Layer '{name}' is not defined in this compositor run.") from e
+        if slot.lifecycle_state is not LifecycleState.ACTIVE:
+            raise RuntimeError("Layer exit intent can only be changed while the run slot is active.")
+        slot.exit_intent = intent
+
+    def _ensure_layers_can_enter(self) -> None:
+        """Reject invalid external lifecycle states before any layer side effects."""
+        for name, slot in self.slots.items():
+            if slot.lifecycle_state is LifecycleState.ACTIVE:
+                raise RuntimeError(f"Layer '{name}' is already active; ACTIVE snapshots are not allowed.")
+            if slot.lifecycle_state is LifecycleState.CLOSED:
+                raise RuntimeError(f"Layer '{name}' is closed; CLOSED snapshots cannot be entered.")
+
+    @property
+    def prompts(self) -> list[PromptT]:
+        result: list[LayerPromptT] = []
+        for slot in self.slots.values():
+            layer = slot.layer
+            result.extend(cast(LayerPromptT, layer.wrap_prompt(prompt)) for prompt in layer.prefix_prompts)
+        for slot in reversed(self.slots.values()):
+            layer = slot.layer
+            result.extend(cast(LayerPromptT, layer.wrap_prompt(prompt)) for prompt in layer.suffix_prompts)
+        if self.prompt_transformer is None:
+            return cast(list[PromptT], result)
+        return list(self.prompt_transformer(result))
+
+    @property
+    def user_prompts(self) -> list[UserPromptT]:
+        result: list[LayerUserPromptT] = []
+        for slot in self.slots.values():
+            layer = slot.layer
+            result.extend(cast(LayerUserPromptT, layer.wrap_user_prompt(prompt)) for prompt in layer.user_prompts)
+        if self.user_prompt_transformer is None:
+            return cast(list[UserPromptT], result)
+        return list(self.user_prompt_transformer(result))
+
+    @property
+    def tools(self) -> list[ToolT]:
+        result: list[LayerToolT] = []
+        for slot in self.slots.values():
+            layer = slot.layer
+            result.extend(cast(LayerToolT, layer.wrap_tool(tool)) for tool in layer.tools)
+        if self.tool_transformer is None:
+            return cast(list[ToolT], result)
+        return list(self.tool_transformer(result))
diff --git a/dify-agent/src/agenton/compositor/schemas.py b/dify-agent/src/agenton/compositor/schemas.py
new file mode 100644
index 0000000000..8b58eaf20e
--- /dev/null
+++ b/dify-agent/src/agenton/compositor/schemas.py
@@ -0,0 +1,112 @@
+"""Serializable compositor DTOs and external boundary validation.
+
+Graph config and session snapshots are separate boundaries on purpose. Graph
+config describes only reusable composition state: schema version, ordered node
+names, provider type ids, dependency mappings, and metadata. Session snapshots
+carry only ordered layer lifecycle state plus serializable ``runtime_state``.
+
+External DTOs are revalidated even when callers pass an already-constructed
+Pydantic model instance. These models are mutable, so dumping and validating
+again prevents post-construction mutations from bypassing compositor entry
+validators. ``LifecycleState.ACTIVE`` remains internal-only and is rejected in
+external session snapshots.
+"""
+
+from collections.abc import Mapping
+
+from pydantic import BaseModel, ConfigDict, Field, JsonValue, field_validator
+
+from agenton.layers.base import LifecycleState
+
+type _ConfigModelValue[ModelT: BaseModel] = ModelT | JsonValue | str | bytes
+
+
+def _validate_config_model_input[ModelT: BaseModel](
+    model_type: type[ModelT],
+    value: _ConfigModelValue[ModelT] | Mapping[str, object],
+) -> ModelT:
+    """Validate an external DTO boundary, including existing model instances.
+
+    Pydantic models in this package are generally mutable and do not all enable
+    assignment validation. Revalidating existing instances through their dumped
+    data prevents post-construction mutations from bypassing config or snapshot
+    validators at compositor entry boundaries.
+    """
+    if isinstance(value, BaseModel):
+        return model_type.model_validate(value.model_dump(mode="python", warnings=False))
+    if isinstance(value, str | bytes):
+        return model_type.model_validate_json(value)
+
+    return model_type.model_validate(value)
+
+
+class LayerNodeConfig(BaseModel):
+    """Serializable config for one provider-backed layer graph node.
+
+    Nodes intentionally contain no runtime state and no per-call layer config.
+    Runtime state belongs to session snapshots; layer config belongs to
+    ``Compositor.enter(configs=...)`` keyed by node name.
+    """
+
+    name: str
+    type: str
+    deps: Mapping[str, str] = Field(default_factory=dict)
+    metadata: Mapping[str, JsonValue] = Field(default_factory=dict)
+
+    model_config = ConfigDict(extra="forbid")
+
+
+class CompositorConfig(BaseModel):
+    """Serializable config for constructing a reusable compositor graph plan."""
+
+    schema_version: int = 1
+    layers: list[LayerNodeConfig]
+
+    model_config = ConfigDict(extra="forbid")
+
+
+type CompositorConfigValue = _ConfigModelValue[CompositorConfig] | Mapping[str, object]
+
+
+def _validate_compositor_config_input(value: CompositorConfigValue) -> CompositorConfig:
+    """Validate external graph config input for ``Compositor.from_config``."""
+    return _validate_config_model_input(CompositorConfig, value)
+
+
+class LayerSessionSnapshot(BaseModel):
+    """Serializable snapshot for one layer's state-only invocation data.
+
+    ``runtime_state`` is the only snapshotted mutable layer data. ``ACTIVE`` is
+    rejected here because a running layer cannot be represented safely outside
+    the active compositor entry.
+    """
+
+    name: str
+    lifecycle_state: LifecycleState
+    runtime_state: dict[str, JsonValue]
+
+    model_config = ConfigDict(extra="forbid")
+
+    @field_validator("lifecycle_state")
+    @classmethod
+    def _reject_active_lifecycle(cls, value: LifecycleState) -> LifecycleState:
+        if value is LifecycleState.ACTIVE:
+            raise ValueError("LifecycleState.ACTIVE is internal-only and cannot appear in session snapshots.")
+        return value
+
+
+class CompositorSessionSnapshot(BaseModel):
+    """Serializable compositor session snapshot.
+
+    Snapshots include ordered layer lifecycle state and serializable runtime
+    state only. Live resources, handles, dependencies, prompts, tools, and
+    config are outside Agenton snapshots and are never captured here.
+    """
+
+    schema_version: int = 1
+    layers: list[LayerSessionSnapshot]
+
+    model_config = ConfigDict(extra="forbid")
+
+
+type CompositorSessionSnapshotValue = _ConfigModelValue[CompositorSessionSnapshot] | Mapping[str, object]
diff --git a/dify-agent/src/agenton/compositor/types.py b/dify-agent/src/agenton/compositor/types.py
new file mode 100644
index 0000000000..984dc2014e
--- /dev/null
+++ b/dify-agent/src/agenton/compositor/types.py
@@ -0,0 +1,46 @@
+"""Shared generic compositor types.
+
+This module contains the generic prompt/tool type variables and transformer
+contracts shared by compositor runtime and orchestration modules. It depends
+only on layer base/types modules so higher-level compositor modules can import
+it without creating cycles.
+"""
+
+from collections.abc import Callable, Sequence
+from typing import Any, TypedDict
+
+from typing_extensions import TypeVar
+
+from agenton.layers.base import Layer
+from agenton.layers.types import AllPromptTypes, AllToolTypes, AllUserPromptTypes
+
+PromptT = TypeVar("PromptT", default=AllPromptTypes)
+ToolT = TypeVar("ToolT", default=AllToolTypes)
+LayerPromptT = TypeVar("LayerPromptT", default=AllPromptTypes)
+LayerToolT = TypeVar("LayerToolT", default=AllToolTypes)
+UserPromptT = TypeVar("UserPromptT", default=AllUserPromptTypes)
+LayerUserPromptT = TypeVar("LayerUserPromptT", default=AllUserPromptTypes)
+LayerT = TypeVar("LayerT", bound=Layer[Any, Any, Any, Any, Any, Any])
+
+
+type CompositorTransformer[InputT, OutputT] = Callable[[Sequence[InputT]], Sequence[OutputT]]
+
+
+class CompositorTransformerKwargs[
+    PromptT,
+    ToolT,
+    LayerPromptT,
+    LayerToolT,
+    UserPromptT,
+    LayerUserPromptT,
+](TypedDict):
+    """Keyword arguments that install prompt, user prompt, and tool transformers.
+
+    The required keys intentionally mirror the keyword-only transformer
+    parameters exposed by ``Compositor.__init__`` and
+    ``Compositor.from_config(...)``.
+    """
+
+    prompt_transformer: CompositorTransformer[LayerPromptT, PromptT]
+    user_prompt_transformer: CompositorTransformer[LayerUserPromptT, UserPromptT]
+    tool_transformer: CompositorTransformer[LayerToolT, ToolT]
diff --git a/dify-agent/src/agenton/layers/__init__.py b/dify-agent/src/agenton/layers/__init__.py
new file mode 100644
index 0000000000..bc02a13f0c
--- /dev/null
+++ b/dify-agent/src/agenton/layers/__init__.py
@@ -0,0 +1,66 @@
+"""Layer base classes and typed layer families.
+
+``agenton.layers.base`` owns the framework-neutral ``Layer`` abstraction.
+``agenton.layers.types`` binds the prompt/tool generic slots to specific layer
+families while keeping concrete reusable layers in ``agenton_collections``.
+"""
+
+from agenton.layers.base import (
+    EmptyLayerConfig,
+    EmptyRuntimeState,
+    ExitIntent,
+    Layer,
+    LayerConfig,
+    LayerConfigValue,
+    LayerDeps,
+    LifecycleState,
+    NoLayerDeps,
+)
+from agenton.layers.types import (
+    AllPromptTypes,
+    AllToolTypes,
+    AllUserPromptTypes,
+    PlainLayer,
+    PlainPrompt,
+    PlainPromptType,
+    PlainTool,
+    PlainToolType,
+    PlainUserPrompt,
+    PlainUserPromptType,
+    PydanticAILayer,
+    PydanticAIPrompt,
+    PydanticAIPromptType,
+    PydanticAITool,
+    PydanticAIToolType,
+    PydanticAIUserPrompt,
+    PydanticAIUserPromptType,
+)
+
+__all__ = [
+    "AllPromptTypes",
+    "AllToolTypes",
+    "AllUserPromptTypes",
+    "Layer",
+    "LayerConfig",
+    "LayerConfigValue",
+    "LayerDeps",
+    "LifecycleState",
+    "ExitIntent",
+    "EmptyLayerConfig",
+    "EmptyRuntimeState",
+    "NoLayerDeps",
+    "PlainLayer",
+    "PlainPrompt",
+    "PlainPromptType",
+    "PlainUserPrompt",
+    "PlainUserPromptType",
+    "PlainTool",
+    "PlainToolType",
+    "PydanticAILayer",
+    "PydanticAIPrompt",
+    "PydanticAIPromptType",
+    "PydanticAIUserPrompt",
+    "PydanticAIUserPromptType",
+    "PydanticAITool",
+    "PydanticAIToolType",
+]
diff --git a/dify-agent/src/agenton/layers/base.py b/dify-agent/src/agenton/layers/base.py
new file mode 100644
index 0000000000..c6f26a4dbc
--- /dev/null
+++ b/dify-agent/src/agenton/layers/base.py
@@ -0,0 +1,520 @@
+"""Invocation-scoped core layer abstractions and typed dependency binding.
+
+Agenton core deliberately manages only three concerns: stateless layer graph
+composition, serializable ``runtime_state`` lifecycle, and session snapshots. It
+does not own live resources, process handles, HTTP clients, cleanup stacks, or
+any other non-serializable runtime object. Those belong to application layers or
+integration code outside the core.
+
+Layers declare their dependency shape with
+``Layer[DepsT, PromptT, UserPromptT, ToolT, ConfigT, RuntimeStateT]``.
+``DepsT`` must be a ``LayerDeps`` subclass whose annotated members are concrete
+``Layer`` subclasses or modern optional dependencies such as ``SomeLayer | None``.
+Dependencies are direct layer instance relationships bound onto ``self.deps``
+for one compositor invocation; there is no dependency-control lookup API in the
+core.
+
+``LayerConfig`` is the DTO base for config schemas accepted by layer providers.
+The provider validates raw node-name keyed configs with a layer's
+``config_type`` before constructing the layer and assigning ``self.config``.
+``runtime_state_type`` is the only mutable schema managed by Agenton and the only
+per-layer data included in session snapshots. The base class infers
+``deps_type``, ``config_type``, and ``runtime_state_type`` from generic bases
+when possible, while still allowing subclasses to set them explicitly for
+unusual inheritance patterns.
+
+``Layer`` is an invocation-scoped business object. It owns ``config``, direct
+``deps``, and serializable ``runtime_state`` plus prompt/tool authoring surfaces,
+but it does not own lifecycle state, exit intent, graph owner tokens, entry
+stacks, resources, or cleanup callbacks. ``CompositorRun`` owns lifecycle state
+and exit intent for one entry. ``SessionSnapshot`` objects are the only supported
+cross-call state carrier.
+
+Lifecycle hooks are no-argument business hooks on the layer instance:
+``on_context_create/resume/suspend/delete(self)``. They should read dependencies
+from ``self.deps`` and read or mutate serializable invocation state through
+``self.runtime_state``. Resource acquisition and deterministic cleanup should be
+handled outside Agenton core, for example by integration-specific context
+managers that wrap compositor entry.
+
+``Layer`` is framework-neutral over system prompt, user prompt, and tool item
+types. The native ``prefix_prompts``, ``suffix_prompts``, ``user_prompts``, and
+``tools`` properties are the layer authoring surface. ``wrap_prompt``,
+``wrap_user_prompt``, and ``wrap_tool`` are the compositor aggregation surface;
+typed families such as ``agenton.layers.types.PlainLayer`` implement them to tag
+native values without changing layer implementations.
+"""
+
+from abc import ABC, abstractmethod
+from collections.abc import Mapping, Sequence
+from dataclasses import dataclass
+from enum import StrEnum
+from types import UnionType
+from typing import (
+    Any,
+    ClassVar,
+    Generic,
+    Union,
+    cast,
+    get_args,
+    get_origin,
+    get_type_hints,
+)
+
+from pydantic import BaseModel, ConfigDict, JsonValue, SerializeAsAny
+from typing_extensions import Self, TypeVar
+
+
+_DepsT = TypeVar("_DepsT", bound="LayerDeps")
+_PromptT = TypeVar("_PromptT")
+_UserPromptT = TypeVar("_UserPromptT")
+_ToolT = TypeVar("_ToolT")
+
+
+class LayerConfig(BaseModel):
+    """Base DTO for serializable layer configuration.
+
+    Layer providers validate raw config values with concrete ``LayerConfig``
+    subclasses before constructing a layer for one invocation. Serializable
+    compositor graph config references layer type ids and node metadata only;
+    per-call config travels through ``Compositor.enter(configs=...)``.
+    """
+
+    model_config = ConfigDict(extra="forbid")
+
+
+type LayerConfigValue = JsonValue | SerializeAsAny[LayerConfig]
+
+
+_ConfigT = TypeVar("_ConfigT", bound=LayerConfig, default="EmptyLayerConfig")
+_RuntimeStateT = TypeVar("_RuntimeStateT", bound=BaseModel, default="EmptyRuntimeState")
+
+
+class LayerDeps:
+    """Typed dependency container for a layer.
+
+    Subclasses declare dependency members with annotations. Every annotated
+    member must be a Layer subclass or ``LayerSubclass | None``. Optional deps
+    are always assigned as attributes; missing optional values become ``None``.
+    """
+
+    def __init__(self, **deps: "Layer[Any, Any, Any, Any, Any, Any] | None") -> None:
+        dep_specs = _get_dep_specs(type(self))
+        missing_names = {name for name, spec in dep_specs.items() if not spec.optional} - deps.keys()
+        if missing_names:
+            names = ", ".join(sorted(missing_names))
+            raise ValueError(f"Missing layer dependencies: {names}.")
+
+        unknown_names = deps.keys() - dep_specs.keys()
+        if unknown_names:
+            names = ", ".join(sorted(unknown_names))
+            raise ValueError(f"Unknown layer dependencies: {names}.")
+
+        for name, spec in dep_specs.items():
+            value = deps.get(name)
+            if value is None:
+                if spec.optional:
+                    setattr(self, name, None)
+                    continue
+                raise ValueError(f"Dependency '{name}' is required but not provided.")
+
+            if not isinstance(value, spec.layer_type):
+                raise TypeError(
+                    f"Dependency '{name}' should be of type '{spec.layer_type.__name__}', "
+                    f"but got type '{type(value).__name__}'."
+                )
+            setattr(self, name, value)
+
+
+class NoLayerDeps(LayerDeps):
+    """Dependency container for layers that do not require other layers."""
+
+
+class EmptyLayerConfig(LayerConfig):
+    """Default serializable config schema for layers without config."""
+
+    model_config = ConfigDict(extra="forbid")
+
+
+class EmptyRuntimeState(BaseModel):
+    """Default serializable invocation runtime state schema."""
+
+    model_config = ConfigDict(extra="forbid", validate_assignment=True)
+
+
+class LifecycleState(StrEnum):
+    """Lifecycle state for one run slot.
+
+    ``ACTIVE`` is internal-only. It is used while an invocation is running and
+    must never appear in external session snapshots or hydrated input.
+    """
+
+    NEW = "new"
+    ACTIVE = "active"
+    SUSPENDED = "suspended"
+    CLOSED = "closed"
+
+
+class ExitIntent(StrEnum):
+    """Run-slot exit behavior requested during active invocation."""
+
+    DELETE = "delete"
+    SUSPEND = "suspend"
+
+
+@dataclass(frozen=True, slots=True)
+class LayerDepSpec:
+    """Runtime dependency specification derived from a deps annotation."""
+
+    layer_type: type["Layer[Any, Any, Any, Any, Any, Any]"]
+    optional: bool = False
+
+
+class Layer(
+    ABC,
+    Generic[_DepsT, _PromptT, _UserPromptT, _ToolT, _ConfigT, _RuntimeStateT],
+):
+    """Framework-neutral base class for prompt/tool layers.
+
+    A layer instance is invocation-scoped mutable business state, not a reusable
+    cross-session definition. ``CompositorRun`` creates fresh instances through
+    layer providers, assigns validated ``config``, binds direct dependency layer
+    instances to ``deps``, hydrates ``runtime_state`` from an optional session
+    snapshot, and then runs no-argument lifecycle hooks. The run owns lifecycle
+    state and exit intent; layers never expose a public entry context manager.
+
+    Live resources and handles are intentionally outside this abstraction. Only
+    ``runtime_state`` is managed and snapshotted by Agenton core. Lifecycle hooks
+    should operate on ``self`` and keep any non-serializable cleanup policy in
+    integration code that wraps the compositor.
+    """
+
+    deps_type: type[_DepsT]
+    config: _ConfigT
+    deps: _DepsT
+    runtime_state: _RuntimeStateT
+    type_id: ClassVar[str | None] = None
+    config_type: ClassVar[type[LayerConfig]] = EmptyLayerConfig
+    runtime_state_type: ClassVar[type[BaseModel]] = EmptyRuntimeState
+
+    def __new__(cls, *args: object, **kwargs: object) -> Self:
+        instance = cast(Self, super().__new__(cls))
+        runtime_state_type = getattr(cls, "runtime_state_type", None)
+        if isinstance(runtime_state_type, type) and issubclass(runtime_state_type, BaseModel):
+            instance.runtime_state = cast(Any, runtime_state_type.model_validate({}))
+        return instance
+
+    def __init_subclass__(cls) -> None:
+        super().__init_subclass__()
+        is_generic_template = _is_generic_layer_template(cls)
+        deps_type = cls.__dict__.get("deps_type")
+        if deps_type is None:
+            deps_type = _infer_deps_type(cls) or getattr(cls, "deps_type", None)
+            if deps_type is None and is_generic_template:
+                return
+            if deps_type is not None:
+                cls.deps_type = deps_type  # pyright: ignore[reportAttributeAccessIssue]
+        if deps_type is None:
+            raise TypeError(f"{cls.__name__} must define deps_type or inherit from Layer[DepsT].")
+        if not isinstance(deps_type, type) or not issubclass(deps_type, LayerDeps):
+            raise TypeError(f"{cls.__name__}.deps_type must be a LayerDeps subclass.")
+        _get_dep_specs(deps_type)
+        _init_config_type(cls, _infer_config_type(cls))
+        _init_schema_type(
+            cls,
+            "runtime_state_type",
+            _infer_schema_type(cls, 5, "runtime_state_type"),
+            EmptyRuntimeState,
+        )
+
+    @classmethod
+    def from_config(cls: type[Self], config: _ConfigT) -> Self:
+        """Create a layer from schema-validated serialized config.
+
+        ``LayerProvider.from_layer_type`` validates raw config with
+        ``config_type`` before calling this method. Layers without config use the
+        default no-argument construction path. Layers with a concrete config
+        schema should override this method and consume the typed Pydantic model.
+        """
+        if cls.config_type is not EmptyLayerConfig:
+            raise TypeError(f"{cls.__name__} cannot be created from config; override from_config or use a provider.")
+        EmptyLayerConfig.model_validate(config)
+        try:
+            return cast(Self, cls())
+        except TypeError as e:
+            raise TypeError(f"{cls.__name__} cannot be created from empty config; use a custom provider.") from e
+
+    @classmethod
+    def dependency_names(cls) -> frozenset[str]:
+        """Return dependency field names declared by this layer's deps schema."""
+        return frozenset(_get_dep_specs(cls.deps_type))
+
+    def bind_deps(self, deps: Mapping[str, "Layer[Any, Any, Any, Any, Any, Any] | None"]) -> None:
+        """Bind this layer's declared dependencies from a name-to-layer mapping.
+
+        The mapping may include more layers than the declared dependency fields.
+        Only names declared by ``deps_type`` are selected and validated. Missing
+        optional deps are bound as ``None``. Bound values are direct layer
+        instances for this invocation graph.
+        """
+        resolved_deps: dict[str, Layer[Any, Any, Any, Any, Any, Any] | None] = {}
+        for name, spec in _get_dep_specs(self.deps_type).items():
+            if name not in deps:
+                if spec.optional:
+                    resolved_deps[name] = None
+                    continue
+                raise ValueError(f"Dependency '{name}' is required for layer '{type(self).__name__}' but not provided.")
+            resolved_deps[name] = deps[name]
+        self.deps = self.deps_type(**resolved_deps)
+
+    async def on_context_create(self) -> None:
+        """Run when the run slot enters from ``LifecycleState.NEW``."""
+
+    async def on_context_delete(self) -> None:
+        """Run when the run slot exits with ``ExitIntent.DELETE``."""
+
+    async def on_context_suspend(self) -> None:
+        """Run when the run slot exits with ``ExitIntent.SUSPEND``."""
+
+    async def on_context_resume(self) -> None:
+        """Run when the run slot enters from ``LifecycleState.SUSPENDED``."""
+
+    @property
+    def prefix_prompts(self) -> Sequence[_PromptT]:
+        return []
+
+    @property
+    def suffix_prompts(self) -> Sequence[_PromptT]:
+        return []
+
+    @property
+    def user_prompts(self) -> Sequence[_UserPromptT]:
+        return []
+
+    @property
+    def tools(self) -> Sequence[_ToolT]:
+        return []
+
+    @abstractmethod
+    def wrap_prompt(self, prompt: _PromptT) -> object:
+        """Wrap a native prompt item for run-level aggregation."""
+        raise NotImplementedError
+
+    @abstractmethod
+    def wrap_user_prompt(self, prompt: _UserPromptT) -> object:
+        """Wrap a native user prompt item for run-level aggregation."""
+        raise NotImplementedError
+
+    @abstractmethod
+    def wrap_tool(self, tool: _ToolT) -> object:
+        """Wrap a native tool item for run-level aggregation."""
+        raise NotImplementedError
+
+
+def _get_dep_specs(deps_type: type[LayerDeps]) -> dict[str, LayerDepSpec]:
+    dep_specs: dict[str, LayerDepSpec] = {}
+    for name, annotation in get_type_hints(deps_type).items():
+        spec = _as_dep_spec(annotation)
+        if spec is None:
+            raise TypeError(
+                f"{deps_type.__name__}.{name} must be annotated with a Layer subclass or Layer subclass | None."
+            )
+        dep_specs[name] = spec
+    return dep_specs
+
+
+def _as_dep_spec(annotation: object) -> LayerDepSpec | None:
+    origin = get_origin(annotation)
+    args = get_args(annotation)
+    if origin in (UnionType, Union) and len(args) == 2 and type(None) in args:
+        layer_annotation = args[0] if args[1] is type(None) else args[1]
+        layer_type = _as_layer_type(layer_annotation)
+        if layer_type is None:
+            return None
+        return LayerDepSpec(layer_type=layer_type, optional=True)
+
+    layer_type = _as_layer_type(annotation)
+    if layer_type is None:
+        return None
+    return LayerDepSpec(layer_type=layer_type)
+
+
+def _as_layer_type(annotation: object) -> type[Layer[Any, Any, Any, Any, Any, Any]] | None:
+    runtime_type = get_origin(annotation) or annotation
+    if isinstance(runtime_type, type) and issubclass(runtime_type, Layer):
+        return cast(type[Layer[Any, Any, Any, Any, Any, Any]], runtime_type)
+    return None
+
+
+def _infer_deps_type(layer_type: type[Layer[Any, Any, Any, Any, Any, Any]]) -> type[LayerDeps] | None:
+    inferred = _infer_layer_generic_arg(layer_type, 0, {})
+    if inferred is None:
+        return None
+    return _as_deps_type(inferred)
+
+
+def _infer_schema_type(
+    layer_type: type[Layer[Any, Any, Any, Any, Any, Any]],
+    index: int,
+    attr_name: str,
+) -> type[BaseModel] | None:
+    inferred = _infer_schema_generic_arg(layer_type, attr_name, {}) or _infer_layer_generic_arg(layer_type, index, {})
+    if inferred is None:
+        return None
+    schema_type = _as_model_type(inferred)
+    if schema_type is None:
+        raise TypeError(f"{layer_type.__name__}.{attr_name} must be a Pydantic BaseModel subclass.")
+    return schema_type
+
+
+def _infer_config_type(layer_type: type[Layer[Any, Any, Any, Any, Any, Any]]) -> type[LayerConfig] | None:
+    inferred = _infer_schema_generic_arg(layer_type, "config_type", {}) or _infer_layer_generic_arg(layer_type, 4, {})
+    if inferred is None:
+        return None
+    config_type = _as_config_type(inferred)
+    if config_type is None:
+        raise TypeError(f"{layer_type.__name__}.config_type must be a LayerConfig subclass.")
+    return config_type
+
+
+def _infer_schema_generic_arg(
+    layer_type: type[Layer[Any, Any, Any, Any, Any, Any]],
+    attr_name: str,
+    substitutions: Mapping[object, object],
+) -> object | None:
+    """Infer schema type arguments exposed by typed layer family bases."""
+    expected_names = {
+        "config_type": {"ConfigT", "_ConfigT"},
+        "runtime_state_type": {"RuntimeStateT", "_RuntimeStateT"},
+    }[attr_name]
+    for base in getattr(layer_type, "__orig_bases__", ()):
+        origin = get_origin(base) or base
+        args = tuple(_substitute_type(arg, substitutions) for arg in get_args(base))
+        if not isinstance(origin, type) or not issubclass(origin, Layer):
+            continue
+
+        params = _generic_params(origin)
+        for param, arg in zip(params, args):
+            if getattr(param, "__name__", None) in expected_names:
+                return arg
+
+        next_substitutions = dict(substitutions)
+        next_substitutions.update(_generic_arg_substitutions(origin, args))
+        inferred = _infer_schema_generic_arg(origin, attr_name, next_substitutions)
+        if inferred is not None:
+            return inferred
+    return None
+
+
+def _infer_layer_generic_arg(
+    layer_type: type[Layer[Any, Any, Any, Any, Any, Any]],
+    index: int,
+    substitutions: Mapping[object, object],
+) -> object | None:
+    """Infer one concrete ``Layer`` generic argument through inheritance.
+
+    This walks through intermediate generic base classes so subclasses can omit
+    explicit class attributes in common cases such as ``class X(Base[YDeps])``.
+    """
+    for base in getattr(layer_type, "__orig_bases__", ()):
+        origin = get_origin(base) or base
+        args = tuple(_substitute_type(arg, substitutions) for arg in get_args(base))
+        if origin is Layer:
+            if len(args) <= index:
+                continue
+            return args[index]
+
+        if not isinstance(origin, type) or not issubclass(origin, Layer):
+            continue
+
+        next_substitutions = dict(substitutions)
+        next_substitutions.update(_generic_arg_substitutions(origin, args))
+        inferred = _infer_layer_generic_arg(origin, index, next_substitutions)
+        if inferred is not None:
+            return inferred
+    return None
+
+
+def _init_schema_type(
+    layer_type: type[Layer[Any, Any, Any, Any, Any, Any]],
+    attr_name: str,
+    inferred_schema_type: type[BaseModel] | None,
+    default_schema_type: type[BaseModel],
+) -> None:
+    schema_type = layer_type.__dict__.get(attr_name)
+    if schema_type is None:
+        schema_type = inferred_schema_type or getattr(layer_type, attr_name, default_schema_type)
+        setattr(layer_type, attr_name, schema_type)
+    if not isinstance(schema_type, type) or not issubclass(schema_type, BaseModel):
+        raise TypeError(f"{layer_type.__name__}.{attr_name} must be a Pydantic BaseModel subclass.")
+
+
+def _init_config_type(
+    layer_type: type[Layer[Any, Any, Any, Any, Any, Any]],
+    inferred_config_type: type[LayerConfig] | None,
+) -> None:
+    config_type = layer_type.__dict__.get("config_type")
+    if config_type is None:
+        config_type = inferred_config_type or getattr(layer_type, "config_type", EmptyLayerConfig)
+        setattr(layer_type, "config_type", config_type)
+    if not isinstance(config_type, type) or not issubclass(config_type, LayerConfig):
+        raise TypeError(f"{layer_type.__name__}.config_type must be a LayerConfig subclass.")
+
+
+def _substitute_type(value: object, substitutions: Mapping[object, object]) -> object:
+    if value in substitutions:
+        return substitutions[value]
+
+    origin = get_origin(value)
+    if origin is None:
+        return value
+
+    args = get_args(value)
+    if not args:
+        return value
+
+    substituted_args = tuple(_substitute_type(arg, substitutions) for arg in args)
+    if substituted_args == args:
+        return value
+
+    try:
+        return origin[substituted_args]
+    except TypeError:
+        return value
+
+
+def _generic_arg_substitutions(origin: type[Any], args: Sequence[object]) -> dict[object, object]:
+    params = _generic_params(origin)
+    return dict(zip(params, args))
+
+
+def _generic_params(origin: type[Any]) -> Sequence[object]:
+    params = getattr(origin, "__type_params__", ())
+    if not params:
+        params = getattr(origin, "__parameters__", ())
+    return params
+
+
+def _as_deps_type(value: object) -> type[LayerDeps] | None:
+    runtime_type = get_origin(value) or value
+    if isinstance(runtime_type, type) and issubclass(runtime_type, LayerDeps):
+        return runtime_type
+    return None
+
+
+def _as_model_type(value: object) -> type[BaseModel] | None:
+    runtime_type = get_origin(value) or value
+    if isinstance(runtime_type, type) and issubclass(runtime_type, BaseModel):
+        return runtime_type
+    return None
+
+
+def _as_config_type(value: object) -> type[LayerConfig] | None:
+    runtime_type = get_origin(value) or value
+    if isinstance(runtime_type, type) and issubclass(runtime_type, LayerConfig):
+        return runtime_type
+    return None
+
+
+def _is_generic_layer_template(layer_type: type[Layer[Any, Any, Any, Any, Any, Any]]) -> bool:
+    return bool(getattr(layer_type, "__type_params__", ())) or bool(getattr(layer_type, "__parameters__", ()))
diff --git a/dify-agent/src/agenton/layers/types.py b/dify-agent/src/agenton/layers/types.py
new file mode 100644
index 0000000000..e6133dcd55
--- /dev/null
+++ b/dify-agent/src/agenton/layers/types.py
@@ -0,0 +1,184 @@
+"""Typed layer family definitions.
+
+``Layer`` itself is framework-neutral. This module defines typed layer families
+that bind its system prompt, user prompt, and tool generic slots to concrete
+contracts, such as ordinary strings with plain callable tools or pydantic-ai
+prompt/tool shapes. The families keep the trailing schema generic slots open so
+concrete layers can have ``config_type`` and ``runtime_state_type`` inferred from
+type arguments instead of repeated class attributes. Config schemas use
+``LayerConfig`` so they can also be embedded as
+typed DTOs in serializable compositor config. Agenton core is state-only:
+typed layer families do not expose runtime handle schemas or resource ownership.
+Tagged aggregate aliases cover code paths that can accept any supported
+prompt/tool family without changing the plain and pydantic-ai layer contracts.
+Pydantic-ai names are imported for static analysis only, so ``agenton`` can be
+imported without loading that optional integration at runtime.
+Concrete reusable layers live under ``agenton_collections``.
+"""
+
+from __future__ import annotations
+
+from collections.abc import Callable
+from dataclasses import dataclass, field
+from typing import TYPE_CHECKING, Any, Generic, Literal
+
+from typing_extensions import TypeVar, final, override
+
+if TYPE_CHECKING:
+    from pydantic_ai import Tool
+    from pydantic_ai.messages import UserContent
+    from pydantic_ai.tools import SystemPromptFunc
+
+from pydantic import BaseModel
+
+from agenton.layers.base import EmptyLayerConfig, EmptyRuntimeState, Layer, LayerConfig, LayerDeps
+
+type PlainPrompt = str
+type PlainUserPrompt = str
+type PlainTool = Callable[..., Any]
+
+
+type PydanticAIPrompt[AgentDepsT] = SystemPromptFunc[AgentDepsT]
+type PydanticAIUserPrompt = UserContent
+type PydanticAITool[AgentDepsT] = Tool[AgentDepsT]
+
+
+@dataclass(frozen=True, slots=True)
+class PlainPromptType:
+    """Tagged plain prompt item for aggregate prompt transformations."""
+
+    value: PlainPrompt
+    kind: Literal["plain"] = field(default="plain", init=False)
+
+
+@dataclass(frozen=True, slots=True)
+class PlainToolType:
+    """Tagged plain tool item for aggregate tool transformations."""
+
+    value: PlainTool
+    kind: Literal["plain"] = field(default="plain", init=False)
+
+
+@dataclass(frozen=True, slots=True)
+class PlainUserPromptType:
+    """Tagged plain user prompt item for aggregate user prompt transformations."""
+
+    value: PlainUserPrompt
+    kind: Literal["plain"] = field(default="plain", init=False)
+
+
+@dataclass(frozen=True, slots=True)
+class PydanticAIPromptType[AgentDepsT]:
+    """Tagged pydantic-ai prompt item for aggregate prompt transformations."""
+
+    value: PydanticAIPrompt[AgentDepsT]
+    kind: Literal["pydantic_ai"] = field(default="pydantic_ai", init=False)
+
+
+@dataclass(frozen=True, slots=True)
+class PydanticAIUserPromptType:
+    """Tagged pydantic-ai user prompt item for aggregate user prompts."""
+
+    value: PydanticAIUserPrompt
+    kind: Literal["pydantic_ai"] = field(default="pydantic_ai", init=False)
+
+
+@dataclass(frozen=True, slots=True)
+class PydanticAIToolType[AgentDepsT]:
+    """Tagged pydantic-ai tool item for aggregate tool transformations."""
+
+    value: PydanticAITool[AgentDepsT]
+    kind: Literal["pydantic_ai"] = field(default="pydantic_ai", init=False)
+
+
+type AllPromptTypes = PlainPromptType | PydanticAIPromptType[Any]
+type AllUserPromptTypes = PlainUserPromptType | PydanticAIUserPromptType
+type AllToolTypes = PlainToolType | PydanticAIToolType[Any]
+
+
+_DepsT = TypeVar("_DepsT", bound=LayerDeps)
+_ConfigT = TypeVar("_ConfigT", bound=LayerConfig, default=EmptyLayerConfig)
+_RuntimeStateT = TypeVar("_RuntimeStateT", bound=BaseModel, default=EmptyRuntimeState)
+_AgentDepsT = TypeVar("_AgentDepsT")
+
+
+class PlainLayer(
+    Generic[_DepsT, _ConfigT, _RuntimeStateT],
+    Layer[
+        _DepsT,
+        PlainPrompt,
+        PlainUserPrompt,
+        PlainTool,
+        _ConfigT,
+        _RuntimeStateT,
+    ],
+):
+    """Layer base for ordinary string prompts and plain-callable tools."""
+
+    @final
+    @override
+    def wrap_prompt(self, prompt: PlainPrompt) -> PlainPromptType:
+        return PlainPromptType(prompt)
+
+    @final
+    @override
+    def wrap_user_prompt(self, prompt: PlainUserPrompt) -> PlainUserPromptType:
+        return PlainUserPromptType(prompt)
+
+    @final
+    @override
+    def wrap_tool(self, tool: PlainTool) -> PlainToolType:
+        return PlainToolType(tool)
+
+
+class PydanticAILayer(
+    Generic[_DepsT, _AgentDepsT, _ConfigT, _RuntimeStateT],
+    Layer[
+        _DepsT,
+        PydanticAIPrompt[_AgentDepsT],
+        PydanticAIUserPrompt,
+        PydanticAITool[_AgentDepsT],
+        _ConfigT,
+        _RuntimeStateT,
+    ],
+):
+    """Layer base for pydantic-ai prompt and tool adapters."""
+
+    @final
+    @override
+    def wrap_prompt(
+        self,
+        prompt: PydanticAIPrompt[_AgentDepsT],
+    ) -> PydanticAIPromptType[_AgentDepsT]:
+        return PydanticAIPromptType(prompt)
+
+    @final
+    @override
+    def wrap_user_prompt(self, prompt: PydanticAIUserPrompt) -> PydanticAIUserPromptType:
+        return PydanticAIUserPromptType(prompt)
+
+    @final
+    @override
+    def wrap_tool(self, tool: PydanticAITool[_AgentDepsT]) -> PydanticAIToolType[_AgentDepsT]:
+        return PydanticAIToolType(tool)
+
+
+__all__ = [
+    "AllPromptTypes",
+    "AllUserPromptTypes",
+    "AllToolTypes",
+    "PlainLayer",
+    "PlainPrompt",
+    "PlainPromptType",
+    "PlainUserPrompt",
+    "PlainUserPromptType",
+    "PlainTool",
+    "PlainToolType",
+    "PydanticAILayer",
+    "PydanticAIPrompt",
+    "PydanticAIPromptType",
+    "PydanticAIUserPrompt",
+    "PydanticAIUserPromptType",
+    "PydanticAITool",
+    "PydanticAIToolType",
+]
diff --git a/dify-agent/src/agenton_collections/__init__.py b/dify-agent/src/agenton_collections/__init__.py
new file mode 100644
index 0000000000..b4b52de993
--- /dev/null
+++ b/dify-agent/src/agenton_collections/__init__.py
@@ -0,0 +1,52 @@
+"""Convenience exports for reusable layer implementations.
+
+Concrete collection layers live in family subpackages such as
+``agenton_collections.layers.plain`` and
+``agenton_collections.layers.pydantic_ai``. The package root keeps short
+client-safe imports for common plain layers while requiring explicit submodule
+imports for pydantic-ai bridge implementations.
+"""
+
+from agenton.layers.types import (
+    AllPromptTypes,
+    AllToolTypes,
+    PlainLayer,
+    PlainPrompt,
+    PlainPromptType,
+    PlainTool,
+    PlainToolType,
+    PydanticAILayer,
+    PydanticAIPrompt,
+    PydanticAIPromptType,
+    PydanticAITool,
+    PydanticAIToolType,
+)
+from agenton_collections.layers.plain import (
+    DynamicToolsLayer,
+    DynamicToolsLayerDeps,
+    ObjectLayer,
+    PromptLayer,
+    ToolsLayer,
+    with_object,
+)
+
+__all__ = [
+    "AllPromptTypes",
+    "AllToolTypes",
+    "DynamicToolsLayer",
+    "DynamicToolsLayerDeps",
+    "ObjectLayer",
+    "PlainLayer",
+    "PlainPrompt",
+    "PlainPromptType",
+    "PlainTool",
+    "PlainToolType",
+    "PromptLayer",
+    "PydanticAILayer",
+    "PydanticAIPrompt",
+    "PydanticAIPromptType",
+    "PydanticAITool",
+    "PydanticAIToolType",
+    "ToolsLayer",
+    "with_object",
+]
diff --git a/dify-agent/src/agenton_collections/layers/plain/__init__.py b/dify-agent/src/agenton_collections/layers/plain/__init__.py
new file mode 100644
index 0000000000..a3e20cc204
--- /dev/null
+++ b/dify-agent/src/agenton_collections/layers/plain/__init__.py
@@ -0,0 +1,25 @@
+"""Reusable collection layers for the plain layer family."""
+
+from agenton_collections.layers.plain.basic import (
+    PLAIN_PROMPT_LAYER_TYPE_ID,
+    ObjectLayer,
+    PromptLayer,
+    PromptLayerConfig,
+    ToolsLayer,
+)
+from agenton_collections.layers.plain.dynamic_tools import (
+    DynamicToolsLayer,
+    DynamicToolsLayerDeps,
+    with_object,
+)
+
+__all__ = [
+    "DynamicToolsLayer",
+    "DynamicToolsLayerDeps",
+    "ObjectLayer",
+    "PLAIN_PROMPT_LAYER_TYPE_ID",
+    "PromptLayer",
+    "PromptLayerConfig",
+    "ToolsLayer",
+    "with_object",
+]
diff --git a/dify-agent/src/agenton_collections/layers/plain/basic.py b/dify-agent/src/agenton_collections/layers/plain/basic.py
new file mode 100644
index 0000000000..aeefd1abf8
--- /dev/null
+++ b/dify-agent/src/agenton_collections/layers/plain/basic.py
@@ -0,0 +1,103 @@
+"""Basic ready-to-compose layers for common plain use cases.
+
+These layers are small concrete implementations built on
+``agenton.layers.types``. They intentionally stay free of compositor graph
+construction so they can be reused from config, examples, and higher-level
+dynamic layers.
+"""
+
+from collections.abc import Callable, Sequence
+from dataclasses import dataclass, field
+from typing import Any, Final
+
+from pydantic import ConfigDict, Field
+from typing_extensions import Self, override
+
+from agenton.layers.base import LayerConfig, NoLayerDeps
+from agenton.layers.types import PlainLayer
+
+
+PLAIN_PROMPT_LAYER_TYPE_ID: Final[str] = "plain.prompt"
+
+
+class PromptLayerConfig(LayerConfig):
+    """Serializable config schema for ``PromptLayer``."""
+
+    prefix: list[str] | str = Field(default_factory=list)
+    user: list[str] | str = Field(default_factory=list)
+    suffix: list[str] | str = Field(default_factory=list)
+
+    model_config = ConfigDict(extra="forbid")
+
+
+@dataclass
+class ObjectLayer[ObjectT](PlainLayer[NoLayerDeps]):
+    """Layer that stores one typed object for downstream dependencies.
+
+    Object layers are instance-only because arbitrary Python objects are not
+    serializable graph config. Add them with a custom ``LayerProvider`` factory
+    that creates a fresh object layer for each compositor run.
+    """
+
+    value: ObjectT
+
+
+@dataclass
+class PromptLayer(PlainLayer[NoLayerDeps, PromptLayerConfig]):
+    """Layer that contributes configured system and user prompt fragments."""
+
+    type_id = PLAIN_PROMPT_LAYER_TYPE_ID
+
+    prefix: list[str] | str = field(default_factory=list)
+    user: list[str] | str = field(default_factory=list)
+    suffix: list[str] | str = field(default_factory=list)
+
+    @classmethod
+    @override
+    def from_config(cls, config: PromptLayerConfig) -> Self:
+        """Create a prompt layer from validated prompt config."""
+        validated_config = PromptLayerConfig.model_validate(config)
+        return cls(prefix=validated_config.prefix, user=validated_config.user, suffix=validated_config.suffix)
+
+    @property
+    def prefix_prompts(self) -> list[str]:
+        if isinstance(self.prefix, str):
+            return [self.prefix]
+        return self.prefix
+
+    @property
+    def suffix_prompts(self) -> list[str]:
+        if isinstance(self.suffix, str):
+            return [self.suffix]
+        return self.suffix
+
+    @property
+    def user_prompts(self) -> list[str]:
+        if isinstance(self.user, str):
+            return [self.user]
+        return self.user
+
+
+@dataclass
+class ToolsLayer(PlainLayer[NoLayerDeps]):
+    """Layer that contributes configured plain-callable tools.
+
+    Tool layers are instance-only because Python callables are live objects. Add
+    them with a custom ``LayerProvider`` factory that returns a fresh layer for
+    each compositor run.
+    """
+
+    tool_entries: Sequence[Callable[..., Any]] = ()
+
+    @property
+    def tools(self) -> list[Callable[..., Any]]:
+        return list(self.tool_entries)
+
+
+__all__ = [
+    "ObjectLayer",
+    "PLAIN_PROMPT_LAYER_TYPE_ID",
+    "PromptLayerConfig",
+    "PromptLayer",
+    "ToolsLayer",
+]
diff --git a/dify-agent/src/agenton_collections/layers/plain/dynamic_tools.py b/dify-agent/src/agenton_collections/layers/plain/dynamic_tools.py
new file mode 100644
index 0000000000..12c78990a3
--- /dev/null
+++ b/dify-agent/src/agenton_collections/layers/plain/dynamic_tools.py
@@ -0,0 +1,232 @@
+"""Dynamic plain-tool layer with object-bound tool entries.
+
+This module builds on ``ObjectLayer`` from ``agenton_collections.plain.basic``.
+Plain callables are exposed unchanged, while entries wrapped with
+``with_object`` bind the current object value into the first callable argument
+and expose the remaining parameters as the public tool signature.
+"""
+
+from collections.abc import Callable, Sequence
+from dataclasses import dataclass
+from functools import wraps
+from inspect import Parameter, Signature, iscoroutinefunction, signature
+from types import UnionType
+from typing import (
+    Annotated,
+    Any,
+    Concatenate,
+    Union,
+    get_args,
+    get_origin,
+    get_type_hints,
+)
+
+from agenton.layers.base import LayerDeps
+from agenton.layers.types import PlainLayer
+from agenton_collections.layers.plain.basic import ObjectLayer
+
+type _ObjectToolCallable[ObjectT] = Callable[Concatenate[ObjectT, ...], Any]
+
+
+@dataclass(frozen=True, slots=True)
+class _ObjectToolEntry[ObjectT]:
+    """Tool entry whose first argument should be filled from ``ObjectLayer``."""
+
+    tool_entry: _ObjectToolCallable[ObjectT]
+    object_type: type[ObjectT] | None = None
+
+
+type _DynamicToolEntry[ObjectT] = Callable[..., Any] | _ObjectToolEntry[ObjectT]
+
+
+def with_object[ObjectT](
+    object_type: type[ObjectT],
+    /,
+) -> Callable[[_ObjectToolCallable[ObjectT]], _ObjectToolEntry[ObjectT]]:
+    """Mark a tool as requiring the bound object value as its first argument."""
+
+    def decorator(tool_entry: _ObjectToolCallable[ObjectT]) -> _ObjectToolEntry[ObjectT]:
+        _validate_object_tool_annotation(tool_entry, object_type)
+        return _ObjectToolEntry(tool_entry=tool_entry, object_type=object_type)
+
+    return decorator
+
+
+class DynamicToolsLayerDeps[ObjectT](LayerDeps):
+    """Dependencies required by ``DynamicToolsLayer``."""
+
+    object_layer: ObjectLayer[ObjectT]  # pyright: ignore[reportUninitializedInstanceVariable]
+
+
+@dataclass
+class DynamicToolsLayer[ObjectT](PlainLayer[DynamicToolsLayerDeps[ObjectT]]):
+    """Layer that exposes plain tools and object-bound tools."""
+
+    tool_entries: Sequence[_DynamicToolEntry[ObjectT]] = ()
+
+    @property
+    def tools(self) -> list[Callable[..., Any]]:
+        object_value = self.deps.object_layer.value
+        return [
+            _bind_object_argument(tool_entry.tool_entry, object_value, tool_entry.object_type)
+            if isinstance(tool_entry, _ObjectToolEntry)
+            else tool_entry
+            for tool_entry in self.tool_entries
+        ]
+
+
+def _bind_object_argument[ObjectT](
+    tool_entry: _ObjectToolCallable[ObjectT],
+    object_value: ObjectT,
+    object_type: type[ObjectT] | None,
+) -> Callable[..., Any]:
+    _validate_object_value(tool_entry, object_value, object_type)
+    if iscoroutinefunction(tool_entry):
+        wrapped = _async_object_wrapper(tool_entry, object_value)
+    else:
+        wrapped = _sync_object_wrapper(tool_entry, object_value)
+
+    public_signature = _public_tool_signature(tool_entry)
+    if public_signature is not None:
+        setattr(wrapped, "__signature__", public_signature)
+    _set_public_annotations(wrapped, tool_entry)
+    return wrapped
+
+
+def _validate_object_tool_annotation[ObjectT](
+    tool_entry: _ObjectToolCallable[ObjectT],
+    object_type: type[ObjectT],
+) -> None:
+    parameter = _first_object_parameter(tool_entry)
+    if parameter is None:
+        return
+
+    annotation = _parameter_annotation(tool_entry, parameter)
+    if annotation is Parameter.empty:
+        return
+    if _annotation_accepts_object_type(annotation, object_type):
+        return
+
+    raise TypeError(
+        f"Object-bound tool '{_tool_name(tool_entry)}' first parameter should accept '{_type_name(object_type)}'."
+    )
+
+
+def _first_object_parameter(tool_entry: Callable[..., Any]) -> Parameter | None:
+    try:
+        tool_signature = signature(tool_entry)
+    except (TypeError, ValueError):
+        return None
+
+    parameters = list(tool_signature.parameters.values())
+    if not parameters:
+        raise ValueError("Dynamic tools must accept the object dependency as their first parameter.")
+    return parameters[0]
+
+
+def _parameter_annotation(tool_entry: Callable[..., Any], parameter: Parameter) -> object:
+    try:
+        type_hints = get_type_hints(tool_entry, include_extras=True)
+    except (AttributeError, NameError, TypeError):
+        return parameter.annotation
+    return type_hints.get(parameter.name, parameter.annotation)
+
+
+def _annotation_accepts_object_type(annotation: object, object_type: type[Any]) -> bool:
+    if annotation is Any or annotation is Parameter.empty:
+        return True
+
+    origin = get_origin(annotation)
+    if origin is Annotated:
+        args = get_args(annotation)
+        return True if not args else _annotation_accepts_object_type(args[0], object_type)
+    if origin in (UnionType, Union):
+        return any(
+            arg is type(None) or _annotation_accepts_object_type(arg, object_type) for arg in get_args(annotation)
+        )
+
+    runtime_type = origin or annotation
+    if not isinstance(runtime_type, type):
+        return True
+    try:
+        return issubclass(object_type, runtime_type)
+    except TypeError:
+        return True
+
+
+def _validate_object_value[ObjectT](
+    tool_entry: _ObjectToolCallable[ObjectT],
+    object_value: ObjectT,
+    object_type: type[ObjectT] | None,
+) -> None:
+    if object_type is None or isinstance(object_value, object_type):
+        return
+    raise TypeError(
+        f"Object-bound tool '{_tool_name(tool_entry)}' expected object dependency "
+        f"of type '{_type_name(object_type)}', but got '{type(object_value).__qualname__}'."
+    )
+
+
+def _tool_name(tool_entry: Callable[..., Any]) -> str:
+    return getattr(tool_entry, "__qualname__", getattr(tool_entry, "__name__", repr(tool_entry)))
+
+
+def _type_name(object_type: type[Any]) -> str:
+    return object_type.__qualname__
+
+
+def _sync_object_wrapper[ObjectT](
+    tool_entry: _ObjectToolCallable[ObjectT],
+    object_value: ObjectT,
+) -> Callable[..., Any]:
+    @wraps(tool_entry)
+    def wrapped(*args: Any, **kwargs: Any) -> Any:
+        return tool_entry(object_value, *args, **kwargs)
+
+    return wrapped
+
+
+def _async_object_wrapper[ObjectT](
+    tool_entry: _ObjectToolCallable[ObjectT],
+    object_value: ObjectT,
+) -> Callable[..., Any]:
+    @wraps(tool_entry)
+    async def wrapped(*args: Any, **kwargs: Any) -> Any:
+        return await tool_entry(object_value, *args, **kwargs)
+
+    return wrapped
+
+
+def _public_tool_signature(tool_entry: Callable[..., Any]) -> Signature | None:
+    try:
+        tool_signature = signature(tool_entry)
+    except (TypeError, ValueError):
+        return None
+
+    parameters = list(tool_signature.parameters.values())
+    if not parameters:
+        raise ValueError("Dynamic tools must accept the object dependency as their first parameter.")
+    return tool_signature.replace(parameters=parameters[1:])
+
+
+def _set_public_annotations(wrapper: Callable[..., Any], tool_entry: Callable[..., Any]) -> None:
+    annotations = getattr(tool_entry, "__annotations__", None)
+    if not isinstance(annotations, dict):
+        return
+
+    try:
+        parameters = list(signature(tool_entry).parameters)
+    except (TypeError, ValueError):
+        parameters = []
+
+    public_annotations = dict(annotations)
+    if parameters:
+        public_annotations.pop(parameters[0], None)
+    wrapper.__annotations__ = public_annotations
+
+
+__all__ = [
+    "DynamicToolsLayer",
+    "DynamicToolsLayerDeps",
+    "with_object",
+]
diff --git a/dify-agent/src/agenton_collections/layers/pydantic_ai/__init__.py b/dify-agent/src/agenton_collections/layers/pydantic_ai/__init__.py
new file mode 100644
index 0000000000..c8b657cfdb
--- /dev/null
+++ b/dify-agent/src/agenton_collections/layers/pydantic_ai/__init__.py
@@ -0,0 +1,11 @@
+"""Reusable collection layers for the pydantic-ai layer family."""
+
+from agenton_collections.layers.pydantic_ai.bridge import (
+    PydanticAIBridgeLayer,
+    PydanticAIBridgeLayerDeps,
+)
+
+__all__ = [
+    "PydanticAIBridgeLayer",
+    "PydanticAIBridgeLayerDeps",
+]
diff --git a/dify-agent/src/agenton_collections/layers/pydantic_ai/bridge.py b/dify-agent/src/agenton_collections/layers/pydantic_ai/bridge.py
new file mode 100644
index 0000000000..c2f9c668db
--- /dev/null
+++ b/dify-agent/src/agenton_collections/layers/pydantic_ai/bridge.py
@@ -0,0 +1,106 @@
+"""Pydantic AI bridge prompt and tool layer.
+
+This module keeps pydantic-ai's callable shapes intact through
+``PydanticAILayer``. The bridge layer depends on ``ObjectLayer`` so callers have
+one explicit graph node that provides the object used as
+``RunContext[ObjectT].deps`` in pydantic-ai prompt and tool callables.
+Bridge construction accepts pydantic-ai's ergonomic input forms and normalizes
+them at the layer boundary: string system prompts become zero-arg system prompt
+functions, user prompts stay as pydantic-ai ``UserContent`` values, and bare
+tool functions become ``Tool`` instances.
+"""
+
+from collections.abc import Sequence
+from dataclasses import dataclass
+
+from pydantic_ai import Tool
+from pydantic_ai.messages import UserContent
+from pydantic_ai.tools import ToolFuncEither
+from typing_extensions import override
+
+from agenton.layers.base import LayerDeps
+from agenton.layers.types import PydanticAILayer, PydanticAIPrompt, PydanticAITool, PydanticAIUserPrompt
+from agenton_collections.layers.plain.basic import ObjectLayer
+
+
+class PydanticAIBridgeLayerDeps[ObjectT](LayerDeps):
+    """Dependencies required by ``PydanticAIBridgeLayer``."""
+
+    object_layer: ObjectLayer[ObjectT]  # pyright: ignore[reportUninitializedInstanceVariable]
+
+
+@dataclass
+class PydanticAIBridgeLayer[ObjectT](PydanticAILayer[PydanticAIBridgeLayerDeps[ObjectT], ObjectT]):
+    """Bridge layer for pydantic-ai prompts and tools using one object deps."""
+
+    prefix: str | PydanticAIPrompt[ObjectT] | Sequence[str | PydanticAIPrompt[ObjectT]] = ()
+    user: UserContent | Sequence[UserContent] = ()
+    suffix: str | PydanticAIPrompt[ObjectT] | Sequence[str | PydanticAIPrompt[ObjectT]] = ()
+    tool_entries: Sequence[PydanticAITool[ObjectT] | ToolFuncEither[ObjectT, ...]] = ()
+
+    @property
+    def run_deps(self) -> ObjectT:
+        """Object to pass as pydantic-ai run deps for this layer."""
+        return self.deps.object_layer.value
+
+    @property
+    @override
+    def prefix_prompts(self) -> list[PydanticAIPrompt[ObjectT]]:
+        return _normalize_prompts(self.prefix)
+
+    @property
+    @override
+    def suffix_prompts(self) -> list[PydanticAIPrompt[ObjectT]]:
+        return _normalize_prompts(self.suffix)
+
+    @property
+    @override
+    def user_prompts(self) -> list[PydanticAIUserPrompt]:
+        return _normalize_user_prompts(self.user)
+
+    @property
+    @override
+    def tools(self) -> list[PydanticAITool[ObjectT]]:
+        return [_normalize_tool(tool_entry) for tool_entry in self.tool_entries]
+
+
+def _normalize_prompts[ObjectT](
+    prompts: str | PydanticAIPrompt[ObjectT] | Sequence[str | PydanticAIPrompt[ObjectT]],
+) -> list[PydanticAIPrompt[ObjectT]]:
+    if isinstance(prompts, str):
+        return [_normalize_prompt(prompts)]
+    if isinstance(prompts, Sequence):
+        return [_normalize_prompt(prompt) for prompt in prompts]
+    return [prompts]
+
+
+def _normalize_prompt[ObjectT](
+    prompt: str | PydanticAIPrompt[ObjectT],
+) -> PydanticAIPrompt[ObjectT]:
+    if isinstance(prompt, str):
+        return (lambda value: lambda: value)(prompt)
+    return prompt
+
+
+def _normalize_user_prompts(
+    prompts: UserContent | Sequence[UserContent],
+) -> list[PydanticAIUserPrompt]:
+    if isinstance(prompts, str):
+        return [prompts]
+    if isinstance(prompts, Sequence):
+        return list(prompts)
+    return [prompts]
+
+
+def _normalize_tool[ObjectT](
+    tool_entry: PydanticAITool[ObjectT] | ToolFuncEither[ObjectT, ...],
+) -> PydanticAITool[ObjectT]:
+    if isinstance(tool_entry, Tool):
+        return tool_entry
+    return Tool(tool_entry)
+
+
+__all__ = [
+    "PydanticAIBridgeLayer",
+    "PydanticAIBridgeLayerDeps",
+]
diff --git a/dify-agent/src/agenton_collections/transformers/__init__.py b/dify-agent/src/agenton_collections/transformers/__init__.py
new file mode 100644
index 0000000000..9767d57fc3
--- /dev/null
+++ b/dify-agent/src/agenton_collections/transformers/__init__.py
@@ -0,0 +1,8 @@
+"""Transformer package marker for collection integrations.
+
+Import pydantic-ai transformer presets from
+``agenton_collections.transformers.pydantic_ai`` explicitly so default imports do
+not pull runtime bridge implementations into client-safe environments.
+"""
+
+__all__: list[str] = []
diff --git a/dify-agent/src/agenton_collections/transformers/pydantic_ai.py b/dify-agent/src/agenton_collections/transformers/pydantic_ai.py
new file mode 100644
index 0000000000..81b5393a8c
--- /dev/null
+++ b/dify-agent/src/agenton_collections/transformers/pydantic_ai.py
@@ -0,0 +1,85 @@
+"""Pydantic AI compositor transformer presets.
+
+This module owns the pydantic-ai runtime dependency for transforming tagged
+agenton system prompt, user prompt, and tool items into pydantic-ai-compatible
+items.
+"""
+
+from collections.abc import Sequence
+from typing import Final
+
+from pydantic_ai import Tool
+
+from agenton.compositor import CompositorTransformerKwargs
+from agenton.layers.types import (
+    AllPromptTypes,
+    AllToolTypes,
+    AllUserPromptTypes,
+    PydanticAIPrompt,
+    PydanticAITool,
+    PydanticAIUserPrompt,
+)
+
+type PydanticAICompositorTransformerKwargs = CompositorTransformerKwargs[
+    PydanticAIPrompt[object],
+    PydanticAITool[object],
+    AllPromptTypes,
+    AllToolTypes,
+    PydanticAIUserPrompt,
+    AllUserPromptTypes,
+]
+
+
+def _pydantic_ai_prompt_transformer(
+    prompts: Sequence[AllPromptTypes],
+) -> list[PydanticAIPrompt[object]]:
+    result: list[PydanticAIPrompt[object]] = []
+    for prompt in prompts:
+        if prompt.kind == "plain":
+            result.append((lambda value: lambda: value)(prompt.value))
+        elif prompt.kind == "pydantic_ai":
+            result.append(prompt.value)
+        else:
+            raise NotImplementedError(f"Unsupported prompt type: {type(prompt).__qualname__}.")
+    return result
+
+
+def _pydantic_ai_user_prompt_transformer(
+    prompts: Sequence[AllUserPromptTypes],
+) -> list[PydanticAIUserPrompt]:
+    result: list[PydanticAIUserPrompt] = []
+    for prompt in prompts:
+        if prompt.kind == "plain":
+            result.append(prompt.value)
+        elif prompt.kind == "pydantic_ai":
+            result.append(prompt.value)
+        else:
+            raise NotImplementedError(f"Unsupported user prompt type: {type(prompt).__qualname__}.")
+    return result
+
+
+def _pydantic_ai_tool_transformer(
+    tools: Sequence[AllToolTypes],
+) -> list[PydanticAITool[object]]:
+    result: list[PydanticAITool[object]] = []
+    for tool in tools:
+        if tool.kind == "plain":
+            result.append(Tool(tool.value))
+        elif tool.kind == "pydantic_ai":
+            result.append(tool.value)
+        else:
+            raise NotImplementedError(f"Unsupported tool type: {type(tool).__qualname__}.")
+    return result
+
+
+PYDANTIC_AI_TRANSFORMERS: Final[PydanticAICompositorTransformerKwargs] = {
+    "prompt_transformer": _pydantic_ai_prompt_transformer,
+    "user_prompt_transformer": _pydantic_ai_user_prompt_transformer,
+    "tool_transformer": _pydantic_ai_tool_transformer,
+}
+
+
+__all__ = [
+    "PYDANTIC_AI_TRANSFORMERS",
+    "PydanticAICompositorTransformerKwargs",
+]
diff --git a/dify-agent/src/dify_agent/__init__.py b/dify-agent/src/dify_agent/__init__.py
new file mode 100644
index 0000000000..b83189b195
--- /dev/null
+++ b/dify-agent/src/dify_agent/__init__.py
@@ -0,0 +1,10 @@
+"""Client-safe top-level exports for the Dify Agent package.
+
+Default installs must be able to import ``dify_agent`` without pulling in server
+runtime adapters or their optional dependencies. Server-only adapter entry points
+remain under ``dify_agent.adapters.llm``.
+"""
+
+from dify_agent.client import Client
+
+__all__ = ["Client"]
diff --git a/dify-agent/src/dify_agent/adapters/__init__.py b/dify-agent/src/dify_agent/adapters/__init__.py
new file mode 100644
index 0000000000..ac7a1ae47a
--- /dev/null
+++ b/dify-agent/src/dify_agent/adapters/__init__.py
@@ -0,0 +1 @@
+"""Adapter integrations for Dify agent components."""
diff --git a/dify-agent/src/dify_agent/adapters/llm/__init__.py b/dify-agent/src/dify_agent/adapters/llm/__init__.py
new file mode 100644
index 0000000000..b63771ed61
--- /dev/null
+++ b/dify-agent/src/dify_agent/adapters/llm/__init__.py
@@ -0,0 +1,6 @@
+"""LLM adapters for Dify plugin-daemon integrations."""
+
+from .model import DifyLLMAdapterModel
+from .provider import DifyPluginDaemonProvider
+
+__all__ = ["DifyLLMAdapterModel", "DifyPluginDaemonProvider"]
diff --git a/dify-agent/src/dify_agent/adapters/llm/model.py b/dify-agent/src/dify_agent/adapters/llm/model.py
new file mode 100644
index 0000000000..1863dec138
--- /dev/null
+++ b/dify-agent/src/dify_agent/adapters/llm/model.py
@@ -0,0 +1,757 @@
+"""Bridge Dify plugin-daemon LLM invocations into Pydantic AI's model interface.
+
+The API and agent layers are clients of the plugin daemon, not direct hosts of provider SDK
+implementations. This adapter therefore targets the plugin-daemon dispatch protocol and maps
+Pydantic AI messages into the daemon's Graphon-compatible request and stream response schema.
+"""
+
+from __future__ import annotations
+
+import base64
+import re
+from collections.abc import AsyncGenerator, AsyncIterator, Mapping, Sequence
+from contextlib import asynccontextmanager
+from dataclasses import KW_ONLY, InitVar, dataclass, field
+from datetime import datetime, timezone
+from typing import cast
+
+from graphon.model_runtime.entities.llm_entities import LLMResultChunk, LLMUsage
+from graphon.model_runtime.entities.message_entities import (
+    AssistantPromptMessage,
+    AudioPromptMessageContent,
+    DocumentPromptMessageContent,
+    ImagePromptMessageContent,
+    PromptMessage,
+    PromptMessageContentUnionTypes,
+    PromptMessageTool,
+    SystemPromptMessage,
+    TextPromptMessageContent,
+    ToolPromptMessage,
+    UserPromptMessage,
+    VideoPromptMessageContent,
+)
+from typing_extensions import assert_never, override
+
+from pydantic_ai._parts_manager import ModelResponsePartsManager
+from pydantic_ai.exceptions import UnexpectedModelBehavior
+from pydantic_ai.messages import (
+    AudioUrl,
+    BinaryContent,
+    BuiltinToolCallPart,
+    BuiltinToolReturnPart,
+    CachePoint,
+    CompactionPart,
+    DocumentUrl,
+    FilePart,
+    FinishReason,
+    ImageUrl,
+    ModelMessage,
+    ModelRequest,
+    ModelResponse,
+    ModelResponsePart,
+    ModelResponseStreamEvent,
+    MultiModalContent,
+    RetryPromptPart,
+    SystemPromptPart,
+    TextContent,
+    TextPart,
+    ThinkingPart,
+    ToolCallPart,
+    ToolReturnPart,
+    UploadedFile,
+    UserContent,
+    UserPromptPart,
+    VideoUrl,
+)
+from pydantic_ai.models import Model, ModelRequestParameters, StreamedResponse
+from pydantic_ai.profiles import ModelProfileSpec
+from pydantic_ai.settings import ModelSettings
+from pydantic_ai.usage import RequestUsage
+
+from .provider import DifyPluginDaemonLLMClient, DifyPluginDaemonProvider
+
+_THINK_START = "<think>\n"
+_THINK_END = "\n</think>"
+_THINK_OPEN_TAG = "<think>"
+_THINK_CLOSE_TAG = "</think>"
+_THINK_TAG_PATTERN = re.compile(r"<think>(.*?)</think>", re.DOTALL)
+_DETAIL_HIGH = "high"
+
+
+@dataclass(slots=True)
+class _DifyRequestInput:
+    credentials: dict[str, object]
+    prompt_messages: list[PromptMessage]
+    model_parameters: dict[str, object]
+    tools: list[PromptMessageTool] | None
+    stop_sequences: list[str] | None
+
+
+@dataclass(slots=True)
+class DifyLLMAdapterModel(Model[DifyPluginDaemonLLMClient]):
+    """Use a Dify plugin-daemon transport plus request-level model identity."""
+
+    model: str
+    daemon_provider: DifyPluginDaemonProvider
+    _: KW_ONLY
+    model_provider: str
+    credentials: dict[str, object] = field(default_factory=dict, repr=False)
+    model_profile: InitVar[ModelProfileSpec | None] = None
+    model_settings: InitVar[ModelSettings | None] = None
+
+    def __post_init__(
+        self,
+        model_profile: ModelProfileSpec | None,
+        model_settings: ModelSettings | None,
+    ) -> None:
+        Model.__init__(
+            self,
+            settings=model_settings,
+            profile=model_profile or self.daemon_provider.model_profile(self.model),
+        )
+
+    @property
+    @override
+    def provider(self) -> DifyPluginDaemonProvider:
+        return self.daemon_provider
+
+    @property
+    @override
+    def model_name(self) -> str:
+        return self.model
+
+    @property
+    @override
+    def system(self) -> str:
+        return self.daemon_provider.name
+
+    @override
+    async def request(
+        self,
+        messages: list[ModelMessage],
+        model_settings: ModelSettings | None,
+        model_request_parameters: ModelRequestParameters,
+    ) -> ModelResponse:
+        prepared_settings, prepared_params = self.prepare_request(model_settings, model_request_parameters)
+        request_input = self._build_request_input(messages, prepared_settings, prepared_params)
+
+        response = DifyStreamedResponse(
+            model_request_parameters=prepared_params,
+            chunks=self.daemon_provider.client.iter_llm_result_chunks(
+                provider=self.model_provider,
+                model=self.model_name,
+                credentials=request_input.credentials,
+                prompt_messages=request_input.prompt_messages,
+                model_parameters=request_input.model_parameters,
+                tools=request_input.tools,
+                stop=request_input.stop_sequences,
+                stream=False,
+            ),
+            response_model_name=self.model_name,
+            provider_name_value=self.system,
+        )
+        async for _event in response:
+            pass
+        return response.get()
+
+    @asynccontextmanager
+    @override
+    async def request_stream(
+        self,
+        messages: list[ModelMessage],
+        model_settings: ModelSettings | None,
+        model_request_parameters: ModelRequestParameters,
+        run_context: object | None = None,
+    ) -> AsyncGenerator[StreamedResponse, None]:
+        del run_context
+        prepared_settings, prepared_params = self.prepare_request(model_settings, model_request_parameters)
+        request_input = self._build_request_input(messages, prepared_settings, prepared_params)
+
+        yield DifyStreamedResponse(
+            model_request_parameters=prepared_params,
+            chunks=self.daemon_provider.client.iter_llm_result_chunks(
+                provider=self.model_provider,
+                model=self.model_name,
+                credentials=request_input.credentials,
+                prompt_messages=request_input.prompt_messages,
+                model_parameters=request_input.model_parameters,
+                tools=request_input.tools,
+                stop=request_input.stop_sequences,
+                stream=True,
+            ),
+            response_model_name=self.model_name,
+            provider_name_value=self.system,
+        )
+
+    def _build_request_input(
+        self,
+        messages: Sequence[ModelMessage],
+        model_settings: ModelSettings | None,
+        model_request_parameters: ModelRequestParameters,
+    ) -> _DifyRequestInput:
+        return _DifyRequestInput(
+            credentials=dict(self.credentials),
+            prompt_messages=_map_messages_to_prompt_messages(messages, model_request_parameters),
+            model_parameters=_map_model_settings_to_parameters(model_settings),
+            tools=_map_tool_definitions_to_prompt_tools(model_request_parameters),
+            stop_sequences=_get_stop_sequences(model_settings),
+        )
+
+
+@dataclass
+class DifyStreamedResponse(StreamedResponse):
+    chunks: AsyncIterator[LLMResultChunk]
+    response_model_name: str
+    provider_name_value: str
+    _timestamp: datetime = field(default_factory=lambda: datetime.now(timezone.utc))
+    _embedded_thinking_parser: "_EmbeddedThinkingParser" = field(default_factory=lambda: _EmbeddedThinkingParser())
+
+    @override
+    async def _get_event_iterator(self) -> AsyncIterator[ModelResponseStreamEvent]:
+        async for chunk in self.chunks:
+            if chunk.delta.usage is not None:
+                self._usage: RequestUsage = _map_usage(chunk.delta.usage)
+            if chunk.delta.finish_reason is not None:
+                self.finish_reason: FinishReason | None = _normalize_finish_reason(chunk.delta.finish_reason)
+
+            for event in _chunk_to_stream_events(
+                self._parts_manager,
+                chunk,
+                self.provider_name_value,
+                self._embedded_thinking_parser,
+            ):
+                yield event
+
+        for event in self._embedded_thinking_parser.flush(self._parts_manager, self.provider_name_value):
+            yield event
+
+    @property
+    @override
+    def model_name(self) -> str:
+        return self.response_model_name
+
+    @property
+    @override
+    def provider_name(self) -> str:
+        return self.provider_name_value
+
+    @property
+    @override
+    def provider_url(self) -> None:
+        return None
+
+    @property
+    @override
+    def timestamp(self) -> datetime:
+        return self._timestamp
+
+
+def _map_messages_to_prompt_messages(
+    messages: Sequence[ModelMessage],
+    model_request_parameters: ModelRequestParameters,
+) -> list[PromptMessage]:
+    prompt_messages: list[PromptMessage] = []
+
+    for message in messages:
+        if isinstance(message, ModelRequest):
+            prompt_messages.extend(_map_model_request_to_prompt_messages(message))
+        elif isinstance(message, ModelResponse):
+            assistant_message = _map_model_response_to_prompt_message(message)
+            if assistant_message is not None:
+                prompt_messages.append(assistant_message)
+        else:
+            assert_never(message)
+
+    instruction_messages = [
+        SystemPromptMessage(content=part.content)
+        for part in (Model._get_instruction_parts(messages, model_request_parameters) or [])
+        if part.content.strip()
+    ]
+    if instruction_messages:
+        insert_at = next(
+            (index for index, message in enumerate(prompt_messages) if not isinstance(message, SystemPromptMessage)),
+            len(prompt_messages),
+        )
+        prompt_messages[insert_at:insert_at] = instruction_messages
+
+    return prompt_messages
+
+
+def _map_model_request_to_prompt_messages(message: ModelRequest) -> list[PromptMessage]:
+    prompt_messages: list[PromptMessage] = []
+
+    for part in message.parts:
+        if isinstance(part, SystemPromptPart):
+            prompt_messages.append(SystemPromptMessage(content=part.content))
+        elif isinstance(part, UserPromptPart):
+            prompt_messages.append(UserPromptMessage(content=_map_user_prompt_content(part.content)))
+        elif isinstance(part, ToolReturnPart):
+            prompt_messages.append(_map_tool_return_part_to_prompt_message(part))
+        elif isinstance(part, RetryPromptPart):
+            if part.tool_name is None:
+                prompt_messages.append(UserPromptMessage(content=part.model_response()))
+            else:
+                prompt_messages.append(
+                    ToolPromptMessage(
+                        content=part.model_response(),
+                        tool_call_id=part.tool_call_id,
+                        name=part.tool_name,
+                    )
+                )
+        else:
+            assert_never(part)
+
+    return prompt_messages
+
+
+def _map_tool_return_part_to_prompt_message(part: ToolReturnPart) -> ToolPromptMessage:
+    items = part.content_items(mode="str")
+    if len(items) == 1 and isinstance(items[0], str):
+        content: str | list[PromptMessageContentUnionTypes] | None = items[0]
+    else:
+        content_items: list[PromptMessageContentUnionTypes] = []
+        for item in items:
+            if isinstance(item, str):
+                content_items.append(TextPromptMessageContent(data=item))
+            elif isinstance(item, CachePoint):
+                continue
+            elif _is_multi_modal_content(item):
+                content_items.append(_map_multi_modal_user_content(item))
+            else:
+                raise UnexpectedModelBehavior(f"Unsupported daemon tool message content: {type(item).__name__}")
+        content = content_items or None
+
+    return ToolPromptMessage(content=content, tool_call_id=part.tool_call_id, name=part.tool_name)
+
+
+def _map_model_response_to_prompt_message(
+    message: ModelResponse,
+) -> AssistantPromptMessage | None:
+    """Map prior assistant output into daemon prompt history.
+
+    The plugin daemon requires ``PromptMessage.content`` to be present even when
+    an assistant turn contains only tool calls. Tool-call-only assistant history
+    therefore uses the empty string instead of ``null`` so the second request in
+    a tool round trip remains schema-compatible.
+    """
+    content_parts: list[PromptMessageContentUnionTypes] = []
+    tool_calls: list[AssistantPromptMessage.ToolCall] = []
+
+    for part in message.parts:
+        if isinstance(part, TextPart):
+            if part.content:
+                content_parts.append(TextPromptMessageContent(data=part.content))
+        elif isinstance(part, ThinkingPart):
+            if part.content:
+                content_parts.append(TextPromptMessageContent(data=f"{_THINK_START}{part.content}{_THINK_END}"))
+        elif isinstance(part, FilePart):
+            content_parts.append(_map_binary_content_to_prompt_content(part.content))
+        elif isinstance(part, ToolCallPart):
+            tool_calls.append(
+                AssistantPromptMessage.ToolCall(
+                    id=part.tool_call_id or f"tool-call-{part.tool_name}",
+                    type="function",
+                    function=AssistantPromptMessage.ToolCall.ToolCallFunction(
+                        name=part.tool_name,
+                        arguments=part.args_as_json_str(),
+                    ),
+                )
+            )
+        elif isinstance(part, BuiltinToolCallPart | BuiltinToolReturnPart | CompactionPart):
+            raise UnexpectedModelBehavior(f"Unsupported response part for daemon adapter: {type(part).__name__}")
+        else:
+            assert_never(part)
+
+    content = _normalize_prompt_content(content_parts)
+    if content is None and not tool_calls:
+        return None
+    if content is None:
+        content = ""
+
+    return AssistantPromptMessage(content=content, tool_calls=tool_calls)
+
+
+def _map_user_prompt_content(
+    content: str | Sequence[UserContent],
+) -> str | list[PromptMessageContentUnionTypes] | None:
+    if isinstance(content, str):
+        return content
+
+    prompt_content: list[PromptMessageContentUnionTypes] = []
+    for item in content:
+        if isinstance(item, CachePoint):
+            continue
+        if isinstance(item, str):
+            prompt_content.append(TextPromptMessageContent(data=item))
+        elif isinstance(item, TextContent):
+            prompt_content.append(TextPromptMessageContent(data=item.content))
+        elif _is_multi_modal_content(item):
+            prompt_content.append(_map_multi_modal_user_content(item))
+        else:
+            raise UnexpectedModelBehavior(f"Unsupported user prompt content: {type(item).__name__}")
+    return _normalize_prompt_content(prompt_content)
+
+
+def _is_multi_modal_content(item: object) -> bool:
+    return isinstance(
+        item,
+        ImageUrl | AudioUrl | DocumentUrl | VideoUrl | BinaryContent | UploadedFile,
+    )
+
+
+def _map_multi_modal_user_content(
+    item: MultiModalContent,
+) -> PromptMessageContentUnionTypes:
+    if isinstance(item, ImageUrl):
+        detail = (
+            ImagePromptMessageContent.DETAIL.HIGH
+            if _get_detail(item) == _DETAIL_HIGH
+            else ImagePromptMessageContent.DETAIL.LOW
+        )
+        return ImagePromptMessageContent(
+            url=item.url,
+            mime_type=item.media_type,
+            format=item.format,
+            filename=f"{item.identifier}.{item.format}",
+            detail=detail,
+        )
+    if isinstance(item, AudioUrl):
+        return AudioPromptMessageContent(
+            url=item.url,
+            mime_type=item.media_type,
+            format=item.format,
+            filename=f"{item.identifier}.{item.format}",
+        )
+    if isinstance(item, VideoUrl):
+        return VideoPromptMessageContent(
+            url=item.url,
+            mime_type=item.media_type,
+            format=item.format,
+            filename=f"{item.identifier}.{item.format}",
+        )
+    if isinstance(item, DocumentUrl):
+        return DocumentPromptMessageContent(
+            url=item.url,
+            mime_type=item.media_type,
+            format=item.format,
+            filename=f"{item.identifier}.{item.format}",
+        )
+    if isinstance(item, BinaryContent):
+        return _map_binary_content_to_prompt_content(item)
+    if isinstance(item, UploadedFile):
+        raise UnexpectedModelBehavior("UploadedFile content is not supported by the daemon adapter")
+    assert_never(item)
+
+
+def _map_binary_content_to_prompt_content(
+    item: BinaryContent,
+) -> PromptMessageContentUnionTypes:
+    filename = f"{item.identifier}.{item.format}"
+    if item.is_image:
+        detail = (
+            ImagePromptMessageContent.DETAIL.HIGH
+            if _get_detail(item) == _DETAIL_HIGH
+            else ImagePromptMessageContent.DETAIL.LOW
+        )
+        return ImagePromptMessageContent(
+            base64_data=item.base64,
+            mime_type=item.media_type,
+            format=item.format,
+            filename=filename,
+            detail=detail,
+        )
+    if item.is_audio:
+        return AudioPromptMessageContent(
+            base64_data=item.base64,
+            mime_type=item.media_type,
+            format=item.format,
+            filename=filename,
+        )
+    if item.is_video:
+        return VideoPromptMessageContent(
+            base64_data=item.base64,
+            mime_type=item.media_type,
+            format=item.format,
+            filename=filename,
+        )
+    if item.is_document:
+        return DocumentPromptMessageContent(
+            base64_data=item.base64,
+            mime_type=item.media_type,
+            format=item.format,
+            filename=filename,
+        )
+    raise UnexpectedModelBehavior(f"Unsupported binary media type for daemon adapter: {item.media_type}")
+
+
+def _normalize_prompt_content(
+    content: list[PromptMessageContentUnionTypes],
+) -> str | list[PromptMessageContentUnionTypes] | None:
+    if not content:
+        return None
+    if len(content) == 1 and isinstance(content[0], TextPromptMessageContent):
+        return content[0].data
+    return content
+
+
+def _map_tool_definitions_to_prompt_tools(
+    model_request_parameters: ModelRequestParameters,
+) -> list[PromptMessageTool] | None:
+    tool_definitions = [
+        *model_request_parameters.function_tools,
+        *model_request_parameters.output_tools,
+    ]
+    if not tool_definitions:
+        return None
+
+    return [
+        PromptMessageTool(
+            name=tool_definition.name,
+            description=tool_definition.description or "",
+            parameters=cast(dict[str, object], tool_definition.parameters_json_schema),
+        )
+        for tool_definition in tool_definitions
+    ]
+
+
+def _map_model_settings_to_parameters(model_settings: ModelSettings | None) -> dict[str, object]:
+    if not model_settings:
+        return {}
+
+    parameters: dict[str, object] = {
+        key: value
+        for key, value in model_settings.items()
+        if value is not None and key not in {"extra_body", "stop_sequences"}
+    }
+
+    extra_body = model_settings.get("extra_body")
+    if isinstance(extra_body, Mapping):
+        parameters.update(cast(Mapping[str, object], extra_body))
+
+    return parameters
+
+
+def _get_stop_sequences(model_settings: ModelSettings | None) -> list[str] | None:
+    if not model_settings:
+        return None
+    return list(model_settings.get("stop_sequences") or []) or None
+
+
+def _map_usage(usage: LLMUsage) -> RequestUsage:
+    return RequestUsage(input_tokens=usage.prompt_tokens, output_tokens=usage.completion_tokens)
+
+
+def _normalize_finish_reason(finish_reason: str) -> FinishReason:
+    lowered = finish_reason.lower()
+    if lowered in {"stop", "length", "content_filter", "error", "tool_call"}:
+        return cast(FinishReason, lowered)
+    if lowered in {"tool_calls", "function_call", "function_calls"}:
+        return "tool_call"
+    return "error"
+
+
+def _chunk_to_stream_events(
+    parts_manager: ModelResponsePartsManager,
+    chunk: LLMResultChunk,
+    provider_name: str,
+    embedded_thinking_parser: "_EmbeddedThinkingParser",
+) -> list[ModelResponseStreamEvent]:
+    events: list[ModelResponseStreamEvent] = []
+    message = chunk.delta.message
+
+    if isinstance(message.content, str):
+        if message.content:
+            events.extend(embedded_thinking_parser.parse(parts_manager, message.content, provider_name))
+    elif isinstance(message.content, list):
+        for part in _map_assistant_content_to_response_parts(message.content):
+            if isinstance(part, TextPart):
+                events.extend(
+                    parts_manager.handle_text_delta(
+                        vendor_part_id=None,
+                        content=part.content,
+                        provider_name=provider_name,
+                    )
+                )
+            else:
+                events.append(parts_manager.handle_part(vendor_part_id=None, part=part))
+
+    for index, tool_call in enumerate(message.tool_calls):
+        vendor_id = tool_call.id or f"chunk-{chunk.delta.index}-tool-{index}"
+        events.append(
+            parts_manager.handle_tool_call_part(
+                vendor_part_id=vendor_id,
+                tool_name=tool_call.function.name,
+                args=tool_call.function.arguments,
+                tool_call_id=tool_call.id,
+                provider_name=provider_name,
+            )
+        )
+
+    return events
+
+
+def _map_assistant_content_to_response_parts(
+    content: Sequence[PromptMessageContentUnionTypes],
+) -> list[ModelResponsePart]:
+    response_parts: list[ModelResponsePart] = []
+
+    for item in content:
+        if isinstance(item, TextPromptMessageContent):
+            if item.data:
+                response_parts.extend(_parse_assistant_text_parts(item.data))
+        elif isinstance(
+            item,
+            ImagePromptMessageContent
+            | AudioPromptMessageContent
+            | VideoPromptMessageContent
+            | DocumentPromptMessageContent,
+        ):
+            if item.url:
+                raise UnexpectedModelBehavior(
+                    "URL-based assistant multimodal output is not supported by the daemon adapter"
+                )
+            if not item.base64_data:
+                continue
+            response_parts.append(
+                FilePart(
+                    content=BinaryContent(
+                        data=base64.b64decode(item.base64_data),
+                        media_type=item.mime_type,
+                    ),
+                    provider_name=None,
+                )
+            )
+        else:
+            assert_never(item)
+
+    return response_parts
+
+
+def _get_detail(item: ImageUrl | BinaryContent) -> str | None:
+    metadata = item.vendor_metadata or {}
+    detail = metadata.get("detail")
+    return detail if isinstance(detail, str) else None
+
+
+def _parse_assistant_text_parts(content: str) -> list[ModelResponsePart]:
+    response_parts: list[ModelResponsePart] = []
+    cursor = 0
+
+    for match in _THINK_TAG_PATTERN.finditer(content):
+        if match.start() > cursor:
+            response_parts.append(TextPart(content=content[cursor : match.start()], provider_name=None))
+
+        thinking_content = match.group(1).strip("\n")
+        if thinking_content:
+            response_parts.append(ThinkingPart(content=thinking_content, provider_name=None))
+        cursor = match.end()
+
+    if cursor < len(content):
+        response_parts.append(TextPart(content=content[cursor:], provider_name=None))
+
+    if response_parts:
+        return response_parts
+    return [TextPart(content=content, provider_name=None)]
+
+
+@dataclass(slots=True)
+class _EmbeddedThinkingParser:
+    _pending: str = ""
+    _inside_thinking: bool = False
+
+    def parse(
+        self,
+        parts_manager: ModelResponsePartsManager,
+        content: str,
+        provider_name: str,
+    ) -> list[ModelResponseStreamEvent]:
+        events: list[ModelResponseStreamEvent] = []
+        buffer = self._pending + content
+        self._pending = ""
+
+        while buffer:
+            if self._inside_thinking:
+                end_index = buffer.find(_THINK_CLOSE_TAG)
+                if end_index >= 0:
+                    if end_index > 0:
+                        events.extend(
+                            parts_manager.handle_thinking_delta(
+                                vendor_part_id=None,
+                                content=buffer[:end_index],
+                                provider_name=provider_name,
+                            )
+                        )
+                    buffer = buffer[end_index + len(_THINK_CLOSE_TAG) :]
+                    self._inside_thinking = False
+                    continue
+
+                safe_content, self._pending = _split_incomplete_tag_suffix(buffer, _THINK_CLOSE_TAG)
+                if safe_content:
+                    events.extend(
+                        parts_manager.handle_thinking_delta(
+                            vendor_part_id=None,
+                            content=safe_content,
+                            provider_name=provider_name,
+                        )
+                    )
+                break
+
+            start_index = buffer.find(_THINK_OPEN_TAG)
+            if start_index >= 0:
+                if start_index > 0:
+                    events.extend(
+                        parts_manager.handle_text_delta(
+                            vendor_part_id=None,
+                            content=buffer[:start_index],
+                            provider_name=provider_name,
+                        )
+                    )
+                buffer = buffer[start_index + len(_THINK_OPEN_TAG) :]
+                self._inside_thinking = True
+                continue
+
+            safe_content, self._pending = _split_incomplete_tag_suffix(buffer, _THINK_OPEN_TAG)
+            if safe_content:
+                events.extend(
+                    parts_manager.handle_text_delta(
+                        vendor_part_id=None,
+                        content=safe_content,
+                        provider_name=provider_name,
+                    )
+                )
+            break
+
+        return events
+
+    def flush(
+        self,
+        parts_manager: ModelResponsePartsManager,
+        provider_name: str,
+    ) -> list[ModelResponseStreamEvent]:
+        if not self._pending:
+            return []
+
+        pending = self._pending
+        self._pending = ""
+        if self._inside_thinking:
+            return list(
+                parts_manager.handle_thinking_delta(
+                    vendor_part_id=None,
+                    content=pending,
+                    provider_name=provider_name,
+                )
+            )
+        return list(
+            parts_manager.handle_text_delta(
+                vendor_part_id=None,
+                content=pending,
+                provider_name=provider_name,
+            )
+        )
+
+
+def _split_incomplete_tag_suffix(content: str, tag: str) -> tuple[str, str]:
+    for suffix_length in range(len(tag) - 1, 0, -1):
+        if content.endswith(tag[:suffix_length]):
+            return content[:-suffix_length], content[-suffix_length:]
+    return content, ""
diff --git a/dify-agent/src/dify_agent/adapters/llm/provider.py b/dify-agent/src/dify_agent/adapters/llm/provider.py
new file mode 100644
index 0000000000..6e7b92f646
--- /dev/null
+++ b/dify-agent/src/dify_agent/adapters/llm/provider.py
@@ -0,0 +1,272 @@
+"""Dify plugin-daemon provider for Pydantic AI LLM adapters.
+
+The Pydantic AI provider represents daemon/plugin transport identity. Business
+model provider names such as ``openai`` are request-level model identity and are
+passed by ``DifyLLMAdapterModel`` for each invocation instead of being stored on
+this provider.
+"""
+
+from __future__ import annotations
+
+import json
+from collections.abc import AsyncIterator, Callable, Mapping
+from dataclasses import dataclass, field
+from typing import NoReturn
+
+import httpx
+from graphon.model_runtime.entities.llm_entities import LLMResultChunk
+from graphon.model_runtime.entities.message_entities import PromptMessage, PromptMessageTool
+from pydantic import BaseModel
+from typing_extensions import override
+
+from pydantic_ai.exceptions import ModelAPIError, ModelHTTPError, UnexpectedModelBehavior, UserError
+from pydantic_ai.providers import Provider
+
+_DEFAULT_DAEMON_TIMEOUT: float | httpx.Timeout | None = 600.0
+
+
+class PluginDaemonBasicResponse(BaseModel):
+    code: int
+    message: str
+    data: object | None = None
+
+
+@dataclass(slots=True)
+class DifyPluginDaemonLLMClient:
+    """HTTP client wrapper for plugin-daemon LLM dispatch requests."""
+
+    plugin_daemon_url: str
+    plugin_daemon_api_key: str
+    tenant_id: str
+    plugin_id: str
+    user_id: str | None
+    http_client: httpx.AsyncClient = field(repr=False)
+
+    def __post_init__(self) -> None:
+        self.plugin_daemon_url = self.plugin_daemon_url.rstrip("/")
+
+    async def iter_llm_result_chunks(
+        self,
+        *,
+        provider: str,
+        model: str,
+        credentials: dict[str, object],
+        prompt_messages: list[PromptMessage],
+        model_parameters: dict[str, object],
+        tools: list[PromptMessageTool] | None,
+        stop: list[str] | None,
+        stream: bool,
+    ) -> AsyncIterator[LLMResultChunk]:
+        async for item in self._iter_stream_response(
+            model_name=model,
+            path=f"plugin/{self.tenant_id}/dispatch/llm/invoke",
+            request_data={
+                "provider": provider,
+                "model_type": "llm",
+                "model": model,
+                "credentials": credentials,
+                "prompt_messages": prompt_messages,
+                "model_parameters": model_parameters,
+                "tools": tools,
+                "stop": stop,
+                "stream": stream,
+            },
+            response_model=LLMResultChunk,
+        ):
+            yield item
+
+    async def _iter_stream_response[T: BaseModel](
+        self,
+        *,
+        model_name: str,
+        path: str,
+        request_data: Mapping[str, object],
+        response_model: type[T],
+    ) -> AsyncIterator[T]:
+        payload: dict[str, object] = {"data": _to_jsonable(request_data)}
+        if self.user_id is not None:
+            payload["user_id"] = self.user_id
+
+        headers = {
+            "X-Api-Key": self.plugin_daemon_api_key,
+            "X-Plugin-ID": self.plugin_id,
+            "Content-Type": "application/json",
+        }
+        url = f"{self.plugin_daemon_url}/{path}"
+
+        async with self.http_client.stream("POST", url, headers=headers, json=payload) as response:
+            if response.is_error:
+                body = (await response.aread()).decode("utf-8", errors="replace")
+                error = _decode_plugin_daemon_error_payload(body)
+                if error is not None:
+                    _raise_plugin_daemon_error(
+                        model_name=model_name,
+                        error_type=error["error_type"],
+                        message=error["message"],
+                        status_code=response.status_code,
+                        body=error,
+                    )
+                raise ModelHTTPError(response.status_code, model_name, body or None)
+
+            async for raw_line in response.aiter_lines():
+                line = raw_line.strip()
+                if not line:
+                    continue
+                if line.startswith("data:"):
+                    line = line[5:].strip()
+
+                wrapped = PluginDaemonBasicResponse.model_validate_json(line)
+                if wrapped.code != 0:
+                    error = _decode_plugin_daemon_error_payload(wrapped.message)
+                    if error is not None:
+                        _raise_plugin_daemon_error(
+                            model_name=model_name,
+                            error_type=error["error_type"],
+                            message=error["message"],
+                            body=error,
+                        )
+                    raise ModelAPIError(
+                        model_name,
+                        f"Plugin daemon returned error code {wrapped.code}: {wrapped.message}",
+                    )
+                if wrapped.data is None:
+                    raise UnexpectedModelBehavior("Plugin daemon returned an empty stream item")
+                yield response_model.model_validate(wrapped.data)
+
+
+@dataclass(slots=True, kw_only=True)
+class DifyPluginDaemonProvider(Provider[DifyPluginDaemonLLMClient]):
+    """Pydantic AI provider for Dify plugin-daemon dispatch requests.
+
+    The provider ``name`` identifies the daemon/plugin context. The business LLM
+    provider is supplied by each adapter model request so one daemon provider can
+    serve different model-provider selections without mutating transport state.
+    When ``http_client`` is omitted the provider owns an ``AsyncClient`` and the
+    Pydantic AI provider context manager closes it. When an external client is
+    supplied, ownership stays with the caller and provider exit leaves it open.
+    """
+
+    tenant_id: str
+    plugin_id: str
+    plugin_daemon_url: str
+    plugin_daemon_api_key: str = field(repr=False)
+    user_id: str | None = None
+    timeout: float | httpx.Timeout | None = _DEFAULT_DAEMON_TIMEOUT
+    http_client: httpx.AsyncClient | None = field(default=None, repr=False)
+    _client: DifyPluginDaemonLLMClient = field(init=False, repr=False)
+    _own_http_client: httpx.AsyncClient | None = field(init=False, default=None, repr=False)
+    _http_client_factory: Callable[[], httpx.AsyncClient] | None = field(init=False, default=None, repr=False)
+
+    def __post_init__(self) -> None:
+        self.plugin_daemon_url = self.plugin_daemon_url.rstrip("/")
+        if self.http_client is None:
+            self._http_client_factory = self._make_http_client
+            http_client = self._make_http_client()
+            self._own_http_client = http_client
+        else:
+            http_client = self.http_client
+            self._own_http_client = None
+            self._http_client_factory = None
+        self._client = DifyPluginDaemonLLMClient(
+            plugin_daemon_url=self.plugin_daemon_url,
+            plugin_daemon_api_key=self.plugin_daemon_api_key,
+            tenant_id=self.tenant_id,
+            plugin_id=self.plugin_id,
+            user_id=self.user_id,
+            http_client=http_client,
+        )
+
+    def _make_http_client(self) -> httpx.AsyncClient:
+        return httpx.AsyncClient(timeout=self.timeout, trust_env=False)
+
+    @override
+    def _set_http_client(self, http_client: httpx.AsyncClient) -> None:
+        self._client.http_client = http_client
+
+    @property
+    @override
+    def name(self) -> str:
+        return f"DifyPlugin/{self.plugin_id}"
+
+    @property
+    @override
+    def base_url(self) -> str:
+        return self.plugin_daemon_url
+
+    @property
+    @override
+    def client(self) -> DifyPluginDaemonLLMClient:
+        return self._client
+
+
+def _to_jsonable(value: object) -> object:
+    if isinstance(value, BaseModel):
+        return value.model_dump(mode="json")
+    if isinstance(value, dict):
+        return {key: _to_jsonable(item) for key, item in value.items()}
+    if isinstance(value, list | tuple):
+        return [_to_jsonable(item) for item in value]
+    return value
+
+
+def _decode_plugin_daemon_error_payload(raw_message: str) -> dict[str, str] | None:
+    try:
+        parsed = json.loads(raw_message)
+    except json.JSONDecodeError:
+        return None
+
+    if not isinstance(parsed, dict):
+        return None
+
+    error_type = parsed.get("error_type")
+    message = parsed.get("message")
+    if not isinstance(error_type, str) or not isinstance(message, str):
+        return None
+    return {"error_type": error_type, "message": message}
+
+
+def _raise_plugin_daemon_error(
+    *,
+    model_name: str,
+    error_type: str,
+    message: str,
+    status_code: int | None = None,
+    body: object | None = None,
+) -> NoReturn:
+    http_error_body = body or {"error_type": error_type, "message": message}
+
+    match error_type:
+        case "PluginInvokeError":
+            nested_error = _decode_plugin_daemon_error_payload(message)
+            if nested_error is not None:
+                _raise_plugin_daemon_error(
+                    model_name=model_name,
+                    error_type=nested_error["error_type"],
+                    message=nested_error["message"],
+                    status_code=status_code,
+                    body=nested_error,
+                )
+            raise ModelAPIError(model_name, message)
+        case "PluginDaemonUnauthorizedError" | "InvokeAuthorizationError":
+            raise ModelHTTPError(status_code or 401, model_name, http_error_body)
+        case "PluginPermissionDeniedError":
+            raise ModelHTTPError(status_code or 403, model_name, http_error_body)
+        case (
+            "PluginDaemonBadRequestError"
+            | "InvokeBadRequestError"
+            | "CredentialsValidateFailedError"
+            | "PluginUniqueIdentifierError"
+        ):
+            raise ModelHTTPError(status_code or 400, model_name, http_error_body)
+        case "EndpointSetupFailedError" | "TriggerProviderCredentialValidationError":
+            raise UserError(message)
+        case "PluginDaemonNotFoundError" | "PluginNotFoundError":
+            raise ModelHTTPError(status_code or 404, model_name, http_error_body)
+        case "InvokeRateLimitError":
+            raise ModelHTTPError(status_code or 429, model_name, http_error_body)
+        case "PluginDaemonInternalServerError" | "PluginDaemonInnerError":
+            raise ModelHTTPError(status_code or 500, model_name, http_error_body)
+        case "InvokeConnectionError" | "InvokeServerUnavailableError":
+            raise ModelHTTPError(status_code or 503, model_name, http_error_body)
+        case _:
+            raise ModelAPIError(model_name, f"{error_type}: {message}")
diff --git a/dify-agent/src/dify_agent/client/__init__.py b/dify-agent/src/dify_agent/client/__init__.py
new file mode 100644
index 0000000000..ff0027b291
--- /dev/null
+++ b/dify-agent/src/dify_agent/client/__init__.py
@@ -0,0 +1,21 @@
+"""Unified sync and async Python client for the Dify Agent run API."""
+
+from ._client import (
+    Client,
+    DifyAgentClientError,
+    DifyAgentHTTPError,
+    DifyAgentNotFoundError,
+    DifyAgentStreamError,
+    DifyAgentTimeoutError,
+    DifyAgentValidationError,
+)
+
+__all__ = [
+    "Client",
+    "DifyAgentClientError",
+    "DifyAgentHTTPError",
+    "DifyAgentNotFoundError",
+    "DifyAgentStreamError",
+    "DifyAgentTimeoutError",
+    "DifyAgentValidationError",
+]
diff --git a/dify-agent/src/dify_agent/client/_client.py b/dify-agent/src/dify_agent/client/_client.py
new file mode 100644
index 0000000000..7760f356aa
--- /dev/null
+++ b/dify-agent/src/dify_agent/client/_client.py
@@ -0,0 +1,665 @@
+"""HTTPX-based client for Dify Agent runs.
+
+The client uses the public DTOs from ``dify_agent.protocol.schemas`` for all
+normal request and response parsing. It intentionally does not retry
+``POST /runs`` because create-run is not idempotent, and create helpers require a
+``CreateRunRequest`` instance rather than accepting raw payload dicts. SSE
+streams are the only operation with reconnect logic: transient stream, connect,
+or read failures, stream timeouts, and HTTP 5xx stream responses reconnect with
+the latest observed event id, while HTTP 4xx responses, DTO validation failures,
+and malformed SSE frames fail immediately.
+"""
+
+from __future__ import annotations
+
+import asyncio
+import time
+from collections.abc import AsyncIterator, Iterator
+from types import TracebackType
+from typing import Self, TypeVar, cast
+from urllib.parse import quote
+
+import httpx
+from pydantic import BaseModel, ValidationError
+
+from dify_agent.protocol.schemas import (
+    CreateRunRequest,
+    CreateRunResponse,
+    RUN_EVENT_ADAPTER,
+    RunEvent,
+    RunEventsResponse,
+    RunStatusResponse,
+)
+
+_ResponseModelT = TypeVar("_ResponseModelT", bound=BaseModel)
+_TERMINAL_EVENT_TYPES = {"run_succeeded", "run_failed"}
+_TERMINAL_RUN_STATUSES = {"succeeded", "failed"}
+
+
+class DifyAgentClientError(RuntimeError):
+    """Base class for errors raised by the Dify Agent Python client."""
+
+
+class DifyAgentHTTPError(DifyAgentClientError):
+    """Raised for HTTP 4xx/5xx responses not covered by a narrower subclass."""
+
+    status_code: int
+    detail: object
+
+    def __init__(self, status_code: int, detail: object) -> None:
+        self.status_code = status_code
+        self.detail = detail
+        super().__init__(f"Dify Agent HTTP {status_code}: {detail}")
+
+
+class DifyAgentNotFoundError(DifyAgentHTTPError):
+    """Raised when the server returns ``404`` for a run resource."""
+
+
+class DifyAgentValidationError(DifyAgentHTTPError):
+    """Raised for local input validation, invalid DTO responses, or HTTP ``422``."""
+
+    def __init__(self, detail: object, *, status_code: int = 422) -> None:
+        super().__init__(status_code=status_code, detail=detail)
+
+
+class DifyAgentTimeoutError(DifyAgentClientError):
+    """Raised when an HTTPX timeout occurs outside successful SSE reconnects."""
+
+
+class DifyAgentStreamError(DifyAgentClientError):
+    """Raised for malformed SSE frames or exhausted SSE reconnect attempts."""
+
+
+class _ReconnectableStreamError(Exception):
+    """Internal wrapper for stream failures that may be retried by the caller."""
+
+    error: DifyAgentClientError
+
+    def __init__(self, error: DifyAgentClientError) -> None:
+        self.error = error
+        super().__init__(str(error))
+
+
+class _SSEDecoder:
+    """Incrementally decode SSE lines into typed run events.
+
+    The decoder keeps only the fields for the current frame. Comments are ignored,
+    ``data`` fields are joined with newlines as required by the SSE specification,
+    and payload JSON is validated by ``RUN_EVENT_ADAPTER``. The frame ``id`` is
+    copied into the decoded event only when the JSON payload omits ``event.id``.
+    """
+
+    _event_id: str | None
+    _event_type: str | None
+    _data_lines: list[str]
+
+    def __init__(self) -> None:
+        self._event_id = None
+        self._event_type = None
+        self._data_lines = []
+
+    def feed_line(self, raw_line: str) -> RunEvent | None:
+        """Consume one SSE line and return an event when a frame completes.
+
+        Empty lines dispatch the current frame. Comment-only frames and frames
+        without ``data`` are ignored so server heartbeats do not surface to users.
+        Malformed event payloads raise ``DifyAgentStreamError`` and must not be
+        retried because replaying would repeat the same invalid frame.
+        """
+        line = raw_line.rstrip("\r")
+        if line == "":
+            return self._dispatch()
+        if line.startswith(":"):
+            return None
+
+        field, separator, value = line.partition(":")
+        if separator and value.startswith(" "):
+            value = value[1:]
+        if field == "id":
+            self._event_id = value
+        elif field == "event":
+            self._event_type = value
+        elif field == "data":
+            self._data_lines.append(value)
+        return None
+
+    def _dispatch(self) -> RunEvent | None:
+        """Validate and return the current frame, then clear decoder state."""
+        if not self._data_lines:
+            self._reset()
+            return None
+
+        frame_id = self._event_id
+        frame_event_type = self._event_type
+        data = "\n".join(self._data_lines)
+        self._reset()
+
+        try:
+            event = RUN_EVENT_ADAPTER.validate_json(data)
+        except ValidationError as exc:
+            raise DifyAgentStreamError("malformed SSE data frame") from exc
+        if frame_event_type is not None and frame_event_type != event.type:
+            raise DifyAgentStreamError(
+                f"SSE event field {frame_event_type!r} does not match payload type {event.type!r}"
+            )
+        if frame_id is not None and event.id is None:
+            return event.model_copy(update={"id": frame_id})
+        return event
+
+    def _reset(self) -> None:
+        """Clear the current frame without changing decoder configuration."""
+        self._event_id = None
+        self._event_type = None
+        self._data_lines = []
+
+
+class Client:
+    """Unified synchronous and asynchronous client for Dify Agent runs.
+
+    The instance is intentionally small and stateful: it stores base URL, default
+    headers, timeout settings, optional external HTTPX clients, and lazy-owned
+    clients for whichever sync/async side is used. External clients are never
+    closed by this wrapper. Owned sync clients close via ``close_sync`` or the
+    sync context manager; owned async clients close via ``aclose`` or the async
+    context manager.
+    """
+
+    _base_url: str
+    _timeout: float | httpx.Timeout
+    _stream_timeout: float | httpx.Timeout | None
+    _headers: dict[str, str]
+    _sync_http_client: httpx.Client | None
+    _async_http_client: httpx.AsyncClient | None
+    _owns_sync_http_client: bool
+    _owns_async_http_client: bool
+    _sync_closed: bool
+    _async_closed: bool
+
+    def __init__(
+        self,
+        *,
+        base_url: str,
+        timeout: float | httpx.Timeout = 30.0,
+        stream_timeout: float | httpx.Timeout | None = None,
+        headers: dict[str, str] | None = None,
+        sync_http_client: httpx.Client | None = None,
+        async_http_client: httpx.AsyncClient | None = None,
+    ) -> None:
+        self._base_url = base_url.rstrip("/")
+        self._timeout = timeout
+        self._stream_timeout = stream_timeout
+        self._headers = dict(headers or {})
+        self._sync_http_client = sync_http_client
+        self._async_http_client = async_http_client
+        self._owns_sync_http_client = sync_http_client is None
+        self._owns_async_http_client = async_http_client is None
+        self._sync_closed = False
+        self._async_closed = False
+
+    def __enter__(self) -> Self:
+        """Enter a sync context and return this client without opening the network."""
+        return self
+
+    def __exit__(
+        self,
+        exc_type: type[BaseException] | None,
+        exc_value: BaseException | None,
+        traceback: TracebackType | None,
+    ) -> None:
+        """Close the owned sync HTTP client when leaving a sync context."""
+        del exc_type, exc_value, traceback
+        self.close_sync()
+
+    async def __aenter__(self) -> Self:
+        """Enter an async context and return this client without opening the network."""
+        return self
+
+    async def __aexit__(
+        self,
+        exc_type: type[BaseException] | None,
+        exc_value: BaseException | None,
+        traceback: TracebackType | None,
+    ) -> None:
+        """Close owned async resources when leaving an async context."""
+        del exc_type, exc_value, traceback
+        await self.aclose()
+
+    def close_sync(self) -> None:
+        """Close the owned synchronous HTTPX client if it was created."""
+        if self._sync_closed:
+            return
+        if self._owns_sync_http_client and self._sync_http_client is not None:
+            self._sync_http_client.close()
+        self._sync_closed = True
+
+    async def aclose(self) -> None:
+        """Close owned asynchronous resources and any owned sync client already opened."""
+        if not self._async_closed:
+            if self._owns_async_http_client and self._async_http_client is not None:
+                await self._async_http_client.aclose()
+            self._async_closed = True
+        if self._owns_sync_http_client and self._sync_http_client is not None:
+            self.close_sync()
+
+    async def create_run(self, request: CreateRunRequest) -> CreateRunResponse:
+        """Create one run and return its accepted status response.
+
+        ``request`` must already be a public ``CreateRunRequest`` DTO. This
+        method performs exactly one ``POST /runs`` attempt and maps HTTPX
+        timeouts to ``DifyAgentTimeoutError``.
+        """
+        request_model = _validate_create_run_request(request)
+        try:
+            response = await self._get_async_http_client().post(
+                self._url("/runs"),
+                content=request_model.model_dump_json(),
+                headers=self._merged_headers({"Content-Type": "application/json"}),
+                timeout=self._timeout,
+            )
+        except httpx.TimeoutException as exc:
+            raise DifyAgentTimeoutError("create_run timed out") from exc
+        except httpx.RequestError as exc:
+            raise DifyAgentClientError(f"create_run request failed: {exc}") from exc
+        return _parse_model_response(response, CreateRunResponse)
+
+    def create_run_sync(self, request: CreateRunRequest) -> CreateRunResponse:
+        """Synchronous variant of ``create_run`` with the same no-retry contract."""
+        request_model = _validate_create_run_request(request)
+        try:
+            response = self._get_sync_http_client().post(
+                self._url("/runs"),
+                content=request_model.model_dump_json(),
+                headers=self._merged_headers({"Content-Type": "application/json"}),
+                timeout=self._timeout,
+            )
+        except httpx.TimeoutException as exc:
+            raise DifyAgentTimeoutError("create_run_sync timed out") from exc
+        except httpx.RequestError as exc:
+            raise DifyAgentClientError(f"create_run_sync request failed: {exc}") from exc
+        return _parse_model_response(response, CreateRunResponse)
+
+    async def get_run(self, run_id: str) -> RunStatusResponse:
+        """Return the current status for ``run_id`` or raise a mapped client error."""
+        try:
+            response = await self._get_async_http_client().get(
+                self._url(f"/runs/{quote(run_id, safe='')}"),
+                headers=self._merged_headers(),
+                timeout=self._timeout,
+            )
+        except httpx.TimeoutException as exc:
+            raise DifyAgentTimeoutError("get_run timed out") from exc
+        except httpx.RequestError as exc:
+            raise DifyAgentClientError(f"get_run request failed: {exc}") from exc
+        return _parse_model_response(response, RunStatusResponse)
+
+    def get_run_sync(self, run_id: str) -> RunStatusResponse:
+        """Synchronous variant of ``get_run``."""
+        try:
+            response = self._get_sync_http_client().get(
+                self._url(f"/runs/{quote(run_id, safe='')}"),
+                headers=self._merged_headers(),
+                timeout=self._timeout,
+            )
+        except httpx.TimeoutException as exc:
+            raise DifyAgentTimeoutError("get_run_sync timed out") from exc
+        except httpx.RequestError as exc:
+            raise DifyAgentClientError(f"get_run_sync request failed: {exc}") from exc
+        return _parse_model_response(response, RunStatusResponse)
+
+    async def get_events(self, run_id: str, *, after: str = "0-0", limit: int = 100) -> RunEventsResponse:
+        """Return one cursor-paginated page of events for ``run_id``."""
+        try:
+            response = await self._get_async_http_client().get(
+                self._url(f"/runs/{quote(run_id, safe='')}/events"),
+                params={"after": after, "limit": str(limit)},
+                headers=self._merged_headers(),
+                timeout=self._timeout,
+            )
+        except httpx.TimeoutException as exc:
+            raise DifyAgentTimeoutError("get_events timed out") from exc
+        except httpx.RequestError as exc:
+            raise DifyAgentClientError(f"get_events request failed: {exc}") from exc
+        return _parse_model_response(response, RunEventsResponse)
+
+    def get_events_sync(self, run_id: str, *, after: str = "0-0", limit: int = 100) -> RunEventsResponse:
+        """Synchronous variant of ``get_events``."""
+        try:
+            response = self._get_sync_http_client().get(
+                self._url(f"/runs/{quote(run_id, safe='')}/events"),
+                params={"after": after, "limit": str(limit)},
+                headers=self._merged_headers(),
+                timeout=self._timeout,
+            )
+        except httpx.TimeoutException as exc:
+            raise DifyAgentTimeoutError("get_events_sync timed out") from exc
+        except httpx.RequestError as exc:
+            raise DifyAgentClientError(f"get_events_sync request failed: {exc}") from exc
+        return _parse_model_response(response, RunEventsResponse)
+
+    async def stream_events(
+        self,
+        run_id: str,
+        *,
+        after: str | None = None,
+        reconnect: bool = True,
+        max_reconnects: int | None = None,
+        reconnect_delay_seconds: float = 1.0,
+        until_terminal: bool = True,
+    ) -> AsyncIterator[RunEvent]:
+        """Yield typed events from SSE with cursor-based reconnect.
+
+        The initial cursor is ``after`` or ``"0-0"``. After every yielded event
+        with an id, reconnects resume from that id using the ``after`` query
+        parameter. HTTP 5xx stream responses are retried, but HTTP 4xx responses,
+        DTO validation failures, and malformed SSE frames are not retried. By
+        default iteration stops after ``run_succeeded`` or ``run_failed``.
+        """
+        _validate_stream_options(max_reconnects, reconnect_delay_seconds)
+        cursor = after or "0-0"
+        reconnect_attempts = 0
+        while True:
+            try:
+                async for event in self._stream_events_once(run_id, after=cursor):
+                    if event.id is not None:
+                        cursor = event.id
+                    yield event
+                    if until_terminal and event.type in _TERMINAL_EVENT_TYPES:
+                        return
+            except _ReconnectableStreamError as exc:
+                if not reconnect:
+                    raise exc.error from exc
+                reconnect_attempts = _next_reconnect_attempt(
+                    reconnect_attempts,
+                    max_reconnects=max_reconnects,
+                    error=exc.error,
+                )
+                await _sleep_async(reconnect_delay_seconds)
+                continue
+            if not reconnect:
+                return
+            reconnect_attempts = _next_reconnect_attempt(
+                reconnect_attempts,
+                max_reconnects=max_reconnects,
+                error=DifyAgentStreamError("SSE stream ended before a terminal event"),
+            )
+            await _sleep_async(reconnect_delay_seconds)
+
+    def stream_events_sync(
+        self,
+        run_id: str,
+        *,
+        after: str | None = None,
+        reconnect: bool = True,
+        max_reconnects: int | None = None,
+        reconnect_delay_seconds: float = 1.0,
+        until_terminal: bool = True,
+    ) -> Iterator[RunEvent]:
+        """Synchronous variant of ``stream_events`` with the same reconnect rules."""
+        _validate_stream_options(max_reconnects, reconnect_delay_seconds)
+        cursor = after or "0-0"
+        reconnect_attempts = 0
+        while True:
+            try:
+                for event in self._stream_events_once_sync(run_id, after=cursor):
+                    if event.id is not None:
+                        cursor = event.id
+                    yield event
+                    if until_terminal and event.type in _TERMINAL_EVENT_TYPES:
+                        return
+            except _ReconnectableStreamError as exc:
+                if not reconnect:
+                    raise exc.error from exc
+                reconnect_attempts = _next_reconnect_attempt(
+                    reconnect_attempts,
+                    max_reconnects=max_reconnects,
+                    error=exc.error,
+                )
+                _sleep_sync(reconnect_delay_seconds)
+                continue
+            if not reconnect:
+                return
+            reconnect_attempts = _next_reconnect_attempt(
+                reconnect_attempts,
+                max_reconnects=max_reconnects,
+                error=DifyAgentStreamError("SSE stream ended before a terminal event"),
+            )
+            _sleep_sync(reconnect_delay_seconds)
+
+    async def wait_run(
+        self,
+        run_id: str,
+        *,
+        poll_interval_seconds: float = 1.0,
+        timeout_seconds: float | None = None,
+    ) -> RunStatusResponse:
+        """Poll run status until it becomes terminal and return the final status."""
+        _validate_wait_options(poll_interval_seconds, timeout_seconds)
+        deadline = time.monotonic() + timeout_seconds if timeout_seconds is not None else None
+        while True:
+            status = await self.get_run(run_id)
+            if status.status in _TERMINAL_RUN_STATUSES:
+                return status
+            sleep_for = _next_sleep_seconds(poll_interval_seconds, deadline)
+            if sleep_for is None:
+                raise DifyAgentTimeoutError(f"run {run_id!r} did not finish before timeout")
+            await _sleep_async(sleep_for)
+
+    def wait_run_sync(
+        self,
+        run_id: str,
+        *,
+        poll_interval_seconds: float = 1.0,
+        timeout_seconds: float | None = None,
+    ) -> RunStatusResponse:
+        """Synchronous variant of ``wait_run``."""
+        _validate_wait_options(poll_interval_seconds, timeout_seconds)
+        deadline = time.monotonic() + timeout_seconds if timeout_seconds is not None else None
+        while True:
+            status = self.get_run_sync(run_id)
+            if status.status in _TERMINAL_RUN_STATUSES:
+                return status
+            sleep_for = _next_sleep_seconds(poll_interval_seconds, deadline)
+            if sleep_for is None:
+                raise DifyAgentTimeoutError(f"run {run_id!r} did not finish before timeout")
+            _sleep_sync(sleep_for)
+
+    async def _stream_events_once(self, run_id: str, *, after: str) -> AsyncIterator[RunEvent]:
+        """Open one SSE connection and yield events until it ends or fails."""
+        try:
+            async with self._get_async_http_client().stream(
+                "GET",
+                self._url(f"/runs/{quote(run_id, safe='')}/events/sse"),
+                params={"after": after},
+                headers=self._merged_headers(),
+                timeout=self._stream_timeout,
+            ) as response:
+                if response.status_code >= 400:
+                    _ = await response.aread()
+                _raise_for_stream_status(response)
+                decoder = _SSEDecoder()
+                async for line in response.aiter_lines():
+                    event = decoder.feed_line(line)
+                    if event is not None:
+                        yield event
+        except DifyAgentHTTPError:
+            raise
+        except DifyAgentStreamError:
+            raise
+        except httpx.TimeoutException as exc:
+            raise _ReconnectableStreamError(DifyAgentTimeoutError("SSE stream timed out")) from exc
+        except httpx.TransportError as exc:
+            raise _ReconnectableStreamError(DifyAgentStreamError(f"SSE stream failed: {exc}")) from exc
+        except httpx.StreamError as exc:
+            raise _ReconnectableStreamError(DifyAgentStreamError(f"SSE stream failed: {exc}")) from exc
+
+    def _stream_events_once_sync(self, run_id: str, *, after: str) -> Iterator[RunEvent]:
+        """Open one synchronous SSE connection and yield events until it ends or fails."""
+        try:
+            with self._get_sync_http_client().stream(
+                "GET",
+                self._url(f"/runs/{quote(run_id, safe='')}/events/sse"),
+                params={"after": after},
+                headers=self._merged_headers(),
+                timeout=self._stream_timeout,
+            ) as response:
+                if response.status_code >= 400:
+                    _ = response.read()
+                _raise_for_stream_status(response)
+                decoder = _SSEDecoder()
+                for line in response.iter_lines():
+                    event = decoder.feed_line(line)
+                    if event is not None:
+                        yield event
+        except DifyAgentHTTPError:
+            raise
+        except DifyAgentStreamError:
+            raise
+        except httpx.TimeoutException as exc:
+            raise _ReconnectableStreamError(DifyAgentTimeoutError("SSE stream timed out")) from exc
+        except httpx.TransportError as exc:
+            raise _ReconnectableStreamError(DifyAgentStreamError(f"SSE stream failed: {exc}")) from exc
+        except httpx.StreamError as exc:
+            raise _ReconnectableStreamError(DifyAgentStreamError(f"SSE stream failed: {exc}")) from exc
+
+    def _get_sync_http_client(self) -> httpx.Client:
+        """Return an open sync HTTPX client, creating an owned one lazily."""
+        if self._sync_closed:
+            raise DifyAgentClientError("sync client is closed")
+        if self._sync_http_client is None:
+            self._sync_http_client = httpx.Client(timeout=self._timeout, headers=self._headers)
+        return self._sync_http_client
+
+    def _get_async_http_client(self) -> httpx.AsyncClient:
+        """Return an open async HTTPX client, creating an owned one lazily."""
+        if self._async_closed:
+            raise DifyAgentClientError("async client is closed")
+        if self._async_http_client is None:
+            self._async_http_client = httpx.AsyncClient(timeout=self._timeout, headers=self._headers)
+        return self._async_http_client
+
+    def _url(self, path: str) -> str:
+        """Build an absolute URL from the configured base and API path."""
+        return f"{self._base_url}{path}"
+
+    def _merged_headers(self, extra: dict[str, str] | None = None) -> dict[str, str]:
+        """Return per-request headers without mutating client defaults."""
+        headers = dict(self._headers)
+        if extra is not None:
+            headers.update(extra)
+        return headers
+
+
+def _validate_create_run_request(request: CreateRunRequest) -> CreateRunRequest:
+    """Reject raw payloads so create-run uses the public request DTO boundary."""
+    if isinstance(request, CreateRunRequest):
+        return request
+    raise DifyAgentValidationError(detail="request must be a CreateRunRequest")
+
+
+def _parse_model_response(response: httpx.Response, model_type: type[_ResponseModelT]) -> _ResponseModelT:
+    """Map HTTP errors and parse a Pydantic response DTO."""
+    _raise_for_status(response)
+    try:
+        return model_type.model_validate_json(response.content)
+    except ValidationError as exc:
+        raise DifyAgentValidationError(
+            detail=exc.errors(include_url=False),
+            status_code=response.status_code,
+        ) from exc
+
+
+def _raise_for_status(response: httpx.Response) -> None:
+    """Raise the configured client exception for HTTP 4xx/5xx responses."""
+    if response.status_code < 400:
+        return
+    detail = _extract_error_detail(response)
+    if response.status_code == 404:
+        raise DifyAgentNotFoundError(status_code=response.status_code, detail=detail)
+    if response.status_code == 422:
+        raise DifyAgentValidationError(status_code=response.status_code, detail=detail)
+    raise DifyAgentHTTPError(status_code=response.status_code, detail=detail)
+
+
+def _raise_for_stream_status(response: httpx.Response) -> None:
+    """Raise terminal 4xx errors or wrap retryable SSE 5xx responses."""
+    try:
+        _raise_for_status(response)
+    except DifyAgentHTTPError as exc:
+        if response.status_code >= 500:
+            raise _ReconnectableStreamError(
+                DifyAgentStreamError(f"SSE stream HTTP {response.status_code}: {exc.detail}")
+            ) from exc
+        raise
+
+
+def _extract_error_detail(response: httpx.Response) -> object:
+    """Extract FastAPI's ``detail`` field when present, falling back to text."""
+    try:
+        payload = cast(object, response.json())
+    except (ValueError, httpx.ResponseNotRead):
+        return response.text or response.reason_phrase
+    if isinstance(payload, dict) and "detail" in payload:
+        return cast(object, payload["detail"])
+    return cast(object, payload)
+
+
+def _next_reconnect_attempt(
+    reconnect_attempts: int,
+    *,
+    max_reconnects: int | None,
+    error: DifyAgentClientError,
+) -> int:
+    """Increment reconnect attempts or raise when the configured budget is spent."""
+    if max_reconnects is not None and reconnect_attempts >= max_reconnects:
+        raise DifyAgentStreamError("SSE stream reconnect attempts exhausted") from error
+    return reconnect_attempts + 1
+
+
+def _validate_stream_options(max_reconnects: int | None, reconnect_delay_seconds: float) -> None:
+    """Reject stream options that cannot produce deterministic reconnect behavior."""
+    if max_reconnects is not None and max_reconnects < 0:
+        raise DifyAgentValidationError(detail="max_reconnects must be non-negative")
+    if reconnect_delay_seconds < 0:
+        raise DifyAgentValidationError(detail="reconnect_delay_seconds must be non-negative")
+
+
+def _validate_wait_options(poll_interval_seconds: float, timeout_seconds: float | None) -> None:
+    """Reject wait options that would make polling ambiguous."""
+    if poll_interval_seconds < 0:
+        raise DifyAgentValidationError(detail="poll_interval_seconds must be non-negative")
+    if timeout_seconds is not None and timeout_seconds < 0:
+        raise DifyAgentValidationError(detail="timeout_seconds must be non-negative")
+
+
+def _next_sleep_seconds(poll_interval_seconds: float, deadline: float | None) -> float | None:
+    """Return the next polling sleep duration, or ``None`` when timed out."""
+    if deadline is None:
+        return poll_interval_seconds
+    remaining = deadline - time.monotonic()
+    if remaining <= 0:
+        return None
+    return min(poll_interval_seconds, remaining)
+
+
+async def _sleep_async(seconds: float) -> None:
+    """Sleep asynchronously, skipping the call for zero-second test delays."""
+    if seconds > 0:
+        await asyncio.sleep(seconds)
+
+
+def _sleep_sync(seconds: float) -> None:
+    """Sleep synchronously, skipping the call for zero-second test delays."""
+    if seconds > 0:
+        time.sleep(seconds)
+
+
+__all__ = [
+    "Client",
+    "DifyAgentClientError",
+    "DifyAgentHTTPError",
+    "DifyAgentNotFoundError",
+    "DifyAgentStreamError",
+    "DifyAgentTimeoutError",
+    "DifyAgentValidationError",
+]
diff --git a/dify-agent/src/dify_agent/layers/__init__.py b/dify-agent/src/dify_agent/layers/__init__.py
new file mode 100644
index 0000000000..518fbf9bd9
--- /dev/null
+++ b/dify-agent/src/dify_agent/layers/__init__.py
@@ -0,0 +1,3 @@
+"""Dify-owned Agenton layer packages."""
+
+__all__: list[str] = []
diff --git a/dify-agent/src/dify_agent/layers/dify_plugin/__init__.py b/dify-agent/src/dify_agent/layers/dify_plugin/__init__.py
new file mode 100644
index 0000000000..5b2f1dccce
--- /dev/null
+++ b/dify-agent/src/dify_agent/layers/dify_plugin/__init__.py
@@ -0,0 +1,21 @@
+"""Client-safe exports for Dify plugin DTOs and public layer type ids.
+
+Implementation layers live in sibling modules and require server-side runtime
+dependencies. Keep this package root import-safe for client-only installs.
+"""
+
+from dify_agent.layers.dify_plugin.configs import (
+    DIFY_PLUGIN_LAYER_TYPE_ID,
+    DIFY_PLUGIN_LLM_LAYER_TYPE_ID,
+    DifyPluginCredentialValue,
+    DifyPluginLLMLayerConfig,
+    DifyPluginLayerConfig,
+)
+
+__all__ = [
+    "DIFY_PLUGIN_LAYER_TYPE_ID",
+    "DIFY_PLUGIN_LLM_LAYER_TYPE_ID",
+    "DifyPluginCredentialValue",
+    "DifyPluginLLMLayerConfig",
+    "DifyPluginLayerConfig",
+]
diff --git a/dify-agent/src/dify_agent/layers/dify_plugin/configs.py b/dify-agent/src/dify_agent/layers/dify_plugin/configs.py
new file mode 100644
index 0000000000..5fff7dde51
--- /dev/null
+++ b/dify-agent/src/dify_agent/layers/dify_plugin/configs.py
@@ -0,0 +1,50 @@
+"""Client-safe DTOs for Dify plugin-backed Agenton layers.
+
+This module intentionally contains only public config schemas and scalar type
+aliases plus stable layer type identifiers. Runtime objects such as HTTP
+clients, server settings, and adapter implementations live in sibling
+implementation modules so clients can build run requests without importing
+server-only dependencies.
+"""
+
+from typing import ClassVar, Final, TypeAlias
+
+from pydantic import ConfigDict, Field
+from pydantic_ai.settings import ModelSettings
+
+from agenton.layers import LayerConfig
+
+
+DifyPluginCredentialValue: TypeAlias = str | int | float | bool | None
+DIFY_PLUGIN_LAYER_TYPE_ID: Final[str] = "dify.plugin"
+DIFY_PLUGIN_LLM_LAYER_TYPE_ID: Final[str] = "dify.plugin.llm"
+
+
+class DifyPluginLayerConfig(LayerConfig):
+    """Public config for the plugin daemon tenant/plugin context layer."""
+
+    tenant_id: str
+    plugin_id: str
+    user_id: str | None = None
+
+    model_config: ClassVar[ConfigDict] = ConfigDict(extra="forbid", arbitrary_types_allowed=True)
+
+
+class DifyPluginLLMLayerConfig(LayerConfig):
+    """Public config for selecting a business provider/model from a plugin."""
+
+    model_provider: str
+    model: str
+    credentials: dict[str, DifyPluginCredentialValue] = Field(default_factory=dict)
+    model_settings: ModelSettings | None = None
+
+    model_config: ClassVar[ConfigDict] = ConfigDict(extra="forbid", arbitrary_types_allowed=True)
+
+
+__all__ = [
+    "DIFY_PLUGIN_LAYER_TYPE_ID",
+    "DIFY_PLUGIN_LLM_LAYER_TYPE_ID",
+    "DifyPluginCredentialValue",
+    "DifyPluginLLMLayerConfig",
+    "DifyPluginLayerConfig",
+]
diff --git a/dify-agent/src/dify_agent/layers/dify_plugin/llm_layer.py b/dify-agent/src/dify_agent/layers/dify_plugin/llm_layer.py
new file mode 100644
index 0000000000..4ac053df3f
--- /dev/null
+++ b/dify-agent/src/dify_agent/layers/dify_plugin/llm_layer.py
@@ -0,0 +1,55 @@
+"""Dify plugin LLM model layer.
+
+This layer owns model capability resolution for Dify plugin-backed LLMs. It
+depends on ``DifyPluginLayer`` for daemon identity through Agenton's direct
+dependency binding and returns a Pydantic AI model adapter configured from the
+public LLM layer DTO. Runtime code supplies the FastAPI lifespan-owned shared
+HTTP client to ``get_model``; the layer does not own or discover live resources.
+The daemon provider carries plugin transport identity, while the DTO's
+``model_provider`` is passed to the adapter as request-level model identity.
+"""
+
+from dataclasses import dataclass
+
+import httpx
+from typing_extensions import Self, override
+
+from agenton.layers import LayerDeps, PlainLayer
+from dify_agent.adapters.llm import DifyLLMAdapterModel
+from dify_agent.layers.dify_plugin.configs import DIFY_PLUGIN_LLM_LAYER_TYPE_ID, DifyPluginLLMLayerConfig
+from dify_agent.layers.dify_plugin.plugin_layer import DifyPluginLayer
+
+
+class DifyPluginLLMDeps(LayerDeps):
+    """Dependencies required by ``DifyPluginLLMLayer``."""
+
+    plugin: DifyPluginLayer  # pyright: ignore[reportUninitializedInstanceVariable]
+
+
+@dataclass(slots=True)
+class DifyPluginLLMLayer(PlainLayer[DifyPluginLLMDeps, DifyPluginLLMLayerConfig]):
+    """Layer that creates the Dify plugin-daemon Pydantic AI model."""
+
+    type_id = DIFY_PLUGIN_LLM_LAYER_TYPE_ID
+
+    config: DifyPluginLLMLayerConfig
+
+    @classmethod
+    @override
+    def from_config(cls, config: DifyPluginLLMLayerConfig) -> Self:
+        """Create the LLM layer from validated public config."""
+        return cls(config=config)
+
+    def get_model(self, *, http_client: httpx.AsyncClient) -> DifyLLMAdapterModel:
+        """Return the configured model using the directly bound plugin dependency."""
+        provider = self.deps.plugin.create_daemon_provider(http_client=http_client)
+        return DifyLLMAdapterModel(
+            model=self.config.model,
+            daemon_provider=provider,
+            model_provider=self.config.model_provider,
+            credentials=dict(self.config.credentials),
+            model_settings=self.config.model_settings,
+        )
+
+
+__all__ = ["DifyPluginLLMDeps", "DifyPluginLLMLayer"]
diff --git a/dify-agent/src/dify_agent/layers/dify_plugin/plugin_layer.py b/dify-agent/src/dify_agent/layers/dify_plugin/plugin_layer.py
new file mode 100644
index 0000000000..71c649b6de
--- /dev/null
+++ b/dify-agent/src/dify_agent/layers/dify_plugin/plugin_layer.py
@@ -0,0 +1,69 @@
+"""Runtime Dify plugin context layer.
+
+The public config identifies tenant/plugin/user context only. Plugin daemon URL
+and API key are server-side settings injected by the provider factory. The layer
+is intentionally config/settings-only under Agenton's state-only core: it does
+not open, cache, close, or snapshot HTTP clients, and its lifecycle hooks remain
+the inherited no-op hooks. Runtime code passes the FastAPI lifespan-owned shared
+``httpx.AsyncClient`` into ``create_daemon_provider`` for each model adapter.
+Business model-provider names belong to the LLM layer/model request, not this
+daemon context layer.
+"""
+
+from dataclasses import dataclass
+
+import httpx
+from typing_extensions import Self, override
+
+from agenton.layers import EmptyRuntimeState, NoLayerDeps, PlainLayer
+from dify_agent.adapters.llm import DifyPluginDaemonProvider
+from dify_agent.layers.dify_plugin.configs import DIFY_PLUGIN_LAYER_TYPE_ID, DifyPluginLayerConfig
+
+
+@dataclass(slots=True)
+class DifyPluginLayer(PlainLayer[NoLayerDeps, DifyPluginLayerConfig, EmptyRuntimeState]):
+    """Layer that carries plugin daemon identity without owning live resources."""
+
+    type_id = DIFY_PLUGIN_LAYER_TYPE_ID
+
+    config: DifyPluginLayerConfig
+    daemon_url: str
+    daemon_api_key: str
+
+    @classmethod
+    @override
+    def from_config(cls, config: DifyPluginLayerConfig) -> Self:
+        """Reject construction without server-injected daemon settings."""
+        del config
+        raise TypeError("DifyPluginLayer requires server-side daemon settings and must use a provider factory.")
+
+    @classmethod
+    def from_config_with_settings(
+        cls,
+        config: DifyPluginLayerConfig,
+        *,
+        daemon_url: str,
+        daemon_api_key: str,
+    ) -> Self:
+        """Create a plugin layer from public config plus server-only daemon settings."""
+        return cls(config=config, daemon_url=daemon_url, daemon_api_key=daemon_api_key)
+
+    def create_daemon_provider(self, *, http_client: httpx.AsyncClient) -> DifyPluginDaemonProvider:
+        """Return a daemon provider backed by the shared plugin daemon client.
+
+        Raises:
+            RuntimeError: if ``http_client`` has already been closed.
+        """
+        if http_client.is_closed:
+            raise RuntimeError("DifyPluginLayer.create_daemon_provider() requires an open shared HTTP client.")
+        return DifyPluginDaemonProvider(
+            tenant_id=self.config.tenant_id,
+            plugin_id=self.config.plugin_id,
+            plugin_daemon_url=self.daemon_url,
+            plugin_daemon_api_key=self.daemon_api_key,
+            user_id=self.config.user_id,
+            http_client=http_client,
+        )
+
+
+__all__ = ["DifyPluginLayer"]
diff --git a/dify-agent/src/dify_agent/layers/output/__init__.py b/dify-agent/src/dify_agent/layers/output/__init__.py
new file mode 100644
index 0000000000..076fd00b1a
--- /dev/null
+++ b/dify-agent/src/dify_agent/layers/output/__init__.py
@@ -0,0 +1,10 @@
+"""Client-safe exports for the Dify structured output layer DTOs.
+
+The runtime layer implementation lives in ``output_layer.py`` and imports
+server-side execution dependencies. Keep this package root import-safe for
+client code that only needs to build run requests.
+"""
+
+from dify_agent.layers.output.configs import DIFY_OUTPUT_LAYER_TYPE_ID, DifyOutputLayerConfig
+
+__all__ = ["DIFY_OUTPUT_LAYER_TYPE_ID", "DifyOutputLayerConfig"]
diff --git a/dify-agent/src/dify_agent/layers/output/configs.py b/dify-agent/src/dify_agent/layers/output/configs.py
new file mode 100644
index 0000000000..bead8a354f
--- /dev/null
+++ b/dify-agent/src/dify_agent/layers/output/configs.py
@@ -0,0 +1,62 @@
+"""Client-safe DTOs for Dify Agent structured output configuration.
+
+This module contains only the public config schema and stable layer type id for
+the optional structured output layer. Runtime conversion into pydantic-ai output
+specifications happens in ``dify_agent.layers.output.output_layer`` so client
+imports do not pull in server execution code.
+"""
+
+from __future__ import annotations
+
+import re
+from typing import ClassVar, Final
+
+from pydantic import ConfigDict, JsonValue, field_validator
+
+from agenton.layers import LayerConfig
+
+
+DIFY_OUTPUT_LAYER_TYPE_ID: Final[str] = "dify.output"
+_OUTPUT_TOOL_NAME_PATTERN: Final[re.Pattern[str]] = re.compile(r"^[A-Za-z0-9_-]{1,64}$")
+
+
+class DifyOutputLayerConfig(LayerConfig):
+    """Public config for the conventionally named structured output layer.
+
+    The runtime only reads the layer named by
+    ``dify_agent.protocol.DIFY_AGENT_OUTPUT_LAYER_ID``. ``json_schema`` must
+    therefore describe the final top-level object output, not a provider-specific
+    response wrapper. First-version support is intentionally limited to object
+    schemas plus local ``#/$defs/...`` references so the same caller-provided
+    schema can drive both runtime validation and model-facing tool exposure; the
+    exposure copy may inline supported ``$defs`` refs as needed for the
+    Pydantic/Pydantic AI integration. ``name`` becomes the structured-output
+    tool name exposed to pydantic-ai, defaults to ``final_result``, and must be
+    1-64 ASCII letters, numbers, underscores, or hyphens so downstream model
+    providers accept it consistently. ``description`` and ``strict`` are passed
+    through to the generated structured-output tool definition.
+    """
+
+    json_schema: dict[str, JsonValue]
+    name: str = "final_result"
+    description: str | None = None
+    strict: bool | None = None
+
+    model_config: ClassVar[ConfigDict] = ConfigDict(extra="forbid")
+
+    @field_validator("json_schema")
+    @classmethod
+    def _ensure_object_schema(cls, value: dict[str, JsonValue]) -> dict[str, JsonValue]:
+        if value.get("type") != "object":
+            raise ValueError("Schema must declare an object output.")
+        return value
+
+    @field_validator("name")
+    @classmethod
+    def _ensure_safe_tool_name(cls, value: str) -> str:
+        if not _OUTPUT_TOOL_NAME_PATTERN.fullmatch(value):
+            raise ValueError("name must be 1-64 characters of letters, numbers, underscores, or hyphens.")
+        return value
+
+
+__all__ = ["DIFY_OUTPUT_LAYER_TYPE_ID", "DifyOutputLayerConfig"]
diff --git a/dify-agent/src/dify_agent/layers/output/output_layer.py b/dify-agent/src/dify_agent/layers/output/output_layer.py
new file mode 100644
index 0000000000..f07dc309da
--- /dev/null
+++ b/dify-agent/src/dify_agent/layers/output/output_layer.py
@@ -0,0 +1,319 @@
+"""Runtime layer for Dify Agent structured final output contracts.
+
+``DifyOutputLayer`` is intentionally state-free and does not participate in
+prompt, user prompt, or tool aggregation. Instead, the scheduler and runner read
+the conventionally named layer after ``Compositor.enter(...)`` and convert its
+top-level object JSON Schema into a ``ToolOutput(...)`` whose inner dynamic type
+both exposes the model-facing schema and validates runtime output. ``jsonschema``
+performs the real content validation inside that custom Pydantic-compatible
+dict-like type, so Pydantic AI's normal output validation flow can request
+retries without a separate Dify-owned output-validator callback. Keeping both
+steps here lets request validation and execution reuse the same schema checks
+without teaching Agenton core about output aggregation.
+"""
+
+from __future__ import annotations
+
+from collections.abc import Iterable, Sequence
+from copy import deepcopy
+from dataclasses import dataclass
+from typing import Any, Final, cast
+
+from jsonschema import SchemaError
+from jsonschema.exceptions import ValidationError as JsonSchemaValidationError
+from jsonschema.protocols import Validator as JsonSchemaValidator
+from jsonschema.validators import validator_for
+from pydantic import GetCoreSchemaHandler, GetJsonSchemaHandler, JsonValue
+from pydantic.json_schema import JsonSchemaValue
+from pydantic_ai.output import OutputSpec, ToolOutput
+from pydantic_core import PydanticCustomError, core_schema
+from typing_extensions import Self, assert_never, override
+
+
+from agenton.layers import EmptyRuntimeState, NoLayerDeps, PlainLayer
+from dify_agent.layers.output.configs import DIFY_OUTPUT_LAYER_TYPE_ID, DifyOutputLayerConfig
+
+
+_LOCAL_DEFS_REF_PREFIX: Final[str] = "#/$defs/"
+_NON_SCHEMA_VALUE_KEYWORDS: Final[frozenset[str]] = frozenset({"const", "default", "enum", "example", "examples"})
+
+
+@dataclass(frozen=True, slots=True)
+class DifyOutputContract:
+    """Resolved pydantic-ai output spec for one run.
+
+    ``output_type`` controls both the model-facing output tool schema and the
+    runtime validation behavior because the type inside ``ToolOutput`` carries
+    custom Pydantic hooks for JSON Schema exposure plus output validation.
+    """
+
+    output_type: OutputSpec[object]
+
+
+@dataclass(slots=True)
+class DifyOutputLayer(PlainLayer[NoLayerDeps, DifyOutputLayerConfig, EmptyRuntimeState]):
+    """State-free layer that stores the final structured output contract."""
+
+    type_id = DIFY_OUTPUT_LAYER_TYPE_ID
+
+    config: DifyOutputLayerConfig
+
+    @classmethod
+    @override
+    def from_config(cls, config: DifyOutputLayerConfig) -> Self:
+        """Create the output layer from validated public config."""
+        return cls(config=DifyOutputLayerConfig.model_validate(config))
+
+    def build_output_contract(self) -> DifyOutputContract:
+        """Return the pydantic-ai output contract for this layer.
+
+        The returned contract always keeps model-facing schema exposure plus
+        runtime validation inside the same dynamically generated dict-like type.
+        First-version support is intentionally limited to top-level object JSON
+        Schemas so the same schema can be validated with ``jsonschema`` and then
+        exposed to Pydantic AI without any wrapper/unwrapper translation.
+
+        Raises:
+            ValueError: If the JSON Schema is invalid, contains non-local
+                references, or cannot be represented as a supported structured
+                output tool schema.
+        """
+        user_schema = deepcopy(self.config.json_schema)
+        _reject_non_local_refs(user_schema)
+        validated_output_type = _build_validated_output_type(
+            user_schema,
+            name=self.config.name,
+            description=self.config.description,
+        )
+
+        return DifyOutputContract(
+            output_type=cast(
+                OutputSpec[object],
+                ToolOutput(
+                    validated_output_type,
+                    name=self.config.name,
+                    strict=self.config.strict,
+                ),
+            ),
+        )
+
+
+def _build_json_schema_validator(schema: dict[str, JsonValue]) -> JsonSchemaValidator:
+    """Build a reusable validator after checking the schema itself."""
+    validator_class = validator_for(schema)
+    try:
+        validator_class.check_schema(schema)
+    except SchemaError as exc:
+        raise ValueError(str(exc)) from exc
+    return validator_class(schema)
+
+
+def _build_validated_output_type(
+    schema: dict[str, JsonValue],
+    *,
+    name: str,
+    description: str | None,
+) -> type[dict[str, object]]:
+    """Create a dict-like output type with custom JSON schema and validation hooks.
+
+    The generated type is unique per output layer config. Its Pydantic core
+    schema performs real ``jsonschema`` validation, while its JSON schema hook
+    exposes a model-facing schema that Pydantic AI can turn into an output tool.
+    """
+    validator = _build_json_schema_validator(schema)
+    exposed_schema = _build_exposed_json_schema(schema, name=name, description=description)
+    type_name = _build_output_type_name(name)
+
+    def _validate_output(value: dict[str, object]) -> object:
+        errors = sorted(validator.iter_errors(cast(JsonValue, value)), key=lambda error: _sort_error_path(error.path))
+        if errors:
+            message = _format_json_schema_error(errors[0])
+            raise PydanticCustomError(
+                "json_schema_validation",
+                "Output does not match JSON Schema: {message}",
+                {"message": message},
+            )
+        return validated_output_type(value)
+
+    @classmethod
+    def __get_pydantic_core_schema__(
+        cls,
+        source_type: Any,
+        handler: GetCoreSchemaHandler,
+    ) -> core_schema.CoreSchema:
+        del source_type, handler
+        return core_schema.no_info_after_validator_function(
+            _validate_output,
+            core_schema.dict_schema(
+                keys_schema=core_schema.str_schema(),
+                values_schema=core_schema.any_schema(),
+            ),
+        )
+
+    @classmethod
+    def __get_pydantic_json_schema__(
+        cls,
+        schema_: core_schema.CoreSchema,
+        handler: GetJsonSchemaHandler,
+    ) -> JsonSchemaValue:
+        del cls, schema_, handler
+        return deepcopy(exposed_schema)
+
+    namespace = {
+        "__module__": __name__,
+        "__is_model_like__": True,
+        "__get_pydantic_core_schema__": __get_pydantic_core_schema__,
+        "__get_pydantic_json_schema__": __get_pydantic_json_schema__,
+    }
+    validated_output_type = cast(type[dict[str, object]], type(type_name, (dict,), namespace))
+    return validated_output_type
+
+
+def _build_exposed_json_schema(
+    schema: dict[str, JsonValue],
+    *,
+    name: str,
+    description: str | None,
+) -> dict[str, JsonValue]:
+    """Return the schema exposed to the model through Pydantic AI.
+
+    Pydantic's JSON schema generation cannot safely emit custom schemas that keep
+    root-level ``$defs`` references intact, so the exposure copy is inlined for
+    supported local ``#/$defs/...`` refs before the final title/description is
+    attached.
+    """
+    exposed_schema = _inline_local_defs_refs(schema)
+    exposed_schema["title"] = name
+    if description is not None:
+        exposed_schema["description"] = description
+    return exposed_schema
+
+
+def _build_output_type_name(name: str) -> str:
+    """Return a deterministic debug-friendly class name for one output schema."""
+    sanitized = "".join(character if character.isalnum() else "_" for character in name).strip("_") or "final_result"
+    return f"DifyValidatedOutput_{sanitized}"
+
+
+def _reject_non_local_refs(schema: JsonValue) -> None:
+    """Reject references that would require external fetching or non-local state.
+
+    JSON Schema allows ordinary instance values under keywords such as ``const``
+    and ``examples``. Those values may themselves contain ``{"$ref": ...}`` as
+    plain data, so the traversal only inspects positions that still represent
+    schema documents rather than blindly recursing into every JSON object. This
+    first version only supports local refs under ``#/$defs/`` so every schema
+    accepted here can be materialized into the dynamic output type's exposed JSON
+    schema without needing general-purpose root rewriting.
+    """
+    for ref in _iter_schema_refs(schema):
+        if not ref.startswith("#"):
+            raise ValueError(
+                "Remote $ref values are not supported; only local fragment refs beginning with '#' are allowed."
+            )
+        if not ref.startswith(_LOCAL_DEFS_REF_PREFIX):
+            raise ValueError(
+                f"Only local refs under '#/$defs/' are supported in this version; got unsupported local ref {ref!r}."
+            )
+
+
+def _inline_local_defs_refs(schema: dict[str, JsonValue]) -> dict[str, JsonValue]:
+    """Inline supported root ``$defs`` refs for Pydantic schema exposure.
+
+    ``jsonschema`` can validate a schema that keeps local refs, but Pydantic's
+    JSON schema generation cannot safely preserve custom root ``$defs`` in this
+    integration. Inlining keeps the model-facing schema equivalent while still
+    letting runtime validation use the original schema document.
+    """
+    root_defs = schema.get("$defs")
+    if not isinstance(root_defs, dict):
+        return deepcopy(schema)
+
+    def resolve(node: JsonValue, *, ref_stack: tuple[str, ...]) -> JsonValue:
+        if isinstance(node, dict):
+            ref = node.get("$ref")
+            if isinstance(ref, str):
+                ref_name = ref.removeprefix(_LOCAL_DEFS_REF_PREFIX)
+                if ref_name in ref_stack:
+                    raise ValueError("Recursive $defs refs are not supported for structured output exposure.")
+                target = root_defs.get(ref_name)
+                if not isinstance(target, dict):
+                    raise ValueError(f"Local $ref {ref!r} could not be resolved from $defs.")
+                resolved_target = resolve(deepcopy(target), ref_stack=(*ref_stack, ref_name))
+                merged = cast(dict[str, JsonValue], deepcopy(resolved_target))
+                for key, value in node.items():
+                    if key == "$ref":
+                        continue
+                    if key in _NON_SCHEMA_VALUE_KEYWORDS:
+                        merged[key] = deepcopy(value)
+                    else:
+                        merged[key] = _resolve_or_copy(value, ref_stack=ref_stack)
+                return merged
+
+            resolved_node: dict[str, JsonValue] = {}
+            for key, value in node.items():
+                if key == "$defs":
+                    continue
+                if key in _NON_SCHEMA_VALUE_KEYWORDS:
+                    resolved_node[key] = deepcopy(value)
+                else:
+                    resolved_node[key] = _resolve_or_copy(value, ref_stack=ref_stack)
+            return resolved_node
+
+        if isinstance(node, list):
+            return [_resolve_or_copy(item, ref_stack=ref_stack) for item in node]
+
+        return deepcopy(node)
+
+    def _resolve_or_copy(value: JsonValue, *, ref_stack: tuple[str, ...]) -> JsonValue:
+        if isinstance(value, dict | list):
+            return resolve(value, ref_stack=ref_stack)
+        return deepcopy(value)
+
+    resolved_schema = resolve(deepcopy(schema), ref_stack=())
+    return cast(dict[str, JsonValue], resolved_schema)
+
+
+def _iter_schema_refs(schema: JsonValue) -> Iterable[str]:
+    if isinstance(schema, dict):
+        for key, value in schema.items():
+            if key == "$ref" and isinstance(value, str):
+                yield value
+            elif key in _NON_SCHEMA_VALUE_KEYWORDS:
+                continue
+            elif isinstance(value, dict | list):
+                yield from _iter_schema_refs(value)
+    elif isinstance(schema, list):
+        for item in schema:
+            if isinstance(item, dict | list):
+                yield from _iter_schema_refs(item)
+    elif isinstance(schema, str | int | float | bool) or schema is None:
+        return
+    else:  # pragma: no cover - JsonValue exhaustiveness guard
+        assert_never(schema)
+
+
+def _format_json_schema_error(error: JsonSchemaValidationError) -> str:
+    return f"{_format_json_path(list(error.path))}: {error.message}"
+
+
+def _format_json_path(path: Sequence[object]) -> str:
+    if not path:
+        return "$"
+
+    formatted_path = "$"
+    for segment in path:
+        if isinstance(segment, int):
+            formatted_path += f"[{segment}]"
+        elif isinstance(segment, str):
+            formatted_path += f".{segment}"
+        else:  # pragma: no cover - jsonschema paths are strings or integers
+            formatted_path += f"[{segment!r}]"
+    return formatted_path
+
+
+def _sort_error_path(path: Sequence[object]) -> tuple[str, ...]:
+    return tuple(str(segment) for segment in path)
+
+
+__all__ = ["DifyOutputContract", "DifyOutputLayer"]
diff --git a/dify-agent/src/dify_agent/protocol/__init__.py b/dify-agent/src/dify_agent/protocol/__init__.py
new file mode 100644
index 0000000000..7ab78a5e4d
--- /dev/null
+++ b/dify-agent/src/dify_agent/protocol/__init__.py
@@ -0,0 +1,53 @@
+"""Public protocol exports shared by the Dify Agent server and clients."""
+
+from .schemas import (
+    DIFY_AGENT_MODEL_LAYER_ID,
+    DIFY_AGENT_OUTPUT_LAYER_ID,
+    RUN_EVENT_ADAPTER,
+    BaseRunEvent,
+    CreateRunRequest,
+    CreateRunResponse,
+    EmptyRunEventData,
+    LayerExitSignals,
+    PydanticAIStreamRunEvent,
+    RunEvent,
+    RunComposition,
+    RunEventType,
+    RunEventsResponse,
+    RunFailedEvent,
+    RunFailedEventData,
+    RunLayerSpec,
+    RunStartedEvent,
+    RunStatus,
+    RunStatusResponse,
+    RunSucceededEvent,
+    RunSucceededEventData,
+    normalize_composition,
+    utc_now,
+)
+
+__all__ = [
+    "BaseRunEvent",
+    "CreateRunRequest",
+    "CreateRunResponse",
+    "DIFY_AGENT_MODEL_LAYER_ID",
+    "DIFY_AGENT_OUTPUT_LAYER_ID",
+    "EmptyRunEventData",
+    "LayerExitSignals",
+    "PydanticAIStreamRunEvent",
+    "RUN_EVENT_ADAPTER",
+    "RunComposition",
+    "RunEvent",
+    "RunEventType",
+    "RunEventsResponse",
+    "RunFailedEvent",
+    "RunFailedEventData",
+    "RunLayerSpec",
+    "RunStartedEvent",
+    "RunStatus",
+    "RunStatusResponse",
+    "RunSucceededEvent",
+    "RunSucceededEventData",
+    "normalize_composition",
+    "utc_now",
+]
diff --git a/dify-agent/src/dify_agent/protocol/schemas.py b/dify-agent/src/dify_agent/protocol/schemas.py
new file mode 100644
index 0000000000..430c4052a3
--- /dev/null
+++ b/dify-agent/src/dify_agent/protocol/schemas.py
@@ -0,0 +1,277 @@
+"""Public HTTP protocol schemas for the Dify Agent run API.
+
+This module is the shared wire contract for the FastAPI server, runtime event
+producers, storage adapters, and Python client. Create-run requests expose a
+Dify-friendly ``composition.layers[].config`` shape so callers can describe one
+layer in one place; the server normalizes that public DTO into Agenton's
+state-only ``CompositorConfig`` plus node-name keyed per-run configs before
+calling ``Compositor.enter(configs=...)``. Session snapshots and ``on_exit`` stay
+top-level because they are per-run resume state and exit policy, not graph node
+definition.
+
+The server still constructs layers only from explicit provider type ids, keeping
+HTTP input data-only and preventing unsafe import-path construction. Run events
+are append-only records; Redis stream ids (or in-memory equivalents in tests) are
+the public cursors used by polling and SSE replay. Event envelopes keep the
+public ``id``/``run_id``/``type``/``data``/``created_at`` shape, while each
+``type`` has a typed ``data`` model so OpenAPI, Redis replay, and clients parse
+the same payload contract. Model/provider selection is part of the submitted
+composition, not a top-level run field; the runtime reads the model layer named
+by ``DIFY_AGENT_MODEL_LAYER_ID`` and the optional structured output layer named
+by ``DIFY_AGENT_OUTPUT_LAYER_ID``. Request-level ``on_exit`` signals decide
+whether each active layer is suspended or deleted when the run exits, with
+suspend as the default so successful terminal events can include resumable
+snapshots. Successful runs publish the final JSON-safe agent output and the
+resumable Agenton session snapshot together on the terminal ``run_succeeded``
+event so consumers can treat terminal events as complete run summaries. Session
+snapshots carry only layer lifecycle/runtime state in compositor order; they do
+not persist output-layer config. Resumed structured-output runs therefore must
+resubmit the same ``output`` layer in ``composition.layers[]`` so snapshot layer
+name/order still matches the composition and the runtime can rebuild the same
+structured output contract.
+"""
+
+from datetime import datetime, timezone
+from typing import Annotated, ClassVar, Final, Literal, TypeAlias
+
+from pydantic import BaseModel, ConfigDict, Field, JsonValue, TypeAdapter
+from pydantic_ai.messages import AgentStreamEvent
+
+from agenton.compositor import CompositorConfig, CompositorSessionSnapshot, LayerConfigInput, LayerNodeConfig
+from agenton.layers import ExitIntent
+
+
+DIFY_AGENT_MODEL_LAYER_ID: Final[str] = "llm"
+DIFY_AGENT_OUTPUT_LAYER_ID: Final[str] = "output"
+RunStatus = Literal["running", "succeeded", "failed"]
+RunEventType = Literal[
+    "run_started",
+    "pydantic_ai_event",
+    "run_succeeded",
+    "run_failed",
+]
+
+
+def utc_now() -> datetime:
+    """Return the timezone-aware timestamp format used by public schemas."""
+    return datetime.now(timezone.utc)
+
+
+class LayerExitSignals(BaseModel):
+    """Requested per-layer lifecycle behavior for the top-level ``on_exit`` field."""
+
+    default: ExitIntent = ExitIntent.SUSPEND
+    layers: dict[str, ExitIntent] = Field(default_factory=dict)
+
+    model_config: ClassVar[ConfigDict] = ConfigDict(extra="forbid")
+
+
+class RunLayerSpec(BaseModel):
+    """Public graph node plus per-run layer config for one Dify Agent layer.
+
+    ``name``/``type``/``deps``/``metadata`` are normalized into Agenton's
+    provider-backed graph config. ``config`` is kept separate at the Agenton
+    boundary and passed to ``Compositor.enter(configs=...)`` keyed by ``name``;
+    existing layer config DTO instances are preserved so client code can stay
+    DTO-first without being forced into raw dictionaries.
+    """
+
+    name: str
+    type: str
+    deps: dict[str, str] = Field(default_factory=dict)
+    metadata: dict[str, JsonValue] = Field(default_factory=dict)
+    config: LayerConfigInput = None
+
+    model_config: ClassVar[ConfigDict] = ConfigDict(extra="forbid")
+
+
+class RunComposition(BaseModel):
+    """Public create-run composition DTO.
+
+    The public shape intentionally differs from Agenton's internal
+    ``CompositorConfig`` by carrying each layer's per-run config next to its graph
+    node fields. Use ``normalize_composition`` at server/runtime boundaries before
+    constructing a ``Compositor``.
+    """
+
+    schema_version: int = 1
+    layers: list[RunLayerSpec]
+
+    model_config: ClassVar[ConfigDict] = ConfigDict(extra="forbid")
+
+
+class CreateRunRequest(BaseModel):
+    """Request body for creating one async agent run.
+
+    Model/provider configuration must be supplied through the composition layer
+    named by ``DIFY_AGENT_MODEL_LAYER_ID``. Structured output may be supplied
+    through the optional composition layer named by
+    ``DIFY_AGENT_OUTPUT_LAYER_ID``. ``on_exit`` defaults every active layer to
+    suspend so callers receive a resumable success snapshot unless they
+    explicitly request delete for one or more layers. Session snapshots do not
+    preserve output-layer config, so resume requests that rely on structured
+    output must include the same ``output`` layer in ``composition.layers[]`` to
+    keep snapshot compatibility and rebuild the output schema.
+    """
+
+    composition: RunComposition
+    session_snapshot: CompositorSessionSnapshot | None = None
+    on_exit: LayerExitSignals = Field(default_factory=LayerExitSignals)
+
+    model_config: ClassVar[ConfigDict] = ConfigDict(extra="forbid")
+
+
+def normalize_composition(composition: RunComposition) -> tuple[CompositorConfig, dict[str, LayerConfigInput]]:
+    """Split public Dify composition into Agenton's graph config and layer configs.
+
+    Returns:
+        A ``CompositorConfig`` containing only graph fields and a node-name keyed
+        config mapping suitable for ``Compositor.enter(configs=...)``.
+
+    The helper is the stable public-to-Agenton boundary: it preserves concrete
+    ``LayerConfig`` DTO inputs where possible, does not accept legacy
+    ``LayerNodeConfig(config=...)`` payloads, and keeps session snapshots plus
+    exit signals out of graph normalization.
+    """
+
+    graph_config = CompositorConfig(
+        schema_version=composition.schema_version,
+        layers=[
+            LayerNodeConfig(
+                name=layer.name,
+                type=layer.type,
+                deps=dict(layer.deps),
+                metadata=dict(layer.metadata),
+            )
+            for layer in composition.layers
+        ],
+    )
+    layer_configs = {layer.name: layer.config for layer in composition.layers}
+    return graph_config, layer_configs
+
+
+class CreateRunResponse(BaseModel):
+    """Response returned after a run has been persisted and scheduled locally."""
+
+    run_id: str
+    status: RunStatus
+
+    model_config: ClassVar[ConfigDict] = ConfigDict(extra="forbid")
+
+
+class RunStatusResponse(BaseModel):
+    """Current server-side status for one run."""
+
+    run_id: str
+    status: RunStatus
+    created_at: datetime
+    updated_at: datetime
+    error: str | None = None
+
+    model_config: ClassVar[ConfigDict] = ConfigDict(extra="forbid")
+
+
+class EmptyRunEventData(BaseModel):
+    """Typed empty payload for lifecycle events that carry no extra data."""
+
+    model_config: ClassVar[ConfigDict] = ConfigDict(extra="forbid")
+
+
+class RunSucceededEventData(BaseModel):
+    """Terminal success payload for final output and resumable session state."""
+
+    output: JsonValue
+    session_snapshot: CompositorSessionSnapshot
+
+    model_config: ClassVar[ConfigDict] = ConfigDict(extra="forbid")
+
+
+class RunFailedEventData(BaseModel):
+    """Terminal failure payload shown to polling and SSE consumers."""
+
+    error: str
+    reason: str | None = None
+
+    model_config: ClassVar[ConfigDict] = ConfigDict(extra="forbid")
+
+
+class BaseRunEvent(BaseModel):
+    """Shared append-only event envelope visible through polling and SSE."""
+
+    id: str | None = None
+    run_id: str
+    created_at: datetime = Field(default_factory=utc_now)
+
+    model_config: ClassVar[ConfigDict] = ConfigDict(extra="forbid")
+
+
+class RunStartedEvent(BaseRunEvent):
+    """Run lifecycle event emitted before runtime execution starts."""
+
+    type: Literal["run_started"] = "run_started"
+    data: EmptyRunEventData = Field(default_factory=EmptyRunEventData)
+
+
+class PydanticAIStreamRunEvent(BaseRunEvent):
+    """Pydantic AI stream event using the upstream typed event model."""
+
+    type: Literal["pydantic_ai_event"] = "pydantic_ai_event"
+    data: AgentStreamEvent
+
+
+class RunSucceededEvent(BaseRunEvent):
+    """Terminal success event carrying the complete successful run result."""
+
+    type: Literal["run_succeeded"] = "run_succeeded"
+    data: RunSucceededEventData
+
+
+class RunFailedEvent(BaseRunEvent):
+    """Terminal failure event emitted before the run status becomes failed."""
+
+    type: Literal["run_failed"] = "run_failed"
+    data: RunFailedEventData
+
+
+RunEvent: TypeAlias = Annotated[
+    RunStartedEvent | PydanticAIStreamRunEvent | RunSucceededEvent | RunFailedEvent,
+    Field(discriminator="type"),
+]
+RUN_EVENT_ADAPTER: TypeAdapter[RunEvent] = TypeAdapter(RunEvent)
+
+
+class RunEventsResponse(BaseModel):
+    """Cursor-paginated event log response."""
+
+    run_id: str
+    events: list[RunEvent]
+    next_cursor: str | None = None
+
+    model_config: ClassVar[ConfigDict] = ConfigDict(extra="forbid")
+
+
+__all__ = [
+    "BaseRunEvent",
+    "CreateRunRequest",
+    "CreateRunResponse",
+    "DIFY_AGENT_MODEL_LAYER_ID",
+    "DIFY_AGENT_OUTPUT_LAYER_ID",
+    "EmptyRunEventData",
+    "LayerExitSignals",
+    "PydanticAIStreamRunEvent",
+    "RUN_EVENT_ADAPTER",
+    "RunComposition",
+    "RunEvent",
+    "RunEventType",
+    "RunEventsResponse",
+    "RunFailedEvent",
+    "RunFailedEventData",
+    "RunStartedEvent",
+    "RunStatus",
+    "RunStatusResponse",
+    "RunSucceededEvent",
+    "RunSucceededEventData",
+    "RunLayerSpec",
+    "normalize_composition",
+    "utc_now",
+]
diff --git a/dify-agent/src/dify_agent/runtime/agent_factory.py b/dify-agent/src/dify_agent/runtime/agent_factory.py
new file mode 100644
index 0000000000..95c79f3086
--- /dev/null
+++ b/dify-agent/src/dify_agent/runtime/agent_factory.py
@@ -0,0 +1,52 @@
+"""Pydantic AI agent construction for models supplied by Agenton layers.
+
+The run request carries model/provider selection in the layer graph. This helper
+keeps Agent construction details out of ``AgentRunRunner`` while accepting an
+already resolved Pydantic AI model from the configured model layer. Prompt and
+tool values arriving here are already transformed by Agenton's
+``PYDANTIC_AI_TRANSFORMERS`` preset; this module registers those pydantic-ai
+objects without reimplementing plain/pydantic-ai conversion logic. The caller
+also passes the already resolved ``output_type`` so legacy text output and the
+optional JSON Schema output layer share the same ``Agent`` construction path.
+"""
+
+from collections.abc import Sequence
+from typing import Any, cast
+
+from pydantic_ai import Agent
+from pydantic_ai.messages import UserContent
+from pydantic_ai.models import Model
+from pydantic_ai.output import OutputSpec
+
+from agenton.layers.types import PydanticAIPrompt, PydanticAITool
+
+
+def create_agent(
+    model: Model[Any],
+    *,
+    system_prompts: Sequence[PydanticAIPrompt[object]],
+    tools: Sequence[PydanticAITool[object]],
+    output_type: OutputSpec[object] = str,
+) -> Agent[None, object]:
+    """Create the pydantic-ai agent for one run.
+
+    ``output_type`` is resolved by the runtime after entering the Agenton run so
+    validation and execution both honor the same optional structured output
+    contract. For structured output runs the type inside ``output_type`` already
+    carries the Pydantic hooks needed for schema exposure and runtime validation,
+    so agent construction does not need to register a separate validator.
+    """
+    agent = cast(Agent[None, object], Agent(model, output_type=output_type, tools=tools))
+    for prompt in system_prompts:
+        _ = agent.system_prompt(cast(Any, prompt))
+    return agent
+
+
+def normalize_user_input(user_prompts: Sequence[UserContent]) -> str | Sequence[UserContent]:
+    """Return the pydantic-ai run input while preserving multi-part prompts."""
+    if len(user_prompts) == 1 and isinstance(user_prompts[0], str):
+        return user_prompts[0]
+    return list(user_prompts)
+
+
+__all__ = ["create_agent", "normalize_user_input"]
diff --git a/dify-agent/src/dify_agent/runtime/agenton_validation.py b/dify-agent/src/dify_agent/runtime/agenton_validation.py
new file mode 100644
index 0000000000..3522e16b08
--- /dev/null
+++ b/dify-agent/src/dify_agent/runtime/agenton_validation.py
@@ -0,0 +1,28 @@
+"""Shared validation helpers for Agenton-backed request boundaries.
+
+Most bad Dify Agent inputs surface from Agenton as ``KeyError``, ``TypeError``,
+or ``ValueError`` while graph config, per-run layer config, and session snapshot
+DTOs are being validated. One smaller class of request-shaped failures appears a
+bit later, during ``Compositor.enter(...)`` before the body of the entered run
+executes: session snapshots may contain lifecycle states such as ``CLOSED`` that
+are serializable but not enterable. Agenton reports those as ``RuntimeError``.
+
+Dify Agent intentionally translates only these known enter-time runtime errors
+into public request-validation errors. Other runtime failures still represent
+execution bugs or infrastructure problems and must not be downgraded to client
+input errors.
+"""
+
+_ENTER_VALIDATION_RUNTIME_ERROR_FRAGMENTS = (
+    "ACTIVE snapshots are not allowed.",
+    "CLOSED snapshots cannot be entered.",
+)
+
+
+def is_agenton_enter_validation_runtime_error(exc: RuntimeError) -> bool:
+    """Return whether ``exc`` is a known Agenton enter-time input failure."""
+    message = str(exc)
+    return any(fragment in message for fragment in _ENTER_VALIDATION_RUNTIME_ERROR_FRAGMENTS)
+
+
+__all__ = ["is_agenton_enter_validation_runtime_error"]
diff --git a/dify-agent/src/dify_agent/runtime/compositor_factory.py b/dify-agent/src/dify_agent/runtime/compositor_factory.py
new file mode 100644
index 0000000000..4fc221f91c
--- /dev/null
+++ b/dify-agent/src/dify_agent/runtime/compositor_factory.py
@@ -0,0 +1,90 @@
+"""Safe Agenton compositor construction for API-submitted configs.
+
+Only explicitly allowed provider type ids are constructible here. The default
+provider set contains prompt layers, the state-free Dify structured output
+layer, plus Dify plugin LLM layers. Public DTOs provide tenant/plugin/model
+data, while server-only plugin daemon settings are injected through the provider
+factory for ``DifyPluginLayer``. The resulting ``Compositor`` remains Agenton
+state-only: live resources such as the plugin daemon HTTP client are supplied
+later by the runtime and never enter providers, layers, or session snapshots.
+"""
+
+from collections.abc import Mapping, Sequence
+from typing import Any, cast
+
+from pydantic_ai.messages import UserContent
+
+from agenton.compositor import Compositor, CompositorConfig, LayerProvider, LayerProviderInput
+from agenton.layers.types import AllPromptTypes, AllToolTypes, AllUserPromptTypes, PydanticAIPrompt, PydanticAITool
+from agenton_collections.layers.plain.basic import PromptLayer
+from agenton_collections.transformers.pydantic_ai import PYDANTIC_AI_TRANSFORMERS
+from dify_agent.layers.dify_plugin.configs import DifyPluginLayerConfig
+from dify_agent.layers.dify_plugin.llm_layer import DifyPluginLLMLayer
+from dify_agent.layers.dify_plugin.plugin_layer import DifyPluginLayer
+from dify_agent.layers.output.output_layer import DifyOutputLayer
+
+
+type DifyAgentLayerProvider = LayerProvider[Any]
+
+
+def create_default_layer_providers(
+    *,
+    plugin_daemon_url: str = "http://localhost:5002",
+    plugin_daemon_api_key: str = "",
+) -> tuple[DifyAgentLayerProvider, ...]:
+    """Return the server provider set of safe config-constructible layers."""
+    return (
+        LayerProvider.from_layer_type(PromptLayer),
+        LayerProvider.from_layer_type(DifyOutputLayer),
+        LayerProvider.from_factory(
+            layer_type=DifyPluginLayer,
+            create=lambda config: DifyPluginLayer.from_config_with_settings(
+                DifyPluginLayerConfig.model_validate(config),
+                daemon_url=plugin_daemon_url,
+                daemon_api_key=plugin_daemon_api_key,
+            ),
+        ),
+        LayerProvider.from_layer_type(DifyPluginLLMLayer),
+    )
+
+
+def build_pydantic_ai_compositor(
+    config: CompositorConfig,
+    *,
+    providers: Sequence[LayerProviderInput],
+    node_providers: Mapping[str, LayerProviderInput] | None = None,
+) -> Compositor[
+    PydanticAIPrompt[object],
+    PydanticAITool[object],
+    AllPromptTypes,
+    AllToolTypes,
+    UserContent,
+    AllUserPromptTypes,
+]:
+    """Build a Pydantic AI-ready compositor from a validated graph config.
+
+    Prompt, user prompt, and tool conversion is delegated to Agenton's shared
+    pydantic-ai transformer preset so Dify Agent does not duplicate conversion
+    logic for plain and pydantic-ai layer families. Callers must pass the already
+    selected provider set explicitly so provider defaulting stays at outer runtime
+    boundaries rather than being duplicated here.
+    """
+    return cast(
+        Compositor[
+            PydanticAIPrompt[object],
+            PydanticAITool[object],
+            AllPromptTypes,
+            AllToolTypes,
+            UserContent,
+            AllUserPromptTypes,
+        ],
+        Compositor.from_config(
+            config,
+            providers=providers,
+            node_providers=node_providers,
+            **PYDANTIC_AI_TRANSFORMERS,  # pyright: ignore[reportArgumentType]
+        ),
+    )
+
+
+__all__ = ["DifyAgentLayerProvider", "build_pydantic_ai_compositor", "create_default_layer_providers"]
diff --git a/dify-agent/src/dify_agent/runtime/event_sink.py b/dify-agent/src/dify_agent/runtime/event_sink.py
new file mode 100644
index 0000000000..6567189c69
--- /dev/null
+++ b/dify-agent/src/dify_agent/runtime/event_sink.py
@@ -0,0 +1,134 @@
+"""Event sink contracts used by the runner and storage adapters.
+
+The runner only needs append-only event writes and status transitions, so tests
+can use ``InMemoryRunEventSink`` without Redis. Production storage implements the
+same protocol with Redis streams in ``dify_agent.storage.redis_run_store``. The
+terminal success helper writes the final JSON-safe output and session snapshot in
+one event so event consumers can stop at ``run_succeeded`` without correlating
+separate payload events.
+"""
+
+from collections import defaultdict
+from typing import Protocol
+
+from pydantic import JsonValue
+from pydantic_ai.messages import AgentStreamEvent
+
+from agenton.compositor import CompositorSessionSnapshot
+from dify_agent.protocol.schemas import (
+    EmptyRunEventData,
+    PydanticAIStreamRunEvent,
+    RunEvent,
+    RunFailedEvent,
+    RunFailedEventData,
+    RunStartedEvent,
+    RunStatus,
+    RunSucceededEvent,
+    RunSucceededEventData,
+    utc_now,
+)
+
+
+class RunEventSink(Protocol):
+    """Boundary used by runtime code to publish observable run progress."""
+
+    async def append_event(self, event: RunEvent) -> str:
+        """Persist ``event`` and return its cursor id."""
+        ...
+
+    async def update_status(self, run_id: str, status: RunStatus, error: str | None = None) -> None:
+        """Persist the current run status."""
+        ...
+
+
+class InMemoryRunEventSink:
+    """Small async-compatible sink for local unit tests and examples."""
+
+    events: dict[str, list[RunEvent]]
+    statuses: dict[str, RunStatus]
+    errors: dict[str, str | None]
+
+    def __init__(self) -> None:
+        self.events = defaultdict(list)
+        self.statuses = {}
+        self.errors = {}
+
+    async def append_event(self, event: RunEvent) -> str:
+        """Store an event and assign a monotonic per-run cursor."""
+        event_id = str(len(self.events[event.run_id]) + 1)
+        stored = event.model_copy(update={"id": event_id})
+        self.events[event.run_id].append(stored)
+        return event_id
+
+    async def update_status(self, run_id: str, status: RunStatus, error: str | None = None) -> None:
+        """Record the latest status; timestamps are owned by run stores."""
+        self.statuses[run_id] = status
+        self.errors[run_id] = error
+
+
+async def emit_run_event(
+    sink: RunEventSink,
+    *,
+    event: RunEvent,
+) -> str:
+    """Append an already typed public run event."""
+    return await sink.append_event(event)
+
+
+async def emit_run_started(sink: RunEventSink, *, run_id: str) -> str:
+    """Emit the first lifecycle event for one run."""
+    return await emit_run_event(
+        sink,
+        event=RunStartedEvent(run_id=run_id, data=EmptyRunEventData(), created_at=utc_now()),
+    )
+
+
+async def emit_pydantic_ai_event(sink: RunEventSink, *, run_id: str, data: AgentStreamEvent) -> str:
+    """Emit one typed Pydantic AI stream event."""
+    return await emit_run_event(
+        sink,
+        event=PydanticAIStreamRunEvent(run_id=run_id, data=data, created_at=utc_now()),
+    )
+
+
+async def emit_run_succeeded(
+    sink: RunEventSink,
+    *,
+    run_id: str,
+    output: JsonValue,
+    session_snapshot: CompositorSessionSnapshot,
+) -> str:
+    """Emit the terminal success event with output and resumable state."""
+    return await emit_run_event(
+        sink,
+        event=RunSucceededEvent(
+            run_id=run_id,
+            data=RunSucceededEventData(output=output, session_snapshot=session_snapshot),
+            created_at=utc_now(),
+        ),
+    )
+
+
+async def emit_run_failed(
+    sink: RunEventSink,
+    *,
+    run_id: str,
+    error: str,
+    reason: str | None = None,
+) -> str:
+    """Emit the terminal failure lifecycle event."""
+    return await emit_run_event(
+        sink,
+        event=RunFailedEvent(run_id=run_id, data=RunFailedEventData(error=error, reason=reason), created_at=utc_now()),
+    )
+
+
+__all__ = [
+    "InMemoryRunEventSink",
+    "RunEventSink",
+    "emit_pydantic_ai_event",
+    "emit_run_event",
+    "emit_run_failed",
+    "emit_run_started",
+    "emit_run_succeeded",
+]
diff --git a/dify-agent/src/dify_agent/runtime/layer_exit_signals.py b/dify-agent/src/dify_agent/runtime/layer_exit_signals.py
new file mode 100644
index 0000000000..3636b89836
--- /dev/null
+++ b/dify-agent/src/dify_agent/runtime/layer_exit_signals.py
@@ -0,0 +1,46 @@
+"""Validation and application of request-level Agenton layer exit signals.
+
+HTTP requests carry data-only lifecycle intent in the top-level ``on_exit``
+field. The runtime validates signal keys against the built compositor before a
+run is persisted or entered, then applies the resolved intent to the active
+``CompositorRun`` after entry because Agenton initializes each run slot with a
+delete-on-exit intent.
+"""
+
+from typing import Any
+
+from agenton.compositor import Compositor, CompositorRun
+from agenton.layers import ExitIntent
+from dify_agent.protocol.schemas import LayerExitSignals
+
+
+def validate_layer_exit_signals(
+    compositor: Compositor[Any, Any, Any, Any, Any, Any],
+    signals: LayerExitSignals,
+) -> None:
+    """Raise ``ValueError`` when ``signals`` mention layers absent from ``compositor``."""
+    known_layer_ids = {node.name for node in compositor.nodes}
+    unknown_layer_ids = set(signals.layers) - known_layer_ids
+    if not unknown_layer_ids:
+        return
+
+    names = ", ".join(sorted(unknown_layer_ids))
+    raise ValueError(f"on_exit.layers references unknown layer ids: {names}.")
+
+
+def apply_layer_exit_signals(
+    run: CompositorRun[Any, Any, Any, Any, Any, Any],
+    signals: LayerExitSignals,
+) -> None:
+    """Apply ``signals`` to active run slots for the current compositor entry."""
+    for layer_id in run.slots:
+        intent = signals.layers.get(layer_id, signals.default)
+        if intent is ExitIntent.SUSPEND:
+            run.suspend_layer_on_exit(layer_id)
+        elif intent is ExitIntent.DELETE:
+            run.delete_layer_on_exit(layer_id)
+        else:
+            raise ValueError(f"Unsupported layer exit intent: {intent!r}.")
+
+
+__all__ = ["apply_layer_exit_signals", "validate_layer_exit_signals"]
diff --git a/dify-agent/src/dify_agent/runtime/output_type.py b/dify-agent/src/dify_agent/runtime/output_type.py
new file mode 100644
index 0000000000..a8e12cfd6f
--- /dev/null
+++ b/dify-agent/src/dify_agent/runtime/output_type.py
@@ -0,0 +1,92 @@
+"""Validate and resolve the optional structured output layer.
+
+Dify Agent keeps structured output outside Agenton's prompt/tool aggregation.
+That means the request boundary must validate the public composition shape
+before entering Agenton, while the entered-run helper resolves a complete output
+contract containing the model-facing output type. The type itself carries the
+custom Pydantic hooks needed for schema exposure and runtime validation, so the
+runtime does not need a separate validator callback. Missing output layers
+preserve the legacy plain-text ``str`` output contract.
+"""
+
+from typing import Protocol
+
+from dify_agent.layers.output import DIFY_OUTPUT_LAYER_TYPE_ID
+from dify_agent.layers.output.output_layer import DifyOutputContract, DifyOutputLayer
+from dify_agent.protocol import DIFY_AGENT_OUTPUT_LAYER_ID
+from dify_agent.protocol.schemas import RunComposition
+
+
+class SupportsOutputLayerLookup(Protocol):
+    """Minimal run surface needed to resolve the optional output layer."""
+
+    def get_layer(self, name: str, layer_type: type[DifyOutputLayer]) -> DifyOutputLayer:
+        """Return a typed layer instance or raise lookup/type errors."""
+        ...
+
+
+def validate_output_layer_composition(composition: RunComposition) -> None:
+    """Reject unsupported public output-layer graph shapes.
+
+    The proposal reserves the node name ``output`` for the single supported
+    ``dify.output`` layer. Validating this directly from
+    ``CreateRunRequest.composition.layers`` keeps bad requests from silently
+    falling back to text output after entering Agenton.
+
+    Raises:
+        ValueError: If more than one ``dify.output`` layer is declared or if the
+            single ``dify.output`` layer does not use the reserved node name
+            ``output``.
+    """
+    output_layer_names = [layer.name for layer in composition.layers if layer.type == DIFY_OUTPUT_LAYER_TYPE_ID]
+    if not output_layer_names:
+        return
+
+    if len(output_layer_names) > 1:
+        names = ", ".join(output_layer_names)
+        raise ValueError(
+            f"Only one '{DIFY_OUTPUT_LAYER_TYPE_ID}' layer is supported, named '{DIFY_AGENT_OUTPUT_LAYER_ID}'. "
+            f"Found layers: {names}."
+        )
+
+    output_layer_name = output_layer_names[0]
+    if output_layer_name != DIFY_AGENT_OUTPUT_LAYER_ID:
+        raise ValueError(
+            f"Layer type '{DIFY_OUTPUT_LAYER_TYPE_ID}' must use reserved layer name "
+            f"'{DIFY_AGENT_OUTPUT_LAYER_ID}', got '{output_layer_name}'."
+        )
+
+
+_TEXT_OUTPUT_CONTRACT = DifyOutputContract(output_type=str)
+
+
+def resolve_run_output_contract(run: SupportsOutputLayerLookup) -> DifyOutputContract:
+    """Return the run's configured pydantic-ai output contract.
+
+    When the conventionally named output layer is absent, the runtime keeps the
+    existing plain-text behavior by returning a contract whose ``output_type`` is
+    ``str``. This helper assumes the
+    public composition has already passed ``validate_output_layer_composition``;
+    its remaining responsibility is to type-check the reserved ``output`` slot
+    after compositor entry and build the validated output type from the layer
+    config.
+
+    Raises:
+        TypeError: If a layer named ``output`` exists but is not a
+            ``DifyOutputLayer``.
+        ValueError: If the output layer exists but its JSON Schema cannot be
+            converted into a supported pydantic-ai structured output contract.
+    """
+    try:
+        output_layer = run.get_layer(DIFY_AGENT_OUTPUT_LAYER_ID, DifyOutputLayer)
+    except KeyError:
+        return _TEXT_OUTPUT_CONTRACT
+    return output_layer.build_output_contract()
+
+
+__all__ = [
+    "DifyOutputContract",
+    "SupportsOutputLayerLookup",
+    "resolve_run_output_contract",
+    "validate_output_layer_composition",
+]
diff --git a/dify-agent/src/dify_agent/runtime/run_scheduler.py b/dify-agent/src/dify_agent/runtime/run_scheduler.py
new file mode 100644
index 0000000000..8b1a5a2699
--- /dev/null
+++ b/dify-agent/src/dify_agent/runtime/run_scheduler.py
@@ -0,0 +1,206 @@
+"""In-process scheduling for Dify Agent runs.
+
+The scheduler is intentionally process-local: it persists a run record, starts an
+``asyncio.Task`` for ``AgentRunRunner.run()``, and keeps only a transient active
+task registry. Redis remains the durable source for status and event streams, but
+there is no Redis job queue or cross-process handoff. If the process crashes,
+currently active runs are lost until an external operator marks or retries them.
+Create-run validation enters a lightweight Agenton run before persistence so the
+same transformed user prompts, optional structured output contract, and
+top-level ``on_exit`` policy used by execution are checked without relying on
+removed session/control APIs; Dify's default layers keep lifecycle hooks
+side-effect free so this validation does not open plugin daemon clients.
+"""
+
+import asyncio
+import logging
+from collections.abc import Callable
+from typing import Protocol
+
+import httpx
+
+from agenton.compositor import LayerProviderInput
+from dify_agent.protocol.schemas import CreateRunRequest, normalize_composition
+from dify_agent.runtime.agenton_validation import is_agenton_enter_validation_runtime_error
+from dify_agent.runtime.compositor_factory import build_pydantic_ai_compositor, create_default_layer_providers
+from dify_agent.runtime.event_sink import RunEventSink, emit_run_failed
+from dify_agent.runtime.layer_exit_signals import apply_layer_exit_signals, validate_layer_exit_signals
+from dify_agent.runtime.output_type import resolve_run_output_contract, validate_output_layer_composition
+from dify_agent.runtime.runner import AgentRunRunner
+from dify_agent.runtime.user_prompt_validation import EMPTY_USER_PROMPTS_ERROR, has_non_blank_user_prompt
+from dify_agent.server.schemas import RunRecord
+
+logger = logging.getLogger(__name__)
+
+
+class SchedulerStoppingError(RuntimeError):
+    """Raised when a create-run request arrives after shutdown has started."""
+
+
+class RunRequestValidationError(ValueError):
+    """Raised when a create-run request cannot produce an executable Agenton run."""
+
+
+class RunStore(RunEventSink, Protocol):
+    """Persistence boundary needed by the scheduler."""
+
+    async def create_run(self) -> RunRecord:
+        """Persist a new run record and return it with status ``running``."""
+        ...
+
+
+class RunnableRun(Protocol):
+    """Executable unit for one scheduled run."""
+
+    async def run(self) -> None:
+        """Run until terminal status/events have been written or cancellation occurs."""
+        ...
+
+
+type RunRunnerFactory = Callable[[RunRecord, CreateRunRequest], RunnableRun]
+
+
+class RunScheduler:
+    """Owns process-local run tasks and best-effort graceful shutdown.
+
+    ``active_tasks`` is mutated only on the event loop that calls ``create_run``
+    and ``shutdown``. The task registry is not durable; it exists so the lifespan
+    hook can wait for in-flight work and mark cancelled runs failed before Redis is
+    closed. A lock guards the stopping flag, lightweight request validation, run
+    persistence, and task registration so shutdown cannot begin after a request is
+    admitted and no validation runs once stopping has been set.
+    """
+
+    store: RunStore
+    shutdown_grace_seconds: float
+    active_tasks: dict[str, asyncio.Task[None]]
+    stopping: bool
+    runner_factory: RunRunnerFactory
+    layer_providers: tuple[LayerProviderInput, ...]
+    plugin_daemon_http_client: httpx.AsyncClient
+    _lifecycle_lock: asyncio.Lock
+
+    def __init__(
+        self,
+        *,
+        store: RunStore,
+        plugin_daemon_http_client: httpx.AsyncClient,
+        shutdown_grace_seconds: float = 30,
+        layer_providers: tuple[LayerProviderInput, ...] | None = None,
+        runner_factory: RunRunnerFactory | None = None,
+    ) -> None:
+        self.store = store
+        self.shutdown_grace_seconds = shutdown_grace_seconds
+        self.active_tasks = {}
+        self.stopping = False
+        self.plugin_daemon_http_client = plugin_daemon_http_client
+        self.layer_providers = layer_providers if layer_providers is not None else create_default_layer_providers()
+        self.runner_factory = runner_factory or self._default_runner_factory
+        self._lifecycle_lock = asyncio.Lock()
+
+    async def create_run(self, request: CreateRunRequest) -> RunRecord:
+        """Validate, persist, and schedule one run in the current process.
+
+        The returned record is already ``running``. The background task is removed
+        from ``active_tasks`` when it finishes, regardless of success or failure.
+        """
+        async with self._lifecycle_lock:
+            if self.stopping:
+                raise SchedulerStoppingError("run scheduler is shutting down")
+            await validate_run_request(request, layer_providers=self.layer_providers)
+            record = await self.store.create_run()
+            task = asyncio.create_task(self._run_record(record, request), name=f"dify-agent-run-{record.run_id}")
+            self.active_tasks[record.run_id] = task
+            task.add_done_callback(lambda _task, run_id=record.run_id: self.active_tasks.pop(run_id, None))
+            return record
+
+    async def shutdown(self) -> None:
+        """Stop accepting runs, wait briefly, then cancel and fail unfinished runs."""
+        async with self._lifecycle_lock:
+            self.stopping = True
+            if not self.active_tasks:
+                return
+            tasks_by_run_id = dict(self.active_tasks)
+        done, pending = await asyncio.wait(tasks_by_run_id.values(), timeout=self.shutdown_grace_seconds)
+        del done
+        if not pending:
+            return
+
+        pending_run_ids = [run_id for run_id, task in tasks_by_run_id.items() if task in pending]
+        for task in pending:
+            _ = task.cancel()
+        _ = await asyncio.gather(*pending, return_exceptions=True)
+        for run_id in pending_run_ids:
+            await self._mark_cancelled_run_failed(run_id)
+
+    async def _run_record(self, record: RunRecord, request: CreateRunRequest) -> None:
+        """Execute a stored run and log failures already reflected in events."""
+        try:
+            await self.runner_factory(record, request).run()
+        except asyncio.CancelledError:
+            raise
+        except Exception:
+            logger.exception("scheduled run failed", extra={"run_id": record.run_id})
+
+    def _default_runner_factory(self, record: RunRecord, request: CreateRunRequest) -> RunnableRun:
+        """Create the production runner for a stored run record."""
+        return AgentRunRunner(
+            sink=self.store,
+            request=request,
+            run_id=record.run_id,
+            plugin_daemon_http_client=self.plugin_daemon_http_client,
+            layer_providers=self.layer_providers,
+        )
+
+    async def _mark_cancelled_run_failed(self, run_id: str) -> None:
+        """Best-effort failure event/status for shutdown-cancelled runs."""
+        message = "run cancelled during server shutdown"
+        try:
+            _ = await emit_run_failed(self.store, run_id=run_id, error=message, reason="shutdown")
+            await self.store.update_status(run_id, "failed", message)
+        except Exception:
+            logger.exception("failed to mark cancelled run failed", extra={"run_id": run_id})
+
+
+async def validate_run_request(
+    request: CreateRunRequest,
+    *,
+    layer_providers: tuple[LayerProviderInput, ...] | None = None,
+) -> None:
+    """Validate create-run semantics that require an entered Agenton run.
+
+    This boundary rejects unsupported output-layer graph shapes, unknown
+    ``on_exit`` layer ids, effectively empty transformed user prompts, and known
+    enter-time snapshot lifecycle errors before the scheduler persists a run
+    record. It also exercises provider config validation, structured output
+    contract construction, and snapshot hydration without touching external
+    services because Dify plugin daemon clients are owned by the FastAPI
+    lifespan, not Agenton lifecycle hooks.
+    """
+    resolved_layer_providers = layer_providers if layer_providers is not None else create_default_layer_providers()
+    entered_run = False
+    try:
+        validate_output_layer_composition(request.composition)
+        graph_config, layer_configs = normalize_composition(request.composition)
+        compositor = build_pydantic_ai_compositor(
+            graph_config,
+            providers=resolved_layer_providers,
+        )
+        validate_layer_exit_signals(compositor, request.on_exit)
+        async with compositor.enter(configs=layer_configs, session_snapshot=request.session_snapshot) as run:
+            entered_run = True
+            apply_layer_exit_signals(run, request.on_exit)
+            if not has_non_blank_user_prompt(run.user_prompts):
+                raise RunRequestValidationError(EMPTY_USER_PROMPTS_ERROR)
+            _ = resolve_run_output_contract(run)
+    except RunRequestValidationError:
+        raise
+    except RuntimeError as exc:
+        if not entered_run and is_agenton_enter_validation_runtime_error(exc):
+            raise RunRequestValidationError(str(exc)) from exc
+        raise
+    except (KeyError, TypeError, ValueError) as exc:
+        raise RunRequestValidationError(str(exc)) from exc
+
+
+__all__ = ["RunRequestValidationError", "RunScheduler", "SchedulerStoppingError", "validate_run_request"]
diff --git a/dify-agent/src/dify_agent/runtime/runner.py b/dify-agent/src/dify_agent/runtime/runner.py
new file mode 100644
index 0000000000..becb538e7b
--- /dev/null
+++ b/dify-agent/src/dify_agent/runtime/runner.py
@@ -0,0 +1,164 @@
+"""Runtime execution for one scheduled Dify Agent run.
+
+The runner is storage-agnostic: it normalizes the public Dify composition into
+Agenton's graph/config split, enters a fresh ``CompositorRun`` (or resumes one
+from a snapshot), runs pydantic-ai with ``run.user_prompts`` as the user input,
+emits stream events, applies request-level ``on_exit`` signals, and then
+publishes a terminal success or failure event. The Pydantic AI model is resolved
+from the active Agenton layer named by ``DIFY_AGENT_MODEL_LAYER_ID``. An
+optional structured output layer named by ``DIFY_AGENT_OUTPUT_LAYER_ID`` is read
+after entry and resolved into an output contract whose type both exposes the
+output schema to the model and performs runtime JSON Schema validation through
+custom Pydantic hooks. Invalid structured outputs therefore trigger Pydantic
+AI's normal output-validation retry behavior before Dify Agent emits
+``run_succeeded``. Layers still never own the FastAPI lifespan-owned plugin
+daemon HTTP client. Successful terminal events contain both the JSON-safe final
+output and session snapshot; there are no separate output or snapshot events to
+correlate.
+"""
+
+from collections.abc import AsyncIterable
+from typing import cast
+
+import httpx
+from pydantic import JsonValue, TypeAdapter
+from pydantic_ai.messages import AgentStreamEvent
+
+from agenton.compositor import CompositorSessionSnapshot, LayerProviderInput
+from dify_agent.layers.dify_plugin.llm_layer import DifyPluginLLMLayer
+from dify_agent.protocol.schemas import DIFY_AGENT_MODEL_LAYER_ID, CreateRunRequest, normalize_composition
+from dify_agent.runtime.agent_factory import create_agent, normalize_user_input
+from dify_agent.runtime.agenton_validation import is_agenton_enter_validation_runtime_error
+from dify_agent.runtime.compositor_factory import build_pydantic_ai_compositor, create_default_layer_providers
+from dify_agent.runtime.event_sink import (
+    RunEventSink,
+    emit_pydantic_ai_event,
+    emit_run_failed,
+    emit_run_started,
+    emit_run_succeeded,
+)
+from dify_agent.runtime.layer_exit_signals import apply_layer_exit_signals, validate_layer_exit_signals
+from dify_agent.runtime.output_type import resolve_run_output_contract, validate_output_layer_composition
+from dify_agent.runtime.user_prompt_validation import EMPTY_USER_PROMPTS_ERROR, has_non_blank_user_prompt
+
+
+_AGENT_OUTPUT_ADAPTER = TypeAdapter(object)
+
+
+class AgentRunValidationError(ValueError):
+    """Raised when a run request is valid JSON but cannot execute."""
+
+
+class AgentRunRunner:
+    """Executes one run and writes only public run events to its sink."""
+
+    sink: RunEventSink
+
+    request: CreateRunRequest
+    run_id: str
+    layer_providers: tuple[LayerProviderInput, ...]
+    plugin_daemon_http_client: httpx.AsyncClient
+
+    def __init__(
+        self,
+        *,
+        sink: RunEventSink,
+        request: CreateRunRequest,
+        run_id: str,
+        plugin_daemon_http_client: httpx.AsyncClient,
+        layer_providers: tuple[LayerProviderInput, ...] | None = None,
+    ) -> None:
+        self.sink = sink
+        self.request = request
+        self.run_id = run_id
+        self.plugin_daemon_http_client = plugin_daemon_http_client
+        self.layer_providers = layer_providers if layer_providers is not None else create_default_layer_providers()
+
+    async def run(self) -> None:
+        """Execute the run and emit the documented event sequence."""
+        await self.sink.update_status(self.run_id, "running")
+        _ = await emit_run_started(self.sink, run_id=self.run_id)
+
+        try:
+            output, session_snapshot = await self._run_agent()
+        except Exception as exc:
+            message = str(exc) or type(exc).__name__
+            _ = await emit_run_failed(self.sink, run_id=self.run_id, error=message)
+            await self.sink.update_status(self.run_id, "failed", message)
+            raise
+
+        _ = await emit_run_succeeded(
+            self.sink,
+            run_id=self.run_id,
+            output=output,
+            session_snapshot=session_snapshot,
+        )
+        await self.sink.update_status(self.run_id, "succeeded")
+
+    async def _run_agent(self) -> tuple[JsonValue, CompositorSessionSnapshot]:
+        """Run pydantic-ai inside an entered Agenton run.
+
+        Known input-shaped Agenton enter-time runtime errors, such as trying to
+        resume a ``CLOSED`` snapshot layer, are normalized to
+        ``AgentRunValidationError``. Output-layer graph invariants are validated
+        from the public composition before entering Agenton so misnamed or extra
+        ``dify.output`` layers never silently degrade to text output. Later
+        runtime failures still propagate as execution errors so they become
+        terminal failed runs rather than client validation responses. Structured
+        output uses a resolved contract whose type itself encodes both the
+        model-facing schema and the runtime validation hooks, so invalid model
+        outputs can be corrected before Dify Agent emits success.
+        """
+        try:
+            validate_output_layer_composition(self.request.composition)
+            graph_config, layer_configs = normalize_composition(self.request.composition)
+            compositor = build_pydantic_ai_compositor(graph_config, providers=self.layer_providers)
+            validate_layer_exit_signals(compositor, self.request.on_exit)
+        except (KeyError, TypeError, ValueError) as exc:
+            raise AgentRunValidationError(str(exc)) from exc
+
+        entered_run = False
+        try:
+            async with compositor.enter(configs=layer_configs, session_snapshot=self.request.session_snapshot) as run:
+                entered_run = True
+                apply_layer_exit_signals(run, self.request.on_exit)
+                user_prompts = run.user_prompts
+                if not has_non_blank_user_prompt(user_prompts):
+                    raise AgentRunValidationError(EMPTY_USER_PROMPTS_ERROR)
+
+                async def handle_events(_ctx: object, events: AsyncIterable[AgentStreamEvent]) -> None:
+                    async for event in events:
+                        _ = await emit_pydantic_ai_event(self.sink, run_id=self.run_id, data=event)
+
+                try:
+                    output_contract = resolve_run_output_contract(run)
+                    llm_layer = run.get_layer(DIFY_AGENT_MODEL_LAYER_ID, DifyPluginLLMLayer)
+                    model = llm_layer.get_model(http_client=self.plugin_daemon_http_client)
+                except (KeyError, TypeError, RuntimeError, ValueError) as exc:
+                    raise AgentRunValidationError(str(exc)) from exc
+
+                agent = create_agent(
+                    model,
+                    system_prompts=run.prompts,
+                    tools=run.tools,
+                    output_type=output_contract.output_type,
+                )
+                result = await agent.run(normalize_user_input(user_prompts), event_stream_handler=handle_events)
+                output = _serialize_agent_output(result.output)
+        except RuntimeError as exc:
+            if not entered_run and is_agenton_enter_validation_runtime_error(exc):
+                raise AgentRunValidationError(str(exc)) from exc
+            raise
+
+        if run.session_snapshot is None:
+            raise RuntimeError("Agenton run did not produce a session snapshot after exit.")
+
+        return output, run.session_snapshot
+
+
+def _serialize_agent_output(output: object) -> JsonValue:
+    """Convert arbitrary pydantic-ai output into the public JSON-safe payload type."""
+    return cast(JsonValue, _AGENT_OUTPUT_ADAPTER.dump_python(output, mode="json"))
+
+
+__all__ = ["AgentRunRunner", "AgentRunValidationError"]
diff --git a/dify-agent/src/dify_agent/runtime/user_prompt_validation.py b/dify-agent/src/dify_agent/runtime/user_prompt_validation.py
new file mode 100644
index 0000000000..8e8602c864
--- /dev/null
+++ b/dify-agent/src/dify_agent/runtime/user_prompt_validation.py
@@ -0,0 +1,29 @@
+"""Validation for effective user prompts produced by Agenton runs.
+
+Validation happens after safe compositor construction and run entry so scheduler
+and runner paths use the same transformed prompts as the actual pydantic-ai
+input. Blank string fragments do not count as meaningful input; non-string
+``UserContent`` is treated as intentional content because rich media/message
+parts do not have a universal whitespace representation.
+"""
+
+from collections.abc import Sequence
+
+from pydantic_ai.messages import UserContent
+
+
+EMPTY_USER_PROMPTS_ERROR = "run.user_prompts must not be empty"
+
+
+def has_non_blank_user_prompt(user_prompts: Sequence[UserContent]) -> bool:
+    """Return whether composed user prompts contain meaningful input."""
+    for prompt in user_prompts:
+        if isinstance(prompt, str):
+            if prompt.strip():
+                return True
+        else:
+            return True
+    return False
+
+
+__all__ = ["EMPTY_USER_PROMPTS_ERROR", "has_non_blank_user_prompt"]
diff --git a/dify-agent/src/dify_agent/server/app.py b/dify-agent/src/dify_agent/server/app.py
new file mode 100644
index 0000000000..9b5cf2a9c4
--- /dev/null
+++ b/dify-agent/src/dify_agent/server/app.py
@@ -0,0 +1,97 @@
+"""FastAPI application factory for the Dify Agent run server.
+
+The HTTP process owns Redis clients, one shared plugin daemon ``httpx.AsyncClient``,
+route wiring, and a process-local scheduler. Run execution happens in background
+``asyncio`` tasks rather than request handlers, so client disconnects do not
+cancel the agent runtime. Redis persists run records and per-run event streams
+with configured retention only; it is not used as a job queue. Agenton layers and
+providers stay state-only: they borrow the lifespan-owned plugin daemon client
+through the runner and never create or close it themselves.
+"""
+
+from collections.abc import AsyncGenerator
+from contextlib import asynccontextmanager
+
+import httpx
+from fastapi import FastAPI
+from redis.asyncio import Redis
+
+from dify_agent.runtime.compositor_factory import create_default_layer_providers
+from dify_agent.runtime.run_scheduler import RunScheduler
+from dify_agent.server.routes.runs import create_runs_router
+from dify_agent.server.settings import ServerSettings
+from dify_agent.storage.redis_run_store import RedisRunStore
+
+
+def create_app(settings: ServerSettings | None = None) -> FastAPI:
+    """Build the FastAPI app with one shared Redis store and local scheduler."""
+    resolved_settings = settings or ServerSettings()
+    layer_providers = create_default_layer_providers(
+        plugin_daemon_url=resolved_settings.plugin_daemon_url,
+        plugin_daemon_api_key=resolved_settings.plugin_daemon_api_key,
+    )
+    state: dict[str, object] = {}
+
+    @asynccontextmanager
+    async def lifespan(_app: FastAPI) -> AsyncGenerator[None, None]:
+        redis = Redis.from_url(resolved_settings.redis_url)
+        plugin_daemon_http_client = create_plugin_daemon_http_client(resolved_settings)
+        store = RedisRunStore(
+            redis,
+            prefix=resolved_settings.redis_prefix,
+            run_retention_seconds=resolved_settings.run_retention_seconds,
+        )
+        scheduler = RunScheduler(
+            store=store,
+            plugin_daemon_http_client=plugin_daemon_http_client,
+            shutdown_grace_seconds=resolved_settings.shutdown_grace_seconds,
+            layer_providers=layer_providers,
+        )
+        state["store"] = store
+        state["scheduler"] = scheduler
+        try:
+            yield
+        finally:
+            await scheduler.shutdown()
+            await plugin_daemon_http_client.aclose()
+            await redis.aclose()
+
+    app = FastAPI(title="Dify Agent Run Server", version="0.1.0", lifespan=lifespan)
+
+    def get_store() -> RedisRunStore:
+        return state["store"]  # pyright: ignore[reportReturnType]
+
+    def get_scheduler() -> RunScheduler:
+        return state["scheduler"]  # pyright: ignore[reportReturnType]
+
+    app.include_router(create_runs_router(get_store, get_scheduler))
+    return app
+
+
+def create_plugin_daemon_http_client(settings: ServerSettings) -> httpx.AsyncClient:
+    """Create the lifespan-owned plugin daemon HTTP client with configured limits.
+
+    The returned client is shared by all local background runs in this FastAPI
+    process and must be closed by the app lifespan after the scheduler has stopped
+    using it.
+    """
+    return httpx.AsyncClient(
+        timeout=httpx.Timeout(
+            connect=settings.plugin_daemon_connect_timeout,
+            read=settings.plugin_daemon_read_timeout,
+            write=settings.plugin_daemon_write_timeout,
+            pool=settings.plugin_daemon_pool_timeout,
+        ),
+        limits=httpx.Limits(
+            max_connections=settings.plugin_daemon_max_connections,
+            max_keepalive_connections=settings.plugin_daemon_max_keepalive_connections,
+            keepalive_expiry=settings.plugin_daemon_keepalive_expiry,
+        ),
+        trust_env=False,
+    )
+
+
+app = create_app()
+
+
+__all__ = ["app", "create_app", "create_plugin_daemon_http_client"]
diff --git a/dify-agent/src/dify_agent/server/routes/runs.py b/dify-agent/src/dify_agent/server/routes/runs.py
new file mode 100644
index 0000000000..9375b1f5b7
--- /dev/null
+++ b/dify-agent/src/dify_agent/server/routes/runs.py
@@ -0,0 +1,92 @@
+"""FastAPI routes for asynchronous agent runs.
+
+Controllers translate known validation and shutdown errors into HTTP status codes.
+Unexpected scheduler or storage failures are intentionally left for FastAPI's
+server-error handling so infrastructure problems are not reported as client input
+errors. Created runs are scheduled in the current process and observed through
+status polling or SSE replay backed by Redis event streams.
+"""
+
+from collections.abc import Callable
+from typing import Annotated
+
+from fastapi import APIRouter, Depends, Header, HTTPException, Query
+from fastapi.responses import StreamingResponse
+
+from dify_agent.protocol.schemas import CreateRunRequest, CreateRunResponse, RunEventsResponse, RunStatusResponse
+from dify_agent.runtime.run_scheduler import RunRequestValidationError, RunScheduler, SchedulerStoppingError
+from dify_agent.server.sse import sse_event_stream
+from dify_agent.storage.redis_run_store import RedisRunStore, RunNotFoundError
+
+
+def create_runs_router(
+    get_store: Callable[[], RedisRunStore],
+    get_scheduler: Callable[[], RunScheduler],
+) -> APIRouter:
+    """Create routes bound to the application's store dependency provider."""
+    router = APIRouter(prefix="/runs", tags=["runs"])
+
+    async def store_dep() -> RedisRunStore:
+        return get_store()
+
+    async def scheduler_dep() -> RunScheduler:
+        return get_scheduler()
+
+    @router.post("", response_model=CreateRunResponse, status_code=202)
+    async def create_run(
+        request: CreateRunRequest,
+        scheduler: Annotated[RunScheduler, Depends(scheduler_dep)],
+    ) -> CreateRunResponse:
+        try:
+            record = await scheduler.create_run(request)
+        except RunRequestValidationError as exc:
+            raise HTTPException(status_code=422, detail=str(exc)) from exc
+        except SchedulerStoppingError as exc:
+            raise HTTPException(status_code=503, detail="run scheduler is shutting down") from exc
+        return CreateRunResponse(run_id=record.run_id, status=record.status)
+
+    @router.get("/{run_id}", response_model=RunStatusResponse)
+    async def get_run_status(run_id: str, store: Annotated[RedisRunStore, Depends(store_dep)]) -> RunStatusResponse:
+        try:
+            record = await store.get_run(run_id)
+        except RunNotFoundError as exc:
+            raise HTTPException(status_code=404, detail="run not found") from exc
+        return RunStatusResponse(
+            run_id=record.run_id,
+            status=record.status,
+            created_at=record.created_at,
+            updated_at=record.updated_at,
+            error=record.error,
+        )
+
+    @router.get("/{run_id}/events", response_model=RunEventsResponse)
+    async def get_run_events(
+        run_id: str,
+        store: Annotated[RedisRunStore, Depends(store_dep)],
+        after: str = Query(default="0-0"),
+        limit: int = Query(default=100, ge=1, le=500),
+    ) -> RunEventsResponse:
+        try:
+            return await store.get_events(run_id, after=after, limit=limit)
+        except RunNotFoundError as exc:
+            raise HTTPException(status_code=404, detail="run not found") from exc
+
+    @router.get("/{run_id}/events/sse")
+    async def stream_run_events(
+        run_id: str,
+        store: Annotated[RedisRunStore, Depends(store_dep)],
+        last_event_id: Annotated[str | None, Header(alias="Last-Event-ID")] = None,
+        after: str | None = Query(default=None),
+    ) -> StreamingResponse:
+        cursor = after or last_event_id or "0-0"
+        try:
+            _ = await store.get_run(run_id)
+            events = store.iter_events(run_id, after=cursor)
+            return StreamingResponse(sse_event_stream(events), media_type="text/event-stream")
+        except RunNotFoundError as exc:
+            raise HTTPException(status_code=404, detail="run not found") from exc
+
+    return router
+
+
+__all__ = ["create_runs_router"]
diff --git a/dify-agent/src/dify_agent/server/schemas.py b/dify-agent/src/dify_agent/server/schemas.py
new file mode 100644
index 0000000000..21e8e624a0
--- /dev/null
+++ b/dify-agent/src/dify_agent/server/schemas.py
@@ -0,0 +1,48 @@
+"""Server-only schemas and helpers for persisted run records.
+
+Public HTTP DTOs and run events live in ``dify_agent.protocol.schemas`` and are
+intentionally not re-exported here. Keeping this module server-only prevents old
+imports from silently depending on implementation modules while preserving the
+internal ``RunRecord`` model used by schedulers and Redis storage.
+"""
+
+from datetime import datetime
+from typing import ClassVar
+from uuid import uuid4
+
+from pydantic import BaseModel, ConfigDict, Field, field_validator
+
+from dify_agent.protocol import schemas as _protocol_schemas
+
+
+def new_run_id() -> str:
+    """Return a stable external run id for newly persisted server records."""
+    return str(uuid4())
+
+
+class RunRecord(BaseModel):
+    """Internal representation persisted for status reads.
+
+    Only status metadata is persisted. Create-run requests can contain model
+    credentials in layer config and must remain in scheduler memory rather than
+    being written to Redis.
+    """
+
+    run_id: str
+    status: _protocol_schemas.RunStatus
+    created_at: datetime = Field(default_factory=_protocol_schemas.utc_now)
+    updated_at: datetime = Field(default_factory=_protocol_schemas.utc_now)
+    error: str | None = None
+
+    model_config: ClassVar[ConfigDict] = ConfigDict(extra="forbid")
+
+    @field_validator("updated_at")
+    @classmethod
+    def updated_at_must_be_timezone_aware(cls, value: datetime) -> datetime:
+        """Reject naive timestamps before they become JSON API values."""
+        if value.tzinfo is None:
+            raise ValueError("updated_at must be timezone-aware")
+        return value
+
+
+__all__ = ["RunRecord", "new_run_id"]
diff --git a/dify-agent/src/dify_agent/server/settings.py b/dify-agent/src/dify_agent/server/settings.py
new file mode 100644
index 0000000000..18c0ce7747
--- /dev/null
+++ b/dify-agent/src/dify_agent/server/settings.py
@@ -0,0 +1,41 @@
+"""Configuration for the FastAPI run server.
+
+Plugin daemon HTTP client settings describe the single FastAPI lifespan-owned
+``httpx.AsyncClient`` shared by local run tasks. Layers and Agenton providers do
+not own that client, so these settings are process resource limits rather than
+per-run lifecycle knobs.
+"""
+
+from typing import ClassVar
+
+from pydantic import Field
+from pydantic_settings import BaseSettings, SettingsConfigDict
+
+DEFAULT_RUN_RETENTION_SECONDS = 3 * 24 * 60 * 60
+
+
+class ServerSettings(BaseSettings):
+    """Environment-backed settings for Redis, scheduling, and plugin daemon access."""
+
+    redis_url: str = "redis://localhost:6379/0"
+    redis_prefix: str = "dify-agent"
+    shutdown_grace_seconds: float = 30
+    run_retention_seconds: int = Field(default=DEFAULT_RUN_RETENTION_SECONDS, ge=1)
+    plugin_daemon_url: str = "http://localhost:5002"
+    plugin_daemon_api_key: str = ""
+    plugin_daemon_connect_timeout: float = Field(default=10.0, ge=0)
+    plugin_daemon_read_timeout: float = Field(default=600.0, ge=0)
+    plugin_daemon_write_timeout: float = Field(default=30.0, ge=0)
+    plugin_daemon_pool_timeout: float = Field(default=10.0, ge=0)
+    plugin_daemon_max_connections: int = Field(default=100, ge=1)
+    plugin_daemon_max_keepalive_connections: int = Field(default=20, ge=0)
+    plugin_daemon_keepalive_expiry: float = Field(default=30.0, ge=0)
+
+    model_config: ClassVar[SettingsConfigDict] = SettingsConfigDict(
+        env_prefix="DIFY_AGENT_",
+        env_file=(".env", "dify-agent/.env"),
+        extra="ignore",
+    )
+
+
+__all__ = ["DEFAULT_RUN_RETENTION_SECONDS", "ServerSettings"]
diff --git a/dify-agent/src/dify_agent/server/sse.py b/dify-agent/src/dify_agent/server/sse.py
new file mode 100644
index 0000000000..72a880ab0f
--- /dev/null
+++ b/dify-agent/src/dify_agent/server/sse.py
@@ -0,0 +1,29 @@
+"""Server-sent event formatting for run event replay.
+
+SSE frames use the run event id as ``id`` and the run event type as ``event`` so
+browsers can resume with ``Last-Event-ID`` while clients can subscribe by event
+name. Payload data is the full public ``RunEvent`` JSON object.
+"""
+
+from collections.abc import AsyncIterable, AsyncIterator
+
+from dify_agent.protocol.schemas import RUN_EVENT_ADAPTER, RunEvent
+
+
+def format_sse_event(event: RunEvent) -> str:
+    """Serialize one event as an SSE frame."""
+    lines: list[str] = []
+    if event.id is not None:
+        lines.append(f"id: {event.id}")
+    lines.append(f"event: {event.type}")
+    lines.append(f"data: {RUN_EVENT_ADAPTER.dump_json(event).decode()}")
+    return "\n".join(lines) + "\n\n"
+
+
+async def sse_event_stream(events: AsyncIterable[RunEvent]) -> AsyncIterator[str]:
+    """Yield formatted SSE frames from public run events."""
+    async for event in events:
+        yield format_sse_event(event)
+
+
+__all__ = ["format_sse_event", "sse_event_stream"]
diff --git a/dify-agent/src/dify_agent/storage/redis_keys.py b/dify-agent/src/dify_agent/storage/redis_keys.py
new file mode 100644
index 0000000000..c93e69ba82
--- /dev/null
+++ b/dify-agent/src/dify_agent/storage/redis_keys.py
@@ -0,0 +1,14 @@
+"""Redis key helpers for run records and per-run event streams."""
+
+
+def run_record_key(prefix: str, run_id: str) -> str:
+    """Return the Redis string key holding one serialized run record."""
+    return f"{prefix}:runs:{run_id}:record"
+
+
+def run_events_key(prefix: str, run_id: str) -> str:
+    """Return the Redis stream key holding one run's event log."""
+    return f"{prefix}:runs:{run_id}:events"
+
+
+__all__ = ["run_events_key", "run_record_key"]
diff --git a/dify-agent/src/dify_agent/storage/redis_run_store.py b/dify-agent/src/dify_agent/storage/redis_run_store.py
new file mode 100644
index 0000000000..72091dcc1e
--- /dev/null
+++ b/dify-agent/src/dify_agent/storage/redis_run_store.py
@@ -0,0 +1,137 @@
+"""Redis-backed run records and per-run event streams.
+
+The store writes status-only run records as JSON strings and events as Redis
+streams. HTTP event cursors are Redis stream ids; ``0-0`` means replay from the
+beginning for polling and SSE. Records and streams share one retention window
+that is refreshed when status or event data is written. Execution is scheduled
+in-process by ``dify_agent.runtime.run_scheduler``; Redis is not a job queue, and
+create-run payloads are never persisted because layer config may include model
+credentials.
+"""
+
+from collections.abc import AsyncIterator
+from typing import cast
+
+from redis.asyncio import Redis
+
+from dify_agent.protocol.schemas import RUN_EVENT_ADAPTER, RunEvent, RunEventsResponse, RunStatus, utc_now
+from dify_agent.runtime.event_sink import RunEventSink
+from dify_agent.server.schemas import RunRecord, new_run_id
+from dify_agent.server.settings import DEFAULT_RUN_RETENTION_SECONDS
+from dify_agent.storage.redis_keys import run_events_key, run_record_key
+
+
+class RunNotFoundError(LookupError):
+    """Raised when a requested run record does not exist."""
+
+
+class RedisRunStore(RunEventSink):
+    """Async Redis implementation for run records and event logs.
+
+    ``run_retention_seconds`` is applied to both the run record key and the
+    per-run Redis stream. Event writes also refresh the record TTL so long-running
+    runs that keep producing events do not lose their status record mid-run.
+    """
+
+    redis: Redis
+    prefix: str
+    run_retention_seconds: int
+
+    def __init__(
+        self,
+        redis: Redis,
+        *,
+        prefix: str = "dify-agent",
+        run_retention_seconds: int = DEFAULT_RUN_RETENTION_SECONDS,
+    ) -> None:
+        if run_retention_seconds <= 0:
+            raise ValueError("run_retention_seconds must be positive")
+        self.redis = redis
+        self.prefix = prefix
+        self.run_retention_seconds = run_retention_seconds
+
+    async def create_run(self) -> RunRecord:
+        """Persist a running run record without storing the create request."""
+        run_id = new_run_id()
+        record = RunRecord(run_id=run_id, status="running")
+        await self.redis.set(
+            run_record_key(self.prefix, run_id),
+            record.model_dump_json(),
+            ex=self.run_retention_seconds,
+        )
+        return record
+
+    async def get_run(self, run_id: str) -> RunRecord:
+        """Return one run record or raise ``RunNotFoundError``."""
+        value = await self.redis.get(run_record_key(self.prefix, run_id))
+        if value is None:
+            raise RunNotFoundError(run_id)
+        if isinstance(value, bytes):
+            value = value.decode()
+        return RunRecord.model_validate_json(value)
+
+    async def update_status(self, run_id: str, status: RunStatus, error: str | None = None) -> None:
+        """Update the status fields of an existing run record."""
+        record = await self.get_run(run_id)
+        updated = record.model_copy(update={"status": status, "updated_at": utc_now(), "error": error})
+        await self.redis.set(
+            run_record_key(self.prefix, run_id),
+            updated.model_dump_json(),
+            ex=self.run_retention_seconds,
+        )
+
+    async def append_event(self, event: RunEvent) -> str:
+        """Append an event JSON payload to the run's Redis stream."""
+        events_key = run_events_key(self.prefix, event.run_id)
+        payload = RUN_EVENT_ADAPTER.dump_json(event, exclude={"id"}).decode()
+        event_id = await self.redis.xadd(
+            events_key,
+            {"payload": payload},
+        )
+        await self.redis.expire(events_key, self.run_retention_seconds)
+        await self.redis.expire(run_record_key(self.prefix, event.run_id), self.run_retention_seconds)
+        return event_id.decode() if isinstance(event_id, bytes) else str(event_id)
+
+    async def get_events(self, run_id: str, *, after: str = "0-0", limit: int = 100) -> RunEventsResponse:
+        """Read a bounded page of events after ``after`` cursor."""
+        await self.get_run(run_id)
+        raw_events = await self.redis.xrange(run_events_key(self.prefix, run_id), min=f"({after}", count=limit)
+        events = [self._decode_event(run_id, raw_id, fields) for raw_id, fields in raw_events]
+        next_cursor = events[-1].id if events else after
+        return RunEventsResponse(run_id=run_id, events=events, next_cursor=next_cursor)
+
+    async def iter_events(self, run_id: str, *, after: str = "0-0") -> AsyncIterator[RunEvent]:
+        """Yield replayed and future events for SSE clients."""
+        await self.get_run(run_id)
+        cursor = after
+        while True:
+            page = await self.get_events(run_id, after=cursor, limit=100)
+            for event in page.events:
+                if event.id is not None:
+                    cursor = event.id
+                yield event
+            if not page.events:
+                break
+        while True:
+            response = await self.redis.xread({run_events_key(self.prefix, run_id): cursor}, block=30_000, count=100)
+            if not response:
+                continue
+            for _stream_name, entries in response:
+                for raw_id, fields in entries:
+                    event = self._decode_event(run_id, raw_id, fields)
+                    if event.id is not None:
+                        cursor = event.id
+                    yield event
+
+    @staticmethod
+    def _decode_event(run_id: str, raw_id: object, fields: dict[object, object]) -> RunEvent:
+        """Decode one Redis stream entry into a public event."""
+        payload = fields.get(b"payload") or fields.get("payload")
+        if isinstance(payload, bytes):
+            payload = payload.decode()
+        event_id = raw_id.decode() if isinstance(raw_id, bytes) else str(raw_id)
+        event = RUN_EVENT_ADAPTER.validate_json(cast(str, payload))
+        return event.model_copy(update={"id": event_id, "run_id": run_id})
+
+
+__all__ = ["DEFAULT_RUN_RETENTION_SECONDS", "RedisRunStore", "RunNotFoundError"]
diff --git a/dify-agent/tests/__init__.py b/dify-agent/tests/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/dify-agent/tests/docs/test_examples.py b/dify-agent/tests/docs/test_examples.py
new file mode 100644
index 0000000000..83280724b2
--- /dev/null
+++ b/dify-agent/tests/docs/test_examples.py
@@ -0,0 +1,65 @@
+from __future__ import annotations
+
+from collections.abc import Iterable
+from dataclasses import dataclass, field
+from pathlib import Path
+
+import pytest
+from _pytest.mark import ParameterSet
+from pytest_examples import CodeExample, EvalExample, find_examples
+from pytest_examples.config import ExamplesConfig as BaseExamplesConfig
+
+
+@dataclass
+class ExamplesConfig(BaseExamplesConfig):
+    known_first_party: list[str] = field(default_factory=list[str])
+
+    def ruff_config(self) -> tuple[str, ...]:
+        config = super().ruff_config()
+        if self.known_first_party:
+            config = (*config, "--config", f"lint.isort.known-first-party = {self.known_first_party}")
+        return config
+
+
+def find_doc_examples() -> Iterable[ParameterSet]:
+    root_dir = Path(__file__).resolve().parents[2]
+    for example in find_examples(
+        root_dir / "docs",
+        root_dir / "src",
+        root_dir / "examples" / "agenton",
+        root_dir / "examples" / "dify_agent",
+    ):
+        path = example.path.relative_to(root_dir)
+        yield pytest.param(example, id=f"{path}:{example.start_line}")
+
+
+@pytest.mark.parametrize("example", find_doc_examples())
+def test_documentation_examples(example: CodeExample, eval_example: EvalExample) -> None:
+    prefix_settings = example.prefix_settings()
+    opt_test = prefix_settings.get("test", "")
+    opt_lint = prefix_settings.get("lint", "")
+    line_length = int(prefix_settings.get("line_length", "120"))
+
+    eval_example.config = ExamplesConfig(
+        ruff_ignore=["D", "Q001"],
+        target_version="py312",  # pyright: ignore[reportArgumentType]
+        line_length=line_length,
+        isort=True,
+        upgrade=True,
+        quotes="double",
+        known_first_party=["agenton", "agenton_collections", "dify_agent"],
+    )
+
+    if not opt_lint.startswith("skip"):
+        if eval_example.update_examples:  # pragma: no cover
+            eval_example.format_ruff(example)
+        else:
+            eval_example.lint_ruff(example)
+
+    if opt_test.startswith("skip"):
+        pytest.skip(opt_test[4:].lstrip(" -") or "running code skipped")
+
+    if eval_example.update_examples:  # pragma: no cover
+        eval_example.run_print_update(example, module_globals={"__name__": "__main__"})
+    else:
+        eval_example.run_print_check(example, module_globals={"__name__": "__main__"})
diff --git a/dify-agent/tests/docs/test_snippets.py b/dify-agent/tests/docs/test_snippets.py
new file mode 100644
index 0000000000..89428323d0
--- /dev/null
+++ b/dify-agent/tests/docs/test_snippets.py
@@ -0,0 +1,46 @@
+from __future__ import annotations
+
+import sys
+from pathlib import Path
+
+PROJECT_ROOT = Path(__file__).resolve().parents[2]
+HOOKS_DIR = PROJECT_ROOT / "docs" / ".hooks"
+sys.path.append(str(HOOKS_DIR))
+
+from snippets import inject_snippets, parse_file_sections, parse_snippet_directive  # pyright: ignore[reportMissingImports]  # noqa: E402
+
+
+def test_parse_snippet_directive() -> None:
+    directive = parse_snippet_directive('```snippet {path="demo.py" fragment="main" hl="1"}\n```')
+
+    assert directive is not None
+    assert directive.path == "demo.py"
+    assert directive.fragment == "main"
+    assert directive.extra_attrs == {"hl": "1"}
+
+
+def test_parse_file_sections_and_inject_snippet(tmp_path: Path) -> None:
+    source = tmp_path / "demo.py"
+    source.write_text(
+        """import asyncio
+
+### [main]
+async def main() -> None:
+    print("hello")
+### [/main]
+
+if __name__ == "__main__":
+    asyncio.run(main())
+""",
+        encoding="utf-8",
+    )
+
+    parsed = parse_file_sections(source)
+    assert "main" in parsed.sections
+
+    markdown = '```snippet {path="/examples/agenton/agenton_examples/session_snapshot.py"}\n```'
+    rendered = inject_snippets(markdown, PROJECT_ROOT / "docs")
+
+    assert rendered.startswith('```py {title="examples/agenton/agenton_examples/session_snapshot.py"}')
+    assert "async def main() -> None:" in rendered
+    assert "asyncio.run(main())" in rendered
diff --git a/dify-agent/tests/local/__init__.py b/dify-agent/tests/local/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/dify-agent/tests/local/agenton/__init__.py b/dify-agent/tests/local/agenton/__init__.py
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/dify-agent/tests/local/agenton/__init__.py
@@ -0,0 +1 @@
+
diff --git a/dify-agent/tests/local/agenton/compositor/__init__.py b/dify-agent/tests/local/agenton/compositor/__init__.py
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/dify-agent/tests/local/agenton/compositor/__init__.py
@@ -0,0 +1 @@
+
diff --git a/dify-agent/tests/local/agenton/compositor/test_builder_snapshot.py b/dify-agent/tests/local/agenton/compositor/test_builder_snapshot.py
new file mode 100644
index 0000000000..b43b0d1e71
--- /dev/null
+++ b/dify-agent/tests/local/agenton/compositor/test_builder_snapshot.py
@@ -0,0 +1,337 @@
+import asyncio
+from dataclasses import dataclass
+
+import pytest
+from pydantic import BaseModel, ConfigDict, ValidationError
+from typing_extensions import override
+
+import agenton.compositor as compositor_module
+import agenton.layers as layers_module
+from agenton.compositor import (
+    Compositor,
+    LayerConfigInput,
+    LayerNode,
+    LayerNodeConfig,
+    LayerProvider,
+    LayerProviderInput,
+)
+from agenton.layers import EmptyLayerConfig, Layer, LayerDeps, NoLayerDeps, PlainLayer
+from agenton_collections.layers.plain import ObjectLayer, PromptLayer, PromptLayerConfig
+
+
+EXPECTED_FACADE_EXPORTS = [
+    "Compositor",
+    "CompositorConfig",
+    "CompositorConfigValue",
+    "CompositorRun",
+    "CompositorSessionSnapshot",
+    "CompositorSessionSnapshotValue",
+    "CompositorTransformer",
+    "CompositorTransformerKwargs",
+    "LayerFactory",
+    "LayerNode",
+    "LayerNodeConfig",
+    "LayerProvider",
+    "LayerRunSlot",
+    "LayerSessionSnapshot",
+]
+
+EXPECTED_DIRECT_IMPORT_COMPAT_NAMES = ["LayerConfigInput", "LayerProviderInput"]
+
+
+@dataclass(slots=True)
+class InstanceOnlyLayer(PlainLayer[NoLayerDeps]):
+    pass
+
+
+@dataclass(slots=True)
+class RequiredConstructorLayer(PlainLayer[NoLayerDeps]):
+    value: str
+
+
+def test_layer_provider_from_layer_type_uses_declared_schema_and_type_id() -> None:
+    provider = LayerProvider.from_layer_type(PromptLayer)
+
+    assert provider.type_id == "plain.prompt"
+    assert provider.layer_type is PromptLayer
+
+    layer = provider.create_layer(PromptLayerConfig(prefix="hello", user="ask politely"))
+
+    assert isinstance(layer, PromptLayer)
+    assert layer.config == PromptLayerConfig(prefix="hello", user="ask politely")
+    assert layer.prefix_prompts == ["hello"]
+
+    with pytest.raises(TypeError, match="cannot be created from empty config"):
+        LayerProvider.from_layer_type(RequiredConstructorLayer).create_layer()
+
+
+def test_compositor_from_config_uses_providers_and_enter_configs_by_node_name() -> None:
+    compositor = Compositor.from_config(
+        {"layers": [{"name": "prompt", "type": "plain.prompt"}]},
+        providers=[PromptLayer],
+    )
+
+    async def run() -> None:
+        async with compositor.enter(
+            configs={"prompt": {"prefix": "hello", "user": "ask politely", "suffix": ["bye"]}}
+        ) as active_run:
+            assert [prompt.value for prompt in active_run.prompts] == ["hello", "bye"]
+            assert [prompt.value for prompt in active_run.user_prompts] == ["ask politely"]
+
+    asyncio.run(run())
+
+    with pytest.raises(ValidationError):
+        asyncio.run(_enter_once(compositor, configs={"prompt": {"unknown": "field"}}))
+
+
+def test_layer_node_config_has_no_runtime_state_or_layer_config() -> None:
+    node = LayerNodeConfig(
+        name="prompt",
+        type="plain.prompt",
+        deps={"source": "other"},
+        metadata={"label": "Prompt"},
+    )
+
+    assert node.model_dump(mode="json") == {
+        "name": "prompt",
+        "type": "plain.prompt",
+        "deps": {"source": "other"},
+        "metadata": {"label": "Prompt"},
+    }
+    assert "runtime_state" not in LayerNodeConfig.model_fields
+    assert "config" not in LayerNodeConfig.model_fields
+
+
+def test_node_providers_override_type_id_providers_for_serializable_graphs() -> None:
+    override_provider = LayerProvider.from_factory(
+        layer_type=PromptLayer,
+        create=lambda config: PromptLayer(prefix="override"),
+    )
+    compositor = Compositor.from_config(
+        {"layers": [{"name": "prompt", "type": "plain.prompt"}]},
+        providers=[PromptLayer],
+        node_providers={"prompt": override_provider},
+    )
+
+    async def run() -> None:
+        async with compositor.enter(configs={"prompt": {"prefix": "ignored"}}) as active_run:
+            assert [prompt.value for prompt in active_run.prompts] == ["override"]
+
+    asyncio.run(run())
+
+
+def test_from_config_rejects_missing_duplicate_and_unknown_providers() -> None:
+    with pytest.raises(KeyError, match="Layer type id 'missing' is not registered"):
+        Compositor.from_config({"layers": [{"name": "node", "type": "missing"}]}, providers=[])
+
+    with pytest.raises(ValueError, match="already registered"):
+        Compositor.from_config(
+            {"layers": [{"name": "prompt", "type": "plain.prompt"}]},
+            providers=[PromptLayer, PromptLayer],
+        )
+
+    with pytest.raises(ValueError, match="must declare a type_id"):
+        Compositor.from_config(
+            {"layers": [{"name": "node", "type": "instance.only"}]},
+            providers=[InstanceOnlyLayer],
+        )
+
+    with pytest.raises(ValueError, match="unknown layer node names: other"):
+        Compositor.from_config(
+            {"layers": [{"name": "prompt", "type": "plain.prompt"}]},
+            providers=[PromptLayer],
+            node_providers={"other": PromptLayer},
+        )
+
+
+def test_compositor_run_get_layer_returns_named_layer_and_validates_type() -> None:
+    compositor = Compositor([LayerNode("obj", _object_provider("value"))])
+
+    async def run() -> None:
+        async with compositor.enter() as active_run:
+            layer = active_run.get_layer("obj", ObjectLayer)
+            assert active_run.get_layer("obj") is layer
+            assert layer.value == "value"
+
+            with pytest.raises(KeyError, match="Layer 'missing' is not defined"):
+                active_run.get_layer("missing")
+
+            with pytest.raises(TypeError, match="Layer 'obj' must be PromptLayer, got ObjectLayer"):
+                active_run.get_layer("obj", PromptLayer)
+
+    asyncio.run(run())
+
+
+class ObjectConsumerDeps(LayerDeps):
+    obj: ObjectLayer[str]  # pyright: ignore[reportUninitializedInstanceVariable]
+
+
+@dataclass(slots=True)
+class ObjectConsumerLayer(PlainLayer[ObjectConsumerDeps]):
+    @property
+    @override
+    def prefix_prompts(self) -> list[str]:
+        return [self.deps.obj.value]
+
+
+def test_python_native_construction_mixes_layer_classes_and_providers() -> None:
+    compositor = Compositor(
+        [
+            LayerNode("prompt", PromptLayer),
+            LayerNode("obj", _object_provider("instance")),
+            LayerNode("consumer", ObjectConsumerLayer, deps={"obj": "obj"}),
+        ]
+    )
+
+    async def run() -> None:
+        async with compositor.enter(configs={"prompt": {"prefix": "cfg"}}) as active_run:
+            assert [prompt.value for prompt in active_run.prompts] == ["cfg", "instance"]
+
+    asyncio.run(run())
+
+
+class SerializableState(BaseModel):
+    resource_id: str = ""
+    created: bool = False
+    resumed: bool = False
+
+    model_config = ConfigDict(extra="forbid", validate_assignment=True)
+
+
+@dataclass(slots=True)
+class StateLayer(PlainLayer[NoLayerDeps, EmptyLayerConfig, SerializableState]):
+    created_hooks: int = 0
+    resumed_hooks: int = 0
+
+    @override
+    async def on_context_create(self) -> None:
+        self.created_hooks += 1
+        self.runtime_state.created = True
+
+    @override
+    async def on_context_resume(self) -> None:
+        self.resumed_hooks += 1
+        self.runtime_state.resumed = True
+
+
+def test_snapshot_contains_runtime_state_only_not_config_deps_or_resources() -> None:
+    compositor = Compositor([LayerNode("state", StateLayer)])
+
+    async def get_snapshot() -> dict[str, object]:
+        async with compositor.enter() as active_run:
+            state_layer = active_run.get_layer("state", StateLayer)
+            state_layer.runtime_state.resource_id = "abc"
+        assert active_run.session_snapshot is not None
+        return active_run.session_snapshot.model_dump(mode="json")
+
+    dumped = asyncio.run(get_snapshot())
+    assert dumped == {
+        "schema_version": 1,
+        "layers": [
+            {
+                "name": "state",
+                "lifecycle_state": "closed",
+                "runtime_state": {"resource_id": "abc", "created": True, "resumed": False},
+            }
+        ],
+    }
+
+
+def test_hydrate_validates_runtime_state_and_resume_mutates_layer_self() -> None:
+    compositor = Compositor([LayerNode("state", StateLayer)])
+
+    bad_snapshot = {"layers": [{"name": "state", "lifecycle_state": "suspended", "runtime_state": {"wrong": "field"}}]}
+    with pytest.raises(ValidationError):
+        asyncio.run(_enter_once(compositor, session_snapshot=bad_snapshot))
+
+    good_snapshot = {
+        "layers": [
+            {
+                "name": "state",
+                "lifecycle_state": "suspended",
+                "runtime_state": {"resource_id": "abc", "created": True, "resumed": False},
+            }
+        ]
+    }
+
+    async def run() -> None:
+        async with compositor.enter(session_snapshot=good_snapshot) as active_run:
+            layer = active_run.get_layer("state", StateLayer)
+            assert layer.runtime_state.resource_id == "abc"
+            assert layer.runtime_state.resumed is True
+            assert layer.resumed_hooks == 1
+
+    asyncio.run(run())
+
+
+def test_hydrate_rejects_mismatched_snapshot_layer_names() -> None:
+    compositor = Compositor([LayerNode("state", StateLayer)])
+
+    with pytest.raises(ValueError, match=r"Expected \[state\], got \[other\]"):
+        asyncio.run(
+            _enter_once(
+                compositor,
+                session_snapshot={"layers": [{"name": "other", "lifecycle_state": "new", "runtime_state": {}}]},
+            )
+        )
+
+
+def test_removed_lifecycle_and_resource_apis_are_not_public_exports() -> None:
+    assert not hasattr(compositor_module, "CompositorBuilder")
+    assert not hasattr(compositor_module, "LayerRegistry")
+    assert not hasattr(compositor_module, "LayerDescriptor")
+    assert not hasattr(layers_module, "LayerControl")
+    assert not hasattr(layers_module, "EmptyRuntimeHandles")
+    assert not hasattr(Layer, "enter")
+    assert not hasattr(Layer, "hydrate_session_state")
+    assert not hasattr(Layer, "suspend_on_exit")
+    assert not hasattr(Layer, "delete_on_exit")
+    assert not hasattr(Layer, "runtime_handles")
+    assert not hasattr(Layer, "require_control")
+    assert not hasattr(Layer, "control_for")
+    assert not hasattr(Layer, "enter_async_resource")
+    assert not hasattr(Layer, "add_async_cleanup")
+
+
+def test_facade_keeps_direct_import_type_aliases_without_expanding___all__() -> None:
+    assert compositor_module.LayerConfigInput is LayerConfigInput
+    assert compositor_module.LayerProviderInput is LayerProviderInput
+    assert LayerConfigInput.__module__ == "agenton.compositor"
+    assert LayerProviderInput.__module__ == "agenton.compositor"
+    assert LayerConfigInput.__name__ == "LayerConfigInput"
+    assert LayerProviderInput.__name__ == "LayerProviderInput"
+    assert "LayerConfigInput" not in compositor_module.__all__
+    assert "LayerProviderInput" not in compositor_module.__all__
+
+
+def test_facade_export_surface_matches_split_contract() -> None:
+    compatibility_names = [*EXPECTED_FACADE_EXPORTS, *EXPECTED_DIRECT_IMPORT_COMPAT_NAMES]
+
+    assert compositor_module.__all__ == EXPECTED_FACADE_EXPORTS
+
+    namespace: dict[str, object] = {}
+    exec(
+        "from agenton.compositor import " + ", ".join(compatibility_names),
+        {},
+        namespace,
+    )
+
+    for name in compatibility_names:
+        assert namespace[name] is getattr(compositor_module, name)
+
+
+def _object_provider(value: str) -> LayerProvider[ObjectLayer[str]]:
+    return LayerProvider.from_factory(layer_type=ObjectLayer, create=lambda config: ObjectLayer(value))
+
+
+async def _enter_once(
+    compositor: Compositor,
+    *,
+    configs: dict[str, object] | None = None,
+    session_snapshot: object | None = None,
+) -> None:
+    async with compositor.enter(
+        configs=configs,  # pyright: ignore[reportArgumentType]
+        session_snapshot=session_snapshot,  # pyright: ignore[reportArgumentType]
+    ):
+        pass
diff --git a/dify-agent/tests/local/agenton/compositor/test_direct_deps.py b/dify-agent/tests/local/agenton/compositor/test_direct_deps.py
new file mode 100644
index 0000000000..d89d4bb7e2
--- /dev/null
+++ b/dify-agent/tests/local/agenton/compositor/test_direct_deps.py
@@ -0,0 +1,128 @@
+import asyncio
+from dataclasses import dataclass
+
+import pytest
+from typing_extensions import override
+
+from agenton.compositor import Compositor, LayerNode, LayerProvider
+from agenton.layers import EmptyLayerConfig, LayerDeps, PlainLayer
+from agenton_collections.layers.plain import ObjectLayer
+
+
+class RenamedObjectDeps(LayerDeps):
+    renamed: ObjectLayer[str]  # pyright: ignore[reportUninitializedInstanceVariable]
+
+
+@dataclass(slots=True)
+class RenamedConsumerLayer(PlainLayer[RenamedObjectDeps]):
+    @property
+    @override
+    def prefix_prompts(self) -> list[str]:
+        return [self.deps.renamed.value]
+
+
+class SameNameObjectDeps(LayerDeps):
+    same: ObjectLayer[str]  # pyright: ignore[reportUninitializedInstanceVariable]
+
+
+@dataclass(slots=True)
+class SameNameConsumerLayer(PlainLayer[SameNameObjectDeps]):
+    @property
+    @override
+    def prefix_prompts(self) -> list[str]:
+        return [self.deps.same.value]
+
+
+class OptionalObjectDeps(LayerDeps):
+    maybe: ObjectLayer[str] | None  # pyright: ignore[reportUninitializedInstanceVariable]
+
+
+@dataclass(slots=True)
+class OptionalConsumerLayer(PlainLayer[OptionalObjectDeps]):
+    pass
+
+
+def _object_provider(value: str) -> LayerProvider[ObjectLayer[str]]:
+    return LayerProvider.from_factory(
+        layer_type=ObjectLayer,
+        create=lambda config: ObjectLayer(value),
+    )
+
+
+def test_direct_deps_access_uses_explicit_dependency_rename() -> None:
+    compositor = Compositor(
+        [
+            LayerNode("actual", _object_provider("target")),
+            LayerNode("consumer", RenamedConsumerLayer, deps={"renamed": "actual"}),
+        ]
+    )
+
+    async def run() -> None:
+        async with compositor.enter() as active_run:
+            target = active_run.get_layer("actual", ObjectLayer)
+            consumer = active_run.get_layer("consumer", RenamedConsumerLayer)
+            assert consumer.deps.renamed is target
+            assert [prompt.value for prompt in active_run.prompts] == ["target"]
+
+    asyncio.run(run())
+
+
+def test_direct_deps_access_uses_explicit_same_name_dependency() -> None:
+    compositor = Compositor(
+        [
+            LayerNode("same", _object_provider("target")),
+            LayerNode("consumer", SameNameConsumerLayer, deps={"same": "same"}),
+        ]
+    )
+
+    async def run() -> None:
+        async with compositor.enter() as active_run:
+            target = active_run.get_layer("same", ObjectLayer)
+            consumer = active_run.get_layer("consumer", SameNameConsumerLayer)
+            assert consumer.deps.same is target
+            assert [prompt.value for prompt in active_run.prompts] == ["target"]
+
+    asyncio.run(run())
+
+
+def test_optional_missing_dependency_is_bound_to_none() -> None:
+    compositor = Compositor([LayerNode("consumer", OptionalConsumerLayer)])
+
+    async def run() -> None:
+        async with compositor.enter() as active_run:
+            consumer = active_run.get_layer("consumer", OptionalConsumerLayer)
+            assert consumer.deps.maybe is None
+
+    asyncio.run(run())
+
+
+def test_missing_required_dependency_is_rejected_before_hooks() -> None:
+    compositor = Compositor([LayerNode("consumer", SameNameConsumerLayer)])
+
+    with pytest.raises(ValueError, match="Dependency 'same' is required"):
+        asyncio.run(_enter_once(compositor))
+
+
+def test_unknown_dependency_mapping_is_rejected_for_compositor_construction() -> None:
+    with pytest.raises(ValueError, match="unknown dependency keys: missing"):
+        Compositor([LayerNode("consumer", RenamedConsumerLayer, deps={"missing": "target"})])
+
+
+def test_undefined_dependency_target_is_rejected_for_compositor_construction() -> None:
+    with pytest.raises(ValueError, match="depends on undefined layer names: missing_target"):
+        Compositor([LayerNode("consumer", RenamedConsumerLayer, deps={"renamed": "missing_target"})])
+
+
+def test_duplicate_layer_node_name_is_rejected() -> None:
+    with pytest.raises(ValueError, match="Duplicate layer name 'same'"):
+        Compositor(
+            [
+                LayerNode("same", _object_provider("first")),
+                LayerNode("same", _object_provider("second")),
+            ]
+        )
+
+
+async def _enter_once(compositor: Compositor) -> None:
+    async with compositor.enter(configs={"consumer": EmptyLayerConfig()}):
+        pass
diff --git a/dify-agent/tests/local/agenton/compositor/test_enter.py b/dify-agent/tests/local/agenton/compositor/test_enter.py
new file mode 100644
index 0000000000..154bc8b0d7
--- /dev/null
+++ b/dify-agent/tests/local/agenton/compositor/test_enter.py
@@ -0,0 +1,401 @@
+import asyncio
+from collections.abc import Iterator
+from dataclasses import dataclass, field
+from itertools import count
+
+import pytest
+from pydantic import BaseModel, ConfigDict, ValidationError
+from typing_extensions import override
+
+from agenton.compositor import Compositor, CompositorSessionSnapshot, LayerNode, LayerProvider
+from agenton.layers import (
+    EmptyLayerConfig,
+    ExitIntent,
+    LayerConfig,
+    LifecycleState,
+    NoLayerDeps,
+    PlainLayer,
+)
+
+
+@dataclass(slots=True)
+class TraceLayer(PlainLayer[NoLayerDeps]):
+    """Layer that records no-arg lifecycle events observable to tests."""
+
+    events: list[str] = field(default_factory=list)
+
+    @override
+    async def on_context_create(self) -> None:
+        self.events.append("create")
+
+    @override
+    async def on_context_suspend(self) -> None:
+        self.events.append("suspend")
+
+    @override
+    async def on_context_resume(self) -> None:
+        self.events.append("resume")
+
+    @override
+    async def on_context_delete(self) -> None:
+        self.events.append("delete")
+
+
+def _compositor(*layer_names: str) -> Compositor:
+    return Compositor([LayerNode(layer_name, TraceLayer) for layer_name in layer_names])
+
+
+def test_same_compositor_enters_multiple_times_with_fresh_layers_and_snapshot_resume() -> None:
+    compositor = _compositor("first", "second")
+    runs = []
+
+    async def run() -> None:
+        async with compositor.enter() as first_run:
+            assert [slot.lifecycle_state for slot in first_run.slots.values()] == [
+                LifecycleState.ACTIVE,
+                LifecycleState.ACTIVE,
+            ]
+            first_run.suspend_on_exit()
+            assert [slot.exit_intent for slot in first_run.slots.values()] == [
+                ExitIntent.SUSPEND,
+                ExitIntent.SUSPEND,
+            ]
+        runs.append(first_run)
+
+        assert first_run.session_snapshot is not None
+        async with compositor.enter(session_snapshot=first_run.session_snapshot) as resumed_run:
+            assert resumed_run.get_layer("first", TraceLayer).events == ["resume"]
+            assert resumed_run.get_layer("second", TraceLayer).events == ["resume"]
+        runs.append(resumed_run)
+
+    asyncio.run(run())
+
+    first_layer = runs[0].get_layer("first", TraceLayer)
+    resumed_layer = runs[1].get_layer("first", TraceLayer)
+    assert first_layer is not resumed_layer
+    assert first_layer.events == ["create", "suspend"]
+    assert resumed_layer.events == ["resume", "delete"]
+    assert runs[1].session_snapshot is not None
+    assert [layer.lifecycle_state for layer in runs[1].session_snapshot.layers] == [
+        LifecycleState.CLOSED,
+        LifecycleState.CLOSED,
+    ]
+
+
+def test_concurrent_enters_do_not_share_layer_instances() -> None:
+    compositor = _compositor("trace")
+
+    async def enter_once() -> tuple[int, list[str]]:
+        async with compositor.enter() as run:
+            layer = run.get_layer("trace", TraceLayer)
+            await asyncio.sleep(0)
+        return id(layer), layer.events
+
+    async def run_concurrently() -> list[tuple[int, list[str]]]:
+        return list(await asyncio.gather(enter_once(), enter_once()))
+
+    results = asyncio.run(run_concurrently())
+
+    assert results[0][0] != results[1][0]
+    assert results[0][1] == ["create", "delete"]
+    assert results[1][1] == ["create", "delete"]
+
+
+class ConfiguredLayerConfig(LayerConfig):
+    value: str
+
+    model_config = ConfigDict(extra="forbid")
+
+
+@dataclass(slots=True)
+class ConfiguredLayer(PlainLayer[NoLayerDeps, ConfiguredLayerConfig]):
+    type_id = "test.configured"
+
+    value: str
+
+    hooks: list[str] = field(default_factory=list)
+
+    @classmethod
+    @override
+    def from_config(cls, config: ConfiguredLayerConfig) -> "ConfiguredLayer":
+        return cls(value=config.value)
+
+    @override
+    async def on_context_create(self) -> None:
+        self.hooks.append(f"create:{self.config.value}")
+
+
+def test_custom_factory_is_called_each_enter_with_typed_config() -> None:
+    calls: list[str] = []
+
+    def create_layer(config: ConfiguredLayerConfig) -> ConfiguredLayer:
+        calls.append(config.value)
+        return ConfiguredLayer(value=f"factory:{config.value}")
+
+    compositor = Compositor(
+        [LayerNode("configured", LayerProvider.from_factory(layer_type=ConfiguredLayer, create=create_layer))]
+    )
+
+    async def run() -> None:
+        async with compositor.enter(configs={"configured": {"value": "one"}}) as first_run:
+            first_layer = first_run.get_layer("configured", ConfiguredLayer)
+            assert first_layer.value == "factory:one"
+            assert first_layer.config.value == "one"
+        async with compositor.enter(configs={"configured": ConfiguredLayerConfig(value="two")}) as second_run:
+            second_layer = second_run.get_layer("configured", ConfiguredLayer)
+            assert second_layer.value == "factory:two"
+            assert second_layer.config.value == "two"
+            assert second_layer is not first_layer
+
+    asyncio.run(run())
+
+    assert calls == ["one", "two"]
+
+
+def test_provider_rejects_reused_layer_instance_before_hooks_run() -> None:
+    shared_layer = TraceLayer()
+    compositor = Compositor(
+        [
+            LayerNode(
+                "trace",
+                LayerProvider.from_factory(layer_type=TraceLayer, create=lambda config: shared_layer),
+            )
+        ]
+    )
+
+    async def run() -> None:
+        async with compositor.enter():
+            pass
+
+        with pytest.raises(ValueError, match="fresh layer instance"):
+            async with compositor.enter():
+                pass
+
+    asyncio.run(run())
+
+    assert shared_layer.events == ["create", "delete"]
+
+
+def test_configs_are_validated_by_node_name_before_factory_call() -> None:
+    calls: list[str] = []
+
+    def create_layer(config: ConfiguredLayerConfig) -> ConfiguredLayer:
+        calls.append(config.value)
+        return ConfiguredLayer(value=config.value)
+
+    compositor = Compositor(
+        [LayerNode("configured", LayerProvider.from_factory(layer_type=ConfiguredLayer, create=create_layer))]
+    )
+
+    with pytest.raises(ValueError, match="unknown layer node names: missing"):
+        asyncio.run(_enter_once(compositor, configs={"missing": {}}))
+
+    with pytest.raises(ValidationError):
+        asyncio.run(_enter_once(compositor, configs={"configured": {"unknown": "field"}}))
+
+    assert calls == []
+
+
+def test_all_node_configs_are_validated_before_any_factory_runs() -> None:
+    calls: list[str] = []
+
+    def create_layer(config: ConfiguredLayerConfig) -> ConfiguredLayer:
+        calls.append(config.value)
+        return ConfiguredLayer(value=config.value)
+
+    provider = LayerProvider.from_factory(layer_type=ConfiguredLayer, create=create_layer)
+    compositor = Compositor([LayerNode("first", provider), LayerNode("second", provider)])
+
+    with pytest.raises(ValidationError):
+        asyncio.run(
+            _enter_once(
+                compositor,
+                configs={"first": {"value": "valid"}, "second": {"unknown": "field"}},
+            )
+        )
+
+    assert calls == []
+
+
+def test_existing_config_model_instances_are_revalidated_before_factory_runs() -> None:
+    calls: list[str] = []
+
+    def create_layer(config: ConfiguredLayerConfig) -> ConfiguredLayer:
+        calls.append(config.value)
+        return ConfiguredLayer(value=config.value)
+
+    compositor = Compositor(
+        [LayerNode("configured", LayerProvider.from_factory(layer_type=ConfiguredLayer, create=create_layer))]
+    )
+    config = ConfiguredLayerConfig(value="valid")
+    config.value = 123  # pyright: ignore[reportAttributeAccessIssue]
+
+    with pytest.raises(ValidationError):
+        asyncio.run(_enter_once(compositor, configs={"configured": config}))
+
+    assert calls == []
+
+
+def test_existing_snapshot_model_instances_are_revalidated_before_factory_runs() -> None:
+    calls = 0
+
+    def create_layer(config: EmptyLayerConfig) -> TraceLayer:
+        nonlocal calls
+        calls += 1
+        return TraceLayer()
+
+    compositor = Compositor(
+        [LayerNode("trace", LayerProvider.from_factory(layer_type=TraceLayer, create=create_layer))]
+    )
+    snapshot = CompositorSessionSnapshot.model_validate(
+        {"layers": [{"name": "trace", "lifecycle_state": "suspended", "runtime_state": {}}]}
+    )
+    snapshot.layers[0].lifecycle_state = LifecycleState.ACTIVE
+
+    with pytest.raises(ValidationError, match="ACTIVE is internal-only"):
+        asyncio.run(_enter_once(compositor, session_snapshot=snapshot))
+
+    assert calls == 0
+
+
+class RuntimeState(BaseModel):
+    runtime_id: int | None = None
+    resumed_runtime_id: int | None = None
+    deleted_runtime_id: int | None = None
+    body_value: str | None = None
+
+    model_config = ConfigDict(extra="forbid", validate_assignment=True)
+
+
+@dataclass(slots=True)
+class RuntimeStateLayer(PlainLayer[NoLayerDeps, EmptyLayerConfig, RuntimeState]):
+    next_id: Iterator[int] = field(default_factory=lambda: count(1))
+
+    @override
+    async def on_context_create(self) -> None:
+        self.runtime_state.runtime_id = next(self.next_id)
+
+    @override
+    async def on_context_resume(self) -> None:
+        self.runtime_state.resumed_runtime_id = self.runtime_state.runtime_id
+
+    @override
+    async def on_context_delete(self) -> None:
+        self.runtime_state.deleted_runtime_id = self.runtime_state.runtime_id
+
+
+def test_snapshot_hydrates_runtime_state_and_exit_snapshots_from_layer_self() -> None:
+    compositor = Compositor([LayerNode("state", RuntimeStateLayer)])
+
+    async def create_suspend_resume_delete() -> tuple[CompositorSessionSnapshot, CompositorSessionSnapshot]:
+        async with compositor.enter() as first_run:
+            first_run.suspend_on_exit()
+        assert first_run.session_snapshot is not None
+
+        async with compositor.enter(session_snapshot=first_run.session_snapshot) as resumed_run:
+            resumed_layer = resumed_run.get_layer("state", RuntimeStateLayer)
+            assert isinstance(resumed_layer.runtime_state, RuntimeState)
+            assert resumed_layer.runtime_state.runtime_id == 1
+            assert resumed_layer.runtime_state.resumed_runtime_id == 1
+            resumed_layer.runtime_state.body_value = "mutated on self"
+        assert resumed_run.session_snapshot is not None
+        return first_run.session_snapshot, resumed_run.session_snapshot
+
+    suspended_snapshot, closed_snapshot = asyncio.run(create_suspend_resume_delete())
+
+    assert suspended_snapshot.model_dump(mode="json") == {
+        "schema_version": 1,
+        "layers": [
+            {
+                "name": "state",
+                "lifecycle_state": "suspended",
+                "runtime_state": {
+                    "runtime_id": 1,
+                    "resumed_runtime_id": None,
+                    "deleted_runtime_id": None,
+                    "body_value": None,
+                },
+            }
+        ],
+    }
+    assert closed_snapshot.model_dump(mode="json") == {
+        "schema_version": 1,
+        "layers": [
+            {
+                "name": "state",
+                "lifecycle_state": "closed",
+                "runtime_state": {
+                    "runtime_id": 1,
+                    "resumed_runtime_id": 1,
+                    "deleted_runtime_id": 1,
+                    "body_value": "mutated on self",
+                },
+            }
+        ],
+    }
+
+
+def test_run_snapshot_rejects_active_layers() -> None:
+    compositor = _compositor("trace")
+
+    async def run() -> None:
+        async with compositor.enter() as active_run:
+            with pytest.raises(RuntimeError, match="Cannot snapshot active compositor run layers: trace"):
+                active_run.snapshot_session()
+
+    asyncio.run(run())
+
+
+def test_active_snapshot_input_is_rejected_before_factories_run() -> None:
+    calls = 0
+
+    def create_layer(config: EmptyLayerConfig) -> TraceLayer:
+        nonlocal calls
+        calls += 1
+        return TraceLayer()
+
+    compositor = Compositor(
+        [LayerNode("trace", LayerProvider.from_factory(layer_type=TraceLayer, create=create_layer))]
+    )
+    active_snapshot = {"layers": [{"name": "trace", "lifecycle_state": "active", "runtime_state": {}}]}
+
+    with pytest.raises(ValidationError, match="ACTIVE is internal-only"):
+        CompositorSessionSnapshot.model_validate(active_snapshot)
+
+    with pytest.raises(ValidationError, match="ACTIVE is internal-only"):
+        asyncio.run(_enter_once(compositor, session_snapshot=active_snapshot))
+
+    assert calls == 0
+
+
+def test_closed_snapshot_enter_is_rejected_before_hooks_run() -> None:
+    created_layers: list[TraceLayer] = []
+
+    def create_layer(config: EmptyLayerConfig) -> TraceLayer:
+        layer = TraceLayer()
+        created_layers.append(layer)
+        return layer
+
+    compositor = Compositor(
+        [LayerNode("trace", LayerProvider.from_factory(layer_type=TraceLayer, create=create_layer))]
+    )
+    closed_snapshot = {"layers": [{"name": "trace", "lifecycle_state": "closed", "runtime_state": {}}]}
+
+    with pytest.raises(RuntimeError, match="CLOSED snapshots cannot be entered"):
+        asyncio.run(_enter_once(compositor, session_snapshot=closed_snapshot))
+
+    assert len(created_layers) == 1
+    assert created_layers[0].events == []
+
+
+async def _enter_once(
+    compositor: Compositor,
+    *,
+    configs: dict[str, object] | None = None,
+    session_snapshot: object | None = None,
+) -> None:
+    async with compositor.enter(
+        configs=configs,  # pyright: ignore[reportArgumentType]
+        session_snapshot=session_snapshot,  # pyright: ignore[reportArgumentType]
+    ):
+        pass
diff --git a/dify-agent/tests/local/agenton/compositor/test_transformers.py b/dify-agent/tests/local/agenton/compositor/test_transformers.py
new file mode 100644
index 0000000000..56a41d9fe0
--- /dev/null
+++ b/dify-agent/tests/local/agenton/compositor/test_transformers.py
@@ -0,0 +1,156 @@
+import asyncio
+from collections.abc import Callable, Sequence
+from dataclasses import dataclass
+from inspect import Parameter, signature
+
+from typing_extensions import override
+
+from agenton.compositor import Compositor, CompositorTransformerKwargs, LayerNode, LayerProvider
+from agenton.layers import NoLayerDeps, PlainLayer, PlainPromptType, PlainToolType, PlainUserPromptType
+
+type ToolCallable = Callable[..., object]
+type WrappedPrompt = tuple[str, str]
+type WrappedUserPrompt = tuple[str, str]
+
+
+@dataclass(slots=True)
+class PromptAndToolLayer(PlainLayer[NoLayerDeps]):
+    prefix: list[str]
+    user: list[str]
+    suffix: list[str]
+    tool_entries: list[ToolCallable]
+
+    @property
+    @override
+    def prefix_prompts(self) -> list[str]:
+        return self.prefix
+
+    @property
+    @override
+    def suffix_prompts(self) -> list[str]:
+        return self.suffix
+
+    @property
+    @override
+    def user_prompts(self) -> list[str]:
+        return self.user
+
+    @property
+    @override
+    def tools(self) -> list[ToolCallable]:
+        return self.tool_entries
+
+
+def base_tool() -> str:
+    return "base"
+
+
+def wrapped_tool() -> str:
+    return "wrapped"
+
+
+def wrap_prompts(prompts: Sequence[PlainPromptType]) -> list[WrappedPrompt]:
+    return [("wrapped", prompt.value) for prompt in prompts]
+
+
+def wrap_user_prompts(prompts: Sequence[PlainUserPromptType]) -> list[WrappedUserPrompt]:
+    return [("wrapped-user", prompt.value) for prompt in prompts]
+
+
+def describe_tools(tools: Sequence[PlainToolType]) -> list[str]:
+    return [tool.value.__name__ for tool in tools]
+
+
+def prompt_tool_provider(
+    *,
+    prefix: list[str] | None = None,
+    user: list[str] | None = None,
+    suffix: list[str] | None = None,
+    tool_entries: list[ToolCallable] | None = None,
+) -> LayerProvider[PromptAndToolLayer]:
+    return LayerProvider.from_factory(
+        layer_type=PromptAndToolLayer,
+        create=lambda config: PromptAndToolLayer(
+            prefix=list(prefix or []),
+            user=list(user or []),
+            suffix=list(suffix or []),
+            tool_entries=list(tool_entries or []),
+        ),
+    )
+
+
+def test_compositor_transformer_kwargs_keys_match_constructor_parameters() -> None:
+    transformer_kwargs = set(CompositorTransformerKwargs.__required_keys__)
+    parameters = signature(Compositor).parameters
+
+    assert CompositorTransformerKwargs.__optional_keys__ == frozenset()
+    assert transformer_kwargs == {name for name in parameters if name.endswith("_transformer")}
+    assert all(parameters[name].kind is Parameter.KEYWORD_ONLY for name in transformer_kwargs)
+
+
+def test_compositor_transformer_kwargs_keys_match_from_config_parameters() -> None:
+    transformer_kwargs = set(CompositorTransformerKwargs.__required_keys__)
+    parameters = signature(Compositor.from_config).parameters
+
+    assert transformer_kwargs == {name for name in parameters if name.endswith("_transformer")}
+    assert all(parameters[name].kind is Parameter.KEYWORD_ONLY for name in transformer_kwargs)
+
+
+def test_compositor_transforms_prompts_to_another_type_after_layer_ordering() -> None:
+    compositor: Compositor[WrappedPrompt, PlainToolType, PlainPromptType, PlainToolType] = Compositor(
+        [
+            LayerNode("first", prompt_tool_provider(prefix=["first-prefix"], suffix=["first-suffix"])),
+            LayerNode("second", prompt_tool_provider(prefix=["second-prefix"], suffix=["second-suffix"])),
+        ],
+        prompt_transformer=wrap_prompts,
+    )
+
+    async def run() -> None:
+        async with compositor.enter() as active_run:
+            assert active_run.prompts == [
+                ("wrapped", "first-prefix"),
+                ("wrapped", "second-prefix"),
+                ("wrapped", "second-suffix"),
+                ("wrapped", "first-suffix"),
+            ]
+
+    asyncio.run(run())
+
+
+def test_compositor_transforms_tools_to_another_type_after_layer_aggregation() -> None:
+    compositor: Compositor[PlainPromptType, str, PlainPromptType, PlainToolType] = Compositor(
+        [LayerNode("tools", prompt_tool_provider(tool_entries=[base_tool, wrapped_tool]))],
+        tool_transformer=describe_tools,
+    )
+
+    async def run() -> None:
+        async with compositor.enter() as active_run:
+            assert active_run.tools == ["base_tool", "wrapped_tool"]
+
+    asyncio.run(run())
+
+
+def test_compositor_transforms_user_prompts_after_layer_ordering() -> None:
+    compositor: Compositor[
+        PlainPromptType,
+        PlainToolType,
+        PlainPromptType,
+        PlainToolType,
+        WrappedUserPrompt,
+        PlainUserPromptType,
+    ] = Compositor(
+        [
+            LayerNode("first", prompt_tool_provider(user=["first-user"])),
+            LayerNode("second", prompt_tool_provider(user=["second-user"])),
+        ],
+        user_prompt_transformer=wrap_user_prompts,
+    )
+
+    async def run() -> None:
+        async with compositor.enter() as active_run:
+            assert active_run.user_prompts == [
+                ("wrapped-user", "first-user"),
+                ("wrapped-user", "second-user"),
+            ]
+
+    asyncio.run(run())
diff --git a/dify-agent/tests/local/agenton/layers/__init__.py b/dify-agent/tests/local/agenton/layers/__init__.py
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/dify-agent/tests/local/agenton/layers/__init__.py
@@ -0,0 +1 @@
+
diff --git a/dify-agent/tests/local/agenton/layers/test_layer_deps.py b/dify-agent/tests/local/agenton/layers/test_layer_deps.py
new file mode 100644
index 0000000000..1ab0c543e2
--- /dev/null
+++ b/dify-agent/tests/local/agenton/layers/test_layer_deps.py
@@ -0,0 +1,15 @@
+import pytest
+
+from agenton.layers import LayerDeps
+from agenton_collections.layers.plain import ObjectLayer, PromptLayer
+
+
+class ObjectLayerDeps(LayerDeps):
+    """Deps container used to exercise runtime dependency validation."""
+
+    object_layer: ObjectLayer[str]  # pyright: ignore[reportUninitializedInstanceVariable]
+
+
+def test_layer_deps_rejects_mismatched_runtime_layer_class() -> None:
+    with pytest.raises(TypeError, match="should be of type 'ObjectLayer'"):
+        ObjectLayerDeps(object_layer=PromptLayer())
diff --git a/dify-agent/tests/local/agenton/layers/test_schema_inference.py b/dify-agent/tests/local/agenton/layers/test_schema_inference.py
new file mode 100644
index 0000000000..55af512e54
--- /dev/null
+++ b/dify-agent/tests/local/agenton/layers/test_schema_inference.py
@@ -0,0 +1,92 @@
+from dataclasses import dataclass
+
+from pydantic import BaseModel, ConfigDict
+
+from agenton.compositor import LayerProvider
+from agenton.layers import (
+    EmptyLayerConfig,
+    EmptyRuntimeState,
+    LayerConfig,
+    NoLayerDeps,
+    PlainLayer,
+)
+
+
+class InferredConfig(LayerConfig):
+    value: str = "configured"
+
+    model_config = ConfigDict(extra="forbid")
+
+
+class InferredState(BaseModel):
+    count: int = 0
+
+    model_config = ConfigDict(extra="forbid", validate_assignment=True)
+
+
+@dataclass(slots=True)
+class GenericSchemaLayer(PlainLayer[NoLayerDeps, InferredConfig, InferredState]):
+    type_id = "test.generic-schema"
+
+    @classmethod
+    def from_config(cls, config: InferredConfig) -> "GenericSchemaLayer":
+        return cls()
+
+    async def on_context_create(self) -> None:
+        self.runtime_state.count += 1
+
+
+@dataclass(slots=True)
+class DefaultSchemaLayer(PlainLayer[NoLayerDeps]):
+    type_id = "test.default-schema"
+
+
+def test_layer_infers_config_and_runtime_state_from_generics() -> None:
+    layer = GenericSchemaLayer()
+    layer.runtime_state = InferredState(count=3)
+
+    assert GenericSchemaLayer.config_type is InferredConfig
+    assert GenericSchemaLayer.runtime_state_type is InferredState
+    assert isinstance(layer.runtime_state, InferredState)
+    assert layer.runtime_state.count == 3
+
+
+def test_layer_uses_empty_schema_defaults_when_omitted() -> None:
+    layer = DefaultSchemaLayer()
+
+    assert DefaultSchemaLayer.config_type is EmptyLayerConfig
+    assert DefaultSchemaLayer.runtime_state_type is EmptyRuntimeState
+    assert isinstance(layer.runtime_state, EmptyRuntimeState)
+
+
+def test_invalid_declared_schema_type_is_rejected_clearly() -> None:
+    try:
+
+        class InvalidSchemaLayer(PlainLayer[NoLayerDeps]):
+            config_type = dict  # pyright: ignore[reportAssignmentType]
+
+    except TypeError as e:
+        assert str(e) == "InvalidSchemaLayer.config_type must be a LayerConfig subclass."
+    else:
+        raise AssertionError("Expected TypeError.")
+
+    try:
+
+        class InvalidGenericSchemaLayer(PlainLayer[NoLayerDeps, dict[str, object]]):  # pyright: ignore[reportInvalidTypeArguments]
+            pass
+
+    except TypeError as e:
+        assert str(e) == "InvalidGenericSchemaLayer.config_type must be a LayerConfig subclass."
+    else:
+        raise AssertionError("Expected TypeError.")
+
+
+def test_layer_provider_uses_inferred_schema_types() -> None:
+    provider = LayerProvider.from_layer_type(GenericSchemaLayer)
+
+    layer = provider.create_layer({"value": "configured"})
+
+    assert provider.type_id == "test.generic-schema"
+    assert provider.layer_type.config_type is InferredConfig
+    assert provider.layer_type.runtime_state_type is InferredState
+    assert isinstance(layer.config, InferredConfig)
diff --git a/dify-agent/tests/local/agenton_collections/__init__.py b/dify-agent/tests/local/agenton_collections/__init__.py
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/dify-agent/tests/local/agenton_collections/__init__.py
@@ -0,0 +1 @@
+
diff --git a/dify-agent/tests/local/agenton_collections/layers/plain/__init__.py b/dify-agent/tests/local/agenton_collections/layers/plain/__init__.py
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/dify-agent/tests/local/agenton_collections/layers/plain/__init__.py
@@ -0,0 +1 @@
+
diff --git a/dify-agent/tests/local/agenton_collections/layers/plain/test_basic.py b/dify-agent/tests/local/agenton_collections/layers/plain/test_basic.py
new file mode 100644
index 0000000000..45928d079b
--- /dev/null
+++ b/dify-agent/tests/local/agenton_collections/layers/plain/test_basic.py
@@ -0,0 +1,6 @@
+from agenton_collections.layers.plain import PLAIN_PROMPT_LAYER_TYPE_ID, PromptLayer
+
+
+def test_prompt_layer_type_id_constant_matches_implementation_class() -> None:
+    assert PLAIN_PROMPT_LAYER_TYPE_ID == "plain.prompt"
+    assert PromptLayer.type_id == PLAIN_PROMPT_LAYER_TYPE_ID
diff --git a/dify-agent/tests/local/agenton_collections/layers/plain/test_dynamic_tools.py b/dify-agent/tests/local/agenton_collections/layers/plain/test_dynamic_tools.py
new file mode 100644
index 0000000000..213d7ff992
--- /dev/null
+++ b/dify-agent/tests/local/agenton_collections/layers/plain/test_dynamic_tools.py
@@ -0,0 +1,75 @@
+import asyncio
+
+import pytest
+from pydantic_ai import Tool
+
+from agenton_collections.layers.plain import DynamicToolsLayer, ObjectLayer, with_object
+
+
+class Profile:
+    """Profile object used by object-bound tool tests."""
+
+    name: str
+
+    def __init__(self, name: str) -> None:
+        self.name = name
+
+
+class OtherProfile:
+    """Different runtime object used to trigger object mismatch checks."""
+
+
+@with_object(Profile)
+def greet(profile: Profile, topic: str) -> str:
+    return f"{profile.name}: {topic}"
+
+
+def test_with_object_rejects_tool_without_object_parameter() -> None:
+    def tool() -> str:
+        return "unused"
+
+    with pytest.raises(ValueError, match="must accept the object dependency"):
+        with_object(Profile)(tool)  # pyright: ignore[reportArgumentType]
+
+
+def test_with_object_rejects_first_parameter_annotation_mismatch() -> None:
+    def tool(profile: OtherProfile) -> str:
+        return repr(profile)
+
+    with pytest.raises(TypeError, match="first parameter should accept 'Profile'"):
+        with_object(Profile)(tool)  # pyright: ignore[reportArgumentType]
+
+
+def test_dynamic_tools_layer_rejects_mismatched_runtime_object_value() -> None:
+    layer = DynamicToolsLayer[Profile](tool_entries=(greet,))
+    layer.bind_deps({"object_layer": ObjectLayer[OtherProfile](OtherProfile())})
+
+    with pytest.raises(TypeError, match="expected object dependency of type 'Profile'"):
+        layer.tools
+
+
+def public_greet(topic: str) -> str:
+    return f"Ada: {topic}"
+
+
+def test_dynamic_tools_layer_binds_object_as_pydantic_ai_equivalent_tool() -> None:
+    layer = DynamicToolsLayer[Profile](tool_entries=(greet,))
+    layer.bind_deps({"object_layer": ObjectLayer[Profile](Profile("Ada"))})
+
+    expected_tool = Tool(public_greet, name="greet")
+    dynamic_tool = Tool(layer.tools[0], name="greet")
+    dynamic_result = asyncio.run(
+        dynamic_tool.function_schema.call(
+            {"topic": "layer composition"},
+            None,  # pyright: ignore[reportArgumentType]
+        )
+    )
+    expected_result = asyncio.run(
+        expected_tool.function_schema.call(
+            {"topic": "layer composition"},
+            None,  # pyright: ignore[reportArgumentType]
+        )
+    )
+
+    assert dynamic_tool.tool_def == expected_tool.tool_def
+    assert dynamic_result == expected_result
diff --git a/dify-agent/tests/local/agenton_collections/layers/pydantic_ai/test_bridge.py b/dify-agent/tests/local/agenton_collections/layers/pydantic_ai/test_bridge.py
new file mode 100644
index 0000000000..12a93959de
--- /dev/null
+++ b/dify-agent/tests/local/agenton_collections/layers/pydantic_ai/test_bridge.py
@@ -0,0 +1,56 @@
+from collections.abc import Callable
+from dataclasses import dataclass
+from typing import cast
+
+from pydantic_ai import RunContext, Tool
+
+from agenton_collections.layers.pydantic_ai import PydanticAIBridgeLayer
+
+
+@dataclass(frozen=True, slots=True)
+class Profile:
+    name: str
+
+
+def profile_prompt(ctx: RunContext[Profile]) -> str:
+    return f"Profile: {ctx.deps.name}"
+
+
+def existing_tool(ctx: RunContext[Profile]) -> str:
+    return ctx.deps.name
+
+
+def raw_tool(ctx: RunContext[Profile], topic: str) -> str:
+    return f"{ctx.deps.name}: {topic}"
+
+
+def test_pydantic_ai_bridge_layer_accepts_mixed_string_and_function_prompts() -> None:
+    layer = PydanticAIBridgeLayer[Profile](
+        prefix=("plain prefix", profile_prompt),
+        user=("first user", "second user"),
+        suffix="plain suffix",
+    )
+
+    prefix_prompts = layer.prefix_prompts
+    user_prompts = layer.user_prompts
+    suffix_prompts = layer.suffix_prompts
+
+    plain_prefix = cast(Callable[[], str], prefix_prompts[0])
+    plain_suffix = cast(Callable[[], str], suffix_prompts[0])
+    assert plain_prefix() == "plain prefix"
+    assert prefix_prompts[1] is profile_prompt
+    assert user_prompts == ["first user", "second user"]
+    assert plain_suffix() == "plain suffix"
+
+
+def test_pydantic_ai_bridge_layer_accepts_mixed_tool_and_tool_function_entries() -> None:
+    pydantic_ai_tool = Tool(existing_tool)
+    layer = PydanticAIBridgeLayer[Profile](
+        tool_entries=(pydantic_ai_tool, raw_tool),
+    )
+
+    tools = layer.tools
+
+    assert tools[0] is pydantic_ai_tool
+    assert isinstance(tools[1], Tool)
+    assert tools[1].function is raw_tool
diff --git a/dify-agent/tests/local/agenton_collections/transformers/test_pydantic_ai.py b/dify-agent/tests/local/agenton_collections/transformers/test_pydantic_ai.py
new file mode 100644
index 0000000000..4ff49b1e1a
--- /dev/null
+++ b/dify-agent/tests/local/agenton_collections/transformers/test_pydantic_ai.py
@@ -0,0 +1,85 @@
+from collections.abc import Callable
+from typing import cast
+
+from pydantic_ai import Tool
+
+from agenton.layers.types import (
+    PlainPromptType,
+    PlainToolType,
+    PlainUserPromptType,
+    PydanticAIPromptType,
+    PydanticAIToolType,
+    PydanticAIUserPromptType,
+)
+from agenton_collections.transformers.pydantic_ai import PYDANTIC_AI_TRANSFORMERS
+
+
+def plain_tool(name: str) -> str:
+    return f"hello {name}"
+
+
+def dynamic_prompt() -> str:
+    return "dynamic prompt"
+
+
+def test_pydantic_ai_transformers_wrap_tagged_plain_prompts() -> None:
+    prompts = [PlainPromptType("plain prompt")]
+
+    result = PYDANTIC_AI_TRANSFORMERS["prompt_transformer"](prompts)
+
+    assert len(result) == 1
+    prompt_func = cast(Callable[[], str], result[0])
+    assert prompt_func() == "plain prompt"
+
+
+def test_pydantic_ai_transformers_preserve_tagged_existing_prompt_functions() -> None:
+    result = PYDANTIC_AI_TRANSFORMERS["prompt_transformer"]([PydanticAIPromptType(dynamic_prompt)])
+
+    assert result == [dynamic_prompt]
+
+
+def test_pydantic_ai_transformers_accept_mixed_tagged_prompt_types() -> None:
+    result = PYDANTIC_AI_TRANSFORMERS["prompt_transformer"](
+        [PlainPromptType("plain prompt"), PydanticAIPromptType(dynamic_prompt)]
+    )
+
+    plain_prompt = cast(Callable[[], str], result[0])
+    assert plain_prompt() == "plain prompt"
+    assert result[1] is dynamic_prompt
+
+
+def test_pydantic_ai_transformers_accept_tagged_user_prompt_types() -> None:
+    result = PYDANTIC_AI_TRANSFORMERS["user_prompt_transformer"](
+        [PlainUserPromptType("plain user"), PydanticAIUserPromptType("pydantic user")]
+    )
+
+    assert result == ["plain user", "pydantic user"]
+
+
+def test_pydantic_ai_transformers_wrap_tagged_plain_tools() -> None:
+    result = PYDANTIC_AI_TRANSFORMERS["tool_transformer"]([PlainToolType(plain_tool)])
+
+    assert len(result) == 1
+    tool = result[0]
+    assert isinstance(tool, Tool)
+    assert tool.function is plain_tool
+
+
+def test_pydantic_ai_transformers_preserve_tagged_existing_tools() -> None:
+    pydantic_ai_tool = Tool(plain_tool)
+
+    result = PYDANTIC_AI_TRANSFORMERS["tool_transformer"]([PydanticAIToolType(pydantic_ai_tool)])
+
+    assert result == [pydantic_ai_tool]
+
+
+def test_pydantic_ai_transformers_accept_tagged_tool_types() -> None:
+    pydantic_ai_tool = Tool(plain_tool)
+
+    result = PYDANTIC_AI_TRANSFORMERS["tool_transformer"](
+        [PlainToolType(plain_tool), PydanticAIToolType(pydantic_ai_tool)]
+    )
+
+    assert isinstance(result[0], Tool)
+    assert result[0].function is plain_tool
+    assert result[1] is pydantic_ai_tool
diff --git a/dify-agent/tests/local/dify_agent/__init__.py b/dify-agent/tests/local/dify_agent/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/dify-agent/tests/local/dify_agent/adapters/__init__.py b/dify-agent/tests/local/dify_agent/adapters/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/dify-agent/tests/local/dify_agent/adapters/llm/__init__.py b/dify-agent/tests/local/dify_agent/adapters/llm/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/dify-agent/tests/local/dify_agent/adapters/llm/_test_support.py b/dify-agent/tests/local/dify_agent/adapters/llm/_test_support.py
new file mode 100644
index 0000000000..20bb7d734b
--- /dev/null
+++ b/dify-agent/tests/local/dify_agent/adapters/llm/_test_support.py
@@ -0,0 +1,83 @@
+import json
+from decimal import Decimal
+
+import httpx
+from graphon.model_runtime.entities.llm_entities import (
+    LLMResultChunk,
+    LLMResultChunkDelta,
+    LLMUsage,
+)
+from graphon.model_runtime.entities.message_entities import (
+    AssistantPromptMessage,
+)
+from pydantic import BaseModel
+
+
+def make_usage(prompt_tokens: int = 3, completion_tokens: int = 5) -> LLMUsage:
+    return LLMUsage(
+        prompt_tokens=prompt_tokens,
+        prompt_unit_price=Decimal("0"),
+        prompt_price_unit=Decimal("0"),
+        prompt_price=Decimal("0"),
+        completion_tokens=completion_tokens,
+        completion_unit_price=Decimal("0"),
+        completion_price_unit=Decimal("0"),
+        completion_price=Decimal("0"),
+        total_tokens=prompt_tokens + completion_tokens,
+        total_price=Decimal("0"),
+        currency="USD",
+        latency=0.1,
+    )
+
+
+def single_text_chunk(
+    text: str,
+    *,
+    prompt_tokens: int = 3,
+    completion_tokens: int = 5,
+) -> list[LLMResultChunk]:
+    return [
+        LLMResultChunk(
+            model="demo-model",
+            delta=LLMResultChunkDelta(
+                index=0,
+                message=AssistantPromptMessage(content=text, tool_calls=[]),
+                usage=make_usage(prompt_tokens=prompt_tokens, completion_tokens=completion_tokens),
+            ),
+        )
+    ]
+
+
+def wrap_plugin_daemon_stream_item(item: object) -> str:
+    if isinstance(item, BaseModel):
+        data = item.model_dump(mode="json")
+    else:
+        data = item
+    return f"data: {json.dumps({'code': 0, 'message': '', 'data': data})}\n\n"
+
+
+def build_stream_response(*items: object, status_code: int = 200) -> httpx.Response:
+    body = "".join(wrap_plugin_daemon_stream_item(item) for item in items)
+    return httpx.Response(
+        status_code=status_code,
+        headers={"content-type": "text/event-stream"},
+        content=body.encode("utf-8"),
+    )
+
+
+def build_error_response(error_type: str, message: str, *, status_code: int) -> httpx.Response:
+    return httpx.Response(
+        status_code=status_code,
+        headers={"content-type": "application/json"},
+        content=json.dumps({"error_type": error_type, "message": message}).encode("utf-8"),
+    )
+
+
+def build_stream_error(error_type: str, message: str, *, code: int = -500) -> httpx.Response:
+    return httpx.Response(
+        status_code=200,
+        headers={"content-type": "text/event-stream"},
+        content=(
+            f"data: {json.dumps({'code': code, 'message': json.dumps({'error_type': error_type, 'message': message}), 'data': None})}\n\n"
+        ).encode("utf-8"),
+    )
diff --git a/dify-agent/tests/local/dify_agent/adapters/llm/test_model.py b/dify-agent/tests/local/dify_agent/adapters/llm/test_model.py
new file mode 100644
index 0000000000..c68142ce57
--- /dev/null
+++ b/dify-agent/tests/local/dify_agent/adapters/llm/test_model.py
@@ -0,0 +1,481 @@
+import json
+import unittest
+from contextlib import asynccontextmanager
+from typing import cast
+from unittest.mock import patch
+
+import httpx
+from pydantic_ai.exceptions import ModelHTTPError, UserError
+from pydantic_ai.messages import (
+    InstructionPart,
+    ModelRequest,
+    ModelResponse,
+    RetryPromptPart,
+    SystemPromptPart,
+    TextPart,
+    ThinkingPart,
+    ToolCallPart,
+    ToolReturnPart,
+    UserPromptPart,
+)
+from pydantic_ai.models import ModelRequestParameters
+from pydantic_ai.tools import ToolDefinition
+
+from dify_agent.adapters.llm import DifyLLMAdapterModel, DifyPluginDaemonProvider
+
+from ._test_support import (
+    AssistantPromptMessage,
+    LLMResultChunk,
+    LLMResultChunkDelta,
+    build_error_response,
+    build_stream_error,
+    build_stream_response,
+    make_usage,
+    single_text_chunk,
+)
+
+
+class DifyLLMAdapterModelTests(unittest.IsolatedAsyncioTestCase):
+    def make_provider(
+        self,
+        *,
+        user_id: str | None = None,
+        http_client: httpx.AsyncClient | None = None,
+    ) -> DifyPluginDaemonProvider:
+        return DifyPluginDaemonProvider(
+            tenant_id="tenant-1",
+            plugin_id="langgenius/openai",
+            plugin_daemon_url="http://plugin-daemon",
+            plugin_daemon_api_key="daemon-secret",
+            user_id=user_id,
+            http_client=http_client,
+        )
+
+    @asynccontextmanager
+    async def mock_daemon_stream(self, handler: httpx.MockTransport):
+        @asynccontextmanager
+        async def mock_stream(
+            client: httpx.AsyncClient,
+            method: str,
+            url: str,
+            **kwargs: object,
+        ):
+            request = client.build_request(
+                method,
+                url,
+                headers=cast(dict[str, str] | None, kwargs.get("headers")),
+                json=kwargs.get("json"),
+            )
+            yield handler.handle_request(request)
+
+        with patch.object(httpx.AsyncClient, "stream", new=mock_stream):
+            yield
+
+    async def test_request_uses_plugin_daemon_dispatch_contract(self) -> None:
+        messages = [
+            ModelRequest(
+                parts=[
+                    SystemPromptPart("request system"),
+                    UserPromptPart("hello"),
+                    ToolReturnPart(
+                        tool_name="lookup",
+                        content={"city": "Paris"},
+                        tool_call_id="tool-1",
+                    ),
+                    RetryPromptPart(content="try again", tool_name="lookup", tool_call_id="tool-1"),
+                ]
+            ),
+            ModelResponse(
+                parts=[
+                    TextPart(content="previous answer"),
+                    ToolCallPart(
+                        tool_name="lookup",
+                        args='{"city":"Paris"}',
+                        tool_call_id="tool-1",
+                    ),
+                ]
+            ),
+        ]
+        request_parameters = ModelRequestParameters(
+            function_tools=[
+                ToolDefinition(
+                    name="weather",
+                    description="Look up the weather",
+                    parameters_json_schema={
+                        "type": "object",
+                        "properties": {"city": {"type": "string"}},
+                    },
+                )
+            ],
+            output_mode="tool",
+            output_tools=[
+                ToolDefinition(
+                    name="incident_summary",
+                    description="Return the final structured incident summary",
+                    parameters_json_schema={
+                        "type": "object",
+                        "properties": {"title": {"type": "string"}},
+                        "required": ["title"],
+                        "additionalProperties": False,
+                    },
+                )
+            ],
+            allow_text_output=False,
+            instruction_parts=[InstructionPart(content="be concise")],
+        )
+
+        def handler(request: httpx.Request) -> httpx.Response:
+            self.assertEqual(request.method, "POST")
+            self.assertEqual(request.url.path, "/plugin/tenant-1/dispatch/llm/invoke")
+            self.assertEqual(request.headers["X-Api-Key"], "daemon-secret")
+            self.assertEqual(request.headers["X-Plugin-ID"], "langgenius/openai")
+
+            payload = json.loads(request.content.decode("utf-8"))
+            self.assertEqual(payload["user_id"], "user-123")
+            data = payload["data"]
+            self.assertEqual(data["provider"], "openai")
+            self.assertEqual(data["model_type"], "llm")
+            self.assertEqual(data["model"], "demo-model")
+            self.assertEqual(data["credentials"], {"api_key": "secret"})
+            self.assertEqual(
+                data["model_parameters"],
+                {"temperature": 0.2, "max_tokens": 128, "logit_bias": {"1": 2}},
+            )
+            self.assertEqual(data["stop"], ["END"])
+            self.assertFalse(data["stream"])
+            tools_by_name = {tool["name"]: tool for tool in data["tools"]}
+            self.assertEqual(set(tools_by_name), {"weather", "incident_summary"})
+            self.assertEqual(tools_by_name["incident_summary"]["parameters"]["required"], ["title"])
+            self.assertEqual(data["prompt_messages"][0]["role"], "system")
+            self.assertEqual(data["prompt_messages"][0]["content"], "request system")
+            self.assertEqual(data["prompt_messages"][1]["content"], "be concise")
+            self.assertEqual(data["prompt_messages"][2]["content"], "hello")
+            self.assertEqual(data["prompt_messages"][3]["role"], "tool")
+            self.assertEqual(data["prompt_messages"][4]["role"], "tool")
+            self.assertEqual(data["prompt_messages"][5]["role"], "assistant")
+            return build_stream_response(
+                LLMResultChunk(
+                    model="demo-model",
+                    delta=LLMResultChunkDelta(
+                        index=0,
+                        message=AssistantPromptMessage(content="adapter response", tool_calls=[]),
+                        usage=make_usage(prompt_tokens=11, completion_tokens=7),
+                    ),
+                )
+            )
+
+        async with self.mock_daemon_stream(httpx.MockTransport(handler)):
+            adapter = DifyLLMAdapterModel(
+                "demo-model",
+                self.make_provider(user_id="user-123"),
+                model_provider="openai",
+                credentials={"api_key": "secret"},
+                model_settings={"temperature": 0.2, "stop_sequences": ["DEFAULT_STOP"]},
+            )
+
+            response = await adapter.request(
+                messages,
+                model_settings={"max_tokens": 128, "logit_bias": {"1": 2}, "stop_sequences": ["END"]},
+                model_request_parameters=request_parameters,
+            )
+
+        self.assertEqual(response.model_name, "demo-model")
+        self.assertEqual(response.provider_name, "DifyPlugin/langgenius/openai")
+        self.assertEqual(response.usage.input_tokens, 11)
+        self.assertEqual(response.usage.output_tokens, 7)
+        self.assertEqual(response.parts[0].part_kind, "text")
+        self.assertEqual(cast(TextPart, response.parts[0]).content, "adapter response")
+
+    async def test_request_maps_tool_call_only_assistant_history_to_empty_string_content(self) -> None:
+        messages = [
+            ModelRequest(parts=[SystemPromptPart("request system"), UserPromptPart("hello")]),
+            ModelResponse(
+                parts=[
+                    ToolCallPart(
+                        tool_name="weather",
+                        args='{"city":"Paris"}',
+                        tool_call_id="tool-1",
+                    )
+                ]
+            ),
+            ModelRequest(
+                parts=[
+                    ToolReturnPart(
+                        tool_name="weather",
+                        content={"temperature": "18C"},
+                        tool_call_id="tool-1",
+                    )
+                ]
+            ),
+        ]
+
+        def handler(request: httpx.Request) -> httpx.Response:
+            payload = json.loads(request.content.decode("utf-8"))
+            prompt_messages = payload["data"]["prompt_messages"]
+
+            self.assertEqual([message["role"] for message in prompt_messages], ["system", "user", "assistant", "tool"])
+            self.assertEqual(prompt_messages[2]["content"], "")
+            self.assertEqual(prompt_messages[2]["tool_calls"][0]["id"], "tool-1")
+            self.assertEqual(prompt_messages[2]["tool_calls"][0]["type"], "function")
+            self.assertEqual(prompt_messages[2]["tool_calls"][0]["function"]["name"], "weather")
+            self.assertEqual(prompt_messages[2]["tool_calls"][0]["function"]["arguments"], '{"city":"Paris"}')
+            self.assertEqual(prompt_messages[3]["tool_call_id"], "tool-1")
+
+            return build_stream_response(*single_text_chunk("adapter response", prompt_tokens=11, completion_tokens=7))
+
+        async with self.mock_daemon_stream(httpx.MockTransport(handler)):
+            adapter = DifyLLMAdapterModel(
+                "demo-model",
+                self.make_provider(),
+                model_provider="openai",
+                credentials={"api_key": "secret"},
+            )
+
+            response = await adapter.request(
+                messages,
+                model_settings=None,
+                model_request_parameters=ModelRequestParameters(),
+            )
+
+        self.assertEqual(response.model_name, "demo-model")
+        self.assertEqual(response.parts[0].part_kind, "text")
+        self.assertEqual(cast(TextPart, response.parts[0]).content, "adapter response")
+
+    async def test_request_omits_empty_assistant_history_when_response_has_no_content_or_tool_calls(self) -> None:
+        messages = [
+            ModelRequest(parts=[SystemPromptPart("request system"), UserPromptPart("hello")]),
+            ModelResponse(parts=[]),
+            ModelRequest(parts=[UserPromptPart("follow up")]),
+        ]
+
+        def handler(request: httpx.Request) -> httpx.Response:
+            payload = json.loads(request.content.decode("utf-8"))
+            prompt_messages = payload["data"]["prompt_messages"]
+
+            self.assertEqual([message["role"] for message in prompt_messages], ["system", "user", "user"])
+            self.assertEqual(prompt_messages[2]["content"], "follow up")
+
+            return build_stream_response(*single_text_chunk("adapter response", prompt_tokens=11, completion_tokens=7))
+
+        async with self.mock_daemon_stream(httpx.MockTransport(handler)):
+            adapter = DifyLLMAdapterModel(
+                "demo-model",
+                self.make_provider(),
+                model_provider="openai",
+                credentials={"api_key": "secret"},
+            )
+
+            response = await adapter.request(
+                messages,
+                model_settings=None,
+                model_request_parameters=ModelRequestParameters(),
+            )
+
+        self.assertEqual(response.model_name, "demo-model")
+        self.assertEqual(response.parts[0].part_kind, "text")
+        self.assertEqual(cast(TextPart, response.parts[0]).content, "adapter response")
+
+    async def test_provider_does_not_close_external_http_client(self) -> None:
+        http_client = httpx.AsyncClient()
+        provider = self.make_provider(http_client=http_client)
+
+        self.assertEqual(provider.name, "DifyPlugin/langgenius/openai")
+        self.assertIs(provider.client.http_client, http_client)
+        async with provider:
+            pass
+
+        self.assertFalse(http_client.is_closed)
+        await http_client.aclose()
+
+    async def test_request_returns_a_response(self) -> None:
+        def handler(_request: httpx.Request) -> httpx.Response:
+            return build_stream_response(*single_text_chunk("adapter response", prompt_tokens=11, completion_tokens=7))
+
+        async with self.mock_daemon_stream(httpx.MockTransport(handler)):
+            adapter = DifyLLMAdapterModel(
+                "demo-model",
+                self.make_provider(),
+                model_provider="openai",
+                credentials={"api_key": "secret"},
+            )
+
+            response = await adapter.request(
+                [ModelRequest(parts=[UserPromptPart("hello")])],
+                model_settings=None,
+                model_request_parameters=ModelRequestParameters(),
+            )
+
+        self.assertEqual(response.model_name, "demo-model")
+        self.assertEqual(response.parts[0].part_kind, "text")
+        self.assertEqual(cast(TextPart, response.parts[0]).content, "adapter response")
+        self.assertEqual(response.usage.input_tokens, 11)
+        self.assertEqual(response.usage.output_tokens, 7)
+
+    async def test_request_stream_yields_response_parts_and_usage(self) -> None:
+        def handler(_request: httpx.Request) -> httpx.Response:
+            return build_stream_response(
+                LLMResultChunk(
+                    model="demo-model",
+                    delta=LLMResultChunkDelta(
+                        index=0,
+                        message=AssistantPromptMessage(content="hello ", tool_calls=[]),
+                    ),
+                ),
+                LLMResultChunk(
+                    model="demo-model",
+                    delta=LLMResultChunkDelta(
+                        index=1,
+                        message=AssistantPromptMessage(
+                            content="",
+                            tool_calls=[
+                                AssistantPromptMessage.ToolCall(
+                                    id="call-1",
+                                    type="function",
+                                    function=AssistantPromptMessage.ToolCall.ToolCallFunction(
+                                        name="weather",
+                                        arguments='{"city":"Paris"}',
+                                    ),
+                                )
+                            ],
+                        ),
+                    ),
+                ),
+                LLMResultChunk(
+                    model="demo-model",
+                    delta=LLMResultChunkDelta(
+                        index=2,
+                        message=AssistantPromptMessage(content="world", tool_calls=[]),
+                        usage=make_usage(prompt_tokens=6, completion_tokens=4),
+                        finish_reason="tool_calls",
+                    ),
+                ),
+            )
+
+        async with self.mock_daemon_stream(httpx.MockTransport(handler)):
+            adapter = DifyLLMAdapterModel(
+                "demo-model",
+                self.make_provider(),
+                model_provider="openai",
+                credentials={"api_key": "secret"},
+            )
+
+            async with adapter.request_stream(
+                [ModelRequest(parts=[UserPromptPart("hello")])],
+                model_settings=None,
+                model_request_parameters=ModelRequestParameters(),
+            ) as stream:
+                events = [event async for event in stream]
+                response = stream.get()
+
+        self.assertTrue(events)
+        self.assertEqual(response.usage.input_tokens, 6)
+        self.assertEqual(response.usage.output_tokens, 4)
+        self.assertEqual(response.finish_reason, "tool_call")
+        self.assertEqual(response.parts[0].part_kind, "text")
+        self.assertEqual(cast(TextPart, response.parts[0]).content, "hello ")
+        self.assertEqual(response.parts[1].part_kind, "tool-call")
+        self.assertEqual(cast(ToolCallPart, response.parts[1]).tool_name, "weather")
+        self.assertEqual(response.parts[2].part_kind, "text")
+        self.assertEqual(cast(TextPart, response.parts[2]).content, "world")
+
+    async def test_request_splits_embedded_thinking_tags_into_parts(self) -> None:
+        def handler(_request: httpx.Request) -> httpx.Response:
+            return build_stream_response(*single_text_chunk("before<think>reasoning</think>after"))
+
+        async with self.mock_daemon_stream(httpx.MockTransport(handler)):
+            adapter = DifyLLMAdapterModel(
+                "demo-model",
+                self.make_provider(),
+                model_provider="openai",
+                credentials={"api_key": "secret"},
+            )
+
+            response = await adapter.request(
+                [ModelRequest(parts=[UserPromptPart("hello")])],
+                model_settings=None,
+                model_request_parameters=ModelRequestParameters(),
+            )
+
+        self.assertEqual([part.part_kind for part in response.parts], ["text", "thinking", "text"])
+        self.assertEqual(cast(TextPart, response.parts[0]).content, "before")
+        self.assertEqual(cast(ThinkingPart, response.parts[1]).content, "reasoning")
+        self.assertEqual(cast(TextPart, response.parts[2]).content, "after")
+
+    async def test_request_maps_stream_envelope_rate_limit_error_to_http_error(
+        self,
+    ) -> None:
+        def handler(_request: httpx.Request) -> httpx.Response:
+            return build_stream_error(
+                "PluginInvokeError",
+                json.dumps({"error_type": "InvokeRateLimitError", "message": "too many"}),
+            )
+
+        async with self.mock_daemon_stream(httpx.MockTransport(handler)):
+            adapter = DifyLLMAdapterModel(
+                "demo-model",
+                self.make_provider(),
+                model_provider="openai",
+                credentials={"api_key": "secret"},
+            )
+
+            with self.assertRaises(ModelHTTPError) as context:
+                await adapter.request(
+                    [ModelRequest(parts=[UserPromptPart("hello")])],
+                    model_settings=None,
+                    model_request_parameters=ModelRequestParameters(),
+                )
+
+        self.assertEqual(context.exception.status_code, 429)
+        self.assertEqual(
+            context.exception.body,
+            {"error_type": "InvokeRateLimitError", "message": "too many"},
+        )
+
+    async def test_request_maps_http_error_payload_to_http_error(self) -> None:
+        def handler(_request: httpx.Request) -> httpx.Response:
+            return build_error_response("PluginDaemonUnauthorizedError", "invalid api key", status_code=401)
+
+        async with self.mock_daemon_stream(httpx.MockTransport(handler)):
+            adapter = DifyLLMAdapterModel(
+                "demo-model",
+                self.make_provider(),
+                model_provider="openai",
+                credentials={"api_key": "secret"},
+            )
+
+            with self.assertRaises(ModelHTTPError) as context:
+                await adapter.request(
+                    [ModelRequest(parts=[UserPromptPart("hello")])],
+                    model_settings=None,
+                    model_request_parameters=ModelRequestParameters(),
+                )
+
+        self.assertEqual(context.exception.status_code, 401)
+        self.assertEqual(
+            context.exception.body,
+            {
+                "error_type": "PluginDaemonUnauthorizedError",
+                "message": "invalid api key",
+            },
+        )
+
+    async def test_request_maps_endpoint_setup_error_to_user_error(self) -> None:
+        def handler(_request: httpx.Request) -> httpx.Response:
+            return build_stream_error("EndpointSetupFailedError", "missing endpoint config")
+
+        async with self.mock_daemon_stream(httpx.MockTransport(handler)):
+            adapter = DifyLLMAdapterModel(
+                "demo-model",
+                self.make_provider(),
+                model_provider="openai",
+                credentials={"api_key": "secret"},
+            )
+
+            with self.assertRaises(UserError) as context:
+                await adapter.request(
+                    [ModelRequest(parts=[UserPromptPart("hello")])],
+                    model_settings=None,
+                    model_request_parameters=ModelRequestParameters(),
+                )
+
+        self.assertEqual(str(context.exception), "missing endpoint config")
diff --git a/dify-agent/tests/local/dify_agent/client/test_client.py b/dify-agent/tests/local/dify_agent/client/test_client.py
new file mode 100644
index 0000000000..990475909d
--- /dev/null
+++ b/dify-agent/tests/local/dify_agent/client/test_client.py
@@ -0,0 +1,391 @@
+from __future__ import annotations
+
+import asyncio
+import json
+from collections.abc import Iterator
+from datetime import UTC, datetime
+from typing import cast, override
+
+import httpx
+import pytest
+
+from agenton.compositor import CompositorSessionSnapshot
+from agenton_collections.layers.plain import PLAIN_PROMPT_LAYER_TYPE_ID
+from dify_agent.client import (
+    Client,
+    DifyAgentHTTPError,
+    DifyAgentNotFoundError,
+    DifyAgentStreamError,
+    DifyAgentTimeoutError,
+    DifyAgentValidationError,
+)
+from dify_agent.protocol.schemas import (
+    CreateRunRequest,
+    RUN_EVENT_ADAPTER,
+    RunEvent,
+    RunEventsResponse,
+    RunStartedEvent,
+    RunSucceededEvent,
+    RunSucceededEventData,
+)
+
+
+def _create_run_payload() -> dict[str, object]:
+    return {
+        "composition": {
+            "schema_version": 1,
+            "layers": [{"name": "prompt", "type": PLAIN_PROMPT_LAYER_TYPE_ID, "config": {"user": "hello"}}],
+        }
+    }
+
+
+def _event_frame(event: RunEvent, *, event_id: str | None = None, exclude_id: bool = False) -> str:
+    payload = RUN_EVENT_ADAPTER.dump_json(event, exclude={"id"} if exclude_id else None).decode()
+    lines: list[str] = []
+    if event_id is not None:
+        lines.append(f"id: {event_id}")
+    lines.append(f"data: {payload}")
+    return "\n".join(lines) + "\n\n"
+
+
+def _run_succeeded_event(*, event_id: str = "2-0", run_id: str = "run-1") -> RunSucceededEvent:
+    return RunSucceededEvent(
+        id=event_id,
+        run_id=run_id,
+        data=RunSucceededEventData(output="done", session_snapshot=CompositorSessionSnapshot(layers=[])),
+    )
+
+
+def _run_status_json(status: str) -> dict[str, object]:
+    now = datetime(2026, 5, 11, tzinfo=UTC).isoformat()
+    return {"run_id": "run-1", "status": status, "created_at": now, "updated_at": now, "error": None}
+
+
+class DisconnectingSyncStream(httpx.SyncByteStream):
+    chunks: list[bytes]
+
+    def __init__(self, *chunks: str) -> None:
+        self.chunks = [chunk.encode() for chunk in chunks]
+
+    @override
+    def __iter__(self) -> Iterator[bytes]:
+        yield from self.chunks
+        raise httpx.ReadError("stream disconnected")
+
+
+def test_sync_methods_parse_protocol_dtos_and_send_create_request_dto() -> None:
+    def handler(request: httpx.Request) -> httpx.Response:
+        if request.method == "POST" and request.url.path == "/runs":
+            payload = cast(dict[str, object], json.loads(request.content))
+            composition = cast(dict[str, object], payload["composition"])
+            layers = cast(list[dict[str, object]], composition["layers"])
+            assert layers[0]["config"] == {"user": "hello"}
+            assert "compositor" not in payload
+            assert "agent_profile" not in payload
+            return httpx.Response(202, json={"run_id": "run-1", "status": "running"})
+        if request.method == "GET" and request.url.path == "/runs/run-1":
+            return httpx.Response(200, json=_run_status_json("running"))
+        if request.method == "GET" and request.url.path == "/runs/run-1/events":
+            assert request.url.params["after"] == "0-0"
+            assert request.url.params["limit"] == "10"
+            event = RunStartedEvent(id="1-0", run_id="run-1")
+            return httpx.Response(
+                200,
+                json={
+                    "run_id": "run-1",
+                    "events": [cast(object, json.loads(RUN_EVENT_ADAPTER.dump_json(event)))],
+                    "next_cursor": "1-0",
+                },
+            )
+        raise AssertionError(f"unexpected request: {request.method} {request.url}")
+
+    http_client = httpx.Client(transport=httpx.MockTransport(handler))
+    client = Client(base_url="http://testserver", sync_http_client=http_client)
+
+    created = client.create_run_sync(CreateRunRequest.model_validate(_create_run_payload()))
+    status = client.get_run_sync(created.run_id)
+    events = client.get_events_sync(created.run_id, after="0-0", limit=10)
+
+    assert created.status == "running"
+    assert status.status == "running"
+    assert isinstance(events, RunEventsResponse)
+    assert [event.type for event in events.events] == ["run_started"]
+
+
+def test_async_methods_and_wait_run_parse_protocol_dtos() -> None:
+    statuses = iter(["running", "succeeded"])
+
+    def handler(request: httpx.Request) -> httpx.Response:
+        if request.method == "POST" and request.url.path == "/runs":
+            return httpx.Response(202, json={"run_id": "run-1", "status": "running"})
+        if request.method == "GET" and request.url.path == "/runs/run-1":
+            return httpx.Response(200, json=_run_status_json(next(statuses)))
+        if request.method == "GET" and request.url.path == "/runs/run-1/events":
+            return httpx.Response(200, json={"run_id": "run-1", "events": [], "next_cursor": "0-0"})
+        raise AssertionError(f"unexpected request: {request.method} {request.url}")
+
+    async def scenario() -> None:
+        http_client = httpx.AsyncClient(transport=httpx.MockTransport(handler))
+        client = Client(base_url="http://testserver", async_http_client=http_client)
+        request = CreateRunRequest.model_validate(_create_run_payload())
+
+        created = await client.create_run(request)
+        events = await client.get_events(created.run_id)
+        terminal = await client.wait_run(created.run_id, poll_interval_seconds=0)
+
+        assert created.run_id == "run-1"
+        assert events.events == []
+        assert terminal.status == "succeeded"
+        await http_client.aclose()
+
+    asyncio.run(scenario())
+
+
+def test_error_mapping_and_create_run_input_validation() -> None:
+    responses = iter(
+        [
+            httpx.Response(404, json={"detail": "run not found"}),
+            httpx.Response(422, json={"detail": "invalid"}),
+            httpx.Response(500, json={"detail": "boom"}),
+        ]
+    )
+
+    def handler(_request: httpx.Request) -> httpx.Response:
+        return next(responses)
+
+    client = Client(
+        base_url="http://testserver",
+        sync_http_client=httpx.Client(transport=httpx.MockTransport(handler)),
+    )
+
+    with pytest.raises(DifyAgentNotFoundError) as not_found:
+        _ = client.get_run_sync("missing")
+    assert not_found.value.status_code == 404
+    assert not_found.value.detail == "run not found"
+
+    with pytest.raises(DifyAgentValidationError) as validation:
+        _ = client.get_run_sync("bad")
+    assert validation.value.status_code == 422
+
+    with pytest.raises(DifyAgentHTTPError) as server_error:
+        _ = client.get_run_sync("bad")
+    assert server_error.value.status_code == 500
+
+    with pytest.raises(DifyAgentValidationError):
+        _ = client.create_run_sync({"unknown": "field"})  # pyright: ignore[reportArgumentType]
+
+
+def test_http_timeout_maps_to_client_timeout_error() -> None:
+    def handler(request: httpx.Request) -> httpx.Response:
+        raise httpx.ReadTimeout("slow", request=request)
+
+    client = Client(
+        base_url="http://testserver",
+        sync_http_client=httpx.Client(transport=httpx.MockTransport(handler)),
+    )
+
+    with pytest.raises(DifyAgentTimeoutError):
+        _ = client.get_run_sync("run-1")
+
+
+def test_create_run_is_not_retried_after_timeout() -> None:
+    attempts = 0
+
+    def handler(request: httpx.Request) -> httpx.Response:
+        nonlocal attempts
+        attempts += 1
+        raise httpx.ConnectTimeout("cannot connect", request=request)
+
+    client = Client(
+        base_url="http://testserver",
+        sync_http_client=httpx.Client(transport=httpx.MockTransport(handler)),
+    )
+
+    with pytest.raises(DifyAgentTimeoutError):
+        _ = client.create_run_sync(CreateRunRequest.model_validate(_create_run_payload()))
+    assert attempts == 1
+
+
+def test_sync_sse_parser_supports_comments_multiline_data_and_id_fill() -> None:
+    payload = RUN_EVENT_ADAPTER.dump_json(RunStartedEvent(run_id="run-1"), exclude={"id"}).decode()
+    before_type, after_type = payload.split('"type"', maxsplit=1)
+    body = f': keepalive\nid: 5-0\nevent: run_started\ndata: {before_type}\ndata: "type"{after_type}\n\n'
+
+    def handler(request: httpx.Request) -> httpx.Response:
+        assert request.url.params["after"] == "0-0"
+        return httpx.Response(200, content=body)
+
+    client = Client(
+        base_url="http://testserver",
+        sync_http_client=httpx.Client(transport=httpx.MockTransport(handler)),
+    )
+
+    events = list(client.stream_events_sync("run-1", until_terminal=False, reconnect=False))
+
+    assert [event.id for event in events] == ["5-0"]
+    assert [event.type for event in events] == ["run_started"]
+
+
+def test_stream_events_stops_after_terminal_event() -> None:
+    calls = 0
+    body = "".join(
+        [
+            _event_frame(RunStartedEvent(id="1-0", run_id="run-1")),
+            _event_frame(_run_succeeded_event()),
+        ]
+    )
+
+    def handler(_request: httpx.Request) -> httpx.Response:
+        nonlocal calls
+        calls += 1
+        return httpx.Response(200, content=body)
+
+    client = Client(
+        base_url="http://testserver",
+        sync_http_client=httpx.Client(transport=httpx.MockTransport(handler)),
+    )
+
+    events = list(client.stream_events_sync("run-1", reconnect_delay_seconds=0))
+
+    assert [event.type for event in events] == ["run_started", "run_succeeded"]
+    assert calls == 1
+
+
+def test_stream_events_reconnects_from_latest_event_id() -> None:
+    seen_after: list[str] = []
+
+    def handler(request: httpx.Request) -> httpx.Response:
+        seen_after.append(request.url.params["after"])
+        if len(seen_after) == 1:
+            return httpx.Response(
+                200,
+                stream=DisconnectingSyncStream(_event_frame(RunStartedEvent(id="1-0", run_id="run-1"))),
+            )
+        return httpx.Response(200, content=_event_frame(_run_succeeded_event()))
+
+    client = Client(
+        base_url="http://testserver",
+        sync_http_client=httpx.Client(transport=httpx.MockTransport(handler)),
+    )
+
+    events = list(client.stream_events_sync("run-1", reconnect_delay_seconds=0))
+
+    assert seen_after == ["0-0", "1-0"]
+    assert [event.type for event in events] == ["run_started", "run_succeeded"]
+
+
+def test_stream_events_reconnects_after_http_5xx_response() -> None:
+    seen_after: list[str] = []
+
+    def handler(request: httpx.Request) -> httpx.Response:
+        seen_after.append(request.url.params["after"])
+        if len(seen_after) == 1:
+            return httpx.Response(503, json={"detail": "temporarily unavailable"})
+        return httpx.Response(200, content=_event_frame(_run_succeeded_event()))
+
+    client = Client(
+        base_url="http://testserver",
+        sync_http_client=httpx.Client(transport=httpx.MockTransport(handler)),
+    )
+
+    events = list(client.stream_events_sync("run-1", reconnect_delay_seconds=0))
+
+    assert seen_after == ["0-0", "0-0"]
+    assert [event.type for event in events] == ["run_succeeded"]
+
+
+def test_stream_events_raises_when_reconnects_are_exhausted() -> None:
+    calls = 0
+
+    def handler(_request: httpx.Request) -> httpx.Response:
+        nonlocal calls
+        calls += 1
+        return httpx.Response(200, stream=DisconnectingSyncStream())
+
+    client = Client(
+        base_url="http://testserver",
+        sync_http_client=httpx.Client(transport=httpx.MockTransport(handler)),
+    )
+
+    with pytest.raises(DifyAgentStreamError):
+        _ = list(client.stream_events_sync("run-1", max_reconnects=1, reconnect_delay_seconds=0))
+    assert calls == 2
+
+
+def test_malformed_sse_frame_does_not_reconnect() -> None:
+    calls = 0
+
+    def handler(_request: httpx.Request) -> httpx.Response:
+        nonlocal calls
+        calls += 1
+        return httpx.Response(200, content="data: not-json\n\n")
+
+    client = Client(
+        base_url="http://testserver",
+        sync_http_client=httpx.Client(transport=httpx.MockTransport(handler)),
+    )
+
+    with pytest.raises(DifyAgentStreamError):
+        _ = list(client.stream_events_sync("run-1", reconnect_delay_seconds=0))
+    assert calls == 1
+
+
+def test_async_stream_events_yields_terminal_event() -> None:
+    body = _event_frame(_run_succeeded_event())
+
+    def handler(_request: httpx.Request) -> httpx.Response:
+        return httpx.Response(200, content=body)
+
+    async def scenario() -> None:
+        http_client = httpx.AsyncClient(transport=httpx.MockTransport(handler))
+        client = Client(base_url="http://testserver", async_http_client=http_client)
+
+        events = [event async for event in client.stream_events("run-1")]
+
+        assert [event.type for event in events] == ["run_succeeded"]
+        await http_client.aclose()
+
+    asyncio.run(scenario())
+
+
+def test_async_stream_events_reconnects_after_http_5xx_response() -> None:
+    seen_after: list[str] = []
+
+    def handler(request: httpx.Request) -> httpx.Response:
+        seen_after.append(request.url.params["after"])
+        if len(seen_after) == 1:
+            return httpx.Response(502, json={"detail": "bad gateway"})
+        return httpx.Response(200, content=_event_frame(_run_succeeded_event()))
+
+    async def scenario() -> None:
+        http_client = httpx.AsyncClient(transport=httpx.MockTransport(handler))
+        client = Client(base_url="http://testserver", async_http_client=http_client)
+
+        events = [event async for event in client.stream_events("run-1", reconnect_delay_seconds=0)]
+
+        assert seen_after == ["0-0", "0-0"]
+        assert [event.type for event in events] == ["run_succeeded"]
+        await http_client.aclose()
+
+    asyncio.run(scenario())
+
+
+def test_stream_timeout_can_reconnect_until_terminal() -> None:
+    calls = 0
+
+    def handler(request: httpx.Request) -> httpx.Response:
+        nonlocal calls
+        calls += 1
+        if calls == 1:
+            raise httpx.ReadTimeout("stream stalled", request=request)
+        return httpx.Response(200, content=_event_frame(_run_succeeded_event()))
+
+    client = Client(
+        base_url="http://testserver",
+        sync_http_client=httpx.Client(transport=httpx.MockTransport(handler)),
+    )
+
+    events = list(client.stream_events_sync("run-1", reconnect_delay_seconds=0))
+
+    assert calls == 2
+    assert [event.type for event in events] == ["run_succeeded"]
diff --git a/dify-agent/tests/local/dify_agent/layers/__init__.py b/dify-agent/tests/local/dify_agent/layers/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/dify-agent/tests/local/dify_agent/layers/dify_plugin/__init__.py b/dify-agent/tests/local/dify_agent/layers/dify_plugin/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/dify-agent/tests/local/dify_agent/layers/dify_plugin/test_configs.py b/dify-agent/tests/local/dify_agent/layers/dify_plugin/test_configs.py
new file mode 100644
index 0000000000..f6f84772ba
--- /dev/null
+++ b/dify-agent/tests/local/dify_agent/layers/dify_plugin/test_configs.py
@@ -0,0 +1,71 @@
+import pytest
+from pydantic import ValidationError
+
+import dify_agent.layers.dify_plugin as dify_plugin_exports
+from dify_agent.layers.dify_plugin import (
+    DifyPluginCredentialValue,
+    DifyPluginLLMLayerConfig,
+    DifyPluginLayerConfig,
+)
+
+
+def test_dify_plugin_package_exports_client_safe_config_symbols_only() -> None:
+    assert dify_plugin_exports.__all__ == [
+        "DIFY_PLUGIN_LAYER_TYPE_ID",
+        "DIFY_PLUGIN_LLM_LAYER_TYPE_ID",
+        "DifyPluginCredentialValue",
+        "DifyPluginLLMLayerConfig",
+        "DifyPluginLayerConfig",
+    ]
+    assert dify_plugin_exports.DIFY_PLUGIN_LAYER_TYPE_ID == "dify.plugin"
+    assert dify_plugin_exports.DIFY_PLUGIN_LLM_LAYER_TYPE_ID == "dify.plugin.llm"
+    assert not hasattr(dify_plugin_exports, "DifyPluginLayer")
+    assert not hasattr(dify_plugin_exports, "DifyPluginLLMLayer")
+
+
+def test_dify_plugin_layer_config_forbids_runtime_settings() -> None:
+    config = DifyPluginLayerConfig(tenant_id="tenant-1", plugin_id="plugin-1", user_id="user-1")
+
+    assert config.tenant_id == "tenant-1"
+    assert config.plugin_id == "plugin-1"
+    assert config.user_id == "user-1"
+    with pytest.raises(ValidationError):
+        _ = DifyPluginLayerConfig.model_validate(
+            {
+                "tenant_id": "tenant-1",
+                "plugin_id": "plugin-1",
+                "daemon_url": "http://daemon",
+            }
+        )
+
+
+def test_dify_plugin_llm_config_accepts_scalar_credentials_and_model_settings() -> None:
+    credential: DifyPluginCredentialValue = "secret"
+    config = DifyPluginLLMLayerConfig(
+        model_provider="openai",
+        model="gpt-4o-mini",
+        credentials={"api_key": credential, "enabled": True, "retries": 2, "ratio": 0.5, "empty": None},
+        model_settings={"temperature": 0.2, "max_tokens": 64},
+    )
+
+    assert config.model_provider == "openai"
+    assert config.credentials == {"api_key": "secret", "enabled": True, "retries": 2, "ratio": 0.5, "empty": None}
+    assert config.model_settings == {"temperature": 0.2, "max_tokens": 64}
+    with pytest.raises(ValidationError):
+        _ = DifyPluginLLMLayerConfig.model_validate(
+            {
+                "model_provider": "openai",
+                "model": "gpt-4o-mini",
+                "credentials": {"nested": {"not": "allowed"}},
+            }
+        )
+
+
+def test_dify_plugin_llm_config_rejects_old_provider_field() -> None:
+    with pytest.raises(ValidationError):
+        _ = DifyPluginLLMLayerConfig.model_validate(
+            {
+                "provider": "openai",
+                "model": "gpt-4o-mini",
+            }
+        )
diff --git a/dify-agent/tests/local/dify_agent/layers/dify_plugin/test_layers.py b/dify-agent/tests/local/dify_agent/layers/dify_plugin/test_layers.py
new file mode 100644
index 0000000000..78c833d946
--- /dev/null
+++ b/dify-agent/tests/local/dify_agent/layers/dify_plugin/test_layers.py
@@ -0,0 +1,130 @@
+import asyncio
+
+import httpx
+import pytest
+
+from agenton.compositor import Compositor, LayerNode, LayerProvider
+from dify_agent.adapters.llm import DifyLLMAdapterModel
+from dify_agent.layers.dify_plugin.configs import (
+    DIFY_PLUGIN_LAYER_TYPE_ID,
+    DIFY_PLUGIN_LLM_LAYER_TYPE_ID,
+    DifyPluginLLMLayerConfig,
+    DifyPluginLayerConfig,
+)
+from dify_agent.layers.dify_plugin.llm_layer import DifyPluginLLMLayer
+from dify_agent.layers.dify_plugin.plugin_layer import DifyPluginLayer
+
+
+def _plugin_config() -> DifyPluginLayerConfig:
+    return DifyPluginLayerConfig(tenant_id="tenant-1", plugin_id="langgenius/openai", user_id="user-1")
+
+
+def _llm_config() -> DifyPluginLLMLayerConfig:
+    return DifyPluginLLMLayerConfig(
+        model_provider="openai",
+        model="demo-model",
+        credentials={"api_key": "secret"},
+        model_settings={"temperature": 0.2},
+    )
+
+
+def _plugin_layer() -> DifyPluginLayer:
+    return DifyPluginLayer.from_config_with_settings(
+        _plugin_config(),
+        daemon_url="http://plugin-daemon",
+        daemon_api_key="daemon-secret",
+    )
+
+
+def _plugin_provider() -> LayerProvider[DifyPluginLayer]:
+    return LayerProvider.from_factory(
+        layer_type=DifyPluginLayer,
+        create=lambda config: DifyPluginLayer.from_config_with_settings(
+            DifyPluginLayerConfig.model_validate(config),
+            daemon_url="http://plugin-daemon",
+            daemon_api_key="daemon-secret",
+        ),
+    )
+
+
+def test_dify_plugin_type_id_constants_match_implementation_classes() -> None:
+    assert DIFY_PLUGIN_LAYER_TYPE_ID == DifyPluginLayer.type_id
+    assert DIFY_PLUGIN_LLM_LAYER_TYPE_ID == DifyPluginLLMLayer.type_id
+
+
+def test_dify_plugin_layer_creates_daemon_provider_from_shared_http_client() -> None:
+    async def scenario() -> None:
+        plugin = _plugin_layer()
+        async with httpx.AsyncClient(transport=httpx.MockTransport(lambda _request: httpx.Response(200))) as client:
+            provider = plugin.create_daemon_provider(http_client=client)
+
+            assert provider.name == "DifyPlugin/langgenius/openai"
+            assert provider.client.http_client is client
+            assert provider.client.tenant_id == "tenant-1"
+            assert provider.client.plugin_id == "langgenius/openai"
+            assert provider.client.user_id == "user-1"
+
+            async with provider:
+                pass
+            assert client.is_closed is False
+
+    asyncio.run(scenario())
+
+
+def test_dify_plugin_layer_rejects_closed_shared_http_client() -> None:
+    async def scenario() -> None:
+        plugin = _plugin_layer()
+        client = httpx.AsyncClient()
+        await client.aclose()
+
+        with pytest.raises(RuntimeError, match="open shared HTTP client"):
+            _ = plugin.create_daemon_provider(http_client=client)
+
+    asyncio.run(scenario())
+
+
+def test_dify_plugin_llm_layer_builds_adapter_model_from_direct_dependency() -> None:
+    async def scenario() -> None:
+        compositor = Compositor(
+            [
+                LayerNode("renamed-plugin", _plugin_provider()),
+                LayerNode("llm", DifyPluginLLMLayer, deps={"plugin": "renamed-plugin"}),
+            ]
+        )
+        async with httpx.AsyncClient(transport=httpx.MockTransport(lambda _request: httpx.Response(200))) as client:
+            async with compositor.enter(
+                configs={
+                    "renamed-plugin": _plugin_config(),
+                    "llm": _llm_config(),
+                }
+            ) as run:
+                plugin = run.get_layer("renamed-plugin", DifyPluginLayer)
+                llm = run.get_layer("llm", DifyPluginLLMLayer)
+
+                model = llm.get_model(http_client=client)
+
+                assert llm.deps.plugin is plugin
+                assert isinstance(model, DifyLLMAdapterModel)
+                assert model.model_name == "demo-model"
+                assert model.model_provider == "openai"
+                assert model.credentials == {"api_key": "secret"}
+                assert model.provider.name == "DifyPlugin/langgenius/openai"
+                assert model.provider.client.http_client is client
+
+    asyncio.run(scenario())
+
+
+def test_dify_plugin_layer_lifecycle_does_not_manage_http_client() -> None:
+    async def scenario() -> None:
+        compositor = Compositor([LayerNode("plugin", _plugin_provider())])
+        async with httpx.AsyncClient(transport=httpx.MockTransport(lambda _request: httpx.Response(200))) as client:
+            async with compositor.enter(configs={"plugin": _plugin_config()}) as run:
+                plugin = run.get_layer("plugin", DifyPluginLayer)
+                provider = plugin.create_daemon_provider(http_client=client)
+                run.suspend_layer_on_exit("plugin")
+
+            assert run.session_snapshot is not None
+            assert provider.client.http_client is client
+            assert client.is_closed is False
+
+    asyncio.run(scenario())
diff --git a/dify-agent/tests/local/dify_agent/layers/output/__init__.py b/dify-agent/tests/local/dify_agent/layers/output/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/dify-agent/tests/local/dify_agent/layers/output/test_configs.py b/dify-agent/tests/local/dify_agent/layers/output/test_configs.py
new file mode 100644
index 0000000000..608c5f5a6f
--- /dev/null
+++ b/dify-agent/tests/local/dify_agent/layers/output/test_configs.py
@@ -0,0 +1,270 @@
+import pytest
+from pydantic import JsonValue, TypeAdapter, ValidationError
+from pydantic_ai.output import ToolOutput
+
+import dify_agent.layers.output as output_exports
+from dify_agent.layers.output import DIFY_OUTPUT_LAYER_TYPE_ID, DifyOutputLayerConfig
+from dify_agent.layers.output.output_layer import DifyOutputLayer
+
+
+def _json_schema() -> dict[str, JsonValue]:
+    return {
+        "type": "object",
+        "properties": {
+            "title": {"type": "string"},
+            "severity": {"type": "string", "enum": ["low", "medium", "high"]},
+            "actions": {"type": "array", "items": {"type": "string"}},
+        },
+        "required": ["title", "severity", "actions"],
+        "additionalProperties": False,
+    }
+
+
+def _recursive_json_schema() -> dict[str, JsonValue]:
+    return {
+        "type": "object",
+        "properties": {"node": {"$ref": "#/$defs/node"}},
+        "$defs": {
+            "node": {
+                "type": "object",
+                "properties": {"child": {"$ref": "#/$defs/node"}},
+                "additionalProperties": False,
+            }
+        },
+        "additionalProperties": False,
+    }
+
+
+def _remote_ref_schema() -> dict[str, JsonValue]:
+    return {
+        "type": "object",
+        "properties": {
+            "title": {"$ref": "https://example.com/schema.json"},
+        },
+    }
+
+
+def _literal_dollar_ref_value_schema() -> dict[str, JsonValue]:
+    return {
+        "type": "object",
+        "properties": {
+            "payload": {
+                "const": {
+                    "$ref": "https://example.com/literal",
+                    "kind": "literal",
+                },
+            },
+            "metadata": {
+                "type": "object",
+                "examples": [
+                    {
+                        "$ref": "https://example.com/example",
+                        "note": "example value",
+                    }
+                ],
+            },
+        },
+        "required": ["payload", "metadata"],
+        "additionalProperties": False,
+    }
+
+
+def _object_local_definitions_ref_schema() -> dict[str, JsonValue]:
+    return {
+        "type": "object",
+        "properties": {
+            "items": {"$ref": "#/definitions/itemArray"},
+        },
+        "required": ["items"],
+        "definitions": {
+            "itemArray": {
+                "type": "array",
+                "items": {"type": "string"},
+            },
+        },
+    }
+
+
+def _object_local_defs_ref_schema() -> dict[str, JsonValue]:
+    return {
+        "type": "object",
+        "properties": {
+            "items": {"$ref": "#/$defs/itemArray"},
+        },
+        "required": ["items"],
+        "$defs": {
+            "itemArray": {
+                "type": "array",
+                "items": {"type": "string"},
+            },
+        },
+    }
+
+
+def _invalid_json_schema() -> dict[str, JsonValue]:
+    return {
+        "type": "object",
+        "properties": {
+            "title": {"type": "wat"},
+        },
+    }
+
+
+def _validated_output_type(output_spec: object) -> object:
+    assert isinstance(output_spec, ToolOutput)
+    return output_spec.output
+
+
+def test_output_package_exports_client_safe_config_symbols_only() -> None:
+    assert output_exports.__all__ == ["DIFY_OUTPUT_LAYER_TYPE_ID", "DifyOutputLayerConfig"]
+    assert output_exports.DIFY_OUTPUT_LAYER_TYPE_ID == "dify.output"
+    assert not hasattr(output_exports, "DifyOutputLayer")
+
+
+def test_output_layer_config_accepts_valid_object_schema_and_defaults_name() -> None:
+    config = DifyOutputLayerConfig(json_schema=_json_schema())
+
+    assert DIFY_OUTPUT_LAYER_TYPE_ID == "dify.output"
+    assert config.name == "final_result"
+    assert config.description is None
+    assert config.strict is None
+
+
+def test_output_layer_config_rejects_non_object_top_level_json_schema() -> None:
+    with pytest.raises(ValidationError, match="Schema must declare an object output"):
+        _ = DifyOutputLayerConfig(json_schema={"type": "array", "items": {"type": "string"}})
+
+
+@pytest.mark.parametrize(
+    ("payload", "message"),
+    [
+        ({"json_schema": _json_schema(), "name": "bad name"}, "letters, numbers, underscores, or hyphens"),
+        ({"json_schema": _json_schema(), "unknown": True}, "Extra inputs are not permitted"),
+    ],
+)
+def test_output_layer_config_rejects_invalid_input(payload: dict[str, object], message: str) -> None:
+    with pytest.raises(ValidationError, match=message):
+        _ = DifyOutputLayerConfig.model_validate(payload)
+
+
+def test_output_layer_builds_validated_output_contract_for_object_schema() -> None:
+    config = DifyOutputLayerConfig(
+        json_schema=_json_schema(),
+        name="incident_summary",
+        description="Structured incident summary.",
+        strict=True,
+    )
+
+    layer = DifyOutputLayer.from_config(config)
+    output_contract = layer.build_output_contract()
+    output_type = output_contract.output_type
+    output_schema = TypeAdapter(output_type.output).json_schema() if isinstance(output_type, ToolOutput) else {}
+    valid_output = {"title": "Database outage", "severity": "high", "actions": ["page on-call"]}
+    output_adapter = TypeAdapter(_validated_output_type(output_contract.output_type))
+
+    assert isinstance(output_type, ToolOutput)
+    assert output_type.name == "incident_summary"
+    assert output_type.description is None
+    assert output_type.strict is True
+    assert output_schema["type"] == "object"
+    assert output_schema["title"] == "incident_summary"
+    assert output_schema["description"] == "Structured incident summary."
+    assert output_adapter.validate_python(valid_output) == valid_output
+
+
+@pytest.mark.parametrize(
+    ("invalid_output", "message"),
+    [
+        (
+            {"title": "Database outage", "severity": "high", "actions": "page on-call"},
+            "Output does not match JSON Schema",
+        ),
+        ({"title": "Database outage", "actions": []}, "Output does not match JSON Schema"),
+        ({"title": "Database outage", "severity": "urgent", "actions": []}, "Output does not match JSON Schema"),
+        (
+            {"title": "Database outage", "severity": "high", "actions": [], "extra": True},
+            "Output does not match JSON Schema",
+        ),
+    ],
+)
+def test_output_layer_object_contract_retries_invalid_model_output(invalid_output: JsonValue, message: str) -> None:
+    output_contract = DifyOutputLayer.from_config(
+        DifyOutputLayerConfig(json_schema=_json_schema())
+    ).build_output_contract()
+    output_adapter = TypeAdapter(_validated_output_type(output_contract.output_type))
+
+    with pytest.raises(ValidationError, match=message):
+        _ = output_adapter.validate_python(invalid_output)
+
+
+def test_output_layer_rejects_non_defs_local_ref_in_direct_object_schema() -> None:
+    layer = DifyOutputLayer.from_config(DifyOutputLayerConfig(json_schema=_object_local_definitions_ref_schema()))
+
+    with pytest.raises(ValueError, match=r"Only local refs under '#/\$defs/' are supported"):
+        _ = layer.build_output_contract()
+
+
+def test_output_layer_keeps_local_defs_ref_working_in_direct_object_schema() -> None:
+    output_contract = DifyOutputLayer.from_config(
+        DifyOutputLayerConfig(json_schema=_object_local_defs_ref_schema(), name="direct_defs_result")
+    ).build_output_contract()
+    output_adapter = TypeAdapter(_validated_output_type(output_contract.output_type))
+    output_schema = output_adapter.json_schema()
+
+    assert isinstance(output_contract.output_type, ToolOutput)
+    assert output_schema == {
+        "type": "object",
+        "properties": {
+            "items": {
+                "type": "array",
+                "items": {"type": "string"},
+            },
+        },
+        "required": ["items"],
+        "title": "direct_defs_result",
+    }
+    assert output_adapter.validate_python({"items": ["a", "b"]}) == {"items": ["a", "b"]}
+
+
+def test_output_layer_rejects_recursive_json_schema_during_contract_build() -> None:
+    layer = DifyOutputLayer.from_config(DifyOutputLayerConfig(json_schema=_recursive_json_schema()))
+
+    with pytest.raises(ValueError):
+        _ = layer.build_output_contract()
+
+
+def test_output_layer_rejects_invalid_json_schema_during_contract_build() -> None:
+    layer = DifyOutputLayer.from_config(DifyOutputLayerConfig(json_schema=_invalid_json_schema()))
+
+    with pytest.raises(ValueError):
+        _ = layer.build_output_contract()
+
+
+def test_output_layer_rejects_remote_ref_during_contract_build() -> None:
+    layer = DifyOutputLayer.from_config(DifyOutputLayerConfig(json_schema=_remote_ref_schema()))
+
+    with pytest.raises(ValueError, match=r"Remote \$ref values are not supported"):
+        _ = layer.build_output_contract()
+
+
+def test_output_layer_allows_literal_dollar_ref_values_under_const_and_examples() -> None:
+    layer = DifyOutputLayer.from_config(DifyOutputLayerConfig(json_schema=_literal_dollar_ref_value_schema()))
+
+    output_contract = layer.build_output_contract()
+    output_adapter = TypeAdapter(_validated_output_type(output_contract.output_type))
+
+    assert output_adapter.validate_python(
+        {
+            "payload": {
+                "$ref": "https://example.com/literal",
+                "kind": "literal",
+            },
+            "metadata": {"note": "runtime value"},
+        }
+    ) == {
+        "payload": {
+            "$ref": "https://example.com/literal",
+            "kind": "literal",
+        },
+        "metadata": {"note": "runtime value"},
+    }
diff --git a/dify-agent/tests/local/dify_agent/protocol/test_protocol_schemas.py b/dify-agent/tests/local/dify_agent/protocol/test_protocol_schemas.py
new file mode 100644
index 0000000000..ffdad4207b
--- /dev/null
+++ b/dify-agent/tests/local/dify_agent/protocol/test_protocol_schemas.py
@@ -0,0 +1,174 @@
+import pytest
+from pydantic import ValidationError
+from pydantic_ai.messages import FinalResultEvent
+
+from agenton.compositor import CompositorSessionSnapshot
+from agenton.layers import ExitIntent
+from agenton_collections.layers.plain import PLAIN_PROMPT_LAYER_TYPE_ID, PromptLayerConfig
+import dify_agent.protocol as protocol_exports
+from dify_agent.layers.dify_plugin import DIFY_PLUGIN_LAYER_TYPE_ID, DIFY_PLUGIN_LLM_LAYER_TYPE_ID
+from dify_agent.layers.output import DIFY_OUTPUT_LAYER_TYPE_ID, DifyOutputLayerConfig
+from dify_agent.protocol import DIFY_AGENT_MODEL_LAYER_ID, DIFY_AGENT_OUTPUT_LAYER_ID
+from dify_agent.protocol.schemas import (
+    RUN_EVENT_ADAPTER,
+    CreateRunRequest,
+    LayerExitSignals,
+    PydanticAIStreamRunEvent,
+    RunComposition,
+    RunFailedEvent,
+    RunFailedEventData,
+    RunLayerSpec,
+    RunStartedEvent,
+    RunSucceededEvent,
+    RunSucceededEventData,
+    normalize_composition,
+)
+from dify_agent.layers.dify_plugin.configs import DifyPluginLLMLayerConfig, DifyPluginLayerConfig
+
+
+def test_run_event_adapter_round_trips_typed_variants() -> None:
+    events = [
+        RunStartedEvent(run_id="run-1"),
+        PydanticAIStreamRunEvent(run_id="run-1", data=FinalResultEvent(tool_name=None, tool_call_id=None)),
+        RunSucceededEvent(
+            run_id="run-1",
+            data=RunSucceededEventData(
+                output={"answer": ["done"]},
+                session_snapshot=CompositorSessionSnapshot(layers=[]),
+            ),
+        ),
+        RunFailedEvent(run_id="run-1", data=RunFailedEventData(error="boom", reason="shutdown")),
+    ]
+
+    for event in events:
+        payload = RUN_EVENT_ADAPTER.dump_json(event)
+        decoded = RUN_EVENT_ADAPTER.validate_json(payload)
+
+        assert decoded.type == event.type
+        assert decoded.run_id == event.run_id
+
+
+def test_pydantic_ai_event_data_uses_agent_stream_event_model() -> None:
+    event = RUN_EVENT_ADAPTER.validate_python(
+        {
+            "run_id": "run-1",
+            "type": "pydantic_ai_event",
+            "data": {"event_kind": "final_result", "tool_name": None, "tool_call_id": None},
+        }
+    )
+
+    assert isinstance(event, PydanticAIStreamRunEvent)
+    assert isinstance(event.data, FinalResultEvent)
+
+
+def test_create_run_request_rejects_old_compositor_payload_and_model_layer_id_is_public() -> None:
+    assert DIFY_AGENT_MODEL_LAYER_ID == "llm"
+    assert DIFY_AGENT_OUTPUT_LAYER_ID == "output"
+    with pytest.raises(ValidationError):
+        _ = CreateRunRequest.model_validate(
+            {
+                "compositor": {"layers": []},
+            }
+        )
+
+
+def test_create_run_request_accepts_dto_first_public_composition_and_normalizes_graph_config() -> None:
+    prompt_config = PromptLayerConfig(prefix="system", user="hello")
+    plugin_config = DifyPluginLayerConfig(tenant_id="tenant-1", plugin_id="langgenius/openai")
+    llm_config = DifyPluginLLMLayerConfig(
+        model_provider="openai",
+        model="demo-model",
+        credentials={"api_key": "secret"},
+    )
+    output_config = DifyOutputLayerConfig(
+        json_schema={
+            "type": "object",
+            "properties": {"title": {"type": "string"}},
+            "required": ["title"],
+            "additionalProperties": False,
+        }
+    )
+    request = CreateRunRequest(
+        composition=RunComposition(
+            layers=[
+                RunLayerSpec(name="prompt", type=PLAIN_PROMPT_LAYER_TYPE_ID, config=prompt_config),
+                RunLayerSpec(name="plugin", type=DIFY_PLUGIN_LAYER_TYPE_ID, config=plugin_config),
+                RunLayerSpec(
+                    name=DIFY_AGENT_MODEL_LAYER_ID,
+                    type=DIFY_PLUGIN_LLM_LAYER_TYPE_ID,
+                    deps={"plugin": "plugin"},
+                    config=llm_config,
+                ),
+                RunLayerSpec(
+                    name=DIFY_AGENT_OUTPUT_LAYER_ID,
+                    type=DIFY_OUTPUT_LAYER_TYPE_ID,
+                    config=output_config,
+                ),
+            ]
+        )
+    )
+
+    graph_config, layer_configs = normalize_composition(request.composition)
+    payload = request.model_dump(mode="json")
+
+    assert payload["composition"]["layers"][0]["config"] == {"prefix": "system", "user": "hello", "suffix": []}
+    assert [layer.model_dump(mode="json") for layer in graph_config.layers] == [
+        {"name": "prompt", "type": PLAIN_PROMPT_LAYER_TYPE_ID, "deps": {}, "metadata": {}},
+        {"name": "plugin", "type": DIFY_PLUGIN_LAYER_TYPE_ID, "deps": {}, "metadata": {}},
+        {
+            "name": DIFY_AGENT_MODEL_LAYER_ID,
+            "type": DIFY_PLUGIN_LLM_LAYER_TYPE_ID,
+            "deps": {"plugin": "plugin"},
+            "metadata": {},
+        },
+        {
+            "name": DIFY_AGENT_OUTPUT_LAYER_ID,
+            "type": DIFY_OUTPUT_LAYER_TYPE_ID,
+            "deps": {},
+            "metadata": {},
+        },
+    ]
+    assert layer_configs == {
+        "prompt": prompt_config,
+        "plugin": plugin_config,
+        DIFY_AGENT_MODEL_LAYER_ID: llm_config,
+        DIFY_AGENT_OUTPUT_LAYER_ID: output_config,
+    }
+
+
+def test_on_exit_default_to_suspend_and_are_public() -> None:
+    assert protocol_exports.LayerExitSignals is LayerExitSignals
+    assert protocol_exports.RunComposition is RunComposition
+    assert protocol_exports.RunLayerSpec is RunLayerSpec
+    assert protocol_exports.normalize_composition is normalize_composition
+    assert protocol_exports.DIFY_AGENT_OUTPUT_LAYER_ID == DIFY_AGENT_OUTPUT_LAYER_ID
+    request = CreateRunRequest.model_validate({"composition": {"layers": []}})
+
+    assert request.on_exit.default is ExitIntent.SUSPEND
+    assert request.on_exit.layers == {}
+
+
+def test_on_exit_accept_layer_overrides() -> None:
+    request = CreateRunRequest.model_validate(
+        {
+            "composition": {"layers": []},
+            "on_exit": {
+                "default": "delete",
+                "layers": {"prompt": "suspend", "llm": "delete"},
+            },
+        }
+    )
+
+    assert request.on_exit.default is ExitIntent.DELETE
+    assert request.on_exit.layers == {"prompt": ExitIntent.SUSPEND, "llm": ExitIntent.DELETE}
+
+
+def test_layer_exit_signals_reject_extra_fields() -> None:
+    with pytest.raises(ValidationError):
+        _ = LayerExitSignals.model_validate({"default": "suspend", "unknown": "value"})
+
+
+@pytest.mark.parametrize("event_type", ["agent_output", "session_snapshot"])
+def test_removed_non_terminal_payload_events_are_rejected(event_type: str) -> None:
+    with pytest.raises(ValidationError):
+        _ = RUN_EVENT_ADAPTER.validate_python({"run_id": "run-1", "type": event_type, "data": {}})
diff --git a/dify-agent/tests/local/dify_agent/runtime/test_run_scheduler.py b/dify-agent/tests/local/dify_agent/runtime/test_run_scheduler.py
new file mode 100644
index 0000000000..2aedacc703
--- /dev/null
+++ b/dify-agent/tests/local/dify_agent/runtime/test_run_scheduler.py
@@ -0,0 +1,546 @@
+import asyncio
+from collections import defaultdict
+from collections.abc import Mapping
+
+import httpx
+import pytest
+
+from agenton.compositor import CompositorSessionSnapshot, LayerSessionSnapshot
+from agenton.layers import ExitIntent, LifecycleState
+from agenton_collections.layers.plain import PromptLayerConfig
+from dify_agent.layers.output import DIFY_OUTPUT_LAYER_TYPE_ID, DifyOutputLayerConfig
+from dify_agent.protocol import DIFY_AGENT_OUTPUT_LAYER_ID
+from dify_agent.protocol.schemas import (
+    CreateRunRequest,
+    LayerExitSignals,
+    RunComposition,
+    RunEvent,
+    RunLayerSpec,
+    RunStatus,
+)
+from dify_agent.runtime.run_scheduler import (
+    RunRequestValidationError,
+    RunScheduler,
+    SchedulerStoppingError,
+    validate_run_request,
+)
+from dify_agent.server.schemas import RunRecord
+
+
+def _request(
+    user: str | list[str] = "hello",
+    *,
+    output_config: Mapping[str, object] | DifyOutputLayerConfig | None = None,
+) -> CreateRunRequest:
+    layers = [RunLayerSpec(name="prompt", type="plain.prompt", config=PromptLayerConfig(user=user))]
+    if output_config is not None:
+        layers.append(
+            RunLayerSpec(
+                name=DIFY_AGENT_OUTPUT_LAYER_ID,
+                type=DIFY_OUTPUT_LAYER_TYPE_ID,
+                config=output_config,
+            )
+        )
+
+    return CreateRunRequest(composition=RunComposition(layers=layers))
+
+
+def _recursive_output_schema() -> dict[str, object]:
+    return {
+        "type": "object",
+        "properties": {"node": {"$ref": "#/$defs/node"}},
+        "$defs": {
+            "node": {
+                "type": "object",
+                "properties": {"child": {"$ref": "#/$defs/node"}},
+                "additionalProperties": False,
+            }
+        },
+        "additionalProperties": False,
+    }
+
+
+class FakeStore:
+    records: dict[str, RunRecord]
+    events: dict[str, list[RunEvent]]
+    statuses: dict[str, RunStatus]
+    errors: dict[str, str | None]
+
+    def __init__(self) -> None:
+        self.records = {}
+        self.events = defaultdict(list)
+        self.statuses = {}
+        self.errors = {}
+
+    async def create_run(self) -> RunRecord:
+        run_id = f"run-{len(self.records) + 1}"
+        record = RunRecord(run_id=run_id, status="running")
+        self.records[run_id] = record
+        self.statuses[run_id] = "running"
+        return record
+
+    async def append_event(self, event: RunEvent) -> str:
+        event_id = str(len(self.events[event.run_id]) + 1)
+        self.events[event.run_id].append(event.model_copy(update={"id": event_id}))
+        return event_id
+
+    async def update_status(self, run_id: str, status: RunStatus, error: str | None = None) -> None:
+        self.statuses[run_id] = status
+        self.errors[run_id] = error
+
+
+class SlowCreateStore(FakeStore):
+    create_started: asyncio.Event
+    release_create: asyncio.Event
+
+    def __init__(self, *, create_started: asyncio.Event, release_create: asyncio.Event) -> None:
+        super().__init__()
+        self.create_started = create_started
+        self.release_create = release_create
+
+    async def create_run(self) -> RunRecord:
+        _ = self.create_started.set()
+        await self.release_create.wait()
+        return await super().create_run()
+
+
+class ControlledRunner:
+    started: asyncio.Event
+    release: asyncio.Event
+
+    def __init__(self, *, started: asyncio.Event, release: asyncio.Event) -> None:
+        self.started = started
+        self.release = release
+
+    async def run(self) -> None:
+        _ = self.started.set()
+        await self.release.wait()
+
+
+def test_create_run_starts_background_task_and_returns_running() -> None:
+    async def scenario() -> None:
+        store = FakeStore()
+        started = asyncio.Event()
+        release = asyncio.Event()
+        async with httpx.AsyncClient() as client:
+            scheduler = RunScheduler(
+                store=store,
+                plugin_daemon_http_client=client,
+                runner_factory=lambda _record, _request: ControlledRunner(started=started, release=release),
+            )
+
+            record = await scheduler.create_run(_request())
+            await asyncio.wait_for(started.wait(), timeout=1)
+
+            assert record.status == "running"
+            assert list(scheduler.active_tasks) == [record.run_id]
+            _ = release.set()
+            await asyncio.wait_for(scheduler.active_tasks[record.run_id], timeout=1)
+            await asyncio.sleep(0)
+            assert scheduler.active_tasks == {}
+
+    asyncio.run(scenario())
+
+
+def test_shutdown_marks_unfinished_runs_failed_and_appends_event() -> None:
+    async def scenario() -> None:
+        store = FakeStore()
+        started = asyncio.Event()
+        async with httpx.AsyncClient() as client:
+            scheduler = RunScheduler(
+                store=store,
+                plugin_daemon_http_client=client,
+                shutdown_grace_seconds=0,
+                runner_factory=lambda _record, _request: ControlledRunner(started=started, release=asyncio.Event()),
+            )
+            record = await scheduler.create_run(_request())
+            await asyncio.wait_for(started.wait(), timeout=1)
+
+            await scheduler.shutdown()
+
+            assert scheduler.stopping is True
+            assert scheduler.active_tasks == {}
+            assert store.statuses[record.run_id] == "failed"
+            assert store.errors[record.run_id] == "run cancelled during server shutdown"
+            assert [event.type for event in store.events[record.run_id]] == ["run_failed"]
+
+    asyncio.run(scenario())
+
+
+def test_create_run_rejects_blank_prompt_before_persisting() -> None:
+    async def scenario() -> None:
+        store = FakeStore()
+        async with httpx.AsyncClient() as client:
+            scheduler = RunScheduler(store=store, plugin_daemon_http_client=client)
+
+            with pytest.raises(ValueError, match="run.user_prompts must not be empty"):
+                await scheduler.create_run(_request(["", "   "]))
+
+        assert store.records == {}
+
+    asyncio.run(scenario())
+
+
+def test_create_run_rejects_invalid_output_schema_before_persisting() -> None:
+    async def scenario() -> None:
+        store = FakeStore()
+        async with httpx.AsyncClient() as client:
+            scheduler = RunScheduler(store=store, plugin_daemon_http_client=client)
+
+            with pytest.raises(ValueError, match=r"Recursive \$defs refs are not supported"):
+                await scheduler.create_run(
+                    _request(
+                        output_config={
+                            "name": "incident_summary",
+                            "json_schema": _recursive_output_schema(),
+                        }
+                    )
+                )
+
+        assert store.records == {}
+
+    asyncio.run(scenario())
+
+
+def test_create_run_rejects_remote_ref_output_schema_before_persisting() -> None:
+    async def scenario() -> None:
+        store = FakeStore()
+        async with httpx.AsyncClient() as client:
+            scheduler = RunScheduler(store=store, plugin_daemon_http_client=client)
+
+            with pytest.raises(ValueError, match=r"Remote \$ref values are not supported"):
+                await scheduler.create_run(
+                    _request(
+                        output_config={
+                            "name": "incident_summary",
+                            "json_schema": {
+                                "type": "object",
+                                "properties": {
+                                    "title": {"$ref": "https://example.com/schema.json"},
+                                },
+                            },
+                        }
+                    )
+                )
+
+        assert store.records == {}
+
+    asyncio.run(scenario())
+
+
+def test_create_run_rejects_non_object_output_schema_before_persisting() -> None:
+    async def scenario() -> None:
+        store = FakeStore()
+        async with httpx.AsyncClient() as client:
+            scheduler = RunScheduler(store=store, plugin_daemon_http_client=client)
+
+            with pytest.raises(ValueError, match="Schema must declare an object output"):
+                await scheduler.create_run(
+                    _request(
+                        output_config={
+                            "name": "incident_actions",
+                            "json_schema": {
+                                "type": "array",
+                                "items": {"type": "string"},
+                            },
+                        }
+                    )
+                )
+
+        assert store.records == {}
+
+    asyncio.run(scenario())
+
+
+def test_create_run_rejects_non_defs_local_ref_in_direct_object_schema_before_persisting() -> None:
+    async def scenario() -> None:
+        store = FakeStore()
+        async with httpx.AsyncClient() as client:
+            scheduler = RunScheduler(store=store, plugin_daemon_http_client=client)
+
+            with pytest.raises(ValueError, match=r"Only local refs under '#/\$defs/' are supported"):
+                await scheduler.create_run(
+                    _request(
+                        output_config={
+                            "name": "incident_summary",
+                            "json_schema": {
+                                "type": "object",
+                                "properties": {
+                                    "items": {"$ref": "#/definitions/itemArray"},
+                                },
+                                "required": ["items"],
+                                "definitions": {
+                                    "itemArray": {
+                                        "type": "array",
+                                        "items": {"type": "string"},
+                                    },
+                                },
+                            },
+                        }
+                    )
+                )
+
+        assert store.records == {}
+
+    asyncio.run(scenario())
+
+
+def test_create_run_rejects_misnamed_output_layer_before_persisting() -> None:
+    async def scenario() -> None:
+        store = FakeStore()
+        async with httpx.AsyncClient() as client:
+            scheduler = RunScheduler(store=store, plugin_daemon_http_client=client)
+
+            request = CreateRunRequest(
+                composition=RunComposition(
+                    layers=[
+                        RunLayerSpec(name="prompt", type="plain.prompt", config=PromptLayerConfig(user="hello")),
+                        RunLayerSpec(
+                            name="structured-output",
+                            type=DIFY_OUTPUT_LAYER_TYPE_ID,
+                            config=DifyOutputLayerConfig(
+                                json_schema={
+                                    "type": "object",
+                                    "properties": {"title": {"type": "string"}},
+                                    "required": ["title"],
+                                    "additionalProperties": False,
+                                }
+                            ),
+                        ),
+                    ]
+                )
+            )
+
+            with pytest.raises(ValueError, match="must use reserved layer name 'output'"):
+                await scheduler.create_run(request)
+
+        assert store.records == {}
+
+    asyncio.run(scenario())
+
+
+def test_create_run_rejects_multiple_output_layers_before_persisting() -> None:
+    async def scenario() -> None:
+        store = FakeStore()
+        async with httpx.AsyncClient() as client:
+            scheduler = RunScheduler(store=store, plugin_daemon_http_client=client)
+
+            request = CreateRunRequest(
+                composition=RunComposition(
+                    layers=[
+                        RunLayerSpec(name="prompt", type="plain.prompt", config=PromptLayerConfig(user="hello")),
+                        RunLayerSpec(
+                            name=DIFY_AGENT_OUTPUT_LAYER_ID,
+                            type=DIFY_OUTPUT_LAYER_TYPE_ID,
+                            config=DifyOutputLayerConfig(
+                                json_schema={
+                                    "type": "object",
+                                    "properties": {"title": {"type": "string"}},
+                                    "required": ["title"],
+                                    "additionalProperties": False,
+                                }
+                            ),
+                        ),
+                        RunLayerSpec(
+                            name="secondary-output",
+                            type=DIFY_OUTPUT_LAYER_TYPE_ID,
+                            config=DifyOutputLayerConfig(
+                                json_schema={
+                                    "type": "object",
+                                    "properties": {"summary": {"type": "string"}},
+                                    "required": ["summary"],
+                                    "additionalProperties": False,
+                                }
+                            ),
+                        ),
+                    ]
+                )
+            )
+
+            with pytest.raises(ValueError, match="Only one 'dify.output' layer is supported"):
+                await scheduler.create_run(request)
+
+        assert store.records == {}
+
+    asyncio.run(scenario())
+
+
+def test_create_run_rejects_reserved_output_name_with_wrong_layer_type_before_persisting() -> None:
+    async def scenario() -> None:
+        store = FakeStore()
+        async with httpx.AsyncClient() as client:
+            scheduler = RunScheduler(store=store, plugin_daemon_http_client=client)
+
+            request = CreateRunRequest(
+                composition=RunComposition(
+                    layers=[
+                        RunLayerSpec(name="prompt", type="plain.prompt", config=PromptLayerConfig(user="hello")),
+                        RunLayerSpec(
+                            name=DIFY_AGENT_OUTPUT_LAYER_ID, type="plain.prompt", config=PromptLayerConfig(user="hi")
+                        ),
+                    ]
+                )
+            )
+
+            with pytest.raises(ValueError, match=r"Layer 'output' must be DifyOutputLayer, got PromptLayer"):
+                await scheduler.create_run(request)
+
+        assert store.records == {}
+
+    asyncio.run(scenario())
+
+
+def test_validate_run_request_honors_explicit_empty_layer_providers() -> None:
+    async def scenario() -> None:
+        with pytest.raises(RunRequestValidationError, match="plain.prompt"):
+            await validate_run_request(_request(), layer_providers=())
+
+    asyncio.run(scenario())
+
+
+def test_validate_run_request_rejects_misnamed_output_layer_before_provider_checks() -> None:
+    async def scenario() -> None:
+        request = CreateRunRequest(
+            composition=RunComposition(
+                layers=[
+                    RunLayerSpec(name="prompt", type="plain.prompt", config=PromptLayerConfig(user="hello")),
+                    RunLayerSpec(
+                        name="structured-output",
+                        type=DIFY_OUTPUT_LAYER_TYPE_ID,
+                        config=DifyOutputLayerConfig(
+                            json_schema={
+                                "type": "object",
+                                "properties": {"title": {"type": "string"}},
+                                "required": ["title"],
+                                "additionalProperties": False,
+                            }
+                        ),
+                    ),
+                ]
+            )
+        )
+
+        with pytest.raises(RunRequestValidationError, match="must use reserved layer name 'output'"):
+            await validate_run_request(request, layer_providers=())
+
+    asyncio.run(scenario())
+
+
+def test_create_run_rejects_unknown_layer_exit_signal_before_persisting() -> None:
+    async def scenario() -> None:
+        store = FakeStore()
+        async with httpx.AsyncClient() as client:
+            scheduler = RunScheduler(store=store, plugin_daemon_http_client=client)
+            request = _request()
+            request.on_exit = LayerExitSignals(layers={"missing": ExitIntent.DELETE})
+
+            with pytest.raises(ValueError, match="missing"):
+                await scheduler.create_run(request)
+
+        assert store.records == {}
+
+    asyncio.run(scenario())
+
+
+def test_create_run_honors_explicit_empty_layer_providers_before_persisting() -> None:
+    async def scenario() -> None:
+        store = FakeStore()
+        async with httpx.AsyncClient() as client:
+            scheduler = RunScheduler(store=store, plugin_daemon_http_client=client, layer_providers=())
+
+            with pytest.raises(RunRequestValidationError, match="plain.prompt"):
+                await scheduler.create_run(_request())
+
+        assert store.records == {}
+
+    asyncio.run(scenario())
+
+
+def test_create_run_rejects_closed_session_snapshot_before_persisting() -> None:
+    async def scenario() -> None:
+        store = FakeStore()
+        async with httpx.AsyncClient() as client:
+            scheduler = RunScheduler(store=store, plugin_daemon_http_client=client)
+            request = _request()
+            request.session_snapshot = CompositorSessionSnapshot(
+                layers=[
+                    LayerSessionSnapshot(
+                        name="prompt",
+                        lifecycle_state=LifecycleState.CLOSED,
+                        runtime_state={},
+                    )
+                ]
+            )
+
+            with pytest.raises(ValueError, match="CLOSED snapshots cannot be entered"):
+                _ = await scheduler.create_run(request)
+
+        assert store.records == {}
+
+    asyncio.run(scenario())
+
+
+def test_create_run_rejects_after_shutdown_starts() -> None:
+    async def scenario() -> None:
+        async with httpx.AsyncClient() as client:
+            scheduler = RunScheduler(store=FakeStore(), plugin_daemon_http_client=client)
+            await scheduler.shutdown()
+
+            with pytest.raises(SchedulerStoppingError):
+                await scheduler.create_run(_request())
+
+    asyncio.run(scenario())
+
+
+def test_create_run_rejects_invalid_request_after_shutdown_without_persisting() -> None:
+    async def scenario() -> None:
+        store = FakeStore()
+        async with httpx.AsyncClient() as client:
+            scheduler = RunScheduler(store=store, plugin_daemon_http_client=client)
+            await scheduler.shutdown()
+
+            with pytest.raises(SchedulerStoppingError):
+                _ = await scheduler.create_run(_request(["", "   "]))
+
+        assert store.records == {}
+
+    asyncio.run(scenario())
+
+
+def test_shutdown_waits_for_in_flight_create_to_register_before_cancelling() -> None:
+    async def scenario() -> None:
+        create_started = asyncio.Event()
+        release_create = asyncio.Event()
+        runner_started = asyncio.Event()
+        store = SlowCreateStore(create_started=create_started, release_create=release_create)
+        async with httpx.AsyncClient() as client:
+            scheduler = RunScheduler(
+                store=store,
+                plugin_daemon_http_client=client,
+                shutdown_grace_seconds=0,
+                runner_factory=lambda _record, _request: ControlledRunner(
+                    started=runner_started, release=asyncio.Event()
+                ),
+            )
+
+            create_task = asyncio.create_task(scheduler.create_run(_request()))
+            await asyncio.wait_for(create_started.wait(), timeout=1)
+            shutdown_task = asyncio.create_task(scheduler.shutdown())
+            await asyncio.sleep(0)
+
+            assert shutdown_task.done() is False
+            assert scheduler.stopping is False
+
+            _ = release_create.set()
+            record = await asyncio.wait_for(create_task, timeout=1)
+            await asyncio.wait_for(shutdown_task, timeout=1)
+
+            assert scheduler.stopping is True
+            assert scheduler.active_tasks == {}
+            assert store.statuses[record.run_id] == "failed"
+            assert [event.type for event in store.events[record.run_id]] == ["run_failed"]
+
+            with pytest.raises(SchedulerStoppingError):
+                await scheduler.create_run(_request())
+
+    asyncio.run(scenario())
diff --git a/dify-agent/tests/local/dify_agent/runtime/test_runner.py b/dify-agent/tests/local/dify_agent/runtime/test_runner.py
new file mode 100644
index 0000000000..8469139327
--- /dev/null
+++ b/dify-agent/tests/local/dify_agent/runtime/test_runner.py
@@ -0,0 +1,834 @@
+import asyncio
+from collections.abc import Mapping
+from typing import Any
+
+import httpx
+import pytest
+from pydantic_ai.exceptions import UnexpectedModelBehavior
+from pydantic_ai.messages import ModelMessage, ModelResponse, ToolCallPart
+from pydantic_ai.models import ModelRequestParameters
+from pydantic_ai.models.test import TestModel
+from pydantic_ai.settings import ModelSettings
+
+from agenton.compositor import CompositorSessionSnapshot, LayerSessionSnapshot
+from agenton.layers import ExitIntent, LifecycleState
+from agenton_collections.layers.plain import PromptLayerConfig
+from dify_agent.layers.dify_plugin.configs import DifyPluginLLMLayerConfig, DifyPluginLayerConfig
+from dify_agent.layers.dify_plugin.llm_layer import DifyPluginLLMLayer
+from dify_agent.layers.output import DIFY_OUTPUT_LAYER_TYPE_ID, DifyOutputLayerConfig
+from dify_agent.protocol import DIFY_AGENT_MODEL_LAYER_ID, DIFY_AGENT_OUTPUT_LAYER_ID
+from dify_agent.protocol.schemas import (
+    CreateRunRequest,
+    LayerExitSignals,
+    RunComposition,
+    RunLayerSpec,
+    RunSucceededEvent,
+)
+from dify_agent.runtime.event_sink import InMemoryRunEventSink
+from dify_agent.runtime.runner import AgentRunRunner, AgentRunValidationError
+
+
+def _request(
+    user: str | list[str] = "hello",
+    *,
+    llm_layer_name: str = DIFY_AGENT_MODEL_LAYER_ID,
+    plugin_layer_name: str = "plugin",
+    on_exit: LayerExitSignals | None = None,
+    output_config: Mapping[str, object] | DifyOutputLayerConfig | None = None,
+) -> CreateRunRequest:
+    layers = [
+        RunLayerSpec(
+            name="prompt",
+            type="plain.prompt",
+            config=PromptLayerConfig(prefix="system", user=user),
+        ),
+        RunLayerSpec(
+            name=plugin_layer_name,
+            type="dify.plugin",
+            config=DifyPluginLayerConfig(tenant_id="tenant-1", plugin_id="langgenius/openai"),
+        ),
+        RunLayerSpec(
+            name=llm_layer_name,
+            type="dify.plugin.llm",
+            deps={"plugin": plugin_layer_name},
+            config=DifyPluginLLMLayerConfig(
+                model_provider="openai",
+                model="demo-model",
+                credentials={"api_key": "secret"},
+            ),
+        ),
+    ]
+    if output_config is not None:
+        layers.append(
+            RunLayerSpec(
+                name=DIFY_AGENT_OUTPUT_LAYER_ID,
+                type=DIFY_OUTPUT_LAYER_TYPE_ID,
+                config=output_config,
+            )
+        )
+
+    return CreateRunRequest(
+        composition=RunComposition(layers=layers),
+        on_exit=on_exit or LayerExitSignals(),
+    )
+
+
+def _recursive_output_schema() -> dict[str, object]:
+    return {
+        "type": "object",
+        "properties": {"node": {"$ref": "#/$defs/node"}},
+        "$defs": {
+            "node": {
+                "type": "object",
+                "properties": {"child": {"$ref": "#/$defs/node"}},
+                "additionalProperties": False,
+            }
+        },
+        "additionalProperties": False,
+    }
+
+
+class SequenceOutputTestModel(TestModel):
+    outputs: list[str | dict[str, Any] | None]
+    request_count: int
+
+    def __init__(self, outputs: list[str | dict[str, Any] | None]) -> None:
+        super().__init__(call_tools=[])
+        self.outputs = outputs
+        self.request_count = 0
+
+    def _request(
+        self,
+        messages: list[ModelMessage],
+        model_settings: ModelSettings | None,
+        model_request_parameters: ModelRequestParameters,
+    ) -> ModelResponse:
+        if not model_request_parameters.output_tools:
+            return super()._request(messages, model_settings, model_request_parameters)
+
+        output_tool = model_request_parameters.output_tools[0]
+        next_index = min(self.request_count, len(self.outputs) - 1)
+        output_args = self.outputs[next_index]
+        self.request_count += 1
+        return ModelResponse(
+            parts=[
+                ToolCallPart(
+                    output_tool.name,
+                    output_args,
+                    tool_call_id=f"pyd_ai_tool_call_id__{output_tool.name}_{self.request_count}",
+                )
+            ],
+            model_name=self.model_name,
+        )
+
+
+def test_runner_emits_terminal_success_and_snapshot(monkeypatch: pytest.MonkeyPatch) -> None:
+    seen_clients: list[httpx.AsyncClient] = []
+
+    def fake_get_model(self: DifyPluginLLMLayer, *, http_client: httpx.AsyncClient):
+        assert self.config.model == "demo-model"
+        assert self.deps.plugin.config.plugin_id == "langgenius/openai"
+        seen_clients.append(http_client)
+        return TestModel(custom_output_text="done")  # pyright: ignore[reportReturnType]
+
+    monkeypatch.setattr(DifyPluginLLMLayer, "get_model", fake_get_model)
+    request = _request(plugin_layer_name="renamed-plugin")
+    sink = InMemoryRunEventSink()
+
+    async def scenario() -> None:
+        async with httpx.AsyncClient() as client:
+            await AgentRunRunner(
+                sink=sink,
+                request=request,
+                run_id="run-1",
+                plugin_daemon_http_client=client,
+            ).run()
+            assert seen_clients == [client]
+            assert client.is_closed is False
+
+    asyncio.run(scenario())
+
+    event_types = [event.type for event in sink.events["run-1"]]
+    assert event_types[0] == "run_started"
+    assert "pydantic_ai_event" in event_types
+    assert "agent_output" not in event_types
+    assert "session_snapshot" not in event_types
+    assert event_types[-1:] == ["run_succeeded"]
+    terminal = sink.events["run-1"][-1]
+    assert isinstance(terminal, RunSucceededEvent)
+    assert terminal.data.output == "done"
+    assert [layer.name for layer in terminal.data.session_snapshot.layers] == [
+        "prompt",
+        "renamed-plugin",
+        DIFY_AGENT_MODEL_LAYER_ID,
+    ]
+    assert [layer.lifecycle_state for layer in terminal.data.session_snapshot.layers] == [
+        LifecycleState.SUSPENDED,
+        LifecycleState.SUSPENDED,
+        LifecycleState.SUSPENDED,
+    ]
+    assert sink.statuses["run-1"] == "succeeded"
+
+
+def test_runner_applies_on_exit_overrides_to_success_snapshot(monkeypatch: pytest.MonkeyPatch) -> None:
+    def fake_get_model(_self: DifyPluginLLMLayer, *, http_client: httpx.AsyncClient):
+        assert http_client.is_closed is False
+        return TestModel(custom_output_text="done")  # pyright: ignore[reportReturnType]
+
+    monkeypatch.setattr(DifyPluginLLMLayer, "get_model", fake_get_model)
+    request = _request(
+        on_exit=LayerExitSignals(
+            default=ExitIntent.SUSPEND,
+            layers={"prompt": ExitIntent.DELETE, DIFY_AGENT_MODEL_LAYER_ID: ExitIntent.DELETE},
+        )
+    )
+    sink = InMemoryRunEventSink()
+
+    async def scenario() -> None:
+        async with httpx.AsyncClient() as client:
+            await AgentRunRunner(
+                sink=sink,
+                request=request,
+                run_id="run-exit",
+                plugin_daemon_http_client=client,
+            ).run()
+
+    asyncio.run(scenario())
+
+    terminal = sink.events["run-exit"][-1]
+    assert isinstance(terminal, RunSucceededEvent)
+    assert {layer.name: layer.lifecycle_state for layer in terminal.data.session_snapshot.layers} == {
+        "prompt": LifecycleState.CLOSED,
+        "plugin": LifecycleState.SUSPENDED,
+        DIFY_AGENT_MODEL_LAYER_ID: LifecycleState.CLOSED,
+    }
+
+
+def test_runner_passes_output_layer_spec_to_agent_and_serializes_structured_result(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    model = TestModel(
+        custom_output_args={
+            "title": "Database outage",
+            "severity": "high",
+            "actions": ["page on-call", "open incident bridge"],
+        }
+    )
+
+    def fake_get_model(_self: DifyPluginLLMLayer, *, http_client: httpx.AsyncClient):
+        assert http_client.is_closed is False
+        return model  # pyright: ignore[reportReturnType]
+
+    monkeypatch.setattr(DifyPluginLLMLayer, "get_model", fake_get_model)
+    request = _request(
+        output_config=DifyOutputLayerConfig(
+            json_schema={
+                "type": "object",
+                "properties": {
+                    "title": {"type": "string"},
+                    "severity": {"type": "string", "enum": ["low", "medium", "high"]},
+                    "actions": {"type": "array", "items": {"type": "string"}},
+                },
+                "required": ["title", "severity", "actions"],
+                "additionalProperties": False,
+            },
+            name="incident_summary",
+            description="Structured incident summary returned by the agent.",
+            strict=True,
+        )
+    )
+    sink = InMemoryRunEventSink()
+    expected_snapshot_layer_names = ["prompt", "plugin", DIFY_AGENT_MODEL_LAYER_ID, DIFY_AGENT_OUTPUT_LAYER_ID]
+
+    async def scenario() -> None:
+        async with httpx.AsyncClient() as client:
+            await AgentRunRunner(
+                sink=sink,
+                request=request,
+                run_id="run-structured-output",
+                plugin_daemon_http_client=client,
+            ).run()
+
+            first_terminal = sink.events["run-structured-output"][-1]
+            assert isinstance(first_terminal, RunSucceededEvent)
+
+            resumed_request = request.model_copy(deep=True)
+            resumed_request.session_snapshot = first_terminal.data.session_snapshot
+
+            await AgentRunRunner(
+                sink=sink,
+                request=resumed_request,
+                run_id="run-structured-output-resume",
+                plugin_daemon_http_client=client,
+            ).run()
+
+    asyncio.run(scenario())
+
+    assert model.last_model_request_parameters is not None
+    assert len(model.last_model_request_parameters.output_tools) == 1
+    output_tool = model.last_model_request_parameters.output_tools[0]
+    assert output_tool.name == "incident_summary"
+    assert output_tool.description == "Structured incident summary returned by the agent."
+    assert output_tool.parameters_json_schema["type"] == "object"
+    assert output_tool.parameters_json_schema["title"] == "incident_summary"
+    assert output_tool.parameters_json_schema["properties"] == {
+        "title": {"type": "string"},
+        "severity": {"type": "string", "enum": ["low", "medium", "high"]},
+        "actions": {"type": "array", "items": {"type": "string"}},
+    }
+    assert output_tool.parameters_json_schema["required"] == ["title", "severity", "actions"]
+    assert output_tool.parameters_json_schema["additionalProperties"] is False
+    terminal = sink.events["run-structured-output"][-1]
+    resumed_terminal = sink.events["run-structured-output-resume"][-1]
+    assert isinstance(terminal, RunSucceededEvent)
+    assert isinstance(resumed_terminal, RunSucceededEvent)
+    assert terminal.data.output == {
+        "title": "Database outage",
+        "severity": "high",
+        "actions": ["page on-call", "open incident bridge"],
+    }
+    assert resumed_terminal.data.output == terminal.data.output
+    assert [layer.name for layer in terminal.data.session_snapshot.layers] == expected_snapshot_layer_names
+    assert [layer.name for layer in resumed_terminal.data.session_snapshot.layers] == expected_snapshot_layer_names
+    assert all(layer.lifecycle_state is LifecycleState.SUSPENDED for layer in terminal.data.session_snapshot.layers)
+    assert all(
+        layer.lifecycle_state is LifecycleState.SUSPENDED for layer in resumed_terminal.data.session_snapshot.layers
+    )
+
+
+def test_runner_retries_invalid_structured_output_and_eventually_succeeds(monkeypatch: pytest.MonkeyPatch) -> None:
+    model = SequenceOutputTestModel(
+        outputs=[
+            {"title": "Database outage", "severity": "high", "actions": "page on-call"},
+            {"title": "Database outage", "severity": "high", "actions": ["page on-call"]},
+        ]
+    )
+
+    def fake_get_model(_self: DifyPluginLLMLayer, *, http_client: httpx.AsyncClient):
+        assert http_client.is_closed is False
+        return model  # pyright: ignore[reportReturnType]
+
+    monkeypatch.setattr(DifyPluginLLMLayer, "get_model", fake_get_model)
+    request = _request(
+        output_config=DifyOutputLayerConfig(
+            json_schema={
+                "type": "object",
+                "properties": {
+                    "title": {"type": "string"},
+                    "severity": {"type": "string", "enum": ["low", "medium", "high"]},
+                    "actions": {"type": "array", "items": {"type": "string"}},
+                },
+                "required": ["title", "severity", "actions"],
+                "additionalProperties": False,
+            },
+            name="incident_summary",
+            description="Structured incident summary returned by the agent.",
+        )
+    )
+    sink = InMemoryRunEventSink()
+
+    async def scenario() -> None:
+        async with httpx.AsyncClient() as client:
+            await AgentRunRunner(
+                sink=sink,
+                request=request,
+                run_id="run-output-retry-success",
+                plugin_daemon_http_client=client,
+            ).run()
+
+    asyncio.run(scenario())
+
+    terminal = sink.events["run-output-retry-success"][-1]
+    assert isinstance(terminal, RunSucceededEvent)
+    assert terminal.data.output == {
+        "title": "Database outage",
+        "severity": "high",
+        "actions": ["page on-call"],
+    }
+    assert model.request_count == 2
+
+
+def test_runner_fails_when_invalid_structured_output_exhausts_retries(monkeypatch: pytest.MonkeyPatch) -> None:
+    model = TestModel(
+        custom_output_args={
+            "title": "Database outage",
+            "severity": "high",
+            "actions": "page on-call",
+        }
+    )
+
+    def fake_get_model(_self: DifyPluginLLMLayer, *, http_client: httpx.AsyncClient):
+        assert http_client.is_closed is False
+        return model  # pyright: ignore[reportReturnType]
+
+    monkeypatch.setattr(DifyPluginLLMLayer, "get_model", fake_get_model)
+    request = _request(
+        output_config=DifyOutputLayerConfig(
+            json_schema={
+                "type": "object",
+                "properties": {
+                    "title": {"type": "string"},
+                    "severity": {"type": "string", "enum": ["low", "medium", "high"]},
+                    "actions": {"type": "array", "items": {"type": "string"}},
+                },
+                "required": ["title", "severity", "actions"],
+                "additionalProperties": False,
+            },
+            name="incident_summary",
+            description="Structured incident summary returned by the agent.",
+        )
+    )
+    sink = InMemoryRunEventSink()
+
+    async def scenario() -> None:
+        async with httpx.AsyncClient() as client:
+            with pytest.raises(UnexpectedModelBehavior):
+                await AgentRunRunner(
+                    sink=sink,
+                    request=request,
+                    run_id="run-output-retry-failed",
+                    plugin_daemon_http_client=client,
+                ).run()
+
+    asyncio.run(scenario())
+
+    event_types = [event.type for event in sink.events["run-output-retry-failed"]]
+    assert event_types[0] == "run_started"
+    assert event_types[-1] == "run_failed"
+    assert "run_succeeded" not in event_types
+    assert sink.statuses["run-output-retry-failed"] == "failed"
+
+
+def test_runner_rejects_invalid_output_layer_before_model_resolution(monkeypatch: pytest.MonkeyPatch) -> None:
+    model_requested = False
+
+    def fake_get_model(_self: DifyPluginLLMLayer, *, http_client: httpx.AsyncClient):
+        del http_client
+        nonlocal model_requested
+        model_requested = True
+        return TestModel(custom_output_text="done")  # pyright: ignore[reportReturnType]
+
+    monkeypatch.setattr(DifyPluginLLMLayer, "get_model", fake_get_model)
+    request = _request(
+        output_config={
+            "name": "incident_summary",
+            "json_schema": _recursive_output_schema(),
+        }
+    )
+    sink = InMemoryRunEventSink()
+
+    async def scenario() -> None:
+        async with httpx.AsyncClient() as client:
+            with pytest.raises(AgentRunValidationError, match=r"Recursive \$defs refs are not supported"):
+                await AgentRunRunner(
+                    sink=sink,
+                    request=request,
+                    run_id="run-invalid-output",
+                    plugin_daemon_http_client=client,
+                ).run()
+
+    asyncio.run(scenario())
+
+    assert model_requested is False
+    assert [event.type for event in sink.events["run-invalid-output"]] == ["run_started", "run_failed"]
+    assert sink.statuses["run-invalid-output"] == "failed"
+
+
+def test_runner_rejects_misnamed_output_layer_before_model_resolution(monkeypatch: pytest.MonkeyPatch) -> None:
+    model_requested = False
+    request = CreateRunRequest(
+        composition=RunComposition(
+            layers=[
+                RunLayerSpec(
+                    name="prompt",
+                    type="plain.prompt",
+                    config=PromptLayerConfig(prefix="system", user="hello"),
+                ),
+                RunLayerSpec(
+                    name="plugin",
+                    type="dify.plugin",
+                    config=DifyPluginLayerConfig(tenant_id="tenant-1", plugin_id="langgenius/openai"),
+                ),
+                RunLayerSpec(
+                    name=DIFY_AGENT_MODEL_LAYER_ID,
+                    type="dify.plugin.llm",
+                    deps={"plugin": "plugin"},
+                    config=DifyPluginLLMLayerConfig(
+                        model_provider="openai",
+                        model="demo-model",
+                        credentials={"api_key": "secret"},
+                    ),
+                ),
+                RunLayerSpec(
+                    name="structured-output",
+                    type=DIFY_OUTPUT_LAYER_TYPE_ID,
+                    config=DifyOutputLayerConfig(
+                        json_schema={
+                            "type": "object",
+                            "properties": {"title": {"type": "string"}},
+                            "required": ["title"],
+                            "additionalProperties": False,
+                        }
+                    ),
+                ),
+            ]
+        ),
+        on_exit=LayerExitSignals(),
+    )
+    sink = InMemoryRunEventSink()
+
+    def fake_get_model(_self: DifyPluginLLMLayer, *, http_client: httpx.AsyncClient):
+        del http_client
+        nonlocal model_requested
+        model_requested = True
+        return TestModel(custom_output_text="done")  # pyright: ignore[reportReturnType]
+
+    monkeypatch.setattr(DifyPluginLLMLayer, "get_model", fake_get_model)
+
+    async def scenario() -> None:
+        async with httpx.AsyncClient() as client:
+            with pytest.raises(AgentRunValidationError, match="must use reserved layer name 'output'"):
+                await AgentRunRunner(
+                    sink=sink,
+                    request=request,
+                    run_id="run-misnamed-output",
+                    plugin_daemon_http_client=client,
+                ).run()
+
+    asyncio.run(scenario())
+
+    assert model_requested is False
+    assert [event.type for event in sink.events["run-misnamed-output"]] == ["run_started", "run_failed"]
+    assert sink.statuses["run-misnamed-output"] == "failed"
+
+
+def test_runner_rejects_multiple_output_layers_before_model_resolution(monkeypatch: pytest.MonkeyPatch) -> None:
+    model_requested = False
+    request = CreateRunRequest(
+        composition=RunComposition(
+            layers=[
+                RunLayerSpec(
+                    name="prompt",
+                    type="plain.prompt",
+                    config=PromptLayerConfig(prefix="system", user="hello"),
+                ),
+                RunLayerSpec(
+                    name="plugin",
+                    type="dify.plugin",
+                    config=DifyPluginLayerConfig(tenant_id="tenant-1", plugin_id="langgenius/openai"),
+                ),
+                RunLayerSpec(
+                    name=DIFY_AGENT_MODEL_LAYER_ID,
+                    type="dify.plugin.llm",
+                    deps={"plugin": "plugin"},
+                    config=DifyPluginLLMLayerConfig(
+                        model_provider="openai",
+                        model="demo-model",
+                        credentials={"api_key": "secret"},
+                    ),
+                ),
+                RunLayerSpec(
+                    name=DIFY_AGENT_OUTPUT_LAYER_ID,
+                    type=DIFY_OUTPUT_LAYER_TYPE_ID,
+                    config=DifyOutputLayerConfig(
+                        json_schema={
+                            "type": "object",
+                            "properties": {"title": {"type": "string"}},
+                            "required": ["title"],
+                            "additionalProperties": False,
+                        }
+                    ),
+                ),
+                RunLayerSpec(
+                    name="secondary-output",
+                    type=DIFY_OUTPUT_LAYER_TYPE_ID,
+                    config=DifyOutputLayerConfig(
+                        json_schema={
+                            "type": "object",
+                            "properties": {"summary": {"type": "string"}},
+                            "required": ["summary"],
+                            "additionalProperties": False,
+                        }
+                    ),
+                ),
+            ]
+        ),
+        on_exit=LayerExitSignals(),
+    )
+    sink = InMemoryRunEventSink()
+
+    def fake_get_model(_self: DifyPluginLLMLayer, *, http_client: httpx.AsyncClient):
+        del http_client
+        nonlocal model_requested
+        model_requested = True
+        return TestModel(custom_output_text="done")  # pyright: ignore[reportReturnType]
+
+    monkeypatch.setattr(DifyPluginLLMLayer, "get_model", fake_get_model)
+
+    async def scenario() -> None:
+        async with httpx.AsyncClient() as client:
+            with pytest.raises(AgentRunValidationError, match="Only one 'dify.output' layer is supported"):
+                await AgentRunRunner(
+                    sink=sink,
+                    request=request,
+                    run_id="run-duplicate-output",
+                    plugin_daemon_http_client=client,
+                ).run()
+
+    asyncio.run(scenario())
+
+    assert model_requested is False
+    assert [event.type for event in sink.events["run-duplicate-output"]] == ["run_started", "run_failed"]
+    assert sink.statuses["run-duplicate-output"] == "failed"
+
+
+def test_runner_rejects_reserved_output_name_with_wrong_layer_type_before_model_resolution(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    model_requested = False
+
+    def fake_get_model(_self: DifyPluginLLMLayer, *, http_client: httpx.AsyncClient):
+        del http_client
+        nonlocal model_requested
+        model_requested = True
+        return TestModel(custom_output_text="done")  # pyright: ignore[reportReturnType]
+
+    monkeypatch.setattr(DifyPluginLLMLayer, "get_model", fake_get_model)
+    request = CreateRunRequest(
+        composition=RunComposition(
+            layers=[
+                RunLayerSpec(
+                    name="prompt",
+                    type="plain.prompt",
+                    config=PromptLayerConfig(prefix="system", user="hello"),
+                ),
+                RunLayerSpec(
+                    name="plugin",
+                    type="dify.plugin",
+                    config=DifyPluginLayerConfig(tenant_id="tenant-1", plugin_id="langgenius/openai"),
+                ),
+                RunLayerSpec(
+                    name=DIFY_AGENT_MODEL_LAYER_ID,
+                    type="dify.plugin.llm",
+                    deps={"plugin": "plugin"},
+                    config=DifyPluginLLMLayerConfig(
+                        model_provider="openai",
+                        model="demo-model",
+                        credentials={"api_key": "secret"},
+                    ),
+                ),
+                RunLayerSpec(
+                    name=DIFY_AGENT_OUTPUT_LAYER_ID,
+                    type="plain.prompt",
+                    config=PromptLayerConfig(user="not structured output"),
+                ),
+            ]
+        ),
+        on_exit=LayerExitSignals(),
+    )
+    sink = InMemoryRunEventSink()
+
+    async def scenario() -> None:
+        async with httpx.AsyncClient() as client:
+            with pytest.raises(
+                AgentRunValidationError, match=r"Layer 'output' must be DifyOutputLayer, got PromptLayer"
+            ):
+                await AgentRunRunner(
+                    sink=sink,
+                    request=request,
+                    run_id="run-wrong-output-type",
+                    plugin_daemon_http_client=client,
+                ).run()
+
+    asyncio.run(scenario())
+
+    assert model_requested is False
+    assert [event.type for event in sink.events["run-wrong-output-type"]] == ["run_started", "run_failed"]
+    assert sink.statuses["run-wrong-output-type"] == "failed"
+
+
+def test_runner_rejects_misnamed_output_layer_before_provider_checks() -> None:
+    request = CreateRunRequest(
+        composition=RunComposition(
+            layers=[
+                RunLayerSpec(
+                    name="prompt",
+                    type="plain.prompt",
+                    config=PromptLayerConfig(prefix="system", user="hello"),
+                ),
+                RunLayerSpec(
+                    name="structured-output",
+                    type=DIFY_OUTPUT_LAYER_TYPE_ID,
+                    config=DifyOutputLayerConfig(
+                        json_schema={
+                            "type": "object",
+                            "properties": {"title": {"type": "string"}},
+                            "required": ["title"],
+                            "additionalProperties": False,
+                        }
+                    ),
+                ),
+            ]
+        ),
+        on_exit=LayerExitSignals(),
+    )
+    sink = InMemoryRunEventSink()
+
+    async def scenario() -> None:
+        async with httpx.AsyncClient() as client:
+            with pytest.raises(AgentRunValidationError, match="must use reserved layer name 'output'"):
+                await AgentRunRunner(
+                    sink=sink,
+                    request=request,
+                    run_id="run-misnamed-output-before-providers",
+                    plugin_daemon_http_client=client,
+                    layer_providers=(),
+                ).run()
+
+    asyncio.run(scenario())
+
+    assert [event.type for event in sink.events["run-misnamed-output-before-providers"]] == [
+        "run_started",
+        "run_failed",
+    ]
+    assert sink.statuses["run-misnamed-output-before-providers"] == "failed"
+
+
+def test_runner_rejects_unknown_on_exit_layer_id() -> None:
+    request = _request(on_exit=LayerExitSignals(layers={"missing": ExitIntent.DELETE}))
+    sink = InMemoryRunEventSink()
+
+    async def scenario() -> None:
+        async with httpx.AsyncClient() as client:
+            with pytest.raises(AgentRunValidationError, match="missing"):
+                await AgentRunRunner(
+                    sink=sink,
+                    request=request,
+                    run_id="run-unknown-signal",
+                    plugin_daemon_http_client=client,
+                ).run()
+
+    asyncio.run(scenario())
+
+    assert [event.type for event in sink.events["run-unknown-signal"]] == ["run_started", "run_failed"]
+    assert sink.statuses["run-unknown-signal"] == "failed"
+
+
+def test_runner_honors_explicit_empty_layer_providers() -> None:
+    request = _request()
+    sink = InMemoryRunEventSink()
+
+    async def scenario() -> None:
+        async with httpx.AsyncClient() as client:
+            with pytest.raises(AgentRunValidationError, match="plain.prompt"):
+                await AgentRunRunner(
+                    sink=sink,
+                    request=request,
+                    run_id="run-empty-providers",
+                    plugin_daemon_http_client=client,
+                    layer_providers=(),
+                ).run()
+
+    asyncio.run(scenario())
+
+    assert [event.type for event in sink.events["run-empty-providers"]] == ["run_started", "run_failed"]
+    assert sink.statuses["run-empty-providers"] == "failed"
+
+
+def test_runner_fails_empty_user_prompts() -> None:
+    request = _request("")
+    sink = InMemoryRunEventSink()
+
+    async def scenario() -> None:
+        async with httpx.AsyncClient() as client:
+            with pytest.raises(AgentRunValidationError):
+                await AgentRunRunner(
+                    sink=sink,
+                    request=request,
+                    run_id="run-2",
+                    plugin_daemon_http_client=client,
+                ).run()
+
+    asyncio.run(scenario())
+
+    assert [event.type for event in sink.events["run-2"]] == ["run_started", "run_failed"]
+    assert sink.statuses["run-2"] == "failed"
+
+
+def test_runner_fails_blank_string_user_prompt_list() -> None:
+    request = _request(["", "   "])
+    sink = InMemoryRunEventSink()
+
+    async def scenario() -> None:
+        async with httpx.AsyncClient() as client:
+            with pytest.raises(AgentRunValidationError):
+                await AgentRunRunner(
+                    sink=sink,
+                    request=request,
+                    run_id="run-3",
+                    plugin_daemon_http_client=client,
+                ).run()
+
+    asyncio.run(scenario())
+
+    assert [event.type for event in sink.events["run-3"]] == ["run_started", "run_failed"]
+    assert sink.statuses["run-3"] == "failed"
+
+
+def test_runner_requires_llm_layer_id() -> None:
+    request = _request(llm_layer_name="not-llm")
+    sink = InMemoryRunEventSink()
+
+    async def scenario() -> None:
+        async with httpx.AsyncClient() as client:
+            with pytest.raises(AgentRunValidationError, match="llm"):
+                await AgentRunRunner(
+                    sink=sink,
+                    request=request,
+                    run_id="run-4",
+                    plugin_daemon_http_client=client,
+                ).run()
+
+    asyncio.run(scenario())
+
+    assert [event.type for event in sink.events["run-4"]] == ["run_started", "run_failed"]
+    assert sink.statuses["run-4"] == "failed"
+
+
+def test_runner_rejects_closed_session_snapshot_as_validation_error() -> None:
+    request = _request()
+    request.session_snapshot = CompositorSessionSnapshot(
+        layers=[
+            LayerSessionSnapshot(
+                name="prompt",
+                lifecycle_state=LifecycleState.CLOSED,
+                runtime_state={},
+            ),
+            LayerSessionSnapshot(
+                name="plugin",
+                lifecycle_state=LifecycleState.NEW,
+                runtime_state={},
+            ),
+            LayerSessionSnapshot(
+                name=DIFY_AGENT_MODEL_LAYER_ID,
+                lifecycle_state=LifecycleState.NEW,
+                runtime_state={},
+            ),
+        ]
+    )
+    sink = InMemoryRunEventSink()
+
+    async def scenario() -> None:
+        async with httpx.AsyncClient() as client:
+            with pytest.raises(AgentRunValidationError, match="CLOSED snapshots cannot be entered"):
+                await AgentRunRunner(
+                    sink=sink,
+                    request=request,
+                    run_id="run-closed-snapshot",
+                    plugin_daemon_http_client=client,
+                ).run()
+
+    asyncio.run(scenario())
+
+    assert [event.type for event in sink.events["run-closed-snapshot"]] == ["run_started", "run_failed"]
+    assert sink.statuses["run-closed-snapshot"] == "failed"
diff --git a/dify-agent/tests/local/dify_agent/server/test_app.py b/dify-agent/tests/local/dify_agent/server/test_app.py
new file mode 100644
index 0000000000..73bfde69bd
--- /dev/null
+++ b/dify-agent/tests/local/dify_agent/server/test_app.py
@@ -0,0 +1,185 @@
+from __future__ import annotations
+
+from typing import ClassVar
+
+import pytest
+from fastapi.testclient import TestClient
+
+import dify_agent.server.app as app_module
+from dify_agent.runtime.compositor_factory import DifyAgentLayerProvider
+from dify_agent.layers.dify_plugin.configs import DifyPluginLayerConfig
+from dify_agent.layers.dify_plugin.plugin_layer import DifyPluginLayer
+from dify_agent.server.app import create_app, create_plugin_daemon_http_client
+from dify_agent.server.settings import ServerSettings
+from dify_agent.storage.redis_run_store import RedisRunStore
+
+
+class FakeRedis:
+    closed: bool
+
+    def __init__(self) -> None:
+        self.closed = False
+
+    async def aclose(self) -> None:
+        self.closed = True
+
+
+class FakeRunScheduler:
+    created: list["FakeRunScheduler"] = []
+
+    store: object
+    shutdown_grace_seconds: float
+    layer_providers: tuple[DifyAgentLayerProvider, ...]
+    plugin_daemon_http_client: FakePluginDaemonHttpClient
+    shutdown_called: bool
+
+    def __init__(
+        self,
+        *,
+        store: object,
+        plugin_daemon_http_client: FakePluginDaemonHttpClient,
+        shutdown_grace_seconds: float,
+        layer_providers: tuple[DifyAgentLayerProvider, ...],
+    ) -> None:
+        self.store = store
+        self.shutdown_grace_seconds = shutdown_grace_seconds
+        self.layer_providers = layer_providers
+        self.plugin_daemon_http_client = plugin_daemon_http_client
+        self.shutdown_called = False
+        self.created.append(self)
+
+    async def shutdown(self) -> None:
+        self.shutdown_called = True
+
+
+class FakePluginDaemonHttpClient:
+    timeout: object | None
+    limits: object | None
+    trust_env: bool | None
+    is_closed: bool
+
+    def __init__(
+        self,
+        *,
+        timeout: object | None = None,
+        limits: object | None = None,
+        trust_env: bool | None = None,
+    ) -> None:
+        self.timeout = timeout
+        self.limits = limits
+        self.trust_env = trust_env
+        self.is_closed = False
+
+    async def aclose(self) -> None:
+        self.is_closed = True
+
+
+class FakeTimeout:
+    connect: float
+    read: float
+    write: float
+    pool: float
+
+    def __init__(self, *, connect: float, read: float, write: float, pool: float) -> None:
+        self.connect = connect
+        self.read = read
+        self.write = write
+        self.pool = pool
+
+
+class FakeLimits:
+    max_connections: int
+    max_keepalive_connections: int
+    keepalive_expiry: float
+
+    def __init__(self, *, max_connections: int, max_keepalive_connections: int, keepalive_expiry: float) -> None:
+        self.max_connections = max_connections
+        self.max_keepalive_connections = max_keepalive_connections
+        self.keepalive_expiry = keepalive_expiry
+
+
+class FakeRedisModule:
+    fake_redis: ClassVar[FakeRedis | None] = None
+
+    @staticmethod
+    def from_url(_url: str) -> FakeRedis:
+        assert FakeRedisModule.fake_redis is not None
+        return FakeRedisModule.fake_redis
+
+
+class FakeHttpxModule:
+    Timeout: ClassVar[type[FakeTimeout]] = FakeTimeout
+    Limits: ClassVar[type[FakeLimits]] = FakeLimits
+    AsyncClient: ClassVar[type[FakePluginDaemonHttpClient]] = FakePluginDaemonHttpClient
+
+
+def test_create_app_creates_scheduler_and_closes_after_shutdown(monkeypatch: pytest.MonkeyPatch) -> None:
+    fake_redis = FakeRedis()
+    fake_http_client = FakePluginDaemonHttpClient()
+    FakeRunScheduler.created.clear()
+    FakeRedisModule.fake_redis = fake_redis
+    monkeypatch.setattr(app_module, "Redis", FakeRedisModule)
+    monkeypatch.setattr(app_module, "RunScheduler", FakeRunScheduler)
+
+    def fake_create_plugin_daemon_http_client(_settings: ServerSettings) -> FakePluginDaemonHttpClient:
+        return fake_http_client
+
+    monkeypatch.setattr(app_module, "create_plugin_daemon_http_client", fake_create_plugin_daemon_http_client)
+
+    settings = ServerSettings(
+        redis_url="redis://example.invalid/0",
+        redis_prefix="test",
+        shutdown_grace_seconds=5,
+        run_retention_seconds=7,
+        plugin_daemon_url="http://plugin-daemon",
+        plugin_daemon_api_key="daemon-secret",
+        plugin_daemon_connect_timeout=1,
+        plugin_daemon_read_timeout=2,
+        plugin_daemon_write_timeout=3,
+        plugin_daemon_pool_timeout=4,
+        plugin_daemon_max_connections=5,
+        plugin_daemon_max_keepalive_connections=3,
+        plugin_daemon_keepalive_expiry=6,
+    )
+
+    with TestClient(create_app(settings)):
+        assert len(FakeRunScheduler.created) == 1
+        scheduler = FakeRunScheduler.created[0]
+        assert scheduler.shutdown_grace_seconds == 5
+        layer_providers = scheduler.layer_providers
+        assert isinstance(layer_providers, tuple)
+        plugin_provider = next(provider for provider in layer_providers if provider.type_id == "dify.plugin")
+        plugin_layer = plugin_provider.create_layer(DifyPluginLayerConfig(tenant_id="tenant-1", plugin_id="plugin-1"))
+        assert isinstance(plugin_layer, DifyPluginLayer)
+        assert plugin_layer.daemon_url == "http://plugin-daemon"
+        assert plugin_layer.daemon_api_key == "daemon-secret"
+        http_client = scheduler.plugin_daemon_http_client
+        assert http_client is fake_http_client
+        assert http_client.is_closed is False
+        store = scheduler.store
+        assert isinstance(store, RedisRunStore)
+        assert store.run_retention_seconds == 7
+
+    assert FakeRunScheduler.created[0].shutdown_called is True
+    assert FakeRunScheduler.created[0].plugin_daemon_http_client.is_closed is True
+    assert fake_redis.closed is True
+
+
+def test_create_plugin_daemon_http_client_uses_configured_httpx_construction_args(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setattr(app_module, "httpx", FakeHttpxModule)
+
+    client = create_plugin_daemon_http_client(ServerSettings())
+
+    assert isinstance(client, FakePluginDaemonHttpClient)
+    assert isinstance(client.timeout, FakeTimeout)
+    assert client.timeout.connect == 10
+    assert client.timeout.read == 600
+    assert client.timeout.write == 30
+    assert client.timeout.pool == 10
+    assert isinstance(client.limits, FakeLimits)
+    assert client.limits.max_connections == 100
+    assert client.limits.max_keepalive_connections == 20
+    assert client.limits.keepalive_expiry == 30
+    assert client.trust_env is False
diff --git a/dify-agent/tests/local/dify_agent/server/test_runs_routes.py b/dify-agent/tests/local/dify_agent/server/test_runs_routes.py
new file mode 100644
index 0000000000..c173816a51
--- /dev/null
+++ b/dify-agent/tests/local/dify_agent/server/test_runs_routes.py
@@ -0,0 +1,235 @@
+from fastapi.testclient import TestClient
+
+from dify_agent.protocol import DIFY_AGENT_MODEL_LAYER_ID
+from dify_agent.runtime.run_scheduler import RunRequestValidationError, SchedulerStoppingError
+from dify_agent.server.routes.runs import create_runs_router
+from dify_agent.server.schemas import RunRecord
+
+
+class FakeScheduler:
+    async def create_run(self, request: object) -> object:
+        del request
+        raise RunRequestValidationError("run.user_prompts must not be empty")
+
+
+class FakeStore:
+    pass
+
+
+def test_create_run_rejects_effectively_blank_user_prompt_list() -> None:
+    from fastapi import FastAPI
+
+    app = FastAPI()
+    app.include_router(
+        create_runs_router(lambda: FakeStore(), lambda: FakeScheduler())  # pyright: ignore[reportArgumentType]
+    )
+    client = TestClient(app)
+
+    response = client.post(
+        "/runs",
+        json={
+            "composition": {
+                "schema_version": 1,
+                "layers": [{"name": "prompt", "type": "plain.prompt", "config": {"user": ["", "   "]}}],
+            }
+        },
+    )
+
+    assert response.status_code == 422
+    assert response.json()["detail"] == "run.user_prompts must not be empty"
+
+
+def test_create_run_returns_running_from_scheduler() -> None:
+    from fastapi import FastAPI
+
+    class CapturingScheduler:
+        async def create_run(self, request: object) -> RunRecord:
+            del request
+            return RunRecord(run_id="run-1", status="running")
+
+    app = FastAPI()
+    app.include_router(
+        create_runs_router(lambda: FakeStore(), lambda: CapturingScheduler())  # pyright: ignore[reportArgumentType]
+    )
+    client = TestClient(app)
+
+    response = client.post(
+        "/runs",
+        json={
+            "composition": {
+                "schema_version": 1,
+                "layers": [{"name": "prompt", "type": "plain.prompt", "config": {"user": "hello"}}],
+            }
+        },
+    )
+
+    assert response.status_code == 202
+    assert response.json() == {"run_id": "run-1", "status": "running"}
+
+
+def test_create_run_accepts_valid_full_plugin_graph() -> None:
+    from fastapi import FastAPI
+
+    class CapturingScheduler:
+        async def create_run(self, request: object) -> RunRecord:
+            del request
+            return RunRecord(run_id="run-1", status="running")
+
+    app = FastAPI()
+    app.include_router(
+        create_runs_router(lambda: FakeStore(), lambda: CapturingScheduler())  # pyright: ignore[reportArgumentType]
+    )
+    client = TestClient(app)
+
+    response = client.post(
+        "/runs",
+        json={
+            "composition": {
+                "schema_version": 1,
+                "layers": [
+                    {"name": "prompt", "type": "plain.prompt", "config": {"user": "hello"}},
+                    {
+                        "name": "plugin-renamed",
+                        "type": "dify.plugin",
+                        "config": {"tenant_id": "tenant-1", "plugin_id": "langgenius/openai"},
+                    },
+                    {
+                        "name": DIFY_AGENT_MODEL_LAYER_ID,
+                        "type": "dify.plugin.llm",
+                        "deps": {"plugin": "plugin-renamed"},
+                        "config": {
+                            "model_provider": "openai",
+                            "model": "gpt-4o-mini",
+                            "credentials": {"api_key": "secret"},
+                            "model_settings": {"temperature": 0.2},
+                        },
+                    },
+                ],
+            }
+        },
+    )
+
+    assert response.status_code == 202
+    assert response.json() == {"run_id": "run-1", "status": "running"}
+
+
+def test_create_run_rejects_unknown_layer_exit_signal_before_scheduling() -> None:
+    from fastapi import FastAPI
+
+    class UnknownSignalScheduler:
+        async def create_run(self, request: object) -> RunRecord:
+            del request
+            raise RunRequestValidationError("on_exit.layers references unknown layer ids: missing.")
+
+    app = FastAPI()
+    app.include_router(
+        create_runs_router(lambda: FakeStore(), lambda: UnknownSignalScheduler())  # pyright: ignore[reportArgumentType]
+    )
+    client = TestClient(app)
+
+    response = client.post(
+        "/runs",
+        json={
+            "composition": {
+                "schema_version": 1,
+                "layers": [{"name": "prompt", "type": "plain.prompt", "config": {"user": "hello"}}],
+            },
+            "on_exit": {"layers": {"missing": "delete"}},
+        },
+    )
+
+    assert response.status_code == 422
+    assert "missing" in response.json()["detail"]
+
+
+def test_create_run_rejects_closed_session_snapshot_with_422() -> None:
+    from fastapi import FastAPI
+
+    class ClosedSnapshotScheduler:
+        async def create_run(self, request: object) -> RunRecord:
+            del request
+            raise RunRequestValidationError("Layer 'prompt' is closed; CLOSED snapshots cannot be entered.")
+
+    app = FastAPI()
+    app.include_router(
+        create_runs_router(lambda: FakeStore(), lambda: ClosedSnapshotScheduler())  # pyright: ignore[reportArgumentType]
+    )
+    client = TestClient(app)
+
+    response = client.post(
+        "/runs",
+        json={
+            "composition": {
+                "schema_version": 1,
+                "layers": [{"name": "prompt", "type": "plain.prompt", "config": {"user": "hello"}}],
+            },
+            "session_snapshot": {
+                "schema_version": 1,
+                "layers": [
+                    {
+                        "name": "prompt",
+                        "lifecycle_state": "closed",
+                        "runtime_state": {},
+                    }
+                ],
+            },
+        },
+    )
+
+    assert response.status_code == 422
+    assert "CLOSED snapshots cannot be entered" in response.json()["detail"]
+
+
+def test_create_run_returns_503_when_scheduler_is_stopping() -> None:
+    from fastapi import FastAPI
+
+    class StoppingScheduler:
+        async def create_run(self, request: object) -> RunRecord:
+            del request
+            raise SchedulerStoppingError("run scheduler is shutting down")
+
+    app = FastAPI()
+    app.include_router(
+        create_runs_router(lambda: FakeStore(), lambda: StoppingScheduler())  # pyright: ignore[reportArgumentType]
+    )
+    client = TestClient(app)
+
+    response = client.post(
+        "/runs",
+        json={
+            "composition": {
+                "schema_version": 1,
+                "layers": [{"name": "prompt", "type": "plain.prompt", "config": {"user": "hello"}}],
+            }
+        },
+    )
+
+    assert response.status_code == 503
+    assert response.json()["detail"] == "run scheduler is shutting down"
+
+
+def test_create_run_does_not_map_infrastructure_failure_to_422() -> None:
+    from fastapi import FastAPI
+
+    class FailingScheduler:
+        async def create_run(self, request: object) -> RunRecord:
+            del request
+            raise RuntimeError("redis unavailable")
+
+    app = FastAPI()
+    app.include_router(
+        create_runs_router(lambda: FakeStore(), lambda: FailingScheduler())  # pyright: ignore[reportArgumentType]
+    )
+    client = TestClient(app, raise_server_exceptions=False)
+
+    response = client.post(
+        "/runs",
+        json={
+            "composition": {
+                "schema_version": 1,
+                "layers": [{"name": "prompt", "type": "plain.prompt", "config": {"user": "hello"}}],
+            }
+        },
+    )
+
+    assert response.status_code == 500
diff --git a/dify-agent/tests/local/dify_agent/server/test_schemas.py b/dify-agent/tests/local/dify_agent/server/test_schemas.py
new file mode 100644
index 0000000000..e627c9e53f
--- /dev/null
+++ b/dify-agent/tests/local/dify_agent/server/test_schemas.py
@@ -0,0 +1,12 @@
+import dify_agent.server.schemas as server_schemas
+
+
+def test_server_schemas_do_not_reexport_public_protocol_dtos() -> None:
+    assert server_schemas.__all__ == ["RunRecord", "new_run_id"]
+    assert not hasattr(server_schemas, "CreateRunRequest")
+    assert not hasattr(server_schemas, "RunStartedEvent")
+
+
+def test_server_schemas_keep_server_only_run_helpers() -> None:
+    assert isinstance(server_schemas.new_run_id(), str)
+    assert hasattr(server_schemas, "RunRecord")
diff --git a/dify-agent/tests/local/dify_agent/server/test_sse.py b/dify-agent/tests/local/dify_agent/server/test_sse.py
new file mode 100644
index 0000000000..64201a8080
--- /dev/null
+++ b/dify-agent/tests/local/dify_agent/server/test_sse.py
@@ -0,0 +1,12 @@
+from dify_agent.protocol.schemas import RunStartedEvent
+from dify_agent.server.sse import format_sse_event
+
+
+def test_format_sse_event_uses_id_event_and_json_data() -> None:
+    event = RunStartedEvent(id="7-0", run_id="run-1")
+
+    frame = format_sse_event(event)
+
+    assert frame.startswith("id: 7-0\nevent: run_started\ndata: ")
+    assert '"run_id":"run-1"' in frame
+    assert frame.endswith("\n\n")
diff --git a/dify-agent/tests/local/dify_agent/storage/test_redis_run_store.py b/dify-agent/tests/local/dify_agent/storage/test_redis_run_store.py
new file mode 100644
index 0000000000..f835652536
--- /dev/null
+++ b/dify-agent/tests/local/dify_agent/storage/test_redis_run_store.py
@@ -0,0 +1,144 @@
+import asyncio
+from collections.abc import Mapping
+from typing import cast
+
+from pydantic import JsonValue
+
+from agenton.compositor import CompositorSessionSnapshot, LayerSessionSnapshot
+from agenton.layers import LifecycleState
+from dify_agent.protocol.schemas import RunStartedEvent, RunSucceededEvent, RunSucceededEventData
+from dify_agent.storage.redis_run_store import DEFAULT_RUN_RETENTION_SECONDS, RedisRunStore
+
+
+class FakeRedis:
+    commands: list[tuple[object, ...]]
+    values: dict[str, object]
+    streams: dict[str, list[tuple[str, dict[str, object]]]]
+
+    def __init__(self) -> None:
+        self.commands = []
+        self.values = {}
+        self.streams = {}
+
+    async def set(self, key: str, value: object, *, ex: int | None = None) -> None:
+        self.commands.append(("set", key, value, ex))
+        self.values[key] = value
+
+    async def get(self, key: str) -> object | None:
+        self.commands.append(("get", key))
+        return self.values.get(key)
+
+    async def xadd(self, key: str, fields: Mapping[str, object]) -> str:
+        self.commands.append(("xadd", key, dict(fields)))
+        entries = self.streams.setdefault(key, [])
+        event_id = f"{len(entries) + 1}-0"
+        entries.append((event_id, dict(fields)))
+        return event_id
+
+    async def xrange(
+        self, key: str, *, min: str = "-", count: int | None = None
+    ) -> list[tuple[str, dict[str, object]]]:
+        self.commands.append(("xrange", key, min, count))
+        entries = [entry for entry in self.streams.get(key, []) if self._is_after_min(entry[0], min)]
+        if count is not None:
+            return entries[:count]
+        return entries
+
+    async def expire(self, key: str, seconds: int) -> bool:
+        self.commands.append(("expire", key, seconds))
+        return True
+
+    @staticmethod
+    def _is_after_min(event_id: str, min_id: str) -> bool:
+        if min_id == "-":
+            return True
+        is_exclusive = min_id.startswith("(")
+        cursor = min_id[1:] if is_exclusive else min_id
+        event_value = FakeRedis._stream_id_value(event_id)
+        cursor_value = FakeRedis._stream_id_value(cursor)
+        return event_value > cursor_value if is_exclusive else event_value >= cursor_value
+
+    @staticmethod
+    def _stream_id_value(event_id: str) -> tuple[int, int]:
+        timestamp, sequence = event_id.split("-", maxsplit=1)
+        return int(timestamp), int(sequence)
+
+
+def test_create_run_writes_running_record_without_job_queue_and_with_retention() -> None:
+    redis = FakeRedis()
+    store = RedisRunStore(redis, prefix="test")  # pyright: ignore[reportArgumentType]
+
+    record = asyncio.run(store.create_run())
+
+    assert record.status == "running"
+    assert [command[0] for command in redis.commands] == ["set"]
+    assert redis.commands[0][1] == f"test:runs:{record.run_id}:record"
+    assert redis.commands[0][3] == DEFAULT_RUN_RETENTION_SECONDS
+    assert "request" not in str(redis.commands[0][2])
+
+
+def test_update_status_refreshes_record_retention() -> None:
+    redis = FakeRedis()
+    store = RedisRunStore(redis, prefix="test", run_retention_seconds=60)  # pyright: ignore[reportArgumentType]
+    record = asyncio.run(store.create_run())
+    redis.commands.clear()
+
+    asyncio.run(store.update_status(record.run_id, "succeeded"))
+
+    assert [command[0] for command in redis.commands] == ["get", "set"]
+    assert redis.commands[1][1] == f"test:runs:{record.run_id}:record"
+    assert redis.commands[1][3] == 60
+
+
+def test_append_event_serializes_typed_event_without_id_and_expires_run_keys() -> None:
+    redis = FakeRedis()
+    store = RedisRunStore(redis, prefix="test", run_retention_seconds=60)  # pyright: ignore[reportArgumentType]
+
+    event_id = asyncio.run(store.append_event(RunStartedEvent(id="local", run_id="run-1")))
+
+    assert event_id == "1-0"
+    assert redis.commands[0][0] == "xadd"
+    fields = redis.commands[0][2]
+    assert isinstance(fields, dict)
+    assert '"id"' not in str(fields["payload"])
+    assert '"type":"run_started"' in str(fields["payload"])
+    assert redis.commands[1:] == [
+        ("expire", "test:runs:run-1:events", 60),
+        ("expire", "test:runs:run-1:record", 60),
+    ]
+
+
+def test_get_events_round_trips_run_succeeded_output_and_session_snapshot() -> None:
+    redis = FakeRedis()
+    store = RedisRunStore(redis, prefix="test", run_retention_seconds=60)  # pyright: ignore[reportArgumentType]
+    output = cast(JsonValue, {"answer": ["done", 1], "ok": True})
+    session_snapshot = CompositorSessionSnapshot(
+        layers=[
+            LayerSessionSnapshot(
+                name="prompt",
+                lifecycle_state=LifecycleState.SUSPENDED,
+                runtime_state={"resource_id": "abc"},
+            )
+        ]
+    )
+
+    async def scenario() -> tuple[str, RunSucceededEvent]:
+        record = await store.create_run()
+        event_id = await store.append_event(
+            RunSucceededEvent(
+                id="local-only",
+                run_id=record.run_id,
+                data=RunSucceededEventData(output=output, session_snapshot=session_snapshot),
+            )
+        )
+        page = await store.get_events(record.run_id, after="0-0", limit=10)
+        decoded = page.events[0]
+        assert isinstance(decoded, RunSucceededEvent)
+        assert page.next_cursor == event_id
+        return event_id, decoded
+
+    event_id, decoded = asyncio.run(scenario())
+
+    assert decoded.id == event_id
+    assert decoded.data.output == output
+    assert decoded.data.session_snapshot == session_snapshot
diff --git a/dify-agent/tests/local/dify_agent/test_import_boundaries.py b/dify-agent/tests/local/dify_agent/test_import_boundaries.py
new file mode 100644
index 0000000000..7ff55b167b
--- /dev/null
+++ b/dify-agent/tests/local/dify_agent/test_import_boundaries.py
@@ -0,0 +1,114 @@
+from __future__ import annotations
+
+import os
+import subprocess
+import sys
+from pathlib import Path
+
+
+PROJECT_ROOT = Path(__file__).resolve().parents[3]
+
+
+def _run_import_check(*, blocked_imports: list[str], imports: list[str], assertions: list[str]) -> None:
+    python_path = os.pathsep.join([str(PROJECT_ROOT / "src"), os.environ.get("PYTHONPATH", "")])
+    module_aliases = {module_name: module_name.replace(".", "_") for module_name in imports}
+    script = "\n".join(
+        [
+            "import builtins",
+            "import importlib",
+            f"blocked_imports = {blocked_imports!r}",
+            f"imports = {imports!r}",
+            f"module_aliases = {module_aliases!r}",
+            f"assertions = {assertions!r}",
+            "original_import = builtins.__import__",
+            "def guarded_import(name, globals=None, locals=None, fromlist=(), level=0):",
+            "    for blocked in blocked_imports:",
+            "        if name == blocked or name.startswith(f'{blocked}.'):",
+            "            raise ModuleNotFoundError(f'blocked import: {name}')",
+            "    return original_import(name, globals, locals, fromlist, level)",
+            "builtins.__import__ = guarded_import",
+            "namespace = {}",
+            "for module_name in imports:",
+            "    namespace[module_aliases[module_name]] = importlib.import_module(module_name)",
+            "for statement in assertions:",
+            "    exec(statement, namespace)",
+        ]
+    )
+    env = os.environ.copy()
+    env["PYTHONPATH"] = python_path
+
+    result = subprocess.run(
+        [sys.executable, "-c", script],
+        cwd=PROJECT_ROOT,
+        env=env,
+        text=True,
+        capture_output=True,
+        check=False,
+    )
+
+    assert result.returncode == 0, result.stderr
+
+
+def test_dify_agent_root_import_is_client_safe() -> None:
+    _run_import_check(
+        blocked_imports=[
+            "anthropic",
+            "dify_agent.adapters.llm",
+            "dify_agent.runtime",
+            "dify_agent.server",
+            "fastapi",
+            "google",
+            "graphon",
+            "openai",
+            "pydantic_settings",
+            "redis",
+        ],
+        imports=["dify_agent"],
+        assertions=[
+            "from dify_agent import Client",
+            "assert dify_agent.__all__ == ['Client']",
+            "assert dify_agent.Client is Client",
+            "assert not hasattr(dify_agent, 'DifyLLMAdapterModel')",
+            "assert not hasattr(dify_agent, 'DifyPluginDaemonProvider')",
+        ],
+    )
+
+
+def test_protocol_and_dify_plugin_exports_do_not_import_server_only_modules() -> None:
+    _run_import_check(
+        blocked_imports=[
+            "anthropic",
+            "dify_agent.adapters.llm",
+            "dify_agent.layers.dify_plugin.llm_layer",
+            "dify_agent.layers.dify_plugin.plugin_layer",
+            "dify_agent.layers.output.output_layer",
+            "dify_agent.runtime",
+            "dify_agent.server",
+            "fastapi",
+            "google",
+            "graphon",
+            "openai",
+            "pydantic_settings",
+            "redis",
+        ],
+        imports=["dify_agent.protocol", "dify_agent.layers.dify_plugin", "dify_agent.layers.output"],
+        assertions=[
+            "assert hasattr(dify_agent_protocol, 'PydanticAIStreamRunEvent')",
+            "assert dify_agent_layers_dify_plugin.__all__ == ['DIFY_PLUGIN_LAYER_TYPE_ID', 'DIFY_PLUGIN_LLM_LAYER_TYPE_ID', 'DifyPluginCredentialValue', 'DifyPluginLLMLayerConfig', 'DifyPluginLayerConfig']",
+            "assert dify_agent_layers_output.__all__ == ['DIFY_OUTPUT_LAYER_TYPE_ID', 'DifyOutputLayerConfig']",
+        ],
+    )
+
+
+def test_agenton_collection_roots_do_not_eagerly_import_pydantic_ai_implementations() -> None:
+    _run_import_check(
+        blocked_imports=[
+            "agenton_collections.layers.pydantic_ai",
+            "agenton_collections.transformers.pydantic_ai",
+        ],
+        imports=["agenton_collections", "agenton_collections.transformers"],
+        assertions=[
+            "assert 'PydanticAIBridgeLayer' not in agenton_collections.__all__",
+            "assert agenton_collections_transformers.__all__ == []",
+        ],
+    )
diff --git a/dify-agent/tests/local/examples/test_agenton_examples.py b/dify-agent/tests/local/examples/test_agenton_examples.py
new file mode 100644
index 0000000000..545f5e6ef5
--- /dev/null
+++ b/dify-agent/tests/local/examples/test_agenton_examples.py
@@ -0,0 +1,59 @@
+import os
+import subprocess
+import sys
+from pathlib import Path
+
+
+PROJECT_ROOT = Path(__file__).resolve().parents[3]
+
+
+def _run_example(path: str) -> subprocess.CompletedProcess[str]:
+    env = os.environ.copy()
+    _ = env.pop("OPENAI_API_KEY", None)
+    python_path = os.pathsep.join(
+        [
+            str(PROJECT_ROOT / "src"),
+            str(PROJECT_ROOT / "examples" / "agenton"),
+            str(PROJECT_ROOT / "examples" / "dify_agent"),
+            env.get("PYTHONPATH", ""),
+        ]
+    )
+    env["PYTHONPATH"] = python_path
+
+    return subprocess.run(
+        [sys.executable, "-m", path],
+        cwd=PROJECT_ROOT,
+        env=env,
+        text=True,
+        capture_output=True,
+        check=False,
+    )
+
+
+def test_agenton_basics_example_smoke() -> None:
+    result = _run_example("agenton_examples.basics")
+
+    assert result.returncode == 0, result.stderr
+    assert "Prompts:" in result.stdout
+    assert "User prompts:" in result.stdout
+    assert "Tools:" in result.stdout
+    assert "Lifecycle: ['create', 'suspend', 'resume', 'delete']" in result.stdout
+
+
+def test_agenton_pydantic_ai_example_smoke() -> None:
+    result = _run_example("agenton_examples.pydantic_ai_bridge")
+
+    assert result.returncode == 0, result.stderr
+    assert "SystemPromptPart: Prefer concrete details." in result.stdout
+    assert "UserPromptPart: [\"Use the tools for 'layer composition'.\"]" in result.stdout
+    assert "ToolCallPart: count_words(" in result.stdout
+    assert "ToolCallPart: write_tagline(" in result.stdout
+    assert "TextPart:" in result.stdout
+
+
+def test_agenton_session_snapshot_example_smoke() -> None:
+    result = _run_example("agenton_examples.session_snapshot")
+
+    assert result.returncode == 0, result.stderr
+    assert "Snapshot:" in result.stdout
+    assert "Rehydrated external handle: restored:demo-connection" in result.stdout
diff --git a/dify-agent/tests/local/examples/test_dify_agent_examples.py b/dify-agent/tests/local/examples/test_dify_agent_examples.py
new file mode 100644
index 0000000000..d0530181c7
--- /dev/null
+++ b/dify-agent/tests/local/examples/test_dify_agent_examples.py
@@ -0,0 +1,21 @@
+from __future__ import annotations
+
+import importlib
+from pathlib import Path
+
+import pytest
+
+
+PROJECT_ROOT = Path(__file__).resolve().parents[3]
+
+
+def test_dify_agent_examples_are_importable_from_repo_checkout(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.syspath_prepend(str(PROJECT_ROOT / "examples" / "dify_agent"))
+
+    for module_name in [
+        "dify_agent_examples.run_pydantic_ai_agent",
+        "dify_agent_examples.run_server_consumer",
+        "dify_agent_examples.run_server_sse_consumer",
+        "dify_agent_examples.run_server_sync_client",
+    ]:
+        importlib.import_module(module_name)
diff --git a/dify-agent/tests/local/test_packaging.py b/dify-agent/tests/local/test_packaging.py
new file mode 100644
index 0000000000..a1a7b024e0
--- /dev/null
+++ b/dify-agent/tests/local/test_packaging.py
@@ -0,0 +1,45 @@
+from __future__ import annotations
+
+import tomllib
+from pathlib import Path
+
+
+PROJECT_ROOT = Path(__file__).resolve().parents[2]
+
+CLIENT_SHARED_DTO_DEPENDENCIES = {
+    "httpx>=0.28.1",
+    "pydantic>=2.13.3",
+    "pydantic-ai-slim>=1.85.1",
+    "typing-extensions>=4.12.2",
+}
+
+SERVER_RUNTIME_DEPENDENCIES = {
+    "fastapi>=0.136.0",
+    "graphon~=0.2.2",
+    "jsonschema>=4.23.0",
+    "pydantic-ai-slim[anthropic,google,openai]>=1.85.1",
+    "pydantic-settings>=2.12.0",
+    "redis>=5",
+    "uvicorn[standard]>=0.38.0",
+}
+
+
+def _read_pyproject():
+    return tomllib.loads((PROJECT_ROOT / "pyproject.toml").read_text(encoding="utf-8"))
+
+
+def test_project_dependencies_split_client_and_server_requirements() -> None:
+    pyproject = _read_pyproject()
+    project = pyproject["project"]
+
+    assert set(project["dependencies"]) == CLIENT_SHARED_DTO_DEPENDENCIES
+    assert set(project["optional-dependencies"]["server"]) == SERVER_RUNTIME_DEPENDENCIES
+
+
+def test_default_package_discovery_excludes_example_packages() -> None:
+    pyproject = _read_pyproject()
+    find_config = pyproject["tool"]["setuptools"]["packages"]["find"]
+
+    assert find_config["where"] == ["src"]
+    assert "agenton_examples*" not in find_config["include"]
+    assert "dify_agent_examples*" not in find_config["include"]
diff --git a/dify-agent/uv.lock b/dify-agent/uv.lock
new file mode 100644
index 0000000000..d3b4b09ba0
--- /dev/null
+++ b/dify-agent/uv.lock
@@ -0,0 +1,3716 @@
+version = 1
+revision = 3
+requires-python = ">=3.12"
+resolution-markers = [
+    "python_full_version >= '3.14' and sys_platform == 'win32'",
+    "python_full_version >= '3.14' and sys_platform == 'emscripten'",
+    "python_full_version >= '3.14' and sys_platform != 'emscripten' and sys_platform != 'win32'",
+    "python_full_version < '3.14' and sys_platform == 'win32'",
+    "python_full_version < '3.14' and sys_platform == 'emscripten'",
+    "python_full_version < '3.14' and sys_platform != 'emscripten' and sys_platform != 'win32'",
+]
+
+[[package]]
+name = "aiofiles"
+version = "25.1.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/41/c3/534eac40372d8ee36ef40df62ec129bee4fdb5ad9706e58a29be53b2c970/aiofiles-25.1.0.tar.gz", hash = "sha256:a8d728f0a29de45dc521f18f07297428d56992a742f0cd2701ba86e44d23d5b2", size = 46354, upload-time = "2025-10-09T20:51:04.358Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/bc/8a/340a1555ae33d7354dbca4faa54948d76d89a27ceef032c8c3bc661d003e/aiofiles-25.1.0-py3-none-any.whl", hash = "sha256:abe311e527c862958650f9438e859c1fa7568a141b22abcd015e120e86a85695", size = 14668, upload-time = "2025-10-09T20:51:03.174Z" },
+]
+
+[[package]]
+name = "annotated-doc"
+version = "0.0.4"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/57/ba/046ceea27344560984e26a590f90bc7f4a75b06701f653222458922b558c/annotated_doc-0.0.4.tar.gz", hash = "sha256:fbcda96e87e9c92ad167c2e53839e57503ecfda18804ea28102353485033faa4", size = 7288, upload-time = "2025-11-10T22:07:42.062Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/1e/d3/26bf1008eb3d2daa8ef4cacc7f3bfdc11818d111f7e2d0201bc6e3b49d45/annotated_doc-0.0.4-py3-none-any.whl", hash = "sha256:571ac1dc6991c450b25a9c2d84a3705e2ae7a53467b5d111c24fa8baabbed320", size = 5303, upload-time = "2025-11-10T22:07:40.673Z" },
+]
+
+[[package]]
+name = "annotated-types"
+version = "0.7.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/ee/67/531ea369ba64dcff5ec9c3402f9f51bf748cec26dde048a2f973a4eea7f5/annotated_types-0.7.0.tar.gz", hash = "sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89", size = 16081, upload-time = "2024-05-20T21:33:25.928Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/78/b6/6307fbef88d9b5ee7421e68d78a9f162e0da4900bc5f5793f6d3d0e34fb8/annotated_types-0.7.0-py3-none-any.whl", hash = "sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53", size = 13643, upload-time = "2024-05-20T21:33:24.1Z" },
+]
+
+[[package]]
+name = "anthropic"
+version = "0.96.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "anyio" },
+    { name = "distro" },
+    { name = "docstring-parser" },
+    { name = "httpx" },
+    { name = "jiter" },
+    { name = "pydantic" },
+    { name = "sniffio" },
+    { name = "typing-extensions" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/b9/7e/672f533dee813028d2c699bfd2a7f52c9118d7353680d9aa44b9e23f717f/anthropic-0.96.0.tar.gz", hash = "sha256:9de947b737f39452f68aa520f1c2239d44119c9b73b0fb6d4e6ca80f00279ee6", size = 658210, upload-time = "2026-04-16T14:28:02.846Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/48/5a/72f33204064b6e87601a71a6baf8d855769f8a0c1eaae8d06a1094872371/anthropic-0.96.0-py3-none-any.whl", hash = "sha256:9a6e335a354602a521cd9e777e92bfd46ba6e115bf9bbfe6135311e8fb2015b2", size = 635930, upload-time = "2026-04-16T14:28:01.436Z" },
+]
+
+[[package]]
+name = "anyio"
+version = "4.13.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "idna" },
+    { name = "typing-extensions", marker = "python_full_version < '3.13'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/19/14/2c5dd9f512b66549ae92767a9c7b330ae88e1932ca57876909410251fe13/anyio-4.13.0.tar.gz", hash = "sha256:334b70e641fd2221c1505b3890c69882fe4a2df910cba14d97019b90b24439dc", size = 231622, upload-time = "2026-03-24T12:59:09.671Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/da/42/e921fccf5015463e32a3cf6ee7f980a6ed0f395ceeaa45060b61d86486c2/anyio-4.13.0-py3-none-any.whl", hash = "sha256:08b310f9e24a9594186fd75b4f73f4a4152069e3853f1ed8bfbf58369f4ad708", size = 114353, upload-time = "2026-03-24T12:59:08.246Z" },
+]
+
+[[package]]
+name = "attrs"
+version = "26.1.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/9a/8e/82a0fe20a541c03148528be8cac2408564a6c9a0cc7e9171802bc1d26985/attrs-26.1.0.tar.gz", hash = "sha256:d03ceb89cb322a8fd706d4fb91940737b6642aa36998fe130a9bc96c985eff32", size = 952055, upload-time = "2026-03-19T14:22:25.026Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/64/b4/17d4b0b2a2dc85a6df63d1157e028ed19f90d4cd97c36717afef2bc2f395/attrs-26.1.0-py3-none-any.whl", hash = "sha256:c647aa4a12dfbad9333ca4e71fe62ddc36f4e63b2d260a37a8b83d2f043ac309", size = 67548, upload-time = "2026-03-19T14:22:23.645Z" },
+]
+
+[[package]]
+name = "babel"
+version = "2.18.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/7d/b2/51899539b6ceeeb420d40ed3cd4b7a40519404f9baf3d4ac99dc413a834b/babel-2.18.0.tar.gz", hash = "sha256:b80b99a14bd085fcacfa15c9165f651fbb3406e66cc603abf11c5750937c992d", size = 9959554, upload-time = "2026-02-01T12:30:56.078Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/77/f5/21d2de20e8b8b0408f0681956ca2c69f1320a3848ac50e6e7f39c6159675/babel-2.18.0-py3-none-any.whl", hash = "sha256:e2b422b277c2b9a9630c1d7903c2a00d0830c409c59ac8cae9081c92f1aeba35", size = 10196845, upload-time = "2026-02-01T12:30:53.445Z" },
+]
+
+[[package]]
+name = "backrefs"
+version = "7.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/5e/a7/a7dd63622beef68cc0d3c3c36d472e143dd95443d5ebf14cd1a5b4dfbf11/backrefs-7.0.tar.gz", hash = "sha256:4989bb9e1e99eb23647c7160ed51fb21d0b41b5d200f2d3017da41e023097e82", size = 7012453, upload-time = "2026-04-28T16:28:04.215Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/d4/39/39a31d7eae729ea14ed10c3ccef79371197177b9355a86cb3525709e8502/backrefs-7.0-py310-none-any.whl", hash = "sha256:b57cd227ea556b0aed3dc9b8da4628db4eabc0402c6d7fcfc69283a93955f7e9", size = 380824, upload-time = "2026-04-28T16:27:55.647Z" },
+    { url = "https://files.pythonhosted.org/packages/c9/b5/9302644225ba7dfa934a2ff2b9c7bb85701313a90dddb3dfaf693fa5bae2/backrefs-7.0-py311-none-any.whl", hash = "sha256:a0fa7360c63509e9e077e174ef4e6d3c21c8db94189b9d957289ae6d794b9475", size = 392626, upload-time = "2026-04-28T16:27:57.42Z" },
+    { url = "https://files.pythonhosted.org/packages/36/da/87912ddec6e06feffbaa3d7aa18fc6352bee2e8f1fee185d7d1690f8f4e8/backrefs-7.0-py312-none-any.whl", hash = "sha256:ca42ce6a49ace3d75684dfa9937f3373902a63284ecb385ce36d15e5dcb41c12", size = 398537, upload-time = "2026-04-28T16:27:58.913Z" },
+    { url = "https://files.pythonhosted.org/packages/00/bb/90ba423612b6aa0adccc6b1874bcd4a9b44b660c0c16f346611e00f64ac3/backrefs-7.0-py313-none-any.whl", hash = "sha256:f2c52955d631b9e1ac4cd56209f0a3a946d592b98e7790e77699339ae01c102a", size = 400491, upload-time = "2026-04-28T16:28:00.928Z" },
+    { url = "https://files.pythonhosted.org/packages/3e/5c/fb93d3092640a24dfb7bd7727a24016d7c01774ca013e60efd3f683c8002/backrefs-7.0-py314-none-any.whl", hash = "sha256:a6448b28180e3ca01134c9cf09dcebafad8531072e09903c5451748a05f24bc9", size = 412349, upload-time = "2026-04-28T16:28:02.412Z" },
+]
+
+[[package]]
+name = "basedpyright"
+version = "1.39.3"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "nodejs-wheel-binaries" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/04/19/5a5b9b9197973da732638957be3a65cf514d2f5a4964eeedbf33b6c65bbd/basedpyright-1.39.3.tar.gz", hash = "sha256:2f794e6b5f4260fb89f614ca6cd23c6f305373bb6b50c4ed7794ff2ae647fb14", size = 25503187, upload-time = "2026-04-20T22:14:47.424Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/54/5c/f950c1239ad26f3bb453e665428a2cf1893995de725a5eb0b64a2520b366/basedpyright-1.39.3-py3-none-any.whl", hash = "sha256:aba760dc83307727554f936d6b4381caa14482f30dbc2173167710e217c1f7ab", size = 12419181, upload-time = "2026-04-20T22:14:51.975Z" },
+]
+
+[[package]]
+name = "beautifulsoup4"
+version = "4.14.3"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "soupsieve" },
+    { name = "typing-extensions" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/c3/b0/1c6a16426d389813b48d95e26898aff79abbde42ad353958ad95cc8c9b21/beautifulsoup4-4.14.3.tar.gz", hash = "sha256:6292b1c5186d356bba669ef9f7f051757099565ad9ada5dd630bd9de5fa7fb86", size = 627737, upload-time = "2025-11-30T15:08:26.084Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/1a/39/47f9197bdd44df24d67ac8893641e16f386c984a0619ef2ee4c51fbbc019/beautifulsoup4-4.14.3-py3-none-any.whl", hash = "sha256:0918bfe44902e6ad8d57732ba310582e98da931428d231a5ecb9e7c703a735bb", size = 107721, upload-time = "2025-11-30T15:08:24.087Z" },
+]
+
+[[package]]
+name = "black"
+version = "26.3.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "click" },
+    { name = "mypy-extensions" },
+    { name = "packaging" },
+    { name = "pathspec" },
+    { name = "platformdirs" },
+    { name = "pytokens" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/e1/c5/61175d618685d42b005847464b8fb4743a67b1b8fdb75e50e5a96c31a27a/black-26.3.1.tar.gz", hash = "sha256:2c50f5063a9641c7eed7795014ba37b0f5fa227f3d408b968936e24bc0566b07", size = 666155, upload-time = "2026-03-12T03:36:03.593Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/dc/f8/da5eae4fc75e78e6dceb60624e1b9662ab00d6b452996046dfa9b8a6025b/black-26.3.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:b5e6f89631eb88a7302d416594a32faeee9fb8fb848290da9d0a5f2903519fc1", size = 1895920, upload-time = "2026-03-12T03:40:13.921Z" },
+    { url = "https://files.pythonhosted.org/packages/2c/9f/04e6f26534da2e1629b2b48255c264cabf5eedc5141d04516d9d68a24111/black-26.3.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:41cd2012d35b47d589cb8a16faf8a32ef7a336f56356babd9fcf70939ad1897f", size = 1718499, upload-time = "2026-03-12T03:40:15.239Z" },
+    { url = "https://files.pythonhosted.org/packages/04/91/a5935b2a63e31b331060c4a9fdb5a6c725840858c599032a6f3aac94055f/black-26.3.1-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0f76ff19ec5297dd8e66eb64deda23631e642c9393ab592826fd4bdc97a4bce7", size = 1794994, upload-time = "2026-03-12T03:40:17.124Z" },
+    { url = "https://files.pythonhosted.org/packages/e7/0a/86e462cdd311a3c2a8ece708d22aba17d0b2a0d5348ca34b40cdcbea512e/black-26.3.1-cp312-cp312-win_amd64.whl", hash = "sha256:ddb113db38838eb9f043623ba274cfaf7d51d5b0c22ecb30afe58b1bb8322983", size = 1420867, upload-time = "2026-03-12T03:40:18.83Z" },
+    { url = "https://files.pythonhosted.org/packages/5b/e5/22515a19cb7eaee3440325a6b0d95d2c0e88dd180cb011b12ae488e031d1/black-26.3.1-cp312-cp312-win_arm64.whl", hash = "sha256:dfdd51fc3e64ea4f35873d1b3fb25326773d55d2329ff8449139ebaad7357efb", size = 1230124, upload-time = "2026-03-12T03:40:20.425Z" },
+    { url = "https://files.pythonhosted.org/packages/f5/77/5728052a3c0450c53d9bb3945c4c46b91baa62b2cafab6801411b6271e45/black-26.3.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:855822d90f884905362f602880ed8b5df1b7e3ee7d0db2502d4388a954cc8c54", size = 1895034, upload-time = "2026-03-12T03:40:21.813Z" },
+    { url = "https://files.pythonhosted.org/packages/52/73/7cae55fdfdfbe9d19e9a8d25d145018965fe2079fa908101c3733b0c55a0/black-26.3.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:8a33d657f3276328ce00e4d37fe70361e1ec7614da5d7b6e78de5426cb56332f", size = 1718503, upload-time = "2026-03-12T03:40:23.666Z" },
+    { url = "https://files.pythonhosted.org/packages/e1/87/af89ad449e8254fdbc74654e6467e3c9381b61472cc532ee350d28cfdafb/black-26.3.1-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f1cd08e99d2f9317292a311dfe578fd2a24b15dbce97792f9c4d752275c1fa56", size = 1793557, upload-time = "2026-03-12T03:40:25.497Z" },
+    { url = "https://files.pythonhosted.org/packages/43/10/d6c06a791d8124b843bf325ab4ac7d2f5b98731dff84d6064eafd687ded1/black-26.3.1-cp313-cp313-win_amd64.whl", hash = "sha256:c7e72339f841b5a237ff14f7d3880ddd0fc7f98a1199e8c4327f9a4f478c1839", size = 1422766, upload-time = "2026-03-12T03:40:27.14Z" },
+    { url = "https://files.pythonhosted.org/packages/59/4f/40a582c015f2d841ac24fed6390bd68f0fc896069ff3a886317959c9daf8/black-26.3.1-cp313-cp313-win_arm64.whl", hash = "sha256:afc622538b430aa4c8c853f7f63bc582b3b8030fd8c80b70fb5fa5b834e575c2", size = 1232140, upload-time = "2026-03-12T03:40:28.882Z" },
+    { url = "https://files.pythonhosted.org/packages/d5/da/e36e27c9cebc1311b7579210df6f1c86e50f2d7143ae4fcf8a5017dc8809/black-26.3.1-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:2d6bfaf7fd0993b420bed691f20f9492d53ce9a2bcccea4b797d34e947318a78", size = 1889234, upload-time = "2026-03-12T03:40:30.964Z" },
+    { url = "https://files.pythonhosted.org/packages/0e/7b/9871acf393f64a5fa33668c19350ca87177b181f44bb3d0c33b2d534f22c/black-26.3.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:f89f2ab047c76a9c03f78d0d66ca519e389519902fa27e7a91117ef7611c0568", size = 1720522, upload-time = "2026-03-12T03:40:32.346Z" },
+    { url = "https://files.pythonhosted.org/packages/03/87/e766c7f2e90c07fb7586cc787c9ae6462b1eedab390191f2b7fc7f6170a9/black-26.3.1-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b07fc0dab849d24a80a29cfab8d8a19187d1c4685d8a5e6385a5ce323c1f015f", size = 1787824, upload-time = "2026-03-12T03:40:33.636Z" },
+    { url = "https://files.pythonhosted.org/packages/ac/94/2424338fb2d1875e9e83eed4c8e9c67f6905ec25afd826a911aea2b02535/black-26.3.1-cp314-cp314-win_amd64.whl", hash = "sha256:0126ae5b7c09957da2bdbd91a9ba1207453feada9e9fe51992848658c6c8e01c", size = 1445855, upload-time = "2026-03-12T03:40:35.442Z" },
+    { url = "https://files.pythonhosted.org/packages/86/43/0c3338bd928afb8ee7471f1a4eec3bdbe2245ccb4a646092a222e8669840/black-26.3.1-cp314-cp314-win_arm64.whl", hash = "sha256:92c0ec1f2cc149551a2b7b47efc32c866406b6891b0ee4625e95967c8f4acfb1", size = 1258109, upload-time = "2026-03-12T03:40:36.832Z" },
+    { url = "https://files.pythonhosted.org/packages/8e/0d/52d98722666d6fc6c3dd4c76df339501d6efd40e0ff95e6186a7b7f0befd/black-26.3.1-py3-none-any.whl", hash = "sha256:2bd5aa94fc267d38bb21a70d7410a89f1a1d318841855f698746f8e7f51acd1b", size = 207542, upload-time = "2026-03-12T03:36:01.668Z" },
+]
+
+[[package]]
+name = "blis"
+version = "1.3.3"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "numpy" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/d0/d0/d8cc8c9a4488a787e7fa430f6055e5bd1ddb22c340a751d9e901b82e2efe/blis-1.3.3.tar.gz", hash = "sha256:034d4560ff3cc43e8aa37e188451b0440e3261d989bb8a42ceee865607715ecd", size = 2644873, upload-time = "2025-11-17T12:28:30.511Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/16/d1/429cf0cf693d4c7dc2efed969bd474e315aab636e4a95f66c4ed7264912d/blis-1.3.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:2a1c74e100665f8e918ebdbae2794576adf1f691680b5cdb8b29578432f623ef", size = 6929663, upload-time = "2025-11-17T12:27:44.482Z" },
+    { url = "https://files.pythonhosted.org/packages/11/69/363c8df8d98b3cc97be19aad6aabb2c9c53f372490d79316bdee92d476e7/blis-1.3.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:3f6c595185176ce021316263e1a1d636a3425b6c48366c1fd712d08d0b71849a", size = 1230939, upload-time = "2025-11-17T12:27:46.19Z" },
+    { url = "https://files.pythonhosted.org/packages/96/2a/fbf65d906d823d839076c5150a6f8eb5ecbc5f9135e0b6510609bda1e6b7/blis-1.3.3-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:d734b19fba0be7944f272dfa7b443b37c61f9476d9ab054a9ac53555ceadd2e0", size = 2818835, upload-time = "2025-11-17T12:27:48.167Z" },
+    { url = "https://files.pythonhosted.org/packages/d5/ad/58deaa3ad856dd3cc96493e40ffd2ed043d18d4d304f85a65cde1ccbf644/blis-1.3.3-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:1ef6d6e2b599a3a2788eb6d9b443533961265aa4ec49d574ed4bb846e548dcdb", size = 11366550, upload-time = "2025-11-17T12:27:49.958Z" },
+    { url = "https://files.pythonhosted.org/packages/78/82/816a7adfe1f7acc8151f01ec86ef64467a3c833932d8f19f8e06613b8a4e/blis-1.3.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:8c888438ae99c500422d50698e3028b65caa8ebb44e24204d87fda2df64058f7", size = 3023686, upload-time = "2025-11-17T12:27:52.062Z" },
+    { url = "https://files.pythonhosted.org/packages/1e/e2/0e93b865f648b5519360846669a35f28ee8f4e1d93d054f6850d8afbabde/blis-1.3.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:8177879fd3590b5eecdd377f9deafb5dc8af6d684f065bd01553302fb3fcf9a7", size = 14250939, upload-time = "2025-11-17T12:27:53.847Z" },
+    { url = "https://files.pythonhosted.org/packages/20/07/fb43edc2ff0a6a367e4a94fc39eb3b85aa1e55e24cc857af2db145ce9f0d/blis-1.3.3-cp312-cp312-win_amd64.whl", hash = "sha256:f20f7ad69aaffd1ce14fe77de557b6df9b61e0c9e582f75a843715d836b5c8af", size = 6192759, upload-time = "2025-11-17T12:27:56.176Z" },
+    { url = "https://files.pythonhosted.org/packages/e6/f7/d26e62d9be3d70473a63e0a5d30bae49c2fe138bebac224adddcdef8a7ce/blis-1.3.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:1e647341f958421a86b028a2efe16ce19c67dba2a05f79e8f7e80b1ff45328aa", size = 6928322, upload-time = "2025-11-17T12:27:57.965Z" },
+    { url = "https://files.pythonhosted.org/packages/4a/78/750d12da388f714958eb2f2fd177652323bbe7ec528365c37129edd6eb84/blis-1.3.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:d563160f874abb78a57e346f07312c5323f7ad67b6370052b6b17087ef234a8e", size = 1229635, upload-time = "2025-11-17T12:28:00.118Z" },
+    { url = "https://files.pythonhosted.org/packages/e8/36/eac4199c5b200a5f3e93cad197da8d26d909f218eb444c4f552647c95240/blis-1.3.3-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:30b8a5b90cb6cb81d1ada9ae05aa55fb8e70d9a0ae9db40d2401bb9c1c8f14c4", size = 2815650, upload-time = "2025-11-17T12:28:02.544Z" },
+    { url = "https://files.pythonhosted.org/packages/bf/51/472e7b36a6bedb5242a9757e7486f702c3619eff76e256735d0c8b1679c6/blis-1.3.3-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:e9f5c53b277f6ac5b3ca30bc12ebab7ea16c8f8c36b14428abb56924213dc127", size = 11359008, upload-time = "2025-11-17T12:28:04.589Z" },
+    { url = "https://files.pythonhosted.org/packages/84/da/d0dfb6d6e6321ae44df0321384c32c322bd07b15740d7422727a1a49fc5d/blis-1.3.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:6297e7616c158b305c9a8a4e47ca5fc9b0785194dd96c903b1a1591a7ca21ddf", size = 3011959, upload-time = "2025-11-17T12:28:06.862Z" },
+    { url = "https://files.pythonhosted.org/packages/20/c5/2b0b5e556fa0364ed671051ea078a6d6d7b979b1cfef78d64ad3ca5f0c7f/blis-1.3.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:3f966ca74f89f8a33e568b9a1d71992fc9a0d29a423e047f0a212643e21b5458", size = 14232456, upload-time = "2025-11-17T12:28:08.779Z" },
+    { url = "https://files.pythonhosted.org/packages/31/07/4cdc81a47bf862c0b06d91f1bc6782064e8b69ac9b5d4ff51d97e4ff03da/blis-1.3.3-cp313-cp313-win_amd64.whl", hash = "sha256:7a0fc4b237a3a453bdc3c7ab48d91439fcd2d013b665c46948d9eaf9c3e45a97", size = 6192624, upload-time = "2025-11-17T12:28:14.197Z" },
+    { url = "https://files.pythonhosted.org/packages/5f/8a/80f7c68fbc24a76fc9c18522c46d6d69329c320abb18e26a707a5d874083/blis-1.3.3-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:c3e33cfbf22a418373766816343fcfcd0556012aa3ffdf562c29cddec448a415", size = 6934081, upload-time = "2025-11-17T12:28:16.436Z" },
+    { url = "https://files.pythonhosted.org/packages/e5/52/d1aa3a51a7fc299b0c89dcaa971922714f50b1202769eebbdaadd1b5cff7/blis-1.3.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:6f165930e8d3a85c606d2003211497e28d528c7416fbfeafb6b15600963f7c9b", size = 1231486, upload-time = "2025-11-17T12:28:18.008Z" },
+    { url = "https://files.pythonhosted.org/packages/99/4f/badc7bd7f74861b26c10123bba7b9d16f99cd9535ad0128780360713820f/blis-1.3.3-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:878d4d96d8f2c7a2459024f013f2e4e5f46d708b23437dae970d998e7bff14a0", size = 2814944, upload-time = "2025-11-17T12:28:19.654Z" },
+    { url = "https://files.pythonhosted.org/packages/72/a6/f62a3bd814ca19ec7e29ac889fd354adea1217df3183e10217de51e2eb8b/blis-1.3.3-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:f36c0ca84a05ee5d3dbaa38056c4423c1fc29948b17a7923dd2fed8967375d74", size = 11345825, upload-time = "2025-11-17T12:28:21.354Z" },
+    { url = "https://files.pythonhosted.org/packages/d4/6c/671af79ee42bc4c968cae35c091ac89e8721c795bfa4639100670dc59139/blis-1.3.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:e5a662c48cd4aad5dae1a950345df23957524f071315837a4c6feb7d3b288990", size = 3008771, upload-time = "2025-11-17T12:28:23.637Z" },
+    { url = "https://files.pythonhosted.org/packages/be/92/7cd7f8490da7c98ee01557f2105885cc597217b0e7fd2eeb9e22cdd4ef23/blis-1.3.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:9de26fbd72bac900c273b76d46f0b45b77a28eace2e01f6ac6c2239531a413bb", size = 14219213, upload-time = "2025-11-17T12:28:26.143Z" },
+    { url = "https://files.pythonhosted.org/packages/0a/de/acae8e9f9a1f4bb393d41c8265898b0f29772e38eac14e9f69d191e2c006/blis-1.3.3-cp314-cp314-win_amd64.whl", hash = "sha256:9e5fdf4211b1972400f8ff6dafe87cb689c5d84f046b4a76b207c0bd2270faaf", size = 6324695, upload-time = "2025-11-17T12:28:28.401Z" },
+]
+
+[[package]]
+name = "catalogue"
+version = "2.0.10"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/38/b4/244d58127e1cdf04cf2dc7d9566f0d24ef01d5ce21811bab088ecc62b5ea/catalogue-2.0.10.tar.gz", hash = "sha256:4f56daa940913d3f09d589c191c74e5a6d51762b3a9e37dd53b7437afd6cda15", size = 19561, upload-time = "2023-09-25T06:29:24.962Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/9e/96/d32b941a501ab566a16358d68b6eb4e4acc373fab3c3c4d7d9e649f7b4bb/catalogue-2.0.10-py3-none-any.whl", hash = "sha256:58c2de0020aa90f4a2da7dfad161bf7b3b054c86a5f09fcedc0b2b740c109a9f", size = 17325, upload-time = "2023-09-25T06:29:23.337Z" },
+]
+
+[[package]]
+name = "certifi"
+version = "2026.4.22"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/25/ee/6caf7a40c36a1220410afe15a1cc64993a1f864871f698c0f93acb72842a/certifi-2026.4.22.tar.gz", hash = "sha256:8d455352a37b71bf76a79caa83a3d6c25afee4a385d632127b6afb3963f1c580", size = 137077, upload-time = "2026-04-22T11:26:11.191Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/22/30/7cd8fdcdfbc5b869528b079bfb76dcdf6056b1a2097a662e5e8c04f42965/certifi-2026.4.22-py3-none-any.whl", hash = "sha256:3cb2210c8f88ba2318d29b0388d1023c8492ff72ecdde4ebdaddbb13a31b1c4a", size = 135707, upload-time = "2026-04-22T11:26:09.372Z" },
+]
+
+[[package]]
+name = "cffi"
+version = "2.0.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "pycparser", marker = "implementation_name != 'PyPy'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/eb/56/b1ba7935a17738ae8453301356628e8147c79dbb825bcbc73dc7401f9846/cffi-2.0.0.tar.gz", hash = "sha256:44d1b5909021139fe36001ae048dbdde8214afa20200eda0f64c068cac5d5529", size = 523588, upload-time = "2025-09-08T23:24:04.541Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/ea/47/4f61023ea636104d4f16ab488e268b93008c3d0bb76893b1b31db1f96802/cffi-2.0.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:6d02d6655b0e54f54c4ef0b94eb6be0607b70853c45ce98bd278dc7de718be5d", size = 185271, upload-time = "2025-09-08T23:22:44.795Z" },
+    { url = "https://files.pythonhosted.org/packages/df/a2/781b623f57358e360d62cdd7a8c681f074a71d445418a776eef0aadb4ab4/cffi-2.0.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:8eca2a813c1cb7ad4fb74d368c2ffbbb4789d377ee5bb8df98373c2cc0dee76c", size = 181048, upload-time = "2025-09-08T23:22:45.938Z" },
+    { url = "https://files.pythonhosted.org/packages/ff/df/a4f0fbd47331ceeba3d37c2e51e9dfc9722498becbeec2bd8bc856c9538a/cffi-2.0.0-cp312-cp312-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:21d1152871b019407d8ac3985f6775c079416c282e431a4da6afe7aefd2bccbe", size = 212529, upload-time = "2025-09-08T23:22:47.349Z" },
+    { url = "https://files.pythonhosted.org/packages/d5/72/12b5f8d3865bf0f87cf1404d8c374e7487dcf097a1c91c436e72e6badd83/cffi-2.0.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:b21e08af67b8a103c71a250401c78d5e0893beff75e28c53c98f4de42f774062", size = 220097, upload-time = "2025-09-08T23:22:48.677Z" },
+    { url = "https://files.pythonhosted.org/packages/c2/95/7a135d52a50dfa7c882ab0ac17e8dc11cec9d55d2c18dda414c051c5e69e/cffi-2.0.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:1e3a615586f05fc4065a8b22b8152f0c1b00cdbc60596d187c2a74f9e3036e4e", size = 207983, upload-time = "2025-09-08T23:22:50.06Z" },
+    { url = "https://files.pythonhosted.org/packages/3a/c8/15cb9ada8895957ea171c62dc78ff3e99159ee7adb13c0123c001a2546c1/cffi-2.0.0-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:81afed14892743bbe14dacb9e36d9e0e504cd204e0b165062c488942b9718037", size = 206519, upload-time = "2025-09-08T23:22:51.364Z" },
+    { url = "https://files.pythonhosted.org/packages/78/2d/7fa73dfa841b5ac06c7b8855cfc18622132e365f5b81d02230333ff26e9e/cffi-2.0.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:3e17ed538242334bf70832644a32a7aae3d83b57567f9fd60a26257e992b79ba", size = 219572, upload-time = "2025-09-08T23:22:52.902Z" },
+    { url = "https://files.pythonhosted.org/packages/07/e0/267e57e387b4ca276b90f0434ff88b2c2241ad72b16d31836adddfd6031b/cffi-2.0.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:3925dd22fa2b7699ed2617149842d2e6adde22b262fcbfada50e3d195e4b3a94", size = 222963, upload-time = "2025-09-08T23:22:54.518Z" },
+    { url = "https://files.pythonhosted.org/packages/b6/75/1f2747525e06f53efbd878f4d03bac5b859cbc11c633d0fb81432d98a795/cffi-2.0.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:2c8f814d84194c9ea681642fd164267891702542f028a15fc97d4674b6206187", size = 221361, upload-time = "2025-09-08T23:22:55.867Z" },
+    { url = "https://files.pythonhosted.org/packages/7b/2b/2b6435f76bfeb6bbf055596976da087377ede68df465419d192acf00c437/cffi-2.0.0-cp312-cp312-win32.whl", hash = "sha256:da902562c3e9c550df360bfa53c035b2f241fed6d9aef119048073680ace4a18", size = 172932, upload-time = "2025-09-08T23:22:57.188Z" },
+    { url = "https://files.pythonhosted.org/packages/f8/ed/13bd4418627013bec4ed6e54283b1959cf6db888048c7cf4b4c3b5b36002/cffi-2.0.0-cp312-cp312-win_amd64.whl", hash = "sha256:da68248800ad6320861f129cd9c1bf96ca849a2771a59e0344e88681905916f5", size = 183557, upload-time = "2025-09-08T23:22:58.351Z" },
+    { url = "https://files.pythonhosted.org/packages/95/31/9f7f93ad2f8eff1dbc1c3656d7ca5bfd8fb52c9d786b4dcf19b2d02217fa/cffi-2.0.0-cp312-cp312-win_arm64.whl", hash = "sha256:4671d9dd5ec934cb9a73e7ee9676f9362aba54f7f34910956b84d727b0d73fb6", size = 177762, upload-time = "2025-09-08T23:22:59.668Z" },
+    { url = "https://files.pythonhosted.org/packages/4b/8d/a0a47a0c9e413a658623d014e91e74a50cdd2c423f7ccfd44086ef767f90/cffi-2.0.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:00bdf7acc5f795150faa6957054fbbca2439db2f775ce831222b66f192f03beb", size = 185230, upload-time = "2025-09-08T23:23:00.879Z" },
+    { url = "https://files.pythonhosted.org/packages/4a/d2/a6c0296814556c68ee32009d9c2ad4f85f2707cdecfd7727951ec228005d/cffi-2.0.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:45d5e886156860dc35862657e1494b9bae8dfa63bf56796f2fb56e1679fc0bca", size = 181043, upload-time = "2025-09-08T23:23:02.231Z" },
+    { url = "https://files.pythonhosted.org/packages/b0/1e/d22cc63332bd59b06481ceaac49d6c507598642e2230f201649058a7e704/cffi-2.0.0-cp313-cp313-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:07b271772c100085dd28b74fa0cd81c8fb1a3ba18b21e03d7c27f3436a10606b", size = 212446, upload-time = "2025-09-08T23:23:03.472Z" },
+    { url = "https://files.pythonhosted.org/packages/a9/f5/a2c23eb03b61a0b8747f211eb716446c826ad66818ddc7810cc2cc19b3f2/cffi-2.0.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:d48a880098c96020b02d5a1f7d9251308510ce8858940e6fa99ece33f610838b", size = 220101, upload-time = "2025-09-08T23:23:04.792Z" },
+    { url = "https://files.pythonhosted.org/packages/f2/7f/e6647792fc5850d634695bc0e6ab4111ae88e89981d35ac269956605feba/cffi-2.0.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:f93fd8e5c8c0a4aa1f424d6173f14a892044054871c771f8566e4008eaa359d2", size = 207948, upload-time = "2025-09-08T23:23:06.127Z" },
+    { url = "https://files.pythonhosted.org/packages/cb/1e/a5a1bd6f1fb30f22573f76533de12a00bf274abcdc55c8edab639078abb6/cffi-2.0.0-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:dd4f05f54a52fb558f1ba9f528228066954fee3ebe629fc1660d874d040ae5a3", size = 206422, upload-time = "2025-09-08T23:23:07.753Z" },
+    { url = "https://files.pythonhosted.org/packages/98/df/0a1755e750013a2081e863e7cd37e0cdd02664372c754e5560099eb7aa44/cffi-2.0.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:c8d3b5532fc71b7a77c09192b4a5a200ea992702734a2e9279a37f2478236f26", size = 219499, upload-time = "2025-09-08T23:23:09.648Z" },
+    { url = "https://files.pythonhosted.org/packages/50/e1/a969e687fcf9ea58e6e2a928ad5e2dd88cc12f6f0ab477e9971f2309b57c/cffi-2.0.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:d9b29c1f0ae438d5ee9acb31cadee00a58c46cc9c0b2f9038c6b0b3470877a8c", size = 222928, upload-time = "2025-09-08T23:23:10.928Z" },
+    { url = "https://files.pythonhosted.org/packages/36/54/0362578dd2c9e557a28ac77698ed67323ed5b9775ca9d3fe73fe191bb5d8/cffi-2.0.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:6d50360be4546678fc1b79ffe7a66265e28667840010348dd69a314145807a1b", size = 221302, upload-time = "2025-09-08T23:23:12.42Z" },
+    { url = "https://files.pythonhosted.org/packages/eb/6d/bf9bda840d5f1dfdbf0feca87fbdb64a918a69bca42cfa0ba7b137c48cb8/cffi-2.0.0-cp313-cp313-win32.whl", hash = "sha256:74a03b9698e198d47562765773b4a8309919089150a0bb17d829ad7b44b60d27", size = 172909, upload-time = "2025-09-08T23:23:14.32Z" },
+    { url = "https://files.pythonhosted.org/packages/37/18/6519e1ee6f5a1e579e04b9ddb6f1676c17368a7aba48299c3759bbc3c8b3/cffi-2.0.0-cp313-cp313-win_amd64.whl", hash = "sha256:19f705ada2530c1167abacb171925dd886168931e0a7b78f5bffcae5c6b5be75", size = 183402, upload-time = "2025-09-08T23:23:15.535Z" },
+    { url = "https://files.pythonhosted.org/packages/cb/0e/02ceeec9a7d6ee63bb596121c2c8e9b3a9e150936f4fbef6ca1943e6137c/cffi-2.0.0-cp313-cp313-win_arm64.whl", hash = "sha256:256f80b80ca3853f90c21b23ee78cd008713787b1b1e93eae9f3d6a7134abd91", size = 177780, upload-time = "2025-09-08T23:23:16.761Z" },
+    { url = "https://files.pythonhosted.org/packages/92/c4/3ce07396253a83250ee98564f8d7e9789fab8e58858f35d07a9a2c78de9f/cffi-2.0.0-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:fc33c5141b55ed366cfaad382df24fe7dcbc686de5be719b207bb248e3053dc5", size = 185320, upload-time = "2025-09-08T23:23:18.087Z" },
+    { url = "https://files.pythonhosted.org/packages/59/dd/27e9fa567a23931c838c6b02d0764611c62290062a6d4e8ff7863daf9730/cffi-2.0.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:c654de545946e0db659b3400168c9ad31b5d29593291482c43e3564effbcee13", size = 181487, upload-time = "2025-09-08T23:23:19.622Z" },
+    { url = "https://files.pythonhosted.org/packages/d6/43/0e822876f87ea8a4ef95442c3d766a06a51fc5298823f884ef87aaad168c/cffi-2.0.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:24b6f81f1983e6df8db3adc38562c83f7d4a0c36162885ec7f7b77c7dcbec97b", size = 220049, upload-time = "2025-09-08T23:23:20.853Z" },
+    { url = "https://files.pythonhosted.org/packages/b4/89/76799151d9c2d2d1ead63c2429da9ea9d7aac304603de0c6e8764e6e8e70/cffi-2.0.0-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:12873ca6cb9b0f0d3a0da705d6086fe911591737a59f28b7936bdfed27c0d47c", size = 207793, upload-time = "2025-09-08T23:23:22.08Z" },
+    { url = "https://files.pythonhosted.org/packages/bb/dd/3465b14bb9e24ee24cb88c9e3730f6de63111fffe513492bf8c808a3547e/cffi-2.0.0-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:d9b97165e8aed9272a6bb17c01e3cc5871a594a446ebedc996e2397a1c1ea8ef", size = 206300, upload-time = "2025-09-08T23:23:23.314Z" },
+    { url = "https://files.pythonhosted.org/packages/47/d9/d83e293854571c877a92da46fdec39158f8d7e68da75bf73581225d28e90/cffi-2.0.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:afb8db5439b81cf9c9d0c80404b60c3cc9c3add93e114dcae767f1477cb53775", size = 219244, upload-time = "2025-09-08T23:23:24.541Z" },
+    { url = "https://files.pythonhosted.org/packages/2b/0f/1f177e3683aead2bb00f7679a16451d302c436b5cbf2505f0ea8146ef59e/cffi-2.0.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:737fe7d37e1a1bffe70bd5754ea763a62a066dc5913ca57e957824b72a85e205", size = 222828, upload-time = "2025-09-08T23:23:26.143Z" },
+    { url = "https://files.pythonhosted.org/packages/c6/0f/cafacebd4b040e3119dcb32fed8bdef8dfe94da653155f9d0b9dc660166e/cffi-2.0.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:38100abb9d1b1435bc4cc340bb4489635dc2f0da7456590877030c9b3d40b0c1", size = 220926, upload-time = "2025-09-08T23:23:27.873Z" },
+    { url = "https://files.pythonhosted.org/packages/3e/aa/df335faa45b395396fcbc03de2dfcab242cd61a9900e914fe682a59170b1/cffi-2.0.0-cp314-cp314-win32.whl", hash = "sha256:087067fa8953339c723661eda6b54bc98c5625757ea62e95eb4898ad5e776e9f", size = 175328, upload-time = "2025-09-08T23:23:44.61Z" },
+    { url = "https://files.pythonhosted.org/packages/bb/92/882c2d30831744296ce713f0feb4c1cd30f346ef747b530b5318715cc367/cffi-2.0.0-cp314-cp314-win_amd64.whl", hash = "sha256:203a48d1fb583fc7d78a4c6655692963b860a417c0528492a6bc21f1aaefab25", size = 185650, upload-time = "2025-09-08T23:23:45.848Z" },
+    { url = "https://files.pythonhosted.org/packages/9f/2c/98ece204b9d35a7366b5b2c6539c350313ca13932143e79dc133ba757104/cffi-2.0.0-cp314-cp314-win_arm64.whl", hash = "sha256:dbd5c7a25a7cb98f5ca55d258b103a2054f859a46ae11aaf23134f9cc0d356ad", size = 180687, upload-time = "2025-09-08T23:23:47.105Z" },
+    { url = "https://files.pythonhosted.org/packages/3e/61/c768e4d548bfa607abcda77423448df8c471f25dbe64fb2ef6d555eae006/cffi-2.0.0-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:9a67fc9e8eb39039280526379fb3a70023d77caec1852002b4da7e8b270c4dd9", size = 188773, upload-time = "2025-09-08T23:23:29.347Z" },
+    { url = "https://files.pythonhosted.org/packages/2c/ea/5f76bce7cf6fcd0ab1a1058b5af899bfbef198bea4d5686da88471ea0336/cffi-2.0.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:7a66c7204d8869299919db4d5069a82f1561581af12b11b3c9f48c584eb8743d", size = 185013, upload-time = "2025-09-08T23:23:30.63Z" },
+    { url = "https://files.pythonhosted.org/packages/be/b4/c56878d0d1755cf9caa54ba71e5d049479c52f9e4afc230f06822162ab2f/cffi-2.0.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:7cc09976e8b56f8cebd752f7113ad07752461f48a58cbba644139015ac24954c", size = 221593, upload-time = "2025-09-08T23:23:31.91Z" },
+    { url = "https://files.pythonhosted.org/packages/e0/0d/eb704606dfe8033e7128df5e90fee946bbcb64a04fcdaa97321309004000/cffi-2.0.0-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:92b68146a71df78564e4ef48af17551a5ddd142e5190cdf2c5624d0c3ff5b2e8", size = 209354, upload-time = "2025-09-08T23:23:33.214Z" },
+    { url = "https://files.pythonhosted.org/packages/d8/19/3c435d727b368ca475fb8742ab97c9cb13a0de600ce86f62eab7fa3eea60/cffi-2.0.0-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.whl", hash = "sha256:b1e74d11748e7e98e2f426ab176d4ed720a64412b6a15054378afdb71e0f37dc", size = 208480, upload-time = "2025-09-08T23:23:34.495Z" },
+    { url = "https://files.pythonhosted.org/packages/d0/44/681604464ed9541673e486521497406fadcc15b5217c3e326b061696899a/cffi-2.0.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:28a3a209b96630bca57cce802da70c266eb08c6e97e5afd61a75611ee6c64592", size = 221584, upload-time = "2025-09-08T23:23:36.096Z" },
+    { url = "https://files.pythonhosted.org/packages/25/8e/342a504ff018a2825d395d44d63a767dd8ebc927ebda557fecdaca3ac33a/cffi-2.0.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:7553fb2090d71822f02c629afe6042c299edf91ba1bf94951165613553984512", size = 224443, upload-time = "2025-09-08T23:23:37.328Z" },
+    { url = "https://files.pythonhosted.org/packages/e1/5e/b666bacbbc60fbf415ba9988324a132c9a7a0448a9a8f125074671c0f2c3/cffi-2.0.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:6c6c373cfc5c83a975506110d17457138c8c63016b563cc9ed6e056a82f13ce4", size = 223437, upload-time = "2025-09-08T23:23:38.945Z" },
+    { url = "https://files.pythonhosted.org/packages/a0/1d/ec1a60bd1a10daa292d3cd6bb0b359a81607154fb8165f3ec95fe003b85c/cffi-2.0.0-cp314-cp314t-win32.whl", hash = "sha256:1fc9ea04857caf665289b7a75923f2c6ed559b8298a1b8c49e59f7dd95c8481e", size = 180487, upload-time = "2025-09-08T23:23:40.423Z" },
+    { url = "https://files.pythonhosted.org/packages/bf/41/4c1168c74fac325c0c8156f04b6749c8b6a8f405bbf91413ba088359f60d/cffi-2.0.0-cp314-cp314t-win_amd64.whl", hash = "sha256:d68b6cef7827e8641e8ef16f4494edda8b36104d79773a334beaa1e3521430f6", size = 191726, upload-time = "2025-09-08T23:23:41.742Z" },
+    { url = "https://files.pythonhosted.org/packages/ae/3a/dbeec9d1ee0844c679f6bb5d6ad4e9f198b1224f4e7a32825f47f6192b0c/cffi-2.0.0-cp314-cp314t-win_arm64.whl", hash = "sha256:0a1527a803f0a659de1af2e1fd700213caba79377e27e4693648c2923da066f9", size = 184195, upload-time = "2025-09-08T23:23:43.004Z" },
+]
+
+[[package]]
+name = "charset-normalizer"
+version = "3.4.7"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/e7/a1/67fe25fac3c7642725500a3f6cfe5821ad557c3abb11c9d20d12c7008d3e/charset_normalizer-3.4.7.tar.gz", hash = "sha256:ae89db9e5f98a11a4bf50407d4363e7b09b31e55bc117b4f7d80aab97ba009e5", size = 144271, upload-time = "2026-04-02T09:28:39.342Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/0c/eb/4fc8d0a7110eb5fc9cc161723a34a8a6c200ce3b4fbf681bc86feee22308/charset_normalizer-3.4.7-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:eca9705049ad3c7345d574e3510665cb2cf844c2f2dcfe675332677f081cbd46", size = 311328, upload-time = "2026-04-02T09:26:24.331Z" },
+    { url = "https://files.pythonhosted.org/packages/f8/e3/0fadc706008ac9d7b9b5be6dc767c05f9d3e5df51744ce4cc9605de7b9f4/charset_normalizer-3.4.7-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6178f72c5508bfc5fd446a5905e698c6212932f25bcdd4b47a757a50605a90e2", size = 208061, upload-time = "2026-04-02T09:26:25.568Z" },
+    { url = "https://files.pythonhosted.org/packages/42/f0/3dd1045c47f4a4604df85ec18ad093912ae1344ac706993aff91d38773a2/charset_normalizer-3.4.7-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:e1421b502d83040e6d7fb2fb18dff63957f720da3d77b2fbd3187ceb63755d7b", size = 229031, upload-time = "2026-04-02T09:26:26.865Z" },
+    { url = "https://files.pythonhosted.org/packages/dc/67/675a46eb016118a2fbde5a277a5d15f4f69d5f3f5f338e5ee2f8948fcf43/charset_normalizer-3.4.7-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:edac0f1ab77644605be2cbba52e6b7f630731fc42b34cb0f634be1a6eface56a", size = 225239, upload-time = "2026-04-02T09:26:28.044Z" },
+    { url = "https://files.pythonhosted.org/packages/4b/f8/d0118a2f5f23b02cd166fa385c60f9b0d4f9194f574e2b31cef350ad7223/charset_normalizer-3.4.7-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5649fd1c7bade02f320a462fdefd0b4bd3ce036065836d4f42e0de958038e116", size = 216589, upload-time = "2026-04-02T09:26:29.239Z" },
+    { url = "https://files.pythonhosted.org/packages/b1/f1/6d2b0b261b6c4ceef0fcb0d17a01cc5bc53586c2d4796fa04b5c540bc13d/charset_normalizer-3.4.7-cp312-cp312-manylinux_2_31_armv7l.whl", hash = "sha256:203104ed3e428044fd943bc4bf45fa73c0730391f9621e37fe39ecf477b128cb", size = 202733, upload-time = "2026-04-02T09:26:30.5Z" },
+    { url = "https://files.pythonhosted.org/packages/6f/c0/7b1f943f7e87cc3db9626ba17807d042c38645f0a1d4415c7a14afb5591f/charset_normalizer-3.4.7-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:298930cec56029e05497a76988377cbd7457ba864beeea92ad7e844fe74cd1f1", size = 212652, upload-time = "2026-04-02T09:26:31.709Z" },
+    { url = "https://files.pythonhosted.org/packages/38/dd/5a9ab159fe45c6e72079398f277b7d2b523e7f716acc489726115a910097/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:708838739abf24b2ceb208d0e22403dd018faeef86ddac04319a62ae884c4f15", size = 211229, upload-time = "2026-04-02T09:26:33.282Z" },
+    { url = "https://files.pythonhosted.org/packages/d5/ff/531a1cad5ca855d1c1a8b69cb71abfd6d85c0291580146fda7c82857caa1/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:0f7eb884681e3938906ed0434f20c63046eacd0111c4ba96f27b76084cd679f5", size = 203552, upload-time = "2026-04-02T09:26:34.845Z" },
+    { url = "https://files.pythonhosted.org/packages/c1/4c/a5fb52d528a8ca41f7598cb619409ece30a169fbdf9cdce592e53b46c3a6/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:4dc1e73c36828f982bfe79fadf5919923f8a6f4df2860804db9a98c48824ce8d", size = 230806, upload-time = "2026-04-02T09:26:36.152Z" },
+    { url = "https://files.pythonhosted.org/packages/59/7a/071feed8124111a32b316b33ae4de83d36923039ef8cf48120266844285b/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:aed52fea0513bac0ccde438c188c8a471c4e0f457c2dd20cdbf6ea7a450046c7", size = 212316, upload-time = "2026-04-02T09:26:37.672Z" },
+    { url = "https://files.pythonhosted.org/packages/fd/35/f7dba3994312d7ba508e041eaac39a36b120f32d4c8662b8814dab876431/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:fea24543955a6a729c45a73fe90e08c743f0b3334bbf3201e6c4bc1b0c7fa464", size = 227274, upload-time = "2026-04-02T09:26:38.93Z" },
+    { url = "https://files.pythonhosted.org/packages/8a/2d/a572df5c9204ab7688ec1edc895a73ebded3b023bb07364710b05dd1c9be/charset_normalizer-3.4.7-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:bb6d88045545b26da47aa879dd4a89a71d1dce0f0e549b1abcb31dfe4a8eac49", size = 218468, upload-time = "2026-04-02T09:26:40.17Z" },
+    { url = "https://files.pythonhosted.org/packages/86/eb/890922a8b03a568ca2f336c36585a4713c55d4d67bf0f0c78924be6315ca/charset_normalizer-3.4.7-cp312-cp312-win32.whl", hash = "sha256:2257141f39fe65a3fdf38aeccae4b953e5f3b3324f4ff0daf9f15b8518666a2c", size = 148460, upload-time = "2026-04-02T09:26:41.416Z" },
+    { url = "https://files.pythonhosted.org/packages/35/d9/0e7dffa06c5ab081f75b1b786f0aefc88365825dfcd0ac544bdb7b2b6853/charset_normalizer-3.4.7-cp312-cp312-win_amd64.whl", hash = "sha256:5ed6ab538499c8644b8a3e18debabcd7ce684f3fa91cf867521a7a0279cab2d6", size = 159330, upload-time = "2026-04-02T09:26:42.554Z" },
+    { url = "https://files.pythonhosted.org/packages/9e/5d/481bcc2a7c88ea6b0878c299547843b2521ccbc40980cb406267088bc701/charset_normalizer-3.4.7-cp312-cp312-win_arm64.whl", hash = "sha256:56be790f86bfb2c98fb742ce566dfb4816e5a83384616ab59c49e0604d49c51d", size = 147828, upload-time = "2026-04-02T09:26:44.075Z" },
+    { url = "https://files.pythonhosted.org/packages/c1/3b/66777e39d3ae1ddc77ee606be4ec6d8cbd4c801f65e5a1b6f2b11b8346dd/charset_normalizer-3.4.7-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:f496c9c3cc02230093d8330875c4c3cdfc3b73612a5fd921c65d39cbcef08063", size = 309627, upload-time = "2026-04-02T09:26:45.198Z" },
+    { url = "https://files.pythonhosted.org/packages/2e/4e/b7f84e617b4854ade48a1b7915c8ccfadeba444d2a18c291f696e37f0d3b/charset_normalizer-3.4.7-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0ea948db76d31190bf08bd371623927ee1339d5f2a0b4b1b4a4439a65298703c", size = 207008, upload-time = "2026-04-02T09:26:46.824Z" },
+    { url = "https://files.pythonhosted.org/packages/c4/bb/ec73c0257c9e11b268f018f068f5d00aa0ef8c8b09f7753ebd5f2880e248/charset_normalizer-3.4.7-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:a277ab8928b9f299723bc1a2dabb1265911b1a76341f90a510368ca44ad9ab66", size = 228303, upload-time = "2026-04-02T09:26:48.397Z" },
+    { url = "https://files.pythonhosted.org/packages/85/fb/32d1f5033484494619f701e719429c69b766bfc4dbc61aa9e9c8c166528b/charset_normalizer-3.4.7-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:3bec022aec2c514d9cf199522a802bd007cd588ab17ab2525f20f9c34d067c18", size = 224282, upload-time = "2026-04-02T09:26:49.684Z" },
+    { url = "https://files.pythonhosted.org/packages/fa/07/330e3a0dda4c404d6da83b327270906e9654a24f6c546dc886a0eb0ffb23/charset_normalizer-3.4.7-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e044c39e41b92c845bc815e5ae4230804e8e7bc29e399b0437d64222d92809dd", size = 215595, upload-time = "2026-04-02T09:26:50.915Z" },
+    { url = "https://files.pythonhosted.org/packages/e3/7c/fc890655786e423f02556e0216d4b8c6bcb6bdfa890160dc66bf52dee468/charset_normalizer-3.4.7-cp313-cp313-manylinux_2_31_armv7l.whl", hash = "sha256:f495a1652cf3fbab2eb0639776dad966c2fb874d79d87ca07f9d5f059b8bd215", size = 201986, upload-time = "2026-04-02T09:26:52.197Z" },
+    { url = "https://files.pythonhosted.org/packages/d8/97/bfb18b3db2aed3b90cf54dc292ad79fdd5ad65c4eae454099475cbeadd0d/charset_normalizer-3.4.7-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e712b419df8ba5e42b226c510472b37bd57b38e897d3eca5e8cfd410a29fa859", size = 211711, upload-time = "2026-04-02T09:26:53.49Z" },
+    { url = "https://files.pythonhosted.org/packages/6f/a5/a581c13798546a7fd557c82614a5c65a13df2157e9ad6373166d2a3e645d/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:7804338df6fcc08105c7745f1502ba68d900f45fd770d5bdd5288ddccb8a42d8", size = 210036, upload-time = "2026-04-02T09:26:54.975Z" },
+    { url = "https://files.pythonhosted.org/packages/8c/bf/b3ab5bcb478e4193d517644b0fb2bf5497fbceeaa7a1bc0f4d5b50953861/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:481551899c856c704d58119b5025793fa6730adda3571971af568f66d2424bb5", size = 202998, upload-time = "2026-04-02T09:26:56.303Z" },
+    { url = "https://files.pythonhosted.org/packages/e7/4e/23efd79b65d314fa320ec6017b4b5834d5c12a58ba4610aa353af2e2f577/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:f59099f9b66f0d7145115e6f80dd8b1d847176df89b234a5a6b3f00437aa0832", size = 230056, upload-time = "2026-04-02T09:26:57.554Z" },
+    { url = "https://files.pythonhosted.org/packages/b9/9f/1e1941bc3f0e01df116e68dc37a55c4d249df5e6fa77f008841aef68264f/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:f59ad4c0e8f6bba240a9bb85504faa1ab438237199d4cce5f622761507b8f6a6", size = 211537, upload-time = "2026-04-02T09:26:58.843Z" },
+    { url = "https://files.pythonhosted.org/packages/80/0f/088cbb3020d44428964a6c97fe1edfb1b9550396bf6d278330281e8b709c/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:3dedcc22d73ec993f42055eff4fcfed9318d1eeb9a6606c55892a26964964e48", size = 226176, upload-time = "2026-04-02T09:27:00.437Z" },
+    { url = "https://files.pythonhosted.org/packages/6a/9f/130394f9bbe06f4f63e22641d32fc9b202b7e251c9aef4db044324dac493/charset_normalizer-3.4.7-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:64f02c6841d7d83f832cd97ccf8eb8a906d06eb95d5276069175c696b024b60a", size = 217723, upload-time = "2026-04-02T09:27:02.021Z" },
+    { url = "https://files.pythonhosted.org/packages/73/55/c469897448a06e49f8fa03f6caae97074fde823f432a98f979cc42b90e69/charset_normalizer-3.4.7-cp313-cp313-win32.whl", hash = "sha256:4042d5c8f957e15221d423ba781e85d553722fc4113f523f2feb7b188cc34c5e", size = 148085, upload-time = "2026-04-02T09:27:03.192Z" },
+    { url = "https://files.pythonhosted.org/packages/5d/78/1b74c5bbb3f99b77a1715c91b3e0b5bdb6fe302d95ace4f5b1bec37b0167/charset_normalizer-3.4.7-cp313-cp313-win_amd64.whl", hash = "sha256:3946fa46a0cf3e4c8cb1cc52f56bb536310d34f25f01ca9b6c16afa767dab110", size = 158819, upload-time = "2026-04-02T09:27:04.454Z" },
+    { url = "https://files.pythonhosted.org/packages/68/86/46bd42279d323deb8687c4a5a811fd548cb7d1de10cf6535d099877a9a9f/charset_normalizer-3.4.7-cp313-cp313-win_arm64.whl", hash = "sha256:80d04837f55fc81da168b98de4f4b797ef007fc8a79ab71c6ec9bc4dd662b15b", size = 147915, upload-time = "2026-04-02T09:27:05.971Z" },
+    { url = "https://files.pythonhosted.org/packages/97/c8/c67cb8c70e19ef1960b97b22ed2a1567711de46c4ddf19799923adc836c2/charset_normalizer-3.4.7-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:c36c333c39be2dbca264d7803333c896ab8fa7d4d6f0ab7edb7dfd7aea6e98c0", size = 309234, upload-time = "2026-04-02T09:27:07.194Z" },
+    { url = "https://files.pythonhosted.org/packages/99/85/c091fdee33f20de70d6c8b522743b6f831a2f1cd3ff86de4c6a827c48a76/charset_normalizer-3.4.7-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1c2aed2e5e41f24ea8ef1590b8e848a79b56f3a5564a65ceec43c9d692dc7d8a", size = 208042, upload-time = "2026-04-02T09:27:08.749Z" },
+    { url = "https://files.pythonhosted.org/packages/87/1c/ab2ce611b984d2fd5d86a5a8a19c1ae26acac6bad967da4967562c75114d/charset_normalizer-3.4.7-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:54523e136b8948060c0fa0bc7b1b50c32c186f2fceee897a495406bb6e311d2b", size = 228706, upload-time = "2026-04-02T09:27:09.951Z" },
+    { url = "https://files.pythonhosted.org/packages/a8/29/2b1d2cb00bf085f59d29eb773ce58ec2d325430f8c216804a0a5cd83cbca/charset_normalizer-3.4.7-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:715479b9a2802ecac752a3b0efa2b0b60285cf962ee38414211abdfccc233b41", size = 224727, upload-time = "2026-04-02T09:27:11.175Z" },
+    { url = "https://files.pythonhosted.org/packages/47/5c/032c2d5a07fe4d4855fea851209cca2b6f03ebeb6d4e3afdb3358386a684/charset_normalizer-3.4.7-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:bd6c2a1c7573c64738d716488d2cdd3c00e340e4835707d8fdb8dc1a66ef164e", size = 215882, upload-time = "2026-04-02T09:27:12.446Z" },
+    { url = "https://files.pythonhosted.org/packages/2c/c2/356065d5a8b78ed04499cae5f339f091946a6a74f91e03476c33f0ab7100/charset_normalizer-3.4.7-cp314-cp314-manylinux_2_31_armv7l.whl", hash = "sha256:c45e9440fb78f8ddabcf714b68f936737a121355bf59f3907f4e17721b9d1aae", size = 200860, upload-time = "2026-04-02T09:27:13.721Z" },
+    { url = "https://files.pythonhosted.org/packages/0c/cd/a32a84217ced5039f53b29f460962abb2d4420def55afabe45b1c3c7483d/charset_normalizer-3.4.7-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:3534e7dcbdcf757da6b85a0bbf5b6868786d5982dd959b065e65481644817a18", size = 211564, upload-time = "2026-04-02T09:27:15.272Z" },
+    { url = "https://files.pythonhosted.org/packages/44/86/58e6f13ce26cc3b8f4a36b94a0f22ae2f00a72534520f4ae6857c4b81f89/charset_normalizer-3.4.7-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:e8ac484bf18ce6975760921bb6148041faa8fef0547200386ea0b52b5d27bf7b", size = 211276, upload-time = "2026-04-02T09:27:16.834Z" },
+    { url = "https://files.pythonhosted.org/packages/8f/fe/d17c32dc72e17e155e06883efa84514ca375f8a528ba2546bee73fc4df81/charset_normalizer-3.4.7-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:a5fe03b42827c13cdccd08e6c0247b6a6d4b5e3cdc53fd1749f5896adcdc2356", size = 201238, upload-time = "2026-04-02T09:27:18.229Z" },
+    { url = "https://files.pythonhosted.org/packages/6a/29/f33daa50b06525a237451cdb6c69da366c381a3dadcd833fa5676bc468b3/charset_normalizer-3.4.7-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:2d6eb928e13016cea4f1f21d1e10c1cebd5a421bc57ddf5b1142ae3f86824fab", size = 230189, upload-time = "2026-04-02T09:27:19.445Z" },
+    { url = "https://files.pythonhosted.org/packages/b6/6e/52c84015394a6a0bdcd435210a7e944c5f94ea1055f5cc5d56c5fe368e7b/charset_normalizer-3.4.7-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:e74327fb75de8986940def6e8dee4f127cc9752bee7355bb323cc5b2659b6d46", size = 211352, upload-time = "2026-04-02T09:27:20.79Z" },
+    { url = "https://files.pythonhosted.org/packages/8c/d7/4353be581b373033fb9198bf1da3cf8f09c1082561e8e922aa7b39bf9fe8/charset_normalizer-3.4.7-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:d6038d37043bced98a66e68d3aa2b6a35505dc01328cd65217cefe82f25def44", size = 227024, upload-time = "2026-04-02T09:27:22.063Z" },
+    { url = "https://files.pythonhosted.org/packages/30/45/99d18aa925bd1740098ccd3060e238e21115fffbfdcb8f3ece837d0ace6c/charset_normalizer-3.4.7-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:7579e913a5339fb8fa133f6bbcfd8e6749696206cf05acdbdca71a1b436d8e72", size = 217869, upload-time = "2026-04-02T09:27:23.486Z" },
+    { url = "https://files.pythonhosted.org/packages/5c/05/5ee478aa53f4bb7996482153d4bfe1b89e0f087f0ab6b294fcf92d595873/charset_normalizer-3.4.7-cp314-cp314-win32.whl", hash = "sha256:5b77459df20e08151cd6f8b9ef8ef1f961ef73d85c21a555c7eed5b79410ec10", size = 148541, upload-time = "2026-04-02T09:27:25.146Z" },
+    { url = "https://files.pythonhosted.org/packages/48/77/72dcb0921b2ce86420b2d79d454c7022bf5be40202a2a07906b9f2a35c97/charset_normalizer-3.4.7-cp314-cp314-win_amd64.whl", hash = "sha256:92a0a01ead5e668468e952e4238cccd7c537364eb7d851ab144ab6627dbbe12f", size = 159634, upload-time = "2026-04-02T09:27:26.642Z" },
+    { url = "https://files.pythonhosted.org/packages/c6/a3/c2369911cd72f02386e4e340770f6e158c7980267da16af8f668217abaa0/charset_normalizer-3.4.7-cp314-cp314-win_arm64.whl", hash = "sha256:67f6279d125ca0046a7fd386d01b311c6363844deac3e5b069b514ba3e63c246", size = 148384, upload-time = "2026-04-02T09:27:28.271Z" },
+    { url = "https://files.pythonhosted.org/packages/94/09/7e8a7f73d24dba1f0035fbbf014d2c36828fc1bf9c88f84093e57d315935/charset_normalizer-3.4.7-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:effc3f449787117233702311a1b7d8f59cba9ced946ba727bdc329ec69028e24", size = 330133, upload-time = "2026-04-02T09:27:29.474Z" },
+    { url = "https://files.pythonhosted.org/packages/8d/da/96975ddb11f8e977f706f45cddd8540fd8242f71ecdb5d18a80723dcf62c/charset_normalizer-3.4.7-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:fbccdc05410c9ee21bbf16a35f4c1d16123dcdeb8a1d38f33654fa21d0234f79", size = 216257, upload-time = "2026-04-02T09:27:30.793Z" },
+    { url = "https://files.pythonhosted.org/packages/e5/e8/1d63bf8ef2d388e95c64b2098f45f84758f6d102a087552da1485912637b/charset_normalizer-3.4.7-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:733784b6d6def852c814bce5f318d25da2ee65dd4839a0718641c696e09a2960", size = 234851, upload-time = "2026-04-02T09:27:32.44Z" },
+    { url = "https://files.pythonhosted.org/packages/9b/40/e5ff04233e70da2681fa43969ad6f66ca5611d7e669be0246c4c7aaf6dc8/charset_normalizer-3.4.7-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:a89c23ef8d2c6b27fd200a42aa4ac72786e7c60d40efdc76e6011260b6e949c4", size = 233393, upload-time = "2026-04-02T09:27:34.03Z" },
+    { url = "https://files.pythonhosted.org/packages/be/c1/06c6c49d5a5450f76899992f1ee40b41d076aee9279b49cf9974d2f313d5/charset_normalizer-3.4.7-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6c114670c45346afedc0d947faf3c7f701051d2518b943679c8ff88befe14f8e", size = 223251, upload-time = "2026-04-02T09:27:35.369Z" },
+    { url = "https://files.pythonhosted.org/packages/2b/9f/f2ff16fb050946169e3e1f82134d107e5d4ae72647ec8a1b1446c148480f/charset_normalizer-3.4.7-cp314-cp314t-manylinux_2_31_armv7l.whl", hash = "sha256:a180c5e59792af262bf263b21a3c49353f25945d8d9f70628e73de370d55e1e1", size = 206609, upload-time = "2026-04-02T09:27:36.661Z" },
+    { url = "https://files.pythonhosted.org/packages/69/d5/a527c0cd8d64d2eab7459784fb4169a0ac76e5a6fc5237337982fd61347e/charset_normalizer-3.4.7-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:3c9a494bc5ec77d43cea229c4f6db1e4d8fe7e1bbffa8b6f0f0032430ff8ab44", size = 220014, upload-time = "2026-04-02T09:27:38.019Z" },
+    { url = "https://files.pythonhosted.org/packages/7e/80/8a7b8104a3e203074dc9aa2c613d4b726c0e136bad1cc734594b02867972/charset_normalizer-3.4.7-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:8d828b6667a32a728a1ad1d93957cdf37489c57b97ae6c4de2860fa749b8fc1e", size = 218979, upload-time = "2026-04-02T09:27:39.37Z" },
+    { url = "https://files.pythonhosted.org/packages/02/9a/b759b503d507f375b2b5c153e4d2ee0a75aa215b7f2489cf314f4541f2c0/charset_normalizer-3.4.7-cp314-cp314t-musllinux_1_2_armv7l.whl", hash = "sha256:cf1493cd8607bec4d8a7b9b004e699fcf8f9103a9284cc94962cb73d20f9d4a3", size = 209238, upload-time = "2026-04-02T09:27:40.722Z" },
+    { url = "https://files.pythonhosted.org/packages/c2/4e/0f3f5d47b86bdb79256e7290b26ac847a2832d9a4033f7eb2cd4bcf4bb5b/charset_normalizer-3.4.7-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:0c96c3b819b5c3e9e165495db84d41914d6894d55181d2d108cc1a69bfc9cce0", size = 236110, upload-time = "2026-04-02T09:27:42.33Z" },
+    { url = "https://files.pythonhosted.org/packages/96/23/bce28734eb3ed2c91dcf93abeb8a5cf393a7b2749725030bb630e554fdd8/charset_normalizer-3.4.7-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:752a45dc4a6934060b3b0dab47e04edc3326575f82be64bc4fc293914566503e", size = 219824, upload-time = "2026-04-02T09:27:43.924Z" },
+    { url = "https://files.pythonhosted.org/packages/2c/6f/6e897c6984cc4d41af319b077f2f600fc8214eb2fe2d6bcb79141b882400/charset_normalizer-3.4.7-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:8778f0c7a52e56f75d12dae53ae320fae900a8b9b4164b981b9c5ce059cd1fcb", size = 233103, upload-time = "2026-04-02T09:27:45.348Z" },
+    { url = "https://files.pythonhosted.org/packages/76/22/ef7bd0fe480a0ae9b656189ec00744b60933f68b4f42a7bb06589f6f576a/charset_normalizer-3.4.7-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:ce3412fbe1e31eb81ea42f4169ed94861c56e643189e1e75f0041f3fe7020abe", size = 225194, upload-time = "2026-04-02T09:27:46.706Z" },
+    { url = "https://files.pythonhosted.org/packages/c5/a7/0e0ab3e0b5bc1219bd80a6a0d4d72ca74d9250cb2382b7c699c147e06017/charset_normalizer-3.4.7-cp314-cp314t-win32.whl", hash = "sha256:c03a41a8784091e67a39648f70c5f97b5b6a37f216896d44d2cdcb82615339a0", size = 159827, upload-time = "2026-04-02T09:27:48.053Z" },
+    { url = "https://files.pythonhosted.org/packages/7a/1d/29d32e0fb40864b1f878c7f5a0b343ae676c6e2b271a2d55cc3a152391da/charset_normalizer-3.4.7-cp314-cp314t-win_amd64.whl", hash = "sha256:03853ed82eeebbce3c2abfdbc98c96dc205f32a79627688ac9a27370ea61a49c", size = 174168, upload-time = "2026-04-02T09:27:49.795Z" },
+    { url = "https://files.pythonhosted.org/packages/de/32/d92444ad05c7a6e41fb2036749777c163baf7a0301a040cb672d6b2b1ae9/charset_normalizer-3.4.7-cp314-cp314t-win_arm64.whl", hash = "sha256:c35abb8bfff0185efac5878da64c45dafd2b37fb0383add1be155a763c1f083d", size = 153018, upload-time = "2026-04-02T09:27:51.116Z" },
+    { url = "https://files.pythonhosted.org/packages/db/8f/61959034484a4a7c527811f4721e75d02d653a35afb0b6054474d8185d4c/charset_normalizer-3.4.7-py3-none-any.whl", hash = "sha256:3dce51d0f5e7951f8bb4900c257dad282f49190fdbebecd4ba99bcc41fef404d", size = 61958, upload-time = "2026-04-02T09:28:37.794Z" },
+]
+
+[[package]]
+name = "click"
+version = "8.3.3"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "colorama", marker = "sys_platform == 'win32'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/bb/63/f9e1ea081ce35720d8b92acde70daaedace594dc93b693c869e0d5910718/click-8.3.3.tar.gz", hash = "sha256:398329ad4837b2ff7cbe1dd166a4c0f8900c3ca3a218de04466f38f6497f18a2", size = 328061, upload-time = "2026-04-22T15:11:27.506Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/ae/44/c1221527f6a71a01ec6fbad7fa78f1d50dfa02217385cf0fa3eec7087d59/click-8.3.3-py3-none-any.whl", hash = "sha256:a2bf429bb3033c89fa4936ffb35d5cb471e3719e1f3c8a7c3fff0b8314305613", size = 110502, upload-time = "2026-04-22T15:11:25.044Z" },
+]
+
+[[package]]
+name = "cloudpathlib"
+version = "0.23.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/f4/18/2ac35d6b3015a0c74e923d94fc69baf8307f7c3233de015d69f99e17afa8/cloudpathlib-0.23.0.tar.gz", hash = "sha256:eb38a34c6b8a048ecfd2b2f60917f7cbad4a105b7c979196450c2f541f4d6b4b", size = 53126, upload-time = "2025-10-07T22:47:56.278Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/ae/8a/c4bb04426d608be4a3171efa2e233d2c59a5c8937850c10d098e126df18e/cloudpathlib-0.23.0-py3-none-any.whl", hash = "sha256:8520b3b01468fee77de37ab5d50b1b524ea6b4a8731c35d1b7407ac0cd716002", size = 62755, upload-time = "2025-10-07T22:47:54.905Z" },
+]
+
+[[package]]
+name = "colorama"
+version = "0.4.6"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/d8/53/6f443c9a4a8358a93a6792e2acffb9d9d5cb0a5cfd8802644b7b1c9a02e4/colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44", size = 27697, upload-time = "2022-10-25T02:36:22.414Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", size = 25335, upload-time = "2022-10-25T02:36:20.889Z" },
+]
+
+[[package]]
+name = "confection"
+version = "1.3.3"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/ca/65/efd0fe8a936fc8ca2978cb7b82581fb20d901c6039e746a808f746b7647b/confection-1.3.3.tar.gz", hash = "sha256:f0f6810d567ff73993fe74d218ca5e1ffb6a44fb03f391257fc5d033546cbfaa", size = 54895, upload-time = "2026-03-24T18:45:24.331Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/8d/e4/d66708bdf0d92fb4d49b22cdff4b10cec38aca5dcd7e81d909bb55c65cd7/confection-1.3.3-py3-none-any.whl", hash = "sha256:b9fef9ee84b237ef4611ec3eb5797b70e13063e6310ad9f15536373f5e313c82", size = 35902, upload-time = "2026-03-24T18:45:22.664Z" },
+]
+
+[[package]]
+name = "coverage"
+version = "7.14.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/23/7f/d0720730a397a999ffc0fd3f5bebef347338e3a47b727da66fbb228e2ff2/coverage-7.14.0.tar.gz", hash = "sha256:057a6af2f160a85384cde4ab36f0d2777bae1057bae255f95413cdd382aa5c74", size = 919489, upload-time = "2026-05-10T18:02:31.397Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/09/1e/2f996b2c8415cbb6f54b0f5ec1ee850c96d7911961afb4fc05f4a89d8c58/coverage-7.14.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:7ffd19fc8aed057fd686a17a4935eef5f9859d69208f96310e893e64b9b6ccf5", size = 219967, upload-time = "2026-05-10T18:00:13.756Z" },
+    { url = "https://files.pythonhosted.org/packages/34/23/35c7aea1274aef7525bdd2dc92f710bdde6d11652239d71d1ec450067939/coverage-7.14.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:829994cfe1aeb773ca27bf246d4badc1e764893e3bfb98fff820fcecd1ca4662", size = 220329, upload-time = "2026-05-10T18:00:15.264Z" },
+    { url = "https://files.pythonhosted.org/packages/75/cf/a8f4b43a16e194b0261257ad28ded5853ec052570afef4a84e1d81189f3b/coverage-7.14.0-cp312-cp312-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:b4f07cf7edcb7ec39431a5074d7ea83b29a9f71fcfc494f0f40af4e65180420f", size = 251839, upload-time = "2026-05-10T18:00:17.16Z" },
+    { url = "https://files.pythonhosted.org/packages/69/ff/6699e7b71e60d3049eb2bdcbc95ee3f35707b2b0e48f32e9e63d3ce30c08/coverage-7.14.0-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:ca3d9cf2c32b521bd9518385608787fa86f38daf993695307531822c3430ed67", size = 254576, upload-time = "2026-05-10T18:00:18.829Z" },
+    { url = "https://files.pythonhosted.org/packages/22/ec/c936d495fcd67f48f03a9c4ad3297ff80d1f222a5df3980f15b34c186c21/coverage-7.14.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:92af52828e7f29d827346b0294e5a0853fa206db77db0395b282918d41e28db9", size = 255690, upload-time = "2026-05-10T18:00:20.648Z" },
+    { url = "https://files.pythonhosted.org/packages/5c/42/5af63f636cc62a4a2b1b3ba9146f6ee6f53a35a50d5cefc54d5670f60999/coverage-7.14.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:7b2bb6c9d7e769360d0f20a0f219603fd64f0c8f97de17ab25853261602be0fb", size = 257949, upload-time = "2026-05-10T18:00:22.28Z" },
+    { url = "https://files.pythonhosted.org/packages/26/d3/a225317bd2012132a27e1176d51660b826f99bb975876463c44ea0d7ee5a/coverage-7.14.0-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:1c9ed6ef99f88fb8c14aa8e2bf8eb0fe55fa2edfea68f8675d78741df1a5ac0e", size = 252242, upload-time = "2026-05-10T18:00:24.076Z" },
+    { url = "https://files.pythonhosted.org/packages/f1/7f/9e65495298c3ea414742998539c37d048b5e81cc818fb1828cc6b51d10bf/coverage-7.14.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:8231ade007f37959fbf58acc677f26b922c02eda6f0428ea307da0fd39681bf3", size = 253608, upload-time = "2026-05-10T18:00:25.588Z" },
+    { url = "https://files.pythonhosted.org/packages/94/46/1522b524a35bdad22b2b8c4f9d32d0a104b524726ec380b2db68db1746f5/coverage-7.14.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:d8b013632cc1ce1d09dbe4f32667b4d320ec2f54fc326ebeffcd0b0bcc2bb6c4", size = 251753, upload-time = "2026-05-10T18:00:27.104Z" },
+    { url = "https://files.pythonhosted.org/packages/f3/e9/cdf00d38817742c541ade405e115a3f7bf36e6f2a8b99d4f209861b85a2d/coverage-7.14.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:1733198802d71ec4c524f322e2867ee05c62e9e75df86bdca545407a221827d1", size = 255823, upload-time = "2026-05-10T18:00:29.038Z" },
+    { url = "https://files.pythonhosted.org/packages/38/fc/5e7877cf5f902d08a17ff1c532511476d87e1bea355bd5028cb97f902e79/coverage-7.14.0-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:72a305291fa8ee01332f1aaf38b348ca34097f6aa0b0ef627eef2837e57bbba5", size = 251323, upload-time = "2026-05-10T18:00:30.647Z" },
+    { url = "https://files.pythonhosted.org/packages/18/9d/50f05a72dff8487464fdd4178dda5daed642a060e60afb644e3d45123559/coverage-7.14.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:fcaba850dd317c65423a9d63d88f9573c53b00354d6dd95724576cc98a131595", size = 253197, upload-time = "2026-05-10T18:00:32.211Z" },
+    { url = "https://files.pythonhosted.org/packages/00/3f/6f61ffe6439df266c3cf60f5c99cfaa21103d0210d706a42fc6c30683ff8/coverage-7.14.0-cp312-cp312-win32.whl", hash = "sha256:5ac83957a80d0701310e96d8bec68cdcf4f90a7674b7d13f15a344315b41ab27", size = 222515, upload-time = "2026-05-10T18:00:33.717Z" },
+    { url = "https://files.pythonhosted.org/packages/85/19/93853133df2cb371083285ef6a93982a0173e7a233b0f61373ba9fd30eb2/coverage-7.14.0-cp312-cp312-win_amd64.whl", hash = "sha256:70390b0da32cb90b501953716302906e8bcce087cb283e70d8c97729f22e92b2", size = 223324, upload-time = "2026-05-10T18:00:35.172Z" },
+    { url = "https://files.pythonhosted.org/packages/74/18/9f7fe62f659f24b7a82a0be56bf94c1bd0a89e0ae7ab4c668f6e82404294/coverage-7.14.0-cp312-cp312-win_arm64.whl", hash = "sha256:91b993743d959b8be85b4abf9d5478216a69329c321efe5be0433c1a841d691d", size = 221944, upload-time = "2026-05-10T18:00:37.014Z" },
+    { url = "https://files.pythonhosted.org/packages/6b/76/b7c66ee3c66e1b0f9d894c8125983aa0c03fb2336f2fd16559f9c966157f/coverage-7.14.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:f2bbb8254370eb4c628ff3d6fa8a7f74ddc40565394d4f7ab791d1fe568e37ef", size = 219990, upload-time = "2026-05-10T18:00:38.887Z" },
+    { url = "https://files.pythonhosted.org/packages/b3/af/e567cbad5ba69c013a50146dfa886dc7193361fda77521f51274ff620e1b/coverage-7.14.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:23b81107f46d3f21d0cbce30664fcec0f5d9f585638a67081750f99738f6bf66", size = 220365, upload-time = "2026-05-10T18:00:40.864Z" },
+    { url = "https://files.pythonhosted.org/packages/44/6f/9ad575d505b4d805b254febc8a5b338a2efe278f8786e56ff1cb8413f9c3/coverage-7.14.0-cp313-cp313-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:22a7e06a5f11a757cdfe79018e9095f9f69ae283c5cd8123774c788deec8717b", size = 251363, upload-time = "2026-05-10T18:00:42.489Z" },
+    { url = "https://files.pythonhosted.org/packages/6f/5f/b5370068b2f57787454592ed7dcd1002f0f1703b7db1fa30f6a325a4ca6e/coverage-7.14.0-cp313-cp313-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:9d1aa57a1dc8e05bdc42e81c5d671d849577aeedf279f4c449d6d286f9ed88ca", size = 253961, upload-time = "2026-05-10T18:00:44.079Z" },
+    { url = "https://files.pythonhosted.org/packages/29/1e/51adf17738976e8f2b85ddef7b7aa12a0838b056c92f175941d8862767c1/coverage-7.14.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:90c1a51bcfddf645b3bb7ec333d9e94393a8e94f55642380fa8a9a5a9e636cb7", size = 255193, upload-time = "2026-05-10T18:00:45.623Z" },
+    { url = "https://files.pythonhosted.org/packages/9e/7b/5bfd7ac1df3b881c2ac7a5cbc99c7609e6296c402f5ef587cd81c6f355b3/coverage-7.14.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:a841fae2fadcae4f438d43b6ccc4aac2ad609f47cdb6cfdce60cbb3fe5ca7bc2", size = 257326, upload-time = "2026-05-10T18:00:47.173Z" },
+    { url = "https://files.pythonhosted.org/packages/7d/38/1d37d316b174fad3843a1d76dbdfe4398771c9ecd0515935dd9ece9cd627/coverage-7.14.0-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:c79d2319cabef1fe8e86df73371126931550804738f78ad7d31e3aad85a67367", size = 251582, upload-time = "2026-05-10T18:00:49.152Z" },
+    { url = "https://files.pythonhosted.org/packages/34/46/746704f95980ba220214e1a41e18cec5aea80a898eaa53c51bf2d645ff36/coverage-7.14.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:1b23b0c6f0b1db6ad769b7050c8b641c0bf215ded26c1816955b17b7f26edfa9", size = 253325, upload-time = "2026-05-10T18:00:51.252Z" },
+    { url = "https://files.pythonhosted.org/packages/e1/b9/bbe87206d9687b192352f893797825b5f5b15ecd3aa9c68fbff0c074d77b/coverage-7.14.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:55d3089079ce181a4566b1065ab28d2575eb76d8ac8f81f4fcda2bf037fee087", size = 251291, upload-time = "2026-05-10T18:00:52.816Z" },
+    { url = "https://files.pythonhosted.org/packages/46/57/b8cdb12ac0d73ef0243218bd5e22c9df8f92edab8018213a86aec67c5324/coverage-7.14.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:49c005cba1e2f9677fb2845dcdf9a2e72a52a17d63e8231aaaae35d9f50215ef", size = 255448, upload-time = "2026-05-10T18:00:54.548Z" },
+    { url = "https://files.pythonhosted.org/packages/1f/d4/5002019538b2036ce3c84340f54d2fd5100d55b0a6b0894eee56128d03c7/coverage-7.14.0-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:9117377b823daa28aa8635fbb08cda1cd6be3d7143257345459559aeef852d52", size = 251110, upload-time = "2026-05-10T18:00:56.122Z" },
+    { url = "https://files.pythonhosted.org/packages/37/53/20c5009477660f084e6ed60bc02a91894b8e234e617e86ecfd9aaf78e27b/coverage-7.14.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:7b79d646cf46d5cf9a9f40281d4441df5849e445726e369006d2b117710b33fe", size = 252885, upload-time = "2026-05-10T18:00:57.967Z" },
+    { url = "https://files.pythonhosted.org/packages/ae/ab/3cf6427ac9c1f1db747dbb1ce71dde47984876d4c2cfd018a3fef0a78d4d/coverage-7.14.0-cp313-cp313-win32.whl", hash = "sha256:fb609b3658479e33f9516d46f1a89dbb9b6c261366e3a11844a96ec487533dae", size = 222539, upload-time = "2026-05-10T18:00:59.581Z" },
+    { url = "https://files.pythonhosted.org/packages/8f/b8/9228523e80321c2cb4880d1f589bc0171f2f71432c35118ad04dc01decce/coverage-7.14.0-cp313-cp313-win_amd64.whl", hash = "sha256:0773d8329cf32b6fd222e4b52622c61fe8d503eb966cfc8d3c3c10c96266d50e", size = 223344, upload-time = "2026-05-10T18:01:01.531Z" },
+    { url = "https://files.pythonhosted.org/packages/a3/99/118daa192f95e3a6cb2740100fbf8797cda1734b4134ef0b5d501a7fa8f3/coverage-7.14.0-cp313-cp313-win_arm64.whl", hash = "sha256:b4e26a0f1b696faf283bffe5b8569e44e336c582439df5d53281ab89ee0cba96", size = 221966, upload-time = "2026-05-10T18:01:03.16Z" },
+    { url = "https://files.pythonhosted.org/packages/e6/f1/a46cc0c013be170216253184a32366d7cbdb9252feaec866b05c2d12a894/coverage-7.14.0-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:953f521ca9445300397e65fda3dca58b2dbd68fee983777420b57ac3c77e9f90", size = 220679, upload-time = "2026-05-10T18:01:05.058Z" },
+    { url = "https://files.pythonhosted.org/packages/64/8c/9c30a3d311a34177fa432995be7fbfc64477d8bac5630bd38055b1c9b424/coverage-7.14.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:98af83fd65ae24b1fdd03aaead967a9f523bcd2f1aab2d4f3ffda65bb568a6f1", size = 221033, upload-time = "2026-05-10T18:01:07.002Z" },
+    { url = "https://files.pythonhosted.org/packages/9a/cd/3fb5e06c3badefd0c1b47e2044fdca67f8220a4ec2e7fcfb476aa0a67c6c/coverage-7.14.0-cp313-cp313t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:668b92e6958c4db7cf92e81caac328dfbbdbb215db2850ad28f0cbe1eea0bfbd", size = 262333, upload-time = "2026-05-10T18:01:08.903Z" },
+    { url = "https://files.pythonhosted.org/packages/a8/e6/fbc322325c7294d3e22c1ad6b79e45d0806b25228c8e5842aed6d8169aa7/coverage-7.14.0-cp313-cp313t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:9fbd898551762dea00d3fef2b1c4f99afd2c6a3ff952ea07d60a9bd5ed4f34bc", size = 264410, upload-time = "2026-05-10T18:01:10.531Z" },
+    { url = "https://files.pythonhosted.org/packages/08/92/c497b264bec1673c47cc77e26f760fcda4654cabf1f39546d1a23a3b8c35/coverage-7.14.0-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:68af363c07ecd8d4b7d4043d85cb376d7d227eceb54e5323ee45da73dbd3e426", size = 266836, upload-time = "2026-05-10T18:01:12.19Z" },
+    { url = "https://files.pythonhosted.org/packages/78/fc/045da320987f401af5d2815d351e8aa799aec859f60e29f445e3089eeedb/coverage-7.14.0-cp313-cp313t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:6e57054a583da8ac55edf24117ea4c9133032cfc4cf72aa2d48c1e5d4b52f899", size = 267974, upload-time = "2026-05-10T18:01:13.926Z" },
+    { url = "https://files.pythonhosted.org/packages/1b/ae/227b1e379497fb7a4fc3286e620f80c8a1e7cec66d45695a01639eb1af65/coverage-7.14.0-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:cc3499459bbcdd51a65b64c35ab7ed2764eaf3cba826e0df3f1d7fe2e102b70b", size = 261578, upload-time = "2026-05-10T18:01:15.564Z" },
+    { url = "https://files.pythonhosted.org/packages/a0/f5/3570342900f2acea31d33ff1590c5d8bac1a8e1a2e1c6d34a5d5e61de681/coverage-7.14.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:45899ec2138a4346ed34d601dedf5076fb74edf2d1dd9dc76a78e82397edee90", size = 264394, upload-time = "2026-05-10T18:01:17.607Z" },
+    { url = "https://files.pythonhosted.org/packages/16/29/de1bbc01c935b28f89b1dc3db85b011c055e843a8e5e3b83141c3f80af7f/coverage-7.14.0-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:8767486808c436f05b23ab98eb963fb29185e32a9357a166971685cb3459900f", size = 262022, upload-time = "2026-05-10T18:01:19.304Z" },
+    { url = "https://files.pythonhosted.org/packages/35/95/f53890b0bf2fc10ab168e05d38869215e73ca24c4cb521c3bb0eb62fe16b/coverage-7.14.0-cp313-cp313t-musllinux_1_2_ppc64le.whl", hash = "sha256:a3b5ddfd6aa7ddad53ee3edb231e88a2151507a43229b7d71b953916deca127d", size = 265732, upload-time = "2026-05-10T18:01:21.494Z" },
+    { url = "https://files.pythonhosted.org/packages/ed/ea/c919e259081dd2bdf0e43b87209709ba7ec2e4117c2a7f5185379c43463c/coverage-7.14.0-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:63df0fe568e698e1045792399f8ab6da3a6c2dce3182813fb92afa2641087b47", size = 260921, upload-time = "2026-05-10T18:01:23.533Z" },
+    { url = "https://files.pythonhosted.org/packages/1a/2c/c2831889705a81dc5d1c6ca12e4d8e9b95dfc146d153488a6c0ea685d28e/coverage-7.14.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:827d6397dbd95144939b18f89edf31f63e1f99633e8d5f32f22ba8bdda567477", size = 263109, upload-time = "2026-05-10T18:01:25.165Z" },
+    { url = "https://files.pythonhosted.org/packages/5a/a9/2fcae5003cac3d63fe344d2166243c2756935f48420863c5272b240d550b/coverage-7.14.0-cp313-cp313t-win32.whl", hash = "sha256:7bf43e000d24012599b879791cff41589af90674722421ef11b11a5431920bab", size = 223212, upload-time = "2026-05-10T18:01:27.157Z" },
+    { url = "https://files.pythonhosted.org/packages/3f/bb/18e94d7b14b9b398164197114a587a04ab7c9fdbe1d237eef57311c5e883/coverage-7.14.0-cp313-cp313t-win_amd64.whl", hash = "sha256:3f5549365af25d770e06b1f8f5682d9a5637d06eb494db91c6fa75d3950cc917", size = 224272, upload-time = "2026-05-10T18:01:29.107Z" },
+    { url = "https://files.pythonhosted.org/packages/db/56/4f14fad782b035c81c4ffd09159e7103d42bb1d93ac8496d04b90a11b7da/coverage-7.14.0-cp313-cp313t-win_arm64.whl", hash = "sha256:6d160217ec6fe890f16ad3a9531761589443749e448f91986c972714fad361c8", size = 222530, upload-time = "2026-05-10T18:01:31.151Z" },
+    { url = "https://files.pythonhosted.org/packages/1c/18/b9a6586d73992807c26f9a5f274131be3d76b56b18a82b9392e2a25d2e45/coverage-7.14.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:9aed9fa983514ca032790f3fe0d1c0e42ca7e16b42432af1706b50a9a46bef5d", size = 220036, upload-time = "2026-05-10T18:01:33.057Z" },
+    { url = "https://files.pythonhosted.org/packages/f3/9b/4165a1d56ddc302a0e2d518fd9d412a4fd0b57562618c78c5f21c57194f5/coverage-7.14.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:ba3b8390db29296dbbf49e91b6fe08f990743a90c8f447ba4c2ffc29670dfa63", size = 220368, upload-time = "2026-05-10T18:01:34.705Z" },
+    { url = "https://files.pythonhosted.org/packages/69/aa/c12e52a5ba148d9995229d557e3be6e554fe469addc0e9241b2f0956d8ea/coverage-7.14.0-cp314-cp314-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:3a5d8e876dfa2f102e970b183863d6dedd023d3c0eeca1fe7a9787bc5f28b212", size = 251417, upload-time = "2026-05-10T18:01:36.949Z" },
+    { url = "https://files.pythonhosted.org/packages/d7/51/ec641c26e6dca1b25a7d2035ba6ecb7c884ef1a100a9e42fbe4ce4405139/coverage-7.14.0-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:5ebb8f4614a3787d567e610bbfdf96a4798dd69a1afb1bd8ad228d4111fe6ff3", size = 253924, upload-time = "2026-05-10T18:01:38.985Z" },
+    { url = "https://files.pythonhosted.org/packages/33/c4/59c3de0bd1b538824173fd518fed51c1ce740ca5ed68e74545983f4053a9/coverage-7.14.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6b9bf47223dd8db3d4c4b2e443b02bace480d428f0822c3f991600448a176c97", size = 255269, upload-time = "2026-05-10T18:01:40.957Z" },
+    { url = "https://files.pythonhosted.org/packages/7b/a9/36dfa153a62040296f6e7febfdb20a5720622f6ef5a81a41e8237b9a5344/coverage-7.14.0-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:3485a836550b303d006d57cc06e3d5afaabc642c77050b7c985a97b13e3776b8", size = 257583, upload-time = "2026-05-10T18:01:42.607Z" },
+    { url = "https://files.pythonhosted.org/packages/26/7b/cc2c048d4114d9ab1c2409e9ee365e5ae10736df6dffcfc9444effa6c708/coverage-7.14.0-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:3e7e88110bae996d199d1693ca8ec3fd52441d426401ae963437598667b4c5eb", size = 251434, upload-time = "2026-05-10T18:01:44.537Z" },
+    { url = "https://files.pythonhosted.org/packages/ee/df/6770eaa576e604575e9a78055313250faef5faa84bd6f71a39fece519c43/coverage-7.14.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:15228a6800ce7bdf1b74800595e56db7138cecb338fdbf044806e10dcf182dfe", size = 253280, upload-time = "2026-05-10T18:01:46.175Z" },
+    { url = "https://files.pythonhosted.org/packages/ad/9e/1c0264514a3f98259a6d64765a397b2c8373e3ba59ee722a4802d3ec0c61/coverage-7.14.0-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:9d26ac7f5398bafc5b57421ad994e8a4749e8a7a0e62d05ec7d53014d5963bfa", size = 251241, upload-time = "2026-05-10T18:01:48.732Z" },
+    { url = "https://files.pythonhosted.org/packages/64/16/4efdf3e3c4079cdbf0ece56a2fea872df9e8a3e15a13a0af4400e1075944/coverage-7.14.0-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:2fb73254ff43c911c967a899e1359bc5049b4b115d6e8fbdde4937d0a2246cd5", size = 255516, upload-time = "2026-05-10T18:01:50.819Z" },
+    { url = "https://files.pythonhosted.org/packages/93/69/b1de96346603881b3d1bc8d6447c83200e1c9700ffbaff926ba01ff5724c/coverage-7.14.0-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:454a380af72c6adada298ed270d38c7a391288198dbfb8467f786f588751a90c", size = 251059, upload-time = "2026-05-10T18:01:52.773Z" },
+    { url = "https://files.pythonhosted.org/packages/a4/66/2881853e0363a5e0a724d1103e53650795367471b6afb234f8b49e713bc6/coverage-7.14.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:65c86fb646d2bd2972e96bd1a8b45817ed907cee68655d6295fe7ec031d04cca", size = 252716, upload-time = "2026-05-10T18:01:54.506Z" },
+    { url = "https://files.pythonhosted.org/packages/55/5c/0d3305d002c41dcde873dbe456491e663dc55152ca526b630b5c47efd62f/coverage-7.14.0-cp314-cp314-win32.whl", hash = "sha256:6a6516b02a6101398e19a3f44820f69bab2590697f7def4331f668b14adaf828", size = 222788, upload-time = "2026-05-10T18:01:56.487Z" },
+    { url = "https://files.pythonhosted.org/packages/f9/58/6e1b8f52fdc3184b47dc5037f5070d83a3d11042db1594b02d2a44d786c8/coverage-7.14.0-cp314-cp314-win_amd64.whl", hash = "sha256:45e0f79d8351fa76e256716df91eab12890d32678b9590df7ae1042e4bd4cf5d", size = 223600, upload-time = "2026-05-10T18:01:58.497Z" },
+    { url = "https://files.pythonhosted.org/packages/00/70/a18c408e674bc26281cadaedc7351f929bd2094e191e4b15271c30b084cc/coverage-7.14.0-cp314-cp314-win_arm64.whl", hash = "sha256:4b899594a8b2d81e5cc064a0d7f9cac2081fed91049456cae7676787e41549c9", size = 222168, upload-time = "2026-05-10T18:02:00.411Z" },
+    { url = "https://files.pythonhosted.org/packages/3d/89/2681f071d238b62aff8dfc2ab44fc24cfdb38d1c01f391a80522ff5d3a16/coverage-7.14.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:f580f8c80acd94ac72e863efe2cab791d8c38d153e0b463b92dfa000d5c84cd1", size = 220766, upload-time = "2026-05-10T18:02:02.313Z" },
+    { url = "https://files.pythonhosted.org/packages/bd/c7/c987babafd9207ffa1995e1ef1f9b26762cf4963aa768a66b6f0501e4616/coverage-7.14.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:a2bd259c442cd43c49b30fbafc51776eb19ea396faf159d26a83e6a0a5f13b0c", size = 221035, upload-time = "2026-05-10T18:02:04.017Z" },
+    { url = "https://files.pythonhosted.org/packages/5a/e9/d6a5ac3b333088143d6fc877d398a9a674dc03124a2f776e131f03864823/coverage-7.14.0-cp314-cp314t-manylinux1_i686.manylinux_2_28_i686.manylinux_2_5_i686.whl", hash = "sha256:a706b908dfa85538863504c624b237a3cc34232bf403c057414ebfdb3b4d9f84", size = 262405, upload-time = "2026-05-10T18:02:05.915Z" },
+    { url = "https://files.pythonhosted.org/packages/38/b1/e70838d29a7c08e22d44398a46db90815bbcbf28de06992bd9210d1a8d8e/coverage-7.14.0-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:7333cd944ee4393b9b3d3c1b598c936d4fc8d70573a4c7dacfec5590dd50e436", size = 264530, upload-time = "2026-05-10T18:02:07.582Z" },
+    { url = "https://files.pythonhosted.org/packages/6b/73/5c31ef97763288d03d9995152b96d5475b527c63d91c84b01caea894b83a/coverage-7.14.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0f162bc9a15b82d947b02651b0c7e1609d6f7a8735ca330cfadec8481dd97d5a", size = 266932, upload-time = "2026-05-10T18:02:09.401Z" },
+    { url = "https://files.pythonhosted.org/packages/e1/76/dd56d80f29c5f05b4d76f7e7c6d47cafacae017189c75c5759d24f9ff0cc/coverage-7.14.0-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:362cb78e01a5dc82009d88004cf60f2e6b6d6fcbfdec05b05af73b0abf40118f", size = 268062, upload-time = "2026-05-10T18:02:11.399Z" },
+    { url = "https://files.pythonhosted.org/packages/6e/c7/27ba85cd5b95614f159ff93ebff1901584a8d192e2e5e24c4943a7453f59/coverage-7.14.0-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:acebd068fca5512c3a6fde9c045f901613478781a73f0e82b307b214daef23fb", size = 261504, upload-time = "2026-05-10T18:02:13.257Z" },
+    { url = "https://files.pythonhosted.org/packages/13/2e/e8149f60ab5d5684c6eee881bdf34b127115cddbb958b196768dd9d63473/coverage-7.14.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:29fe3da551dface75deb2ccbf87b6b66e2e7ef38f6d89050b428be94afff3490", size = 264398, upload-time = "2026-05-10T18:02:15.063Z" },
+    { url = "https://files.pythonhosted.org/packages/d9/7f/1261b025285323225f4b4abffa5a643649dfd67e25ddca7ebcbdea3b7cb3/coverage-7.14.0-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:b4cc4fce8672fffcb09b0eafc167b396b3ba53c4a7230f54b7aaffbf6c835fa9", size = 262000, upload-time = "2026-05-10T18:02:16.756Z" },
+    { url = "https://files.pythonhosted.org/packages/d3/dc/829c54f60b9d08389439c00f813c752781c496fc5788c78d8006db4b4f2b/coverage-7.14.0-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:5d4a51aad8ba8bdcd2b8bd8f03d4aca19693fa2327a3470e4718a25b03481020", size = 265732, upload-time = "2026-05-10T18:02:18.817Z" },
+    { url = "https://files.pythonhosted.org/packages/ed/b0/70bd1419941652fa062689cba9c3eeafb8f5e6fbb890bce41c3bdda5dbd6/coverage-7.14.0-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:9f323af3e1e4f68b60b7b247e37b8515563a61375518fa59de1af48ba28a3db6", size = 260847, upload-time = "2026-05-10T18:02:20.528Z" },
+    { url = "https://files.pythonhosted.org/packages/f2/73/be40b2390656c654d35ea0015ea7ba3d945769cf80790ad5e0bb2d56d2ba/coverage-7.14.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:1a0abc7342ea9711c469dd8b821c6c311e6bc6aac1442e5fbd6b27fae0a8f3db", size = 263166, upload-time = "2026-05-10T18:02:22.337Z" },
+    { url = "https://files.pythonhosted.org/packages/29/55/4a643f712fcf7cf2881f8ec1e0ccb7b164aff3108f69b51801246c8799f2/coverage-7.14.0-cp314-cp314t-win32.whl", hash = "sha256:a9f864ef57b7172e2db87a096642dd51e179e085ab6b2c371c29e885f65c8fb2", size = 223573, upload-time = "2026-05-10T18:02:24.11Z" },
+    { url = "https://files.pythonhosted.org/packages/27/96/3acae5da0953be042c0b4dea6d6789d2f080701c77b88e44d5bd41b9219b/coverage-7.14.0-cp314-cp314t-win_amd64.whl", hash = "sha256:29943e552fdc08e082eb51400fb2f58e118a83b5542bd06531214e084399b644", size = 224680, upload-time = "2026-05-10T18:02:25.896Z" },
+    { url = "https://files.pythonhosted.org/packages/93/3d/6ab5d2dd8325d838737c6f8d83d62eb6230e0d70b87b51b57bbfd08fa767/coverage-7.14.0-cp314-cp314t-win_arm64.whl", hash = "sha256:742a73ea621953b012f2c4c2219b512180dd84489acf5b1596b0aafc55b9100b", size = 222703, upload-time = "2026-05-10T18:02:27.822Z" },
+    { url = "https://files.pythonhosted.org/packages/61/e8/cb8e80d6f9f55b99588625062822bf946cf03ed06315df4bd8397f5632a1/coverage-7.14.0-py3-none-any.whl", hash = "sha256:8de5b61163aee3d05c8a2beab6f47913df7981dad1baf82c414d99158c286ab1", size = 211764, upload-time = "2026-05-10T18:02:29.538Z" },
+]
+
+[[package]]
+name = "cryptography"
+version = "46.0.7"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "cffi", marker = "platform_python_implementation != 'PyPy'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/47/93/ac8f3d5ff04d54bc814e961a43ae5b0b146154c89c61b47bb07557679b18/cryptography-46.0.7.tar.gz", hash = "sha256:e4cfd68c5f3e0bfdad0d38e023239b96a2fe84146481852dffbcca442c245aa5", size = 750652, upload-time = "2026-04-08T01:57:54.692Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/0b/5d/4a8f770695d73be252331e60e526291e3df0c9b27556a90a6b47bccca4c2/cryptography-46.0.7-cp311-abi3-macosx_10_9_universal2.whl", hash = "sha256:ea42cbe97209df307fdc3b155f1b6fa2577c0defa8f1f7d3be7d31d189108ad4", size = 7179869, upload-time = "2026-04-08T01:56:17.157Z" },
+    { url = "https://files.pythonhosted.org/packages/5f/45/6d80dc379b0bbc1f9d1e429f42e4cb9e1d319c7a8201beffd967c516ea01/cryptography-46.0.7-cp311-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:b36a4695e29fe69215d75960b22577197aca3f7a25b9cf9d165dcfe9d80bc325", size = 4275492, upload-time = "2026-04-08T01:56:19.36Z" },
+    { url = "https://files.pythonhosted.org/packages/4a/9a/1765afe9f572e239c3469f2cb429f3ba7b31878c893b246b4b2994ffe2fe/cryptography-46.0.7-cp311-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:5ad9ef796328c5e3c4ceed237a183f5d41d21150f972455a9d926593a1dcb308", size = 4426670, upload-time = "2026-04-08T01:56:21.415Z" },
+    { url = "https://files.pythonhosted.org/packages/8f/3e/af9246aaf23cd4ee060699adab1e47ced3f5f7e7a8ffdd339f817b446462/cryptography-46.0.7-cp311-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:73510b83623e080a2c35c62c15298096e2a5dc8d51c3b4e1740211839d0dea77", size = 4280275, upload-time = "2026-04-08T01:56:23.539Z" },
+    { url = "https://files.pythonhosted.org/packages/0f/54/6bbbfc5efe86f9d71041827b793c24811a017c6ac0fd12883e4caa86b8ed/cryptography-46.0.7-cp311-abi3-manylinux_2_28_ppc64le.whl", hash = "sha256:cbd5fb06b62bd0721e1170273d3f4d5a277044c47ca27ee257025146c34cbdd1", size = 4928402, upload-time = "2026-04-08T01:56:25.624Z" },
+    { url = "https://files.pythonhosted.org/packages/2d/cf/054b9d8220f81509939599c8bdbc0c408dbd2bdd41688616a20731371fe0/cryptography-46.0.7-cp311-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:420b1e4109cc95f0e5700eed79908cef9268265c773d3a66f7af1eef53d409ef", size = 4459985, upload-time = "2026-04-08T01:56:27.309Z" },
+    { url = "https://files.pythonhosted.org/packages/f9/46/4e4e9c6040fb01c7467d47217d2f882daddeb8828f7df800cb806d8a2288/cryptography-46.0.7-cp311-abi3-manylinux_2_31_armv7l.whl", hash = "sha256:24402210aa54baae71d99441d15bb5a1919c195398a87b563df84468160a65de", size = 3990652, upload-time = "2026-04-08T01:56:29.095Z" },
+    { url = "https://files.pythonhosted.org/packages/36/5f/313586c3be5a2fbe87e4c9a254207b860155a8e1f3cca99f9910008e7d08/cryptography-46.0.7-cp311-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:8a469028a86f12eb7d2fe97162d0634026d92a21f3ae0ac87ed1c4a447886c83", size = 4279805, upload-time = "2026-04-08T01:56:30.928Z" },
+    { url = "https://files.pythonhosted.org/packages/69/33/60dfc4595f334a2082749673386a4d05e4f0cf4df8248e63b2c3437585f2/cryptography-46.0.7-cp311-abi3-manylinux_2_34_ppc64le.whl", hash = "sha256:9694078c5d44c157ef3162e3bf3946510b857df5a3955458381d1c7cfc143ddb", size = 4892883, upload-time = "2026-04-08T01:56:32.614Z" },
+    { url = "https://files.pythonhosted.org/packages/c7/0b/333ddab4270c4f5b972f980adef4faa66951a4aaf646ca067af597f15563/cryptography-46.0.7-cp311-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:42a1e5f98abb6391717978baf9f90dc28a743b7d9be7f0751a6f56a75d14065b", size = 4459756, upload-time = "2026-04-08T01:56:34.306Z" },
+    { url = "https://files.pythonhosted.org/packages/d2/14/633913398b43b75f1234834170947957c6b623d1701ffc7a9600da907e89/cryptography-46.0.7-cp311-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:91bbcb08347344f810cbe49065914fe048949648f6bd5c2519f34619142bbe85", size = 4410244, upload-time = "2026-04-08T01:56:35.977Z" },
+    { url = "https://files.pythonhosted.org/packages/10/f2/19ceb3b3dc14009373432af0c13f46aa08e3ce334ec6eff13492e1812ccd/cryptography-46.0.7-cp311-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:5d1c02a14ceb9148cc7816249f64f623fbfee39e8c03b3650d842ad3f34d637e", size = 4674868, upload-time = "2026-04-08T01:56:38.034Z" },
+    { url = "https://files.pythonhosted.org/packages/1a/bb/a5c213c19ee94b15dfccc48f363738633a493812687f5567addbcbba9f6f/cryptography-46.0.7-cp311-abi3-win32.whl", hash = "sha256:d23c8ca48e44ee015cd0a54aeccdf9f09004eba9fc96f38c911011d9ff1bd457", size = 3026504, upload-time = "2026-04-08T01:56:39.666Z" },
+    { url = "https://files.pythonhosted.org/packages/2b/02/7788f9fefa1d060ca68717c3901ae7fffa21ee087a90b7f23c7a603c32ae/cryptography-46.0.7-cp311-abi3-win_amd64.whl", hash = "sha256:397655da831414d165029da9bc483bed2fe0e75dde6a1523ec2fe63f3c46046b", size = 3488363, upload-time = "2026-04-08T01:56:41.893Z" },
+    { url = "https://files.pythonhosted.org/packages/7b/56/15619b210e689c5403bb0540e4cb7dbf11a6bf42e483b7644e471a2812b3/cryptography-46.0.7-cp314-cp314t-macosx_10_9_universal2.whl", hash = "sha256:d151173275e1728cf7839aaa80c34fe550c04ddb27b34f48c232193df8db5842", size = 7119671, upload-time = "2026-04-08T01:56:44Z" },
+    { url = "https://files.pythonhosted.org/packages/74/66/e3ce040721b0b5599e175ba91ab08884c75928fbeb74597dd10ef13505d2/cryptography-46.0.7-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:db0f493b9181c7820c8134437eb8b0b4792085d37dbb24da050476ccb664e59c", size = 4268551, upload-time = "2026-04-08T01:56:46.071Z" },
+    { url = "https://files.pythonhosted.org/packages/03/11/5e395f961d6868269835dee1bafec6a1ac176505a167f68b7d8818431068/cryptography-46.0.7-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:ebd6daf519b9f189f85c479427bbd6e9c9037862cf8fe89ee35503bd209ed902", size = 4408887, upload-time = "2026-04-08T01:56:47.718Z" },
+    { url = "https://files.pythonhosted.org/packages/40/53/8ed1cf4c3b9c8e611e7122fb56f1c32d09e1fff0f1d77e78d9ff7c82653e/cryptography-46.0.7-cp314-cp314t-manylinux_2_28_aarch64.whl", hash = "sha256:b7b412817be92117ec5ed95f880defe9cf18a832e8cafacf0a22337dc1981b4d", size = 4271354, upload-time = "2026-04-08T01:56:49.312Z" },
+    { url = "https://files.pythonhosted.org/packages/50/46/cf71e26025c2e767c5609162c866a78e8a2915bbcfa408b7ca495c6140c4/cryptography-46.0.7-cp314-cp314t-manylinux_2_28_ppc64le.whl", hash = "sha256:fbfd0e5f273877695cb93baf14b185f4878128b250cc9f8e617ea0c025dfb022", size = 4905845, upload-time = "2026-04-08T01:56:50.916Z" },
+    { url = "https://files.pythonhosted.org/packages/c0/ea/01276740375bac6249d0a971ebdf6b4dc9ead0ee0a34ef3b5a88c1a9b0d4/cryptography-46.0.7-cp314-cp314t-manylinux_2_28_x86_64.whl", hash = "sha256:ffca7aa1d00cf7d6469b988c581598f2259e46215e0140af408966a24cf086ce", size = 4444641, upload-time = "2026-04-08T01:56:52.882Z" },
+    { url = "https://files.pythonhosted.org/packages/3d/4c/7d258f169ae71230f25d9f3d06caabcff8c3baf0978e2b7d65e0acac3827/cryptography-46.0.7-cp314-cp314t-manylinux_2_31_armv7l.whl", hash = "sha256:60627cf07e0d9274338521205899337c5d18249db56865f943cbe753aa96f40f", size = 3967749, upload-time = "2026-04-08T01:56:54.597Z" },
+    { url = "https://files.pythonhosted.org/packages/b5/2a/2ea0767cad19e71b3530e4cad9605d0b5e338b6a1e72c37c9c1ceb86c333/cryptography-46.0.7-cp314-cp314t-manylinux_2_34_aarch64.whl", hash = "sha256:80406c3065e2c55d7f49a9550fe0c49b3f12e5bfff5dedb727e319e1afb9bf99", size = 4270942, upload-time = "2026-04-08T01:56:56.416Z" },
+    { url = "https://files.pythonhosted.org/packages/41/3d/fe14df95a83319af25717677e956567a105bb6ab25641acaa093db79975d/cryptography-46.0.7-cp314-cp314t-manylinux_2_34_ppc64le.whl", hash = "sha256:c5b1ccd1239f48b7151a65bc6dd54bcfcc15e028c8ac126d3fada09db0e07ef1", size = 4871079, upload-time = "2026-04-08T01:56:58.31Z" },
+    { url = "https://files.pythonhosted.org/packages/9c/59/4a479e0f36f8f378d397f4eab4c850b4ffb79a2f0d58704b8fa0703ddc11/cryptography-46.0.7-cp314-cp314t-manylinux_2_34_x86_64.whl", hash = "sha256:d5f7520159cd9c2154eb61eb67548ca05c5774d39e9c2c4339fd793fe7d097b2", size = 4443999, upload-time = "2026-04-08T01:57:00.508Z" },
+    { url = "https://files.pythonhosted.org/packages/28/17/b59a741645822ec6d04732b43c5d35e4ef58be7bfa84a81e5ae6f05a1d33/cryptography-46.0.7-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:fcd8eac50d9138c1d7fc53a653ba60a2bee81a505f9f8850b6b2888555a45d0e", size = 4399191, upload-time = "2026-04-08T01:57:02.654Z" },
+    { url = "https://files.pythonhosted.org/packages/59/6a/bb2e166d6d0e0955f1e9ff70f10ec4b2824c9cfcdb4da772c7dd69cc7d80/cryptography-46.0.7-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:65814c60f8cc400c63131584e3e1fad01235edba2614b61fbfbfa954082db0ee", size = 4655782, upload-time = "2026-04-08T01:57:04.592Z" },
+    { url = "https://files.pythonhosted.org/packages/95/b6/3da51d48415bcb63b00dc17c2eff3a651b7c4fed484308d0f19b30e8cb2c/cryptography-46.0.7-cp314-cp314t-win32.whl", hash = "sha256:fdd1736fed309b4300346f88f74cd120c27c56852c3838cab416e7a166f67298", size = 3002227, upload-time = "2026-04-08T01:57:06.91Z" },
+    { url = "https://files.pythonhosted.org/packages/32/a8/9f0e4ed57ec9cebe506e58db11ae472972ecb0c659e4d52bbaee80ca340a/cryptography-46.0.7-cp314-cp314t-win_amd64.whl", hash = "sha256:e06acf3c99be55aa3b516397fe42f5855597f430add9c17fa46bf2e0fb34c9bb", size = 3475332, upload-time = "2026-04-08T01:57:08.807Z" },
+    { url = "https://files.pythonhosted.org/packages/a7/7f/cd42fc3614386bc0c12f0cb3c4ae1fc2bbca5c9662dfed031514911d513d/cryptography-46.0.7-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:462ad5cb1c148a22b2e3bcc5ad52504dff325d17daf5df8d88c17dda1f75f2a4", size = 7165618, upload-time = "2026-04-08T01:57:10.645Z" },
+    { url = "https://files.pythonhosted.org/packages/a5/d0/36a49f0262d2319139d2829f773f1b97ef8aef7f97e6e5bd21455e5a8fb5/cryptography-46.0.7-cp38-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:84d4cced91f0f159a7ddacad249cc077e63195c36aac40b4150e7a57e84fffe7", size = 4270628, upload-time = "2026-04-08T01:57:12.885Z" },
+    { url = "https://files.pythonhosted.org/packages/8a/6c/1a42450f464dda6ffbe578a911f773e54dd48c10f9895a23a7e88b3e7db5/cryptography-46.0.7-cp38-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:128c5edfe5e5938b86b03941e94fac9ee793a94452ad1365c9fc3f4f62216832", size = 4415405, upload-time = "2026-04-08T01:57:14.923Z" },
+    { url = "https://files.pythonhosted.org/packages/9a/92/4ed714dbe93a066dc1f4b4581a464d2d7dbec9046f7c8b7016f5286329e2/cryptography-46.0.7-cp38-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:5e51be372b26ef4ba3de3c167cd3d1022934bc838ae9eaad7e644986d2a3d163", size = 4272715, upload-time = "2026-04-08T01:57:16.638Z" },
+    { url = "https://files.pythonhosted.org/packages/b7/e6/a26b84096eddd51494bba19111f8fffe976f6a09f132706f8f1bf03f51f7/cryptography-46.0.7-cp38-abi3-manylinux_2_28_ppc64le.whl", hash = "sha256:cdf1a610ef82abb396451862739e3fc93b071c844399e15b90726ef7470eeaf2", size = 4918400, upload-time = "2026-04-08T01:57:19.021Z" },
+    { url = "https://files.pythonhosted.org/packages/c7/08/ffd537b605568a148543ac3c2b239708ae0bd635064bab41359252ef88ed/cryptography-46.0.7-cp38-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:1d25aee46d0c6f1a501adcddb2d2fee4b979381346a78558ed13e50aa8a59067", size = 4450634, upload-time = "2026-04-08T01:57:21.185Z" },
+    { url = "https://files.pythonhosted.org/packages/16/01/0cd51dd86ab5b9befe0d031e276510491976c3a80e9f6e31810cce46c4ad/cryptography-46.0.7-cp38-abi3-manylinux_2_31_armv7l.whl", hash = "sha256:cdfbe22376065ffcf8be74dc9a909f032df19bc58a699456a21712d6e5eabfd0", size = 3985233, upload-time = "2026-04-08T01:57:22.862Z" },
+    { url = "https://files.pythonhosted.org/packages/92/49/819d6ed3a7d9349c2939f81b500a738cb733ab62fbecdbc1e38e83d45e12/cryptography-46.0.7-cp38-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:abad9dac36cbf55de6eb49badd4016806b3165d396f64925bf2999bcb67837ba", size = 4271955, upload-time = "2026-04-08T01:57:24.814Z" },
+    { url = "https://files.pythonhosted.org/packages/80/07/ad9b3c56ebb95ed2473d46df0847357e01583f4c52a85754d1a55e29e4d0/cryptography-46.0.7-cp38-abi3-manylinux_2_34_ppc64le.whl", hash = "sha256:935ce7e3cfdb53e3536119a542b839bb94ec1ad081013e9ab9b7cfd478b05006", size = 4879888, upload-time = "2026-04-08T01:57:26.88Z" },
+    { url = "https://files.pythonhosted.org/packages/b8/c7/201d3d58f30c4c2bdbe9b03844c291feb77c20511cc3586daf7edc12a47b/cryptography-46.0.7-cp38-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:35719dc79d4730d30f1c2b6474bd6acda36ae2dfae1e3c16f2051f215df33ce0", size = 4449961, upload-time = "2026-04-08T01:57:29.068Z" },
+    { url = "https://files.pythonhosted.org/packages/a5/ef/649750cbf96f3033c3c976e112265c33906f8e462291a33d77f90356548c/cryptography-46.0.7-cp38-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:7bbc6ccf49d05ac8f7d7b5e2e2c33830d4fe2061def88210a126d130d7f71a85", size = 4401696, upload-time = "2026-04-08T01:57:31.029Z" },
+    { url = "https://files.pythonhosted.org/packages/41/52/a8908dcb1a389a459a29008c29966c1d552588d4ae6d43f3a1a4512e0ebe/cryptography-46.0.7-cp38-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:a1529d614f44b863a7b480c6d000fe93b59acee9c82ffa027cfadc77521a9f5e", size = 4664256, upload-time = "2026-04-08T01:57:33.144Z" },
+    { url = "https://files.pythonhosted.org/packages/4b/fa/f0ab06238e899cc3fb332623f337a7364f36f4bb3f2534c2bb95a35b132c/cryptography-46.0.7-cp38-abi3-win32.whl", hash = "sha256:f247c8c1a1fb45e12586afbb436ef21ff1e80670b2861a90353d9b025583d246", size = 3013001, upload-time = "2026-04-08T01:57:34.933Z" },
+    { url = "https://files.pythonhosted.org/packages/d2/f1/00ce3bde3ca542d1acd8f8cfa38e446840945aa6363f9b74746394b14127/cryptography-46.0.7-cp38-abi3-win_amd64.whl", hash = "sha256:506c4ff91eff4f82bdac7633318a526b1d1309fc07ca76a3ad182cb5b686d6d3", size = 3472985, upload-time = "2026-04-08T01:57:36.714Z" },
+]
+
+[[package]]
+name = "cymem"
+version = "2.0.13"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/c0/8f/2f0fbb32535c3731b7c2974c569fb9325e0a38ed5565a08e1139a3b71e82/cymem-2.0.13.tar.gz", hash = "sha256:1c91a92ae8c7104275ac26bd4d29b08ccd3e7faff5893d3858cb6fadf1bc1588", size = 12320, upload-time = "2025-11-14T14:58:36.902Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/c9/52/478a2911ab5028cb710b4900d64aceba6f4f882fcb13fd8d40a456a1b6dc/cymem-2.0.13-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:e8afbc5162a0fe14b6463e1c4e45248a1b2fe2cbcecc8a5b9e511117080da0eb", size = 43745, upload-time = "2025-11-14T14:57:32.52Z" },
+    { url = "https://files.pythonhosted.org/packages/f9/71/f0f8adee945524774b16af326bd314a14a478ed369a728a22834e6785a18/cymem-2.0.13-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:c9251d889348fe79a75e9b3e4d1b5fa651fca8a64500820685d73a3acc21b6a8", size = 42927, upload-time = "2025-11-14T14:57:33.827Z" },
+    { url = "https://files.pythonhosted.org/packages/62/6d/159780fe162ff715d62b809246e5fc20901cef87ca28b67d255a8d741861/cymem-2.0.13-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:742fc19764467a49ed22e56a4d2134c262d73a6c635409584ae3bf9afa092c33", size = 258346, upload-time = "2025-11-14T14:57:34.917Z" },
+    { url = "https://files.pythonhosted.org/packages/eb/12/678d16f7aa1996f947bf17b8cfb917ea9c9674ef5e2bd3690c04123d5680/cymem-2.0.13-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:f190a92fe46197ee64d32560eb121c2809bb843341733227f51538ce77b3410d", size = 260843, upload-time = "2025-11-14T14:57:36.503Z" },
+    { url = "https://files.pythonhosted.org/packages/31/5d/0dd8c167c08cd85e70d274b7235cfe1e31b3cebc99221178eaf4bbb95c6f/cymem-2.0.13-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:d670329ee8dbbbf241b7c08069fe3f1d3a1a3e2d69c7d05ea008a7010d826298", size = 254607, upload-time = "2025-11-14T14:57:38.036Z" },
+    { url = "https://files.pythonhosted.org/packages/b7/c9/d6514a412a1160aa65db539836b3d47f9b59f6675f294ec34ae32f867c82/cymem-2.0.13-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:a84ba3178d9128b9ffb52ce81ebab456e9fe959125b51109f5b73ebdfc6b60d6", size = 262421, upload-time = "2025-11-14T14:57:39.265Z" },
+    { url = "https://files.pythonhosted.org/packages/dd/fe/3ee37d02ca4040f2fb22d34eb415198f955862b5dd47eee01df4c8f5454c/cymem-2.0.13-cp312-cp312-win_amd64.whl", hash = "sha256:2ff1c41fd59b789579fdace78aa587c5fc091991fa59458c382b116fc36e30dc", size = 40176, upload-time = "2025-11-14T14:57:40.706Z" },
+    { url = "https://files.pythonhosted.org/packages/94/fb/1b681635bfd5f2274d0caa8f934b58435db6c091b97f5593738065ddb786/cymem-2.0.13-cp312-cp312-win_arm64.whl", hash = "sha256:6bbd701338df7bf408648191dff52472a9b334f71bcd31a21a41d83821050f67", size = 35959, upload-time = "2025-11-14T14:57:41.682Z" },
+    { url = "https://files.pythonhosted.org/packages/ce/0f/95a4d1e3bebfdfa7829252369357cf9a764f67569328cd9221f21e2c952e/cymem-2.0.13-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:891fd9030293a8b652dc7fb9fdc79a910a6c76fc679cd775e6741b819ffea476", size = 43478, upload-time = "2025-11-14T14:57:42.682Z" },
+    { url = "https://files.pythonhosted.org/packages/bf/a0/8fc929cc29ae466b7b4efc23ece99cbd3ea34992ccff319089c624d667fd/cymem-2.0.13-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:89c4889bd16513ce1644ccfe1e7c473ba7ca150f0621e66feac3a571bde09e7e", size = 42695, upload-time = "2025-11-14T14:57:43.741Z" },
+    { url = "https://files.pythonhosted.org/packages/4a/b3/deeb01354ebaf384438083ffe0310209ef903db3e7ba5a8f584b06d28387/cymem-2.0.13-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:45dcaba0f48bef9cc3d8b0b92058640244a95a9f12542210b51318da97c2cf28", size = 250573, upload-time = "2025-11-14T14:57:44.81Z" },
+    { url = "https://files.pythonhosted.org/packages/36/36/bc980b9a14409f3356309c45a8d88d58797d02002a9d794dd6c84e809d3a/cymem-2.0.13-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:e96848faaafccc0abd631f1c5fb194eac0caee4f5a8777fdbb3e349d3a21741c", size = 254572, upload-time = "2025-11-14T14:57:46.023Z" },
+    { url = "https://files.pythonhosted.org/packages/fd/dd/a12522952624685bd0f8968e26d2ed6d059c967413ce6eb52292f538f1b0/cymem-2.0.13-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:e02d3e2c3bfeb21185d5a4a70790d9df40629a87d8d7617dc22b4e864f665fa3", size = 248060, upload-time = "2025-11-14T14:57:47.605Z" },
+    { url = "https://files.pythonhosted.org/packages/08/11/5dc933ddfeb2dfea747a0b935cb965b9a7580b324d96fc5f5a1b5ff8df29/cymem-2.0.13-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:fece5229fd5ecdcd7a0738affb8c59890e13073ae5626544e13825f26c019d3c", size = 254601, upload-time = "2025-11-14T14:57:48.861Z" },
+    { url = "https://files.pythonhosted.org/packages/70/66/d23b06166864fa94e13a98e5922986ce774832936473578febce64448d75/cymem-2.0.13-cp313-cp313-win_amd64.whl", hash = "sha256:38aefeb269597c1a0c2ddf1567dd8605489b661fa0369c6406c1acd433b4c7ba", size = 40103, upload-time = "2025-11-14T14:57:50.396Z" },
+    { url = "https://files.pythonhosted.org/packages/2f/9e/c7b21271ab88a21760f3afdec84d2bc09ffa9e6c8d774ad9d4f1afab0416/cymem-2.0.13-cp313-cp313-win_arm64.whl", hash = "sha256:717270dcfd8c8096b479c42708b151002ff98e434a7b6f1f916387a6c791e2ad", size = 36016, upload-time = "2025-11-14T14:57:51.611Z" },
+    { url = "https://files.pythonhosted.org/packages/7f/28/d3b03427edc04ae04910edf1c24b993881c3ba93a9729a42bcbb816a1808/cymem-2.0.13-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:7e1a863a7f144ffb345397813701509cfc74fc9ed360a4d92799805b4b865dd1", size = 46429, upload-time = "2025-11-14T14:57:52.582Z" },
+    { url = "https://files.pythonhosted.org/packages/35/a9/7ed53e481f47ebfb922b0b42e980cec83e98ccb2137dc597ea156642440c/cymem-2.0.13-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:c16cb80efc017b054f78998c6b4b013cef509c7b3d802707ce1f85a1d68361bf", size = 46205, upload-time = "2025-11-14T14:57:53.64Z" },
+    { url = "https://files.pythonhosted.org/packages/61/39/a3d6ad073cf7f0fbbb8bbf09698c3c8fac11be3f791d710239a4e8dd3438/cymem-2.0.13-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:0d78a27c88b26c89bd1ece247d1d5939dba05a1dae6305aad8fd8056b17ddb51", size = 296083, upload-time = "2025-11-14T14:57:55.922Z" },
+    { url = "https://files.pythonhosted.org/packages/36/0c/20697c8bc19f624a595833e566f37d7bcb9167b0ce69de896eba7cfc9c2d/cymem-2.0.13-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:6d36710760f817194dacb09d9fc45cb6a5062ed75e85f0ef7ad7aeeb13d80cc3", size = 286159, upload-time = "2025-11-14T14:57:57.106Z" },
+    { url = "https://files.pythonhosted.org/packages/82/d4/9326e3422d1c2d2b4a8fb859bdcce80138f6ab721ddafa4cba328a505c71/cymem-2.0.13-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:c8f30971cadd5dcf73bcfbbc5849b1f1e1f40db8cd846c4aa7d3b5e035c7b583", size = 288186, upload-time = "2025-11-14T14:57:58.334Z" },
+    { url = "https://files.pythonhosted.org/packages/ed/bc/68da7dd749b72884dc22e898562f335002d70306069d496376e5ff3b6153/cymem-2.0.13-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:9d441d0e45798ec1fd330373bf7ffa6b795f229275f64016b6a193e6e2a51522", size = 290353, upload-time = "2025-11-14T14:58:00.562Z" },
+    { url = "https://files.pythonhosted.org/packages/50/23/dbf2ad6ecd19b99b3aab6203b1a06608bbd04a09c522d836b854f2f30f73/cymem-2.0.13-cp313-cp313t-win_amd64.whl", hash = "sha256:d1c950eebb9f0f15e3ef3591313482a5a611d16fc12d545e2018cd607f40f472", size = 44764, upload-time = "2025-11-14T14:58:01.793Z" },
+    { url = "https://files.pythonhosted.org/packages/54/3f/35701c13e1fc7b0895198c8b20068c569a841e0daf8e0b14d1dc0816b28f/cymem-2.0.13-cp313-cp313t-win_arm64.whl", hash = "sha256:042e8611ef862c34a97b13241f5d0da86d58aca3cecc45c533496678e75c5a1f", size = 38964, upload-time = "2025-11-14T14:58:02.87Z" },
+    { url = "https://files.pythonhosted.org/packages/a7/2e/f0e1596010a9a57fa9ebd124a678c07c5b2092283781ae51e79edcf5cb98/cymem-2.0.13-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:d2a4bf67db76c7b6afc33de44fb1c318207c3224a30da02c70901936b5aafdf1", size = 43812, upload-time = "2025-11-14T14:58:04.227Z" },
+    { url = "https://files.pythonhosted.org/packages/bc/45/8ccc21df08fcbfa6aa3efeb7efc11a1c81c90e7476e255768bb9c29ba02a/cymem-2.0.13-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:92a2ce50afa5625fb5ce7c9302cee61e23a57ccac52cd0410b4858e572f8614b", size = 42951, upload-time = "2025-11-14T14:58:05.424Z" },
+    { url = "https://files.pythonhosted.org/packages/01/8c/fe16531631f051d3d1226fa42e2d76fd2c8d5cfa893ec93baee90c7a9d90/cymem-2.0.13-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:bc116a70cc3a5dc3d1684db5268eff9399a0be8603980005e5b889564f1ea42f", size = 249878, upload-time = "2025-11-14T14:58:06.95Z" },
+    { url = "https://files.pythonhosted.org/packages/47/4b/39d67b80ffb260457c05fcc545de37d82e9e2dbafc93dd6b64f17e09b933/cymem-2.0.13-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:68489bf0035c4c280614067ab6a82815b01dc9fcd486742a5306fe9f68deb7ef", size = 252571, upload-time = "2025-11-14T14:58:08.232Z" },
+    { url = "https://files.pythonhosted.org/packages/53/0e/76f6531f74dfdfe7107899cce93ab063bb7ee086ccd3910522b31f623c08/cymem-2.0.13-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:03cb7bdb55718d5eb6ef0340b1d2430ba1386db30d33e9134d01ba9d6d34d705", size = 248555, upload-time = "2025-11-14T14:58:09.429Z" },
+    { url = "https://files.pythonhosted.org/packages/c7/7c/eee56757db81f0aefc2615267677ae145aff74228f529838425057003c0d/cymem-2.0.13-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:1710390e7fb2510a8091a1991024d8ae838fd06b02cdfdcd35f006192e3c6b0e", size = 254177, upload-time = "2025-11-14T14:58:10.594Z" },
+    { url = "https://files.pythonhosted.org/packages/77/e0/a4b58ec9e53c836dce07ef39837a64a599f4a21a134fc7ca57a3a8f9a4b5/cymem-2.0.13-cp314-cp314-win_amd64.whl", hash = "sha256:ac699c8ec72a3a9de8109bd78821ab22f60b14cf2abccd970b5ff310e14158ed", size = 40853, upload-time = "2025-11-14T14:58:12.116Z" },
+    { url = "https://files.pythonhosted.org/packages/61/81/9931d1f83e5aeba175440af0b28f0c2e6f71274a5a7b688bc3e907669388/cymem-2.0.13-cp314-cp314-win_arm64.whl", hash = "sha256:90c2d0c04bcda12cd5cebe9be93ce3af6742ad8da96e1b1907e3f8e00291def1", size = 36970, upload-time = "2025-11-14T14:58:13.114Z" },
+    { url = "https://files.pythonhosted.org/packages/b7/ef/af447c2184dec6dec973be14614df8ccb4d16d1c74e0784ab4f02538433c/cymem-2.0.13-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:ff036bbc1464993552fd1251b0a83fe102af334b301e3896d7aa05a4999ad042", size = 46804, upload-time = "2025-11-14T14:58:14.113Z" },
+    { url = "https://files.pythonhosted.org/packages/8c/95/e10f33a8d4fc17f9b933d451038218437f9326c2abb15a3e7f58ce2a06ec/cymem-2.0.13-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:fb8291691ba7ff4e6e000224cc97a744a8d9588418535c9454fd8436911df612", size = 46254, upload-time = "2025-11-14T14:58:15.156Z" },
+    { url = "https://files.pythonhosted.org/packages/e7/7a/5efeb2d2ea6ebad2745301ad33a4fa9a8f9a33b66623ee4d9185683007a6/cymem-2.0.13-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:d8d06ea59006b1251ad5794bcc00121e148434826090ead0073c7b7fedebe431", size = 296061, upload-time = "2025-11-14T14:58:16.254Z" },
+    { url = "https://files.pythonhosted.org/packages/0b/28/2a3f65842cc8443c2c0650cf23d525be06c8761ab212e0a095a88627be1b/cymem-2.0.13-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:c0046a619ecc845ccb4528b37b63426a0cbcb4f14d7940add3391f59f13701e6", size = 285784, upload-time = "2025-11-14T14:58:17.412Z" },
+    { url = "https://files.pythonhosted.org/packages/98/73/dd5f9729398f0108c2e71d942253d0d484d299d08b02e474d7cfc43ed0b0/cymem-2.0.13-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:18ad5b116a82fa3674bc8838bd3792891b428971e2123ae8c0fd3ca472157c5e", size = 288062, upload-time = "2025-11-14T14:58:20.225Z" },
+    { url = "https://files.pythonhosted.org/packages/5a/01/ffe51729a8f961a437920560659073e47f575d4627445216c1177ecd4a41/cymem-2.0.13-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:666ce6146bc61b9318aa70d91ce33f126b6344a25cf0b925621baed0c161e9cc", size = 290465, upload-time = "2025-11-14T14:58:21.815Z" },
+    { url = "https://files.pythonhosted.org/packages/fd/ac/c9e7d68607f71ef978c81e334ab2898b426944c71950212b1467186f69f9/cymem-2.0.13-cp314-cp314t-win_amd64.whl", hash = "sha256:84c1168c563d9d1e04546cb65e3e54fde2bf814f7c7faf11fc06436598e386d1", size = 46665, upload-time = "2025-11-14T14:58:23.512Z" },
+    { url = "https://files.pythonhosted.org/packages/66/66/150e406a2db5535533aa3c946de58f0371f2e412e23f050c704588023e6e/cymem-2.0.13-cp314-cp314t-win_arm64.whl", hash = "sha256:e9027764dc5f1999fb4b4cabee1d0322c59e330c0a6485b436a68275f614277f", size = 39715, upload-time = "2025-11-14T14:58:24.773Z" },
+]
+
+[[package]]
+name = "defusedxml"
+version = "0.7.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/0f/d5/c66da9b79e5bdb124974bfe172b4daf3c984ebd9c2a06e2b8a4dc7331c72/defusedxml-0.7.1.tar.gz", hash = "sha256:1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69", size = 75520, upload-time = "2021-03-08T10:59:26.269Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/07/6c/aa3f2f849e01cb6a001cd8554a88d4c77c5c1a31c95bdf1cf9301e6d9ef4/defusedxml-0.7.1-py2.py3-none-any.whl", hash = "sha256:a352e7e428770286cc899e2542b6cdaedb2b4953ff269a210103ec58f6198a61", size = 25604, upload-time = "2021-03-08T10:59:24.45Z" },
+]
+
+[[package]]
+name = "dify-agent"
+version = "0.1.0"
+source = { editable = "." }
+dependencies = [
+    { name = "httpx" },
+    { name = "pydantic" },
+    { name = "pydantic-ai-slim" },
+    { name = "typing-extensions" },
+]
+
+[package.optional-dependencies]
+server = [
+    { name = "fastapi" },
+    { name = "graphon" },
+    { name = "jsonschema" },
+    { name = "pydantic-ai-slim", extra = ["anthropic", "google", "openai"] },
+    { name = "pydantic-settings" },
+    { name = "redis" },
+    { name = "uvicorn", extra = ["standard"] },
+]
+
+[package.dev-dependencies]
+dev = [
+    { name = "basedpyright" },
+    { name = "coverage" },
+    { name = "pytest" },
+    { name = "pytest-examples" },
+    { name = "pytest-mock" },
+    { name = "ruff" },
+]
+docs = [
+    { name = "mkdocs" },
+    { name = "mkdocs-glightbox" },
+    { name = "mkdocs-material" },
+    { name = "mkdocstrings-python" },
+]
+
+[package.metadata]
+requires-dist = [
+    { name = "fastapi", marker = "extra == 'server'", specifier = ">=0.136.0" },
+    { name = "graphon", marker = "extra == 'server'", specifier = "~=0.2.2" },
+    { name = "httpx", specifier = ">=0.28.1" },
+    { name = "jsonschema", marker = "extra == 'server'", specifier = ">=4.23.0" },
+    { name = "pydantic", specifier = ">=2.12.5,<2.13" },
+    { name = "pydantic-ai-slim", specifier = ">=1.85.1" },
+    { name = "pydantic-ai-slim", extras = ["anthropic", "google", "openai"], marker = "extra == 'server'", specifier = ">=1.85.1" },
+    { name = "pydantic-settings", marker = "extra == 'server'", specifier = ">=2.12.0" },
+    { name = "redis", marker = "extra == 'server'", specifier = ">=5" },
+    { name = "typing-extensions", specifier = ">=4.12.2" },
+    { name = "uvicorn", extras = ["standard"], marker = "extra == 'server'", specifier = ">=0.38.0" },
+]
+provides-extras = ["server"]
+
+[package.metadata.requires-dev]
+dev = [
+    { name = "basedpyright", specifier = ">=1.39.3" },
+    { name = "coverage", extras = ["toml"], specifier = ">=7.10.7" },
+    { name = "pytest", specifier = ">=9.0.3" },
+    { name = "pytest-examples", specifier = ">=0.0.18" },
+    { name = "pytest-mock", specifier = ">=3.14.0" },
+    { name = "ruff", specifier = ">=0.15.11" },
+]
+docs = [
+    { name = "mkdocs", specifier = ">=1.6.1,<2" },
+    { name = "mkdocs-glightbox", specifier = ">=0.4.0" },
+    { name = "mkdocs-material", specifier = ">=9.7.0" },
+    { name = "mkdocstrings-python", specifier = ">=2.0.0" },
+]
+
+[[package]]
+name = "distro"
+version = "1.9.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/fc/f8/98eea607f65de6527f8a2e8885fc8015d3e6f5775df186e443e0964a11c3/distro-1.9.0.tar.gz", hash = "sha256:2fa77c6fd8940f116ee1d6b94a2f90b13b5ea8d019b98bc8bafdcabcdd9bdbed", size = 60722, upload-time = "2023-12-24T09:54:32.31Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/12/b3/231ffd4ab1fc9d679809f356cebee130ac7daa00d6d6f3206dd4fd137e9e/distro-1.9.0-py3-none-any.whl", hash = "sha256:7bffd925d65168f85027d8da9af6bddab658135b840670a223589bc0c8ef02b2", size = 20277, upload-time = "2023-12-24T09:54:30.421Z" },
+]
+
+[[package]]
+name = "docstring-parser"
+version = "0.18.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/e0/4d/f332313098c1de1b2d2ff91cf2674415cc7cddab2ca1b01ae29774bd5fdf/docstring_parser-0.18.0.tar.gz", hash = "sha256:292510982205c12b1248696f44959db3cdd1740237a968ea1e2e7a900eeb2015", size = 29341, upload-time = "2026-04-14T04:09:19.867Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/a7/5f/ed01f9a3cdffbd5a008556fc7b2a08ddb1cc6ace7effa7340604b1d16699/docstring_parser-0.18.0-py3-none-any.whl", hash = "sha256:b3fcbed555c47d8479be0796ef7e19c2670d428d72e96da63f3a40122860374b", size = 22484, upload-time = "2026-04-14T04:09:18.638Z" },
+]
+
+[[package]]
+name = "emoji"
+version = "2.15.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/a2/78/0d2db9382c92a163d7095fc08efff7800880f830a152cfced40161e7638d/emoji-2.15.0.tar.gz", hash = "sha256:eae4ab7d86456a70a00a985125a03263a5eac54cd55e51d7e184b1ed3b6757e4", size = 615483, upload-time = "2025-09-21T12:13:02.755Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/e1/5e/4b5aaaabddfacfe36ba7768817bd1f71a7a810a43705e531f3ae4c690767/emoji-2.15.0-py3-none-any.whl", hash = "sha256:205296793d66a89d88af4688fa57fd6496732eb48917a87175a023c8138995eb", size = 608433, upload-time = "2025-09-21T12:13:01.197Z" },
+]
+
+[[package]]
+name = "et-xmlfile"
+version = "2.0.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/d3/38/af70d7ab1ae9d4da450eeec1fa3918940a5fafb9055e934af8d6eb0c2313/et_xmlfile-2.0.0.tar.gz", hash = "sha256:dab3f4764309081ce75662649be815c4c9081e88f0837825f90fd28317d4da54", size = 17234, upload-time = "2024-10-25T17:25:40.039Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/c1/8b/5fe2cc11fee489817272089c4203e679c63b570a5aaeb18d852ae3cbba6a/et_xmlfile-2.0.0-py3-none-any.whl", hash = "sha256:7a91720bc756843502c3b7504c77b8fe44217c85c537d85037f0f536151b2caa", size = 18059, upload-time = "2024-10-25T17:25:39.051Z" },
+]
+
+[[package]]
+name = "fastapi"
+version = "0.136.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "annotated-doc" },
+    { name = "pydantic" },
+    { name = "starlette" },
+    { name = "typing-extensions" },
+    { name = "typing-inspection" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/4e/d9/e66315807e41e69e7f6a1b42a162dada2f249c5f06ad3f1a95f84ab336ef/fastapi-0.136.0.tar.gz", hash = "sha256:cf08e067cc66e106e102d9ba659463abfac245200752f8a5b7b1e813de4ff73e", size = 396607, upload-time = "2026-04-16T11:47:13.623Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/26/a3/0bd5f0cdb0bbc92650e8dc457e9250358411ee5d1b65e42b6632387daf81/fastapi-0.136.0-py3-none-any.whl", hash = "sha256:8793d44ec7378e2be07f8a013cf7f7aa47d6327d0dfe9804862688ec4541a6b4", size = 117556, upload-time = "2026-04-16T11:47:11.922Z" },
+]
+
+[[package]]
+name = "filelock"
+version = "3.29.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/b5/fe/997687a931ab51049acce6fa1f23e8f01216374ea81374ddee763c493db5/filelock-3.29.0.tar.gz", hash = "sha256:69974355e960702e789734cb4871f884ea6fe50bd8404051a3530bc07809cf90", size = 57571, upload-time = "2026-04-19T15:39:10.068Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/81/47/dd9a212ef6e343a6857485ffe25bba537304f1913bdbed446a23f7f592e1/filelock-3.29.0-py3-none-any.whl", hash = "sha256:96f5f6344709aa1572bbf631c640e4ebeeb519e08da902c39a001882f30ac258", size = 39812, upload-time = "2026-04-19T15:39:08.752Z" },
+]
+
+[[package]]
+name = "filetype"
+version = "1.2.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/bb/29/745f7d30d47fe0f251d3ad3dc2978a23141917661998763bebb6da007eb1/filetype-1.2.0.tar.gz", hash = "sha256:66b56cd6474bf41d8c54660347d37afcc3f7d1970648de365c102ef77548aadb", size = 998020, upload-time = "2022-11-02T17:34:04.141Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/18/79/1b8fa1bb3568781e84c9200f951c735f3f157429f44be0495da55894d620/filetype-1.2.0-py2.py3-none-any.whl", hash = "sha256:7ce71b6880181241cf7ac8697a2f1eb6a8bd9b429f7ad6d27b8db9ba5f1c2d25", size = 19970, upload-time = "2022-11-02T17:34:01.425Z" },
+]
+
+[[package]]
+name = "fsspec"
+version = "2026.3.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/e1/cf/b50ddf667c15276a9ab15a70ef5f257564de271957933ffea49d2cdbcdfb/fsspec-2026.3.0.tar.gz", hash = "sha256:1ee6a0e28677557f8c2f994e3eea77db6392b4de9cd1f5d7a9e87a0ae9d01b41", size = 313547, upload-time = "2026-03-27T19:11:14.892Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/d5/1f/5f4a3cd9e4440e9d9bc78ad0a91a1c8d46b4d429d5239ebe6793c9fe5c41/fsspec-2026.3.0-py3-none-any.whl", hash = "sha256:d2ceafaad1b3457968ed14efa28798162f1638dbb5d2a6868a2db002a5ee39a4", size = 202595, upload-time = "2026-03-27T19:11:13.595Z" },
+]
+
+[[package]]
+name = "genai-prices"
+version = "0.0.57"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "httpx" },
+    { name = "pydantic" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/be/30/11f3d683cf3b1d9612475ad8bfffe3423ce9f50fc617733109033e73a038/genai_prices-0.0.57.tar.gz", hash = "sha256:6e101e9c53975557ceffa237b0995787d81fe75aac12410f2898504188bcad89", size = 66555, upload-time = "2026-04-21T13:42:52.554Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/a9/fe/d0095040c120d97cb63d055224ecd4e913dc5655315c203c8e83bf13aa86/genai_prices-0.0.57-py3-none-any.whl", hash = "sha256:14e50fb69cdc5a06ddb2a6df5a7fe06741b9e44304ce3f1728f56abdf1856cca", size = 69654, upload-time = "2026-04-21T13:42:51.236Z" },
+]
+
+[[package]]
+name = "ghp-import"
+version = "2.1.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "python-dateutil" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/d9/29/d40217cbe2f6b1359e00c6c307bb3fc876ba74068cbab3dde77f03ca0dc4/ghp-import-2.1.0.tar.gz", hash = "sha256:9c535c4c61193c2df8871222567d7fd7e5014d835f97dc7b7439069e2413d343", size = 10943, upload-time = "2022-05-02T15:47:16.11Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/f7/ec/67fbef5d497f86283db54c22eec6f6140243aae73265799baaaa19cd17fb/ghp_import-2.1.0-py3-none-any.whl", hash = "sha256:8337dd7b50877f163d4c0289bc1f1c7f127550241988d568c1db512c4324a619", size = 11034, upload-time = "2022-05-02T15:47:14.552Z" },
+]
+
+[[package]]
+name = "google-auth"
+version = "2.49.2"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "cryptography" },
+    { name = "pyasn1-modules" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/c6/fc/e925290a1ad95c975c459e2df070fac2b90954e13a0370ac505dff78cb99/google_auth-2.49.2.tar.gz", hash = "sha256:c1ae38500e73065dcae57355adb6278cf8b5c8e391994ae9cbadbcb9631ab409", size = 333958, upload-time = "2026-04-10T00:41:21.888Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/73/76/d241a5c927433420507215df6cac1b1fa4ac0ba7a794df42a84326c68da8/google_auth-2.49.2-py3-none-any.whl", hash = "sha256:c2720924dfc82dedb962c9f52cabb2ab16714fd0a6a707e40561d217574ed6d5", size = 240638, upload-time = "2026-04-10T00:41:14.501Z" },
+]
+
+[package.optional-dependencies]
+requests = [
+    { name = "requests" },
+]
+
+[[package]]
+name = "google-genai"
+version = "1.73.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "anyio" },
+    { name = "distro" },
+    { name = "google-auth", extra = ["requests"] },
+    { name = "httpx" },
+    { name = "pydantic" },
+    { name = "requests" },
+    { name = "sniffio" },
+    { name = "tenacity" },
+    { name = "typing-extensions" },
+    { name = "websockets" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/3d/d8/40f5f107e5a2976bbac52d421f04d14fc221b55a8f05e66be44b2f739fe6/google_genai-1.73.1.tar.gz", hash = "sha256:b637e3a3b9e2eccc46f27136d470165803de84eca52abfed2e7352081a4d5a15", size = 530998, upload-time = "2026-04-14T21:06:19.153Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/65/af/508e0528015240d710c6763f7c89ff44fab9a94a80b4377e265d692cbfd6/google_genai-1.73.1-py3-none-any.whl", hash = "sha256:af2d2287d25e42a187de19811ef33beb2e347c7e2bdb4dc8c467d78254e43a2c", size = 783595, upload-time = "2026-04-14T21:06:17.464Z" },
+]
+
+[[package]]
+name = "graphon"
+version = "0.2.2"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "charset-normalizer" },
+    { name = "httpx" },
+    { name = "json-repair" },
+    { name = "jsonschema" },
+    { name = "orjson" },
+    { name = "pandas", extra = ["excel"] },
+    { name = "pydantic" },
+    { name = "pydantic-extra-types" },
+    { name = "pypandoc" },
+    { name = "pypdfium2" },
+    { name = "python-docx" },
+    { name = "pyyaml" },
+    { name = "tiktoken" },
+    { name = "transformers" },
+    { name = "typing-extensions" },
+    { name = "unstructured", extra = ["docx", "epub", "md", "ppt", "pptx"] },
+    { name = "webvtt-py" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/08/50/e745a79c5f742f88f6011a1f7c9ba2c2f9cc1beedd982f0b192f1ab8c748/graphon-0.2.2.tar.gz", hash = "sha256:141f0de536171850f1af6f738dc66f0285aadd3c097f1dad2a038636789e0aa5", size = 236360, upload-time = "2026-04-17T08:52:28.047Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/de/89/a6340afdaf5169d17a318e00fc685fb67ed99baa602c2cbbbf6af6a76096/graphon-0.2.2-py3-none-any.whl", hash = "sha256:754e544d08779138f99eac6547ab08559463680e2c76488b05e1c978210392b4", size = 340808, upload-time = "2026-04-17T08:52:26.5Z" },
+]
+
+[[package]]
+name = "griffelib"
+version = "2.0.2"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/9d/82/74f4a3310cdabfbb10da554c3a672847f1ed33c6f61dd472681ce7f1fe67/griffelib-2.0.2.tar.gz", hash = "sha256:3cf20b3bc470e83763ffbf236e0076b1211bac1bc67de13daf494640f2de707e", size = 166461, upload-time = "2026-03-27T11:34:51.091Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/11/8c/c9138d881c79aa0ea9ed83cbd58d5ca75624378b38cee225dcf5c42cc91f/griffelib-2.0.2-py3-none-any.whl", hash = "sha256:925c857658fb1ba40c0772c37acbc2ab650bd794d9c1b9726922e36ea4117ea1", size = 142357, upload-time = "2026-03-27T11:34:46.275Z" },
+]
+
+[[package]]
+name = "h11"
+version = "0.16.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/01/ee/02a2c011bdab74c6fb3c75474d40b3052059d95df7e73351460c8588d963/h11-0.16.0.tar.gz", hash = "sha256:4e35b956cf45792e4caa5885e69fba00bdbc6ffafbfa020300e549b208ee5ff1", size = 101250, upload-time = "2025-04-24T03:35:25.427Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/04/4b/29cac41a4d98d144bf5f6d33995617b185d14b22401f75ca86f384e87ff1/h11-0.16.0-py3-none-any.whl", hash = "sha256:63cf8bbe7522de3bf65932fda1d9c2772064ffb3dae62d55932da54b31cb6c86", size = 37515, upload-time = "2025-04-24T03:35:24.344Z" },
+]
+
+[[package]]
+name = "hf-xet"
+version = "1.4.3"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/53/92/ec9ad04d0b5728dca387a45af7bc98fbb0d73b2118759f5f6038b61a57e8/hf_xet-1.4.3.tar.gz", hash = "sha256:8ddedb73c8c08928c793df2f3401ec26f95be7f7e516a7bee2fbb546f6676113", size = 670477, upload-time = "2026-03-31T22:40:07.874Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/72/43/724d307b34e353da0abd476e02f72f735cdd2bc86082dee1b32ea0bfee1d/hf_xet-1.4.3-cp313-cp313t-macosx_10_12_x86_64.whl", hash = "sha256:7551659ba4f1e1074e9623996f28c3873682530aee0a846b7f2f066239228144", size = 3800935, upload-time = "2026-03-31T22:39:49.618Z" },
+    { url = "https://files.pythonhosted.org/packages/2b/d2/8bee5996b699262edb87dbb54118d287c0e1b2fc78af7cdc41857ba5e3c4/hf_xet-1.4.3-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:bee693ada985e7045997f05f081d0e12c4c08bd7626dc397f8a7c487e6c04f7f", size = 3558942, upload-time = "2026-03-31T22:39:47.938Z" },
+    { url = "https://files.pythonhosted.org/packages/c3/a1/e993d09cbe251196fb60812b09a58901c468127b7259d2bf0f68bf6088eb/hf_xet-1.4.3-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:21644b404bb0100fe3857892f752c4d09642586fd988e61501c95bbf44b393a3", size = 4207657, upload-time = "2026-03-31T22:39:39.69Z" },
+    { url = "https://files.pythonhosted.org/packages/64/44/9eb6d21e5c34c63e5e399803a6932fa983cabdf47c0ecbcfe7ea97684b8c/hf_xet-1.4.3-cp313-cp313t-manylinux_2_28_aarch64.whl", hash = "sha256:987f09cfe418237812896a6736b81b1af02a3a6dcb4b4944425c4c4fca7a7cf8", size = 3986765, upload-time = "2026-03-31T22:39:37.936Z" },
+    { url = "https://files.pythonhosted.org/packages/ea/7b/8ad6f16fdb82f5f7284a34b5ec48645bd575bdcd2f6f0d1644775909c486/hf_xet-1.4.3-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:60cf7fc43a99da0a853345cf86d23738c03983ee5249613a6305d3e57a5dca74", size = 4188162, upload-time = "2026-03-31T22:39:58.382Z" },
+    { url = "https://files.pythonhosted.org/packages/1b/c4/39d6e136cbeea9ca5a23aad4b33024319222adbdc059ebcda5fc7d9d5ff4/hf_xet-1.4.3-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:2815a49a7a59f3e2edf0cf113ae88e8cb2ca2a221bf353fb60c609584f4884d4", size = 4424525, upload-time = "2026-03-31T22:40:00.225Z" },
+    { url = "https://files.pythonhosted.org/packages/46/f2/adc32dae6bdbc367853118b9878139ac869419a4ae7ba07185dc31251b76/hf_xet-1.4.3-cp313-cp313t-win_amd64.whl", hash = "sha256:42ee323265f1e6a81b0e11094564fb7f7e0ec75b5105ffd91ae63f403a11931b", size = 3671610, upload-time = "2026-03-31T22:40:10.42Z" },
+    { url = "https://files.pythonhosted.org/packages/e2/19/25d897dcc3f81953e0c2cde9ec186c7a0fee413eb0c9a7a9130d87d94d3a/hf_xet-1.4.3-cp313-cp313t-win_arm64.whl", hash = "sha256:27c976ba60079fb8217f485b9c5c7fcd21c90b0367753805f87cb9f3cdc4418a", size = 3528529, upload-time = "2026-03-31T22:40:09.106Z" },
+    { url = "https://files.pythonhosted.org/packages/ec/36/3e8f85ca9fe09b8de2b2e10c63b3b3353d7dda88a0b3d426dffbe7b8313b/hf_xet-1.4.3-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:5251d5ece3a81815bae9abab41cf7ddb7bcb8f56411bce0827f4a3071c92fdc6", size = 3801019, upload-time = "2026-03-31T22:39:56.651Z" },
+    { url = "https://files.pythonhosted.org/packages/b5/9c/defb6cb1de28bccb7bd8d95f6e60f72a3d3fa4cb3d0329c26fb9a488bfe7/hf_xet-1.4.3-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:1feb0f3abeacee143367c326a128a2e2b60868ec12a36c225afb1d6c5a05e6d2", size = 3558746, upload-time = "2026-03-31T22:39:54.766Z" },
+    { url = "https://files.pythonhosted.org/packages/c1/bd/8d001191893178ff8e826e46ad5299446e62b93cd164e17b0ffea08832ec/hf_xet-1.4.3-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8b301fc150290ca90b4fccd079829b84bb4786747584ae08b94b4577d82fb791", size = 4207692, upload-time = "2026-03-31T22:39:46.246Z" },
+    { url = "https://files.pythonhosted.org/packages/ce/48/6790b402803250e9936435613d3a78b9aaeee7973439f0918848dde58309/hf_xet-1.4.3-cp314-cp314t-manylinux_2_28_aarch64.whl", hash = "sha256:d972fbe95ddc0d3c0fc49b31a8a69f47db35c1e3699bf316421705741aab6653", size = 3986281, upload-time = "2026-03-31T22:39:44.648Z" },
+    { url = "https://files.pythonhosted.org/packages/51/56/ea62552fe53db652a9099eda600b032d75554d0e86c12a73824bfedef88b/hf_xet-1.4.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:c5b48db1ee344a805a1b9bd2cda9b6b65fe77ed3787bd6e87ad5521141d317cd", size = 4187414, upload-time = "2026-03-31T22:40:04.951Z" },
+    { url = "https://files.pythonhosted.org/packages/7d/f5/bc1456d4638061bea997e6d2db60a1a613d7b200e0755965ec312dc1ef79/hf_xet-1.4.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:22bdc1f5fb8b15bf2831440b91d1c9bbceeb7e10c81a12e8d75889996a5c9da8", size = 4424368, upload-time = "2026-03-31T22:40:06.347Z" },
+    { url = "https://files.pythonhosted.org/packages/e4/76/ab597bae87e1f06d18d3ecb8ed7f0d3c9a37037fc32ce76233d369273c64/hf_xet-1.4.3-cp314-cp314t-win_amd64.whl", hash = "sha256:0392c79b7cf48418cd61478c1a925246cf10639f4cd9d94368d8ca1e8df9ea07", size = 3672280, upload-time = "2026-03-31T22:40:16.401Z" },
+    { url = "https://files.pythonhosted.org/packages/62/05/2e462d34e23a09a74d73785dbed71cc5dbad82a72eee2ad60a72a554155d/hf_xet-1.4.3-cp314-cp314t-win_arm64.whl", hash = "sha256:681c92a07796325778a79d76c67011764ecc9042a8c3579332b61b63ae512075", size = 3528945, upload-time = "2026-03-31T22:40:14.995Z" },
+    { url = "https://files.pythonhosted.org/packages/ac/9f/9c23e4a447b8f83120798f9279d0297a4d1360bdbf59ef49ebec78fe2545/hf_xet-1.4.3-cp37-abi3-macosx_10_12_x86_64.whl", hash = "sha256:d0da85329eaf196e03e90b84c2d0aca53bd4573d097a75f99609e80775f98025", size = 3805048, upload-time = "2026-03-31T22:39:53.105Z" },
+    { url = "https://files.pythonhosted.org/packages/0b/f8/7aacb8e5f4a7899d39c787b5984e912e6c18b11be136ef13947d7a66d265/hf_xet-1.4.3-cp37-abi3-macosx_11_0_arm64.whl", hash = "sha256:e23717ce4186b265f69afa66e6f0069fe7efbf331546f5c313d00e123dc84583", size = 3562178, upload-time = "2026-03-31T22:39:51.295Z" },
+    { url = "https://files.pythonhosted.org/packages/df/9a/a24b26dc8a65f0ecc0fe5be981a19e61e7ca963b85e062c083f3a9100529/hf_xet-1.4.3-cp37-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:fc360b70c815bf340ed56c7b8c63aacf11762a4b099b2fe2c9bd6d6068668c08", size = 4212320, upload-time = "2026-03-31T22:39:42.922Z" },
+    { url = "https://files.pythonhosted.org/packages/53/60/46d493db155d2ee2801b71fb1b0fd67696359047fdd8caee2c914cc50c79/hf_xet-1.4.3-cp37-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:39f2d2e9654cd9b4319885733993807aab6de9dfbd34c42f0b78338d6617421f", size = 3991546, upload-time = "2026-03-31T22:39:41.335Z" },
+    { url = "https://files.pythonhosted.org/packages/bc/f5/067363e1c96c6b17256910830d1b54099d06287e10f4ec6ec4e7e08371fc/hf_xet-1.4.3-cp37-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:49ad8a8cead2b56051aa84d7fce3e1335efe68df3cf6c058f22a65513885baac", size = 4193200, upload-time = "2026-03-31T22:40:01.936Z" },
+    { url = "https://files.pythonhosted.org/packages/42/4b/53951592882d9c23080c7644542fda34a3813104e9e11fa1a7d82d419cb8/hf_xet-1.4.3-cp37-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:7716d62015477a70ea272d2d68cd7cad140f61c52ee452e133e139abfe2c17ba", size = 4429392, upload-time = "2026-03-31T22:40:03.492Z" },
+    { url = "https://files.pythonhosted.org/packages/8a/21/75a6c175b4e79662ad8e62f46a40ce341d8d6b206b06b4320d07d55b188c/hf_xet-1.4.3-cp37-abi3-win_amd64.whl", hash = "sha256:6b591fcad34e272a5b02607485e4f2a1334aebf1bc6d16ce8eb1eb8978ac2021", size = 3677359, upload-time = "2026-03-31T22:40:13.619Z" },
+    { url = "https://files.pythonhosted.org/packages/8a/7c/44314ecd0e89f8b2b51c9d9e5e7a60a9c1c82024ac471d415860557d3cd8/hf_xet-1.4.3-cp37-abi3-win_arm64.whl", hash = "sha256:7c2c7e20bcfcc946dc67187c203463f5e932e395845d098cc2a93f5b67ca0b47", size = 3533664, upload-time = "2026-03-31T22:40:12.152Z" },
+]
+
+[[package]]
+name = "html5lib"
+version = "1.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "six" },
+    { name = "webencodings" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/ac/b6/b55c3f49042f1df3dcd422b7f224f939892ee94f22abcf503a9b7339eaf2/html5lib-1.1.tar.gz", hash = "sha256:b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f", size = 272215, upload-time = "2020-06-22T23:32:38.834Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/6c/dd/a834df6482147d48e225a49515aabc28974ad5a4ca3215c18a882565b028/html5lib-1.1-py2.py3-none-any.whl", hash = "sha256:0d78f8fde1c230e99fe37986a60526d7049ed4bf8a9fadbad5f00e22e58e041d", size = 112173, upload-time = "2020-06-22T23:32:36.781Z" },
+]
+
+[[package]]
+name = "httpcore"
+version = "1.0.9"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "certifi" },
+    { name = "h11" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/06/94/82699a10bca87a5556c9c59b5963f2d039dbd239f25bc2a63907a05a14cb/httpcore-1.0.9.tar.gz", hash = "sha256:6e34463af53fd2ab5d807f399a9b45ea31c3dfa2276f15a2c3f00afff6e176e8", size = 85484, upload-time = "2025-04-24T22:06:22.219Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/7e/f5/f66802a942d491edb555dd61e3a9961140fd64c90bce1eafd741609d334d/httpcore-1.0.9-py3-none-any.whl", hash = "sha256:2d400746a40668fc9dec9810239072b40b4484b640a8c38fd654a024c7a1bf55", size = 78784, upload-time = "2025-04-24T22:06:20.566Z" },
+]
+
+[[package]]
+name = "httptools"
+version = "0.7.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/b5/46/120a669232c7bdedb9d52d4aeae7e6c7dfe151e99dc70802e2fc7a5e1993/httptools-0.7.1.tar.gz", hash = "sha256:abd72556974f8e7c74a259655924a717a2365b236c882c3f6f8a45fe94703ac9", size = 258961, upload-time = "2025-10-10T03:55:08.559Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/53/7f/403e5d787dc4942316e515e949b0c8a013d84078a915910e9f391ba9b3ed/httptools-0.7.1-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:38e0c83a2ea9746ebbd643bdfb521b9aa4a91703e2cd705c20443405d2fd16a5", size = 206280, upload-time = "2025-10-10T03:54:39.274Z" },
+    { url = "https://files.pythonhosted.org/packages/2a/0d/7f3fd28e2ce311ccc998c388dd1c53b18120fda3b70ebb022b135dc9839b/httptools-0.7.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f25bbaf1235e27704f1a7b86cd3304eabc04f569c828101d94a0e605ef7205a5", size = 110004, upload-time = "2025-10-10T03:54:40.403Z" },
+    { url = "https://files.pythonhosted.org/packages/84/a6/b3965e1e146ef5762870bbe76117876ceba51a201e18cc31f5703e454596/httptools-0.7.1-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:2c15f37ef679ab9ecc06bfc4e6e8628c32a8e4b305459de7cf6785acd57e4d03", size = 517655, upload-time = "2025-10-10T03:54:41.347Z" },
+    { url = "https://files.pythonhosted.org/packages/11/7d/71fee6f1844e6fa378f2eddde6c3e41ce3a1fb4b2d81118dd544e3441ec0/httptools-0.7.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7fe6e96090df46b36ccfaf746f03034e5ab723162bc51b0a4cf58305324036f2", size = 511440, upload-time = "2025-10-10T03:54:42.452Z" },
+    { url = "https://files.pythonhosted.org/packages/22/a5/079d216712a4f3ffa24af4a0381b108aa9c45b7a5cc6eb141f81726b1823/httptools-0.7.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:f72fdbae2dbc6e68b8239defb48e6a5937b12218e6ffc2c7846cc37befa84362", size = 495186, upload-time = "2025-10-10T03:54:43.937Z" },
+    { url = "https://files.pythonhosted.org/packages/e9/9e/025ad7b65278745dee3bd0ebf9314934c4592560878308a6121f7f812084/httptools-0.7.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:e99c7b90a29fd82fea9ef57943d501a16f3404d7b9ee81799d41639bdaae412c", size = 499192, upload-time = "2025-10-10T03:54:45.003Z" },
+    { url = "https://files.pythonhosted.org/packages/6d/de/40a8f202b987d43afc4d54689600ff03ce65680ede2f31df348d7f368b8f/httptools-0.7.1-cp312-cp312-win_amd64.whl", hash = "sha256:3e14f530fefa7499334a79b0cf7e7cd2992870eb893526fb097d51b4f2d0f321", size = 86694, upload-time = "2025-10-10T03:54:45.923Z" },
+    { url = "https://files.pythonhosted.org/packages/09/8f/c77b1fcbfd262d422f12da02feb0d218fa228d52485b77b953832105bb90/httptools-0.7.1-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:6babce6cfa2a99545c60bfef8bee0cc0545413cb0018f617c8059a30ad985de3", size = 202889, upload-time = "2025-10-10T03:54:47.089Z" },
+    { url = "https://files.pythonhosted.org/packages/0a/1a/22887f53602feaa066354867bc49a68fc295c2293433177ee90870a7d517/httptools-0.7.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:601b7628de7504077dd3dcb3791c6b8694bbd967148a6d1f01806509254fb1ca", size = 108180, upload-time = "2025-10-10T03:54:48.052Z" },
+    { url = "https://files.pythonhosted.org/packages/32/6a/6aaa91937f0010d288d3d124ca2946d48d60c3a5ee7ca62afe870e3ea011/httptools-0.7.1-cp313-cp313-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:04c6c0e6c5fb0739c5b8a9eb046d298650a0ff38cf42537fc372b28dc7e4472c", size = 478596, upload-time = "2025-10-10T03:54:48.919Z" },
+    { url = "https://files.pythonhosted.org/packages/6d/70/023d7ce117993107be88d2cbca566a7c1323ccbaf0af7eabf2064fe356f6/httptools-0.7.1-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:69d4f9705c405ae3ee83d6a12283dc9feba8cc6aaec671b412917e644ab4fa66", size = 473268, upload-time = "2025-10-10T03:54:49.993Z" },
+    { url = "https://files.pythonhosted.org/packages/32/4d/9dd616c38da088e3f436e9a616e1d0cc66544b8cdac405cc4e81c8679fc7/httptools-0.7.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:44c8f4347d4b31269c8a9205d8a5ee2df5322b09bbbd30f8f862185bb6b05346", size = 455517, upload-time = "2025-10-10T03:54:51.066Z" },
+    { url = "https://files.pythonhosted.org/packages/1d/3a/a6c595c310b7df958e739aae88724e24f9246a514d909547778d776799be/httptools-0.7.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:465275d76db4d554918aba40bf1cbebe324670f3dfc979eaffaa5d108e2ed650", size = 458337, upload-time = "2025-10-10T03:54:52.196Z" },
+    { url = "https://files.pythonhosted.org/packages/fd/82/88e8d6d2c51edc1cc391b6e044c6c435b6aebe97b1abc33db1b0b24cd582/httptools-0.7.1-cp313-cp313-win_amd64.whl", hash = "sha256:322d00c2068d125bd570f7bf78b2d367dad02b919d8581d7476d8b75b294e3e6", size = 85743, upload-time = "2025-10-10T03:54:53.448Z" },
+    { url = "https://files.pythonhosted.org/packages/34/50/9d095fcbb6de2d523e027a2f304d4551855c2f46e0b82befd718b8b20056/httptools-0.7.1-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:c08fe65728b8d70b6923ce31e3956f859d5e1e8548e6f22ec520a962c6757270", size = 203619, upload-time = "2025-10-10T03:54:54.321Z" },
+    { url = "https://files.pythonhosted.org/packages/07/f0/89720dc5139ae54b03f861b5e2c55a37dba9a5da7d51e1e824a1f343627f/httptools-0.7.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:7aea2e3c3953521c3c51106ee11487a910d45586e351202474d45472db7d72d3", size = 108714, upload-time = "2025-10-10T03:54:55.163Z" },
+    { url = "https://files.pythonhosted.org/packages/b3/cb/eea88506f191fb552c11787c23f9a405f4c7b0c5799bf73f2249cd4f5228/httptools-0.7.1-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:0e68b8582f4ea9166be62926077a3334064d422cf08ab87d8b74664f8e9058e1", size = 472909, upload-time = "2025-10-10T03:54:56.056Z" },
+    { url = "https://files.pythonhosted.org/packages/e0/4a/a548bdfae6369c0d078bab5769f7b66f17f1bfaa6fa28f81d6be6959066b/httptools-0.7.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:df091cf961a3be783d6aebae963cc9b71e00d57fa6f149025075217bc6a55a7b", size = 470831, upload-time = "2025-10-10T03:54:57.219Z" },
+    { url = "https://files.pythonhosted.org/packages/4d/31/14df99e1c43bd132eec921c2e7e11cda7852f65619bc0fc5bdc2d0cb126c/httptools-0.7.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:f084813239e1eb403ddacd06a30de3d3e09a9b76e7894dcda2b22f8a726e9c60", size = 452631, upload-time = "2025-10-10T03:54:58.219Z" },
+    { url = "https://files.pythonhosted.org/packages/22/d2/b7e131f7be8d854d48cb6d048113c30f9a46dca0c9a8b08fcb3fcd588cdc/httptools-0.7.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:7347714368fb2b335e9063bc2b96f2f87a9ceffcd9758ac295f8bbcd3ffbc0ca", size = 452910, upload-time = "2025-10-10T03:54:59.366Z" },
+    { url = "https://files.pythonhosted.org/packages/53/cf/878f3b91e4e6e011eff6d1fa9ca39f7eb17d19c9d7971b04873734112f30/httptools-0.7.1-cp314-cp314-win_amd64.whl", hash = "sha256:cfabda2a5bb85aa2a904ce06d974a3f30fb36cc63d7feaddec05d2050acede96", size = 88205, upload-time = "2025-10-10T03:55:00.389Z" },
+]
+
+[[package]]
+name = "httpx"
+version = "0.28.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "anyio" },
+    { name = "certifi" },
+    { name = "httpcore" },
+    { name = "idna" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/b1/df/48c586a5fe32a0f01324ee087459e112ebb7224f646c0b5023f5e79e9956/httpx-0.28.1.tar.gz", hash = "sha256:75e98c5f16b0f35b567856f597f06ff2270a374470a5c2392242528e3e3e42fc", size = 141406, upload-time = "2024-12-06T15:37:23.222Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/2a/39/e50c7c3a983047577ee07d2a9e53faf5a69493943ec3f6a384bdc792deb2/httpx-0.28.1-py3-none-any.whl", hash = "sha256:d909fcccc110f8c7faf814ca82a9a4d816bc5a6dbfea25d6591d6985b8ba59ad", size = 73517, upload-time = "2024-12-06T15:37:21.509Z" },
+]
+
+[[package]]
+name = "huggingface-hub"
+version = "1.11.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "filelock" },
+    { name = "fsspec" },
+    { name = "hf-xet", marker = "platform_machine == 'AMD64' or platform_machine == 'aarch64' or platform_machine == 'amd64' or platform_machine == 'arm64' or platform_machine == 'x86_64'" },
+    { name = "httpx" },
+    { name = "packaging" },
+    { name = "pyyaml" },
+    { name = "tqdm" },
+    { name = "typer" },
+    { name = "typing-extensions" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/dc/89/e7aa12d8a6b9259bed10671abb25ae6fa437c0f88a86ecbf59617bae7759/huggingface_hub-1.11.0.tar.gz", hash = "sha256:15fb3713c7f9cdff7b808a94fd91664f661ab142796bb48c9cd9493e8d166278", size = 761749, upload-time = "2026-04-16T13:07:39.73Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/37/02/4f3f8997d1ea7fe0146b343e5e14bd065fa87af790d07e5576d31b31cc18/huggingface_hub-1.11.0-py3-none-any.whl", hash = "sha256:42a6de0afbfeb5e022222d36398f029679db4eb4778801aafda32257ae9131ab", size = 645499, upload-time = "2026-04-16T13:07:37.716Z" },
+]
+
+[[package]]
+name = "idna"
+version = "3.12"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/22/12/2948fbe5513d062169bd91f7d7b1cd97bc8894f32946b71fa39f6e63ca0c/idna-3.12.tar.gz", hash = "sha256:724e9952cc9e2bd7550ea784adb098d837ab5267ef67a1ab9cf7846bdbdd8254", size = 194350, upload-time = "2026-04-21T13:32:48.916Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/53/b2/acc33950394b3becb2b664741a0c0889c7ef9f9ffbfa8d47eddb53a50abd/idna-3.12-py3-none-any.whl", hash = "sha256:60ffaa1858fac94c9c124728c24fcde8160f3fb4a7f79aa8cdd33a9d1af60a67", size = 68634, upload-time = "2026-04-21T13:32:47.403Z" },
+]
+
+[[package]]
+name = "importlib-metadata"
+version = "8.7.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "zipp" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/f3/49/3b30cad09e7771a4982d9975a8cbf64f00d4a1ececb53297f1d9a7be1b10/importlib_metadata-8.7.1.tar.gz", hash = "sha256:49fef1ae6440c182052f407c8d34a68f72efc36db9ca90dc0113398f2fdde8bb", size = 57107, upload-time = "2025-12-21T10:00:19.278Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/fa/5e/f8e9a1d23b9c20a551a8a02ea3637b4642e22c2626e3a13a9a29cdea99eb/importlib_metadata-8.7.1-py3-none-any.whl", hash = "sha256:5a1f80bf1daa489495071efbb095d75a634cf28a8bc299581244063b53176151", size = 27865, upload-time = "2025-12-21T10:00:18.329Z" },
+]
+
+[[package]]
+name = "iniconfig"
+version = "2.3.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/72/34/14ca021ce8e5dfedc35312d08ba8bf51fdd999c576889fc2c24cb97f4f10/iniconfig-2.3.0.tar.gz", hash = "sha256:c76315c77db068650d49c5b56314774a7804df16fee4402c1f19d6d15d8c4730", size = 20503, upload-time = "2025-10-18T21:55:43.219Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/cb/b1/3846dd7f199d53cb17f49cba7e651e9ce294d8497c8c150530ed11865bb8/iniconfig-2.3.0-py3-none-any.whl", hash = "sha256:f631c04d2c48c52b84d0d0549c99ff3859c98df65b3101406327ecc7d53fbf12", size = 7484, upload-time = "2025-10-18T21:55:41.639Z" },
+]
+
+[[package]]
+name = "installer"
+version = "0.7.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/05/18/ceeb4e3ab3aa54495775775b38ae42b10a92f42ce42dfa44da684289b8c8/installer-0.7.0.tar.gz", hash = "sha256:a26d3e3116289bb08216e0d0f7d925fcef0b0194eedfa0c944bcaaa106c4b631", size = 474349, upload-time = "2023-03-17T20:39:38.871Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/e5/ca/1172b6638d52f2d6caa2dd262ec4c811ba59eee96d54a7701930726bce18/installer-0.7.0-py3-none-any.whl", hash = "sha256:05d1933f0a5ba7d8d6296bb6d5018e7c94fa473ceb10cf198a92ccea19c27b53", size = 453838, upload-time = "2023-03-17T20:39:36.219Z" },
+]
+
+[[package]]
+name = "jinja2"
+version = "3.1.6"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "markupsafe" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/df/bf/f7da0350254c0ed7c72f3e33cef02e048281fec7ecec5f032d4aac52226b/jinja2-3.1.6.tar.gz", hash = "sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d", size = 245115, upload-time = "2025-03-05T20:05:02.478Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/62/a1/3d680cbfd5f4b8f15abc1d571870c5fc3e594bb582bc3b64ea099db13e56/jinja2-3.1.6-py3-none-any.whl", hash = "sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67", size = 134899, upload-time = "2025-03-05T20:05:00.369Z" },
+]
+
+[[package]]
+name = "jiter"
+version = "0.14.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/6e/c1/0cddc6eb17d4c53a99840953f95dd3accdc5cfc7a337b0e9b26476276be9/jiter-0.14.0.tar.gz", hash = "sha256:e8a39e66dac7153cf3f964a12aad515afa8d74938ec5cc0018adcdae5367c79e", size = 165725, upload-time = "2026-04-10T14:28:42.01Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/5a/68/7390a418f10897da93b158f2d5a8bd0bcd73a0f9ec3bb36917085bb759ef/jiter-0.14.0-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:2fb2ce3a7bc331256dfb14cefc34832366bb28a9aca81deaf43bbf2a5659e607", size = 316295, upload-time = "2026-04-10T14:26:24.887Z" },
+    { url = "https://files.pythonhosted.org/packages/60/a0/5854ac00ff63551c52c6c89534ec6aba4b93474e7924d64e860b1c94165b/jiter-0.14.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:5252a7ca23785cef5d02d4ece6077a1b556a410c591b379f82091c3001e14844", size = 315898, upload-time = "2026-04-10T14:26:26.601Z" },
+    { url = "https://files.pythonhosted.org/packages/41/a1/4f44832650a16b18e8391f1bf1d6ca4909bc738351826bcc198bba4357f4/jiter-0.14.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c409578cbd77c338975670ada777add4efd53379667edf0aceea730cabede6fb", size = 343730, upload-time = "2026-04-10T14:26:28.326Z" },
+    { url = "https://files.pythonhosted.org/packages/48/64/a329e9d469f86307203594b1707e11ae51c3348d03bfd514a5f997870012/jiter-0.14.0-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:7ede4331a1899d604463369c730dbb961ffdc5312bc7f16c41c2896415b1304a", size = 370102, upload-time = "2026-04-10T14:26:30.089Z" },
+    { url = "https://files.pythonhosted.org/packages/94/c1/5e3dfc59635aa4d4c7bd20a820ac1d09b8ed851568356802cf1c08edb3cf/jiter-0.14.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:92cd8b6025981a041f5310430310b55b25ca593972c16407af8837d3d7d2ca01", size = 461335, upload-time = "2026-04-10T14:26:31.911Z" },
+    { url = "https://files.pythonhosted.org/packages/e3/1b/dd157009dbc058f7b00108f545ccb72a2d56461395c4fc7b9cfdccb00af4/jiter-0.14.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:351bf6eda4e3a7ceb876377840c702e9a3e4ecc4624dbfb2d6463c67ae52637d", size = 378536, upload-time = "2026-04-10T14:26:33.595Z" },
+    { url = "https://files.pythonhosted.org/packages/91/78/256013667b7c10b8834f8e6e54cd3e562d4c6e34227a1596addccc05e38c/jiter-0.14.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c1dcfbeb93d9ecd9ca128bbf8910120367777973fa193fb9a39c31237d8df165", size = 353859, upload-time = "2026-04-10T14:26:35.098Z" },
+    { url = "https://files.pythonhosted.org/packages/de/d9/137d65ade9093a409fe80955ce60b12bb753722c986467aeda47faf450ad/jiter-0.14.0-cp312-cp312-manylinux_2_31_riscv64.whl", hash = "sha256:ae039aaef8de3f8157ecc1fdd4d85043ac4f57538c245a0afaecb8321ec951c3", size = 357626, upload-time = "2026-04-10T14:26:36.685Z" },
+    { url = "https://files.pythonhosted.org/packages/2e/48/76750835b87029342727c1a268bea8878ab988caf81ee4e7b880900eeb5a/jiter-0.14.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:7d9d51eb96c82a9652933bd769fe6de66877d6eb2b2440e281f2938c51b5643e", size = 393172, upload-time = "2026-04-10T14:26:38.097Z" },
+    { url = "https://files.pythonhosted.org/packages/a6/60/456c4e81d5c8045279aefe60e9e483be08793828800a4e64add8fdde7f2a/jiter-0.14.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:d824ca4148b705970bf4e120924a212fdfca9859a73e42bd7889a63a4ea6bb98", size = 520300, upload-time = "2026-04-10T14:26:39.532Z" },
+    { url = "https://files.pythonhosted.org/packages/a8/9f/2020e0984c235f678dced38fe4eec3058cf528e6af36ebf969b410305941/jiter-0.14.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:ff3a6465b3a0f54b1a430f45c3c0ba7d61ceb45cbc3e33f9e1a7f638d690baf3", size = 553059, upload-time = "2026-04-10T14:26:40.991Z" },
+    { url = "https://files.pythonhosted.org/packages/ef/32/e2d298e1a22a4bbe6062136d1c7192db7dba003a6975e51d9a9eecabc4c2/jiter-0.14.0-cp312-cp312-win32.whl", hash = "sha256:5dec7c0a3e98d2a3f8a2e67382d0d7c3ac60c69103a4b271da889b4e8bb1e129", size = 206030, upload-time = "2026-04-10T14:26:42.517Z" },
+    { url = "https://files.pythonhosted.org/packages/36/ac/96369141b3d8a4a8e4590e983085efe1c436f35c0cda940dd76d942e3e40/jiter-0.14.0-cp312-cp312-win_amd64.whl", hash = "sha256:fc7e37b4b8bc7e80a63ad6cfa5fc11fab27dbfea4cc4ae644b1ab3f273dc348f", size = 201603, upload-time = "2026-04-10T14:26:44.328Z" },
+    { url = "https://files.pythonhosted.org/packages/01/c3/75d847f264647017d7e3052bbcc8b1e24b95fa139c320c5f5066fa7a0bdd/jiter-0.14.0-cp312-cp312-win_arm64.whl", hash = "sha256:ee4a72f12847ef29b072aee9ad5474041ab2924106bdca9fcf5d7d965853e057", size = 191525, upload-time = "2026-04-10T14:26:46Z" },
+    { url = "https://files.pythonhosted.org/packages/97/2a/09f70020898507a89279659a1afe3364d57fc1b2c89949081975d135f6f5/jiter-0.14.0-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:af72f204cf4d44258e5b4c1745130ac45ddab0e71a06333b01de660ab4187a94", size = 315502, upload-time = "2026-04-10T14:26:47.697Z" },
+    { url = "https://files.pythonhosted.org/packages/d6/be/080c96a45cd74f9fce5db4fd68510b88087fb37ffe2541ff73c12db92535/jiter-0.14.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:4b77da71f6e819be5fbcec11a453fde5b1d0267ef6ed487e2a392fd8e14e4e3a", size = 314870, upload-time = "2026-04-10T14:26:49.149Z" },
+    { url = "https://files.pythonhosted.org/packages/7d/5e/2d0fee155826a968a832cc32438de5e2a193292c8721ca70d0b53e58245b/jiter-0.14.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f4ea612fe8b84b8b04e51d0e78029ecf3466348e25973f953de6e6a59aa4c1", size = 343406, upload-time = "2026-04-10T14:26:50.762Z" },
+    { url = "https://files.pythonhosted.org/packages/70/af/bf9ee0d3a4f8dc0d679fc1337f874fe60cdbf841ebbb304b374e1c9aaceb/jiter-0.14.0-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:62fe2451f8fcc0240261e6a4df18ecbcd58327857e61e625b2393ea3b468aac9", size = 369415, upload-time = "2026-04-10T14:26:52.188Z" },
+    { url = "https://files.pythonhosted.org/packages/0f/83/8e8561eadba31f4d3948a5b712fb0447ec71c3560b57a855449e7b8ddc98/jiter-0.14.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:6112f26f5afc75bcb475787d29da3aa92f9d09c7858f632f4be6ffe607be82e9", size = 461456, upload-time = "2026-04-10T14:26:53.611Z" },
+    { url = "https://files.pythonhosted.org/packages/f6/c9/c5299e826a5fe6108d172b344033f61c69b1bb979dd8d9ddd4278a160971/jiter-0.14.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:215a6cb8fb7dc702aa35d475cc00ddc7f970e5c0b1417fb4b4ac5d82fa2a29db", size = 378488, upload-time = "2026-04-10T14:26:55.211Z" },
+    { url = "https://files.pythonhosted.org/packages/5d/37/c16d9d15c0a471b8644b1abe3c82668092a707d9bedcf076f24ff2e380cd/jiter-0.14.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fc4ab96a30fb3cb2c7e0cd33f7616c8860da5f5674438988a54ac717caccdbaa", size = 353242, upload-time = "2026-04-10T14:26:56.705Z" },
+    { url = "https://files.pythonhosted.org/packages/58/ea/8050cb0dc654e728e1bfacbc0c640772f2181af5dedd13ae70145743a439/jiter-0.14.0-cp313-cp313-manylinux_2_31_riscv64.whl", hash = "sha256:3a99c1387b1f2928f799a9de899193484d66206a50e98233b6b088a7f0c1edb2", size = 356823, upload-time = "2026-04-10T14:26:58.281Z" },
+    { url = "https://files.pythonhosted.org/packages/b0/3b/cf71506d270e5f84d97326bf220e47aed9b95e9a4a060758fb07772170ab/jiter-0.14.0-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:ab18d11074485438695f8d34a1b6da61db9754248f96d51341956607a8f39985", size = 392564, upload-time = "2026-04-10T14:27:00.018Z" },
+    { url = "https://files.pythonhosted.org/packages/b0/cc/8c6c74a3efb5bd671bfd14f51e8a73375464ca914b1551bc3b40e26ac2c9/jiter-0.14.0-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:801028dcfc26ac0895e4964cbc0fd62c73be9fd4a7d7b1aaf6e5790033a719b7", size = 520322, upload-time = "2026-04-10T14:27:01.664Z" },
+    { url = "https://files.pythonhosted.org/packages/41/24/68d7b883ec959884ddf00d019b2e0e82ba81b167e1253684fa90519ce33c/jiter-0.14.0-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:ad425b087aafb4a1c7e1e98a279200743b9aaf30c3e0ba723aec93f061bd9bc8", size = 552619, upload-time = "2026-04-10T14:27:03.316Z" },
+    { url = "https://files.pythonhosted.org/packages/b6/89/b1a0985223bbf3150ff9e8f46f98fc9360c1de94f48abe271bbe1b465682/jiter-0.14.0-cp313-cp313-win32.whl", hash = "sha256:882bcb9b334318e233950b8be366fe5f92c86b66a7e449e76975dfd6d776a01f", size = 205699, upload-time = "2026-04-10T14:27:04.662Z" },
+    { url = "https://files.pythonhosted.org/packages/4c/19/3f339a5a7f14a11730e67f6be34f9d5105751d547b615ef593fa122a5ded/jiter-0.14.0-cp313-cp313-win_amd64.whl", hash = "sha256:9b8c571a5dba09b98bd3462b5a53f27209a5cbbe85670391692ede71974e979f", size = 201323, upload-time = "2026-04-10T14:27:06.139Z" },
+    { url = "https://files.pythonhosted.org/packages/50/56/752dd89c84be0e022a8ea3720bcfa0a8431db79a962578544812ce061739/jiter-0.14.0-cp313-cp313-win_arm64.whl", hash = "sha256:34f19dcc35cb1abe7c369b3756babf8c7f04595c0807a848df8f26ef8298ef92", size = 191099, upload-time = "2026-04-10T14:27:07.564Z" },
+    { url = "https://files.pythonhosted.org/packages/91/28/292916f354f25a1fe8cf2c918d1415c699a4a659ae00be0430e1c5d9ffea/jiter-0.14.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:e89bcd7d426a75bb4952c696b267075790d854a07aad4c9894551a82c5b574ab", size = 320880, upload-time = "2026-04-10T14:27:09.326Z" },
+    { url = "https://files.pythonhosted.org/packages/ad/c7/b002a7d8b8957ac3d469bd59c18ef4b1595a5216ae0de639a287b9816023/jiter-0.14.0-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7b25beaa0d4447ea8c7ae0c18c688905d34840d7d0b937f2f7bdd52162c98a40", size = 346563, upload-time = "2026-04-10T14:27:11.287Z" },
+    { url = "https://files.pythonhosted.org/packages/f9/3b/f8d07580d8706021d255a6356b8fab13ee4c869412995550ce6ed4ddf97d/jiter-0.14.0-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:651a8758dd413c51e3b7f6557cdc6921faf70b14106f45f969f091f5cda990ea", size = 357928, upload-time = "2026-04-10T14:27:12.729Z" },
+    { url = "https://files.pythonhosted.org/packages/47/5b/ac1a974da29e35507230383110ffec59998b290a8732585d04e19a9eb5ba/jiter-0.14.0-cp313-cp313t-win_amd64.whl", hash = "sha256:e1a7eead856a5038a8d291f1447176ab0b525c77a279a058121b5fccee257f6f", size = 203519, upload-time = "2026-04-10T14:27:14.125Z" },
+    { url = "https://files.pythonhosted.org/packages/96/6d/9fc8433d667d2454271378a79747d8c76c10b51b482b454e6190e511f244/jiter-0.14.0-cp313-cp313t-win_arm64.whl", hash = "sha256:2e692633a12cda97e352fdcd1c4acc971b1c28707e1e33aeef782b0cbf051975", size = 190113, upload-time = "2026-04-10T14:27:16.638Z" },
+    { url = "https://files.pythonhosted.org/packages/4f/1e/354ed92461b165bd581f9ef5150971a572c873ec3b68a916d5aa91da3cc2/jiter-0.14.0-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:6f396837fc7577871ca8c12edaf239ed9ccef3bbe39904ae9b8b63ce0a48b140", size = 315277, upload-time = "2026-04-10T14:27:18.109Z" },
+    { url = "https://files.pythonhosted.org/packages/a6/95/8c7c7028aa8636ac21b7a55faef3e34215e6ed0cbf5ae58258427f621aa3/jiter-0.14.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:a4d50ea3d8ba4176f79754333bd35f1bbcd28e91adc13eb9b7ca91bc52a6cef9", size = 315923, upload-time = "2026-04-10T14:27:19.603Z" },
+    { url = "https://files.pythonhosted.org/packages/47/40/e2a852a44c4a089f2681a16611b7ce113224a80fd8504c46d78491b47220/jiter-0.14.0-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ce17f8a050447d1b4153bda4fb7d26e6a9e74eb4f4a41913f30934c5075bf615", size = 344943, upload-time = "2026-04-10T14:27:21.262Z" },
+    { url = "https://files.pythonhosted.org/packages/fc/1f/670f92adee1e9895eac41e8a4d623b6da68c4d46249d8b556b60b63f949e/jiter-0.14.0-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:f4f1c4b125e1652aefbc2e2c1617b60a160ab789d180e3d423c41439e5f32850", size = 369725, upload-time = "2026-04-10T14:27:22.766Z" },
+    { url = "https://files.pythonhosted.org/packages/01/2f/541c9ba567d05de1c4874a0f8f8c5e3fd78e2b874266623da9a775cf46e0/jiter-0.14.0-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:be808176a6a3a14321d18c603f2d40741858a7c4fc982f83232842689fe86dd9", size = 461210, upload-time = "2026-04-10T14:27:24.315Z" },
+    { url = "https://files.pythonhosted.org/packages/ce/a9/c31cbec09627e0d5de7aeaec7690dba03e090caa808fefd8133137cf45bc/jiter-0.14.0-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:26679d58ba816f88c3849306dd58cb863a90a1cf352cdd4ef67e30ccf8a77994", size = 380002, upload-time = "2026-04-10T14:27:26.155Z" },
+    { url = "https://files.pythonhosted.org/packages/50/02/3c05c1666c41904a2f607475a73e7a4763d1cbde2d18229c4f85b22dc253/jiter-0.14.0-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:80381f5a19af8fa9aef743f080e34f6b25ebd89656475f8cf0470ec6157052aa", size = 354678, upload-time = "2026-04-10T14:27:27.701Z" },
+    { url = "https://files.pythonhosted.org/packages/7d/97/e15b33545c2b13518f560d695f974b9891b311641bdcf178d63177e8801e/jiter-0.14.0-cp314-cp314-manylinux_2_31_riscv64.whl", hash = "sha256:004df5fdb8ecbd6d99f3227df18ba1a259254c4359736a2e6f036c944e02d7c5", size = 358920, upload-time = "2026-04-10T14:27:29.256Z" },
+    { url = "https://files.pythonhosted.org/packages/ad/d2/8b1461def6b96ba44530df20d07ef7a1c7da22f3f9bf1727e2d611077bf1/jiter-0.14.0-cp314-cp314-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:cff5708f7ed0fa098f2b53446c6fa74c48469118e5cd7497b4f1cd569ab06928", size = 394512, upload-time = "2026-04-10T14:27:31.344Z" },
+    { url = "https://files.pythonhosted.org/packages/e3/88/837566dd6ed6e452e8d3205355afd484ce44b2533edfa4ed73a298ea893e/jiter-0.14.0-cp314-cp314-musllinux_1_1_aarch64.whl", hash = "sha256:2492e5f06c36a976d25c7cc347a60e26d5470178d44cde1b9b75e60b4e519f28", size = 521120, upload-time = "2026-04-10T14:27:33.299Z" },
+    { url = "https://files.pythonhosted.org/packages/89/6b/b00b45c4d1b4c031777fe161d620b755b5b02cdade1e316dcb46e4471d63/jiter-0.14.0-cp314-cp314-musllinux_1_1_x86_64.whl", hash = "sha256:7609cfbe3a03d37bfdbf5052012d5a879e72b83168a363deae7b3a26564d57de", size = 553668, upload-time = "2026-04-10T14:27:34.868Z" },
+    { url = "https://files.pythonhosted.org/packages/ad/d8/6fe5b42011d19397433d345716eac16728ac241862a2aac9c91923c7509a/jiter-0.14.0-cp314-cp314-win32.whl", hash = "sha256:7282342d32e357543565286b6450378c3cd402eea333fc1ebe146f1fabb306fc", size = 207001, upload-time = "2026-04-10T14:27:36.455Z" },
+    { url = "https://files.pythonhosted.org/packages/e5/43/5c2e08da1efad5e410f0eaaabeadd954812612c33fbbd8fd5328b489139d/jiter-0.14.0-cp314-cp314-win_amd64.whl", hash = "sha256:bd77945f38866a448e73b0b7637366afa814d4617790ecd88a18ca74377e6c02", size = 202187, upload-time = "2026-04-10T14:27:38Z" },
+    { url = "https://files.pythonhosted.org/packages/aa/1f/6e39ac0b4cdfa23e606af5b245df5f9adaa76f35e0c5096790da430ca506/jiter-0.14.0-cp314-cp314-win_arm64.whl", hash = "sha256:f2d4c61da0821ee42e0cdf5489da60a6d074306313a377c2b35af464955a3611", size = 192257, upload-time = "2026-04-10T14:27:39.504Z" },
+    { url = "https://files.pythonhosted.org/packages/05/57/7dbc0ffbbb5176a27e3518716608aa464aee2e2887dc938f0b900a120449/jiter-0.14.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:1bf7ff85517dd2f20a5750081d2b75083c1b269cf75afc7511bdf1f9548beb3b", size = 323441, upload-time = "2026-04-10T14:27:41.039Z" },
+    { url = "https://files.pythonhosted.org/packages/83/6e/7b3314398d8983f06b557aa21b670511ec72d3b79a68ee5e4d9bff972286/jiter-0.14.0-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c8ef8791c3e78d6c6b157c6d360fbb5c715bebb8113bc6a9303c5caff012754a", size = 348109, upload-time = "2026-04-10T14:27:42.552Z" },
+    { url = "https://files.pythonhosted.org/packages/ae/4f/8dc674bcd7db6dba566de73c08c763c337058baff1dbeb34567045b27cdc/jiter-0.14.0-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e74663b8b10da1fe0f4e4703fd7980d24ad17174b6bb35d8498d6e3ebce2ae6a", size = 368328, upload-time = "2026-04-10T14:27:44.574Z" },
+    { url = "https://files.pythonhosted.org/packages/3b/5f/188e09a1f20906f98bbdec44ed820e19f4e8eb8aff88b9d1a5a497587ff3/jiter-0.14.0-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1aca29ba52913f78362ec9c2da62f22cdc4c3083313403f90c15460979b84d9b", size = 463301, upload-time = "2026-04-10T14:27:46.717Z" },
+    { url = "https://files.pythonhosted.org/packages/ac/f0/19046ef965ed8f349e8554775bb12ff4352f443fbe12b95d31f575891256/jiter-0.14.0-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8b39b7d87a952b79949af5fef44d2544e58c21a28da7f1bae3ef166455c61746", size = 378891, upload-time = "2026-04-10T14:27:48.32Z" },
+    { url = "https://files.pythonhosted.org/packages/c4/c3/da43bd8431ee175695777ee78cf0e93eacbb47393ff493f18c45231b427d/jiter-0.14.0-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:78d918a68b26e9fab068c2b5453577ef04943ab2807b9a6275df2a812599a310", size = 360749, upload-time = "2026-04-10T14:27:49.88Z" },
+    { url = "https://files.pythonhosted.org/packages/72/26/e054771be889707c6161dbdec9c23d33a9ec70945395d70f07cfea1e9a6f/jiter-0.14.0-cp314-cp314t-manylinux_2_31_riscv64.whl", hash = "sha256:b08997c35aee1201c1a5361466a8fb9162d03ae7bf6568df70b6c859f1e654a4", size = 358526, upload-time = "2026-04-10T14:27:51.504Z" },
+    { url = "https://files.pythonhosted.org/packages/c3/0f/7bea65ea2a6d91f2bf989ff11a18136644392bf2b0497a1fa50934c30a9c/jiter-0.14.0-cp314-cp314t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:260bf7ca20704d58d41f669e5e9fe7fe2fa72901a6b324e79056f5d52e9c9be2", size = 393926, upload-time = "2026-04-10T14:27:53.368Z" },
+    { url = "https://files.pythonhosted.org/packages/3c/a1/b1ff7d70deef61ac0b7c6c2f12d2ace950cdeecb4fdc94500a0926802857/jiter-0.14.0-cp314-cp314t-musllinux_1_1_aarch64.whl", hash = "sha256:37826e3df29e60f30a382f9294348d0238ef127f4b5d7f5f8da78b5b9e050560", size = 521052, upload-time = "2026-04-10T14:27:55.058Z" },
+    { url = "https://files.pythonhosted.org/packages/0b/7b/3b0649983cbaf15eda26a414b5b1982e910c67bd6f7b1b490f3cfc76896a/jiter-0.14.0-cp314-cp314t-musllinux_1_1_x86_64.whl", hash = "sha256:645be49c46f2900937ba0eaf871ad5183c96858c0af74b6becc7f4e367e36e06", size = 553716, upload-time = "2026-04-10T14:27:57.269Z" },
+    { url = "https://files.pythonhosted.org/packages/97/f8/33d78c83bd93ae0c0af05293a6660f88a1977caef39a6d72a84afab94ce0/jiter-0.14.0-cp314-cp314t-win32.whl", hash = "sha256:2f7877ed45118de283786178eceaf877110abacd04fde31efff3940ae9672674", size = 207957, upload-time = "2026-04-10T14:27:59.285Z" },
+    { url = "https://files.pythonhosted.org/packages/d6/ac/2b760516c03e2227826d1f7025d89bf6bf6357a28fe75c2a2800873c50bf/jiter-0.14.0-cp314-cp314t-win_amd64.whl", hash = "sha256:14c0cb10337c49f5eafe8e7364daca5e29a020ea03580b8f8e6c597fed4e1588", size = 204690, upload-time = "2026-04-10T14:28:00.962Z" },
+    { url = "https://files.pythonhosted.org/packages/dc/2e/a44c20c58aeed0355f2d326969a181696aeb551a25195f47563908a815be/jiter-0.14.0-cp314-cp314t-win_arm64.whl", hash = "sha256:5419d4aa2024961da9fe12a9cfe7484996735dca99e8e090b5c88595ef1951ff", size = 191338, upload-time = "2026-04-10T14:28:02.853Z" },
+    { url = "https://files.pythonhosted.org/packages/21/42/9042c3f3019de4adcb8c16591c325ec7255beea9fcd33a42a43f3b0b1000/jiter-0.14.0-graalpy312-graalpy250_312_native-macosx_10_12_x86_64.whl", hash = "sha256:fbd9e482663ca9d005d051330e4d2d8150bb208a209409c10f7e7dfdf7c49da9", size = 308810, upload-time = "2026-04-10T14:28:34.673Z" },
+    { url = "https://files.pythonhosted.org/packages/60/cf/a7e19b308bd86bb04776803b1f01a5f9a287a4c55205f4708827ee487fbf/jiter-0.14.0-graalpy312-graalpy250_312_native-macosx_11_0_arm64.whl", hash = "sha256:33a20d838b91ef376b3a56896d5b04e725c7df5bc4864cc6569cf046a8d73b6d", size = 308443, upload-time = "2026-04-10T14:28:36.658Z" },
+    { url = "https://files.pythonhosted.org/packages/ca/44/e26ede3f0caeff93f222559cb0cc4ca68579f07d009d7b6010c5b586f9b1/jiter-0.14.0-graalpy312-graalpy250_312_native-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:432c4db5255d86a259efde91e55cb4c8d18c0521d844c9e2e7efcce3899fb016", size = 343039, upload-time = "2026-04-10T14:28:38.356Z" },
+    { url = "https://files.pythonhosted.org/packages/da/e9/1f9ada30cef7b05e74bb06f52127e7a724976c225f46adb65c37b1dadfb6/jiter-0.14.0-graalpy312-graalpy250_312_native-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:67f00d94b281174144d6532a04b66a12cb866cbdc47c3af3bfe2973677f9861a", size = 349613, upload-time = "2026-04-10T14:28:40.066Z" },
+]
+
+[[package]]
+name = "json-repair"
+version = "0.59.4"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/32/41/4ae9c6e711647a41b4e0c04bce815113ce9c0286eff6dc6fb86979b2fb9f/json_repair-0.59.4.tar.gz", hash = "sha256:559ca1828f6f566530663cd96d64bee29f8282b9d2ff0e661e05fa87b4171ab3", size = 47624, upload-time = "2026-04-15T06:48:40.776Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/74/c4/ec3068436d2275731539b7a43fbc947f502bc3fe149856a5d00368c7b087/json_repair-0.59.4-py3-none-any.whl", hash = "sha256:46052e646bc0b0c39db672ebbf732f774f3c1a5bde81a54f0b0e19d3af4f45cd", size = 46697, upload-time = "2026-04-15T06:48:39.61Z" },
+]
+
+[[package]]
+name = "jsonschema"
+version = "4.26.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "attrs" },
+    { name = "jsonschema-specifications" },
+    { name = "referencing" },
+    { name = "rpds-py" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/b3/fc/e067678238fa451312d4c62bf6e6cf5ec56375422aee02f9cb5f909b3047/jsonschema-4.26.0.tar.gz", hash = "sha256:0c26707e2efad8aa1bfc5b7ce170f3fccc2e4918ff85989ba9ffa9facb2be326", size = 366583, upload-time = "2026-01-07T13:41:07.246Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/69/90/f63fb5873511e014207a475e2bb4e8b2e570d655b00ac19a9a0ca0a385ee/jsonschema-4.26.0-py3-none-any.whl", hash = "sha256:d489f15263b8d200f8387e64b4c3a75f06629559fb73deb8fdfb525f2dab50ce", size = 90630, upload-time = "2026-01-07T13:41:05.306Z" },
+]
+
+[[package]]
+name = "jsonschema-specifications"
+version = "2025.9.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "referencing" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/19/74/a633ee74eb36c44aa6d1095e7cc5569bebf04342ee146178e2d36600708b/jsonschema_specifications-2025.9.1.tar.gz", hash = "sha256:b540987f239e745613c7a9176f3edb72b832a4ac465cf02712288397832b5e8d", size = 32855, upload-time = "2025-09-08T01:34:59.186Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/41/45/1a4ed80516f02155c51f51e8cedb3c1902296743db0bbc66608a0db2814f/jsonschema_specifications-2025.9.1-py3-none-any.whl", hash = "sha256:98802fee3a11ee76ecaca44429fda8a41bff98b00a0f2838151b113f210cc6fe", size = 18437, upload-time = "2025-09-08T01:34:57.871Z" },
+]
+
+[[package]]
+name = "langdetect"
+version = "1.0.9"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "six" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/0e/72/a3add0e4eec4eb9e2569554f7c70f4a3c27712f40e3284d483e88094cc0e/langdetect-1.0.9.tar.gz", hash = "sha256:cbc1fef89f8d062739774bd51eda3da3274006b3661d199c2655f6b3f6d605a0", size = 981474, upload-time = "2021-05-07T07:54:13.562Z" }
+
+[[package]]
+name = "llvmlite"
+version = "0.47.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/01/88/a8952b6d5c21e74cbf158515b779666f692846502623e9e3c39d8e8ba25f/llvmlite-0.47.0.tar.gz", hash = "sha256:62031ce968ec74e95092184d4b0e857e444f8fdff0b8f9213707699570c33ccc", size = 193614, upload-time = "2026-03-31T18:29:53.497Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/fa/48/4b7fe0e34c169fa2f12532916133e0b219d2823b540733651b34fdac509a/llvmlite-0.47.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:306a265f408c259067257a732c8e159284334018b4083a9e35f67d19792b164f", size = 37232769, upload-time = "2026-03-31T18:28:43.735Z" },
+    { url = "https://files.pythonhosted.org/packages/e6/4b/e3f2cd17822cf772a4a51a0a8080b0032e6d37b2dbe8cfb724eac4e31c52/llvmlite-0.47.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:5853bf26160857c0c2573415ff4efe01c4c651e59e2c55c2a088740acfee51cd", size = 56275178, upload-time = "2026-03-31T18:28:48.342Z" },
+    { url = "https://files.pythonhosted.org/packages/b6/55/a3b4a543185305a9bdf3d9759d53646ed96e55e7dfd43f53e7a421b8fbae/llvmlite-0.47.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:003bcf7fa579e14db59c1a1e113f93ab8a06b56a4be31c7f08264d1d4072d077", size = 55128632, upload-time = "2026-03-31T18:28:52.901Z" },
+    { url = "https://files.pythonhosted.org/packages/2f/f5/d281ae0f79378a5a91f308ea9fdb9f9cc068fddd09629edc0725a5a8fde1/llvmlite-0.47.0-cp312-cp312-win_amd64.whl", hash = "sha256:f3079f25bdc24cd9d27c4b2b5e68f5f60c4fdb7e8ad5ee2b9b006007558f9df7", size = 38138692, upload-time = "2026-03-31T18:28:57.147Z" },
+    { url = "https://files.pythonhosted.org/packages/77/6f/4615353e016799f80fa52ccb270a843c413b22361fadda2589b2922fb9b0/llvmlite-0.47.0-cp313-cp313-macosx_12_0_arm64.whl", hash = "sha256:a3c6a735d4e1041808434f9d440faa3d78d9b4af2ee64d05a66f351883b6ceec", size = 37232771, upload-time = "2026-03-31T18:29:01.324Z" },
+    { url = "https://files.pythonhosted.org/packages/31/b8/69f5565f1a280d032525878a86511eebed0645818492feeb169dfb20ae8e/llvmlite-0.47.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:2699a74321189e812d476a43d6d7f652f51811e7b5aad9d9bba842a1c7927acb", size = 56275178, upload-time = "2026-03-31T18:29:05.748Z" },
+    { url = "https://files.pythonhosted.org/packages/d6/da/b32cafcb926fb0ce2aa25553bf32cb8764af31438f40e2481df08884c947/llvmlite-0.47.0-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6c6951e2b29930227963e53ee152441f0e14be92e9d4231852102d986c761e40", size = 55128632, upload-time = "2026-03-31T18:29:11.235Z" },
+    { url = "https://files.pythonhosted.org/packages/46/9f/4898b44e4042c60fafcb1162dfb7014f6f15b1ec19bf29cfea6bf26df90d/llvmlite-0.47.0-cp313-cp313-win_amd64.whl", hash = "sha256:c2e9adf8698d813a9a5efb2d4370caf344dbc1e145019851fee6a6f319ba760e", size = 38138695, upload-time = "2026-03-31T18:29:15.43Z" },
+    { url = "https://files.pythonhosted.org/packages/1c/d4/33c8af00f0bf6f552d74f3a054f648af2c5bc6bece97972f3bfadce4f5ec/llvmlite-0.47.0-cp314-cp314-macosx_12_0_arm64.whl", hash = "sha256:de966c626c35c9dff5ae7bf12db25637738d0df83fc370cf793bc94d43d92d14", size = 37232773, upload-time = "2026-03-31T18:29:19.453Z" },
+    { url = "https://files.pythonhosted.org/packages/64/1d/a760e993e0c0ba6db38d46b9f48f6c7dceb8ac838824997fb9e25f97bc04/llvmlite-0.47.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:ddbccff2aeaff8670368340a158abefc032fe9b3ccf7d9c496639263d00151aa", size = 56275176, upload-time = "2026-03-31T18:29:24.149Z" },
+    { url = "https://files.pythonhosted.org/packages/84/3b/e679bc3b29127182a7f4aa2d2e9e5bea42adb93fb840484147d59c236299/llvmlite-0.47.0-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d4a7b778a2e144fc64468fb9bf509ac1226c9813a00b4d7afea5d988c4e22fca", size = 55128631, upload-time = "2026-03-31T18:29:29.536Z" },
+    { url = "https://files.pythonhosted.org/packages/be/f7/19e2a09c62809c9e63bbd14ce71fb92c6ff7b7b3045741bb00c781efc3c9/llvmlite-0.47.0-cp314-cp314-win_amd64.whl", hash = "sha256:694e3c2cdc472ed2bd8bd4555ca002eec4310961dd58ef791d508f57b5cc4c94", size = 39153826, upload-time = "2026-03-31T18:29:33.681Z" },
+    { url = "https://files.pythonhosted.org/packages/40/a1/581a8c707b5e80efdbbe1dd94527404d33fe50bceb71f39d5a7e11bd57b7/llvmlite-0.47.0-cp314-cp314t-macosx_12_0_arm64.whl", hash = "sha256:92ec8a169a20b473c1c54d4695e371bde36489fc1efa3688e11e99beba0abf9c", size = 37232772, upload-time = "2026-03-31T18:29:37.952Z" },
+    { url = "https://files.pythonhosted.org/packages/11/03/16090dd6f74ba2b8b922276047f15962fbeea0a75d5601607edb301ba945/llvmlite-0.47.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:fa1cbd800edd3b20bc141521f7fd45a6185a5b84109aa6855134e81397ffe72b", size = 56275178, upload-time = "2026-03-31T18:29:42.58Z" },
+    { url = "https://files.pythonhosted.org/packages/f5/cb/0abf1dd4c5286a95ffe0c1d8c67aec06b515894a0dd2ac97f5e27b82ab0b/llvmlite-0.47.0-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f6725179b89f03b17dabe236ff3422cb8291b4c1bf40af152826dfd34e350ae8", size = 55128632, upload-time = "2026-03-31T18:29:46.939Z" },
+    { url = "https://files.pythonhosted.org/packages/4f/79/d3bbab197e86e0ff4f9c07122895b66a3e0d024247fcff7f12c473cb36d9/llvmlite-0.47.0-cp314-cp314t-win_amd64.whl", hash = "sha256:6842cf6f707ec4be3d985a385ad03f72b2d724439e118fcbe99b2929964f0453", size = 39153839, upload-time = "2026-03-31T18:29:51.004Z" },
+]
+
+[[package]]
+name = "logfire-api"
+version = "4.32.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/58/1b/0c74ad85f977743ba4c589e46e0cb138d6a6e69487830f4e86ebbdb145a3/logfire_api-4.32.1.tar.gz", hash = "sha256:5e8714b2bb5fb5d1f4a4a833941e4ca711b75d2c1f98e76c5ad680fe6991af6a", size = 78788, upload-time = "2026-04-15T14:11:58.788Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/0c/ab/d5adeab6253c7ecd5904fc5ef3265859f218610caf4e1e55efe9aff6ac49/logfire_api-4.32.1-py3-none-any.whl", hash = "sha256:4b4c27cf6e27e8e26ef4b22a77f2a2988dd1d07e2d24ee70673ef34b234fb8a5", size = 124394, upload-time = "2026-04-15T14:11:56.157Z" },
+]
+
+[[package]]
+name = "lxml"
+version = "6.1.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/28/30/9abc9e34c657c33834eaf6cd02124c61bdf5944d802aa48e69be8da3585d/lxml-6.1.0.tar.gz", hash = "sha256:bfd57d8008c4965709a919c3e9a98f76c2c7cb319086b3d26858250620023b13", size = 4197006, upload-time = "2026-04-18T04:32:51.613Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/d2/d4/9326838b59dc36dfae42eec9656b97520f9997eee1de47b8316aaeed169c/lxml-6.1.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:d2f17a16cd8751e8eb233a7e41aecdf8e511712e00088bf9be455f604cd0d28d", size = 8570663, upload-time = "2026-04-18T04:27:48.253Z" },
+    { url = "https://files.pythonhosted.org/packages/d8/a4/053745ce1f8303ccbb788b86c0db3a91b973675cefc42566a188637b7c40/lxml-6.1.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:f0cea5b1d3e6e77d71bd2b9972eb2446221a69dc52bb0b9c3c6f6e5700592d93", size = 4624024, upload-time = "2026-04-18T04:27:52.594Z" },
+    { url = "https://files.pythonhosted.org/packages/90/97/a517944b20f8fd0932ad2109482bee4e29fe721416387a363306667941f6/lxml-6.1.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:fc46da94826188ed45cb53bd8e3fc076ae22675aea2087843d4735627f867c6d", size = 4930895, upload-time = "2026-04-18T04:32:56.29Z" },
+    { url = "https://files.pythonhosted.org/packages/94/7c/e08a970727d556caa040a44773c7b7e3ad0f0d73dedc863543e9a8b931f2/lxml-6.1.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:9147d8e386ec3b82c3b15d88927f734f565b0aaadef7def562b853adca45784a", size = 5093820, upload-time = "2026-04-18T04:32:58.94Z" },
+    { url = "https://files.pythonhosted.org/packages/88/ee/2a5c2aa2c32016a226ca25d3e1056a8102ea6e1fe308bf50213586635400/lxml-6.1.0-cp312-cp312-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5715e0e28736a070f3f34a7ccc09e2fdcba0e3060abbcf61a1a5718ff6d6b105", size = 5005790, upload-time = "2026-04-18T04:33:01.272Z" },
+    { url = "https://files.pythonhosted.org/packages/e3/38/a0db9be8f38ad6043ab9429487c128dd1d30f07956ef43040402f8da49e8/lxml-6.1.0-cp312-cp312-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:4937460dc5df0cdd2f06a86c285c28afda06aefa3af949f9477d3e8df430c485", size = 5630827, upload-time = "2026-04-18T04:33:04.036Z" },
+    { url = "https://files.pythonhosted.org/packages/31/ba/3c13d3fc24b7cacf675f808a3a1baabf43a30d0cd24c98f94548e9aa58eb/lxml-6.1.0-cp312-cp312-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:bc783ee3147e60a25aa0445ea82b3e8aabb83b240f2b95d32cb75587ff781814", size = 5240445, upload-time = "2026-04-18T04:33:06.87Z" },
+    { url = "https://files.pythonhosted.org/packages/55/ba/eeef4ccba09b2212fe239f46c1692a98db1878e0872ae320756488878a94/lxml-6.1.0-cp312-cp312-manylinux_2_28_i686.whl", hash = "sha256:40d9189f80075f2e1f88db21ef815a2b17b28adf8e50aaf5c789bfe737027f32", size = 5350121, upload-time = "2026-04-18T04:33:09.365Z" },
+    { url = "https://files.pythonhosted.org/packages/7e/01/1da87c7b587c38d0cbe77a01aae3b9c1c49ed47d76918ef3db8fc151b1ca/lxml-6.1.0-cp312-cp312-manylinux_2_31_armv7l.whl", hash = "sha256:05b9b8787e35bec69e68daf4952b2e6dfcfb0db7ecf1a06f8cdfbbac4eb71aad", size = 4694949, upload-time = "2026-04-18T04:33:11.628Z" },
+    { url = "https://files.pythonhosted.org/packages/a1/88/7db0fe66d5aaf128443ee1623dec3db1576f3e4c17751ec0ef5866468590/lxml-6.1.0-cp312-cp312-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:0f0f08beb0182e3e9a86fae124b3c47a7b41b7b69b225e1377db983802404e54", size = 5243901, upload-time = "2026-04-18T04:33:13.95Z" },
+    { url = "https://files.pythonhosted.org/packages/00/a8/1346726af7d1f6fca1f11223ba34001462b0a3660416986d37641708d57c/lxml-6.1.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:73becf6d8c81d4c76b1014dbd3584cb26d904492dcf73ca85dc8bff08dcd6d2d", size = 5048054, upload-time = "2026-04-18T04:33:16.965Z" },
+    { url = "https://files.pythonhosted.org/packages/2e/b7/85057012f035d1a0c87e02f8c723ca3c3e6e0728bcf4cb62080b21b1c1e3/lxml-6.1.0-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:1ae225f66e5938f4fa29d37e009a3bb3b13032ac57eb4eb42afa44f6e4054e69", size = 4777324, upload-time = "2026-04-18T04:33:19.832Z" },
+    { url = "https://files.pythonhosted.org/packages/75/6c/ad2f94a91073ef570f33718040e8e160d5fb93331cf1ab3ca1323f939e2d/lxml-6.1.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:690022c7fae793b0489aa68a658822cea83e0d5933781811cabbf5ea3bcfe73d", size = 5645702, upload-time = "2026-04-18T04:33:22.436Z" },
+    { url = "https://files.pythonhosted.org/packages/3b/89/0bb6c0bd549c19004c60eea9dc554dd78fd647b72314ef25d460e0d208c6/lxml-6.1.0-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:63aeafc26aac0be8aff14af7871249e87ea1319be92090bfd632ec68e03b16a5", size = 5232901, upload-time = "2026-04-18T04:33:26.21Z" },
+    { url = "https://files.pythonhosted.org/packages/a1/d9/d609a11fb567da9399f525193e2b49847b5a409cdebe737f06a8b7126bdc/lxml-6.1.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:264c605ab9c0e4aa1a679636f4582c4d3313700009fac3ec9c3412ed0d8f3e1d", size = 5261333, upload-time = "2026-04-18T04:33:28.984Z" },
+    { url = "https://files.pythonhosted.org/packages/a6/3a/ac3f99ec8ac93089e7dd556f279e0d14c24de0a74a507e143a2e4b496e7c/lxml-6.1.0-cp312-cp312-win32.whl", hash = "sha256:56971379bc5ee8037c5a0f09fa88f66cdb7d37c3e38af3e45cf539f41131ac1f", size = 3596289, upload-time = "2026-04-18T04:27:42.819Z" },
+    { url = "https://files.pythonhosted.org/packages/f2/a7/0a915557538593cb1bbeedcd40e13c7a261822c26fecbbdb71dad0c2f540/lxml-6.1.0-cp312-cp312-win_amd64.whl", hash = "sha256:bba078de0031c219e5dd06cf3e6bf8fb8e6e64a77819b358f53bb132e3e03366", size = 3997059, upload-time = "2026-04-18T04:27:46.764Z" },
+    { url = "https://files.pythonhosted.org/packages/92/96/a5dc078cf0126fbfbc35611d77ecd5da80054b5893e28fb213a5613b9e1d/lxml-6.1.0-cp312-cp312-win_arm64.whl", hash = "sha256:c3592631e652afa34999a088f98ba7dfc7d6aff0d535c410bea77a71743f3819", size = 3659552, upload-time = "2026-04-18T04:27:51.133Z" },
+    { url = "https://files.pythonhosted.org/packages/08/03/69347590f1cf4a6d5a4944bb6099e6d37f334784f16062234e1f892fdb1d/lxml-6.1.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:a0092f2b107b69601adf562a57c956fbb596e05e3e6651cabd3054113b007e45", size = 8559689, upload-time = "2026-04-18T04:31:57.785Z" },
+    { url = "https://files.pythonhosted.org/packages/3f/58/25e00bb40b185c974cfe156c110474d9a8a8390d5f7c92a4e328189bb60e/lxml-6.1.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:fc7140d7a7386e6b545d41b7358f4d02b656d4053f5fa6859f92f4b9c2572c4d", size = 4617892, upload-time = "2026-04-18T04:32:01.78Z" },
+    { url = "https://files.pythonhosted.org/packages/f5/54/92ad98a94ac318dc4f97aaac22ff8d1b94212b2ae8af5b6e9b354bf825f7/lxml-6.1.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:419c58fc92cc3a2c3fa5f78c63dbf5da70c1fa9c1b25f25727ecee89a96c7de2", size = 4923489, upload-time = "2026-04-18T04:33:31.401Z" },
+    { url = "https://files.pythonhosted.org/packages/15/3b/a20aecfab42bdf4f9b390590d345857ad3ffd7c51988d1c89c53a0c73faf/lxml-6.1.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:37fabd1452852636cf38ecdcc9dd5ca4bba7a35d6c53fa09725deeb894a87491", size = 5082162, upload-time = "2026-04-18T04:33:34.262Z" },
+    { url = "https://files.pythonhosted.org/packages/45/26/2cdb3d281ac1bd175603e290cbe4bad6eff127c0f8de90bafd6f8548f0fd/lxml-6.1.0-cp313-cp313-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a2853c8b2170cc6cd54a6b4d50d2c1a8a7aeca201f23804b4898525c7a152cfc", size = 4993247, upload-time = "2026-04-18T04:33:36.674Z" },
+    { url = "https://files.pythonhosted.org/packages/f6/05/d735aef963740022a08185c84821f689fc903acb3d50326e6b1e9886cc22/lxml-6.1.0-cp313-cp313-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:8e369cbd690e788c8d15e56222d91a09c6a417f49cbc543040cba0fe2e25a79e", size = 5613042, upload-time = "2026-04-18T04:33:39.205Z" },
+    { url = "https://files.pythonhosted.org/packages/ee/b8/ead7c10efff731738c72e59ed6eb5791854879fbed7ae98781a12006263a/lxml-6.1.0-cp313-cp313-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e69aa6805905807186eb00e66c6d97a935c928275182eb02ee40ba00da9623b2", size = 5228304, upload-time = "2026-04-18T04:33:41.647Z" },
+    { url = "https://files.pythonhosted.org/packages/6b/10/e9842d2ec322ea65f0a7270aa0315a53abed06058b88ef1b027f620e7a5f/lxml-6.1.0-cp313-cp313-manylinux_2_28_i686.whl", hash = "sha256:4bd1bdb8a9e0e2dd229de19b5f8aebac80e916921b4b2c6ef8a52bc131d0c1f9", size = 5341578, upload-time = "2026-04-18T04:33:44.596Z" },
+    { url = "https://files.pythonhosted.org/packages/89/54/40d9403d7c2775fa7301d3ddd3464689bfe9ba71acc17dfff777071b4fdc/lxml-6.1.0-cp313-cp313-manylinux_2_31_armv7l.whl", hash = "sha256:cbd7b79cdcb4986ad78a2662625882747f09db5e4cd7b2ae178a88c9c51b3dfe", size = 4700209, upload-time = "2026-04-18T04:33:47.552Z" },
+    { url = "https://files.pythonhosted.org/packages/85/b2/bbdcc2cf45dfc7dfffef4fd97e5c47b15919b6a365247d95d6f684ef5e82/lxml-6.1.0-cp313-cp313-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:43e4d297f11080ec9d64a4b1ad7ac02b4484c9f0e2179d9c4ef78e886e747b88", size = 5232365, upload-time = "2026-04-18T04:33:50.249Z" },
+    { url = "https://files.pythonhosted.org/packages/48/5a/b06875665e53aaba7127611a7bed3b7b9658e20b22bc2dd217a0b7ab0091/lxml-6.1.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:cc16682cc987a3da00aa56a3aa3075b08edb10d9b1e476938cfdbee8f3b67181", size = 5043654, upload-time = "2026-04-18T04:33:52.71Z" },
+    { url = "https://files.pythonhosted.org/packages/e9/9c/e71a069d09641c1a7abeb30e693f828c7c90a41cbe3d650b2d734d876f85/lxml-6.1.0-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:d6d8efe71429635f0559579092bb5e60560d7b9115ee38c4adbea35632e7fa24", size = 4769326, upload-time = "2026-04-18T04:33:55.244Z" },
+    { url = "https://files.pythonhosted.org/packages/cc/06/7a9cd84b3d4ed79adf35f874750abb697dec0b4a81a836037b36e47c091a/lxml-6.1.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:7e39ab3a28af7784e206d8606ec0e4bcad0190f63a492bca95e94e5a4aef7f6e", size = 5635879, upload-time = "2026-04-18T04:33:58.509Z" },
+    { url = "https://files.pythonhosted.org/packages/cc/f0/9d57916befc1e54c451712c7ee48e9e74e80ae4d03bdce49914e0aee42cd/lxml-6.1.0-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:9eb667bf50856c4a58145f8ca2d5e5be160191e79eb9e30855a476191b3c3495", size = 5224048, upload-time = "2026-04-18T04:34:00.943Z" },
+    { url = "https://files.pythonhosted.org/packages/99/75/90c4eefda0c08c92221fe0753db2d6699a4c628f76ff4465ec20dea84cc1/lxml-6.1.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:7f4a77d6f7edf9230cee3e1f7f6764722a41604ee5681844f18db9a81ea0ec33", size = 5250241, upload-time = "2026-04-18T04:34:03.365Z" },
+    { url = "https://files.pythonhosted.org/packages/5e/73/16596f7e4e38fa33084b9ccbccc22a15f82a290a055126f2c1541236d2ff/lxml-6.1.0-cp313-cp313-win32.whl", hash = "sha256:28902146ffbe5222df411c5d19e5352490122e14447e98cd118907ee3fd6ee62", size = 3596938, upload-time = "2026-04-18T04:31:56.206Z" },
+    { url = "https://files.pythonhosted.org/packages/8e/63/981401c5680c1eb30893f00a19641ac80db5d1e7086c62cb4b13ed813038/lxml-6.1.0-cp313-cp313-win_amd64.whl", hash = "sha256:4a1503c56e4e2b38dc76f2f2da7bae69670c0f1933e27cfa34b2fa5876410b16", size = 3995728, upload-time = "2026-04-18T04:31:58.763Z" },
+    { url = "https://files.pythonhosted.org/packages/e7/e8/c358a38ac3e541d16a1b527e4e9cb78c0419b0506a070ace11777e5e8404/lxml-6.1.0-cp313-cp313-win_arm64.whl", hash = "sha256:e0af85773850417d994d019741239b901b22c6680206f46a34766926e466141d", size = 3658372, upload-time = "2026-04-18T04:32:03.629Z" },
+    { url = "https://files.pythonhosted.org/packages/eb/45/cee4cf203ef0bab5c52afc118da61d6b460c928f2893d40023cfa27e0b80/lxml-6.1.0-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:ab863fd37458fed6456525f297d21239d987800c46e67da5ef04fc6b3dd93ac8", size = 8576713, upload-time = "2026-04-18T04:32:06.831Z" },
+    { url = "https://files.pythonhosted.org/packages/8a/a7/eda05babeb7e046839204eaf254cd4d7c9130ce2bbf0d9e90ea41af5654d/lxml-6.1.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:6fd8b1df8254ff4fd93fd31da1fc15770bde23ac045be9bb1f87425702f61cc9", size = 4623874, upload-time = "2026-04-18T04:32:10.755Z" },
+    { url = "https://files.pythonhosted.org/packages/e7/e9/db5846de9b436b91890a62f29d80cd849ea17948a49bf532d5278ee69a9e/lxml-6.1.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:47024feaae386a92a146af0d2aeed65229bf6fff738e6a11dda6b0015fb8fd03", size = 4949535, upload-time = "2026-04-18T04:34:06.657Z" },
+    { url = "https://files.pythonhosted.org/packages/5a/ba/0d3593373dcae1d68f40dc3c41a5a92f2544e68115eb2f62319a4c2a6500/lxml-6.1.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:3f00972f84450204cd5d93a5395965e348956aaceaadec693a22ec743f8ae3eb", size = 5086881, upload-time = "2026-04-18T04:34:09.556Z" },
+    { url = "https://files.pythonhosted.org/packages/43/76/759a7484539ad1af0d125a9afe9c3fb5f82a8779fd1f5f56319d9e4ea2fd/lxml-6.1.0-cp314-cp314-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:97faa0860e13b05b15a51fb4986421ef7a30f0b3334061c416e0981e9450ca4c", size = 5031305, upload-time = "2026-04-18T04:34:12.336Z" },
+    { url = "https://files.pythonhosted.org/packages/dc/b9/c1f0daf981a11e47636126901fd4ab82429e18c57aeb0fc3ad2940b42d8b/lxml-6.1.0-cp314-cp314-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:972a6451204798675407beaad97b868d0c733d9a74dafefc63120b81b8c2de28", size = 5647522, upload-time = "2026-04-18T04:34:14.89Z" },
+    { url = "https://files.pythonhosted.org/packages/31/e6/1f533dcd205275363d9ba3511bcec52fa2df86abf8abe6a5f2c599f0dc31/lxml-6.1.0-cp314-cp314-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:fe022f20bc4569ec66b63b3fb275a3d628d9d32da6326b2982584104db6d3086", size = 5239310, upload-time = "2026-04-18T04:34:17.652Z" },
+    { url = "https://files.pythonhosted.org/packages/c3/8c/4175fb709c78a6e315ed814ed33be3defd8b8721067e70419a6cf6f971da/lxml-6.1.0-cp314-cp314-manylinux_2_28_i686.whl", hash = "sha256:75c4c7c619a744f972f4451bf5adf6d0fb00992a1ffc9fd78e13b0bc817cc99f", size = 5350799, upload-time = "2026-04-18T04:34:20.529Z" },
+    { url = "https://files.pythonhosted.org/packages/fd/77/6ffdebc5994975f0dde4acb59761902bd9d9bb84422b9a0bd239a7da9ca8/lxml-6.1.0-cp314-cp314-manylinux_2_31_armv7l.whl", hash = "sha256:3648f20d25102a22b6061c688beb3a805099ea4beb0a01ce62975d926944d292", size = 4697693, upload-time = "2026-04-18T04:34:23.541Z" },
+    { url = "https://files.pythonhosted.org/packages/f8/f1/565f36bd5c73294602d48e04d23f81ff4c8736be6ba5e1d1ec670ac9be80/lxml-6.1.0-cp314-cp314-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:77b9f99b17cbf14026d1e618035077060fc7195dd940d025149f3e2e830fbfcb", size = 5250708, upload-time = "2026-04-18T04:34:26.001Z" },
+    { url = "https://files.pythonhosted.org/packages/5a/11/a68ab9dd18c5c499404deb4005f4bc4e0e88e5b72cd755ad96efec81d18d/lxml-6.1.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:32662519149fd7a9db354175aa5e417d83485a8039b8aaa62f873ceee7ea4cad", size = 5084737, upload-time = "2026-04-18T04:34:28.32Z" },
+    { url = "https://files.pythonhosted.org/packages/ab/78/e8f41e2c74f4af564e6a0348aea69fb6daaefa64bc071ef469823d22cc18/lxml-6.1.0-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:73d658216fc173cf2c939e90e07b941c5e12736b0bf6a99e7af95459cfe8eabb", size = 4737817, upload-time = "2026-04-18T04:34:30.784Z" },
+    { url = "https://files.pythonhosted.org/packages/06/2d/aa4e117aa2ce2f3b35d9ff246be74a2f8e853baba5d2a92c64744474603a/lxml-6.1.0-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:ac4db068889f8772a4a698c5980ec302771bb545e10c4b095d4c8be26749616f", size = 5670753, upload-time = "2026-04-18T04:34:33.675Z" },
+    { url = "https://files.pythonhosted.org/packages/08/f5/dd745d50c0409031dbfcc4881740542a01e54d6f0110bd420fa7782110b8/lxml-6.1.0-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:45e9dfbd1b661eb64ba0d4dbe762bd210c42d86dd1e5bd2bdf89d634231beb43", size = 5238071, upload-time = "2026-04-18T04:34:36.12Z" },
+    { url = "https://files.pythonhosted.org/packages/3e/74/ad424f36d0340a904665867dab310a3f1f4c96ff4039698de83b77f44c1f/lxml-6.1.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:89e8d73d09ac696a5ba42ec69787913d53284f12092f651506779314f10ba585", size = 5264319, upload-time = "2026-04-18T04:34:39.035Z" },
+    { url = "https://files.pythonhosted.org/packages/53/36/a15d8b3514ec889bfd6aa3609107fcb6c9189f8dc347f1c0b81eded8d87c/lxml-6.1.0-cp314-cp314-win32.whl", hash = "sha256:ebe33f4ec1b2de38ceb225a1749a2965855bffeef435ba93cd2d5d540783bf2f", size = 3657139, upload-time = "2026-04-18T04:32:20.006Z" },
+    { url = "https://files.pythonhosted.org/packages/1a/a4/263ebb0710851a3c6c937180a9a86df1206fdfe53cc43005aa2237fd7736/lxml-6.1.0-cp314-cp314-win_amd64.whl", hash = "sha256:398443df51c538bd578529aa7e5f7afc6c292644174b47961f3bf87fe5741120", size = 4064195, upload-time = "2026-04-18T04:32:23.876Z" },
+    { url = "https://files.pythonhosted.org/packages/80/68/2000f29d323b6c286de077ad20b429fc52272e44eae6d295467043e56012/lxml-6.1.0-cp314-cp314-win_arm64.whl", hash = "sha256:8c8984e1d8c4b3949e419158fda14d921ff703a9ed8a47236c6eb7a2b6cb4946", size = 3741870, upload-time = "2026-04-18T04:32:27.922Z" },
+    { url = "https://files.pythonhosted.org/packages/30/e9/21383c7c8d43799f0da90224c0d7c921870d476ec9b3e01e1b2c0b8237c5/lxml-6.1.0-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:1081dd10bc6fa437db2500e13993abf7cc30716d0a2f40e65abb935f02ec559c", size = 8827548, upload-time = "2026-04-18T04:32:15.094Z" },
+    { url = "https://files.pythonhosted.org/packages/a5/01/c6bc11cd587030dd4f719f65c5657960649fe3e19196c844c75bf32cd0d6/lxml-6.1.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:dabecc48db5f42ba348d1f5d5afdc54c6c4cc758e676926c7cd327045749517d", size = 4735866, upload-time = "2026-04-18T04:32:18.924Z" },
+    { url = "https://files.pythonhosted.org/packages/f3/01/757132fff5f4acf25463b5298f1a46099f3a94480b806547b29ce5e385de/lxml-6.1.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:e3dd5fe19c9e0ac818a9c7f132a5e43c1339ec1cbbfecb1a938bd3a47875b7c9", size = 4969476, upload-time = "2026-04-18T04:34:41.889Z" },
+    { url = "https://files.pythonhosted.org/packages/fd/fb/1bc8b9d27ed64be7c8903db6c89e74dc8c2cd9ec630a7462e4654316dc5b/lxml-6.1.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:9e7b0a4ca6dcc007a4cef00a761bba2dea959de4bd2df98f926b33c92ca5dfb9", size = 5103719, upload-time = "2026-04-18T04:34:44.797Z" },
+    { url = "https://files.pythonhosted.org/packages/d5/e7/5bf82fa28133536a54601aae633b14988e89ed61d4c1eb6b899b023233aa/lxml-6.1.0-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5d27bbe326c6b539c64b42638b18bc6003a8d88f76213a97ac9ed4f885efeab7", size = 5027890, upload-time = "2026-04-18T04:34:47.634Z" },
+    { url = "https://files.pythonhosted.org/packages/2d/20/e048db5d4b4ea0366648aa595f26bb764b2670903fc585b87436d0a5032c/lxml-6.1.0-cp314-cp314t-manylinux_2_26_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:c4e425db0c5445ef0ad56b0eec54f89b88b2d884656e536a90b2f52aecb4ca86", size = 5596008, upload-time = "2026-04-18T04:34:51.503Z" },
+    { url = "https://files.pythonhosted.org/packages/9a/c2/d10807bc8da4824b39e5bd01b5d05c077b6fd01bd91584167edf6b269d22/lxml-6.1.0-cp314-cp314t-manylinux_2_26_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4b89b098105b8599dc57adac95d1813409ac476d3c948a498775d3d0c6124bfb", size = 5224451, upload-time = "2026-04-18T04:34:54.263Z" },
+    { url = "https://files.pythonhosted.org/packages/3c/15/2ebea45bea427e7f0057e9ce7b2d62c5aba20c6b001cca89ed0aadb3ad41/lxml-6.1.0-cp314-cp314t-manylinux_2_28_i686.whl", hash = "sha256:c4a699432846df86cc3de502ee85f445ebad748a1c6021d445f3e514d2cd4b1c", size = 5312135, upload-time = "2026-04-18T04:34:56.818Z" },
+    { url = "https://files.pythonhosted.org/packages/31/e2/87eeae151b0be2a308d49a7ec444ff3eb192b14251e62addb29d0bf3778f/lxml-6.1.0-cp314-cp314t-manylinux_2_31_armv7l.whl", hash = "sha256:30e7b2ed63b6c8e97cca8af048589a788ab5c9c905f36d9cf1c2bb549f450d2f", size = 4639126, upload-time = "2026-04-18T04:34:59.704Z" },
+    { url = "https://files.pythonhosted.org/packages/a3/51/8a3f6a20902ad604dd746ec7b4000311b240d389dac5e9d95adefd349e0c/lxml-6.1.0-cp314-cp314t-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:022981127642fe19866d2907d76241bb07ed21749601f727d5d5dd1ce5d1b773", size = 5232579, upload-time = "2026-04-18T04:35:02.658Z" },
+    { url = "https://files.pythonhosted.org/packages/6d/d2/650d619bdbe048d2c3f2c31edb00e35670a5e2d65b4fe3b61bce37b19121/lxml-6.1.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:23cad0cc86046d4222f7f418910e46b89971c5a45d3c8abfad0f64b7b05e4a9b", size = 5084206, upload-time = "2026-04-18T04:35:05.175Z" },
+    { url = "https://files.pythonhosted.org/packages/dd/8a/672ca1a3cbeabd1f511ca275a916c0514b747f4b85bdaae103b8fa92f307/lxml-6.1.0-cp314-cp314t-musllinux_1_2_armv7l.whl", hash = "sha256:21c3302068f50d1e8728c67c87ba92aa87043abee517aa2576cca1855326b405", size = 4758906, upload-time = "2026-04-18T04:35:08.098Z" },
+    { url = "https://files.pythonhosted.org/packages/be/f1/ef4b691da85c916cb2feb1eec7414f678162798ac85e042fa164419ac05c/lxml-6.1.0-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:be10838781cb3be19251e276910cd508fe127e27c3242e50521521a0f3781690", size = 5620553, upload-time = "2026-04-18T04:35:11.23Z" },
+    { url = "https://files.pythonhosted.org/packages/59/17/94e81def74107809755ac2782fdad4404420f1c92ca83433d117a6d5acf0/lxml-6.1.0-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:2173a7bffe97667bbf0767f8a99e587740a8c56fdf3befac4b09cb29a80276fd", size = 5229458, upload-time = "2026-04-18T04:35:14.254Z" },
+    { url = "https://files.pythonhosted.org/packages/21/55/c4be91b0f830a871fc1b0d730943d56013b683d4671d5198260e2eae722b/lxml-6.1.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:c6854e9cf99c84beb004eecd7d3a3868ef1109bf2b1df92d7bc11e96a36c2180", size = 5247861, upload-time = "2026-04-18T04:35:17.006Z" },
+    { url = "https://files.pythonhosted.org/packages/c2/ca/77123e4d77df3cb1e968ade7b1f808f5d3a5c1c96b18a33895397de292c1/lxml-6.1.0-cp314-cp314t-win32.whl", hash = "sha256:00750d63ef0031a05331b9223463b1c7c02b9004cef2346a5b2877f0f9494dd2", size = 3897377, upload-time = "2026-04-18T04:32:07.656Z" },
+    { url = "https://files.pythonhosted.org/packages/64/ce/3554833989d074267c063209bae8b09815e5656456a2d332b947806b05ff/lxml-6.1.0-cp314-cp314t-win_amd64.whl", hash = "sha256:80410c3a7e3c617af04de17caa9f9f20adaa817093293d69eae7d7d0522836f5", size = 4392701, upload-time = "2026-04-18T04:32:12.113Z" },
+    { url = "https://files.pythonhosted.org/packages/2b/a0/9b916c68c0e57752c07f8f64b30138d9d4059dbeb27b90274dedbea128ff/lxml-6.1.0-cp314-cp314t-win_arm64.whl", hash = "sha256:26dd9f57ee3bd41e7d35b4c98a2ffd89ed11591649f421f0ec19f67d50ec67ac", size = 3817120, upload-time = "2026-04-18T04:32:15.803Z" },
+]
+
+[[package]]
+name = "markdown"
+version = "3.10.2"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/2b/f4/69fa6ed85ae003c2378ffa8f6d2e3234662abd02c10d216c0ba96081a238/markdown-3.10.2.tar.gz", hash = "sha256:994d51325d25ad8aa7ce4ebaec003febcce822c3f8c911e3b17c52f7f589f950", size = 368805, upload-time = "2026-02-09T14:57:26.942Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/de/1f/77fa3081e4f66ca3576c896ae5d31c3002ac6607f9747d2e3aa49227e464/markdown-3.10.2-py3-none-any.whl", hash = "sha256:e91464b71ae3ee7afd3017d9f358ef0baf158fd9a298db92f1d4761133824c36", size = 108180, upload-time = "2026-02-09T14:57:25.787Z" },
+]
+
+[[package]]
+name = "markdown-it-py"
+version = "4.0.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "mdurl" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/5b/f5/4ec618ed16cc4f8fb3b701563655a69816155e79e24a17b651541804721d/markdown_it_py-4.0.0.tar.gz", hash = "sha256:cb0a2b4aa34f932c007117b194e945bd74e0ec24133ceb5bac59009cda1cb9f3", size = 73070, upload-time = "2025-08-11T12:57:52.854Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/94/54/e7d793b573f298e1c9013b8c4dade17d481164aa517d1d7148619c2cedbf/markdown_it_py-4.0.0-py3-none-any.whl", hash = "sha256:87327c59b172c5011896038353a81343b6754500a08cd7a4973bb48c6d578147", size = 87321, upload-time = "2025-08-11T12:57:51.923Z" },
+]
+
+[[package]]
+name = "markupsafe"
+version = "3.0.3"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/7e/99/7690b6d4034fffd95959cbe0c02de8deb3098cc577c67bb6a24fe5d7caa7/markupsafe-3.0.3.tar.gz", hash = "sha256:722695808f4b6457b320fdc131280796bdceb04ab50fe1795cd540799ebe1698", size = 80313, upload-time = "2025-09-27T18:37:40.426Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/5a/72/147da192e38635ada20e0a2e1a51cf8823d2119ce8883f7053879c2199b5/markupsafe-3.0.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:d53197da72cc091b024dd97249dfc7794d6a56530370992a5e1a08983ad9230e", size = 11615, upload-time = "2025-09-27T18:36:30.854Z" },
+    { url = "https://files.pythonhosted.org/packages/9a/81/7e4e08678a1f98521201c3079f77db69fb552acd56067661f8c2f534a718/markupsafe-3.0.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:1872df69a4de6aead3491198eaf13810b565bdbeec3ae2dc8780f14458ec73ce", size = 12020, upload-time = "2025-09-27T18:36:31.971Z" },
+    { url = "https://files.pythonhosted.org/packages/1e/2c/799f4742efc39633a1b54a92eec4082e4f815314869865d876824c257c1e/markupsafe-3.0.3-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3a7e8ae81ae39e62a41ec302f972ba6ae23a5c5396c8e60113e9066ef893da0d", size = 24332, upload-time = "2025-09-27T18:36:32.813Z" },
+    { url = "https://files.pythonhosted.org/packages/3c/2e/8d0c2ab90a8c1d9a24f0399058ab8519a3279d1bd4289511d74e909f060e/markupsafe-3.0.3-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d6dd0be5b5b189d31db7cda48b91d7e0a9795f31430b7f271219ab30f1d3ac9d", size = 22947, upload-time = "2025-09-27T18:36:33.86Z" },
+    { url = "https://files.pythonhosted.org/packages/2c/54/887f3092a85238093a0b2154bd629c89444f395618842e8b0c41783898ea/markupsafe-3.0.3-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:94c6f0bb423f739146aec64595853541634bde58b2135f27f61c1ffd1cd4d16a", size = 21962, upload-time = "2025-09-27T18:36:35.099Z" },
+    { url = "https://files.pythonhosted.org/packages/c9/2f/336b8c7b6f4a4d95e91119dc8521402461b74a485558d8f238a68312f11c/markupsafe-3.0.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:be8813b57049a7dc738189df53d69395eba14fb99345e0a5994914a3864c8a4b", size = 23760, upload-time = "2025-09-27T18:36:36.001Z" },
+    { url = "https://files.pythonhosted.org/packages/32/43/67935f2b7e4982ffb50a4d169b724d74b62a3964bc1a9a527f5ac4f1ee2b/markupsafe-3.0.3-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:83891d0e9fb81a825d9a6d61e3f07550ca70a076484292a70fde82c4b807286f", size = 21529, upload-time = "2025-09-27T18:36:36.906Z" },
+    { url = "https://files.pythonhosted.org/packages/89/e0/4486f11e51bbba8b0c041098859e869e304d1c261e59244baa3d295d47b7/markupsafe-3.0.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:77f0643abe7495da77fb436f50f8dab76dbc6e5fd25d39589a0f1fe6548bfa2b", size = 23015, upload-time = "2025-09-27T18:36:37.868Z" },
+    { url = "https://files.pythonhosted.org/packages/2f/e1/78ee7a023dac597a5825441ebd17170785a9dab23de95d2c7508ade94e0e/markupsafe-3.0.3-cp312-cp312-win32.whl", hash = "sha256:d88b440e37a16e651bda4c7c2b930eb586fd15ca7406cb39e211fcff3bf3017d", size = 14540, upload-time = "2025-09-27T18:36:38.761Z" },
+    { url = "https://files.pythonhosted.org/packages/aa/5b/bec5aa9bbbb2c946ca2733ef9c4ca91c91b6a24580193e891b5f7dbe8e1e/markupsafe-3.0.3-cp312-cp312-win_amd64.whl", hash = "sha256:26a5784ded40c9e318cfc2bdb30fe164bdb8665ded9cd64d500a34fb42067b1c", size = 15105, upload-time = "2025-09-27T18:36:39.701Z" },
+    { url = "https://files.pythonhosted.org/packages/e5/f1/216fc1bbfd74011693a4fd837e7026152e89c4bcf3e77b6692fba9923123/markupsafe-3.0.3-cp312-cp312-win_arm64.whl", hash = "sha256:35add3b638a5d900e807944a078b51922212fb3dedb01633a8defc4b01a3c85f", size = 13906, upload-time = "2025-09-27T18:36:40.689Z" },
+    { url = "https://files.pythonhosted.org/packages/38/2f/907b9c7bbba283e68f20259574b13d005c121a0fa4c175f9bed27c4597ff/markupsafe-3.0.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:e1cf1972137e83c5d4c136c43ced9ac51d0e124706ee1c8aa8532c1287fa8795", size = 11622, upload-time = "2025-09-27T18:36:41.777Z" },
+    { url = "https://files.pythonhosted.org/packages/9c/d9/5f7756922cdd676869eca1c4e3c0cd0df60ed30199ffd775e319089cb3ed/markupsafe-3.0.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:116bb52f642a37c115f517494ea5feb03889e04df47eeff5b130b1808ce7c219", size = 12029, upload-time = "2025-09-27T18:36:43.257Z" },
+    { url = "https://files.pythonhosted.org/packages/00/07/575a68c754943058c78f30db02ee03a64b3c638586fba6a6dd56830b30a3/markupsafe-3.0.3-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:133a43e73a802c5562be9bbcd03d090aa5a1fe899db609c29e8c8d815c5f6de6", size = 24374, upload-time = "2025-09-27T18:36:44.508Z" },
+    { url = "https://files.pythonhosted.org/packages/a9/21/9b05698b46f218fc0e118e1f8168395c65c8a2c750ae2bab54fc4bd4e0e8/markupsafe-3.0.3-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ccfcd093f13f0f0b7fdd0f198b90053bf7b2f02a3927a30e63f3ccc9df56b676", size = 22980, upload-time = "2025-09-27T18:36:45.385Z" },
+    { url = "https://files.pythonhosted.org/packages/7f/71/544260864f893f18b6827315b988c146b559391e6e7e8f7252839b1b846a/markupsafe-3.0.3-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:509fa21c6deb7a7a273d629cf5ec029bc209d1a51178615ddf718f5918992ab9", size = 21990, upload-time = "2025-09-27T18:36:46.916Z" },
+    { url = "https://files.pythonhosted.org/packages/c2/28/b50fc2f74d1ad761af2f5dcce7492648b983d00a65b8c0e0cb457c82ebbe/markupsafe-3.0.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:a4afe79fb3de0b7097d81da19090f4df4f8d3a2b3adaa8764138aac2e44f3af1", size = 23784, upload-time = "2025-09-27T18:36:47.884Z" },
+    { url = "https://files.pythonhosted.org/packages/ed/76/104b2aa106a208da8b17a2fb72e033a5a9d7073c68f7e508b94916ed47a9/markupsafe-3.0.3-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:795e7751525cae078558e679d646ae45574b47ed6e7771863fcc079a6171a0fc", size = 21588, upload-time = "2025-09-27T18:36:48.82Z" },
+    { url = "https://files.pythonhosted.org/packages/b5/99/16a5eb2d140087ebd97180d95249b00a03aa87e29cc224056274f2e45fd6/markupsafe-3.0.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:8485f406a96febb5140bfeca44a73e3ce5116b2501ac54fe953e488fb1d03b12", size = 23041, upload-time = "2025-09-27T18:36:49.797Z" },
+    { url = "https://files.pythonhosted.org/packages/19/bc/e7140ed90c5d61d77cea142eed9f9c303f4c4806f60a1044c13e3f1471d0/markupsafe-3.0.3-cp313-cp313-win32.whl", hash = "sha256:bdd37121970bfd8be76c5fb069c7751683bdf373db1ed6c010162b2a130248ed", size = 14543, upload-time = "2025-09-27T18:36:51.584Z" },
+    { url = "https://files.pythonhosted.org/packages/05/73/c4abe620b841b6b791f2edc248f556900667a5a1cf023a6646967ae98335/markupsafe-3.0.3-cp313-cp313-win_amd64.whl", hash = "sha256:9a1abfdc021a164803f4d485104931fb8f8c1efd55bc6b748d2f5774e78b62c5", size = 15113, upload-time = "2025-09-27T18:36:52.537Z" },
+    { url = "https://files.pythonhosted.org/packages/f0/3a/fa34a0f7cfef23cf9500d68cb7c32dd64ffd58a12b09225fb03dd37d5b80/markupsafe-3.0.3-cp313-cp313-win_arm64.whl", hash = "sha256:7e68f88e5b8799aa49c85cd116c932a1ac15caaa3f5db09087854d218359e485", size = 13911, upload-time = "2025-09-27T18:36:53.513Z" },
+    { url = "https://files.pythonhosted.org/packages/e4/d7/e05cd7efe43a88a17a37b3ae96e79a19e846f3f456fe79c57ca61356ef01/markupsafe-3.0.3-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:218551f6df4868a8d527e3062d0fb968682fe92054e89978594c28e642c43a73", size = 11658, upload-time = "2025-09-27T18:36:54.819Z" },
+    { url = "https://files.pythonhosted.org/packages/99/9e/e412117548182ce2148bdeacdda3bb494260c0b0184360fe0d56389b523b/markupsafe-3.0.3-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:3524b778fe5cfb3452a09d31e7b5adefeea8c5be1d43c4f810ba09f2ceb29d37", size = 12066, upload-time = "2025-09-27T18:36:55.714Z" },
+    { url = "https://files.pythonhosted.org/packages/bc/e6/fa0ffcda717ef64a5108eaa7b4f5ed28d56122c9a6d70ab8b72f9f715c80/markupsafe-3.0.3-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4e885a3d1efa2eadc93c894a21770e4bc67899e3543680313b09f139e149ab19", size = 25639, upload-time = "2025-09-27T18:36:56.908Z" },
+    { url = "https://files.pythonhosted.org/packages/96/ec/2102e881fe9d25fc16cb4b25d5f5cde50970967ffa5dddafdb771237062d/markupsafe-3.0.3-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8709b08f4a89aa7586de0aadc8da56180242ee0ada3999749b183aa23df95025", size = 23569, upload-time = "2025-09-27T18:36:57.913Z" },
+    { url = "https://files.pythonhosted.org/packages/4b/30/6f2fce1f1f205fc9323255b216ca8a235b15860c34b6798f810f05828e32/markupsafe-3.0.3-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:b8512a91625c9b3da6f127803b166b629725e68af71f8184ae7e7d54686a56d6", size = 23284, upload-time = "2025-09-27T18:36:58.833Z" },
+    { url = "https://files.pythonhosted.org/packages/58/47/4a0ccea4ab9f5dcb6f79c0236d954acb382202721e704223a8aafa38b5c8/markupsafe-3.0.3-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:9b79b7a16f7fedff2495d684f2b59b0457c3b493778c9eed31111be64d58279f", size = 24801, upload-time = "2025-09-27T18:36:59.739Z" },
+    { url = "https://files.pythonhosted.org/packages/6a/70/3780e9b72180b6fecb83a4814d84c3bf4b4ae4bf0b19c27196104149734c/markupsafe-3.0.3-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:12c63dfb4a98206f045aa9563db46507995f7ef6d83b2f68eda65c307c6829eb", size = 22769, upload-time = "2025-09-27T18:37:00.719Z" },
+    { url = "https://files.pythonhosted.org/packages/98/c5/c03c7f4125180fc215220c035beac6b9cb684bc7a067c84fc69414d315f5/markupsafe-3.0.3-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:8f71bc33915be5186016f675cd83a1e08523649b0e33efdb898db577ef5bb009", size = 23642, upload-time = "2025-09-27T18:37:01.673Z" },
+    { url = "https://files.pythonhosted.org/packages/80/d6/2d1b89f6ca4bff1036499b1e29a1d02d282259f3681540e16563f27ebc23/markupsafe-3.0.3-cp313-cp313t-win32.whl", hash = "sha256:69c0b73548bc525c8cb9a251cddf1931d1db4d2258e9599c28c07ef3580ef354", size = 14612, upload-time = "2025-09-27T18:37:02.639Z" },
+    { url = "https://files.pythonhosted.org/packages/2b/98/e48a4bfba0a0ffcf9925fe2d69240bfaa19c6f7507b8cd09c70684a53c1e/markupsafe-3.0.3-cp313-cp313t-win_amd64.whl", hash = "sha256:1b4b79e8ebf6b55351f0d91fe80f893b4743f104bff22e90697db1590e47a218", size = 15200, upload-time = "2025-09-27T18:37:03.582Z" },
+    { url = "https://files.pythonhosted.org/packages/0e/72/e3cc540f351f316e9ed0f092757459afbc595824ca724cbc5a5d4263713f/markupsafe-3.0.3-cp313-cp313t-win_arm64.whl", hash = "sha256:ad2cf8aa28b8c020ab2fc8287b0f823d0a7d8630784c31e9ee5edea20f406287", size = 13973, upload-time = "2025-09-27T18:37:04.929Z" },
+    { url = "https://files.pythonhosted.org/packages/33/8a/8e42d4838cd89b7dde187011e97fe6c3af66d8c044997d2183fbd6d31352/markupsafe-3.0.3-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:eaa9599de571d72e2daf60164784109f19978b327a3910d3e9de8c97b5b70cfe", size = 11619, upload-time = "2025-09-27T18:37:06.342Z" },
+    { url = "https://files.pythonhosted.org/packages/b5/64/7660f8a4a8e53c924d0fa05dc3a55c9cee10bbd82b11c5afb27d44b096ce/markupsafe-3.0.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:c47a551199eb8eb2121d4f0f15ae0f923d31350ab9280078d1e5f12b249e0026", size = 12029, upload-time = "2025-09-27T18:37:07.213Z" },
+    { url = "https://files.pythonhosted.org/packages/da/ef/e648bfd021127bef5fa12e1720ffed0c6cbb8310c8d9bea7266337ff06de/markupsafe-3.0.3-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f34c41761022dd093b4b6896d4810782ffbabe30f2d443ff5f083e0cbbb8c737", size = 24408, upload-time = "2025-09-27T18:37:09.572Z" },
+    { url = "https://files.pythonhosted.org/packages/41/3c/a36c2450754618e62008bf7435ccb0f88053e07592e6028a34776213d877/markupsafe-3.0.3-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:457a69a9577064c05a97c41f4e65148652db078a3a509039e64d3467b9e7ef97", size = 23005, upload-time = "2025-09-27T18:37:10.58Z" },
+    { url = "https://files.pythonhosted.org/packages/bc/20/b7fdf89a8456b099837cd1dc21974632a02a999ec9bf7ca3e490aacd98e7/markupsafe-3.0.3-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e8afc3f2ccfa24215f8cb28dcf43f0113ac3c37c2f0f0806d8c70e4228c5cf4d", size = 22048, upload-time = "2025-09-27T18:37:11.547Z" },
+    { url = "https://files.pythonhosted.org/packages/9a/a7/591f592afdc734f47db08a75793a55d7fbcc6902a723ae4cfbab61010cc5/markupsafe-3.0.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:ec15a59cf5af7be74194f7ab02d0f59a62bdcf1a537677ce67a2537c9b87fcda", size = 23821, upload-time = "2025-09-27T18:37:12.48Z" },
+    { url = "https://files.pythonhosted.org/packages/7d/33/45b24e4f44195b26521bc6f1a82197118f74df348556594bd2262bda1038/markupsafe-3.0.3-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:0eb9ff8191e8498cca014656ae6b8d61f39da5f95b488805da4bb029cccbfbaf", size = 21606, upload-time = "2025-09-27T18:37:13.485Z" },
+    { url = "https://files.pythonhosted.org/packages/ff/0e/53dfaca23a69fbfbbf17a4b64072090e70717344c52eaaaa9c5ddff1e5f0/markupsafe-3.0.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:2713baf880df847f2bece4230d4d094280f4e67b1e813eec43b4c0e144a34ffe", size = 23043, upload-time = "2025-09-27T18:37:14.408Z" },
+    { url = "https://files.pythonhosted.org/packages/46/11/f333a06fc16236d5238bfe74daccbca41459dcd8d1fa952e8fbd5dccfb70/markupsafe-3.0.3-cp314-cp314-win32.whl", hash = "sha256:729586769a26dbceff69f7a7dbbf59ab6572b99d94576a5592625d5b411576b9", size = 14747, upload-time = "2025-09-27T18:37:15.36Z" },
+    { url = "https://files.pythonhosted.org/packages/28/52/182836104b33b444e400b14f797212f720cbc9ed6ba34c800639d154e821/markupsafe-3.0.3-cp314-cp314-win_amd64.whl", hash = "sha256:bdc919ead48f234740ad807933cdf545180bfbe9342c2bb451556db2ed958581", size = 15341, upload-time = "2025-09-27T18:37:16.496Z" },
+    { url = "https://files.pythonhosted.org/packages/6f/18/acf23e91bd94fd7b3031558b1f013adfa21a8e407a3fdb32745538730382/markupsafe-3.0.3-cp314-cp314-win_arm64.whl", hash = "sha256:5a7d5dc5140555cf21a6fefbdbf8723f06fcd2f63ef108f2854de715e4422cb4", size = 14073, upload-time = "2025-09-27T18:37:17.476Z" },
+    { url = "https://files.pythonhosted.org/packages/3c/f0/57689aa4076e1b43b15fdfa646b04653969d50cf30c32a102762be2485da/markupsafe-3.0.3-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:1353ef0c1b138e1907ae78e2f6c63ff67501122006b0f9abad68fda5f4ffc6ab", size = 11661, upload-time = "2025-09-27T18:37:18.453Z" },
+    { url = "https://files.pythonhosted.org/packages/89/c3/2e67a7ca217c6912985ec766c6393b636fb0c2344443ff9d91404dc4c79f/markupsafe-3.0.3-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:1085e7fbddd3be5f89cc898938f42c0b3c711fdcb37d75221de2666af647c175", size = 12069, upload-time = "2025-09-27T18:37:19.332Z" },
+    { url = "https://files.pythonhosted.org/packages/f0/00/be561dce4e6ca66b15276e184ce4b8aec61fe83662cce2f7d72bd3249d28/markupsafe-3.0.3-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1b52b4fb9df4eb9ae465f8d0c228a00624de2334f216f178a995ccdcf82c4634", size = 25670, upload-time = "2025-09-27T18:37:20.245Z" },
+    { url = "https://files.pythonhosted.org/packages/50/09/c419f6f5a92e5fadde27efd190eca90f05e1261b10dbd8cbcb39cd8ea1dc/markupsafe-3.0.3-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:fed51ac40f757d41b7c48425901843666a6677e3e8eb0abcff09e4ba6e664f50", size = 23598, upload-time = "2025-09-27T18:37:21.177Z" },
+    { url = "https://files.pythonhosted.org/packages/22/44/a0681611106e0b2921b3033fc19bc53323e0b50bc70cffdd19f7d679bb66/markupsafe-3.0.3-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:f190daf01f13c72eac4efd5c430a8de82489d9cff23c364c3ea822545032993e", size = 23261, upload-time = "2025-09-27T18:37:22.167Z" },
+    { url = "https://files.pythonhosted.org/packages/5f/57/1b0b3f100259dc9fffe780cfb60d4be71375510e435efec3d116b6436d43/markupsafe-3.0.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:e56b7d45a839a697b5eb268c82a71bd8c7f6c94d6fd50c3d577fa39a9f1409f5", size = 24835, upload-time = "2025-09-27T18:37:23.296Z" },
+    { url = "https://files.pythonhosted.org/packages/26/6a/4bf6d0c97c4920f1597cc14dd720705eca0bf7c787aebc6bb4d1bead5388/markupsafe-3.0.3-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:f3e98bb3798ead92273dc0e5fd0f31ade220f59a266ffd8a4f6065e0a3ce0523", size = 22733, upload-time = "2025-09-27T18:37:24.237Z" },
+    { url = "https://files.pythonhosted.org/packages/14/c7/ca723101509b518797fedc2fdf79ba57f886b4aca8a7d31857ba3ee8281f/markupsafe-3.0.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:5678211cb9333a6468fb8d8be0305520aa073f50d17f089b5b4b477ea6e67fdc", size = 23672, upload-time = "2025-09-27T18:37:25.271Z" },
+    { url = "https://files.pythonhosted.org/packages/fb/df/5bd7a48c256faecd1d36edc13133e51397e41b73bb77e1a69deab746ebac/markupsafe-3.0.3-cp314-cp314t-win32.whl", hash = "sha256:915c04ba3851909ce68ccc2b8e2cd691618c4dc4c4232fb7982bca3f41fd8c3d", size = 14819, upload-time = "2025-09-27T18:37:26.285Z" },
+    { url = "https://files.pythonhosted.org/packages/1a/8a/0402ba61a2f16038b48b39bccca271134be00c5c9f0f623208399333c448/markupsafe-3.0.3-cp314-cp314t-win_amd64.whl", hash = "sha256:4faffd047e07c38848ce017e8725090413cd80cbc23d86e55c587bf979e579c9", size = 15426, upload-time = "2025-09-27T18:37:27.316Z" },
+    { url = "https://files.pythonhosted.org/packages/70/bc/6f1c2f612465f5fa89b95bead1f44dcb607670fd42891d8fdcd5d039f4f4/markupsafe-3.0.3-cp314-cp314t-win_arm64.whl", hash = "sha256:32001d6a8fc98c8cb5c947787c5d08b0a50663d139f1305bac5885d98d9b40fa", size = 14146, upload-time = "2025-09-27T18:37:28.327Z" },
+]
+
+[[package]]
+name = "mdurl"
+version = "0.1.2"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/d6/54/cfe61301667036ec958cb99bd3efefba235e65cdeb9c84d24a8293ba1d90/mdurl-0.1.2.tar.gz", hash = "sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba", size = 8729, upload-time = "2022-08-14T12:40:10.846Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/b3/38/89ba8ad64ae25be8de66a6d463314cf1eb366222074cfda9ee839c56a4b4/mdurl-0.1.2-py3-none-any.whl", hash = "sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8", size = 9979, upload-time = "2022-08-14T12:40:09.779Z" },
+]
+
+[[package]]
+name = "mergedeep"
+version = "1.3.4"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/3a/41/580bb4006e3ed0361b8151a01d324fb03f420815446c7def45d02f74c270/mergedeep-1.3.4.tar.gz", hash = "sha256:0096d52e9dad9939c3d975a774666af186eda617e6ca84df4c94dec30004f2a8", size = 4661, upload-time = "2021-02-05T18:55:30.623Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/2c/19/04f9b178c2d8a15b076c8b5140708fa6ffc5601fb6f1e975537072df5b2a/mergedeep-1.3.4-py3-none-any.whl", hash = "sha256:70775750742b25c0d8f36c55aed03d24c3384d17c951b3175d898bd778ef0307", size = 6354, upload-time = "2021-02-05T18:55:29.583Z" },
+]
+
+[[package]]
+name = "mkdocs"
+version = "1.6.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "click" },
+    { name = "colorama", marker = "sys_platform == 'win32'" },
+    { name = "ghp-import" },
+    { name = "jinja2" },
+    { name = "markdown" },
+    { name = "markupsafe" },
+    { name = "mergedeep" },
+    { name = "mkdocs-get-deps" },
+    { name = "packaging" },
+    { name = "pathspec" },
+    { name = "pyyaml" },
+    { name = "pyyaml-env-tag" },
+    { name = "watchdog" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/bc/c6/bbd4f061bd16b378247f12953ffcb04786a618ce5e904b8c5a01a0309061/mkdocs-1.6.1.tar.gz", hash = "sha256:7b432f01d928c084353ab39c57282f29f92136665bdd6abf7c1ec8d822ef86f2", size = 3889159, upload-time = "2024-08-30T12:24:06.899Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/22/5b/dbc6a8cddc9cfa9c4971d59fb12bb8d42e161b7e7f8cc89e49137c5b279c/mkdocs-1.6.1-py3-none-any.whl", hash = "sha256:db91759624d1647f3f34aa0c3f327dd2601beae39a366d6e064c03468d35c20e", size = 3864451, upload-time = "2024-08-30T12:24:05.054Z" },
+]
+
+[[package]]
+name = "mkdocs-autorefs"
+version = "1.4.4"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "markdown" },
+    { name = "markupsafe" },
+    { name = "mkdocs" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/52/c0/f641843de3f612a6b48253f39244165acff36657a91cc903633d456ae1ac/mkdocs_autorefs-1.4.4.tar.gz", hash = "sha256:d54a284f27a7346b9c38f1f852177940c222da508e66edc816a0fa55fc6da197", size = 56588, upload-time = "2026-02-10T15:23:55.105Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/28/de/a3e710469772c6a89595fc52816da05c1e164b4c866a89e3cb82fb1b67c5/mkdocs_autorefs-1.4.4-py3-none-any.whl", hash = "sha256:834ef5408d827071ad1bc69e0f39704fa34c7fc05bc8e1c72b227dfdc5c76089", size = 25530, upload-time = "2026-02-10T15:23:53.817Z" },
+]
+
+[[package]]
+name = "mkdocs-get-deps"
+version = "0.2.2"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "mergedeep" },
+    { name = "platformdirs" },
+    { name = "pyyaml" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/ce/25/b3cccb187655b9393572bde9b09261d267c3bf2f2cdabe347673be5976a6/mkdocs_get_deps-0.2.2.tar.gz", hash = "sha256:8ee8d5f316cdbbb2834bc1df6e69c08fe769a83e040060de26d3c19fad3599a1", size = 11047, upload-time = "2026-03-10T02:46:33.632Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/88/29/744136411e785c4b0b744d5413e56555265939ab3a104c6a4b719dad33fd/mkdocs_get_deps-0.2.2-py3-none-any.whl", hash = "sha256:e7878cbeac04860b8b5e0ca31d3abad3df9411a75a32cde82f8e44b6c16ff650", size = 9555, upload-time = "2026-03-10T02:46:32.256Z" },
+]
+
+[[package]]
+name = "mkdocs-glightbox"
+version = "0.5.2"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "selectolax" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/8d/26/c793459622da8e31f954c6f5fb51e8f098143fdfc147b1e3c25bf686f4aa/mkdocs_glightbox-0.5.2.tar.gz", hash = "sha256:c7622799347c32310878e01ccf14f70648445561010911c80590cec0353370ac", size = 510586, upload-time = "2025-10-23T14:55:18.909Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/4e/ca/03624e017e5ee2d7ce8a08d89f81c1e535eb3c30d7b2dc4a435ea3fbbeae/mkdocs_glightbox-0.5.2-py3-none-any.whl", hash = "sha256:23a431ea802b60b1030c73323db2eed6ba859df1a0822ce575afa43e0ea3f47e", size = 26458, upload-time = "2025-10-23T14:55:17.43Z" },
+]
+
+[[package]]
+name = "mkdocs-material"
+version = "9.7.6"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "babel" },
+    { name = "backrefs" },
+    { name = "colorama" },
+    { name = "jinja2" },
+    { name = "markdown" },
+    { name = "mkdocs" },
+    { name = "mkdocs-material-extensions" },
+    { name = "paginate" },
+    { name = "pygments" },
+    { name = "pymdown-extensions" },
+    { name = "requests" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/45/29/6d2bcf41ae40802c4beda2432396fff97b8456fb496371d1bc7aad6512ec/mkdocs_material-9.7.6.tar.gz", hash = "sha256:00bdde50574f776d328b1862fe65daeaf581ec309bd150f7bff345a098c64a69", size = 4097959, upload-time = "2026-03-19T15:41:58.161Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/2c/01/bc663630c510822c95c47a66af9fa7a443c295b47d5f041e5e6ae62ef659/mkdocs_material-9.7.6-py3-none-any.whl", hash = "sha256:71b84353921b8ea1ba84fe11c50912cc512da8fe0881038fcc9a0761c0e635ba", size = 9305470, upload-time = "2026-03-19T15:41:55.217Z" },
+]
+
+[[package]]
+name = "mkdocs-material-extensions"
+version = "1.3.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/79/9b/9b4c96d6593b2a541e1cb8b34899a6d021d208bb357042823d4d2cabdbe7/mkdocs_material_extensions-1.3.1.tar.gz", hash = "sha256:10c9511cea88f568257f960358a467d12b970e1f7b2c0e5fb2bb48cab1928443", size = 11847, upload-time = "2023-11-22T19:09:45.208Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/5b/54/662a4743aa81d9582ee9339d4ffa3c8fd40a4965e033d77b9da9774d3960/mkdocs_material_extensions-1.3.1-py3-none-any.whl", hash = "sha256:adff8b62700b25cb77b53358dad940f3ef973dd6db797907c49e3c2ef3ab4e31", size = 8728, upload-time = "2023-11-22T19:09:43.465Z" },
+]
+
+[[package]]
+name = "mkdocstrings"
+version = "1.0.4"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "jinja2" },
+    { name = "markdown" },
+    { name = "markupsafe" },
+    { name = "mkdocs" },
+    { name = "mkdocs-autorefs" },
+    { name = "pymdown-extensions" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/1d/5d/f888d4d3eb31359b327bc9b17a212d6ef03fe0b0682fbb3fc2cb849fb12b/mkdocstrings-1.0.4.tar.gz", hash = "sha256:3969a6515b77db65fd097b53c1b7aa4ae840bd71a2ee62a6a3e89503446d7172", size = 100088, upload-time = "2026-04-15T09:16:53.376Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/6e/94/be70f8ee9c45f2f62b39a1f0e9303bc20e138a8f3b8e50ffd89498e177e1/mkdocstrings-1.0.4-py3-none-any.whl", hash = "sha256:63464b4b29053514f32a1dbbf604e52876d5e638111b0c295ab7ed3cac73ca9b", size = 35560, upload-time = "2026-04-15T09:16:51.436Z" },
+]
+
+[[package]]
+name = "mkdocstrings-python"
+version = "2.0.3"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "griffelib" },
+    { name = "mkdocs-autorefs" },
+    { name = "mkdocstrings" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/29/33/c225eaf898634bdda489a6766fc35d1683c640bffe0e0acd10646b13536d/mkdocstrings_python-2.0.3.tar.gz", hash = "sha256:c518632751cc869439b31c9d3177678ad2bfa5c21b79b863956ad68fc92c13b8", size = 199083, upload-time = "2026-02-20T10:38:36.368Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/32/28/79f0f8de97cce916d5ae88a7bee1ad724855e83e6019c0b4d5b3fabc80f3/mkdocstrings_python-2.0.3-py3-none-any.whl", hash = "sha256:0b83513478bdfd803ff05aa43e9b1fca9dd22bcd9471f09ca6257f009bc5ee12", size = 104779, upload-time = "2026-02-20T10:38:34.517Z" },
+]
+
+[[package]]
+name = "murmurhash"
+version = "1.0.15"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/23/2e/88c147931ea9725d634840d538622e94122bceaf346233349b7b5c62964b/murmurhash-1.0.15.tar.gz", hash = "sha256:58e2b27b7847f9e2a6edf10b47a8c8dd70a4705f45dccb7bf76aeadacf56ba01", size = 13291, upload-time = "2025-11-14T09:51:15.272Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/b6/46/be8522d3456fdccf1b8b049c6d82e7a3c1114c4fc2cfe14b04cba4b3e701/murmurhash-1.0.15-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:d37e3ae44746bca80b1a917c2ea625cf216913564ed43f69d2888e5df97db0cb", size = 27884, upload-time = "2025-11-14T09:50:13.133Z" },
+    { url = "https://files.pythonhosted.org/packages/ed/cc/630449bf4f6178d7daf948ce46ad00b25d279065fc30abd8d706be3d87e0/murmurhash-1.0.15-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:0861cb11039409eaf46878456b7d985ef17b6b484103a6fc367b2ecec846891d", size = 27855, upload-time = "2025-11-14T09:50:14.859Z" },
+    { url = "https://files.pythonhosted.org/packages/ff/30/ea8f601a9bf44db99468696efd59eb9cff1157cd55cb586d67116697583f/murmurhash-1.0.15-cp312-cp312-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:5a301decfaccfec70fe55cb01dde2a012c3014a874542eaa7cc73477bb749616", size = 134088, upload-time = "2025-11-14T09:50:15.958Z" },
+    { url = "https://files.pythonhosted.org/packages/c9/de/c40ce8c0877d406691e735b8d6e9c815f36a82b499d358313db5dbe219d7/murmurhash-1.0.15-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:32c6fde7bd7e9407003370a07b5f4addacabe1556ad3dc2cac246b7a2bba3400", size = 133978, upload-time = "2025-11-14T09:50:17.572Z" },
+    { url = "https://files.pythonhosted.org/packages/47/84/bd49963ecd84ebab2fe66595e2d1ed41d5e8b5153af5dc930f0bd827007c/murmurhash-1.0.15-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:5d8b43a7011540dc3c7ce66f2134df9732e2bc3bbb4a35f6458bc755e48bde26", size = 132956, upload-time = "2025-11-14T09:50:18.742Z" },
+    { url = "https://files.pythonhosted.org/packages/4f/7c/2530769c545074417c862583f05f4245644599f1e9ff619b3dfe2969aafc/murmurhash-1.0.15-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:43bf4541892ecd95963fcd307bf1c575fc0fee1682f41c93007adee71ca2bb40", size = 134184, upload-time = "2025-11-14T09:50:19.941Z" },
+    { url = "https://files.pythonhosted.org/packages/84/a4/b249b042f5afe34d14ada2dc4afc777e883c15863296756179652e081c44/murmurhash-1.0.15-cp312-cp312-win_amd64.whl", hash = "sha256:f4ac15a2089dc42e6eb0966622d42d2521590a12c92480aafecf34c085302cca", size = 25647, upload-time = "2025-11-14T09:50:21.049Z" },
+    { url = "https://files.pythonhosted.org/packages/13/bf/028179259aebc18fd4ba5cae2601d1d47517427a537ab44336446431a215/murmurhash-1.0.15-cp312-cp312-win_arm64.whl", hash = "sha256:4a70ca4ae19e600d9be3da64d00710e79dde388a4d162f22078d64844d0ebdda", size = 23338, upload-time = "2025-11-14T09:50:22.359Z" },
+    { url = "https://files.pythonhosted.org/packages/29/2f/ba300b5f04dae0409202d6285668b8a9d3ade43a846abee3ef611cb388d5/murmurhash-1.0.15-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:fe50dc70e52786759358fd1471e309b94dddfffb9320d9dfea233c7684c894ba", size = 27861, upload-time = "2025-11-14T09:50:23.804Z" },
+    { url = "https://files.pythonhosted.org/packages/34/02/29c19d268e6f4ea1ed2a462c901eed1ed35b454e2cbc57da592fad663ac6/murmurhash-1.0.15-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:1349a7c23f6092e7998ddc5bd28546cc31a595afc61e9fdb3afc423feec3d7ad", size = 27840, upload-time = "2025-11-14T09:50:25.146Z" },
+    { url = "https://files.pythonhosted.org/packages/e2/63/58e2de2b5232cd294c64092688c422196e74f9fa8b3958bdf02d33df24b9/murmurhash-1.0.15-cp313-cp313-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:b3ba6d05de2613535b5a9227d4ad8ef40a540465f64660d4a8800634ae10e04f", size = 133080, upload-time = "2025-11-14T09:50:26.566Z" },
+    { url = "https://files.pythonhosted.org/packages/aa/9a/d13e2e9f8ba1ced06840921a50f7cece0a475453284158a3018b72679761/murmurhash-1.0.15-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:fa1b70b3cc2801ab44179c65827bbd12009c68b34e9d9ce7125b6a0bd35af63c", size = 132648, upload-time = "2025-11-14T09:50:27.788Z" },
+    { url = "https://files.pythonhosted.org/packages/b2/e1/47994f1813fa205c84977b0ff51ae6709f8539af052c7491a5f863d82bdc/murmurhash-1.0.15-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:213d710fb6f4ef3bc11abbfad0fa94a75ffb675b7dc158c123471e5de869f9af", size = 131502, upload-time = "2025-11-14T09:50:29.339Z" },
+    { url = "https://files.pythonhosted.org/packages/b9/ea/90c1fd00b4aeb704fb5e84cd666b33ffd7f245155048071ffbb51d2bb57d/murmurhash-1.0.15-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:b65a5c4e7f5d71f7ccac2d2b60bdf7092d7976270878cfec59d5a66a533db823", size = 132736, upload-time = "2025-11-14T09:50:30.545Z" },
+    { url = "https://files.pythonhosted.org/packages/00/db/da73462dbfa77f6433b128d2120ba7ba300f8c06dc4f4e022c38d240a5f5/murmurhash-1.0.15-cp313-cp313-win_amd64.whl", hash = "sha256:9aba94c5d841e1904cd110e94ceb7f49cfb60a874bbfb27e0373622998fb7c7c", size = 25682, upload-time = "2025-11-14T09:50:31.624Z" },
+    { url = "https://files.pythonhosted.org/packages/bb/83/032729ef14971b938fbef41ee125fc8800020ee229bd35178b6ede8ee934/murmurhash-1.0.15-cp313-cp313-win_arm64.whl", hash = "sha256:263807eca40d08c7b702413e45cca75ecb5883aa337237dc5addb660f1483378", size = 23370, upload-time = "2025-11-14T09:50:33.264Z" },
+    { url = "https://files.pythonhosted.org/packages/10/83/7547d9205e9bd2f8e5dfd0b682cc9277594f98909f228eb359489baec1df/murmurhash-1.0.15-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:694fd42a74b7ce257169d14c24aa616aa6cd4ccf8abe50eca0557e08da99d055", size = 29955, upload-time = "2025-11-14T09:50:34.488Z" },
+    { url = "https://files.pythonhosted.org/packages/b7/c7/3afd5de7a5b3ae07fe2d3a3271b327ee1489c58ba2b2f2159bd31a25edb9/murmurhash-1.0.15-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:a2ea4546ba426390beff3cd10db8f0152fdc9072c4f2583ec7d8aa9f3e4ac070", size = 30108, upload-time = "2025-11-14T09:50:35.53Z" },
+    { url = "https://files.pythonhosted.org/packages/02/69/d6637ee67d78ebb2538c00411f28ea5c154886bbe1db16c49435a8a4ab16/murmurhash-1.0.15-cp313-cp313t-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:34e5a91139c40b10f98d0b297907f5d5267b4b1b2e5dd2eb74a021824f751b98", size = 164054, upload-time = "2025-11-14T09:50:36.591Z" },
+    { url = "https://files.pythonhosted.org/packages/ab/4c/89e590165b4c7da6bf941441212a721a270195332d3aacfdfdf527d466ca/murmurhash-1.0.15-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:dc35606868a5961cf42e79314ca0bddf5a400ce377b14d83192057928d6252ec", size = 168153, upload-time = "2025-11-14T09:50:37.856Z" },
+    { url = "https://files.pythonhosted.org/packages/07/7a/95c42df0c21d2e413b9fcd17317a7587351daeb264dc29c6aec1fdbd26f8/murmurhash-1.0.15-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:43cc6ac3b91ca0f7a5ae9c063ba4d6c26972c97fd7c25280ecc666413e4c5535", size = 164345, upload-time = "2025-11-14T09:50:39.346Z" },
+    { url = "https://files.pythonhosted.org/packages/d0/22/9d02c880a88b83bb3ce7d6a38fb727373ab78d82e5f3d8d9fc5612219f90/murmurhash-1.0.15-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:847d712136cb462f0e4bd6229ee2d9eb996d8854eb8312dff3d20c8f5181fda5", size = 161990, upload-time = "2025-11-14T09:50:40.689Z" },
+    { url = "https://files.pythonhosted.org/packages/9a/e3/750232524e0dc262e8dcede6536dafc766faadd9a52f1d23746b02948ad8/murmurhash-1.0.15-cp313-cp313t-win_amd64.whl", hash = "sha256:2680851af6901dbe66cc4aa7ef8e263de47e6e1b425ae324caa571bdf18f8d58", size = 28812, upload-time = "2025-11-14T09:50:41.971Z" },
+    { url = "https://files.pythonhosted.org/packages/ff/89/4ad9d215ef6ade89f27a72dc4e86b98ef1a43534cc3e6a6900a362a0bf0a/murmurhash-1.0.15-cp313-cp313t-win_arm64.whl", hash = "sha256:189a8de4d657b5da9efd66601b0636330b08262b3a55431f2379097c986995d0", size = 25398, upload-time = "2025-11-14T09:50:43.023Z" },
+    { url = "https://files.pythonhosted.org/packages/1c/69/726df275edf07688146966e15eaaa23168100b933a2e1a29b37eb56c6db8/murmurhash-1.0.15-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:7c4280136b738e85ff76b4bdc4341d0b867ee753e73fd8b6994288080c040d0b", size = 28029, upload-time = "2025-11-14T09:50:44.124Z" },
+    { url = "https://files.pythonhosted.org/packages/59/8f/24ecf9061bc2b20933df8aba47c73e904274ea8811c8300cab92f6f82372/murmurhash-1.0.15-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:d4d681f474830489e2ec1d912095cfff027fbaf2baa5414c7e9d25b89f0fab68", size = 27912, upload-time = "2025-11-14T09:50:45.266Z" },
+    { url = "https://files.pythonhosted.org/packages/ba/26/fff3caba25aa3c0622114e03c69fb66c839b22335b04d7cce91a3a126d44/murmurhash-1.0.15-cp314-cp314-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:d7e47c5746785db6a43b65fac47b9e63dd71dfbd89a8c92693425b9715e68c6e", size = 131847, upload-time = "2025-11-14T09:50:46.819Z" },
+    { url = "https://files.pythonhosted.org/packages/df/e4/0f2b9fc533467a27afb4e906c33f32d5f637477de87dd94690e0c44335a6/murmurhash-1.0.15-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:e8e674f02a99828c8a671ba99cd03299381b2f0744e6f25c29cadfc6151dc724", size = 132267, upload-time = "2025-11-14T09:50:48.298Z" },
+    { url = "https://files.pythonhosted.org/packages/da/bf/9d1c107989728ec46e25773d503aa54070b32822a18cfa7f9d5f41bc17a5/murmurhash-1.0.15-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:26fd7c7855ac4850ad8737991d7b0e3e501df93ebaf0cf45aa5954303085fdba", size = 131894, upload-time = "2025-11-14T09:50:49.485Z" },
+    { url = "https://files.pythonhosted.org/packages/0d/81/dcf27c71445c0e993b10e33169a098ca60ee702c5c58fcbde205fa6332a6/murmurhash-1.0.15-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:cb8ebafae60d5f892acff533cc599a359954d8c016a829514cb3f6e9ee10f322", size = 132054, upload-time = "2025-11-14T09:50:50.747Z" },
+    { url = "https://files.pythonhosted.org/packages/bc/32/e874a14b2d2246bd2d16f80f49fad393a3865d4ee7d66d2cae939a67a29a/murmurhash-1.0.15-cp314-cp314-win_amd64.whl", hash = "sha256:898a629bf111f1aeba4437e533b5b836c0a9d2dd12d6880a9c75f6ca13e30e22", size = 26579, upload-time = "2025-11-14T09:50:52.278Z" },
+    { url = "https://files.pythonhosted.org/packages/af/8e/4fca051ed8ae4d23a15aaf0a82b18cb368e8cf84f1e3b474d5749ec46069/murmurhash-1.0.15-cp314-cp314-win_arm64.whl", hash = "sha256:88dc1dd53b7b37c0df1b8b6bce190c12763014492f0269ff7620dc6027f470f4", size = 24341, upload-time = "2025-11-14T09:50:53.295Z" },
+    { url = "https://files.pythonhosted.org/packages/38/9c/c72c2a4edd86aac829337ab9f83cf04cdb15e5d503e4c9a3a243f30a261c/murmurhash-1.0.15-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:6cb4e962ec4f928b30c271b2d84e6707eff6d942552765b663743cfa618b294b", size = 30146, upload-time = "2025-11-14T09:50:54.705Z" },
+    { url = "https://files.pythonhosted.org/packages/ac/d7/72b47ebc86436cd0aa1fd4c6e8779521ec389397ac11389990278d0f7a47/murmurhash-1.0.15-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:5678a3ea4fbf0cbaaca2bed9b445f556f294d5f799c67185d05ffcb221a77faf", size = 30141, upload-time = "2025-11-14T09:50:55.829Z" },
+    { url = "https://files.pythonhosted.org/packages/64/bb/6d2f09135079c34dc2d26e961c52742d558b320c61503f273eab6ba743d9/murmurhash-1.0.15-cp314-cp314t-manylinux1_x86_64.manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:ef19f38c6b858eef83caf710773db98c8f7eb2193b4c324650c74f3d8ba299e0", size = 163898, upload-time = "2025-11-14T09:50:56.946Z" },
+    { url = "https://files.pythonhosted.org/packages/b9/e2/9c1b462e33f9cb2d632056f07c90b502fc20bd7da50a15d0557343bd2fed/murmurhash-1.0.15-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:22aa3ceaedd2e57078b491ed08852d512b84ff4ff9bb2ff3f9bf0eec7f214c9e", size = 168040, upload-time = "2025-11-14T09:50:58.234Z" },
+    { url = "https://files.pythonhosted.org/packages/e8/73/8694db1408fcdfa73589f7df6c445437ea146986fa1e393ec60d26d6e30c/murmurhash-1.0.15-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:bba0e0262c0d08682b028cb963ac477bd9839029486fa1333fc5c01fb6072749", size = 164239, upload-time = "2025-11-14T09:50:59.95Z" },
+    { url = "https://files.pythonhosted.org/packages/2d/f9/8e360bdfc3c44e267e7e046f0e0b9922766da92da26959a6963f597e6bb5/murmurhash-1.0.15-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:4fd8189ee293a09f30f4931408f40c28ccd42d9de4f66595f8814879339378bc", size = 161811, upload-time = "2025-11-14T09:51:01.289Z" },
+    { url = "https://files.pythonhosted.org/packages/f9/31/97649680595b1096803d877ababb9a67c07f4378f177ec885eea28b9db6d/murmurhash-1.0.15-cp314-cp314t-win_amd64.whl", hash = "sha256:66395b1388f7daa5103db92debe06842ae3be4c0749ef6db68b444518666cdcc", size = 29817, upload-time = "2025-11-14T09:51:02.493Z" },
+    { url = "https://files.pythonhosted.org/packages/76/66/4fce8755f25d77324401886c00017c556be7ca3039575b94037aff905385/murmurhash-1.0.15-cp314-cp314t-win_arm64.whl", hash = "sha256:c22e56c6a0b70598a66e456de5272f76088bc623688da84ef403148a6d41851d", size = 26219, upload-time = "2025-11-14T09:51:03.563Z" },
+]
+
+[[package]]
+name = "mypy-extensions"
+version = "1.1.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/a2/6e/371856a3fb9d31ca8dac321cda606860fa4548858c0cc45d9d1d4ca2628b/mypy_extensions-1.1.0.tar.gz", hash = "sha256:52e68efc3284861e772bbcd66823fde5ae21fd2fdb51c62a211403730b916558", size = 6343, upload-time = "2025-04-22T14:54:24.164Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/79/7b/2c79738432f5c924bef5071f933bcc9efd0473bac3b4aa584a6f7c1c8df8/mypy_extensions-1.1.0-py3-none-any.whl", hash = "sha256:1be4cccdb0f2482337c4743e60421de3a356cd97508abadd57d47403e94f5505", size = 4963, upload-time = "2025-04-22T14:54:22.983Z" },
+]
+
+[[package]]
+name = "nodejs-wheel-binaries"
+version = "24.15.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/3f/70/a1e4f4d5986768ab90cc860b1cc3660fd2ded74ca175a900a5c29f839c7d/nodejs_wheel_binaries-24.15.0.tar.gz", hash = "sha256:b43f5c4f6e5768d8845b2ae4682eb703a19bf7aadc84187e2d903ed3a611c859", size = 8057, upload-time = "2026-04-19T15:48:16.899Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/85/66/54051d14853d6ab4fb85f8be9b042b530be653357fb9a19557498bc91ab7/nodejs_wheel_binaries-24.15.0-py2.py3-none-macosx_13_0_arm64.whl", hash = "sha256:a6232fa8b754220941f52388c8ead923f7c1c7fdf0ea0d98f657523bd9a81ef4", size = 55173485, upload-time = "2026-04-19T15:47:34.561Z" },
+    { url = "https://files.pythonhosted.org/packages/ad/5f/66acada164da5ca10a0824db021aa7394ae18396c550cd9280e839a43126/nodejs_wheel_binaries-24.15.0-py2.py3-none-macosx_13_0_x86_64.whl", hash = "sha256:001a6b62c69d9109c1738163cca00608dd2722e8663af59300054ea02610972d", size = 55348100, upload-time = "2026-04-19T15:47:40.521Z" },
+    { url = "https://files.pythonhosted.org/packages/0d/2d/0cbd5ff40c9bb030ca1735d8f8793bd74f08a4cbd49100a1d19313ea57ab/nodejs_wheel_binaries-24.15.0-py2.py3-none-manylinux_2_28_aarch64.whl", hash = "sha256:0fbc48765e60ed0ff30d43898dbf5cadbadf2e5f1e7f204afc2b01493b7ebce6", size = 59668206, upload-time = "2026-04-19T15:47:46.848Z" },
+    { url = "https://files.pythonhosted.org/packages/da/d5/91ac63951ec75927a486b83b8cafe650e360fa70ac01dc94adfb32b93b97/nodejs_wheel_binaries-24.15.0-py2.py3-none-manylinux_2_28_x86_64.whl", hash = "sha256:20ee0536809795da8a4942fc1ab4cbdebbcaaf29383eab67ba8874268fb00008", size = 60206736, upload-time = "2026-04-19T15:47:52.668Z" },
+    { url = "https://files.pythonhosted.org/packages/db/72/dc22776974d928869c0c30d23ee98ed7df254243c2df68f09f5963e8e8b8/nodejs_wheel_binaries-24.15.0-py2.py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:1fade6c214285e72472ca40a631e98ff36559671cd5eefc8bf009471d67f04b4", size = 61720456, upload-time = "2026-04-19T15:47:58.325Z" },
+    { url = "https://files.pythonhosted.org/packages/01/0a/34461b9050cb45ee371dccdefc622aef6351506ea2691b08fc761ca67150/nodejs_wheel_binaries-24.15.0-py2.py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:3984cb8d87766567aee67a49743227ab40ede6f47734ec990ff90e50b74e7740", size = 62326172, upload-time = "2026-04-19T15:48:04.094Z" },
+    { url = "https://files.pythonhosted.org/packages/c9/17/09252bf35672dba926649d59dfe51443a0f6955ad13784e91131d5ec82a2/nodejs_wheel_binaries-24.15.0-py2.py3-none-win_amd64.whl", hash = "sha256:a437601956b532dcb3082046e6978e622733f90edc0932cbb9adb3bb97a16501", size = 41543461, upload-time = "2026-04-19T15:48:09.332Z" },
+    { url = "https://files.pythonhosted.org/packages/0a/7e/b649777d148e1e0c2ce349156603cdb12f7ed99921b95d93717393650193/nodejs_wheel_binaries-24.15.0-py2.py3-none-win_arm64.whl", hash = "sha256:bdf4a431e08321a32efc604111c6f23941f87055d796a537e8c4110daecad23f", size = 39233248, upload-time = "2026-04-19T15:48:13.326Z" },
+]
+
+[[package]]
+name = "numba"
+version = "0.65.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "llvmlite" },
+    { name = "numpy" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/f6/c5/db2ac3685833d626c0dcae6bd2330cd68433e1fd248d15f70998160d3ad7/numba-0.65.1.tar.gz", hash = "sha256:19357146c32fe9ed25059ab915e8465fb13951cf6b0aace3826b76886373ab23", size = 2765600, upload-time = "2026-04-24T02:02:56.551Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/57/bc/76f8f8c5cf9adee47fdb7bbb03be8900f76f902d451d7477cf12b845e1de/numba-0.65.1-cp312-cp312-macosx_12_0_arm64.whl", hash = "sha256:ac3f1e77c352dd0ea9712732c2d8f9ca507717435eec5b5013bf138ac33c4a08", size = 2681371, upload-time = "2026-04-24T02:02:26.105Z" },
+    { url = "https://files.pythonhosted.org/packages/69/47/a415af0283e4db0398104c6d1c11c9861a98dc67a7aa442a7769ed5d6196/numba-0.65.1-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:52bc6f3ceb8fcaff9b2ae26b4c6b1e9fee39db8d355534c0fe4f39a901246b84", size = 3802467, upload-time = "2026-04-24T02:02:27.712Z" },
+    { url = "https://files.pythonhosted.org/packages/46/36/246f73ec99cfeab2f2cb2ce7d4218766cc36a2da418901223f4f4da9c813/numba-0.65.1-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:90ca10b3463bae0bd70589726fe3c77d01d6b5fc86bee54bcdf9fb6b47c28977", size = 3502628, upload-time = "2026-04-24T02:02:29.763Z" },
+    { url = "https://files.pythonhosted.org/packages/db/9e/3c679b2ee078425b9e99a91e44f8d132a6830d8ccce5227bc5e9181aeed8/numba-0.65.1-cp312-cp312-win_amd64.whl", hash = "sha256:5971c632be2a2351500431f46213821dba8d02b18a9f7d02fd36bd2743e41a6a", size = 2750611, upload-time = "2026-04-24T02:02:31.477Z" },
+    { url = "https://files.pythonhosted.org/packages/79/37/14a4579049c1eb673afd0de0cb4842982acd55b9ce2643e763db858bcea0/numba-0.65.1-cp313-cp313-macosx_12_0_arm64.whl", hash = "sha256:1735c15c1134a5108b4d6a5c77fc0947924ea066a738dc09a52008c13df9cad3", size = 2681344, upload-time = "2026-04-24T02:02:33.65Z" },
+    { url = "https://files.pythonhosted.org/packages/a0/22/b8d873f6466b20aa563fc9b33acd48dec89a07803ddaa2f1c8ca1cd33126/numba-0.65.1-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:c09f49117ef255e1f1c6dad0c7a1ed39868243862a73be5706793241a3755f1b", size = 3810619, upload-time = "2026-04-24T02:02:36.041Z" },
+    { url = "https://files.pythonhosted.org/packages/62/08/e16a8b5d9a018962ebb5c66be662317cde32b9f5dab08441f90bed5522fb/numba-0.65.1-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:594a8680b3fadac99e97e489b1fd89007177e5336713745c3b769528c635a464", size = 3509783, upload-time = "2026-04-24T02:02:38.245Z" },
+    { url = "https://files.pythonhosted.org/packages/fd/a5/03c970d57f4c1741354837353ce39fb5206952ae1dba8922d29c86f64805/numba-0.65.1-cp313-cp313-win_amd64.whl", hash = "sha256:85be74c0d036842699a30058f82fb88fc5ffdc59f7615cab5792ea92914c9b62", size = 2750534, upload-time = "2026-04-24T02:02:39.903Z" },
+    { url = "https://files.pythonhosted.org/packages/4f/2e/8aed9b726d9ba5f11ad287645fd479e88278db3060a25cb1225d730eb2b7/numba-0.65.1-cp314-cp314-macosx_12_0_arm64.whl", hash = "sha256:33f5eb68eb1c843511615d14663ce60258525d6a4c65ab040e2c2b0c4cf17450", size = 2681554, upload-time = "2026-04-24T02:02:41.812Z" },
+    { url = "https://files.pythonhosted.org/packages/87/96/f3eb235fafa82a34e2ab5dd7dc9ffff998ebf5f0bbc23fa56a96aeb44da6/numba-0.65.1-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:71e73029bf53a62cc6afcf96be4bd942290d8b4c55f0a454fb536158115790f7", size = 3779602, upload-time = "2026-04-24T02:02:43.726Z" },
+    { url = "https://files.pythonhosted.org/packages/09/90/b0f09b48752d23640b8284f22aa597737e8adaddc7fbfacc4708b7f73a4c/numba-0.65.1-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3a07635e0be926b9bdbffb09137c230fb13f6ec0e564914ba937cee12ce3eb35", size = 3479532, upload-time = "2026-04-24T02:02:45.427Z" },
+    { url = "https://files.pythonhosted.org/packages/56/46/3f7fc04fb853559e74b210e0b62c19974ec844cefec611f9e535f4da3761/numba-0.65.1-cp314-cp314-win_amd64.whl", hash = "sha256:2a20fcdabdefbdacf88d85caf70c3b18c4bcb7ebb8f82e6a19486383dd26ab63", size = 2752637, upload-time = "2026-04-24T02:02:47.664Z" },
+    { url = "https://files.pythonhosted.org/packages/81/7b/c1a341a9067367778f4152a5f01061cf281fb09582c92c510ec4918cabf6/numba-0.65.1-cp314-cp314t-macosx_12_0_arm64.whl", hash = "sha256:548dd4b3a4508d5062768d1514b2cd7b015f9a25ec7af651c50dee243965e652", size = 2684600, upload-time = "2026-04-24T02:02:49.653Z" },
+    { url = "https://files.pythonhosted.org/packages/03/36/98ddbcf3e4f04a6dd07e1c67249955920579ba4af6bb6868e3088f4ed282/numba-0.65.1-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:78abc28feff2c2ff8307fff3975b6438352759c9acb797ecd6b1fb6e7e39e31d", size = 3817198, upload-time = "2026-04-24T02:02:51.266Z" },
+    { url = "https://files.pythonhosted.org/packages/a3/83/0dad21057ece5a835599f5d24099b091703995e23dbbf894f259e91c010b/numba-0.65.1-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ee7676cb389555805f9b9a1840cbcd1ea6c8bd5376ab6918e3a29c5ea1dbda20", size = 3533862, upload-time = "2026-04-24T02:02:52.987Z" },
+    { url = "https://files.pythonhosted.org/packages/32/36/8be7118ffd4c8440881046eac3d0982cc5ab42909508cf5d67024d62a2e4/numba-0.65.1-cp314-cp314t-win_amd64.whl", hash = "sha256:20609346e3bd75204950dcbbfe383a8d7dbf4902f442aedbf00f97fef4aa8f38", size = 2758237, upload-time = "2026-04-24T02:02:54.612Z" },
+]
+
+[[package]]
+name = "numpy"
+version = "2.4.4"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/d7/9f/b8cef5bffa569759033adda9481211426f12f53299629b410340795c2514/numpy-2.4.4.tar.gz", hash = "sha256:2d390634c5182175533585cc89f3608a4682ccb173cc9bb940b2881c8d6f8fa0", size = 20731587, upload-time = "2026-03-29T13:22:01.298Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/28/05/32396bec30fb2263770ee910142f49c1476d08e8ad41abf8403806b520ce/numpy-2.4.4-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:15716cfef24d3a9762e3acdf87e27f58dc823d1348f765bbea6bef8c639bfa1b", size = 16689272, upload-time = "2026-03-29T13:18:49.223Z" },
+    { url = "https://files.pythonhosted.org/packages/c5/f3/a983d28637bfcd763a9c7aafdb6d5c0ebf3d487d1e1459ffdb57e2f01117/numpy-2.4.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:23cbfd4c17357c81021f21540da84ee282b9c8fba38a03b7b9d09ba6b951421e", size = 14699573, upload-time = "2026-03-29T13:18:52.629Z" },
+    { url = "https://files.pythonhosted.org/packages/9b/fd/e5ecca1e78c05106d98028114f5c00d3eddb41207686b2b7de3e477b0e22/numpy-2.4.4-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:8b3b60bb7cba2c8c81837661c488637eee696f59a877788a396d33150c35d842", size = 5204782, upload-time = "2026-03-29T13:18:55.579Z" },
+    { url = "https://files.pythonhosted.org/packages/de/2f/702a4594413c1a8632092beae8aba00f1d67947389369b3777aed783fdca/numpy-2.4.4-cp312-cp312-macosx_14_0_x86_64.whl", hash = "sha256:e4a010c27ff6f210ff4c6ef34394cd61470d01014439b192ec22552ee867f2a8", size = 6552038, upload-time = "2026-03-29T13:18:57.769Z" },
+    { url = "https://files.pythonhosted.org/packages/7f/37/eed308a8f56cba4d1fdf467a4fc67ef4ff4bf1c888f5fc980481890104b1/numpy-2.4.4-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f9e75681b59ddaa5e659898085ae0eaea229d054f2ac0c7e563a62205a700121", size = 15670666, upload-time = "2026-03-29T13:19:00.341Z" },
+    { url = "https://files.pythonhosted.org/packages/0a/0d/0e3ecece05b7a7e87ab9fb587855548da437a061326fff64a223b6dcb78a/numpy-2.4.4-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:81f4a14bee47aec54f883e0cad2d73986640c1590eb9bfaaba7ad17394481e6e", size = 16645480, upload-time = "2026-03-29T13:19:03.63Z" },
+    { url = "https://files.pythonhosted.org/packages/34/49/f2312c154b82a286758ee2f1743336d50651f8b5195db18cdb63675ff649/numpy-2.4.4-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:62d6b0f03b694173f9fcb1fb317f7222fd0b0b103e784c6549f5e53a27718c44", size = 17020036, upload-time = "2026-03-29T13:19:07.428Z" },
+    { url = "https://files.pythonhosted.org/packages/7b/e9/736d17bd77f1b0ec4f9901aaec129c00d59f5d84d5e79bba540ef12c2330/numpy-2.4.4-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:fbc356aae7adf9e6336d336b9c8111d390a05df88f1805573ebb0807bd06fd1d", size = 18368643, upload-time = "2026-03-29T13:19:10.775Z" },
+    { url = "https://files.pythonhosted.org/packages/63/f6/d417977c5f519b17c8a5c3bc9e8304b0908b0e21136fe43bf628a1343914/numpy-2.4.4-cp312-cp312-win32.whl", hash = "sha256:0d35aea54ad1d420c812bfa0385c71cd7cc5bcf7c65fed95fc2cd02fe8c79827", size = 5961117, upload-time = "2026-03-29T13:19:13.464Z" },
+    { url = "https://files.pythonhosted.org/packages/2d/5b/e1deebf88ff431b01b7406ca3583ab2bbb90972bbe1c568732e49c844f7e/numpy-2.4.4-cp312-cp312-win_amd64.whl", hash = "sha256:b5f0362dc928a6ecd9db58868fca5e48485205e3855957bdedea308f8672ea4a", size = 12320584, upload-time = "2026-03-29T13:19:16.155Z" },
+    { url = "https://files.pythonhosted.org/packages/58/89/e4e856ac82a68c3ed64486a544977d0e7bdd18b8da75b78a577ca31c4395/numpy-2.4.4-cp312-cp312-win_arm64.whl", hash = "sha256:846300f379b5b12cc769334464656bc882e0735d27d9726568bc932fdc49d5ec", size = 10221450, upload-time = "2026-03-29T13:19:18.994Z" },
+    { url = "https://files.pythonhosted.org/packages/14/1d/d0a583ce4fefcc3308806a749a536c201ed6b5ad6e1322e227ee4848979d/numpy-2.4.4-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:08f2e31ed5e6f04b118e49821397f12767934cfdd12a1ce86a058f91e004ee50", size = 16684933, upload-time = "2026-03-29T13:19:22.47Z" },
+    { url = "https://files.pythonhosted.org/packages/c1/62/2b7a48fbb745d344742c0277f01286dead15f3f68e4f359fbfcf7b48f70f/numpy-2.4.4-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:e823b8b6edc81e747526f70f71a9c0a07ac4e7ad13020aa736bb7c9d67196115", size = 14694532, upload-time = "2026-03-29T13:19:25.581Z" },
+    { url = "https://files.pythonhosted.org/packages/e5/87/499737bfba066b4a3bebff24a8f1c5b2dee410b209bc6668c9be692580f0/numpy-2.4.4-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:4a19d9dba1a76618dd86b164d608566f393f8ec6ac7c44f0cc879011c45e65af", size = 5199661, upload-time = "2026-03-29T13:19:28.31Z" },
+    { url = "https://files.pythonhosted.org/packages/cd/da/464d551604320d1491bc345efed99b4b7034143a85787aab78d5691d5a0e/numpy-2.4.4-cp313-cp313-macosx_14_0_x86_64.whl", hash = "sha256:d2a8490669bfe99a233298348acc2d824d496dee0e66e31b66a6022c2ad74a5c", size = 6547539, upload-time = "2026-03-29T13:19:30.97Z" },
+    { url = "https://files.pythonhosted.org/packages/7d/90/8d23e3b0dafd024bf31bdec225b3bb5c2dbfa6912f8a53b8659f21216cbf/numpy-2.4.4-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:45dbed2ab436a9e826e302fcdcbe9133f9b0006e5af7168afb8963a6520da103", size = 15668806, upload-time = "2026-03-29T13:19:33.887Z" },
+    { url = "https://files.pythonhosted.org/packages/d1/73/a9d864e42a01896bb5974475438f16086be9ba1f0d19d0bb7a07427c4a8b/numpy-2.4.4-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c901b15172510173f5cb310eae652908340f8dede90fff9e3bf6c0d8dfd92f83", size = 16632682, upload-time = "2026-03-29T13:19:37.336Z" },
+    { url = "https://files.pythonhosted.org/packages/34/fb/14570d65c3bde4e202a031210475ae9cde9b7686a2e7dc97ee67d2833b35/numpy-2.4.4-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:99d838547ace2c4aace6c4f76e879ddfe02bb58a80c1549928477862b7a6d6ed", size = 17019810, upload-time = "2026-03-29T13:19:40.963Z" },
+    { url = "https://files.pythonhosted.org/packages/8a/77/2ba9d87081fd41f6d640c83f26fb7351e536b7ce6dd9061b6af5904e8e46/numpy-2.4.4-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:0aec54fd785890ecca25a6003fd9a5aed47ad607bbac5cd64f836ad8666f4959", size = 18357394, upload-time = "2026-03-29T13:19:44.859Z" },
+    { url = "https://files.pythonhosted.org/packages/a2/23/52666c9a41708b0853fa3b1a12c90da38c507a3074883823126d4e9d5b30/numpy-2.4.4-cp313-cp313-win32.whl", hash = "sha256:07077278157d02f65c43b1b26a3886bce886f95d20aabd11f87932750dfb14ed", size = 5959556, upload-time = "2026-03-29T13:19:47.661Z" },
+    { url = "https://files.pythonhosted.org/packages/57/fb/48649b4971cde70d817cf97a2a2fdc0b4d8308569f1dd2f2611959d2e0cf/numpy-2.4.4-cp313-cp313-win_amd64.whl", hash = "sha256:5c70f1cc1c4efbe316a572e2d8b9b9cc44e89b95f79ca3331553fbb63716e2bf", size = 12317311, upload-time = "2026-03-29T13:19:50.67Z" },
+    { url = "https://files.pythonhosted.org/packages/ba/d8/11490cddd564eb4de97b4579ef6bfe6a736cc07e94c1598590ae25415e01/numpy-2.4.4-cp313-cp313-win_arm64.whl", hash = "sha256:ef4059d6e5152fa1a39f888e344c73fdc926e1b2dd58c771d67b0acfbf2aa67d", size = 10222060, upload-time = "2026-03-29T13:19:54.229Z" },
+    { url = "https://files.pythonhosted.org/packages/99/5d/dab4339177a905aad3e2221c915b35202f1ec30d750dd2e5e9d9a72b804b/numpy-2.4.4-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:4bbc7f303d125971f60ec0aaad5e12c62d0d2c925f0ab1273debd0e4ba37aba5", size = 14822302, upload-time = "2026-03-29T13:19:57.585Z" },
+    { url = "https://files.pythonhosted.org/packages/eb/e4/0564a65e7d3d97562ed6f9b0fd0fb0a6f559ee444092f105938b50043876/numpy-2.4.4-cp313-cp313t-macosx_14_0_arm64.whl", hash = "sha256:4d6d57903571f86180eb98f8f0c839fa9ebbfb031356d87f1361be91e433f5b7", size = 5327407, upload-time = "2026-03-29T13:20:00.601Z" },
+    { url = "https://files.pythonhosted.org/packages/29/8d/35a3a6ce5ad371afa58b4700f1c820f8f279948cca32524e0a695b0ded83/numpy-2.4.4-cp313-cp313t-macosx_14_0_x86_64.whl", hash = "sha256:4636de7fd195197b7535f231b5de9e4b36d2c440b6e566d2e4e4746e6af0ca93", size = 6647631, upload-time = "2026-03-29T13:20:02.855Z" },
+    { url = "https://files.pythonhosted.org/packages/f4/da/477731acbd5a58a946c736edfdabb2ac5b34c3d08d1ba1a7b437fa0884df/numpy-2.4.4-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ad2e2ef14e0b04e544ea2fa0a36463f847f113d314aa02e5b402fdf910ef309e", size = 15727691, upload-time = "2026-03-29T13:20:06.004Z" },
+    { url = "https://files.pythonhosted.org/packages/e6/db/338535d9b152beabeb511579598418ba0212ce77cf9718edd70262cc4370/numpy-2.4.4-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5a285b3b96f951841799528cd1f4f01cd70e7e0204b4abebac9463eecfcf2a40", size = 16681241, upload-time = "2026-03-29T13:20:09.417Z" },
+    { url = "https://files.pythonhosted.org/packages/e2/a9/ad248e8f58beb7a0219b413c9c7d8151c5d285f7f946c3e26695bdbbe2df/numpy-2.4.4-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:f8474c4241bc18b750be2abea9d7a9ec84f46ef861dbacf86a4f6e043401f79e", size = 17085767, upload-time = "2026-03-29T13:20:13.126Z" },
+    { url = "https://files.pythonhosted.org/packages/b5/1a/3b88ccd3694681356f70da841630e4725a7264d6a885c8d442a697e1146b/numpy-2.4.4-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:4e874c976154687c1f71715b034739b45c7711bec81db01914770373d125e392", size = 18403169, upload-time = "2026-03-29T13:20:17.096Z" },
+    { url = "https://files.pythonhosted.org/packages/c2/c9/fcfd5d0639222c6eac7f304829b04892ef51c96a75d479214d77e3ce6e33/numpy-2.4.4-cp313-cp313t-win32.whl", hash = "sha256:9c585a1790d5436a5374bac930dad6ed244c046ed91b2b2a3634eb2971d21008", size = 6083477, upload-time = "2026-03-29T13:20:20.195Z" },
+    { url = "https://files.pythonhosted.org/packages/d5/e3/3938a61d1c538aaec8ed6fd6323f57b0c2d2d2219512434c5c878db76553/numpy-2.4.4-cp313-cp313t-win_amd64.whl", hash = "sha256:93e15038125dc1e5345d9b5b68aa7f996ec33b98118d18c6ca0d0b7d6198b7e8", size = 12457487, upload-time = "2026-03-29T13:20:22.946Z" },
+    { url = "https://files.pythonhosted.org/packages/97/6a/7e345032cc60501721ef94e0e30b60f6b0bd601f9174ebd36389a2b86d40/numpy-2.4.4-cp313-cp313t-win_arm64.whl", hash = "sha256:0dfd3f9d3adbe2920b68b5cd3d51444e13a10792ec7154cd0a2f6e74d4ab3233", size = 10292002, upload-time = "2026-03-29T13:20:25.909Z" },
+    { url = "https://files.pythonhosted.org/packages/6e/06/c54062f85f673dd5c04cbe2f14c3acb8c8b95e3384869bb8cc9bff8cb9df/numpy-2.4.4-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:f169b9a863d34f5d11b8698ead99febeaa17a13ca044961aa8e2662a6c7766a0", size = 16684353, upload-time = "2026-03-29T13:20:29.504Z" },
+    { url = "https://files.pythonhosted.org/packages/4c/39/8a320264a84404c74cc7e79715de85d6130fa07a0898f67fb5cd5bd79908/numpy-2.4.4-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:2483e4584a1cb3092da4470b38866634bafb223cbcd551ee047633fd2584599a", size = 14704914, upload-time = "2026-03-29T13:20:33.547Z" },
+    { url = "https://files.pythonhosted.org/packages/91/fb/287076b2614e1d1044235f50f03748f31fa287e3dbe6abeb35cdfa351eca/numpy-2.4.4-cp314-cp314-macosx_14_0_arm64.whl", hash = "sha256:2d19e6e2095506d1736b7d80595e0f252d76b89f5e715c35e06e937679ea7d7a", size = 5210005, upload-time = "2026-03-29T13:20:36.45Z" },
+    { url = "https://files.pythonhosted.org/packages/63/eb/fcc338595309910de6ecabfcef2419a9ce24399680bfb149421fa2df1280/numpy-2.4.4-cp314-cp314-macosx_14_0_x86_64.whl", hash = "sha256:6a246d5914aa1c820c9443ddcee9c02bec3e203b0c080349533fae17727dfd1b", size = 6544974, upload-time = "2026-03-29T13:20:39.014Z" },
+    { url = "https://files.pythonhosted.org/packages/44/5d/e7e9044032a716cdfaa3fba27a8e874bf1c5f1912a1ddd4ed071bf8a14a6/numpy-2.4.4-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:989824e9faf85f96ec9c7761cd8d29c531ad857bfa1daa930cba85baaecf1a9a", size = 15684591, upload-time = "2026-03-29T13:20:42.146Z" },
+    { url = "https://files.pythonhosted.org/packages/98/7c/21252050676612625449b4807d6b695b9ce8a7c9e1c197ee6216c8a65c7c/numpy-2.4.4-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:27a8d92cd10f1382a67d7cf4db7ce18341b66438bdd9f691d7b0e48d104c2a9d", size = 16637700, upload-time = "2026-03-29T13:20:46.204Z" },
+    { url = "https://files.pythonhosted.org/packages/b1/29/56d2bbef9465db24ef25393383d761a1af4f446a1df9b8cded4fe3a5a5d7/numpy-2.4.4-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:e44319a2953c738205bf3354537979eaa3998ed673395b964c1176083dd46252", size = 17035781, upload-time = "2026-03-29T13:20:50.242Z" },
+    { url = "https://files.pythonhosted.org/packages/e3/2b/a35a6d7589d21f44cea7d0a98de5ddcbb3d421b2622a5c96b1edf18707c3/numpy-2.4.4-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:e892aff75639bbef0d2a2cfd55535510df26ff92f63c92cd84ef8d4ba5a5557f", size = 18362959, upload-time = "2026-03-29T13:20:54.019Z" },
+    { url = "https://files.pythonhosted.org/packages/64/c9/d52ec581f2390e0f5f85cbfd80fb83d965fc15e9f0e1aec2195faa142cde/numpy-2.4.4-cp314-cp314-win32.whl", hash = "sha256:1378871da56ca8943c2ba674530924bb8ca40cd228358a3b5f302ad60cf875fc", size = 6008768, upload-time = "2026-03-29T13:20:56.912Z" },
+    { url = "https://files.pythonhosted.org/packages/fa/22/4cc31a62a6c7b74a8730e31a4274c5dc80e005751e277a2ce38e675e4923/numpy-2.4.4-cp314-cp314-win_amd64.whl", hash = "sha256:715d1c092715954784bc79e1174fc2a90093dc4dc84ea15eb14dad8abdcdeb74", size = 12449181, upload-time = "2026-03-29T13:20:59.548Z" },
+    { url = "https://files.pythonhosted.org/packages/70/2e/14cda6f4d8e396c612d1bf97f22958e92148801d7e4f110cabebdc0eef4b/numpy-2.4.4-cp314-cp314-win_arm64.whl", hash = "sha256:2c194dd721e54ecad9ad387c1d35e63dce5c4450c6dc7dd5611283dda239aabb", size = 10496035, upload-time = "2026-03-29T13:21:02.524Z" },
+    { url = "https://files.pythonhosted.org/packages/b1/e8/8fed8c8d848d7ecea092dc3469643f9d10bc3a134a815a3b033da1d2039b/numpy-2.4.4-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:2aa0613a5177c264ff5921051a5719d20095ea586ca88cc802c5c218d1c67d3e", size = 14824958, upload-time = "2026-03-29T13:21:05.671Z" },
+    { url = "https://files.pythonhosted.org/packages/05/1a/d8007a5138c179c2bf33ef44503e83d70434d2642877ee8fbb230e7c0548/numpy-2.4.4-cp314-cp314t-macosx_14_0_arm64.whl", hash = "sha256:42c16925aa5a02362f986765f9ebabf20de75cdefdca827d14315c568dcab113", size = 5330020, upload-time = "2026-03-29T13:21:08.635Z" },
+    { url = "https://files.pythonhosted.org/packages/99/64/ffb99ac6ae93faf117bcbd5c7ba48a7f45364a33e8e458545d3633615dda/numpy-2.4.4-cp314-cp314t-macosx_14_0_x86_64.whl", hash = "sha256:874f200b2a981c647340f841730fc3a2b54c9d940566a3c4149099591e2c4c3d", size = 6650758, upload-time = "2026-03-29T13:21:10.949Z" },
+    { url = "https://files.pythonhosted.org/packages/6e/6e/795cc078b78a384052e73b2f6281ff7a700e9bf53bcce2ee579d4f6dd879/numpy-2.4.4-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c9b39d38a9bd2ae1becd7eac1303d031c5c110ad31f2b319c6e7d98b135c934d", size = 15729948, upload-time = "2026-03-29T13:21:14.047Z" },
+    { url = "https://files.pythonhosted.org/packages/5f/86/2acbda8cc2af5f3d7bfc791192863b9e3e19674da7b5e533fded124d1299/numpy-2.4.4-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b268594bccac7d7cf5844c7732e3f20c50921d94e36d7ec9b79e9857694b1b2f", size = 16679325, upload-time = "2026-03-29T13:21:17.561Z" },
+    { url = "https://files.pythonhosted.org/packages/bc/59/cafd83018f4aa55e0ac6fa92aa066c0a1877b77a615ceff1711c260ffae8/numpy-2.4.4-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:ac6b31e35612a26483e20750126d30d0941f949426974cace8e6b5c58a3657b0", size = 17084883, upload-time = "2026-03-29T13:21:21.106Z" },
+    { url = "https://files.pythonhosted.org/packages/f0/85/a42548db84e65ece46ab2caea3d3f78b416a47af387fcbb47ec28e660dc2/numpy-2.4.4-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:8e3ed142f2728df44263aaf5fb1f5b0b99f4070c553a0d7f033be65338329150", size = 18403474, upload-time = "2026-03-29T13:21:24.828Z" },
+    { url = "https://files.pythonhosted.org/packages/ed/ad/483d9e262f4b831000062e5d8a45e342166ec8aaa1195264982bca267e62/numpy-2.4.4-cp314-cp314t-win32.whl", hash = "sha256:dddbbd259598d7240b18c9d87c56a9d2fb3b02fe266f49a7c101532e78c1d871", size = 6155500, upload-time = "2026-03-29T13:21:28.205Z" },
+    { url = "https://files.pythonhosted.org/packages/c7/03/2fc4e14c7bd4ff2964b74ba90ecb8552540b6315f201df70f137faa5c589/numpy-2.4.4-cp314-cp314t-win_amd64.whl", hash = "sha256:a7164afb23be6e37ad90b2f10426149fd75aee07ca55653d2aa41e66c4ef697e", size = 12637755, upload-time = "2026-03-29T13:21:31.107Z" },
+    { url = "https://files.pythonhosted.org/packages/58/78/548fb8e07b1a341746bfbecb32f2c268470f45fa028aacdbd10d9bc73aab/numpy-2.4.4-cp314-cp314t-win_arm64.whl", hash = "sha256:ba203255017337d39f89bdd58417f03c4426f12beed0440cfd933cb15f8669c7", size = 10566643, upload-time = "2026-03-29T13:21:34.339Z" },
+]
+
+[[package]]
+name = "odfpy"
+version = "1.4.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "defusedxml" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/97/73/8ade73f6749177003f7ce3304f524774adda96e6aaab30ea79fd8fda7934/odfpy-1.4.1.tar.gz", hash = "sha256:db766a6e59c5103212f3cc92ec8dd50a0f3a02790233ed0b52148b70d3c438ec", size = 717045, upload-time = "2020-01-18T16:55:48.852Z" }
+
+[[package]]
+name = "olefile"
+version = "0.47"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/69/1b/077b508e3e500e1629d366249c3ccb32f95e50258b231705c09e3c7a4366/olefile-0.47.zip", hash = "sha256:599383381a0bf3dfbd932ca0ca6515acd174ed48870cbf7fee123d698c192c1c", size = 112240, upload-time = "2023-12-01T16:22:53.025Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/17/d3/b64c356a907242d719fc668b71befd73324e47ab46c8ebbbede252c154b2/olefile-0.47-py2.py3-none-any.whl", hash = "sha256:543c7da2a7adadf21214938bb79c83ea12b473a4b6ee4ad4bf854e7715e13d1f", size = 114565, upload-time = "2023-12-01T16:22:51.518Z" },
+]
+
+[[package]]
+name = "openai"
+version = "2.32.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "anyio" },
+    { name = "distro" },
+    { name = "httpx" },
+    { name = "jiter" },
+    { name = "pydantic" },
+    { name = "sniffio" },
+    { name = "tqdm" },
+    { name = "typing-extensions" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/ed/59/bdcc6b759b8c42dd73afaf5bf8f902c04b37987a5514dbc1c64dba390fef/openai-2.32.0.tar.gz", hash = "sha256:c54b27a9e4cb8d51f0dd94972ffd1a04437efeb259a9e60d8922b8bd26fe55e0", size = 693286, upload-time = "2026-04-15T22:28:19.434Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/1e/c1/d6e64ccd0536bf616556f0cad2b6d94a8125f508d25cfd814b1d2db4e2f1/openai-2.32.0-py3-none-any.whl", hash = "sha256:4dcc9badeb4bf54ad0d187453742f290226d30150890b7890711bda4f32f192f", size = 1162570, upload-time = "2026-04-15T22:28:17.714Z" },
+]
+
+[[package]]
+name = "openpyxl"
+version = "3.1.5"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "et-xmlfile" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/3d/f9/88d94a75de065ea32619465d2f77b29a0469500e99012523b91cc4141cd1/openpyxl-3.1.5.tar.gz", hash = "sha256:cf0e3cf56142039133628b5acffe8ef0c12bc902d2aadd3e0fe5878dc08d1050", size = 186464, upload-time = "2024-06-28T14:03:44.161Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/c0/da/977ded879c29cbd04de313843e76868e6e13408a94ed6b987245dc7c8506/openpyxl-3.1.5-py2.py3-none-any.whl", hash = "sha256:5282c12b107bffeef825f4617dc029afaf41d0ea60823bbb665ef3079dc79de2", size = 250910, upload-time = "2024-06-28T14:03:41.161Z" },
+]
+
+[[package]]
+name = "opentelemetry-api"
+version = "1.39.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "importlib-metadata" },
+    { name = "typing-extensions" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/97/b9/3161be15bb8e3ad01be8be5a968a9237c3027c5be504362ff800fca3e442/opentelemetry_api-1.39.1.tar.gz", hash = "sha256:fbde8c80e1b937a2c61f20347e91c0c18a1940cecf012d62e65a7caf08967c9c", size = 65767, upload-time = "2025-12-11T13:32:39.182Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/cf/df/d3f1ddf4bb4cb50ed9b1139cc7b1c54c34a1e7ce8fd1b9a37c0d1551a6bd/opentelemetry_api-1.39.1-py3-none-any.whl", hash = "sha256:2edd8463432a7f8443edce90972169b195e7d6a05500cd29e6d13898187c9950", size = 66356, upload-time = "2025-12-11T13:32:17.304Z" },
+]
+
+[[package]]
+name = "orjson"
+version = "3.11.8"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/9d/1b/2024d06792d0779f9dbc51531b61c24f76c75b9f4ce05e6f3377a1814cea/orjson-3.11.8.tar.gz", hash = "sha256:96163d9cdc5a202703e9ad1b9ae757d5f0ca62f4fa0cc93d1f27b0e180cc404e", size = 5603832, upload-time = "2026-03-31T16:16:27.878Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/01/f6/8d58b32ab32d9215973a1688aebd098252ee8af1766c0e4e36e7831f0295/orjson-3.11.8-cp312-cp312-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:1cd0b77e77c95758f8e1100139844e99f3ccc87e71e6fc8e1c027e55807c549f", size = 229233, upload-time = "2026-03-31T16:15:12.762Z" },
+    { url = "https://files.pythonhosted.org/packages/a9/8b/2ffe35e71f6b92622e8ea4607bf33ecf7dfb51b3619dcfabfd36cbe2d0a5/orjson-3.11.8-cp312-cp312-macosx_15_0_arm64.whl", hash = "sha256:6a3d159d5ffa0e3961f353c4b036540996bf8b9697ccc38261c0eac1fd3347a6", size = 128772, upload-time = "2026-03-31T16:15:14.237Z" },
+    { url = "https://files.pythonhosted.org/packages/27/d2/1f8682ae50d5c6897a563cb96bc106da8c9cb5b7b6e81a52e4cc086679b9/orjson-3.11.8-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:76070a76e9c5ae661e2d9848f216980d8d533e0f8143e6ed462807b242e3c5e8", size = 131946, upload-time = "2026-03-31T16:15:15.607Z" },
+    { url = "https://files.pythonhosted.org/packages/52/4b/5500f76f0eece84226e0689cb48dcde081104c2fa6e2483d17ca13685ffb/orjson-3.11.8-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:54153d21520a71a4c82a0dbb4523e468941d549d221dc173de0f019678cf3813", size = 130368, upload-time = "2026-03-31T16:15:17.066Z" },
+    { url = "https://files.pythonhosted.org/packages/da/4e/58b927e08fbe9840e6c920d9e299b051ea667463b1f39a56e668669f8508/orjson-3.11.8-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:469ac2125611b7c5741a0b3798cd9e5786cbad6345f9f400c77212be89563bec", size = 135540, upload-time = "2026-03-31T16:15:18.404Z" },
+    { url = "https://files.pythonhosted.org/packages/56/7c/ba7cb871cba1bcd5cd02ee34f98d894c6cea96353ad87466e5aef2429c60/orjson-3.11.8-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:14778ffd0f6896aa613951a7fbf4690229aa7a543cb2bfbe9f358e08aafa9546", size = 146877, upload-time = "2026-03-31T16:15:19.833Z" },
+    { url = "https://files.pythonhosted.org/packages/0b/5d/eb9c25fc1386696c6a342cd361c306452c75e0b55e86ad602dd4827a7fd7/orjson-3.11.8-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ea56a955056a6d6c550cf18b3348656a9d9a4f02e2d0c02cabf3c73f1055d506", size = 132837, upload-time = "2026-03-31T16:15:21.282Z" },
+    { url = "https://files.pythonhosted.org/packages/37/87/5ddeb7fc1fbd9004aeccab08426f34c81a5b4c25c7061281862b015fce2b/orjson-3.11.8-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:53a0f57e59a530d18a142f4d4ba6dfc708dc5fdedce45e98ff06b44930a2a48f", size = 133624, upload-time = "2026-03-31T16:15:22.641Z" },
+    { url = "https://files.pythonhosted.org/packages/22/09/90048793db94ee4b2fcec4ac8e5ddb077367637d6650be896b3494b79bb7/orjson-3.11.8-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:9b48e274f8824567d74e2158199e269597edf00823a1b12b63d48462bbf5123e", size = 141904, upload-time = "2026-03-31T16:15:24.435Z" },
+    { url = "https://files.pythonhosted.org/packages/c0/cf/eb284847487821a5d415e54149a6449ba9bfc5872ce63ab7be41b8ec401c/orjson-3.11.8-cp312-cp312-musllinux_1_2_armv7l.whl", hash = "sha256:3f262401086a3960586af06c054609365e98407151f5ea24a62893a40d80dbbb", size = 423742, upload-time = "2026-03-31T16:15:26.155Z" },
+    { url = "https://files.pythonhosted.org/packages/44/09/e12423d327071c851c13e76936f144a96adacfc037394dec35ac3fc8d1e8/orjson-3.11.8-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:8e8c6218b614badf8e229b697865df4301afa74b791b6c9ade01d19a9953a942", size = 147806, upload-time = "2026-03-31T16:15:27.909Z" },
+    { url = "https://files.pythonhosted.org/packages/b3/6d/37c2589ba864e582ffe7611643314785c6afb1f83c701654ef05daa8fcc7/orjson-3.11.8-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:093d489fa039ddade2db541097dbb484999fcc65fc2b0ff9819141e2ab364f25", size = 136485, upload-time = "2026-03-31T16:15:29.749Z" },
+    { url = "https://files.pythonhosted.org/packages/be/c9/135194a02ab76b04ed9a10f68624b7ebd238bbe55548878b11ff15a0f352/orjson-3.11.8-cp312-cp312-win32.whl", hash = "sha256:e0950ed1bcb9893f4293fd5c5a7ee10934fbf82c4101c70be360db23ce24b7d2", size = 131966, upload-time = "2026-03-31T16:15:31.687Z" },
+    { url = "https://files.pythonhosted.org/packages/ed/9a/9796f8fbe3cf30ce9cb696748dbb535e5c87be4bf4fe2e9ca498ef1fa8cf/orjson-3.11.8-cp312-cp312-win_amd64.whl", hash = "sha256:3cf17c141617b88ced4536b2135c552490f07799f6ad565948ea07bef0dcb9a6", size = 127441, upload-time = "2026-03-31T16:15:33.333Z" },
+    { url = "https://files.pythonhosted.org/packages/cc/47/5aaf54524a7a4a0dd09dd778f3fa65dd2108290615b652e23d944152bc8e/orjson-3.11.8-cp312-cp312-win_arm64.whl", hash = "sha256:48854463b0572cc87dac7d981aa72ed8bf6deedc0511853dc76b8bbd5482d36d", size = 127364, upload-time = "2026-03-31T16:15:34.748Z" },
+    { url = "https://files.pythonhosted.org/packages/66/7f/95fba509bb2305fab0073558f1e8c3a2ec4b2afe58ed9fcb7d3b8beafe94/orjson-3.11.8-cp313-cp313-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:3f23426851d98478c8970da5991f84784a76682213cd50eb73a1da56b95239dc", size = 229180, upload-time = "2026-03-31T16:15:36.426Z" },
+    { url = "https://files.pythonhosted.org/packages/f6/9d/b237215c743ca073697d759b5503abd2cb8a0d7b9c9e21f524bcf176ab66/orjson-3.11.8-cp313-cp313-macosx_15_0_arm64.whl", hash = "sha256:ebaed4cef74a045b83e23537b52ef19a367c7e3f536751e355a2a394f8648559", size = 128754, upload-time = "2026-03-31T16:15:38.049Z" },
+    { url = "https://files.pythonhosted.org/packages/42/3d/27d65b6d11e63f133781425f132807aef793ed25075fec686fc8e46dd528/orjson-3.11.8-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:97c8f5d3b62380b70c36ffacb2a356b7c6becec86099b177f73851ba095ef623", size = 131877, upload-time = "2026-03-31T16:15:39.484Z" },
+    { url = "https://files.pythonhosted.org/packages/dd/cc/faee30cd8f00421999e40ef0eba7332e3a625ce91a58200a2f52c7fef235/orjson-3.11.8-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:436c4922968a619fb7fef1ccd4b8b3a76c13b67d607073914d675026e911a65c", size = 130361, upload-time = "2026-03-31T16:15:41.274Z" },
+    { url = "https://files.pythonhosted.org/packages/5c/bb/a6c55896197f97b6d4b4e7c7fd77e7235517c34f5d6ad5aadd43c54c6d7c/orjson-3.11.8-cp313-cp313-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1ab359aff0436d80bfe8a23b46b5fea69f1e18aaf1760a709b4787f1318b317f", size = 135521, upload-time = "2026-03-31T16:15:42.758Z" },
+    { url = "https://files.pythonhosted.org/packages/9c/7c/ca3a3525aa32ff636ebb1778e77e3587b016ab2edb1b618b36ba96f8f2c0/orjson-3.11.8-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f89b6d0b3a8d81e1929d3ab3d92bbc225688bd80a770c49432543928fe09ac55", size = 146862, upload-time = "2026-03-31T16:15:44.341Z" },
+    { url = "https://files.pythonhosted.org/packages/3c/0c/18a9d7f18b5edd37344d1fd5be17e94dc652c67826ab749c6e5948a78112/orjson-3.11.8-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:29c009e7a2ca9ad0ed1376ce20dd692146a5d9fe4310848904b6b4fee5c5c137", size = 132847, upload-time = "2026-03-31T16:15:46.368Z" },
+    { url = "https://files.pythonhosted.org/packages/23/91/7e722f352ad67ca573cee44de2a58fb810d0f4eb4e33276c6a557979fd8a/orjson-3.11.8-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:705b895b781b3e395c067129d8551655642dfe9437273211d5404e87ac752b53", size = 133637, upload-time = "2026-03-31T16:15:48.123Z" },
+    { url = "https://files.pythonhosted.org/packages/af/04/32845ce13ac5bd1046ddb02ac9432ba856cc35f6d74dde95864fe0ad5523/orjson-3.11.8-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:88006eda83858a9fdf73985ce3804e885c2befb2f506c9a3723cdeb5a2880e3e", size = 141906, upload-time = "2026-03-31T16:15:49.626Z" },
+    { url = "https://files.pythonhosted.org/packages/02/5e/c551387ddf2d7106d9039369862245c85738b828844d13b99ccb8d61fd06/orjson-3.11.8-cp313-cp313-musllinux_1_2_armv7l.whl", hash = "sha256:55120759e61309af7fcf9e961c6f6af3dde5921cdb3ee863ef63fd9db126cae6", size = 423722, upload-time = "2026-03-31T16:15:51.176Z" },
+    { url = "https://files.pythonhosted.org/packages/00/a3/ecfe62434096f8a794d4976728cb59bcfc4a643977f21c2040545d37eb4c/orjson-3.11.8-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:98bdc6cb889d19bed01de46e67574a2eab61f5cc6b768ed50e8ac68e9d6ffab6", size = 147801, upload-time = "2026-03-31T16:15:52.939Z" },
+    { url = "https://files.pythonhosted.org/packages/18/6d/0dce10b9f6643fdc59d99333871a38fa5a769d8e2fc34a18e5d2bfdee900/orjson-3.11.8-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:708c95f925a43ab9f34625e45dcdadf09ec8a6e7b664a938f2f8d5650f6c090b", size = 136460, upload-time = "2026-03-31T16:15:54.431Z" },
+    { url = "https://files.pythonhosted.org/packages/01/d6/6dde4f31842d87099238f1f07b459d24edc1a774d20687187443ab044191/orjson-3.11.8-cp313-cp313-win32.whl", hash = "sha256:01c4e5a6695dc09098f2e6468a251bc4671c50922d4d745aff1a0a33a0cf5b8d", size = 131956, upload-time = "2026-03-31T16:15:56.081Z" },
+    { url = "https://files.pythonhosted.org/packages/c1/f9/4e494a56e013db957fb77186b818b916d4695b8fa2aa612364974160e91b/orjson-3.11.8-cp313-cp313-win_amd64.whl", hash = "sha256:c154a35dd1330707450bb4d4e7dd1f17fa6f42267a40c1e8a1daa5e13719b4b8", size = 127410, upload-time = "2026-03-31T16:15:57.54Z" },
+    { url = "https://files.pythonhosted.org/packages/57/7f/803203d00d6edb6e9e7eef421d4e1adbb5ea973e40b3533f3cfd9aeb374e/orjson-3.11.8-cp313-cp313-win_arm64.whl", hash = "sha256:4861bde57f4d253ab041e374f44023460e60e71efaa121f3c5f0ed457c3a701e", size = 127338, upload-time = "2026-03-31T16:15:59.106Z" },
+    { url = "https://files.pythonhosted.org/packages/6d/35/b01910c3d6b85dc882442afe5060cbf719c7d1fc85749294beda23d17873/orjson-3.11.8-cp314-cp314-macosx_10_15_x86_64.macosx_11_0_arm64.macosx_10_15_universal2.whl", hash = "sha256:ec795530a73c269a55130498842aaa762e4a939f6ce481a7e986eeaa790e9da4", size = 229171, upload-time = "2026-03-31T16:16:00.651Z" },
+    { url = "https://files.pythonhosted.org/packages/c2/56/c9ec97bd11240abef39b9e5d99a15462809c45f677420fd148a6c5e6295e/orjson-3.11.8-cp314-cp314-macosx_15_0_arm64.whl", hash = "sha256:c492a0e011c0f9066e9ceaa896fbc5b068c54d365fea5f3444b697ee01bc8625", size = 128746, upload-time = "2026-03-31T16:16:02.673Z" },
+    { url = "https://files.pythonhosted.org/packages/3b/e4/66d4f30a90de45e2f0cbd9623588e8ae71eef7679dbe2ae954ed6d66a41f/orjson-3.11.8-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:883206d55b1bd5f5679ad5e6ddd3d1a5e3cac5190482927fdb8c78fb699193b5", size = 131867, upload-time = "2026-03-31T16:16:04.342Z" },
+    { url = "https://files.pythonhosted.org/packages/19/30/2a645fc9286b928675e43fa2a3a16fb7b6764aa78cc719dc82141e00f30b/orjson-3.11.8-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5774c1fdcc98b2259800b683b19599c133baeb11d60033e2095fd9d4667b82db", size = 124664, upload-time = "2026-03-31T16:16:05.837Z" },
+    { url = "https://files.pythonhosted.org/packages/db/44/77b9a86d84a28d52ba3316d77737f6514e17118119ade3f91b639e859029/orjson-3.11.8-cp314-cp314-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8ac7381c83dd3d4a6347e6635950aa448f54e7b8406a27c7ecb4a37e9f1ae08b", size = 129701, upload-time = "2026-03-31T16:16:07.407Z" },
+    { url = "https://files.pythonhosted.org/packages/b3/ea/eff3d9bfe47e9bc6969c9181c58d9f71237f923f9c86a2d2f490cd898c82/orjson-3.11.8-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:14439063aebcb92401c11afc68ee4e407258d2752e62d748b6942dad20d2a70d", size = 141202, upload-time = "2026-03-31T16:16:09.48Z" },
+    { url = "https://files.pythonhosted.org/packages/52/c8/90d4b4c60c84d62068d0cf9e4d8f0a4e05e76971d133ac0c60d818d4db20/orjson-3.11.8-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:fa72e71977bff96567b0f500fc5bfd2fdf915f34052c782a4c6ebbdaa97aa858", size = 127194, upload-time = "2026-03-31T16:16:11.02Z" },
+    { url = "https://files.pythonhosted.org/packages/8d/c7/ea9e08d1f0ba981adffb629811148b44774d935171e7b3d780ae43c4c254/orjson-3.11.8-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7679bc2f01bb0d219758f1a5f87bb7c8a81c0a186824a393b366876b4948e14f", size = 133639, upload-time = "2026-03-31T16:16:13.434Z" },
+    { url = "https://files.pythonhosted.org/packages/6c/8c/ddbbfd6ba59453c8fc7fe1d0e5983895864e264c37481b2a791db635f046/orjson-3.11.8-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:14f7b8fcb35ef403b42fa5ecfa4ed032332a91f3dc7368fbce4184d59e1eae0d", size = 141914, upload-time = "2026-03-31T16:16:14.955Z" },
+    { url = "https://files.pythonhosted.org/packages/4e/31/dbfbefec9df060d34ef4962cd0afcb6fa7a9ec65884cb78f04a7859526c3/orjson-3.11.8-cp314-cp314-musllinux_1_2_armv7l.whl", hash = "sha256:c2bdf7b2facc80b5e34f48a2d557727d5c5c57a8a450de122ae81fa26a81c1bc", size = 423800, upload-time = "2026-03-31T16:16:16.594Z" },
+    { url = "https://files.pythonhosted.org/packages/87/cf/f74e9ae9803d4ab46b163494adba636c6d7ea955af5cc23b8aaa94cfd528/orjson-3.11.8-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:ccd7ba1b0605813a0715171d39ec4c314cb97a9c85893c2c5c0c3a3729df38bf", size = 147837, upload-time = "2026-03-31T16:16:18.585Z" },
+    { url = "https://files.pythonhosted.org/packages/64/e6/9214f017b5db85e84e68602792f742e5dc5249e963503d1b356bee611e01/orjson-3.11.8-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:cdbc8c9c02463fef4d3c53a9ba3336d05496ec8e1f1c53326a1e4acc11f5c600", size = 136441, upload-time = "2026-03-31T16:16:20.151Z" },
+    { url = "https://files.pythonhosted.org/packages/24/dd/3590348818f58f837a75fb969b04cdf187ae197e14d60b5e5a794a38b79d/orjson-3.11.8-cp314-cp314-win32.whl", hash = "sha256:0b57f67710a8cd459e4e54eb96d5f77f3624eba0c661ba19a525807e42eccade", size = 131983, upload-time = "2026-03-31T16:16:21.823Z" },
+    { url = "https://files.pythonhosted.org/packages/3f/0f/b6cb692116e05d058f31ceee819c70f097fa9167c82f67fabe7516289abc/orjson-3.11.8-cp314-cp314-win_amd64.whl", hash = "sha256:735e2262363dcbe05c35e3a8869898022af78f89dde9e256924dc02e99fe69ca", size = 127396, upload-time = "2026-03-31T16:16:23.685Z" },
+    { url = "https://files.pythonhosted.org/packages/c0/d1/facb5b5051fabb0ef9d26c6544d87ef19a939a9a001198655d0d891062dd/orjson-3.11.8-cp314-cp314-win_arm64.whl", hash = "sha256:6ccdea2c213cf9f3d9490cbd5d427693c870753df41e6cb375bd79bcbafc8817", size = 127330, upload-time = "2026-03-31T16:16:25.496Z" },
+]
+
+[[package]]
+name = "packaging"
+version = "25.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/a1/d4/1fc4078c65507b51b96ca8f8c3ba19e6a61c8253c72794544580a7b6c24d/packaging-25.0.tar.gz", hash = "sha256:d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f", size = 165727, upload-time = "2025-04-19T11:48:59.673Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/20/12/38679034af332785aac8774540895e234f4d07f7545804097de4b666afd8/packaging-25.0-py3-none-any.whl", hash = "sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484", size = 66469, upload-time = "2025-04-19T11:48:57.875Z" },
+]
+
+[[package]]
+name = "paginate"
+version = "0.5.7"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/ec/46/68dde5b6bc00c1296ec6466ab27dddede6aec9af1b99090e1107091b3b84/paginate-0.5.7.tar.gz", hash = "sha256:22bd083ab41e1a8b4f3690544afb2c60c25e5c9a63a30fa2f483f6c60c8e5945", size = 19252, upload-time = "2024-08-25T14:17:24.139Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/90/96/04b8e52da071d28f5e21a805b19cb9390aa17a47462ac87f5e2696b9566d/paginate-0.5.7-py2.py3-none-any.whl", hash = "sha256:b885e2af73abcf01d9559fd5216b57ef722f8c42affbb63942377668e35c7591", size = 13746, upload-time = "2024-08-25T14:17:22.55Z" },
+]
+
+[[package]]
+name = "pandas"
+version = "3.0.2"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "numpy" },
+    { name = "python-dateutil" },
+    { name = "tzdata", marker = "sys_platform == 'emscripten' or sys_platform == 'win32'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/da/99/b342345300f13440fe9fe385c3c481e2d9a595ee3bab4d3219247ac94e9a/pandas-3.0.2.tar.gz", hash = "sha256:f4753e73e34c8d83221ba58f232433fca2748be8b18dbca02d242ed153945043", size = 4645855, upload-time = "2026-03-31T06:48:30.816Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/f3/b0/c20bd4d6d3f736e6bd6b55794e9cd0a617b858eaad27c8f410ea05d953b7/pandas-3.0.2-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:232a70ebb568c0c4d2db4584f338c1577d81e3af63292208d615907b698a0f18", size = 10347921, upload-time = "2026-03-31T06:46:33.36Z" },
+    { url = "https://files.pythonhosted.org/packages/35/d0/4831af68ce30cc2d03c697bea8450e3225a835ef497d0d70f31b8cdde965/pandas-3.0.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:970762605cff1ca0d3f71ed4f3a769ea8f85fc8e6348f6e110b8fea7e6eb5a14", size = 9888127, upload-time = "2026-03-31T06:46:36.253Z" },
+    { url = "https://files.pythonhosted.org/packages/61/a9/16ea9346e1fc4a96e2896242d9bc674764fb9049b0044c0132502f7a771e/pandas-3.0.2-cp312-cp312-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:aff4e6f4d722e0652707d7bcb190c445fe58428500c6d16005b02401764b1b3d", size = 10399577, upload-time = "2026-03-31T06:46:39.224Z" },
+    { url = "https://files.pythonhosted.org/packages/c4/a8/3a61a721472959ab0ce865ef05d10b0d6bfe27ce8801c99f33d4fa996e65/pandas-3.0.2-cp312-cp312-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ef8b27695c3d3dc78403c9a7d5e59a62d5464a7e1123b4e0042763f7104dc74f", size = 10880030, upload-time = "2026-03-31T06:46:42.412Z" },
+    { url = "https://files.pythonhosted.org/packages/da/65/7225c0ea4d6ce9cb2160a7fb7f39804871049f016e74782e5dade4d14109/pandas-3.0.2-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:f8d68083e49e16b84734eb1a4dcae4259a75c90fb6e2251ab9a00b61120c06ab", size = 11409468, upload-time = "2026-03-31T06:46:45.2Z" },
+    { url = "https://files.pythonhosted.org/packages/fa/5b/46e7c76032639f2132359b5cf4c785dd8cf9aea5ea64699eac752f02b9db/pandas-3.0.2-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:32cc41f310ebd4a296d93515fcac312216adfedb1894e879303987b8f1e2b97d", size = 11936381, upload-time = "2026-03-31T06:46:48.293Z" },
+    { url = "https://files.pythonhosted.org/packages/7b/8b/721a9cff6fa6a91b162eb51019c6243b82b3226c71bb6c8ef4a9bd65cbc6/pandas-3.0.2-cp312-cp312-win_amd64.whl", hash = "sha256:a4785e1d6547d8427c5208b748ae2efb64659a21bd82bf440d4262d02bfa02a4", size = 9744993, upload-time = "2026-03-31T06:46:51.488Z" },
+    { url = "https://files.pythonhosted.org/packages/d5/18/7f0bd34ae27b28159aa80f2a6799f47fda34f7fb938a76e20c7b7fe3b200/pandas-3.0.2-cp312-cp312-win_arm64.whl", hash = "sha256:08504503f7101300107ecdc8df73658e4347586db5cfdadabc1592e9d7e7a0fd", size = 9056118, upload-time = "2026-03-31T06:46:54.548Z" },
+    { url = "https://files.pythonhosted.org/packages/bf/ca/3e639a1ea6fcd0617ca4e8ca45f62a74de33a56ae6cd552735470b22c8d3/pandas-3.0.2-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:b5918ba197c951dec132b0c5929a00c0bf05d5942f590d3c10a807f6e15a57d3", size = 10321105, upload-time = "2026-03-31T06:46:57.327Z" },
+    { url = "https://files.pythonhosted.org/packages/0b/77/dbc82ff2fb0e63c6564356682bf201edff0ba16c98630d21a1fb312a8182/pandas-3.0.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:d606a041c89c0a474a4702d532ab7e73a14fe35c8d427b972a625c8e46373668", size = 9864088, upload-time = "2026-03-31T06:46:59.935Z" },
+    { url = "https://files.pythonhosted.org/packages/5c/2b/341f1b04bbca2e17e13cd3f08c215b70ef2c60c5356ef1e8c6857449edc7/pandas-3.0.2-cp313-cp313-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:710246ba0616e86891b58ab95f2495143bb2bc83ab6b06747c74216f583a6ac9", size = 10369066, upload-time = "2026-03-31T06:47:02.792Z" },
+    { url = "https://files.pythonhosted.org/packages/12/c5/cbb1ffefb20a93d3f0e1fdcda699fb84976210d411b008f97f48bf6ce27e/pandas-3.0.2-cp313-cp313-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5d3cfe227c725b1f3dff4278b43d8c784656a42a9325b63af6b1492a8232209e", size = 10876780, upload-time = "2026-03-31T06:47:06.205Z" },
+    { url = "https://files.pythonhosted.org/packages/98/fe/2249ae5e0a69bd0ddf17353d0a5d26611d70970111f5b3600cdc8be883e7/pandas-3.0.2-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:c3b723df9087a9a9a840e263ebd9f88b64a12075d1bf2ea401a5a42f254f084d", size = 11375181, upload-time = "2026-03-31T06:47:09.383Z" },
+    { url = "https://files.pythonhosted.org/packages/de/64/77a38b09e70b6464883b8d7584ab543e748e42c1b5d337a2ee088e0df741/pandas-3.0.2-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:a3096110bf9eac0070b7208465f2740e2d8a670d5cb6530b5bb884eca495fd39", size = 11928899, upload-time = "2026-03-31T06:47:12.686Z" },
+    { url = "https://files.pythonhosted.org/packages/5e/52/42855bf626868413f761addd574acc6195880ae247a5346477a4361c3acb/pandas-3.0.2-cp313-cp313-win_amd64.whl", hash = "sha256:07a10f5c36512eead51bc578eb3354ad17578b22c013d89a796ab5eee90cd991", size = 9746574, upload-time = "2026-03-31T06:47:15.64Z" },
+    { url = "https://files.pythonhosted.org/packages/88/39/21304ae06a25e8bf9fc820d69b29b2c495b2ae580d1e143146c309941760/pandas-3.0.2-cp313-cp313-win_arm64.whl", hash = "sha256:5fdbfa05931071aba28b408e59226186b01eb5e92bea2ab78b65863ca3228d84", size = 9047156, upload-time = "2026-03-31T06:47:18.595Z" },
+    { url = "https://files.pythonhosted.org/packages/72/20/7defa8b27d4f330a903bb68eea33be07d839c5ea6bdda54174efcec0e1d2/pandas-3.0.2-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:dbc20dea3b9e27d0e66d74c42b2d0c1bed9c2ffe92adea33633e3bedeb5ac235", size = 10756238, upload-time = "2026-03-31T06:47:22.012Z" },
+    { url = "https://files.pythonhosted.org/packages/e9/95/49433c14862c636afc0e9b2db83ff16b3ad92959364e52b2955e44c8e94c/pandas-3.0.2-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:b75c347eff42497452116ce05ef461822d97ce5b9ff8df6edacb8076092c855d", size = 10408520, upload-time = "2026-03-31T06:47:25.197Z" },
+    { url = "https://files.pythonhosted.org/packages/3b/f8/462ad2b5881d6b8ec8e5f7ed2ea1893faa02290d13870a1600fe72ad8efc/pandas-3.0.2-cp313-cp313t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d1478075142e83a5571782ad007fb201ed074bdeac7ebcc8890c71442e96adf7", size = 10324154, upload-time = "2026-03-31T06:47:28.097Z" },
+    { url = "https://files.pythonhosted.org/packages/0a/65/d1e69b649cbcddda23ad6e4c40ef935340f6f652a006e5cbc3555ac8adb3/pandas-3.0.2-cp313-cp313t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5880314e69e763d4c8b27937090de570f1fb8d027059a7ada3f7f8e98bdcb677", size = 10714449, upload-time = "2026-03-31T06:47:30.85Z" },
+    { url = "https://files.pythonhosted.org/packages/47/a4/85b59bc65b8190ea3689882db6cdf32a5003c0ccd5a586c30fdcc3ffc4fc/pandas-3.0.2-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:b5329e26898896f06035241a626d7c335daa479b9bbc82be7c2742d048e41172", size = 11338475, upload-time = "2026-03-31T06:47:34.026Z" },
+    { url = "https://files.pythonhosted.org/packages/1e/c4/bc6966c6e38e5d9478b935272d124d80a589511ed1612a5d21d36f664c68/pandas-3.0.2-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:81526c4afd31971f8b62671442a4b2b51e0aa9acc3819c9f0f12a28b6fcf85f1", size = 11786568, upload-time = "2026-03-31T06:47:36.941Z" },
+    { url = "https://files.pythonhosted.org/packages/e8/74/09298ca9740beed1d3504e073d67e128aa07e5ca5ca2824b0c674c0b8676/pandas-3.0.2-cp313-cp313t-win_amd64.whl", hash = "sha256:7cadd7e9a44ec13b621aec60f9150e744cfc7a3dd32924a7e2f45edff31823b0", size = 10488652, upload-time = "2026-03-31T06:47:40.612Z" },
+    { url = "https://files.pythonhosted.org/packages/bb/40/c6ea527147c73b24fc15c891c3fcffe9c019793119c5742b8784a062c7db/pandas-3.0.2-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:db0dbfd2a6cdf3770aa60464d50333d8f3d9165b2f2671bcc299b72de5a6677b", size = 10326084, upload-time = "2026-03-31T06:47:43.834Z" },
+    { url = "https://files.pythonhosted.org/packages/95/25/bdb9326c3b5455f8d4d3549fce7abcf967259de146fe2cf7a82368141948/pandas-3.0.2-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:0555c5882688a39317179ab4a0ed41d3ebc8812ab14c69364bbee8fb7a3f6288", size = 9914146, upload-time = "2026-03-31T06:47:46.67Z" },
+    { url = "https://files.pythonhosted.org/packages/8d/77/3a227ff3337aa376c60d288e1d61c5d097131d0ac71f954d90a8f369e422/pandas-3.0.2-cp314-cp314-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:01f31a546acd5574ef77fe199bc90b55527c225c20ccda6601cf6b0fd5ed597c", size = 10444081, upload-time = "2026-03-31T06:47:49.681Z" },
+    { url = "https://files.pythonhosted.org/packages/15/88/3cdd54fa279341afa10acf8d2b503556b1375245dccc9315659f795dd2e9/pandas-3.0.2-cp314-cp314-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:deeca1b5a931fdf0c2212c8a659ade6d3b1edc21f0914ce71ef24456ca7a6535", size = 10897535, upload-time = "2026-03-31T06:47:53.033Z" },
+    { url = "https://files.pythonhosted.org/packages/06/9d/98cc7a7624f7932e40f434299260e2917b090a579d75937cb8a57b9d2de3/pandas-3.0.2-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:0f48afd9bb13300ffb5a3316973324c787054ba6665cda0da3fbd67f451995db", size = 11446992, upload-time = "2026-03-31T06:47:56.193Z" },
+    { url = "https://files.pythonhosted.org/packages/9a/cd/19ff605cc3760e80602e6826ddef2824d8e7050ed80f2e11c4b079741dc3/pandas-3.0.2-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:6c4d8458b97a35717b62469a4ea0e85abd5ed8687277f5ccfc67f8a5126f8c53", size = 11968257, upload-time = "2026-03-31T06:47:59.137Z" },
+    { url = "https://files.pythonhosted.org/packages/db/60/aba6a38de456e7341285102bede27514795c1eaa353bc0e7638b6b785356/pandas-3.0.2-cp314-cp314-win_amd64.whl", hash = "sha256:b35d14bb5d8285d9494fe93815a9e9307c0876e10f1e8e89ac5b88f728ec8dcf", size = 9865893, upload-time = "2026-03-31T06:48:02.038Z" },
+    { url = "https://files.pythonhosted.org/packages/08/71/e5ec979dd2e8a093dacb8864598c0ff59a0cee0bbcdc0bfec16a51684d4f/pandas-3.0.2-cp314-cp314-win_arm64.whl", hash = "sha256:63d141b56ef686f7f0d714cfb8de4e320475b86bf4b620aa0b7da89af8cbdbbb", size = 9188644, upload-time = "2026-03-31T06:48:05.045Z" },
+    { url = "https://files.pythonhosted.org/packages/f1/6c/7b45d85db19cae1eb524f2418ceaa9d85965dcf7b764ed151386b7c540f0/pandas-3.0.2-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:140f0cffb1fa2524e874dde5b477d9defe10780d8e9e220d259b2c0874c89d9d", size = 10776246, upload-time = "2026-03-31T06:48:07.789Z" },
+    { url = "https://files.pythonhosted.org/packages/a8/3e/7b00648b086c106e81766f25322b48aa8dfa95b55e621dbdf2fdd413a117/pandas-3.0.2-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:ae37e833ff4fed0ba352f6bdd8b73ba3ab3256a85e54edfd1ab51ae40cca0af8", size = 10424801, upload-time = "2026-03-31T06:48:10.897Z" },
+    { url = "https://files.pythonhosted.org/packages/da/6e/558dd09a71b53b4008e7fc8a98ec6d447e9bfb63cdaeea10e5eb9b2dabe8/pandas-3.0.2-cp314-cp314t-manylinux_2_24_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4d888a5c678a419a5bb41a2a93818e8ed9fd3172246555c0b37b7cc27027effd", size = 10345643, upload-time = "2026-03-31T06:48:13.7Z" },
+    { url = "https://files.pythonhosted.org/packages/be/e3/921c93b4d9a280409451dc8d07b062b503bbec0531d2627e73a756e99a82/pandas-3.0.2-cp314-cp314t-manylinux_2_24_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b444dc64c079e84df91baa8bf613d58405645461cabca929d9178f2cd392398d", size = 10743641, upload-time = "2026-03-31T06:48:16.659Z" },
+    { url = "https://files.pythonhosted.org/packages/56/ca/fd17286f24fa3b4d067965d8d5d7e14fe557dd4f979a0b068ac0deaf8228/pandas-3.0.2-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:4544c7a54920de8eeacaa1466a6b7268ecfbc9bc64ab4dbb89c6bbe94d5e0660", size = 11361993, upload-time = "2026-03-31T06:48:19.475Z" },
+    { url = "https://files.pythonhosted.org/packages/e4/a5/2f6ed612056819de445a433ca1f2821ac3dab7f150d569a59e9cc105de1d/pandas-3.0.2-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:734be7551687c00fbd760dc0522ed974f82ad230d4a10f54bf51b80d44a08702", size = 11815274, upload-time = "2026-03-31T06:48:22.695Z" },
+    { url = "https://files.pythonhosted.org/packages/00/2f/b622683e99ec3ce00b0854bac9e80868592c5b051733f2cf3a868e5fea26/pandas-3.0.2-cp314-cp314t-win_amd64.whl", hash = "sha256:57a07209bebcbcf768d2d13c9b78b852f9a15978dac41b9e6421a81ad4cdd276", size = 10888530, upload-time = "2026-03-31T06:48:25.806Z" },
+    { url = "https://files.pythonhosted.org/packages/cb/2b/f8434233fab2bd66a02ec014febe4e5adced20e2693e0e90a07d118ed30e/pandas-3.0.2-cp314-cp314t-win_arm64.whl", hash = "sha256:5371b72c2d4d415d08765f32d689217a43227484e81b2305b52076e328f6f482", size = 9455341, upload-time = "2026-03-31T06:48:28.418Z" },
+]
+
+[package.optional-dependencies]
+excel = [
+    { name = "odfpy" },
+    { name = "openpyxl" },
+    { name = "python-calamine" },
+    { name = "pyxlsb" },
+    { name = "xlrd" },
+    { name = "xlsxwriter" },
+]
+
+[[package]]
+name = "pathspec"
+version = "1.1.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/5a/82/42f767fc1c1143d6fd36efb827202a2d997a375e160a71eb2888a925aac1/pathspec-1.1.1.tar.gz", hash = "sha256:17db5ecd524104a120e173814c90367a96a98d07c45b2e10c2f3919fff91bf5a", size = 135180, upload-time = "2026-04-27T01:46:08.907Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/f1/d9/7fb5aa316bc299258e68c73ba3bddbc499654a07f151cba08f6153988714/pathspec-1.1.1-py3-none-any.whl", hash = "sha256:a00ce642f577bf7f473932318056212bc4f8bfdf53128c78bbd5af0b9b20b189", size = 57328, upload-time = "2026-04-27T01:46:07.06Z" },
+]
+
+[[package]]
+name = "pillow"
+version = "12.2.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/8c/21/c2bcdd5906101a30244eaffc1b6e6ce71a31bd0742a01eb89e660ebfac2d/pillow-12.2.0.tar.gz", hash = "sha256:a830b1a40919539d07806aa58e1b114df53ddd43213d9c8b75847eee6c0182b5", size = 46987819, upload-time = "2026-04-01T14:46:17.687Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/58/be/7482c8a5ebebbc6470b3eb791812fff7d5e0216c2be3827b30b8bb6603ed/pillow-12.2.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:2d192a155bbcec180f8564f693e6fd9bccff5a7af9b32e2e4bf8c9c69dbad6b5", size = 5308279, upload-time = "2026-04-01T14:43:13.246Z" },
+    { url = "https://files.pythonhosted.org/packages/d8/95/0a351b9289c2b5cbde0bacd4a83ebc44023e835490a727b2a3bd60ddc0f4/pillow-12.2.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f3f40b3c5a968281fd507d519e444c35f0ff171237f4fdde090dd60699458421", size = 4695490, upload-time = "2026-04-01T14:43:15.584Z" },
+    { url = "https://files.pythonhosted.org/packages/de/af/4e8e6869cbed569d43c416fad3dc4ecb944cb5d9492defaed89ddd6fe871/pillow-12.2.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:03e7e372d5240cc23e9f07deca4d775c0817bffc641b01e9c3af208dbd300987", size = 6284462, upload-time = "2026-04-01T14:43:18.268Z" },
+    { url = "https://files.pythonhosted.org/packages/e9/9e/c05e19657fd57841e476be1ab46c4d501bffbadbafdc31a6d665f8b737b6/pillow-12.2.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:b86024e52a1b269467a802258c25521e6d742349d760728092e1bc2d135b4d76", size = 8094744, upload-time = "2026-04-01T14:43:20.716Z" },
+    { url = "https://files.pythonhosted.org/packages/2b/54/1789c455ed10176066b6e7e6da1b01e50e36f94ba584dc68d9eebfe9156d/pillow-12.2.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:7371b48c4fa448d20d2714c9a1f775a81155050d383333e0a6c15b1123dda005", size = 6398371, upload-time = "2026-04-01T14:43:23.443Z" },
+    { url = "https://files.pythonhosted.org/packages/43/e3/fdc657359e919462369869f1c9f0e973f353f9a9ee295a39b1fea8ee1a77/pillow-12.2.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:62f5409336adb0663b7caa0da5c7d9e7bdbaae9ce761d34669420c2a801b2780", size = 7087215, upload-time = "2026-04-01T14:43:26.758Z" },
+    { url = "https://files.pythonhosted.org/packages/8b/f8/2f6825e441d5b1959d2ca5adec984210f1ec086435b0ed5f52c19b3b8a6e/pillow-12.2.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:01afa7cf67f74f09523699b4e88c73fb55c13346d212a59a2db1f86b0a63e8c5", size = 6509783, upload-time = "2026-04-01T14:43:29.56Z" },
+    { url = "https://files.pythonhosted.org/packages/67/f9/029a27095ad20f854f9dba026b3ea6428548316e057e6fc3545409e86651/pillow-12.2.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:fc3d34d4a8fbec3e88a79b92e5465e0f9b842b628675850d860b8bd300b159f5", size = 7212112, upload-time = "2026-04-01T14:43:32.091Z" },
+    { url = "https://files.pythonhosted.org/packages/be/42/025cfe05d1be22dbfdb4f264fe9de1ccda83f66e4fc3aac94748e784af04/pillow-12.2.0-cp312-cp312-win32.whl", hash = "sha256:58f62cc0f00fd29e64b29f4fd923ffdb3859c9f9e6105bfc37ba1d08994e8940", size = 6378489, upload-time = "2026-04-01T14:43:34.601Z" },
+    { url = "https://files.pythonhosted.org/packages/5d/7b/25a221d2c761c6a8ae21bfa3874988ff2583e19cf8a27bf2fee358df7942/pillow-12.2.0-cp312-cp312-win_amd64.whl", hash = "sha256:7f84204dee22a783350679a0333981df803dac21a0190d706a50475e361c93f5", size = 7084129, upload-time = "2026-04-01T14:43:37.213Z" },
+    { url = "https://files.pythonhosted.org/packages/10/e1/542a474affab20fd4a0f1836cb234e8493519da6b76899e30bcc5d990b8b/pillow-12.2.0-cp312-cp312-win_arm64.whl", hash = "sha256:af73337013e0b3b46f175e79492d96845b16126ddf79c438d7ea7ff27783a414", size = 2463612, upload-time = "2026-04-01T14:43:39.421Z" },
+    { url = "https://files.pythonhosted.org/packages/4a/01/53d10cf0dbad820a8db274d259a37ba50b88b24768ddccec07355382d5ad/pillow-12.2.0-cp313-cp313-ios_13_0_arm64_iphoneos.whl", hash = "sha256:8297651f5b5679c19968abefd6bb84d95fe30ef712eb1b2d9b2d31ca61267f4c", size = 4100837, upload-time = "2026-04-01T14:43:41.506Z" },
+    { url = "https://files.pythonhosted.org/packages/0f/98/f3a6657ecb698c937f6c76ee564882945f29b79bad496abcba0e84659ec5/pillow-12.2.0-cp313-cp313-ios_13_0_arm64_iphonesimulator.whl", hash = "sha256:50d8520da2a6ce0af445fa6d648c4273c3eeefbc32d7ce049f22e8b5c3daecc2", size = 4176528, upload-time = "2026-04-01T14:43:43.773Z" },
+    { url = "https://files.pythonhosted.org/packages/69/bc/8986948f05e3ea490b8442ea1c1d4d990b24a7e43d8a51b2c7d8b1dced36/pillow-12.2.0-cp313-cp313-ios_13_0_x86_64_iphonesimulator.whl", hash = "sha256:766cef22385fa1091258ad7e6216792b156dc16d8d3fa607e7545b2b72061f1c", size = 3640401, upload-time = "2026-04-01T14:43:45.87Z" },
+    { url = "https://files.pythonhosted.org/packages/34/46/6c717baadcd62bc8ed51d238d521ab651eaa74838291bda1f86fe1f864c9/pillow-12.2.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:5d2fd0fa6b5d9d1de415060363433f28da8b1526c1c129020435e186794b3795", size = 5308094, upload-time = "2026-04-01T14:43:48.438Z" },
+    { url = "https://files.pythonhosted.org/packages/71/43/905a14a8b17fdb1ccb58d282454490662d2cb89a6bfec26af6d3520da5ec/pillow-12.2.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:56b25336f502b6ed02e889f4ece894a72612fe885889a6e8c4c80239ff6e5f5f", size = 4695402, upload-time = "2026-04-01T14:43:51.292Z" },
+    { url = "https://files.pythonhosted.org/packages/73/dd/42107efcb777b16fa0393317eac58f5b5cf30e8392e266e76e51cff28c3d/pillow-12.2.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f1c943e96e85df3d3478f7b691f229887e143f81fedab9b20205349ab04d73ed", size = 6280005, upload-time = "2026-04-01T14:43:54.242Z" },
+    { url = "https://files.pythonhosted.org/packages/a8/68/b93e09e5e8549019e61acf49f65b1a8530765a7f812c77a7461bca7e4494/pillow-12.2.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:03f6fab9219220f041c74aeaa2939ff0062bd5c364ba9ce037197f4c6d498cd9", size = 8090669, upload-time = "2026-04-01T14:43:57.335Z" },
+    { url = "https://files.pythonhosted.org/packages/4b/6e/3ccb54ce8ec4ddd1accd2d89004308b7b0b21c4ac3d20fa70af4760a4330/pillow-12.2.0-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5cdfebd752ec52bf5bb4e35d9c64b40826bc5b40a13df7c3cda20a2c03a0f5ed", size = 6395194, upload-time = "2026-04-01T14:43:59.864Z" },
+    { url = "https://files.pythonhosted.org/packages/67/ee/21d4e8536afd1a328f01b359b4d3997b291ffd35a237c877b331c1c3b71c/pillow-12.2.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:eedf4b74eda2b5a4b2b2fb4c006d6295df3bf29e459e198c90ea48e130dc75c3", size = 7082423, upload-time = "2026-04-01T14:44:02.74Z" },
+    { url = "https://files.pythonhosted.org/packages/78/5f/e9f86ab0146464e8c133fe85df987ed9e77e08b29d8d35f9f9f4d6f917ba/pillow-12.2.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:00a2865911330191c0b818c59103b58a5e697cae67042366970a6b6f1b20b7f9", size = 6505667, upload-time = "2026-04-01T14:44:05.381Z" },
+    { url = "https://files.pythonhosted.org/packages/ed/1e/409007f56a2fdce61584fd3acbc2bbc259857d555196cedcadc68c015c82/pillow-12.2.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:1e1757442ed87f4912397c6d35a0db6a7b52592156014706f17658ff58bbf795", size = 7208580, upload-time = "2026-04-01T14:44:08.39Z" },
+    { url = "https://files.pythonhosted.org/packages/23/c4/7349421080b12fb35414607b8871e9534546c128a11965fd4a7002ccfbee/pillow-12.2.0-cp313-cp313-win32.whl", hash = "sha256:144748b3af2d1b358d41286056d0003f47cb339b8c43a9ea42f5fea4d8c66b6e", size = 6375896, upload-time = "2026-04-01T14:44:11.197Z" },
+    { url = "https://files.pythonhosted.org/packages/3f/82/8a3739a5e470b3c6cbb1d21d315800d8e16bff503d1f16b03a4ec3212786/pillow-12.2.0-cp313-cp313-win_amd64.whl", hash = "sha256:390ede346628ccc626e5730107cde16c42d3836b89662a115a921f28440e6a3b", size = 7081266, upload-time = "2026-04-01T14:44:13.947Z" },
+    { url = "https://files.pythonhosted.org/packages/c3/25/f968f618a062574294592f668218f8af564830ccebdd1fa6200f598e65c5/pillow-12.2.0-cp313-cp313-win_arm64.whl", hash = "sha256:8023abc91fba39036dbce14a7d6535632f99c0b857807cbbbf21ecc9f4717f06", size = 2463508, upload-time = "2026-04-01T14:44:16.312Z" },
+    { url = "https://files.pythonhosted.org/packages/4d/a4/b342930964e3cb4dce5038ae34b0eab4653334995336cd486c5a8c25a00c/pillow-12.2.0-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:042db20a421b9bafecc4b84a8b6e444686bd9d836c7fd24542db3e7df7baad9b", size = 5309927, upload-time = "2026-04-01T14:44:18.89Z" },
+    { url = "https://files.pythonhosted.org/packages/9f/de/23198e0a65a9cf06123f5435a5d95cea62a635697f8f03d134d3f3a96151/pillow-12.2.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:dd025009355c926a84a612fecf58bb315a3f6814b17ead51a8e48d3823d9087f", size = 4698624, upload-time = "2026-04-01T14:44:21.115Z" },
+    { url = "https://files.pythonhosted.org/packages/01/a6/1265e977f17d93ea37aa28aa81bad4fa597933879fac2520d24e021c8da3/pillow-12.2.0-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:88ddbc66737e277852913bd1e07c150cc7bb124539f94c4e2df5344494e0a612", size = 6321252, upload-time = "2026-04-01T14:44:23.663Z" },
+    { url = "https://files.pythonhosted.org/packages/3c/83/5982eb4a285967baa70340320be9f88e57665a387e3a53a7f0db8231a0cd/pillow-12.2.0-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:d362d1878f00c142b7e1a16e6e5e780f02be8195123f164edf7eddd911eefe7c", size = 8126550, upload-time = "2026-04-01T14:44:26.772Z" },
+    { url = "https://files.pythonhosted.org/packages/4e/48/6ffc514adce69f6050d0753b1a18fd920fce8cac87620d5a31231b04bfc5/pillow-12.2.0-cp313-cp313t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2c727a6d53cb0018aadd8018c2b938376af27914a68a492f59dfcaca650d5eea", size = 6433114, upload-time = "2026-04-01T14:44:29.615Z" },
+    { url = "https://files.pythonhosted.org/packages/36/a3/f9a77144231fb8d40ee27107b4463e205fa4677e2ca2548e14da5cf18dce/pillow-12.2.0-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:efd8c21c98c5cc60653bcb311bef2ce0401642b7ce9d09e03a7da87c878289d4", size = 7115667, upload-time = "2026-04-01T14:44:32.773Z" },
+    { url = "https://files.pythonhosted.org/packages/c1/fc/ac4ee3041e7d5a565e1c4fd72a113f03b6394cc72ab7089d27608f8aaccb/pillow-12.2.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:9f08483a632889536b8139663db60f6724bfcb443c96f1b18855860d7d5c0fd4", size = 6538966, upload-time = "2026-04-01T14:44:35.252Z" },
+    { url = "https://files.pythonhosted.org/packages/c0/a8/27fb307055087f3668f6d0a8ccb636e7431d56ed0750e07a60547b1e083e/pillow-12.2.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:dac8d77255a37e81a2efcbd1fc05f1c15ee82200e6c240d7e127e25e365c39ea", size = 7238241, upload-time = "2026-04-01T14:44:37.875Z" },
+    { url = "https://files.pythonhosted.org/packages/ad/4b/926ab182c07fccae9fcb120043464e1ff1564775ec8864f21a0ebce6ac25/pillow-12.2.0-cp313-cp313t-win32.whl", hash = "sha256:ee3120ae9dff32f121610bb08e4313be87e03efeadfc6c0d18f89127e24d0c24", size = 6379592, upload-time = "2026-04-01T14:44:40.336Z" },
+    { url = "https://files.pythonhosted.org/packages/c2/c4/f9e476451a098181b30050cc4c9a3556b64c02cf6497ea421ac047e89e4b/pillow-12.2.0-cp313-cp313t-win_amd64.whl", hash = "sha256:325ca0528c6788d2a6c3d40e3568639398137346c3d6e66bb61db96b96511c98", size = 7085542, upload-time = "2026-04-01T14:44:43.251Z" },
+    { url = "https://files.pythonhosted.org/packages/00/a4/285f12aeacbe2d6dc36c407dfbbe9e96d4a80b0fb710a337f6d2ad978c75/pillow-12.2.0-cp313-cp313t-win_arm64.whl", hash = "sha256:2e5a76d03a6c6dcef67edabda7a52494afa4035021a79c8558e14af25313d453", size = 2465765, upload-time = "2026-04-01T14:44:45.996Z" },
+    { url = "https://files.pythonhosted.org/packages/bf/98/4595daa2365416a86cb0d495248a393dfc84e96d62ad080c8546256cb9c0/pillow-12.2.0-cp314-cp314-ios_13_0_arm64_iphoneos.whl", hash = "sha256:3adc9215e8be0448ed6e814966ecf3d9952f0ea40eb14e89a102b87f450660d8", size = 4100848, upload-time = "2026-04-01T14:44:48.48Z" },
+    { url = "https://files.pythonhosted.org/packages/0b/79/40184d464cf89f6663e18dfcf7ca21aae2491fff1a16127681bf1fa9b8cf/pillow-12.2.0-cp314-cp314-ios_13_0_arm64_iphonesimulator.whl", hash = "sha256:6a9adfc6d24b10f89588096364cc726174118c62130c817c2837c60cf08a392b", size = 4176515, upload-time = "2026-04-01T14:44:51.353Z" },
+    { url = "https://files.pythonhosted.org/packages/b0/63/703f86fd4c422a9cf722833670f4f71418fb116b2853ff7da722ea43f184/pillow-12.2.0-cp314-cp314-ios_13_0_x86_64_iphonesimulator.whl", hash = "sha256:6a6e67ea2e6feda684ed370f9a1c52e7a243631c025ba42149a2cc5934dec295", size = 3640159, upload-time = "2026-04-01T14:44:53.588Z" },
+    { url = "https://files.pythonhosted.org/packages/71/e0/fb22f797187d0be2270f83500aab851536101b254bfa1eae10795709d283/pillow-12.2.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:2bb4a8d594eacdfc59d9e5ad972aa8afdd48d584ffd5f13a937a664c3e7db0ed", size = 5312185, upload-time = "2026-04-01T14:44:56.039Z" },
+    { url = "https://files.pythonhosted.org/packages/ba/8c/1a9e46228571de18f8e28f16fabdfc20212a5d019f3e3303452b3f0a580d/pillow-12.2.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:80b2da48193b2f33ed0c32c38140f9d3186583ce7d516526d462645fd98660ae", size = 4695386, upload-time = "2026-04-01T14:44:58.663Z" },
+    { url = "https://files.pythonhosted.org/packages/70/62/98f6b7f0c88b9addd0e87c217ded307b36be024d4ff8869a812b241d1345/pillow-12.2.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:22db17c68434de69d8ecfc2fe821569195c0c373b25cccb9cbdacf2c6e53c601", size = 6280384, upload-time = "2026-04-01T14:45:01.5Z" },
+    { url = "https://files.pythonhosted.org/packages/5e/03/688747d2e91cfbe0e64f316cd2e8005698f76ada3130d0194664174fa5de/pillow-12.2.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:7b14cc0106cd9aecda615dd6903840a058b4700fcb817687d0ee4fc8b6e389be", size = 8091599, upload-time = "2026-04-01T14:45:04.5Z" },
+    { url = "https://files.pythonhosted.org/packages/f6/35/577e22b936fcdd66537329b33af0b4ccfefaeabd8aec04b266528cddb33c/pillow-12.2.0-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8cbeb542b2ebc6fcdacabf8aca8c1a97c9b3ad3927d46b8723f9d4f033288a0f", size = 6396021, upload-time = "2026-04-01T14:45:07.117Z" },
+    { url = "https://files.pythonhosted.org/packages/11/8d/d2532ad2a603ca2b93ad9f5135732124e57811d0168155852f37fbce2458/pillow-12.2.0-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4bfd07bc812fbd20395212969e41931001fd59eb55a60658b0e5710872e95286", size = 7083360, upload-time = "2026-04-01T14:45:09.763Z" },
+    { url = "https://files.pythonhosted.org/packages/5e/26/d325f9f56c7e039034897e7380e9cc202b1e368bfd04d4cbe6a441f02885/pillow-12.2.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:9aba9a17b623ef750a4d11b742cbafffeb48a869821252b30ee21b5e91392c50", size = 6507628, upload-time = "2026-04-01T14:45:12.378Z" },
+    { url = "https://files.pythonhosted.org/packages/5f/f7/769d5632ffb0988f1c5e7660b3e731e30f7f8ec4318e94d0a5d674eb65a4/pillow-12.2.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:deede7c263feb25dba4e82ea23058a235dcc2fe1f6021025dc71f2b618e26104", size = 7209321, upload-time = "2026-04-01T14:45:15.122Z" },
+    { url = "https://files.pythonhosted.org/packages/6a/7a/c253e3c645cd47f1aceea6a8bacdba9991bf45bb7dfe927f7c893e89c93c/pillow-12.2.0-cp314-cp314-win32.whl", hash = "sha256:632ff19b2778e43162304d50da0181ce24ac5bb8180122cbe1bf4673428328c7", size = 6479723, upload-time = "2026-04-01T14:45:17.797Z" },
+    { url = "https://files.pythonhosted.org/packages/cd/8b/601e6566b957ca50e28725cb6c355c59c2c8609751efbecd980db44e0349/pillow-12.2.0-cp314-cp314-win_amd64.whl", hash = "sha256:4e6c62e9d237e9b65fac06857d511e90d8461a32adcc1b9065ea0c0fa3a28150", size = 7217400, upload-time = "2026-04-01T14:45:20.529Z" },
+    { url = "https://files.pythonhosted.org/packages/d6/94/220e46c73065c3e2951bb91c11a1fb636c8c9ad427ac3ce7d7f3359b9b2f/pillow-12.2.0-cp314-cp314-win_arm64.whl", hash = "sha256:b1c1fbd8a5a1af3412a0810d060a78b5136ec0836c8a4ef9aa11807f2a22f4e1", size = 2554835, upload-time = "2026-04-01T14:45:23.162Z" },
+    { url = "https://files.pythonhosted.org/packages/b6/ab/1b426a3974cb0e7da5c29ccff4807871d48110933a57207b5a676cccc155/pillow-12.2.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:57850958fe9c751670e49b2cecf6294acc99e562531f4bd317fa5ddee2068463", size = 5314225, upload-time = "2026-04-01T14:45:25.637Z" },
+    { url = "https://files.pythonhosted.org/packages/19/1e/dce46f371be2438eecfee2a1960ee2a243bbe5e961890146d2dee1ff0f12/pillow-12.2.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:d5d38f1411c0ed9f97bcb49b7bd59b6b7c314e0e27420e34d99d844b9ce3b6f3", size = 4698541, upload-time = "2026-04-01T14:45:28.355Z" },
+    { url = "https://files.pythonhosted.org/packages/55/c3/7fbecf70adb3a0c33b77a300dc52e424dc22ad8cdc06557a2e49523b703d/pillow-12.2.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:5c0a9f29ca8e79f09de89293f82fc9b0270bb4af1d58bc98f540cc4aedf03166", size = 6322251, upload-time = "2026-04-01T14:45:30.924Z" },
+    { url = "https://files.pythonhosted.org/packages/1c/3c/7fbc17cfb7e4fe0ef1642e0abc17fc6c94c9f7a16be41498e12e2ba60408/pillow-12.2.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:1610dd6c61621ae1cf811bef44d77e149ce3f7b95afe66a4512f8c59f25d9ebe", size = 8127807, upload-time = "2026-04-01T14:45:33.908Z" },
+    { url = "https://files.pythonhosted.org/packages/ff/c3/a8ae14d6defd2e448493ff512fae903b1e9bd40b72efb6ec55ce0048c8ce/pillow-12.2.0-cp314-cp314t-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0a34329707af4f73cf1782a36cd2289c0368880654a2c11f027bcee9052d35dd", size = 6433935, upload-time = "2026-04-01T14:45:36.623Z" },
+    { url = "https://files.pythonhosted.org/packages/6e/32/2880fb3a074847ac159d8f902cb43278a61e85f681661e7419e6596803ed/pillow-12.2.0-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8e9c4f5b3c546fa3458a29ab22646c1c6c787ea8f5ef51300e5a60300736905e", size = 7116720, upload-time = "2026-04-01T14:45:39.258Z" },
+    { url = "https://files.pythonhosted.org/packages/46/87/495cc9c30e0129501643f24d320076f4cc54f718341df18cc70ec94c44e1/pillow-12.2.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:fb043ee2f06b41473269765c2feae53fc2e2fbf96e5e22ca94fb5ad677856f06", size = 6540498, upload-time = "2026-04-01T14:45:41.879Z" },
+    { url = "https://files.pythonhosted.org/packages/18/53/773f5edca692009d883a72211b60fdaf8871cbef075eaa9d577f0a2f989e/pillow-12.2.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:f278f034eb75b4e8a13a54a876cc4a5ab39173d2cdd93a638e1b467fc545ac43", size = 7239413, upload-time = "2026-04-01T14:45:44.705Z" },
+    { url = "https://files.pythonhosted.org/packages/c9/e4/4b64a97d71b2a83158134abbb2f5bd3f8a2ea691361282f010998f339ec7/pillow-12.2.0-cp314-cp314t-win32.whl", hash = "sha256:6bb77b2dcb06b20f9f4b4a8454caa581cd4dd0643a08bacf821216a16d9c8354", size = 6482084, upload-time = "2026-04-01T14:45:47.568Z" },
+    { url = "https://files.pythonhosted.org/packages/ba/13/306d275efd3a3453f72114b7431c877d10b1154014c1ebbedd067770d629/pillow-12.2.0-cp314-cp314t-win_amd64.whl", hash = "sha256:6562ace0d3fb5f20ed7290f1f929cae41b25ae29528f2af1722966a0a02e2aa1", size = 7225152, upload-time = "2026-04-01T14:45:50.032Z" },
+    { url = "https://files.pythonhosted.org/packages/ff/6e/cf826fae916b8658848d7b9f38d88da6396895c676e8086fc0988073aaf8/pillow-12.2.0-cp314-cp314t-win_arm64.whl", hash = "sha256:aa88ccfe4e32d362816319ed727a004423aab09c5cea43c01a4b435643fa34eb", size = 2556579, upload-time = "2026-04-01T14:45:52.529Z" },
+]
+
+[[package]]
+name = "platformdirs"
+version = "4.9.6"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/9f/4a/0883b8e3802965322523f0b200ecf33d31f10991d0401162f4b23c698b42/platformdirs-4.9.6.tar.gz", hash = "sha256:3bfa75b0ad0db84096ae777218481852c0ebc6c727b3168c1b9e0118e458cf0a", size = 29400, upload-time = "2026-04-09T00:04:10.812Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/75/a6/a0a304dc33b49145b21f4808d763822111e67d1c3a32b524a1baf947b6e1/platformdirs-4.9.6-py3-none-any.whl", hash = "sha256:e61adb1d5e5cb3441b4b7710bea7e4c12250ca49439228cc1021c00dcfac0917", size = 21348, upload-time = "2026-04-09T00:04:09.463Z" },
+]
+
+[[package]]
+name = "pluggy"
+version = "1.6.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/f9/e2/3e91f31a7d2b083fe6ef3fa267035b518369d9511ffab804f839851d2779/pluggy-1.6.0.tar.gz", hash = "sha256:7dcc130b76258d33b90f61b658791dede3486c3e6bfb003ee5c9bfb396dd22f3", size = 69412, upload-time = "2025-05-15T12:30:07.975Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/54/20/4d324d65cc6d9205fabedc306948156824eb9f0ee1633355a8f7ec5c66bf/pluggy-1.6.0-py3-none-any.whl", hash = "sha256:e920276dd6813095e9377c0bc5566d94c932c33b27a3e3945d8389c374dd4746", size = 20538, upload-time = "2025-05-15T12:30:06.134Z" },
+]
+
+[[package]]
+name = "preshed"
+version = "3.0.13"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "cymem" },
+    { name = "murmurhash" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/43/75/fe6b7bbd0dea530a001b0e24c331b21a0be2786e402abf3c57f5dce43d4b/preshed-3.0.13.tar.gz", hash = "sha256:d75f718bbfd97e992f7827e0fa7faf6a91bdd9c922d5baa4b50d62731396cb89", size = 18338, upload-time = "2026-03-23T08:57:31.378Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/39/fb/ccff23c44c04088c248539005fcda78b9014512a34d170c5360f02ad908b/preshed-3.0.13-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:5d14eea14bd01291388928991d7df7d60b9fd19ae970e55006eb4d29b0c1e8eb", size = 138497, upload-time = "2026-03-23T08:56:35.321Z" },
+    { url = "https://files.pythonhosted.org/packages/8e/ce/cad5a8145881a771e6c0d002f2e585fc19b962f120860b54d32af5baa342/preshed-3.0.13-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f05b08ce92399c0655b5e0eb5a1cc1f9e295703ed3aabdfaf6538dfa8ae23d57", size = 138010, upload-time = "2026-03-23T08:56:36.399Z" },
+    { url = "https://files.pythonhosted.org/packages/a7/a2/c5fed4fb3e946699259d11e4036a3cfdd8c89b3e542e3077d46781642425/preshed-3.0.13-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:62cf7f3113132891d6bba70ff547ad81c6fe50a31930bbbb8499f1d47cd122b7", size = 861498, upload-time = "2026-03-23T08:56:37.67Z" },
+    { url = "https://files.pythonhosted.org/packages/51/94/8c9bc48a6ea4903f53a1a0031ce8e35687526949f25821762ef21493c007/preshed-3.0.13-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:8b8de3f58043070a354477995acdd98626ce43e4193c708ebd0f694e467f5155", size = 868988, upload-time = "2026-03-23T08:56:39.324Z" },
+    { url = "https://files.pythonhosted.org/packages/b6/df/ecd2f40055ff52527ca117ffbfafb888c1a3079b59fbabe03c5b8f9b7240/preshed-3.0.13-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:183b339956a9e1d7a4a00038a3b9587a734db9e8bd915939a49791bd1b372156", size = 1847382, upload-time = "2026-03-23T08:56:40.89Z" },
+    { url = "https://files.pythonhosted.org/packages/e6/88/bdb244e40284ded3632a9f88c23bc80230bd7b2ae4a8b7f2cc91adead7a8/preshed-3.0.13-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:2e77bed56aded7cbe5d28d6bd2178bc5b13eda0e0e464dab205fb578fa915000", size = 1919236, upload-time = "2026-03-23T08:56:42.616Z" },
+    { url = "https://files.pythonhosted.org/packages/a0/c9/c91ea56342e6c364fc69b444a1ac5432327857199c44032c9cc9dc4c3a23/preshed-3.0.13-cp312-cp312-win_amd64.whl", hash = "sha256:04d8f13f2986e5d11af5ac51f55ce3106c70c41b483d20ea392e6180bdd0f870", size = 122938, upload-time = "2026-03-23T08:56:44.271Z" },
+    { url = "https://files.pythonhosted.org/packages/b2/0b/6a99d99619fd83b14c696e2489caed7070647488d4d3ac0b723d35db2de0/preshed-3.0.13-cp312-cp312-win_arm64.whl", hash = "sha256:19318dc1cd8cac6663c6c830bf7e0002d2de853769fb03e056774e97c21bedfd", size = 109194, upload-time = "2026-03-23T08:56:45.346Z" },
+    { url = "https://files.pythonhosted.org/packages/0e/2a/401158195d6dc7f6aef0b354d74d0e95c9da124499448c2b3dbb95b71204/preshed-3.0.13-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:c0d0c14187dc0078d8a63bf190ec045a4d13e7748b6caeb557a7d575e411410b", size = 137289, upload-time = "2026-03-23T08:56:46.516Z" },
+    { url = "https://files.pythonhosted.org/packages/88/8f/e20e64573988528785447a6893b2e7ab287ecfd85b3888e978b28812fd20/preshed-3.0.13-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:7770987c2e57497cd26124a9be5f652b5b3ccd0def89859ab0da8bca6144a3de", size = 136847, upload-time = "2026-03-23T08:56:47.572Z" },
+    { url = "https://files.pythonhosted.org/packages/b9/72/18168f881359c4482d312f8dc196371bdd61c1583a52b34390da4c88bbea/preshed-3.0.13-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:4a7bc48220de579be6bdb0a8715482cf36e2a625a6fd5ad26c9f43485a4a23b5", size = 831478, upload-time = "2026-03-23T08:56:48.769Z" },
+    { url = "https://files.pythonhosted.org/packages/fd/3a/3543476091087102775568cea9885dde3453569e9aeee365809108de572f/preshed-3.0.13-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:e5c8462472f790c16708306aef3a102a762bd19dfe3d2f8ee08bd5e12f51b835", size = 839913, upload-time = "2026-03-23T08:56:49.937Z" },
+    { url = "https://files.pythonhosted.org/packages/cf/65/b13f01329decc44ef53cfb6b4601ba85382dcb2a4ec78d9250f03a418066/preshed-3.0.13-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:c046736239cc8d72670749b79b526e4111839a2fc461a58545d212797649129c", size = 1816452, upload-time = "2026-03-23T08:56:51.233Z" },
+    { url = "https://files.pythonhosted.org/packages/d1/c7/f1a996c6832234efd4d543041b582418d41ac480ee55c557ec9e65344637/preshed-3.0.13-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:7c333f18e9a81c8a6de0603fd8781e17115324b117c445ca91abdf7bfb1abe49", size = 1888978, upload-time = "2026-03-23T08:56:52.591Z" },
+    { url = "https://files.pythonhosted.org/packages/e3/b9/96fb71499049885ce19545903fdd38877bbc2be0da47e37c04d01f3e9f66/preshed-3.0.13-cp313-cp313-win_amd64.whl", hash = "sha256:461327f8dd36520dcf1fd55a671e0c3c2c97a2d95e22fc85faa31173f4785dda", size = 122134, upload-time = "2026-03-23T08:56:54.392Z" },
+    { url = "https://files.pythonhosted.org/packages/ef/a7/32a4903019d936a2316fdd330bedddac287ac26326107d24fb76a1fbc60a/preshed-3.0.13-cp313-cp313-win_arm64.whl", hash = "sha256:35d6c5acb3ee3b12b87a551913063f0cec784055c2af16e028c19fe875f079d0", size = 108497, upload-time = "2026-03-23T08:56:55.816Z" },
+    { url = "https://files.pythonhosted.org/packages/bb/b5/993886c98f5caaa6f07a648cac97a7c62a3093091cad65e1e43a1bd41cc4/preshed-3.0.13-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:d2f1efae396cadab5f3890a2fd43d2ee65373ef9096ccbb805e51e8d8bcc563b", size = 137882, upload-time = "2026-03-23T08:56:56.878Z" },
+    { url = "https://files.pythonhosted.org/packages/c6/86/b7fd137cbf140afd6c45e895946068a15f5b55642916de0075e6eb18581c/preshed-3.0.13-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:8d6acc1f5031a535a55a6f7148e2f274554a8343a16309c700cebea0fe7aee8c", size = 138233, upload-time = "2026-03-23T08:56:58.318Z" },
+    { url = "https://files.pythonhosted.org/packages/8b/ca/21a7e79625614134273dfed32bca5bb4c2ec1313e33fbd12d41657536f1f/preshed-3.0.13-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:7da9d931e7660dcdd757e5870269f0c159126d682ed73ed313971d199eb0f334", size = 834835, upload-time = "2026-03-23T08:56:59.48Z" },
+    { url = "https://files.pythonhosted.org/packages/8f/3a/2dbd299516461831ae90e0d5b0637137bf28520c4e6dd0b01d6f1886659a/preshed-3.0.13-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:d4ae5cfe075bb7a07982e382bca44f41ddf041f4d24cbd358e8cccfc049259b8", size = 834928, upload-time = "2026-03-23T08:57:01.075Z" },
+    { url = "https://files.pythonhosted.org/packages/7c/d3/af654eba4f6587c4ee02c5043e62c194b0a1c4431ffef0c67b9518f6b61c/preshed-3.0.13-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:7557963d0125a3a7bcdb2eb6948f3e45da31b5a7f066b55320de3dea22d7557f", size = 1820368, upload-time = "2026-03-23T08:57:02.351Z" },
+    { url = "https://files.pythonhosted.org/packages/bf/9b/ebcb2b9e8cb881e40b55b0bf450f8a6b187e2ef3ae0c685cce81d2d85026/preshed-3.0.13-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:c4bc60dc994864095d784b7e4d77dba3e64188d169ac88722b699d175561fddb", size = 1888251, upload-time = "2026-03-23T08:57:04.158Z" },
+    { url = "https://files.pythonhosted.org/packages/97/f7/c6c012779edcaa6e2cd092c554e98dc53e77f41205b07208655ba77e2327/preshed-3.0.13-cp314-cp314-win_amd64.whl", hash = "sha256:208dcebbe294bf1881ce33fb015d56ab2a7587aece85a09147727174207892e4", size = 125211, upload-time = "2026-03-23T08:57:05.83Z" },
+    { url = "https://files.pythonhosted.org/packages/f8/82/390ef87d732ef64e673ef6bf9e5d898453986e979efa50fb3a400e2c0766/preshed-3.0.13-cp314-cp314-win_arm64.whl", hash = "sha256:cf8e1a7a1823b2a7765121446c630140ac6e8650c07a6efbf375e168d1fef4f7", size = 111942, upload-time = "2026-03-23T08:57:06.996Z" },
+    { url = "https://files.pythonhosted.org/packages/80/3a/a9dde3167bcecb27ae82ce4567b5ab1aa3989113ae6814c092ce223cc4ef/preshed-3.0.13-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:9ca43ecbc3783eda4d6ab3416ae2ecd9ef23dca5f53995843f69f7457bcd0677", size = 144997, upload-time = "2026-03-23T08:57:08.064Z" },
+    { url = "https://files.pythonhosted.org/packages/74/d4/22d9355b50b6a13b407dcad0a81df83fb1d5602092d1f05834674dde8fda/preshed-3.0.13-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:c8596e41a258ff213553a441e0bb3eb388fd8158e84a7bf3aae6d8ede2c166d3", size = 147294, upload-time = "2026-03-23T08:57:09.411Z" },
+    { url = "https://files.pythonhosted.org/packages/70/42/a225ee83fdb306d2a503f21a627953b820f4e079c90c8a84338957cb8ff5/preshed-3.0.13-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:4f8856ca3d88e9b250630d70abb4f260d8933151ddfb413024784b25b009868e", size = 952110, upload-time = "2026-03-23T08:57:10.592Z" },
+    { url = "https://files.pythonhosted.org/packages/40/ba/09a9dfe3d22d7e745483fd5d7f2a82cd4d39c161f7d2daa0faa4bd6402be/preshed-3.0.13-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:0e5b2865aecbd2e1e10e5d19bb8bfad765863c1307c6c3e51f2a08bd64122409", size = 932217, upload-time = "2026-03-23T08:57:12.124Z" },
+    { url = "https://files.pythonhosted.org/packages/6c/5c/e10e2e05133e7fcbd7c40536af1148c82dd24357b8f5726e2c7bc51cfd53/preshed-3.0.13-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:09f96b477c987755b3c945df214ea1c1c80bfb350e9f34e78da89585535b77e8", size = 1896542, upload-time = "2026-03-23T08:57:13.525Z" },
+    { url = "https://files.pythonhosted.org/packages/37/aa/51e5b4109a4cdfae28c3613eeeb10764a3794ebef8de93ffbb109465bea3/preshed-3.0.13-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:670db59a52e1823b5f088c764df474e65b686592d4093adbeef14581c95ee2cb", size = 1959473, upload-time = "2026-03-23T08:57:15.706Z" },
+    { url = "https://files.pythonhosted.org/packages/0e/6a/1d966f367a14c703dde629d150d996c1b727d442f620300b21c9ec1a24d1/preshed-3.0.13-cp314-cp314t-win_amd64.whl", hash = "sha256:b03e21b0bf95eb56e23973f32cabb930e94f352228652f81c0955dbd6967d904", size = 146229, upload-time = "2026-03-23T08:57:17.457Z" },
+    { url = "https://files.pythonhosted.org/packages/22/80/368139067603e590a000122355f9c8576c8ebed4fb0b8849feaa2698489d/preshed-3.0.13-cp314-cp314t-win_arm64.whl", hash = "sha256:b980f3ea9bb74b7f94464bc3d6eb3c9162b6b79b531febd14c6465c24344d2cc", size = 119339, upload-time = "2026-03-23T08:57:18.882Z" },
+]
+
+[[package]]
+name = "psutil"
+version = "7.2.2"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/aa/c6/d1ddf4abb55e93cebc4f2ed8b5d6dbad109ecb8d63748dd2b20ab5e57ebe/psutil-7.2.2.tar.gz", hash = "sha256:0746f5f8d406af344fd547f1c8daa5f5c33dbc293bb8d6a16d80b4bb88f59372", size = 493740, upload-time = "2026-01-28T18:14:54.428Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/51/08/510cbdb69c25a96f4ae523f733cdc963ae654904e8db864c07585ef99875/psutil-7.2.2-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:2edccc433cbfa046b980b0df0171cd25bcaeb3a68fe9022db0979e7aa74a826b", size = 130595, upload-time = "2026-01-28T18:14:57.293Z" },
+    { url = "https://files.pythonhosted.org/packages/d6/f5/97baea3fe7a5a9af7436301f85490905379b1c6f2dd51fe3ecf24b4c5fbf/psutil-7.2.2-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:e78c8603dcd9a04c7364f1a3e670cea95d51ee865e4efb3556a3a63adef958ea", size = 131082, upload-time = "2026-01-28T18:14:59.732Z" },
+    { url = "https://files.pythonhosted.org/packages/37/d6/246513fbf9fa174af531f28412297dd05241d97a75911ac8febefa1a53c6/psutil-7.2.2-cp313-cp313t-manylinux2010_x86_64.manylinux_2_12_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1a571f2330c966c62aeda00dd24620425d4b0cc86881c89861fbc04549e5dc63", size = 181476, upload-time = "2026-01-28T18:15:01.884Z" },
+    { url = "https://files.pythonhosted.org/packages/b8/b5/9182c9af3836cca61696dabe4fd1304e17bc56cb62f17439e1154f225dd3/psutil-7.2.2-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:917e891983ca3c1887b4ef36447b1e0873e70c933afc831c6b6da078ba474312", size = 184062, upload-time = "2026-01-28T18:15:04.436Z" },
+    { url = "https://files.pythonhosted.org/packages/16/ba/0756dca669f5a9300d0cbcbfae9a4c30e446dfc7440ffe43ded5724bfd93/psutil-7.2.2-cp313-cp313t-win_amd64.whl", hash = "sha256:ab486563df44c17f5173621c7b198955bd6b613fb87c71c161f827d3fb149a9b", size = 139893, upload-time = "2026-01-28T18:15:06.378Z" },
+    { url = "https://files.pythonhosted.org/packages/1c/61/8fa0e26f33623b49949346de05ec1ddaad02ed8ba64af45f40a147dbfa97/psutil-7.2.2-cp313-cp313t-win_arm64.whl", hash = "sha256:ae0aefdd8796a7737eccea863f80f81e468a1e4cf14d926bd9b6f5f2d5f90ca9", size = 135589, upload-time = "2026-01-28T18:15:08.03Z" },
+    { url = "https://files.pythonhosted.org/packages/81/69/ef179ab5ca24f32acc1dac0c247fd6a13b501fd5534dbae0e05a1c48b66d/psutil-7.2.2-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:eed63d3b4d62449571547b60578c5b2c4bcccc5387148db46e0c2313dad0ee00", size = 130664, upload-time = "2026-01-28T18:15:09.469Z" },
+    { url = "https://files.pythonhosted.org/packages/7b/64/665248b557a236d3fa9efc378d60d95ef56dd0a490c2cd37dafc7660d4a9/psutil-7.2.2-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:7b6d09433a10592ce39b13d7be5a54fbac1d1228ed29abc880fb23df7cb694c9", size = 131087, upload-time = "2026-01-28T18:15:11.724Z" },
+    { url = "https://files.pythonhosted.org/packages/d5/2e/e6782744700d6759ebce3043dcfa661fb61e2fb752b91cdeae9af12c2178/psutil-7.2.2-cp314-cp314t-manylinux2010_x86_64.manylinux_2_12_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1fa4ecf83bcdf6e6c8f4449aff98eefb5d0604bf88cb883d7da3d8d2d909546a", size = 182383, upload-time = "2026-01-28T18:15:13.445Z" },
+    { url = "https://files.pythonhosted.org/packages/57/49/0a41cefd10cb7505cdc04dab3eacf24c0c2cb158a998b8c7b1d27ee2c1f5/psutil-7.2.2-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e452c464a02e7dc7822a05d25db4cde564444a67e58539a00f929c51eddda0cf", size = 185210, upload-time = "2026-01-28T18:15:16.002Z" },
+    { url = "https://files.pythonhosted.org/packages/dd/2c/ff9bfb544f283ba5f83ba725a3c5fec6d6b10b8f27ac1dc641c473dc390d/psutil-7.2.2-cp314-cp314t-win_amd64.whl", hash = "sha256:c7663d4e37f13e884d13994247449e9f8f574bc4655d509c3b95e9ec9e2b9dc1", size = 141228, upload-time = "2026-01-28T18:15:18.385Z" },
+    { url = "https://files.pythonhosted.org/packages/f2/fc/f8d9c31db14fcec13748d373e668bc3bed94d9077dbc17fb0eebc073233c/psutil-7.2.2-cp314-cp314t-win_arm64.whl", hash = "sha256:11fe5a4f613759764e79c65cf11ebdf26e33d6dd34336f8a337aa2996d71c841", size = 136284, upload-time = "2026-01-28T18:15:19.912Z" },
+    { url = "https://files.pythonhosted.org/packages/e7/36/5ee6e05c9bd427237b11b3937ad82bb8ad2752d72c6969314590dd0c2f6e/psutil-7.2.2-cp36-abi3-macosx_10_9_x86_64.whl", hash = "sha256:ed0cace939114f62738d808fdcecd4c869222507e266e574799e9c0faa17d486", size = 129090, upload-time = "2026-01-28T18:15:22.168Z" },
+    { url = "https://files.pythonhosted.org/packages/80/c4/f5af4c1ca8c1eeb2e92ccca14ce8effdeec651d5ab6053c589b074eda6e1/psutil-7.2.2-cp36-abi3-macosx_11_0_arm64.whl", hash = "sha256:1a7b04c10f32cc88ab39cbf606e117fd74721c831c98a27dc04578deb0c16979", size = 129859, upload-time = "2026-01-28T18:15:23.795Z" },
+    { url = "https://files.pythonhosted.org/packages/b5/70/5d8df3b09e25bce090399cf48e452d25c935ab72dad19406c77f4e828045/psutil-7.2.2-cp36-abi3-manylinux2010_x86_64.manylinux_2_12_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:076a2d2f923fd4821644f5ba89f059523da90dc9014e85f8e45a5774ca5bc6f9", size = 155560, upload-time = "2026-01-28T18:15:25.976Z" },
+    { url = "https://files.pythonhosted.org/packages/63/65/37648c0c158dc222aba51c089eb3bdfa238e621674dc42d48706e639204f/psutil-7.2.2-cp36-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b0726cecd84f9474419d67252add4ac0cd9811b04d61123054b9fb6f57df6e9e", size = 156997, upload-time = "2026-01-28T18:15:27.794Z" },
+    { url = "https://files.pythonhosted.org/packages/8e/13/125093eadae863ce03c6ffdbae9929430d116a246ef69866dad94da3bfbc/psutil-7.2.2-cp36-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:fd04ef36b4a6d599bbdb225dd1d3f51e00105f6d48a28f006da7f9822f2606d8", size = 148972, upload-time = "2026-01-28T18:15:29.342Z" },
+    { url = "https://files.pythonhosted.org/packages/04/78/0acd37ca84ce3ddffaa92ef0f571e073faa6d8ff1f0559ab1272188ea2be/psutil-7.2.2-cp36-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:b58fabe35e80b264a4e3bb23e6b96f9e45a3df7fb7eed419ac0e5947c61e47cc", size = 148266, upload-time = "2026-01-28T18:15:31.597Z" },
+    { url = "https://files.pythonhosted.org/packages/b4/90/e2159492b5426be0c1fef7acba807a03511f97c5f86b3caeda6ad92351a7/psutil-7.2.2-cp37-abi3-win_amd64.whl", hash = "sha256:eb7e81434c8d223ec4a219b5fc1c47d0417b12be7ea866e24fb5ad6e84b3d988", size = 137737, upload-time = "2026-01-28T18:15:33.849Z" },
+    { url = "https://files.pythonhosted.org/packages/8c/c7/7bb2e321574b10df20cbde462a94e2b71d05f9bbda251ef27d104668306a/psutil-7.2.2-cp37-abi3-win_arm64.whl", hash = "sha256:8c233660f575a5a89e6d4cb65d9f938126312bca76d8fe087b947b3a1aaac9ee", size = 134617, upload-time = "2026-01-28T18:15:36.514Z" },
+]
+
+[[package]]
+name = "pyasn1"
+version = "0.6.3"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/5c/5f/6583902b6f79b399c9c40674ac384fd9cd77805f9e6205075f828ef11fb2/pyasn1-0.6.3.tar.gz", hash = "sha256:697a8ecd6d98891189184ca1fa05d1bb00e2f84b5977c481452050549c8a72cf", size = 148685, upload-time = "2026-03-17T01:06:53.382Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/5d/a0/7d793dce3fa811fe047d6ae2431c672364b462850c6235ae306c0efd025f/pyasn1-0.6.3-py3-none-any.whl", hash = "sha256:a80184d120f0864a52a073acc6fc642847d0be408e7c7252f31390c0f4eadcde", size = 83997, upload-time = "2026-03-17T01:06:52.036Z" },
+]
+
+[[package]]
+name = "pyasn1-modules"
+version = "0.4.2"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "pyasn1" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/e9/e6/78ebbb10a8c8e4b61a59249394a4a594c1a7af95593dc933a349c8d00964/pyasn1_modules-0.4.2.tar.gz", hash = "sha256:677091de870a80aae844b1ca6134f54652fa2c8c5a52aa396440ac3106e941e6", size = 307892, upload-time = "2025-03-28T02:41:22.17Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/47/8d/d529b5d697919ba8c11ad626e835d4039be708a35b0d22de83a269a6682c/pyasn1_modules-0.4.2-py3-none-any.whl", hash = "sha256:29253a9207ce32b64c3ac6600edc75368f98473906e8fd1043bd6b5b1de2c14a", size = 181259, upload-time = "2025-03-28T02:41:19.028Z" },
+]
+
+[[package]]
+name = "pycparser"
+version = "3.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/1b/7d/92392ff7815c21062bea51aa7b87d45576f649f16458d78b7cf94b9ab2e6/pycparser-3.0.tar.gz", hash = "sha256:600f49d217304a5902ac3c37e1281c9fe94e4d0489de643a9504c5cdfdfc6b29", size = 103492, upload-time = "2026-01-21T14:26:51.89Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/0c/c3/44f3fbbfa403ea2a7c779186dc20772604442dde72947e7d01069cbe98e3/pycparser-3.0-py3-none-any.whl", hash = "sha256:b727414169a36b7d524c1c3e31839a521725078d7b2ff038656844266160a992", size = 48172, upload-time = "2026-01-21T14:26:50.693Z" },
+]
+
+[[package]]
+name = "pydantic"
+version = "2.12.5"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "annotated-types" },
+    { name = "pydantic-core" },
+    { name = "typing-extensions" },
+    { name = "typing-inspection" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/69/44/36f1a6e523abc58ae5f928898e4aca2e0ea509b5aa6f6f392a5d882be928/pydantic-2.12.5.tar.gz", hash = "sha256:4d351024c75c0f085a9febbb665ce8c0c6ec5d30e903bdb6394b7ede26aebb49", size = 821591, upload-time = "2025-11-26T15:11:46.471Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/5a/87/b70ad306ebb6f9b585f114d0ac2137d792b48be34d732d60e597c2f8465a/pydantic-2.12.5-py3-none-any.whl", hash = "sha256:e561593fccf61e8a20fc46dfc2dfe075b8be7d0188df33f221ad1f0139180f9d", size = 463580, upload-time = "2025-11-26T15:11:44.605Z" },
+]
+
+[[package]]
+name = "pydantic-ai-slim"
+version = "1.85.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "genai-prices" },
+    { name = "griffelib" },
+    { name = "httpx" },
+    { name = "opentelemetry-api" },
+    { name = "pydantic" },
+    { name = "pydantic-graph" },
+    { name = "typing-inspection" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/a4/6e/018aa88e340dd6e25b0a22f49737c44de56a9c69a4282377fac225197e63/pydantic_ai_slim-1.85.1.tar.gz", hash = "sha256:7394748844cbd28519add1e8aa24b665ffd7516da3579daaaf3de9e1787250a3", size = 562638, upload-time = "2026-04-22T00:08:23.493Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/99/cc/b91513022c89a0ba26d394fa5da5e1e9fbcbb6490a0e1161f73f7f5606e2/pydantic_ai_slim-1.85.1-py3-none-any.whl", hash = "sha256:4a22e1b532e9f8c8afa118ea2cbef2ea541e2f6d7247112fefc0a2bd6b929331", size = 718957, upload-time = "2026-04-22T00:08:15.457Z" },
+]
+
+[package.optional-dependencies]
+anthropic = [
+    { name = "anthropic" },
+]
+google = [
+    { name = "google-genai" },
+]
+openai = [
+    { name = "openai" },
+    { name = "tiktoken" },
+]
+
+[[package]]
+name = "pydantic-core"
+version = "2.41.5"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "typing-extensions" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/71/70/23b021c950c2addd24ec408e9ab05d59b035b39d97cdc1130e1bce647bb6/pydantic_core-2.41.5.tar.gz", hash = "sha256:08daa51ea16ad373ffd5e7606252cc32f07bc72b28284b6bc9c6df804816476e", size = 460952, upload-time = "2025-11-04T13:43:49.098Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/5f/5d/5f6c63eebb5afee93bcaae4ce9a898f3373ca23df3ccaef086d0233a35a7/pydantic_core-2.41.5-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:f41a7489d32336dbf2199c8c0a215390a751c5b014c2c1c5366e817202e9cdf7", size = 2110990, upload-time = "2025-11-04T13:39:58.079Z" },
+    { url = "https://files.pythonhosted.org/packages/aa/32/9c2e8ccb57c01111e0fd091f236c7b371c1bccea0fa85247ac55b1e2b6b6/pydantic_core-2.41.5-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:070259a8818988b9a84a449a2a7337c7f430a22acc0859c6b110aa7212a6d9c0", size = 1896003, upload-time = "2025-11-04T13:39:59.956Z" },
+    { url = "https://files.pythonhosted.org/packages/68/b8/a01b53cb0e59139fbc9e4fda3e9724ede8de279097179be4ff31f1abb65a/pydantic_core-2.41.5-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e96cea19e34778f8d59fe40775a7a574d95816eb150850a85a7a4c8f4b94ac69", size = 1919200, upload-time = "2025-11-04T13:40:02.241Z" },
+    { url = "https://files.pythonhosted.org/packages/38/de/8c36b5198a29bdaade07b5985e80a233a5ac27137846f3bc2d3b40a47360/pydantic_core-2.41.5-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ed2e99c456e3fadd05c991f8f437ef902e00eedf34320ba2b0842bd1c3ca3a75", size = 2052578, upload-time = "2025-11-04T13:40:04.401Z" },
+    { url = "https://files.pythonhosted.org/packages/00/b5/0e8e4b5b081eac6cb3dbb7e60a65907549a1ce035a724368c330112adfdd/pydantic_core-2.41.5-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:65840751b72fbfd82c3c640cff9284545342a4f1eb1586ad0636955b261b0b05", size = 2208504, upload-time = "2025-11-04T13:40:06.072Z" },
+    { url = "https://files.pythonhosted.org/packages/77/56/87a61aad59c7c5b9dc8caad5a41a5545cba3810c3e828708b3d7404f6cef/pydantic_core-2.41.5-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e536c98a7626a98feb2d3eaf75944ef6f3dbee447e1f841eae16f2f0a72d8ddc", size = 2335816, upload-time = "2025-11-04T13:40:07.835Z" },
+    { url = "https://files.pythonhosted.org/packages/0d/76/941cc9f73529988688a665a5c0ecff1112b3d95ab48f81db5f7606f522d3/pydantic_core-2.41.5-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eceb81a8d74f9267ef4081e246ffd6d129da5d87e37a77c9bde550cb04870c1c", size = 2075366, upload-time = "2025-11-04T13:40:09.804Z" },
+    { url = "https://files.pythonhosted.org/packages/d3/43/ebef01f69baa07a482844faaa0a591bad1ef129253ffd0cdaa9d8a7f72d3/pydantic_core-2.41.5-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:d38548150c39b74aeeb0ce8ee1d8e82696f4a4e16ddc6de7b1d8823f7de4b9b5", size = 2171698, upload-time = "2025-11-04T13:40:12.004Z" },
+    { url = "https://files.pythonhosted.org/packages/b1/87/41f3202e4193e3bacfc2c065fab7706ebe81af46a83d3e27605029c1f5a6/pydantic_core-2.41.5-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:c23e27686783f60290e36827f9c626e63154b82b116d7fe9adba1fda36da706c", size = 2132603, upload-time = "2025-11-04T13:40:13.868Z" },
+    { url = "https://files.pythonhosted.org/packages/49/7d/4c00df99cb12070b6bccdef4a195255e6020a550d572768d92cc54dba91a/pydantic_core-2.41.5-cp312-cp312-musllinux_1_1_armv7l.whl", hash = "sha256:482c982f814460eabe1d3bb0adfdc583387bd4691ef00b90575ca0d2b6fe2294", size = 2329591, upload-time = "2025-11-04T13:40:15.672Z" },
+    { url = "https://files.pythonhosted.org/packages/cc/6a/ebf4b1d65d458f3cda6a7335d141305dfa19bdc61140a884d165a8a1bbc7/pydantic_core-2.41.5-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:bfea2a5f0b4d8d43adf9d7b8bf019fb46fdd10a2e5cde477fbcb9d1fa08c68e1", size = 2319068, upload-time = "2025-11-04T13:40:17.532Z" },
+    { url = "https://files.pythonhosted.org/packages/49/3b/774f2b5cd4192d5ab75870ce4381fd89cf218af999515baf07e7206753f0/pydantic_core-2.41.5-cp312-cp312-win32.whl", hash = "sha256:b74557b16e390ec12dca509bce9264c3bbd128f8a2c376eaa68003d7f327276d", size = 1985908, upload-time = "2025-11-04T13:40:19.309Z" },
+    { url = "https://files.pythonhosted.org/packages/86/45/00173a033c801cacf67c190fef088789394feaf88a98a7035b0e40d53dc9/pydantic_core-2.41.5-cp312-cp312-win_amd64.whl", hash = "sha256:1962293292865bca8e54702b08a4f26da73adc83dd1fcf26fbc875b35d81c815", size = 2020145, upload-time = "2025-11-04T13:40:21.548Z" },
+    { url = "https://files.pythonhosted.org/packages/f9/22/91fbc821fa6d261b376a3f73809f907cec5ca6025642c463d3488aad22fb/pydantic_core-2.41.5-cp312-cp312-win_arm64.whl", hash = "sha256:1746d4a3d9a794cacae06a5eaaccb4b8643a131d45fbc9af23e353dc0a5ba5c3", size = 1976179, upload-time = "2025-11-04T13:40:23.393Z" },
+    { url = "https://files.pythonhosted.org/packages/87/06/8806241ff1f70d9939f9af039c6c35f2360cf16e93c2ca76f184e76b1564/pydantic_core-2.41.5-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:941103c9be18ac8daf7b7adca8228f8ed6bb7a1849020f643b3a14d15b1924d9", size = 2120403, upload-time = "2025-11-04T13:40:25.248Z" },
+    { url = "https://files.pythonhosted.org/packages/94/02/abfa0e0bda67faa65fef1c84971c7e45928e108fe24333c81f3bfe35d5f5/pydantic_core-2.41.5-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:112e305c3314f40c93998e567879e887a3160bb8689ef3d2c04b6cc62c33ac34", size = 1896206, upload-time = "2025-11-04T13:40:27.099Z" },
+    { url = "https://files.pythonhosted.org/packages/15/df/a4c740c0943e93e6500f9eb23f4ca7ec9bf71b19e608ae5b579678c8d02f/pydantic_core-2.41.5-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0cbaad15cb0c90aa221d43c00e77bb33c93e8d36e0bf74760cd00e732d10a6a0", size = 1919307, upload-time = "2025-11-04T13:40:29.806Z" },
+    { url = "https://files.pythonhosted.org/packages/9a/e3/6324802931ae1d123528988e0e86587c2072ac2e5394b4bc2bc34b61ff6e/pydantic_core-2.41.5-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:03ca43e12fab6023fc79d28ca6b39b05f794ad08ec2feccc59a339b02f2b3d33", size = 2063258, upload-time = "2025-11-04T13:40:33.544Z" },
+    { url = "https://files.pythonhosted.org/packages/c9/d4/2230d7151d4957dd79c3044ea26346c148c98fbf0ee6ebd41056f2d62ab5/pydantic_core-2.41.5-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:dc799088c08fa04e43144b164feb0c13f9a0bc40503f8df3e9fde58a3c0c101e", size = 2214917, upload-time = "2025-11-04T13:40:35.479Z" },
+    { url = "https://files.pythonhosted.org/packages/e6/9f/eaac5df17a3672fef0081b6c1bb0b82b33ee89aa5cec0d7b05f52fd4a1fa/pydantic_core-2.41.5-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:97aeba56665b4c3235a0e52b2c2f5ae9cd071b8a8310ad27bddb3f7fb30e9aa2", size = 2332186, upload-time = "2025-11-04T13:40:37.436Z" },
+    { url = "https://files.pythonhosted.org/packages/cf/4e/35a80cae583a37cf15604b44240e45c05e04e86f9cfd766623149297e971/pydantic_core-2.41.5-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:406bf18d345822d6c21366031003612b9c77b3e29ffdb0f612367352aab7d586", size = 2073164, upload-time = "2025-11-04T13:40:40.289Z" },
+    { url = "https://files.pythonhosted.org/packages/bf/e3/f6e262673c6140dd3305d144d032f7bd5f7497d3871c1428521f19f9efa2/pydantic_core-2.41.5-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b93590ae81f7010dbe380cdeab6f515902ebcbefe0b9327cc4804d74e93ae69d", size = 2179146, upload-time = "2025-11-04T13:40:42.809Z" },
+    { url = "https://files.pythonhosted.org/packages/75/c7/20bd7fc05f0c6ea2056a4565c6f36f8968c0924f19b7d97bbfea55780e73/pydantic_core-2.41.5-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:01a3d0ab748ee531f4ea6c3e48ad9dac84ddba4b0d82291f87248f2f9de8d740", size = 2137788, upload-time = "2025-11-04T13:40:44.752Z" },
+    { url = "https://files.pythonhosted.org/packages/3a/8d/34318ef985c45196e004bc46c6eab2eda437e744c124ef0dbe1ff2c9d06b/pydantic_core-2.41.5-cp313-cp313-musllinux_1_1_armv7l.whl", hash = "sha256:6561e94ba9dacc9c61bce40e2d6bdc3bfaa0259d3ff36ace3b1e6901936d2e3e", size = 2340133, upload-time = "2025-11-04T13:40:46.66Z" },
+    { url = "https://files.pythonhosted.org/packages/9c/59/013626bf8c78a5a5d9350d12e7697d3d4de951a75565496abd40ccd46bee/pydantic_core-2.41.5-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:915c3d10f81bec3a74fbd4faebe8391013ba61e5a1a8d48c4455b923bdda7858", size = 2324852, upload-time = "2025-11-04T13:40:48.575Z" },
+    { url = "https://files.pythonhosted.org/packages/1a/d9/c248c103856f807ef70c18a4f986693a46a8ffe1602e5d361485da502d20/pydantic_core-2.41.5-cp313-cp313-win32.whl", hash = "sha256:650ae77860b45cfa6e2cdafc42618ceafab3a2d9a3811fcfbd3bbf8ac3c40d36", size = 1994679, upload-time = "2025-11-04T13:40:50.619Z" },
+    { url = "https://files.pythonhosted.org/packages/9e/8b/341991b158ddab181cff136acd2552c9f35bd30380422a639c0671e99a91/pydantic_core-2.41.5-cp313-cp313-win_amd64.whl", hash = "sha256:79ec52ec461e99e13791ec6508c722742ad745571f234ea6255bed38c6480f11", size = 2019766, upload-time = "2025-11-04T13:40:52.631Z" },
+    { url = "https://files.pythonhosted.org/packages/73/7d/f2f9db34af103bea3e09735bb40b021788a5e834c81eedb541991badf8f5/pydantic_core-2.41.5-cp313-cp313-win_arm64.whl", hash = "sha256:3f84d5c1b4ab906093bdc1ff10484838aca54ef08de4afa9de0f5f14d69639cd", size = 1981005, upload-time = "2025-11-04T13:40:54.734Z" },
+    { url = "https://files.pythonhosted.org/packages/ea/28/46b7c5c9635ae96ea0fbb779e271a38129df2550f763937659ee6c5dbc65/pydantic_core-2.41.5-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:3f37a19d7ebcdd20b96485056ba9e8b304e27d9904d233d7b1015db320e51f0a", size = 2119622, upload-time = "2025-11-04T13:40:56.68Z" },
+    { url = "https://files.pythonhosted.org/packages/74/1a/145646e5687e8d9a1e8d09acb278c8535ebe9e972e1f162ed338a622f193/pydantic_core-2.41.5-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:1d1d9764366c73f996edd17abb6d9d7649a7eb690006ab6adbda117717099b14", size = 1891725, upload-time = "2025-11-04T13:40:58.807Z" },
+    { url = "https://files.pythonhosted.org/packages/23/04/e89c29e267b8060b40dca97bfc64a19b2a3cf99018167ea1677d96368273/pydantic_core-2.41.5-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:25e1c2af0fce638d5f1988b686f3b3ea8cd7de5f244ca147c777769e798a9cd1", size = 1915040, upload-time = "2025-11-04T13:41:00.853Z" },
+    { url = "https://files.pythonhosted.org/packages/84/a3/15a82ac7bd97992a82257f777b3583d3e84bdb06ba6858f745daa2ec8a85/pydantic_core-2.41.5-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:506d766a8727beef16b7adaeb8ee6217c64fc813646b424d0804d67c16eddb66", size = 2063691, upload-time = "2025-11-04T13:41:03.504Z" },
+    { url = "https://files.pythonhosted.org/packages/74/9b/0046701313c6ef08c0c1cf0e028c67c770a4e1275ca73131563c5f2a310a/pydantic_core-2.41.5-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4819fa52133c9aa3c387b3328f25c1facc356491e6135b459f1de698ff64d869", size = 2213897, upload-time = "2025-11-04T13:41:05.804Z" },
+    { url = "https://files.pythonhosted.org/packages/8a/cd/6bac76ecd1b27e75a95ca3a9a559c643b3afcd2dd62086d4b7a32a18b169/pydantic_core-2.41.5-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2b761d210c9ea91feda40d25b4efe82a1707da2ef62901466a42492c028553a2", size = 2333302, upload-time = "2025-11-04T13:41:07.809Z" },
+    { url = "https://files.pythonhosted.org/packages/4c/d2/ef2074dc020dd6e109611a8be4449b98cd25e1b9b8a303c2f0fca2f2bcf7/pydantic_core-2.41.5-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:22f0fb8c1c583a3b6f24df2470833b40207e907b90c928cc8d3594b76f874375", size = 2064877, upload-time = "2025-11-04T13:41:09.827Z" },
+    { url = "https://files.pythonhosted.org/packages/18/66/e9db17a9a763d72f03de903883c057b2592c09509ccfe468187f2a2eef29/pydantic_core-2.41.5-cp314-cp314-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:2782c870e99878c634505236d81e5443092fba820f0373997ff75f90f68cd553", size = 2180680, upload-time = "2025-11-04T13:41:12.379Z" },
+    { url = "https://files.pythonhosted.org/packages/d3/9e/3ce66cebb929f3ced22be85d4c2399b8e85b622db77dad36b73c5387f8f8/pydantic_core-2.41.5-cp314-cp314-musllinux_1_1_aarch64.whl", hash = "sha256:0177272f88ab8312479336e1d777f6b124537d47f2123f89cb37e0accea97f90", size = 2138960, upload-time = "2025-11-04T13:41:14.627Z" },
+    { url = "https://files.pythonhosted.org/packages/a6/62/205a998f4327d2079326b01abee48e502ea739d174f0a89295c481a2272e/pydantic_core-2.41.5-cp314-cp314-musllinux_1_1_armv7l.whl", hash = "sha256:63510af5e38f8955b8ee5687740d6ebf7c2a0886d15a6d65c32814613681bc07", size = 2339102, upload-time = "2025-11-04T13:41:16.868Z" },
+    { url = "https://files.pythonhosted.org/packages/3c/0d/f05e79471e889d74d3d88f5bd20d0ed189ad94c2423d81ff8d0000aab4ff/pydantic_core-2.41.5-cp314-cp314-musllinux_1_1_x86_64.whl", hash = "sha256:e56ba91f47764cc14f1daacd723e3e82d1a89d783f0f5afe9c364b8bb491ccdb", size = 2326039, upload-time = "2025-11-04T13:41:18.934Z" },
+    { url = "https://files.pythonhosted.org/packages/ec/e1/e08a6208bb100da7e0c4b288eed624a703f4d129bde2da475721a80cab32/pydantic_core-2.41.5-cp314-cp314-win32.whl", hash = "sha256:aec5cf2fd867b4ff45b9959f8b20ea3993fc93e63c7363fe6851424c8a7e7c23", size = 1995126, upload-time = "2025-11-04T13:41:21.418Z" },
+    { url = "https://files.pythonhosted.org/packages/48/5d/56ba7b24e9557f99c9237e29f5c09913c81eeb2f3217e40e922353668092/pydantic_core-2.41.5-cp314-cp314-win_amd64.whl", hash = "sha256:8e7c86f27c585ef37c35e56a96363ab8de4e549a95512445b85c96d3e2f7c1bf", size = 2015489, upload-time = "2025-11-04T13:41:24.076Z" },
+    { url = "https://files.pythonhosted.org/packages/4e/bb/f7a190991ec9e3e0ba22e4993d8755bbc4a32925c0b5b42775c03e8148f9/pydantic_core-2.41.5-cp314-cp314-win_arm64.whl", hash = "sha256:e672ba74fbc2dc8eea59fb6d4aed6845e6905fc2a8afe93175d94a83ba2a01a0", size = 1977288, upload-time = "2025-11-04T13:41:26.33Z" },
+    { url = "https://files.pythonhosted.org/packages/92/ed/77542d0c51538e32e15afe7899d79efce4b81eee631d99850edc2f5e9349/pydantic_core-2.41.5-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:8566def80554c3faa0e65ac30ab0932b9e3a5cd7f8323764303d468e5c37595a", size = 2120255, upload-time = "2025-11-04T13:41:28.569Z" },
+    { url = "https://files.pythonhosted.org/packages/bb/3d/6913dde84d5be21e284439676168b28d8bbba5600d838b9dca99de0fad71/pydantic_core-2.41.5-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:b80aa5095cd3109962a298ce14110ae16b8c1aece8b72f9dafe81cf597ad80b3", size = 1863760, upload-time = "2025-11-04T13:41:31.055Z" },
+    { url = "https://files.pythonhosted.org/packages/5a/f0/e5e6b99d4191da102f2b0eb9687aaa7f5bea5d9964071a84effc3e40f997/pydantic_core-2.41.5-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3006c3dd9ba34b0c094c544c6006cc79e87d8612999f1a5d43b769b89181f23c", size = 1878092, upload-time = "2025-11-04T13:41:33.21Z" },
+    { url = "https://files.pythonhosted.org/packages/71/48/36fb760642d568925953bcc8116455513d6e34c4beaa37544118c36aba6d/pydantic_core-2.41.5-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:72f6c8b11857a856bcfa48c86f5368439f74453563f951e473514579d44aa612", size = 2053385, upload-time = "2025-11-04T13:41:35.508Z" },
+    { url = "https://files.pythonhosted.org/packages/20/25/92dc684dd8eb75a234bc1c764b4210cf2646479d54b47bf46061657292a8/pydantic_core-2.41.5-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5cb1b2f9742240e4bb26b652a5aeb840aa4b417c7748b6f8387927bc6e45e40d", size = 2218832, upload-time = "2025-11-04T13:41:37.732Z" },
+    { url = "https://files.pythonhosted.org/packages/e2/09/f53e0b05023d3e30357d82eb35835d0f6340ca344720a4599cd663dca599/pydantic_core-2.41.5-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:bd3d54f38609ff308209bd43acea66061494157703364ae40c951f83ba99a1a9", size = 2327585, upload-time = "2025-11-04T13:41:40Z" },
+    { url = "https://files.pythonhosted.org/packages/aa/4e/2ae1aa85d6af35a39b236b1b1641de73f5a6ac4d5a7509f77b814885760c/pydantic_core-2.41.5-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2ff4321e56e879ee8d2a879501c8e469414d948f4aba74a2d4593184eb326660", size = 2041078, upload-time = "2025-11-04T13:41:42.323Z" },
+    { url = "https://files.pythonhosted.org/packages/cd/13/2e215f17f0ef326fc72afe94776edb77525142c693767fc347ed6288728d/pydantic_core-2.41.5-cp314-cp314t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:d0d2568a8c11bf8225044aa94409e21da0cb09dcdafe9ecd10250b2baad531a9", size = 2173914, upload-time = "2025-11-04T13:41:45.221Z" },
+    { url = "https://files.pythonhosted.org/packages/02/7a/f999a6dcbcd0e5660bc348a3991c8915ce6599f4f2c6ac22f01d7a10816c/pydantic_core-2.41.5-cp314-cp314t-musllinux_1_1_aarch64.whl", hash = "sha256:a39455728aabd58ceabb03c90e12f71fd30fa69615760a075b9fec596456ccc3", size = 2129560, upload-time = "2025-11-04T13:41:47.474Z" },
+    { url = "https://files.pythonhosted.org/packages/3a/b1/6c990ac65e3b4c079a4fb9f5b05f5b013afa0f4ed6780a3dd236d2cbdc64/pydantic_core-2.41.5-cp314-cp314t-musllinux_1_1_armv7l.whl", hash = "sha256:239edca560d05757817c13dc17c50766136d21f7cd0fac50295499ae24f90fdf", size = 2329244, upload-time = "2025-11-04T13:41:49.992Z" },
+    { url = "https://files.pythonhosted.org/packages/d9/02/3c562f3a51afd4d88fff8dffb1771b30cfdfd79befd9883ee094f5b6c0d8/pydantic_core-2.41.5-cp314-cp314t-musllinux_1_1_x86_64.whl", hash = "sha256:2a5e06546e19f24c6a96a129142a75cee553cc018ffee48a460059b1185f4470", size = 2331955, upload-time = "2025-11-04T13:41:54.079Z" },
+    { url = "https://files.pythonhosted.org/packages/5c/96/5fb7d8c3c17bc8c62fdb031c47d77a1af698f1d7a406b0f79aaa1338f9ad/pydantic_core-2.41.5-cp314-cp314t-win32.whl", hash = "sha256:b4ececa40ac28afa90871c2cc2b9ffd2ff0bf749380fbdf57d165fd23da353aa", size = 1988906, upload-time = "2025-11-04T13:41:56.606Z" },
+    { url = "https://files.pythonhosted.org/packages/22/ed/182129d83032702912c2e2d8bbe33c036f342cc735737064668585dac28f/pydantic_core-2.41.5-cp314-cp314t-win_amd64.whl", hash = "sha256:80aa89cad80b32a912a65332f64a4450ed00966111b6615ca6816153d3585a8c", size = 1981607, upload-time = "2025-11-04T13:41:58.889Z" },
+    { url = "https://files.pythonhosted.org/packages/9f/ed/068e41660b832bb0b1aa5b58011dea2a3fe0ba7861ff38c4d4904c1c1a99/pydantic_core-2.41.5-cp314-cp314t-win_arm64.whl", hash = "sha256:35b44f37a3199f771c3eaa53051bc8a70cd7b54f333531c59e29fd4db5d15008", size = 1974769, upload-time = "2025-11-04T13:42:01.186Z" },
+    { url = "https://files.pythonhosted.org/packages/09/32/59b0c7e63e277fa7911c2fc70ccfb45ce4b98991e7ef37110663437005af/pydantic_core-2.41.5-graalpy312-graalpy250_312_native-macosx_10_12_x86_64.whl", hash = "sha256:7da7087d756b19037bc2c06edc6c170eeef3c3bafcb8f532ff17d64dc427adfd", size = 2110495, upload-time = "2025-11-04T13:42:49.689Z" },
+    { url = "https://files.pythonhosted.org/packages/aa/81/05e400037eaf55ad400bcd318c05bb345b57e708887f07ddb2d20e3f0e98/pydantic_core-2.41.5-graalpy312-graalpy250_312_native-macosx_11_0_arm64.whl", hash = "sha256:aabf5777b5c8ca26f7824cb4a120a740c9588ed58df9b2d196ce92fba42ff8dc", size = 1915388, upload-time = "2025-11-04T13:42:52.215Z" },
+    { url = "https://files.pythonhosted.org/packages/6e/0d/e3549b2399f71d56476b77dbf3cf8937cec5cd70536bdc0e374a421d0599/pydantic_core-2.41.5-graalpy312-graalpy250_312_native-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c007fe8a43d43b3969e8469004e9845944f1a80e6acd47c150856bb87f230c56", size = 1942879, upload-time = "2025-11-04T13:42:56.483Z" },
+    { url = "https://files.pythonhosted.org/packages/f7/07/34573da085946b6a313d7c42f82f16e8920bfd730665de2d11c0c37a74b5/pydantic_core-2.41.5-graalpy312-graalpy250_312_native-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:76d0819de158cd855d1cbb8fcafdf6f5cf1eb8e470abe056d5d161106e38062b", size = 2139017, upload-time = "2025-11-04T13:42:59.471Z" },
+]
+
+[[package]]
+name = "pydantic-extra-types"
+version = "2.11.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "pydantic" },
+    { name = "typing-extensions" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/66/71/dba38ee2651f84f7842206adbd2233d8bbdb59fb85e9fa14232486a8c471/pydantic_extra_types-2.11.1.tar.gz", hash = "sha256:46792d2307383859e923d8fcefa82108b1a141f8a9c0198982b3832ab5ef1049", size = 172002, upload-time = "2026-03-16T08:08:03.92Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/17/c1/3226e6d7f5a4f736f38ac11a6fbb262d701889802595cdb0f53a885ac2e0/pydantic_extra_types-2.11.1-py3-none-any.whl", hash = "sha256:1722ea2bddae5628ace25f2aa685b69978ef533123e5638cfbddb999e0100ec1", size = 79526, upload-time = "2026-03-16T08:08:02.533Z" },
+]
+
+[[package]]
+name = "pydantic-graph"
+version = "1.85.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "httpx" },
+    { name = "logfire-api" },
+    { name = "pydantic" },
+    { name = "typing-inspection" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/5e/bf/dcdcafe71411a8a31fbce0e546186f2706a44ffd4c57afe021f00bda27f3/pydantic_graph-1.85.1.tar.gz", hash = "sha256:4cfd3feb2ce7d6f5f604034e432697567551458d3c29d755221d9288336cfdfd", size = 59244, upload-time = "2026-04-22T00:08:26.378Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/0f/49/71b66c79df6ffbf3a340a33602ce44873548f589548d5fb5d8873b870f05/pydantic_graph-1.85.1-py3-none-any.whl", hash = "sha256:515bee899bbfbf00911e32db941c69f2a72bc8fff56ea03a99fa10cd0fa5c436", size = 73066, upload-time = "2026-04-22T00:08:19.025Z" },
+]
+
+[[package]]
+name = "pydantic-settings"
+version = "2.14.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "pydantic" },
+    { name = "python-dotenv" },
+    { name = "typing-inspection" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/42/98/c8345dccdc31de4228c039a98f6467a941e39558da41c1744fbe29fa5666/pydantic_settings-2.14.0.tar.gz", hash = "sha256:24285fd4b0e0c06507dd9fdfd331ee23794305352aaec8fc4eb92d4047aeb67d", size = 235709, upload-time = "2026-04-20T13:37:40.293Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/01/dd/bebff3040138f00ae8a102d426b27349b9a49acc310fcae7f92112d867e3/pydantic_settings-2.14.0-py3-none-any.whl", hash = "sha256:fc8d5d692eb7092e43c8647c1c35a3ecd00e040fcf02ed86f4cb5458ca62182e", size = 60940, upload-time = "2026-04-20T13:37:38.586Z" },
+]
+
+[[package]]
+name = "pygments"
+version = "2.20.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/c3/b2/bc9c9196916376152d655522fdcebac55e66de6603a76a02bca1b6414f6c/pygments-2.20.0.tar.gz", hash = "sha256:6757cd03768053ff99f3039c1a36d6c0aa0b263438fcab17520b30a303a82b5f", size = 4955991, upload-time = "2026-03-29T13:29:33.898Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/f4/7e/a72dd26f3b0f4f2bf1dd8923c85f7ceb43172af56d63c7383eb62b332364/pygments-2.20.0-py3-none-any.whl", hash = "sha256:81a9e26dd42fd28a23a2d169d86d7ac03b46e2f8b59ed4698fb4785f946d0176", size = 1231151, upload-time = "2026-03-29T13:29:30.038Z" },
+]
+
+[[package]]
+name = "pymdown-extensions"
+version = "10.21.2"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "markdown" },
+    { name = "pyyaml" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/df/08/f1c908c581fd11913da4711ea7ba32c0eee40b0190000996bb863b0c9349/pymdown_extensions-10.21.2.tar.gz", hash = "sha256:c3f55a5b8a1d0edf6699e35dcbea71d978d34ff3fa79f3d807b8a5b3fa90fbdc", size = 853922, upload-time = "2026-03-29T15:01:55.233Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/f7/27/a2fc51a4a122dfd1015e921ae9d22fee3d20b0b8080d9a704578bf9deece/pymdown_extensions-10.21.2-py3-none-any.whl", hash = "sha256:5c0fd2a2bea14eb39af8ff284f1066d898ab2187d81b889b75d46d4348c01638", size = 268901, upload-time = "2026-03-29T15:01:53.244Z" },
+]
+
+[[package]]
+name = "pypandoc"
+version = "1.17"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/ea/d6/410615fc433e5d1eacc00db2044ae2a9c82302df0d35366fe2bd15de024d/pypandoc-1.17.tar.gz", hash = "sha256:51179abfd6e582a25ed03477541b48836b5bba5a4c3b282a547630793934d799", size = 69071, upload-time = "2026-03-14T22:39:07.21Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/0c/86/e2ffa604eacfbec3f430b1d850e7e04c4101eca1a5828f9ae54bf51dfba4/pypandoc-1.17-py3-none-any.whl", hash = "sha256:01fdbffa61edb9f8e82e8faad6954efcb7b6f8f0634aead4d89e322a00225a67", size = 23554, upload-time = "2026-03-14T22:38:46.007Z" },
+]
+
+[[package]]
+name = "pypandoc-binary"
+version = "1.17"
+source = { registry = "https://pypi.org/simple" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/80/85/681a54111f0948821a5cf87ce30a88bb0a3f6848af5112c912abac4a2b77/pypandoc_binary-1.17-py3-none-macosx_10_9_x86_64.whl", hash = "sha256:734726dc618ef276343e272e1a6b4567e59c2ef9ef41d5533042deac3b0531f1", size = 25553945, upload-time = "2026-03-14T22:38:47.91Z" },
+    { url = "https://files.pythonhosted.org/packages/15/58/8fd107c68522957868c1e785fbea7595608df118e440e424d189668294df/pypandoc_binary-1.17-py3-none-macosx_11_0_arm64.whl", hash = "sha256:fcfd28f347ed998dda28823fc6bc24f9310e7fdf3ddceaf925bf0563a100ab5b", size = 25553944, upload-time = "2026-03-14T22:38:50.74Z" },
+    { url = "https://files.pythonhosted.org/packages/f4/27/ac1078239aae14b94c51975b7f46ad8e099e47d7ae26c175a5486b1c0099/pypandoc_binary-1.17-py3-none-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:d6b620b21c9374e3e48aabd518492bf0776b148442ee28816f6aaf52da3d4387", size = 34460960, upload-time = "2026-03-14T22:38:53.391Z" },
+    { url = "https://files.pythonhosted.org/packages/8d/7f/1e5612b52900ebe590862dabeadf546f739b27527dcd8bfd632f8adac1be/pypandoc_binary-1.17-py3-none-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9ada156cb980cd54fd6534231788e668c00dbb591cbd24f0be0bd86812eb8788", size = 36867598, upload-time = "2026-03-14T22:38:56.351Z" },
+    { url = "https://files.pythonhosted.org/packages/3b/31/a5a867159c4080e5d368f4a53540a727501a2f31affc297dc8e0fced96a7/pypandoc_binary-1.17-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:2f439dcd211183bb3460253ca4511101df6e1acf4a01f45f5617e1fa2ad24279", size = 36867584, upload-time = "2026-03-14T22:38:59.087Z" },
+    { url = "https://files.pythonhosted.org/packages/0d/2d/6a51cd4e54bdf132c19416801077c34bd40ba182e85d843360d36ae03a2d/pypandoc_binary-1.17-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:f6e6d3e4cfafbe23189a08db3d41f8def260bacd6e7e382bceadab7ba1f17da6", size = 34460949, upload-time = "2026-03-14T22:39:01.71Z" },
+    { url = "https://files.pythonhosted.org/packages/c6/b9/f47b77ba75ed5d47ec85fcc2ecfbf7f78e3a73347f3a09836634d930de98/pypandoc_binary-1.17-py3-none-win_amd64.whl", hash = "sha256:76fae066cd2d7e78fb97f0ec8e9e36f437b07187b689b0b415ca18216f8f898a", size = 40891661, upload-time = "2026-03-14T22:39:04.782Z" },
+]
+
+[[package]]
+name = "pypdf"
+version = "6.10.2"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/7b/3f/9f2167401c2e94833ca3b69535bad89e533b5de75fefe4197a2c224baec2/pypdf-6.10.2.tar.gz", hash = "sha256:7d09ce108eff6bf67465d461b6ef352dcb8d84f7a91befc02f904455c6eea11d", size = 5315679, upload-time = "2026-04-15T16:37:36.978Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/0c/d6/1d5c60cc17bbdf37c1552d9c03862fc6d32c5836732a0415b2d637edc2d0/pypdf-6.10.2-py3-none-any.whl", hash = "sha256:aa53be9826655b51c96741e5d7983ca224d898ac0a77896e64636810517624aa", size = 336308, upload-time = "2026-04-15T16:37:34.851Z" },
+]
+
+[[package]]
+name = "pypdfium2"
+version = "5.7.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/bc/13/ee794b8a810b7226426c8b50d6c28637c059e7da0caf9936164f352ef858/pypdfium2-5.7.1.tar.gz", hash = "sha256:3b3b20a56048dbe3fd4bf397f9bec854c834668bc47ef6a7d9041b23bb04317b", size = 266791, upload-time = "2026-04-20T15:01:02.598Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/d6/f7/e87ba0eec9cd4e9eedd4bbb867515da970525ca8c105dd5e254758216ee3/pypdfium2-5.7.1-py3-none-android_23_arm64_v8a.whl", hash = "sha256:8008f45e8adc4fc1ec2a51e018e01cd0692d4859bdbb28e88be221804f329468", size = 3367033, upload-time = "2026-04-20T15:00:22.847Z" },
+    { url = "https://files.pythonhosted.org/packages/f6/e1/a4b9be9a09fa9857958357ced51afb25518f6a48e4e68fdc9a091f0f2259/pypdfium2-5.7.1-py3-none-android_23_armeabi_v7a.whl", hash = "sha256:892fcb5a618f5f551fffdb968ac2d64911953c3ba0f9aa628239705af68dbe15", size = 2824449, upload-time = "2026-04-20T15:00:24.913Z" },
+    { url = "https://files.pythonhosted.org/packages/7b/5d/c91abb2610316a1622f86ddf706fcd04d34c7e6923c3fa8fa145c8f7a372/pypdfium2-5.7.1-py3-none-macosx_11_0_arm64.whl", hash = "sha256:7431847d45dedc3c7ffede15b58ac611e996a0cdcd61318a0190d46b9980ac2b", size = 3443730, upload-time = "2026-04-20T15:00:26.664Z" },
+    { url = "https://files.pythonhosted.org/packages/50/8b/b9eefed83d6a0a59384ee64d25c1515e831c234c3ed6b8c6dfc8f99f4875/pypdfium2-5.7.1-py3-none-macosx_11_0_x86_64.whl", hash = "sha256:548bd09c9f97565ae8ddba30bb65823cbf791b84e4cdb63ed582aec2c289dbe2", size = 3626483, upload-time = "2026-04-20T15:00:28.629Z" },
+    { url = "https://files.pythonhosted.org/packages/5b/98/6d62723e1f58d66e7e0073c4f12048f9d5dcd478369da0990db08e677dd5/pypdfium2-5.7.1-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:18a15ad0918acc3ea98778394f0331b9ad2a1b7384ab3d8d8c63422ffd01ed13", size = 3610098, upload-time = "2026-04-20T15:00:30.344Z" },
+    { url = "https://files.pythonhosted.org/packages/0b/4a/f72b42578f30971c29915e33ee598ed451aa6f0c2808a71526c1b81afd8d/pypdfium2-5.7.1-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:1df04564659d807fb38810d9bd1ac18419d8acbb5f87f2cb20675d7332635b18", size = 3340119, upload-time = "2026-04-20T15:00:32.19Z" },
+    { url = "https://files.pythonhosted.org/packages/0d/64/de69c5feed470617f243e61cac841bfd1b5273d575c3d3b49b27f738e334/pypdfium2-5.7.1-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5a146d036a6b085a406aa256548b827b63016714fd77f8e11b7f704c1175e8cc", size = 3738864, upload-time = "2026-04-20T15:00:33.798Z" },
+    { url = "https://files.pythonhosted.org/packages/07/ce/69ff10766565c5ffcb66cebe780ce3bc4fe7cc16b218df8c240075881c66/pypdfium2-5.7.1-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3397b0d705b6858c87dec1dc9c44d4c7094601a9b231097f441b64d1a7d5ff0b", size = 4169839, upload-time = "2026-04-20T15:00:35.973Z" },
+    { url = "https://files.pythonhosted.org/packages/03/4b/fff16a831a6f07aad02da0d02b620c455310b8bf4e2642909175dcb7ccae/pypdfium2-5.7.1-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fc2cdf603ac766b91b7c1b455197ec1c3471089d75f999b046edb65ed6cedd80", size = 3657630, upload-time = "2026-04-20T15:00:38.407Z" },
+    { url = "https://files.pythonhosted.org/packages/9b/58/d3148917616164cfad347b0b509342737ed80e060afab07523ffeac2a05f/pypdfium2-5.7.1-py3-none-manylinux_2_27_s390x.manylinux_2_28_s390x.whl", hash = "sha256:1b1a6a5f3320b59138e7570a3f78840540383d058ac180a9a21f924ad3bd7f83", size = 3088898, upload-time = "2026-04-20T15:00:40.109Z" },
+    { url = "https://files.pythonhosted.org/packages/e4/1d/387ca4dfe9865a8d61114dae2debba4d86eed07cdc6a31c5527a049583be/pypdfium2-5.7.1-py3-none-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:91b809c40a5fc248107d13fbcf1dd2c64dbc8e572693a9b93e350bf31efda92b", size = 2955404, upload-time = "2026-04-20T15:00:41.921Z" },
+    { url = "https://files.pythonhosted.org/packages/ad/87/4afc2bfe35d71942f1bf9e774086f74af66a0a4e56338f39a7cbc5b8721c/pypdfium2-5.7.1-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:85611ef61cbc0f5e04de8f99fec0f3db3920b09f46c62afa08c9caa21a74b353", size = 4126600, upload-time = "2026-04-20T15:00:44.079Z" },
+    { url = "https://files.pythonhosted.org/packages/b1/c4/872eef4cb8f0d8ebbf967ca713254ac71c75878a1d5798bc2b8d23104e52/pypdfium2-5.7.1-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:b2764ab909f9b444d4e643be90b064c4053e6828c28bfd47639fc84526ba244d", size = 3742636, upload-time = "2026-04-20T15:00:46.009Z" },
+    { url = "https://files.pythonhosted.org/packages/10/6d/3805a53623a72e20b68e6814b37582994298b231628656ff227fa1158a1f/pypdfium2-5.7.1-py3-none-musllinux_1_2_i686.whl", hash = "sha256:fcea3cc20b7cca7d84ceee68b9c6ef7fe773fb71c145542769dc2ceb27e9698a", size = 4332743, upload-time = "2026-04-20T15:00:47.829Z" },
+    { url = "https://files.pythonhosted.org/packages/92/61/3e3f8ae7ad04400bc3c6a75bbf59db500eaf9dff05477d1b25ff4a36363b/pypdfium2-5.7.1-py3-none-musllinux_1_2_ppc64le.whl", hash = "sha256:f04546bc314973397148805d44f8e660e81aa80c2a87e12afb892c11493ded6c", size = 4377471, upload-time = "2026-04-20T15:00:49.443Z" },
+    { url = "https://files.pythonhosted.org/packages/8d/e0/1026f297b5be292cae7095aa4814d57faa3faba0b49552afcaa11a1c2e4e/pypdfium2-5.7.1-py3-none-musllinux_1_2_riscv64.whl", hash = "sha256:66275c8a854969bdf905abc7599e5623d62739c44604d69788ff5457082d275b", size = 3919215, upload-time = "2026-04-20T15:00:51.2Z" },
+    { url = "https://files.pythonhosted.org/packages/e8/5d/7d6d5b392fa42a997aadf127e3b2c25739199141054b33f759ba5d02e653/pypdfium2-5.7.1-py3-none-musllinux_1_2_s390x.whl", hash = "sha256:bbed8f32040ce3b3236a512265976017c2465ea6643a1730f008b39e0339b8ce", size = 4263089, upload-time = "2026-04-20T15:00:53.105Z" },
+    { url = "https://files.pythonhosted.org/packages/2e/b8/d51bd4a1d426fa5b99d4516c77cc1892a8fbfd5a93a823e2679cf9b09ee0/pypdfium2-5.7.1-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:c55d3df09bd0d72a1d192107dcbf80bcb2791662a3eca3b084001f947d3040d5", size = 4175967, upload-time = "2026-04-20T15:00:54.757Z" },
+    { url = "https://files.pythonhosted.org/packages/30/52/06a6358856374ae4400ee1ad0ddaa01d5c31fcd6e8f4577e6a3ed1c40343/pypdfium2-5.7.1-py3-none-win32.whl", hash = "sha256:4f6bbe1211c5883c8fc9ce11008347e5b96ec6571456d959ae289cecdb2867f0", size = 3629154, upload-time = "2026-04-20T15:00:56.916Z" },
+    { url = "https://files.pythonhosted.org/packages/6f/13/e0dbc9377d976d8b03ed0dd07fe9892e06d09fcf4f6a0e66df49366227d7/pypdfium2-5.7.1-py3-none-win_amd64.whl", hash = "sha256:fdf117af26bd310f4f176b3cf0e2e23f0f800e48dcf2bcf6c2cca0de3326f5cb", size = 3747295, upload-time = "2026-04-20T15:00:59.15Z" },
+    { url = "https://files.pythonhosted.org/packages/bc/67/4759522f5bca0ac4cda9f42c7f3f818aa826568793bd8b4532d2d2ffa515/pypdfium2-5.7.1-py3-none-win_arm64.whl", hash = "sha256:622821698fcc30fc560bd4eead6df9e6b846de9876b82861bed0091c09a4c27b", size = 3540903, upload-time = "2026-04-20T15:01:00.994Z" },
+]
+
+[[package]]
+name = "pytest"
+version = "9.0.3"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "colorama", marker = "sys_platform == 'win32'" },
+    { name = "iniconfig" },
+    { name = "packaging" },
+    { name = "pluggy" },
+    { name = "pygments" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/7d/0d/549bd94f1a0a402dc8cf64563a117c0f3765662e2e668477624baeec44d5/pytest-9.0.3.tar.gz", hash = "sha256:b86ada508af81d19edeb213c681b1d48246c1a91d304c6c81a427674c17eb91c", size = 1572165, upload-time = "2026-04-07T17:16:18.027Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/d4/24/a372aaf5c9b7208e7112038812994107bc65a84cd00e0354a88c2c77a617/pytest-9.0.3-py3-none-any.whl", hash = "sha256:2c5efc453d45394fdd706ade797c0a81091eccd1d6e4bccfcd476e2b8e0ab5d9", size = 375249, upload-time = "2026-04-07T17:16:16.13Z" },
+]
+
+[[package]]
+name = "pytest-examples"
+version = "0.0.18"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "black" },
+    { name = "pytest" },
+    { name = "ruff" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/af/71/4ae972fd95f474454aa450108ee1037830e7ba11840363e981b8d48fd16a/pytest_examples-0.0.18.tar.gz", hash = "sha256:9a464f007f805b113677a15e2f8942ebb92d7d3eb5312e9a405d018478ec9801", size = 21237, upload-time = "2025-05-06T07:46:10.705Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/09/52/7bbfb6e987d9a8a945f22941a8da63e3529465f1b106ef0e26f5df7c780d/pytest_examples-0.0.18-py3-none-any.whl", hash = "sha256:86c195b98c4e55049a0df3a0a990ca89123b7280473ab57608eecc6c47bcfe9c", size = 18169, upload-time = "2025-05-06T07:46:09.349Z" },
+]
+
+[[package]]
+name = "pytest-mock"
+version = "3.15.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "pytest" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/68/14/eb014d26be205d38ad5ad20d9a80f7d201472e08167f0bb4361e251084a9/pytest_mock-3.15.1.tar.gz", hash = "sha256:1849a238f6f396da19762269de72cb1814ab44416fa73a8686deac10b0d87a0f", size = 34036, upload-time = "2025-09-16T16:37:27.081Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/5a/cc/06253936f4a7fa2e0f48dfe6d851d9c56df896a9ab09ac019d70b760619c/pytest_mock-3.15.1-py3-none-any.whl", hash = "sha256:0a25e2eb88fe5168d535041d09a4529a188176ae608a6d249ee65abc0949630d", size = 10095, upload-time = "2025-09-16T16:37:25.734Z" },
+]
+
+[[package]]
+name = "python-calamine"
+version = "0.6.2"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/01/18/e1e53ade001b30a3c6642d876e5defe8431da8c31fb7798909e6c8ab8c34/python_calamine-0.6.2.tar.gz", hash = "sha256:2c90e5224c5e92db9fcd8f22b6085ce63b935cfe7a893ac9a1c3c56793bafd9d", size = 138000, upload-time = "2026-02-18T13:38:17.389Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/7a/ec/e111c1a3a4c138ebc41e416e33730ee6d7c54e714af21c2a4e59b41715a5/python_calamine-0.6.2-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:857e4cddadba9b55c76dc583c58c5dc101a6cd5320190c10f8b2ab98d66c9040", size = 879539, upload-time = "2026-02-18T13:36:21.674Z" },
+    { url = "https://files.pythonhosted.org/packages/53/26/fe4c2138ff21542e2f1130a4d83c330d7f9486b62775196e998b88a03de6/python_calamine-0.6.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:cd89d6a53e4b22328cd685fc054c31d359cb3ae67bd24bc57e1c1db62a4cfc97", size = 858642, upload-time = "2026-02-18T13:36:23.847Z" },
+    { url = "https://files.pythonhosted.org/packages/6a/b0/bfeaf45ac5e2f6553723dd2fbe127d1d17c6f26496db5781de42a933776a/python_calamine-0.6.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4d6c9af39db39e0c70710ae79cd1b5d980f9c0aea55fc16d194460c1561a0c6a", size = 925242, upload-time = "2026-02-18T13:36:25.236Z" },
+    { url = "https://files.pythonhosted.org/packages/fe/6e/81106aa80609075015d400584030605b05f5e12931717160dcc58fdc4980/python_calamine-0.6.2-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:9a2382dbc410dd48c99d89ee460662cc70892fe1b2901ab982604b923e8eb8f6", size = 905295, upload-time = "2026-02-18T13:36:27.152Z" },
+    { url = "https://files.pythonhosted.org/packages/4d/ba/6311b24f9889246be63b664630c5601039ef771f7ed04c8f51aace39b7a9/python_calamine-0.6.2-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3ebb93255709874ede5b5e62828cb5758e60097e5390b6c9a3eb7751b617b12e", size = 1063473, upload-time = "2026-02-18T13:36:29.226Z" },
+    { url = "https://files.pythonhosted.org/packages/23/e4/027a1b046d30768872307ebe808dc4cdc5357295cdcda98b30b3ea924904/python_calamine-0.6.2-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:837bca19bd945cb83aded433f4cf76e80d70a5400404d876400ca7e88e5ea311", size = 965355, upload-time = "2026-02-18T13:36:31.376Z" },
+    { url = "https://files.pythonhosted.org/packages/5c/4d/da8716a1b3a66938aaabe36873f6fa210fa063bab1b20c2ec236013de6b3/python_calamine-0.6.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:723990a47668cb819f307ccc634741370d3cd3804a0ee8cda392a522ae6d5016", size = 935091, upload-time = "2026-02-18T13:36:32.777Z" },
+    { url = "https://files.pythonhosted.org/packages/36/40/9521e8da5496cbc4b18027626a40018301f546b3e9802ca2f3a6cb5b4739/python_calamine-0.6.2-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b067630d693e1d7de41e3d44a99c7dd3feebb52db8dda8636ac3f70d8b6a4ad6", size = 974070, upload-time = "2026-02-18T13:36:34.055Z" },
+    { url = "https://files.pythonhosted.org/packages/cd/b0/7a63963512c5ba7e9539b7452e2b1561625e63e4e29c044e487e2e93dcbe/python_calamine-0.6.2-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:6ab09c9da53a2b33633e9f940aed11c08e083810a0fd6885826cdc52ba4f86a5", size = 1100321, upload-time = "2026-02-18T13:36:35.475Z" },
+    { url = "https://files.pythonhosted.org/packages/22/81/e2bc38a5cf9629f656adcdabe8e134028f60c236e4bb96375dda90db3fdd/python_calamine-0.6.2-cp312-cp312-musllinux_1_1_armv7l.whl", hash = "sha256:ae08e1308a0d0c6b8b4cc0a039ed8a85fc9ee2f8a3ca9ea57b1af9f97ed68fe4", size = 1181039, upload-time = "2026-02-18T13:36:37.195Z" },
+    { url = "https://files.pythonhosted.org/packages/b1/ea/513117015fd5903ca6dde9c8fb8502af60af6965642f4e3311623943e673/python_calamine-0.6.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:c441a20c7aff0e904ca01b5cdc1e5be2c6d4a41a24a0ea4d5ea6d211343bb95f", size = 1144843, upload-time = "2026-02-18T13:36:38.393Z" },
+    { url = "https://files.pythonhosted.org/packages/a2/14/8846478dacf31535f5f15448ade3bc688b51f3183f1b52844451aa27b0e6/python_calamine-0.6.2-cp312-cp312-win32.whl", hash = "sha256:39cae8e66f8bce499f5f965f4575ddf61e30184cc97f02e1c7031a57abe0903b", size = 692411, upload-time = "2026-02-18T13:36:39.741Z" },
+    { url = "https://files.pythonhosted.org/packages/bb/e2/2d2dcf4ec7e5ec08e33bf966ab010a7be178a4b623bd5f7601d47f2c734c/python_calamine-0.6.2-cp312-cp312-win_amd64.whl", hash = "sha256:1617efa24532f2420934a8cf77e6d33ff1740cae1d39355cab4f4cf141fdab49", size = 748960, upload-time = "2026-02-18T13:36:40.922Z" },
+    { url = "https://files.pythonhosted.org/packages/f1/eb/2f50f3395c0435e6186cab56c36d04c06581ba827264bca1f1acae523aa3/python_calamine-0.6.2-cp312-cp312-win_arm64.whl", hash = "sha256:c2b378db494740e540e8157a7e5fe61dadae69ad2d988a7c80f9583f434acf07", size = 718992, upload-time = "2026-02-18T13:36:42.671Z" },
+    { url = "https://files.pythonhosted.org/packages/15/db/f409c3ffa5d452b8184978c94440b48c933c79232c5e40fe9ce3608ff06d/python_calamine-0.6.2-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:4c6e68c233841604fa3f63899d13bd2e47cddf0787c4b4b8188f74c3be452045", size = 878907, upload-time = "2026-02-18T13:36:44.039Z" },
+    { url = "https://files.pythonhosted.org/packages/66/fe/8cf4309a00ad5628c45e69f13352d6a1e0e0a3148a2fc28d7a43a8cefec9/python_calamine-0.6.2-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:0fd5bcbd904d05f8b9f127a93706fdbb0a5934efdc9677b402a82d91e6e3f920", size = 858314, upload-time = "2026-02-18T13:36:45.28Z" },
+    { url = "https://files.pythonhosted.org/packages/b8/cc/c5edfb89a99d19c66b029e2e6dc0db052709888753fc0a771bf28343c5e5/python_calamine-0.6.2-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cef6454aa1b3b2137d7a202c9f84b87dffdd187ff218f2cee459480c102c20a3", size = 924748, upload-time = "2026-02-18T13:36:46.462Z" },
+    { url = "https://files.pythonhosted.org/packages/0a/bd/d0504a0e85b1588ad4ddb97f2ba003d22d9ae7cd719b82a5be2e71d97519/python_calamine-0.6.2-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:19c55c35edaf89b4d18d5d3cfaac619362f2e8339e4c876f9f0c80640d990db3", size = 903646, upload-time = "2026-02-18T13:36:47.737Z" },
+    { url = "https://files.pythonhosted.org/packages/94/1d/7cf92a77e83f62b8a106af36aa6b314f4b42abc7959787e5a746de4b0525/python_calamine-0.6.2-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d29984496a22286f511668ea6483293c0e58ac0f25916e1d88125e5e1d83313b", size = 1063499, upload-time = "2026-02-18T13:36:48.998Z" },
+    { url = "https://files.pythonhosted.org/packages/0a/2b/1d90207328fa7f8e74ce13337ae2965669e762877846dab3db8a6f90dec3/python_calamine-0.6.2-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3b0c4deabc2646c6c07abb3620088c5d6d2af26f8954726938ebcdbc6c56a8bd", size = 964671, upload-time = "2026-02-18T13:36:50.289Z" },
+    { url = "https://files.pythonhosted.org/packages/30/2a/7a58828ef14801b4efb323ad9b1ae3d2d2e82e1c5ce35502189e7a201a14/python_calamine-0.6.2-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fc536feb86c948b330c4db8a9f1d9f9094f8d70a981d04de87ece9d9b9300458", size = 935016, upload-time = "2026-02-18T13:36:51.628Z" },
+    { url = "https://files.pythonhosted.org/packages/ba/63/08c63af2d5074d96b808ad7ae4cb04a3ab59d8d6260223b4d03d99b9cf49/python_calamine-0.6.2-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:7c0f9e769c735cfb0564aefb4273c6dfeee9fbab1db69b9099cb19cfb8208ddf", size = 973549, upload-time = "2026-02-18T13:36:52.913Z" },
+    { url = "https://files.pythonhosted.org/packages/5f/91/ea25bd171222b9bab1f79e5cb923b891903afbcb19c5241528f9d87b80a9/python_calamine-0.6.2-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:e3824c211eb9505461a9820ed893cf6e39a3af8024fd1892d2cc174ce8329955", size = 1100508, upload-time = "2026-02-18T13:36:54.497Z" },
+    { url = "https://files.pythonhosted.org/packages/d5/21/79f4095e53b4935e36e9e2ed5c7d9683fb448dd9c1bba69144277df9b3a6/python_calamine-0.6.2-cp313-cp313-musllinux_1_1_armv7l.whl", hash = "sha256:8323edededa282cace538805cfa7cab30ad9dd19bca4a23215ea975c73ce9f26", size = 1177921, upload-time = "2026-02-18T13:36:56.339Z" },
+    { url = "https://files.pythonhosted.org/packages/67/02/d0328a96f2cac5cd7d13e50691207b6c06f33b22010d70d3dafde13e50fd/python_calamine-0.6.2-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:f64b93e41dd878a317f958fbf9bfa64342ef9aea58956a93a52d4b9d646a6ef4", size = 1144850, upload-time = "2026-02-18T13:36:57.812Z" },
+    { url = "https://files.pythonhosted.org/packages/28/8c/97012240a29ad22a8a2fb69097d4de52e48a05b7e6cddda9916eec439c83/python_calamine-0.6.2-cp313-cp313-win32.whl", hash = "sha256:91fbfa837aaa6f7fc72e9277678aa0c95b0c3c7df76c7c7bac4ab4a128834a70", size = 691860, upload-time = "2026-02-18T13:36:59.156Z" },
+    { url = "https://files.pythonhosted.org/packages/9e/35/f505780ba2228510412837a56bd9fb1721b021c2203afa10e25aebe67751/python_calamine-0.6.2-cp313-cp313-win_amd64.whl", hash = "sha256:0b2464e036819ecce50181220e120d674b1caac806a31e48eed2e2183acf9a69", size = 748488, upload-time = "2026-02-18T13:37:01.432Z" },
+    { url = "https://files.pythonhosted.org/packages/12/67/309ec85184f189709d238c9f2ec1b056354a8310a4eacefbfdd17b47061c/python_calamine-0.6.2-cp313-cp313-win_arm64.whl", hash = "sha256:64b1ce2bd452a9d2ae00a97e2629e3444b9669ce348e1f534f3a91f55694de15", size = 718567, upload-time = "2026-02-18T13:37:02.773Z" },
+    { url = "https://files.pythonhosted.org/packages/66/a4/0be8520de23b10d3e9179fe620e22ea7ef5f864152cd7ce322df1c9f707a/python_calamine-0.6.2-cp313-cp313t-macosx_10_12_x86_64.whl", hash = "sha256:050f0b830fcdf209826e98849432fb6ee1328895949bf7c63632fd34130cef8d", size = 877980, upload-time = "2026-02-18T13:37:03.932Z" },
+    { url = "https://files.pythonhosted.org/packages/72/92/c6f3e47f84bd9b0298f63dca7a47136121c8a180b09660728ba381eb10a4/python_calamine-0.6.2-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:f3636e14736cd2ab2377418aeb2ef8c17d1ce7e19bbbe52e445027cf43a2a745", size = 857296, upload-time = "2026-02-18T13:37:05.14Z" },
+    { url = "https://files.pythonhosted.org/packages/4b/60/bb3cc5a7bfd5618307262c1234c38a137532ac17c4c385364a6594c59d91/python_calamine-0.6.2-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f86a51485f93264679eb449dc93dc498553f449322c81936eac47ace45365e89", size = 923713, upload-time = "2026-02-18T13:37:06.333Z" },
+    { url = "https://files.pythonhosted.org/packages/20/b9/156223f20a685071223bff0f9d220511ed9012e6ba96cede417dde13abcb/python_calamine-0.6.2-cp313-cp313t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:b44fbdd11ac44dc5eecf49c1597e7234633cbc9f38c73521ce00278cf0bd8976", size = 902503, upload-time = "2026-02-18T13:37:07.696Z" },
+    { url = "https://files.pythonhosted.org/packages/fb/5b/64f62bbdaaaf7b8fec3c509038edc3cecf7f6dd8539828baf03ba45854ee/python_calamine-0.6.2-cp313-cp313t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a0d5fd48c92ae04bf8ef1f326d7ec23295545d171f4b810dc8fa08f28932900f", size = 1061675, upload-time = "2026-02-18T13:37:09.006Z" },
+    { url = "https://files.pythonhosted.org/packages/be/7e/0c440a6aac2b35328e6de7055ea20424456118e67f934ee778a79060f9f3/python_calamine-0.6.2-cp313-cp313t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:19363504d08c5c2c7aca188a5c4ded89a47cbba1cbc9a083cd230839f977c5a8", size = 962969, upload-time = "2026-02-18T13:37:10.248Z" },
+    { url = "https://files.pythonhosted.org/packages/66/25/fcbe045e5595a6bc734e6e091909b64099a69725f8335596a6493c21aa05/python_calamine-0.6.2-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:72078b550a871249c07b71fe5b94fbd30857604ff99380304d273d84a8bcd7c8", size = 934205, upload-time = "2026-02-18T13:37:11.649Z" },
+    { url = "https://files.pythonhosted.org/packages/e4/44/361972390dea31d700b8a8974510cf7d5cac0a0bc563fa1726879b801e2f/python_calamine-0.6.2-cp313-cp313t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e18e524ef1532f8269739b63ca9c6ab7dbd75e9dff20ca7e2e2d8d13c59964b2", size = 971168, upload-time = "2026-02-18T13:37:12.95Z" },
+    { url = "https://files.pythonhosted.org/packages/e7/f8/635566a955138d14fd1ecbc49be48f9add3e2107861507ce1fefd92192a9/python_calamine-0.6.2-cp313-cp313t-musllinux_1_1_aarch64.whl", hash = "sha256:b665c55d5d03b5cc205e4b68c711712cff8aac273f2aa930ab8ab5960b9dc90f", size = 1099592, upload-time = "2026-02-18T13:37:14.312Z" },
+    { url = "https://files.pythonhosted.org/packages/57/12/6b02a3adba57ed2ef7f2ed5ffa557f6a29a06a77f1fd40770ab3d530d2c9/python_calamine-0.6.2-cp313-cp313t-musllinux_1_1_armv7l.whl", hash = "sha256:dc21843a6fca8ae5a722e66bde14324da4f43be98b772b0689ac75dd89d888fd", size = 1176734, upload-time = "2026-02-18T13:37:15.581Z" },
+    { url = "https://files.pythonhosted.org/packages/e1/fb/b6ffd03dc468b0e3bb5747b747bcb4cdd6a98fea7b0f444d8600f2ebaa4e/python_calamine-0.6.2-cp313-cp313t-musllinux_1_1_x86_64.whl", hash = "sha256:e16192fbbb3a3009c89aa62530d807bca272e68a67b362da5c9d156a8950cd51", size = 1143744, upload-time = "2026-02-18T13:37:18.425Z" },
+    { url = "https://files.pythonhosted.org/packages/0d/95/ca5d3f09c98d0420fb03643aea3897c2d68e77df7d3108ad660e9024c277/python_calamine-0.6.2-cp313-cp313t-win_amd64.whl", hash = "sha256:a94a560c0b7ec791f6edfb3fede6ade35b048a61be80e584de8411bf930a8902", size = 749291, upload-time = "2026-02-18T13:37:19.842Z" },
+    { url = "https://files.pythonhosted.org/packages/73/b3/a9ee154d185e64edfeb5bb0c5621a650bc946c071a7be5a2ccfe81da413e/python_calamine-0.6.2-cp313-cp313t-win_arm64.whl", hash = "sha256:2574072b9e26aeae26ebd051a1661bb72fd202ce2904f920f9c605de9555c057", size = 716122, upload-time = "2026-02-18T13:37:21.172Z" },
+    { url = "https://files.pythonhosted.org/packages/86/c3/30e8ebbc5813d332edc6733c63f861bb87b61ad8a71fc97f39d687fb0195/python_calamine-0.6.2-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:630d32f10b16bafbca86fb9373e7a4eccbd0268bc9e80dac923b731a8e472704", size = 878817, upload-time = "2026-02-18T13:37:22.358Z" },
+    { url = "https://files.pythonhosted.org/packages/5f/b7/2c0c82c1d3938bee3972fe97103da158ef9cf2b3bd2ba88ef1fa7e766564/python_calamine-0.6.2-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:39de4d8c1f9db34d02a2d9b7eaad55cdd013b5881cf0a5ab281e2167d090b22e", size = 857826, upload-time = "2026-02-18T13:37:23.856Z" },
+    { url = "https://files.pythonhosted.org/packages/d9/b0/260135d30b0c5e1b723bb5d450426614a20409b27b9e5cdd17076abe1516/python_calamine-0.6.2-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:36148e9c5022494fd6a2c111fb51d24e6e39cbf3027a3ddedad44545598609ca", size = 925839, upload-time = "2026-02-18T13:37:25.276Z" },
+    { url = "https://files.pythonhosted.org/packages/04/d1/6cc11c5287020a04326da01e46a7a4169d4496d462f94c69ac993e4b6c1d/python_calamine-0.6.2-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:2526bddc75829b4376a515cad83afeab4019bbe5b770a892852de66b0017527b", size = 902844, upload-time = "2026-02-18T13:37:27.015Z" },
+    { url = "https://files.pythonhosted.org/packages/9c/56/c2197448e66cf8369ecc3ed6450fc26085404b8ddf3f3409958d82a44908/python_calamine-0.6.2-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:711a664b8cf1e4f6c55fbd5e15e70fc5792e382e3866416044c23b0d3ffdd055", size = 1063688, upload-time = "2026-02-18T13:37:28.824Z" },
+    { url = "https://files.pythonhosted.org/packages/fd/68/c26b811cf88b39afc107af73fab1a42af56d7ea19e33b80eddc3e869a6e7/python_calamine-0.6.2-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8d449b6130f1469810ebe9f423f9efecaabc60e110db7a5a56d0f098ea78b22f", size = 963750, upload-time = "2026-02-18T13:37:30.655Z" },
+    { url = "https://files.pythonhosted.org/packages/35/d8/4f4bee70187f148661f6112b6cff572c199518b943b4821d9303c3d5084d/python_calamine-0.6.2-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f3841986cf512893e8871555ef586387e5e36484cebd0d9398046c3bde1e13c", size = 933485, upload-time = "2026-02-18T13:37:32.082Z" },
+    { url = "https://files.pythonhosted.org/packages/08/67/5f9826d9ee2cb167fa86a496f3dd6551aa727c8dcef8041eb7362c0eeb80/python_calamine-0.6.2-cp314-cp314-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:7a8f437273c8dee9d9ae89cc766b6c313a1a99155b74a1a6560a01b82db89b51", size = 973008, upload-time = "2026-02-18T13:37:33.36Z" },
+    { url = "https://files.pythonhosted.org/packages/8d/20/8384433127d4bef3b663e71285d9c5f21d2e312e6b9ae37170290ec28566/python_calamine-0.6.2-cp314-cp314-musllinux_1_1_aarch64.whl", hash = "sha256:6a2dfcfbf1907f37e6a13e2dffff409f79cff911e44e1ce7deb65510b8bbb0de", size = 1101447, upload-time = "2026-02-18T13:37:34.678Z" },
+    { url = "https://files.pythonhosted.org/packages/57/ab/f86f30f3f72a930e6787c7a28b1042458045572c785b6362a77e42920fb1/python_calamine-0.6.2-cp314-cp314-musllinux_1_1_armv7l.whl", hash = "sha256:0c4a6131835f28897cdf36942067220e2c8c6c23f4b7747a094dca6748190c12", size = 1176774, upload-time = "2026-02-18T13:37:37.256Z" },
+    { url = "https://files.pythonhosted.org/packages/ce/2a/3a4d0332b5a30604c6e2645f3a3a54d443ee78ba45d4ad2be015e32bab4a/python_calamine-0.6.2-cp314-cp314-musllinux_1_1_x86_64.whl", hash = "sha256:e8f50885c5042fb3bdd9ad820e4b871e6a1758e15957964acf0515b5d0fb3984", size = 1143674, upload-time = "2026-02-18T13:37:39.007Z" },
+    { url = "https://files.pythonhosted.org/packages/1c/e1/28254dc423f63a62d1c0da649e673ca492ac84250adcc63f90547b83bfbf/python_calamine-0.6.2-cp314-cp314-win32.whl", hash = "sha256:d4b6fe3564596b1a85fdb7dea60ae7dda2bd56898e88128e0306ebfca29d3659", size = 691485, upload-time = "2026-02-18T13:37:40.64Z" },
+    { url = "https://files.pythonhosted.org/packages/17/24/3954b1279ea1b4e25368bccd139098d1abeb3188f4100f2604555be67bae/python_calamine-0.6.2-cp314-cp314-win_amd64.whl", hash = "sha256:39a6703c80e71c9df2eefa4b9aedd994c27d6ae1fda07a48ee3306414d76d39b", size = 749519, upload-time = "2026-02-18T13:37:41.871Z" },
+    { url = "https://files.pythonhosted.org/packages/ae/be/e103f840b48677a85085eaca4667fb2f7c0828c7c49b3ea9e1300d5074bc/python_calamine-0.6.2-cp314-cp314-win_arm64.whl", hash = "sha256:cedae91678a016690775a815c7dc66288b3f0968451bf2161689846b5b330b84", size = 718799, upload-time = "2026-02-18T13:37:43.692Z" },
+    { url = "https://files.pythonhosted.org/packages/0f/36/08e98171718cec3a22e0c4082714894d9ae71c8aaba2ca47dabc5dbf4cf0/python_calamine-0.6.2-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:5c3ca40133330cccdafb7326c39f7dd60247ad1995d9b92fdcd5052853fc31e5", size = 876825, upload-time = "2026-02-18T13:37:44.933Z" },
+    { url = "https://files.pythonhosted.org/packages/bf/06/327a49b20cd2565457a1eb361b8e078aeb2eb8c2473358924563fc737701/python_calamine-0.6.2-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:5599d12fa06ad42694255fecb1de48f6eb2d074fa55b2f532a93158ae1cc3958", size = 857368, upload-time = "2026-02-18T13:37:46.798Z" },
+    { url = "https://files.pythonhosted.org/packages/c1/fc/b0d380ea649833acc79ecc829470cb632565b865713865c6ba995e505e55/python_calamine-0.6.2-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fb50c1f6303650d5712a707c8c13842eeebcd433bd660dcdaebc8aedd9085d37", size = 922634, upload-time = "2026-02-18T13:37:50.205Z" },
+    { url = "https://files.pythonhosted.org/packages/50/b7/89128cca52c80c8b9649176bac374356f1923997af0b262a7b5547479fb1/python_calamine-0.6.2-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:42f1b3172fc2c916990a9749c30f5c2aad5351a807c6597febf7b5b9444eaf4d", size = 901578, upload-time = "2026-02-18T13:37:52.108Z" },
+    { url = "https://files.pythonhosted.org/packages/78/40/bf06d465c761d59beab8d42cb4f5b648862a8ef0a1d900790b7efce1fa5f/python_calamine-0.6.2-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5f3bb6370d855c9035e8727e6d8685775d411e5f5a3b114e0048bacd2efc2dc5", size = 1062802, upload-time = "2026-02-18T13:37:53.383Z" },
+    { url = "https://files.pythonhosted.org/packages/b9/fd/87792c5f5c5822036ee4bdb01853bd7cb854f982f88cb7fdf6405a36072d/python_calamine-0.6.2-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8d790fa2065c3c5d07de27ead53486b6afa64b935036444e5593c670baaf7394", size = 964571, upload-time = "2026-02-18T13:37:54.754Z" },
+    { url = "https://files.pythonhosted.org/packages/31/6c/9981f4ca131d104e7e2d275c97a22026984c766009ec98269fb3b23a8a9f/python_calamine-0.6.2-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba4ac4bc59fb16e76d57bbbb2b5567e9d78f99e0b7d6cf27b1fc968dddad9e52", size = 934577, upload-time = "2026-02-18T13:37:56.03Z" },
+    { url = "https://files.pythonhosted.org/packages/19/02/7c1fe7038f9921d520b4bf52299c260db4e21cbba7d3df29ed960ebb31c6/python_calamine-0.6.2-cp314-cp314t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:16750f933fd68d6796c24390d5379abe02cc592b8cb5c2c715d09885a4e4db78", size = 971699, upload-time = "2026-02-18T13:37:57.303Z" },
+    { url = "https://files.pythonhosted.org/packages/06/10/9da5009d84154e6d86dd73c7f35fe6402803eb054c198a22605d74ab07a0/python_calamine-0.6.2-cp314-cp314t-musllinux_1_1_aarch64.whl", hash = "sha256:0c3a65ee5e1bbed8d32225882b6fae147c187a5019b895bd1a9631fb1e8ebd1b", size = 1098043, upload-time = "2026-02-18T13:37:59.168Z" },
+    { url = "https://files.pythonhosted.org/packages/2f/d0/53238c2185ad59659245d8bc7a86e4902860bd3c73303744b039a35ae517/python_calamine-0.6.2-cp314-cp314t-musllinux_1_1_armv7l.whl", hash = "sha256:80f54662715b25078e90794d792df6ef45154f1affea472c9e802c5d3dda5a9e", size = 1175384, upload-time = "2026-02-18T13:38:00.542Z" },
+    { url = "https://files.pythonhosted.org/packages/3e/40/c421fe66af1e94267a66735940dfc01f7e423eb8c0217a9bc97b03927de6/python_calamine-0.6.2-cp314-cp314t-musllinux_1_1_x86_64.whl", hash = "sha256:7568800d967b7b7b56d1a139d8d6c343b70d88695c8f3c3906aaa1b8bff76900", size = 1144251, upload-time = "2026-02-18T13:38:01.881Z" },
+    { url = "https://files.pythonhosted.org/packages/16/ed/def5e5fa257658894ca2ca3f9c532064056cd1b686f3bc2861f6313ccac7/python_calamine-0.6.2-cp314-cp314t-win_amd64.whl", hash = "sha256:aab8ef96f19feb5df3704dc04805b1e0d6e82827546bea92d660344c674ed9e1", size = 748446, upload-time = "2026-02-18T13:38:03.35Z" },
+    { url = "https://files.pythonhosted.org/packages/f6/24/3587fb169ddd82e78fcd4cd7b2e3eb3ecaa9b28dbee1da18dd0db13b27e6/python_calamine-0.6.2-cp314-cp314t-win_arm64.whl", hash = "sha256:514b3b0ccba57cf807bd4869a76020eb53e2d797f35c95fceb274a5208da1651", size = 714386, upload-time = "2026-02-18T13:38:04.643Z" },
+]
+
+[[package]]
+name = "python-dateutil"
+version = "2.9.0.post0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "six" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/66/c0/0c8b6ad9f17a802ee498c46e004a0eb49bc148f2fd230864601a86dcf6db/python-dateutil-2.9.0.post0.tar.gz", hash = "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3", size = 342432, upload-time = "2024-03-01T18:36:20.211Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/ec/57/56b9bcc3c9c6a792fcbaf139543cee77261f3651ca9da0c93f5c1221264b/python_dateutil-2.9.0.post0-py2.py3-none-any.whl", hash = "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427", size = 229892, upload-time = "2024-03-01T18:36:18.57Z" },
+]
+
+[[package]]
+name = "python-docx"
+version = "1.2.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "lxml" },
+    { name = "typing-extensions" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/a9/f7/eddfe33871520adab45aaa1a71f0402a2252050c14c7e3009446c8f4701c/python_docx-1.2.0.tar.gz", hash = "sha256:7bc9d7b7d8a69c9c02ca09216118c86552704edc23bac179283f2e38f86220ce", size = 5723256, upload-time = "2025-06-16T20:46:27.921Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/d0/00/1e03a4989fa5795da308cd774f05b704ace555a70f9bf9d3be057b680bcf/python_docx-1.2.0-py3-none-any.whl", hash = "sha256:3fd478f3250fbbbfd3b94fe1e985955737c145627498896a8a6bf81f4baf66c7", size = 252987, upload-time = "2025-06-16T20:46:22.506Z" },
+]
+
+[[package]]
+name = "python-dotenv"
+version = "1.2.2"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/82/ed/0301aeeac3e5353ef3d94b6ec08bbcabd04a72018415dcb29e588514bba8/python_dotenv-1.2.2.tar.gz", hash = "sha256:2c371a91fbd7ba082c2c1dc1f8bf89ca22564a087c2c287cd9b662adde799cf3", size = 50135, upload-time = "2026-03-01T16:00:26.196Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/0b/d7/1959b9648791274998a9c3526f6d0ec8fd2233e4d4acce81bbae76b44b2a/python_dotenv-1.2.2-py3-none-any.whl", hash = "sha256:1d8214789a24de455a8b8bd8ae6fe3c6b69a5e3d64aa8a8e5d68e694bbcb285a", size = 22101, upload-time = "2026-03-01T16:00:25.09Z" },
+]
+
+[[package]]
+name = "python-iso639"
+version = "2026.4.20"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/da/c8/22c80367213029ea3abc4e7ab6e1ed8545542f98e5db6e1ab4f2973890ad/python_iso639-2026.4.20.tar.gz", hash = "sha256:00570376d24788f889578991bb2ad93c030a014c1d373f64f2ceffe84732a537", size = 173955, upload-time = "2026-04-20T14:15:47.748Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/fe/71/520fbac49c0650aba66093396282e1e4a1315a7242461c21480132a1b0df/python_iso639-2026.4.20-py3-none-any.whl", hash = "sha256:60a380571fafdbcc6190c5c1ee78e217194332cbe3caec76345327712e5a65cb", size = 167842, upload-time = "2026-04-20T14:15:46.308Z" },
+]
+
+[[package]]
+name = "python-magic"
+version = "0.4.27"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/da/db/0b3e28ac047452d079d375ec6798bf76a036a08182dbb39ed38116a49130/python-magic-0.4.27.tar.gz", hash = "sha256:c1ba14b08e4a5f5c31a302b7721239695b2f0f058d125bd5ce1ee36b9d9d3c3b", size = 14677, upload-time = "2022-06-07T20:16:59.508Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/6c/73/9f872cb81fc5c3bb48f7227872c28975f998f3e7c2b1c16e95e6432bbb90/python_magic-0.4.27-py2.py3-none-any.whl", hash = "sha256:c212960ad306f700aa0d01e5d7a325d20548ff97eb9920dcd29513174f0294d3", size = 13840, upload-time = "2022-06-07T20:16:57.763Z" },
+]
+
+[[package]]
+name = "python-oxmsg"
+version = "0.0.2"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "click" },
+    { name = "olefile" },
+    { name = "typing-extensions" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/a2/4e/869f34faedbc968796d2c7e9837dede079c9cb9750917356b1f1eda926e9/python_oxmsg-0.0.2.tar.gz", hash = "sha256:a6aff4deb1b5975d44d49dab1d9384089ffeec819e19c6940bc7ffbc84775fad", size = 34713, upload-time = "2025-02-03T17:13:47.415Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/53/67/f56c69a98c7eb244025845506387d0f961681657c9fcd8b2d2edd148f9d2/python_oxmsg-0.0.2-py3-none-any.whl", hash = "sha256:22be29b14c46016bcd05e34abddfd8e05ee82082f53b82753d115da3fc7d0355", size = 31455, upload-time = "2025-02-03T17:13:46.061Z" },
+]
+
+[[package]]
+name = "python-pptx"
+version = "1.0.2"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "lxml" },
+    { name = "pillow" },
+    { name = "typing-extensions" },
+    { name = "xlsxwriter" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/52/a9/0c0db8d37b2b8a645666f7fd8accea4c6224e013c42b1d5c17c93590cd06/python_pptx-1.0.2.tar.gz", hash = "sha256:479a8af0eaf0f0d76b6f00b0887732874ad2e3188230315290cd1f9dd9cc7095", size = 10109297, upload-time = "2024-08-07T17:33:37.772Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/d9/4f/00be2196329ebbff56ce564aa94efb0fbc828d00de250b1980de1a34ab49/python_pptx-1.0.2-py3-none-any.whl", hash = "sha256:160838e0b8565a8b1f67947675886e9fea18aa5e795db7ae531606d68e785cba", size = 472788, upload-time = "2024-08-07T17:33:28.192Z" },
+]
+
+[[package]]
+name = "pytokens"
+version = "0.4.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/b6/34/b4e015b99031667a7b960f888889c5bd34ef585c85e1cb56a594b92836ac/pytokens-0.4.1.tar.gz", hash = "sha256:292052fe80923aae2260c073f822ceba21f3872ced9a68bb7953b348e561179a", size = 23015, upload-time = "2026-01-30T01:03:45.924Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/41/5d/e44573011401fb82e9d51e97f1290ceb377800fb4eed650b96f4753b499c/pytokens-0.4.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:140709331e846b728475786df8aeb27d24f48cbcf7bcd449f8de75cae7a45083", size = 160663, upload-time = "2026-01-30T01:03:06.473Z" },
+    { url = "https://files.pythonhosted.org/packages/f0/e6/5bbc3019f8e6f21d09c41f8b8654536117e5e211a85d89212d59cbdab381/pytokens-0.4.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6d6c4268598f762bc8e91f5dbf2ab2f61f7b95bdc07953b602db879b3c8c18e1", size = 255626, upload-time = "2026-01-30T01:03:08.177Z" },
+    { url = "https://files.pythonhosted.org/packages/bf/3c/2d5297d82286f6f3d92770289fd439956b201c0a4fc7e72efb9b2293758e/pytokens-0.4.1-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:24afde1f53d95348b5a0eb19488661147285ca4dd7ed752bbc3e1c6242a304d1", size = 269779, upload-time = "2026-01-30T01:03:09.756Z" },
+    { url = "https://files.pythonhosted.org/packages/20/01/7436e9ad693cebda0551203e0bf28f7669976c60ad07d6402098208476de/pytokens-0.4.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:5ad948d085ed6c16413eb5fec6b3e02fa00dc29a2534f088d3302c47eb59adf9", size = 268076, upload-time = "2026-01-30T01:03:10.957Z" },
+    { url = "https://files.pythonhosted.org/packages/2e/df/533c82a3c752ba13ae7ef238b7f8cdd272cf1475f03c63ac6cf3fcfb00b6/pytokens-0.4.1-cp312-cp312-win_amd64.whl", hash = "sha256:3f901fe783e06e48e8cbdc82d631fca8f118333798193e026a50ce1b3757ea68", size = 103552, upload-time = "2026-01-30T01:03:12.066Z" },
+    { url = "https://files.pythonhosted.org/packages/cb/dc/08b1a080372afda3cceb4f3c0a7ba2bde9d6a5241f1edb02a22a019ee147/pytokens-0.4.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:8bdb9d0ce90cbf99c525e75a2fa415144fd570a1ba987380190e8b786bc6ef9b", size = 160720, upload-time = "2026-01-30T01:03:13.843Z" },
+    { url = "https://files.pythonhosted.org/packages/64/0c/41ea22205da480837a700e395507e6a24425151dfb7ead73343d6e2d7ffe/pytokens-0.4.1-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:5502408cab1cb18e128570f8d598981c68a50d0cbd7c61312a90507cd3a1276f", size = 254204, upload-time = "2026-01-30T01:03:14.886Z" },
+    { url = "https://files.pythonhosted.org/packages/e0/d2/afe5c7f8607018beb99971489dbb846508f1b8f351fcefc225fcf4b2adc0/pytokens-0.4.1-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:29d1d8fb1030af4d231789959f21821ab6325e463f0503a61d204343c9b355d1", size = 268423, upload-time = "2026-01-30T01:03:15.936Z" },
+    { url = "https://files.pythonhosted.org/packages/68/d4/00ffdbd370410c04e9591da9220a68dc1693ef7499173eb3e30d06e05ed1/pytokens-0.4.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:970b08dd6b86058b6dc07efe9e98414f5102974716232d10f32ff39701e841c4", size = 266859, upload-time = "2026-01-30T01:03:17.458Z" },
+    { url = "https://files.pythonhosted.org/packages/a7/c9/c3161313b4ca0c601eeefabd3d3b576edaa9afdefd32da97210700e47652/pytokens-0.4.1-cp313-cp313-win_amd64.whl", hash = "sha256:9bd7d7f544d362576be74f9d5901a22f317efc20046efe2034dced238cbbfe78", size = 103520, upload-time = "2026-01-30T01:03:18.652Z" },
+    { url = "https://files.pythonhosted.org/packages/8f/a7/b470f672e6fc5fee0a01d9e75005a0e617e162381974213a945fcd274843/pytokens-0.4.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:4a14d5f5fc78ce85e426aa159489e2d5961acf0e47575e08f35584009178e321", size = 160821, upload-time = "2026-01-30T01:03:19.684Z" },
+    { url = "https://files.pythonhosted.org/packages/80/98/e83a36fe8d170c911f864bfded690d2542bfcfacb9c649d11a9e6eb9dc41/pytokens-0.4.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:97f50fd18543be72da51dd505e2ed20d2228c74e0464e4262e4899797803d7fa", size = 254263, upload-time = "2026-01-30T01:03:20.834Z" },
+    { url = "https://files.pythonhosted.org/packages/0f/95/70d7041273890f9f97a24234c00b746e8da86df462620194cef1d411ddeb/pytokens-0.4.1-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:dc74c035f9bfca0255c1af77ddd2d6ae8419012805453e4b0e7513e17904545d", size = 268071, upload-time = "2026-01-30T01:03:21.888Z" },
+    { url = "https://files.pythonhosted.org/packages/da/79/76e6d09ae19c99404656d7db9c35dfd20f2086f3eb6ecb496b5b31163bad/pytokens-0.4.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:f66a6bbe741bd431f6d741e617e0f39ec7257ca1f89089593479347cc4d13324", size = 271716, upload-time = "2026-01-30T01:03:23.633Z" },
+    { url = "https://files.pythonhosted.org/packages/79/37/482e55fa1602e0a7ff012661d8c946bafdc05e480ea5a32f4f7e336d4aa9/pytokens-0.4.1-cp314-cp314-win_amd64.whl", hash = "sha256:b35d7e5ad269804f6697727702da3c517bb8a5228afa450ab0fa787732055fc9", size = 104539, upload-time = "2026-01-30T01:03:24.788Z" },
+    { url = "https://files.pythonhosted.org/packages/30/e8/20e7db907c23f3d63b0be3b8a4fd1927f6da2395f5bcc7f72242bb963dfe/pytokens-0.4.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:8fcb9ba3709ff77e77f1c7022ff11d13553f3c30299a9fe246a166903e9091eb", size = 168474, upload-time = "2026-01-30T01:03:26.428Z" },
+    { url = "https://files.pythonhosted.org/packages/d6/81/88a95ee9fafdd8f5f3452107748fd04c24930d500b9aba9738f3ade642cc/pytokens-0.4.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:79fc6b8699564e1f9b521582c35435f1bd32dd06822322ec44afdeba666d8cb3", size = 290473, upload-time = "2026-01-30T01:03:27.415Z" },
+    { url = "https://files.pythonhosted.org/packages/cf/35/3aa899645e29b6375b4aed9f8d21df219e7c958c4c186b465e42ee0a06bf/pytokens-0.4.1-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d31b97b3de0f61571a124a00ffe9a81fb9939146c122c11060725bd5aea79975", size = 303485, upload-time = "2026-01-30T01:03:28.558Z" },
+    { url = "https://files.pythonhosted.org/packages/52/a0/07907b6ff512674d9b201859f7d212298c44933633c946703a20c25e9d81/pytokens-0.4.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:967cf6e3fd4adf7de8fc73cd3043754ae79c36475c1c11d514fc72cf5490094a", size = 306698, upload-time = "2026-01-30T01:03:29.653Z" },
+    { url = "https://files.pythonhosted.org/packages/39/2a/cbbf9250020a4a8dd53ba83a46c097b69e5eb49dd14e708f496f548c6612/pytokens-0.4.1-cp314-cp314t-win_amd64.whl", hash = "sha256:584c80c24b078eec1e227079d56dc22ff755e0ba8654d8383b2c549107528918", size = 116287, upload-time = "2026-01-30T01:03:30.912Z" },
+    { url = "https://files.pythonhosted.org/packages/c6/78/397db326746f0a342855b81216ae1f0a32965deccfd7c830a2dbc66d2483/pytokens-0.4.1-py3-none-any.whl", hash = "sha256:26cef14744a8385f35d0e095dc8b3a7583f6c953c2e3d269c7f82484bf5ad2de", size = 13729, upload-time = "2026-01-30T01:03:45.029Z" },
+]
+
+[[package]]
+name = "pyxlsb"
+version = "1.0.10"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/3f/13/eebaeb7a40b062d1c6f7f91d09e73d30a69e33e4baa7cbe4b7658548b1cd/pyxlsb-1.0.10.tar.gz", hash = "sha256:8062d1ea8626d3f1980e8b1cfe91a4483747449242ecb61013bc2df85435f685", size = 22424, upload-time = "2022-10-14T19:17:47.308Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/7e/92/345823838ae367c59b63e03aef9c331f485370f9df6d049256a61a28f06d/pyxlsb-1.0.10-py2.py3-none-any.whl", hash = "sha256:87c122a9a622e35ca5e741d2e541201d28af00fb46bec492cfa9586890b120b4", size = 23849, upload-time = "2022-10-14T19:17:46.079Z" },
+]
+
+[[package]]
+name = "pyyaml"
+version = "6.0.3"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/05/8e/961c0007c59b8dd7729d542c61a4d537767a59645b82a0b521206e1e25c2/pyyaml-6.0.3.tar.gz", hash = "sha256:d76623373421df22fb4cf8817020cbb7ef15c725b9d5e45f17e189bfc384190f", size = 130960, upload-time = "2025-09-25T21:33:16.546Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/d1/33/422b98d2195232ca1826284a76852ad5a86fe23e31b009c9886b2d0fb8b2/pyyaml-6.0.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:7f047e29dcae44602496db43be01ad42fc6f1cc0d8cd6c83d342306c32270196", size = 182063, upload-time = "2025-09-25T21:32:11.445Z" },
+    { url = "https://files.pythonhosted.org/packages/89/a0/6cf41a19a1f2f3feab0e9c0b74134aa2ce6849093d5517a0c550fe37a648/pyyaml-6.0.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:fc09d0aa354569bc501d4e787133afc08552722d3ab34836a80547331bb5d4a0", size = 173973, upload-time = "2025-09-25T21:32:12.492Z" },
+    { url = "https://files.pythonhosted.org/packages/ed/23/7a778b6bd0b9a8039df8b1b1d80e2e2ad78aa04171592c8a5c43a56a6af4/pyyaml-6.0.3-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9149cad251584d5fb4981be1ecde53a1ca46c891a79788c0df828d2f166bda28", size = 775116, upload-time = "2025-09-25T21:32:13.652Z" },
+    { url = "https://files.pythonhosted.org/packages/65/30/d7353c338e12baef4ecc1b09e877c1970bd3382789c159b4f89d6a70dc09/pyyaml-6.0.3-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:5fdec68f91a0c6739b380c83b951e2c72ac0197ace422360e6d5a959d8d97b2c", size = 844011, upload-time = "2025-09-25T21:32:15.21Z" },
+    { url = "https://files.pythonhosted.org/packages/8b/9d/b3589d3877982d4f2329302ef98a8026e7f4443c765c46cfecc8858c6b4b/pyyaml-6.0.3-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ba1cc08a7ccde2d2ec775841541641e4548226580ab850948cbfda66a1befcdc", size = 807870, upload-time = "2025-09-25T21:32:16.431Z" },
+    { url = "https://files.pythonhosted.org/packages/05/c0/b3be26a015601b822b97d9149ff8cb5ead58c66f981e04fedf4e762f4bd4/pyyaml-6.0.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:8dc52c23056b9ddd46818a57b78404882310fb473d63f17b07d5c40421e47f8e", size = 761089, upload-time = "2025-09-25T21:32:17.56Z" },
+    { url = "https://files.pythonhosted.org/packages/be/8e/98435a21d1d4b46590d5459a22d88128103f8da4c2d4cb8f14f2a96504e1/pyyaml-6.0.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:41715c910c881bc081f1e8872880d3c650acf13dfa8214bad49ed4cede7c34ea", size = 790181, upload-time = "2025-09-25T21:32:18.834Z" },
+    { url = "https://files.pythonhosted.org/packages/74/93/7baea19427dcfbe1e5a372d81473250b379f04b1bd3c4c5ff825e2327202/pyyaml-6.0.3-cp312-cp312-win32.whl", hash = "sha256:96b533f0e99f6579b3d4d4995707cf36df9100d67e0c8303a0c55b27b5f99bc5", size = 137658, upload-time = "2025-09-25T21:32:20.209Z" },
+    { url = "https://files.pythonhosted.org/packages/86/bf/899e81e4cce32febab4fb42bb97dcdf66bc135272882d1987881a4b519e9/pyyaml-6.0.3-cp312-cp312-win_amd64.whl", hash = "sha256:5fcd34e47f6e0b794d17de1b4ff496c00986e1c83f7ab2fb8fcfe9616ff7477b", size = 154003, upload-time = "2025-09-25T21:32:21.167Z" },
+    { url = "https://files.pythonhosted.org/packages/1a/08/67bd04656199bbb51dbed1439b7f27601dfb576fb864099c7ef0c3e55531/pyyaml-6.0.3-cp312-cp312-win_arm64.whl", hash = "sha256:64386e5e707d03a7e172c0701abfb7e10f0fb753ee1d773128192742712a98fd", size = 140344, upload-time = "2025-09-25T21:32:22.617Z" },
+    { url = "https://files.pythonhosted.org/packages/d1/11/0fd08f8192109f7169db964b5707a2f1e8b745d4e239b784a5a1dd80d1db/pyyaml-6.0.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:8da9669d359f02c0b91ccc01cac4a67f16afec0dac22c2ad09f46bee0697eba8", size = 181669, upload-time = "2025-09-25T21:32:23.673Z" },
+    { url = "https://files.pythonhosted.org/packages/b1/16/95309993f1d3748cd644e02e38b75d50cbc0d9561d21f390a76242ce073f/pyyaml-6.0.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:2283a07e2c21a2aa78d9c4442724ec1eb15f5e42a723b99cb3d822d48f5f7ad1", size = 173252, upload-time = "2025-09-25T21:32:25.149Z" },
+    { url = "https://files.pythonhosted.org/packages/50/31/b20f376d3f810b9b2371e72ef5adb33879b25edb7a6d072cb7ca0c486398/pyyaml-6.0.3-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ee2922902c45ae8ccada2c5b501ab86c36525b883eff4255313a253a3160861c", size = 767081, upload-time = "2025-09-25T21:32:26.575Z" },
+    { url = "https://files.pythonhosted.org/packages/49/1e/a55ca81e949270d5d4432fbbd19dfea5321eda7c41a849d443dc92fd1ff7/pyyaml-6.0.3-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:a33284e20b78bd4a18c8c2282d549d10bc8408a2a7ff57653c0cf0b9be0afce5", size = 841159, upload-time = "2025-09-25T21:32:27.727Z" },
+    { url = "https://files.pythonhosted.org/packages/74/27/e5b8f34d02d9995b80abcef563ea1f8b56d20134d8f4e5e81733b1feceb2/pyyaml-6.0.3-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0f29edc409a6392443abf94b9cf89ce99889a1dd5376d94316ae5145dfedd5d6", size = 801626, upload-time = "2025-09-25T21:32:28.878Z" },
+    { url = "https://files.pythonhosted.org/packages/f9/11/ba845c23988798f40e52ba45f34849aa8a1f2d4af4b798588010792ebad6/pyyaml-6.0.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:f7057c9a337546edc7973c0d3ba84ddcdf0daa14533c2065749c9075001090e6", size = 753613, upload-time = "2025-09-25T21:32:30.178Z" },
+    { url = "https://files.pythonhosted.org/packages/3d/e0/7966e1a7bfc0a45bf0a7fb6b98ea03fc9b8d84fa7f2229e9659680b69ee3/pyyaml-6.0.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:eda16858a3cab07b80edaf74336ece1f986ba330fdb8ee0d6c0d68fe82bc96be", size = 794115, upload-time = "2025-09-25T21:32:31.353Z" },
+    { url = "https://files.pythonhosted.org/packages/de/94/980b50a6531b3019e45ddeada0626d45fa85cbe22300844a7983285bed3b/pyyaml-6.0.3-cp313-cp313-win32.whl", hash = "sha256:d0eae10f8159e8fdad514efdc92d74fd8d682c933a6dd088030f3834bc8e6b26", size = 137427, upload-time = "2025-09-25T21:32:32.58Z" },
+    { url = "https://files.pythonhosted.org/packages/97/c9/39d5b874e8b28845e4ec2202b5da735d0199dbe5b8fb85f91398814a9a46/pyyaml-6.0.3-cp313-cp313-win_amd64.whl", hash = "sha256:79005a0d97d5ddabfeeea4cf676af11e647e41d81c9a7722a193022accdb6b7c", size = 154090, upload-time = "2025-09-25T21:32:33.659Z" },
+    { url = "https://files.pythonhosted.org/packages/73/e8/2bdf3ca2090f68bb3d75b44da7bbc71843b19c9f2b9cb9b0f4ab7a5a4329/pyyaml-6.0.3-cp313-cp313-win_arm64.whl", hash = "sha256:5498cd1645aa724a7c71c8f378eb29ebe23da2fc0d7a08071d89469bf1d2defb", size = 140246, upload-time = "2025-09-25T21:32:34.663Z" },
+    { url = "https://files.pythonhosted.org/packages/9d/8c/f4bd7f6465179953d3ac9bc44ac1a8a3e6122cf8ada906b4f96c60172d43/pyyaml-6.0.3-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:8d1fab6bb153a416f9aeb4b8763bc0f22a5586065f86f7664fc23339fc1c1fac", size = 181814, upload-time = "2025-09-25T21:32:35.712Z" },
+    { url = "https://files.pythonhosted.org/packages/bd/9c/4d95bb87eb2063d20db7b60faa3840c1b18025517ae857371c4dd55a6b3a/pyyaml-6.0.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:34d5fcd24b8445fadc33f9cf348c1047101756fd760b4dacb5c3e99755703310", size = 173809, upload-time = "2025-09-25T21:32:36.789Z" },
+    { url = "https://files.pythonhosted.org/packages/92/b5/47e807c2623074914e29dabd16cbbdd4bf5e9b2db9f8090fa64411fc5382/pyyaml-6.0.3-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:501a031947e3a9025ed4405a168e6ef5ae3126c59f90ce0cd6f2bfc477be31b7", size = 766454, upload-time = "2025-09-25T21:32:37.966Z" },
+    { url = "https://files.pythonhosted.org/packages/02/9e/e5e9b168be58564121efb3de6859c452fccde0ab093d8438905899a3a483/pyyaml-6.0.3-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:b3bc83488de33889877a0f2543ade9f70c67d66d9ebb4ac959502e12de895788", size = 836355, upload-time = "2025-09-25T21:32:39.178Z" },
+    { url = "https://files.pythonhosted.org/packages/88/f9/16491d7ed2a919954993e48aa941b200f38040928474c9e85ea9e64222c3/pyyaml-6.0.3-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c458b6d084f9b935061bc36216e8a69a7e293a2f1e68bf956dcd9e6cbcd143f5", size = 794175, upload-time = "2025-09-25T21:32:40.865Z" },
+    { url = "https://files.pythonhosted.org/packages/dd/3f/5989debef34dc6397317802b527dbbafb2b4760878a53d4166579111411e/pyyaml-6.0.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:7c6610def4f163542a622a73fb39f534f8c101d690126992300bf3207eab9764", size = 755228, upload-time = "2025-09-25T21:32:42.084Z" },
+    { url = "https://files.pythonhosted.org/packages/d7/ce/af88a49043cd2e265be63d083fc75b27b6ed062f5f9fd6cdc223ad62f03e/pyyaml-6.0.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:5190d403f121660ce8d1d2c1bb2ef1bd05b5f68533fc5c2ea899bd15f4399b35", size = 789194, upload-time = "2025-09-25T21:32:43.362Z" },
+    { url = "https://files.pythonhosted.org/packages/23/20/bb6982b26a40bb43951265ba29d4c246ef0ff59c9fdcdf0ed04e0687de4d/pyyaml-6.0.3-cp314-cp314-win_amd64.whl", hash = "sha256:4a2e8cebe2ff6ab7d1050ecd59c25d4c8bd7e6f400f5f82b96557ac0abafd0ac", size = 156429, upload-time = "2025-09-25T21:32:57.844Z" },
+    { url = "https://files.pythonhosted.org/packages/f4/f4/a4541072bb9422c8a883ab55255f918fa378ecf083f5b85e87fc2b4eda1b/pyyaml-6.0.3-cp314-cp314-win_arm64.whl", hash = "sha256:93dda82c9c22deb0a405ea4dc5f2d0cda384168e466364dec6255b293923b2f3", size = 143912, upload-time = "2025-09-25T21:32:59.247Z" },
+    { url = "https://files.pythonhosted.org/packages/7c/f9/07dd09ae774e4616edf6cda684ee78f97777bdd15847253637a6f052a62f/pyyaml-6.0.3-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:02893d100e99e03eda1c8fd5c441d8c60103fd175728e23e431db1b589cf5ab3", size = 189108, upload-time = "2025-09-25T21:32:44.377Z" },
+    { url = "https://files.pythonhosted.org/packages/4e/78/8d08c9fb7ce09ad8c38ad533c1191cf27f7ae1effe5bb9400a46d9437fcf/pyyaml-6.0.3-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:c1ff362665ae507275af2853520967820d9124984e0f7466736aea23d8611fba", size = 183641, upload-time = "2025-09-25T21:32:45.407Z" },
+    { url = "https://files.pythonhosted.org/packages/7b/5b/3babb19104a46945cf816d047db2788bcaf8c94527a805610b0289a01c6b/pyyaml-6.0.3-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6adc77889b628398debc7b65c073bcb99c4a0237b248cacaf3fe8a557563ef6c", size = 831901, upload-time = "2025-09-25T21:32:48.83Z" },
+    { url = "https://files.pythonhosted.org/packages/8b/cc/dff0684d8dc44da4d22a13f35f073d558c268780ce3c6ba1b87055bb0b87/pyyaml-6.0.3-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:a80cb027f6b349846a3bf6d73b5e95e782175e52f22108cfa17876aaeff93702", size = 861132, upload-time = "2025-09-25T21:32:50.149Z" },
+    { url = "https://files.pythonhosted.org/packages/b1/5e/f77dc6b9036943e285ba76b49e118d9ea929885becb0a29ba8a7c75e29fe/pyyaml-6.0.3-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:00c4bdeba853cc34e7dd471f16b4114f4162dc03e6b7afcc2128711f0eca823c", size = 839261, upload-time = "2025-09-25T21:32:51.808Z" },
+    { url = "https://files.pythonhosted.org/packages/ce/88/a9db1376aa2a228197c58b37302f284b5617f56a5d959fd1763fb1675ce6/pyyaml-6.0.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:66e1674c3ef6f541c35191caae2d429b967b99e02040f5ba928632d9a7f0f065", size = 805272, upload-time = "2025-09-25T21:32:52.941Z" },
+    { url = "https://files.pythonhosted.org/packages/da/92/1446574745d74df0c92e6aa4a7b0b3130706a4142b2d1a5869f2eaa423c6/pyyaml-6.0.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:16249ee61e95f858e83976573de0f5b2893b3677ba71c9dd36b9cf8be9ac6d65", size = 829923, upload-time = "2025-09-25T21:32:54.537Z" },
+    { url = "https://files.pythonhosted.org/packages/f0/7a/1c7270340330e575b92f397352af856a8c06f230aa3e76f86b39d01b416a/pyyaml-6.0.3-cp314-cp314t-win_amd64.whl", hash = "sha256:4ad1906908f2f5ae4e5a8ddfce73c320c2a1429ec52eafd27138b7f1cbe341c9", size = 174062, upload-time = "2025-09-25T21:32:55.767Z" },
+    { url = "https://files.pythonhosted.org/packages/f1/12/de94a39c2ef588c7e6455cfbe7343d3b2dc9d6b6b2f40c4c6565744c873d/pyyaml-6.0.3-cp314-cp314t-win_arm64.whl", hash = "sha256:ebc55a14a21cb14062aa4162f906cd962b28e2e9ea38f9b4391244cd8de4ae0b", size = 149341, upload-time = "2025-09-25T21:32:56.828Z" },
+]
+
+[[package]]
+name = "pyyaml-env-tag"
+version = "1.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "pyyaml" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/eb/2e/79c822141bfd05a853236b504869ebc6b70159afc570e1d5a20641782eaa/pyyaml_env_tag-1.1.tar.gz", hash = "sha256:2eb38b75a2d21ee0475d6d97ec19c63287a7e140231e4214969d0eac923cd7ff", size = 5737, upload-time = "2025-05-13T15:24:01.64Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/04/11/432f32f8097b03e3cd5fe57e88efb685d964e2e5178a48ed61e841f7fdce/pyyaml_env_tag-1.1-py3-none-any.whl", hash = "sha256:17109e1a528561e32f026364712fee1264bc2ea6715120891174ed1b980d2e04", size = 4722, upload-time = "2025-05-13T15:23:59.629Z" },
+]
+
+[[package]]
+name = "rapidfuzz"
+version = "3.14.5"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/2c/21/ef6157213316e85790041254259907eb722e00b03480256c0545d98acd33/rapidfuzz-3.14.5.tar.gz", hash = "sha256:ba10ac57884ce82112f7ed910b67e7fb6072d8ef2c06e30dc63c0f604a112e0e", size = 57901753, upload-time = "2026-04-07T11:16:31.931Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/d3/e3/574435c6aafb80254c191ef40d7aca2cb2bb97a095ec9395e9fa59ac307a/rapidfuzz-3.14.5-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:0d3378f471ef440473a396ce2f8e97ee12f89a78b495540e0a5617bbfe895638", size = 1944601, upload-time = "2026-04-07T11:14:18.771Z" },
+    { url = "https://files.pythonhosted.org/packages/d0/1f/fbad3102a255ecc112ce9a7e779bacab7fd14398217be8868dc9082ba363/rapidfuzz-3.14.5-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:1e910eebca9fd0eba245c0555e764597e8a0cccb673a92da2dc2397050725f48", size = 1164293, upload-time = "2026-04-07T11:14:20.534Z" },
+    { url = "https://files.pythonhosted.org/packages/88/37/a3eb7ff6121ed3a5f199a8c38cc86c8e481816f879cb0e0b738b078c9a7e/rapidfuzz-3.14.5-cp312-cp312-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:01550fe5f60fd176aa66b7611289d46dc4aa4b1b904874c7b6d1d54e581c5ec1", size = 1371999, upload-time = "2026-04-07T11:14:22.63Z" },
+    { url = "https://files.pythonhosted.org/packages/79/72/97a9728c711c7c1b06e107d3f0623880fb4ef90e147ed13c551a1730e7cc/rapidfuzz-3.14.5-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:48bee0b91bebfaec41e1081e351000659ab7570cc4598d617aa04d5bf827f9e6", size = 3145715, upload-time = "2026-04-07T11:14:24.508Z" },
+    { url = "https://files.pythonhosted.org/packages/ed/54/d5caabbea233ac90c286c87c260e49d7641467e87438a18d858e41c82e91/rapidfuzz-3.14.5-cp312-cp312-manylinux_2_39_riscv64.whl", hash = "sha256:7e580cb04ad849ae9b786fa21383c6b994b6e6c1444ad1cb9f22392759d72741", size = 1456304, upload-time = "2026-04-07T11:14:26.515Z" },
+    { url = "https://files.pythonhosted.org/packages/fc/a7/2d1a81250ac8c01a0100c026018e76f0e7a097ff63e4c553e02a6938c6fb/rapidfuzz-3.14.5-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:09d6c9ba091854f07817055d795d604179c12a8f308ba4c7d56f3719dfea1646", size = 2389089, upload-time = "2026-04-07T11:14:28.635Z" },
+    { url = "https://files.pythonhosted.org/packages/65/0d/c47c3872203ae88e6506997c0b576ad731f5261daa25d559be09c9756658/rapidfuzz-3.14.5-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:1e989f86113be66574113b9c7bdf4793f3f863d248e47d911b355e05ca6b6b10", size = 2493404, upload-time = "2026-04-07T11:14:30.577Z" },
+    { url = "https://files.pythonhosted.org/packages/8f/2f/71e0a5a3130792146c8a200a2dd1e52aa16f7c1074012e17f2601eea9a90/rapidfuzz-3.14.5-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:0ebd1a18e2e47bc0b292a07e6ed9c3642f8aaa672d12253885f599b50807a4f9", size = 4251709, upload-time = "2026-04-07T11:14:32.451Z" },
+    { url = "https://files.pythonhosted.org/packages/86/45/d39874901abacef325adb5b34ae416817c8486dfb4fb87c7a9b74ec5b072/rapidfuzz-3.14.5-cp312-cp312-win32.whl", hash = "sha256:9981d38a703b86f0e315a3cd229fd1906fe1d91c989ed121fb975b3c849f89f5", size = 1710069, upload-time = "2026-04-07T11:14:34.37Z" },
+    { url = "https://files.pythonhosted.org/packages/85/0b/f65572c53de8a1c704bda707f63a447b67bdbe95d7cdc70d18885e191df5/rapidfuzz-3.14.5-cp312-cp312-win_amd64.whl", hash = "sha256:d8375e3da319593389727c3187ccaf3e0e84199accc530866b8e0f2b79af05e9", size = 1540630, upload-time = "2026-04-07T11:14:36.287Z" },
+    { url = "https://files.pythonhosted.org/packages/5e/c3/143be3a578f989758cae516f3270d5cbb49783a7bfdf57cc27a670e00456/rapidfuzz-3.14.5-cp312-cp312-win_arm64.whl", hash = "sha256:478b59bb018a6780d73f33e38d0b3ec5e968a6c1ed42876b993dd456b7aa20e8", size = 813137, upload-time = "2026-04-07T11:14:38.289Z" },
+    { url = "https://files.pythonhosted.org/packages/11/66/252803f2010ba699618cdc048b6e1f7cc1f433c08b4a9a17579b92ab0142/rapidfuzz-3.14.5-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:ebd8fd343bf8492a1e60bcb6dc99f90f74f65d98d8241a6b3e1fed225b76ecd6", size = 1940205, upload-time = "2026-04-07T11:14:40.319Z" },
+    { url = "https://files.pythonhosted.org/packages/ea/59/b2afd98e41af9cd54554a4c1c423d84cdd60e6b1c0a09496f033b55f60ec/rapidfuzz-3.14.5-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:6737b35d5af7479c5bf9710f7b17edd9d2c43128d974d25fb4ea653e42c64609", size = 1159639, upload-time = "2026-04-07T11:14:42.52Z" },
+    { url = "https://files.pythonhosted.org/packages/a3/31/7aa7e62c4c516a7af322ed0c4f0774208b72d457d0cfec808bad0df12f4a/rapidfuzz-3.14.5-cp313-cp313-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:b002c7994cc9f2bc9d9856f0fbaee6e8072c983873846c92f25cefba5b2a925f", size = 1367194, upload-time = "2026-04-07T11:14:44.25Z" },
+    { url = "https://files.pythonhosted.org/packages/90/79/2fc252a63bc91d3c3b234d0a3a6ad4ebc460037a23cdcdaf9285f986e6c9/rapidfuzz-3.14.5-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:17a34330cd2a538c1ce5d400b61ba358c5b72c654b928ff87b362e88f8b864c7", size = 3151805, upload-time = "2026-04-07T11:14:46.21Z" },
+    { url = "https://files.pythonhosted.org/packages/17/54/0c83508f2683ea70e2d05f8527eb07328acf7bb1e9d97a3bece5702378e7/rapidfuzz-3.14.5-cp313-cp313-manylinux_2_39_riscv64.whl", hash = "sha256:95d937e74c1a7a1287dfb03b62a827be08ede10a155cf1af73bbf47f2b73ee6e", size = 1455667, upload-time = "2026-04-07T11:14:47.991Z" },
+    { url = "https://files.pythonhosted.org/packages/71/1b/070175e873177814d58850a01ebe80e20ae11e93eb4da894d563988660fa/rapidfuzz-3.14.5-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:46b92a9970dcc34f0096901c792644094cab49554ac3547f35e3aebbdf0a3610", size = 2388246, upload-time = "2026-04-07T11:14:50.098Z" },
+    { url = "https://files.pythonhosted.org/packages/c9/dd/77caf7aaf9c2be050ad1f128d7c24ff0f59079aa62c5f62f9df41c0af45e/rapidfuzz-3.14.5-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:e012177c8e8a8a0754ae0d6027d63042aa5ff036d9f40f07cb3466a6082e21b8", size = 2494333, upload-time = "2026-04-07T11:14:52.303Z" },
+    { url = "https://files.pythonhosted.org/packages/2c/e2/dd7e1f2aa31a8fbbfc16b0610af1d770ffaf1287490f3c8c5b1c52da264f/rapidfuzz-3.14.5-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:a2ae6f53f99c9a0eca7a0afc5b4e45fc73bc1dd4ac74c00509031d76df80ed98", size = 4258579, upload-time = "2026-04-07T11:14:54.538Z" },
+    { url = "https://files.pythonhosted.org/packages/9c/0a/ac99e1ba347ba0e85e0bb60b74231d55fb93c0eff43f2920ccb413d0be08/rapidfuzz-3.14.5-cp313-cp313-win32.whl", hash = "sha256:4a60f0057231188e3bd30216f7b4e0f279b11fa4ec818bb6c1d9f014d1562fbc", size = 1709231, upload-time = "2026-04-07T11:14:56.524Z" },
+    { url = "https://files.pythonhosted.org/packages/cf/cb/0e251d731b3166378644238e8f0cf9e89858c024e19f75ca9f7e3ae83fd5/rapidfuzz-3.14.5-cp313-cp313-win_amd64.whl", hash = "sha256:11bfc2ed8fbe4ab86bd516fadefab126f90e6dcadffa761739fcb304707dfd35", size = 1538519, upload-time = "2026-04-07T11:14:58.635Z" },
+    { url = "https://files.pythonhosted.org/packages/30/6f/4548132acc947db6d5346a248e44a8b3a22d608ef30e770fb578caaf2d00/rapidfuzz-3.14.5-cp313-cp313-win_arm64.whl", hash = "sha256:b486b5218808f6f4dc471b114b1054e63553db69705c97da0271f47bd706aedd", size = 812628, upload-time = "2026-04-07T11:15:00.552Z" },
+    { url = "https://files.pythonhosted.org/packages/00/60/69b177577290c5eab892c6f75fe89c3aff3f9ae80298a78d9372b1cecb9a/rapidfuzz-3.14.5-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:39ef8658aaf67d51667e7bdaf7096f432333377d8302ac43c70b5df8a4cf89b8", size = 1970231, upload-time = "2026-04-07T11:15:02.603Z" },
+    { url = "https://files.pythonhosted.org/packages/48/38/2fd790052659cc4e2907b63c25433f0987864b445c1aeec1a302ef5ad948/rapidfuzz-3.14.5-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:9ad37a0be705b544af6296da8edddc260d10a8ae5462530fc9991f66498bb1f9", size = 1194394, upload-time = "2026-04-07T11:15:04.572Z" },
+    { url = "https://files.pythonhosted.org/packages/80/f4/28430ad8472fc3536e8ebd51a864a226e979cfe924c6e3f83d111373aa74/rapidfuzz-3.14.5-cp313-cp313t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d45e06f60729e07d9b20c205f7e5cff90b6ef2584e852eecf46e045aea69627d", size = 1377051, upload-time = "2026-04-07T11:15:06.728Z" },
+    { url = "https://files.pythonhosted.org/packages/77/7e/9aeacabcfd1e77397968362e5b98fe14248b8307011136b17daf99752a8e/rapidfuzz-3.14.5-cp313-cp313t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e52da10236aa6212de71b9e170bace65b64b129c0dea7fc243d6c9ce976f5074", size = 3160565, upload-time = "2026-04-07T11:15:08.667Z" },
+    { url = "https://files.pythonhosted.org/packages/56/f4/db4dd7be0cd2f2022117ac5407d905f435d60e48baaea313a567ad27e865/rapidfuzz-3.14.5-cp313-cp313t-manylinux_2_39_riscv64.whl", hash = "sha256:440d30faaf682ca496170a7f0cc5453ec942e3e079f0fd802c9a7f938dfb50a3", size = 1442113, upload-time = "2026-04-07T11:15:11.138Z" },
+    { url = "https://files.pythonhosted.org/packages/a4/99/0e9f6aa57f3e32a767216f797e56dc96b720fcecfb9d8ee907ecc82f8d66/rapidfuzz-3.14.5-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:56227a61fd3d17b0cd9793132431f3a3d07c8654be96794ba9f89fe0fc8b2d09", size = 2396618, upload-time = "2026-04-07T11:15:13.154Z" },
+    { url = "https://files.pythonhosted.org/packages/60/94/44a78e39ffce17cbdd3e2b53b696acc751d5d153be0f499d052b07a4d904/rapidfuzz-3.14.5-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:2e83cd2e25bb4edd97b689d9979d9c3acccdaaf26ceac08212ceece202febcfa", size = 2478220, upload-time = "2026-04-07T11:15:15.193Z" },
+    { url = "https://files.pythonhosted.org/packages/dd/df/454311469a09a507e9d784a35796742bec22e4cebe75551e2da4e0e290fd/rapidfuzz-3.14.5-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:af3b859726cd3374287e405e14b9634563c078c5531a4f62375508addebddad1", size = 4265027, upload-time = "2026-04-07T11:15:17.28Z" },
+    { url = "https://files.pythonhosted.org/packages/fc/01/175465a9ab3e3b70ba669058372f009d1d49c1746e2dcd56b69df188d3a5/rapidfuzz-3.14.5-cp313-cp313t-win32.whl", hash = "sha256:8ce1d850b3c0178440efde9e884d98421b5e87ff925f364d6d79e23910d7593f", size = 1766814, upload-time = "2026-04-07T11:15:19.687Z" },
+    { url = "https://files.pythonhosted.org/packages/1b/a0/a9b84a47af06ebed94a1439eb2f02adebfb8628bcd30af1fe3e02f5ef56c/rapidfuzz-3.14.5-cp313-cp313t-win_amd64.whl", hash = "sha256:c84af70bcf34e99aee894e46a0f1ac77f17d0ef828179c387407642e2466d28a", size = 1582448, upload-time = "2026-04-07T11:15:21.98Z" },
+    { url = "https://files.pythonhosted.org/packages/1e/f1/5937800238b3f8248e70860d79f69ba8f73e764fff47e36bc9e2f26dbcc6/rapidfuzz-3.14.5-cp313-cp313t-win_arm64.whl", hash = "sha256:aac0ad28c686a5e72b81668b906c030ee28050b244544b8af68e12fb32543895", size = 832932, upload-time = "2026-04-07T11:15:24.358Z" },
+    { url = "https://files.pythonhosted.org/packages/81/41/aa3ffb3355e62e1bf91f6599b3092e866bc88487a07c524004943c7676df/rapidfuzz-3.14.5-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:1a31cc6d7d03e7318a0974c038959c59e19c752b81115f2e9138b3331cd64d45", size = 1943327, upload-time = "2026-04-07T11:15:26.266Z" },
+    { url = "https://files.pythonhosted.org/packages/2d/e1/c2141f1840a41e07ad2db6f724945f8f8ff3065463899a22939152dd6e09/rapidfuzz-3.14.5-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:0298d357e2bc59d572da4db0bc631009b6f8f6c9bc8c11e99a12b833f16b6575", size = 1161755, upload-time = "2026-04-07T11:15:28.659Z" },
+    { url = "https://files.pythonhosted.org/packages/ca/07/66e753eeaa353161d1d331b7dd517bb349b0bacfebe8496d7b26be26f81f/rapidfuzz-3.14.5-cp314-cp314-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:59b3dba758661a318995655435c6ab20a04ade79fa51e75bc8dc107cac8df280", size = 1376571, upload-time = "2026-04-07T11:15:31.225Z" },
+    { url = "https://files.pythonhosted.org/packages/c8/85/9535df0b78ba51f478c9ce7eb6d1f85535cc31fe356773b48fd9d3e563ca/rapidfuzz-3.14.5-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4900143d82071bdda533b00300c40b14b963ff826b3642cc463b6dd0f036585e", size = 3156468, upload-time = "2026-04-07T11:15:33.428Z" },
+    { url = "https://files.pythonhosted.org/packages/81/ee/b667eb93bba6dc4e0de658edd778e1619dc4d6aab68fa5e5c7f075152735/rapidfuzz-3.14.5-cp314-cp314-manylinux_2_39_riscv64.whl", hash = "sha256:feedf219672eef83ea6be6f3bb093bba396a8560fc75be85ba225f082903df0a", size = 1458311, upload-time = "2026-04-07T11:15:35.557Z" },
+    { url = "https://files.pythonhosted.org/packages/7d/ce/479074f5624364a48df3403c538797ef22d3ac49c19dc76c3f79fcdcc70c/rapidfuzz-3.14.5-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:419e4397a36e2665ec992d8d64c20ba4b2a42500c76ecadeca78a4f19cb9cc32", size = 2398228, upload-time = "2026-04-07T11:15:37.669Z" },
+    { url = "https://files.pythonhosted.org/packages/0b/15/a8982f649150fffbdcd6f17565974501f6ab33b2795267bffbd4a7ba905b/rapidfuzz-3.14.5-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:97131ab2be39043054ee28d99e09efe316e6d53449b7e962dfcf3c2de8b2b246", size = 2497226, upload-time = "2026-04-07T11:15:39.857Z" },
+    { url = "https://files.pythonhosted.org/packages/19/52/5267c03ef6759831b7d4625a0c9c06e87baa2fae084b61ac9c388858317b/rapidfuzz-3.14.5-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:593c00dac4e30231c35bf3b4f1da8ec0998762e9e94425586a5d636fcd57f9d0", size = 4262283, upload-time = "2026-04-07T11:15:42.279Z" },
+    { url = "https://files.pythonhosted.org/packages/71/c0/2579f343a97f5254c43bb5853baccc01488357dcb64a27bcb869b7888a4a/rapidfuzz-3.14.5-cp314-cp314-win32.whl", hash = "sha256:0084b687b02b4e569b46d8d6d4ad25659528e6081cd6d067ca453a69035f07e4", size = 1744614, upload-time = "2026-04-07T11:15:44.498Z" },
+    { url = "https://files.pythonhosted.org/packages/17/eb/8edfed1e80119dc9c35b11df4bc701eea85622ad681fff0263b6961d3224/rapidfuzz-3.14.5-cp314-cp314-win_amd64.whl", hash = "sha256:5dfa89d78f22cd773054caff44827b846161a29f2dcf7e78b8f90d086621e502", size = 1588971, upload-time = "2026-04-07T11:15:46.86Z" },
+    { url = "https://files.pythonhosted.org/packages/f6/04/5676df93c85cfa57a3045d8047318df9f3cd58c7b8a99340dd95f874795e/rapidfuzz-3.14.5-cp314-cp314-win_arm64.whl", hash = "sha256:67f3f9d2b444268ab53e47d31bab89954888d23c04c6789f2c727e51fe4b1d13", size = 834985, upload-time = "2026-04-07T11:15:49.411Z" },
+    { url = "https://files.pythonhosted.org/packages/f7/0d/4a8988cea658fe335048ddef8c876addff1b6daa3c9ca8ad65a5a2196e69/rapidfuzz-3.14.5-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:77eac0526899b3c3ad1454bb2b03cdb491d67358ec8ef0c9c48bd61b632b431d", size = 1972517, upload-time = "2026-04-07T11:15:51.819Z" },
+    { url = "https://files.pythonhosted.org/packages/1c/a3/f5cfd9965a9d9a9e32249159797c47b5d6299ea6d1629f9126b25f1c10a3/rapidfuzz-3.14.5-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:b9c6bd754d11f6e78ac54e3d86b4b11dc1ba2f13e5fc958899574532897f5a99", size = 1196056, upload-time = "2026-04-07T11:15:54.292Z" },
+    { url = "https://files.pythonhosted.org/packages/64/07/561c2e40cfd10e6630a7b0ac5a2a813aef50d944bcd1f3d260319d659d5b/rapidfuzz-3.14.5-cp314-cp314t-manylinux_2_26_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:738c96944d076deeaff70e92b65696ab4f7ecb8081d7791c5403a3257dfaf8ff", size = 1374732, upload-time = "2026-04-07T11:15:56.584Z" },
+    { url = "https://files.pythonhosted.org/packages/c2/39/123bb94fee40e2fb3b7c49b80827c7ef42d838e18def3fc2fef5a3cf817a/rapidfuzz-3.14.5-cp314-cp314t-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:f4c1bca487a17fe4226b4ffb2d30e799d2b274d692cffa76bd0746f56235fca3", size = 3166902, upload-time = "2026-04-07T11:15:58.768Z" },
+    { url = "https://files.pythonhosted.org/packages/75/0a/45716fafc9fd2e028cf20b5ac5bc704887081cd312f84edb0e325599414b/rapidfuzz-3.14.5-cp314-cp314t-manylinux_2_39_riscv64.whl", hash = "sha256:af6a90a4ed2a48fa1a2d17e9d824e6c7c950bea5bad0b707c77fd55751e6bfef", size = 1452130, upload-time = "2026-04-07T11:16:01.453Z" },
+    { url = "https://files.pythonhosted.org/packages/ca/49/4e96c413114398481c0a5b0086af32c364a18613c9a2ea578d17c4bea4ee/rapidfuzz-3.14.5-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:bf5018938208d4597b2e679a4f8cff9fd252f1df53583130ae56281a21801b64", size = 2396308, upload-time = "2026-04-07T11:16:03.588Z" },
+    { url = "https://files.pythonhosted.org/packages/89/b7/49fea9fc6878d59bd259d01dd1972d9b86117992b1c66d9b16f0a65273c3/rapidfuzz-3.14.5-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:c0919d1f89ddf91129906705723118ea09754171e4116f5a5dbc667c7bc9b261", size = 2488210, upload-time = "2026-04-07T11:16:05.871Z" },
+    { url = "https://files.pythonhosted.org/packages/0c/44/a1f732b93ffacbdad077b7c801149549b2938e1bece6addb5ad85ed74df8/rapidfuzz-3.14.5-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:93d8da883a35116d6813432177f35e570db5b0a5e30ecb0cbd7cb39c815735df", size = 4270621, upload-time = "2026-04-07T11:16:08.483Z" },
+    { url = "https://files.pythonhosted.org/packages/bb/ce/ff942d19fce5385054650bb71a58495ddda299d94661ccc4e6e7fa44868b/rapidfuzz-3.14.5-cp314-cp314t-win32.whl", hash = "sha256:0f23e37019ec07712d58976b1ab2b889f8649a7f7c2f626a2f34ea9139e79279", size = 1803950, upload-time = "2026-04-07T11:16:10.873Z" },
+    { url = "https://files.pythonhosted.org/packages/5c/0f/9aafc63f9661222b819b391c187eed29fc90ad5935f9690e5ecc2d2047a4/rapidfuzz-3.14.5-cp314-cp314t-win_amd64.whl", hash = "sha256:7d5ca9c7832e6879a707296d1463685f7c243a27846227044504741640caec66", size = 1632357, upload-time = "2026-04-07T11:16:13.1Z" },
+    { url = "https://files.pythonhosted.org/packages/70/a6/51fc1b0e61e3326e1c68a61cfd0c6b3c34c843681c4b1eefbf0596f59162/rapidfuzz-3.14.5-cp314-cp314t-win_arm64.whl", hash = "sha256:3e91dcd2549b8f8d843f98ba03a17e01f3d8b72ce942adbbb6761bc58ffce813", size = 855409, upload-time = "2026-04-07T11:16:15.787Z" },
+]
+
+[[package]]
+name = "redis"
+version = "7.4.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/7b/7f/3759b1d0d72b7c92f0d70ffd9dc962b7b7b5ee74e135f9d7d8ab06b8a318/redis-7.4.0.tar.gz", hash = "sha256:64a6ea7bf567ad43c964d2c30d82853f8df927c5c9017766c55a1d1ed95d18ad", size = 4943913, upload-time = "2026-03-24T09:14:37.53Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/74/3a/95deec7db1eb53979973ebd156f3369a72732208d1391cd2e5d127062a32/redis-7.4.0-py3-none-any.whl", hash = "sha256:a9c74a5c893a5ef8455a5adb793a31bb70feb821c86eccb62eebef5a19c429ec", size = 409772, upload-time = "2026-03-24T09:14:35.968Z" },
+]
+
+[[package]]
+name = "referencing"
+version = "0.37.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "attrs" },
+    { name = "rpds-py" },
+    { name = "typing-extensions", marker = "python_full_version < '3.13'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/22/f5/df4e9027acead3ecc63e50fe1e36aca1523e1719559c499951bb4b53188f/referencing-0.37.0.tar.gz", hash = "sha256:44aefc3142c5b842538163acb373e24cce6632bd54bdb01b21ad5863489f50d8", size = 78036, upload-time = "2025-10-13T15:30:48.871Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/2c/58/ca301544e1fa93ed4f80d724bf5b194f6e4b945841c5bfd555878eea9fcb/referencing-0.37.0-py3-none-any.whl", hash = "sha256:381329a9f99628c9069361716891d34ad94af76e461dcb0335825aecc7692231", size = 26766, upload-time = "2025-10-13T15:30:47.625Z" },
+]
+
+[[package]]
+name = "regex"
+version = "2026.4.4"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/cb/0e/3a246dbf05666918bd3664d9d787f84a9108f6f43cc953a077e4a7dfdb7e/regex-2026.4.4.tar.gz", hash = "sha256:e08270659717f6973523ce3afbafa53515c4dc5dcad637dc215b6fd50f689423", size = 416000, upload-time = "2026-04-03T20:56:28.155Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/e5/28/b972a4d3df61e1d7bcf1b59fdb3cddef22f88b6be43f161bb41ebc0e4081/regex-2026.4.4-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:c07ab8794fa929e58d97a0e1796b8b76f70943fa39df225ac9964615cf1f9d52", size = 490434, upload-time = "2026-04-03T20:53:40.219Z" },
+    { url = "https://files.pythonhosted.org/packages/84/20/30041446cf6dc3e0eab344fc62770e84c23b6b68a3b657821f9f80cb69b4/regex-2026.4.4-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:2c785939dc023a1ce4ec09599c032cc9933d258a998d16ca6f2b596c010940eb", size = 292061, upload-time = "2026-04-03T20:53:41.862Z" },
+    { url = "https://files.pythonhosted.org/packages/62/c8/3baa06d75c98c46d4cc4262b71fd2edb9062b5665e868bca57859dadf93a/regex-2026.4.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:1b1ce5c81c9114f1ce2f9288a51a8fd3aeea33a0cc440c415bf02da323aa0a76", size = 289628, upload-time = "2026-04-03T20:53:43.701Z" },
+    { url = "https://files.pythonhosted.org/packages/31/87/3accf55634caad8c0acab23f5135ef7d4a21c39f28c55c816ae012931408/regex-2026.4.4-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:760ef21c17d8e6a4fe8cf406a97cf2806a4df93416ccc82fc98d25b1c20425be", size = 796651, upload-time = "2026-04-03T20:53:45.379Z" },
+    { url = "https://files.pythonhosted.org/packages/f6/0c/aaa2c83f34efedbf06f61cb1942c25f6cf1ee3b200f832c4d05f28306c2e/regex-2026.4.4-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:7088fcdcb604a4417c208e2169715800d28838fefd7455fbe40416231d1d47c1", size = 865916, upload-time = "2026-04-03T20:53:47.064Z" },
+    { url = "https://files.pythonhosted.org/packages/d9/f6/8c6924c865124643e8f37823eca845dc27ac509b2ee58123685e71cd0279/regex-2026.4.4-cp312-cp312-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:07edca1ba687998968f7db5bc355288d0c6505caa7374f013d27356d93976d13", size = 912287, upload-time = "2026-04-03T20:53:49.422Z" },
+    { url = "https://files.pythonhosted.org/packages/11/0e/a9f6f81013e0deaf559b25711623864970fe6a098314e374ccb1540a4152/regex-2026.4.4-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:993f657a7c1c6ec51b5e0ba97c9817d06b84ea5fa8d82e43b9405de0defdc2b9", size = 801126, upload-time = "2026-04-03T20:53:51.096Z" },
+    { url = "https://files.pythonhosted.org/packages/71/61/3a0cc8af2dc0c8deb48e644dd2521f173f7e6513c6e195aad9aa8dd77ac5/regex-2026.4.4-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:2b69102a743e7569ebee67e634a69c4cb7e59d6fa2e1aa7d3bdbf3f61435f62d", size = 776788, upload-time = "2026-04-03T20:53:52.889Z" },
+    { url = "https://files.pythonhosted.org/packages/64/0b/8bb9cbf21ef7dee58e49b0fdb066a7aded146c823202e16494a36777594f/regex-2026.4.4-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:6dac006c8b6dda72d86ea3d1333d45147de79a3a3f26f10c1cf9287ca4ca0ac3", size = 785184, upload-time = "2026-04-03T20:53:55.627Z" },
+    { url = "https://files.pythonhosted.org/packages/99/c2/d3e80e8137b25ee06c92627de4e4d98b94830e02b3e6f81f3d2e3f504cf5/regex-2026.4.4-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:50a766ee2010d504554bfb5f578ed2e066898aa26411d57e6296230627cdefa0", size = 859913, upload-time = "2026-04-03T20:53:57.249Z" },
+    { url = "https://files.pythonhosted.org/packages/bc/e6/9d5d876157d969c804622456ef250017ac7a8f83e0e14f903b9e6df5ce95/regex-2026.4.4-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:9e2f5217648f68e3028c823df58663587c1507a5ba8419f4fdfc8a461be76043", size = 765732, upload-time = "2026-04-03T20:53:59.428Z" },
+    { url = "https://files.pythonhosted.org/packages/82/80/b568935b4421388561c8ed42aff77247285d3ae3bb2a6ca22af63bae805e/regex-2026.4.4-cp312-cp312-musllinux_1_2_s390x.whl", hash = "sha256:39d8de85a08e32632974151ba59c6e9140646dcc36c80423962b1c5c0a92e244", size = 852152, upload-time = "2026-04-03T20:54:01.505Z" },
+    { url = "https://files.pythonhosted.org/packages/39/29/f0f81217e21cd998245da047405366385d5c6072048038a3d33b37a79dc0/regex-2026.4.4-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:55d9304e0e7178dfb1e106c33edf834097ddf4a890e2f676f6c5118f84390f73", size = 789076, upload-time = "2026-04-03T20:54:03.323Z" },
+    { url = "https://files.pythonhosted.org/packages/49/1d/1d957a61976ab9d4e767dd4f9d04b66cc0c41c5e36cf40e2d43688b5ae6f/regex-2026.4.4-cp312-cp312-win32.whl", hash = "sha256:04bb679bc0bde8a7bfb71e991493d47314e7b98380b083df2447cda4b6edb60f", size = 266700, upload-time = "2026-04-03T20:54:05.639Z" },
+    { url = "https://files.pythonhosted.org/packages/c5/5c/bf575d396aeb58ea13b06ef2adf624f65b70fafef6950a80fc3da9cae3bc/regex-2026.4.4-cp312-cp312-win_amd64.whl", hash = "sha256:db0ac18435a40a2543dbb3d21e161a6c78e33e8159bd2e009343d224bb03bb1b", size = 277768, upload-time = "2026-04-03T20:54:07.312Z" },
+    { url = "https://files.pythonhosted.org/packages/c9/27/049df16ec6a6828ccd72add3c7f54b4df029669bea8e9817df6fff58be90/regex-2026.4.4-cp312-cp312-win_arm64.whl", hash = "sha256:4ce255cc05c1947a12989c6db801c96461947adb7a59990f1360b5983fab4983", size = 270568, upload-time = "2026-04-03T20:54:09.484Z" },
+    { url = "https://files.pythonhosted.org/packages/9d/83/c4373bc5f31f2cf4b66f9b7c31005bd87fe66f0dce17701f7db4ee79ee29/regex-2026.4.4-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:62f5519042c101762509b1d717b45a69c0139d60414b3c604b81328c01bd1943", size = 490273, upload-time = "2026-04-03T20:54:11.202Z" },
+    { url = "https://files.pythonhosted.org/packages/46/f8/fe62afbcc3cf4ad4ac9adeaafd98aa747869ae12d3e8e2ac293d0593c435/regex-2026.4.4-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:3790ba9fb5dd76715a7afe34dbe603ba03f8820764b1dc929dd08106214ed031", size = 291954, upload-time = "2026-04-03T20:54:13.412Z" },
+    { url = "https://files.pythonhosted.org/packages/5a/92/4712b9fe6a33d232eeb1c189484b80c6c4b8422b90e766e1195d6e758207/regex-2026.4.4-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:8fae3c6e795d7678963f2170152b0d892cf6aee9ee8afc8c45e6be38d5107fe7", size = 289487, upload-time = "2026-04-03T20:54:15.824Z" },
+    { url = "https://files.pythonhosted.org/packages/88/2c/f83b93f85e01168f1070f045a42d4c937b69fdb8dd7ae82d307253f7e36e/regex-2026.4.4-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:298c3ec2d53225b3bf91142eb9691025bab610e0c0c51592dde149db679b3d17", size = 796646, upload-time = "2026-04-03T20:54:18.229Z" },
+    { url = "https://files.pythonhosted.org/packages/df/55/61a2e17bf0c4dc57e11caf8dd11771280d8aaa361785f9e3bc40d653f4a7/regex-2026.4.4-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:e9638791082eaf5b3ac112c587518ee78e083a11c4b28012d8fe2a0f536dfb17", size = 865904, upload-time = "2026-04-03T20:54:20.019Z" },
+    { url = "https://files.pythonhosted.org/packages/45/32/1ac8ed1b5a346b5993a3d256abe0a0f03b0b73c8cc88d928537368ac65b6/regex-2026.4.4-cp313-cp313-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:ae3e764bd4c5ff55035dc82a8d49acceb42a5298edf6eb2fc4d328ee5dd7afae", size = 912304, upload-time = "2026-04-03T20:54:22.403Z" },
+    { url = "https://files.pythonhosted.org/packages/26/47/2ee5c613ab546f0eddebf9905d23e07beb933416b1246c2d8791d01979b4/regex-2026.4.4-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ffa81f81b80047ba89a3c69ae6a0f78d06f4a42ce5126b0eb2a0a10ad44e0b2e", size = 801126, upload-time = "2026-04-03T20:54:24.308Z" },
+    { url = "https://files.pythonhosted.org/packages/75/cd/41dacd129ca9fd20bd7d02f83e0fad83e034ac8a084ec369c90f55ef37e2/regex-2026.4.4-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:f56ebf9d70305307a707911b88469213630aba821e77de7d603f9d2f0730687d", size = 776772, upload-time = "2026-04-03T20:54:26.319Z" },
+    { url = "https://files.pythonhosted.org/packages/89/6d/5af0b588174cb5f46041fa7dd64d3fd5cd2fe51f18766703d1edc387f324/regex-2026.4.4-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:773d1dfd652bbffb09336abf890bfd64785c7463716bf766d0eb3bc19c8b7f27", size = 785228, upload-time = "2026-04-03T20:54:28.387Z" },
+    { url = "https://files.pythonhosted.org/packages/b7/3b/f5a72b7045bd59575fc33bf1345f156fcfd5a8484aea6ad84b12c5a82114/regex-2026.4.4-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:d51d20befd5275d092cdffba57ded05f3c436317ee56466c8928ac32d960edaf", size = 860032, upload-time = "2026-04-03T20:54:30.641Z" },
+    { url = "https://files.pythonhosted.org/packages/39/a4/72a317003d6fcd7a573584a85f59f525dfe8f67e355ca74eb6b53d66a5e2/regex-2026.4.4-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:0a51cdb3c1e9161154f976cb2bef9894bc063ac82f31b733087ffb8e880137d0", size = 765714, upload-time = "2026-04-03T20:54:32.789Z" },
+    { url = "https://files.pythonhosted.org/packages/25/1e/5672e16f34dbbcb2560cc7e6a2fbb26dfa8b270711e730101da4423d3973/regex-2026.4.4-cp313-cp313-musllinux_1_2_s390x.whl", hash = "sha256:ae5266a82596114e41fb5302140e9630204c1b5f325c770bec654b95dd54b0aa", size = 852078, upload-time = "2026-04-03T20:54:34.546Z" },
+    { url = "https://files.pythonhosted.org/packages/f7/0d/c813f0af7c6cc7ed7b9558bac2e5120b60ad0fa48f813e4d4bd55446f214/regex-2026.4.4-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:c882cd92ec68585e9c1cf36c447ec846c0d94edd706fe59e0c198e65822fd23b", size = 789181, upload-time = "2026-04-03T20:54:36.642Z" },
+    { url = "https://files.pythonhosted.org/packages/ea/6d/a344608d1adbd2a95090ddd906cec09a11be0e6517e878d02a5123e0917f/regex-2026.4.4-cp313-cp313-win32.whl", hash = "sha256:05568c4fbf3cb4fa9e28e3af198c40d3237cf6041608a9022285fe567ec3ad62", size = 266690, upload-time = "2026-04-03T20:54:38.343Z" },
+    { url = "https://files.pythonhosted.org/packages/31/07/54049f89b46235ca6f45cd6c88668a7050e77d4a15555e47dd40fde75263/regex-2026.4.4-cp313-cp313-win_amd64.whl", hash = "sha256:3384df51ed52db0bea967e21458ab0a414f67cdddfd94401688274e55147bb81", size = 277733, upload-time = "2026-04-03T20:54:40.11Z" },
+    { url = "https://files.pythonhosted.org/packages/0e/21/61366a8e20f4d43fb597708cac7f0e2baadb491ecc9549b4980b2be27d16/regex-2026.4.4-cp313-cp313-win_arm64.whl", hash = "sha256:acd38177bd2c8e69a411d6521760806042e244d0ef94e2dd03ecdaa8a3c99427", size = 270565, upload-time = "2026-04-03T20:54:41.883Z" },
+    { url = "https://files.pythonhosted.org/packages/f1/1e/3a2b9672433bef02f5d39aa1143ca2c08f311c1d041c464a42be9ae648dc/regex-2026.4.4-cp313-cp313t-macosx_10_13_universal2.whl", hash = "sha256:f94a11a9d05afcfcfa640e096319720a19cc0c9f7768e1a61fceee6a3afc6c7c", size = 494126, upload-time = "2026-04-03T20:54:43.602Z" },
+    { url = "https://files.pythonhosted.org/packages/4e/4b/c132a4f4fe18ad3340d89fcb56235132b69559136036b845be3c073142ed/regex-2026.4.4-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:36bcb9d6d1307ab629edc553775baada2aefa5c50ccc0215fbfd2afcfff43141", size = 293882, upload-time = "2026-04-03T20:54:45.41Z" },
+    { url = "https://files.pythonhosted.org/packages/f4/5f/eaa38092ce7a023656280f2341dbbd4ad5f05d780a70abba7bb4f4bea54c/regex-2026.4.4-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:261c015b3e2ed0919157046d768774ecde57f03d8fa4ba78d29793447f70e717", size = 292334, upload-time = "2026-04-03T20:54:47.051Z" },
+    { url = "https://files.pythonhosted.org/packages/5f/f6/dd38146af1392dac33db7074ab331cec23cced3759167735c42c5460a243/regex-2026.4.4-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c228cf65b4a54583763645dcd73819b3b381ca8b4bb1b349dee1c135f4112c07", size = 811691, upload-time = "2026-04-03T20:54:49.074Z" },
+    { url = "https://files.pythonhosted.org/packages/7a/f0/dc54c2e69f5eeec50601054998ec3690d5344277e782bd717e49867c1d29/regex-2026.4.4-cp313-cp313t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:dd2630faeb6876fb0c287f664d93ddce4d50cd46c6e88e60378c05c9047e08ca", size = 871227, upload-time = "2026-04-03T20:54:51.035Z" },
+    { url = "https://files.pythonhosted.org/packages/a1/af/cb16bd5dc61621e27df919a4449bbb7e5a1034c34d307e0a706e9cc0f3e3/regex-2026.4.4-cp313-cp313t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:6a50ab11b7779b849472337191f3a043e27e17f71555f98d0092fa6d73364520", size = 917435, upload-time = "2026-04-03T20:54:52.994Z" },
+    { url = "https://files.pythonhosted.org/packages/5c/71/8b260897f22996b666edd9402861668f45a2ca259f665ac029e6104a2d7d/regex-2026.4.4-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0734f63afe785138549fbe822a8cfeaccd1bae814c5057cc0ed5b9f2de4fc883", size = 816358, upload-time = "2026-04-03T20:54:54.884Z" },
+    { url = "https://files.pythonhosted.org/packages/1c/60/775f7f72a510ef238254906c2f3d737fc80b16ca85f07d20e318d2eea894/regex-2026.4.4-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:c4ee50606cb1967db7e523224e05f32089101945f859928e65657a2cbb3d278b", size = 785549, upload-time = "2026-04-03T20:54:57.01Z" },
+    { url = "https://files.pythonhosted.org/packages/58/42/34d289b3627c03cf381e44da534a0021664188fa49ba41513da0b4ec6776/regex-2026.4.4-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:6c1818f37be3ca02dcb76d63f2c7aaba4b0dc171b579796c6fbe00148dfec6b1", size = 801364, upload-time = "2026-04-03T20:54:58.981Z" },
+    { url = "https://files.pythonhosted.org/packages/fc/20/f6ecf319b382a8f1ab529e898b222c3f30600fcede7834733c26279e7465/regex-2026.4.4-cp313-cp313t-musllinux_1_2_ppc64le.whl", hash = "sha256:f5bfc2741d150d0be3e4a0401a5c22b06e60acb9aa4daa46d9e79a6dcd0f135b", size = 866221, upload-time = "2026-04-03T20:55:00.88Z" },
+    { url = "https://files.pythonhosted.org/packages/92/6a/9f16d3609d549bd96d7a0b2aee1625d7512ba6a03efc01652149ef88e74d/regex-2026.4.4-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:504ffa8a03609a087cad81277a629b6ce884b51a24bd388a7980ad61748618ff", size = 772530, upload-time = "2026-04-03T20:55:03.213Z" },
+    { url = "https://files.pythonhosted.org/packages/fa/f6/aa9768bc96a4c361ac96419fbaf2dcdc33970bb813df3ba9b09d5d7b6d96/regex-2026.4.4-cp313-cp313t-musllinux_1_2_s390x.whl", hash = "sha256:70aadc6ff12e4b444586e57fc30771f86253f9f0045b29016b9605b4be5f7dfb", size = 856989, upload-time = "2026-04-03T20:55:05.087Z" },
+    { url = "https://files.pythonhosted.org/packages/4d/b4/c671db3556be2473ae3e4bb7a297c518d281452871501221251ea4ecba57/regex-2026.4.4-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:f4f83781191007b6ef43b03debc35435f10cad9b96e16d147efe84a1d48bdde4", size = 803241, upload-time = "2026-04-03T20:55:07.162Z" },
+    { url = "https://files.pythonhosted.org/packages/2a/5c/83e3b1d89fa4f6e5a1bc97b4abd4a9a97b3c1ac7854164f694f5f0ba98a0/regex-2026.4.4-cp313-cp313t-win32.whl", hash = "sha256:e014a797de43d1847df957c0a2a8e861d1c17547ee08467d1db2c370b7568baa", size = 269921, upload-time = "2026-04-03T20:55:09.62Z" },
+    { url = "https://files.pythonhosted.org/packages/28/07/077c387121f42cdb4d92b1301133c0d93b5709d096d1669ab847dda9fe2e/regex-2026.4.4-cp313-cp313t-win_amd64.whl", hash = "sha256:b15b88b0d52b179712632832c1d6e58e5774f93717849a41096880442da41ab0", size = 281240, upload-time = "2026-04-03T20:55:11.521Z" },
+    { url = "https://files.pythonhosted.org/packages/9d/22/ead4a4abc7c59a4d882662aa292ca02c8b617f30b6e163bc1728879e9353/regex-2026.4.4-cp313-cp313t-win_arm64.whl", hash = "sha256:586b89cdadf7d67bf86ae3342a4dcd2b8d70a832d90c18a0ae955105caf34dbe", size = 272440, upload-time = "2026-04-03T20:55:13.365Z" },
+    { url = "https://files.pythonhosted.org/packages/f0/f5/ed97c2dc47b5fbd4b73c0d7d75f9ebc8eca139f2bbef476bba35f28c0a77/regex-2026.4.4-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:2da82d643fa698e5e5210e54af90181603d5853cf469f5eedf9bfc8f59b4b8c7", size = 490343, upload-time = "2026-04-03T20:55:15.241Z" },
+    { url = "https://files.pythonhosted.org/packages/80/e9/de4828a7385ec166d673a5790ad06ac48cdaa98bc0960108dd4b9cc1aef7/regex-2026.4.4-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:54a1189ad9d9357760557c91103d5e421f0a2dabe68a5cdf9103d0dcf4e00752", size = 291909, upload-time = "2026-04-03T20:55:17.558Z" },
+    { url = "https://files.pythonhosted.org/packages/b4/d6/5cfbfc97f3201a4d24b596a77957e092030dcc4205894bc035cedcfce62f/regex-2026.4.4-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:76d67d5afb1fe402d10a6403bae668d000441e2ab115191a804287d53b772951", size = 289692, upload-time = "2026-04-03T20:55:20.561Z" },
+    { url = "https://files.pythonhosted.org/packages/8e/ac/f2212d9fd56fe897e36d0110ba30ba2d247bd6410c5bd98499c7e5a1e1f2/regex-2026.4.4-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e7cd3e4ee8d80447a83bbc9ab0c8459781fa77087f856c3e740d7763be0df27f", size = 796979, upload-time = "2026-04-03T20:55:22.56Z" },
+    { url = "https://files.pythonhosted.org/packages/c9/e3/a016c12675fbac988a60c7e1c16e67823ff0bc016beb27bd7a001dbdabc6/regex-2026.4.4-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:2e19e18c568d2866d8b6a6dfad823db86193503f90823a8f66689315ba28fbe8", size = 866744, upload-time = "2026-04-03T20:55:24.646Z" },
+    { url = "https://files.pythonhosted.org/packages/af/a4/0b90ca4cf17adc3cb43de80ec71018c37c88ad64987e8d0d481a95ca60b5/regex-2026.4.4-cp314-cp314-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:7698a6f38730fd1385d390d1ed07bb13dce39aa616aca6a6d89bea178464b9a4", size = 911613, upload-time = "2026-04-03T20:55:27.033Z" },
+    { url = "https://files.pythonhosted.org/packages/8e/3b/2b3dac0b82d41ab43aa87c6ecde63d71189d03fe8854b8ca455a315edac3/regex-2026.4.4-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:173a66f3651cdb761018078e2d9487f4cf971232c990035ec0eb1cdc6bf929a9", size = 800551, upload-time = "2026-04-03T20:55:29.532Z" },
+    { url = "https://files.pythonhosted.org/packages/25/fe/5365eb7aa0e753c4b5957815c321519ecab033c279c60e1b1ae2367fa810/regex-2026.4.4-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:fa7922bbb2cc84fa062d37723f199d4c0cd200245ce269c05db82d904db66b83", size = 776911, upload-time = "2026-04-03T20:55:31.526Z" },
+    { url = "https://files.pythonhosted.org/packages/aa/b3/7fb0072156bba065e3b778a7bc7b0a6328212be5dd6a86fd207e0c4f2dab/regex-2026.4.4-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:59f67cd0a0acaf0e564c20bbd7f767286f23e91e2572c5703bf3e56ea7557edb", size = 785751, upload-time = "2026-04-03T20:55:33.797Z" },
+    { url = "https://files.pythonhosted.org/packages/02/1a/9f83677eb699273e56e858f7bd95acdbee376d42f59e8bfca2fd80d79df3/regex-2026.4.4-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:475e50f3f73f73614f7cba5524d6de49dee269df00272a1b85e3d19f6d498465", size = 860484, upload-time = "2026-04-03T20:55:35.745Z" },
+    { url = "https://files.pythonhosted.org/packages/3b/7a/93937507b61cfcff8b4c5857f1b452852b09f741daa9acae15c971d8554e/regex-2026.4.4-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:a1c0c7d67b64d85ac2e1879923bad2f08a08f3004055f2f406ef73c850114bd4", size = 765939, upload-time = "2026-04-03T20:55:37.972Z" },
+    { url = "https://files.pythonhosted.org/packages/86/ea/81a7f968a351c6552b1670ead861e2a385be730ee28402233020c67f9e0f/regex-2026.4.4-cp314-cp314-musllinux_1_2_s390x.whl", hash = "sha256:1371c2ccbb744d66ee63631cc9ca12aa233d5749972626b68fe1a649dd98e566", size = 851417, upload-time = "2026-04-03T20:55:39.92Z" },
+    { url = "https://files.pythonhosted.org/packages/4c/7e/323c18ce4b5b8f44517a36342961a0306e931e499febbd876bb149d900f0/regex-2026.4.4-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:59968142787042db793348a3f5b918cf24ced1f23247328530e063f89c128a95", size = 789056, upload-time = "2026-04-03T20:55:42.303Z" },
+    { url = "https://files.pythonhosted.org/packages/c0/af/e7510f9b11b1913b0cd44eddb784b2d650b2af6515bfce4cffcc5bfd1d38/regex-2026.4.4-cp314-cp314-win32.whl", hash = "sha256:59efe72d37fd5a91e373e5146f187f921f365f4abc1249a5ab446a60f30dd5f8", size = 272130, upload-time = "2026-04-03T20:55:44.995Z" },
+    { url = "https://files.pythonhosted.org/packages/9a/51/57dae534c915e2d3a21490e88836fa2ae79dde3b66255ecc0c0a155d2c10/regex-2026.4.4-cp314-cp314-win_amd64.whl", hash = "sha256:e0aab3ff447845049d676827d2ff714aab4f73f340e155b7de7458cf53baa5a4", size = 280992, upload-time = "2026-04-03T20:55:47.316Z" },
+    { url = "https://files.pythonhosted.org/packages/0a/5e/abaf9f4c3792e34edb1434f06717fae2b07888d85cb5cec29f9204931bf8/regex-2026.4.4-cp314-cp314-win_arm64.whl", hash = "sha256:a7a5bb6aa0cf62208bb4fa079b0c756734f8ad0e333b425732e8609bd51ee22f", size = 273563, upload-time = "2026-04-03T20:55:49.273Z" },
+    { url = "https://files.pythonhosted.org/packages/ff/06/35da85f9f217b9538b99cbb170738993bcc3b23784322decb77619f11502/regex-2026.4.4-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:97850d0638391bdc7d35dc1c1039974dcb921eaafa8cc935ae4d7f272b1d60b3", size = 494191, upload-time = "2026-04-03T20:55:51.258Z" },
+    { url = "https://files.pythonhosted.org/packages/54/5b/1bc35f479eef8285c4baf88d8c002023efdeebb7b44a8735b36195486ae7/regex-2026.4.4-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:ee7337f88f2a580679f7bbfe69dc86c043954f9f9c541012f49abc554a962f2e", size = 293877, upload-time = "2026-04-03T20:55:53.214Z" },
+    { url = "https://files.pythonhosted.org/packages/39/5b/f53b9ad17480b3ddd14c90da04bfb55ac6894b129e5dea87bcaf7d00e336/regex-2026.4.4-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:7429f4e6192c11d659900c0648ba8776243bf396ab95558b8c51a345afeddde6", size = 292410, upload-time = "2026-04-03T20:55:55.736Z" },
+    { url = "https://files.pythonhosted.org/packages/bb/56/52377f59f60a7c51aa4161eecf0b6032c20b461805aca051250da435ffc9/regex-2026.4.4-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:dc4f10fbd5dd13dcf4265b4cc07d69ca70280742870c97ae10093e3d66000359", size = 811831, upload-time = "2026-04-03T20:55:57.802Z" },
+    { url = "https://files.pythonhosted.org/packages/dd/63/8026310bf066f702a9c361f83a8c9658f3fe4edb349f9c1e5d5273b7c40c/regex-2026.4.4-cp314-cp314t-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:a152560af4f9742b96f3827090f866eeec5becd4765c8e0d3473d9d280e76a5a", size = 871199, upload-time = "2026-04-03T20:56:00.333Z" },
+    { url = "https://files.pythonhosted.org/packages/20/9f/a514bbb00a466dbb506d43f187a04047f7be1505f10a9a15615ead5080ee/regex-2026.4.4-cp314-cp314t-manylinux2014_s390x.manylinux_2_17_s390x.manylinux_2_28_s390x.whl", hash = "sha256:54170b3e95339f415d54651f97df3bff7434a663912f9358237941bbf9143f55", size = 917649, upload-time = "2026-04-03T20:56:02.445Z" },
+    { url = "https://files.pythonhosted.org/packages/cb/6b/8399f68dd41a2030218839b9b18360d79b86d22b9fab5ef477c7f23ca67c/regex-2026.4.4-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:07f190d65f5a72dcb9cf7106bfc3d21e7a49dd2879eda2207b683f32165e4d99", size = 816388, upload-time = "2026-04-03T20:56:04.595Z" },
+    { url = "https://files.pythonhosted.org/packages/1e/9c/103963f47c24339a483b05edd568594c2be486188f688c0170fd504b2948/regex-2026.4.4-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:9a2741ce5a29d3c84b0b94261ba630ab459a1b847a0d6beca7d62d188175c790", size = 785746, upload-time = "2026-04-03T20:56:07.13Z" },
+    { url = "https://files.pythonhosted.org/packages/fa/ee/7f6054c0dec0cee3463c304405e4ff42e27cff05bf36fcb34be549ab17bd/regex-2026.4.4-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:b26c30df3a28fd9793113dac7385a4deb7294a06c0f760dd2b008bd49a9139bc", size = 801483, upload-time = "2026-04-03T20:56:09.365Z" },
+    { url = "https://files.pythonhosted.org/packages/30/c2/51d3d941cf6070dc00c3338ecf138615fc3cce0421c3df6abe97a08af61a/regex-2026.4.4-cp314-cp314t-musllinux_1_2_ppc64le.whl", hash = "sha256:421439d1bee44b19f4583ccf42670ca464ffb90e9fdc38d37f39d1ddd1e44f1f", size = 866331, upload-time = "2026-04-03T20:56:12.039Z" },
+    { url = "https://files.pythonhosted.org/packages/16/e8/76d50dcc122ac33927d939f350eebcfe3dbcbda96913e03433fc36de5e63/regex-2026.4.4-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:b40379b53ecbc747fd9bdf4a0ea14eb8188ca1bd0f54f78893a39024b28f4863", size = 772673, upload-time = "2026-04-03T20:56:14.558Z" },
+    { url = "https://files.pythonhosted.org/packages/a5/6e/5f6bf75e20ea6873d05ba4ec78378c375cbe08cdec571c83fbb01606e563/regex-2026.4.4-cp314-cp314t-musllinux_1_2_s390x.whl", hash = "sha256:08c55c13d2eef54f73eeadc33146fb0baaa49e7335eb1aff6ae1324bf0ddbe4a", size = 857146, upload-time = "2026-04-03T20:56:16.663Z" },
+    { url = "https://files.pythonhosted.org/packages/0b/33/3c76d9962949e487ebba353a18e89399f292287204ac8f2f4cfc3a51c233/regex-2026.4.4-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:9776b85f510062f5a75ef112afe5f494ef1635607bf1cc220c1391e9ac2f5e81", size = 803463, upload-time = "2026-04-03T20:56:18.923Z" },
+    { url = "https://files.pythonhosted.org/packages/19/eb/ef32dcd2cb69b69bc0c3e55205bce94a7def48d495358946bc42186dcccc/regex-2026.4.4-cp314-cp314t-win32.whl", hash = "sha256:385edaebde5db5be103577afc8699fea73a0e36a734ba24870be7ffa61119d74", size = 275709, upload-time = "2026-04-03T20:56:20.996Z" },
+    { url = "https://files.pythonhosted.org/packages/a0/86/c291bf740945acbf35ed7dbebf8e2eea2f3f78041f6bd7cdab80cb274dc0/regex-2026.4.4-cp314-cp314t-win_amd64.whl", hash = "sha256:5d354b18839328927832e2fa5f7c95b7a3ccc39e7a681529e1685898e6436d45", size = 285622, upload-time = "2026-04-03T20:56:23.641Z" },
+    { url = "https://files.pythonhosted.org/packages/d5/e7/ec846d560ae6a597115153c02ca6138a7877a1748b2072d9521c10a93e58/regex-2026.4.4-cp314-cp314t-win_arm64.whl", hash = "sha256:af0384cb01a33600c49505c27c6c57ab0b27bf84a74e28524c92ca897ebdac9d", size = 275773, upload-time = "2026-04-03T20:56:26.07Z" },
+]
+
+[[package]]
+name = "requests"
+version = "2.33.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "certifi" },
+    { name = "charset-normalizer" },
+    { name = "idna" },
+    { name = "urllib3" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/5f/a4/98b9c7c6428a668bf7e42ebb7c79d576a1c3c1e3ae2d47e674b468388871/requests-2.33.1.tar.gz", hash = "sha256:18817f8c57c6263968bc123d237e3b8b08ac046f5456bd1e307ee8f4250d3517", size = 134120, upload-time = "2026-03-30T16:09:15.531Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/d7/8e/7540e8a2036f79a125c1d2ebadf69ed7901608859186c856fa0388ef4197/requests-2.33.1-py3-none-any.whl", hash = "sha256:4e6d1ef462f3626a1f0a0a9c42dd93c63bad33f9f1c1937509b8c5c8718ab56a", size = 64947, upload-time = "2026-03-30T16:09:13.83Z" },
+]
+
+[[package]]
+name = "requests-toolbelt"
+version = "1.0.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "requests" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/f3/61/d7545dafb7ac2230c70d38d31cbfe4cc64f7144dc41f6e4e4b78ecd9f5bb/requests-toolbelt-1.0.0.tar.gz", hash = "sha256:7681a0a3d047012b5bdc0ee37d7f8f07ebe76ab08caeccfc3921ce23c88d5bc6", size = 206888, upload-time = "2023-05-01T04:11:33.229Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/3f/51/d4db610ef29373b879047326cbf6fa98b6c1969d6f6dc423279de2b1be2c/requests_toolbelt-1.0.0-py2.py3-none-any.whl", hash = "sha256:cccfdd665f0a24fcf4726e690f65639d272bb0637b9b92dfd91a5568ccf6bd06", size = 54481, upload-time = "2023-05-01T04:11:28.427Z" },
+]
+
+[[package]]
+name = "rich"
+version = "15.0.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "markdown-it-py" },
+    { name = "pygments" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/c0/8f/0722ca900cc807c13a6a0c696dacf35430f72e0ec571c4275d2371fca3e9/rich-15.0.0.tar.gz", hash = "sha256:edd07a4824c6b40189fb7ac9bc4c52536e9780fbbfbddf6f1e2502c31b068c36", size = 230680, upload-time = "2026-04-12T08:24:00.75Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/82/3b/64d4899d73f91ba49a8c18a8ff3f0ea8f1c1d75481760df8c68ef5235bf5/rich-15.0.0-py3-none-any.whl", hash = "sha256:33bd4ef74232fb73fe9279a257718407f169c09b78a87ad3d296f548e27de0bb", size = 310654, upload-time = "2026-04-12T08:24:02.83Z" },
+]
+
+[[package]]
+name = "rpds-py"
+version = "0.30.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/20/af/3f2f423103f1113b36230496629986e0ef7e199d2aa8392452b484b38ced/rpds_py-0.30.0.tar.gz", hash = "sha256:dd8ff7cf90014af0c0f787eea34794ebf6415242ee1d6fa91eaba725cc441e84", size = 69469, upload-time = "2025-11-30T20:24:38.837Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/03/e7/98a2f4ac921d82f33e03f3835f5bf3a4a40aa1bfdc57975e74a97b2b4bdd/rpds_py-0.30.0-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:a161f20d9a43006833cd7068375a94d035714d73a172b681d8881820600abfad", size = 375086, upload-time = "2025-11-30T20:22:17.93Z" },
+    { url = "https://files.pythonhosted.org/packages/4d/a1/bca7fd3d452b272e13335db8d6b0b3ecde0f90ad6f16f3328c6fb150c889/rpds_py-0.30.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:6abc8880d9d036ecaafe709079969f56e876fcf107f7a8e9920ba6d5a3878d05", size = 359053, upload-time = "2025-11-30T20:22:19.297Z" },
+    { url = "https://files.pythonhosted.org/packages/65/1c/ae157e83a6357eceff62ba7e52113e3ec4834a84cfe07fa4b0757a7d105f/rpds_py-0.30.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ca28829ae5f5d569bb62a79512c842a03a12576375d5ece7d2cadf8abe96ec28", size = 390763, upload-time = "2025-11-30T20:22:21.661Z" },
+    { url = "https://files.pythonhosted.org/packages/d4/36/eb2eb8515e2ad24c0bd43c3ee9cd74c33f7ca6430755ccdb240fd3144c44/rpds_py-0.30.0-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:a1010ed9524c73b94d15919ca4d41d8780980e1765babf85f9a2f90d247153dd", size = 408951, upload-time = "2025-11-30T20:22:23.408Z" },
+    { url = "https://files.pythonhosted.org/packages/d6/65/ad8dc1784a331fabbd740ef6f71ce2198c7ed0890dab595adb9ea2d775a1/rpds_py-0.30.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f8d1736cfb49381ba528cd5baa46f82fdc65c06e843dab24dd70b63d09121b3f", size = 514622, upload-time = "2025-11-30T20:22:25.16Z" },
+    { url = "https://files.pythonhosted.org/packages/63/8e/0cfa7ae158e15e143fe03993b5bcd743a59f541f5952e1546b1ac1b5fd45/rpds_py-0.30.0-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d948b135c4693daff7bc2dcfc4ec57237a29bd37e60c2fabf5aff2bbacf3e2f1", size = 414492, upload-time = "2025-11-30T20:22:26.505Z" },
+    { url = "https://files.pythonhosted.org/packages/60/1b/6f8f29f3f995c7ffdde46a626ddccd7c63aefc0efae881dc13b6e5d5bb16/rpds_py-0.30.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47f236970bccb2233267d89173d3ad2703cd36a0e2a6e92d0560d333871a3d23", size = 394080, upload-time = "2025-11-30T20:22:27.934Z" },
+    { url = "https://files.pythonhosted.org/packages/6d/d5/a266341051a7a3ca2f4b750a3aa4abc986378431fc2da508c5034d081b70/rpds_py-0.30.0-cp312-cp312-manylinux_2_31_riscv64.whl", hash = "sha256:2e6ecb5a5bcacf59c3f912155044479af1d0b6681280048b338b28e364aca1f6", size = 408680, upload-time = "2025-11-30T20:22:29.341Z" },
+    { url = "https://files.pythonhosted.org/packages/10/3b/71b725851df9ab7a7a4e33cf36d241933da66040d195a84781f49c50490c/rpds_py-0.30.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:a8fa71a2e078c527c3e9dc9fc5a98c9db40bcc8a92b4e8858e36d329f8684b51", size = 423589, upload-time = "2025-11-30T20:22:31.469Z" },
+    { url = "https://files.pythonhosted.org/packages/00/2b/e59e58c544dc9bd8bd8384ecdb8ea91f6727f0e37a7131baeff8d6f51661/rpds_py-0.30.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:73c67f2db7bc334e518d097c6d1e6fed021bbc9b7d678d6cc433478365d1d5f5", size = 573289, upload-time = "2025-11-30T20:22:32.997Z" },
+    { url = "https://files.pythonhosted.org/packages/da/3e/a18e6f5b460893172a7d6a680e86d3b6bc87a54c1f0b03446a3c8c7b588f/rpds_py-0.30.0-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:5ba103fb455be00f3b1c2076c9d4264bfcb037c976167a6047ed82f23153f02e", size = 599737, upload-time = "2025-11-30T20:22:34.419Z" },
+    { url = "https://files.pythonhosted.org/packages/5c/e2/714694e4b87b85a18e2c243614974413c60aa107fd815b8cbc42b873d1d7/rpds_py-0.30.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:7cee9c752c0364588353e627da8a7e808a66873672bcb5f52890c33fd965b394", size = 563120, upload-time = "2025-11-30T20:22:35.903Z" },
+    { url = "https://files.pythonhosted.org/packages/6f/ab/d5d5e3bcedb0a77f4f613706b750e50a5a3ba1c15ccd3665ecc636c968fd/rpds_py-0.30.0-cp312-cp312-win32.whl", hash = "sha256:1ab5b83dbcf55acc8b08fc62b796ef672c457b17dbd7820a11d6c52c06839bdf", size = 223782, upload-time = "2025-11-30T20:22:37.271Z" },
+    { url = "https://files.pythonhosted.org/packages/39/3b/f786af9957306fdc38a74cef405b7b93180f481fb48453a114bb6465744a/rpds_py-0.30.0-cp312-cp312-win_amd64.whl", hash = "sha256:a090322ca841abd453d43456ac34db46e8b05fd9b3b4ac0c78bcde8b089f959b", size = 240463, upload-time = "2025-11-30T20:22:39.021Z" },
+    { url = "https://files.pythonhosted.org/packages/f3/d2/b91dc748126c1559042cfe41990deb92c4ee3e2b415f6b5234969ffaf0cc/rpds_py-0.30.0-cp312-cp312-win_arm64.whl", hash = "sha256:669b1805bd639dd2989b281be2cfd951c6121b65e729d9b843e9639ef1fd555e", size = 230868, upload-time = "2025-11-30T20:22:40.493Z" },
+    { url = "https://files.pythonhosted.org/packages/ed/dc/d61221eb88ff410de3c49143407f6f3147acf2538c86f2ab7ce65ae7d5f9/rpds_py-0.30.0-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:f83424d738204d9770830d35290ff3273fbb02b41f919870479fab14b9d303b2", size = 374887, upload-time = "2025-11-30T20:22:41.812Z" },
+    { url = "https://files.pythonhosted.org/packages/fd/32/55fb50ae104061dbc564ef15cc43c013dc4a9f4527a1f4d99baddf56fe5f/rpds_py-0.30.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:e7536cd91353c5273434b4e003cbda89034d67e7710eab8761fd918ec6c69cf8", size = 358904, upload-time = "2025-11-30T20:22:43.479Z" },
+    { url = "https://files.pythonhosted.org/packages/58/70/faed8186300e3b9bdd138d0273109784eea2396c68458ed580f885dfe7ad/rpds_py-0.30.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2771c6c15973347f50fece41fc447c054b7ac2ae0502388ce3b6738cd366e3d4", size = 389945, upload-time = "2025-11-30T20:22:44.819Z" },
+    { url = "https://files.pythonhosted.org/packages/bd/a8/073cac3ed2c6387df38f71296d002ab43496a96b92c823e76f46b8af0543/rpds_py-0.30.0-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:0a59119fc6e3f460315fe9d08149f8102aa322299deaa5cab5b40092345c2136", size = 407783, upload-time = "2025-11-30T20:22:46.103Z" },
+    { url = "https://files.pythonhosted.org/packages/77/57/5999eb8c58671f1c11eba084115e77a8899d6e694d2a18f69f0ba471ec8b/rpds_py-0.30.0-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:76fec018282b4ead0364022e3c54b60bf368b9d926877957a8624b58419169b7", size = 515021, upload-time = "2025-11-30T20:22:47.458Z" },
+    { url = "https://files.pythonhosted.org/packages/e0/af/5ab4833eadc36c0a8ed2bc5c0de0493c04f6c06de223170bd0798ff98ced/rpds_py-0.30.0-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:692bef75a5525db97318e8cd061542b5a79812d711ea03dbc1f6f8dbb0c5f0d2", size = 414589, upload-time = "2025-11-30T20:22:48.872Z" },
+    { url = "https://files.pythonhosted.org/packages/b7/de/f7192e12b21b9e9a68a6d0f249b4af3fdcdff8418be0767a627564afa1f1/rpds_py-0.30.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9027da1ce107104c50c81383cae773ef5c24d296dd11c99e2629dbd7967a20c6", size = 394025, upload-time = "2025-11-30T20:22:50.196Z" },
+    { url = "https://files.pythonhosted.org/packages/91/c4/fc70cd0249496493500e7cc2de87504f5aa6509de1e88623431fec76d4b6/rpds_py-0.30.0-cp313-cp313-manylinux_2_31_riscv64.whl", hash = "sha256:9cf69cdda1f5968a30a359aba2f7f9aa648a9ce4b580d6826437f2b291cfc86e", size = 408895, upload-time = "2025-11-30T20:22:51.87Z" },
+    { url = "https://files.pythonhosted.org/packages/58/95/d9275b05ab96556fefff73a385813eb66032e4c99f411d0795372d9abcea/rpds_py-0.30.0-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:a4796a717bf12b9da9d3ad002519a86063dcac8988b030e405704ef7d74d2d9d", size = 422799, upload-time = "2025-11-30T20:22:53.341Z" },
+    { url = "https://files.pythonhosted.org/packages/06/c1/3088fc04b6624eb12a57eb814f0d4997a44b0d208d6cace713033ff1a6ba/rpds_py-0.30.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:5d4c2aa7c50ad4728a094ebd5eb46c452e9cb7edbfdb18f9e1221f597a73e1e7", size = 572731, upload-time = "2025-11-30T20:22:54.778Z" },
+    { url = "https://files.pythonhosted.org/packages/d8/42/c612a833183b39774e8ac8fecae81263a68b9583ee343db33ab571a7ce55/rpds_py-0.30.0-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:ba81a9203d07805435eb06f536d95a266c21e5b2dfbf6517748ca40c98d19e31", size = 599027, upload-time = "2025-11-30T20:22:56.212Z" },
+    { url = "https://files.pythonhosted.org/packages/5f/60/525a50f45b01d70005403ae0e25f43c0384369ad24ffe46e8d9068b50086/rpds_py-0.30.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:945dccface01af02675628334f7cf49c2af4c1c904748efc5cf7bbdf0b579f95", size = 563020, upload-time = "2025-11-30T20:22:58.2Z" },
+    { url = "https://files.pythonhosted.org/packages/0b/5d/47c4655e9bcd5ca907148535c10e7d489044243cc9941c16ed7cd53be91d/rpds_py-0.30.0-cp313-cp313-win32.whl", hash = "sha256:b40fb160a2db369a194cb27943582b38f79fc4887291417685f3ad693c5a1d5d", size = 223139, upload-time = "2025-11-30T20:23:00.209Z" },
+    { url = "https://files.pythonhosted.org/packages/f2/e1/485132437d20aa4d3e1d8b3fb5a5e65aa8139f1e097080c2a8443201742c/rpds_py-0.30.0-cp313-cp313-win_amd64.whl", hash = "sha256:806f36b1b605e2d6a72716f321f20036b9489d29c51c91f4dd29a3e3afb73b15", size = 240224, upload-time = "2025-11-30T20:23:02.008Z" },
+    { url = "https://files.pythonhosted.org/packages/24/95/ffd128ed1146a153d928617b0ef673960130be0009c77d8fbf0abe306713/rpds_py-0.30.0-cp313-cp313-win_arm64.whl", hash = "sha256:d96c2086587c7c30d44f31f42eae4eac89b60dabbac18c7669be3700f13c3ce1", size = 230645, upload-time = "2025-11-30T20:23:03.43Z" },
+    { url = "https://files.pythonhosted.org/packages/ff/1b/b10de890a0def2a319a2626334a7f0ae388215eb60914dbac8a3bae54435/rpds_py-0.30.0-cp313-cp313t-macosx_10_12_x86_64.whl", hash = "sha256:eb0b93f2e5c2189ee831ee43f156ed34e2a89a78a66b98cadad955972548be5a", size = 364443, upload-time = "2025-11-30T20:23:04.878Z" },
+    { url = "https://files.pythonhosted.org/packages/0d/bf/27e39f5971dc4f305a4fb9c672ca06f290f7c4e261c568f3dea16a410d47/rpds_py-0.30.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:922e10f31f303c7c920da8981051ff6d8c1a56207dbdf330d9047f6d30b70e5e", size = 353375, upload-time = "2025-11-30T20:23:06.342Z" },
+    { url = "https://files.pythonhosted.org/packages/40/58/442ada3bba6e8e6615fc00483135c14a7538d2ffac30e2d933ccf6852232/rpds_py-0.30.0-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cdc62c8286ba9bf7f47befdcea13ea0e26bf294bda99758fd90535cbaf408000", size = 383850, upload-time = "2025-11-30T20:23:07.825Z" },
+    { url = "https://files.pythonhosted.org/packages/14/14/f59b0127409a33c6ef6f5c1ebd5ad8e32d7861c9c7adfa9a624fc3889f6c/rpds_py-0.30.0-cp313-cp313t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:47f9a91efc418b54fb8190a6b4aa7813a23fb79c51f4bb84e418f5476c38b8db", size = 392812, upload-time = "2025-11-30T20:23:09.228Z" },
+    { url = "https://files.pythonhosted.org/packages/b3/66/e0be3e162ac299b3a22527e8913767d869e6cc75c46bd844aa43fb81ab62/rpds_py-0.30.0-cp313-cp313t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1f3587eb9b17f3789ad50824084fa6f81921bbf9a795826570bda82cb3ed91f2", size = 517841, upload-time = "2025-11-30T20:23:11.186Z" },
+    { url = "https://files.pythonhosted.org/packages/3d/55/fa3b9cf31d0c963ecf1ba777f7cf4b2a2c976795ac430d24a1f43d25a6ba/rpds_py-0.30.0-cp313-cp313t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:39c02563fc592411c2c61d26b6c5fe1e51eaa44a75aa2c8735ca88b0d9599daa", size = 408149, upload-time = "2025-11-30T20:23:12.864Z" },
+    { url = "https://files.pythonhosted.org/packages/60/ca/780cf3b1a32b18c0f05c441958d3758f02544f1d613abf9488cd78876378/rpds_py-0.30.0-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:51a1234d8febafdfd33a42d97da7a43f5dcb120c1060e352a3fbc0c6d36e2083", size = 383843, upload-time = "2025-11-30T20:23:14.638Z" },
+    { url = "https://files.pythonhosted.org/packages/82/86/d5f2e04f2aa6247c613da0c1dd87fcd08fa17107e858193566048a1e2f0a/rpds_py-0.30.0-cp313-cp313t-manylinux_2_31_riscv64.whl", hash = "sha256:eb2c4071ab598733724c08221091e8d80e89064cd472819285a9ab0f24bcedb9", size = 396507, upload-time = "2025-11-30T20:23:16.105Z" },
+    { url = "https://files.pythonhosted.org/packages/4b/9a/453255d2f769fe44e07ea9785c8347edaf867f7026872e76c1ad9f7bed92/rpds_py-0.30.0-cp313-cp313t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:6bdfdb946967d816e6adf9a3d8201bfad269c67efe6cefd7093ef959683c8de0", size = 414949, upload-time = "2025-11-30T20:23:17.539Z" },
+    { url = "https://files.pythonhosted.org/packages/a3/31/622a86cdc0c45d6df0e9ccb6becdba5074735e7033c20e401a6d9d0e2ca0/rpds_py-0.30.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:c77afbd5f5250bf27bf516c7c4a016813eb2d3e116139aed0096940c5982da94", size = 565790, upload-time = "2025-11-30T20:23:19.029Z" },
+    { url = "https://files.pythonhosted.org/packages/1c/5d/15bbf0fb4a3f58a3b1c67855ec1efcc4ceaef4e86644665fff03e1b66d8d/rpds_py-0.30.0-cp313-cp313t-musllinux_1_2_i686.whl", hash = "sha256:61046904275472a76c8c90c9ccee9013d70a6d0f73eecefd38c1ae7c39045a08", size = 590217, upload-time = "2025-11-30T20:23:20.885Z" },
+    { url = "https://files.pythonhosted.org/packages/6d/61/21b8c41f68e60c8cc3b2e25644f0e3681926020f11d06ab0b78e3c6bbff1/rpds_py-0.30.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:4c5f36a861bc4b7da6516dbdf302c55313afa09b81931e8280361a4f6c9a2d27", size = 555806, upload-time = "2025-11-30T20:23:22.488Z" },
+    { url = "https://files.pythonhosted.org/packages/f9/39/7e067bb06c31de48de3eb200f9fc7c58982a4d3db44b07e73963e10d3be9/rpds_py-0.30.0-cp313-cp313t-win32.whl", hash = "sha256:3d4a69de7a3e50ffc214ae16d79d8fbb0922972da0356dcf4d0fdca2878559c6", size = 211341, upload-time = "2025-11-30T20:23:24.449Z" },
+    { url = "https://files.pythonhosted.org/packages/0a/4d/222ef0b46443cf4cf46764d9c630f3fe4abaa7245be9417e56e9f52b8f65/rpds_py-0.30.0-cp313-cp313t-win_amd64.whl", hash = "sha256:f14fc5df50a716f7ece6a80b6c78bb35ea2ca47c499e422aa4463455dd96d56d", size = 225768, upload-time = "2025-11-30T20:23:25.908Z" },
+    { url = "https://files.pythonhosted.org/packages/86/81/dad16382ebbd3d0e0328776d8fd7ca94220e4fa0798d1dc5e7da48cb3201/rpds_py-0.30.0-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:68f19c879420aa08f61203801423f6cd5ac5f0ac4ac82a2368a9fcd6a9a075e0", size = 362099, upload-time = "2025-11-30T20:23:27.316Z" },
+    { url = "https://files.pythonhosted.org/packages/2b/60/19f7884db5d5603edf3c6bce35408f45ad3e97e10007df0e17dd57af18f8/rpds_py-0.30.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:ec7c4490c672c1a0389d319b3a9cfcd098dcdc4783991553c332a15acf7249be", size = 353192, upload-time = "2025-11-30T20:23:29.151Z" },
+    { url = "https://files.pythonhosted.org/packages/bf/c4/76eb0e1e72d1a9c4703c69607cec123c29028bff28ce41588792417098ac/rpds_py-0.30.0-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f251c812357a3fed308d684a5079ddfb9d933860fc6de89f2b7ab00da481e65f", size = 384080, upload-time = "2025-11-30T20:23:30.785Z" },
+    { url = "https://files.pythonhosted.org/packages/72/87/87ea665e92f3298d1b26d78814721dc39ed8d2c74b86e83348d6b48a6f31/rpds_py-0.30.0-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ac98b175585ecf4c0348fd7b29c3864bda53b805c773cbf7bfdaffc8070c976f", size = 394841, upload-time = "2025-11-30T20:23:32.209Z" },
+    { url = "https://files.pythonhosted.org/packages/77/ad/7783a89ca0587c15dcbf139b4a8364a872a25f861bdb88ed99f9b0dec985/rpds_py-0.30.0-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3e62880792319dbeb7eb866547f2e35973289e7d5696c6e295476448f5b63c87", size = 516670, upload-time = "2025-11-30T20:23:33.742Z" },
+    { url = "https://files.pythonhosted.org/packages/5b/3c/2882bdac942bd2172f3da574eab16f309ae10a3925644e969536553cb4ee/rpds_py-0.30.0-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4e7fc54e0900ab35d041b0601431b0a0eb495f0851a0639b6ef90f7741b39a18", size = 408005, upload-time = "2025-11-30T20:23:35.253Z" },
+    { url = "https://files.pythonhosted.org/packages/ce/81/9a91c0111ce1758c92516a3e44776920b579d9a7c09b2b06b642d4de3f0f/rpds_py-0.30.0-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47e77dc9822d3ad616c3d5759ea5631a75e5809d5a28707744ef79d7a1bcfcad", size = 382112, upload-time = "2025-11-30T20:23:36.842Z" },
+    { url = "https://files.pythonhosted.org/packages/cf/8e/1da49d4a107027e5fbc64daeab96a0706361a2918da10cb41769244b805d/rpds_py-0.30.0-cp314-cp314-manylinux_2_31_riscv64.whl", hash = "sha256:b4dc1a6ff022ff85ecafef7979a2c6eb423430e05f1165d6688234e62ba99a07", size = 399049, upload-time = "2025-11-30T20:23:38.343Z" },
+    { url = "https://files.pythonhosted.org/packages/df/5a/7ee239b1aa48a127570ec03becbb29c9d5a9eb092febbd1699d567cae859/rpds_py-0.30.0-cp314-cp314-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:4559c972db3a360808309e06a74628b95eaccbf961c335c8fe0d590cf587456f", size = 415661, upload-time = "2025-11-30T20:23:40.263Z" },
+    { url = "https://files.pythonhosted.org/packages/70/ea/caa143cf6b772f823bc7929a45da1fa83569ee49b11d18d0ada7f5ee6fd6/rpds_py-0.30.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:0ed177ed9bded28f8deb6ab40c183cd1192aa0de40c12f38be4d59cd33cb5c65", size = 565606, upload-time = "2025-11-30T20:23:42.186Z" },
+    { url = "https://files.pythonhosted.org/packages/64/91/ac20ba2d69303f961ad8cf55bf7dbdb4763f627291ba3d0d7d67333cced9/rpds_py-0.30.0-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:ad1fa8db769b76ea911cb4e10f049d80bf518c104f15b3edb2371cc65375c46f", size = 591126, upload-time = "2025-11-30T20:23:44.086Z" },
+    { url = "https://files.pythonhosted.org/packages/21/20/7ff5f3c8b00c8a95f75985128c26ba44503fb35b8e0259d812766ea966c7/rpds_py-0.30.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:46e83c697b1f1c72b50e5ee5adb4353eef7406fb3f2043d64c33f20ad1c2fc53", size = 553371, upload-time = "2025-11-30T20:23:46.004Z" },
+    { url = "https://files.pythonhosted.org/packages/72/c7/81dadd7b27c8ee391c132a6b192111ca58d866577ce2d9b0ca157552cce0/rpds_py-0.30.0-cp314-cp314-win32.whl", hash = "sha256:ee454b2a007d57363c2dfd5b6ca4a5d7e2c518938f8ed3b706e37e5d470801ed", size = 215298, upload-time = "2025-11-30T20:23:47.696Z" },
+    { url = "https://files.pythonhosted.org/packages/3e/d2/1aaac33287e8cfb07aab2e6b8ac1deca62f6f65411344f1433c55e6f3eb8/rpds_py-0.30.0-cp314-cp314-win_amd64.whl", hash = "sha256:95f0802447ac2d10bcc69f6dc28fe95fdf17940367b21d34e34c737870758950", size = 228604, upload-time = "2025-11-30T20:23:49.501Z" },
+    { url = "https://files.pythonhosted.org/packages/e8/95/ab005315818cc519ad074cb7784dae60d939163108bd2b394e60dc7b5461/rpds_py-0.30.0-cp314-cp314-win_arm64.whl", hash = "sha256:613aa4771c99f03346e54c3f038e4cc574ac09a3ddfb0e8878487335e96dead6", size = 222391, upload-time = "2025-11-30T20:23:50.96Z" },
+    { url = "https://files.pythonhosted.org/packages/9e/68/154fe0194d83b973cdedcdcc88947a2752411165930182ae41d983dcefa6/rpds_py-0.30.0-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:7e6ecfcb62edfd632e56983964e6884851786443739dbfe3582947e87274f7cb", size = 364868, upload-time = "2025-11-30T20:23:52.494Z" },
+    { url = "https://files.pythonhosted.org/packages/83/69/8bbc8b07ec854d92a8b75668c24d2abcb1719ebf890f5604c61c9369a16f/rpds_py-0.30.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:a1d0bc22a7cdc173fedebb73ef81e07faef93692b8c1ad3733b67e31e1b6e1b8", size = 353747, upload-time = "2025-11-30T20:23:54.036Z" },
+    { url = "https://files.pythonhosted.org/packages/ab/00/ba2e50183dbd9abcce9497fa5149c62b4ff3e22d338a30d690f9af970561/rpds_py-0.30.0-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0d08f00679177226c4cb8c5265012eea897c8ca3b93f429e546600c971bcbae7", size = 383795, upload-time = "2025-11-30T20:23:55.556Z" },
+    { url = "https://files.pythonhosted.org/packages/05/6f/86f0272b84926bcb0e4c972262f54223e8ecc556b3224d281e6598fc9268/rpds_py-0.30.0-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5965af57d5848192c13534f90f9dd16464f3c37aaf166cc1da1cae1fd5a34898", size = 393330, upload-time = "2025-11-30T20:23:57.033Z" },
+    { url = "https://files.pythonhosted.org/packages/cb/e9/0e02bb2e6dc63d212641da45df2b0bf29699d01715913e0d0f017ee29438/rpds_py-0.30.0-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9a4e86e34e9ab6b667c27f3211ca48f73dba7cd3d90f8d5b11be56e5dbc3fb4e", size = 518194, upload-time = "2025-11-30T20:23:58.637Z" },
+    { url = "https://files.pythonhosted.org/packages/ee/ca/be7bca14cf21513bdf9c0606aba17d1f389ea2b6987035eb4f62bd923f25/rpds_py-0.30.0-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e5d3e6b26f2c785d65cc25ef1e5267ccbe1b069c5c21b8cc724efee290554419", size = 408340, upload-time = "2025-11-30T20:24:00.2Z" },
+    { url = "https://files.pythonhosted.org/packages/c2/c7/736e00ebf39ed81d75544c0da6ef7b0998f8201b369acf842f9a90dc8fce/rpds_py-0.30.0-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:626a7433c34566535b6e56a1b39a7b17ba961e97ce3b80ec62e6f1312c025551", size = 383765, upload-time = "2025-11-30T20:24:01.759Z" },
+    { url = "https://files.pythonhosted.org/packages/4a/3f/da50dfde9956aaf365c4adc9533b100008ed31aea635f2b8d7b627e25b49/rpds_py-0.30.0-cp314-cp314t-manylinux_2_31_riscv64.whl", hash = "sha256:acd7eb3f4471577b9b5a41baf02a978e8bdeb08b4b355273994f8b87032000a8", size = 396834, upload-time = "2025-11-30T20:24:03.687Z" },
+    { url = "https://files.pythonhosted.org/packages/4e/00/34bcc2565b6020eab2623349efbdec810676ad571995911f1abdae62a3a0/rpds_py-0.30.0-cp314-cp314t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:fe5fa731a1fa8a0a56b0977413f8cacac1768dad38d16b3a296712709476fbd5", size = 415470, upload-time = "2025-11-30T20:24:05.232Z" },
+    { url = "https://files.pythonhosted.org/packages/8c/28/882e72b5b3e6f718d5453bd4d0d9cf8df36fddeb4ddbbab17869d5868616/rpds_py-0.30.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:74a3243a411126362712ee1524dfc90c650a503502f135d54d1b352bd01f2404", size = 565630, upload-time = "2025-11-30T20:24:06.878Z" },
+    { url = "https://files.pythonhosted.org/packages/3b/97/04a65539c17692de5b85c6e293520fd01317fd878ea1995f0367d4532fb1/rpds_py-0.30.0-cp314-cp314t-musllinux_1_2_i686.whl", hash = "sha256:3e8eeb0544f2eb0d2581774be4c3410356eba189529a6b3e36bbbf9696175856", size = 591148, upload-time = "2025-11-30T20:24:08.445Z" },
+    { url = "https://files.pythonhosted.org/packages/85/70/92482ccffb96f5441aab93e26c4d66489eb599efdcf96fad90c14bbfb976/rpds_py-0.30.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:dbd936cde57abfee19ab3213cf9c26be06d60750e60a8e4dd85d1ab12c8b1f40", size = 556030, upload-time = "2025-11-30T20:24:10.956Z" },
+    { url = "https://files.pythonhosted.org/packages/20/53/7c7e784abfa500a2b6b583b147ee4bb5a2b3747a9166bab52fec4b5b5e7d/rpds_py-0.30.0-cp314-cp314t-win32.whl", hash = "sha256:dc824125c72246d924f7f796b4f63c1e9dc810c7d9e2355864b3c3a73d59ade0", size = 211570, upload-time = "2025-11-30T20:24:12.735Z" },
+    { url = "https://files.pythonhosted.org/packages/d0/02/fa464cdfbe6b26e0600b62c528b72d8608f5cc49f96b8d6e38c95d60c676/rpds_py-0.30.0-cp314-cp314t-win_amd64.whl", hash = "sha256:27f4b0e92de5bfbc6f86e43959e6edd1425c33b5e69aab0984a72047f2bcf1e3", size = 226532, upload-time = "2025-11-30T20:24:14.634Z" },
+]
+
+[[package]]
+name = "ruff"
+version = "0.15.11"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/e4/8d/192f3d7103816158dfd5ea50d098ef2aec19194e6cbccd4b3485bdb2eb2d/ruff-0.15.11.tar.gz", hash = "sha256:f092b21708bf0e7437ce9ada249dfe688ff9a0954fc94abab05dcea7dcd29c33", size = 4637264, upload-time = "2026-04-16T18:46:26.58Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/02/1e/6aca3427f751295ab011828e15e9bf452200ac74484f1db4be0197b8170b/ruff-0.15.11-py3-none-linux_armv6l.whl", hash = "sha256:e927cfff503135c558eb581a0c9792264aae9507904eb27809cdcff2f2c847b7", size = 10607943, upload-time = "2026-04-16T18:46:05.967Z" },
+    { url = "https://files.pythonhosted.org/packages/e7/26/1341c262e74f36d4e84f3d6f4df0ac68cd53331a66bfc5080daa17c84c0b/ruff-0.15.11-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:7a1b5b2938d8f890b76084d4fa843604d787a912541eae85fd7e233398bbb73e", size = 10988592, upload-time = "2026-04-16T18:46:00.742Z" },
+    { url = "https://files.pythonhosted.org/packages/03/71/850b1d6ffa9564fbb6740429bad53df1094082fe515c8c1e74b6d8d05f18/ruff-0.15.11-py3-none-macosx_11_0_arm64.whl", hash = "sha256:d4176f3d194afbdaee6e41b9ccb1a2c287dba8700047df474abfbe773825d1cb", size = 10338501, upload-time = "2026-04-16T18:46:03.723Z" },
+    { url = "https://files.pythonhosted.org/packages/f2/11/cc1284d3e298c45a817a6aadb6c3e1d70b45c9b36d8d9cce3387b495a03a/ruff-0.15.11-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3b17c886fb88203ced3afe7f14e8d5ae96e9d2f4ccc0ee66aa19f2c2675a27e4", size = 10670693, upload-time = "2026-04-16T18:46:41.941Z" },
+    { url = "https://files.pythonhosted.org/packages/ce/9e/f8288b034ab72b371513c13f9a41d9ba3effac54e24bfb467b007daee2ca/ruff-0.15.11-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:49fafa220220afe7758a487b048de4c8f9f767f37dfefad46b9dd06759d003eb", size = 10416177, upload-time = "2026-04-16T18:46:21.717Z" },
+    { url = "https://files.pythonhosted.org/packages/85/71/504d79abfd3d92532ba6bbe3d1c19fada03e494332a59e37c7c2dabae427/ruff-0.15.11-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f2ab8427e74a00d93b8bda1307b1e60970d40f304af38bccb218e056c220120d", size = 11221886, upload-time = "2026-04-16T18:46:15.086Z" },
+    { url = "https://files.pythonhosted.org/packages/43/5a/947e6ab7a5ad603d65b474be15a4cbc6d29832db5d762cd142e4e3a74164/ruff-0.15.11-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:195072c0c8e1fc8f940652073df082e37a5d9cb43b4ab1e4d0566ab8977a13b7", size = 12075183, upload-time = "2026-04-16T18:46:07.944Z" },
+    { url = "https://files.pythonhosted.org/packages/9f/a1/0b7bb6268775fdd3a0818aee8efd8f5b4e231d24dd4d528ced2534023182/ruff-0.15.11-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a3a0996d486af3920dec930a2e7daed4847dfc12649b537a9335585ada163e9e", size = 11516575, upload-time = "2026-04-16T18:46:31.687Z" },
+    { url = "https://files.pythonhosted.org/packages/30/c3/bb5168fc4d233cc06e95f482770d0f3c87945a0cd9f614b90ea8dc2f2833/ruff-0.15.11-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1bef2cb556d509259f1fe440bb9cd33c756222cf0a7afe90d15edf0866702431", size = 11306537, upload-time = "2026-04-16T18:46:36.988Z" },
+    { url = "https://files.pythonhosted.org/packages/e4/92/4cfae6441f3967317946f3b788136eecf093729b94d6561f963ed810c82e/ruff-0.15.11-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:030d921a836d7d4a12cf6e8d984a88b66094ccb0e0f17ddd55067c331191bf19", size = 11296813, upload-time = "2026-04-16T18:46:24.182Z" },
+    { url = "https://files.pythonhosted.org/packages/43/26/972784c5dde8313acde8ac71ba8ac65475b85db4a2352a76c9934361f9bc/ruff-0.15.11-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:0e783b599b4577788dbbb66b9addcef87e9a8832f4ce0c19e34bf55543a2f890", size = 10633136, upload-time = "2026-04-16T18:46:39.802Z" },
+    { url = "https://files.pythonhosted.org/packages/5b/53/3985a4f185020c2f367f2e08a103032e12564829742a1b417980ce1514a0/ruff-0.15.11-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:ae90592246625ba4a34349d68ec28d4400d75182b71baa196ddb9f82db025ef5", size = 10424701, upload-time = "2026-04-16T18:46:10.381Z" },
+    { url = "https://files.pythonhosted.org/packages/d3/57/bf0dfb32241b56c83bb663a826133da4bf17f682ba8c096973065f6e6a68/ruff-0.15.11-py3-none-musllinux_1_2_i686.whl", hash = "sha256:1f111d62e3c983ed20e0ca2e800f8d77433a5b1161947df99a5c2a3fb60514f0", size = 10873887, upload-time = "2026-04-16T18:46:29.157Z" },
+    { url = "https://files.pythonhosted.org/packages/02/05/e48076b2a57dc33ee8c7a957296f97c744ca891a8ffb4ffb1aaa3b3f517d/ruff-0.15.11-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:06f483d6646f59eaffba9ae30956370d3a886625f511a3108994000480621d1c", size = 11404316, upload-time = "2026-04-16T18:46:19.462Z" },
+    { url = "https://files.pythonhosted.org/packages/88/27/0195d15fe7a897cbcba0904792c4b7c9fdd958456c3a17d2ea6093716a9a/ruff-0.15.11-py3-none-win32.whl", hash = "sha256:476a2aa56b7da0b73a3ee80b6b2f0e19cce544245479adde7baa65466664d5f3", size = 10655535, upload-time = "2026-04-16T18:46:12.47Z" },
+    { url = "https://files.pythonhosted.org/packages/3a/5e/c927b325bd4c1d3620211a4b96f47864633199feed60fa936025ab27e090/ruff-0.15.11-py3-none-win_amd64.whl", hash = "sha256:8b6756d88d7e234fb0c98c91511aae3cd519d5e3ed271cae31b20f39cb2a12a3", size = 11779692, upload-time = "2026-04-16T18:46:17.268Z" },
+    { url = "https://files.pythonhosted.org/packages/63/b6/aeadee5443e49baa2facd51131159fd6301cc4ccfc1541e4df7b021c37dd/ruff-0.15.11-py3-none-win_arm64.whl", hash = "sha256:063fed18cc1bbe0ee7393957284a6fe8b588c6a406a285af3ee3f46da2391ee4", size = 11032614, upload-time = "2026-04-16T18:46:34.487Z" },
+]
+
+[[package]]
+name = "safetensors"
+version = "0.7.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/29/9c/6e74567782559a63bd040a236edca26fd71bc7ba88de2ef35d75df3bca5e/safetensors-0.7.0.tar.gz", hash = "sha256:07663963b67e8bd9f0b8ad15bb9163606cd27cc5a1b96235a50d8369803b96b0", size = 200878, upload-time = "2025-11-19T15:18:43.199Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/fa/47/aef6c06649039accf914afef490268e1067ed82be62bcfa5b7e886ad15e8/safetensors-0.7.0-cp38-abi3-macosx_10_12_x86_64.whl", hash = "sha256:c82f4d474cf725255d9e6acf17252991c3c8aac038d6ef363a4bf8be2f6db517", size = 467781, upload-time = "2025-11-19T15:18:35.84Z" },
+    { url = "https://files.pythonhosted.org/packages/e8/00/374c0c068e30cd31f1e1b46b4b5738168ec79e7689ca82ee93ddfea05109/safetensors-0.7.0-cp38-abi3-macosx_11_0_arm64.whl", hash = "sha256:94fd4858284736bb67a897a41608b5b0c2496c9bdb3bf2af1fa3409127f20d57", size = 447058, upload-time = "2025-11-19T15:18:34.416Z" },
+    { url = "https://files.pythonhosted.org/packages/f1/06/578ffed52c2296f93d7fd2d844cabfa92be51a587c38c8afbb8ae449ca89/safetensors-0.7.0-cp38-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e07d91d0c92a31200f25351f4acb2bc6aff7f48094e13ebb1d0fb995b54b6542", size = 491748, upload-time = "2025-11-19T15:18:09.79Z" },
+    { url = "https://files.pythonhosted.org/packages/ae/33/1debbbb70e4791dde185edb9413d1fe01619255abb64b300157d7f15dddd/safetensors-0.7.0-cp38-abi3-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:8469155f4cb518bafb4acf4865e8bb9d6804110d2d9bdcaa78564b9fd841e104", size = 503881, upload-time = "2025-11-19T15:18:16.145Z" },
+    { url = "https://files.pythonhosted.org/packages/8e/1c/40c2ca924d60792c3be509833df711b553c60effbd91da6f5284a83f7122/safetensors-0.7.0-cp38-abi3-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:54bef08bf00a2bff599982f6b08e8770e09cc012d7bba00783fc7ea38f1fb37d", size = 623463, upload-time = "2025-11-19T15:18:21.11Z" },
+    { url = "https://files.pythonhosted.org/packages/9b/3a/13784a9364bd43b0d61eef4bea2845039bc2030458b16594a1bd787ae26e/safetensors-0.7.0-cp38-abi3-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:42cb091236206bb2016d245c377ed383aa7f78691748f3bb6ee1bfa51ae2ce6a", size = 532855, upload-time = "2025-11-19T15:18:25.719Z" },
+    { url = "https://files.pythonhosted.org/packages/a0/60/429e9b1cb3fc651937727befe258ea24122d9663e4d5709a48c9cbfceecb/safetensors-0.7.0-cp38-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dac7252938f0696ddea46f5e855dd3138444e82236e3be475f54929f0c510d48", size = 507152, upload-time = "2025-11-19T15:18:33.023Z" },
+    { url = "https://files.pythonhosted.org/packages/3c/a8/4b45e4e059270d17af60359713ffd83f97900d45a6afa73aaa0d737d48b6/safetensors-0.7.0-cp38-abi3-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:1d060c70284127fa805085d8f10fbd0962792aed71879d00864acda69dbab981", size = 541856, upload-time = "2025-11-19T15:18:31.075Z" },
+    { url = "https://files.pythonhosted.org/packages/06/87/d26d8407c44175d8ae164a95b5a62707fcc445f3c0c56108e37d98070a3d/safetensors-0.7.0-cp38-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:cdab83a366799fa730f90a4ebb563e494f28e9e92c4819e556152ad55e43591b", size = 674060, upload-time = "2025-11-19T15:18:37.211Z" },
+    { url = "https://files.pythonhosted.org/packages/11/f5/57644a2ff08dc6325816ba7217e5095f17269dada2554b658442c66aed51/safetensors-0.7.0-cp38-abi3-musllinux_1_2_armv7l.whl", hash = "sha256:672132907fcad9f2aedcb705b2d7b3b93354a2aec1b2f706c4db852abe338f85", size = 771715, upload-time = "2025-11-19T15:18:38.689Z" },
+    { url = "https://files.pythonhosted.org/packages/86/31/17883e13a814bd278ae6e266b13282a01049b0c81341da7fd0e3e71a80a3/safetensors-0.7.0-cp38-abi3-musllinux_1_2_i686.whl", hash = "sha256:5d72abdb8a4d56d4020713724ba81dac065fedb7f3667151c4a637f1d3fb26c0", size = 714377, upload-time = "2025-11-19T15:18:40.162Z" },
+    { url = "https://files.pythonhosted.org/packages/4a/d8/0c8a7dc9b41dcac53c4cbf9df2b9c83e0e0097203de8b37a712b345c0be5/safetensors-0.7.0-cp38-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:b0f6d66c1c538d5a94a73aa9ddca8ccc4227e6c9ff555322ea40bdd142391dd4", size = 677368, upload-time = "2025-11-19T15:18:41.627Z" },
+    { url = "https://files.pythonhosted.org/packages/05/e5/cb4b713c8a93469e3c5be7c3f8d77d307e65fe89673e731f5c2bfd0a9237/safetensors-0.7.0-cp38-abi3-win32.whl", hash = "sha256:c74af94bf3ac15ac4d0f2a7c7b4663a15f8c2ab15ed0fc7531ca61d0835eccba", size = 326423, upload-time = "2025-11-19T15:18:45.74Z" },
+    { url = "https://files.pythonhosted.org/packages/5d/e6/ec8471c8072382cb91233ba7267fd931219753bb43814cbc71757bfd4dab/safetensors-0.7.0-cp38-abi3-win_amd64.whl", hash = "sha256:d1239932053f56f3456f32eb9625590cc7582e905021f94636202a864d470755", size = 341380, upload-time = "2025-11-19T15:18:44.427Z" },
+]
+
+[[package]]
+name = "selectolax"
+version = "0.4.8"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/b3/1a/ce7768c1bff5cf07e3e12f904d54a63c3f85f78e3b299c0b561839d0238e/selectolax-0.4.8.tar.gz", hash = "sha256:cd703165b9a346be255e2ca5b4219e01009911977ac8a474d8ccb7e32e9a4fae", size = 4875521, upload-time = "2026-05-04T15:10:44.935Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/12/3c/9cf255f11d04cf203b61f5a85fb273bc85778c3ab5d2ad98ce892f7df3b4/selectolax-0.4.8-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:bbcd4cb837dec4b16a3ab6a8b2ec4388ea20c050092b68536dc9a60ce8f19b56", size = 2236812, upload-time = "2026-05-04T15:09:20.193Z" },
+    { url = "https://files.pythonhosted.org/packages/9c/6b/4c343f767fa61131fc03b3de278dfcff024485996d7d6c917b55b0f9ce16/selectolax-0.4.8-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:f1cdcf946dd46e11640ca0a0361945c3ed65627ba4bd219ccf84a53fab28c072", size = 2287194, upload-time = "2026-05-04T15:09:22.15Z" },
+    { url = "https://files.pythonhosted.org/packages/9f/7d/5a47a0d102709297b6b09473a58c7e9727955a0d6e0c8eba9b27574e3680/selectolax-0.4.8-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:074254670a8a00b36202ab0cd99ce8fb2a25b3b2f10072891a35a6a85c53f679", size = 2369192, upload-time = "2026-05-04T15:09:23.768Z" },
+    { url = "https://files.pythonhosted.org/packages/e9/81/48b5cfa5b2803379855050310c876a6f68b7e53598f9252e5bb3fb911ff0/selectolax-0.4.8-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0bbd33d348a555b37d5f922c421338db690500e5b579353ffa24e3bd23a04704", size = 2415401, upload-time = "2026-05-04T15:09:25.349Z" },
+    { url = "https://files.pythonhosted.org/packages/46/92/cf0ffe4668af87f2071253ad43cccf73ac6bc6324c13fefe38fdb198d54b/selectolax-0.4.8-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:c0cf863f652ed6de58c9f3599173be70064827807f46ddd38ad82b185fead322", size = 2373885, upload-time = "2026-05-04T15:09:26.889Z" },
+    { url = "https://files.pythonhosted.org/packages/6a/0f/4de417c1bbc44c31453ac0582f578ddfdf4f4e29d55d451e4435cef7f4eb/selectolax-0.4.8-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:ca2e1a9a06d1b1a7549d2828240f1888a172b60720baf8a2cb90936482d8b6b4", size = 2437684, upload-time = "2026-05-04T15:09:28.544Z" },
+    { url = "https://files.pythonhosted.org/packages/6e/e4/a465e3d7b641b7693c36a20401c1cd924bd9038dfbee195c11087de08aae/selectolax-0.4.8-cp312-cp312-win32.whl", hash = "sha256:b812691bbdf7c958b29956138917bd46cd78b96f2d4f51f56063f584f0d6c476", size = 1759388, upload-time = "2026-05-04T15:09:30.679Z" },
+    { url = "https://files.pythonhosted.org/packages/ac/c0/b7e681cf829f58be0927b10d606ec96126e3d863b11c4ba6cabb701a1b32/selectolax-0.4.8-cp312-cp312-win_amd64.whl", hash = "sha256:877df05c9fb306ed6b4d094cbd655ad8e89ea4744d3597eb1e5217c7f71d4ea4", size = 1855778, upload-time = "2026-05-04T15:09:32.284Z" },
+    { url = "https://files.pythonhosted.org/packages/2d/85/9b64306821eb38fb84510e43bd5e8685fbf179ce5717496522fdf208573c/selectolax-0.4.8-cp312-cp312-win_arm64.whl", hash = "sha256:52db6be936a0f0648d9d8acbfdf16d4c5a16600cfc31db1b557b0effd8b164ce", size = 1805553, upload-time = "2026-05-04T15:09:33.897Z" },
+    { url = "https://files.pythonhosted.org/packages/3d/fb/678ea1250811a4b42686c506df43d3c752ce2158dc66fd4f60c39d4ae1d6/selectolax-0.4.8-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:fb2c4bed19e0c3e34b877b6df607150725d84a38dda32bccb030d8744078eda6", size = 2236220, upload-time = "2026-05-04T15:09:35.841Z" },
+    { url = "https://files.pythonhosted.org/packages/3e/fe/1624eb5024e897bf4074bfc31f9e5e823160aed1ac14e7720e849a3d1109/selectolax-0.4.8-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:1a2d83e04bf0a9f0a8c9a6a7989df1844acc2242025f26293c1e12ce82b4a3f9", size = 2286820, upload-time = "2026-05-04T15:09:37.448Z" },
+    { url = "https://files.pythonhosted.org/packages/10/ac/f0d4e4061de679f5f3d1858f50d31b09935fa97c05f8a2b2e46c344c74a8/selectolax-0.4.8-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:8513c179ec9758d9bbc43a9e7e58fecfcfc1ec88e9100ed592cce2703c316b63", size = 2368949, upload-time = "2026-05-04T15:09:39.26Z" },
+    { url = "https://files.pythonhosted.org/packages/ec/2d/2ba76651c93907b2c3c0005d4745df94493e29bd15cfb9edd7c0e6a7a4d9/selectolax-0.4.8-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4b6225fd6b5bec6be59bc07aeee17f50448c9b4769531afaa079c74650ebd2c5", size = 2415032, upload-time = "2026-05-04T15:09:40.93Z" },
+    { url = "https://files.pythonhosted.org/packages/b8/08/a20f9ef0213b8f33c5164781e8cc18eeb059779ed8b4051df39cbfde3d50/selectolax-0.4.8-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:899b62117147fd804b43822e7af0c422730c6743b27b20b233c4896363b1e655", size = 2373656, upload-time = "2026-05-04T15:09:42.862Z" },
+    { url = "https://files.pythonhosted.org/packages/9c/8d/ba692cc70aa45feb55d8241e05f8b8bde97ed4c7d5b4d83b148d1f6ebc43/selectolax-0.4.8-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:573b67610d2876b67707eaaad71d28da5a0d4ce72ab4880a68abeacdbdd825b1", size = 2437386, upload-time = "2026-05-04T15:09:45.27Z" },
+    { url = "https://files.pythonhosted.org/packages/1c/cb/771e3e7ad7ef51ddafecf7b80e92421113cc4026fb951740009633d34d1d/selectolax-0.4.8-cp313-cp313-win32.whl", hash = "sha256:69cf8b1edbc2f6e401a1be0a2fc6eb1ea05679446053724a3ac399abea1e98d3", size = 1759310, upload-time = "2026-05-04T15:09:47.103Z" },
+    { url = "https://files.pythonhosted.org/packages/4c/4d/6635f0ba2d0f456f5f5ded29691fab431da94ae8403b88379da730337971/selectolax-0.4.8-cp313-cp313-win_amd64.whl", hash = "sha256:e57a2c314b339ffd6da899bf7d37a3d850aa03b8bcbcbb25d183fdae4525ad6d", size = 1856663, upload-time = "2026-05-04T15:09:49.247Z" },
+    { url = "https://files.pythonhosted.org/packages/c5/2d/a9adae174d3b6e83eda10854e3921f298a2764f604bb6b8bea68461cb003/selectolax-0.4.8-cp313-cp313-win_arm64.whl", hash = "sha256:9a593eaf1a6686b559e3f65f20d21c592933cf6c18a0a042a9f46d96a88f54d3", size = 1805441, upload-time = "2026-05-04T15:09:51.3Z" },
+    { url = "https://files.pythonhosted.org/packages/25/60/d1a14de44725277d91111931d785edc8387de1e95fe0987766b1e73a899e/selectolax-0.4.8-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:412d8c3203d294a36bed5b01942d8f81724a6731458e257b0153f2f4425e3da9", size = 2252331, upload-time = "2026-05-04T15:09:52.934Z" },
+    { url = "https://files.pythonhosted.org/packages/4e/79/2455aab4dc66a7f6c49af5dda759eca3bdbd20f2fa4193eb1daf32abc93e/selectolax-0.4.8-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:45e02ed68d9888828edae568c17ebd055f265221c2784329ed63078283c4e0ea", size = 2304020, upload-time = "2026-05-04T15:09:55.309Z" },
+    { url = "https://files.pythonhosted.org/packages/04/81/ae320006cb5f327926d7888fabdec3181c1a4dbb6218ebe05f10f204fdd0/selectolax-0.4.8-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4f7aa77dec4a04b8b63aeaa505c168ac2597df2be426783ede8d74d56e925b48", size = 2368262, upload-time = "2026-05-04T15:09:57.231Z" },
+    { url = "https://files.pythonhosted.org/packages/7e/b4/cf8c860906aeeb074a0babe070d399416b9ec80c1029e1ed187aed443936/selectolax-0.4.8-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4fab78f7cab55c06a1a994f522adb5b4c5302aaacac60bdca7de1f8eaacaa9f9", size = 2414392, upload-time = "2026-05-04T15:09:58.889Z" },
+    { url = "https://files.pythonhosted.org/packages/81/fc/ab5f27398bfa65d49e92b5846e0ed4bb92c45c5cfe759d3c14ba47845085/selectolax-0.4.8-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:7923f90a5d51325cde8b47e41aa71a0f81429afb85d26966369389c5eaf99c6e", size = 2390375, upload-time = "2026-05-04T15:10:01.06Z" },
+    { url = "https://files.pythonhosted.org/packages/1c/3d/0045463e7b8e9229a422507aac28fa71fa5cf548c1410f47f1337fe54bdc/selectolax-0.4.8-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:7af017e28bcdcea1d7aaeab329f78515fab3becf30c4c9408e0c9b8303be1393", size = 2454560, upload-time = "2026-05-04T15:10:03.135Z" },
+    { url = "https://files.pythonhosted.org/packages/2d/9c/628723b10aece08f963b8d38473433df66986b419c9789d130cae9ff61dd/selectolax-0.4.8-cp314-cp314-win32.whl", hash = "sha256:40f6de3a820983c1f3feacb60351677b69d0c829b63aa11c7bd4811bcbcb8f42", size = 1870694, upload-time = "2026-05-04T15:10:04.912Z" },
+    { url = "https://files.pythonhosted.org/packages/34/e4/2d111f68cbd2ed1270d37b2fe23f9dbd2059cfa80f492ee19b3ad3b641b4/selectolax-0.4.8-cp314-cp314-win_amd64.whl", hash = "sha256:ce6668c260ada8880106f6d37cd073b53ac3342f04b8a771dacb6ea68d953285", size = 1965854, upload-time = "2026-05-04T15:10:06.513Z" },
+    { url = "https://files.pythonhosted.org/packages/63/a5/f0042a20e4ca914e66d2f513491bfc92d907ead59d3a63c6e56e6130b006/selectolax-0.4.8-cp314-cp314-win_arm64.whl", hash = "sha256:5125e171b16bbbdb76ea36140c165f183b1e99fe4170eb9b79a7141090bba51c", size = 1914520, upload-time = "2026-05-04T15:10:08.223Z" },
+    { url = "https://files.pythonhosted.org/packages/b3/3b/5d0087a277802a0054073d67919e560de3fada54497762f065ea5e54b0cb/selectolax-0.4.8-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:bc041e2554c4cce221401bbde42177a99670fdba8a60448f0ae65731fc08a0b5", size = 2266985, upload-time = "2026-05-04T15:10:10.405Z" },
+    { url = "https://files.pythonhosted.org/packages/b0/07/1c398f0040f21897945d6a750dbc49bf1e0190f57490ba631bda4a421e86/selectolax-0.4.8-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:957fd757b0491e29f96235cb5ce0a46b8cdc8cce41f5032805387311d2504677", size = 2314767, upload-time = "2026-05-04T15:10:12.239Z" },
+    { url = "https://files.pythonhosted.org/packages/dc/00/4ef2186699d1097f7275eade50cc27d41a1ecb8311b8d46c185e5266dd9d/selectolax-0.4.8-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:d001ceff303937e0d05ecba4c1a8d39ea04840a653ccaecf59446667c16f65bc", size = 2374250, upload-time = "2026-05-04T15:10:13.988Z" },
+    { url = "https://files.pythonhosted.org/packages/9f/01/bb5fe5a69997282764174d4fdd0246d6ceb269c03806f07ad454d3fdc07c/selectolax-0.4.8-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:9f293e28183b329bed738918d18cd35966add6600bad2f3431470ffa18c0639e", size = 2425296, upload-time = "2026-05-04T15:10:16.493Z" },
+    { url = "https://files.pythonhosted.org/packages/b3/d3/5114524c7480c6f55791ef7ab82a4a923b0367553bc9f39541ed8b392117/selectolax-0.4.8-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:3972b884caa78abf3710a0e7723dc705974dbdaef46d98a05e47c68493d86922", size = 2401425, upload-time = "2026-05-04T15:10:18.261Z" },
+    { url = "https://files.pythonhosted.org/packages/59/8d/e51946644e5abbe53d08634ac2251f73132d290116a9d349ec5d381c8ba0/selectolax-0.4.8-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:a6aacac9d106a2c992b817b5c1d4a1aa2e825403a5c1354386657968fa4b9b15", size = 2462447, upload-time = "2026-05-04T15:10:20.026Z" },
+    { url = "https://files.pythonhosted.org/packages/9b/54/2250ce95c2b4f47f43b5fb9a156db823faffe1623c95e42137c738234573/selectolax-0.4.8-cp314-cp314t-win32.whl", hash = "sha256:ccfb2d172db96401a8d4ebc2dc12f4f4f20208597f5e6510d3f6bdc5a49c46b5", size = 1919388, upload-time = "2026-05-04T15:10:22.17Z" },
+    { url = "https://files.pythonhosted.org/packages/3a/8e/4e576a67fdd3a44d76418a196b7850890af8ef254efbca3eabef1b70fad5/selectolax-0.4.8-cp314-cp314t-win_amd64.whl", hash = "sha256:5c34fd9a29a430c1f8800d94e7a2c4fd0b1aef10485b0871fbae914cde232c41", size = 2036030, upload-time = "2026-05-04T15:10:23.775Z" },
+    { url = "https://files.pythonhosted.org/packages/31/58/1e080cf00d7c4712e6411cd9cd3c927ec6ad4adf25d280a73ef38aeeb68a/selectolax-0.4.8-cp314-cp314t-win_arm64.whl", hash = "sha256:136dfad919728023fcd13fc773a1c488204fb0efd9c1f9baf7bd815fbb35eec3", size = 1939289, upload-time = "2026-05-04T15:10:25.481Z" },
+]
+
+[[package]]
+name = "setuptools"
+version = "82.0.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/4f/db/cfac1baf10650ab4d1c111714410d2fbb77ac5a616db26775db562c8fab2/setuptools-82.0.1.tar.gz", hash = "sha256:7d872682c5d01cfde07da7bccc7b65469d3dca203318515ada1de5eda35efbf9", size = 1152316, upload-time = "2026-03-09T12:47:17.221Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/9d/76/f789f7a86709c6b087c5a2f52f911838cad707cc613162401badc665acfe/setuptools-82.0.1-py3-none-any.whl", hash = "sha256:a59e362652f08dcd477c78bb6e7bd9d80a7995bc73ce773050228a348ce2e5bb", size = 1006223, upload-time = "2026-03-09T12:47:15.026Z" },
+]
+
+[[package]]
+name = "shellingham"
+version = "1.5.4"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/58/15/8b3609fd3830ef7b27b655beb4b4e9c62313a4e8da8c676e142cc210d58e/shellingham-1.5.4.tar.gz", hash = "sha256:8dbca0739d487e5bd35ab3ca4b36e11c4078f3a234bfce294b0a0291363404de", size = 10310, upload-time = "2023-10-24T04:13:40.426Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/e0/f9/0595336914c5619e5f28a1fb793285925a8cd4b432c9da0a987836c7f822/shellingham-1.5.4-py2.py3-none-any.whl", hash = "sha256:7ecfff8f2fd72616f7481040475a65b2bf8af90a56c89140852d1120324e8686", size = 9755, upload-time = "2023-10-24T04:13:38.866Z" },
+]
+
+[[package]]
+name = "six"
+version = "1.17.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/94/e7/b2c673351809dca68a0e064b6af791aa332cf192da575fd474ed7d6f16a2/six-1.17.0.tar.gz", hash = "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81", size = 34031, upload-time = "2024-12-04T17:35:28.174Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/b7/ce/149a00dd41f10bc29e5921b496af8b574d8413afcd5e30dfa0ed46c2cc5e/six-1.17.0-py2.py3-none-any.whl", hash = "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274", size = 11050, upload-time = "2024-12-04T17:35:26.475Z" },
+]
+
+[[package]]
+name = "smart-open"
+version = "7.6.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "wrapt" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/14/33/7a00ac9b4a63afb4279b99a766f6cbe56c443526dcbf5db97b219e21fde9/smart_open-7.6.0.tar.gz", hash = "sha256:44717f46b5ff276fac03b88e5d13d1c416f064f3b7b081381b0fa8889004bd7e", size = 54548, upload-time = "2026-04-13T09:48:04.347Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/de/bc/2761410d0541e975f384bc89f062d716bf119499dd097eb1af33dcd3b1c0/smart_open-7.6.0-py3-none-any.whl", hash = "sha256:2a78f454610a826aa688065b54b4a0a9b12a5599fa61d5190e9bac2df5e5f53f", size = 64591, upload-time = "2026-04-13T09:48:02.687Z" },
+]
+
+[[package]]
+name = "sniffio"
+version = "1.3.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/a2/87/a6771e1546d97e7e041b6ae58d80074f81b7d5121207425c964ddf5cfdbd/sniffio-1.3.1.tar.gz", hash = "sha256:f4324edc670a0f49750a81b895f35c3adb843cca46f0530f79fc1babb23789dc", size = 20372, upload-time = "2024-02-25T23:20:04.057Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/e9/44/75a9c9421471a6c4805dbf2356f7c181a29c1879239abab1ea2cc8f38b40/sniffio-1.3.1-py3-none-any.whl", hash = "sha256:2f6da418d1f1e0fddd844478f41680e794e6051915791a034ff65e5f100525a2", size = 10235, upload-time = "2024-02-25T23:20:01.196Z" },
+]
+
+[[package]]
+name = "soupsieve"
+version = "2.8.3"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/7b/ae/2d9c981590ed9999a0d91755b47fc74f74de286b0f5cee14c9269041e6c4/soupsieve-2.8.3.tar.gz", hash = "sha256:3267f1eeea4251fb42728b6dfb746edc9acaffc4a45b27e19450b676586e8349", size = 118627, upload-time = "2026-01-20T04:27:02.457Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/46/2c/1462b1d0a634697ae9e55b3cecdcb64788e8b7d63f54d923fcd0bb140aed/soupsieve-2.8.3-py3-none-any.whl", hash = "sha256:ed64f2ba4eebeab06cc4962affce381647455978ffc1e36bb79a545b91f45a95", size = 37016, upload-time = "2026-01-20T04:27:01.012Z" },
+]
+
+[[package]]
+name = "spacy"
+version = "3.8.14"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "catalogue" },
+    { name = "confection" },
+    { name = "cymem" },
+    { name = "jinja2" },
+    { name = "murmurhash" },
+    { name = "numpy" },
+    { name = "packaging" },
+    { name = "preshed" },
+    { name = "pydantic" },
+    { name = "requests" },
+    { name = "setuptools" },
+    { name = "spacy-legacy" },
+    { name = "spacy-loggers" },
+    { name = "srsly" },
+    { name = "thinc" },
+    { name = "tqdm" },
+    { name = "typer" },
+    { name = "wasabi" },
+    { name = "weasel" },
+]
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/0c/78/e4f2ae19a791cae756cd0e801204953eaec4e9ab75a60ad39f671dbb8d5a/spacy-3.8.14-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:726f02c60a2c6b0029167370d22d51731172a053d29c7e2ea6190db6de3ab483", size = 6218335, upload-time = "2026-03-29T10:40:46.298Z" },
+    { url = "https://files.pythonhosted.org/packages/06/df/178bbab47fa209c8baf2f1e609cbddc6b18a985200be1ceee22bd5b89beb/spacy-3.8.14-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:e3ebe50b93f2d40e8ec3451255528bb622ccb12be39fd140bb87668ce8d1075b", size = 6033860, upload-time = "2026-03-29T10:40:47.861Z" },
+    { url = "https://files.pythonhosted.org/packages/ff/e8/048d83b73b28686307bd9a60878a58de7b7b21b562ca4de8b5bd558031e9/spacy-3.8.14-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:daeb64b048f12c059997281aed53eb8776d26416dd313cf17ad6f63124b2b564", size = 32725099, upload-time = "2026-03-29T10:40:50.194Z" },
+    { url = "https://files.pythonhosted.org/packages/8e/3f/1799af5f4ccc8eb7500e4a20ca301488134429dba08cda5be68ce6ab2992/spacy-3.8.14-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:6d45715a24446f23b98ec3f09409a1d4111983d1d64613250ee38c3270e21853", size = 33205838, upload-time = "2026-03-29T10:40:53.029Z" },
+    { url = "https://files.pythonhosted.org/packages/78/07/81ab9acd0ec64bfdd7339acfc4cf35f5fb74bbbb0b2be7e64d717c416bac/spacy-3.8.14-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:1069a8be34940809f8462eb69f09a3f0ce59bf8b9cb82475f2a8e3580f50ece0", size = 32090380, upload-time = "2026-03-29T10:40:56.115Z" },
+    { url = "https://files.pythonhosted.org/packages/74/a5/b081b5bd3cedb2634c23eb470b5e24c65c894c57646567f47627291c2b3f/spacy-3.8.14-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:2dfa77aec7fdebac0455d8afd4ce1d92d6f868b03d507ed1976179a63db7b374", size = 32991946, upload-time = "2026-03-29T10:40:58.852Z" },
+    { url = "https://files.pythonhosted.org/packages/5f/55/4371413a6dfc1fa837282a365498165f828c2f3fe018dfb35336acc869e0/spacy-3.8.14-cp312-cp312-win_amd64.whl", hash = "sha256:9def18c76a4472b326cb91a195623c9ca38a2b86999ad2df9e00b49ba8c63734", size = 14226946, upload-time = "2026-03-29T10:41:01.63Z" },
+    { url = "https://files.pythonhosted.org/packages/f3/5e/12ac876017da6c1e6b72afcc3c8b309996227fd3aa15382cd3311aee21b8/spacy-3.8.14-cp312-cp312-win_arm64.whl", hash = "sha256:d6257133357e4801c9c5d011925af5439b0a015aacf3c16528aa0009982431c7", size = 13628765, upload-time = "2026-03-29T10:41:03.806Z" },
+    { url = "https://files.pythonhosted.org/packages/1b/e5/822bbdfa459fee863ef2e9879a34b0ae5db7cd1e3eb76d32c766f19222e9/spacy-3.8.14-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:2b4f60fa8b9641a5e93e7a96db0cdd106d05d61756bf1d0ddcd1705ad347909a", size = 6202114, upload-time = "2026-03-29T10:41:06.119Z" },
+    { url = "https://files.pythonhosted.org/packages/7e/de/0e512154113e1f341567f2b9341835775e4180c180221e60faedaebb2f65/spacy-3.8.14-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:0860c57220c633ccb20468bcd64bfb0d28908990c371a8857951d093a148dc8e", size = 6015458, upload-time = "2026-03-29T10:41:07.79Z" },
+    { url = "https://files.pythonhosted.org/packages/0c/4f/29c7e56afc7db07348a9e0efe0243b5eef465d5dc3d56433f164378c3fa6/spacy-3.8.14-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:c24620b7dba879c69cebc51ef3b1107d4d4e44a1e0d4baa439372887d00c3fd9", size = 32510659, upload-time = "2026-03-29T10:41:09.88Z" },
+    { url = "https://files.pythonhosted.org/packages/1e/ce/cae678f664d5467016819253f5d6e52f8e68a12d8e799b651d73ec2a9a4b/spacy-3.8.14-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:9699c1248d115d5825987c287a6f6acd66386ef3ebee7994ee67ba093e932c59", size = 32841057, upload-time = "2026-03-29T10:41:12.585Z" },
+    { url = "https://files.pythonhosted.org/packages/04/d4/419868afd449bdd367df005932537eea66c71e97c899ba278f3124933f3c/spacy-3.8.14-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:042d799e342fdb6bb5b02a4213a95acc9116c40ed3c849bb0a8296fbe648ec22", size = 31763252, upload-time = "2026-03-29T10:41:15.569Z" },
+    { url = "https://files.pythonhosted.org/packages/ec/53/df5c1fee45f200b749ba72eeb536fbb2c545fc56230324954263b2f3be00/spacy-3.8.14-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:69b2264294097336e86832e8663f1ab3a7215621184863c96c082ab17ee11937", size = 32717872, upload-time = "2026-03-29T10:41:18.193Z" },
+    { url = "https://files.pythonhosted.org/packages/12/c2/f1882ec2f5cc9c4e73cf2132997a03c397d7ceeb5ee7f7bb878b51a16365/spacy-3.8.14-cp313-cp313-win_amd64.whl", hash = "sha256:4b6d4f20e291a7c70e37de2f246622b44a0ce82efaa710c9801c6bd599e75177", size = 14220335, upload-time = "2026-03-29T10:41:20.89Z" },
+]
+
+[[package]]
+name = "spacy-legacy"
+version = "3.0.12"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/d9/79/91f9d7cc8db5642acad830dcc4b49ba65a7790152832c4eceb305e46d681/spacy-legacy-3.0.12.tar.gz", hash = "sha256:b37d6e0c9b6e1d7ca1cf5bc7152ab64a4c4671f59c85adaf7a3fcb870357a774", size = 23806, upload-time = "2023-01-23T09:04:15.104Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/c3/55/12e842c70ff8828e34e543a2c7176dac4da006ca6901c9e8b43efab8bc6b/spacy_legacy-3.0.12-py2.py3-none-any.whl", hash = "sha256:476e3bd0d05f8c339ed60f40986c07387c0a71479245d6d0f4298dbd52cda55f", size = 29971, upload-time = "2023-01-23T09:04:13.45Z" },
+]
+
+[[package]]
+name = "spacy-loggers"
+version = "1.0.5"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/67/3d/926db774c9c98acf66cb4ed7faf6c377746f3e00b84b700d0868b95d0712/spacy-loggers-1.0.5.tar.gz", hash = "sha256:d60b0bdbf915a60e516cc2e653baeff946f0cfc461b452d11a4d5458c6fe5f24", size = 20811, upload-time = "2023-09-11T12:26:52.323Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/33/78/d1a1a026ef3af911159398c939b1509d5c36fe524c7b644f34a5146c4e16/spacy_loggers-1.0.5-py3-none-any.whl", hash = "sha256:196284c9c446cc0cdb944005384270d775fdeaf4f494d8e269466cfa497ef645", size = 22343, upload-time = "2023-09-11T12:26:50.586Z" },
+]
+
+[[package]]
+name = "srsly"
+version = "2.5.3"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "catalogue" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/2b/db/f794f219a6c788b881252d2536a8c4a97d2bdaadc690391e1cb53d123d71/srsly-2.5.3.tar.gz", hash = "sha256:08f98dbecbff3a31466c4ae7c833131f59d3655a0ad8ac749e6e2c149e2b0680", size = 490881, upload-time = "2026-03-23T11:56:59.865Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/02/cc/e9f7fcec4cc92ad8bad6316c4241638b8cf7380382d4489d94ec6c436452/srsly-2.5.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:71e51c046ccbeefb86524c6b1e17574f579c6ac4dc8ea4a09437d3e8f88342d3", size = 658379, upload-time = "2026-03-23T11:55:59.85Z" },
+    { url = "https://files.pythonhosted.org/packages/21/e4/fea4512e9785f58509b2cf67d993323848e583161b5fcfdc7dd9d7c1f3df/srsly-2.5.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:2f73c0db911552e94fe2016e1759d261d2f47926f68826664cada3723c87006a", size = 658513, upload-time = "2026-03-23T11:56:01.239Z" },
+    { url = "https://files.pythonhosted.org/packages/20/b1/53591681b6ff2699a4f97b2d5552ba196eaa6a979b0873605f4c04b5f7ee/srsly-2.5.3-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:5c1ac27ae5f4bb9163c7d2c45fc8ec173aac3d92e32086d9472b326c5c6e570e", size = 1172265, upload-time = "2026-03-23T11:56:02.589Z" },
+    { url = "https://files.pythonhosted.org/packages/4e/c9/741e29f534919a944a16da4184924b1d3404c4bf60716ab2b91be771d1e3/srsly-2.5.3-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:99026bcd9cbd3211cc36517400b04ca0fc5d3e412b14daf84ee6e65f67d9a2d8", size = 1180873, upload-time = "2026-03-23T11:56:03.944Z" },
+    { url = "https://files.pythonhosted.org/packages/89/57/5554f786eccf78b2750d6ac63be126e1b67badec2cb409dd611cf6f8c52b/srsly-2.5.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:07d682679e639eb46ff7e6da4a92714f4d5ffe351d088ee66f221e9b1f8865bb", size = 1120437, upload-time = "2026-03-23T11:56:05.283Z" },
+    { url = "https://files.pythonhosted.org/packages/eb/95/9b4f73b1be3692f86d72ccc131c8e50f26f824d5c8830a59390bcc5b60ef/srsly-2.5.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:8e0542d85d6b55cf2934050d6ffcb1cd76c768dcf9572e7467002cf087bb366d", size = 1137376, upload-time = "2026-03-23T11:56:06.613Z" },
+    { url = "https://files.pythonhosted.org/packages/5a/de/89ca640ca1953c4612279ce515d0af35658df3c06cdb324329bc91b4a7e1/srsly-2.5.3-cp312-cp312-win_amd64.whl", hash = "sha256:598f1e494c18cacb978299d77125415a586417081959f8ec3f068b32d97f8933", size = 652459, upload-time = "2026-03-23T11:56:07.994Z" },
+    { url = "https://files.pythonhosted.org/packages/6d/4f/7ab6d49e36d9cc72ee15746cabd116eb6f338be8a06c1882968ee9d6c7d7/srsly-2.5.3-cp312-cp312-win_arm64.whl", hash = "sha256:4b1b721cd3ad1a9b2343519aadc786a4d09d5c0666962d49852eb12d6ec3fe26", size = 638411, upload-time = "2026-03-23T11:56:09.31Z" },
+    { url = "https://files.pythonhosted.org/packages/9d/5c/12901e3794f4158abc6da750725aad6c2afddb1e4227b300fe7c71f66957/srsly-2.5.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:e67b6bbacbfadea5e100266d2797f2d4cec9883ea4dc84a5537673850036a8d8", size = 656750, upload-time = "2026-03-23T11:56:10.708Z" },
+    { url = "https://files.pythonhosted.org/packages/04/61/181c26370995f96f56f1b64b801e3ca1e0d703fc36506ae28606d62369fb/srsly-2.5.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:348c231b4477d8fe86603131d0f166d2feac9c372704dfc4398be71cc5b6fb07", size = 656746, upload-time = "2026-03-23T11:56:12.28Z" },
+    { url = "https://files.pythonhosted.org/packages/77/c6/35876c78889f8ffe11ed3521644e666c3aef20ea31527b70f47456cf35c2/srsly-2.5.3-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:b0938c2978c91ae1ef9c1f2ba35abb86330e198fb23469e356eba311e02233ee", size = 1155762, upload-time = "2026-03-23T11:56:14.075Z" },
+    { url = "https://files.pythonhosted.org/packages/3e/da/40b71ca9906c8eb8f8feb6ac11d33dad458c85a56e1de764b96d402168a0/srsly-2.5.3-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:5f6a837954429ecbe6dcdd27390d2fb4c7d01a3f99c9ffcf9ce66b2a6dd1b738", size = 1161092, upload-time = "2026-03-23T11:56:15.778Z" },
+    { url = "https://files.pythonhosted.org/packages/dc/14/c0dd30cc8b93ce8137ff4766f743c882440ce49195fffc5d50eaeef311a6/srsly-2.5.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:3576c125c486ce2958c2047e8858fe3cfc9ea877adfa05203b0986f9badee355", size = 1109984, upload-time = "2026-03-23T11:56:17.056Z" },
+    { url = "https://files.pythonhosted.org/packages/08/f3/34354f183d8faafc631585571224b54d1b4b67e796972c36519c074ca355/srsly-2.5.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:5fb59c42922e095d1ea36085c55bc16e2adb06a7bfe57b24d381e0194ae699f2", size = 1128409, upload-time = "2026-03-23T11:56:18.761Z" },
+    { url = "https://files.pythonhosted.org/packages/a4/d9/5531f8a19492060b4e76e4ab06aca6f096fb5128fe18cc813d1772daf653/srsly-2.5.3-cp313-cp313-win_amd64.whl", hash = "sha256:111805927f05f5db440aeeacb85ce43da0b19ce7b2a09567a9ef8d30f3cc4d83", size = 650820, upload-time = "2026-03-23T11:56:20.096Z" },
+    { url = "https://files.pythonhosted.org/packages/8e/8a/62fb7a971eca29e12f03fb9ddacb058548c14d33e5b5675ff0f85839cc7b/srsly-2.5.3-cp313-cp313-win_arm64.whl", hash = "sha256:0f106b0a700ab56e4a7c431b0f1444009ab6cb332edc7bbf6811c2a43f4722cb", size = 637278, upload-time = "2026-03-23T11:56:21.439Z" },
+    { url = "https://files.pythonhosted.org/packages/e1/5b/e4ef43c2a381711230af98d4c94a5323df48d6a7899ee652e05bf889290e/srsly-2.5.3-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:39c13d552a9f9674a12cdcdc66b0c2f02f3430d0cd04c5f9cf598824c2bd3d65", size = 661294, upload-time = "2026-03-23T11:56:23.29Z" },
+    { url = "https://files.pythonhosted.org/packages/92/2d/ebce7f3717e52cd0a01f4ec570f388f3b7098526794fcf1ad734e0b8f852/srsly-2.5.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:14c930767cc169611a2dc14e23bc7638cfb616d6f79029700ade033607343540", size = 660952, upload-time = "2026-03-23T11:56:24.908Z" },
+    { url = "https://files.pythonhosted.org/packages/22/47/a8f3e9b214be2624c8e8a78d38ca7b1d4e26b92d57018412e4bfc4abe89a/srsly-2.5.3-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:2f2d464f0d0237e32fb53f0ec6f05418652c550e772b50e9918e83a1577cba4d", size = 1154554, upload-time = "2026-03-23T11:56:26.608Z" },
+    { url = "https://files.pythonhosted.org/packages/d6/71/2a89dc3180a51e633a87a079ca064225f4aaf46c7b2a5fc720e28f261d98/srsly-2.5.3-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:d18933248a5bb0ad56a1bae6003a9a7f37daac2ecb0c5bcbfaaf081b317e1c84", size = 1155746, upload-time = "2026-03-23T11:56:28.102Z" },
+    { url = "https://files.pythonhosted.org/packages/b8/36/72e5ce3153927ca404b6f5bf5280e6ff3399c11557df472b153945468e0a/srsly-2.5.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:7ea5412ea229e571ac9738cbe14f845cc06c8e4e956afb5f42061ccd087ef31f", size = 1112374, upload-time = "2026-03-23T11:56:29.591Z" },
+    { url = "https://files.pythonhosted.org/packages/04/b2/0895de109c28eca0d41a811ab7c076d4e4a505e8466f06bae22f5180a1dd/srsly-2.5.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:8d3988970b4cf7d03bdd5b5169302ff84562dd2e1e0f84aeb34df3e5b5dc19bf", size = 1127732, upload-time = "2026-03-23T11:56:31.458Z" },
+    { url = "https://files.pythonhosted.org/packages/c7/79/a37fa7759797fbdfe0a2e029ab13e78b1e81e191220d2bb8ff57d869aefb/srsly-2.5.3-cp314-cp314-win_amd64.whl", hash = "sha256:6a02d7dcc16126c8fae1c1c09b2072798a1dc482ab5f9c52b12c7114dac47325", size = 656467, upload-time = "2026-03-23T11:56:33.14Z" },
+    { url = "https://files.pythonhosted.org/packages/d7/25/0dae019b3b90ad9037f91de4c390555cdaac9460a93ad62b02b03babdff5/srsly-2.5.3-cp314-cp314-win_arm64.whl", hash = "sha256:1c9129c4abe31903ff7996904a51afdd5428060de6c3d12af49a4da5e8df2821", size = 643040, upload-time = "2026-03-23T11:56:34.448Z" },
+    { url = "https://files.pythonhosted.org/packages/3a/44/72dd5285b2e05435d98b0797f101d91d9b345d491ddc1fdb9bd09e27ccb8/srsly-2.5.3-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:29d5d01ba4c2e9c01f936e5e6d5babc4a47b38c9cbd6e1ec23f6d5a49df32605", size = 666200, upload-time = "2026-03-23T11:56:35.753Z" },
+    { url = "https://files.pythonhosted.org/packages/d2/ad/002c71b87fc3f648c9bf0ec47de0c3822bf2c95c8896a589dd03e7fd3977/srsly-2.5.3-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:5c8df4039426d99f0148b5743542842ab96b82daded0b342555e15a639927757", size = 667409, upload-time = "2026-03-23T11:56:37.172Z" },
+    { url = "https://files.pythonhosted.org/packages/2a/35/2cea3d5e80aeecfc4ece9e7e1783e7792cc3bad7ab85ab585882e1db4e38/srsly-2.5.3-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:06a43d63bde2e8cccadb953d7fff70b18196ca286b65dd2ad16006d65f3f8166", size = 1265941, upload-time = "2026-03-23T11:56:38.825Z" },
+    { url = "https://files.pythonhosted.org/packages/aa/38/8a4d7e86dd0370a2e5af251b646000197bb5b7e0f9aa360c71bbfb253d0d/srsly-2.5.3-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:808cfafc047f0dec507a34c8fa8e4cda5722737fd33577df73452f52f7aca644", size = 1250693, upload-time = "2026-03-23T11:56:40.449Z" },
+    { url = "https://files.pythonhosted.org/packages/99/05/340129de5ea7b237271b12f8a6962cfa7eb0c5a3056794626d348c5ae7c7/srsly-2.5.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:71d4cbe2b2a1335c76ed0acae2dc862163787d8b01a705e1949796907ed94ccd", size = 1242408, upload-time = "2026-03-23T11:56:41.8Z" },
+    { url = "https://files.pythonhosted.org/packages/01/cb/d7fee7ab27c6aa2e3f865fb7b50ba18c81a4c763bba12bdf53df246441bc/srsly-2.5.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:565f69083d33cb329cfc74317da937fb3270c0f40fabc1b4488702d8074b4a3e", size = 1242749, upload-time = "2026-03-23T11:56:43.246Z" },
+    { url = "https://files.pythonhosted.org/packages/d8/d1/9bad3a0f2fa7b72f4e0cf1d267b00513092d20ef538c47f72823ae4f7656/srsly-2.5.3-cp314-cp314t-win_amd64.whl", hash = "sha256:8ac016ffaeac35bc010992b71bf8afdd39d458f201c8138d84cf78778a936e6c", size = 673783, upload-time = "2026-03-23T11:56:44.875Z" },
+    { url = "https://files.pythonhosted.org/packages/2a/ae/57d1d7af907e20c077e113e0e4976f87b82c0a415403d99284a262229dd0/srsly-2.5.3-cp314-cp314t-win_arm64.whl", hash = "sha256:d822083fe26ec6728bd8c273ac121fc4ab3864a0fdf0cf0ff3efb188fcd209ed", size = 650229, upload-time = "2026-03-23T11:56:46.148Z" },
+]
+
+[[package]]
+name = "starlette"
+version = "1.0.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "anyio" },
+    { name = "typing-extensions", marker = "python_full_version < '3.13'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/81/69/17425771797c36cded50b7fe44e850315d039f28b15901ab44839e70b593/starlette-1.0.0.tar.gz", hash = "sha256:6a4beaf1f81bb472fd19ea9b918b50dc3a77a6f2e190a12954b25e6ed5eea149", size = 2655289, upload-time = "2026-03-22T18:29:46.779Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/0b/c9/584bc9651441b4ba60cc4d557d8a547b5aff901af35bda3a4ee30c819b82/starlette-1.0.0-py3-none-any.whl", hash = "sha256:d3ec55e0bb321692d275455ddfd3df75fff145d009685eb40dc91fc66b03d38b", size = 72651, upload-time = "2026-03-22T18:29:45.111Z" },
+]
+
+[[package]]
+name = "tenacity"
+version = "9.1.4"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/47/c6/ee486fd809e357697ee8a44d3d69222b344920433d3b6666ccd9b374630c/tenacity-9.1.4.tar.gz", hash = "sha256:adb31d4c263f2bd041081ab33b498309a57c77f9acf2db65aadf0898179cf93a", size = 49413, upload-time = "2026-02-07T10:45:33.841Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/d7/c1/eb8f9debc45d3b7918a32ab756658a0904732f75e555402972246b0b8e71/tenacity-9.1.4-py3-none-any.whl", hash = "sha256:6095a360c919085f28c6527de529e76a06ad89b23659fa881ae0649b867a9d55", size = 28926, upload-time = "2026-02-07T10:45:32.24Z" },
+]
+
+[[package]]
+name = "thinc"
+version = "8.3.13"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "blis" },
+    { name = "catalogue" },
+    { name = "confection" },
+    { name = "cymem" },
+    { name = "murmurhash" },
+    { name = "numpy" },
+    { name = "packaging" },
+    { name = "preshed" },
+    { name = "pydantic" },
+    { name = "setuptools" },
+    { name = "srsly" },
+    { name = "wasabi" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/13/46/76df95f2c327f9a9cef30c1523bf285627897097163584dcf5f77b2ebce2/thinc-8.3.13.tar.gz", hash = "sha256:68e658549fc1eb3ff92aed5147fcbb9c15d6e9cc0e623b4d0998d16522ffb4f9", size = 194640, upload-time = "2026-03-23T07:22:36.41Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/3e/af/f7c1ebfe92eb5d27d7f2f3da67a11e2eb57bc30ab1553279af6dc65b65a8/thinc-8.3.13-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:77a41f66285321d20aaedaea1e87d7cd48dca6d2427bed1867ec7cba7109fc8d", size = 821097, upload-time = "2026-03-23T07:21:56.698Z" },
+    { url = "https://files.pythonhosted.org/packages/45/8f/69d7338575d98df85d0b54c0f5fc277dba72587fe9ab846ecdd12a998bcb/thinc-8.3.13-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:3710d318b4e5460cf366a6f7b5ddbefb5d39dbd4cfa408222750fdc6c27c4411", size = 791932, upload-time = "2026-03-23T07:21:58.38Z" },
+    { url = "https://files.pythonhosted.org/packages/4b/a5/21d010c81e81e1589e5ccb4950e521804d13726e541e87f644c51815673b/thinc-8.3.13-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:5a08c87143a6d20177652dca1ec0dc815d88216d8fc62594a57e8bc45bf5ed49", size = 3854219, upload-time = "2026-03-23T07:21:59.819Z" },
+    { url = "https://files.pythonhosted.org/packages/f9/ff/6914bf370bd1d604d89e6dfb46b97d10cd9b00d42ff8c036283e92314a8c/thinc-8.3.13-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:4b5ec9ff313819e7d8667794a3559463fa89ff45aaa73e3fd8d6273b1e0d7a7f", size = 3903307, upload-time = "2026-03-23T07:22:01.652Z" },
+    { url = "https://files.pythonhosted.org/packages/f3/3d/5572b47fa155fb3388c071515b74024fa17a6efd1df9406da378f0aa84ef/thinc-8.3.13-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:5c9a48f2bc1e04f138240ed5f9b815a9141a5de26accd0f08fa0137fcefed258", size = 4836882, upload-time = "2026-03-23T07:22:03.565Z" },
+    { url = "https://files.pythonhosted.org/packages/f0/f0/a8d77c7bac089697c6df302cc3c936a1ab36a4720deae889e6f1dbcbd0eb/thinc-8.3.13-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:79a29a44d76bd02f5ac0624268c6e42b3576ae472c791a8ae9c2d813ae789b59", size = 5033398, upload-time = "2026-03-23T07:22:05.045Z" },
+    { url = "https://files.pythonhosted.org/packages/21/82/5651bb1f904d04220fc7670035ada921bf0638e2cff6444d67c12887a968/thinc-8.3.13-cp312-cp312-win_amd64.whl", hash = "sha256:ed1dc709ac4f2f03b710457889e4e02f05de51bc8456980c241d0b28798bc7cb", size = 1721248, upload-time = "2026-03-23T07:22:06.749Z" },
+    { url = "https://files.pythonhosted.org/packages/94/8d/683703de021ffbe46833d722b70f49ffbbca8e5bd6876256977555d92d7d/thinc-8.3.13-cp312-cp312-win_arm64.whl", hash = "sha256:c6a049703a6011c8fe26ee41af7e70272145594140d82f79bb23de619c6a6525", size = 1645777, upload-time = "2026-03-23T07:22:08.104Z" },
+    { url = "https://files.pythonhosted.org/packages/af/b9/7b46942176df459d1804a9e77b0976f7c56f3abf3ec7485d0e5f836a0382/thinc-8.3.13-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:c2811dfd8d46d8b5d3b39051b23e64006b2994a5143b1978b436938018792af8", size = 817337, upload-time = "2026-03-23T07:22:09.538Z" },
+    { url = "https://files.pythonhosted.org/packages/a7/79/53085a72cd8f4fc4e6e313d05ea5aa98e870684f4a0fb318a9875fc0a964/thinc-8.3.13-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:5593e6300cb1ebe0c0e546e9c9fb49e7c2627a0aa688795cd4f995a8b820d2ec", size = 788120, upload-time = "2026-03-23T07:22:11.215Z" },
+    { url = "https://files.pythonhosted.org/packages/9e/3e/d61b462b16da95ac6885f95bb395e672040ee594833e571a6edcffd234f5/thinc-8.3.13-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:f697174d3fb474966ce50b430bbafa101a6d2f7ffb559dac4b5c59389ef72d22", size = 3844666, upload-time = "2026-03-23T07:22:12.67Z" },
+    { url = "https://files.pythonhosted.org/packages/78/4c/898cc654bb123734c71ec5a425c02ca34439517d01ce1c95a6563295580e/thinc-8.3.13-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:e9c7c5c104737b414c8c4ec578e67d78b6c859afe25cbc0684402e721415bd7f", size = 3890658, upload-time = "2026-03-23T07:22:14.668Z" },
+    { url = "https://files.pythonhosted.org/packages/cd/56/1abdbf0a4ad628e8a05d6516fe0745969649d805367a3dccad8ee872981b/thinc-8.3.13-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:7a99d0e242d1ccd23f9ae6bea7cd502f8626efa65c156b91d84581d0356696c3", size = 4819933, upload-time = "2026-03-23T07:22:16.85Z" },
+    { url = "https://files.pythonhosted.org/packages/f1/22/b84dbdc6be5055bbdb2a7352e2c393f67e8593c137f1b83c82bf1e062b6e/thinc-8.3.13-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:e676edd21a747afbe3e6b9f3fca8b962e36d146ded03b070cb0c28e2dfbe9499", size = 5018099, upload-time = "2026-03-23T07:22:18.356Z" },
+    { url = "https://files.pythonhosted.org/packages/0f/a8/763cd7ba949334c9d2cddc92dadb68b344cb9546dc01b8d4a733dcaa16c1/thinc-8.3.13-cp313-cp313-win_amd64.whl", hash = "sha256:8ad40307f20e83f77af28ff5c6be0b86af7a8b251d1231c545508d2763157d8f", size = 1720309, upload-time = "2026-03-23T07:22:19.81Z" },
+    { url = "https://files.pythonhosted.org/packages/f5/15/a11f7bb3cbc97dfecf32a90552f5a8f8a5c99316a99c6c17bdabf5baf256/thinc-8.3.13-cp313-cp313-win_arm64.whl", hash = "sha256:723949cab11d1925c15447928513a718276316cec6e0de28337cca0a62be0521", size = 1644606, upload-time = "2026-03-23T07:22:21.339Z" },
+    { url = "https://files.pythonhosted.org/packages/80/40/f4937d113912c6d669ffe982356ab29dcb6c7fe3be926a15981dbbb6a91c/thinc-8.3.13-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:7badb0be4825535e6362c19e8a41872b65409e9da46d3453a391b843a0720865", size = 817024, upload-time = "2026-03-23T07:22:23.005Z" },
+    { url = "https://files.pythonhosted.org/packages/d2/00/4d4ed1a11ba2920b85a03a0683b16d97dc5beb2e78078dbf0e13e43bcea7/thinc-8.3.13-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:565300b7e13de799e5abff00d445f537e9256cf7da4dcb0d0f005fc16748a29e", size = 792096, upload-time = "2026-03-23T07:22:24.349Z" },
+    { url = "https://files.pythonhosted.org/packages/44/5d/dc33d6932be8721af2ef76b4a3a6e8020648630eabae61fb916d2a861d1d/thinc-8.3.13-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:c17cef1900a1aba7e1487493d16b8aa0a8633116f1b2a51c6649a4000697f17b", size = 3842215, upload-time = "2026-03-23T07:22:25.836Z" },
+    { url = "https://files.pythonhosted.org/packages/af/bc/a6d37d8dadc2c5b524f51192413481160c42c9dd6105e8d5551531623225/thinc-8.3.13-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:f4f26d1eec9b2a6a8f2e0298a5515d13eb06d70730d0d9e1040bb329e12bf3fb", size = 3849253, upload-time = "2026-03-23T07:22:27.845Z" },
+    { url = "https://files.pythonhosted.org/packages/7a/59/ce9c7067f1dfe5985875927de9cf7a79f9dae3e69487fd650dfba558029d/thinc-8.3.13-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:a61a31fd0ce3c2771cf4901ba6df70e774ffe32febf1024c5b43d63575cd58fe", size = 4831163, upload-time = "2026-03-23T07:22:29.395Z" },
+    { url = "https://files.pythonhosted.org/packages/4f/a8/f57819347fc4d8bef2204d15fcbb9d7dff2d6cdd5f83d5ed91456ddacc55/thinc-8.3.13-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:ba8119daf84a12259ae4d251d36426417bafa0b34108890b4b7e2b50966bd990", size = 4986051, upload-time = "2026-03-23T07:22:30.933Z" },
+    { url = "https://files.pythonhosted.org/packages/05/ef/a82214bb7c7c1e2d92b69e1a7654be90cfab180082c6108e45a98af2422c/thinc-8.3.13-cp314-cp314-win_amd64.whl", hash = "sha256:433e3826e018da489f1a8068e6de677f6eff3cc93991a599d90f12cd1bc26cdc", size = 1740382, upload-time = "2026-03-23T07:22:32.869Z" },
+    { url = "https://files.pythonhosted.org/packages/9f/ef/1648fda54e9689058335ff54f650a7a314db2a42e21af1b83949b2dc748e/thinc-8.3.13-cp314-cp314-win_arm64.whl", hash = "sha256:11754fada9ad5ba2e02d5f3f234f940e24015b82333db58372f4a6aedad9b43f", size = 1667687, upload-time = "2026-03-23T07:22:34.967Z" },
+]
+
+[[package]]
+name = "tiktoken"
+version = "0.12.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "regex" },
+    { name = "requests" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/7d/ab/4d017d0f76ec3171d469d80fc03dfbb4e48a4bcaddaa831b31d526f05edc/tiktoken-0.12.0.tar.gz", hash = "sha256:b18ba7ee2b093863978fcb14f74b3707cdc8d4d4d3836853ce7ec60772139931", size = 37806, upload-time = "2025-10-06T20:22:45.419Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/a4/85/be65d39d6b647c79800fd9d29241d081d4eeb06271f383bb87200d74cf76/tiktoken-0.12.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:b97f74aca0d78a1ff21b8cd9e9925714c15a9236d6ceacf5c7327c117e6e21e8", size = 1050728, upload-time = "2025-10-06T20:21:52.756Z" },
+    { url = "https://files.pythonhosted.org/packages/4a/42/6573e9129bc55c9bf7300b3a35bef2c6b9117018acca0dc760ac2d93dffe/tiktoken-0.12.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:2b90f5ad190a4bb7c3eb30c5fa32e1e182ca1ca79f05e49b448438c3e225a49b", size = 994049, upload-time = "2025-10-06T20:21:53.782Z" },
+    { url = "https://files.pythonhosted.org/packages/66/c5/ed88504d2f4a5fd6856990b230b56d85a777feab84e6129af0822f5d0f70/tiktoken-0.12.0-cp312-cp312-manylinux_2_28_aarch64.whl", hash = "sha256:65b26c7a780e2139e73acc193e5c63ac754021f160df919add909c1492c0fb37", size = 1129008, upload-time = "2025-10-06T20:21:54.832Z" },
+    { url = "https://files.pythonhosted.org/packages/f4/90/3dae6cc5436137ebd38944d396b5849e167896fc2073da643a49f372dc4f/tiktoken-0.12.0-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:edde1ec917dfd21c1f2f8046b86348b0f54a2c0547f68149d8600859598769ad", size = 1152665, upload-time = "2025-10-06T20:21:56.129Z" },
+    { url = "https://files.pythonhosted.org/packages/a3/fe/26df24ce53ffde419a42f5f53d755b995c9318908288c17ec3f3448313a3/tiktoken-0.12.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:35a2f8ddd3824608b3d650a000c1ef71f730d0c56486845705a8248da00f9fe5", size = 1194230, upload-time = "2025-10-06T20:21:57.546Z" },
+    { url = "https://files.pythonhosted.org/packages/20/cc/b064cae1a0e9fac84b0d2c46b89f4e57051a5f41324e385d10225a984c24/tiktoken-0.12.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:83d16643edb7fa2c99eff2ab7733508aae1eebb03d5dfc46f5565862810f24e3", size = 1254688, upload-time = "2025-10-06T20:21:58.619Z" },
+    { url = "https://files.pythonhosted.org/packages/81/10/b8523105c590c5b8349f2587e2fdfe51a69544bd5a76295fc20f2374f470/tiktoken-0.12.0-cp312-cp312-win_amd64.whl", hash = "sha256:ffc5288f34a8bc02e1ea7047b8d041104791d2ddbf42d1e5fa07822cbffe16bd", size = 878694, upload-time = "2025-10-06T20:21:59.876Z" },
+    { url = "https://files.pythonhosted.org/packages/00/61/441588ee21e6b5cdf59d6870f86beb9789e532ee9718c251b391b70c68d6/tiktoken-0.12.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:775c2c55de2310cc1bc9a3ad8826761cbdc87770e586fd7b6da7d4589e13dab3", size = 1050802, upload-time = "2025-10-06T20:22:00.96Z" },
+    { url = "https://files.pythonhosted.org/packages/1f/05/dcf94486d5c5c8d34496abe271ac76c5b785507c8eae71b3708f1ad9b45a/tiktoken-0.12.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:a01b12f69052fbe4b080a2cfb867c4de12c704b56178edf1d1d7b273561db160", size = 993995, upload-time = "2025-10-06T20:22:02.788Z" },
+    { url = "https://files.pythonhosted.org/packages/a0/70/5163fe5359b943f8db9946b62f19be2305de8c3d78a16f629d4165e2f40e/tiktoken-0.12.0-cp313-cp313-manylinux_2_28_aarch64.whl", hash = "sha256:01d99484dc93b129cd0964f9d34eee953f2737301f18b3c7257bf368d7615baa", size = 1128948, upload-time = "2025-10-06T20:22:03.814Z" },
+    { url = "https://files.pythonhosted.org/packages/0c/da/c028aa0babf77315e1cef357d4d768800c5f8a6de04d0eac0f377cb619fa/tiktoken-0.12.0-cp313-cp313-manylinux_2_28_x86_64.whl", hash = "sha256:4a1a4fcd021f022bfc81904a911d3df0f6543b9e7627b51411da75ff2fe7a1be", size = 1151986, upload-time = "2025-10-06T20:22:05.173Z" },
+    { url = "https://files.pythonhosted.org/packages/a0/5a/886b108b766aa53e295f7216b509be95eb7d60b166049ce2c58416b25f2a/tiktoken-0.12.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:981a81e39812d57031efdc9ec59fa32b2a5a5524d20d4776574c4b4bd2e9014a", size = 1194222, upload-time = "2025-10-06T20:22:06.265Z" },
+    { url = "https://files.pythonhosted.org/packages/f4/f8/4db272048397636ac7a078d22773dd2795b1becee7bc4922fe6207288d57/tiktoken-0.12.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:9baf52f84a3f42eef3ff4e754a0db79a13a27921b457ca9832cf944c6be4f8f3", size = 1255097, upload-time = "2025-10-06T20:22:07.403Z" },
+    { url = "https://files.pythonhosted.org/packages/8e/32/45d02e2e0ea2be3a9ed22afc47d93741247e75018aac967b713b2941f8ea/tiktoken-0.12.0-cp313-cp313-win_amd64.whl", hash = "sha256:b8a0cd0c789a61f31bf44851defbd609e8dd1e2c8589c614cc1060940ef1f697", size = 879117, upload-time = "2025-10-06T20:22:08.418Z" },
+    { url = "https://files.pythonhosted.org/packages/ce/76/994fc868f88e016e6d05b0da5ac24582a14c47893f4474c3e9744283f1d5/tiktoken-0.12.0-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:d5f89ea5680066b68bcb797ae85219c72916c922ef0fcdd3480c7d2315ffff16", size = 1050309, upload-time = "2025-10-06T20:22:10.939Z" },
+    { url = "https://files.pythonhosted.org/packages/f6/b8/57ef1456504c43a849821920d582a738a461b76a047f352f18c0b26c6516/tiktoken-0.12.0-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:b4e7ed1c6a7a8a60a3230965bdedba8cc58f68926b835e519341413370e0399a", size = 993712, upload-time = "2025-10-06T20:22:12.115Z" },
+    { url = "https://files.pythonhosted.org/packages/72/90/13da56f664286ffbae9dbcfadcc625439142675845baa62715e49b87b68b/tiktoken-0.12.0-cp313-cp313t-manylinux_2_28_aarch64.whl", hash = "sha256:fc530a28591a2d74bce821d10b418b26a094bf33839e69042a6e86ddb7a7fb27", size = 1128725, upload-time = "2025-10-06T20:22:13.541Z" },
+    { url = "https://files.pythonhosted.org/packages/05/df/4f80030d44682235bdaecd7346c90f67ae87ec8f3df4a3442cb53834f7e4/tiktoken-0.12.0-cp313-cp313t-manylinux_2_28_x86_64.whl", hash = "sha256:06a9f4f49884139013b138920a4c393aa6556b2f8f536345f11819389c703ebb", size = 1151875, upload-time = "2025-10-06T20:22:14.559Z" },
+    { url = "https://files.pythonhosted.org/packages/22/1f/ae535223a8c4ef4c0c1192e3f9b82da660be9eb66b9279e95c99288e9dab/tiktoken-0.12.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:04f0e6a985d95913cabc96a741c5ffec525a2c72e9df086ff17ebe35985c800e", size = 1194451, upload-time = "2025-10-06T20:22:15.545Z" },
+    { url = "https://files.pythonhosted.org/packages/78/a7/f8ead382fce0243cb625c4f266e66c27f65ae65ee9e77f59ea1653b6d730/tiktoken-0.12.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:0ee8f9ae00c41770b5f9b0bb1235474768884ae157de3beb5439ca0fd70f3e25", size = 1253794, upload-time = "2025-10-06T20:22:16.624Z" },
+    { url = "https://files.pythonhosted.org/packages/93/e0/6cc82a562bc6365785a3ff0af27a2a092d57c47d7a81d9e2295d8c36f011/tiktoken-0.12.0-cp313-cp313t-win_amd64.whl", hash = "sha256:dc2dd125a62cb2b3d858484d6c614d136b5b848976794edfb63688d539b8b93f", size = 878777, upload-time = "2025-10-06T20:22:18.036Z" },
+    { url = "https://files.pythonhosted.org/packages/72/05/3abc1db5d2c9aadc4d2c76fa5640134e475e58d9fbb82b5c535dc0de9b01/tiktoken-0.12.0-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:a90388128df3b3abeb2bfd1895b0681412a8d7dc644142519e6f0a97c2111646", size = 1050188, upload-time = "2025-10-06T20:22:19.563Z" },
+    { url = "https://files.pythonhosted.org/packages/e3/7b/50c2f060412202d6c95f32b20755c7a6273543b125c0985d6fa9465105af/tiktoken-0.12.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:da900aa0ad52247d8794e307d6446bd3cdea8e192769b56276695d34d2c9aa88", size = 993978, upload-time = "2025-10-06T20:22:20.702Z" },
+    { url = "https://files.pythonhosted.org/packages/14/27/bf795595a2b897e271771cd31cb847d479073497344c637966bdf2853da1/tiktoken-0.12.0-cp314-cp314-manylinux_2_28_aarch64.whl", hash = "sha256:285ba9d73ea0d6171e7f9407039a290ca77efcdb026be7769dccc01d2c8d7fff", size = 1129271, upload-time = "2025-10-06T20:22:22.06Z" },
+    { url = "https://files.pythonhosted.org/packages/f5/de/9341a6d7a8f1b448573bbf3425fa57669ac58258a667eb48a25dfe916d70/tiktoken-0.12.0-cp314-cp314-manylinux_2_28_x86_64.whl", hash = "sha256:d186a5c60c6a0213f04a7a802264083dea1bbde92a2d4c7069e1a56630aef830", size = 1151216, upload-time = "2025-10-06T20:22:23.085Z" },
+    { url = "https://files.pythonhosted.org/packages/75/0d/881866647b8d1be4d67cb24e50d0c26f9f807f994aa1510cb9ba2fe5f612/tiktoken-0.12.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:604831189bd05480f2b885ecd2d1986dc7686f609de48208ebbbddeea071fc0b", size = 1194860, upload-time = "2025-10-06T20:22:24.602Z" },
+    { url = "https://files.pythonhosted.org/packages/b3/1e/b651ec3059474dab649b8d5b69f5c65cd8fcd8918568c1935bd4136c9392/tiktoken-0.12.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:8f317e8530bb3a222547b85a58583238c8f74fd7a7408305f9f63246d1a0958b", size = 1254567, upload-time = "2025-10-06T20:22:25.671Z" },
+    { url = "https://files.pythonhosted.org/packages/80/57/ce64fd16ac390fafde001268c364d559447ba09b509181b2808622420eec/tiktoken-0.12.0-cp314-cp314-win_amd64.whl", hash = "sha256:399c3dd672a6406719d84442299a490420b458c44d3ae65516302a99675888f3", size = 921067, upload-time = "2025-10-06T20:22:26.753Z" },
+    { url = "https://files.pythonhosted.org/packages/ac/a4/72eed53e8976a099539cdd5eb36f241987212c29629d0a52c305173e0a68/tiktoken-0.12.0-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:c2c714c72bc00a38ca969dae79e8266ddec999c7ceccd603cc4f0d04ccd76365", size = 1050473, upload-time = "2025-10-06T20:22:27.775Z" },
+    { url = "https://files.pythonhosted.org/packages/e6/d7/0110b8f54c008466b19672c615f2168896b83706a6611ba6e47313dbc6e9/tiktoken-0.12.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:cbb9a3ba275165a2cb0f9a83f5d7025afe6b9d0ab01a22b50f0e74fee2ad253e", size = 993855, upload-time = "2025-10-06T20:22:28.799Z" },
+    { url = "https://files.pythonhosted.org/packages/5f/77/4f268c41a3957c418b084dd576ea2fad2e95da0d8e1ab705372892c2ca22/tiktoken-0.12.0-cp314-cp314t-manylinux_2_28_aarch64.whl", hash = "sha256:dfdfaa5ffff8993a3af94d1125870b1d27aed7cb97aa7eb8c1cefdbc87dbee63", size = 1129022, upload-time = "2025-10-06T20:22:29.981Z" },
+    { url = "https://files.pythonhosted.org/packages/4e/2b/fc46c90fe5028bd094cd6ee25a7db321cb91d45dc87531e2bdbb26b4867a/tiktoken-0.12.0-cp314-cp314t-manylinux_2_28_x86_64.whl", hash = "sha256:584c3ad3d0c74f5269906eb8a659c8bfc6144a52895d9261cdaf90a0ae5f4de0", size = 1150736, upload-time = "2025-10-06T20:22:30.996Z" },
+    { url = "https://files.pythonhosted.org/packages/28/c0/3c7a39ff68022ddfd7d93f3337ad90389a342f761c4d71de99a3ccc57857/tiktoken-0.12.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:54c891b416a0e36b8e2045b12b33dd66fb34a4fe7965565f1b482da50da3e86a", size = 1194908, upload-time = "2025-10-06T20:22:32.073Z" },
+    { url = "https://files.pythonhosted.org/packages/ab/0d/c1ad6f4016a3968c048545f5d9b8ffebf577774b2ede3e2e352553b685fe/tiktoken-0.12.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:5edb8743b88d5be814b1a8a8854494719080c28faaa1ccbef02e87354fe71ef0", size = 1253706, upload-time = "2025-10-06T20:22:33.385Z" },
+    { url = "https://files.pythonhosted.org/packages/af/df/c7891ef9d2712ad774777271d39fdef63941ffba0a9d59b7ad1fd2765e57/tiktoken-0.12.0-cp314-cp314t-win_amd64.whl", hash = "sha256:f61c0aea5565ac82e2ec50a05e02a6c44734e91b51c10510b084ea1b8e633a71", size = 920667, upload-time = "2025-10-06T20:22:34.444Z" },
+]
+
+[[package]]
+name = "tokenizers"
+version = "0.22.2"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "huggingface-hub" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/73/6f/f80cfef4a312e1fb34baf7d85c72d4411afde10978d4657f8cdd811d3ccc/tokenizers-0.22.2.tar.gz", hash = "sha256:473b83b915e547aa366d1eee11806deaf419e17be16310ac0a14077f1e28f917", size = 372115, upload-time = "2026-01-05T10:45:15.988Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/92/97/5dbfabf04c7e348e655e907ed27913e03db0923abb5dfdd120d7b25630e1/tokenizers-0.22.2-cp39-abi3-macosx_10_12_x86_64.whl", hash = "sha256:544dd704ae7238755d790de45ba8da072e9af3eea688f698b137915ae959281c", size = 3100275, upload-time = "2026-01-05T10:41:02.158Z" },
+    { url = "https://files.pythonhosted.org/packages/2e/47/174dca0502ef88b28f1c9e06b73ce33500eedfac7a7692108aec220464e7/tokenizers-0.22.2-cp39-abi3-macosx_11_0_arm64.whl", hash = "sha256:1e418a55456beedca4621dbab65a318981467a2b188e982a23e117f115ce5001", size = 2981472, upload-time = "2026-01-05T10:41:00.276Z" },
+    { url = "https://files.pythonhosted.org/packages/d6/84/7990e799f1309a8b87af6b948f31edaa12a3ed22d11b352eaf4f4b2e5753/tokenizers-0.22.2-cp39-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2249487018adec45d6e3554c71d46eb39fa8ea67156c640f7513eb26f318cec7", size = 3290736, upload-time = "2026-01-05T10:40:32.165Z" },
+    { url = "https://files.pythonhosted.org/packages/78/59/09d0d9ba94dcd5f4f1368d4858d24546b4bdc0231c2354aa31d6199f0399/tokenizers-0.22.2-cp39-abi3-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:25b85325d0815e86e0bac263506dd114578953b7b53d7de09a6485e4a160a7dd", size = 3168835, upload-time = "2026-01-05T10:40:38.847Z" },
+    { url = "https://files.pythonhosted.org/packages/47/50/b3ebb4243e7160bda8d34b731e54dd8ab8b133e50775872e7a434e524c28/tokenizers-0.22.2-cp39-abi3-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:bfb88f22a209ff7b40a576d5324bf8286b519d7358663db21d6246fb17eea2d5", size = 3521673, upload-time = "2026-01-05T10:40:56.614Z" },
+    { url = "https://files.pythonhosted.org/packages/e0/fa/89f4cb9e08df770b57adb96f8cbb7e22695a4cb6c2bd5f0c4f0ebcf33b66/tokenizers-0.22.2-cp39-abi3-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1c774b1276f71e1ef716e5486f21e76333464f47bece56bbd554485982a9e03e", size = 3724818, upload-time = "2026-01-05T10:40:44.507Z" },
+    { url = "https://files.pythonhosted.org/packages/64/04/ca2363f0bfbe3b3d36e95bf67e56a4c88c8e3362b658e616d1ac185d47f2/tokenizers-0.22.2-cp39-abi3-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:df6c4265b289083bf710dff49bc51ef252f9d5be33a45ee2bed151114a56207b", size = 3379195, upload-time = "2026-01-05T10:40:51.139Z" },
+    { url = "https://files.pythonhosted.org/packages/2e/76/932be4b50ef6ccedf9d3c6639b056a967a86258c6d9200643f01269211ca/tokenizers-0.22.2-cp39-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:369cc9fc8cc10cb24143873a0d95438bb8ee257bb80c71989e3ee290e8d72c67", size = 3274982, upload-time = "2026-01-05T10:40:58.331Z" },
+    { url = "https://files.pythonhosted.org/packages/1d/28/5f9f5a4cc211b69e89420980e483831bcc29dade307955cc9dc858a40f01/tokenizers-0.22.2-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:29c30b83d8dcd061078b05ae0cb94d3c710555fbb44861139f9f83dcca3dc3e4", size = 9478245, upload-time = "2026-01-05T10:41:04.053Z" },
+    { url = "https://files.pythonhosted.org/packages/6c/fb/66e2da4704d6aadebf8cb39f1d6d1957df667ab24cff2326b77cda0dcb85/tokenizers-0.22.2-cp39-abi3-musllinux_1_2_armv7l.whl", hash = "sha256:37ae80a28c1d3265bb1f22464c856bd23c02a05bb211e56d0c5301a435be6c1a", size = 9560069, upload-time = "2026-01-05T10:45:10.673Z" },
+    { url = "https://files.pythonhosted.org/packages/16/04/fed398b05caa87ce9b1a1bb5166645e38196081b225059a6edaff6440fac/tokenizers-0.22.2-cp39-abi3-musllinux_1_2_i686.whl", hash = "sha256:791135ee325f2336f498590eb2f11dc5c295232f288e75c99a36c5dbce63088a", size = 9899263, upload-time = "2026-01-05T10:45:12.559Z" },
+    { url = "https://files.pythonhosted.org/packages/05/a1/d62dfe7376beaaf1394917e0f8e93ee5f67fea8fcf4107501db35996586b/tokenizers-0.22.2-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:38337540fbbddff8e999d59970f3c6f35a82de10053206a7562f1ea02d046fa5", size = 10033429, upload-time = "2026-01-05T10:45:14.333Z" },
+    { url = "https://files.pythonhosted.org/packages/fd/18/a545c4ea42af3df6effd7d13d250ba77a0a86fb20393143bbb9a92e434d4/tokenizers-0.22.2-cp39-abi3-win32.whl", hash = "sha256:a6bf3f88c554a2b653af81f3204491c818ae2ac6fbc09e76ef4773351292bc92", size = 2502363, upload-time = "2026-01-05T10:45:20.593Z" },
+    { url = "https://files.pythonhosted.org/packages/65/71/0670843133a43d43070abeb1949abfdef12a86d490bea9cd9e18e37c5ff7/tokenizers-0.22.2-cp39-abi3-win_amd64.whl", hash = "sha256:c9ea31edff2968b44a88f97d784c2f16dc0729b8b143ed004699ebca91f05c48", size = 2747786, upload-time = "2026-01-05T10:45:18.411Z" },
+    { url = "https://files.pythonhosted.org/packages/72/f4/0de46cfa12cdcbcd464cc59fde36912af405696f687e53a091fb432f694c/tokenizers-0.22.2-cp39-abi3-win_arm64.whl", hash = "sha256:9ce725d22864a1e965217204946f830c37876eee3b2ba6fc6255e8e903d5fcbc", size = 2612133, upload-time = "2026-01-05T10:45:17.232Z" },
+]
+
+[[package]]
+name = "tqdm"
+version = "4.67.3"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "colorama", marker = "sys_platform == 'win32'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/09/a9/6ba95a270c6f1fbcd8dac228323f2777d886cb206987444e4bce66338dd4/tqdm-4.67.3.tar.gz", hash = "sha256:7d825f03f89244ef73f1d4ce193cb1774a8179fd96f31d7e1dcde62092b960bb", size = 169598, upload-time = "2026-02-03T17:35:53.048Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/16/e1/3079a9ff9b8e11b846c6ac5c8b5bfb7ff225eee721825310c91b3b50304f/tqdm-4.67.3-py3-none-any.whl", hash = "sha256:ee1e4c0e59148062281c49d80b25b67771a127c85fc9676d3be5f243206826bf", size = 78374, upload-time = "2026-02-03T17:35:50.982Z" },
+]
+
+[[package]]
+name = "transformers"
+version = "5.6.2"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "huggingface-hub" },
+    { name = "numpy" },
+    { name = "packaging" },
+    { name = "pyyaml" },
+    { name = "regex" },
+    { name = "safetensors" },
+    { name = "tokenizers" },
+    { name = "tqdm" },
+    { name = "typer" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/a4/e9/c6c80a07690142a7d05444271f47b9f3c8aac7dea01d52e1137ee480ad78/transformers-5.6.2.tar.gz", hash = "sha256:e657134c3e5a6bc00a3c35f4e2674bb51adfcd89898495b788a18552bac2b91a", size = 8311867, upload-time = "2026-04-23T18:33:29.332Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/5d/95/0b0218149b0d6f14df35f5b8f676fa83df4f19ed253c3cc447107ef86eca/transformers-5.6.2-py3-none-any.whl", hash = "sha256:f8d3a1bb96778fed9b8aabfd0dd6e19843e4b0f2bb6b59f32b8a92051b0f348f", size = 10364898, upload-time = "2026-04-23T18:33:26.081Z" },
+]
+
+[[package]]
+name = "typer"
+version = "0.24.2"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "annotated-doc" },
+    { name = "click" },
+    { name = "rich" },
+    { name = "shellingham" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/83/b8/9ebb531b6c2d377af08ac6746a5df3425b21853a5d2260876919b58a2a4a/typer-0.24.2.tar.gz", hash = "sha256:ec070dcfca1408e85ee203c6365001e818c3b7fffe686fd07ff2d68095ca0480", size = 119849, upload-time = "2026-04-22T17:45:34.413Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/39/d1/9484b497e0a0410b901c12b8251c3e746e1e863f7d28419ffe06f7892fda/typer-0.24.2-py3-none-any.whl", hash = "sha256:b618bc3d721f9a8d30f3e05565be26416d06e9bcc29d49bc491dc26aba674fa8", size = 55977, upload-time = "2026-04-22T17:45:33.055Z" },
+]
+
+[[package]]
+name = "typing-extensions"
+version = "4.15.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/72/94/1a15dd82efb362ac84269196e94cf00f187f7ed21c242792a923cdb1c61f/typing_extensions-4.15.0.tar.gz", hash = "sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466", size = 109391, upload-time = "2025-08-25T13:49:26.313Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/18/67/36e9267722cc04a6b9f15c7f3441c2363321a3ea07da7ae0c0707beb2a9c/typing_extensions-4.15.0-py3-none-any.whl", hash = "sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548", size = 44614, upload-time = "2025-08-25T13:49:24.86Z" },
+]
+
+[[package]]
+name = "typing-inspection"
+version = "0.4.2"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "typing-extensions" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/55/e3/70399cb7dd41c10ac53367ae42139cf4b1ca5f36bb3dc6c9d33acdb43655/typing_inspection-0.4.2.tar.gz", hash = "sha256:ba561c48a67c5958007083d386c3295464928b01faa735ab8547c5692e87f464", size = 75949, upload-time = "2025-10-01T02:14:41.687Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/dc/9b/47798a6c91d8bdb567fe2698fe81e0c6b7cb7ef4d13da4114b41d239f65d/typing_inspection-0.4.2-py3-none-any.whl", hash = "sha256:4ed1cacbdc298c220f1bd249ed5287caa16f34d44ef4e9c3d0cbad5b521545e7", size = 14611, upload-time = "2025-10-01T02:14:40.154Z" },
+]
+
+[[package]]
+name = "tzdata"
+version = "2026.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/19/f5/cd531b2d15a671a40c0f66cf06bc3570a12cd56eef98960068ebbad1bf5a/tzdata-2026.1.tar.gz", hash = "sha256:67658a1903c75917309e753fdc349ac0efd8c27db7a0cb406a25be4840f87f98", size = 197639, upload-time = "2026-04-03T11:25:22.002Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/b0/70/d460bd685a170790ec89317e9bd33047988e4bce507b831f5db771e142de/tzdata-2026.1-py2.py3-none-any.whl", hash = "sha256:4b1d2be7ac37ceafd7327b961aa3a54e467efbdb563a23655fbfe0d39cfc42a9", size = 348952, upload-time = "2026-04-03T11:25:20.313Z" },
+]
+
+[[package]]
+name = "unstructured"
+version = "0.21.5"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "beautifulsoup4" },
+    { name = "charset-normalizer" },
+    { name = "emoji" },
+    { name = "filelock" },
+    { name = "filetype" },
+    { name = "html5lib" },
+    { name = "installer" },
+    { name = "langdetect" },
+    { name = "lxml" },
+    { name = "numba" },
+    { name = "numpy" },
+    { name = "psutil" },
+    { name = "python-iso639" },
+    { name = "python-magic" },
+    { name = "python-oxmsg" },
+    { name = "rapidfuzz" },
+    { name = "regex" },
+    { name = "requests" },
+    { name = "spacy" },
+    { name = "tqdm" },
+    { name = "typing-extensions" },
+    { name = "unstructured-client" },
+    { name = "wrapt" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/b3/e6/fbef61517d130af1def3b81681e253a5679f19de2f04e439afbbf1f021e0/unstructured-0.21.5.tar.gz", hash = "sha256:3e220d0c2b9c8ec12c99767162b95ab0acfca75e979b82c66c15ca15caa60139", size = 1501811, upload-time = "2026-02-24T15:29:27.84Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/b8/b6/7e6dd60bde81d5a4d4ddf426f566a5d1b4c30490053caed69e47f55c676f/unstructured-0.21.5-py3-none-any.whl", hash = "sha256:d88a277c368462b69a8843b9cb22476f3cc4d0a58455536520359387224b3366", size = 1554925, upload-time = "2026-02-24T15:29:26.009Z" },
+]
+
+[package.optional-dependencies]
+docx = [
+    { name = "python-docx" },
+]
+epub = [
+    { name = "pypandoc-binary", marker = "python_full_version < '3.13' or sys_platform != 'win32'" },
+]
+md = [
+    { name = "markdown" },
+]
+ppt = [
+    { name = "python-pptx" },
+]
+pptx = [
+    { name = "python-pptx" },
+]
+
+[[package]]
+name = "unstructured-client"
+version = "0.43.2"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "aiofiles" },
+    { name = "httpcore" },
+    { name = "httpx" },
+    { name = "pydantic" },
+    { name = "pypdf" },
+    { name = "pypdfium2" },
+    { name = "requests-toolbelt" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/ce/a8/82f91b5e891996737473f911ce0103cab85275043ee6314cdc7249d17d74/unstructured_client-0.43.2.tar.gz", hash = "sha256:dce158622e789833d29fe321c3cdf6048588e4f51b88ac4fd94a0ff06edbfc9a", size = 105852, upload-time = "2026-04-04T14:30:57.806Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/7d/de/680fd60d0b2cf96a72c4e3086d6ee697f4d40cbf34f49e22a379c4f0bd31/unstructured_client-0.43.2-py3-none-any.whl", hash = "sha256:65bda439c250fa5041d0d8374af407c1fc051cd78c0ebd62600d2562c16bd00f", size = 224522, upload-time = "2026-04-04T14:30:56.244Z" },
+]
+
+[[package]]
+name = "urllib3"
+version = "2.7.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/53/0c/06f8b233b8fd13b9e5ee11424ef85419ba0d8ba0b3138bf360be2ff56953/urllib3-2.7.0.tar.gz", hash = "sha256:231e0ec3b63ceb14667c67be60f2f2c40a518cb38b03af60abc813da26505f4c", size = 433602, upload-time = "2026-05-07T16:13:18.596Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/7f/3e/5db95bcf282c52709639744ca2a8b149baccf648e39c8cc87553df9eae0c/urllib3-2.7.0-py3-none-any.whl", hash = "sha256:9fb4c81ebbb1ce9531cce37674bbc6f1360472bc18ca9a553ede278ef7276897", size = 131087, upload-time = "2026-05-07T16:13:17.151Z" },
+]
+
+[[package]]
+name = "uvicorn"
+version = "0.46.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "click" },
+    { name = "h11" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/1f/93/041fca8274050e40e6791f267d82e0e2e27dd165627bd640d3e0e378d877/uvicorn-0.46.0.tar.gz", hash = "sha256:fb9da0926999cc6cb22dc7cd71a94a632f078e6ae47ff683c5c420750fb7413d", size = 88758, upload-time = "2026-04-23T07:16:00.151Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/31/a3/5b1562db76a5a488274b2332a97199b32d0442aca0ed193697fd47786316/uvicorn-0.46.0-py3-none-any.whl", hash = "sha256:bbebbcbed972d162afca128605223022bedd345b7bc7855ce66deb31487a9048", size = 70926, upload-time = "2026-04-23T07:15:58.355Z" },
+]
+
+[package.optional-dependencies]
+standard = [
+    { name = "colorama", marker = "sys_platform == 'win32'" },
+    { name = "httptools" },
+    { name = "python-dotenv" },
+    { name = "pyyaml" },
+    { name = "uvloop", marker = "platform_python_implementation != 'PyPy' and sys_platform != 'cygwin' and sys_platform != 'win32'" },
+    { name = "watchfiles" },
+    { name = "websockets" },
+]
+
+[[package]]
+name = "uvloop"
+version = "0.22.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/06/f0/18d39dbd1971d6d62c4629cc7fa67f74821b0dc1f5a77af43719de7936a7/uvloop-0.22.1.tar.gz", hash = "sha256:6c84bae345b9147082b17371e3dd5d42775bddce91f885499017f4607fdaf39f", size = 2443250, upload-time = "2025-10-16T22:17:19.342Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/3d/ff/7f72e8170be527b4977b033239a83a68d5c881cc4775fca255c677f7ac5d/uvloop-0.22.1-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:fe94b4564e865d968414598eea1a6de60adba0c040ba4ed05ac1300de402cd42", size = 1359936, upload-time = "2025-10-16T22:16:29.436Z" },
+    { url = "https://files.pythonhosted.org/packages/c3/c6/e5d433f88fd54d81ef4be58b2b7b0cea13c442454a1db703a1eea0db1a59/uvloop-0.22.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:51eb9bd88391483410daad430813d982010f9c9c89512321f5b60e2cddbdddd6", size = 752769, upload-time = "2025-10-16T22:16:30.493Z" },
+    { url = "https://files.pythonhosted.org/packages/24/68/a6ac446820273e71aa762fa21cdcc09861edd3536ff47c5cd3b7afb10eeb/uvloop-0.22.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:700e674a166ca5778255e0e1dc4e9d79ab2acc57b9171b79e65feba7184b3370", size = 4317413, upload-time = "2025-10-16T22:16:31.644Z" },
+    { url = "https://files.pythonhosted.org/packages/5f/6f/e62b4dfc7ad6518e7eff2516f680d02a0f6eb62c0c212e152ca708a0085e/uvloop-0.22.1-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7b5b1ac819a3f946d3b2ee07f09149578ae76066d70b44df3fa990add49a82e4", size = 4426307, upload-time = "2025-10-16T22:16:32.917Z" },
+    { url = "https://files.pythonhosted.org/packages/90/60/97362554ac21e20e81bcef1150cb2a7e4ffdaf8ea1e5b2e8bf7a053caa18/uvloop-0.22.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:e047cc068570bac9866237739607d1313b9253c3051ad84738cbb095be0537b2", size = 4131970, upload-time = "2025-10-16T22:16:34.015Z" },
+    { url = "https://files.pythonhosted.org/packages/99/39/6b3f7d234ba3964c428a6e40006340f53ba37993f46ed6e111c6e9141d18/uvloop-0.22.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:512fec6815e2dd45161054592441ef76c830eddaad55c8aa30952e6fe1ed07c0", size = 4296343, upload-time = "2025-10-16T22:16:35.149Z" },
+    { url = "https://files.pythonhosted.org/packages/89/8c/182a2a593195bfd39842ea68ebc084e20c850806117213f5a299dfc513d9/uvloop-0.22.1-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:561577354eb94200d75aca23fbde86ee11be36b00e52a4eaf8f50fb0c86b7705", size = 1358611, upload-time = "2025-10-16T22:16:36.833Z" },
+    { url = "https://files.pythonhosted.org/packages/d2/14/e301ee96a6dc95224b6f1162cd3312f6d1217be3907b79173b06785f2fe7/uvloop-0.22.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:1cdf5192ab3e674ca26da2eada35b288d2fa49fdd0f357a19f0e7c4e7d5077c8", size = 751811, upload-time = "2025-10-16T22:16:38.275Z" },
+    { url = "https://files.pythonhosted.org/packages/b7/02/654426ce265ac19e2980bfd9ea6590ca96a56f10c76e63801a2df01c0486/uvloop-0.22.1-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6e2ea3d6190a2968f4a14a23019d3b16870dd2190cd69c8180f7c632d21de68d", size = 4288562, upload-time = "2025-10-16T22:16:39.375Z" },
+    { url = "https://files.pythonhosted.org/packages/15/c0/0be24758891ef825f2065cd5db8741aaddabe3e248ee6acc5e8a80f04005/uvloop-0.22.1-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0530a5fbad9c9e4ee3f2b33b148c6a64d47bbad8000ea63704fa8260f4cf728e", size = 4366890, upload-time = "2025-10-16T22:16:40.547Z" },
+    { url = "https://files.pythonhosted.org/packages/d2/53/8369e5219a5855869bcee5f4d317f6da0e2c669aecf0ef7d371e3d084449/uvloop-0.22.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:bc5ef13bbc10b5335792360623cc378d52d7e62c2de64660616478c32cd0598e", size = 4119472, upload-time = "2025-10-16T22:16:41.694Z" },
+    { url = "https://files.pythonhosted.org/packages/f8/ba/d69adbe699b768f6b29a5eec7b47dd610bd17a69de51b251126a801369ea/uvloop-0.22.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:1f38ec5e3f18c8a10ded09742f7fb8de0108796eb673f30ce7762ce1b8550cad", size = 4239051, upload-time = "2025-10-16T22:16:43.224Z" },
+    { url = "https://files.pythonhosted.org/packages/90/cd/b62bdeaa429758aee8de8b00ac0dd26593a9de93d302bff3d21439e9791d/uvloop-0.22.1-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:3879b88423ec7e97cd4eba2a443aa26ed4e59b45e6b76aabf13fe2f27023a142", size = 1362067, upload-time = "2025-10-16T22:16:44.503Z" },
+    { url = "https://files.pythonhosted.org/packages/0d/f8/a132124dfda0777e489ca86732e85e69afcd1ff7686647000050ba670689/uvloop-0.22.1-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:4baa86acedf1d62115c1dc6ad1e17134476688f08c6efd8a2ab076e815665c74", size = 752423, upload-time = "2025-10-16T22:16:45.968Z" },
+    { url = "https://files.pythonhosted.org/packages/a3/94/94af78c156f88da4b3a733773ad5ba0b164393e357cc4bd0ab2e2677a7d6/uvloop-0.22.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:297c27d8003520596236bdb2335e6b3f649480bd09e00d1e3a99144b691d2a35", size = 4272437, upload-time = "2025-10-16T22:16:47.451Z" },
+    { url = "https://files.pythonhosted.org/packages/b5/35/60249e9fd07b32c665192cec7af29e06c7cd96fa1d08b84f012a56a0b38e/uvloop-0.22.1-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c1955d5a1dd43198244d47664a5858082a3239766a839b2102a269aaff7a4e25", size = 4292101, upload-time = "2025-10-16T22:16:49.318Z" },
+    { url = "https://files.pythonhosted.org/packages/02/62/67d382dfcb25d0a98ce73c11ed1a6fba5037a1a1d533dcbb7cab033a2636/uvloop-0.22.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:b31dc2fccbd42adc73bc4e7cdbae4fc5086cf378979e53ca5d0301838c5682c6", size = 4114158, upload-time = "2025-10-16T22:16:50.517Z" },
+    { url = "https://files.pythonhosted.org/packages/f0/7a/f1171b4a882a5d13c8b7576f348acfe6074d72eaf52cccef752f748d4a9f/uvloop-0.22.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:93f617675b2d03af4e72a5333ef89450dfaa5321303ede6e67ba9c9d26878079", size = 4177360, upload-time = "2025-10-16T22:16:52.646Z" },
+    { url = "https://files.pythonhosted.org/packages/79/7b/b01414f31546caf0919da80ad57cbfe24c56b151d12af68cee1b04922ca8/uvloop-0.22.1-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:37554f70528f60cad66945b885eb01f1bb514f132d92b6eeed1c90fd54ed6289", size = 1454790, upload-time = "2025-10-16T22:16:54.355Z" },
+    { url = "https://files.pythonhosted.org/packages/d4/31/0bb232318dd838cad3fa8fb0c68c8b40e1145b32025581975e18b11fab40/uvloop-0.22.1-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:b76324e2dc033a0b2f435f33eb88ff9913c156ef78e153fb210e03c13da746b3", size = 796783, upload-time = "2025-10-16T22:16:55.906Z" },
+    { url = "https://files.pythonhosted.org/packages/42/38/c9b09f3271a7a723a5de69f8e237ab8e7803183131bc57c890db0b6bb872/uvloop-0.22.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:badb4d8e58ee08dad957002027830d5c3b06aea446a6a3744483c2b3b745345c", size = 4647548, upload-time = "2025-10-16T22:16:57.008Z" },
+    { url = "https://files.pythonhosted.org/packages/c1/37/945b4ca0ac27e3dc4952642d4c900edd030b3da6c9634875af6e13ae80e5/uvloop-0.22.1-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:b91328c72635f6f9e0282e4a57da7470c7350ab1c9f48546c0f2866205349d21", size = 4467065, upload-time = "2025-10-16T22:16:58.206Z" },
+    { url = "https://files.pythonhosted.org/packages/97/cc/48d232f33d60e2e2e0b42f4e73455b146b76ebe216487e862700457fbf3c/uvloop-0.22.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:daf620c2995d193449393d6c62131b3fbd40a63bf7b307a1527856ace637fe88", size = 4328384, upload-time = "2025-10-16T22:16:59.36Z" },
+    { url = "https://files.pythonhosted.org/packages/e4/16/c1fd27e9549f3c4baf1dc9c20c456cd2f822dbf8de9f463824b0c0357e06/uvloop-0.22.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:6cde23eeda1a25c75b2e07d39970f3374105d5eafbaab2a4482be82f272d5a5e", size = 4296730, upload-time = "2025-10-16T22:17:00.744Z" },
+]
+
+[[package]]
+name = "wasabi"
+version = "1.1.3"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "colorama", marker = "sys_platform == 'win32'" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/ac/f9/054e6e2f1071e963b5e746b48d1e3727470b2a490834d18ad92364929db3/wasabi-1.1.3.tar.gz", hash = "sha256:4bb3008f003809db0c3e28b4daf20906ea871a2bb43f9914197d540f4f2e0878", size = 30391, upload-time = "2024-05-31T16:56:18.99Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/06/7c/34330a89da55610daa5f245ddce5aab81244321101614751e7537f125133/wasabi-1.1.3-py3-none-any.whl", hash = "sha256:f76e16e8f7e79f8c4c8be49b4024ac725713ab10cd7f19350ad18a8e3f71728c", size = 27880, upload-time = "2024-05-31T16:56:16.699Z" },
+]
+
+[[package]]
+name = "watchdog"
+version = "6.0.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/db/7d/7f3d619e951c88ed75c6037b246ddcf2d322812ee8ea189be89511721d54/watchdog-6.0.0.tar.gz", hash = "sha256:9ddf7c82fda3ae8e24decda1338ede66e1c99883db93711d8fb941eaa2d8c282", size = 131220, upload-time = "2024-11-01T14:07:13.037Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/39/ea/3930d07dafc9e286ed356a679aa02d777c06e9bfd1164fa7c19c288a5483/watchdog-6.0.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:bdd4e6f14b8b18c334febb9c4425a878a2ac20efd1e0b231978e7b150f92a948", size = 96471, upload-time = "2024-11-01T14:06:37.745Z" },
+    { url = "https://files.pythonhosted.org/packages/12/87/48361531f70b1f87928b045df868a9fd4e253d9ae087fa4cf3f7113be363/watchdog-6.0.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:c7c15dda13c4eb00d6fb6fc508b3c0ed88b9d5d374056b239c4ad1611125c860", size = 88449, upload-time = "2024-11-01T14:06:39.748Z" },
+    { url = "https://files.pythonhosted.org/packages/5b/7e/8f322f5e600812e6f9a31b75d242631068ca8f4ef0582dd3ae6e72daecc8/watchdog-6.0.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:6f10cb2d5902447c7d0da897e2c6768bca89174d0c6e1e30abec5421af97a5b0", size = 89054, upload-time = "2024-11-01T14:06:41.009Z" },
+    { url = "https://files.pythonhosted.org/packages/68/98/b0345cabdce2041a01293ba483333582891a3bd5769b08eceb0d406056ef/watchdog-6.0.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:490ab2ef84f11129844c23fb14ecf30ef3d8a6abafd3754a6f75ca1e6654136c", size = 96480, upload-time = "2024-11-01T14:06:42.952Z" },
+    { url = "https://files.pythonhosted.org/packages/85/83/cdf13902c626b28eedef7ec4f10745c52aad8a8fe7eb04ed7b1f111ca20e/watchdog-6.0.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:76aae96b00ae814b181bb25b1b98076d5fc84e8a53cd8885a318b42b6d3a5134", size = 88451, upload-time = "2024-11-01T14:06:45.084Z" },
+    { url = "https://files.pythonhosted.org/packages/fe/c4/225c87bae08c8b9ec99030cd48ae9c4eca050a59bf5c2255853e18c87b50/watchdog-6.0.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:a175f755fc2279e0b7312c0035d52e27211a5bc39719dd529625b1930917345b", size = 89057, upload-time = "2024-11-01T14:06:47.324Z" },
+    { url = "https://files.pythonhosted.org/packages/a9/c7/ca4bf3e518cb57a686b2feb4f55a1892fd9a3dd13f470fca14e00f80ea36/watchdog-6.0.0-py3-none-manylinux2014_aarch64.whl", hash = "sha256:7607498efa04a3542ae3e05e64da8202e58159aa1fa4acddf7678d34a35d4f13", size = 79079, upload-time = "2024-11-01T14:06:59.472Z" },
+    { url = "https://files.pythonhosted.org/packages/5c/51/d46dc9332f9a647593c947b4b88e2381c8dfc0942d15b8edc0310fa4abb1/watchdog-6.0.0-py3-none-manylinux2014_armv7l.whl", hash = "sha256:9041567ee8953024c83343288ccc458fd0a2d811d6a0fd68c4c22609e3490379", size = 79078, upload-time = "2024-11-01T14:07:01.431Z" },
+    { url = "https://files.pythonhosted.org/packages/d4/57/04edbf5e169cd318d5f07b4766fee38e825d64b6913ca157ca32d1a42267/watchdog-6.0.0-py3-none-manylinux2014_i686.whl", hash = "sha256:82dc3e3143c7e38ec49d61af98d6558288c415eac98486a5c581726e0737c00e", size = 79076, upload-time = "2024-11-01T14:07:02.568Z" },
+    { url = "https://files.pythonhosted.org/packages/ab/cc/da8422b300e13cb187d2203f20b9253e91058aaf7db65b74142013478e66/watchdog-6.0.0-py3-none-manylinux2014_ppc64.whl", hash = "sha256:212ac9b8bf1161dc91bd09c048048a95ca3a4c4f5e5d4a7d1b1a7d5752a7f96f", size = 79077, upload-time = "2024-11-01T14:07:03.893Z" },
+    { url = "https://files.pythonhosted.org/packages/2c/3b/b8964e04ae1a025c44ba8e4291f86e97fac443bca31de8bd98d3263d2fcf/watchdog-6.0.0-py3-none-manylinux2014_ppc64le.whl", hash = "sha256:e3df4cbb9a450c6d49318f6d14f4bbc80d763fa587ba46ec86f99f9e6876bb26", size = 79078, upload-time = "2024-11-01T14:07:05.189Z" },
+    { url = "https://files.pythonhosted.org/packages/62/ae/a696eb424bedff7407801c257d4b1afda455fe40821a2be430e173660e81/watchdog-6.0.0-py3-none-manylinux2014_s390x.whl", hash = "sha256:2cce7cfc2008eb51feb6aab51251fd79b85d9894e98ba847408f662b3395ca3c", size = 79077, upload-time = "2024-11-01T14:07:06.376Z" },
+    { url = "https://files.pythonhosted.org/packages/b5/e8/dbf020b4d98251a9860752a094d09a65e1b436ad181faf929983f697048f/watchdog-6.0.0-py3-none-manylinux2014_x86_64.whl", hash = "sha256:20ffe5b202af80ab4266dcd3e91aae72bf2da48c0d33bdb15c66658e685e94e2", size = 79078, upload-time = "2024-11-01T14:07:07.547Z" },
+    { url = "https://files.pythonhosted.org/packages/07/f6/d0e5b343768e8bcb4cda79f0f2f55051bf26177ecd5651f84c07567461cf/watchdog-6.0.0-py3-none-win32.whl", hash = "sha256:07df1fdd701c5d4c8e55ef6cf55b8f0120fe1aef7ef39a1c6fc6bc2e606d517a", size = 79065, upload-time = "2024-11-01T14:07:09.525Z" },
+    { url = "https://files.pythonhosted.org/packages/db/d9/c495884c6e548fce18a8f40568ff120bc3a4b7b99813081c8ac0c936fa64/watchdog-6.0.0-py3-none-win_amd64.whl", hash = "sha256:cbafb470cf848d93b5d013e2ecb245d4aa1c8fd0504e863ccefa32445359d680", size = 79070, upload-time = "2024-11-01T14:07:10.686Z" },
+    { url = "https://files.pythonhosted.org/packages/33/e8/e40370e6d74ddba47f002a32919d91310d6074130fe4e17dabcafc15cbf1/watchdog-6.0.0-py3-none-win_ia64.whl", hash = "sha256:a1914259fa9e1454315171103c6a30961236f508b9b623eae470268bbcc6a22f", size = 79067, upload-time = "2024-11-01T14:07:11.845Z" },
+]
+
+[[package]]
+name = "watchfiles"
+version = "1.1.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "anyio" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/c2/c9/8869df9b2a2d6c59d79220a4db37679e74f807c559ffe5265e08b227a210/watchfiles-1.1.1.tar.gz", hash = "sha256:a173cb5c16c4f40ab19cecf48a534c409f7ea983ab8fed0741304a1c0a31b3f2", size = 94440, upload-time = "2025-10-14T15:06:21.08Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/74/d5/f039e7e3c639d9b1d09b07ea412a6806d38123f0508e5f9b48a87b0a76cc/watchfiles-1.1.1-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:8c89f9f2f740a6b7dcc753140dd5e1ab9215966f7a3530d0c0705c83b401bd7d", size = 404745, upload-time = "2025-10-14T15:04:46.731Z" },
+    { url = "https://files.pythonhosted.org/packages/a5/96/a881a13aa1349827490dab2d363c8039527060cfcc2c92cc6d13d1b1049e/watchfiles-1.1.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:bd404be08018c37350f0d6e34676bd1e2889990117a2b90070b3007f172d0610", size = 391769, upload-time = "2025-10-14T15:04:48.003Z" },
+    { url = "https://files.pythonhosted.org/packages/4b/5b/d3b460364aeb8da471c1989238ea0e56bec24b6042a68046adf3d9ddb01c/watchfiles-1.1.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8526e8f916bb5b9a0a777c8317c23ce65de259422bba5b31325a6fa6029d33af", size = 449374, upload-time = "2025-10-14T15:04:49.179Z" },
+    { url = "https://files.pythonhosted.org/packages/b9/44/5769cb62d4ed055cb17417c0a109a92f007114a4e07f30812a73a4efdb11/watchfiles-1.1.1-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:2edc3553362b1c38d9f06242416a5d8e9fe235c204a4072e988ce2e5bb1f69f6", size = 459485, upload-time = "2025-10-14T15:04:50.155Z" },
+    { url = "https://files.pythonhosted.org/packages/19/0c/286b6301ded2eccd4ffd0041a1b726afda999926cf720aab63adb68a1e36/watchfiles-1.1.1-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:30f7da3fb3f2844259cba4720c3fc7138eb0f7b659c38f3bfa65084c7fc7abce", size = 488813, upload-time = "2025-10-14T15:04:51.059Z" },
+    { url = "https://files.pythonhosted.org/packages/c7/2b/8530ed41112dd4a22f4dcfdb5ccf6a1baad1ff6eed8dc5a5f09e7e8c41c7/watchfiles-1.1.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f8979280bdafff686ba5e4d8f97840f929a87ed9cdf133cbbd42f7766774d2aa", size = 594816, upload-time = "2025-10-14T15:04:52.031Z" },
+    { url = "https://files.pythonhosted.org/packages/ce/d2/f5f9fb49489f184f18470d4f99f4e862a4b3e9ac2865688eb2099e3d837a/watchfiles-1.1.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dcc5c24523771db3a294c77d94771abcfcb82a0e0ee8efd910c37c59ec1b31bb", size = 475186, upload-time = "2025-10-14T15:04:53.064Z" },
+    { url = "https://files.pythonhosted.org/packages/cf/68/5707da262a119fb06fbe214d82dd1fe4a6f4af32d2d14de368d0349eb52a/watchfiles-1.1.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1db5d7ae38ff20153d542460752ff397fcf5c96090c1230803713cf3147a6803", size = 456812, upload-time = "2025-10-14T15:04:55.174Z" },
+    { url = "https://files.pythonhosted.org/packages/66/ab/3cbb8756323e8f9b6f9acb9ef4ec26d42b2109bce830cc1f3468df20511d/watchfiles-1.1.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:28475ddbde92df1874b6c5c8aaeb24ad5be47a11f87cde5a28ef3835932e3e94", size = 630196, upload-time = "2025-10-14T15:04:56.22Z" },
+    { url = "https://files.pythonhosted.org/packages/78/46/7152ec29b8335f80167928944a94955015a345440f524d2dfe63fc2f437b/watchfiles-1.1.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:36193ed342f5b9842edd3532729a2ad55c4160ffcfa3700e0d54be496b70dd43", size = 622657, upload-time = "2025-10-14T15:04:57.521Z" },
+    { url = "https://files.pythonhosted.org/packages/0a/bf/95895e78dd75efe9a7f31733607f384b42eb5feb54bd2eb6ed57cc2e94f4/watchfiles-1.1.1-cp312-cp312-win32.whl", hash = "sha256:859e43a1951717cc8de7f4c77674a6d389b106361585951d9e69572823f311d9", size = 272042, upload-time = "2025-10-14T15:04:59.046Z" },
+    { url = "https://files.pythonhosted.org/packages/87/0a/90eb755f568de2688cb220171c4191df932232c20946966c27a59c400850/watchfiles-1.1.1-cp312-cp312-win_amd64.whl", hash = "sha256:91d4c9a823a8c987cce8fa2690923b069966dabb196dd8d137ea2cede885fde9", size = 288410, upload-time = "2025-10-14T15:05:00.081Z" },
+    { url = "https://files.pythonhosted.org/packages/36/76/f322701530586922fbd6723c4f91ace21364924822a8772c549483abed13/watchfiles-1.1.1-cp312-cp312-win_arm64.whl", hash = "sha256:a625815d4a2bdca61953dbba5a39d60164451ef34c88d751f6c368c3ea73d404", size = 278209, upload-time = "2025-10-14T15:05:01.168Z" },
+    { url = "https://files.pythonhosted.org/packages/bb/f4/f750b29225fe77139f7ae5de89d4949f5a99f934c65a1f1c0b248f26f747/watchfiles-1.1.1-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:130e4876309e8686a5e37dba7d5e9bc77e6ed908266996ca26572437a5271e18", size = 404321, upload-time = "2025-10-14T15:05:02.063Z" },
+    { url = "https://files.pythonhosted.org/packages/2b/f9/f07a295cde762644aa4c4bb0f88921d2d141af45e735b965fb2e87858328/watchfiles-1.1.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:5f3bde70f157f84ece3765b42b4a52c6ac1a50334903c6eaf765362f6ccca88a", size = 391783, upload-time = "2025-10-14T15:05:03.052Z" },
+    { url = "https://files.pythonhosted.org/packages/bc/11/fc2502457e0bea39a5c958d86d2cb69e407a4d00b85735ca724bfa6e0d1a/watchfiles-1.1.1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:14e0b1fe858430fc0251737ef3824c54027bedb8c37c38114488b8e131cf8219", size = 449279, upload-time = "2025-10-14T15:05:04.004Z" },
+    { url = "https://files.pythonhosted.org/packages/e3/1f/d66bc15ea0b728df3ed96a539c777acfcad0eb78555ad9efcaa1274688f0/watchfiles-1.1.1-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:f27db948078f3823a6bb3b465180db8ebecf26dd5dae6f6180bd87383b6b4428", size = 459405, upload-time = "2025-10-14T15:05:04.942Z" },
+    { url = "https://files.pythonhosted.org/packages/be/90/9f4a65c0aec3ccf032703e6db02d89a157462fbb2cf20dd415128251cac0/watchfiles-1.1.1-cp313-cp313-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:059098c3a429f62fc98e8ec62b982230ef2c8df68c79e826e37b895bc359a9c0", size = 488976, upload-time = "2025-10-14T15:05:05.905Z" },
+    { url = "https://files.pythonhosted.org/packages/37/57/ee347af605d867f712be7029bb94c8c071732a4b44792e3176fa3c612d39/watchfiles-1.1.1-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:bfb5862016acc9b869bb57284e6cb35fdf8e22fe59f7548858e2f971d045f150", size = 595506, upload-time = "2025-10-14T15:05:06.906Z" },
+    { url = "https://files.pythonhosted.org/packages/a8/78/cc5ab0b86c122047f75e8fc471c67a04dee395daf847d3e59381996c8707/watchfiles-1.1.1-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:319b27255aacd9923b8a276bb14d21a5f7ff82564c744235fc5eae58d95422ae", size = 474936, upload-time = "2025-10-14T15:05:07.906Z" },
+    { url = "https://files.pythonhosted.org/packages/62/da/def65b170a3815af7bd40a3e7010bf6ab53089ef1b75d05dd5385b87cf08/watchfiles-1.1.1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c755367e51db90e75b19454b680903631d41f9e3607fbd941d296a020c2d752d", size = 456147, upload-time = "2025-10-14T15:05:09.138Z" },
+    { url = "https://files.pythonhosted.org/packages/57/99/da6573ba71166e82d288d4df0839128004c67d2778d3b566c138695f5c0b/watchfiles-1.1.1-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:c22c776292a23bfc7237a98f791b9ad3144b02116ff10d820829ce62dff46d0b", size = 630007, upload-time = "2025-10-14T15:05:10.117Z" },
+    { url = "https://files.pythonhosted.org/packages/a8/51/7439c4dd39511368849eb1e53279cd3454b4a4dbace80bab88feeb83c6b5/watchfiles-1.1.1-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:3a476189be23c3686bc2f4321dd501cb329c0a0469e77b7b534ee10129ae6374", size = 622280, upload-time = "2025-10-14T15:05:11.146Z" },
+    { url = "https://files.pythonhosted.org/packages/95/9c/8ed97d4bba5db6fdcdb2b298d3898f2dd5c20f6b73aee04eabe56c59677e/watchfiles-1.1.1-cp313-cp313-win32.whl", hash = "sha256:bf0a91bfb5574a2f7fc223cf95eeea79abfefa404bf1ea5e339c0c1560ae99a0", size = 272056, upload-time = "2025-10-14T15:05:12.156Z" },
+    { url = "https://files.pythonhosted.org/packages/1f/f3/c14e28429f744a260d8ceae18bf58c1d5fa56b50d006a7a9f80e1882cb0d/watchfiles-1.1.1-cp313-cp313-win_amd64.whl", hash = "sha256:52e06553899e11e8074503c8e716d574adeeb7e68913115c4b3653c53f9bae42", size = 288162, upload-time = "2025-10-14T15:05:13.208Z" },
+    { url = "https://files.pythonhosted.org/packages/dc/61/fe0e56c40d5cd29523e398d31153218718c5786b5e636d9ae8ae79453d27/watchfiles-1.1.1-cp313-cp313-win_arm64.whl", hash = "sha256:ac3cc5759570cd02662b15fbcd9d917f7ecd47efe0d6b40474eafd246f91ea18", size = 277909, upload-time = "2025-10-14T15:05:14.49Z" },
+    { url = "https://files.pythonhosted.org/packages/79/42/e0a7d749626f1e28c7108a99fb9bf524b501bbbeb9b261ceecde644d5a07/watchfiles-1.1.1-cp313-cp313t-macosx_10_12_x86_64.whl", hash = "sha256:563b116874a9a7ce6f96f87cd0b94f7faf92d08d0021e837796f0a14318ef8da", size = 403389, upload-time = "2025-10-14T15:05:15.777Z" },
+    { url = "https://files.pythonhosted.org/packages/15/49/08732f90ce0fbbc13913f9f215c689cfc9ced345fb1bcd8829a50007cc8d/watchfiles-1.1.1-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:3ad9fe1dae4ab4212d8c91e80b832425e24f421703b5a42ef2e4a1e215aff051", size = 389964, upload-time = "2025-10-14T15:05:16.85Z" },
+    { url = "https://files.pythonhosted.org/packages/27/0d/7c315d4bd5f2538910491a0393c56bf70d333d51bc5b34bee8e68e8cea19/watchfiles-1.1.1-cp313-cp313t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ce70f96a46b894b36eba678f153f052967a0d06d5b5a19b336ab0dbbd029f73e", size = 448114, upload-time = "2025-10-14T15:05:17.876Z" },
+    { url = "https://files.pythonhosted.org/packages/c3/24/9e096de47a4d11bc4df41e9d1e61776393eac4cb6eb11b3e23315b78b2cc/watchfiles-1.1.1-cp313-cp313t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:cb467c999c2eff23a6417e58d75e5828716f42ed8289fe6b77a7e5a91036ca70", size = 460264, upload-time = "2025-10-14T15:05:18.962Z" },
+    { url = "https://files.pythonhosted.org/packages/cc/0f/e8dea6375f1d3ba5fcb0b3583e2b493e77379834c74fd5a22d66d85d6540/watchfiles-1.1.1-cp313-cp313t-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:836398932192dae4146c8f6f737d74baeac8b70ce14831a239bdb1ca882fc261", size = 487877, upload-time = "2025-10-14T15:05:20.094Z" },
+    { url = "https://files.pythonhosted.org/packages/ac/5b/df24cfc6424a12deb41503b64d42fbea6b8cb357ec62ca84a5a3476f654a/watchfiles-1.1.1-cp313-cp313t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:743185e7372b7bc7c389e1badcc606931a827112fbbd37f14c537320fca08620", size = 595176, upload-time = "2025-10-14T15:05:21.134Z" },
+    { url = "https://files.pythonhosted.org/packages/8f/b5/853b6757f7347de4e9b37e8cc3289283fb983cba1ab4d2d7144694871d9c/watchfiles-1.1.1-cp313-cp313t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:afaeff7696e0ad9f02cbb8f56365ff4686ab205fcf9c4c5b6fdfaaa16549dd04", size = 473577, upload-time = "2025-10-14T15:05:22.306Z" },
+    { url = "https://files.pythonhosted.org/packages/e1/f7/0a4467be0a56e80447c8529c9fce5b38eab4f513cb3d9bf82e7392a5696b/watchfiles-1.1.1-cp313-cp313t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3f7eb7da0eb23aa2ba036d4f616d46906013a68caf61b7fdbe42fc8b25132e77", size = 455425, upload-time = "2025-10-14T15:05:23.348Z" },
+    { url = "https://files.pythonhosted.org/packages/8e/e0/82583485ea00137ddf69bc84a2db88bd92ab4a6e3c405e5fb878ead8d0e7/watchfiles-1.1.1-cp313-cp313t-musllinux_1_1_aarch64.whl", hash = "sha256:831a62658609f0e5c64178211c942ace999517f5770fe9436be4c2faeba0c0ef", size = 628826, upload-time = "2025-10-14T15:05:24.398Z" },
+    { url = "https://files.pythonhosted.org/packages/28/9a/a785356fccf9fae84c0cc90570f11702ae9571036fb25932f1242c82191c/watchfiles-1.1.1-cp313-cp313t-musllinux_1_1_x86_64.whl", hash = "sha256:f9a2ae5c91cecc9edd47e041a930490c31c3afb1f5e6d71de3dc671bfaca02bf", size = 622208, upload-time = "2025-10-14T15:05:25.45Z" },
+    { url = "https://files.pythonhosted.org/packages/c3/f4/0872229324ef69b2c3edec35e84bd57a1289e7d3fe74588048ed8947a323/watchfiles-1.1.1-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:d1715143123baeeaeadec0528bb7441103979a1d5f6fd0e1f915383fea7ea6d5", size = 404315, upload-time = "2025-10-14T15:05:26.501Z" },
+    { url = "https://files.pythonhosted.org/packages/7b/22/16d5331eaed1cb107b873f6ae1b69e9ced582fcf0c59a50cd84f403b1c32/watchfiles-1.1.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:39574d6370c4579d7f5d0ad940ce5b20db0e4117444e39b6d8f99db5676c52fd", size = 390869, upload-time = "2025-10-14T15:05:27.649Z" },
+    { url = "https://files.pythonhosted.org/packages/b2/7e/5643bfff5acb6539b18483128fdc0ef2cccc94a5b8fbda130c823e8ed636/watchfiles-1.1.1-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7365b92c2e69ee952902e8f70f3ba6360d0d596d9299d55d7d386df84b6941fb", size = 449919, upload-time = "2025-10-14T15:05:28.701Z" },
+    { url = "https://files.pythonhosted.org/packages/51/2e/c410993ba5025a9f9357c376f48976ef0e1b1aefb73b97a5ae01a5972755/watchfiles-1.1.1-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:bfff9740c69c0e4ed32416f013f3c45e2ae42ccedd1167ef2d805c000b6c71a5", size = 460845, upload-time = "2025-10-14T15:05:30.064Z" },
+    { url = "https://files.pythonhosted.org/packages/8e/a4/2df3b404469122e8680f0fcd06079317e48db58a2da2950fb45020947734/watchfiles-1.1.1-cp314-cp314-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b27cf2eb1dda37b2089e3907d8ea92922b673c0c427886d4edc6b94d8dfe5db3", size = 489027, upload-time = "2025-10-14T15:05:31.064Z" },
+    { url = "https://files.pythonhosted.org/packages/ea/84/4587ba5b1f267167ee715b7f66e6382cca6938e0a4b870adad93e44747e6/watchfiles-1.1.1-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:526e86aced14a65a5b0ec50827c745597c782ff46b571dbfe46192ab9e0b3c33", size = 595615, upload-time = "2025-10-14T15:05:32.074Z" },
+    { url = "https://files.pythonhosted.org/packages/6a/0f/c6988c91d06e93cd0bb3d4a808bcf32375ca1904609835c3031799e3ecae/watchfiles-1.1.1-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:04e78dd0b6352db95507fd8cb46f39d185cf8c74e4cf1e4fbad1d3df96faf510", size = 474836, upload-time = "2025-10-14T15:05:33.209Z" },
+    { url = "https://files.pythonhosted.org/packages/b4/36/ded8aebea91919485b7bbabbd14f5f359326cb5ec218cd67074d1e426d74/watchfiles-1.1.1-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5c85794a4cfa094714fb9c08d4a218375b2b95b8ed1666e8677c349906246c05", size = 455099, upload-time = "2025-10-14T15:05:34.189Z" },
+    { url = "https://files.pythonhosted.org/packages/98/e0/8c9bdba88af756a2fce230dd365fab2baf927ba42cd47521ee7498fd5211/watchfiles-1.1.1-cp314-cp314-musllinux_1_1_aarch64.whl", hash = "sha256:74d5012b7630714b66be7b7b7a78855ef7ad58e8650c73afc4c076a1f480a8d6", size = 630626, upload-time = "2025-10-14T15:05:35.216Z" },
+    { url = "https://files.pythonhosted.org/packages/2a/84/a95db05354bf2d19e438520d92a8ca475e578c647f78f53197f5a2f17aaf/watchfiles-1.1.1-cp314-cp314-musllinux_1_1_x86_64.whl", hash = "sha256:8fbe85cb3201c7d380d3d0b90e63d520f15d6afe217165d7f98c9c649654db81", size = 622519, upload-time = "2025-10-14T15:05:36.259Z" },
+    { url = "https://files.pythonhosted.org/packages/1d/ce/d8acdc8de545de995c339be67711e474c77d643555a9bb74a9334252bd55/watchfiles-1.1.1-cp314-cp314-win32.whl", hash = "sha256:3fa0b59c92278b5a7800d3ee7733da9d096d4aabcfabb9a928918bd276ef9b9b", size = 272078, upload-time = "2025-10-14T15:05:37.63Z" },
+    { url = "https://files.pythonhosted.org/packages/c4/c9/a74487f72d0451524be827e8edec251da0cc1fcf111646a511ae752e1a3d/watchfiles-1.1.1-cp314-cp314-win_amd64.whl", hash = "sha256:c2047d0b6cea13b3316bdbafbfa0c4228ae593d995030fda39089d36e64fc03a", size = 287664, upload-time = "2025-10-14T15:05:38.95Z" },
+    { url = "https://files.pythonhosted.org/packages/df/b8/8ac000702cdd496cdce998c6f4ee0ca1f15977bba51bdf07d872ebdfc34c/watchfiles-1.1.1-cp314-cp314-win_arm64.whl", hash = "sha256:842178b126593addc05acf6fce960d28bc5fae7afbaa2c6c1b3a7b9460e5be02", size = 277154, upload-time = "2025-10-14T15:05:39.954Z" },
+    { url = "https://files.pythonhosted.org/packages/47/a8/e3af2184707c29f0f14b1963c0aace6529f9d1b8582d5b99f31bbf42f59e/watchfiles-1.1.1-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:88863fbbc1a7312972f1c511f202eb30866370ebb8493aef2812b9ff28156a21", size = 403820, upload-time = "2025-10-14T15:05:40.932Z" },
+    { url = "https://files.pythonhosted.org/packages/c0/ec/e47e307c2f4bd75f9f9e8afbe3876679b18e1bcec449beca132a1c5ffb2d/watchfiles-1.1.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:55c7475190662e202c08c6c0f4d9e345a29367438cf8e8037f3155e10a88d5a5", size = 390510, upload-time = "2025-10-14T15:05:41.945Z" },
+    { url = "https://files.pythonhosted.org/packages/d5/a0/ad235642118090f66e7b2f18fd5c42082418404a79205cdfca50b6309c13/watchfiles-1.1.1-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3f53fa183d53a1d7a8852277c92b967ae99c2d4dcee2bfacff8868e6e30b15f7", size = 448408, upload-time = "2025-10-14T15:05:43.385Z" },
+    { url = "https://files.pythonhosted.org/packages/df/85/97fa10fd5ff3332ae17e7e40e20784e419e28521549780869f1413742e9d/watchfiles-1.1.1-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:6aae418a8b323732fa89721d86f39ec8f092fc2af67f4217a2b07fd3e93c6101", size = 458968, upload-time = "2025-10-14T15:05:44.404Z" },
+    { url = "https://files.pythonhosted.org/packages/47/c2/9059c2e8966ea5ce678166617a7f75ecba6164375f3b288e50a40dc6d489/watchfiles-1.1.1-cp314-cp314t-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f096076119da54a6080e8920cbdaac3dbee667eb91dcc5e5b78840b87415bd44", size = 488096, upload-time = "2025-10-14T15:05:45.398Z" },
+    { url = "https://files.pythonhosted.org/packages/94/44/d90a9ec8ac309bc26db808a13e7bfc0e4e78b6fc051078a554e132e80160/watchfiles-1.1.1-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:00485f441d183717038ed2e887a7c868154f216877653121068107b227a2f64c", size = 596040, upload-time = "2025-10-14T15:05:46.502Z" },
+    { url = "https://files.pythonhosted.org/packages/95/68/4e3479b20ca305cfc561db3ed207a8a1c745ee32bf24f2026a129d0ddb6e/watchfiles-1.1.1-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a55f3e9e493158d7bfdb60a1165035f1cf7d320914e7b7ea83fe22c6023b58fc", size = 473847, upload-time = "2025-10-14T15:05:47.484Z" },
+    { url = "https://files.pythonhosted.org/packages/4f/55/2af26693fd15165c4ff7857e38330e1b61ab8c37d15dc79118cdba115b7a/watchfiles-1.1.1-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8c91ed27800188c2ae96d16e3149f199d62f86c7af5f5f4d2c61a3ed8cd3666c", size = 455072, upload-time = "2025-10-14T15:05:48.928Z" },
+    { url = "https://files.pythonhosted.org/packages/66/1d/d0d200b10c9311ec25d2273f8aad8c3ef7cc7ea11808022501811208a750/watchfiles-1.1.1-cp314-cp314t-musllinux_1_1_aarch64.whl", hash = "sha256:311ff15a0bae3714ffb603e6ba6dbfba4065ab60865d15a6ec544133bdb21099", size = 629104, upload-time = "2025-10-14T15:05:49.908Z" },
+    { url = "https://files.pythonhosted.org/packages/e3/bd/fa9bb053192491b3867ba07d2343d9f2252e00811567d30ae8d0f78136fe/watchfiles-1.1.1-cp314-cp314t-musllinux_1_1_x86_64.whl", hash = "sha256:a916a2932da8f8ab582f242c065f5c81bed3462849ca79ee357dd9551b0e9b01", size = 622112, upload-time = "2025-10-14T15:05:50.941Z" },
+]
+
+[[package]]
+name = "weasel"
+version = "1.0.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "cloudpathlib" },
+    { name = "confection" },
+    { name = "httpx" },
+    { name = "packaging" },
+    { name = "pydantic" },
+    { name = "smart-open" },
+    { name = "srsly" },
+    { name = "typer" },
+    { name = "wasabi" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/ce/e5/e272bb9a045105a1fdf4b798d8086f5932a178f4d738f17a74f5c9e0ae9a/weasel-1.0.0.tar.gz", hash = "sha256:7b129b44c90cc543b760532974ca1e4eb30dad2aa2026f57bdce66354ae610fc", size = 38682, upload-time = "2026-03-20T08:10:25.266Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/0a/07/57ebf7a6798b016c064bd0ca81b4c6a99daa4dc377b898bc7b41eb6b5af0/weasel-1.0.0-py3-none-any.whl", hash = "sha256:89518acee027f49d743126c3502d35e6dd14f5768be5c37c9af47c171b6005cc", size = 50713, upload-time = "2026-03-20T08:10:23.637Z" },
+]
+
+[[package]]
+name = "webencodings"
+version = "0.5.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/0b/02/ae6ceac1baeda530866a85075641cec12989bd8d31af6d5ab4a3e8c92f47/webencodings-0.5.1.tar.gz", hash = "sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923", size = 9721, upload-time = "2017-04-05T20:21:34.189Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/f4/24/2a3e3df732393fed8b3ebf2ec078f05546de641fe1b667ee316ec1dcf3b7/webencodings-0.5.1-py2.py3-none-any.whl", hash = "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78", size = 11774, upload-time = "2017-04-05T20:21:32.581Z" },
+]
+
+[[package]]
+name = "websockets"
+version = "16.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/04/24/4b2031d72e840ce4c1ccb255f693b15c334757fc50023e4db9537080b8c4/websockets-16.0.tar.gz", hash = "sha256:5f6261a5e56e8d5c42a4497b364ea24d94d9563e8fbd44e78ac40879c60179b5", size = 179346, upload-time = "2026-01-10T09:23:47.181Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/84/7b/bac442e6b96c9d25092695578dda82403c77936104b5682307bd4deb1ad4/websockets-16.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:71c989cbf3254fbd5e84d3bff31e4da39c43f884e64f2551d14bb3c186230f00", size = 177365, upload-time = "2026-01-10T09:22:46.787Z" },
+    { url = "https://files.pythonhosted.org/packages/b0/fe/136ccece61bd690d9c1f715baaeefd953bb2360134de73519d5df19d29ca/websockets-16.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:8b6e209ffee39ff1b6d0fa7bfef6de950c60dfb91b8fcead17da4ee539121a79", size = 175038, upload-time = "2026-01-10T09:22:47.999Z" },
+    { url = "https://files.pythonhosted.org/packages/40/1e/9771421ac2286eaab95b8575b0cb701ae3663abf8b5e1f64f1fd90d0a673/websockets-16.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:86890e837d61574c92a97496d590968b23c2ef0aeb8a9bc9421d174cd378ae39", size = 175328, upload-time = "2026-01-10T09:22:49.809Z" },
+    { url = "https://files.pythonhosted.org/packages/18/29/71729b4671f21e1eaa5d6573031ab810ad2936c8175f03f97f3ff164c802/websockets-16.0-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:9b5aca38b67492ef518a8ab76851862488a478602229112c4b0d58d63a7a4d5c", size = 184915, upload-time = "2026-01-10T09:22:51.071Z" },
+    { url = "https://files.pythonhosted.org/packages/97/bb/21c36b7dbbafc85d2d480cd65df02a1dc93bf76d97147605a8e27ff9409d/websockets-16.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e0334872c0a37b606418ac52f6ab9cfd17317ac26365f7f65e203e2d0d0d359f", size = 186152, upload-time = "2026-01-10T09:22:52.224Z" },
+    { url = "https://files.pythonhosted.org/packages/4a/34/9bf8df0c0cf88fa7bfe36678dc7b02970c9a7d5e065a3099292db87b1be2/websockets-16.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:a0b31e0b424cc6b5a04b8838bbaec1688834b2383256688cf47eb97412531da1", size = 185583, upload-time = "2026-01-10T09:22:53.443Z" },
+    { url = "https://files.pythonhosted.org/packages/47/88/4dd516068e1a3d6ab3c7c183288404cd424a9a02d585efbac226cb61ff2d/websockets-16.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:485c49116d0af10ac698623c513c1cc01c9446c058a4e61e3bf6c19dff7335a2", size = 184880, upload-time = "2026-01-10T09:22:55.033Z" },
+    { url = "https://files.pythonhosted.org/packages/91/d6/7d4553ad4bf1c0421e1ebd4b18de5d9098383b5caa1d937b63df8d04b565/websockets-16.0-cp312-cp312-win32.whl", hash = "sha256:eaded469f5e5b7294e2bdca0ab06becb6756ea86894a47806456089298813c89", size = 178261, upload-time = "2026-01-10T09:22:56.251Z" },
+    { url = "https://files.pythonhosted.org/packages/c3/f0/f3a17365441ed1c27f850a80b2bc680a0fa9505d733fe152fdf5e98c1c0b/websockets-16.0-cp312-cp312-win_amd64.whl", hash = "sha256:5569417dc80977fc8c2d43a86f78e0a5a22fee17565d78621b6bb264a115d4ea", size = 178693, upload-time = "2026-01-10T09:22:57.478Z" },
+    { url = "https://files.pythonhosted.org/packages/cc/9c/baa8456050d1c1b08dd0ec7346026668cbc6f145ab4e314d707bb845bf0d/websockets-16.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:878b336ac47938b474c8f982ac2f7266a540adc3fa4ad74ae96fea9823a02cc9", size = 177364, upload-time = "2026-01-10T09:22:59.333Z" },
+    { url = "https://files.pythonhosted.org/packages/7e/0c/8811fc53e9bcff68fe7de2bcbe75116a8d959ac699a3200f4847a8925210/websockets-16.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:52a0fec0e6c8d9a784c2c78276a48a2bdf099e4ccc2a4cad53b27718dbfd0230", size = 175039, upload-time = "2026-01-10T09:23:01.171Z" },
+    { url = "https://files.pythonhosted.org/packages/aa/82/39a5f910cb99ec0b59e482971238c845af9220d3ab9fa76dd9162cda9d62/websockets-16.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:e6578ed5b6981005df1860a56e3617f14a6c307e6a71b4fff8c48fdc50f3ed2c", size = 175323, upload-time = "2026-01-10T09:23:02.341Z" },
+    { url = "https://files.pythonhosted.org/packages/bd/28/0a25ee5342eb5d5f297d992a77e56892ecb65e7854c7898fb7d35e9b33bd/websockets-16.0-cp313-cp313-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:95724e638f0f9c350bb1c2b0a7ad0e83d9cc0c9259f3ea94e40d7b02a2179ae5", size = 184975, upload-time = "2026-01-10T09:23:03.756Z" },
+    { url = "https://files.pythonhosted.org/packages/f9/66/27ea52741752f5107c2e41fda05e8395a682a1e11c4e592a809a90c6a506/websockets-16.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c0204dc62a89dc9d50d682412c10b3542d748260d743500a85c13cd1ee4bde82", size = 186203, upload-time = "2026-01-10T09:23:05.01Z" },
+    { url = "https://files.pythonhosted.org/packages/37/e5/8e32857371406a757816a2b471939d51c463509be73fa538216ea52b792a/websockets-16.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:52ac480f44d32970d66763115edea932f1c5b1312de36df06d6b219f6741eed8", size = 185653, upload-time = "2026-01-10T09:23:06.301Z" },
+    { url = "https://files.pythonhosted.org/packages/9b/67/f926bac29882894669368dc73f4da900fcdf47955d0a0185d60103df5737/websockets-16.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:6e5a82b677f8f6f59e8dfc34ec06ca6b5b48bc4fcda346acd093694cc2c24d8f", size = 184920, upload-time = "2026-01-10T09:23:07.492Z" },
+    { url = "https://files.pythonhosted.org/packages/3c/a1/3d6ccdcd125b0a42a311bcd15a7f705d688f73b2a22d8cf1c0875d35d34a/websockets-16.0-cp313-cp313-win32.whl", hash = "sha256:abf050a199613f64c886ea10f38b47770a65154dc37181bfaff70c160f45315a", size = 178255, upload-time = "2026-01-10T09:23:09.245Z" },
+    { url = "https://files.pythonhosted.org/packages/6b/ae/90366304d7c2ce80f9b826096a9e9048b4bb760e44d3b873bb272cba696b/websockets-16.0-cp313-cp313-win_amd64.whl", hash = "sha256:3425ac5cf448801335d6fdc7ae1eb22072055417a96cc6b31b3861f455fbc156", size = 178689, upload-time = "2026-01-10T09:23:10.483Z" },
+    { url = "https://files.pythonhosted.org/packages/f3/1d/e88022630271f5bd349ed82417136281931e558d628dd52c4d8621b4a0b2/websockets-16.0-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:8cc451a50f2aee53042ac52d2d053d08bf89bcb31ae799cb4487587661c038a0", size = 177406, upload-time = "2026-01-10T09:23:12.178Z" },
+    { url = "https://files.pythonhosted.org/packages/f2/78/e63be1bf0724eeb4616efb1ae1c9044f7c3953b7957799abb5915bffd38e/websockets-16.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:daa3b6ff70a9241cf6c7fc9e949d41232d9d7d26fd3522b1ad2b4d62487e9904", size = 175085, upload-time = "2026-01-10T09:23:13.511Z" },
+    { url = "https://files.pythonhosted.org/packages/bb/f4/d3c9220d818ee955ae390cf319a7c7a467beceb24f05ee7aaaa2414345ba/websockets-16.0-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:fd3cb4adb94a2a6e2b7c0d8d05cb94e6f1c81a0cf9dc2694fb65c7e8d94c42e4", size = 175328, upload-time = "2026-01-10T09:23:14.727Z" },
+    { url = "https://files.pythonhosted.org/packages/63/bc/d3e208028de777087e6fb2b122051a6ff7bbcca0d6df9d9c2bf1dd869ae9/websockets-16.0-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:781caf5e8eee67f663126490c2f96f40906594cb86b408a703630f95550a8c3e", size = 185044, upload-time = "2026-01-10T09:23:15.939Z" },
+    { url = "https://files.pythonhosted.org/packages/ad/6e/9a0927ac24bd33a0a9af834d89e0abc7cfd8e13bed17a86407a66773cc0e/websockets-16.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:caab51a72c51973ca21fa8a18bd8165e1a0183f1ac7066a182ff27107b71e1a4", size = 186279, upload-time = "2026-01-10T09:23:17.148Z" },
+    { url = "https://files.pythonhosted.org/packages/b9/ca/bf1c68440d7a868180e11be653c85959502efd3a709323230314fda6e0b3/websockets-16.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:19c4dc84098e523fd63711e563077d39e90ec6702aff4b5d9e344a60cb3c0cb1", size = 185711, upload-time = "2026-01-10T09:23:18.372Z" },
+    { url = "https://files.pythonhosted.org/packages/c4/f8/fdc34643a989561f217bb477cbc47a3a07212cbda91c0e4389c43c296ebf/websockets-16.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:a5e18a238a2b2249c9a9235466b90e96ae4795672598a58772dd806edc7ac6d3", size = 184982, upload-time = "2026-01-10T09:23:19.652Z" },
+    { url = "https://files.pythonhosted.org/packages/dd/d1/574fa27e233764dbac9c52730d63fcf2823b16f0856b3329fc6268d6ae4f/websockets-16.0-cp314-cp314-win32.whl", hash = "sha256:a069d734c4a043182729edd3e9f247c3b2a4035415a9172fd0f1b71658a320a8", size = 177915, upload-time = "2026-01-10T09:23:21.458Z" },
+    { url = "https://files.pythonhosted.org/packages/8a/f1/ae6b937bf3126b5134ce1f482365fde31a357c784ac51852978768b5eff4/websockets-16.0-cp314-cp314-win_amd64.whl", hash = "sha256:c0ee0e63f23914732c6d7e0cce24915c48f3f1512ec1d079ed01fc629dab269d", size = 178381, upload-time = "2026-01-10T09:23:22.715Z" },
+    { url = "https://files.pythonhosted.org/packages/06/9b/f791d1db48403e1f0a27577a6beb37afae94254a8c6f08be4a23e4930bc0/websockets-16.0-cp314-cp314t-macosx_10_15_universal2.whl", hash = "sha256:a35539cacc3febb22b8f4d4a99cc79b104226a756aa7400adc722e83b0d03244", size = 177737, upload-time = "2026-01-10T09:23:24.523Z" },
+    { url = "https://files.pythonhosted.org/packages/bd/40/53ad02341fa33b3ce489023f635367a4ac98b73570102ad2cdd770dacc9a/websockets-16.0-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:b784ca5de850f4ce93ec85d3269d24d4c82f22b7212023c974c401d4980ebc5e", size = 175268, upload-time = "2026-01-10T09:23:25.781Z" },
+    { url = "https://files.pythonhosted.org/packages/74/9b/6158d4e459b984f949dcbbb0c5d270154c7618e11c01029b9bbd1bb4c4f9/websockets-16.0-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:569d01a4e7fba956c5ae4fc988f0d4e187900f5497ce46339c996dbf24f17641", size = 175486, upload-time = "2026-01-10T09:23:27.033Z" },
+    { url = "https://files.pythonhosted.org/packages/e5/2d/7583b30208b639c8090206f95073646c2c9ffd66f44df967981a64f849ad/websockets-16.0-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:50f23cdd8343b984957e4077839841146f67a3d31ab0d00e6b824e74c5b2f6e8", size = 185331, upload-time = "2026-01-10T09:23:28.259Z" },
+    { url = "https://files.pythonhosted.org/packages/45/b0/cce3784eb519b7b5ad680d14b9673a31ab8dcb7aad8b64d81709d2430aa8/websockets-16.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:152284a83a00c59b759697b7f9e9cddf4e3c7861dd0d964b472b70f78f89e80e", size = 186501, upload-time = "2026-01-10T09:23:29.449Z" },
+    { url = "https://files.pythonhosted.org/packages/19/60/b8ebe4c7e89fb5f6cdf080623c9d92789a53636950f7abacfc33fe2b3135/websockets-16.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:bc59589ab64b0022385f429b94697348a6a234e8ce22544e3681b2e9331b5944", size = 186062, upload-time = "2026-01-10T09:23:31.368Z" },
+    { url = "https://files.pythonhosted.org/packages/88/a8/a080593f89b0138b6cba1b28f8df5673b5506f72879322288b031337c0b8/websockets-16.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:32da954ffa2814258030e5a57bc73a3635463238e797c7375dc8091327434206", size = 185356, upload-time = "2026-01-10T09:23:32.627Z" },
+    { url = "https://files.pythonhosted.org/packages/c2/b6/b9afed2afadddaf5ebb2afa801abf4b0868f42f8539bfe4b071b5266c9fe/websockets-16.0-cp314-cp314t-win32.whl", hash = "sha256:5a4b4cc550cb665dd8a47f868c8d04c8230f857363ad3c9caf7a0c3bf8c61ca6", size = 178085, upload-time = "2026-01-10T09:23:33.816Z" },
+    { url = "https://files.pythonhosted.org/packages/9f/3e/28135a24e384493fa804216b79a6a6759a38cc4ff59118787b9fb693df93/websockets-16.0-cp314-cp314t-win_amd64.whl", hash = "sha256:b14dc141ed6d2dde437cddb216004bcac6a1df0935d79656387bd41632ba0bbd", size = 178531, upload-time = "2026-01-10T09:23:35.016Z" },
+    { url = "https://files.pythonhosted.org/packages/6f/28/258ebab549c2bf3e64d2b0217b973467394a9cea8c42f70418ca2c5d0d2e/websockets-16.0-py3-none-any.whl", hash = "sha256:1637db62fad1dc833276dded54215f2c7fa46912301a24bd94d45d46a011ceec", size = 171598, upload-time = "2026-01-10T09:23:45.395Z" },
+]
+
+[[package]]
+name = "webvtt-py"
+version = "0.5.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/5e/f6/7c9c964681fb148e0293e6860108d378e09ccab2218f9063fd3eb87f840a/webvtt-py-0.5.1.tar.gz", hash = "sha256:2040dd325277ddadc1e0c6cc66cbc4a1d9b6b49b24c57a0c3364374c3e8a3dc1", size = 55128, upload-time = "2024-05-30T13:40:17.189Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/f3/ed/aad7e0f5a462d679f7b4d2e0d8502c3096740c883b5bbed5103146480937/webvtt_py-0.5.1-py3-none-any.whl", hash = "sha256:9d517d286cfe7fc7825e9d4e2079647ce32f5678eb58e39ef544ffbb932610b7", size = 19802, upload-time = "2024-05-30T13:40:14.661Z" },
+]
+
+[[package]]
+name = "wrapt"
+version = "1.17.3"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/95/8f/aeb76c5b46e273670962298c23e7ddde79916cb74db802131d49a85e4b7d/wrapt-1.17.3.tar.gz", hash = "sha256:f66eb08feaa410fe4eebd17f2a2c8e2e46d3476e9f8c783daa8e09e0faa666d0", size = 55547, upload-time = "2025-08-12T05:53:21.714Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/9f/41/cad1aba93e752f1f9268c77270da3c469883d56e2798e7df6240dcb2287b/wrapt-1.17.3-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:ab232e7fdb44cdfbf55fc3afa31bcdb0d8980b9b95c38b6405df2acb672af0e0", size = 53998, upload-time = "2025-08-12T05:51:47.138Z" },
+    { url = "https://files.pythonhosted.org/packages/60/f8/096a7cc13097a1869fe44efe68dace40d2a16ecb853141394047f0780b96/wrapt-1.17.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:9baa544e6acc91130e926e8c802a17f3b16fbea0fd441b5a60f5cf2cc5c3deba", size = 39020, upload-time = "2025-08-12T05:51:35.906Z" },
+    { url = "https://files.pythonhosted.org/packages/33/df/bdf864b8997aab4febb96a9ae5c124f700a5abd9b5e13d2a3214ec4be705/wrapt-1.17.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:6b538e31eca1a7ea4605e44f81a48aa24c4632a277431a6ed3f328835901f4fd", size = 39098, upload-time = "2025-08-12T05:51:57.474Z" },
+    { url = "https://files.pythonhosted.org/packages/9f/81/5d931d78d0eb732b95dc3ddaeeb71c8bb572fb01356e9133916cd729ecdd/wrapt-1.17.3-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:042ec3bb8f319c147b1301f2393bc19dba6e176b7da446853406d041c36c7828", size = 88036, upload-time = "2025-08-12T05:52:34.784Z" },
+    { url = "https://files.pythonhosted.org/packages/ca/38/2e1785df03b3d72d34fc6252d91d9d12dc27a5c89caef3335a1bbb8908ca/wrapt-1.17.3-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3af60380ba0b7b5aeb329bc4e402acd25bd877e98b3727b0135cb5c2efdaefe9", size = 88156, upload-time = "2025-08-12T05:52:13.599Z" },
+    { url = "https://files.pythonhosted.org/packages/b3/8b/48cdb60fe0603e34e05cffda0b2a4adab81fd43718e11111a4b0100fd7c1/wrapt-1.17.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:0b02e424deef65c9f7326d8c19220a2c9040c51dc165cddb732f16198c168396", size = 87102, upload-time = "2025-08-12T05:52:14.56Z" },
+    { url = "https://files.pythonhosted.org/packages/3c/51/d81abca783b58f40a154f1b2c56db1d2d9e0d04fa2d4224e357529f57a57/wrapt-1.17.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:74afa28374a3c3a11b3b5e5fca0ae03bef8450d6aa3ab3a1e2c30e3a75d023dc", size = 87732, upload-time = "2025-08-12T05:52:36.165Z" },
+    { url = "https://files.pythonhosted.org/packages/9e/b1/43b286ca1392a006d5336412d41663eeef1ad57485f3e52c767376ba7e5a/wrapt-1.17.3-cp312-cp312-win32.whl", hash = "sha256:4da9f45279fff3543c371d5ababc57a0384f70be244de7759c85a7f989cb4ebe", size = 36705, upload-time = "2025-08-12T05:53:07.123Z" },
+    { url = "https://files.pythonhosted.org/packages/28/de/49493f962bd3c586ab4b88066e967aa2e0703d6ef2c43aa28cb83bf7b507/wrapt-1.17.3-cp312-cp312-win_amd64.whl", hash = "sha256:e71d5c6ebac14875668a1e90baf2ea0ef5b7ac7918355850c0908ae82bcb297c", size = 38877, upload-time = "2025-08-12T05:53:05.436Z" },
+    { url = "https://files.pythonhosted.org/packages/f1/48/0f7102fe9cb1e8a5a77f80d4f0956d62d97034bbe88d33e94699f99d181d/wrapt-1.17.3-cp312-cp312-win_arm64.whl", hash = "sha256:604d076c55e2fdd4c1c03d06dc1a31b95130010517b5019db15365ec4a405fc6", size = 36885, upload-time = "2025-08-12T05:52:54.367Z" },
+    { url = "https://files.pythonhosted.org/packages/fc/f6/759ece88472157acb55fc195e5b116e06730f1b651b5b314c66291729193/wrapt-1.17.3-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:a47681378a0439215912ef542c45a783484d4dd82bac412b71e59cf9c0e1cea0", size = 54003, upload-time = "2025-08-12T05:51:48.627Z" },
+    { url = "https://files.pythonhosted.org/packages/4f/a9/49940b9dc6d47027dc850c116d79b4155f15c08547d04db0f07121499347/wrapt-1.17.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:54a30837587c6ee3cd1a4d1c2ec5d24e77984d44e2f34547e2323ddb4e22eb77", size = 39025, upload-time = "2025-08-12T05:51:37.156Z" },
+    { url = "https://files.pythonhosted.org/packages/45/35/6a08de0f2c96dcdd7fe464d7420ddb9a7655a6561150e5fc4da9356aeaab/wrapt-1.17.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:16ecf15d6af39246fe33e507105d67e4b81d8f8d2c6598ff7e3ca1b8a37213f7", size = 39108, upload-time = "2025-08-12T05:51:58.425Z" },
+    { url = "https://files.pythonhosted.org/packages/0c/37/6faf15cfa41bf1f3dba80cd3f5ccc6622dfccb660ab26ed79f0178c7497f/wrapt-1.17.3-cp313-cp313-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:6fd1ad24dc235e4ab88cda009e19bf347aabb975e44fd5c2fb22a3f6e4141277", size = 88072, upload-time = "2025-08-12T05:52:37.53Z" },
+    { url = "https://files.pythonhosted.org/packages/78/f2/efe19ada4a38e4e15b6dff39c3e3f3f73f5decf901f66e6f72fe79623a06/wrapt-1.17.3-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0ed61b7c2d49cee3c027372df5809a59d60cf1b6c2f81ee980a091f3afed6a2d", size = 88214, upload-time = "2025-08-12T05:52:15.886Z" },
+    { url = "https://files.pythonhosted.org/packages/40/90/ca86701e9de1622b16e09689fc24b76f69b06bb0150990f6f4e8b0eeb576/wrapt-1.17.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:423ed5420ad5f5529db9ce89eac09c8a2f97da18eb1c870237e84c5a5c2d60aa", size = 87105, upload-time = "2025-08-12T05:52:17.914Z" },
+    { url = "https://files.pythonhosted.org/packages/fd/e0/d10bd257c9a3e15cbf5523025252cc14d77468e8ed644aafb2d6f54cb95d/wrapt-1.17.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:e01375f275f010fcbf7f643b4279896d04e571889b8a5b3f848423d91bf07050", size = 87766, upload-time = "2025-08-12T05:52:39.243Z" },
+    { url = "https://files.pythonhosted.org/packages/e8/cf/7d848740203c7b4b27eb55dbfede11aca974a51c3d894f6cc4b865f42f58/wrapt-1.17.3-cp313-cp313-win32.whl", hash = "sha256:53e5e39ff71b3fc484df8a522c933ea2b7cdd0d5d15ae82e5b23fde87d44cbd8", size = 36711, upload-time = "2025-08-12T05:53:10.074Z" },
+    { url = "https://files.pythonhosted.org/packages/57/54/35a84d0a4d23ea675994104e667ceff49227ce473ba6a59ba2c84f250b74/wrapt-1.17.3-cp313-cp313-win_amd64.whl", hash = "sha256:1f0b2f40cf341ee8cc1a97d51ff50dddb9fcc73241b9143ec74b30fc4f44f6cb", size = 38885, upload-time = "2025-08-12T05:53:08.695Z" },
+    { url = "https://files.pythonhosted.org/packages/01/77/66e54407c59d7b02a3c4e0af3783168fff8e5d61def52cda8728439d86bc/wrapt-1.17.3-cp313-cp313-win_arm64.whl", hash = "sha256:7425ac3c54430f5fc5e7b6f41d41e704db073309acfc09305816bc6a0b26bb16", size = 36896, upload-time = "2025-08-12T05:52:55.34Z" },
+    { url = "https://files.pythonhosted.org/packages/02/a2/cd864b2a14f20d14f4c496fab97802001560f9f41554eef6df201cd7f76c/wrapt-1.17.3-cp314-cp314-macosx_10_13_universal2.whl", hash = "sha256:cf30f6e3c077c8e6a9a7809c94551203c8843e74ba0c960f4a98cd80d4665d39", size = 54132, upload-time = "2025-08-12T05:51:49.864Z" },
+    { url = "https://files.pythonhosted.org/packages/d5/46/d011725b0c89e853dc44cceb738a307cde5d240d023d6d40a82d1b4e1182/wrapt-1.17.3-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:e228514a06843cae89621384cfe3a80418f3c04aadf8a3b14e46a7be704e4235", size = 39091, upload-time = "2025-08-12T05:51:38.935Z" },
+    { url = "https://files.pythonhosted.org/packages/2e/9e/3ad852d77c35aae7ddebdbc3b6d35ec8013af7d7dddad0ad911f3d891dae/wrapt-1.17.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:5ea5eb3c0c071862997d6f3e02af1d055f381b1d25b286b9d6644b79db77657c", size = 39172, upload-time = "2025-08-12T05:51:59.365Z" },
+    { url = "https://files.pythonhosted.org/packages/c3/f7/c983d2762bcce2326c317c26a6a1e7016f7eb039c27cdf5c4e30f4160f31/wrapt-1.17.3-cp314-cp314-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:281262213373b6d5e4bb4353bc36d1ba4084e6d6b5d242863721ef2bf2c2930b", size = 87163, upload-time = "2025-08-12T05:52:40.965Z" },
+    { url = "https://files.pythonhosted.org/packages/e4/0f/f673f75d489c7f22d17fe0193e84b41540d962f75fce579cf6873167c29b/wrapt-1.17.3-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:dc4a8d2b25efb6681ecacad42fca8859f88092d8732b170de6a5dddd80a1c8fa", size = 87963, upload-time = "2025-08-12T05:52:20.326Z" },
+    { url = "https://files.pythonhosted.org/packages/df/61/515ad6caca68995da2fac7a6af97faab8f78ebe3bf4f761e1b77efbc47b5/wrapt-1.17.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:373342dd05b1d07d752cecbec0c41817231f29f3a89aa8b8843f7b95992ed0c7", size = 86945, upload-time = "2025-08-12T05:52:21.581Z" },
+    { url = "https://files.pythonhosted.org/packages/d3/bd/4e70162ce398462a467bc09e768bee112f1412e563620adc353de9055d33/wrapt-1.17.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:d40770d7c0fd5cbed9d84b2c3f2e156431a12c9a37dc6284060fb4bec0b7ffd4", size = 86857, upload-time = "2025-08-12T05:52:43.043Z" },
+    { url = "https://files.pythonhosted.org/packages/2b/b8/da8560695e9284810b8d3df8a19396a6e40e7518059584a1a394a2b35e0a/wrapt-1.17.3-cp314-cp314-win32.whl", hash = "sha256:fbd3c8319de8e1dc79d346929cd71d523622da527cca14e0c1d257e31c2b8b10", size = 37178, upload-time = "2025-08-12T05:53:12.605Z" },
+    { url = "https://files.pythonhosted.org/packages/db/c8/b71eeb192c440d67a5a0449aaee2310a1a1e8eca41676046f99ed2487e9f/wrapt-1.17.3-cp314-cp314-win_amd64.whl", hash = "sha256:e1a4120ae5705f673727d3253de3ed0e016f7cd78dc463db1b31e2463e1f3cf6", size = 39310, upload-time = "2025-08-12T05:53:11.106Z" },
+    { url = "https://files.pythonhosted.org/packages/45/20/2cda20fd4865fa40f86f6c46ed37a2a8356a7a2fde0773269311f2af56c7/wrapt-1.17.3-cp314-cp314-win_arm64.whl", hash = "sha256:507553480670cab08a800b9463bdb881b2edeed77dc677b0a5915e6106e91a58", size = 37266, upload-time = "2025-08-12T05:52:56.531Z" },
+    { url = "https://files.pythonhosted.org/packages/77/ed/dd5cf21aec36c80443c6f900449260b80e2a65cf963668eaef3b9accce36/wrapt-1.17.3-cp314-cp314t-macosx_10_13_universal2.whl", hash = "sha256:ed7c635ae45cfbc1a7371f708727bf74690daedc49b4dba310590ca0bd28aa8a", size = 56544, upload-time = "2025-08-12T05:51:51.109Z" },
+    { url = "https://files.pythonhosted.org/packages/8d/96/450c651cc753877ad100c7949ab4d2e2ecc4d97157e00fa8f45df682456a/wrapt-1.17.3-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:249f88ed15503f6492a71f01442abddd73856a0032ae860de6d75ca62eed8067", size = 40283, upload-time = "2025-08-12T05:51:39.912Z" },
+    { url = "https://files.pythonhosted.org/packages/d1/86/2fcad95994d9b572db57632acb6f900695a648c3e063f2cd344b3f5c5a37/wrapt-1.17.3-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:5a03a38adec8066d5a37bea22f2ba6bbf39fcdefbe2d91419ab864c3fb515454", size = 40366, upload-time = "2025-08-12T05:52:00.693Z" },
+    { url = "https://files.pythonhosted.org/packages/64/0e/f4472f2fdde2d4617975144311f8800ef73677a159be7fe61fa50997d6c0/wrapt-1.17.3-cp314-cp314t-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl", hash = "sha256:5d4478d72eb61c36e5b446e375bbc49ed002430d17cdec3cecb36993398e1a9e", size = 108571, upload-time = "2025-08-12T05:52:44.521Z" },
+    { url = "https://files.pythonhosted.org/packages/cc/01/9b85a99996b0a97c8a17484684f206cbb6ba73c1ce6890ac668bcf3838fb/wrapt-1.17.3-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:223db574bb38637e8230eb14b185565023ab624474df94d2af18f1cdb625216f", size = 113094, upload-time = "2025-08-12T05:52:22.618Z" },
+    { url = "https://files.pythonhosted.org/packages/25/02/78926c1efddcc7b3aa0bc3d6b33a822f7d898059f7cd9ace8c8318e559ef/wrapt-1.17.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:e405adefb53a435f01efa7ccdec012c016b5a1d3f35459990afc39b6be4d5056", size = 110659, upload-time = "2025-08-12T05:52:24.057Z" },
+    { url = "https://files.pythonhosted.org/packages/dc/ee/c414501ad518ac3e6fe184753632fe5e5ecacdcf0effc23f31c1e4f7bfcf/wrapt-1.17.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:88547535b787a6c9ce4086917b6e1d291aa8ed914fdd3a838b3539dc95c12804", size = 106946, upload-time = "2025-08-12T05:52:45.976Z" },
+    { url = "https://files.pythonhosted.org/packages/be/44/a1bd64b723d13bb151d6cc91b986146a1952385e0392a78567e12149c7b4/wrapt-1.17.3-cp314-cp314t-win32.whl", hash = "sha256:41b1d2bc74c2cac6f9074df52b2efbef2b30bdfe5f40cb78f8ca22963bc62977", size = 38717, upload-time = "2025-08-12T05:53:15.214Z" },
+    { url = "https://files.pythonhosted.org/packages/79/d9/7cfd5a312760ac4dd8bf0184a6ee9e43c33e47f3dadc303032ce012b8fa3/wrapt-1.17.3-cp314-cp314t-win_amd64.whl", hash = "sha256:73d496de46cd2cdbdbcce4ae4bcdb4afb6a11234a1df9c085249d55166b95116", size = 41334, upload-time = "2025-08-12T05:53:14.178Z" },
+    { url = "https://files.pythonhosted.org/packages/46/78/10ad9781128ed2f99dbc474f43283b13fea8ba58723e98844367531c18e9/wrapt-1.17.3-cp314-cp314t-win_arm64.whl", hash = "sha256:f38e60678850c42461d4202739f9bf1e3a737c7ad283638251e79cc49effb6b6", size = 38471, upload-time = "2025-08-12T05:52:57.784Z" },
+    { url = "https://files.pythonhosted.org/packages/1f/f6/a933bd70f98e9cf3e08167fc5cd7aaaca49147e48411c0bd5ae701bb2194/wrapt-1.17.3-py3-none-any.whl", hash = "sha256:7171ae35d2c33d326ac19dd8facb1e82e5fd04ef8c6c0e394d7af55a55051c22", size = 23591, upload-time = "2025-08-12T05:53:20.674Z" },
+]
+
+[[package]]
+name = "xlrd"
+version = "2.0.2"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/07/5a/377161c2d3538d1990d7af382c79f3b2372e880b65de21b01b1a2b78691e/xlrd-2.0.2.tar.gz", hash = "sha256:08b5e25de58f21ce71dc7db3b3b8106c1fa776f3024c54e45b45b374e89234c9", size = 100167, upload-time = "2025-06-14T08:46:39.039Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/1a/62/c8d562e7766786ba6587d09c5a8ba9f718ed3fa8af7f4553e8f91c36f302/xlrd-2.0.2-py2.py3-none-any.whl", hash = "sha256:ea762c3d29f4cca48d82df517b6d89fbce4db3107f9d78713e48cd321d5c9aa9", size = 96555, upload-time = "2025-06-14T08:46:37.766Z" },
+]
+
+[[package]]
+name = "xlsxwriter"
+version = "3.2.9"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/46/2c/c06ef49dc36e7954e55b802a8b231770d286a9758b3d936bd1e04ce5ba88/xlsxwriter-3.2.9.tar.gz", hash = "sha256:254b1c37a368c444eac6e2f867405cc9e461b0ed97a3233b2ac1e574efb4140c", size = 215940, upload-time = "2025-09-16T00:16:21.63Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/3a/0c/3662f4a66880196a590b202f0db82d919dd2f89e99a27fadef91c4a33d41/xlsxwriter-3.2.9-py3-none-any.whl", hash = "sha256:9a5db42bc5dff014806c58a20b9eae7322a134abb6fce3c92c181bfb275ec5b3", size = 175315, upload-time = "2025-09-16T00:16:20.108Z" },
+]
+
+[[package]]
+name = "zipp"
+version = "3.23.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/30/21/093488dfc7cc8964ded15ab726fad40f25fd3d788fd741cc1c5a17d78ee8/zipp-3.23.1.tar.gz", hash = "sha256:32120e378d32cd9714ad503c1d024619063ec28aad2248dc6672ad13edfa5110", size = 25965, upload-time = "2026-04-13T23:21:46.6Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/08/8a/0861bec20485572fbddf3dfba2910e38fe249796cb73ecdeb74e07eeb8d3/zipp-3.23.1-py3-none-any.whl", hash = "sha256:0b3596c50a5c700c9cb40ba8d86d9f2cc4807e9bedb06bcdf7fac85633e444dc", size = 10378, upload-time = "2026-04-13T23:21:45.386Z" },
+]
diff --git a/docker/.env.example b/docker/.env.example
index 29741474fa..c708a40c15 100644
--- a/docker/.env.example
+++ b/docker/.env.example
@@ -1,1249 +1,163 @@
-# ------------------------------
-# Environment Variables for API service & worker
-# ------------------------------
+# ------------------------------------------------------------------
+# Essential defaults for Docker Compose deployments.
+# Only include variables required for services to start.
+#
+# For a default deployment, copy this file to .env and run:
+#   docker compose up -d
+#
+# Optional and provider-specific variables live under docker/envs/.
+# Copy an optional *.env.example file beside itself without the
+# .example suffix when you need those advanced settings.
+# Values in docker/.env take precedence over docker/envs/*.env files.
+# ------------------------------------------------------------------
 
-# ------------------------------
-# Common Variables
-# ------------------------------
-
-# The backend URL of the console API,
-# used to concatenate the authorization callback.
-# If empty, it is the same domain.
-# Example: https://api.console.dify.ai
+# Core service URLs
 CONSOLE_API_URL=
-
-# The front-end URL of the console web,
-# used to concatenate some front-end addresses and for CORS configuration use.
-# If empty, it is the same domain.
-# Example: https://console.dify.ai
 CONSOLE_WEB_URL=
-
-# Service API Url,
-# used to display Service API Base Url to the front-end.
-# If empty, it is the same domain.
-# Example: https://api.dify.ai
 SERVICE_API_URL=
-
-# Trigger external URL
-# used to display trigger endpoint API Base URL to the front-end.
-# Example: https://api.dify.ai
 TRIGGER_URL=http://localhost
-
-# WebApp API backend Url,
-# used to declare the back-end URL for the front-end API.
-# If empty, it is the same domain.
-# Example: https://api.app.dify.ai
 APP_API_URL=
-
-# WebApp Url,
-# used to display WebAPP API Base Url to the front-end.
-# If empty, it is the same domain.
-# Example: https://app.dify.ai
 APP_WEB_URL=
-
-# File preview or download Url prefix.
-# used to display File preview or download Url to the front-end or as Multi-model inputs;
-# Url is signed and has expiration time.
-# Setting FILES_URL is required for file processing plugins.
-#   - For https://example.com, use FILES_URL=https://example.com
-#   - For http://example.com, use FILES_URL=http://example.com
-#   Recommendation: use a dedicated domain (e.g., https://upload.example.com).
-#   Alternatively, use http://<your-ip>:5001 or http://api:5001,
-#   ensuring port 5001 is externally accessible (see docker-compose.yaml).
 FILES_URL=
-
-# INTERNAL_FILES_URL is used for plugin daemon communication within Docker network.
-# Set this to the internal Docker service URL for proper plugin file access.
-# Example: INTERNAL_FILES_URL=http://api:5001
 INTERNAL_FILES_URL=
+ENDPOINT_URL_TEMPLATE=http://localhost/e/{hook_id}
+NEXT_PUBLIC_SOCKET_URL=ws://localhost
 
-# Ensure UTF-8 encoding
+# Runtime and security
 LANG=C.UTF-8
 LC_ALL=C.UTF-8
 PYTHONIOENCODING=utf-8
-
-# Set UV cache directory to avoid permission issues with non-existent home directory
 UV_CACHE_DIR=/tmp/.uv-cache
-
-# ------------------------------
-# Server Configuration
-# ------------------------------
-
-# The log level for the application.
-# Supported values are `DEBUG`, `INFO`, `WARNING`, `ERROR`, `CRITICAL`
-LOG_LEVEL=INFO
-# Log output format: text or json
-LOG_OUTPUT_FORMAT=text
-# Log file path
-LOG_FILE=/app/logs/server.log
-# Log file max size, the unit is MB
-LOG_FILE_MAX_SIZE=20
-# Log file max backup count
-LOG_FILE_BACKUP_COUNT=5
-# Log dateformat
-LOG_DATEFORMAT=%Y-%m-%d %H:%M:%S
-# Log Timezone
-LOG_TZ=UTC
-
-# Debug mode, default is false.
-# It is recommended to turn on this configuration for local development
-# to prevent some problems caused by monkey patch.
-DEBUG=false
-
-# Flask debug mode, it can output trace information at the interface when turned on,
-# which is convenient for debugging.
-FLASK_DEBUG=false
-
-# Enable request logging, which will log the request and response information.
-# And the log level is DEBUG
-ENABLE_REQUEST_LOGGING=False
-
-# A secret key that is used for securely signing the session cookie
-# and encrypting sensitive information on the database.
-# You can generate a strong key using `openssl rand -base64 42`.
-SECRET_KEY=sk-9f73s3ljTXVcMT3Blb3ljTqtsKiGHXVcMT3BlbkFJLK7U
-
-# Password for admin user initialization.
-# If left unset, admin user will not be prompted for a password
-# when creating the initial admin account.
-# The length of the password cannot exceed 30 characters.
+# Leave empty to auto-generate a persistent key in the storage directory.
+SECRET_KEY=
 INIT_PASSWORD=
-
-# Deployment environment.
-# Supported values are `PRODUCTION`, `TESTING`. Default is `PRODUCTION`.
-# Testing environment. There will be a distinct color label on the front-end page,
-# indicating that this environment is a testing environment.
 DEPLOY_ENV=PRODUCTION
-
-# Whether to enable the version check policy.
-# If set to empty, https://updates.dify.ai will be called for version check.
 CHECK_UPDATE_URL=https://updates.dify.ai
-
-# Used to change the OpenAI base address, default is https://api.openai.com/v1.
-# When OpenAI cannot be accessed in China, replace it with a domestic mirror address,
-# or when a local model provides OpenAI compatible API, it can be replaced.
 OPENAI_API_BASE=https://api.openai.com/v1
-
-# When enabled, migrations will be executed prior to application startup
-# and the application will start after the migrations have completed.
 MIGRATION_ENABLED=true
-
-# File Access Time specifies a time interval in seconds for the file to be accessed.
-# The default value is 300 seconds.
 FILES_ACCESS_TIMEOUT=300
+# Remove `collaboration` from COMPOSE_PROFILES to stop the dedicated websocket service.
+ENABLE_COLLABORATION_MODE=true
 
-# Collaboration mode toggle
-# To open collaboration features, you also need to set SERVER_WORKER_CLASS=geventwebsocket.gunicorn.workers.GeventWebSocketWorker
-ENABLE_COLLABORATION_MODE=false
-
-# Access token expiration time in minutes
-ACCESS_TOKEN_EXPIRE_MINUTES=60
-
-# Refresh token expiration time in days
-REFRESH_TOKEN_EXPIRE_DAYS=30
-
-# The default number of active requests for the application, where 0 means unlimited, should be a non-negative integer.
-APP_DEFAULT_ACTIVE_REQUESTS=0
-# The maximum number of active requests for the application, where 0 means unlimited, should be a non-negative integer.
-APP_MAX_ACTIVE_REQUESTS=0
-APP_MAX_EXECUTION_TIME=1200
-
-# ------------------------------
-# Container Startup Related Configuration
-# Only effective when starting with docker image or docker-compose.
-# ------------------------------
-
-# API service binding address, default: 0.0.0.0, i.e., all addresses can be accessed.
+# Logging and server workers
+LOG_LEVEL=INFO
+LOG_OUTPUT_FORMAT=text
+LOG_FILE=/app/logs/server.log
+LOG_FILE_MAX_SIZE=20
+LOG_FILE_BACKUP_COUNT=5
+LOG_DATEFORMAT=%Y-%m-%d %H:%M:%S
+LOG_TZ=UTC
+DEBUG=false
+FLASK_DEBUG=false
+ENABLE_REQUEST_LOGGING=False
 DIFY_BIND_ADDRESS=0.0.0.0
-
-# API service binding port number, default 5001.
 DIFY_PORT=5001
-
-# The number of API server workers, i.e., the number of workers.
-# Formula: number of cpu cores x 2 + 1 for sync, 1 for Gevent
-# Reference: https://docs.gunicorn.org/en/stable/design.html#how-many-workers
 SERVER_WORKER_AMOUNT=1
-
-# Defaults to gevent. If using windows, it can be switched to sync or solo.
-#
-# Warning: Changing this parameter requires disabling patching for
-# psycopg2 and gRPC (see `gunicorn.conf.py` and `celery_entrypoint.py`).
-# Modifying it may also decrease throughput.
-#
-# It is strongly discouraged to change this parameter.
-# If enable collaboration mode, it must be set to geventwebsocket.gunicorn.workers.GeventWebSocketWorker
 SERVER_WORKER_CLASS=gevent
-
-# Default number of worker connections, the default is 10.
 SERVER_WORKER_CONNECTIONS=10
-
-# Similar to SERVER_WORKER_CLASS.
-# If using windows, it can be switched to sync or solo.
-#
-# Warning: Changing this parameter requires disabling patching for
-# psycopg2 and gRPC (see `gunicorn_conf.py` and `celery_entrypoint.py`).
-# Modifying it may also decrease throughput.
-#
-# It is strongly discouraged to change this parameter.
-CELERY_WORKER_CLASS=
-
-# Request handling timeout. The default is 200,
-# it is recommended to set it to 360 to support a longer sse connection time.
+API_WEBSOCKET_WORKER_CLASS=geventwebsocket.gunicorn.workers.GeventWebSocketWorker
+API_WEBSOCKET_WORKER_CONNECTIONS=1000
+API_WEBSOCKET_GUNICORN_TIMEOUT=360
 GUNICORN_TIMEOUT=360
-
-# The number of Celery workers. The default is 4 for development environments
-# to allow parallel processing of workflows, document indexing, and other async tasks.
-# Adjust based on your system resources and workload requirements.
+CELERY_WORKER_CLASS=
 CELERY_WORKER_AMOUNT=4
-
-# Flag indicating whether to enable autoscaling of Celery workers.
-#
-# Autoscaling is useful when tasks are CPU intensive and can be dynamically
-# allocated and deallocated based on the workload.
-#
-# When autoscaling is enabled, the maximum and minimum number of workers can
-# be specified. The autoscaling algorithm will dynamically adjust the number
-# of workers within the specified range.
-#
-# Default is false (i.e., autoscaling is disabled).
-#
-# Example:
-# CELERY_AUTO_SCALE=true
 CELERY_AUTO_SCALE=false
-
-# The maximum number of Celery workers that can be autoscaled.
-# This is optional and only used when autoscaling is enabled.
-# Default is not set.
 CELERY_MAX_WORKERS=
-
-# The minimum number of Celery workers that can be autoscaled.
-# This is optional and only used when autoscaling is enabled.
-# Default is not set.
 CELERY_MIN_WORKERS=
+COMPOSE_WORKER_HEALTHCHECK_DISABLED=true
+COMPOSE_WORKER_HEALTHCHECK_INTERVAL=30s
+COMPOSE_WORKER_HEALTHCHECK_TIMEOUT=30s
 
-# API Tool configuration
-API_TOOL_DEFAULT_CONNECT_TIMEOUT=10
-API_TOOL_DEFAULT_READ_TIMEOUT=60
-
-# -------------------------------
-# Datasource Configuration
-# --------------------------------
-ENABLE_WEBSITE_JINAREADER=true
-ENABLE_WEBSITE_FIRECRAWL=true
-ENABLE_WEBSITE_WATERCRAWL=true
-
-# Enable inline LaTeX rendering with single dollar signs ($...$) in the web frontend
-# Default is false for security reasons to prevent conflicts with regular text
-NEXT_PUBLIC_ENABLE_SINGLE_DOLLAR_LATEX=false
-
-# ------------------------------
-# Database Configuration
-# The database uses PostgreSQL or MySQL. OceanBase and seekdb are also supported. Please use the public schema.
-# It is consistent with the configuration in the database service below.
-# You can adjust the database configuration according to your needs.
-# ------------------------------
-
-# Database type, supported values are `postgresql`, `mysql`, `oceanbase`, `seekdb`
+# Database
 DB_TYPE=postgresql
-# For MySQL, only `root` user is supported for now
 DB_USERNAME=postgres
 DB_PASSWORD=difyai123456
 DB_HOST=db_postgres
 DB_PORT=5432
 DB_DATABASE=dify
-
-# The size of the database connection pool.
-# The default is 30 connections, which can be appropriately increased.
 SQLALCHEMY_POOL_SIZE=30
-# The default is 10 connections, which allows temporary overflow beyond the pool size.
 SQLALCHEMY_MAX_OVERFLOW=10
-# Database connection pool recycling time, the default is 3600 seconds.
 SQLALCHEMY_POOL_RECYCLE=3600
-# Whether to print SQL, default is false.
 SQLALCHEMY_ECHO=false
-# If True, will test connections for liveness upon each checkout
 SQLALCHEMY_POOL_PRE_PING=false
-# Whether to enable the Last in first out option or use default FIFO queue if is false
 SQLALCHEMY_POOL_USE_LIFO=false
-# Number of seconds to wait for a connection from the pool before raising a timeout error.
-# Default is 30
 SQLALCHEMY_POOL_TIMEOUT=30
-
-# Maximum number of connections to the database
-# Default is 100
-#
-# Reference: https://www.postgresql.org/docs/current/runtime-config-connection.html#GUC-MAX-CONNECTIONS
+SQLALCHEMY_POOL_RESET_ON_RETURN=rollback
+PGDATA=/var/lib/postgresql/data/pgdata
 POSTGRES_MAX_CONNECTIONS=200
-
-# Sets the amount of shared memory used for postgres's shared buffers.
-# Default is 128MB
-# Recommended value: 25% of available memory
-# Reference: https://www.postgresql.org/docs/current/runtime-config-resource.html#GUC-SHARED-BUFFERS
 POSTGRES_SHARED_BUFFERS=128MB
-
-# Sets the amount of memory used by each database worker for working space.
-# Default is 4MB
-#
-# Reference: https://www.postgresql.org/docs/current/runtime-config-resource.html#GUC-WORK-MEM
 POSTGRES_WORK_MEM=4MB
-
-# Sets the amount of memory reserved for maintenance activities.
-# Default is 64MB
-#
-# Reference: https://www.postgresql.org/docs/current/runtime-config-resource.html#GUC-MAINTENANCE-WORK-MEM
 POSTGRES_MAINTENANCE_WORK_MEM=64MB
-
-# Sets the planner's assumption about the effective cache size.
-# Default is 4096MB
-#
-# Reference: https://www.postgresql.org/docs/current/runtime-config-query.html#GUC-EFFECTIVE-CACHE-SIZE
 POSTGRES_EFFECTIVE_CACHE_SIZE=4096MB
-
-# Sets the maximum allowed duration of any statement before termination.
-# Default is 0 (no timeout).
-#
-# Reference: https://www.postgresql.org/docs/current/runtime-config-client.html#GUC-STATEMENT-TIMEOUT
-# A value of 0 prevents the server from timing out statements.
 POSTGRES_STATEMENT_TIMEOUT=0
-
-# Sets the maximum allowed duration of any idle in-transaction session before termination.
-# Default is 0 (no timeout).
-#
-# Reference: https://www.postgresql.org/docs/current/runtime-config-client.html#GUC-IDLE-IN-TRANSACTION-SESSION-TIMEOUT
-# A value of 0 prevents the server from terminating idle sessions.
 POSTGRES_IDLE_IN_TRANSACTION_SESSION_TIMEOUT=0
 
-# MySQL Performance Configuration
-# Maximum number of connections to MySQL
-#
-# Default is 1000
-MYSQL_MAX_CONNECTIONS=1000
-
-# InnoDB buffer pool size
-# Default is 512M
-# Recommended value: 70-80% of available memory for dedicated MySQL server
-# Reference: https://dev.mysql.com/doc/refman/8.0/en/innodb-parameters.html#sysvar_innodb_buffer_pool_size
-MYSQL_INNODB_BUFFER_POOL_SIZE=512M
-
-# InnoDB log file size
-# Default is 128M
-# Reference: https://dev.mysql.com/doc/refman/8.0/en/innodb-parameters.html#sysvar_innodb_log_file_size
-MYSQL_INNODB_LOG_FILE_SIZE=128M
-
-# InnoDB flush log at transaction commit
-# Default is 2 (flush to OS cache, sync every second)
-# Options: 0 (no flush), 1 (flush and sync), 2 (flush to OS cache)
-# Reference: https://dev.mysql.com/doc/refman/8.0/en/innodb-parameters.html#sysvar_innodb_flush_log_at_trx_commit
-MYSQL_INNODB_FLUSH_LOG_AT_TRX_COMMIT=2
-
-# ------------------------------
-# Redis Configuration
-# This Redis configuration is used for caching and for pub/sub during conversation.
-# ------------------------------
-
+# Redis and Celery
 REDIS_HOST=redis
 REDIS_PORT=6379
 REDIS_USERNAME=
 REDIS_PASSWORD=difyai123456
 REDIS_USE_SSL=false
-# SSL configuration for Redis (when REDIS_USE_SSL=true)
 REDIS_SSL_CERT_REQS=CERT_NONE
-# Options: CERT_NONE, CERT_OPTIONAL, CERT_REQUIRED
 REDIS_SSL_CA_CERTS=
-# Path to CA certificate file for SSL verification
 REDIS_SSL_CERTFILE=
-# Path to client certificate file for SSL authentication
 REDIS_SSL_KEYFILE=
-# Path to client private key file for SSL authentication
 REDIS_DB=0
-# Optional global prefix for Redis keys, topics, streams, and Celery Redis transport artifacts.
-# Leave empty to preserve current unprefixed behavior.
 REDIS_KEY_PREFIX=
-# Optional: limit total Redis connections used by API/Worker (unset for default)
-# Align with API's REDIS_MAX_CONNECTIONS in configs
 REDIS_MAX_CONNECTIONS=
-
-# Whether to use Redis Sentinel mode.
-# If set to true, the application will automatically discover and connect to the master node through Sentinel.
-REDIS_USE_SENTINEL=false
-
-# List of Redis Sentinel nodes. If Sentinel mode is enabled, provide at least one Sentinel IP and port.
-# Format: `<sentinel1_ip>:<sentinel1_port>,<sentinel2_ip>:<sentinel2_port>,<sentinel3_ip>:<sentinel3_port>`
-REDIS_SENTINELS=
-REDIS_SENTINEL_SERVICE_NAME=
-REDIS_SENTINEL_USERNAME=
-REDIS_SENTINEL_PASSWORD=
-REDIS_SENTINEL_SOCKET_TIMEOUT=0.1
-
-# List of Redis Cluster nodes. If Cluster mode is enabled, provide at least one Cluster IP and port.
-# Format: `<Cluster1_ip>:<Cluster1_port>,<Cluster2_ip>:<Cluster2_port>,<Cluster3_ip>:<Cluster3_port>`
-REDIS_USE_CLUSTERS=false
-REDIS_CLUSTERS=
-REDIS_CLUSTERS_PASSWORD=
-
-# Redis connection and retry configuration
-# max redis retry
 REDIS_RETRY_RETRIES=3
-# Base delay (in seconds) for exponential backoff on retries
 REDIS_RETRY_BACKOFF_BASE=1.0
-# Cap (in seconds) for exponential backoff on retries
 REDIS_RETRY_BACKOFF_CAP=10.0
-# Timeout (in seconds) for Redis socket operations
 REDIS_SOCKET_TIMEOUT=5.0
-# Timeout (in seconds) for establishing a Redis connection
 REDIS_SOCKET_CONNECT_TIMEOUT=5.0
-# Interval (in seconds) for Redis health checks
 REDIS_HEALTH_CHECK_INTERVAL=30
-
-# ------------------------------
-# Celery Configuration
-# ------------------------------
-
-# Use standalone redis as the broker, and redis db 1 for celery broker. (redis_username is usually set by default as empty)
-# Format as follows: `redis://<redis_username>:<redis_password>@<redis_host>:<redis_port>/<redis_database>`.
-# Example: redis://:difyai123456@redis:6379/1
-# If use Redis Sentinel, format as follows: `sentinel://<redis_username>:<redis_password>@<sentinel_host1>:<sentinel_port>/<redis_database>`
-# For high availability, you can configure multiple Sentinel nodes (if provided) separated by semicolons like below example:
-# Example: sentinel://:difyai123456@localhost:26379/1;sentinel://:difyai12345@localhost:26379/1;sentinel://:difyai12345@localhost:26379/1
 CELERY_BROKER_URL=redis://:difyai123456@redis:6379/1
 CELERY_BACKEND=redis
 BROKER_USE_SSL=false
-
-# If you are using Redis Sentinel for high availability, configure the following settings.
-CELERY_USE_SENTINEL=false
-CELERY_SENTINEL_MASTER_NAME=
-CELERY_SENTINEL_PASSWORD=
-CELERY_SENTINEL_SOCKET_TIMEOUT=0.1
-# e.g. {"tasks.add": {"rate_limit": "10/s"}}
 CELERY_TASK_ANNOTATIONS=null
+EVENT_BUS_REDIS_URL=
+EVENT_BUS_REDIS_CHANNEL_TYPE=pubsub
+EVENT_BUS_REDIS_USE_CLUSTERS=false
 
-# ------------------------------
-# CORS Configuration
-# Used to set the front-end cross-domain access policy.
-# ------------------------------
-
-# Specifies the allowed origins for cross-origin requests to the Web API,
-# e.g. https://dify.app or * for all origins.
+# Web and app limits
 WEB_API_CORS_ALLOW_ORIGINS=*
-
-# Specifies the allowed origins for cross-origin requests to the console API,
-# e.g. https://cloud.dify.ai or * for all origins.
 CONSOLE_CORS_ALLOW_ORIGINS=*
-# When the frontend and backend run on different subdomains, set COOKIE_DOMAIN to the site's top-level domain (e.g., `example.com`). Leading dots are optional.
 COOKIE_DOMAIN=
-# When the frontend and backend run on different subdomains, set NEXT_PUBLIC_COOKIE_DOMAIN=1.
 NEXT_PUBLIC_COOKIE_DOMAIN=
-# WebSocket server URL. 
-NEXT_PUBLIC_SOCKET_URL=ws://localhost
 NEXT_PUBLIC_BATCH_CONCURRENCY=5
+API_SENTRY_DSN=
+API_SENTRY_TRACES_SAMPLE_RATE=1.0
+API_SENTRY_PROFILES_SAMPLE_RATE=1.0
+WEB_SENTRY_DSN=
+AMPLITUDE_API_KEY=
+TEXT_GENERATION_TIMEOUT_MS=60000
+CSP_WHITELIST=
+ALLOW_EMBED=false
+ALLOW_INLINE_STYLES=false
+ALLOW_UNSAFE_DATA_SCHEME=false
+TOP_K_MAX_VALUE=10
+INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH=4000
+LOOP_NODE_MAX_COUNT=100
+MAX_TOOLS_NUM=10
+MAX_PARALLEL_LIMIT=10
+MAX_ITERATIONS_NUM=99
+MAX_TREE_DEPTH=50
+ENABLE_WEBSITE_JINAREADER=true
+ENABLE_WEBSITE_FIRECRAWL=true
+ENABLE_WEBSITE_WATERCRAWL=true
+NEXT_PUBLIC_ENABLE_SINGLE_DOLLAR_LATEX=false
+EXPERIMENTAL_ENABLE_VINEXT=false
 
-# ------------------------------
-# File Storage Configuration
-# ------------------------------
-
-# The type of storage to use for storing user files.
+# Storage and default vector store
 STORAGE_TYPE=opendal
-
-# Apache OpenDAL Configuration
-# The configuration for OpenDAL consists of the following format: OPENDAL_<SCHEME_NAME>_<CONFIG_NAME>.
-# You can find all the service configurations (CONFIG_NAME) in the repository at: https://github.com/apache/opendal/tree/main/core/src/services.
-# Dify will scan configurations starting with OPENDAL_<SCHEME_NAME> and automatically apply them.
-# The scheme name for the OpenDAL storage.
 OPENDAL_SCHEME=fs
-# Configurations for OpenDAL Local File System.
 OPENDAL_FS_ROOT=storage
-
-# ClickZetta Volume Configuration (for storage backend)
-# To use ClickZetta Volume as storage backend, set STORAGE_TYPE=clickzetta-volume
-# Note: ClickZetta Volume will reuse the existing CLICKZETTA_* connection parameters
-
-# Volume type selection (three types available):
-# - user: Personal/small team use, simple config, user-level permissions
-# - table: Enterprise multi-tenant, smart routing, table-level + user-level permissions
-# - external: Data lake integration, external storage connection, volume-level + storage-level permissions
-CLICKZETTA_VOLUME_TYPE=user
-
-# External Volume name (required only when TYPE=external)
-CLICKZETTA_VOLUME_NAME=
-
-# Table Volume table prefix (used only when TYPE=table)
-CLICKZETTA_VOLUME_TABLE_PREFIX=dataset_
-
-# Dify file directory prefix (isolates from other apps, recommended to keep default)
-CLICKZETTA_VOLUME_DIFY_PREFIX=dify_km
-
-# S3 Configuration
-#
-S3_ENDPOINT=
-S3_REGION=us-east-1
-S3_BUCKET_NAME=difyai
-S3_ACCESS_KEY=
-S3_SECRET_KEY=
-S3_ADDRESS_STYLE=auto
-# Whether to use AWS managed IAM roles for authenticating with the S3 service.
-# If set to false, the access key and secret key must be provided.
-S3_USE_AWS_MANAGED_IAM=false
-
-# Workflow run and Conversation archive storage (S3-compatible)
-ARCHIVE_STORAGE_ENABLED=false
-ARCHIVE_STORAGE_ENDPOINT=
-ARCHIVE_STORAGE_ARCHIVE_BUCKET=
-ARCHIVE_STORAGE_EXPORT_BUCKET=
-ARCHIVE_STORAGE_ACCESS_KEY=
-ARCHIVE_STORAGE_SECRET_KEY=
-ARCHIVE_STORAGE_REGION=auto
-
-# Azure Blob Configuration
-#
-AZURE_BLOB_ACCOUNT_NAME=difyai
-AZURE_BLOB_ACCOUNT_KEY=difyai
-AZURE_BLOB_CONTAINER_NAME=difyai-container
-AZURE_BLOB_ACCOUNT_URL=https://<your_account_name>.blob.core.windows.net
-
-# Google Storage Configuration
-#
-GOOGLE_STORAGE_BUCKET_NAME=your-bucket-name
-GOOGLE_STORAGE_SERVICE_ACCOUNT_JSON_BASE64=
-
-# The Alibaba Cloud OSS configurations,
-#
-ALIYUN_OSS_BUCKET_NAME=your-bucket-name
-ALIYUN_OSS_ACCESS_KEY=your-access-key
-ALIYUN_OSS_SECRET_KEY=your-secret-key
-ALIYUN_OSS_ENDPOINT=https://oss-ap-southeast-1-internal.aliyuncs.com
-ALIYUN_OSS_REGION=ap-southeast-1
-ALIYUN_OSS_AUTH_VERSION=v4
-# Don't start with '/'. OSS doesn't support leading slash in object names.
-ALIYUN_OSS_PATH=your-path
-# Optional CloudBox ID for Aliyun OSS, DO NOT enable it if you are not using CloudBox.
-#ALIYUN_CLOUDBOX_ID=your-cloudbox-id
-
-# Tencent COS Configuration
-#
-TENCENT_COS_BUCKET_NAME=your-bucket-name
-TENCENT_COS_SECRET_KEY=your-secret-key
-TENCENT_COS_SECRET_ID=your-secret-id
-TENCENT_COS_REGION=your-region
-TENCENT_COS_SCHEME=your-scheme
-TENCENT_COS_CUSTOM_DOMAIN=your-custom-domain
-
-# Oracle Storage Configuration
-#
-OCI_ENDPOINT=https://your-object-storage-namespace.compat.objectstorage.us-ashburn-1.oraclecloud.com
-OCI_BUCKET_NAME=your-bucket-name
-OCI_ACCESS_KEY=your-access-key
-OCI_SECRET_KEY=your-secret-key
-OCI_REGION=us-ashburn-1
-
-# Huawei OBS Configuration
-#
-HUAWEI_OBS_BUCKET_NAME=your-bucket-name
-HUAWEI_OBS_SECRET_KEY=your-secret-key
-HUAWEI_OBS_ACCESS_KEY=your-access-key
-HUAWEI_OBS_SERVER=your-server-url
-HUAWEI_OBS_PATH_STYLE=false
-
-# Volcengine TOS Configuration
-#
-VOLCENGINE_TOS_BUCKET_NAME=your-bucket-name
-VOLCENGINE_TOS_SECRET_KEY=your-secret-key
-VOLCENGINE_TOS_ACCESS_KEY=your-access-key
-VOLCENGINE_TOS_ENDPOINT=your-server-url
-VOLCENGINE_TOS_REGION=your-region
-
-# Baidu OBS Storage Configuration
-#
-BAIDU_OBS_BUCKET_NAME=your-bucket-name
-BAIDU_OBS_SECRET_KEY=your-secret-key
-BAIDU_OBS_ACCESS_KEY=your-access-key
-BAIDU_OBS_ENDPOINT=your-server-url
-
-# Supabase Storage Configuration
-#
-SUPABASE_BUCKET_NAME=your-bucket-name
-SUPABASE_API_KEY=your-access-key
-SUPABASE_URL=your-server-url
-
-# ------------------------------
-# Vector Database Configuration
-# ------------------------------
-
-# The type of vector store to use.
-# Supported values are `weaviate`, `oceanbase`, `seekdb`, `qdrant`, `milvus`, `myscale`, `relyt`, `pgvector`, `pgvecto-rs`, `chroma`, `opensearch`, `oracle`, `tencent`, `elasticsearch`, `elasticsearch-ja`, `analyticdb`, `couchbase`, `vikingdb`, `opengauss`, `tablestore`, `vastbase`, `tidb`, `tidb_on_qdrant`, `baidu`, `lindorm`, `huawei_cloud`, `upstash`, `matrixone`, `clickzetta`, `alibabacloud_mysql`, `iris`, `hologres`.
 VECTOR_STORE=weaviate
-# Prefix used to create collection name in vector database
 VECTOR_INDEX_NAME_PREFIX=Vector_index
-
-# The Weaviate endpoint URL. Only available when VECTOR_STORE is `weaviate`.
 WEAVIATE_ENDPOINT=http://weaviate:8080
 WEAVIATE_API_KEY=WVF5YThaHlkYwhGUSmCRgsX3tD5ngdN8pkih
 WEAVIATE_GRPC_ENDPOINT=grpc://weaviate:50051
 WEAVIATE_TOKENIZATION=word
-
-# For OceanBase metadata database configuration, available when `DB_TYPE` is `oceanbase`.
-# For OceanBase vector database configuration, available when `VECTOR_STORE` is `oceanbase`
-# If you want to use OceanBase as both vector database and metadata database, you need to set both `DB_TYPE` and `VECTOR_STORE` to `oceanbase`, and set Database Configuration is the same as the vector database.
-# seekdb is the lite version of OceanBase and shares the connection configuration with OceanBase.
-OCEANBASE_VECTOR_HOST=oceanbase
-OCEANBASE_VECTOR_PORT=2881
-OCEANBASE_VECTOR_USER=root@test
-OCEANBASE_VECTOR_PASSWORD=difyai123456
-OCEANBASE_VECTOR_DATABASE=test
-OCEANBASE_CLUSTER_NAME=difyai
-OCEANBASE_MEMORY_LIMIT=6G
-OCEANBASE_ENABLE_HYBRID_SEARCH=false
-# For OceanBase vector database, built-in fulltext parsers are `ngram`, `beng`, `space`, `ngram2`, `ik`
-# For OceanBase vector database, external fulltext parsers (require plugin installation) are `japanese_ftparser`, `thai_ftparser`
-OCEANBASE_FULLTEXT_PARSER=ik
-SEEKDB_MEMORY_LIMIT=2G
-
-# The Qdrant endpoint URL. Only available when VECTOR_STORE is `qdrant`.
-QDRANT_URL=http://qdrant:6333
-QDRANT_API_KEY=difyai123456
-QDRANT_CLIENT_TIMEOUT=20
-QDRANT_GRPC_ENABLED=false
-QDRANT_GRPC_PORT=6334
-QDRANT_REPLICATION_FACTOR=1
-
-# Milvus configuration. Only available when VECTOR_STORE is `milvus`.
-# The milvus uri.
-MILVUS_URI=http://host.docker.internal:19530
-MILVUS_DATABASE=
-MILVUS_TOKEN=
-MILVUS_USER=
-MILVUS_PASSWORD=
-MILVUS_ENABLE_HYBRID_SEARCH=False
-MILVUS_ANALYZER_PARAMS=
-
-# MyScale configuration, only available when VECTOR_STORE is `myscale`
-# For multi-language support, please set MYSCALE_FTS_PARAMS with referring to:
-# https://myscale.com/docs/en/text-search/#understanding-fts-index-parameters
-MYSCALE_HOST=myscale
-MYSCALE_PORT=8123
-MYSCALE_USER=default
-MYSCALE_PASSWORD=
-MYSCALE_DATABASE=dify
-MYSCALE_FTS_PARAMS=
-
-# Couchbase configurations, only available when VECTOR_STORE is `couchbase`
-# The connection string must include hostname defined in the docker-compose file (couchbase-server in this case)
-COUCHBASE_CONNECTION_STRING=couchbase://couchbase-server
-COUCHBASE_USER=Administrator
-COUCHBASE_PASSWORD=password
-COUCHBASE_BUCKET_NAME=Embeddings
-COUCHBASE_SCOPE_NAME=_default
-
-# Hologres configurations, only available when VECTOR_STORE is `hologres`
-# access_key_id is used as the PG username, access_key_secret is used as the PG password
-HOLOGRES_HOST=
-HOLOGRES_PORT=80
-HOLOGRES_DATABASE=
-HOLOGRES_ACCESS_KEY_ID=
-HOLOGRES_ACCESS_KEY_SECRET=
-HOLOGRES_SCHEMA=public
-HOLOGRES_TOKENIZER=jieba
-HOLOGRES_DISTANCE_METHOD=Cosine
-HOLOGRES_BASE_QUANTIZATION_TYPE=rabitq
-HOLOGRES_MAX_DEGREE=64
-HOLOGRES_EF_CONSTRUCTION=400
-
-# pgvector configurations, only available when VECTOR_STORE is `pgvector`
-PGVECTOR_HOST=pgvector
-PGVECTOR_PORT=5432
-PGVECTOR_USER=postgres
-PGVECTOR_PASSWORD=difyai123456
-PGVECTOR_DATABASE=dify
-PGVECTOR_MIN_CONNECTION=1
-PGVECTOR_MAX_CONNECTION=5
-PGVECTOR_PG_BIGM=false
-PGVECTOR_PG_BIGM_VERSION=1.2-20240606
-
-# vastbase configurations, only available when VECTOR_STORE is `vastbase`
-VASTBASE_HOST=vastbase
-VASTBASE_PORT=5432
-VASTBASE_USER=dify
-VASTBASE_PASSWORD=Difyai123456
-VASTBASE_DATABASE=dify
-VASTBASE_MIN_CONNECTION=1
-VASTBASE_MAX_CONNECTION=5
-
-# pgvecto-rs configurations, only available when VECTOR_STORE is `pgvecto-rs`
-PGVECTO_RS_HOST=pgvecto-rs
-PGVECTO_RS_PORT=5432
-PGVECTO_RS_USER=postgres
-PGVECTO_RS_PASSWORD=difyai123456
-PGVECTO_RS_DATABASE=dify
-
-# analyticdb configurations, only available when VECTOR_STORE is `analyticdb`
-ANALYTICDB_KEY_ID=your-ak
-ANALYTICDB_KEY_SECRET=your-sk
-ANALYTICDB_REGION_ID=cn-hangzhou
-ANALYTICDB_INSTANCE_ID=gp-ab123456
-ANALYTICDB_ACCOUNT=testaccount
-ANALYTICDB_PASSWORD=testpassword
-ANALYTICDB_NAMESPACE=dify
-ANALYTICDB_NAMESPACE_PASSWORD=difypassword
-ANALYTICDB_HOST=gp-test.aliyuncs.com
-ANALYTICDB_PORT=5432
-ANALYTICDB_MIN_CONNECTION=1
-ANALYTICDB_MAX_CONNECTION=5
-
-# TiDB vector configurations, only available when VECTOR_STORE is `tidb_vector`
-TIDB_VECTOR_HOST=tidb
-TIDB_VECTOR_PORT=4000
-TIDB_VECTOR_USER=
-TIDB_VECTOR_PASSWORD=
-TIDB_VECTOR_DATABASE=dify
-
-# Matrixone vector configurations.
-MATRIXONE_HOST=matrixone
-MATRIXONE_PORT=6001
-MATRIXONE_USER=dump
-MATRIXONE_PASSWORD=111
-MATRIXONE_DATABASE=dify
-
-# Tidb on qdrant configuration, only available when VECTOR_STORE is `tidb_on_qdrant`
-TIDB_ON_QDRANT_URL=http://127.0.0.1
-TIDB_ON_QDRANT_API_KEY=dify
-TIDB_ON_QDRANT_CLIENT_TIMEOUT=20
-TIDB_ON_QDRANT_GRPC_ENABLED=false
-TIDB_ON_QDRANT_GRPC_PORT=6334
-TIDB_PUBLIC_KEY=dify
-TIDB_PRIVATE_KEY=dify
-TIDB_API_URL=http://127.0.0.1
-TIDB_IAM_API_URL=http://127.0.0.1
-TIDB_REGION=regions/aws-us-east-1
-TIDB_PROJECT_ID=dify
-TIDB_SPEND_LIMIT=100
-
-# Chroma configuration, only available when VECTOR_STORE is `chroma`
-CHROMA_HOST=127.0.0.1
-CHROMA_PORT=8000
-CHROMA_TENANT=default_tenant
-CHROMA_DATABASE=default_database
-CHROMA_AUTH_PROVIDER=chromadb.auth.token_authn.TokenAuthClientProvider
-CHROMA_AUTH_CREDENTIALS=
-
-# Oracle configuration, only available when VECTOR_STORE is `oracle`
-ORACLE_USER=dify
-ORACLE_PASSWORD=dify
-ORACLE_DSN=oracle:1521/FREEPDB1
-ORACLE_CONFIG_DIR=/app/api/storage/wallet
-ORACLE_WALLET_LOCATION=/app/api/storage/wallet
-ORACLE_WALLET_PASSWORD=dify
-ORACLE_IS_AUTONOMOUS=false
-
-# AlibabaCloud MySQL configuration, only available when VECTOR_STORE is `alibabcloud_mysql`
-ALIBABACLOUD_MYSQL_HOST=127.0.0.1
-ALIBABACLOUD_MYSQL_PORT=3306
-ALIBABACLOUD_MYSQL_USER=root
-ALIBABACLOUD_MYSQL_PASSWORD=difyai123456
-ALIBABACLOUD_MYSQL_DATABASE=dify
-ALIBABACLOUD_MYSQL_MAX_CONNECTION=5
-ALIBABACLOUD_MYSQL_HNSW_M=6
-
-# relyt configurations, only available when VECTOR_STORE is `relyt`
-RELYT_HOST=db
-RELYT_PORT=5432
-RELYT_USER=postgres
-RELYT_PASSWORD=difyai123456
-RELYT_DATABASE=postgres
-
-# open search configuration, only available when VECTOR_STORE is `opensearch`
-OPENSEARCH_HOST=opensearch
-OPENSEARCH_PORT=9200
-OPENSEARCH_SECURE=true
-OPENSEARCH_VERIFY_CERTS=true
-OPENSEARCH_AUTH_METHOD=basic
-OPENSEARCH_USER=admin
-OPENSEARCH_PASSWORD=admin
-# If using AWS managed IAM, e.g. Managed Cluster or OpenSearch Serverless
-OPENSEARCH_AWS_REGION=ap-southeast-1
-OPENSEARCH_AWS_SERVICE=aoss
-
-# tencent vector configurations, only available when VECTOR_STORE is `tencent`
-TENCENT_VECTOR_DB_URL=http://127.0.0.1
-TENCENT_VECTOR_DB_API_KEY=dify
-TENCENT_VECTOR_DB_TIMEOUT=30
-TENCENT_VECTOR_DB_USERNAME=dify
-TENCENT_VECTOR_DB_DATABASE=dify
-TENCENT_VECTOR_DB_SHARD=1
-TENCENT_VECTOR_DB_REPLICAS=2
-TENCENT_VECTOR_DB_ENABLE_HYBRID_SEARCH=false
-
-# ElasticSearch configuration, only available when VECTOR_STORE is `elasticsearch`
-ELASTICSEARCH_HOST=0.0.0.0
-ELASTICSEARCH_PORT=9200
-ELASTICSEARCH_USERNAME=elastic
-ELASTICSEARCH_PASSWORD=elastic
-KIBANA_PORT=5601
-
-# Using ElasticSearch Cloud Serverless, or not.
-ELASTICSEARCH_USE_CLOUD=false
-ELASTICSEARCH_CLOUD_URL=YOUR-ELASTICSEARCH_CLOUD_URL
-ELASTICSEARCH_API_KEY=YOUR-ELASTICSEARCH_API_KEY
-
-ELASTICSEARCH_VERIFY_CERTS=False
-ELASTICSEARCH_CA_CERTS=
-ELASTICSEARCH_REQUEST_TIMEOUT=100000
-ELASTICSEARCH_RETRY_ON_TIMEOUT=True
-ELASTICSEARCH_MAX_RETRIES=10
-
-# baidu vector configurations, only available when VECTOR_STORE is `baidu`
-BAIDU_VECTOR_DB_ENDPOINT=http://127.0.0.1:5287
-BAIDU_VECTOR_DB_CONNECTION_TIMEOUT_MS=30000
-BAIDU_VECTOR_DB_ACCOUNT=root
-BAIDU_VECTOR_DB_API_KEY=dify
-BAIDU_VECTOR_DB_DATABASE=dify
-BAIDU_VECTOR_DB_SHARD=1
-BAIDU_VECTOR_DB_REPLICAS=3
-BAIDU_VECTOR_DB_INVERTED_INDEX_ANALYZER=DEFAULT_ANALYZER
-BAIDU_VECTOR_DB_INVERTED_INDEX_PARSER_MODE=COARSE_MODE
-BAIDU_VECTOR_DB_AUTO_BUILD_ROW_COUNT_INCREMENT=500
-BAIDU_VECTOR_DB_AUTO_BUILD_ROW_COUNT_INCREMENT_RATIO=0.05
-BAIDU_VECTOR_DB_REBUILD_INDEX_TIMEOUT_IN_SECONDS=300
-
-# VikingDB configurations, only available when VECTOR_STORE is `vikingdb`
-VIKINGDB_ACCESS_KEY=your-ak
-VIKINGDB_SECRET_KEY=your-sk
-VIKINGDB_REGION=cn-shanghai
-VIKINGDB_HOST=api-vikingdb.xxx.volces.com
-VIKINGDB_SCHEMA=http
-VIKINGDB_CONNECTION_TIMEOUT=30
-VIKINGDB_SOCKET_TIMEOUT=30
-
-# Lindorm configuration, only available when VECTOR_STORE is `lindorm`
-LINDORM_URL=http://localhost:30070
-LINDORM_USERNAME=admin
-LINDORM_PASSWORD=admin
-LINDORM_USING_UGC=True
-LINDORM_QUERY_TIMEOUT=1
-
-# opengauss configurations, only available when VECTOR_STORE is `opengauss`
-OPENGAUSS_HOST=opengauss
-OPENGAUSS_PORT=6600
-OPENGAUSS_USER=postgres
-OPENGAUSS_PASSWORD=Dify@123
-OPENGAUSS_DATABASE=dify
-OPENGAUSS_MIN_CONNECTION=1
-OPENGAUSS_MAX_CONNECTION=5
-OPENGAUSS_ENABLE_PQ=false
-
-# huawei cloud search service vector configurations, only available when VECTOR_STORE is `huawei_cloud`
-HUAWEI_CLOUD_HOSTS=https://127.0.0.1:9200
-HUAWEI_CLOUD_USER=admin
-HUAWEI_CLOUD_PASSWORD=admin
-
-# Upstash Vector configuration, only available when VECTOR_STORE is `upstash`
-UPSTASH_VECTOR_URL=https://xxx-vector.upstash.io
-UPSTASH_VECTOR_TOKEN=dify
-
-# TableStore Vector configuration
-# (only used when VECTOR_STORE is tablestore)
-TABLESTORE_ENDPOINT=https://instance-name.cn-hangzhou.ots.aliyuncs.com
-TABLESTORE_INSTANCE_NAME=instance-name
-TABLESTORE_ACCESS_KEY_ID=xxx
-TABLESTORE_ACCESS_KEY_SECRET=xxx
-TABLESTORE_NORMALIZE_FULLTEXT_BM25_SCORE=false
-
-# Clickzetta configuration, only available when VECTOR_STORE is `clickzetta`
-CLICKZETTA_USERNAME=
-CLICKZETTA_PASSWORD=
-CLICKZETTA_INSTANCE=
-CLICKZETTA_SERVICE=api.clickzetta.com
-CLICKZETTA_WORKSPACE=quick_start
-CLICKZETTA_VCLUSTER=default_ap
-CLICKZETTA_SCHEMA=dify
-CLICKZETTA_BATCH_SIZE=100
-CLICKZETTA_ENABLE_INVERTED_INDEX=true
-CLICKZETTA_ANALYZER_TYPE=chinese
-CLICKZETTA_ANALYZER_MODE=smart
-CLICKZETTA_VECTOR_DISTANCE_FUNCTION=cosine_distance
-
-# InterSystems IRIS configuration, only available when VECTOR_STORE is `iris`
-IRIS_HOST=iris
-IRIS_SUPER_SERVER_PORT=1972
-IRIS_WEB_SERVER_PORT=52773
-IRIS_USER=_SYSTEM
-IRIS_PASSWORD=Dify@1234
-IRIS_DATABASE=USER
-IRIS_SCHEMA=dify
-IRIS_CONNECTION_URL=
-IRIS_MIN_CONNECTION=1
-IRIS_MAX_CONNECTION=3
-IRIS_TEXT_INDEX=true
-IRIS_TEXT_INDEX_LANGUAGE=en
-IRIS_TIMEZONE=UTC
-
-# ------------------------------
-# Knowledge Configuration
-# ------------------------------
-
-# Upload file size limit, default 15M.
-UPLOAD_FILE_SIZE_LIMIT=15
-
-# The maximum number of files that can be uploaded at a time, default 5.
-UPLOAD_FILE_BATCH_LIMIT=5
-
-# Comma-separated list of file extensions blocked from upload for security reasons.
-# Extensions should be lowercase without dots (e.g., exe,bat,sh,dll).
-# Empty by default to allow all file types.
-# Recommended: exe,bat,cmd,com,scr,vbs,ps1,msi,dll
-UPLOAD_FILE_EXTENSION_BLACKLIST=
-
-# Maximum number of files allowed in a single chunk attachment, default 10.
-SINGLE_CHUNK_ATTACHMENT_LIMIT=10
-
-# Maximum number of files allowed in a image batch upload operation
-IMAGE_FILE_BATCH_LIMIT=10
-
-# Maximum allowed image file size for attachments in megabytes, default 2.
-ATTACHMENT_IMAGE_FILE_SIZE_LIMIT=2
-
-# Timeout for downloading image attachments in seconds, default 60.
-ATTACHMENT_IMAGE_DOWNLOAD_TIMEOUT=60
-
-
-# ETL type, support: `dify`, `Unstructured`
-# `dify` Dify's proprietary file extraction scheme
-# `Unstructured` Unstructured.io file extraction scheme
-ETL_TYPE=dify
-
-# Unstructured API path and API key, needs to be configured when ETL_TYPE is Unstructured
-# Or using Unstructured for document extractor node for pptx.
-# For example: http://unstructured:8000/general/v0/general
-UNSTRUCTURED_API_URL=
-UNSTRUCTURED_API_KEY=
-SCARF_NO_ANALYTICS=true
-
-# ------------------------------
-# Model Configuration
-# ------------------------------
-
-# The maximum number of tokens allowed for prompt generation.
-# This setting controls the upper limit of tokens that can be used by the LLM
-# when generating a prompt in the prompt generation tool.
-# Default: 512 tokens.
-PROMPT_GENERATION_MAX_TOKENS=512
-
-# The maximum number of tokens allowed for code generation.
-# This setting controls the upper limit of tokens that can be used by the LLM
-# when generating code in the code generation tool.
-# Default: 1024 tokens.
-CODE_GENERATION_MAX_TOKENS=1024
-
-# Enable or disable plugin based token counting. If disabled, token counting will return 0.
-# This can improve performance by skipping token counting operations.
-# Default: false (disabled).
-PLUGIN_BASED_TOKEN_COUNTING_ENABLED=false
-
-# ------------------------------
-# Multi-modal Configuration
-# ------------------------------
-
-# The format of the image/video/audio/document sent when the multi-modal model is input,
-# the default is base64, optional url.
-# The delay of the call in url mode will be lower than that in base64 mode.
-# It is generally recommended to use the more compatible base64 mode.
-# If configured as url, you need to configure FILES_URL as an externally accessible address so that the multi-modal model can access the image/video/audio/document.
-MULTIMODAL_SEND_FORMAT=base64
-# Upload image file size limit, default 10M.
-UPLOAD_IMAGE_FILE_SIZE_LIMIT=10
-# Upload video file size limit, default 100M.
-UPLOAD_VIDEO_FILE_SIZE_LIMIT=100
-# Upload audio file size limit, default 50M.
-UPLOAD_AUDIO_FILE_SIZE_LIMIT=50
-
-# ------------------------------
-# Sentry Configuration
-# Used for application monitoring and error log tracking.
-# ------------------------------
-SENTRY_DSN=
-
-# API Service Sentry DSN address, default is empty, when empty,
-# all monitoring information is not reported to Sentry.
-# If not set, Sentry error reporting will be disabled.
-API_SENTRY_DSN=
-# API Service The reporting ratio of Sentry events, if it is 0.01, it is 1%.
-API_SENTRY_TRACES_SAMPLE_RATE=1.0
-# API Service The reporting ratio of Sentry profiles, if it is 0.01, it is 1%.
-API_SENTRY_PROFILES_SAMPLE_RATE=1.0
-
-# Web Service Sentry DSN address, default is empty, when empty,
-# all monitoring information is not reported to Sentry.
-# If not set, Sentry error reporting will be disabled.
-WEB_SENTRY_DSN=
-
-# Plugin_daemon Service Sentry DSN address, default is empty, when empty,
-# all monitoring information is not reported to Sentry.
-# If not set, Sentry error reporting will be disabled.
-PLUGIN_SENTRY_ENABLED=false
-PLUGIN_SENTRY_DSN=
-
-# ------------------------------
-# Notion Integration Configuration
-# Variables can be obtained by applying for Notion integration: https://www.notion.so/my-integrations
-# ------------------------------
-
-# Configure as "public" or "internal".
-# Since Notion's OAuth redirect URL only supports HTTPS,
-# if deploying locally, please use Notion's internal integration.
-NOTION_INTEGRATION_TYPE=public
-# Notion OAuth client secret (used for public integration type)
-NOTION_CLIENT_SECRET=
-# Notion OAuth client id (used for public integration type)
-NOTION_CLIENT_ID=
-# Notion internal integration secret.
-# If the value of NOTION_INTEGRATION_TYPE is "internal",
-# you need to configure this variable.
-NOTION_INTERNAL_SECRET=
-
-# ------------------------------
-# Mail related configuration
-# ------------------------------
-
-# Mail type, support: resend, smtp, sendgrid
-MAIL_TYPE=resend
-
-# Default send from email address, if not specified
-# If using SendGrid, use the 'from' field for authentication if necessary.
-MAIL_DEFAULT_SEND_FROM=
-
-# API-Key for the Resend email provider, used when MAIL_TYPE is `resend`.
-RESEND_API_URL=https://api.resend.com
-RESEND_API_KEY=your-resend-api-key
-
-
-# SMTP server configuration, used when MAIL_TYPE is `smtp`
-SMTP_SERVER=
-SMTP_PORT=465
-SMTP_USERNAME=
-SMTP_PASSWORD=
-SMTP_USE_TLS=true
-SMTP_OPPORTUNISTIC_TLS=false
-# Optional: override the local hostname used for SMTP HELO/EHLO
-SMTP_LOCAL_HOSTNAME=
-
-# Sendgid configuration
-SENDGRID_API_KEY=
-
-# ------------------------------
-# Others Configuration
-# ------------------------------
-
-# Maximum length of segmentation tokens for indexing
-INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH=4000
-
-# Member invitation link valid time (hours),
-# Default: 72.
-INVITE_EXPIRY_HOURS=72
-
-# Reset password token valid time (minutes),
-RESET_PASSWORD_TOKEN_EXPIRY_MINUTES=5
-EMAIL_REGISTER_TOKEN_EXPIRY_MINUTES=5
-CHANGE_EMAIL_TOKEN_EXPIRY_MINUTES=5
-OWNER_TRANSFER_TOKEN_EXPIRY_MINUTES=5
-
-# The sandbox service endpoint.
-CODE_EXECUTION_ENDPOINT=http://sandbox:8194
-CODE_EXECUTION_API_KEY=dify-sandbox
-CODE_EXECUTION_SSL_VERIFY=True
-CODE_EXECUTION_POOL_MAX_CONNECTIONS=100
-CODE_EXECUTION_POOL_MAX_KEEPALIVE_CONNECTIONS=20
-CODE_EXECUTION_POOL_KEEPALIVE_EXPIRY=5.0
-CODE_MAX_NUMBER=9223372036854775807
-CODE_MIN_NUMBER=-9223372036854775808
-CODE_MAX_DEPTH=5
-CODE_MAX_PRECISION=20
-CODE_MAX_STRING_LENGTH=400000
-CODE_MAX_STRING_ARRAY_LENGTH=30
-CODE_MAX_OBJECT_ARRAY_LENGTH=30
-CODE_MAX_NUMBER_ARRAY_LENGTH=1000
-CODE_EXECUTION_CONNECT_TIMEOUT=10
-CODE_EXECUTION_READ_TIMEOUT=60
-CODE_EXECUTION_WRITE_TIMEOUT=10
-TEMPLATE_TRANSFORM_MAX_LENGTH=400000
-
-# Workflow runtime configuration
-WORKFLOW_MAX_EXECUTION_STEPS=500
-WORKFLOW_MAX_EXECUTION_TIME=1200
-WORKFLOW_CALL_MAX_DEPTH=5
-MAX_VARIABLE_SIZE=204800
-WORKFLOW_FILE_UPLOAD_LIMIT=10
-
-# GraphEngine Worker Pool Configuration
-# Minimum number of workers per GraphEngine instance (default: 1)
-GRAPH_ENGINE_MIN_WORKERS=1
-# Maximum number of workers per GraphEngine instance (default: 10)
-GRAPH_ENGINE_MAX_WORKERS=10
-# Queue depth threshold that triggers worker scale up (default: 3)
-GRAPH_ENGINE_SCALE_UP_THRESHOLD=3
-# Seconds of idle time before scaling down workers (default: 5.0)
-GRAPH_ENGINE_SCALE_DOWN_IDLE_TIME=5.0
-
-# Workflow storage configuration
-# Options: rdbms, hybrid
-# rdbms: Use only the relational database (default)
-# hybrid: Save new data to object storage, read from both object storage and RDBMS
-WORKFLOW_NODE_EXECUTION_STORAGE=rdbms
-
-# Repository configuration
-# Core workflow execution repository implementation
-# Options:
-#   - core.repositories.sqlalchemy_workflow_execution_repository.SQLAlchemyWorkflowExecutionRepository (default)
-#   - core.repositories.celery_workflow_execution_repository.CeleryWorkflowExecutionRepository
-#   - extensions.logstore.repositories.logstore_workflow_execution_repository.LogstoreWorkflowExecutionRepository
-CORE_WORKFLOW_EXECUTION_REPOSITORY=core.repositories.sqlalchemy_workflow_execution_repository.SQLAlchemyWorkflowExecutionRepository
-
-# Core workflow node execution repository implementation
-# Options:
-#   - core.repositories.sqlalchemy_workflow_node_execution_repository.SQLAlchemyWorkflowNodeExecutionRepository (default)
-#   - core.repositories.celery_workflow_node_execution_repository.CeleryWorkflowNodeExecutionRepository
-#   - extensions.logstore.repositories.logstore_workflow_node_execution_repository.LogstoreWorkflowNodeExecutionRepository
-CORE_WORKFLOW_NODE_EXECUTION_REPOSITORY=core.repositories.sqlalchemy_workflow_node_execution_repository.SQLAlchemyWorkflowNodeExecutionRepository
-
-# API workflow run repository implementation
-# Options:
-#   - repositories.sqlalchemy_api_workflow_run_repository.DifyAPISQLAlchemyWorkflowRunRepository (default)
-#   - extensions.logstore.repositories.logstore_api_workflow_run_repository.LogstoreAPIWorkflowRunRepository
-API_WORKFLOW_RUN_REPOSITORY=repositories.sqlalchemy_api_workflow_run_repository.DifyAPISQLAlchemyWorkflowRunRepository
-
-# API workflow node execution repository implementation
-# Options:
-#   - repositories.sqlalchemy_api_workflow_node_execution_repository.DifyAPISQLAlchemyWorkflowNodeExecutionRepository (default)
-#   - extensions.logstore.repositories.logstore_api_workflow_node_execution_repository.LogstoreAPIWorkflowNodeExecutionRepository
-API_WORKFLOW_NODE_EXECUTION_REPOSITORY=repositories.sqlalchemy_api_workflow_node_execution_repository.DifyAPISQLAlchemyWorkflowNodeExecutionRepository
-
-# Workflow log cleanup configuration
-# Enable automatic cleanup of workflow run logs to manage database size
-WORKFLOW_LOG_CLEANUP_ENABLED=false
-# Number of days to retain workflow run logs (default: 30 days)
-WORKFLOW_LOG_RETENTION_DAYS=30
-# Batch size for workflow log cleanup operations (default: 100)
-WORKFLOW_LOG_CLEANUP_BATCH_SIZE=100
-# Comma-separated list of workflow IDs to clean logs for
-WORKFLOW_LOG_CLEANUP_SPECIFIC_WORKFLOW_IDS=
-
-# Aliyun SLS Logstore Configuration
-# Aliyun Access Key ID
-ALIYUN_SLS_ACCESS_KEY_ID=
-# Aliyun Access Key Secret
-ALIYUN_SLS_ACCESS_KEY_SECRET=
-# Aliyun SLS Endpoint (e.g., cn-hangzhou.log.aliyuncs.com)
-ALIYUN_SLS_ENDPOINT=
-# Aliyun SLS Region (e.g., cn-hangzhou)
-ALIYUN_SLS_REGION=
-# Aliyun SLS Project Name
-ALIYUN_SLS_PROJECT_NAME=
-# Number of days to retain workflow run logs (default: 365 days, 3650 for permanent storage)
-ALIYUN_SLS_LOGSTORE_TTL=365
-# Enable dual-write to both SLS LogStore and SQL database (default: false)
-LOGSTORE_DUAL_WRITE_ENABLED=false
-# Enable dual-read fallback to SQL database when LogStore returns no results (default: true)
-# Useful for migration scenarios where historical data exists only in SQL database
-LOGSTORE_DUAL_READ_ENABLED=true
-# Control flag for whether to write the `graph` field to LogStore.
-# If LOGSTORE_ENABLE_PUT_GRAPH_FIELD is "true", write the full `graph` field;
-# otherwise write an empty {} instead. Defaults to writing the `graph` field.
-LOGSTORE_ENABLE_PUT_GRAPH_FIELD=true
-
-# HTTP request node in workflow configuration
-HTTP_REQUEST_NODE_MAX_BINARY_SIZE=10485760
-HTTP_REQUEST_NODE_MAX_TEXT_SIZE=1048576
-HTTP_REQUEST_NODE_SSL_VERIFY=True
-
-# HTTP request node timeout configuration
-# Maximum timeout values (in seconds) that users can set in HTTP request nodes
-# - Connect timeout: Time to wait for establishing connection (default: 10s)
-# - Read timeout: Time to wait for receiving response data (default: 600s, 10 minutes)
-# - Write timeout: Time to wait for sending request data (default: 600s, 10 minutes)
-HTTP_REQUEST_MAX_CONNECT_TIMEOUT=10
-HTTP_REQUEST_MAX_READ_TIMEOUT=600
-HTTP_REQUEST_MAX_WRITE_TIMEOUT=600
-
-# Base64 encoded CA certificate data for custom certificate verification (PEM format, optional)
-# HTTP_REQUEST_NODE_SSL_CERT_DATA=LS0tLS1CRUdJTi...
-# Base64 encoded client certificate data for mutual TLS authentication (PEM format, optional)
-# HTTP_REQUEST_NODE_SSL_CLIENT_CERT_DATA=LS0tLS1CRUdJTi...
-# Base64 encoded client private key data for mutual TLS authentication (PEM format, optional)
-# HTTP_REQUEST_NODE_SSL_CLIENT_KEY_DATA=LS0tLS1CRUdJTi...
-
-# Webhook request configuration
-WEBHOOK_REQUEST_BODY_MAX_SIZE=10485760
-
-# Respect X-* headers to redirect clients
-RESPECT_XFORWARD_HEADERS_ENABLED=false
-
-# SSRF Proxy server HTTP URL
-SSRF_PROXY_HTTP_URL=http://ssrf_proxy:3128
-# SSRF Proxy server HTTPS URL
-SSRF_PROXY_HTTPS_URL=http://ssrf_proxy:3128
-
-# Maximum loop count in the workflow
-LOOP_NODE_MAX_COUNT=100
-
-# The maximum number of tools that can be used in the agent.
-MAX_TOOLS_NUM=10
-
-# Maximum number of Parallelism branches in the workflow
-MAX_PARALLEL_LIMIT=10
-
-# The maximum number of iterations for agent setting
-MAX_ITERATIONS_NUM=99
-
-# ------------------------------
-# Environment Variables for web Service
-# ------------------------------
-
-# The timeout for the text generation in millisecond
-TEXT_GENERATION_TIMEOUT_MS=60000
-
-# Enable the experimental vinext runtime shipped in the image.
-EXPERIMENTAL_ENABLE_VINEXT=false
-
-# Allow inline style attributes in Markdown rendering.
-# Enable this if your workflows use Jinja2 templates with styled HTML.
-# Only recommended for self-hosted deployments with trusted content.
-ALLOW_INLINE_STYLES=false
-
-# Allow rendering unsafe URLs which have "data:" scheme.
-ALLOW_UNSAFE_DATA_SCHEME=false
-
-# Maximum number of tree depth in the workflow
-MAX_TREE_DEPTH=50
-
-# ------------------------------
-# Environment Variables for database Service
-# ------------------------------
-# Postgres data directory
-PGDATA=/var/lib/postgresql/data/pgdata
-
-# MySQL Default Configuration
-MYSQL_HOST_VOLUME=./volumes/mysql/data
-
-# ------------------------------
-# Environment Variables for sandbox Service
-# ------------------------------
-
-# The API key for the sandbox service
-SANDBOX_API_KEY=dify-sandbox
-# The mode in which the Gin framework runs
-SANDBOX_GIN_MODE=release
-# The timeout for the worker in seconds
-SANDBOX_WORKER_TIMEOUT=15
-# Enable network for the sandbox service
-SANDBOX_ENABLE_NETWORK=true
-# HTTP proxy URL for SSRF protection
-SANDBOX_HTTP_PROXY=http://ssrf_proxy:3128
-# HTTPS proxy URL for SSRF protection
-SANDBOX_HTTPS_PROXY=http://ssrf_proxy:3128
-# The port on which the sandbox service runs
-SANDBOX_PORT=8194
-
-# ------------------------------
-# Environment Variables for weaviate Service
-# (only used when VECTOR_STORE is weaviate)
-# ------------------------------
 WEAVIATE_PERSISTENCE_DATA_PATH=/var/lib/weaviate
 WEAVIATE_QUERY_DEFAULTS_LIMIT=25
 WEAVIATE_AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED=true
@@ -1259,118 +173,26 @@ WEAVIATE_ENABLE_TOKENIZER_GSE=false
 WEAVIATE_ENABLE_TOKENIZER_KAGOME_JA=false
 WEAVIATE_ENABLE_TOKENIZER_KAGOME_KR=false
 
-# ------------------------------
-# Environment Variables for Chroma
-# (only used when VECTOR_STORE is chroma)
-# ------------------------------
-
-# Authentication credentials for Chroma server
-CHROMA_SERVER_AUTHN_CREDENTIALS=difyai123456
-# Authentication provider for Chroma server
-CHROMA_SERVER_AUTHN_PROVIDER=chromadb.auth.token_authn.TokenAuthenticationServerProvider
-# Persistence setting for Chroma server
-CHROMA_IS_PERSISTENT=TRUE
-
-# ------------------------------
-# Environment Variables for Oracle Service
-# (only used when VECTOR_STORE is oracle)
-# ------------------------------
-ORACLE_PWD=Dify123456
-ORACLE_CHARACTERSET=AL32UTF8
-
-# ------------------------------
-# Environment Variables for milvus Service
-# (only used when VECTOR_STORE is milvus)
-# ------------------------------
-# ETCD configuration for auto compaction mode
-ETCD_AUTO_COMPACTION_MODE=revision
-# ETCD configuration for auto compaction retention in terms of number of revisions
-ETCD_AUTO_COMPACTION_RETENTION=1000
-# ETCD configuration for backend quota in bytes
-ETCD_QUOTA_BACKEND_BYTES=4294967296
-# ETCD configuration for the number of changes before triggering a snapshot
-ETCD_SNAPSHOT_COUNT=50000
-# MinIO access key for authentication
-MINIO_ACCESS_KEY=minioadmin
-# MinIO secret key for authentication
-MINIO_SECRET_KEY=minioadmin
-# ETCD service endpoints
-ETCD_ENDPOINTS=etcd:2379
-# MinIO service address
-MINIO_ADDRESS=minio:9000
-# Enable or disable security authorization
-MILVUS_AUTHORIZATION_ENABLED=true
-
-# ------------------------------
-# Environment Variables for pgvector / pgvector-rs Service
-# (only used when VECTOR_STORE is pgvector / pgvector-rs)
-# ------------------------------
-PGVECTOR_PGUSER=postgres
-# The password for the default postgres user.
-PGVECTOR_POSTGRES_PASSWORD=difyai123456
-# The name of the default postgres database.
-PGVECTOR_POSTGRES_DB=dify
-# postgres data directory
-PGVECTOR_PGDATA=/var/lib/postgresql/data/pgdata
-
-# ------------------------------
-# Environment Variables for opensearch
-# (only used when VECTOR_STORE is opensearch)
-# ------------------------------
-OPENSEARCH_DISCOVERY_TYPE=single-node
-OPENSEARCH_BOOTSTRAP_MEMORY_LOCK=true
-OPENSEARCH_JAVA_OPTS_MIN=512m
-OPENSEARCH_JAVA_OPTS_MAX=1024m
-OPENSEARCH_INITIAL_ADMIN_PASSWORD=Qazwsxedc!@#123
-OPENSEARCH_MEMLOCK_SOFT=-1
-OPENSEARCH_MEMLOCK_HARD=-1
-OPENSEARCH_NOFILE_SOFT=65536
-OPENSEARCH_NOFILE_HARD=65536
-
-# ------------------------------
-# Environment Variables for Nginx reverse proxy
-# ------------------------------
-NGINX_SERVER_NAME=_
-NGINX_HTTPS_ENABLED=false
-# HTTP port
-NGINX_PORT=80
-# SSL settings are only applied when HTTPS_ENABLED is true
-NGINX_SSL_PORT=443
-# if HTTPS_ENABLED is true, you're required to add your own SSL certificates/keys to the `./nginx/ssl` directory
-# and modify the env vars below accordingly.
-NGINX_SSL_CERT_FILENAME=dify.crt
-NGINX_SSL_CERT_KEY_FILENAME=dify.key
-NGINX_SSL_PROTOCOLS=TLSv1.2 TLSv1.3
-
-# Nginx performance tuning
-NGINX_WORKER_PROCESSES=auto
-NGINX_CLIENT_MAX_BODY_SIZE=100M
-NGINX_KEEPALIVE_TIMEOUT=65
-
-# Proxy settings
-NGINX_PROXY_READ_TIMEOUT=3600s
-NGINX_PROXY_SEND_TIMEOUT=3600s
-
-# Set true to accept requests for /.well-known/acme-challenge/
-NGINX_ENABLE_CERTBOT_CHALLENGE=false
-
-# ------------------------------
-# Certbot Configuration
-# ------------------------------
-
-# Email address (required to get certificates from Let's Encrypt)
-CERTBOT_EMAIL=your_email@example.com
-
-# Domain name
-CERTBOT_DOMAIN=your_domain.com
-
-# certbot command options
-# i.e: --force-renewal --dry-run --test-cert --debug
-CERTBOT_OPTIONS=
-
-# ------------------------------
-# Environment Variables for SSRF Proxy
-# ------------------------------
+# Sandbox and SSRF proxy
+CODE_EXECUTION_ENDPOINT=http://sandbox:8194
+CODE_EXECUTION_API_KEY=dify-sandbox
+CODE_EXECUTION_SSL_VERIFY=True
+CODE_EXECUTION_POOL_MAX_CONNECTIONS=100
+CODE_EXECUTION_POOL_MAX_KEEPALIVE_CONNECTIONS=20
+CODE_EXECUTION_POOL_KEEPALIVE_EXPIRY=5.0
+CODE_EXECUTION_CONNECT_TIMEOUT=10
+CODE_EXECUTION_READ_TIMEOUT=60
+CODE_EXECUTION_WRITE_TIMEOUT=10
+SANDBOX_API_KEY=dify-sandbox
+SANDBOX_GIN_MODE=release
+SANDBOX_WORKER_TIMEOUT=15
+SANDBOX_ENABLE_NETWORK=true
+SANDBOX_HTTP_PROXY=http://ssrf_proxy:3128
+SANDBOX_HTTPS_PROXY=http://ssrf_proxy:3128
+SANDBOX_PORT=8194
+PIP_MIRROR_URL=
+SSRF_PROXY_HTTP_URL=http://ssrf_proxy:3128
+SSRF_PROXY_HTTPS_URL=http://ssrf_proxy:3128
 SSRF_HTTP_PORT=3128
 SSRF_COREDUMP_DIR=/var/spool/squid
 SSRF_REVERSE_PROXY_PORT=8194
@@ -1383,67 +205,7 @@ SSRF_POOL_MAX_CONNECTIONS=100
 SSRF_POOL_MAX_KEEPALIVE_CONNECTIONS=20
 SSRF_POOL_KEEPALIVE_EXPIRY=5.0
 
-# ------------------------------
-# docker env var for specifying vector db and metadata db type at startup
-# (based on the vector db and metadata db type, the corresponding docker
-# compose profile will be used)
-# if you want to use unstructured, add ',unstructured' to the end
-# ------------------------------
-COMPOSE_PROFILES=${VECTOR_STORE:-weaviate},${DB_TYPE:-postgresql}
-
-# ------------------------------
-# Worker health check configuration for worker and worker_beat services.
-# Set to false to enable the health check.
-# Note: enabling the health check may cause periodic CPU spikes and increased load,
-# as it establishes a broker connection and sends a Celery ping on every check interval.
-# ------------------------------
-COMPOSE_WORKER_HEALTHCHECK_DISABLED=true
-# Interval between health checks (e.g. 30s, 1m)
-COMPOSE_WORKER_HEALTHCHECK_INTERVAL=30s
-# Timeout for each health check (e.g. 30s, 1m)
-COMPOSE_WORKER_HEALTHCHECK_TIMEOUT=30s
-
-# ------------------------------
-# Docker Compose Service Expose Host Port Configurations
-# ------------------------------
-EXPOSE_NGINX_PORT=80
-EXPOSE_NGINX_SSL_PORT=443
-
-# ----------------------------------------------------------------------------
-# ModelProvider & Tool Position Configuration
-# Used to specify the model providers and tools that can be used in the app.
-# ----------------------------------------------------------------------------
-
-# Pin, include, and exclude tools
-# Use comma-separated values with no spaces between items.
-# Example: POSITION_TOOL_PINS=bing,google
-POSITION_TOOL_PINS=
-POSITION_TOOL_INCLUDES=
-POSITION_TOOL_EXCLUDES=
-
-# Pin, include, and exclude model providers
-# Use comma-separated values with no spaces between items.
-# Example: POSITION_PROVIDER_PINS=openai,openllm
-POSITION_PROVIDER_PINS=
-POSITION_PROVIDER_INCLUDES=
-POSITION_PROVIDER_EXCLUDES=
-
-# CSP https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP
-CSP_WHITELIST=
-
-# Enable or disable create tidb service job
-CREATE_TIDB_SERVICE_JOB_ENABLED=false
-
-# Maximum number of submitted thread count in a ThreadPool for parallel node execution
-MAX_SUBMIT_COUNT=100
-
-# The maximum number of top-k value for RAG.
-TOP_K_MAX_VALUE=10
-
-# ------------------------------
-# Plugin Daemon Configuration
-# ------------------------------
-
+# Plugin daemon
 DB_PLUGIN_DATABASE=dify_plugin
 EXPOSE_PLUGIN_DAEMON_PORT=5002
 PLUGIN_DAEMON_PORT=5002
@@ -1452,180 +214,45 @@ PLUGIN_DAEMON_URL=http://plugin_daemon:5002
 PLUGIN_MAX_PACKAGE_SIZE=52428800
 PLUGIN_MODEL_SCHEMA_CACHE_TTL=3600
 PLUGIN_PPROF_ENABLED=false
-
 PLUGIN_DEBUGGING_HOST=0.0.0.0
 PLUGIN_DEBUGGING_PORT=5003
 EXPOSE_PLUGIN_DEBUGGING_HOST=localhost
 EXPOSE_PLUGIN_DEBUGGING_PORT=5003
-
-# If this key is changed, DIFY_INNER_API_KEY in plugin_daemon service must also be updated or agent node will fail.
 PLUGIN_DIFY_INNER_API_KEY=QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1
 PLUGIN_DIFY_INNER_API_URL=http://api:5001
-
-ENDPOINT_URL_TEMPLATE=http://localhost/e/{hook_id}
-
-MARKETPLACE_ENABLED=true
-MARKETPLACE_API_URL=https://marketplace.dify.ai
-
-# Creators Platform configuration
-CREATORS_PLATFORM_FEATURES_ENABLED=true
-CREATORS_PLATFORM_API_URL=https://creators.dify.ai
-CREATORS_PLATFORM_OAUTH_CLIENT_ID=
-
 FORCE_VERIFYING_SIGNATURE=true
-ENFORCE_LANGGENIUS_PLUGIN_SIGNATURES=true
-
 PLUGIN_STDIO_BUFFER_SIZE=1024
 PLUGIN_STDIO_MAX_BUFFER_SIZE=5242880
-
 PLUGIN_PYTHON_ENV_INIT_TIMEOUT=120
-# Plugin Daemon side timeout (configure to match the API side below)
 PLUGIN_MAX_EXECUTION_TIMEOUT=600
-# API side timeout (configure to match the Plugin Daemon side above)
-PLUGIN_DAEMON_TIMEOUT=600.0
-# PIP_MIRROR_URL=https://pypi.tuna.tsinghua.edu.cn/simple
-PIP_MIRROR_URL=
-
-# https://github.com/langgenius/dify-plugin-daemon/blob/main/.env.example
-# Plugin storage type, local aws_s3 tencent_cos azure_blob aliyun_oss volcengine_tos
 PLUGIN_STORAGE_TYPE=local
 PLUGIN_STORAGE_LOCAL_ROOT=/app/storage
 PLUGIN_WORKING_PATH=/app/storage/cwd
 PLUGIN_INSTALLED_PATH=plugin
 PLUGIN_PACKAGE_CACHE_PATH=plugin_packages
 PLUGIN_MEDIA_CACHE_PATH=assets
-# Plugin oss bucket
 PLUGIN_STORAGE_OSS_BUCKET=
-# Plugin oss s3 credentials
-PLUGIN_S3_USE_AWS=false
-PLUGIN_S3_USE_AWS_MANAGED_IAM=false
-PLUGIN_S3_ENDPOINT=
-PLUGIN_S3_USE_PATH_STYLE=false
-PLUGIN_AWS_ACCESS_KEY=
-PLUGIN_AWS_SECRET_KEY=
-PLUGIN_AWS_REGION=
-# Plugin oss azure blob
-PLUGIN_AZURE_BLOB_STORAGE_CONTAINER_NAME=
-PLUGIN_AZURE_BLOB_STORAGE_CONNECTION_STRING=
-# Plugin oss tencent cos
-PLUGIN_TENCENT_COS_SECRET_KEY=
-PLUGIN_TENCENT_COS_SECRET_ID=
-PLUGIN_TENCENT_COS_REGION=
-# Plugin oss aliyun oss
-PLUGIN_ALIYUN_OSS_REGION=
-PLUGIN_ALIYUN_OSS_ENDPOINT=
-PLUGIN_ALIYUN_OSS_ACCESS_KEY_ID=
-PLUGIN_ALIYUN_OSS_ACCESS_KEY_SECRET=
-PLUGIN_ALIYUN_OSS_AUTH_VERSION=v4
-PLUGIN_ALIYUN_OSS_PATH=
-# Plugin oss volcengine tos
-PLUGIN_VOLCENGINE_TOS_ENDPOINT=
-PLUGIN_VOLCENGINE_TOS_ACCESS_KEY=
-PLUGIN_VOLCENGINE_TOS_SECRET_KEY=
-PLUGIN_VOLCENGINE_TOS_REGION=
+PLUGIN_SENTRY_ENABLED=false
+PLUGIN_SENTRY_DSN=
+MARKETPLACE_ENABLED=true
+MARKETPLACE_API_URL=https://marketplace.dify.ai
+MARKETPLACE_URL=
 
-# ------------------------------
-# OTLP Collector Configuration
-# ------------------------------
-ENABLE_OTEL=false
-OTLP_TRACE_ENDPOINT=
-OTLP_METRIC_ENDPOINT=
-OTLP_BASE_ENDPOINT=http://localhost:4318
-OTLP_API_KEY=
-OTEL_EXPORTER_OTLP_PROTOCOL=
-OTEL_EXPORTER_TYPE=otlp
-OTEL_SAMPLING_RATE=0.1
-OTEL_BATCH_EXPORT_SCHEDULE_DELAY=5000
-OTEL_MAX_QUEUE_SIZE=2048
-OTEL_MAX_EXPORT_BATCH_SIZE=512
-OTEL_METRIC_EXPORT_INTERVAL=60000
-OTEL_BATCH_EXPORT_TIMEOUT=10000
-OTEL_METRIC_EXPORT_TIMEOUT=30000
-
-# Prevent Clickjacking
-ALLOW_EMBED=false
-
-# Dataset queue monitor configuration
-QUEUE_MONITOR_THRESHOLD=200
-# You can configure multiple ones, separated by commas. eg: test1@dify.ai,test2@dify.ai
-QUEUE_MONITOR_ALERT_EMAILS=
-# Monitor interval in minutes, default is 30 minutes
-QUEUE_MONITOR_INTERVAL=30
-
-# Swagger UI configuration
-SWAGGER_UI_ENABLED=false
-SWAGGER_UI_PATH=/swagger-ui.html
-
-# Whether to encrypt dataset IDs when exporting DSL files (default: true)
-# Set to false to export dataset IDs as plain text for easier cross-environment import
-DSL_EXPORT_ENCRYPT_DATASET_ID=true
-
-# Maximum number of segments for dataset segments API (0 for unlimited)
-DATASET_MAX_SEGMENTS_PER_REQUEST=0
-
-# Celery schedule tasks configuration
-ENABLE_CLEAN_EMBEDDING_CACHE_TASK=false
-ENABLE_CLEAN_UNUSED_DATASETS_TASK=false
-ENABLE_CREATE_TIDB_SERVERLESS_TASK=false
-ENABLE_UPDATE_TIDB_SERVERLESS_STATUS_TASK=false
-ENABLE_CLEAN_MESSAGES=false
-ENABLE_WORKFLOW_RUN_CLEANUP_TASK=false
-ENABLE_MAIL_CLEAN_DOCUMENT_NOTIFY_TASK=false
-ENABLE_DATASETS_QUEUE_MONITOR=false
-ENABLE_CHECK_UPGRADABLE_PLUGIN_TASK=true
-ENABLE_WORKFLOW_SCHEDULE_POLLER_TASK=true
-WORKFLOW_SCHEDULE_POLLER_INTERVAL=1
-WORKFLOW_SCHEDULE_POLLER_BATCH_SIZE=100
-WORKFLOW_SCHEDULE_MAX_DISPATCH_PER_TICK=0
-
-# Tenant isolated task queue configuration
-TENANT_ISOLATED_TASK_CONCURRENCY=1
-
-# Maximum allowed CSV file size for annotation import in megabytes
-ANNOTATION_IMPORT_FILE_SIZE_LIMIT=2
-#Maximum number of annotation records allowed in a single import
-ANNOTATION_IMPORT_MAX_RECORDS=10000
-# Minimum number of annotation records required in a single import
-ANNOTATION_IMPORT_MIN_RECORDS=1
-ANNOTATION_IMPORT_RATE_LIMIT_PER_MINUTE=5
-ANNOTATION_IMPORT_RATE_LIMIT_PER_HOUR=20
-# Maximum number of concurrent annotation import tasks per tenant
-ANNOTATION_IMPORT_MAX_CONCURRENT=5
-
-# The API key of amplitude
-AMPLITUDE_API_KEY=
-
-# Sandbox expired records clean configuration
-SANDBOX_EXPIRED_RECORDS_CLEAN_GRACEFUL_PERIOD=21
-SANDBOX_EXPIRED_RECORDS_CLEAN_BATCH_SIZE=1000
-SANDBOX_EXPIRED_RECORDS_CLEAN_BATCH_MAX_INTERVAL=200
-SANDBOX_EXPIRED_RECORDS_RETENTION_DAYS=30
-
-
-# Redis URL used for event bus between API and
-# celery worker
-# defaults to url constructed from `REDIS_*`
-# configurations
-EVENT_BUS_REDIS_URL=
-# Event transport type. 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)
-#
-# 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 enable this for large deployments.
-EVENT_BUS_REDIS_USE_CLUSTERS=false
-
-# Whether to Enable human input timeout check task
-ENABLE_HUMAN_INPUT_TIMEOUT_TASK=true
-# Human input timeout check interval in minutes
-HUMAN_INPUT_TIMEOUT_TASK_INTERVAL=1
-
-
-SANDBOX_EXPIRED_RECORDS_CLEAN_TASK_LOCK_TTL=90000
+# Nginx and Docker Compose
+NGINX_SERVER_NAME=_
+NGINX_HTTPS_ENABLED=false
+NGINX_PORT=80
+NGINX_SSL_PORT=443
+NGINX_SSL_CERT_FILENAME=dify.crt
+NGINX_SSL_CERT_KEY_FILENAME=dify.key
+NGINX_SSL_PROTOCOLS=TLSv1.2 TLSv1.3
+NGINX_WORKER_PROCESSES=auto
+NGINX_CLIENT_MAX_BODY_SIZE=100M
+NGINX_KEEPALIVE_TIMEOUT=65
+NGINX_PROXY_READ_TIMEOUT=3600s
+NGINX_PROXY_SEND_TIMEOUT=3600s
+NGINX_ENABLE_CERTBOT_CHALLENGE=false
+NGINX_SOCKET_IO_UPSTREAM=api_websocket:5001
+EXPOSE_NGINX_PORT=80
+EXPOSE_NGINX_SSL_PORT=443
+COMPOSE_PROFILES=${VECTOR_STORE:-weaviate},${DB_TYPE:-postgresql},collaboration
diff --git a/docker/.gitignore b/docker/.gitignore
new file mode 100644
index 0000000000..c3a47ad592
--- /dev/null
+++ b/docker/.gitignore
@@ -0,0 +1,3 @@
+# Ignore actual .env files (keep only .env.example files in git)
+*.env
+!*.env.example
diff --git a/docker/README.md b/docker/README.md
index 3130fa9886..2e21a2ce8f 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -5,44 +5,46 @@ Welcome to the new `docker` directory for deploying Dify using Docker Compose. T
 ### What's Updated
 
 - **Certbot Container**: `docker-compose.yaml` now contains `certbot` for managing SSL certificates. This container automatically renews certificates and ensures secure HTTPS connections.\
-  For more information, refer `docker/certbot/README.md`.
+  For more information, refer to `docker/certbot/README.md`.
 
-- **Persistent Environment Variables**: Environment variables are now managed through a `.env` file, ensuring that your configurations persist across deployments.
+- **Persistent Environment Variables**: Essential startup defaults are provided in `.env.example`, while local values are stored in `.env`, ensuring that your configurations persist across deployments.
 
   > What is `.env`? </br> </br>
-  > The `.env` file is a crucial component in Docker and Docker Compose environments, serving as a centralized configuration file where you can define environment variables that are accessible to the containers at runtime. This file simplifies the management of environment settings across different stages of development, testing, and production, providing consistency and ease of configuration to deployments.
+  > The `.env` file is the local startup file. Copy it from `.env.example` for a default deployment. Optional advanced settings live in `envs/*.env.example` files.
 
 - **Unified Vector Database Services**: All vector database services are now managed from a single Docker Compose file `docker-compose.yaml`. You can switch between different vector databases by setting the `VECTOR_STORE` environment variable in your `.env` file.
 
-- **Mandatory .env File**: A `.env` file is now required to run `docker compose up`. This file is crucial for configuring your deployment and for any custom settings to persist through upgrades.
-
 ### How to Deploy Dify with `docker-compose.yaml`
 
 1. **Prerequisites**: Ensure Docker and Docker Compose are installed on your system.
-1. **Environment Setup**:
+2. **Environment Setup**:
    - Navigate to the `docker` directory.
-   - Copy the `.env.example` file to a new file named `.env` by running `cp .env.example .env`.
-   - Customize the `.env` file as needed. Refer to the `.env.example` file for detailed configuration options.
-   - **Optional (Recommended for upgrades)**:
-     You may use the environment synchronization tool to help keep your `.env` file aligned with the latest `.env.example` updates, while preserving your custom settings.
-     This is especially useful when upgrading Dify or managing a large, customized `.env` file.
+   - Copy `.env.example` to `.env`.
+   - Customize `.env` when you need to change essential startup defaults. Copy optional files from `envs/` without the `.example` suffix when you need advanced settings.
+   - **Optional (for advanced deployments)**:
+     If you maintain a full `.env` file copied from `.env.example`, you may use the environment synchronization tool to keep it aligned with the latest `.env.example` updates while preserving your custom settings.
      See the [Environment Variables Synchronization](#environment-variables-synchronization) section below.
-1. **Running the Services**:
-   - Execute `docker compose up` from the `docker` directory to start the services.
-   - To specify a vector database, set the `VECTOR_STORE` variable in your `.env` file to your desired vector database service, such as `milvus`, `weaviate`, or `opensearch`.
-1. **SSL Certificate Setup**:
-   - Refer `docker/certbot/README.md` to set up SSL certificates using Certbot.
-1. **OpenTelemetry Collector Setup**:
-   - Change `ENABLE_OTEL` to `true` in `.env`.
-   - Configure `OTLP_BASE_ENDPOINT` properly.
+3. **Running the Services**:
+   - Execute `docker compose up -d` from the `docker` directory to start the services.
+   - To specify a vector database, set the `VECTOR_STORE` variable in your `.env` file to your desired vector database service, such as `milvus`, `weaviate`, or `opensearch`. See `envs/vectorstores/` for the full list of supported options.
+   ```bash
+   cp .env.example .env
+   docker compose up -d
+   ```
+
+4. **SSL Certificate Setup**:
+   - Refer to `docker/certbot/README.md` to set up SSL certificates using Certbot.
+5. **OpenTelemetry Collector Setup**:
+   - Copy `envs/core-services/shared.env.example` to `envs/core-services/shared.env`.
+   - Set `ENABLE_OTEL=true` and configure `OTLP_BASE_ENDPOINT`. Tune the other `OTEL_*` knobs in the same file if needed.
 
 ### How to Deploy Middleware for Developing Dify
 
 1. **Middleware Setup**:
    - Use the `docker-compose.middleware.yaml` for setting up essential middleware services like databases and caches.
    - Navigate to the `docker` directory.
-   - Ensure the `middleware.env` file is created by running `cp middleware.env.example middleware.env` (refer to the `middleware.env.example` file).
-1. **Running Middleware Services**:
+   - Ensure the `middleware.env` file is created by running `cp envs/middleware.env.example middleware.env` (refer to the `envs/middleware.env.example` file).
+2. **Running Middleware Services**:
    - Navigate to the `docker` directory.
    - Execute `docker compose --env-file middleware.env -f docker-compose.middleware.yaml -p dify up -d` to start PostgreSQL/MySQL (per `DB_TYPE`) plus the bundled Weaviate instance.
 
@@ -53,12 +55,18 @@ Welcome to the new `docker` directory for deploying Dify using Docker Compose. T
 For users migrating from the `docker-legacy` setup:
 
 1. **Review Changes**: Familiarize yourself with the new `.env` configuration and Docker Compose setup.
-1. **Transfer Customizations**:
+2. **Transfer Customizations**:
    - If you have customized configurations such as `docker-compose.yaml`, `ssrf_proxy/squid.conf`, or `nginx/conf.d/default.conf`, you will need to reflect these changes in the `.env` file you create.
-1. **Data Migration**:
+3. **Data Migration**:
    - Ensure that data from services like databases and caches is backed up and migrated appropriately to the new structure if necessary.
 
-### Overview of `.env`
+### Overview of `.env`, `.env.example`, and `envs/`
+
+- `.env.example` contains the essential default configuration for Docker Compose deployments.
+- `.env` contains local startup values copied from `.env.example` and any local changes.
+- `envs/*.env.example` files contain optional advanced configuration grouped by theme.
+
+Docker Compose reads `envs/*.env` files when present, then reads `.env` last so values in `.env` take precedence.
 
 #### Key Modules and Customization
 
@@ -68,59 +76,63 @@ For users migrating from the `docker-legacy` setup:
 
 #### Other notable variables
 
-The `.env.example` file provided in the Docker setup is extensive and covers a wide range of configuration options. It is structured into several sections, each pertaining to different aspects of the application and its services. Here are some of the key sections and variables:
+The root `.env.example` file contains the essential startup settings. Optional and provider-specific settings are grouped in `envs/*.env.example` files. Here are some of the key sections and variables:
 
 1. **Common Variables**:
 
-   - `CONSOLE_API_URL`, `SERVICE_API_URL`: URLs for different API services.
-   - `APP_WEB_URL`: Frontend application URL.
-   - `FILES_URL`: Base URL for file downloads and previews.
+   - `CONSOLE_API_URL`, `CONSOLE_WEB_URL`, `SERVICE_API_URL`, `APP_API_URL`, `APP_WEB_URL`: URLs for the API and frontend services.
+   - `FILES_URL`, `INTERNAL_FILES_URL`: Public and internal base URLs for file downloads and previews.
+   - `ENDPOINT_URL_TEMPLATE`, `NEXT_PUBLIC_SOCKET_URL`, `TRIGGER_URL`: Additional service URLs. 
+   
+   See `.env.example` for the full list.
 
-1. **Server Configuration**:
+2. **Server Configuration**:
 
    - `LOG_LEVEL`, `DEBUG`, `FLASK_DEBUG`: Logging and debug settings.
-   - `SECRET_KEY`: A key for encrypting session cookies and other sensitive data.
+   - `SECRET_KEY`: A key for signing sessions, JWTs, and file URLs. Leave it empty to let Dify generate a persistent key in the storage directory, or set a unique value yourself.
 
-1. **Database Configuration**:
+3. **Database Configuration**:
 
    - `DB_USERNAME`, `DB_PASSWORD`, `DB_HOST`, `DB_PORT`, `DB_DATABASE`: PostgreSQL database credentials and connection details.
 
-1. **Redis Configuration**:
+4. **Redis Configuration**:
 
    - `REDIS_HOST`, `REDIS_PORT`, `REDIS_PASSWORD`: Redis server connection settings.
    - `REDIS_KEY_PREFIX`: Optional global namespace prefix for Redis keys, topics, streams, and Celery Redis transport artifacts.
 
-1. **Celery Configuration**:
+5. **Celery Configuration**:
 
    - `CELERY_BROKER_URL`: Configuration for Celery message broker.
 
-1. **Storage Configuration**:
+6. **Storage Configuration**:
 
-   - `STORAGE_TYPE`, `S3_BUCKET_NAME`, `AZURE_BLOB_ACCOUNT_NAME`: Settings for file storage options like local, S3, Azure Blob, etc.
+   - `STORAGE_TYPE`, `OPENDAL_SCHEME`, `OPENDAL_FS_ROOT`: Default local file storage settings. Optional storage backends are configured from the files under `envs/`.
 
-1. **Vector Database Configuration**:
+7. **Vector Database Configuration**:
 
-   - `VECTOR_STORE`: Type of vector database (e.g., `weaviate`, `milvus`).
+   - `VECTOR_STORE`: Type of vector database (e.g., `weaviate`, `milvus`). See `envs/vectorstores/` for the full list of supported options.
    - Specific settings for each vector store like `WEAVIATE_ENDPOINT`, `MILVUS_URI`.
 
-1. **CORS Configuration**:
+8. **CORS Configuration**:
 
    - `WEB_API_CORS_ALLOW_ORIGINS`, `CONSOLE_CORS_ALLOW_ORIGINS`: Settings for cross-origin resource sharing.
 
-1. **OpenTelemetry Configuration**:
+9. **OpenTelemetry Configuration**:
 
    - `ENABLE_OTEL`: Enable OpenTelemetry collector in api.
    - `OTLP_BASE_ENDPOINT`: Endpoint for your OTLP exporter.
 
-1. **Other Service-Specific Environment Variables**:
+10. **Other Service-Specific Environment Variables**:
 
-   - Each service like `nginx`, `redis`, `db`, and vector databases have specific environment variables that are directly referenced in the `docker-compose.yaml`.
+    - Each service like `nginx`, `redis`, `db`, and vector databases have specific environment variables that are directly referenced in the `docker-compose.yaml`.
 
 ### Environment Variables Synchronization
 
-When upgrading Dify or pulling the latest changes, new environment variables may be introduced in `.env.example`.
+When upgrading Dify or pulling the latest changes, new environment variables may be introduced in `.env.example` or the optional files under `envs/`.
 
-To help keep your existing `.env` file up to date **without losing your custom values**, an optional environment variables synchronization tool is provided.
+If you use the default workflow, review `.env.example` and keep your `.env` aligned with essential startup values.
+
+If you maintain a customized `.env` file copied from `.env.example`, an optional environment variables synchronization tool is provided.
 
 > This tool performs a **one-way synchronization** from `.env.example` to `.env`.
 > Existing values in `.env` are never overwritten automatically.
@@ -143,9 +155,9 @@ Before synchronization, the current `.env` file is saved to the `env-backup/` di
 
 **When to use**
 
-- After upgrading Dify to a newer version
+- After upgrading Dify to a newer version with a full `.env` file
 - When `.env.example` has been updated with new environment variables
-- When managing a large or heavily customized `.env` file
+- When managing a large or heavily customized `.env` file copied from `.env.example`
 
 **Usage**
 
diff --git a/docker/docker-compose-template.yaml b/docker/docker-compose-template.yaml
index 87fa01f671..d3cff12a4b 100644
--- a/docker/docker-compose-template.yaml
+++ b/docker/docker-compose-template.yaml
@@ -1,4 +1,202 @@
-x-shared-env: &shared-api-worker-env
+# Shared configuration using YAML anchors and env_file
+x-shared-api-worker-config: &shared-api-worker-config
+  env_file:
+    - path: ./envs/core-services/shared.env
+      required: false
+    - path: ./envs/core-services/api.env
+      required: false
+    - path: ./envs/security.env
+      required: false
+    - path: ./envs/databases/db-postgres.env
+      required: false
+    - path: ./envs/databases/db-mysql.env
+      required: false
+    - path: ./envs/databases/redis.env
+      required: false
+    - path: ./envs/vectorstores/weaviate.env
+      required: false
+    - path: ./envs/vectorstores/qdrant.env
+      required: false
+    - path: ./envs/vectorstores/oceanbase.env
+      required: false
+    - path: ./envs/vectorstores/seekdb.env
+      required: false
+    - path: ./envs/vectorstores/couchbase.env
+      required: false
+    - path: ./envs/vectorstores/pgvector.env
+      required: false
+    - path: ./envs/vectorstores/vastbase.env
+      required: false
+    - path: ./envs/vectorstores/pgvecto-rs.env
+      required: false
+    - path: ./envs/vectorstores/chroma.env
+      required: false
+    - path: ./envs/vectorstores/iris.env
+      required: false
+    - path: ./envs/vectorstores/oracle.env
+      required: false
+    - path: ./envs/vectorstores/opengauss.env
+      required: false
+    - path: ./envs/vectorstores/myscale.env
+      required: false
+    - path: ./envs/vectorstores/matrixone.env
+      required: false
+    - path: ./envs/vectorstores/elasticsearch.env
+      required: false
+    - path: ./envs/vectorstores/opensearch.env
+      required: false
+    - path: ./envs/vectorstores/milvus.env
+      required: false
+    - path: ./envs/infrastructure/nginx.env
+      required: false
+    - path: ./envs/infrastructure/certbot.env
+      required: false
+    - path: ./envs/infrastructure/ssrf-proxy.env
+      required: false
+    - path: ./envs/infrastructure/etcd.env
+      required: false
+    - path: ./envs/infrastructure/minio.env
+      required: false
+    - path: ./envs/infrastructure/milvus-standalone.env
+      required: false
+    - ./.env
+  networks:
+    - ssrf_proxy_network
+    - default
+  restart: always
+
+x-shared-worker-config: &shared-worker-config
+  env_file:
+    - path: ./envs/core-services/shared.env
+      required: false
+    - path: ./envs/core-services/worker.env
+      required: false
+    - path: ./envs/security.env
+      required: false
+    - path: ./envs/databases/db-postgres.env
+      required: false
+    - path: ./envs/databases/db-mysql.env
+      required: false
+    - path: ./envs/databases/redis.env
+      required: false
+    - path: ./envs/vectorstores/weaviate.env
+      required: false
+    - path: ./envs/vectorstores/qdrant.env
+      required: false
+    - path: ./envs/vectorstores/oceanbase.env
+      required: false
+    - path: ./envs/vectorstores/seekdb.env
+      required: false
+    - path: ./envs/vectorstores/couchbase.env
+      required: false
+    - path: ./envs/vectorstores/pgvector.env
+      required: false
+    - path: ./envs/vectorstores/vastbase.env
+      required: false
+    - path: ./envs/vectorstores/pgvecto-rs.env
+      required: false
+    - path: ./envs/vectorstores/chroma.env
+      required: false
+    - path: ./envs/vectorstores/iris.env
+      required: false
+    - path: ./envs/vectorstores/oracle.env
+      required: false
+    - path: ./envs/vectorstores/opengauss.env
+      required: false
+    - path: ./envs/vectorstores/myscale.env
+      required: false
+    - path: ./envs/vectorstores/matrixone.env
+      required: false
+    - path: ./envs/vectorstores/elasticsearch.env
+      required: false
+    - path: ./envs/vectorstores/opensearch.env
+      required: false
+    - path: ./envs/vectorstores/milvus.env
+      required: false
+    - path: ./envs/infrastructure/nginx.env
+      required: false
+    - path: ./envs/infrastructure/certbot.env
+      required: false
+    - path: ./envs/infrastructure/ssrf-proxy.env
+      required: false
+    - path: ./envs/infrastructure/etcd.env
+      required: false
+    - path: ./envs/infrastructure/minio.env
+      required: false
+    - path: ./envs/infrastructure/milvus-standalone.env
+      required: false
+    - ./.env
+  networks:
+    - ssrf_proxy_network
+    - default
+  restart: always
+
+x-shared-worker-beat-config: &shared-worker-beat-config
+  env_file:
+    - path: ./envs/core-services/shared.env
+      required: false
+    - path: ./envs/core-services/worker-beat.env
+      required: false
+    - path: ./envs/security.env
+      required: false
+    - path: ./envs/databases/db-postgres.env
+      required: false
+    - path: ./envs/databases/db-mysql.env
+      required: false
+    - path: ./envs/databases/redis.env
+      required: false
+    - path: ./envs/vectorstores/weaviate.env
+      required: false
+    - path: ./envs/vectorstores/qdrant.env
+      required: false
+    - path: ./envs/vectorstores/oceanbase.env
+      required: false
+    - path: ./envs/vectorstores/seekdb.env
+      required: false
+    - path: ./envs/vectorstores/couchbase.env
+      required: false
+    - path: ./envs/vectorstores/pgvector.env
+      required: false
+    - path: ./envs/vectorstores/vastbase.env
+      required: false
+    - path: ./envs/vectorstores/pgvecto-rs.env
+      required: false
+    - path: ./envs/vectorstores/chroma.env
+      required: false
+    - path: ./envs/vectorstores/iris.env
+      required: false
+    - path: ./envs/vectorstores/oracle.env
+      required: false
+    - path: ./envs/vectorstores/opengauss.env
+      required: false
+    - path: ./envs/vectorstores/myscale.env
+      required: false
+    - path: ./envs/vectorstores/matrixone.env
+      required: false
+    - path: ./envs/vectorstores/elasticsearch.env
+      required: false
+    - path: ./envs/vectorstores/opensearch.env
+      required: false
+    - path: ./envs/vectorstores/milvus.env
+      required: false
+    - path: ./envs/infrastructure/nginx.env
+      required: false
+    - path: ./envs/infrastructure/certbot.env
+      required: false
+    - path: ./envs/infrastructure/ssrf-proxy.env
+      required: false
+    - path: ./envs/infrastructure/etcd.env
+      required: false
+    - path: ./envs/infrastructure/minio.env
+      required: false
+    - path: ./envs/infrastructure/milvus-standalone.env
+      required: false
+    - ./.env
+  networks:
+    - ssrf_proxy_network
+    - default
+  restart: always
+
 services:
   # Init container to fix permissions
   init_permissions:
@@ -21,12 +219,9 @@ services:
 
   # API service
   api:
-    image: langgenius/dify-api:1.14.0
-    restart: always
+    <<: *shared-api-worker-config
+    image: langgenius/dify-api:1.14.2
     environment:
-      # Use the shared environment variables.
-      <<: *shared-api-worker-env
-      # Startup mode, 'api' starts the API server.
       MODE: api
       SENTRY_DSN: ${API_SENTRY_DSN:-}
       SENTRY_TRACES_SAMPLE_RATE: ${API_SENTRY_TRACES_SAMPLE_RATE:-1.0}
@@ -66,15 +261,37 @@ services:
       - ssrf_proxy_network
       - default
 
+  # WebSocket service for workflow collaboration.
+  api_websocket:
+    <<: *shared-api-worker-config
+    image: langgenius/dify-api:1.14.2
+    profiles:
+      - collaboration
+    environment:
+      MODE: api
+      SERVER_WORKER_AMOUNT: 1
+      SERVER_WORKER_CLASS: ${API_WEBSOCKET_WORKER_CLASS:-geventwebsocket.gunicorn.workers.GeventWebSocketWorker}
+      SERVER_WORKER_CONNECTIONS: ${API_WEBSOCKET_WORKER_CONNECTIONS:-1000}
+      GUNICORN_TIMEOUT: ${API_WEBSOCKET_GUNICORN_TIMEOUT:-360}
+    depends_on:
+      db_postgres:
+        condition: service_healthy
+        required: false
+      db_mysql:
+        condition: service_healthy
+        required: false
+      redis:
+        condition: service_started
+    networks:
+      - ssrf_proxy_network
+      - default
+
   # worker service
   # The Celery worker for processing all queues (dataset, workflow, mail, etc.)
   worker:
-    image: langgenius/dify-api:1.14.0
-    restart: always
+    <<: *shared-worker-config
+    image: langgenius/dify-api:1.14.2
     environment:
-      # Use the shared environment variables.
-      <<: *shared-api-worker-env
-      # Startup mode, 'worker' starts the Celery worker for processing all queues.
       MODE: worker
       SENTRY_DSN: ${API_SENTRY_DSN:-}
       SENTRY_TRACES_SAMPLE_RATE: ${API_SENTRY_TRACES_SAMPLE_RATE:-1.0}
@@ -115,12 +332,9 @@ services:
   # worker_beat service
   # Celery beat for scheduling periodic tasks.
   worker_beat:
-    image: langgenius/dify-api:1.14.0
-    restart: always
+    <<: *shared-worker-beat-config
+    image: langgenius/dify-api:1.14.2
     environment:
-      # Use the shared environment variables.
-      <<: *shared-api-worker-env
-      # Startup mode, 'worker_beat' starts the Celery beat for scheduling periodic tasks.
       MODE: beat
     depends_on:
       init_permissions:
@@ -152,8 +366,14 @@ services:
 
   # Frontend web application.
   web:
-    image: langgenius/dify-web:1.14.0
+    image: langgenius/dify-web:1.14.2
     restart: always
+    env_file:
+      - path: ./envs/core-services/web.env
+        required: false
+      - path: ./envs/security.env
+        required: false
+      - ./.env
     environment:
       CONSOLE_API_URL: ${CONSOLE_API_URL:-}
       APP_API_URL: ${APP_API_URL:-}
@@ -170,8 +390,8 @@ services:
       ALLOW_UNSAFE_DATA_SCHEME: ${ALLOW_UNSAFE_DATA_SCHEME:-false}
       MARKETPLACE_API_URL: ${MARKETPLACE_API_URL:-https://marketplace.dify.ai}
       MARKETPLACE_URL: ${MARKETPLACE_URL:-https://marketplace.dify.ai}
-      TOP_K_MAX_VALUE: ${TOP_K_MAX_VALUE:-}
-      INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH: ${INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH:-}
+      TOP_K_MAX_VALUE: ${TOP_K_MAX_VALUE:-10}
+      INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH: ${INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH:-4000}
       LOOP_NODE_MAX_COUNT: ${LOOP_NODE_MAX_COUNT:-100}
       MAX_TOOLS_NUM: ${MAX_TOOLS_NUM:-10}
       MAX_PARALLEL_LIMIT: ${MAX_PARALLEL_LIMIT:-10}
@@ -228,7 +448,7 @@ services:
       MYSQL_ROOT_PASSWORD: ${DB_PASSWORD:-difyai123456}
       MYSQL_DATABASE: ${DB_DATABASE:-dify}
     command: >
-      --max_connections=1000
+      --max_connections=${MYSQL_MAX_CONNECTIONS:-1000}
       --innodb_buffer_pool_size=${MYSQL_INNODB_BUFFER_POOL_SIZE:-512M}
       --innodb_log_file_size=${MYSQL_INNODB_LOG_FILE_SIZE:-128M}
       --innodb_flush_log_at_trx_commit=${MYSQL_INNODB_FLUSH_LOG_AT_TRX_COMMIT:-2}
@@ -270,6 +490,12 @@ services:
   sandbox:
     image: langgenius/dify-sandbox:0.2.15
     restart: always
+    env_file:
+      - path: ./envs/core-services/sandbox.env
+        required: false
+      - path: ./envs/security.env
+        required: false
+      - ./.env
     environment:
       # The DifySandbox configurations
       # Make sure you are changing this key for your deployment with a strong key.
@@ -292,11 +518,26 @@ services:
 
   # plugin daemon
   plugin_daemon:
-    image: langgenius/dify-plugin-daemon:0.6.0-local
+    image: langgenius/dify-plugin-daemon:0.6.1-local
     restart: always
+    env_file:
+      - path: ./envs/core-services/shared.env
+        required: false
+      - path: ./envs/core-services/plugin-daemon.env
+        required: false
+      - path: ./envs/security.env
+        required: false
+      - path: ./envs/databases/db-postgres.env
+        required: false
+      - path: ./envs/databases/db-mysql.env
+        required: false
+      - path: ./envs/databases/redis.env
+        required: false
+      - ./.env
+    networks:
+      - ssrf_proxy_network
+      - default
     environment:
-      # Use the shared environment variables.
-      <<: *shared-api-worker-env
       DB_DATABASE: ${DB_PLUGIN_DATABASE:-dify_plugin}
       DB_SSL_MODE: ${DB_SSL_MODE:-disable}
       SERVER_PORT: ${PLUGIN_DAEMON_PORT:-5002}
@@ -402,8 +643,8 @@ services:
       - ./certbot/update-cert.template.txt:/update-cert.template.txt
       - ./certbot/docker-entrypoint.sh:/docker-entrypoint.sh
     environment:
-      - CERTBOT_EMAIL=${CERTBOT_EMAIL}
-      - CERTBOT_DOMAIN=${CERTBOT_DOMAIN}
+      - CERTBOT_EMAIL=${CERTBOT_EMAIL:-}
+      - CERTBOT_DOMAIN=${CERTBOT_DOMAIN:-}
       - CERTBOT_OPTIONS=${CERTBOT_OPTIONS:-}
     entrypoint: ["/docker-entrypoint.sh"]
     command: ["tail", "-f", "/dev/null"]
@@ -445,6 +686,7 @@ services:
       NGINX_PROXY_READ_TIMEOUT: ${NGINX_PROXY_READ_TIMEOUT:-3600s}
       NGINX_PROXY_SEND_TIMEOUT: ${NGINX_PROXY_SEND_TIMEOUT:-3600s}
       NGINX_ENABLE_CERTBOT_CHALLENGE: ${NGINX_ENABLE_CERTBOT_CHALLENGE:-false}
+      NGINX_SOCKET_IO_UPSTREAM: ${NGINX_SOCKET_IO_UPSTREAM:-api_websocket:5001}
       CERTBOT_DOMAIN: ${CERTBOT_DOMAIN:-}
     depends_on:
       - api
diff --git a/docker/docker-compose.middleware.yaml b/docker/docker-compose.middleware.yaml
index 23c26c6695..170e171856 100644
--- a/docker/docker-compose.middleware.yaml
+++ b/docker/docker-compose.middleware.yaml
@@ -51,7 +51,7 @@ services:
       MYSQL_ROOT_PASSWORD: ${DB_PASSWORD:-difyai123456}
       MYSQL_DATABASE: ${DB_DATABASE:-dify}
     command: >
-      --max_connections=1000
+      --max_connections=${MYSQL_MAX_CONNECTIONS:-1000}
       --innodb_buffer_pool_size=${MYSQL_INNODB_BUFFER_POOL_SIZE:-512M}
       --innodb_log_file_size=${MYSQL_INNODB_LOG_FILE_SIZE:-128M}
       --innodb_flush_log_at_trx_commit=${MYSQL_INNODB_FLUSH_LOG_AT_TRX_COMMIT:-2}
@@ -129,7 +129,7 @@ services:
 
   # plugin daemon
   plugin_daemon:
-    image: langgenius/dify-plugin-daemon:0.6.0-local
+    image: langgenius/dify-plugin-daemon:0.6.1-local
     restart: always
     env_file:
       - ./middleware.env
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index a72136049d..da94f7f16c 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -4,724 +4,204 @@
 # or docker-compose-template.yaml and regenerate this file.
 # ==================================================================
 
-x-shared-env: &shared-api-worker-env
-  CONSOLE_API_URL: ${CONSOLE_API_URL:-}
-  CONSOLE_WEB_URL: ${CONSOLE_WEB_URL:-}
-  SERVICE_API_URL: ${SERVICE_API_URL:-}
-  TRIGGER_URL: ${TRIGGER_URL:-http://localhost}
-  APP_API_URL: ${APP_API_URL:-}
-  APP_WEB_URL: ${APP_WEB_URL:-}
-  FILES_URL: ${FILES_URL:-}
-  INTERNAL_FILES_URL: ${INTERNAL_FILES_URL:-}
-  LANG: ${LANG:-C.UTF-8}
-  LC_ALL: ${LC_ALL:-C.UTF-8}
-  PYTHONIOENCODING: ${PYTHONIOENCODING:-utf-8}
-  UV_CACHE_DIR: ${UV_CACHE_DIR:-/tmp/.uv-cache}
-  LOG_LEVEL: ${LOG_LEVEL:-INFO}
-  LOG_OUTPUT_FORMAT: ${LOG_OUTPUT_FORMAT:-text}
-  LOG_FILE: ${LOG_FILE:-/app/logs/server.log}
-  LOG_FILE_MAX_SIZE: ${LOG_FILE_MAX_SIZE:-20}
-  LOG_FILE_BACKUP_COUNT: ${LOG_FILE_BACKUP_COUNT:-5}
-  LOG_DATEFORMAT: ${LOG_DATEFORMAT:-%Y-%m-%d %H:%M:%S}
-  LOG_TZ: ${LOG_TZ:-UTC}
-  DEBUG: ${DEBUG:-false}
-  FLASK_DEBUG: ${FLASK_DEBUG:-false}
-  ENABLE_REQUEST_LOGGING: ${ENABLE_REQUEST_LOGGING:-False}
-  SECRET_KEY: ${SECRET_KEY:-sk-9f73s3ljTXVcMT3Blb3ljTqtsKiGHXVcMT3BlbkFJLK7U}
-  INIT_PASSWORD: ${INIT_PASSWORD:-}
-  DEPLOY_ENV: ${DEPLOY_ENV:-PRODUCTION}
-  CHECK_UPDATE_URL: ${CHECK_UPDATE_URL:-https://updates.dify.ai}
-  OPENAI_API_BASE: ${OPENAI_API_BASE:-https://api.openai.com/v1}
-  MIGRATION_ENABLED: ${MIGRATION_ENABLED:-true}
-  FILES_ACCESS_TIMEOUT: ${FILES_ACCESS_TIMEOUT:-300}
-  ENABLE_COLLABORATION_MODE: ${ENABLE_COLLABORATION_MODE:-false}
-  ACCESS_TOKEN_EXPIRE_MINUTES: ${ACCESS_TOKEN_EXPIRE_MINUTES:-60}
-  REFRESH_TOKEN_EXPIRE_DAYS: ${REFRESH_TOKEN_EXPIRE_DAYS:-30}
-  APP_DEFAULT_ACTIVE_REQUESTS: ${APP_DEFAULT_ACTIVE_REQUESTS:-0}
-  APP_MAX_ACTIVE_REQUESTS: ${APP_MAX_ACTIVE_REQUESTS:-0}
-  APP_MAX_EXECUTION_TIME: ${APP_MAX_EXECUTION_TIME:-1200}
-  DIFY_BIND_ADDRESS: ${DIFY_BIND_ADDRESS:-0.0.0.0}
-  DIFY_PORT: ${DIFY_PORT:-5001}
-  SERVER_WORKER_AMOUNT: ${SERVER_WORKER_AMOUNT:-1}
-  SERVER_WORKER_CLASS: ${SERVER_WORKER_CLASS:-gevent}
-  SERVER_WORKER_CONNECTIONS: ${SERVER_WORKER_CONNECTIONS:-10}
-  CELERY_WORKER_CLASS: ${CELERY_WORKER_CLASS:-}
-  GUNICORN_TIMEOUT: ${GUNICORN_TIMEOUT:-360}
-  CELERY_WORKER_AMOUNT: ${CELERY_WORKER_AMOUNT:-4}
-  CELERY_AUTO_SCALE: ${CELERY_AUTO_SCALE:-false}
-  CELERY_MAX_WORKERS: ${CELERY_MAX_WORKERS:-}
-  CELERY_MIN_WORKERS: ${CELERY_MIN_WORKERS:-}
-  API_TOOL_DEFAULT_CONNECT_TIMEOUT: ${API_TOOL_DEFAULT_CONNECT_TIMEOUT:-10}
-  API_TOOL_DEFAULT_READ_TIMEOUT: ${API_TOOL_DEFAULT_READ_TIMEOUT:-60}
-  ENABLE_WEBSITE_JINAREADER: ${ENABLE_WEBSITE_JINAREADER:-true}
-  ENABLE_WEBSITE_FIRECRAWL: ${ENABLE_WEBSITE_FIRECRAWL:-true}
-  ENABLE_WEBSITE_WATERCRAWL: ${ENABLE_WEBSITE_WATERCRAWL:-true}
-  NEXT_PUBLIC_ENABLE_SINGLE_DOLLAR_LATEX: ${NEXT_PUBLIC_ENABLE_SINGLE_DOLLAR_LATEX:-false}
-  DB_TYPE: ${DB_TYPE:-postgresql}
-  DB_USERNAME: ${DB_USERNAME:-postgres}
-  DB_PASSWORD: ${DB_PASSWORD:-difyai123456}
-  DB_HOST: ${DB_HOST:-db_postgres}
-  DB_PORT: ${DB_PORT:-5432}
-  DB_DATABASE: ${DB_DATABASE:-dify}
-  SQLALCHEMY_POOL_SIZE: ${SQLALCHEMY_POOL_SIZE:-30}
-  SQLALCHEMY_MAX_OVERFLOW: ${SQLALCHEMY_MAX_OVERFLOW:-10}
-  SQLALCHEMY_POOL_RECYCLE: ${SQLALCHEMY_POOL_RECYCLE:-3600}
-  SQLALCHEMY_ECHO: ${SQLALCHEMY_ECHO:-false}
-  SQLALCHEMY_POOL_PRE_PING: ${SQLALCHEMY_POOL_PRE_PING:-false}
-  SQLALCHEMY_POOL_USE_LIFO: ${SQLALCHEMY_POOL_USE_LIFO:-false}
-  SQLALCHEMY_POOL_TIMEOUT: ${SQLALCHEMY_POOL_TIMEOUT:-30}
-  POSTGRES_MAX_CONNECTIONS: ${POSTGRES_MAX_CONNECTIONS:-200}
-  POSTGRES_SHARED_BUFFERS: ${POSTGRES_SHARED_BUFFERS:-128MB}
-  POSTGRES_WORK_MEM: ${POSTGRES_WORK_MEM:-4MB}
-  POSTGRES_MAINTENANCE_WORK_MEM: ${POSTGRES_MAINTENANCE_WORK_MEM:-64MB}
-  POSTGRES_EFFECTIVE_CACHE_SIZE: ${POSTGRES_EFFECTIVE_CACHE_SIZE:-4096MB}
-  POSTGRES_STATEMENT_TIMEOUT: ${POSTGRES_STATEMENT_TIMEOUT:-0}
-  POSTGRES_IDLE_IN_TRANSACTION_SESSION_TIMEOUT: ${POSTGRES_IDLE_IN_TRANSACTION_SESSION_TIMEOUT:-0}
-  MYSQL_MAX_CONNECTIONS: ${MYSQL_MAX_CONNECTIONS:-1000}
-  MYSQL_INNODB_BUFFER_POOL_SIZE: ${MYSQL_INNODB_BUFFER_POOL_SIZE:-512M}
-  MYSQL_INNODB_LOG_FILE_SIZE: ${MYSQL_INNODB_LOG_FILE_SIZE:-128M}
-  MYSQL_INNODB_FLUSH_LOG_AT_TRX_COMMIT: ${MYSQL_INNODB_FLUSH_LOG_AT_TRX_COMMIT:-2}
-  REDIS_HOST: ${REDIS_HOST:-redis}
-  REDIS_PORT: ${REDIS_PORT:-6379}
-  REDIS_USERNAME: ${REDIS_USERNAME:-}
-  REDIS_PASSWORD: ${REDIS_PASSWORD:-difyai123456}
-  REDIS_USE_SSL: ${REDIS_USE_SSL:-false}
-  REDIS_SSL_CERT_REQS: ${REDIS_SSL_CERT_REQS:-CERT_NONE}
-  REDIS_SSL_CA_CERTS: ${REDIS_SSL_CA_CERTS:-}
-  REDIS_SSL_CERTFILE: ${REDIS_SSL_CERTFILE:-}
-  REDIS_SSL_KEYFILE: ${REDIS_SSL_KEYFILE:-}
-  REDIS_DB: ${REDIS_DB:-0}
-  REDIS_KEY_PREFIX: ${REDIS_KEY_PREFIX:-}
-  REDIS_MAX_CONNECTIONS: ${REDIS_MAX_CONNECTIONS:-}
-  REDIS_USE_SENTINEL: ${REDIS_USE_SENTINEL:-false}
-  REDIS_SENTINELS: ${REDIS_SENTINELS:-}
-  REDIS_SENTINEL_SERVICE_NAME: ${REDIS_SENTINEL_SERVICE_NAME:-}
-  REDIS_SENTINEL_USERNAME: ${REDIS_SENTINEL_USERNAME:-}
-  REDIS_SENTINEL_PASSWORD: ${REDIS_SENTINEL_PASSWORD:-}
-  REDIS_SENTINEL_SOCKET_TIMEOUT: ${REDIS_SENTINEL_SOCKET_TIMEOUT:-0.1}
-  REDIS_USE_CLUSTERS: ${REDIS_USE_CLUSTERS:-false}
-  REDIS_CLUSTERS: ${REDIS_CLUSTERS:-}
-  REDIS_CLUSTERS_PASSWORD: ${REDIS_CLUSTERS_PASSWORD:-}
-  REDIS_RETRY_RETRIES: ${REDIS_RETRY_RETRIES:-3}
-  REDIS_RETRY_BACKOFF_BASE: ${REDIS_RETRY_BACKOFF_BASE:-1.0}
-  REDIS_RETRY_BACKOFF_CAP: ${REDIS_RETRY_BACKOFF_CAP:-10.0}
-  REDIS_SOCKET_TIMEOUT: ${REDIS_SOCKET_TIMEOUT:-5.0}
-  REDIS_SOCKET_CONNECT_TIMEOUT: ${REDIS_SOCKET_CONNECT_TIMEOUT:-5.0}
-  REDIS_HEALTH_CHECK_INTERVAL: ${REDIS_HEALTH_CHECK_INTERVAL:-30}
-  CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://:difyai123456@redis:6379/1}
-  CELERY_BACKEND: ${CELERY_BACKEND:-redis}
-  BROKER_USE_SSL: ${BROKER_USE_SSL:-false}
-  CELERY_USE_SENTINEL: ${CELERY_USE_SENTINEL:-false}
-  CELERY_SENTINEL_MASTER_NAME: ${CELERY_SENTINEL_MASTER_NAME:-}
-  CELERY_SENTINEL_PASSWORD: ${CELERY_SENTINEL_PASSWORD:-}
-  CELERY_SENTINEL_SOCKET_TIMEOUT: ${CELERY_SENTINEL_SOCKET_TIMEOUT:-0.1}
-  CELERY_TASK_ANNOTATIONS: ${CELERY_TASK_ANNOTATIONS:-null}
-  WEB_API_CORS_ALLOW_ORIGINS: ${WEB_API_CORS_ALLOW_ORIGINS:-*}
-  CONSOLE_CORS_ALLOW_ORIGINS: ${CONSOLE_CORS_ALLOW_ORIGINS:-*}
-  COOKIE_DOMAIN: ${COOKIE_DOMAIN:-}
-  NEXT_PUBLIC_COOKIE_DOMAIN: ${NEXT_PUBLIC_COOKIE_DOMAIN:-}
-  NEXT_PUBLIC_SOCKET_URL: ${NEXT_PUBLIC_SOCKET_URL:-ws://localhost}
-  NEXT_PUBLIC_BATCH_CONCURRENCY: ${NEXT_PUBLIC_BATCH_CONCURRENCY:-5}
-  STORAGE_TYPE: ${STORAGE_TYPE:-opendal}
-  OPENDAL_SCHEME: ${OPENDAL_SCHEME:-fs}
-  OPENDAL_FS_ROOT: ${OPENDAL_FS_ROOT:-storage}
-  CLICKZETTA_VOLUME_TYPE: ${CLICKZETTA_VOLUME_TYPE:-user}
-  CLICKZETTA_VOLUME_NAME: ${CLICKZETTA_VOLUME_NAME:-}
-  CLICKZETTA_VOLUME_TABLE_PREFIX: ${CLICKZETTA_VOLUME_TABLE_PREFIX:-dataset_}
-  CLICKZETTA_VOLUME_DIFY_PREFIX: ${CLICKZETTA_VOLUME_DIFY_PREFIX:-dify_km}
-  S3_ENDPOINT: ${S3_ENDPOINT:-}
-  S3_REGION: ${S3_REGION:-us-east-1}
-  S3_BUCKET_NAME: ${S3_BUCKET_NAME:-difyai}
-  S3_ACCESS_KEY: ${S3_ACCESS_KEY:-}
-  S3_SECRET_KEY: ${S3_SECRET_KEY:-}
-  S3_ADDRESS_STYLE: ${S3_ADDRESS_STYLE:-auto}
-  S3_USE_AWS_MANAGED_IAM: ${S3_USE_AWS_MANAGED_IAM:-false}
-  ARCHIVE_STORAGE_ENABLED: ${ARCHIVE_STORAGE_ENABLED:-false}
-  ARCHIVE_STORAGE_ENDPOINT: ${ARCHIVE_STORAGE_ENDPOINT:-}
-  ARCHIVE_STORAGE_ARCHIVE_BUCKET: ${ARCHIVE_STORAGE_ARCHIVE_BUCKET:-}
-  ARCHIVE_STORAGE_EXPORT_BUCKET: ${ARCHIVE_STORAGE_EXPORT_BUCKET:-}
-  ARCHIVE_STORAGE_ACCESS_KEY: ${ARCHIVE_STORAGE_ACCESS_KEY:-}
-  ARCHIVE_STORAGE_SECRET_KEY: ${ARCHIVE_STORAGE_SECRET_KEY:-}
-  ARCHIVE_STORAGE_REGION: ${ARCHIVE_STORAGE_REGION:-auto}
-  AZURE_BLOB_ACCOUNT_NAME: ${AZURE_BLOB_ACCOUNT_NAME:-difyai}
-  AZURE_BLOB_ACCOUNT_KEY: ${AZURE_BLOB_ACCOUNT_KEY:-difyai}
-  AZURE_BLOB_CONTAINER_NAME: ${AZURE_BLOB_CONTAINER_NAME:-difyai-container}
-  AZURE_BLOB_ACCOUNT_URL: ${AZURE_BLOB_ACCOUNT_URL:-https://<your_account_name>.blob.core.windows.net}
-  GOOGLE_STORAGE_BUCKET_NAME: ${GOOGLE_STORAGE_BUCKET_NAME:-your-bucket-name}
-  GOOGLE_STORAGE_SERVICE_ACCOUNT_JSON_BASE64: ${GOOGLE_STORAGE_SERVICE_ACCOUNT_JSON_BASE64:-}
-  ALIYUN_OSS_BUCKET_NAME: ${ALIYUN_OSS_BUCKET_NAME:-your-bucket-name}
-  ALIYUN_OSS_ACCESS_KEY: ${ALIYUN_OSS_ACCESS_KEY:-your-access-key}
-  ALIYUN_OSS_SECRET_KEY: ${ALIYUN_OSS_SECRET_KEY:-your-secret-key}
-  ALIYUN_OSS_ENDPOINT: ${ALIYUN_OSS_ENDPOINT:-https://oss-ap-southeast-1-internal.aliyuncs.com}
-  ALIYUN_OSS_REGION: ${ALIYUN_OSS_REGION:-ap-southeast-1}
-  ALIYUN_OSS_AUTH_VERSION: ${ALIYUN_OSS_AUTH_VERSION:-v4}
-  ALIYUN_OSS_PATH: ${ALIYUN_OSS_PATH:-your-path}
-  TENCENT_COS_BUCKET_NAME: ${TENCENT_COS_BUCKET_NAME:-your-bucket-name}
-  TENCENT_COS_SECRET_KEY: ${TENCENT_COS_SECRET_KEY:-your-secret-key}
-  TENCENT_COS_SECRET_ID: ${TENCENT_COS_SECRET_ID:-your-secret-id}
-  TENCENT_COS_REGION: ${TENCENT_COS_REGION:-your-region}
-  TENCENT_COS_SCHEME: ${TENCENT_COS_SCHEME:-your-scheme}
-  TENCENT_COS_CUSTOM_DOMAIN: ${TENCENT_COS_CUSTOM_DOMAIN:-your-custom-domain}
-  OCI_ENDPOINT: ${OCI_ENDPOINT:-https://your-object-storage-namespace.compat.objectstorage.us-ashburn-1.oraclecloud.com}
-  OCI_BUCKET_NAME: ${OCI_BUCKET_NAME:-your-bucket-name}
-  OCI_ACCESS_KEY: ${OCI_ACCESS_KEY:-your-access-key}
-  OCI_SECRET_KEY: ${OCI_SECRET_KEY:-your-secret-key}
-  OCI_REGION: ${OCI_REGION:-us-ashburn-1}
-  HUAWEI_OBS_BUCKET_NAME: ${HUAWEI_OBS_BUCKET_NAME:-your-bucket-name}
-  HUAWEI_OBS_SECRET_KEY: ${HUAWEI_OBS_SECRET_KEY:-your-secret-key}
-  HUAWEI_OBS_ACCESS_KEY: ${HUAWEI_OBS_ACCESS_KEY:-your-access-key}
-  HUAWEI_OBS_SERVER: ${HUAWEI_OBS_SERVER:-your-server-url}
-  HUAWEI_OBS_PATH_STYLE: ${HUAWEI_OBS_PATH_STYLE:-false}
-  VOLCENGINE_TOS_BUCKET_NAME: ${VOLCENGINE_TOS_BUCKET_NAME:-your-bucket-name}
-  VOLCENGINE_TOS_SECRET_KEY: ${VOLCENGINE_TOS_SECRET_KEY:-your-secret-key}
-  VOLCENGINE_TOS_ACCESS_KEY: ${VOLCENGINE_TOS_ACCESS_KEY:-your-access-key}
-  VOLCENGINE_TOS_ENDPOINT: ${VOLCENGINE_TOS_ENDPOINT:-your-server-url}
-  VOLCENGINE_TOS_REGION: ${VOLCENGINE_TOS_REGION:-your-region}
-  BAIDU_OBS_BUCKET_NAME: ${BAIDU_OBS_BUCKET_NAME:-your-bucket-name}
-  BAIDU_OBS_SECRET_KEY: ${BAIDU_OBS_SECRET_KEY:-your-secret-key}
-  BAIDU_OBS_ACCESS_KEY: ${BAIDU_OBS_ACCESS_KEY:-your-access-key}
-  BAIDU_OBS_ENDPOINT: ${BAIDU_OBS_ENDPOINT:-your-server-url}
-  SUPABASE_BUCKET_NAME: ${SUPABASE_BUCKET_NAME:-your-bucket-name}
-  SUPABASE_API_KEY: ${SUPABASE_API_KEY:-your-access-key}
-  SUPABASE_URL: ${SUPABASE_URL:-your-server-url}
-  VECTOR_STORE: ${VECTOR_STORE:-weaviate}
-  VECTOR_INDEX_NAME_PREFIX: ${VECTOR_INDEX_NAME_PREFIX:-Vector_index}
-  WEAVIATE_ENDPOINT: ${WEAVIATE_ENDPOINT:-http://weaviate:8080}
-  WEAVIATE_API_KEY: ${WEAVIATE_API_KEY:-WVF5YThaHlkYwhGUSmCRgsX3tD5ngdN8pkih}
-  WEAVIATE_GRPC_ENDPOINT: ${WEAVIATE_GRPC_ENDPOINT:-grpc://weaviate:50051}
-  WEAVIATE_TOKENIZATION: ${WEAVIATE_TOKENIZATION:-word}
-  OCEANBASE_VECTOR_HOST: ${OCEANBASE_VECTOR_HOST:-oceanbase}
-  OCEANBASE_VECTOR_PORT: ${OCEANBASE_VECTOR_PORT:-2881}
-  OCEANBASE_VECTOR_USER: ${OCEANBASE_VECTOR_USER:-root@test}
-  OCEANBASE_VECTOR_PASSWORD: ${OCEANBASE_VECTOR_PASSWORD:-difyai123456}
-  OCEANBASE_VECTOR_DATABASE: ${OCEANBASE_VECTOR_DATABASE:-test}
-  OCEANBASE_CLUSTER_NAME: ${OCEANBASE_CLUSTER_NAME:-difyai}
-  OCEANBASE_MEMORY_LIMIT: ${OCEANBASE_MEMORY_LIMIT:-6G}
-  OCEANBASE_ENABLE_HYBRID_SEARCH: ${OCEANBASE_ENABLE_HYBRID_SEARCH:-false}
-  OCEANBASE_FULLTEXT_PARSER: ${OCEANBASE_FULLTEXT_PARSER:-ik}
-  SEEKDB_MEMORY_LIMIT: ${SEEKDB_MEMORY_LIMIT:-2G}
-  QDRANT_URL: ${QDRANT_URL:-http://qdrant:6333}
-  QDRANT_API_KEY: ${QDRANT_API_KEY:-difyai123456}
-  QDRANT_CLIENT_TIMEOUT: ${QDRANT_CLIENT_TIMEOUT:-20}
-  QDRANT_GRPC_ENABLED: ${QDRANT_GRPC_ENABLED:-false}
-  QDRANT_GRPC_PORT: ${QDRANT_GRPC_PORT:-6334}
-  QDRANT_REPLICATION_FACTOR: ${QDRANT_REPLICATION_FACTOR:-1}
-  MILVUS_URI: ${MILVUS_URI:-http://host.docker.internal:19530}
-  MILVUS_DATABASE: ${MILVUS_DATABASE:-}
-  MILVUS_TOKEN: ${MILVUS_TOKEN:-}
-  MILVUS_USER: ${MILVUS_USER:-}
-  MILVUS_PASSWORD: ${MILVUS_PASSWORD:-}
-  MILVUS_ENABLE_HYBRID_SEARCH: ${MILVUS_ENABLE_HYBRID_SEARCH:-False}
-  MILVUS_ANALYZER_PARAMS: ${MILVUS_ANALYZER_PARAMS:-}
-  MYSCALE_HOST: ${MYSCALE_HOST:-myscale}
-  MYSCALE_PORT: ${MYSCALE_PORT:-8123}
-  MYSCALE_USER: ${MYSCALE_USER:-default}
-  MYSCALE_PASSWORD: ${MYSCALE_PASSWORD:-}
-  MYSCALE_DATABASE: ${MYSCALE_DATABASE:-dify}
-  MYSCALE_FTS_PARAMS: ${MYSCALE_FTS_PARAMS:-}
-  COUCHBASE_CONNECTION_STRING: ${COUCHBASE_CONNECTION_STRING:-couchbase://couchbase-server}
-  COUCHBASE_USER: ${COUCHBASE_USER:-Administrator}
-  COUCHBASE_PASSWORD: ${COUCHBASE_PASSWORD:-password}
-  COUCHBASE_BUCKET_NAME: ${COUCHBASE_BUCKET_NAME:-Embeddings}
-  COUCHBASE_SCOPE_NAME: ${COUCHBASE_SCOPE_NAME:-_default}
-  HOLOGRES_HOST: ${HOLOGRES_HOST:-}
-  HOLOGRES_PORT: ${HOLOGRES_PORT:-80}
-  HOLOGRES_DATABASE: ${HOLOGRES_DATABASE:-}
-  HOLOGRES_ACCESS_KEY_ID: ${HOLOGRES_ACCESS_KEY_ID:-}
-  HOLOGRES_ACCESS_KEY_SECRET: ${HOLOGRES_ACCESS_KEY_SECRET:-}
-  HOLOGRES_SCHEMA: ${HOLOGRES_SCHEMA:-public}
-  HOLOGRES_TOKENIZER: ${HOLOGRES_TOKENIZER:-jieba}
-  HOLOGRES_DISTANCE_METHOD: ${HOLOGRES_DISTANCE_METHOD:-Cosine}
-  HOLOGRES_BASE_QUANTIZATION_TYPE: ${HOLOGRES_BASE_QUANTIZATION_TYPE:-rabitq}
-  HOLOGRES_MAX_DEGREE: ${HOLOGRES_MAX_DEGREE:-64}
-  HOLOGRES_EF_CONSTRUCTION: ${HOLOGRES_EF_CONSTRUCTION:-400}
-  PGVECTOR_HOST: ${PGVECTOR_HOST:-pgvector}
-  PGVECTOR_PORT: ${PGVECTOR_PORT:-5432}
-  PGVECTOR_USER: ${PGVECTOR_USER:-postgres}
-  PGVECTOR_PASSWORD: ${PGVECTOR_PASSWORD:-difyai123456}
-  PGVECTOR_DATABASE: ${PGVECTOR_DATABASE:-dify}
-  PGVECTOR_MIN_CONNECTION: ${PGVECTOR_MIN_CONNECTION:-1}
-  PGVECTOR_MAX_CONNECTION: ${PGVECTOR_MAX_CONNECTION:-5}
-  PGVECTOR_PG_BIGM: ${PGVECTOR_PG_BIGM:-false}
-  PGVECTOR_PG_BIGM_VERSION: ${PGVECTOR_PG_BIGM_VERSION:-1.2-20240606}
-  VASTBASE_HOST: ${VASTBASE_HOST:-vastbase}
-  VASTBASE_PORT: ${VASTBASE_PORT:-5432}
-  VASTBASE_USER: ${VASTBASE_USER:-dify}
-  VASTBASE_PASSWORD: ${VASTBASE_PASSWORD:-Difyai123456}
-  VASTBASE_DATABASE: ${VASTBASE_DATABASE:-dify}
-  VASTBASE_MIN_CONNECTION: ${VASTBASE_MIN_CONNECTION:-1}
-  VASTBASE_MAX_CONNECTION: ${VASTBASE_MAX_CONNECTION:-5}
-  PGVECTO_RS_HOST: ${PGVECTO_RS_HOST:-pgvecto-rs}
-  PGVECTO_RS_PORT: ${PGVECTO_RS_PORT:-5432}
-  PGVECTO_RS_USER: ${PGVECTO_RS_USER:-postgres}
-  PGVECTO_RS_PASSWORD: ${PGVECTO_RS_PASSWORD:-difyai123456}
-  PGVECTO_RS_DATABASE: ${PGVECTO_RS_DATABASE:-dify}
-  ANALYTICDB_KEY_ID: ${ANALYTICDB_KEY_ID:-your-ak}
-  ANALYTICDB_KEY_SECRET: ${ANALYTICDB_KEY_SECRET:-your-sk}
-  ANALYTICDB_REGION_ID: ${ANALYTICDB_REGION_ID:-cn-hangzhou}
-  ANALYTICDB_INSTANCE_ID: ${ANALYTICDB_INSTANCE_ID:-gp-ab123456}
-  ANALYTICDB_ACCOUNT: ${ANALYTICDB_ACCOUNT:-testaccount}
-  ANALYTICDB_PASSWORD: ${ANALYTICDB_PASSWORD:-testpassword}
-  ANALYTICDB_NAMESPACE: ${ANALYTICDB_NAMESPACE:-dify}
-  ANALYTICDB_NAMESPACE_PASSWORD: ${ANALYTICDB_NAMESPACE_PASSWORD:-difypassword}
-  ANALYTICDB_HOST: ${ANALYTICDB_HOST:-gp-test.aliyuncs.com}
-  ANALYTICDB_PORT: ${ANALYTICDB_PORT:-5432}
-  ANALYTICDB_MIN_CONNECTION: ${ANALYTICDB_MIN_CONNECTION:-1}
-  ANALYTICDB_MAX_CONNECTION: ${ANALYTICDB_MAX_CONNECTION:-5}
-  TIDB_VECTOR_HOST: ${TIDB_VECTOR_HOST:-tidb}
-  TIDB_VECTOR_PORT: ${TIDB_VECTOR_PORT:-4000}
-  TIDB_VECTOR_USER: ${TIDB_VECTOR_USER:-}
-  TIDB_VECTOR_PASSWORD: ${TIDB_VECTOR_PASSWORD:-}
-  TIDB_VECTOR_DATABASE: ${TIDB_VECTOR_DATABASE:-dify}
-  MATRIXONE_HOST: ${MATRIXONE_HOST:-matrixone}
-  MATRIXONE_PORT: ${MATRIXONE_PORT:-6001}
-  MATRIXONE_USER: ${MATRIXONE_USER:-dump}
-  MATRIXONE_PASSWORD: ${MATRIXONE_PASSWORD:-111}
-  MATRIXONE_DATABASE: ${MATRIXONE_DATABASE:-dify}
-  TIDB_ON_QDRANT_URL: ${TIDB_ON_QDRANT_URL:-http://127.0.0.1}
-  TIDB_ON_QDRANT_API_KEY: ${TIDB_ON_QDRANT_API_KEY:-dify}
-  TIDB_ON_QDRANT_CLIENT_TIMEOUT: ${TIDB_ON_QDRANT_CLIENT_TIMEOUT:-20}
-  TIDB_ON_QDRANT_GRPC_ENABLED: ${TIDB_ON_QDRANT_GRPC_ENABLED:-false}
-  TIDB_ON_QDRANT_GRPC_PORT: ${TIDB_ON_QDRANT_GRPC_PORT:-6334}
-  TIDB_PUBLIC_KEY: ${TIDB_PUBLIC_KEY:-dify}
-  TIDB_PRIVATE_KEY: ${TIDB_PRIVATE_KEY:-dify}
-  TIDB_API_URL: ${TIDB_API_URL:-http://127.0.0.1}
-  TIDB_IAM_API_URL: ${TIDB_IAM_API_URL:-http://127.0.0.1}
-  TIDB_REGION: ${TIDB_REGION:-regions/aws-us-east-1}
-  TIDB_PROJECT_ID: ${TIDB_PROJECT_ID:-dify}
-  TIDB_SPEND_LIMIT: ${TIDB_SPEND_LIMIT:-100}
-  CHROMA_HOST: ${CHROMA_HOST:-127.0.0.1}
-  CHROMA_PORT: ${CHROMA_PORT:-8000}
-  CHROMA_TENANT: ${CHROMA_TENANT:-default_tenant}
-  CHROMA_DATABASE: ${CHROMA_DATABASE:-default_database}
-  CHROMA_AUTH_PROVIDER: ${CHROMA_AUTH_PROVIDER:-chromadb.auth.token_authn.TokenAuthClientProvider}
-  CHROMA_AUTH_CREDENTIALS: ${CHROMA_AUTH_CREDENTIALS:-}
-  ORACLE_USER: ${ORACLE_USER:-dify}
-  ORACLE_PASSWORD: ${ORACLE_PASSWORD:-dify}
-  ORACLE_DSN: ${ORACLE_DSN:-oracle:1521/FREEPDB1}
-  ORACLE_CONFIG_DIR: ${ORACLE_CONFIG_DIR:-/app/api/storage/wallet}
-  ORACLE_WALLET_LOCATION: ${ORACLE_WALLET_LOCATION:-/app/api/storage/wallet}
-  ORACLE_WALLET_PASSWORD: ${ORACLE_WALLET_PASSWORD:-dify}
-  ORACLE_IS_AUTONOMOUS: ${ORACLE_IS_AUTONOMOUS:-false}
-  ALIBABACLOUD_MYSQL_HOST: ${ALIBABACLOUD_MYSQL_HOST:-127.0.0.1}
-  ALIBABACLOUD_MYSQL_PORT: ${ALIBABACLOUD_MYSQL_PORT:-3306}
-  ALIBABACLOUD_MYSQL_USER: ${ALIBABACLOUD_MYSQL_USER:-root}
-  ALIBABACLOUD_MYSQL_PASSWORD: ${ALIBABACLOUD_MYSQL_PASSWORD:-difyai123456}
-  ALIBABACLOUD_MYSQL_DATABASE: ${ALIBABACLOUD_MYSQL_DATABASE:-dify}
-  ALIBABACLOUD_MYSQL_MAX_CONNECTION: ${ALIBABACLOUD_MYSQL_MAX_CONNECTION:-5}
-  ALIBABACLOUD_MYSQL_HNSW_M: ${ALIBABACLOUD_MYSQL_HNSW_M:-6}
-  RELYT_HOST: ${RELYT_HOST:-db}
-  RELYT_PORT: ${RELYT_PORT:-5432}
-  RELYT_USER: ${RELYT_USER:-postgres}
-  RELYT_PASSWORD: ${RELYT_PASSWORD:-difyai123456}
-  RELYT_DATABASE: ${RELYT_DATABASE:-postgres}
-  OPENSEARCH_HOST: ${OPENSEARCH_HOST:-opensearch}
-  OPENSEARCH_PORT: ${OPENSEARCH_PORT:-9200}
-  OPENSEARCH_SECURE: ${OPENSEARCH_SECURE:-true}
-  OPENSEARCH_VERIFY_CERTS: ${OPENSEARCH_VERIFY_CERTS:-true}
-  OPENSEARCH_AUTH_METHOD: ${OPENSEARCH_AUTH_METHOD:-basic}
-  OPENSEARCH_USER: ${OPENSEARCH_USER:-admin}
-  OPENSEARCH_PASSWORD: ${OPENSEARCH_PASSWORD:-admin}
-  OPENSEARCH_AWS_REGION: ${OPENSEARCH_AWS_REGION:-ap-southeast-1}
-  OPENSEARCH_AWS_SERVICE: ${OPENSEARCH_AWS_SERVICE:-aoss}
-  TENCENT_VECTOR_DB_URL: ${TENCENT_VECTOR_DB_URL:-http://127.0.0.1}
-  TENCENT_VECTOR_DB_API_KEY: ${TENCENT_VECTOR_DB_API_KEY:-dify}
-  TENCENT_VECTOR_DB_TIMEOUT: ${TENCENT_VECTOR_DB_TIMEOUT:-30}
-  TENCENT_VECTOR_DB_USERNAME: ${TENCENT_VECTOR_DB_USERNAME:-dify}
-  TENCENT_VECTOR_DB_DATABASE: ${TENCENT_VECTOR_DB_DATABASE:-dify}
-  TENCENT_VECTOR_DB_SHARD: ${TENCENT_VECTOR_DB_SHARD:-1}
-  TENCENT_VECTOR_DB_REPLICAS: ${TENCENT_VECTOR_DB_REPLICAS:-2}
-  TENCENT_VECTOR_DB_ENABLE_HYBRID_SEARCH: ${TENCENT_VECTOR_DB_ENABLE_HYBRID_SEARCH:-false}
-  ELASTICSEARCH_HOST: ${ELASTICSEARCH_HOST:-0.0.0.0}
-  ELASTICSEARCH_PORT: ${ELASTICSEARCH_PORT:-9200}
-  ELASTICSEARCH_USERNAME: ${ELASTICSEARCH_USERNAME:-elastic}
-  ELASTICSEARCH_PASSWORD: ${ELASTICSEARCH_PASSWORD:-elastic}
-  KIBANA_PORT: ${KIBANA_PORT:-5601}
-  ELASTICSEARCH_USE_CLOUD: ${ELASTICSEARCH_USE_CLOUD:-false}
-  ELASTICSEARCH_CLOUD_URL: ${ELASTICSEARCH_CLOUD_URL:-YOUR-ELASTICSEARCH_CLOUD_URL}
-  ELASTICSEARCH_API_KEY: ${ELASTICSEARCH_API_KEY:-YOUR-ELASTICSEARCH_API_KEY}
-  ELASTICSEARCH_VERIFY_CERTS: ${ELASTICSEARCH_VERIFY_CERTS:-False}
-  ELASTICSEARCH_CA_CERTS: ${ELASTICSEARCH_CA_CERTS:-}
-  ELASTICSEARCH_REQUEST_TIMEOUT: ${ELASTICSEARCH_REQUEST_TIMEOUT:-100000}
-  ELASTICSEARCH_RETRY_ON_TIMEOUT: ${ELASTICSEARCH_RETRY_ON_TIMEOUT:-True}
-  ELASTICSEARCH_MAX_RETRIES: ${ELASTICSEARCH_MAX_RETRIES:-10}
-  BAIDU_VECTOR_DB_ENDPOINT: ${BAIDU_VECTOR_DB_ENDPOINT:-http://127.0.0.1:5287}
-  BAIDU_VECTOR_DB_CONNECTION_TIMEOUT_MS: ${BAIDU_VECTOR_DB_CONNECTION_TIMEOUT_MS:-30000}
-  BAIDU_VECTOR_DB_ACCOUNT: ${BAIDU_VECTOR_DB_ACCOUNT:-root}
-  BAIDU_VECTOR_DB_API_KEY: ${BAIDU_VECTOR_DB_API_KEY:-dify}
-  BAIDU_VECTOR_DB_DATABASE: ${BAIDU_VECTOR_DB_DATABASE:-dify}
-  BAIDU_VECTOR_DB_SHARD: ${BAIDU_VECTOR_DB_SHARD:-1}
-  BAIDU_VECTOR_DB_REPLICAS: ${BAIDU_VECTOR_DB_REPLICAS:-3}
-  BAIDU_VECTOR_DB_INVERTED_INDEX_ANALYZER: ${BAIDU_VECTOR_DB_INVERTED_INDEX_ANALYZER:-DEFAULT_ANALYZER}
-  BAIDU_VECTOR_DB_INVERTED_INDEX_PARSER_MODE: ${BAIDU_VECTOR_DB_INVERTED_INDEX_PARSER_MODE:-COARSE_MODE}
-  BAIDU_VECTOR_DB_AUTO_BUILD_ROW_COUNT_INCREMENT: ${BAIDU_VECTOR_DB_AUTO_BUILD_ROW_COUNT_INCREMENT:-500}
-  BAIDU_VECTOR_DB_AUTO_BUILD_ROW_COUNT_INCREMENT_RATIO: ${BAIDU_VECTOR_DB_AUTO_BUILD_ROW_COUNT_INCREMENT_RATIO:-0.05}
-  BAIDU_VECTOR_DB_REBUILD_INDEX_TIMEOUT_IN_SECONDS: ${BAIDU_VECTOR_DB_REBUILD_INDEX_TIMEOUT_IN_SECONDS:-300}
-  VIKINGDB_ACCESS_KEY: ${VIKINGDB_ACCESS_KEY:-your-ak}
-  VIKINGDB_SECRET_KEY: ${VIKINGDB_SECRET_KEY:-your-sk}
-  VIKINGDB_REGION: ${VIKINGDB_REGION:-cn-shanghai}
-  VIKINGDB_HOST: ${VIKINGDB_HOST:-api-vikingdb.xxx.volces.com}
-  VIKINGDB_SCHEMA: ${VIKINGDB_SCHEMA:-http}
-  VIKINGDB_CONNECTION_TIMEOUT: ${VIKINGDB_CONNECTION_TIMEOUT:-30}
-  VIKINGDB_SOCKET_TIMEOUT: ${VIKINGDB_SOCKET_TIMEOUT:-30}
-  LINDORM_URL: ${LINDORM_URL:-http://localhost:30070}
-  LINDORM_USERNAME: ${LINDORM_USERNAME:-admin}
-  LINDORM_PASSWORD: ${LINDORM_PASSWORD:-admin}
-  LINDORM_USING_UGC: ${LINDORM_USING_UGC:-True}
-  LINDORM_QUERY_TIMEOUT: ${LINDORM_QUERY_TIMEOUT:-1}
-  OPENGAUSS_HOST: ${OPENGAUSS_HOST:-opengauss}
-  OPENGAUSS_PORT: ${OPENGAUSS_PORT:-6600}
-  OPENGAUSS_USER: ${OPENGAUSS_USER:-postgres}
-  OPENGAUSS_PASSWORD: ${OPENGAUSS_PASSWORD:-Dify@123}
-  OPENGAUSS_DATABASE: ${OPENGAUSS_DATABASE:-dify}
-  OPENGAUSS_MIN_CONNECTION: ${OPENGAUSS_MIN_CONNECTION:-1}
-  OPENGAUSS_MAX_CONNECTION: ${OPENGAUSS_MAX_CONNECTION:-5}
-  OPENGAUSS_ENABLE_PQ: ${OPENGAUSS_ENABLE_PQ:-false}
-  HUAWEI_CLOUD_HOSTS: ${HUAWEI_CLOUD_HOSTS:-https://127.0.0.1:9200}
-  HUAWEI_CLOUD_USER: ${HUAWEI_CLOUD_USER:-admin}
-  HUAWEI_CLOUD_PASSWORD: ${HUAWEI_CLOUD_PASSWORD:-admin}
-  UPSTASH_VECTOR_URL: ${UPSTASH_VECTOR_URL:-https://xxx-vector.upstash.io}
-  UPSTASH_VECTOR_TOKEN: ${UPSTASH_VECTOR_TOKEN:-dify}
-  TABLESTORE_ENDPOINT: ${TABLESTORE_ENDPOINT:-https://instance-name.cn-hangzhou.ots.aliyuncs.com}
-  TABLESTORE_INSTANCE_NAME: ${TABLESTORE_INSTANCE_NAME:-instance-name}
-  TABLESTORE_ACCESS_KEY_ID: ${TABLESTORE_ACCESS_KEY_ID:-xxx}
-  TABLESTORE_ACCESS_KEY_SECRET: ${TABLESTORE_ACCESS_KEY_SECRET:-xxx}
-  TABLESTORE_NORMALIZE_FULLTEXT_BM25_SCORE: ${TABLESTORE_NORMALIZE_FULLTEXT_BM25_SCORE:-false}
-  CLICKZETTA_USERNAME: ${CLICKZETTA_USERNAME:-}
-  CLICKZETTA_PASSWORD: ${CLICKZETTA_PASSWORD:-}
-  CLICKZETTA_INSTANCE: ${CLICKZETTA_INSTANCE:-}
-  CLICKZETTA_SERVICE: ${CLICKZETTA_SERVICE:-api.clickzetta.com}
-  CLICKZETTA_WORKSPACE: ${CLICKZETTA_WORKSPACE:-quick_start}
-  CLICKZETTA_VCLUSTER: ${CLICKZETTA_VCLUSTER:-default_ap}
-  CLICKZETTA_SCHEMA: ${CLICKZETTA_SCHEMA:-dify}
-  CLICKZETTA_BATCH_SIZE: ${CLICKZETTA_BATCH_SIZE:-100}
-  CLICKZETTA_ENABLE_INVERTED_INDEX: ${CLICKZETTA_ENABLE_INVERTED_INDEX:-true}
-  CLICKZETTA_ANALYZER_TYPE: ${CLICKZETTA_ANALYZER_TYPE:-chinese}
-  CLICKZETTA_ANALYZER_MODE: ${CLICKZETTA_ANALYZER_MODE:-smart}
-  CLICKZETTA_VECTOR_DISTANCE_FUNCTION: ${CLICKZETTA_VECTOR_DISTANCE_FUNCTION:-cosine_distance}
-  IRIS_HOST: ${IRIS_HOST:-iris}
-  IRIS_SUPER_SERVER_PORT: ${IRIS_SUPER_SERVER_PORT:-1972}
-  IRIS_WEB_SERVER_PORT: ${IRIS_WEB_SERVER_PORT:-52773}
-  IRIS_USER: ${IRIS_USER:-_SYSTEM}
-  IRIS_PASSWORD: ${IRIS_PASSWORD:-Dify@1234}
-  IRIS_DATABASE: ${IRIS_DATABASE:-USER}
-  IRIS_SCHEMA: ${IRIS_SCHEMA:-dify}
-  IRIS_CONNECTION_URL: ${IRIS_CONNECTION_URL:-}
-  IRIS_MIN_CONNECTION: ${IRIS_MIN_CONNECTION:-1}
-  IRIS_MAX_CONNECTION: ${IRIS_MAX_CONNECTION:-3}
-  IRIS_TEXT_INDEX: ${IRIS_TEXT_INDEX:-true}
-  IRIS_TEXT_INDEX_LANGUAGE: ${IRIS_TEXT_INDEX_LANGUAGE:-en}
-  IRIS_TIMEZONE: ${IRIS_TIMEZONE:-UTC}
-  UPLOAD_FILE_SIZE_LIMIT: ${UPLOAD_FILE_SIZE_LIMIT:-15}
-  UPLOAD_FILE_BATCH_LIMIT: ${UPLOAD_FILE_BATCH_LIMIT:-5}
-  UPLOAD_FILE_EXTENSION_BLACKLIST: ${UPLOAD_FILE_EXTENSION_BLACKLIST:-}
-  SINGLE_CHUNK_ATTACHMENT_LIMIT: ${SINGLE_CHUNK_ATTACHMENT_LIMIT:-10}
-  IMAGE_FILE_BATCH_LIMIT: ${IMAGE_FILE_BATCH_LIMIT:-10}
-  ATTACHMENT_IMAGE_FILE_SIZE_LIMIT: ${ATTACHMENT_IMAGE_FILE_SIZE_LIMIT:-2}
-  ATTACHMENT_IMAGE_DOWNLOAD_TIMEOUT: ${ATTACHMENT_IMAGE_DOWNLOAD_TIMEOUT:-60}
-  ETL_TYPE: ${ETL_TYPE:-dify}
-  UNSTRUCTURED_API_URL: ${UNSTRUCTURED_API_URL:-}
-  UNSTRUCTURED_API_KEY: ${UNSTRUCTURED_API_KEY:-}
-  SCARF_NO_ANALYTICS: ${SCARF_NO_ANALYTICS:-true}
-  PROMPT_GENERATION_MAX_TOKENS: ${PROMPT_GENERATION_MAX_TOKENS:-512}
-  CODE_GENERATION_MAX_TOKENS: ${CODE_GENERATION_MAX_TOKENS:-1024}
-  PLUGIN_BASED_TOKEN_COUNTING_ENABLED: ${PLUGIN_BASED_TOKEN_COUNTING_ENABLED:-false}
-  MULTIMODAL_SEND_FORMAT: ${MULTIMODAL_SEND_FORMAT:-base64}
-  UPLOAD_IMAGE_FILE_SIZE_LIMIT: ${UPLOAD_IMAGE_FILE_SIZE_LIMIT:-10}
-  UPLOAD_VIDEO_FILE_SIZE_LIMIT: ${UPLOAD_VIDEO_FILE_SIZE_LIMIT:-100}
-  UPLOAD_AUDIO_FILE_SIZE_LIMIT: ${UPLOAD_AUDIO_FILE_SIZE_LIMIT:-50}
-  SENTRY_DSN: ${SENTRY_DSN:-}
-  API_SENTRY_DSN: ${API_SENTRY_DSN:-}
-  API_SENTRY_TRACES_SAMPLE_RATE: ${API_SENTRY_TRACES_SAMPLE_RATE:-1.0}
-  API_SENTRY_PROFILES_SAMPLE_RATE: ${API_SENTRY_PROFILES_SAMPLE_RATE:-1.0}
-  WEB_SENTRY_DSN: ${WEB_SENTRY_DSN:-}
-  PLUGIN_SENTRY_ENABLED: ${PLUGIN_SENTRY_ENABLED:-false}
-  PLUGIN_SENTRY_DSN: ${PLUGIN_SENTRY_DSN:-}
-  NOTION_INTEGRATION_TYPE: ${NOTION_INTEGRATION_TYPE:-public}
-  NOTION_CLIENT_SECRET: ${NOTION_CLIENT_SECRET:-}
-  NOTION_CLIENT_ID: ${NOTION_CLIENT_ID:-}
-  NOTION_INTERNAL_SECRET: ${NOTION_INTERNAL_SECRET:-}
-  MAIL_TYPE: ${MAIL_TYPE:-resend}
-  MAIL_DEFAULT_SEND_FROM: ${MAIL_DEFAULT_SEND_FROM:-}
-  RESEND_API_URL: ${RESEND_API_URL:-https://api.resend.com}
-  RESEND_API_KEY: ${RESEND_API_KEY:-your-resend-api-key}
-  SMTP_SERVER: ${SMTP_SERVER:-}
-  SMTP_PORT: ${SMTP_PORT:-465}
-  SMTP_USERNAME: ${SMTP_USERNAME:-}
-  SMTP_PASSWORD: ${SMTP_PASSWORD:-}
-  SMTP_USE_TLS: ${SMTP_USE_TLS:-true}
-  SMTP_OPPORTUNISTIC_TLS: ${SMTP_OPPORTUNISTIC_TLS:-false}
-  SMTP_LOCAL_HOSTNAME: ${SMTP_LOCAL_HOSTNAME:-}
-  SENDGRID_API_KEY: ${SENDGRID_API_KEY:-}
-  INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH: ${INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH:-4000}
-  INVITE_EXPIRY_HOURS: ${INVITE_EXPIRY_HOURS:-72}
-  RESET_PASSWORD_TOKEN_EXPIRY_MINUTES: ${RESET_PASSWORD_TOKEN_EXPIRY_MINUTES:-5}
-  EMAIL_REGISTER_TOKEN_EXPIRY_MINUTES: ${EMAIL_REGISTER_TOKEN_EXPIRY_MINUTES:-5}
-  CHANGE_EMAIL_TOKEN_EXPIRY_MINUTES: ${CHANGE_EMAIL_TOKEN_EXPIRY_MINUTES:-5}
-  OWNER_TRANSFER_TOKEN_EXPIRY_MINUTES: ${OWNER_TRANSFER_TOKEN_EXPIRY_MINUTES:-5}
-  CODE_EXECUTION_ENDPOINT: ${CODE_EXECUTION_ENDPOINT:-http://sandbox:8194}
-  CODE_EXECUTION_API_KEY: ${CODE_EXECUTION_API_KEY:-dify-sandbox}
-  CODE_EXECUTION_SSL_VERIFY: ${CODE_EXECUTION_SSL_VERIFY:-True}
-  CODE_EXECUTION_POOL_MAX_CONNECTIONS: ${CODE_EXECUTION_POOL_MAX_CONNECTIONS:-100}
-  CODE_EXECUTION_POOL_MAX_KEEPALIVE_CONNECTIONS: ${CODE_EXECUTION_POOL_MAX_KEEPALIVE_CONNECTIONS:-20}
-  CODE_EXECUTION_POOL_KEEPALIVE_EXPIRY: ${CODE_EXECUTION_POOL_KEEPALIVE_EXPIRY:-5.0}
-  CODE_MAX_NUMBER: ${CODE_MAX_NUMBER:-9223372036854775807}
-  CODE_MIN_NUMBER: ${CODE_MIN_NUMBER:--9223372036854775808}
-  CODE_MAX_DEPTH: ${CODE_MAX_DEPTH:-5}
-  CODE_MAX_PRECISION: ${CODE_MAX_PRECISION:-20}
-  CODE_MAX_STRING_LENGTH: ${CODE_MAX_STRING_LENGTH:-400000}
-  CODE_MAX_STRING_ARRAY_LENGTH: ${CODE_MAX_STRING_ARRAY_LENGTH:-30}
-  CODE_MAX_OBJECT_ARRAY_LENGTH: ${CODE_MAX_OBJECT_ARRAY_LENGTH:-30}
-  CODE_MAX_NUMBER_ARRAY_LENGTH: ${CODE_MAX_NUMBER_ARRAY_LENGTH:-1000}
-  CODE_EXECUTION_CONNECT_TIMEOUT: ${CODE_EXECUTION_CONNECT_TIMEOUT:-10}
-  CODE_EXECUTION_READ_TIMEOUT: ${CODE_EXECUTION_READ_TIMEOUT:-60}
-  CODE_EXECUTION_WRITE_TIMEOUT: ${CODE_EXECUTION_WRITE_TIMEOUT:-10}
-  TEMPLATE_TRANSFORM_MAX_LENGTH: ${TEMPLATE_TRANSFORM_MAX_LENGTH:-400000}
-  WORKFLOW_MAX_EXECUTION_STEPS: ${WORKFLOW_MAX_EXECUTION_STEPS:-500}
-  WORKFLOW_MAX_EXECUTION_TIME: ${WORKFLOW_MAX_EXECUTION_TIME:-1200}
-  WORKFLOW_CALL_MAX_DEPTH: ${WORKFLOW_CALL_MAX_DEPTH:-5}
-  MAX_VARIABLE_SIZE: ${MAX_VARIABLE_SIZE:-204800}
-  WORKFLOW_FILE_UPLOAD_LIMIT: ${WORKFLOW_FILE_UPLOAD_LIMIT:-10}
-  GRAPH_ENGINE_MIN_WORKERS: ${GRAPH_ENGINE_MIN_WORKERS:-1}
-  GRAPH_ENGINE_MAX_WORKERS: ${GRAPH_ENGINE_MAX_WORKERS:-10}
-  GRAPH_ENGINE_SCALE_UP_THRESHOLD: ${GRAPH_ENGINE_SCALE_UP_THRESHOLD:-3}
-  GRAPH_ENGINE_SCALE_DOWN_IDLE_TIME: ${GRAPH_ENGINE_SCALE_DOWN_IDLE_TIME:-5.0}
-  WORKFLOW_NODE_EXECUTION_STORAGE: ${WORKFLOW_NODE_EXECUTION_STORAGE:-rdbms}
-  CORE_WORKFLOW_EXECUTION_REPOSITORY: ${CORE_WORKFLOW_EXECUTION_REPOSITORY:-core.repositories.sqlalchemy_workflow_execution_repository.SQLAlchemyWorkflowExecutionRepository}
-  CORE_WORKFLOW_NODE_EXECUTION_REPOSITORY: ${CORE_WORKFLOW_NODE_EXECUTION_REPOSITORY:-core.repositories.sqlalchemy_workflow_node_execution_repository.SQLAlchemyWorkflowNodeExecutionRepository}
-  API_WORKFLOW_RUN_REPOSITORY: ${API_WORKFLOW_RUN_REPOSITORY:-repositories.sqlalchemy_api_workflow_run_repository.DifyAPISQLAlchemyWorkflowRunRepository}
-  API_WORKFLOW_NODE_EXECUTION_REPOSITORY: ${API_WORKFLOW_NODE_EXECUTION_REPOSITORY:-repositories.sqlalchemy_api_workflow_node_execution_repository.DifyAPISQLAlchemyWorkflowNodeExecutionRepository}
-  WORKFLOW_LOG_CLEANUP_ENABLED: ${WORKFLOW_LOG_CLEANUP_ENABLED:-false}
-  WORKFLOW_LOG_RETENTION_DAYS: ${WORKFLOW_LOG_RETENTION_DAYS:-30}
-  WORKFLOW_LOG_CLEANUP_BATCH_SIZE: ${WORKFLOW_LOG_CLEANUP_BATCH_SIZE:-100}
-  WORKFLOW_LOG_CLEANUP_SPECIFIC_WORKFLOW_IDS: ${WORKFLOW_LOG_CLEANUP_SPECIFIC_WORKFLOW_IDS:-}
-  ALIYUN_SLS_ACCESS_KEY_ID: ${ALIYUN_SLS_ACCESS_KEY_ID:-}
-  ALIYUN_SLS_ACCESS_KEY_SECRET: ${ALIYUN_SLS_ACCESS_KEY_SECRET:-}
-  ALIYUN_SLS_ENDPOINT: ${ALIYUN_SLS_ENDPOINT:-}
-  ALIYUN_SLS_REGION: ${ALIYUN_SLS_REGION:-}
-  ALIYUN_SLS_PROJECT_NAME: ${ALIYUN_SLS_PROJECT_NAME:-}
-  ALIYUN_SLS_LOGSTORE_TTL: ${ALIYUN_SLS_LOGSTORE_TTL:-365}
-  LOGSTORE_DUAL_WRITE_ENABLED: ${LOGSTORE_DUAL_WRITE_ENABLED:-false}
-  LOGSTORE_DUAL_READ_ENABLED: ${LOGSTORE_DUAL_READ_ENABLED:-true}
-  LOGSTORE_ENABLE_PUT_GRAPH_FIELD: ${LOGSTORE_ENABLE_PUT_GRAPH_FIELD:-true}
-  HTTP_REQUEST_NODE_MAX_BINARY_SIZE: ${HTTP_REQUEST_NODE_MAX_BINARY_SIZE:-10485760}
-  HTTP_REQUEST_NODE_MAX_TEXT_SIZE: ${HTTP_REQUEST_NODE_MAX_TEXT_SIZE:-1048576}
-  HTTP_REQUEST_NODE_SSL_VERIFY: ${HTTP_REQUEST_NODE_SSL_VERIFY:-True}
-  HTTP_REQUEST_MAX_CONNECT_TIMEOUT: ${HTTP_REQUEST_MAX_CONNECT_TIMEOUT:-10}
-  HTTP_REQUEST_MAX_READ_TIMEOUT: ${HTTP_REQUEST_MAX_READ_TIMEOUT:-600}
-  HTTP_REQUEST_MAX_WRITE_TIMEOUT: ${HTTP_REQUEST_MAX_WRITE_TIMEOUT:-600}
-  WEBHOOK_REQUEST_BODY_MAX_SIZE: ${WEBHOOK_REQUEST_BODY_MAX_SIZE:-10485760}
-  RESPECT_XFORWARD_HEADERS_ENABLED: ${RESPECT_XFORWARD_HEADERS_ENABLED:-false}
-  SSRF_PROXY_HTTP_URL: ${SSRF_PROXY_HTTP_URL:-http://ssrf_proxy:3128}
-  SSRF_PROXY_HTTPS_URL: ${SSRF_PROXY_HTTPS_URL:-http://ssrf_proxy:3128}
-  LOOP_NODE_MAX_COUNT: ${LOOP_NODE_MAX_COUNT:-100}
-  MAX_TOOLS_NUM: ${MAX_TOOLS_NUM:-10}
-  MAX_PARALLEL_LIMIT: ${MAX_PARALLEL_LIMIT:-10}
-  MAX_ITERATIONS_NUM: ${MAX_ITERATIONS_NUM:-99}
-  TEXT_GENERATION_TIMEOUT_MS: ${TEXT_GENERATION_TIMEOUT_MS:-60000}
-  EXPERIMENTAL_ENABLE_VINEXT: ${EXPERIMENTAL_ENABLE_VINEXT:-false}
-  ALLOW_INLINE_STYLES: ${ALLOW_INLINE_STYLES:-false}
-  ALLOW_UNSAFE_DATA_SCHEME: ${ALLOW_UNSAFE_DATA_SCHEME:-false}
-  MAX_TREE_DEPTH: ${MAX_TREE_DEPTH:-50}
-  PGDATA: ${PGDATA:-/var/lib/postgresql/data/pgdata}
-  MYSQL_HOST_VOLUME: ${MYSQL_HOST_VOLUME:-./volumes/mysql/data}
-  SANDBOX_API_KEY: ${SANDBOX_API_KEY:-dify-sandbox}
-  SANDBOX_GIN_MODE: ${SANDBOX_GIN_MODE:-release}
-  SANDBOX_WORKER_TIMEOUT: ${SANDBOX_WORKER_TIMEOUT:-15}
-  SANDBOX_ENABLE_NETWORK: ${SANDBOX_ENABLE_NETWORK:-true}
-  SANDBOX_HTTP_PROXY: ${SANDBOX_HTTP_PROXY:-http://ssrf_proxy:3128}
-  SANDBOX_HTTPS_PROXY: ${SANDBOX_HTTPS_PROXY:-http://ssrf_proxy:3128}
-  SANDBOX_PORT: ${SANDBOX_PORT:-8194}
-  WEAVIATE_PERSISTENCE_DATA_PATH: ${WEAVIATE_PERSISTENCE_DATA_PATH:-/var/lib/weaviate}
-  WEAVIATE_QUERY_DEFAULTS_LIMIT: ${WEAVIATE_QUERY_DEFAULTS_LIMIT:-25}
-  WEAVIATE_AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED: ${WEAVIATE_AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED:-true}
-  WEAVIATE_DEFAULT_VECTORIZER_MODULE: ${WEAVIATE_DEFAULT_VECTORIZER_MODULE:-none}
-  WEAVIATE_CLUSTER_HOSTNAME: ${WEAVIATE_CLUSTER_HOSTNAME:-node1}
-  WEAVIATE_AUTHENTICATION_APIKEY_ENABLED: ${WEAVIATE_AUTHENTICATION_APIKEY_ENABLED:-true}
-  WEAVIATE_AUTHENTICATION_APIKEY_ALLOWED_KEYS: ${WEAVIATE_AUTHENTICATION_APIKEY_ALLOWED_KEYS:-WVF5YThaHlkYwhGUSmCRgsX3tD5ngdN8pkih}
-  WEAVIATE_AUTHENTICATION_APIKEY_USERS: ${WEAVIATE_AUTHENTICATION_APIKEY_USERS:-hello@dify.ai}
-  WEAVIATE_AUTHORIZATION_ADMINLIST_ENABLED: ${WEAVIATE_AUTHORIZATION_ADMINLIST_ENABLED:-true}
-  WEAVIATE_AUTHORIZATION_ADMINLIST_USERS: ${WEAVIATE_AUTHORIZATION_ADMINLIST_USERS:-hello@dify.ai}
-  WEAVIATE_DISABLE_TELEMETRY: ${WEAVIATE_DISABLE_TELEMETRY:-false}
-  WEAVIATE_ENABLE_TOKENIZER_GSE: ${WEAVIATE_ENABLE_TOKENIZER_GSE:-false}
-  WEAVIATE_ENABLE_TOKENIZER_KAGOME_JA: ${WEAVIATE_ENABLE_TOKENIZER_KAGOME_JA:-false}
-  WEAVIATE_ENABLE_TOKENIZER_KAGOME_KR: ${WEAVIATE_ENABLE_TOKENIZER_KAGOME_KR:-false}
-  CHROMA_SERVER_AUTHN_CREDENTIALS: ${CHROMA_SERVER_AUTHN_CREDENTIALS:-difyai123456}
-  CHROMA_SERVER_AUTHN_PROVIDER: ${CHROMA_SERVER_AUTHN_PROVIDER:-chromadb.auth.token_authn.TokenAuthenticationServerProvider}
-  CHROMA_IS_PERSISTENT: ${CHROMA_IS_PERSISTENT:-TRUE}
-  ORACLE_PWD: ${ORACLE_PWD:-Dify123456}
-  ORACLE_CHARACTERSET: ${ORACLE_CHARACTERSET:-AL32UTF8}
-  ETCD_AUTO_COMPACTION_MODE: ${ETCD_AUTO_COMPACTION_MODE:-revision}
-  ETCD_AUTO_COMPACTION_RETENTION: ${ETCD_AUTO_COMPACTION_RETENTION:-1000}
-  ETCD_QUOTA_BACKEND_BYTES: ${ETCD_QUOTA_BACKEND_BYTES:-4294967296}
-  ETCD_SNAPSHOT_COUNT: ${ETCD_SNAPSHOT_COUNT:-50000}
-  MINIO_ACCESS_KEY: ${MINIO_ACCESS_KEY:-minioadmin}
-  MINIO_SECRET_KEY: ${MINIO_SECRET_KEY:-minioadmin}
-  ETCD_ENDPOINTS: ${ETCD_ENDPOINTS:-etcd:2379}
-  MINIO_ADDRESS: ${MINIO_ADDRESS:-minio:9000}
-  MILVUS_AUTHORIZATION_ENABLED: ${MILVUS_AUTHORIZATION_ENABLED:-true}
-  PGVECTOR_PGUSER: ${PGVECTOR_PGUSER:-postgres}
-  PGVECTOR_POSTGRES_PASSWORD: ${PGVECTOR_POSTGRES_PASSWORD:-difyai123456}
-  PGVECTOR_POSTGRES_DB: ${PGVECTOR_POSTGRES_DB:-dify}
-  PGVECTOR_PGDATA: ${PGVECTOR_PGDATA:-/var/lib/postgresql/data/pgdata}
-  OPENSEARCH_DISCOVERY_TYPE: ${OPENSEARCH_DISCOVERY_TYPE:-single-node}
-  OPENSEARCH_BOOTSTRAP_MEMORY_LOCK: ${OPENSEARCH_BOOTSTRAP_MEMORY_LOCK:-true}
-  OPENSEARCH_JAVA_OPTS_MIN: ${OPENSEARCH_JAVA_OPTS_MIN:-512m}
-  OPENSEARCH_JAVA_OPTS_MAX: ${OPENSEARCH_JAVA_OPTS_MAX:-1024m}
-  OPENSEARCH_INITIAL_ADMIN_PASSWORD: ${OPENSEARCH_INITIAL_ADMIN_PASSWORD:-Qazwsxedc!@#123}
-  OPENSEARCH_MEMLOCK_SOFT: ${OPENSEARCH_MEMLOCK_SOFT:--1}
-  OPENSEARCH_MEMLOCK_HARD: ${OPENSEARCH_MEMLOCK_HARD:--1}
-  OPENSEARCH_NOFILE_SOFT: ${OPENSEARCH_NOFILE_SOFT:-65536}
-  OPENSEARCH_NOFILE_HARD: ${OPENSEARCH_NOFILE_HARD:-65536}
-  NGINX_SERVER_NAME: ${NGINX_SERVER_NAME:-_}
-  NGINX_HTTPS_ENABLED: ${NGINX_HTTPS_ENABLED:-false}
-  NGINX_PORT: ${NGINX_PORT:-80}
-  NGINX_SSL_PORT: ${NGINX_SSL_PORT:-443}
-  NGINX_SSL_CERT_FILENAME: ${NGINX_SSL_CERT_FILENAME:-dify.crt}
-  NGINX_SSL_CERT_KEY_FILENAME: ${NGINX_SSL_CERT_KEY_FILENAME:-dify.key}
-  NGINX_SSL_PROTOCOLS: ${NGINX_SSL_PROTOCOLS:-TLSv1.2 TLSv1.3}
-  NGINX_WORKER_PROCESSES: ${NGINX_WORKER_PROCESSES:-auto}
-  NGINX_CLIENT_MAX_BODY_SIZE: ${NGINX_CLIENT_MAX_BODY_SIZE:-100M}
-  NGINX_KEEPALIVE_TIMEOUT: ${NGINX_KEEPALIVE_TIMEOUT:-65}
-  NGINX_PROXY_READ_TIMEOUT: ${NGINX_PROXY_READ_TIMEOUT:-3600s}
-  NGINX_PROXY_SEND_TIMEOUT: ${NGINX_PROXY_SEND_TIMEOUT:-3600s}
-  NGINX_ENABLE_CERTBOT_CHALLENGE: ${NGINX_ENABLE_CERTBOT_CHALLENGE:-false}
-  CERTBOT_EMAIL: ${CERTBOT_EMAIL:-your_email@example.com}
-  CERTBOT_DOMAIN: ${CERTBOT_DOMAIN:-your_domain.com}
-  CERTBOT_OPTIONS: ${CERTBOT_OPTIONS:-}
-  SSRF_HTTP_PORT: ${SSRF_HTTP_PORT:-3128}
-  SSRF_COREDUMP_DIR: ${SSRF_COREDUMP_DIR:-/var/spool/squid}
-  SSRF_REVERSE_PROXY_PORT: ${SSRF_REVERSE_PROXY_PORT:-8194}
-  SSRF_SANDBOX_HOST: ${SSRF_SANDBOX_HOST:-sandbox}
-  SSRF_DEFAULT_TIME_OUT: ${SSRF_DEFAULT_TIME_OUT:-5}
-  SSRF_DEFAULT_CONNECT_TIME_OUT: ${SSRF_DEFAULT_CONNECT_TIME_OUT:-5}
-  SSRF_DEFAULT_READ_TIME_OUT: ${SSRF_DEFAULT_READ_TIME_OUT:-5}
-  SSRF_DEFAULT_WRITE_TIME_OUT: ${SSRF_DEFAULT_WRITE_TIME_OUT:-5}
-  SSRF_POOL_MAX_CONNECTIONS: ${SSRF_POOL_MAX_CONNECTIONS:-100}
-  SSRF_POOL_MAX_KEEPALIVE_CONNECTIONS: ${SSRF_POOL_MAX_KEEPALIVE_CONNECTIONS:-20}
-  SSRF_POOL_KEEPALIVE_EXPIRY: ${SSRF_POOL_KEEPALIVE_EXPIRY:-5.0}
-  EXPOSE_NGINX_PORT: ${EXPOSE_NGINX_PORT:-80}
-  EXPOSE_NGINX_SSL_PORT: ${EXPOSE_NGINX_SSL_PORT:-443}
-  POSITION_TOOL_PINS: ${POSITION_TOOL_PINS:-}
-  POSITION_TOOL_INCLUDES: ${POSITION_TOOL_INCLUDES:-}
-  POSITION_TOOL_EXCLUDES: ${POSITION_TOOL_EXCLUDES:-}
-  POSITION_PROVIDER_PINS: ${POSITION_PROVIDER_PINS:-}
-  POSITION_PROVIDER_INCLUDES: ${POSITION_PROVIDER_INCLUDES:-}
-  POSITION_PROVIDER_EXCLUDES: ${POSITION_PROVIDER_EXCLUDES:-}
-  CSP_WHITELIST: ${CSP_WHITELIST:-}
-  CREATE_TIDB_SERVICE_JOB_ENABLED: ${CREATE_TIDB_SERVICE_JOB_ENABLED:-false}
-  MAX_SUBMIT_COUNT: ${MAX_SUBMIT_COUNT:-100}
-  TOP_K_MAX_VALUE: ${TOP_K_MAX_VALUE:-10}
-  DB_PLUGIN_DATABASE: ${DB_PLUGIN_DATABASE:-dify_plugin}
-  EXPOSE_PLUGIN_DAEMON_PORT: ${EXPOSE_PLUGIN_DAEMON_PORT:-5002}
-  PLUGIN_DAEMON_PORT: ${PLUGIN_DAEMON_PORT:-5002}
-  PLUGIN_DAEMON_KEY: ${PLUGIN_DAEMON_KEY:-lYkiYYT6owG+71oLerGzA7GXCgOT++6ovaezWAjpCjf+Sjc3ZtU+qUEi}
-  PLUGIN_DAEMON_URL: ${PLUGIN_DAEMON_URL:-http://plugin_daemon:5002}
-  PLUGIN_MAX_PACKAGE_SIZE: ${PLUGIN_MAX_PACKAGE_SIZE:-52428800}
-  PLUGIN_MODEL_SCHEMA_CACHE_TTL: ${PLUGIN_MODEL_SCHEMA_CACHE_TTL:-3600}
-  PLUGIN_PPROF_ENABLED: ${PLUGIN_PPROF_ENABLED:-false}
-  PLUGIN_DEBUGGING_HOST: ${PLUGIN_DEBUGGING_HOST:-0.0.0.0}
-  PLUGIN_DEBUGGING_PORT: ${PLUGIN_DEBUGGING_PORT:-5003}
-  EXPOSE_PLUGIN_DEBUGGING_HOST: ${EXPOSE_PLUGIN_DEBUGGING_HOST:-localhost}
-  EXPOSE_PLUGIN_DEBUGGING_PORT: ${EXPOSE_PLUGIN_DEBUGGING_PORT:-5003}
-  PLUGIN_DIFY_INNER_API_KEY: ${PLUGIN_DIFY_INNER_API_KEY:-QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1}
-  PLUGIN_DIFY_INNER_API_URL: ${PLUGIN_DIFY_INNER_API_URL:-http://api:5001}
-  ENDPOINT_URL_TEMPLATE: ${ENDPOINT_URL_TEMPLATE:-http://localhost/e/{hook_id}}
-  MARKETPLACE_ENABLED: ${MARKETPLACE_ENABLED:-true}
-  MARKETPLACE_API_URL: ${MARKETPLACE_API_URL:-https://marketplace.dify.ai}
-  CREATORS_PLATFORM_FEATURES_ENABLED: ${CREATORS_PLATFORM_FEATURES_ENABLED:-true}
-  CREATORS_PLATFORM_API_URL: ${CREATORS_PLATFORM_API_URL:-https://creators.dify.ai}
-  CREATORS_PLATFORM_OAUTH_CLIENT_ID: ${CREATORS_PLATFORM_OAUTH_CLIENT_ID:-}
-  FORCE_VERIFYING_SIGNATURE: ${FORCE_VERIFYING_SIGNATURE:-true}
-  ENFORCE_LANGGENIUS_PLUGIN_SIGNATURES: ${ENFORCE_LANGGENIUS_PLUGIN_SIGNATURES:-true}
-  PLUGIN_STDIO_BUFFER_SIZE: ${PLUGIN_STDIO_BUFFER_SIZE:-1024}
-  PLUGIN_STDIO_MAX_BUFFER_SIZE: ${PLUGIN_STDIO_MAX_BUFFER_SIZE:-5242880}
-  PLUGIN_PYTHON_ENV_INIT_TIMEOUT: ${PLUGIN_PYTHON_ENV_INIT_TIMEOUT:-120}
-  PLUGIN_MAX_EXECUTION_TIMEOUT: ${PLUGIN_MAX_EXECUTION_TIMEOUT:-600}
-  PLUGIN_DAEMON_TIMEOUT: ${PLUGIN_DAEMON_TIMEOUT:-600.0}
-  PIP_MIRROR_URL: ${PIP_MIRROR_URL:-}
-  PLUGIN_STORAGE_TYPE: ${PLUGIN_STORAGE_TYPE:-local}
-  PLUGIN_STORAGE_LOCAL_ROOT: ${PLUGIN_STORAGE_LOCAL_ROOT:-/app/storage}
-  PLUGIN_WORKING_PATH: ${PLUGIN_WORKING_PATH:-/app/storage/cwd}
-  PLUGIN_INSTALLED_PATH: ${PLUGIN_INSTALLED_PATH:-plugin}
-  PLUGIN_PACKAGE_CACHE_PATH: ${PLUGIN_PACKAGE_CACHE_PATH:-plugin_packages}
-  PLUGIN_MEDIA_CACHE_PATH: ${PLUGIN_MEDIA_CACHE_PATH:-assets}
-  PLUGIN_STORAGE_OSS_BUCKET: ${PLUGIN_STORAGE_OSS_BUCKET:-}
-  PLUGIN_S3_USE_AWS: ${PLUGIN_S3_USE_AWS:-false}
-  PLUGIN_S3_USE_AWS_MANAGED_IAM: ${PLUGIN_S3_USE_AWS_MANAGED_IAM:-false}
-  PLUGIN_S3_ENDPOINT: ${PLUGIN_S3_ENDPOINT:-}
-  PLUGIN_S3_USE_PATH_STYLE: ${PLUGIN_S3_USE_PATH_STYLE:-false}
-  PLUGIN_AWS_ACCESS_KEY: ${PLUGIN_AWS_ACCESS_KEY:-}
-  PLUGIN_AWS_SECRET_KEY: ${PLUGIN_AWS_SECRET_KEY:-}
-  PLUGIN_AWS_REGION: ${PLUGIN_AWS_REGION:-}
-  PLUGIN_AZURE_BLOB_STORAGE_CONTAINER_NAME: ${PLUGIN_AZURE_BLOB_STORAGE_CONTAINER_NAME:-}
-  PLUGIN_AZURE_BLOB_STORAGE_CONNECTION_STRING: ${PLUGIN_AZURE_BLOB_STORAGE_CONNECTION_STRING:-}
-  PLUGIN_TENCENT_COS_SECRET_KEY: ${PLUGIN_TENCENT_COS_SECRET_KEY:-}
-  PLUGIN_TENCENT_COS_SECRET_ID: ${PLUGIN_TENCENT_COS_SECRET_ID:-}
-  PLUGIN_TENCENT_COS_REGION: ${PLUGIN_TENCENT_COS_REGION:-}
-  PLUGIN_ALIYUN_OSS_REGION: ${PLUGIN_ALIYUN_OSS_REGION:-}
-  PLUGIN_ALIYUN_OSS_ENDPOINT: ${PLUGIN_ALIYUN_OSS_ENDPOINT:-}
-  PLUGIN_ALIYUN_OSS_ACCESS_KEY_ID: ${PLUGIN_ALIYUN_OSS_ACCESS_KEY_ID:-}
-  PLUGIN_ALIYUN_OSS_ACCESS_KEY_SECRET: ${PLUGIN_ALIYUN_OSS_ACCESS_KEY_SECRET:-}
-  PLUGIN_ALIYUN_OSS_AUTH_VERSION: ${PLUGIN_ALIYUN_OSS_AUTH_VERSION:-v4}
-  PLUGIN_ALIYUN_OSS_PATH: ${PLUGIN_ALIYUN_OSS_PATH:-}
-  PLUGIN_VOLCENGINE_TOS_ENDPOINT: ${PLUGIN_VOLCENGINE_TOS_ENDPOINT:-}
-  PLUGIN_VOLCENGINE_TOS_ACCESS_KEY: ${PLUGIN_VOLCENGINE_TOS_ACCESS_KEY:-}
-  PLUGIN_VOLCENGINE_TOS_SECRET_KEY: ${PLUGIN_VOLCENGINE_TOS_SECRET_KEY:-}
-  PLUGIN_VOLCENGINE_TOS_REGION: ${PLUGIN_VOLCENGINE_TOS_REGION:-}
-  ENABLE_OTEL: ${ENABLE_OTEL:-false}
-  OTLP_TRACE_ENDPOINT: ${OTLP_TRACE_ENDPOINT:-}
-  OTLP_METRIC_ENDPOINT: ${OTLP_METRIC_ENDPOINT:-}
-  OTLP_BASE_ENDPOINT: ${OTLP_BASE_ENDPOINT:-http://localhost:4318}
-  OTLP_API_KEY: ${OTLP_API_KEY:-}
-  OTEL_EXPORTER_OTLP_PROTOCOL: ${OTEL_EXPORTER_OTLP_PROTOCOL:-}
-  OTEL_EXPORTER_TYPE: ${OTEL_EXPORTER_TYPE:-otlp}
-  OTEL_SAMPLING_RATE: ${OTEL_SAMPLING_RATE:-0.1}
-  OTEL_BATCH_EXPORT_SCHEDULE_DELAY: ${OTEL_BATCH_EXPORT_SCHEDULE_DELAY:-5000}
-  OTEL_MAX_QUEUE_SIZE: ${OTEL_MAX_QUEUE_SIZE:-2048}
-  OTEL_MAX_EXPORT_BATCH_SIZE: ${OTEL_MAX_EXPORT_BATCH_SIZE:-512}
-  OTEL_METRIC_EXPORT_INTERVAL: ${OTEL_METRIC_EXPORT_INTERVAL:-60000}
-  OTEL_BATCH_EXPORT_TIMEOUT: ${OTEL_BATCH_EXPORT_TIMEOUT:-10000}
-  OTEL_METRIC_EXPORT_TIMEOUT: ${OTEL_METRIC_EXPORT_TIMEOUT:-30000}
-  ALLOW_EMBED: ${ALLOW_EMBED:-false}
-  QUEUE_MONITOR_THRESHOLD: ${QUEUE_MONITOR_THRESHOLD:-200}
-  QUEUE_MONITOR_ALERT_EMAILS: ${QUEUE_MONITOR_ALERT_EMAILS:-}
-  QUEUE_MONITOR_INTERVAL: ${QUEUE_MONITOR_INTERVAL:-30}
-  SWAGGER_UI_ENABLED: ${SWAGGER_UI_ENABLED:-false}
-  SWAGGER_UI_PATH: ${SWAGGER_UI_PATH:-/swagger-ui.html}
-  DSL_EXPORT_ENCRYPT_DATASET_ID: ${DSL_EXPORT_ENCRYPT_DATASET_ID:-true}
-  DATASET_MAX_SEGMENTS_PER_REQUEST: ${DATASET_MAX_SEGMENTS_PER_REQUEST:-0}
-  ENABLE_CLEAN_EMBEDDING_CACHE_TASK: ${ENABLE_CLEAN_EMBEDDING_CACHE_TASK:-false}
-  ENABLE_CLEAN_UNUSED_DATASETS_TASK: ${ENABLE_CLEAN_UNUSED_DATASETS_TASK:-false}
-  ENABLE_CREATE_TIDB_SERVERLESS_TASK: ${ENABLE_CREATE_TIDB_SERVERLESS_TASK:-false}
-  ENABLE_UPDATE_TIDB_SERVERLESS_STATUS_TASK: ${ENABLE_UPDATE_TIDB_SERVERLESS_STATUS_TASK:-false}
-  ENABLE_CLEAN_MESSAGES: ${ENABLE_CLEAN_MESSAGES:-false}
-  ENABLE_WORKFLOW_RUN_CLEANUP_TASK: ${ENABLE_WORKFLOW_RUN_CLEANUP_TASK:-false}
-  ENABLE_MAIL_CLEAN_DOCUMENT_NOTIFY_TASK: ${ENABLE_MAIL_CLEAN_DOCUMENT_NOTIFY_TASK:-false}
-  ENABLE_DATASETS_QUEUE_MONITOR: ${ENABLE_DATASETS_QUEUE_MONITOR:-false}
-  ENABLE_CHECK_UPGRADABLE_PLUGIN_TASK: ${ENABLE_CHECK_UPGRADABLE_PLUGIN_TASK:-true}
-  ENABLE_WORKFLOW_SCHEDULE_POLLER_TASK: ${ENABLE_WORKFLOW_SCHEDULE_POLLER_TASK:-true}
-  WORKFLOW_SCHEDULE_POLLER_INTERVAL: ${WORKFLOW_SCHEDULE_POLLER_INTERVAL:-1}
-  WORKFLOW_SCHEDULE_POLLER_BATCH_SIZE: ${WORKFLOW_SCHEDULE_POLLER_BATCH_SIZE:-100}
-  WORKFLOW_SCHEDULE_MAX_DISPATCH_PER_TICK: ${WORKFLOW_SCHEDULE_MAX_DISPATCH_PER_TICK:-0}
-  TENANT_ISOLATED_TASK_CONCURRENCY: ${TENANT_ISOLATED_TASK_CONCURRENCY:-1}
-  ANNOTATION_IMPORT_FILE_SIZE_LIMIT: ${ANNOTATION_IMPORT_FILE_SIZE_LIMIT:-2}
-  ANNOTATION_IMPORT_MAX_RECORDS: ${ANNOTATION_IMPORT_MAX_RECORDS:-10000}
-  ANNOTATION_IMPORT_MIN_RECORDS: ${ANNOTATION_IMPORT_MIN_RECORDS:-1}
-  ANNOTATION_IMPORT_RATE_LIMIT_PER_MINUTE: ${ANNOTATION_IMPORT_RATE_LIMIT_PER_MINUTE:-5}
-  ANNOTATION_IMPORT_RATE_LIMIT_PER_HOUR: ${ANNOTATION_IMPORT_RATE_LIMIT_PER_HOUR:-20}
-  ANNOTATION_IMPORT_MAX_CONCURRENT: ${ANNOTATION_IMPORT_MAX_CONCURRENT:-5}
-  AMPLITUDE_API_KEY: ${AMPLITUDE_API_KEY:-}
-  SANDBOX_EXPIRED_RECORDS_CLEAN_GRACEFUL_PERIOD: ${SANDBOX_EXPIRED_RECORDS_CLEAN_GRACEFUL_PERIOD:-21}
-  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}
-  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}
+# Shared configuration using YAML anchors and env_file
+x-shared-api-worker-config: &shared-api-worker-config
+  env_file:
+    - path: ./envs/core-services/shared.env
+      required: false
+    - path: ./envs/core-services/api.env
+      required: false
+    - path: ./envs/security.env
+      required: false
+    - path: ./envs/databases/db-postgres.env
+      required: false
+    - path: ./envs/databases/db-mysql.env
+      required: false
+    - path: ./envs/databases/redis.env
+      required: false
+    - path: ./envs/vectorstores/weaviate.env
+      required: false
+    - path: ./envs/vectorstores/qdrant.env
+      required: false
+    - path: ./envs/vectorstores/oceanbase.env
+      required: false
+    - path: ./envs/vectorstores/seekdb.env
+      required: false
+    - path: ./envs/vectorstores/couchbase.env
+      required: false
+    - path: ./envs/vectorstores/pgvector.env
+      required: false
+    - path: ./envs/vectorstores/vastbase.env
+      required: false
+    - path: ./envs/vectorstores/pgvecto-rs.env
+      required: false
+    - path: ./envs/vectorstores/chroma.env
+      required: false
+    - path: ./envs/vectorstores/iris.env
+      required: false
+    - path: ./envs/vectorstores/oracle.env
+      required: false
+    - path: ./envs/vectorstores/opengauss.env
+      required: false
+    - path: ./envs/vectorstores/myscale.env
+      required: false
+    - path: ./envs/vectorstores/matrixone.env
+      required: false
+    - path: ./envs/vectorstores/elasticsearch.env
+      required: false
+    - path: ./envs/vectorstores/opensearch.env
+      required: false
+    - path: ./envs/vectorstores/milvus.env
+      required: false
+    - path: ./envs/infrastructure/nginx.env
+      required: false
+    - path: ./envs/infrastructure/certbot.env
+      required: false
+    - path: ./envs/infrastructure/ssrf-proxy.env
+      required: false
+    - path: ./envs/infrastructure/etcd.env
+      required: false
+    - path: ./envs/infrastructure/minio.env
+      required: false
+    - path: ./envs/infrastructure/milvus-standalone.env
+      required: false
+    - ./.env
+  networks:
+    - ssrf_proxy_network
+    - default
+  restart: always
+
+x-shared-worker-config: &shared-worker-config
+  env_file:
+    - path: ./envs/core-services/shared.env
+      required: false
+    - path: ./envs/core-services/worker.env
+      required: false
+    - path: ./envs/security.env
+      required: false
+    - path: ./envs/databases/db-postgres.env
+      required: false
+    - path: ./envs/databases/db-mysql.env
+      required: false
+    - path: ./envs/databases/redis.env
+      required: false
+    - path: ./envs/vectorstores/weaviate.env
+      required: false
+    - path: ./envs/vectorstores/qdrant.env
+      required: false
+    - path: ./envs/vectorstores/oceanbase.env
+      required: false
+    - path: ./envs/vectorstores/seekdb.env
+      required: false
+    - path: ./envs/vectorstores/couchbase.env
+      required: false
+    - path: ./envs/vectorstores/pgvector.env
+      required: false
+    - path: ./envs/vectorstores/vastbase.env
+      required: false
+    - path: ./envs/vectorstores/pgvecto-rs.env
+      required: false
+    - path: ./envs/vectorstores/chroma.env
+      required: false
+    - path: ./envs/vectorstores/iris.env
+      required: false
+    - path: ./envs/vectorstores/oracle.env
+      required: false
+    - path: ./envs/vectorstores/opengauss.env
+      required: false
+    - path: ./envs/vectorstores/myscale.env
+      required: false
+    - path: ./envs/vectorstores/matrixone.env
+      required: false
+    - path: ./envs/vectorstores/elasticsearch.env
+      required: false
+    - path: ./envs/vectorstores/opensearch.env
+      required: false
+    - path: ./envs/vectorstores/milvus.env
+      required: false
+    - path: ./envs/infrastructure/nginx.env
+      required: false
+    - path: ./envs/infrastructure/certbot.env
+      required: false
+    - path: ./envs/infrastructure/ssrf-proxy.env
+      required: false
+    - path: ./envs/infrastructure/etcd.env
+      required: false
+    - path: ./envs/infrastructure/minio.env
+      required: false
+    - path: ./envs/infrastructure/milvus-standalone.env
+      required: false
+    - ./.env
+  networks:
+    - ssrf_proxy_network
+    - default
+  restart: always
+
+x-shared-worker-beat-config: &shared-worker-beat-config
+  env_file:
+    - path: ./envs/core-services/shared.env
+      required: false
+    - path: ./envs/core-services/worker-beat.env
+      required: false
+    - path: ./envs/security.env
+      required: false
+    - path: ./envs/databases/db-postgres.env
+      required: false
+    - path: ./envs/databases/db-mysql.env
+      required: false
+    - path: ./envs/databases/redis.env
+      required: false
+    - path: ./envs/vectorstores/weaviate.env
+      required: false
+    - path: ./envs/vectorstores/qdrant.env
+      required: false
+    - path: ./envs/vectorstores/oceanbase.env
+      required: false
+    - path: ./envs/vectorstores/seekdb.env
+      required: false
+    - path: ./envs/vectorstores/couchbase.env
+      required: false
+    - path: ./envs/vectorstores/pgvector.env
+      required: false
+    - path: ./envs/vectorstores/vastbase.env
+      required: false
+    - path: ./envs/vectorstores/pgvecto-rs.env
+      required: false
+    - path: ./envs/vectorstores/chroma.env
+      required: false
+    - path: ./envs/vectorstores/iris.env
+      required: false
+    - path: ./envs/vectorstores/oracle.env
+      required: false
+    - path: ./envs/vectorstores/opengauss.env
+      required: false
+    - path: ./envs/vectorstores/myscale.env
+      required: false
+    - path: ./envs/vectorstores/matrixone.env
+      required: false
+    - path: ./envs/vectorstores/elasticsearch.env
+      required: false
+    - path: ./envs/vectorstores/opensearch.env
+      required: false
+    - path: ./envs/vectorstores/milvus.env
+      required: false
+    - path: ./envs/infrastructure/nginx.env
+      required: false
+    - path: ./envs/infrastructure/certbot.env
+      required: false
+    - path: ./envs/infrastructure/ssrf-proxy.env
+      required: false
+    - path: ./envs/infrastructure/etcd.env
+      required: false
+    - path: ./envs/infrastructure/minio.env
+      required: false
+    - path: ./envs/infrastructure/milvus-standalone.env
+      required: false
+    - ./.env
+  networks:
+    - ssrf_proxy_network
+    - default
+  restart: always
 
 services:
   # Init container to fix permissions
@@ -745,12 +225,9 @@ services:
 
   # API service
   api:
-    image: langgenius/dify-api:1.14.0
-    restart: always
+    <<: *shared-api-worker-config
+    image: langgenius/dify-api:1.14.2
     environment:
-      # Use the shared environment variables.
-      <<: *shared-api-worker-env
-      # Startup mode, 'api' starts the API server.
       MODE: api
       SENTRY_DSN: ${API_SENTRY_DSN:-}
       SENTRY_TRACES_SAMPLE_RATE: ${API_SENTRY_TRACES_SAMPLE_RATE:-1.0}
@@ -790,15 +267,37 @@ services:
       - ssrf_proxy_network
       - default
 
+  # WebSocket service for workflow collaboration.
+  api_websocket:
+    <<: *shared-api-worker-config
+    image: langgenius/dify-api:1.14.2
+    profiles:
+      - collaboration
+    environment:
+      MODE: api
+      SERVER_WORKER_AMOUNT: 1
+      SERVER_WORKER_CLASS: ${API_WEBSOCKET_WORKER_CLASS:-geventwebsocket.gunicorn.workers.GeventWebSocketWorker}
+      SERVER_WORKER_CONNECTIONS: ${API_WEBSOCKET_WORKER_CONNECTIONS:-1000}
+      GUNICORN_TIMEOUT: ${API_WEBSOCKET_GUNICORN_TIMEOUT:-360}
+    depends_on:
+      db_postgres:
+        condition: service_healthy
+        required: false
+      db_mysql:
+        condition: service_healthy
+        required: false
+      redis:
+        condition: service_started
+    networks:
+      - ssrf_proxy_network
+      - default
+
   # worker service
   # The Celery worker for processing all queues (dataset, workflow, mail, etc.)
   worker:
-    image: langgenius/dify-api:1.14.0
-    restart: always
+    <<: *shared-worker-config
+    image: langgenius/dify-api:1.14.2
     environment:
-      # Use the shared environment variables.
-      <<: *shared-api-worker-env
-      # Startup mode, 'worker' starts the Celery worker for processing all queues.
       MODE: worker
       SENTRY_DSN: ${API_SENTRY_DSN:-}
       SENTRY_TRACES_SAMPLE_RATE: ${API_SENTRY_TRACES_SAMPLE_RATE:-1.0}
@@ -839,12 +338,9 @@ services:
   # worker_beat service
   # Celery beat for scheduling periodic tasks.
   worker_beat:
-    image: langgenius/dify-api:1.14.0
-    restart: always
+    <<: *shared-worker-beat-config
+    image: langgenius/dify-api:1.14.2
     environment:
-      # Use the shared environment variables.
-      <<: *shared-api-worker-env
-      # Startup mode, 'worker_beat' starts the Celery beat for scheduling periodic tasks.
       MODE: beat
     depends_on:
       init_permissions:
@@ -876,8 +372,14 @@ services:
 
   # Frontend web application.
   web:
-    image: langgenius/dify-web:1.14.0
+    image: langgenius/dify-web:1.14.2
     restart: always
+    env_file:
+      - path: ./envs/core-services/web.env
+        required: false
+      - path: ./envs/security.env
+        required: false
+      - ./.env
     environment:
       CONSOLE_API_URL: ${CONSOLE_API_URL:-}
       APP_API_URL: ${APP_API_URL:-}
@@ -894,8 +396,8 @@ services:
       ALLOW_UNSAFE_DATA_SCHEME: ${ALLOW_UNSAFE_DATA_SCHEME:-false}
       MARKETPLACE_API_URL: ${MARKETPLACE_API_URL:-https://marketplace.dify.ai}
       MARKETPLACE_URL: ${MARKETPLACE_URL:-https://marketplace.dify.ai}
-      TOP_K_MAX_VALUE: ${TOP_K_MAX_VALUE:-}
-      INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH: ${INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH:-}
+      TOP_K_MAX_VALUE: ${TOP_K_MAX_VALUE:-10}
+      INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH: ${INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH:-4000}
       LOOP_NODE_MAX_COUNT: ${LOOP_NODE_MAX_COUNT:-100}
       MAX_TOOLS_NUM: ${MAX_TOOLS_NUM:-10}
       MAX_PARALLEL_LIMIT: ${MAX_PARALLEL_LIMIT:-10}
@@ -952,7 +454,7 @@ services:
       MYSQL_ROOT_PASSWORD: ${DB_PASSWORD:-difyai123456}
       MYSQL_DATABASE: ${DB_DATABASE:-dify}
     command: >
-      --max_connections=1000
+      --max_connections=${MYSQL_MAX_CONNECTIONS:-1000}
       --innodb_buffer_pool_size=${MYSQL_INNODB_BUFFER_POOL_SIZE:-512M}
       --innodb_log_file_size=${MYSQL_INNODB_LOG_FILE_SIZE:-128M}
       --innodb_flush_log_at_trx_commit=${MYSQL_INNODB_FLUSH_LOG_AT_TRX_COMMIT:-2}
@@ -994,6 +496,12 @@ services:
   sandbox:
     image: langgenius/dify-sandbox:0.2.15
     restart: always
+    env_file:
+      - path: ./envs/core-services/sandbox.env
+        required: false
+      - path: ./envs/security.env
+        required: false
+      - ./.env
     environment:
       # The DifySandbox configurations
       # Make sure you are changing this key for your deployment with a strong key.
@@ -1016,11 +524,26 @@ services:
 
   # plugin daemon
   plugin_daemon:
-    image: langgenius/dify-plugin-daemon:0.6.0-local
+    image: langgenius/dify-plugin-daemon:0.6.1-local
     restart: always
+    env_file:
+      - path: ./envs/core-services/shared.env
+        required: false
+      - path: ./envs/core-services/plugin-daemon.env
+        required: false
+      - path: ./envs/security.env
+        required: false
+      - path: ./envs/databases/db-postgres.env
+        required: false
+      - path: ./envs/databases/db-mysql.env
+        required: false
+      - path: ./envs/databases/redis.env
+        required: false
+      - ./.env
+    networks:
+      - ssrf_proxy_network
+      - default
     environment:
-      # Use the shared environment variables.
-      <<: *shared-api-worker-env
       DB_DATABASE: ${DB_PLUGIN_DATABASE:-dify_plugin}
       DB_SSL_MODE: ${DB_SSL_MODE:-disable}
       SERVER_PORT: ${PLUGIN_DAEMON_PORT:-5002}
@@ -1126,8 +649,8 @@ services:
       - ./certbot/update-cert.template.txt:/update-cert.template.txt
       - ./certbot/docker-entrypoint.sh:/docker-entrypoint.sh
     environment:
-      - CERTBOT_EMAIL=${CERTBOT_EMAIL}
-      - CERTBOT_DOMAIN=${CERTBOT_DOMAIN}
+      - CERTBOT_EMAIL=${CERTBOT_EMAIL:-}
+      - CERTBOT_DOMAIN=${CERTBOT_DOMAIN:-}
       - CERTBOT_OPTIONS=${CERTBOT_OPTIONS:-}
     entrypoint: ["/docker-entrypoint.sh"]
     command: ["tail", "-f", "/dev/null"]
@@ -1169,6 +692,7 @@ services:
       NGINX_PROXY_READ_TIMEOUT: ${NGINX_PROXY_READ_TIMEOUT:-3600s}
       NGINX_PROXY_SEND_TIMEOUT: ${NGINX_PROXY_SEND_TIMEOUT:-3600s}
       NGINX_ENABLE_CERTBOT_CHALLENGE: ${NGINX_ENABLE_CERTBOT_CHALLENGE:-false}
+      NGINX_SOCKET_IO_UPSTREAM: ${NGINX_SOCKET_IO_UPSTREAM:-api_websocket:5001}
       CERTBOT_DOMAIN: ${CERTBOT_DOMAIN:-}
     depends_on:
       - api
diff --git a/docker/envs/core-services/api.env.example b/docker/envs/core-services/api.env.example
new file mode 100644
index 0000000000..1a3fc7a4ab
--- /dev/null
+++ b/docker/envs/core-services/api.env.example
@@ -0,0 +1,13 @@
+# ------------------------------
+# Api Configuration
+# ------------------------------
+
+MODE=api
+SENTRY_DSN=
+SENTRY_TRACES_SAMPLE_RATE=1.0
+SENTRY_PROFILES_SAMPLE_RATE=1.0
+PLUGIN_REMOTE_INSTALL_HOST=localhost
+PLUGIN_REMOTE_INSTALL_PORT=5003
+PLUGIN_MAX_PACKAGE_SIZE=52428800
+PLUGIN_DAEMON_TIMEOUT=600.0
+INNER_API_KEY_FOR_PLUGIN=QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1
diff --git a/docker/envs/core-services/plugin-daemon.env.example b/docker/envs/core-services/plugin-daemon.env.example
new file mode 100644
index 0000000000..c3b1bef974
--- /dev/null
+++ b/docker/envs/core-services/plugin-daemon.env.example
@@ -0,0 +1,23 @@
+# ------------------------------
+# Plugin Daemon Configuration
+# ------------------------------
+
+DB_PLUGIN_DATABASE=dify_plugin
+PLUGIN_DAEMON_URL=http://plugin_daemon:5002
+PLUGIN_PPROF_ENABLED=false
+PLUGIN_DIFY_INNER_API_URL=http://api:5001
+FORCE_VERIFYING_SIGNATURE=true
+PLUGIN_STDIO_BUFFER_SIZE=1024
+PLUGIN_STDIO_MAX_BUFFER_SIZE=5242880
+PLUGIN_PYTHON_ENV_INIT_TIMEOUT=120
+PLUGIN_MAX_EXECUTION_TIMEOUT=600
+PLUGIN_DEBUGGING_HOST=0.0.0.0
+PLUGIN_DEBUGGING_PORT=5003
+PLUGIN_DAEMON_KEY=lYkiYYT6owG+71oLerGzA7GXCgOT++6ovaezWAjpCjf+Sjc3ZtU+qUEi
+PLUGIN_DIFY_INNER_API_KEY=QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1
+PLUGIN_DAEMON_PORT=5002
+CELERY_WORKER_CLASS=
+PLUGIN_STORAGE_TYPE=local
+PLUGIN_STORAGE_LOCAL_ROOT=/app/storage
+PLUGIN_WORKING_PATH=/app/storage/cwd
+PLUGIN_STORAGE_OSS_BUCKET=
diff --git a/docker/envs/core-services/sandbox.env.example b/docker/envs/core-services/sandbox.env.example
new file mode 100644
index 0000000000..5d4ee6614b
--- /dev/null
+++ b/docker/envs/core-services/sandbox.env.example
@@ -0,0 +1,17 @@
+# ------------------------------
+# Sandbox Configuration
+# ------------------------------
+
+SANDBOX_HTTP_PROXY=http://ssrf_proxy:3128
+SANDBOX_HTTPS_PROXY=http://ssrf_proxy:3128
+SANDBOX_PORT=8194
+PIP_MIRROR_URL=
+SANDBOX_API_KEY=dify-sandbox
+SANDBOX_GIN_MODE=release
+SANDBOX_WORKER_TIMEOUT=15
+SANDBOX_ENABLE_NETWORK=true
+SANDBOX_EXPIRED_RECORDS_CLEAN_GRACEFUL_PERIOD=21
+SANDBOX_EXPIRED_RECORDS_CLEAN_BATCH_SIZE=1000
+SANDBOX_EXPIRED_RECORDS_CLEAN_BATCH_MAX_INTERVAL=200
+SANDBOX_EXPIRED_RECORDS_RETENTION_DAYS=30
+SANDBOX_EXPIRED_RECORDS_CLEAN_TASK_LOCK_TTL=90000
diff --git a/docker/envs/core-services/shared.env.example b/docker/envs/core-services/shared.env.example
new file mode 100644
index 0000000000..fca0b57d0c
--- /dev/null
+++ b/docker/envs/core-services/shared.env.example
@@ -0,0 +1,475 @@
+# ------------------------------
+# Shared API/Worker Configuration
+# ------------------------------
+
+CONSOLE_WEB_URL=
+SERVICE_API_URL=
+TRIGGER_URL=http://localhost
+APP_WEB_URL=
+FILES_URL=
+INTERNAL_FILES_URL=
+LANG=C.UTF-8
+LC_ALL=C.UTF-8
+PYTHONIOENCODING=utf-8
+UV_CACHE_DIR=/tmp/.uv-cache
+CHECK_UPDATE_URL=https://updates.dify.ai
+OPENAI_API_BASE=https://api.openai.com/v1
+MIGRATION_ENABLED=true
+FILES_ACCESS_TIMEOUT=300
+# Remove `collaboration` from COMPOSE_PROFILES to stop the dedicated websocket service.
+ENABLE_COLLABORATION_MODE=true
+CELERY_BROKER_URL=redis://:difyai123456@redis:6379/1
+CELERY_TASK_ANNOTATIONS=null
+AZURE_BLOB_ACCOUNT_URL=https://<your_account_name>.blob.core.windows.net
+SUPABASE_URL=your-server-url
+TIDB_ON_QDRANT_URL=http://127.0.0.1
+TIDB_ON_QDRANT_API_KEY=dify
+TIDB_API_URL=http://127.0.0.1
+TIDB_IAM_API_URL=http://127.0.0.1
+TIDB_REGION=regions/aws-us-east-1
+TIDB_PROJECT_ID=dify
+TIDB_SPEND_LIMIT=100
+TENCENT_VECTOR_DB_URL=http://127.0.0.1
+TENCENT_VECTOR_DB_API_KEY=dify
+LINDORM_URL=http://localhost:30070
+LINDORM_USERNAME=admin
+UPSTASH_VECTOR_URL=https://xxx-vector.upstash.io
+UPLOAD_FILE_SIZE_LIMIT=15
+UPLOAD_FILE_BATCH_LIMIT=5
+UPLOAD_FILE_EXTENSION_BLACKLIST=
+SINGLE_CHUNK_ATTACHMENT_LIMIT=10
+IMAGE_FILE_BATCH_LIMIT=10
+ATTACHMENT_IMAGE_FILE_SIZE_LIMIT=2
+ATTACHMENT_IMAGE_DOWNLOAD_TIMEOUT=60
+ETL_TYPE=dify
+UNSTRUCTURED_API_URL=
+MULTIMODAL_SEND_FORMAT=base64
+UPLOAD_IMAGE_FILE_SIZE_LIMIT=10
+UPLOAD_VIDEO_FILE_SIZE_LIMIT=100
+UPLOAD_AUDIO_FILE_SIZE_LIMIT=50
+API_SENTRY_DSN=
+API_SENTRY_TRACES_SAMPLE_RATE=1.0
+API_SENTRY_PROFILES_SAMPLE_RATE=1.0
+WEB_SENTRY_DSN=
+PLUGIN_SENTRY_ENABLED=false
+PLUGIN_SENTRY_DSN=
+NOTION_INTEGRATION_TYPE=public
+RESEND_API_URL=https://api.resend.com
+SSRF_PROXY_HTTP_URL=http://ssrf_proxy:3128
+SSRF_PROXY_HTTPS_URL=http://ssrf_proxy:3128
+PGDATA=/var/lib/postgresql/data/pgdata
+PLUGIN_MAX_PACKAGE_SIZE=52428800
+PLUGIN_MODEL_SCHEMA_CACHE_TTL=3600
+ENDPOINT_URL_TEMPLATE=http://localhost/e/{hook_id}
+LOG_LEVEL=INFO
+LOG_OUTPUT_FORMAT=text
+LOG_FILE=/app/logs/server.log
+LOG_FILE_MAX_SIZE=20
+LOG_FILE_BACKUP_COUNT=5
+LOG_DATEFORMAT=%Y-%m-%d %H:%M:%S
+LOG_TZ=UTC
+DEBUG=false
+FLASK_DEBUG=false
+ENABLE_REQUEST_LOGGING=False
+OPS_TRACE_RETRYABLE_DISPATCH_MAX_RETRIES=60
+OPS_TRACE_RETRYABLE_DISPATCH_DELAY_SECONDS=5
+WORKFLOW_LOG_CLEANUP_ENABLED=false
+WORKFLOW_LOG_RETENTION_DAYS=30
+WORKFLOW_LOG_CLEANUP_BATCH_SIZE=100
+WORKFLOW_LOG_CLEANUP_SPECIFIC_WORKFLOW_IDS=
+EXPOSE_PLUGIN_DEBUGGING_HOST=localhost
+EXPOSE_PLUGIN_DEBUGGING_PORT=5003
+DEPLOY_ENV=PRODUCTION
+ACCESS_TOKEN_EXPIRE_MINUTES=60
+REFRESH_TOKEN_EXPIRE_DAYS=30
+APP_DEFAULT_ACTIVE_REQUESTS=0
+APP_MAX_ACTIVE_REQUESTS=0
+APP_MAX_EXECUTION_TIME=1200
+DIFY_BIND_ADDRESS=0.0.0.0
+DIFY_PORT=5001
+SERVER_WORKER_AMOUNT=1
+SERVER_WORKER_CLASS=gevent
+SERVER_WORKER_CONNECTIONS=10
+API_WEBSOCKET_WORKER_CLASS=geventwebsocket.gunicorn.workers.GeventWebSocketWorker
+API_WEBSOCKET_WORKER_CONNECTIONS=1000
+API_WEBSOCKET_GUNICORN_TIMEOUT=360
+CELERY_SENTINEL_PASSWORD=
+S3_ACCESS_KEY=
+S3_SECRET_KEY=
+ARCHIVE_STORAGE_ACCESS_KEY=
+ARCHIVE_STORAGE_SECRET_KEY=
+AZURE_BLOB_ACCOUNT_KEY=difyai
+ALIYUN_OSS_ACCESS_KEY=your-access-key
+ALIYUN_OSS_SECRET_KEY=your-secret-key
+TENCENT_COS_SECRET_KEY=your-secret-key
+TENCENT_COS_SECRET_ID=your-secret-id
+OCI_ACCESS_KEY=your-access-key
+OCI_SECRET_KEY=your-secret-key
+HUAWEI_OBS_SECRET_KEY=your-secret-key
+HUAWEI_OBS_ACCESS_KEY=your-access-key
+VOLCENGINE_TOS_SECRET_KEY=your-secret-key
+VOLCENGINE_TOS_ACCESS_KEY=your-access-key
+BAIDU_OBS_SECRET_KEY=your-secret-key
+BAIDU_OBS_ACCESS_KEY=your-access-key
+SUPABASE_API_KEY=your-access-key
+ALIBABACLOUD_MYSQL_PASSWORD=difyai123456
+RELYT_PASSWORD=difyai123456
+LINDORM_PASSWORD=admin
+LINDORM_USING_UGC=True
+LINDORM_QUERY_TIMEOUT=1
+HUAWEI_CLOUD_PASSWORD=admin
+UPSTASH_VECTOR_TOKEN=dify
+TABLESTORE_ACCESS_KEY_ID=xxx
+TABLESTORE_ACCESS_KEY_SECRET=xxx
+TABLESTORE_NORMALIZE_FULLTEXT_BM25_SCORE=false
+CLICKZETTA_PASSWORD=
+CLICKZETTA_INSTANCE=
+CLICKZETTA_SERVICE=api.clickzetta.com
+CLICKZETTA_WORKSPACE=quick_start
+CLICKZETTA_VCLUSTER=default_ap
+CLICKZETTA_SCHEMA=dify
+CLICKZETTA_BATCH_SIZE=100
+CLICKZETTA_ENABLE_INVERTED_INDEX=true
+CLICKZETTA_ANALYZER_TYPE=chinese
+CLICKZETTA_ANALYZER_MODE=smart
+UNSTRUCTURED_API_KEY=
+SCARF_NO_ANALYTICS=true
+PLUGIN_BASED_TOKEN_COUNTING_ENABLED=false
+NOTION_CLIENT_SECRET=
+NOTION_CLIENT_ID=
+NOTION_INTERNAL_SECRET=
+MAIL_TYPE=resend
+MAIL_DEFAULT_SEND_FROM=
+RESEND_API_KEY=your-resend-api-key
+SMTP_SERVER=
+SMTP_PORT=465
+SMTP_USERNAME=
+SMTP_PASSWORD=
+SMTP_USE_TLS=true
+SMTP_OPPORTUNISTIC_TLS=false
+SMTP_LOCAL_HOSTNAME=
+SENDGRID_API_KEY=
+INVITE_EXPIRY_HOURS=72
+RESET_PASSWORD_TOKEN_EXPIRY_MINUTES=5
+EMAIL_REGISTER_TOKEN_EXPIRY_MINUTES=5
+CHANGE_EMAIL_TOKEN_EXPIRY_MINUTES=5
+OWNER_TRANSFER_TOKEN_EXPIRY_MINUTES=5
+CODE_EXECUTION_ENDPOINT=http://sandbox:8194
+CODE_EXECUTION_API_KEY=dify-sandbox
+CODE_EXECUTION_SSL_VERIFY=True
+CODE_EXECUTION_POOL_MAX_CONNECTIONS=100
+CODE_EXECUTION_POOL_MAX_KEEPALIVE_CONNECTIONS=20
+CODE_EXECUTION_POOL_KEEPALIVE_EXPIRY=5.0
+CODE_MAX_NUMBER=9223372036854775807
+CODE_MIN_NUMBER=-9223372036854775808
+CODE_MAX_DEPTH=5
+CODE_MAX_PRECISION=20
+CODE_MAX_STRING_LENGTH=400000
+CODE_MAX_STRING_ARRAY_LENGTH=30
+CODE_MAX_OBJECT_ARRAY_LENGTH=30
+CODE_MAX_NUMBER_ARRAY_LENGTH=1000
+CODE_EXECUTION_CONNECT_TIMEOUT=10
+CODE_EXECUTION_READ_TIMEOUT=60
+CODE_EXECUTION_WRITE_TIMEOUT=10
+TEMPLATE_TRANSFORM_MAX_LENGTH=400000
+WORKFLOW_MAX_EXECUTION_STEPS=500
+WORKFLOW_MAX_EXECUTION_TIME=1200
+WORKFLOW_CALL_MAX_DEPTH=5
+MAX_VARIABLE_SIZE=204800
+WORKFLOW_FILE_UPLOAD_LIMIT=10
+GRAPH_ENGINE_MIN_WORKERS=3
+GRAPH_ENGINE_MAX_WORKERS=10
+GRAPH_ENGINE_SCALE_UP_THRESHOLD=3
+GRAPH_ENGINE_SCALE_DOWN_IDLE_TIME=5.0
+ALIYUN_SLS_ACCESS_KEY_ID=
+ALIYUN_SLS_ACCESS_KEY_SECRET=
+WEBHOOK_REQUEST_BODY_MAX_SIZE=10485760
+RESPECT_XFORWARD_HEADERS_ENABLED=false
+SSRF_HTTP_PORT=3128
+SSRF_COREDUMP_DIR=/var/spool/squid
+SSRF_REVERSE_PROXY_PORT=8194
+SSRF_SANDBOX_HOST=sandbox
+SSRF_DEFAULT_TIME_OUT=5
+SSRF_DEFAULT_CONNECT_TIME_OUT=5
+SSRF_DEFAULT_READ_TIME_OUT=5
+SSRF_DEFAULT_WRITE_TIME_OUT=5
+SSRF_POOL_MAX_CONNECTIONS=100
+SSRF_POOL_MAX_KEEPALIVE_CONNECTIONS=20
+SSRF_POOL_KEEPALIVE_EXPIRY=5.0
+PLUGIN_AWS_ACCESS_KEY=
+PLUGIN_AWS_SECRET_KEY=
+PLUGIN_AWS_REGION=
+PLUGIN_TENCENT_COS_SECRET_KEY=
+PLUGIN_TENCENT_COS_SECRET_ID=
+PLUGIN_ALIYUN_OSS_ACCESS_KEY_ID=
+PLUGIN_ALIYUN_OSS_ACCESS_KEY_SECRET=
+PLUGIN_VOLCENGINE_TOS_ACCESS_KEY=
+PLUGIN_VOLCENGINE_TOS_SECRET_KEY=
+OTLP_API_KEY=
+OTEL_EXPORTER_OTLP_PROTOCOL=
+OTEL_EXPORTER_TYPE=otlp
+OTEL_SAMPLING_RATE=0.1
+OTEL_BATCH_EXPORT_SCHEDULE_DELAY=5000
+OTEL_MAX_QUEUE_SIZE=2048
+OTEL_MAX_EXPORT_BATCH_SIZE=512
+OTEL_METRIC_EXPORT_INTERVAL=60000
+OTEL_BATCH_EXPORT_TIMEOUT=10000
+OTEL_METRIC_EXPORT_TIMEOUT=30000
+QUEUE_MONITOR_THRESHOLD=200
+QUEUE_MONITOR_ALERT_EMAILS=
+QUEUE_MONITOR_INTERVAL=30
+SWAGGER_UI_ENABLED=false
+SWAGGER_UI_PATH=/swagger-ui.html
+DSL_EXPORT_ENCRYPT_DATASET_ID=true
+DATASET_MAX_SEGMENTS_PER_REQUEST=0
+ENABLE_CLEAN_EMBEDDING_CACHE_TASK=false
+ENABLE_CLEAN_UNUSED_DATASETS_TASK=false
+ENABLE_CREATE_TIDB_SERVERLESS_TASK=false
+ENABLE_UPDATE_TIDB_SERVERLESS_STATUS_TASK=false
+ENABLE_CLEAN_MESSAGES=false
+ENABLE_WORKFLOW_RUN_CLEANUP_TASK=false
+ENABLE_MAIL_CLEAN_DOCUMENT_NOTIFY_TASK=false
+ENABLE_DATASETS_QUEUE_MONITOR=false
+ENABLE_CHECK_UPGRADABLE_PLUGIN_TASK=true
+ENABLE_WORKFLOW_SCHEDULE_POLLER_TASK=true
+WORKFLOW_SCHEDULE_POLLER_INTERVAL=1
+WORKFLOW_SCHEDULE_POLLER_BATCH_SIZE=100
+WORKFLOW_SCHEDULE_MAX_DISPATCH_PER_TICK=0
+TENANT_ISOLATED_TASK_CONCURRENCY=1
+ANNOTATION_IMPORT_FILE_SIZE_LIMIT=2
+ANNOTATION_IMPORT_MAX_RECORDS=10000
+ANNOTATION_IMPORT_MIN_RECORDS=1
+ANNOTATION_IMPORT_RATE_LIMIT_PER_MINUTE=5
+ANNOTATION_IMPORT_RATE_LIMIT_PER_HOUR=20
+ANNOTATION_IMPORT_MAX_CONCURRENT=5
+CREATORS_PLATFORM_FEATURES_ENABLED=true
+CREATORS_PLATFORM_API_URL=https://creators.dify.ai
+CREATORS_PLATFORM_OAUTH_CLIENT_ID=
+TIDB_VECTOR_DATABASE=dify
+ALIBABACLOUD_MYSQL_HOST=127.0.0.1
+ALIBABACLOUD_MYSQL_PORT=3306
+ALIBABACLOUD_MYSQL_USER=root
+ALIBABACLOUD_MYSQL_DATABASE=dify
+ALIBABACLOUD_MYSQL_MAX_CONNECTION=5
+ALIBABACLOUD_MYSQL_HNSW_M=6
+RELYT_DATABASE=postgres
+TENCENT_VECTOR_DB_DATABASE=dify
+BAIDU_VECTOR_DB_DATABASE=dify
+EXPOSE_PLUGIN_DAEMON_PORT=5002
+GUNICORN_TIMEOUT=360
+CELERY_WORKER_AMOUNT=
+CELERY_AUTO_SCALE=false
+CELERY_MAX_WORKERS=
+CELERY_MIN_WORKERS=
+API_TOOL_DEFAULT_CONNECT_TIMEOUT=10
+API_TOOL_DEFAULT_READ_TIMEOUT=60
+CELERY_BACKEND=redis
+CELERY_USE_SENTINEL=false
+CELERY_SENTINEL_MASTER_NAME=
+CELERY_SENTINEL_SOCKET_TIMEOUT=0.1
+WEB_API_CORS_ALLOW_ORIGINS=*
+CONSOLE_CORS_ALLOW_ORIGINS=*
+COOKIE_DOMAIN=
+OPENDAL_SCHEME=fs
+OPENDAL_FS_ROOT=storage
+CLICKZETTA_VOLUME_TYPE=user
+CLICKZETTA_VOLUME_NAME=
+CLICKZETTA_VOLUME_TABLE_PREFIX=dataset_
+CLICKZETTA_VOLUME_DIFY_PREFIX=dify_km
+S3_ENDPOINT=
+S3_REGION=us-east-1
+S3_BUCKET_NAME=difyai
+S3_ADDRESS_STYLE=auto
+S3_USE_AWS_MANAGED_IAM=false
+ARCHIVE_STORAGE_ENABLED=false
+ARCHIVE_STORAGE_ENDPOINT=
+ARCHIVE_STORAGE_ARCHIVE_BUCKET=
+ARCHIVE_STORAGE_EXPORT_BUCKET=
+ARCHIVE_STORAGE_REGION=auto
+AZURE_BLOB_ACCOUNT_NAME=difyai
+AZURE_BLOB_CONTAINER_NAME=difyai-container
+GOOGLE_STORAGE_BUCKET_NAME=your-bucket-name
+GOOGLE_STORAGE_SERVICE_ACCOUNT_JSON_BASE64=
+ALIYUN_OSS_BUCKET_NAME=your-bucket-name
+ALIYUN_OSS_ENDPOINT=https://oss-ap-southeast-1-internal.aliyuncs.com
+ALIYUN_OSS_REGION=ap-southeast-1
+ALIYUN_OSS_AUTH_VERSION=v4
+ALIYUN_OSS_PATH=your-path
+ALIYUN_CLOUDBOX_ID=your-cloudbox-id
+TENCENT_COS_BUCKET_NAME=your-bucket-name
+TENCENT_COS_REGION=your-region
+TENCENT_COS_SCHEME=your-scheme
+TENCENT_COS_CUSTOM_DOMAIN=your-custom-domain
+OCI_ENDPOINT=https://your-object-storage-namespace.compat.objectstorage.us-ashburn-1.oraclecloud.com
+OCI_BUCKET_NAME=your-bucket-name
+OCI_REGION=us-ashburn-1
+HUAWEI_OBS_BUCKET_NAME=your-bucket-name
+HUAWEI_OBS_SERVER=your-server-url
+HUAWEI_OBS_PATH_STYLE=false
+VOLCENGINE_TOS_BUCKET_NAME=your-bucket-name
+VOLCENGINE_TOS_ENDPOINT=your-server-url
+VOLCENGINE_TOS_REGION=your-region
+BAIDU_OBS_BUCKET_NAME=your-bucket-name
+BAIDU_OBS_ENDPOINT=your-server-url
+SUPABASE_BUCKET_NAME=your-bucket-name
+TENCENT_VECTOR_DB_TIMEOUT=30
+TENCENT_VECTOR_DB_USERNAME=dify
+TENCENT_VECTOR_DB_SHARD=1
+TENCENT_VECTOR_DB_REPLICAS=2
+TENCENT_VECTOR_DB_ENABLE_HYBRID_SEARCH=false
+BAIDU_VECTOR_DB_ENDPOINT=http://127.0.0.1:5287
+BAIDU_VECTOR_DB_CONNECTION_TIMEOUT_MS=30000
+BAIDU_VECTOR_DB_ACCOUNT=root
+BAIDU_VECTOR_DB_API_KEY=dify
+BAIDU_VECTOR_DB_SHARD=1
+BAIDU_VECTOR_DB_REPLICAS=3
+BAIDU_VECTOR_DB_INVERTED_INDEX_ANALYZER=DEFAULT_ANALYZER
+BAIDU_VECTOR_DB_INVERTED_INDEX_PARSER_MODE=COARSE_MODE
+BAIDU_VECTOR_DB_AUTO_BUILD_ROW_COUNT_INCREMENT=500
+BAIDU_VECTOR_DB_AUTO_BUILD_ROW_COUNT_INCREMENT_RATIO=0.05
+BAIDU_VECTOR_DB_REBUILD_INDEX_TIMEOUT_IN_SECONDS=300
+HUAWEI_CLOUD_HOSTS=https://127.0.0.1:9200
+HUAWEI_CLOUD_USER=admin
+WORKFLOW_NODE_EXECUTION_STORAGE=rdbms
+CORE_WORKFLOW_EXECUTION_REPOSITORY=core.repositories.sqlalchemy_workflow_execution_repository.SQLAlchemyWorkflowExecutionRepository
+CORE_WORKFLOW_NODE_EXECUTION_REPOSITORY=core.repositories.sqlalchemy_workflow_node_execution_repository.SQLAlchemyWorkflowNodeExecutionRepository
+API_WORKFLOW_RUN_REPOSITORY=repositories.sqlalchemy_api_workflow_run_repository.DifyAPISQLAlchemyWorkflowRunRepository
+API_WORKFLOW_NODE_EXECUTION_REPOSITORY=repositories.sqlalchemy_api_workflow_node_execution_repository.DifyAPISQLAlchemyWorkflowNodeExecutionRepository
+ALIYUN_SLS_ENDPOINT=
+ALIYUN_SLS_REGION=
+ALIYUN_SLS_PROJECT_NAME=
+ALIYUN_SLS_LOGSTORE_TTL=365
+LOGSTORE_DUAL_WRITE_ENABLED=false
+LOGSTORE_DUAL_READ_ENABLED=true
+LOGSTORE_ENABLE_PUT_GRAPH_FIELD=true
+HTTP_REQUEST_NODE_MAX_BINARY_SIZE=10485760
+HTTP_REQUEST_NODE_MAX_TEXT_SIZE=1048576
+HTTP_REQUEST_NODE_SSL_VERIFY=True
+HTTP_REQUEST_MAX_CONNECT_TIMEOUT=10
+HTTP_REQUEST_MAX_READ_TIMEOUT=600
+HTTP_REQUEST_MAX_WRITE_TIMEOUT=600
+PLUGIN_INSTALLED_PATH=plugin
+PLUGIN_PACKAGE_CACHE_PATH=plugin_packages
+PLUGIN_MEDIA_CACHE_PATH=assets
+PLUGIN_S3_USE_AWS=false
+PLUGIN_S3_USE_AWS_MANAGED_IAM=false
+PLUGIN_S3_ENDPOINT=
+PLUGIN_S3_USE_PATH_STYLE=false
+PLUGIN_AZURE_BLOB_STORAGE_CONTAINER_NAME=
+PLUGIN_AZURE_BLOB_STORAGE_CONNECTION_STRING=
+PLUGIN_TENCENT_COS_REGION=
+PLUGIN_ALIYUN_OSS_REGION=
+PLUGIN_ALIYUN_OSS_ENDPOINT=
+PLUGIN_ALIYUN_OSS_AUTH_VERSION=v4
+PLUGIN_ALIYUN_OSS_PATH=
+PLUGIN_VOLCENGINE_TOS_ENDPOINT=
+PLUGIN_VOLCENGINE_TOS_REGION=
+ENABLE_OTEL=false
+OTLP_TRACE_ENDPOINT=
+OTLP_METRIC_ENDPOINT=
+# Prefix used to create collection name in vector database
+OTLP_BASE_ENDPOINT=http://localhost:4318
+WEAVIATE_GRPC_ENDPOINT=grpc://weaviate:50051
+ANALYTICDB_KEY_ID=your-ak
+ANALYTICDB_KEY_SECRET=your-sk
+ANALYTICDB_REGION_ID=cn-hangzhou
+ANALYTICDB_INSTANCE_ID=gp-ab123456
+ANALYTICDB_ACCOUNT=testaccount
+ANALYTICDB_PASSWORD=testpassword
+ANALYTICDB_NAMESPACE=dify
+ANALYTICDB_NAMESPACE_PASSWORD=difypassword
+ANALYTICDB_HOST=gp-test.aliyuncs.com
+ANALYTICDB_PORT=5432
+ANALYTICDB_MIN_CONNECTION=1
+ANALYTICDB_MAX_CONNECTION=5
+TIDB_VECTOR_HOST=tidb
+TIDB_VECTOR_PORT=4000
+TIDB_VECTOR_USER=
+TIDB_VECTOR_PASSWORD=
+TIDB_ON_QDRANT_CLIENT_TIMEOUT=20
+TIDB_ON_QDRANT_GRPC_ENABLED=false
+TIDB_ON_QDRANT_GRPC_PORT=6334
+TIDB_PUBLIC_KEY=dify
+TIDB_PRIVATE_KEY=dify
+RELYT_HOST=db
+RELYT_PORT=5432
+RELYT_USER=postgres
+VIKINGDB_ACCESS_KEY=your-ak
+VIKINGDB_SECRET_KEY=your-sk
+VIKINGDB_REGION=cn-shanghai
+VIKINGDB_HOST=api-vikingdb.xxx.volces.com
+VIKINGDB_SCHEME=http
+VIKINGDB_CONNECTION_TIMEOUT=30
+VIKINGDB_SOCKET_TIMEOUT=30
+TABLESTORE_ENDPOINT=https://instance-name.cn-hangzhou.ots.aliyuncs.com
+TABLESTORE_INSTANCE_NAME=instance-name
+CLICKZETTA_USERNAME=
+CLICKZETTA_VECTOR_DISTANCE_FUNCTION=cosine_distance
+COMPOSE_PROFILES=${VECTOR_STORE:-weaviate},${DB_TYPE:-postgresql},collaboration
+EXPOSE_NGINX_PORT=80
+EXPOSE_NGINX_SSL_PORT=443
+POSITION_TOOL_PINS=
+POSITION_TOOL_INCLUDES=
+POSITION_TOOL_EXCLUDES=
+POSITION_PROVIDER_PINS=
+POSITION_PROVIDER_INCLUDES=
+POSITION_PROVIDER_EXCLUDES=
+CREATE_TIDB_SERVICE_JOB_ENABLED=false
+MAX_SUBMIT_COUNT=100
+
+# Vector Store Configuration
+STORAGE_TYPE=opendal
+VECTOR_STORE=weaviate
+VECTOR_INDEX_NAME_PREFIX=Vector_index
+WEAVIATE_ENDPOINT=http://weaviate:8080
+WEAVIATE_API_KEY=WVF5YThaHlkYwhGUSmCRgsX3tD5ngdN8pkih
+WEAVIATE_TOKENIZATION=word
+OCEANBASE_VECTOR_HOST=oceanbase
+OCEANBASE_VECTOR_PORT=2881
+OCEANBASE_VECTOR_USER=root@test
+OCEANBASE_VECTOR_PASSWORD=difyai123456
+OCEANBASE_VECTOR_DATABASE=test
+OCEANBASE_ENABLE_HYBRID_SEARCH=false
+OCEANBASE_FULLTEXT_PARSER=ik
+SEEKDB_MEMORY_LIMIT=2G
+QDRANT_URL=http://qdrant:6333
+QDRANT_API_KEY=difyai123456
+QDRANT_CLIENT_TIMEOUT=20
+QDRANT_GRPC_ENABLED=false
+QDRANT_GRPC_PORT=6334
+QDRANT_REPLICATION_FACTOR=1
+MILVUS_URI=http://host.docker.internal:19530
+MILVUS_TOKEN=
+MILVUS_USER=
+MILVUS_PASSWORD=
+MILVUS_ANALYZER_PARAMS=
+PGVECTOR_HOST=pgvector
+PGVECTOR_PORT=5432
+PGVECTOR_USER=postgres
+PGVECTOR_PASSWORD=difyai123456
+PGVECTOR_DATABASE=dify
+PGVECTOR_MIN_CONNECTION=1
+PGVECTOR_MAX_CONNECTION=5
+PGVECTOR_PG_BIGM=false
+PGVECTOR_PG_BIGM_VERSION=1.2-20240606
+
+# Hologres Configuration
+HOLOGRES_HOST=
+HOLOGRES_PORT=80
+HOLOGRES_DATABASE=
+HOLOGRES_ACCESS_KEY_ID=
+HOLOGRES_ACCESS_KEY_SECRET=
+HOLOGRES_SCHEMA=public
+HOLOGRES_TOKENIZER=jieba
+HOLOGRES_DISTANCE_METHOD=Cosine
+HOLOGRES_BASE_QUANTIZATION_TYPE=rabitq
+HOLOGRES_MAX_DEGREE=64
+HOLOGRES_EF_CONSTRUCTION=400
+
+# Milvus API Configuration
+MILVUS_DATABASE=
+MILVUS_ENABLE_HYBRID_SEARCH=False
+
+# Human Input Task Configuration
+ENABLE_HUMAN_INPUT_TIMEOUT_TASK=true
+HUMAN_INPUT_TIMEOUT_TASK_INTERVAL=1
diff --git a/docker/envs/core-services/web.env.example b/docker/envs/core-services/web.env.example
new file mode 100644
index 0000000000..d366cd87ba
--- /dev/null
+++ b/docker/envs/core-services/web.env.example
@@ -0,0 +1,30 @@
+# ------------------------------
+# Web Configuration
+# ------------------------------
+
+CONSOLE_API_URL=
+APP_API_URL=
+SENTRY_DSN=
+NEXT_PUBLIC_SOCKET_URL=ws://localhost
+EXPERIMENTAL_ENABLE_VINEXT=false
+LOOP_NODE_MAX_COUNT=100
+MAX_TOOLS_NUM=10
+MAX_PARALLEL_LIMIT=10
+MAX_ITERATIONS_NUM=99
+TEXT_GENERATION_TIMEOUT_MS=60000
+ALLOW_INLINE_STYLES=false
+ALLOW_UNSAFE_DATA_SCHEME=false
+MAX_TREE_DEPTH=50
+MARKETPLACE_ENABLED=true
+MARKETPLACE_API_URL=https://marketplace.dify.ai
+INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH=4000
+ALLOW_EMBED=false
+AMPLITUDE_API_KEY=
+ENABLE_WEBSITE_JINAREADER=true
+ENABLE_WEBSITE_FIRECRAWL=true
+ENABLE_WEBSITE_WATERCRAWL=true
+NEXT_PUBLIC_ENABLE_SINGLE_DOLLAR_LATEX=false
+NEXT_PUBLIC_COOKIE_DOMAIN=
+NEXT_PUBLIC_BATCH_CONCURRENCY=5
+CSP_WHITELIST=
+TOP_K_MAX_VALUE=10
diff --git a/docker/envs/core-services/worker-beat.env.example b/docker/envs/core-services/worker-beat.env.example
new file mode 100644
index 0000000000..380fe02b68
--- /dev/null
+++ b/docker/envs/core-services/worker-beat.env.example
@@ -0,0 +1,8 @@
+# ------------------------------
+# Worker Beat Configuration
+# ------------------------------
+
+MODE=beat
+COMPOSE_WORKER_HEALTHCHECK_DISABLED=true
+COMPOSE_WORKER_HEALTHCHECK_INTERVAL=30s
+COMPOSE_WORKER_HEALTHCHECK_TIMEOUT=30s
diff --git a/docker/envs/core-services/worker.env.example b/docker/envs/core-services/worker.env.example
new file mode 100644
index 0000000000..58cf4ea901
--- /dev/null
+++ b/docker/envs/core-services/worker.env.example
@@ -0,0 +1,13 @@
+# ------------------------------
+# Worker Configuration
+# ------------------------------
+
+MODE=worker
+SENTRY_DSN=
+SENTRY_TRACES_SAMPLE_RATE=1.0
+SENTRY_PROFILES_SAMPLE_RATE=1.0
+PLUGIN_MAX_PACKAGE_SIZE=52428800
+INNER_API_KEY_FOR_PLUGIN=QaHbTe77CtuXmsfyhR7+vRjI/+XbV1AaFy691iy+kGDv2Jvy0/eAh8Y1
+COMPOSE_WORKER_HEALTHCHECK_DISABLED=true
+COMPOSE_WORKER_HEALTHCHECK_INTERVAL=30s
+COMPOSE_WORKER_HEALTHCHECK_TIMEOUT=30s
diff --git a/docker/envs/databases/db-mysql.env.example b/docker/envs/databases/db-mysql.env.example
new file mode 100644
index 0000000000..b3ea6801fe
--- /dev/null
+++ b/docker/envs/databases/db-mysql.env.example
@@ -0,0 +1,9 @@
+# ------------------------------
+# Db Mysql Configuration
+# ------------------------------
+
+MYSQL_INNODB_LOG_FILE_SIZE=128M
+MYSQL_INNODB_FLUSH_LOG_AT_TRX_COMMIT=2
+MYSQL_MAX_CONNECTIONS=1000
+MYSQL_INNODB_BUFFER_POOL_SIZE=512M
+MYSQL_HOST_VOLUME=./volumes/mysql/data
diff --git a/docker/envs/databases/db-postgres.env.example b/docker/envs/databases/db-postgres.env.example
new file mode 100644
index 0000000000..14cefb6bee
--- /dev/null
+++ b/docker/envs/databases/db-postgres.env.example
@@ -0,0 +1,26 @@
+# ------------------------------
+# Db Postgres Configuration
+# ------------------------------
+
+PGDATA=/var/lib/postgresql/data/pgdata
+DB_TYPE=postgresql
+DB_USERNAME=postgres
+DB_PASSWORD=difyai123456
+DB_HOST=db_postgres
+DB_PORT=5432
+DB_DATABASE=dify
+SQLALCHEMY_POOL_SIZE=30
+SQLALCHEMY_MAX_OVERFLOW=10
+SQLALCHEMY_POOL_RECYCLE=3600
+SQLALCHEMY_ECHO=false
+SQLALCHEMY_POOL_PRE_PING=false
+SQLALCHEMY_POOL_USE_LIFO=false
+SQLALCHEMY_POOL_TIMEOUT=30
+SQLALCHEMY_POOL_RESET_ON_RETURN=rollback
+POSTGRES_MAX_CONNECTIONS=100
+POSTGRES_SHARED_BUFFERS=128MB
+POSTGRES_WORK_MEM=4MB
+POSTGRES_MAINTENANCE_WORK_MEM=64MB
+POSTGRES_EFFECTIVE_CACHE_SIZE=4096MB
+POSTGRES_STATEMENT_TIMEOUT=0
+POSTGRES_IDLE_IN_TRANSACTION_SESSION_TIMEOUT=0
diff --git a/docker/envs/databases/redis.env.example b/docker/envs/databases/redis.env.example
new file mode 100644
index 0000000000..74bcb6525e
--- /dev/null
+++ b/docker/envs/databases/redis.env.example
@@ -0,0 +1,35 @@
+# ------------------------------
+# Redis Configuration
+# ------------------------------
+
+REDIS_HOST=redis
+REDIS_PORT=6379
+REDIS_USERNAME=
+REDIS_PASSWORD=difyai123456
+REDIS_USE_SSL=false
+REDIS_SSL_CERT_REQS=CERT_NONE
+REDIS_SSL_CA_CERTS=
+REDIS_SSL_CERTFILE=
+REDIS_SSL_KEYFILE=
+REDIS_DB=0
+REDIS_KEY_PREFIX=
+REDIS_MAX_CONNECTIONS=
+REDIS_USE_SENTINEL=false
+REDIS_SENTINELS=
+REDIS_SENTINEL_SERVICE_NAME=
+REDIS_SENTINEL_USERNAME=
+REDIS_SENTINEL_PASSWORD=
+REDIS_SENTINEL_SOCKET_TIMEOUT=0.1
+REDIS_USE_CLUSTERS=false
+REDIS_CLUSTERS=
+REDIS_CLUSTERS_PASSWORD=
+REDIS_RETRY_RETRIES=3
+REDIS_RETRY_BACKOFF_BASE=1.0
+REDIS_RETRY_BACKOFF_CAP=10.0
+REDIS_SOCKET_TIMEOUT=5.0
+REDIS_SOCKET_CONNECT_TIMEOUT=5.0
+REDIS_HEALTH_CHECK_INTERVAL=30
+EVENT_BUS_REDIS_URL=
+EVENT_BUS_REDIS_CHANNEL_TYPE=pubsub
+EVENT_BUS_REDIS_USE_CLUSTERS=false
+BROKER_USE_SSL=false
diff --git a/docker/envs/infrastructure/certbot.env.example b/docker/envs/infrastructure/certbot.env.example
new file mode 100644
index 0000000000..c654fbe02f
--- /dev/null
+++ b/docker/envs/infrastructure/certbot.env.example
@@ -0,0 +1,7 @@
+# ------------------------------
+# Certbot Configuration
+# ------------------------------
+
+CERTBOT_EMAIL=your_email@example.com
+CERTBOT_DOMAIN=your_domain.com
+CERTBOT_OPTIONS=
diff --git a/docker/envs/infrastructure/etcd.env.example b/docker/envs/infrastructure/etcd.env.example
new file mode 100644
index 0000000000..4dca26671a
--- /dev/null
+++ b/docker/envs/infrastructure/etcd.env.example
@@ -0,0 +1,4 @@
+# ------------------------------
+# Etcd Configuration
+# ------------------------------
+
diff --git a/docker/envs/infrastructure/milvus-standalone.env.example b/docker/envs/infrastructure/milvus-standalone.env.example
new file mode 100644
index 0000000000..7e87ed2648
--- /dev/null
+++ b/docker/envs/infrastructure/milvus-standalone.env.example
@@ -0,0 +1,4 @@
+# ------------------------------
+# Milvus Standalone Configuration
+# ------------------------------
+
diff --git a/docker/envs/infrastructure/minio.env.example b/docker/envs/infrastructure/minio.env.example
new file mode 100644
index 0000000000..7c8e1fa35a
--- /dev/null
+++ b/docker/envs/infrastructure/minio.env.example
@@ -0,0 +1,4 @@
+# ------------------------------
+# Minio Configuration
+# ------------------------------
+
diff --git a/docker/envs/infrastructure/nginx.env.example b/docker/envs/infrastructure/nginx.env.example
new file mode 100644
index 0000000000..fcb369a47d
--- /dev/null
+++ b/docker/envs/infrastructure/nginx.env.example
@@ -0,0 +1,18 @@
+# ------------------------------
+# Nginx Configuration
+# ------------------------------
+
+NGINX_SERVER_NAME=_
+NGINX_HTTPS_ENABLED=false
+NGINX_PORT=80
+NGINX_SSL_PORT=443
+NGINX_SSL_CERT_FILENAME=dify.crt
+NGINX_SSL_CERT_KEY_FILENAME=dify.key
+NGINX_SSL_PROTOCOLS=TLSv1.2 TLSv1.3
+NGINX_WORKER_PROCESSES=auto
+NGINX_CLIENT_MAX_BODY_SIZE=100M
+NGINX_KEEPALIVE_TIMEOUT=65
+NGINX_PROXY_READ_TIMEOUT=3600s
+NGINX_PROXY_SEND_TIMEOUT=3600s
+NGINX_ENABLE_CERTBOT_CHALLENGE=false
+NGINX_SOCKET_IO_UPSTREAM=api_websocket:5001
diff --git a/docker/envs/infrastructure/ssrf-proxy.env.example b/docker/envs/infrastructure/ssrf-proxy.env.example
new file mode 100644
index 0000000000..210a782494
--- /dev/null
+++ b/docker/envs/infrastructure/ssrf-proxy.env.example
@@ -0,0 +1,17 @@
+# ------------------------------
+# Ssrf Proxy Configuration
+# ------------------------------
+
+SSRF_PROXY_HTTP_URL=http://ssrf_proxy:3128
+SSRF_PROXY_HTTPS_URL=http://ssrf_proxy:3128
+SSRF_HTTP_PORT=3128
+SSRF_COREDUMP_DIR=/var/spool/squid
+SSRF_REVERSE_PROXY_PORT=8194
+SSRF_SANDBOX_HOST=sandbox
+SSRF_DEFAULT_TIME_OUT=5
+SSRF_DEFAULT_CONNECT_TIME_OUT=5
+SSRF_DEFAULT_READ_TIME_OUT=5
+SSRF_DEFAULT_WRITE_TIME_OUT=5
+SSRF_POOL_MAX_CONNECTIONS=100
+SSRF_POOL_MAX_KEEPALIVE_CONNECTIONS=20
+SSRF_POOL_KEEPALIVE_EXPIRY=5.0
diff --git a/docker/middleware.env.example b/docker/envs/middleware.env.example
similarity index 100%
rename from docker/middleware.env.example
rename to docker/envs/middleware.env.example
diff --git a/docker/envs/security.env.example b/docker/envs/security.env.example
new file mode 100644
index 0000000000..d7556d91e5
--- /dev/null
+++ b/docker/envs/security.env.example
@@ -0,0 +1,41 @@
+# ------------------------------
+# Security Configuration
+# ------------------------------
+
+TIDB_ON_QDRANT_API_KEY=dify
+TENCENT_VECTOR_DB_API_KEY=dify
+ALIBABACLOUD_MYSQL_PASSWORD=difyai123456
+RELYT_PASSWORD=difyai123456
+LINDORM_PASSWORD=admin
+HUAWEI_CLOUD_PASSWORD=admin
+UPSTASH_VECTOR_TOKEN=dify
+TABLESTORE_ACCESS_KEY_ID=xxx
+TABLESTORE_ACCESS_KEY_SECRET=xxx
+UNSTRUCTURED_API_KEY=
+PLUGIN_BASED_TOKEN_COUNTING_ENABLED=false
+NOTION_CLIENT_SECRET=
+NOTION_INTERNAL_SECRET=
+RESEND_API_KEY=your-resend-api-key
+SMTP_PASSWORD=
+SENDGRID_API_KEY=
+RESET_PASSWORD_TOKEN_EXPIRY_MINUTES=5
+EMAIL_REGISTER_TOKEN_EXPIRY_MINUTES=5
+CHANGE_EMAIL_TOKEN_EXPIRY_MINUTES=5
+OWNER_TRANSFER_TOKEN_EXPIRY_MINUTES=5
+CODE_EXECUTION_API_KEY=dify-sandbox
+ALIYUN_SLS_ACCESS_KEY_ID=
+ALIYUN_SLS_ACCESS_KEY_SECRET=
+OTLP_API_KEY=
+BAIDU_VECTOR_DB_API_KEY=dify
+ANALYTICDB_KEY_ID=your-ak
+ANALYTICDB_KEY_SECRET=your-sk
+ANALYTICDB_PASSWORD=testpassword
+ANALYTICDB_NAMESPACE_PASSWORD=difypassword
+TIDB_VECTOR_PASSWORD=
+TIDB_PUBLIC_KEY=dify
+TIDB_PRIVATE_KEY=dify
+VIKINGDB_ACCESS_KEY=your-ak
+VIKINGDB_SECRET_KEY=your-sk
+# Leave empty to auto-generate a persistent key in the storage directory.
+SECRET_KEY=
+INIT_PASSWORD=
diff --git a/docker/envs/vectorstores/chroma.env.example b/docker/envs/vectorstores/chroma.env.example
new file mode 100644
index 0000000000..2a15375a3d
--- /dev/null
+++ b/docker/envs/vectorstores/chroma.env.example
@@ -0,0 +1,13 @@
+# ------------------------------
+# Chroma Configuration
+# ------------------------------
+
+CHROMA_DATABASE=default_database
+CHROMA_AUTH_PROVIDER=chromadb.auth.token_authn.TokenAuthClientProvider
+CHROMA_AUTH_CREDENTIALS=
+CHROMA_HOST=127.0.0.1
+CHROMA_PORT=8000
+CHROMA_TENANT=default_tenant
+CHROMA_SERVER_AUTHN_CREDENTIALS=difyai123456
+CHROMA_SERVER_AUTHN_PROVIDER=chromadb.auth.token_authn.TokenAuthenticationServerProvider
+CHROMA_IS_PERSISTENT=TRUE
diff --git a/docker/envs/vectorstores/couchbase.env.example b/docker/envs/vectorstores/couchbase.env.example
new file mode 100644
index 0000000000..4329d9c723
--- /dev/null
+++ b/docker/envs/vectorstores/couchbase.env.example
@@ -0,0 +1,9 @@
+# ------------------------------
+# Couchbase Configuration
+# ------------------------------
+
+COUCHBASE_PASSWORD=password
+COUCHBASE_BUCKET_NAME=Embeddings
+COUCHBASE_SCOPE_NAME=_default
+COUCHBASE_CONNECTION_STRING=couchbase://couchbase-server
+COUCHBASE_USER=Administrator
diff --git a/docker/envs/vectorstores/elasticsearch.env.example b/docker/envs/vectorstores/elasticsearch.env.example
new file mode 100644
index 0000000000..2aaa965cd7
--- /dev/null
+++ b/docker/envs/vectorstores/elasticsearch.env.example
@@ -0,0 +1,17 @@
+# ------------------------------
+# Elasticsearch Configuration
+# ------------------------------
+
+ELASTICSEARCH_CLOUD_URL=YOUR-ELASTICSEARCH_CLOUD_URL
+ELASTICSEARCH_PASSWORD=elastic
+KIBANA_PORT=5601
+ELASTICSEARCH_USE_CLOUD=false
+ELASTICSEARCH_API_KEY=YOUR-ELASTICSEARCH_API_KEY
+ELASTICSEARCH_VERIFY_CERTS=False
+ELASTICSEARCH_CA_CERTS=
+ELASTICSEARCH_REQUEST_TIMEOUT=100000
+ELASTICSEARCH_RETRY_ON_TIMEOUT=True
+ELASTICSEARCH_MAX_RETRIES=10
+ELASTICSEARCH_HOST=0.0.0.0
+ELASTICSEARCH_PORT=9200
+ELASTICSEARCH_USERNAME=elastic
diff --git a/docker/envs/vectorstores/iris.env.example b/docker/envs/vectorstores/iris.env.example
new file mode 100644
index 0000000000..b1eb39bff8
--- /dev/null
+++ b/docker/envs/vectorstores/iris.env.example
@@ -0,0 +1,17 @@
+# ------------------------------
+# Iris Configuration
+# ------------------------------
+
+IRIS_CONNECTION_URL=
+IRIS_MIN_CONNECTION=1
+IRIS_MAX_CONNECTION=3
+IRIS_TEXT_INDEX=true
+IRIS_TEXT_INDEX_LANGUAGE=en
+IRIS_TIMEZONE=UTC
+IRIS_PASSWORD=Dify@1234
+IRIS_DATABASE=USER
+IRIS_SCHEMA=dify
+IRIS_HOST=iris
+IRIS_SUPER_SERVER_PORT=1972
+IRIS_WEB_SERVER_PORT=52773
+IRIS_USER=_SYSTEM
diff --git a/docker/envs/vectorstores/matrixone.env.example b/docker/envs/vectorstores/matrixone.env.example
new file mode 100644
index 0000000000..931375f8b4
--- /dev/null
+++ b/docker/envs/vectorstores/matrixone.env.example
@@ -0,0 +1,9 @@
+# ------------------------------
+# Matrixone Configuration
+# ------------------------------
+
+MATRIXONE_PASSWORD=111
+MATRIXONE_HOST=matrixone
+MATRIXONE_PORT=6001
+MATRIXONE_USER=dump
+MATRIXONE_DATABASE=dify
diff --git a/docker/envs/vectorstores/milvus.env.example b/docker/envs/vectorstores/milvus.env.example
new file mode 100644
index 0000000000..d16879ca7b
--- /dev/null
+++ b/docker/envs/vectorstores/milvus.env.example
@@ -0,0 +1,13 @@
+# ------------------------------
+# Milvus Configuration
+# ------------------------------
+
+MINIO_ACCESS_KEY=minioadmin
+MINIO_SECRET_KEY=minioadmin
+ETCD_ENDPOINTS=etcd:2379
+MINIO_ADDRESS=minio:9000
+ETCD_AUTO_COMPACTION_MODE=revision
+ETCD_AUTO_COMPACTION_RETENTION=1000
+ETCD_QUOTA_BACKEND_BYTES=4294967296
+ETCD_SNAPSHOT_COUNT=50000
+MILVUS_AUTHORIZATION_ENABLED=true
diff --git a/docker/envs/vectorstores/myscale.env.example b/docker/envs/vectorstores/myscale.env.example
new file mode 100644
index 0000000000..eaa9e88cc0
--- /dev/null
+++ b/docker/envs/vectorstores/myscale.env.example
@@ -0,0 +1,10 @@
+# ------------------------------
+# Myscale Configuration
+# ------------------------------
+
+MYSCALE_PASSWORD=
+MYSCALE_DATABASE=dify
+MYSCALE_FTS_PARAMS=
+MYSCALE_HOST=myscale
+MYSCALE_PORT=8123
+MYSCALE_USER=default
diff --git a/docker/envs/vectorstores/oceanbase.env.example b/docker/envs/vectorstores/oceanbase.env.example
new file mode 100644
index 0000000000..42bed8df6a
--- /dev/null
+++ b/docker/envs/vectorstores/oceanbase.env.example
@@ -0,0 +1,6 @@
+# ------------------------------
+# Oceanbase Configuration
+# ------------------------------
+
+OCEANBASE_CLUSTER_NAME=difyai
+OCEANBASE_MEMORY_LIMIT=6G
diff --git a/docker/envs/vectorstores/opengauss.env.example b/docker/envs/vectorstores/opengauss.env.example
new file mode 100644
index 0000000000..9f58499b64
--- /dev/null
+++ b/docker/envs/vectorstores/opengauss.env.example
@@ -0,0 +1,12 @@
+# ------------------------------
+# Opengauss Configuration
+# ------------------------------
+
+OPENGAUSS_PASSWORD=Dify@123
+OPENGAUSS_DATABASE=dify
+OPENGAUSS_MIN_CONNECTION=1
+OPENGAUSS_MAX_CONNECTION=5
+OPENGAUSS_ENABLE_PQ=false
+OPENGAUSS_HOST=opengauss
+OPENGAUSS_PORT=6600
+OPENGAUSS_USER=postgres
diff --git a/docker/envs/vectorstores/opensearch.env.example b/docker/envs/vectorstores/opensearch.env.example
new file mode 100644
index 0000000000..a6a9283378
--- /dev/null
+++ b/docker/envs/vectorstores/opensearch.env.example
@@ -0,0 +1,22 @@
+# ------------------------------
+# Opensearch Configuration
+# ------------------------------
+
+OPENSEARCH_PASSWORD=admin
+OPENSEARCH_AWS_REGION=ap-southeast-1
+OPENSEARCH_AWS_SERVICE=aoss
+OPENSEARCH_INITIAL_ADMIN_PASSWORD=Qazwsxedc!@#123
+OPENSEARCH_MEMLOCK_SOFT=-1
+OPENSEARCH_MEMLOCK_HARD=-1
+OPENSEARCH_NOFILE_SOFT=65536
+OPENSEARCH_NOFILE_HARD=65536
+OPENSEARCH_HOST=opensearch
+OPENSEARCH_PORT=9200
+OPENSEARCH_SECURE=true
+OPENSEARCH_VERIFY_CERTS=true
+OPENSEARCH_AUTH_METHOD=basic
+OPENSEARCH_USER=admin
+OPENSEARCH_DISCOVERY_TYPE=single-node
+OPENSEARCH_BOOTSTRAP_MEMORY_LOCK=true
+OPENSEARCH_JAVA_OPTS_MIN=512m
+OPENSEARCH_JAVA_OPTS_MAX=1024m
diff --git a/docker/envs/vectorstores/oracle.env.example b/docker/envs/vectorstores/oracle.env.example
new file mode 100644
index 0000000000..c8f24db41a
--- /dev/null
+++ b/docker/envs/vectorstores/oracle.env.example
@@ -0,0 +1,13 @@
+# ------------------------------
+# Oracle Configuration
+# ------------------------------
+
+ORACLE_PASSWORD=dify
+ORACLE_DSN=oracle:1521/FREEPDB1
+ORACLE_CONFIG_DIR=/app/api/storage/wallet
+ORACLE_WALLET_LOCATION=/app/api/storage/wallet
+ORACLE_WALLET_PASSWORD=dify
+ORACLE_IS_AUTONOMOUS=false
+ORACLE_USER=dify
+ORACLE_PWD=Dify123456
+ORACLE_CHARACTERSET=AL32UTF8
diff --git a/docker/envs/vectorstores/pgvecto-rs.env.example b/docker/envs/vectorstores/pgvecto-rs.env.example
new file mode 100644
index 0000000000..6428e5dd67
--- /dev/null
+++ b/docker/envs/vectorstores/pgvecto-rs.env.example
@@ -0,0 +1,9 @@
+# ------------------------------
+# Pgvecto Rs Configuration
+# ------------------------------
+
+PGVECTO_RS_HOST=pgvecto-rs
+PGVECTO_RS_PORT=5432
+PGVECTO_RS_USER=postgres
+PGVECTO_RS_PASSWORD=difyai123456
+PGVECTO_RS_DATABASE=dify
diff --git a/docker/envs/vectorstores/pgvector.env.example b/docker/envs/vectorstores/pgvector.env.example
new file mode 100644
index 0000000000..9fd1dbf962
--- /dev/null
+++ b/docker/envs/vectorstores/pgvector.env.example
@@ -0,0 +1,8 @@
+# ------------------------------
+# Pgvector Configuration
+# ------------------------------
+
+PGVECTOR_PGUSER=postgres
+PGVECTOR_POSTGRES_PASSWORD=difyai123456
+PGVECTOR_POSTGRES_DB=dify
+PGVECTOR_PGDATA=/var/lib/postgresql/data/pgdata
diff --git a/docker/envs/vectorstores/qdrant.env.example b/docker/envs/vectorstores/qdrant.env.example
new file mode 100644
index 0000000000..a3555fe547
--- /dev/null
+++ b/docker/envs/vectorstores/qdrant.env.example
@@ -0,0 +1,4 @@
+# ------------------------------
+# Qdrant Configuration
+# ------------------------------
+
diff --git a/docker/envs/vectorstores/seekdb.env.example b/docker/envs/vectorstores/seekdb.env.example
new file mode 100644
index 0000000000..4307fbede2
--- /dev/null
+++ b/docker/envs/vectorstores/seekdb.env.example
@@ -0,0 +1,4 @@
+# ------------------------------
+# Seekdb Configuration
+# ------------------------------
+
diff --git a/docker/envs/vectorstores/vastbase.env.example b/docker/envs/vectorstores/vastbase.env.example
new file mode 100644
index 0000000000..2c9db50fbe
--- /dev/null
+++ b/docker/envs/vectorstores/vastbase.env.example
@@ -0,0 +1,11 @@
+# ------------------------------
+# Vastbase Configuration
+# ------------------------------
+
+VASTBASE_PASSWORD=Difyai123456
+VASTBASE_DATABASE=dify
+VASTBASE_MIN_CONNECTION=1
+VASTBASE_MAX_CONNECTION=5
+VASTBASE_HOST=vastbase
+VASTBASE_PORT=5432
+VASTBASE_USER=dify
diff --git a/docker/envs/vectorstores/weaviate.env.example b/docker/envs/vectorstores/weaviate.env.example
new file mode 100644
index 0000000000..82a3ccb172
--- /dev/null
+++ b/docker/envs/vectorstores/weaviate.env.example
@@ -0,0 +1,18 @@
+# ------------------------------
+# Weaviate Configuration
+# ------------------------------
+
+WEAVIATE_PERSISTENCE_DATA_PATH=/var/lib/weaviate
+WEAVIATE_QUERY_DEFAULTS_LIMIT=25
+WEAVIATE_AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED=true
+WEAVIATE_DEFAULT_VECTORIZER_MODULE=none
+WEAVIATE_CLUSTER_HOSTNAME=node1
+WEAVIATE_AUTHENTICATION_APIKEY_ENABLED=true
+WEAVIATE_AUTHENTICATION_APIKEY_ALLOWED_KEYS=WVF5YThaHlkYwhGUSmCRgsX3tD5ngdN8pkih
+WEAVIATE_AUTHENTICATION_APIKEY_USERS=hello@dify.ai
+WEAVIATE_AUTHORIZATION_ADMINLIST_ENABLED=true
+WEAVIATE_AUTHORIZATION_ADMINLIST_USERS=hello@dify.ai
+WEAVIATE_DISABLE_TELEMETRY=false
+WEAVIATE_ENABLE_TOKENIZER_GSE=false
+WEAVIATE_ENABLE_TOKENIZER_KAGOME_JA=false
+WEAVIATE_ENABLE_TOKENIZER_KAGOME_KR=false
diff --git a/docker/generate_docker_compose b/docker/generate_docker_compose
index 46d948f3c1..580091e006 100755
--- a/docker/generate_docker_compose
+++ b/docker/generate_docker_compose
@@ -64,25 +64,61 @@ def generate_shared_env_block(env_vars, anchor_name="shared-api-worker-env"):
     return "\n".join(lines)
 
 
-def insert_shared_env(template_path, output_path, shared_env_block, header_comments):
+def create_env_files_from_example(env_example_path):
     """
-    Inserts the shared environment variables block and header comments into the template file,
-    removing any existing x-shared-env anchors, and generates the final docker-compose.yaml file.
-    Always writes with LF line endings.
+    Creates actual env files from .env.example by copying the categorized .env.example files.
+    This allows docker-compose to use env_file references.
+    Supports per-module structure with subdirectories.
+    """
+    base_dir = os.path.dirname(os.path.abspath(env_example_path))
+    root_env_file = os.path.join(base_dir, ".env")
+    if not os.path.exists(root_env_file):
+        with open(env_example_path, "r", encoding="utf-8") as src, open(
+            root_env_file, "w", encoding="utf-8", newline="\n"
+        ) as dst:
+            dst.write(src.read())
+        print(f"Created {root_env_file}")
+    else:
+        print(f"{root_env_file} already exists, skipping")
+
+    envs_dir = os.path.join(base_dir, "envs")
+    if not os.path.isdir(envs_dir):
+        print(f"No envs directory found at {envs_dir}, skipping split env files")
+        return []
+
+    created_files = []
+    # Walk through all .env.example files in subdirectories
+    for root, dirs, files in os.walk(envs_dir):
+        for file in files:
+            if file.endswith('.env.example'):
+                example_file = os.path.join(root, file)
+                env_file = example_file.replace('.env.example', '.env')
+
+                if os.path.exists(env_file):
+                    print(f"{env_file} already exists, skipping")
+                    continue
+
+                # Copy .example to actual file
+                with open(example_file, "r", encoding="utf-8") as src, open(
+                    env_file, "w", encoding="utf-8", newline="\n"
+                ) as dst:
+                    dst.write(src.read())
+                created_files.append(env_file)
+                print(f"Created {env_file}")
+    
+    return created_files
+
+
+def insert_shared_env(template_path, output_path, header_comments):
+    """
+    Copies the template file to output path with header comments.
+    The template now uses env_file references instead of a huge YAML anchor.
     """
     with open(template_path, "r", encoding="utf-8") as f:
         template_content = f.read()
 
-    # Remove existing x-shared-env: &shared-api-worker-env lines
-    template_content = re.sub(
-        r"^x-shared-env: &shared-api-worker-env\s*\n?",
-        "",
-        template_content,
-        flags=re.MULTILINE,
-    )
-
-    # Prepare the final content with header comments and shared env block
-    final_content = f"{header_comments}\n{shared_env_block}\n\n{template_content}"
+    # Prepare the final content with header comments
+    final_content = f"{header_comments}\n{template_content}"
 
     with open(output_path, "w", encoding="utf-8", newline="\n") as f:
         f.write(final_content)
@@ -90,10 +126,10 @@ def insert_shared_env(template_path, output_path, shared_env_block, header_comme
 
 
 def main():
-    env_example_path = ".env.example"
-    template_path = "docker-compose-template.yaml"
-    output_path = "docker-compose.yaml"
-    anchor_name = "shared-api-worker-env"  # Can be modified as needed
+    base_dir = os.path.dirname(os.path.abspath(__file__))
+    env_example_path = os.path.join(base_dir, ".env.example")
+    template_path = os.path.join(base_dir, "docker-compose-template.yaml")
+    output_path = os.path.join(base_dir, "docker-compose.yaml")
 
     # Define header comments to be added at the top of docker-compose.yaml
     header_comments = (
@@ -110,17 +146,14 @@ def main():
             print(f"Error: File {path} does not exist.")
             sys.exit(1)
 
-    # Parse .env.example file
-    env_vars = parse_env_example(env_example_path)
+    # Create env files from categorized .env.example files
+    # These files are used by docker-compose's env_file directive
+    # This ensures .env files exist even in CI/CD environments
+    create_env_files_from_example(env_example_path)
 
-    if not env_vars:
-        print("Warning: No environment variables found in .env.example.")
-
-    # Generate shared environment variables block
-    shared_env_block = generate_shared_env_block(env_vars, anchor_name)
-
-    # Insert shared environment variables block and header comments into the template
-    insert_shared_env(template_path, output_path, shared_env_block, header_comments)
+    # Copy template to output with header comments
+    # The template now uses env_file references instead of a huge YAML anchor
+    insert_shared_env(template_path, output_path, header_comments)
 
 
 if __name__ == "__main__":
diff --git a/docker/nginx/conf.d/default.conf.template b/docker/nginx/conf.d/default.conf.template
index 94a748290f..64c720ca2b 100644
--- a/docker/nginx/conf.d/default.conf.template
+++ b/docker/nginx/conf.d/default.conf.template
@@ -15,7 +15,9 @@ server {
     }
 
     location /socket.io/ {
-      proxy_pass http://api:5001;
+      resolver 127.0.0.11 valid=30s ipv6=off;
+      set $socket_io_upstream ${NGINX_SOCKET_IO_UPSTREAM};
+      proxy_pass http://$socket_io_upstream;
       include proxy.conf;
       proxy_set_header Upgrade $http_upgrade;
       proxy_set_header Connection "upgrade";
diff --git a/e2e/AGENTS.md b/e2e/AGENTS.md
index e56aab20a7..c05b5105be 100644
--- a/e2e/AGENTS.md
+++ b/e2e/AGENTS.md
@@ -31,7 +31,7 @@ pnpm -C e2e check
 
 `pnpm install` is resolved through the repository workspace and uses the shared root lockfile plus `pnpm-workspace.yaml`.
 
-Use `pnpm check` as the default local verification step after editing E2E TypeScript, Cucumber support code, or feature glue. It runs formatting, linting, and type checks for this package.
+Use `pnpm -C e2e check` as the default local verification step after editing E2E TypeScript, Cucumber support code, or feature glue. It runs formatting, linting, and type checks for this package.
 
 Common commands:
 
@@ -68,8 +68,8 @@ flowchart TD
   C --> D["Cucumber loads config, steps, and support modules"]
   D --> E["BeforeAll bootstraps shared auth state via /install"]
   E --> F{"Which command is running?"}
-  F -->|`pnpm e2e`| G["Run config default tags: not @fresh and not @skip"]
-  F -->|`pnpm e2e:full*`| H["Override tags to not @skip"]
+  F -->|`pnpm -C e2e e2e`| G["Run config default tags: not @fresh and not @skip"]
+  F -->|`pnpm -C e2e e2e:full*`| H["Override tags to not @skip"]
   G --> I["Per-scenario BrowserContext from shared browser"]
   H --> I
   I --> J["Failure artifacts written to cucumber-report/artifacts"]
@@ -99,7 +99,7 @@ Behavior depends on instance state:
 - uninitialized instance: completes install and stores authenticated state
 - initialized instance: signs in and reuses authenticated state
 
-Because of that, the `@fresh` install scenario only runs in the `pnpm e2e:full*` flows. The default `pnpm e2e*` flows exclude `@fresh` via Cucumber config tags so they can be re-run against an already initialized instance.
+Because of that, the `@fresh` install scenario only runs in the `pnpm -C e2e e2e:full*` flows. The default `pnpm -C e2e e2e*` flows exclude `@fresh` via Cucumber config tags so they can be re-run against an already initialized instance.
 
 Reset all persisted E2E state:
 
@@ -126,7 +126,7 @@ pnpm -C e2e e2e:middleware:up
 Stop the full middleware stack:
 
 ```bash
-pnpm e2e:middleware:down
+pnpm -C e2e e2e:middleware:down
 ```
 
 The middleware stack includes:
@@ -141,15 +141,15 @@ The middleware stack includes:
 Fresh install verification:
 
 ```bash
-pnpm e2e:full
+pnpm -C e2e e2e:full
 ```
 
 Run the Cucumber suite against an already running middleware stack:
 
 ```bash
-pnpm e2e:middleware:up
-pnpm e2e
-pnpm e2e:middleware:down
+pnpm -C e2e e2e:middleware:up
+pnpm -C e2e e2e
+pnpm -C e2e e2e:middleware:down
 ```
 
 Artifacts and diagnostics:
diff --git a/e2e/features/step-definitions/apps/share-app.steps.ts b/e2e/features/step-definitions/apps/share-app.steps.ts
index d5742bdaa8..3ec038b065 100644
--- a/e2e/features/step-definitions/apps/share-app.steps.ts
+++ b/e2e/features/step-definitions/apps/share-app.steps.ts
@@ -40,7 +40,7 @@ Then('the shared app page should be accessible', async function (this: DifyWorld
 
 When('I run the shared workflow app', async function (this: DifyWorld) {
   const page = this.getPage()
-  const runButton = page.getByTestId('run-button')
+  const runButton = page.getByRole('button', { name: 'Execute' })
 
   await expect(runButton).toBeEnabled({ timeout: 15_000 })
   await runButton.click()
diff --git a/e2e/scripts/common.ts b/e2e/scripts/common.ts
index ea6c897b2d..2964892dd0 100644
--- a/e2e/scripts/common.ts
+++ b/e2e/scripts/common.ts
@@ -36,7 +36,7 @@ export const webDir = path.join(rootDir, 'web')
 
 export const middlewareComposeFile = path.join(dockerDir, 'docker-compose.middleware.yaml')
 export const middlewareEnvFile = path.join(dockerDir, 'middleware.env')
-export const middlewareEnvExampleFile = path.join(dockerDir, 'middleware.env.example')
+export const middlewareEnvExampleFile = path.join(dockerDir, 'envs', 'middleware.env.example')
 export const webEnvLocalFile = path.join(webDir, '.env.local')
 export const webEnvExampleFile = path.join(webDir, '.env.example')
 export const apiEnvExampleFile = path.join(apiDir, 'tests', 'integration_tests', '.env.example')
diff --git a/eslint-suppressions.json b/eslint-suppressions.json
index bbb5cd5af9..07504d2754 100644
--- a/eslint-suppressions.json
+++ b/eslint-suppressions.json
@@ -120,6 +120,9 @@
     }
   },
   "web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/provider-panel.tsx": {
+    "react/static-components": {
+      "count": 2
+    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -155,33 +158,15 @@
     }
   },
   "web/app/account/(commonLayout)/account-page/email-change-modal.tsx": {
-    "erasable-syntax-only/enums": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 5
     }
   },
-  "web/app/account/(commonLayout)/account-page/index.tsx": {
-    "ts/no-explicit-any": {
-      "count": 1
-    }
-  },
-  "web/app/account/(commonLayout)/delete-account/components/feed-back.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/account/(commonLayout)/delete-account/components/verify-email.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "web/app/account/(commonLayout)/delete-account/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/account/oauth/authorize/layout.tsx": {
     "ts/no-explicit-any": {
       "count": 1
@@ -210,13 +195,15 @@
       "count": 1
     }
   },
+  "web/app/components/app/annotation/batch-add-annotation-modal/csv-downloader.tsx": {
+    "react/static-components": {
+      "count": 2
+    }
+  },
   "web/app/components/app/annotation/batch-add-annotation-modal/index.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react-refresh/only-export-components": {
       "count": 1
     },
@@ -267,26 +254,11 @@
       "count": 1
     }
   },
-  "web/app/components/app/app-access-control/specific-groups-or-members.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/app/app-publisher/features-wrapper.tsx": {
     "ts/no-explicit-any": {
       "count": 4
     }
   },
-  "web/app/components/app/app-publisher/index.tsx": {
-    "ts/no-explicit-any": {
-      "count": 5
-    }
-  },
-  "web/app/components/app/app-publisher/version-info-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/app/configuration/base/var-highlight/index.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
@@ -298,9 +270,6 @@
     }
   },
   "web/app/components/app/configuration/config-prompt/conversation-history/edit-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -316,27 +285,11 @@
     }
   },
   "web/app/components/app/configuration/config-var/config-modal/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 4
     }
   },
-  "web/app/components/app/configuration/config-var/config-modal/type-select.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/app/configuration/config-var/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/app/configuration/config-var/select-var-type.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -349,11 +302,6 @@
       "count": 1
     }
   },
-  "web/app/components/app/configuration/config/agent/agent-setting/item-panel.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/app/configuration/config/agent/agent-tools/index.tsx": {
     "ts/no-explicit-any": {
       "count": 9
@@ -371,17 +319,11 @@
     }
   },
   "web/app/components/app/configuration/config/assistant-type-picker/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
   },
   "web/app/components/app/configuration/config/automatic/get-automatic-res.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react/set-state-in-effect": {
       "count": 4
     },
@@ -409,15 +351,7 @@
       "count": 1
     }
   },
-  "web/app/components/app/configuration/config/automatic/version-selector.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/app/configuration/config/code-generator/get-code-generator-res.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react/set-state-in-effect": {
       "count": 4
     },
@@ -436,18 +370,10 @@
     }
   },
   "web/app/components/app/configuration/dataset-config/params-config/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "web/app/components/app/configuration/dataset-config/select-dataset/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/app/configuration/dataset-config/settings-modal/index.tsx": {
     "react/set-state-in-effect": {
       "count": 2
@@ -493,7 +419,7 @@
   },
   "web/app/components/app/configuration/debug/index.tsx": {
     "react/set-state-in-effect": {
-      "count": 2
+      "count": 1
     },
     "ts/no-explicit-any": {
       "count": 11
@@ -517,26 +443,10 @@
       "count": 1
     }
   },
-  "web/app/components/app/create-app-modal/index.tsx": {
-    "react/set-state-in-effect": {
-      "count": 1
-    },
-    "ts/no-explicit-any": {
-      "count": 1
-    }
-  },
-  "web/app/components/app/create-from-dsl-modal/dsl-confirm-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/app/create-from-dsl-modal/index.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react-refresh/only-export-components": {
       "count": 1
     },
@@ -544,11 +454,6 @@
       "count": 2
     }
   },
-  "web/app/components/app/duplicate-modal/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/app/log/filter.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
@@ -575,27 +480,8 @@
       "count": 2
     }
   },
-  "web/app/components/app/overview/customize/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/app/overview/embedded/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "react/set-state-in-effect": {
-      "count": 1
-    }
-  },
-  "web/app/components/app/overview/settings/index.tsx": {
-    "no-restricted-imports": {
-      "count": 2
-    },
-    "react/set-state-in-effect": {
-      "count": 3
-    },
-    "regexp/no-unused-capturing-group": {
+  "web/app/components/app/overview/app-chart.tsx": {
+    "react/component-hook-factories": {
       "count": 1
     }
   },
@@ -605,9 +491,6 @@
     }
   },
   "web/app/components/app/switch-app-modal/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react/set-state-in-effect": {
       "count": 1
     }
@@ -622,11 +505,6 @@
       "count": 2
     }
   },
-  "web/app/components/app/workflow-log/detail.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/app/workflow-log/filter.tsx": {
     "react-refresh/only-export-components": {
       "count": 1
@@ -642,25 +520,6 @@
       "count": 1
     }
   },
-  "web/app/components/apps/app-card.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "react/set-state-in-effect": {
-      "count": 1
-    },
-    "ts/no-explicit-any": {
-      "count": 2
-    }
-  },
-  "web/app/components/apps/list.tsx": {
-    "react-hooks/exhaustive-deps": {
-      "count": 1
-    },
-    "react/unsupported-syntax": {
-      "count": 2
-    }
-  },
   "web/app/components/apps/new-app-card.tsx": {
     "react-hooks-extra/no-direct-set-state-in-use-effect": {
       "count": 1
@@ -766,14 +625,14 @@
     "react-refresh/only-export-components": {
       "count": 1
     },
-    "react/component-hook-factories": {
-      "count": 1
-    },
     "react/no-nested-component-definitions": {
       "count": 1
     },
     "react/set-state-in-effect": {
       "count": 1
+    },
+    "react/static-components": {
+      "count": 2
     }
   },
   "web/app/components/base/carousel/index.tsx": {
@@ -830,11 +689,6 @@
       "count": 1
     }
   },
-  "web/app/components/base/chat/chat-with-history/sidebar/rename-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/base/chat/chat/answer/agent-content.tsx": {
     "style/multiline-ternary": {
       "count": 2
@@ -849,18 +703,10 @@
     }
   },
   "web/app/components/base/chat/chat/answer/index.tsx": {
-    "react/set-state-in-effect": {
-      "count": 3
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "web/app/components/base/chat/chat/answer/operation.tsx": {
-    "no-restricted-imports": {
-      "count": 2
-    }
-  },
   "web/app/components/base/chat/chat/answer/workflow-process.tsx": {
     "react/set-state-in-effect": {
       "count": 1
@@ -943,24 +789,11 @@
       "count": 10
     }
   },
-  "web/app/components/base/checkbox/index.stories.tsx": {
-    "no-console": {
-      "count": 1
-    },
-    "ts/no-explicit-any": {
-      "count": 1
-    }
-  },
   "web/app/components/base/chip/index.tsx": {
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "web/app/components/base/content-dialog/index.stories.tsx": {
-    "react/set-state-in-effect": {
-      "count": 1
-    }
-  },
   "web/app/components/base/date-and-time-picker/hooks.ts": {
     "react/no-unnecessary-use-prefix": {
       "count": 2
@@ -976,26 +809,11 @@
       "count": 1
     }
   },
-  "web/app/components/base/dialog/index.stories.tsx": {
-    "react/set-state-in-effect": {
-      "count": 1
-    }
-  },
-  "web/app/components/base/drawer-plus/index.stories.tsx": {
-    "react/component-hook-factories": {
-      "count": 1
-    }
-  },
-  "web/app/components/base/emoji-picker/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/base/error-boundary/index.tsx": {
     "react-refresh/only-export-components": {
       "count": 3
     },
-    "react/component-hook-factories": {
+    "react/jsx-no-key-after-spread": {
       "count": 1
     },
     "ts/no-explicit-any": {
@@ -1012,16 +830,6 @@
       "count": 1
     }
   },
-  "web/app/components/base/features/new-feature-panel/annotation-reply/config-param-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/base/features/new-feature-panel/annotation-reply/config-param.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/base/features/new-feature-panel/annotation-reply/index.tsx": {
     "ts/no-explicit-any": {
       "count": 3
@@ -1048,18 +856,10 @@
     }
   },
   "web/app/components/base/features/new-feature-panel/moderation/moderation-setting-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "web/app/components/base/features/new-feature-panel/text-to-speech/param-config-content.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/base/features/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 2
@@ -1111,14 +911,6 @@
       "count": 3
     }
   },
-  "web/app/components/base/form/components/base/base-field.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "ts/no-explicit-any": {
-      "count": 3
-    }
-  },
   "web/app/components/base/form/components/base/base-form.tsx": {
     "ts/no-explicit-any": {
       "count": 6
@@ -1134,27 +926,26 @@
       "count": 1
     }
   },
-  "web/app/components/base/form/components/field/variable-or-constant-input.tsx": {
-    "no-console": {
-      "count": 2
-    },
-    "ts/no-explicit-any": {
-      "count": 2
-    }
-  },
   "web/app/components/base/form/components/field/variable-selector.tsx": {
     "no-console": {
       "count": 1
     }
   },
+  "web/app/components/base/form/form-scenarios/base/__tests__/field.spec.tsx": {
+    "react/static-components": {
+      "count": 2
+    }
+  },
   "web/app/components/base/form/form-scenarios/base/field.tsx": {
-    "react/component-hook-factories": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
   },
+  "web/app/components/base/form/form-scenarios/base/index.tsx": {
+    "react/static-components": {
+      "count": 2
+    }
+  },
   "web/app/components/base/form/form-scenarios/base/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
@@ -1168,10 +959,12 @@
       "count": 2
     }
   },
+  "web/app/components/base/form/form-scenarios/input-field/__tests__/field.spec.tsx": {
+    "react/static-components": {
+      "count": 2
+    }
+  },
   "web/app/components/base/form/form-scenarios/input-field/field.tsx": {
-    "react/component-hook-factories": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -1184,10 +977,12 @@
       "count": 2
     }
   },
+  "web/app/components/base/form/form-scenarios/node-panel/__tests__/field.spec.tsx": {
+    "react/static-components": {
+      "count": 2
+    }
+  },
   "web/app/components/base/form/form-scenarios/node-panel/field.tsx": {
-    "react/component-hook-factories": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -1323,7 +1118,7 @@
   },
   "web/app/components/base/icons/src/vender/line/development/index.ts": {
     "no-barrel-files/no-barrel-files": {
-      "count": 2
+      "count": 1
     }
   },
   "web/app/components/base/icons/src/vender/line/editor/index.ts": {
@@ -1348,7 +1143,7 @@
   },
   "web/app/components/base/icons/src/vender/line/general/index.ts": {
     "no-barrel-files/no-barrel-files": {
-      "count": 12
+      "count": 11
     }
   },
   "web/app/components/base/icons/src/vender/line/images/index.ts": {
@@ -1540,18 +1335,10 @@
     }
   },
   "web/app/components/base/markdown-blocks/code-block.tsx": {
-    "react/set-state-in-effect": {
-      "count": 7
-    },
     "ts/no-explicit-any": {
       "count": 9
     }
   },
-  "web/app/components/base/markdown-blocks/form.tsx": {
-    "erasable-syntax-only/enums": {
-      "count": 3
-    }
-  },
   "web/app/components/base/markdown-blocks/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 10
@@ -1602,7 +1389,7 @@
   },
   "web/app/components/base/mermaid/index.tsx": {
     "react/set-state-in-effect": {
-      "count": 7
+      "count": 4
     },
     "regexp/no-super-linear-backtracking": {
       "count": 3
@@ -1627,32 +1414,6 @@
       "count": 1
     }
   },
-  "web/app/components/base/message-log-modal/index.tsx": {
-    "react/set-state-in-effect": {
-      "count": 1
-    },
-    "ts/no-explicit-any": {
-      "count": 1
-    }
-  },
-  "web/app/components/base/modal-like-wrap/index.stories.tsx": {
-    "no-console": {
-      "count": 3
-    }
-  },
-  "web/app/components/base/modal/index.stories.tsx": {
-    "react/set-state-in-effect": {
-      "count": 1
-    }
-  },
-  "web/app/components/base/modal/modal.stories.tsx": {
-    "no-console": {
-      "count": 4
-    },
-    "react/set-state-in-effect": {
-      "count": 1
-    }
-  },
   "web/app/components/base/new-audio-button/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
@@ -1696,7 +1457,12 @@
   },
   "web/app/components/base/prompt-editor/index.tsx": {
     "ts/no-explicit-any": {
-      "count": 4
+      "count": 3
+    }
+  },
+  "web/app/components/base/prompt-editor/plugins/component-picker-block/index.tsx": {
+    "no-restricted-imports": {
+      "count": 1
     }
   },
   "web/app/components/base/prompt-editor/plugins/component-picker-block/menu.tsx": {
@@ -1784,8 +1550,8 @@
     }
   },
   "web/app/components/base/prompt-editor/plugins/shortcuts-popup-plugin/index.tsx": {
-    "ts/no-explicit-any": {
-      "count": 2
+    "no-restricted-imports": {
+      "count": 1
     }
   },
   "web/app/components/base/prompt-editor/plugins/update-block.tsx": {
@@ -1877,26 +1643,6 @@
       "count": 1
     }
   },
-  "web/app/components/base/tag-management/__tests__/panel.spec.tsx": {
-    "ts/no-explicit-any": {
-      "count": 2
-    }
-  },
-  "web/app/components/base/tag-management/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/base/tag-management/tag-item-editor.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/base/tag-management/tag-remove-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/base/text-generation/hooks.ts": {
     "ts/no-explicit-any": {
       "count": 1
@@ -1915,11 +1661,6 @@
       "count": 1
     }
   },
-  "web/app/components/base/video-gallery/VideoPlayer.tsx": {
-    "react/set-state-in-effect": {
-      "count": 1
-    }
-  },
   "web/app/components/base/voice-input/__tests__/index.spec.tsx": {
     "ts/no-explicit-any": {
       "count": 3
@@ -1941,15 +1682,9 @@
   "web/app/components/base/with-input-validation/index.stories.tsx": {
     "no-console": {
       "count": 1
-    },
-    "react/component-hook-factories": {
-      "count": 1
     }
   },
   "web/app/components/base/with-input-validation/index.tsx": {
-    "react/component-hook-factories": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -1959,11 +1694,6 @@
       "count": 4
     }
   },
-  "web/app/components/billing/annotation-full/modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/billing/billing-page/__tests__/index.spec.tsx": {
     "ts/no-explicit-any": {
       "count": 4
@@ -1974,11 +1704,6 @@
       "count": 4
     }
   },
-  "web/app/components/billing/plan/index.tsx": {
-    "ts/no-explicit-any": {
-      "count": 2
-    }
-  },
   "web/app/components/billing/pricing/assets/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 12
@@ -1992,6 +1717,11 @@
       "count": 1
     }
   },
+  "web/app/components/billing/pricing/plans/self-hosted-plan-item/button.tsx": {
+    "react/static-components": {
+      "count": 2
+    }
+  },
   "web/app/components/billing/pricing/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
@@ -2002,9 +1732,9 @@
       "count": 4
     }
   },
-  "web/app/components/billing/upgrade-btn/index.tsx": {
-    "ts/no-explicit-any": {
-      "count": 3
+  "web/app/components/datasets/common/document-status-with-action/status-with-action.tsx": {
+    "react/static-components": {
+      "count": 2
     }
   },
   "web/app/components/datasets/common/image-previewer/index.tsx": {
@@ -2032,11 +1762,6 @@
       "count": 1
     }
   },
-  "web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/dsl-confirm-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/hooks/use-dsl-import.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
@@ -2045,9 +1770,6 @@
   "web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 1
-    },
-    "no-restricted-imports": {
-      "count": 1
     }
   },
   "web/app/components/datasets/create-from-pipeline/list/template-card/details/types.ts": {
@@ -2055,16 +1777,6 @@
       "count": 1
     }
   },
-  "web/app/components/datasets/create-from-pipeline/list/template-card/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/datasets/create/empty-dataset-creation-modal/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/datasets/create/file-preview/index.tsx": {
     "react/set-state-in-effect": {
       "count": 1
@@ -2119,11 +1831,6 @@
       "count": 1
     }
   },
-  "web/app/components/datasets/create/stop-embedding-modal/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/datasets/create/website/firecrawl/index.tsx": {
     "no-console": {
       "count": 1
@@ -2182,36 +1889,16 @@
       "count": 4
     }
   },
-  "web/app/components/datasets/documents/components/operations.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/datasets/documents/components/rename-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/__tests__/index.spec.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "web/app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/datasets/documents/create-from-pipeline/data-source/online-documents/index.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/list/item.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/index.tsx": {
     "react/set-state-in-effect": {
       "count": 5
@@ -2233,6 +1920,9 @@
     }
   },
   "web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/options/index.tsx": {
+    "react/static-components": {
+      "count": 2
+    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -2248,6 +1938,9 @@
     }
   },
   "web/app/components/datasets/documents/create-from-pipeline/process-documents/form.tsx": {
+    "react/static-components": {
+      "count": 2
+    },
     "ts/no-explicit-any": {
       "count": 3
     }
@@ -2257,11 +1950,6 @@
       "count": 2
     }
   },
-  "web/app/components/datasets/documents/create-from-pipeline/processing/embedding-process/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/datasets/documents/create-from-pipeline/steps/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 3
@@ -2272,12 +1960,9 @@
       "count": 1
     }
   },
-  "web/app/components/datasets/documents/detail/batch-modal/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "react/set-state-in-effect": {
-      "count": 1
+  "web/app/components/datasets/documents/detail/batch-modal/csv-downloader.tsx": {
+    "react/static-components": {
+      "count": 2
     }
   },
   "web/app/components/datasets/documents/detail/completed/common/chunk-content.tsx": {
@@ -2285,26 +1970,11 @@
       "count": 1
     }
   },
-  "web/app/components/datasets/documents/detail/completed/common/regeneration-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/datasets/documents/detail/completed/components/index.ts": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 3
-    }
-  },
   "web/app/components/datasets/documents/detail/completed/components/segment-list-content.tsx": {
     "ts/no-non-null-asserted-optional-chain": {
       "count": 1
     }
   },
-  "web/app/components/datasets/documents/detail/completed/display-toggle.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/datasets/documents/detail/completed/hooks/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 5
@@ -2321,9 +1991,9 @@
       "count": 1
     }
   },
-  "web/app/components/datasets/documents/detail/completed/segment-card/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
+  "web/app/components/datasets/documents/detail/completed/segment-list.tsx": {
+    "react/static-components": {
+      "count": 2
     }
   },
   "web/app/components/datasets/documents/detail/context.ts": {
@@ -2359,14 +2029,6 @@
       "count": 1
     }
   },
-  "web/app/components/datasets/documents/detail/segment-add/index.tsx": {
-    "erasable-syntax-only/enums": {
-      "count": 1
-    },
-    "react-refresh/only-export-components": {
-      "count": 1
-    }
-  },
   "web/app/components/datasets/documents/detail/settings/pipeline-settings/index.tsx": {
     "ts/no-explicit-any": {
       "count": 6
@@ -2387,21 +2049,21 @@
       "count": 1
     }
   },
+  "web/app/components/datasets/formatted-text/flavours/edit-slice.tsx": {
+    "no-restricted-imports": {
+      "count": 2
+    }
+  },
+  "web/app/components/datasets/formatted-text/flavours/preview-slice.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
   "web/app/components/datasets/formatted-text/flavours/type.ts": {
     "ts/no-empty-object-type": {
       "count": 1
     }
   },
-  "web/app/components/datasets/hit-testing/components/chunk-detail-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/datasets/hit-testing/components/result-item-external.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/datasets/hit-testing/components/score.tsx": {
     "unicorn/prefer-number-properties": {
       "count": 1
@@ -2412,21 +2074,11 @@
       "count": 1
     }
   },
-  "web/app/components/datasets/list/dataset-card/hooks/use-dataset-card-state.ts": {
-    "react/set-state-in-effect": {
-      "count": 1
-    }
-  },
   "web/app/components/datasets/metadata/edit-metadata-batch/input-combined.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "web/app/components/datasets/metadata/edit-metadata-batch/modal.tsx": {
-    "no-restricted-imports": {
-      "count": 2
-    }
-  },
   "web/app/components/datasets/metadata/hooks/use-edit-dataset-metadata.ts": {
     "react/set-state-in-effect": {
       "count": 1
@@ -2440,52 +2092,24 @@
       "count": 2
     }
   },
-  "web/app/components/datasets/metadata/metadata-dataset/create-content.tsx": {
-    "ts/no-explicit-any": {
-      "count": 1
-    }
-  },
-  "web/app/components/datasets/metadata/metadata-dataset/create-metadata-modal.tsx": {
-    "ts/no-explicit-any": {
-      "count": 1
-    }
-  },
-  "web/app/components/datasets/metadata/metadata-dataset/dataset-metadata-drawer.tsx": {
-    "no-restricted-imports": {
-      "count": 2
-    }
-  },
-  "web/app/components/datasets/metadata/metadata-dataset/select-metadata-modal.tsx": {
-    "erasable-syntax-only/enums": {
-      "count": 1
-    }
-  },
   "web/app/components/datasets/metadata/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 2
     }
   },
-  "web/app/components/datasets/rename-modal/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/datasets/settings/chunk-structure/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "web/app/components/datasets/settings/index-method/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
+  "web/app/components/develop/code.tsx": {
+    "ts/no-explicit-any": {
+      "count": 7
     }
   },
-  "web/app/components/develop/code.tsx": {
-    "ts/no-empty-object-type": {
-      "count": 1
-    },
-    "ts/no-explicit-any": {
-      "count": 9
+  "web/app/components/develop/doc.tsx": {
+    "react/static-components": {
+      "count": 2
     }
   },
   "web/app/components/develop/md.tsx": {
@@ -2496,22 +2120,12 @@
       "count": 2
     }
   },
-  "web/app/components/develop/secret-key/secret-key-generate.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/develop/secret-key/secret-key-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/explore/banner/banner-item.tsx": {
     "react-hooks-extra/no-direct-set-state-in-use-effect": {
       "count": 1
     },
     "react/set-state-in-effect": {
-      "count": 3
+      "count": 1
     }
   },
   "web/app/components/explore/banner/indicator-button.tsx": {
@@ -2522,27 +2136,11 @@
       "count": 2
     }
   },
-  "web/app/components/explore/create-app-modal/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "ts/no-explicit-any": {
-      "count": 1
-    },
-    "unicorn/prefer-number-properties": {
-      "count": 1
-    }
-  },
   "web/app/components/explore/item-operation/index.tsx": {
     "react/set-state-in-effect": {
       "count": 1
     }
   },
-  "web/app/components/explore/try-app/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/explore/try-app/tab.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
@@ -2622,16 +2220,6 @@
       "count": 1
     }
   },
-  "web/app/components/header/account-about/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/header/account-setting/api-based-extension-page/modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/header/account-setting/data-source-page-new/card.tsx": {
     "ts/no-explicit-any": {
       "count": 2
@@ -2667,20 +2255,12 @@
       "count": 1
     }
   },
-  "web/app/components/header/account-setting/members-page/invite-modal/index.tsx": {
-    "react/set-state-in-effect": {
-      "count": 3
-    }
-  },
   "web/app/components/header/account-setting/members-page/transfer-ownership-modal/index.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     },
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
-      "count": 3
+      "count": 2
     }
   },
   "web/app/components/header/account-setting/model-provider-page/declarations.ts": {
@@ -2704,12 +2284,7 @@
       "count": 4
     }
   },
-  "web/app/components/header/account-setting/model-provider-page/model-auth/config-provider.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/header/account-setting/model-provider-page/model-auth/credential-selector.tsx": {
+  "web/app/components/header/account-setting/model-provider-page/model-auth/authorized/index.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
@@ -2740,21 +2315,10 @@
     }
   },
   "web/app/components/header/account-setting/model-provider-page/model-auth/switch-credential-in-load-balancing.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 3
     }
   },
-  "web/app/components/header/account-setting/model-provider-page/model-modal/Form.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "ts/no-explicit-any": {
-      "count": 6
-    }
-  },
   "web/app/components/header/account-setting/model-provider-page/model-modal/Input.tsx": {
     "unicorn/prefer-number-properties": {
       "count": 2
@@ -2776,16 +2340,13 @@
     }
   },
   "web/app/components/header/account-setting/model-provider-page/model-parameter-modal/status-indicators.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 2
     }
   },
   "web/app/components/header/account-setting/model-provider-page/provider-added-card/cooldown-timer.tsx": {
     "react/set-state-in-effect": {
-      "count": 2
+      "count": 1
     }
   },
   "web/app/components/header/account-setting/model-provider-page/provider-added-card/model-auth-dropdown/__tests__/use-activate-credential.spec.tsx": {
@@ -2793,20 +2354,12 @@
       "count": 2
     }
   },
-  "web/app/components/header/account-setting/model-provider-page/provider-added-card/model-list-item.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/header/account-setting/model-provider-page/provider-added-card/model-load-balancing-configs.tsx": {
     "ts/no-explicit-any": {
       "count": 5
     }
   },
   "web/app/components/header/account-setting/model-provider-page/provider-added-card/model-load-balancing-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react/set-state-in-effect": {
       "count": 1
     },
@@ -2824,14 +2377,6 @@
       "count": 4
     }
   },
-  "web/app/components/header/app-nav/index.tsx": {
-    "react/set-state-in-effect": {
-      "count": 2
-    },
-    "ts/no-explicit-any": {
-      "count": 1
-    }
-  },
   "web/app/components/header/header-wrapper.tsx": {
     "ts/no-explicit-any": {
       "count": 1
@@ -2856,9 +2401,6 @@
     "erasable-syntax-only/enums": {
       "count": 1
     },
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react-refresh/only-export-components": {
       "count": 1
     }
@@ -2874,30 +2416,12 @@
     }
   },
   "web/app/components/plugins/install-plugin/install-from-github/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "ts/no-explicit-any": {
-      "count": 3
-    }
-  },
-  "web/app/components/plugins/install-plugin/install-from-github/steps/selectPackage.tsx": {
-    "ts/no-explicit-any": {
-      "count": 1
-    }
-  },
-  "web/app/components/plugins/install-plugin/install-from-local-package/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/plugins/install-plugin/install-from-local-package/steps/uploading.tsx": {
     "ts/no-explicit-any": {
       "count": 2
     }
   },
-  "web/app/components/plugins/install-plugin/install-from-marketplace/index.tsx": {
-    "no-restricted-imports": {
+  "web/app/components/plugins/install-plugin/install-from-github/steps/selectPackage.tsx": {
+    "ts/no-explicit-any": {
       "count": 1
     }
   },
@@ -2911,6 +2435,11 @@
       "count": 1
     }
   },
+  "web/app/components/plugins/plugin-auth/authorized/index.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
   "web/app/components/plugins/plugin-auth/authorized/item.tsx": {
     "ts/no-explicit-any": {
       "count": 1
@@ -3005,11 +2534,6 @@
       "count": 1
     }
   },
-  "web/app/components/plugins/plugin-detail-panel/multiple-tool-selector/index.tsx": {
-    "ts/no-explicit-any": {
-      "count": 1
-    }
-  },
   "web/app/components/plugins/plugin-detail-panel/strategy-detail.tsx": {
     "ts/no-explicit-any": {
       "count": 2
@@ -3025,44 +2549,11 @@
       "count": 1
     }
   },
-  "web/app/components/plugins/plugin-detail-panel/subscription-list/create/hooks/use-oauth-client-state.ts": {
-    "erasable-syntax-only/enums": {
-      "count": 2
-    }
-  },
-  "web/app/components/plugins/plugin-detail-panel/subscription-list/create/index.tsx": {
-    "no-barrel-files/no-barrel-files": {
-      "count": 3
-    }
-  },
-  "web/app/components/plugins/plugin-detail-panel/subscription-list/create/oauth-client.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/plugins/plugin-detail-panel/subscription-list/create/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "web/app/components/plugins/plugin-detail-panel/subscription-list/edit/apikey-edit-modal.tsx": {
-    "erasable-syntax-only/enums": {
-      "count": 1
-    },
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/plugins/plugin-detail-panel/subscription-list/edit/manual-edit-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/plugins/plugin-detail-panel/subscription-list/edit/oauth-edit-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/plugins/plugin-detail-panel/subscription-list/index.tsx": {
     "no-barrel-files/no-barrel-files": {
       "count": 2
@@ -3076,11 +2567,6 @@
       "count": 2
     }
   },
-  "web/app/components/plugins/plugin-detail-panel/subscription-list/subscription-card.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/plugins/plugin-detail-panel/subscription-list/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
@@ -3091,12 +2577,7 @@
       "count": 7
     }
   },
-  "web/app/components/plugins/plugin-detail-panel/tool-selector/components/schema-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/plugins/plugin-detail-panel/tool-selector/components/tool-item.tsx": {
+  "web/app/components/plugins/plugin-detail-panel/tool-selector/components/tool-base-form.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
@@ -3106,29 +2587,21 @@
       "count": 2
     }
   },
+  "web/app/components/plugins/plugin-detail-panel/tool-selector/index.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
   "web/app/components/plugins/plugin-detail-panel/trigger/event-detail-drawer.tsx": {
     "ts/no-explicit-any": {
       "count": 5
     }
   },
-  "web/app/components/plugins/plugin-item/action.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/plugins/plugin-item/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "web/app/components/plugins/plugin-mutation-model/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/plugins/plugin-page/context.ts": {
     "ts/no-explicit-any": {
       "count": 1
@@ -3144,31 +2617,11 @@
       "count": 2
     }
   },
-  "web/app/components/plugins/plugin-page/plugin-info.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/plugins/readme-panel/index.tsx": {
-    "react/unsupported-syntax": {
-      "count": 1
-    }
-  },
-  "web/app/components/plugins/readme-panel/store.ts": {
-    "erasable-syntax-only/enums": {
-      "count": 1
-    }
-  },
   "web/app/components/plugins/reference-setting-modal/auto-update-setting/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 2
     }
   },
-  "web/app/components/plugins/reference-setting-modal/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/plugins/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 7
@@ -3182,9 +2635,19 @@
       "count": 1
     }
   },
+  "web/app/components/rag-pipeline/components/panel/input-field/editor/form/__tests__/hidden-fields.spec.tsx": {
+    "react/static-components": {
+      "count": 4
+    }
+  },
+  "web/app/components/rag-pipeline/components/panel/input-field/editor/form/__tests__/show-all-settings.spec.tsx": {
+    "react/static-components": {
+      "count": 4
+    }
+  },
   "web/app/components/rag-pipeline/components/panel/input-field/editor/form/hidden-fields.tsx": {
-    "react/component-hook-factories": {
-      "count": 1
+    "react/static-components": {
+      "count": 2
     },
     "ts/no-explicit-any": {
       "count": 1
@@ -3195,18 +2658,20 @@
       "count": 2
     }
   },
+  "web/app/components/rag-pipeline/components/panel/input-field/editor/form/index.tsx": {
+    "react/static-components": {
+      "count": 6
+    }
+  },
   "web/app/components/rag-pipeline/components/panel/input-field/editor/form/initial-fields.tsx": {
-    "react/component-hook-factories": {
-      "count": 1
+    "react/static-components": {
+      "count": 2
     },
     "ts/no-explicit-any": {
       "count": 2
     }
   },
   "web/app/components/rag-pipeline/components/panel/input-field/editor/form/show-all-settings.tsx": {
-    "react/component-hook-factories": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -3221,9 +2686,9 @@
       "count": 1
     }
   },
-  "web/app/components/rag-pipeline/components/panel/input-field/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
+  "web/app/components/rag-pipeline/components/panel/input-field/preview/form.tsx": {
+    "react/static-components": {
+      "count": 2
     }
   },
   "web/app/components/rag-pipeline/components/panel/test-run/preparation/document-processing/index.tsx": {
@@ -3232,6 +2697,9 @@
     }
   },
   "web/app/components/rag-pipeline/components/panel/test-run/preparation/document-processing/options.tsx": {
+    "react/static-components": {
+      "count": 2
+    },
     "ts/no-explicit-any": {
       "count": 2
     }
@@ -3256,11 +2724,6 @@
       "count": 4
     }
   },
-  "web/app/components/rag-pipeline/components/publish-as-knowledge-pipeline-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/rag-pipeline/components/rag-pipeline-children.tsx": {
     "ts/no-explicit-any": {
       "count": 1
@@ -3276,16 +2739,6 @@
       "count": 2
     }
   },
-  "web/app/components/rag-pipeline/components/update-dsl-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/rag-pipeline/components/version-mismatch-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/rag-pipeline/hooks/index.ts": {
     "no-barrel-files/no-barrel-files": {
       "count": 9
@@ -3341,11 +2794,6 @@
       "count": 1
     }
   },
-  "web/app/components/share/text-generation/info-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/share/text-generation/menu-dropdown.tsx": {
     "react/set-state-in-effect": {
       "count": 1
@@ -3361,11 +2809,24 @@
       "count": 1
     }
   },
+  "web/app/components/share/text-generation/run-batch/csv-download/index.tsx": {
+    "react/static-components": {
+      "count": 2
+    }
+  },
   "web/app/components/share/text-generation/run-batch/csv-reader/index.tsx": {
+    "react/static-components": {
+      "count": 2
+    },
     "ts/no-explicit-any": {
       "count": 2
     }
   },
+  "web/app/components/share/text-generation/run-batch/res-download/index.tsx": {
+    "react/static-components": {
+      "count": 2
+    }
+  },
   "web/app/components/share/text-generation/run-once/index.tsx": {
     "react/set-state-in-effect": {
       "count": 1
@@ -3384,16 +2845,6 @@
       "count": 2
     }
   },
-  "web/app/components/tools/edit-custom-collection-modal/config-credentials.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/tools/edit-custom-collection-modal/get-schema.tsx": {
-    "ts/no-explicit-any": {
-      "count": 1
-    }
-  },
   "web/app/components/tools/edit-custom-collection-modal/index.tsx": {
     "react/set-state-in-effect": {
       "count": 4
@@ -3412,24 +2863,11 @@
       "count": 1
     }
   },
-  "web/app/components/tools/mcp/mcp-server-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
-    "ts/no-explicit-any": {
-      "count": 5
-    }
-  },
   "web/app/components/tools/mcp/mcp-server-param-item.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "web/app/components/tools/mcp/modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/tools/mcp/provider-card.tsx": {
     "ts/no-explicit-any": {
       "count": 3
@@ -3458,6 +2896,11 @@
       "count": 4
     }
   },
+  "web/app/components/workflow-app/components/__tests__/workflow-children.spec.tsx": {
+    "react/static-components": {
+      "count": 2
+    }
+  },
   "web/app/components/workflow-app/components/workflow-children.tsx": {
     "ts/no-explicit-any": {
       "count": 3
@@ -3488,11 +2931,6 @@
       "count": 2
     }
   },
-  "web/app/components/workflow-app/hooks/use-workflow-run.ts": {
-    "ts/no-explicit-any": {
-      "count": 5
-    }
-  },
   "web/app/components/workflow-app/hooks/use-workflow-template.ts": {
     "ts/no-explicit-any": {
       "count": 2
@@ -3513,22 +2951,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/block-selector/featured-tools.tsx": {
-    "react/set-state-in-effect": {
-      "count": 2
-    },
-    "ts/no-explicit-any": {
-      "count": 2
-    }
-  },
-  "web/app/components/workflow/block-selector/featured-triggers.tsx": {
-    "react/set-state-in-effect": {
-      "count": 2
-    },
-    "ts/no-explicit-any": {
-      "count": 2
-    }
-  },
   "web/app/components/workflow/block-selector/hooks.ts": {
     "react/set-state-in-effect": {
       "count": 1
@@ -3539,6 +2961,11 @@
       "count": 1
     }
   },
+  "web/app/components/workflow/block-selector/main.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    }
+  },
   "web/app/components/workflow/block-selector/market-place-plugin/action.tsx": {
     "react/set-state-in-effect": {
       "count": 1
@@ -3554,34 +2981,11 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/block-selector/tabs.tsx": {
+  "web/app/components/workflow/block-selector/tool-picker.tsx": {
     "no-restricted-imports": {
       "count": 1
     }
   },
-  "web/app/components/workflow/block-selector/tool/tool-list-flat-view/list.tsx": {
-    "ts/no-explicit-any": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/block-selector/tool/tool.tsx": {
-    "react/set-state-in-effect": {
-      "count": 2
-    }
-  },
-  "web/app/components/workflow/block-selector/trigger-plugin/action-item.tsx": {
-    "ts/no-explicit-any": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/block-selector/trigger-plugin/item.tsx": {
-    "react/set-state-in-effect": {
-      "count": 2
-    },
-    "ts/no-explicit-any": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/block-selector/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 4
@@ -3620,9 +3024,9 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/dsl-export-confirm-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
+  "web/app/components/workflow/header/__tests__/index.spec.tsx": {
+    "react/static-components": {
+      "count": 2
     }
   },
   "web/app/components/workflow/header/run-mode.tsx": {
@@ -3663,7 +3067,7 @@
   },
   "web/app/components/workflow/hooks/index.ts": {
     "no-barrel-files/no-barrel-files": {
-      "count": 26
+      "count": 25
     }
   },
   "web/app/components/workflow/hooks/use-checklist.ts": {
@@ -3771,9 +3175,6 @@
     }
   },
   "web/app/components/workflow/nodes/_base/components/editor/code-editor/editor-support-vars.tsx": {
-    "react/set-state-in-effect": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 6
     }
@@ -3799,11 +3200,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/_base/components/error-handle/error-handle-type-selector.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/_base/components/error-handle/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
@@ -3818,6 +3214,9 @@
     }
   },
   "web/app/components/workflow/nodes/_base/components/input-var-type-icon.tsx": {
+    "react/static-components": {
+      "count": 2
+    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -3835,11 +3234,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/_base/components/mcp-tool-not-support-tooltip.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/_base/components/memory-config.tsx": {
     "unicorn/prefer-number-properties": {
       "count": 1
@@ -3875,11 +3269,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/_base/components/switch-plugin-version.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/_base/components/variable/match-schema-type.ts": {
     "ts/no-explicit-any": {
       "count": 8
@@ -3900,14 +3289,17 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/_base/components/variable/var-type-picker.tsx": {
-    "no-restricted-imports": {
-      "count": 1
+  "web/app/components/workflow/nodes/_base/components/variable/variable-label/base/variable-icon.tsx": {
+    "react/static-components": {
+      "count": 2
     }
   },
   "web/app/components/workflow/nodes/_base/components/variable/variable-label/hooks.ts": {
     "react/no-unnecessary-use-prefix": {
       "count": 2
+    },
+    "react/use-memo": {
+      "count": 2
     }
   },
   "web/app/components/workflow/nodes/_base/components/variable/variable-label/index.tsx": {
@@ -3917,7 +3309,7 @@
   },
   "web/app/components/workflow/nodes/_base/components/workflow-panel/index.tsx": {
     "react/set-state-in-effect": {
-      "count": 3
+      "count": 2
     },
     "ts/no-explicit-any": {
       "count": 6
@@ -3995,6 +3387,9 @@
     }
   },
   "web/app/components/workflow/nodes/agent/node.tsx": {
+    "react/jsx-no-key-after-spread": {
+      "count": 2
+    },
     "ts/no-explicit-any": {
       "count": 2
     }
@@ -4147,16 +3542,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/http/components/authorization/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/nodes/http/components/curl-panel.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/http/components/key-value/key-value-edit/index.tsx": {
     "ts/no-explicit-any": {
       "count": 2
@@ -4196,9 +3581,6 @@
     }
   },
   "web/app/components/workflow/nodes/human-input/components/form-content.tsx": {
-    "react/component-hook-factories": {
-      "count": 1
-    },
     "react/no-nested-component-definitions": {
       "count": 1
     },
@@ -4224,16 +3606,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/if-else/components/condition-list/condition-operator.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/nodes/if-else/components/condition-number-input.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/if-else/default.ts": {
     "ts/no-explicit-any": {
       "count": 1
@@ -4249,9 +3621,9 @@
       "count": 5
     }
   },
-  "web/app/components/workflow/nodes/iteration-start/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
+  "web/app/components/workflow/nodes/index.tsx": {
+    "react/static-components": {
+      "count": 4
     }
   },
   "web/app/components/workflow/nodes/iteration/default.ts": {
@@ -4269,21 +3641,11 @@
       "count": 6
     }
   },
-  "web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/selector.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/hooks.tsx": {
     "ts/no-explicit-any": {
       "count": 4
     }
   },
-  "web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/search-method-option.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/type.ts": {
     "ts/no-explicit-any": {
       "count": 2
@@ -4312,26 +3674,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-operator.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-value-method.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/metadata-filter-selector.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/knowledge-retrieval/default.ts": {
     "ts/no-explicit-any": {
       "count": 1
@@ -4378,11 +3720,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/llm/components/json-schema-config-modal/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-importer.tsx": {
     "ts/no-explicit-any": {
       "count": 3
@@ -4408,16 +3745,6 @@
       "count": 2
     }
   },
-  "web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/auto-width-input.tsx": {
-    "react/set-state-in-effect": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/type-selector.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/hooks.ts": {
     "ts/no-explicit-any": {
       "count": 1
@@ -4459,26 +3786,11 @@
       "count": 7
     }
   },
-  "web/app/components/workflow/nodes/loop-start/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/loop/components/condition-list/condition-input.tsx": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/loop/components/condition-list/condition-operator.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/nodes/loop/components/condition-number-input.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/loop/components/loop-variables/form-item.tsx": {
     "ts/no-explicit-any": {
       "count": 3
@@ -4523,9 +3835,6 @@
     }
   },
   "web/app/components/workflow/nodes/parameter-extractor/components/extract-parameter/update.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -4535,11 +3844,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/parameter-extractor/panel.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/parameter-extractor/types.ts": {
     "erasable-syntax-only/enums": {
       "count": 2
@@ -4558,42 +3862,6 @@
       "count": 9
     }
   },
-  "web/app/components/workflow/nodes/question-classifier/components/advanced-setting.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/nodes/question-classifier/components/class-item.tsx": {
-    "react/set-state-in-effect": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/nodes/question-classifier/components/class-list.tsx": {
-    "react/set-state-in-effect": {
-      "count": 1
-    },
-    "react/unsupported-syntax": {
-      "count": 2
-    }
-  },
-  "web/app/components/workflow/nodes/question-classifier/default.ts": {
-    "ts/no-explicit-any": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/nodes/question-classifier/node.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/nodes/question-classifier/use-config.ts": {
-    "react/set-state-in-effect": {
-      "count": 2
-    },
-    "ts/no-explicit-any": {
-      "count": 2
-    }
-  },
   "web/app/components/workflow/nodes/question-classifier/use-single-run-form-params.ts": {
     "ts/no-explicit-any": {
       "count": 8
@@ -4650,9 +3918,6 @@
     }
   },
   "web/app/components/workflow/nodes/tool/components/tool-form/item.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -4696,9 +3961,6 @@
     }
   },
   "web/app/components/workflow/nodes/trigger-plugin/components/trigger-form/item.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -4754,11 +4016,6 @@
       "count": 1
     }
   },
-  "web/app/components/workflow/nodes/trigger-webhook/panel.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/nodes/utils.ts": {
     "ts/no-explicit-any": {
       "count": 1
@@ -4785,6 +4042,9 @@
     }
   },
   "web/app/components/workflow/note-node/note-editor/plugins/link-editor-plugin/component.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    },
     "react/set-state-in-effect": {
       "count": 1
     }
@@ -4795,6 +4055,9 @@
     }
   },
   "web/app/components/workflow/operator/add-block.tsx": {
+    "no-restricted-imports": {
+      "count": 1
+    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -4809,6 +4072,11 @@
       "count": 1
     }
   },
+  "web/app/components/workflow/panel/__tests__/index.spec.tsx": {
+    "react/static-components": {
+      "count": 2
+    }
+  },
   "web/app/components/workflow/panel/chat-record/index.tsx": {
     "ts/no-explicit-any": {
       "count": 8
@@ -4856,9 +4124,6 @@
     }
   },
   "web/app/components/workflow/panel/debug-and-preview/conversation-variable-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 2
     }
@@ -4869,9 +4134,6 @@
     }
   },
   "web/app/components/workflow/panel/env-panel/variable-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "react/set-state-in-effect": {
       "count": 4
     },
@@ -4889,16 +4151,6 @@
       "count": 4
     }
   },
-  "web/app/components/workflow/panel/version-history-panel/delete-confirm-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/panel/version-history-panel/restore-confirm-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/panel/workflow-preview.tsx": {
     "ts/no-explicit-any": {
       "count": 2
@@ -4916,7 +4168,7 @@
   },
   "web/app/components/workflow/run/index.tsx": {
     "react/set-state-in-effect": {
-      "count": 2
+      "count": 1
     }
   },
   "web/app/components/workflow/run/iteration-log/index.tsx": {
@@ -5034,9 +4286,6 @@
     }
   },
   "web/app/components/workflow/update-dsl-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 1
     }
@@ -5102,9 +4351,6 @@
     }
   },
   "web/app/components/workflow/variable-inspect/listening.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 2
     }
@@ -5143,46 +4389,21 @@
       "count": 5
     }
   },
-  "web/app/components/workflow/workflow-preview/components/nodes/base.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/workflow-preview/components/nodes/constants.ts": {
     "ts/no-explicit-any": {
       "count": 1
     }
   },
-  "web/app/components/workflow/workflow-preview/components/nodes/iteration-start/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
-  "web/app/components/workflow/workflow-preview/components/nodes/loop-start/index.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/components/workflow/workflow-preview/components/zoom-in-out.tsx": {
     "erasable-syntax-only/enums": {
       "count": 1
     }
   },
-  "web/app/education-apply/expire-notice-modal.tsx": {
-    "no-restricted-imports": {
-      "count": 1
-    }
-  },
   "web/app/education-apply/hooks.ts": {
     "react/set-state-in-effect": {
       "count": 5
     }
   },
-  "web/app/education-apply/verify-state-modal.tsx": {
-    "react/set-state-in-effect": {
-      "count": 1
-    }
-  },
   "web/app/forgot-password/ForgotPasswordForm.spec.tsx": {
     "ts/no-explicit-any": {
       "count": 5
@@ -5218,11 +4439,6 @@
       "count": 1
     }
   },
-  "web/app/signin/one-more-step.tsx": {
-    "ts/no-explicit-any": {
-      "count": 1
-    }
-  },
   "web/app/signup/layout.tsx": {
     "ts/no-explicit-any": {
       "count": 1
@@ -5272,9 +4488,6 @@
     }
   },
   "web/hooks/use-mitt.ts": {
-    "react/component-hook-factories": {
-      "count": 1
-    },
     "ts/no-explicit-any": {
       "count": 2
     }
@@ -5404,11 +4617,6 @@
       "count": 1
     }
   },
-  "web/plugins/dev-proxy/server.spec.ts": {
-    "ts/no-explicit-any": {
-      "count": 1
-    }
-  },
   "web/scripts/component-analyzer.js": {
     "regexp/no-unused-capturing-group": {
       "count": 6
@@ -5462,11 +4670,6 @@
       "count": 2
     }
   },
-  "web/service/knowledge/use-dataset.ts": {
-    "@tanstack/query/exhaustive-deps": {
-      "count": 1
-    }
-  },
   "web/service/share.ts": {
     "erasable-syntax-only/enums": {
       "count": 1
@@ -5480,11 +4683,6 @@
       "count": 2
     }
   },
-  "web/service/use-apps.ts": {
-    "ts/no-explicit-any": {
-      "count": 1
-    }
-  },
   "web/service/use-common.ts": {
     "ts/no-empty-object-type": {
       "count": 1
@@ -5522,9 +4720,6 @@
     },
     "ts/no-explicit-any": {
       "count": 3
-    },
-    "ts/no-non-null-asserted-optional-chain": {
-      "count": 1
     }
   },
   "web/service/use-tools.ts": {
@@ -5603,11 +4798,6 @@
       "count": 1
     }
   },
-  "web/utils/context.ts": {
-    "react/component-hook-factories": {
-      "count": 1
-    }
-  },
   "web/utils/error-parser.ts": {
     "no-console": {
       "count": 1
diff --git a/eslint.config.mjs b/eslint.config.mjs
index ae9fdaff01..1380ed67d2 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -4,6 +4,17 @@ import antfu, { GLOB_MARKDOWN } from '@antfu/eslint-config'
 import md from 'eslint-markdown'
 import markdownPreferences from 'eslint-plugin-markdown-preferences'
 
+const GENERATED_IGNORES = [
+  '**/storybook-static/',
+  '**/.next/',
+  'web/next/',
+  'web/next-env.d.ts',
+  '**/dist/',
+  '**/coverage/',
+  'e2e/.auth/',
+  'e2e/cucumber-report/',
+]
+
 export default antfu(
   {
     ignores: original => [
@@ -15,6 +26,7 @@ export default antfu(
       '!package.json',
       '!pnpm-workspace.yaml',
       '!vite.config.ts',
+      ...GENERATED_IGNORES,
       ...original,
     ],
     typescript: {
diff --git a/package.json b/package.json
index a563b574f7..e3fcd40ab1 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "dify",
   "type": "module",
   "private": true,
-  "packageManager": "pnpm@11.0.0",
+  "packageManager": "pnpm@11.1.1",
   "engines": {
     "node": "^22.22.1"
   },
diff --git a/packages/contracts/README.md b/packages/contracts/README.md
new file mode 100644
index 0000000000..e9320c921d
--- /dev/null
+++ b/packages/contracts/README.md
@@ -0,0 +1,40 @@
+# Contracts
+
+## API OpenAPI Readiness
+
+<!-- api-openapi-readiness:start -->
+
+<!-- This section is auto-generated by scripts/generate-api-readiness-readme.mjs. Do not edit between the markers. -->
+
+Snapshot generated from `packages/contracts/generated/api/readiness.json` after running `pnpm -C packages/contracts gen-api-contract-from-openapi`.
+
+Are we OpenAPI ready? **No.** Current generated API contracts are **16.7% ready**.
+
+| Surface   |   Ready | Not ready |   Total |   Ready % |
+| --------- | ------: | --------: | ------: | --------: |
+| console   |      96 |       474 |     570 |     16.8% |
+| service   |      16 |        72 |      88 |     18.2% |
+| web       |       5 |        36 |      41 |     12.2% |
+| **total** | **117** |   **582** | **699** | **16.7%** |
+
+Readiness here means the generated contract operation is not marked with:
+
+> Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+
+Operations marked with that warning should not be migrated to blindly. Prefer fixing backend OpenAPI annotations first so the generated contract has accurate request and response types, then migrate callers endpoint by endpoint.
+
+The current heuristic marks an operation as not ready when a request body or success response that should have a body contains a loose object type, or when an operation has no documented 2xx response. 204, 205, and 304 responses are treated as bodyless when the request type is otherwise accurate.
+
+<!-- api-openapi-readiness:end -->
+
+## How to Improve Readiness
+
+Improve the ready percentage by fixing the backend annotations that produce loose generated types, then regenerating the contracts.
+
+- Add accurate request body schemas for endpoints that currently generate loose object types.
+- Add accurate 2xx response schemas for endpoints that return JSON payloads.
+- Use 204 responses for endpoints that intentionally return no body.
+- Avoid untyped dictionaries, raw objects, or `additionalProperties: true` responses unless the API really returns an arbitrary object.
+- Regenerate with `pnpm -C packages/contracts gen-api-contract` and use this README to verify the updated percentage.
+
+Do not remove the generated warning just to increase the number. The warning should disappear because the backend OpenAPI output became accurate enough for callers to migrate safely.
diff --git a/packages/contracts/generated/api/console/account/orpc.gen.ts b/packages/contracts/generated/api/console/account/orpc.gen.ts
index a926103667..7308733a12 100644
--- a/packages/contracts/generated/api/console/account/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/account/orpc.gen.ts
@@ -45,10 +45,16 @@ import {
 
 /**
  * Get account avatar url
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get = oc
   .route({
-    description: 'Get account avatar url',
+    deprecated: true,
+    description:
+      'Get account avatar url\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAccountAvatar',
@@ -74,8 +80,16 @@ export const avatar = {
   post,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post2 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAccountChangeEmailCheckEmailUnique',
@@ -104,8 +118,16 @@ export const reset = {
   post: post3,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post4 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAccountChangeEmailValidity',
@@ -119,8 +141,16 @@ export const validity = {
   post: post4,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post5 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAccountChangeEmail',
@@ -137,8 +167,16 @@ export const changeEmail = {
   validity,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post6 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAccountDeleteFeedback',
@@ -152,8 +190,16 @@ export const feedback = {
   post: post6,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get2 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAccountDeleteVerify',
@@ -166,8 +212,16 @@ export const verify = {
   get: get2,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post7 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAccountDelete',
@@ -222,8 +276,16 @@ export const get5 = oc
   })
   .output(zGetAccountEducationResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post8 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAccountEducation',
@@ -240,8 +302,16 @@ export const education = {
   verify: verify2,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post9 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAccountInit',
diff --git a/packages/contracts/generated/api/console/account/types.gen.ts b/packages/contracts/generated/api/console/account/types.gen.ts
index 9021d4c8fb..6ccac5f94a 100644
--- a/packages/contracts/generated/api/console/account/types.gen.ts
+++ b/packages/contracts/generated/api/console/account/types.gen.ts
@@ -92,7 +92,7 @@ export type AccountInterfaceLanguagePayload = {
 }
 
 export type AccountInterfaceThemePayload = {
-  interface_theme: 'light' | 'dark'
+  interface_theme: 'dark' | 'light'
 }
 
 export type AccountNamePayload = {
diff --git a/packages/contracts/generated/api/console/account/zod.gen.ts b/packages/contracts/generated/api/console/account/zod.gen.ts
index befa7c27c6..18afef9541 100644
--- a/packages/contracts/generated/api/console/account/zod.gen.ts
+++ b/packages/contracts/generated/api/console/account/zod.gen.ts
@@ -131,7 +131,7 @@ export const zAccountInterfaceLanguagePayload = z.object({
  * AccountInterfaceThemePayload
  */
 export const zAccountInterfaceThemePayload = z.object({
-  interface_theme: z.enum(['light', 'dark']),
+  interface_theme: z.enum(['dark', 'light']),
 })
 
 /**
diff --git a/packages/contracts/generated/api/console/activate/orpc.gen.ts b/packages/contracts/generated/api/console/activate/orpc.gen.ts
index 870f45bd2e..3e74dd841b 100644
--- a/packages/contracts/generated/api/console/activate/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/activate/orpc.gen.ts
@@ -12,10 +12,16 @@ import {
 
 /**
  * Check if activation token is valid
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get = oc
   .route({
-    description: 'Check if activation token is valid',
+    deprecated: true,
+    description:
+      'Check if activation token is valid\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getActivateCheck',
diff --git a/packages/contracts/generated/api/console/admin/orpc.gen.ts b/packages/contracts/generated/api/console/admin/orpc.gen.ts
deleted file mode 100644
index 93f012405a..0000000000
--- a/packages/contracts/generated/api/console/admin/orpc.gen.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-// This file is auto-generated by @hey-api/openapi-ts
-
-import { oc } from '@orpc/contract'
-import * as z from 'zod'
-
-import {
-  zDeleteAdminDeleteExploreBannerByBannerIdPath,
-  zDeleteAdminDeleteExploreBannerByBannerIdResponse,
-  zDeleteAdminInsertExploreAppsByAppIdPath,
-  zDeleteAdminInsertExploreAppsByAppIdResponse,
-  zPostAdminBatchAddNotificationAccountsResponse,
-  zPostAdminInsertExploreAppsBody,
-  zPostAdminInsertExploreAppsResponse,
-  zPostAdminInsertExploreBannerBody,
-  zPostAdminInsertExploreBannerResponse,
-  zPostAdminUpsertNotificationBody,
-  zPostAdminUpsertNotificationResponse,
-} from './zod.gen'
-
-/**
- * Register target accounts for a notification by email address. JSON body: {"notification_id": "...", "user_email": ["a@example.com", ...]}. File upload: multipart/form-data with a 'file' field (CSV or TXT, one email per line) plus a 'notification_id' field. Emails that do not match any account are silently skipped.
- */
-export const post = oc
-  .route({
-    description:
-      'Register target accounts for a notification by email address. JSON body: {"notification_id": "...", "user_email": ["a@example.com", ...]}. File upload: multipart/form-data with a \'file\' field (CSV or TXT, one email per line) plus a \'notification_id\' field. Emails that do not match any account are silently skipped.',
-    inputStructure: 'detailed',
-    method: 'POST',
-    operationId: 'postAdminBatchAddNotificationAccounts',
-    path: '/admin/batch_add_notification_accounts',
-    tags: ['console'],
-  })
-  .output(zPostAdminBatchAddNotificationAccountsResponse)
-
-export const batchAddNotificationAccounts = {
-  post,
-}
-
-/**
- * Delete an explore banner
- */
-export const delete_ = oc
-  .route({
-    description: 'Delete an explore banner',
-    inputStructure: 'detailed',
-    method: 'DELETE',
-    operationId: 'deleteAdminDeleteExploreBannerByBannerId',
-    path: '/admin/delete-explore-banner/{banner_id}',
-    successStatus: 204,
-    tags: ['console'],
-  })
-  .input(z.object({ params: zDeleteAdminDeleteExploreBannerByBannerIdPath }))
-  .output(zDeleteAdminDeleteExploreBannerByBannerIdResponse)
-
-export const byBannerId = {
-  delete: delete_,
-}
-
-export const deleteExploreBanner = {
-  byBannerId,
-}
-
-/**
- * Remove an app from the explore list
- */
-export const delete2 = oc
-  .route({
-    description: 'Remove an app from the explore list',
-    inputStructure: 'detailed',
-    method: 'DELETE',
-    operationId: 'deleteAdminInsertExploreAppsByAppId',
-    path: '/admin/insert-explore-apps/{app_id}',
-    successStatus: 204,
-    tags: ['console'],
-  })
-  .input(z.object({ params: zDeleteAdminInsertExploreAppsByAppIdPath }))
-  .output(zDeleteAdminInsertExploreAppsByAppIdResponse)
-
-export const byAppId = {
-  delete: delete2,
-}
-
-/**
- * Insert or update an app in the explore list
- */
-export const post2 = oc
-  .route({
-    description: 'Insert or update an app in the explore list',
-    inputStructure: 'detailed',
-    method: 'POST',
-    operationId: 'postAdminInsertExploreApps',
-    path: '/admin/insert-explore-apps',
-    tags: ['console'],
-  })
-  .input(z.object({ body: zPostAdminInsertExploreAppsBody }))
-  .output(zPostAdminInsertExploreAppsResponse)
-
-export const insertExploreApps = {
-  post: post2,
-  byAppId,
-}
-
-/**
- * Insert an explore banner
- */
-export const post3 = oc
-  .route({
-    description: 'Insert an explore banner',
-    inputStructure: 'detailed',
-    method: 'POST',
-    operationId: 'postAdminInsertExploreBanner',
-    path: '/admin/insert-explore-banner',
-    successStatus: 201,
-    tags: ['console'],
-  })
-  .input(z.object({ body: zPostAdminInsertExploreBannerBody }))
-  .output(zPostAdminInsertExploreBannerResponse)
-
-export const insertExploreBanner = {
-  post: post3,
-}
-
-/**
- * Create or update an in-product notification. Supply notification_id to update an existing one; omit it to create a new one. Pass at least one language variant in contents (zh / en / jp).
- */
-export const post4 = oc
-  .route({
-    description:
-      'Create or update an in-product notification. Supply notification_id to update an existing one; omit it to create a new one. Pass at least one language variant in contents (zh / en / jp).',
-    inputStructure: 'detailed',
-    method: 'POST',
-    operationId: 'postAdminUpsertNotification',
-    path: '/admin/upsert_notification',
-    tags: ['console'],
-  })
-  .input(z.object({ body: zPostAdminUpsertNotificationBody }))
-  .output(zPostAdminUpsertNotificationResponse)
-
-export const upsertNotification = {
-  post: post4,
-}
-
-export const admin = {
-  batchAddNotificationAccounts,
-  deleteExploreBanner,
-  insertExploreApps,
-  insertExploreBanner,
-  upsertNotification,
-}
-
-export const contract = {
-  admin,
-}
diff --git a/packages/contracts/generated/api/console/admin/types.gen.ts b/packages/contracts/generated/api/console/admin/types.gen.ts
deleted file mode 100644
index d3fef01791..0000000000
--- a/packages/contracts/generated/api/console/admin/types.gen.ts
+++ /dev/null
@@ -1,157 +0,0 @@
-// This file is auto-generated by @hey-api/openapi-ts
-
-export type ClientOptions = {
-  baseUrl: `${string}://${string}/console/api` | (string & {})
-}
-
-export type InsertExploreAppPayload = {
-  app_id: string
-  can_trial?: boolean
-  category: string
-  copyright?: string | null
-  custom_disclaimer?: string | null
-  desc?: string | null
-  language: string
-  position: number
-  privacy_policy?: string | null
-  trial_limit?: number
-}
-
-export type InsertExploreBannerPayload = {
-  'category': string
-  'description': string
-  'img-src': string
-  'language'?: string
-  'link': string
-  'sort': number
-  'title': string
-}
-
-export type UpsertNotificationPayload = {
-  contents: Array<LangContentPayload>
-  end_time?: string | null
-  frequency?: string
-  notification_id?: string | null
-  start_time?: string | null
-  status?: string
-}
-
-export type LangContentPayload = {
-  body: string
-  lang: string
-  subtitle?: string | null
-  title: string
-  title_pic_url?: string | null
-}
-
-export type PostAdminBatchAddNotificationAccountsData = {
-  body?: never
-  path?: never
-  query?: never
-  url: '/admin/batch_add_notification_accounts'
-}
-
-export type PostAdminBatchAddNotificationAccountsResponses = {
-  200: {
-    [key: string]: unknown
-  }
-}
-
-export type PostAdminBatchAddNotificationAccountsResponse
-  = PostAdminBatchAddNotificationAccountsResponses[keyof PostAdminBatchAddNotificationAccountsResponses]
-
-export type DeleteAdminDeleteExploreBannerByBannerIdData = {
-  body?: never
-  path: {
-    banner_id: string
-  }
-  query?: never
-  url: '/admin/delete-explore-banner/{banner_id}'
-}
-
-export type DeleteAdminDeleteExploreBannerByBannerIdResponses = {
-  204: {
-    [key: string]: unknown
-  }
-}
-
-export type DeleteAdminDeleteExploreBannerByBannerIdResponse
-  = DeleteAdminDeleteExploreBannerByBannerIdResponses[keyof DeleteAdminDeleteExploreBannerByBannerIdResponses]
-
-export type PostAdminInsertExploreAppsData = {
-  body: InsertExploreAppPayload
-  path?: never
-  query?: never
-  url: '/admin/insert-explore-apps'
-}
-
-export type PostAdminInsertExploreAppsErrors = {
-  404: {
-    [key: string]: unknown
-  }
-}
-
-export type PostAdminInsertExploreAppsError
-  = PostAdminInsertExploreAppsErrors[keyof PostAdminInsertExploreAppsErrors]
-
-export type PostAdminInsertExploreAppsResponses = {
-  200: {
-    [key: string]: unknown
-  }
-  201: {
-    [key: string]: unknown
-  }
-}
-
-export type PostAdminInsertExploreAppsResponse
-  = PostAdminInsertExploreAppsResponses[keyof PostAdminInsertExploreAppsResponses]
-
-export type DeleteAdminInsertExploreAppsByAppIdData = {
-  body?: never
-  path: {
-    app_id: string
-  }
-  query?: never
-  url: '/admin/insert-explore-apps/{app_id}'
-}
-
-export type DeleteAdminInsertExploreAppsByAppIdResponses = {
-  204: {
-    [key: string]: unknown
-  }
-}
-
-export type DeleteAdminInsertExploreAppsByAppIdResponse
-  = DeleteAdminInsertExploreAppsByAppIdResponses[keyof DeleteAdminInsertExploreAppsByAppIdResponses]
-
-export type PostAdminInsertExploreBannerData = {
-  body: InsertExploreBannerPayload
-  path?: never
-  query?: never
-  url: '/admin/insert-explore-banner'
-}
-
-export type PostAdminInsertExploreBannerResponses = {
-  201: {
-    [key: string]: unknown
-  }
-}
-
-export type PostAdminInsertExploreBannerResponse
-  = PostAdminInsertExploreBannerResponses[keyof PostAdminInsertExploreBannerResponses]
-
-export type PostAdminUpsertNotificationData = {
-  body: UpsertNotificationPayload
-  path?: never
-  query?: never
-  url: '/admin/upsert_notification'
-}
-
-export type PostAdminUpsertNotificationResponses = {
-  200: {
-    [key: string]: unknown
-  }
-}
-
-export type PostAdminUpsertNotificationResponse
-  = PostAdminUpsertNotificationResponses[keyof PostAdminUpsertNotificationResponses]
diff --git a/packages/contracts/generated/api/console/admin/zod.gen.ts b/packages/contracts/generated/api/console/admin/zod.gen.ts
deleted file mode 100644
index 9ebed93e1e..0000000000
--- a/packages/contracts/generated/api/console/admin/zod.gen.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-// This file is auto-generated by @hey-api/openapi-ts
-
-import * as z from 'zod'
-
-/**
- * InsertExploreAppPayload
- */
-export const zInsertExploreAppPayload = z.object({
-  app_id: z.string(),
-  can_trial: z.boolean().optional().default(false),
-  category: z.string(),
-  copyright: z.string().nullish(),
-  custom_disclaimer: z.string().nullish(),
-  desc: z.string().nullish(),
-  language: z.string(),
-  position: z.int(),
-  privacy_policy: z.string().nullish(),
-  trial_limit: z.int().optional().default(0),
-})
-
-/**
- * InsertExploreBannerPayload
- */
-export const zInsertExploreBannerPayload = z.object({
-  'category': z.string(),
-  'description': z.string(),
-  'img-src': z.string(),
-  'language': z.string().optional().default('en-US'),
-  'link': z.string(),
-  'sort': z.int(),
-  'title': z.string(),
-})
-
-/**
- * LangContentPayload
- */
-export const zLangContentPayload = z.object({
-  body: z.string(),
-  lang: z.string(),
-  subtitle: z.string().nullish(),
-  title: z.string(),
-  title_pic_url: z.string().nullish(),
-})
-
-/**
- * UpsertNotificationPayload
- */
-export const zUpsertNotificationPayload = z.object({
-  contents: z.array(zLangContentPayload).min(1),
-  end_time: z.string().nullish(),
-  frequency: z.string().optional().default('once'),
-  notification_id: z.string().nullish(),
-  start_time: z.string().nullish(),
-  status: z.string().optional().default('active'),
-})
-
-/**
- * Accounts added successfully
- */
-export const zPostAdminBatchAddNotificationAccountsResponse = z.record(z.string(), z.unknown())
-
-export const zDeleteAdminDeleteExploreBannerByBannerIdPath = z.object({
-  banner_id: z.string(),
-})
-
-/**
- * Banner deleted successfully
- */
-export const zDeleteAdminDeleteExploreBannerByBannerIdResponse = z.record(z.string(), z.unknown())
-
-export const zPostAdminInsertExploreAppsBody = zInsertExploreAppPayload
-
-export const zPostAdminInsertExploreAppsResponse = z.union([
-  z.record(z.string(), z.unknown()),
-  z.record(z.string(), z.unknown()),
-])
-
-export const zDeleteAdminInsertExploreAppsByAppIdPath = z.object({
-  app_id: z.string(),
-})
-
-/**
- * App removed successfully
- */
-export const zDeleteAdminInsertExploreAppsByAppIdResponse = z.record(z.string(), z.unknown())
-
-export const zPostAdminInsertExploreBannerBody = zInsertExploreBannerPayload
-
-/**
- * Banner inserted successfully
- */
-export const zPostAdminInsertExploreBannerResponse = z.record(z.string(), z.unknown())
-
-export const zPostAdminUpsertNotificationBody = zUpsertNotificationPayload
-
-/**
- * Notification upserted successfully
- */
-export const zPostAdminUpsertNotificationResponse = z.record(z.string(), z.unknown())
diff --git a/packages/contracts/generated/api/console/all-workspaces/orpc.gen.ts b/packages/contracts/generated/api/console/all-workspaces/orpc.gen.ts
index 91ccdbc408..52ee85667e 100644
--- a/packages/contracts/generated/api/console/all-workspaces/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/all-workspaces/orpc.gen.ts
@@ -5,8 +5,16 @@ import * as z from 'zod'
 
 import { zGetAllWorkspacesQuery, zGetAllWorkspacesResponse } from './zod.gen'
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAllWorkspaces',
diff --git a/packages/contracts/generated/api/console/api-based-extension/types.gen.ts b/packages/contracts/generated/api/console/api-based-extension/types.gen.ts
index f7b12f5b3f..1b460d2166 100644
--- a/packages/contracts/generated/api/console/api-based-extension/types.gen.ts
+++ b/packages/contracts/generated/api/console/api-based-extension/types.gen.ts
@@ -59,7 +59,7 @@ export type DeleteApiBasedExtensionByIdData = {
 
 export type DeleteApiBasedExtensionByIdResponses = {
   204: {
-    [key: string]: unknown
+    [key: string]: never
   }
 }
 
diff --git a/packages/contracts/generated/api/console/api-based-extension/zod.gen.ts b/packages/contracts/generated/api/console/api-based-extension/zod.gen.ts
index 43f38a5214..dd7fa0c51d 100644
--- a/packages/contracts/generated/api/console/api-based-extension/zod.gen.ts
+++ b/packages/contracts/generated/api/console/api-based-extension/zod.gen.ts
@@ -43,7 +43,7 @@ export const zDeleteApiBasedExtensionByIdPath = z.object({
 /**
  * Extension deleted successfully
  */
-export const zDeleteApiBasedExtensionByIdResponse = z.record(z.string(), z.unknown())
+export const zDeleteApiBasedExtensionByIdResponse = z.record(z.string(), z.never())
 
 export const zGetApiBasedExtensionByIdPath = z.object({
   id: z.string(),
diff --git a/packages/contracts/generated/api/console/api-key-auth/orpc.gen.ts b/packages/contracts/generated/api/console/api-key-auth/orpc.gen.ts
index a113e39c15..48f5f69624 100644
--- a/packages/contracts/generated/api/console/api-key-auth/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/api-key-auth/orpc.gen.ts
@@ -11,8 +11,16 @@ import {
   zPostApiKeyAuthDataSourceBindingResponse,
 } from './zod.gen'
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postApiKeyAuthDataSourceBinding',
@@ -26,8 +34,16 @@ export const binding = {
   post,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const delete_ = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId: 'deleteApiKeyAuthDataSourceByBindingId',
@@ -41,8 +57,16 @@ export const byBindingId = {
   delete: delete_,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getApiKeyAuthDataSource',
diff --git a/packages/contracts/generated/api/console/app/orpc.gen.ts b/packages/contracts/generated/api/console/app/orpc.gen.ts
index 7ccb933866..1a2a10f23c 100644
--- a/packages/contracts/generated/api/console/app/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/app/orpc.gen.ts
@@ -7,10 +7,16 @@ import { zGetAppPromptTemplatesQuery, zGetAppPromptTemplatesResponse } from './z
 
 /**
  * Get advanced prompt templates based on app mode and model configuration
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get = oc
   .route({
-    description: 'Get advanced prompt templates based on app mode and model configuration',
+    deprecated: true,
+    description:
+      'Get advanced prompt templates based on app mode and model configuration\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppPromptTemplates',
diff --git a/packages/contracts/generated/api/console/apps/orpc.gen.ts b/packages/contracts/generated/api/console/apps/orpc.gen.ts
index 069976904d..a1a0faaefd 100644
--- a/packages/contracts/generated/api/console/apps/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/apps/orpc.gen.ts
@@ -194,8 +194,6 @@ import {
   zGetAppsImportsByAppIdCheckDependenciesResponse,
   zGetAppsQuery,
   zGetAppsResponse,
-  zGetAppsWorkflowsOnlineUsersQuery,
-  zGetAppsWorkflowsOnlineUsersResponse,
   zPatchAppsByAppIdTraceConfigBody,
   zPatchAppsByAppIdTraceConfigPath,
   zPatchAppsByAppIdTraceConfigResponse,
@@ -353,6 +351,8 @@ import {
   zPostAppsImportsByImportIdConfirmResponse,
   zPostAppsImportsResponse,
   zPostAppsResponse,
+  zPostAppsWorkflowsOnlineUsersBody,
+  zPostAppsWorkflowsOnlineUsersResponse,
   zPutAppsByAppIdBody,
   zPutAppsByAppIdPath,
   zPutAppsByAppIdResponse,
@@ -427,20 +427,20 @@ export const imports = {
 /**
  * Get workflow online users
  */
-export const get2 = oc
+export const post3 = oc
   .route({
     description: 'Get workflow online users',
     inputStructure: 'detailed',
-    method: 'GET',
-    operationId: 'getAppsWorkflowsOnlineUsers',
+    method: 'POST',
+    operationId: 'postAppsWorkflowsOnlineUsers',
     path: '/apps/workflows/online-users',
     tags: ['console'],
   })
-  .input(z.object({ query: zGetAppsWorkflowsOnlineUsersQuery }))
-  .output(zGetAppsWorkflowsOnlineUsersResponse)
+  .input(z.object({ body: zPostAppsWorkflowsOnlineUsersBody }))
+  .output(zPostAppsWorkflowsOnlineUsersResponse)
 
 export const onlineUsers = {
-  get: get2,
+  post: post3,
 }
 
 export const workflows = {
@@ -452,7 +452,7 @@ export const workflows = {
  *
  * Get advanced chat workflow runs count statistics
  */
-export const get3 = oc
+export const get2 = oc
   .route({
     description: 'Get advanced chat workflow runs count statistics',
     inputStructure: 'detailed',
@@ -471,7 +471,7 @@ export const get3 = oc
   .output(zGetAppsByAppIdAdvancedChatWorkflowRunsCountResponse)
 
 export const count = {
-  get: get3,
+  get: get2,
 }
 
 /**
@@ -479,7 +479,7 @@ export const count = {
  *
  * Get advanced chat workflow run list
  */
-export const get4 = oc
+export const get3 = oc
   .route({
     description: 'Get advanced chat workflow run list',
     inputStructure: 'detailed',
@@ -498,7 +498,7 @@ export const get4 = oc
   .output(zGetAppsByAppIdAdvancedChatWorkflowRunsResponse)
 
 export const workflowRuns = {
-  get: get4,
+  get: get3,
   count,
 }
 
@@ -506,10 +506,16 @@ export const workflowRuns = {
  * Preview human input form content and placeholders
  *
  * Get human input form preview for advanced chat workflow
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post3 = oc
+export const post4 = oc
   .route({
-    description: 'Get human input form preview for advanced chat workflow',
+    deprecated: true,
+    description:
+      'Get human input form preview for advanced chat workflow\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdAdvancedChatWorkflowsDraftHumanInputNodesByNodeIdFormPreview',
@@ -526,17 +532,23 @@ export const post3 = oc
   .output(zPostAppsByAppIdAdvancedChatWorkflowsDraftHumanInputNodesByNodeIdFormPreviewResponse)
 
 export const preview = {
-  post: post3,
+  post: post4,
 }
 
 /**
  * Submit human input form preview
  *
  * Submit human input form preview for advanced chat workflow
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post4 = oc
+export const post5 = oc
   .route({
-    description: 'Submit human input form preview for advanced chat workflow',
+    deprecated: true,
+    description:
+      'Submit human input form preview for advanced chat workflow\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdAdvancedChatWorkflowsDraftHumanInputNodesByNodeIdFormRun',
@@ -553,7 +565,7 @@ export const post4 = oc
   .output(zPostAppsByAppIdAdvancedChatWorkflowsDraftHumanInputNodesByNodeIdFormRunResponse)
 
 export const run = {
-  post: post4,
+  post: post5,
 }
 
 export const form = {
@@ -577,10 +589,16 @@ export const humanInput = {
  * Run draft workflow iteration node
  *
  * Run draft workflow iteration node for advanced chat
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post5 = oc
+export const post6 = oc
   .route({
-    description: 'Run draft workflow iteration node for advanced chat',
+    deprecated: true,
+    description:
+      'Run draft workflow iteration node for advanced chat\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdAdvancedChatWorkflowsDraftIterationNodesByNodeIdRun',
@@ -597,7 +615,7 @@ export const post5 = oc
   .output(zPostAppsByAppIdAdvancedChatWorkflowsDraftIterationNodesByNodeIdRunResponse)
 
 export const run2 = {
-  post: post5,
+  post: post6,
 }
 
 export const byNodeId2 = {
@@ -616,10 +634,16 @@ export const iteration = {
  * Run draft workflow loop node
  *
  * Run draft workflow loop node for advanced chat
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post6 = oc
+export const post7 = oc
   .route({
-    description: 'Run draft workflow loop node for advanced chat',
+    deprecated: true,
+    description:
+      'Run draft workflow loop node for advanced chat\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdAdvancedChatWorkflowsDraftLoopNodesByNodeIdRun',
@@ -636,7 +660,7 @@ export const post6 = oc
   .output(zPostAppsByAppIdAdvancedChatWorkflowsDraftLoopNodesByNodeIdRunResponse)
 
 export const run3 = {
-  post: post6,
+  post: post7,
 }
 
 export const byNodeId3 = {
@@ -655,10 +679,16 @@ export const loop = {
  * Run draft workflow
  *
  * Run draft workflow for advanced chat application
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post7 = oc
+export const post8 = oc
   .route({
-    description: 'Run draft workflow for advanced chat application',
+    deprecated: true,
+    description:
+      'Run draft workflow for advanced chat application\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdAdvancedChatWorkflowsDraftRun',
@@ -675,7 +705,7 @@ export const post7 = oc
   .output(zPostAppsByAppIdAdvancedChatWorkflowsDraftRunResponse)
 
 export const run4 = {
-  post: post7,
+  post: post8,
 }
 
 export const draft = {
@@ -698,10 +728,16 @@ export const advancedChat = {
  * Get agent logs
  *
  * Get agent execution logs for an application
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get5 = oc
+export const get4 = oc
   .route({
-    description: 'Get agent execution logs for an application',
+    deprecated: true,
+    description:
+      'Get agent execution logs for an application\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdAgentLogs',
@@ -713,7 +749,7 @@ export const get5 = oc
   .output(zGetAppsByAppIdAgentLogsResponse)
 
 export const logs = {
-  get: get5,
+  get: get4,
 }
 
 export const agent = {
@@ -722,10 +758,16 @@ export const agent = {
 
 /**
  * Get status of annotation reply action job
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get6 = oc
+export const get5 = oc
   .route({
-    description: 'Get status of annotation reply action job',
+    deprecated: true,
+    description:
+      'Get status of annotation reply action job\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdAnnotationReplyByActionStatusByJobId',
@@ -736,7 +778,7 @@ export const get6 = oc
   .output(zGetAppsByAppIdAnnotationReplyByActionStatusByJobIdResponse)
 
 export const byJobId = {
-  get: get6,
+  get: get5,
 }
 
 export const status = {
@@ -745,10 +787,16 @@ export const status = {
 
 /**
  * Enable or disable annotation reply for an app
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post8 = oc
+export const post9 = oc
   .route({
-    description: 'Enable or disable annotation reply for an app',
+    deprecated: true,
+    description:
+      'Enable or disable annotation reply for an app\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdAnnotationReplyByAction',
@@ -764,7 +812,7 @@ export const post8 = oc
   .output(zPostAppsByAppIdAnnotationReplyByActionResponse)
 
 export const byAction = {
-  post: post8,
+  post: post9,
   status,
 }
 
@@ -774,10 +822,16 @@ export const annotationReply = {
 
 /**
  * Get annotation settings for an app
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get7 = oc
+export const get6 = oc
   .route({
-    description: 'Get annotation settings for an app',
+    deprecated: true,
+    description:
+      'Get annotation settings for an app\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdAnnotationSetting',
@@ -788,15 +842,21 @@ export const get7 = oc
   .output(zGetAppsByAppIdAnnotationSettingResponse)
 
 export const annotationSetting = {
-  get: get7,
+  get: get6,
 }
 
 /**
  * Update annotation settings for an app
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post9 = oc
+export const post10 = oc
   .route({
-    description: 'Update annotation settings for an app',
+    deprecated: true,
+    description:
+      'Update annotation settings for an app\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdAnnotationSettingsByAnnotationSettingId',
@@ -812,7 +872,7 @@ export const post9 = oc
   .output(zPostAppsByAppIdAnnotationSettingsByAnnotationSettingIdResponse)
 
 export const byAnnotationSettingId = {
-  post: post9,
+  post: post10,
 }
 
 export const annotationSettings = {
@@ -821,10 +881,16 @@ export const annotationSettings = {
 
 /**
  * Batch import annotations from CSV file with rate limiting and security checks
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post10 = oc
+export const post11 = oc
   .route({
-    description: 'Batch import annotations from CSV file with rate limiting and security checks',
+    deprecated: true,
+    description:
+      'Batch import annotations from CSV file with rate limiting and security checks\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdAnnotationsBatchImport',
@@ -835,15 +901,21 @@ export const post10 = oc
   .output(zPostAppsByAppIdAnnotationsBatchImportResponse)
 
 export const batchImport = {
-  post: post10,
+  post: post11,
 }
 
 /**
  * Get status of batch import job
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get8 = oc
+export const get7 = oc
   .route({
-    description: 'Get status of batch import job',
+    deprecated: true,
+    description:
+      'Get status of batch import job\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdAnnotationsBatchImportStatusByJobId',
@@ -854,7 +926,7 @@ export const get8 = oc
   .output(zGetAppsByAppIdAnnotationsBatchImportStatusByJobIdResponse)
 
 export const byJobId2 = {
-  get: get8,
+  get: get7,
 }
 
 export const batchImportStatus = {
@@ -864,7 +936,7 @@ export const batchImportStatus = {
 /**
  * Get count of message annotations for the app
  */
-export const get9 = oc
+export const get8 = oc
   .route({
     description: 'Get count of message annotations for the app',
     inputStructure: 'detailed',
@@ -877,13 +949,13 @@ export const get9 = oc
   .output(zGetAppsByAppIdAnnotationsCountResponse)
 
 export const count2 = {
-  get: get9,
+  get: get8,
 }
 
 /**
  * Export all annotations for an app with CSV injection protection
  */
-export const get10 = oc
+export const get9 = oc
   .route({
     description: 'Export all annotations for an app with CSV injection protection',
     inputStructure: 'detailed',
@@ -896,13 +968,13 @@ export const get10 = oc
   .output(zGetAppsByAppIdAnnotationsExportResponse)
 
 export const export_ = {
-  get: get10,
+  get: get9,
 }
 
 /**
  * Get hit histories for an annotation
  */
-export const get11 = oc
+export const get10 = oc
   .route({
     description: 'Get hit histories for an annotation',
     inputStructure: 'detailed',
@@ -920,11 +992,19 @@ export const get11 = oc
   .output(zGetAppsByAppIdAnnotationsByAnnotationIdHitHistoriesResponse)
 
 export const hitHistories = {
-  get: get11,
+  get: get10,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const delete_ = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId: 'deleteAppsByAppIdAnnotationsByAnnotationId',
@@ -936,10 +1016,16 @@ export const delete_ = oc
 
 /**
  * Update or delete an annotation
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post11 = oc
+export const post12 = oc
   .route({
-    description: 'Update or delete an annotation',
+    deprecated: true,
+    description:
+      'Update or delete an annotation\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdAnnotationsByAnnotationId',
@@ -956,12 +1042,20 @@ export const post11 = oc
 
 export const byAnnotationId = {
   delete: delete_,
-  post: post11,
+  post: post12,
   hitHistories,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const delete2 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId: 'deleteAppsByAppIdAnnotations',
@@ -973,10 +1067,16 @@ export const delete2 = oc
 
 /**
  * Get annotations for an app with pagination
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get12 = oc
+export const get11 = oc
   .route({
-    description: 'Get annotations for an app with pagination',
+    deprecated: true,
+    description:
+      'Get annotations for an app with pagination\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdAnnotations',
@@ -993,10 +1093,16 @@ export const get12 = oc
 
 /**
  * Create a new annotation for an app
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post12 = oc
+export const post13 = oc
   .route({
-    description: 'Create a new annotation for an app',
+    deprecated: true,
+    description:
+      'Create a new annotation for an app\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdAnnotations',
@@ -1011,8 +1117,8 @@ export const post12 = oc
 
 export const annotations = {
   delete: delete2,
-  get: get12,
-  post: post12,
+  get: get11,
+  post: post13,
   batchImport,
   batchImportStatus,
   count: count2,
@@ -1022,10 +1128,16 @@ export const annotations = {
 
 /**
  * Enable or disable app API
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post13 = oc
+export const post14 = oc
   .route({
-    description: 'Enable or disable app API',
+    deprecated: true,
+    description:
+      'Enable or disable app API\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdApiEnable',
@@ -1036,13 +1148,13 @@ export const post13 = oc
   .output(zPostAppsByAppIdApiEnableResponse)
 
 export const apiEnable = {
-  post: post13,
+  post: post14,
 }
 
 /**
  * Transcript audio to text for chat messages
  */
-export const post14 = oc
+export const post15 = oc
   .route({
     description: 'Transcript audio to text for chat messages',
     inputStructure: 'detailed',
@@ -1055,7 +1167,7 @@ export const post14 = oc
   .output(zPostAppsByAppIdAudioToTextResponse)
 
 export const audioToText = {
-  post: post14,
+  post: post15,
 }
 
 /**
@@ -1076,10 +1188,16 @@ export const delete3 = oc
 
 /**
  * Get chat conversation details
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get13 = oc
+export const get12 = oc
   .route({
-    description: 'Get chat conversation details',
+    deprecated: true,
+    description:
+      'Get chat conversation details\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdChatConversationsByConversationId',
@@ -1091,13 +1209,13 @@ export const get13 = oc
 
 export const byConversationId = {
   delete: delete3,
-  get: get13,
+  get: get12,
 }
 
 /**
  * Get chat conversations with pagination, filtering and summary
  */
-export const get14 = oc
+export const get13 = oc
   .route({
     description: 'Get chat conversations with pagination, filtering and summary',
     inputStructure: 'detailed',
@@ -1115,14 +1233,14 @@ export const get14 = oc
   .output(zGetAppsByAppIdChatConversationsResponse)
 
 export const chatConversations = {
-  get: get14,
+  get: get13,
   byConversationId,
 }
 
 /**
  * Get suggested questions for a message
  */
-export const get15 = oc
+export const get14 = oc
   .route({
     description: 'Get suggested questions for a message',
     inputStructure: 'detailed',
@@ -1135,7 +1253,7 @@ export const get15 = oc
   .output(zGetAppsByAppIdChatMessagesByMessageIdSuggestedQuestionsResponse)
 
 export const suggestedQuestions = {
-  get: get15,
+  get: get14,
 }
 
 export const byMessageId = {
@@ -1144,10 +1262,16 @@ export const byMessageId = {
 
 /**
  * Stop a running chat message generation
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post15 = oc
+export const post16 = oc
   .route({
-    description: 'Stop a running chat message generation',
+    deprecated: true,
+    description:
+      'Stop a running chat message generation\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdChatMessagesByTaskIdStop',
@@ -1158,7 +1282,7 @@ export const post15 = oc
   .output(zPostAppsByAppIdChatMessagesByTaskIdStopResponse)
 
 export const stop = {
-  post: post15,
+  post: post16,
 }
 
 export const byTaskId = {
@@ -1167,10 +1291,16 @@ export const byTaskId = {
 
 /**
  * Get chat messages for a conversation with pagination
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get16 = oc
+export const get15 = oc
   .route({
-    description: 'Get chat messages for a conversation with pagination',
+    deprecated: true,
+    description:
+      'Get chat messages for a conversation with pagination\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdChatMessages',
@@ -1183,7 +1313,7 @@ export const get16 = oc
   .output(zGetAppsByAppIdChatMessagesResponse)
 
 export const chatMessages = {
-  get: get16,
+  get: get15,
   byMessageId,
   byTaskId,
 }
@@ -1206,10 +1336,16 @@ export const delete4 = oc
 
 /**
  * Get completion conversation details with messages
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get17 = oc
+export const get16 = oc
   .route({
-    description: 'Get completion conversation details with messages',
+    deprecated: true,
+    description:
+      'Get completion conversation details with messages\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdCompletionConversationsByConversationId',
@@ -1221,13 +1357,13 @@ export const get17 = oc
 
 export const byConversationId2 = {
   delete: delete4,
-  get: get17,
+  get: get16,
 }
 
 /**
  * Get completion conversations with pagination and filtering
  */
-export const get18 = oc
+export const get17 = oc
   .route({
     description: 'Get completion conversations with pagination and filtering',
     inputStructure: 'detailed',
@@ -1245,16 +1381,22 @@ export const get18 = oc
   .output(zGetAppsByAppIdCompletionConversationsResponse)
 
 export const completionConversations = {
-  get: get18,
+  get: get17,
   byConversationId: byConversationId2,
 }
 
 /**
  * Stop a running completion message generation
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post16 = oc
+export const post17 = oc
   .route({
-    description: 'Stop a running completion message generation',
+    deprecated: true,
+    description:
+      'Stop a running completion message generation\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdCompletionMessagesByTaskIdStop',
@@ -1265,7 +1407,7 @@ export const post16 = oc
   .output(zPostAppsByAppIdCompletionMessagesByTaskIdStopResponse)
 
 export const stop2 = {
-  post: post16,
+  post: post17,
 }
 
 export const byTaskId2 = {
@@ -1274,10 +1416,16 @@ export const byTaskId2 = {
 
 /**
  * Generate completion message for debugging
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post17 = oc
+export const post18 = oc
   .route({
-    description: 'Generate completion message for debugging',
+    deprecated: true,
+    description:
+      'Generate completion message for debugging\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdCompletionMessages',
@@ -1293,14 +1441,14 @@ export const post17 = oc
   .output(zPostAppsByAppIdCompletionMessagesResponse)
 
 export const completionMessages = {
-  post: post17,
+  post: post18,
   byTaskId: byTaskId2,
 }
 
 /**
  * Get conversation variables for an application
  */
-export const get19 = oc
+export const get18 = oc
   .route({
     description: 'Get conversation variables for an application',
     inputStructure: 'detailed',
@@ -1318,7 +1466,7 @@ export const get19 = oc
   .output(zGetAppsByAppIdConversationVariablesResponse)
 
 export const conversationVariables = {
-  get: get19,
+  get: get18,
 }
 
 /**
@@ -1327,11 +1475,16 @@ export const conversationVariables = {
  * Convert application to workflow mode
  * Convert expert mode of chatbot app to workflow mode
  * Convert Completion App to Workflow App
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post18 = oc
+export const post19 = oc
   .route({
+    deprecated: true,
     description:
-      'Convert application to workflow mode\nConvert expert mode of chatbot app to workflow mode\nConvert Completion App to Workflow App',
+      'Convert application to workflow mode\nConvert expert mode of chatbot app to workflow mode\nConvert Completion App to Workflow App\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdConvertToWorkflow',
@@ -1348,17 +1501,23 @@ export const post18 = oc
   .output(zPostAppsByAppIdConvertToWorkflowResponse)
 
 export const convertToWorkflow = {
-  post: post18,
+  post: post19,
 }
 
 /**
  * Copy app
  *
  * Create a copy of an existing application
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post19 = oc
+export const post20 = oc
   .route({
-    description: 'Create a copy of an existing application',
+    deprecated: true,
+    description:
+      'Create a copy of an existing application\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdCopy',
@@ -1371,7 +1530,7 @@ export const post19 = oc
   .output(zPostAppsByAppIdCopyResponse)
 
 export const copy = {
-  post: post19,
+  post: post20,
 }
 
 /**
@@ -1379,7 +1538,7 @@ export const copy = {
  *
  * Export application configuration as DSL
  */
-export const get20 = oc
+export const get19 = oc
   .route({
     description: 'Export application configuration as DSL',
     inputStructure: 'detailed',
@@ -1395,15 +1554,21 @@ export const get20 = oc
   .output(zGetAppsByAppIdExportResponse)
 
 export const export2 = {
-  get: get20,
+  get: get19,
 }
 
 /**
  * Export user feedback data for Google Sheets
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get21 = oc
+export const get20 = oc
   .route({
-    description: 'Export user feedback data for Google Sheets',
+    deprecated: true,
+    description:
+      'Export user feedback data for Google Sheets\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdFeedbacksExport',
@@ -1419,15 +1584,21 @@ export const get21 = oc
   .output(zGetAppsByAppIdFeedbacksExportResponse)
 
 export const export3 = {
-  get: get21,
+  get: get20,
 }
 
 /**
  * Create or update message feedback (like/dislike)
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post20 = oc
+export const post21 = oc
   .route({
-    description: 'Create or update message feedback (like/dislike)',
+    deprecated: true,
+    description:
+      'Create or update message feedback (like/dislike)\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdFeedbacks',
@@ -1438,16 +1609,22 @@ export const post20 = oc
   .output(zPostAppsByAppIdFeedbacksResponse)
 
 export const feedbacks = {
-  post: post20,
+  post: post21,
   export: export3,
 }
 
 /**
  * Update application icon
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post21 = oc
+export const post22 = oc
   .route({
-    description: 'Update application icon',
+    deprecated: true,
+    description:
+      'Update application icon\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdIcon',
@@ -1458,15 +1635,21 @@ export const post21 = oc
   .output(zPostAppsByAppIdIconResponse)
 
 export const icon = {
-  post: post21,
+  post: post22,
 }
 
 /**
  * Get message details by ID
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get22 = oc
+export const get21 = oc
   .route({
-    description: 'Get message details by ID',
+    deprecated: true,
+    description:
+      'Get message details by ID\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdMessagesByMessageId',
@@ -1477,7 +1660,7 @@ export const get22 = oc
   .output(zGetAppsByAppIdMessagesByMessageIdResponse)
 
 export const byMessageId2 = {
-  get: get22,
+  get: get21,
 }
 
 export const messages = {
@@ -1488,10 +1671,16 @@ export const messages = {
  * Modify app model config
  *
  * Update application model configuration
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post22 = oc
+export const post23 = oc
   .route({
-    description: 'Update application model configuration',
+    deprecated: true,
+    description:
+      'Update application model configuration\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdModelConfig',
@@ -1505,15 +1694,21 @@ export const post22 = oc
   .output(zPostAppsByAppIdModelConfigResponse)
 
 export const modelConfig = {
-  post: post22,
+  post: post23,
 }
 
 /**
  * Check if app name is available
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post23 = oc
+export const post24 = oc
   .route({
-    description: 'Check if app name is available',
+    deprecated: true,
+    description:
+      'Check if app name is available\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdName',
@@ -1524,14 +1719,21 @@ export const post23 = oc
   .output(zPostAppsByAppIdNameResponse)
 
 export const name = {
-  post: post23,
+  post: post24,
 }
 
 /**
  * Publish app to Creators Platform
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post24 = oc
+export const post25 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdPublishToCreatorsPlatform',
@@ -1543,15 +1745,21 @@ export const post24 = oc
   .output(zPostAppsByAppIdPublishToCreatorsPlatformResponse)
 
 export const publishToCreatorsPlatform = {
-  post: post24,
+  post: post25,
 }
 
 /**
  * Get MCP server configuration for an application
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get23 = oc
+export const get22 = oc
   .route({
-    description: 'Get MCP server configuration for an application',
+    deprecated: true,
+    description:
+      'Get MCP server configuration for an application\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdServer',
@@ -1563,10 +1771,16 @@ export const get23 = oc
 
 /**
  * Create MCP server configuration for an application
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post25 = oc
+export const post26 = oc
   .route({
-    description: 'Create MCP server configuration for an application',
+    deprecated: true,
+    description:
+      'Create MCP server configuration for an application\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdServer',
@@ -1579,10 +1793,16 @@ export const post25 = oc
 
 /**
  * Update MCP server configuration for an application
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const put = oc
   .route({
-    description: 'Update MCP server configuration for an application',
+    deprecated: true,
+    description:
+      'Update MCP server configuration for an application\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PUT',
     operationId: 'putAppsByAppIdServer',
@@ -1593,15 +1813,15 @@ export const put = oc
   .output(zPutAppsByAppIdServerResponse)
 
 export const server = {
-  get: get23,
-  post: post25,
+  get: get22,
+  post: post26,
   put,
 }
 
 /**
  * Reset access token for application site
  */
-export const post26 = oc
+export const post27 = oc
   .route({
     description: 'Reset access token for application site',
     inputStructure: 'detailed',
@@ -1614,13 +1834,13 @@ export const post26 = oc
   .output(zPostAppsByAppIdSiteAccessTokenResetResponse)
 
 export const accessTokenReset = {
-  post: post26,
+  post: post27,
 }
 
 /**
  * Update application site configuration
  */
-export const post27 = oc
+export const post28 = oc
   .route({
     description: 'Update application site configuration',
     inputStructure: 'detailed',
@@ -1633,16 +1853,22 @@ export const post27 = oc
   .output(zPostAppsByAppIdSiteResponse)
 
 export const site = {
-  post: post27,
+  post: post28,
   accessTokenReset,
 }
 
 /**
  * Enable or disable app site
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post28 = oc
+export const post29 = oc
   .route({
-    description: 'Enable or disable app site',
+    deprecated: true,
+    description:
+      'Enable or disable app site\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdSiteEnable',
@@ -1653,15 +1879,21 @@ export const post28 = oc
   .output(zPostAppsByAppIdSiteEnableResponse)
 
 export const siteEnable = {
-  post: post28,
+  post: post29,
 }
 
 /**
  * Get average response time statistics for an application
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get24 = oc
+export const get23 = oc
   .route({
-    description: 'Get average response time statistics for an application',
+    deprecated: true,
+    description:
+      'Get average response time statistics for an application\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdStatisticsAverageResponseTime',
@@ -1677,15 +1909,21 @@ export const get24 = oc
   .output(zGetAppsByAppIdStatisticsAverageResponseTimeResponse)
 
 export const averageResponseTime = {
-  get: get24,
+  get: get23,
 }
 
 /**
  * Get average session interaction statistics for an application
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get25 = oc
+export const get24 = oc
   .route({
-    description: 'Get average session interaction statistics for an application',
+    deprecated: true,
+    description:
+      'Get average session interaction statistics for an application\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdStatisticsAverageSessionInteractions',
@@ -1701,15 +1939,21 @@ export const get25 = oc
   .output(zGetAppsByAppIdStatisticsAverageSessionInteractionsResponse)
 
 export const averageSessionInteractions = {
-  get: get25,
+  get: get24,
 }
 
 /**
  * Get daily conversation statistics for an application
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get26 = oc
+export const get25 = oc
   .route({
-    description: 'Get daily conversation statistics for an application',
+    deprecated: true,
+    description:
+      'Get daily conversation statistics for an application\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdStatisticsDailyConversations',
@@ -1725,15 +1969,21 @@ export const get26 = oc
   .output(zGetAppsByAppIdStatisticsDailyConversationsResponse)
 
 export const dailyConversations = {
-  get: get26,
+  get: get25,
 }
 
 /**
  * Get daily terminal/end-user statistics for an application
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get27 = oc
+export const get26 = oc
   .route({
-    description: 'Get daily terminal/end-user statistics for an application',
+    deprecated: true,
+    description:
+      'Get daily terminal/end-user statistics for an application\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdStatisticsDailyEndUsers',
@@ -1749,15 +1999,21 @@ export const get27 = oc
   .output(zGetAppsByAppIdStatisticsDailyEndUsersResponse)
 
 export const dailyEndUsers = {
-  get: get27,
+  get: get26,
 }
 
 /**
  * Get daily message statistics for an application
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get28 = oc
+export const get27 = oc
   .route({
-    description: 'Get daily message statistics for an application',
+    deprecated: true,
+    description:
+      'Get daily message statistics for an application\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdStatisticsDailyMessages',
@@ -1773,15 +2029,21 @@ export const get28 = oc
   .output(zGetAppsByAppIdStatisticsDailyMessagesResponse)
 
 export const dailyMessages = {
-  get: get28,
+  get: get27,
 }
 
 /**
  * Get daily token cost statistics for an application
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get29 = oc
+export const get28 = oc
   .route({
-    description: 'Get daily token cost statistics for an application',
+    deprecated: true,
+    description:
+      'Get daily token cost statistics for an application\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdStatisticsTokenCosts',
@@ -1797,15 +2059,21 @@ export const get29 = oc
   .output(zGetAppsByAppIdStatisticsTokenCostsResponse)
 
 export const tokenCosts = {
-  get: get29,
+  get: get28,
 }
 
 /**
  * Get tokens per second statistics for an application
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get30 = oc
+export const get29 = oc
   .route({
-    description: 'Get tokens per second statistics for an application',
+    deprecated: true,
+    description:
+      'Get tokens per second statistics for an application\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdStatisticsTokensPerSecond',
@@ -1821,15 +2089,21 @@ export const get30 = oc
   .output(zGetAppsByAppIdStatisticsTokensPerSecondResponse)
 
 export const tokensPerSecond = {
-  get: get30,
+  get: get29,
 }
 
 /**
  * Get user satisfaction rate statistics for an application
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get31 = oc
+export const get30 = oc
   .route({
-    description: 'Get user satisfaction rate statistics for an application',
+    deprecated: true,
+    description:
+      'Get user satisfaction rate statistics for an application\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdStatisticsUserSatisfactionRate',
@@ -1845,7 +2119,7 @@ export const get31 = oc
   .output(zGetAppsByAppIdStatisticsUserSatisfactionRateResponse)
 
 export const userSatisfactionRate = {
-  get: get31,
+  get: get30,
 }
 
 export const statistics = {
@@ -1861,10 +2135,16 @@ export const statistics = {
 
 /**
  * Get available TTS voices for a specific language
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get32 = oc
+export const get31 = oc
   .route({
-    description: 'Get available TTS voices for a specific language',
+    deprecated: true,
+    description:
+      'Get available TTS voices for a specific language\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdTextToAudioVoices',
@@ -1880,15 +2160,21 @@ export const get32 = oc
   .output(zGetAppsByAppIdTextToAudioVoicesResponse)
 
 export const voices = {
-  get: get32,
+  get: get31,
 }
 
 /**
  * Convert text to speech for chat messages
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post29 = oc
+export const post30 = oc
   .route({
-    description: 'Convert text to speech for chat messages',
+    deprecated: true,
+    description:
+      'Convert text to speech for chat messages\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdTextToAudio',
@@ -1901,7 +2187,7 @@ export const post29 = oc
   .output(zPostAppsByAppIdTextToAudioResponse)
 
 export const textToAudio = {
-  post: post29,
+  post: post30,
   voices,
 }
 
@@ -1909,10 +2195,16 @@ export const textToAudio = {
  * Get app trace
  *
  * Get app tracing configuration
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get33 = oc
+export const get32 = oc
   .route({
-    description: 'Get app tracing configuration',
+    deprecated: true,
+    description:
+      'Get app tracing configuration\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdTrace',
@@ -1925,10 +2217,16 @@ export const get33 = oc
 
 /**
  * Update app tracing configuration
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post30 = oc
+export const post31 = oc
   .route({
-    description: 'Update app tracing configuration',
+    deprecated: true,
+    description:
+      'Update app tracing configuration\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdTrace',
@@ -1939,8 +2237,8 @@ export const post30 = oc
   .output(zPostAppsByAppIdTraceResponse)
 
 export const trace = {
-  get: get33,
-  post: post30,
+  get: get32,
+  post: post31,
 }
 
 /**
@@ -1969,10 +2267,16 @@ export const delete5 = oc
 
 /**
  * Get tracing configuration for an application
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get34 = oc
+export const get33 = oc
   .route({
-    description: 'Get tracing configuration for an application',
+    deprecated: true,
+    description:
+      'Get tracing configuration for an application\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdTraceConfig',
@@ -1988,10 +2292,16 @@ export const get34 = oc
  * Update an existing trace app configuration
  *
  * Update an existing tracing configuration for an application
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const patch = oc
   .route({
-    description: 'Update an existing tracing configuration for an application',
+    deprecated: true,
+    description:
+      'Update an existing tracing configuration for an application\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchAppsByAppIdTraceConfig',
@@ -2008,10 +2318,16 @@ export const patch = oc
  * Create a new trace app configuration
  *
  * Create a new tracing configuration for an application
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post31 = oc
+export const post32 = oc
   .route({
-    description: 'Create a new tracing configuration for an application',
+    deprecated: true,
+    description:
+      'Create a new tracing configuration for an application\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdTraceConfig',
@@ -2027,15 +2343,15 @@ export const post31 = oc
 
 export const traceConfig = {
   delete: delete5,
-  get: get34,
+  get: get33,
   patch,
-  post: post31,
+  post: post32,
 }
 
 /**
  * Update app trigger (enable/disable)
  */
-export const post32 = oc
+export const post33 = oc
   .route({
     inputStructure: 'detailed',
     method: 'POST',
@@ -2053,13 +2369,13 @@ export const post32 = oc
   .output(zPostAppsByAppIdTriggerEnableResponse)
 
 export const triggerEnable = {
-  post: post32,
+  post: post33,
 }
 
 /**
  * Get app triggers list
  */
-export const get35 = oc
+export const get34 = oc
   .route({
     inputStructure: 'detailed',
     method: 'GET',
@@ -2072,7 +2388,7 @@ export const get35 = oc
   .output(zGetAppsByAppIdTriggersResponse)
 
 export const triggers = {
-  get: get35,
+  get: get34,
 }
 
 /**
@@ -2080,7 +2396,7 @@ export const triggers = {
  *
  * Get workflow application execution logs
  */
-export const get36 = oc
+export const get35 = oc
   .route({
     description: 'Get workflow application execution logs',
     inputStructure: 'detailed',
@@ -2099,7 +2415,7 @@ export const get36 = oc
   .output(zGetAppsByAppIdWorkflowAppLogsResponse)
 
 export const workflowAppLogs = {
-  get: get36,
+  get: get35,
 }
 
 /**
@@ -2107,7 +2423,7 @@ export const workflowAppLogs = {
  *
  * Get workflow archived execution logs
  */
-export const get37 = oc
+export const get36 = oc
   .route({
     description: 'Get workflow archived execution logs',
     inputStructure: 'detailed',
@@ -2126,7 +2442,7 @@ export const get37 = oc
   .output(zGetAppsByAppIdWorkflowArchivedLogsResponse)
 
 export const workflowArchivedLogs = {
-  get: get37,
+  get: get36,
 }
 
 /**
@@ -2134,7 +2450,7 @@ export const workflowArchivedLogs = {
  *
  * Get workflow runs count statistics
  */
-export const get38 = oc
+export const get37 = oc
   .route({
     description: 'Get workflow runs count statistics',
     inputStructure: 'detailed',
@@ -2153,17 +2469,23 @@ export const get38 = oc
   .output(zGetAppsByAppIdWorkflowRunsCountResponse)
 
 export const count3 = {
-  get: get38,
+  get: get37,
 }
 
 /**
  * Stop workflow task
  *
  * Stop running workflow task
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post33 = oc
+export const post34 = oc
   .route({
-    description: 'Stop running workflow task',
+    deprecated: true,
+    description:
+      'Stop running workflow task\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdWorkflowRunsTasksByTaskIdStop',
@@ -2175,7 +2497,7 @@ export const post33 = oc
   .output(zPostAppsByAppIdWorkflowRunsTasksByTaskIdStopResponse)
 
 export const stop3 = {
-  post: post33,
+  post: post34,
 }
 
 export const byTaskId3 = {
@@ -2189,7 +2511,7 @@ export const tasks = {
 /**
  * Generate a download URL for an archived workflow run.
  */
-export const get39 = oc
+export const get38 = oc
   .route({
     description: 'Generate a download URL for an archived workflow run.',
     inputStructure: 'detailed',
@@ -2202,7 +2524,7 @@ export const get39 = oc
   .output(zGetAppsByAppIdWorkflowRunsByRunIdExportResponse)
 
 export const export4 = {
-  get: get39,
+  get: get38,
 }
 
 /**
@@ -2210,7 +2532,7 @@ export const export4 = {
  *
  * Get workflow run node execution list
  */
-export const get40 = oc
+export const get39 = oc
   .route({
     description: 'Get workflow run node execution list',
     inputStructure: 'detailed',
@@ -2224,7 +2546,7 @@ export const get40 = oc
   .output(zGetAppsByAppIdWorkflowRunsByRunIdNodeExecutionsResponse)
 
 export const nodeExecutions = {
-  get: get40,
+  get: get39,
 }
 
 /**
@@ -2232,7 +2554,7 @@ export const nodeExecutions = {
  *
  * Get workflow run detail
  */
-export const get41 = oc
+export const get40 = oc
   .route({
     description: 'Get workflow run detail',
     inputStructure: 'detailed',
@@ -2246,7 +2568,7 @@ export const get41 = oc
   .output(zGetAppsByAppIdWorkflowRunsByRunIdResponse)
 
 export const byRunId = {
-  get: get41,
+  get: get40,
   export: export4,
   nodeExecutions,
 }
@@ -2256,7 +2578,7 @@ export const byRunId = {
  *
  * Get workflow run list
  */
-export const get42 = oc
+export const get41 = oc
   .route({
     description: 'Get workflow run list',
     inputStructure: 'detailed',
@@ -2275,7 +2597,7 @@ export const get42 = oc
   .output(zGetAppsByAppIdWorkflowRunsResponse)
 
 export const workflowRuns2 = {
-  get: get42,
+  get: get41,
   count: count3,
   tasks,
   byRunId,
@@ -2286,7 +2608,7 @@ export const workflowRuns2 = {
  *
  * Get all users in current tenant for mentions
  */
-export const get43 = oc
+export const get42 = oc
   .route({
     description: 'Get all users in current tenant for mentions',
     inputStructure: 'detailed',
@@ -2300,7 +2622,7 @@ export const get43 = oc
   .output(zGetAppsByAppIdWorkflowCommentsMentionUsersResponse)
 
 export const mentionUsers = {
-  get: get43,
+  get: get42,
 }
 
 /**
@@ -2355,7 +2677,7 @@ export const byReplyId = {
  *
  * Add a reply to a workflow comment
  */
-export const post34 = oc
+export const post35 = oc
   .route({
     description: 'Add a reply to a workflow comment',
     inputStructure: 'detailed',
@@ -2375,7 +2697,7 @@ export const post34 = oc
   .output(zPostAppsByAppIdWorkflowCommentsByCommentIdRepliesResponse)
 
 export const replies = {
-  post: post34,
+  post: post35,
   byReplyId,
 }
 
@@ -2384,7 +2706,7 @@ export const replies = {
  *
  * Resolve a workflow comment
  */
-export const post35 = oc
+export const post36 = oc
   .route({
     description: 'Resolve a workflow comment',
     inputStructure: 'detailed',
@@ -2398,7 +2720,7 @@ export const post35 = oc
   .output(zPostAppsByAppIdWorkflowCommentsByCommentIdResolveResponse)
 
 export const resolve = {
-  post: post35,
+  post: post36,
 }
 
 /**
@@ -2425,7 +2747,7 @@ export const delete7 = oc
  *
  * Get a specific workflow comment
  */
-export const get44 = oc
+export const get43 = oc
   .route({
     description: 'Get a specific workflow comment',
     inputStructure: 'detailed',
@@ -2463,7 +2785,7 @@ export const put3 = oc
 
 export const byCommentId = {
   delete: delete7,
-  get: get44,
+  get: get43,
   put: put3,
   replies,
   resolve,
@@ -2474,7 +2796,7 @@ export const byCommentId = {
  *
  * Get all comments for a workflow
  */
-export const get45 = oc
+export const get44 = oc
   .route({
     description: 'Get all comments for a workflow',
     inputStructure: 'detailed',
@@ -2492,7 +2814,7 @@ export const get45 = oc
  *
  * Create a new workflow comment
  */
-export const post36 = oc
+export const post37 = oc
   .route({
     description: 'Create a new workflow comment',
     inputStructure: 'detailed',
@@ -2512,18 +2834,24 @@ export const post36 = oc
   .output(zPostAppsByAppIdWorkflowCommentsResponse)
 
 export const comments = {
-  get: get45,
-  post: post36,
+  get: get44,
+  post: post37,
   mentionUsers,
   byCommentId,
 }
 
 /**
  * Get workflow average app interaction statistics
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get46 = oc
+export const get45 = oc
   .route({
-    description: 'Get workflow average app interaction statistics',
+    deprecated: true,
+    description:
+      'Get workflow average app interaction statistics\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdWorkflowStatisticsAverageAppInteractions',
@@ -2539,15 +2867,21 @@ export const get46 = oc
   .output(zGetAppsByAppIdWorkflowStatisticsAverageAppInteractionsResponse)
 
 export const averageAppInteractions = {
-  get: get46,
+  get: get45,
 }
 
 /**
  * Get workflow daily runs statistics
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get47 = oc
+export const get46 = oc
   .route({
-    description: 'Get workflow daily runs statistics',
+    deprecated: true,
+    description:
+      'Get workflow daily runs statistics\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdWorkflowStatisticsDailyConversations',
@@ -2563,15 +2897,21 @@ export const get47 = oc
   .output(zGetAppsByAppIdWorkflowStatisticsDailyConversationsResponse)
 
 export const dailyConversations2 = {
-  get: get47,
+  get: get46,
 }
 
 /**
  * Get workflow daily terminals statistics
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get48 = oc
+export const get47 = oc
   .route({
-    description: 'Get workflow daily terminals statistics',
+    deprecated: true,
+    description:
+      'Get workflow daily terminals statistics\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdWorkflowStatisticsDailyTerminals',
@@ -2587,15 +2927,21 @@ export const get48 = oc
   .output(zGetAppsByAppIdWorkflowStatisticsDailyTerminalsResponse)
 
 export const dailyTerminals = {
-  get: get48,
+  get: get47,
 }
 
 /**
  * Get workflow daily token cost statistics
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get49 = oc
+export const get48 = oc
   .route({
-    description: 'Get workflow daily token cost statistics',
+    deprecated: true,
+    description:
+      'Get workflow daily token cost statistics\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdWorkflowStatisticsTokenCosts',
@@ -2611,7 +2957,7 @@ export const get49 = oc
   .output(zGetAppsByAppIdWorkflowStatisticsTokenCostsResponse)
 
 export const tokenCosts2 = {
-  get: get49,
+  get: get48,
 }
 
 export const statistics2 = {
@@ -2630,10 +2976,16 @@ export const workflow = {
  * Get default block config
  *
  * Get default block configuration by type
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get50 = oc
+export const get49 = oc
   .route({
-    description: 'Get default block configuration by type',
+    deprecated: true,
+    description:
+      'Get default block configuration by type\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdWorkflowsDefaultWorkflowBlockConfigsByBlockType',
@@ -2650,17 +3002,23 @@ export const get50 = oc
   .output(zGetAppsByAppIdWorkflowsDefaultWorkflowBlockConfigsByBlockTypeResponse)
 
 export const byBlockType = {
-  get: get50,
+  get: get49,
 }
 
 /**
  * Get default block config
  *
  * Get default block configurations for workflow
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get51 = oc
+export const get50 = oc
   .route({
-    description: 'Get default block configurations for workflow',
+    deprecated: true,
+    description:
+      'Get default block configurations for workflow\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdWorkflowsDefaultWorkflowBlockConfigs',
@@ -2672,16 +3030,22 @@ export const get51 = oc
   .output(zGetAppsByAppIdWorkflowsDefaultWorkflowBlockConfigsResponse)
 
 export const defaultWorkflowBlockConfigs = {
-  get: get51,
+  get: get50,
   byBlockType,
 }
 
 /**
  * Get conversation variables for workflow
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get52 = oc
+export const get51 = oc
   .route({
-    description: 'Get conversation variables for workflow',
+    deprecated: true,
+    description:
+      'Get conversation variables for workflow\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdWorkflowsDraftConversationVariables',
@@ -2693,10 +3057,16 @@ export const get52 = oc
 
 /**
  * Update conversation variables for workflow draft
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post37 = oc
+export const post38 = oc
   .route({
-    description: 'Update conversation variables for workflow draft',
+    deprecated: true,
+    description:
+      'Update conversation variables for workflow draft\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdWorkflowsDraftConversationVariables',
@@ -2712,18 +3082,24 @@ export const post37 = oc
   .output(zPostAppsByAppIdWorkflowsDraftConversationVariablesResponse)
 
 export const conversationVariables2 = {
-  get: get52,
-  post: post37,
+  get: get51,
+  post: post38,
 }
 
 /**
  * Get draft workflow
  *
  * Get environment variables for workflow
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get53 = oc
+export const get52 = oc
   .route({
-    description: 'Get environment variables for workflow',
+    deprecated: true,
+    description:
+      'Get environment variables for workflow\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdWorkflowsDraftEnvironmentVariables',
@@ -2736,10 +3112,16 @@ export const get53 = oc
 
 /**
  * Update environment variables for workflow draft
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post38 = oc
+export const post39 = oc
   .route({
-    description: 'Update environment variables for workflow draft',
+    deprecated: true,
+    description:
+      'Update environment variables for workflow draft\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdWorkflowsDraftEnvironmentVariables',
@@ -2755,16 +3137,22 @@ export const post38 = oc
   .output(zPostAppsByAppIdWorkflowsDraftEnvironmentVariablesResponse)
 
 export const environmentVariables = {
-  get: get53,
-  post: post38,
+  get: get52,
+  post: post39,
 }
 
 /**
  * Update draft workflow features
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post39 = oc
+export const post40 = oc
   .route({
-    description: 'Update draft workflow features',
+    deprecated: true,
+    description:
+      'Update draft workflow features\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdWorkflowsDraftFeatures',
@@ -2780,17 +3168,23 @@ export const post39 = oc
   .output(zPostAppsByAppIdWorkflowsDraftFeaturesResponse)
 
 export const features = {
-  post: post39,
+  post: post40,
 }
 
 /**
  * Test human input delivery
  *
  * Test human input delivery for workflow
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post40 = oc
+export const post41 = oc
   .route({
-    description: 'Test human input delivery for workflow',
+    deprecated: true,
+    description:
+      'Test human input delivery for workflow\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdWorkflowsDraftHumanInputNodesByNodeIdDeliveryTest',
@@ -2807,17 +3201,23 @@ export const post40 = oc
   .output(zPostAppsByAppIdWorkflowsDraftHumanInputNodesByNodeIdDeliveryTestResponse)
 
 export const deliveryTest = {
-  post: post40,
+  post: post41,
 }
 
 /**
  * Preview human input form content and placeholders
  *
  * Get human input form preview for workflow
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post41 = oc
+export const post42 = oc
   .route({
-    description: 'Get human input form preview for workflow',
+    deprecated: true,
+    description:
+      'Get human input form preview for workflow\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdWorkflowsDraftHumanInputNodesByNodeIdFormPreview',
@@ -2834,17 +3234,23 @@ export const post41 = oc
   .output(zPostAppsByAppIdWorkflowsDraftHumanInputNodesByNodeIdFormPreviewResponse)
 
 export const preview2 = {
-  post: post41,
+  post: post42,
 }
 
 /**
  * Submit human input form preview
  *
  * Submit human input form preview for workflow
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post42 = oc
+export const post43 = oc
   .route({
-    description: 'Submit human input form preview for workflow',
+    deprecated: true,
+    description:
+      'Submit human input form preview for workflow\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdWorkflowsDraftHumanInputNodesByNodeIdFormRun',
@@ -2861,7 +3267,7 @@ export const post42 = oc
   .output(zPostAppsByAppIdWorkflowsDraftHumanInputNodesByNodeIdFormRunResponse)
 
 export const run5 = {
-  post: post42,
+  post: post43,
 }
 
 export const form2 = {
@@ -2886,10 +3292,16 @@ export const humanInput2 = {
  * Run draft workflow iteration node
  *
  * Run draft workflow iteration node
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post43 = oc
+export const post44 = oc
   .route({
-    description: 'Run draft workflow iteration node',
+    deprecated: true,
+    description:
+      'Run draft workflow iteration node\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdWorkflowsDraftIterationNodesByNodeIdRun',
@@ -2906,7 +3318,7 @@ export const post43 = oc
   .output(zPostAppsByAppIdWorkflowsDraftIterationNodesByNodeIdRunResponse)
 
 export const run6 = {
-  post: post43,
+  post: post44,
 }
 
 export const byNodeId5 = {
@@ -2925,10 +3337,16 @@ export const iteration2 = {
  * Run draft workflow loop node
  *
  * Run draft workflow loop node
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post44 = oc
+export const post45 = oc
   .route({
-    description: 'Run draft workflow loop node',
+    deprecated: true,
+    description:
+      'Run draft workflow loop node\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdWorkflowsDraftLoopNodesByNodeIdRun',
@@ -2945,7 +3363,7 @@ export const post44 = oc
   .output(zPostAppsByAppIdWorkflowsDraftLoopNodesByNodeIdRunResponse)
 
 export const run7 = {
-  post: post44,
+  post: post45,
 }
 
 export const byNodeId6 = {
@@ -2963,7 +3381,7 @@ export const loop2 = {
 /**
  * Get last run result for draft workflow node
  */
-export const get54 = oc
+export const get53 = oc
   .route({
     description: 'Get last run result for draft workflow node',
     inputStructure: 'detailed',
@@ -2976,17 +3394,23 @@ export const get54 = oc
   .output(zGetAppsByAppIdWorkflowsDraftNodesByNodeIdLastRunResponse)
 
 export const lastRun = {
-  get: get54,
+  get: get53,
 }
 
 /**
  * Run draft workflow node
  *
  * Run draft workflow node
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post45 = oc
+export const post46 = oc
   .route({
-    description: 'Run draft workflow node',
+    deprecated: true,
+    description:
+      'Run draft workflow node\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdWorkflowsDraftNodesByNodeIdRun',
@@ -3003,17 +3427,23 @@ export const post45 = oc
   .output(zPostAppsByAppIdWorkflowsDraftNodesByNodeIdRunResponse)
 
 export const run8 = {
-  post: post45,
+  post: post46,
 }
 
 /**
  * Poll for trigger events and execute single node when event arrives
  *
  * Poll for trigger events and execute single node when event arrives
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post46 = oc
+export const post47 = oc
   .route({
-    description: 'Poll for trigger events and execute single node when event arrives',
+    deprecated: true,
+    description:
+      'Poll for trigger events and execute single node when event arrives\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdWorkflowsDraftNodesByNodeIdTriggerRun',
@@ -3025,7 +3455,7 @@ export const post46 = oc
   .output(zPostAppsByAppIdWorkflowsDraftNodesByNodeIdTriggerRunResponse)
 
 export const run9 = {
-  post: post46,
+  post: post47,
 }
 
 export const trigger = {
@@ -3050,10 +3480,16 @@ export const delete8 = oc
 
 /**
  * Get variables for a specific node
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get55 = oc
+export const get54 = oc
   .route({
-    description: 'Get variables for a specific node',
+    deprecated: true,
+    description:
+      'Get variables for a specific node\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdWorkflowsDraftNodesByNodeIdVariables',
@@ -3065,7 +3501,7 @@ export const get55 = oc
 
 export const variables = {
   delete: delete8,
-  get: get55,
+  get: get54,
 }
 
 export const byNodeId7 = {
@@ -3083,10 +3519,16 @@ export const nodes7 = {
  * Run draft workflow
  *
  * Run draft workflow
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post47 = oc
+export const post48 = oc
   .route({
-    description: 'Run draft workflow',
+    deprecated: true,
+    description:
+      'Run draft workflow\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdWorkflowsDraftRun',
@@ -3103,15 +3545,21 @@ export const post47 = oc
   .output(zPostAppsByAppIdWorkflowsDraftRunResponse)
 
 export const run10 = {
-  post: post47,
+  post: post48,
 }
 
 /**
  * Get system variables for workflow
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get56 = oc
+export const get55 = oc
   .route({
-    description: 'Get system variables for workflow',
+    deprecated: true,
+    description:
+      'Get system variables for workflow\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdWorkflowsDraftSystemVariables',
@@ -3122,17 +3570,23 @@ export const get56 = oc
   .output(zGetAppsByAppIdWorkflowsDraftSystemVariablesResponse)
 
 export const systemVariables = {
-  get: get56,
+  get: get55,
 }
 
 /**
  * Poll for trigger events and execute full workflow when event arrives
  *
  * Poll for trigger events and execute full workflow when event arrives
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post48 = oc
+export const post49 = oc
   .route({
-    description: 'Poll for trigger events and execute full workflow when event arrives',
+    deprecated: true,
+    description:
+      'Poll for trigger events and execute full workflow when event arrives\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdWorkflowsDraftTriggerRun',
@@ -3149,17 +3603,23 @@ export const post48 = oc
   .output(zPostAppsByAppIdWorkflowsDraftTriggerRunResponse)
 
 export const run11 = {
-  post: post48,
+  post: post49,
 }
 
 /**
  * Full workflow debug when the start node is a trigger
  *
  * Full workflow debug when the start node is a trigger
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post49 = oc
+export const post50 = oc
   .route({
-    description: 'Full workflow debug when the start node is a trigger',
+    deprecated: true,
+    description:
+      'Full workflow debug when the start node is a trigger\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdWorkflowsDraftTriggerRunAll',
@@ -3176,7 +3636,7 @@ export const post49 = oc
   .output(zPostAppsByAppIdWorkflowsDraftTriggerRunAllResponse)
 
 export const runAll = {
-  post: post49,
+  post: post50,
 }
 
 export const trigger2 = {
@@ -3186,10 +3646,16 @@ export const trigger2 = {
 
 /**
  * Reset a workflow variable to its default value
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const put4 = oc
   .route({
-    description: 'Reset a workflow variable to its default value',
+    deprecated: true,
+    description:
+      'Reset a workflow variable to its default value\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PUT',
     operationId: 'putAppsByAppIdWorkflowsDraftVariablesByVariableIdReset',
@@ -3221,10 +3687,16 @@ export const delete9 = oc
 
 /**
  * Get a specific workflow variable
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get57 = oc
+export const get56 = oc
   .route({
-    description: 'Get a specific workflow variable',
+    deprecated: true,
+    description:
+      'Get a specific workflow variable\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdWorkflowsDraftVariablesByVariableId',
@@ -3236,10 +3708,16 @@ export const get57 = oc
 
 /**
  * Update a workflow variable
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const patch2 = oc
   .route({
-    description: 'Update a workflow variable',
+    deprecated: true,
+    description:
+      'Update a workflow variable\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchAppsByAppIdWorkflowsDraftVariablesByVariableId',
@@ -3256,7 +3734,7 @@ export const patch2 = oc
 
 export const byVariableId = {
   delete: delete9,
-  get: get57,
+  get: get56,
   patch: patch2,
   reset,
 }
@@ -3281,10 +3759,16 @@ export const delete10 = oc
  * Get draft workflow
  *
  * Get draft workflow variables
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get58 = oc
+export const get57 = oc
   .route({
-    description: 'Get draft workflow variables',
+    deprecated: true,
+    description:
+      'Get draft workflow variables\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdWorkflowsDraftVariables',
@@ -3302,7 +3786,7 @@ export const get58 = oc
 
 export const variables2 = {
   delete: delete10,
-  get: get58,
+  get: get57,
   byVariableId,
 }
 
@@ -3310,10 +3794,16 @@ export const variables2 = {
  * Get draft workflow
  *
  * Get draft workflow for an application
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get59 = oc
+export const get58 = oc
   .route({
-    description: 'Get draft workflow for an application',
+    deprecated: true,
+    description:
+      'Get draft workflow for an application\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdWorkflowsDraft',
@@ -3328,10 +3818,16 @@ export const get59 = oc
  * Sync draft workflow
  *
  * Sync draft workflow configuration
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post50 = oc
+export const post51 = oc
   .route({
-    description: 'Sync draft workflow configuration',
+    deprecated: true,
+    description:
+      'Sync draft workflow configuration\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdWorkflowsDraft',
@@ -3348,8 +3844,8 @@ export const post50 = oc
   .output(zPostAppsByAppIdWorkflowsDraftResponse)
 
 export const draft2 = {
-  get: get59,
-  post: post50,
+  get: get58,
+  post: post51,
   conversationVariables: conversationVariables2,
   environmentVariables,
   features,
@@ -3367,10 +3863,16 @@ export const draft2 = {
  * Get published workflow
  *
  * Get published workflow for an application
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get60 = oc
+export const get59 = oc
   .route({
-    description: 'Get published workflow for an application',
+    deprecated: true,
+    description:
+      'Get published workflow for an application\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdWorkflowsPublish',
@@ -3383,9 +3885,16 @@ export const get60 = oc
 
 /**
  * Publish workflow
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post51 = oc
+export const post52 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdWorkflowsPublish',
@@ -3402,15 +3911,22 @@ export const post51 = oc
   .output(zPostAppsByAppIdWorkflowsPublishResponse)
 
 export const publish = {
-  get: get60,
-  post: post51,
+  get: get59,
+  post: post52,
 }
 
 /**
  * Get webhook trigger for a node
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get61 = oc
+export const get60 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdWorkflowsTriggersWebhook',
@@ -3427,7 +3943,7 @@ export const get61 = oc
   .output(zGetAppsByAppIdWorkflowsTriggersWebhookResponse)
 
 export const webhook = {
-  get: get61,
+  get: get60,
 }
 
 export const triggers2 = {
@@ -3436,10 +3952,16 @@ export const triggers2 = {
 
 /**
  * Restore a published workflow version into the draft workflow
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post52 = oc
+export const post53 = oc
   .route({
-    description: 'Restore a published workflow version into the draft workflow',
+    deprecated: true,
+    description:
+      'Restore a published workflow version into the draft workflow\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsByAppIdWorkflowsByWorkflowIdRestore',
@@ -3450,14 +3972,21 @@ export const post52 = oc
   .output(zPostAppsByAppIdWorkflowsByWorkflowIdRestoreResponse)
 
 export const restore = {
-  post: post52,
+  post: post53,
 }
 
 /**
  * Delete workflow
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const delete11 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId: 'deleteAppsByAppIdWorkflowsByWorkflowId',
@@ -3472,10 +4001,16 @@ export const delete11 = oc
  * Update workflow attributes
  *
  * Update workflow by ID
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const patch3 = oc
   .route({
-    description: 'Update workflow by ID',
+    deprecated: true,
+    description:
+      'Update workflow by ID\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchAppsByAppIdWorkflowsByWorkflowId',
@@ -3501,10 +4036,16 @@ export const byWorkflowId = {
  * Get published workflows
  *
  * Get all published workflows for an application
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get62 = oc
+export const get61 = oc
   .route({
-    description: 'Get all published workflows for an application',
+    deprecated: true,
+    description:
+      'Get all published workflows for an application\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppIdWorkflows',
@@ -3521,7 +4062,7 @@ export const get62 = oc
   .output(zGetAppsByAppIdWorkflowsResponse)
 
 export const workflows3 = {
-  get: get62,
+  get: get61,
   defaultWorkflowBlockConfigs,
   draft: draft2,
   publish,
@@ -3552,10 +4093,16 @@ export const delete12 = oc
  * Get app detail
  *
  * Get application details
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get63 = oc
+export const get62 = oc
   .route({
-    description: 'Get application details',
+    deprecated: true,
+    description:
+      'Get application details\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByAppId',
@@ -3570,10 +4117,16 @@ export const get63 = oc
  * Update app
  *
  * Update application details
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const put5 = oc
   .route({
-    description: 'Update application details',
+    deprecated: true,
+    description:
+      'Update application details\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PUT',
     operationId: 'putAppsByAppId',
@@ -3586,7 +4139,7 @@ export const put5 = oc
 
 export const byAppId2 = {
   delete: delete12,
-  get: get63,
+  get: get62,
   put: put5,
   advancedChat,
   agent,
@@ -3654,7 +4207,7 @@ export const byApiKeyId = {
  *
  * Get all API keys for an app
  */
-export const get64 = oc
+export const get63 = oc
   .route({
     description: 'Get all API keys for an app',
     inputStructure: 'detailed',
@@ -3672,7 +4225,7 @@ export const get64 = oc
  *
  * Create a new API key for an app
  */
-export const post53 = oc
+export const post54 = oc
   .route({
     description: 'Create a new API key for an app',
     inputStructure: 'detailed',
@@ -3687,8 +4240,8 @@ export const post53 = oc
   .output(zPostAppsByResourceIdApiKeysResponse)
 
 export const apiKeys = {
-  get: get64,
-  post: post53,
+  get: get63,
+  post: post54,
   byApiKeyId,
 }
 
@@ -3698,10 +4251,16 @@ export const byResourceId = {
 
 /**
  * Refresh MCP server configuration and regenerate server code
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const get65 = oc
+export const get64 = oc
   .route({
-    description: 'Refresh MCP server configuration and regenerate server code',
+    deprecated: true,
+    description:
+      'Refresh MCP server configuration and regenerate server code\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsByServerIdServerRefresh',
@@ -3712,7 +4271,7 @@ export const get65 = oc
   .output(zGetAppsByServerIdServerRefreshResponse)
 
 export const refresh = {
-  get: get65,
+  get: get64,
 }
 
 export const server2 = {
@@ -3728,7 +4287,7 @@ export const byServerId = {
  *
  * Get list of applications with pagination and filtering
  */
-export const get66 = oc
+export const get65 = oc
   .route({
     description: 'Get list of applications with pagination and filtering',
     inputStructure: 'detailed',
@@ -3745,10 +4304,16 @@ export const get66 = oc
  * Create app
  *
  * Create a new application
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
-export const post54 = oc
+export const post55 = oc
   .route({
-    description: 'Create a new application',
+    deprecated: true,
+    description:
+      'Create a new application\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postApps',
@@ -3761,8 +4326,8 @@ export const post54 = oc
   .output(zPostAppsResponse)
 
 export const apps = {
-  get: get66,
-  post: post54,
+  get: get65,
+  post: post55,
   imports,
   workflows,
   byAppId: byAppId2,
diff --git a/packages/contracts/generated/api/console/apps/types.gen.ts b/packages/contracts/generated/api/console/apps/types.gen.ts
index fe4c10329e..a4e3c97a0a 100644
--- a/packages/contracts/generated/api/console/apps/types.gen.ts
+++ b/packages/contracts/generated/api/console/apps/types.gen.ts
@@ -17,7 +17,7 @@ export type CreateAppPayload = {
   icon?: string | null
   icon_background?: string | null
   icon_type?: IconType
-  mode: 'chat' | 'agent-chat' | 'advanced-chat' | 'workflow' | 'completion'
+  mode: 'advanced-chat' | 'agent-chat' | 'chat' | 'completion' | 'workflow'
   name: string
 }
 
@@ -68,6 +68,14 @@ export type CheckDependenciesResult = {
   leaked_dependencies?: Array<PluginDependency>
 }
 
+export type WorkflowOnlineUsersPayload = {
+  app_ids?: Array<string>
+}
+
+export type WorkflowOnlineUsersResponse = {
+  data: Array<WorkflowOnlineUsersByApp>
+}
+
 export type AppDetailWithSite = {
   access_mode?: string | null
   api_base_url?: string | null
@@ -104,12 +112,19 @@ export type UpdateAppPayload = {
   use_icon_as_answer_icon?: boolean | null
 }
 
-export type AdvancedChatWorkflowRunPagination = {
-  [key: string]: unknown
+export type AdvancedChatWorkflowRunPaginationResponse = {
+  data: Array<AdvancedChatWorkflowRunForListResponse>
+  has_more: boolean
+  limit: number
 }
 
-export type WorkflowRunCount = {
-  [key: string]: unknown
+export type WorkflowRunCountResponse = {
+  failed: number
+  partial_succeeded: number
+  running: number
+  stopped: number
+  succeeded: number
+  total: number
 }
 
 export type HumanInputFormPreviewPayload = {
@@ -309,7 +324,7 @@ export type AppExportResponse = {
 export type MessageFeedbackPayload = {
   content?: string | null
   message_id: string
-  rating?: 'like' | 'dislike' | null
+  rating?: 'dislike' | 'like' | null
 }
 
 export type AppIconPayload = {
@@ -415,7 +430,7 @@ export type AppSiteUpdatePayload = {
   copyright?: string | null
   custom_disclaimer?: string | null
   customize_domain?: string | null
-  customize_token_strategy?: 'must' | 'allow' | 'not_allow' | null
+  customize_token_strategy?: 'allow' | 'must' | 'not_allow' | null
   default_language?: string | null
   description?: string | null
   icon?: string | null
@@ -510,24 +525,43 @@ export type WorkflowArchivedLogPaginationResponse = {
   total: number
 }
 
-export type WorkflowRunPagination = {
-  [key: string]: unknown
+export type WorkflowRunPaginationResponse = {
+  data: Array<WorkflowRunForListResponse>
+  has_more: boolean
+  limit: number
 }
 
-export type WorkflowRunDetail = {
-  [key: string]: unknown
+export type WorkflowRunDetailResponse = {
+  created_at?: number | null
+  created_by_account?: SimpleAccount
+  created_by_end_user?: SimpleEndUser
+  created_by_role?: string | null
+  elapsed_time?: number | null
+  error?: string | null
+  exceptions_count?: number | null
+  finished_at?: number | null
+  graph: unknown
+  id: string
+  inputs: unknown
+  outputs: unknown
+  status?: string | null
+  total_steps?: number | null
+  total_tokens?: number | null
+  version?: string | null
 }
 
-export type WorkflowRunExport = {
-  [key: string]: unknown
+export type WorkflowRunExportResponse = {
+  presigned_url?: string | null
+  presigned_url_expires_at?: string | null
+  status: string
 }
 
-export type WorkflowRunNodeExecutionList = {
-  [key: string]: unknown
+export type WorkflowRunNodeExecutionListResponse = {
+  data: Array<WorkflowRunNodeExecutionResponse>
 }
 
-export type WorkflowCommentBasic = {
-  [key: string]: unknown
+export type WorkflowCommentBasicList = {
+  data: Array<WorkflowCommentBasic>
 }
 
 export type WorkflowCommentCreatePayload = {
@@ -538,7 +572,8 @@ export type WorkflowCommentCreatePayload = {
 }
 
 export type WorkflowCommentCreate = {
-  [key: string]: unknown
+  created_at?: number | null
+  id: string
 }
 
 export type WorkflowCommentMentionUsersPayload = {
@@ -546,7 +581,20 @@ export type WorkflowCommentMentionUsersPayload = {
 }
 
 export type WorkflowCommentDetail = {
-  [key: string]: unknown
+  content: string
+  created_at?: number | null
+  created_by: string
+  created_by_account?: WorkflowCommentAccount
+  id: string
+  mentions: Array<WorkflowCommentMention>
+  position_x: number
+  position_y: number
+  replies: Array<WorkflowCommentReply>
+  resolved: boolean
+  resolved_at?: number | null
+  resolved_by?: string | null
+  resolved_by_account?: WorkflowCommentAccount
+  updated_at?: number | null
 }
 
 export type WorkflowCommentUpdatePayload = {
@@ -557,7 +605,8 @@ export type WorkflowCommentUpdatePayload = {
 }
 
 export type WorkflowCommentUpdate = {
-  [key: string]: unknown
+  id: string
+  updated_at?: number | null
 }
 
 export type WorkflowCommentReplyPayload = {
@@ -566,23 +615,49 @@ export type WorkflowCommentReplyPayload = {
 }
 
 export type WorkflowCommentReplyCreate = {
-  [key: string]: unknown
+  created_at?: number | null
+  id: string
 }
 
 export type WorkflowCommentReplyUpdate = {
-  [key: string]: unknown
+  id: string
+  updated_at?: number | null
 }
 
 export type WorkflowCommentResolve = {
-  [key: string]: unknown
+  id: string
+  resolved: boolean
+  resolved_at?: number | null
+  resolved_by?: string | null
 }
 
-export type WorkflowPagination = {
-  [key: string]: unknown
+export type WorkflowPaginationResponse = {
+  has_more: boolean
+  items: Array<WorkflowResponse>
+  limit: number
+  page: number
 }
 
-export type Workflow = {
-  [key: string]: unknown
+export type WorkflowResponse = {
+  conversation_variables: Array<WorkflowConversationVariableResponse>
+  created_at: number
+  created_by?: SimpleAccount
+  environment_variables: Array<WorkflowEnvironmentVariableResponse>
+  features: {
+    [key: string]: unknown
+  }
+  graph: {
+    [key: string]: unknown
+  }
+  hash: string
+  id: string
+  marked_comment: string
+  marked_name: string
+  rag_pipeline_variables: Array<PipelineVariableResponse>
+  tool_published: boolean
+  updated_at: number
+  updated_by?: SimpleAccount
+  version: string
 }
 
 export type SyncDraftWorkflowPayload = {
@@ -602,11 +677,13 @@ export type SyncDraftWorkflowPayload = {
 }
 
 export type SyncDraftWorkflowResponse = {
-  [key: string]: unknown
+  hash?: string
+  result?: string
+  updated_at?: string
 }
 
 export type WorkflowDraftVariableList = {
-  [key: string]: unknown
+  items?: Array<WorkflowDraftVariable>
 }
 
 export type ConversationVariableUpdatePayload = {
@@ -634,8 +711,29 @@ export type HumanInputDeliveryTestPayload = {
   }
 }
 
-export type WorkflowRunNodeExecution = {
-  [key: string]: unknown
+export type WorkflowRunNodeExecutionResponse = {
+  created_at?: number | null
+  created_by_account?: SimpleAccount
+  created_by_end_user?: SimpleEndUser
+  created_by_role?: string | null
+  elapsed_time?: number | null
+  error?: string | null
+  execution_metadata?: unknown
+  extras?: unknown
+  finished_at?: number | null
+  id: string
+  index?: number | null
+  inputs?: unknown
+  inputs_truncated?: boolean | null
+  node_id?: string | null
+  node_type?: string | null
+  outputs?: unknown
+  outputs_truncated?: boolean | null
+  predecessor_node_id?: string | null
+  process_data?: unknown
+  process_data_truncated?: boolean | null
+  status?: string | null
+  title?: string | null
 }
 
 export type DraftWorkflowNodeRunPayload = {
@@ -660,7 +758,7 @@ export type DraftWorkflowRunPayload = {
 }
 
 export type DraftWorkflowTriggerRunRequest = {
-  [key: string]: unknown
+  node_id: string
 }
 
 export type DraftWorkflowTriggerRunAllPayload = {
@@ -668,11 +766,28 @@ export type DraftWorkflowTriggerRunAllPayload = {
 }
 
 export type WorkflowDraftVariableListWithoutValue = {
-  [key: string]: unknown
+  items?: Array<WorkflowDraftVariableWithoutValue>
+  total?: {
+    [key: string]: unknown
+  }
 }
 
 export type WorkflowDraftVariable = {
-  [key: string]: unknown
+  description?: string
+  edited?: boolean
+  full_content?: {
+    [key: string]: unknown
+  }
+  id?: string
+  is_truncated?: boolean
+  name?: string
+  selector?: Array<string>
+  type?: string
+  value?: {
+    [key: string]: unknown
+  }
+  value_type?: string
+  visible?: boolean
 }
 
 export type WorkflowDraftVariableUpdatePayload = {
@@ -734,33 +849,15 @@ export type AppPartial = {
   workflow?: WorkflowPartial
 }
 
-export type IconType = 'image' | 'emoji' | 'link'
+export type IconType = 'emoji' | 'image' | 'link'
 
 export type ModelConfig = {
-  agent_mode_dict?: JsonValue
-  annotation_reply_dict?: JsonValue
-  chat_prompt_config_dict?: JsonValue
-  completion_prompt_config_dict?: JsonValue
-  created_at?: number | null
-  created_by?: string | null
-  dataset_configs_dict?: JsonValue
-  dataset_query_variable?: string | null
-  external_data_tools_list?: JsonValue
-  file_upload_dict?: JsonValue
-  model_dict?: JsonValue
-  more_like_this_dict?: JsonValue
-  opening_statement?: string | null
-  pre_prompt?: string | null
-  prompt_type?: string | null
-  retriever_resource_dict?: JsonValue
-  sensitive_word_avoidance_dict?: JsonValue
-  speech_to_text_dict?: JsonValue
-  suggested_questions_after_answer_dict?: JsonValue
-  suggested_questions_list?: JsonValue
-  text_to_speech_dict?: JsonValue
-  updated_at?: number | null
-  updated_by?: string | null
-  user_input_form_list?: JsonValue
+  completion_params?: {
+    [key: string]: unknown
+  }
+  mode: LlmMode
+  name: string
+  provider: string
 }
 
 export type Tag = {
@@ -779,7 +876,7 @@ export type WorkflowPartial = {
   updated_by?: string | null
 }
 
-export type ImportStatus = 'completed' | 'completed-with-warnings' | 'pending' | 'failed'
+export type ImportStatus = 'completed' | 'completed-with-warnings' | 'failed' | 'pending'
 
 export type PluginDependency = {
   current_identifier?: string | null
@@ -787,6 +884,11 @@ export type PluginDependency = {
   value: unknown
 }
 
+export type WorkflowOnlineUsersByApp = {
+  app_id: string
+  users: Array<WorkflowOnlineUser>
+}
+
 export type DeletedTool = {
   provider_id: string
   tool_name: string
@@ -818,6 +920,22 @@ export type Site = {
   use_icon_as_answer_icon?: boolean | null
 }
 
+export type AdvancedChatWorkflowRunForListResponse = {
+  conversation_id?: string | null
+  created_at?: number | null
+  created_by_account?: SimpleAccount
+  elapsed_time?: number | null
+  exceptions_count?: number | null
+  finished_at?: number | null
+  id: string
+  message_id?: string | null
+  retry_index?: number | null
+  status?: string | null
+  total_steps?: number | null
+  total_tokens?: number | null
+  version?: string | null
+}
+
 export type AnnotationHitHistory = {
   annotation_content?: string | null
   annotation_question?: string | null
@@ -967,7 +1085,7 @@ export type MessageFile = {
   url?: string | null
 }
 
-export type AppMcpServerStatus = 'normal' | 'active' | 'inactive'
+export type AppMcpServerStatus = 'active' | 'inactive' | 'normal'
 
 export type WorkflowAppLogPartialResponse = {
   created_at?: number | null
@@ -989,6 +1107,51 @@ export type WorkflowArchivedLogPartialResponse = {
   workflow_run?: WorkflowRunForArchivedLogResponse
 }
 
+export type WorkflowRunForListResponse = {
+  created_at?: number | null
+  created_by_account?: SimpleAccount
+  elapsed_time?: number | null
+  exceptions_count?: number | null
+  finished_at?: number | null
+  id: string
+  retry_index?: number | null
+  status?: string | null
+  total_steps?: number | null
+  total_tokens?: number | null
+  version?: string | null
+}
+
+export type SimpleAccount = {
+  email: string
+  id: string
+  name: string
+}
+
+export type SimpleEndUser = {
+  id: string
+  is_anonymous: boolean
+  session_id?: string | null
+  type: string
+}
+
+export type WorkflowCommentBasic = {
+  content: string
+  created_at?: number | null
+  created_by: string
+  created_by_account?: WorkflowCommentAccount
+  id: string
+  mention_count: number
+  participants: Array<WorkflowCommentAccount>
+  position_x: number
+  position_y: number
+  reply_count: number
+  resolved: boolean
+  resolved_at?: number | null
+  resolved_by?: string | null
+  resolved_by_account?: WorkflowCommentAccount
+  updated_at?: number | null
+}
+
 export type AccountWithRole = {
   avatar?: string | null
   created_at?: number | null
@@ -1001,6 +1164,78 @@ export type AccountWithRole = {
   status: string
 }
 
+export type WorkflowCommentAccount = {
+  readonly avatar_url: string | null
+  email: string
+  id: string
+  name: string
+}
+
+export type WorkflowCommentMention = {
+  mentioned_user_account?: WorkflowCommentAccount
+  mentioned_user_id: string
+  reply_id?: string | null
+}
+
+export type WorkflowCommentReply = {
+  content: string
+  created_at?: number | null
+  created_by: string
+  created_by_account?: WorkflowCommentAccount
+  id: string
+}
+
+export type WorkflowConversationVariableResponse = {
+  description: string
+  id: string
+  name: string
+  value: {
+    [key: string]: unknown
+  }
+  value_type: string
+}
+
+export type WorkflowEnvironmentVariableResponse = {
+  description: string
+  id: string
+  name: string
+  value: {
+    [key: string]: unknown
+  }
+  value_type: string
+}
+
+export type PipelineVariableResponse = {
+  allowed_file_extensions?: Array<string> | null
+  allowed_file_types?: Array<string> | null
+  allowed_file_upload_methods?: Array<string> | null
+  belong_to_node_id: string
+  default_value?: {
+    [key: string]: unknown
+  }
+  label: string
+  max_length?: number | null
+  options?: Array<string> | null
+  placeholder?: string | null
+  required: boolean
+  tooltips?: string | null
+  type: string
+  unit?: string | null
+  variable: string
+}
+
+export type WorkflowDraftVariableWithoutValue = {
+  description?: string
+  edited?: boolean
+  id?: string
+  is_truncated?: boolean
+  name?: string
+  selector?: Array<string>
+  type?: string
+  value_type?: string
+  visible?: boolean
+}
+
 export type ModelConfigPartial = {
   created_at?: number | null
   created_by?: string | null
@@ -1010,6 +1245,8 @@ export type ModelConfigPartial = {
   updated_by?: string | null
 }
 
+export type LlmMode = 'chat' | 'completion'
+
 export type Type = 'github' | 'marketplace' | 'package'
 
 export type Github = {
@@ -1029,6 +1266,12 @@ export type Package = {
   version?: string | null
 }
 
+export type WorkflowOnlineUser = {
+  avatar?: string | null
+  user_id: string
+  username: string
+}
+
 export type SimpleModelConfig = {
   model_dict?: JsonValue
   pre_prompt?: string | null
@@ -1050,20 +1293,14 @@ export type SimpleMessageDetail = {
   query: string
 }
 
-export type SimpleAccount = {
-  email: string
-  id: string
-  name: string
-}
-
 export type HumanInputFormDefinition = {
-  actions?: Array<UserAction>
+  actions?: Array<UserActionConfig>
   display_in_ui?: boolean
   expiration_time: number
   form_content: string
   form_id: string
   form_token?: string | null
-  inputs?: Array<FormInput>
+  inputs?: Array<FormInputConfig>
   node_id: string
   node_title: string
   resolved_default_values?: {
@@ -1081,13 +1318,6 @@ export type HumanInputFormSubmissionData = {
 
 export type ExecutionContentType = 'human_input'
 
-export type SimpleEndUser = {
-  id: string
-  is_anonymous: boolean
-  session_id?: string | null
-  type: string
-}
-
 export type WorkflowRunForLogResponse = {
   created_at?: number | null
   elapsed_time?: number | null
@@ -1110,29 +1340,121 @@ export type WorkflowRunForArchivedLogResponse = {
   triggered_from?: string | null
 }
 
-export type UserAction = {
+export type UserActionConfig = {
   button_style?: ButtonStyle
   id: string
   title: string
 }
 
-export type FormInput = {
-  default?: FormInputDefault
+export type FormInputConfig = unknown
+
+export type ButtonStyle = 'accent' | 'default' | 'ghost' | 'primary'
+
+export type ParagraphInputConfig = {
+  default?: StringSource
   output_variable_name: string
-  type: FormInputType
+  type?: string
 }
 
-export type ButtonStyle = 'primary' | 'default' | 'accent' | 'ghost'
+export type SelectInputConfig = {
+  option_source: StringListSource
+  output_variable_name: string
+  type?: string
+}
 
-export type FormInputDefault = {
+export type FileInputConfig = {
+  allowed_file_extensions?: Array<string>
+  allowed_file_types?: Array<FileType>
+  allowed_file_upload_methods?: Array<FileTransferMethod>
+  output_variable_name: string
+  type?: string
+}
+
+export type FileListInputConfig = {
+  allowed_file_extensions?: Array<string>
+  allowed_file_types?: Array<FileType>
+  allowed_file_upload_methods?: Array<FileTransferMethod>
+  number_limits?: number
+  output_variable_name: string
+  type?: string
+}
+
+export type StringSource = {
   selector?: Array<string>
-  type: PlaceholderType
+  type: ValueSourceType
   value?: string
 }
 
-export type FormInputType = 'text_input' | 'paragraph'
+export type StringListSource = {
+  selector?: Array<string>
+  type: ValueSourceType
+  value?: Array<string>
+}
 
-export type PlaceholderType = 'variable' | 'constant'
+export type FileType = 'audio' | 'custom' | 'document' | 'image' | 'video'
+
+export type FileTransferMethod = 'datasource_file' | 'local_file' | 'remote_url' | 'tool_file'
+
+export type ValueSourceType = 'constant' | 'variable'
+
+export type WorkflowCommentBasicListWritable = {
+  data: Array<WorkflowCommentBasicWritable>
+}
+
+export type WorkflowCommentDetailWritable = {
+  content: string
+  created_at?: number | null
+  created_by: string
+  created_by_account?: WorkflowCommentAccountWritable
+  id: string
+  mentions: Array<WorkflowCommentMentionWritable>
+  position_x: number
+  position_y: number
+  replies: Array<WorkflowCommentReplyWritable>
+  resolved: boolean
+  resolved_at?: number | null
+  resolved_by?: string | null
+  resolved_by_account?: WorkflowCommentAccountWritable
+  updated_at?: number | null
+}
+
+export type WorkflowCommentBasicWritable = {
+  content: string
+  created_at?: number | null
+  created_by: string
+  created_by_account?: WorkflowCommentAccountWritable
+  id: string
+  mention_count: number
+  participants: Array<WorkflowCommentAccountWritable>
+  position_x: number
+  position_y: number
+  reply_count: number
+  resolved: boolean
+  resolved_at?: number | null
+  resolved_by?: string | null
+  resolved_by_account?: WorkflowCommentAccountWritable
+  updated_at?: number | null
+}
+
+export type WorkflowCommentAccountWritable = {
+  email: string
+  id: string
+  name: string
+}
+
+export type WorkflowCommentMentionWritable = {
+  mentioned_user_account?: WorkflowCommentAccountWritable
+  mentioned_user_id: string
+  reply_id?: string | null
+}
+
+export type WorkflowCommentReplyWritable = {
+  content: string
+  created_at?: number | null
+  created_by: string
+  created_by_account?: WorkflowCommentAccountWritable
+  id: string
+}
 
 export type GetAppsData = {
   body?: never
@@ -1140,7 +1462,7 @@ export type GetAppsData = {
   query?: {
     is_created_by_me?: boolean | null
     limit?: number
-    mode?: 'completion' | 'chat' | 'advanced-chat' | 'workflow' | 'agent-chat' | 'channel' | 'all'
+    mode?: 'advanced-chat' | 'agent-chat' | 'all' | 'channel' | 'chat' | 'completion' | 'workflow'
     name?: string | null
     page?: number
     tag_ids?: Array<string> | null
@@ -1237,23 +1559,19 @@ export type PostAppsImportsByImportIdConfirmResponses = {
 export type PostAppsImportsByImportIdConfirmResponse
   = PostAppsImportsByImportIdConfirmResponses[keyof PostAppsImportsByImportIdConfirmResponses]
 
-export type GetAppsWorkflowsOnlineUsersData = {
-  body?: never
+export type PostAppsWorkflowsOnlineUsersData = {
+  body: WorkflowOnlineUsersPayload
   path?: never
-  query: {
-    app_ids: string
-  }
+  query?: never
   url: '/apps/workflows/online-users'
 }
 
-export type GetAppsWorkflowsOnlineUsersResponses = {
-  200: {
-    [key: string]: unknown
-  }
+export type PostAppsWorkflowsOnlineUsersResponses = {
+  200: WorkflowOnlineUsersResponse
 }
 
-export type GetAppsWorkflowsOnlineUsersResponse
-  = GetAppsWorkflowsOnlineUsersResponses[keyof GetAppsWorkflowsOnlineUsersResponses]
+export type PostAppsWorkflowsOnlineUsersResponse
+  = PostAppsWorkflowsOnlineUsersResponses[keyof PostAppsWorkflowsOnlineUsersResponses]
 
 export type DeleteAppsByAppIdData = {
   body?: never
@@ -1274,7 +1592,7 @@ export type DeleteAppsByAppIdError = DeleteAppsByAppIdErrors[keyof DeleteAppsByA
 
 export type DeleteAppsByAppIdResponses = {
   204: {
-    [key: string]: unknown
+    [key: string]: never
   }
 }
 
@@ -1327,16 +1645,16 @@ export type GetAppsByAppIdAdvancedChatWorkflowRunsData = {
     app_id: string
   }
   query?: {
-    triggered_from?: 'debugging' | 'app-run' | null
-    status?: 'running' | 'succeeded' | 'failed' | 'stopped' | 'partial-succeeded' | null
-    last_id?: string | null
+    last_id?: string
     limit?: number
+    status?: 'failed' | 'partial-succeeded' | 'running' | 'stopped' | 'succeeded'
+    triggered_from?: 'app-run' | 'debugging'
   }
   url: '/apps/{app_id}/advanced-chat/workflow-runs'
 }
 
 export type GetAppsByAppIdAdvancedChatWorkflowRunsResponses = {
-  200: AdvancedChatWorkflowRunPagination
+  200: AdvancedChatWorkflowRunPaginationResponse
 }
 
 export type GetAppsByAppIdAdvancedChatWorkflowRunsResponse
@@ -1348,15 +1666,15 @@ export type GetAppsByAppIdAdvancedChatWorkflowRunsCountData = {
     app_id: string
   }
   query?: {
-    triggered_from?: 'debugging' | 'app-run' | null
-    time_range?: string | null
-    status?: 'running' | 'succeeded' | 'failed' | 'stopped' | 'partial-succeeded' | null
+    status?: 'failed' | 'partial-succeeded' | 'running' | 'stopped' | 'succeeded'
+    time_range?: string
+    triggered_from?: 'app-run' | 'debugging'
   }
   url: '/apps/{app_id}/advanced-chat/workflow-runs/count'
 }
 
 export type GetAppsByAppIdAdvancedChatWorkflowRunsCountResponses = {
-  200: WorkflowRunCount
+  200: WorkflowRunCountResponse
 }
 
 export type GetAppsByAppIdAdvancedChatWorkflowRunsCountResponse
@@ -1525,8 +1843,8 @@ export type GetAppsByAppIdAgentLogsResponse
 export type PostAppsByAppIdAnnotationReplyByActionData = {
   body: AnnotationReplyPayload
   path: {
-    app_id: string
     action: string
+    app_id: string
   }
   query?: never
   url: '/apps/{app_id}/annotation-reply/{action}'
@@ -1553,8 +1871,8 @@ export type PostAppsByAppIdAnnotationReplyByActionResponse
 export type GetAppsByAppIdAnnotationReplyByActionStatusByJobIdData = {
   body?: never
   path: {
-    app_id: string
     action: string
+    app_id: string
     job_id: string
   }
   query?: never
@@ -1609,8 +1927,8 @@ export type GetAppsByAppIdAnnotationSettingResponse
 export type PostAppsByAppIdAnnotationSettingsByAnnotationSettingIdData = {
   body: AnnotationSettingUpdatePayload
   path: {
-    app_id: string
     annotation_setting_id: string
+    app_id: string
   }
   query?: never
   url: '/apps/{app_id}/annotation-settings/{annotation_setting_id}'
@@ -1835,8 +2153,8 @@ export type DeleteAppsByAppIdAnnotationsByAnnotationIdResponse
 export type PostAppsByAppIdAnnotationsByAnnotationIdData = {
   body: UpdateAnnotationPayload
   path: {
-    app_id: string
     annotation_id: string
+    app_id: string
   }
   query?: never
   url: '/apps/{app_id}/annotations/{annotation_id}'
@@ -1854,7 +2172,7 @@ export type PostAppsByAppIdAnnotationsByAnnotationIdError
 export type PostAppsByAppIdAnnotationsByAnnotationIdResponses = {
   200: Annotation
   204: {
-    [key: string]: unknown
+    [key: string]: never
   }
 }
 
@@ -1864,12 +2182,12 @@ export type PostAppsByAppIdAnnotationsByAnnotationIdResponse
 export type GetAppsByAppIdAnnotationsByAnnotationIdHitHistoriesData = {
   body?: never
   path: {
-    app_id: string
     annotation_id: string
+    app_id: string
   }
   query?: {
-    page?: number
     limit?: number
+    page?: number
   }
   url: '/apps/{app_id}/annotations/{annotation_id}/hit-histories'
 }
@@ -1949,12 +2267,12 @@ export type GetAppsByAppIdChatConversationsData = {
     app_id: string
   }
   query?: {
-    annotation_status?: 'annotated' | 'not_annotated' | 'all'
+    annotation_status?: 'all' | 'annotated' | 'not_annotated'
     end?: string | null
     keyword?: string | null
     limit?: number
     page?: number
-    sort_by?: 'created_at' | '-created_at' | 'updated_at' | '-updated_at'
+    sort_by?: '-created_at' | '-updated_at' | 'created_at' | 'updated_at'
     start?: string | null
   }
   url: '/apps/{app_id}/chat-conversations'
@@ -2000,7 +2318,7 @@ export type DeleteAppsByAppIdChatConversationsByConversationIdError
 
 export type DeleteAppsByAppIdChatConversationsByConversationIdResponses = {
   204: {
-    [key: string]: unknown
+    [key: string]: never
   }
 }
 
@@ -2116,7 +2434,7 @@ export type GetAppsByAppIdCompletionConversationsData = {
     app_id: string
   }
   query?: {
-    annotation_status?: 'annotated' | 'not_annotated' | 'all'
+    annotation_status?: 'all' | 'annotated' | 'not_annotated'
     end?: string | null
     keyword?: string | null
     limit?: number
@@ -2166,7 +2484,7 @@ export type DeleteAppsByAppIdCompletionConversationsByConversationIdError
 
 export type DeleteAppsByAppIdCompletionConversationsByConversationIdResponses = {
   204: {
-    [key: string]: unknown
+    [key: string]: never
   }
 }
 
@@ -2388,9 +2706,9 @@ export type GetAppsByAppIdFeedbacksExportData = {
   query?: {
     end_date?: string | null
     format?: 'csv' | 'json'
-    from_source?: 'user' | 'admin' | null
+    from_source?: 'admin' | 'user' | null
     has_comment?: boolean | null
-    rating?: 'like' | 'dislike' | null
+    rating?: 'dislike' | 'like' | null
     start_date?: string | null
   }
   url: '/apps/{app_id}/feedbacks/export'
@@ -2969,7 +3287,7 @@ export type DeleteAppsByAppIdTraceConfigError
 
 export type DeleteAppsByAppIdTraceConfigResponses = {
   204: {
-    [key: string]: unknown
+    [key: string]: never
   }
 }
 
@@ -3149,16 +3467,16 @@ export type GetAppsByAppIdWorkflowRunsData = {
     app_id: string
   }
   query?: {
-    triggered_from?: 'debugging' | 'app-run' | null
-    status?: 'running' | 'succeeded' | 'failed' | 'stopped' | 'partial-succeeded' | null
-    last_id?: string | null
+    last_id?: string
     limit?: number
+    status?: 'failed' | 'partial-succeeded' | 'running' | 'stopped' | 'succeeded'
+    triggered_from?: 'app-run' | 'debugging'
   }
   url: '/apps/{app_id}/workflow-runs'
 }
 
 export type GetAppsByAppIdWorkflowRunsResponses = {
-  200: WorkflowRunPagination
+  200: WorkflowRunPaginationResponse
 }
 
 export type GetAppsByAppIdWorkflowRunsResponse
@@ -3170,15 +3488,15 @@ export type GetAppsByAppIdWorkflowRunsCountData = {
     app_id: string
   }
   query?: {
-    triggered_from?: 'debugging' | 'app-run' | null
-    time_range?: string | null
-    status?: 'running' | 'succeeded' | 'failed' | 'stopped' | 'partial-succeeded' | null
+    status?: 'failed' | 'partial-succeeded' | 'running' | 'stopped' | 'succeeded'
+    time_range?: string
+    triggered_from?: 'app-run' | 'debugging'
   }
   url: '/apps/{app_id}/workflow-runs/count'
 }
 
 export type GetAppsByAppIdWorkflowRunsCountResponses = {
-  200: WorkflowRunCount
+  200: WorkflowRunCountResponse
 }
 
 export type GetAppsByAppIdWorkflowRunsCountResponse
@@ -3235,7 +3553,7 @@ export type GetAppsByAppIdWorkflowRunsByRunIdError
   = GetAppsByAppIdWorkflowRunsByRunIdErrors[keyof GetAppsByAppIdWorkflowRunsByRunIdErrors]
 
 export type GetAppsByAppIdWorkflowRunsByRunIdResponses = {
-  200: WorkflowRunDetail
+  200: WorkflowRunDetailResponse
 }
 
 export type GetAppsByAppIdWorkflowRunsByRunIdResponse
@@ -3252,7 +3570,7 @@ export type GetAppsByAppIdWorkflowRunsByRunIdExportData = {
 }
 
 export type GetAppsByAppIdWorkflowRunsByRunIdExportResponses = {
-  200: WorkflowRunExport
+  200: WorkflowRunExportResponse
 }
 
 export type GetAppsByAppIdWorkflowRunsByRunIdExportResponse
@@ -3278,7 +3596,7 @@ export type GetAppsByAppIdWorkflowRunsByRunIdNodeExecutionsError
   = GetAppsByAppIdWorkflowRunsByRunIdNodeExecutionsErrors[keyof GetAppsByAppIdWorkflowRunsByRunIdNodeExecutionsErrors]
 
 export type GetAppsByAppIdWorkflowRunsByRunIdNodeExecutionsResponses = {
-  200: WorkflowRunNodeExecutionList
+  200: WorkflowRunNodeExecutionListResponse
 }
 
 export type GetAppsByAppIdWorkflowRunsByRunIdNodeExecutionsResponse
@@ -3294,7 +3612,7 @@ export type GetAppsByAppIdWorkflowCommentsData = {
 }
 
 export type GetAppsByAppIdWorkflowCommentsResponses = {
-  200: WorkflowCommentBasic
+  200: WorkflowCommentBasicList
 }
 
 export type GetAppsByAppIdWorkflowCommentsResponse
@@ -3344,7 +3662,7 @@ export type DeleteAppsByAppIdWorkflowCommentsByCommentIdData = {
 
 export type DeleteAppsByAppIdWorkflowCommentsByCommentIdResponses = {
   204: {
-    [key: string]: unknown
+    [key: string]: never
   }
 }
 
@@ -3415,7 +3733,7 @@ export type DeleteAppsByAppIdWorkflowCommentsByCommentIdRepliesByReplyIdData = {
 
 export type DeleteAppsByAppIdWorkflowCommentsByCommentIdRepliesByReplyIdResponses = {
   204: {
-    [key: string]: unknown
+    [key: string]: never
   }
 }
 
@@ -3556,7 +3874,7 @@ export type GetAppsByAppIdWorkflowsData = {
 }
 
 export type GetAppsByAppIdWorkflowsResponses = {
-  200: WorkflowPagination
+  200: WorkflowPaginationResponse
 }
 
 export type GetAppsByAppIdWorkflowsResponse
@@ -3629,7 +3947,7 @@ export type GetAppsByAppIdWorkflowsDraftError
   = GetAppsByAppIdWorkflowsDraftErrors[keyof GetAppsByAppIdWorkflowsDraftErrors]
 
 export type GetAppsByAppIdWorkflowsDraftResponses = {
-  200: Workflow
+  200: WorkflowResponse
 }
 
 export type GetAppsByAppIdWorkflowsDraftResponse
@@ -3911,7 +4229,7 @@ export type GetAppsByAppIdWorkflowsDraftNodesByNodeIdLastRunError
   = GetAppsByAppIdWorkflowsDraftNodesByNodeIdLastRunErrors[keyof GetAppsByAppIdWorkflowsDraftNodesByNodeIdLastRunErrors]
 
 export type GetAppsByAppIdWorkflowsDraftNodesByNodeIdLastRunResponses = {
-  200: WorkflowRunNodeExecution
+  200: WorkflowRunNodeExecutionResponse
 }
 
 export type GetAppsByAppIdWorkflowsDraftNodesByNodeIdLastRunResponse
@@ -3940,7 +4258,7 @@ export type PostAppsByAppIdWorkflowsDraftNodesByNodeIdRunError
   = PostAppsByAppIdWorkflowsDraftNodesByNodeIdRunErrors[keyof PostAppsByAppIdWorkflowsDraftNodesByNodeIdRunErrors]
 
 export type PostAppsByAppIdWorkflowsDraftNodesByNodeIdRunResponses = {
-  200: WorkflowRunNodeExecution
+  200: WorkflowRunNodeExecutionResponse
 }
 
 export type PostAppsByAppIdWorkflowsDraftNodesByNodeIdRunResponse
@@ -3980,8 +4298,8 @@ export type PostAppsByAppIdWorkflowsDraftNodesByNodeIdTriggerRunResponse
 export type DeleteAppsByAppIdWorkflowsDraftNodesByNodeIdVariablesData = {
   body?: never
   path: {
-    node_id: string
     app_id: string
+    node_id: string
   }
   query?: never
   url: '/apps/{app_id}/workflows/draft/nodes/{node_id}/variables'
@@ -3989,7 +4307,7 @@ export type DeleteAppsByAppIdWorkflowsDraftNodesByNodeIdVariablesData = {
 
 export type DeleteAppsByAppIdWorkflowsDraftNodesByNodeIdVariablesResponses = {
   204: {
-    [key: string]: unknown
+    [key: string]: never
   }
 }
 
@@ -4127,7 +4445,7 @@ export type DeleteAppsByAppIdWorkflowsDraftVariablesData = {
 
 export type DeleteAppsByAppIdWorkflowsDraftVariablesResponses = {
   204: {
-    [key: string]: unknown
+    [key: string]: never
   }
 }
 
@@ -4140,8 +4458,8 @@ export type GetAppsByAppIdWorkflowsDraftVariablesData = {
     app_id: string
   }
   query?: {
-    page?: number
     limit?: number
+    page?: number
   }
   url: '/apps/{app_id}/workflows/draft/variables'
 }
@@ -4174,7 +4492,7 @@ export type DeleteAppsByAppIdWorkflowsDraftVariablesByVariableIdError
 
 export type DeleteAppsByAppIdWorkflowsDraftVariablesByVariableIdResponses = {
   204: {
-    [key: string]: unknown
+    [key: string]: never
   }
 }
 
@@ -4255,7 +4573,7 @@ export type PutAppsByAppIdWorkflowsDraftVariablesByVariableIdResetError
 export type PutAppsByAppIdWorkflowsDraftVariablesByVariableIdResetResponses = {
   200: WorkflowDraftVariable
   204: {
-    [key: string]: unknown
+    [key: string]: never
   }
 }
 
@@ -4271,17 +4589,8 @@ export type GetAppsByAppIdWorkflowsPublishData = {
   url: '/apps/{app_id}/workflows/publish'
 }
 
-export type GetAppsByAppIdWorkflowsPublishErrors = {
-  404: {
-    [key: string]: unknown
-  }
-}
-
-export type GetAppsByAppIdWorkflowsPublishError
-  = GetAppsByAppIdWorkflowsPublishErrors[keyof GetAppsByAppIdWorkflowsPublishErrors]
-
 export type GetAppsByAppIdWorkflowsPublishResponses = {
-  200: Workflow
+  200: WorkflowResponse
 }
 
 export type GetAppsByAppIdWorkflowsPublishResponse
@@ -4328,8 +4637,8 @@ export type GetAppsByAppIdWorkflowsTriggersWebhookResponse
 export type DeleteAppsByAppIdWorkflowsByWorkflowIdData = {
   body?: never
   path: {
-    workflow_id: string
     app_id: string
+    workflow_id: string
   }
   query?: never
   url: '/apps/{app_id}/workflows/{workflow_id}'
@@ -4367,7 +4676,7 @@ export type PatchAppsByAppIdWorkflowsByWorkflowIdError
   = PatchAppsByAppIdWorkflowsByWorkflowIdErrors[keyof PatchAppsByAppIdWorkflowsByWorkflowIdErrors]
 
 export type PatchAppsByAppIdWorkflowsByWorkflowIdResponses = {
-  200: Workflow
+  200: WorkflowResponse
 }
 
 export type PatchAppsByAppIdWorkflowsByWorkflowIdResponse
@@ -4448,8 +4757,8 @@ export type PostAppsByResourceIdApiKeysResponse
 export type DeleteAppsByResourceIdApiKeysByApiKeyIdData = {
   body?: never
   path: {
-    resource_id: string
     api_key_id: string
+    resource_id: string
   }
   query?: never
   url: '/apps/{resource_id}/api-keys/{api_key_id}'
@@ -4457,7 +4766,7 @@ export type DeleteAppsByResourceIdApiKeysByApiKeyIdData = {
 
 export type DeleteAppsByResourceIdApiKeysByApiKeyIdResponses = {
   204: {
-    [key: string]: unknown
+    [key: string]: never
   }
 }
 
diff --git a/packages/contracts/generated/api/console/apps/zod.gen.ts b/packages/contracts/generated/api/console/apps/zod.gen.ts
index dcaeaed246..1f8ea393c7 100644
--- a/packages/contracts/generated/api/console/apps/zod.gen.ts
+++ b/packages/contracts/generated/api/console/apps/zod.gen.ts
@@ -17,9 +17,24 @@ export const zAppImportPayload = z.object({
   yaml_url: z.string().nullish(),
 })
 
-export const zAdvancedChatWorkflowRunPagination = z.record(z.string(), z.unknown())
+/**
+ * WorkflowOnlineUsersPayload
+ */
+export const zWorkflowOnlineUsersPayload = z.object({
+  app_ids: z.array(z.string()).optional(),
+})
 
-export const zWorkflowRunCount = z.record(z.string(), z.unknown())
+/**
+ * WorkflowRunCountResponse
+ */
+export const zWorkflowRunCountResponse = z.object({
+  failed: z.int(),
+  partial_succeeded: z.int(),
+  running: z.int(),
+  stopped: z.int(),
+  succeeded: z.int(),
+  total: z.int(),
+})
 
 /**
  * HumanInputFormPreviewPayload
@@ -180,7 +195,7 @@ export const zAppExportResponse = z.object({
 export const zMessageFeedbackPayload = z.object({
   content: z.string().nullish(),
   message_id: z.string(),
-  rating: z.enum(['like', 'dislike']).nullish(),
+  rating: z.enum(['dislike', 'like']).nullish(),
 })
 
 /**
@@ -235,7 +250,7 @@ export const zAppSiteUpdatePayload = z.object({
   copyright: z.string().nullish(),
   custom_disclaimer: z.string().nullish(),
   customize_domain: z.string().nullish(),
-  customize_token_strategy: z.enum(['must', 'allow', 'not_allow']).nullish(),
+  customize_token_strategy: z.enum(['allow', 'must', 'not_allow']).nullish(),
   default_language: z.string().nullish(),
   description: z.string().nullish(),
   icon: z.string().nullish(),
@@ -339,15 +354,14 @@ export const zWorkflowTriggerListResponse = z.object({
   data: z.array(zWorkflowTriggerResponse),
 })
 
-export const zWorkflowRunPagination = z.record(z.string(), z.unknown())
-
-export const zWorkflowRunDetail = z.record(z.string(), z.unknown())
-
-export const zWorkflowRunExport = z.record(z.string(), z.unknown())
-
-export const zWorkflowRunNodeExecutionList = z.record(z.string(), z.unknown())
-
-export const zWorkflowCommentBasic = z.record(z.string(), z.unknown())
+/**
+ * WorkflowRunExportResponse
+ */
+export const zWorkflowRunExportResponse = z.object({
+  presigned_url: z.string().nullish(),
+  presigned_url_expires_at: z.string().nullish(),
+  status: z.string(),
+})
 
 /**
  * WorkflowCommentCreatePayload
@@ -359,9 +373,13 @@ export const zWorkflowCommentCreatePayload = z.object({
   position_y: z.number(),
 })
 
-export const zWorkflowCommentCreate = z.record(z.string(), z.unknown())
-
-export const zWorkflowCommentDetail = z.record(z.string(), z.unknown())
+/**
+ * WorkflowCommentCreate
+ */
+export const zWorkflowCommentCreate = z.object({
+  created_at: z.int().nullish(),
+  id: z.string(),
+})
 
 /**
  * WorkflowCommentUpdatePayload
@@ -373,7 +391,13 @@ export const zWorkflowCommentUpdatePayload = z.object({
   position_y: z.number().nullish(),
 })
 
-export const zWorkflowCommentUpdate = z.record(z.string(), z.unknown())
+/**
+ * WorkflowCommentUpdate
+ */
+export const zWorkflowCommentUpdate = z.object({
+  id: z.string(),
+  updated_at: z.int().nullish(),
+})
 
 /**
  * WorkflowCommentReplyPayload
@@ -383,15 +407,31 @@ export const zWorkflowCommentReplyPayload = z.object({
   mentioned_user_ids: z.array(z.string()).optional(),
 })
 
-export const zWorkflowCommentReplyCreate = z.record(z.string(), z.unknown())
+/**
+ * WorkflowCommentReplyCreate
+ */
+export const zWorkflowCommentReplyCreate = z.object({
+  created_at: z.int().nullish(),
+  id: z.string(),
+})
 
-export const zWorkflowCommentReplyUpdate = z.record(z.string(), z.unknown())
+/**
+ * WorkflowCommentReplyUpdate
+ */
+export const zWorkflowCommentReplyUpdate = z.object({
+  id: z.string(),
+  updated_at: z.int().nullish(),
+})
 
-export const zWorkflowCommentResolve = z.record(z.string(), z.unknown())
-
-export const zWorkflowPagination = z.record(z.string(), z.unknown())
-
-export const zWorkflow = z.record(z.string(), z.unknown())
+/**
+ * WorkflowCommentResolve
+ */
+export const zWorkflowCommentResolve = z.object({
+  id: z.string(),
+  resolved: z.boolean(),
+  resolved_at: z.int().nullish(),
+  resolved_by: z.string().nullish(),
+})
 
 /**
  * SyncDraftWorkflowPayload
@@ -404,9 +444,11 @@ export const zSyncDraftWorkflowPayload = z.object({
   hash: z.string().nullish(),
 })
 
-export const zSyncDraftWorkflowResponse = z.record(z.string(), z.unknown())
-
-export const zWorkflowDraftVariableList = z.record(z.string(), z.unknown())
+export const zSyncDraftWorkflowResponse = z.object({
+  hash: z.string().optional(),
+  result: z.string().optional(),
+  updated_at: z.string().optional(),
+})
 
 /**
  * ConversationVariableUpdatePayload
@@ -437,8 +479,6 @@ export const zHumanInputDeliveryTestPayload = z.object({
   inputs: z.record(z.string(), z.unknown()).optional(),
 })
 
-export const zWorkflowRunNodeExecution = z.record(z.string(), z.unknown())
-
 /**
  * DraftWorkflowNodeRunPayload
  */
@@ -458,7 +498,9 @@ export const zDraftWorkflowRunPayload = z.object({
   start_node_id: z.string(),
 })
 
-export const zDraftWorkflowTriggerRunRequest = z.record(z.string(), z.unknown())
+export const zDraftWorkflowTriggerRunRequest = z.object({
+  node_id: z.string(),
+})
 
 /**
  * DraftWorkflowTriggerRunAllPayload
@@ -467,9 +509,23 @@ export const zDraftWorkflowTriggerRunAllPayload = z.object({
   node_ids: z.array(z.string()),
 })
 
-export const zWorkflowDraftVariableListWithoutValue = z.record(z.string(), z.unknown())
+export const zWorkflowDraftVariable = z.object({
+  description: z.string().optional(),
+  edited: z.boolean().optional(),
+  full_content: z.record(z.string(), z.unknown()).optional(),
+  id: z.string().optional(),
+  is_truncated: z.boolean().optional(),
+  name: z.string().optional(),
+  selector: z.array(z.string()).optional(),
+  type: z.string().optional(),
+  value: z.record(z.string(), z.unknown()).optional(),
+  value_type: z.string().optional(),
+  visible: z.boolean().optional(),
+})
 
-export const zWorkflowDraftVariable = z.record(z.string(), z.unknown())
+export const zWorkflowDraftVariableList = z.object({
+  items: z.array(zWorkflowDraftVariable).optional(),
+})
 
 /**
  * WorkflowDraftVariableUpdatePayload
@@ -528,7 +584,7 @@ export const zApiKeyList = z.object({
 /**
  * IconType
  */
-export const zIconType = z.enum(['image', 'emoji', 'link'])
+export const zIconType = z.enum(['emoji', 'image', 'link'])
 
 /**
  * CreateAppPayload
@@ -538,7 +594,7 @@ export const zCreateAppPayload = z.object({
   icon: z.string().nullish(),
   icon_background: z.string().nullish(),
   icon_type: zIconType.optional(),
-  mode: z.enum(['chat', 'agent-chat', 'advanced-chat', 'workflow', 'completion']),
+  mode: z.enum(['advanced-chat', 'agent-chat', 'chat', 'completion', 'workflow']),
   name: z.string().min(1),
 })
 
@@ -586,36 +642,6 @@ export const zTag = z.object({
 
 export const zJsonValue = z.unknown()
 
-/**
- * ModelConfig
- */
-export const zModelConfig = z.object({
-  agent_mode_dict: zJsonValue.optional(),
-  annotation_reply_dict: zJsonValue.optional(),
-  chat_prompt_config_dict: zJsonValue.optional(),
-  completion_prompt_config_dict: zJsonValue.optional(),
-  created_at: z.int().nullish(),
-  created_by: z.string().nullish(),
-  dataset_configs_dict: zJsonValue.optional(),
-  dataset_query_variable: z.string().nullish(),
-  external_data_tools_list: zJsonValue.optional(),
-  file_upload_dict: zJsonValue.optional(),
-  model_dict: zJsonValue.optional(),
-  more_like_this_dict: zJsonValue.optional(),
-  opening_statement: z.string().nullish(),
-  pre_prompt: z.string().nullish(),
-  prompt_type: z.string().nullish(),
-  retriever_resource_dict: zJsonValue.optional(),
-  sensitive_word_avoidance_dict: zJsonValue.optional(),
-  speech_to_text_dict: zJsonValue.optional(),
-  suggested_questions_after_answer_dict: zJsonValue.optional(),
-  suggested_questions_list: zJsonValue.optional(),
-  text_to_speech_dict: zJsonValue.optional(),
-  updated_at: z.int().nullish(),
-  updated_by: z.string().nullish(),
-  user_input_form_list: zJsonValue.optional(),
-})
-
 /**
  * WorkflowPartial
  */
@@ -627,34 +653,10 @@ export const zWorkflowPartial = z.object({
   updated_by: z.string().nullish(),
 })
 
-/**
- * AppDetail
- */
-export const zAppDetail = z.object({
-  access_mode: z.string().nullish(),
-  app_model_config: zModelConfig.optional(),
-  created_at: z.int().nullish(),
-  created_by: z.string().nullish(),
-  description: z.string().nullish(),
-  enable_api: z.boolean(),
-  enable_site: z.boolean(),
-  icon: z.string().nullish(),
-  icon_background: z.string().nullish(),
-  id: z.string(),
-  mode_compatible_with_agent: z.string(),
-  name: z.string(),
-  tags: z.array(zTag).optional(),
-  tracing: zJsonValue.optional(),
-  updated_at: z.int().nullish(),
-  updated_by: z.string().nullish(),
-  use_icon_as_answer_icon: z.boolean().nullish(),
-  workflow: zWorkflowPartial.optional(),
-})
-
 /**
  * ImportStatus
  */
-export const zImportStatus = z.enum(['completed', 'completed-with-warnings', 'pending', 'failed'])
+export const zImportStatus = z.enum(['completed', 'completed-with-warnings', 'failed', 'pending'])
 
 /**
  * Import
@@ -706,35 +708,6 @@ export const zSite = z.object({
   use_icon_as_answer_icon: z.boolean().nullish(),
 })
 
-/**
- * AppDetailWithSite
- */
-export const zAppDetailWithSite = z.object({
-  access_mode: z.string().nullish(),
-  api_base_url: z.string().nullish(),
-  app_model_config: zModelConfig.optional(),
-  created_at: z.int().nullish(),
-  created_by: z.string().nullish(),
-  deleted_tools: z.array(zDeletedTool).optional(),
-  description: z.string().nullish(),
-  enable_api: z.boolean(),
-  enable_site: z.boolean(),
-  icon: z.string().nullish(),
-  icon_background: z.string().nullish(),
-  icon_type: z.string().nullish(),
-  id: z.string(),
-  max_active_requests: z.int().nullish(),
-  mode_compatible_with_agent: z.string(),
-  name: z.string(),
-  site: zSite.optional(),
-  tags: z.array(zTag).optional(),
-  tracing: zJsonValue.optional(),
-  updated_at: z.int().nullish(),
-  updated_by: z.string().nullish(),
-  use_icon_as_answer_icon: z.boolean().nullish(),
-  workflow: zWorkflowPartial.optional(),
-})
-
 /**
  * AnnotationHitHistory
  */
@@ -767,25 +740,6 @@ export const zFeedbackStat = z.object({
   like: z.int(),
 })
 
-/**
- * ConversationDetail
- */
-export const zConversationDetail = z.object({
-  admin_feedback_stats: zFeedbackStat.optional(),
-  annotated: z.boolean(),
-  created_at: z.int().nullish(),
-  from_account_id: z.string().nullish(),
-  from_end_user_id: z.string().nullish(),
-  from_source: z.string(),
-  id: z.string(),
-  introduction: z.string().nullish(),
-  message_count: z.int(),
-  model_config: zModelConfig.optional(),
-  status: z.string(),
-  updated_at: z.int().nullish(),
-  user_feedback_stats: zFeedbackStat.optional(),
-})
-
 /**
  * ConversationVariableResponse
  */
@@ -848,7 +802,7 @@ export const zMessageFile = z.object({
  *
  * AppMCPServer Status Enum
  */
-export const zAppMcpServerStatus = z.enum(['normal', 'active', 'inactive'])
+export const zAppMcpServerStatus = z.enum(['active', 'inactive', 'normal'])
 
 /**
  * AppMCPServerResponse
@@ -864,6 +818,196 @@ export const zAppMcpServerResponse = z.object({
   updated_at: z.int().nullish(),
 })
 
+/**
+ * SimpleAccount
+ */
+export const zSimpleAccount = z.object({
+  email: z.string(),
+  id: z.string(),
+  name: z.string(),
+})
+
+/**
+ * AdvancedChatWorkflowRunForListResponse
+ */
+export const zAdvancedChatWorkflowRunForListResponse = z.object({
+  conversation_id: z.string().nullish(),
+  created_at: z.int().nullish(),
+  created_by_account: zSimpleAccount.optional(),
+  elapsed_time: z.number().nullish(),
+  exceptions_count: z.int().nullish(),
+  finished_at: z.int().nullish(),
+  id: z.string(),
+  message_id: z.string().nullish(),
+  retry_index: z.int().nullish(),
+  status: z.string().nullish(),
+  total_steps: z.int().nullish(),
+  total_tokens: z.int().nullish(),
+  version: z.string().nullish(),
+})
+
+/**
+ * AdvancedChatWorkflowRunPaginationResponse
+ */
+export const zAdvancedChatWorkflowRunPaginationResponse = z.object({
+  data: z.array(zAdvancedChatWorkflowRunForListResponse),
+  has_more: z.boolean(),
+  limit: z.int(),
+})
+
+/**
+ * ConversationAnnotation
+ */
+export const zConversationAnnotation = z.object({
+  account: zSimpleAccount.optional(),
+  content: z.string(),
+  created_at: z.int().nullish(),
+  id: z.string(),
+  question: z.string().nullish(),
+})
+
+/**
+ * ConversationAnnotationHitHistory
+ */
+export const zConversationAnnotationHitHistory = z.object({
+  annotation_create_account: zSimpleAccount.optional(),
+  created_at: z.int().nullish(),
+  id: z.string(),
+})
+
+/**
+ * Feedback
+ */
+export const zFeedback = z.object({
+  content: z.string().nullish(),
+  from_account: zSimpleAccount.optional(),
+  from_end_user_id: z.string().nullish(),
+  from_source: z.string(),
+  rating: z.string(),
+})
+
+/**
+ * MessageDetail
+ */
+export const zMessageDetail = z.object({
+  agent_thoughts: z.array(zAgentThought),
+  annotation: zConversationAnnotation.optional(),
+  annotation_hit_history: zConversationAnnotationHitHistory.optional(),
+  answer_tokens: z.int(),
+  conversation_id: z.string(),
+  created_at: z.int().nullish(),
+  error: z.string().nullish(),
+  feedbacks: z.array(zFeedback),
+  from_account_id: z.string().nullish(),
+  from_end_user_id: z.string().nullish(),
+  from_source: z.string(),
+  id: z.string(),
+  inputs: z.record(z.string(), zJsonValue),
+  message: zJsonValue,
+  message_files: z.array(zMessageFile),
+  message_metadata_dict: zJsonValue,
+  message_tokens: z.int(),
+  parent_message_id: z.string().nullish(),
+  provider_response_latency: z.number(),
+  query: z.string(),
+  re_sign_file_url_answer: z.string(),
+  status: z.string(),
+  workflow_run_id: z.string().nullish(),
+})
+
+/**
+ * WorkflowRunForListResponse
+ */
+export const zWorkflowRunForListResponse = z.object({
+  created_at: z.int().nullish(),
+  created_by_account: zSimpleAccount.optional(),
+  elapsed_time: z.number().nullish(),
+  exceptions_count: z.int().nullish(),
+  finished_at: z.int().nullish(),
+  id: z.string(),
+  retry_index: z.int().nullish(),
+  status: z.string().nullish(),
+  total_steps: z.int().nullish(),
+  total_tokens: z.int().nullish(),
+  version: z.string().nullish(),
+})
+
+/**
+ * WorkflowRunPaginationResponse
+ */
+export const zWorkflowRunPaginationResponse = z.object({
+  data: z.array(zWorkflowRunForListResponse),
+  has_more: z.boolean(),
+  limit: z.int(),
+})
+
+/**
+ * SimpleEndUser
+ */
+export const zSimpleEndUser = z.object({
+  id: z.string(),
+  is_anonymous: z.boolean(),
+  session_id: z.string().nullish(),
+  type: z.string(),
+})
+
+/**
+ * WorkflowRunDetailResponse
+ */
+export const zWorkflowRunDetailResponse = z.object({
+  created_at: z.int().nullish(),
+  created_by_account: zSimpleAccount.optional(),
+  created_by_end_user: zSimpleEndUser.optional(),
+  created_by_role: z.string().nullish(),
+  elapsed_time: z.number().nullish(),
+  error: z.string().nullish(),
+  exceptions_count: z.int().nullish(),
+  finished_at: z.int().nullish(),
+  graph: z.unknown(),
+  id: z.string(),
+  inputs: z.unknown(),
+  outputs: z.unknown(),
+  status: z.string().nullish(),
+  total_steps: z.int().nullish(),
+  total_tokens: z.int().nullish(),
+  version: z.string().nullish(),
+})
+
+/**
+ * WorkflowRunNodeExecutionResponse
+ */
+export const zWorkflowRunNodeExecutionResponse = z.object({
+  created_at: z.int().nullish(),
+  created_by_account: zSimpleAccount.optional(),
+  created_by_end_user: zSimpleEndUser.optional(),
+  created_by_role: z.string().nullish(),
+  elapsed_time: z.number().nullish(),
+  error: z.string().nullish(),
+  execution_metadata: z.unknown().optional(),
+  extras: z.unknown().optional(),
+  finished_at: z.int().nullish(),
+  id: z.string(),
+  index: z.int().nullish(),
+  inputs: z.unknown().optional(),
+  inputs_truncated: z.boolean().nullish(),
+  node_id: z.string().nullish(),
+  node_type: z.string().nullish(),
+  outputs: z.unknown().optional(),
+  outputs_truncated: z.boolean().nullish(),
+  predecessor_node_id: z.string().nullish(),
+  process_data: z.unknown().optional(),
+  process_data_truncated: z.boolean().nullish(),
+  status: z.string().nullish(),
+  title: z.string().nullish(),
+})
+
+/**
+ * WorkflowRunNodeExecutionListResponse
+ */
+export const zWorkflowRunNodeExecutionListResponse = z.object({
+  data: z.array(zWorkflowRunNodeExecutionResponse),
+})
+
 /**
  * AccountWithRole
  */
@@ -886,6 +1030,174 @@ export const zWorkflowCommentMentionUsersPayload = z.object({
   users: z.array(zAccountWithRole),
 })
 
+/**
+ * WorkflowCommentAccount
+ */
+export const zWorkflowCommentAccount = z.object({
+  avatar_url: z.string().readonly().nullable(),
+  email: z.string(),
+  id: z.string(),
+  name: z.string(),
+})
+
+/**
+ * WorkflowCommentBasic
+ */
+export const zWorkflowCommentBasic = z.object({
+  content: z.string(),
+  created_at: z.int().nullish(),
+  created_by: z.string(),
+  created_by_account: zWorkflowCommentAccount.optional(),
+  id: z.string(),
+  mention_count: z.int(),
+  participants: z.array(zWorkflowCommentAccount),
+  position_x: z.number(),
+  position_y: z.number(),
+  reply_count: z.int(),
+  resolved: z.boolean(),
+  resolved_at: z.int().nullish(),
+  resolved_by: z.string().nullish(),
+  resolved_by_account: zWorkflowCommentAccount.optional(),
+  updated_at: z.int().nullish(),
+})
+
+/**
+ * WorkflowCommentBasicList
+ */
+export const zWorkflowCommentBasicList = z.object({
+  data: z.array(zWorkflowCommentBasic),
+})
+
+/**
+ * WorkflowCommentMention
+ */
+export const zWorkflowCommentMention = z.object({
+  mentioned_user_account: zWorkflowCommentAccount.optional(),
+  mentioned_user_id: z.string(),
+  reply_id: z.string().nullish(),
+})
+
+/**
+ * WorkflowCommentReply
+ */
+export const zWorkflowCommentReply = z.object({
+  content: z.string(),
+  created_at: z.int().nullish(),
+  created_by: z.string(),
+  created_by_account: zWorkflowCommentAccount.optional(),
+  id: z.string(),
+})
+
+/**
+ * WorkflowCommentDetail
+ */
+export const zWorkflowCommentDetail = z.object({
+  content: z.string(),
+  created_at: z.int().nullish(),
+  created_by: z.string(),
+  created_by_account: zWorkflowCommentAccount.optional(),
+  id: z.string(),
+  mentions: z.array(zWorkflowCommentMention),
+  position_x: z.number(),
+  position_y: z.number(),
+  replies: z.array(zWorkflowCommentReply),
+  resolved: z.boolean(),
+  resolved_at: z.int().nullish(),
+  resolved_by: z.string().nullish(),
+  resolved_by_account: zWorkflowCommentAccount.optional(),
+  updated_at: z.int().nullish(),
+})
+
+/**
+ * WorkflowConversationVariableResponse
+ */
+export const zWorkflowConversationVariableResponse = z.object({
+  description: z.string(),
+  id: z.string(),
+  name: z.string(),
+  value: z.record(z.string(), z.unknown()),
+  value_type: z.string(),
+})
+
+/**
+ * WorkflowEnvironmentVariableResponse
+ */
+export const zWorkflowEnvironmentVariableResponse = z.object({
+  description: z.string(),
+  id: z.string(),
+  name: z.string(),
+  value: z.record(z.string(), z.unknown()),
+  value_type: z.string(),
+})
+
+/**
+ * PipelineVariableResponse
+ */
+export const zPipelineVariableResponse = z.object({
+  allowed_file_extensions: z.array(z.string()).nullish(),
+  allowed_file_types: z.array(z.string()).nullish(),
+  allowed_file_upload_methods: z.array(z.string()).nullish(),
+  belong_to_node_id: z.string(),
+  default_value: z.record(z.string(), z.unknown()).optional(),
+  label: z.string(),
+  max_length: z.int().nullish(),
+  options: z.array(z.string()).nullish(),
+  placeholder: z.string().nullish(),
+  required: z.boolean(),
+  tooltips: z.string().nullish(),
+  type: z.string(),
+  unit: z.string().nullish(),
+  variable: z.string(),
+})
+
+/**
+ * WorkflowResponse
+ */
+export const zWorkflowResponse = z.object({
+  conversation_variables: z.array(zWorkflowConversationVariableResponse),
+  created_at: z.int(),
+  created_by: zSimpleAccount.optional(),
+  environment_variables: z.array(zWorkflowEnvironmentVariableResponse),
+  features: z.record(z.string(), z.unknown()),
+  graph: z.record(z.string(), z.unknown()),
+  hash: z.string(),
+  id: z.string(),
+  marked_comment: z.string(),
+  marked_name: z.string(),
+  rag_pipeline_variables: z.array(zPipelineVariableResponse),
+  tool_published: z.boolean(),
+  updated_at: z.int(),
+  updated_by: zSimpleAccount.optional(),
+  version: z.string(),
+})
+
+/**
+ * WorkflowPaginationResponse
+ */
+export const zWorkflowPaginationResponse = z.object({
+  has_more: z.boolean(),
+  items: z.array(zWorkflowResponse),
+  limit: z.int(),
+  page: z.int(),
+})
+
+export const zWorkflowDraftVariableWithoutValue = z.object({
+  description: z.string().optional(),
+  edited: z.boolean().optional(),
+  id: z.string().optional(),
+  is_truncated: z.boolean().optional(),
+  name: z.string().optional(),
+  selector: z.array(z.string()).optional(),
+  type: z.string().optional(),
+  value_type: z.string().optional(),
+  visible: z.boolean().optional(),
+})
+
+export const zWorkflowDraftVariableListWithoutValue = z.object({
+  items: z.array(zWorkflowDraftVariableWithoutValue).optional(),
+  total: z.record(z.string(), z.unknown()).optional(),
+})
+
 /**
  * ModelConfigPartial
  */
@@ -935,6 +1247,109 @@ export const zAppPagination = z.object({
   total: z.int(),
 })
 
+/**
+ * LLMMode
+ *
+ * Enum class for large language model mode.
+ */
+export const zLlmMode = z.enum(['chat', 'completion'])
+
+/**
+ * ModelConfig
+ */
+export const zModelConfig = z.object({
+  completion_params: z.record(z.string(), z.unknown()).optional(),
+  mode: zLlmMode,
+  name: z.string(),
+  provider: z.string(),
+})
+
+/**
+ * AppDetail
+ */
+export const zAppDetail = z.object({
+  access_mode: z.string().nullish(),
+  app_model_config: zModelConfig.optional(),
+  created_at: z.int().nullish(),
+  created_by: z.string().nullish(),
+  description: z.string().nullish(),
+  enable_api: z.boolean(),
+  enable_site: z.boolean(),
+  icon: z.string().nullish(),
+  icon_background: z.string().nullish(),
+  id: z.string(),
+  mode_compatible_with_agent: z.string(),
+  name: z.string(),
+  tags: z.array(zTag).optional(),
+  tracing: zJsonValue.optional(),
+  updated_at: z.int().nullish(),
+  updated_by: z.string().nullish(),
+  use_icon_as_answer_icon: z.boolean().nullish(),
+  workflow: zWorkflowPartial.optional(),
+})
+
+/**
+ * AppDetailWithSite
+ */
+export const zAppDetailWithSite = z.object({
+  access_mode: z.string().nullish(),
+  api_base_url: z.string().nullish(),
+  app_model_config: zModelConfig.optional(),
+  created_at: z.int().nullish(),
+  created_by: z.string().nullish(),
+  deleted_tools: z.array(zDeletedTool).optional(),
+  description: z.string().nullish(),
+  enable_api: z.boolean(),
+  enable_site: z.boolean(),
+  icon: z.string().nullish(),
+  icon_background: z.string().nullish(),
+  icon_type: z.string().nullish(),
+  id: z.string(),
+  max_active_requests: z.int().nullish(),
+  mode_compatible_with_agent: z.string(),
+  name: z.string(),
+  site: zSite.optional(),
+  tags: z.array(zTag).optional(),
+  tracing: zJsonValue.optional(),
+  updated_at: z.int().nullish(),
+  updated_by: z.string().nullish(),
+  use_icon_as_answer_icon: z.boolean().nullish(),
+  workflow: zWorkflowPartial.optional(),
+})
+
+/**
+ * ConversationDetail
+ */
+export const zConversationDetail = z.object({
+  admin_feedback_stats: zFeedbackStat.optional(),
+  annotated: z.boolean(),
+  created_at: z.int().nullish(),
+  from_account_id: z.string().nullish(),
+  from_end_user_id: z.string().nullish(),
+  from_source: z.string(),
+  id: z.string(),
+  introduction: z.string().nullish(),
+  message_count: z.int(),
+  model_config: zModelConfig.optional(),
+  status: z.string(),
+  updated_at: z.int().nullish(),
+  user_feedback_stats: zFeedbackStat.optional(),
+})
+
+/**
+ * ConversationMessageDetail
+ */
+export const zConversationMessageDetail = z.object({
+  created_at: z.int().nullish(),
+  first_message: zMessageDetail.optional(),
+  from_account_id: z.string().nullish(),
+  from_end_user_id: z.string().nullish(),
+  from_source: z.string(),
+  id: z.string(),
+  model_config: zModelConfig.optional(),
+  status: z.string(),
+})
+
 /**
  * Type
  */
@@ -982,6 +1397,30 @@ export const zPackage = z.object({
   version: z.string().nullish(),
 })
 
+/**
+ * WorkflowOnlineUser
+ */
+export const zWorkflowOnlineUser = z.object({
+  avatar: z.string().nullish(),
+  user_id: z.string(),
+  username: z.string(),
+})
+
+/**
+ * WorkflowOnlineUsersByApp
+ */
+export const zWorkflowOnlineUsersByApp = z.object({
+  app_id: z.string(),
+  users: z.array(zWorkflowOnlineUser),
+})
+
+/**
+ * WorkflowOnlineUsersResponse
+ */
+export const zWorkflowOnlineUsersResponse = z.object({
+  data: z.array(zWorkflowOnlineUsersByApp),
+})
+
 /**
  * SimpleModelConfig
  */
@@ -1045,26 +1484,6 @@ export const zSimpleMessageDetail = z.object({
   query: z.string(),
 })
 
-/**
- * SimpleAccount
- */
-export const zSimpleAccount = z.object({
-  email: z.string(),
-  id: z.string(),
-  name: z.string(),
-})
-
-/**
- * ConversationAnnotation
- */
-export const zConversationAnnotation = z.object({
-  account: zSimpleAccount.optional(),
-  content: z.string(),
-  created_at: z.int().nullish(),
-  id: z.string(),
-  question: z.string().nullish(),
-})
-
 /**
  * Conversation
  */
@@ -1097,69 +1516,6 @@ export const zConversationPagination = z.object({
   total: z.int(),
 })
 
-/**
- * ConversationAnnotationHitHistory
- */
-export const zConversationAnnotationHitHistory = z.object({
-  annotation_create_account: zSimpleAccount.optional(),
-  created_at: z.int().nullish(),
-  id: z.string(),
-})
-
-/**
- * Feedback
- */
-export const zFeedback = z.object({
-  content: z.string().nullish(),
-  from_account: zSimpleAccount.optional(),
-  from_end_user_id: z.string().nullish(),
-  from_source: z.string(),
-  rating: z.string(),
-})
-
-/**
- * MessageDetail
- */
-export const zMessageDetail = z.object({
-  agent_thoughts: z.array(zAgentThought),
-  annotation: zConversationAnnotation.optional(),
-  annotation_hit_history: zConversationAnnotationHitHistory.optional(),
-  answer_tokens: z.int(),
-  conversation_id: z.string(),
-  created_at: z.int().nullish(),
-  error: z.string().nullish(),
-  feedbacks: z.array(zFeedback),
-  from_account_id: z.string().nullish(),
-  from_end_user_id: z.string().nullish(),
-  from_source: z.string(),
-  id: z.string(),
-  inputs: z.record(z.string(), zJsonValue),
-  message: zJsonValue,
-  message_files: z.array(zMessageFile),
-  message_metadata_dict: zJsonValue,
-  message_tokens: z.int(),
-  parent_message_id: z.string().nullish(),
-  provider_response_latency: z.number(),
-  query: z.string(),
-  re_sign_file_url_answer: z.string(),
-  status: z.string(),
-  workflow_run_id: z.string().nullish(),
-})
-
-/**
- * ConversationMessageDetail
- */
-export const zConversationMessageDetail = z.object({
-  created_at: z.int().nullish(),
-  first_message: zMessageDetail.optional(),
-  from_account_id: z.string().nullish(),
-  from_end_user_id: z.string().nullish(),
-  from_source: z.string(),
-  id: z.string(),
-  model_config: zModelConfig.optional(),
-  status: z.string(),
-})
-
 /**
  * HumanInputFormSubmissionData
  */
@@ -1176,16 +1532,6 @@ export const zHumanInputFormSubmissionData = z.object({
  */
 export const zExecutionContentType = z.enum(['human_input'])
 
-/**
- * SimpleEndUser
- */
-export const zSimpleEndUser = z.object({
-  id: z.string(),
-  is_anonymous: z.boolean(),
-  session_id: z.string().nullish(),
-  type: z.string(),
-})
-
 /**
  * WorkflowRunForLogResponse
  */
@@ -1262,71 +1608,37 @@ export const zWorkflowArchivedLogPaginationResponse = z.object({
   total: z.int(),
 })
 
+export const zFormInputConfig = z.unknown()
+
 /**
  * ButtonStyle
  *
  * Button styles for user actions.
  */
-export const zButtonStyle = z.enum(['primary', 'default', 'accent', 'ghost'])
+export const zButtonStyle = z.enum(['accent', 'default', 'ghost', 'primary'])
 
 /**
- * UserAction
+ * UserActionConfig
  *
  * User action configuration.
  */
-export const zUserAction = z.object({
+export const zUserActionConfig = z.object({
   button_style: zButtonStyle.optional(),
   id: z.string().max(20),
-  title: z.string().max(20),
-})
-
-/**
- * FormInputType
- *
- * Form input types.
- */
-export const zFormInputType = z.enum(['text_input', 'paragraph'])
-
-/**
- * PlaceholderType
- *
- * Default value types for form inputs.
- */
-export const zPlaceholderType = z.enum(['variable', 'constant'])
-
-/**
- * FormInputDefault
- *
- * Default configuration for form inputs.
- */
-export const zFormInputDefault = z.object({
-  selector: z.array(z.string()).optional(),
-  type: zPlaceholderType,
-  value: z.string().optional().default(''),
-})
-
-/**
- * FormInput
- *
- * Form input definition.
- */
-export const zFormInput = z.object({
-  default: zFormInputDefault.optional(),
-  output_variable_name: z.string(),
-  type: zFormInputType,
+  title: z.string().max(100),
 })
 
 /**
  * HumanInputFormDefinition
  */
 export const zHumanInputFormDefinition = z.object({
-  actions: z.array(zUserAction).optional(),
+  actions: z.array(zUserActionConfig).optional(),
   display_in_ui: z.boolean().optional().default(false),
   expiration_time: z.int(),
   form_content: z.string(),
   form_id: z.string(),
   form_token: z.string().nullish(),
-  inputs: z.array(zFormInput).optional(),
+  inputs: z.array(zFormInputConfig).optional(),
   node_id: z.string(),
   node_title: z.string(),
   resolved_default_values: z.record(z.string(), z.unknown()).optional(),
@@ -1382,11 +1694,174 @@ export const zMessageInfiniteScrollPaginationResponse = z.object({
   limit: z.int(),
 })
 
+/**
+ * FileType
+ */
+export const zFileType = z.enum(['audio', 'custom', 'document', 'image', 'video'])
+
+/**
+ * FileTransferMethod
+ */
+export const zFileTransferMethod = z.enum([
+  'datasource_file',
+  'local_file',
+  'remote_url',
+  'tool_file',
+])
+
+/**
+ * FileInputConfig
+ */
+export const zFileInputConfig = z.object({
+  allowed_file_extensions: z.array(z.string()).optional(),
+  allowed_file_types: z.array(zFileType).optional(),
+  allowed_file_upload_methods: z.array(zFileTransferMethod).optional(),
+  output_variable_name: z.string(),
+  type: z.string().optional().default('file'),
+})
+
+/**
+ * FileListInputConfig
+ */
+export const zFileListInputConfig = z.object({
+  allowed_file_extensions: z.array(z.string()).optional(),
+  allowed_file_types: z.array(zFileType).optional(),
+  allowed_file_upload_methods: z.array(zFileTransferMethod).optional(),
+  number_limits: z.int().gte(0).optional().default(0),
+  output_variable_name: z.string(),
+  type: z.string().optional().default('file-list'),
+})
+
+/**
+ * ValueSourceType
+ *
+ * ValueSourceType records whether the value comes from a static setting
+ * in form definiton, or a variable while the workflow is running.
+ */
+export const zValueSourceType = z.enum(['constant', 'variable'])
+
+/**
+ * StringSource
+ *
+ * Default configuration for form inputs.
+ */
+export const zStringSource = z.object({
+  selector: z.array(z.string()).optional(),
+  type: zValueSourceType,
+  value: z.string().optional().default(''),
+})
+
+/**
+ * ParagraphInputConfig
+ *
+ * Form input definition.
+ */
+export const zParagraphInputConfig = z.object({
+  default: zStringSource.optional(),
+  output_variable_name: z.string(),
+  type: z.string().optional().default('paragraph'),
+})
+
+/**
+ * StringListSource
+ */
+export const zStringListSource = z.object({
+  selector: z.array(z.string()).optional(),
+  type: zValueSourceType,
+  value: z.array(z.string()).optional(),
+})
+
+/**
+ * SelectInputConfig
+ */
+export const zSelectInputConfig = z.object({
+  option_source: zStringListSource,
+  output_variable_name: z.string(),
+  type: z.string().optional().default('select'),
+})
+
+/**
+ * WorkflowCommentAccount
+ */
+export const zWorkflowCommentAccountWritable = z.object({
+  email: z.string(),
+  id: z.string(),
+  name: z.string(),
+})
+
+/**
+ * WorkflowCommentBasic
+ */
+export const zWorkflowCommentBasicWritable = z.object({
+  content: z.string(),
+  created_at: z.int().nullish(),
+  created_by: z.string(),
+  created_by_account: zWorkflowCommentAccountWritable.optional(),
+  id: z.string(),
+  mention_count: z.int(),
+  participants: z.array(zWorkflowCommentAccountWritable),
+  position_x: z.number(),
+  position_y: z.number(),
+  reply_count: z.int(),
+  resolved: z.boolean(),
+  resolved_at: z.int().nullish(),
+  resolved_by: z.string().nullish(),
+  resolved_by_account: zWorkflowCommentAccountWritable.optional(),
+  updated_at: z.int().nullish(),
+})
+
+/**
+ * WorkflowCommentBasicList
+ */
+export const zWorkflowCommentBasicListWritable = z.object({
+  data: z.array(zWorkflowCommentBasicWritable),
+})
+
+/**
+ * WorkflowCommentMention
+ */
+export const zWorkflowCommentMentionWritable = z.object({
+  mentioned_user_account: zWorkflowCommentAccountWritable.optional(),
+  mentioned_user_id: z.string(),
+  reply_id: z.string().nullish(),
+})
+
+/**
+ * WorkflowCommentReply
+ */
+export const zWorkflowCommentReplyWritable = z.object({
+  content: z.string(),
+  created_at: z.int().nullish(),
+  created_by: z.string(),
+  created_by_account: zWorkflowCommentAccountWritable.optional(),
+  id: z.string(),
+})
+
+/**
+ * WorkflowCommentDetail
+ */
+export const zWorkflowCommentDetailWritable = z.object({
+  content: z.string(),
+  created_at: z.int().nullish(),
+  created_by: z.string(),
+  created_by_account: zWorkflowCommentAccountWritable.optional(),
+  id: z.string(),
+  mentions: z.array(zWorkflowCommentMentionWritable),
+  position_x: z.number(),
+  position_y: z.number(),
+  replies: z.array(zWorkflowCommentReplyWritable),
+  resolved: z.boolean(),
+  resolved_at: z.int().nullish(),
+  resolved_by: z.string().nullish(),
+  resolved_by_account: zWorkflowCommentAccountWritable.optional(),
+  updated_at: z.int().nullish(),
+})
+
 export const zGetAppsQuery = z.object({
   is_created_by_me: z.boolean().nullish(),
   limit: z.int().gte(1).lte(100).optional().default(20),
   mode: z
-    .enum(['completion', 'chat', 'advanced-chat', 'workflow', 'agent-chat', 'channel', 'all'])
+    .enum(['advanced-chat', 'agent-chat', 'all', 'channel', 'chat', 'completion', 'workflow'])
     .optional()
     .default('all'),
   name: z.string().nullish(),
@@ -1431,14 +1906,12 @@ export const zPostAppsImportsByImportIdConfirmPath = z.object({
  */
 export const zPostAppsImportsByImportIdConfirmResponse = zImport
 
-export const zGetAppsWorkflowsOnlineUsersQuery = z.object({
-  app_ids: z.string(),
-})
+export const zPostAppsWorkflowsOnlineUsersBody = zWorkflowOnlineUsersPayload
 
 /**
- * Success
+ * Workflow online users retrieved successfully
  */
-export const zGetAppsWorkflowsOnlineUsersResponse = z.record(z.string(), z.unknown())
+export const zPostAppsWorkflowsOnlineUsersResponse = zWorkflowOnlineUsersResponse
 
 export const zDeleteAppsByAppIdPath = z.object({
   app_id: z.string(),
@@ -1447,7 +1920,7 @@ export const zDeleteAppsByAppIdPath = z.object({
 /**
  * App deleted successfully
  */
-export const zDeleteAppsByAppIdResponse = z.record(z.string(), z.unknown())
+export const zDeleteAppsByAppIdResponse = z.record(z.string(), z.never())
 
 export const zGetAppsByAppIdPath = z.object({
   app_id: z.string(),
@@ -1474,31 +1947,32 @@ export const zGetAppsByAppIdAdvancedChatWorkflowRunsPath = z.object({
 })
 
 export const zGetAppsByAppIdAdvancedChatWorkflowRunsQuery = z.object({
-  triggered_from: z.enum(['debugging', 'app-run']).nullish(),
-  status: z.enum(['running', 'succeeded', 'failed', 'stopped', 'partial-succeeded']).nullish(),
-  last_id: z.string().nullish(),
+  last_id: z.string().optional(),
   limit: z.int().gte(1).lte(100).optional().default(20),
+  status: z.enum(['failed', 'partial-succeeded', 'running', 'stopped', 'succeeded']).optional(),
+  triggered_from: z.enum(['app-run', 'debugging']).optional(),
 })
 
 /**
  * Workflow runs retrieved successfully
  */
-export const zGetAppsByAppIdAdvancedChatWorkflowRunsResponse = zAdvancedChatWorkflowRunPagination
+export const zGetAppsByAppIdAdvancedChatWorkflowRunsResponse
+  = zAdvancedChatWorkflowRunPaginationResponse
 
 export const zGetAppsByAppIdAdvancedChatWorkflowRunsCountPath = z.object({
   app_id: z.string(),
 })
 
 export const zGetAppsByAppIdAdvancedChatWorkflowRunsCountQuery = z.object({
-  triggered_from: z.enum(['debugging', 'app-run']).nullish(),
-  time_range: z.string().nullish(),
-  status: z.enum(['running', 'succeeded', 'failed', 'stopped', 'partial-succeeded']).nullish(),
+  status: z.enum(['failed', 'partial-succeeded', 'running', 'stopped', 'succeeded']).optional(),
+  time_range: z.string().optional(),
+  triggered_from: z.enum(['app-run', 'debugging']).optional(),
 })
 
 /**
  * Workflow runs count retrieved successfully
  */
-export const zGetAppsByAppIdAdvancedChatWorkflowRunsCountResponse = zWorkflowRunCount
+export const zGetAppsByAppIdAdvancedChatWorkflowRunsCountResponse = zWorkflowRunCountResponse
 
 export const zPostAppsByAppIdAdvancedChatWorkflowsDraftHumanInputNodesByNodeIdFormPreviewBody
   = zHumanInputFormPreviewPayload
@@ -1593,8 +2067,8 @@ export const zGetAppsByAppIdAgentLogsResponse = z.array(z.record(z.string(), z.u
 export const zPostAppsByAppIdAnnotationReplyByActionBody = zAnnotationReplyPayload
 
 export const zPostAppsByAppIdAnnotationReplyByActionPath = z.object({
-  app_id: z.string(),
   action: z.string(),
+  app_id: z.string(),
 })
 
 /**
@@ -1603,8 +2077,8 @@ export const zPostAppsByAppIdAnnotationReplyByActionPath = z.object({
 export const zPostAppsByAppIdAnnotationReplyByActionResponse = z.record(z.string(), z.unknown())
 
 export const zGetAppsByAppIdAnnotationReplyByActionStatusByJobIdPath = z.object({
-  app_id: z.string(),
   action: z.string(),
+  app_id: z.string(),
   job_id: z.string(),
 })
 
@@ -1629,8 +2103,8 @@ export const zPostAppsByAppIdAnnotationSettingsByAnnotationSettingIdBody
   = zAnnotationSettingUpdatePayload
 
 export const zPostAppsByAppIdAnnotationSettingsByAnnotationSettingIdPath = z.object({
-  app_id: z.string(),
   annotation_setting_id: z.string(),
+  app_id: z.string(),
 })
 
 /**
@@ -1729,23 +2203,23 @@ export const zDeleteAppsByAppIdAnnotationsByAnnotationIdResponse = z.record(z.st
 export const zPostAppsByAppIdAnnotationsByAnnotationIdBody = zUpdateAnnotationPayload
 
 export const zPostAppsByAppIdAnnotationsByAnnotationIdPath = z.object({
-  app_id: z.string(),
   annotation_id: z.string(),
+  app_id: z.string(),
 })
 
 export const zPostAppsByAppIdAnnotationsByAnnotationIdResponse = z.union([
   zAnnotation,
-  z.record(z.string(), z.unknown()),
+  z.record(z.string(), z.never()),
 ])
 
 export const zGetAppsByAppIdAnnotationsByAnnotationIdHitHistoriesPath = z.object({
-  app_id: z.string(),
   annotation_id: z.string(),
+  app_id: z.string(),
 })
 
 export const zGetAppsByAppIdAnnotationsByAnnotationIdHitHistoriesQuery = z.object({
-  page: z.int().optional().default(1),
   limit: z.int().optional().default(20),
+  page: z.int().optional().default(1),
 })
 
 /**
@@ -1779,13 +2253,13 @@ export const zGetAppsByAppIdChatConversationsPath = z.object({
 })
 
 export const zGetAppsByAppIdChatConversationsQuery = z.object({
-  annotation_status: z.enum(['annotated', 'not_annotated', 'all']).optional().default('all'),
+  annotation_status: z.enum(['all', 'annotated', 'not_annotated']).optional().default('all'),
   end: z.string().nullish(),
   keyword: z.string().nullish(),
   limit: z.int().gte(1).lte(100).optional().default(20),
   page: z.int().gte(1).lte(99999).optional().default(1),
   sort_by: z
-    .enum(['created_at', '-created_at', 'updated_at', '-updated_at'])
+    .enum(['-created_at', '-updated_at', 'created_at', 'updated_at'])
     .optional()
     .default('-updated_at'),
   start: z.string().nullish(),
@@ -1806,7 +2280,7 @@ export const zDeleteAppsByAppIdChatConversationsByConversationIdPath = z.object(
  */
 export const zDeleteAppsByAppIdChatConversationsByConversationIdResponse = z.record(
   z.string(),
-  z.unknown(),
+  z.never(),
 )
 
 export const zGetAppsByAppIdChatConversationsByConversationIdPath = z.object({
@@ -1860,7 +2334,7 @@ export const zGetAppsByAppIdCompletionConversationsPath = z.object({
 })
 
 export const zGetAppsByAppIdCompletionConversationsQuery = z.object({
-  annotation_status: z.enum(['annotated', 'not_annotated', 'all']).optional().default('all'),
+  annotation_status: z.enum(['all', 'annotated', 'not_annotated']).optional().default('all'),
   end: z.string().nullish(),
   keyword: z.string().nullish(),
   limit: z.int().gte(1).lte(100).optional().default(20),
@@ -1883,7 +2357,7 @@ export const zDeleteAppsByAppIdCompletionConversationsByConversationIdPath = z.o
  */
 export const zDeleteAppsByAppIdCompletionConversationsByConversationIdResponse = z.record(
   z.string(),
-  z.unknown(),
+  z.never(),
 )
 
 export const zGetAppsByAppIdCompletionConversationsByConversationIdPath = z.object({
@@ -1988,9 +2462,9 @@ export const zGetAppsByAppIdFeedbacksExportPath = z.object({
 export const zGetAppsByAppIdFeedbacksExportQuery = z.object({
   end_date: z.string().nullish(),
   format: z.enum(['csv', 'json']).optional().default('csv'),
-  from_source: z.enum(['user', 'admin']).nullish(),
+  from_source: z.enum(['admin', 'user']).nullish(),
   has_comment: z.boolean().nullish(),
-  rating: z.enum(['like', 'dislike']).nullish(),
+  rating: z.enum(['dislike', 'like']).nullish(),
   start_date: z.string().nullish(),
 })
 
@@ -2294,7 +2768,7 @@ export const zDeleteAppsByAppIdTraceConfigPath = z.object({
 /**
  * Tracing configuration deleted successfully
  */
-export const zDeleteAppsByAppIdTraceConfigResponse = z.record(z.string(), z.unknown())
+export const zDeleteAppsByAppIdTraceConfigResponse = z.record(z.string(), z.never())
 
 export const zGetAppsByAppIdTraceConfigPath = z.object({
   app_id: z.string(),
@@ -2398,31 +2872,31 @@ export const zGetAppsByAppIdWorkflowRunsPath = z.object({
 })
 
 export const zGetAppsByAppIdWorkflowRunsQuery = z.object({
-  triggered_from: z.enum(['debugging', 'app-run']).nullish(),
-  status: z.enum(['running', 'succeeded', 'failed', 'stopped', 'partial-succeeded']).nullish(),
-  last_id: z.string().nullish(),
+  last_id: z.string().optional(),
   limit: z.int().gte(1).lte(100).optional().default(20),
+  status: z.enum(['failed', 'partial-succeeded', 'running', 'stopped', 'succeeded']).optional(),
+  triggered_from: z.enum(['app-run', 'debugging']).optional(),
 })
 
 /**
  * Workflow runs retrieved successfully
  */
-export const zGetAppsByAppIdWorkflowRunsResponse = zWorkflowRunPagination
+export const zGetAppsByAppIdWorkflowRunsResponse = zWorkflowRunPaginationResponse
 
 export const zGetAppsByAppIdWorkflowRunsCountPath = z.object({
   app_id: z.string(),
 })
 
 export const zGetAppsByAppIdWorkflowRunsCountQuery = z.object({
-  triggered_from: z.enum(['debugging', 'app-run']).nullish(),
-  time_range: z.string().nullish(),
-  status: z.enum(['running', 'succeeded', 'failed', 'stopped', 'partial-succeeded']).nullish(),
+  status: z.enum(['failed', 'partial-succeeded', 'running', 'stopped', 'succeeded']).optional(),
+  time_range: z.string().optional(),
+  triggered_from: z.enum(['app-run', 'debugging']).optional(),
 })
 
 /**
  * Workflow runs count retrieved successfully
  */
-export const zGetAppsByAppIdWorkflowRunsCountResponse = zWorkflowRunCount
+export const zGetAppsByAppIdWorkflowRunsCountResponse = zWorkflowRunCountResponse
 
 export const zPostAppsByAppIdWorkflowRunsTasksByTaskIdStopPath = z.object({
   app_id: z.string(),
@@ -2445,7 +2919,7 @@ export const zGetAppsByAppIdWorkflowRunsByRunIdPath = z.object({
 /**
  * Workflow run detail retrieved successfully
  */
-export const zGetAppsByAppIdWorkflowRunsByRunIdResponse = zWorkflowRunDetail
+export const zGetAppsByAppIdWorkflowRunsByRunIdResponse = zWorkflowRunDetailResponse
 
 export const zGetAppsByAppIdWorkflowRunsByRunIdExportPath = z.object({
   app_id: z.string(),
@@ -2455,7 +2929,7 @@ export const zGetAppsByAppIdWorkflowRunsByRunIdExportPath = z.object({
 /**
  * Export URL generated
  */
-export const zGetAppsByAppIdWorkflowRunsByRunIdExportResponse = zWorkflowRunExport
+export const zGetAppsByAppIdWorkflowRunsByRunIdExportResponse = zWorkflowRunExportResponse
 
 export const zGetAppsByAppIdWorkflowRunsByRunIdNodeExecutionsPath = z.object({
   app_id: z.string(),
@@ -2466,7 +2940,7 @@ export const zGetAppsByAppIdWorkflowRunsByRunIdNodeExecutionsPath = z.object({
  * Node executions retrieved successfully
  */
 export const zGetAppsByAppIdWorkflowRunsByRunIdNodeExecutionsResponse
-  = zWorkflowRunNodeExecutionList
+  = zWorkflowRunNodeExecutionListResponse
 
 export const zGetAppsByAppIdWorkflowCommentsPath = z.object({
   app_id: z.string(),
@@ -2475,7 +2949,7 @@ export const zGetAppsByAppIdWorkflowCommentsPath = z.object({
 /**
  * Comments retrieved successfully
  */
-export const zGetAppsByAppIdWorkflowCommentsResponse = zWorkflowCommentBasic
+export const zGetAppsByAppIdWorkflowCommentsResponse = zWorkflowCommentBasicList
 
 export const zPostAppsByAppIdWorkflowCommentsBody = zWorkflowCommentCreatePayload
 
@@ -2506,10 +2980,7 @@ export const zDeleteAppsByAppIdWorkflowCommentsByCommentIdPath = z.object({
 /**
  * Comment deleted successfully
  */
-export const zDeleteAppsByAppIdWorkflowCommentsByCommentIdResponse = z.record(
-  z.string(),
-  z.unknown(),
-)
+export const zDeleteAppsByAppIdWorkflowCommentsByCommentIdResponse = z.record(z.string(), z.never())
 
 export const zGetAppsByAppIdWorkflowCommentsByCommentIdPath = z.object({
   app_id: z.string(),
@@ -2557,7 +3028,7 @@ export const zDeleteAppsByAppIdWorkflowCommentsByCommentIdRepliesByReplyIdPath =
  */
 export const zDeleteAppsByAppIdWorkflowCommentsByCommentIdRepliesByReplyIdResponse = z.record(
   z.string(),
-  z.unknown(),
+  z.never(),
 )
 
 export const zPutAppsByAppIdWorkflowCommentsByCommentIdRepliesByReplyIdBody
@@ -2664,7 +3135,7 @@ export const zGetAppsByAppIdWorkflowsQuery = z.object({
 /**
  * Published workflows retrieved successfully
  */
-export const zGetAppsByAppIdWorkflowsResponse = zWorkflowPagination
+export const zGetAppsByAppIdWorkflowsResponse = zWorkflowPaginationResponse
 
 export const zGetAppsByAppIdWorkflowsDefaultWorkflowBlockConfigsPath = z.object({
   app_id: z.string(),
@@ -2702,7 +3173,7 @@ export const zGetAppsByAppIdWorkflowsDraftPath = z.object({
 /**
  * Draft workflow retrieved successfully
  */
-export const zGetAppsByAppIdWorkflowsDraftResponse = zWorkflow
+export const zGetAppsByAppIdWorkflowsDraftResponse = zWorkflowResponse
 
 export const zPostAppsByAppIdWorkflowsDraftBody = zSyncDraftWorkflowPayload
 
@@ -2863,7 +3334,8 @@ export const zGetAppsByAppIdWorkflowsDraftNodesByNodeIdLastRunPath = z.object({
 /**
  * Node last run retrieved successfully
  */
-export const zGetAppsByAppIdWorkflowsDraftNodesByNodeIdLastRunResponse = zWorkflowRunNodeExecution
+export const zGetAppsByAppIdWorkflowsDraftNodesByNodeIdLastRunResponse
+  = zWorkflowRunNodeExecutionResponse
 
 export const zPostAppsByAppIdWorkflowsDraftNodesByNodeIdRunBody = zDraftWorkflowNodeRunPayload
 
@@ -2875,7 +3347,8 @@ export const zPostAppsByAppIdWorkflowsDraftNodesByNodeIdRunPath = z.object({
 /**
  * Node run started successfully
  */
-export const zPostAppsByAppIdWorkflowsDraftNodesByNodeIdRunResponse = zWorkflowRunNodeExecution
+export const zPostAppsByAppIdWorkflowsDraftNodesByNodeIdRunResponse
+  = zWorkflowRunNodeExecutionResponse
 
 export const zPostAppsByAppIdWorkflowsDraftNodesByNodeIdTriggerRunPath = z.object({
   app_id: z.string(),
@@ -2891,8 +3364,8 @@ export const zPostAppsByAppIdWorkflowsDraftNodesByNodeIdTriggerRunResponse = z.r
 )
 
 export const zDeleteAppsByAppIdWorkflowsDraftNodesByNodeIdVariablesPath = z.object({
-  node_id: z.string(),
   app_id: z.string(),
+  node_id: z.string(),
 })
 
 /**
@@ -2900,7 +3373,7 @@ export const zDeleteAppsByAppIdWorkflowsDraftNodesByNodeIdVariablesPath = z.obje
  */
 export const zDeleteAppsByAppIdWorkflowsDraftNodesByNodeIdVariablesResponse = z.record(
   z.string(),
-  z.unknown(),
+  z.never(),
 )
 
 export const zGetAppsByAppIdWorkflowsDraftNodesByNodeIdVariablesPath = z.object({
@@ -2963,15 +3436,15 @@ export const zDeleteAppsByAppIdWorkflowsDraftVariablesPath = z.object({
 /**
  * Workflow variables deleted successfully
  */
-export const zDeleteAppsByAppIdWorkflowsDraftVariablesResponse = z.record(z.string(), z.unknown())
+export const zDeleteAppsByAppIdWorkflowsDraftVariablesResponse = z.record(z.string(), z.never())
 
 export const zGetAppsByAppIdWorkflowsDraftVariablesPath = z.object({
   app_id: z.string(),
 })
 
 export const zGetAppsByAppIdWorkflowsDraftVariablesQuery = z.object({
-  page: z.int().gte(1).lte(100000).optional().default(1),
   limit: z.int().gte(1).lte(100).optional().default(20),
+  page: z.int().gte(1).lte(100000).optional().default(1),
 })
 
 /**
@@ -2989,7 +3462,7 @@ export const zDeleteAppsByAppIdWorkflowsDraftVariablesByVariableIdPath = z.objec
  */
 export const zDeleteAppsByAppIdWorkflowsDraftVariablesByVariableIdResponse = z.record(
   z.string(),
-  z.unknown(),
+  z.never(),
 )
 
 export const zGetAppsByAppIdWorkflowsDraftVariablesByVariableIdPath = z.object({
@@ -3022,7 +3495,7 @@ export const zPutAppsByAppIdWorkflowsDraftVariablesByVariableIdResetPath = z.obj
 
 export const zPutAppsByAppIdWorkflowsDraftVariablesByVariableIdResetResponse = z.union([
   zWorkflowDraftVariable,
-  z.record(z.string(), z.unknown()),
+  z.record(z.string(), z.never()),
 ])
 
 export const zGetAppsByAppIdWorkflowsPublishPath = z.object({
@@ -3030,9 +3503,9 @@ export const zGetAppsByAppIdWorkflowsPublishPath = z.object({
 })
 
 /**
- * Published workflow retrieved successfully
+ * Published workflow retrieved successfully, or null if not found
  */
-export const zGetAppsByAppIdWorkflowsPublishResponse = zWorkflow
+export const zGetAppsByAppIdWorkflowsPublishResponse = zWorkflowResponse
 
 export const zPostAppsByAppIdWorkflowsPublishBody = zPublishWorkflowPayload
 
@@ -3061,8 +3534,8 @@ export const zGetAppsByAppIdWorkflowsTriggersWebhookQuery = z.object({
 export const zGetAppsByAppIdWorkflowsTriggersWebhookResponse = zWebhookTriggerResponse
 
 export const zDeleteAppsByAppIdWorkflowsByWorkflowIdPath = z.object({
-  workflow_id: z.string(),
   app_id: z.string(),
+  workflow_id: z.string(),
 })
 
 /**
@@ -3080,7 +3553,7 @@ export const zPatchAppsByAppIdWorkflowsByWorkflowIdPath = z.object({
 /**
  * Workflow updated successfully
  */
-export const zPatchAppsByAppIdWorkflowsByWorkflowIdResponse = zWorkflow
+export const zPatchAppsByAppIdWorkflowsByWorkflowIdResponse = zWorkflowResponse
 
 export const zPostAppsByAppIdWorkflowsByWorkflowIdRestorePath = z.object({
   app_id: z.string(),
@@ -3114,14 +3587,14 @@ export const zPostAppsByResourceIdApiKeysPath = z.object({
 export const zPostAppsByResourceIdApiKeysResponse = zApiKeyItem
 
 export const zDeleteAppsByResourceIdApiKeysByApiKeyIdPath = z.object({
-  resource_id: z.string(),
   api_key_id: z.string(),
+  resource_id: z.string(),
 })
 
 /**
  * API key deleted successfully
  */
-export const zDeleteAppsByResourceIdApiKeysByApiKeyIdResponse = z.record(z.string(), z.unknown())
+export const zDeleteAppsByResourceIdApiKeysByApiKeyIdResponse = z.record(z.string(), z.never())
 
 export const zGetAppsByServerIdServerRefreshPath = z.object({
   server_id: z.string(),
diff --git a/packages/contracts/generated/api/console/auth/orpc.gen.ts b/packages/contracts/generated/api/console/auth/orpc.gen.ts
index 7a95a96f10..a17a733d82 100644
--- a/packages/contracts/generated/api/console/auth/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/auth/orpc.gen.ts
@@ -30,8 +30,16 @@ import {
   zPostAuthPluginDatasourceByProviderIdUpdateResponse,
 } from './zod.gen'
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAuthPluginDatasourceDefaultList',
@@ -44,8 +52,16 @@ export const defaultList = {
   get,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get2 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAuthPluginDatasourceList',
@@ -58,8 +74,16 @@ export const list = {
   get: get2,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const delete_ = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId: 'deleteAuthPluginDatasourceByProviderIdCustomClient',
@@ -69,8 +93,16 @@ export const delete_ = oc
   .input(z.object({ params: zDeleteAuthPluginDatasourceByProviderIdCustomClientPath }))
   .output(zDeleteAuthPluginDatasourceByProviderIdCustomClientResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAuthPluginDatasourceByProviderIdCustomClient',
@@ -90,8 +122,16 @@ export const customClient = {
   post,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post2 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAuthPluginDatasourceByProviderIdDefault',
@@ -110,8 +150,16 @@ export const default_ = {
   post: post2,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post3 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAuthPluginDatasourceByProviderIdDelete',
@@ -130,8 +178,16 @@ export const delete2 = {
   post: post3,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post4 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAuthPluginDatasourceByProviderIdUpdate',
@@ -150,8 +206,16 @@ export const update = {
   post: post4,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post5 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAuthPluginDatasourceByProviderIdUpdateName',
@@ -170,8 +234,16 @@ export const updateName = {
   post: post5,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get3 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAuthPluginDatasourceByProviderId',
@@ -181,8 +253,16 @@ export const get3 = oc
   .input(z.object({ params: zGetAuthPluginDatasourceByProviderIdPath }))
   .output(zGetAuthPluginDatasourceByProviderIdResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post6 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAuthPluginDatasourceByProviderId',
diff --git a/packages/contracts/generated/api/console/billing/orpc.gen.ts b/packages/contracts/generated/api/console/billing/orpc.gen.ts
index 09d25c072e..501f8a4e46 100644
--- a/packages/contracts/generated/api/console/billing/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/billing/orpc.gen.ts
@@ -11,8 +11,16 @@ import {
   zPutBillingPartnersByPartnerKeyTenantsResponse,
 } from './zod.gen'
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getBillingInvoices',
@@ -27,10 +35,16 @@ export const invoices = {
 
 /**
  * Sync partner tenants bindings
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const put = oc
   .route({
-    description: 'Sync partner tenants bindings',
+    deprecated: true,
+    description:
+      'Sync partner tenants bindings\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PUT',
     operationId: 'putBillingPartnersByPartnerKeyTenants',
@@ -57,8 +71,16 @@ export const partners = {
   byPartnerKey,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get2 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getBillingSubscription',
diff --git a/packages/contracts/generated/api/console/compliance/orpc.gen.ts b/packages/contracts/generated/api/console/compliance/orpc.gen.ts
index e68c87e7eb..ec7a9be60f 100644
--- a/packages/contracts/generated/api/console/compliance/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/compliance/orpc.gen.ts
@@ -7,10 +7,16 @@ import { zGetComplianceDownloadQuery, zGetComplianceDownloadResponse } from './z
 
 /**
  * Get compliance document download link
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get = oc
   .route({
-    description: 'Get compliance document download link',
+    deprecated: true,
+    description:
+      'Get compliance document download link\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getComplianceDownload',
diff --git a/packages/contracts/generated/api/console/data-source/orpc.gen.ts b/packages/contracts/generated/api/console/data-source/orpc.gen.ts
index 209447236a..dceb32433d 100644
--- a/packages/contracts/generated/api/console/data-source/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/data-source/orpc.gen.ts
@@ -12,8 +12,16 @@ import {
   zPatchDataSourceIntegratesResponse,
 } from './zod.gen'
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDataSourceIntegratesByBindingIdByAction',
@@ -23,8 +31,16 @@ export const get = oc
   .input(z.object({ params: zGetDataSourceIntegratesByBindingIdByActionPath }))
   .output(zGetDataSourceIntegratesByBindingIdByActionResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const patch = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchDataSourceIntegratesByBindingIdByAction',
@@ -43,8 +59,16 @@ export const byBindingId = {
   byAction,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get2 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDataSourceIntegrates',
@@ -53,8 +77,16 @@ export const get2 = oc
   })
   .output(zGetDataSourceIntegratesResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const patch2 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchDataSourceIntegrates',
diff --git a/packages/contracts/generated/api/console/data-source/types.gen.ts b/packages/contracts/generated/api/console/data-source/types.gen.ts
index db83d81ec1..b8e57e212a 100644
--- a/packages/contracts/generated/api/console/data-source/types.gen.ts
+++ b/packages/contracts/generated/api/console/data-source/types.gen.ts
@@ -39,8 +39,8 @@ export type PatchDataSourceIntegratesResponse
 export type GetDataSourceIntegratesByBindingIdByActionData = {
   body?: never
   path: {
-    binding_id: string
     action: string
+    binding_id: string
   }
   query?: never
   url: '/data-source/integrates/{binding_id}/{action}'
@@ -58,8 +58,8 @@ export type GetDataSourceIntegratesByBindingIdByActionResponse
 export type PatchDataSourceIntegratesByBindingIdByActionData = {
   body?: never
   path: {
-    binding_id: string
     action: string
+    binding_id: string
   }
   query?: never
   url: '/data-source/integrates/{binding_id}/{action}'
diff --git a/packages/contracts/generated/api/console/data-source/zod.gen.ts b/packages/contracts/generated/api/console/data-source/zod.gen.ts
index 1684b7e637..b98caa256c 100644
--- a/packages/contracts/generated/api/console/data-source/zod.gen.ts
+++ b/packages/contracts/generated/api/console/data-source/zod.gen.ts
@@ -13,8 +13,8 @@ export const zGetDataSourceIntegratesResponse = z.record(z.string(), z.unknown()
 export const zPatchDataSourceIntegratesResponse = z.record(z.string(), z.unknown())
 
 export const zGetDataSourceIntegratesByBindingIdByActionPath = z.object({
-  binding_id: z.string(),
   action: z.string(),
+  binding_id: z.string(),
 })
 
 /**
@@ -23,8 +23,8 @@ export const zGetDataSourceIntegratesByBindingIdByActionPath = z.object({
 export const zGetDataSourceIntegratesByBindingIdByActionResponse = z.record(z.string(), z.unknown())
 
 export const zPatchDataSourceIntegratesByBindingIdByActionPath = z.object({
-  binding_id: z.string(),
   action: z.string(),
+  binding_id: z.string(),
 })
 
 /**
diff --git a/packages/contracts/generated/api/console/datasets/orpc.gen.ts b/packages/contracts/generated/api/console/datasets/orpc.gen.ts
index 37a0b7cb8c..6a2bcb7720 100644
--- a/packages/contracts/generated/api/console/datasets/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/datasets/orpc.gen.ts
@@ -187,10 +187,16 @@ import {
 
 /**
  * Get dataset API base information
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get = oc
   .route({
-    description: 'Get dataset API base information',
+    deprecated: true,
+    description:
+      'Get dataset API base information\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsApiBaseInfo',
@@ -253,8 +259,16 @@ export const apiKeys = {
   byApiKeyId,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get3 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsBatchImportStatusByJobId',
@@ -264,8 +278,16 @@ export const get3 = oc
   .input(z.object({ params: zGetDatasetsBatchImportStatusByJobIdPath }))
   .output(zGetDatasetsBatchImportStatusByJobIdResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post2 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsBatchImportStatusByJobId',
@@ -291,10 +313,16 @@ export const batchImportStatus = {
 
 /**
  * Create external knowledge dataset
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post3 = oc
   .route({
-    description: 'Create external knowledge dataset',
+    deprecated: true,
+    description:
+      'Create external knowledge dataset\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsExternal',
@@ -311,10 +339,16 @@ export const external = {
 
 /**
  * Check if external knowledge API is being used
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get4 = oc
   .route({
-    description: 'Check if external knowledge API is being used',
+    deprecated: true,
+    description:
+      'Check if external knowledge API is being used\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsExternalKnowledgeApiByExternalKnowledgeApiIdUseCheck',
@@ -328,8 +362,16 @@ export const useCheck = {
   get: get4,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const delete2 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId: 'deleteDatasetsExternalKnowledgeApiByExternalKnowledgeApiId',
@@ -341,10 +383,16 @@ export const delete2 = oc
 
 /**
  * Get external knowledge API template details
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get5 = oc
   .route({
-    description: 'Get external knowledge API template details',
+    deprecated: true,
+    description:
+      'Get external knowledge API template details\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsExternalKnowledgeApiByExternalKnowledgeApiId',
@@ -354,8 +402,16 @@ export const get5 = oc
   .input(z.object({ params: zGetDatasetsExternalKnowledgeApiByExternalKnowledgeApiIdPath }))
   .output(zGetDatasetsExternalKnowledgeApiByExternalKnowledgeApiIdResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const patch = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchDatasetsExternalKnowledgeApiByExternalKnowledgeApiId',
@@ -379,10 +435,16 @@ export const byExternalKnowledgeApiId = {
 
 /**
  * Get external knowledge API templates
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get6 = oc
   .route({
-    description: 'Get external knowledge API templates',
+    deprecated: true,
+    description:
+      'Get external knowledge API templates\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsExternalKnowledgeApi',
@@ -392,8 +454,16 @@ export const get6 = oc
   .input(z.object({ query: zGetDatasetsExternalKnowledgeApiQuery.optional() }))
   .output(zGetDatasetsExternalKnowledgeApiResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post4 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsExternalKnowledgeApi',
@@ -411,10 +481,16 @@ export const externalKnowledgeApi = {
 
 /**
  * Estimate dataset indexing cost
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post5 = oc
   .route({
-    description: 'Estimate dataset indexing cost',
+    deprecated: true,
+    description:
+      'Estimate dataset indexing cost\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsIndexingEstimate',
@@ -430,10 +506,16 @@ export const indexingEstimate = {
 
 /**
  * Initialize dataset with documents
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post6 = oc
   .route({
-    description: 'Initialize dataset with documents',
+    deprecated: true,
+    description:
+      'Initialize dataset with documents\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsInit',
@@ -448,8 +530,16 @@ export const init = {
   post: post6,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get7 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsMetadataBuiltIn',
@@ -466,8 +556,16 @@ export const metadata = {
   builtIn,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get8 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsNotionIndexingEstimate',
@@ -476,8 +574,16 @@ export const get8 = oc
   })
   .output(zGetDatasetsNotionIndexingEstimateResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post7 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsNotionIndexingEstimate',
@@ -494,10 +600,16 @@ export const notionIndexingEstimate = {
 
 /**
  * Get dataset document processing rules
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get9 = oc
   .route({
-    description: 'Get dataset document processing rules',
+    deprecated: true,
+    description:
+      'Get dataset document processing rules\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsProcessRule',
@@ -513,10 +625,16 @@ export const processRule = {
 
 /**
  * Get mock dataset retrieval settings by vector type
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get10 = oc
   .route({
-    description: 'Get mock dataset retrieval settings by vector type',
+    deprecated: true,
+    description:
+      'Get mock dataset retrieval settings by vector type\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsRetrievalSettingByVectorType',
@@ -532,10 +650,16 @@ export const byVectorType = {
 
 /**
  * Get dataset retrieval settings
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get11 = oc
   .route({
-    description: 'Get dataset retrieval settings',
+    deprecated: true,
+    description:
+      'Get dataset retrieval settings\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsRetrievalSetting',
@@ -549,8 +673,16 @@ export const retrievalSetting = {
   byVectorType,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post8 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdApiKeysByStatus',
@@ -570,10 +702,16 @@ export const apiKeys2 = {
 
 /**
  * Get dataset auto disable logs
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get12 = oc
   .route({
-    description: 'Get dataset auto disable logs',
+    deprecated: true,
+    description:
+      'Get dataset auto disable logs\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdAutoDisableLogs',
@@ -587,8 +725,16 @@ export const autoDisableLogs = {
   get: get12,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get13 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdBatchByBatchIndexingEstimate',
@@ -602,8 +748,16 @@ export const indexingEstimate2 = {
   get: get13,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get14 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdBatchByBatchIndexingStatus',
@@ -630,10 +784,16 @@ export const batch = {
  * Stream a ZIP archive containing the requested uploaded documents
  *
  * Download selected dataset documents as a single ZIP archive (upload-file only)
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post9 = oc
   .route({
-    description: 'Download selected dataset documents as a single ZIP archive (upload-file only)',
+    deprecated: true,
+    description:
+      'Download selected dataset documents as a single ZIP archive (upload-file only)\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdDocumentsDownloadZip',
@@ -660,11 +820,16 @@ export const downloadZip = {
  * This endpoint checks if the dataset configuration supports summary generation
  * (indexing_technique must be 'high_quality' and summary_index_setting.enable must be true),
  * then asynchronously generates summary indexes for the provided documents.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post10 = oc
   .route({
+    deprecated: true,
     description:
-      'Generate summary index for documents\nThis endpoint checks if the dataset configuration supports summary generation\n(indexing_technique must be \'high_quality\' and summary_index_setting.enable must be true),\nthen asynchronously generates summary indexes for the provided documents.',
+      'Generate summary index for documents\nThis endpoint checks if the dataset configuration supports summary generation\n(indexing_technique must be \'high_quality\' and summary_index_setting.enable must be true),\nthen asynchronously generates summary indexes for the provided documents.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdDocumentsGenerateSummary',
@@ -684,8 +849,16 @@ export const generateSummary = {
   post: post10,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post11 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdDocumentsMetadata',
@@ -704,8 +877,16 @@ export const metadata2 = {
   post: post11,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const patch2 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchDatasetsByDatasetIdDocumentsStatusByActionBatch',
@@ -729,10 +910,16 @@ export const status = {
 
 /**
  * Get a signed download URL for a dataset document's original uploaded file
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get15 = oc
   .route({
-    description: 'Get a signed download URL for a dataset document\'s original uploaded file',
+    deprecated: true,
+    description:
+      'Get a signed download URL for a dataset document\'s original uploaded file\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdDocumentsByDocumentIdDownload',
@@ -748,10 +935,16 @@ export const download = {
 
 /**
  * Estimate document indexing cost
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get16 = oc
   .route({
-    description: 'Estimate document indexing cost',
+    deprecated: true,
+    description:
+      'Estimate document indexing cost\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdDocumentsByDocumentIdIndexingEstimate',
@@ -767,10 +960,16 @@ export const indexingEstimate3 = {
 
 /**
  * Get document indexing status
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get17 = oc
   .route({
-    description: 'Get document indexing status',
+    deprecated: true,
+    description:
+      'Get document indexing status\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdDocumentsByDocumentIdIndexingStatus',
@@ -786,10 +985,16 @@ export const indexingStatus2 = {
 
 /**
  * Update document metadata
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const put = oc
   .route({
-    description: 'Update document metadata',
+    deprecated: true,
+    description:
+      'Update document metadata\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PUT',
     operationId: 'putDatasetsByDatasetIdDocumentsByDocumentIdMetadata',
@@ -808,8 +1013,16 @@ export const metadata3 = {
   put,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get18 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdDocumentsByDocumentIdNotionSync',
@@ -827,8 +1040,16 @@ export const notion = {
   sync,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get19 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdDocumentsByDocumentIdPipelineExecutionLog',
@@ -844,9 +1065,16 @@ export const pipelineExecutionLog = {
 
 /**
  * pause document
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const patch3 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchDatasetsByDatasetIdDocumentsByDocumentIdProcessingPause',
@@ -863,9 +1091,16 @@ export const pause = {
 
 /**
  * recover document
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const patch4 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchDatasetsByDatasetIdDocumentsByDocumentIdProcessingResume',
@@ -882,10 +1117,16 @@ export const resume = {
 
 /**
  * Update document processing status (pause/resume)
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const patch5 = oc
   .route({
-    description: 'Update document processing status (pause/resume)',
+    deprecated: true,
+    description:
+      'Update document processing status (pause/resume)\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchDatasetsByDatasetIdDocumentsByDocumentIdProcessingByAction',
@@ -925,8 +1166,16 @@ export const rename = {
   post: post12,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const patch6 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchDatasetsByDatasetIdDocumentsByDocumentIdSegmentByAction',
@@ -940,8 +1189,16 @@ export const byAction3 = {
   patch: patch6,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post13 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdDocumentsByDocumentIdSegment',
@@ -961,8 +1218,16 @@ export const segment = {
   byAction: byAction3,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get20 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBatchImport',
@@ -972,8 +1237,16 @@ export const get20 = oc
   .input(z.object({ params: zGetDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBatchImportPath }))
   .output(zGetDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBatchImportResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post14 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBatchImport',
@@ -993,8 +1266,16 @@ export const batchImport = {
   post: post14,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const delete3 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId:
@@ -1012,8 +1293,16 @@ export const delete3 = oc
     zDeleteDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdChildChunksByChildChunkIdResponse,
   )
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const patch7 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId:
@@ -1037,8 +1326,16 @@ export const byChildChunkId = {
   patch: patch7,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get21 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdChildChunks',
@@ -1052,8 +1349,16 @@ export const get21 = oc
   )
   .output(zGetDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdChildChunksResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const patch8 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdChildChunks',
@@ -1067,8 +1372,16 @@ export const patch8 = oc
   )
   .output(zPatchDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdChildChunksResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post15 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdChildChunks',
@@ -1090,8 +1403,16 @@ export const childChunks = {
   byChildChunkId,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const delete4 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId: 'deleteDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentId',
@@ -1103,8 +1424,16 @@ export const delete4 = oc
   )
   .output(zDeleteDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const patch9 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentId',
@@ -1125,8 +1454,16 @@ export const bySegmentId = {
   childChunks,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const delete5 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId: 'deleteDatasetsByDatasetIdDocumentsByDocumentIdSegments',
@@ -1136,8 +1473,16 @@ export const delete5 = oc
   .input(z.object({ params: zDeleteDatasetsByDatasetIdDocumentsByDocumentIdSegmentsPath }))
   .output(zDeleteDatasetsByDatasetIdDocumentsByDocumentIdSegmentsResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get22 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdDocumentsByDocumentIdSegments',
@@ -1166,11 +1511,16 @@ export const segments = {
  * - error: Number of summaries with errors
  * - not_started: Number of segments without summary records
  * - summaries: List of summary records with status and content preview
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get23 = oc
   .route({
+    deprecated: true,
     description:
-      'Get summary index generation status for a document\nReturns:\n- total_segments: Total number of segments in the document\n- summary_status: Dictionary with status counts\n  - completed: Number of summaries completed\n  - generating: Number of summaries being generated\n  - error: Number of summaries with errors\n  - not_started: Number of segments without summary records\n- summaries: List of summary records with status and content preview',
+      'Get summary index generation status for a document\nReturns:\n- total_segments: Total number of segments in the document\n- summary_status: Dictionary with status counts\n  - completed: Number of summaries completed\n  - generating: Number of summaries being generated\n  - error: Number of summaries with errors\n  - not_started: Number of segments without summary records\n- summaries: List of summary records with status and content preview\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdDocumentsByDocumentIdSummaryStatus',
@@ -1187,9 +1537,16 @@ export const summaryStatus = {
 
 /**
  * sync website document
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get24 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdDocumentsByDocumentIdWebsiteSync',
@@ -1204,8 +1561,16 @@ export const websiteSync = {
   get: get24,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const delete6 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId: 'deleteDatasetsByDatasetIdDocumentsByDocumentId',
@@ -1217,10 +1582,16 @@ export const delete6 = oc
 
 /**
  * Get document details
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get25 = oc
   .route({
-    description: 'Get document details',
+    deprecated: true,
+    description:
+      'Get document details\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdDocumentsByDocumentId',
@@ -1252,8 +1623,16 @@ export const byDocumentId = {
   websiteSync,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const delete7 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId: 'deleteDatasetsByDatasetIdDocuments',
@@ -1265,10 +1644,16 @@ export const delete7 = oc
 
 /**
  * Get documents in a dataset
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get26 = oc
   .route({
-    description: 'Get documents in a dataset',
+    deprecated: true,
+    description:
+      'Get documents in a dataset\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdDocuments',
@@ -1283,8 +1668,16 @@ export const get26 = oc
   )
   .output(zGetDatasetsByDatasetIdDocumentsResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post16 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdDocuments',
@@ -1312,10 +1705,16 @@ export const documents = {
 
 /**
  * Get dataset error documents
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get27 = oc
   .route({
-    description: 'Get dataset error documents',
+    deprecated: true,
+    description:
+      'Get dataset error documents\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdErrorDocs',
@@ -1331,10 +1730,16 @@ export const errorDocs = {
 
 /**
  * Test external knowledge retrieval for dataset
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post17 = oc
   .route({
-    description: 'Test external knowledge retrieval for dataset',
+    deprecated: true,
+    description:
+      'Test external knowledge retrieval for dataset\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdExternalHitTesting',
@@ -1355,10 +1760,16 @@ export const externalHitTesting = {
 
 /**
  * Test dataset knowledge retrieval
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post18 = oc
   .route({
-    description: 'Test dataset knowledge retrieval',
+    deprecated: true,
+    description:
+      'Test dataset knowledge retrieval\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdHitTesting',
@@ -1379,10 +1790,16 @@ export const hitTesting = {
 
 /**
  * Get dataset indexing status
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get28 = oc
   .route({
-    description: 'Get dataset indexing status',
+    deprecated: true,
+    description:
+      'Get dataset indexing status\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdIndexingStatus',
@@ -1396,8 +1813,16 @@ export const indexingStatus3 = {
   get: get28,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post19 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdMetadataBuiltInByAction',
@@ -1415,8 +1840,16 @@ export const builtIn2 = {
   byAction: byAction4,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const delete8 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId: 'deleteDatasetsByDatasetIdMetadataByMetadataId',
@@ -1426,8 +1859,16 @@ export const delete8 = oc
   .input(z.object({ params: zDeleteDatasetsByDatasetIdMetadataByMetadataIdPath }))
   .output(zDeleteDatasetsByDatasetIdMetadataByMetadataIdResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const patch10 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchDatasetsByDatasetIdMetadataByMetadataId',
@@ -1447,8 +1888,16 @@ export const byMetadataId = {
   patch: patch10,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get29 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdMetadata',
@@ -1458,8 +1907,16 @@ export const get29 = oc
   .input(z.object({ params: zGetDatasetsByDatasetIdMetadataPath }))
   .output(zGetDatasetsByDatasetIdMetadataResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post20 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdMetadata',
@@ -1481,8 +1938,16 @@ export const metadata4 = {
   byMetadataId,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get30 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdNotionSync',
@@ -1502,10 +1967,16 @@ export const notion2 = {
 
 /**
  * Get dataset permission user list
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get31 = oc
   .route({
-    description: 'Get dataset permission user list',
+    deprecated: true,
+    description:
+      'Get dataset permission user list\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdPermissionPartUsers',
@@ -1521,10 +1992,16 @@ export const permissionPartUsers = {
 
 /**
  * Get dataset query history
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get32 = oc
   .route({
-    description: 'Get dataset query history',
+    deprecated: true,
+    description:
+      'Get dataset query history\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdQueries',
@@ -1540,10 +2017,16 @@ export const queries = {
 
 /**
  * Get applications related to dataset
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get33 = oc
   .route({
-    description: 'Get applications related to dataset',
+    deprecated: true,
+    description:
+      'Get applications related to dataset\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdRelatedApps',
@@ -1559,9 +2042,16 @@ export const relatedApps = {
 
 /**
  * retry document
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post21 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdRetry',
@@ -1583,10 +2073,16 @@ export const retry = {
 
 /**
  * Check if dataset is in use
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get34 = oc
   .route({
-    description: 'Check if dataset is in use',
+    deprecated: true,
+    description:
+      'Check if dataset is in use\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdUseCheck',
@@ -1600,8 +2096,16 @@ export const useCheck2 = {
   get: get34,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const delete9 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId: 'deleteDatasetsByDatasetId',
@@ -1613,10 +2117,16 @@ export const delete9 = oc
 
 /**
  * Get dataset details
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get35 = oc
   .route({
-    description: 'Get dataset details',
+    deprecated: true,
+    description:
+      'Get dataset details\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetId',
@@ -1628,10 +2138,16 @@ export const get35 = oc
 
 /**
  * Update dataset details
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const patch11 = oc
   .route({
-    description: 'Update dataset details',
+    deprecated: true,
+    description:
+      'Update dataset details\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchDatasetsByDatasetId',
@@ -1734,10 +2250,16 @@ export const byResourceId = {
 
 /**
  * Get list of datasets
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get37 = oc
   .route({
-    description: 'Get list of datasets',
+    deprecated: true,
+    description:
+      'Get list of datasets\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasets',
@@ -1749,10 +2271,16 @@ export const get37 = oc
 
 /**
  * Create a new dataset
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post23 = oc
   .route({
-    description: 'Create a new dataset',
+    deprecated: true,
+    description:
+      'Create a new dataset\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasets',
diff --git a/packages/contracts/generated/api/console/datasets/types.gen.ts b/packages/contracts/generated/api/console/datasets/types.gen.ts
index 89a68593b7..4b1ff07660 100644
--- a/packages/contracts/generated/api/console/datasets/types.gen.ts
+++ b/packages/contracts/generated/api/console/datasets/types.gen.ts
@@ -41,7 +41,45 @@ export type ExternalDatasetCreatePayload = {
 }
 
 export type DatasetDetail = {
-  [key: string]: unknown
+  app_count?: number
+  author_name?: string
+  built_in_field_enabled?: boolean
+  chunk_structure?: string
+  created_at?: {
+    [key: string]: unknown
+  }
+  created_by?: string
+  data_source_type?: string
+  description?: string
+  doc_form?: string
+  doc_metadata?: Array<DatasetDocMetadata>
+  document_count?: number
+  embedding_available?: boolean
+  embedding_model?: string
+  embedding_model_provider?: string
+  enable_api?: boolean
+  external_knowledge_info?: ExternalKnowledgeInfo
+  external_retrieval_model?: ExternalRetrievalModel
+  icon_info?: DatasetIconInfo
+  id?: string
+  indexing_technique?: string
+  is_multimodal?: boolean
+  is_published?: boolean
+  name?: string
+  permission?: string
+  pipeline_id?: string
+  provider?: string
+  retrieval_model_dict?: DatasetRetrievalModel
+  runtime_mode?: string
+  summary_index_setting?: AnonymousInlineModelB1954337D565
+  tags?: Array<Tag>
+  total_available_documents?: number
+  total_documents?: number
+  updated_at?: {
+    [key: string]: unknown
+  }
+  updated_by?: string
+  word_count?: number
 }
 
 export type ExternalKnowledgeApiPayload = {
@@ -71,7 +109,7 @@ export type KnowledgeConfig = {
   duplicate?: boolean
   embedding_model?: string | null
   embedding_model_provider?: string | null
-  indexing_technique: 'high_quality' | 'economy'
+  indexing_technique: 'economy' | 'high_quality'
   is_multimodal?: boolean
   name?: string | null
   original_document_id?: string | null
@@ -224,7 +262,7 @@ export type HitTestingResponse = {
 
 export type MetadataArgs = {
   name: string
-  type: 'string' | 'number' | 'time'
+  type: 'number' | 'string' | 'time'
 }
 
 export type MetadataUpdatePayload = {
@@ -232,18 +270,77 @@ export type MetadataUpdatePayload = {
 }
 
 export type DatasetQueryDetail = {
-  [key: string]: unknown
+  created_at?: {
+    [key: string]: unknown
+  }
+  created_by?: string
+  created_by_role?: string
+  id?: string
+  queries?: DatasetContent
+  source?: string
+  source_app_id?: string
 }
 
 export type RelatedAppList = {
-  [key: string]: unknown
+  data?: Array<AppDetailKernel>
+  total?: number
 }
 
 export type DocumentRetryPayload = {
   document_ids: Array<string>
 }
 
-export type DatasetPermissionEnum = 'only_me' | 'all_team_members' | 'partial_members'
+export type DatasetPermissionEnum = 'all_team_members' | 'only_me' | 'partial_members'
+
+export type DatasetDocMetadata = {
+  id?: string
+  name?: string
+  type?: string
+}
+
+export type ExternalKnowledgeInfo = {
+  external_knowledge_api_endpoint?: string
+  external_knowledge_api_id?: string
+  external_knowledge_api_name?: string
+  external_knowledge_id?: string
+}
+
+export type ExternalRetrievalModel = {
+  score_threshold?: number
+  score_threshold_enabled?: boolean
+  top_k?: number
+}
+
+export type DatasetIconInfo = {
+  icon?: string
+  icon_background?: string
+  icon_type?: string
+  icon_url?: string
+}
+
+export type DatasetRetrievalModel = {
+  reranking_enable?: boolean
+  reranking_mode?: string
+  reranking_model?: DatasetRerankingModel
+  score_threshold?: number
+  score_threshold_enabled?: boolean
+  search_method?: string
+  top_k?: number
+  weights?: DatasetWeightedScore
+}
+
+export type AnonymousInlineModelB1954337D565 = {
+  enable?: boolean
+  model_name?: string
+  model_provider_name?: string
+  summary_prompt?: string
+}
+
+export type Tag = {
+  id: string
+  name: string
+  type: string
+}
 
 export type DataSource = {
   info_list: InfoList
@@ -255,6 +352,7 @@ export type ProcessRule = {
 }
 
 export type RetrievalModel = {
+  metadata_filtering_conditions?: MetadataFilteringCondition
   reranking_enable: boolean
   reranking_mode?: string | null
   reranking_model?: RerankingModel
@@ -298,8 +396,38 @@ export type HitTestingRecord = {
   tsne_position?: unknown
 }
 
+export type DatasetContent = {
+  content?: string
+  content_type?: string
+  file_info?: DatasetFileInfo
+}
+
+export type AppDetailKernel = {
+  description?: string
+  icon?: string
+  icon_background?: string
+  icon_type?: string
+  icon_url?: {
+    [key: string]: unknown
+  }
+  id?: string
+  mode?: string
+  name?: string
+}
+
+export type DatasetRerankingModel = {
+  reranking_model_name?: string
+  reranking_provider_name?: string
+}
+
+export type DatasetWeightedScore = {
+  keyword_setting?: DatasetKeywordSetting
+  vector_setting?: DatasetVectorSetting
+  weight_type?: string
+}
+
 export type InfoList = {
-  data_source_type: 'upload_file' | 'notion_import' | 'website_crawl'
+  data_source_type: 'notion_import' | 'upload_file' | 'website_crawl'
   file_info_list?: FileInfo
   notion_info_list?: Array<NotionInfo> | null
   website_info_list?: WebsiteInfo
@@ -312,21 +440,26 @@ export type Rule = {
   subchunk_segmentation?: Segmentation
 }
 
+export type MetadataFilteringCondition = {
+  conditions?: Array<Condition> | null
+  logical_operator?: 'and' | 'or' | null
+}
+
 export type RerankingModel = {
   reranking_model_name?: string | null
   reranking_provider_name?: string | null
 }
 
 export type RetrievalMethod
-  = | 'semantic_search'
-    | 'full_text_search'
+  = | 'full_text_search'
     | 'hybrid_search'
     | 'keyword_search'
+    | 'semantic_search'
 
 export type WeightModel = {
   keyword_setting?: WeightKeywordSetting
   vector_setting?: WeightVectorSetting
-  weight_type?: 'semantic_first' | 'keyword_first' | 'customized' | null
+  weight_type?: 'customized' | 'keyword_first' | 'semantic_first' | null
 }
 
 export type MetadataDetail = {
@@ -377,6 +510,25 @@ export type HitTestingSegment = {
   word_count?: number | null
 }
 
+export type DatasetFileInfo = {
+  extension?: string
+  id?: string
+  mime_type?: string
+  name?: string
+  size?: number
+  source_url?: string
+}
+
+export type DatasetKeywordSetting = {
+  keyword_weight?: number
+}
+
+export type DatasetVectorSetting = {
+  embedding_model_name?: string
+  embedding_provider_name?: string
+  vector_weight?: number
+}
+
 export type FileInfo = {
   file_ids: Array<string>
 }
@@ -405,6 +557,30 @@ export type Segmentation = {
   separator?: string
 }
 
+export type Condition = {
+  comparison_operator:
+    | '<'
+    | '='
+    | '>'
+    | 'after'
+    | 'before'
+    | 'contains'
+    | 'empty'
+    | 'end with'
+    | 'in'
+    | 'is'
+    | 'is not'
+    | 'not contains'
+    | 'not empty'
+    | 'not in'
+    | 'start with'
+    | '≠'
+    | '≤'
+    | '≥'
+  name: string
+  value?: unknown
+}
+
 export type WeightKeywordSetting = {
   keyword_weight: number
 }
@@ -440,12 +616,12 @@ export type GetDatasetsData = {
   body?: never
   path?: never
   query?: {
-    page?: string
-    limit?: string
     ids?: string
-    keyword?: string
-    tag_ids?: string
     include_all?: string
+    keyword?: string
+    limit?: string
+    page?: string
+    tag_ids?: string
   }
   url: '/datasets'
 }
@@ -544,7 +720,7 @@ export type DeleteDatasetsApiKeysByApiKeyIdData = {
 
 export type DeleteDatasetsApiKeysByApiKeyIdResponses = {
   204: {
-    [key: string]: unknown
+    [key: string]: never
   }
 }
 
@@ -616,9 +792,9 @@ export type GetDatasetsExternalKnowledgeApiData = {
   body?: never
   path?: never
   query?: {
-    page?: string
-    limit?: string
     keyword?: string
+    limit?: string
+    page?: string
   }
   url: '/datasets/external-knowledge-api'
 }
@@ -989,8 +1165,8 @@ export type GetDatasetsByDatasetIdAutoDisableLogsResponse
 export type GetDatasetsByDatasetIdBatchByBatchIndexingEstimateData = {
   body?: never
   path: {
-    dataset_id: string
     batch: string
+    dataset_id: string
   }
   query?: never
   url: '/datasets/{dataset_id}/batch/{batch}/indexing-estimate'
@@ -1008,8 +1184,8 @@ export type GetDatasetsByDatasetIdBatchByBatchIndexingEstimateResponse
 export type GetDatasetsByDatasetIdBatchByBatchIndexingStatusData = {
   body?: never
   path: {
-    dataset_id: string
     batch: string
+    dataset_id: string
   }
   query?: never
   url: '/datasets/{dataset_id}/batch/{batch}/indexing-status'
@@ -1048,11 +1224,11 @@ export type GetDatasetsByDatasetIdDocumentsData = {
     dataset_id: string
   }
   query?: {
-    page?: string
-    limit?: string
-    keyword?: string
-    sort?: string
     fetch?: string
+    keyword?: string
+    limit?: string
+    page?: string
+    sort?: string
     status?: string
   }
   url: '/datasets/{dataset_id}/documents'
@@ -1155,8 +1331,8 @@ export type PostDatasetsByDatasetIdDocumentsMetadataResponse
 export type PatchDatasetsByDatasetIdDocumentsStatusByActionBatchData = {
   body?: never
   path: {
-    dataset_id: string
     action: string
+    dataset_id: string
   }
   query?: never
   url: '/datasets/{dataset_id}/documents/status/{action}/batch'
@@ -1408,9 +1584,9 @@ export type PatchDatasetsByDatasetIdDocumentsByDocumentIdProcessingResumeRespons
 export type PatchDatasetsByDatasetIdDocumentsByDocumentIdProcessingByActionData = {
   body?: never
   path: {
+    action: string
     dataset_id: string
     document_id: string
-    action: string
   }
   query?: never
   url: '/datasets/{dataset_id}/documents/{document_id}/processing/{action}'
@@ -1476,9 +1652,9 @@ export type PostDatasetsByDatasetIdDocumentsByDocumentIdSegmentResponse
 export type PatchDatasetsByDatasetIdDocumentsByDocumentIdSegmentByActionData = {
   body?: never
   path: {
+    action: string
     dataset_id: string
     document_id: string
-    action: string
   }
   query?: never
   url: '/datasets/{dataset_id}/documents/{document_id}/segment/{action}'
@@ -1673,10 +1849,10 @@ export type DeleteDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdChi
   = {
     body?: never
     path: {
+      child_chunk_id: string
       dataset_id: string
       document_id: string
       segment_id: string
-      child_chunk_id: string
     }
     query?: never
     url: '/datasets/{dataset_id}/documents/{document_id}/segments/{segment_id}/child_chunks/{child_chunk_id}'
@@ -1696,10 +1872,10 @@ export type PatchDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdChil
   = {
     body: ChildChunkUpdatePayload
     path: {
+      child_chunk_id: string
       dataset_id: string
       document_id: string
       segment_id: string
-      child_chunk_id: string
     }
     query?: never
     url: '/datasets/{dataset_id}/documents/{document_id}/segments/{segment_id}/child_chunks/{child_chunk_id}'
@@ -1904,8 +2080,8 @@ export type PostDatasetsByDatasetIdMetadataResponse
 export type PostDatasetsByDatasetIdMetadataBuiltInByActionData = {
   body?: never
   path: {
-    dataset_id: string
     action: string
+    dataset_id: string
   }
   query?: never
   url: '/datasets/{dataset_id}/metadata/built-in/{action}'
@@ -2118,8 +2294,8 @@ export type PostDatasetsByResourceIdApiKeysResponse
 export type DeleteDatasetsByResourceIdApiKeysByApiKeyIdData = {
   body?: never
   path: {
-    resource_id: string
     api_key_id: string
+    resource_id: string
   }
   query?: never
   url: '/datasets/{resource_id}/api-keys/{api_key_id}'
@@ -2127,7 +2303,7 @@ export type DeleteDatasetsByResourceIdApiKeysByApiKeyIdData = {
 
 export type DeleteDatasetsByResourceIdApiKeysByApiKeyIdResponses = {
   204: {
-    [key: string]: unknown
+    [key: string]: never
   }
 }
 
diff --git a/packages/contracts/generated/api/console/datasets/zod.gen.ts b/packages/contracts/generated/api/console/datasets/zod.gen.ts
index 2ac2cbfd1f..e26f412da9 100644
--- a/packages/contracts/generated/api/console/datasets/zod.gen.ts
+++ b/packages/contracts/generated/api/console/datasets/zod.gen.ts
@@ -38,8 +38,6 @@ export const zExternalDatasetCreatePayload = z.object({
   name: z.string().min(1).max(100),
 })
 
-export const zDatasetDetail = z.record(z.string(), z.unknown())
-
 /**
  * ExternalKnowledgeApiPayload
  */
@@ -151,7 +149,7 @@ export const zExternalHitTestingPayload = z.object({
  */
 export const zMetadataArgs = z.object({
   name: z.string(),
-  type: z.enum(['string', 'number', 'time']),
+  type: z.enum(['number', 'string', 'time']),
 })
 
 /**
@@ -161,10 +159,6 @@ export const zMetadataUpdatePayload = z.object({
   name: z.string(),
 })
 
-export const zDatasetQueryDetail = z.record(z.string(), z.unknown())
-
-export const zRelatedAppList = z.record(z.string(), z.unknown())
-
 /**
  * DocumentRetryPayload
  */
@@ -175,7 +169,7 @@ export const zDocumentRetryPayload = z.object({
 /**
  * DatasetPermissionEnum
  */
-export const zDatasetPermissionEnum = z.enum(['only_me', 'all_team_members', 'partial_members'])
+export const zDatasetPermissionEnum = z.enum(['all_team_members', 'only_me', 'partial_members'])
 
 /**
  * DatasetCreatePayload
@@ -210,6 +204,48 @@ export const zDatasetUpdatePayload = z.object({
   summary_index_setting: z.record(z.string(), z.unknown()).nullish(),
 })
 
+export const zDatasetDocMetadata = z.object({
+  id: z.string().optional(),
+  name: z.string().optional(),
+  type: z.string().optional(),
+})
+
+export const zExternalKnowledgeInfo = z.object({
+  external_knowledge_api_endpoint: z.string().optional(),
+  external_knowledge_api_id: z.string().optional(),
+  external_knowledge_api_name: z.string().optional(),
+  external_knowledge_id: z.string().optional(),
+})
+
+export const zExternalRetrievalModel = z.object({
+  score_threshold: z.number().optional(),
+  score_threshold_enabled: z.boolean().optional(),
+  top_k: z.int().optional(),
+})
+
+export const zDatasetIconInfo = z.object({
+  icon: z.string().optional(),
+  icon_background: z.string().optional(),
+  icon_type: z.string().optional(),
+  icon_url: z.string().optional(),
+})
+
+export const zAnonymousInlineModelB1954337D565 = z.object({
+  enable: z.boolean().optional(),
+  model_name: z.string().optional(),
+  model_provider_name: z.string().optional(),
+  summary_prompt: z.string().optional(),
+})
+
+/**
+ * Tag
+ */
+export const zTag = z.object({
+  id: z.string(),
+  name: z.string(),
+  type: z.string(),
+})
+
 /**
  * DatasetResponse
  */
@@ -273,6 +309,27 @@ export const zDatasetAndDocumentResponse = z.object({
   documents: z.array(zDocumentResponse),
 })
 
+export const zAppDetailKernel = z.object({
+  description: z.string().optional(),
+  icon: z.string().optional(),
+  icon_background: z.string().optional(),
+  icon_type: z.string().optional(),
+  icon_url: z.record(z.string(), z.unknown()).optional(),
+  id: z.string().optional(),
+  mode: z.string().optional(),
+  name: z.string().optional(),
+})
+
+export const zRelatedAppList = z.object({
+  data: z.array(zAppDetailKernel).optional(),
+  total: z.int().optional(),
+})
+
+export const zDatasetRerankingModel = z.object({
+  reranking_model_name: z.string().optional(),
+  reranking_provider_name: z.string().optional(),
+})
+
 /**
  * RerankingModel
  */
@@ -285,10 +342,10 @@ export const zRerankingModel = z.object({
  * RetrievalMethod
  */
 export const zRetrievalMethod = z.enum([
-  'semantic_search',
   'full_text_search',
   'hybrid_search',
   'keyword_search',
+  'semantic_search',
 ])
 
 /**
@@ -340,6 +397,96 @@ export const zHitTestingFile = z.object({
   source_url: z.string().nullish(),
 })
 
+export const zDatasetFileInfo = z.object({
+  extension: z.string().optional(),
+  id: z.string().optional(),
+  mime_type: z.string().optional(),
+  name: z.string().optional(),
+  size: z.int().optional(),
+  source_url: z.string().optional(),
+})
+
+export const zDatasetContent = z.object({
+  content: z.string().optional(),
+  content_type: z.string().optional(),
+  file_info: zDatasetFileInfo.optional(),
+})
+
+export const zDatasetQueryDetail = z.object({
+  created_at: z.record(z.string(), z.unknown()).optional(),
+  created_by: z.string().optional(),
+  created_by_role: z.string().optional(),
+  id: z.string().optional(),
+  queries: zDatasetContent.optional(),
+  source: z.string().optional(),
+  source_app_id: z.string().optional(),
+})
+
+export const zDatasetKeywordSetting = z.object({
+  keyword_weight: z.number().optional(),
+})
+
+export const zDatasetVectorSetting = z.object({
+  embedding_model_name: z.string().optional(),
+  embedding_provider_name: z.string().optional(),
+  vector_weight: z.number().optional(),
+})
+
+export const zDatasetWeightedScore = z.object({
+  keyword_setting: zDatasetKeywordSetting.optional(),
+  vector_setting: zDatasetVectorSetting.optional(),
+  weight_type: z.string().optional(),
+})
+
+export const zDatasetRetrievalModel = z.object({
+  reranking_enable: z.boolean().optional(),
+  reranking_mode: z.string().optional(),
+  reranking_model: zDatasetRerankingModel.optional(),
+  score_threshold: z.number().optional(),
+  score_threshold_enabled: z.boolean().optional(),
+  search_method: z.string().optional(),
+  top_k: z.int().optional(),
+  weights: zDatasetWeightedScore.optional(),
+})
+
+export const zDatasetDetail = z.object({
+  app_count: z.int().optional(),
+  author_name: z.string().optional(),
+  built_in_field_enabled: z.boolean().optional(),
+  chunk_structure: z.string().optional(),
+  created_at: z.record(z.string(), z.unknown()).optional(),
+  created_by: z.string().optional(),
+  data_source_type: z.string().optional(),
+  description: z.string().optional(),
+  doc_form: z.string().optional(),
+  doc_metadata: z.array(zDatasetDocMetadata).optional(),
+  document_count: z.int().optional(),
+  embedding_available: z.boolean().optional(),
+  embedding_model: z.string().optional(),
+  embedding_model_provider: z.string().optional(),
+  enable_api: z.boolean().optional(),
+  external_knowledge_info: zExternalKnowledgeInfo.optional(),
+  external_retrieval_model: zExternalRetrievalModel.optional(),
+  icon_info: zDatasetIconInfo.optional(),
+  id: z.string().optional(),
+  indexing_technique: z.string().optional(),
+  is_multimodal: z.boolean().optional(),
+  is_published: z.boolean().optional(),
+  name: z.string().optional(),
+  permission: z.string().optional(),
+  pipeline_id: z.string().optional(),
+  provider: z.string().optional(),
+  retrieval_model_dict: zDatasetRetrievalModel.optional(),
+  runtime_mode: z.string().optional(),
+  summary_index_setting: zAnonymousInlineModelB1954337D565.optional(),
+  tags: z.array(zTag).optional(),
+  total_available_documents: z.int().optional(),
+  total_documents: z.int().optional(),
+  updated_at: z.record(z.string(), z.unknown()).optional(),
+  updated_by: z.string().optional(),
+  word_count: z.int().optional(),
+})
+
 /**
  * FileInfo
  */
@@ -392,6 +539,46 @@ export const zProcessRule = z.object({
   rules: zRule.optional(),
 })
 
+/**
+ * Condition
+ *
+ * Condition detail
+ */
+export const zCondition = z.object({
+  comparison_operator: z.enum([
+    '<',
+    '=',
+    '>',
+    'after',
+    'before',
+    'contains',
+    'empty',
+    'end with',
+    'in',
+    'is',
+    'is not',
+    'not contains',
+    'not empty',
+    'not in',
+    'start with',
+    '≠',
+    '≤',
+    '≥',
+  ]),
+  name: z.string(),
+  value: z.unknown().optional(),
+})
+
+/**
+ * MetadataFilteringCondition
+ *
+ * Metadata Filtering Condition.
+ */
+export const zMetadataFilteringCondition = z.object({
+  conditions: z.array(zCondition).nullish(),
+  logical_operator: z.enum(['and', 'or']).nullish().default('and'),
+})
+
 /**
  * WeightKeywordSetting
  */
@@ -414,13 +601,14 @@ export const zWeightVectorSetting = z.object({
 export const zWeightModel = z.object({
   keyword_setting: zWeightKeywordSetting.optional(),
   vector_setting: zWeightVectorSetting.optional(),
-  weight_type: z.enum(['semantic_first', 'keyword_first', 'customized']).nullish(),
+  weight_type: z.enum(['customized', 'keyword_first', 'semantic_first']).nullish(),
 })
 
 /**
  * RetrievalModel
  */
 export const zRetrievalModel = z.object({
+  metadata_filtering_conditions: zMetadataFilteringCondition.optional(),
   reranking_enable: z.boolean(),
   reranking_mode: z.string().nullish(),
   reranking_model: zRerankingModel.optional(),
@@ -533,7 +721,7 @@ export const zNotionInfo = z.object({
  * InfoList
  */
 export const zInfoList = z.object({
-  data_source_type: z.enum(['upload_file', 'notion_import', 'website_crawl']),
+  data_source_type: z.enum(['notion_import', 'upload_file', 'website_crawl']),
   file_info_list: zFileInfo.optional(),
   notion_info_list: z.array(zNotionInfo).nullish(),
   website_info_list: zWebsiteInfo.optional(),
@@ -556,7 +744,7 @@ export const zKnowledgeConfig = z.object({
   duplicate: z.boolean().optional().default(true),
   embedding_model: z.string().nullish(),
   embedding_model_provider: z.string().nullish(),
-  indexing_technique: z.enum(['high_quality', 'economy']),
+  indexing_technique: z.enum(['economy', 'high_quality']),
   is_multimodal: z.boolean().optional().default(false),
   name: z.string().nullish(),
   original_document_id: z.string().nullish(),
@@ -566,12 +754,12 @@ export const zKnowledgeConfig = z.object({
 })
 
 export const zGetDatasetsQuery = z.object({
-  page: z.string().optional(),
-  limit: z.string().optional(),
   ids: z.string().optional(),
-  keyword: z.string().optional(),
-  tag_ids: z.string().optional(),
   include_all: z.string().optional(),
+  keyword: z.string().optional(),
+  limit: z.string().optional(),
+  page: z.string().optional(),
+  tag_ids: z.string().optional(),
 })
 
 /**
@@ -608,7 +796,7 @@ export const zDeleteDatasetsApiKeysByApiKeyIdPath = z.object({
 /**
  * API key deleted successfully
  */
-export const zDeleteDatasetsApiKeysByApiKeyIdResponse = z.record(z.string(), z.unknown())
+export const zDeleteDatasetsApiKeysByApiKeyIdResponse = z.record(z.string(), z.never())
 
 export const zGetDatasetsBatchImportStatusByJobIdPath = z.object({
   job_id: z.string(),
@@ -638,9 +826,9 @@ export const zPostDatasetsExternalBody = zExternalDatasetCreatePayload
 export const zPostDatasetsExternalResponse = zDatasetDetail
 
 export const zGetDatasetsExternalKnowledgeApiQuery = z.object({
-  page: z.string().optional(),
-  limit: z.string().optional(),
   keyword: z.string().optional(),
+  limit: z.string().optional(),
+  page: z.string().optional(),
 })
 
 /**
@@ -809,8 +997,8 @@ export const zGetDatasetsByDatasetIdAutoDisableLogsPath = z.object({
 export const zGetDatasetsByDatasetIdAutoDisableLogsResponse = z.record(z.string(), z.unknown())
 
 export const zGetDatasetsByDatasetIdBatchByBatchIndexingEstimatePath = z.object({
-  dataset_id: z.string(),
   batch: z.string(),
+  dataset_id: z.string(),
 })
 
 /**
@@ -822,8 +1010,8 @@ export const zGetDatasetsByDatasetIdBatchByBatchIndexingEstimateResponse = z.rec
 )
 
 export const zGetDatasetsByDatasetIdBatchByBatchIndexingStatusPath = z.object({
-  dataset_id: z.string(),
   batch: z.string(),
+  dataset_id: z.string(),
 })
 
 /**
@@ -848,11 +1036,11 @@ export const zGetDatasetsByDatasetIdDocumentsPath = z.object({
 })
 
 export const zGetDatasetsByDatasetIdDocumentsQuery = z.object({
-  page: z.string().optional(),
-  limit: z.string().optional(),
-  keyword: z.string().optional(),
-  sort: z.string().optional(),
   fetch: z.string().optional(),
+  keyword: z.string().optional(),
+  limit: z.string().optional(),
+  page: z.string().optional(),
+  sort: z.string().optional(),
   status: z.string().optional(),
 })
 
@@ -912,8 +1100,8 @@ export const zPostDatasetsByDatasetIdDocumentsMetadataPath = z.object({
 export const zPostDatasetsByDatasetIdDocumentsMetadataResponse = z.record(z.string(), z.unknown())
 
 export const zPatchDatasetsByDatasetIdDocumentsStatusByActionBatchPath = z.object({
-  dataset_id: z.string(),
   action: z.string(),
+  dataset_id: z.string(),
 })
 
 /**
@@ -1062,9 +1250,9 @@ export const zPatchDatasetsByDatasetIdDocumentsByDocumentIdProcessingResumeRespo
 )
 
 export const zPatchDatasetsByDatasetIdDocumentsByDocumentIdProcessingByActionPath = z.object({
+  action: z.string(),
   dataset_id: z.string(),
   document_id: z.string(),
-  action: z.string(),
 })
 
 /**
@@ -1103,9 +1291,9 @@ export const zPostDatasetsByDatasetIdDocumentsByDocumentIdSegmentResponse = z.re
 )
 
 export const zPatchDatasetsByDatasetIdDocumentsByDocumentIdSegmentByActionPath = z.object({
+  action: z.string(),
   dataset_id: z.string(),
   document_id: z.string(),
-  action: z.string(),
 })
 
 /**
@@ -1246,10 +1434,10 @@ export const zPostDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdChi
 
 export const zDeleteDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdChildChunksByChildChunkIdPath
   = z.object({
+    child_chunk_id: z.string(),
     dataset_id: z.string(),
     document_id: z.string(),
     segment_id: z.string(),
-    child_chunk_id: z.string(),
   })
 
 /**
@@ -1263,10 +1451,10 @@ export const zPatchDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdCh
 
 export const zPatchDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdChildChunksByChildChunkIdPath
   = z.object({
+    child_chunk_id: z.string(),
     dataset_id: z.string(),
     document_id: z.string(),
     segment_id: z.string(),
-    child_chunk_id: z.string(),
   })
 
 /**
@@ -1362,8 +1550,8 @@ export const zPostDatasetsByDatasetIdMetadataPath = z.object({
 export const zPostDatasetsByDatasetIdMetadataResponse = z.record(z.string(), z.unknown())
 
 export const zPostDatasetsByDatasetIdMetadataBuiltInByActionPath = z.object({
-  dataset_id: z.string(),
   action: z.string(),
+  dataset_id: z.string(),
 })
 
 /**
@@ -1477,14 +1665,11 @@ export const zPostDatasetsByResourceIdApiKeysPath = z.object({
 export const zPostDatasetsByResourceIdApiKeysResponse = zApiKeyItem
 
 export const zDeleteDatasetsByResourceIdApiKeysByApiKeyIdPath = z.object({
-  resource_id: z.string(),
   api_key_id: z.string(),
+  resource_id: z.string(),
 })
 
 /**
  * API key deleted successfully
  */
-export const zDeleteDatasetsByResourceIdApiKeysByApiKeyIdResponse = z.record(
-  z.string(),
-  z.unknown(),
-)
+export const zDeleteDatasetsByResourceIdApiKeysByApiKeyIdResponse = z.record(z.string(), z.never())
diff --git a/packages/contracts/generated/api/console/email-code-login/orpc.gen.ts b/packages/contracts/generated/api/console/email-code-login/orpc.gen.ts
index 54edabc29f..e1d0c2c319 100644
--- a/packages/contracts/generated/api/console/email-code-login/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/email-code-login/orpc.gen.ts
@@ -10,8 +10,16 @@ import {
   zPostEmailCodeLoginValidityResponse,
 } from './zod.gen'
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postEmailCodeLoginValidity',
@@ -25,8 +33,16 @@ export const validity = {
   post,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post2 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postEmailCodeLogin',
diff --git a/packages/contracts/generated/api/console/email-code-login/types.gen.ts b/packages/contracts/generated/api/console/email-code-login/types.gen.ts
index 851a8d568d..f1413a611d 100644
--- a/packages/contracts/generated/api/console/email-code-login/types.gen.ts
+++ b/packages/contracts/generated/api/console/email-code-login/types.gen.ts
@@ -13,6 +13,7 @@ export type EmailCodeLoginPayload = {
   code: string
   email: string
   language?: string | null
+  timezone?: string | null
   token: string
 }
 
diff --git a/packages/contracts/generated/api/console/email-code-login/zod.gen.ts b/packages/contracts/generated/api/console/email-code-login/zod.gen.ts
index 0ff511c722..83f1abed45 100644
--- a/packages/contracts/generated/api/console/email-code-login/zod.gen.ts
+++ b/packages/contracts/generated/api/console/email-code-login/zod.gen.ts
@@ -17,6 +17,7 @@ export const zEmailCodeLoginPayload = z.object({
   code: z.string(),
   email: z.string(),
   language: z.string().nullish(),
+  timezone: z.string().nullish(),
   token: z.string(),
 })
 
diff --git a/packages/contracts/generated/api/console/email-register/orpc.gen.ts b/packages/contracts/generated/api/console/email-register/orpc.gen.ts
index 0bd724aba9..b00fdb1c63 100644
--- a/packages/contracts/generated/api/console/email-register/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/email-register/orpc.gen.ts
@@ -8,8 +8,16 @@ import {
   zPostEmailRegisterValidityResponse,
 } from './zod.gen'
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postEmailRegisterSendEmail',
@@ -22,8 +30,16 @@ export const sendEmail = {
   post,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post2 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postEmailRegisterValidity',
@@ -36,8 +52,16 @@ export const validity = {
   post: post2,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post3 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postEmailRegister',
diff --git a/packages/contracts/generated/api/console/explore/orpc.gen.ts b/packages/contracts/generated/api/console/explore/orpc.gen.ts
index 4b37a0a4fd..4933c1ec12 100644
--- a/packages/contracts/generated/api/console/explore/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/explore/orpc.gen.ts
@@ -11,8 +11,16 @@ import {
   zGetExploreBannersResponse,
 } from './zod.gen'
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getExploreAppsByAppId',
@@ -44,9 +52,16 @@ export const apps = {
 
 /**
  * Get banner list
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get3 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getExploreBanners',
diff --git a/packages/contracts/generated/api/console/explore/types.gen.ts b/packages/contracts/generated/api/console/explore/types.gen.ts
index db56dbdac0..329c1f7722 100644
--- a/packages/contracts/generated/api/console/explore/types.gen.ts
+++ b/packages/contracts/generated/api/console/explore/types.gen.ts
@@ -13,7 +13,7 @@ export type RecommendedAppResponse = {
   app?: RecommendedAppInfoResponse
   app_id: string
   can_trial?: boolean | null
-  category?: string | null
+  categories?: Array<string>
   copyright?: string | null
   custom_disclaimer?: string | null
   description?: string | null
@@ -35,7 +35,7 @@ export type GetExploreAppsData = {
   body?: never
   path?: never
   query?: {
-    language?: string | null
+    language?: string
   }
   url: '/explore/apps'
 }
diff --git a/packages/contracts/generated/api/console/explore/zod.gen.ts b/packages/contracts/generated/api/console/explore/zod.gen.ts
index 2ceb54e7bd..c65c47be91 100644
--- a/packages/contracts/generated/api/console/explore/zod.gen.ts
+++ b/packages/contracts/generated/api/console/explore/zod.gen.ts
@@ -21,7 +21,7 @@ export const zRecommendedAppResponse = z.object({
   app: zRecommendedAppInfoResponse.optional(),
   app_id: z.string(),
   can_trial: z.boolean().nullish(),
-  category: z.string().nullish(),
+  categories: z.array(z.string()).optional(),
   copyright: z.string().nullish(),
   custom_disclaimer: z.string().nullish(),
   description: z.string().nullish(),
@@ -39,7 +39,7 @@ export const zRecommendedAppListResponse = z.object({
 })
 
 export const zGetExploreAppsQuery = z.object({
-  language: z.string().nullish(),
+  language: z.string().optional(),
 })
 
 /**
diff --git a/packages/contracts/generated/api/console/features/orpc.gen.ts b/packages/contracts/generated/api/console/features/orpc.gen.ts
index e24ec3d964..e859a3c684 100644
--- a/packages/contracts/generated/api/console/features/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/features/orpc.gen.ts
@@ -8,10 +8,16 @@ import { zGetFeaturesResponse } from './zod.gen'
  * Get feature configuration for current tenant
  *
  * Get feature configuration for current tenant
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get = oc
   .route({
-    description: 'Get feature configuration for current tenant',
+    deprecated: true,
+    description:
+      'Get feature configuration for current tenant\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getFeatures',
diff --git a/packages/contracts/generated/api/console/features/types.gen.ts b/packages/contracts/generated/api/console/features/types.gen.ts
index eed18d5344..4c3ba1c00f 100644
--- a/packages/contracts/generated/api/console/features/types.gen.ts
+++ b/packages/contracts/generated/api/console/features/types.gen.ts
@@ -5,7 +5,9 @@ export type ClientOptions = {
 }
 
 export type FeatureResponse = {
-  [key: string]: unknown
+  features?: {
+    [key: string]: unknown
+  }
 }
 
 export type GetFeaturesData = {
diff --git a/packages/contracts/generated/api/console/features/zod.gen.ts b/packages/contracts/generated/api/console/features/zod.gen.ts
index 1e967fb879..7bfc4debdd 100644
--- a/packages/contracts/generated/api/console/features/zod.gen.ts
+++ b/packages/contracts/generated/api/console/features/zod.gen.ts
@@ -2,7 +2,9 @@
 
 import * as z from 'zod'
 
-export const zFeatureResponse = z.record(z.string(), z.unknown())
+export const zFeatureResponse = z.object({
+  features: z.record(z.string(), z.unknown()).optional(),
+})
 
 /**
  * Success
diff --git a/packages/contracts/generated/api/console/files/orpc.gen.ts b/packages/contracts/generated/api/console/files/orpc.gen.ts
index 2ee949edc2..a46dcca46e 100644
--- a/packages/contracts/generated/api/console/files/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/files/orpc.gen.ts
@@ -11,8 +11,16 @@ import {
   zPostFilesUploadResponse,
 } from './zod.gen'
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getFilesSupportType',
@@ -51,8 +59,16 @@ export const upload = {
   post,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get3 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getFilesByFileIdPreview',
diff --git a/packages/contracts/generated/api/console/form/orpc.gen.ts b/packages/contracts/generated/api/console/form/orpc.gen.ts
index f6d76b28c0..0d30da9d00 100644
--- a/packages/contracts/generated/api/console/form/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/form/orpc.gen.ts
@@ -14,10 +14,16 @@ import {
  * Get human input form definition by form token
  *
  * GET /console/api/form/human_input/<form_token>
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get = oc
   .route({
-    description: 'GET /console/api/form/human_input/<form_token>',
+    deprecated: true,
+    description:
+      'GET /console/api/form/human_input/<form_token>\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getFormHumanInputByFormToken',
@@ -40,11 +46,16 @@ export const get = oc
  * },
  * "action": "Approve"
  * }
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post = oc
   .route({
+    deprecated: true,
     description:
-      'POST /console/api/form/human_input/<form_token>\n\nRequest body:\n{\n    "inputs": {\n        "content": "User input content"\n    },\n    "action": "Approve"\n}',
+      'POST /console/api/form/human_input/<form_token>\n\nRequest body:\n{\n    "inputs": {\n        "content": "User input content"\n    },\n    "action": "Approve"\n}\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postFormHumanInputByFormToken',
diff --git a/packages/contracts/generated/api/console/info/orpc.gen.ts b/packages/contracts/generated/api/console/info/orpc.gen.ts
index 4eb342e9cf..0ef5bd4856 100644
--- a/packages/contracts/generated/api/console/info/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/info/orpc.gen.ts
@@ -4,8 +4,16 @@ import { oc } from '@orpc/contract'
 
 import { zPostInfoResponse } from './zod.gen'
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postInfo',
diff --git a/packages/contracts/generated/api/console/installed-apps/orpc.gen.ts b/packages/contracts/generated/api/console/installed-apps/orpc.gen.ts
index c2b0b2eb37..f0efa7abbc 100644
--- a/packages/contracts/generated/api/console/installed-apps/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/installed-apps/orpc.gen.ts
@@ -67,8 +67,16 @@ import {
   zPostInstalledAppsResponse,
 } from './zod.gen'
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postInstalledAppsByInstalledAppIdAudioToText',
@@ -82,8 +90,16 @@ export const audioToText = {
   post,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post2 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postInstalledAppsByInstalledAppIdChatMessagesByTaskIdStop',
@@ -101,8 +117,16 @@ export const byTaskId = {
   stop,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post3 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postInstalledAppsByInstalledAppIdChatMessages',
@@ -122,8 +146,16 @@ export const chatMessages = {
   byTaskId,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post4 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postInstalledAppsByInstalledAppIdCompletionMessagesByTaskIdStop',
@@ -141,8 +173,16 @@ export const byTaskId2 = {
   stop: stop2,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post5 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postInstalledAppsByInstalledAppIdCompletionMessages',
@@ -162,8 +202,16 @@ export const completionMessages = {
   byTaskId: byTaskId2,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post6 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postInstalledAppsByInstalledAppIdConversationsByCIdName',
@@ -182,8 +230,16 @@ export const name = {
   post: post6,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const patch = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchInstalledAppsByInstalledAppIdConversationsByCIdPin',
@@ -197,8 +253,16 @@ export const pin = {
   patch,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const patch2 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchInstalledAppsByInstalledAppIdConversationsByCIdUnpin',
@@ -212,8 +276,16 @@ export const unpin = {
   patch: patch2,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const delete_ = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId: 'deleteInstalledAppsByInstalledAppIdConversationsByCId',
@@ -230,8 +302,16 @@ export const byCId = {
   unpin,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getInstalledAppsByInstalledAppIdConversations',
@@ -251,8 +331,16 @@ export const conversations = {
   byCId,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post7 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postInstalledAppsByInstalledAppIdMessagesByMessageIdFeedbacks',
@@ -271,8 +359,16 @@ export const feedbacks = {
   post: post7,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get2 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getInstalledAppsByInstalledAppIdMessagesByMessageIdMoreLikeThis',
@@ -291,8 +387,16 @@ export const moreLikeThis = {
   get: get2,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get3 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getInstalledAppsByInstalledAppIdMessagesByMessageIdSuggestedQuestions',
@@ -316,8 +420,16 @@ export const byMessageId = {
   suggestedQuestions,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get4 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getInstalledAppsByInstalledAppIdMessages',
@@ -339,9 +451,16 @@ export const messages = {
 
 /**
  * Get app meta
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get5 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getInstalledAppsByInstalledAppIdMeta',
@@ -358,9 +477,16 @@ export const meta = {
 
 /**
  * Retrieve app parameters
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get6 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getInstalledAppsByInstalledAppIdParameters',
@@ -375,8 +501,16 @@ export const parameters = {
   get: get6,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const delete2 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId: 'deleteInstalledAppsByInstalledAppIdSavedMessagesByMessageId',
@@ -390,8 +524,16 @@ export const byMessageId2 = {
   delete: delete2,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get7 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getInstalledAppsByInstalledAppIdSavedMessages',
@@ -406,8 +548,16 @@ export const get7 = oc
   )
   .output(zGetInstalledAppsByInstalledAppIdSavedMessagesResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post8 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postInstalledAppsByInstalledAppIdSavedMessages',
@@ -428,8 +578,16 @@ export const savedMessages = {
   byMessageId: byMessageId2,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post9 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postInstalledAppsByInstalledAppIdTextToAudio',
@@ -450,9 +608,16 @@ export const textToAudio = {
 
 /**
  * Run workflow
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post10 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postInstalledAppsByInstalledAppIdWorkflowsRun',
@@ -474,9 +639,16 @@ export const run = {
 
 /**
  * Stop workflow task
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post11 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postInstalledAppsByInstalledAppIdWorkflowsTasksByTaskIdStop',
@@ -504,8 +676,16 @@ export const workflows = {
   tasks,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const delete3 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId: 'deleteInstalledAppsByInstalledAppId',
@@ -515,8 +695,16 @@ export const delete3 = oc
   .input(z.object({ params: zDeleteInstalledAppsByInstalledAppIdPath }))
   .output(zDeleteInstalledAppsByInstalledAppIdResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const patch3 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchInstalledAppsByInstalledAppId',
@@ -551,8 +739,16 @@ export const get8 = oc
   })
   .output(zGetInstalledAppsResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post12 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postInstalledApps',
diff --git a/packages/contracts/generated/api/console/installed-apps/types.gen.ts b/packages/contracts/generated/api/console/installed-apps/types.gen.ts
index 897fc29b8b..22f9903bc8 100644
--- a/packages/contracts/generated/api/console/installed-apps/types.gen.ts
+++ b/packages/contracts/generated/api/console/installed-apps/types.gen.ts
@@ -43,7 +43,7 @@ export type ConversationRenamePayload = {
 export type MessageFeedbackPayload = {
   content?: string | null
   message_id: string
-  rating?: 'like' | 'dislike' | null
+  rating?: 'dislike' | 'like' | null
 }
 
 export type SavedMessageCreatePayload = {
@@ -267,8 +267,8 @@ export type GetInstalledAppsByInstalledAppIdConversationsResponse
 export type DeleteInstalledAppsByInstalledAppIdConversationsByCIdData = {
   body?: never
   path: {
-    installed_app_id: string
     c_id: string
+    installed_app_id: string
   }
   query?: never
   url: '/installed-apps/{installed_app_id}/conversations/{c_id}'
@@ -286,8 +286,8 @@ export type DeleteInstalledAppsByInstalledAppIdConversationsByCIdResponse
 export type PostInstalledAppsByInstalledAppIdConversationsByCIdNameData = {
   body: ConversationRenamePayload
   path: {
-    installed_app_id: string
     c_id: string
+    installed_app_id: string
   }
   query?: never
   url: '/installed-apps/{installed_app_id}/conversations/{c_id}/name'
@@ -305,8 +305,8 @@ export type PostInstalledAppsByInstalledAppIdConversationsByCIdNameResponse
 export type PatchInstalledAppsByInstalledAppIdConversationsByCIdPinData = {
   body?: never
   path: {
-    installed_app_id: string
     c_id: string
+    installed_app_id: string
   }
   query?: never
   url: '/installed-apps/{installed_app_id}/conversations/{c_id}/pin'
@@ -324,8 +324,8 @@ export type PatchInstalledAppsByInstalledAppIdConversationsByCIdPinResponse
 export type PatchInstalledAppsByInstalledAppIdConversationsByCIdUnpinData = {
   body?: never
   path: {
-    installed_app_id: string
     c_id: string
+    installed_app_id: string
   }
   query?: never
   url: '/installed-apps/{installed_app_id}/conversations/{c_id}/unpin'
diff --git a/packages/contracts/generated/api/console/installed-apps/zod.gen.ts b/packages/contracts/generated/api/console/installed-apps/zod.gen.ts
index c8683e092c..d688bba246 100644
--- a/packages/contracts/generated/api/console/installed-apps/zod.gen.ts
+++ b/packages/contracts/generated/api/console/installed-apps/zod.gen.ts
@@ -41,7 +41,7 @@ export const zConversationRenamePayload = z.object({
 export const zMessageFeedbackPayload = z.object({
   content: z.string().nullish(),
   message_id: z.string(),
-  rating: z.enum(['like', 'dislike']).nullish(),
+  rating: z.enum(['dislike', 'like']).nullish(),
 })
 
 /**
@@ -216,8 +216,8 @@ export const zGetInstalledAppsByInstalledAppIdConversationsResponse = z.record(
 )
 
 export const zDeleteInstalledAppsByInstalledAppIdConversationsByCIdPath = z.object({
-  installed_app_id: z.string(),
   c_id: z.string(),
+  installed_app_id: z.string(),
 })
 
 /**
@@ -232,8 +232,8 @@ export const zPostInstalledAppsByInstalledAppIdConversationsByCIdNameBody
   = zConversationRenamePayload
 
 export const zPostInstalledAppsByInstalledAppIdConversationsByCIdNamePath = z.object({
-  installed_app_id: z.string(),
   c_id: z.string(),
+  installed_app_id: z.string(),
 })
 
 /**
@@ -245,8 +245,8 @@ export const zPostInstalledAppsByInstalledAppIdConversationsByCIdNameResponse =
 )
 
 export const zPatchInstalledAppsByInstalledAppIdConversationsByCIdPinPath = z.object({
-  installed_app_id: z.string(),
   c_id: z.string(),
+  installed_app_id: z.string(),
 })
 
 /**
@@ -258,8 +258,8 @@ export const zPatchInstalledAppsByInstalledAppIdConversationsByCIdPinResponse =
 )
 
 export const zPatchInstalledAppsByInstalledAppIdConversationsByCIdUnpinPath = z.object({
-  installed_app_id: z.string(),
   c_id: z.string(),
+  installed_app_id: z.string(),
 })
 
 /**
diff --git a/packages/contracts/generated/api/console/instruction-generate/orpc.gen.ts b/packages/contracts/generated/api/console/instruction-generate/orpc.gen.ts
index 3aff6a9a3b..f91220f369 100644
--- a/packages/contracts/generated/api/console/instruction-generate/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/instruction-generate/orpc.gen.ts
@@ -12,10 +12,16 @@ import {
 
 /**
  * Get instruction generation template
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post = oc
   .route({
-    description: 'Get instruction generation template',
+    deprecated: true,
+    description:
+      'Get instruction generation template\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postInstructionGenerateTemplate',
@@ -31,10 +37,16 @@ export const template = {
 
 /**
  * Generate instruction for workflow nodes or general use
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post2 = oc
   .route({
-    description: 'Generate instruction for workflow nodes or general use',
+    deprecated: true,
+    description:
+      'Generate instruction for workflow nodes or general use\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postInstructionGenerate',
diff --git a/packages/contracts/generated/api/console/instruction-generate/types.gen.ts b/packages/contracts/generated/api/console/instruction-generate/types.gen.ts
index 1dd3530d44..c17d0c451b 100644
--- a/packages/contracts/generated/api/console/instruction-generate/types.gen.ts
+++ b/packages/contracts/generated/api/console/instruction-generate/types.gen.ts
@@ -19,33 +19,15 @@ export type InstructionTemplatePayload = {
 }
 
 export type ModelConfig = {
-  agent_mode_dict?: JsonValue
-  annotation_reply_dict?: JsonValue
-  chat_prompt_config_dict?: JsonValue
-  completion_prompt_config_dict?: JsonValue
-  created_at?: number | null
-  created_by?: string | null
-  dataset_configs_dict?: JsonValue
-  dataset_query_variable?: string | null
-  external_data_tools_list?: JsonValue
-  file_upload_dict?: JsonValue
-  model_dict?: JsonValue
-  more_like_this_dict?: JsonValue
-  opening_statement?: string | null
-  pre_prompt?: string | null
-  prompt_type?: string | null
-  retriever_resource_dict?: JsonValue
-  sensitive_word_avoidance_dict?: JsonValue
-  speech_to_text_dict?: JsonValue
-  suggested_questions_after_answer_dict?: JsonValue
-  suggested_questions_list?: JsonValue
-  text_to_speech_dict?: JsonValue
-  updated_at?: number | null
-  updated_by?: string | null
-  user_input_form_list?: JsonValue
+  completion_params?: {
+    [key: string]: unknown
+  }
+  mode: LlmMode
+  name: string
+  provider: string
 }
 
-export type JsonValue = unknown
+export type LlmMode = 'chat' | 'completion'
 
 export type PostInstructionGenerateData = {
   body: InstructionGeneratePayload
diff --git a/packages/contracts/generated/api/console/instruction-generate/zod.gen.ts b/packages/contracts/generated/api/console/instruction-generate/zod.gen.ts
index 35135fdcf7..b24c9b178f 100644
--- a/packages/contracts/generated/api/console/instruction-generate/zod.gen.ts
+++ b/packages/contracts/generated/api/console/instruction-generate/zod.gen.ts
@@ -9,36 +9,21 @@ export const zInstructionTemplatePayload = z.object({
   type: z.string(),
 })
 
-export const zJsonValue = z.unknown()
+/**
+ * LLMMode
+ *
+ * Enum class for large language model mode.
+ */
+export const zLlmMode = z.enum(['chat', 'completion'])
 
 /**
  * ModelConfig
  */
 export const zModelConfig = z.object({
-  agent_mode_dict: zJsonValue.optional(),
-  annotation_reply_dict: zJsonValue.optional(),
-  chat_prompt_config_dict: zJsonValue.optional(),
-  completion_prompt_config_dict: zJsonValue.optional(),
-  created_at: z.int().nullish(),
-  created_by: z.string().nullish(),
-  dataset_configs_dict: zJsonValue.optional(),
-  dataset_query_variable: z.string().nullish(),
-  external_data_tools_list: zJsonValue.optional(),
-  file_upload_dict: zJsonValue.optional(),
-  model_dict: zJsonValue.optional(),
-  more_like_this_dict: zJsonValue.optional(),
-  opening_statement: z.string().nullish(),
-  pre_prompt: z.string().nullish(),
-  prompt_type: z.string().nullish(),
-  retriever_resource_dict: zJsonValue.optional(),
-  sensitive_word_avoidance_dict: zJsonValue.optional(),
-  speech_to_text_dict: zJsonValue.optional(),
-  suggested_questions_after_answer_dict: zJsonValue.optional(),
-  suggested_questions_list: zJsonValue.optional(),
-  text_to_speech_dict: zJsonValue.optional(),
-  updated_at: z.int().nullish(),
-  updated_by: z.string().nullish(),
-  user_input_form_list: zJsonValue.optional(),
+  completion_params: z.record(z.string(), z.unknown()).optional(),
+  mode: zLlmMode,
+  name: z.string(),
+  provider: z.string(),
 })
 
 /**
diff --git a/packages/contracts/generated/api/console/login/orpc.gen.ts b/packages/contracts/generated/api/console/login/orpc.gen.ts
index b8e647a11d..0fb7cbf4bb 100644
--- a/packages/contracts/generated/api/console/login/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/login/orpc.gen.ts
@@ -7,9 +7,16 @@ import { zPostLoginBody, zPostLoginResponse } from './zod.gen'
 
 /**
  * Authenticate user and login
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postLogin',
diff --git a/packages/contracts/generated/api/console/logout/orpc.gen.ts b/packages/contracts/generated/api/console/logout/orpc.gen.ts
index 02ecd2c82d..0fe1f3b909 100644
--- a/packages/contracts/generated/api/console/logout/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/logout/orpc.gen.ts
@@ -4,8 +4,16 @@ import { oc } from '@orpc/contract'
 
 import { zPostLogoutResponse } from './zod.gen'
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postLogout',
diff --git a/packages/contracts/generated/api/console/mcp/orpc.gen.ts b/packages/contracts/generated/api/console/mcp/orpc.gen.ts
index 211e8cb2f2..6508e34a42 100644
--- a/packages/contracts/generated/api/console/mcp/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/mcp/orpc.gen.ts
@@ -4,8 +4,16 @@ import { oc } from '@orpc/contract'
 
 import { zGetMcpOauthCallbackResponse } from './zod.gen'
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getMcpOauthCallback',
diff --git a/packages/contracts/generated/api/console/notification/orpc.gen.ts b/packages/contracts/generated/api/console/notification/orpc.gen.ts
index f7125346cf..c7d55612af 100644
--- a/packages/contracts/generated/api/console/notification/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/notification/orpc.gen.ts
@@ -6,10 +6,16 @@ import { zGetNotificationResponse, zPostNotificationDismissResponse } from './zo
 
 /**
  * Mark a notification as dismissed for the current user.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post = oc
   .route({
-    description: 'Mark a notification as dismissed for the current user.',
+    deprecated: true,
+    description:
+      'Mark a notification as dismissed for the current user.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postNotificationDismiss',
@@ -24,11 +30,16 @@ export const dismiss = {
 
 /**
  * Return the active in-product notification for the current user in their interface language (falls back to English if unavailable). The notification is NOT marked as seen here; call POST /notification/dismiss when the user explicitly closes the modal.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get = oc
   .route({
+    deprecated: true,
     description:
-      'Return the active in-product notification for the current user in their interface language (falls back to English if unavailable). The notification is NOT marked as seen here; call POST /notification/dismiss when the user explicitly closes the modal.',
+      'Return the active in-product notification for the current user in their interface language (falls back to English if unavailable). The notification is NOT marked as seen here; call POST /notification/dismiss when the user explicitly closes the modal.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getNotification',
diff --git a/packages/contracts/generated/api/console/notion/orpc.gen.ts b/packages/contracts/generated/api/console/notion/orpc.gen.ts
index b8de9e89f2..8c5dc03c9e 100644
--- a/packages/contracts/generated/api/console/notion/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/notion/orpc.gen.ts
@@ -12,8 +12,16 @@ import {
   zPostNotionPagesByPageIdByPageTypePreviewResponse,
 } from './zod.gen'
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getNotionPagesByPageIdByPageTypePreview',
@@ -23,8 +31,16 @@ export const get = oc
   .input(z.object({ params: zGetNotionPagesByPageIdByPageTypePreviewPath }))
   .output(zGetNotionPagesByPageIdByPageTypePreviewResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postNotionPagesByPageIdByPageTypePreview',
@@ -56,8 +72,16 @@ export const pages = {
   byPageId,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get2 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getNotionPreImportPages',
diff --git a/packages/contracts/generated/api/console/oauth/orpc.gen.ts b/packages/contracts/generated/api/console/oauth/orpc.gen.ts
index b9a57e3e88..5ef03ccb96 100644
--- a/packages/contracts/generated/api/console/oauth/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/oauth/orpc.gen.ts
@@ -38,10 +38,16 @@ import {
 
 /**
  * Handle OAuth callback and complete login process
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get = oc
   .route({
-    description: 'Handle OAuth callback and complete login process',
+    deprecated: true,
+    description:
+      'Handle OAuth callback and complete login process\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getOauthAuthorizeByProvider',
@@ -94,10 +100,16 @@ export const binding = {
 
 /**
  * Handle OAuth callback from data source provider
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get3 = oc
   .route({
-    description: 'Handle OAuth callback from data source provider',
+    deprecated: true,
+    description:
+      'Handle OAuth callback from data source provider\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getOauthDataSourceCallbackByProvider',
@@ -171,10 +183,16 @@ export const dataSource = {
 
 /**
  * Initiate OAuth login process
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get6 = oc
   .route({
-    description: 'Initiate OAuth login process',
+    deprecated: true,
+    description:
+      'Initiate OAuth login process\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getOauthLoginByProvider',
@@ -197,8 +215,16 @@ export const login = {
   byProvider: byProvider5,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get7 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getOauthPluginByProviderIdDatasourceCallback',
@@ -212,8 +238,16 @@ export const callback2 = {
   get: get7,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get8 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getOauthPluginByProviderIdDatasourceGetAuthorizationUrl',
@@ -236,8 +270,16 @@ export const byProviderId = {
   datasource,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get9 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getOauthPluginByProviderToolAuthorizationUrl',
@@ -251,8 +293,16 @@ export const authorizationUrl = {
   get: get9,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get10 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getOauthPluginByProviderToolCallback',
@@ -273,9 +323,16 @@ export const tool = {
 
 /**
  * Handle OAuth callback for trigger provider
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get11 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getOauthPluginByProviderTriggerCallback',
@@ -304,8 +361,16 @@ export const plugin = {
   byProvider: byProvider6,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postOauthProviderAccount',
@@ -318,8 +383,16 @@ export const account = {
   post,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post2 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postOauthProviderAuthorize',
@@ -332,8 +405,16 @@ export const authorize2 = {
   post: post2,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post3 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postOauthProviderToken',
@@ -346,8 +427,16 @@ export const token = {
   post: post3,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post4 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postOauthProvider',
diff --git a/packages/contracts/generated/api/console/oauth/types.gen.ts b/packages/contracts/generated/api/console/oauth/types.gen.ts
index 7091cdab7c..15bad82f5e 100644
--- a/packages/contracts/generated/api/console/oauth/types.gen.ts
+++ b/packages/contracts/generated/api/console/oauth/types.gen.ts
@@ -134,8 +134,8 @@ export type GetOauthDataSourceByProviderResponse
 export type GetOauthDataSourceByProviderByBindingIdSyncData = {
   body?: never
   path: {
-    provider: string
     binding_id: string
+    provider: string
   }
   query?: never
   url: '/oauth/data-source/{provider}/{binding_id}/sync'
diff --git a/packages/contracts/generated/api/console/oauth/zod.gen.ts b/packages/contracts/generated/api/console/oauth/zod.gen.ts
index 22f2c4bd76..a96b7e3382 100644
--- a/packages/contracts/generated/api/console/oauth/zod.gen.ts
+++ b/packages/contracts/generated/api/console/oauth/zod.gen.ts
@@ -74,8 +74,8 @@ export const zGetOauthDataSourceByProviderPath = z.object({
 export const zGetOauthDataSourceByProviderResponse = zOAuthDataSourceResponse
 
 export const zGetOauthDataSourceByProviderByBindingIdSyncPath = z.object({
-  provider: z.string(),
   binding_id: z.string(),
+  provider: z.string(),
 })
 
 /**
diff --git a/packages/contracts/generated/api/console/orpc.gen.ts b/packages/contracts/generated/api/console/orpc.gen.ts
new file mode 100644
index 0000000000..06a4d79563
--- /dev/null
+++ b/packages/contracts/generated/api/console/orpc.gen.ts
@@ -0,0 +1,95 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { account } from './account/orpc.gen'
+import { activate } from './activate/orpc.gen'
+import { allWorkspaces } from './all-workspaces/orpc.gen'
+import { apiBasedExtension } from './api-based-extension/orpc.gen'
+import { apiKeyAuth } from './api-key-auth/orpc.gen'
+import { app } from './app/orpc.gen'
+import { apps } from './apps/orpc.gen'
+import { auth } from './auth/orpc.gen'
+import { billing } from './billing/orpc.gen'
+import { codeBasedExtension } from './code-based-extension/orpc.gen'
+import { compliance } from './compliance/orpc.gen'
+import { dataSource } from './data-source/orpc.gen'
+import { datasets } from './datasets/orpc.gen'
+import { emailCodeLogin } from './email-code-login/orpc.gen'
+import { emailRegister } from './email-register/orpc.gen'
+import { explore } from './explore/orpc.gen'
+import { features } from './features/orpc.gen'
+import { files } from './files/orpc.gen'
+import { forgotPassword } from './forgot-password/orpc.gen'
+import { form } from './form/orpc.gen'
+import { info } from './info/orpc.gen'
+import { installedApps } from './installed-apps/orpc.gen'
+import { instructionGenerate } from './instruction-generate/orpc.gen'
+import { login } from './login/orpc.gen'
+import { logout } from './logout/orpc.gen'
+import { mcp } from './mcp/orpc.gen'
+import { notification } from './notification/orpc.gen'
+import { notion } from './notion/orpc.gen'
+import { oauth } from './oauth/orpc.gen'
+import { rag } from './rag/orpc.gen'
+import { refreshToken } from './refresh-token/orpc.gen'
+import { remoteFiles } from './remote-files/orpc.gen'
+import { resetPassword } from './reset-password/orpc.gen'
+import { ruleCodeGenerate } from './rule-code-generate/orpc.gen'
+import { ruleGenerate } from './rule-generate/orpc.gen'
+import { ruleStructuredOutputGenerate } from './rule-structured-output-generate/orpc.gen'
+import { spec } from './spec/orpc.gen'
+import { systemFeatures } from './system-features/orpc.gen'
+import { tagBindings } from './tag-bindings/orpc.gen'
+import { tags } from './tags/orpc.gen'
+import { test } from './test/orpc.gen'
+import { trialApps } from './trial-apps/orpc.gen'
+import { website } from './website/orpc.gen'
+import { workflow } from './workflow/orpc.gen'
+import { workspaces } from './workspaces/orpc.gen'
+
+export const contract = {
+  account,
+  activate,
+  allWorkspaces,
+  apiBasedExtension,
+  apiKeyAuth,
+  app,
+  apps,
+  auth,
+  billing,
+  codeBasedExtension,
+  compliance,
+  dataSource,
+  datasets,
+  emailCodeLogin,
+  emailRegister,
+  explore,
+  features,
+  files,
+  forgotPassword,
+  form,
+  info,
+  installedApps,
+  instructionGenerate,
+  login,
+  logout,
+  mcp,
+  notification,
+  notion,
+  oauth,
+  rag,
+  refreshToken,
+  remoteFiles,
+  resetPassword,
+  ruleCodeGenerate,
+  ruleGenerate,
+  ruleStructuredOutputGenerate,
+  spec,
+  systemFeatures,
+  tagBindings,
+  tags,
+  test,
+  trialApps,
+  website,
+  workflow,
+  workspaces,
+}
diff --git a/packages/contracts/generated/api/console/rag/orpc.gen.ts b/packages/contracts/generated/api/console/rag/orpc.gen.ts
index a642a91ba1..c522f1d060 100644
--- a/packages/contracts/generated/api/console/rag/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/rag/orpc.gen.ts
@@ -118,8 +118,16 @@ import {
   zPutRagPipelinesByPipelineIdWorkflowsDraftVariablesByVariableIdResetResponse,
 } from './zod.gen'
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const delete_ = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId: 'deleteRagPipelineCustomizedTemplatesByTemplateId',
@@ -129,8 +137,16 @@ export const delete_ = oc
   .input(z.object({ params: zDeleteRagPipelineCustomizedTemplatesByTemplateIdPath }))
   .output(zDeleteRagPipelineCustomizedTemplatesByTemplateIdResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const patch = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchRagPipelineCustomizedTemplatesByTemplateId',
@@ -140,8 +156,16 @@ export const patch = oc
   .input(z.object({ params: zPatchRagPipelineCustomizedTemplatesByTemplateIdPath }))
   .output(zPatchRagPipelineCustomizedTemplatesByTemplateIdResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postRagPipelineCustomizedTemplatesByTemplateId',
@@ -165,8 +189,16 @@ export const customized = {
   templates,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post2 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postRagPipelineDataset',
@@ -180,8 +212,16 @@ export const dataset = {
   post: post2,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post3 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postRagPipelineEmptyDataset',
@@ -194,8 +234,16 @@ export const emptyDataset = {
   post: post3,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getRagPipelineTemplatesByTemplateId',
@@ -209,8 +257,16 @@ export const byTemplateId2 = {
   get,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get2 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getRagPipelineTemplates',
@@ -231,8 +287,16 @@ export const pipeline = {
   templates: templates2,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get3 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getRagPipelinesDatasourcePlugins',
@@ -245,8 +309,16 @@ export const datasourcePlugins = {
   get: get3,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post4 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postRagPipelinesImportsByImportIdConfirm',
@@ -264,8 +336,16 @@ export const byImportId = {
   confirm,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get4 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getRagPipelinesImportsByPipelineIdCheckDependencies',
@@ -283,8 +363,16 @@ export const byPipelineId = {
   checkDependencies,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post5 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postRagPipelinesImports',
@@ -300,8 +388,16 @@ export const imports = {
   byPipelineId,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get5 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getRagPipelinesRecommendedPlugins',
@@ -314,8 +410,16 @@ export const recommendedPlugins = {
   get: get5,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post6 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postRagPipelinesTransformDatasetsByDatasetId',
@@ -337,8 +441,16 @@ export const transform = {
   datasets,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post7 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postRagPipelinesByPipelineIdCustomizedPublish',
@@ -361,8 +473,16 @@ export const customized2 = {
   publish,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get6 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getRagPipelinesByPipelineIdExports',
@@ -378,9 +498,16 @@ export const exports_ = {
 
 /**
  * Stop workflow task
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post8 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postRagPipelinesByPipelineIdWorkflowRunsTasksByTaskIdStop',
@@ -465,9 +592,16 @@ export const workflowRuns = {
 
 /**
  * Get default block config
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get10 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getRagPipelinesByPipelineIdWorkflowsDefaultWorkflowBlockConfigsByBlockType',
@@ -488,9 +622,16 @@ export const byBlockType = {
 
 /**
  * Get default block config
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get11 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getRagPipelinesByPipelineIdWorkflowsDefaultWorkflowBlockConfigs',
@@ -508,9 +649,16 @@ export const defaultWorkflowBlockConfigs = {
 
 /**
  * Run rag pipeline datasource
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post9 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postRagPipelinesByPipelineIdWorkflowsDraftDatasourceNodesByNodeIdRun',
@@ -540,9 +688,16 @@ export const nodes = {
 
 /**
  * Set datasource variables
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post10 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postRagPipelinesByPipelineIdWorkflowsDraftDatasourceVariablesInspect',
@@ -567,8 +722,16 @@ export const datasource = {
   variablesInspect,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get12 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getRagPipelinesByPipelineIdWorkflowsDraftEnvironmentVariables',
@@ -584,9 +747,16 @@ export const environmentVariables = {
 
 /**
  * Run draft workflow iteration node
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post11 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postRagPipelinesByPipelineIdWorkflowsDraftIterationNodesByNodeIdRun',
@@ -620,9 +790,16 @@ export const iteration = {
 
 /**
  * Run draft workflow loop node
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post12 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postRagPipelinesByPipelineIdWorkflowsDraftLoopNodesByNodeIdRun',
@@ -671,9 +848,16 @@ export const lastRun = {
 
 /**
  * Run draft workflow node
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post13 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postRagPipelinesByPipelineIdWorkflowsDraftNodesByNodeIdRun',
@@ -693,8 +877,16 @@ export const run4 = {
   post: post13,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const delete2 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId: 'deleteRagPipelinesByPipelineIdWorkflowsDraftNodesByNodeIdVariables',
@@ -706,8 +898,16 @@ export const delete2 = oc
   )
   .output(zDeleteRagPipelinesByPipelineIdWorkflowsDraftNodesByNodeIdVariablesResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get14 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getRagPipelinesByPipelineIdWorkflowsDraftNodesByNodeIdVariables',
@@ -734,9 +934,16 @@ export const nodes4 = {
 
 /**
  * Get first step parameters of rag pipeline
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get15 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getRagPipelinesByPipelineIdWorkflowsDraftPreProcessingParameters',
@@ -759,9 +966,16 @@ export const preProcessing = {
 
 /**
  * Get second step parameters of rag pipeline
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get16 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getRagPipelinesByPipelineIdWorkflowsDraftProcessingParameters',
@@ -782,9 +996,16 @@ export const processing = {
 
 /**
  * Run draft workflow
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post14 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postRagPipelinesByPipelineIdWorkflowsDraftRun',
@@ -804,8 +1025,16 @@ export const run5 = {
   post: post14,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get17 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getRagPipelinesByPipelineIdWorkflowsDraftSystemVariables',
@@ -819,8 +1048,16 @@ export const systemVariables = {
   get: get17,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const put = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PUT',
     operationId: 'putRagPipelinesByPipelineIdWorkflowsDraftVariablesByVariableIdReset',
@@ -836,8 +1073,16 @@ export const reset = {
   put,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const delete3 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId: 'deleteRagPipelinesByPipelineIdWorkflowsDraftVariablesByVariableId',
@@ -849,8 +1094,16 @@ export const delete3 = oc
   )
   .output(zDeleteRagPipelinesByPipelineIdWorkflowsDraftVariablesByVariableIdResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get18 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getRagPipelinesByPipelineIdWorkflowsDraftVariablesByVariableId',
@@ -860,8 +1113,16 @@ export const get18 = oc
   .input(z.object({ params: zGetRagPipelinesByPipelineIdWorkflowsDraftVariablesByVariableIdPath }))
   .output(zGetRagPipelinesByPipelineIdWorkflowsDraftVariablesByVariableIdResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const patch2 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchRagPipelinesByPipelineIdWorkflowsDraftVariablesByVariableId',
@@ -880,8 +1141,16 @@ export const byVariableId = {
   reset,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const delete4 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId: 'deleteRagPipelinesByPipelineIdWorkflowsDraftVariables',
@@ -891,8 +1160,16 @@ export const delete4 = oc
   .input(z.object({ params: zDeleteRagPipelinesByPipelineIdWorkflowsDraftVariablesPath }))
   .output(zDeleteRagPipelinesByPipelineIdWorkflowsDraftVariablesResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get19 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getRagPipelinesByPipelineIdWorkflowsDraftVariables',
@@ -910,9 +1187,16 @@ export const variables2 = {
 
 /**
  * Get draft rag pipeline's workflow
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get20 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getRagPipelinesByPipelineIdWorkflowsDraft',
@@ -925,9 +1209,16 @@ export const get20 = oc
 
 /**
  * Sync draft workflow
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post15 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postRagPipelinesByPipelineIdWorkflowsDraft',
@@ -955,9 +1246,16 @@ export const draft = {
 
 /**
  * Get published pipeline
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get21 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getRagPipelinesByPipelineIdWorkflowsPublish',
@@ -970,9 +1268,16 @@ export const get21 = oc
 
 /**
  * Publish workflow
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post16 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postRagPipelinesByPipelineIdWorkflowsPublish',
@@ -990,9 +1295,16 @@ export const publish2 = {
 
 /**
  * Run datasource content preview
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post17 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postRagPipelinesByPipelineIdWorkflowsPublishedDatasourceNodesByNodeIdPreview',
@@ -1014,9 +1326,16 @@ export const preview = {
 
 /**
  * Run rag pipeline datasource
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post18 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postRagPipelinesByPipelineIdWorkflowsPublishedDatasourceNodesByNodeIdRun',
@@ -1051,9 +1370,16 @@ export const datasource2 = {
 
 /**
  * Get first step parameters of rag pipeline
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get22 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getRagPipelinesByPipelineIdWorkflowsPublishedPreProcessingParameters',
@@ -1076,9 +1402,16 @@ export const preProcessing2 = {
 
 /**
  * Get second step parameters of rag pipeline
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get23 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getRagPipelinesByPipelineIdWorkflowsPublishedProcessingParameters',
@@ -1101,9 +1434,16 @@ export const processing2 = {
 
 /**
  * Run published workflow
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post19 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postRagPipelinesByPipelineIdWorkflowsPublishedRun',
@@ -1130,8 +1470,16 @@ export const published = {
   run: run7,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post20 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postRagPipelinesByPipelineIdWorkflowsByWorkflowIdRestore',
@@ -1147,9 +1495,16 @@ export const restore = {
 
 /**
  * Delete a published workflow version that is not currently active on the pipeline
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const delete5 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId: 'deleteRagPipelinesByPipelineIdWorkflowsByWorkflowId',
@@ -1162,9 +1517,16 @@ export const delete5 = oc
 
 /**
  * Update workflow attributes
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const patch3 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchRagPipelinesByPipelineIdWorkflowsByWorkflowId',
@@ -1183,9 +1545,16 @@ export const byWorkflowId = {
 
 /**
  * Get published workflows
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get24 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getRagPipelinesByPipelineIdWorkflows',
diff --git a/packages/contracts/generated/api/console/rag/types.gen.ts b/packages/contracts/generated/api/console/rag/types.gen.ts
index e300ff443c..b25272ed7a 100644
--- a/packages/contracts/generated/api/console/rag/types.gen.ts
+++ b/packages/contracts/generated/api/console/rag/types.gen.ts
@@ -28,6 +28,64 @@ export type Payload = {
   name: string
 }
 
+export type WorkflowRunPaginationResponse = {
+  data: Array<WorkflowRunForListResponse>
+  has_more: boolean
+  limit: number
+}
+
+export type WorkflowRunDetailResponse = {
+  created_at?: number | null
+  created_by_account?: SimpleAccount
+  created_by_end_user?: SimpleEndUser
+  created_by_role?: string | null
+  elapsed_time?: number | null
+  error?: string | null
+  exceptions_count?: number | null
+  finished_at?: number | null
+  graph: unknown
+  id: string
+  inputs: unknown
+  outputs: unknown
+  status?: string | null
+  total_steps?: number | null
+  total_tokens?: number | null
+  version?: string | null
+}
+
+export type WorkflowRunNodeExecutionListResponse = {
+  data: Array<WorkflowRunNodeExecutionResponse>
+}
+
+export type WorkflowPaginationResponse = {
+  has_more: boolean
+  items: Array<WorkflowResponse>
+  limit: number
+  page: number
+}
+
+export type WorkflowResponse = {
+  conversation_variables: Array<WorkflowConversationVariableResponse>
+  created_at: number
+  created_by?: SimpleAccount
+  environment_variables: Array<WorkflowEnvironmentVariableResponse>
+  features: {
+    [key: string]: unknown
+  }
+  graph: {
+    [key: string]: unknown
+  }
+  hash: string
+  id: string
+  marked_comment: string
+  marked_name: string
+  rag_pipeline_variables: Array<PipelineVariableResponse>
+  tool_published: boolean
+  updated_at: number
+  updated_by?: SimpleAccount
+  version: string
+}
+
 export type DatasourceNodeRunPayload = {
   credential_id?: string | null
   datasource_type: string
@@ -45,6 +103,31 @@ export type DatasourceVariablesPayload = {
   start_node_title: string
 }
 
+export type WorkflowRunNodeExecutionResponse = {
+  created_at?: number | null
+  created_by_account?: SimpleAccount
+  created_by_end_user?: SimpleEndUser
+  created_by_role?: string | null
+  elapsed_time?: number | null
+  error?: string | null
+  execution_metadata?: unknown
+  extras?: unknown
+  finished_at?: number | null
+  id: string
+  index?: number | null
+  inputs?: unknown
+  inputs_truncated?: boolean | null
+  node_id?: string | null
+  node_type?: string | null
+  outputs?: unknown
+  outputs_truncated?: boolean | null
+  predecessor_node_id?: string | null
+  process_data?: unknown
+  process_data_truncated?: boolean | null
+  status?: string | null
+  title?: string | null
+}
+
 export type NodeRunPayload = {
   inputs?: {
     [key: string]: unknown
@@ -86,10 +169,76 @@ export type PublishedWorkflowRunPayload = {
   }
   is_preview?: boolean
   original_document_id?: string | null
-  response_mode?: 'streaming' | 'blocking'
+  response_mode?: 'blocking' | 'streaming'
   start_node_id: string
 }
 
+export type WorkflowRunForListResponse = {
+  created_at?: number | null
+  created_by_account?: SimpleAccount
+  elapsed_time?: number | null
+  exceptions_count?: number | null
+  finished_at?: number | null
+  id: string
+  retry_index?: number | null
+  status?: string | null
+  total_steps?: number | null
+  total_tokens?: number | null
+  version?: string | null
+}
+
+export type SimpleAccount = {
+  email: string
+  id: string
+  name: string
+}
+
+export type SimpleEndUser = {
+  id: string
+  is_anonymous: boolean
+  session_id?: string | null
+  type: string
+}
+
+export type WorkflowConversationVariableResponse = {
+  description: string
+  id: string
+  name: string
+  value: {
+    [key: string]: unknown
+  }
+  value_type: string
+}
+
+export type WorkflowEnvironmentVariableResponse = {
+  description: string
+  id: string
+  name: string
+  value: {
+    [key: string]: unknown
+  }
+  value_type: string
+}
+
+export type PipelineVariableResponse = {
+  allowed_file_extensions?: Array<string> | null
+  allowed_file_types?: Array<string> | null
+  allowed_file_upload_methods?: Array<string> | null
+  belong_to_node_id: string
+  default_value?: {
+    [key: string]: unknown
+  }
+  label: string
+  max_length?: number | null
+  options?: Array<string> | null
+  placeholder?: string | null
+  required: boolean
+  tooltips?: string | null
+  type: string
+  unit?: string | null
+  variable: string
+}
+
 export type DeleteRagPipelineCustomizedTemplatesByTemplateIdData = {
   body?: never
   path: {
@@ -358,9 +507,7 @@ export type GetRagPipelinesByPipelineIdWorkflowRunsData = {
 }
 
 export type GetRagPipelinesByPipelineIdWorkflowRunsResponses = {
-  200: {
-    [key: string]: unknown
-  }
+  200: WorkflowRunPaginationResponse
 }
 
 export type GetRagPipelinesByPipelineIdWorkflowRunsResponse
@@ -396,9 +543,7 @@ export type GetRagPipelinesByPipelineIdWorkflowRunsByRunIdData = {
 }
 
 export type GetRagPipelinesByPipelineIdWorkflowRunsByRunIdResponses = {
-  200: {
-    [key: string]: unknown
-  }
+  200: WorkflowRunDetailResponse
 }
 
 export type GetRagPipelinesByPipelineIdWorkflowRunsByRunIdResponse
@@ -415,9 +560,7 @@ export type GetRagPipelinesByPipelineIdWorkflowRunsByRunIdNodeExecutionsData = {
 }
 
 export type GetRagPipelinesByPipelineIdWorkflowRunsByRunIdNodeExecutionsResponses = {
-  200: {
-    [key: string]: unknown
-  }
+  200: WorkflowRunNodeExecutionListResponse
 }
 
 export type GetRagPipelinesByPipelineIdWorkflowRunsByRunIdNodeExecutionsResponse
@@ -432,12 +575,19 @@ export type GetRagPipelinesByPipelineIdWorkflowsData = {
   url: '/rag/pipelines/{pipeline_id}/workflows'
 }
 
-export type GetRagPipelinesByPipelineIdWorkflowsResponses = {
-  200: {
+export type GetRagPipelinesByPipelineIdWorkflowsErrors = {
+  403: {
     [key: string]: unknown
   }
 }
 
+export type GetRagPipelinesByPipelineIdWorkflowsError
+  = GetRagPipelinesByPipelineIdWorkflowsErrors[keyof GetRagPipelinesByPipelineIdWorkflowsErrors]
+
+export type GetRagPipelinesByPipelineIdWorkflowsResponses = {
+  200: WorkflowPaginationResponse
+}
+
 export type GetRagPipelinesByPipelineIdWorkflowsResponse
   = GetRagPipelinesByPipelineIdWorkflowsResponses[keyof GetRagPipelinesByPipelineIdWorkflowsResponses]
 
@@ -462,8 +612,8 @@ export type GetRagPipelinesByPipelineIdWorkflowsDefaultWorkflowBlockConfigsRespo
 export type GetRagPipelinesByPipelineIdWorkflowsDefaultWorkflowBlockConfigsByBlockTypeData = {
   body?: never
   path: {
-    pipeline_id: string
     block_type: string
+    pipeline_id: string
   }
   query?: never
   url: '/rag/pipelines/{pipeline_id}/workflows/default-workflow-block-configs/{block_type}'
@@ -487,12 +637,19 @@ export type GetRagPipelinesByPipelineIdWorkflowsDraftData = {
   url: '/rag/pipelines/{pipeline_id}/workflows/draft'
 }
 
-export type GetRagPipelinesByPipelineIdWorkflowsDraftResponses = {
-  200: {
+export type GetRagPipelinesByPipelineIdWorkflowsDraftErrors = {
+  404: {
     [key: string]: unknown
   }
 }
 
+export type GetRagPipelinesByPipelineIdWorkflowsDraftError
+  = GetRagPipelinesByPipelineIdWorkflowsDraftErrors[keyof GetRagPipelinesByPipelineIdWorkflowsDraftErrors]
+
+export type GetRagPipelinesByPipelineIdWorkflowsDraftResponses = {
+  200: WorkflowResponse
+}
+
 export type GetRagPipelinesByPipelineIdWorkflowsDraftResponse
   = GetRagPipelinesByPipelineIdWorkflowsDraftResponses[keyof GetRagPipelinesByPipelineIdWorkflowsDraftResponses]
 
@@ -517,8 +674,8 @@ export type PostRagPipelinesByPipelineIdWorkflowsDraftResponse
 export type PostRagPipelinesByPipelineIdWorkflowsDraftDatasourceNodesByNodeIdRunData = {
   body: DatasourceNodeRunPayload
   path: {
-    pipeline_id: string
     node_id: string
+    pipeline_id: string
   }
   query?: never
   url: '/rag/pipelines/{pipeline_id}/workflows/draft/datasource/nodes/{node_id}/run'
@@ -543,9 +700,7 @@ export type PostRagPipelinesByPipelineIdWorkflowsDraftDatasourceVariablesInspect
 }
 
 export type PostRagPipelinesByPipelineIdWorkflowsDraftDatasourceVariablesInspectResponses = {
-  200: {
-    [key: string]: unknown
-  }
+  200: WorkflowRunNodeExecutionResponse
 }
 
 export type PostRagPipelinesByPipelineIdWorkflowsDraftDatasourceVariablesInspectResponse
@@ -572,8 +727,8 @@ export type GetRagPipelinesByPipelineIdWorkflowsDraftEnvironmentVariablesRespons
 export type PostRagPipelinesByPipelineIdWorkflowsDraftIterationNodesByNodeIdRunData = {
   body: NodeRunPayload
   path: {
-    pipeline_id: string
     node_id: string
+    pipeline_id: string
   }
   query?: never
   url: '/rag/pipelines/{pipeline_id}/workflows/draft/iteration/nodes/{node_id}/run'
@@ -591,8 +746,8 @@ export type PostRagPipelinesByPipelineIdWorkflowsDraftIterationNodesByNodeIdRunR
 export type PostRagPipelinesByPipelineIdWorkflowsDraftLoopNodesByNodeIdRunData = {
   body: NodeRunPayload
   path: {
-    pipeline_id: string
     node_id: string
+    pipeline_id: string
   }
   query?: never
   url: '/rag/pipelines/{pipeline_id}/workflows/draft/loop/nodes/{node_id}/run'
@@ -610,17 +765,15 @@ export type PostRagPipelinesByPipelineIdWorkflowsDraftLoopNodesByNodeIdRunRespon
 export type GetRagPipelinesByPipelineIdWorkflowsDraftNodesByNodeIdLastRunData = {
   body?: never
   path: {
-    pipeline_id: string
     node_id: string
+    pipeline_id: string
   }
   query?: never
   url: '/rag/pipelines/{pipeline_id}/workflows/draft/nodes/{node_id}/last-run'
 }
 
 export type GetRagPipelinesByPipelineIdWorkflowsDraftNodesByNodeIdLastRunResponses = {
-  200: {
-    [key: string]: unknown
-  }
+  200: WorkflowRunNodeExecutionResponse
 }
 
 export type GetRagPipelinesByPipelineIdWorkflowsDraftNodesByNodeIdLastRunResponse
@@ -629,17 +782,15 @@ export type GetRagPipelinesByPipelineIdWorkflowsDraftNodesByNodeIdLastRunRespons
 export type PostRagPipelinesByPipelineIdWorkflowsDraftNodesByNodeIdRunData = {
   body: NodeRunRequiredPayload
   path: {
-    pipeline_id: string
     node_id: string
+    pipeline_id: string
   }
   query?: never
   url: '/rag/pipelines/{pipeline_id}/workflows/draft/nodes/{node_id}/run'
 }
 
 export type PostRagPipelinesByPipelineIdWorkflowsDraftNodesByNodeIdRunResponses = {
-  200: {
-    [key: string]: unknown
-  }
+  200: WorkflowRunNodeExecutionResponse
 }
 
 export type PostRagPipelinesByPipelineIdWorkflowsDraftNodesByNodeIdRunResponse
@@ -648,8 +799,8 @@ export type PostRagPipelinesByPipelineIdWorkflowsDraftNodesByNodeIdRunResponse
 export type DeleteRagPipelinesByPipelineIdWorkflowsDraftNodesByNodeIdVariablesData = {
   body?: never
   path: {
-    pipeline_id: string
     node_id: string
+    pipeline_id: string
   }
   query?: never
   url: '/rag/pipelines/{pipeline_id}/workflows/draft/nodes/{node_id}/variables'
@@ -667,8 +818,8 @@ export type DeleteRagPipelinesByPipelineIdWorkflowsDraftNodesByNodeIdVariablesRe
 export type GetRagPipelinesByPipelineIdWorkflowsDraftNodesByNodeIdVariablesData = {
   body?: never
   path: {
-    pipeline_id: string
     node_id: string
+    pipeline_id: string
   }
   query?: never
   url: '/rag/pipelines/{pipeline_id}/workflows/draft/nodes/{node_id}/variables'
@@ -877,9 +1028,7 @@ export type GetRagPipelinesByPipelineIdWorkflowsPublishData = {
 }
 
 export type GetRagPipelinesByPipelineIdWorkflowsPublishResponses = {
-  200: {
-    [key: string]: unknown
-  }
+  200: WorkflowResponse
 }
 
 export type GetRagPipelinesByPipelineIdWorkflowsPublishResponse
@@ -906,8 +1055,8 @@ export type PostRagPipelinesByPipelineIdWorkflowsPublishResponse
 export type PostRagPipelinesByPipelineIdWorkflowsPublishedDatasourceNodesByNodeIdPreviewData = {
   body: Parser
   path: {
-    pipeline_id: string
     node_id: string
+    pipeline_id: string
   }
   query?: never
   url: '/rag/pipelines/{pipeline_id}/workflows/published/datasource/nodes/{node_id}/preview'
@@ -926,8 +1075,8 @@ export type PostRagPipelinesByPipelineIdWorkflowsPublishedDatasourceNodesByNodeI
 export type PostRagPipelinesByPipelineIdWorkflowsPublishedDatasourceNodesByNodeIdRunData = {
   body: DatasourceNodeRunPayload
   path: {
-    pipeline_id: string
     node_id: string
+    pipeline_id: string
   }
   query?: never
   url: '/rag/pipelines/{pipeline_id}/workflows/published/datasource/nodes/{node_id}/run'
@@ -1025,10 +1174,23 @@ export type PatchRagPipelinesByPipelineIdWorkflowsByWorkflowIdData = {
   url: '/rag/pipelines/{pipeline_id}/workflows/{workflow_id}'
 }
 
-export type PatchRagPipelinesByPipelineIdWorkflowsByWorkflowIdResponses = {
-  200: {
+export type PatchRagPipelinesByPipelineIdWorkflowsByWorkflowIdErrors = {
+  400: {
     [key: string]: unknown
   }
+  403: {
+    [key: string]: unknown
+  }
+  404: {
+    [key: string]: unknown
+  }
+}
+
+export type PatchRagPipelinesByPipelineIdWorkflowsByWorkflowIdError
+  = PatchRagPipelinesByPipelineIdWorkflowsByWorkflowIdErrors[keyof PatchRagPipelinesByPipelineIdWorkflowsByWorkflowIdErrors]
+
+export type PatchRagPipelinesByPipelineIdWorkflowsByWorkflowIdResponses = {
+  200: WorkflowResponse
 }
 
 export type PatchRagPipelinesByPipelineIdWorkflowsByWorkflowIdResponse
diff --git a/packages/contracts/generated/api/console/rag/zod.gen.ts b/packages/contracts/generated/api/console/rag/zod.gen.ts
index b28d7fafc7..6832c6eb09 100644
--- a/packages/contracts/generated/api/console/rag/zod.gen.ts
+++ b/packages/contracts/generated/api/console/rag/zod.gen.ts
@@ -94,10 +94,185 @@ export const zPublishedWorkflowRunPayload = z.object({
   inputs: z.record(z.string(), z.unknown()),
   is_preview: z.boolean().optional().default(false),
   original_document_id: z.string().nullish(),
-  response_mode: z.enum(['streaming', 'blocking']).optional().default('streaming'),
+  response_mode: z.enum(['blocking', 'streaming']).optional().default('streaming'),
   start_node_id: z.string(),
 })
 
+/**
+ * SimpleAccount
+ */
+export const zSimpleAccount = z.object({
+  email: z.string(),
+  id: z.string(),
+  name: z.string(),
+})
+
+/**
+ * WorkflowRunForListResponse
+ */
+export const zWorkflowRunForListResponse = z.object({
+  created_at: z.int().nullish(),
+  created_by_account: zSimpleAccount.optional(),
+  elapsed_time: z.number().nullish(),
+  exceptions_count: z.int().nullish(),
+  finished_at: z.int().nullish(),
+  id: z.string(),
+  retry_index: z.int().nullish(),
+  status: z.string().nullish(),
+  total_steps: z.int().nullish(),
+  total_tokens: z.int().nullish(),
+  version: z.string().nullish(),
+})
+
+/**
+ * WorkflowRunPaginationResponse
+ */
+export const zWorkflowRunPaginationResponse = z.object({
+  data: z.array(zWorkflowRunForListResponse),
+  has_more: z.boolean(),
+  limit: z.int(),
+})
+
+/**
+ * SimpleEndUser
+ */
+export const zSimpleEndUser = z.object({
+  id: z.string(),
+  is_anonymous: z.boolean(),
+  session_id: z.string().nullish(),
+  type: z.string(),
+})
+
+/**
+ * WorkflowRunDetailResponse
+ */
+export const zWorkflowRunDetailResponse = z.object({
+  created_at: z.int().nullish(),
+  created_by_account: zSimpleAccount.optional(),
+  created_by_end_user: zSimpleEndUser.optional(),
+  created_by_role: z.string().nullish(),
+  elapsed_time: z.number().nullish(),
+  error: z.string().nullish(),
+  exceptions_count: z.int().nullish(),
+  finished_at: z.int().nullish(),
+  graph: z.unknown(),
+  id: z.string(),
+  inputs: z.unknown(),
+  outputs: z.unknown(),
+  status: z.string().nullish(),
+  total_steps: z.int().nullish(),
+  total_tokens: z.int().nullish(),
+  version: z.string().nullish(),
+})
+
+/**
+ * WorkflowRunNodeExecutionResponse
+ */
+export const zWorkflowRunNodeExecutionResponse = z.object({
+  created_at: z.int().nullish(),
+  created_by_account: zSimpleAccount.optional(),
+  created_by_end_user: zSimpleEndUser.optional(),
+  created_by_role: z.string().nullish(),
+  elapsed_time: z.number().nullish(),
+  error: z.string().nullish(),
+  execution_metadata: z.unknown().optional(),
+  extras: z.unknown().optional(),
+  finished_at: z.int().nullish(),
+  id: z.string(),
+  index: z.int().nullish(),
+  inputs: z.unknown().optional(),
+  inputs_truncated: z.boolean().nullish(),
+  node_id: z.string().nullish(),
+  node_type: z.string().nullish(),
+  outputs: z.unknown().optional(),
+  outputs_truncated: z.boolean().nullish(),
+  predecessor_node_id: z.string().nullish(),
+  process_data: z.unknown().optional(),
+  process_data_truncated: z.boolean().nullish(),
+  status: z.string().nullish(),
+  title: z.string().nullish(),
+})
+
+/**
+ * WorkflowRunNodeExecutionListResponse
+ */
+export const zWorkflowRunNodeExecutionListResponse = z.object({
+  data: z.array(zWorkflowRunNodeExecutionResponse),
+})
+
+/**
+ * WorkflowConversationVariableResponse
+ */
+export const zWorkflowConversationVariableResponse = z.object({
+  description: z.string(),
+  id: z.string(),
+  name: z.string(),
+  value: z.record(z.string(), z.unknown()),
+  value_type: z.string(),
+})
+
+/**
+ * WorkflowEnvironmentVariableResponse
+ */
+export const zWorkflowEnvironmentVariableResponse = z.object({
+  description: z.string(),
+  id: z.string(),
+  name: z.string(),
+  value: z.record(z.string(), z.unknown()),
+  value_type: z.string(),
+})
+
+/**
+ * PipelineVariableResponse
+ */
+export const zPipelineVariableResponse = z.object({
+  allowed_file_extensions: z.array(z.string()).nullish(),
+  allowed_file_types: z.array(z.string()).nullish(),
+  allowed_file_upload_methods: z.array(z.string()).nullish(),
+  belong_to_node_id: z.string(),
+  default_value: z.record(z.string(), z.unknown()).optional(),
+  label: z.string(),
+  max_length: z.int().nullish(),
+  options: z.array(z.string()).nullish(),
+  placeholder: z.string().nullish(),
+  required: z.boolean(),
+  tooltips: z.string().nullish(),
+  type: z.string(),
+  unit: z.string().nullish(),
+  variable: z.string(),
+})
+
+/**
+ * WorkflowResponse
+ */
+export const zWorkflowResponse = z.object({
+  conversation_variables: z.array(zWorkflowConversationVariableResponse),
+  created_at: z.int(),
+  created_by: zSimpleAccount.optional(),
+  environment_variables: z.array(zWorkflowEnvironmentVariableResponse),
+  features: z.record(z.string(), z.unknown()),
+  graph: z.record(z.string(), z.unknown()),
+  hash: z.string(),
+  id: z.string(),
+  marked_comment: z.string(),
+  marked_name: z.string(),
+  rag_pipeline_variables: z.array(zPipelineVariableResponse),
+  tool_published: z.boolean(),
+  updated_at: z.int(),
+  updated_by: zSimpleAccount.optional(),
+  version: z.string(),
+})
+
+/**
+ * WorkflowPaginationResponse
+ */
+export const zWorkflowPaginationResponse = z.object({
+  has_more: z.boolean(),
+  items: z.array(zWorkflowResponse),
+  limit: z.int(),
+  page: z.int(),
+})
+
 export const zDeleteRagPipelineCustomizedTemplatesByTemplateIdPath = z.object({
   template_id: z.string(),
 })
@@ -238,9 +413,9 @@ export const zGetRagPipelinesByPipelineIdWorkflowRunsPath = z.object({
 })
 
 /**
- * Success
+ * Workflow runs retrieved successfully
  */
-export const zGetRagPipelinesByPipelineIdWorkflowRunsResponse = z.record(z.string(), z.unknown())
+export const zGetRagPipelinesByPipelineIdWorkflowRunsResponse = zWorkflowRunPaginationResponse
 
 export const zPostRagPipelinesByPipelineIdWorkflowRunsTasksByTaskIdStopPath = z.object({
   pipeline_id: z.string(),
@@ -261,12 +436,9 @@ export const zGetRagPipelinesByPipelineIdWorkflowRunsByRunIdPath = z.object({
 })
 
 /**
- * Success
+ * Workflow run detail retrieved successfully
  */
-export const zGetRagPipelinesByPipelineIdWorkflowRunsByRunIdResponse = z.record(
-  z.string(),
-  z.unknown(),
-)
+export const zGetRagPipelinesByPipelineIdWorkflowRunsByRunIdResponse = zWorkflowRunDetailResponse
 
 export const zGetRagPipelinesByPipelineIdWorkflowRunsByRunIdNodeExecutionsPath = z.object({
   pipeline_id: z.string(),
@@ -274,21 +446,19 @@ export const zGetRagPipelinesByPipelineIdWorkflowRunsByRunIdNodeExecutionsPath =
 })
 
 /**
- * Success
+ * Node executions retrieved successfully
  */
-export const zGetRagPipelinesByPipelineIdWorkflowRunsByRunIdNodeExecutionsResponse = z.record(
-  z.string(),
-  z.unknown(),
-)
+export const zGetRagPipelinesByPipelineIdWorkflowRunsByRunIdNodeExecutionsResponse
+  = zWorkflowRunNodeExecutionListResponse
 
 export const zGetRagPipelinesByPipelineIdWorkflowsPath = z.object({
   pipeline_id: z.string(),
 })
 
 /**
- * Success
+ * Published workflows retrieved successfully
  */
-export const zGetRagPipelinesByPipelineIdWorkflowsResponse = z.record(z.string(), z.unknown())
+export const zGetRagPipelinesByPipelineIdWorkflowsResponse = zWorkflowPaginationResponse
 
 export const zGetRagPipelinesByPipelineIdWorkflowsDefaultWorkflowBlockConfigsPath = z.object({
   pipeline_id: z.string(),
@@ -304,8 +474,8 @@ export const zGetRagPipelinesByPipelineIdWorkflowsDefaultWorkflowBlockConfigsRes
 
 export const zGetRagPipelinesByPipelineIdWorkflowsDefaultWorkflowBlockConfigsByBlockTypePath
   = z.object({
-    pipeline_id: z.string(),
     block_type: z.string(),
+    pipeline_id: z.string(),
   })
 
 /**
@@ -319,9 +489,9 @@ export const zGetRagPipelinesByPipelineIdWorkflowsDraftPath = z.object({
 })
 
 /**
- * Success
+ * Draft workflow retrieved successfully
  */
-export const zGetRagPipelinesByPipelineIdWorkflowsDraftResponse = z.record(z.string(), z.unknown())
+export const zGetRagPipelinesByPipelineIdWorkflowsDraftResponse = zWorkflowResponse
 
 export const zPostRagPipelinesByPipelineIdWorkflowsDraftPath = z.object({
   pipeline_id: z.string(),
@@ -336,8 +506,8 @@ export const zPostRagPipelinesByPipelineIdWorkflowsDraftDatasourceNodesByNodeIdR
   = zDatasourceNodeRunPayload
 
 export const zPostRagPipelinesByPipelineIdWorkflowsDraftDatasourceNodesByNodeIdRunPath = z.object({
-  pipeline_id: z.string(),
   node_id: z.string(),
+  pipeline_id: z.string(),
 })
 
 /**
@@ -354,10 +524,10 @@ export const zPostRagPipelinesByPipelineIdWorkflowsDraftDatasourceVariablesInspe
 })
 
 /**
- * Success
+ * Datasource variables set successfully
  */
 export const zPostRagPipelinesByPipelineIdWorkflowsDraftDatasourceVariablesInspectResponse
-  = z.record(z.string(), z.unknown())
+  = zWorkflowRunNodeExecutionResponse
 
 export const zGetRagPipelinesByPipelineIdWorkflowsDraftEnvironmentVariablesPath = z.object({
   pipeline_id: z.string(),
@@ -375,8 +545,8 @@ export const zPostRagPipelinesByPipelineIdWorkflowsDraftIterationNodesByNodeIdRu
   = zNodeRunPayload
 
 export const zPostRagPipelinesByPipelineIdWorkflowsDraftIterationNodesByNodeIdRunPath = z.object({
-  pipeline_id: z.string(),
   node_id: z.string(),
+  pipeline_id: z.string(),
 })
 
 /**
@@ -388,8 +558,8 @@ export const zPostRagPipelinesByPipelineIdWorkflowsDraftIterationNodesByNodeIdRu
 export const zPostRagPipelinesByPipelineIdWorkflowsDraftLoopNodesByNodeIdRunBody = zNodeRunPayload
 
 export const zPostRagPipelinesByPipelineIdWorkflowsDraftLoopNodesByNodeIdRunPath = z.object({
-  pipeline_id: z.string(),
   node_id: z.string(),
+  pipeline_id: z.string(),
 })
 
 /**
@@ -401,37 +571,33 @@ export const zPostRagPipelinesByPipelineIdWorkflowsDraftLoopNodesByNodeIdRunResp
 )
 
 export const zGetRagPipelinesByPipelineIdWorkflowsDraftNodesByNodeIdLastRunPath = z.object({
-  pipeline_id: z.string(),
   node_id: z.string(),
+  pipeline_id: z.string(),
 })
 
 /**
- * Success
+ * Node last run retrieved successfully
  */
-export const zGetRagPipelinesByPipelineIdWorkflowsDraftNodesByNodeIdLastRunResponse = z.record(
-  z.string(),
-  z.unknown(),
-)
+export const zGetRagPipelinesByPipelineIdWorkflowsDraftNodesByNodeIdLastRunResponse
+  = zWorkflowRunNodeExecutionResponse
 
 export const zPostRagPipelinesByPipelineIdWorkflowsDraftNodesByNodeIdRunBody
   = zNodeRunRequiredPayload
 
 export const zPostRagPipelinesByPipelineIdWorkflowsDraftNodesByNodeIdRunPath = z.object({
-  pipeline_id: z.string(),
   node_id: z.string(),
+  pipeline_id: z.string(),
 })
 
 /**
- * Success
+ * Node run started successfully
  */
-export const zPostRagPipelinesByPipelineIdWorkflowsDraftNodesByNodeIdRunResponse = z.record(
-  z.string(),
-  z.unknown(),
-)
+export const zPostRagPipelinesByPipelineIdWorkflowsDraftNodesByNodeIdRunResponse
+  = zWorkflowRunNodeExecutionResponse
 
 export const zDeleteRagPipelinesByPipelineIdWorkflowsDraftNodesByNodeIdVariablesPath = z.object({
-  pipeline_id: z.string(),
   node_id: z.string(),
+  pipeline_id: z.string(),
 })
 
 /**
@@ -443,8 +609,8 @@ export const zDeleteRagPipelinesByPipelineIdWorkflowsDraftNodesByNodeIdVariables
 )
 
 export const zGetRagPipelinesByPipelineIdWorkflowsDraftNodesByNodeIdVariablesPath = z.object({
-  pipeline_id: z.string(),
   node_id: z.string(),
+  pipeline_id: z.string(),
 })
 
 /**
@@ -584,12 +750,9 @@ export const zGetRagPipelinesByPipelineIdWorkflowsPublishPath = z.object({
 })
 
 /**
- * Success
+ * Published workflow retrieved successfully, or null if not exist
  */
-export const zGetRagPipelinesByPipelineIdWorkflowsPublishResponse = z.record(
-  z.string(),
-  z.unknown(),
-)
+export const zGetRagPipelinesByPipelineIdWorkflowsPublishResponse = zWorkflowResponse
 
 export const zPostRagPipelinesByPipelineIdWorkflowsPublishPath = z.object({
   pipeline_id: z.string(),
@@ -608,8 +771,8 @@ export const zPostRagPipelinesByPipelineIdWorkflowsPublishedDatasourceNodesByNod
 
 export const zPostRagPipelinesByPipelineIdWorkflowsPublishedDatasourceNodesByNodeIdPreviewPath
   = z.object({
-    pipeline_id: z.string(),
     node_id: z.string(),
+    pipeline_id: z.string(),
   })
 
 /**
@@ -623,8 +786,8 @@ export const zPostRagPipelinesByPipelineIdWorkflowsPublishedDatasourceNodesByNod
 
 export const zPostRagPipelinesByPipelineIdWorkflowsPublishedDatasourceNodesByNodeIdRunPath
   = z.object({
-    pipeline_id: z.string(),
     node_id: z.string(),
+    pipeline_id: z.string(),
   })
 
 /**
@@ -688,12 +851,9 @@ export const zPatchRagPipelinesByPipelineIdWorkflowsByWorkflowIdPath = z.object(
 })
 
 /**
- * Success
+ * Workflow updated successfully
  */
-export const zPatchRagPipelinesByPipelineIdWorkflowsByWorkflowIdResponse = z.record(
-  z.string(),
-  z.unknown(),
-)
+export const zPatchRagPipelinesByPipelineIdWorkflowsByWorkflowIdResponse = zWorkflowResponse
 
 export const zPostRagPipelinesByPipelineIdWorkflowsByWorkflowIdRestorePath = z.object({
   pipeline_id: z.string(),
diff --git a/packages/contracts/generated/api/console/refresh-token/orpc.gen.ts b/packages/contracts/generated/api/console/refresh-token/orpc.gen.ts
index 4faa4d7d23..90d8aae968 100644
--- a/packages/contracts/generated/api/console/refresh-token/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/refresh-token/orpc.gen.ts
@@ -4,8 +4,16 @@ import { oc } from '@orpc/contract'
 
 import { zPostRefreshTokenResponse } from './zod.gen'
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postRefreshToken',
diff --git a/packages/contracts/generated/api/console/remote-files/orpc.gen.ts b/packages/contracts/generated/api/console/remote-files/orpc.gen.ts
index 977af4a09c..d8e493b759 100644
--- a/packages/contracts/generated/api/console/remote-files/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/remote-files/orpc.gen.ts
@@ -9,8 +9,16 @@ import {
   zPostRemoteFilesUploadResponse,
 } from './zod.gen'
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postRemoteFilesUpload',
@@ -23,8 +31,16 @@ export const upload = {
   post,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getRemoteFilesByUrl',
diff --git a/packages/contracts/generated/api/console/reset-password/orpc.gen.ts b/packages/contracts/generated/api/console/reset-password/orpc.gen.ts
index 93701280db..2c049efb9d 100644
--- a/packages/contracts/generated/api/console/reset-password/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/reset-password/orpc.gen.ts
@@ -5,8 +5,16 @@ import * as z from 'zod'
 
 import { zPostResetPasswordBody, zPostResetPasswordResponse } from './zod.gen'
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postResetPassword',
diff --git a/packages/contracts/generated/api/console/rule-code-generate/orpc.gen.ts b/packages/contracts/generated/api/console/rule-code-generate/orpc.gen.ts
index 1c5252525c..fb3909f748 100644
--- a/packages/contracts/generated/api/console/rule-code-generate/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/rule-code-generate/orpc.gen.ts
@@ -7,10 +7,16 @@ import { zPostRuleCodeGenerateBody, zPostRuleCodeGenerateResponse } from './zod.
 
 /**
  * Generate code rules using LLM
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post = oc
   .route({
-    description: 'Generate code rules using LLM',
+    deprecated: true,
+    description:
+      'Generate code rules using LLM\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postRuleCodeGenerate',
diff --git a/packages/contracts/generated/api/console/rule-code-generate/types.gen.ts b/packages/contracts/generated/api/console/rule-code-generate/types.gen.ts
index dc1b045285..c5fafa90a9 100644
--- a/packages/contracts/generated/api/console/rule-code-generate/types.gen.ts
+++ b/packages/contracts/generated/api/console/rule-code-generate/types.gen.ts
@@ -12,33 +12,15 @@ export type RuleCodeGeneratePayload = {
 }
 
 export type ModelConfig = {
-  agent_mode_dict?: JsonValue
-  annotation_reply_dict?: JsonValue
-  chat_prompt_config_dict?: JsonValue
-  completion_prompt_config_dict?: JsonValue
-  created_at?: number | null
-  created_by?: string | null
-  dataset_configs_dict?: JsonValue
-  dataset_query_variable?: string | null
-  external_data_tools_list?: JsonValue
-  file_upload_dict?: JsonValue
-  model_dict?: JsonValue
-  more_like_this_dict?: JsonValue
-  opening_statement?: string | null
-  pre_prompt?: string | null
-  prompt_type?: string | null
-  retriever_resource_dict?: JsonValue
-  sensitive_word_avoidance_dict?: JsonValue
-  speech_to_text_dict?: JsonValue
-  suggested_questions_after_answer_dict?: JsonValue
-  suggested_questions_list?: JsonValue
-  text_to_speech_dict?: JsonValue
-  updated_at?: number | null
-  updated_by?: string | null
-  user_input_form_list?: JsonValue
+  completion_params?: {
+    [key: string]: unknown
+  }
+  mode: LlmMode
+  name: string
+  provider: string
 }
 
-export type JsonValue = unknown
+export type LlmMode = 'chat' | 'completion'
 
 export type PostRuleCodeGenerateData = {
   body: RuleCodeGeneratePayload
diff --git a/packages/contracts/generated/api/console/rule-code-generate/zod.gen.ts b/packages/contracts/generated/api/console/rule-code-generate/zod.gen.ts
index 40b840dc8a..f98d2f5dc0 100644
--- a/packages/contracts/generated/api/console/rule-code-generate/zod.gen.ts
+++ b/packages/contracts/generated/api/console/rule-code-generate/zod.gen.ts
@@ -2,36 +2,21 @@
 
 import * as z from 'zod'
 
-export const zJsonValue = z.unknown()
+/**
+ * LLMMode
+ *
+ * Enum class for large language model mode.
+ */
+export const zLlmMode = z.enum(['chat', 'completion'])
 
 /**
  * ModelConfig
  */
 export const zModelConfig = z.object({
-  agent_mode_dict: zJsonValue.optional(),
-  annotation_reply_dict: zJsonValue.optional(),
-  chat_prompt_config_dict: zJsonValue.optional(),
-  completion_prompt_config_dict: zJsonValue.optional(),
-  created_at: z.int().nullish(),
-  created_by: z.string().nullish(),
-  dataset_configs_dict: zJsonValue.optional(),
-  dataset_query_variable: z.string().nullish(),
-  external_data_tools_list: zJsonValue.optional(),
-  file_upload_dict: zJsonValue.optional(),
-  model_dict: zJsonValue.optional(),
-  more_like_this_dict: zJsonValue.optional(),
-  opening_statement: z.string().nullish(),
-  pre_prompt: z.string().nullish(),
-  prompt_type: z.string().nullish(),
-  retriever_resource_dict: zJsonValue.optional(),
-  sensitive_word_avoidance_dict: zJsonValue.optional(),
-  speech_to_text_dict: zJsonValue.optional(),
-  suggested_questions_after_answer_dict: zJsonValue.optional(),
-  suggested_questions_list: zJsonValue.optional(),
-  text_to_speech_dict: zJsonValue.optional(),
-  updated_at: z.int().nullish(),
-  updated_by: z.string().nullish(),
-  user_input_form_list: zJsonValue.optional(),
+  completion_params: z.record(z.string(), z.unknown()).optional(),
+  mode: zLlmMode,
+  name: z.string(),
+  provider: z.string(),
 })
 
 /**
diff --git a/packages/contracts/generated/api/console/rule-generate/orpc.gen.ts b/packages/contracts/generated/api/console/rule-generate/orpc.gen.ts
index 7bd233de2b..1351b459cc 100644
--- a/packages/contracts/generated/api/console/rule-generate/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/rule-generate/orpc.gen.ts
@@ -7,10 +7,16 @@ import { zPostRuleGenerateBody, zPostRuleGenerateResponse } from './zod.gen'
 
 /**
  * Generate rule configuration using LLM
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post = oc
   .route({
-    description: 'Generate rule configuration using LLM',
+    deprecated: true,
+    description:
+      'Generate rule configuration using LLM\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postRuleGenerate',
diff --git a/packages/contracts/generated/api/console/rule-generate/types.gen.ts b/packages/contracts/generated/api/console/rule-generate/types.gen.ts
index 265ca5013d..01f44c096c 100644
--- a/packages/contracts/generated/api/console/rule-generate/types.gen.ts
+++ b/packages/contracts/generated/api/console/rule-generate/types.gen.ts
@@ -11,33 +11,15 @@ export type RuleGeneratePayload = {
 }
 
 export type ModelConfig = {
-  agent_mode_dict?: JsonValue
-  annotation_reply_dict?: JsonValue
-  chat_prompt_config_dict?: JsonValue
-  completion_prompt_config_dict?: JsonValue
-  created_at?: number | null
-  created_by?: string | null
-  dataset_configs_dict?: JsonValue
-  dataset_query_variable?: string | null
-  external_data_tools_list?: JsonValue
-  file_upload_dict?: JsonValue
-  model_dict?: JsonValue
-  more_like_this_dict?: JsonValue
-  opening_statement?: string | null
-  pre_prompt?: string | null
-  prompt_type?: string | null
-  retriever_resource_dict?: JsonValue
-  sensitive_word_avoidance_dict?: JsonValue
-  speech_to_text_dict?: JsonValue
-  suggested_questions_after_answer_dict?: JsonValue
-  suggested_questions_list?: JsonValue
-  text_to_speech_dict?: JsonValue
-  updated_at?: number | null
-  updated_by?: string | null
-  user_input_form_list?: JsonValue
+  completion_params?: {
+    [key: string]: unknown
+  }
+  mode: LlmMode
+  name: string
+  provider: string
 }
 
-export type JsonValue = unknown
+export type LlmMode = 'chat' | 'completion'
 
 export type PostRuleGenerateData = {
   body: RuleGeneratePayload
diff --git a/packages/contracts/generated/api/console/rule-generate/zod.gen.ts b/packages/contracts/generated/api/console/rule-generate/zod.gen.ts
index 7a346a58fc..aae7b67f0f 100644
--- a/packages/contracts/generated/api/console/rule-generate/zod.gen.ts
+++ b/packages/contracts/generated/api/console/rule-generate/zod.gen.ts
@@ -2,36 +2,21 @@
 
 import * as z from 'zod'
 
-export const zJsonValue = z.unknown()
+/**
+ * LLMMode
+ *
+ * Enum class for large language model mode.
+ */
+export const zLlmMode = z.enum(['chat', 'completion'])
 
 /**
  * ModelConfig
  */
 export const zModelConfig = z.object({
-  agent_mode_dict: zJsonValue.optional(),
-  annotation_reply_dict: zJsonValue.optional(),
-  chat_prompt_config_dict: zJsonValue.optional(),
-  completion_prompt_config_dict: zJsonValue.optional(),
-  created_at: z.int().nullish(),
-  created_by: z.string().nullish(),
-  dataset_configs_dict: zJsonValue.optional(),
-  dataset_query_variable: z.string().nullish(),
-  external_data_tools_list: zJsonValue.optional(),
-  file_upload_dict: zJsonValue.optional(),
-  model_dict: zJsonValue.optional(),
-  more_like_this_dict: zJsonValue.optional(),
-  opening_statement: z.string().nullish(),
-  pre_prompt: z.string().nullish(),
-  prompt_type: z.string().nullish(),
-  retriever_resource_dict: zJsonValue.optional(),
-  sensitive_word_avoidance_dict: zJsonValue.optional(),
-  speech_to_text_dict: zJsonValue.optional(),
-  suggested_questions_after_answer_dict: zJsonValue.optional(),
-  suggested_questions_list: zJsonValue.optional(),
-  text_to_speech_dict: zJsonValue.optional(),
-  updated_at: z.int().nullish(),
-  updated_by: z.string().nullish(),
-  user_input_form_list: zJsonValue.optional(),
+  completion_params: z.record(z.string(), z.unknown()).optional(),
+  mode: zLlmMode,
+  name: z.string(),
+  provider: z.string(),
 })
 
 /**
diff --git a/packages/contracts/generated/api/console/rule-structured-output-generate/orpc.gen.ts b/packages/contracts/generated/api/console/rule-structured-output-generate/orpc.gen.ts
index 276442f1c9..3fef5f3c3f 100644
--- a/packages/contracts/generated/api/console/rule-structured-output-generate/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/rule-structured-output-generate/orpc.gen.ts
@@ -10,10 +10,16 @@ import {
 
 /**
  * Generate structured output rules using LLM
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post = oc
   .route({
-    description: 'Generate structured output rules using LLM',
+    deprecated: true,
+    description:
+      'Generate structured output rules using LLM\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postRuleStructuredOutputGenerate',
diff --git a/packages/contracts/generated/api/console/rule-structured-output-generate/types.gen.ts b/packages/contracts/generated/api/console/rule-structured-output-generate/types.gen.ts
index f6124c6956..0ab9d90904 100644
--- a/packages/contracts/generated/api/console/rule-structured-output-generate/types.gen.ts
+++ b/packages/contracts/generated/api/console/rule-structured-output-generate/types.gen.ts
@@ -10,33 +10,15 @@ export type RuleStructuredOutputPayload = {
 }
 
 export type ModelConfig = {
-  agent_mode_dict?: JsonValue
-  annotation_reply_dict?: JsonValue
-  chat_prompt_config_dict?: JsonValue
-  completion_prompt_config_dict?: JsonValue
-  created_at?: number | null
-  created_by?: string | null
-  dataset_configs_dict?: JsonValue
-  dataset_query_variable?: string | null
-  external_data_tools_list?: JsonValue
-  file_upload_dict?: JsonValue
-  model_dict?: JsonValue
-  more_like_this_dict?: JsonValue
-  opening_statement?: string | null
-  pre_prompt?: string | null
-  prompt_type?: string | null
-  retriever_resource_dict?: JsonValue
-  sensitive_word_avoidance_dict?: JsonValue
-  speech_to_text_dict?: JsonValue
-  suggested_questions_after_answer_dict?: JsonValue
-  suggested_questions_list?: JsonValue
-  text_to_speech_dict?: JsonValue
-  updated_at?: number | null
-  updated_by?: string | null
-  user_input_form_list?: JsonValue
+  completion_params?: {
+    [key: string]: unknown
+  }
+  mode: LlmMode
+  name: string
+  provider: string
 }
 
-export type JsonValue = unknown
+export type LlmMode = 'chat' | 'completion'
 
 export type PostRuleStructuredOutputGenerateData = {
   body: RuleStructuredOutputPayload
diff --git a/packages/contracts/generated/api/console/rule-structured-output-generate/zod.gen.ts b/packages/contracts/generated/api/console/rule-structured-output-generate/zod.gen.ts
index 231b5a072c..ddcabbba49 100644
--- a/packages/contracts/generated/api/console/rule-structured-output-generate/zod.gen.ts
+++ b/packages/contracts/generated/api/console/rule-structured-output-generate/zod.gen.ts
@@ -2,36 +2,21 @@
 
 import * as z from 'zod'
 
-export const zJsonValue = z.unknown()
+/**
+ * LLMMode
+ *
+ * Enum class for large language model mode.
+ */
+export const zLlmMode = z.enum(['chat', 'completion'])
 
 /**
  * ModelConfig
  */
 export const zModelConfig = z.object({
-  agent_mode_dict: zJsonValue.optional(),
-  annotation_reply_dict: zJsonValue.optional(),
-  chat_prompt_config_dict: zJsonValue.optional(),
-  completion_prompt_config_dict: zJsonValue.optional(),
-  created_at: z.int().nullish(),
-  created_by: z.string().nullish(),
-  dataset_configs_dict: zJsonValue.optional(),
-  dataset_query_variable: z.string().nullish(),
-  external_data_tools_list: zJsonValue.optional(),
-  file_upload_dict: zJsonValue.optional(),
-  model_dict: zJsonValue.optional(),
-  more_like_this_dict: zJsonValue.optional(),
-  opening_statement: z.string().nullish(),
-  pre_prompt: z.string().nullish(),
-  prompt_type: z.string().nullish(),
-  retriever_resource_dict: zJsonValue.optional(),
-  sensitive_word_avoidance_dict: zJsonValue.optional(),
-  speech_to_text_dict: zJsonValue.optional(),
-  suggested_questions_after_answer_dict: zJsonValue.optional(),
-  suggested_questions_list: zJsonValue.optional(),
-  text_to_speech_dict: zJsonValue.optional(),
-  updated_at: z.int().nullish(),
-  updated_by: z.string().nullish(),
-  user_input_form_list: zJsonValue.optional(),
+  completion_params: z.record(z.string(), z.unknown()).optional(),
+  mode: zLlmMode,
+  name: z.string(),
+  provider: z.string(),
 })
 
 /**
diff --git a/packages/contracts/generated/api/console/spec/orpc.gen.ts b/packages/contracts/generated/api/console/spec/orpc.gen.ts
index bd2e750e6d..9af554b5c5 100644
--- a/packages/contracts/generated/api/console/spec/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/spec/orpc.gen.ts
@@ -8,10 +8,16 @@ import { zGetSpecSchemaDefinitionsResponse } from './zod.gen'
  * Get system JSON Schema definitions specification
  *
  * Used for frontend component type mapping
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get = oc
   .route({
-    description: 'Used for frontend component type mapping',
+    deprecated: true,
+    description:
+      'Used for frontend component type mapping\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getSpecSchemaDefinitions',
diff --git a/packages/contracts/generated/api/console/system-features/orpc.gen.ts b/packages/contracts/generated/api/console/system-features/orpc.gen.ts
index 5c0a475585..a3667f791f 100644
--- a/packages/contracts/generated/api/console/system-features/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/system-features/orpc.gen.ts
@@ -14,11 +14,16 @@ import { zGetSystemFeaturesResponse } from './zod.gen'
  * Authentication would create circular dependency (can't login without dashboard loading).
  *
  * Only non-sensitive configuration data should be returned by this endpoint.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get = oc
   .route({
+    deprecated: true,
     description:
-      'Get system-wide feature configuration\nNOTE: This endpoint is unauthenticated by design, as it provides system features\ndata required for dashboard initialization.\n\nAuthentication would create circular dependency (can\'t login without dashboard loading).\n\nOnly non-sensitive configuration data should be returned by this endpoint.',
+      'Get system-wide feature configuration\nNOTE: This endpoint is unauthenticated by design, as it provides system features\ndata required for dashboard initialization.\n\nAuthentication would create circular dependency (can\'t login without dashboard loading).\n\nOnly non-sensitive configuration data should be returned by this endpoint.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getSystemFeatures',
diff --git a/packages/contracts/generated/api/console/system-features/types.gen.ts b/packages/contracts/generated/api/console/system-features/types.gen.ts
index 0fbea39beb..1f14d19c51 100644
--- a/packages/contracts/generated/api/console/system-features/types.gen.ts
+++ b/packages/contracts/generated/api/console/system-features/types.gen.ts
@@ -5,7 +5,9 @@ export type ClientOptions = {
 }
 
 export type SystemFeatureResponse = {
-  [key: string]: unknown
+  features?: {
+    [key: string]: unknown
+  }
 }
 
 export type GetSystemFeaturesData = {
diff --git a/packages/contracts/generated/api/console/system-features/zod.gen.ts b/packages/contracts/generated/api/console/system-features/zod.gen.ts
index affb2a10a3..58f353b512 100644
--- a/packages/contracts/generated/api/console/system-features/zod.gen.ts
+++ b/packages/contracts/generated/api/console/system-features/zod.gen.ts
@@ -2,7 +2,9 @@
 
 import * as z from 'zod'
 
-export const zSystemFeatureResponse = z.record(z.string(), z.unknown())
+export const zSystemFeatureResponse = z.object({
+  features: z.record(z.string(), z.unknown()).optional(),
+})
 
 /**
  * Success
diff --git a/packages/contracts/generated/api/console/tag-bindings/orpc.gen.ts b/packages/contracts/generated/api/console/tag-bindings/orpc.gen.ts
index 8b58d2c47d..154c75d917 100644
--- a/packages/contracts/generated/api/console/tag-bindings/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/tag-bindings/orpc.gen.ts
@@ -4,48 +4,24 @@ import { oc } from '@orpc/contract'
 import * as z from 'zod'
 
 import {
-  zDeleteTagBindingsByIdBody,
-  zDeleteTagBindingsByIdPath,
-  zDeleteTagBindingsByIdResponse,
   zPostTagBindingsBody,
-  zPostTagBindingsCreateBody,
-  zPostTagBindingsCreateResponse,
   zPostTagBindingsRemoveBody,
   zPostTagBindingsRemoveResponse,
   zPostTagBindingsResponse,
 } from './zod.gen'
 
 /**
- * Deprecated legacy alias. Use POST /tag-bindings instead.
+ * Remove one or more tag bindings from a target.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
  *
  * @deprecated
  */
 export const post = oc
   .route({
     deprecated: true,
-    description: 'Deprecated legacy alias. Use POST /tag-bindings instead.',
-    inputStructure: 'detailed',
-    method: 'POST',
-    operationId: 'postTagBindingsCreate',
-    path: '/tag-bindings/create',
-    tags: ['console'],
-  })
-  .input(z.object({ body: zPostTagBindingsCreateBody }))
-  .output(zPostTagBindingsCreateResponse)
-
-export const create = {
-  post,
-}
-
-/**
- * Deprecated legacy alias. Use DELETE /tag-bindings/{id} instead.
- *
- * @deprecated
- */
-export const post2 = oc
-  .route({
-    deprecated: true,
-    description: 'Deprecated legacy alias. Use DELETE /tag-bindings/{id} instead.',
+    description:
+      'Remove one or more tag bindings from a target.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postTagBindingsRemove',
@@ -56,26 +32,19 @@ export const post2 = oc
   .output(zPostTagBindingsRemoveResponse)
 
 export const remove = {
-  post: post2,
+  post,
 }
 
-export const delete_ = oc
-  .route({
-    inputStructure: 'detailed',
-    method: 'DELETE',
-    operationId: 'deleteTagBindingsById',
-    path: '/tag-bindings/{id}',
-    tags: ['console'],
-  })
-  .input(z.object({ body: zDeleteTagBindingsByIdBody, params: zDeleteTagBindingsByIdPath }))
-  .output(zDeleteTagBindingsByIdResponse)
-
-export const byId = {
-  delete: delete_,
-}
-
-export const post3 = oc
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
+export const post2 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postTagBindings',
@@ -86,10 +55,8 @@ export const post3 = oc
   .output(zPostTagBindingsResponse)
 
 export const tagBindings = {
-  post: post3,
-  create,
+  post: post2,
   remove,
-  byId,
 }
 
 export const contract = {
diff --git a/packages/contracts/generated/api/console/tag-bindings/types.gen.ts b/packages/contracts/generated/api/console/tag-bindings/types.gen.ts
index e9426766ed..1896ccd366 100644
--- a/packages/contracts/generated/api/console/tag-bindings/types.gen.ts
+++ b/packages/contracts/generated/api/console/tag-bindings/types.gen.ts
@@ -11,17 +11,12 @@ export type TagBindingPayload = {
 }
 
 export type TagBindingRemovePayload = {
-  tag_id: string
+  tag_ids: Array<string>
   target_id: string
   type: TagType
 }
 
-export type TagBindingItemDeletePayload = {
-  target_id: string
-  type: TagType
-}
-
-export type TagType = 'knowledge' | 'app'
+export type TagType = 'app' | 'knowledge'
 
 export type PostTagBindingsData = {
   body: TagBindingPayload
@@ -38,22 +33,6 @@ export type PostTagBindingsResponses = {
 
 export type PostTagBindingsResponse = PostTagBindingsResponses[keyof PostTagBindingsResponses]
 
-export type PostTagBindingsCreateData = {
-  body: TagBindingPayload
-  path?: never
-  query?: never
-  url: '/tag-bindings/create'
-}
-
-export type PostTagBindingsCreateResponses = {
-  200: {
-    [key: string]: unknown
-  }
-}
-
-export type PostTagBindingsCreateResponse
-  = PostTagBindingsCreateResponses[keyof PostTagBindingsCreateResponses]
-
 export type PostTagBindingsRemoveData = {
   body: TagBindingRemovePayload
   path?: never
@@ -69,21 +48,3 @@ export type PostTagBindingsRemoveResponses = {
 
 export type PostTagBindingsRemoveResponse
   = PostTagBindingsRemoveResponses[keyof PostTagBindingsRemoveResponses]
-
-export type DeleteTagBindingsByIdData = {
-  body: TagBindingItemDeletePayload
-  path: {
-    id: string
-  }
-  query?: never
-  url: '/tag-bindings/{id}'
-}
-
-export type DeleteTagBindingsByIdResponses = {
-  200: {
-    [key: string]: unknown
-  }
-}
-
-export type DeleteTagBindingsByIdResponse
-  = DeleteTagBindingsByIdResponses[keyof DeleteTagBindingsByIdResponses]
diff --git a/packages/contracts/generated/api/console/tag-bindings/zod.gen.ts b/packages/contracts/generated/api/console/tag-bindings/zod.gen.ts
index 3dead1ec1b..72e2608b95 100644
--- a/packages/contracts/generated/api/console/tag-bindings/zod.gen.ts
+++ b/packages/contracts/generated/api/console/tag-bindings/zod.gen.ts
@@ -7,7 +7,7 @@ import * as z from 'zod'
  *
  * Tag type
  */
-export const zTagType = z.enum(['knowledge', 'app'])
+export const zTagType = z.enum(['app', 'knowledge'])
 
 /**
  * TagBindingPayload
@@ -22,15 +22,7 @@ export const zTagBindingPayload = z.object({
  * TagBindingRemovePayload
  */
 export const zTagBindingRemovePayload = z.object({
-  tag_id: z.string(),
-  target_id: z.string(),
-  type: zTagType,
-})
-
-/**
- * TagBindingItemDeletePayload
- */
-export const zTagBindingItemDeletePayload = z.object({
+  tag_ids: z.array(z.string()).min(1),
   target_id: z.string(),
   type: zTagType,
 })
@@ -42,27 +34,9 @@ export const zPostTagBindingsBody = zTagBindingPayload
  */
 export const zPostTagBindingsResponse = z.record(z.string(), z.unknown())
 
-export const zPostTagBindingsCreateBody = zTagBindingPayload
-
-/**
- * Success
- */
-export const zPostTagBindingsCreateResponse = z.record(z.string(), z.unknown())
-
 export const zPostTagBindingsRemoveBody = zTagBindingRemovePayload
 
 /**
  * Success
  */
 export const zPostTagBindingsRemoveResponse = z.record(z.string(), z.unknown())
-
-export const zDeleteTagBindingsByIdBody = zTagBindingItemDeletePayload
-
-export const zDeleteTagBindingsByIdPath = z.object({
-  id: z.string(),
-})
-
-/**
- * Success
- */
-export const zDeleteTagBindingsByIdResponse = z.record(z.string(), z.unknown())
diff --git a/packages/contracts/generated/api/console/tags/orpc.gen.ts b/packages/contracts/generated/api/console/tags/orpc.gen.ts
index 937ccce634..bc2ac4ef5c 100644
--- a/packages/contracts/generated/api/console/tags/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/tags/orpc.gen.ts
@@ -15,8 +15,16 @@ import {
   zPostTagsResponse,
 } from './zod.gen'
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const delete_ = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId: 'deleteTagsByTagId',
@@ -26,8 +34,16 @@ export const delete_ = oc
   .input(z.object({ params: zDeleteTagsByTagIdPath }))
   .output(zDeleteTagsByTagIdResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const patch = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchTagsByTagId',
@@ -53,8 +69,16 @@ export const get = oc
   .input(z.object({ query: zGetTagsQuery.optional() }))
   .output(zGetTagsResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postTags',
diff --git a/packages/contracts/generated/api/console/tags/types.gen.ts b/packages/contracts/generated/api/console/tags/types.gen.ts
index f3c3b1eb3f..3e1bac75c4 100644
--- a/packages/contracts/generated/api/console/tags/types.gen.ts
+++ b/packages/contracts/generated/api/console/tags/types.gen.ts
@@ -16,14 +16,18 @@ export type TagBasePayload = {
   type: TagType
 }
 
-export type TagType = 'knowledge' | 'app'
+export type TagUpdateRequestPayload = {
+  name: string
+}
+
+export type TagType = 'app' | 'knowledge'
 
 export type GetTagsData = {
   body?: never
   path?: never
   query?: {
-    type?: string
     keyword?: string
+    type?: string
   }
   url: '/tags'
 }
@@ -67,7 +71,7 @@ export type DeleteTagsByTagIdResponses = {
 export type DeleteTagsByTagIdResponse = DeleteTagsByTagIdResponses[keyof DeleteTagsByTagIdResponses]
 
 export type PatchTagsByTagIdData = {
-  body: TagBasePayload
+  body: TagUpdateRequestPayload
   path: {
     tag_id: string
   }
diff --git a/packages/contracts/generated/api/console/tags/zod.gen.ts b/packages/contracts/generated/api/console/tags/zod.gen.ts
index 4bb8e1783c..65c5b06b63 100644
--- a/packages/contracts/generated/api/console/tags/zod.gen.ts
+++ b/packages/contracts/generated/api/console/tags/zod.gen.ts
@@ -12,12 +12,19 @@ export const zTagResponse = z.object({
   type: z.string().nullish(),
 })
 
+/**
+ * TagUpdateRequestPayload
+ */
+export const zTagUpdateRequestPayload = z.object({
+  name: z.string().min(1).max(50),
+})
+
 /**
  * TagType
  *
  * Tag type
  */
-export const zTagType = z.enum(['knowledge', 'app'])
+export const zTagType = z.enum(['app', 'knowledge'])
 
 /**
  * TagBasePayload
@@ -28,8 +35,8 @@ export const zTagBasePayload = z.object({
 })
 
 export const zGetTagsQuery = z.object({
-  type: z.string().optional(),
   keyword: z.string().optional(),
+  type: z.string().optional(),
 })
 
 /**
@@ -53,7 +60,7 @@ export const zDeleteTagsByTagIdPath = z.object({
  */
 export const zDeleteTagsByTagIdResponse = z.record(z.string(), z.unknown())
 
-export const zPatchTagsByTagIdBody = zTagBasePayload
+export const zPatchTagsByTagIdBody = zTagUpdateRequestPayload
 
 export const zPatchTagsByTagIdPath = z.object({
   tag_id: z.string(),
diff --git a/packages/contracts/generated/api/console/test/orpc.gen.ts b/packages/contracts/generated/api/console/test/orpc.gen.ts
index 1bdf526b70..27b46e3381 100644
--- a/packages/contracts/generated/api/console/test/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/test/orpc.gen.ts
@@ -7,10 +7,16 @@ import { zPostTestRetrievalBody, zPostTestRetrievalResponse } from './zod.gen'
 
 /**
  * Bedrock retrieval test (internal use only)
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post = oc
   .route({
-    description: 'Bedrock retrieval test (internal use only)',
+    deprecated: true,
+    description:
+      'Bedrock retrieval test (internal use only)\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postTestRetrieval',
diff --git a/packages/contracts/generated/api/console/trial-apps/orpc.gen.ts b/packages/contracts/generated/api/console/trial-apps/orpc.gen.ts
index eca85c206f..4a10ee7cb8 100644
--- a/packages/contracts/generated/api/console/trial-apps/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/trial-apps/orpc.gen.ts
@@ -34,8 +34,16 @@ import {
   zPostTrialAppsByAppIdWorkflowsTasksByTaskIdStopResponse,
 } from './zod.gen'
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postTrialAppsByAppIdAudioToText',
@@ -49,8 +57,16 @@ export const audioToText = {
   post,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post2 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postTrialAppsByAppIdChatMessages',
@@ -69,8 +85,16 @@ export const chatMessages = {
   post: post2,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post3 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postTrialAppsByAppIdCompletionMessages',
@@ -89,8 +113,16 @@ export const completionMessages = {
   post: post3,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getTrialAppsByAppIdDatasets',
@@ -104,8 +136,16 @@ export const datasets = {
   get,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get2 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getTrialAppsByAppIdMessagesByMessageIdSuggestedQuestions',
@@ -129,9 +169,16 @@ export const messages = {
 
 /**
  * Retrieve app parameters
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get3 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getTrialAppsByAppIdParameters',
@@ -150,11 +197,16 @@ export const parameters = {
  * Retrieve app site info
  *
  * Returns the site configuration for the application including theme, icons, and text.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get4 = oc
   .route({
+    deprecated: true,
     description:
-      'Returns the site configuration for the application including theme, icons, and text.',
+      'Returns the site configuration for the application including theme, icons, and text.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getTrialAppsByAppIdSite',
@@ -169,8 +221,16 @@ export const site = {
   get: get4,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post4 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postTrialAppsByAppIdTextToAudio',
@@ -191,9 +251,16 @@ export const textToAudio = {
 
 /**
  * Run workflow
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post5 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postTrialAppsByAppIdWorkflowsRun',
@@ -215,9 +282,16 @@ export const run = {
 
 /**
  * Stop workflow task
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post6 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postTrialAppsByAppIdWorkflowsTasksByTaskIdStop',
@@ -242,9 +316,16 @@ export const tasks = {
 
 /**
  * Get workflow detail
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get5 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getTrialAppsByAppIdWorkflows',
@@ -263,9 +344,16 @@ export const workflows = {
 
 /**
  * Get app detail
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get6 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getTrialAppsByAppId',
diff --git a/packages/contracts/generated/api/console/website/orpc.gen.ts b/packages/contracts/generated/api/console/website/orpc.gen.ts
index 698f656967..5ed1fcd8ab 100644
--- a/packages/contracts/generated/api/console/website/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/website/orpc.gen.ts
@@ -13,10 +13,16 @@ import {
 
 /**
  * Get website crawl status
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get = oc
   .route({
-    description: 'Get website crawl status',
+    deprecated: true,
+    description:
+      'Get website crawl status\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWebsiteCrawlStatusByJobId',
@@ -41,10 +47,16 @@ export const status = {
 
 /**
  * Crawl website content
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post = oc
   .route({
-    description: 'Crawl website content',
+    deprecated: true,
+    description:
+      'Crawl website content\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWebsiteCrawl',
diff --git a/packages/contracts/generated/api/console/website/types.gen.ts b/packages/contracts/generated/api/console/website/types.gen.ts
index e47b11a819..c8ea0de7b6 100644
--- a/packages/contracts/generated/api/console/website/types.gen.ts
+++ b/packages/contracts/generated/api/console/website/types.gen.ts
@@ -8,7 +8,7 @@ export type WebsiteCrawlPayload = {
   options: {
     [key: string]: unknown
   }
-  provider: 'firecrawl' | 'watercrawl' | 'jinareader'
+  provider: 'firecrawl' | 'jinareader' | 'watercrawl'
   url: string
 }
 
@@ -41,7 +41,7 @@ export type GetWebsiteCrawlStatusByJobIdData = {
     job_id: string
   }
   query: {
-    provider: 'firecrawl' | 'watercrawl' | 'jinareader'
+    provider: 'firecrawl' | 'jinareader' | 'watercrawl'
   }
   url: '/website/crawl/status/{job_id}'
 }
diff --git a/packages/contracts/generated/api/console/website/zod.gen.ts b/packages/contracts/generated/api/console/website/zod.gen.ts
index a7590ec9ee..88f1d4a7c8 100644
--- a/packages/contracts/generated/api/console/website/zod.gen.ts
+++ b/packages/contracts/generated/api/console/website/zod.gen.ts
@@ -7,7 +7,7 @@ import * as z from 'zod'
  */
 export const zWebsiteCrawlPayload = z.object({
   options: z.record(z.string(), z.unknown()),
-  provider: z.enum(['firecrawl', 'watercrawl', 'jinareader']),
+  provider: z.enum(['firecrawl', 'jinareader', 'watercrawl']),
   url: z.string(),
 })
 
@@ -23,7 +23,7 @@ export const zGetWebsiteCrawlStatusByJobIdPath = z.object({
 })
 
 export const zGetWebsiteCrawlStatusByJobIdQuery = z.object({
-  provider: z.enum(['firecrawl', 'watercrawl', 'jinareader']),
+  provider: z.enum(['firecrawl', 'jinareader', 'watercrawl']),
 })
 
 /**
diff --git a/packages/contracts/generated/api/console/workflow/orpc.gen.ts b/packages/contracts/generated/api/console/workflow/orpc.gen.ts
index bf139e6ac1..1470137236 100644
--- a/packages/contracts/generated/api/console/workflow/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/workflow/orpc.gen.ts
@@ -16,11 +16,16 @@ import {
  * GET /console/api/workflow/<workflow_run_id>/events
  *
  * Returns Server-Sent Events stream.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get = oc
   .route({
+    deprecated: true,
     description:
-      'GET /console/api/workflow/<workflow_run_id>/events\n\nReturns Server-Sent Events stream.',
+      'GET /console/api/workflow/<workflow_run_id>/events\n\nReturns Server-Sent Events stream.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkflowByWorkflowRunIdEvents',
@@ -38,6 +43,7 @@ export const events = {
 /**
  * Get workflow pause details
  *
+ * Get workflow pause details
  * GET /console/api/workflow/<workflow_run_id>/pause-details
  *
  * Returns information about why and where the workflow is paused.
@@ -45,7 +51,7 @@ export const events = {
 export const get2 = oc
   .route({
     description:
-      'GET /console/api/workflow/<workflow_run_id>/pause-details\n\nReturns information about why and where the workflow is paused.',
+      'Get workflow pause details\nGET /console/api/workflow/<workflow_run_id>/pause-details\n\nReturns information about why and where the workflow is paused.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkflowByWorkflowRunIdPauseDetails',
diff --git a/packages/contracts/generated/api/console/workflow/types.gen.ts b/packages/contracts/generated/api/console/workflow/types.gen.ts
index a3fae60eae..cf794515d4 100644
--- a/packages/contracts/generated/api/console/workflow/types.gen.ts
+++ b/packages/contracts/generated/api/console/workflow/types.gen.ts
@@ -4,6 +4,23 @@ export type ClientOptions = {
   baseUrl: `${string}://${string}/console/api` | (string & {})
 }
 
+export type WorkflowPauseDetailsResponse = {
+  paused_at?: string | null
+  paused_nodes: Array<PausedNodeResponse>
+}
+
+export type PausedNodeResponse = {
+  node_id: string
+  node_title: string
+  pause_type: HumanInputPauseTypeResponse
+}
+
+export type HumanInputPauseTypeResponse = {
+  backstage_input_url?: string | null
+  form_id: string
+  type: string
+}
+
 export type GetWorkflowByWorkflowRunIdEventsData = {
   body?: never
   path: {
@@ -31,11 +48,18 @@ export type GetWorkflowByWorkflowRunIdPauseDetailsData = {
   url: '/workflow/{workflow_run_id}/pause-details'
 }
 
-export type GetWorkflowByWorkflowRunIdPauseDetailsResponses = {
-  200: {
+export type GetWorkflowByWorkflowRunIdPauseDetailsErrors = {
+  404: {
     [key: string]: unknown
   }
 }
 
+export type GetWorkflowByWorkflowRunIdPauseDetailsError
+  = GetWorkflowByWorkflowRunIdPauseDetailsErrors[keyof GetWorkflowByWorkflowRunIdPauseDetailsErrors]
+
+export type GetWorkflowByWorkflowRunIdPauseDetailsResponses = {
+  200: WorkflowPauseDetailsResponse
+}
+
 export type GetWorkflowByWorkflowRunIdPauseDetailsResponse
   = GetWorkflowByWorkflowRunIdPauseDetailsResponses[keyof GetWorkflowByWorkflowRunIdPauseDetailsResponses]
diff --git a/packages/contracts/generated/api/console/workflow/zod.gen.ts b/packages/contracts/generated/api/console/workflow/zod.gen.ts
index 315085f60f..6a737a683f 100644
--- a/packages/contracts/generated/api/console/workflow/zod.gen.ts
+++ b/packages/contracts/generated/api/console/workflow/zod.gen.ts
@@ -2,6 +2,32 @@
 
 import * as z from 'zod'
 
+/**
+ * HumanInputPauseTypeResponse
+ */
+export const zHumanInputPauseTypeResponse = z.object({
+  backstage_input_url: z.string().nullish(),
+  form_id: z.string(),
+  type: z.string(),
+})
+
+/**
+ * PausedNodeResponse
+ */
+export const zPausedNodeResponse = z.object({
+  node_id: z.string(),
+  node_title: z.string(),
+  pause_type: zHumanInputPauseTypeResponse,
+})
+
+/**
+ * WorkflowPauseDetailsResponse
+ */
+export const zWorkflowPauseDetailsResponse = z.object({
+  paused_at: z.string().nullish(),
+  paused_nodes: z.array(zPausedNodeResponse),
+})
+
 export const zGetWorkflowByWorkflowRunIdEventsPath = z.object({
   workflow_run_id: z.string(),
 })
@@ -16,6 +42,6 @@ export const zGetWorkflowByWorkflowRunIdPauseDetailsPath = z.object({
 })
 
 /**
- * Success
+ * Workflow pause details retrieved successfully
  */
-export const zGetWorkflowByWorkflowRunIdPauseDetailsResponse = z.record(z.string(), z.unknown())
+export const zGetWorkflowByWorkflowRunIdPauseDetailsResponse = zWorkflowPauseDetailsResponse
diff --git a/packages/contracts/generated/api/console/workspaces/orpc.gen.ts b/packages/contracts/generated/api/console/workspaces/orpc.gen.ts
index 4d16e3120f..f4460bb181 100644
--- a/packages/contracts/generated/api/console/workspaces/orpc.gen.ts
+++ b/packages/contracts/generated/api/console/workspaces/orpc.gen.ts
@@ -298,10 +298,16 @@ import {
 
 /**
  * Get specific agent provider details
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get = oc
   .route({
-    description: 'Get specific agent provider details',
+    deprecated: true,
+    description:
+      'Get specific agent provider details\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentAgentProviderByProviderName',
@@ -321,10 +327,16 @@ export const agentProvider = {
 
 /**
  * Get list of available agent providers
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get2 = oc
   .route({
-    description: 'Get list of available agent providers',
+    deprecated: true,
+    description:
+      'Get list of available agent providers\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentAgentProviders',
@@ -351,8 +363,16 @@ export const datasetOperators = {
   get: get3,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get4 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentDefaultModel',
@@ -362,8 +382,16 @@ export const get4 = oc
   .input(z.object({ query: zGetWorkspacesCurrentDefaultModelQuery }))
   .output(zGetWorkspacesCurrentDefaultModelResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentDefaultModel',
@@ -381,13 +409,15 @@ export const defaultModel = {
 /**
  * Deprecated legacy alias for creating a plugin endpoint. Use POST /workspaces/current/endpoints instead.
  *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
  * @deprecated
  */
 export const post2 = oc
   .route({
     deprecated: true,
     description:
-      'Deprecated legacy alias for creating a plugin endpoint. Use POST /workspaces/current/endpoints instead.',
+      'Deprecated legacy alias for creating a plugin endpoint. Use POST /workspaces/current/endpoints instead.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentEndpointsCreate',
@@ -464,10 +494,16 @@ export const enable = {
 
 /**
  * List endpoints for a specific plugin
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get5 = oc
   .route({
-    description: 'List endpoints for a specific plugin',
+    deprecated: true,
+    description:
+      'List endpoints for a specific plugin\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentEndpointsListPlugin',
@@ -483,10 +519,16 @@ export const plugin = {
 
 /**
  * List plugin endpoints with pagination
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get6 = oc
   .route({
-    description: 'List plugin endpoints with pagination',
+    deprecated: true,
+    description:
+      'List plugin endpoints with pagination\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentEndpointsList',
@@ -504,13 +546,15 @@ export const list = {
 /**
  * Deprecated legacy alias for updating a plugin endpoint. Use PATCH /workspaces/current/endpoints/{id} instead.
  *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
  * @deprecated
  */
 export const post6 = oc
   .route({
     deprecated: true,
     description:
-      'Deprecated legacy alias for updating a plugin endpoint. Use PATCH /workspaces/current/endpoints/{id} instead.',
+      'Deprecated legacy alias for updating a plugin endpoint. Use PATCH /workspaces/current/endpoints/{id} instead.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentEndpointsUpdate',
@@ -541,10 +585,16 @@ export const delete2 = oc
 
 /**
  * Update a plugin endpoint
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const patch = oc
   .route({
-    description: 'Update a plugin endpoint',
+    deprecated: true,
+    description:
+      'Update a plugin endpoint\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchWorkspacesCurrentEndpointsById',
@@ -566,10 +616,16 @@ export const byId = {
 
 /**
  * Create a new plugin endpoint
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post7 = oc
   .route({
-    description: 'Create a new plugin endpoint',
+    deprecated: true,
+    description:
+      'Create a new plugin endpoint\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentEndpoints',
@@ -590,8 +646,16 @@ export const endpoints = {
   byId,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post8 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentMembersInviteEmail',
@@ -605,8 +669,16 @@ export const inviteEmail = {
   post: post8,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post9 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentMembersOwnerTransferCheck',
@@ -620,8 +692,16 @@ export const ownerTransferCheck = {
   post: post9,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post10 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentMembersSendOwnerTransferConfirmEmail',
@@ -635,8 +715,16 @@ export const sendOwnerTransferConfirmEmail = {
   post: post10,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post11 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentMembersByMemberIdOwnerTransfer',
@@ -655,8 +743,16 @@ export const ownerTransfer = {
   post: post11,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const put = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PUT',
     operationId: 'putWorkspacesCurrentMembersByMemberIdUpdateRole',
@@ -675,8 +771,16 @@ export const updateRole = {
   put,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const delete3 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId: 'deleteWorkspacesCurrentMembersByMemberId',
@@ -710,8 +814,16 @@ export const members = {
   byMemberId,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get8 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentModelProvidersByProviderCheckoutUrl',
@@ -725,8 +837,16 @@ export const checkoutUrl = {
   get: get8,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post12 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentModelProvidersByProviderCredentialsSwitch',
@@ -745,8 +865,16 @@ export const switch_ = {
   post: post12,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post13 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentModelProvidersByProviderCredentialsValidate',
@@ -765,8 +893,16 @@ export const validate = {
   post: post13,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const delete4 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId: 'deleteWorkspacesCurrentModelProvidersByProviderCredentials',
@@ -781,8 +917,16 @@ export const delete4 = oc
   )
   .output(zDeleteWorkspacesCurrentModelProvidersByProviderCredentialsResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get9 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentModelProvidersByProviderCredentials',
@@ -797,8 +941,16 @@ export const get9 = oc
   )
   .output(zGetWorkspacesCurrentModelProvidersByProviderCredentialsResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post14 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentModelProvidersByProviderCredentials',
@@ -813,8 +965,16 @@ export const post14 = oc
   )
   .output(zPostWorkspacesCurrentModelProvidersByProviderCredentialsResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const put2 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PUT',
     operationId: 'putWorkspacesCurrentModelProvidersByProviderCredentials',
@@ -838,8 +998,16 @@ export const credentials = {
   validate,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post15 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentModelProvidersByProviderModelsCredentialsSwitch',
@@ -858,8 +1026,16 @@ export const switch2 = {
   post: post15,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post16 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentModelProvidersByProviderModelsCredentialsValidate',
@@ -878,8 +1054,16 @@ export const validate2 = {
   post: post16,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const delete5 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId: 'deleteWorkspacesCurrentModelProvidersByProviderModelsCredentials',
@@ -894,8 +1078,16 @@ export const delete5 = oc
   )
   .output(zDeleteWorkspacesCurrentModelProvidersByProviderModelsCredentialsResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get10 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentModelProvidersByProviderModelsCredentials',
@@ -910,8 +1102,16 @@ export const get10 = oc
   )
   .output(zGetWorkspacesCurrentModelProvidersByProviderModelsCredentialsResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post17 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentModelProvidersByProviderModelsCredentials',
@@ -926,8 +1126,16 @@ export const post17 = oc
   )
   .output(zPostWorkspacesCurrentModelProvidersByProviderModelsCredentialsResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const put3 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PUT',
     operationId: 'putWorkspacesCurrentModelProvidersByProviderModelsCredentials',
@@ -951,8 +1159,16 @@ export const credentials2 = {
   validate: validate2,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const patch2 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchWorkspacesCurrentModelProvidersByProviderModelsDisable',
@@ -971,8 +1187,16 @@ export const disable2 = {
   patch: patch2,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const patch3 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchWorkspacesCurrentModelProvidersByProviderModelsEnable',
@@ -991,8 +1215,16 @@ export const enable2 = {
   patch: patch3,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post18 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId:
@@ -1015,8 +1247,16 @@ export const credentialsValidate = {
   post: post18,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post19 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId:
@@ -1048,8 +1288,16 @@ export const loadBalancingConfigs = {
   byConfigId,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get11 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentModelProvidersByProviderModelsParameterRules',
@@ -1068,8 +1316,16 @@ export const parameterRules = {
   get: get11,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const delete6 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId: 'deleteWorkspacesCurrentModelProvidersByProviderModels',
@@ -1084,8 +1340,16 @@ export const delete6 = oc
   )
   .output(zDeleteWorkspacesCurrentModelProvidersByProviderModelsResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get12 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentModelProvidersByProviderModels',
@@ -1095,8 +1359,16 @@ export const get12 = oc
   .input(z.object({ params: zGetWorkspacesCurrentModelProvidersByProviderModelsPath }))
   .output(zGetWorkspacesCurrentModelProvidersByProviderModelsResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post20 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentModelProvidersByProviderModels',
@@ -1122,8 +1394,16 @@ export const models = {
   parameterRules,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post21 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentModelProvidersByProviderPreferredProviderType',
@@ -1149,8 +1429,16 @@ export const byProvider = {
   preferredProviderType,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get13 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentModelProviders',
@@ -1165,8 +1453,16 @@ export const modelProviders = {
   byProvider,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get14 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentModelsModelTypesByModelType',
@@ -1192,11 +1488,16 @@ export const models2 = {
  * Get workspace permission settings
  *
  * Returns permission flags that control workspace features like member invitations and owner transfer.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get15 = oc
   .route({
+    deprecated: true,
     description:
-      'Returns permission flags that control workspace features like member invitations and owner transfer.',
+      'Returns permission flags that control workspace features like member invitations and owner transfer.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentPermission',
@@ -1210,8 +1511,16 @@ export const permission = {
   get: get15,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get16 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentPluginAsset',
@@ -1225,8 +1534,16 @@ export const asset = {
   get: get16,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get17 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentPluginDebuggingKey',
@@ -1239,8 +1556,16 @@ export const debuggingKey = {
   get: get17,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get18 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentPluginFetchManifest',
@@ -1254,8 +1579,16 @@ export const fetchManifest = {
   get: get18,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get19 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentPluginIcon',
@@ -1269,8 +1602,16 @@ export const icon = {
   get: get19,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post22 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentPluginInstallGithub',
@@ -1284,8 +1625,16 @@ export const github = {
   post: post22,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post23 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentPluginInstallMarketplace',
@@ -1299,8 +1648,16 @@ export const marketplace = {
   post: post23,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post24 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentPluginInstallPkg',
@@ -1320,8 +1677,16 @@ export const install = {
   pkg,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post25 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentPluginListInstallationsIds',
@@ -1339,8 +1704,16 @@ export const installations = {
   ids,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post26 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentPluginListLatestVersions',
@@ -1354,8 +1727,16 @@ export const latestVersions = {
   post: post26,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get20 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentPluginList',
@@ -1371,8 +1752,16 @@ export const list2 = {
   latestVersions,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get21 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentPluginMarketplacePkg',
@@ -1390,8 +1779,16 @@ export const marketplace2 = {
   pkg: pkg2,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get22 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentPluginParametersDynamicOptions',
@@ -1407,9 +1804,16 @@ export const dynamicOptions = {
 
 /**
  * Fetch dynamic options using credentials directly (for edit mode)
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post27 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentPluginParametersDynamicOptionsWithCredentials',
@@ -1431,8 +1835,16 @@ export const parameters = {
   dynamicOptionsWithCredentials,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post28 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentPluginPermissionChange',
@@ -1446,8 +1858,16 @@ export const change = {
   post: post28,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get23 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentPluginPermissionFetch',
@@ -1465,8 +1885,16 @@ export const permission2 = {
   fetch: fetch_,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post29 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentPluginPreferencesAutoupgradeExclude',
@@ -1484,8 +1912,16 @@ export const autoupgrade = {
   exclude,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post30 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentPluginPreferencesChange',
@@ -1499,8 +1935,16 @@ export const change2 = {
   post: post30,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get24 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentPluginPreferencesFetch',
@@ -1519,8 +1963,16 @@ export const preferences = {
   fetch: fetch2,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get25 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentPluginReadme',
@@ -1534,8 +1986,16 @@ export const readme = {
   get: get25,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post31 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentPluginTasksDeleteAll',
@@ -1548,8 +2008,16 @@ export const deleteAll = {
   post: post31,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post32 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentPluginTasksByTaskIdDeleteByIdentifier',
@@ -1563,8 +2031,16 @@ export const byIdentifier = {
   post: post32,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post33 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentPluginTasksByTaskIdDelete',
@@ -1579,8 +2055,16 @@ export const delete7 = {
   byIdentifier,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get26 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentPluginTasksByTaskId',
@@ -1595,8 +2079,16 @@ export const byTaskId = {
   delete: delete7,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get27 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentPluginTasks',
@@ -1612,8 +2104,16 @@ export const tasks = {
   byTaskId,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post34 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentPluginUninstall',
@@ -1627,8 +2127,16 @@ export const uninstall = {
   post: post34,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post35 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentPluginUpgradeGithub',
@@ -1642,8 +2150,16 @@ export const github2 = {
   post: post35,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post36 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentPluginUpgradeMarketplace',
@@ -1662,8 +2178,16 @@ export const upgrade = {
   marketplace: marketplace3,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post37 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentPluginUploadBundle',
@@ -1676,8 +2200,16 @@ export const bundle = {
   post: post37,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post38 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentPluginUploadGithub',
@@ -1691,8 +2223,16 @@ export const github3 = {
   post: post38,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post39 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentPluginUploadPkg',
@@ -1729,8 +2269,16 @@ export const plugin2 = {
   upload,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get28 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentToolLabels',
@@ -1743,8 +2291,16 @@ export const toolLabels = {
   get: get28,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post40 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentToolProviderApiAdd',
@@ -1758,8 +2314,16 @@ export const add = {
   post: post40,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post41 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentToolProviderApiDelete',
@@ -1773,8 +2337,16 @@ export const delete8 = {
   post: post41,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get29 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentToolProviderApiGet',
@@ -1787,8 +2359,16 @@ export const get30 = {
   get: get29,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get31 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentToolProviderApiRemote',
@@ -1801,8 +2381,16 @@ export const remote = {
   get: get31,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post42 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentToolProviderApiSchema',
@@ -1816,8 +2404,16 @@ export const schema = {
   post: post42,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post43 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentToolProviderApiTestPre',
@@ -1835,8 +2431,16 @@ export const test = {
   pre,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get32 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentToolProviderApiTools',
@@ -1849,8 +2453,16 @@ export const tools = {
   get: get32,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post44 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentToolProviderApiUpdate',
@@ -1875,8 +2487,16 @@ export const api = {
   update: update2,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post45 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentToolProviderBuiltinByProviderAdd',
@@ -1895,8 +2515,16 @@ export const add2 = {
   post: post45,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get33 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentToolProviderBuiltinByProviderCredentialInfo',
@@ -1910,8 +2538,16 @@ export const info = {
   get: get33,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get34 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId:
@@ -1942,8 +2578,16 @@ export const credential = {
   schema: schema2,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get35 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentToolProviderBuiltinByProviderCredentials',
@@ -1957,8 +2601,16 @@ export const credentials3 = {
   get: get35,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post46 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentToolProviderBuiltinByProviderDefaultCredential',
@@ -1977,8 +2629,16 @@ export const defaultCredential = {
   post: post46,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post47 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentToolProviderBuiltinByProviderDelete',
@@ -1997,8 +2657,16 @@ export const delete9 = {
   post: post47,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get36 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentToolProviderBuiltinByProviderIcon',
@@ -2012,8 +2680,16 @@ export const icon2 = {
   get: get36,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get37 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentToolProviderBuiltinByProviderInfo',
@@ -2027,8 +2703,16 @@ export const info2 = {
   get: get37,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get38 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentToolProviderBuiltinByProviderOauthClientSchema',
@@ -2044,8 +2728,16 @@ export const clientSchema = {
   get: get38,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const delete10 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId: 'deleteWorkspacesCurrentToolProviderBuiltinByProviderOauthCustomClient',
@@ -2059,8 +2751,16 @@ export const delete10 = oc
   )
   .output(zDeleteWorkspacesCurrentToolProviderBuiltinByProviderOauthCustomClientResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get39 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentToolProviderBuiltinByProviderOauthCustomClient',
@@ -2072,8 +2772,16 @@ export const get39 = oc
   )
   .output(zGetWorkspacesCurrentToolProviderBuiltinByProviderOauthCustomClientResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post48 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentToolProviderBuiltinByProviderOauthCustomClient',
@@ -2099,8 +2807,16 @@ export const oauth = {
   customClient,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get40 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentToolProviderBuiltinByProviderTools',
@@ -2114,8 +2830,16 @@ export const tools2 = {
   get: get40,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post49 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentToolProviderBuiltinByProviderUpdate',
@@ -2151,8 +2875,16 @@ export const builtin = {
   byProvider: byProvider2,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post50 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentToolProviderMcpAuth',
@@ -2166,8 +2898,16 @@ export const auth = {
   post: post50,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get41 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentToolProviderMcpToolsByProviderId',
@@ -2185,8 +2925,16 @@ export const tools3 = {
   byProviderId,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get42 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentToolProviderMcpUpdateByProviderId',
@@ -2204,8 +2952,16 @@ export const update4 = {
   byProviderId: byProviderId2,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const delete11 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId: 'deleteWorkspacesCurrentToolProviderMcp',
@@ -2215,8 +2971,16 @@ export const delete11 = oc
   .input(z.object({ body: zDeleteWorkspacesCurrentToolProviderMcpBody }))
   .output(zDeleteWorkspacesCurrentToolProviderMcpResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post51 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentToolProviderMcp',
@@ -2226,8 +2990,16 @@ export const post51 = oc
   .input(z.object({ body: zPostWorkspacesCurrentToolProviderMcpBody }))
   .output(zPostWorkspacesCurrentToolProviderMcpResponse)
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const put4 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PUT',
     operationId: 'putWorkspacesCurrentToolProviderMcp',
@@ -2246,8 +3018,16 @@ export const mcp = {
   update: update4,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post52 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentToolProviderWorkflowCreate',
@@ -2261,8 +3041,16 @@ export const create2 = {
   post: post52,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post53 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentToolProviderWorkflowDelete',
@@ -2276,8 +3064,16 @@ export const delete12 = {
   post: post53,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get43 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentToolProviderWorkflowGet',
@@ -2290,8 +3086,16 @@ export const get44 = {
   get: get43,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get45 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentToolProviderWorkflowTools',
@@ -2304,8 +3108,16 @@ export const tools4 = {
   get: get45,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post54 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentToolProviderWorkflowUpdate',
@@ -2334,8 +3146,16 @@ export const toolProvider = {
   workflow,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get46 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentToolProviders',
@@ -2348,8 +3168,16 @@ export const toolProviders = {
   get: get46,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get47 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentToolsApi',
@@ -2362,8 +3190,16 @@ export const api2 = {
   get: get47,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get48 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentToolsBuiltin',
@@ -2376,8 +3212,16 @@ export const builtin2 = {
   get: get48,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get49 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentToolsMcp',
@@ -2390,8 +3234,16 @@ export const mcp2 = {
   get: get49,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get50 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentToolsWorkflow',
@@ -2411,8 +3263,16 @@ export const tools5 = {
   workflow: workflow2,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get51 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentTriggerProviderByProviderIcon',
@@ -2428,9 +3288,16 @@ export const icon3 = {
 
 /**
  * Get info for a trigger provider
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get52 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentTriggerProviderByProviderInfo',
@@ -2447,9 +3314,16 @@ export const info3 = {
 
 /**
  * Remove custom OAuth client configuration
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const delete13 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'DELETE',
     operationId: 'deleteWorkspacesCurrentTriggerProviderByProviderOauthClient',
@@ -2462,9 +3336,16 @@ export const delete13 = oc
 
 /**
  * Get OAuth client configuration for a provider
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get53 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentTriggerProviderByProviderOauthClient',
@@ -2477,9 +3358,16 @@ export const get53 = oc
 
 /**
  * Configure custom OAuth client for a provider
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post55 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentTriggerProviderByProviderOauthClient',
@@ -2507,9 +3395,16 @@ export const oauth2 = {
 
 /**
  * Build a subscription instance for a trigger provider
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post56 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId:
@@ -2539,9 +3434,16 @@ export const build = {
 
 /**
  * Add a new subscription instance for a trigger provider
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post57 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentTriggerProviderByProviderSubscriptionsBuilderCreate',
@@ -2563,9 +3465,16 @@ export const create3 = {
 
 /**
  * Get the request logs for a subscription instance for a trigger provider
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get54 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId:
@@ -2594,9 +3503,16 @@ export const logs = {
 
 /**
  * Update a subscription instance for a trigger provider
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post58 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId:
@@ -2626,9 +3542,16 @@ export const update6 = {
 
 /**
  * Verify and update a subscription instance for a trigger provider
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post59 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId:
@@ -2658,9 +3581,16 @@ export const verifyAndUpdate = {
 
 /**
  * Get a subscription instance for a trigger provider
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get55 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId:
@@ -2694,9 +3624,16 @@ export const builder = {
 
 /**
  * List all trigger subscriptions for the current tenant's provider
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get56 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentTriggerProviderByProviderSubscriptionsList',
@@ -2713,9 +3650,16 @@ export const list3 = {
 
 /**
  * Initiate OAuth authorization flow for a trigger provider
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get57 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentTriggerProviderByProviderSubscriptionsOauthAuthorize',
@@ -2740,9 +3684,16 @@ export const oauth3 = {
 
 /**
  * Verify credentials for an existing subscription (edit mode only)
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post60 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId:
@@ -2786,9 +3737,16 @@ export const byProvider3 = {
 
 /**
  * Delete a subscription instance
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post61 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentTriggerProviderBySubscriptionIdSubscriptionsDelete',
@@ -2809,9 +3767,16 @@ export const delete14 = {
 
 /**
  * Update a subscription instance
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post62 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrentTriggerProviderBySubscriptionIdSubscriptionsUpdate',
@@ -2847,9 +3812,16 @@ export const triggerProvider = {
 
 /**
  * List all trigger providers for the current tenant
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get58 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentTriggers',
@@ -2863,8 +3835,16 @@ export const triggers = {
   get: get58,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post63 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCurrent',
@@ -2893,8 +3873,16 @@ export const current = {
   triggers,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post64 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCustomConfigWebappLogoUpload',
@@ -2911,8 +3899,16 @@ export const webappLogo = {
   upload: upload2,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post65 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesCustomConfig',
@@ -2927,8 +3923,16 @@ export const customConfig = {
   webappLogo,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post66 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesInfo',
@@ -2942,8 +3946,16 @@ export const info4 = {
   post: post66,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const post67 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkspacesSwitch',
@@ -2957,8 +3969,16 @@ export const switch3 = {
   post: post67,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get59 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesByTenantIdModelProvidersByProviderByIconTypeByLang',
@@ -2988,8 +4008,16 @@ export const byTenantId = {
   modelProviders: modelProviders2,
 }
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get60 = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspaces',
diff --git a/packages/contracts/generated/api/console/workspaces/types.gen.ts b/packages/contracts/generated/api/console/workspaces/types.gen.ts
index a90db98f22..3d2dde4482 100644
--- a/packages/contracts/generated/api/console/workspaces/types.gen.ts
+++ b/packages/contracts/generated/api/console/workspaces/types.gen.ts
@@ -201,7 +201,7 @@ export type LoadBalancingCredentialPayload = {
 }
 
 export type ParserPreferredProviderType = {
-  preferred_provider_type: 'system' | 'custom'
+  preferred_provider_type: 'custom' | 'system'
 }
 
 export type ParserGithubInstall = {
@@ -487,9 +487,9 @@ export type Inner = {
   provider?: string | null
 }
 
-export type TenantAccountRole = 'owner' | 'admin' | 'editor' | 'normal' | 'dataset_operator'
+export type TenantAccountRole = 'admin' | 'dataset_operator' | 'editor' | 'normal' | 'owner'
 
-export type ModelType = 'llm' | 'text-embedding' | 'rerank' | 'speech2text' | 'moderation' | 'tts'
+export type ModelType = 'llm' | 'moderation' | 'rerank' | 'speech2text' | 'text-embedding' | 'tts'
 
 export type LoadBalancingPayload = {
   configs?: Array<{
@@ -498,9 +498,9 @@ export type LoadBalancingPayload = {
   enabled?: boolean | null
 }
 
-export type DebugPermission = 'everyone' | 'admins' | 'noone'
+export type DebugPermission = 'admins' | 'everyone' | 'noone'
 
-export type InstallPermission = 'everyone' | 'admins' | 'noone'
+export type InstallPermission = 'admins' | 'everyone' | 'noone'
 
 export type PluginAutoUpgradeSettingsPayload = {
   exclude_plugins?: Array<string>
@@ -515,7 +515,7 @@ export type PluginPermissionSettingsPayload = {
   install_permission?: InstallPermission
 }
 
-export type ApiProviderSchemaType = 'openapi' | 'swagger' | 'openai_plugin' | 'openai_actions'
+export type ApiProviderSchemaType = 'openai_actions' | 'openai_plugin' | 'openapi' | 'swagger'
 
 export type CredentialType = 'api-key' | 'oauth2' | 'unauthorized'
 
@@ -527,9 +527,9 @@ export type WorkflowToolParameterConfiguration = {
 
 export type StrategySetting = 'disabled' | 'fix_only' | 'latest'
 
-export type UpgradeMode = 'all' | 'partial' | 'exclude'
+export type UpgradeMode = 'all' | 'exclude' | 'partial'
 
-export type ToolParameterForm = 'schema' | 'form' | 'llm'
+export type ToolParameterForm = 'form' | 'llm' | 'schema'
 
 export type GetWorkspacesData = {
   body?: never
@@ -1354,8 +1354,8 @@ export type PostWorkspacesCurrentModelProvidersByProviderModelsLoadBalancingConf
   = {
     body: LoadBalancingCredentialPayload
     path: {
-      provider: string
       config_id: string
+      provider: string
     }
     query?: never
     url: '/workspaces/current/model-providers/{provider}/models/load-balancing-configs/{config_id}/credentials-validate'
@@ -1844,8 +1844,8 @@ export type PostWorkspacesCurrentPluginTasksByTaskIdDeleteResponse
 export type PostWorkspacesCurrentPluginTasksByTaskIdDeleteByIdentifierData = {
   body?: never
   path: {
-    task_id: string
     identifier: string
+    task_id: string
   }
   query?: never
   url: '/workspaces/current/plugin/tasks/{task_id}/delete/{identifier}'
@@ -2140,8 +2140,8 @@ export type GetWorkspacesCurrentToolProviderBuiltinByProviderCredentialSchemaByC
   = {
     body?: never
     path: {
-      provider: string
       credential_type: string
+      provider: string
     }
     query?: never
     url: '/workspaces/current/tool-provider/builtin/{provider}/credential/schema/{credential_type}'
@@ -3004,10 +3004,10 @@ export type PostWorkspacesSwitchResponse
 export type GetWorkspacesByTenantIdModelProvidersByProviderByIconTypeByLangData = {
   body?: never
   path: {
-    tenant_id: string
-    provider: string
     icon_type: string
     lang: string
+    provider: string
+    tenant_id: string
   }
   query?: never
   url: '/workspaces/{tenant_id}/model-providers/{provider}/{icon_type}/{lang}'
diff --git a/packages/contracts/generated/api/console/workspaces/zod.gen.ts b/packages/contracts/generated/api/console/workspaces/zod.gen.ts
index a381824da7..cf7a3d97c5 100644
--- a/packages/contracts/generated/api/console/workspaces/zod.gen.ts
+++ b/packages/contracts/generated/api/console/workspaces/zod.gen.ts
@@ -173,7 +173,7 @@ export const zParserCredentialValidate = z.object({
  * ParserPreferredProviderType
  */
 export const zParserPreferredProviderType = z.object({
-  preferred_provider_type: z.enum(['system', 'custom']),
+  preferred_provider_type: z.enum(['custom', 'system']),
 })
 
 /**
@@ -431,7 +431,7 @@ export const zAccountWithRoleList = z.object({
 /**
  * TenantAccountRole
  */
-export const zTenantAccountRole = z.enum(['owner', 'admin', 'editor', 'normal', 'dataset_operator'])
+export const zTenantAccountRole = z.enum(['admin', 'dataset_operator', 'editor', 'normal', 'owner'])
 
 /**
  * MemberInvitePayload
@@ -449,10 +449,10 @@ export const zMemberInvitePayload = z.object({
  */
 export const zModelType = z.enum([
   'llm',
-  'text-embedding',
+  'moderation',
   'rerank',
   'speech2text',
-  'moderation',
+  'text-embedding',
   'tts',
 ])
 
@@ -559,12 +559,12 @@ export const zParserPostModels = z.object({
 /**
  * DebugPermission
  */
-export const zDebugPermission = z.enum(['everyone', 'admins', 'noone'])
+export const zDebugPermission = z.enum(['admins', 'everyone', 'noone'])
 
 /**
  * InstallPermission
  */
-export const zInstallPermission = z.enum(['everyone', 'admins', 'noone'])
+export const zInstallPermission = z.enum(['admins', 'everyone', 'noone'])
 
 /**
  * ParserPermissionChange
@@ -588,10 +588,10 @@ export const zPluginPermissionSettingsPayload = z.object({
  * Enum class for api provider schema type.
  */
 export const zApiProviderSchemaType = z.enum([
+  'openai_actions',
+  'openai_plugin',
   'openapi',
   'swagger',
-  'openai_plugin',
-  'openai_actions',
 ])
 
 /**
@@ -657,7 +657,7 @@ export const zStrategySetting = z.enum(['disabled', 'fix_only', 'latest'])
 /**
  * UpgradeMode
  */
-export const zUpgradeMode = z.enum(['all', 'partial', 'exclude'])
+export const zUpgradeMode = z.enum(['all', 'exclude', 'partial'])
 
 /**
  * PluginAutoUpgradeSettingsPayload
@@ -681,7 +681,7 @@ export const zParserPreferencesChange = z.object({
 /**
  * ToolParameterForm
  */
-export const zToolParameterForm = z.enum(['schema', 'form', 'llm'])
+export const zToolParameterForm = z.enum(['form', 'llm', 'schema'])
 
 /**
  * WorkflowToolParameterConfiguration
@@ -1214,8 +1214,8 @@ export const zPostWorkspacesCurrentModelProvidersByProviderModelsLoadBalancingCo
 
 export const zPostWorkspacesCurrentModelProvidersByProviderModelsLoadBalancingConfigsByConfigIdCredentialsValidatePath
   = z.object({
-    provider: z.string(),
     config_id: z.string(),
+    provider: z.string(),
   })
 
 /**
@@ -1484,8 +1484,8 @@ export const zPostWorkspacesCurrentPluginTasksByTaskIdDeleteResponse = z.record(
 )
 
 export const zPostWorkspacesCurrentPluginTasksByTaskIdDeleteByIdentifierPath = z.object({
-  task_id: z.string(),
   identifier: z.string(),
+  task_id: z.string(),
 })
 
 /**
@@ -1623,8 +1623,8 @@ export const zGetWorkspacesCurrentToolProviderBuiltinByProviderCredentialInfoRes
 
 export const zGetWorkspacesCurrentToolProviderBuiltinByProviderCredentialSchemaByCredentialTypePath
   = z.object({
-    provider: z.string(),
     credential_type: z.string(),
+    provider: z.string(),
   })
 
 /**
@@ -2135,10 +2135,10 @@ export const zPostWorkspacesSwitchBody = zSwitchWorkspacePayload
 export const zPostWorkspacesSwitchResponse = z.record(z.string(), z.unknown())
 
 export const zGetWorkspacesByTenantIdModelProvidersByProviderByIconTypeByLangPath = z.object({
-  tenant_id: z.string(),
-  provider: z.string(),
   icon_type: z.string(),
   lang: z.string(),
+  provider: z.string(),
+  tenant_id: z.string(),
 })
 
 /**
diff --git a/packages/contracts/generated/api/readiness.json b/packages/contracts/generated/api/readiness.json
new file mode 100644
index 0000000000..78fed3ccfa
--- /dev/null
+++ b/packages/contracts/generated/api/readiness.json
@@ -0,0 +1,17 @@
+{
+  "surfaces": {
+    "console": {
+      "notReady": 474,
+      "total": 570
+    },
+    "service": {
+      "notReady": 72,
+      "total": 88
+    },
+    "web": {
+      "notReady": 36,
+      "total": 41
+    }
+  },
+  "warning": "Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate."
+}
diff --git a/packages/contracts/generated/api/service/orpc.gen.ts b/packages/contracts/generated/api/service/orpc.gen.ts
index a5a45a6452..647cdd87b5 100644
--- a/packages/contracts/generated/api/service/orpc.gen.ts
+++ b/packages/contracts/generated/api/service/orpc.gen.ts
@@ -199,8 +199,16 @@ import {
   zPutConversationsByCIdVariablesByVariableIdResponse,
 } from './zod.gen'
 
+/**
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
+ */
 export const get = oc
   .route({
+    deprecated: true,
+    description:
+      'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getRoot',
@@ -218,11 +226,16 @@ export const root = {
  *
  * Get all feedbacks for the application
  * Returns paginated list of all feedback submitted for messages in this app.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get2 = oc
   .route({
+    deprecated: true,
     description:
-      'Get all feedbacks for the application\nReturns paginated list of all feedback submitted for messages in this app.',
+      'Get all feedbacks for the application\nReturns paginated list of all feedback submitted for messages in this app.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppFeedbacks',
@@ -245,10 +258,16 @@ export const app = {
  * Get the status of an annotation reply action job
  *
  * Get the status of an annotation reply action job
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get3 = oc
   .route({
-    description: 'Get the status of an annotation reply action job',
+    deprecated: true,
+    description:
+      'Get the status of an annotation reply action job\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getAppsAnnotationReplyByActionStatusByJobId',
@@ -271,10 +290,16 @@ export const status = {
  * Enable or disable annotation reply feature
  *
  * Enable or disable annotation reply feature
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post = oc
   .route({
-    description: 'Enable or disable annotation reply feature',
+    deprecated: true,
+    description:
+      'Enable or disable annotation reply feature\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAppsAnnotationReplyByAction',
@@ -398,11 +423,16 @@ export const apps = {
  *
  * Convert audio to text using speech-to-text
  * Accepts an audio file upload and returns the transcribed text.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post3 = oc
   .route({
+    deprecated: true,
     description:
-      'Convert audio to text using speech-to-text\nAccepts an audio file upload and returns the transcribed text.',
+      'Convert audio to text using speech-to-text\nAccepts an audio file upload and returns the transcribed text.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAudioToText',
@@ -420,10 +450,16 @@ export const audioToText = {
  * Stop a running chat message generation
  *
  * Stop a running chat message generation
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post4 = oc
   .route({
-    description: 'Stop a running chat message generation',
+    deprecated: true,
+    description:
+      'Stop a running chat message generation\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postChatMessagesByTaskIdStop',
@@ -448,11 +484,16 @@ export const byTaskId = {
  * Send a message in a chat conversation
  * This endpoint handles chat messages for chat, agent chat, and advanced chat applications.
  * Supports conversation management and both blocking and streaming response modes.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post5 = oc
   .route({
+    deprecated: true,
     description:
-      'Send a message in a chat conversation\nThis endpoint handles chat messages for chat, agent chat, and advanced chat applications.\nSupports conversation management and both blocking and streaming response modes.',
+      'Send a message in a chat conversation\nThis endpoint handles chat messages for chat, agent chat, and advanced chat applications.\nSupports conversation management and both blocking and streaming response modes.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postChatMessages',
@@ -472,10 +513,16 @@ export const chatMessages = {
  * Stop a running completion task
  *
  * Stop a running completion task
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post6 = oc
   .route({
-    description: 'Stop a running completion task',
+    deprecated: true,
+    description:
+      'Stop a running completion task\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postCompletionMessagesByTaskIdStop',
@@ -500,11 +547,16 @@ export const byTaskId2 = {
  * Create a completion for the given prompt
  * This endpoint generates a completion based on the provided inputs and query.
  * Supports both blocking and streaming response modes.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post7 = oc
   .route({
+    deprecated: true,
     description:
-      'Create a completion for the given prompt\nThis endpoint generates a completion based on the provided inputs and query.\nSupports both blocking and streaming response modes.',
+      'Create a completion for the given prompt\nThis endpoint generates a completion based on the provided inputs and query.\nSupports both blocking and streaming response modes.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postCompletionMessages',
@@ -524,10 +576,16 @@ export const completionMessages = {
  * Rename a conversation or auto-generate a name
  *
  * Rename a conversation or auto-generate a name
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post8 = oc
   .route({
-    description: 'Rename a conversation or auto-generate a name',
+    deprecated: true,
+    description:
+      'Rename a conversation or auto-generate a name\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postConversationsByCIdName',
@@ -634,11 +692,16 @@ export const byCId = {
  *
  * List all conversations for the current user
  * Supports pagination using last_id and limit parameters.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get6 = oc
   .route({
+    deprecated: true,
     description:
-      'List all conversations for the current user\nSupports pagination using last_id and limit parameters.',
+      'List all conversations for the current user\nSupports pagination using last_id and limit parameters.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getConversations',
@@ -659,11 +722,16 @@ export const conversations = {
  *
  * Upload a file to a knowledgebase pipeline
  * Accepts a single file upload via multipart/form-data.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post9 = oc
   .route({
+    deprecated: true,
     description:
-      'Upload a file to a knowledgebase pipeline\nAccepts a single file upload via multipart/form-data.',
+      'Upload a file to a knowledgebase pipeline\nAccepts a single file upload via multipart/form-data.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsPipelineFileUpload',
@@ -703,11 +771,11 @@ export const binding = {
 }
 
 /**
- * Unbind a tag from a dataset
+ * Unbind tags from a dataset
  */
 export const post11 = oc
   .route({
-    description: 'Unbind a tag from a dataset',
+    description: 'Unbind tags from a dataset',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsTagsUnbinding',
@@ -745,10 +813,16 @@ export const delete3 = oc
  * Get all knowledge type tags
  *
  * Get all knowledge type tags
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get7 = oc
   .route({
-    description: 'Get all knowledge type tags',
+    deprecated: true,
+    description:
+      'Get all knowledge type tags\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsTags',
@@ -760,10 +834,16 @@ export const get7 = oc
 
 /**
  * Update a knowledge type tag
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const patch = oc
   .route({
-    description: 'Update a knowledge type tag',
+    deprecated: true,
+    description:
+      'Update a knowledge type tag\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchDatasetsTags',
@@ -777,10 +857,16 @@ export const patch = oc
  * Add a knowledge type tag
  *
  * Add a knowledge type tag
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post12 = oc
   .route({
-    description: 'Add a knowledge type tag',
+    deprecated: true,
+    description:
+      'Add a knowledge type tag\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsTags',
@@ -802,10 +888,16 @@ export const tags = {
 
 /**
  * Create a new document by uploading a file
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post13 = oc
   .route({
-    description: 'Create a new document by uploading a file',
+    deprecated: true,
+    description:
+      'Create a new document by uploading a file\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdDocumentCreateByFile',
@@ -817,10 +909,16 @@ export const post13 = oc
 
 /**
  * Create a new document by uploading a file
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post14 = oc
   .route({
-    description: 'Create a new document by uploading a file',
+    deprecated: true,
+    description:
+      'Create a new document by uploading a file\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdDocumentCreateByFile',
@@ -836,10 +934,16 @@ export const createByFile = {
 
 /**
  * Create a new document by providing text content
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post15 = oc
   .route({
-    description: 'Create a new document by providing text content',
+    deprecated: true,
+    description:
+      'Create a new document by providing text content\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdDocumentCreateByText',
@@ -857,13 +961,15 @@ export const post15 = oc
 /**
  * Deprecated legacy alias for creating a new document by providing text content. Use /datasets/{dataset_id}/document/create-by-text instead.
  *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
  * @deprecated
  */
 export const post16 = oc
   .route({
     deprecated: true,
     description:
-      'Deprecated legacy alias for creating a new document by providing text content. Use /datasets/{dataset_id}/document/create-by-text instead.',
+      'Deprecated legacy alias for creating a new document by providing text content. Use /datasets/{dataset_id}/document/create-by-text instead.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdDocumentCreateByText',
@@ -889,10 +995,16 @@ export const document_ = {
 
 /**
  * Download selected uploaded documents as a single ZIP archive
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post17 = oc
   .route({
-    description: 'Download selected uploaded documents as a single ZIP archive',
+    deprecated: true,
+    description:
+      'Download selected uploaded documents as a single ZIP archive\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdDocumentsDownloadZip',
@@ -915,10 +1027,16 @@ export const downloadZip = {
  * Update metadata for multiple documents
  *
  * Update metadata for multiple documents
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post18 = oc
   .route({
-    description: 'Update metadata for multiple documents',
+    deprecated: true,
+    description:
+      'Update metadata for multiple documents\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdDocumentsMetadata',
@@ -955,11 +1073,16 @@ export const metadata = {
  * NotFound: If the dataset with the given ID does not exist.
  * Forbidden: If the user does not have permission.
  * InvalidActionError: If the action is invalid or cannot be performed.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const patch2 = oc
   .route({
+    deprecated: true,
     description:
-      'Batch update document status\nArgs:\n    tenant_id: tenant id\n    dataset_id: dataset id\n    action: action to perform (Literal["enable", "disable", "archive", "un_archive"])\n\nReturns:\n    dict: A dictionary with a key \'result\' and a value \'success\'\n    int: HTTP status code 200 indicating that the operation was successful.\n\nRaises:\n    NotFound: If the dataset with the given ID does not exist.\n    Forbidden: If the user does not have permission.\n    InvalidActionError: If the action is invalid or cannot be performed.',
+      'Batch update document status\nArgs:\n    tenant_id: tenant id\n    dataset_id: dataset id\n    action: action to perform (Literal["enable", "disable", "archive", "un_archive"])\n\nReturns:\n    dict: A dictionary with a key \'result\' and a value \'success\'\n    int: HTTP status code 200 indicating that the operation was successful.\n\nRaises:\n    NotFound: If the dataset with the given ID does not exist.\n    Forbidden: If the user does not have permission.\n    InvalidActionError: If the action is invalid or cannot be performed.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchDatasetsByDatasetIdDocumentsStatusByAction',
@@ -980,10 +1103,16 @@ export const status2 = {
 
 /**
  * Get indexing status for documents in a batch
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get8 = oc
   .route({
-    description: 'Get indexing status for documents in a batch',
+    deprecated: true,
+    description:
+      'Get indexing status for documents in a batch\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdDocumentsByBatchIndexingStatus',
@@ -1003,10 +1132,16 @@ export const byBatch = {
 
 /**
  * Get a signed download URL for a document's original uploaded file
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get9 = oc
   .route({
-    description: 'Get a signed download URL for a document\'s original uploaded file',
+    deprecated: true,
+    description:
+      'Get a signed download URL for a document\'s original uploaded file\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdDocumentsByDocumentIdDownload',
@@ -1046,10 +1181,16 @@ export const delete4 = oc
 
 /**
  * Update a specific child chunk
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const patch3 = oc
   .route({
-    description: 'Update a specific child chunk',
+    deprecated: true,
+    description:
+      'Update a specific child chunk\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId:
@@ -1075,10 +1216,16 @@ export const byChildChunkId = {
 
 /**
  * List child chunks for a segment
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get10 = oc
   .route({
-    description: 'List child chunks for a segment',
+    deprecated: true,
+    description:
+      'List child chunks for a segment\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdChildChunks',
@@ -1096,10 +1243,16 @@ export const get10 = oc
 
 /**
  * Create a new child chunk for a segment
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post19 = oc
   .route({
-    description: 'Create a new child chunk for a segment',
+    deprecated: true,
+    description:
+      'Create a new child chunk for a segment\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdChildChunks',
@@ -1140,10 +1293,16 @@ export const delete5 = oc
 
 /**
  * Get a specific segment by ID
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get11 = oc
   .route({
-    description: 'Get a specific segment by ID',
+    deprecated: true,
+    description:
+      'Get a specific segment by ID\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentId',
@@ -1155,10 +1314,16 @@ export const get11 = oc
 
 /**
  * Update a specific segment
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post20 = oc
   .route({
-    description: 'Update a specific segment',
+    deprecated: true,
+    description:
+      'Update a specific segment\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentId',
@@ -1182,10 +1347,16 @@ export const bySegmentId = {
 
 /**
  * List segments in a document
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get12 = oc
   .route({
-    description: 'List segments in a document',
+    deprecated: true,
+    description:
+      'List segments in a document\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdDocumentsByDocumentIdSegments',
@@ -1202,10 +1373,16 @@ export const get12 = oc
 
 /**
  * Create segments in a document
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post21 = oc
   .route({
-    description: 'Create segments in a document',
+    deprecated: true,
+    description:
+      'Create segments in a document\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdDocumentsByDocumentIdSegments',
@@ -1229,13 +1406,15 @@ export const segments = {
 /**
  * Deprecated legacy alias for updating an existing document by uploading a file. Use PATCH /datasets/{dataset_id}/documents/{document_id} instead.
  *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
  * @deprecated
  */
 export const post22 = oc
   .route({
     deprecated: true,
     description:
-      'Deprecated legacy alias for updating an existing document by uploading a file. Use PATCH /datasets/{dataset_id}/documents/{document_id} instead.',
+      'Deprecated legacy alias for updating an existing document by uploading a file. Use PATCH /datasets/{dataset_id}/documents/{document_id} instead.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdDocumentsByDocumentIdUpdateByFile',
@@ -1248,13 +1427,15 @@ export const post22 = oc
 /**
  * Deprecated legacy alias for updating an existing document by uploading a file. Use PATCH /datasets/{dataset_id}/documents/{document_id} instead.
  *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
  * @deprecated
  */
 export const post23 = oc
   .route({
     deprecated: true,
     description:
-      'Deprecated legacy alias for updating an existing document by uploading a file. Use PATCH /datasets/{dataset_id}/documents/{document_id} instead.',
+      'Deprecated legacy alias for updating an existing document by uploading a file. Use PATCH /datasets/{dataset_id}/documents/{document_id} instead.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdDocumentsByDocumentIdUpdateByFile',
@@ -1270,10 +1451,16 @@ export const updateByFile = {
 
 /**
  * Update an existing document by providing text content
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post24 = oc
   .route({
-    description: 'Update an existing document by providing text content',
+    deprecated: true,
+    description:
+      'Update an existing document by providing text content\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdDocumentsByDocumentIdUpdateByText',
@@ -1291,13 +1478,15 @@ export const post24 = oc
 /**
  * Deprecated legacy alias for updating an existing document by providing text content. Use /datasets/{dataset_id}/documents/{document_id}/update-by-text instead.
  *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
  * @deprecated
  */
 export const post25 = oc
   .route({
     deprecated: true,
     description:
-      'Deprecated legacy alias for updating an existing document by providing text content. Use /datasets/{dataset_id}/documents/{document_id}/update-by-text instead.',
+      'Deprecated legacy alias for updating an existing document by providing text content. Use /datasets/{dataset_id}/documents/{document_id}/update-by-text instead.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdDocumentsByDocumentIdUpdateByText',
@@ -1337,10 +1526,16 @@ export const delete6 = oc
 
 /**
  * Get a specific document by ID
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get13 = oc
   .route({
-    description: 'Get a specific document by ID',
+    deprecated: true,
+    description:
+      'Get a specific document by ID\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdDocumentsByDocumentId',
@@ -1352,10 +1547,16 @@ export const get13 = oc
 
 /**
  * Update an existing document by uploading a file
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const patch4 = oc
   .route({
-    description: 'Update an existing document by uploading a file',
+    deprecated: true,
+    description:
+      'Update an existing document by uploading a file\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchDatasetsByDatasetIdDocumentsByDocumentId',
@@ -1377,10 +1578,16 @@ export const byDocumentId = {
 
 /**
  * List all documents in a dataset
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get14 = oc
   .route({
-    description: 'List all documents in a dataset',
+    deprecated: true,
+    description:
+      'List all documents in a dataset\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdDocuments',
@@ -1404,11 +1611,16 @@ export const documents = {
  *
  * Perform hit testing on a dataset
  * Tests retrieval performance for the specified dataset.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post26 = oc
   .route({
+    deprecated: true,
     description:
-      'Perform hit testing on a dataset\nTests retrieval performance for the specified dataset.',
+      'Perform hit testing on a dataset\nTests retrieval performance for the specified dataset.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdHitTesting',
@@ -1432,10 +1644,16 @@ export const hitTesting = {
  * Enable or disable built-in metadata field
  *
  * Enable or disable built-in metadata field
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post27 = oc
   .route({
-    description: 'Enable or disable built-in metadata field',
+    deprecated: true,
+    description:
+      'Enable or disable built-in metadata field\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdMetadataBuiltInByAction',
@@ -1454,10 +1672,16 @@ export const byAction3 = {
  * Get all built-in metadata fields
  *
  * Get all built-in metadata fields
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get15 = oc
   .route({
-    description: 'Get all built-in metadata fields',
+    deprecated: true,
+    description:
+      'Get all built-in metadata fields\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdMetadataBuiltIn',
@@ -1496,10 +1720,16 @@ export const delete7 = oc
  * Update metadata name
  *
  * Update metadata name
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const patch5 = oc
   .route({
-    description: 'Update metadata name',
+    deprecated: true,
+    description:
+      'Update metadata name\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchDatasetsByDatasetIdMetadataByMetadataId',
@@ -1524,10 +1754,16 @@ export const byMetadataId = {
  * Get all metadata for a dataset
  *
  * Get all metadata for a dataset
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get16 = oc
   .route({
-    description: 'Get all metadata for a dataset',
+    deprecated: true,
+    description:
+      'Get all metadata for a dataset\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdMetadata',
@@ -1542,10 +1778,16 @@ export const get16 = oc
  * Create metadata for a dataset
  *
  * Create metadata for a dataset
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post28 = oc
   .route({
-    description: 'Create metadata for a dataset',
+    deprecated: true,
+    description:
+      'Create metadata for a dataset\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdMetadata',
@@ -1573,10 +1815,16 @@ export const metadata2 = {
  * Resource for getting datasource plugins
  *
  * List all datasource plugins for a rag pipeline
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get17 = oc
   .route({
-    description: 'List all datasource plugins for a rag pipeline',
+    deprecated: true,
+    description:
+      'List all datasource plugins for a rag pipeline\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdPipelineDatasourcePlugins',
@@ -1600,10 +1848,16 @@ export const datasourcePlugins = {
  * Resource for getting datasource plugins
  *
  * Run a datasource node for a rag pipeline
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post29 = oc
   .route({
-    description: 'Run a datasource node for a rag pipeline',
+    deprecated: true,
+    description:
+      'Run a datasource node for a rag pipeline\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdPipelineDatasourceNodesByNodeIdRun',
@@ -1634,10 +1888,16 @@ export const datasource = {
  * Resource for running a rag pipeline
  *
  * Run a datasource node for a rag pipeline
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post30 = oc
   .route({
-    description: 'Run a datasource node for a rag pipeline',
+    deprecated: true,
+    description:
+      'Run a datasource node for a rag pipeline\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdPipelineRun',
@@ -1663,11 +1923,16 @@ export const pipeline2 = {
  *
  * Perform hit testing on a dataset
  * Tests retrieval performance for the specified dataset.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post31 = oc
   .route({
+    deprecated: true,
     description:
-      'Perform hit testing on a dataset\nTests retrieval performance for the specified dataset.',
+      'Perform hit testing on a dataset\nTests retrieval performance for the specified dataset.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasetsByDatasetIdRetrieve',
@@ -1691,10 +1956,16 @@ export const retrieve = {
  * Get all knowledge type tags
  *
  * Get tags bound to a specific dataset
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get18 = oc
   .route({
-    description: 'Get tags bound to a specific dataset',
+    deprecated: true,
+    description:
+      'Get tags bound to a specific dataset\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetIdTags',
@@ -1742,10 +2013,16 @@ export const delete8 = oc
 
 /**
  * Get a specific dataset by ID
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get19 = oc
   .route({
-    description: 'Get a specific dataset by ID',
+    deprecated: true,
+    description:
+      'Get a specific dataset by ID\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasetsByDatasetId',
@@ -1757,10 +2034,16 @@ export const get19 = oc
 
 /**
  * Update an existing dataset
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const patch6 = oc
   .route({
-    description: 'Update an existing dataset',
+    deprecated: true,
+    description:
+      'Update an existing dataset\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchDatasetsByDatasetId',
@@ -1787,10 +2070,16 @@ export const byDatasetId = {
  * Resource for getting datasets
  *
  * List all datasets
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get20 = oc
   .route({
-    description: 'List all datasets',
+    deprecated: true,
+    description:
+      'List all datasets\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getDatasets',
@@ -1804,10 +2093,16 @@ export const get20 = oc
  * Resource for creating datasets
  *
  * Create a new dataset
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post32 = oc
   .route({
-    description: 'Create a new dataset',
+    deprecated: true,
+    description:
+      'Create a new dataset\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postDatasets',
@@ -1832,11 +2127,16 @@ export const datasets = {
  * Get an end user by ID
  * This endpoint is scoped to the current app token's tenant/app to prevent
  * cross-tenant/app access when an end-user ID is known.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get21 = oc
   .route({
+    deprecated: true,
     description:
-      'Get an end user by ID\nThis endpoint is scoped to the current app token\'s tenant/app to prevent\ncross-tenant/app access when an end-user ID is known.',
+      'Get an end user by ID\nThis endpoint is scoped to the current app token\'s tenant/app to prevent\ncross-tenant/app access when an end-user ID is known.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getEndUsersByEndUserId',
@@ -1885,11 +2185,16 @@ export const upload = {
  * Preview or download a file uploaded via Service API
  * Provides secure file preview/download functionality.
  * Files can only be accessed if they belong to messages within the requesting app's context.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get22 = oc
   .route({
+    deprecated: true,
     description:
-      'Preview or download a file uploaded via Service API\nProvides secure file preview/download functionality.\nFiles can only be accessed if they belong to messages within the requesting app\'s context.',
+      'Preview or download a file uploaded via Service API\nProvides secure file preview/download functionality.\nFiles can only be accessed if they belong to messages within the requesting app\'s context.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getFilesByFileIdPreview',
@@ -1920,10 +2225,16 @@ export const files = {
 
 /**
  * Get a paused human input form by token
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get23 = oc
   .route({
-    description: 'Get a paused human input form by token',
+    deprecated: true,
+    description:
+      'Get a paused human input form by token\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getFormHumanInputByFormToken',
@@ -1935,10 +2246,16 @@ export const get23 = oc
 
 /**
  * Submit a paused human input form by token
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post34 = oc
   .route({
-    description: 'Submit a paused human input form by token',
+    deprecated: true,
+    description:
+      'Submit a paused human input form by token\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postFormHumanInputByFormToken',
@@ -1971,11 +2288,16 @@ export const form = {
  *
  * Get basic application information
  * Returns basic information about the application including name, description, tags, and mode.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get24 = oc
   .route({
+    deprecated: true,
     description:
-      'Get basic application information\nReturns basic information about the application including name, description, tags, and mode.',
+      'Get basic application information\nReturns basic information about the application including name, description, tags, and mode.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getInfo',
@@ -1994,11 +2316,16 @@ export const info = {
  *
  * Submit feedback for a message
  * Allows users to rate messages as like/dislike and provide optional feedback content.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post35 = oc
   .route({
+    deprecated: true,
     description:
-      'Submit feedback for a message\nAllows users to rate messages as like/dislike and provide optional feedback content.',
+      'Submit feedback for a message\nAllows users to rate messages as like/dislike and provide optional feedback content.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postMessagesByMessageIdFeedbacks',
@@ -2023,11 +2350,16 @@ export const feedbacks2 = {
  *
  * Get suggested follow-up questions for a message
  * Returns AI-generated follow-up questions based on the message content.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get25 = oc
   .route({
+    deprecated: true,
     description:
-      'Get suggested follow-up questions for a message\nReturns AI-generated follow-up questions based on the message content.',
+      'Get suggested follow-up questions for a message\nReturns AI-generated follow-up questions based on the message content.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getMessagesByMessageIdSuggested',
@@ -2052,11 +2384,16 @@ export const byMessageId = {
  *
  * List messages in a conversation
  * Retrieves messages with pagination support using first_id.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get26 = oc
   .route({
+    deprecated: true,
     description:
-      'List messages in a conversation\nRetrieves messages with pagination support using first_id.',
+      'List messages in a conversation\nRetrieves messages with pagination support using first_id.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getMessages',
@@ -2077,11 +2414,16 @@ export const messages = {
  *
  * Get application metadata
  * Returns metadata about the application including configuration and settings.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get27 = oc
   .route({
+    deprecated: true,
     description:
-      'Get application metadata\nReturns metadata about the application including configuration and settings.',
+      'Get application metadata\nReturns metadata about the application including configuration and settings.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getMeta',
@@ -2100,11 +2442,16 @@ export const meta = {
  *
  * Retrieve application input parameters and configuration
  * Returns the input form parameters and configuration for the application.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get28 = oc
   .route({
+    deprecated: true,
     description:
-      'Retrieve application input parameters and configuration\nReturns the input form parameters and configuration for the application.',
+      'Retrieve application input parameters and configuration\nReturns the input form parameters and configuration for the application.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getParameters',
@@ -2123,11 +2470,16 @@ export const parameters = {
  *
  * Get application site configuration
  * Returns the site configuration for the application including theme, icons, and text.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get29 = oc
   .route({
+    deprecated: true,
     description:
-      'Get application site configuration\nReturns the site configuration for the application including theme, icons, and text.',
+      'Get application site configuration\nReturns the site configuration for the application including theme, icons, and text.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getSite',
@@ -2146,11 +2498,16 @@ export const site = {
  *
  * Convert text to audio using text-to-speech
  * Converts the provided text to audio using the specified voice.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post36 = oc
   .route({
+    deprecated: true,
     description:
-      'Convert text to audio using text-to-speech\nConverts the provided text to audio using the specified voice.',
+      'Convert text to audio using text-to-speech\nConverts the provided text to audio using the specified voice.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postTextToAudio',
@@ -2167,10 +2524,16 @@ export const textToAudio = {
 
 /**
  * Get workflow execution events stream after resume
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get30 = oc
   .route({
-    description: 'Get workflow execution events stream after resume',
+    deprecated: true,
+    description:
+      'Get workflow execution events stream after resume\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkflowByTaskIdEvents',
@@ -2202,11 +2565,16 @@ export const workflow = {
  *
  * Get workflow execution logs
  * Returns paginated workflow execution logs with filtering options.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get31 = oc
   .route({
+    deprecated: true,
     description:
-      'Get workflow execution logs\nReturns paginated workflow execution logs with filtering options.',
+      'Get workflow execution logs\nReturns paginated workflow execution logs with filtering options.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkflowsLogs',
@@ -2226,11 +2594,16 @@ export const logs = {
  *
  * Get workflow run details
  * Returns detailed information about a specific workflow run.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get32 = oc
   .route({
+    deprecated: true,
     description:
-      'Get workflow run details\nReturns detailed information about a specific workflow run.',
+      'Get workflow run details\nReturns detailed information about a specific workflow run.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkflowsRunByWorkflowRunId',
@@ -2251,11 +2624,16 @@ export const byWorkflowRunId = {
  * Execute a workflow
  * Runs a workflow with the provided inputs and returns the results.
  * Supports both blocking and streaming response modes.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post37 = oc
   .route({
+    deprecated: true,
     description:
-      'Execute a workflow\nRuns a workflow with the provided inputs and returns the results.\nSupports both blocking and streaming response modes.',
+      'Execute a workflow\nRuns a workflow with the provided inputs and returns the results.\nSupports both blocking and streaming response modes.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkflowsRun',
@@ -2275,10 +2653,16 @@ export const run3 = {
  * Stop a running workflow task
  *
  * Stop a running workflow task
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post38 = oc
   .route({
-    description: 'Stop a running workflow task',
+    deprecated: true,
+    description:
+      'Stop a running workflow task\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkflowsTasksByTaskIdStop',
@@ -2306,11 +2690,16 @@ export const tasks = {
  *
  * Execute a specific workflow by ID
  * Executes a specific workflow version identified by its ID.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post39 = oc
   .route({
+    deprecated: true,
     description:
-      'Execute a specific workflow by ID\nExecutes a specific workflow version identified by its ID.',
+      'Execute a specific workflow by ID\nExecutes a specific workflow version identified by its ID.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkflowsByWorkflowIdRun',
@@ -2346,11 +2735,16 @@ export const workflows = {
  *
  * Get available models by model type
  * Returns a list of available models for the specified model type.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get33 = oc
   .route({
+    deprecated: true,
     description:
-      'Get available models by model type\nReturns a list of available models for the specified model type.',
+      'Get available models by model type\nReturns a list of available models for the specified model type.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkspacesCurrentModelsModelTypesByModelType',
diff --git a/packages/contracts/generated/api/service/types.gen.ts b/packages/contracts/generated/api/service/types.gen.ts
index f491c1e3f9..ba6f822087 100644
--- a/packages/contracts/generated/api/service/types.gen.ts
+++ b/packages/contracts/generated/api/service/types.gen.ts
@@ -72,10 +72,34 @@ export type CompletionRequestPayload = {
   retriever_from?: string
 }
 
+export type Condition = {
+  comparison_operator:
+    | '<'
+    | '='
+    | '>'
+    | 'after'
+    | 'before'
+    | 'contains'
+    | 'empty'
+    | 'end with'
+    | 'in'
+    | 'is'
+    | 'is not'
+    | 'not contains'
+    | 'not empty'
+    | 'not in'
+    | 'start with'
+    | '≠'
+    | '≤'
+    | '≥'
+  name: string
+  value?: unknown
+}
+
 export type ConversationListQuery = {
   last_id?: string | null
   limit?: number
-  sort_by?: 'created_at' | '-created_at' | 'updated_at' | '-updated_at'
+  sort_by?: '-created_at' | '-updated_at' | 'created_at' | 'updated_at'
 }
 
 export type ConversationRenamePayload = {
@@ -109,13 +133,20 @@ export type ConversationVariablesQuery = {
   variable_name?: string | null
 }
 
+export type DataSetTag = {
+  binding_count?: string | null
+  id: string
+  name: string
+  type: string
+}
+
 export type DatasetCreatePayload = {
   description?: string
   embedding_model?: string | null
   embedding_model_provider?: string | null
   external_knowledge_api_id?: string | null
   external_knowledge_id?: string | null
-  indexing_technique?: 'high_quality' | 'economy' | null
+  indexing_technique?: 'economy' | 'high_quality' | null
   name: string
   permission?: DatasetPermissionEnum
   provider?: string
@@ -125,6 +156,16 @@ export type DatasetCreatePayload = {
   } | null
 }
 
+export type DatasetListQuery = {
+  include_all?: boolean
+  keyword?: string | null
+  limit?: number
+  page?: number
+  tag_ids?: Array<string>
+}
+
+export type DatasetPermissionEnum = 'all_team_members' | 'only_me' | 'partial_members'
+
 export type DatasetUpdatePayload = {
   description?: string | null
   embedding_model?: string | null
@@ -134,7 +175,7 @@ export type DatasetUpdatePayload = {
   external_retrieval_model?: {
     [key: string]: unknown
   } | null
-  indexing_technique?: 'high_quality' | 'economy' | null
+  indexing_technique?: 'economy' | 'high_quality' | null
   name?: string | null
   partial_member_list?: Array<{
     [key: string]: string
@@ -143,10 +184,32 @@ export type DatasetUpdatePayload = {
   retrieval_model?: RetrievalModel
 }
 
+export type DatasourceNodeRunPayload = {
+  credential_id?: string | null
+  datasource_type: string
+  inputs: {
+    [key: string]: unknown
+  }
+  is_published: boolean
+}
+
 export type DocumentBatchDownloadZipPayload = {
   document_ids: Array<string>
 }
 
+export type DocumentListQuery = {
+  keyword?: string | null
+  limit?: number
+  page?: number
+  status?: string | null
+}
+
+export type DocumentMetadataOperation = {
+  document_id: string
+  metadata_list: Array<MetadataDetail>
+  partial_update?: boolean
+}
+
 export type DocumentTextCreatePayload = {
   doc_form?: string
   doc_language?: string
@@ -211,9 +274,11 @@ export type HumanInputFormSubmitPayload = {
   }
 }
 
+export type JsonValue = unknown
+
 export type MessageFeedbackPayload = {
   content?: string | null
-  rating?: 'like' | 'dislike' | null
+  rating?: 'dislike' | 'like' | null
 }
 
 export type MessageListQuery = {
@@ -224,7 +289,18 @@ export type MessageListQuery = {
 
 export type MetadataArgs = {
   name: string
-  type: 'string' | 'number' | 'time'
+  type: 'number' | 'string' | 'time'
+}
+
+export type MetadataDetail = {
+  id: string
+  name: string
+  value?: unknown
+}
+
+export type MetadataFilteringCondition = {
+  conditions?: Array<Condition> | null
+  logical_operator?: 'and' | 'or' | null
 }
 
 export type MetadataOperationData = {
@@ -235,6 +311,59 @@ export type MetadataUpdatePayload = {
   name: string
 }
 
+export type PipelineRunApiEntity = {
+  datasource_info_list: Array<{
+    [key: string]: unknown
+  }>
+  datasource_type: string
+  inputs: {
+    [key: string]: unknown
+  }
+  is_published: boolean
+  response_mode: string
+  start_node_id: string
+}
+
+export type PreProcessingRule = {
+  enabled: boolean
+  id: string
+}
+
+export type ProcessRule = {
+  mode: 'automatic' | 'custom' | 'hierarchical'
+  rules?: Rule
+}
+
+export type RerankingModel = {
+  reranking_model_name?: string | null
+  reranking_provider_name?: string | null
+}
+
+export type RetrievalMethod
+  = | 'full_text_search'
+    | 'hybrid_search'
+    | 'keyword_search'
+    | 'semantic_search'
+
+export type RetrievalModel = {
+  metadata_filtering_conditions?: MetadataFilteringCondition
+  reranking_enable: boolean
+  reranking_mode?: string | null
+  reranking_model?: RerankingModel
+  score_threshold?: number | null
+  score_threshold_enabled: boolean
+  search_method: RetrievalMethod
+  top_k: number
+  weights?: WeightModel
+}
+
+export type Rule = {
+  parent_mode?: 'full-doc' | 'paragraph' | null
+  pre_processing_rules?: Array<PreProcessingRule> | null
+  segmentation?: Segmentation
+  subchunk_segmentation?: Segmentation
+}
+
 export type SegmentCreatePayload = {
   segments?: Array<{
     [key: string]: unknown
@@ -246,10 +375,39 @@ export type SegmentListQuery = {
   status?: Array<string>
 }
 
+export type SegmentUpdateArgs = {
+  answer?: string | null
+  attachment_ids?: Array<string> | null
+  content?: string | null
+  enabled?: boolean | null
+  keywords?: Array<string> | null
+  regenerate_child_chunks?: boolean
+  summary?: string | null
+}
+
 export type SegmentUpdatePayload = {
   segment: SegmentUpdateArgs
 }
 
+export type Segmentation = {
+  chunk_overlap?: number
+  max_tokens: number
+  separator?: string
+}
+
+export type SimpleAccount = {
+  email: string
+  id: string
+  name: string
+}
+
+export type SimpleEndUser = {
+  id: string
+  is_anonymous: boolean
+  session_id?: string | null
+  type: string
+}
+
 export type TagBindingPayload = {
   tag_ids: Array<string>
   target_id: string
@@ -264,7 +422,8 @@ export type TagDeletePayload = {
 }
 
 export type TagUnbindingPayload = {
-  tag_id: string
+  tag_id?: string | null
+  tag_ids?: Array<string>
   target_id: string
 }
 
@@ -280,6 +439,22 @@ export type TextToAudioPayload = {
   voice?: string | null
 }
 
+export type WeightKeywordSetting = {
+  keyword_weight: number
+}
+
+export type WeightModel = {
+  keyword_setting?: WeightKeywordSetting
+  vector_setting?: WeightVectorSetting
+  weight_type?: 'customized' | 'keyword_first' | 'semantic_first' | null
+}
+
+export type WeightVectorSetting = {
+  embedding_model_name: string
+  embedding_provider_name: string
+  vector_weight: number
+}
+
 export type WorkflowAppLogPaginationResponse = {
   data: Array<WorkflowAppLogPartialResponse>
   has_more: boolean
@@ -288,6 +463,17 @@ export type WorkflowAppLogPaginationResponse = {
   total: number
 }
 
+export type WorkflowAppLogPartialResponse = {
+  created_at?: number | null
+  created_by_account?: SimpleAccount
+  created_by_end_user?: SimpleEndUser
+  created_by_role?: string | null
+  created_from?: string | null
+  details?: unknown
+  id: string
+  workflow_run?: WorkflowRunForLogResponse
+}
+
 export type WorkflowLogQuery = {
   created_at__after?: string | null
   created_at__before?: string | null
@@ -296,7 +482,21 @@ export type WorkflowLogQuery = {
   keyword?: string | null
   limit?: number
   page?: number
-  status?: 'succeeded' | 'failed' | 'stopped' | null
+  status?: 'failed' | 'stopped' | 'succeeded' | null
+}
+
+export type WorkflowRunForLogResponse = {
+  created_at?: number | null
+  elapsed_time?: unknown
+  error?: string | null
+  exceptions_count?: number | null
+  finished_at?: number | null
+  id: string
+  status?: string | null
+  total_steps?: number | null
+  total_tokens?: number | null
+  triggered_from?: string | null
+  version?: string | null
 }
 
 export type WorkflowRunPayload = {
@@ -325,131 +525,6 @@ export type WorkflowRunResponse = {
   workflow_id: string
 }
 
-export type DatasetPermissionEnum = 'only_me' | 'all_team_members' | 'partial_members'
-
-export type RerankingModel = {
-  reranking_model_name?: string | null
-  reranking_provider_name?: string | null
-}
-
-export type RetrievalMethod
-  = | 'semantic_search'
-    | 'full_text_search'
-    | 'hybrid_search'
-    | 'keyword_search'
-
-export type RetrievalModel = {
-  reranking_enable: boolean
-  reranking_mode?: string | null
-  reranking_model?: RerankingModel
-  score_threshold?: number | null
-  score_threshold_enabled: boolean
-  search_method: RetrievalMethod
-  top_k: number
-  weights?: WeightModel
-}
-
-export type WeightKeywordSetting = {
-  keyword_weight: number
-}
-
-export type WeightModel = {
-  keyword_setting?: WeightKeywordSetting
-  vector_setting?: WeightVectorSetting
-  weight_type?: 'semantic_first' | 'keyword_first' | 'customized' | null
-}
-
-export type WeightVectorSetting = {
-  embedding_model_name: string
-  embedding_provider_name: string
-  vector_weight: number
-}
-
-export type PreProcessingRule = {
-  enabled: boolean
-  id: string
-}
-
-export type ProcessRule = {
-  mode: 'automatic' | 'custom' | 'hierarchical'
-  rules?: Rule
-}
-
-export type Rule = {
-  parent_mode?: 'full-doc' | 'paragraph' | null
-  pre_processing_rules?: Array<PreProcessingRule> | null
-  segmentation?: Segmentation
-  subchunk_segmentation?: Segmentation
-}
-
-export type Segmentation = {
-  chunk_overlap?: number
-  max_tokens: number
-  separator?: string
-}
-
-export type JsonValue = unknown
-
-export type DocumentMetadataOperation = {
-  document_id: string
-  metadata_list: Array<MetadataDetail>
-  partial_update?: boolean
-}
-
-export type MetadataDetail = {
-  id: string
-  name: string
-  value?: unknown
-}
-
-export type SegmentUpdateArgs = {
-  answer?: string | null
-  attachment_ids?: Array<string> | null
-  content?: string | null
-  enabled?: boolean | null
-  keywords?: Array<string> | null
-  regenerate_child_chunks?: boolean
-  summary?: string | null
-}
-
-export type SimpleAccount = {
-  email: string
-  id: string
-  name: string
-}
-
-export type SimpleEndUser = {
-  id: string
-  is_anonymous: boolean
-  session_id?: string | null
-  type: string
-}
-
-export type WorkflowAppLogPartialResponse = {
-  created_at?: number | null
-  created_by_account?: SimpleAccount
-  created_by_end_user?: SimpleEndUser
-  created_by_role?: string | null
-  created_from?: string | null
-  details?: unknown
-  id: string
-  workflow_run?: WorkflowRunForLogResponse
-}
-
-export type WorkflowRunForLogResponse = {
-  created_at?: number | null
-  elapsed_time?: unknown
-  error?: string | null
-  exceptions_count?: number | null
-  finished_at?: number | null
-  id: string
-  status?: string | null
-  total_steps?: number | null
-  total_tokens?: number | null
-  triggered_from?: string | null
-  version?: string | null
-}
-
 export type GetRootData = {
   body?: never
   path?: never
@@ -619,7 +694,7 @@ export type DeleteAppsAnnotationsByAnnotationIdError
 
 export type DeleteAppsAnnotationsByAnnotationIdResponses = {
   204: {
-    [key: string]: unknown
+    [key: string]: never
   }
 }
 
@@ -827,7 +902,7 @@ export type GetConversationsData = {
   query?: {
     last_id?: string | null
     limit?: number
-    sort_by?: 'created_at' | '-created_at' | 'updated_at' | '-updated_at'
+    sort_by?: '-created_at' | '-updated_at' | 'created_at' | 'updated_at'
   }
   url: '/conversations'
 }
@@ -874,7 +949,7 @@ export type DeleteConversationsByCIdError
 
 export type DeleteConversationsByCIdResponses = {
   204: {
-    [key: string]: unknown
+    [key: string]: never
   }
 }
 
@@ -1078,7 +1153,7 @@ export type DeleteDatasetsTagsError = DeleteDatasetsTagsErrors[keyof DeleteDatas
 
 export type DeleteDatasetsTagsResponses = {
   204: {
-    [key: string]: unknown
+    [key: string]: never
   }
 }
 
@@ -1181,7 +1256,7 @@ export type PostDatasetsTagsBindingError
 
 export type PostDatasetsTagsBindingResponses = {
   204: {
-    [key: string]: unknown
+    [key: string]: never
   }
 }
 
@@ -1209,7 +1284,7 @@ export type PostDatasetsTagsUnbindingError
 
 export type PostDatasetsTagsUnbindingResponses = {
   204: {
-    [key: string]: unknown
+    [key: string]: never
   }
 }
 
@@ -1242,7 +1317,7 @@ export type DeleteDatasetsByDatasetIdError
 
 export type DeleteDatasetsByDatasetIdResponses = {
   204: {
-    [key: string]: unknown
+    [key: string]: never
   }
 }
 
@@ -1531,8 +1606,8 @@ export type PostDatasetsByDatasetIdDocumentsMetadataResponse
 export type PatchDatasetsByDatasetIdDocumentsStatusByActionData = {
   body?: never
   path: {
-    dataset_id: string
     action: string
+    dataset_id: string
   }
   query?: never
   url: '/datasets/{dataset_id}/documents/status/{action}'
@@ -1568,8 +1643,8 @@ export type PatchDatasetsByDatasetIdDocumentsStatusByActionResponse
 export type GetDatasetsByDatasetIdDocumentsByBatchIndexingStatusData = {
   body?: never
   path: {
-    dataset_id: string
     batch: string
+    dataset_id: string
   }
   query?: never
   url: '/datasets/{dataset_id}/documents/{batch}/indexing-status'
@@ -1623,7 +1698,7 @@ export type DeleteDatasetsByDatasetIdDocumentsByDocumentIdError
 
 export type DeleteDatasetsByDatasetIdDocumentsByDocumentIdResponses = {
   204: {
-    [key: string]: unknown
+    [key: string]: never
   }
 }
 
@@ -1822,7 +1897,7 @@ export type DeleteDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdErr
 
 export type DeleteDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdResponses = {
   204: {
-    [key: string]: unknown
+    [key: string]: never
   }
 }
 
@@ -1832,9 +1907,9 @@ export type DeleteDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdRes
 export type GetDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdData = {
   body?: never
   path: {
-    segment_id: string
     dataset_id: string
     document_id: string
+    segment_id: string
   }
   query?: never
   url: '/datasets/{dataset_id}/documents/{document_id}/segments/{segment_id}'
@@ -1965,10 +2040,10 @@ export type DeleteDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdChi
   = {
     body?: never
     path: {
+      child_chunk_id: string
       dataset_id: string
       document_id: string
       segment_id: string
-      child_chunk_id: string
     }
     query?: never
     url: '/datasets/{dataset_id}/documents/{document_id}/segments/{segment_id}/child_chunks/{child_chunk_id}'
@@ -1990,7 +2065,7 @@ export type DeleteDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdChi
 export type DeleteDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdChildChunksByChildChunkIdResponses
   = {
     204: {
-      [key: string]: unknown
+      [key: string]: never
     }
   }
 
@@ -2001,10 +2076,10 @@ export type PatchDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdChil
   = {
     body: ChildChunkUpdatePayload
     path: {
+      child_chunk_id: string
       dataset_id: string
       document_id: string
       segment_id: string
-      child_chunk_id: string
     }
     query?: never
     url: '/datasets/{dataset_id}/documents/{document_id}/segments/{segment_id}/child_chunks/{child_chunk_id}'
@@ -2277,8 +2352,8 @@ export type GetDatasetsByDatasetIdMetadataBuiltInResponse
 export type PostDatasetsByDatasetIdMetadataBuiltInByActionData = {
   body?: never
   path: {
-    dataset_id: string
     action: string
+    dataset_id: string
   }
   query?: never
   url: '/datasets/{dataset_id}/metadata/built-in/{action}'
@@ -2329,7 +2404,7 @@ export type DeleteDatasetsByDatasetIdMetadataByMetadataIdError
 
 export type DeleteDatasetsByDatasetIdMetadataByMetadataIdResponses = {
   204: {
-    [key: string]: unknown
+    [key: string]: never
   }
 }
 
@@ -2907,9 +2982,9 @@ export type GetWorkflowByTaskIdEventsData = {
     task_id: string
   }
   query?: {
-    user?: string
-    include_state_snapshot?: string
     continue_on_pause?: string
+    include_state_snapshot?: string
+    user?: string
   }
   url: '/workflow/{task_id}/events'
 }
@@ -2946,7 +3021,7 @@ export type GetWorkflowsLogsData = {
     keyword?: string | null
     limit?: number
     page?: number
-    status?: 'succeeded' | 'failed' | 'stopped' | null
+    status?: 'failed' | 'stopped' | 'succeeded' | null
   }
   url: '/workflows/logs'
 }
diff --git a/packages/contracts/generated/api/service/zod.gen.ts b/packages/contracts/generated/api/service/zod.gen.ts
index 2c2400c0cb..8a1b7c5a3d 100644
--- a/packages/contracts/generated/api/service/zod.gen.ts
+++ b/packages/contracts/generated/api/service/zod.gen.ts
@@ -89,6 +89,36 @@ export const zCompletionRequestPayload = z.object({
   retriever_from: z.string().optional().default('dev'),
 })
 
+/**
+ * Condition
+ *
+ * Condition detail
+ */
+export const zCondition = z.object({
+  comparison_operator: z.enum([
+    '<',
+    '=',
+    '>',
+    'after',
+    'before',
+    'contains',
+    'empty',
+    'end with',
+    'in',
+    'is',
+    'is not',
+    'not contains',
+    'not empty',
+    'not in',
+    'start with',
+    '≠',
+    '≤',
+    '≥',
+  ]),
+  name: z.string(),
+  value: z.unknown().optional(),
+})
+
 /**
  * ConversationListQuery
  */
@@ -96,7 +126,7 @@ export const zConversationListQuery = z.object({
   last_id: z.string().nullish(),
   limit: z.int().gte(1).lte(100).optional().default(20),
   sort_by: z
-    .enum(['created_at', '-created_at', 'updated_at', '-updated_at'])
+    .enum(['-created_at', '-updated_at', 'created_at', 'updated_at'])
     .optional()
     .default('-updated_at'),
 })
@@ -147,6 +177,42 @@ export const zConversationVariablesQuery = z.object({
   variable_name: z.string().min(1).max(255).nullish(),
 })
 
+/**
+ * DataSetTag
+ */
+export const zDataSetTag = z.object({
+  binding_count: z.string().nullish(),
+  id: z.string(),
+  name: z.string(),
+  type: z.string(),
+})
+
+/**
+ * DatasetListQuery
+ */
+export const zDatasetListQuery = z.object({
+  include_all: z.boolean().optional().default(false),
+  keyword: z.string().nullish(),
+  limit: z.int().optional().default(20),
+  page: z.int().optional().default(1),
+  tag_ids: z.array(z.string()).optional(),
+})
+
+/**
+ * DatasetPermissionEnum
+ */
+export const zDatasetPermissionEnum = z.enum(['all_team_members', 'only_me', 'partial_members'])
+
+/**
+ * DatasourceNodeRunPayload
+ */
+export const zDatasourceNodeRunPayload = z.object({
+  credential_id: z.string().nullish(),
+  datasource_type: z.string(),
+  inputs: z.record(z.string(), z.unknown()),
+  is_published: z.boolean(),
+})
+
 /**
  * DocumentBatchDownloadZipPayload
  *
@@ -156,6 +222,16 @@ export const zDocumentBatchDownloadZipPayload = z.object({
   document_ids: z.array(z.uuid()).min(1).max(100),
 })
 
+/**
+ * DocumentListQuery
+ */
+export const zDocumentListQuery = z.object({
+  keyword: z.string().nullish(),
+  limit: z.int().optional().default(20),
+  page: z.int().optional().default(1),
+  status: z.string().nullish(),
+})
+
 /**
  * FeedbackListQuery
  */
@@ -191,12 +267,22 @@ export const zFileResponse = z.object({
   user_id: z.string().nullish(),
 })
 
+export const zJsonValue = z.unknown()
+
+/**
+ * HumanInputFormSubmitPayload
+ */
+export const zHumanInputFormSubmitPayload = z.object({
+  action: z.string(),
+  inputs: z.record(z.string(), zJsonValue),
+})
+
 /**
  * MessageFeedbackPayload
  */
 export const zMessageFeedbackPayload = z.object({
   content: z.string().nullish(),
-  rating: z.enum(['like', 'dislike']).nullish(),
+  rating: z.enum(['dislike', 'like']).nullish(),
 })
 
 /**
@@ -213,7 +299,44 @@ export const zMessageListQuery = z.object({
  */
 export const zMetadataArgs = z.object({
   name: z.string(),
-  type: z.enum(['string', 'number', 'time']),
+  type: z.enum(['number', 'string', 'time']),
+})
+
+/**
+ * MetadataDetail
+ */
+export const zMetadataDetail = z.object({
+  id: z.string(),
+  name: z.string(),
+  value: z.unknown().optional(),
+})
+
+/**
+ * DocumentMetadataOperation
+ */
+export const zDocumentMetadataOperation = z.object({
+  document_id: z.string(),
+  metadata_list: z.array(zMetadataDetail),
+  partial_update: z.boolean().optional().default(false),
+})
+
+/**
+ * MetadataFilteringCondition
+ *
+ * Metadata Filtering Condition.
+ */
+export const zMetadataFilteringCondition = z.object({
+  conditions: z.array(zCondition).nullish(),
+  logical_operator: z.enum(['and', 'or']).nullish().default('and'),
+})
+
+/**
+ * MetadataOperationData
+ *
+ * Metadata operation data
+ */
+export const zMetadataOperationData = z.object({
+  operation_data: z.array(zDocumentMetadataOperation),
 })
 
 /**
@@ -223,6 +346,44 @@ export const zMetadataUpdatePayload = z.object({
   name: z.string(),
 })
 
+/**
+ * PipelineRunApiEntity
+ */
+export const zPipelineRunApiEntity = z.object({
+  datasource_info_list: z.array(z.record(z.string(), z.unknown())),
+  datasource_type: z.string(),
+  inputs: z.record(z.string(), z.unknown()),
+  is_published: z.boolean(),
+  response_mode: z.string(),
+  start_node_id: z.string(),
+})
+
+/**
+ * PreProcessingRule
+ */
+export const zPreProcessingRule = z.object({
+  enabled: z.boolean(),
+  id: z.string(),
+})
+
+/**
+ * RerankingModel
+ */
+export const zRerankingModel = z.object({
+  reranking_model_name: z.string().nullish(),
+  reranking_provider_name: z.string().nullish(),
+})
+
+/**
+ * RetrievalMethod
+ */
+export const zRetrievalMethod = z.enum([
+  'full_text_search',
+  'hybrid_search',
+  'keyword_search',
+  'semantic_search',
+])
+
 /**
  * SegmentCreatePayload
  */
@@ -239,205 +400,23 @@ export const zSegmentListQuery = z.object({
 })
 
 /**
- * TagBindingPayload
+ * SegmentUpdateArgs
  */
-export const zTagBindingPayload = z.object({
-  tag_ids: z.array(z.string()),
-  target_id: z.string(),
-})
-
-/**
- * TagCreatePayload
- */
-export const zTagCreatePayload = z.object({
-  name: z.string().min(1).max(50),
-})
-
-/**
- * TagDeletePayload
- */
-export const zTagDeletePayload = z.object({
-  tag_id: z.string(),
-})
-
-/**
- * TagUnbindingPayload
- */
-export const zTagUnbindingPayload = z.object({
-  tag_id: z.string(),
-  target_id: z.string(),
-})
-
-/**
- * TagUpdatePayload
- */
-export const zTagUpdatePayload = z.object({
-  name: z.string().min(1).max(50),
-  tag_id: z.string(),
-})
-
-/**
- * TextToAudioPayload
- */
-export const zTextToAudioPayload = z.object({
-  message_id: z.string().nullish(),
-  streaming: z.boolean().nullish(),
-  text: z.string().nullish(),
-  voice: z.string().nullish(),
-})
-
-/**
- * WorkflowLogQuery
- */
-export const zWorkflowLogQuery = z.object({
-  created_at__after: z.string().nullish(),
-  created_at__before: z.string().nullish(),
-  created_by_account: z.string().nullish(),
-  created_by_end_user_session_id: z.string().nullish(),
-  keyword: z.string().nullish(),
-  limit: z.int().gte(1).lte(100).optional().default(20),
-  page: z.int().gte(1).lte(99999).optional().default(1),
-  status: z.enum(['succeeded', 'failed', 'stopped']).nullish(),
-})
-
-/**
- * WorkflowRunPayload
- */
-export const zWorkflowRunPayload = z.object({
-  files: z.array(z.record(z.string(), z.unknown())).nullish(),
-  inputs: z.record(z.string(), z.unknown()),
-  response_mode: z.enum(['blocking', 'streaming']).nullish(),
-})
-
-/**
- * WorkflowRunResponse
- */
-export const zWorkflowRunResponse = z.object({
-  created_at: z.int().nullish(),
-  elapsed_time: z.unknown().optional(),
-  error: z.string().nullish(),
-  finished_at: z.int().nullish(),
-  id: z.string(),
-  inputs: z.unknown().optional(),
-  outputs: z.record(z.string(), z.unknown()).optional(),
-  status: z.string(),
-  total_steps: z.int().nullish(),
-  total_tokens: z.int().nullish(),
-  workflow_id: z.string(),
-})
-
-/**
- * DatasetPermissionEnum
- */
-export const zDatasetPermissionEnum = z.enum(['only_me', 'all_team_members', 'partial_members'])
-
-/**
- * RerankingModel
- */
-export const zRerankingModel = z.object({
-  reranking_model_name: z.string().nullish(),
-  reranking_provider_name: z.string().nullish(),
-})
-
-/**
- * RetrievalMethod
- */
-export const zRetrievalMethod = z.enum([
-  'semantic_search',
-  'full_text_search',
-  'hybrid_search',
-  'keyword_search',
-])
-
-/**
- * WeightKeywordSetting
- */
-export const zWeightKeywordSetting = z.object({
-  keyword_weight: z.number(),
-})
-
-/**
- * WeightVectorSetting
- */
-export const zWeightVectorSetting = z.object({
-  embedding_model_name: z.string(),
-  embedding_provider_name: z.string(),
-  vector_weight: z.number(),
-})
-
-/**
- * WeightModel
- */
-export const zWeightModel = z.object({
-  keyword_setting: zWeightKeywordSetting.optional(),
-  vector_setting: zWeightVectorSetting.optional(),
-  weight_type: z.enum(['semantic_first', 'keyword_first', 'customized']).nullish(),
-})
-
-/**
- * RetrievalModel
- */
-export const zRetrievalModel = z.object({
-  reranking_enable: z.boolean(),
-  reranking_mode: z.string().nullish(),
-  reranking_model: zRerankingModel.optional(),
-  score_threshold: z.number().nullish(),
-  score_threshold_enabled: z.boolean(),
-  search_method: zRetrievalMethod,
-  top_k: z.int(),
-  weights: zWeightModel.optional(),
-})
-
-/**
- * DatasetCreatePayload
- */
-export const zDatasetCreatePayload = z.object({
-  description: z.string().max(400).optional().default(''),
-  embedding_model: z.string().nullish(),
-  embedding_model_provider: z.string().nullish(),
-  external_knowledge_api_id: z.string().nullish(),
-  external_knowledge_id: z.string().nullish(),
-  indexing_technique: z.enum(['high_quality', 'economy']).nullish(),
-  name: z.string().min(1).max(40),
-  permission: zDatasetPermissionEnum.optional(),
-  provider: z.string().optional().default('vendor'),
-  retrieval_model: zRetrievalModel.optional(),
-  summary_index_setting: z.record(z.string(), z.unknown()).nullish(),
-})
-
-/**
- * DatasetUpdatePayload
- */
-export const zDatasetUpdatePayload = z.object({
-  description: z.string().max(400).nullish(),
-  embedding_model: z.string().nullish(),
-  embedding_model_provider: z.string().nullish(),
-  external_knowledge_api_id: z.string().nullish(),
-  external_knowledge_id: z.string().nullish(),
-  external_retrieval_model: z.record(z.string(), z.unknown()).nullish(),
-  indexing_technique: z.enum(['high_quality', 'economy']).nullish(),
-  name: z.string().min(1).max(40).nullish(),
-  partial_member_list: z.array(z.record(z.string(), z.string())).nullish(),
-  permission: zDatasetPermissionEnum.optional(),
-  retrieval_model: zRetrievalModel.optional(),
-})
-
-/**
- * HitTestingPayload
- */
-export const zHitTestingPayload = z.object({
+export const zSegmentUpdateArgs = z.object({
+  answer: z.string().nullish(),
   attachment_ids: z.array(z.string()).nullish(),
-  external_retrieval_model: z.record(z.string(), z.unknown()).nullish(),
-  query: z.string().max(250),
-  retrieval_model: zRetrievalModel.optional(),
+  content: z.string().nullish(),
+  enabled: z.boolean().nullish(),
+  keywords: z.array(z.string()).nullish(),
+  regenerate_child_chunks: z.boolean().optional().default(false),
+  summary: z.string().nullish(),
 })
 
 /**
- * PreProcessingRule
+ * SegmentUpdatePayload
  */
-export const zPreProcessingRule = z.object({
-  enabled: z.boolean(),
-  id: z.string(),
+export const zSegmentUpdatePayload = z.object({
+  segment: zSegmentUpdateArgs,
 })
 
 /**
@@ -467,6 +446,150 @@ export const zProcessRule = z.object({
   rules: zRule.optional(),
 })
 
+/**
+ * SimpleAccount
+ */
+export const zSimpleAccount = z.object({
+  email: z.string(),
+  id: z.string(),
+  name: z.string(),
+})
+
+/**
+ * SimpleEndUser
+ */
+export const zSimpleEndUser = z.object({
+  id: z.string(),
+  is_anonymous: z.boolean(),
+  session_id: z.string().nullish(),
+  type: z.string(),
+})
+
+/**
+ * TagBindingPayload
+ */
+export const zTagBindingPayload = z.object({
+  tag_ids: z.array(z.string()),
+  target_id: z.string(),
+})
+
+/**
+ * TagCreatePayload
+ */
+export const zTagCreatePayload = z.object({
+  name: z.string().min(1).max(50),
+})
+
+/**
+ * TagDeletePayload
+ */
+export const zTagDeletePayload = z.object({
+  tag_id: z.string(),
+})
+
+/**
+ * TagUnbindingPayload
+ *
+ * Accept the legacy single-tag Service API payload while exposing a normalized tag_ids list internally.
+ */
+export const zTagUnbindingPayload = z.object({
+  tag_id: z.string().nullish(),
+  tag_ids: z.array(z.string()).optional(),
+  target_id: z.string(),
+})
+
+/**
+ * TagUpdatePayload
+ */
+export const zTagUpdatePayload = z.object({
+  name: z.string().min(1).max(50),
+  tag_id: z.string(),
+})
+
+/**
+ * TextToAudioPayload
+ */
+export const zTextToAudioPayload = z.object({
+  message_id: z.string().nullish(),
+  streaming: z.boolean().nullish(),
+  text: z.string().nullish(),
+  voice: z.string().nullish(),
+})
+
+/**
+ * WeightKeywordSetting
+ */
+export const zWeightKeywordSetting = z.object({
+  keyword_weight: z.number(),
+})
+
+/**
+ * WeightVectorSetting
+ */
+export const zWeightVectorSetting = z.object({
+  embedding_model_name: z.string(),
+  embedding_provider_name: z.string(),
+  vector_weight: z.number(),
+})
+
+/**
+ * WeightModel
+ */
+export const zWeightModel = z.object({
+  keyword_setting: zWeightKeywordSetting.optional(),
+  vector_setting: zWeightVectorSetting.optional(),
+  weight_type: z.enum(['customized', 'keyword_first', 'semantic_first']).nullish(),
+})
+
+/**
+ * RetrievalModel
+ */
+export const zRetrievalModel = z.object({
+  metadata_filtering_conditions: zMetadataFilteringCondition.optional(),
+  reranking_enable: z.boolean(),
+  reranking_mode: z.string().nullish(),
+  reranking_model: zRerankingModel.optional(),
+  score_threshold: z.number().nullish(),
+  score_threshold_enabled: z.boolean(),
+  search_method: zRetrievalMethod,
+  top_k: z.int(),
+  weights: zWeightModel.optional(),
+})
+
+/**
+ * DatasetCreatePayload
+ */
+export const zDatasetCreatePayload = z.object({
+  description: z.string().max(400).optional().default(''),
+  embedding_model: z.string().nullish(),
+  embedding_model_provider: z.string().nullish(),
+  external_knowledge_api_id: z.string().nullish(),
+  external_knowledge_id: z.string().nullish(),
+  indexing_technique: z.enum(['economy', 'high_quality']).nullish(),
+  name: z.string().min(1).max(40),
+  permission: zDatasetPermissionEnum.optional(),
+  provider: z.string().optional().default('vendor'),
+  retrieval_model: zRetrievalModel.optional(),
+  summary_index_setting: z.record(z.string(), z.unknown()).nullish(),
+})
+
+/**
+ * DatasetUpdatePayload
+ */
+export const zDatasetUpdatePayload = z.object({
+  description: z.string().max(400).nullish(),
+  embedding_model: z.string().nullish(),
+  embedding_model_provider: z.string().nullish(),
+  external_knowledge_api_id: z.string().nullish(),
+  external_knowledge_id: z.string().nullish(),
+  external_retrieval_model: z.record(z.string(), z.unknown()).nullish(),
+  indexing_technique: z.enum(['economy', 'high_quality']).nullish(),
+  name: z.string().min(1).max(40).nullish(),
+  partial_member_list: z.array(z.record(z.string(), z.string())).nullish(),
+  permission: zDatasetPermissionEnum.optional(),
+  retrieval_model: zRetrievalModel.optional(),
+})
+
 /**
  * DocumentTextCreatePayload
  */
@@ -495,80 +618,28 @@ export const zDocumentTextUpdate = z.object({
   text: z.string().nullish(),
 })
 
-export const zJsonValue = z.unknown()
-
 /**
- * HumanInputFormSubmitPayload
+ * HitTestingPayload
  */
-export const zHumanInputFormSubmitPayload = z.object({
-  action: z.string(),
-  inputs: z.record(z.string(), zJsonValue),
-})
-
-/**
- * MetadataDetail
- */
-export const zMetadataDetail = z.object({
-  id: z.string(),
-  name: z.string(),
-  value: z.unknown().optional(),
-})
-
-/**
- * DocumentMetadataOperation
- */
-export const zDocumentMetadataOperation = z.object({
-  document_id: z.string(),
-  metadata_list: z.array(zMetadataDetail),
-  partial_update: z.boolean().optional().default(false),
-})
-
-/**
- * MetadataOperationData
- *
- * Metadata operation data
- */
-export const zMetadataOperationData = z.object({
-  operation_data: z.array(zDocumentMetadataOperation),
-})
-
-/**
- * SegmentUpdateArgs
- */
-export const zSegmentUpdateArgs = z.object({
-  answer: z.string().nullish(),
+export const zHitTestingPayload = z.object({
   attachment_ids: z.array(z.string()).nullish(),
-  content: z.string().nullish(),
-  enabled: z.boolean().nullish(),
-  keywords: z.array(z.string()).nullish(),
-  regenerate_child_chunks: z.boolean().optional().default(false),
-  summary: z.string().nullish(),
+  external_retrieval_model: z.record(z.string(), z.unknown()).nullish(),
+  query: z.string().max(250),
+  retrieval_model: zRetrievalModel.optional(),
 })
 
 /**
- * SegmentUpdatePayload
+ * WorkflowLogQuery
  */
-export const zSegmentUpdatePayload = z.object({
-  segment: zSegmentUpdateArgs,
-})
-
-/**
- * SimpleAccount
- */
-export const zSimpleAccount = z.object({
-  email: z.string(),
-  id: z.string(),
-  name: z.string(),
-})
-
-/**
- * SimpleEndUser
- */
-export const zSimpleEndUser = z.object({
-  id: z.string(),
-  is_anonymous: z.boolean(),
-  session_id: z.string().nullish(),
-  type: z.string(),
+export const zWorkflowLogQuery = z.object({
+  created_at__after: z.string().nullish(),
+  created_at__before: z.string().nullish(),
+  created_by_account: z.string().nullish(),
+  created_by_end_user_session_id: z.string().nullish(),
+  keyword: z.string().nullish(),
+  limit: z.int().gte(1).lte(100).optional().default(20),
+  page: z.int().gte(1).lte(99999).optional().default(1),
+  status: z.enum(['failed', 'stopped', 'succeeded']).nullish(),
 })
 
 /**
@@ -613,6 +684,32 @@ export const zWorkflowAppLogPaginationResponse = z.object({
   total: z.int(),
 })
 
+/**
+ * WorkflowRunPayload
+ */
+export const zWorkflowRunPayload = z.object({
+  files: z.array(z.record(z.string(), z.unknown())).nullish(),
+  inputs: z.record(z.string(), z.unknown()),
+  response_mode: z.enum(['blocking', 'streaming']).nullish(),
+})
+
+/**
+ * WorkflowRunResponse
+ */
+export const zWorkflowRunResponse = z.object({
+  created_at: z.int().nullish(),
+  elapsed_time: z.unknown().optional(),
+  error: z.string().nullish(),
+  finished_at: z.int().nullish(),
+  id: z.string(),
+  inputs: z.unknown().optional(),
+  outputs: z.record(z.string(), z.unknown()).optional(),
+  status: z.string(),
+  total_steps: z.int().nullish(),
+  total_tokens: z.int().nullish(),
+  workflow_id: z.string(),
+})
+
 /**
  * Success
  */
@@ -671,7 +768,7 @@ export const zDeleteAppsAnnotationsByAnnotationIdPath = z.object({
 /**
  * Annotation deleted successfully
  */
-export const zDeleteAppsAnnotationsByAnnotationIdResponse = z.record(z.string(), z.unknown())
+export const zDeleteAppsAnnotationsByAnnotationIdResponse = z.record(z.string(), z.never())
 
 export const zPutAppsAnnotationsByAnnotationIdBody = zAnnotationCreatePayload
 
@@ -725,7 +822,7 @@ export const zGetConversationsQuery = z.object({
   last_id: z.string().nullish(),
   limit: z.int().gte(1).lte(100).optional().default(20),
   sort_by: z
-    .enum(['created_at', '-created_at', 'updated_at', '-updated_at'])
+    .enum(['-created_at', '-updated_at', 'created_at', 'updated_at'])
     .optional()
     .default('-updated_at'),
 })
@@ -742,7 +839,7 @@ export const zDeleteConversationsByCIdPath = z.object({
 /**
  * Conversation deleted successfully
  */
-export const zDeleteConversationsByCIdResponse = z.record(z.string(), z.unknown())
+export const zDeleteConversationsByCIdResponse = z.record(z.string(), z.never())
 
 export const zPostConversationsByCIdNameBody = zConversationRenamePayload
 
@@ -805,7 +902,7 @@ export const zDeleteDatasetsTagsBody = zTagDeletePayload
 /**
  * Tag deleted successfully
  */
-export const zDeleteDatasetsTagsResponse = z.record(z.string(), z.unknown())
+export const zDeleteDatasetsTagsResponse = z.record(z.string(), z.never())
 
 /**
  * Tags retrieved successfully
@@ -831,14 +928,14 @@ export const zPostDatasetsTagsBindingBody = zTagBindingPayload
 /**
  * Tags bound successfully
  */
-export const zPostDatasetsTagsBindingResponse = z.record(z.string(), z.unknown())
+export const zPostDatasetsTagsBindingResponse = z.record(z.string(), z.never())
 
 export const zPostDatasetsTagsUnbindingBody = zTagUnbindingPayload
 
 /**
- * Tag unbound successfully
+ * Tags unbound successfully
  */
-export const zPostDatasetsTagsUnbindingResponse = z.record(z.string(), z.unknown())
+export const zPostDatasetsTagsUnbindingResponse = z.record(z.string(), z.never())
 
 export const zDeleteDatasetsByDatasetIdPath = z.object({
   dataset_id: z.string(),
@@ -847,7 +944,7 @@ export const zDeleteDatasetsByDatasetIdPath = z.object({
 /**
  * Dataset deleted successfully
  */
-export const zDeleteDatasetsByDatasetIdResponse = z.record(z.string(), z.unknown())
+export const zDeleteDatasetsByDatasetIdResponse = z.record(z.string(), z.never())
 
 export const zGetDatasetsByDatasetIdPath = z.object({
   dataset_id: z.string(),
@@ -956,8 +1053,8 @@ export const zPostDatasetsByDatasetIdDocumentsMetadataPath = z.object({
 export const zPostDatasetsByDatasetIdDocumentsMetadataResponse = z.record(z.string(), z.unknown())
 
 export const zPatchDatasetsByDatasetIdDocumentsStatusByActionPath = z.object({
-  dataset_id: z.string(),
   action: z.string(),
+  dataset_id: z.string(),
 })
 
 /**
@@ -969,8 +1066,8 @@ export const zPatchDatasetsByDatasetIdDocumentsStatusByActionResponse = z.record
 )
 
 export const zGetDatasetsByDatasetIdDocumentsByBatchIndexingStatusPath = z.object({
-  dataset_id: z.string(),
   batch: z.string(),
+  dataset_id: z.string(),
 })
 
 /**
@@ -991,7 +1088,7 @@ export const zDeleteDatasetsByDatasetIdDocumentsByDocumentIdPath = z.object({
  */
 export const zDeleteDatasetsByDatasetIdDocumentsByDocumentIdResponse = z.record(
   z.string(),
-  z.unknown(),
+  z.never(),
 )
 
 export const zGetDatasetsByDatasetIdDocumentsByDocumentIdPath = z.object({
@@ -1077,13 +1174,13 @@ export const zDeleteDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdP
  */
 export const zDeleteDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdResponse = z.record(
   z.string(),
-  z.unknown(),
+  z.never(),
 )
 
 export const zGetDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdPath = z.object({
-  segment_id: z.string(),
   dataset_id: z.string(),
   document_id: z.string(),
+  segment_id: z.string(),
 })
 
 /**
@@ -1149,27 +1246,27 @@ export const zPostDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdChi
 
 export const zDeleteDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdChildChunksByChildChunkIdPath
   = z.object({
+    child_chunk_id: z.string(),
     dataset_id: z.string(),
     document_id: z.string(),
     segment_id: z.string(),
-    child_chunk_id: z.string(),
   })
 
 /**
  * Child chunk deleted successfully
  */
 export const zDeleteDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdChildChunksByChildChunkIdResponse
-  = z.record(z.string(), z.unknown())
+  = z.record(z.string(), z.never())
 
 export const zPatchDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdChildChunksByChildChunkIdBody
   = zChildChunkUpdatePayload
 
 export const zPatchDatasetsByDatasetIdDocumentsByDocumentIdSegmentsBySegmentIdChildChunksByChildChunkIdPath
   = z.object({
+    child_chunk_id: z.string(),
     dataset_id: z.string(),
     document_id: z.string(),
     segment_id: z.string(),
-    child_chunk_id: z.string(),
   })
 
 /**
@@ -1275,8 +1372,8 @@ export const zGetDatasetsByDatasetIdMetadataBuiltInPath = z.object({
 export const zGetDatasetsByDatasetIdMetadataBuiltInResponse = z.record(z.string(), z.unknown())
 
 export const zPostDatasetsByDatasetIdMetadataBuiltInByActionPath = z.object({
-  dataset_id: z.string(),
   action: z.string(),
+  dataset_id: z.string(),
 })
 
 /**
@@ -1297,7 +1394,7 @@ export const zDeleteDatasetsByDatasetIdMetadataByMetadataIdPath = z.object({
  */
 export const zDeleteDatasetsByDatasetIdMetadataByMetadataIdResponse = z.record(
   z.string(),
-  z.unknown(),
+  z.never(),
 )
 
 export const zPatchDatasetsByDatasetIdMetadataByMetadataIdBody = zMetadataUpdatePayload
@@ -1483,9 +1580,9 @@ export const zGetWorkflowByTaskIdEventsPath = z.object({
 })
 
 export const zGetWorkflowByTaskIdEventsQuery = z.object({
-  user: z.string().optional(),
-  include_state_snapshot: z.string().optional(),
   continue_on_pause: z.string().optional(),
+  include_state_snapshot: z.string().optional(),
+  user: z.string().optional(),
 })
 
 /**
@@ -1501,7 +1598,7 @@ export const zGetWorkflowsLogsQuery = z.object({
   keyword: z.string().nullish(),
   limit: z.int().gte(1).lte(100).optional().default(20),
   page: z.int().gte(1).lte(99999).optional().default(1),
-  status: z.enum(['succeeded', 'failed', 'stopped']).nullish(),
+  status: z.enum(['failed', 'stopped', 'succeeded']).nullish(),
 })
 
 /**
diff --git a/packages/contracts/generated/api/web/orpc.gen.ts b/packages/contracts/generated/api/web/orpc.gen.ts
index 459d556145..eea2efcb7c 100644
--- a/packages/contracts/generated/api/web/orpc.gen.ts
+++ b/packages/contracts/generated/api/web/orpc.gen.ts
@@ -85,10 +85,16 @@ import {
  * Convert audio to text
  *
  * Convert audio file to text using speech-to-text service.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post = oc
   .route({
-    description: 'Convert audio file to text using speech-to-text service.',
+    deprecated: true,
+    description:
+      'Convert audio file to text using speech-to-text service.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postAudioToText',
@@ -104,10 +110,16 @@ export const audioToText = {
 
 /**
  * Stop a running chat message task.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post2 = oc
   .route({
-    description: 'Stop a running chat message task.',
+    deprecated: true,
+    description:
+      'Stop a running chat message task.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postChatMessagesByTaskIdStop',
@@ -127,10 +139,16 @@ export const byTaskId = {
 
 /**
  * Create a chat message for conversational applications.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post3 = oc
   .route({
-    description: 'Create a chat message for conversational applications.',
+    deprecated: true,
+    description:
+      'Create a chat message for conversational applications.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postChatMessages',
@@ -147,10 +165,16 @@ export const chatMessages = {
 
 /**
  * Stop a running completion message task.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post4 = oc
   .route({
-    description: 'Stop a running completion message task.',
+    deprecated: true,
+    description:
+      'Stop a running completion message task.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postCompletionMessagesByTaskIdStop',
@@ -170,10 +194,16 @@ export const byTaskId2 = {
 
 /**
  * Create a completion message for text generation applications.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post5 = oc
   .route({
-    description: 'Create a completion message for text generation applications.',
+    deprecated: true,
+    description:
+      'Create a completion message for text generation applications.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postCompletionMessages',
@@ -190,10 +220,16 @@ export const completionMessages = {
 
 /**
  * Rename a specific conversation with a custom name or auto-generate one.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post6 = oc
   .route({
-    description: 'Rename a specific conversation with a custom name or auto-generate one.',
+    deprecated: true,
+    description:
+      'Rename a specific conversation with a custom name or auto-generate one.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postConversationsByCIdName',
@@ -214,10 +250,16 @@ export const name = {
 
 /**
  * Pin a specific conversation to keep it at the top of the list.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const patch = oc
   .route({
-    description: 'Pin a specific conversation to keep it at the top of the list.',
+    deprecated: true,
+    description:
+      'Pin a specific conversation to keep it at the top of the list.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchConversationsByCIdPin',
@@ -233,10 +275,16 @@ export const pin = {
 
 /**
  * Unpin a specific conversation to remove it from the top of the list.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const patch2 = oc
   .route({
-    description: 'Unpin a specific conversation to remove it from the top of the list.',
+    deprecated: true,
+    description:
+      'Unpin a specific conversation to remove it from the top of the list.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'PATCH',
     operationId: 'patchConversationsByCIdUnpin',
@@ -275,10 +323,16 @@ export const byCId = {
 
 /**
  * Retrieve paginated list of conversations for a chat application.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get = oc
   .route({
-    description: 'Retrieve paginated list of conversations for a chat application.',
+    deprecated: true,
+    description:
+      'Retrieve paginated list of conversations for a chat application.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getConversations',
@@ -295,10 +349,16 @@ export const conversations = {
 
 /**
  * Verify email code and complete login
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post7 = oc
   .route({
-    description: 'Verify email code and complete login',
+    deprecated: true,
+    description:
+      'Verify email code and complete login\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postEmailCodeLoginValidity',
@@ -314,10 +374,16 @@ export const validity = {
 
 /**
  * Send email verification code for login
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post8 = oc
   .route({
-    description: 'Send email verification code for login',
+    deprecated: true,
+    description:
+      'Send email verification code for login\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postEmailCodeLogin',
@@ -382,10 +448,16 @@ export const files = {
 
 /**
  * Reset user password with verification token
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post10 = oc
   .route({
-    description: 'Reset user password with verification token',
+    deprecated: true,
+    description:
+      'Reset user password with verification token\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postForgotPasswordResets',
@@ -401,10 +473,16 @@ export const resets = {
 
 /**
  * Verify password reset token validity
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post11 = oc
   .route({
-    description: 'Verify password reset token validity',
+    deprecated: true,
+    description:
+      'Verify password reset token validity\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postForgotPasswordValidity',
@@ -420,10 +498,16 @@ export const validity2 = {
 
 /**
  * Send password reset email
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post12 = oc
   .route({
-    description: 'Send password reset email',
+    deprecated: true,
+    description:
+      'Send password reset email\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postForgotPassword',
@@ -443,10 +527,16 @@ export const forgotPassword = {
  * Get human input form definition by token
  *
  * GET /api/form/human_input/<form_token>
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get2 = oc
   .route({
-    description: 'GET /api/form/human_input/<form_token>',
+    deprecated: true,
+    description:
+      'GET /api/form/human_input/<form_token>\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getFormHumanInputByFormToken',
@@ -469,11 +559,16 @@ export const get2 = oc
  * },
  * "action": "Approve"
  * }
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post13 = oc
   .route({
+    deprecated: true,
     description:
-      'POST /api/form/human_input/<form_token>\n\nRequest body:\n{\n    "inputs": {\n        "content": "User input content"\n    },\n    "action": "Approve"\n}',
+      'POST /api/form/human_input/<form_token>\n\nRequest body:\n{\n    "inputs": {\n        "content": "User input content"\n    },\n    "action": "Approve"\n}\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postFormHumanInputByFormToken',
@@ -499,10 +594,16 @@ export const form = {
 
 /**
  * Check login status
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get3 = oc
   .route({
-    description: 'Check login status',
+    deprecated: true,
+    description:
+      'Check login status\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getLoginStatus',
@@ -519,10 +620,16 @@ export const status = {
  * Authenticate user and login
  *
  * Authenticate user for web application access
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post14 = oc
   .route({
-    description: 'Authenticate user for web application access',
+    deprecated: true,
+    description:
+      'Authenticate user for web application access\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postLogin',
@@ -540,10 +647,16 @@ export const login = {
 
 /**
  * Logout user from web application
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post15 = oc
   .route({
-    description: 'Logout user from web application',
+    deprecated: true,
+    description:
+      'Logout user from web application\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postLogout',
@@ -558,10 +671,16 @@ export const logout = {
 
 /**
  * Submit feedback (like/dislike) for a specific message.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post16 = oc
   .route({
-    description: 'Submit feedback (like/dislike) for a specific message.',
+    deprecated: true,
+    description:
+      'Submit feedback (like/dislike) for a specific message.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postMessagesByMessageIdFeedbacks',
@@ -582,10 +701,16 @@ export const feedbacks = {
 
 /**
  * Generate a new completion similar to an existing message (completion apps only).
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get4 = oc
   .route({
-    description: 'Generate a new completion similar to an existing message (completion apps only).',
+    deprecated: true,
+    description:
+      'Generate a new completion similar to an existing message (completion apps only).\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getMessagesByMessageIdMoreLikeThis',
@@ -606,10 +731,16 @@ export const moreLikeThis = {
 
 /**
  * Get suggested follow-up questions after a message (chat apps only).
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get5 = oc
   .route({
-    description: 'Get suggested follow-up questions after a message (chat apps only).',
+    deprecated: true,
+    description:
+      'Get suggested follow-up questions after a message (chat apps only).\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getMessagesByMessageIdSuggestedQuestions',
@@ -631,10 +762,16 @@ export const byMessageId = {
 
 /**
  * Retrieve paginated list of messages from a conversation in a chat application.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get6 = oc
   .route({
-    description: 'Retrieve paginated list of messages from a conversation in a chat application.',
+    deprecated: true,
+    description:
+      'Retrieve paginated list of messages from a conversation in a chat application.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getMessages',
@@ -653,10 +790,16 @@ export const messages = {
  * Get app meta
  *
  * Retrieve the metadata for a specific app.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get7 = oc
   .route({
-    description: 'Retrieve the metadata for a specific app.',
+    deprecated: true,
+    description:
+      'Retrieve the metadata for a specific app.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getMeta',
@@ -674,10 +817,16 @@ export const meta = {
  * Retrieve app parameters
  *
  * Retrieve the parameters for a specific app.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get8 = oc
   .route({
-    description: 'Retrieve the parameters for a specific app.',
+    deprecated: true,
+    description:
+      'Retrieve the parameters for a specific app.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getParameters',
@@ -693,10 +842,16 @@ export const parameters = {
 
 /**
  * Get authentication passport for web application access
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get9 = oc
   .route({
-    description: 'Get authentication passport for web application access',
+    deprecated: true,
+    description:
+      'Get authentication passport for web application access\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getPassport',
@@ -813,10 +968,16 @@ export const byMessageId2 = {
 
 /**
  * Retrieve paginated list of saved messages for a completion application.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get11 = oc
   .route({
-    description: 'Retrieve paginated list of saved messages for a completion application.',
+    deprecated: true,
+    description:
+      'Retrieve paginated list of saved messages for a completion application.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getSavedMessages',
@@ -828,10 +989,16 @@ export const get11 = oc
 
 /**
  * Save a specific message for later reference.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post18 = oc
   .route({
-    description: 'Save a specific message for later reference.',
+    deprecated: true,
+    description:
+      'Save a specific message for later reference.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postSavedMessages',
@@ -851,10 +1018,16 @@ export const savedMessages = {
  * Retrieve app site info
  *
  * Retrieve app site information and configuration.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get12 = oc
   .route({
-    description: 'Retrieve app site information and configuration.',
+    deprecated: true,
+    description:
+      'Retrieve app site information and configuration.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getSite',
@@ -887,11 +1060,16 @@ export const site = {
  * Authentication would create circular dependency (can't authenticate without webapp loading).
  *
  * Only non-sensitive configuration data should be returned by this endpoint.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get13 = oc
   .route({
+    deprecated: true,
     description:
-      'Get system feature flags and configuration\nReturns the current system feature flags and configuration\nthat control various functionalities across the platform.\n\nReturns:\n    dict: System feature configuration object\n\nThis endpoint is akin to the `SystemFeatureApi` endpoint in api/controllers/console/feature.py,\nexcept it is intended for use by the web app, instead of the console dashboard.\n\nNOTE: This endpoint is unauthenticated by design, as it provides system features\ndata required for webapp initialization.\n\nAuthentication would create circular dependency (can\'t authenticate without webapp loading).\n\nOnly non-sensitive configuration data should be returned by this endpoint.',
+      'Get system feature flags and configuration\nReturns the current system feature flags and configuration\nthat control various functionalities across the platform.\n\nReturns:\n    dict: System feature configuration object\n\nThis endpoint is akin to the `SystemFeatureApi` endpoint in api/controllers/console/feature.py,\nexcept it is intended for use by the web app, instead of the console dashboard.\n\nNOTE: This endpoint is unauthenticated by design, as it provides system features\ndata required for webapp initialization.\n\nAuthentication would create circular dependency (can\'t authenticate without webapp loading).\n\nOnly non-sensitive configuration data should be returned by this endpoint.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getSystemFeatures',
@@ -909,10 +1087,16 @@ export const systemFeatures = {
  * Convert text to audio
  *
  * Convert text to audio using text-to-speech service.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post19 = oc
   .route({
-    description: 'Convert text to audio using text-to-speech service.',
+    deprecated: true,
+    description:
+      'Convert text to audio using text-to-speech service.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postTextToAudio',
@@ -929,10 +1113,16 @@ export const textToAudio = {
 
 /**
  * Retrieve the access mode for a web application (public or restricted).
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get14 = oc
   .route({
-    description: 'Retrieve the access mode for a web application (public or restricted).',
+    deprecated: true,
+    description:
+      'Retrieve the access mode for a web application (public or restricted).\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWebappAccessMode',
@@ -948,10 +1138,16 @@ export const accessMode = {
 
 /**
  * Check if user has permission to access a web application.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get15 = oc
   .route({
-    description: 'Check if user has permission to access a web application.',
+    deprecated: true,
+    description:
+      'Check if user has permission to access a web application.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWebappPermission',
@@ -976,10 +1172,16 @@ export const webapp = {
  * GET /api/workflow/<task_id>/events
  *
  * Returns Server-Sent Events stream.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const get16 = oc
   .route({
-    description: 'GET /api/workflow/<task_id>/events\n\nReturns Server-Sent Events stream.',
+    deprecated: true,
+    description:
+      'GET /api/workflow/<task_id>/events\n\nReturns Server-Sent Events stream.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'GET',
     operationId: 'getWorkflowByTaskIdEvents',
@@ -1006,10 +1208,16 @@ export const workflow = {
  * Run workflow
  *
  * Execute a workflow with provided inputs and files.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post20 = oc
   .route({
-    description: 'Execute a workflow with provided inputs and files.',
+    deprecated: true,
+    description:
+      'Execute a workflow with provided inputs and files.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkflowsRun',
@@ -1028,10 +1236,16 @@ export const run = {
  * Stop workflow task
  *
  * Stop a running workflow task.
+ *
+ * Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.
+ *
+ * @deprecated
  */
 export const post21 = oc
   .route({
-    description: 'Stop a running workflow task.',
+    deprecated: true,
+    description:
+      'Stop a running workflow task.\n\nGenerated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.',
     inputStructure: 'detailed',
     method: 'POST',
     operationId: 'postWorkflowsTasksByTaskIdStop',
diff --git a/packages/contracts/generated/api/web/types.gen.ts b/packages/contracts/generated/api/web/types.gen.ts
index f2009b966b..fed7ed8452 100644
--- a/packages/contracts/generated/api/web/types.gen.ts
+++ b/packages/contracts/generated/api/web/types.gen.ts
@@ -4,6 +4,11 @@ export type ClientOptions = {
   baseUrl: `${string}://${string}/api` | (string & {})
 }
 
+export type AppAccessModeQuery = {
+  appCode?: string | null
+  appId?: string | null
+}
+
 export type ChatMessagePayload = {
   conversation_id?: string | null
   files?: Array<{
@@ -30,6 +35,18 @@ export type CompletionMessagePayload = {
   retriever_from?: string
 }
 
+export type ConversationListQuery = {
+  last_id?: string | null
+  limit?: number
+  pinned?: boolean | null
+  sort_by?: '-created_at' | '-updated_at' | 'created_at' | 'updated_at'
+}
+
+export type ConversationRenamePayload = {
+  auto_generate?: boolean
+  name?: string | null
+}
+
 export type EmailCodeLoginSendPayload = {
   email: string
   language?: string | null
@@ -91,6 +108,17 @@ export type LoginPayload = {
   password: string
 }
 
+export type MessageFeedbackPayload = {
+  content?: string | null
+  rating?: 'dislike' | 'like' | null
+}
+
+export type MessageListQuery = {
+  conversation_id: string
+  first_id?: string | null
+  limit?: number
+}
+
 export type MessageMoreLikeThisQuery = {
   response_mode: 'blocking' | 'streaming'
 }
@@ -100,6 +128,19 @@ export type RemoteFileInfo = {
   file_type: string
 }
 
+export type RemoteFileUploadPayload = {
+  url: string
+}
+
+export type SavedMessageCreatePayload = {
+  message_id: string
+}
+
+export type SavedMessageListQuery = {
+  last_id?: string | null
+  limit?: number
+}
+
 export type TextToAudioPayload = {
   message_id?: string | null
   streaming?: boolean | null
@@ -310,8 +351,8 @@ export type GetConversationsData = {
   query?: {
     last_id?: string
     limit?: number
-    pinned?: 'true' | 'false'
-    sort_by?: 'created_at' | '-created_at' | 'updated_at' | '-updated_at'
+    pinned?: 'false' | 'true'
+    sort_by?: '-created_at' | '-updated_at' | 'created_at' | 'updated_at'
   }
   url: '/conversations'
 }
@@ -376,7 +417,7 @@ export type DeleteConversationsByCIdError
 
 export type DeleteConversationsByCIdResponses = {
   204: {
-    [key: string]: unknown
+    [key: string]: never
   }
 }
 
@@ -389,8 +430,8 @@ export type PostConversationsByCIdNameData = {
     c_id: string
   }
   query?: {
-    name?: string
     auto_generate?: boolean
+    name?: string
   }
   url: '/conversations/{c_id}/name'
 }
@@ -828,8 +869,8 @@ export type PostMessagesByMessageIdFeedbacksData = {
     message_id: string
   }
   query?: {
-    rating?: 'like' | 'dislike'
     content?: string
+    rating?: 'dislike' | 'like'
   }
   url: '/messages/{message_id}/feedbacks'
 }
@@ -1209,7 +1250,7 @@ export type DeleteSavedMessagesByMessageIdError
 
 export type DeleteSavedMessagesByMessageIdResponses = {
   204: {
-    [key: string]: unknown
+    [key: string]: never
   }
 }
 
@@ -1310,8 +1351,8 @@ export type GetWebappAccessModeData = {
   body?: never
   path?: never
   query?: {
-    appId?: string
     appCode?: string
+    appId?: string
   }
   url: '/webapp/access-mode'
 }
diff --git a/packages/contracts/generated/api/web/zod.gen.ts b/packages/contracts/generated/api/web/zod.gen.ts
index ec4bd19aff..3d4785891f 100644
--- a/packages/contracts/generated/api/web/zod.gen.ts
+++ b/packages/contracts/generated/api/web/zod.gen.ts
@@ -2,6 +2,14 @@
 
 import * as z from 'zod'
 
+/**
+ * AppAccessModeQuery
+ */
+export const zAppAccessModeQuery = z.object({
+  appCode: z.string().nullish(),
+  appId: z.string().nullish(),
+})
+
 /**
  * ChatMessagePayload
  */
@@ -26,6 +34,27 @@ export const zCompletionMessagePayload = z.object({
   retriever_from: z.string().optional().default('web_app'),
 })
 
+/**
+ * ConversationListQuery
+ */
+export const zConversationListQuery = z.object({
+  last_id: z.string().nullish(),
+  limit: z.int().gte(1).lte(100).optional().default(20),
+  pinned: z.boolean().nullish(),
+  sort_by: z
+    .enum(['-created_at', '-updated_at', 'created_at', 'updated_at'])
+    .optional()
+    .default('-updated_at'),
+})
+
+/**
+ * ConversationRenamePayload
+ */
+export const zConversationRenamePayload = z.object({
+  auto_generate: z.boolean().optional().default(false),
+  name: z.string().nullish(),
+})
+
 /**
  * EmailCodeLoginSendPayload
  */
@@ -111,6 +140,23 @@ export const zLoginPayload = z.object({
   password: z.string(),
 })
 
+/**
+ * MessageFeedbackPayload
+ */
+export const zMessageFeedbackPayload = z.object({
+  content: z.string().nullish(),
+  rating: z.enum(['dislike', 'like']).nullish(),
+})
+
+/**
+ * MessageListQuery
+ */
+export const zMessageListQuery = z.object({
+  conversation_id: z.string(),
+  first_id: z.string().nullish(),
+  limit: z.int().gte(1).lte(100).optional().default(20),
+})
+
 /**
  * MessageMoreLikeThisQuery
  */
@@ -126,6 +172,28 @@ export const zRemoteFileInfo = z.object({
   file_type: z.string(),
 })
 
+/**
+ * RemoteFileUploadPayload
+ */
+export const zRemoteFileUploadPayload = z.object({
+  url: z.url().min(1).max(2083),
+})
+
+/**
+ * SavedMessageCreatePayload
+ */
+export const zSavedMessageCreatePayload = z.object({
+  message_id: z.string(),
+})
+
+/**
+ * SavedMessageListQuery
+ */
+export const zSavedMessageListQuery = z.object({
+  last_id: z.string().nullish(),
+  limit: z.int().gte(1).lte(100).optional().default(20),
+})
+
 /**
  * TextToAudioPayload
  */
@@ -184,9 +252,9 @@ export const zPostCompletionMessagesByTaskIdStopResponse = z.record(z.string(),
 export const zGetConversationsQuery = z.object({
   last_id: z.string().optional(),
   limit: z.int().optional().default(20),
-  pinned: z.enum(['true', 'false']).optional(),
+  pinned: z.enum(['false', 'true']).optional(),
   sort_by: z
-    .enum(['created_at', '-created_at', 'updated_at', '-updated_at'])
+    .enum(['-created_at', '-updated_at', 'created_at', 'updated_at'])
     .optional()
     .default('-updated_at'),
 })
@@ -203,15 +271,15 @@ export const zDeleteConversationsByCIdPath = z.object({
 /**
  * Conversation deleted successfully
  */
-export const zDeleteConversationsByCIdResponse = z.record(z.string(), z.unknown())
+export const zDeleteConversationsByCIdResponse = z.record(z.string(), z.never())
 
 export const zPostConversationsByCIdNamePath = z.object({
   c_id: z.string(),
 })
 
 export const zPostConversationsByCIdNameQuery = z.object({
-  name: z.string().optional(),
   auto_generate: z.boolean().optional().default(false),
+  name: z.string().optional(),
 })
 
 /**
@@ -328,8 +396,8 @@ export const zPostMessagesByMessageIdFeedbacksPath = z.object({
 })
 
 export const zPostMessagesByMessageIdFeedbacksQuery = z.object({
-  rating: z.enum(['like', 'dislike']).optional(),
   content: z.string().optional(),
+  rating: z.enum(['dislike', 'like']).optional(),
 })
 
 /**
@@ -414,7 +482,7 @@ export const zDeleteSavedMessagesByMessageIdPath = z.object({
 /**
  * Message removed successfully
  */
-export const zDeleteSavedMessagesByMessageIdResponse = z.record(z.string(), z.unknown())
+export const zDeleteSavedMessagesByMessageIdResponse = z.record(z.string(), z.never())
 
 /**
  * Success
@@ -434,8 +502,8 @@ export const zPostTextToAudioBody = zTextToAudioPayload
 export const zPostTextToAudioResponse = z.record(z.string(), z.unknown())
 
 export const zGetWebappAccessModeQuery = z.object({
-  appId: z.string().optional(),
   appCode: z.string().optional(),
+  appId: z.string().optional(),
 })
 
 /**
diff --git a/packages/contracts/generated/enterprise/orpc.gen.ts b/packages/contracts/generated/enterprise/orpc.gen.ts
index 73eb850001..6b9b76470a 100644
--- a/packages/contracts/generated/enterprise/orpc.gen.ts
+++ b/packages/contracts/generated/enterprise/orpc.gen.ts
@@ -7,63 +7,6 @@ import {
   zConsoleSsoOAuth2LoginResponse,
   zConsoleSsoOidcLoginResponse,
   zConsoleSsoSamlLoginResponse,
-  zEnterpriseAppDeployConsoleCancelRuntimeDeploymentBody,
-  zEnterpriseAppDeployConsoleCancelRuntimeDeploymentPath,
-  zEnterpriseAppDeployConsoleCancelRuntimeDeploymentResponse,
-  zEnterpriseAppDeployConsoleCreateAppInstanceBody,
-  zEnterpriseAppDeployConsoleCreateAppInstanceResponse,
-  zEnterpriseAppDeployConsoleCreateDeploymentBody,
-  zEnterpriseAppDeployConsoleCreateDeploymentPath,
-  zEnterpriseAppDeployConsoleCreateDeploymentResponse,
-  zEnterpriseAppDeployConsoleCreateDeveloperApiKeyBody,
-  zEnterpriseAppDeployConsoleCreateDeveloperApiKeyPath,
-  zEnterpriseAppDeployConsoleCreateDeveloperApiKeyResponse,
-  zEnterpriseAppDeployConsoleCreateReleaseBody,
-  zEnterpriseAppDeployConsoleCreateReleasePath,
-  zEnterpriseAppDeployConsoleCreateReleaseResponse,
-  zEnterpriseAppDeployConsoleDeleteAppInstancePath,
-  zEnterpriseAppDeployConsoleDeleteAppInstanceResponse,
-  zEnterpriseAppDeployConsoleDeleteDeveloperApiKeyPath,
-  zEnterpriseAppDeployConsoleDeleteDeveloperApiKeyResponse,
-  zEnterpriseAppDeployConsoleGetAppInstanceAccessPath,
-  zEnterpriseAppDeployConsoleGetAppInstanceAccessResponse,
-  zEnterpriseAppDeployConsoleGetAppInstanceOverviewPath,
-  zEnterpriseAppDeployConsoleGetAppInstanceOverviewResponse,
-  zEnterpriseAppDeployConsoleGetAppInstanceSettingsPath,
-  zEnterpriseAppDeployConsoleGetAppInstanceSettingsResponse,
-  zEnterpriseAppDeployConsoleGetEnvironmentAccessPolicyPath,
-  zEnterpriseAppDeployConsoleGetEnvironmentAccessPolicyResponse,
-  zEnterpriseAppDeployConsoleListAppInstancesQuery,
-  zEnterpriseAppDeployConsoleListAppInstancesResponse,
-  zEnterpriseAppDeployConsoleListDeploymentBindingOptionsPath,
-  zEnterpriseAppDeployConsoleListDeploymentBindingOptionsResponse,
-  zEnterpriseAppDeployConsoleListDeploymentEnvironmentOptionsResponse,
-  zEnterpriseAppDeployConsoleListReleasesPath,
-  zEnterpriseAppDeployConsoleListReleasesQuery,
-  zEnterpriseAppDeployConsoleListReleasesResponse,
-  zEnterpriseAppDeployConsoleListRuntimeInstancesPath,
-  zEnterpriseAppDeployConsoleListRuntimeInstancesResponse,
-  zEnterpriseAppDeployConsolePreviewReleaseBody,
-  zEnterpriseAppDeployConsolePreviewReleasePath,
-  zEnterpriseAppDeployConsolePreviewReleaseResponse,
-  zEnterpriseAppDeployConsoleSearchAccessSubjectsPath,
-  zEnterpriseAppDeployConsoleSearchAccessSubjectsQuery,
-  zEnterpriseAppDeployConsoleSearchAccessSubjectsResponse,
-  zEnterpriseAppDeployConsoleUndeployRuntimeInstanceBody,
-  zEnterpriseAppDeployConsoleUndeployRuntimeInstancePath,
-  zEnterpriseAppDeployConsoleUndeployRuntimeInstanceResponse,
-  zEnterpriseAppDeployConsoleUpdateAccessChannelsBody,
-  zEnterpriseAppDeployConsoleUpdateAccessChannelsPath,
-  zEnterpriseAppDeployConsoleUpdateAccessChannelsResponse,
-  zEnterpriseAppDeployConsoleUpdateAppInstanceBody,
-  zEnterpriseAppDeployConsoleUpdateAppInstancePath,
-  zEnterpriseAppDeployConsoleUpdateAppInstanceResponse,
-  zEnterpriseAppDeployConsoleUpdateDeveloperApiBody,
-  zEnterpriseAppDeployConsoleUpdateDeveloperApiPath,
-  zEnterpriseAppDeployConsoleUpdateDeveloperApiResponse,
-  zEnterpriseAppDeployConsoleUpdateEnvironmentAccessPolicyBody,
-  zEnterpriseAppDeployConsoleUpdateEnvironmentAccessPolicyPath,
-  zEnterpriseAppDeployConsoleUpdateEnvironmentAccessPolicyResponse,
   zWebAppAuthGetGroupSubjectsQuery,
   zWebAppAuthGetGroupSubjectsResponse,
   zWebAppAuthGetWebAppAccessModeQuery,
@@ -78,344 +21,6 @@ import {
   zWebAppAuthUpdateWebAppWhitelistSubjectsResponse,
 } from './zod.gen'
 
-export const listAppInstances = oc
-  .route({
-    inputStructure: 'detailed',
-    method: 'GET',
-    operationId: 'EnterpriseAppDeployConsole_ListAppInstances',
-    path: '/enterprise/app-instances',
-    tags: ['EnterpriseAppDeployConsole'],
-  })
-  .input(z.object({ query: zEnterpriseAppDeployConsoleListAppInstancesQuery.optional() }))
-  .output(zEnterpriseAppDeployConsoleListAppInstancesResponse)
-
-export const createAppInstance = oc
-  .route({
-    inputStructure: 'detailed',
-    method: 'POST',
-    operationId: 'EnterpriseAppDeployConsole_CreateAppInstance',
-    path: '/enterprise/app-instances',
-    tags: ['EnterpriseAppDeployConsole'],
-  })
-  .input(z.object({ body: zEnterpriseAppDeployConsoleCreateAppInstanceBody }))
-  .output(zEnterpriseAppDeployConsoleCreateAppInstanceResponse)
-
-export const deleteAppInstance = oc
-  .route({
-    inputStructure: 'detailed',
-    method: 'DELETE',
-    operationId: 'EnterpriseAppDeployConsole_DeleteAppInstance',
-    path: '/enterprise/app-instances/{appInstanceId}',
-    tags: ['EnterpriseAppDeployConsole'],
-  })
-  .input(z.object({ params: zEnterpriseAppDeployConsoleDeleteAppInstancePath }))
-  .output(zEnterpriseAppDeployConsoleDeleteAppInstanceResponse)
-
-export const updateAppInstance = oc
-  .route({
-    inputStructure: 'detailed',
-    method: 'PATCH',
-    operationId: 'EnterpriseAppDeployConsole_UpdateAppInstance',
-    path: '/enterprise/app-instances/{appInstanceId}',
-    tags: ['EnterpriseAppDeployConsole'],
-  })
-  .input(
-    z.object({
-      body: zEnterpriseAppDeployConsoleUpdateAppInstanceBody,
-      params: zEnterpriseAppDeployConsoleUpdateAppInstancePath,
-    }),
-  )
-  .output(zEnterpriseAppDeployConsoleUpdateAppInstanceResponse)
-
-export const getAppInstanceAccess = oc
-  .route({
-    inputStructure: 'detailed',
-    method: 'GET',
-    operationId: 'EnterpriseAppDeployConsole_GetAppInstanceAccess',
-    path: '/enterprise/app-instances/{appInstanceId}/access',
-    tags: ['EnterpriseAppDeployConsole'],
-  })
-  .input(z.object({ params: zEnterpriseAppDeployConsoleGetAppInstanceAccessPath }))
-  .output(zEnterpriseAppDeployConsoleGetAppInstanceAccessResponse)
-
-export const updateAccessChannels = oc
-  .route({
-    inputStructure: 'detailed',
-    method: 'PATCH',
-    operationId: 'EnterpriseAppDeployConsole_UpdateAccessChannels',
-    path: '/enterprise/app-instances/{appInstanceId}/access-channels',
-    tags: ['EnterpriseAppDeployConsole'],
-  })
-  .input(
-    z.object({
-      body: zEnterpriseAppDeployConsoleUpdateAccessChannelsBody,
-      params: zEnterpriseAppDeployConsoleUpdateAccessChannelsPath,
-    }),
-  )
-  .output(zEnterpriseAppDeployConsoleUpdateAccessChannelsResponse)
-
-export const searchAccessSubjects = oc
-  .route({
-    inputStructure: 'detailed',
-    method: 'GET',
-    operationId: 'EnterpriseAppDeployConsole_SearchAccessSubjects',
-    path: '/enterprise/app-instances/{appInstanceId}/access-subjects:search',
-    tags: ['EnterpriseAppDeployConsole'],
-  })
-  .input(
-    z.object({
-      params: zEnterpriseAppDeployConsoleSearchAccessSubjectsPath,
-      query: zEnterpriseAppDeployConsoleSearchAccessSubjectsQuery.optional(),
-    }),
-  )
-  .output(zEnterpriseAppDeployConsoleSearchAccessSubjectsResponse)
-
-export const createDeveloperApiKey = oc
-  .route({
-    inputStructure: 'detailed',
-    method: 'POST',
-    operationId: 'EnterpriseAppDeployConsole_CreateDeveloperApiKey',
-    path: '/enterprise/app-instances/{appInstanceId}/api-keys',
-    tags: ['EnterpriseAppDeployConsole'],
-  })
-  .input(
-    z.object({
-      body: zEnterpriseAppDeployConsoleCreateDeveloperApiKeyBody,
-      params: zEnterpriseAppDeployConsoleCreateDeveloperApiKeyPath,
-    }),
-  )
-  .output(zEnterpriseAppDeployConsoleCreateDeveloperApiKeyResponse)
-
-export const deleteDeveloperApiKey = oc
-  .route({
-    inputStructure: 'detailed',
-    method: 'DELETE',
-    operationId: 'EnterpriseAppDeployConsole_DeleteDeveloperApiKey',
-    path: '/enterprise/app-instances/{appInstanceId}/api-keys/{apiKeyId}',
-    tags: ['EnterpriseAppDeployConsole'],
-  })
-  .input(z.object({ params: zEnterpriseAppDeployConsoleDeleteDeveloperApiKeyPath }))
-  .output(zEnterpriseAppDeployConsoleDeleteDeveloperApiKeyResponse)
-
-export const listDeploymentBindingOptions = oc
-  .route({
-    inputStructure: 'detailed',
-    method: 'GET',
-    operationId: 'EnterpriseAppDeployConsole_ListDeploymentBindingOptions',
-    path: '/enterprise/app-instances/{appInstanceId}/deployment-binding-options',
-    tags: ['EnterpriseAppDeployConsole'],
-  })
-  .input(z.object({ params: zEnterpriseAppDeployConsoleListDeploymentBindingOptionsPath }))
-  .output(zEnterpriseAppDeployConsoleListDeploymentBindingOptionsResponse)
-
-export const createDeployment = oc
-  .route({
-    inputStructure: 'detailed',
-    method: 'POST',
-    operationId: 'EnterpriseAppDeployConsole_CreateDeployment',
-    path: '/enterprise/app-instances/{appInstanceId}/deployments',
-    tags: ['EnterpriseAppDeployConsole'],
-  })
-  .input(
-    z.object({
-      body: zEnterpriseAppDeployConsoleCreateDeploymentBody,
-      params: zEnterpriseAppDeployConsoleCreateDeploymentPath,
-    }),
-  )
-  .output(zEnterpriseAppDeployConsoleCreateDeploymentResponse)
-
-export const updateDeveloperApi = oc
-  .route({
-    inputStructure: 'detailed',
-    method: 'PATCH',
-    operationId: 'EnterpriseAppDeployConsole_UpdateDeveloperApi',
-    path: '/enterprise/app-instances/{appInstanceId}/developer-api',
-    tags: ['EnterpriseAppDeployConsole'],
-  })
-  .input(
-    z.object({
-      body: zEnterpriseAppDeployConsoleUpdateDeveloperApiBody,
-      params: zEnterpriseAppDeployConsoleUpdateDeveloperApiPath,
-    }),
-  )
-  .output(zEnterpriseAppDeployConsoleUpdateDeveloperApiResponse)
-
-export const getEnvironmentAccessPolicy = oc
-  .route({
-    inputStructure: 'detailed',
-    method: 'GET',
-    operationId: 'EnterpriseAppDeployConsole_GetEnvironmentAccessPolicy',
-    path: '/enterprise/app-instances/{appInstanceId}/environments/{environmentId}/access-policy',
-    tags: ['EnterpriseAppDeployConsole'],
-  })
-  .input(z.object({ params: zEnterpriseAppDeployConsoleGetEnvironmentAccessPolicyPath }))
-  .output(zEnterpriseAppDeployConsoleGetEnvironmentAccessPolicyResponse)
-
-export const updateEnvironmentAccessPolicy = oc
-  .route({
-    inputStructure: 'detailed',
-    method: 'PUT',
-    operationId: 'EnterpriseAppDeployConsole_UpdateEnvironmentAccessPolicy',
-    path: '/enterprise/app-instances/{appInstanceId}/environments/{environmentId}/access-policy',
-    tags: ['EnterpriseAppDeployConsole'],
-  })
-  .input(
-    z.object({
-      body: zEnterpriseAppDeployConsoleUpdateEnvironmentAccessPolicyBody,
-      params: zEnterpriseAppDeployConsoleUpdateEnvironmentAccessPolicyPath,
-    }),
-  )
-  .output(zEnterpriseAppDeployConsoleUpdateEnvironmentAccessPolicyResponse)
-
-export const getAppInstanceOverview = oc
-  .route({
-    inputStructure: 'detailed',
-    method: 'GET',
-    operationId: 'EnterpriseAppDeployConsole_GetAppInstanceOverview',
-    path: '/enterprise/app-instances/{appInstanceId}/overview',
-    tags: ['EnterpriseAppDeployConsole'],
-  })
-  .input(z.object({ params: zEnterpriseAppDeployConsoleGetAppInstanceOverviewPath }))
-  .output(zEnterpriseAppDeployConsoleGetAppInstanceOverviewResponse)
-
-export const listReleases = oc
-  .route({
-    inputStructure: 'detailed',
-    method: 'GET',
-    operationId: 'EnterpriseAppDeployConsole_ListReleases',
-    path: '/enterprise/app-instances/{appInstanceId}/releases',
-    tags: ['EnterpriseAppDeployConsole'],
-  })
-  .input(
-    z.object({
-      params: zEnterpriseAppDeployConsoleListReleasesPath,
-      query: zEnterpriseAppDeployConsoleListReleasesQuery.optional(),
-    }),
-  )
-  .output(zEnterpriseAppDeployConsoleListReleasesResponse)
-
-export const createRelease = oc
-  .route({
-    inputStructure: 'detailed',
-    method: 'POST',
-    operationId: 'EnterpriseAppDeployConsole_CreateRelease',
-    path: '/enterprise/app-instances/{appInstanceId}/releases',
-    tags: ['EnterpriseAppDeployConsole'],
-  })
-  .input(
-    z.object({
-      body: zEnterpriseAppDeployConsoleCreateReleaseBody,
-      params: zEnterpriseAppDeployConsoleCreateReleasePath,
-    }),
-  )
-  .output(zEnterpriseAppDeployConsoleCreateReleaseResponse)
-
-export const previewRelease = oc
-  .route({
-    inputStructure: 'detailed',
-    method: 'POST',
-    operationId: 'EnterpriseAppDeployConsole_PreviewRelease',
-    path: '/enterprise/app-instances/{appInstanceId}/releases:preview',
-    tags: ['EnterpriseAppDeployConsole'],
-  })
-  .input(
-    z.object({
-      body: zEnterpriseAppDeployConsolePreviewReleaseBody,
-      params: zEnterpriseAppDeployConsolePreviewReleasePath,
-    }),
-  )
-  .output(zEnterpriseAppDeployConsolePreviewReleaseResponse)
-
-export const listRuntimeInstances = oc
-  .route({
-    inputStructure: 'detailed',
-    method: 'GET',
-    operationId: 'EnterpriseAppDeployConsole_ListRuntimeInstances',
-    path: '/enterprise/app-instances/{appInstanceId}/runtime-instances',
-    tags: ['EnterpriseAppDeployConsole'],
-  })
-  .input(z.object({ params: zEnterpriseAppDeployConsoleListRuntimeInstancesPath }))
-  .output(zEnterpriseAppDeployConsoleListRuntimeInstancesResponse)
-
-export const cancelRuntimeDeployment = oc
-  .route({
-    inputStructure: 'detailed',
-    method: 'POST',
-    operationId: 'EnterpriseAppDeployConsole_CancelRuntimeDeployment',
-    path: '/enterprise/app-instances/{appInstanceId}/runtime-instances/{runtimeInstanceId}/deployment:cancel',
-    tags: ['EnterpriseAppDeployConsole'],
-  })
-  .input(
-    z.object({
-      body: zEnterpriseAppDeployConsoleCancelRuntimeDeploymentBody,
-      params: zEnterpriseAppDeployConsoleCancelRuntimeDeploymentPath,
-    }),
-  )
-  .output(zEnterpriseAppDeployConsoleCancelRuntimeDeploymentResponse)
-
-export const undeployRuntimeInstance = oc
-  .route({
-    inputStructure: 'detailed',
-    method: 'POST',
-    operationId: 'EnterpriseAppDeployConsole_UndeployRuntimeInstance',
-    path: '/enterprise/app-instances/{appInstanceId}/runtime-instances/{runtimeInstanceId}:undeploy',
-    tags: ['EnterpriseAppDeployConsole'],
-  })
-  .input(
-    z.object({
-      body: zEnterpriseAppDeployConsoleUndeployRuntimeInstanceBody,
-      params: zEnterpriseAppDeployConsoleUndeployRuntimeInstancePath,
-    }),
-  )
-  .output(zEnterpriseAppDeployConsoleUndeployRuntimeInstanceResponse)
-
-export const getAppInstanceSettings = oc
-  .route({
-    inputStructure: 'detailed',
-    method: 'GET',
-    operationId: 'EnterpriseAppDeployConsole_GetAppInstanceSettings',
-    path: '/enterprise/app-instances/{appInstanceId}/settings',
-    tags: ['EnterpriseAppDeployConsole'],
-  })
-  .input(z.object({ params: zEnterpriseAppDeployConsoleGetAppInstanceSettingsPath }))
-  .output(zEnterpriseAppDeployConsoleGetAppInstanceSettingsResponse)
-
-export const listDeploymentEnvironmentOptions = oc
-  .route({
-    inputStructure: 'detailed',
-    method: 'GET',
-    operationId: 'EnterpriseAppDeployConsole_ListDeploymentEnvironmentOptions',
-    path: '/enterprise/deployment-environment-options',
-    tags: ['EnterpriseAppDeployConsole'],
-  })
-  .output(zEnterpriseAppDeployConsoleListDeploymentEnvironmentOptionsResponse)
-
-export const enterpriseAppDeployConsole = {
-  listAppInstances,
-  createAppInstance,
-  deleteAppInstance,
-  updateAppInstance,
-  getAppInstanceAccess,
-  updateAccessChannels,
-  searchAccessSubjects,
-  createDeveloperApiKey,
-  deleteDeveloperApiKey,
-  listDeploymentBindingOptions,
-  createDeployment,
-  updateDeveloperApi,
-  getEnvironmentAccessPolicy,
-  updateEnvironmentAccessPolicy,
-  getAppInstanceOverview,
-  listReleases,
-  createRelease,
-  previewRelease,
-  listRuntimeInstances,
-  cancelRuntimeDeployment,
-  undeployRuntimeInstance,
-  getAppInstanceSettings,
-  listDeploymentEnvironmentOptions,
-}
-
 export const oAuth2Login = oc
   .route({
     inputStructure: 'detailed',
@@ -528,7 +133,6 @@ export const webAppAuth = {
 }
 
 export const contract = {
-  enterpriseAppDeployConsole,
   consoleSso,
   webAppAuth,
 }
diff --git a/packages/contracts/generated/enterprise/types.gen.ts b/packages/contracts/generated/enterprise/types.gen.ts
index 56228f2738..b747c4baa8 100644
--- a/packages/contracts/generated/enterprise/types.gen.ts
+++ b/packages/contracts/generated/enterprise/types.gen.ts
@@ -4,46 +4,6 @@ export type ClientOptions = {
   baseUrl: `${string}://${string}` | (string & {})
 }
 
-export type AccessChannels = {
-  enabled?: boolean
-  webappRows?: Array<WebAppAccessRow>
-  cli?: CliAccess
-}
-
-export type AccessModeOption = {
-  mode?: string
-  label?: string
-  disabled?: boolean
-  selected?: boolean
-}
-
-export type AccessPolicyDetail = {
-  accessMode?: string
-  subjects?: Array<AccessSubjectDisplay>
-  options?: Array<AccessModeOption>
-}
-
-export type AccessStatus = {
-  accessChannelsEnabled?: boolean
-  webappUrl?: string
-  cliUrl?: string
-  developerApiEnabled?: boolean
-  apiKeyCount?: number
-}
-
-export type AccessSubject = {
-  subjectId?: string
-  subjectType?: string
-}
-
-export type AccessSubjectDisplay = {
-  id?: string
-  subjectType?: string
-  name?: string
-  avatarUrl?: string
-  memberCount?: string
-}
-
 export type Account = {
   id?: string
   email?: string
@@ -70,104 +30,9 @@ export type AccountInWorkspace = {
   role?: string
 }
 
-export type AckDeploymentReply = {
-  accepted?: boolean
-  newVersion?: string
-}
-
-export type AckDeploymentReq = {
-  deploymentId?: string
-  instanceId?: string
-  expectedVersion?: string
-  status?: string
-  observedReleaseId?: string
-  lastError?: LastError
-}
-
-export type AppInstanceBasicInfo = {
+export type AddGroupAppsRequest = {
   id?: string
-  name?: string
-  description?: string
-  sourceAppId?: string
-  sourceAppName?: string
-  mode?: string
-  createdAt?: string
-}
-
-export type AppInstanceCard = {
-  id?: string
-  name?: string
-  icon?: string
-  mode?: string
-  sourceAppName?: string
-  statuses?: Array<StatusCount>
-  lastDeployedAt?: string
-}
-
-export type AppRunnerBatchRuntimeArtifactReply = {
-  results?: Array<AppRunnerRuntimeArtifactResult>
-}
-
-export type AppRunnerBatchRuntimeArtifactRequest = {
-  artifacts?: Array<AppRunnerRuntimeArtifactRequest>
-}
-
-export type AppRunnerBootstrapAssignment = {
-  appId?: string
-  environmentId?: string
-  workflowId?: string
-  instanceId?: string
-  workspaceId?: string
-  instanceVersion?: string
-  bindingSnapshotVersion?: string
-  executionTokenVersion?: string
-  executionToken?: string
-  releaseId?: string
-}
-
-export type AppRunnerBootstrapReply = {
-  runnerId?: string
-  assignmentRevision?: string
-  assignments?: Array<AppRunnerBootstrapAssignment>
-}
-
-export type AppRunnerBootstrapRequest = {
-  runner?: AppRunnerRunnerInfo
-}
-
-export type AppRunnerRunnerInfo = {
-  hostname?: string
-}
-
-export type AppRunnerRuntimeArtifactReply = {
-  dslYaml?: string
-  bindingSnapshotVersion?: string
-  bindingSnapshot?: {
-    [key: string]: unknown
-  }
-}
-
-export type AppRunnerRuntimeArtifactRequest = {
-  instanceId?: string
-  releaseId?: string
-  bindingSnapshotVersion?: string
-}
-
-export type AppRunnerRuntimeArtifactResult = {
-  instanceId?: string
-  releaseId?: string
-  artifact?: AppRunnerRuntimeArtifactReply
-  errorCode?: string
-  errorMessage?: string
-}
-
-export type AppRunnerTokenExchangeReply = {
-  accessToken?: string
-  expiresAt?: string
-}
-
-export type AppRunnerTokenExchangeRequest = {
-  joinToken?: string
+  app_ids?: Array<string>
 }
 
 export type AuthSettingsReply = {
@@ -193,15 +58,6 @@ export type AuthSettingsReq = {
   ssoSettings?: SsoSettings
 }
 
-export type BootstrapProgress = {
-  currentStep?: string
-  completedSteps?: Array<string>
-  attemptCount?: number
-  lastAttemptAt?: string
-  lastErrorCode?: string
-  lastErrorMessage?: string
-}
-
 export type BrandingInfo = {
   enabled?: boolean
   applicationTitle?: string
@@ -210,15 +66,6 @@ export type BrandingInfo = {
   favicon?: string
 }
 
-export type CancelRuntimeDeploymentReply = {
-  status?: string
-}
-
-export type CancelRuntimeDeploymentReq = {
-  appInstanceId?: string
-  runtimeInstanceId?: string
-}
-
 export type CheckPasswordStatusReply = {
   requirePasswordChange?: boolean
   changeReason?: number
@@ -230,82 +77,10 @@ export type ClearDefaultWorkspaceReply = {
   [key: string]: unknown
 }
 
-export type CliAccess = {
-  url?: string
-}
-
-export type ConsoleEnvironment = {
-  id?: string
-  name?: string
-  runtime?: string
-  type?: string
-  status?: string
-}
-
-export type ConsoleRelease = {
-  id?: string
-  name?: string
-  shortCommitId?: string
-  createdAt?: string
-}
-
-export type ConsoleUser = {
-  id?: string
-  name?: string
-}
-
-export type CreateAppInstanceReply = {
-  appInstanceId?: string
-  initialRelease?: ConsoleRelease
-}
-
-export type CreateAppInstanceReq = {
-  sourceAppId?: string
-  name?: string
-  description?: string
-}
-
 export type CreateBearerTokenResponse = {
   token?: string
 }
 
-export type CreateDeploymentReply = {
-  runtimeInstanceId?: string
-  deploymentId?: string
-  status?: string
-}
-
-export type CreateDeploymentReq = {
-  appInstanceId?: string
-  environmentId?: string
-  releaseId?: string
-  bindings?: Array<DeploymentRuntimeBinding>
-}
-
-export type CreateDeveloperApiKeyReply = {
-  apiKey?: DeveloperApiKeyRow
-  token?: string
-}
-
-export type CreateDeveloperApiKeyReq = {
-  appInstanceId?: string
-  environmentId?: string
-  name?: string
-}
-
-export type CreateEnvironmentReply = {
-  environment?: Environment
-}
-
-export type CreateEnvironmentReq = {
-  name?: string
-  description?: string
-  mode?: number
-  backend?: number
-  k8s?: K8sEnvironmentConfig
-  host?: HostEnvironmentConfig
-}
-
 export type CreateMemberReply = {
   id?: string
   password?: string
@@ -329,12 +104,7 @@ export type CreateNewGroupsRes = {
   groups?: Array<SubjectGroupData>
 }
 
-export type CreateReleaseReply = {
-  release?: ConsoleRelease
-}
-
-export type CreateReleaseReq = {
-  appInstanceId?: string
+export type CreateResourceGroupRequest = {
   name?: string
   description?: string
 }
@@ -394,27 +164,10 @@ export type DashboardSsosamlLoginReply = {
   url?: string
 }
 
-export type DeleteAppInstanceReply = {
-  [key: string]: unknown
-}
-
-export type DeleteDeveloperApiKeyReply = {
-  [key: string]: unknown
-}
-
-export type DeleteEnvironmentReply = {
-  [key: string]: unknown
-}
-
 export type DeleteGroupsRes = {
   message?: string
 }
 
-export type DeleteGuard = {
-  canDelete?: boolean
-  disabledReason?: string
-}
-
 export type DeleteMemberReply = {
   account?: Account
 }
@@ -431,70 +184,6 @@ export type DeleteWorkspaceReply = {
   [key: string]: unknown
 }
 
-export type DeployedEnvironment = {
-  environmentId?: string
-  environmentName?: string
-}
-
-export type DeploymentBindingOptionSlot = {
-  slot?: string
-  kind?: string
-  label?: string
-  required?: boolean
-  candidates?: Array<DeploymentCredentialOption>
-  envVarCandidates?: Array<DeploymentEnvVarOption>
-}
-
-export type DeploymentCredentialOption = {
-  credentialId?: string
-  displayName?: string
-  pluginId?: string
-  pluginName?: string
-  pluginVersion?: string
-}
-
-export type DeploymentEnvVarOption = {
-  envVarId?: string
-  name?: string
-  valueType?: string
-  displayValue?: string
-}
-
-export type DeploymentEnvironmentOption = {
-  id?: string
-  name?: string
-  type?: string
-  backend?: string
-  status?: string
-  managedBy?: string
-  deployable?: boolean
-  disabledReason?: string
-}
-
-export type DeploymentRuntimeBinding = {
-  slot?: string
-  credentialId?: string
-  envVarId?: string
-}
-
-export type DeploymentStatusRow = {
-  environment?: ConsoleEnvironment
-  release?: ConsoleRelease
-  status?: string
-}
-
-export type DeveloperApiAccess = {
-  enabled?: boolean
-  apiKeys?: Array<DeveloperApiKeyRow>
-}
-
-export type DeveloperApiKeyRow = {
-  id?: string
-  name?: string
-  environment?: ConsoleEnvironment
-  maskedKey?: string
-}
-
 export type EndpointReply = {
   mode?: number
   metricsEndpoint?: OtelExporterEndpoint
@@ -507,55 +196,6 @@ export type EnterpriseSystemUserSettingReply = {
   enableEmailPasswordLogin?: boolean
 }
 
-export type Environment = {
-  id?: string
-  name?: string
-  description?: string
-  mode?: number
-  namespace?: string
-  apiServer?: string
-  status?: number
-  statusMessage?: string
-  bootstrapProgress?: BootstrapProgress
-  managedBy?: string
-  createdAt?: string
-  updatedAt?: string
-  backend?: number
-  host?: string
-}
-
-export type EnvironmentAccessRow = {
-  environment?: ConsoleEnvironment
-  currentRelease?: ConsoleRelease
-  accessMode?: string
-  accessModeLabel?: string
-  hint?: string
-}
-
-export type EnvironmentFilter = {
-  id?: string
-  name?: string
-  kind?: string
-}
-
-export type GetAppInstanceAccessReply = {
-  permissions?: Array<EnvironmentAccessRow>
-  accessChannels?: AccessChannels
-  developerApi?: DeveloperApiAccess
-}
-
-export type GetAppInstanceOverviewReply = {
-  instance?: AppInstanceBasicInfo
-  deployments?: Array<DeploymentStatusRow>
-  access?: AccessStatus
-}
-
-export type GetAppInstanceSettingsReply = {
-  name?: string
-  description?: string
-  deleteGuard?: DeleteGuard
-}
-
 export type GetBearerTokenResponse = {
   maskedToken?: string
 }
@@ -571,14 +211,6 @@ export type GetDefaultWorkspaceReply = {
   workspace?: Workspace
 }
 
-export type GetEnvironmentAccessPolicyReply = {
-  policy?: AccessPolicyDetail
-}
-
-export type GetEnvironmentReply = {
-  environment?: Environment
-}
-
 export type GetGroupSubjectsRes = {
   subjects?: Array<Subject>
 }
@@ -587,15 +219,6 @@ export type GetGroupsRes = {
   groups?: Array<SubjectGroupData>
 }
 
-export type GetInstanceReply = {
-  instanceId?: string
-  status?: string
-  desiredReleaseId?: string
-  observedReleaseId?: string
-  currentDeploymentId?: string
-  version?: string
-}
-
 export type GetJoinedGroupsRes = {
   groups?: Array<SubjectGroupData>
 }
@@ -652,16 +275,22 @@ export type GetWorkspaceReply = {
   workspace?: Workspace
 }
 
+export type GroupAppItem = {
+  app_id?: string
+  app_name?: string
+  workspace_id?: string
+  workspace_name?: string
+  app_status?: number
+  token_usage?: string
+  rpm?: string
+  concurrency?: string
+}
+
 export type HealthzReply = {
   message?: string
   status?: string
 }
 
-export type HostEnvironmentConfig = {
-  machineId?: string
-  joinTokenHash?: string
-}
-
 export type InfoConfigReply = {
   SSOEnforcedForSignin?: boolean
   SSOEnforcedForSigninProtocol?: string
@@ -677,6 +306,11 @@ export type InfoConfigReply = {
   PluginInstallationPermission?: PluginInstallationPermissionInfo
 }
 
+export type InnerAdmission = {
+  marker?: string
+  concurrencyGroupIds?: Array<string>
+}
+
 export type InnerBatchGetWebAppAccessModesByIdReq = {
   appIds?: Array<string>
 }
@@ -698,42 +332,10 @@ export type InnerBatchIsUserAllowedToAccessWebAppRes = {
   }
 }
 
-export type InnerCheckAppDeployAccessReply = {
-  allowed?: boolean
-  matchedPolicyId?: string
-  matchedScopeType?: string
-  reason?: string
-  cacheTtlSeconds?: number
-}
-
-export type InnerCheckAppDeployAccessReq = {
-  appInstanceId?: string
-  environmentId?: string
-  principalType?: string
-  principalId?: string
-}
-
 export type InnerCleanAppRes = {
   message?: string
 }
 
-export type InnerGetTokenRouteReply = {
-  environmentId?: string
-  namespace?: string
-  serviceName?: string
-  servicePort?: number
-  environmentStatus?: string
-  appId?: string
-  tenantId?: string
-  instanceId?: string
-  observedReleaseId?: string
-  instanceStatus?: string
-}
-
-export type InnerGetTokenRouteReq = {
-  token?: string
-}
-
 export type InnerGetWebAppAccessModeByCodeRes = {
   accessMode?: string
 }
@@ -742,10 +344,34 @@ export type InnerGetWebAppAccessModeByIdRes = {
   accessMode?: string
 }
 
+export type InnerGroupConfig = {
+  id?: string
+  enabled?: boolean
+  membershipId?: string
+  limits?: Array<LimitConfig>
+}
+
 export type InnerIsUserAllowedToAccessWebAppRes = {
   result?: boolean
 }
 
+export type InnerReleaseAdmissionRequest = {
+  admission?: InnerAdmission
+}
+
+export type InnerReleaseAdmissionResponse = {
+  [key: string]: unknown
+}
+
+export type InnerResolveResponse = {
+  appId?: string
+  groups?: Array<InnerGroupConfig>
+  blocked?: boolean
+  blockGroupId?: string
+  blockReason?: string
+  admission?: InnerAdmission
+}
+
 export type InnerTryAddAccountToDefaultWorkspaceReply = {
   workspaceId?: string
   joined?: boolean
@@ -770,20 +396,6 @@ export type JoinWorkspaceReq = {
   role?: string
 }
 
-export type K8sEnvironmentConfig = {
-  namespace?: string
-  apiServer?: string
-  caBundle?: string
-  bearerToken?: string
-}
-
-export type LastError = {
-  phase?: string
-  code?: string
-  message?: string
-  releaseId?: string
-}
-
 export type LicenseInfo = {
   uuid?: string
   expiredAt?: string
@@ -798,28 +410,21 @@ export type LicenseStatus = {
   workspaces?: ResourceQuota
 }
 
+export type LimitConfig = {
+  type?: number
+  threshold?: string
+  action?: number
+  reached?: boolean
+}
+
 export type LimitFields = {
   workspaceMembers?: number
   workspaces?: ResourceQuota
 }
 
-export type ListAppInstancesReply = {
-  filters?: Array<EnvironmentFilter>
-  data?: Array<AppInstanceCard>
-  pagination?: Pagination
-}
-
-export type ListDeploymentBindingOptionsReply = {
-  slots?: Array<DeploymentBindingOptionSlot>
-}
-
-export type ListDeploymentEnvironmentOptionsReply = {
-  environments?: Array<DeploymentEnvironmentOption>
-}
-
-export type ListEnvironmentsReply = {
-  data?: Array<Environment>
-  pagination?: Pagination
+export type ListGroupAppsResponse = {
+  items?: Array<GroupAppItem>
+  total?: string
 }
 
 export type ListMembersReply = {
@@ -827,13 +432,9 @@ export type ListMembersReply = {
   pagination?: Pagination
 }
 
-export type ListReleasesReply = {
-  data?: Array<ReleaseRow>
-  pagination?: Pagination
-}
-
-export type ListRuntimeInstancesReply = {
-  data?: Array<RuntimeInstanceRow>
+export type ListResourceGroupsResponse = {
+  items?: Array<ResourceGroupItem>
+  total?: string
 }
 
 export type ListSecretKeysReply = {
@@ -981,31 +582,6 @@ export type PluginInstallationSettingsReply = {
   restrictToMarketplaceOnly?: boolean
 }
 
-export type PreviewReleaseReply = {
-  release?: ConsoleRelease
-  bindings?: Array<ReleaseRuntimeBinding>
-}
-
-export type PreviewReleaseReq = {
-  appInstanceId?: string
-  releaseId?: string
-}
-
-export type ReleaseRow = {
-  id?: string
-  name?: string
-  createdAt?: string
-  createdBy?: ConsoleUser
-  deployedTo?: Array<DeployedEnvironment>
-}
-
-export type ReleaseRuntimeBinding = {
-  kind?: string
-  label?: string
-  displayValue?: string
-  valueType?: string
-}
-
 export type ResetMemberPasswordReply = {
   id?: string
   password?: string
@@ -1034,21 +610,35 @@ export type ResetUserPasswordReq = {
   id?: string
 }
 
-export type ResolveCredentialsReply = {
-  resolved?: Array<ResolvedCredential>
+export type ResourceGroupDetail = {
+  id?: string
+  name?: string
+  description?: string
+  enabled?: boolean
+  rpm_limit?: number
+  rpm_action?: number
+  concurrency_limit?: number
+  concurrency_action?: number
+  token_quota?: string
+  token_action?: number
+  created_at?: string
+  updated_at?: string
 }
 
-export type ResolveCredentialsReq = {
-  instanceId?: string
-  deploymentId?: string
-  slots?: Array<string>
-}
-
-export type ResolvedCredential = {
-  slot?: string
-  credentialId?: string
-  envVarId?: string
-  value?: string
+export type ResourceGroupItem = {
+  id?: string
+  name?: string
+  description?: string
+  enabled?: boolean
+  rpm_limit?: number
+  concurrency_limit?: number
+  token_quota?: string
+  token_usage?: string
+  app_count?: string
+  rpm_status?: number
+  conc_status?: number
+  created_at?: string
+  updated_at?: string
 }
 
 export type ResourceQuota = {
@@ -1057,36 +647,6 @@ export type ResourceQuota = {
   enabled?: boolean
 }
 
-export type RetryEnvironmentReply = {
-  environment?: Environment
-}
-
-export type RetryEnvironmentReq = {
-  id?: string
-}
-
-export type RuntimeEndpoints = {
-  run?: string
-  health?: string
-}
-
-export type RuntimeInstanceDetail = {
-  deploymentName?: string
-  replicas?: number
-  runtimeMode?: string
-  runtimeNote?: string
-  endpoints?: RuntimeEndpoints
-  bindings?: Array<ReleaseRuntimeBinding>
-}
-
-export type RuntimeInstanceRow = {
-  id?: string
-  environment?: ConsoleEnvironment
-  status?: string
-  currentRelease?: ConsoleRelease
-  detail?: RuntimeInstanceDetail
-}
-
 export type SamlConfig = {
   idpSsoUrl?: string
   certificate?: string
@@ -1119,8 +679,21 @@ export type ScimSettings = {
   lastSyncTime?: string
 }
 
-export type SearchAccessSubjectsReply = {
-  data?: Array<AccessSubjectDisplay>
+export type SearchAppItem = {
+  app_id?: string
+  app_name?: string
+  workspace_id?: string
+  workspace_name?: string
+  app_status?: number
+  icon?: string
+  icon_type?: string
+  icon_background?: string
+  created_by_name?: string
+}
+
+export type SearchAppsResponse = {
+  items?: Array<SearchAppItem>
+  total?: string
 }
 
 export type SearchForWhilteListCandidatesRes = {
@@ -1145,11 +718,6 @@ export type SetDefaultWorkspaceReq = {
   id?: string
 }
 
-export type StatusCount = {
-  status?: string
-  count?: number
-}
-
 export type Subject = {
   subjectId?: string
   subjectType?: string
@@ -1185,42 +753,10 @@ export type TestConnectionReply = {
   error?: string
 }
 
-export type TestEnvironmentConnectionReply = {
-  ok?: boolean
-  reachableServerVersion?: string
-  namespaceExists?: boolean
-  missingPermissions?: Array<string>
-  error?: string
-  probedAt?: string
-}
-
-export type TestEnvironmentConnectionReq = {
-  id?: string
-}
-
 export type ToggleEndpointRequest = {
   enabled?: boolean
 }
 
-export type UndeployRuntimeInstanceReply = {
-  deploymentId?: string
-  status?: string
-}
-
-export type UndeployRuntimeInstanceReq = {
-  appInstanceId?: string
-  runtimeInstanceId?: string
-}
-
-export type UpdateAccessChannelsReply = {
-  accessChannels?: AccessChannels
-}
-
-export type UpdateAccessChannelsReq = {
-  appInstanceId?: string
-  enabled?: boolean
-}
-
 export type UpdateAccessModeReq = {
   appId?: string
   accessMode?: string
@@ -1230,16 +766,6 @@ export type UpdateAccessModeRes = {
   message?: string
 }
 
-export type UpdateAppInstanceReply = {
-  appInstanceId?: string
-}
-
-export type UpdateAppInstanceReq = {
-  appInstanceId?: string
-  name?: string
-  description?: string
-}
-
 export type UpdateBrandingInfoReq = {
   enabled?: boolean
   applicationTitle?: string
@@ -1248,36 +774,6 @@ export type UpdateBrandingInfoReq = {
   favicon?: string
 }
 
-export type UpdateDeveloperApiReply = {
-  developerApi?: DeveloperApiAccess
-}
-
-export type UpdateDeveloperApiReq = {
-  appInstanceId?: string
-  enabled?: boolean
-}
-
-export type UpdateEnvironmentAccessPolicyReply = {
-  permission?: EnvironmentAccessRow
-}
-
-export type UpdateEnvironmentAccessPolicyReq = {
-  appInstanceId?: string
-  environmentId?: string
-  accessMode?: string
-  subjects?: Array<AccessSubject>
-}
-
-export type UpdateEnvironmentReply = {
-  environment?: Environment
-}
-
-export type UpdateEnvironmentReq = {
-  id?: string
-  name?: string
-  description?: string
-}
-
 export type UpdateGroupSubjectsReq = {
   groupId?: string
   subjects?: Array<Subject>
@@ -1358,6 +854,19 @@ export type UpdatePluginInstallationSettingsRequest = {
   restrictToMarketplaceOnly?: boolean
 }
 
+export type UpdateResourceGroupRequest = {
+  id?: string
+  name?: string
+  description?: string
+  enabled?: boolean
+  rpm_limit?: number
+  rpm_action?: number
+  concurrency_limit?: number
+  concurrency_action?: number
+  token_quota?: string
+  token_action?: number
+}
+
 export type UpdateUserReply = {
   account?: AccountDetail
 }
@@ -1410,11 +919,6 @@ export type UpdateWorkspaceReq = {
   status?: string
 }
 
-export type WebAppAccessRow = {
-  environment?: ConsoleEnvironment
-  url?: string
-}
-
 export type WebAppAuthInfo = {
   allowSso?: boolean
   allowEmailCodeLogin?: boolean
@@ -1459,385 +963,6 @@ export type Pagination = {
   totalPages?: number
 }
 
-export type EnterpriseAppDeployConsoleListAppInstancesData = {
-  body?: never
-  path?: never
-  query?: {
-    environmentId?: string
-    notDeployed?: boolean
-    query?: string
-    pageNumber?: number
-    resultsPerPage?: number
-  }
-  url: '/enterprise/app-instances'
-}
-
-export type EnterpriseAppDeployConsoleListAppInstancesResponses = {
-  200: ListAppInstancesReply
-}
-
-export type EnterpriseAppDeployConsoleListAppInstancesResponse
-  = EnterpriseAppDeployConsoleListAppInstancesResponses[keyof EnterpriseAppDeployConsoleListAppInstancesResponses]
-
-export type EnterpriseAppDeployConsoleCreateAppInstanceData = {
-  body: CreateAppInstanceReq
-  path?: never
-  query?: never
-  url: '/enterprise/app-instances'
-}
-
-export type EnterpriseAppDeployConsoleCreateAppInstanceResponses = {
-  200: CreateAppInstanceReply
-}
-
-export type EnterpriseAppDeployConsoleCreateAppInstanceResponse
-  = EnterpriseAppDeployConsoleCreateAppInstanceResponses[keyof EnterpriseAppDeployConsoleCreateAppInstanceResponses]
-
-export type EnterpriseAppDeployConsoleDeleteAppInstanceData = {
-  body?: never
-  path: {
-    appInstanceId: string
-  }
-  query?: never
-  url: '/enterprise/app-instances/{appInstanceId}'
-}
-
-export type EnterpriseAppDeployConsoleDeleteAppInstanceResponses = {
-  200: DeleteAppInstanceReply
-}
-
-export type EnterpriseAppDeployConsoleDeleteAppInstanceResponse
-  = EnterpriseAppDeployConsoleDeleteAppInstanceResponses[keyof EnterpriseAppDeployConsoleDeleteAppInstanceResponses]
-
-export type EnterpriseAppDeployConsoleUpdateAppInstanceData = {
-  body: UpdateAppInstanceReq
-  path: {
-    appInstanceId: string
-  }
-  query?: never
-  url: '/enterprise/app-instances/{appInstanceId}'
-}
-
-export type EnterpriseAppDeployConsoleUpdateAppInstanceResponses = {
-  200: UpdateAppInstanceReply
-}
-
-export type EnterpriseAppDeployConsoleUpdateAppInstanceResponse
-  = EnterpriseAppDeployConsoleUpdateAppInstanceResponses[keyof EnterpriseAppDeployConsoleUpdateAppInstanceResponses]
-
-export type EnterpriseAppDeployConsoleGetAppInstanceAccessData = {
-  body?: never
-  path: {
-    appInstanceId: string
-  }
-  query?: never
-  url: '/enterprise/app-instances/{appInstanceId}/access'
-}
-
-export type EnterpriseAppDeployConsoleGetAppInstanceAccessResponses = {
-  200: GetAppInstanceAccessReply
-}
-
-export type EnterpriseAppDeployConsoleGetAppInstanceAccessResponse
-  = EnterpriseAppDeployConsoleGetAppInstanceAccessResponses[keyof EnterpriseAppDeployConsoleGetAppInstanceAccessResponses]
-
-export type EnterpriseAppDeployConsoleUpdateAccessChannelsData = {
-  body: UpdateAccessChannelsReq
-  path: {
-    appInstanceId: string
-  }
-  query?: never
-  url: '/enterprise/app-instances/{appInstanceId}/access-channels'
-}
-
-export type EnterpriseAppDeployConsoleUpdateAccessChannelsResponses = {
-  200: UpdateAccessChannelsReply
-}
-
-export type EnterpriseAppDeployConsoleUpdateAccessChannelsResponse
-  = EnterpriseAppDeployConsoleUpdateAccessChannelsResponses[keyof EnterpriseAppDeployConsoleUpdateAccessChannelsResponses]
-
-export type EnterpriseAppDeployConsoleSearchAccessSubjectsData = {
-  body?: never
-  path: {
-    appInstanceId: string
-  }
-  query?: {
-    keyword?: string
-    subjectTypes?: Array<string>
-  }
-  url: '/enterprise/app-instances/{appInstanceId}/access-subjects:search'
-}
-
-export type EnterpriseAppDeployConsoleSearchAccessSubjectsResponses = {
-  200: SearchAccessSubjectsReply
-}
-
-export type EnterpriseAppDeployConsoleSearchAccessSubjectsResponse
-  = EnterpriseAppDeployConsoleSearchAccessSubjectsResponses[keyof EnterpriseAppDeployConsoleSearchAccessSubjectsResponses]
-
-export type EnterpriseAppDeployConsoleCreateDeveloperApiKeyData = {
-  body: CreateDeveloperApiKeyReq
-  path: {
-    appInstanceId: string
-  }
-  query?: never
-  url: '/enterprise/app-instances/{appInstanceId}/api-keys'
-}
-
-export type EnterpriseAppDeployConsoleCreateDeveloperApiKeyResponses = {
-  200: CreateDeveloperApiKeyReply
-}
-
-export type EnterpriseAppDeployConsoleCreateDeveloperApiKeyResponse
-  = EnterpriseAppDeployConsoleCreateDeveloperApiKeyResponses[keyof EnterpriseAppDeployConsoleCreateDeveloperApiKeyResponses]
-
-export type EnterpriseAppDeployConsoleDeleteDeveloperApiKeyData = {
-  body?: never
-  path: {
-    appInstanceId: string
-    apiKeyId: string
-  }
-  query?: never
-  url: '/enterprise/app-instances/{appInstanceId}/api-keys/{apiKeyId}'
-}
-
-export type EnterpriseAppDeployConsoleDeleteDeveloperApiKeyResponses = {
-  200: DeleteDeveloperApiKeyReply
-}
-
-export type EnterpriseAppDeployConsoleDeleteDeveloperApiKeyResponse
-  = EnterpriseAppDeployConsoleDeleteDeveloperApiKeyResponses[keyof EnterpriseAppDeployConsoleDeleteDeveloperApiKeyResponses]
-
-export type EnterpriseAppDeployConsoleListDeploymentBindingOptionsData = {
-  body?: never
-  path: {
-    appInstanceId: string
-  }
-  query?: never
-  url: '/enterprise/app-instances/{appInstanceId}/deployment-binding-options'
-}
-
-export type EnterpriseAppDeployConsoleListDeploymentBindingOptionsResponses = {
-  200: ListDeploymentBindingOptionsReply
-}
-
-export type EnterpriseAppDeployConsoleListDeploymentBindingOptionsResponse
-  = EnterpriseAppDeployConsoleListDeploymentBindingOptionsResponses[keyof EnterpriseAppDeployConsoleListDeploymentBindingOptionsResponses]
-
-export type EnterpriseAppDeployConsoleCreateDeploymentData = {
-  body: CreateDeploymentReq
-  path: {
-    appInstanceId: string
-  }
-  query?: never
-  url: '/enterprise/app-instances/{appInstanceId}/deployments'
-}
-
-export type EnterpriseAppDeployConsoleCreateDeploymentResponses = {
-  200: CreateDeploymentReply
-}
-
-export type EnterpriseAppDeployConsoleCreateDeploymentResponse
-  = EnterpriseAppDeployConsoleCreateDeploymentResponses[keyof EnterpriseAppDeployConsoleCreateDeploymentResponses]
-
-export type EnterpriseAppDeployConsoleUpdateDeveloperApiData = {
-  body: UpdateDeveloperApiReq
-  path: {
-    appInstanceId: string
-  }
-  query?: never
-  url: '/enterprise/app-instances/{appInstanceId}/developer-api'
-}
-
-export type EnterpriseAppDeployConsoleUpdateDeveloperApiResponses = {
-  200: UpdateDeveloperApiReply
-}
-
-export type EnterpriseAppDeployConsoleUpdateDeveloperApiResponse
-  = EnterpriseAppDeployConsoleUpdateDeveloperApiResponses[keyof EnterpriseAppDeployConsoleUpdateDeveloperApiResponses]
-
-export type EnterpriseAppDeployConsoleGetEnvironmentAccessPolicyData = {
-  body?: never
-  path: {
-    appInstanceId: string
-    environmentId: string
-  }
-  query?: never
-  url: '/enterprise/app-instances/{appInstanceId}/environments/{environmentId}/access-policy'
-}
-
-export type EnterpriseAppDeployConsoleGetEnvironmentAccessPolicyResponses = {
-  200: GetEnvironmentAccessPolicyReply
-}
-
-export type EnterpriseAppDeployConsoleGetEnvironmentAccessPolicyResponse
-  = EnterpriseAppDeployConsoleGetEnvironmentAccessPolicyResponses[keyof EnterpriseAppDeployConsoleGetEnvironmentAccessPolicyResponses]
-
-export type EnterpriseAppDeployConsoleUpdateEnvironmentAccessPolicyData = {
-  body: UpdateEnvironmentAccessPolicyReq
-  path: {
-    appInstanceId: string
-    environmentId: string
-  }
-  query?: never
-  url: '/enterprise/app-instances/{appInstanceId}/environments/{environmentId}/access-policy'
-}
-
-export type EnterpriseAppDeployConsoleUpdateEnvironmentAccessPolicyResponses = {
-  200: UpdateEnvironmentAccessPolicyReply
-}
-
-export type EnterpriseAppDeployConsoleUpdateEnvironmentAccessPolicyResponse
-  = EnterpriseAppDeployConsoleUpdateEnvironmentAccessPolicyResponses[keyof EnterpriseAppDeployConsoleUpdateEnvironmentAccessPolicyResponses]
-
-export type EnterpriseAppDeployConsoleGetAppInstanceOverviewData = {
-  body?: never
-  path: {
-    appInstanceId: string
-  }
-  query?: never
-  url: '/enterprise/app-instances/{appInstanceId}/overview'
-}
-
-export type EnterpriseAppDeployConsoleGetAppInstanceOverviewResponses = {
-  200: GetAppInstanceOverviewReply
-}
-
-export type EnterpriseAppDeployConsoleGetAppInstanceOverviewResponse
-  = EnterpriseAppDeployConsoleGetAppInstanceOverviewResponses[keyof EnterpriseAppDeployConsoleGetAppInstanceOverviewResponses]
-
-export type EnterpriseAppDeployConsoleListReleasesData = {
-  body?: never
-  path: {
-    appInstanceId: string
-  }
-  query?: {
-    pageNumber?: number
-    resultsPerPage?: number
-  }
-  url: '/enterprise/app-instances/{appInstanceId}/releases'
-}
-
-export type EnterpriseAppDeployConsoleListReleasesResponses = {
-  200: ListReleasesReply
-}
-
-export type EnterpriseAppDeployConsoleListReleasesResponse
-  = EnterpriseAppDeployConsoleListReleasesResponses[keyof EnterpriseAppDeployConsoleListReleasesResponses]
-
-export type EnterpriseAppDeployConsoleCreateReleaseData = {
-  body: CreateReleaseReq
-  path: {
-    appInstanceId: string
-  }
-  query?: never
-  url: '/enterprise/app-instances/{appInstanceId}/releases'
-}
-
-export type EnterpriseAppDeployConsoleCreateReleaseResponses = {
-  200: CreateReleaseReply
-}
-
-export type EnterpriseAppDeployConsoleCreateReleaseResponse
-  = EnterpriseAppDeployConsoleCreateReleaseResponses[keyof EnterpriseAppDeployConsoleCreateReleaseResponses]
-
-export type EnterpriseAppDeployConsolePreviewReleaseData = {
-  body: PreviewReleaseReq
-  path: {
-    appInstanceId: string
-  }
-  query?: never
-  url: '/enterprise/app-instances/{appInstanceId}/releases:preview'
-}
-
-export type EnterpriseAppDeployConsolePreviewReleaseResponses = {
-  200: PreviewReleaseReply
-}
-
-export type EnterpriseAppDeployConsolePreviewReleaseResponse
-  = EnterpriseAppDeployConsolePreviewReleaseResponses[keyof EnterpriseAppDeployConsolePreviewReleaseResponses]
-
-export type EnterpriseAppDeployConsoleListRuntimeInstancesData = {
-  body?: never
-  path: {
-    appInstanceId: string
-  }
-  query?: never
-  url: '/enterprise/app-instances/{appInstanceId}/runtime-instances'
-}
-
-export type EnterpriseAppDeployConsoleListRuntimeInstancesResponses = {
-  200: ListRuntimeInstancesReply
-}
-
-export type EnterpriseAppDeployConsoleListRuntimeInstancesResponse
-  = EnterpriseAppDeployConsoleListRuntimeInstancesResponses[keyof EnterpriseAppDeployConsoleListRuntimeInstancesResponses]
-
-export type EnterpriseAppDeployConsoleCancelRuntimeDeploymentData = {
-  body: CancelRuntimeDeploymentReq
-  path: {
-    appInstanceId: string
-    runtimeInstanceId: string
-  }
-  query?: never
-  url: '/enterprise/app-instances/{appInstanceId}/runtime-instances/{runtimeInstanceId}/deployment:cancel'
-}
-
-export type EnterpriseAppDeployConsoleCancelRuntimeDeploymentResponses = {
-  200: CancelRuntimeDeploymentReply
-}
-
-export type EnterpriseAppDeployConsoleCancelRuntimeDeploymentResponse
-  = EnterpriseAppDeployConsoleCancelRuntimeDeploymentResponses[keyof EnterpriseAppDeployConsoleCancelRuntimeDeploymentResponses]
-
-export type EnterpriseAppDeployConsoleUndeployRuntimeInstanceData = {
-  body: UndeployRuntimeInstanceReq
-  path: {
-    appInstanceId: string
-    runtimeInstanceId: string
-  }
-  query?: never
-  url: '/enterprise/app-instances/{appInstanceId}/runtime-instances/{runtimeInstanceId}:undeploy'
-}
-
-export type EnterpriseAppDeployConsoleUndeployRuntimeInstanceResponses = {
-  200: UndeployRuntimeInstanceReply
-}
-
-export type EnterpriseAppDeployConsoleUndeployRuntimeInstanceResponse
-  = EnterpriseAppDeployConsoleUndeployRuntimeInstanceResponses[keyof EnterpriseAppDeployConsoleUndeployRuntimeInstanceResponses]
-
-export type EnterpriseAppDeployConsoleGetAppInstanceSettingsData = {
-  body?: never
-  path: {
-    appInstanceId: string
-  }
-  query?: never
-  url: '/enterprise/app-instances/{appInstanceId}/settings'
-}
-
-export type EnterpriseAppDeployConsoleGetAppInstanceSettingsResponses = {
-  200: GetAppInstanceSettingsReply
-}
-
-export type EnterpriseAppDeployConsoleGetAppInstanceSettingsResponse
-  = EnterpriseAppDeployConsoleGetAppInstanceSettingsResponses[keyof EnterpriseAppDeployConsoleGetAppInstanceSettingsResponses]
-
-export type EnterpriseAppDeployConsoleListDeploymentEnvironmentOptionsData = {
-  body?: never
-  path?: never
-  query?: never
-  url: '/enterprise/deployment-environment-options'
-}
-
-export type EnterpriseAppDeployConsoleListDeploymentEnvironmentOptionsResponses = {
-  200: ListDeploymentEnvironmentOptionsReply
-}
-
-export type EnterpriseAppDeployConsoleListDeploymentEnvironmentOptionsResponse
-  = EnterpriseAppDeployConsoleListDeploymentEnvironmentOptionsResponses[keyof EnterpriseAppDeployConsoleListDeploymentEnvironmentOptionsResponses]
-
 export type ConsoleSsoOAuth2LoginData = {
   body?: never
   path?: never
diff --git a/packages/contracts/generated/enterprise/zod.gen.ts b/packages/contracts/generated/enterprise/zod.gen.ts
index 1e7e3d44ae..cef500a906 100644
--- a/packages/contracts/generated/enterprise/zod.gen.ts
+++ b/packages/contracts/generated/enterprise/zod.gen.ts
@@ -2,44 +2,6 @@
 
 import * as z from 'zod'
 
-export const zAccessModeOption = z.object({
-  mode: z.string().optional(),
-  label: z.string().optional(),
-  disabled: z.boolean().optional(),
-  selected: z.boolean().optional(),
-})
-
-export const zAccessStatus = z.object({
-  accessChannelsEnabled: z.boolean().optional(),
-  webappUrl: z.string().optional(),
-  cliUrl: z.string().optional(),
-  developerApiEnabled: z.boolean().optional(),
-  apiKeyCount: z
-    .int()
-    .min(-2147483648, { error: 'Invalid value: Expected int32 to be >= -2147483648' })
-    .max(2147483647, { error: 'Invalid value: Expected int32 to be <= 2147483647' })
-    .optional(),
-})
-
-export const zAccessSubject = z.object({
-  subjectId: z.string().optional(),
-  subjectType: z.string().optional(),
-})
-
-export const zAccessSubjectDisplay = z.object({
-  id: z.string().optional(),
-  subjectType: z.string().optional(),
-  name: z.string().optional(),
-  avatarUrl: z.string().optional(),
-  memberCount: z.string().optional(),
-})
-
-export const zAccessPolicyDetail = z.object({
-  accessMode: z.string().optional(),
-  subjects: z.array(zAccessSubjectDisplay).optional(),
-  options: z.array(zAccessModeOption).optional(),
-})
-
 /**
  * Account represents a basic user account
  */
@@ -75,101 +37,9 @@ export const zAccountDetail = z.object({
   groups: z.array(zAccountDetailGroup).optional(),
 })
 
-export const zAckDeploymentReply = z.object({
-  accepted: z.boolean().optional(),
-  newVersion: z.string().optional(),
-})
-
-export const zAppInstanceBasicInfo = z.object({
+export const zAddGroupAppsRequest = z.object({
   id: z.string().optional(),
-  name: z.string().optional(),
-  description: z.string().optional(),
-  sourceAppId: z.string().optional(),
-  sourceAppName: z.string().optional(),
-  mode: z.string().optional(),
-  createdAt: z.iso.datetime().optional(),
-})
-
-export const zAppRunnerBootstrapAssignment = z.object({
-  appId: z.string().optional(),
-  environmentId: z.string().optional(),
-  workflowId: z.string().optional(),
-  instanceId: z.string().optional(),
-  workspaceId: z.string().optional(),
-  instanceVersion: z.string().optional(),
-  bindingSnapshotVersion: z.string().optional(),
-  executionTokenVersion: z.string().optional(),
-  executionToken: z.string().optional(),
-  releaseId: z.string().optional(),
-})
-
-export const zAppRunnerBootstrapReply = z.object({
-  runnerId: z.string().optional(),
-  assignmentRevision: z.string().optional(),
-  assignments: z.array(zAppRunnerBootstrapAssignment).optional(),
-})
-
-export const zAppRunnerRunnerInfo = z.object({
-  hostname: z.string().optional(),
-})
-
-export const zAppRunnerBootstrapRequest = z.object({
-  runner: zAppRunnerRunnerInfo.optional(),
-})
-
-export const zAppRunnerRuntimeArtifactReply = z.object({
-  dslYaml: z.string().optional(),
-  bindingSnapshotVersion: z.string().optional(),
-  bindingSnapshot: z.record(z.string(), z.unknown()).optional(),
-})
-
-export const zAppRunnerRuntimeArtifactRequest = z.object({
-  instanceId: z.string().optional(),
-  releaseId: z.string().optional(),
-  bindingSnapshotVersion: z.string().optional(),
-})
-
-export const zAppRunnerBatchRuntimeArtifactRequest = z.object({
-  artifacts: z.array(zAppRunnerRuntimeArtifactRequest).optional(),
-})
-
-export const zAppRunnerRuntimeArtifactResult = z.object({
-  instanceId: z.string().optional(),
-  releaseId: z.string().optional(),
-  artifact: zAppRunnerRuntimeArtifactReply.optional(),
-  errorCode: z.string().optional(),
-  errorMessage: z.string().optional(),
-})
-
-export const zAppRunnerBatchRuntimeArtifactReply = z.object({
-  results: z.array(zAppRunnerRuntimeArtifactResult).optional(),
-})
-
-export const zAppRunnerTokenExchangeReply = z.object({
-  accessToken: z.string().optional(),
-  expiresAt: z.iso.datetime().optional(),
-})
-
-export const zAppRunnerTokenExchangeRequest = z.object({
-  joinToken: z.string().optional(),
-})
-
-/**
- * BootstrapProgress is step-list-agnostic. Reconcilers emit step names as
- * strings owned by each executor (e.g. "connectivity", "namespace"), so adding
- * or removing steps does not break the API.
- */
-export const zBootstrapProgress = z.object({
-  currentStep: z.string().optional(),
-  completedSteps: z.array(z.string()).optional(),
-  attemptCount: z
-    .int()
-    .min(-2147483648, { error: 'Invalid value: Expected int32 to be >= -2147483648' })
-    .max(2147483647, { error: 'Invalid value: Expected int32 to be <= 2147483647' })
-    .optional(),
-  lastAttemptAt: z.iso.datetime().optional(),
-  lastErrorCode: z.string().optional(),
-  lastErrorMessage: z.string().optional(),
+  app_ids: z.array(z.string()).optional(),
 })
 
 export const zBrandingInfo = z.object({
@@ -180,15 +50,6 @@ export const zBrandingInfo = z.object({
   favicon: z.string().optional(),
 })
 
-export const zCancelRuntimeDeploymentReply = z.object({
-  status: z.string().optional(),
-})
-
-export const zCancelRuntimeDeploymentReq = z.object({
-  appInstanceId: z.string().optional(),
-  runtimeInstanceId: z.string().optional(),
-})
-
 export const zCheckPasswordStatusReply = z.object({
   requirePasswordChange: z.boolean().optional(),
   changeReason: z.int().optional(),
@@ -202,57 +63,10 @@ export const zCheckPasswordStatusReply = z.object({
 
 export const zClearDefaultWorkspaceReply = z.record(z.string(), z.unknown())
 
-export const zCliAccess = z.object({
-  url: z.string().optional(),
-})
-
-export const zConsoleEnvironment = z.object({
-  id: z.string().optional(),
-  name: z.string().optional(),
-  runtime: z.string().optional(),
-  type: z.string().optional(),
-  status: z.string().optional(),
-})
-
-export const zConsoleRelease = z.object({
-  id: z.string().optional(),
-  name: z.string().optional(),
-  shortCommitId: z.string().optional(),
-  createdAt: z.iso.datetime().optional(),
-})
-
-export const zConsoleUser = z.object({
-  id: z.string().optional(),
-  name: z.string().optional(),
-})
-
-export const zCreateAppInstanceReply = z.object({
-  appInstanceId: z.string().optional(),
-  initialRelease: zConsoleRelease.optional(),
-})
-
-export const zCreateAppInstanceReq = z.object({
-  sourceAppId: z.string().optional(),
-  name: z.string().optional(),
-  description: z.string().optional(),
-})
-
 export const zCreateBearerTokenResponse = z.object({
   token: z.string().optional(),
 })
 
-export const zCreateDeploymentReply = z.object({
-  runtimeInstanceId: z.string().optional(),
-  deploymentId: z.string().optional(),
-  status: z.string().optional(),
-})
-
-export const zCreateDeveloperApiKeyReq = z.object({
-  appInstanceId: z.string().optional(),
-  environmentId: z.string().optional(),
-  name: z.string().optional(),
-})
-
 export const zCreateMemberReply = z.object({
   id: z.string().optional(),
   password: z.string().optional(),
@@ -275,12 +89,7 @@ export const zCreateNewGroupsReq = z.object({
   groups: z.array(zCreateNewGroupsReqGroup).optional(),
 })
 
-export const zCreateReleaseReply = z.object({
-  release: zConsoleRelease.optional(),
-})
-
-export const zCreateReleaseReq = z.object({
-  appInstanceId: z.string().optional(),
+export const zCreateResourceGroupRequest = z.object({
   name: z.string().optional(),
   description: z.string().optional(),
 })
@@ -342,21 +151,10 @@ export const zDashboardSsosamlLoginReply = z.object({
   url: z.string().optional(),
 })
 
-export const zDeleteAppInstanceReply = z.record(z.string(), z.unknown())
-
-export const zDeleteDeveloperApiKeyReply = z.record(z.string(), z.unknown())
-
-export const zDeleteEnvironmentReply = z.record(z.string(), z.unknown())
-
 export const zDeleteGroupsRes = z.object({
   message: z.string().optional(),
 })
 
-export const zDeleteGuard = z.object({
-  canDelete: z.boolean().optional(),
-  disabledReason: z.string().optional(),
-})
-
 export const zDeleteMemberReply = z.object({
   account: zAccount.optional(),
 })
@@ -371,82 +169,6 @@ export const zDeleteUserReply = z.object({
 
 export const zDeleteWorkspaceReply = z.record(z.string(), z.unknown())
 
-export const zDeployedEnvironment = z.object({
-  environmentId: z.string().optional(),
-  environmentName: z.string().optional(),
-})
-
-export const zDeploymentCredentialOption = z.object({
-  credentialId: z.string().optional(),
-  displayName: z.string().optional(),
-  pluginId: z.string().optional(),
-  pluginName: z.string().optional(),
-  pluginVersion: z.string().optional(),
-})
-
-export const zDeploymentEnvVarOption = z.object({
-  envVarId: z.string().optional(),
-  name: z.string().optional(),
-  valueType: z.string().optional(),
-  displayValue: z.string().optional(),
-})
-
-export const zDeploymentBindingOptionSlot = z.object({
-  slot: z.string().optional(),
-  kind: z.string().optional(),
-  label: z.string().optional(),
-  required: z.boolean().optional(),
-  candidates: z.array(zDeploymentCredentialOption).optional(),
-  envVarCandidates: z.array(zDeploymentEnvVarOption).optional(),
-})
-
-export const zDeploymentEnvironmentOption = z.object({
-  id: z.string().optional(),
-  name: z.string().optional(),
-  type: z.string().optional(),
-  backend: z.string().optional(),
-  status: z.string().optional(),
-  managedBy: z.string().optional(),
-  deployable: z.boolean().optional(),
-  disabledReason: z.string().optional(),
-})
-
-export const zDeploymentRuntimeBinding = z.object({
-  slot: z.string().optional(),
-  credentialId: z.string().optional(),
-  envVarId: z.string().optional(),
-})
-
-export const zCreateDeploymentReq = z.object({
-  appInstanceId: z.string().optional(),
-  environmentId: z.string().optional(),
-  releaseId: z.string().optional(),
-  bindings: z.array(zDeploymentRuntimeBinding).optional(),
-})
-
-export const zDeploymentStatusRow = z.object({
-  environment: zConsoleEnvironment.optional(),
-  release: zConsoleRelease.optional(),
-  status: z.string().optional(),
-})
-
-export const zDeveloperApiKeyRow = z.object({
-  id: z.string().optional(),
-  name: z.string().optional(),
-  environment: zConsoleEnvironment.optional(),
-  maskedKey: z.string().optional(),
-})
-
-export const zCreateDeveloperApiKeyReply = z.object({
-  apiKey: zDeveloperApiKeyRow.optional(),
-  token: z.string().optional(),
-})
-
-export const zDeveloperApiAccess = z.object({
-  enabled: z.boolean().optional(),
-  apiKeys: z.array(zDeveloperApiKeyRow).optional(),
-})
-
 /**
  * System user setting messages
  */
@@ -456,53 +178,6 @@ export const zEnterpriseSystemUserSettingReply = z.object({
   enableEmailPasswordLogin: z.boolean().optional(),
 })
 
-export const zEnvironment = z.object({
-  id: z.string().optional(),
-  name: z.string().optional(),
-  description: z.string().optional(),
-  mode: z.int().optional(),
-  namespace: z.string().optional(),
-  apiServer: z.string().optional(),
-  status: z.int().optional(),
-  statusMessage: z.string().optional(),
-  bootstrapProgress: zBootstrapProgress.optional(),
-  managedBy: z.string().optional(),
-  createdAt: z.iso.datetime().optional(),
-  updatedAt: z.iso.datetime().optional(),
-  backend: z.int().optional(),
-  host: z.string().optional(),
-})
-
-export const zCreateEnvironmentReply = z.object({
-  environment: zEnvironment.optional(),
-})
-
-export const zEnvironmentAccessRow = z.object({
-  environment: zConsoleEnvironment.optional(),
-  currentRelease: zConsoleRelease.optional(),
-  accessMode: z.string().optional(),
-  accessModeLabel: z.string().optional(),
-  hint: z.string().optional(),
-})
-
-export const zEnvironmentFilter = z.object({
-  id: z.string().optional(),
-  name: z.string().optional(),
-  kind: z.string().optional(),
-})
-
-export const zGetAppInstanceOverviewReply = z.object({
-  instance: zAppInstanceBasicInfo.optional(),
-  deployments: z.array(zDeploymentStatusRow).optional(),
-  access: zAccessStatus.optional(),
-})
-
-export const zGetAppInstanceSettingsReply = z.object({
-  name: z.string().optional(),
-  description: z.string().optional(),
-  deleteGuard: zDeleteGuard.optional(),
-})
-
 export const zGetBearerTokenResponse = z.object({
   maskedToken: z.string().optional(),
 })
@@ -513,23 +188,6 @@ export const zGetClusterInfoReply = z.object({
   verifyMode: z.string().optional(),
 })
 
-export const zGetEnvironmentAccessPolicyReply = z.object({
-  policy: zAccessPolicyDetail.optional(),
-})
-
-export const zGetEnvironmentReply = z.object({
-  environment: zEnvironment.optional(),
-})
-
-export const zGetInstanceReply = z.object({
-  instanceId: z.string().optional(),
-  status: z.string().optional(),
-  desiredReleaseId: z.string().optional(),
-  observedReleaseId: z.string().optional(),
-  currentDeploymentId: z.string().optional(),
-  version: z.string().optional(),
-})
-
 export const zGetLicenseStatusReply = z.object({
   status: z.string().optional(),
 })
@@ -565,14 +223,25 @@ export const zGetWebAppWhitelistSubjectsResMember = z.object({
   avatar: z.string().optional(),
 })
 
+export const zGroupAppItem = z.object({
+  app_id: z.string().optional(),
+  app_name: z.string().optional(),
+  workspace_id: z.string().optional(),
+  workspace_name: z.string().optional(),
+  app_status: z.int().optional(),
+  token_usage: z.string().optional(),
+  rpm: z.string().optional(),
+  concurrency: z.string().optional(),
+})
+
 export const zHealthzReply = z.object({
   message: z.string().optional(),
   status: z.string().optional(),
 })
 
-export const zHostEnvironmentConfig = z.object({
-  machineId: z.string().optional(),
-  joinTokenHash: z.string().optional(),
+export const zInnerAdmission = z.object({
+  marker: z.string().optional(),
+  concurrencyGroupIds: z.array(z.string()).optional(),
 })
 
 export const zInnerBatchGetWebAppAccessModesByIdReq = z.object({
@@ -592,50 +261,10 @@ export const zInnerBatchIsUserAllowedToAccessWebAppRes = z.object({
   permissions: z.record(z.string(), z.boolean()).optional(),
 })
 
-export const zInnerCheckAppDeployAccessReply = z.object({
-  allowed: z.boolean().optional(),
-  matchedPolicyId: z.string().optional(),
-  matchedScopeType: z.string().optional(),
-  reason: z.string().optional(),
-  cacheTtlSeconds: z
-    .int()
-    .min(-2147483648, { error: 'Invalid value: Expected int32 to be >= -2147483648' })
-    .max(2147483647, { error: 'Invalid value: Expected int32 to be <= 2147483647' })
-    .optional(),
-})
-
-export const zInnerCheckAppDeployAccessReq = z.object({
-  appInstanceId: z.string().optional(),
-  environmentId: z.string().optional(),
-  principalType: z.string().optional(),
-  principalId: z.string().optional(),
-})
-
 export const zInnerCleanAppRes = z.object({
   message: z.string().optional(),
 })
 
-export const zInnerGetTokenRouteReply = z.object({
-  environmentId: z.string().optional(),
-  namespace: z.string().optional(),
-  serviceName: z.string().optional(),
-  servicePort: z
-    .int()
-    .min(-2147483648, { error: 'Invalid value: Expected int32 to be >= -2147483648' })
-    .max(2147483647, { error: 'Invalid value: Expected int32 to be <= 2147483647' })
-    .optional(),
-  environmentStatus: z.string().optional(),
-  appId: z.string().optional(),
-  tenantId: z.string().optional(),
-  instanceId: z.string().optional(),
-  observedReleaseId: z.string().optional(),
-  instanceStatus: z.string().optional(),
-})
-
-export const zInnerGetTokenRouteReq = z.object({
-  token: z.string().optional(),
-})
-
 export const zInnerGetWebAppAccessModeByCodeRes = z.object({
   accessMode: z.string().optional(),
 })
@@ -648,6 +277,12 @@ export const zInnerIsUserAllowedToAccessWebAppRes = z.object({
   result: z.boolean().optional(),
 })
 
+export const zInnerReleaseAdmissionRequest = z.object({
+  admission: zInnerAdmission.optional(),
+})
+
+export const zInnerReleaseAdmissionResponse = z.record(z.string(), z.unknown())
+
 export const zInnerTryAddAccountToDefaultWorkspaceReply = z.object({
   workspaceId: z.string().optional(),
   joined: z.boolean().optional(),
@@ -678,48 +313,32 @@ export const zJoinWorkspaceReq = z.object({
   role: z.string().optional(),
 })
 
-export const zK8sEnvironmentConfig = z.object({
-  namespace: z.string().optional(),
-  apiServer: z.string().optional(),
-  caBundle: z.string().optional(),
-  bearerToken: z.string().optional(),
+export const zLimitConfig = z.object({
+  type: z.int().optional(),
+  threshold: z.string().optional(),
+  action: z.int().optional(),
+  reached: z.boolean().optional(),
 })
 
-/**
- * Field-level validation only; target (api_server) and RBAC validation happen
- * in the bootstrap reconciler.
- */
-export const zCreateEnvironmentReq = z.object({
-  name: z.string().optional(),
-  description: z.string().optional(),
-  mode: z.int().optional(),
-  backend: z.int().optional(),
-  k8s: zK8sEnvironmentConfig.optional(),
-  host: zHostEnvironmentConfig.optional(),
+export const zInnerGroupConfig = z.object({
+  id: z.string().optional(),
+  enabled: z.boolean().optional(),
+  membershipId: z.string().optional(),
+  limits: z.array(zLimitConfig).optional(),
 })
 
-export const zLastError = z.object({
-  phase: z.string().optional(),
-  code: z.string().optional(),
-  message: z.string().optional(),
-  releaseId: z.string().optional(),
+export const zInnerResolveResponse = z.object({
+  appId: z.string().optional(),
+  groups: z.array(zInnerGroupConfig).optional(),
+  blocked: z.boolean().optional(),
+  blockGroupId: z.string().optional(),
+  blockReason: z.string().optional(),
+  admission: zInnerAdmission.optional(),
 })
 
-export const zAckDeploymentReq = z.object({
-  deploymentId: z.string().optional(),
-  instanceId: z.string().optional(),
-  expectedVersion: z.string().optional(),
-  status: z.string().optional(),
-  observedReleaseId: z.string().optional(),
-  lastError: zLastError.optional(),
-})
-
-export const zListDeploymentBindingOptionsReply = z.object({
-  slots: z.array(zDeploymentBindingOptionSlot).optional(),
-})
-
-export const zListDeploymentEnvironmentOptionsReply = z.object({
-  environments: z.array(zDeploymentEnvironmentOption).optional(),
+export const zListGroupAppsResponse = z.object({
+  items: z.array(zGroupAppItem).optional(),
+  total: z.string().optional(),
 })
 
 export const zLoginTypesReply = z.object({
@@ -871,31 +490,6 @@ export const zPluginInstallationSettingsReply = z.object({
   restrictToMarketplaceOnly: z.boolean().optional(),
 })
 
-export const zPreviewReleaseReq = z.object({
-  appInstanceId: z.string().optional(),
-  releaseId: z.string().optional(),
-})
-
-export const zReleaseRow = z.object({
-  id: z.string().optional(),
-  name: z.string().optional(),
-  createdAt: z.iso.datetime().optional(),
-  createdBy: zConsoleUser.optional(),
-  deployedTo: z.array(zDeployedEnvironment).optional(),
-})
-
-export const zReleaseRuntimeBinding = z.object({
-  kind: z.string().optional(),
-  label: z.string().optional(),
-  displayValue: z.string().optional(),
-  valueType: z.string().optional(),
-})
-
-export const zPreviewReleaseReply = z.object({
-  release: zConsoleRelease.optional(),
-  bindings: z.array(zReleaseRuntimeBinding).optional(),
-})
-
 export const zResetMemberPasswordReply = z.object({
   id: z.string().optional(),
   password: z.string().optional(),
@@ -930,26 +524,56 @@ export const zResetUserPasswordReq = z.object({
   id: z.string().optional(),
 })
 
-export const zResolveCredentialsReq = z.object({
-  instanceId: z.string().optional(),
-  deploymentId: z.string().optional(),
-  slots: z.array(z.string()).optional(),
+export const zResourceGroupDetail = z.object({
+  id: z.string().optional(),
+  name: z.string().optional(),
+  description: z.string().optional(),
+  enabled: z.boolean().optional(),
+  rpm_limit: z
+    .int()
+    .min(-2147483648, { error: 'Invalid value: Expected int32 to be >= -2147483648' })
+    .max(2147483647, { error: 'Invalid value: Expected int32 to be <= 2147483647' })
+    .optional(),
+  rpm_action: z.int().optional(),
+  concurrency_limit: z
+    .int()
+    .min(-2147483648, { error: 'Invalid value: Expected int32 to be >= -2147483648' })
+    .max(2147483647, { error: 'Invalid value: Expected int32 to be <= 2147483647' })
+    .optional(),
+  concurrency_action: z.int().optional(),
+  token_quota: z.string().optional(),
+  token_action: z.int().optional(),
+  created_at: z.string().optional(),
+  updated_at: z.string().optional(),
 })
 
-/**
- * Exactly one of credential_id / env_var_id is populated; model/plugin slots
- * carry credential_id (pool A), env_var slots carry env_var_id (pool B).
- * See design §4.1.
- */
-export const zResolvedCredential = z.object({
-  slot: z.string().optional(),
-  credentialId: z.string().optional(),
-  envVarId: z.string().optional(),
-  value: z.string().optional(),
+export const zResourceGroupItem = z.object({
+  id: z.string().optional(),
+  name: z.string().optional(),
+  description: z.string().optional(),
+  enabled: z.boolean().optional(),
+  rpm_limit: z
+    .int()
+    .min(-2147483648, { error: 'Invalid value: Expected int32 to be >= -2147483648' })
+    .max(2147483647, { error: 'Invalid value: Expected int32 to be <= 2147483647' })
+    .optional(),
+  concurrency_limit: z
+    .int()
+    .min(-2147483648, { error: 'Invalid value: Expected int32 to be >= -2147483648' })
+    .max(2147483647, { error: 'Invalid value: Expected int32 to be <= 2147483647' })
+    .optional(),
+  token_quota: z.string().optional(),
+  token_usage: z.string().optional(),
+  app_count: z.string().optional(),
+  rpm_status: z.int().optional(),
+  conc_status: z.int().optional(),
+  created_at: z.string().optional(),
+  updated_at: z.string().optional(),
 })
 
-export const zResolveCredentialsReply = z.object({
-  resolved: z.array(zResolvedCredential).optional(),
+export const zListResourceGroupsResponse = z.object({
+  items: z.array(zResourceGroupItem).optional(),
+  total: z.string().optional(),
 })
 
 /**
@@ -1002,44 +626,6 @@ export const zGetLicenseReply = z.object({
   license: zLicenseInfo.optional(),
 })
 
-export const zRetryEnvironmentReply = z.object({
-  environment: zEnvironment.optional(),
-})
-
-export const zRetryEnvironmentReq = z.object({
-  id: z.string().optional(),
-})
-
-export const zRuntimeEndpoints = z.object({
-  run: z.string().optional(),
-  health: z.string().optional(),
-})
-
-export const zRuntimeInstanceDetail = z.object({
-  deploymentName: z.string().optional(),
-  replicas: z
-    .int()
-    .min(-2147483648, { error: 'Invalid value: Expected int32 to be >= -2147483648' })
-    .max(2147483647, { error: 'Invalid value: Expected int32 to be <= 2147483647' })
-    .optional(),
-  runtimeMode: z.string().optional(),
-  runtimeNote: z.string().optional(),
-  endpoints: zRuntimeEndpoints.optional(),
-  bindings: z.array(zReleaseRuntimeBinding).optional(),
-})
-
-export const zRuntimeInstanceRow = z.object({
-  id: z.string().optional(),
-  environment: zConsoleEnvironment.optional(),
-  status: z.string().optional(),
-  currentRelease: zConsoleRelease.optional(),
-  detail: zRuntimeInstanceDetail.optional(),
-})
-
-export const zListRuntimeInstancesReply = z.object({
-  data: z.array(zRuntimeInstanceRow).optional(),
-})
-
 /**
  * SSO Configuration messages
  */
@@ -1102,8 +688,21 @@ export const zScimSettings = z.object({
   lastSyncTime: z.iso.datetime().optional(),
 })
 
-export const zSearchAccessSubjectsReply = z.object({
-  data: z.array(zAccessSubjectDisplay).optional(),
+export const zSearchAppItem = z.object({
+  app_id: z.string().optional(),
+  app_name: z.string().optional(),
+  workspace_id: z.string().optional(),
+  workspace_name: z.string().optional(),
+  app_status: z.int().optional(),
+  icon: z.string().optional(),
+  icon_type: z.string().optional(),
+  icon_background: z.string().optional(),
+  created_by_name: z.string().optional(),
+})
+
+export const zSearchAppsResponse = z.object({
+  items: z.array(zSearchAppItem).optional(),
+  total: z.string().optional(),
 })
 
 export const zSecretKey = z.object({
@@ -1122,25 +721,6 @@ export const zSetDefaultWorkspaceReq = z.object({
   id: z.string().optional(),
 })
 
-export const zStatusCount = z.object({
-  status: z.string().optional(),
-  count: z
-    .int()
-    .min(-2147483648, { error: 'Invalid value: Expected int32 to be >= -2147483648' })
-    .max(2147483647, { error: 'Invalid value: Expected int32 to be <= 2147483647' })
-    .optional(),
-})
-
-export const zAppInstanceCard = z.object({
-  id: z.string().optional(),
-  name: z.string().optional(),
-  icon: z.string().optional(),
-  mode: z.string().optional(),
-  sourceAppName: z.string().optional(),
-  statuses: z.array(zStatusCount).optional(),
-  lastDeployedAt: z.iso.datetime().optional(),
-})
-
 export const zSubjectAccountData = z.object({
   id: z.string().optional(),
   name: z.string().optional(),
@@ -1214,38 +794,10 @@ export const zTestConnectionReply = z.object({
   error: z.string().optional(),
 })
 
-export const zTestEnvironmentConnectionReply = z.object({
-  ok: z.boolean().optional(),
-  reachableServerVersion: z.string().optional(),
-  namespaceExists: z.boolean().optional(),
-  missingPermissions: z.array(z.string()).optional(),
-  error: z.string().optional(),
-  probedAt: z.iso.datetime().optional(),
-})
-
-export const zTestEnvironmentConnectionReq = z.object({
-  id: z.string().optional(),
-})
-
 export const zToggleEndpointRequest = z.object({
   enabled: z.boolean().optional(),
 })
 
-export const zUndeployRuntimeInstanceReply = z.object({
-  deploymentId: z.string().optional(),
-  status: z.string().optional(),
-})
-
-export const zUndeployRuntimeInstanceReq = z.object({
-  appInstanceId: z.string().optional(),
-  runtimeInstanceId: z.string().optional(),
-})
-
-export const zUpdateAccessChannelsReq = z.object({
-  appInstanceId: z.string().optional(),
-  enabled: z.boolean().optional(),
-})
-
 export const zUpdateAccessModeReq = z.object({
   appId: z.string().optional(),
   accessMode: z.string().optional(),
@@ -1255,16 +807,6 @@ export const zUpdateAccessModeRes = z.object({
   message: z.string().optional(),
 })
 
-export const zUpdateAppInstanceReply = z.object({
-  appInstanceId: z.string().optional(),
-})
-
-export const zUpdateAppInstanceReq = z.object({
-  appInstanceId: z.string().optional(),
-  name: z.string().optional(),
-  description: z.string().optional(),
-})
-
 export const zUpdateBrandingInfoReq = z.object({
   enabled: z.boolean().optional(),
   applicationTitle: z.string().optional(),
@@ -1273,36 +815,6 @@ export const zUpdateBrandingInfoReq = z.object({
   favicon: z.string().optional(),
 })
 
-export const zUpdateDeveloperApiReply = z.object({
-  developerApi: zDeveloperApiAccess.optional(),
-})
-
-export const zUpdateDeveloperApiReq = z.object({
-  appInstanceId: z.string().optional(),
-  enabled: z.boolean().optional(),
-})
-
-export const zUpdateEnvironmentAccessPolicyReply = z.object({
-  permission: zEnvironmentAccessRow.optional(),
-})
-
-export const zUpdateEnvironmentAccessPolicyReq = z.object({
-  appInstanceId: z.string().optional(),
-  environmentId: z.string().optional(),
-  accessMode: z.string().optional(),
-  subjects: z.array(zAccessSubject).optional(),
-})
-
-export const zUpdateEnvironmentReply = z.object({
-  environment: zEnvironment.optional(),
-})
-
-export const zUpdateEnvironmentReq = z.object({
-  id: z.string().optional(),
-  name: z.string().optional(),
-  description: z.string().optional(),
-})
-
 export const zUpdateGroupSubjectsReq = z.object({
   groupId: z.string().optional(),
   subjects: z.array(zSubject).optional(),
@@ -1386,6 +898,27 @@ export const zUpdatePluginInstallationSettingsRequest = z.object({
   restrictToMarketplaceOnly: z.boolean().optional(),
 })
 
+export const zUpdateResourceGroupRequest = z.object({
+  id: z.string().optional(),
+  name: z.string().optional(),
+  description: z.string().optional(),
+  enabled: z.boolean().optional(),
+  rpm_limit: z
+    .int()
+    .min(-2147483648, { error: 'Invalid value: Expected int32 to be >= -2147483648' })
+    .max(2147483647, { error: 'Invalid value: Expected int32 to be <= 2147483647' })
+    .optional(),
+  rpm_action: z.int().optional(),
+  concurrency_limit: z
+    .int()
+    .min(-2147483648, { error: 'Invalid value: Expected int32 to be >= -2147483648' })
+    .max(2147483647, { error: 'Invalid value: Expected int32 to be <= 2147483647' })
+    .optional(),
+  concurrency_action: z.int().optional(),
+  token_quota: z.string().optional(),
+  token_action: z.int().optional(),
+})
+
 export const zUpdateUserReply = z.object({
   account: zAccountDetail.optional(),
 })
@@ -1430,27 +963,6 @@ export const zUpdateWorkspaceReq = z.object({
   status: z.string().optional(),
 })
 
-export const zWebAppAccessRow = z.object({
-  environment: zConsoleEnvironment.optional(),
-  url: z.string().optional(),
-})
-
-export const zAccessChannels = z.object({
-  enabled: z.boolean().optional(),
-  webappRows: z.array(zWebAppAccessRow).optional(),
-  cli: zCliAccess.optional(),
-})
-
-export const zGetAppInstanceAccessReply = z.object({
-  permissions: z.array(zEnvironmentAccessRow).optional(),
-  accessChannels: zAccessChannels.optional(),
-  developerApi: zDeveloperApiAccess.optional(),
-})
-
-export const zUpdateAccessChannelsReply = z.object({
-  accessChannels: zAccessChannels.optional(),
-})
-
 export const zWebAppAuthInfo = z.object({
   allowSso: z.boolean().optional(),
   allowEmailCodeLogin: z.boolean().optional(),
@@ -1572,27 +1084,11 @@ export const zPagination = z.object({
     .optional(),
 })
 
-export const zListAppInstancesReply = z.object({
-  filters: z.array(zEnvironmentFilter).optional(),
-  data: z.array(zAppInstanceCard).optional(),
-  pagination: zPagination.optional(),
-})
-
-export const zListEnvironmentsReply = z.object({
-  data: z.array(zEnvironment).optional(),
-  pagination: zPagination.optional(),
-})
-
 export const zListMembersReply = z.object({
   data: z.array(zAccountDetail).optional(),
   pagination: zPagination.optional(),
 })
 
-export const zListReleasesReply = z.object({
-  data: z.array(zReleaseRow).optional(),
-  pagination: zPagination.optional(),
-})
-
 export const zListSecretKeysReply = z.object({
   data: z.array(zSecretKey).optional(),
   pagination: zPagination.optional(),
@@ -1608,271 +1104,6 @@ export const zListWorkspacesReply = z.object({
   pagination: zPagination.optional(),
 })
 
-export const zEnterpriseAppDeployConsoleListAppInstancesQuery = z.object({
-  environmentId: z.string().optional(),
-  notDeployed: z.boolean().optional(),
-  query: z.string().optional(),
-  pageNumber: z
-    .int()
-    .min(-2147483648, { error: 'Invalid value: Expected int32 to be >= -2147483648' })
-    .max(2147483647, { error: 'Invalid value: Expected int32 to be <= 2147483647' })
-    .optional(),
-  resultsPerPage: z
-    .int()
-    .min(-2147483648, { error: 'Invalid value: Expected int32 to be >= -2147483648' })
-    .max(2147483647, { error: 'Invalid value: Expected int32 to be <= 2147483647' })
-    .optional(),
-})
-
-/**
- * OK
- */
-export const zEnterpriseAppDeployConsoleListAppInstancesResponse = zListAppInstancesReply
-
-export const zEnterpriseAppDeployConsoleCreateAppInstanceBody = zCreateAppInstanceReq
-
-/**
- * OK
- */
-export const zEnterpriseAppDeployConsoleCreateAppInstanceResponse = zCreateAppInstanceReply
-
-export const zEnterpriseAppDeployConsoleDeleteAppInstancePath = z.object({
-  appInstanceId: z.string(),
-})
-
-/**
- * OK
- */
-export const zEnterpriseAppDeployConsoleDeleteAppInstanceResponse = zDeleteAppInstanceReply
-
-export const zEnterpriseAppDeployConsoleUpdateAppInstanceBody = zUpdateAppInstanceReq
-
-export const zEnterpriseAppDeployConsoleUpdateAppInstancePath = z.object({
-  appInstanceId: z.string(),
-})
-
-/**
- * OK
- */
-export const zEnterpriseAppDeployConsoleUpdateAppInstanceResponse = zUpdateAppInstanceReply
-
-export const zEnterpriseAppDeployConsoleGetAppInstanceAccessPath = z.object({
-  appInstanceId: z.string(),
-})
-
-/**
- * OK
- */
-export const zEnterpriseAppDeployConsoleGetAppInstanceAccessResponse = zGetAppInstanceAccessReply
-
-export const zEnterpriseAppDeployConsoleUpdateAccessChannelsBody = zUpdateAccessChannelsReq
-
-export const zEnterpriseAppDeployConsoleUpdateAccessChannelsPath = z.object({
-  appInstanceId: z.string(),
-})
-
-/**
- * OK
- */
-export const zEnterpriseAppDeployConsoleUpdateAccessChannelsResponse = zUpdateAccessChannelsReply
-
-export const zEnterpriseAppDeployConsoleSearchAccessSubjectsPath = z.object({
-  appInstanceId: z.string(),
-})
-
-export const zEnterpriseAppDeployConsoleSearchAccessSubjectsQuery = z.object({
-  keyword: z.string().optional(),
-  subjectTypes: z.array(z.string()).optional(),
-})
-
-/**
- * OK
- */
-export const zEnterpriseAppDeployConsoleSearchAccessSubjectsResponse = zSearchAccessSubjectsReply
-
-export const zEnterpriseAppDeployConsoleCreateDeveloperApiKeyBody = zCreateDeveloperApiKeyReq
-
-export const zEnterpriseAppDeployConsoleCreateDeveloperApiKeyPath = z.object({
-  appInstanceId: z.string(),
-})
-
-/**
- * OK
- */
-export const zEnterpriseAppDeployConsoleCreateDeveloperApiKeyResponse = zCreateDeveloperApiKeyReply
-
-export const zEnterpriseAppDeployConsoleDeleteDeveloperApiKeyPath = z.object({
-  appInstanceId: z.string(),
-  apiKeyId: z.string(),
-})
-
-/**
- * OK
- */
-export const zEnterpriseAppDeployConsoleDeleteDeveloperApiKeyResponse = zDeleteDeveloperApiKeyReply
-
-export const zEnterpriseAppDeployConsoleListDeploymentBindingOptionsPath = z.object({
-  appInstanceId: z.string(),
-})
-
-/**
- * OK
- */
-export const zEnterpriseAppDeployConsoleListDeploymentBindingOptionsResponse
-  = zListDeploymentBindingOptionsReply
-
-export const zEnterpriseAppDeployConsoleCreateDeploymentBody = zCreateDeploymentReq
-
-export const zEnterpriseAppDeployConsoleCreateDeploymentPath = z.object({
-  appInstanceId: z.string(),
-})
-
-/**
- * OK
- */
-export const zEnterpriseAppDeployConsoleCreateDeploymentResponse = zCreateDeploymentReply
-
-export const zEnterpriseAppDeployConsoleUpdateDeveloperApiBody = zUpdateDeveloperApiReq
-
-export const zEnterpriseAppDeployConsoleUpdateDeveloperApiPath = z.object({
-  appInstanceId: z.string(),
-})
-
-/**
- * OK
- */
-export const zEnterpriseAppDeployConsoleUpdateDeveloperApiResponse = zUpdateDeveloperApiReply
-
-export const zEnterpriseAppDeployConsoleGetEnvironmentAccessPolicyPath = z.object({
-  appInstanceId: z.string(),
-  environmentId: z.string(),
-})
-
-/**
- * OK
- */
-export const zEnterpriseAppDeployConsoleGetEnvironmentAccessPolicyResponse
-  = zGetEnvironmentAccessPolicyReply
-
-export const zEnterpriseAppDeployConsoleUpdateEnvironmentAccessPolicyBody
-  = zUpdateEnvironmentAccessPolicyReq
-
-export const zEnterpriseAppDeployConsoleUpdateEnvironmentAccessPolicyPath = z.object({
-  appInstanceId: z.string(),
-  environmentId: z.string(),
-})
-
-/**
- * OK
- */
-export const zEnterpriseAppDeployConsoleUpdateEnvironmentAccessPolicyResponse
-  = zUpdateEnvironmentAccessPolicyReply
-
-export const zEnterpriseAppDeployConsoleGetAppInstanceOverviewPath = z.object({
-  appInstanceId: z.string(),
-})
-
-/**
- * OK
- */
-export const zEnterpriseAppDeployConsoleGetAppInstanceOverviewResponse
-  = zGetAppInstanceOverviewReply
-
-export const zEnterpriseAppDeployConsoleListReleasesPath = z.object({
-  appInstanceId: z.string(),
-})
-
-export const zEnterpriseAppDeployConsoleListReleasesQuery = z.object({
-  pageNumber: z
-    .int()
-    .min(-2147483648, { error: 'Invalid value: Expected int32 to be >= -2147483648' })
-    .max(2147483647, { error: 'Invalid value: Expected int32 to be <= 2147483647' })
-    .optional(),
-  resultsPerPage: z
-    .int()
-    .min(-2147483648, { error: 'Invalid value: Expected int32 to be >= -2147483648' })
-    .max(2147483647, { error: 'Invalid value: Expected int32 to be <= 2147483647' })
-    .optional(),
-})
-
-/**
- * OK
- */
-export const zEnterpriseAppDeployConsoleListReleasesResponse = zListReleasesReply
-
-export const zEnterpriseAppDeployConsoleCreateReleaseBody = zCreateReleaseReq
-
-export const zEnterpriseAppDeployConsoleCreateReleasePath = z.object({
-  appInstanceId: z.string(),
-})
-
-/**
- * OK
- */
-export const zEnterpriseAppDeployConsoleCreateReleaseResponse = zCreateReleaseReply
-
-export const zEnterpriseAppDeployConsolePreviewReleaseBody = zPreviewReleaseReq
-
-export const zEnterpriseAppDeployConsolePreviewReleasePath = z.object({
-  appInstanceId: z.string(),
-})
-
-/**
- * OK
- */
-export const zEnterpriseAppDeployConsolePreviewReleaseResponse = zPreviewReleaseReply
-
-export const zEnterpriseAppDeployConsoleListRuntimeInstancesPath = z.object({
-  appInstanceId: z.string(),
-})
-
-/**
- * OK
- */
-export const zEnterpriseAppDeployConsoleListRuntimeInstancesResponse = zListRuntimeInstancesReply
-
-export const zEnterpriseAppDeployConsoleCancelRuntimeDeploymentBody = zCancelRuntimeDeploymentReq
-
-export const zEnterpriseAppDeployConsoleCancelRuntimeDeploymentPath = z.object({
-  appInstanceId: z.string(),
-  runtimeInstanceId: z.string(),
-})
-
-/**
- * OK
- */
-export const zEnterpriseAppDeployConsoleCancelRuntimeDeploymentResponse
-  = zCancelRuntimeDeploymentReply
-
-export const zEnterpriseAppDeployConsoleUndeployRuntimeInstanceBody = zUndeployRuntimeInstanceReq
-
-export const zEnterpriseAppDeployConsoleUndeployRuntimeInstancePath = z.object({
-  appInstanceId: z.string(),
-  runtimeInstanceId: z.string(),
-})
-
-/**
- * OK
- */
-export const zEnterpriseAppDeployConsoleUndeployRuntimeInstanceResponse
-  = zUndeployRuntimeInstanceReply
-
-export const zEnterpriseAppDeployConsoleGetAppInstanceSettingsPath = z.object({
-  appInstanceId: z.string(),
-})
-
-/**
- * OK
- */
-export const zEnterpriseAppDeployConsoleGetAppInstanceSettingsResponse
-  = zGetAppInstanceSettingsReply
-
-/**
- * OK
- */
-export const zEnterpriseAppDeployConsoleListDeploymentEnvironmentOptionsResponse
-  = zListDeploymentEnvironmentOptionsReply
-
 /**
  * OK
  */
diff --git a/packages/contracts/openapi-ts.api.config.ts b/packages/contracts/openapi-ts.api.config.ts
index 79c8ec8322..d17b5dcbc3 100644
--- a/packages/contracts/openapi-ts.api.config.ts
+++ b/packages/contracts/openapi-ts.api.config.ts
@@ -11,6 +11,7 @@ type SwaggerSchema = JsonObject & {
   '$ref'?: string
   'x-nullable'?: boolean
   'additionalProperties'?: unknown
+  'allOf'?: SwaggerSchema[]
   'anyOf'?: SwaggerSchema[]
   'const'?: unknown
   'default'?: unknown
@@ -19,6 +20,7 @@ type SwaggerSchema = JsonObject & {
   'enum'?: unknown[]
   'format'?: string
   'items'?: SwaggerSchema
+  'oneOf'?: SwaggerSchema[]
   'properties'?: Record<string, SwaggerSchema>
   'required'?: string[]
   'type'?: string
@@ -38,6 +40,8 @@ type SwaggerResponse = JsonObject & {
 }
 
 type SwaggerOperation = JsonObject & {
+  deprecated?: boolean
+  description?: string
   operationId?: string
   parameters?: SwaggerParameter[]
   responses?: Record<string, SwaggerResponse>
@@ -54,8 +58,16 @@ type ApiSpec = {
 }
 
 type ApiJob = {
+  clean?: boolean
   document: SwaggerDocument
   outputPath: string
+  plugins?: UserConfig['plugins']
+  source?: {
+    callback: () => void
+    enabled: true
+    path: null
+    serialize: () => string
+  }
 }
 
 type ApiContractOperation = {
@@ -63,10 +75,17 @@ type ApiContractOperation = {
   path: string
 }
 
+type ApiReadinessSurfaceStats = {
+  notReady: number
+  total: number
+}
+
 const currentDir = path.dirname(fileURLToPath(import.meta.url))
 const apiOpenApiDir = path.resolve(currentDir, 'openapi')
+const apiReadinessStatsPath = path.resolve(currentDir, 'generated/api/readiness.json')
 
 const operationMethods = new Set(['delete', 'get', 'patch', 'post', 'put'])
+const noBodyResponseStatuses = new Set(['204', '205', '304'])
 
 const apiSpecs: ApiSpec[] = [
   { filename: 'console-swagger.json', name: 'console' },
@@ -74,6 +93,9 @@ const apiSpecs: ApiSpec[] = [
   { filename: 'service-swagger.json', name: 'service' },
 ]
 
+const inaccurateGeneratedContractDescription = 'Generated contract types may be inaccurate because backend OpenAPI annotations are incomplete. Do not migrate callers until the generated contract is accurate.'
+const apiReadinessStats: Record<string, ApiReadinessSurfaceStats> = {}
+
 const isObject = (value: unknown): value is JsonObject => {
   return !!value && typeof value === 'object' && !Array.isArray(value)
 }
@@ -83,6 +105,13 @@ const unknownObjectSchema = (): SwaggerSchema => ({
   type: 'object',
 })
 
+const noContentSchema = (): SwaggerSchema => ({
+  // Hey API's Swagger 2.0 pipeline currently needs a response schema symbol even for no-content responses.
+  additionalProperties: false,
+  properties: {},
+  type: 'object',
+})
+
 const toWords = (value: string) => {
   return value
     .replace(/[{}]/g, '')
@@ -425,7 +454,12 @@ const normalizeGetBodyParameters = (
 const normalizeResponses = (operation: SwaggerOperation) => {
   const responses = operation.responses ??= {}
 
-  for (const response of Object.values(responses)) {
+  for (const [status, response] of Object.entries(responses)) {
+    if (noBodyResponseStatuses.has(status)) {
+      response.schema = noContentSchema()
+      continue
+    }
+
     if (!response.schema)
       response.schema = unknownObjectSchema()
   }
@@ -438,7 +472,103 @@ const normalizeResponses = (operation: SwaggerOperation) => {
   }
 }
 
-const normalizeOperations = (document: SwaggerDocument) => {
+const hasProperties = (schema: SwaggerSchema) => {
+  return isObject(schema.properties) && Object.keys(schema.properties).length > 0
+}
+
+const isEmptySchemaObject = (value: unknown) => {
+  return isObject(value) && Object.keys(value).length === 0
+}
+
+const isLooseObjectSchema = (schema: SwaggerSchema) => {
+  if (hasProperties(schema))
+    return false
+
+  if (schema.additionalProperties === true || isEmptySchemaObject(schema.additionalProperties))
+    return true
+
+  return schema.type === 'object' && schema.additionalProperties === undefined
+}
+
+const hasLooseSchema = (
+  schema: SwaggerSchema | undefined,
+  definitions: Record<string, SwaggerSchema>,
+  visitedRefs = new Set<string>(),
+): boolean => {
+  if (!schema)
+    return true
+
+  const ref = schema?.$ref
+  if (ref?.startsWith('#/definitions/')) {
+    const refName = ref.slice('#/definitions/'.length)
+    if (visitedRefs.has(refName))
+      return false
+
+    return hasLooseSchema(definitions[refName], definitions, new Set([...visitedRefs, refName]))
+  }
+
+  const normalizedSchema = withoutNullableWrapper(schema)
+
+  for (const variants of [normalizedSchema.allOf, normalizedSchema.anyOf, normalizedSchema.oneOf]) {
+    if (Array.isArray(variants) && variants.some(item => !isNullSchema(item) && hasLooseSchema(item, definitions, visitedRefs)))
+      return true
+  }
+
+  if (normalizedSchema.type === 'array')
+    return hasLooseSchema(normalizedSchema.items, definitions, visitedRefs)
+
+  if (isLooseObjectSchema(normalizedSchema))
+    return true
+
+  if (isObject(normalizedSchema.additionalProperties) && hasLooseSchema(normalizedSchema.additionalProperties, definitions, visitedRefs))
+    return true
+
+  return Object.values(normalizedSchema.properties ?? {})
+    .some(property => hasLooseSchema(property, definitions, visitedRefs))
+}
+
+const hasPossiblyInaccurateGeneratedContractTypes = (
+  operation: SwaggerOperation,
+  definitions: Record<string, SwaggerSchema>,
+) => {
+  const successResponses = Object.entries(operation.responses ?? {})
+    .filter(([status]) => /^2\d\d$/.test(status))
+
+  if (successResponses.length === 0)
+    return true
+
+  const successResponsesWithBody = successResponses.filter(([status]) => !noBodyResponseStatuses.has(status))
+  if (successResponsesWithBody.some(([, response]) => hasLooseSchema(response.schema, definitions)))
+    return true
+
+  return operation.parameters?.some((parameter) => {
+    return parameter.in === 'body' && hasLooseSchema(parameter.schema, definitions)
+  }) ?? false
+}
+
+const appendOperationDescription = (operation: SwaggerOperation, description: string) => {
+  const currentDescription = operation.description?.trim()
+  operation.description = currentDescription ? `${currentDescription}\n\n${description}` : description
+}
+
+const markPossiblyInaccurateGeneratedContract = (operation: SwaggerOperation) => {
+  operation.deprecated = true
+  appendOperationDescription(operation, inaccurateGeneratedContractDescription)
+}
+
+const recordApiReadiness = (surface: string, isReady: boolean) => {
+  const stats = apiReadinessStats[surface] ??= {
+    notReady: 0,
+    total: 0,
+  }
+
+  stats.total += 1
+
+  if (!isReady)
+    stats.notReady += 1
+}
+
+const normalizeOperations = (document: SwaggerDocument, surface: string) => {
   const definitions = document.definitions ??= {}
 
   for (const [routePath, pathItem] of Object.entries(document.paths ?? {})) {
@@ -450,14 +580,19 @@ const normalizeOperations = (document: SwaggerDocument) => {
       swaggerOperation.operationId = operationId(method, routePath)
 
       normalizeResponses(swaggerOperation)
+      const hasPossiblyInaccurateTypes = hasPossiblyInaccurateGeneratedContractTypes(swaggerOperation, definitions)
+      recordApiReadiness(surface, !hasPossiblyInaccurateTypes)
 
       if (method === 'get')
         normalizeGetBodyParameters(swaggerOperation, definitions)
+
+      if (hasPossiblyInaccurateTypes)
+        markPossiblyInaccurateGeneratedContract(swaggerOperation)
     }
   }
 }
 
-const normalizeApiSwagger = (document: SwaggerDocument) => {
+const normalizeApiSwagger = (document: SwaggerDocument, surface: string) => {
   document.definitions ??= {}
 
   // Flask-RESTX emits Pydantic nested $defs inside individual schemas while
@@ -466,11 +601,25 @@ const normalizeApiSwagger = (document: SwaggerDocument) => {
   ensureReferencedDefinitions(document)
   normalizeNullableAnyOf(document)
   removeNullDefaults(document)
-  normalizeOperations(document)
+  normalizeOperations(document, surface)
 
   return document
 }
 
+const writeApiReadinessStats = () => {
+  const sortedSurfaces = Object.entries(apiReadinessStats)
+    .sort(([left], [right]) => left.localeCompare(right))
+
+  fs.mkdirSync(path.dirname(apiReadinessStatsPath), { recursive: true })
+  fs.writeFileSync(
+    apiReadinessStatsPath,
+    `${JSON.stringify({
+      surfaces: Object.fromEntries(sortedSurfaces),
+      warning: inaccurateGeneratedContractDescription,
+    }, null, 2)}\n`,
+  )
+}
+
 const topLevelPathSegment = (routePath: string) => {
   return routePath.split('/').filter(Boolean)[0] ?? 'root'
 }
@@ -520,6 +669,50 @@ const cloneDocumentWithPaths = (
   } satisfies SwaggerDocument
 }
 
+const consoleContractEntryContent = (segments: string[]) => {
+  const contracts = segments.map((segment) => {
+    return {
+      importPath: toKebabCase(segment),
+      name: toCamelCase(segmentWords(segment)),
+    }
+  })
+
+  const imports = contracts
+    .map(contract => `import { ${contract.name} } from './${contract.importPath}/orpc.gen'`)
+    .join('\n')
+  const contractEntries = contracts.map(contract => `  ${contract.name},`).join('\n')
+
+  return `// This file is auto-generated by @hey-api/openapi-ts
+
+${imports}
+
+export const contract = {
+${contractEntries}
+}
+`
+}
+
+const writeConsoleContractEntry = (segments: string[]) => {
+  const entryPath = path.resolve(currentDir, 'generated/api/console/orpc.gen.ts')
+  fs.mkdirSync(path.dirname(entryPath), { recursive: true })
+  fs.writeFileSync(entryPath, consoleContractEntryContent(segments))
+}
+
+const createConsoleContractEntryJob = (document: SwaggerDocument, segments: string[]): ApiJob => {
+  return {
+    clean: false,
+    document,
+    outputPath: 'generated/api/console',
+    plugins: [],
+    source: {
+      callback: () => writeConsoleContractEntry(segments),
+      enabled: true,
+      path: null,
+      serialize: () => '',
+    },
+  }
+}
+
 const splitConsoleDocument = (document: SwaggerDocument) => {
   const pathsBySegment = new Map<string, Record<string, Record<string, unknown>>>()
 
@@ -530,16 +723,17 @@ const splitConsoleDocument = (document: SwaggerDocument) => {
     pathsBySegment.set(segment, paths)
   }
 
-  return [...pathsBySegment.entries()]
-    .sort(([left], [right]) => left.localeCompare(right))
-    .map(([segment, paths]): ApiJob => ({
-      document: cloneDocumentWithPaths(document, paths),
-      outputPath: `generated/api/console/${toKebabCase(segment)}`,
-    }))
+  const segments = [...pathsBySegment.keys()].sort((left, right) => left.localeCompare(right))
+  const jobs = segments.map((segment): ApiJob => ({
+    document: cloneDocumentWithPaths(document, pathsBySegment.get(segment) ?? {}),
+    outputPath: `generated/api/console/${toKebabCase(segment)}`,
+  }))
+
+  return [...jobs, createConsoleContractEntryJob(document, segments)]
 }
 
 const createApiJobs = (spec: ApiSpec): ApiJob[] => {
-  const document = normalizeApiSwagger(readApiSwagger(spec.filename))
+  const document = normalizeApiSwagger(readApiSwagger(spec.filename), spec.name)
 
   if (spec.name === 'console')
     return splitConsoleDocument(document)
@@ -552,29 +746,24 @@ const createApiJobs = (spec: ApiSpec): ApiJob[] => {
   ]
 }
 
+const apiJobs = apiSpecs.flatMap(createApiJobs)
+writeApiReadinessStats()
+
 const createApiConfig = (job: ApiJob): UserConfig => ({
   input: job.document,
   logs: {
     file: false,
   },
   output: {
+    ...(job.clean === undefined ? {} : { clean: job.clean }),
     entryFile: false,
     fileName: {
       suffix: '.gen',
     },
     path: job.outputPath,
-    postProcess: [
-      {
-        args: ['fmt', '{{path}}'],
-        command: 'vp',
-      },
-      {
-        args: ['--fix', '{{path}}/*.ts'],
-        command: 'eslint',
-      },
-    ],
+    ...(job.source ? { source: job.source } : {}),
   },
-  plugins: [
+  plugins: job.plugins ?? [
     {
       'comments': false,
       'name': '@hey-api/typescript',
@@ -607,4 +796,4 @@ const createApiConfig = (job: ApiJob): UserConfig => ({
   ],
 })
 
-export default defineConfig(apiSpecs.flatMap(createApiJobs).map(createApiConfig))
+export default defineConfig(apiJobs.map(createApiConfig))
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 5e9af5e0f1..507a95a779 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -14,8 +14,10 @@
     }
   },
   "scripts": {
-    "gen-api-contract": "pnpm gen-api-openapi && node -e \"fs.rmSync('generated/api', { recursive: true, force: true })\" && openapi-ts -f openapi-ts.api.config.ts",
+    "gen-api-contract": "pnpm gen-api-openapi && pnpm gen-api-contract-from-openapi",
+    "gen-api-contract-from-openapi": "node -e \"fs.rmSync('generated/api', { recursive: true, force: true })\" && openapi-ts -f openapi-ts.api.config.ts && vp fmt generated/api && eslint --fix generated/api && pnpm gen-api-readiness-readme",
     "gen-api-openapi": "uv run --project ../../api ../../api/dev/generate_swagger_specs.py --output-dir openapi",
+    "gen-api-readiness-readme": "node scripts/generate-api-readiness-readme.mjs && eslint --fix README.md",
     "gen-enterprise-contract": "openapi-ts -f openapi-ts.enterprise.config.ts",
     "type-check": "tsgo"
   },
diff --git a/packages/contracts/scripts/generate-api-readiness-readme.mjs b/packages/contracts/scripts/generate-api-readiness-readme.mjs
new file mode 100644
index 0000000000..c75b944e2a
--- /dev/null
+++ b/packages/contracts/scripts/generate-api-readiness-readme.mjs
@@ -0,0 +1,94 @@
+import fs from 'node:fs'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+const currentDir = path.dirname(fileURLToPath(import.meta.url))
+const packageDir = path.resolve(currentDir, '..')
+const readinessStatsPath = path.resolve(packageDir, 'generated/api/readiness.json')
+const readmePath = path.resolve(packageDir, 'README.md')
+
+const readinessStartMarker = '<!-- api-openapi-readiness:start -->'
+const readinessEndMarker = '<!-- api-openapi-readiness:end -->'
+
+const formatPercent = (ready, total) => {
+  return total === 0 ? '0.0%' : `${((ready / total) * 100).toFixed(1)}%`
+}
+
+const collectStats = () => {
+  if (!fs.existsSync(readinessStatsPath)) {
+    throw new Error(
+      `Missing API readiness stats: ${readinessStatsPath}. Run "pnpm -C packages/contracts gen-api-contract-from-openapi" first.`,
+    )
+  }
+
+  return JSON.parse(fs.readFileSync(readinessStatsPath, 'utf8'))
+}
+
+const tableRow = (surface, ready, notReady, total) => {
+  return `| ${surface} | ${ready} | ${notReady} | ${total} | ${formatPercent(ready, total)} |`
+}
+
+const renderReadinessSection = (stats) => {
+  const rows = Object.entries(stats.surfaces)
+    .sort(([left], [right]) => left.localeCompare(right))
+    .map(([surface, stat]) => tableRow(surface, stat.total - stat.notReady, stat.notReady, stat.total))
+
+  const totals = Object.values(stats.surfaces).reduce(
+    (summary, stat) => {
+      summary.notReady += stat.notReady
+      summary.total += stat.total
+      return summary
+    },
+    { notReady: 0, total: 0 },
+  )
+  const totalReady = totals.total - totals.notReady
+
+  if (totals.total === 0)
+    throw new Error(`No API readiness stats found in ${readinessStatsPath}`)
+
+  return `${readinessStartMarker}
+
+<!-- This section is auto-generated by scripts/generate-api-readiness-readme.mjs. Do not edit between the markers. -->
+
+Snapshot generated from \`packages/contracts/generated/api/readiness.json\` after running \`pnpm -C packages/contracts gen-api-contract-from-openapi\`.
+
+Are we OpenAPI ready? **No.** Current generated API contracts are **${formatPercent(totalReady, totals.total)} ready**.
+
+| Surface | Ready | Not ready | Total | Ready % |
+| --- | ---: | ---: | ---: | ---: |
+${rows.join('\n')}
+| **total** | **${totalReady}** | **${totals.notReady}** | **${totals.total}** | **${formatPercent(totalReady, totals.total)}** |
+
+Readiness here means the generated contract operation is not marked with:
+
+> ${stats.warning}
+
+Operations marked with that warning should not be migrated to blindly. Prefer fixing backend OpenAPI annotations first so the generated contract has accurate request and response types, then migrate callers endpoint by endpoint.
+
+The current heuristic marks an operation as not ready when a request body or success response that should have a body contains a loose object type, or when an operation has no documented 2xx response. 204, 205, and 304 responses are treated as bodyless when the request type is otherwise accurate.
+
+${readinessEndMarker}
+`
+}
+
+const updateReadme = (readinessSection) => {
+  const readme = fs.readFileSync(readmePath, 'utf8')
+  const startIndex = readme.indexOf(readinessStartMarker)
+  const endIndex = readme.indexOf(readinessEndMarker)
+
+  if (startIndex === -1 || endIndex === -1 || endIndex < startIndex) {
+    throw new Error(
+      `Missing readiness markers in ${readmePath}. Expected ${readinessStartMarker} and ${readinessEndMarker}.`,
+    )
+  }
+
+  const nextReadme = [
+    readme.slice(0, startIndex),
+    readinessSection,
+    readme.slice(endIndex + readinessEndMarker.length),
+  ].join('')
+
+  fs.writeFileSync(readmePath, nextReadme)
+}
+
+updateReadme(renderReadinessSection(collectStats()))
diff --git a/packages/dev-proxy/README.md b/packages/dev-proxy/README.md
new file mode 100644
index 0000000000..6b9d7298c4
--- /dev/null
+++ b/packages/dev-proxy/README.md
@@ -0,0 +1,196 @@
+# @langgenius/dev-proxy
+
+Generic Hono-based development proxy for frontend projects. The package does not ship any product-specific routes, cookie names, or environment variable conventions. Every proxied path and upstream target is declared in a local config file.
+
+## Installation
+
+```bash
+pnpm add -D @langgenius/dev-proxy
+```
+
+Add a script in your frontend project:
+
+```json
+{
+  "scripts": {
+    "dev:proxy": "dev-proxy --config ./dev-proxy.config.ts --env-file ./.env"
+  }
+}
+```
+
+Run it with:
+
+```bash
+pnpm dev:proxy
+```
+
+## CLI
+
+```bash
+dev-proxy --config ./dev-proxy.config.ts
+```
+
+Supported options:
+
+- `--config`, `-c`: config file path. Defaults to `dev-proxy.config.ts`.
+- `--env-file`: load environment variables before evaluating the config file.
+- `--host`: override `server.host` from config.
+- `--port`: override `server.port` from config.
+- `--help`, `-h`: print help.
+
+`--target` is not supported. Put targets in the config file so routes and upstreams stay explicit.
+
+## Config Shape
+
+```ts
+import { defineDevProxyConfig } from '@langgenius/dev-proxy'
+
+export default defineDevProxyConfig({
+  server: {
+    host: '127.0.0.1',
+    port: 5001,
+  },
+  routes: [
+    {
+      paths: '/api',
+      target: 'https://example.com',
+    },
+  ],
+  cors: {
+    allowedOrigins: 'local',
+  },
+})
+```
+
+Config files can be `.ts`, `.mts`, `.js`, or `.mjs`.
+
+`routes` are matched in declaration order. The first matching route wins. Each configured path matches both the exact path and all child paths, so `paths: '/api'` matches `/api`, `/api/apps`, and `/api/apps/123`.
+
+By default, credentialed CORS is allowed for local development origins such as `localhost`, `127.0.0.1`, and `::1`. To restrict it to specific origins:
+
+```
+cors: {
+  allowedOrigins: ['http://localhost:3000'],
+}
+```
+
+## Scenario 1: Proxy One Local Route Group To An Online Backend
+
+Use this when a local frontend should call an online backend through one proxy server. For example, the frontend calls `http://127.0.0.1:5001/api/apps`, and the proxy forwards it to `https://cloud.example.com/api/apps`.
+
+```ts
+import { defineDevProxyConfig } from '@langgenius/dev-proxy'
+
+const target = process.env.DEV_PROXY_TARGET || 'https://cloud.example.com'
+
+export default defineDevProxyConfig({
+  server: {
+    host: process.env.DEV_PROXY_HOST || '127.0.0.1',
+    port: Number(process.env.DEV_PROXY_PORT || 5001),
+  },
+  routes: [
+    {
+      paths: '/api',
+      target,
+    },
+  ],
+})
+```
+
+Optional `.env`:
+
+```env
+DEV_PROXY_TARGET=https://cloud.example.com
+DEV_PROXY_HOST=127.0.0.1
+DEV_PROXY_PORT=5001
+```
+
+Command:
+
+```bash
+dev-proxy --config ./dev-proxy.config.ts --env-file ./.env
+```
+
+## Scenario 2: Proxy Two Route Groups To Two Local Backends
+
+Use this when one frontend needs to talk to two different local services. For example:
+
+- `/console/api/*` goes to a local console backend at `http://127.0.0.1:5001`
+- `/api/*` goes to a local public API backend at `http://127.0.0.1:5002`
+
+```ts
+import { defineDevProxyConfig } from '@langgenius/dev-proxy'
+
+const consoleApiTarget = process.env.DEV_PROXY_CONSOLE_API_TARGET || 'http://127.0.0.1:5001'
+const publicApiTarget = process.env.DEV_PROXY_PUBLIC_API_TARGET || 'http://127.0.0.1:5002'
+
+export default defineDevProxyConfig({
+  server: {
+    host: process.env.DEV_PROXY_HOST || '127.0.0.1',
+    port: Number(process.env.DEV_PROXY_PORT || 8082),
+  },
+  routes: [
+    {
+      paths: '/console/api',
+      target: consoleApiTarget,
+    },
+    {
+      paths: '/api',
+      target: publicApiTarget,
+    },
+  ],
+})
+```
+
+Optional `.env`:
+
+```env
+DEV_PROXY_CONSOLE_API_TARGET=http://127.0.0.1:5001
+DEV_PROXY_PUBLIC_API_TARGET=http://127.0.0.1:5002
+DEV_PROXY_HOST=127.0.0.1
+DEV_PROXY_PORT=8082
+```
+
+When two route groups overlap, put the more specific one first:
+
+```ts
+routes: [
+  { paths: '/api/enterprise', target: 'http://127.0.0.1:5003' },
+  { paths: '/api', target: 'http://127.0.0.1:5002' },
+]
+```
+
+## Cookie Rewrite
+
+Cookie rewriting is opt-in and config-driven. The package does not know any application cookie names.
+
+Use `cookieRewrite` when an upstream uses secure cookie prefixes such as `__Host-` or `__Secure-`, but local development needs cookies to work over `http://localhost`.
+
+```ts
+import type { CookieRewriteOptions } from '@langgenius/dev-proxy'
+import { defineDevProxyConfig } from '@langgenius/dev-proxy'
+
+const cookieRewrite: CookieRewriteOptions = {
+  hostPrefixCookies: ['access_token', 'refresh_token', /^passport-/],
+}
+
+export default defineDevProxyConfig({
+  routes: [
+    {
+      paths: '/api',
+      target: 'https://cloud.example.com',
+      cookieRewrite,
+    },
+  ],
+})
+```
+
+Set `cookieRewrite: false` to disable cookie rewriting for a route.
+
+## Behavior
+
+- The proxy preserves the matched path prefix when forwarding requests.
+- Request bodies are forwarded as streams.
+- Hop-by-hop headers are removed before forwarding.
+- Local credentialed CORS and preflight requests are handled by the proxy.
+- Route matching is explicit and order-sensitive.
diff --git a/packages/dev-proxy/bin/dev-proxy.js b/packages/dev-proxy/bin/dev-proxy.js
new file mode 100755
index 0000000000..02e37f3525
--- /dev/null
+++ b/packages/dev-proxy/bin/dev-proxy.js
@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+import '../dist/cli.mjs'
diff --git a/packages/dev-proxy/package.json b/packages/dev-proxy/package.json
new file mode 100644
index 0000000000..d5524290eb
--- /dev/null
+++ b/packages/dev-proxy/package.json
@@ -0,0 +1,43 @@
+{
+  "name": "@langgenius/dev-proxy",
+  "type": "module",
+  "version": "0.0.5",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.mts",
+      "import": "./dist/index.mjs"
+    }
+  },
+  "types": "./dist/index.d.mts",
+  "bin": {
+    "dev-proxy": "./bin/dev-proxy.js"
+  },
+  "files": [
+    "bin",
+    "dist",
+    "src"
+  ],
+  "engines": {
+    "node": "^22.22.1"
+  },
+  "scripts": {
+    "build": "vp pack",
+    "prepare": "pnpm run build",
+    "test": "vp test",
+    "type-check": "tsgo",
+    "prepublish": "pnpm run build"
+  },
+  "dependencies": {
+    "@hono/node-server": "catalog:",
+    "c12": "catalog:",
+    "hono": "catalog:"
+  },
+  "devDependencies": {
+    "@dify/tsconfig": "workspace:*",
+    "@types/node": "catalog:",
+    "@typescript/native-preview": "catalog:",
+    "vite": "catalog:",
+    "vite-plus": "catalog:",
+    "vitest": "catalog:"
+  }
+}
diff --git a/packages/dev-proxy/src/cli.spec.ts b/packages/dev-proxy/src/cli.spec.ts
new file mode 100644
index 0000000000..e8a87a0588
--- /dev/null
+++ b/packages/dev-proxy/src/cli.spec.ts
@@ -0,0 +1,158 @@
+/**
+ * @vitest-environment node
+ */
+import type { ChildProcessByStdio } from 'node:child_process'
+import type { Readable } from 'node:stream'
+import { spawn } from 'node:child_process'
+import { once } from 'node:events'
+import fs from 'node:fs/promises'
+import net from 'node:net'
+import os from 'node:os'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { afterEach, describe, expect, it } from 'vitest'
+
+const tempDirs: string[] = []
+type DevProxyCliProcess = ChildProcessByStdio<null, Readable, Readable>
+
+const childProcesses: DevProxyCliProcess[] = []
+const binPath = fileURLToPath(new URL('../bin/dev-proxy.js', import.meta.url))
+
+const createTempDir = async () => {
+  const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'dev-proxy-cli-test-'))
+  tempDirs.push(tempDir)
+  return tempDir
+}
+
+const getFreePort = async () => {
+  const server = net.createServer()
+  await new Promise<void>((resolve, reject) => {
+    server.once('error', reject)
+    server.listen(0, '127.0.0.1', resolve)
+  })
+
+  const address = server.address()
+  if (!address || typeof address === 'string')
+    throw new Error('Failed to allocate a test port.')
+
+  const { port } = address
+  await new Promise<void>((resolve, reject) => {
+    server.close((error) => {
+      if (error)
+        reject(error)
+      else
+        resolve()
+    })
+  })
+
+  return port
+}
+
+const waitForOutput = (
+  child: DevProxyCliProcess,
+  output: () => string,
+  expectedOutput: string,
+) => new Promise<void>((resolve, reject) => {
+  let timeout: ReturnType<typeof setTimeout>
+
+  function cleanup() {
+    clearTimeout(timeout)
+    child.stdout.off('data', onData)
+    child.stderr.off('data', onData)
+    child.off('exit', onExit)
+  }
+
+  function onData() {
+    if (!output().includes(expectedOutput))
+      return
+
+    cleanup()
+    resolve()
+  }
+
+  function onExit(code: number | null, signal: NodeJS.Signals | null) {
+    cleanup()
+    reject(new Error(`dev-proxy exited before writing "${expectedOutput}" with code ${code} and signal ${signal}. Output:\n${output()}`))
+  }
+
+  timeout = setTimeout(() => {
+    cleanup()
+    reject(new Error(`Timed out waiting for "${expectedOutput}". Output:\n${output()}`))
+  }, 3000)
+
+  child.stdout.on('data', onData)
+  child.stderr.on('data', onData)
+  child.once('exit', onExit)
+  onData()
+})
+
+const spawnCli = (args: readonly string[], cwd: string) => {
+  const child = spawn(process.execPath, [binPath, ...args], {
+    cwd,
+    env: {
+      ...process.env,
+      FORCE_COLOR: '0',
+    },
+    stdio: ['ignore', 'pipe', 'pipe'],
+  })
+  childProcesses.push(child)
+  return child
+}
+
+const stopChildProcess = async (child: DevProxyCliProcess) => {
+  if (child.exitCode !== null || child.signalCode !== null)
+    return
+
+  child.kill('SIGTERM')
+  await once(child, 'exit')
+}
+
+describe('dev proxy CLI', () => {
+  afterEach(async () => {
+    await Promise.all(childProcesses.splice(0).map(stopChildProcess))
+    await Promise.all(tempDirs.splice(0).map(tempDir => fs.rm(tempDir, {
+      force: true,
+      recursive: true,
+    })))
+  })
+
+  // Scenario: help output should still be a normal short-lived command.
+  it('should print help and exit', async () => {
+    // Arrange
+    const tempDir = await createTempDir()
+    const child = spawnCli(['--help'], tempDir)
+
+    // Act
+    const [code] = await once(child, 'exit')
+
+    // Assert
+    expect(code).toBe(0)
+  })
+
+  // Scenario: successful server startup should keep the CLI process alive.
+  it('should keep running after starting the proxy server', async () => {
+    // Arrange
+    const tempDir = await createTempDir()
+    const port = await getFreePort()
+    await fs.writeFile(path.join(tempDir, 'dev-proxy.config.ts'), `
+      export default {
+        routes: [{ paths: '/api', target: 'https://api.example.com' }],
+      }
+    `)
+
+    let output = ''
+    const child = spawnCli(['--config', './dev-proxy.config.ts', '--host', '127.0.0.1', '--port', String(port)], tempDir)
+    child.stdout.on('data', chunk => output += chunk.toString())
+    child.stderr.on('data', chunk => output += chunk.toString())
+
+    // Act
+    await waitForOutput(child, () => output, `[dev-proxy] listening on http://127.0.0.1:${port}`)
+    await new Promise(resolve => setTimeout(resolve, 100))
+    const response = await fetch(`http://127.0.0.1:${port}/not-proxied`)
+
+    // Assert
+    expect(child.exitCode).toBeNull()
+    expect(child.signalCode).toBeNull()
+    expect(response.status).toBe(404)
+  })
+})
diff --git a/packages/dev-proxy/src/cli.ts b/packages/dev-proxy/src/cli.ts
new file mode 100644
index 0000000000..05234cb359
--- /dev/null
+++ b/packages/dev-proxy/src/cli.ts
@@ -0,0 +1,56 @@
+import process from 'node:process'
+import { serve } from '@hono/node-server'
+import { loadDevProxyConfig, parseDevProxyCliArgs, resolveDevProxyServerOptions } from './config'
+import { createDevProxyApp } from './server'
+
+function printUsage() {
+  console.log(`Usage:
+  dev-proxy --config <path> [options]
+
+Options:
+  --config, -c <path>  Path to a dev proxy config file. Defaults to dev-proxy.config.ts.
+  --env-file <path>    Load environment variables before evaluating the config file.
+  --host <host>        Override the configured host.
+  --port <port>        Override the configured port.
+  --help, -h           Show this help message.`)
+}
+
+async function flushStandardStreams() {
+  await Promise.all([
+    new Promise<void>(resolve => process.stdout.write('', () => resolve())),
+    new Promise<void>(resolve => process.stderr.write('', () => resolve())),
+  ])
+}
+
+async function main() {
+  const cliOptions = parseDevProxyCliArgs(process.argv.slice(2))
+
+  if (cliOptions.help) {
+    printUsage()
+    return
+  }
+
+  const config = await loadDevProxyConfig(cliOptions.config, process.cwd(), {
+    envFile: cliOptions.envFile,
+  })
+  const { host, port } = resolveDevProxyServerOptions(config.server, cliOptions)
+  const app = createDevProxyApp(config)
+
+  serve({
+    fetch: app.fetch,
+    hostname: host,
+    port,
+  })
+
+  console.log(`[dev-proxy] listening on http://${host}:${port}`)
+}
+
+try {
+  await main()
+  await flushStandardStreams()
+}
+catch (error) {
+  console.error(error instanceof Error ? error.message : error)
+  await flushStandardStreams()
+  process.exit(1)
+}
diff --git a/packages/dev-proxy/src/config.spec.ts b/packages/dev-proxy/src/config.spec.ts
new file mode 100644
index 0000000000..6f681bcbae
--- /dev/null
+++ b/packages/dev-proxy/src/config.spec.ts
@@ -0,0 +1,145 @@
+/**
+ * @vitest-environment node
+ */
+import fs from 'node:fs/promises'
+import os from 'node:os'
+import path from 'node:path'
+import { afterEach, describe, expect, it } from 'vitest'
+import { loadDevProxyConfig, parseDevProxyCliArgs, resolveDevProxyServerOptions } from './config'
+
+const tempDirs: string[] = []
+
+const createTempDir = async () => {
+  const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'dev-proxy-test-'))
+  tempDirs.push(tempDir)
+  return tempDir
+}
+
+describe('dev proxy config', () => {
+  afterEach(async () => {
+    delete process.env.DEV_PROXY_TEST_PORT
+    delete process.env.DEV_PROXY_TEST_TARGET
+
+    await Promise.all(tempDirs.splice(0).map(tempDir => fs.rm(tempDir, {
+      force: true,
+      recursive: true,
+    })))
+  })
+
+  // Scenario: CLI options should support both inline and separated values.
+  it('should parse proxy CLI options', () => {
+    // Act
+    const options = parseDevProxyCliArgs([
+      '--config=./dev-proxy.config.ts',
+      '--env-file',
+      './.env.proxy',
+      '--host',
+      '0.0.0.0',
+      '--port',
+      '8083',
+    ])
+
+    // Assert
+    expect(options).toEqual({
+      config: './dev-proxy.config.ts',
+      envFile: './.env.proxy',
+      host: '0.0.0.0',
+      port: '8083',
+    })
+  })
+
+  // Scenario: removed target shortcuts should fail instead of silently doing the wrong thing.
+  it('should reject unsupported target shortcuts', () => {
+    // Assert
+    expect(() => parseDevProxyCliArgs(['--target', 'enterprise'])).toThrow('Unsupported dev proxy option')
+  })
+
+  // Scenario: package manager argument separators should not be treated as proxy options.
+  it('should ignore package manager argument separators', () => {
+    // Act
+    const options = parseDevProxyCliArgs(['--config', './dev-proxy.config.ts', '--', '--help'])
+
+    // Assert
+    expect(options).toEqual({
+      config: './dev-proxy.config.ts',
+      help: true,
+    })
+  })
+
+  // Scenario: CLI host and port should override config defaults.
+  it('should resolve server options with CLI overrides', () => {
+    // Act
+    const options = resolveDevProxyServerOptions({
+      host: '127.0.0.1',
+      port: 5001,
+    }, {
+      host: '0.0.0.0',
+      port: '9002',
+    })
+
+    // Assert
+    expect(options).toEqual({
+      host: '0.0.0.0',
+      port: 9002,
+    })
+  })
+
+  // Scenario: TS config files should load through c12.
+  it('should load a TypeScript config file', async () => {
+    // Arrange
+    const tempDir = await createTempDir()
+    await fs.writeFile(path.join(tempDir, 'dev-proxy.config.ts'), `
+      export default {
+        server: { host: '127.0.0.1', port: 7777 },
+        routes: [{ paths: ['/api', '/files'], target: 'https://api.example.com' }],
+      }
+    `)
+
+    // Act
+    const config = await loadDevProxyConfig('dev-proxy.config.ts', tempDir)
+
+    // Assert
+    expect(config.server).toEqual({
+      host: '127.0.0.1',
+      port: 7777,
+    })
+    expect(config.routes).toEqual([
+      {
+        paths: ['/api', '/files'],
+        target: 'https://api.example.com',
+      },
+    ])
+  })
+
+  // Scenario: env files should be loaded before the TypeScript config is evaluated.
+  it('should load a TypeScript config file with env file values', async () => {
+    // Arrange
+    const tempDir = await createTempDir()
+    await fs.writeFile(path.join(tempDir, '.env.proxy'), [
+      'DEV_PROXY_TEST_PORT=7788',
+      'DEV_PROXY_TEST_TARGET=https://env.example.com',
+    ].join('\n'))
+    await fs.writeFile(path.join(tempDir, 'dev-proxy.config.ts'), `
+      export default {
+        server: { port: Number(process.env.DEV_PROXY_TEST_PORT) },
+        routes: [{ paths: '/api', target: process.env.DEV_PROXY_TEST_TARGET }],
+      }
+    `)
+
+    // Act
+    const config = await loadDevProxyConfig('dev-proxy.config.ts', tempDir, {
+      envFile: '.env.proxy',
+    })
+
+    // Assert
+    expect(config.server).toEqual({
+      port: 7788,
+    })
+    expect(config.routes).toEqual([
+      {
+        paths: '/api',
+        target: 'https://env.example.com',
+      },
+    ])
+  })
+})
diff --git a/packages/dev-proxy/src/config.ts b/packages/dev-proxy/src/config.ts
new file mode 100644
index 0000000000..b23cb0a152
--- /dev/null
+++ b/packages/dev-proxy/src/config.ts
@@ -0,0 +1,129 @@
+import type { DotenvOptions } from 'c12'
+import type { DevProxyCliOptions, DevProxyConfig, DevProxyConfigLoadOptions, DevProxyServerConfig, ResolvedDevProxyServerOptions } from './types'
+import path from 'node:path'
+import { loadConfig } from 'c12'
+
+const DEFAULT_CONFIG_FILE = 'dev-proxy.config.ts'
+const DEFAULT_PROXY_HOST = '127.0.0.1'
+const DEFAULT_PROXY_PORT = 5001
+
+const OPTION_NAME_TO_KEY = {
+  '--config': 'config',
+  '-c': 'config',
+  '--env-file': 'envFile',
+  '--host': 'host',
+  '--port': 'port',
+} as const
+
+type OptionName = keyof typeof OPTION_NAME_TO_KEY
+
+const isOptionName = (value: string): value is OptionName => value in OPTION_NAME_TO_KEY
+
+const requireOptionValue = (name: string, value?: string) => {
+  if (!value || value.startsWith('-'))
+    throw new Error(`Missing value for ${name}.`)
+
+  return value
+}
+
+export const parseDevProxyCliArgs = (argv: readonly string[]): DevProxyCliOptions => {
+  const options: DevProxyCliOptions = {}
+
+  for (let index = 0; index < argv.length; index += 1) {
+    const arg = argv[index]!
+
+    if (arg === '--')
+      continue
+
+    if (arg === '--help' || arg === '-h') {
+      options.help = true
+      continue
+    }
+
+    const [rawName, inlineValue] = arg.split('=', 2)
+    const name = rawName ?? ''
+
+    if (!name.startsWith('-'))
+      continue
+
+    if (!isOptionName(name))
+      throw new Error(`Unsupported dev proxy option "${name}".`)
+
+    const key = OPTION_NAME_TO_KEY[name]
+    options[key] = inlineValue ?? requireOptionValue(name, argv[index + 1])
+
+    if (inlineValue === undefined)
+      index += 1
+  }
+
+  return options
+}
+
+const resolvePort = (rawPort: string | number) => {
+  const port = Number(rawPort)
+  if (!Number.isInteger(port) || port < 1 || port > 65535)
+    throw new Error(`Invalid proxy port "${rawPort}". Expected an integer between 1 and 65535.`)
+
+  return port
+}
+
+export const resolveDevProxyServerOptions = (
+  serverConfig: DevProxyServerConfig = {},
+  cliOptions: DevProxyCliOptions = {},
+): ResolvedDevProxyServerOptions => {
+  const configuredPort = cliOptions.port ?? serverConfig.port ?? DEFAULT_PROXY_PORT
+
+  return {
+    host: cliOptions.host || serverConfig.host || DEFAULT_PROXY_HOST,
+    port: resolvePort(configuredPort),
+  }
+}
+
+const isRecord = (value: unknown): value is Record<string, unknown> =>
+  typeof value === 'object' && value !== null
+
+export function assertDevProxyConfig(config: unknown): asserts config is DevProxyConfig {
+  if (!isRecord(config))
+    throw new Error('Dev proxy config must export an object.')
+
+  if (!Array.isArray(config.routes))
+    throw new Error('Dev proxy config must include a routes array.')
+}
+
+const resolveDotenvOptions = (
+  envFile: DevProxyConfigLoadOptions['envFile'],
+  cwd: string,
+): DotenvOptions | false => {
+  if (!envFile)
+    return false
+
+  const resolvedEnvFilePath = path.resolve(cwd, envFile)
+  return {
+    cwd: path.dirname(resolvedEnvFilePath),
+    fileName: path.basename(resolvedEnvFilePath),
+    interpolate: true,
+  }
+}
+
+export const loadDevProxyConfig = async (
+  configPath = DEFAULT_CONFIG_FILE,
+  cwd = process.cwd(),
+  options: DevProxyConfigLoadOptions = {},
+): Promise<DevProxyConfig> => {
+  const resolvedConfigPath = path.resolve(cwd, configPath)
+  const parsedPath = path.parse(resolvedConfigPath)
+  const { config: loadedConfig } = await loadConfig({
+    configFile: parsedPath.name,
+    cwd: parsedPath.dir,
+    dotenv: resolveDotenvOptions(options.envFile, cwd),
+    envName: false,
+    globalRc: false,
+    packageJson: false,
+    rcFile: false,
+  })
+
+  assertDevProxyConfig(loadedConfig)
+  return loadedConfig
+}
+
+export const defineDevProxyConfig = (config: DevProxyConfig) => config
diff --git a/packages/dev-proxy/src/cookies.spec.ts b/packages/dev-proxy/src/cookies.spec.ts
new file mode 100644
index 0000000000..4a1b614eeb
--- /dev/null
+++ b/packages/dev-proxy/src/cookies.spec.ts
@@ -0,0 +1,44 @@
+/**
+ * @vitest-environment node
+ */
+import { describe, expect, it } from 'vitest'
+import { rewriteCookieHeaderForUpstream, rewriteSetCookieHeadersForLocal } from './cookies'
+
+describe('dev proxy cookies', () => {
+  // Scenario: cookie names should only receive secure host prefixes when configured.
+  it('should rewrite configured cookie names for HTTPS upstream requests', () => {
+    // Act
+    const cookieHeader = rewriteCookieHeaderForUpstream('access_token=abc; theme=dark; passport-app=def', {
+      hostPrefixCookies: ['access_token', /^passport-/],
+      useHostPrefix: true,
+    })
+
+    // Assert
+    expect(cookieHeader).toBe('__Host-access_token=abc; theme=dark; __Host-passport-app=def')
+  })
+
+  // Scenario: HTTP upstreams should keep local cookie names even when rewrite config exists.
+  it('should keep local cookie names for HTTP upstream requests', () => {
+    // Act
+    const cookieHeader = rewriteCookieHeaderForUpstream('access_token=abc; refresh_token=def', {
+      hostPrefixCookies: ['access_token', 'refresh_token'],
+      useHostPrefix: false,
+    })
+
+    // Assert
+    expect(cookieHeader).toBe('access_token=abc; refresh_token=def')
+  })
+
+  // Scenario: upstream set-cookie headers should be converted into localhost-safe cookies.
+  it('should rewrite upstream set-cookie headers for local development', () => {
+    // Act
+    const cookies = rewriteSetCookieHeadersForLocal([
+      '__Host-access_token=abc; Path=/console/api; Domain=cloud.example.com; Secure; SameSite=None; Partitioned',
+    ])
+
+    // Assert
+    expect(cookies).toEqual([
+      'access_token=abc; Path=/; SameSite=Lax',
+    ])
+  })
+})
diff --git a/web/plugins/dev-proxy/cookies.ts b/packages/dev-proxy/src/cookies.ts
similarity index 58%
rename from web/plugins/dev-proxy/cookies.ts
rename to packages/dev-proxy/src/cookies.ts
index c606322e96..61fdb6abd4 100644
--- a/web/plugins/dev-proxy/cookies.ts
+++ b/packages/dev-proxy/src/cookies.ts
@@ -1,4 +1,4 @@
-const DEFAULT_PROXY_TARGET = 'https://cloud.dify.ai'
+import type { CookieRewriteOptions } from './types'
 
 const SECURE_COOKIE_PREFIX_PATTERN = /^__(Host|Secure)-/
 const SAME_SITE_NONE_PATTERN = /^samesite=none$/i
@@ -7,39 +7,43 @@ const COOKIE_DOMAIN_PATTERN = /^domain=/i
 const COOKIE_SECURE_PATTERN = /^secure$/i
 const COOKIE_PARTITIONED_PATTERN = /^partitioned$/i
 
-const HOST_PREFIX_COOKIE_NAMES = new Set([
-  'access_token',
-  'csrf_token',
-  'refresh_token',
-  'webapp_access_token',
-])
+const stripSecureCookiePrefix = (cookieName: string) => cookieName.replace(SECURE_COOKIE_PREFIX_PATTERN, '')
 
-const isPassportCookie = (cookieName: string) => cookieName.startsWith('passport-')
+const matchesCookieName = (cookieName: string, matcher: string | RegExp) =>
+  typeof matcher === 'string'
+    ? matcher === cookieName
+    : matcher.test(cookieName)
 
-const shouldUseHostPrefix = (cookieName: string) => {
-  const normalizedCookieName = cookieName.replace(SECURE_COOKIE_PREFIX_PATTERN, '')
-  return HOST_PREFIX_COOKIE_NAMES.has(normalizedCookieName) || isPassportCookie(normalizedCookieName)
+const shouldUseHostPrefix = (cookieName: string, options: CookieRewriteOptions) => {
+  const normalizedCookieName = stripSecureCookiePrefix(cookieName)
+
+  return options.hostPrefixCookies?.some(matcher => matchesCookieName(normalizedCookieName, matcher)) || false
 }
 
-const toUpstreamCookieName = (cookieName: string) => {
+const toUpstreamCookieName = (cookieName: string, options: CookieRewriteOptions) => {
   if (cookieName.startsWith('__Host-'))
     return cookieName
 
   if (cookieName.startsWith('__Secure-'))
-    return `__Host-${cookieName.replace(SECURE_COOKIE_PREFIX_PATTERN, '')}`
+    return `__Host-${stripSecureCookiePrefix(cookieName)}`
 
-  if (!shouldUseHostPrefix(cookieName))
+  if (!shouldUseHostPrefix(cookieName, options))
     return cookieName
 
   return `__Host-${cookieName}`
 }
 
-const toLocalCookieName = (cookieName: string) => cookieName.replace(SECURE_COOKIE_PREFIX_PATTERN, '')
+export const toLocalCookieName = (cookieName: string) => stripSecureCookiePrefix(cookieName)
 
-export const rewriteCookieHeaderForUpstream = (cookieHeader?: string) => {
+export const rewriteCookieHeaderForUpstream = (
+  cookieHeader: string | undefined,
+  options: CookieRewriteOptions & { useHostPrefix?: boolean },
+) => {
   if (!cookieHeader)
     return cookieHeader
 
+  const { useHostPrefix = true } = options
+
   return cookieHeader
     .split(/;\s*/)
     .filter(Boolean)
@@ -50,7 +54,11 @@ export const rewriteCookieHeaderForUpstream = (cookieHeader?: string) => {
 
       const cookieName = cookie.slice(0, separatorIndex).trim()
       const cookieValue = cookie.slice(separatorIndex + 1)
-      return `${toUpstreamCookieName(cookieName)}=${cookieValue}`
+      const upstreamCookieName = useHostPrefix
+        ? toUpstreamCookieName(cookieName, options)
+        : cookieName
+
+      return `${upstreamCookieName}=${cookieValue}`
     })
     .join('; ')
 }
@@ -84,15 +92,5 @@ const rewriteSetCookieValueForLocal = (setCookieValue: string) => {
   return [`${toLocalCookieName(cookieName)}=${cookieValue}`, ...rewrittenAttributes].join('; ')
 }
 
-export const rewriteSetCookieHeadersForLocal = (setCookieHeaders?: string | string[]): string[] | undefined => {
-  if (!setCookieHeaders)
-    return undefined
-
-  const normalizedHeaders = Array.isArray(setCookieHeaders)
-    ? setCookieHeaders
-    : [setCookieHeaders]
-
-  return normalizedHeaders.map(rewriteSetCookieValueForLocal)
-}
-
-export { DEFAULT_PROXY_TARGET }
+export const rewriteSetCookieHeadersForLocal = (setCookieHeaders: readonly string[]) =>
+  setCookieHeaders.map(rewriteSetCookieValueForLocal)
diff --git a/packages/dev-proxy/src/index.ts b/packages/dev-proxy/src/index.ts
new file mode 100644
index 0000000000..e35893b98f
--- /dev/null
+++ b/packages/dev-proxy/src/index.ts
@@ -0,0 +1,22 @@
+export {
+  assertDevProxyConfig,
+  defineDevProxyConfig,
+  loadDevProxyConfig,
+  parseDevProxyCliArgs,
+  resolveDevProxyServerOptions,
+} from './config'
+export { rewriteCookieHeaderForUpstream, rewriteSetCookieHeadersForLocal, toLocalCookieName } from './cookies'
+export { buildUpstreamUrl, createDevProxyApp, isAllowedDevOrigin, isAllowedLocalDevOrigin } from './server'
+export type {
+  CookieNameMatcher,
+  CookieRewriteOptions,
+  CreateDevProxyAppOptions,
+  DevProxyCliOptions,
+  DevProxyConfig,
+  DevProxyConfigLoadOptions,
+  DevProxyCorsAllowedOrigins,
+  DevProxyCorsConfig,
+  DevProxyRoute,
+  DevProxyServerConfig,
+  ResolvedDevProxyServerOptions,
+} from './types'
diff --git a/packages/dev-proxy/src/server.spec.ts b/packages/dev-proxy/src/server.spec.ts
new file mode 100644
index 0000000000..32c16a1807
--- /dev/null
+++ b/packages/dev-proxy/src/server.spec.ts
@@ -0,0 +1,242 @@
+/**
+ * @vitest-environment node
+ */
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { buildUpstreamUrl, createDevProxyApp, isAllowedDevOrigin } from './server'
+
+describe('dev proxy server', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  // Scenario: target paths should not be duplicated when the incoming route already includes them.
+  it('should preserve prefixed targets when building upstream URLs', () => {
+    // Act
+    const url = buildUpstreamUrl('https://api.example.com/console/api', '/console/api/apps', '?page=1')
+
+    // Assert
+    expect(url.href).toBe('https://api.example.com/console/api/apps?page=1')
+  })
+
+  // Scenario: only localhost dev origins should be reflected for credentialed CORS by default.
+  it('should only allow local development origins by default', () => {
+    // Assert
+    expect(isAllowedDevOrigin('http://localhost:3000')).toBe(true)
+    expect(isAllowedDevOrigin('http://127.0.0.1:3000')).toBe(true)
+    expect(isAllowedDevOrigin('https://example.com')).toBe(false)
+  })
+
+  // Scenario: explicit CORS origins should support non-local development hosts.
+  it('should allow explicitly configured origins', () => {
+    // Assert
+    expect(isAllowedDevOrigin('https://app.example.com', ['https://app.example.com'])).toBe(true)
+    expect(isAllowedDevOrigin('https://other.example.com', ['https://app.example.com'])).toBe(false)
+  })
+
+  // Scenario: proxy requests should rewrite cookies and surface credentialed CORS headers when configured.
+  it('should proxy api requests with configured local cookie rewriting', async () => {
+    // Arrange
+    const fetchImpl = vi.fn<typeof fetch>().mockResolvedValue(new Response('ok', {
+      status: 200,
+      headers: [
+        ['content-encoding', 'br'],
+        ['content-length', '123'],
+        ['set-cookie', '__Host-access_token=abc; Path=/console/api; Domain=cloud.example.com; Secure; SameSite=None'],
+        ['transfer-encoding', 'chunked'],
+      ],
+    }))
+    const app = createDevProxyApp({
+      routes: [
+        {
+          paths: '/console/api',
+          target: 'https://cloud.example.com',
+          cookieRewrite: {
+            hostPrefixCookies: ['access_token'],
+          },
+        },
+      ],
+      fetchImpl,
+    })
+
+    // Act
+    const response = await app.request('http://127.0.0.1:5001/console/api/apps?page=1', {
+      headers: {
+        'Origin': 'http://localhost:3000',
+        'Cookie': 'access_token=abc; theme=dark',
+        'Accept-Encoding': 'zstd, br, gzip',
+      },
+    })
+
+    // Assert
+    expect(fetchImpl).toHaveBeenCalledTimes(1)
+    expect(fetchImpl).toHaveBeenCalledWith(
+      new URL('https://cloud.example.com/console/api/apps?page=1'),
+      expect.objectContaining({
+        method: 'GET',
+        headers: expect.any(Headers),
+      }),
+    )
+
+    const requestHeaders = fetchImpl.mock.calls[0]?.[1]?.headers
+    if (!(requestHeaders instanceof Headers))
+      throw new Error('Expected proxy request headers to be Headers')
+
+    expect(requestHeaders.get('cookie')).toBe('__Host-access_token=abc; theme=dark')
+    expect(requestHeaders.get('origin')).toBe('https://cloud.example.com')
+    expect(requestHeaders.get('accept-encoding')).toBe('identity')
+    expect(response.headers.get('access-control-allow-origin')).toBe('http://localhost:3000')
+    expect(response.headers.get('access-control-allow-credentials')).toBe('true')
+    expect(response.headers.get('content-encoding')).toBeNull()
+    expect(response.headers.get('content-length')).toBeNull()
+    expect(response.headers.get('transfer-encoding')).toBeNull()
+    expect(response.headers.getSetCookie()).toEqual([
+      'access_token=abc; Path=/; SameSite=Lax',
+    ])
+  })
+
+  // Scenario: generic proxy routes should not know Dify cookie names by default.
+  it('should not rewrite cookie names when cookie rewriting is not configured', async () => {
+    // Arrange
+    const fetchImpl = vi.fn<typeof fetch>().mockResolvedValue(new Response('ok'))
+    const app = createDevProxyApp({
+      routes: [
+        {
+          paths: '/api',
+          target: 'https://api.example.com',
+        },
+      ],
+      fetchImpl,
+    })
+
+    // Act
+    await app.request('http://127.0.0.1:5001/api/messages', {
+      headers: {
+        Cookie: 'access_token=abc; refresh_token=def',
+      },
+    })
+
+    // Assert
+    const requestHeaders = fetchImpl.mock.calls[0]?.[1]?.headers
+    if (!(requestHeaders instanceof Headers))
+      throw new Error('Expected proxy request headers to be Headers')
+
+    expect(requestHeaders.get('cookie')).toBe('access_token=abc; refresh_token=def')
+  })
+
+  // Scenario: local HTTP upstreams expect local cookie names even when cookie rewriting is configured.
+  it('should keep local cookie names for HTTP upstream targets', async () => {
+    // Arrange
+    const fetchImpl = vi.fn<typeof fetch>().mockResolvedValue(new Response('ok'))
+    const app = createDevProxyApp({
+      routes: [
+        {
+          paths: '/console/api',
+          target: 'http://127.0.0.1:5001',
+          cookieRewrite: {
+            hostPrefixCookies: ['access_token', 'refresh_token'],
+          },
+        },
+      ],
+      fetchImpl,
+    })
+
+    // Act
+    await app.request('http://127.0.0.1:5010/console/api/account/profile', {
+      headers: {
+        Cookie: 'access_token=abc; refresh_token=def',
+      },
+    })
+
+    // Assert
+    const requestHeaders = fetchImpl.mock.calls[0]?.[1]?.headers
+    if (!(requestHeaders instanceof Headers))
+      throw new Error('Expected proxy request headers to be Headers')
+
+    expect(requestHeaders.get('cookie')).toBe('access_token=abc; refresh_token=def')
+  })
+
+  // Scenario: custom route paths should support independent upstream targets.
+  it('should proxy custom route paths to their configured targets', async () => {
+    // Arrange
+    const fetchImpl = vi.fn<typeof fetch>().mockResolvedValue(new Response('ok'))
+    const app = createDevProxyApp({
+      routes: [
+        {
+          paths: '/api',
+          target: 'https://api.example.com',
+        },
+        {
+          paths: '/files',
+          target: 'https://files.example.com/assets',
+        },
+      ],
+      fetchImpl,
+    })
+
+    // Act
+    await app.request('http://127.0.0.1:5001/api/messages')
+    await app.request('http://127.0.0.1:5001/files/logo.png?size=small')
+
+    // Assert
+    expect(fetchImpl.mock.calls.map(([url]) => url.toString())).toEqual([
+      'https://api.example.com/api/messages',
+      'https://files.example.com/assets/files/logo.png?size=small',
+    ])
+  })
+
+  // Scenario: routes are matched in config order so callers can put specific routes first.
+  it('should prefer earlier route entries', async () => {
+    // Arrange
+    const fetchImpl = vi.fn<typeof fetch>().mockResolvedValue(new Response('ok'))
+    const app = createDevProxyApp({
+      routes: [
+        {
+          paths: '/api/enterprise',
+          target: 'https://enterprise.example.com',
+        },
+        {
+          paths: '/api',
+          target: 'https://api.example.com',
+        },
+      ],
+      fetchImpl,
+    })
+
+    // Act
+    await app.request('http://127.0.0.1:5001/api/enterprise/sso/login')
+
+    // Assert
+    expect(fetchImpl.mock.calls.map(([url]) => url.toString())).toEqual([
+      'https://enterprise.example.com/api/enterprise/sso/login',
+    ])
+  })
+
+  // Scenario: preflight requests should advertise allowed headers for credentialed cross-origin calls.
+  it('should answer CORS preflight requests', async () => {
+    // Arrange
+    const app = createDevProxyApp({
+      routes: [
+        {
+          paths: '/api',
+          target: 'https://api.example.com',
+        },
+      ],
+      fetchImpl: vi.fn<typeof fetch>(),
+    })
+
+    // Act
+    const response = await app.request('http://127.0.0.1:5001/api/messages', {
+      method: 'OPTIONS',
+      headers: {
+        'Origin': 'http://localhost:3000',
+        'Access-Control-Request-Headers': 'authorization,content-type,x-csrf-token',
+      },
+    })
+
+    // Assert
+    expect(response.status).toBe(204)
+    expect(response.headers.get('access-control-allow-origin')).toBe('http://localhost:3000')
+    expect(response.headers.get('access-control-allow-credentials')).toBe('true')
+    expect(response.headers.get('access-control-allow-headers')).toBe('authorization,content-type,x-csrf-token')
+  })
+})
diff --git a/packages/dev-proxy/src/server.ts b/packages/dev-proxy/src/server.ts
new file mode 100644
index 0000000000..79654750da
--- /dev/null
+++ b/packages/dev-proxy/src/server.ts
@@ -0,0 +1,254 @@
+import type { Context, Hono } from 'hono'
+import type { CookieRewriteOptions, CreateDevProxyAppOptions, DevProxyCorsAllowedOrigins, DevProxyRoute } from './types'
+import { Hono as HonoApp } from 'hono'
+import { rewriteCookieHeaderForUpstream, rewriteSetCookieHeadersForLocal } from './cookies'
+
+const LOCAL_DEV_HOSTS = new Set(['localhost', '127.0.0.1', '[::1]', '::1'])
+const ALLOW_METHODS = 'GET,HEAD,POST,PUT,PATCH,DELETE,OPTIONS'
+const DEFAULT_ALLOW_HEADERS = 'Authorization, Content-Type, X-CSRF-Token'
+const UPSTREAM_ACCEPT_ENCODING = 'identity'
+const RESPONSE_HEADERS_TO_DROP = [
+  'connection',
+  'content-encoding',
+  'content-length',
+  'keep-alive',
+  'proxy-authenticate',
+  'proxy-authorization',
+  'te',
+  'trailer',
+  'transfer-encoding',
+  'upgrade',
+] as const
+
+const appendHeaderValue = (headers: Headers, name: string, value: string) => {
+  const currentValue = headers.get(name)
+  if (!currentValue) {
+    headers.set(name, value)
+    return
+  }
+
+  if (currentValue.split(',').map(item => item.trim()).includes(value))
+    return
+
+  headers.set(name, `${currentValue}, ${value}`)
+}
+
+export const isAllowedLocalDevOrigin = (origin?: string | null) => {
+  if (!origin)
+    return false
+
+  try {
+    const url = new URL(origin)
+    return LOCAL_DEV_HOSTS.has(url.hostname)
+  }
+  catch {
+    return false
+  }
+}
+
+export const isAllowedDevOrigin = (
+  origin?: string | null,
+  allowedOrigins: DevProxyCorsAllowedOrigins = 'local',
+) => {
+  if (!origin)
+    return false
+
+  if (allowedOrigins === 'local')
+    return isAllowedLocalDevOrigin(origin)
+
+  return allowedOrigins.includes(origin)
+}
+
+const applyCorsHeaders = (
+  headers: Headers,
+  origin: string | undefined | null,
+  allowedOrigins: DevProxyCorsAllowedOrigins = 'local',
+) => {
+  if (!isAllowedDevOrigin(origin, allowedOrigins))
+    return
+
+  headers.set('Access-Control-Allow-Origin', origin!)
+  headers.set('Access-Control-Allow-Credentials', 'true')
+  appendHeaderValue(headers, 'Vary', 'Origin')
+}
+
+export const buildUpstreamUrl = (target: string, requestPath: string, search = '') => {
+  const targetUrl = new URL(target)
+  const normalizedTargetPath = targetUrl.pathname === '/' ? '' : targetUrl.pathname.replace(/\/$/, '')
+  const normalizedRequestPath = requestPath.startsWith('/') ? requestPath : `/${requestPath}`
+  const hasTargetPrefix = normalizedTargetPath
+    && (normalizedRequestPath === normalizedTargetPath || normalizedRequestPath.startsWith(`${normalizedTargetPath}/`))
+
+  targetUrl.pathname = hasTargetPrefix
+    ? normalizedRequestPath
+    : `${normalizedTargetPath}${normalizedRequestPath}`
+  targetUrl.search = search
+
+  return targetUrl
+}
+
+const createProxyRequestHeaders = (
+  request: Request,
+  targetUrl: URL,
+  cookieRewrite: CookieRewriteOptions | false | undefined,
+) => {
+  const headers = new Headers(request.headers)
+  headers.delete('host')
+  headers.set('accept-encoding', UPSTREAM_ACCEPT_ENCODING)
+
+  if (headers.has('origin'))
+    headers.set('origin', targetUrl.origin)
+
+  if (cookieRewrite) {
+    const rewrittenCookieHeader = rewriteCookieHeaderForUpstream(headers.get('cookie') || undefined, {
+      ...cookieRewrite,
+      useHostPrefix: targetUrl.protocol === 'https:',
+    })
+    if (rewrittenCookieHeader)
+      headers.set('cookie', rewrittenCookieHeader)
+  }
+
+  return headers
+}
+
+const getSetCookieHeaders = (headers: Headers) => {
+  const headersWithGetSetCookie = headers as Headers & { getSetCookie?: () => string[] }
+  const setCookieHeaders = headersWithGetSetCookie.getSetCookie?.()
+  if (setCookieHeaders?.length)
+    return setCookieHeaders
+
+  const setCookie = headers.get('set-cookie')
+  return setCookie ? [setCookie] : []
+}
+
+const createUpstreamResponseHeaders = (
+  response: Response,
+  requestOrigin: string | undefined | null,
+  allowedOrigins: DevProxyCorsAllowedOrigins,
+  cookieRewrite: CookieRewriteOptions | false | undefined,
+) => {
+  const headers = new Headers(response.headers)
+  RESPONSE_HEADERS_TO_DROP.forEach(header => headers.delete(header))
+  headers.delete('set-cookie')
+
+  const setCookieHeaders = getSetCookieHeaders(response.headers)
+  const responseSetCookieHeaders = cookieRewrite
+    ? rewriteSetCookieHeadersForLocal(setCookieHeaders)
+    : setCookieHeaders
+
+  responseSetCookieHeaders.forEach((cookie) => {
+    headers.append('set-cookie', cookie)
+  })
+
+  applyCorsHeaders(headers, requestOrigin, allowedOrigins)
+  return headers
+}
+
+const proxyRequest = async (
+  context: Context,
+  route: DevProxyRoute,
+  fetchImpl: typeof globalThis.fetch,
+  allowedOrigins: DevProxyCorsAllowedOrigins,
+) => {
+  const requestUrl = new URL(context.req.url)
+  const targetUrl = buildUpstreamUrl(route.target, requestUrl.pathname, requestUrl.search)
+  const requestHeaders = createProxyRequestHeaders(context.req.raw, targetUrl, route.cookieRewrite)
+  const requestInit: RequestInit & { duplex?: 'half' } = {
+    method: context.req.method,
+    headers: requestHeaders,
+    redirect: 'manual',
+  }
+
+  if (context.req.method !== 'GET' && context.req.method !== 'HEAD') {
+    requestInit.body = context.req.raw.body
+    requestInit.duplex = 'half'
+  }
+
+  const upstreamResponse = await fetchImpl(targetUrl, requestInit)
+  const responseHeaders = createUpstreamResponseHeaders(
+    upstreamResponse,
+    context.req.header('origin'),
+    allowedOrigins,
+    route.cookieRewrite,
+  )
+
+  return new Response(upstreamResponse.body, {
+    status: upstreamResponse.status,
+    statusText: upstreamResponse.statusText,
+    headers: responseHeaders,
+  })
+}
+
+const normalizeRoutePaths = (paths: DevProxyRoute['paths']) => Array.isArray(paths) ? paths : [paths]
+
+const registerProxyRoute = (
+  app: Hono,
+  route: DevProxyRoute,
+  path: string,
+  fetchImpl: typeof globalThis.fetch,
+  allowedOrigins: DevProxyCorsAllowedOrigins,
+) => {
+  if (!path.startsWith('/'))
+    throw new Error(`Invalid dev proxy route path "${path}". Paths must start with "/".`)
+
+  app.all(path, context => proxyRequest(context, route, fetchImpl, allowedOrigins))
+  app.all(`${path}/*`, context => proxyRequest(context, route, fetchImpl, allowedOrigins))
+}
+
+const registerProxyRoutes = (
+  app: Hono,
+  routes: readonly DevProxyRoute[],
+  fetchImpl: typeof globalThis.fetch,
+  allowedOrigins: DevProxyCorsAllowedOrigins,
+) => {
+  routes.forEach((route) => {
+    normalizeRoutePaths(route.paths).forEach((path) => {
+      registerProxyRoute(app, route, path, fetchImpl, allowedOrigins)
+    })
+  })
+}
+
+export const createDevProxyApp = (options: CreateDevProxyAppOptions) => {
+  const app = new HonoApp()
+  const fetchImpl = options.fetchImpl || globalThis.fetch
+  const logger = options.logger || console
+  const allowedOrigins = options.cors?.allowedOrigins || 'local'
+
+  app.onError((error, context) => {
+    logger.error('[dev-proxy]', error)
+
+    const headers = new Headers()
+    applyCorsHeaders(headers, context.req.header('origin'), allowedOrigins)
+
+    return new Response('Upstream proxy request failed.', {
+      status: 502,
+      headers,
+    })
+  })
+
+  app.use('*', async (context, next) => {
+    if (context.req.method === 'OPTIONS') {
+      const headers = new Headers()
+      applyCorsHeaders(headers, context.req.header('origin'), allowedOrigins)
+      headers.set('Access-Control-Allow-Methods', ALLOW_METHODS)
+      headers.set(
+        'Access-Control-Allow-Headers',
+        context.req.header('Access-Control-Request-Headers') || DEFAULT_ALLOW_HEADERS,
+      )
+      if (context.req.header('Access-Control-Request-Private-Network') === 'true')
+        headers.set('Access-Control-Allow-Private-Network', 'true')
+
+      return new Response(null, {
+        status: 204,
+        headers,
+      })
+    }
+
+    await next()
+    applyCorsHeaders(context.res.headers, context.req.header('origin'), allowedOrigins)
+  })
+
+  registerProxyRoutes(app, options.routes, fetchImpl, allowedOrigins)
+
+  return app
+}
diff --git a/packages/dev-proxy/src/types.ts b/packages/dev-proxy/src/types.ts
new file mode 100644
index 0000000000..2c42b2f7fb
--- /dev/null
+++ b/packages/dev-proxy/src/types.ts
@@ -0,0 +1,50 @@
+export type DevProxyServerConfig = {
+  host?: string
+  port?: number
+}
+
+export type DevProxyCorsAllowedOrigins = 'local' | readonly string[]
+
+export type DevProxyCorsConfig = {
+  allowedOrigins?: DevProxyCorsAllowedOrigins
+}
+
+export type CookieNameMatcher = string | RegExp
+
+export type CookieRewriteOptions = {
+  hostPrefixCookies?: readonly CookieNameMatcher[]
+}
+
+export type DevProxyRoute = {
+  paths: string | readonly string[]
+  target: string
+  cookieRewrite?: CookieRewriteOptions | false
+}
+
+export type DevProxyConfig = {
+  server?: DevProxyServerConfig
+  routes: readonly DevProxyRoute[]
+  cors?: DevProxyCorsConfig
+}
+
+export type DevProxyCliOptions = {
+  config?: string
+  envFile?: string
+  host?: string
+  port?: string
+  help?: boolean
+}
+
+export type DevProxyConfigLoadOptions = {
+  envFile?: string | false
+}
+
+export type ResolvedDevProxyServerOptions = {
+  host: string
+  port: number
+}
+
+export type CreateDevProxyAppOptions = Pick<DevProxyConfig, 'routes' | 'cors'> & {
+  fetchImpl?: typeof globalThis.fetch
+  logger?: Pick<Console, 'error'>
+}
diff --git a/packages/dev-proxy/tsconfig.json b/packages/dev-proxy/tsconfig.json
new file mode 100644
index 0000000000..813a9bd8a3
--- /dev/null
+++ b/packages/dev-proxy/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "extends": "@dify/tsconfig/node.json",
+  "compilerOptions": {
+    "types": [
+      "node",
+      "vitest/globals"
+    ]
+  },
+  "include": [
+    "src/**/*.ts",
+    "vite.config.ts"
+  ],
+  "exclude": [
+    "node_modules",
+    "dist"
+  ]
+}
diff --git a/packages/dev-proxy/vite.config.ts b/packages/dev-proxy/vite.config.ts
new file mode 100644
index 0000000000..d060ae036e
--- /dev/null
+++ b/packages/dev-proxy/vite.config.ts
@@ -0,0 +1,27 @@
+import { defineConfig } from 'vite-plus'
+
+export default defineConfig({
+  pack: {
+    clean: true,
+    deps: {
+      neverBundle: [
+        '@hono/node-server',
+        'c12',
+        'hono',
+      ],
+    },
+    entry: [
+      'src/index.ts',
+      'src/cli.ts',
+    ],
+    format: ['esm'],
+    outDir: 'dist',
+    platform: 'node',
+    sourcemap: true,
+    target: 'node22',
+    treeshake: true,
+  },
+  test: {
+    environment: 'node',
+  },
+})
diff --git a/packages/dify-ui/.storybook/storybook.css b/packages/dify-ui/.storybook/storybook.css
index e9796fd046..ca76cd2968 100644
--- a/packages/dify-ui/.storybook/storybook.css
+++ b/packages/dify-ui/.storybook/storybook.css
@@ -1,6 +1,9 @@
 @import 'tailwindcss';
 
-@config '../tailwind.config.ts';
+@plugin '../src/plugins/icons.ts';
+
+@source '../src';
+@source '../.storybook';
 
 @import '../src/styles/styles.css';
 
diff --git a/packages/dify-ui/AGENTS.md b/packages/dify-ui/AGENTS.md
index 4a7fe2f22a..6eadd200f0 100644
--- a/packages/dify-ui/AGENTS.md
+++ b/packages/dify-ui/AGENTS.md
@@ -1,6 +1,6 @@
 # @langgenius/dify-ui
 
-Shared design tokens, the `cn()` utility, a Tailwind CSS preset, and headless primitive components consumed by `web/`.
+Shared design tokens, the `cn()` utility, CSS-first Tailwind styles, and headless primitive components consumed by `web/`.
 
 ## Component Authoring Rules
 
@@ -9,6 +9,7 @@ Shared design tokens, the `cn()` utility, a Tailwind CSS preset, and headless pr
 - No imports from `web/`. No dependencies on next / i18next / ky / jotai / zustand.
 - One component per folder: `src/<name>/index.tsx`, optional `index.stories.tsx` and `__tests__/index.spec.tsx`. Add a matching `./<name>` subpath to `package.json#exports`.
 - Props pattern: `Omit<BaseXxx.Root.Props, 'className' | ...> & VariantProps<typeof xxxVariants> & { /* custom */ }`.
+- Use plain `Omit<...>` only for non-union Base UI props. When a prop changes the valid shape of related props (for example `value` / `defaultValue`, `multiple` / `value`, or `clearable` / `onChange`), model that relationship with an explicit discriminated union or a distributive helper instead of flattening the props.
 - When a component accepts a prop typed from a shared internal module, `export type` it from that component so consumers import it from the component subpath.
 
 ## Overlay Primitive Selection: Tooltip vs PreviewCard vs Popover
@@ -51,9 +52,33 @@ The Figma design system uses `--radius/*` tokens whose scale is **offset by one
 
 ### Rules
 
-- **Do not** add custom `borderRadius` values to `tailwind-preset.ts`. We use Tailwind v4 defaults and arbitrary values (`rounded-[Npx]`) for sizes without a standard equivalent.
+- **Do not** add custom `borderRadius` theme values. We use Tailwind v4 defaults and arbitrary values (`rounded-[Npx]`) for sizes without a standard equivalent.
 - **Do not** use `radius-*` as CSS class names. The old `@utility radius-*` definitions have been removed.
 - When the Figma MCP returns `rounded-[var(--radius/sm, 6px)]`, convert it to the standard Tailwind class from the table above (e.g. `rounded-md`).
 - For values without a standard Tailwind equivalent (10px, 20px, 28px), use arbitrary values like `rounded-[10px]`.
 
+## Search / Picker Primitive Selection: Autocomplete vs Combobox vs Select
+
+Pick by whether the user is entering free-form text, choosing a remembered value, or selecting from a closed list.
+
+Base UI decision rules:
+
+- [Autocomplete docs]: use `Combobox` instead of `Autocomplete` if the selection should be remembered and the input value cannot be custom.
+- [Combobox docs]: do not use `Combobox` for simple search widgets that require unrestricted text entry; use `Autocomplete` instead.
+
+Apply this split in Dify UI:
+
+- `Autocomplete` — free-form text input with optional suggestions or completions. The input value may be custom and does not necessarily become a selected option. Use for search boxes, command-style suggestions, tag suggestions, and async text completion.
+- `Combobox` — searchable picker whose value is one or more selected items from a collection. The chosen value is remembered by the root, and free-form text is not the final value. Use for model pickers, user pickers, dataset/document pickers, and multi-select chips.
+- `Select` — closed-list picker without text entry. Use when the option set is small or already scannable and filtering is unnecessary.
+
+Composition rules:
+
+- Keep Base UI primitive semantics visible in the public API. Export compound parts such as `ComboboxInputGroup`, `ComboboxInput`, `ComboboxContent`, `ComboboxList`, `ComboboxItem`, and `ComboboxItemIndicator` instead of wrapping them into one business component.
+- For `Combobox` multiple selection, follow the official chips pattern: `ComboboxInputGroup` contains `ComboboxChips`, `ComboboxValue` renders `ComboboxChip` items, and `ComboboxInput` remains inside the chips row. Chips should wrap and let the input group grow vertically instead of forcing horizontal overflow.
+- Content primitives must own their Base UI `Portal` and use `z-50` on `Positioner`, matching the overlay contract in `README.md`. Toast owns `z-60`.
+- Use `w-(--anchor-width)` with viewport-aware max-width for `Autocomplete` and `Combobox` popups. Do not add `min-w-(--anchor-width)` when it would defeat available-width clamping.
+
+[Autocomplete docs]: https://base-ui.com/react/components/autocomplete.md#usage-guidelines
+[Combobox docs]: https://base-ui.com/react/components/combobox.md#usage-guidelines
 [docs]: https://base-ui.com/react/components/tooltip#infotips
diff --git a/packages/dify-ui/README.md b/packages/dify-ui/README.md
index cd9485c400..010fb3e56d 100644
--- a/packages/dify-ui/README.md
+++ b/packages/dify-ui/README.md
@@ -1,6 +1,6 @@
 # @langgenius/dify-ui
 
-Shared UI primitives, design tokens, Tailwind preset, and the `cn()` utility consumed by Dify's `web/` app.
+Shared UI primitives, design tokens, CSS-first Tailwind styles, and the `cn()` utility consumed by Dify's `web/` app.
 
 The primitives are thin, opinionated wrappers around [Base UI] headless components, styled with `cva` + `cn` and Dify design tokens.
 
@@ -28,6 +28,7 @@ Always import from a **subpath export** — there is no barrel:
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
 import { Dialog, DialogContent, DialogTrigger } from '@langgenius/dify-ui/dialog'
+import { Drawer, DrawerPopup, DrawerTrigger } from '@langgenius/dify-ui/drawer'
 import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
 import '@langgenius/dify-ui/styles.css' // once, in the app root
 ```
@@ -36,22 +37,36 @@ Importing from `@langgenius/dify-ui` (no subpath) is intentionally not supported
 
 ## Primitives
 
-| Category | Subpath                                                                                                            | Notes                                             |
-| -------- | ------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------- |
-| Overlay  | `./alert-dialog`, `./context-menu`, `./dialog`, `./dropdown-menu`, `./popover`, `./select`, `./toast`, `./tooltip` | Portalled. See [Overlay & portal contract] below. |
-| Form     | `./number-field`, `./slider`, `./switch`                                                                           | Controlled / uncontrolled per Base UI defaults.   |
-| Layout   | `./scroll-area`                                                                                                    | Custom-styled scrollbar over the host viewport.   |
-| Media    | `./avatar`, `./button`                                                                                             | Button exposes `cva` variants.                    |
+| Category | Subpath                                                                                                                                                        | Notes                                             |
+| -------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------- |
+| Overlay  | `./alert-dialog`, `./autocomplete`, `./combobox`, `./context-menu`, `./dialog`, `./drawer`, `./dropdown-menu`, `./popover`, `./select`, `./toast`, `./tooltip` | Portalled. See [Overlay & portal contract] below. |
+| Form     | `./autocomplete`, `./combobox`, `./number-field`, `./slider`, `./switch`                                                                                       | Controlled / uncontrolled per Base UI defaults.   |
+| Layout   | `./scroll-area`                                                                                                                                                | Custom-styled scrollbar over the host viewport.   |
+| Media    | `./avatar`, `./button`                                                                                                                                         | Button exposes `cva` variants.                    |
 
 Utilities:
 
 - `./cn` — `clsx` + `tailwind-merge` wrapper. Use this for conditional class composition.
-- `./tailwind-preset` — Tailwind v4 preset with Dify tokens. Apps extend it from their own `tailwind.config.ts`.
-- `./styles.css` — the one CSS entry that ships the design tokens, theme variables, and base reset. Import it once from the app root.
+- `./styles.css` — the one CSS entry that ships the design tokens, theme variables, and project utilities/components. Import it once from the app root.
+
+## Tailwind CSS v4 integration
+
+This package uses Tailwind CSS v4's CSS-first configuration model. Consumers should import Tailwind from their own root stylesheet, then import this package's CSS entry:
+
+```css
+@import 'tailwindcss';
+@import '@langgenius/dify-ui/styles.css';
+```
+
+If a consumer uses Dify UI source files through the workspace, add an explicit source so Tailwind can detect utility classes:
+
+```css
+@source '../packages/dify-ui/src';
+```
 
 ## Overlay & portal contract
 
-All overlay primitives (`dialog`, `alert-dialog`, `popover`, `dropdown-menu`, `context-menu`, `select`, `tooltip`, `toast`) render their content inside a [Base UI Portal] attached to `document.body`. This is the Base UI default — see the upstream [Portals][Base UI Portal] docs for the underlying behavior. Consumers **do not** need to wrap anything in a portal manually.
+Overlay primitives render their floating surfaces inside a [Base UI Portal] attached to `document.body`. This is the Base UI default — see the upstream [Portals][Base UI Portal] docs for the underlying behavior. Convenience content components such as `DialogContent`, `PopoverContent`, and `SelectContent` own their portal internally; primitives with explicit portal anatomy such as `Drawer` expose the matching `DrawerPortal` part so consumers can compose the full Base UI structure.
 
 ### Root isolation requirement
 
@@ -69,21 +84,28 @@ Equivalent: any root element with `isolation: isolate` in CSS. Without it, overl
 
 Every overlay primitive uses a single, shared z-index. Do **not** override it at call sites.
 
-| Layer                                                                               | z-index  | Where                                                                      |
-| ----------------------------------------------------------------------------------- | -------- | -------------------------------------------------------------------------- |
-| Overlays (Dialog, AlertDialog, Popover, DropdownMenu, ContextMenu, Select, Tooltip) | `z-1002` | Positioner / Backdrop                                                      |
-| Toast viewport                                                                      | `z-1003` | One layer above overlays so notifications are never hidden under a dialog. |
+| Layer                                                                                                               | z-index | Where                                                                      |
+| ------------------------------------------------------------------------------------------------------------------- | ------- | -------------------------------------------------------------------------- |
+| Overlays (Dialog, AlertDialog, Autocomplete, Combobox, Drawer, Popover, DropdownMenu, ContextMenu, Select, Tooltip) | `z-50`  | Positioner / Backdrop                                                      |
+| Toast viewport                                                                                                      | `z-60`  | One layer above overlays so notifications are never hidden under a dialog. |
 
-Rationale: during Dify's migration from legacy `portal-to-follow-elem` / `base/modal` / `base/dialog` overlays to this package, new and old overlays coexist in the DOM. `z-1002` sits above any common legacy layer, eliminating per-call-site z-index hacks. Among themselves, new primitives share the same z-index and **rely on DOM order** for stacking — the portal mounted later wins.
+Rationale: Dify UI owns the normal application overlay layer. Overlay primitives share `z-50` and **rely on DOM order** for stacking — the portal mounted later wins. Toast owns `z-60` so notifications remain visible above dialogs, popovers, and other portalled surfaces without falling back to `z-9999`.
 
-See `[web/docs/overlay-migration.md](../../web/docs/overlay-migration.md)` for the Dify-web migration history and the remaining legacy allowlist. Once the legacy overlays are gone, the values in this table can drop back to `z-50` / `z-51`.
+See `[web/docs/overlay.md](../../web/docs/overlay.md)` for the web app overlay best practices.
 
 ### Rules
 
-- Never add `z-1003` / `z-9999` / etc. overrides on primitives from this package. If something is getting clipped, the **parent** overlay (typically a legacy one) is the problem and should be migrated.
-- Never portal an overlay manually on top of our primitives — use `DialogTrigger`, `PopoverTrigger`, etc. Base UI handles focus management, scroll-locking, and dismissal.
+- Never add ad hoc `z-*` overrides on primitives from this package. If something is getting clipped, fix the parent overlay structure instead of raising the child primitive.
+- Never create an extra manual portal on top of our primitives — use the exported content / portal parts such as `DialogContent`, `PopoverContent`, and `DrawerPortal`. Base UI handles focus management, scroll-locking, and dismissal.
 - When a primitive needs additional presentation chrome (e.g. a custom backdrop), add it **inside** the exported component, not at call sites.
 
+### Tooltip, infotip, and popover semantics
+
+- Use `Tooltip` only for short, non-interactive visual labels. The trigger must already have visible text or an `aria-label`; the tooltip is not the accessible name and must not contain links, buttons, forms, or structured prose.
+- Use `Popover` for explanatory content, long text, rich layout, or anything users may need to reach on touch or with assistive technology. In `web/`, the `Infotip` wrapper is the preferred pattern for a `?` help glyph backed by `Popover`.
+- Pick a `placement` and let the primitive own spacing. Avoid per-call-site offsets unless the component API explicitly needs a measured layout exception.
+- When passing a Base UI trigger `render` prop, render a real `<button type="button">` for button-like triggers. If a Popover trigger must render a `div`, `span`, or another non-button element, pass `nativeButton={false}`.
+
 ## Development
 
 - `pnpm -C packages/dify-ui test` — Vitest unit tests for primitives.
diff --git a/packages/dify-ui/package.json b/packages/dify-ui/package.json
index 483db46986..ee20896570 100644
--- a/packages/dify-ui/package.json
+++ b/packages/dify-ui/package.json
@@ -5,10 +5,6 @@
   "private": true,
   "exports": {
     "./styles.css": "./src/styles/styles.css",
-    "./tailwind-preset": {
-      "types": "./src/tailwind-preset.ts",
-      "import": "./src/tailwind-preset.ts"
-    },
     "./cn": {
       "types": "./src/cn.ts",
       "import": "./src/cn.ts"
@@ -17,6 +13,10 @@
       "types": "./src/alert-dialog/index.tsx",
       "import": "./src/alert-dialog/index.tsx"
     },
+    "./autocomplete": {
+      "types": "./src/autocomplete/index.tsx",
+      "import": "./src/autocomplete/index.tsx"
+    },
     "./avatar": {
       "types": "./src/avatar/index.tsx",
       "import": "./src/avatar/index.tsx"
@@ -25,6 +25,18 @@
       "types": "./src/button/index.tsx",
       "import": "./src/button/index.tsx"
     },
+    "./checkbox": {
+      "types": "./src/checkbox/index.tsx",
+      "import": "./src/checkbox/index.tsx"
+    },
+    "./checkbox-group": {
+      "types": "./src/checkbox-group/index.tsx",
+      "import": "./src/checkbox-group/index.tsx"
+    },
+    "./combobox": {
+      "types": "./src/combobox/index.tsx",
+      "import": "./src/combobox/index.tsx"
+    },
     "./context-menu": {
       "types": "./src/context-menu/index.tsx",
       "import": "./src/context-menu/index.tsx"
@@ -33,6 +45,10 @@
       "types": "./src/dialog/index.tsx",
       "import": "./src/dialog/index.tsx"
     },
+    "./drawer": {
+      "types": "./src/drawer/index.tsx",
+      "import": "./src/drawer/index.tsx"
+    },
     "./dropdown-menu": {
       "types": "./src/dropdown-menu/index.tsx",
       "import": "./src/dropdown-menu/index.tsx"
@@ -69,6 +85,14 @@
       "types": "./src/switch/index.tsx",
       "import": "./src/switch/index.tsx"
     },
+    "./tabs": {
+      "types": "./src/tabs/index.tsx",
+      "import": "./src/tabs/index.tsx"
+    },
+    "./toggle-group": {
+      "types": "./src/toggle-group/index.tsx",
+      "import": "./src/toggle-group/index.tsx"
+    },
     "./toast": {
       "types": "./src/toast/index.tsx",
       "import": "./src/toast/index.tsx"
@@ -107,6 +131,7 @@
     "@storybook/addon-themes": "catalog:",
     "@storybook/react-vite": "catalog:",
     "@tailwindcss/vite": "catalog:",
+    "@tanstack/react-virtual": "catalog:",
     "@types/react": "catalog:",
     "@types/react-dom": "catalog:",
     "@typescript/native-preview": "catalog:",
diff --git a/packages/dify-ui/src/alert-dialog/index.tsx b/packages/dify-ui/src/alert-dialog/index.tsx
index 7b432c87dc..81299ef932 100644
--- a/packages/dify-ui/src/alert-dialog/index.tsx
+++ b/packages/dify-ui/src/alert-dialog/index.tsx
@@ -29,14 +29,14 @@ export function AlertDialogContent({
       <BaseAlertDialog.Backdrop
         {...backdropProps}
         className={cn(
-          'fixed inset-0 z-1002 bg-background-overlay',
+          'fixed inset-0 z-50 bg-background-overlay',
           'transition-opacity duration-150 data-ending-style:opacity-0 data-starting-style:opacity-0 motion-reduce:transition-none',
           backdropClassName,
         )}
       />
       <BaseAlertDialog.Popup
         className={cn(
-          'fixed top-1/2 left-1/2 z-1002 max-h-[calc(100vh-2rem)] w-[480px] max-w-[calc(100vw-2rem)] -translate-x-1/2 -translate-y-1/2 overflow-y-auto overscroll-contain rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-lg',
+          'fixed top-1/2 left-1/2 z-50 max-h-[calc(100vh-2rem)] w-120 max-w-[calc(100vw-2rem)] -translate-x-1/2 -translate-y-1/2 overflow-y-auto overscroll-contain rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-lg',
           'transition-[transform,scale,opacity] duration-150 data-ending-style:scale-95 data-ending-style:opacity-0 data-starting-style:scale-95 data-starting-style:opacity-0 motion-reduce:transition-none',
           className,
         )}
diff --git a/packages/dify-ui/src/autocomplete/__tests__/index.spec.tsx b/packages/dify-ui/src/autocomplete/__tests__/index.spec.tsx
new file mode 100644
index 0000000000..5c56dc4c07
--- /dev/null
+++ b/packages/dify-ui/src/autocomplete/__tests__/index.spec.tsx
@@ -0,0 +1,252 @@
+import type { ReactNode } from 'react'
+import { render } from 'vitest-browser-react'
+import {
+  Autocomplete,
+  AutocompleteClear,
+  AutocompleteContent,
+  AutocompleteEmpty,
+  AutocompleteGroup,
+  AutocompleteInput,
+  AutocompleteInputGroup,
+  AutocompleteItem,
+  AutocompleteItemIndicator,
+  AutocompleteItemText,
+  AutocompleteLabel,
+  AutocompleteList,
+  AutocompleteSeparator,
+  AutocompleteStatus,
+  AutocompleteTrigger,
+} from '../index'
+
+const renderWithSafeViewport = (ui: ReactNode) => render(
+  <div style={{ minHeight: '100vh', minWidth: '100vw', padding: '240px' }}>
+    {ui}
+  </div>,
+)
+
+const asHTMLElement = (element: HTMLElement | SVGElement) => element as HTMLElement
+
+const renderAutocomplete = ({
+  children,
+  open = false,
+  defaultValue = 'workflow',
+}: {
+  children?: ReactNode
+  open?: boolean
+  defaultValue?: string
+} = {}) => renderWithSafeViewport(
+  <Autocomplete open={open} defaultValue={defaultValue} items={['workflow', 'dataset']}>
+    {children ?? (
+      <>
+        <AutocompleteInputGroup data-testid="input-group">
+          <AutocompleteInput aria-label="Search suggestions" data-testid="input" />
+          <AutocompleteClear data-testid="clear" />
+          <AutocompleteTrigger data-testid="trigger" />
+        </AutocompleteInputGroup>
+        <AutocompleteContent
+          positionerProps={{
+            'role': 'group',
+            'aria-label': 'autocomplete positioner',
+          }}
+          popupProps={{
+            'role': 'dialog',
+            'aria-label': 'autocomplete popup',
+          }}
+        >
+          <AutocompleteStatus data-testid="status">2 suggestions</AutocompleteStatus>
+          <AutocompleteList role="listbox" aria-label="autocomplete list" data-testid="list">
+            <AutocompleteItem value="workflow">
+              <AutocompleteItemText>Workflow</AutocompleteItemText>
+              <AutocompleteItemIndicator />
+            </AutocompleteItem>
+            <AutocompleteItem value="dataset">
+              <AutocompleteItemText>Dataset</AutocompleteItemText>
+            </AutocompleteItem>
+          </AutocompleteList>
+          <AutocompleteEmpty data-testid="empty">No suggestions</AutocompleteEmpty>
+        </AutocompleteContent>
+      </>
+    )}
+  </Autocomplete>,
+)
+
+describe('Autocomplete wrappers', () => {
+  describe('Input group and input', () => {
+    it('should apply medium input group and input classes by default', async () => {
+      const screen = await renderAutocomplete()
+
+      await expect.element(screen.getByTestId('input-group')).toHaveClass('rounded-lg')
+      await expect.element(screen.getByRole('combobox', { name: 'Search suggestions' })).toHaveClass('px-3')
+      await expect.element(screen.getByRole('combobox', { name: 'Search suggestions' })).toHaveClass('system-sm-regular')
+    })
+
+    it('should apply large input group and input classes when large size is provided', async () => {
+      const screen = await renderAutocomplete({
+        children: (
+          <AutocompleteInputGroup size="large" data-testid="input-group">
+            <AutocompleteInput size="large" aria-label="Search suggestions" data-testid="input" />
+          </AutocompleteInputGroup>
+        ),
+      })
+
+      await expect.element(screen.getByTestId('input-group')).toHaveClass('rounded-[10px]')
+      await expect.element(screen.getByRole('combobox', { name: 'Search suggestions' })).toHaveClass('px-4')
+      await expect.element(screen.getByRole('combobox', { name: 'Search suggestions' })).toHaveClass('system-md-regular')
+    })
+
+    it('should set input defaults and forward passthrough props', async () => {
+      const screen = await renderAutocomplete({
+        children: (
+          <AutocompleteInputGroup>
+            <AutocompleteInput
+              aria-label="Search suggestions"
+              className="custom-input"
+              placeholder="Find a resource"
+              required
+            />
+          </AutocompleteInputGroup>
+        ),
+      })
+
+      await expect.element(screen.getByRole('combobox', { name: 'Search suggestions' })).toHaveAttribute('autocomplete', 'off')
+      await expect.element(screen.getByRole('combobox', { name: 'Search suggestions' })).toHaveAttribute('type', 'text')
+      await expect.element(screen.getByRole('combobox', { name: 'Search suggestions' })).toHaveAttribute('placeholder', 'Find a resource')
+      await expect.element(screen.getByRole('combobox', { name: 'Search suggestions' })).toBeRequired()
+      await expect.element(screen.getByRole('combobox', { name: 'Search suggestions' })).toHaveClass('custom-input')
+    })
+  })
+
+  describe('Controls', () => {
+    it('should provide fallback aria labels and decorative icons when labels are omitted', async () => {
+      const screen = await renderAutocomplete()
+
+      await expect.element(screen.getByRole('button', { name: 'Clear autocomplete' })).toHaveAttribute('type', 'button')
+      await expect.element(screen.getByRole('button', { name: 'Open autocomplete suggestions' })).toHaveAttribute('type', 'button')
+      expect(screen.getByRole('button', { name: 'Clear autocomplete' }).element().querySelector('.i-ri-close-line')).toHaveAttribute('aria-hidden', 'true')
+      expect(screen.getByRole('button', { name: 'Open autocomplete suggestions' }).element().querySelector('.i-ri-arrow-down-s-line')).toHaveAttribute('aria-hidden', 'true')
+    })
+
+    it('should preserve explicit labels and custom children', async () => {
+      const screen = await renderAutocomplete({
+        children: (
+          <AutocompleteInputGroup>
+            <AutocompleteInput aria-label="Search suggestions" />
+            <AutocompleteClear aria-label="Reset search">
+              <span data-testid="custom-clear">reset</span>
+            </AutocompleteClear>
+            <AutocompleteTrigger aria-label="Show suggestions">
+              <span data-testid="custom-trigger">open</span>
+            </AutocompleteTrigger>
+          </AutocompleteInputGroup>
+        ),
+      })
+
+      expect(screen.getByRole('button', { name: 'Reset search' }).element()).toContainElement(screen.getByTestId('custom-clear').element())
+      expect(screen.getByRole('button', { name: 'Show suggestions' }).element()).toContainElement(screen.getByTestId('custom-trigger').element())
+      expect(screen.getByRole('button', { name: 'Reset search' }).element().querySelector('.i-ri-close-line')).not.toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'Show suggestions' }).element().querySelector('.i-ri-arrow-down-s-line')).not.toBeInTheDocument()
+    })
+
+    it('should rely on aria-labelledby when provided instead of injecting fallback labels', async () => {
+      const screen = await renderAutocomplete({
+        children: (
+          <>
+            <span id="clear-label">Clear from label</span>
+            <span id="trigger-label">Trigger from label</span>
+            <AutocompleteInputGroup>
+              <AutocompleteInput aria-label="Search suggestions" />
+              <AutocompleteClear aria-labelledby="clear-label" />
+              <AutocompleteTrigger aria-labelledby="trigger-label" />
+            </AutocompleteInputGroup>
+          </>
+        ),
+      })
+
+      await expect.element(screen.getByRole('button', { name: 'Clear from label' })).not.toHaveAttribute('aria-label')
+      await expect.element(screen.getByRole('button', { name: 'Trigger from label' })).not.toHaveAttribute('aria-label')
+    })
+  })
+
+  describe('Content and options', () => {
+    it('should use default overlay placement and Dify popup classes', async () => {
+      const screen = await renderAutocomplete({ open: true })
+
+      await expect.element(screen.getByRole('group', { name: 'autocomplete positioner' })).toHaveAttribute('data-side', 'bottom')
+      await expect.element(screen.getByRole('group', { name: 'autocomplete positioner' })).toHaveAttribute('data-align', 'start')
+      await expect.element(screen.getByRole('group', { name: 'autocomplete positioner' })).toHaveClass('z-50')
+      await expect.element(screen.getByRole('dialog', { name: 'autocomplete popup' })).toHaveClass('rounded-xl')
+      await expect.element(screen.getByRole('dialog', { name: 'autocomplete popup' })).toHaveClass('w-(--anchor-width)')
+      await expect.element(screen.getByRole('listbox', { name: 'autocomplete list' })).toHaveClass('scroll-py-1')
+    })
+
+    it('should apply custom placement side and passthrough popup props', async () => {
+      const onPopupClick = vi.fn()
+      const screen = await renderWithSafeViewport(
+        <Autocomplete open defaultValue="workflow" items={['workflow']}>
+          <AutocompleteInputGroup>
+            <AutocompleteInput aria-label="Search suggestions" />
+          </AutocompleteInputGroup>
+          <AutocompleteContent
+            placement="top-end"
+            sideOffset={12}
+            alignOffset={6}
+            positionerProps={{ 'role': 'group', 'aria-label': 'autocomplete positioner' }}
+            popupProps={{
+              'role': 'dialog',
+              'aria-label': 'autocomplete popup',
+              'onClick': onPopupClick,
+            }}
+          >
+            <AutocompleteList role="listbox" aria-label="autocomplete list">
+              <AutocompleteItem value="workflow">
+                <AutocompleteItemText>Workflow</AutocompleteItemText>
+              </AutocompleteItem>
+            </AutocompleteList>
+          </AutocompleteContent>
+        </Autocomplete>,
+      )
+
+      asHTMLElement(screen.getByRole('dialog', { name: 'autocomplete popup' }).element()).click()
+
+      await expect.element(screen.getByRole('group', { name: 'autocomplete positioner' })).toHaveAttribute('data-side', 'top')
+      expect(onPopupClick).toHaveBeenCalledTimes(1)
+    })
+
+    it('should render item text indicator status and empty wrappers with design classes', async () => {
+      const screen = await renderAutocomplete({ open: true })
+
+      await expect.element(screen.getByText('Workflow')).toHaveClass('system-sm-medium')
+      await expect.element(screen.getByTestId('status')).toHaveClass('text-text-tertiary')
+      await expect.element(screen.getByTestId('empty')).toHaveClass('system-sm-regular')
+      expect(screen.getByText('Workflow').element().parentElement?.querySelector('.i-ri-arrow-right-line')).toHaveAttribute('aria-hidden', 'true')
+    })
+
+    it('should forward custom classes to label separator item text and indicator', async () => {
+      const screen = await renderWithSafeViewport(
+        <Autocomplete open defaultValue="workflow" items={['workflow']}>
+          <AutocompleteInputGroup>
+            <AutocompleteInput aria-label="Search suggestions" />
+          </AutocompleteInputGroup>
+          <AutocompleteContent popupProps={{ 'role': 'dialog', 'aria-label': 'autocomplete popup' }}>
+            <AutocompleteList role="listbox" aria-label="autocomplete list">
+              <AutocompleteGroup items={['workflow']}>
+                <AutocompleteLabel className="custom-label">Resources</AutocompleteLabel>
+                <AutocompleteSeparator className="custom-separator" data-testid="separator" />
+                <AutocompleteItem value="workflow" className="custom-item">
+                  <AutocompleteItemText className="custom-text">Workflow</AutocompleteItemText>
+                  <AutocompleteItemIndicator className="custom-indicator" data-testid="indicator" />
+                </AutocompleteItem>
+              </AutocompleteGroup>
+            </AutocompleteList>
+          </AutocompleteContent>
+        </Autocomplete>,
+      )
+
+      await expect.element(screen.getByText('Resources')).toHaveClass('custom-label')
+      await expect.element(screen.getByTestId('separator')).toHaveClass('custom-separator')
+      await expect.element(screen.getByRole('option', { name: 'Workflow' })).toHaveClass('custom-item')
+      await expect.element(screen.getByText('Workflow')).toHaveClass('custom-text')
+      await expect.element(screen.getByTestId('indicator')).toHaveClass('custom-indicator')
+    })
+  })
+})
diff --git a/packages/dify-ui/src/autocomplete/index.stories.tsx b/packages/dify-ui/src/autocomplete/index.stories.tsx
new file mode 100644
index 0000000000..71c7c6607d
--- /dev/null
+++ b/packages/dify-ui/src/autocomplete/index.stories.tsx
@@ -0,0 +1,721 @@
+import type { Meta, StoryObj } from '@storybook/react-vite'
+import type { Virtualizer } from '@tanstack/react-virtual'
+import type { RefObject } from 'react'
+import { useVirtualizer } from '@tanstack/react-virtual'
+import { useEffect, useMemo, useRef, useState } from 'react'
+import {
+  Autocomplete,
+  AutocompleteClear,
+  AutocompleteCollection,
+  AutocompleteContent,
+  AutocompleteEmpty,
+  AutocompleteGroup,
+  AutocompleteInput,
+  AutocompleteInputGroup,
+  AutocompleteItem,
+  AutocompleteItemText,
+  AutocompleteLabel,
+  AutocompleteList,
+  AutocompleteSeparator,
+  AutocompleteStatus,
+  AutocompleteTrigger,
+  useAutocompleteFilter,
+  useAutocompleteFilteredItems,
+} from '.'
+import { cn } from '../cn'
+
+type Suggestion = {
+  value: string
+  label: string
+  description?: string
+  icon?: string
+  meta?: string
+}
+
+type SuggestionGroup = {
+  label: string
+  items: Suggestion[]
+}
+
+const inputWidth = 'w-80'
+
+type StoryVirtualizer = Virtualizer<HTMLDivElement, Element>
+
+const scrollHighlightedVirtualItem = (
+  item: unknown,
+  {
+    reason,
+    index,
+  }: {
+    reason: 'keyboard' | 'pointer' | 'none'
+    index: number
+  },
+  virtualizer: StoryVirtualizer | null,
+) => {
+  if (!item || !virtualizer)
+    return
+
+  const isStart = index === 0
+  const isEnd = index === virtualizer.options.count - 1
+  const shouldScroll = reason === 'none' || (reason === 'keyboard' && (isStart || isEnd))
+
+  if (shouldScroll) {
+    queueMicrotask(() => {
+      virtualizer.scrollToIndex(index, { align: isEnd ? 'start' : 'end' })
+    })
+  }
+}
+
+const tagSuggestions: Suggestion[] = [
+  { value: 'feature', label: 'feature', description: 'Product work and launch notes' },
+  { value: 'fix', label: 'fix', description: 'Bug fixes and regressions' },
+  { value: 'docs', label: 'docs', description: 'Documentation updates' },
+  { value: 'internal', label: 'internal', description: 'Workspace-only notes' },
+  { value: 'mobile', label: 'mobile', description: 'Mobile app issues' },
+  { value: 'component: autocomplete', label: 'component: autocomplete', description: 'Base UI primitive wrapper' },
+  { value: 'component: combobox', label: 'component: combobox', description: 'Filterable predefined selection' },
+  { value: 'component: select', label: 'component: select', description: 'Compact predefined selection' },
+]
+
+const promptCompletions: Suggestion[] = [
+  { value: 'summarize this conversation', label: 'summarize this conversation' },
+  { value: 'summarize this dataset with citations', label: 'summarize this dataset with citations' },
+  { value: 'summarize this workflow run for an operator', label: 'summarize this workflow run for an operator' },
+  { value: 'summarize this support ticket in 3 bullets', label: 'summarize this support ticket in 3 bullets' },
+]
+
+const workflowSuggestions: Suggestion[] = [
+  { value: 'http-request', label: 'HTTP Request', description: 'Call an external API', icon: 'i-ri-global-line', meta: 'Tool' },
+  { value: 'knowledge-retrieval', label: 'Knowledge Retrieval', description: 'Search configured datasets', icon: 'i-ri-database-2-line', meta: 'Tool' },
+  { value: 'code-execution', label: 'Code Execution', description: 'Run sandboxed snippets', icon: 'i-ri-code-s-slash-line', meta: 'Tool' },
+  { value: 'template-transform', label: 'Template Transform', description: 'Compose variables into output', icon: 'i-ri-braces-line', meta: 'Tool' },
+  { value: 'question-classifier', label: 'Question Classifier', description: 'Route by intent', icon: 'i-ri-git-branch-line', meta: 'Tool' },
+  { value: 'parameter-extractor', label: 'Parameter Extractor', description: 'Extract typed values', icon: 'i-ri-list-check-3', meta: 'Tool' },
+  { value: 'answer-node', label: 'Answer Node', description: 'Return a final assistant answer', icon: 'i-ri-message-3-line', meta: 'Node' },
+  { value: 'iteration-node', label: 'Iteration Node', description: 'Run a loop over array items', icon: 'i-ri-repeat-line', meta: 'Node' },
+  { value: 'variable-assigner', label: 'Variable Assigner', description: 'Persist intermediate state', icon: 'i-ri-pencil-ruler-2-line', meta: 'Node' },
+]
+
+const groupedSuggestions: SuggestionGroup[] = [
+  {
+    label: 'Tags',
+    items: tagSuggestions.slice(0, 5),
+  },
+  {
+    label: 'Workflow Suggestions',
+    items: workflowSuggestions.slice(0, 5),
+  },
+  {
+    label: 'Prompt Starters',
+    items: promptCompletions.slice(0, 3),
+  },
+]
+
+const commandGroups: SuggestionGroup[] = [
+  {
+    label: 'App',
+    items: [
+      { value: '/run', label: 'Run workflow', description: 'Execute the current draft', icon: 'i-ri-play-circle-line' },
+      { value: '/publish', label: 'Publish app', description: 'Ship the current configuration', icon: 'i-ri-upload-cloud-2-line' },
+      { value: '/trace', label: 'Open trace', description: 'Inspect the latest workflow run', icon: 'i-ri-route-line' },
+    ],
+  },
+  {
+    label: 'Workspace',
+    items: [
+      { value: '/dataset', label: 'Search datasets', description: 'Find knowledge attached to this app', icon: 'i-ri-database-line' },
+      { value: '/members', label: 'Invite members', description: 'Open workspace access settings', icon: 'i-ri-user-add-line' },
+      { value: '/usage', label: 'View usage', description: 'Open model and workflow usage', icon: 'i-ri-bar-chart-line' },
+    ],
+  },
+]
+
+const remoteSuggestions: Suggestion[] = [
+  { value: 'agent-builder', label: 'Agent Builder', description: 'Workspace app' },
+  { value: 'agent-observability', label: 'Agent Observability', description: 'Dataset' },
+  { value: 'agent-routing-dataset', label: 'Agent Routing Dataset', description: 'Knowledge source' },
+]
+
+const virtualizedSuggestions: Suggestion[] = Array.from({ length: 1000 }, (_, index) => {
+  const family = ['workflow', 'dataset', 'prompt', 'tool'][index % 4]!
+  const number = new Intl.NumberFormat('en-US', {
+    minimumIntegerDigits: 4,
+  }).format(index + 1)
+
+  return {
+    value: `${family}-${index + 1}`,
+    label: `${family} suggestion ${number}`,
+    description: `Free-form autocomplete result from ${family} search`,
+    icon: family === 'dataset'
+      ? 'i-ri-database-2-line'
+      : family === 'prompt'
+        ? 'i-ri-text-snippet'
+        : family === 'tool'
+          ? 'i-ri-tools-line'
+          : 'i-ri-flow-chart',
+    meta: family,
+  }
+})
+
+const getSuggestionLabel = (item: Suggestion) => item.label
+
+const SuggestionItem = ({
+  item,
+  index,
+  dense,
+}: {
+  item: Suggestion
+  index?: number
+  dense?: boolean
+}) => (
+  <AutocompleteItem value={item} index={index}>
+    {item.icon && <span className={cn(item.icon, 'size-4 shrink-0 text-text-tertiary')} aria-hidden="true" />}
+    <div className="flex min-w-0 grow flex-col">
+      <AutocompleteItemText className="px-0">{item.label}</AutocompleteItemText>
+      {!dense && item.description && (
+        <span className="truncate system-xs-regular text-text-tertiary">{item.description}</span>
+      )}
+    </div>
+    {item.meta && (
+      <span className="shrink-0 rounded-md bg-components-badge-bg-dimm px-1.5 py-0.5 system-2xs-medium text-text-tertiary">
+        {item.meta}
+      </span>
+    )}
+  </AutocompleteItem>
+)
+
+const TagSuggestionItem = ({
+  item,
+  index,
+}: {
+  item: Suggestion
+  index?: number
+}) => (
+  <AutocompleteItem value={item} index={index}>
+    <AutocompleteItemText className="px-0">{item.label}</AutocompleteItemText>
+    {item.description && <span className="ml-auto max-w-36 truncate system-xs-regular text-text-tertiary">{item.description}</span>}
+  </AutocompleteItem>
+)
+
+const BasicTagAutocomplete = ({
+  size = 'medium',
+}: {
+  size?: 'small' | 'medium' | 'large'
+}) => (
+  <Autocomplete
+    items={tagSuggestions}
+    itemToStringValue={getSuggestionLabel}
+    openOnInputClick
+  >
+    <AutocompleteInputGroup size={size}>
+      <span className="i-ri-search-line ml-2 size-4 shrink-0 text-text-tertiary" aria-hidden="true" />
+      <AutocompleteInput size={size} placeholder="Search tags or type a new one…" aria-label="Search tags or type a new one" />
+      <AutocompleteClear size={size} />
+      <AutocompleteTrigger size={size} />
+    </AutocompleteInputGroup>
+    <AutocompleteContent>
+      <AutocompleteList>
+        {(item: Suggestion, index: number) => (
+          <TagSuggestionItem key={item.value} item={item} index={index} />
+        )}
+      </AutocompleteList>
+      <AutocompleteEmpty>No tag suggestion. Keep the typed value.</AutocompleteEmpty>
+    </AutocompleteContent>
+  </Autocomplete>
+)
+
+const GroupedSuggestionList = () => {
+  const groups = useAutocompleteFilteredItems<SuggestionGroup>()
+
+  return (
+    <AutocompleteList>
+      {groups.map((group, groupIndex) => (
+        <AutocompleteGroup key={group.label} items={group.items}>
+          {groupIndex > 0 && <AutocompleteSeparator />}
+          <AutocompleteLabel>{group.label}</AutocompleteLabel>
+          <AutocompleteCollection>
+            {(item: Suggestion) => (
+              <SuggestionItem key={item.value} item={item} />
+            )}
+          </AutocompleteCollection>
+        </AutocompleteGroup>
+      ))}
+    </AutocompleteList>
+  )
+}
+
+const CommandPaletteList = () => {
+  const groups = useAutocompleteFilteredItems<SuggestionGroup>()
+
+  return (
+    <AutocompleteList className="max-h-72 rounded-lg border border-divider-subtle bg-components-panel-bg p-1 shadow-xs">
+      {groups.map((group, groupIndex) => (
+        <AutocompleteGroup key={group.label} items={group.items}>
+          {groupIndex > 0 && <AutocompleteSeparator />}
+          <AutocompleteLabel>{group.label}</AutocompleteLabel>
+          <AutocompleteCollection>
+            {(item: Suggestion) => (
+              <AutocompleteItem key={item.value} value={item} className="grid grid-cols-[1fr_auto]">
+                <span className="flex min-w-0 items-center gap-2">
+                  {item.icon && <span className={cn(item.icon, 'size-4 shrink-0 text-text-tertiary')} aria-hidden="true" />}
+                  <span className="min-w-0">
+                    <AutocompleteItemText className="block px-0">{item.label}</AutocompleteItemText>
+                    <span className="block truncate system-xs-regular text-text-tertiary">{item.description}</span>
+                  </span>
+                </span>
+                <kbd className="rounded-md border border-divider-subtle bg-components-badge-bg-dimm px-1.5 py-0.5 text-text-quaternary system-2xs-medium">
+                  Enter
+                </kbd>
+              </AutocompleteItem>
+            )}
+          </AutocompleteCollection>
+        </AutocompleteGroup>
+      ))}
+    </AutocompleteList>
+  )
+}
+
+const LimitedStatus = ({
+  total,
+}: {
+  total: number
+}) => {
+  const items = useAutocompleteFilteredItems<Suggestion>()
+  const hidden = Math.max(0, total - items.length)
+
+  return hidden > 0
+    ? `${hidden} more suggestions hidden. Refine the query to narrow results.`
+    : `${items.length} suggestions available.`
+}
+
+const AsyncSearchDemo = () => {
+  const [value, setValue] = useState('agent')
+  const [loading, setLoading] = useState(false)
+  const [items, setItems] = useState(remoteSuggestions)
+
+  useEffect(() => {
+    setLoading(true)
+    const timeout = window.setTimeout(() => {
+      setItems(
+        value.trim()
+          ? remoteSuggestions.filter(item => item.label.toLowerCase().includes(value.trim().toLowerCase()))
+          : remoteSuggestions,
+      )
+      setLoading(false)
+    }, 500)
+
+    return () => window.clearTimeout(timeout)
+  }, [value])
+
+  return (
+    <div className={inputWidth}>
+      <Autocomplete
+        items={items}
+        value={value}
+        onValueChange={setValue}
+        itemToStringValue={getSuggestionLabel}
+        openOnInputClick
+      >
+        <AutocompleteInputGroup>
+          <span className="i-ri-cloud-line ml-2 size-4 shrink-0 text-text-tertiary" aria-hidden="true" />
+          <AutocompleteInput placeholder="Search remote resources…" aria-label="Search remote resources" />
+          <AutocompleteClear />
+          <AutocompleteTrigger />
+        </AutocompleteInputGroup>
+        <AutocompleteContent>
+          <AutocompleteStatus>
+            {loading ? 'Loading suggestions…' : `${items.length} remote suggestions`}
+          </AutocompleteStatus>
+          <AutocompleteList>
+            {(item: Suggestion, index: number) => (
+              <SuggestionItem key={item.value} item={item} index={index} />
+            )}
+          </AutocompleteList>
+          <AutocompleteEmpty>No remote suggestion. Keep the typed query.</AutocompleteEmpty>
+        </AutocompleteContent>
+      </Autocomplete>
+    </div>
+  )
+}
+
+const VirtualizedSuggestionList = ({
+  virtualizerRef,
+}: {
+  virtualizerRef: RefObject<StoryVirtualizer | null>
+}) => {
+  const scrollRef = useRef<HTMLDivElement | null>(null)
+  const filteredItems = useAutocompleteFilteredItems<Suggestion>()
+  const virtualizer = useVirtualizer({
+    count: filteredItems.length,
+    getScrollElement: () => scrollRef.current,
+    estimateSize: () => 44,
+    overscan: 6,
+  })
+
+  useEffect(() => {
+    virtualizerRef.current = virtualizer
+
+    return () => {
+      virtualizerRef.current = null
+    }
+  }, [virtualizer, virtualizerRef])
+
+  return (
+    <div
+      ref={scrollRef}
+      className="max-h-[min(22rem,var(--available-height))] overflow-y-auto overflow-x-hidden overscroll-contain outline-hidden"
+    >
+      <AutocompleteList
+        className="relative max-h-none overflow-visible p-0"
+        style={{ height: virtualizer.getTotalSize() }}
+      >
+        {virtualizer.getVirtualItems().map((virtualItem) => {
+          const item = filteredItems[virtualItem.index]
+
+          if (!item)
+            return null
+
+          return (
+            <div
+              key={virtualItem.key}
+              className="absolute top-0 left-0 w-full"
+              style={{
+                height: virtualItem.size,
+                transform: `translateY(${virtualItem.start}px)`,
+              }}
+            >
+              <SuggestionItem item={item} index={virtualItem.index} />
+            </div>
+          )
+        })}
+      </AutocompleteList>
+    </div>
+  )
+}
+
+const VirtualizedStatus = () => {
+  const filteredItems = useAutocompleteFilteredItems<Suggestion>()
+
+  return (
+    <AutocompleteStatus className="border-b border-divider-subtle text-text-quaternary tabular-nums">
+      {filteredItems.length}
+      {' '}
+      matching suggestions. Selecting one only replaces the input text.
+    </AutocompleteStatus>
+  )
+}
+
+const FuzzyHighlight = ({
+  text,
+  query,
+}: {
+  text: string
+  query: string
+}) => {
+  const parts = useMemo(() => {
+    const trimmed = query.trim()
+
+    if (!trimmed)
+      return [text]
+
+    const escaped = trimmed.slice(0, 80).replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+    return text.split(new RegExp(`(${escaped})`, 'i'))
+  }, [query, text])
+
+  return (
+    <>
+      {parts.map((part, index) => (
+        part.toLowerCase() === query.trim().toLowerCase()
+          ? <mark key={`${part}-${index}`} className="bg-transparent text-text-accent">{part}</mark>
+          : part
+      ))}
+    </>
+  )
+}
+
+const FuzzyMatchingDemo = () => {
+  const [value, setValue] = useState('retr')
+  const { contains } = useAutocompleteFilter({ sensitivity: 'base' })
+
+  return (
+    <div className={inputWidth}>
+      <Autocomplete
+        items={workflowSuggestions}
+        value={value}
+        onValueChange={setValue}
+        filter={contains}
+        itemToStringValue={getSuggestionLabel}
+        openOnInputClick
+      >
+        <AutocompleteInputGroup>
+          <span className="i-ri-sparkling-2-line ml-2 size-4 shrink-0 text-text-tertiary" aria-hidden="true" />
+          <AutocompleteInput placeholder="Fuzzy search workflow suggestions…" aria-label="Fuzzy search workflow suggestions" />
+          <AutocompleteClear />
+          <AutocompleteTrigger />
+        </AutocompleteInputGroup>
+        <AutocompleteContent>
+          <AutocompleteList>
+            {(item: Suggestion, index: number) => (
+              <AutocompleteItem key={item.value} value={item} index={index}>
+                {item.icon && <span className={cn(item.icon, 'size-4 shrink-0 text-text-tertiary')} aria-hidden="true" />}
+                <div className="min-w-0 grow">
+                  <AutocompleteItemText className="block px-0">
+                    <FuzzyHighlight text={item.label} query={value} />
+                  </AutocompleteItemText>
+                  <span className="block truncate system-xs-regular text-text-tertiary">{item.description}</span>
+                </div>
+              </AutocompleteItem>
+            )}
+          </AutocompleteList>
+          <AutocompleteEmpty>No workflow suggestion. Keep typing freely.</AutocompleteEmpty>
+        </AutocompleteContent>
+      </Autocomplete>
+    </div>
+  )
+}
+
+const meta = {
+  title: 'Base/UI/Autocomplete',
+  component: Autocomplete,
+  parameters: {
+    layout: 'centered',
+    docs: {
+      description: {
+        component: 'Compound autocomplete built on Base UI Autocomplete. Use it for free-form inputs where suggestions can replace or complete the typed text, but selection is not persistent state.',
+      },
+    },
+  },
+  tags: ['autodocs'],
+} satisfies Meta<typeof Autocomplete>
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+export const SearchTags: Story = {
+  render: () => (
+    <div className={inputWidth}>
+      <BasicTagAutocomplete />
+    </div>
+  ),
+}
+
+export const Sizes: Story = {
+  render: () => (
+    <div className="flex flex-col gap-3">
+      {(['small', 'medium', 'large'] as const).map(size => (
+        <div key={size} className={inputWidth}>
+          <BasicTagAutocomplete size={size} />
+        </div>
+      ))}
+    </div>
+  ),
+}
+
+export const InlineAutocomplete: Story = {
+  render: () => (
+    <div className={inputWidth}>
+      <Autocomplete
+        items={promptCompletions}
+        itemToStringValue={getSuggestionLabel}
+        mode="both"
+        openOnInputClick
+      >
+        <AutocompleteInputGroup>
+          <span className="i-ri-text-snippet ml-2 size-4 shrink-0 text-text-tertiary" aria-hidden="true" />
+          <AutocompleteInput placeholder="Type a prompt starter…" aria-label="Type a prompt starter" />
+          <AutocompleteClear />
+          <AutocompleteTrigger />
+        </AutocompleteInputGroup>
+        <AutocompleteContent>
+          <AutocompleteList>
+            {(item: Suggestion, index: number) => (
+              <SuggestionItem key={item.value} item={item} index={index} dense />
+            )}
+          </AutocompleteList>
+          <AutocompleteEmpty>No inline completion. Continue typing freely.</AutocompleteEmpty>
+        </AutocompleteContent>
+      </Autocomplete>
+    </div>
+  ),
+}
+
+export const GroupedSuggestions: Story = {
+  render: () => (
+    <div className={inputWidth}>
+      <Autocomplete
+        items={groupedSuggestions}
+        itemToStringValue={getSuggestionLabel}
+        openOnInputClick
+      >
+        <AutocompleteInputGroup>
+          <span className="i-ri-command-line ml-2 size-4 shrink-0 text-text-tertiary" aria-hidden="true" />
+          <AutocompleteInput placeholder="Search tags, nodes, or prompt starters…" aria-label="Search tags, nodes, or prompt starters" />
+          <AutocompleteClear />
+          <AutocompleteTrigger />
+        </AutocompleteInputGroup>
+        <AutocompleteContent popupClassName="w-[420px]">
+          <GroupedSuggestionList />
+          <AutocompleteEmpty>No suggestion. Use the text as entered.</AutocompleteEmpty>
+        </AutocompleteContent>
+      </Autocomplete>
+    </div>
+  ),
+}
+
+export const FuzzyMatching: Story = {
+  render: () => <FuzzyMatchingDemo />,
+}
+
+export const LimitResults: Story = {
+  render: () => (
+    <div className={inputWidth}>
+      <Autocomplete
+        items={workflowSuggestions}
+        itemToStringValue={getSuggestionLabel}
+        limit={5}
+        openOnInputClick
+      >
+        <AutocompleteInputGroup>
+          <span className="i-ri-tools-line ml-2 size-4 shrink-0 text-text-tertiary" aria-hidden="true" />
+          <AutocompleteInput placeholder="Search workflow suggestions…" aria-label="Search workflow suggestions" />
+          <AutocompleteClear />
+          <AutocompleteTrigger />
+        </AutocompleteInputGroup>
+        <AutocompleteContent popupClassName="w-[420px]">
+          <AutocompleteStatus className="border-b border-divider-subtle">
+            <LimitedStatus total={workflowSuggestions.length} />
+          </AutocompleteStatus>
+          <AutocompleteList>
+            {(item: Suggestion, index: number) => (
+              <SuggestionItem key={item.value} item={item} index={index} />
+            )}
+          </AutocompleteList>
+          <AutocompleteEmpty>No suggestion. Submit the typed text instead.</AutocompleteEmpty>
+        </AutocompleteContent>
+      </Autocomplete>
+    </div>
+  ),
+}
+
+export const CommandPalette: Story = {
+  render: () => (
+    <div className="w-[440px] rounded-xl border border-divider-subtle bg-components-panel-bg-alt p-2 shadow-xs">
+      <Autocomplete
+        open
+        inline
+        items={commandGroups}
+        itemToStringValue={getSuggestionLabel}
+        autoHighlight="always"
+        keepHighlight
+      >
+        <AutocompleteInputGroup className="mb-2">
+          <span className="i-ri-search-line ml-2 size-4 shrink-0 text-text-tertiary" aria-hidden="true" />
+          <AutocompleteInput placeholder="Run a command…" aria-label="Run a command" />
+          <AutocompleteClear />
+        </AutocompleteInputGroup>
+        <CommandPaletteList />
+      </Autocomplete>
+    </div>
+  ),
+}
+
+const VirtualizedLongSuggestionsDemo = () => {
+  const virtualizerRef = useRef<StoryVirtualizer | null>(null)
+
+  return (
+    <div className={inputWidth}>
+      <Autocomplete
+        items={virtualizedSuggestions}
+        itemToStringValue={getSuggestionLabel}
+        virtualized
+        openOnInputClick
+        onItemHighlighted={(item, details) => {
+          scrollHighlightedVirtualItem(item, details, virtualizerRef.current)
+        }}
+      >
+        <AutocompleteInputGroup>
+          <span className="i-ri-search-line ml-2 size-4 shrink-0 text-text-tertiary" aria-hidden="true" />
+          <AutocompleteInput placeholder="Search 1,000 workspace suggestions…" aria-label="Search 1,000 workspace suggestions" />
+          <AutocompleteClear />
+          <AutocompleteTrigger />
+        </AutocompleteInputGroup>
+        <AutocompleteContent popupClassName="w-[440px] p-1">
+          <VirtualizedStatus />
+          <VirtualizedSuggestionList virtualizerRef={virtualizerRef} />
+          <AutocompleteEmpty>No suggestion. Free-form text is still valid.</AutocompleteEmpty>
+        </AutocompleteContent>
+      </Autocomplete>
+    </div>
+  )
+}
+
+export const VirtualizedLongSuggestions: Story = {
+  render: () => <VirtualizedLongSuggestionsDemo />,
+}
+
+export const AsyncSearch: Story = {
+  render: () => <AsyncSearchDemo />,
+}
+
+export const Empty: Story = {
+  render: () => (
+    <div className={inputWidth}>
+      <Autocomplete
+        items={tagSuggestions}
+        itemToStringValue={getSuggestionLabel}
+        defaultValue="private-release-note"
+        openOnInputClick
+      >
+        <AutocompleteInputGroup>
+          <span className="i-ri-search-line ml-2 size-4 shrink-0 text-text-tertiary" aria-hidden="true" />
+          <AutocompleteInput placeholder="Search tags or type a new one…" aria-label="Search tags or type a new one" />
+          <AutocompleteClear />
+          <AutocompleteTrigger />
+        </AutocompleteInputGroup>
+        <AutocompleteContent>
+          <AutocompleteList>
+            {(item: Suggestion, index: number) => (
+              <TagSuggestionItem key={item.value} item={item} index={index} />
+            )}
+          </AutocompleteList>
+          <AutocompleteEmpty>No tag suggestion. The custom text remains valid.</AutocompleteEmpty>
+        </AutocompleteContent>
+      </Autocomplete>
+    </div>
+  ),
+}
+
+export const DisabledAndReadOnly: Story = {
+  render: () => (
+    <div className="flex w-80 flex-col gap-3">
+      <Autocomplete items={tagSuggestions} itemToStringValue={getSuggestionLabel} defaultValue="feature" disabled>
+        <AutocompleteInputGroup>
+          <AutocompleteInput aria-label="Disabled tag autocomplete" />
+          <AutocompleteClear />
+          <AutocompleteTrigger />
+        </AutocompleteInputGroup>
+        <AutocompleteContent>
+          <AutocompleteList>
+            {(item: Suggestion, index: number) => (
+              <TagSuggestionItem key={item.value} item={item} index={index} />
+            )}
+          </AutocompleteList>
+        </AutocompleteContent>
+      </Autocomplete>
+      <Autocomplete items={promptCompletions} itemToStringValue={getSuggestionLabel} defaultValue="summarize this conversation" readOnly>
+        <AutocompleteInputGroup>
+          <AutocompleteInput aria-label="Read-only prompt autocomplete" />
+          <AutocompleteClear />
+          <AutocompleteTrigger />
+        </AutocompleteInputGroup>
+        <AutocompleteContent>
+          <AutocompleteList>
+            {(item: Suggestion, index: number) => (
+              <SuggestionItem key={item.value} item={item} index={index} />
+            )}
+          </AutocompleteList>
+        </AutocompleteContent>
+      </Autocomplete>
+    </div>
+  ),
+}
diff --git a/packages/dify-ui/src/autocomplete/index.tsx b/packages/dify-ui/src/autocomplete/index.tsx
new file mode 100644
index 0000000000..4c8893b376
--- /dev/null
+++ b/packages/dify-ui/src/autocomplete/index.tsx
@@ -0,0 +1,381 @@
+'use client'
+
+import type { VariantProps } from 'class-variance-authority'
+import type { HTMLAttributes, ReactNode } from 'react'
+import type { Placement } from '../placement'
+import { Autocomplete as BaseAutocomplete } from '@base-ui/react/autocomplete'
+import { cva } from 'class-variance-authority'
+import { cn } from '../cn'
+import {
+  overlayIndicatorClassName,
+  overlayLabelClassName,
+  overlayPopupAnimationClassName,
+  overlaySeparatorClassName,
+} from '../overlay-shared'
+import { parsePlacement } from '../placement'
+
+export type { Placement }
+
+export const Autocomplete = BaseAutocomplete.Root
+export const AutocompleteValue = BaseAutocomplete.Value
+export const AutocompleteGroup = BaseAutocomplete.Group
+export const AutocompleteCollection = BaseAutocomplete.Collection
+export const AutocompleteRow = BaseAutocomplete.Row
+export const useAutocompleteFilter = BaseAutocomplete.useFilter
+export const useAutocompleteFilteredItems = BaseAutocomplete.useFilteredItems
+
+export type AutocompleteRootProps<ItemValue> = BaseAutocomplete.Root.Props<ItemValue>
+export type AutocompleteRootChangeEventDetails = BaseAutocomplete.Root.ChangeEventDetails
+export type AutocompleteRootHighlightEventDetails = BaseAutocomplete.Root.HighlightEventDetails
+
+const autocompletePopupClassName = [
+  'w-(--anchor-width) max-w-[min(28rem,var(--available-width))] overflow-hidden rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-lg outline-hidden',
+  'data-side-top:origin-bottom data-side-bottom:origin-top data-side-left:origin-right data-side-right:origin-left',
+]
+
+const autocompleteListClassName = [
+  'max-h-[min(20rem,var(--available-height))] overflow-y-auto overflow-x-hidden overscroll-contain p-1 outline-hidden scroll-py-1',
+  'data-empty:max-h-none data-empty:p-0',
+]
+
+const autocompleteItemClassName = [
+  'mx-1 flex min-h-8 cursor-pointer select-none items-center gap-2 rounded-lg px-2 py-1.5 text-text-secondary outline-hidden transition-colors',
+  'hover:bg-state-base-hover-alt hover:text-text-primary',
+  'data-highlighted:bg-state-base-hover data-highlighted:text-text-primary',
+  'data-disabled:cursor-not-allowed data-disabled:opacity-30 data-disabled:hover:bg-transparent data-disabled:hover:text-text-secondary',
+  'motion-reduce:transition-none',
+]
+
+const autocompleteInputGroupVariants = cva(
+  [
+    'group/autocomplete flex w-full min-w-0 items-center border border-transparent bg-components-input-bg-normal text-components-input-text-filled shadow-none outline-hidden transition-[background-color,border-color,box-shadow]',
+    'hover:border-components-input-border-hover hover:bg-components-input-bg-hover',
+    'focus-within:border-components-input-border-active focus-within:bg-components-input-bg-active focus-within:shadow-xs',
+    'data-focused:border-components-input-border-active data-focused:bg-components-input-bg-active data-focused:shadow-xs',
+    'data-disabled:cursor-not-allowed data-disabled:border-transparent data-disabled:bg-components-input-bg-disabled data-disabled:text-components-input-text-filled-disabled',
+    'data-disabled:hover:border-transparent data-disabled:hover:bg-components-input-bg-disabled',
+    'data-readonly:shadow-none data-readonly:hover:border-transparent data-readonly:hover:bg-components-input-bg-normal',
+    'motion-reduce:transition-none',
+  ],
+  {
+    variants: {
+      size: {
+        small: 'h-6 rounded-md',
+        medium: 'h-8 rounded-lg',
+        large: 'h-9 rounded-[10px]',
+      },
+    },
+    defaultVariants: {
+      size: 'medium',
+    },
+  },
+)
+
+export type AutocompleteSize = NonNullable<VariantProps<typeof autocompleteInputGroupVariants>['size']>
+
+export type AutocompleteInputGroupProps
+  = BaseAutocomplete.InputGroup.Props
+    & VariantProps<typeof autocompleteInputGroupVariants>
+
+export function AutocompleteInputGroup({
+  className,
+  size = 'medium',
+  ...props
+}: AutocompleteInputGroupProps) {
+  return (
+    <BaseAutocomplete.InputGroup
+      className={cn(autocompleteInputGroupVariants({ size }), className)}
+      {...props}
+    />
+  )
+}
+
+const autocompleteInputVariants = cva(
+  [
+    'w-0 min-w-0 flex-1 appearance-none border-0 bg-transparent text-components-input-text-filled caret-primary-600 outline-hidden',
+    'placeholder:text-components-input-text-placeholder',
+    'disabled:cursor-not-allowed disabled:text-components-input-text-filled-disabled disabled:placeholder:text-components-input-text-disabled',
+    'data-readonly:cursor-default',
+  ],
+  {
+    variants: {
+      size: {
+        small: 'px-2 py-1 system-xs-regular',
+        medium: 'px-3 py-[7px] system-sm-regular',
+        large: 'px-4 py-2 system-md-regular',
+      },
+    },
+    defaultVariants: {
+      size: 'medium',
+    },
+  },
+)
+
+export type AutocompleteInputProps
+  = Omit<BaseAutocomplete.Input.Props, 'size'>
+    & VariantProps<typeof autocompleteInputVariants>
+
+export function AutocompleteInput({
+  className,
+  size = 'medium',
+  type = 'text',
+  autoComplete = 'off',
+  ...props
+}: AutocompleteInputProps) {
+  return (
+    <BaseAutocomplete.Input
+      type={type}
+      autoComplete={autoComplete}
+      className={cn(autocompleteInputVariants({ size }), className)}
+      {...props}
+    />
+  )
+}
+
+const autocompleteControlVariants = cva(
+  [
+    'flex shrink-0 touch-manipulation items-center justify-center rounded-md text-text-tertiary outline-hidden transition-colors',
+    'hover:bg-components-input-bg-hover hover:text-text-secondary focus-visible:bg-components-input-bg-hover focus-visible:text-text-secondary',
+    'focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:ring-inset',
+    'disabled:cursor-not-allowed disabled:hover:bg-transparent disabled:hover:text-text-tertiary disabled:focus-visible:bg-transparent disabled:focus-visible:ring-0',
+    'group-data-disabled/autocomplete:cursor-not-allowed group-data-disabled/autocomplete:hover:bg-transparent group-data-disabled/autocomplete:focus-visible:bg-transparent group-data-disabled/autocomplete:focus-visible:ring-0',
+    'group-data-readonly/autocomplete:hidden',
+    'motion-reduce:transition-none',
+  ],
+  {
+    variants: {
+      size: {
+        small: 'mr-1 size-4',
+        medium: 'mr-1.5 size-5',
+        large: 'mr-2 size-5',
+      },
+    },
+    defaultVariants: {
+      size: 'medium',
+    },
+  },
+)
+
+export type AutocompleteControlProps
+  = Omit<BaseAutocomplete.Trigger.Props, 'className'>
+    & VariantProps<typeof autocompleteControlVariants>
+    & { className?: string }
+
+export function AutocompleteTrigger({
+  className,
+  children,
+  size = 'medium',
+  type = 'button',
+  ...props
+}: AutocompleteControlProps) {
+  return (
+    <BaseAutocomplete.Trigger
+      type={type}
+      aria-label={props['aria-label'] ?? (props['aria-labelledby'] ? undefined : 'Open autocomplete suggestions')}
+      className={cn(autocompleteControlVariants({ size }), className)}
+      {...props}
+    >
+      {children ?? <span className="i-ri-arrow-down-s-line size-4" aria-hidden="true" />}
+    </BaseAutocomplete.Trigger>
+  )
+}
+
+export type AutocompleteClearProps
+  = Omit<BaseAutocomplete.Clear.Props, 'className'>
+    & VariantProps<typeof autocompleteControlVariants>
+    & { className?: string }
+
+export function AutocompleteClear({
+  className,
+  children,
+  size = 'medium',
+  type = 'button',
+  ...props
+}: AutocompleteClearProps) {
+  return (
+    <BaseAutocomplete.Clear
+      type={type}
+      aria-label={props['aria-label'] ?? (props['aria-labelledby'] ? undefined : 'Clear autocomplete')}
+      className={cn(
+        autocompleteControlVariants({ size }),
+        'data-ending-style:opacity-0 data-starting-style:opacity-0',
+        className,
+      )}
+      {...props}
+    >
+      {children ?? <span className="i-ri-close-line size-4" aria-hidden="true" />}
+    </BaseAutocomplete.Clear>
+  )
+}
+
+export function AutocompleteIcon({
+  className,
+  children,
+  ...props
+}: BaseAutocomplete.Icon.Props) {
+  return (
+    <BaseAutocomplete.Icon
+      className={cn('flex shrink-0 items-center text-text-tertiary', className)}
+      {...props}
+    >
+      {children ?? <span className="i-ri-arrow-down-s-line size-4" aria-hidden="true" />}
+    </BaseAutocomplete.Icon>
+  )
+}
+
+type AutocompleteContentProps = {
+  children: ReactNode
+  placement?: Placement
+  sideOffset?: number
+  alignOffset?: number
+  className?: string
+  popupClassName?: string
+  portalProps?: Omit<BaseAutocomplete.Portal.Props, 'children'>
+  positionerProps?: Omit<
+    BaseAutocomplete.Positioner.Props,
+    'children' | 'className' | 'side' | 'align' | 'sideOffset' | 'alignOffset'
+  >
+  popupProps?: Omit<
+    BaseAutocomplete.Popup.Props,
+    'children' | 'className'
+  >
+}
+
+export function AutocompleteContent({
+  children,
+  placement = 'bottom-start',
+  sideOffset = 4,
+  alignOffset = 0,
+  className,
+  popupClassName,
+  portalProps,
+  positionerProps,
+  popupProps,
+}: AutocompleteContentProps) {
+  const { side, align } = parsePlacement(placement)
+
+  return (
+    <BaseAutocomplete.Portal {...portalProps}>
+      <BaseAutocomplete.Positioner
+        side={side}
+        align={align}
+        sideOffset={sideOffset}
+        alignOffset={alignOffset}
+        className={cn('z-50 outline-hidden', className)}
+        {...positionerProps}
+      >
+        <BaseAutocomplete.Popup
+          className={cn(
+            autocompletePopupClassName,
+            overlayPopupAnimationClassName,
+            popupClassName,
+          )}
+          {...popupProps}
+        >
+          {children}
+        </BaseAutocomplete.Popup>
+      </BaseAutocomplete.Positioner>
+    </BaseAutocomplete.Portal>
+  )
+}
+
+export function AutocompleteList({
+  className,
+  ...props
+}: BaseAutocomplete.List.Props) {
+  return (
+    <BaseAutocomplete.List
+      className={cn(autocompleteListClassName, className)}
+      {...props}
+    />
+  )
+}
+
+export function AutocompleteItem({
+  className,
+  ...props
+}: BaseAutocomplete.Item.Props) {
+  return (
+    <BaseAutocomplete.Item
+      className={cn(autocompleteItemClassName, className)}
+      {...props}
+    />
+  )
+}
+
+export type AutocompleteItemTextProps = HTMLAttributes<HTMLSpanElement>
+
+export function AutocompleteItemText({
+  className,
+  ...props
+}: AutocompleteItemTextProps) {
+  return (
+    <span
+      className={cn('min-w-0 grow truncate px-1 system-sm-medium', className)}
+      {...props}
+    />
+  )
+}
+
+export function AutocompleteLabel({
+  className,
+  ...props
+}: BaseAutocomplete.GroupLabel.Props) {
+  return (
+    <BaseAutocomplete.GroupLabel
+      className={cn(overlayLabelClassName, className)}
+      {...props}
+    />
+  )
+}
+
+export function AutocompleteSeparator({
+  className,
+  ...props
+}: BaseAutocomplete.Separator.Props) {
+  return (
+    <BaseAutocomplete.Separator
+      className={cn(overlaySeparatorClassName, className)}
+      {...props}
+    />
+  )
+}
+
+export function AutocompleteEmpty({
+  className,
+  ...props
+}: BaseAutocomplete.Empty.Props) {
+  return (
+    <BaseAutocomplete.Empty
+      className={cn('px-3 py-2 system-sm-regular text-text-tertiary', className)}
+      {...props}
+    />
+  )
+}
+
+export function AutocompleteStatus({
+  className,
+  ...props
+}: BaseAutocomplete.Status.Props) {
+  return (
+    <BaseAutocomplete.Status
+      className={cn('px-3 py-2 system-sm-regular text-text-tertiary', className)}
+      {...props}
+    />
+  )
+}
+
+export function AutocompleteItemIndicator({
+  className,
+  children,
+  ...props
+}: HTMLAttributes<HTMLSpanElement>) {
+  return (
+    <span
+      className={cn(overlayIndicatorClassName, className)}
+      {...props}
+    >
+      {children ?? <span className="i-ri-arrow-right-line size-4" aria-hidden="true" />}
+    </span>
+  )
+}
diff --git a/packages/dify-ui/src/checkbox-group/__tests__/index.spec.tsx b/packages/dify-ui/src/checkbox-group/__tests__/index.spec.tsx
new file mode 100644
index 0000000000..b5d8e65c99
--- /dev/null
+++ b/packages/dify-ui/src/checkbox-group/__tests__/index.spec.tsx
@@ -0,0 +1,76 @@
+import { Field } from '@base-ui/react/field'
+import { Fieldset } from '@base-ui/react/fieldset'
+import { useState } from 'react'
+import { render } from 'vitest-browser-react'
+import { Checkbox } from '../../checkbox'
+import { CheckboxGroup } from '../index'
+
+const asHTMLElement = (element: HTMLElement | SVGElement) => element as HTMLElement
+
+describe('CheckboxGroup', () => {
+  it('should manage selected values and parent mixed state', async () => {
+    function PermissionsDemo() {
+      const [value, setValue] = useState(['read'])
+
+      return (
+        <CheckboxGroup value={value} onValueChange={setValue} allValues={['read', 'write']}>
+          <Checkbox parent aria-label="All permissions" />
+          <label>
+            <Checkbox value="read" />
+            Read
+          </label>
+          <label>
+            <Checkbox value="write" />
+            Write
+          </label>
+        </CheckboxGroup>
+      )
+    }
+
+    const screen = await render(<PermissionsDemo />)
+    const parent = screen.getByRole('checkbox', { name: 'All permissions' })
+    const write = screen.getByRole('checkbox', { name: 'Write' })
+
+    await expect.element(parent).toHaveAttribute('aria-checked', 'mixed')
+    await expect.element(parent).toHaveAttribute('data-indeterminate', '')
+    await expect.element(write).toHaveAttribute('aria-checked', 'false')
+
+    asHTMLElement(parent.element()).click()
+
+    await vi.waitFor(async () => {
+      await expect.element(parent).toHaveAttribute('aria-checked', 'true')
+      await expect.element(write).toHaveAttribute('aria-checked', 'true')
+    })
+  })
+
+  it('should compose with Base UI Field and Fieldset without losing labels', async () => {
+    const onValueChange = vi.fn()
+    const screen = await render(
+      <Field.Root name="features">
+        <Fieldset.Root render={<CheckboxGroup value={['search']} onValueChange={onValueChange} />}>
+          <Fieldset.Legend>Features</Fieldset.Legend>
+          <Field.Item>
+            <Field.Label>
+              <Checkbox value="search" />
+              Search
+            </Field.Label>
+          </Field.Item>
+          <Field.Item>
+            <Field.Label>
+              <Checkbox value="analytics" />
+              Analytics
+            </Field.Label>
+          </Field.Item>
+        </Fieldset.Root>
+      </Field.Root>,
+    )
+
+    const analytics = screen.getByRole('checkbox', { name: 'Analytics' })
+    await expect.element(analytics).toHaveAttribute('aria-checked', 'false')
+
+    asHTMLElement(analytics.element()).click()
+
+    expect(onValueChange).toHaveBeenCalledTimes(1)
+    expect(onValueChange.mock.calls[0]?.[0]).toEqual(['search', 'analytics'])
+  })
+})
diff --git a/packages/dify-ui/src/checkbox-group/index.stories.tsx b/packages/dify-ui/src/checkbox-group/index.stories.tsx
new file mode 100644
index 0000000000..623ae62c98
--- /dev/null
+++ b/packages/dify-ui/src/checkbox-group/index.stories.tsx
@@ -0,0 +1,116 @@
+import type { Meta, StoryObj } from '@storybook/react-vite'
+import { Field } from '@base-ui/react/field'
+import { Fieldset } from '@base-ui/react/fieldset'
+import { useId, useState } from 'react'
+import { CheckboxGroup } from '.'
+import { Checkbox } from '../checkbox'
+
+const meta = {
+  title: 'Base/UI/CheckboxGroup',
+  component: CheckboxGroup,
+  parameters: {
+    layout: 'centered',
+    docs: {
+      description: {
+        component: 'CheckboxGroup primitive built on Base UI. It owns multi-checkbox array state, allValues, and parent checkbox semantics. Import from `@langgenius/dify-ui/checkbox-group` and compose with `Checkbox` from `@langgenius/dify-ui/checkbox`.',
+      },
+    },
+  },
+  tags: ['autodocs'],
+} satisfies Meta<typeof CheckboxGroup>
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+function DocumentSelectionDemo() {
+  const documentIds = ['doc-1', 'doc-2', 'doc-3']
+  const [selected, setSelected] = useState<string[]>(['doc-1'])
+  const groupLabelId = useId()
+
+  return (
+    <CheckboxGroup
+      aria-labelledby={groupLabelId}
+      value={selected}
+      onValueChange={setSelected}
+      allValues={documentIds}
+      className="flex flex-col gap-3"
+    >
+      <label id={groupLabelId} className="flex items-center gap-2 system-sm-semibold-uppercase text-text-secondary">
+        <Checkbox parent />
+        Current page documents
+      </label>
+      <div className="flex flex-col gap-2 pl-6">
+        {[
+          { id: 'doc-1', name: 'onboarding-guide.pdf' },
+          { id: 'doc-2', name: 'pricing-faq.md' },
+          { id: 'doc-3', name: 'release-notes.txt' },
+        ].map(document => (
+          <label key={document.id} className="flex items-center gap-2 system-sm-medium text-text-secondary">
+            <Checkbox value={document.id} />
+            {document.name}
+          </label>
+        ))}
+      </div>
+    </CheckboxGroup>
+  )
+}
+
+export const DocumentSelection: Story = {
+  render: () => <DocumentSelectionDemo />,
+  parameters: {
+    docs: {
+      description: {
+        story: 'Matches Dify table/list selection patterns such as documents, segments, annotations, and install bundle items: CheckboxGroup owns the selected ID array, allValues defines the current selectable page, and the parent checkbox provides select-all plus mixed state.',
+      },
+    },
+  },
+}
+
+function DynamicFormFieldDemo() {
+  const options = [
+    { value: 'markdown', label: 'Markdown' },
+    { value: 'pdf', label: 'PDF' },
+    { value: 'html', label: 'HTML' },
+  ]
+  const [selected, setSelected] = useState<string[]>(['markdown'])
+
+  return (
+    <Field.Root name="allowed_file_types" className="flex w-80 flex-col gap-2">
+      <Field.Description className="body-xs-regular text-text-tertiary">
+        This mirrors Dify dynamic form fields where checkbox options are controlled by schema and persisted as a string array.
+      </Field.Description>
+      <Fieldset.Root
+        render={(
+          <CheckboxGroup
+            value={selected}
+            onValueChange={setSelected}
+            className="flex flex-col gap-2 rounded-lg border border-components-panel-border bg-components-panel-bg p-3"
+          />
+        )}
+      >
+        <Fieldset.Legend className="system-sm-medium text-text-secondary">
+          Allowed file types
+        </Fieldset.Legend>
+        {options.map(option => (
+          <Field.Item key={option.value}>
+            <Field.Label className="flex items-center gap-2 system-sm-medium text-text-secondary">
+              <Checkbox value={option.value} />
+              {option.label}
+            </Field.Label>
+          </Field.Item>
+        ))}
+      </Fieldset.Root>
+    </Field.Root>
+  )
+}
+
+export const DynamicFormField: Story = {
+  render: () => <DynamicFormFieldDemo />,
+  parameters: {
+    docs: {
+      description: {
+        story: 'Matches Dify checkbox-list form usage in workflow node forms and base form rendering. Field and Fieldset provide group labeling; CheckboxGroup owns controlled array state.',
+      },
+    },
+  },
+}
diff --git a/packages/dify-ui/src/checkbox-group/index.tsx b/packages/dify-ui/src/checkbox-group/index.tsx
new file mode 100644
index 0000000000..c3d8fab6a1
--- /dev/null
+++ b/packages/dify-ui/src/checkbox-group/index.tsx
@@ -0,0 +1,10 @@
+'use client'
+
+import type { CheckboxGroup as BaseCheckboxGroupNS } from '@base-ui/react/checkbox-group'
+import { CheckboxGroup as BaseCheckboxGroup } from '@base-ui/react/checkbox-group'
+
+export type CheckboxGroupProps = BaseCheckboxGroupNS.Props
+
+export function CheckboxGroup(props: CheckboxGroupProps) {
+  return <BaseCheckboxGroup {...props} />
+}
diff --git a/packages/dify-ui/src/checkbox/__tests__/index.spec.tsx b/packages/dify-ui/src/checkbox/__tests__/index.spec.tsx
new file mode 100644
index 0000000000..77edc59892
--- /dev/null
+++ b/packages/dify-ui/src/checkbox/__tests__/index.spec.tsx
@@ -0,0 +1,129 @@
+import { render } from 'vitest-browser-react'
+import {
+  Checkbox,
+  CheckboxIndicator,
+  CheckboxRoot,
+  CheckboxSkeleton,
+} from '../index'
+
+const asHTMLElement = (element: HTMLElement | SVGElement) => element as HTMLElement
+
+describe('Checkbox', () => {
+  it('should render an unchecked checkbox with Base UI semantics', async () => {
+    const screen = await render(<Checkbox checked={false} aria-label="Accept terms" />)
+    const checkbox = screen.getByRole('checkbox', { name: 'Accept terms' })
+
+    await expect.element(checkbox).toHaveAttribute('aria-checked', 'false')
+    await expect.element(checkbox).toHaveAttribute('data-unchecked', '')
+    await expect.element(checkbox).not.toHaveAttribute('data-checked')
+    await expect.element(checkbox).not.toHaveAttribute('data-indeterminate')
+  })
+
+  it('should expose checked data attributes and icon styling hooks', async () => {
+    const screen = await render(<Checkbox checked aria-label="Accept terms" />)
+    const checkbox = screen.getByRole('checkbox', { name: 'Accept terms' })
+
+    await expect.element(checkbox).toHaveAttribute('aria-checked', 'true')
+    await expect.element(checkbox).toHaveAttribute('data-checked', '')
+    await expect.element(checkbox).toHaveClass('data-checked:bg-components-checkbox-bg')
+    expect(screen.container.querySelector('.i-ri-check-line')).toBeInTheDocument()
+  })
+
+  it('should expose mixed state when indeterminate', async () => {
+    const screen = await render(<Checkbox checked={false} indeterminate aria-label="Select all" />)
+    const checkbox = screen.getByRole('checkbox', { name: 'Select all' })
+
+    await expect.element(checkbox).toHaveAttribute('aria-checked', 'mixed')
+    await expect.element(checkbox).toHaveAttribute('data-indeterminate', '')
+    expect(screen.container.querySelector('.i-ri-check-line')).not.toBeInTheDocument()
+    expect(screen.container.querySelector('span span.rounded-full.bg-current')).toBeInTheDocument()
+  })
+
+  it('should call onCheckedChange with the next checked value', async () => {
+    const onCheckedChange = vi.fn()
+    const screen = await render(
+      <Checkbox checked={false} aria-label="Accept terms" onCheckedChange={onCheckedChange} />,
+    )
+
+    asHTMLElement(screen.getByRole('checkbox', { name: 'Accept terms' }).element()).click()
+
+    expect(onCheckedChange).toHaveBeenCalledTimes(1)
+    expect(onCheckedChange.mock.calls[0]?.[0]).toBe(true)
+  })
+
+  it('should stay controlled until the checked prop changes', async () => {
+    const onCheckedChange = vi.fn()
+    const screen = await render(
+      <Checkbox checked={false} aria-label="Accept terms" onCheckedChange={onCheckedChange} />,
+    )
+    const checkbox = screen.getByRole('checkbox', { name: 'Accept terms' })
+
+    asHTMLElement(checkbox.element()).click()
+    expect(onCheckedChange.mock.calls[0]?.[0]).toBe(true)
+    await expect.element(checkbox).toHaveAttribute('aria-checked', 'false')
+
+    await screen.rerender(<Checkbox checked aria-label="Accept terms" onCheckedChange={onCheckedChange} />)
+    await expect.element(screen.getByRole('checkbox', { name: 'Accept terms' })).toHaveAttribute('aria-checked', 'true')
+  })
+
+  it('should ignore interaction when disabled', async () => {
+    const onCheckedChange = vi.fn()
+    const screen = await render(
+      <Checkbox checked={false} disabled aria-label="Accept terms" onCheckedChange={onCheckedChange} />,
+    )
+    const checkbox = screen.getByRole('checkbox', { name: 'Accept terms' })
+
+    await expect.element(checkbox).toHaveAttribute('data-disabled', '')
+    await expect.element(checkbox).toHaveClass('data-disabled:cursor-not-allowed')
+
+    asHTMLElement(checkbox.element()).click()
+
+    expect(onCheckedChange).not.toHaveBeenCalled()
+  })
+
+  it('should submit checked and unchecked form values through the hidden input', async () => {
+    const screen = await render(
+      <form>
+        <Checkbox
+          checked
+          name="terms"
+          value="accepted"
+          uncheckedValue="declined"
+          aria-label="Terms"
+        />
+        <Checkbox
+          checked={false}
+          name="newsletter"
+          value="yes"
+          uncheckedValue="no"
+          aria-label="Newsletter"
+        />
+      </form>,
+    )
+    const form = screen.container.querySelector('form') as HTMLFormElement
+    const data = new FormData(form)
+
+    expect(data.get('terms')).toBe('accepted')
+    expect(data.get('newsletter')).toBe('no')
+  })
+
+  it('should support custom compound composition with CheckboxRoot and CheckboxIndicator', async () => {
+    const screen = await render(
+      <CheckboxRoot checked aria-label="Custom checkbox" className="custom-root">
+        <CheckboxIndicator className="custom-indicator" />
+      </CheckboxRoot>,
+    )
+
+    await expect.element(screen.getByRole('checkbox', { name: 'Custom checkbox' })).toHaveClass('custom-root')
+    expect(screen.container.querySelector('.custom-indicator')).toBeInTheDocument()
+  })
+})
+
+describe('CheckboxSkeleton', () => {
+  it('should render a visual placeholder without checkbox semantics', async () => {
+    const screen = await render(<CheckboxSkeleton data-testid="checkbox-skeleton" />)
+
+    expect(screen.container.querySelector('[role="checkbox"]')).not.toBeInTheDocument()
+    await expect.element(screen.getByTestId('checkbox-skeleton')).toHaveClass('bg-text-quaternary', 'opacity-20')
+  })
+})
diff --git a/packages/dify-ui/src/checkbox/index.stories.tsx b/packages/dify-ui/src/checkbox/index.stories.tsx
new file mode 100644
index 0000000000..97cd1a1d60
--- /dev/null
+++ b/packages/dify-ui/src/checkbox/index.stories.tsx
@@ -0,0 +1,145 @@
+import type { Meta, StoryObj } from '@storybook/react-vite'
+import type { ComponentProps } from 'react'
+import { useState } from 'react'
+import {
+  Checkbox,
+  CheckboxSkeleton,
+} from '.'
+
+const meta = {
+  title: 'Base/UI/Checkbox',
+  component: Checkbox,
+  parameters: {
+    layout: 'centered',
+    docs: {
+      description: {
+        component: 'Checkbox primitive built on Base UI. It preserves Base UI checked, indeterminate, disabled, and hidden input semantics while applying the Dify 16px checkbox design from Figma. Import from `@langgenius/dify-ui/checkbox`.',
+      },
+    },
+  },
+  tags: ['autodocs'],
+  args: {
+    checked: false,
+    disabled: false,
+    indeterminate: false,
+  },
+  argTypes: {
+    checked: {
+      control: 'boolean',
+      description: 'Controlled checked state.',
+    },
+    indeterminate: {
+      control: 'boolean',
+      description: 'Mixed state used by parent or select-all checkboxes.',
+    },
+    disabled: {
+      control: 'boolean',
+      description: 'Disables user interaction and exposes Base UI disabled state attributes.',
+    },
+  },
+} satisfies Meta<typeof Checkbox>
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+function CheckboxDemo(args: Partial<ComponentProps<typeof Checkbox>>) {
+  const [checked, setChecked] = useState(args.checked ?? false)
+
+  return (
+    <label className="flex items-center gap-2 system-sm-medium text-text-secondary">
+      <Checkbox
+        {...args}
+        checked={checked}
+        onCheckedChange={setChecked}
+      />
+      Enable feature
+    </label>
+  )
+}
+
+export const Default: Story = {
+  render: args => <CheckboxDemo {...args} />,
+  args: {
+    checked: false,
+    indeterminate: false,
+    disabled: false,
+  },
+}
+
+export const Checked: Story = {
+  render: args => <CheckboxDemo {...args} />,
+  args: {
+    checked: true,
+    indeterminate: false,
+    disabled: false,
+  },
+}
+
+export const Indeterminate: Story = {
+  args: {
+    'checked': false,
+    'indeterminate': true,
+    'disabled': false,
+    'aria-label': 'Partial selection',
+  },
+}
+
+export const Disabled: Story = {
+  render: () => (
+    <div className="flex flex-col gap-3">
+      <label className="flex items-center gap-2 system-sm-medium text-text-secondary">
+        <Checkbox checked={false} disabled />
+        Disabled unchecked
+      </label>
+      <label className="flex items-center gap-2 system-sm-medium text-text-secondary">
+        <Checkbox checked disabled />
+        Disabled checked
+      </label>
+      <label className="flex items-center gap-2 system-sm-medium text-text-secondary">
+        <Checkbox checked={false} indeterminate disabled />
+        Disabled mixed
+      </label>
+    </div>
+  ),
+}
+
+function StateMatrixDemo() {
+  const states = [
+    { label: 'Unchecked', checked: false },
+    { label: 'Checked', checked: true },
+    { label: 'Indeterminate', checked: false, indeterminate: true },
+    { label: 'Disabled unchecked', checked: false, disabled: true },
+    { label: 'Disabled checked', checked: true, disabled: true },
+    { label: 'Disabled indeterminate', checked: false, indeterminate: true, disabled: true },
+  ]
+
+  return (
+    <div className="flex flex-col gap-3">
+      {states.map(state => (
+        <label key={state.label} className="flex items-center gap-2 system-sm-medium text-text-secondary">
+          <Checkbox
+            checked={state.checked}
+            indeterminate={state.indeterminate}
+            disabled={state.disabled}
+          />
+          {state.label}
+        </label>
+      ))}
+      <div className="flex items-center gap-2 system-sm-medium text-text-secondary">
+        <CheckboxSkeleton aria-hidden="true" />
+        Skeleton
+      </div>
+    </div>
+  )
+}
+
+export const StateMatrix: Story = {
+  render: () => <StateMatrixDemo />,
+  parameters: {
+    docs: {
+      description: {
+        story: 'The full visual matrix for Dify checkbox states. State styling comes from Base UI data attributes such as data-checked, data-indeterminate, and data-disabled.',
+      },
+    },
+  },
+}
diff --git a/packages/dify-ui/src/checkbox/index.tsx b/packages/dify-ui/src/checkbox/index.tsx
new file mode 100644
index 0000000000..5e099be500
--- /dev/null
+++ b/packages/dify-ui/src/checkbox/index.tsx
@@ -0,0 +1,100 @@
+'use client'
+
+import type { Checkbox as BaseCheckboxNS } from '@base-ui/react/checkbox'
+import type { HTMLAttributes } from 'react'
+import { Checkbox as BaseCheckbox } from '@base-ui/react/checkbox'
+import { cn } from '../cn'
+
+const checkboxRootClassName = cn(
+  'inline-flex size-4 shrink-0 touch-manipulation items-center justify-center rounded-sm shadow-xs shadow-shadow-shadow-3 transition-colors motion-reduce:transition-none',
+  'border border-components-checkbox-border bg-components-checkbox-bg-unchecked text-components-checkbox-icon',
+  'hover:border-components-checkbox-border-hover hover:bg-components-checkbox-bg-unchecked-hover',
+  'focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-components-checkbox-bg focus-visible:ring-offset-0',
+  'data-checked:border-transparent data-checked:bg-components-checkbox-bg data-checked:hover:bg-components-checkbox-bg-hover',
+  'data-indeterminate:border-transparent data-indeterminate:bg-components-checkbox-bg data-indeterminate:hover:bg-components-checkbox-bg-hover',
+  'data-disabled:cursor-not-allowed data-disabled:border-components-checkbox-border-disabled data-disabled:bg-components-checkbox-bg-disabled',
+  'data-disabled:hover:border-components-checkbox-border-disabled data-disabled:hover:bg-components-checkbox-bg-disabled',
+  'data-disabled:data-checked:border-transparent data-disabled:data-checked:bg-components-checkbox-bg-disabled-checked data-disabled:data-checked:text-components-checkbox-icon-disabled',
+  'data-disabled:data-checked:hover:bg-components-checkbox-bg-disabled-checked',
+  'data-disabled:data-indeterminate:border-transparent data-disabled:data-indeterminate:bg-components-checkbox-bg-disabled-checked data-disabled:data-indeterminate:text-components-checkbox-icon-disabled',
+  'data-disabled:data-indeterminate:hover:bg-components-checkbox-bg-disabled-checked',
+)
+
+const checkboxIndicatorClassName = 'flex size-3 items-center justify-center text-current data-unchecked:hidden'
+
+const checkboxSkeletonClassName = 'size-4 shrink-0 rounded-sm bg-text-quaternary opacity-20'
+
+export type CheckboxRootProps
+  = Omit<BaseCheckboxNS.Root.Props, 'className'>
+    & {
+      className?: string
+    }
+
+export function CheckboxRoot({
+  className,
+  ...props
+}: CheckboxRootProps) {
+  return (
+    <BaseCheckbox.Root
+      className={cn(checkboxRootClassName, className)}
+      {...props}
+    />
+  )
+}
+
+export type CheckboxIndicatorProps
+  = Omit<BaseCheckboxNS.Indicator.Props, 'className' | 'children'>
+    & {
+      className?: string
+    }
+
+export function CheckboxIndicator({
+  className,
+  render,
+  ...props
+}: CheckboxIndicatorProps) {
+  return (
+    <BaseCheckbox.Indicator
+      className={cn(checkboxIndicatorClassName, className)}
+      render={render ?? ((indicatorProps, state) => (
+        <span {...indicatorProps}>
+          {state.indeterminate
+            ? <span className="block h-[1.5px] w-1.75 rounded-full bg-current" />
+            : <span className="i-ri-check-line block size-3 shrink-0" />}
+        </span>
+      ))}
+      {...props}
+    />
+  )
+}
+
+export type CheckboxProps
+  = Omit<CheckboxRootProps, 'children'>
+
+export function Checkbox({
+  ...props
+}: CheckboxProps) {
+  return (
+    <CheckboxRoot {...props}>
+      <CheckboxIndicator />
+    </CheckboxRoot>
+  )
+}
+
+export type CheckboxSkeletonProps
+  = Omit<HTMLAttributes<HTMLDivElement>, 'className'>
+    & {
+      className?: string
+    }
+
+export function CheckboxSkeleton({
+  className,
+  ...props
+}: CheckboxSkeletonProps) {
+  return (
+    <div
+      className={cn(checkboxSkeletonClassName, className)}
+      {...props}
+    />
+  )
+}
diff --git a/packages/dify-ui/src/combobox/__tests__/index.spec.tsx b/packages/dify-ui/src/combobox/__tests__/index.spec.tsx
new file mode 100644
index 0000000000..75968c162f
--- /dev/null
+++ b/packages/dify-ui/src/combobox/__tests__/index.spec.tsx
@@ -0,0 +1,363 @@
+import type { ReactNode } from 'react'
+import { render } from 'vitest-browser-react'
+import {
+  Combobox,
+  ComboboxChip,
+  ComboboxChipRemove,
+  ComboboxChips,
+  ComboboxClear,
+  ComboboxContent,
+  ComboboxEmpty,
+  ComboboxGroup,
+  ComboboxGroupLabel,
+  ComboboxInput,
+  ComboboxInputGroup,
+  ComboboxInputTrigger,
+  ComboboxItem,
+  ComboboxItemIndicator,
+  ComboboxItemText,
+  ComboboxLabel,
+  ComboboxList,
+  ComboboxSeparator,
+  ComboboxStatus,
+  ComboboxTrigger,
+  ComboboxValue,
+} from '../index'
+
+const renderWithSafeViewport = (ui: ReactNode) => render(
+  <div style={{ minHeight: '100vh', minWidth: '100vw', padding: '240px' }}>
+    {ui}
+  </div>,
+)
+
+const asHTMLElement = (element: HTMLElement | SVGElement) => element as HTMLElement
+
+const renderSelectLikeCombobox = ({
+  children,
+  open = false,
+}: {
+  children?: ReactNode
+  open?: boolean
+} = {}) => renderWithSafeViewport(
+  <Combobox open={open} defaultValue="workflow" items={['workflow', 'dataset']}>
+    {children ?? (
+      <>
+        <ComboboxLabel data-testid="label">Resource type</ComboboxLabel>
+        <ComboboxTrigger aria-label="Resource type" data-testid="trigger">
+          <ComboboxValue placeholder="Select resource" />
+        </ComboboxTrigger>
+        <ComboboxContent
+          positionerProps={{
+            'role': 'group',
+            'aria-label': 'combobox positioner',
+          }}
+          popupProps={{
+            'role': 'dialog',
+            'aria-label': 'combobox popup',
+          }}
+        >
+          <ComboboxStatus data-testid="status">2 options</ComboboxStatus>
+          <ComboboxList role="listbox" aria-label="combobox list" data-testid="list">
+            <ComboboxItem value="workflow">
+              <ComboboxItemText>Workflow</ComboboxItemText>
+              <ComboboxItemIndicator />
+            </ComboboxItem>
+            <ComboboxItem value="dataset">
+              <ComboboxItemText>Dataset</ComboboxItemText>
+            </ComboboxItem>
+          </ComboboxList>
+          <ComboboxEmpty data-testid="empty">No options</ComboboxEmpty>
+        </ComboboxContent>
+      </>
+    )}
+  </Combobox>,
+)
+
+const renderInputCombobox = ({
+  children,
+  open = false,
+}: {
+  children?: ReactNode
+  open?: boolean
+} = {}) => renderWithSafeViewport(
+  <Combobox open={open} defaultValue="workflow" items={['workflow', 'dataset']}>
+    {children ?? (
+      <>
+        <ComboboxInputGroup data-testid="input-group">
+          <ComboboxInput aria-label="Search resources" data-testid="input" />
+          <ComboboxClear data-testid="clear" />
+          <ComboboxInputTrigger data-testid="input-trigger" />
+        </ComboboxInputGroup>
+        <ComboboxContent popupProps={{ 'role': 'dialog', 'aria-label': 'combobox popup' }}>
+          <ComboboxList role="listbox" aria-label="combobox list">
+            <ComboboxItem value="workflow">
+              <ComboboxItemText>Workflow</ComboboxItemText>
+              <ComboboxItemIndicator />
+            </ComboboxItem>
+          </ComboboxList>
+        </ComboboxContent>
+      </>
+    )}
+  </Combobox>,
+)
+
+describe('Combobox wrappers', () => {
+  describe('Select-like trigger', () => {
+    it('should render label and apply medium trigger classes by default', async () => {
+      const screen = await renderSelectLikeCombobox()
+
+      await expect.element(screen.getByText('Resource type')).toHaveClass('system-sm-medium')
+      await expect.element(screen.getByRole('combobox', { name: 'Resource type' })).toHaveClass('rounded-lg')
+      await expect.element(screen.getByRole('combobox', { name: 'Resource type' })).toHaveClass('system-sm-regular')
+    })
+
+    it('should apply small and large trigger size variants', async () => {
+      const smallScreen = await renderSelectLikeCombobox({
+        children: (
+          <ComboboxTrigger aria-label="Small resource type" size="small">
+            <ComboboxValue placeholder="Select resource" />
+          </ComboboxTrigger>
+        ),
+      })
+
+      await expect.element(smallScreen.getByRole('combobox', { name: 'Small resource type' })).toHaveClass('rounded-md')
+      await expect.element(smallScreen.getByRole('combobox', { name: 'Small resource type' })).toHaveClass('system-xs-regular')
+
+      const largeScreen = await renderSelectLikeCombobox({
+        children: (
+          <ComboboxTrigger aria-label="Large resource type" size="large">
+            <ComboboxValue placeholder="Select resource" />
+          </ComboboxTrigger>
+        ),
+      })
+
+      await expect.element(largeScreen.getByRole('combobox', { name: 'Large resource type' })).toHaveClass('rounded-[10px]')
+      await expect.element(largeScreen.getByRole('combobox', { name: 'Large resource type' })).toHaveClass('system-md-regular')
+    })
+
+    it('should render default trigger icon and support hiding it', async () => {
+      const withIcon = await renderSelectLikeCombobox()
+
+      expect(withIcon.getByTestId('trigger').element().querySelector('.i-ri-arrow-down-s-line')).toHaveAttribute('aria-hidden', 'true')
+
+      const withoutIcon = await renderSelectLikeCombobox({
+        children: (
+          <ComboboxTrigger aria-label="Resource type without icon" icon={false}>
+            <ComboboxValue placeholder="Select resource" />
+          </ComboboxTrigger>
+        ),
+      })
+
+      expect(withoutIcon.getByRole('combobox', { name: 'Resource type without icon' }).element().querySelector('.i-ri-arrow-down-s-line')).not.toBeInTheDocument()
+    })
+  })
+
+  describe('Input group and controls', () => {
+    it('should apply medium input group and input classes by default', async () => {
+      const screen = await renderInputCombobox()
+
+      await expect.element(screen.getByTestId('input-group')).toHaveClass('rounded-lg')
+      await expect.element(screen.getByRole('combobox', { name: 'Search resources' })).toHaveClass('px-3')
+      await expect.element(screen.getByRole('combobox', { name: 'Search resources' })).toHaveClass('system-sm-regular')
+    })
+
+    it('should apply large input group and input classes when large size is provided', async () => {
+      const screen = await renderInputCombobox({
+        children: (
+          <ComboboxInputGroup size="large" data-testid="input-group">
+            <ComboboxInput size="large" aria-label="Search resources" />
+          </ComboboxInputGroup>
+        ),
+      })
+
+      await expect.element(screen.getByTestId('input-group')).toHaveClass('rounded-[10px]')
+      await expect.element(screen.getByRole('combobox', { name: 'Search resources' })).toHaveClass('px-4')
+      await expect.element(screen.getByRole('combobox', { name: 'Search resources' })).toHaveClass('system-md-regular')
+    })
+
+    it('should set input defaults and forward passthrough props', async () => {
+      const screen = await renderInputCombobox({
+        children: (
+          <ComboboxInputGroup>
+            <ComboboxInput
+              aria-label="Search resources"
+              className="custom-input"
+              placeholder="Find a resource"
+              required
+            />
+          </ComboboxInputGroup>
+        ),
+      })
+
+      await expect.element(screen.getByRole('combobox', { name: 'Search resources' })).toHaveAttribute('autocomplete', 'off')
+      await expect.element(screen.getByRole('combobox', { name: 'Search resources' })).toHaveAttribute('type', 'text')
+      await expect.element(screen.getByRole('combobox', { name: 'Search resources' })).toHaveAttribute('placeholder', 'Find a resource')
+      await expect.element(screen.getByRole('combobox', { name: 'Search resources' })).toBeRequired()
+      await expect.element(screen.getByRole('combobox', { name: 'Search resources' })).toHaveClass('custom-input')
+    })
+
+    it('should provide fallback aria labels and decorative icons for input controls', async () => {
+      const screen = await renderInputCombobox()
+
+      await expect.element(screen.getByRole('button', { name: 'Clear combobox' })).toHaveAttribute('type', 'button')
+      await expect.element(screen.getByRole('button', { name: 'Open combobox options' })).toHaveAttribute('type', 'button')
+      expect(screen.getByRole('button', { name: 'Clear combobox' }).element().querySelector('.i-ri-close-line')).toHaveAttribute('aria-hidden', 'true')
+      expect(screen.getByRole('button', { name: 'Open combobox options' }).element().querySelector('.i-ri-arrow-down-s-line')).toHaveAttribute('aria-hidden', 'true')
+    })
+
+    it('should rely on aria-labelledby when provided instead of injecting fallback labels', async () => {
+      const screen = await renderInputCombobox({
+        children: (
+          <>
+            <span id="clear-label">Clear from label</span>
+            <span id="trigger-label">Trigger from label</span>
+            <ComboboxInputGroup>
+              <ComboboxInput aria-label="Search resources" />
+              <ComboboxClear aria-labelledby="clear-label" />
+              <ComboboxInputTrigger aria-labelledby="trigger-label" />
+            </ComboboxInputGroup>
+          </>
+        ),
+      })
+
+      await expect.element(screen.getByRole('button', { name: 'Clear from label' })).not.toHaveAttribute('aria-label')
+      await expect.element(screen.getByRole('button', { name: 'Trigger from label' })).not.toHaveAttribute('aria-label')
+    })
+  })
+
+  describe('Content and options', () => {
+    it('should use default overlay placement and Dify popup classes', async () => {
+      const screen = await renderSelectLikeCombobox({ open: true })
+
+      await expect.element(screen.getByRole('group', { name: 'combobox positioner' })).toHaveAttribute('data-side', 'bottom')
+      await expect.element(screen.getByRole('group', { name: 'combobox positioner' })).toHaveAttribute('data-align', 'start')
+      await expect.element(screen.getByRole('group', { name: 'combobox positioner' })).toHaveClass('z-50')
+      await expect.element(screen.getByRole('dialog', { name: 'combobox popup' })).toHaveClass('rounded-xl')
+      await expect.element(screen.getByRole('dialog', { name: 'combobox popup' })).toHaveClass('w-(--anchor-width)')
+      await expect.element(screen.getByRole('listbox', { name: 'combobox list' })).toHaveClass('scroll-py-1')
+    })
+
+    it('should apply custom placement side and passthrough popup props', async () => {
+      const onPopupClick = vi.fn()
+      const screen = await renderWithSafeViewport(
+        <Combobox open defaultValue="workflow" items={['workflow']}>
+          <ComboboxTrigger aria-label="Resource type">
+            <ComboboxValue />
+          </ComboboxTrigger>
+          <ComboboxContent
+            placement="top-end"
+            sideOffset={12}
+            alignOffset={6}
+            positionerProps={{ 'role': 'group', 'aria-label': 'combobox positioner' }}
+            popupProps={{
+              'role': 'dialog',
+              'aria-label': 'combobox popup',
+              'onClick': onPopupClick,
+            }}
+          >
+            <ComboboxList role="listbox" aria-label="combobox list">
+              <ComboboxItem value="workflow">
+                <ComboboxItemText>Workflow</ComboboxItemText>
+              </ComboboxItem>
+            </ComboboxList>
+          </ComboboxContent>
+        </Combobox>,
+      )
+
+      asHTMLElement(screen.getByRole('dialog', { name: 'combobox popup' }).element()).click()
+
+      await expect.element(screen.getByRole('group', { name: 'combobox positioner' })).toHaveAttribute('data-side', 'top')
+      expect(onPopupClick).toHaveBeenCalledTimes(1)
+    })
+
+    it('should render item text indicator status and empty wrappers with design classes', async () => {
+      const screen = await renderSelectLikeCombobox({ open: true })
+
+      await expect.element(screen.getByTestId('list').getByText('Workflow')).toHaveClass('system-sm-medium')
+      await expect.element(screen.getByTestId('status')).toHaveClass('text-text-tertiary')
+      await expect.element(screen.getByTestId('empty')).toHaveClass('system-sm-regular')
+      expect(screen.getByTestId('list').getByText('Workflow').element().parentElement?.querySelector('.i-ri-check-line')).toHaveAttribute('aria-hidden', 'true')
+    })
+
+    it('should forward custom classes to group label separator item text and indicator', async () => {
+      const screen = await renderWithSafeViewport(
+        <Combobox open defaultValue="workflow" items={['workflow']}>
+          <ComboboxTrigger aria-label="Resource type">
+            <ComboboxValue />
+          </ComboboxTrigger>
+          <ComboboxContent popupProps={{ 'role': 'dialog', 'aria-label': 'combobox popup' }}>
+            <ComboboxList role="listbox" aria-label="combobox list" data-testid="custom-list">
+              <ComboboxGroup items={['workflow']}>
+                <ComboboxGroupLabel className="custom-label">Resources</ComboboxGroupLabel>
+                <ComboboxSeparator className="custom-separator" data-testid="separator" />
+                <ComboboxItem value="workflow" className="custom-item">
+                  <ComboboxItemText className="custom-text">Workflow</ComboboxItemText>
+                  <ComboboxItemIndicator className="custom-indicator" data-testid="indicator" />
+                </ComboboxItem>
+              </ComboboxGroup>
+            </ComboboxList>
+          </ComboboxContent>
+        </Combobox>,
+      )
+
+      await expect.element(screen.getByText('Resources')).toHaveClass('custom-label')
+      await expect.element(screen.getByTestId('separator')).toHaveClass('custom-separator')
+      await expect.element(screen.getByRole('option', { name: 'Workflow' })).toHaveClass('custom-item')
+      await expect.element(screen.getByTestId('custom-list').getByText('Workflow')).toHaveClass('custom-text')
+      await expect.element(screen.getByTestId('indicator')).toHaveClass('custom-indicator')
+    })
+  })
+
+  describe('Multiple selection chips', () => {
+    it('should render chip wrappers and default remove button label', async () => {
+      const screen = await renderWithSafeViewport(
+        <Combobox multiple defaultValue={['maya']} items={['maya', 'nora']}>
+          <ComboboxInputGroup>
+            <ComboboxValue>
+              {(selectedValue: string[]) => (
+                <ComboboxChips className="custom-chips" data-testid="chips">
+                  {selectedValue.map(item => (
+                    <ComboboxChip key={item} className="custom-chip">
+                      <span>{item}</span>
+                      <ComboboxChipRemove data-testid="remove-chip" />
+                    </ComboboxChip>
+                  ))}
+                </ComboboxChips>
+              )}
+            </ComboboxValue>
+            <ComboboxInput aria-label="Reviewers" />
+          </ComboboxInputGroup>
+        </Combobox>,
+      )
+
+      await expect.element(screen.getByTestId('chips')).toHaveClass('custom-chips')
+      await expect.element(screen.getByText('maya').element().parentElement!).toHaveClass('custom-chip')
+      await expect.element(screen.getByRole('button', { name: 'Remove selected item' })).toHaveAttribute('type', 'button')
+      expect(screen.getByTestId('remove-chip').element().querySelector('.i-ri-close-line')).toHaveAttribute('aria-hidden', 'true')
+    })
+
+    it('should preserve chip remove aria-labelledby over fallback label', async () => {
+      const screen = await renderWithSafeViewport(
+        <Combobox multiple defaultValue={['maya']} items={['maya']}>
+          <ComboboxInputGroup>
+            <ComboboxValue>
+              {(selectedValue: string[]) => (
+                <ComboboxChips>
+                  {selectedValue.map(item => (
+                    <ComboboxChip key={item}>
+                      <span id="remove-maya">Remove Maya</span>
+                      <ComboboxChipRemove aria-labelledby="remove-maya" />
+                    </ComboboxChip>
+                  ))}
+                </ComboboxChips>
+              )}
+            </ComboboxValue>
+            <ComboboxInput aria-label="Reviewers" />
+          </ComboboxInputGroup>
+        </Combobox>,
+      )
+
+      await expect.element(screen.getByRole('button', { name: 'Remove Maya' })).not.toHaveAttribute('aria-label')
+    })
+  })
+})
diff --git a/packages/dify-ui/src/combobox/index.stories.tsx b/packages/dify-ui/src/combobox/index.stories.tsx
new file mode 100644
index 0000000000..f2b5f4d4c6
--- /dev/null
+++ b/packages/dify-ui/src/combobox/index.stories.tsx
@@ -0,0 +1,618 @@
+import type { Meta, StoryObj } from '@storybook/react-vite'
+import type { Virtualizer } from '@tanstack/react-virtual'
+import type { RefObject } from 'react'
+import { useVirtualizer } from '@tanstack/react-virtual'
+import { useEffect, useRef, useState } from 'react'
+import {
+  Combobox,
+  ComboboxChip,
+  ComboboxChipRemove,
+  ComboboxChips,
+  ComboboxClear,
+  ComboboxCollection,
+  ComboboxContent,
+  ComboboxEmpty,
+  ComboboxGroup,
+  ComboboxGroupLabel,
+  ComboboxInput,
+  ComboboxInputGroup,
+  ComboboxInputTrigger,
+  ComboboxItem,
+  ComboboxItemIndicator,
+  ComboboxItemText,
+  ComboboxLabel,
+  ComboboxList,
+  ComboboxSeparator,
+  ComboboxStatus,
+  ComboboxTrigger,
+  ComboboxValue,
+  useComboboxFilteredItems,
+} from '.'
+import { cn } from '../cn'
+
+type Option = {
+  value: string
+  label: string
+  meta?: string
+  icon?: string
+  disabled?: boolean
+}
+
+type OptionGroup = {
+  label: string
+  items: Option[]
+}
+
+const fieldWidth = 'w-80'
+const wideFieldWidth = 'w-[520px]'
+const nativeFieldLabelClassName = 'mb-1 block text-text-secondary system-sm-medium'
+
+type StoryVirtualizer = Virtualizer<HTMLDivElement, Element>
+
+const scrollHighlightedVirtualItem = (
+  item: unknown,
+  {
+    reason,
+    index,
+  }: {
+    reason: 'keyboard' | 'pointer' | 'none'
+    index: number
+  },
+  virtualizer: StoryVirtualizer | null,
+) => {
+  if (!item || !virtualizer)
+    return
+
+  const isStart = index === 0
+  const isEnd = index === virtualizer.options.count - 1
+  const shouldScroll = reason === 'none' || (reason === 'keyboard' && (isStart || isEnd))
+
+  if (shouldScroll) {
+    queueMicrotask(() => {
+      virtualizer.scrollToIndex(index, { align: isEnd ? 'start' : 'end' })
+    })
+  }
+}
+
+const providerOptions: Option[] = [
+  { value: 'openai', label: 'OpenAI', meta: 'GPT-5, GPT-4.1', icon: 'i-ri-openai-fill' },
+  { value: 'anthropic', label: 'Anthropic', meta: 'Claude Opus, Sonnet', icon: 'i-ri-sparkling-2-line' },
+  { value: 'google', label: 'Google', meta: 'Gemini 2.5', icon: 'i-ri-google-fill' },
+  { value: 'azure-openai', label: 'Azure OpenAI', meta: 'Enterprise workspace', icon: 'i-ri-microsoft-fill' },
+  { value: 'localai', label: 'LocalAI', meta: 'Self-hosted endpoint', icon: 'i-ri-server-line', disabled: true },
+]
+
+const dataSourceOptions: Option[] = [
+  { value: 'knowledge-base', label: 'Knowledge Base', meta: 'Vector index', icon: 'i-ri-database-2-line' },
+  { value: 'notion', label: 'Notion', meta: 'Synced pages', icon: 'i-ri-notion-fill' },
+  { value: 'website', label: 'Website crawler', meta: 'Public URLs', icon: 'i-ri-global-line' },
+  { value: 's3', label: 'S3 bucket', meta: 'Private files', icon: 'i-ri-cloud-line' },
+  { value: 'slack', label: 'Slack', meta: 'Channel history', icon: 'i-ri-slack-fill' },
+]
+
+const reviewerOptions: Option[] = [
+  { value: 'maya', label: 'Maya Chen', meta: 'Product owner' },
+  { value: 'liam', label: 'Liam Brooks', meta: 'Prompt engineer' },
+  { value: 'nora', label: 'Nora Park', meta: 'Data steward' },
+  { value: 'owen', label: 'Owen Reed', meta: 'Security reviewer' },
+  { value: 'yuki', label: 'Yuki Tanaka', meta: 'ML engineer' },
+]
+
+const toolGroups: OptionGroup[] = [
+  {
+    label: 'Retrieval',
+    items: [
+      { value: 'dataset-search', label: 'Dataset search', meta: 'Search workspace knowledge', icon: 'i-ri-search-eye-line' },
+      { value: 'web-scraper', label: 'Web scraper', meta: 'Fetch public pages', icon: 'i-ri-global-line' },
+    ],
+  },
+  {
+    label: 'Actions',
+    items: [
+      { value: 'http-request', label: 'HTTP request', meta: 'Call external APIs', icon: 'i-ri-terminal-box-line' },
+      { value: 'code-runner', label: 'Code runner', meta: 'Execute sandboxed scripts', icon: 'i-ri-code-s-slash-line' },
+    ],
+  },
+  {
+    label: 'Operations',
+    items: [
+      { value: 'human-review', label: 'Human review', meta: 'Assign approval task', icon: 'i-ri-user-voice-line' },
+      { value: 'audit-log', label: 'Audit log', meta: 'Record workflow events', icon: 'i-ri-file-list-3-line' },
+    ],
+  },
+]
+
+const tagOptions: Option[] = [
+  { value: 'rag', label: 'RAG' },
+  { value: 'agent', label: 'Agent' },
+  { value: 'production', label: 'Production' },
+  { value: 'evaluation', label: 'Evaluation' },
+  { value: 'finance', label: 'Finance' },
+  { value: 'support', label: 'Support' },
+]
+
+const directoryOptions: Option[] = [
+  { value: 'maya-chen', label: 'Maya Chen', meta: 'Product owner · maya@example.com', icon: 'i-ri-user-3-line' },
+  { value: 'liam-brooks', label: 'Liam Brooks', meta: 'Prompt engineer · liam@example.com', icon: 'i-ri-user-3-line' },
+  { value: 'nora-park', label: 'Nora Park', meta: 'Data steward · nora@example.com', icon: 'i-ri-user-3-line' },
+  { value: 'owen-reed', label: 'Owen Reed', meta: 'Security reviewer · owen@example.com', icon: 'i-ri-shield-user-line' },
+  { value: 'yuki-tanaka', label: 'Yuki Tanaka', meta: 'ML engineer · yuki@example.com', icon: 'i-ri-user-3-line' },
+  { value: 'ava-martin', label: 'Ava Martin', meta: 'Support lead · ava@example.com', icon: 'i-ri-customer-service-2-line' },
+]
+
+const emptyOptions: Option[] = [
+  { value: 'billing', label: 'Billing connector' },
+  { value: 'zendesk', label: 'Zendesk' },
+  { value: 'github', label: 'GitHub issues' },
+]
+
+const modelCatalogOptions: Option[] = Array.from({ length: 1000 }, (_, index) => {
+  const provider = ['OpenAI', 'Anthropic', 'Google', 'Mistral', 'DeepSeek'][index % 5]!
+  const family = ['chat', 'reasoning', 'vision', 'embedding'][index % 4]!
+  const number = new Intl.NumberFormat('en-US', {
+    minimumIntegerDigits: 4,
+  }).format(index + 1)
+
+  return {
+    value: `model-${index + 1}`,
+    label: `${provider} ${family} ${number}`,
+    meta: `${provider} provider · ${family}`,
+    icon: family === 'embedding'
+      ? 'i-ri-vector-triangle'
+      : family === 'vision'
+        ? 'i-ri-image-circle-line'
+        : family === 'reasoning'
+          ? 'i-ri-brain-line'
+          : 'i-ri-chat-1-line',
+  }
+})
+
+const sizeOptions: Option[] = providerOptions.slice(0, 3)
+const defaultProvider = providerOptions[0]!
+const disabledProvider = providerOptions[1]!
+const defaultDataSource = dataSourceOptions[0]!
+const defaultPopupDataSource = dataSourceOptions[1]!
+const readOnlyDataSource = dataSourceOptions[2]!
+const defaultTool = toolGroups[0]!.items[0]!
+const defaultReviewers = [reviewerOptions[0]!, reviewerOptions[2]!]
+const defaultTag = tagOptions[2]!
+
+const renderOptionItem = (option: Option, index?: number) => (
+  <ComboboxItem key={option.value} value={option} index={index} disabled={option.disabled}>
+    <ComboboxItemText className="flex items-center gap-2 px-0">
+      {option.icon && <span aria-hidden className={cn(option.icon, 'size-4 shrink-0 text-text-tertiary')} />}
+      <span className="min-w-0 flex-1">
+        <span className="block truncate text-text-secondary system-sm-medium">{option.label}</span>
+        {option.meta && <span className="block truncate text-text-tertiary system-xs-regular">{option.meta}</span>}
+      </span>
+    </ComboboxItemText>
+    <ComboboxItemIndicator />
+  </ComboboxItem>
+)
+
+const renderSimpleOptionItem = (option: Option, index?: number) => (
+  <ComboboxItem key={option.value} value={option} index={index}>
+    <ComboboxItemText>{option.label}</ComboboxItemText>
+    <ComboboxItemIndicator />
+  </ComboboxItem>
+)
+
+const PopupSearchInput = ({
+  label,
+  placeholder,
+}: {
+  label: string
+  placeholder: string
+}) => (
+  <ComboboxInputGroup className="mb-1 border-divider-subtle bg-components-input-bg-normal">
+    <span aria-hidden className="ml-2 i-ri-search-line size-4 shrink-0 text-text-tertiary" />
+    <ComboboxInput aria-label={label} placeholder={`${placeholder}…`} className="pl-2" />
+    <ComboboxClear />
+  </ComboboxInputGroup>
+)
+
+const GroupedToolList = () => {
+  const groups = useComboboxFilteredItems<OptionGroup>()
+
+  return (
+    <ComboboxList className="p-0">
+      {groups.map((group, groupIndex) => (
+        <ComboboxGroup key={group.label} items={group.items}>
+          {groupIndex > 0 && <ComboboxSeparator />}
+          <ComboboxGroupLabel>{group.label}</ComboboxGroupLabel>
+          <ComboboxCollection>
+            {(option: Option) => renderOptionItem(option)}
+          </ComboboxCollection>
+        </ComboboxGroup>
+      ))}
+    </ComboboxList>
+  )
+}
+
+const VirtualizedModelList = ({
+  virtualizerRef,
+}: {
+  virtualizerRef: RefObject<StoryVirtualizer | null>
+}) => {
+  const scrollRef = useRef<HTMLDivElement | null>(null)
+  const filteredItems = useComboboxFilteredItems<Option>()
+  const virtualizer = useVirtualizer({
+    count: filteredItems.length,
+    getScrollElement: () => scrollRef.current,
+    estimateSize: () => 42,
+    overscan: 6,
+  })
+
+  useEffect(() => {
+    virtualizerRef.current = virtualizer
+
+    return () => {
+      virtualizerRef.current = null
+    }
+  }, [virtualizer, virtualizerRef])
+
+  return (
+    <div
+      ref={scrollRef}
+      className="max-h-[min(22rem,var(--available-height))] overflow-y-auto overflow-x-hidden overscroll-contain outline-hidden"
+    >
+      <ComboboxList
+        className="relative max-h-none overflow-visible p-0"
+        style={{
+          height: virtualizer.getTotalSize(),
+        }}
+      >
+        {virtualizer.getVirtualItems().map((virtualItem) => {
+          const option = filteredItems[virtualItem.index]
+
+          if (!option)
+            return null
+
+          return (
+            <div
+              key={virtualItem.key}
+              className="absolute top-0 left-0 w-full"
+              style={{
+                height: virtualItem.size,
+                transform: `translateY(${virtualItem.start}px)`,
+              }}
+            >
+              {renderOptionItem(option, virtualItem.index)}
+            </div>
+          )
+        })}
+      </ComboboxList>
+    </div>
+  )
+}
+
+const FilteredModelStatus = () => {
+  const filteredItems = useComboboxFilteredItems<Option>()
+
+  return (
+    <ComboboxStatus className="border-y border-divider-subtle px-2 py-1 text-text-quaternary tabular-nums">
+      {filteredItems.length}
+      {' '}
+      matching models
+    </ComboboxStatus>
+  )
+}
+
+const VirtualizedLongListDemo = () => {
+  const [value, setValue] = useState<Option | null>(modelCatalogOptions[137]!)
+  const virtualizerRef = useRef<StoryVirtualizer | null>(null)
+
+  return (
+    <div className={fieldWidth}>
+      <Combobox
+        items={modelCatalogOptions}
+        value={value}
+        onValueChange={setValue}
+        virtualized
+        autoHighlight
+        onItemHighlighted={(item, details) => {
+          scrollHighlightedVirtualItem(item, details, virtualizerRef.current)
+        }}
+      >
+        <ComboboxLabel>Model catalog</ComboboxLabel>
+        <ComboboxTrigger aria-label="Model catalog">
+          <ComboboxValue placeholder="Select model" />
+        </ComboboxTrigger>
+        <ComboboxContent popupClassName="w-[440px] p-1">
+          <PopupSearchInput label="Filter model catalog" placeholder="Filter 1,000 models" />
+          <FilteredModelStatus />
+          <VirtualizedModelList virtualizerRef={virtualizerRef} />
+          <ComboboxEmpty>No model matches this filter</ComboboxEmpty>
+        </ComboboxContent>
+      </Combobox>
+    </div>
+  )
+}
+
+const AsyncDirectoryDemo = () => {
+  const [inputValue, setInputValue] = useState('ma')
+  const [value, setValue] = useState<Option | null>(null)
+  const [items, setItems] = useState(directoryOptions.slice(0, 3))
+  const [loading, setLoading] = useState(false)
+
+  useEffect(() => {
+    setLoading(true)
+    const timeout = window.setTimeout(() => {
+      const query = inputValue.trim().toLowerCase()
+      setItems(
+        query
+          ? directoryOptions.filter(option => `${option.label} ${option.meta}`.toLowerCase().includes(query))
+          : directoryOptions.slice(0, 5),
+      )
+      setLoading(false)
+    }, 450)
+
+    return () => window.clearTimeout(timeout)
+  }, [inputValue])
+
+  return (
+    <div className={fieldWidth}>
+      <Combobox
+        items={value && !items.some(item => item.value === value.value) ? [value, ...items] : items}
+        value={value}
+        onValueChange={setValue}
+        inputValue={inputValue}
+        onInputValueChange={setInputValue}
+        autoHighlight
+      >
+        <label className={nativeFieldLabelClassName}>
+          Owner
+          <ComboboxInputGroup className="mt-1">
+            <span aria-hidden className="ml-3 i-ri-search-line size-4 shrink-0 text-text-tertiary" />
+            <ComboboxInput placeholder="Search owners…" className="pl-2" />
+            <ComboboxClear />
+            <ComboboxInputTrigger />
+          </ComboboxInputGroup>
+        </label>
+        <ComboboxContent popupClassName="w-[420px]">
+          <ComboboxStatus className="border-b border-divider-subtle">
+            {loading ? 'Loading directory matches…' : `${items.length} selectable owners`}
+          </ComboboxStatus>
+          <ComboboxList>{renderOptionItem}</ComboboxList>
+          <ComboboxEmpty>No owner matches this query</ComboboxEmpty>
+        </ComboboxContent>
+      </Combobox>
+    </div>
+  )
+}
+
+const meta = {
+  title: 'Base/UI/Combobox',
+  component: Combobox,
+  parameters: {
+    layout: 'centered',
+    docs: {
+      description: {
+        component: 'Compound combobox built on Base UI Combobox for searchable predefined selections. Compose triggers, inputs, lists, groups, status, empty states, and chips without importing Base UI primitives directly.',
+      },
+    },
+  },
+  tags: ['autodocs'],
+} satisfies Meta<typeof Combobox>
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+export const SelectLikeDefault: Story = {
+  render: () => (
+    <div className={fieldWidth}>
+      <Combobox items={providerOptions} defaultValue={defaultProvider} autoHighlight>
+        <ComboboxLabel>Model provider</ComboboxLabel>
+        <ComboboxTrigger aria-label="Model provider">
+          <ComboboxValue placeholder="Select provider" />
+        </ComboboxTrigger>
+        <ComboboxContent popupClassName="p-1">
+          <PopupSearchInput label="Search model providers" placeholder="Search providers" />
+          <ComboboxList className="p-0">{renderOptionItem}</ComboboxList>
+        </ComboboxContent>
+      </Combobox>
+    </div>
+  ),
+}
+
+export const PopupInputSearchableSelect: Story = {
+  render: () => (
+    <div className={fieldWidth}>
+      <Combobox items={dataSourceOptions} defaultValue={defaultPopupDataSource} autoHighlight>
+        <ComboboxLabel>Data source</ComboboxLabel>
+        <ComboboxTrigger aria-label="Data source">
+          <ComboboxValue placeholder="Choose source" />
+        </ComboboxTrigger>
+        <ComboboxContent popupClassName="p-1">
+          <PopupSearchInput label="Search data sources" placeholder="Search sources" />
+          <ComboboxList className="p-0">{renderOptionItem}</ComboboxList>
+        </ComboboxContent>
+      </Combobox>
+    </div>
+  ),
+}
+
+export const AsyncSearchSingle: Story = {
+  render: () => <AsyncDirectoryDemo />,
+}
+
+export const InputGroupSearchable: Story = {
+  render: () => (
+    <div className={fieldWidth}>
+      <Combobox items={dataSourceOptions} defaultValue={defaultDataSource} autoHighlight>
+        <label className={nativeFieldLabelClassName}>
+          Connect source
+          <ComboboxInputGroup className="mt-1">
+            <span aria-hidden className="ml-3 i-ri-search-line size-4 shrink-0 text-text-tertiary" />
+            <ComboboxInput placeholder="Search data sources…" className="pl-2" />
+            <ComboboxClear />
+            <ComboboxInputTrigger />
+          </ComboboxInputGroup>
+        </label>
+        <ComboboxContent>
+          <ComboboxList>{renderOptionItem}</ComboboxList>
+        </ComboboxContent>
+      </Combobox>
+    </div>
+  ),
+}
+
+export const Sizes: Story = {
+  render: () => (
+    <div className="flex w-80 flex-col gap-3">
+      {(['small', 'medium', 'large'] as const).map(size => (
+        <Combobox key={size} items={sizeOptions} defaultValue={defaultProvider} autoHighlight>
+          <ComboboxTrigger aria-label={`${size} model provider`} size={size}>
+            <ComboboxValue />
+          </ComboboxTrigger>
+          <ComboboxContent popupClassName="p-1">
+            <PopupSearchInput label={`Search ${size} model providers`} placeholder="Search providers" />
+            <ComboboxList className="p-0">{renderOptionItem}</ComboboxList>
+          </ComboboxContent>
+        </Combobox>
+      ))}
+    </div>
+  ),
+}
+
+export const Grouped: Story = {
+  render: () => (
+    <div className={fieldWidth}>
+      <Combobox items={toolGroups} defaultValue={defaultTool} autoHighlight>
+        <ComboboxLabel>Workflow tool</ComboboxLabel>
+        <ComboboxTrigger aria-label="Workflow tool">
+          <ComboboxValue placeholder="Select tool" />
+        </ComboboxTrigger>
+        <ComboboxContent popupClassName="p-1">
+          <PopupSearchInput label="Search workflow tools" placeholder="Search workflow tools" />
+          <GroupedToolList />
+        </ComboboxContent>
+      </Combobox>
+    </div>
+  ),
+}
+
+const MultipleChipsDemo = () => {
+  const [value, setValue] = useState<Option[]>(defaultReviewers)
+
+  return (
+    <div className={wideFieldWidth}>
+      <Combobox items={reviewerOptions} multiple value={value} onValueChange={setValue} autoHighlight>
+        <label className={nativeFieldLabelClassName}>
+          Reviewers
+          <ComboboxInputGroup className="mt-1 h-auto min-h-8 flex-nowrap py-1">
+            <ComboboxValue>
+              {(selectedValue: Option[]) => (
+                <>
+                  <ComboboxChips className="flex-nowrap">
+                    {selectedValue.map(item => (
+                      <ComboboxChip key={item.value}>
+                        <span className="max-w-32 truncate">{item.label}</span>
+                        <ComboboxChipRemove aria-label={`Remove ${item.label}`} />
+                      </ComboboxChip>
+                    ))}
+                  </ComboboxChips>
+                  <ComboboxInput placeholder={selectedValue.length ? '' : 'Assign reviewers…'} className="min-w-16 px-2" />
+                </>
+              )}
+            </ComboboxValue>
+            <ComboboxClear />
+            <ComboboxInputTrigger />
+          </ComboboxInputGroup>
+        </label>
+        <ComboboxContent>
+          <ComboboxList>{renderOptionItem}</ComboboxList>
+        </ComboboxContent>
+      </Combobox>
+    </div>
+  )
+}
+
+export const MultipleChips: Story = {
+  render: () => <MultipleChipsDemo />,
+}
+
+export const VirtualizedLongList: Story = {
+  render: () => <VirtualizedLongListDemo />,
+}
+
+export const EmptyAndStatus: Story = {
+  render: () => (
+    <div className={fieldWidth}>
+      <Combobox items={emptyOptions} defaultInputValue="salesforce" autoHighlight>
+        <label className={nativeFieldLabelClassName}>
+          Connector
+          <ComboboxInputGroup className="mt-1">
+            <span aria-hidden className="ml-3 i-ri-search-line size-4 shrink-0 text-text-tertiary" />
+            <ComboboxInput placeholder="Search connectors…" className="pl-2" />
+            <ComboboxClear />
+            <ComboboxInputTrigger />
+          </ComboboxInputGroup>
+        </label>
+        <ComboboxContent>
+          <ComboboxStatus>Search workspace connectors</ComboboxStatus>
+          <ComboboxEmpty>No connectors found</ComboboxEmpty>
+          <ComboboxList>{renderSimpleOptionItem}</ComboboxList>
+        </ComboboxContent>
+      </Combobox>
+    </div>
+  ),
+}
+
+export const DisabledAndReadOnly: Story = {
+  render: () => (
+    <div className="flex w-80 flex-col gap-3">
+      <Combobox items={providerOptions} defaultValue={disabledProvider} disabled>
+        <ComboboxLabel>Disabled provider</ComboboxLabel>
+        <ComboboxTrigger aria-label="Disabled model provider">
+          <ComboboxValue />
+        </ComboboxTrigger>
+        <ComboboxContent popupClassName="p-1">
+          <PopupSearchInput label="Search disabled providers" placeholder="Search providers" />
+          <ComboboxList className="p-0">{renderOptionItem}</ComboboxList>
+        </ComboboxContent>
+      </Combobox>
+      <Combobox items={dataSourceOptions} defaultValue={readOnlyDataSource} readOnly>
+        <label className={nativeFieldLabelClassName}>
+          Read-only source
+          <ComboboxInputGroup className="mt-1">
+            <ComboboxInput placeholder="Read-only data source…" />
+            <ComboboxClear />
+            <ComboboxInputTrigger />
+          </ComboboxInputGroup>
+        </label>
+        <ComboboxContent>
+          <ComboboxList>{renderOptionItem}</ComboboxList>
+        </ComboboxContent>
+      </Combobox>
+    </div>
+  ),
+}
+
+const ControlledDemo = () => {
+  const [value, setValue] = useState<Option | null>(defaultTag)
+
+  return (
+    <div className="flex w-80 flex-col items-start gap-3">
+      <Combobox items={tagOptions} value={value} onValueChange={setValue}>
+        <ComboboxLabel>Default app tag</ComboboxLabel>
+        <ComboboxTrigger aria-label="Default app tag">
+          <ComboboxValue placeholder="Select tag" />
+        </ComboboxTrigger>
+        <ComboboxContent popupClassName="p-1">
+          <PopupSearchInput label="Search app tags" placeholder="Search tags" />
+          <ComboboxList className="p-0">{renderSimpleOptionItem}</ComboboxList>
+        </ComboboxContent>
+      </Combobox>
+      <span className="rounded-md border border-divider-subtle bg-components-panel-bg px-2 py-1 text-text-tertiary system-xs-regular">
+        Selected:
+        {' '}
+        {value?.label ?? 'None'}
+      </span>
+    </div>
+  )
+}
+
+export const Controlled: Story = {
+  render: () => <ControlledDemo />,
+}
diff --git a/packages/dify-ui/src/combobox/index.tsx b/packages/dify-ui/src/combobox/index.tsx
new file mode 100644
index 0000000000..eb43b911c7
--- /dev/null
+++ b/packages/dify-ui/src/combobox/index.tsx
@@ -0,0 +1,497 @@
+'use client'
+
+import type { VariantProps } from 'class-variance-authority'
+import type { HTMLAttributes, ReactNode } from 'react'
+import type { Placement } from '../placement'
+import { Combobox as BaseCombobox } from '@base-ui/react/combobox'
+import { cva } from 'class-variance-authority'
+import { cn } from '../cn'
+import {
+  overlayIndicatorClassName,
+  overlayLabelClassName,
+  overlayPopupAnimationClassName,
+  overlaySeparatorClassName,
+} from '../overlay-shared'
+import { parsePlacement } from '../placement'
+
+export type { Placement }
+
+export const Combobox = BaseCombobox.Root
+export const ComboboxValue = BaseCombobox.Value
+export const ComboboxGroup = BaseCombobox.Group
+export const ComboboxCollection = BaseCombobox.Collection
+export const ComboboxRow = BaseCombobox.Row
+export const useComboboxFilter = BaseCombobox.useFilter
+export const useComboboxFilteredItems = BaseCombobox.useFilteredItems
+
+export type ComboboxRootProps<Value, Multiple extends boolean | undefined = false>
+  = BaseCombobox.Root.Props<Value, Multiple>
+export type ComboboxRootChangeEventDetails = BaseCombobox.Root.ChangeEventDetails
+export type ComboboxRootHighlightEventDetails = BaseCombobox.Root.HighlightEventDetails
+
+const comboboxPopupClassName = [
+  'w-(--anchor-width) max-w-[min(28rem,var(--available-width))] overflow-hidden rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-lg outline-hidden',
+  'data-side-top:origin-bottom data-side-bottom:origin-top data-side-left:origin-right data-side-right:origin-left',
+]
+
+const comboboxListClassName = [
+  'max-h-[min(20rem,var(--available-height))] overflow-y-auto overflow-x-hidden overscroll-contain p-1 outline-hidden scroll-py-1',
+  'data-empty:max-h-none data-empty:p-0',
+]
+
+const comboboxItemClassName = [
+  'mx-1 grid min-h-8 cursor-pointer select-none grid-cols-[1fr_auto] items-center gap-2 rounded-lg px-2 py-1.5 text-text-secondary outline-hidden transition-colors',
+  'hover:bg-state-base-hover-alt hover:text-text-primary',
+  'data-highlighted:bg-state-base-hover data-highlighted:text-text-primary',
+  'data-selected:text-text-primary',
+  'data-disabled:cursor-not-allowed data-disabled:opacity-30 data-disabled:hover:bg-transparent data-disabled:hover:text-text-secondary',
+  'motion-reduce:transition-none',
+]
+
+const comboboxTriggerVariants = cva(
+  [
+    'group/combobox-trigger flex w-full min-w-0 items-center border-0 bg-components-input-bg-normal text-left text-components-input-text-filled outline-hidden transition-colors',
+    'hover:bg-state-base-hover-alt focus-visible:bg-state-base-hover-alt data-open:bg-state-base-hover-alt',
+    'focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:ring-inset',
+    'data-placeholder:text-components-input-text-placeholder',
+    'data-readonly:cursor-default data-readonly:bg-transparent data-readonly:hover:bg-transparent',
+    'data-disabled:cursor-not-allowed data-disabled:bg-components-input-bg-disabled data-disabled:text-components-input-text-filled-disabled data-disabled:hover:bg-components-input-bg-disabled',
+    'data-disabled:data-placeholder:text-components-input-text-disabled',
+    'motion-reduce:transition-none',
+  ],
+  {
+    variants: {
+      size: {
+        small: 'h-6 gap-px rounded-md px-2 py-1 system-xs-regular',
+        medium: 'h-8 gap-0.5 rounded-lg px-3 py-2 system-sm-regular',
+        large: 'h-9 gap-0.5 rounded-[10px] px-4 py-2 system-md-regular',
+      },
+    },
+    defaultVariants: {
+      size: 'medium',
+    },
+  },
+)
+
+export type ComboboxSize = NonNullable<VariantProps<typeof comboboxTriggerVariants>['size']>
+
+type ComboboxTriggerProps
+  = Omit<BaseCombobox.Trigger.Props, 'className'>
+    & VariantProps<typeof comboboxTriggerVariants>
+    & {
+      className?: string
+      icon?: ReactNode | false
+    }
+
+export function ComboboxTrigger({
+  className,
+  children,
+  icon,
+  size,
+  type = 'button',
+  ...props
+}: ComboboxTriggerProps) {
+  return (
+    <BaseCombobox.Trigger
+      type={type}
+      className={cn(comboboxTriggerVariants({ size, className }))}
+      {...props}
+    >
+      <span className="min-w-0 grow truncate">
+        {children}
+      </span>
+      {icon !== false && (
+        <BaseCombobox.Icon className="shrink-0 text-text-quaternary transition-colors group-hover/combobox-trigger:text-text-secondary group-data-open/combobox-trigger:text-text-secondary group-data-readonly/combobox-trigger:hidden">
+          {icon ?? <span className="i-ri-arrow-down-s-line h-4 w-4" aria-hidden="true" />}
+        </BaseCombobox.Icon>
+      )}
+    </BaseCombobox.Trigger>
+  )
+}
+
+const comboboxInputGroupVariants = cva(
+  [
+    'group/combobox flex w-full min-w-0 items-center border border-transparent bg-components-input-bg-normal text-components-input-text-filled shadow-none outline-hidden transition-[background-color,border-color,box-shadow]',
+    'hover:border-components-input-border-hover hover:bg-components-input-bg-hover',
+    'focus-within:border-components-input-border-active focus-within:bg-components-input-bg-active focus-within:shadow-xs',
+    'data-focused:border-components-input-border-active data-focused:bg-components-input-bg-active data-focused:shadow-xs',
+    'data-open:border-components-input-border-active data-open:bg-components-input-bg-active',
+    'data-disabled:cursor-not-allowed data-disabled:border-transparent data-disabled:bg-components-input-bg-disabled data-disabled:text-components-input-text-filled-disabled',
+    'data-disabled:hover:border-transparent data-disabled:hover:bg-components-input-bg-disabled',
+    'data-readonly:shadow-none data-readonly:hover:border-transparent data-readonly:hover:bg-components-input-bg-normal',
+    'motion-reduce:transition-none',
+  ],
+  {
+    variants: {
+      size: {
+        small: 'min-h-6 rounded-md',
+        medium: 'min-h-8 rounded-lg',
+        large: 'min-h-9 rounded-[10px]',
+      },
+    },
+    defaultVariants: {
+      size: 'medium',
+    },
+  },
+)
+
+export type ComboboxInputGroupProps
+  = BaseCombobox.InputGroup.Props
+    & VariantProps<typeof comboboxInputGroupVariants>
+
+export function ComboboxInputGroup({
+  className,
+  size = 'medium',
+  ...props
+}: ComboboxInputGroupProps) {
+  return (
+    <BaseCombobox.InputGroup
+      className={cn(comboboxInputGroupVariants({ size }), className)}
+      {...props}
+    />
+  )
+}
+
+const comboboxInputVariants = cva(
+  [
+    'w-0 min-w-0 flex-1 appearance-none border-0 bg-transparent text-components-input-text-filled caret-primary-600 outline-hidden',
+    'placeholder:text-components-input-text-placeholder',
+    'disabled:cursor-not-allowed disabled:text-components-input-text-filled-disabled disabled:placeholder:text-components-input-text-disabled',
+    'data-readonly:cursor-default',
+  ],
+  {
+    variants: {
+      size: {
+        small: 'px-2 py-1 system-xs-regular',
+        medium: 'px-3 py-[7px] system-sm-regular',
+        large: 'px-4 py-2 system-md-regular',
+      },
+    },
+    defaultVariants: {
+      size: 'medium',
+    },
+  },
+)
+
+export type ComboboxInputProps
+  = Omit<BaseCombobox.Input.Props, 'size'>
+    & VariantProps<typeof comboboxInputVariants>
+
+export function ComboboxInput({
+  className,
+  size = 'medium',
+  type = 'text',
+  autoComplete = 'off',
+  ...props
+}: ComboboxInputProps) {
+  return (
+    <BaseCombobox.Input
+      type={type}
+      autoComplete={autoComplete}
+      className={cn(comboboxInputVariants({ size }), className)}
+      {...props}
+    />
+  )
+}
+
+const comboboxControlVariants = cva(
+  [
+    'flex shrink-0 touch-manipulation items-center justify-center rounded-md text-text-tertiary outline-hidden transition-colors',
+    'hover:bg-components-input-bg-hover hover:text-text-secondary focus-visible:bg-components-input-bg-hover focus-visible:text-text-secondary',
+    'focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:ring-inset',
+    'disabled:cursor-not-allowed disabled:hover:bg-transparent disabled:hover:text-text-tertiary disabled:focus-visible:bg-transparent disabled:focus-visible:ring-0',
+    'group-data-disabled/combobox:cursor-not-allowed group-data-disabled/combobox:hover:bg-transparent group-data-disabled/combobox:focus-visible:bg-transparent group-data-disabled/combobox:focus-visible:ring-0',
+    'group-data-readonly/combobox:hidden',
+    'motion-reduce:transition-none',
+  ],
+  {
+    variants: {
+      size: {
+        small: 'mr-1 size-4',
+        medium: 'mr-1.5 size-5',
+        large: 'mr-2 size-5',
+      },
+    },
+    defaultVariants: {
+      size: 'medium',
+    },
+  },
+)
+
+export type ComboboxClearProps
+  = Omit<BaseCombobox.Clear.Props, 'className'>
+    & VariantProps<typeof comboboxControlVariants>
+    & { className?: string }
+
+export function ComboboxClear({
+  className,
+  children,
+  size = 'medium',
+  type = 'button',
+  ...props
+}: ComboboxClearProps) {
+  return (
+    <BaseCombobox.Clear
+      type={type}
+      aria-label={props['aria-label'] ?? (props['aria-labelledby'] ? undefined : 'Clear combobox')}
+      className={cn(
+        comboboxControlVariants({ size }),
+        'data-ending-style:opacity-0 data-starting-style:opacity-0',
+        className,
+      )}
+      {...props}
+    >
+      {children ?? <span className="i-ri-close-line size-4" aria-hidden="true" />}
+    </BaseCombobox.Clear>
+  )
+}
+
+export type ComboboxInputTriggerProps
+  = Omit<BaseCombobox.Trigger.Props, 'className'>
+    & VariantProps<typeof comboboxControlVariants>
+    & { className?: string }
+
+export function ComboboxInputTrigger({
+  className,
+  children,
+  size = 'medium',
+  type = 'button',
+  ...props
+}: ComboboxInputTriggerProps) {
+  return (
+    <BaseCombobox.Trigger
+      type={type}
+      aria-label={props['aria-label'] ?? (props['aria-labelledby'] ? undefined : 'Open combobox options')}
+      className={cn(comboboxControlVariants({ size }), className)}
+      {...props}
+    >
+      {children ?? <span className="i-ri-arrow-down-s-line size-4" aria-hidden="true" />}
+    </BaseCombobox.Trigger>
+  )
+}
+
+export function ComboboxIcon({
+  className,
+  children,
+  ...props
+}: BaseCombobox.Icon.Props) {
+  return (
+    <BaseCombobox.Icon
+      className={cn('flex shrink-0 items-center text-text-tertiary', className)}
+      {...props}
+    >
+      {children ?? <span className="i-ri-arrow-down-s-line size-4" aria-hidden="true" />}
+    </BaseCombobox.Icon>
+  )
+}
+
+type ComboboxContentProps = {
+  children: ReactNode
+  placement?: Placement
+  sideOffset?: number
+  alignOffset?: number
+  className?: string
+  popupClassName?: string
+  portalProps?: Omit<BaseCombobox.Portal.Props, 'children'>
+  positionerProps?: Omit<
+    BaseCombobox.Positioner.Props,
+    'children' | 'className' | 'side' | 'align' | 'sideOffset' | 'alignOffset'
+  >
+  popupProps?: Omit<
+    BaseCombobox.Popup.Props,
+    'children' | 'className'
+  >
+}
+
+export function ComboboxContent({
+  children,
+  placement = 'bottom-start',
+  sideOffset = 4,
+  alignOffset = 0,
+  className,
+  popupClassName,
+  portalProps,
+  positionerProps,
+  popupProps,
+}: ComboboxContentProps) {
+  const { side, align } = parsePlacement(placement)
+
+  return (
+    <BaseCombobox.Portal {...portalProps}>
+      <BaseCombobox.Positioner
+        side={side}
+        align={align}
+        sideOffset={sideOffset}
+        alignOffset={alignOffset}
+        className={cn('z-50 outline-hidden', className)}
+        {...positionerProps}
+      >
+        <BaseCombobox.Popup
+          className={cn(
+            comboboxPopupClassName,
+            overlayPopupAnimationClassName,
+            popupClassName,
+          )}
+          {...popupProps}
+        >
+          {children}
+        </BaseCombobox.Popup>
+      </BaseCombobox.Positioner>
+    </BaseCombobox.Portal>
+  )
+}
+
+export function ComboboxList({
+  className,
+  ...props
+}: BaseCombobox.List.Props) {
+  return (
+    <BaseCombobox.List
+      className={cn(comboboxListClassName, className)}
+      {...props}
+    />
+  )
+}
+
+export function ComboboxItem({
+  className,
+  ...props
+}: BaseCombobox.Item.Props) {
+  return (
+    <BaseCombobox.Item
+      className={cn(comboboxItemClassName, className)}
+      {...props}
+    />
+  )
+}
+
+export type ComboboxItemTextProps = HTMLAttributes<HTMLSpanElement>
+
+export function ComboboxItemText({
+  className,
+  ...props
+}: ComboboxItemTextProps) {
+  return (
+    <span
+      className={cn('min-w-0 grow truncate px-1 system-sm-medium', className)}
+      {...props}
+    />
+  )
+}
+
+export function ComboboxItemIndicator({
+  className,
+  children,
+  ...props
+}: Omit<BaseCombobox.ItemIndicator.Props, 'children'> & { children?: ReactNode }) {
+  return (
+    <BaseCombobox.ItemIndicator
+      className={cn(overlayIndicatorClassName, className)}
+      {...props}
+    >
+      {children ?? <span className="i-ri-check-line h-4 w-4" aria-hidden="true" />}
+    </BaseCombobox.ItemIndicator>
+  )
+}
+
+export function ComboboxLabel({
+  className,
+  ...props
+}: BaseCombobox.Label.Props) {
+  return (
+    <BaseCombobox.Label
+      className={cn('mb-1 block text-text-secondary system-sm-medium', className)}
+      {...props}
+    />
+  )
+}
+
+export function ComboboxGroupLabel({
+  className,
+  ...props
+}: BaseCombobox.GroupLabel.Props) {
+  return (
+    <BaseCombobox.GroupLabel
+      className={cn(overlayLabelClassName, className)}
+      {...props}
+    />
+  )
+}
+
+export function ComboboxSeparator({
+  className,
+  ...props
+}: BaseCombobox.Separator.Props) {
+  return (
+    <BaseCombobox.Separator
+      className={cn(overlaySeparatorClassName, className)}
+      {...props}
+    />
+  )
+}
+
+export function ComboboxEmpty({
+  className,
+  ...props
+}: BaseCombobox.Empty.Props) {
+  return (
+    <BaseCombobox.Empty
+      className={cn('px-3 py-2 system-sm-regular text-text-tertiary', className)}
+      {...props}
+    />
+  )
+}
+
+export function ComboboxStatus({
+  className,
+  ...props
+}: BaseCombobox.Status.Props) {
+  return (
+    <BaseCombobox.Status
+      className={cn('px-3 py-2 system-sm-regular text-text-tertiary', className)}
+      {...props}
+    />
+  )
+}
+
+export function ComboboxChips({
+  className,
+  ...props
+}: BaseCombobox.Chips.Props) {
+  return (
+    <BaseCombobox.Chips
+      className={cn('flex w-full min-w-0 flex-wrap items-center gap-1 px-1', className)}
+      {...props}
+    />
+  )
+}
+
+export function ComboboxChip({
+  className,
+  ...props
+}: BaseCombobox.Chip.Props) {
+  return (
+    <BaseCombobox.Chip
+      className={cn('inline-flex max-w-full min-w-0 items-center gap-1 rounded-md bg-state-base-hover px-1.5 py-0.5 text-text-secondary system-xs-medium', className)}
+      {...props}
+    />
+  )
+}
+
+export function ComboboxChipRemove({
+  className,
+  children,
+  type = 'button',
+  ...props
+}: BaseCombobox.ChipRemove.Props) {
+  return (
+    <BaseCombobox.ChipRemove
+      type={type}
+      aria-label={props['aria-label'] ?? (props['aria-labelledby'] ? undefined : 'Remove selected item')}
+      className={cn('flex size-3.5 shrink-0 items-center justify-center rounded-sm text-text-tertiary outline-hidden hover:bg-state-base-hover-alt hover:text-text-secondary focus-visible:ring-1 focus-visible:ring-components-input-border-active', className)}
+      {...props}
+    >
+      {children ?? <span className="i-ri-close-line size-3" aria-hidden="true" />}
+    </BaseCombobox.ChipRemove>
+  )
+}
diff --git a/packages/dify-ui/src/context-menu/index.tsx b/packages/dify-ui/src/context-menu/index.tsx
index 10b9f2c206..e33a94f03f 100644
--- a/packages/dify-ui/src/context-menu/index.tsx
+++ b/packages/dify-ui/src/context-menu/index.tsx
@@ -76,7 +76,7 @@ function renderContextMenuPopup({
         align={align}
         sideOffset={sideOffset}
         alignOffset={alignOffset}
-        className={cn('z-1002 outline-hidden', className)}
+        className={cn('z-50 outline-hidden', className)}
         {...positionerProps}
       >
         <BaseContextMenu.Popup
diff --git a/packages/dify-ui/src/dialog/index.tsx b/packages/dify-ui/src/dialog/index.tsx
index 24c5bcc463..f29517717a 100644
--- a/packages/dify-ui/src/dialog/index.tsx
+++ b/packages/dify-ui/src/dialog/index.tsx
@@ -1,8 +1,8 @@
 'use client'
 
 //   z-index strategy (relies on root `isolation: isolate` in layout.tsx):
-//   All @langgenius/dify-ui/* overlay primitives — z-1002
-//   Toast stays one layer above overlays at z-1003.
+//   All @langgenius/dify-ui/* overlay primitives — z-50
+//   Toast stays one layer above overlays at z-60.
 //   Overlays share the same z-index; DOM order handles stacking when multiple are open.
 //   This ensures overlays inside a Dialog (e.g. a Tooltip on a dialog button) render
 //   above the dialog backdrop instead of being clipped by it.
@@ -56,14 +56,14 @@ export function DialogContent({
       <BaseDialog.Backdrop
         {...backdropProps}
         className={cn(
-          'fixed inset-0 z-1002 bg-background-overlay',
+          'fixed inset-0 z-50 bg-background-overlay',
           'transition-opacity duration-150 data-ending-style:opacity-0 data-starting-style:opacity-0 motion-reduce:transition-none',
           backdropClassName,
         )}
       />
       <BaseDialog.Popup
         className={cn(
-          'fixed top-1/2 left-1/2 z-1002 max-h-[80dvh] w-[480px] max-w-[calc(100vw-2rem)] -translate-x-1/2 -translate-y-1/2 overflow-y-auto overscroll-contain rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg p-6 shadow-xl',
+          'fixed top-1/2 left-1/2 z-50 max-h-[80dvh] w-120 max-w-[calc(100vw-2rem)] -translate-x-1/2 -translate-y-1/2 overflow-y-auto overscroll-contain rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg p-6 shadow-xl',
           'transition-[transform,scale,opacity] duration-150 data-ending-style:scale-95 data-ending-style:opacity-0 data-starting-style:scale-95 data-starting-style:opacity-0 motion-reduce:transition-none',
           className,
         )}
diff --git a/packages/dify-ui/src/drawer/__tests__/index.spec.tsx b/packages/dify-ui/src/drawer/__tests__/index.spec.tsx
new file mode 100644
index 0000000000..a0ca1cdf99
--- /dev/null
+++ b/packages/dify-ui/src/drawer/__tests__/index.spec.tsx
@@ -0,0 +1,61 @@
+import { render } from 'vitest-browser-react'
+import {
+  Drawer,
+  DrawerBackdrop,
+  DrawerCloseButton,
+  DrawerContent,
+  DrawerDescription,
+  DrawerPopup,
+  DrawerPortal,
+  DrawerTitle,
+  DrawerTrigger,
+  DrawerViewport,
+} from '../index'
+
+const asHTMLElement = (element: HTMLElement | SVGElement) => element as HTMLElement
+
+describe('Drawer wrapper', () => {
+  describe('User Interactions', () => {
+    it('should open a portalled drawer and close it with the default close button', async () => {
+      const screen = await render(
+        <Drawer>
+          <DrawerTrigger>Open settings</DrawerTrigger>
+          <DrawerPortal>
+            <DrawerBackdrop data-testid="drawer-backdrop" />
+            <DrawerViewport>
+              <DrawerPopup>
+                <DrawerTitle>Settings</DrawerTitle>
+                <DrawerDescription>Configure the current workspace.</DrawerDescription>
+                <DrawerContent>
+                  <p>Workspace controls</p>
+                  <DrawerCloseButton />
+                </DrawerContent>
+              </DrawerPopup>
+            </DrawerViewport>
+          </DrawerPortal>
+        </Drawer>,
+      )
+
+      expect(document.body.querySelector('[role="dialog"]')).not.toBeInTheDocument()
+
+      asHTMLElement(screen.getByRole('button', { name: 'Open settings' }).element()).click()
+
+      await vi.waitFor(() => {
+        expect(document.body.querySelector('[role="dialog"]')).toBeInTheDocument()
+      })
+
+      const dialog = asHTMLElement(document.body.querySelector('[role="dialog"]')!)
+      expect(document.body).toContainElement(dialog)
+      expect(screen.container).not.toContainElement(dialog)
+      await expect.element(dialog).toHaveTextContent('Workspace controls')
+      await expect.element(screen.getByText('Configure the current workspace.')).toBeInTheDocument()
+      await expect.element(screen.getByTestId('drawer-backdrop')).toHaveClass('z-50')
+
+      asHTMLElement(screen.getByRole('button', { name: 'Close drawer' }).element()).click()
+
+      await vi.waitFor(() => {
+        expect(document.body.querySelector('[role="dialog"]')).not.toBeInTheDocument()
+      })
+    })
+  })
+})
diff --git a/packages/dify-ui/src/drawer/index.tsx b/packages/dify-ui/src/drawer/index.tsx
new file mode 100644
index 0000000000..a2ad6dcdaf
--- /dev/null
+++ b/packages/dify-ui/src/drawer/index.tsx
@@ -0,0 +1,116 @@
+'use client'
+
+import type { ReactNode } from 'react'
+import { Drawer as BaseDrawer } from '@base-ui/react/drawer'
+import { cn } from '../cn'
+
+export const Drawer = BaseDrawer.Root
+export const DrawerProvider = BaseDrawer.Provider
+export const DrawerIndent = BaseDrawer.Indent
+export const DrawerIndentBackground = BaseDrawer.IndentBackground
+export const DrawerTrigger = BaseDrawer.Trigger
+export const DrawerSwipeArea = BaseDrawer.SwipeArea
+export const DrawerPortal = BaseDrawer.Portal
+export const DrawerTitle = BaseDrawer.Title
+export const DrawerDescription = BaseDrawer.Description
+export const DrawerClose = BaseDrawer.Close
+export const createDrawerHandle = BaseDrawer.createHandle
+
+export type DrawerRootProps<Payload = unknown> = BaseDrawer.Root.Props<Payload>
+export type DrawerRootActions = BaseDrawer.Root.Actions
+export type DrawerRootChangeEventDetails = BaseDrawer.Root.ChangeEventDetails
+export type DrawerRootChangeEventReason = BaseDrawer.Root.ChangeEventReason
+export type DrawerRootSnapPoint = BaseDrawer.Root.SnapPoint
+export type DrawerRootSnapPointChangeEventDetails = BaseDrawer.Root.SnapPointChangeEventDetails
+export type DrawerRootSnapPointChangeEventReason = BaseDrawer.Root.SnapPointChangeEventReason
+export type DrawerTriggerProps<Payload = unknown> = BaseDrawer.Trigger.Props<Payload>
+
+export function DrawerBackdrop({
+  className,
+  ...props
+}: BaseDrawer.Backdrop.Props) {
+  return (
+    <BaseDrawer.Backdrop
+      className={cn(
+        'fixed inset-0 z-50 bg-background-overlay opacity-[calc(1-var(--drawer-swipe-progress,0))]',
+        'transition-opacity duration-200 data-ending-style:opacity-0 data-starting-style:opacity-0 data-swiping:duration-0 motion-reduce:transition-none',
+        className,
+      )}
+      {...props}
+    />
+  )
+}
+
+export function DrawerViewport({
+  className,
+  ...props
+}: BaseDrawer.Viewport.Props) {
+  return (
+    <BaseDrawer.Viewport
+      className={cn('fixed inset-0 z-50 touch-none overflow-hidden overscroll-contain outline-hidden', className)}
+      {...props}
+    />
+  )
+}
+
+export function DrawerPopup({
+  className,
+  ...props
+}: BaseDrawer.Popup.Props) {
+  return (
+    <BaseDrawer.Popup
+      className={cn(
+        'fixed z-50 flex min-h-0 flex-col overflow-hidden border-[0.5px] border-components-panel-border bg-components-panel-bg text-text-primary shadow-xl outline-hidden touch-none',
+        'transition-[transform,opacity,box-shadow] duration-200 data-swiping:select-none data-swiping:duration-0 motion-reduce:transition-none',
+        'data-[swipe-direction=right]:inset-y-0 data-[swipe-direction=right]:right-0 data-[swipe-direction=right]:h-dvh data-[swipe-direction=right]:w-120 data-[swipe-direction=right]:max-w-[calc(100vw-2rem)] data-[swipe-direction=right]:rounded-l-2xl data-[swipe-direction=right]:border-r-0 data-[swipe-direction=right]:transform-[translateX(var(--drawer-swipe-movement-x,0px))]',
+        'data-starting-style:data-[swipe-direction=right]:transform-[translateX(calc(100%+2px))] data-ending-style:data-[swipe-direction=right]:transform-[translateX(calc(100%+2px))]',
+        'data-[swipe-direction=left]:inset-y-0 data-[swipe-direction=left]:left-0 data-[swipe-direction=left]:h-dvh data-[swipe-direction=left]:w-120 data-[swipe-direction=left]:max-w-[calc(100vw-2rem)] data-[swipe-direction=left]:rounded-r-2xl data-[swipe-direction=left]:border-l-0 data-[swipe-direction=left]:transform-[translateX(var(--drawer-swipe-movement-x,0px))]',
+        'data-starting-style:data-[swipe-direction=left]:transform-[translateX(calc(-100%-2px))] data-ending-style:data-[swipe-direction=left]:transform-[translateX(calc(-100%-2px))]',
+        'data-[swipe-direction=down]:inset-x-0 data-[swipe-direction=down]:bottom-0 data-[swipe-direction=down]:max-h-[calc(100dvh-2rem)] data-[swipe-direction=down]:w-full data-[swipe-direction=down]:rounded-t-2xl data-[swipe-direction=down]:border-b-0 data-[swipe-direction=down]:transform-[translateY(calc(var(--drawer-snap-point-offset,0px)+var(--drawer-swipe-movement-y,0px)))]',
+        'data-starting-style:data-[swipe-direction=down]:transform-[translateY(calc(100%+2px))] data-ending-style:data-[swipe-direction=down]:transform-[translateY(calc(100%+2px))]',
+        'data-[swipe-direction=up]:inset-x-0 data-[swipe-direction=up]:top-0 data-[swipe-direction=up]:max-h-[calc(100dvh-2rem)] data-[swipe-direction=up]:w-full data-[swipe-direction=up]:rounded-b-2xl data-[swipe-direction=up]:border-t-0 data-[swipe-direction=up]:transform-[translateY(var(--drawer-swipe-movement-y,0px))]',
+        'data-starting-style:data-[swipe-direction=up]:transform-[translateY(calc(-100%-2px))] data-ending-style:data-[swipe-direction=up]:transform-[translateY(calc(-100%-2px))]',
+        className,
+      )}
+      {...props}
+    />
+  )
+}
+
+export function DrawerContent({
+  className,
+  ...props
+}: BaseDrawer.Content.Props) {
+  return (
+    <BaseDrawer.Content
+      className={cn('min-h-0 flex-1 overflow-y-auto overscroll-contain p-6 pb-[calc(1.5rem+env(safe-area-inset-bottom,0))]', className)}
+      {...props}
+    />
+  )
+}
+
+type DrawerCloseButtonProps = Omit<BaseDrawer.Close.Props, 'children'> & {
+  children?: ReactNode
+}
+
+export function DrawerCloseButton({
+  className,
+  children,
+  type = 'button',
+  'aria-label': ariaLabel = 'Close drawer',
+  ...props
+}: DrawerCloseButtonProps) {
+  return (
+    <BaseDrawer.Close
+      type={type}
+      aria-label={ariaLabel}
+      className={cn(
+        'flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg text-text-tertiary outline-hidden hover:bg-state-base-hover hover:text-text-secondary focus-visible:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-hover disabled:cursor-not-allowed disabled:opacity-50',
+        className,
+      )}
+      {...props}
+    >
+      {children ?? <span aria-hidden="true" className="i-ri-close-line h-4 w-4" />}
+    </BaseDrawer.Close>
+  )
+}
diff --git a/packages/dify-ui/src/dropdown-menu/index.tsx b/packages/dify-ui/src/dropdown-menu/index.tsx
index f742625964..509d4c9d35 100644
--- a/packages/dify-ui/src/dropdown-menu/index.tsx
+++ b/packages/dify-ui/src/dropdown-menu/index.tsx
@@ -134,7 +134,7 @@ function renderDropdownMenuPopup({
         align={align}
         sideOffset={sideOffset}
         alignOffset={alignOffset}
-        className={cn('z-1002 outline-hidden', className)}
+        className={cn('z-50 outline-hidden', className)}
         {...positionerProps}
       >
         <Menu.Popup
diff --git a/packages/dify-ui/src/overlay-shared.ts b/packages/dify-ui/src/overlay-shared.ts
index cdff8253a1..d6d3a05b9d 100644
--- a/packages/dify-ui/src/overlay-shared.ts
+++ b/packages/dify-ui/src/overlay-shared.ts
@@ -7,4 +7,4 @@ export const overlayLabelClassName = 'px-3 pb-0.5 pt-1 text-text-tertiary system
 export const overlaySeparatorClassName = 'my-1 h-px bg-divider-subtle'
 export const overlayPopupBaseClassName = 'max-h-(--available-height) overflow-y-auto overflow-x-hidden rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur py-1 text-sm text-text-secondary shadow-lg outline-hidden focus:outline-hidden focus-visible:outline-hidden backdrop-blur-[5px]'
 export const overlayPopupAnimationClassName = 'origin-(--transform-origin) transition-[transform,scale,opacity] data-ending-style:scale-95 data-starting-style:scale-95 data-ending-style:opacity-0 data-starting-style:opacity-0 motion-reduce:transition-none'
-export const overlayBackdropClassName = 'fixed inset-0 z-1002 bg-transparent transition-opacity duration-150 data-ending-style:opacity-0 data-starting-style:opacity-0 motion-reduce:transition-none'
+export const overlayBackdropClassName = 'fixed inset-0 z-50 bg-transparent transition-opacity duration-150 data-ending-style:opacity-0 data-starting-style:opacity-0 motion-reduce:transition-none'
diff --git a/packages/dify-ui/src/placement.ts b/packages/dify-ui/src/placement.ts
index 95f233fd56..bf5534c92d 100644
--- a/packages/dify-ui/src/placement.ts
+++ b/packages/dify-ui/src/placement.ts
@@ -19,11 +19,21 @@ export type Placement
     | 'left-start'
     | 'left-end'
 
-export function parsePlacement(placement: Placement): { side: Side, align: Align } {
-  const [side, align] = placement.split('-') as [Side, Align | undefined]
+const PLACEMENT_PARTS = {
+  'top': { side: 'top', align: 'center' },
+  'top-start': { side: 'top', align: 'start' },
+  'top-end': { side: 'top', align: 'end' },
+  'right': { side: 'right', align: 'center' },
+  'right-start': { side: 'right', align: 'start' },
+  'right-end': { side: 'right', align: 'end' },
+  'bottom': { side: 'bottom', align: 'center' },
+  'bottom-start': { side: 'bottom', align: 'start' },
+  'bottom-end': { side: 'bottom', align: 'end' },
+  'left': { side: 'left', align: 'center' },
+  'left-start': { side: 'left', align: 'start' },
+  'left-end': { side: 'left', align: 'end' },
+} satisfies Record<Placement, { side: Side, align: Align }>
 
-  return {
-    side,
-    align: align ?? 'center',
-  }
+export function parsePlacement(placement: Placement): { side: Side, align: Align } {
+  return PLACEMENT_PARTS[placement]
 }
diff --git a/packages/dify-ui/src/plugins/icons.ts b/packages/dify-ui/src/plugins/icons.ts
new file mode 100644
index 0000000000..e2d678c78f
--- /dev/null
+++ b/packages/dify-ui/src/plugins/icons.ts
@@ -0,0 +1,10 @@
+import { getIconCollections, iconsPlugin } from '@egoist/tailwindcss-icons'
+
+export default iconsPlugin({
+  collections: getIconCollections(['ri']),
+  extraProperties: {
+    width: '1rem',
+    height: '1rem',
+    display: 'block',
+  },
+})
diff --git a/packages/dify-ui/src/popover/index.tsx b/packages/dify-ui/src/popover/index.tsx
index f6fcd5ed43..c29c50d1fe 100644
--- a/packages/dify-ui/src/popover/index.tsx
+++ b/packages/dify-ui/src/popover/index.tsx
@@ -13,6 +13,7 @@ export const PopoverTrigger = BasePopover.Trigger
 export const PopoverClose = BasePopover.Close
 export const PopoverTitle = BasePopover.Title
 export const PopoverDescription = BasePopover.Description
+export const createPopoverHandle = BasePopover.createHandle
 
 type PopoverContentProps = {
   children: ReactNode
@@ -50,7 +51,7 @@ export function PopoverContent({
         align={align}
         sideOffset={sideOffset}
         alignOffset={alignOffset}
-        className={cn('z-1002 outline-hidden', className)}
+        className={cn('z-50 outline-hidden', className)}
         {...positionerProps}
       >
         <BasePopover.Popup
diff --git a/packages/dify-ui/src/preview-card/index.tsx b/packages/dify-ui/src/preview-card/index.tsx
index 771b15cf13..f4448e477a 100644
--- a/packages/dify-ui/src/preview-card/index.tsx
+++ b/packages/dify-ui/src/preview-card/index.tsx
@@ -62,7 +62,7 @@ export function PreviewCardContent({
         align={align}
         sideOffset={sideOffset}
         alignOffset={alignOffset}
-        className={cn('z-1002 outline-hidden', className)}
+        className={cn('z-50 outline-hidden', className)}
         {...positionerProps}
       >
         <BasePreviewCard.Popup
diff --git a/packages/dify-ui/src/select/index.tsx b/packages/dify-ui/src/select/index.tsx
index 2f2f91d9c6..676fcae6b4 100644
--- a/packages/dify-ui/src/select/index.tsx
+++ b/packages/dify-ui/src/select/index.tsx
@@ -135,7 +135,7 @@ export function SelectContent({
         sideOffset={sideOffset}
         alignOffset={alignOffset}
         alignItemWithTrigger={false}
-        className={cn('z-1002 outline-hidden', className)}
+        className={cn('z-50 outline-hidden', className)}
         {...positionerProps}
       >
         <BaseSelect.Popup
diff --git a/packages/dify-ui/src/styles/styles.css b/packages/dify-ui/src/styles/styles.css
index fb410b2d5f..e2403d308a 100644
--- a/packages/dify-ui/src/styles/styles.css
+++ b/packages/dify-ui/src/styles/styles.css
@@ -1,4 +1,90 @@
+/*
+ * @langgenius/dify-ui — Tailwind CSS v4 preset (CSS-first).
+ *
+ * This is the single CSS entry point for consumers:
+ *   @import '@langgenius/dify-ui/styles.css';
+ *
+ * Consumers must also `@import 'tailwindcss';` (or selected layers) in their
+ * own root stylesheet so that the engine generates utilities. This file only
+ * contributes design tokens, runtime CSS variables, and project utilities.
+ */
+
+/* ---------- Palette overrides ----------------------------------------- */
+/* Override Tailwind v4's oklch defaults with the Dify brand palette so that
+ * `bg-gray-500`, `text-primary-600`, etc. resolve to the design system. */
+@theme {
+  /* gray */
+  --color-gray-25: #fcfcfd;
+  --color-gray-50: #f9fafb;
+  --color-gray-100: #f2f4f7;
+  --color-gray-200: #eaecf0;
+  --color-gray-300: #d0d5dd;
+  --color-gray-400: #98a2b3;
+  --color-gray-500: #667085;
+  --color-gray-600: #344054;
+  --color-gray-700: #475467;
+  --color-gray-800: #1d2939;
+  --color-gray-900: #101828;
+
+  /* primary */
+  --color-primary-25: #f5f8ff;
+  --color-primary-50: #eff4ff;
+  --color-primary-100: #d1e0ff;
+  --color-primary-200: #b2ccff;
+  --color-primary-300: #84adff;
+  --color-primary-400: #528bff;
+  --color-primary-500: #2970ff;
+  --color-primary-600: #155eef;
+  --color-primary-700: #004eeb;
+  --color-primary-800: #0040c1;
+  --color-primary-900: #00359e;
+
+  /* blue / green / yellow / purple — narrow overrides used by legacy markup */
+  --color-blue-500: #e1effe;
+  --color-green-50: #f3faf7;
+  --color-green-100: #def7ec;
+  --color-green-800: #03543f;
+  --color-yellow-100: #fdf6b2;
+  --color-yellow-800: #723b13;
+  --color-purple-50: #f6f5ff;
+  --color-purple-200: #dcd7fe;
+
+  /* indigo */
+  --color-indigo-25: #f5f8ff;
+  --color-indigo-50: #eef4ff;
+  --color-indigo-100: #e0eaff;
+  --color-indigo-300: #a4bcfd;
+  --color-indigo-400: #8098f9;
+  --color-indigo-600: #444ce7;
+  --color-indigo-800: #2d31a6;
+
+  /* shadows */
+  --shadow-xs: 0px 1px 2px 0px rgba(16, 24, 40, 0.05);
+  --shadow-sm: 0px 1px 2px 0px rgba(16, 24, 40, 0.06), 0px 1px 3px 0px rgba(16, 24, 40, 0.10);
+  --shadow-sm-no-bottom: 0px -1px 2px 0px rgba(16, 24, 40, 0.06), 0px -1px 3px 0px rgba(16, 24, 40, 0.10);
+  --shadow-md: 0px 2px 4px -2px rgba(16, 24, 40, 0.06), 0px 4px 8px -2px rgba(16, 24, 40, 0.10);
+  --shadow-lg: 0px 4px 6px -2px rgba(16, 24, 40, 0.03), 0px 12px 16px -4px rgba(16, 24, 40, 0.08);
+  --shadow-xl: 0px 8px 8px -4px rgba(16, 24, 40, 0.03), 0px 20px 24px -4px rgba(16, 24, 40, 0.08);
+  --shadow-2xl: 0px 24px 48px -12px rgba(16, 24, 40, 0.18);
+  --shadow-3xl: 0px 32px 64px -12px rgba(16, 24, 40, 0.14);
+  --shadow-status-indicator-green-shadow: 0px 2px 6px 0px var(--color-components-badge-status-light-success-halo), 0px 0px 0px 1px var(--color-components-badge-status-light-border-outer);
+  --shadow-status-indicator-warning-shadow: 0px 2px 6px 0px var(--color-components-badge-status-light-warning-halo), 0px 0px 0px 1px var(--color-components-badge-status-light-border-outer);
+  --shadow-status-indicator-red-shadow: 0px 2px 6px 0px var(--color-components-badge-status-light-error-halo), 0px 0px 0px 1px var(--color-components-badge-status-light-border-outer);
+  --shadow-status-indicator-blue-shadow: 0px 2px 6px 0px var(--color-components-badge-status-light-normal-halo), 0px 0px 0px 1px var(--color-components-badge-status-light-border-outer);
+  --shadow-status-indicator-gray-shadow: 0px 1px 2px 0px var(--color-components-badge-status-light-disabled-halo), 0px 0px 0px 1px var(--color-components-badge-status-light-border-outer);
+
+  /* font sizes */
+  --text-2xs: 0.625rem;
+}
+
+/* ---------- Semantic design tokens (`@theme inline`) ------------------ */
+@import '../themes/theme.css';
+
+/* ---------- Runtime variable values ----------------------------------- */
+/* Real values for the semantic tokens above, scoped per `html[data-theme]`. */
 @import '../themes/light.css' layer(base);
 @import '../themes/dark.css' layer(base);
+
+/* ---------- Project utilities & components ---------------------------- */
 @import './utilities.css';
 @import './components.css';
diff --git a/packages/dify-ui/src/tabs/__tests__/index.spec.tsx b/packages/dify-ui/src/tabs/__tests__/index.spec.tsx
new file mode 100644
index 0000000000..6673e35bf5
--- /dev/null
+++ b/packages/dify-ui/src/tabs/__tests__/index.spec.tsx
@@ -0,0 +1,80 @@
+import { render } from 'vitest-browser-react'
+import {
+  Tabs,
+  TabsList,
+  TabsPanel,
+  TabsTab,
+} from '../index'
+
+const asHTMLElement = (element: HTMLElement | SVGElement) => element as HTMLElement
+
+describe('Tabs wrappers', () => {
+  it('renders Base UI tabs with accessible roles', async () => {
+    const screen = await render(
+      <Tabs defaultValue="js">
+        <TabsList>
+          <TabsTab value="js">JavaScript</TabsTab>
+          <TabsTab value="py">Python</TabsTab>
+        </TabsList>
+        <TabsPanel value="js">JS panel</TabsPanel>
+        <TabsPanel value="py">Python panel</TabsPanel>
+      </Tabs>,
+    )
+
+    await expect.element(screen.getByRole('tablist')).toBeInTheDocument()
+    await expect.element(screen.getByRole('tab', { name: 'JavaScript' })).toHaveAttribute('aria-selected', 'true')
+    await expect.element(screen.getByRole('tab', { name: 'Python' })).toHaveAttribute('aria-selected', 'false')
+    await expect.element(screen.getByText('JS panel')).toBeInTheDocument()
+  })
+
+  it('keeps tabs styling minimal by default', async () => {
+    const screen = await render(
+      <Tabs defaultValue="first">
+        <TabsList>
+          <TabsTab value="first">First</TabsTab>
+          <TabsTab value="second">Second</TabsTab>
+        </TabsList>
+      </Tabs>,
+    )
+
+    await expect.element(screen.getByRole('tablist')).toHaveClass(
+      'flex',
+    )
+    await expect.element(screen.getByRole('tab', { name: 'First' })).toHaveClass(
+      'touch-manipulation',
+      'focus-visible:outline-hidden',
+    )
+  })
+
+  it('calls onValueChange while leaving controlled value to the caller', async () => {
+    const onValueChange = vi.fn()
+    const screen = await render(
+      <Tabs value="js" onValueChange={onValueChange}>
+        <TabsList>
+          <TabsTab value="js">JavaScript</TabsTab>
+          <TabsTab value="py">Python</TabsTab>
+        </TabsList>
+      </Tabs>,
+    )
+
+    asHTMLElement(screen.getByRole('tab', { name: 'Python' }).element()).click()
+
+    expect(onValueChange).toHaveBeenCalledWith('py', expect.anything())
+    await expect.element(screen.getByRole('tab', { name: 'JavaScript' })).toHaveAttribute('aria-selected', 'true')
+  })
+
+  it('forwards className to composable parts', async () => {
+    const screen = await render(
+      <Tabs defaultValue="first">
+        <TabsList className="custom-list">
+          <TabsTab value="first" className="custom-tab">First</TabsTab>
+        </TabsList>
+        <TabsPanel value="first" className="custom-panel">Panel</TabsPanel>
+      </Tabs>,
+    )
+
+    await expect.element(screen.getByRole('tablist')).toHaveClass('custom-list')
+    await expect.element(screen.getByRole('tab', { name: 'First' })).toHaveClass('custom-tab')
+    expect(screen.getByText('Panel').element()).toHaveClass('custom-panel')
+  })
+})
diff --git a/packages/dify-ui/src/tabs/index.stories.tsx b/packages/dify-ui/src/tabs/index.stories.tsx
new file mode 100644
index 0000000000..dd1e79a1ce
--- /dev/null
+++ b/packages/dify-ui/src/tabs/index.stories.tsx
@@ -0,0 +1,51 @@
+import type { Meta, StoryObj } from '@storybook/react-vite'
+import {
+  Tabs,
+  TabsList,
+  TabsPanel,
+  TabsTab,
+} from '.'
+
+const meta = {
+  title: 'Base/UI/Tabs',
+  component: Tabs,
+  parameters: {
+    layout: 'centered',
+    docs: {
+      description: {
+        component: 'Composable tabs built on Base UI. Use this when a tab controls a corresponding tab panel.',
+      },
+    },
+  },
+  tags: ['autodocs'],
+} satisfies Meta<typeof Tabs>
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+export const Basic: Story = {
+  render: () => (
+    <Tabs defaultValue="overview" className="w-96">
+      <TabsList className="gap-4 border-b border-divider-subtle">
+        <TabsTab
+          value="overview"
+          className="border-b border-transparent px-0 py-2 system-sm-medium text-text-tertiary data-active:border-text-accent data-active:text-text-primary"
+        >
+          Overview
+        </TabsTab>
+        <TabsTab
+          value="activity"
+          className="border-b border-transparent px-0 py-2 system-sm-medium text-text-tertiary data-active:border-text-accent data-active:text-text-primary"
+        >
+          Activity
+        </TabsTab>
+      </TabsList>
+      <TabsPanel value="overview" className="py-3 system-sm-regular text-text-secondary">
+        Overview panel
+      </TabsPanel>
+      <TabsPanel value="activity" className="py-3 system-sm-regular text-text-secondary">
+        Activity panel
+      </TabsPanel>
+    </Tabs>
+  ),
+}
diff --git a/packages/dify-ui/src/tabs/index.tsx b/packages/dify-ui/src/tabs/index.tsx
new file mode 100644
index 0000000000..ddc5891b89
--- /dev/null
+++ b/packages/dify-ui/src/tabs/index.tsx
@@ -0,0 +1,59 @@
+'use client'
+
+import type { Tabs as BaseTabsNS } from '@base-ui/react/tabs'
+import { Tabs as BaseTabs } from '@base-ui/react/tabs'
+import { cn } from '../cn'
+
+export type TabsProps = BaseTabsNS.Root.Props
+
+export const Tabs = BaseTabs.Root
+
+export type TabsListProps = Omit<BaseTabsNS.List.Props, 'className'> & {
+  className?: string
+}
+
+export function TabsList({
+  className,
+  ...props
+}: TabsListProps) {
+  return (
+    <BaseTabs.List
+      className={cn('flex', className)}
+      {...props}
+    />
+  )
+}
+
+export type TabsTabProps = Omit<BaseTabsNS.Tab.Props, 'className'> & {
+  className?: string
+}
+
+export function TabsTab({
+  className,
+  ...props
+}: TabsTabProps) {
+  return (
+    <BaseTabs.Tab
+      className={cn('touch-manipulation focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-components-input-border-hover data-disabled:cursor-not-allowed data-disabled:text-text-disabled', className)}
+      {...props}
+    />
+  )
+}
+
+export type TabsPanelProps = Omit<BaseTabsNS.Panel.Props, 'className'> & {
+  className?: string
+}
+
+export function TabsPanel({
+  className,
+  ...props
+}: TabsPanelProps) {
+  return (
+    <BaseTabs.Panel
+      className={className}
+      {...props}
+    />
+  )
+}
+
+export const TabsIndicator = BaseTabs.Indicator
diff --git a/packages/dify-ui/src/tailwind-preset.ts b/packages/dify-ui/src/tailwind-preset.ts
deleted file mode 100644
index 2dbf4781b0..0000000000
--- a/packages/dify-ui/src/tailwind-preset.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import tailwindThemeVarDefine from './themes/tailwind-theme-var-define'
-
-const difyUIPreset = {
-  theme: {
-    extend: {
-      colors: {
-        gray: {
-          25: '#fcfcfd',
-          50: '#f9fafb',
-          100: '#f2f4f7',
-          200: '#eaecf0',
-          300: '#d0d5dd',
-          400: '#98a2b3',
-          500: '#667085',
-          600: '#344054',
-          700: '#475467',
-          800: '#1d2939',
-          900: '#101828',
-        },
-        primary: {
-          25: '#f5f8ff',
-          50: '#eff4ff',
-          100: '#d1e0ff',
-          200: '#b2ccff',
-          300: '#84adff',
-          400: '#528bff',
-          500: '#2970ff',
-          600: '#155eef',
-          700: '#004eeb',
-          800: '#0040c1',
-          900: '#00359e',
-        },
-        blue: {
-          500: '#E1EFFE',
-        },
-        green: {
-          50: '#F3FAF7',
-          100: '#DEF7EC',
-          800: '#03543F',
-        },
-        yellow: {
-          100: '#FDF6B2',
-          800: '#723B13',
-        },
-        purple: {
-          50: '#F6F5FF',
-          200: '#DCD7FE',
-        },
-        indigo: {
-          25: '#F5F8FF',
-          50: '#EEF4FF',
-          100: '#E0EAFF',
-          300: '#A4BCFD',
-          400: '#8098F9',
-          600: '#444CE7',
-          800: '#2D31A6',
-        },
-        ...tailwindThemeVarDefine,
-      },
-      boxShadow: {
-        'xs': '0px 1px 2px 0px rgba(16, 24, 40, 0.05)',
-        'sm': '0px 1px 2px 0px rgba(16, 24, 40, 0.06), 0px 1px 3px 0px rgba(16, 24, 40, 0.10)',
-        'sm-no-bottom': '0px -1px 2px 0px rgba(16, 24, 40, 0.06), 0px -1px 3px 0px rgba(16, 24, 40, 0.10)',
-        'md': '0px 2px 4px -2px rgba(16, 24, 40, 0.06), 0px 4px 8px -2px rgba(16, 24, 40, 0.10)',
-        'lg': '0px 4px 6px -2px rgba(16, 24, 40, 0.03), 0px 12px 16px -4px rgba(16, 24, 40, 0.08)',
-        'xl': '0px 8px 8px -4px rgba(16, 24, 40, 0.03), 0px 20px 24px -4px rgba(16, 24, 40, 0.08)',
-        '2xl': '0px 24px 48px -12px rgba(16, 24, 40, 0.18)',
-        '3xl': '0px 32px 64px -12px rgba(16, 24, 40, 0.14)',
-        'status-indicator-green-shadow': '0px 2px 6px 0px var(--color-components-badge-status-light-success-halo), 0px 0px 0px 1px var(--color-components-badge-status-light-border-outer)',
-        'status-indicator-warning-shadow': '0px 2px 6px 0px var(--color-components-badge-status-light-warning-halo), 0px 0px 0px 1px var(--color-components-badge-status-light-border-outer)',
-        'status-indicator-red-shadow': '0px 2px 6px 0px var(--color-components-badge-status-light-error-halo), 0px 0px 0px 1px var(--color-components-badge-status-light-border-outer)',
-        'status-indicator-blue-shadow': '0px 2px 6px 0px var(--color-components-badge-status-light-normal-halo), 0px 0px 0px 1px var(--color-components-badge-status-light-border-outer)',
-        'status-indicator-gray-shadow': '0px 1px 2px 0px var(--color-components-badge-status-light-disabled-halo), 0px 0px 0px 1px var(--color-components-badge-status-light-border-outer)',
-      },
-      opacity: {
-        2: '0.02',
-        8: '0.08',
-      },
-      fontSize: {
-        '2xs': '0.625rem',
-      },
-    },
-  },
-  plugins: [],
-}
-
-export default difyUIPreset
diff --git a/packages/dify-ui/src/themes/dark.css b/packages/dify-ui/src/themes/dark.css
index 59c9811412..4c005983ef 100644
--- a/packages/dify-ui/src/themes/dark.css
+++ b/packages/dify-ui/src/themes/dark.css
@@ -6,18 +6,6 @@ html[data-theme="dark"] {
   --color-components-input-bg-active: rgb(255 255 255 / 0.05);
   --color-components-input-border-active: #747481;
   --color-components-input-border-destructive: #f97066;
-
-  /* Sticky header / Monaco editor sticky scroll colors (dark mode) */
-  /* Use solid panel background to ensure visibility when elements become sticky */
-  --color-components-sticky-header-bg: var(--color-components-panel-bg);
-  --color-components-sticky-header-bg-hover: var(--color-components-panel-on-panel-item-bg-hover);
-  --color-components-sticky-header-border: var(--color-components-panel-border);
-
-  /* Override Monaco/VSCode CSS variables for sticky scroll so the sticky header is opaque */
-  --vscode-editorStickyScroll-background: var(--color-components-sticky-header-bg);
-  --vscode-editorStickyScrollHover-background: var(--color-components-sticky-header-bg-hover);
-  --vscode-editorStickyScroll-border: var(--color-components-sticky-header-border);
-  --vscode-editorStickyScroll-shadow: rgba(0, 0, 0, 0.6);
   --color-components-input-text-filled: #f4f4f5;
   --color-components-input-bg-destructive: rgb(255 255 255 / 0.01);
   --color-components-input-bg-disabled: rgb(255 255 255 / 0.03);
@@ -101,17 +89,6 @@ html[data-theme="dark"] {
   --color-components-button-indigo-bg-hover: #6172f3;
   --color-components-button-indigo-bg-disabled: rgb(255 255 255 / 0.03);
 
-  --color-components-button-debug-text: rgb(255 255 255 / 0.95);
-  --color-components-button-debug-text-disabled: rgb(255 255 255 / 0.2);
-  --color-components-button-debug-bg: #ff4405;
-  --color-components-button-debug-bg-hover: #ff692e;
-  --color-components-button-debug-bg-disabled: rgb(255 68 5 / 0.08);
-  --color-components-button-debug-border: rgb(255 255 255 / 0.12);
-  --color-components-button-debug-border-hover: rgb(255 255 255 / 0.2);
-  --color-components-button-debug-border-disabled: rgb(255 255 255 / 0.08);
-
-  --color-components-button-button-seam: rgb(0 0 0 / 0.15);
-
   --color-components-checkbox-icon: rgb(255 255 255 / 0.95);
   --color-components-checkbox-icon-disabled: rgb(255 255 255 / 0.2);
   --color-components-checkbox-bg: #296dff;
@@ -172,7 +149,6 @@ html[data-theme="dark"] {
   --color-components-panel-on-panel-item-bg-destructive-hover-transparent: rgb(255 251 250 / 0);
 
   --color-components-panel-bg-transparent: rgb(34 34 37 / 0);
-  --color-components-panel-bg-blur-burn: rgb(31 31 35 / 0.9);
 
   --color-components-main-nav-nav-button-text: rgb(200 206 218 / 0.6);
   --color-components-main-nav-nav-button-text-active: #f4f4f5;
@@ -183,26 +159,6 @@ html[data-theme="dark"] {
 
   --color-components-main-nav-nav-user-border: rgb(255 255 255 / 0.05);
 
-  --color-components-main-nav-text: #a8a8b3;
-  --color-components-main-nav-text-active: #ffffff;
-  --color-components-main-nav-glass-edge-highlight-first: rgb(196 207 255 / 0.15);
-  --color-components-main-nav-glass-edge-highlight-middle: rgb(72 108 255 / 0);
-  --color-components-main-nav-glass-edge-highlight-end: rgb(196 207 255 / 0.05);
-
-  --color-components-main-nav-glass-edge-reflection-first: rgb(92 124 255 / 0);
-  --color-components-main-nav-glass-edge-reflection-middle: rgb(210 219 255 / 0.8);
-  --color-components-main-nav-glass-edge-reflection-end: rgb(92 124 255 / 0);
-
-  --color-components-main-nav-glass-surface-first: rgb(196 207 255 / 0.08);
-  --color-components-main-nav-glass-surface-middle-1: rgb(210 219 255 / 0.12);
-  --color-components-main-nav-glass-surface-middle-2: rgb(210 219 255 / 0.1);
-  --color-components-main-nav-glass-surface-end: rgb(196 207 255 / 0.08);
-
-  --color-components-main-nav-glass-inner-glow: rgb(210 219 255 / 0.05);
-  --color-components-main-nav-glass-shadow-reflection: rgb(210 219 255 / 0.04);
-  --color-components-main-nav-glass-shadow-reflection-glow: rgb(255 255 255 / 0.02);
-  --color-components-main-nav-glass-text-glow: rgb(245 246 255 / 0.27);
-
   --color-components-slider-knob: #f4f4f5;
   --color-components-slider-knob-hover: #fefefe;
   --color-components-slider-knob-disabled: rgb(255 255 255 / 0.2);
@@ -401,8 +357,6 @@ html[data-theme="dark"] {
   --color-components-icon-bg-orange-solid: #f79009;
   --color-components-icon-bg-orange-soft: rgb(247 144 9 / 0.2);
 
-  --color-components-marketplace-header-bg: rgb(31 31 35 / 0.9);
-
   --color-text-primary: #fbfbfc;
   --color-text-secondary: #d9d9de;
   --color-text-tertiary: rgb(200 206 218 / 0.6);
@@ -464,7 +418,6 @@ html[data-theme="dark"] {
   --color-background-overlay-backdrop: rgb(24 24 27 / 0.95);
   --color-background-body-transparent: rgb(29 29 32 / 0);
   --color-background-section-burn-inverted: #27272b;
-  --color-background-default-hover-alpha-0: rgb(39 39 43 / 0);
 
   --color-shadow-shadow-1: rgb(0 0 0 / 0.05);
   --color-shadow-shadow-3: rgb(0 0 0 / 0.1);
@@ -548,18 +501,6 @@ html[data-theme="dark"] {
   --color-workflow-workflow-progress-bg-1: rgb(24 24 27 / 0.25);
   --color-workflow-workflow-progress-bg-2: rgb(24 24 27 / 0.04);
 
-  --color-workflow-debug-run-status-bg: rgb(230 46 5 / 0.4);
-  --color-workflow-debug-breakpoint: #ff692e;
-  --color-workflow-debug-text: #ff9c66;
-  --color-workflow-debug-text-disabled: rgb(255 68 5 / 0.2);
-  --color-workflow-debug-run-status-bg-alt: rgb(255 46 0 / 0.5);
-
-  --color-workflow-test-run-run-status-bg: rgb(21 90 239 / 0.5);
-  --color-workflow-test-run-text: #d1e0ff;
-  --color-workflow-test-run-run-status-bg-alt: rgb(45 90 190 / 0.9);
-  --color-workflow-test-run-paused-bg: rgb(247 144 9 / 0.3);
-  --color-workflow-test-run-paused-text: #fdb022;
-
   --color-divider-subtle: rgb(200 206 218 / 0.08);
   --color-divider-regular: rgb(200 206 218 / 0.14);
   --color-divider-deep: rgb(200 206 218 / 0.2);
@@ -604,7 +545,6 @@ html[data-theme="dark"] {
   --color-effects-highlight-lightmode-off: rgb(200 206 218 / 0.08);
   --color-effects-image-frame: #ffffff;
   --color-effects-icon-border: rgb(255 255 255 / 0.15);
-  --color-effects-highlight-subtle: rgb(200 206 218 / 0.04);
 
   --color-util-colors-orange-dark-orange-dark-50: #57130a;
   --color-util-colors-orange-dark-orange-dark-100: #771a0d;
@@ -821,7 +761,5 @@ html[data-theme="dark"] {
 
   --color-dify-logo-blue: #e8e8e8;
   --color-dify-logo-black: #e8e8e8;
-  --color-dify-logo-outline-1: #ffffff;
-  --color-dify-logo-outline-2: #e8e8e8;
 
-}
\ No newline at end of file
+}
diff --git a/packages/dify-ui/src/themes/light.css b/packages/dify-ui/src/themes/light.css
index 3901de4d8b..16e5e898ee 100644
--- a/packages/dify-ui/src/themes/light.css
+++ b/packages/dify-ui/src/themes/light.css
@@ -89,17 +89,6 @@ html[data-theme="light"] {
   --color-components-button-indigo-bg-hover: #3538cd;
   --color-components-button-indigo-bg-disabled: rgb(97 114 243 / 0.14);
 
-  --color-components-button-debug-text: #ffffff;
-  --color-components-button-debug-text-disabled: rgb(255 255 255 / 0.6);
-  --color-components-button-debug-bg: #ff4405;
-  --color-components-button-debug-bg-hover: #e62e05;
-  --color-components-button-debug-bg-disabled: rgb(255 68 5 / 0.2);
-  --color-components-button-debug-border: rgb(16 24 40 / 0.04);
-  --color-components-button-debug-border-hover: rgb(16 24 40 / 0.08);
-  --color-components-button-debug-border-disabled: rgb(255 255 255 / 0);
-
-  --color-components-button-button-seam: rgb(0 0 0 / 0.03);
-
   --color-components-checkbox-icon: #ffffff;
   --color-components-checkbox-icon-disabled: rgb(255 255 255 / 0.5);
   --color-components-checkbox-bg: #155aef;
@@ -160,7 +149,6 @@ html[data-theme="light"] {
   --color-components-panel-on-panel-item-bg-destructive-hover-transparent: rgb(254 243 242 / 0);
 
   --color-components-panel-bg-transparent: rgb(255 255 255 / 0);
-  --color-components-panel-bg-blur-burn: rgb(255 255 255 / 0.9);
 
   --color-components-main-nav-nav-button-text: #495464;
   --color-components-main-nav-nav-button-text-active: #155aef;
@@ -171,26 +159,6 @@ html[data-theme="light"] {
 
   --color-components-main-nav-nav-user-border: #ffffff;
 
-  --color-components-main-nav-text: #495464;
-  --color-components-main-nav-text-active: #0033ff;
-  --color-components-main-nav-glass-edge-highlight-first: rgb(255 255 255 / 0.98);
-  --color-components-main-nav-glass-edge-highlight-middle: rgb(255 255 255 / 0);
-  --color-components-main-nav-glass-edge-highlight-end: rgb(255 255 255 / 0.42);
-
-  --color-components-main-nav-glass-edge-reflection-first: rgb(0 51 255 / 0);
-  --color-components-main-nav-glass-edge-reflection-middle: rgb(0 51 255 / 0.6);
-  --color-components-main-nav-glass-edge-reflection-end: rgb(0 51 255 / 0);
-
-  --color-components-main-nav-glass-surface-first: rgb(0 51 255 / 0.08);
-  --color-components-main-nav-glass-surface-middle-1: rgb(0 51 255 / 0.12);
-  --color-components-main-nav-glass-surface-middle-2: rgb(0 51 255 / 0.1);
-  --color-components-main-nav-glass-surface-end: rgb(0 51 255 / 0.08);
-
-  --color-components-main-nav-glass-inner-glow: rgb(255 255 255 / 0.3);
-  --color-components-main-nav-glass-shadow-reflection: rgb(0 51 255 / 0.06);
-  --color-components-main-nav-glass-shadow-reflection-glow: rgb(255 255 255 / 0);
-  --color-components-main-nav-glass-text-glow: rgb(49 70 255 / 0.18);
-
   --color-components-slider-knob: #ffffff;
   --color-components-slider-knob-hover: #ffffff;
   --color-components-slider-knob-disabled: rgb(255 255 255 / 0.95);
@@ -389,8 +357,6 @@ html[data-theme="light"] {
   --color-components-icon-bg-orange-solid: #f79009;
   --color-components-icon-bg-orange-soft: #fffaeb;
 
-  --color-components-marketplace-header-bg: rgb(255 255 255 / 0.98);
-
   --color-text-primary: #101828;
   --color-text-secondary: #354052;
   --color-text-tertiary: #676f83;
@@ -452,7 +418,6 @@ html[data-theme="light"] {
   --color-background-overlay-backdrop: rgb(242 244 247 / 0.95);
   --color-background-body-transparent: rgb(242 244 247 / 0);
   --color-background-section-burn-inverted: #f2f4f7;
-  --color-background-default-hover-alpha-0: rgb(249 250 251 / 0);
 
   --color-shadow-shadow-1: rgb(9 9 11 / 0.03);
   --color-shadow-shadow-3: rgb(9 9 11 / 0.05);
@@ -536,18 +501,6 @@ html[data-theme="light"] {
   --color-workflow-workflow-progress-bg-1: rgb(200 206 218 / 0.2);
   --color-workflow-workflow-progress-bg-2: rgb(200 206 218 / 0.04);
 
-  --color-workflow-debug-run-status-bg: rgb(255 68 5 / 0.08);
-  --color-workflow-debug-breakpoint: #e62e05;
-  --color-workflow-debug-text: #e62e05;
-  --color-workflow-debug-text-disabled: rgb(255 68 5 / 0.2);
-  --color-workflow-debug-run-status-bg-alt: rgb(255 68 5 / 0.14);
-
-  --color-workflow-test-run-run-status-bg: rgb(21 90 239 / 0.08);
-  --color-workflow-test-run-text: #004aeb;
-  --color-workflow-test-run-run-status-bg-alt: rgb(21 90 239 / 0.14);
-  --color-workflow-test-run-paused-bg: rgb(247 144 9 / 0.14);
-  --color-workflow-test-run-paused-text: #dc6803;
-
   --color-divider-subtle: rgb(16 24 40 / 0.04);
   --color-divider-regular: rgb(16 24 40 / 0.08);
   --color-divider-deep: rgb(16 24 40 / 0.14);
@@ -592,7 +545,6 @@ html[data-theme="light"] {
   --color-effects-highlight-lightmode-off: rgb(255 255 255 / 0);
   --color-effects-image-frame: #ffffff;
   --color-effects-icon-border: rgb(16 24 40 / 0.08);
-  --color-effects-highlight-subtle: rgb(255 255 255 / 0.5);
 
   --color-util-colors-orange-dark-orange-dark-50: #fff4ed;
   --color-util-colors-orange-dark-orange-dark-100: #ffe6d5;
@@ -809,7 +761,5 @@ html[data-theme="light"] {
 
   --color-dify-logo-blue: #0033ff;
   --color-dify-logo-black: #000000;
-  --color-dify-logo-outline-1: rgb(0 0 0 / 0);
-  --color-dify-logo-outline-2: rgb(0 0 0 / 0);
 
-}
\ No newline at end of file
+}
diff --git a/packages/dify-ui/src/themes/tailwind-theme-var-define.ts b/packages/dify-ui/src/themes/tailwind-theme-var-define.ts
deleted file mode 100644
index 2ea617284f..0000000000
--- a/packages/dify-ui/src/themes/tailwind-theme-var-define.ts
+++ /dev/null
@@ -1,816 +0,0 @@
-/* Attention: Generate by code. Don't update by hand!!! */
-const vars = {
-  'components-input-bg-normal': 'var(--color-components-input-bg-normal)',
-  'components-input-text-placeholder': 'var(--color-components-input-text-placeholder)',
-  'components-input-bg-hover': 'var(--color-components-input-bg-hover)',
-  'components-input-bg-active': 'var(--color-components-input-bg-active)',
-  'components-input-border-active': 'var(--color-components-input-border-active)',
-  'components-input-border-destructive': 'var(--color-components-input-border-destructive)',
-  'components-input-text-filled': 'var(--color-components-input-text-filled)',
-  'components-input-bg-destructive': 'var(--color-components-input-bg-destructive)',
-  'components-input-bg-disabled': 'var(--color-components-input-bg-disabled)',
-  'components-input-text-disabled': 'var(--color-components-input-text-disabled)',
-  'components-input-text-filled-disabled': 'var(--color-components-input-text-filled-disabled)',
-  'components-input-border-hover': 'var(--color-components-input-border-hover)',
-  'components-input-border-active-prompt-1': 'var(--color-components-input-border-active-prompt-1)',
-  'components-input-border-active-prompt-2': 'var(--color-components-input-border-active-prompt-2)',
-
-  'components-kbd-bg-gray': 'var(--color-components-kbd-bg-gray)',
-  'components-kbd-bg-white': 'var(--color-components-kbd-bg-white)',
-
-  'components-tooltip-bg': 'var(--color-components-tooltip-bg)',
-
-  'components-button-primary-text': 'var(--color-components-button-primary-text)',
-  'components-button-primary-bg': 'var(--color-components-button-primary-bg)',
-  'components-button-primary-border': 'var(--color-components-button-primary-border)',
-  'components-button-primary-bg-hover': 'var(--color-components-button-primary-bg-hover)',
-  'components-button-primary-border-hover': 'var(--color-components-button-primary-border-hover)',
-  'components-button-primary-bg-disabled': 'var(--color-components-button-primary-bg-disabled)',
-  'components-button-primary-border-disabled': 'var(--color-components-button-primary-border-disabled)',
-  'components-button-primary-text-disabled': 'var(--color-components-button-primary-text-disabled)',
-
-  'components-button-secondary-text': 'var(--color-components-button-secondary-text)',
-  'components-button-secondary-text-disabled': 'var(--color-components-button-secondary-text-disabled)',
-  'components-button-secondary-bg': 'var(--color-components-button-secondary-bg)',
-  'components-button-secondary-bg-hover': 'var(--color-components-button-secondary-bg-hover)',
-  'components-button-secondary-bg-disabled': 'var(--color-components-button-secondary-bg-disabled)',
-  'components-button-secondary-border': 'var(--color-components-button-secondary-border)',
-  'components-button-secondary-border-hover': 'var(--color-components-button-secondary-border-hover)',
-  'components-button-secondary-border-disabled': 'var(--color-components-button-secondary-border-disabled)',
-
-  'components-button-tertiary-text': 'var(--color-components-button-tertiary-text)',
-  'components-button-tertiary-text-disabled': 'var(--color-components-button-tertiary-text-disabled)',
-  'components-button-tertiary-bg': 'var(--color-components-button-tertiary-bg)',
-  'components-button-tertiary-bg-hover': 'var(--color-components-button-tertiary-bg-hover)',
-  'components-button-tertiary-bg-disabled': 'var(--color-components-button-tertiary-bg-disabled)',
-
-  'components-button-ghost-text': 'var(--color-components-button-ghost-text)',
-  'components-button-ghost-text-disabled': 'var(--color-components-button-ghost-text-disabled)',
-  'components-button-ghost-bg-hover': 'var(--color-components-button-ghost-bg-hover)',
-
-  'components-button-destructive-primary-text': 'var(--color-components-button-destructive-primary-text)',
-  'components-button-destructive-primary-text-disabled': 'var(--color-components-button-destructive-primary-text-disabled)',
-  'components-button-destructive-primary-bg': 'var(--color-components-button-destructive-primary-bg)',
-  'components-button-destructive-primary-bg-hover': 'var(--color-components-button-destructive-primary-bg-hover)',
-  'components-button-destructive-primary-bg-disabled': 'var(--color-components-button-destructive-primary-bg-disabled)',
-  'components-button-destructive-primary-border': 'var(--color-components-button-destructive-primary-border)',
-  'components-button-destructive-primary-border-hover': 'var(--color-components-button-destructive-primary-border-hover)',
-  'components-button-destructive-primary-border-disabled': 'var(--color-components-button-destructive-primary-border-disabled)',
-
-  'components-button-destructive-secondary-text': 'var(--color-components-button-destructive-secondary-text)',
-  'components-button-destructive-secondary-text-disabled': 'var(--color-components-button-destructive-secondary-text-disabled)',
-  'components-button-destructive-secondary-bg': 'var(--color-components-button-destructive-secondary-bg)',
-  'components-button-destructive-secondary-bg-hover': 'var(--color-components-button-destructive-secondary-bg-hover)',
-  'components-button-destructive-secondary-bg-disabled': 'var(--color-components-button-destructive-secondary-bg-disabled)',
-  'components-button-destructive-secondary-border': 'var(--color-components-button-destructive-secondary-border)',
-  'components-button-destructive-secondary-border-hover': 'var(--color-components-button-destructive-secondary-border-hover)',
-  'components-button-destructive-secondary-border-disabled': 'var(--color-components-button-destructive-secondary-border-disabled)',
-
-  'components-button-destructive-tertiary-text': 'var(--color-components-button-destructive-tertiary-text)',
-  'components-button-destructive-tertiary-text-disabled': 'var(--color-components-button-destructive-tertiary-text-disabled)',
-  'components-button-destructive-tertiary-bg': 'var(--color-components-button-destructive-tertiary-bg)',
-  'components-button-destructive-tertiary-bg-hover': 'var(--color-components-button-destructive-tertiary-bg-hover)',
-  'components-button-destructive-tertiary-bg-disabled': 'var(--color-components-button-destructive-tertiary-bg-disabled)',
-
-  'components-button-destructive-ghost-text': 'var(--color-components-button-destructive-ghost-text)',
-  'components-button-destructive-ghost-text-disabled': 'var(--color-components-button-destructive-ghost-text-disabled)',
-  'components-button-destructive-ghost-bg-hover': 'var(--color-components-button-destructive-ghost-bg-hover)',
-
-  'components-button-secondary-accent-text': 'var(--color-components-button-secondary-accent-text)',
-  'components-button-secondary-accent-text-disabled': 'var(--color-components-button-secondary-accent-text-disabled)',
-  'components-button-secondary-accent-bg': 'var(--color-components-button-secondary-accent-bg)',
-  'components-button-secondary-accent-bg-hover': 'var(--color-components-button-secondary-accent-bg-hover)',
-  'components-button-secondary-accent-bg-disabled': 'var(--color-components-button-secondary-accent-bg-disabled)',
-  'components-button-secondary-accent-border': 'var(--color-components-button-secondary-accent-border)',
-  'components-button-secondary-accent-border-hover': 'var(--color-components-button-secondary-accent-border-hover)',
-  'components-button-secondary-accent-border-disabled': 'var(--color-components-button-secondary-accent-border-disabled)',
-
-  'components-button-indigo-bg': 'var(--color-components-button-indigo-bg)',
-  'components-button-indigo-bg-hover': 'var(--color-components-button-indigo-bg-hover)',
-  'components-button-indigo-bg-disabled': 'var(--color-components-button-indigo-bg-disabled)',
-
-  'components-button-debug-text': 'var(--color-components-button-debug-text)',
-  'components-button-debug-text-disabled': 'var(--color-components-button-debug-text-disabled)',
-  'components-button-debug-bg': 'var(--color-components-button-debug-bg)',
-  'components-button-debug-bg-hover': 'var(--color-components-button-debug-bg-hover)',
-  'components-button-debug-bg-disabled': 'var(--color-components-button-debug-bg-disabled)',
-  'components-button-debug-border': 'var(--color-components-button-debug-border)',
-  'components-button-debug-border-hover': 'var(--color-components-button-debug-border-hover)',
-  'components-button-debug-border-disabled': 'var(--color-components-button-debug-border-disabled)',
-
-  'components-button-button-seam': 'var(--color-components-button-button-seam)',
-
-  'components-checkbox-icon': 'var(--color-components-checkbox-icon)',
-  'components-checkbox-icon-disabled': 'var(--color-components-checkbox-icon-disabled)',
-  'components-checkbox-bg': 'var(--color-components-checkbox-bg)',
-  'components-checkbox-bg-hover': 'var(--color-components-checkbox-bg-hover)',
-  'components-checkbox-bg-disabled': 'var(--color-components-checkbox-bg-disabled)',
-  'components-checkbox-border': 'var(--color-components-checkbox-border)',
-  'components-checkbox-border-hover': 'var(--color-components-checkbox-border-hover)',
-  'components-checkbox-border-disabled': 'var(--color-components-checkbox-border-disabled)',
-  'components-checkbox-bg-unchecked': 'var(--color-components-checkbox-bg-unchecked)',
-  'components-checkbox-bg-unchecked-hover': 'var(--color-components-checkbox-bg-unchecked-hover)',
-  'components-checkbox-bg-disabled-checked': 'var(--color-components-checkbox-bg-disabled-checked)',
-
-  'components-radio-border-checked': 'var(--color-components-radio-border-checked)',
-  'components-radio-border-checked-hover': 'var(--color-components-radio-border-checked-hover)',
-  'components-radio-border-checked-disabled': 'var(--color-components-radio-border-checked-disabled)',
-  'components-radio-bg-disabled': 'var(--color-components-radio-bg-disabled)',
-  'components-radio-border': 'var(--color-components-radio-border)',
-  'components-radio-border-hover': 'var(--color-components-radio-border-hover)',
-  'components-radio-border-disabled': 'var(--color-components-radio-border-disabled)',
-  'components-radio-bg': 'var(--color-components-radio-bg)',
-  'components-radio-bg-hover': 'var(--color-components-radio-bg-hover)',
-
-  'components-toggle-knob': 'var(--color-components-toggle-knob)',
-  'components-toggle-knob-disabled': 'var(--color-components-toggle-knob-disabled)',
-  'components-toggle-bg': 'var(--color-components-toggle-bg)',
-  'components-toggle-bg-hover': 'var(--color-components-toggle-bg-hover)',
-  'components-toggle-bg-disabled': 'var(--color-components-toggle-bg-disabled)',
-  'components-toggle-bg-unchecked': 'var(--color-components-toggle-bg-unchecked)',
-  'components-toggle-bg-unchecked-hover': 'var(--color-components-toggle-bg-unchecked-hover)',
-  'components-toggle-bg-unchecked-disabled': 'var(--color-components-toggle-bg-unchecked-disabled)',
-  'components-toggle-knob-hover': 'var(--color-components-toggle-knob-hover)',
-
-  'components-card-bg': 'var(--color-components-card-bg)',
-  'components-card-border': 'var(--color-components-card-border)',
-  'components-card-bg-alt': 'var(--color-components-card-bg-alt)',
-  'components-card-bg-transparent': 'var(--color-components-card-bg-transparent)',
-  'components-card-bg-alt-transparent': 'var(--color-components-card-bg-alt-transparent)',
-
-  'components-menu-item-text': 'var(--color-components-menu-item-text)',
-  'components-menu-item-text-active': 'var(--color-components-menu-item-text-active)',
-  'components-menu-item-text-hover': 'var(--color-components-menu-item-text-hover)',
-  'components-menu-item-text-active-accent': 'var(--color-components-menu-item-text-active-accent)',
-  'components-menu-item-bg-active': 'var(--color-components-menu-item-bg-active)',
-  'components-menu-item-bg-hover': 'var(--color-components-menu-item-bg-hover)',
-
-  'components-panel-bg': 'var(--color-components-panel-bg)',
-  'components-panel-bg-blur': 'var(--color-components-panel-bg-blur)',
-  'components-panel-border': 'var(--color-components-panel-border)',
-  'components-panel-border-subtle': 'var(--color-components-panel-border-subtle)',
-  'components-panel-gradient-2': 'var(--color-components-panel-gradient-2)',
-  'components-panel-gradient-1': 'var(--color-components-panel-gradient-1)',
-  'components-panel-bg-alt': 'var(--color-components-panel-bg-alt)',
-  'components-panel-on-panel-item-bg': 'var(--color-components-panel-on-panel-item-bg)',
-  'components-panel-on-panel-item-bg-hover': 'var(--color-components-panel-on-panel-item-bg-hover)',
-  'components-panel-on-panel-item-bg-alt': 'var(--color-components-panel-on-panel-item-bg-alt)',
-  'components-panel-on-panel-item-bg-transparent': 'var(--color-components-panel-on-panel-item-bg-transparent)',
-  'components-panel-on-panel-item-bg-hover-transparent': 'var(--color-components-panel-on-panel-item-bg-hover-transparent)',
-  'components-panel-on-panel-item-bg-destructive-hover-transparent': 'var(--color-components-panel-on-panel-item-bg-destructive-hover-transparent)',
-
-  'components-panel-bg-transparent': 'var(--color-components-panel-bg-transparent)',
-  'components-panel-bg-blur-burn': 'var(--color-components-panel-bg-blur-burn)',
-
-  'components-main-nav-nav-button-text': 'var(--color-components-main-nav-nav-button-text)',
-  'components-main-nav-nav-button-text-active': 'var(--color-components-main-nav-nav-button-text-active)',
-  'components-main-nav-nav-button-bg': 'var(--color-components-main-nav-nav-button-bg)',
-  'components-main-nav-nav-button-bg-active': 'var(--color-components-main-nav-nav-button-bg-active)',
-  'components-main-nav-nav-button-border': 'var(--color-components-main-nav-nav-button-border)',
-  'components-main-nav-nav-button-bg-hover': 'var(--color-components-main-nav-nav-button-bg-hover)',
-
-  'components-main-nav-nav-user-border': 'var(--color-components-main-nav-nav-user-border)',
-
-  'components-main-nav-text': 'var(--color-components-main-nav-text)',
-  'components-main-nav-text-active': 'var(--color-components-main-nav-text-active)',
-  'components-main-nav-glass-edge-highlight-first': 'var(--color-components-main-nav-glass-edge-highlight-first)',
-  'components-main-nav-glass-edge-highlight-middle': 'var(--color-components-main-nav-glass-edge-highlight-middle)',
-  'components-main-nav-glass-edge-highlight-end': 'var(--color-components-main-nav-glass-edge-highlight-end)',
-
-  'components-main-nav-glass-edge-reflection-first': 'var(--color-components-main-nav-glass-edge-reflection-first)',
-  'components-main-nav-glass-edge-reflection-middle': 'var(--color-components-main-nav-glass-edge-reflection-middle)',
-  'components-main-nav-glass-edge-reflection-end': 'var(--color-components-main-nav-glass-edge-reflection-end)',
-
-  'components-main-nav-glass-surface-first': 'var(--color-components-main-nav-glass-surface-first)',
-  'components-main-nav-glass-surface-middle-1': 'var(--color-components-main-nav-glass-surface-middle-1)',
-  'components-main-nav-glass-surface-middle-2': 'var(--color-components-main-nav-glass-surface-middle-2)',
-  'components-main-nav-glass-surface-end': 'var(--color-components-main-nav-glass-surface-end)',
-
-  'components-main-nav-glass-inner-glow': 'var(--color-components-main-nav-glass-inner-glow)',
-  'components-main-nav-glass-shadow-reflection': 'var(--color-components-main-nav-glass-shadow-reflection)',
-  'components-main-nav-glass-shadow-reflection-glow': 'var(--color-components-main-nav-glass-shadow-reflection-glow)',
-  'components-main-nav-glass-text-glow': 'var(--color-components-main-nav-glass-text-glow)',
-
-  'components-slider-knob': 'var(--color-components-slider-knob)',
-  'components-slider-knob-hover': 'var(--color-components-slider-knob-hover)',
-  'components-slider-knob-disabled': 'var(--color-components-slider-knob-disabled)',
-  'components-slider-range': 'var(--color-components-slider-range)',
-  'components-slider-track': 'var(--color-components-slider-track)',
-  'components-slider-knob-border-hover': 'var(--color-components-slider-knob-border-hover)',
-  'components-slider-knob-border': 'var(--color-components-slider-knob-border)',
-
-  'components-segmented-control-item-active-bg': 'var(--color-components-segmented-control-item-active-bg)',
-  'components-segmented-control-item-active-border': 'var(--color-components-segmented-control-item-active-border)',
-  'components-segmented-control-bg-normal': 'var(--color-components-segmented-control-bg-normal)',
-  'components-segmented-control-item-active-accent-bg': 'var(--color-components-segmented-control-item-active-accent-bg)',
-  'components-segmented-control-item-active-accent-border': 'var(--color-components-segmented-control-item-active-accent-border)',
-
-  'components-option-card-option-bg': 'var(--color-components-option-card-option-bg)',
-  'components-option-card-option-selected-bg': 'var(--color-components-option-card-option-selected-bg)',
-  'components-option-card-option-selected-border': 'var(--color-components-option-card-option-selected-border)',
-  'components-option-card-option-border': 'var(--color-components-option-card-option-border)',
-  'components-option-card-option-bg-hover': 'var(--color-components-option-card-option-bg-hover)',
-  'components-option-card-option-border-hover': 'var(--color-components-option-card-option-border-hover)',
-
-  'components-tab-active': 'var(--color-components-tab-active)',
-
-  'components-badge-white-to-dark': 'var(--color-components-badge-white-to-dark)',
-  'components-badge-status-light-success-bg': 'var(--color-components-badge-status-light-success-bg)',
-  'components-badge-status-light-success-border-inner': 'var(--color-components-badge-status-light-success-border-inner)',
-  'components-badge-status-light-success-halo': 'var(--color-components-badge-status-light-success-halo)',
-
-  'components-badge-status-light-border-outer': 'var(--color-components-badge-status-light-border-outer)',
-  'components-badge-status-light-high-light': 'var(--color-components-badge-status-light-high-light)',
-  'components-badge-status-light-warning-bg': 'var(--color-components-badge-status-light-warning-bg)',
-  'components-badge-status-light-warning-border-inner': 'var(--color-components-badge-status-light-warning-border-inner)',
-  'components-badge-status-light-warning-halo': 'var(--color-components-badge-status-light-warning-halo)',
-
-  'components-badge-status-light-error-bg': 'var(--color-components-badge-status-light-error-bg)',
-  'components-badge-status-light-error-border-inner': 'var(--color-components-badge-status-light-error-border-inner)',
-  'components-badge-status-light-error-halo': 'var(--color-components-badge-status-light-error-halo)',
-
-  'components-badge-status-light-normal-bg': 'var(--color-components-badge-status-light-normal-bg)',
-  'components-badge-status-light-normal-border-inner': 'var(--color-components-badge-status-light-normal-border-inner)',
-  'components-badge-status-light-normal-halo': 'var(--color-components-badge-status-light-normal-halo)',
-
-  'components-badge-status-light-disabled-bg': 'var(--color-components-badge-status-light-disabled-bg)',
-  'components-badge-status-light-disabled-border-inner': 'var(--color-components-badge-status-light-disabled-border-inner)',
-  'components-badge-status-light-disabled-halo': 'var(--color-components-badge-status-light-disabled-halo)',
-
-  'components-badge-bg-green-soft': 'var(--color-components-badge-bg-green-soft)',
-  'components-badge-bg-orange-soft': 'var(--color-components-badge-bg-orange-soft)',
-  'components-badge-bg-red-soft': 'var(--color-components-badge-bg-red-soft)',
-  'components-badge-bg-blue-light-soft': 'var(--color-components-badge-bg-blue-light-soft)',
-  'components-badge-bg-gray-soft': 'var(--color-components-badge-bg-gray-soft)',
-  'components-badge-bg-dimm': 'var(--color-components-badge-bg-dimm)',
-
-  'components-chart-line': 'var(--color-components-chart-line)',
-  'components-chart-area-1': 'var(--color-components-chart-area-1)',
-  'components-chart-area-2': 'var(--color-components-chart-area-2)',
-  'components-chart-current-1': 'var(--color-components-chart-current-1)',
-  'components-chart-current-2': 'var(--color-components-chart-current-2)',
-  'components-chart-bg': 'var(--color-components-chart-bg)',
-
-  'components-actionbar-bg': 'var(--color-components-actionbar-bg)',
-  'components-actionbar-border': 'var(--color-components-actionbar-border)',
-  'components-actionbar-bg-accent': 'var(--color-components-actionbar-bg-accent)',
-  'components-actionbar-border-accent': 'var(--color-components-actionbar-border-accent)',
-
-  'components-dropzone-bg-alt': 'var(--color-components-dropzone-bg-alt)',
-  'components-dropzone-bg': 'var(--color-components-dropzone-bg)',
-  'components-dropzone-bg-accent': 'var(--color-components-dropzone-bg-accent)',
-  'components-dropzone-border': 'var(--color-components-dropzone-border)',
-  'components-dropzone-border-alt': 'var(--color-components-dropzone-border-alt)',
-  'components-dropzone-border-accent': 'var(--color-components-dropzone-border-accent)',
-
-  'components-progress-brand-progress': 'var(--color-components-progress-brand-progress)',
-  'components-progress-brand-border': 'var(--color-components-progress-brand-border)',
-  'components-progress-brand-bg': 'var(--color-components-progress-brand-bg)',
-
-  'components-progress-white-progress': 'var(--color-components-progress-white-progress)',
-  'components-progress-white-border': 'var(--color-components-progress-white-border)',
-  'components-progress-white-bg': 'var(--color-components-progress-white-bg)',
-
-  'components-progress-gray-progress': 'var(--color-components-progress-gray-progress)',
-  'components-progress-gray-border': 'var(--color-components-progress-gray-border)',
-  'components-progress-gray-bg': 'var(--color-components-progress-gray-bg)',
-
-  'components-progress-warning-progress': 'var(--color-components-progress-warning-progress)',
-  'components-progress-warning-border': 'var(--color-components-progress-warning-border)',
-  'components-progress-warning-bg': 'var(--color-components-progress-warning-bg)',
-
-  'components-progress-error-progress': 'var(--color-components-progress-error-progress)',
-  'components-progress-error-border': 'var(--color-components-progress-error-border)',
-  'components-progress-error-bg': 'var(--color-components-progress-error-bg)',
-
-  'components-chat-input-audio-bg': 'var(--color-components-chat-input-audio-bg)',
-  'components-chat-input-audio-wave-default': 'var(--color-components-chat-input-audio-wave-default)',
-  'components-chat-input-bg-mask-1': 'var(--color-components-chat-input-bg-mask-1)',
-  'components-chat-input-bg-mask-2': 'var(--color-components-chat-input-bg-mask-2)',
-  'components-chat-input-border': 'var(--color-components-chat-input-border)',
-  'components-chat-input-audio-wave-active': 'var(--color-components-chat-input-audio-wave-active)',
-  'components-chat-input-audio-bg-alt': 'var(--color-components-chat-input-audio-bg-alt)',
-
-  'components-avatar-shape-fill-stop-0': 'var(--color-components-avatar-shape-fill-stop-0)',
-  'components-avatar-shape-fill-stop-100': 'var(--color-components-avatar-shape-fill-stop-100)',
-
-  'components-avatar-bg-mask-stop-0': 'var(--color-components-avatar-bg-mask-stop-0)',
-  'components-avatar-bg-mask-stop-100': 'var(--color-components-avatar-bg-mask-stop-100)',
-
-  'components-avatar-default-avatar-bg': 'var(--color-components-avatar-default-avatar-bg)',
-  'components-avatar-mask-darkmode-dimmed': 'var(--color-components-avatar-mask-darkmode-dimmed)',
-
-  'components-label-gray': 'var(--color-components-label-gray)',
-
-  'components-premium-badge-blue-bg-stop-0': 'var(--color-components-premium-badge-blue-bg-stop-0)',
-  'components-premium-badge-blue-bg-stop-100': 'var(--color-components-premium-badge-blue-bg-stop-100)',
-  'components-premium-badge-blue-stroke-stop-0': 'var(--color-components-premium-badge-blue-stroke-stop-0)',
-  'components-premium-badge-blue-stroke-stop-100': 'var(--color-components-premium-badge-blue-stroke-stop-100)',
-  'components-premium-badge-blue-text-stop-0': 'var(--color-components-premium-badge-blue-text-stop-0)',
-  'components-premium-badge-blue-text-stop-100': 'var(--color-components-premium-badge-blue-text-stop-100)',
-  'components-premium-badge-blue-glow': 'var(--color-components-premium-badge-blue-glow)',
-  'components-premium-badge-blue-bg-stop-0-hover': 'var(--color-components-premium-badge-blue-bg-stop-0-hover)',
-  'components-premium-badge-blue-bg-stop-100-hover': 'var(--color-components-premium-badge-blue-bg-stop-100-hover)',
-  'components-premium-badge-blue-glow-hover': 'var(--color-components-premium-badge-blue-glow-hover)',
-  'components-premium-badge-blue-stroke-stop-0-hover': 'var(--color-components-premium-badge-blue-stroke-stop-0-hover)',
-  'components-premium-badge-blue-stroke-stop-100-hover': 'var(--color-components-premium-badge-blue-stroke-stop-100-hover)',
-
-  'components-premium-badge-highlight-stop-0': 'var(--color-components-premium-badge-highlight-stop-0)',
-  'components-premium-badge-highlight-stop-100': 'var(--color-components-premium-badge-highlight-stop-100)',
-  'components-premium-badge-indigo-bg-stop-0': 'var(--color-components-premium-badge-indigo-bg-stop-0)',
-  'components-premium-badge-indigo-bg-stop-100': 'var(--color-components-premium-badge-indigo-bg-stop-100)',
-  'components-premium-badge-indigo-stroke-stop-0': 'var(--color-components-premium-badge-indigo-stroke-stop-0)',
-  'components-premium-badge-indigo-stroke-stop-100': 'var(--color-components-premium-badge-indigo-stroke-stop-100)',
-  'components-premium-badge-indigo-text-stop-0': 'var(--color-components-premium-badge-indigo-text-stop-0)',
-  'components-premium-badge-indigo-text-stop-100': 'var(--color-components-premium-badge-indigo-text-stop-100)',
-  'components-premium-badge-indigo-glow': 'var(--color-components-premium-badge-indigo-glow)',
-  'components-premium-badge-indigo-glow-hover': 'var(--color-components-premium-badge-indigo-glow-hover)',
-  'components-premium-badge-indigo-bg-stop-0-hover': 'var(--color-components-premium-badge-indigo-bg-stop-0-hover)',
-  'components-premium-badge-indigo-bg-stop-100-hover': 'var(--color-components-premium-badge-indigo-bg-stop-100-hover)',
-  'components-premium-badge-indigo-stroke-stop-0-hover': 'var(--color-components-premium-badge-indigo-stroke-stop-0-hover)',
-  'components-premium-badge-indigo-stroke-stop-100-hover': 'var(--color-components-premium-badge-indigo-stroke-stop-100-hover)',
-
-  'components-premium-badge-grey-bg-stop-0': 'var(--color-components-premium-badge-grey-bg-stop-0)',
-  'components-premium-badge-grey-bg-stop-100': 'var(--color-components-premium-badge-grey-bg-stop-100)',
-  'components-premium-badge-grey-stroke-stop-0': 'var(--color-components-premium-badge-grey-stroke-stop-0)',
-  'components-premium-badge-grey-stroke-stop-100': 'var(--color-components-premium-badge-grey-stroke-stop-100)',
-  'components-premium-badge-grey-text-stop-0': 'var(--color-components-premium-badge-grey-text-stop-0)',
-  'components-premium-badge-grey-text-stop-100': 'var(--color-components-premium-badge-grey-text-stop-100)',
-  'components-premium-badge-grey-glow': 'var(--color-components-premium-badge-grey-glow)',
-  'components-premium-badge-grey-glow-hover': 'var(--color-components-premium-badge-grey-glow-hover)',
-  'components-premium-badge-grey-bg-stop-0-hover': 'var(--color-components-premium-badge-grey-bg-stop-0-hover)',
-  'components-premium-badge-grey-bg-stop-100-hover': 'var(--color-components-premium-badge-grey-bg-stop-100-hover)',
-  'components-premium-badge-grey-stroke-stop-0-hover': 'var(--color-components-premium-badge-grey-stroke-stop-0-hover)',
-  'components-premium-badge-grey-stroke-stop-100-hover': 'var(--color-components-premium-badge-grey-stroke-stop-100-hover)',
-
-  'components-premium-badge-orange-bg-stop-0': 'var(--color-components-premium-badge-orange-bg-stop-0)',
-  'components-premium-badge-orange-bg-stop-100': 'var(--color-components-premium-badge-orange-bg-stop-100)',
-  'components-premium-badge-orange-stroke-stop-0': 'var(--color-components-premium-badge-orange-stroke-stop-0)',
-  'components-premium-badge-orange-stroke-stop-100': 'var(--color-components-premium-badge-orange-stroke-stop-100)',
-  'components-premium-badge-orange-text-stop-0': 'var(--color-components-premium-badge-orange-text-stop-0)',
-  'components-premium-badge-orange-text-stop-100': 'var(--color-components-premium-badge-orange-text-stop-100)',
-  'components-premium-badge-orange-glow': 'var(--color-components-premium-badge-orange-glow)',
-  'components-premium-badge-orange-glow-hover': 'var(--color-components-premium-badge-orange-glow-hover)',
-  'components-premium-badge-orange-bg-stop-0-hover': 'var(--color-components-premium-badge-orange-bg-stop-0-hover)',
-  'components-premium-badge-orange-bg-stop-100-hover': 'var(--color-components-premium-badge-orange-bg-stop-100-hover)',
-  'components-premium-badge-orange-stroke-stop-0-hover': 'var(--color-components-premium-badge-orange-stroke-stop-0-hover)',
-  'components-premium-badge-orange-stroke-stop-100-hover': 'var(--color-components-premium-badge-orange-stroke-stop-100-hover)',
-
-  'components-progress-bar-bg': 'var(--color-components-progress-bar-bg)',
-  'components-progress-bar-progress': 'var(--color-components-progress-bar-progress)',
-  'components-progress-bar-border': 'var(--color-components-progress-bar-border)',
-  'components-progress-bar-progress-solid': 'var(--color-components-progress-bar-progress-solid)',
-  'components-progress-bar-progress-highlight': 'var(--color-components-progress-bar-progress-highlight)',
-
-  'components-icon-bg-red-solid': 'var(--color-components-icon-bg-red-solid)',
-  'components-icon-bg-rose-solid': 'var(--color-components-icon-bg-rose-solid)',
-  'components-icon-bg-pink-solid': 'var(--color-components-icon-bg-pink-solid)',
-  'components-icon-bg-orange-dark-solid': 'var(--color-components-icon-bg-orange-dark-solid)',
-  'components-icon-bg-yellow-solid': 'var(--color-components-icon-bg-yellow-solid)',
-  'components-icon-bg-green-solid': 'var(--color-components-icon-bg-green-solid)',
-  'components-icon-bg-teal-solid': 'var(--color-components-icon-bg-teal-solid)',
-  'components-icon-bg-blue-light-solid': 'var(--color-components-icon-bg-blue-light-solid)',
-  'components-icon-bg-blue-solid': 'var(--color-components-icon-bg-blue-solid)',
-  'components-icon-bg-indigo-solid': 'var(--color-components-icon-bg-indigo-solid)',
-  'components-icon-bg-violet-solid': 'var(--color-components-icon-bg-violet-solid)',
-  'components-icon-bg-midnight-solid': 'var(--color-components-icon-bg-midnight-solid)',
-  'components-icon-bg-rose-soft': 'var(--color-components-icon-bg-rose-soft)',
-  'components-icon-bg-pink-soft': 'var(--color-components-icon-bg-pink-soft)',
-  'components-icon-bg-orange-dark-soft': 'var(--color-components-icon-bg-orange-dark-soft)',
-  'components-icon-bg-yellow-soft': 'var(--color-components-icon-bg-yellow-soft)',
-  'components-icon-bg-green-soft': 'var(--color-components-icon-bg-green-soft)',
-  'components-icon-bg-teal-soft': 'var(--color-components-icon-bg-teal-soft)',
-  'components-icon-bg-blue-light-soft': 'var(--color-components-icon-bg-blue-light-soft)',
-  'components-icon-bg-blue-soft': 'var(--color-components-icon-bg-blue-soft)',
-  'components-icon-bg-indigo-soft': 'var(--color-components-icon-bg-indigo-soft)',
-  'components-icon-bg-violet-soft': 'var(--color-components-icon-bg-violet-soft)',
-  'components-icon-bg-midnight-soft': 'var(--color-components-icon-bg-midnight-soft)',
-  'components-icon-bg-red-soft': 'var(--color-components-icon-bg-red-soft)',
-  'components-icon-bg-orange-solid': 'var(--color-components-icon-bg-orange-solid)',
-  'components-icon-bg-orange-soft': 'var(--color-components-icon-bg-orange-soft)',
-
-  'components-marketplace-header-bg': 'var(--color-components-marketplace-header-bg)',
-
-  'text-primary': 'var(--color-text-primary)',
-  'text-secondary': 'var(--color-text-secondary)',
-  'text-tertiary': 'var(--color-text-tertiary)',
-  'text-quaternary': 'var(--color-text-quaternary)',
-  'text-destructive': 'var(--color-text-destructive)',
-  'text-success': 'var(--color-text-success)',
-  'text-warning': 'var(--color-text-warning)',
-  'text-destructive-secondary': 'var(--color-text-destructive-secondary)',
-  'text-success-secondary': 'var(--color-text-success-secondary)',
-  'text-warning-secondary': 'var(--color-text-warning-secondary)',
-  'text-accent': 'var(--color-text-accent)',
-  'text-primary-on-surface': 'var(--color-text-primary-on-surface)',
-  'text-placeholder': 'var(--color-text-placeholder)',
-  'text-disabled': 'var(--color-text-disabled)',
-  'text-accent-secondary': 'var(--color-text-accent-secondary)',
-  'text-accent-light-mode-only': 'var(--color-text-accent-light-mode-only)',
-  'text-text-selected': 'var(--color-text-text-selected)',
-  'text-secondary-on-surface': 'var(--color-text-secondary-on-surface)',
-  'text-logo-text': 'var(--color-text-logo-text)',
-  'text-empty-state-icon': 'var(--color-text-empty-state-icon)',
-  'text-inverted': 'var(--color-text-inverted)',
-  'text-inverted-dimmed': 'var(--color-text-inverted-dimmed)',
-
-  'background-body': 'var(--color-background-body)',
-  'background-default-subtle': 'var(--color-background-default-subtle)',
-  'background-neutral-subtle': 'var(--color-background-neutral-subtle)',
-  'background-sidenav-bg': 'var(--color-background-sidenav-bg)',
-  'background-default': 'var(--color-background-default)',
-  'background-soft': 'var(--color-background-soft)',
-  'background-gradient-bg-fill-chat-bg-1': 'var(--color-background-gradient-bg-fill-chat-bg-1)',
-  'background-gradient-bg-fill-chat-bg-2': 'var(--color-background-gradient-bg-fill-chat-bg-2)',
-  'background-gradient-bg-fill-chat-bubble-bg-1': 'var(--color-background-gradient-bg-fill-chat-bubble-bg-1)',
-  'background-gradient-bg-fill-chat-bubble-bg-2': 'var(--color-background-gradient-bg-fill-chat-bubble-bg-2)',
-  'background-gradient-bg-fill-debug-bg-1': 'var(--color-background-gradient-bg-fill-debug-bg-1)',
-  'background-gradient-bg-fill-debug-bg-2': 'var(--color-background-gradient-bg-fill-debug-bg-2)',
-
-  'background-gradient-mask-gray': 'var(--color-background-gradient-mask-gray)',
-  'background-gradient-mask-transparent': 'var(--color-background-gradient-mask-transparent)',
-  'background-gradient-mask-input-clear-2': 'var(--color-background-gradient-mask-input-clear-2)',
-  'background-gradient-mask-input-clear-1': 'var(--color-background-gradient-mask-input-clear-1)',
-  'background-gradient-mask-transparent-dark': 'var(--color-background-gradient-mask-transparent-dark)',
-  'background-gradient-mask-side-panel-2': 'var(--color-background-gradient-mask-side-panel-2)',
-  'background-gradient-mask-side-panel-1': 'var(--color-background-gradient-mask-side-panel-1)',
-
-  'background-default-burn': 'var(--color-background-default-burn)',
-  'background-overlay-fullscreen': 'var(--color-background-overlay-fullscreen)',
-  'background-default-lighter': 'var(--color-background-default-lighter)',
-  'background-section': 'var(--color-background-section)',
-  'background-interaction-from-bg-1': 'var(--color-background-interaction-from-bg-1)',
-  'background-interaction-from-bg-2': 'var(--color-background-interaction-from-bg-2)',
-  'background-section-burn': 'var(--color-background-section-burn)',
-  'background-default-dodge': 'var(--color-background-default-dodge)',
-  'background-overlay': 'var(--color-background-overlay)',
-  'background-default-dimmed': 'var(--color-background-default-dimmed)',
-  'background-default-hover': 'var(--color-background-default-hover)',
-  'background-overlay-alt': 'var(--color-background-overlay-alt)',
-  'background-surface-white': 'var(--color-background-surface-white)',
-  'background-overlay-destructive': 'var(--color-background-overlay-destructive)',
-  'background-overlay-backdrop': 'var(--color-background-overlay-backdrop)',
-  'background-body-transparent': 'var(--color-background-body-transparent)',
-  'background-section-burn-inverted': 'var(--color-background-section-burn-inverted)',
-  'background-default-hover-alpha-0': 'var(--color-background-default-hover-alpha-0)',
-
-  'shadow-shadow-1': 'var(--color-shadow-shadow-1)',
-  'shadow-shadow-3': 'var(--color-shadow-shadow-3)',
-  'shadow-shadow-4': 'var(--color-shadow-shadow-4)',
-  'shadow-shadow-5': 'var(--color-shadow-shadow-5)',
-  'shadow-shadow-6': 'var(--color-shadow-shadow-6)',
-  'shadow-shadow-7': 'var(--color-shadow-shadow-7)',
-  'shadow-shadow-8': 'var(--color-shadow-shadow-8)',
-  'shadow-shadow-9': 'var(--color-shadow-shadow-9)',
-  'shadow-shadow-2': 'var(--color-shadow-shadow-2)',
-  'shadow-shadow-10': 'var(--color-shadow-shadow-10)',
-
-  'workflow-block-border': 'var(--color-workflow-block-border)',
-  'workflow-block-parma-bg': 'var(--color-workflow-block-parma-bg)',
-  'workflow-block-bg': 'var(--color-workflow-block-bg)',
-  'workflow-block-bg-transparent': 'var(--color-workflow-block-bg-transparent)',
-  'workflow-block-border-highlight': 'var(--color-workflow-block-border-highlight)',
-  'workflow-block-wrapper-bg-1': 'var(--color-workflow-block-wrapper-bg-1)',
-  'workflow-block-wrapper-bg-2': 'var(--color-workflow-block-wrapper-bg-2)',
-
-  'workflow-canvas-workflow-dot-color': 'var(--color-workflow-canvas-workflow-dot-color)',
-  'workflow-canvas-workflow-bg': 'var(--color-workflow-canvas-workflow-bg)',
-  'workflow-canvas-workflow-top-bar-1': 'var(--color-workflow-canvas-workflow-top-bar-1)',
-  'workflow-canvas-workflow-top-bar-2': 'var(--color-workflow-canvas-workflow-top-bar-2)',
-  'workflow-canvas-canvas-overlay': 'var(--color-workflow-canvas-canvas-overlay)',
-
-  'workflow-link-line-active': 'var(--color-workflow-link-line-active)',
-  'workflow-link-line-normal': 'var(--color-workflow-link-line-normal)',
-  'workflow-link-line-handle': 'var(--color-workflow-link-line-handle)',
-  'workflow-link-line-normal-transparent': 'var(--color-workflow-link-line-normal-transparent)',
-  'workflow-link-line-failure-active': 'var(--color-workflow-link-line-failure-active)',
-  'workflow-link-line-failure-handle': 'var(--color-workflow-link-line-failure-handle)',
-  'workflow-link-line-failure-button-bg': 'var(--color-workflow-link-line-failure-button-bg)',
-  'workflow-link-line-failure-button-hover': 'var(--color-workflow-link-line-failure-button-hover)',
-
-  'workflow-link-line-success-active': 'var(--color-workflow-link-line-success-active)',
-  'workflow-link-line-success-handle': 'var(--color-workflow-link-line-success-handle)',
-
-  'workflow-link-line-error-active': 'var(--color-workflow-link-line-error-active)',
-  'workflow-link-line-error-handle': 'var(--color-workflow-link-line-error-handle)',
-
-  'workflow-minimap-bg': 'var(--color-workflow-minimap-bg)',
-  'workflow-minimap-block': 'var(--color-workflow-minimap-block)',
-
-  'workflow-display-success-bg': 'var(--color-workflow-display-success-bg)',
-  'workflow-display-success-border-1': 'var(--color-workflow-display-success-border-1)',
-  'workflow-display-success-border-2': 'var(--color-workflow-display-success-border-2)',
-  'workflow-display-success-vignette-color': 'var(--color-workflow-display-success-vignette-color)',
-  'workflow-display-success-bg-line-pattern': 'var(--color-workflow-display-success-bg-line-pattern)',
-
-  'workflow-display-glass-1': 'var(--color-workflow-display-glass-1)',
-  'workflow-display-glass-2': 'var(--color-workflow-display-glass-2)',
-  'workflow-display-vignette-dark': 'var(--color-workflow-display-vignette-dark)',
-  'workflow-display-highlight': 'var(--color-workflow-display-highlight)',
-  'workflow-display-outline': 'var(--color-workflow-display-outline)',
-  'workflow-display-error-bg': 'var(--color-workflow-display-error-bg)',
-  'workflow-display-error-bg-line-pattern': 'var(--color-workflow-display-error-bg-line-pattern)',
-  'workflow-display-error-border-1': 'var(--color-workflow-display-error-border-1)',
-  'workflow-display-error-border-2': 'var(--color-workflow-display-error-border-2)',
-  'workflow-display-error-vignette-color': 'var(--color-workflow-display-error-vignette-color)',
-
-  'workflow-display-warning-bg': 'var(--color-workflow-display-warning-bg)',
-  'workflow-display-warning-bg-line-pattern': 'var(--color-workflow-display-warning-bg-line-pattern)',
-  'workflow-display-warning-border-1': 'var(--color-workflow-display-warning-border-1)',
-  'workflow-display-warning-border-2': 'var(--color-workflow-display-warning-border-2)',
-  'workflow-display-warning-vignette-color': 'var(--color-workflow-display-warning-vignette-color)',
-
-  'workflow-display-normal-bg': 'var(--color-workflow-display-normal-bg)',
-  'workflow-display-normal-bg-line-pattern': 'var(--color-workflow-display-normal-bg-line-pattern)',
-  'workflow-display-normal-border-1': 'var(--color-workflow-display-normal-border-1)',
-  'workflow-display-normal-border-2': 'var(--color-workflow-display-normal-border-2)',
-  'workflow-display-normal-vignette-color': 'var(--color-workflow-display-normal-vignette-color)',
-
-  'workflow-display-disabled-bg': 'var(--color-workflow-display-disabled-bg)',
-  'workflow-display-disabled-bg-line-pattern': 'var(--color-workflow-display-disabled-bg-line-pattern)',
-  'workflow-display-disabled-border-1': 'var(--color-workflow-display-disabled-border-1)',
-  'workflow-display-disabled-border-2': 'var(--color-workflow-display-disabled-border-2)',
-  'workflow-display-disabled-vignette-color': 'var(--color-workflow-display-disabled-vignette-color)',
-  'workflow-display-disabled-outline': 'var(--color-workflow-display-disabled-outline)',
-
-  'workflow-workflow-progress-bg-1': 'var(--color-workflow-workflow-progress-bg-1)',
-  'workflow-workflow-progress-bg-2': 'var(--color-workflow-workflow-progress-bg-2)',
-
-  'workflow-debug-run-status-bg': 'var(--color-workflow-debug-run-status-bg)',
-  'workflow-debug-breakpoint': 'var(--color-workflow-debug-breakpoint)',
-  'workflow-debug-text': 'var(--color-workflow-debug-text)',
-  'workflow-debug-text-disabled': 'var(--color-workflow-debug-text-disabled)',
-  'workflow-debug-run-status-bg-alt': 'var(--color-workflow-debug-run-status-bg-alt)',
-
-  'workflow-test-run-run-status-bg': 'var(--color-workflow-test-run-run-status-bg)',
-  'workflow-test-run-text': 'var(--color-workflow-test-run-text)',
-  'workflow-test-run-run-status-bg-alt': 'var(--color-workflow-test-run-run-status-bg-alt)',
-  'workflow-test-run-paused-bg': 'var(--color-workflow-test-run-paused-bg)',
-  'workflow-test-run-paused-text': 'var(--color-workflow-test-run-paused-text)',
-
-  'divider-subtle': 'var(--color-divider-subtle)',
-  'divider-regular': 'var(--color-divider-regular)',
-  'divider-deep': 'var(--color-divider-deep)',
-  'divider-burn': 'var(--color-divider-burn)',
-  'divider-intense': 'var(--color-divider-intense)',
-  'divider-solid': 'var(--color-divider-solid)',
-  'divider-solid-alt': 'var(--color-divider-solid-alt)',
-  'divider-accent': 'var(--color-divider-accent)',
-
-  'state-base-hover': 'var(--color-state-base-hover)',
-  'state-base-active': 'var(--color-state-base-active)',
-  'state-base-hover-alt': 'var(--color-state-base-hover-alt)',
-  'state-base-handle': 'var(--color-state-base-handle)',
-  'state-base-handle-hover': 'var(--color-state-base-handle-hover)',
-  'state-base-hover-subtle': 'var(--color-state-base-hover-subtle)',
-
-  'state-accent-hover': 'var(--color-state-accent-hover)',
-  'state-accent-active': 'var(--color-state-accent-active)',
-  'state-accent-hover-alt': 'var(--color-state-accent-hover-alt)',
-  'state-accent-solid': 'var(--color-state-accent-solid)',
-  'state-accent-active-alt': 'var(--color-state-accent-active-alt)',
-
-  'state-destructive-hover': 'var(--color-state-destructive-hover)',
-  'state-destructive-hover-alt': 'var(--color-state-destructive-hover-alt)',
-  'state-destructive-active': 'var(--color-state-destructive-active)',
-  'state-destructive-solid': 'var(--color-state-destructive-solid)',
-  'state-destructive-border': 'var(--color-state-destructive-border)',
-  'state-destructive-hover-transparent': 'var(--color-state-destructive-hover-transparent)',
-
-  'state-success-hover': 'var(--color-state-success-hover)',
-  'state-success-hover-alt': 'var(--color-state-success-hover-alt)',
-  'state-success-active': 'var(--color-state-success-active)',
-  'state-success-solid': 'var(--color-state-success-solid)',
-
-  'state-warning-hover': 'var(--color-state-warning-hover)',
-  'state-warning-hover-alt': 'var(--color-state-warning-hover-alt)',
-  'state-warning-active': 'var(--color-state-warning-active)',
-  'state-warning-solid': 'var(--color-state-warning-solid)',
-  'state-warning-hover-transparent': 'var(--color-state-warning-hover-transparent)',
-
-  'effects-highlight': 'var(--color-effects-highlight)',
-  'effects-highlight-lightmode-off': 'var(--color-effects-highlight-lightmode-off)',
-  'effects-image-frame': 'var(--color-effects-image-frame)',
-  'effects-icon-border': 'var(--color-effects-icon-border)',
-  'effects-highlight-subtle': 'var(--color-effects-highlight-subtle)',
-
-  'util-colors-orange-dark-orange-dark-50': 'var(--color-util-colors-orange-dark-orange-dark-50)',
-  'util-colors-orange-dark-orange-dark-100': 'var(--color-util-colors-orange-dark-orange-dark-100)',
-  'util-colors-orange-dark-orange-dark-200': 'var(--color-util-colors-orange-dark-orange-dark-200)',
-  'util-colors-orange-dark-orange-dark-300': 'var(--color-util-colors-orange-dark-orange-dark-300)',
-  'util-colors-orange-dark-orange-dark-400': 'var(--color-util-colors-orange-dark-orange-dark-400)',
-  'util-colors-orange-dark-orange-dark-500': 'var(--color-util-colors-orange-dark-orange-dark-500)',
-  'util-colors-orange-dark-orange-dark-600': 'var(--color-util-colors-orange-dark-orange-dark-600)',
-  'util-colors-orange-dark-orange-dark-700': 'var(--color-util-colors-orange-dark-orange-dark-700)',
-
-  'util-colors-orange-orange-50': 'var(--color-util-colors-orange-orange-50)',
-  'util-colors-orange-orange-100': 'var(--color-util-colors-orange-orange-100)',
-  'util-colors-orange-orange-200': 'var(--color-util-colors-orange-orange-200)',
-  'util-colors-orange-orange-300': 'var(--color-util-colors-orange-orange-300)',
-  'util-colors-orange-orange-400': 'var(--color-util-colors-orange-orange-400)',
-  'util-colors-orange-orange-500': 'var(--color-util-colors-orange-orange-500)',
-  'util-colors-orange-orange-600': 'var(--color-util-colors-orange-orange-600)',
-  'util-colors-orange-orange-700': 'var(--color-util-colors-orange-orange-700)',
-  'util-colors-orange-orange-100-transparent': 'var(--color-util-colors-orange-orange-100-transparent)',
-
-  'util-colors-pink-pink-50': 'var(--color-util-colors-pink-pink-50)',
-  'util-colors-pink-pink-100': 'var(--color-util-colors-pink-pink-100)',
-  'util-colors-pink-pink-200': 'var(--color-util-colors-pink-pink-200)',
-  'util-colors-pink-pink-300': 'var(--color-util-colors-pink-pink-300)',
-  'util-colors-pink-pink-400': 'var(--color-util-colors-pink-pink-400)',
-  'util-colors-pink-pink-500': 'var(--color-util-colors-pink-pink-500)',
-  'util-colors-pink-pink-600': 'var(--color-util-colors-pink-pink-600)',
-  'util-colors-pink-pink-700': 'var(--color-util-colors-pink-pink-700)',
-
-  'util-colors-fuchsia-fuchsia-50': 'var(--color-util-colors-fuchsia-fuchsia-50)',
-  'util-colors-fuchsia-fuchsia-100': 'var(--color-util-colors-fuchsia-fuchsia-100)',
-  'util-colors-fuchsia-fuchsia-200': 'var(--color-util-colors-fuchsia-fuchsia-200)',
-  'util-colors-fuchsia-fuchsia-300': 'var(--color-util-colors-fuchsia-fuchsia-300)',
-  'util-colors-fuchsia-fuchsia-400': 'var(--color-util-colors-fuchsia-fuchsia-400)',
-  'util-colors-fuchsia-fuchsia-500': 'var(--color-util-colors-fuchsia-fuchsia-500)',
-  'util-colors-fuchsia-fuchsia-600': 'var(--color-util-colors-fuchsia-fuchsia-600)',
-  'util-colors-fuchsia-fuchsia-700': 'var(--color-util-colors-fuchsia-fuchsia-700)',
-
-  'util-colors-purple-purple-50': 'var(--color-util-colors-purple-purple-50)',
-  'util-colors-purple-purple-100': 'var(--color-util-colors-purple-purple-100)',
-  'util-colors-purple-purple-200': 'var(--color-util-colors-purple-purple-200)',
-  'util-colors-purple-purple-300': 'var(--color-util-colors-purple-purple-300)',
-  'util-colors-purple-purple-400': 'var(--color-util-colors-purple-purple-400)',
-  'util-colors-purple-purple-500': 'var(--color-util-colors-purple-purple-500)',
-  'util-colors-purple-purple-600': 'var(--color-util-colors-purple-purple-600)',
-  'util-colors-purple-purple-700': 'var(--color-util-colors-purple-purple-700)',
-
-  'util-colors-indigo-indigo-50': 'var(--color-util-colors-indigo-indigo-50)',
-  'util-colors-indigo-indigo-100': 'var(--color-util-colors-indigo-indigo-100)',
-  'util-colors-indigo-indigo-200': 'var(--color-util-colors-indigo-indigo-200)',
-  'util-colors-indigo-indigo-300': 'var(--color-util-colors-indigo-indigo-300)',
-  'util-colors-indigo-indigo-400': 'var(--color-util-colors-indigo-indigo-400)',
-  'util-colors-indigo-indigo-500': 'var(--color-util-colors-indigo-indigo-500)',
-  'util-colors-indigo-indigo-600': 'var(--color-util-colors-indigo-indigo-600)',
-  'util-colors-indigo-indigo-700': 'var(--color-util-colors-indigo-indigo-700)',
-
-  'util-colors-blue-blue-50': 'var(--color-util-colors-blue-blue-50)',
-  'util-colors-blue-blue-100': 'var(--color-util-colors-blue-blue-100)',
-  'util-colors-blue-blue-200': 'var(--color-util-colors-blue-blue-200)',
-  'util-colors-blue-blue-300': 'var(--color-util-colors-blue-blue-300)',
-  'util-colors-blue-blue-400': 'var(--color-util-colors-blue-blue-400)',
-  'util-colors-blue-blue-500': 'var(--color-util-colors-blue-blue-500)',
-  'util-colors-blue-blue-600': 'var(--color-util-colors-blue-blue-600)',
-  'util-colors-blue-blue-700': 'var(--color-util-colors-blue-blue-700)',
-
-  'util-colors-blue-light-blue-light-50': 'var(--color-util-colors-blue-light-blue-light-50)',
-  'util-colors-blue-light-blue-light-100': 'var(--color-util-colors-blue-light-blue-light-100)',
-  'util-colors-blue-light-blue-light-200': 'var(--color-util-colors-blue-light-blue-light-200)',
-  'util-colors-blue-light-blue-light-300': 'var(--color-util-colors-blue-light-blue-light-300)',
-  'util-colors-blue-light-blue-light-400': 'var(--color-util-colors-blue-light-blue-light-400)',
-  'util-colors-blue-light-blue-light-500': 'var(--color-util-colors-blue-light-blue-light-500)',
-  'util-colors-blue-light-blue-light-600': 'var(--color-util-colors-blue-light-blue-light-600)',
-  'util-colors-blue-light-blue-light-700': 'var(--color-util-colors-blue-light-blue-light-700)',
-
-  'util-colors-gray-blue-gray-blue-50': 'var(--color-util-colors-gray-blue-gray-blue-50)',
-  'util-colors-gray-blue-gray-blue-100': 'var(--color-util-colors-gray-blue-gray-blue-100)',
-  'util-colors-gray-blue-gray-blue-200': 'var(--color-util-colors-gray-blue-gray-blue-200)',
-  'util-colors-gray-blue-gray-blue-300': 'var(--color-util-colors-gray-blue-gray-blue-300)',
-  'util-colors-gray-blue-gray-blue-400': 'var(--color-util-colors-gray-blue-gray-blue-400)',
-  'util-colors-gray-blue-gray-blue-500': 'var(--color-util-colors-gray-blue-gray-blue-500)',
-  'util-colors-gray-blue-gray-blue-600': 'var(--color-util-colors-gray-blue-gray-blue-600)',
-  'util-colors-gray-blue-gray-blue-700': 'var(--color-util-colors-gray-blue-gray-blue-700)',
-
-  'util-colors-blue-brand-blue-brand-50': 'var(--color-util-colors-blue-brand-blue-brand-50)',
-  'util-colors-blue-brand-blue-brand-100': 'var(--color-util-colors-blue-brand-blue-brand-100)',
-  'util-colors-blue-brand-blue-brand-200': 'var(--color-util-colors-blue-brand-blue-brand-200)',
-  'util-colors-blue-brand-blue-brand-300': 'var(--color-util-colors-blue-brand-blue-brand-300)',
-  'util-colors-blue-brand-blue-brand-400': 'var(--color-util-colors-blue-brand-blue-brand-400)',
-  'util-colors-blue-brand-blue-brand-500': 'var(--color-util-colors-blue-brand-blue-brand-500)',
-  'util-colors-blue-brand-blue-brand-600': 'var(--color-util-colors-blue-brand-blue-brand-600)',
-  'util-colors-blue-brand-blue-brand-700': 'var(--color-util-colors-blue-brand-blue-brand-700)',
-
-  'util-colors-red-red-50': 'var(--color-util-colors-red-red-50)',
-  'util-colors-red-red-100': 'var(--color-util-colors-red-red-100)',
-  'util-colors-red-red-200': 'var(--color-util-colors-red-red-200)',
-  'util-colors-red-red-300': 'var(--color-util-colors-red-red-300)',
-  'util-colors-red-red-400': 'var(--color-util-colors-red-red-400)',
-  'util-colors-red-red-500': 'var(--color-util-colors-red-red-500)',
-  'util-colors-red-red-600': 'var(--color-util-colors-red-red-600)',
-  'util-colors-red-red-700': 'var(--color-util-colors-red-red-700)',
-
-  'util-colors-green-green-50': 'var(--color-util-colors-green-green-50)',
-  'util-colors-green-green-100': 'var(--color-util-colors-green-green-100)',
-  'util-colors-green-green-200': 'var(--color-util-colors-green-green-200)',
-  'util-colors-green-green-300': 'var(--color-util-colors-green-green-300)',
-  'util-colors-green-green-400': 'var(--color-util-colors-green-green-400)',
-  'util-colors-green-green-500': 'var(--color-util-colors-green-green-500)',
-  'util-colors-green-green-600': 'var(--color-util-colors-green-green-600)',
-  'util-colors-green-green-700': 'var(--color-util-colors-green-green-700)',
-
-  'util-colors-warning-warning-50': 'var(--color-util-colors-warning-warning-50)',
-  'util-colors-warning-warning-100': 'var(--color-util-colors-warning-warning-100)',
-  'util-colors-warning-warning-200': 'var(--color-util-colors-warning-warning-200)',
-  'util-colors-warning-warning-300': 'var(--color-util-colors-warning-warning-300)',
-  'util-colors-warning-warning-400': 'var(--color-util-colors-warning-warning-400)',
-  'util-colors-warning-warning-500': 'var(--color-util-colors-warning-warning-500)',
-  'util-colors-warning-warning-600': 'var(--color-util-colors-warning-warning-600)',
-  'util-colors-warning-warning-700': 'var(--color-util-colors-warning-warning-700)',
-
-  'util-colors-yellow-yellow-50': 'var(--color-util-colors-yellow-yellow-50)',
-  'util-colors-yellow-yellow-100': 'var(--color-util-colors-yellow-yellow-100)',
-  'util-colors-yellow-yellow-200': 'var(--color-util-colors-yellow-yellow-200)',
-  'util-colors-yellow-yellow-300': 'var(--color-util-colors-yellow-yellow-300)',
-  'util-colors-yellow-yellow-400': 'var(--color-util-colors-yellow-yellow-400)',
-  'util-colors-yellow-yellow-500': 'var(--color-util-colors-yellow-yellow-500)',
-  'util-colors-yellow-yellow-600': 'var(--color-util-colors-yellow-yellow-600)',
-  'util-colors-yellow-yellow-700': 'var(--color-util-colors-yellow-yellow-700)',
-
-  'util-colors-teal-teal-50': 'var(--color-util-colors-teal-teal-50)',
-  'util-colors-teal-teal-100': 'var(--color-util-colors-teal-teal-100)',
-  'util-colors-teal-teal-200': 'var(--color-util-colors-teal-teal-200)',
-  'util-colors-teal-teal-300': 'var(--color-util-colors-teal-teal-300)',
-  'util-colors-teal-teal-400': 'var(--color-util-colors-teal-teal-400)',
-  'util-colors-teal-teal-500': 'var(--color-util-colors-teal-teal-500)',
-  'util-colors-teal-teal-600': 'var(--color-util-colors-teal-teal-600)',
-  'util-colors-teal-teal-700': 'var(--color-util-colors-teal-teal-700)',
-
-  'util-colors-cyan-cyan-50': 'var(--color-util-colors-cyan-cyan-50)',
-  'util-colors-cyan-cyan-100': 'var(--color-util-colors-cyan-cyan-100)',
-  'util-colors-cyan-cyan-200': 'var(--color-util-colors-cyan-cyan-200)',
-  'util-colors-cyan-cyan-300': 'var(--color-util-colors-cyan-cyan-300)',
-  'util-colors-cyan-cyan-400': 'var(--color-util-colors-cyan-cyan-400)',
-  'util-colors-cyan-cyan-500': 'var(--color-util-colors-cyan-cyan-500)',
-  'util-colors-cyan-cyan-600': 'var(--color-util-colors-cyan-cyan-600)',
-  'util-colors-cyan-cyan-700': 'var(--color-util-colors-cyan-cyan-700)',
-
-  'util-colors-violet-violet-50': 'var(--color-util-colors-violet-violet-50)',
-  'util-colors-violet-violet-100': 'var(--color-util-colors-violet-violet-100)',
-  'util-colors-violet-violet-200': 'var(--color-util-colors-violet-violet-200)',
-  'util-colors-violet-violet-300': 'var(--color-util-colors-violet-violet-300)',
-  'util-colors-violet-violet-400': 'var(--color-util-colors-violet-violet-400)',
-  'util-colors-violet-violet-500': 'var(--color-util-colors-violet-violet-500)',
-  'util-colors-violet-violet-600': 'var(--color-util-colors-violet-violet-600)',
-  'util-colors-violet-violet-700': 'var(--color-util-colors-violet-violet-700)',
-
-  'util-colors-gray-gray-50': 'var(--color-util-colors-gray-gray-50)',
-  'util-colors-gray-gray-100': 'var(--color-util-colors-gray-gray-100)',
-  'util-colors-gray-gray-200': 'var(--color-util-colors-gray-gray-200)',
-  'util-colors-gray-gray-300': 'var(--color-util-colors-gray-gray-300)',
-  'util-colors-gray-gray-400': 'var(--color-util-colors-gray-gray-400)',
-  'util-colors-gray-gray-500': 'var(--color-util-colors-gray-gray-500)',
-  'util-colors-gray-gray-600': 'var(--color-util-colors-gray-gray-600)',
-  'util-colors-gray-gray-700': 'var(--color-util-colors-gray-gray-700)',
-
-  'util-colors-green-light-green-light-50': 'var(--color-util-colors-green-light-green-light-50)',
-  'util-colors-green-light-green-light-100': 'var(--color-util-colors-green-light-green-light-100)',
-  'util-colors-green-light-green-light-200': 'var(--color-util-colors-green-light-green-light-200)',
-  'util-colors-green-light-green-light-300': 'var(--color-util-colors-green-light-green-light-300)',
-  'util-colors-green-light-green-light-500': 'var(--color-util-colors-green-light-green-light-500)',
-  'util-colors-green-light-green-light-400': 'var(--color-util-colors-green-light-green-light-400)',
-  'util-colors-green-light-green-light-600': 'var(--color-util-colors-green-light-green-light-600)',
-  'util-colors-green-light-green-light-700': 'var(--color-util-colors-green-light-green-light-700)',
-
-  'util-colors-rose-rose-50': 'var(--color-util-colors-rose-rose-50)',
-  'util-colors-rose-rose-100': 'var(--color-util-colors-rose-rose-100)',
-  'util-colors-rose-rose-200': 'var(--color-util-colors-rose-rose-200)',
-  'util-colors-rose-rose-300': 'var(--color-util-colors-rose-rose-300)',
-  'util-colors-rose-rose-400': 'var(--color-util-colors-rose-rose-400)',
-  'util-colors-rose-rose-500': 'var(--color-util-colors-rose-rose-500)',
-  'util-colors-rose-rose-600': 'var(--color-util-colors-rose-rose-600)',
-  'util-colors-rose-rose-700': 'var(--color-util-colors-rose-rose-700)',
-
-  'util-colors-midnight-midnight-50': 'var(--color-util-colors-midnight-midnight-50)',
-  'util-colors-midnight-midnight-100': 'var(--color-util-colors-midnight-midnight-100)',
-  'util-colors-midnight-midnight-200': 'var(--color-util-colors-midnight-midnight-200)',
-  'util-colors-midnight-midnight-300': 'var(--color-util-colors-midnight-midnight-300)',
-  'util-colors-midnight-midnight-400': 'var(--color-util-colors-midnight-midnight-400)',
-  'util-colors-midnight-midnight-500': 'var(--color-util-colors-midnight-midnight-500)',
-  'util-colors-midnight-midnight-600': 'var(--color-util-colors-midnight-midnight-600)',
-  'util-colors-midnight-midnight-700': 'var(--color-util-colors-midnight-midnight-700)',
-
-  'third-party-LangChain': 'var(--color-third-party-LangChain)',
-  'third-party-Langfuse': 'var(--color-third-party-Langfuse)',
-  'third-party-Github': 'var(--color-third-party-Github)',
-  'third-party-Github-tertiary': 'var(--color-third-party-Github-tertiary)',
-  'third-party-Github-secondary': 'var(--color-third-party-Github-secondary)',
-  'third-party-model-bg-openai': 'var(--color-third-party-model-bg-openai)',
-  'third-party-model-bg-anthropic': 'var(--color-third-party-model-bg-anthropic)',
-  'third-party-model-bg-default': 'var(--color-third-party-model-bg-default)',
-
-  'third-party-aws': 'var(--color-third-party-aws)',
-  'third-party-aws-alt': 'var(--color-third-party-aws-alt)',
-
-  'saas-background': 'var(--color-saas-background)',
-  'saas-pricing-grid-bg': 'var(--color-saas-pricing-grid-bg)',
-  'saas-dify-blue-static': 'var(--color-saas-dify-blue-static)',
-  'saas-dify-blue-static-hover': 'var(--color-saas-dify-blue-static-hover)',
-  'saas-dify-blue-accessible': 'var(--color-saas-dify-blue-accessible)',
-  'saas-dify-blue-inverted': 'var(--color-saas-dify-blue-inverted)',
-  'saas-dify-blue-inverted-dimmed': 'var(--color-saas-dify-blue-inverted-dimmed)',
-
-  'saas-background-inverted': 'var(--color-saas-background-inverted)',
-  'saas-background-inverted-hover': 'var(--color-saas-background-inverted-hover)',
-
-  'dify-logo-blue': 'var(--color-dify-logo-blue)',
-  'dify-logo-black': 'var(--color-dify-logo-black)',
-  'dify-logo-outline-1': 'var(--color-dify-logo-outline-1)',
-  'dify-logo-outline-2': 'var(--color-dify-logo-outline-2)',
-
-}
-export default vars
diff --git a/packages/dify-ui/src/themes/theme.css b/packages/dify-ui/src/themes/theme.css
new file mode 100644
index 0000000000..04e02d852c
--- /dev/null
+++ b/packages/dify-ui/src/themes/theme.css
@@ -0,0 +1,772 @@
+/* Attention: Generated. Do not edit by hand. */
+/*
+ * Semantic design tokens. Each entry registers a Tailwind v4 utility
+ * (e.g. bg-components-input-bg-normal) that resolves to var(--color-...).
+ * Runtime values come from themes/light.css and themes/dark.css scoped
+ * under html[data-theme=...] — @theme inline avoids duplicating them at :root.
+ */
+
+@theme inline {
+  --color-components-input-bg-normal: var(--color-components-input-bg-normal);
+  --color-components-input-text-placeholder: var(--color-components-input-text-placeholder);
+  --color-components-input-bg-hover: var(--color-components-input-bg-hover);
+  --color-components-input-bg-active: var(--color-components-input-bg-active);
+  --color-components-input-border-active: var(--color-components-input-border-active);
+  --color-components-input-border-destructive: var(--color-components-input-border-destructive);
+  --color-components-input-text-filled: var(--color-components-input-text-filled);
+  --color-components-input-bg-destructive: var(--color-components-input-bg-destructive);
+  --color-components-input-bg-disabled: var(--color-components-input-bg-disabled);
+  --color-components-input-text-disabled: var(--color-components-input-text-disabled);
+  --color-components-input-text-filled-disabled: var(--color-components-input-text-filled-disabled);
+  --color-components-input-border-hover: var(--color-components-input-border-hover);
+  --color-components-input-border-active-prompt-1: var(--color-components-input-border-active-prompt-1);
+  --color-components-input-border-active-prompt-2: var(--color-components-input-border-active-prompt-2);
+
+  --color-components-kbd-bg-gray: var(--color-components-kbd-bg-gray);
+  --color-components-kbd-bg-white: var(--color-components-kbd-bg-white);
+
+  --color-components-tooltip-bg: var(--color-components-tooltip-bg);
+
+  --color-components-button-primary-text: var(--color-components-button-primary-text);
+  --color-components-button-primary-bg: var(--color-components-button-primary-bg);
+  --color-components-button-primary-border: var(--color-components-button-primary-border);
+  --color-components-button-primary-bg-hover: var(--color-components-button-primary-bg-hover);
+  --color-components-button-primary-border-hover: var(--color-components-button-primary-border-hover);
+  --color-components-button-primary-bg-disabled: var(--color-components-button-primary-bg-disabled);
+  --color-components-button-primary-border-disabled: var(--color-components-button-primary-border-disabled);
+  --color-components-button-primary-text-disabled: var(--color-components-button-primary-text-disabled);
+
+  --color-components-button-secondary-text: var(--color-components-button-secondary-text);
+  --color-components-button-secondary-text-disabled: var(--color-components-button-secondary-text-disabled);
+  --color-components-button-secondary-bg: var(--color-components-button-secondary-bg);
+  --color-components-button-secondary-bg-hover: var(--color-components-button-secondary-bg-hover);
+  --color-components-button-secondary-bg-disabled: var(--color-components-button-secondary-bg-disabled);
+  --color-components-button-secondary-border: var(--color-components-button-secondary-border);
+  --color-components-button-secondary-border-hover: var(--color-components-button-secondary-border-hover);
+  --color-components-button-secondary-border-disabled: var(--color-components-button-secondary-border-disabled);
+
+  --color-components-button-tertiary-text: var(--color-components-button-tertiary-text);
+  --color-components-button-tertiary-text-disabled: var(--color-components-button-tertiary-text-disabled);
+  --color-components-button-tertiary-bg: var(--color-components-button-tertiary-bg);
+  --color-components-button-tertiary-bg-hover: var(--color-components-button-tertiary-bg-hover);
+  --color-components-button-tertiary-bg-disabled: var(--color-components-button-tertiary-bg-disabled);
+
+  --color-components-button-ghost-text: var(--color-components-button-ghost-text);
+  --color-components-button-ghost-text-disabled: var(--color-components-button-ghost-text-disabled);
+  --color-components-button-ghost-bg-hover: var(--color-components-button-ghost-bg-hover);
+
+  --color-components-button-destructive-primary-text: var(--color-components-button-destructive-primary-text);
+  --color-components-button-destructive-primary-text-disabled: var(--color-components-button-destructive-primary-text-disabled);
+  --color-components-button-destructive-primary-bg: var(--color-components-button-destructive-primary-bg);
+  --color-components-button-destructive-primary-bg-hover: var(--color-components-button-destructive-primary-bg-hover);
+  --color-components-button-destructive-primary-bg-disabled: var(--color-components-button-destructive-primary-bg-disabled);
+  --color-components-button-destructive-primary-border: var(--color-components-button-destructive-primary-border);
+  --color-components-button-destructive-primary-border-hover: var(--color-components-button-destructive-primary-border-hover);
+  --color-components-button-destructive-primary-border-disabled: var(--color-components-button-destructive-primary-border-disabled);
+
+  --color-components-button-destructive-secondary-text: var(--color-components-button-destructive-secondary-text);
+  --color-components-button-destructive-secondary-text-disabled: var(--color-components-button-destructive-secondary-text-disabled);
+  --color-components-button-destructive-secondary-bg: var(--color-components-button-destructive-secondary-bg);
+  --color-components-button-destructive-secondary-bg-hover: var(--color-components-button-destructive-secondary-bg-hover);
+  --color-components-button-destructive-secondary-bg-disabled: var(--color-components-button-destructive-secondary-bg-disabled);
+  --color-components-button-destructive-secondary-border: var(--color-components-button-destructive-secondary-border);
+  --color-components-button-destructive-secondary-border-hover: var(--color-components-button-destructive-secondary-border-hover);
+  --color-components-button-destructive-secondary-border-disabled: var(--color-components-button-destructive-secondary-border-disabled);
+
+  --color-components-button-destructive-tertiary-text: var(--color-components-button-destructive-tertiary-text);
+  --color-components-button-destructive-tertiary-text-disabled: var(--color-components-button-destructive-tertiary-text-disabled);
+  --color-components-button-destructive-tertiary-bg: var(--color-components-button-destructive-tertiary-bg);
+  --color-components-button-destructive-tertiary-bg-hover: var(--color-components-button-destructive-tertiary-bg-hover);
+  --color-components-button-destructive-tertiary-bg-disabled: var(--color-components-button-destructive-tertiary-bg-disabled);
+
+  --color-components-button-destructive-ghost-text: var(--color-components-button-destructive-ghost-text);
+  --color-components-button-destructive-ghost-text-disabled: var(--color-components-button-destructive-ghost-text-disabled);
+  --color-components-button-destructive-ghost-bg-hover: var(--color-components-button-destructive-ghost-bg-hover);
+
+  --color-components-button-secondary-accent-text: var(--color-components-button-secondary-accent-text);
+  --color-components-button-secondary-accent-text-disabled: var(--color-components-button-secondary-accent-text-disabled);
+  --color-components-button-secondary-accent-bg: var(--color-components-button-secondary-accent-bg);
+  --color-components-button-secondary-accent-bg-hover: var(--color-components-button-secondary-accent-bg-hover);
+  --color-components-button-secondary-accent-bg-disabled: var(--color-components-button-secondary-accent-bg-disabled);
+  --color-components-button-secondary-accent-border: var(--color-components-button-secondary-accent-border);
+  --color-components-button-secondary-accent-border-hover: var(--color-components-button-secondary-accent-border-hover);
+  --color-components-button-secondary-accent-border-disabled: var(--color-components-button-secondary-accent-border-disabled);
+
+  --color-components-button-indigo-bg: var(--color-components-button-indigo-bg);
+  --color-components-button-indigo-bg-hover: var(--color-components-button-indigo-bg-hover);
+  --color-components-button-indigo-bg-disabled: var(--color-components-button-indigo-bg-disabled);
+
+  --color-components-checkbox-icon: var(--color-components-checkbox-icon);
+  --color-components-checkbox-icon-disabled: var(--color-components-checkbox-icon-disabled);
+  --color-components-checkbox-bg: var(--color-components-checkbox-bg);
+  --color-components-checkbox-bg-hover: var(--color-components-checkbox-bg-hover);
+  --color-components-checkbox-bg-disabled: var(--color-components-checkbox-bg-disabled);
+  --color-components-checkbox-border: var(--color-components-checkbox-border);
+  --color-components-checkbox-border-hover: var(--color-components-checkbox-border-hover);
+  --color-components-checkbox-border-disabled: var(--color-components-checkbox-border-disabled);
+  --color-components-checkbox-bg-unchecked: var(--color-components-checkbox-bg-unchecked);
+  --color-components-checkbox-bg-unchecked-hover: var(--color-components-checkbox-bg-unchecked-hover);
+  --color-components-checkbox-bg-disabled-checked: var(--color-components-checkbox-bg-disabled-checked);
+
+  --color-components-radio-border-checked: var(--color-components-radio-border-checked);
+  --color-components-radio-border-checked-hover: var(--color-components-radio-border-checked-hover);
+  --color-components-radio-border-checked-disabled: var(--color-components-radio-border-checked-disabled);
+  --color-components-radio-bg-disabled: var(--color-components-radio-bg-disabled);
+  --color-components-radio-border: var(--color-components-radio-border);
+  --color-components-radio-border-hover: var(--color-components-radio-border-hover);
+  --color-components-radio-border-disabled: var(--color-components-radio-border-disabled);
+  --color-components-radio-bg: var(--color-components-radio-bg);
+  --color-components-radio-bg-hover: var(--color-components-radio-bg-hover);
+
+  --color-components-toggle-knob: var(--color-components-toggle-knob);
+  --color-components-toggle-knob-disabled: var(--color-components-toggle-knob-disabled);
+  --color-components-toggle-bg: var(--color-components-toggle-bg);
+  --color-components-toggle-bg-hover: var(--color-components-toggle-bg-hover);
+  --color-components-toggle-bg-disabled: var(--color-components-toggle-bg-disabled);
+  --color-components-toggle-bg-unchecked: var(--color-components-toggle-bg-unchecked);
+  --color-components-toggle-bg-unchecked-hover: var(--color-components-toggle-bg-unchecked-hover);
+  --color-components-toggle-bg-unchecked-disabled: var(--color-components-toggle-bg-unchecked-disabled);
+  --color-components-toggle-knob-hover: var(--color-components-toggle-knob-hover);
+
+  --color-components-card-bg: var(--color-components-card-bg);
+  --color-components-card-border: var(--color-components-card-border);
+  --color-components-card-bg-alt: var(--color-components-card-bg-alt);
+  --color-components-card-bg-transparent: var(--color-components-card-bg-transparent);
+  --color-components-card-bg-alt-transparent: var(--color-components-card-bg-alt-transparent);
+
+  --color-components-menu-item-text: var(--color-components-menu-item-text);
+  --color-components-menu-item-text-active: var(--color-components-menu-item-text-active);
+  --color-components-menu-item-text-hover: var(--color-components-menu-item-text-hover);
+  --color-components-menu-item-text-active-accent: var(--color-components-menu-item-text-active-accent);
+  --color-components-menu-item-bg-active: var(--color-components-menu-item-bg-active);
+  --color-components-menu-item-bg-hover: var(--color-components-menu-item-bg-hover);
+
+  --color-components-panel-bg: var(--color-components-panel-bg);
+  --color-components-panel-bg-blur: var(--color-components-panel-bg-blur);
+  --color-components-panel-border: var(--color-components-panel-border);
+  --color-components-panel-border-subtle: var(--color-components-panel-border-subtle);
+  --color-components-panel-gradient-2: var(--color-components-panel-gradient-2);
+  --color-components-panel-gradient-1: var(--color-components-panel-gradient-1);
+  --color-components-panel-bg-alt: var(--color-components-panel-bg-alt);
+  --color-components-panel-on-panel-item-bg: var(--color-components-panel-on-panel-item-bg);
+  --color-components-panel-on-panel-item-bg-hover: var(--color-components-panel-on-panel-item-bg-hover);
+  --color-components-panel-on-panel-item-bg-alt: var(--color-components-panel-on-panel-item-bg-alt);
+  --color-components-panel-on-panel-item-bg-transparent: var(--color-components-panel-on-panel-item-bg-transparent);
+  --color-components-panel-on-panel-item-bg-hover-transparent: var(--color-components-panel-on-panel-item-bg-hover-transparent);
+  --color-components-panel-on-panel-item-bg-destructive-hover-transparent: var(--color-components-panel-on-panel-item-bg-destructive-hover-transparent);
+
+  --color-components-panel-bg-transparent: var(--color-components-panel-bg-transparent);
+
+  --color-components-main-nav-nav-button-text: var(--color-components-main-nav-nav-button-text);
+  --color-components-main-nav-nav-button-text-active: var(--color-components-main-nav-nav-button-text-active);
+  --color-components-main-nav-nav-button-bg: var(--color-components-main-nav-nav-button-bg);
+  --color-components-main-nav-nav-button-bg-active: var(--color-components-main-nav-nav-button-bg-active);
+  --color-components-main-nav-nav-button-border: var(--color-components-main-nav-nav-button-border);
+  --color-components-main-nav-nav-button-bg-hover: var(--color-components-main-nav-nav-button-bg-hover);
+
+  --color-components-main-nav-nav-user-border: var(--color-components-main-nav-nav-user-border);
+
+  --color-components-slider-knob: var(--color-components-slider-knob);
+  --color-components-slider-knob-hover: var(--color-components-slider-knob-hover);
+  --color-components-slider-knob-disabled: var(--color-components-slider-knob-disabled);
+  --color-components-slider-range: var(--color-components-slider-range);
+  --color-components-slider-track: var(--color-components-slider-track);
+  --color-components-slider-knob-border-hover: var(--color-components-slider-knob-border-hover);
+  --color-components-slider-knob-border: var(--color-components-slider-knob-border);
+
+  --color-components-segmented-control-item-active-bg: var(--color-components-segmented-control-item-active-bg);
+  --color-components-segmented-control-item-active-border: var(--color-components-segmented-control-item-active-border);
+  --color-components-segmented-control-bg-normal: var(--color-components-segmented-control-bg-normal);
+  --color-components-segmented-control-item-active-accent-bg: var(--color-components-segmented-control-item-active-accent-bg);
+  --color-components-segmented-control-item-active-accent-border: var(--color-components-segmented-control-item-active-accent-border);
+
+  --color-components-option-card-option-bg: var(--color-components-option-card-option-bg);
+  --color-components-option-card-option-selected-bg: var(--color-components-option-card-option-selected-bg);
+  --color-components-option-card-option-selected-border: var(--color-components-option-card-option-selected-border);
+  --color-components-option-card-option-border: var(--color-components-option-card-option-border);
+  --color-components-option-card-option-bg-hover: var(--color-components-option-card-option-bg-hover);
+  --color-components-option-card-option-border-hover: var(--color-components-option-card-option-border-hover);
+
+  --color-components-tab-active: var(--color-components-tab-active);
+
+  --color-components-badge-white-to-dark: var(--color-components-badge-white-to-dark);
+  --color-components-badge-status-light-success-bg: var(--color-components-badge-status-light-success-bg);
+  --color-components-badge-status-light-success-border-inner: var(--color-components-badge-status-light-success-border-inner);
+  --color-components-badge-status-light-success-halo: var(--color-components-badge-status-light-success-halo);
+
+  --color-components-badge-status-light-border-outer: var(--color-components-badge-status-light-border-outer);
+  --color-components-badge-status-light-high-light: var(--color-components-badge-status-light-high-light);
+  --color-components-badge-status-light-warning-bg: var(--color-components-badge-status-light-warning-bg);
+  --color-components-badge-status-light-warning-border-inner: var(--color-components-badge-status-light-warning-border-inner);
+  --color-components-badge-status-light-warning-halo: var(--color-components-badge-status-light-warning-halo);
+
+  --color-components-badge-status-light-error-bg: var(--color-components-badge-status-light-error-bg);
+  --color-components-badge-status-light-error-border-inner: var(--color-components-badge-status-light-error-border-inner);
+  --color-components-badge-status-light-error-halo: var(--color-components-badge-status-light-error-halo);
+
+  --color-components-badge-status-light-normal-bg: var(--color-components-badge-status-light-normal-bg);
+  --color-components-badge-status-light-normal-border-inner: var(--color-components-badge-status-light-normal-border-inner);
+  --color-components-badge-status-light-normal-halo: var(--color-components-badge-status-light-normal-halo);
+
+  --color-components-badge-status-light-disabled-bg: var(--color-components-badge-status-light-disabled-bg);
+  --color-components-badge-status-light-disabled-border-inner: var(--color-components-badge-status-light-disabled-border-inner);
+  --color-components-badge-status-light-disabled-halo: var(--color-components-badge-status-light-disabled-halo);
+
+  --color-components-badge-bg-green-soft: var(--color-components-badge-bg-green-soft);
+  --color-components-badge-bg-orange-soft: var(--color-components-badge-bg-orange-soft);
+  --color-components-badge-bg-red-soft: var(--color-components-badge-bg-red-soft);
+  --color-components-badge-bg-blue-light-soft: var(--color-components-badge-bg-blue-light-soft);
+  --color-components-badge-bg-gray-soft: var(--color-components-badge-bg-gray-soft);
+  --color-components-badge-bg-dimm: var(--color-components-badge-bg-dimm);
+
+  --color-components-chart-line: var(--color-components-chart-line);
+  --color-components-chart-area-1: var(--color-components-chart-area-1);
+  --color-components-chart-area-2: var(--color-components-chart-area-2);
+  --color-components-chart-current-1: var(--color-components-chart-current-1);
+  --color-components-chart-current-2: var(--color-components-chart-current-2);
+  --color-components-chart-bg: var(--color-components-chart-bg);
+
+  --color-components-actionbar-bg: var(--color-components-actionbar-bg);
+  --color-components-actionbar-border: var(--color-components-actionbar-border);
+  --color-components-actionbar-bg-accent: var(--color-components-actionbar-bg-accent);
+  --color-components-actionbar-border-accent: var(--color-components-actionbar-border-accent);
+
+  --color-components-dropzone-bg-alt: var(--color-components-dropzone-bg-alt);
+  --color-components-dropzone-bg: var(--color-components-dropzone-bg);
+  --color-components-dropzone-bg-accent: var(--color-components-dropzone-bg-accent);
+  --color-components-dropzone-border: var(--color-components-dropzone-border);
+  --color-components-dropzone-border-alt: var(--color-components-dropzone-border-alt);
+  --color-components-dropzone-border-accent: var(--color-components-dropzone-border-accent);
+
+  --color-components-progress-brand-progress: var(--color-components-progress-brand-progress);
+  --color-components-progress-brand-border: var(--color-components-progress-brand-border);
+  --color-components-progress-brand-bg: var(--color-components-progress-brand-bg);
+
+  --color-components-progress-white-progress: var(--color-components-progress-white-progress);
+  --color-components-progress-white-border: var(--color-components-progress-white-border);
+  --color-components-progress-white-bg: var(--color-components-progress-white-bg);
+
+  --color-components-progress-gray-progress: var(--color-components-progress-gray-progress);
+  --color-components-progress-gray-border: var(--color-components-progress-gray-border);
+  --color-components-progress-gray-bg: var(--color-components-progress-gray-bg);
+
+  --color-components-progress-warning-progress: var(--color-components-progress-warning-progress);
+  --color-components-progress-warning-border: var(--color-components-progress-warning-border);
+  --color-components-progress-warning-bg: var(--color-components-progress-warning-bg);
+
+  --color-components-progress-error-progress: var(--color-components-progress-error-progress);
+  --color-components-progress-error-border: var(--color-components-progress-error-border);
+  --color-components-progress-error-bg: var(--color-components-progress-error-bg);
+
+  --color-components-chat-input-audio-bg: var(--color-components-chat-input-audio-bg);
+  --color-components-chat-input-audio-wave-default: var(--color-components-chat-input-audio-wave-default);
+  --color-components-chat-input-bg-mask-1: var(--color-components-chat-input-bg-mask-1);
+  --color-components-chat-input-bg-mask-2: var(--color-components-chat-input-bg-mask-2);
+  --color-components-chat-input-border: var(--color-components-chat-input-border);
+  --color-components-chat-input-audio-wave-active: var(--color-components-chat-input-audio-wave-active);
+  --color-components-chat-input-audio-bg-alt: var(--color-components-chat-input-audio-bg-alt);
+
+  --color-components-avatar-shape-fill-stop-0: var(--color-components-avatar-shape-fill-stop-0);
+  --color-components-avatar-shape-fill-stop-100: var(--color-components-avatar-shape-fill-stop-100);
+
+  --color-components-avatar-bg-mask-stop-0: var(--color-components-avatar-bg-mask-stop-0);
+  --color-components-avatar-bg-mask-stop-100: var(--color-components-avatar-bg-mask-stop-100);
+
+  --color-components-avatar-default-avatar-bg: var(--color-components-avatar-default-avatar-bg);
+  --color-components-avatar-mask-darkmode-dimmed: var(--color-components-avatar-mask-darkmode-dimmed);
+
+  --color-components-label-gray: var(--color-components-label-gray);
+
+  --color-components-premium-badge-blue-bg-stop-0: var(--color-components-premium-badge-blue-bg-stop-0);
+  --color-components-premium-badge-blue-bg-stop-100: var(--color-components-premium-badge-blue-bg-stop-100);
+  --color-components-premium-badge-blue-stroke-stop-0: var(--color-components-premium-badge-blue-stroke-stop-0);
+  --color-components-premium-badge-blue-stroke-stop-100: var(--color-components-premium-badge-blue-stroke-stop-100);
+  --color-components-premium-badge-blue-text-stop-0: var(--color-components-premium-badge-blue-text-stop-0);
+  --color-components-premium-badge-blue-text-stop-100: var(--color-components-premium-badge-blue-text-stop-100);
+  --color-components-premium-badge-blue-glow: var(--color-components-premium-badge-blue-glow);
+  --color-components-premium-badge-blue-bg-stop-0-hover: var(--color-components-premium-badge-blue-bg-stop-0-hover);
+  --color-components-premium-badge-blue-bg-stop-100-hover: var(--color-components-premium-badge-blue-bg-stop-100-hover);
+  --color-components-premium-badge-blue-glow-hover: var(--color-components-premium-badge-blue-glow-hover);
+  --color-components-premium-badge-blue-stroke-stop-0-hover: var(--color-components-premium-badge-blue-stroke-stop-0-hover);
+  --color-components-premium-badge-blue-stroke-stop-100-hover: var(--color-components-premium-badge-blue-stroke-stop-100-hover);
+
+  --color-components-premium-badge-highlight-stop-0: var(--color-components-premium-badge-highlight-stop-0);
+  --color-components-premium-badge-highlight-stop-100: var(--color-components-premium-badge-highlight-stop-100);
+  --color-components-premium-badge-indigo-bg-stop-0: var(--color-components-premium-badge-indigo-bg-stop-0);
+  --color-components-premium-badge-indigo-bg-stop-100: var(--color-components-premium-badge-indigo-bg-stop-100);
+  --color-components-premium-badge-indigo-stroke-stop-0: var(--color-components-premium-badge-indigo-stroke-stop-0);
+  --color-components-premium-badge-indigo-stroke-stop-100: var(--color-components-premium-badge-indigo-stroke-stop-100);
+  --color-components-premium-badge-indigo-text-stop-0: var(--color-components-premium-badge-indigo-text-stop-0);
+  --color-components-premium-badge-indigo-text-stop-100: var(--color-components-premium-badge-indigo-text-stop-100);
+  --color-components-premium-badge-indigo-glow: var(--color-components-premium-badge-indigo-glow);
+  --color-components-premium-badge-indigo-glow-hover: var(--color-components-premium-badge-indigo-glow-hover);
+  --color-components-premium-badge-indigo-bg-stop-0-hover: var(--color-components-premium-badge-indigo-bg-stop-0-hover);
+  --color-components-premium-badge-indigo-bg-stop-100-hover: var(--color-components-premium-badge-indigo-bg-stop-100-hover);
+  --color-components-premium-badge-indigo-stroke-stop-0-hover: var(--color-components-premium-badge-indigo-stroke-stop-0-hover);
+  --color-components-premium-badge-indigo-stroke-stop-100-hover: var(--color-components-premium-badge-indigo-stroke-stop-100-hover);
+
+  --color-components-premium-badge-grey-bg-stop-0: var(--color-components-premium-badge-grey-bg-stop-0);
+  --color-components-premium-badge-grey-bg-stop-100: var(--color-components-premium-badge-grey-bg-stop-100);
+  --color-components-premium-badge-grey-stroke-stop-0: var(--color-components-premium-badge-grey-stroke-stop-0);
+  --color-components-premium-badge-grey-stroke-stop-100: var(--color-components-premium-badge-grey-stroke-stop-100);
+  --color-components-premium-badge-grey-text-stop-0: var(--color-components-premium-badge-grey-text-stop-0);
+  --color-components-premium-badge-grey-text-stop-100: var(--color-components-premium-badge-grey-text-stop-100);
+  --color-components-premium-badge-grey-glow: var(--color-components-premium-badge-grey-glow);
+  --color-components-premium-badge-grey-glow-hover: var(--color-components-premium-badge-grey-glow-hover);
+  --color-components-premium-badge-grey-bg-stop-0-hover: var(--color-components-premium-badge-grey-bg-stop-0-hover);
+  --color-components-premium-badge-grey-bg-stop-100-hover: var(--color-components-premium-badge-grey-bg-stop-100-hover);
+  --color-components-premium-badge-grey-stroke-stop-0-hover: var(--color-components-premium-badge-grey-stroke-stop-0-hover);
+  --color-components-premium-badge-grey-stroke-stop-100-hover: var(--color-components-premium-badge-grey-stroke-stop-100-hover);
+
+  --color-components-premium-badge-orange-bg-stop-0: var(--color-components-premium-badge-orange-bg-stop-0);
+  --color-components-premium-badge-orange-bg-stop-100: var(--color-components-premium-badge-orange-bg-stop-100);
+  --color-components-premium-badge-orange-stroke-stop-0: var(--color-components-premium-badge-orange-stroke-stop-0);
+  --color-components-premium-badge-orange-stroke-stop-100: var(--color-components-premium-badge-orange-stroke-stop-100);
+  --color-components-premium-badge-orange-text-stop-0: var(--color-components-premium-badge-orange-text-stop-0);
+  --color-components-premium-badge-orange-text-stop-100: var(--color-components-premium-badge-orange-text-stop-100);
+  --color-components-premium-badge-orange-glow: var(--color-components-premium-badge-orange-glow);
+  --color-components-premium-badge-orange-glow-hover: var(--color-components-premium-badge-orange-glow-hover);
+  --color-components-premium-badge-orange-bg-stop-0-hover: var(--color-components-premium-badge-orange-bg-stop-0-hover);
+  --color-components-premium-badge-orange-bg-stop-100-hover: var(--color-components-premium-badge-orange-bg-stop-100-hover);
+  --color-components-premium-badge-orange-stroke-stop-0-hover: var(--color-components-premium-badge-orange-stroke-stop-0-hover);
+  --color-components-premium-badge-orange-stroke-stop-100-hover: var(--color-components-premium-badge-orange-stroke-stop-100-hover);
+
+  --color-components-progress-bar-bg: var(--color-components-progress-bar-bg);
+  --color-components-progress-bar-progress: var(--color-components-progress-bar-progress);
+  --color-components-progress-bar-border: var(--color-components-progress-bar-border);
+  --color-components-progress-bar-progress-solid: var(--color-components-progress-bar-progress-solid);
+  --color-components-progress-bar-progress-highlight: var(--color-components-progress-bar-progress-highlight);
+
+  --color-components-icon-bg-red-solid: var(--color-components-icon-bg-red-solid);
+  --color-components-icon-bg-rose-solid: var(--color-components-icon-bg-rose-solid);
+  --color-components-icon-bg-pink-solid: var(--color-components-icon-bg-pink-solid);
+  --color-components-icon-bg-orange-dark-solid: var(--color-components-icon-bg-orange-dark-solid);
+  --color-components-icon-bg-yellow-solid: var(--color-components-icon-bg-yellow-solid);
+  --color-components-icon-bg-green-solid: var(--color-components-icon-bg-green-solid);
+  --color-components-icon-bg-teal-solid: var(--color-components-icon-bg-teal-solid);
+  --color-components-icon-bg-blue-light-solid: var(--color-components-icon-bg-blue-light-solid);
+  --color-components-icon-bg-blue-solid: var(--color-components-icon-bg-blue-solid);
+  --color-components-icon-bg-indigo-solid: var(--color-components-icon-bg-indigo-solid);
+  --color-components-icon-bg-violet-solid: var(--color-components-icon-bg-violet-solid);
+  --color-components-icon-bg-midnight-solid: var(--color-components-icon-bg-midnight-solid);
+  --color-components-icon-bg-rose-soft: var(--color-components-icon-bg-rose-soft);
+  --color-components-icon-bg-pink-soft: var(--color-components-icon-bg-pink-soft);
+  --color-components-icon-bg-orange-dark-soft: var(--color-components-icon-bg-orange-dark-soft);
+  --color-components-icon-bg-yellow-soft: var(--color-components-icon-bg-yellow-soft);
+  --color-components-icon-bg-green-soft: var(--color-components-icon-bg-green-soft);
+  --color-components-icon-bg-teal-soft: var(--color-components-icon-bg-teal-soft);
+  --color-components-icon-bg-blue-light-soft: var(--color-components-icon-bg-blue-light-soft);
+  --color-components-icon-bg-blue-soft: var(--color-components-icon-bg-blue-soft);
+  --color-components-icon-bg-indigo-soft: var(--color-components-icon-bg-indigo-soft);
+  --color-components-icon-bg-violet-soft: var(--color-components-icon-bg-violet-soft);
+  --color-components-icon-bg-midnight-soft: var(--color-components-icon-bg-midnight-soft);
+  --color-components-icon-bg-red-soft: var(--color-components-icon-bg-red-soft);
+  --color-components-icon-bg-orange-solid: var(--color-components-icon-bg-orange-solid);
+  --color-components-icon-bg-orange-soft: var(--color-components-icon-bg-orange-soft);
+
+  --color-text-primary: var(--color-text-primary);
+  --color-text-secondary: var(--color-text-secondary);
+  --color-text-tertiary: var(--color-text-tertiary);
+  --color-text-quaternary: var(--color-text-quaternary);
+  --color-text-destructive: var(--color-text-destructive);
+  --color-text-success: var(--color-text-success);
+  --color-text-warning: var(--color-text-warning);
+  --color-text-destructive-secondary: var(--color-text-destructive-secondary);
+  --color-text-success-secondary: var(--color-text-success-secondary);
+  --color-text-warning-secondary: var(--color-text-warning-secondary);
+  --color-text-accent: var(--color-text-accent);
+  --color-text-primary-on-surface: var(--color-text-primary-on-surface);
+  --color-text-placeholder: var(--color-text-placeholder);
+  --color-text-disabled: var(--color-text-disabled);
+  --color-text-accent-secondary: var(--color-text-accent-secondary);
+  --color-text-accent-light-mode-only: var(--color-text-accent-light-mode-only);
+  --color-text-text-selected: var(--color-text-text-selected);
+  --color-text-secondary-on-surface: var(--color-text-secondary-on-surface);
+  --color-text-logo-text: var(--color-text-logo-text);
+  --color-text-empty-state-icon: var(--color-text-empty-state-icon);
+  --color-text-inverted: var(--color-text-inverted);
+  --color-text-inverted-dimmed: var(--color-text-inverted-dimmed);
+
+  --color-background-body: var(--color-background-body);
+  --color-background-default-subtle: var(--color-background-default-subtle);
+  --color-background-neutral-subtle: var(--color-background-neutral-subtle);
+  --color-background-sidenav-bg: var(--color-background-sidenav-bg);
+  --color-background-default: var(--color-background-default);
+  --color-background-soft: var(--color-background-soft);
+  --color-background-gradient-bg-fill-chat-bg-1: var(--color-background-gradient-bg-fill-chat-bg-1);
+  --color-background-gradient-bg-fill-chat-bg-2: var(--color-background-gradient-bg-fill-chat-bg-2);
+  --color-background-gradient-bg-fill-chat-bubble-bg-1: var(--color-background-gradient-bg-fill-chat-bubble-bg-1);
+  --color-background-gradient-bg-fill-chat-bubble-bg-2: var(--color-background-gradient-bg-fill-chat-bubble-bg-2);
+  --color-background-gradient-bg-fill-debug-bg-1: var(--color-background-gradient-bg-fill-debug-bg-1);
+  --color-background-gradient-bg-fill-debug-bg-2: var(--color-background-gradient-bg-fill-debug-bg-2);
+
+  --color-background-gradient-mask-gray: var(--color-background-gradient-mask-gray);
+  --color-background-gradient-mask-transparent: var(--color-background-gradient-mask-transparent);
+  --color-background-gradient-mask-input-clear-2: var(--color-background-gradient-mask-input-clear-2);
+  --color-background-gradient-mask-input-clear-1: var(--color-background-gradient-mask-input-clear-1);
+  --color-background-gradient-mask-transparent-dark: var(--color-background-gradient-mask-transparent-dark);
+  --color-background-gradient-mask-side-panel-2: var(--color-background-gradient-mask-side-panel-2);
+  --color-background-gradient-mask-side-panel-1: var(--color-background-gradient-mask-side-panel-1);
+
+  --color-background-default-burn: var(--color-background-default-burn);
+  --color-background-overlay-fullscreen: var(--color-background-overlay-fullscreen);
+  --color-background-default-lighter: var(--color-background-default-lighter);
+  --color-background-section: var(--color-background-section);
+  --color-background-interaction-from-bg-1: var(--color-background-interaction-from-bg-1);
+  --color-background-interaction-from-bg-2: var(--color-background-interaction-from-bg-2);
+  --color-background-section-burn: var(--color-background-section-burn);
+  --color-background-default-dodge: var(--color-background-default-dodge);
+  --color-background-overlay: var(--color-background-overlay);
+  --color-background-default-dimmed: var(--color-background-default-dimmed);
+  --color-background-default-hover: var(--color-background-default-hover);
+  --color-background-overlay-alt: var(--color-background-overlay-alt);
+  --color-background-surface-white: var(--color-background-surface-white);
+  --color-background-overlay-destructive: var(--color-background-overlay-destructive);
+  --color-background-overlay-backdrop: var(--color-background-overlay-backdrop);
+  --color-background-body-transparent: var(--color-background-body-transparent);
+  --color-background-section-burn-inverted: var(--color-background-section-burn-inverted);
+
+  --color-shadow-shadow-1: var(--color-shadow-shadow-1);
+  --color-shadow-shadow-3: var(--color-shadow-shadow-3);
+  --color-shadow-shadow-4: var(--color-shadow-shadow-4);
+  --color-shadow-shadow-5: var(--color-shadow-shadow-5);
+  --color-shadow-shadow-6: var(--color-shadow-shadow-6);
+  --color-shadow-shadow-7: var(--color-shadow-shadow-7);
+  --color-shadow-shadow-8: var(--color-shadow-shadow-8);
+  --color-shadow-shadow-9: var(--color-shadow-shadow-9);
+  --color-shadow-shadow-2: var(--color-shadow-shadow-2);
+  --color-shadow-shadow-10: var(--color-shadow-shadow-10);
+
+  --color-workflow-block-border: var(--color-workflow-block-border);
+  --color-workflow-block-parma-bg: var(--color-workflow-block-parma-bg);
+  --color-workflow-block-bg: var(--color-workflow-block-bg);
+  --color-workflow-block-bg-transparent: var(--color-workflow-block-bg-transparent);
+  --color-workflow-block-border-highlight: var(--color-workflow-block-border-highlight);
+  --color-workflow-block-wrapper-bg-1: var(--color-workflow-block-wrapper-bg-1);
+  --color-workflow-block-wrapper-bg-2: var(--color-workflow-block-wrapper-bg-2);
+
+  --color-workflow-canvas-workflow-dot-color: var(--color-workflow-canvas-workflow-dot-color);
+  --color-workflow-canvas-workflow-bg: var(--color-workflow-canvas-workflow-bg);
+  --color-workflow-canvas-workflow-top-bar-1: var(--color-workflow-canvas-workflow-top-bar-1);
+  --color-workflow-canvas-workflow-top-bar-2: var(--color-workflow-canvas-workflow-top-bar-2);
+  --color-workflow-canvas-canvas-overlay: var(--color-workflow-canvas-canvas-overlay);
+
+  --color-workflow-link-line-active: var(--color-workflow-link-line-active);
+  --color-workflow-link-line-normal: var(--color-workflow-link-line-normal);
+  --color-workflow-link-line-handle: var(--color-workflow-link-line-handle);
+  --color-workflow-link-line-normal-transparent: var(--color-workflow-link-line-normal-transparent);
+  --color-workflow-link-line-failure-active: var(--color-workflow-link-line-failure-active);
+  --color-workflow-link-line-failure-handle: var(--color-workflow-link-line-failure-handle);
+  --color-workflow-link-line-failure-button-bg: var(--color-workflow-link-line-failure-button-bg);
+  --color-workflow-link-line-failure-button-hover: var(--color-workflow-link-line-failure-button-hover);
+
+  --color-workflow-link-line-success-active: var(--color-workflow-link-line-success-active);
+  --color-workflow-link-line-success-handle: var(--color-workflow-link-line-success-handle);
+
+  --color-workflow-link-line-error-active: var(--color-workflow-link-line-error-active);
+  --color-workflow-link-line-error-handle: var(--color-workflow-link-line-error-handle);
+
+  --color-workflow-minimap-bg: var(--color-workflow-minimap-bg);
+  --color-workflow-minimap-block: var(--color-workflow-minimap-block);
+
+  --color-workflow-display-success-bg: var(--color-workflow-display-success-bg);
+  --color-workflow-display-success-border-1: var(--color-workflow-display-success-border-1);
+  --color-workflow-display-success-border-2: var(--color-workflow-display-success-border-2);
+  --color-workflow-display-success-vignette-color: var(--color-workflow-display-success-vignette-color);
+  --color-workflow-display-success-bg-line-pattern: var(--color-workflow-display-success-bg-line-pattern);
+
+  --color-workflow-display-glass-1: var(--color-workflow-display-glass-1);
+  --color-workflow-display-glass-2: var(--color-workflow-display-glass-2);
+  --color-workflow-display-vignette-dark: var(--color-workflow-display-vignette-dark);
+  --color-workflow-display-highlight: var(--color-workflow-display-highlight);
+  --color-workflow-display-outline: var(--color-workflow-display-outline);
+  --color-workflow-display-error-bg: var(--color-workflow-display-error-bg);
+  --color-workflow-display-error-bg-line-pattern: var(--color-workflow-display-error-bg-line-pattern);
+  --color-workflow-display-error-border-1: var(--color-workflow-display-error-border-1);
+  --color-workflow-display-error-border-2: var(--color-workflow-display-error-border-2);
+  --color-workflow-display-error-vignette-color: var(--color-workflow-display-error-vignette-color);
+
+  --color-workflow-display-warning-bg: var(--color-workflow-display-warning-bg);
+  --color-workflow-display-warning-bg-line-pattern: var(--color-workflow-display-warning-bg-line-pattern);
+  --color-workflow-display-warning-border-1: var(--color-workflow-display-warning-border-1);
+  --color-workflow-display-warning-border-2: var(--color-workflow-display-warning-border-2);
+  --color-workflow-display-warning-vignette-color: var(--color-workflow-display-warning-vignette-color);
+
+  --color-workflow-display-normal-bg: var(--color-workflow-display-normal-bg);
+  --color-workflow-display-normal-bg-line-pattern: var(--color-workflow-display-normal-bg-line-pattern);
+  --color-workflow-display-normal-border-1: var(--color-workflow-display-normal-border-1);
+  --color-workflow-display-normal-border-2: var(--color-workflow-display-normal-border-2);
+  --color-workflow-display-normal-vignette-color: var(--color-workflow-display-normal-vignette-color);
+
+  --color-workflow-display-disabled-bg: var(--color-workflow-display-disabled-bg);
+  --color-workflow-display-disabled-bg-line-pattern: var(--color-workflow-display-disabled-bg-line-pattern);
+  --color-workflow-display-disabled-border-1: var(--color-workflow-display-disabled-border-1);
+  --color-workflow-display-disabled-border-2: var(--color-workflow-display-disabled-border-2);
+  --color-workflow-display-disabled-vignette-color: var(--color-workflow-display-disabled-vignette-color);
+  --color-workflow-display-disabled-outline: var(--color-workflow-display-disabled-outline);
+
+  --color-workflow-workflow-progress-bg-1: var(--color-workflow-workflow-progress-bg-1);
+  --color-workflow-workflow-progress-bg-2: var(--color-workflow-workflow-progress-bg-2);
+
+  --color-divider-subtle: var(--color-divider-subtle);
+  --color-divider-regular: var(--color-divider-regular);
+  --color-divider-deep: var(--color-divider-deep);
+  --color-divider-burn: var(--color-divider-burn);
+  --color-divider-intense: var(--color-divider-intense);
+  --color-divider-solid: var(--color-divider-solid);
+  --color-divider-solid-alt: var(--color-divider-solid-alt);
+  --color-divider-accent: var(--color-divider-accent);
+
+  --color-state-base-hover: var(--color-state-base-hover);
+  --color-state-base-active: var(--color-state-base-active);
+  --color-state-base-hover-alt: var(--color-state-base-hover-alt);
+  --color-state-base-handle: var(--color-state-base-handle);
+  --color-state-base-handle-hover: var(--color-state-base-handle-hover);
+  --color-state-base-hover-subtle: var(--color-state-base-hover-subtle);
+
+  --color-state-accent-hover: var(--color-state-accent-hover);
+  --color-state-accent-active: var(--color-state-accent-active);
+  --color-state-accent-hover-alt: var(--color-state-accent-hover-alt);
+  --color-state-accent-solid: var(--color-state-accent-solid);
+  --color-state-accent-active-alt: var(--color-state-accent-active-alt);
+
+  --color-state-destructive-hover: var(--color-state-destructive-hover);
+  --color-state-destructive-hover-alt: var(--color-state-destructive-hover-alt);
+  --color-state-destructive-active: var(--color-state-destructive-active);
+  --color-state-destructive-solid: var(--color-state-destructive-solid);
+  --color-state-destructive-border: var(--color-state-destructive-border);
+  --color-state-destructive-hover-transparent: var(--color-state-destructive-hover-transparent);
+
+  --color-state-success-hover: var(--color-state-success-hover);
+  --color-state-success-hover-alt: var(--color-state-success-hover-alt);
+  --color-state-success-active: var(--color-state-success-active);
+  --color-state-success-solid: var(--color-state-success-solid);
+
+  --color-state-warning-hover: var(--color-state-warning-hover);
+  --color-state-warning-hover-alt: var(--color-state-warning-hover-alt);
+  --color-state-warning-active: var(--color-state-warning-active);
+  --color-state-warning-solid: var(--color-state-warning-solid);
+  --color-state-warning-hover-transparent: var(--color-state-warning-hover-transparent);
+
+  --color-effects-highlight: var(--color-effects-highlight);
+  --color-effects-highlight-lightmode-off: var(--color-effects-highlight-lightmode-off);
+  --color-effects-image-frame: var(--color-effects-image-frame);
+  --color-effects-icon-border: var(--color-effects-icon-border);
+
+  --color-util-colors-orange-dark-orange-dark-50: var(--color-util-colors-orange-dark-orange-dark-50);
+  --color-util-colors-orange-dark-orange-dark-100: var(--color-util-colors-orange-dark-orange-dark-100);
+  --color-util-colors-orange-dark-orange-dark-200: var(--color-util-colors-orange-dark-orange-dark-200);
+  --color-util-colors-orange-dark-orange-dark-300: var(--color-util-colors-orange-dark-orange-dark-300);
+  --color-util-colors-orange-dark-orange-dark-400: var(--color-util-colors-orange-dark-orange-dark-400);
+  --color-util-colors-orange-dark-orange-dark-500: var(--color-util-colors-orange-dark-orange-dark-500);
+  --color-util-colors-orange-dark-orange-dark-600: var(--color-util-colors-orange-dark-orange-dark-600);
+  --color-util-colors-orange-dark-orange-dark-700: var(--color-util-colors-orange-dark-orange-dark-700);
+
+  --color-util-colors-orange-orange-50: var(--color-util-colors-orange-orange-50);
+  --color-util-colors-orange-orange-100: var(--color-util-colors-orange-orange-100);
+  --color-util-colors-orange-orange-200: var(--color-util-colors-orange-orange-200);
+  --color-util-colors-orange-orange-300: var(--color-util-colors-orange-orange-300);
+  --color-util-colors-orange-orange-400: var(--color-util-colors-orange-orange-400);
+  --color-util-colors-orange-orange-500: var(--color-util-colors-orange-orange-500);
+  --color-util-colors-orange-orange-600: var(--color-util-colors-orange-orange-600);
+  --color-util-colors-orange-orange-700: var(--color-util-colors-orange-orange-700);
+  --color-util-colors-orange-orange-100-transparent: var(--color-util-colors-orange-orange-100-transparent);
+
+  --color-util-colors-pink-pink-50: var(--color-util-colors-pink-pink-50);
+  --color-util-colors-pink-pink-100: var(--color-util-colors-pink-pink-100);
+  --color-util-colors-pink-pink-200: var(--color-util-colors-pink-pink-200);
+  --color-util-colors-pink-pink-300: var(--color-util-colors-pink-pink-300);
+  --color-util-colors-pink-pink-400: var(--color-util-colors-pink-pink-400);
+  --color-util-colors-pink-pink-500: var(--color-util-colors-pink-pink-500);
+  --color-util-colors-pink-pink-600: var(--color-util-colors-pink-pink-600);
+  --color-util-colors-pink-pink-700: var(--color-util-colors-pink-pink-700);
+
+  --color-util-colors-fuchsia-fuchsia-50: var(--color-util-colors-fuchsia-fuchsia-50);
+  --color-util-colors-fuchsia-fuchsia-100: var(--color-util-colors-fuchsia-fuchsia-100);
+  --color-util-colors-fuchsia-fuchsia-200: var(--color-util-colors-fuchsia-fuchsia-200);
+  --color-util-colors-fuchsia-fuchsia-300: var(--color-util-colors-fuchsia-fuchsia-300);
+  --color-util-colors-fuchsia-fuchsia-400: var(--color-util-colors-fuchsia-fuchsia-400);
+  --color-util-colors-fuchsia-fuchsia-500: var(--color-util-colors-fuchsia-fuchsia-500);
+  --color-util-colors-fuchsia-fuchsia-600: var(--color-util-colors-fuchsia-fuchsia-600);
+  --color-util-colors-fuchsia-fuchsia-700: var(--color-util-colors-fuchsia-fuchsia-700);
+
+  --color-util-colors-purple-purple-50: var(--color-util-colors-purple-purple-50);
+  --color-util-colors-purple-purple-100: var(--color-util-colors-purple-purple-100);
+  --color-util-colors-purple-purple-200: var(--color-util-colors-purple-purple-200);
+  --color-util-colors-purple-purple-300: var(--color-util-colors-purple-purple-300);
+  --color-util-colors-purple-purple-400: var(--color-util-colors-purple-purple-400);
+  --color-util-colors-purple-purple-500: var(--color-util-colors-purple-purple-500);
+  --color-util-colors-purple-purple-600: var(--color-util-colors-purple-purple-600);
+  --color-util-colors-purple-purple-700: var(--color-util-colors-purple-purple-700);
+
+  --color-util-colors-indigo-indigo-50: var(--color-util-colors-indigo-indigo-50);
+  --color-util-colors-indigo-indigo-100: var(--color-util-colors-indigo-indigo-100);
+  --color-util-colors-indigo-indigo-200: var(--color-util-colors-indigo-indigo-200);
+  --color-util-colors-indigo-indigo-300: var(--color-util-colors-indigo-indigo-300);
+  --color-util-colors-indigo-indigo-400: var(--color-util-colors-indigo-indigo-400);
+  --color-util-colors-indigo-indigo-500: var(--color-util-colors-indigo-indigo-500);
+  --color-util-colors-indigo-indigo-600: var(--color-util-colors-indigo-indigo-600);
+  --color-util-colors-indigo-indigo-700: var(--color-util-colors-indigo-indigo-700);
+
+  --color-util-colors-blue-blue-50: var(--color-util-colors-blue-blue-50);
+  --color-util-colors-blue-blue-100: var(--color-util-colors-blue-blue-100);
+  --color-util-colors-blue-blue-200: var(--color-util-colors-blue-blue-200);
+  --color-util-colors-blue-blue-300: var(--color-util-colors-blue-blue-300);
+  --color-util-colors-blue-blue-400: var(--color-util-colors-blue-blue-400);
+  --color-util-colors-blue-blue-500: var(--color-util-colors-blue-blue-500);
+  --color-util-colors-blue-blue-600: var(--color-util-colors-blue-blue-600);
+  --color-util-colors-blue-blue-700: var(--color-util-colors-blue-blue-700);
+
+  --color-util-colors-blue-light-blue-light-50: var(--color-util-colors-blue-light-blue-light-50);
+  --color-util-colors-blue-light-blue-light-100: var(--color-util-colors-blue-light-blue-light-100);
+  --color-util-colors-blue-light-blue-light-200: var(--color-util-colors-blue-light-blue-light-200);
+  --color-util-colors-blue-light-blue-light-300: var(--color-util-colors-blue-light-blue-light-300);
+  --color-util-colors-blue-light-blue-light-400: var(--color-util-colors-blue-light-blue-light-400);
+  --color-util-colors-blue-light-blue-light-500: var(--color-util-colors-blue-light-blue-light-500);
+  --color-util-colors-blue-light-blue-light-600: var(--color-util-colors-blue-light-blue-light-600);
+  --color-util-colors-blue-light-blue-light-700: var(--color-util-colors-blue-light-blue-light-700);
+
+  --color-util-colors-gray-blue-gray-blue-50: var(--color-util-colors-gray-blue-gray-blue-50);
+  --color-util-colors-gray-blue-gray-blue-100: var(--color-util-colors-gray-blue-gray-blue-100);
+  --color-util-colors-gray-blue-gray-blue-200: var(--color-util-colors-gray-blue-gray-blue-200);
+  --color-util-colors-gray-blue-gray-blue-300: var(--color-util-colors-gray-blue-gray-blue-300);
+  --color-util-colors-gray-blue-gray-blue-400: var(--color-util-colors-gray-blue-gray-blue-400);
+  --color-util-colors-gray-blue-gray-blue-500: var(--color-util-colors-gray-blue-gray-blue-500);
+  --color-util-colors-gray-blue-gray-blue-600: var(--color-util-colors-gray-blue-gray-blue-600);
+  --color-util-colors-gray-blue-gray-blue-700: var(--color-util-colors-gray-blue-gray-blue-700);
+
+  --color-util-colors-blue-brand-blue-brand-50: var(--color-util-colors-blue-brand-blue-brand-50);
+  --color-util-colors-blue-brand-blue-brand-100: var(--color-util-colors-blue-brand-blue-brand-100);
+  --color-util-colors-blue-brand-blue-brand-200: var(--color-util-colors-blue-brand-blue-brand-200);
+  --color-util-colors-blue-brand-blue-brand-300: var(--color-util-colors-blue-brand-blue-brand-300);
+  --color-util-colors-blue-brand-blue-brand-400: var(--color-util-colors-blue-brand-blue-brand-400);
+  --color-util-colors-blue-brand-blue-brand-500: var(--color-util-colors-blue-brand-blue-brand-500);
+  --color-util-colors-blue-brand-blue-brand-600: var(--color-util-colors-blue-brand-blue-brand-600);
+  --color-util-colors-blue-brand-blue-brand-700: var(--color-util-colors-blue-brand-blue-brand-700);
+
+  --color-util-colors-red-red-50: var(--color-util-colors-red-red-50);
+  --color-util-colors-red-red-100: var(--color-util-colors-red-red-100);
+  --color-util-colors-red-red-200: var(--color-util-colors-red-red-200);
+  --color-util-colors-red-red-300: var(--color-util-colors-red-red-300);
+  --color-util-colors-red-red-400: var(--color-util-colors-red-red-400);
+  --color-util-colors-red-red-500: var(--color-util-colors-red-red-500);
+  --color-util-colors-red-red-600: var(--color-util-colors-red-red-600);
+  --color-util-colors-red-red-700: var(--color-util-colors-red-red-700);
+
+  --color-util-colors-green-green-50: var(--color-util-colors-green-green-50);
+  --color-util-colors-green-green-100: var(--color-util-colors-green-green-100);
+  --color-util-colors-green-green-200: var(--color-util-colors-green-green-200);
+  --color-util-colors-green-green-300: var(--color-util-colors-green-green-300);
+  --color-util-colors-green-green-400: var(--color-util-colors-green-green-400);
+  --color-util-colors-green-green-500: var(--color-util-colors-green-green-500);
+  --color-util-colors-green-green-600: var(--color-util-colors-green-green-600);
+  --color-util-colors-green-green-700: var(--color-util-colors-green-green-700);
+
+  --color-util-colors-warning-warning-50: var(--color-util-colors-warning-warning-50);
+  --color-util-colors-warning-warning-100: var(--color-util-colors-warning-warning-100);
+  --color-util-colors-warning-warning-200: var(--color-util-colors-warning-warning-200);
+  --color-util-colors-warning-warning-300: var(--color-util-colors-warning-warning-300);
+  --color-util-colors-warning-warning-400: var(--color-util-colors-warning-warning-400);
+  --color-util-colors-warning-warning-500: var(--color-util-colors-warning-warning-500);
+  --color-util-colors-warning-warning-600: var(--color-util-colors-warning-warning-600);
+  --color-util-colors-warning-warning-700: var(--color-util-colors-warning-warning-700);
+
+  --color-util-colors-yellow-yellow-50: var(--color-util-colors-yellow-yellow-50);
+  --color-util-colors-yellow-yellow-100: var(--color-util-colors-yellow-yellow-100);
+  --color-util-colors-yellow-yellow-200: var(--color-util-colors-yellow-yellow-200);
+  --color-util-colors-yellow-yellow-300: var(--color-util-colors-yellow-yellow-300);
+  --color-util-colors-yellow-yellow-400: var(--color-util-colors-yellow-yellow-400);
+  --color-util-colors-yellow-yellow-500: var(--color-util-colors-yellow-yellow-500);
+  --color-util-colors-yellow-yellow-600: var(--color-util-colors-yellow-yellow-600);
+  --color-util-colors-yellow-yellow-700: var(--color-util-colors-yellow-yellow-700);
+
+  --color-util-colors-teal-teal-50: var(--color-util-colors-teal-teal-50);
+  --color-util-colors-teal-teal-100: var(--color-util-colors-teal-teal-100);
+  --color-util-colors-teal-teal-200: var(--color-util-colors-teal-teal-200);
+  --color-util-colors-teal-teal-300: var(--color-util-colors-teal-teal-300);
+  --color-util-colors-teal-teal-400: var(--color-util-colors-teal-teal-400);
+  --color-util-colors-teal-teal-500: var(--color-util-colors-teal-teal-500);
+  --color-util-colors-teal-teal-600: var(--color-util-colors-teal-teal-600);
+  --color-util-colors-teal-teal-700: var(--color-util-colors-teal-teal-700);
+
+  --color-util-colors-cyan-cyan-50: var(--color-util-colors-cyan-cyan-50);
+  --color-util-colors-cyan-cyan-100: var(--color-util-colors-cyan-cyan-100);
+  --color-util-colors-cyan-cyan-200: var(--color-util-colors-cyan-cyan-200);
+  --color-util-colors-cyan-cyan-300: var(--color-util-colors-cyan-cyan-300);
+  --color-util-colors-cyan-cyan-400: var(--color-util-colors-cyan-cyan-400);
+  --color-util-colors-cyan-cyan-500: var(--color-util-colors-cyan-cyan-500);
+  --color-util-colors-cyan-cyan-600: var(--color-util-colors-cyan-cyan-600);
+  --color-util-colors-cyan-cyan-700: var(--color-util-colors-cyan-cyan-700);
+
+  --color-util-colors-violet-violet-50: var(--color-util-colors-violet-violet-50);
+  --color-util-colors-violet-violet-100: var(--color-util-colors-violet-violet-100);
+  --color-util-colors-violet-violet-200: var(--color-util-colors-violet-violet-200);
+  --color-util-colors-violet-violet-300: var(--color-util-colors-violet-violet-300);
+  --color-util-colors-violet-violet-400: var(--color-util-colors-violet-violet-400);
+  --color-util-colors-violet-violet-500: var(--color-util-colors-violet-violet-500);
+  --color-util-colors-violet-violet-600: var(--color-util-colors-violet-violet-600);
+  --color-util-colors-violet-violet-700: var(--color-util-colors-violet-violet-700);
+
+  --color-util-colors-gray-gray-50: var(--color-util-colors-gray-gray-50);
+  --color-util-colors-gray-gray-100: var(--color-util-colors-gray-gray-100);
+  --color-util-colors-gray-gray-200: var(--color-util-colors-gray-gray-200);
+  --color-util-colors-gray-gray-300: var(--color-util-colors-gray-gray-300);
+  --color-util-colors-gray-gray-400: var(--color-util-colors-gray-gray-400);
+  --color-util-colors-gray-gray-500: var(--color-util-colors-gray-gray-500);
+  --color-util-colors-gray-gray-600: var(--color-util-colors-gray-gray-600);
+  --color-util-colors-gray-gray-700: var(--color-util-colors-gray-gray-700);
+
+  --color-util-colors-green-light-green-light-50: var(--color-util-colors-green-light-green-light-50);
+  --color-util-colors-green-light-green-light-100: var(--color-util-colors-green-light-green-light-100);
+  --color-util-colors-green-light-green-light-200: var(--color-util-colors-green-light-green-light-200);
+  --color-util-colors-green-light-green-light-300: var(--color-util-colors-green-light-green-light-300);
+  --color-util-colors-green-light-green-light-500: var(--color-util-colors-green-light-green-light-500);
+  --color-util-colors-green-light-green-light-400: var(--color-util-colors-green-light-green-light-400);
+  --color-util-colors-green-light-green-light-600: var(--color-util-colors-green-light-green-light-600);
+  --color-util-colors-green-light-green-light-700: var(--color-util-colors-green-light-green-light-700);
+
+  --color-util-colors-rose-rose-50: var(--color-util-colors-rose-rose-50);
+  --color-util-colors-rose-rose-100: var(--color-util-colors-rose-rose-100);
+  --color-util-colors-rose-rose-200: var(--color-util-colors-rose-rose-200);
+  --color-util-colors-rose-rose-300: var(--color-util-colors-rose-rose-300);
+  --color-util-colors-rose-rose-400: var(--color-util-colors-rose-rose-400);
+  --color-util-colors-rose-rose-500: var(--color-util-colors-rose-rose-500);
+  --color-util-colors-rose-rose-600: var(--color-util-colors-rose-rose-600);
+  --color-util-colors-rose-rose-700: var(--color-util-colors-rose-rose-700);
+
+  --color-util-colors-midnight-midnight-50: var(--color-util-colors-midnight-midnight-50);
+  --color-util-colors-midnight-midnight-100: var(--color-util-colors-midnight-midnight-100);
+  --color-util-colors-midnight-midnight-200: var(--color-util-colors-midnight-midnight-200);
+  --color-util-colors-midnight-midnight-300: var(--color-util-colors-midnight-midnight-300);
+  --color-util-colors-midnight-midnight-400: var(--color-util-colors-midnight-midnight-400);
+  --color-util-colors-midnight-midnight-500: var(--color-util-colors-midnight-midnight-500);
+  --color-util-colors-midnight-midnight-600: var(--color-util-colors-midnight-midnight-600);
+  --color-util-colors-midnight-midnight-700: var(--color-util-colors-midnight-midnight-700);
+
+  --color-third-party-LangChain: var(--color-third-party-LangChain);
+  --color-third-party-Langfuse: var(--color-third-party-Langfuse);
+  --color-third-party-Github: var(--color-third-party-Github);
+  --color-third-party-Github-tertiary: var(--color-third-party-Github-tertiary);
+  --color-third-party-Github-secondary: var(--color-third-party-Github-secondary);
+  --color-third-party-model-bg-openai: var(--color-third-party-model-bg-openai);
+  --color-third-party-model-bg-anthropic: var(--color-third-party-model-bg-anthropic);
+  --color-third-party-model-bg-default: var(--color-third-party-model-bg-default);
+
+  --color-third-party-aws: var(--color-third-party-aws);
+  --color-third-party-aws-alt: var(--color-third-party-aws-alt);
+
+  --color-saas-background: var(--color-saas-background);
+  --color-saas-pricing-grid-bg: var(--color-saas-pricing-grid-bg);
+  --color-saas-dify-blue-static: var(--color-saas-dify-blue-static);
+  --color-saas-dify-blue-static-hover: var(--color-saas-dify-blue-static-hover);
+  --color-saas-dify-blue-accessible: var(--color-saas-dify-blue-accessible);
+  --color-saas-dify-blue-inverted: var(--color-saas-dify-blue-inverted);
+  --color-saas-dify-blue-inverted-dimmed: var(--color-saas-dify-blue-inverted-dimmed);
+
+  --color-saas-background-inverted: var(--color-saas-background-inverted);
+  --color-saas-background-inverted-hover: var(--color-saas-background-inverted-hover);
+
+  --color-dify-logo-blue: var(--color-dify-logo-blue);
+  --color-dify-logo-black: var(--color-dify-logo-black);
+
+}
diff --git a/packages/dify-ui/src/toast/__tests__/index.spec.tsx b/packages/dify-ui/src/toast/__tests__/index.spec.tsx
index e02f6828ac..68ba746f4f 100644
--- a/packages/dify-ui/src/toast/__tests__/index.spec.tsx
+++ b/packages/dify-ui/src/toast/__tests__/index.spec.tsx
@@ -39,7 +39,7 @@ describe('@langgenius/dify-ui/toast', () => {
     await expect.element(screen.getByText('Saved')).toBeInTheDocument()
     await expect.element(screen.getByText('Your changes are available now.')).toBeInTheDocument()
     await expect.element(screen.getByRole('region', { name: 'Notifications' })).toHaveAttribute('aria-live', 'polite')
-    await expect.element(screen.getByRole('region', { name: 'Notifications' })).toHaveClass('z-1003')
+    await expect.element(screen.getByRole('region', { name: 'Notifications' })).toHaveClass('z-60')
     expect(screen.getByRole('region', { name: 'Notifications' }).element().firstElementChild).toHaveClass('top-4')
     expect(screen.getByRole('dialog').element()).not.toHaveClass('outline-hidden')
     expect(document.body.querySelector('[aria-hidden="true"].i-ri-checkbox-circle-fill')).toBeInTheDocument()
diff --git a/packages/dify-ui/src/toast/index.tsx b/packages/dify-ui/src/toast/index.tsx
index a479621563..7d4e867faf 100644
--- a/packages/dify-ui/src/toast/index.tsx
+++ b/packages/dify-ui/src/toast/index.tsx
@@ -222,7 +222,7 @@ function ToastViewport() {
     <BaseToast.Viewport
       aria-label={toastViewportLabel}
       className={cn(
-        'group/toast-viewport pointer-events-none fixed inset-0 z-1003 overflow-visible',
+        'group/toast-viewport pointer-events-none fixed inset-0 z-60 overflow-visible',
       )}
     >
       <div
diff --git a/packages/dify-ui/src/toggle-group/__tests__/index.spec.tsx b/packages/dify-ui/src/toggle-group/__tests__/index.spec.tsx
new file mode 100644
index 0000000000..ec6e7351e2
--- /dev/null
+++ b/packages/dify-ui/src/toggle-group/__tests__/index.spec.tsx
@@ -0,0 +1,74 @@
+import { render } from 'vitest-browser-react'
+import {
+  ToggleGroup,
+  ToggleGroupDivider,
+  ToggleGroupItem,
+} from '../index'
+
+const asHTMLElement = (element: HTMLElement | SVGElement) => element as HTMLElement
+
+describe('ToggleGroup wrappers', () => {
+  it('renders a segmented control with Base UI pressed state', async () => {
+    const screen = await render(
+      <ToggleGroup defaultValue={['one']} aria-label="View">
+        <ToggleGroupItem value="one">One</ToggleGroupItem>
+        <ToggleGroupItem value="two">Two</ToggleGroupItem>
+      </ToggleGroup>,
+    )
+
+    await expect.element(screen.getByRole('group')).toHaveClass(
+      'bg-components-segmented-control-bg-normal',
+      'p-0.5',
+      'rounded-[10px]',
+    )
+    await expect.element(screen.getByRole('button', { name: 'One' })).toHaveAttribute('aria-pressed', 'true')
+    await expect.element(screen.getByRole('button', { name: 'One' })).toHaveClass(
+      'data-pressed:bg-components-segmented-control-item-active-bg',
+      'data-pressed:text-text-accent-light-mode-only',
+    )
+  })
+
+  it('uses single selection by default', async () => {
+    const screen = await render(
+      <ToggleGroup defaultValue={['one']} aria-label="View">
+        <ToggleGroupItem value="one">One</ToggleGroupItem>
+        <ToggleGroupItem value="two">Two</ToggleGroupItem>
+      </ToggleGroup>,
+    )
+
+    asHTMLElement(screen.getByRole('button', { name: 'Two' }).element()).click()
+
+    await expect.element(screen.getByRole('button', { name: 'One' })).toHaveAttribute('aria-pressed', 'false')
+    await expect.element(screen.getByRole('button', { name: 'Two' })).toHaveAttribute('aria-pressed', 'true')
+  })
+
+  it('calls onValueChange while leaving controlled value to the caller', async () => {
+    const onValueChange = vi.fn()
+    const screen = await render(
+      <ToggleGroup value={['one']} onValueChange={onValueChange} aria-label="View">
+        <ToggleGroupItem value="one">One</ToggleGroupItem>
+        <ToggleGroupItem value="two">Two</ToggleGroupItem>
+      </ToggleGroup>,
+    )
+
+    asHTMLElement(screen.getByRole('button', { name: 'Two' }).element()).click()
+
+    expect(onValueChange).toHaveBeenCalledWith(['two'], expect.anything())
+    await expect.element(screen.getByRole('button', { name: 'One' })).toHaveAttribute('aria-pressed', 'true')
+  })
+
+  it('forwards disabled and className to composable parts', async () => {
+    const screen = await render(
+      <ToggleGroup defaultValue={['one']} aria-label="View" className="custom-group">
+        <ToggleGroupItem value="one" className="custom-item">One</ToggleGroupItem>
+        <ToggleGroupDivider className="custom-divider" data-testid="divider" />
+        <ToggleGroupItem value="two" disabled>Two</ToggleGroupItem>
+      </ToggleGroup>,
+    )
+
+    await expect.element(screen.getByRole('group')).toHaveClass('custom-group')
+    await expect.element(screen.getByRole('button', { name: 'One' })).toHaveClass('custom-item')
+    await expect.element(screen.getByRole('button', { name: 'Two' })).toBeDisabled()
+    await expect.element(screen.getByTestId('divider')).toHaveClass('custom-divider')
+  })
+})
diff --git a/packages/dify-ui/src/toggle-group/index.stories.tsx b/packages/dify-ui/src/toggle-group/index.stories.tsx
new file mode 100644
index 0000000000..960957b7ab
--- /dev/null
+++ b/packages/dify-ui/src/toggle-group/index.stories.tsx
@@ -0,0 +1,177 @@
+import type { Meta, StoryObj } from '@storybook/react-vite'
+import type { ReactNode } from 'react'
+import {
+  ToggleGroup,
+  ToggleGroupDivider,
+  ToggleGroupItem,
+} from '.'
+
+const meta = {
+  title: 'Base/UI/ToggleGroup',
+  component: ToggleGroup,
+  parameters: {
+    layout: 'centered',
+    docs: {
+      description: {
+        component: 'Segmented control built on Base UI ToggleGroup and Toggle. Use this for mode, filter, and view selection that does not need tabpanel semantics.',
+      },
+    },
+  },
+  tags: ['autodocs'],
+} satisfies Meta<typeof ToggleGroup>
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+type SegmentedControlProps = {
+  defaultValue: string
+  values: string[]
+  iconOnly?: boolean
+  noPadding?: boolean
+}
+
+const Icon = () => (
+  <i className="i-ri-information-line size-4 shrink-0" aria-hidden="true" />
+)
+
+const Item = () => (
+  <>
+    <Icon />
+    <span className="px-0.5">Item</span>
+  </>
+)
+
+function SegmentedControl({
+  defaultValue,
+  values,
+  iconOnly = false,
+  noPadding = false,
+}: SegmentedControlProps) {
+  return (
+    <ToggleGroup
+      defaultValue={[defaultValue]}
+      aria-label="Segmented control"
+      className={noPadding ? 'rounded-lg border-[0.5px] border-divider-subtle p-0' : undefined}
+    >
+      {values.map((itemValue, index) => (
+        <span key={itemValue} className="relative flex items-center">
+          <ToggleGroupItem
+            value={itemValue}
+            aria-label={iconOnly ? `Item ${index + 1}` : undefined}
+          >
+            <Icon />
+            {!iconOnly && (
+              <span className="px-0.5">Item</span>
+            )}
+          </ToggleGroupItem>
+          {index === 1 && (
+            <span className="pointer-events-none absolute top-0 -right-px flex h-full items-center" aria-hidden="true">
+              <ToggleGroupDivider />
+            </span>
+          )}
+        </span>
+      ))}
+    </ToggleGroup>
+  )
+}
+
+function SpecColumn() {
+  const values = ['one', 'two', 'three']
+
+  return (
+    <div className="flex flex-col items-center gap-6">
+      <SegmentedControl defaultValue="one" values={values} />
+      <SegmentedControl defaultValue="one" values={values} iconOnly />
+      <SegmentedControl defaultValue="one" values={values} noPadding />
+      <SegmentedControl defaultValue="one" values={values} iconOnly noPadding />
+    </div>
+  )
+}
+
+function SpecPanel({
+  className,
+  children,
+}: {
+  className?: string
+  children: ReactNode
+}) {
+  return (
+    <div className={className}>
+      <div className="flex min-h-105 items-center justify-center">
+        {children}
+      </div>
+    </div>
+  )
+}
+
+export const DesignSpec: Story = {
+  render: () => (
+    <div className="overflow-hidden rounded-3xl bg-components-panel-bg-alt p-4">
+      <SpecPanel className="w-120 overflow-hidden rounded-2xl bg-components-chart-bg">
+        <SpecColumn />
+      </SpecPanel>
+    </div>
+  ),
+  parameters: {
+    docs: {
+      description: {
+        story: 'Figma node 2473:9851: segmented control examples with text+icon and icon-only rows, with and without outer padding.',
+      },
+    },
+  },
+}
+
+export const DataAttributeStates: Story = {
+  render: () => (
+    <div className="flex flex-col gap-5">
+      <ToggleGroup defaultValue={['active']} aria-label="Basic states">
+        <ToggleGroupItem value="default">
+          <Item />
+        </ToggleGroupItem>
+        <ToggleGroupItem value="active">
+          <Item />
+        </ToggleGroupItem>
+        <ToggleGroupItem value="disabled" disabled>
+          <Item />
+        </ToggleGroupItem>
+      </ToggleGroup>
+
+      <ToggleGroup defaultValue={['accent-light']} aria-label="Active states">
+        <ToggleGroupItem value="accent-light">
+          <Item />
+        </ToggleGroupItem>
+        <ToggleGroupItem
+          value="neutral"
+          className="data-pressed:text-text-primary"
+        >
+          <Item />
+        </ToggleGroupItem>
+        <ToggleGroupItem
+          value="accent"
+          className="data-pressed:border-components-segmented-control-item-active-accent-border data-pressed:bg-components-segmented-control-item-active-accent-bg data-pressed:text-text-accent"
+        >
+          <Item />
+        </ToggleGroupItem>
+      </ToggleGroup>
+
+      <ToggleGroup defaultValue={['one', 'three']} multiple aria-label="Multiple selection">
+        <ToggleGroupItem value="one">
+          <Item />
+        </ToggleGroupItem>
+        <ToggleGroupItem value="two">
+          <Item />
+        </ToggleGroupItem>
+        <ToggleGroupItem value="three">
+          <Item />
+        </ToggleGroupItem>
+      </ToggleGroup>
+    </div>
+  ),
+  parameters: {
+    docs: {
+      description: {
+        story: '`ToggleGroupItem` gets `data-pressed` and `data-disabled` from Base UI. Accent, neutral, and multiple-selection examples are composed through props and className.',
+      },
+    },
+  },
+}
diff --git a/packages/dify-ui/src/toggle-group/index.tsx b/packages/dify-ui/src/toggle-group/index.tsx
new file mode 100644
index 0000000000..661385a132
--- /dev/null
+++ b/packages/dify-ui/src/toggle-group/index.tsx
@@ -0,0 +1,58 @@
+'use client'
+
+import type { Toggle as BaseToggleNS } from '@base-ui/react/toggle'
+import type { ToggleGroup as BaseToggleGroupNS } from '@base-ui/react/toggle-group'
+import type { HTMLAttributes } from 'react'
+import { Toggle as BaseToggle } from '@base-ui/react/toggle'
+import { ToggleGroup as BaseToggleGroup } from '@base-ui/react/toggle-group'
+import { cn } from '../cn'
+
+export type ToggleGroupProps<Value extends string = string> = Omit<BaseToggleGroupNS.Props<Value>, 'className'> & {
+  className?: string
+}
+
+export function ToggleGroup<Value extends string = string>({
+  className,
+  ...props
+}: ToggleGroupProps<Value>) {
+  return (
+    <BaseToggleGroup
+      className={cn('inline-flex items-center gap-px rounded-[10px] bg-components-segmented-control-bg-normal p-0.5', className)}
+      {...props}
+    />
+  )
+}
+
+export type ToggleGroupItemProps<Value extends string = string> = Omit<BaseToggleNS.Props<Value>, 'className'> & {
+  className?: string
+}
+
+export function ToggleGroupItem<Value extends string = string>({
+  className,
+  ...props
+}: ToggleGroupItemProps<Value>) {
+  return (
+    <BaseToggle
+      className={cn('relative flex h-7 min-w-0 touch-manipulation items-center justify-center gap-0.5 overflow-hidden whitespace-nowrap rounded-lg border-[0.5px] border-transparent px-2 py-1 system-sm-medium text-text-secondary transition-colors duration-150 hover:bg-state-base-hover hover:text-text-secondary focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-components-input-border-hover data-pressed:border-components-segmented-control-item-active-border data-pressed:bg-components-segmented-control-item-active-bg data-pressed:text-text-accent-light-mode-only data-pressed:shadow-xs data-pressed:shadow-shadow-shadow-3 data-disabled:cursor-not-allowed data-disabled:bg-transparent data-disabled:text-text-disabled data-disabled:shadow-none data-disabled:hover:bg-transparent data-disabled:hover:text-text-disabled motion-reduce:transition-none', className)}
+      {...props}
+    />
+  )
+}
+
+export type ToggleGroupDividerProps = Omit<HTMLAttributes<HTMLSpanElement>, 'className'> & {
+  className?: string
+}
+
+export function ToggleGroupDivider({
+  className,
+  ...props
+}: ToggleGroupDividerProps) {
+  return (
+    <span
+      role="presentation"
+      aria-hidden="true"
+      className={cn('h-3.5 w-px shrink-0 bg-divider-regular', className)}
+      {...props}
+    />
+  )
+}
diff --git a/packages/dify-ui/src/tooltip/index.tsx b/packages/dify-ui/src/tooltip/index.tsx
index 1f9772ce2d..88bd6459f7 100644
--- a/packages/dify-ui/src/tooltip/index.tsx
+++ b/packages/dify-ui/src/tooltip/index.tsx
@@ -58,7 +58,7 @@ export function TooltipContent({
         align={align}
         sideOffset={sideOffset}
         alignOffset={alignOffset}
-        className={cn('z-1002 outline-hidden', positionerClassName)}
+        className={cn('z-50 outline-hidden', positionerClassName)}
       >
         <BaseTooltip.Popup
           className={cn(
diff --git a/packages/dify-ui/tailwind.config.ts b/packages/dify-ui/tailwind.config.ts
deleted file mode 100644
index bcf1731775..0000000000
--- a/packages/dify-ui/tailwind.config.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import type { Config } from 'tailwindcss'
-import { getIconCollections, iconsPlugin } from '@egoist/tailwindcss-icons'
-import difyUIPreset from './src/tailwind-preset'
-
-const config: Config = {
-  content: [
-    './src/**/*.{js,ts,jsx,tsx,mdx}',
-    './.storybook/**/*.{js,ts,jsx,tsx,mdx}',
-  ],
-  presets: [difyUIPreset],
-  plugins: [
-    iconsPlugin({
-      collections: getIconCollections(['ri']),
-      extraProperties: {
-        width: '1rem',
-        height: '1rem',
-        display: 'block',
-      },
-    }),
-  ],
-}
-
-export default config
diff --git a/packages/dify-ui/tsconfig.json b/packages/dify-ui/tsconfig.json
index 514954c807..ae1a2b78dd 100644
--- a/packages/dify-ui/tsconfig.json
+++ b/packages/dify-ui/tsconfig.json
@@ -3,6 +3,6 @@
   "compilerOptions": {
     "types": ["vite-plus/test/globals"]
   },
-  "include": ["src/**/*.ts", "src/**/*.tsx", "vite.config.ts", "tailwind.config.ts"],
+  "include": ["src/**/*.ts", "src/**/*.tsx", "vite.config.ts"],
   "exclude": ["node_modules", "dist", "storybook-static", "coverage"]
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2021d87adc..4fdbca121b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -7,14 +7,14 @@ settings:
 catalogs:
   default:
     '@amplitude/analytics-browser':
-      specifier: 2.42.0
-      version: 2.42.0
+      specifier: 2.42.2
+      version: 2.42.2
     '@amplitude/plugin-session-replay-browser':
-      specifier: 1.28.1
-      version: 1.28.1
+      specifier: 1.30.3
+      version: 1.30.3
     '@antfu/eslint-config':
-      specifier: 8.2.0
-      version: 8.2.0
+      specifier: 9.0.0
+      version: 9.0.0
     '@base-ui/react':
       specifier: 1.4.1
       version: 1.4.1
@@ -22,8 +22,8 @@ catalogs:
       specifier: 5.1.2
       version: 5.1.2
     '@cucumber/cucumber':
-      specifier: 12.8.2
-      version: 12.8.2
+      specifier: 12.8.3
+      version: 12.8.3
     '@egoist/tailwindcss-icons':
       specifier: 1.9.2
       version: 1.9.2
@@ -31,8 +31,8 @@ catalogs:
       specifier: 1.2.1
       version: 1.2.1
     '@eslint-react/eslint-plugin':
-      specifier: 3.0.0
-      version: 3.0.0
+      specifier: 5.7.7
+      version: 5.7.7
     '@eslint/js':
       specifier: 10.0.1
       version: 10.0.1
@@ -40,20 +40,17 @@ catalogs:
       specifier: 0.27.19
       version: 0.27.19
     '@formatjs/intl-localematcher':
-      specifier: 0.8.4
-      version: 0.8.4
-    '@headlessui/react':
-      specifier: 2.2.10
-      version: 2.2.10
+      specifier: 0.8.7
+      version: 0.8.7
     '@heroicons/react':
       specifier: 2.2.0
       version: 2.2.0
     '@hey-api/openapi-ts':
-      specifier: 0.97.0
-      version: 0.97.0
+      specifier: 0.97.1
+      version: 0.97.1
     '@hono/node-server':
-      specifier: 2.0.0
-      version: 2.0.0
+      specifier: 2.0.2
+      version: 2.0.2
     '@iconify-json/heroicons':
       specifier: 1.2.3
       version: 1.2.3
@@ -91,26 +88,26 @@ catalogs:
       specifier: 4.7.0
       version: 4.7.0
     '@next/eslint-plugin-next':
-      specifier: 16.2.4
-      version: 16.2.4
+      specifier: 16.2.6
+      version: 16.2.6
     '@next/mdx':
-      specifier: 16.2.4
-      version: 16.2.4
+      specifier: 16.2.6
+      version: 16.2.6
     '@orpc/client':
-      specifier: 1.14.0
-      version: 1.14.0
+      specifier: 1.14.3
+      version: 1.14.3
     '@orpc/contract':
-      specifier: 1.14.0
-      version: 1.14.0
+      specifier: 1.14.3
+      version: 1.14.3
     '@orpc/openapi-client':
-      specifier: 1.14.0
-      version: 1.14.0
+      specifier: 1.14.3
+      version: 1.14.3
     '@orpc/tanstack-query':
-      specifier: 1.14.0
-      version: 1.14.0
+      specifier: 1.14.3
+      version: 1.14.3
     '@playwright/test':
-      specifier: 1.59.1
-      version: 1.59.1
+      specifier: 1.60.0
+      version: 1.60.0
     '@remixicon/react':
       specifier: 4.9.0
       version: 4.9.0
@@ -118,29 +115,29 @@ catalogs:
       specifier: 4.2.0
       version: 4.2.0
     '@sentry/react':
-      specifier: 10.50.0
-      version: 10.50.0
+      specifier: 10.53.1
+      version: 10.53.1
     '@storybook/addon-docs':
-      specifier: 10.3.5
-      version: 10.3.5
+      specifier: 10.3.6
+      version: 10.3.6
     '@storybook/addon-links':
-      specifier: 10.3.5
-      version: 10.3.5
+      specifier: 10.3.6
+      version: 10.3.6
     '@storybook/addon-onboarding':
-      specifier: 10.3.5
-      version: 10.3.5
+      specifier: 10.3.6
+      version: 10.3.6
     '@storybook/addon-themes':
-      specifier: 10.3.5
-      version: 10.3.5
+      specifier: 10.3.6
+      version: 10.3.6
     '@storybook/nextjs-vite':
-      specifier: 10.3.5
-      version: 10.3.5
+      specifier: 10.3.6
+      version: 10.3.6
     '@storybook/react':
-      specifier: 10.3.5
-      version: 10.3.5
+      specifier: 10.3.6
+      version: 10.3.6
     '@storybook/react-vite':
-      specifier: 10.3.5
-      version: 10.3.5
+      specifier: 10.3.6
+      version: 10.3.6
     '@streamdown/math':
       specifier: 1.0.2
       version: 1.0.2
@@ -151,35 +148,35 @@ catalogs:
       specifier: 0.13.11
       version: 0.13.11
     '@tailwindcss/postcss':
-      specifier: 4.2.4
-      version: 4.2.4
+      specifier: 4.3.0
+      version: 4.3.0
     '@tailwindcss/typography':
       specifier: 0.5.19
       version: 0.5.19
     '@tailwindcss/vite':
-      specifier: 4.2.4
-      version: 4.2.4
+      specifier: 4.3.0
+      version: 4.3.0
     '@tanstack/eslint-plugin-query':
-      specifier: 5.100.6
-      version: 5.100.6
+      specifier: 5.100.10
+      version: 5.100.10
     '@tanstack/react-devtools':
-      specifier: 0.10.2
-      version: 0.10.2
+      specifier: 0.10.3
+      version: 0.10.3
     '@tanstack/react-form':
-      specifier: 1.29.1
-      version: 1.29.1
+      specifier: 1.32.0
+      version: 1.32.0
     '@tanstack/react-form-devtools':
-      specifier: 0.2.22
-      version: 0.2.22
+      specifier: 0.2.27
+      version: 0.2.27
     '@tanstack/react-hotkeys':
       specifier: 0.10.0
       version: 0.10.0
     '@tanstack/react-query':
-      specifier: 5.100.6
-      version: 5.100.6
+      specifier: 5.100.10
+      version: 5.100.10
     '@tanstack/react-query-devtools':
-      specifier: 5.100.6
-      version: 5.100.6
+      specifier: 5.100.10
+      version: 5.100.10
     '@tanstack/react-virtual':
       specifier: 3.13.24
       version: 3.13.24
@@ -196,14 +193,14 @@ catalogs:
       specifier: 14.6.1
       version: 14.6.1
     '@tsslint/cli':
-      specifier: 3.1.0
-      version: 3.1.0
+      specifier: 3.1.2
+      version: 3.1.2
     '@tsslint/compat-eslint':
-      specifier: 3.1.0
-      version: 3.1.0
+      specifier: 3.1.2
+      version: 3.1.2
     '@tsslint/config':
-      specifier: 3.1.0
-      version: 3.1.0
+      specifier: 3.1.2
+      version: 3.1.2
     '@types/js-cookie':
       specifier: 3.0.6
       version: 3.0.6
@@ -214,11 +211,11 @@ catalogs:
       specifier: 0.6.4
       version: 0.6.4
     '@types/node':
-      specifier: 25.6.0
-      version: 25.6.0
+      specifier: 25.7.0
+      version: 25.7.0
     '@types/qs':
-      specifier: 6.15.0
-      version: 6.15.0
+      specifier: 6.15.1
+      version: 6.15.1
     '@types/react':
       specifier: 19.2.14
       version: 19.2.14
@@ -229,23 +226,23 @@ catalogs:
       specifier: 1.15.9
       version: 1.15.9
     '@typescript-eslint/eslint-plugin':
-      specifier: 8.59.1
-      version: 8.59.1
+      specifier: 8.59.3
+      version: 8.59.3
     '@typescript-eslint/parser':
-      specifier: 8.59.1
-      version: 8.59.1
+      specifier: 8.59.3
+      version: 8.59.3
     '@typescript/native-preview':
-      specifier: 7.0.0-dev.20260428.1
-      version: 7.0.0-dev.20260428.1
+      specifier: 7.0.0-dev.20260512.1
+      version: 7.0.0-dev.20260512.1
     '@vitejs/plugin-react':
       specifier: 6.0.1
       version: 6.0.1
     '@vitejs/plugin-rsc':
-      specifier: 0.5.25
-      version: 0.5.25
+      specifier: 0.5.26
+      version: 0.5.26
     '@vitest/coverage-v8':
-      specifier: 4.1.5
-      version: 4.1.5
+      specifier: 4.1.6
+      version: 4.1.6
     abcjs:
       specifier: 6.6.3
       version: 6.6.3
@@ -255,6 +252,9 @@ catalogs:
     ahooks:
       specifier: 3.9.7
       version: 3.9.7
+    c12:
+      specifier: 4.0.0-beta.5
+      version: 4.0.0-beta.5
     class-variance-authority:
       specifier: 0.7.1
       version: 0.7.1
@@ -286,8 +286,8 @@ catalogs:
       specifier: 10.6.0
       version: 10.6.0
     dompurify:
-      specifier: 3.4.1
-      version: 3.4.1
+      specifier: 3.4.2
+      version: 3.4.2
     echarts:
       specifier: 6.0.0
       version: 6.0.0
@@ -307,14 +307,14 @@ catalogs:
       specifier: 5.6.0
       version: 5.6.0
     es-toolkit:
-      specifier: 1.46.0
-      version: 1.46.0
+      specifier: 1.46.1
+      version: 1.46.1
     eslint:
-      specifier: 10.2.1
-      version: 10.2.1
+      specifier: 10.3.0
+      version: 10.3.0
     eslint-markdown:
-      specifier: 0.7.0
-      version: 0.7.0
+      specifier: 0.9.0
+      version: 0.9.0
     eslint-plugin-better-tailwindcss:
       specifier: 4.5.0
       version: 4.5.0
@@ -334,11 +334,14 @@ catalogs:
       specifier: 4.0.3
       version: 4.0.3
     eslint-plugin-storybook:
-      specifier: 10.3.5
-      version: 10.3.5
+      specifier: 10.3.6
+      version: 10.3.6
     fast-deep-equal:
       specifier: 3.1.3
       version: 3.1.3
+    fuse.js:
+      specifier: 7.3.0
+      version: 7.3.0
     happy-dom:
       specifier: 20.9.0
       version: 20.9.0
@@ -346,8 +349,8 @@ catalogs:
       specifier: 2.3.6
       version: 2.3.6
     hono:
-      specifier: 4.12.15
-      version: 4.12.15
+      specifier: 4.12.18
+      version: 4.12.18
     html-entities:
       specifier: 2.6.0
       version: 2.6.0
@@ -355,8 +358,8 @@ catalogs:
       specifier: 1.11.13
       version: 1.11.13
     i18next:
-      specifier: 26.0.8
-      version: 26.0.8
+      specifier: 26.1.0
+      version: 26.1.0
     i18next-resources-to-backend:
       specifier: 1.2.1
       version: 1.2.1
@@ -364,11 +367,11 @@ catalogs:
       specifier: 0.2.0
       version: 0.2.0
     immer:
-      specifier: 11.1.4
-      version: 11.1.4
+      specifier: 11.1.8
+      version: 11.1.8
     jotai:
-      specifier: 2.19.1
-      version: 2.19.1
+      specifier: 2.20.0
+      version: 2.20.0
     js-audio-recorder:
       specifier: 1.0.7
       version: 1.0.7
@@ -385,8 +388,8 @@ catalogs:
       specifier: 0.16.45
       version: 0.16.45
     knip:
-      specifier: 6.7.0
-      version: 6.7.0
+      specifier: 6.13.1
+      version: 6.13.1
     ky:
       specifier: 2.0.2
       version: 2.0.2
@@ -397,11 +400,11 @@ catalogs:
       specifier: 0.44.0
       version: 0.44.0
     loro-crdt:
-      specifier: 1.12.0
-      version: 1.12.0
+      specifier: 1.12.1
+      version: 1.12.1
     mermaid:
-      specifier: 11.14.0
-      version: 11.14.0
+      specifier: 11.15.0
+      version: 11.15.0
     mime:
       specifier: 4.1.0
       version: 4.1.0
@@ -412,8 +415,8 @@ catalogs:
       specifier: 1.0.0
       version: 1.0.0
     next:
-      specifier: 16.2.4
-      version: 16.2.4
+      specifier: 16.2.6
+      version: 16.2.6
     next-themes:
       specifier: 0.4.6
       version: 0.4.6
@@ -424,11 +427,11 @@ catalogs:
       specifier: 3.28.1
       version: 3.28.1
     playwright:
-      specifier: 1.59.1
-      version: 1.59.1
+      specifier: 1.60.0
+      version: 1.60.0
     postcss:
-      specifier: 8.5.12
-      version: 8.5.12
+      specifier: 8.5.14
+      version: 8.5.14
     qrcode.react:
       specifier: 4.2.0
       version: 4.2.0
@@ -436,20 +439,20 @@ catalogs:
       specifier: 6.15.1
       version: 6.15.1
     react:
-      specifier: 19.2.5
-      version: 19.2.5
+      specifier: 19.2.6
+      version: 19.2.6
     react-18-input-autosize:
       specifier: 3.0.0
       version: 3.0.0
     react-dom:
-      specifier: 19.2.5
-      version: 19.2.5
+      specifier: 19.2.6
+      version: 19.2.6
     react-easy-crop:
       specifier: 5.5.7
       version: 5.5.7
     react-hotkeys-hook:
-      specifier: 5.2.4
-      version: 5.2.4
+      specifier: 5.3.2
+      version: 5.3.2
     react-i18next:
       specifier: 16.5.8
       version: 16.5.8
@@ -463,8 +466,8 @@ catalogs:
       specifier: 8.0.0-rc.0
       version: 8.0.0-rc.0
     react-server-dom-webpack:
-      specifier: 19.2.5
-      version: 19.2.5
+      specifier: 19.2.6
+      version: 19.2.6
     react-sortablejs:
       specifier: 6.1.4
       version: 6.1.4
@@ -499,8 +502,8 @@ catalogs:
       specifier: 1.0.8
       version: 1.0.8
     storybook:
-      specifier: 10.3.5
-      version: 10.3.5
+      specifier: 10.3.6
+      version: 10.3.6
     streamdown:
       specifier: 2.5.0
       version: 2.5.0
@@ -508,14 +511,14 @@ catalogs:
       specifier: 2.3.1
       version: 2.3.1
     tailwind-merge:
-      specifier: 3.5.0
-      version: 3.5.0
+      specifier: 3.6.0
+      version: 3.6.0
     tailwindcss:
-      specifier: 4.2.4
-      version: 4.2.4
+      specifier: 4.3.0
+      version: 4.3.0
     tldts:
-      specifier: 7.0.29
-      version: 7.0.29
+      specifier: 7.0.30
+      version: 7.0.30
     tsx:
       specifier: 4.21.0
       version: 4.21.0
@@ -535,8 +538,8 @@ catalogs:
       specifier: 14.0.0
       version: 14.0.0
     vinext:
-      specifier: 0.0.45
-      version: 0.0.45
+      specifier: 0.0.49
+      version: 0.0.49
     vite-plugin-inspect:
       specifier: 12.0.0-beta.1
       version: 12.0.0-beta.1
@@ -550,21 +553,24 @@ catalogs:
       specifier: 1.1.4
       version: 1.1.4
     zod:
-      specifier: 4.3.6
-      version: 4.3.6
+      specifier: 4.4.3
+      version: 4.4.3
     zundo:
       specifier: 2.3.0
       version: 2.3.0
     zustand:
-      specifier: 5.0.12
-      version: 5.0.12
+      specifier: 5.0.13
+      version: 5.0.13
 
 overrides:
   '@lexical/code': npm:lexical-code-no-prism@0.41.0
   '@monaco-editor/loader': 1.7.0
   brace-expansion@>=2.0.0 <2.0.3: 2.0.3
   canvas: ^3.2.2
-  dompurify@>=3.1.3 <=3.3.1: 3.3.2
+  dompurify@<3.4.0: ^3.4.0
+  dompurify@<=3.3.3: ^3.3.4
+  dompurify@>=1.0.10 <3.4.0: ^3.4.0
+  dompurify@>=3.0.1 <3.4.0: ^3.4.0
   esbuild@<0.27.2: 0.27.2
   flatted@<=3.4.1: 3.4.2
   glob@>=10.2.0 <10.5.0: 11.1.0
@@ -573,6 +579,7 @@ overrides:
   lodash@>=4.0.0 <= 4.17.23: 4.18.0
   picomatch@<2.3.2: 2.3.2
   picomatch@>=4.0.0 <4.0.4: 4.0.4
+  postcss@<8.5.10: ^8.5.10
   rollup@>=4.0.0 <4.59.0: 4.59.0
   safe-buffer: ^5.2.1
   safer-buffer: npm:@nolyfill/safer-buffer@^1.0.44
@@ -594,46 +601,46 @@ importers:
     devDependencies:
       '@antfu/eslint-config':
         specifier: 'catalog:'
-        version: 8.2.0(@eslint-react/eslint-plugin@3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3))(@next/eslint-plugin-next@16.2.4)(@types/node@25.6.0)(@typescript-eslint/typescript-estree@8.59.1(typescript@6.0.3))(@typescript-eslint/utils@8.59.1(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3))(@vitest/coverage-v8@4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(eslint-plugin-react-refresh@0.5.2(eslint@10.2.1(jiti@2.6.1)))(eslint@10.2.1(jiti@2.6.1))(happy-dom@20.9.0)(jiti@2.6.1)(oxlint@1.61.0(oxlint-tsgolint@0.22.0))(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
+        version: 9.0.0(@eslint-react/eslint-plugin@5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3))(@next/eslint-plugin-next@16.2.6)(@types/node@25.7.0)(@typescript-eslint/typescript-estree@8.59.3(typescript@6.0.3))(@typescript-eslint/utils@8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3))(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(eslint-plugin-react-refresh@0.5.2(eslint@10.3.0(jiti@2.7.0)))(eslint@10.3.0(jiti@2.7.0))(happy-dom@20.9.0)(jiti@2.7.0)(oxlint@1.61.0(oxlint-tsgolint@0.22.0))(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
       concurrently:
         specifier: 'catalog:'
         version: 9.2.1
       eslint:
         specifier: 'catalog:'
-        version: 10.2.1(jiti@2.6.1)
+        version: 10.3.0(jiti@2.7.0)
       eslint-markdown:
         specifier: 'catalog:'
-        version: 0.7.0(eslint@10.2.1(jiti@2.6.1))
+        version: 0.9.0(eslint@10.3.0(jiti@2.7.0))
       eslint-plugin-markdown-preferences:
         specifier: 'catalog:'
-        version: 0.41.1(@eslint/markdown@8.0.1)(eslint@10.2.1(jiti@2.6.1))
+        version: 0.41.1(@eslint/markdown@8.0.1)(eslint@10.3.0(jiti@2.7.0))
       eslint-plugin-no-barrel-files:
         specifier: 'catalog:'
-        version: 1.3.1(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
+        version: 1.3.1(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
       vite:
         specifier: npm:@voidzero-dev/vite-plus-core@0.1.20
-        version: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+        version: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
       vite-plus:
         specifier: 'catalog:'
-        version: 0.1.20(@types/node@25.6.0)(@vitest/coverage-v8@4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
+        version: 0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
 
   e2e:
     devDependencies:
       '@cucumber/cucumber':
         specifier: 'catalog:'
-        version: 12.8.2
+        version: 12.8.3
       '@dify/tsconfig':
         specifier: workspace:*
         version: link:../packages/tsconfig
       '@playwright/test':
         specifier: 'catalog:'
-        version: 1.59.1
+        version: 1.60.0
       '@types/node':
         specifier: 'catalog:'
-        version: 25.6.0
+        version: 25.7.0
       '@typescript/native-preview':
         specifier: 'catalog:'
-        version: 7.0.0-dev.20260428.1
+        version: 7.0.0-dev.20260512.1
       tsx:
         specifier: 'catalog:'
         version: 4.21.0
@@ -642,38 +649,38 @@ importers:
         version: 6.0.3
       vite:
         specifier: npm:@voidzero-dev/vite-plus-core@0.1.20
-        version: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+        version: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
       vite-plus:
         specifier: 'catalog:'
-        version: 0.1.20(@types/node@25.6.0)(@vitest/coverage-v8@4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
+        version: 0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
 
   packages/contracts:
     dependencies:
       '@orpc/contract':
         specifier: 'catalog:'
-        version: 1.14.0
+        version: 1.14.3
       zod:
         specifier: 'catalog:'
-        version: 4.3.6
+        version: 4.4.3
     devDependencies:
       '@dify/tsconfig':
         specifier: workspace:*
         version: link:../tsconfig
       '@hey-api/openapi-ts':
         specifier: 'catalog:'
-        version: 0.97.0(magicast@0.5.2)(typescript@6.0.3)
+        version: 0.97.1(magicast@0.5.2)(typescript@6.0.3)
       '@types/js-yaml':
         specifier: 'catalog:'
         version: 4.0.9
       '@types/node':
         specifier: 'catalog:'
-        version: 25.6.0
+        version: 25.7.0
       '@typescript/native-preview':
         specifier: 'catalog:'
-        version: 7.0.0-dev.20260428.1
+        version: 7.0.0-dev.20260512.1
       eslint:
         specifier: 'catalog:'
-        version: 10.2.1(jiti@2.6.1)
+        version: 10.3.0(jiti@2.7.0)
       js-yaml:
         specifier: 'catalog:'
         version: 4.1.1
@@ -682,7 +689,38 @@ importers:
         version: 6.0.3
       vite-plus:
         specifier: 'catalog:'
-        version: 0.1.20(@types/node@25.6.0)(@vitest/coverage-v8@4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
+        version: 0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
+
+  packages/dev-proxy:
+    dependencies:
+      '@hono/node-server':
+        specifier: 'catalog:'
+        version: 2.0.2(hono@4.12.18)
+      c12:
+        specifier: 'catalog:'
+        version: 4.0.0-beta.5(chokidar@5.0.0)(dotenv@17.4.2)(giget@3.2.0)(jiti@2.7.0)(magicast@0.5.2)
+      hono:
+        specifier: 'catalog:'
+        version: 4.12.18
+    devDependencies:
+      '@dify/tsconfig':
+        specifier: workspace:*
+        version: link:../tsconfig
+      '@types/node':
+        specifier: 'catalog:'
+        version: 25.7.0
+      '@typescript/native-preview':
+        specifier: 'catalog:'
+        version: 7.0.0-dev.20260512.1
+      vite:
+        specifier: npm:@voidzero-dev/vite-plus-core@0.1.20
+        version: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+      vite-plus:
+        specifier: 'catalog:'
+        version: 0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
+      vitest:
+        specifier: npm:@voidzero-dev/vite-plus-test@0.1.20
+        version: '@voidzero-dev/vite-plus-test@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
 
   packages/dify-ui:
     dependencies:
@@ -691,38 +729,41 @@ importers:
         version: 2.1.1
       tailwind-merge:
         specifier: 'catalog:'
-        version: 3.5.0
+        version: 3.6.0
     devDependencies:
       '@base-ui/react':
         specifier: 'catalog:'
-        version: 1.4.1(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+        version: 1.4.1(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@chromatic-com/storybook':
         specifier: 'catalog:'
-        version: 5.1.2(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))
+        version: 5.1.2(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))
       '@dify/tsconfig':
         specifier: workspace:*
         version: link:../tsconfig
       '@egoist/tailwindcss-icons':
         specifier: 'catalog:'
-        version: 1.9.2(tailwindcss@4.2.4)
+        version: 1.9.2(tailwindcss@4.3.0)
       '@iconify-json/ri':
         specifier: 'catalog:'
         version: 1.2.10
       '@storybook/addon-docs':
         specifier: 'catalog:'
-        version: 10.3.5(@types/react@19.2.14)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))
+        version: 10.3.6(@types/react@19.2.14)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))
       '@storybook/addon-links':
         specifier: 'catalog:'
-        version: 10.3.5(react@19.2.5)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))
+        version: 10.3.6(react@19.2.6)(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))
       '@storybook/addon-themes':
         specifier: 'catalog:'
-        version: 10.3.5(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))
+        version: 10.3.6(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))
       '@storybook/react-vite':
         specifier: 'catalog:'
-        version: 10.3.5(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(typescript@6.0.3)
+        version: 10.3.6(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))(typescript@6.0.3)
       '@tailwindcss/vite':
         specifier: 'catalog:'
-        version: 4.2.4(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
+        version: 4.3.0(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
+      '@tanstack/react-virtual':
+        specifier: 'catalog:'
+        version: 3.13.24(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@types/react':
         specifier: 'catalog:'
         version: 19.2.14
@@ -731,43 +772,43 @@ importers:
         version: 19.2.3(@types/react@19.2.14)
       '@typescript/native-preview':
         specifier: 'catalog:'
-        version: 7.0.0-dev.20260428.1
+        version: 7.0.0-dev.20260512.1
       '@vitejs/plugin-react':
         specifier: 'catalog:'
-        version: 6.0.1(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
+        version: 6.0.1(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
       '@vitest/coverage-v8':
         specifier: 'catalog:'
-        version: 4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
+        version: 4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
       class-variance-authority:
         specifier: 'catalog:'
         version: 0.7.1
       playwright:
         specifier: 'catalog:'
-        version: 1.59.1
+        version: 1.60.0
       react:
         specifier: 'catalog:'
-        version: 19.2.5
+        version: 19.2.6
       react-dom:
         specifier: 'catalog:'
-        version: 19.2.5(react@19.2.5)
+        version: 19.2.6(react@19.2.6)
       storybook:
         specifier: 'catalog:'
-        version: 10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+        version: 10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
       tailwindcss:
         specifier: 'catalog:'
-        version: 4.2.4
+        version: 4.3.0
       typescript:
         specifier: 'catalog:'
         version: 6.0.3
       vite:
         specifier: npm:@voidzero-dev/vite-plus-core@0.1.20
-        version: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+        version: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
       vite-plus:
         specifier: 'catalog:'
-        version: 0.1.20(@types/node@25.6.0)(@vitest/coverage-v8@4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
+        version: 0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
       vitest-browser-react:
         specifier: 'catalog:'
-        version: 2.2.0(@types/node@25.6.0)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(@vitest/coverage-v8@4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
+        version: 2.2.0(@types/node@25.7.0)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
 
   packages/iconify-collections:
     devDependencies:
@@ -782,7 +823,7 @@ importers:
     dependencies:
       '@typescript/native-preview':
         specifier: 'catalog:'
-        version: 7.0.0-dev.20260428.1
+        version: 7.0.0-dev.20260512.1
       typescript:
         specifier: 'catalog:'
         version: 6.0.3
@@ -792,13 +833,13 @@ importers:
         version: link:../tsconfig
       '@types/node':
         specifier: 'catalog:'
-        version: 25.6.0
+        version: 25.7.0
       vite:
         specifier: npm:@voidzero-dev/vite-plus-core@0.1.20
-        version: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+        version: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
       vite-plus:
         specifier: 'catalog:'
-        version: 0.1.20(@types/node@25.6.0)(@vitest/coverage-v8@4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
+        version: 0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
 
   packages/tsconfig: {}
 
@@ -809,64 +850,61 @@ importers:
         version: link:../../packages/tsconfig
       '@eslint/js':
         specifier: 'catalog:'
-        version: 10.0.1(eslint@10.2.1(jiti@2.6.1))
+        version: 10.0.1(eslint@10.3.0(jiti@2.7.0))
       '@types/node':
         specifier: 'catalog:'
-        version: 25.6.0
+        version: 25.7.0
       '@typescript-eslint/eslint-plugin':
         specifier: 'catalog:'
-        version: 8.59.1(@typescript-eslint/parser@8.59.1(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3))(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
+        version: 8.59.3(@typescript-eslint/parser@8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
       '@typescript-eslint/parser':
         specifier: 'catalog:'
-        version: 8.59.1(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
+        version: 8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
       '@typescript/native-preview':
         specifier: 'catalog:'
-        version: 7.0.0-dev.20260428.1
+        version: 7.0.0-dev.20260512.1
       '@vitest/coverage-v8':
         specifier: 'catalog:'
-        version: 4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
+        version: 4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
       eslint:
         specifier: 'catalog:'
-        version: 10.2.1(jiti@2.6.1)
+        version: 10.3.0(jiti@2.7.0)
       typescript:
         specifier: 'catalog:'
         version: 6.0.3
       vite:
         specifier: npm:@voidzero-dev/vite-plus-core@0.1.20
-        version: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+        version: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
       vite-plus:
         specifier: 'catalog:'
-        version: 0.1.20(@types/node@25.6.0)(@vitest/coverage-v8@4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
+        version: 0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
       vitest:
         specifier: npm:@voidzero-dev/vite-plus-test@0.1.20
-        version: '@voidzero-dev/vite-plus-test@0.1.20(@types/node@25.6.0)(@vitest/coverage-v8@4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+        version: '@voidzero-dev/vite-plus-test@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
 
   web:
     dependencies:
       '@amplitude/analytics-browser':
         specifier: 'catalog:'
-        version: 2.42.0
+        version: 2.42.2
       '@amplitude/plugin-session-replay-browser':
         specifier: 'catalog:'
-        version: 1.28.1(@amplitude/rrweb@2.0.0-alpha.37)
+        version: 1.30.3(@amplitude/rrweb@2.0.0-alpha.40)
       '@base-ui/react':
         specifier: 'catalog:'
-        version: 1.4.1(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+        version: 1.4.1(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@emoji-mart/data':
         specifier: 'catalog:'
         version: 1.2.1
       '@floating-ui/react':
         specifier: 'catalog:'
-        version: 0.27.19(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+        version: 0.27.19(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@formatjs/intl-localematcher':
         specifier: 'catalog:'
-        version: 0.8.4
-      '@headlessui/react':
-        specifier: 'catalog:'
-        version: 2.2.10(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+        version: 0.8.7
       '@heroicons/react':
         specifier: 'catalog:'
-        version: 2.2.0(react@19.2.5)
+        version: 2.2.0(react@19.2.6)
       '@lexical/code':
         specifier: npm:lexical-code-no-prism@0.41.0
         version: lexical-code-no-prism@0.41.0(@lexical/utils@0.44.0)(lexical@0.44.0)
@@ -878,7 +916,7 @@ importers:
         version: 0.44.0
       '@lexical/react':
         specifier: 'catalog:'
-        version: 0.44.0(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+        version: 0.44.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@lexical/selection':
         specifier: 'catalog:'
         version: 0.44.0
@@ -890,55 +928,55 @@ importers:
         version: 0.44.0
       '@monaco-editor/react':
         specifier: 'catalog:'
-        version: 4.7.0(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+        version: 4.7.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@orpc/client':
         specifier: 'catalog:'
-        version: 1.14.0
+        version: 1.14.3
       '@orpc/contract':
         specifier: 'catalog:'
-        version: 1.14.0
+        version: 1.14.3
       '@orpc/openapi-client':
         specifier: 'catalog:'
-        version: 1.14.0
+        version: 1.14.3
       '@orpc/tanstack-query':
         specifier: 'catalog:'
-        version: 1.14.0(@orpc/client@1.14.0)(@tanstack/query-core@5.100.6)
+        version: 1.14.3(@orpc/client@1.14.3)(@tanstack/query-core@5.100.10)
       '@remixicon/react':
         specifier: 'catalog:'
-        version: 4.9.0(react@19.2.5)
+        version: 4.9.0(react@19.2.6)
       '@sentry/react':
         specifier: 'catalog:'
-        version: 10.50.0(react@19.2.5)
+        version: 10.53.1(react@19.2.6)
       '@streamdown/math':
         specifier: 'catalog:'
-        version: 1.0.2(react@19.2.5)
+        version: 1.0.2(react@19.2.6)
       '@svgdotjs/svg.js':
         specifier: 'catalog:'
         version: 3.2.5
       '@t3-oss/env-nextjs':
         specifier: 'catalog:'
-        version: 0.13.11(typescript@6.0.3)(valibot@1.3.1(typescript@6.0.3))(zod@4.3.6)
+        version: 0.13.11(typescript@6.0.3)(valibot@1.3.1(typescript@6.0.3))(zod@4.4.3)
       '@tailwindcss/typography':
         specifier: 'catalog:'
-        version: 0.5.19(tailwindcss@4.2.4)
+        version: 0.5.19(tailwindcss@4.3.0)
       '@tanstack/react-form':
         specifier: 'catalog:'
-        version: 1.29.1(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+        version: 1.32.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@tanstack/react-hotkeys':
         specifier: 'catalog:'
-        version: 0.10.0(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+        version: 0.10.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@tanstack/react-query':
         specifier: 'catalog:'
-        version: 5.100.6(react@19.2.5)
+        version: 5.100.10(react@19.2.6)
       '@tanstack/react-virtual':
         specifier: 'catalog:'
-        version: 3.13.24(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+        version: 3.13.24(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       abcjs:
         specifier: 'catalog:'
         version: 6.6.3
       ahooks:
         specifier: 'catalog:'
-        version: 3.9.7(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+        version: 3.9.7(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       class-variance-authority:
         specifier: 'catalog:'
         version: 0.7.1
@@ -947,7 +985,7 @@ importers:
         version: 0.0.1
       cmdk:
         specifier: 'catalog:'
-        version: 1.1.1(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+        version: 1.1.1(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       copy-to-clipboard:
         specifier: 'catalog:'
         version: 4.0.2
@@ -962,13 +1000,13 @@ importers:
         version: 10.6.0
       dompurify:
         specifier: 'catalog:'
-        version: 3.4.1
+        version: 3.4.2
       echarts:
         specifier: 'catalog:'
         version: 6.0.0
       echarts-for-react:
         specifier: 'catalog:'
-        version: 3.0.6(echarts@6.0.0)(react@19.2.5)
+        version: 3.0.6(echarts@6.0.0)(react@19.2.6)
       elkjs:
         specifier: 'catalog:'
         version: 0.11.1
@@ -977,16 +1015,19 @@ importers:
         version: 8.6.0(embla-carousel@8.6.0)
       embla-carousel-react:
         specifier: 'catalog:'
-        version: 8.6.0(react@19.2.5)
+        version: 8.6.0(react@19.2.6)
       emoji-mart:
         specifier: 'catalog:'
         version: 5.6.0
       es-toolkit:
         specifier: 'catalog:'
-        version: 1.46.0
+        version: 1.46.1
       fast-deep-equal:
         specifier: 'catalog:'
         version: 3.1.3
+      fuse.js:
+        specifier: 'catalog:'
+        version: 7.3.0
       hast-util-to-jsx-runtime:
         specifier: 'catalog:'
         version: 2.3.6
@@ -998,16 +1039,16 @@ importers:
         version: 1.11.13
       i18next:
         specifier: 'catalog:'
-        version: 26.0.8(typescript@6.0.3)
+        version: 26.1.0(typescript@6.0.3)
       i18next-resources-to-backend:
         specifier: 'catalog:'
         version: 1.2.1
       immer:
         specifier: 'catalog:'
-        version: 11.1.4
+        version: 11.1.8
       jotai:
         specifier: 'catalog:'
-        version: 2.19.1(@babel/core@7.29.0)(@babel/template@7.28.6)(@types/react@19.2.14)(react@19.2.5)
+        version: 2.20.0(@babel/core@7.29.0)(@babel/template@7.28.6)(@types/react@19.2.14)(react@19.2.6)
       js-audio-recorder:
         specifier: 'catalog:'
         version: 1.0.7
@@ -1034,10 +1075,10 @@ importers:
         version: 0.44.0
       loro-crdt:
         specifier: 'catalog:'
-        version: 1.12.0
+        version: 1.12.1
       mermaid:
         specifier: 'catalog:'
-        version: 11.14.0
+        version: 11.15.0
       mime:
         specifier: 'catalog:'
         version: 4.1.0
@@ -1049,58 +1090,58 @@ importers:
         version: 1.0.0
       next:
         specifier: 'catalog:'
-        version: 16.2.4(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+        version: 16.2.6(@babel/core@7.29.0)(@playwright/test@1.60.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       next-themes:
         specifier: 'catalog:'
-        version: 0.4.6(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+        version: 0.4.6(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       nuqs:
         specifier: 'catalog:'
-        version: 2.8.9(next@16.2.4(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(react@19.2.5)
+        version: 2.8.9(next@16.2.6(@babel/core@7.29.0)(@playwright/test@1.60.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(react@19.2.6)
       pinyin-pro:
         specifier: 'catalog:'
         version: 3.28.1
       qrcode.react:
         specifier: 'catalog:'
-        version: 4.2.0(react@19.2.5)
+        version: 4.2.0(react@19.2.6)
       qs:
         specifier: 'catalog:'
         version: 6.15.1
       react:
         specifier: 'catalog:'
-        version: 19.2.5
+        version: 19.2.6
       react-18-input-autosize:
         specifier: 'catalog:'
-        version: 3.0.0(react@19.2.5)
+        version: 3.0.0(react@19.2.6)
       react-dom:
         specifier: 'catalog:'
-        version: 19.2.5(react@19.2.5)
+        version: 19.2.6(react@19.2.6)
       react-easy-crop:
         specifier: 'catalog:'
-        version: 5.5.7(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+        version: 5.5.7(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       react-hotkeys-hook:
         specifier: 'catalog:'
-        version: 5.2.4(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+        version: 5.3.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       react-i18next:
         specifier: 'catalog:'
-        version: 16.5.8(i18next@26.0.8(typescript@6.0.3))(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(typescript@6.0.3)
+        version: 16.5.8(i18next@26.1.0(typescript@6.0.3))(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
       react-multi-email:
         specifier: 'catalog:'
-        version: 1.0.25(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+        version: 1.0.25(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       react-papaparse:
         specifier: 'catalog:'
         version: 4.4.0
       react-pdf-highlighter:
         specifier: 'catalog:'
-        version: 8.0.0-rc.0(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+        version: 8.0.0-rc.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       react-sortablejs:
         specifier: 'catalog:'
-        version: 6.1.4(@types/sortablejs@1.15.9)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(sortablejs@1.15.7)
+        version: 6.1.4(@types/sortablejs@1.15.9)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(sortablejs@1.15.7)
       react-textarea-autosize:
         specifier: 'catalog:'
-        version: 8.5.9(@types/react@19.2.14)(react@19.2.5)
+        version: 8.5.9(@types/react@19.2.14)(react@19.2.6)
       reactflow:
         specifier: 'catalog:'
-        version: 11.11.4(@types/react@19.2.14)(immer@11.1.4)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+        version: 11.11.4(@types/react@19.2.14)(immer@11.1.8)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       remark-breaks:
         specifier: 'catalog:'
         version: 4.0.0
@@ -1127,38 +1168,38 @@ importers:
         version: 1.0.8
       streamdown:
         specifier: 'catalog:'
-        version: 2.5.0(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+        version: 2.5.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       string-ts:
         specifier: 'catalog:'
         version: 2.3.1
       tldts:
         specifier: 'catalog:'
-        version: 7.0.29
+        version: 7.0.30
       unist-util-visit:
         specifier: 'catalog:'
         version: 5.1.0
       use-context-selector:
         specifier: 'catalog:'
-        version: 2.0.0(react@19.2.5)(scheduler@0.27.0)
+        version: 2.0.0(react@19.2.6)(scheduler@0.27.0)
       uuid:
         specifier: 'catalog:'
         version: 14.0.0
       zod:
         specifier: 'catalog:'
-        version: 4.3.6
+        version: 4.4.3
       zundo:
         specifier: 'catalog:'
-        version: 2.3.0(zustand@5.0.12(@types/react@19.2.14)(immer@11.1.4)(react@19.2.5)(use-sync-external-store@1.6.0(react@19.2.5)))
+        version: 2.3.0(zustand@5.0.13(@types/react@19.2.14)(immer@11.1.8)(react@19.2.6)(use-sync-external-store@1.6.0(react@19.2.6)))
       zustand:
         specifier: 'catalog:'
-        version: 5.0.12(@types/react@19.2.14)(immer@11.1.4)(react@19.2.5)(use-sync-external-store@1.6.0(react@19.2.5))
+        version: 5.0.13(@types/react@19.2.14)(immer@11.1.8)(react@19.2.6)(use-sync-external-store@1.6.0(react@19.2.6))
     devDependencies:
       '@antfu/eslint-config':
         specifier: 'catalog:'
-        version: 8.2.0(@eslint-react/eslint-plugin@3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3))(@next/eslint-plugin-next@16.2.4)(@types/node@25.6.0)(@typescript-eslint/typescript-estree@8.59.1(typescript@6.0.3))(@typescript-eslint/utils@8.59.1(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3))(@vitest/coverage-v8@4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(eslint-plugin-react-refresh@0.5.2(eslint@10.2.1(jiti@2.6.1)))(eslint@10.2.1(jiti@2.6.1))(happy-dom@20.9.0)(jiti@2.6.1)(oxlint@1.61.0(oxlint-tsgolint@0.22.0))(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
+        version: 9.0.0(@eslint-react/eslint-plugin@5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3))(@next/eslint-plugin-next@16.2.6)(@types/node@25.7.0)(@typescript-eslint/typescript-estree@8.59.3(typescript@6.0.3))(@typescript-eslint/utils@8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3))(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(eslint-plugin-react-refresh@0.5.2(eslint@10.3.0(jiti@2.7.0)))(eslint@10.3.0(jiti@2.7.0))(happy-dom@20.9.0)(jiti@2.7.0)(oxlint@1.61.0(oxlint-tsgolint@0.22.0))(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
       '@chromatic-com/storybook':
         specifier: 'catalog:'
-        version: 5.1.2(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))
+        version: 5.1.2(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))
       '@dify/contracts':
         specifier: workspace:*
         version: link:../packages/contracts
@@ -1170,19 +1211,19 @@ importers:
         version: link:../packages/tsconfig
       '@egoist/tailwindcss-icons':
         specifier: 'catalog:'
-        version: 1.9.2(tailwindcss@4.2.4)
+        version: 1.9.2(tailwindcss@4.3.0)
       '@eslint-react/eslint-plugin':
         specifier: 'catalog:'
-        version: 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@hono/node-server':
-        specifier: 'catalog:'
-        version: 2.0.0(hono@4.12.15)
+        version: 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
       '@iconify-json/heroicons':
         specifier: 'catalog:'
         version: 1.2.3
       '@iconify-json/ri':
         specifier: 'catalog:'
         version: 1.2.10
+      '@langgenius/dev-proxy':
+        specifier: workspace:*
+        version: link:../packages/dev-proxy
       '@langgenius/dify-ui':
         specifier: workspace:*
         version: link:../packages/dify-ui
@@ -1191,55 +1232,55 @@ importers:
         version: 3.1.1
       '@mdx-js/react':
         specifier: 'catalog:'
-        version: 3.1.1(@types/react@19.2.14)(react@19.2.5)
+        version: 3.1.1(@types/react@19.2.14)(react@19.2.6)
       '@mdx-js/rollup':
         specifier: 'catalog:'
         version: 3.1.1
       '@next/eslint-plugin-next':
         specifier: 'catalog:'
-        version: 16.2.4
+        version: 16.2.6
       '@next/mdx':
         specifier: 'catalog:'
-        version: 16.2.4(@mdx-js/loader@3.1.1)(@mdx-js/react@3.1.1(@types/react@19.2.14)(react@19.2.5))
+        version: 16.2.6(@mdx-js/loader@3.1.1)(@mdx-js/react@3.1.1(@types/react@19.2.14)(react@19.2.6))
       '@rgrove/parse-xml':
         specifier: 'catalog:'
         version: 4.2.0
       '@storybook/addon-docs':
         specifier: 'catalog:'
-        version: 10.3.5(@types/react@19.2.14)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))
+        version: 10.3.6(@types/react@19.2.14)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))
       '@storybook/addon-links':
         specifier: 'catalog:'
-        version: 10.3.5(react@19.2.5)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))
+        version: 10.3.6(react@19.2.6)(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))
       '@storybook/addon-onboarding':
         specifier: 'catalog:'
-        version: 10.3.5(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))
+        version: 10.3.6(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))
       '@storybook/addon-themes':
         specifier: 'catalog:'
-        version: 10.3.5(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))
+        version: 10.3.6(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))
       '@storybook/nextjs-vite':
         specifier: 'catalog:'
-        version: 10.3.5(@babel/core@7.29.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(next@16.2.4(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(typescript@6.0.3)
+        version: 10.3.6(@babel/core@7.29.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(next@16.2.6(@babel/core@7.29.0)(@playwright/test@1.60.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))(typescript@6.0.3)
       '@storybook/react':
         specifier: 'catalog:'
-        version: 10.3.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(typescript@6.0.3)
+        version: 10.3.6(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))(typescript@6.0.3)
       '@tailwindcss/postcss':
         specifier: 'catalog:'
-        version: 4.2.4
+        version: 4.3.0
       '@tailwindcss/vite':
         specifier: 'catalog:'
-        version: 4.2.4(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
+        version: 4.3.0(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
       '@tanstack/eslint-plugin-query':
         specifier: 'catalog:'
-        version: 5.100.6(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
+        version: 5.100.10(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
       '@tanstack/react-devtools':
         specifier: 'catalog:'
-        version: 0.10.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(csstype@3.2.3)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+        version: 0.10.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(csstype@3.2.3)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@tanstack/react-form-devtools':
         specifier: 'catalog:'
-        version: 0.2.22(@types/react@19.2.14)(csstype@3.2.3)(react@19.2.5)(solid-js@1.9.11)
+        version: 0.2.27(@types/react@19.2.14)(csstype@3.2.3)(react@19.2.6)(solid-js@1.9.11)
       '@tanstack/react-query-devtools':
         specifier: 'catalog:'
-        version: 5.100.6(@tanstack/react-query@5.100.6(react@19.2.5))(react@19.2.5)
+        version: 5.100.10(@tanstack/react-query@5.100.10(react@19.2.6))(react@19.2.6)
       '@testing-library/dom':
         specifier: 'catalog:'
         version: 10.4.1
@@ -1248,19 +1289,19 @@ importers:
         version: 6.9.1
       '@testing-library/react':
         specifier: 'catalog:'
-        version: 16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+        version: 16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@testing-library/user-event':
         specifier: 'catalog:'
         version: 14.6.1(@testing-library/dom@10.4.1)
       '@tsslint/cli':
         specifier: 'catalog:'
-        version: 3.1.0(@tsslint/compat-eslint@3.1.0(typescript@6.0.3))(typescript@6.0.3)
+        version: 3.1.2(@tsslint/compat-eslint@3.1.2(typescript@6.0.3))(typescript@6.0.3)
       '@tsslint/compat-eslint':
         specifier: 'catalog:'
-        version: 3.1.0(typescript@6.0.3)
+        version: 3.1.2(typescript@6.0.3)
       '@tsslint/config':
         specifier: 'catalog:'
-        version: 3.1.0(@tsslint/compat-eslint@3.1.0(typescript@6.0.3))(typescript@6.0.3)
+        version: 3.1.2(@tsslint/compat-eslint@3.1.2(typescript@6.0.3))
       '@types/js-cookie':
         specifier: 'catalog:'
         version: 3.0.6
@@ -1272,10 +1313,10 @@ importers:
         version: 0.6.4
       '@types/node':
         specifier: 'catalog:'
-        version: 25.6.0
+        version: 25.7.0
       '@types/qs':
         specifier: 'catalog:'
-        version: 6.15.0
+        version: 6.15.1
       '@types/react':
         specifier: 'catalog:'
         version: 19.2.14
@@ -1287,73 +1328,70 @@ importers:
         version: 1.15.9
       '@typescript-eslint/parser':
         specifier: 'catalog:'
-        version: 8.59.1(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
+        version: 8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
       '@typescript/native-preview':
         specifier: 'catalog:'
-        version: 7.0.0-dev.20260428.1
+        version: 7.0.0-dev.20260512.1
       '@vitejs/plugin-react':
         specifier: 'catalog:'
-        version: 6.0.1(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
+        version: 6.0.1(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
       '@vitejs/plugin-rsc':
         specifier: 'catalog:'
-        version: 0.5.25(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(react-dom@19.2.5(react@19.2.5))(react-server-dom-webpack@19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(react@19.2.5)
+        version: 0.5.26(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(react-dom@19.2.6(react@19.2.6))(react-server-dom-webpack@19.2.6(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(react@19.2.6)
       '@vitest/coverage-v8':
         specifier: 'catalog:'
-        version: 4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
+        version: 4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
       agentation:
         specifier: 'catalog:'
-        version: 3.0.2(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+        version: 3.0.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       code-inspector-plugin:
         specifier: 'catalog:'
         version: 1.5.1
       eslint:
         specifier: 'catalog:'
-        version: 10.2.1(jiti@2.6.1)
+        version: 10.3.0(jiti@2.7.0)
       eslint-markdown:
         specifier: 'catalog:'
-        version: 0.7.0(eslint@10.2.1(jiti@2.6.1))
+        version: 0.9.0(eslint@10.3.0(jiti@2.7.0))
       eslint-plugin-better-tailwindcss:
         specifier: 'catalog:'
-        version: 4.5.0(eslint@10.2.1(jiti@2.6.1))(oxlint@1.61.0(oxlint-tsgolint@0.22.0))(tailwindcss@4.2.4)(typescript@6.0.3)
+        version: 4.5.0(eslint@10.3.0(jiti@2.7.0))(oxlint@1.61.0(oxlint-tsgolint@0.22.0))(tailwindcss@4.3.0)(typescript@6.0.3)
       eslint-plugin-hyoban:
         specifier: 'catalog:'
-        version: 0.14.1(eslint@10.2.1(jiti@2.6.1))
+        version: 0.14.1(eslint@10.3.0(jiti@2.7.0))
       eslint-plugin-markdown-preferences:
         specifier: 'catalog:'
-        version: 0.41.1(@eslint/markdown@8.0.1)(eslint@10.2.1(jiti@2.6.1))
+        version: 0.41.1(@eslint/markdown@8.0.1)(eslint@10.3.0(jiti@2.7.0))
       eslint-plugin-no-barrel-files:
         specifier: 'catalog:'
-        version: 1.3.1(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
+        version: 1.3.1(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
       eslint-plugin-react-refresh:
         specifier: 'catalog:'
-        version: 0.5.2(eslint@10.2.1(jiti@2.6.1))
+        version: 0.5.2(eslint@10.3.0(jiti@2.7.0))
       eslint-plugin-sonarjs:
         specifier: 'catalog:'
-        version: 4.0.3(eslint@10.2.1(jiti@2.6.1))
+        version: 4.0.3(eslint@10.3.0(jiti@2.7.0))
       eslint-plugin-storybook:
         specifier: 'catalog:'
-        version: 10.3.5(eslint@10.2.1(jiti@2.6.1))(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(typescript@6.0.3)
+        version: 10.3.6(eslint@10.3.0(jiti@2.7.0))(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))(typescript@6.0.3)
       happy-dom:
         specifier: 'catalog:'
         version: 20.9.0
-      hono:
-        specifier: 'catalog:'
-        version: 4.12.15
       knip:
         specifier: 'catalog:'
-        version: 6.7.0(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)
+        version: 6.13.1(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)
       postcss:
         specifier: 'catalog:'
-        version: 8.5.12
+        version: 8.5.14
       react-server-dom-webpack:
         specifier: 'catalog:'
-        version: 19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+        version: 19.2.6(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       storybook:
         specifier: 'catalog:'
-        version: 10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+        version: 10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
       tailwindcss:
         specifier: 'catalog:'
-        version: 4.2.4
+        version: 4.3.0
       tsx:
         specifier: 'catalog:'
         version: 4.21.0
@@ -1365,22 +1403,22 @@ importers:
         version: 3.19.3
       vinext:
         specifier: 'catalog:'
-        version: 0.0.45(@mdx-js/rollup@3.1.1)(@vitejs/plugin-react@6.0.1(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))(@vitejs/plugin-rsc@0.5.25(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(react-dom@19.2.5(react@19.2.5))(react-server-dom-webpack@19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(react@19.2.5))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(next@16.2.4(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(react-dom@19.2.5(react@19.2.5))(react-server-dom-webpack@19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(react@19.2.5)(typescript@6.0.3)
+        version: 0.0.49(@mdx-js/rollup@3.1.1)(@vitejs/plugin-react@6.0.1(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))(@vitejs/plugin-rsc@0.5.26(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(react-dom@19.2.6(react@19.2.6))(react-server-dom-webpack@19.2.6(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(react@19.2.6))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(next@16.2.6(@babel/core@7.29.0)(@playwright/test@1.60.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(react-dom@19.2.6(react@19.2.6))(react-server-dom-webpack@19.2.6(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(react@19.2.6)(typescript@6.0.3)
       vite:
         specifier: npm:@voidzero-dev/vite-plus-core@0.1.20
-        version: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+        version: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
       vite-plugin-inspect:
         specifier: 'catalog:'
-        version: 12.0.0-beta.1(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(typescript@6.0.3)(ws@8.20.0)
+        version: 12.0.0-beta.1(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(typescript@6.0.3)(ws@8.20.0)
       vite-plus:
         specifier: 'catalog:'
-        version: 0.1.20(@types/node@25.6.0)(@vitest/coverage-v8@4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
+        version: 0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
       vitest:
         specifier: npm:@voidzero-dev/vite-plus-test@0.1.20
-        version: '@voidzero-dev/vite-plus-test@0.1.20(@types/node@25.6.0)(@vitest/coverage-v8@4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+        version: '@voidzero-dev/vite-plus-test@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
       vitest-canvas-mock:
         specifier: 'catalog:'
-        version: 1.1.4(@voidzero-dev/vite-plus-test@0.1.20(@types/node@25.6.0)(@vitest/coverage-v8@4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
+        version: 1.1.4(@voidzero-dev/vite-plus-test@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
 
 packages:
 
@@ -1391,11 +1429,8 @@ packages:
     resolution: {integrity: sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==}
     engines: {node: '>=10'}
 
-  '@amplitude/analytics-browser@2.42.0':
-    resolution: {integrity: sha512-xG1CU3M8kYjmQmxxvy8c8m1ww7wqp+kuttpVxWsItyKABBIZNofRo4E0UzENBu8PuXRcwKrLq99DdceVKtsL0g==}
-
-  '@amplitude/analytics-client-common@2.4.46':
-    resolution: {integrity: sha512-cvNzR7GY+PqvdT7b1jjs+LhLjkLr/raS8C6Jo4nTD/hDzWI+b73u12atttbgWKGJMCmki+xs+X0oyMt207+qtQ==}
+  '@amplitude/analytics-browser@2.42.2':
+    resolution: {integrity: sha512-smMBDxBuB4jdto+WVH1kbN9Tzxc3ZrgjavgG+wzV2sPFYf6B6yzGZ/Qa3aqFtB6JC+u02S7QhLV7LGSDDro2AA==}
 
   '@amplitude/analytics-client-common@2.4.47':
     resolution: {integrity: sha512-AFmZK3e3mytXtwyLeNqF85T8bGMcw4slYP8mRu9Fm5B9OZEnEqjhKYzNDEMOKtwBkEQbusHCWWYGfZT5sY2+tg==}
@@ -1403,20 +1438,20 @@ packages:
   '@amplitude/analytics-connector@1.6.4':
     resolution: {integrity: sha512-SpIv0IQMNIq6SH3UqFGiaZyGSc7PBZwRdq7lvP0pBxW8i4Ny+8zwI0pV+VMfMHQwWY3wdIbWw5WQphNjpdq1/Q==}
 
-  '@amplitude/analytics-core@2.47.1':
-    resolution: {integrity: sha512-ZdtAx5syGZBQpbZVLnc/zp7sMlq7+b1dxo/5gCG/4thNW0vOHfN4nYGlV2+k/VEEw4/hW893t5EPUCbxUJM+OQ==}
-
   '@amplitude/analytics-core@2.48.0':
     resolution: {integrity: sha512-6ckWWL60LiJJEQQ5V3Veviq0Gl5Lcvy1dFaRDKA/SwLT3cgiBrEFZXZPcri4wDGjchPmJXFCYcE55nr7rP6Wjg==}
 
+  '@amplitude/analytics-core@2.48.1':
+    resolution: {integrity: sha512-6ltecomnZc9z1AUE59orcoLYii0gPoVBBoI4qoMGXw2lsxFh35zx32LPrXO3ezFkTE71CS44AzwaBFsSxQWRuw==}
+
   '@amplitude/analytics-types@2.11.1':
     resolution: {integrity: sha512-wFEgb0t99ly2uJKm5oZ28Lti0Kh5RecR5XBkwfUpDzn84IoCIZ8GJTsMw/nThu8FZFc7xFDA4UAt76zhZKrs9A==}
 
   '@amplitude/experiment-core@0.7.2':
     resolution: {integrity: sha512-Wc2NWvgQ+bLJLeF0A9wBSPIaw0XuqqgkPKsoNFQrmS7r5Djd56um75In05tqmVntPJZRvGKU46pAp8o5tdf4mA==}
 
-  '@amplitude/plugin-autocapture-browser@1.27.0':
-    resolution: {integrity: sha512-iSQJQA2nMftjJ+MtB/ndrLRkSWqsTrGUwia9f+bRodWEQbLw36o/JVD6aHqm5rTvXYvsK/oK9Qv6PAv1lKIL5A==}
+  '@amplitude/plugin-autocapture-browser@1.27.1':
+    resolution: {integrity: sha512-vJxwfExfREBIMbVydAimO/diYsRfNBD/nqo+DABURBsdmb+gliUPd7J6g22ys7al59+ixRwJSQMUrk0bnqn76Q==}
 
   '@amplitude/plugin-custom-enrichment-browser@0.1.8':
     resolution: {integrity: sha512-PVg56GfQID/UKLZx7imbg6Tmlj2AX/euyG7nnouKpowgGJ7jz/t4o2u3csSgrKbLSrTjxdbXVdPyz/+CecJ4Zg==}
@@ -1433,58 +1468,52 @@ packages:
   '@amplitude/plugin-page-view-tracking-browser@2.11.0':
     resolution: {integrity: sha512-ZI/1kTQID0yXileGjvseMoFZ9zUbLG5r+MsznmT0Br+x91LdCrPHXdpU7lq53UAwIhgREXk9S/o/AwUZfFSgzg==}
 
-  '@amplitude/plugin-session-replay-browser@1.28.1':
-    resolution: {integrity: sha512-gSRIZUgUKEb4OvYcGYJZ553YVftq8lIzYkV9BsIQqUxFn3MVFygdQj+ZJCz75lJeyJZI7r9VhLTIzIcuIJ0KFg==}
+  '@amplitude/plugin-session-replay-browser@1.30.3':
+    resolution: {integrity: sha512-mZ1FVFIjtc2fdnUNF3GT8C8m+g7+TZl2nJDRJMDzarUrfDmjOPfnTLltdGH0ydr4Yd87AjLQiFGst7wslQhv+Q==}
 
   '@amplitude/plugin-web-vitals-browser@1.1.32':
     resolution: {integrity: sha512-cf/MR5WTJ5iwCjxdy9f7vK8zy2nD1iXPwu8eKHiRxWR7Eoqx7bT30n9dar8kWDV8kraV0sglA5pVrP3b33m/pw==}
 
-  '@amplitude/rrdom@2.0.0-alpha.37':
-    resolution: {integrity: sha512-u4dSnBtlbJ8oU5P/Ywl2RLqvjqWbkl4ScMUbvQA7in4pWcx+0NRN+VVjLZXQcd8Fn7E/rcxjeUh7e7HfwvdasQ==}
+  '@amplitude/rrdom@2.0.0-alpha.40':
+    resolution: {integrity: sha512-gmOHzCcQEHgzmlqjTiYvTrbAvlk431lmXTpSGKxrCucMg4upQHs75f+YSTFWy6w3m6LwtkUmBJuCqMF5e16Y7w==}
 
-  '@amplitude/rrweb-packer@2.0.0-alpha.36':
-    resolution: {integrity: sha512-kqKg6OGoxHZvG4jwyO4kIjLdf8MkL6JcY5iLB09PQNP7O36ysnrH+ecJfa4V1Rld99kX25Pefkw4bzKmmFAqcg==}
+  '@amplitude/rrweb-packer@2.0.0-alpha.40':
+    resolution: {integrity: sha512-Btb6b9pS1IvDMbvyYxpUdTk9NRJugSoJjRCl7R6jP/iSlPWXoveJIwHaNFAS9ZmWUEK7HhyBJ8bKGFN3giUsDg==}
 
-  '@amplitude/rrweb-plugin-console-record@2.0.0-alpha.36':
-    resolution: {integrity: sha512-7VbXu36PpJA8dSOFxpfpMaoDTuPK5uy1C8mN+Wfdm0X4ROdmrvcTdlQj+jGzhLGeK+xbTixHEy23itCNUau7hQ==}
+  '@amplitude/rrweb-plugin-console-record@2.0.0-alpha.40':
+    resolution: {integrity: sha512-vtY7T/kGFl62nC1u7ZUXQvU7ulB70cZGVHPRN/SO9fzVfsY7y6rCmBfoc2jS5KmISdlgkVzMjY2r/EE2Gk9AQA==}
     peerDependencies:
-      '@amplitude/rrweb': ^2.0.0-alpha.36
+      '@amplitude/rrweb': ^2.0.0-alpha.40
 
-  '@amplitude/rrweb-record@2.0.0-alpha.36':
-    resolution: {integrity: sha512-zSHvmG5NUG4jNgWNVM7Oj3+rJPagv+TiHlnSiJ1X0WWLIg1GbUnOoTqpincZS5QupqTxQchNQaUg9MNu0MM3sQ==}
+  '@amplitude/rrweb-record@2.0.0-alpha.40':
+    resolution: {integrity: sha512-5cJhQwzhymJWX5/XOtpWK0h2NLq9+t2YiO6ub0cdZ9F5AZizaRbsVH88int07DfX0YiXTKWbISezVuduCLqgSQ==}
 
-  '@amplitude/rrweb-snapshot@2.0.0-alpha.37':
-    resolution: {integrity: sha512-OPW2r8ESAguq+1R+z+WxGyzZzkMtojZ49Lpp6NrataNFyjdKaNXehDuLoNlEQkkUZGyDBiA7RSYvUw+JPSmmSQ==}
+  '@amplitude/rrweb-snapshot@2.0.0-alpha.40':
+    resolution: {integrity: sha512-S26czz9TSsmgMc0V9lJcgD+1lLi1G/77kh7pdMs3HHJ85GLn00yucoMOzVHC4O83frk7rE9cSNNdF+x21H0ZjA==}
 
-  '@amplitude/rrweb-types@2.0.0-alpha.36':
-    resolution: {integrity: sha512-Bd2r3Bs0XIJt5fgPRWVl8bhvA9FCjJn8vQlDTO8ffPxilGPIzUXLQ06+xoLYkK9v+PDKJnCapOTL4A2LilDmgA==}
+  '@amplitude/rrweb-types@2.0.0-alpha.40':
+    resolution: {integrity: sha512-rP7CBDkzXupxOA7ukvC+zDYLuCtsz54TuJKC4+5O72Jsz4YdokLznKZRG34P6zXozfhGU0261qckk87lLY6mKQ==}
 
-  '@amplitude/rrweb-types@2.0.0-alpha.37':
-    resolution: {integrity: sha512-LW9wQ85umaAW/qlemTrUC408WVoBx99hvFCjsNRnxAyUmRemWyYY7+o8xPyeUexoWGqizPMkkNnPEO8t1NFjtw==}
+  '@amplitude/rrweb-utils@2.0.0-alpha.40':
+    resolution: {integrity: sha512-i1CCt6MCjlqoeNc+1Hse5bz+ZbASaWaIJ0WdJZvnQjUCHH29Xy/QFouyOuor73RZ+UWX4s2tYSrUIdmBepXk3w==}
 
-  '@amplitude/rrweb-utils@2.0.0-alpha.36':
-    resolution: {integrity: sha512-w5RGROLU1Kyrq9j+trxcvvfkTp05MEKJ70Ig+YvHyZsE0nElh1PCF8PHAjV0/kji68+KqB03c0hoyaV99CDaDw==}
+  '@amplitude/rrweb@2.0.0-alpha.40':
+    resolution: {integrity: sha512-pFXwvQmLXTWSattr3y2ufQdZY7Is3abP0xIsHe7D7YI8D4hZ8Erf/2Z1HmuH33lHqV5e/ZItFF5gJftSiiV3TA==}
 
-  '@amplitude/rrweb-utils@2.0.0-alpha.37':
-    resolution: {integrity: sha512-40YvPj24ietFQ3BTLfvFRPriRqdNOp3DzGiPU+WDOZkI3KjInQrEsibaqNBSXzJ+kMWrm8/eEwcQ0FkLk7Achw==}
-
-  '@amplitude/rrweb@2.0.0-alpha.37':
-    resolution: {integrity: sha512-jJkSpPYiVgOZB422pb2jOJJn3pvb5E5f9vKK8CEmUlk2mVAl6kPQzW98mb05M65OJFj5nn9tSe9h5r5+Cl93ag==}
-
-  '@amplitude/session-replay-browser@1.39.0':
-    resolution: {integrity: sha512-JUVrzBNFbZKvA3QFls5fVLRvpr8F369omyIQzF5qkIpB9ExpAXqRvSXpwX+64oXlugQfW0oR9iAgRu10C66ygg==}
+  '@amplitude/session-replay-browser@1.42.3':
+    resolution: {integrity: sha512-DV33ilG/Gww4Wq/g39xnzY5JYK6pDXCZnSkvsyNoLdS7ecQEVO+VCVSc1Uof8/U/t5VBpwHNbGmhXvc4HIQ9mw==}
 
   '@amplitude/targeting@0.2.0':
     resolution: {integrity: sha512-/50ywTrC4hfcfJVBbh5DFbqMPPfaIOivZeb5Gb+OGM03QrA+lsUqdvtnKLNuWtceD4H6QQ2KFzPJ5aAJLyzVDA==}
 
-  '@antfu/eslint-config@8.2.0':
-    resolution: {integrity: sha512-spfwYXMNrlkl69riTSBnbC0C2K8EVfVMOK3ceP2EpAAioyfprIW1gTwyLRtd9jZSFeNdX4mFNAIG+o0sOneOfA==}
+  '@antfu/eslint-config@9.0.0':
+    resolution: {integrity: sha512-8aQW0UWHoNMdVxTfzs1+w10t26plsc9oFs8YhCyCtST5nnANJe/VAjqvR3hYI1l3PHBeo4tjVMg8wuu6g3OLlA==}
     hasBin: true
     peerDependencies:
       '@angular-eslint/eslint-plugin': ^21.1.0
       '@angular-eslint/eslint-plugin-template': ^21.1.0
       '@angular-eslint/template-parser': ^21.1.0
-      '@eslint-react/eslint-plugin': ^3.0.0
+      '@eslint-react/eslint-plugin': ^5.6.0
       '@next/eslint-plugin-next': '>=15.0.0'
       '@prettier/plugin-xml': ^3.4.1
       '@unocss/eslint-plugin': '>=0.50.0'
@@ -1649,32 +1678,22 @@ packages:
   '@braintree/sanitize-url@7.1.2':
     resolution: {integrity: sha512-jigsZK+sMF/cuiB7sERuo9V7N9jx+dhmHHnQyDSVdpZwVutaBu7WvNYqMDLSgFgfB30n452TP3vjDAvFC973mA==}
 
-  '@chevrotain/cst-dts-gen@11.1.2':
-    resolution: {integrity: sha512-XTsjvDVB5nDZBQB8o0o/0ozNelQtn2KrUVteIHSlPd2VAV2utEb6JzyCJaJ8tGxACR4RiBNWy5uYUHX2eji88Q==}
-
-  '@chevrotain/gast@11.1.2':
-    resolution: {integrity: sha512-Z9zfXR5jNZb1Hlsd/p+4XWeUFugrHirq36bKzPWDSIacV+GPSVXdk+ahVWZTwjhNwofAWg/sZg58fyucKSQx5g==}
-
-  '@chevrotain/regexp-to-ast@11.1.2':
-    resolution: {integrity: sha512-nMU3Uj8naWer7xpZTYJdxbAs6RIv/dxYzkYU8GSwgUtcAAlzjcPfX1w+RKRcYG8POlzMeayOQ/znfwxEGo5ulw==}
-
   '@chevrotain/types@11.1.2':
     resolution: {integrity: sha512-U+HFai5+zmJCkK86QsaJtoITlboZHBqrVketcO2ROv865xfCMSFpELQoz1GkX5GzME8pTa+3kbKrZHQtI0gdbw==}
 
-  '@chevrotain/utils@11.1.2':
-    resolution: {integrity: sha512-4mudFAQ6H+MqBTfqLmU7G1ZwRzCLfJEooL/fsF6rCX5eePMbGhoy5n4g+G4vlh2muDcsCTJtL+uKbOzWxs5LHA==}
-
   '@chromatic-com/storybook@5.1.2':
     resolution: {integrity: sha512-H/hgvwC3E+OtseP2OT2QYUJH2VfnzT6wM3pWOkaNV6g7QI+VUdWJbeJ3o2jFqvEPQNqzhQKWDOlvM4lu+7is6g==}
     engines: {node: '>=20.0.0', yarn: '>=1.22.18'}
     peerDependencies:
       storybook: ^0.0.0-0 || ^10.1.0 || ^10.1.0-0 || ^10.2.0-0 || ^10.3.0-0 || ^10.4.0-0
 
-  '@clack/core@1.2.0':
-    resolution: {integrity: sha512-qfxof/3T3t9DPU/Rj3OmcFyZInceqj/NVtO9rwIuJqCUgh32gwPjpFQQp/ben07qKlhpwq7GzfWpST4qdJ5Drg==}
+  '@clack/core@1.3.1':
+    resolution: {integrity: sha512-fT1qHVGAag4IEkrupZ6lRRbNCs1vS9P01KB/sG8zKgvUztbYtFBtQpjSITNwooDZ83tpsPzP0mRNs1/KVszCRA==}
+    engines: {node: '>= 20.12.0'}
 
-  '@clack/prompts@1.2.0':
-    resolution: {integrity: sha512-4jmztR9fMqPMjz6H/UZXj0zEmE43ha1euENwkckKKel4XpSfokExPo5AiVStdHSAlHekz4d0CA/r45Ok1E4D3w==}
+  '@clack/prompts@1.4.0':
+    resolution: {integrity: sha512-S0My7XPGIgpRWMDG8uRqalbgT+a6FmCUdOW+HaIOVVpUPHOb7RrpvjTjiODadKp06fsrVDJZlIzc6yCTp4AnxA==}
+    engines: {node: '>= 20.12.0'}
 
   '@code-inspector/core@1.5.1':
     resolution: {integrity: sha512-Y9JdgoxVh93xRMupTa1lT/v+UlcBEpM7Y1BTxQy924wSe6VVEXsJ1nPJ/Ob2HPMUAA6F568aHALi2KDUhA2kzg==}
@@ -1704,8 +1723,8 @@ packages:
   '@cucumber/cucumber-expressions@19.0.0':
     resolution: {integrity: sha512-4FKoOQh2Uf6F6/Ln+1OxuK8LkTg6PyAqekhf2Ix8zqV2M54sH+m7XNJNLhOFOAW/t9nxzRbw2CcvXbCLjcvHZg==}
 
-  '@cucumber/cucumber@12.8.2':
-    resolution: {integrity: sha512-IvprstODr0JYTtVG7CQbphN6AGRpzzAQ1EjG7TSumuS15uvVt0inWm8/9uzX8oJwEv5ReU7JruDFim4938omog==}
+  '@cucumber/cucumber@12.8.3':
+    resolution: {integrity: sha512-4F6YAO0kuFhHvIlQLV7aDJ5mwdmiynecO0dqg3VQURA4PFljJ4QbM0I2+1n8WhIBFzJpNayKOY/FhKH4Cp9QHA==}
     engines: {node: 20 || 22 || >=24}
     hasBin: true
 
@@ -1756,11 +1775,11 @@ packages:
   '@cucumber/tag-expressions@9.1.0':
     resolution: {integrity: sha512-bvHjcRFZ+J1TqIa9eFNO1wGHqwx4V9ZKV3hYgkuK/VahHx73uiP4rKV3JVrvWSMrwrFvJG6C8aEwnCWSvbyFdQ==}
 
-  '@e18e/eslint-plugin@0.3.0':
-    resolution: {integrity: sha512-hHgfpxsrZ2UYHcicA+tGZnmk19uJTaye9VH79O+XS8R4ona2Hx3xjhXghclNW58uXMk3xXlbYEOMr8thsoBmWg==}
+  '@e18e/eslint-plugin@0.4.1':
+    resolution: {integrity: sha512-Re00N8ad1HsNrzpuIX7Bhdr8RSaFWp6VgwJUEJF+47+D1CMcXoS7VNRkIG23e46pddhgxWU0cWk4wYiQIuMHqQ==}
     peerDependencies:
       eslint: ^9.0.0 || ^10.0.0
-      oxlint: ^1.55.0
+      oxlint: ^1.61.0
     peerDependenciesMeta:
       eslint:
         optional: true
@@ -1772,14 +1791,11 @@ packages:
     peerDependencies:
       tailwindcss: '*'
 
-  '@emnapi/core@1.9.2':
-    resolution: {integrity: sha512-UC+ZhH3XtczQYfOlu3lNEkdW/p4dsJ1r/bP7H8+rhao3TTTMO1ATq/4DdIi23XuGoFY+Cz0JmCbdVl0hz9jZcA==}
+  '@emnapi/core@1.10.0':
+    resolution: {integrity: sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==}
 
-  '@emnapi/runtime@1.9.1':
-    resolution: {integrity: sha512-VYi5+ZVLhpgK4hQ0TAjiQiZ6ol0oe4mBx7mVv7IflsiEp0OWoVsp/+f9Vc1hOhE0TtkORVrI1GvzyreqpgWtkA==}
-
-  '@emnapi/runtime@1.9.2':
-    resolution: {integrity: sha512-3U4+MIWHImeyu1wnmVygh5WlgfYDtyf0k8AbLhMFxOipihf6nrWC4syIm/SwEeec0mNSafiiNnMJwbza/Is6Lw==}
+  '@emnapi/runtime@1.10.0':
+    resolution: {integrity: sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==}
 
   '@emnapi/wasi-threads@1.2.1':
     resolution: {integrity: sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==}
@@ -1971,39 +1987,53 @@ packages:
     resolution: {integrity: sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==}
     engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
 
-  '@eslint-react/ast@3.0.0':
-    resolution: {integrity: sha512-qBasEJqMhcof/pbxhKSgp52rW9TMUMVIYqv3SOgSzvDG3bed+saWFXOQ+YFMj/o5gr/e6Dsi3mAHqErPzJHelA==}
+  '@eslint-react/ast@5.7.7':
+    resolution: {integrity: sha512-6Ga2QquxpVE1NKku8HgX02/HPkI3RP/dciaqlHGp2va+h0ZJeD57un8b7M+o70S3d/yBTJz0a77ZiPRX5Pggeg==}
     engines: {node: '>=22.0.0'}
     peerDependencies:
-      eslint: ^10.0.0
+      eslint: ^10.3.0
       typescript: '*'
 
-  '@eslint-react/core@3.0.0':
-    resolution: {integrity: sha512-PKa13GrqUAilcvcONJMN8BukuVg3dHuaTxjNBdKOHGxkMexCxDF9hjNHBILErJhFs1kGaJPBK9QUYQci8PV/TA==}
+  '@eslint-react/core@5.7.7':
+    resolution: {integrity: sha512-WqOOUAJgwRNdYPetYfB/ZAIh4uC6NRdp7tNO6wbgDEggEc+2EkUQSpuVhg3JU/HiPaqWvbVwXVFdm+NOVlGUgw==}
     engines: {node: '>=22.0.0'}
     peerDependencies:
-      eslint: ^10.0.0
+      eslint: ^10.3.0
       typescript: '*'
 
-  '@eslint-react/eslint-plugin@3.0.0':
-    resolution: {integrity: sha512-OK8rBrsM/bUr0L918hQ1tWAufz22+m0L6gpSrW3Z/7NSg/imy17IiZHO8UVT99sgcx9euKYAT+QIx45sZUYf1g==}
+  '@eslint-react/eslint-plugin@5.7.7':
+    resolution: {integrity: sha512-be7Y8F5u36Zh5sY07z1OX4hVY/nNvrdPTQZ74TA8rNRO2UaiBULkmYyStcOLeomDOJHNc9xiOp6dK9QVhQ9zqQ==}
     engines: {node: '>=22.0.0'}
     peerDependencies:
-      eslint: ^10.0.0
+      eslint: ^10.3.0
       typescript: '*'
 
-  '@eslint-react/shared@3.0.0':
-    resolution: {integrity: sha512-oHELwh3FghrMc5UX+4qVEdY7ZLZsO4bgKDVv5i6yk8+/997xe6LAY2wailbeljbIJxppcJSl6eXcRl2yv6ffig==}
+  '@eslint-react/eslint@5.7.7':
+    resolution: {integrity: sha512-kE3GhRtm+l+QitUVor1Dmox35mYvjJDtbAT/AEV25FixH53tXC9ZfsjlRzEDmjAdF2B1Z4gjOpim1vHG4PVaDg==}
     engines: {node: '>=22.0.0'}
     peerDependencies:
-      eslint: ^10.0.0
+      eslint: ^10.3.0
       typescript: '*'
 
-  '@eslint-react/var@3.0.0':
-    resolution: {integrity: sha512-Af/7GEZfXtc9jV1i/Uqfko40Gr256YXDZR9CG6mxROOUOMRYIaBPf3K7oLCnwiKVZXiFJ5qYGLEs6HoG8Ifrjw==}
+  '@eslint-react/jsx@5.7.7':
+    resolution: {integrity: sha512-5dTnSC4NQlsHhXDSu99WK8PHJvzJ6h2aMoG7N8Ogov3fDB2iDPhaHkCB+w5/II4H5uhX4X7CuC/U8aFAl7nXEw==}
     engines: {node: '>=22.0.0'}
     peerDependencies:
-      eslint: ^10.0.0
+      eslint: ^10.3.0
+      typescript: '*'
+
+  '@eslint-react/shared@5.7.7':
+    resolution: {integrity: sha512-yPjGe/fhc+V0icGLObhI/iQPtKkHnanv7BWWDguhc5/avRJBRNzwKo4KMBuHHivyn/r78Dw2cC7cFFbR6tELCg==}
+    engines: {node: '>=22.0.0'}
+    peerDependencies:
+      eslint: ^10.3.0
+      typescript: '*'
+
+  '@eslint-react/var@5.7.7':
+    resolution: {integrity: sha512-r9j/dIct99bMxYgbGYgFhoDmqBVqTuJRnp+KK3xI0TG5SU57NTrr3DfJqlcz7PHehVDhagH+y7noWzueAqZbfA==}
+    engines: {node: '>=22.0.0'}
+    peerDependencies:
+      eslint: ^10.3.0
       typescript: '*'
 
   '@eslint/compat@2.0.3':
@@ -2019,10 +2049,6 @@ packages:
     resolution: {integrity: sha512-Y3kKLvC1dvTOT+oGlqNQ1XLqK6D1HU2YXPc52NmAlJZbMMWDzGYXMiPRJ8TYD39muD/OTjlZmNJ4ib7dvSrMBA==}
     engines: {node: ^20.19.0 || ^22.13.0 || >=24}
 
-  '@eslint/config-helpers@0.5.4':
-    resolution: {integrity: sha512-jJhqiY3wPMlWWO3370M86CPJ7pt8GmEwSLglMfQhjXal07RCvhmU0as4IuUEW5SJeunfItiEetHmSxCCe9lDBg==}
-    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
-
   '@eslint/config-helpers@0.5.5':
     resolution: {integrity: sha512-eIJYKTCECbP/nsKaaruF6LW967mtbQbsw4JTtSVkUQc9MneSkbrgPJAbKl9nWr0ZeowV8BfsarBmPpBzGelA2w==}
     engines: {node: ^20.19.0 || ^22.13.0 || >=24}
@@ -2031,10 +2057,6 @@ packages:
     resolution: {integrity: sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@eslint/core@1.2.0':
-    resolution: {integrity: sha512-8FTGbNzTvmSlc4cZBaShkC6YvFMG0riksYWRFKXztqVdXaQbcZLXlFbSpC05s70sGEsXAw0qwhx69JiW7hQS7A==}
-    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
-
   '@eslint/core@1.2.1':
     resolution: {integrity: sha512-MwcE1P+AZ4C6DWlpin/OmOA54mmIZ/+xZuJiQd4SyB29oAJjN30UW9wkKNptW2ctp4cEsvhlLY/CsQ1uoHDloQ==}
     engines: {node: ^20.19.0 || ^22.13.0 || >=24}
@@ -2088,12 +2110,6 @@ packages:
       react: '>=16.8.0'
       react-dom: '>=16.8.0'
 
-  '@floating-ui/react@0.26.28':
-    resolution: {integrity: sha512-yORQuuAtVpiRjpMhdc0wJj06b9JFjrYF4qp96j++v2NBpbi6SEGF7donUJ3TMieerQ6qVkAv1tgr7L4r5roTqw==}
-    peerDependencies:
-      react: '>=16.8.0'
-      react-dom: '>=16.8.0'
-
   '@floating-ui/react@0.27.19':
     resolution: {integrity: sha512-31B8h5mm8YxotlE7/AU/PhNAl8eWxAmjL/v2QOxroDNkTFLk3Uu82u63N3b6TXa4EGJeeZLVcd/9AlNlVqzeog==}
     peerDependencies:
@@ -2103,18 +2119,11 @@ packages:
   '@floating-ui/utils@0.2.11':
     resolution: {integrity: sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==}
 
-  '@formatjs/fast-memoize@3.1.2':
-    resolution: {integrity: sha512-vPnriihkfK0lzoQGaXq+qXH23VsYyansRTkTgo2aTG0k1NjLFyZimFVdfj4C9JkSE5dm7CEngcQ5TTc1yAyBfQ==}
+  '@formatjs/fast-memoize@3.1.5':
+    resolution: {integrity: sha512-KLi3fan6WnCHmigd9pmEEN8Hid0v4wiFBW576M/d07KMWYecf1CvyMI3n34vCmHT4AoVqG2n702kiHbXjzZX2A==}
 
-  '@formatjs/intl-localematcher@0.8.4':
-    resolution: {integrity: sha512-J51dAnynnqJdVUEXidHoIWn+qYve+yNQEgmFk9Dyfr3p0okzm+5QhQ+9QmsMz08+BeWTVpc1HadIiLfZmRYbAQ==}
-
-  '@headlessui/react@2.2.10':
-    resolution: {integrity: sha512-5pVLNK9wlpxTUTy9GpgbX/SdcRh+HBnPktjM2wbiLTH4p+2EPHBO1aoSryUCuKUIItdDWO9ITlhUL8UnUN/oIA==}
-    engines: {node: '>=10'}
-    peerDependencies:
-      react: ^18 || ^19 || ^19.0.0-rc
-      react-dom: ^18 || ^19 || ^19.0.0-rc
+  '@formatjs/intl-localematcher@0.8.7':
+    resolution: {integrity: sha512-1R/ljfRKG1fUhKG4F0lUmrEKPkr/PlHqbgQ8xeYQYYunXu5/0+vbQeeVgGAgydp13Tq+S1X5Qjn6L90hijXjHg==}
 
   '@heroicons/react@2.2.0':
     resolution: {integrity: sha512-LMcepvRaS9LYHJGsF0zzmgKCUim/X3N/DQKc4jepAXJ7l8QxJ1PmxJzqplF2Z3FE4PqBAIGyJAQ/w4B5dsqbtQ==}
@@ -2125,19 +2134,19 @@ packages:
     resolution: {integrity: sha512-Iciv2vUCJTW9lWM/ROvyZLblmcbYJHPuXfzb1SzeDVVn4xEXu2ilLU1pq3fn+09FZ/Y0P7VyvRE47UDU6om8xA==}
     engines: {node: '>=22.13.0'}
 
-  '@hey-api/json-schema-ref-parser@1.4.1':
-    resolution: {integrity: sha512-DoPJGxVApDlktP1yYLjmOrF0YBEqb32ieCbx1S1i09n8TyCgdoh4yQaQ3kp0sMTauH+bwNKPsFh7S8qiWCoKZA==}
+  '@hey-api/json-schema-ref-parser@1.4.2':
+    resolution: {integrity: sha512-ZhCFSKI2ipZHEbgmtUHdyddvRU3wJ4elgCfYUC7T7hZa4EivSrVflTQf2w+v3TuaYxR1Y2V2kq3otqTttrrK8Q==}
     engines: {node: '>=22.13.0'}
 
-  '@hey-api/openapi-ts@0.97.0':
-    resolution: {integrity: sha512-WZkKgrDlZpxKlDv2HkBCzaAYeuM+EtZKFmKGBv9/JblAKpX3JQTROi7PzlCZE3eisetRPSakbcRgn+LGyB7EiQ==}
+  '@hey-api/openapi-ts@0.97.1':
+    resolution: {integrity: sha512-LksUJeXAqwf6OhcCCr3/B4YjnBs5rqSqjDUKMBvkgp4OhaCQiJrOvntctFxdnugy8jUojP4yi/eJf5xYzcYzCQ==}
     engines: {node: '>=22.13.0'}
     hasBin: true
     peerDependencies:
       typescript: '>=5.5.3 || >=6.0.0 || 6.0.1-rc'
 
-  '@hey-api/shared@0.4.2':
-    resolution: {integrity: sha512-4fconS10E0Xr4/acV8G+BkApxaIStxrT0GhB9BDTQWvrFTy5/nV933SyFk8qImcbpKvgv9hpn3N+7bV8oFrbjA==}
+  '@hey-api/shared@0.4.3':
+    resolution: {integrity: sha512-3tHfZNXgGOt+3P3Kq9cvqmZ9i7e3jtrkip1uDpZTX1+hTNboHhYdjxnT8AbrDuvslTaQHoAOlP4/iCDdzd9Jag==}
     engines: {node: '>=22.13.0'}
 
   '@hey-api/spec-types@0.2.0':
@@ -2146,8 +2155,8 @@ packages:
   '@hey-api/types@0.1.4':
     resolution: {integrity: sha512-thWfawrDIP7wSI9ioT13I5soaaqB5vAPIiZmgD8PbeEVKNrkonc0N/Sjj97ezl7oQgusZmaNphGdMKipPO6IBg==}
 
-  '@hono/node-server@2.0.0':
-    resolution: {integrity: sha512-n3GfHwwCvHCkGmOwKfxUPOlbfzuO64Sbc5XC4NGPIXxkuOnJrdgExdRKmHfF924r914WRJPT397GdqLvdYTeyQ==}
+  '@hono/node-server@2.0.2':
+    resolution: {integrity: sha512-tXlTi1h/4V7sDe7i97IVP+9re9ZU7wXZZggnR5ucCRclf1+AX6YhGStrR5w8bLj+3Mlyl0pKfBh9gqTqqnGKfQ==}
     engines: {node: '>=20'}
     peerDependencies:
       hono: ^4
@@ -2472,8 +2481,8 @@ packages:
     peerDependencies:
       rollup: 4.59.0
 
-  '@mermaid-js/parser@1.1.0':
-    resolution: {integrity: sha512-gxK9ZX2+Fex5zu8LhRQoMeMPEHbc73UKZ0FQ54YrQtUxE1VVhMwzeNtKRPAu5aXks4FasbMe4xB4bWrmq6Jlxw==}
+  '@mermaid-js/parser@1.1.1':
+    resolution: {integrity: sha512-VuHdsYMK1bT6X2JbcAaWAhugTRvRBRyuZgd+c22swUeI9g/ntaxF7CY7dYarhZovofCbUNO0G7JesfmNtjYOCw==}
 
   '@monaco-editor/loader@1.7.0':
     resolution: {integrity: sha512-gIwR1HrJrrx+vfyOhYmCZ0/JcWqG5kbfG7+d3f/C1LXk2EvzAbHSg3MQ5lO2sMlo9izoAZ04shohfKLVT6crVA==}
@@ -2497,14 +2506,14 @@ packages:
   '@next/env@16.0.0':
     resolution: {integrity: sha512-s5j2iFGp38QsG1LWRQaE2iUY3h1jc014/melHFfLdrsMJPqxqDQwWNwyQTcNoUSGZlCVZuM7t7JDMmSyRilsnA==}
 
-  '@next/env@16.2.4':
-    resolution: {integrity: sha512-dKkkOzOSwFYe5RX6y26fZgkSpVAlIOJKQHIiydQcrWH6y/97+RceSOAdjZ14Qa3zLduVUy0TXcn+EiM6t4rPgw==}
+  '@next/env@16.2.6':
+    resolution: {integrity: sha512-gd8HoHN4ufj73WmR3JmVolrpJR47ILK6LouP5xElPglaVxir6e1a7VzvTvDWkOoPXT9rkkTzyCxBu4yeZfZwcw==}
 
-  '@next/eslint-plugin-next@16.2.4':
-    resolution: {integrity: sha512-tOX826JJ96gYK/go18sPUgMq9FK1tqxBFfUCEufJb5XIkWFFmpgU7mahJANKGkHs7F41ir3tReJ3Lv5La0RvhA==}
+  '@next/eslint-plugin-next@16.2.6':
+    resolution: {integrity: sha512-Z8l6o4JWKUl755x4R+wogD86KPeU+Ckw4K+SYG4kHeOJtRenDeK+OSbGcqZpDtbwn9DsJVdir2UxmwXuinUbUw==}
 
-  '@next/mdx@16.2.4':
-    resolution: {integrity: sha512-e/3bgla+/oF3vDlndI0eFPa0bnP47HPVA0InsAJi7Jr3DwV8WpEGuOcm/3PdI5/93FfNiBhMVeVHZpm1sFlmJw==}
+  '@next/mdx@16.2.6':
+    resolution: {integrity: sha512-0hdoSkzRbyud1dNRRDiyqD9FrxR2wwdiW+ffhYx+n+fXrFOJ7Nwpi8o7nUz2LiiM44BB9M0eIO1Evy3BBrS50A==}
     peerDependencies:
       '@mdx-js/loader': '>=0.15.0'
       '@mdx-js/react': '>=0.15.0'
@@ -2514,54 +2523,54 @@ packages:
       '@mdx-js/react':
         optional: true
 
-  '@next/swc-darwin-arm64@16.2.4':
-    resolution: {integrity: sha512-OXTFFox5EKN1Ym08vfrz+OXxmCcEjT4SFMbNRsWZE99dMqt2Kcusl5MqPXcW232RYkMLQTy0hqgAMEsfEd/l2A==}
+  '@next/swc-darwin-arm64@16.2.6':
+    resolution: {integrity: sha512-ZJGkkcNfYgrrMkqOdZ7zoLa1TOy0qpcMfk/z4Mh/FKUz40gVO+HNQWqmLxf67Z5WB64DRp0dhEbyHfel+6sJUg==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [darwin]
 
-  '@next/swc-darwin-x64@16.2.4':
-    resolution: {integrity: sha512-XhpVnUfmYWvD3YrXu55XdcAkQtOnvaI6wtQa8fuF5fGoKoxIUZ0kWPtcOfqJEWngFF/lOS9l3+O9CcownhiQxQ==}
+  '@next/swc-darwin-x64@16.2.6':
+    resolution: {integrity: sha512-v/YLBHIY132Ced3puBJ7YJKw1lqsCrgcNo2aRJlCEyQrrCeRJlvGlnmxhPxNQI3KE3N1DN5r9TPNPvka3nq5RQ==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [darwin]
 
-  '@next/swc-linux-arm64-gnu@16.2.4':
-    resolution: {integrity: sha512-Mx/tjlNA3G8kg14QvuGAJ4xBwPk1tUHq56JxZ8CXnZwz1Etz714soCEzGQQzVMz4bEnGPowzkV6Xrp6wAkEWOQ==}
+  '@next/swc-linux-arm64-gnu@16.2.6':
+    resolution: {integrity: sha512-RPOvqlYBbcQjkz9VQQDZ2T2bARIjXZV1KFlt+V2Mr6SW/e4I9fcKsaA0hdyf2FHoTlsV2xnBd5Y912rP/1Ce6w==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@next/swc-linux-arm64-musl@16.2.4':
-    resolution: {integrity: sha512-iVMMp14514u7Nup2umQS03nT/bN9HurK8ufylC3FZNykrwjtx7V1A7+4kvhbDSCeonTVqV3Txnv0Lu+m2oDXNg==}
+  '@next/swc-linux-arm64-musl@16.2.6':
+    resolution: {integrity: sha512-URUTu1+dMkxJsPFgm+OeEvq9wf5sujw0EvgYy80TDGHTSLTnIHeqb0Eu8A3sC95IRgjejQL+kC4mw+4yPxiAXA==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@next/swc-linux-x64-gnu@16.2.4':
-    resolution: {integrity: sha512-EZOvm1aQWgnI/N/xcWOlnS3RQBk0VtVav5Zo7n4p0A7UKyTDx047k8opDbXgBpHl4CulRqRfbw3QrX2w5UOXMQ==}
+  '@next/swc-linux-x64-gnu@16.2.6':
+    resolution: {integrity: sha512-DOj182mPV8G3UkrayLoREM5YEYI+Dk5wv7Ox9xl1fFibAELEsFD0lDPfHIeILlutMMfdyhlzYPELG3peuKaurw==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@next/swc-linux-x64-musl@16.2.4':
-    resolution: {integrity: sha512-h9FxsngCm9cTBf71AR4fGznDEDx1hS7+kSEiIRjq5kO1oXWm07DxVGZjCvk0SGx7TSjlUqhI8oOyz7NfwAdPoA==}
+  '@next/swc-linux-x64-musl@16.2.6':
+    resolution: {integrity: sha512-HKQ5SP/V/ub73UvF7n/zeJlxk2kLmtL7Wzrg4WfmkjmNos5onJ2tKu7yZOPdL18A6Svfn3max29ym+ry7NkK4g==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@next/swc-win32-arm64-msvc@16.2.4':
-    resolution: {integrity: sha512-3NdJV5OXMSOeJYijX+bjaLge3mJBlh4ybydbT4GFoB/2hAojWHtMhl3CYlYoMrjPuodp0nzFVi4Tj2+WaMg+Ow==}
+  '@next/swc-win32-arm64-msvc@16.2.6':
+    resolution: {integrity: sha512-LZXpTlPyS5v7HhSmnvsLGP3iIYgYOBnc8r8ArlT55sGHV89bR2HlDdBjWQ+PY6SJMmk8TuVGFuxalnP3k/0Dwg==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [win32]
 
-  '@next/swc-win32-x64-msvc@16.2.4':
-    resolution: {integrity: sha512-kMVGgsqhO5YTYODD9IPGGhA6iprWidQckK3LmPeW08PIFENRmgfb4MjXHO+p//d+ts2rpjvK5gXWzXSMrPl9cw==}
+  '@next/swc-win32-x64-msvc@16.2.6':
+    resolution: {integrity: sha512-F0+4i0h9J6C4eE3EAPWsoCk7UW/dbzOjyzxY0qnDUOYFu6FFmdZ6l97/XdV3/Nz3VYyO7UWjyEJUXkGqcoXfMA==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [win32]
@@ -2590,165 +2599,165 @@ packages:
     resolution: {integrity: sha512-y3SvzjuY1ygnzWA4Krwx/WaJAsTMP11DN+e21A8Fa8PW1oDtVB5NSRW7LWurAiS2oKRkuCgcjTYMkBuBkcPCRg==}
     engines: {node: '>=12.4.0'}
 
-  '@orpc/client@1.14.0':
-    resolution: {integrity: sha512-TYVcj1s5bN9adggeqIXFdIdoBBUAMUxQwMNv6YagjiaZkGtqWUYd1Y1vU0Rn/9xHWF2+0hBZNUKUmP5qrQhIAw==}
+  '@orpc/client@1.14.3':
+    resolution: {integrity: sha512-0HzeD/BgPctvFnd6ltjuQvx4/POXo0K01Tee/3whAm3ohXnlGqCfhzR2VMN8zBaGs1SYe6AFzjmGG928Ej3pAg==}
 
-  '@orpc/contract@1.14.0':
-    resolution: {integrity: sha512-FUxBNqWr6mOjI+w1JPzO/iHmR3M+GA53ivaxp+eOnQu7g3ZGKB0RS5gJ/oz3cGF1gvuIcCw9FVYKK/5tkB8I1Q==}
+  '@orpc/contract@1.14.3':
+    resolution: {integrity: sha512-docXs4ALK3TADAnscEywjqvV1Dy+4+B6ihfo33hayvJdxZdpVmxjHOf7pcAYaJFJ6+LgKYoskaVVKad6LLxFlg==}
 
-  '@orpc/openapi-client@1.14.0':
-    resolution: {integrity: sha512-joeVdSX2YYFQM+bY4SdNHmnoiw7aYfc7NDEWDncnjpho6bj3DhnDNsINgFnFX7A9by7mVYaLw45yqjDhNSMprg==}
+  '@orpc/openapi-client@1.14.3':
+    resolution: {integrity: sha512-1vp+hi858XDrCwYdhONl15YKNlHtj5F5gI3dq/McRRZ45tZ9/Ma03hxzABOOcayaT1L9nX7gPxhX7l5EuRf2zw==}
 
-  '@orpc/shared@1.14.0':
-    resolution: {integrity: sha512-WNzofimsE3sKbkyAAwVKMwG4P7sL0fzDLUhXqEXuJ9Yjll+phy/jSRK9TupNMtsPyz9ViKHKCQcwmsdgIgn9Sg==}
+  '@orpc/shared@1.14.3':
+    resolution: {integrity: sha512-S7qmhZT4vchKEF6F6YduG5ub5lWnvQRVNq1/f5/kJkSnYMG5q6rWLcK7c3wYfDkeap05ZIiWTwksH+fv+yJOrw==}
     peerDependencies:
       '@opentelemetry/api': '>=1.9.0'
     peerDependenciesMeta:
       '@opentelemetry/api':
         optional: true
 
-  '@orpc/standard-server-fetch@1.14.0':
-    resolution: {integrity: sha512-qg315ZVbQ+02WnLzep7YvCsXb8BdefZ7Zjt+/emu6+Ypgw4fS0O78jtMHy3r39YvdvC9U2hWt8hff1yKiVlvQA==}
+  '@orpc/standard-server-fetch@1.14.3':
+    resolution: {integrity: sha512-IHpBpyd+CTav7ycftKkQax6qrMGdpQfYKCuTLK+P3xsBl1A07UXvlpzPi/8MjyNGDCRAQkTaN7JIr/uqLL1B8A==}
 
-  '@orpc/standard-server-peer@1.14.0':
-    resolution: {integrity: sha512-Phk8D04uxNJMLvl7JfJlWvfzDXwzfGweh4jmQI69zSV+flihp57dkZuk8gpTE7rfDClFiKCDauVsB/pQxwM09Q==}
+  '@orpc/standard-server-peer@1.14.3':
+    resolution: {integrity: sha512-Pk2Sccy+rnMYEDZnbO23NE6gP7ltk8pmlKABE4xlD1l87I/vENip94tiTG0QqmAmKCZ20Gec9vHtuLxtUqMOjQ==}
 
-  '@orpc/standard-server@1.14.0':
-    resolution: {integrity: sha512-zN3Q+ajsoLoxLYmONc1RkDyhIg1wENolrTly8HfodcR3gYrfFRcGhUzShqa/KdG47mK49Nps8rdeeMj6NT8EYw==}
+  '@orpc/standard-server@1.14.3':
+    resolution: {integrity: sha512-qO6xJy+S15Wx0elQeVojo3p5EgBLJDTEtElPcUF9o4ac8hrikYZJBeSg7qGgu/elCIrVbaFk/16Lu8P4qatPWg==}
 
-  '@orpc/tanstack-query@1.14.0':
-    resolution: {integrity: sha512-Bjx29HULT5PNSaGFkt+rExTqQonZfaqrAMUOLWBBNlI8TtPMvnKtDxlzmvO5J4Aq8k5p0t+cZX1E6HTeH3mqKQ==}
+  '@orpc/tanstack-query@1.14.3':
+    resolution: {integrity: sha512-SRoq4zCRF65vlveFegaaVHaqmlpOxI/tHL/sdKVrELJ3zPq22sS4GZQeABIdevH25wjxWBO0gKrVaazzTtVA6Q==}
     peerDependencies:
-      '@orpc/client': 1.14.0
+      '@orpc/client': 1.14.3
       '@tanstack/query-core': '>=5.80.2'
 
   '@ota-meshi/ast-token-store@0.3.0':
     resolution: {integrity: sha512-XRO0zi2NIUKq2lUk3T1ecFSld1fMWRKE6naRFGkgkdeosx7IslyUKNv5Dcb5PJTja9tHJoFu0v/7yEpAkrkrTg==}
     engines: {node: ^20.19.0 || ^22.13.0 || >=24}
 
-  '@oxc-parser/binding-android-arm-eabi@0.127.0':
-    resolution: {integrity: sha512-0LC7ye4hvqbIKxAzThzvswgHLFu2AURKzYLeSVvLdu2TBOYWQDmHnTqPLeA597BcUCxiLqLsS4CJ5uoI5WYWCQ==}
+  '@oxc-parser/binding-android-arm-eabi@0.130.0':
+    resolution: {integrity: sha512-h/xYU8/7ADWzVSf5I+YalLpj33LOy9CI/zgbJNIZ5eunRBG+Czqa3lZsvuPHHf3rOt6z1c5+UzoxjbAzAvhwVw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [android]
 
-  '@oxc-parser/binding-android-arm64@0.127.0':
-    resolution: {integrity: sha512-b5jtVTH6AU5CJXHNdj7Jj9IEiR9yVjjnwHzPJhGyHGPdcsZSzBCkS9GBbV33niRMvKthDwQRFRJfI4a+k4PvYg==}
+  '@oxc-parser/binding-android-arm64@0.130.0':
+    resolution: {integrity: sha512-oFWFJrsGv9siFM4HjMqKNB7IuIZD/SMmZdCXl8xyx7lDplGvPKyewpOo272rSWgMXe2Wx7bWI0Yj+gkHv4qbeg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [android]
 
-  '@oxc-parser/binding-darwin-arm64@0.127.0':
-    resolution: {integrity: sha512-obCE8B7ISKkJidjlhv9xRGJPOSDG2Yu6PRga9Ruaz35uintHxbp1Ki/Yc71wx4rj3Edrm0a1kzG1TAwit0wFpg==}
+  '@oxc-parser/binding-darwin-arm64@0.130.0':
+    resolution: {integrity: sha512-sGUzupdTplK9jQg7eJZ878HfEgQjJNBc6dAYVWJ9W5aU+J8rLfRJhTVsKThiu1pNwm6Y1qKCcbC6WhNWSXR3Ig==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [darwin]
 
-  '@oxc-parser/binding-darwin-x64@0.127.0':
-    resolution: {integrity: sha512-JL6Xb5IwPQT8rUzlpsX7E+AgfcdNklXNPFp8pjCQQ5MQOQo5rtEB2ui+3Hgg9Sn7Y9Egj6YOLLiHhLpdAe12Aw==}
+  '@oxc-parser/binding-darwin-x64@0.130.0':
+    resolution: {integrity: sha512-PsB4cdCISbC00Uy8eiD8bc2AkGWjZqrSrJnkBFuG2ptrrf6mZ2F5gLFSjOAVMMgZPg8B1D7OydJwLWSfyI2Plg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [darwin]
 
-  '@oxc-parser/binding-freebsd-x64@0.127.0':
-    resolution: {integrity: sha512-SDQ/3MQFw58fqQz3Z1PhSKFF3JoCF4gmlNjziDm8X02tTahCw0qJbd7FGPDKw1i4VTBZene9JPyC3mHtSvi+wA==}
+  '@oxc-parser/binding-freebsd-x64@0.130.0':
+    resolution: {integrity: sha512-DgABp3l38hS77JbXCV4qk1+n6DPym5u8zzwuweokezm2tX194nDSJDENbDRECxVsiNbprKATLbk+Z5wlHT0OHw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [freebsd]
 
-  '@oxc-parser/binding-linux-arm-gnueabihf@0.127.0':
-    resolution: {integrity: sha512-Av+D1MIqzV0YMGPT9we2SIZaMKD7Cxs4CvXSx/yxaWHewZjYEjScpOf5igc8IILASViw4WTnjlwUdI1KzVtDHQ==}
+  '@oxc-parser/binding-linux-arm-gnueabihf@0.130.0':
+    resolution: {integrity: sha512-4Kn3CTEmwFrzhTSC/JuUW16qovmaMdX7jeSKbL8w0pLtLww7To1a2XJi9Z5uD8QWUkfUHhqfV+VD6dVzBnWzoA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@oxc-parser/binding-linux-arm-musleabihf@0.127.0':
-    resolution: {integrity: sha512-Cs2fdJ8cPpFdeebj6p4dag8A4+56hPvZ0AhQQzlaLswGz1tz7bXt1nETLeorrM9+AMcWFFkqxcXwDGfTVidY8g==}
+  '@oxc-parser/binding-linux-arm-musleabihf@0.130.0':
+    resolution: {integrity: sha512-D35KZM3F4rRu1uAFKyBlg3Gaf/ybCjyaPR1hfgvk5ex8NtcTmRgc0JgSighEyNg96TPrFhemFba68SZuxaha8w==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm]
     os: [linux]
 
-  '@oxc-parser/binding-linux-arm64-gnu@0.127.0':
-    resolution: {integrity: sha512-qdOfTcT6SY8gsJrrV92uyEUyjqMGPpIB5JZUG6QN5dukYd+7/j0kX6MwK1DgQj39jtUYixxPiaRUiEN1+0CXgQ==}
+  '@oxc-parser/binding-linux-arm64-gnu@0.130.0':
+    resolution: {integrity: sha512-Q9o7oVlo955KHwS8l1u0bCzIx+JsZUA3XToLXC+MsMhye/9LeBQbt84nh120cl2XLy+TEzvugYDiHShg5yaX6Q==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@oxc-parser/binding-linux-arm64-musl@0.127.0':
-    resolution: {integrity: sha512-EoTCZneNFU/P2qrpEM+RHmQwt+CvDkyGESG6qhr7KaegXLZwePfbrkCDfAk8/rhxbDUVGsZILX+2tqPzFtoFWA==}
+  '@oxc-parser/binding-linux-arm64-musl@0.130.0':
+    resolution: {integrity: sha512-EiJ/gC0ljbcwVpycC8YWw6ggMbtsPX8XMOt0mPx0aqWeMsNR+L9m05Flbvd5T+GlivG+GkSWQL7tM9SRFpM/dw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@oxc-parser/binding-linux-ppc64-gnu@0.127.0':
-    resolution: {integrity: sha512-zALjmZYgxFLHjXeudcDF0xFGNydTAtkAeXAr2EuC17ywCyFxcmQra4w0BMde0Yi/re4Bi4iwEoEXtYN7l6eBLQ==}
+  '@oxc-parser/binding-linux-ppc64-gnu@0.130.0':
+    resolution: {integrity: sha512-b+h/lsLLurp756dMGizNs5uPaJfyEdWrTcV5t8M609jWm1DEHB1StpRXCkyvwtkJx3m+qL5BNQ0dEKan/4yGFA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@oxc-parser/binding-linux-riscv64-gnu@0.127.0':
-    resolution: {integrity: sha512-fPP8M6zQLS7Jz7o9d5ArUSuAuSK3e+WCYVrCpdzeCOejidtZExJ9tjhDrAd3HEPqARBCPmdpqxESPFqy44vkBQ==}
+  '@oxc-parser/binding-linux-riscv64-gnu@0.130.0':
+    resolution: {integrity: sha512-O19Cil83XAyjEFfo8WhkMwY58ALqZ7ckjGL+25mjMIuF84urWBeANH0FC8B8BsSSygWU3/1aY3ADdDbp+wlBnw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
-  '@oxc-parser/binding-linux-riscv64-musl@0.127.0':
-    resolution: {integrity: sha512-7IcC4Ao02oGpfnjt+X/oF4U2mllo2qoSkw5xxiXNKL9MCTsTiAC6616beOuehdxGcnz1bRoPC1RQ2f1GQDdN+g==}
+  '@oxc-parser/binding-linux-riscv64-musl@0.130.0':
+    resolution: {integrity: sha512-BgXRVC0+83n3YzCscLQjj6nbyeBIVeZYPTI4fFMAE4WNm2+4RXhWp03IVizL7esIz36kgmT48aebk1iM+cs8sw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
     libc: [musl]
 
-  '@oxc-parser/binding-linux-s390x-gnu@0.127.0':
-    resolution: {integrity: sha512-pbXIhiNFHoqWeqDNLiJ9JkpHz1IM9k4DXa66x+1GTWMG7iLxtkXgE53iiuKSXwmk3zIYmaPVfBvgcAhS583K4Q==}
+  '@oxc-parser/binding-linux-s390x-gnu@0.130.0':
+    resolution: {integrity: sha512-6tJz0xvnGhsokE7N1WlUSBXibpYmT9xSJFS1Ce41Km/+8gQvdlW8MLhRv8PD0L7ix8vRG0FDDepp3jdOFzdVdw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
-  '@oxc-parser/binding-linux-x64-gnu@0.127.0':
-    resolution: {integrity: sha512-MYCguB9RvBvlSd6gbuNI7QwiLoCCAlGnlRJFPrzLI6U1/9wkC/WK6LtBAUln55H1Ctqw45PWmqrobKoMhsYQzQ==}
+  '@oxc-parser/binding-linux-x64-gnu@0.130.0':
+    resolution: {integrity: sha512-9aCWj83dp3heTQGmGnZGdIWgxjZrr/7VQ0TGFHH5PKByxJKF2Hcr4qvaSUHhhGEa3MSsDjTL1YDP8RAgdL5/Cg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@oxc-parser/binding-linux-x64-musl@0.127.0':
-    resolution: {integrity: sha512-5eY0B/bxf1xIUxb4NOTvOI3KWtBQfPWYyKAzgcrCt0mDibSZygVpO1Pz8bkeiSZ5Jj9+M09dkggG3H8I5d0Uyg==}
+  '@oxc-parser/binding-linux-x64-musl@0.130.0':
+    resolution: {integrity: sha512-afXt87aZBqrUVli8TB/I8H1G50RDWcwirjWtXGXYqJ2ZqWEiErH7V72j3LUSDZaivmtu2OLX0KQ/mbhP81mr7A==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@oxc-parser/binding-openharmony-arm64@0.127.0':
-    resolution: {integrity: sha512-Gld0ajrFTUXNtdw20fVBuTQx66FA75nIVg+//pPfR3sXkuABB4mTBhl3r9JNzrJpgW//qiwxf0nWXUWGJSL3UQ==}
+  '@oxc-parser/binding-openharmony-arm64@0.130.0':
+    resolution: {integrity: sha512-I0NCrZV/YZuCGWgqwNN/GO/iXlLF2z+Wgc7u+Aa9N4P51oYeIa0XT+zVBUne4csO9GqxskXgI4g8JzzWGRpfOw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [openharmony]
 
-  '@oxc-parser/binding-wasm32-wasi@0.127.0':
-    resolution: {integrity: sha512-T6KVD7rhLzFlwGRXMnxUFfkCZD8FHnb968wVXW1mXzgRFc5RNXOBY2mPPDZ77x5Ln76ltLMgtPg0cOkU1NSrEQ==}
+  '@oxc-parser/binding-wasm32-wasi@0.130.0':
+    resolution: {integrity: sha512-sJgQkGaBX0WJvPUDfwciex6IcTk5O5NLQ1bhEb6f3nBruh1GshKMRSMt2bxZlYrgBzjyBbJzsnO+InPG0bg+fA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [wasm32]
 
-  '@oxc-parser/binding-win32-arm64-msvc@0.127.0':
-    resolution: {integrity: sha512-Ujvw4X+LD1CCGULcsQcvb4YNVoBGqt+JHgNNzGGaCImELiZLk477ifUH53gIbE7EKd933NdTi25JWEr9K2HwXw==}
+  '@oxc-parser/binding-win32-arm64-msvc@0.130.0':
+    resolution: {integrity: sha512-bjcma99sQrNh6RY4mPO9yTkfxql6TDFoN3HWdK31RCKXwNhcDgJXW/l8PUtzKNiQ+9vpKJfJtQq+LklBuxSOBA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [win32]
 
-  '@oxc-parser/binding-win32-ia32-msvc@0.127.0':
-    resolution: {integrity: sha512-0cwxKO7KHQQQfo4Uf4B2SQrhgm+cJaP9OvFFhx52Tkg4bezsacu83GB2/In5bC415Ueeym+kXdnge/57rbSfTw==}
+  '@oxc-parser/binding-win32-ia32-msvc@0.130.0':
+    resolution: {integrity: sha512-hRYbv6HhpSTzT4xTiIkadLI7upLQxuOdLPR/9nL1fTjwhgutBTPXrwaAPb/jTFVx6/8C7Jb5HcUKhmNwloTbFA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ia32]
     os: [win32]
 
-  '@oxc-parser/binding-win32-x64-msvc@0.127.0':
-    resolution: {integrity: sha512-rOrnSQSCbhI2kowr9XxE7m9a8oQXnBHjnS6j95LxxAnEZ0+Fz20WlRXG4ondQb+ejjt2KOsa65sE6++L6kUd+w==}
+  '@oxc-parser/binding-win32-x64-msvc@0.130.0':
+    resolution: {integrity: sha512-RBpA9TsRucJq6HNVNCFF1iKg+QeTkLdZf7hi4xaOGCPvMZWvDHjQgSOEZMUpuW4JNciHbxNhLEYmz5CVygjVGQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [win32]
@@ -2760,6 +2769,9 @@ packages:
   '@oxc-project/types@0.127.0':
     resolution: {integrity: sha512-aIYXQBo4lCbO4z0R3FHeucQHpF46l2LbMdxRvqvuRuW2OxdnSkcng5B8+K12spgLDj93rtN3+J2Vac/TIO+ciQ==}
 
+  '@oxc-project/types@0.130.0':
+    resolution: {integrity: sha512-ibD2usx9JRu7f5pu2tMKMI4cpA4NgXJQoYRP4pQ7Pxmn1l6k/53qWtQWZayhYy3X4QZkt90Ot+mJEaeXouio6Q==}
+
   '@oxc-resolver/binding-android-arm-eabi@11.19.1':
     resolution: {integrity: sha512-aUs47y+xyXHUKlbhqHUjBABjvycq6YSD7bpxSW7vplUmdzAlJ93yXY6ZR0c1o1x5A/QKbENCvs3+NlY8IpIVzg==}
     cpu: [arm]
@@ -3146,8 +3158,8 @@ packages:
     resolution: {integrity: sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==}
     engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
 
-  '@playwright/test@1.59.1':
-    resolution: {integrity: sha512-PG6q63nQg5c9rIi4/Z5lR5IVF7yU5MqmKaPOe0HSc0O2cX1fPi96sUQu5j7eo4gKCkB2AnNGoWt7y4/Xx3Kcqg==}
+  '@playwright/test@1.60.0':
+    resolution: {integrity: sha512-O71yZIbAh/PxDMNGns37GHBIfrVkEVyn+AXyIa5dOTfb4/xNvRWV+Vv/NMbNCtODB/pO7vLlF2OTmMVLhmr7Ag==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -3350,43 +3362,6 @@ packages:
       '@types/react':
         optional: true
 
-  '@react-aria/focus@3.21.5':
-    resolution: {integrity: sha512-V18fwCyf8zqgJdpLQeDU5ZRNd9TeOfBbhLgmX77Zr5ae9XwaoJ1R3SFJG1wCJX60t34AW+aLZSEEK+saQElf3Q==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
-
-  '@react-aria/interactions@3.27.1':
-    resolution: {integrity: sha512-M3wLpTTmDflI0QGNK0PJNUaBXXfeBXue8ZxLMngfc1piHNiH4G5lUvWd9W14XVbqrSCVY8i8DfGrNYpyyZu0tw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
-
-  '@react-aria/ssr@3.9.10':
-    resolution: {integrity: sha512-hvTm77Pf+pMBhuBm760Li0BVIO38jv1IBws1xFm1NoL26PU+fe+FMW5+VZWyANR6nYL65joaJKZqOdTQMkO9IQ==}
-    engines: {node: '>= 12'}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
-
-  '@react-aria/utils@3.33.1':
-    resolution: {integrity: sha512-kIx1Sj6bbAT0pdqCegHuPanR9zrLn5zMRiM7LN12rgRf55S19ptd9g3ncahArifYTRkfEU9VIn+q0HjfMqS9/w==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
-      react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
-
-  '@react-stately/flags@3.1.2':
-    resolution: {integrity: sha512-2HjFcZx1MyQXoPqcBGALwWWmgFVUk2TuKVIQxCbRq7fPyWXIl6VHcakCLurdtYC2Iks7zizvz0Idv48MQ38DWg==}
-
-  '@react-stately/utils@3.11.0':
-    resolution: {integrity: sha512-8LZpYowJ9eZmmYLpudbo/eclIRnbhWIJZ994ncmlKlouNzKohtM8qTC6B1w1pwUbiwGdUoyzLuQbeaIor5Dvcw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
-
-  '@react-types/shared@3.33.1':
-    resolution: {integrity: sha512-oJHtjvLG43VjwemQDadlR5g/8VepK56B/xKO2XORPHt9zlW6IZs3tZrYlvH29BMvoqC7RtE7E5UjgbnbFtDGag==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
-
   '@reactflow/background@11.3.14':
     resolution: {integrity: sha512-Gewd7blEVT5Lh6jqrvOgd4G6Qk17eGKQfsDXgyRSqM+CTwDqRldG2LsWN4sNeno6sbqVIC2fZ+rAUBFA9ZEUDA==}
     peerDependencies:
@@ -3436,8 +3411,8 @@ packages:
     resolution: {integrity: sha512-UuBOt7BOsKVOkFXRe4Ypd/lADuNIfqJXv8GvHqtXaTYXPPKkj2nS2zPllVsrtRjcomDhIJVBnZwfmlI222WH8g==}
     engines: {node: '>=14.0.0'}
 
-  '@rolldown/pluginutils@1.0.0-rc.17':
-    resolution: {integrity: sha512-n8iosDOt6Ig1UhJ2AYqoIhHWh/isz0xpicHTzpKBeotdVsTEcxsSA/i3EVM7gQAj0rU27OLAxCjzlj15IWY7bg==}
+  '@rolldown/pluginutils@1.0.0-rc.18':
+    resolution: {integrity: sha512-CUY5Mnhe64xQBGZEEXQ5WyZwsc1JU3vAZLIxtrsBt3LO6UOb+C8GunVKqe9sT8NeWb4lqSaoJtp2xo6GxT1MNw==}
 
   '@rolldown/pluginutils@1.0.0-rc.7':
     resolution: {integrity: sha512-qujRfC8sFVInYSPPMLQByRh7zhwkGFS4+tyMQ83srV1qrxL4g8E2tyxVVyxd0+8QeBM1mIk9KbWxkegRr76XzA==}
@@ -3460,32 +3435,32 @@ packages:
       rollup:
         optional: true
 
-  '@sentry-internal/browser-utils@10.50.0':
-    resolution: {integrity: sha512-42bxyRTxnCmYlWnvz4CxikuQNanw8UNma2WJrtxJ0f1MAJV2GhQGSHDLnA+lvFlmiz6qct3pfen/NXGyOTegTA==}
+  '@sentry-internal/browser-utils@10.53.1':
+    resolution: {integrity: sha512-X4d6y8sBMjmNhcDW4eMBU3ASsNIMz8dqaFkhyIMN/dkYr/yZKnbRZPaVuVUGvHKjnlficPpIH0/HK9KBjrYxPw==}
     engines: {node: '>=18'}
 
-  '@sentry-internal/feedback@10.50.0':
-    resolution: {integrity: sha512-0k9XZF0wn86f77mIO2U3gNNyDZooy139CnEanRzHinrN106vVzvBZ6TUEQoHtoO1fqQxr+nWWVrqV/PXUqk47w==}
+  '@sentry-internal/feedback@10.53.1':
+    resolution: {integrity: sha512-vVpTI/aEYN5d9IgZeYJWMqVaN0+iFgidSrYNAsZTh1US5sJUzF/wrl+68KdpmCtFROrN3jiAn1oPSwL5CKvEJA==}
     engines: {node: '>=18'}
 
-  '@sentry-internal/replay-canvas@10.50.0':
-    resolution: {integrity: sha512-jx6RKBmcJSWdI92qDGS/sBv1w+7Cww879Z/moX7bw7ipHa/Ts3iDcB3rgZwvhmi17U+mvYsbJeL2DXkPo3TjPw==}
+  '@sentry-internal/replay-canvas@10.53.1':
+    resolution: {integrity: sha512-aueLaf/2prExwA76BGU5/bOXCKWqtt6jQXWA6WJQNrmKpPEtZJB4ypnpsou0McXQCF8tur2Y8U0TEkwQP13yJQ==}
     engines: {node: '>=18'}
 
-  '@sentry-internal/replay@10.50.0':
-    resolution: {integrity: sha512-51FYNfnvVLAWw1rrEWPFfwHuMRb9mkVCFGA4J9/un7SpeGBsQDziGB0Di4fsCxI7+EdSBpfLHPF0csKtCCw0oQ==}
+  '@sentry-internal/replay@10.53.1':
+    resolution: {integrity: sha512-wZNzTBYkgGUPWMuUQv7L64+OJmoCnz7GQNiTrTFK6EVAjJXFBCSsPp/nhif0bLhbk8+0g4xz633uOhpXuQbFdw==}
     engines: {node: '>=18'}
 
-  '@sentry/browser@10.50.0':
-    resolution: {integrity: sha512-1f6rAvET6myiTaSeYqvaaBwvq1LfxqWjAPIoAW/NVC9bPMkeEcuvgDajHrnZMrBeWoJ81NMyoLkyX+iOc7MoFA==}
+  '@sentry/browser@10.53.1':
+    resolution: {integrity: sha512-zXF373hzUOGzUOrqd8xb1U3LQi5uYC3mwv+z5OMKUUinQlu30tTWBs7ypy6YTchtix9QlYaHWlayUF8vBZ5UjA==}
     engines: {node: '>=18'}
 
-  '@sentry/core@10.50.0':
-    resolution: {integrity: sha512-J4A+vzUO3adl0TkFCjaN1+4miamrjHiEIYuLHiuu1lmAjq5WIVw32ObvAh4yMwNtxyaEMosTrrh5M6f12XSJFg==}
+  '@sentry/core@10.53.1':
+    resolution: {integrity: sha512-XG4ezlkyuAPjBC5+9kXC94rXXuqYTw9NRhfaDHssbTFaGnqBR8vQX2UUgZfY7ucbeelRDGfBu1sywoU+mB04uA==}
     engines: {node: '>=18'}
 
-  '@sentry/react@10.50.0':
-    resolution: {integrity: sha512-MZHYjEZAtFIa4zPrWS4oXlo+gMppRvfETqUqF920Sj2jN2U7WjboU03lDmjfDqEcH7QiwjQyl13jHd2nwAyrrw==}
+  '@sentry/react@10.53.1':
+    resolution: {integrity: sha512-lrwNq5T/zW84l60894TpKHPcvFuc1I/Hnohecc0TfYVpIcYYuw2orCHoU4v4wgkFaJUpegVetbgdOphViyLVjA==}
     engines: {node: '>=18'}
     peerDependencies:
       react: ^16.14.0 || 17.x || 18.x || 19.x
@@ -3569,42 +3544,42 @@ packages:
   '@standard-schema/spec@1.1.0':
     resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
 
-  '@storybook/addon-docs@10.3.5':
-    resolution: {integrity: sha512-WuHbxia/o5TX4Rg/IFD0641K5qId/Nk0dxhmAUNoFs5L0+yfZUwh65XOBbzXqrkYmYmcVID4v7cgDRmzstQNkA==}
+  '@storybook/addon-docs@10.3.6':
+    resolution: {integrity: sha512-TvIdADVPtauxW0LzXIpIv7X6GxwetorhyNh+6+7MHC27XSBCWVxxRUwL63YeLlHTuXsIk0quG3b1xgwVRzWOJA==}
     peerDependencies:
-      storybook: ^10.3.5
+      storybook: ^10.3.6
 
-  '@storybook/addon-links@10.3.5':
-    resolution: {integrity: sha512-Xe2wCGZ+hpZ0cDqAIBHk+kPc8nODNbu585ghd5bLrlYJMDVXoNM/fIlkrLgjIDVbfpgeJLUEg7vldJrn+FyOLw==}
+  '@storybook/addon-links@10.3.6':
+    resolution: {integrity: sha512-tv9Xd68qRGBAvEubaxNo3FuFq4GwuMiBriD+gLGuFK0+/u3cnkuA264aoR1v6YCH3sT3er3+MBimuyKM3jLDxg==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-      storybook: ^10.3.5
+      storybook: ^10.3.6
     peerDependenciesMeta:
       react:
         optional: true
 
-  '@storybook/addon-onboarding@10.3.5':
-    resolution: {integrity: sha512-s3/gIy9Tqxji27iclLY+KSk8kGeow1JxXMl1lPLyu8n6XVvv+tFrUPhAvUTs+fVenG6JQEWc0uzpYBdFRWbMtw==}
+  '@storybook/addon-onboarding@10.3.6':
+    resolution: {integrity: sha512-Tys9eOFzCkBygfDWVRa2hpTQI5Y1HQt9ybkJIHdR16GASQ3fhyXVULHVRmGQLEGN+3n84JGvlU8CN9S/OBB1IQ==}
     peerDependencies:
-      storybook: ^10.3.5
+      storybook: ^10.3.6
 
-  '@storybook/addon-themes@10.3.5':
-    resolution: {integrity: sha512-Mv+C7GuZ0MhGRx5C+rv8sCEjgYsDTLBvq68101V0s8Vwh3gKd6W9cbS31HoOeLAiIMiPPZ8C1iWudA3Oumdtlw==}
+  '@storybook/addon-themes@10.3.6':
+    resolution: {integrity: sha512-/6lPU36+nDQzoDJqwy5BrAO0zFHOHDXn6hy/aq2aKF/RTS54+KrA0fdv0sxTssaBo5tjqZ4jKs60hB0iRWKkFA==}
     peerDependencies:
-      storybook: ^10.3.5
+      storybook: ^10.3.6
 
-  '@storybook/builder-vite@10.3.5':
-    resolution: {integrity: sha512-i4KwCOKbhtlbQIbhm53+Kk7bMnxa0cwTn1pxmtA/x5wm1Qu7FrrBQV0V0DNjkUqzcSKo1CjspASJV/HlY0zYlw==}
+  '@storybook/builder-vite@10.3.6':
+    resolution: {integrity: sha512-gpvR/sE4BcrFtmQZ+Ker7zD23oQzoVeqD9nF6cK6yzY+Q0svJXyX2EPmFG4y+EwygD5/vNzDpP84gGMut8VRwg==}
     peerDependencies:
-      storybook: ^10.3.5
+      storybook: ^10.3.6
       vite: ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0
 
-  '@storybook/csf-plugin@10.3.5':
-    resolution: {integrity: sha512-qlEzNKxOjq86pvrbuMwiGD/bylnsXk1dg7ve0j77YFjEEchqtl7qTlrXvFdNaLA89GhW6D/EV6eOCu/eobPDgw==}
+  '@storybook/csf-plugin@10.3.6':
+    resolution: {integrity: sha512-9kBf7VRdRqTSIYo+rPtVn5yjYYyK8kP2QhEYx3oiXvfwy4RexmbJnhk/tXa/lNiTqukA1TqaWQ2+5MqF4fu6YQ==}
     peerDependencies:
       esbuild: 0.27.2
       rollup: 4.59.0
-      storybook: ^10.3.5
+      storybook: ^10.3.6
       vite: '*'
       webpack: '*'
     peerDependenciesMeta:
@@ -3626,40 +3601,40 @@ packages:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
 
-  '@storybook/nextjs-vite@10.3.5':
-    resolution: {integrity: sha512-PdgekGAnr4m/xhrvtl+ZVh68vKTfJN/AewxmqxqxSlwk0dO7B+uVGjO79WmEZwIlLvdT+3HIThTEfC1ozfpM7A==}
+  '@storybook/nextjs-vite@10.3.6':
+    resolution: {integrity: sha512-X2ExCrrnq319LkOKM5E2ZpeEDFgeUmPNH/v5SQlYA9e3Jmtzs+esObaWEEtUF5pvoxzeszZGEV9zXNFmYaF9Dg==}
     peerDependencies:
       next: ^14.1.0 || ^15.0.0 || ^16.0.0
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-      storybook: ^10.3.5
+      storybook: ^10.3.6
       typescript: '*'
       vite: ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0
     peerDependenciesMeta:
       typescript:
         optional: true
 
-  '@storybook/react-dom-shim@10.3.5':
-    resolution: {integrity: sha512-Gw8R7XZm0zSUH0XAuxlQJhmizsLzyD6x00KOlP6l7oW9eQHXGfxg3seNDG3WrSAcW07iP1/P422kuiriQlOv7g==}
+  '@storybook/react-dom-shim@10.3.6':
+    resolution: {integrity: sha512-/Tu1gPu+Fw+zOnAGmxRmOD30FX3a04LxcTAKflEtdpmtIMVR5bA3qpjy+f5YhoyDCecbXyKmL1OeIU2FIIZHqQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-      storybook: ^10.3.5
+      storybook: ^10.3.6
 
-  '@storybook/react-vite@10.3.5':
-    resolution: {integrity: sha512-UB5sJHeh26bfd8sNMx2YPGYRYmErIdTRaLOT28m4bykQIa1l9IgVktsYg/geW7KsJU0lXd3oTbnUjLD+enpi3w==}
+  '@storybook/react-vite@10.3.6':
+    resolution: {integrity: sha512-tySQRc+8q7V2NkylQMNJjDV8zXy6tkxb8oDqw/DIhHhI9Xn77MTKVZ8Cihbo5NMm7HYTB6xDKr6wqdSMgdufYQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-      storybook: ^10.3.5
+      storybook: ^10.3.6
       vite: ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0
 
-  '@storybook/react@10.3.5':
-    resolution: {integrity: sha512-tpLTLaVGoA6fLK3ReyGzZUricq7lyPaV2hLPpj5wqdXLV/LpRtAHClUpNoPDYSBjlnSjL81hMZijbkGC3mA+gw==}
+  '@storybook/react@10.3.6':
+    resolution: {integrity: sha512-oZQZ6xayWe5IdHmFUTL0TL8rX/gpNNh9gWhT2vzW5eeUvlkVG/RBKdsja6Ndrk2s1D9vcnwiI6r6CNXy3IEEmg==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-      storybook: ^10.3.5
+      storybook: ^10.3.6
       typescript: '>= 4.9.x'
     peerDependenciesMeta:
       typescript:
@@ -3682,9 +3657,6 @@ packages:
   '@swc/helpers@0.5.15':
     resolution: {integrity: sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==}
 
-  '@swc/helpers@0.5.20':
-    resolution: {integrity: sha512-2egEBHUMasdypIzrprsu8g+OEVd7Vp2MM3a2eVlM/cyFYto0nGz5BX5BTgh/ShZZI9ed+ozEq+Ngt+rgmUs8tw==}
-
   '@t3-oss/env-core@0.13.11':
     resolution: {integrity: sha512-sM7GYY+KL7H/Hl0BE0inWfk3nRHZOLhmVn7sHGxaZt9FAR6KqREXAE+6TqKfiavfXmpRxO/OZ2QgKRd+oiBYRQ==}
     peerDependencies:
@@ -3719,69 +3691,69 @@ packages:
       zod:
         optional: true
 
-  '@tailwindcss/node@4.2.4':
-    resolution: {integrity: sha512-Ai7+yQPxz3ddrDQzFfBKdHEVBg0w3Zl83jnjuwxnZOsnH9pGn93QHQtpU0p/8rYWxvbFZHneni6p1BSLK4DkGA==}
+  '@tailwindcss/node@4.3.0':
+    resolution: {integrity: sha512-aFb4gUhFOgdh9AXo4IzBEOzBkkAxm9VigwDJnMIYv3lcfXCJVesNfbEaBl4BNgVRyid92AmdviqwBUBRKSeY3g==}
 
-  '@tailwindcss/oxide-android-arm64@4.2.4':
-    resolution: {integrity: sha512-e7MOr1SAn9U8KlZzPi1ZXGZHeC5anY36qjNwmZv9pOJ8E4Q6jmD1vyEHkQFmNOIN7twGPEMXRHmitN4zCMN03g==}
+  '@tailwindcss/oxide-android-arm64@4.3.0':
+    resolution: {integrity: sha512-TJPiq67tKlLuObP6RkwvVGDoxCMBVtDgKkLfa/uyj7/FyxvQwHS+UOnVrXXgbEsfUaMgiVvC4KbJnRr26ho4Ng==}
     engines: {node: '>= 20'}
     cpu: [arm64]
     os: [android]
 
-  '@tailwindcss/oxide-darwin-arm64@4.2.4':
-    resolution: {integrity: sha512-tSC/Kbqpz/5/o/C2sG7QvOxAKqyd10bq+ypZNf+9Fi2TvbVbv1zNpcEptcsU7DPROaSbVgUXmrzKhurFvo5eDg==}
+  '@tailwindcss/oxide-darwin-arm64@4.3.0':
+    resolution: {integrity: sha512-oMN/WZRb+SO37BmUElEgeEWuU8E/HXRkiODxJxLe1UTHVXLrdVSgfaJV7pSlhRGMSOiXLuxTIjfsF3wYvz8cgQ==}
     engines: {node: '>= 20'}
     cpu: [arm64]
     os: [darwin]
 
-  '@tailwindcss/oxide-darwin-x64@4.2.4':
-    resolution: {integrity: sha512-yPyUXn3yO/ufR6+Kzv0t4fCg2qNr90jxXc5QqBpjlPNd0NqyDXcmQb/6weunH/MEDXW5dhyEi+agTDiqa3WsGg==}
+  '@tailwindcss/oxide-darwin-x64@4.3.0':
+    resolution: {integrity: sha512-N6CUmu4a6bKVADfw77p+iw6Yd9Q3OBhe0veaDX+QazfuVYlQsHfDgxBrsjQ/IW+zywL8mTrNd0SdJT/zgtvMdA==}
     engines: {node: '>= 20'}
     cpu: [x64]
     os: [darwin]
 
-  '@tailwindcss/oxide-freebsd-x64@4.2.4':
-    resolution: {integrity: sha512-BoMIB4vMQtZsXdGLVc2z+P9DbETkiopogfWZKbWwM8b/1Vinbs4YcUwo+kM/KeLkX3Ygrf4/PsRndKaYhS8Eiw==}
+  '@tailwindcss/oxide-freebsd-x64@4.3.0':
+    resolution: {integrity: sha512-zDL5hBkQdH5C6MpqbK3gQAgP80tsMwSI26vjOzjJtNCMUo0lFgOItzHKBIupOZNQxt3ouPH7RPhvNhiTfCe5CQ==}
     engines: {node: '>= 20'}
     cpu: [x64]
     os: [freebsd]
 
-  '@tailwindcss/oxide-linux-arm-gnueabihf@4.2.4':
-    resolution: {integrity: sha512-7pIHBLTHYRAlS7V22JNuTh33yLH4VElwKtB3bwchK/UaKUPpQ0lPQiOWcbm4V3WP2I6fNIJ23vABIvoy2izdwA==}
+  '@tailwindcss/oxide-linux-arm-gnueabihf@4.3.0':
+    resolution: {integrity: sha512-R06HdNi7A7OEoMsf6d4tjZ71RCWnZQPHj2mnotSFURjNLdBC+cIgXQ7l81CqeoiQftjf6OOblxXMInMgN2VzMA==}
     engines: {node: '>= 20'}
     cpu: [arm]
     os: [linux]
 
-  '@tailwindcss/oxide-linux-arm64-gnu@4.2.4':
-    resolution: {integrity: sha512-+E4wxJ0ZGOzSH325reXTWB48l42i93kQqMvDyz5gqfRzRZ7faNhnmvlV4EPGJU3QJM/3Ab5jhJ5pCRUsKn6OQw==}
+  '@tailwindcss/oxide-linux-arm64-gnu@4.3.0':
+    resolution: {integrity: sha512-qTJHELX8jetjhRQHCLilkVLmybpzNQAtaI/gaoVoidn/ufbNDbAo8KlK2J+yPoc8wQxvDxCmh/5lr8nC1+lTbg==}
     engines: {node: '>= 20'}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@tailwindcss/oxide-linux-arm64-musl@4.2.4':
-    resolution: {integrity: sha512-bBADEGAbo4ASnppIziaQJelekCxdMaxisrk+fB7Thit72IBnALp9K6ffA2G4ruj90G9XRS2VQ6q2bCKbfFV82g==}
+  '@tailwindcss/oxide-linux-arm64-musl@4.3.0':
+    resolution: {integrity: sha512-Z6sukiQsngnWO+l39X4pPbiWT81IC+PLKF+PHxIlyZbGNb9MODfYlXEVlFvej5BOZInWX01kVyzeLvHsXhfczQ==}
     engines: {node: '>= 20'}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@tailwindcss/oxide-linux-x64-gnu@4.2.4':
-    resolution: {integrity: sha512-7Mx25E4WTfnht0TVRTyC00j3i0M+EeFe7wguMDTlX4mRxafznw0CA8WJkFjWYH5BlgELd1kSjuU2JiPnNZbJDA==}
+  '@tailwindcss/oxide-linux-x64-gnu@4.3.0':
+    resolution: {integrity: sha512-DRNdQRpSGzRGfARVuVkxvM8Q12nh19l4BF/G7zGA1oe+9wcC6saFBHTISrpIcKzhiXtSrlSrluCfvMuledoCTQ==}
     engines: {node: '>= 20'}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@tailwindcss/oxide-linux-x64-musl@4.2.4':
-    resolution: {integrity: sha512-2wwJRF7nyhOR0hhHoChc04xngV3iS+akccHTGtz965FwF0up4b2lOdo6kI1EbDaEXKgvcrFBYcYQQ/rrnWFVfA==}
+  '@tailwindcss/oxide-linux-x64-musl@4.3.0':
+    resolution: {integrity: sha512-Z0IADbDo8bh6I7h2IQMx601AdXBLfFpEdUotft86evd/8ZPflZe9COPO8Q1vw+pfLWIUo9zN/JGZvwuAJqduqg==}
     engines: {node: '>= 20'}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@tailwindcss/oxide-wasm32-wasi@4.2.4':
-    resolution: {integrity: sha512-FQsqApeor8Fo6gUEklzmaa9994orJZZDBAlQpK2Mq+DslRKFJeD6AjHpBQ0kZFQohVr8o85PPh8eOy86VlSCmw==}
+  '@tailwindcss/oxide-wasm32-wasi@4.3.0':
+    resolution: {integrity: sha512-HNZGOUxEmElksYR7S6sC5jTeNGpobAsy9u7Gu0AskJ8/20FR9GqebUyB+HBcU/ax6BHuiuJi+Oda4B+YX6H1yA==}
     engines: {node: '>=14.0.0'}
     cpu: [wasm32]
     bundledDependencies:
@@ -3792,32 +3764,32 @@ packages:
       - '@emnapi/wasi-threads'
       - tslib
 
-  '@tailwindcss/oxide-win32-arm64-msvc@4.2.4':
-    resolution: {integrity: sha512-L9BXqxC4ToVgwMFqj3pmZRqyHEztulpUJzCxUtLjobMCzTPsGt1Fa9enKbOpY2iIyVtaHNeNvAK8ERP/64sqGQ==}
+  '@tailwindcss/oxide-win32-arm64-msvc@4.3.0':
+    resolution: {integrity: sha512-Pe+RPVTi1T+qymuuRpcdvwSVZjnll/f7n8gBxMMh3xLTctMDKqpdfGimbMyioqtLhUYZxdJ9wGNhV7MKHvgZsQ==}
     engines: {node: '>= 20'}
     cpu: [arm64]
     os: [win32]
 
-  '@tailwindcss/oxide-win32-x64-msvc@4.2.4':
-    resolution: {integrity: sha512-ESlKG0EpVJQwRjXDDa9rLvhEAh0mhP1sF7sap9dNZT0yyl9SAG6T7gdP09EH0vIv0UNTlo6jPWyujD6559fZvw==}
+  '@tailwindcss/oxide-win32-x64-msvc@4.3.0':
+    resolution: {integrity: sha512-Mvrf2kXW/yeW/OTezZlCGOirXRcUuLIBx/5Y12BaPM7wJoryG6dfS/NJL8aBPqtTEx/Vm4T4vKzFUcKDT+TKUA==}
     engines: {node: '>= 20'}
     cpu: [x64]
     os: [win32]
 
-  '@tailwindcss/oxide@4.2.4':
-    resolution: {integrity: sha512-9El/iI069DKDSXwTvB9J4BwdO5JhRrOweGaK25taBAvBXyXqJAX+Jqdvs8r8gKpsI/1m0LeJLyQYTf/WLrBT1Q==}
+  '@tailwindcss/oxide@4.3.0':
+    resolution: {integrity: sha512-F7HZGBeN9I0/AuuJS5PwcD8xayx5ri5GhjYUDBEVYUkexyA/giwbDNjRVrxSezE3T250OU2K/wp/ltWx3UOefg==}
     engines: {node: '>= 20'}
 
-  '@tailwindcss/postcss@4.2.4':
-    resolution: {integrity: sha512-wgAVj6nUWAolAu8YFvzT2cTBIElWHkjZwFYovF+xsqKsW2ADxM/X2opxj5NsF/qVccAOjRNe8X2IdPzMsWyHTg==}
+  '@tailwindcss/postcss@4.3.0':
+    resolution: {integrity: sha512-Jm05Tjx+9yCLGv5qw1c+84Psds8MnyrEQYCB+FFk2lgGiUjlRqdxke4mVTuYrj2xnVZqKim2Apr5ySuQRYAw/w==}
 
   '@tailwindcss/typography@0.5.19':
     resolution: {integrity: sha512-w31dd8HOx3k9vPtcQh5QHP9GwKcgbMp87j58qi6xgiBnFFtKEAgCWnDw4qUT8aHwkCp8bKvb/KGKWWHedP0AAg==}
     peerDependencies:
       tailwindcss: '>=3.0.0 || insiders || >=4.0.0-alpha.20 || >=4.0.0-beta.1'
 
-  '@tailwindcss/vite@4.2.4':
-    resolution: {integrity: sha512-pCvohwOCspk3ZFn6eJzrrX3g4n2JY73H6MmYC87XfGPyTty4YsCjYTMArRZm/zOI8dIt3+EcrLHAFPe5A4bgtw==}
+  '@tailwindcss/vite@4.3.0':
+    resolution: {integrity: sha512-t6J3OrB5Fc0ExuhohouH0fWUGMYL6PTLhW+E7zIk/pdbnJARZDCwjBznFnkh5ynRnIRSI4YjtTH0t6USjJISrw==}
     peerDependencies:
       vite: ^5.2.0 || ^6 || ^7 || ^8
 
@@ -3860,13 +3832,13 @@ packages:
       vue:
         optional: true
 
-  '@tanstack/devtools@0.11.2':
-    resolution: {integrity: sha512-K8+tsBx+ptTLqqd4dOF10B6laj1g+XYImqYZL9n0jBINGaT+sOf17PKV9pbBt8kdbZeIGsHaJ5OZWCyZoHqN4A==}
+  '@tanstack/devtools@0.12.0':
+    resolution: {integrity: sha512-KiRMl8lFTTpNEOU4kt9mdZqQ8mTVEPwRLE8I1g3IJe5y1WpOhwNUU1E5vCq8VUsWJukszI6QmPbMs4Gw+C3cyQ==}
     engines: {node: '>=18'}
     hasBin: true
 
-  '@tanstack/eslint-plugin-query@5.100.6':
-    resolution: {integrity: sha512-dZ2cUFe4OTTf2hLWa7la8oyj7AivK7JDecCDhUnxdAAedkn1YOL2PDr+IFF93h43zwUG2BvnFXiO59shwijyIg==}
+  '@tanstack/eslint-plugin-query@5.100.10':
+    resolution: {integrity: sha512-Ddou3agTWv5rvHSBby4yHlugUFHVh0nyo2fyoZ81qSxaTBIwNCoPgpiJhjo5QkThrH1wGC7k548BcMTszZCkBw==}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
       typescript: ^5.4.0 || ^6.0.0
@@ -3874,11 +3846,11 @@ packages:
       typescript:
         optional: true
 
-  '@tanstack/form-core@1.29.1':
-    resolution: {integrity: sha512-NIYPO36eEu7nSWvMpbFDQaBWyVtnH/C8fsZ3/XpJUT4uOWgmxsiUvHGbTbDNIQTXAKIkhwEl0sUrqBNn2SfUnw==}
+  '@tanstack/form-core@1.32.0':
+    resolution: {integrity: sha512-Tn5VRDSjyqjmaet2tJMuEWDRFyrCaon03vxXPlSSaiSs6C/N7lCIwGCXJbZXEUq1kTj8jYN9qyXHbsz4LQHcow==}
 
-  '@tanstack/form-devtools@0.2.22':
-    resolution: {integrity: sha512-hMrKwu+73O2LeHj78vi48oaAH4jZi/U92hrHmkvxDy3E72c+PbxDJBbM9rXUK4h0GPbOzfaZ235SruJ0lfuOYA==}
+  '@tanstack/form-devtools@0.2.27':
+    resolution: {integrity: sha512-h91foKH1RtUwJC1079kwcNQlO1LYBKdIY5n7kHGGjNTQiH0wLSIBJnxZnOxOJ1qaSjErTqJw5e9sIj3O+zyRYg==}
     peerDependencies:
       solid-js: 1.9.11
 
@@ -3890,14 +3862,14 @@ packages:
     resolution: {integrity: sha512-y/xtNPNt/YeyoVxE/JCx+T7yjEzpezmbb+toK8DDD1P4m7Kzs5YR956+7OKexG3f8aXgC3rLZl7b1V+yNUSy5w==}
     engines: {node: '>=18'}
 
-  '@tanstack/query-core@5.100.6':
-    resolution: {integrity: sha512-Os2CPUr98to98RYm+D4qGqGkiffn7MGSyl2547a4MljVkHE30AMJRqTiyCqBfMwzAx/I91vCkAxp5tHSla6Twg==}
+  '@tanstack/query-core@5.100.10':
+    resolution: {integrity: sha512-8UR0yJR+GiQ40m3lPhUr0xbfAupe6GSQiksSBSa9SM2NjezFyxXCIA69/lz8cSoNKZLrw1/PktIyQBJcVeMi3w==}
 
-  '@tanstack/query-devtools@5.100.6':
-    resolution: {integrity: sha512-2SiNwlOiAdTbqktCSmwlXZH8x8mckSbES2O0bdr3qZNhdQl5DCtImZx0S3HGeNHWTIkzTaHx2Isg+bD4M3WRIg==}
+  '@tanstack/query-devtools@5.100.10':
+    resolution: {integrity: sha512-3DmJf25hDPus5IpVvp6ujXv6bKV2zPzI9vpbAmpJigsL/H6DPvPjmf7/Q9yVKEke//8fgeQ45abjgnLuyYxAiw==}
 
-  '@tanstack/react-devtools@0.10.2':
-    resolution: {integrity: sha512-1BmZyxOrI5SqmRJ5MgkYZNNdnlLsJxQRI2YgorrAvcF2MxK6x5RcuStvD8+YlXoMw3JtNukPxoITirKAnKYDQA==}
+  '@tanstack/react-devtools@0.10.3':
+    resolution: {integrity: sha512-yUCoG7GwnnDb/aaXnimPUTqES7ICMO9LwII27f4RVxFKRS8z7ePqKIGVpQhVu/L0pvArJ8SBAWL8fxuUE1HYqQ==}
     engines: {node: '>=18'}
     peerDependencies:
       '@types/react': '>=16.8'
@@ -3905,13 +3877,13 @@ packages:
       react: '>=16.8'
       react-dom: '>=16.8'
 
-  '@tanstack/react-form-devtools@0.2.22':
-    resolution: {integrity: sha512-CXa+U6QrF8QOGL+sCIIcwzHb1K+hfNjBA5PwSmxm32Oxpu8fK/60M3SbE9UM9439MR/GQiIoeBW2FFyKh73apw==}
+  '@tanstack/react-form-devtools@0.2.27':
+    resolution: {integrity: sha512-c7ugxpwxPBrT2nMYFPaW448SVxYvdi+ruPU/UcFS6YYdQ5uJGqjOJDF+ObCHWxlNJQWIXQVIeqbDZ8UaNPOLTA==}
     peerDependencies:
       react: ^17.0.0 || ^18.0.0 || ^19.0.0
 
-  '@tanstack/react-form@1.29.1':
-    resolution: {integrity: sha512-hVHk4g0phd0HxRsv2ry6Xt8BqmalT55Q3cokhJBCC1St0hcGZhgwJJbohm9atao45BPG9e55DGvtbwExqZe35g==}
+  '@tanstack/react-form@1.32.0':
+    resolution: {integrity: sha512-6WP5SQTA6/H9crCpvpq3ZppYWqtrdE5NjOy6ebABi6uAQPqhfTzrdjS9t40mCZCFtGI5585OhJV6zBP/KN2zcw==}
     peerDependencies:
       '@tanstack/react-start': '*'
       react: ^17.0.0 || ^18.0.0 || ^19.0.0
@@ -3926,14 +3898,14 @@ packages:
       react: '>=16.8'
       react-dom: '>=16.8'
 
-  '@tanstack/react-query-devtools@5.100.6':
-    resolution: {integrity: sha512-sz3ksMKA2t1rx0+Odzb0x1A3pXH/SVf7fzlzd3sKXzwXz8980f5sbOwfQD6+UfTG8G4Y2KaIg9e3sBn+uC4VTg==}
+  '@tanstack/react-query-devtools@5.100.10':
+    resolution: {integrity: sha512-zes0+o9ef5rAZXJ9f/SeaLs2nufJaeVkZkl/Or9NGrWVF41kL9Od9ED9nCwtQlgiF2VGtrzhEw5AU/igAO+aAg==}
     peerDependencies:
-      '@tanstack/react-query': ^5.100.6
+      '@tanstack/react-query': ^5.100.10
       react: ^18 || ^19
 
-  '@tanstack/react-query@5.100.6':
-    resolution: {integrity: sha512-uVSrps0PV16Cxmcn2rvL+dUhwTpTUtiRW347AEeYxMZXO2pZe9ja7E24PAMGoQ5u2g89DD8u4QhOviBk+RN8RA==}
+  '@tanstack/react-query@5.100.10':
+    resolution: {integrity: sha512-FLaZf2RCrA/Zgp4aiu5tG3TyasTRO7aZ99skxQpr3Hg/zXOhu6yq5FZCYQ/tRaJtM9ylnoK8tFK7PolXQadv6Q==}
     peerDependencies:
       react: ^18 || ^19
 
@@ -3997,20 +3969,20 @@ packages:
     peerDependencies:
       '@testing-library/dom': '>=7.21.4'
 
-  '@tsslint/cli@3.1.0':
-    resolution: {integrity: sha512-SbcBbjRyRTXWjuyXccSLjIx2TWdhQFOMPDaqdLbW8dvh/A53pAWkimENKTvEL5gpGc0aulQ2Qt0icd+TxJQiRA==}
+  '@tsslint/cli@3.1.2':
+    resolution: {integrity: sha512-MedbvA73ZhXNYquEBqXeCEoE7md+clhp/1cD5azeRbeIw3tev5TccyReKZZ5cVZDWzUo3PqVFOBSKU+a3v/Olg==}
     engines: {node: '>=22.6.0'}
     hasBin: true
     peerDependencies:
       typescript: '*'
 
-  '@tsslint/compat-eslint@3.1.0':
-    resolution: {integrity: sha512-1gD9G9WH/KlSW3JVG6ahoMoWUy5GZqhFU2RqBOIpjw2vdDwhF+4v1PC6uMJW6LDem/FVoULiMMF9V8vKiX9Uuw==}
+  '@tsslint/compat-eslint@3.1.2':
+    resolution: {integrity: sha512-mwtiAIENNoFms/FomMcuSPfHUwAeqVqsko5yzurul/j+JZ88N2ukzmXoP8dRfXRFq3Ptun+9eW8oy+tQ11ymhQ==}
     peerDependencies:
       typescript: '*'
 
-  '@tsslint/config@3.1.0':
-    resolution: {integrity: sha512-FVoIycFczf1mccZrxOpkknciSpjoWD1o5Yw5CVvsddXz4/A5q6RbWU/QD7kcXpm8Yukw+3eMSKb1/NNKZ0Mmzw==}
+  '@tsslint/config@3.1.2':
+    resolution: {integrity: sha512-wpgH5rBsUZyr0Yccz35kZWLQNUwTN3c3psu7tcGSeRok5rpWabWTHq6PtkrP31SZs2bjxGD2iH4JOJRDDDny1A==}
     engines: {node: '>=22.6.0'}
     hasBin: true
     peerDependencies:
@@ -4022,12 +3994,12 @@ packages:
       tsl:
         optional: true
 
-  '@tsslint/core@3.1.0':
-    resolution: {integrity: sha512-WO9sL4nfYme+3u27DLMHG/abooGMTJb54b8CVS8YSJj6ldMax764mHpiaNHf48jGjWN/pbAoC47pnErwFL022w==}
+  '@tsslint/core@3.1.2':
+    resolution: {integrity: sha512-uuH8oaDDyvJ7iz4V9WMXwkkHlbTbYvhh+4MlyHviDf6rmOCMUcbOVZ3nIkiCpJbGXQiA0D9TH/5CjaR+15aOLg==}
     engines: {node: '>=22.6.0'}
 
-  '@tsslint/types@3.1.0':
-    resolution: {integrity: sha512-y21o32pnDktikkRAfYCHu3bYplxyMo8dwhbBVgSyvFXJfvnc0S7K4c6gZypqSWYPzBRXHQ+sQnJ8oM9xGcwWUw==}
+  '@tsslint/types@3.1.2':
+    resolution: {integrity: sha512-91hceg2KoDTMHDjtbguMqUI41oYtYjNE4ZtzkxE8N8XvqYpHgNdi6s3jgp41oPmmSyV3GuEeaUaAkvLop2b+Aw==}
 
   '@tybys/wasm-util@0.10.1':
     resolution: {integrity: sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==}
@@ -4194,8 +4166,8 @@ packages:
   '@types/negotiator@0.6.4':
     resolution: {integrity: sha512-elf6BsTq+AkyNsb2h5cGNst2Mc7dPliVoAPm1fXglC/BM3f2pFA40BaSSv3E5lyHteEawVKLP+8TwiY1DMNb3A==}
 
-  '@types/node@25.6.0':
-    resolution: {integrity: sha512-+qIYRKdNYJwY3vRCZMdJbPLJAtGjQBudzZzdzwQYkEPQd+PJGixUL5QfvCLDaULoLv+RhT3LDkwEfKaAkgSmNQ==}
+  '@types/node@25.7.0':
+    resolution: {integrity: sha512-z+pdZyxE+RTQE9AcboAZCb4otwcrvgHD+GlBpPgn0emDVt0ohrTMhAwlr2Wd9nZ+nihhYFxO2pThz3C5qSu2Eg==}
 
   '@types/normalize-package-data@2.4.4':
     resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==}
@@ -4203,8 +4175,8 @@ packages:
   '@types/papaparse@5.5.2':
     resolution: {integrity: sha512-gFnFp/JMzLHCwRf7tQHrNnfhN4eYBVYYI897CGX4MY1tzY9l2aLkVyx2IlKZ/SAqDbB3I1AOZW5gTMGGsqWliA==}
 
-  '@types/qs@6.15.0':
-    resolution: {integrity: sha512-JawvT8iBVWpzTrz3EGw9BTQFg3BQNmwERdKE22vlTxawwtbyUSlMppvZYKLZzB5zgACXdXxbD3m1bXaMqP/9ow==}
+  '@types/qs@6.15.1':
+    resolution: {integrity: sha512-GZHUBZR9hckSUhrxmp1nG6NwdpM9fCunJwyThLW1X3AyHgd9IlHb6VANpQQqDr2o/qQp6McZ3y/IA2rVzKzSbw==}
 
   '@types/react-dom@19.2.3':
     resolution: {integrity: sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==}
@@ -4241,210 +4213,115 @@ packages:
   '@types/zen-observable@0.8.3':
     resolution: {integrity: sha512-fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw==}
 
-  '@typescript-eslint/eslint-plugin@8.58.2':
-    resolution: {integrity: sha512-aC2qc5thQahutKjP+cl8cgN9DWe3ZUqVko30CMSZHnFEHyhOYoZSzkGtAI2mcwZ38xeImDucI4dnqsHiOYuuCw==}
+  '@typescript-eslint/eslint-plugin@8.59.3':
+    resolution: {integrity: sha512-PwFvSKsXGShKGW6n5bZOhGHEcCZXM8HofLK9fNsEwZXzFRjoY+XT1Vsf1zgyXdwTr0ZYz1/2tkZ0DBTT9jZjhw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      '@typescript-eslint/parser': ^8.58.2
+      '@typescript-eslint/parser': ^8.59.3
       eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
       typescript: '>=4.8.4 <6.1.0'
 
-  '@typescript-eslint/eslint-plugin@8.59.1':
-    resolution: {integrity: sha512-BOziFIfE+6osHO9FoJG4zjoHUcvI7fTNBSpdAwrNH0/TLvzjsk2oo8XSSOT2HhqUyhZPfHv4UOffoJ9oEEQ7Ag==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      '@typescript-eslint/parser': ^8.59.1
-      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
-      typescript: '>=4.8.4 <6.1.0'
-
-  '@typescript-eslint/parser@8.58.2':
-    resolution: {integrity: sha512-/Zb/xaIDfxeJnvishjGdcR4jmr7S+bda8PKNhRGdljDM+elXhlvN0FyPSsMnLmJUrVG9aPO6dof80wjMawsASg==}
+  '@typescript-eslint/parser@8.59.3':
+    resolution: {integrity: sha512-HPwA+hVkfcriajbNvTmZv4VRauibay+cWArYUYq7u7W7PmGShMxbPxLvrwDme55a6d5alG3nrYfhyJ/G28XlLg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
       typescript: '>=4.8.4 <6.1.0'
 
-  '@typescript-eslint/parser@8.59.1':
-    resolution: {integrity: sha512-HDQH9O/47Dxi1ceDhBXdaldtf/WV9yRYMjbjCuNk3qnaTD564qwv61Y7+gTxwxRKzSrgO5uhtw584igXVuuZkA==}
+  '@typescript-eslint/project-service@8.59.3':
+    resolution: {integrity: sha512-ECiUWa/KYRGDFUqTNehaRgzDshnJfkTABJxVemHk4ko22gcr0ukloKjWvyQ64g8YCV/UI47kN1dbmjf/GaQYng==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '>=4.8.4 <6.1.0'
+
+  '@typescript-eslint/scope-manager@8.59.3':
+    resolution: {integrity: sha512-t2LvZnoEfzKtnPjgeEu41xw5gxq9mQVfYy4OoZ4Vlt0sk3JwxmhCca/AR7DwOiHrjWgjAj6as4AhRLKSDfvZIA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@typescript-eslint/tsconfig-utils@8.59.3':
+    resolution: {integrity: sha512-PcIJHjmaREXLgIAIzLnSY9VucEzz8FKXsRgFa1DmdGCK/5tJpW03TKJF01Q6VZd1lLdz2sIKPWaDUZN9dp//dw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '>=4.8.4 <6.1.0'
+
+  '@typescript-eslint/type-utils@8.59.3':
+    resolution: {integrity: sha512-g71d8QD8UaiHGvrJwyIS1hCX5r63w6Jll+4VEYhEAHXTDIqX1JgxhTAbEHtKntL9kuc4jRo7/GWw5xfCepSccQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
       typescript: '>=4.8.4 <6.1.0'
 
-  '@typescript-eslint/project-service@8.58.2':
-    resolution: {integrity: sha512-Cq6UfpZZk15+r87BkIh5rDpi38W4b+Sjnb8wQCPPDDweS/LRCFjCyViEbzHk5Ck3f2QDfgmlxqSa7S7clDtlfg==}
+  '@typescript-eslint/types@8.59.3':
+    resolution: {integrity: sha512-ePFoH0g4ludssdRFqqDxQePCxU4WQyRa9+XVwjm7yLn0FKhMeoetC+qBEEI1Eyb1pGSDveTIT09Bvw2WhlGayg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@typescript-eslint/typescript-estree@8.59.3':
+    resolution: {integrity: sha512-CbRjVRAf7Lr9Kr8RopKcbY45p2VfmmHrm0ygOCYFi7oU8q19m0Fs/6iHS7kNOmwpp+ob07ZVcAqlxUod9lYdmg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.1.0'
 
-  '@typescript-eslint/project-service@8.59.0':
-    resolution: {integrity: sha512-Lw5ITrR5s5TbC19YSvlr63ZfLaJoU6vtKTHyB0GQOpX0W7d5/Ir6vUahWi/8Sps/nOukZQ0IB3SmlxZnjaKVnw==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      typescript: '>=4.8.4 <6.1.0'
-
-  '@typescript-eslint/project-service@8.59.1':
-    resolution: {integrity: sha512-+MuHQlHiEr00Of/IQbE/MmEoi44znZHbR/Pz7Opq4HryUOlRi+/44dro9Ycy8Fyo+/024IWtw8m4JUMCGTYxDg==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      typescript: '>=4.8.4 <6.1.0'
-
-  '@typescript-eslint/scope-manager@8.58.2':
-    resolution: {integrity: sha512-SgmyvDPexWETQek+qzZnrG6844IaO02UVyOLhI4wpo82dpZJY9+6YZCKAMFzXb7qhx37mFK1QcPQ18tud+vo6Q==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
-  '@typescript-eslint/scope-manager@8.59.0':
-    resolution: {integrity: sha512-UzR16Ut8IpA3Mc4DbgAShlPPkVm8xXMWafXxB0BocaVRHs8ZGakAxGRskF7FId3sdk9lgGD73GSFaWmWFDE4dg==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
-  '@typescript-eslint/scope-manager@8.59.1':
-    resolution: {integrity: sha512-LwuHQI4pDOYVKvmH2dkaJo6YZCSgouVgnS/z7yBPKBMvgtBvyLqiLy9Z6b7+m/TRcX1NFYUqZetI5Y+aT4GEfg==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
-  '@typescript-eslint/tsconfig-utils@8.58.2':
-    resolution: {integrity: sha512-3SR+RukipDvkkKp/d0jP0dyzuls3DbGmwDpVEc5wqk5f38KFThakqAAO0XMirWAE+kT00oTauTbzMFGPoAzB0A==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      typescript: '>=4.8.4 <6.1.0'
-
-  '@typescript-eslint/tsconfig-utils@8.59.0':
-    resolution: {integrity: sha512-91Sbl3s4Kb3SybliIY6muFBmHVv+pYXfybC4Oolp3dvk8BvIE3wOPc+403CWIT7mJNkfQRGtdqghzs2+Z91Tqg==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      typescript: '>=4.8.4 <6.1.0'
-
-  '@typescript-eslint/tsconfig-utils@8.59.1':
-    resolution: {integrity: sha512-/0nEyPbX7gRsk0Uwfe4ALwwgxuA66d/l2mhRDNlAvaj4U3juhUtJNq0DsY8M2AYwwb9rEq2hrC3IcIcEt++iJA==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      typescript: '>=4.8.4 <6.1.0'
-
-  '@typescript-eslint/type-utils@8.58.2':
-    resolution: {integrity: sha512-Z7EloNR/B389FvabdGeTo2XMs4W9TjtPiO9DAsmT0yom0bwlPyRjkJ1uCdW1DvrrrYP50AJZ9Xc3sByZA9+dcg==}
+  '@typescript-eslint/utils@8.59.3':
+    resolution: {integrity: sha512-JAvT14goBzRzzzZyqq3P9BLArIxTtQURUtFgQ/V7FO+eU+Gg6ES+5ymOPP1wRxXcxAYeivCk4uS3jCKWI1K8Zg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
       typescript: '>=4.8.4 <6.1.0'
 
-  '@typescript-eslint/type-utils@8.59.1':
-    resolution: {integrity: sha512-klWPBR2ciQHS3f++ug/mVnWKPjBUo7icEL3FAO1lhAR1Z1i5NQYZ1EannMSRYcq5qCv5wNALlXr6fksRHyYl7w==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
-      typescript: '>=4.8.4 <6.1.0'
-
-  '@typescript-eslint/types@8.58.2':
-    resolution: {integrity: sha512-9TukXyATBQf/Jq9AMQXfvurk+G5R2MwfqQGDR2GzGz28HvY/lXNKGhkY+6IOubwcquikWk5cjlgPvD2uAA7htQ==}
+  '@typescript-eslint/visitor-keys@8.59.3':
+    resolution: {integrity: sha512-f1UQF7ggd42YiwI5wGrRaPsa+P0CINBlrkLPmGfpq/u/I/oVtecoEIfFR9ag/oa1sLOsRNZ6xehf6qMZhQGBDg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/types@8.59.0':
-    resolution: {integrity: sha512-nLzdsT1gdOgFxxxwrlNVUBzSNBEEHJ86bblmk4QAS6stfig7rcJzWKqCyxFy3YRRHXDWEkb2NralA1nOYkkm/A==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
-  '@typescript-eslint/types@8.59.1':
-    resolution: {integrity: sha512-ZDCjgccSdYPw5Bxh+my4Z0lJU96ZDN7jbBzvmEn0FZx3RtU1C7VWl6NbDx94bwY3V5YsgwRzJPOgeY2Q/nLG8A==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
-  '@typescript-eslint/typescript-estree@8.58.2':
-    resolution: {integrity: sha512-ELGuoofuhhoCvNbQjFFiobFcGgcDCEm0ThWdmO4Z0UzLqPXS3KFvnEZ+SHewwOYHjM09tkzOWXNTv9u6Gqtyuw==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      typescript: '>=4.8.4 <6.1.0'
-
-  '@typescript-eslint/typescript-estree@8.59.0':
-    resolution: {integrity: sha512-O9Re9P1BmBLFJyikRbQpLku/QA3/AueZNO9WePLBwQrvkixTmDe8u76B6CYUAITRl/rHawggEqUGn5QIkVRLMw==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      typescript: '>=4.8.4 <6.1.0'
-
-  '@typescript-eslint/typescript-estree@8.59.1':
-    resolution: {integrity: sha512-OUd+vJS05sSkOip+BkZ/2NS8RMxrAAJemsC6vU3kmfLyeaJT0TftHkV9mcx2107MmsBVXXexhVu4F0TZXyMl4g==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      typescript: '>=4.8.4 <6.1.0'
-
-  '@typescript-eslint/utils@8.58.2':
-    resolution: {integrity: sha512-QZfjHNEzPY8+l0+fIXMvuQ2sJlplB4zgDZvA+NmvZsZv3EQwOcc1DuIU1VJUTWZ/RKouBMhDyNaBMx4sWvrzRA==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
-      typescript: '>=4.8.4 <6.1.0'
-
-  '@typescript-eslint/utils@8.59.0':
-    resolution: {integrity: sha512-I1R/K7V07XsMJ12Oaxg/O9GfrysGTmCRhvZJBv0RE0NcULMzjqVpR5kRRQjHsz3J/bElU7HwCO7zkqL+MSUz+g==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
-      typescript: '>=4.8.4 <6.1.0'
-
-  '@typescript-eslint/utils@8.59.1':
-    resolution: {integrity: sha512-3pIeoXhCeYH9FSCBI8P3iNwJlGuzPlYKkTlen2O9T1DSeeg8UG8jstq6BLk+Mda0qup7mgk4z4XL4OzRaxZ8LA==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
-      typescript: '>=4.8.4 <6.1.0'
-
-  '@typescript-eslint/visitor-keys@8.58.2':
-    resolution: {integrity: sha512-f1WO2Lx8a9t8DARmcWAUPJbu0G20bJlj8L4z72K00TMeJAoyLr/tHhI/pzYBLrR4dXWkcxO1cWYZEOX8DKHTqA==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
-  '@typescript-eslint/visitor-keys@8.59.0':
-    resolution: {integrity: sha512-/uejZt4dSere1bx12WLlPfv8GktzcaDtuJ7s42/HEZ5zGj9oxRaD4bj7qwSunXkf+pbAhFt2zjpHYUiT5lHf0Q==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
-  '@typescript-eslint/visitor-keys@8.59.1':
-    resolution: {integrity: sha512-LdDNl6C5iJExcM0Yh0PwAIBb9PrSiCsWamF/JyEZawm3kFDnRoaq3LGE4bpyRao/fWeGKKyw7icx0YxrLFC5Cg==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
-  '@typescript/native-preview-darwin-arm64@7.0.0-dev.20260428.1':
-    resolution: {integrity: sha512-Lll6WmXfgTEj1G3QBIoHlabQwUtJiyhlRgSLksa06QFL5BoA7V+Lu1waa9PtPNZbGsXLDMHodtk/bRQABKuPiw==}
+  '@typescript/native-preview-darwin-arm64@7.0.0-dev.20260512.1':
+    resolution: {integrity: sha512-l9AJi/TIVMPx5R1c7fxZCSA7eUaHeA0C9Mxdxx/oQJo1K/GtbI3mzYe/SiKNltko1KSdKUmWVhPwxTOS289REg==}
     engines: {node: '>=16.20.0'}
     cpu: [arm64]
     os: [darwin]
 
-  '@typescript/native-preview-darwin-x64@7.0.0-dev.20260428.1':
-    resolution: {integrity: sha512-WbsBNSHlo+4sGrTxDWdmI7r8x48tCtSCuKdmK62FvVOq58UWAs6sL13Z4Rev4ohLcGHdXC5E/8AIdpLPqDYQpw==}
+  '@typescript/native-preview-darwin-x64@7.0.0-dev.20260512.1':
+    resolution: {integrity: sha512-oABZLQrfB8JN2Ct2CiLK5PyE28Em3sIJlZsAMD45/A2ymtIaa5826dwv8vapE5Wjp54ao0LXxCSuKFm1A8zzCQ==}
     engines: {node: '>=16.20.0'}
     cpu: [x64]
     os: [darwin]
 
-  '@typescript/native-preview-linux-arm64@7.0.0-dev.20260428.1':
-    resolution: {integrity: sha512-cgcBX/ZBMdepkamLT8g8jQdHe7DZS/s6zTZRof6mvcrnJHlMeUnKoC9UO8/c22IrUMV3n0XPh7R8FYjUP0ll+Q==}
+  '@typescript/native-preview-linux-arm64@7.0.0-dev.20260512.1':
+    resolution: {integrity: sha512-xvbwzpTe+5N6bnBI/t9n4zsGzXxz3V6rVbvDUoJmRLfav5fz+ck0QDkGQGUPrQEEIp0KEzQvx7c+AEZnzdvTQA==}
     engines: {node: '>=16.20.0'}
     cpu: [arm64]
     os: [linux]
 
-  '@typescript/native-preview-linux-arm@7.0.0-dev.20260428.1':
-    resolution: {integrity: sha512-/d/NnZFvEJU67L5mHh+cO3gsfwNCvJ9HGtxGq1KGz1VwTabOIcwLdpTpfsAR39WXzzfh9GJHL28n6GSGZInPow==}
+  '@typescript/native-preview-linux-arm@7.0.0-dev.20260512.1':
+    resolution: {integrity: sha512-0Hs1Gqa/t9cthoPdqHud1pFGUr9DgJivBTjwquTUh8jt/6PI2bQxoMNZLiN/bhqeDFDTzdxoMBfCaytsTMcXqw==}
     engines: {node: '>=16.20.0'}
     cpu: [arm]
     os: [linux]
 
-  '@typescript/native-preview-linux-x64@7.0.0-dev.20260428.1':
-    resolution: {integrity: sha512-4gJCE7wzenx1BH2Vtx2uKWUo8rFxnhGkxNEH1zxbYy/6ASwo+PnOPYmKHAzNE1C3yB5lzw71/vR5p5zyO57Y4A==}
+  '@typescript/native-preview-linux-x64@7.0.0-dev.20260512.1':
+    resolution: {integrity: sha512-qr5h6FPo74bN/U+EwRuayBhUbxaji8xzFbIbhMOA2oYSc/qozp5ia2g1+9xGw67MXxPPw/IPT+UGvrNK7K1NeQ==}
     engines: {node: '>=16.20.0'}
     cpu: [x64]
     os: [linux]
 
-  '@typescript/native-preview-win32-arm64@7.0.0-dev.20260428.1':
-    resolution: {integrity: sha512-yn6Rzbn62L4QTWrp0QgG8al6l/VG7PCPRdbE0vuGDSlKhInlC+Flo4QSc1qA8KHTbpHgl+nEsq9DymiitI4G4g==}
+  '@typescript/native-preview-win32-arm64@7.0.0-dev.20260512.1':
+    resolution: {integrity: sha512-meNWxhNEfaqos2U0JXvfxWvy4JWrKE9fZepCndDZi+t04X+AIiLYp5s6crWnKP67nzVAzMNgTAc8mu8CnGM+/A==}
     engines: {node: '>=16.20.0'}
     cpu: [arm64]
     os: [win32]
 
-  '@typescript/native-preview-win32-x64@7.0.0-dev.20260428.1':
-    resolution: {integrity: sha512-T9z13mcMowXmwGjprA2FIR2EEdYZxgqH8+qk7dFZVBlo5vfk41AN/qJfAdN7IsAhEb640MJ8cMN/aiczweZKmA==}
+  '@typescript/native-preview-win32-x64@7.0.0-dev.20260512.1':
+    resolution: {integrity: sha512-Hp6vBnxJSKEEAVWgIoWMmfqkZXCdkhm6XTivrwgRzBwWfiTVe2ZyZ7byWegIKeNnBbffg/K2KvoM8JAHl059GQ==}
     engines: {node: '>=16.20.0'}
     cpu: [x64]
     os: [win32]
 
-  '@typescript/native-preview@7.0.0-dev.20260428.1':
-    resolution: {integrity: sha512-JiM4PYWDGs57TT0mV2KArmaW7BnTkk3XRid79NdG17tfvDbRyg4hBCpKI7vARiQPtxjKrHlxyzxOGDpv5W5T7Q==}
+  '@typescript/native-preview@7.0.0-dev.20260512.1':
+    resolution: {integrity: sha512-KIzYPGuxZnyiiYkYrozDT94Af2nwbdLXoY1cgGY66RRa9HSEw13RH9WHg8wA8fZhT4wYzF5uF7WY3hz0QhaxGg==}
     engines: {node: '>=16.20.0'}
     hasBin: true
 
   '@ungap/structured-clone@1.3.0':
     resolution: {integrity: sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==}
+    deprecated: Potential CWE-502 - Update to 1.3.1 or higher
 
   '@unpic/core@1.0.3':
     resolution: {integrity: sha512-aum9YNVUGso7MjGLD0Rp/08kywCGLqZ03/q6VQBFFakDBOXWEc8D4kPGcZ8v5wEnGRex3lE+++bOuucBp3KJ/w==}
@@ -4497,8 +4374,8 @@ packages:
       babel-plugin-react-compiler:
         optional: true
 
-  '@vitejs/plugin-rsc@0.5.25':
-    resolution: {integrity: sha512-u+0l91DPzvCQjZX0YcdVTfv0171f1GzTL1EkRlu2dx9DY6kXu+xi+oCuPYaVI0KGj4q6gJiJCYSWNuCjuT+Otw==}
+  '@vitejs/plugin-rsc@0.5.26':
+    resolution: {integrity: sha512-T8W8ODEutblw9qXQB512LDPyv1tAbJRD/Gf0QEGsAoydl4nxEtIrghnhoI9oLY9R+7aw+cLk1ZEltxWHWf4aHw==}
     peerDependencies:
       react: '*'
       react-dom: '*'
@@ -4508,16 +4385,16 @@ packages:
       react-server-dom-webpack:
         optional: true
 
-  '@vitest/coverage-v8@4.1.5':
-    resolution: {integrity: sha512-38C0/Ddb7HcRG0Z4/DUem8x57d2p9jYgp18mkaYswEOQBGsI1CG4f/hjm0ZCeaJfWhSZ4k7jgs29V1Zom7Ki9A==}
+  '@vitest/coverage-v8@4.1.6':
+    resolution: {integrity: sha512-36l628fQ/9a/8ihy97eOtEnvWQEdqULQOJtcaxtoNq0G1w3Mxd4szSahOaMM9/NGyZ+hyKcMtIW/WIxq0XQViQ==}
     peerDependencies:
-      '@vitest/browser': 4.1.5
+      '@vitest/browser': 4.1.6
     peerDependenciesMeta:
       '@vitest/browser':
         optional: true
 
-  '@vitest/eslint-plugin@1.6.15':
-    resolution: {integrity: sha512-dTMjrdngmcB+DxomlKQ+SUubCTvd0m2hQQFpv5sx+GRodmeoxr2PVbphk57SVp250vpxphk9Ccwyv6fQ6+2gkA==}
+  '@vitest/eslint-plugin@1.6.17':
+    resolution: {integrity: sha512-sIVY9ZeVcXyPxFCNRkIt8Yw4keKIcUyp9/8qnmuomPwE+ST1htw5sZsbqdUMTiah9SmCg1JYoK9RqdDtPeNYYg==}
     engines: {node: '>=18'}
     peerDependencies:
       '@typescript-eslint/eslint-plugin': '*'
@@ -4535,8 +4412,8 @@ packages:
   '@vitest/pretty-format@3.2.4':
     resolution: {integrity: sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==}
 
-  '@vitest/pretty-format@4.1.5':
-    resolution: {integrity: sha512-7I3q6l5qr03dVfMX2wCo9FxwSJbPdwKjy2uu/YPpU3wfHvIL4QHwVRp57OfGrDFeUJ8/8QdfBKIV12FTtLn00g==}
+  '@vitest/pretty-format@4.1.6':
+    resolution: {integrity: sha512-h5SxD/IzNhZYnrSZRsUZQIC+vD0GY8cUvq0iwsmkFKixRCKLLWqCXa/FIQ4S1R+sI+PGoojkHsdNrbZiM9Qpgw==}
 
   '@vitest/spy@3.2.4':
     resolution: {integrity: sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==}
@@ -4544,8 +4421,8 @@ packages:
   '@vitest/utils@3.2.4':
     resolution: {integrity: sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==}
 
-  '@vitest/utils@4.1.5':
-    resolution: {integrity: sha512-76wdkrmfXfqGjueGgnb45ITPyUi1ycZ4IHgC2bhPDUfWHklY/q3MdLOAB+TF1e6xfl8NxNY0ZYaPCFNWSsw3Ug==}
+  '@vitest/utils@4.1.6':
+    resolution: {integrity: sha512-FxIY+U81R3LGKCxaHHFRQ5+g6/iRgGLmeHWdp2Amj4ljQRrEIWHmZyDfDYBRZlpyqA7qKxtS9DD1dhk8RnRIVQ==}
 
   '@voidzero-dev/vite-plus-core@0.1.20':
     resolution: {integrity: sha512-4KmzRfzwTeG3JuvDijrdqWusSgRvLMKDPrVsDdtbDVVjEMq0VnM8lSH+Nvepd6Pg+SuSVUP212OIfH/3Yn1bfA==}
@@ -4905,6 +4782,26 @@ packages:
       magicast:
         optional: true
 
+  c12@4.0.0-beta.5:
+    resolution: {integrity: sha512-yWGCPCQGJeFq4R0mFg5HOhC3Rg+B0PCdM+ldXWUhughoGgeeq8/tjRmXh4/lmhKWyhf+KOFxB/JMXf0Yv1Fd5A==}
+    peerDependencies:
+      chokidar: ^5
+      dotenv: '*'
+      giget: '*'
+      jiti: '*'
+      magicast: '*'
+    peerDependenciesMeta:
+      chokidar:
+        optional: true
+      dotenv:
+        optional: true
+      giget:
+        optional: true
+      jiti:
+        optional: true
+      magicast:
+        optional: true
+
   cac@7.0.0:
     resolution: {integrity: sha512-tixWYgm5ZoOD+3g6UTea91eow5z6AAHaho3g0V9CNSNb45gM8SmflpAc+GRd1InC4AqN/07Unrgp56Y94N9hJQ==}
     engines: {node: '>=20.19.0'}
@@ -4963,14 +4860,6 @@ packages:
     resolution: {integrity: sha512-WDrybc/gKFpTYQutKIK6UvfcuxijIZfMfXaYm8NMsPQxSYvf+13fXUJ4rztGGbJcBQ/GF55gvrZ0Bc0bj/mqvg==}
     engines: {node: '>=20.18.1'}
 
-  chevrotain-allstar@0.3.1:
-    resolution: {integrity: sha512-b7g+y9A0v4mxCW1qUhf3BSVPg+/NvGErk/dOkrDaHA0nQIQGAtrOjlX//9OQtRlSCy+x9rfB5N8yC71lH1nvMw==}
-    peerDependencies:
-      chevrotain: ^11.0.0
-
-  chevrotain@11.1.2:
-    resolution: {integrity: sha512-opLQzEVriiH1uUQ4Kctsd49bRoFDXGGSC4GUqj7pGyxM3RehRhvTlZJc1FL/Flew2p5uwxa1tUDWKzI4wNM8pg==}
-
   chokidar@5.0.0:
     resolution: {integrity: sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==}
     engines: {node: '>= 20.19.0'}
@@ -5422,12 +5311,8 @@ packages:
     resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==}
     engines: {node: '>= 4'}
 
-  dompurify@3.3.2:
-    resolution: {integrity: sha512-6obghkliLdmKa56xdbLOpUZ43pAR6xFy1uOrxBaIDjT+yaRuuybLjGS9eVBoSR/UPU5fq3OXClEHLJNGvbxKpQ==}
-    engines: {node: '>=20'}
-
-  dompurify@3.4.1:
-    resolution: {integrity: sha512-JahakDAIg1gyOm7dlgWSDjV4n7Ip2PKR55NIT6jrMfIgLFgWo81vdr1/QGqWtFNRqXP9UV71oVePtjqS2ebnPw==}
+  dompurify@3.4.2:
+    resolution: {integrity: sha512-lHeS9SA/IKeIFFyYciHBr2n0v1VMPlSj843HdLOwjb2OxNwdq9Xykxqhk+FE42MzAdHvInbAolSE4mhahPpjXA==}
 
   domutils@3.2.2:
     resolution: {integrity: sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==}
@@ -5497,8 +5382,8 @@ packages:
     resolution: {integrity: sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==}
     engines: {node: '>=10.0.0'}
 
-  enhanced-resolve@5.20.1:
-    resolution: {integrity: sha512-Qohcme7V1inbAfvjItgw0EaxVX5q2rdVEZHRBrEQdRZTssLDGsL8Lwrznl8oQ/6kuTJONLaDcGjkNP247XEhcA==}
+  enhanced-resolve@5.21.3:
+    resolution: {integrity: sha512-QyL119InA+XXEkNLNTPCXPugSvOfhwv0JOlGNzvxs0hZaiHLNvXSpudUWsOlsXGWJh8G6ckCScEkVHfX3kw/2Q==}
     engines: {node: '>=10.13.0'}
 
   entities@4.5.0:
@@ -5526,11 +5411,11 @@ packages:
   es-module-lexer@1.7.0:
     resolution: {integrity: sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==}
 
-  es-module-lexer@2.0.0:
-    resolution: {integrity: sha512-5POEcUuZybH7IdmGsD8wlf0AI55wMecM9rVBTI/qEAy2c1kTOm3DjFYjrBdI2K3BaJjJYfYFeRtM0t9ssnRuxw==}
+  es-module-lexer@2.1.0:
+    resolution: {integrity: sha512-n27zTYMjYu1aj4MjCWzSP7G9r75utsaoc8m61weK+W8JMBGGQybd43GstCXZ3WNmSFtGT9wi59qQTW6mhTR5LQ==}
 
-  es-toolkit@1.46.0:
-    resolution: {integrity: sha512-IToJ6ct9OLl5zz6WsC/1vZEwfSZ7Myil+ygl5Tf30Xjn9AEkzNB4kqp2G7VUJKF1DtTx/ra5M5KLlXvzOg51BA==}
+  es-toolkit@1.46.1:
+    resolution: {integrity: sha512-5eNtXOs3tbfxXOj04tjjseeWkRWaoCjdEI+96DgwzZoe6c9juL49pXlzAFTI72aWC9Y8p7168g6XIKjh7k6pyQ==}
 
   esast-util-from-estree@2.0.0:
     resolution: {integrity: sha512-4CyanoAudUSBAn5K13H4JhsMH6L9ZP7XbLVe/dKybkxMO7eDyLsT8UHl9TRNrU2Gr9nz+FovfSIjuXWJ81uVwQ==}
@@ -5573,8 +5458,8 @@ packages:
     peerDependencies:
       eslint: ^9.5.0 || ^10.0.0
 
-  eslint-flat-config-utils@3.1.0:
-    resolution: {integrity: sha512-lM+Nwo2CzpuTS/RASQExlEIwk/BQoKqJWX6VbDlLMb/mveqvt9MMrRXFEkG3bseuK6g8noKZLeX82epkILtv4A==}
+  eslint-flat-config-utils@3.2.0:
+    resolution: {integrity: sha512-PHgo1X5uqIorJONLVD9BIaOSdoYFD3z/AeJljdqDPlWVRpeCYkDbK9k0AXoYVqqNJr6FEYIEr5Rm2TSktLQcHw==}
 
   eslint-json-compat-utils@0.2.3:
     resolution: {integrity: sha512-RbBmDFyu7FqnjE8F0ZxPNzx5UaptdeS9Uu50r7A+D7s/+FCX+ybiyViYEgFUaFIFqSWJgZRTpL5d8Kanxxl2lQ==}
@@ -5587,8 +5472,8 @@ packages:
       '@eslint/json':
         optional: true
 
-  eslint-markdown@0.7.0:
-    resolution: {integrity: sha512-cqnr3BWOC7EdexODdtuKIZ4Sbot78x1PZUrdIREp1v25PXgAhz+GRyZjxhSczLnEnf/oj49IyoiBjGAmcLNCQA==}
+  eslint-markdown@0.9.0:
+    resolution: {integrity: sha512-prjW5TYlxljeQEZn4MHjxiQq5VRigKOd1D8XuKQob5oQYZJYrIvrYQUiS5au9Zb+HKeeDzSPDSM19zID3GwGzA==}
     engines: {node: ^20.19.0 || ^22.13.0 || >=24.0.0}
     peerDependencies:
       eslint: ^9.31.0 || ^10.0.0-rc.0
@@ -5601,8 +5486,8 @@ packages:
     peerDependencies:
       eslint: '*'
 
-  eslint-plugin-antfu@3.2.2:
-    resolution: {integrity: sha512-Qzixht2Dmd/pMbb5EnKqw2V8TiWHbotPlsORO8a+IzCLFwE0RxK8a9k4DCTFPzBwyxJzH+0m2Mn8IUGeGQkyUw==}
+  eslint-plugin-antfu@3.2.3:
+    resolution: {integrity: sha512-U2fnz/H0gFPxpuC7QpaHa0Jv2AgCZ5hunp36SOP/yWo8yFzgvMh8X4pZ4uN4IKoqtBhk7G3HuVa93Urf51+sZg==}
     peerDependencies:
       eslint: '*'
 
@@ -5627,11 +5512,6 @@ packages:
       '@typescript-eslint/utils': '*'
       eslint: '*'
 
-  eslint-plugin-depend@1.5.0:
-    resolution: {integrity: sha512-i3UeLYmclf1Icp35+6W7CR4Bp2PIpDgBuf/mpmXK5UeLkZlvYJ21VuQKKHHAIBKRTPivPGX/gZl5JGno1o9Y0A==}
-    peerDependencies:
-      eslint: '>=8.40.0'
-
   eslint-plugin-es-x@7.8.0:
     resolution: {integrity: sha512-7Ds8+wAAoV3T+LAKeu39Y5BzXCrGKrcISfgKEqTS4BDN8SFEDQd0S43jiQ8vIa3wUKD07qitZdfzlenSi8/0qQ==}
     engines: {node: ^14.18.0 || >=16.0.0}
@@ -5668,23 +5548,30 @@ packages:
       '@eslint/markdown': ^7.4.0 || ^8.0.0
       eslint: '>=9.0.0'
 
-  eslint-plugin-n@17.24.0:
-    resolution: {integrity: sha512-/gC7/KAYmfNnPNOb3eu8vw+TdVnV0zhdQwexsw6FLXbhzroVj20vRn2qL8lDWDGnAQ2J8DhdfvXxX9EoxvERvw==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+  eslint-plugin-n@18.0.1:
+    resolution: {integrity: sha512-q3ARhk+eZRc7myR0KHx+R3/GJeOHF+Ir6PK95Pu2tEX8Sl/4BIpmmVLva2kPrjC2gCmn6WHlHm+3yeo6Rxhycw==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
     peerDependencies:
-      eslint: '>=8.23.0'
+      eslint: '>=8.57.1'
+      ts-declaration-location: ^1.0.6
+      typescript: '>=5.0.0'
+    peerDependenciesMeta:
+      ts-declaration-location:
+        optional: true
+      typescript:
+        optional: true
 
   eslint-plugin-no-barrel-files@1.3.1:
     resolution: {integrity: sha512-y7OX5kyH7PMNRFhLF6SmM4JapxvaxExrgWPndPNTzilpO5uBqybuN480g3E8TTxT3OLOOhQDynmcJ0dnipIyNA==}
     peerDependencies:
       eslint: ^8.0.0 || ^9.0.0 || ^10.0.0
 
-  eslint-plugin-no-only-tests@3.3.0:
-    resolution: {integrity: sha512-brcKcxGnISN2CcVhXJ/kEQlNa0MEfGRtwKtWA16SkqXHKitaKIMrfemJKLKX1YqDU5C/5JY3PvZXd5jEW04e0Q==}
+  eslint-plugin-no-only-tests@3.4.0:
+    resolution: {integrity: sha512-4S3/9Nb7A2tiMcpzEQE9bQSlpeOz6WJkgryBuou/SA8W2x2c8Zf4j0NvTKBjv6qNhF9T79tmkecm/0CHqV0UGg==}
     engines: {node: '>=5.0.0'}
 
-  eslint-plugin-perfectionist@5.8.0:
-    resolution: {integrity: sha512-k8uIptWIxkUclonCFGyDzgYs9NI+Qh0a7cUXS3L7IYZDEsjXuimFBVbxXPQQngWqMiaxJRwbtYB4smMGMqF+cw==}
+  eslint-plugin-perfectionist@5.9.0:
+    resolution: {integrity: sha512-8TWzg02zmnBdZwCkWLi8jhzqXI+fE7Z/RwV8SL6xD45tJ8Bp3wGuYL2XtQgfe/Wd0eBqOUX+s6ey73IyszvKTA==}
     engines: {node: ^20.0.0 || >=22.0.0}
     peerDependencies:
       eslint: ^8.45.0 || ^9.0.0 || ^10.0.0
@@ -5694,18 +5581,25 @@ packages:
     peerDependencies:
       eslint: ^9.0.0 || ^10.0.0
 
-  eslint-plugin-react-dom@3.0.0:
-    resolution: {integrity: sha512-NhxPJSGZzR/bW02wop2whWXYKE8ZLZ9JupC5MWRq1AdM+Z84jnUU8c+eobiRzIhy2OupEjKcB8TaqHuQ+3sVoQ==}
+  eslint-plugin-react-dom@5.7.7:
+    resolution: {integrity: sha512-5Mh9UtD70xA7zulqJdzBBOVs6l7FPKbeYdIygAZ/4skhEqh8DanWTdwyGhxxBqbfGJcr3BnWUa3B4T6FIdRufg==}
     engines: {node: '>=22.0.0'}
     peerDependencies:
-      eslint: ^10.0.0
+      eslint: ^10.3.0
       typescript: '*'
 
-  eslint-plugin-react-naming-convention@3.0.0:
-    resolution: {integrity: sha512-pAtOZST5/NhWIa/I5yz7H1HEZTtCY7LHMhzmN9zvaOdTWyZYtz2g9pxPRDBnkR9uSmHsNt44gj+2JSAD4xwgew==}
+  eslint-plugin-react-jsx@5.7.7:
+    resolution: {integrity: sha512-56ceaDHZXWJR8XCstuc/q2Q5SsbX9X6XbMbufCWpTvYibQO6GnMEfrxWT5/q2wAKWI4rNGsOBLOHZDF9QBP2MQ==}
     engines: {node: '>=22.0.0'}
     peerDependencies:
-      eslint: ^10.0.0
+      eslint: ^10.3.0
+      typescript: '*'
+
+  eslint-plugin-react-naming-convention@5.7.7:
+    resolution: {integrity: sha512-Um4QscSSRBCHbLITkAmAac9GODK8Krh8uRwUP+jx1pRcFlY45jzu4/Mna2VZW9Pc2npMjnv2ZGhx/zJL8NB4hA==}
+    engines: {node: '>=22.0.0'}
+    peerDependencies:
+      eslint: ^10.3.0
       typescript: '*'
 
   eslint-plugin-react-refresh@0.5.2:
@@ -5713,25 +5607,25 @@ packages:
     peerDependencies:
       eslint: ^9 || ^10
 
-  eslint-plugin-react-rsc@3.0.0:
-    resolution: {integrity: sha512-HNP1hVO63WsV4wcXxPJJIcnYrvrN5UZyrXIbDOoCNA0axSXjJ6vA63tI2JHgyGcMTdbKxDJwaVd/dJlMudSZBQ==}
-    engines: {node: '>=20.19.0'}
-    peerDependencies:
-      eslint: ^10.0.0
-      typescript: '*'
-
-  eslint-plugin-react-web-api@3.0.0:
-    resolution: {integrity: sha512-DZZh9DkZp/BE5ibaDOXaV4p8rEuMNnoPkCvAlyifB/Gz6ZhHonFRTpg+PEK6et8sx6uroUfhy5QGducmZU8Oug==}
+  eslint-plugin-react-rsc@5.7.7:
+    resolution: {integrity: sha512-BL4JZaFJYhhUryLyh32NqOuktBjIVEX/Jdp4J7WOnbxolxrkBFiagu2UCp07+kQL7takcmwDLmFlb2tgnKA3lA==}
     engines: {node: '>=22.0.0'}
     peerDependencies:
-      eslint: ^10.0.0
+      eslint: ^10.3.0
       typescript: '*'
 
-  eslint-plugin-react-x@3.0.0:
-    resolution: {integrity: sha512-W8QGWk03iqj6EiOhQk2SrrnaiTb2RZFREg1YXgYAh2/zyFztHHnNz4LTeSN+6gFwWDypMFzuFF6uoHO/1KY0Yw==}
+  eslint-plugin-react-web-api@5.7.7:
+    resolution: {integrity: sha512-DlF1QihRP8Sp4Kitbxgdd6KZ6ZlLELnIxg3eC5XA/kxnA60k0/gcEG4/27hNgb+HicPuIJyRaMty5Pj0iODRjQ==}
     engines: {node: '>=22.0.0'}
     peerDependencies:
-      eslint: ^10.0.0
+      eslint: ^10.3.0
+      typescript: '*'
+
+  eslint-plugin-react-x@5.7.7:
+    resolution: {integrity: sha512-BV5b10CmiLb9+UR1W1ukj5jtP+qWZeWsQ1pjVDLaY38fHnCQPjQ0PaEijXg7AV2sxdH9JW9dmqQID7H/av0cOw==}
+    engines: {node: '>=22.0.0'}
+    peerDependencies:
+      eslint: ^10.3.0
       typescript: '*'
 
   eslint-plugin-regexp@3.1.0:
@@ -5745,11 +5639,11 @@ packages:
     peerDependencies:
       eslint: ^8.0.0 || ^9.0.0 || ^10.0.0
 
-  eslint-plugin-storybook@10.3.5:
-    resolution: {integrity: sha512-rEFkfU3ypF44GpB4tiJ9EFDItueoGvGi3+weLHZax2ON2MB7VIDsxdSUGvIU5tMURg+oWYlpzCyLm4TpDq2deA==}
+  eslint-plugin-storybook@10.3.6:
+    resolution: {integrity: sha512-8udrL+Rmp5LFaZvgRe4J226X1MYls25bWCyHuzR5X8s2qbFTryX+wKC+o/0Ato4A1AvwnDg8OOMPc6yWJ9JpcA==}
     peerDependencies:
       eslint: '>=8'
-      storybook: ^10.3.5
+      storybook: ^10.3.6
 
   eslint-plugin-toml@1.3.1:
     resolution: {integrity: sha512-1l00fBP03HIt9IPV7ZxBi7x0y0NMdEZmakL1jBD6N/FoKBvfKxPw5S8XkmzBecOnFBTn5Z8sNJtL5vdf9cpRMQ==}
@@ -5772,22 +5666,22 @@ packages:
       '@typescript-eslint/eslint-plugin':
         optional: true
 
-  eslint-plugin-vue@10.8.0:
-    resolution: {integrity: sha512-f1J/tcbnrpgC8suPN5AtdJ5MQjuXbSU9pGRSSYAuF3SHoiYCOdEX6O22pLaRyLHXvDcOe+O5ENgc1owQ587agA==}
+  eslint-plugin-vue@10.9.1:
+    resolution: {integrity: sha512-cHB0Tf4Duvzwecwd/AqWzZvF/QszE13BhjVUpVXWCy9AeMR5GjkAjP3i85vqgLgOuTmkHR1OJ5oMeqLHtuw8zg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       '@stylistic/eslint-plugin': ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0
       '@typescript-eslint/parser': ^7.0.0 || ^8.0.0
       eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
-      vue-eslint-parser: ^10.0.0
+      vue-eslint-parser: ^10.3.0
     peerDependenciesMeta:
       '@stylistic/eslint-plugin':
         optional: true
       '@typescript-eslint/parser':
         optional: true
 
-  eslint-plugin-yml@3.3.1:
-    resolution: {integrity: sha512-isntsZchaTqDMNNkD+CakrgA/pdUoJ45USWBKpuqfAW1MCuw731xX/vrXfoJFZU3tTFr24nCbDYmDfT2+g4QtQ==}
+  eslint-plugin-yml@3.3.2:
+    resolution: {integrity: sha512-XjmOB/fLBwYHqevnpclPL938V+9ExX7xw1hPaM3IPePGyMFRV1giS16RjSTNhIyCv/Oh0G0PEdmmZPATJ02YCw==}
     engines: {node: ^20.19.0 || ^22.13.0 || >=24.0.0}
     peerDependencies:
       eslint: '>=9.38.0'
@@ -5814,8 +5708,8 @@ packages:
     resolution: {integrity: sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==}
     engines: {node: ^20.19.0 || ^22.13.0 || >=24}
 
-  eslint@10.2.1:
-    resolution: {integrity: sha512-wiyGaKsDgqXvF40P8mDwiUp/KQjE1FdrIEJsM8PZ3XCiniTMXS3OHWWUe5FI5agoCnr8x4xPrTDZuxsBlNHl+Q==}
+  eslint@10.3.0:
+    resolution: {integrity: sha512-XbEXaRva5cF0ZQB8w6MluHA0kZZfV2DuCMJ3ozyEOHLwDpZX2Lmm/7Pp0xdJmI0GL1W05VH5VwIFHEm1Vcw2gw==}
     engines: {node: ^20.19.0 || ^22.13.0 || >=24}
     hasBin: true
     peerDependencies:
@@ -5909,14 +5803,14 @@ packages:
   fast-levenshtein@2.0.6:
     resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
 
-  fast-string-truncated-width@1.2.1:
-    resolution: {integrity: sha512-Q9acT/+Uu3GwGj+5w/zsGuQjh9O1TyywhIwAxHudtWrgF09nHOPrvTLhQevPbttcxjr/SNN7mJmfOw/B1bXgow==}
+  fast-string-truncated-width@3.0.3:
+    resolution: {integrity: sha512-0jjjIEL6+0jag3l2XWWizO64/aZVtpiGE3t0Zgqxv0DPuxiMjvB3M24fCyhZUO4KomJQPj3LTSUnDP3GpdwC0g==}
 
-  fast-string-width@1.1.0:
-    resolution: {integrity: sha512-O3fwIVIH5gKB38QNbdg+3760ZmGz0SZMgvwJbA1b2TGXceKE6A2cOlfogh1iw8lr049zPyd7YADHy+B7U4W9bQ==}
+  fast-string-width@3.0.2:
+    resolution: {integrity: sha512-gX8LrtNEI5hq8DVUfRQMbr5lpaS4nMIWV+7XEbXk2b8kiQIizgnlr12B4dA3ZEx3308ze0O4Q1R+cHts8kyUJg==}
 
-  fast-wrap-ansi@0.1.6:
-    resolution: {integrity: sha512-HlUwET7a5gqjURj70D5jl7aC3Zmy4weA1SHUfM0JFI0Ptq987NH2TwbBFLoERhfwk+E+eaq4EK3jXoT+R3yp3w==}
+  fast-wrap-ansi@0.2.0:
+    resolution: {integrity: sha512-rLV8JHxTyhVmFYhBJuMujcrHqOT2cnO5Zxj37qROj23CP39GXubJRBUFF0z8KFK77Uc0SukZUf7JZhsVEQ6n8w==}
 
   fastq@1.20.1:
     resolution: {integrity: sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==}
@@ -5998,6 +5892,10 @@ packages:
   functional-red-black-tree@1.0.1:
     resolution: {integrity: sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==}
 
+  fuse.js@7.3.0:
+    resolution: {integrity: sha512-plz8RVjfcDedTGfVngWH1jmJvBvAwi1v2jecfDerbEnMcmOYUEEwKFTHbNoCiYyzaK2Ws8lABkTCcRSqCY1q4w==}
+    engines: {node: '>=10'}
+
   gensync@1.0.0-beta.2:
     resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
     engines: {node: '>=6.9.0'}
@@ -6018,9 +5916,6 @@ packages:
     resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}
     engines: {node: '>=8'}
 
-  get-tsconfig@4.13.7:
-    resolution: {integrity: sha512-7tN6rFgBlMgpBML5j8typ92BKFi2sFQvIdpAqLA2beia5avZDrMs0FLZiM5etShWq5irVyGcGMEA1jcDaK7A/Q==}
-
   get-tsconfig@4.14.0:
     resolution: {integrity: sha512-yTb+8DXzDREzgvYmh6s9vHsSVCHeC0G3PI5bEXNBHtmshPnO+S5O7qgLEOn0I5QvMy6kpZN8K1NKGyilLb93wA==}
 
@@ -6054,8 +5949,8 @@ packages:
     resolution: {integrity: sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==}
     engines: {node: '>=18'}
 
-  globals@17.5.0:
-    resolution: {integrity: sha512-qoV+HK2yFl/366t2/Cb3+xxPUo5BuMynomoDmiaZBIdbs+0pYbjfZU+twLhGKp4uCZ/+NbtpVepH5bGCxRyy2g==}
+  globals@17.6.0:
+    resolution: {integrity: sha512-sepffkT8stwnIYbsMBpoCHJuJM5l98FUF2AnE07hfvE0m/qp3R586hw4jF4uadbhvg1ooIdzuu7CsfD2jzCaNA==}
     engines: {node: '>=18'}
 
   globrex@0.1.2:
@@ -6133,8 +6028,8 @@ packages:
     resolution: {integrity: sha512-Ox1pJVrDCyGHMG9CFg1tmrRUMRPRsAWYc/PinY0XzJU4K7y7vjNoLKIQ7BR5UJMCxNN8EM1MNDmHWA/B3aZUuw==}
     engines: {node: '>=6'}
 
-  hono@4.12.15:
-    resolution: {integrity: sha512-qM0jDhFEaCBb4TxoW7f53Qrpv9RBiayUHo0S52JudprkhvpjIrGoU1mnnr29Fvd1U335ZFPZQY1wlkqgfGXyLg==}
+  hono@4.12.18:
+    resolution: {integrity: sha512-RWzP96k/yv0PQfyXnWjs6zot20TqfpfsNXhOnev8d1InAxubW93L11/oNUc3tQqn2G0bSdAOBpX+2uDFHV7kdQ==}
     engines: {node: '>=16.9.0'}
 
   hosted-git-info@9.0.2:
@@ -6165,8 +6060,8 @@ packages:
   i18next-resources-to-backend@1.2.1:
     resolution: {integrity: sha512-okHbVA+HZ7n1/76MsfhPqDou0fptl2dAlhRDu2ideXloRRduzHsqDOznJBef+R3DFZnbvWoBW+KxJ7fnFjd6Yw==}
 
-  i18next@26.0.8:
-    resolution: {integrity: sha512-BRzLom0mhDhV9v0QhgUUHWQJuwFmnr1194xEcNLYD6ym8y8s542n4jXUvRLnhNTbh9PmpU6kGZamyuGHQMsGjw==}
+  i18next@26.1.0:
+    resolution: {integrity: sha512-dIU6td04DvQuIqVst5S9g0GviTmhZ0DYD4b9ociVGJmuCa5vZ2de/t+Enf4olvj87mF8Y2lwjNQBwC9QZsvzKQ==}
     peerDependencies:
       typescript: ^5 || ^6
     peerDependenciesMeta:
@@ -6202,8 +6097,8 @@ packages:
     engines: {node: '>=16.x'}
     hasBin: true
 
-  immer@11.1.4:
-    resolution: {integrity: sha512-XREFCPo6ksxVzP4E0ekD5aMdf8WMwmdNaz6vuvxgI40UaEiu6q3p8X52aU6GdyvLY3XXX/8R7JOTXStz/nBbRw==}
+  immer@11.1.8:
+    resolution: {integrity: sha512-/tbkHMW7y10Lx6i1crLjD4/OhNkRG+Fo7byZHtah0547nIeXYcpIXaUh0IAQY6gO5459qpGGYapcEOHtFXkIuA==}
 
   imurmurhash@0.1.4:
     resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
@@ -6322,12 +6217,12 @@ packages:
     resolution: {integrity: sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==}
     engines: {node: '>=8'}
 
-  jiti@2.6.1:
-    resolution: {integrity: sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==}
+  jiti@2.7.0:
+    resolution: {integrity: sha512-AC/7JofJvZGrrneWNaEnJeOLUx+JlGt7tNa0wZiRPT4MY1wmfKjt2+6O2p2uz2+skll8OZZmJMNqeke7kKbNgQ==}
     hasBin: true
 
-  jotai@2.19.1:
-    resolution: {integrity: sha512-sqm9lVZiqBHZH8aSRk32DSiZDHY3yUIlulXYn9GQj7/LvoUdYXSMti7ZPJGo+6zjzKFt5a25k/I6iBCi43PJcw==}
+  jotai@2.20.0:
+    resolution: {integrity: sha512-b5GAqgmXmXzB4WPaTH26ppk9Sl7AA9WSQX7yfdM+gJ1rFROiWcVbi97gFuN/yVCojOcbcvop2sfLL+fjxW0JVg==}
     engines: {node: '>=12.20.0'}
     peerDependencies:
       '@babel/core': '>=7.0.0'
@@ -6418,8 +6313,8 @@ packages:
   khroma@2.1.0:
     resolution: {integrity: sha512-Ls993zuzfayK269Svk9hzpeGUKob/sIgZzyHYdjQoAdQetRKpOLj+k/QQQ/6Qi0Yz65mlROrfd+Ev+1+7dz9Kw==}
 
-  knip@6.7.0:
-    resolution: {integrity: sha512-ckL51NDH1YJxnv1kNB0iUdDngB4f/e9Igz8uIqYfmNDoyOFmmk1V0WFv3LQ7/hzC63b2Z9X41gGUE9eOWrZpaA==}
+  knip@6.13.1:
+    resolution: {integrity: sha512-hvSnb+YDpDWW1LXub4U0JFfkQhscwgInWuQOv99WTutPZavf1cEP3GwxzEzO2JJpGI9yATk6l0jPLY1V3fp1sQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
 
@@ -6436,10 +6331,6 @@ packages:
   lamejs@1.2.1:
     resolution: {integrity: sha512-s7bxvjvYthw6oPLCm5pFxvA84wUROODB8jEO2+CE1adhKgrIvVOlmMgY8zyugxGrvRaDHNJanOiS21/emty6dQ==}
 
-  langium@4.2.1:
-    resolution: {integrity: sha512-zu9QWmjpzJcomzdJQAHgDVhLGq5bLosVak1KVa40NzQHXfqr4eAHupvnPOVXEoLkg6Ocefvf/93d//SB7du4YQ==}
-    engines: {node: '>=20.10.0', npm: '>=10.2.3'}
-
   launch-ide@1.4.3:
     resolution: {integrity: sha512-v2xMAarJOFy51kuesYEIIx5r4WHvsV+VLMU49K24bdiRZGUpo1ZulO1DRrLozM5BMbXUfRfrUTM2PbBfYCeA4Q==}
 
@@ -6571,8 +6462,8 @@ packages:
     resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
     hasBin: true
 
-  loro-crdt@1.12.0:
-    resolution: {integrity: sha512-+QAqhBEQ3VZqQKRYjVZElZKLMgtQoewaT1l+oZUh74WsCNqvNI5hazy5gM35NQvcOkrebskWc15a33LS6WAR7g==}
+  loro-crdt@1.12.1:
+    resolution: {integrity: sha512-iHDGq4RaTHr6CFbXqV91ngKyVlB2NuYXz0q9t0Dedr8sQnbcPNdFs4DaqzDNP1jojuygFvYv12gt407M22OeQg==}
 
   loupe@3.2.1:
     resolution: {integrity: sha512-CdzqowRJCeLU72bHvWqwRBBlLcMEtIvGrlvef74kMnV2AolS9Y8xUv1I0U/MNAWMhBlKIoyuEgoJ0t/bbwHbLQ==}
@@ -6695,8 +6586,8 @@ packages:
     resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
     engines: {node: '>= 8'}
 
-  mermaid@11.14.0:
-    resolution: {integrity: sha512-GSGloRsBs+JINmmhl0JDwjpuezCsHB4WGI4NASHxL3fHo3o/BRXTxhDLKnln8/Q0lRFRyDdEjmk1/d5Sn1Xz8g==}
+  mermaid@11.15.0:
+    resolution: {integrity: sha512-pTMbcf3rWdtLiYGpmoTjHEpeY8seiy6sR+9nD7LOs8KfUbHE4lOUAprTRqRAcWSQ6MQpdX+YEsxShtGsINtPtw==}
 
   micromark-core-commonmark@2.0.3:
     resolution: {integrity: sha512-RDBrHEMSxVFLg6xvnXmb1Ayr2WzLAWjeSATAoxwKYJV94TeNavgoIdA0a9ytzDSVzBy2YKFK+emCPOEibLeCrg==}
@@ -6834,10 +6725,6 @@ packages:
     resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
     engines: {node: '>=4'}
 
-  minimatch@10.2.4:
-    resolution: {integrity: sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==}
-    engines: {node: 18 || 20 || >=22}
-
   minimatch@10.2.5:
     resolution: {integrity: sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==}
     engines: {node: 18 || 20 || >=22}
@@ -6870,8 +6757,8 @@ packages:
   module-alias@2.3.4:
     resolution: {integrity: sha512-bOclZt8hkpuGgSSoG07PKmvzTizROilUTvLNyrMqvlC9snhs7y7GzjNWAVbISIOlhCP1T14rH1PDAV9iNyBq/w==}
 
-  module-replacements@2.11.0:
-    resolution: {integrity: sha512-j5sNQm3VCpQQ7nTqGeOZtoJtV3uKERgCBm9QRhmGRiXiqkf7iRFOkfxdJRZWLkqYY8PNf4cDQF/WfXUYLENrRA==}
+  module-replacements@3.0.0-beta.7:
+    resolution: {integrity: sha512-n1F9l3gF1wNh13xmnXS2JU7P9c3DlzCgVEyLKrVN0U37RwrXyYoePMMvYvs/6aUONAxbnscphzESZTCorXFh7Q==}
 
   moo-color@1.0.3:
     resolution: {integrity: sha512-i/+ZKXMDf6aqYtBhuOcej71YSlbjT3wCO/4H1j8rPvxDJEifdwgg5MaFyu6iYAT8GBZJg2z0dkgK4YMzvURALQ==}
@@ -6914,8 +6801,8 @@ packages:
       react: ^16.8 || ^17 || ^18 || ^19 || ^19.0.0-rc
       react-dom: ^16.8 || ^17 || ^18 || ^19 || ^19.0.0-rc
 
-  next@16.2.4:
-    resolution: {integrity: sha512-kPvz56wF5frc+FxlHI5qnklCzbq53HTwORaWBGdT0vNoKh1Aya9XC8aPauH4NJxqtzbWsS5mAbctm4cr+EkQ2Q==}
+  next@16.2.6:
+    resolution: {integrity: sha512-qOVgKJg1+At15NpeUP+eJgCHvTCgXsogweq87Ri/Ix7PkqQHg4sdaXmSFqKlgaIXE4kW0g25LE68W87UANlHtw==}
     engines: {node: '>=20.9.0'}
     hasBin: true
     peerDependencies:
@@ -7016,8 +6903,8 @@ packages:
     resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
     engines: {node: '>= 0.8.0'}
 
-  oxc-parser@0.127.0:
-    resolution: {integrity: sha512-bkgD4qHlN7WxLdX8bLXdaU54TtQtAIg/ZBAfm0aje/mo3MRDo3P0hZSgr4U7O3xfX+fQmR5AP04JS/TGcZLcFA==}
+  oxc-parser@0.130.0:
+    resolution: {integrity: sha512-X0PJ+NmOok8qP3vK9uaW431ngkdM9UPEK7KG466urtIL2+EYTEgbZK2yqe2MWKJKBjRlFweP/pJPx0x9muMEVw==}
     engines: {node: ^20.19.0 || >=22.12.0}
 
   oxc-resolver@11.19.1:
@@ -7162,16 +7049,16 @@ packages:
   pkg-types@1.3.1:
     resolution: {integrity: sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==}
 
-  pkg-types@2.3.0:
-    resolution: {integrity: sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==}
+  pkg-types@2.3.1:
+    resolution: {integrity: sha512-y+ichcgc2LrADuhLNAx8DFjVfgz91pRxfZdI3UDhxHvcVEZsenLO+7XaU5vOp0u/7V/wZ+plyuQxtrDlZJ+yeg==}
 
-  playwright-core@1.59.1:
-    resolution: {integrity: sha512-HBV/RJg81z5BiiZ9yPzIiClYV/QMsDCKUyogwH9p3MCP6IYjUFu/MActgYAvK0oWyV9NlwM3GLBjADyWgydVyg==}
+  playwright-core@1.60.0:
+    resolution: {integrity: sha512-9bW6zvX/m0lEbgTKJ6YppOKx8H3VOPBMOCFh2irXFOT4BbHgrx5hPjwJYLT40Lu+4qtD36qKc/Hn56StUW57IA==}
     engines: {node: '>=18'}
     hasBin: true
 
-  playwright@1.59.1:
-    resolution: {integrity: sha512-C8oWjPR3F81yljW9o5OxcWzfh6avkVwDD2VYdwIGqTkl+OGFISgypqzfu7dOe4QNLL2aqcWBmI3PMtLIK233lw==}
+  playwright@1.60.0:
+    resolution: {integrity: sha512-hheHdokM8cdqCb0lcE3s+zT4t4W+vvjpGxsZlDnikarzx8tSzMebh3UiFtgqwFwnTnjYQcsyMF8ei2mCO/tpeA==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -7207,12 +7094,8 @@ packages:
   postcss-value-parser@4.2.0:
     resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
 
-  postcss@8.4.31:
-    resolution: {integrity: sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==}
-    engines: {node: ^10 || ^12 || >=14}
-
-  postcss@8.5.12:
-    resolution: {integrity: sha512-W62t/Se6rA0Az3DfCL0AqJwXuKwBeYg6nOaIgzP+xZ7N5BFCI7DYi1qs6ygUYT6rvfi6t9k65UMLJC+PHZpDAA==}
+  postcss@8.5.14:
+    resolution: {integrity: sha512-SoSL4+OSEtR99LHFZQiJLkT59C5B1amGO1NzTwj7TT1qCUgUO6hxOvzkOYxD+vMrXBM3XJIKzokoERdqQq/Zmg==}
     engines: {node: ^10 || ^12 || >=14}
 
   powershell-utils@0.1.0:
@@ -7299,10 +7182,10 @@ packages:
     resolution: {integrity: sha512-aEZ9qP+/M+58x2qgfSFEWH1BxLyHe5+qkLNJOZQb5iGS017jpbRnoKhNRrXPeA6RfBrZO5wZrT9DMC1UqE1f1w==}
     engines: {node: ^20.9.0 || >=22}
 
-  react-dom@19.2.5:
-    resolution: {integrity: sha512-J5bAZz+DXMMwW/wV3xzKke59Af6CHY7G4uYLN1OvBcKEsWOs4pQExj86BBKamxl/Ik5bx9whOrvBlSDfWzgSag==}
+  react-dom@19.2.6:
+    resolution: {integrity: sha512-0prMI+hvBbPjsWnxDLxlCGyM8PN6UuWjEUCYmZhO67xIV9Xasa/r/vDnq+Xyq4Lo27g8QSbO5YzARu0D1Sps3g==}
     peerDependencies:
-      react: ^19.2.5
+      react: ^19.2.6
 
   react-draggable@4.5.0:
     resolution: {integrity: sha512-VC+HBLEZ0XJxnOxVAZsdRi8rD04Iz3SiiKOoYzamjylUcju/hP9np/aZdLHf/7WOD268WMoNJMvYfB5yAK45cw==}
@@ -7324,8 +7207,8 @@ packages:
   react-fast-compare@3.2.2:
     resolution: {integrity: sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==}
 
-  react-hotkeys-hook@5.2.4:
-    resolution: {integrity: sha512-BgKg+A1+TawkYluh5Bo4cTmcgMN5L29uhJbDUQdHwPX+qgXRjIPYU5kIDHyxnAwCkCBiu9V5OpB2mpyeluVF2A==}
+  react-hotkeys-hook@5.3.2:
+    resolution: {integrity: sha512-DDDy9xK6mbTQ6aPlQvIl0dA/a90T/AWml4Rm21JXFDLlRHalIg4/Rv3equUQYs5xPTWq+oEl6RD7mi/nBpU3Uw==}
     peerDependencies:
       react: '>=16.8.0'
       react-dom: '>=16.8.0'
@@ -7394,12 +7277,12 @@ packages:
       react: '>=16.3.0'
       react-dom: '>=16.3.0'
 
-  react-server-dom-webpack@19.2.5:
-    resolution: {integrity: sha512-bYhdd2cZJhXHqyJBoloYaJrn8MrL9Egf3ZZVn0OrIODCCORm2goFD7C+xszf6xgfsSJi0rtgB/ichcuHfkJ4yQ==}
+  react-server-dom-webpack@19.2.6:
+    resolution: {integrity: sha512-762YXjBPc6hw2V16k4x1sdnw0mxghcSPzoiOhefGYjiTguJLCImGBUz6EjznPIfqKhWgLtpaQMlBhp66N8dKrw==}
     engines: {node: '>=0.10.0'}
     peerDependencies:
-      react: ^19.2.5
-      react-dom: ^19.2.5
+      react: ^19.2.6
+      react-dom: ^19.2.6
       webpack: ^5.59.0
 
   react-sortablejs@6.1.4:
@@ -7426,8 +7309,8 @@ packages:
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
 
-  react@19.2.5:
-    resolution: {integrity: sha512-llUJLzz1zTUBrskt2pwZgLq59AemifIftw4aB7JxOqf1HY2FDaGDxgwpAPVzHU1kdWabH7FauP4i1oEeer2WCA==}
+  react@19.2.6:
+    resolution: {integrity: sha512-sfWGGfavi0xr8Pg0sVsyHMAOziVYKgPLNrS7ig+ivMNb3wbCBw3KxtflsGBAwD3gYQlE/AEZsTLgToRrSCjb0Q==}
     engines: {node: '>=0.10.0'}
 
   reactflow@11.11.4:
@@ -7748,14 +7631,17 @@ packages:
     resolution: {integrity: sha512-9SN0XIjBBXCT6ZXXVnScJN4KP2RyFg6B8sEoFlugVHMANysfaEni4LTWlvUQQ/R0wgZl1Ovt9KBQbzn21kHoZA==}
     engines: {node: '>=20.19.0'}
 
-  storybook@10.3.5:
-    resolution: {integrity: sha512-uBSZu/GZa9aEIW3QMGvdQPMZWhGxSe4dyRWU8B3/Vd47Gy/XLC7tsBxRr13txmmPOEDHZR94uLuq0H50fvuqBw==}
+  storybook@10.3.6:
+    resolution: {integrity: sha512-vbSz7g/1rGMC1uAULqMZjALkIuLu2QABqfhRYhyr/11kzyesi+vAmwyJLukZP1FfecxGOgMwOh6GS0YsGpHAvQ==}
     hasBin: true
     peerDependencies:
       prettier: ^2 || ^3
+      vite-plus: ^0.1.15
     peerDependenciesMeta:
       prettier:
         optional: true
+      vite-plus:
+        optional: true
 
   streamdown@2.5.0:
     resolution: {integrity: sha512-/tTnURfIOxZK/pqJAxsfCvETG/XCJHoWnk3jq9xLcuz6CSpnjjuxSRBTTL4PKGhxiZQf0lqPxGhImdpwcZ2XwA==}
@@ -7876,14 +7762,14 @@ packages:
       '@eslint/css':
         optional: true
 
-  tailwind-merge@3.5.0:
-    resolution: {integrity: sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==}
+  tailwind-merge@3.6.0:
+    resolution: {integrity: sha512-uxL7qAVQriqRQPAyK3pj66VqskWqoZ37PW94jwOTwNfq/z9oyu1V+eqrZqtR2+fCiXdYOZe/Modt8GtvqNzu+w==}
 
-  tailwindcss@4.2.4:
-    resolution: {integrity: sha512-HhKppgO81FQof5m6TEnuBWCZGgfRAWbaeOaGT00KOy/Pf/j6oUihdvBpA7ltCeAvZpFhW3j0PTclkxsd4IXYDA==}
+  tailwindcss@4.3.0:
+    resolution: {integrity: sha512-y6nxMGB1nMW9R6k96e5gdIFzcfL/gTJRNaqGes1YvkLnPVXzWgbqFF2yLC0T8G774n24cx3Pe8XrKoniCOAH+Q==}
 
-  tapable@2.3.2:
-    resolution: {integrity: sha512-1MOpMXuhGzGL5TTCZFItxCc0AARf1EZFQkGqMm7ERKj8+Hgr5oLvJOVFcC+lRmR8hCe2S3jC4T5D7Vg/d7/fhA==}
+  tapable@2.3.3:
+    resolution: {integrity: sha512-uxc/zpqFg6x7C8vOE7lh6Lbda8eEL9zmVm/PLeTPBRhh1xCgdWaQ+J1CUieGpIfm2HdtsUpRv+HshiasBMcc6A==}
     engines: {node: '>=6'}
 
   tar-fs@2.1.4:
@@ -7943,11 +7829,11 @@ packages:
     resolution: {integrity: sha512-azl+t0z7pw/z958Gy9svOTuzqIk6xq+NSheJzn5MMWtWTFywIacg2wUlzKFGtt3cthx0r2SxMK0yzJOR0IES7Q==}
     engines: {node: '>=14.0.0'}
 
-  tldts-core@7.0.29:
-    resolution: {integrity: sha512-W99NuU7b1DcG3uJ3v9k9VztCH3WialNbBkBft5wCs8V8mexu0XQqaZEYb9l9RNNzK8+3EJ9PKWB0/RUtTQ/o+Q==}
+  tldts-core@7.0.30:
+    resolution: {integrity: sha512-uiHN8PIB1VmWyS98eZYja4xzlYqeFZVjb4OuYlJQnZAuJhMw4PbKQOKgHKhBdJR3FE/t5mUQ1Kd80++B+qhD1Q==}
 
-  tldts@7.0.29:
-    resolution: {integrity: sha512-JIXCerhudr/N6OWLwLF1HVsTTUo7ry6qHa5eWZEkiMuxsIiAACL55tGLfqfHfoH7QaMQUW8fngD7u7TxWexYQg==}
+  tldts@7.0.30:
+    resolution: {integrity: sha512-ELrFxuqsDdHUwoh0XxDbxuLD3Wnz49Z57IFvTtvWy1hJdcMZjXLIuonjilCiWHlT2GbE4Wlv1wKVTzDFnXH1aw==}
     hasBin: true
 
   to-regex-range@5.0.1:
@@ -7988,11 +7874,6 @@ packages:
   ts-debounce@4.0.0:
     resolution: {integrity: sha512-+1iDGY6NmOGidq7i7xZGA4cm8DAa6fqdYcvO5Z6yBevH++Bdo9Qt/mN0TzHUgcCcKv1gmh9+W5dHqz8pMWbCbg==}
 
-  ts-declaration-location@1.0.7:
-    resolution: {integrity: sha512-EDyGAwH1gO0Ausm9gV6T2nUvBgXT5kGoCMJPllOaooZ+4VvJiKBdZE7wK18N1deEowhcUptS+5GXZK8U/fvpwA==}
-    peerDependencies:
-      typescript: '>=4.0.0'
-
   ts-dedent@2.2.0:
     resolution: {integrity: sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==}
     engines: {node: '>=6.10'}
@@ -8071,8 +7952,8 @@ packages:
     resolution: {integrity: sha512-FeFPZ/WFT0mbRCuydiZzpPFlrYN8ZUpphQKoq4EeElVIYjYyGzPMxQR/simUwCOJIyVhpFk4RbtyO7RuMpMnHA==}
     engines: {node: '>=14'}
 
-  undici-types@7.19.2:
-    resolution: {integrity: sha512-qYVnV5OEm2AW8cJMCpdV20CDyaN3g0AjDlOGf1OW4iaDEx8MwdtChUp4zu4H0VP3nDRF/8RKWH+IPp9uW0YGZg==}
+  undici-types@7.21.0:
+    resolution: {integrity: sha512-w9IMgQrz4O0YN1LtB7K5P63vhlIOvC7opSmouCJ+ZywlPAlO9gIkJ+otk6LvGpAs2wg4econaCz3TvQ9xPoyuQ==}
 
   undici@7.24.0:
     resolution: {integrity: sha512-jxytwMHhsbdpBXxLAcuu0fzlQeXCNnWdDyRHpvWsUl8vd98UwYdl9YTyn8/HcpcJPC3pwUveefsa3zTxyD/ERg==}
@@ -8206,10 +8087,6 @@ packages:
   util-deprecate@1.0.2:
     resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
 
-  uuid@11.1.0:
-    resolution: {integrity: sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==}
-    hasBin: true
-
   uuid@14.0.0:
     resolution: {integrity: sha512-Qo+uWgilfSmAhXCMav1uYFynlQO7fMFiMVZsQqZRMIXp0O7rR7qjkj+cPvBHLgBqi960QCoo/PH2/6ZtVqKvrg==}
     hasBin: true
@@ -8234,17 +8111,17 @@ packages:
   vfile@6.0.3:
     resolution: {integrity: sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==}
 
-  vinext@0.0.45:
-    resolution: {integrity: sha512-iXXRR5IMO5bZHgN9xEIzwt/+jushkoJgmWNenR++x6Tw1XnJGTEY9D5GAKMGewHl+HJ1z2GPO4fpNkT+2UowRA==}
+  vinext@0.0.49:
+    resolution: {integrity: sha512-FD8JbaElijIfI1aWDo52c6r6/6k2ayuY5TwDqjAd10XEzHDMARLRukIFywqKKKliLEN4p9G0HU/TlJJ4umF5dw==}
     engines: {node: '>=22'}
     hasBin: true
     peerDependencies:
       '@mdx-js/rollup': ^3.0.0
       '@vitejs/plugin-react': ^5.1.4 || ^6.0.0
       '@vitejs/plugin-rsc': ^0.5.23
-      react: ^19.2.5
-      react-dom: ^19.2.5
-      react-server-dom-webpack: ^19.2.5
+      react: ^19.2.6
+      react-dom: ^19.2.6
+      react-server-dom-webpack: ^19.2.6
       vite: ^7.0.0 || ^8.0.0
     peerDependenciesMeta:
       '@mdx-js/rollup':
@@ -8325,23 +8202,6 @@ packages:
     resolution: {integrity: sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==}
     engines: {node: '>=0.10.0'}
 
-  vscode-jsonrpc@8.2.0:
-    resolution: {integrity: sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==}
-    engines: {node: '>=14.0.0'}
-
-  vscode-languageserver-protocol@3.17.5:
-    resolution: {integrity: sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==}
-
-  vscode-languageserver-textdocument@1.0.12:
-    resolution: {integrity: sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==}
-
-  vscode-languageserver-types@3.17.5:
-    resolution: {integrity: sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==}
-
-  vscode-languageserver@9.0.1:
-    resolution: {integrity: sha512-woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g==}
-    hasBin: true
-
   vscode-uri@3.1.0:
     resolution: {integrity: sha512-/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==}
 
@@ -8461,6 +8321,11 @@ packages:
     engines: {node: '>= 14.6'}
     hasBin: true
 
+  yaml@2.9.0:
+    resolution: {integrity: sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA==}
+    engines: {node: '>= 14.6'}
+    hasBin: true
+
   yargs-parser@21.1.1:
     resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
     engines: {node: '>=12'}
@@ -8490,8 +8355,8 @@ packages:
   zen-observable@0.10.0:
     resolution: {integrity: sha512-iI3lT0iojZhKwT5DaFy2Ce42n3yFcLdFyOh01G7H0flMY60P8MJuVFEoJoNwXlmAyQ45GrjL6AcZmmlv8A5rbw==}
 
-  zod@4.3.6:
-    resolution: {integrity: sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==}
+  zod@4.4.3:
+    resolution: {integrity: sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ==}
 
   zrender@6.0.0:
     resolution: {integrity: sha512-41dFXEEXuJpNecuUQq6JlbybmnHaqqpGlbH1yxnA5V9MMP4SbohSVZsJIwz+zdjQXSSlR1Vc34EgH1zxyTDvhg==}
@@ -8516,8 +8381,8 @@ packages:
       react:
         optional: true
 
-  zustand@5.0.12:
-    resolution: {integrity: sha512-i77ae3aZq4dhMlRhJVCYgMLKuSiZAaUPAct2AksxQ+gOtimhGMdXljRT21P5BNpeT4kXlLIckvkPM029OljD7g==}
+  zustand@5.0.13:
+    resolution: {integrity: sha512-efI2tVaVQPqtOh114loML/Z80Y4NP3yc+Ff0fYiZJPauNeWZeIp/bRFD7I9bfmCOYBh/PHxlglQ9+wvlwnPikQ==}
     engines: {node: '>=12.20.0'}
     peerDependencies:
       '@types/react': '>=18.0.0'
@@ -8543,10 +8408,10 @@ snapshots:
 
   '@alloc/quick-lru@5.2.0': {}
 
-  '@amplitude/analytics-browser@2.42.0':
+  '@amplitude/analytics-browser@2.42.2':
     dependencies:
-      '@amplitude/analytics-core': 2.48.0
-      '@amplitude/plugin-autocapture-browser': 1.27.0
+      '@amplitude/analytics-core': 2.48.1
+      '@amplitude/plugin-autocapture-browser': 1.27.1
       '@amplitude/plugin-custom-enrichment-browser': 0.1.8
       '@amplitude/plugin-event-property-attribution-browser': 0.2.0
       '@amplitude/plugin-network-capture-browser': 1.10.0
@@ -8555,13 +8420,6 @@ snapshots:
       '@amplitude/plugin-web-vitals-browser': 1.1.32
       tslib: 2.8.1
 
-  '@amplitude/analytics-client-common@2.4.46':
-    dependencies:
-      '@amplitude/analytics-connector': 1.6.4
-      '@amplitude/analytics-core': 2.47.1
-      '@amplitude/analytics-types': 2.11.1
-      tslib: 2.8.1
-
   '@amplitude/analytics-client-common@2.4.47':
     dependencies:
       '@amplitude/analytics-connector': 1.6.4
@@ -8571,7 +8429,7 @@ snapshots:
 
   '@amplitude/analytics-connector@1.6.4': {}
 
-  '@amplitude/analytics-core@2.47.1':
+  '@amplitude/analytics-core@2.48.0':
     dependencies:
       '@amplitude/analytics-connector': 1.6.4
       '@types/zen-observable': 0.8.3
@@ -8579,7 +8437,7 @@ snapshots:
       tslib: 2.8.1
       zen-observable: 0.10.0
 
-  '@amplitude/analytics-core@2.48.0':
+  '@amplitude/analytics-core@2.48.1':
     dependencies:
       '@amplitude/analytics-connector': 1.6.4
       '@types/zen-observable': 0.8.3
@@ -8593,9 +8451,9 @@ snapshots:
     dependencies:
       js-base64: 3.7.8
 
-  '@amplitude/plugin-autocapture-browser@1.27.0':
+  '@amplitude/plugin-autocapture-browser@1.27.1':
     dependencies:
-      '@amplitude/analytics-core': 2.48.0
+      '@amplitude/analytics-core': 2.48.1
       tslib: 2.8.1
 
   '@amplitude/plugin-custom-enrichment-browser@0.1.8':
@@ -8623,14 +8481,14 @@ snapshots:
       '@amplitude/analytics-core': 2.48.0
       tslib: 2.8.1
 
-  '@amplitude/plugin-session-replay-browser@1.28.1(@amplitude/rrweb@2.0.0-alpha.37)':
+  '@amplitude/plugin-session-replay-browser@1.30.3(@amplitude/rrweb@2.0.0-alpha.40)':
     dependencies:
       '@amplitude/analytics-client-common': 2.4.47
-      '@amplitude/analytics-core': 2.48.0
+      '@amplitude/analytics-core': 2.48.1
       '@amplitude/analytics-types': 2.11.1
-      '@amplitude/rrweb-plugin-console-record': 2.0.0-alpha.36(@amplitude/rrweb@2.0.0-alpha.37)
-      '@amplitude/rrweb-record': 2.0.0-alpha.36
-      '@amplitude/session-replay-browser': 1.39.0(@amplitude/rrweb@2.0.0-alpha.37)
+      '@amplitude/rrweb-plugin-console-record': 2.0.0-alpha.40(@amplitude/rrweb@2.0.0-alpha.40)
+      '@amplitude/rrweb-record': 2.0.0-alpha.40
+      '@amplitude/session-replay-browser': 1.42.3(@amplitude/rrweb@2.0.0-alpha.40)
       idb-keyval: 6.2.2
       tslib: 2.8.1
     transitivePeerDependencies:
@@ -8643,58 +8501,54 @@ snapshots:
       tslib: 2.8.1
       web-vitals: 5.1.0
 
-  '@amplitude/rrdom@2.0.0-alpha.37':
+  '@amplitude/rrdom@2.0.0-alpha.40':
     dependencies:
-      '@amplitude/rrweb-snapshot': 2.0.0-alpha.37
+      '@amplitude/rrweb-snapshot': 2.0.0-alpha.40
 
-  '@amplitude/rrweb-packer@2.0.0-alpha.36':
+  '@amplitude/rrweb-packer@2.0.0-alpha.40':
     dependencies:
-      '@amplitude/rrweb-types': 2.0.0-alpha.37
+      '@amplitude/rrweb-types': 2.0.0-alpha.40
       fflate: 0.4.8
 
-  '@amplitude/rrweb-plugin-console-record@2.0.0-alpha.36(@amplitude/rrweb@2.0.0-alpha.37)':
+  '@amplitude/rrweb-plugin-console-record@2.0.0-alpha.40(@amplitude/rrweb@2.0.0-alpha.40)':
     dependencies:
-      '@amplitude/rrweb': 2.0.0-alpha.37
+      '@amplitude/rrweb': 2.0.0-alpha.40
 
-  '@amplitude/rrweb-record@2.0.0-alpha.36':
+  '@amplitude/rrweb-record@2.0.0-alpha.40':
     dependencies:
-      '@amplitude/rrweb': 2.0.0-alpha.37
-      '@amplitude/rrweb-types': 2.0.0-alpha.37
+      '@amplitude/rrweb': 2.0.0-alpha.40
+      '@amplitude/rrweb-types': 2.0.0-alpha.40
 
-  '@amplitude/rrweb-snapshot@2.0.0-alpha.37':
+  '@amplitude/rrweb-snapshot@2.0.0-alpha.40':
     dependencies:
-      postcss: 8.5.12
+      postcss: 8.5.14
 
-  '@amplitude/rrweb-types@2.0.0-alpha.36': {}
+  '@amplitude/rrweb-types@2.0.0-alpha.40': {}
 
-  '@amplitude/rrweb-types@2.0.0-alpha.37': {}
+  '@amplitude/rrweb-utils@2.0.0-alpha.40': {}
 
-  '@amplitude/rrweb-utils@2.0.0-alpha.36': {}
-
-  '@amplitude/rrweb-utils@2.0.0-alpha.37': {}
-
-  '@amplitude/rrweb@2.0.0-alpha.37':
+  '@amplitude/rrweb@2.0.0-alpha.40':
     dependencies:
-      '@amplitude/rrdom': 2.0.0-alpha.37
-      '@amplitude/rrweb-snapshot': 2.0.0-alpha.37
-      '@amplitude/rrweb-types': 2.0.0-alpha.37
-      '@amplitude/rrweb-utils': 2.0.0-alpha.37
+      '@amplitude/rrdom': 2.0.0-alpha.40
+      '@amplitude/rrweb-snapshot': 2.0.0-alpha.40
+      '@amplitude/rrweb-types': 2.0.0-alpha.40
+      '@amplitude/rrweb-utils': 2.0.0-alpha.40
       '@types/css-font-loading-module': 0.0.7
       '@xstate/fsm': 1.6.5
       base64-arraybuffer: 1.0.2
       mitt: 3.0.1
 
-  '@amplitude/session-replay-browser@1.39.0(@amplitude/rrweb@2.0.0-alpha.37)':
+  '@amplitude/session-replay-browser@1.42.3(@amplitude/rrweb@2.0.0-alpha.40)':
     dependencies:
       '@amplitude/analytics-client-common': 2.4.47
-      '@amplitude/analytics-core': 2.48.0
+      '@amplitude/analytics-core': 2.48.1
       '@amplitude/analytics-types': 2.11.1
       '@amplitude/experiment-core': 0.7.2
-      '@amplitude/rrweb-packer': 2.0.0-alpha.36
-      '@amplitude/rrweb-plugin-console-record': 2.0.0-alpha.36(@amplitude/rrweb@2.0.0-alpha.37)
-      '@amplitude/rrweb-record': 2.0.0-alpha.36
-      '@amplitude/rrweb-types': 2.0.0-alpha.36
-      '@amplitude/rrweb-utils': 2.0.0-alpha.36
+      '@amplitude/rrweb-packer': 2.0.0-alpha.40
+      '@amplitude/rrweb-plugin-console-record': 2.0.0-alpha.40(@amplitude/rrweb@2.0.0-alpha.40)
+      '@amplitude/rrweb-record': 2.0.0-alpha.40
+      '@amplitude/rrweb-types': 2.0.0-alpha.40
+      '@amplitude/rrweb-utils': 2.0.0-alpha.40
       '@amplitude/targeting': 0.2.0
       '@rollup/plugin-replace': 6.0.3
       idb: 8.0.0
@@ -8705,56 +8559,56 @@ snapshots:
 
   '@amplitude/targeting@0.2.0':
     dependencies:
-      '@amplitude/analytics-client-common': 2.4.46
-      '@amplitude/analytics-core': 2.47.1
+      '@amplitude/analytics-client-common': 2.4.47
+      '@amplitude/analytics-core': 2.48.1
       '@amplitude/analytics-types': 2.11.1
       '@amplitude/experiment-core': 0.7.2
       idb: 8.0.0
       tslib: 2.8.1
 
-  '@antfu/eslint-config@8.2.0(@eslint-react/eslint-plugin@3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3))(@next/eslint-plugin-next@16.2.4)(@types/node@25.6.0)(@typescript-eslint/typescript-estree@8.59.1(typescript@6.0.3))(@typescript-eslint/utils@8.59.1(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3))(@vitest/coverage-v8@4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(eslint-plugin-react-refresh@0.5.2(eslint@10.2.1(jiti@2.6.1)))(eslint@10.2.1(jiti@2.6.1))(happy-dom@20.9.0)(jiti@2.6.1)(oxlint@1.61.0(oxlint-tsgolint@0.22.0))(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)':
+  '@antfu/eslint-config@9.0.0(@eslint-react/eslint-plugin@5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3))(@next/eslint-plugin-next@16.2.6)(@types/node@25.7.0)(@typescript-eslint/typescript-estree@8.59.3(typescript@6.0.3))(@typescript-eslint/utils@8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3))(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(eslint-plugin-react-refresh@0.5.2(eslint@10.3.0(jiti@2.7.0)))(eslint@10.3.0(jiti@2.7.0))(happy-dom@20.9.0)(jiti@2.7.0)(oxlint@1.61.0(oxlint-tsgolint@0.22.0))(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)':
     dependencies:
       '@antfu/install-pkg': 1.1.0
-      '@clack/prompts': 1.2.0
-      '@e18e/eslint-plugin': 0.3.0(eslint@10.2.1(jiti@2.6.1))(oxlint@1.61.0(oxlint-tsgolint@0.22.0))
-      '@eslint-community/eslint-plugin-eslint-comments': 4.7.1(eslint@10.2.1(jiti@2.6.1))
+      '@clack/prompts': 1.4.0
+      '@e18e/eslint-plugin': 0.4.1(eslint@10.3.0(jiti@2.7.0))(oxlint@1.61.0(oxlint-tsgolint@0.22.0))
+      '@eslint-community/eslint-plugin-eslint-comments': 4.7.1(eslint@10.3.0(jiti@2.7.0))
       '@eslint/markdown': 8.0.1
-      '@stylistic/eslint-plugin': 5.10.0(eslint@10.2.1(jiti@2.6.1))
-      '@typescript-eslint/eslint-plugin': 8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3))(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@typescript-eslint/parser': 8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@vitest/eslint-plugin': 1.6.15(@types/node@25.6.0)(@typescript-eslint/eslint-plugin@8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3))(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3))(@vitest/coverage-v8@4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(eslint@10.2.1(jiti@2.6.1))(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
+      '@stylistic/eslint-plugin': 5.10.0(eslint@10.3.0(jiti@2.7.0))
+      '@typescript-eslint/eslint-plugin': 8.59.3(@typescript-eslint/parser@8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@typescript-eslint/parser': 8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@vitest/eslint-plugin': 1.6.17(@types/node@25.7.0)(@typescript-eslint/eslint-plugin@8.59.3(@typescript-eslint/parser@8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3))(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(eslint@10.3.0(jiti@2.7.0))(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
       ansis: 4.2.0
       cac: 7.0.0
-      eslint: 10.2.1(jiti@2.6.1)
-      eslint-config-flat-gitignore: 2.3.0(eslint@10.2.1(jiti@2.6.1))
-      eslint-flat-config-utils: 3.1.0
-      eslint-merge-processors: 2.0.0(eslint@10.2.1(jiti@2.6.1))
-      eslint-plugin-antfu: 3.2.2(eslint@10.2.1(jiti@2.6.1))
-      eslint-plugin-command: 3.5.2(@typescript-eslint/typescript-estree@8.59.1(typescript@6.0.3))(@typescript-eslint/utils@8.59.1(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3))(eslint@10.2.1(jiti@2.6.1))
-      eslint-plugin-import-lite: 0.6.0(eslint@10.2.1(jiti@2.6.1))
-      eslint-plugin-jsdoc: 62.9.0(eslint@10.2.1(jiti@2.6.1))
-      eslint-plugin-jsonc: 3.1.2(eslint@10.2.1(jiti@2.6.1))
-      eslint-plugin-n: 17.24.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      eslint-plugin-no-only-tests: 3.3.0
-      eslint-plugin-perfectionist: 5.8.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      eslint-plugin-pnpm: 1.6.0(eslint@10.2.1(jiti@2.6.1))
-      eslint-plugin-regexp: 3.1.0(eslint@10.2.1(jiti@2.6.1))
-      eslint-plugin-toml: 1.3.1(eslint@10.2.1(jiti@2.6.1))
-      eslint-plugin-unicorn: 64.0.0(eslint@10.2.1(jiti@2.6.1))
-      eslint-plugin-unused-imports: 4.4.1(@typescript-eslint/eslint-plugin@8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3))(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3))(eslint@10.2.1(jiti@2.6.1))
-      eslint-plugin-vue: 10.8.0(@stylistic/eslint-plugin@5.10.0(eslint@10.2.1(jiti@2.6.1)))(@typescript-eslint/parser@8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3))(eslint@10.2.1(jiti@2.6.1))(vue-eslint-parser@10.4.0(eslint@10.2.1(jiti@2.6.1)))
-      eslint-plugin-yml: 3.3.1(eslint@10.2.1(jiti@2.6.1))
-      eslint-processor-vue-blocks: 2.0.0(eslint@10.2.1(jiti@2.6.1))
-      globals: 17.5.0
+      eslint: 10.3.0(jiti@2.7.0)
+      eslint-config-flat-gitignore: 2.3.0(eslint@10.3.0(jiti@2.7.0))
+      eslint-flat-config-utils: 3.2.0
+      eslint-merge-processors: 2.0.0(eslint@10.3.0(jiti@2.7.0))
+      eslint-plugin-antfu: 3.2.3(eslint@10.3.0(jiti@2.7.0))
+      eslint-plugin-command: 3.5.2(@typescript-eslint/typescript-estree@8.59.3(typescript@6.0.3))(@typescript-eslint/utils@8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.3.0(jiti@2.7.0))
+      eslint-plugin-import-lite: 0.6.0(eslint@10.3.0(jiti@2.7.0))
+      eslint-plugin-jsdoc: 62.9.0(eslint@10.3.0(jiti@2.7.0))
+      eslint-plugin-jsonc: 3.1.2(eslint@10.3.0(jiti@2.7.0))
+      eslint-plugin-n: 18.0.1(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      eslint-plugin-no-only-tests: 3.4.0
+      eslint-plugin-perfectionist: 5.9.0(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      eslint-plugin-pnpm: 1.6.0(eslint@10.3.0(jiti@2.7.0))
+      eslint-plugin-regexp: 3.1.0(eslint@10.3.0(jiti@2.7.0))
+      eslint-plugin-toml: 1.3.1(eslint@10.3.0(jiti@2.7.0))
+      eslint-plugin-unicorn: 64.0.0(eslint@10.3.0(jiti@2.7.0))
+      eslint-plugin-unused-imports: 4.4.1(@typescript-eslint/eslint-plugin@8.59.3(@typescript-eslint/parser@8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.3.0(jiti@2.7.0))
+      eslint-plugin-vue: 10.9.1(@stylistic/eslint-plugin@5.10.0(eslint@10.3.0(jiti@2.7.0)))(@typescript-eslint/parser@8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.3.0(jiti@2.7.0))(vue-eslint-parser@10.4.0(eslint@10.3.0(jiti@2.7.0)))
+      eslint-plugin-yml: 3.3.2(eslint@10.3.0(jiti@2.7.0))
+      eslint-processor-vue-blocks: 2.0.0(eslint@10.3.0(jiti@2.7.0))
+      globals: 17.6.0
       local-pkg: 1.1.2
       parse-gitignore: 2.0.0
       toml-eslint-parser: 1.0.3
-      vue-eslint-parser: 10.4.0(eslint@10.2.1(jiti@2.6.1))
+      vue-eslint-parser: 10.4.0(eslint@10.3.0(jiti@2.7.0))
       yaml-eslint-parser: 2.0.0
     optionalDependencies:
-      '@eslint-react/eslint-plugin': 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@next/eslint-plugin-next': 16.2.4
-      eslint-plugin-react-refresh: 0.5.2(eslint@10.2.1(jiti@2.6.1))
+      '@eslint-react/eslint-plugin': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@next/eslint-plugin-next': 16.2.6
+      eslint-plugin-react-refresh: 0.5.2(eslint@10.3.0(jiti@2.7.0))
     transitivePeerDependencies:
       - '@arethetypeswrong/core'
       - '@edge-runtime/vm'
@@ -8785,6 +8639,7 @@ snapshots:
       - sugarss
       - supports-color
       - terser
+      - ts-declaration-location
       - tsx
       - typescript
       - unplugin-unused
@@ -8901,26 +8756,26 @@ snapshots:
       '@babel/helper-string-parser': 7.27.1
       '@babel/helper-validator-identifier': 7.28.5
 
-  '@base-ui/react@1.4.1(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@base-ui/react@1.4.1(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
       '@babel/runtime': 7.29.2
-      '@base-ui/utils': 0.2.8(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      '@floating-ui/react-dom': 2.1.8(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@base-ui/utils': 0.2.8(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@floating-ui/react-dom': 2.1.8(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@floating-ui/utils': 0.2.11
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
-      use-sync-external-store: 1.6.0(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
+      use-sync-external-store: 1.6.0(react@19.2.6)
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@base-ui/utils@0.2.8(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@base-ui/utils@0.2.8(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
       '@babel/runtime': 7.29.2
       '@floating-ui/utils': 0.2.11
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
       reselect: 5.1.1
-      use-sync-external-store: 1.6.0(react@19.2.5)
+      use-sync-external-store: 1.6.0(react@19.2.6)
     optionalDependencies:
       '@types/react': 19.2.14
 
@@ -8928,45 +8783,30 @@ snapshots:
 
   '@braintree/sanitize-url@7.1.2': {}
 
-  '@chevrotain/cst-dts-gen@11.1.2':
-    dependencies:
-      '@chevrotain/gast': 11.1.2
-      '@chevrotain/types': 11.1.2
-      lodash-es: 4.18.0
-
-  '@chevrotain/gast@11.1.2':
-    dependencies:
-      '@chevrotain/types': 11.1.2
-      lodash-es: 4.18.0
-
-  '@chevrotain/regexp-to-ast@11.1.2': {}
-
   '@chevrotain/types@11.1.2': {}
 
-  '@chevrotain/utils@11.1.2': {}
-
-  '@chromatic-com/storybook@5.1.2(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))':
+  '@chromatic-com/storybook@5.1.2(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))':
     dependencies:
       '@neoconfetti/react': 1.0.0
       chromatic: 13.3.5
       filesize: 10.1.6
       jsonfile: 6.2.0
-      storybook: 10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      storybook: 10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
       strip-ansi: 7.2.0
     transitivePeerDependencies:
       - '@chromatic-com/cypress'
       - '@chromatic-com/playwright'
 
-  '@clack/core@1.2.0':
+  '@clack/core@1.3.1':
     dependencies:
-      fast-wrap-ansi: 0.1.6
+      fast-wrap-ansi: 0.2.0
       sisteransi: 1.0.5
 
-  '@clack/prompts@1.2.0':
+  '@clack/prompts@1.4.0':
     dependencies:
-      '@clack/core': 1.2.0
-      fast-string-width: 1.1.0
-      fast-wrap-ansi: 0.1.6
+      '@clack/core': 1.3.1
+      fast-string-width: 3.0.2
+      fast-wrap-ansi: 0.2.0
       sisteransi: 1.0.5
 
   '@code-inspector/core@1.5.1':
@@ -9020,7 +8860,7 @@ snapshots:
     dependencies:
       regexp-match-indices: 1.0.2
 
-  '@cucumber/cucumber@12.8.2':
+  '@cucumber/cucumber@12.8.3':
     dependencies:
       '@cucumber/ci-environment': 13.0.0
       '@cucumber/cucumber-expressions': 19.0.0
@@ -9031,7 +8871,7 @@ snapshots:
       '@cucumber/junit-xml-formatter': 0.13.3(@cucumber/messages@32.3.1)
       '@cucumber/message-streams': 4.1.1(@cucumber/messages@32.3.1)
       '@cucumber/messages': 32.3.1
-      '@cucumber/pretty-formatter': 1.0.1(@cucumber/cucumber@12.8.2)(@cucumber/messages@32.3.1)
+      '@cucumber/pretty-formatter': 1.0.1(@cucumber/cucumber@12.8.3)(@cucumber/messages@32.3.1)
       '@cucumber/tag-expressions': 9.1.0
       assertion-error-formatter: 3.0.0
       capital-case: 1.0.4
@@ -9104,9 +8944,9 @@ snapshots:
       class-transformer: 0.5.1
       reflect-metadata: 0.2.2
 
-  '@cucumber/pretty-formatter@1.0.1(@cucumber/cucumber@12.8.2)(@cucumber/messages@32.3.1)':
+  '@cucumber/pretty-formatter@1.0.1(@cucumber/cucumber@12.8.3)(@cucumber/messages@32.3.1)':
     dependencies:
-      '@cucumber/cucumber': 12.8.2
+      '@cucumber/cucumber': 12.8.3
       '@cucumber/messages': 32.3.1
       ansi-styles: 5.2.0
       cli-table3: 0.6.5
@@ -9121,30 +8961,27 @@ snapshots:
 
   '@cucumber/tag-expressions@9.1.0': {}
 
-  '@e18e/eslint-plugin@0.3.0(eslint@10.2.1(jiti@2.6.1))(oxlint@1.61.0(oxlint-tsgolint@0.22.0))':
+  '@e18e/eslint-plugin@0.4.1(eslint@10.3.0(jiti@2.7.0))(oxlint@1.61.0(oxlint-tsgolint@0.22.0))':
     dependencies:
-      eslint-plugin-depend: 1.5.0(eslint@10.2.1(jiti@2.6.1))
+      empathic: 2.0.0
+      module-replacements: 3.0.0-beta.7
+      semver: 7.7.4
     optionalDependencies:
-      eslint: 10.2.1(jiti@2.6.1)
+      eslint: 10.3.0(jiti@2.7.0)
       oxlint: 1.61.0(oxlint-tsgolint@0.22.0)
 
-  '@egoist/tailwindcss-icons@1.9.2(tailwindcss@4.2.4)':
+  '@egoist/tailwindcss-icons@1.9.2(tailwindcss@4.3.0)':
     dependencies:
       '@iconify/utils': 3.1.0
-      tailwindcss: 4.2.4
+      tailwindcss: 4.3.0
 
-  '@emnapi/core@1.9.2':
+  '@emnapi/core@1.10.0':
     dependencies:
       '@emnapi/wasi-threads': 1.2.1
       tslib: 2.8.1
     optional: true
 
-  '@emnapi/runtime@1.9.1':
-    dependencies:
-      tslib: 2.8.1
-    optional: true
-
-  '@emnapi/runtime@1.9.2':
+  '@emnapi/runtime@1.10.0':
     dependencies:
       tslib: 2.8.1
     optional: true
@@ -9159,7 +8996,7 @@ snapshots:
   '@es-joy/jsdoccomment@0.84.0':
     dependencies:
       '@types/estree': 1.0.8
-      '@typescript-eslint/types': 8.59.0
+      '@typescript-eslint/types': 8.59.3
       comment-parser: 1.4.5
       esquery: 1.7.0
       jsdoc-type-pratt-parser: 7.1.1
@@ -9167,7 +9004,7 @@ snapshots:
   '@es-joy/jsdoccomment@0.86.0':
     dependencies:
       '@types/estree': 1.0.8
-      '@typescript-eslint/types': 8.59.0
+      '@typescript-eslint/types': 8.59.3
       comment-parser: 1.4.6
       esquery: 1.7.0
       jsdoc-type-pratt-parser: 7.2.0
@@ -9252,103 +9089,120 @@ snapshots:
   '@esbuild/win32-x64@0.27.2':
     optional: true
 
-  '@eslint-community/eslint-plugin-eslint-comments@4.7.1(eslint@10.2.1(jiti@2.6.1))':
+  '@eslint-community/eslint-plugin-eslint-comments@4.7.1(eslint@10.3.0(jiti@2.7.0))':
     dependencies:
       escape-string-regexp: 4.0.0
-      eslint: 10.2.1(jiti@2.6.1)
+      eslint: 10.3.0(jiti@2.7.0)
       ignore: 7.0.5
 
-  '@eslint-community/eslint-utils@4.9.1(eslint@10.2.1(jiti@2.6.1))':
+  '@eslint-community/eslint-utils@4.9.1(eslint@10.3.0(jiti@2.7.0))':
     dependencies:
-      eslint: 10.2.1(jiti@2.6.1)
+      eslint: 10.3.0(jiti@2.7.0)
       eslint-visitor-keys: 3.4.3
 
   '@eslint-community/regexpp@4.12.2': {}
 
-  '@eslint-react/ast@3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)':
+  '@eslint-react/ast@5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)':
     dependencies:
-      '@typescript-eslint/types': 8.59.0
-      '@typescript-eslint/typescript-estree': 8.59.0(typescript@6.0.3)
-      '@typescript-eslint/utils': 8.59.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      eslint: 10.2.1(jiti@2.6.1)
+      '@typescript-eslint/types': 8.59.3
+      '@typescript-eslint/typescript-estree': 8.59.3(typescript@6.0.3)
+      '@typescript-eslint/utils': 8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      eslint: 10.3.0(jiti@2.7.0)
       string-ts: 2.3.1
       typescript: 6.0.3
     transitivePeerDependencies:
       - supports-color
 
-  '@eslint-react/core@3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)':
+  '@eslint-react/core@5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)':
     dependencies:
-      '@eslint-react/ast': 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@eslint-react/shared': 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@eslint-react/var': 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@typescript-eslint/scope-manager': 8.59.0
-      '@typescript-eslint/types': 8.59.0
-      '@typescript-eslint/utils': 8.59.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      eslint: 10.2.1(jiti@2.6.1)
+      '@eslint-react/ast': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/eslint': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/jsx': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/shared': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/var': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@typescript-eslint/scope-manager': 8.59.3
+      '@typescript-eslint/types': 8.59.3
+      '@typescript-eslint/utils': 8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      eslint: 10.3.0(jiti@2.7.0)
       ts-pattern: 5.9.0
       typescript: 6.0.3
     transitivePeerDependencies:
       - supports-color
 
-  '@eslint-react/eslint-plugin@3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)':
+  '@eslint-react/eslint-plugin@5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)':
     dependencies:
-      '@eslint-react/shared': 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@typescript-eslint/scope-manager': 8.58.2
-      '@typescript-eslint/type-utils': 8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@typescript-eslint/types': 8.58.2
-      '@typescript-eslint/utils': 8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      eslint: 10.2.1(jiti@2.6.1)
-      eslint-plugin-react-dom: 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      eslint-plugin-react-naming-convention: 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      eslint-plugin-react-rsc: 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      eslint-plugin-react-web-api: 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      eslint-plugin-react-x: 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      ts-api-utils: 2.5.0(typescript@6.0.3)
+      '@eslint-react/shared': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      eslint: 10.3.0(jiti@2.7.0)
+      eslint-plugin-react-dom: 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      eslint-plugin-react-jsx: 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      eslint-plugin-react-naming-convention: 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      eslint-plugin-react-rsc: 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      eslint-plugin-react-web-api: 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      eslint-plugin-react-x: 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
       typescript: 6.0.3
     transitivePeerDependencies:
       - supports-color
 
-  '@eslint-react/shared@3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)':
+  '@eslint-react/eslint@5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)':
     dependencies:
-      '@typescript-eslint/utils': 8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      eslint: 10.2.1(jiti@2.6.1)
-      ts-pattern: 5.9.0
+      '@typescript-eslint/utils': 8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      eslint: 10.3.0(jiti@2.7.0)
       typescript: 6.0.3
-      zod: 4.3.6
     transitivePeerDependencies:
       - supports-color
 
-  '@eslint-react/var@3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)':
+  '@eslint-react/jsx@5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)':
     dependencies:
-      '@eslint-react/ast': 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@eslint-react/shared': 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@typescript-eslint/scope-manager': 8.59.0
-      '@typescript-eslint/types': 8.59.0
-      '@typescript-eslint/utils': 8.59.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      eslint: 10.2.1(jiti@2.6.1)
+      '@eslint-react/ast': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/eslint': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/shared': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/var': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@typescript-eslint/types': 8.59.3
+      '@typescript-eslint/utils': 8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      eslint: 10.3.0(jiti@2.7.0)
       ts-pattern: 5.9.0
       typescript: 6.0.3
     transitivePeerDependencies:
       - supports-color
 
-  '@eslint/compat@2.0.3(eslint@10.2.1(jiti@2.6.1))':
+  '@eslint-react/shared@5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)':
     dependencies:
-      '@eslint/core': 1.2.0
+      '@eslint-react/eslint': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@typescript-eslint/utils': 8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      eslint: 10.3.0(jiti@2.7.0)
+      ts-pattern: 5.9.0
+      typescript: 6.0.3
+      zod: 4.4.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@eslint-react/var@5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)':
+    dependencies:
+      '@eslint-react/ast': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/eslint': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@typescript-eslint/scope-manager': 8.59.3
+      '@typescript-eslint/types': 8.59.3
+      '@typescript-eslint/utils': 8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      eslint: 10.3.0(jiti@2.7.0)
+      ts-pattern: 5.9.0
+      typescript: 6.0.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@eslint/compat@2.0.3(eslint@10.3.0(jiti@2.7.0))':
+    dependencies:
+      '@eslint/core': 1.2.1
     optionalDependencies:
-      eslint: 10.2.1(jiti@2.6.1)
+      eslint: 10.3.0(jiti@2.7.0)
 
   '@eslint/config-array@0.23.5':
     dependencies:
       '@eslint/object-schema': 3.0.5
       debug: 4.4.3(supports-color@8.1.1)
-      minimatch: 10.2.4
+      minimatch: 10.2.5
     transitivePeerDependencies:
       - supports-color
 
-  '@eslint/config-helpers@0.5.4':
-    dependencies:
-      '@eslint/core': 1.2.0
-
   '@eslint/config-helpers@0.5.5':
     dependencies:
       '@eslint/core': 1.2.1
@@ -9357,10 +9211,6 @@ snapshots:
     dependencies:
       '@types/json-schema': 7.0.15
 
-  '@eslint/core@1.2.0':
-    dependencies:
-      '@types/json-schema': 7.0.15
-
   '@eslint/core@1.2.1':
     dependencies:
       '@types/json-schema': 7.0.15
@@ -9370,9 +9220,9 @@ snapshots:
       mdn-data: 2.27.1
       source-map-js: 1.2.1
 
-  '@eslint/js@10.0.1(eslint@10.2.1(jiti@2.6.1))':
+  '@eslint/js@10.0.1(eslint@10.3.0(jiti@2.7.0))':
     optionalDependencies:
-      eslint: 10.2.1(jiti@2.6.1)
+      eslint: 10.3.0(jiti@2.7.0)
 
   '@eslint/markdown@7.5.1':
     dependencies:
@@ -9390,7 +9240,7 @@ snapshots:
 
   '@eslint/markdown@8.0.1':
     dependencies:
-      '@eslint/core': 1.2.0
+      '@eslint/core': 1.2.1
       '@eslint/plugin-kit': 0.6.1
       github-slugger: 2.0.0
       mdast-util-from-markdown: 2.0.3
@@ -9413,7 +9263,7 @@ snapshots:
 
   '@eslint/plugin-kit@0.6.1':
     dependencies:
-      '@eslint/core': 1.2.0
+      '@eslint/core': 1.2.1
       levn: 0.4.1
 
   '@eslint/plugin-kit@0.7.1':
@@ -9430,49 +9280,31 @@ snapshots:
       '@floating-ui/core': 1.7.5
       '@floating-ui/utils': 0.2.11
 
-  '@floating-ui/react-dom@2.1.8(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@floating-ui/react-dom@2.1.8(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
       '@floating-ui/dom': 1.7.6
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
 
-  '@floating-ui/react@0.26.28(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@floating-ui/react@0.27.19(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
-      '@floating-ui/react-dom': 2.1.8(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@floating-ui/react-dom': 2.1.8(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@floating-ui/utils': 0.2.11
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
-      tabbable: 6.4.0
-
-  '@floating-ui/react@0.27.19(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
-    dependencies:
-      '@floating-ui/react-dom': 2.1.8(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      '@floating-ui/utils': 0.2.11
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
       tabbable: 6.4.0
 
   '@floating-ui/utils@0.2.11': {}
 
-  '@formatjs/fast-memoize@3.1.2': {}
+  '@formatjs/fast-memoize@3.1.5': {}
 
-  '@formatjs/intl-localematcher@0.8.4':
+  '@formatjs/intl-localematcher@0.8.7':
     dependencies:
-      '@formatjs/fast-memoize': 3.1.2
+      '@formatjs/fast-memoize': 3.1.5
 
-  '@headlessui/react@2.2.10(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@heroicons/react@2.2.0(react@19.2.6)':
     dependencies:
-      '@floating-ui/react': 0.26.28(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      '@react-aria/focus': 3.21.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      '@react-aria/interactions': 3.27.1(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      '@tanstack/react-virtual': 3.13.24(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
-      use-sync-external-store: 1.6.0(react@19.2.5)
-
-  '@heroicons/react@2.2.0(react@19.2.5)':
-    dependencies:
-      react: 19.2.5
+      react: 19.2.6
 
   '@hey-api/codegen-core@0.8.1(magicast@0.5.2)':
     dependencies:
@@ -9483,17 +9315,17 @@ snapshots:
     transitivePeerDependencies:
       - magicast
 
-  '@hey-api/json-schema-ref-parser@1.4.1':
+  '@hey-api/json-schema-ref-parser@1.4.2':
     dependencies:
       '@jsdevtools/ono': 7.1.3
       '@types/json-schema': 7.0.15
-      yaml: 2.8.3
+      js-yaml: 4.1.1
 
-  '@hey-api/openapi-ts@0.97.0(magicast@0.5.2)(typescript@6.0.3)':
+  '@hey-api/openapi-ts@0.97.1(magicast@0.5.2)(typescript@6.0.3)':
     dependencies:
       '@hey-api/codegen-core': 0.8.1(magicast@0.5.2)
-      '@hey-api/json-schema-ref-parser': 1.4.1
-      '@hey-api/shared': 0.4.2(magicast@0.5.2)
+      '@hey-api/json-schema-ref-parser': 1.4.2
+      '@hey-api/shared': 0.4.3(magicast@0.5.2)
       '@hey-api/spec-types': 0.2.0
       '@hey-api/types': 0.1.4
       '@lukeed/ms': 2.0.2
@@ -9505,10 +9337,10 @@ snapshots:
     transitivePeerDependencies:
       - magicast
 
-  '@hey-api/shared@0.4.2(magicast@0.5.2)':
+  '@hey-api/shared@0.4.3(magicast@0.5.2)':
     dependencies:
       '@hey-api/codegen-core': 0.8.1(magicast@0.5.2)
-      '@hey-api/json-schema-ref-parser': 1.4.1
+      '@hey-api/json-schema-ref-parser': 1.4.2
       '@hey-api/spec-types': 0.2.0
       '@hey-api/types': 0.1.4
       ansi-colors: 4.1.3
@@ -9524,9 +9356,9 @@ snapshots:
 
   '@hey-api/types@0.1.4': {}
 
-  '@hono/node-server@2.0.0(hono@4.12.15)':
+  '@hono/node-server@2.0.2(hono@4.12.18)':
     dependencies:
-      hono: 4.12.15
+      hono: 4.12.18
 
   '@humanfs/core@0.19.1': {}
 
@@ -9666,7 +9498,7 @@ snapshots:
 
   '@img/sharp-wasm32@0.34.5':
     dependencies:
-      '@emnapi/runtime': 1.9.1
+      '@emnapi/runtime': 1.10.0
     optional: true
 
   '@img/sharp-win32-arm64@0.34.5':
@@ -9682,11 +9514,11 @@ snapshots:
     dependencies:
       minipass: 7.1.3
 
-  '@joshwooding/vite-plugin-react-docgen-typescript@0.7.0(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(typescript@6.0.3)':
+  '@joshwooding/vite-plugin-react-docgen-typescript@0.7.0(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(typescript@6.0.3)':
     dependencies:
       glob: 13.0.6
       react-docgen-typescript: 2.4.0(typescript@6.0.3)
-      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
     optionalDependencies:
       typescript: 6.0.3
 
@@ -9726,7 +9558,7 @@ snapshots:
       '@lexical/extension': 0.44.0
       lexical: 0.44.0
 
-  '@lexical/devtools-core@0.44.0(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@lexical/devtools-core@0.44.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
       '@lexical/html': 0.44.0
       '@lexical/link': 0.44.0
@@ -9734,8 +9566,8 @@ snapshots:
       '@lexical/table': 0.44.0
       '@lexical/utils': 0.44.0
       lexical: 0.44.0
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
 
   '@lexical/dragon@0.44.0':
     dependencies:
@@ -9806,10 +9638,10 @@ snapshots:
       '@lexical/utils': 0.44.0
       lexical: 0.44.0
 
-  '@lexical/react@0.44.0(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@lexical/react@0.44.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
-      '@floating-ui/react': 0.27.19(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      '@lexical/devtools-core': 0.44.0(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@floating-ui/react': 0.27.19(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@lexical/devtools-core': 0.44.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@lexical/dragon': 0.44.0
       '@lexical/extension': 0.44.0
       '@lexical/hashtag': 0.44.0
@@ -9826,9 +9658,9 @@ snapshots:
       '@lexical/utils': 0.44.0
       '@lexical/yjs': 0.44.0
       lexical: 0.44.0
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
-      react-error-boundary: 6.1.1(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
+      react-error-boundary: 6.1.1(react@19.2.6)
 
   '@lexical/rich-text@0.44.0':
     dependencies:
@@ -9902,11 +9734,11 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@mdx-js/react@3.1.1(@types/react@19.2.14)(react@19.2.5)':
+  '@mdx-js/react@3.1.1(@types/react@19.2.14)(react@19.2.6)':
     dependencies:
       '@types/mdx': 2.0.13
       '@types/react': 19.2.14
-      react: 19.2.5
+      react: 19.2.6
 
   '@mdx-js/rollup@3.1.1':
     dependencies:
@@ -9917,24 +9749,24 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@mermaid-js/parser@1.1.0':
+  '@mermaid-js/parser@1.1.1':
     dependencies:
-      langium: 4.2.1
+      '@chevrotain/types': 11.1.2
 
   '@monaco-editor/loader@1.7.0':
     dependencies:
       state-local: 1.0.7
 
-  '@monaco-editor/react@4.7.0(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@monaco-editor/react@4.7.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
       '@monaco-editor/loader': 1.7.0
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
 
-  '@napi-rs/wasm-runtime@1.1.4(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)':
+  '@napi-rs/wasm-runtime@1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)':
     dependencies:
-      '@emnapi/core': 1.9.2
-      '@emnapi/runtime': 1.9.2
+      '@emnapi/core': 1.10.0
+      '@emnapi/runtime': 1.10.0
       '@tybys/wasm-util': 0.10.1
     optional: true
 
@@ -9942,41 +9774,41 @@ snapshots:
 
   '@next/env@16.0.0': {}
 
-  '@next/env@16.2.4': {}
+  '@next/env@16.2.6': {}
 
-  '@next/eslint-plugin-next@16.2.4':
+  '@next/eslint-plugin-next@16.2.6':
     dependencies:
       fast-glob: 3.3.1
 
-  '@next/mdx@16.2.4(@mdx-js/loader@3.1.1)(@mdx-js/react@3.1.1(@types/react@19.2.14)(react@19.2.5))':
+  '@next/mdx@16.2.6(@mdx-js/loader@3.1.1)(@mdx-js/react@3.1.1(@types/react@19.2.14)(react@19.2.6))':
     dependencies:
       source-map: 0.7.6
     optionalDependencies:
       '@mdx-js/loader': 3.1.1
-      '@mdx-js/react': 3.1.1(@types/react@19.2.14)(react@19.2.5)
+      '@mdx-js/react': 3.1.1(@types/react@19.2.14)(react@19.2.6)
 
-  '@next/swc-darwin-arm64@16.2.4':
+  '@next/swc-darwin-arm64@16.2.6':
     optional: true
 
-  '@next/swc-darwin-x64@16.2.4':
+  '@next/swc-darwin-x64@16.2.6':
     optional: true
 
-  '@next/swc-linux-arm64-gnu@16.2.4':
+  '@next/swc-linux-arm64-gnu@16.2.6':
     optional: true
 
-  '@next/swc-linux-arm64-musl@16.2.4':
+  '@next/swc-linux-arm64-musl@16.2.6':
     optional: true
 
-  '@next/swc-linux-x64-gnu@16.2.4':
+  '@next/swc-linux-x64-gnu@16.2.6':
     optional: true
 
-  '@next/swc-linux-x64-musl@16.2.4':
+  '@next/swc-linux-x64-musl@16.2.6':
     optional: true
 
-  '@next/swc-win32-arm64-msvc@16.2.4':
+  '@next/swc-win32-arm64-msvc@16.2.6':
     optional: true
 
-  '@next/swc-win32-x64-msvc@16.2.4':
+  '@next/swc-win32-x64-msvc@16.2.6':
     optional: true
 
   '@nodelib/fs.scandir@2.1.5':
@@ -9997,136 +9829,138 @@ snapshots:
 
   '@nolyfill/side-channel@1.0.44': {}
 
-  '@orpc/client@1.14.0':
+  '@orpc/client@1.14.3':
     dependencies:
-      '@orpc/shared': 1.14.0
-      '@orpc/standard-server': 1.14.0
-      '@orpc/standard-server-fetch': 1.14.0
-      '@orpc/standard-server-peer': 1.14.0
+      '@orpc/shared': 1.14.3
+      '@orpc/standard-server': 1.14.3
+      '@orpc/standard-server-fetch': 1.14.3
+      '@orpc/standard-server-peer': 1.14.3
     transitivePeerDependencies:
       - '@opentelemetry/api'
 
-  '@orpc/contract@1.14.0':
+  '@orpc/contract@1.14.3':
     dependencies:
-      '@orpc/client': 1.14.0
-      '@orpc/shared': 1.14.0
+      '@orpc/client': 1.14.3
+      '@orpc/shared': 1.14.3
       '@standard-schema/spec': 1.1.0
       openapi-types: 12.1.3
     transitivePeerDependencies:
       - '@opentelemetry/api'
 
-  '@orpc/openapi-client@1.14.0':
+  '@orpc/openapi-client@1.14.3':
     dependencies:
-      '@orpc/client': 1.14.0
-      '@orpc/contract': 1.14.0
-      '@orpc/shared': 1.14.0
-      '@orpc/standard-server': 1.14.0
+      '@orpc/client': 1.14.3
+      '@orpc/contract': 1.14.3
+      '@orpc/shared': 1.14.3
+      '@orpc/standard-server': 1.14.3
     transitivePeerDependencies:
       - '@opentelemetry/api'
 
-  '@orpc/shared@1.14.0':
+  '@orpc/shared@1.14.3':
     dependencies:
       radash: 12.1.1
       type-fest: 5.5.0
 
-  '@orpc/standard-server-fetch@1.14.0':
+  '@orpc/standard-server-fetch@1.14.3':
     dependencies:
-      '@orpc/shared': 1.14.0
-      '@orpc/standard-server': 1.14.0
+      '@orpc/shared': 1.14.3
+      '@orpc/standard-server': 1.14.3
     transitivePeerDependencies:
       - '@opentelemetry/api'
 
-  '@orpc/standard-server-peer@1.14.0':
+  '@orpc/standard-server-peer@1.14.3':
     dependencies:
-      '@orpc/shared': 1.14.0
-      '@orpc/standard-server': 1.14.0
+      '@orpc/shared': 1.14.3
+      '@orpc/standard-server': 1.14.3
     transitivePeerDependencies:
       - '@opentelemetry/api'
 
-  '@orpc/standard-server@1.14.0':
+  '@orpc/standard-server@1.14.3':
     dependencies:
-      '@orpc/shared': 1.14.0
+      '@orpc/shared': 1.14.3
     transitivePeerDependencies:
       - '@opentelemetry/api'
 
-  '@orpc/tanstack-query@1.14.0(@orpc/client@1.14.0)(@tanstack/query-core@5.100.6)':
+  '@orpc/tanstack-query@1.14.3(@orpc/client@1.14.3)(@tanstack/query-core@5.100.10)':
     dependencies:
-      '@orpc/client': 1.14.0
-      '@orpc/shared': 1.14.0
-      '@tanstack/query-core': 5.100.6
+      '@orpc/client': 1.14.3
+      '@orpc/shared': 1.14.3
+      '@tanstack/query-core': 5.100.10
     transitivePeerDependencies:
       - '@opentelemetry/api'
 
   '@ota-meshi/ast-token-store@0.3.0': {}
 
-  '@oxc-parser/binding-android-arm-eabi@0.127.0':
+  '@oxc-parser/binding-android-arm-eabi@0.130.0':
     optional: true
 
-  '@oxc-parser/binding-android-arm64@0.127.0':
+  '@oxc-parser/binding-android-arm64@0.130.0':
     optional: true
 
-  '@oxc-parser/binding-darwin-arm64@0.127.0':
+  '@oxc-parser/binding-darwin-arm64@0.130.0':
     optional: true
 
-  '@oxc-parser/binding-darwin-x64@0.127.0':
+  '@oxc-parser/binding-darwin-x64@0.130.0':
     optional: true
 
-  '@oxc-parser/binding-freebsd-x64@0.127.0':
+  '@oxc-parser/binding-freebsd-x64@0.130.0':
     optional: true
 
-  '@oxc-parser/binding-linux-arm-gnueabihf@0.127.0':
+  '@oxc-parser/binding-linux-arm-gnueabihf@0.130.0':
     optional: true
 
-  '@oxc-parser/binding-linux-arm-musleabihf@0.127.0':
+  '@oxc-parser/binding-linux-arm-musleabihf@0.130.0':
     optional: true
 
-  '@oxc-parser/binding-linux-arm64-gnu@0.127.0':
+  '@oxc-parser/binding-linux-arm64-gnu@0.130.0':
     optional: true
 
-  '@oxc-parser/binding-linux-arm64-musl@0.127.0':
+  '@oxc-parser/binding-linux-arm64-musl@0.130.0':
     optional: true
 
-  '@oxc-parser/binding-linux-ppc64-gnu@0.127.0':
+  '@oxc-parser/binding-linux-ppc64-gnu@0.130.0':
     optional: true
 
-  '@oxc-parser/binding-linux-riscv64-gnu@0.127.0':
+  '@oxc-parser/binding-linux-riscv64-gnu@0.130.0':
     optional: true
 
-  '@oxc-parser/binding-linux-riscv64-musl@0.127.0':
+  '@oxc-parser/binding-linux-riscv64-musl@0.130.0':
     optional: true
 
-  '@oxc-parser/binding-linux-s390x-gnu@0.127.0':
+  '@oxc-parser/binding-linux-s390x-gnu@0.130.0':
     optional: true
 
-  '@oxc-parser/binding-linux-x64-gnu@0.127.0':
+  '@oxc-parser/binding-linux-x64-gnu@0.130.0':
     optional: true
 
-  '@oxc-parser/binding-linux-x64-musl@0.127.0':
+  '@oxc-parser/binding-linux-x64-musl@0.130.0':
     optional: true
 
-  '@oxc-parser/binding-openharmony-arm64@0.127.0':
+  '@oxc-parser/binding-openharmony-arm64@0.130.0':
     optional: true
 
-  '@oxc-parser/binding-wasm32-wasi@0.127.0':
+  '@oxc-parser/binding-wasm32-wasi@0.130.0':
     dependencies:
-      '@emnapi/core': 1.9.2
-      '@emnapi/runtime': 1.9.2
-      '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)
+      '@emnapi/core': 1.10.0
+      '@emnapi/runtime': 1.10.0
+      '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)
     optional: true
 
-  '@oxc-parser/binding-win32-arm64-msvc@0.127.0':
+  '@oxc-parser/binding-win32-arm64-msvc@0.130.0':
     optional: true
 
-  '@oxc-parser/binding-win32-ia32-msvc@0.127.0':
+  '@oxc-parser/binding-win32-ia32-msvc@0.130.0':
     optional: true
 
-  '@oxc-parser/binding-win32-x64-msvc@0.127.0':
+  '@oxc-parser/binding-win32-x64-msvc@0.130.0':
     optional: true
 
   '@oxc-project/runtime@0.127.0': {}
 
   '@oxc-project/types@0.127.0': {}
 
+  '@oxc-project/types@0.130.0': {}
+
   '@oxc-resolver/binding-android-arm-eabi@11.19.1':
     optional: true
 
@@ -10175,9 +10009,9 @@ snapshots:
   '@oxc-resolver/binding-openharmony-arm64@11.19.1':
     optional: true
 
-  '@oxc-resolver/binding-wasm32-wasi@11.19.1(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)':
+  '@oxc-resolver/binding-wasm32-wasi@11.19.1(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)':
     dependencies:
-      '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)
+      '@napi-rs/wasm-runtime': 1.1.4(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)
     transitivePeerDependencies:
       - '@emnapi/core'
       - '@emnapi/runtime'
@@ -10326,9 +10160,9 @@ snapshots:
 
   '@pkgr/core@0.2.9': {}
 
-  '@playwright/test@1.59.1':
+  '@playwright/test@1.60.0':
     dependencies:
-      playwright: 1.59.1
+      playwright: 1.60.0
 
   '@polka/url@1.0.0-next.29': {}
 
@@ -10336,235 +10170,186 @@ snapshots:
 
   '@radix-ui/primitive@1.1.3': {}
 
-  '@radix-ui/react-compose-refs@1.1.2(@types/react@19.2.14)(react@19.2.5)':
+  '@radix-ui/react-compose-refs@1.1.2(@types/react@19.2.14)(react@19.2.6)':
     dependencies:
-      react: 19.2.5
+      react: 19.2.6
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-context@1.1.2(@types/react@19.2.14)(react@19.2.5)':
+  '@radix-ui/react-context@1.1.2(@types/react@19.2.14)(react@19.2.6)':
     dependencies:
-      react: 19.2.5
+      react: 19.2.6
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-dialog@1.1.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@radix-ui/react-dialog@1.1.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.5)
-      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.5)
-      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      '@radix-ui/react-focus-guards': 1.1.3(@types/react@19.2.14)(react@19.2.5)
-      '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.5)
-      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.14)(react@19.2.5)
-      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.5)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.6)
+      '@radix-ui/react-context': 1.1.2(@types/react@19.2.14)(react@19.2.6)
+      '@radix-ui/react-dismissable-layer': 1.1.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-focus-guards': 1.1.3(@types/react@19.2.14)(react@19.2.6)
+      '@radix-ui/react-focus-scope': 1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.6)
+      '@radix-ui/react-portal': 1.1.9(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-presence': 1.1.5(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.14)(react@19.2.6)
+      '@radix-ui/react-use-controllable-state': 1.2.2(@types/react@19.2.14)(react@19.2.6)
       aria-hidden: 1.2.6
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
-      react-remove-scroll: 2.7.2(@types/react@19.2.14)(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
+      react-remove-scroll: 2.7.2(@types/react@19.2.14)(react@19.2.6)
     optionalDependencies:
       '@types/react': 19.2.14
       '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-dismissable-layer@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@radix-ui/react-dismissable-layer@1.1.11(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
       '@radix-ui/primitive': 1.1.3
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.5)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.5)
-      '@radix-ui/react-use-escape-keydown': 1.1.1(@types/react@19.2.14)(react@19.2.5)
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.6)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.6)
+      '@radix-ui/react-use-escape-keydown': 1.1.1(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
     optionalDependencies:
       '@types/react': 19.2.14
       '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-focus-guards@1.1.3(@types/react@19.2.14)(react@19.2.5)':
+  '@radix-ui/react-focus-guards@1.1.3(@types/react@19.2.14)(react@19.2.6)':
     dependencies:
-      react: 19.2.5
+      react: 19.2.6
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-focus-scope@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@radix-ui/react-focus-scope@1.1.7(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.5)
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.5)
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.6)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
     optionalDependencies:
       '@types/react': 19.2.14
       '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-id@1.1.1(@types/react@19.2.14)(react@19.2.5)':
+  '@radix-ui/react-id@1.1.1(@types/react@19.2.14)(react@19.2.6)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.5)
-      react: 19.2.5
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.6
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-portal@1.1.9(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@radix-ui/react-portal@1.1.9(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
-      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.5)
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      '@radix-ui/react-primitive': 2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
     optionalDependencies:
       '@types/react': 19.2.14
       '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-presence@1.1.5(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@radix-ui/react-presence@1.1.5(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.5)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.5)
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.6)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
     optionalDependencies:
       '@types/react': 19.2.14
       '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-primitive@2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@radix-ui/react-primitive@2.1.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
-      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.14)(react@19.2.5)
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      '@radix-ui/react-slot': 1.2.3(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
     optionalDependencies:
       '@types/react': 19.2.14
       '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-primitive@2.1.4(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@radix-ui/react-primitive@2.1.4(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
-      '@radix-ui/react-slot': 1.2.4(@types/react@19.2.14)(react@19.2.5)
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      '@radix-ui/react-slot': 1.2.4(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
     optionalDependencies:
       '@types/react': 19.2.14
       '@types/react-dom': 19.2.3(@types/react@19.2.14)
 
-  '@radix-ui/react-slot@1.2.3(@types/react@19.2.14)(react@19.2.5)':
+  '@radix-ui/react-slot@1.2.3(@types/react@19.2.14)(react@19.2.6)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.5)
-      react: 19.2.5
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.6
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-slot@1.2.4(@types/react@19.2.14)(react@19.2.5)':
+  '@radix-ui/react-slot@1.2.4(@types/react@19.2.14)(react@19.2.6)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.5)
-      react: 19.2.5
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.6
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-use-callback-ref@1.1.1(@types/react@19.2.14)(react@19.2.5)':
+  '@radix-ui/react-use-callback-ref@1.1.1(@types/react@19.2.14)(react@19.2.6)':
     dependencies:
-      react: 19.2.5
+      react: 19.2.6
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-use-controllable-state@1.2.2(@types/react@19.2.14)(react@19.2.5)':
+  '@radix-ui/react-use-controllable-state@1.2.2(@types/react@19.2.14)(react@19.2.6)':
     dependencies:
-      '@radix-ui/react-use-effect-event': 0.0.2(@types/react@19.2.14)(react@19.2.5)
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.5)
-      react: 19.2.5
+      '@radix-ui/react-use-effect-event': 0.0.2(@types/react@19.2.14)(react@19.2.6)
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.6
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-use-effect-event@0.0.2(@types/react@19.2.14)(react@19.2.5)':
+  '@radix-ui/react-use-effect-event@0.0.2(@types/react@19.2.14)(react@19.2.6)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.5)
-      react: 19.2.5
+      '@radix-ui/react-use-layout-effect': 1.1.1(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.6
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-use-escape-keydown@1.1.1(@types/react@19.2.14)(react@19.2.5)':
+  '@radix-ui/react-use-escape-keydown@1.1.1(@types/react@19.2.14)(react@19.2.6)':
     dependencies:
-      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.5)
-      react: 19.2.5
+      '@radix-ui/react-use-callback-ref': 1.1.1(@types/react@19.2.14)(react@19.2.6)
+      react: 19.2.6
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@radix-ui/react-use-layout-effect@1.1.1(@types/react@19.2.14)(react@19.2.5)':
+  '@radix-ui/react-use-layout-effect@1.1.1(@types/react@19.2.14)(react@19.2.6)':
     dependencies:
-      react: 19.2.5
+      react: 19.2.6
     optionalDependencies:
       '@types/react': 19.2.14
 
-  '@react-aria/focus@3.21.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@reactflow/background@11.3.14(@types/react@19.2.14)(immer@11.1.8)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
-      '@react-aria/interactions': 3.27.1(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      '@react-aria/utils': 3.33.1(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      '@react-types/shared': 3.33.1(react@19.2.5)
-      '@swc/helpers': 0.5.20
-      clsx: 2.1.1
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
-
-  '@react-aria/interactions@3.27.1(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
-    dependencies:
-      '@react-aria/ssr': 3.9.10(react@19.2.5)
-      '@react-aria/utils': 3.33.1(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      '@react-stately/flags': 3.1.2
-      '@react-types/shared': 3.33.1(react@19.2.5)
-      '@swc/helpers': 0.5.20
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
-
-  '@react-aria/ssr@3.9.10(react@19.2.5)':
-    dependencies:
-      '@swc/helpers': 0.5.20
-      react: 19.2.5
-
-  '@react-aria/utils@3.33.1(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
-    dependencies:
-      '@react-aria/ssr': 3.9.10(react@19.2.5)
-      '@react-stately/flags': 3.1.2
-      '@react-stately/utils': 3.11.0(react@19.2.5)
-      '@react-types/shared': 3.33.1(react@19.2.5)
-      '@swc/helpers': 0.5.20
-      clsx: 2.1.1
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
-
-  '@react-stately/flags@3.1.2':
-    dependencies:
-      '@swc/helpers': 0.5.20
-
-  '@react-stately/utils@3.11.0(react@19.2.5)':
-    dependencies:
-      '@swc/helpers': 0.5.20
-      react: 19.2.5
-
-  '@react-types/shared@3.33.1(react@19.2.5)':
-    dependencies:
-      react: 19.2.5
-
-  '@reactflow/background@11.3.14(@types/react@19.2.14)(immer@11.1.4)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
-    dependencies:
-      '@reactflow/core': 11.11.4(@types/react@19.2.14)(immer@11.1.4)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@reactflow/core': 11.11.4(@types/react@19.2.14)(immer@11.1.8)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       classcat: 5.0.5
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
-      zustand: 4.5.7(@types/react@19.2.14)(immer@11.1.4)(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
+      zustand: 4.5.7(@types/react@19.2.14)(immer@11.1.8)(react@19.2.6)
     transitivePeerDependencies:
       - '@types/react'
       - immer
 
-  '@reactflow/controls@11.2.14(@types/react@19.2.14)(immer@11.1.4)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@reactflow/controls@11.2.14(@types/react@19.2.14)(immer@11.1.8)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
-      '@reactflow/core': 11.11.4(@types/react@19.2.14)(immer@11.1.4)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@reactflow/core': 11.11.4(@types/react@19.2.14)(immer@11.1.8)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       classcat: 5.0.5
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
-      zustand: 4.5.7(@types/react@19.2.14)(immer@11.1.4)(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
+      zustand: 4.5.7(@types/react@19.2.14)(immer@11.1.8)(react@19.2.6)
     transitivePeerDependencies:
       - '@types/react'
       - immer
 
-  '@reactflow/core@11.11.4(@types/react@19.2.14)(immer@11.1.4)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@reactflow/core@11.11.4(@types/react@19.2.14)(immer@11.1.8)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
       '@types/d3': 7.4.3
       '@types/d3-drag': 3.0.7
@@ -10574,61 +10359,61 @@ snapshots:
       d3-drag: 3.0.0
       d3-selection: 3.0.0
       d3-zoom: 3.0.0
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
-      zustand: 4.5.7(@types/react@19.2.14)(immer@11.1.4)(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
+      zustand: 4.5.7(@types/react@19.2.14)(immer@11.1.8)(react@19.2.6)
     transitivePeerDependencies:
       - '@types/react'
       - immer
 
-  '@reactflow/minimap@11.7.14(@types/react@19.2.14)(immer@11.1.4)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@reactflow/minimap@11.7.14(@types/react@19.2.14)(immer@11.1.8)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
-      '@reactflow/core': 11.11.4(@types/react@19.2.14)(immer@11.1.4)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@reactflow/core': 11.11.4(@types/react@19.2.14)(immer@11.1.8)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@types/d3-selection': 3.0.11
       '@types/d3-zoom': 3.0.8
       classcat: 5.0.5
       d3-selection: 3.0.0
       d3-zoom: 3.0.0
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
-      zustand: 4.5.7(@types/react@19.2.14)(immer@11.1.4)(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
+      zustand: 4.5.7(@types/react@19.2.14)(immer@11.1.8)(react@19.2.6)
     transitivePeerDependencies:
       - '@types/react'
       - immer
 
-  '@reactflow/node-resizer@2.2.14(@types/react@19.2.14)(immer@11.1.4)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@reactflow/node-resizer@2.2.14(@types/react@19.2.14)(immer@11.1.8)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
-      '@reactflow/core': 11.11.4(@types/react@19.2.14)(immer@11.1.4)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@reactflow/core': 11.11.4(@types/react@19.2.14)(immer@11.1.8)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       classcat: 5.0.5
       d3-drag: 3.0.0
       d3-selection: 3.0.0
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
-      zustand: 4.5.7(@types/react@19.2.14)(immer@11.1.4)(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
+      zustand: 4.5.7(@types/react@19.2.14)(immer@11.1.8)(react@19.2.6)
     transitivePeerDependencies:
       - '@types/react'
       - immer
 
-  '@reactflow/node-toolbar@1.3.14(@types/react@19.2.14)(immer@11.1.4)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@reactflow/node-toolbar@1.3.14(@types/react@19.2.14)(immer@11.1.8)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
-      '@reactflow/core': 11.11.4(@types/react@19.2.14)(immer@11.1.4)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@reactflow/core': 11.11.4(@types/react@19.2.14)(immer@11.1.8)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       classcat: 5.0.5
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
-      zustand: 4.5.7(@types/react@19.2.14)(immer@11.1.4)(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
+      zustand: 4.5.7(@types/react@19.2.14)(immer@11.1.8)(react@19.2.6)
     transitivePeerDependencies:
       - '@types/react'
       - immer
 
-  '@remixicon/react@4.9.0(react@19.2.5)':
+  '@remixicon/react@4.9.0(react@19.2.6)':
     dependencies:
-      react: 19.2.5
+      react: 19.2.6
 
   '@resvg/resvg-wasm@2.4.0': {}
 
   '@rgrove/parse-xml@4.2.0': {}
 
-  '@rolldown/pluginutils@1.0.0-rc.17': {}
+  '@rolldown/pluginutils@1.0.0-rc.18': {}
 
   '@rolldown/pluginutils@1.0.0-rc.7': {}
 
@@ -10643,39 +10428,39 @@ snapshots:
       estree-walker: 2.0.2
       picomatch: 4.0.4
 
-  '@sentry-internal/browser-utils@10.50.0':
+  '@sentry-internal/browser-utils@10.53.1':
     dependencies:
-      '@sentry/core': 10.50.0
+      '@sentry/core': 10.53.1
 
-  '@sentry-internal/feedback@10.50.0':
+  '@sentry-internal/feedback@10.53.1':
     dependencies:
-      '@sentry/core': 10.50.0
+      '@sentry/core': 10.53.1
 
-  '@sentry-internal/replay-canvas@10.50.0':
+  '@sentry-internal/replay-canvas@10.53.1':
     dependencies:
-      '@sentry-internal/replay': 10.50.0
-      '@sentry/core': 10.50.0
+      '@sentry-internal/replay': 10.53.1
+      '@sentry/core': 10.53.1
 
-  '@sentry-internal/replay@10.50.0':
+  '@sentry-internal/replay@10.53.1':
     dependencies:
-      '@sentry-internal/browser-utils': 10.50.0
-      '@sentry/core': 10.50.0
+      '@sentry-internal/browser-utils': 10.53.1
+      '@sentry/core': 10.53.1
 
-  '@sentry/browser@10.50.0':
+  '@sentry/browser@10.53.1':
     dependencies:
-      '@sentry-internal/browser-utils': 10.50.0
-      '@sentry-internal/feedback': 10.50.0
-      '@sentry-internal/replay': 10.50.0
-      '@sentry-internal/replay-canvas': 10.50.0
-      '@sentry/core': 10.50.0
+      '@sentry-internal/browser-utils': 10.53.1
+      '@sentry-internal/feedback': 10.53.1
+      '@sentry-internal/replay': 10.53.1
+      '@sentry-internal/replay-canvas': 10.53.1
+      '@sentry/core': 10.53.1
 
-  '@sentry/core@10.50.0': {}
+  '@sentry/core@10.53.1': {}
 
-  '@sentry/react@10.50.0(react@19.2.5)':
+  '@sentry/react@10.53.1(react@19.2.6)':
     dependencies:
-      '@sentry/browser': 10.50.0
-      '@sentry/core': 10.50.0
-      react: 19.2.5
+      '@sentry/browser': 10.53.1
+      '@sentry/core': 10.53.1
+      react: 19.2.6
 
   '@shikijs/core@4.0.2':
     dependencies:
@@ -10764,15 +10549,15 @@ snapshots:
 
   '@standard-schema/spec@1.1.0': {}
 
-  '@storybook/addon-docs@10.3.5(@types/react@19.2.14)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))':
+  '@storybook/addon-docs@10.3.6(@types/react@19.2.14)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))':
     dependencies:
-      '@mdx-js/react': 3.1.1(@types/react@19.2.14)(react@19.2.5)
-      '@storybook/csf-plugin': 10.3.5(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))
-      '@storybook/icons': 2.0.1(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      '@storybook/react-dom-shim': 10.3.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
-      storybook: 10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@mdx-js/react': 3.1.1(@types/react@19.2.14)(react@19.2.6)
+      '@storybook/csf-plugin': 10.3.6(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))
+      '@storybook/icons': 2.0.1(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@storybook/react-dom-shim': 10.3.6(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
+      storybook: 10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
       ts-dedent: 2.2.0
     transitivePeerDependencies:
       - '@types/react'
@@ -10781,60 +10566,60 @@ snapshots:
       - vite
       - webpack
 
-  '@storybook/addon-links@10.3.5(react@19.2.5)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))':
+  '@storybook/addon-links@10.3.6(react@19.2.6)(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))':
     dependencies:
       '@storybook/global': 5.0.0
-      storybook: 10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      storybook: 10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
     optionalDependencies:
-      react: 19.2.5
+      react: 19.2.6
 
-  '@storybook/addon-onboarding@10.3.5(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))':
+  '@storybook/addon-onboarding@10.3.6(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))':
     dependencies:
-      storybook: 10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      storybook: 10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
 
-  '@storybook/addon-themes@10.3.5(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))':
+  '@storybook/addon-themes@10.3.6(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))':
     dependencies:
-      storybook: 10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      storybook: 10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
       ts-dedent: 2.2.0
 
-  '@storybook/builder-vite@10.3.5(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))':
+  '@storybook/builder-vite@10.3.6(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))':
     dependencies:
-      '@storybook/csf-plugin': 10.3.5(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))
-      storybook: 10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@storybook/csf-plugin': 10.3.6(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))
+      storybook: 10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
       ts-dedent: 2.2.0
-      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
     transitivePeerDependencies:
       - esbuild
       - rollup
       - webpack
 
-  '@storybook/csf-plugin@10.3.5(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))':
+  '@storybook/csf-plugin@10.3.6(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))':
     dependencies:
-      storybook: 10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      storybook: 10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
       unplugin: 2.3.11
     optionalDependencies:
       esbuild: 0.27.2
-      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
 
   '@storybook/global@5.0.0': {}
 
-  '@storybook/icons@2.0.1(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@storybook/icons@2.0.1(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
 
-  '@storybook/nextjs-vite@10.3.5(@babel/core@7.29.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(next@16.2.4(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(typescript@6.0.3)':
+  '@storybook/nextjs-vite@10.3.6(@babel/core@7.29.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(next@16.2.6(@babel/core@7.29.0)(@playwright/test@1.60.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))(typescript@6.0.3)':
     dependencies:
-      '@storybook/builder-vite': 10.3.5(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))
-      '@storybook/react': 10.3.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(typescript@6.0.3)
-      '@storybook/react-vite': 10.3.5(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(typescript@6.0.3)
-      next: 16.2.4(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
-      storybook: 10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      styled-jsx: 5.1.6(@babel/core@7.29.0)(react@19.2.5)
-      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
-      vite-plugin-storybook-nextjs: 3.2.4(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(next@16.2.4(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(typescript@6.0.3)
+      '@storybook/builder-vite': 10.3.6(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))
+      '@storybook/react': 10.3.6(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))(typescript@6.0.3)
+      '@storybook/react-vite': 10.3.6(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))(typescript@6.0.3)
+      next: 16.2.6(@babel/core@7.29.0)(@playwright/test@1.60.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
+      storybook: 10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
+      styled-jsx: 5.1.6(@babel/core@7.29.0)(react@19.2.6)
+      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+      vite-plugin-storybook-nextjs: 3.2.4(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(next@16.2.6(@babel/core@7.29.0)(@playwright/test@1.60.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))(typescript@6.0.3)
     optionalDependencies:
       typescript: 6.0.3
     transitivePeerDependencies:
@@ -10845,27 +10630,27 @@ snapshots:
       - supports-color
       - webpack
 
-  '@storybook/react-dom-shim@10.3.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))':
+  '@storybook/react-dom-shim@10.3.6(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))':
     dependencies:
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
-      storybook: 10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
+      storybook: 10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
 
-  '@storybook/react-vite@10.3.5(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(typescript@6.0.3)':
+  '@storybook/react-vite@10.3.6(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))(typescript@6.0.3)':
     dependencies:
-      '@joshwooding/vite-plugin-react-docgen-typescript': 0.7.0(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(typescript@6.0.3)
+      '@joshwooding/vite-plugin-react-docgen-typescript': 0.7.0(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(typescript@6.0.3)
       '@rollup/pluginutils': 5.3.0
-      '@storybook/builder-vite': 10.3.5(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))
-      '@storybook/react': 10.3.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(typescript@6.0.3)
+      '@storybook/builder-vite': 10.3.6(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))
+      '@storybook/react': 10.3.6(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))(typescript@6.0.3)
       empathic: 2.0.0
       magic-string: 0.30.21
-      react: 19.2.5
+      react: 19.2.6
       react-docgen: 8.0.3
-      react-dom: 19.2.5(react@19.2.5)
+      react-dom: 19.2.6(react@19.2.6)
       resolve: 1.22.11
-      storybook: 10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      storybook: 10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
       tsconfig-paths: 4.2.0
-      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
     transitivePeerDependencies:
       - esbuild
       - rollup
@@ -10873,34 +10658,34 @@ snapshots:
       - typescript
       - webpack
 
-  '@storybook/react@10.3.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(typescript@6.0.3)':
+  '@storybook/react@10.3.6(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))(typescript@6.0.3)':
     dependencies:
       '@storybook/global': 5.0.0
-      '@storybook/react-dom-shim': 10.3.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))
-      react: 19.2.5
+      '@storybook/react-dom-shim': 10.3.6(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))
+      react: 19.2.6
       react-docgen: 8.0.3
       react-docgen-typescript: 2.4.0(typescript@6.0.3)
-      react-dom: 19.2.5(react@19.2.5)
-      storybook: 10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      react-dom: 19.2.6(react@19.2.6)
+      storybook: 10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
     optionalDependencies:
       typescript: 6.0.3
     transitivePeerDependencies:
       - supports-color
 
-  '@streamdown/math@1.0.2(react@19.2.5)':
+  '@streamdown/math@1.0.2(react@19.2.6)':
     dependencies:
       katex: 0.16.45
-      react: 19.2.5
+      react: 19.2.6
       rehype-katex: 7.0.1
       remark-math: 6.0.0
     transitivePeerDependencies:
       - supports-color
 
-  '@stylistic/eslint-plugin@5.10.0(eslint@10.2.1(jiti@2.6.1))':
+  '@stylistic/eslint-plugin@5.10.0(eslint@10.3.0(jiti@2.7.0))':
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.1(eslint@10.2.1(jiti@2.6.1))
-      '@typescript-eslint/types': 8.59.0
-      eslint: 10.2.1(jiti@2.6.1)
+      '@eslint-community/eslint-utils': 4.9.1(eslint@10.3.0(jiti@2.7.0))
+      '@typescript-eslint/types': 8.59.3
+      eslint: 10.3.0(jiti@2.7.0)
       eslint-visitor-keys: 4.2.1
       espree: 10.4.0
       estraverse: 5.3.0
@@ -10912,104 +10697,100 @@ snapshots:
     dependencies:
       tslib: 2.8.1
 
-  '@swc/helpers@0.5.20':
-    dependencies:
-      tslib: 2.8.1
-
-  '@t3-oss/env-core@0.13.11(typescript@6.0.3)(valibot@1.3.1(typescript@6.0.3))(zod@4.3.6)':
+  '@t3-oss/env-core@0.13.11(typescript@6.0.3)(valibot@1.3.1(typescript@6.0.3))(zod@4.4.3)':
     optionalDependencies:
       typescript: 6.0.3
       valibot: 1.3.1(typescript@6.0.3)
-      zod: 4.3.6
+      zod: 4.4.3
 
-  '@t3-oss/env-nextjs@0.13.11(typescript@6.0.3)(valibot@1.3.1(typescript@6.0.3))(zod@4.3.6)':
+  '@t3-oss/env-nextjs@0.13.11(typescript@6.0.3)(valibot@1.3.1(typescript@6.0.3))(zod@4.4.3)':
     dependencies:
-      '@t3-oss/env-core': 0.13.11(typescript@6.0.3)(valibot@1.3.1(typescript@6.0.3))(zod@4.3.6)
+      '@t3-oss/env-core': 0.13.11(typescript@6.0.3)(valibot@1.3.1(typescript@6.0.3))(zod@4.4.3)
     optionalDependencies:
       typescript: 6.0.3
       valibot: 1.3.1(typescript@6.0.3)
-      zod: 4.3.6
+      zod: 4.4.3
 
-  '@tailwindcss/node@4.2.4':
+  '@tailwindcss/node@4.3.0':
     dependencies:
       '@jridgewell/remapping': 2.3.5
-      enhanced-resolve: 5.20.1
-      jiti: 2.6.1
+      enhanced-resolve: 5.21.3
+      jiti: 2.7.0
       lightningcss: 1.32.0
       magic-string: 0.30.21
       source-map-js: 1.2.1
-      tailwindcss: 4.2.4
+      tailwindcss: 4.3.0
 
-  '@tailwindcss/oxide-android-arm64@4.2.4':
+  '@tailwindcss/oxide-android-arm64@4.3.0':
     optional: true
 
-  '@tailwindcss/oxide-darwin-arm64@4.2.4':
+  '@tailwindcss/oxide-darwin-arm64@4.3.0':
     optional: true
 
-  '@tailwindcss/oxide-darwin-x64@4.2.4':
+  '@tailwindcss/oxide-darwin-x64@4.3.0':
     optional: true
 
-  '@tailwindcss/oxide-freebsd-x64@4.2.4':
+  '@tailwindcss/oxide-freebsd-x64@4.3.0':
     optional: true
 
-  '@tailwindcss/oxide-linux-arm-gnueabihf@4.2.4':
+  '@tailwindcss/oxide-linux-arm-gnueabihf@4.3.0':
     optional: true
 
-  '@tailwindcss/oxide-linux-arm64-gnu@4.2.4':
+  '@tailwindcss/oxide-linux-arm64-gnu@4.3.0':
     optional: true
 
-  '@tailwindcss/oxide-linux-arm64-musl@4.2.4':
+  '@tailwindcss/oxide-linux-arm64-musl@4.3.0':
     optional: true
 
-  '@tailwindcss/oxide-linux-x64-gnu@4.2.4':
+  '@tailwindcss/oxide-linux-x64-gnu@4.3.0':
     optional: true
 
-  '@tailwindcss/oxide-linux-x64-musl@4.2.4':
+  '@tailwindcss/oxide-linux-x64-musl@4.3.0':
     optional: true
 
-  '@tailwindcss/oxide-wasm32-wasi@4.2.4':
+  '@tailwindcss/oxide-wasm32-wasi@4.3.0':
     optional: true
 
-  '@tailwindcss/oxide-win32-arm64-msvc@4.2.4':
+  '@tailwindcss/oxide-win32-arm64-msvc@4.3.0':
     optional: true
 
-  '@tailwindcss/oxide-win32-x64-msvc@4.2.4':
+  '@tailwindcss/oxide-win32-x64-msvc@4.3.0':
     optional: true
 
-  '@tailwindcss/oxide@4.2.4':
+  '@tailwindcss/oxide@4.3.0':
     optionalDependencies:
-      '@tailwindcss/oxide-android-arm64': 4.2.4
-      '@tailwindcss/oxide-darwin-arm64': 4.2.4
-      '@tailwindcss/oxide-darwin-x64': 4.2.4
-      '@tailwindcss/oxide-freebsd-x64': 4.2.4
-      '@tailwindcss/oxide-linux-arm-gnueabihf': 4.2.4
-      '@tailwindcss/oxide-linux-arm64-gnu': 4.2.4
-      '@tailwindcss/oxide-linux-arm64-musl': 4.2.4
-      '@tailwindcss/oxide-linux-x64-gnu': 4.2.4
-      '@tailwindcss/oxide-linux-x64-musl': 4.2.4
-      '@tailwindcss/oxide-wasm32-wasi': 4.2.4
-      '@tailwindcss/oxide-win32-arm64-msvc': 4.2.4
-      '@tailwindcss/oxide-win32-x64-msvc': 4.2.4
+      '@tailwindcss/oxide-android-arm64': 4.3.0
+      '@tailwindcss/oxide-darwin-arm64': 4.3.0
+      '@tailwindcss/oxide-darwin-x64': 4.3.0
+      '@tailwindcss/oxide-freebsd-x64': 4.3.0
+      '@tailwindcss/oxide-linux-arm-gnueabihf': 4.3.0
+      '@tailwindcss/oxide-linux-arm64-gnu': 4.3.0
+      '@tailwindcss/oxide-linux-arm64-musl': 4.3.0
+      '@tailwindcss/oxide-linux-x64-gnu': 4.3.0
+      '@tailwindcss/oxide-linux-x64-musl': 4.3.0
+      '@tailwindcss/oxide-wasm32-wasi': 4.3.0
+      '@tailwindcss/oxide-win32-arm64-msvc': 4.3.0
+      '@tailwindcss/oxide-win32-x64-msvc': 4.3.0
 
-  '@tailwindcss/postcss@4.2.4':
+  '@tailwindcss/postcss@4.3.0':
     dependencies:
       '@alloc/quick-lru': 5.2.0
-      '@tailwindcss/node': 4.2.4
-      '@tailwindcss/oxide': 4.2.4
-      postcss: 8.5.12
-      tailwindcss: 4.2.4
+      '@tailwindcss/node': 4.3.0
+      '@tailwindcss/oxide': 4.3.0
+      postcss: 8.5.14
+      tailwindcss: 4.3.0
 
-  '@tailwindcss/typography@0.5.19(tailwindcss@4.2.4)':
+  '@tailwindcss/typography@0.5.19(tailwindcss@4.3.0)':
     dependencies:
       postcss-selector-parser: 6.0.10
-      tailwindcss: 4.2.4
+      tailwindcss: 4.3.0
 
-  '@tailwindcss/vite@4.2.4(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))':
+  '@tailwindcss/vite@4.3.0(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))':
     dependencies:
-      '@tailwindcss/node': 4.2.4
-      '@tailwindcss/oxide': 4.2.4
-      tailwindcss: 4.2.4
-      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+      '@tailwindcss/node': 4.3.0
+      '@tailwindcss/oxide': 4.3.0
+      tailwindcss: 4.3.0
+      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
 
   '@tanstack/devtools-client@0.0.6':
     dependencies:
@@ -11033,13 +10814,13 @@ snapshots:
     transitivePeerDependencies:
       - csstype
 
-  '@tanstack/devtools-utils@0.4.0(@types/react@19.2.14)(react@19.2.5)(solid-js@1.9.11)':
+  '@tanstack/devtools-utils@0.4.0(@types/react@19.2.14)(react@19.2.6)(solid-js@1.9.11)':
     optionalDependencies:
       '@types/react': 19.2.14
-      react: 19.2.5
+      react: 19.2.6
       solid-js: 1.9.11
 
-  '@tanstack/devtools@0.11.2(csstype@3.2.3)':
+  '@tanstack/devtools@0.12.0(csstype@3.2.3)':
     dependencies:
       '@solid-primitives/event-listener': 2.4.5(solid-js@1.9.11)
       '@solid-primitives/keyboard': 1.3.5(solid-js@1.9.11)
@@ -11055,26 +10836,26 @@ snapshots:
       - csstype
       - utf-8-validate
 
-  '@tanstack/eslint-plugin-query@5.100.6(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)':
+  '@tanstack/eslint-plugin-query@5.100.10(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)':
     dependencies:
-      '@typescript-eslint/utils': 8.59.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      eslint: 10.2.1(jiti@2.6.1)
+      '@typescript-eslint/utils': 8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      eslint: 10.3.0(jiti@2.7.0)
     optionalDependencies:
       typescript: 6.0.3
     transitivePeerDependencies:
       - supports-color
 
-  '@tanstack/form-core@1.29.1':
+  '@tanstack/form-core@1.32.0':
     dependencies:
       '@tanstack/devtools-event-client': 0.4.3
       '@tanstack/pacer-lite': 0.1.1
       '@tanstack/store': 0.9.3
 
-  '@tanstack/form-devtools@0.2.22(@types/react@19.2.14)(csstype@3.2.3)(react@19.2.5)(solid-js@1.9.11)':
+  '@tanstack/form-devtools@0.2.27(@types/react@19.2.14)(csstype@3.2.3)(react@19.2.6)(solid-js@1.9.11)':
     dependencies:
       '@tanstack/devtools-ui': 0.5.1(csstype@3.2.3)
-      '@tanstack/devtools-utils': 0.4.0(@types/react@19.2.14)(react@19.2.5)(solid-js@1.9.11)
-      '@tanstack/form-core': 1.29.1
+      '@tanstack/devtools-utils': 0.4.0(@types/react@19.2.14)(react@19.2.6)(solid-js@1.9.11)
+      '@tanstack/form-core': 1.32.0
       clsx: 2.1.1
       dayjs: 1.11.20
       goober: 2.1.18(csstype@3.2.3)
@@ -11092,27 +10873,27 @@ snapshots:
 
   '@tanstack/pacer-lite@0.1.1': {}
 
-  '@tanstack/query-core@5.100.6': {}
+  '@tanstack/query-core@5.100.10': {}
 
-  '@tanstack/query-devtools@5.100.6': {}
+  '@tanstack/query-devtools@5.100.10': {}
 
-  '@tanstack/react-devtools@0.10.2(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(csstype@3.2.3)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@tanstack/react-devtools@0.10.3(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(csstype@3.2.3)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
-      '@tanstack/devtools': 0.11.2(csstype@3.2.3)
+      '@tanstack/devtools': 0.12.0(csstype@3.2.3)
       '@types/react': 19.2.14
       '@types/react-dom': 19.2.3(@types/react@19.2.14)
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
     transitivePeerDependencies:
       - bufferutil
       - csstype
       - utf-8-validate
 
-  '@tanstack/react-form-devtools@0.2.22(@types/react@19.2.14)(csstype@3.2.3)(react@19.2.5)(solid-js@1.9.11)':
+  '@tanstack/react-form-devtools@0.2.27(@types/react@19.2.14)(csstype@3.2.3)(react@19.2.6)(solid-js@1.9.11)':
     dependencies:
-      '@tanstack/devtools-utils': 0.4.0(@types/react@19.2.14)(react@19.2.5)(solid-js@1.9.11)
-      '@tanstack/form-devtools': 0.2.22(@types/react@19.2.14)(csstype@3.2.3)(react@19.2.5)(solid-js@1.9.11)
-      react: 19.2.5
+      '@tanstack/devtools-utils': 0.4.0(@types/react@19.2.14)(react@19.2.6)(solid-js@1.9.11)
+      '@tanstack/form-devtools': 0.2.27(@types/react@19.2.14)(csstype@3.2.3)(react@19.2.6)(solid-js@1.9.11)
+      react: 19.2.6
     transitivePeerDependencies:
       - '@types/react'
       - csstype
@@ -11120,51 +10901,51 @@ snapshots:
       - solid-js
       - vue
 
-  '@tanstack/react-form@1.29.1(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@tanstack/react-form@1.32.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
-      '@tanstack/form-core': 1.29.1
-      '@tanstack/react-store': 0.9.3(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      react: 19.2.5
+      '@tanstack/form-core': 1.32.0
+      '@tanstack/react-store': 0.9.3(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      react: 19.2.6
     transitivePeerDependencies:
       - react-dom
 
-  '@tanstack/react-hotkeys@0.10.0(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@tanstack/react-hotkeys@0.10.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
       '@tanstack/hotkeys': 0.8.0
-      '@tanstack/react-store': 0.11.0(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      '@tanstack/react-store': 0.11.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
 
-  '@tanstack/react-query-devtools@5.100.6(@tanstack/react-query@5.100.6(react@19.2.5))(react@19.2.5)':
+  '@tanstack/react-query-devtools@5.100.10(@tanstack/react-query@5.100.10(react@19.2.6))(react@19.2.6)':
     dependencies:
-      '@tanstack/query-devtools': 5.100.6
-      '@tanstack/react-query': 5.100.6(react@19.2.5)
-      react: 19.2.5
+      '@tanstack/query-devtools': 5.100.10
+      '@tanstack/react-query': 5.100.10(react@19.2.6)
+      react: 19.2.6
 
-  '@tanstack/react-query@5.100.6(react@19.2.5)':
+  '@tanstack/react-query@5.100.10(react@19.2.6)':
     dependencies:
-      '@tanstack/query-core': 5.100.6
-      react: 19.2.5
+      '@tanstack/query-core': 5.100.10
+      react: 19.2.6
 
-  '@tanstack/react-store@0.11.0(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@tanstack/react-store@0.11.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
       '@tanstack/store': 0.11.0
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
-      use-sync-external-store: 1.6.0(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
+      use-sync-external-store: 1.6.0(react@19.2.6)
 
-  '@tanstack/react-store@0.9.3(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@tanstack/react-store@0.9.3(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
       '@tanstack/store': 0.9.3
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
-      use-sync-external-store: 1.6.0(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
+      use-sync-external-store: 1.6.0(react@19.2.6)
 
-  '@tanstack/react-virtual@3.13.24(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@tanstack/react-virtual@3.13.24(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
       '@tanstack/virtual-core': 3.14.0
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
 
   '@tanstack/store@0.11.0': {}
 
@@ -11194,12 +10975,12 @@ snapshots:
       picocolors: 1.1.1
       redent: 3.0.0
 
-  '@testing-library/react@16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@testing-library/react@16.3.2(@testing-library/dom@10.4.1)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
       '@babel/runtime': 7.29.2
       '@testing-library/dom': 10.4.1
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
     optionalDependencies:
       '@types/react': 19.2.14
       '@types/react-dom': 19.2.3(@types/react@19.2.14)
@@ -11208,10 +10989,11 @@ snapshots:
     dependencies:
       '@testing-library/dom': 10.4.1
 
-  '@tsslint/cli@3.1.0(@tsslint/compat-eslint@3.1.0(typescript@6.0.3))(typescript@6.0.3)':
+  '@tsslint/cli@3.1.2(@tsslint/compat-eslint@3.1.2(typescript@6.0.3))(typescript@6.0.3)':
     dependencies:
-      '@tsslint/config': 3.1.0(@tsslint/compat-eslint@3.1.0(typescript@6.0.3))(typescript@6.0.3)
-      '@tsslint/core': 3.1.0
+      '@tsslint/config': 3.1.2(@tsslint/compat-eslint@3.1.2(typescript@6.0.3))
+      '@tsslint/core': 3.1.2
+      '@tsslint/types': 3.1.2
       '@volar/language-core': 2.4.28
       '@volar/language-hub': 0.0.1
       '@volar/typescript': 2.4.28
@@ -11221,28 +11003,25 @@ snapshots:
       - '@tsslint/compat-eslint'
       - tsl
 
-  '@tsslint/compat-eslint@3.1.0(typescript@6.0.3)':
+  '@tsslint/compat-eslint@3.1.2(typescript@6.0.3)':
     dependencies:
-      '@tsslint/types': 3.1.0
+      '@tsslint/types': 3.1.2
       esquery: 1.7.0
       typescript: 6.0.3
 
-  '@tsslint/config@3.1.0(@tsslint/compat-eslint@3.1.0(typescript@6.0.3))(typescript@6.0.3)':
+  '@tsslint/config@3.1.2(@tsslint/compat-eslint@3.1.2(typescript@6.0.3))':
     dependencies:
-      '@tsslint/types': 3.1.0
+      '@tsslint/types': 3.1.2
       minimatch: 10.2.5
-      ts-api-utils: 2.5.0(typescript@6.0.3)
     optionalDependencies:
-      '@tsslint/compat-eslint': 3.1.0(typescript@6.0.3)
-    transitivePeerDependencies:
-      - typescript
+      '@tsslint/compat-eslint': 3.1.2(typescript@6.0.3)
 
-  '@tsslint/core@3.1.0':
+  '@tsslint/core@3.1.2':
     dependencies:
-      '@tsslint/types': 3.1.0
+      '@tsslint/types': 3.1.2
       minimatch: 10.2.5
 
-  '@tsslint/types@3.1.0': {}
+  '@tsslint/types@3.1.2': {}
 
   '@tybys/wasm-util@0.10.1':
     dependencies:
@@ -11436,17 +11215,17 @@ snapshots:
 
   '@types/negotiator@0.6.4': {}
 
-  '@types/node@25.6.0':
+  '@types/node@25.7.0':
     dependencies:
-      undici-types: 7.19.2
+      undici-types: 7.21.0
 
   '@types/normalize-package-data@2.4.4': {}
 
   '@types/papaparse@5.5.2':
     dependencies:
-      '@types/node': 25.6.0
+      '@types/node': 25.7.0
 
-  '@types/qs@6.15.0': {}
+  '@types/qs@6.15.1': {}
 
   '@types/react-dom@19.2.3(@types/react@19.2.14)':
     dependencies:
@@ -11470,24 +11249,24 @@ snapshots:
 
   '@types/ws@8.18.1':
     dependencies:
-      '@types/node': 25.6.0
+      '@types/node': 25.7.0
 
   '@types/yauzl@2.10.3':
     dependencies:
-      '@types/node': 25.6.0
+      '@types/node': 25.7.0
     optional: true
 
   '@types/zen-observable@0.8.3': {}
 
-  '@typescript-eslint/eslint-plugin@8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3))(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)':
+  '@typescript-eslint/eslint-plugin@8.59.3(@typescript-eslint/parser@8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)':
     dependencies:
       '@eslint-community/regexpp': 4.12.2
-      '@typescript-eslint/parser': 8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@typescript-eslint/scope-manager': 8.58.2
-      '@typescript-eslint/type-utils': 8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@typescript-eslint/utils': 8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@typescript-eslint/visitor-keys': 8.58.2
-      eslint: 10.2.1(jiti@2.6.1)
+      '@typescript-eslint/parser': 8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@typescript-eslint/scope-manager': 8.59.3
+      '@typescript-eslint/type-utils': 8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@typescript-eslint/utils': 8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@typescript-eslint/visitor-keys': 8.59.3
+      eslint: 10.3.0(jiti@2.7.0)
       ignore: 7.0.5
       natural-compare: 1.4.0
       ts-api-utils: 2.5.0(typescript@6.0.3)
@@ -11495,136 +11274,56 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/eslint-plugin@8.59.1(@typescript-eslint/parser@8.59.1(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3))(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)':
+  '@typescript-eslint/parser@8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)':
     dependencies:
-      '@eslint-community/regexpp': 4.12.2
-      '@typescript-eslint/parser': 8.59.1(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@typescript-eslint/scope-manager': 8.59.1
-      '@typescript-eslint/type-utils': 8.59.1(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@typescript-eslint/utils': 8.59.1(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@typescript-eslint/visitor-keys': 8.59.1
-      eslint: 10.2.1(jiti@2.6.1)
-      ignore: 7.0.5
-      natural-compare: 1.4.0
+      '@typescript-eslint/scope-manager': 8.59.3
+      '@typescript-eslint/types': 8.59.3
+      '@typescript-eslint/typescript-estree': 8.59.3(typescript@6.0.3)
+      '@typescript-eslint/visitor-keys': 8.59.3
+      debug: 4.4.3(supports-color@8.1.1)
+      eslint: 10.3.0(jiti@2.7.0)
+      typescript: 6.0.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/project-service@8.59.3(typescript@6.0.3)':
+    dependencies:
+      '@typescript-eslint/tsconfig-utils': 8.59.3(typescript@6.0.3)
+      '@typescript-eslint/types': 8.59.3
+      debug: 4.4.3(supports-color@8.1.1)
+      typescript: 6.0.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@typescript-eslint/scope-manager@8.59.3':
+    dependencies:
+      '@typescript-eslint/types': 8.59.3
+      '@typescript-eslint/visitor-keys': 8.59.3
+
+  '@typescript-eslint/tsconfig-utils@8.59.3(typescript@6.0.3)':
+    dependencies:
+      typescript: 6.0.3
+
+  '@typescript-eslint/type-utils@8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)':
+    dependencies:
+      '@typescript-eslint/types': 8.59.3
+      '@typescript-eslint/typescript-estree': 8.59.3(typescript@6.0.3)
+      '@typescript-eslint/utils': 8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      debug: 4.4.3(supports-color@8.1.1)
+      eslint: 10.3.0(jiti@2.7.0)
       ts-api-utils: 2.5.0(typescript@6.0.3)
       typescript: 6.0.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)':
+  '@typescript-eslint/types@8.59.3': {}
+
+  '@typescript-eslint/typescript-estree@8.59.3(typescript@6.0.3)':
     dependencies:
-      '@typescript-eslint/scope-manager': 8.58.2
-      '@typescript-eslint/types': 8.58.2
-      '@typescript-eslint/typescript-estree': 8.58.2(typescript@6.0.3)
-      '@typescript-eslint/visitor-keys': 8.58.2
-      debug: 4.4.3(supports-color@8.1.1)
-      eslint: 10.2.1(jiti@2.6.1)
-      typescript: 6.0.3
-    transitivePeerDependencies:
-      - supports-color
-
-  '@typescript-eslint/parser@8.59.1(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)':
-    dependencies:
-      '@typescript-eslint/scope-manager': 8.59.1
-      '@typescript-eslint/types': 8.59.1
-      '@typescript-eslint/typescript-estree': 8.59.1(typescript@6.0.3)
-      '@typescript-eslint/visitor-keys': 8.59.1
-      debug: 4.4.3(supports-color@8.1.1)
-      eslint: 10.2.1(jiti@2.6.1)
-      typescript: 6.0.3
-    transitivePeerDependencies:
-      - supports-color
-
-  '@typescript-eslint/project-service@8.58.2(typescript@6.0.3)':
-    dependencies:
-      '@typescript-eslint/tsconfig-utils': 8.58.2(typescript@6.0.3)
-      '@typescript-eslint/types': 8.59.0
-      debug: 4.4.3(supports-color@8.1.1)
-      typescript: 6.0.3
-    transitivePeerDependencies:
-      - supports-color
-
-  '@typescript-eslint/project-service@8.59.0(typescript@6.0.3)':
-    dependencies:
-      '@typescript-eslint/tsconfig-utils': 8.59.0(typescript@6.0.3)
-      '@typescript-eslint/types': 8.59.0
-      debug: 4.4.3(supports-color@8.1.1)
-      typescript: 6.0.3
-    transitivePeerDependencies:
-      - supports-color
-
-  '@typescript-eslint/project-service@8.59.1(typescript@6.0.3)':
-    dependencies:
-      '@typescript-eslint/tsconfig-utils': 8.59.1(typescript@6.0.3)
-      '@typescript-eslint/types': 8.59.1
-      debug: 4.4.3(supports-color@8.1.1)
-      typescript: 6.0.3
-    transitivePeerDependencies:
-      - supports-color
-
-  '@typescript-eslint/scope-manager@8.58.2':
-    dependencies:
-      '@typescript-eslint/types': 8.58.2
-      '@typescript-eslint/visitor-keys': 8.58.2
-
-  '@typescript-eslint/scope-manager@8.59.0':
-    dependencies:
-      '@typescript-eslint/types': 8.59.0
-      '@typescript-eslint/visitor-keys': 8.59.0
-
-  '@typescript-eslint/scope-manager@8.59.1':
-    dependencies:
-      '@typescript-eslint/types': 8.59.1
-      '@typescript-eslint/visitor-keys': 8.59.1
-
-  '@typescript-eslint/tsconfig-utils@8.58.2(typescript@6.0.3)':
-    dependencies:
-      typescript: 6.0.3
-
-  '@typescript-eslint/tsconfig-utils@8.59.0(typescript@6.0.3)':
-    dependencies:
-      typescript: 6.0.3
-
-  '@typescript-eslint/tsconfig-utils@8.59.1(typescript@6.0.3)':
-    dependencies:
-      typescript: 6.0.3
-
-  '@typescript-eslint/type-utils@8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)':
-    dependencies:
-      '@typescript-eslint/types': 8.58.2
-      '@typescript-eslint/typescript-estree': 8.58.2(typescript@6.0.3)
-      '@typescript-eslint/utils': 8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      debug: 4.4.3(supports-color@8.1.1)
-      eslint: 10.2.1(jiti@2.6.1)
-      ts-api-utils: 2.5.0(typescript@6.0.3)
-      typescript: 6.0.3
-    transitivePeerDependencies:
-      - supports-color
-
-  '@typescript-eslint/type-utils@8.59.1(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)':
-    dependencies:
-      '@typescript-eslint/types': 8.59.1
-      '@typescript-eslint/typescript-estree': 8.59.1(typescript@6.0.3)
-      '@typescript-eslint/utils': 8.59.1(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      debug: 4.4.3(supports-color@8.1.1)
-      eslint: 10.2.1(jiti@2.6.1)
-      ts-api-utils: 2.5.0(typescript@6.0.3)
-      typescript: 6.0.3
-    transitivePeerDependencies:
-      - supports-color
-
-  '@typescript-eslint/types@8.58.2': {}
-
-  '@typescript-eslint/types@8.59.0': {}
-
-  '@typescript-eslint/types@8.59.1': {}
-
-  '@typescript-eslint/typescript-estree@8.58.2(typescript@6.0.3)':
-    dependencies:
-      '@typescript-eslint/project-service': 8.58.2(typescript@6.0.3)
-      '@typescript-eslint/tsconfig-utils': 8.58.2(typescript@6.0.3)
-      '@typescript-eslint/types': 8.58.2
-      '@typescript-eslint/visitor-keys': 8.58.2
+      '@typescript-eslint/project-service': 8.59.3(typescript@6.0.3)
+      '@typescript-eslint/tsconfig-utils': 8.59.3(typescript@6.0.3)
+      '@typescript-eslint/types': 8.59.3
+      '@typescript-eslint/visitor-keys': 8.59.3
       debug: 4.4.3(supports-color@8.1.1)
       minimatch: 10.2.5
       semver: 7.7.4
@@ -11634,114 +11333,52 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/typescript-estree@8.59.0(typescript@6.0.3)':
+  '@typescript-eslint/utils@8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)':
     dependencies:
-      '@typescript-eslint/project-service': 8.59.0(typescript@6.0.3)
-      '@typescript-eslint/tsconfig-utils': 8.59.0(typescript@6.0.3)
-      '@typescript-eslint/types': 8.59.0
-      '@typescript-eslint/visitor-keys': 8.59.0
-      debug: 4.4.3(supports-color@8.1.1)
-      minimatch: 10.2.5
-      semver: 7.7.4
-      tinyglobby: 0.2.16
-      ts-api-utils: 2.5.0(typescript@6.0.3)
+      '@eslint-community/eslint-utils': 4.9.1(eslint@10.3.0(jiti@2.7.0))
+      '@typescript-eslint/scope-manager': 8.59.3
+      '@typescript-eslint/types': 8.59.3
+      '@typescript-eslint/typescript-estree': 8.59.3(typescript@6.0.3)
+      eslint: 10.3.0(jiti@2.7.0)
       typescript: 6.0.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/typescript-estree@8.59.1(typescript@6.0.3)':
+  '@typescript-eslint/visitor-keys@8.59.3':
     dependencies:
-      '@typescript-eslint/project-service': 8.59.1(typescript@6.0.3)
-      '@typescript-eslint/tsconfig-utils': 8.59.1(typescript@6.0.3)
-      '@typescript-eslint/types': 8.59.1
-      '@typescript-eslint/visitor-keys': 8.59.1
-      debug: 4.4.3(supports-color@8.1.1)
-      minimatch: 10.2.5
-      semver: 7.7.4
-      tinyglobby: 0.2.16
-      ts-api-utils: 2.5.0(typescript@6.0.3)
-      typescript: 6.0.3
-    transitivePeerDependencies:
-      - supports-color
-
-  '@typescript-eslint/utils@8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)':
-    dependencies:
-      '@eslint-community/eslint-utils': 4.9.1(eslint@10.2.1(jiti@2.6.1))
-      '@typescript-eslint/scope-manager': 8.58.2
-      '@typescript-eslint/types': 8.58.2
-      '@typescript-eslint/typescript-estree': 8.58.2(typescript@6.0.3)
-      eslint: 10.2.1(jiti@2.6.1)
-      typescript: 6.0.3
-    transitivePeerDependencies:
-      - supports-color
-
-  '@typescript-eslint/utils@8.59.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)':
-    dependencies:
-      '@eslint-community/eslint-utils': 4.9.1(eslint@10.2.1(jiti@2.6.1))
-      '@typescript-eslint/scope-manager': 8.59.0
-      '@typescript-eslint/types': 8.59.0
-      '@typescript-eslint/typescript-estree': 8.59.0(typescript@6.0.3)
-      eslint: 10.2.1(jiti@2.6.1)
-      typescript: 6.0.3
-    transitivePeerDependencies:
-      - supports-color
-
-  '@typescript-eslint/utils@8.59.1(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)':
-    dependencies:
-      '@eslint-community/eslint-utils': 4.9.1(eslint@10.2.1(jiti@2.6.1))
-      '@typescript-eslint/scope-manager': 8.59.1
-      '@typescript-eslint/types': 8.59.1
-      '@typescript-eslint/typescript-estree': 8.59.1(typescript@6.0.3)
-      eslint: 10.2.1(jiti@2.6.1)
-      typescript: 6.0.3
-    transitivePeerDependencies:
-      - supports-color
-
-  '@typescript-eslint/visitor-keys@8.58.2':
-    dependencies:
-      '@typescript-eslint/types': 8.58.2
+      '@typescript-eslint/types': 8.59.3
       eslint-visitor-keys: 5.0.1
 
-  '@typescript-eslint/visitor-keys@8.59.0':
-    dependencies:
-      '@typescript-eslint/types': 8.59.0
-      eslint-visitor-keys: 5.0.1
-
-  '@typescript-eslint/visitor-keys@8.59.1':
-    dependencies:
-      '@typescript-eslint/types': 8.59.1
-      eslint-visitor-keys: 5.0.1
-
-  '@typescript/native-preview-darwin-arm64@7.0.0-dev.20260428.1':
+  '@typescript/native-preview-darwin-arm64@7.0.0-dev.20260512.1':
     optional: true
 
-  '@typescript/native-preview-darwin-x64@7.0.0-dev.20260428.1':
+  '@typescript/native-preview-darwin-x64@7.0.0-dev.20260512.1':
     optional: true
 
-  '@typescript/native-preview-linux-arm64@7.0.0-dev.20260428.1':
+  '@typescript/native-preview-linux-arm64@7.0.0-dev.20260512.1':
     optional: true
 
-  '@typescript/native-preview-linux-arm@7.0.0-dev.20260428.1':
+  '@typescript/native-preview-linux-arm@7.0.0-dev.20260512.1':
     optional: true
 
-  '@typescript/native-preview-linux-x64@7.0.0-dev.20260428.1':
+  '@typescript/native-preview-linux-x64@7.0.0-dev.20260512.1':
     optional: true
 
-  '@typescript/native-preview-win32-arm64@7.0.0-dev.20260428.1':
+  '@typescript/native-preview-win32-arm64@7.0.0-dev.20260512.1':
     optional: true
 
-  '@typescript/native-preview-win32-x64@7.0.0-dev.20260428.1':
+  '@typescript/native-preview-win32-x64@7.0.0-dev.20260512.1':
     optional: true
 
-  '@typescript/native-preview@7.0.0-dev.20260428.1':
+  '@typescript/native-preview@7.0.0-dev.20260512.1':
     optionalDependencies:
-      '@typescript/native-preview-darwin-arm64': 7.0.0-dev.20260428.1
-      '@typescript/native-preview-darwin-x64': 7.0.0-dev.20260428.1
-      '@typescript/native-preview-linux-arm': 7.0.0-dev.20260428.1
-      '@typescript/native-preview-linux-arm64': 7.0.0-dev.20260428.1
-      '@typescript/native-preview-linux-x64': 7.0.0-dev.20260428.1
-      '@typescript/native-preview-win32-arm64': 7.0.0-dev.20260428.1
-      '@typescript/native-preview-win32-x64': 7.0.0-dev.20260428.1
+      '@typescript/native-preview-darwin-arm64': 7.0.0-dev.20260512.1
+      '@typescript/native-preview-darwin-x64': 7.0.0-dev.20260512.1
+      '@typescript/native-preview-linux-arm': 7.0.0-dev.20260512.1
+      '@typescript/native-preview-linux-arm64': 7.0.0-dev.20260512.1
+      '@typescript/native-preview-linux-x64': 7.0.0-dev.20260512.1
+      '@typescript/native-preview-win32-arm64': 7.0.0-dev.20260512.1
+      '@typescript/native-preview-win32-x64': 7.0.0-dev.20260512.1
 
   '@ungap/structured-clone@1.3.0': {}
 
@@ -11749,13 +11386,13 @@ snapshots:
     dependencies:
       unpic: 4.2.2
 
-  '@unpic/react@1.0.2(next@16.2.4(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(react-dom@19.2.5(react@19.2.5))(react@19.2.5)':
+  '@unpic/react@1.0.2(next@16.2.6(@babel/core@7.29.0)(@playwright/test@1.60.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
       '@unpic/core': 1.0.3
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
     optionalDependencies:
-      next: 16.2.4(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      next: 16.2.6(@babel/core@7.29.0)(@playwright/test@1.60.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
 
   '@upsetjs/venn.js@2.0.0':
     optionalDependencies:
@@ -11771,12 +11408,12 @@ snapshots:
       '@resvg/resvg-wasm': 2.4.0
       satori: 0.16.0
 
-  '@vitejs/devtools-kit@0.1.11(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(typescript@6.0.3)(ws@8.20.0)':
+  '@vitejs/devtools-kit@0.1.11(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(typescript@6.0.3)(ws@8.20.0)':
     dependencies:
       '@vitejs/devtools-rpc': 0.1.11(typescript@6.0.3)(ws@8.20.0)
       birpc: 4.0.0
       ohash: 2.0.11
-      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
     transitivePeerDependencies:
       - typescript
       - ws
@@ -11793,31 +11430,31 @@ snapshots:
     transitivePeerDependencies:
       - typescript
 
-  '@vitejs/plugin-react@6.0.1(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))':
+  '@vitejs/plugin-react@6.0.1(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))':
     dependencies:
       '@rolldown/pluginutils': 1.0.0-rc.7
-      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
 
-  '@vitejs/plugin-rsc@0.5.25(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(react-dom@19.2.5(react@19.2.5))(react-server-dom-webpack@19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(react@19.2.5)':
+  '@vitejs/plugin-rsc@0.5.26(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(react-dom@19.2.6(react@19.2.6))(react-server-dom-webpack@19.2.6(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(react@19.2.6)':
     dependencies:
-      '@rolldown/pluginutils': 1.0.0-rc.17
-      es-module-lexer: 2.0.0
+      '@rolldown/pluginutils': 1.0.0-rc.18
+      es-module-lexer: 2.1.0
       estree-walker: 3.0.3
       magic-string: 0.30.21
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
       srvx: 0.11.15
       strip-literal: 3.1.0
       turbo-stream: 3.2.0
-      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
-      vitefu: 1.1.3(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
+      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+      vitefu: 1.1.3(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
     optionalDependencies:
-      react-server-dom-webpack: 19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      react-server-dom-webpack: 19.2.6(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
 
-  '@vitest/coverage-v8@4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)':
+  '@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)':
     dependencies:
       '@bcoe/v8-coverage': 1.0.2
-      '@vitest/utils': 4.1.5
+      '@vitest/utils': 4.1.6
       ast-v8-to-istanbul: 1.0.0
       istanbul-lib-coverage: 3.2.2
       istanbul-lib-report: 3.0.1
@@ -11826,7 +11463,7 @@ snapshots:
       obug: 2.1.1
       std-env: 4.0.0
       tinyrainbow: 3.1.0
-      vitest: '@voidzero-dev/vite-plus-test@0.1.20(@types/node@25.6.0)(@vitest/coverage-v8@4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+      vitest: '@voidzero-dev/vite-plus-test@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
     transitivePeerDependencies:
       - '@arethetypeswrong/core'
       - '@edge-runtime/vm'
@@ -11856,14 +11493,14 @@ snapshots:
       - vite
       - yaml
 
-  '@vitest/eslint-plugin@1.6.15(@types/node@25.6.0)(@typescript-eslint/eslint-plugin@8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3))(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3))(@vitest/coverage-v8@4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(eslint@10.2.1(jiti@2.6.1))(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)':
+  '@vitest/eslint-plugin@1.6.17(@types/node@25.7.0)(@typescript-eslint/eslint-plugin@8.59.3(@typescript-eslint/parser@8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3))(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(eslint@10.3.0(jiti@2.7.0))(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)':
     dependencies:
-      '@typescript-eslint/scope-manager': 8.59.0
-      '@typescript-eslint/utils': 8.59.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      eslint: 10.2.1(jiti@2.6.1)
-      vitest: '@voidzero-dev/vite-plus-test@0.1.20(@types/node@25.6.0)(@vitest/coverage-v8@4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+      '@typescript-eslint/scope-manager': 8.59.3
+      '@typescript-eslint/utils': 8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      eslint: 10.3.0(jiti@2.7.0)
+      vitest: '@voidzero-dev/vite-plus-test@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
     optionalDependencies:
-      '@typescript-eslint/eslint-plugin': 8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3))(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
+      '@typescript-eslint/eslint-plugin': 8.59.3(@typescript-eslint/parser@8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
       typescript: 6.0.3
     transitivePeerDependencies:
       - '@arethetypeswrong/core'
@@ -11907,7 +11544,7 @@ snapshots:
     dependencies:
       tinyrainbow: 2.0.0
 
-  '@vitest/pretty-format@4.1.5':
+  '@vitest/pretty-format@4.1.6':
     dependencies:
       tinyrainbow: 3.1.0
 
@@ -11921,23 +11558,23 @@ snapshots:
       loupe: 3.2.1
       tinyrainbow: 2.0.0
 
-  '@vitest/utils@4.1.5':
+  '@vitest/utils@4.1.6':
     dependencies:
-      '@vitest/pretty-format': 4.1.5
+      '@vitest/pretty-format': 4.1.6
       convert-source-map: 2.0.0
       tinyrainbow: 3.1.0
 
-  '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)':
+  '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)':
     dependencies:
       '@oxc-project/runtime': 0.127.0
       '@oxc-project/types': 0.127.0
       lightningcss: 1.32.0
-      postcss: 8.5.12
+      postcss: 8.5.14
     optionalDependencies:
-      '@types/node': 25.6.0
+      '@types/node': 25.7.0
       esbuild: 0.27.2
       fsevents: 2.3.3
-      jiti: 2.6.1
+      jiti: 2.7.0
       tsx: 4.21.0
       typescript: 6.0.3
       yaml: 2.8.3
@@ -11960,11 +11597,11 @@ snapshots:
   '@voidzero-dev/vite-plus-linux-x64-musl@0.1.20':
     optional: true
 
-  '@voidzero-dev/vite-plus-test@0.1.20(@types/node@25.6.0)(@vitest/coverage-v8@4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)':
+  '@voidzero-dev/vite-plus-test@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)':
     dependencies:
       '@standard-schema/spec': 1.1.0
       '@types/chai': 5.2.3
-      '@voidzero-dev/vite-plus-core': 0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
+      '@voidzero-dev/vite-plus-core': 0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
       es-module-lexer: 1.7.0
       obug: 2.1.1
       pixelmatch: 7.1.0
@@ -11974,11 +11611,11 @@ snapshots:
       tinybench: 2.9.0
       tinyexec: 1.0.4
       tinyglobby: 0.2.16
-      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
       ws: 8.20.0
     optionalDependencies:
-      '@types/node': 25.6.0
-      '@vitest/coverage-v8': 4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
+      '@types/node': 25.7.0
+      '@vitest/coverage-v8': 4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
       happy-dom: 20.9.0
     transitivePeerDependencies:
       - '@arethetypeswrong/core'
@@ -12052,12 +11689,12 @@ snapshots:
 
   acorn@8.16.0: {}
 
-  agentation@3.0.2(react-dom@19.2.5(react@19.2.5))(react@19.2.5):
+  agentation@3.0.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6):
     optionalDependencies:
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
 
-  ahooks@3.9.7(react-dom@19.2.5(react@19.2.5))(react@19.2.5):
+  ahooks@3.9.7(react-dom@19.2.6(react@19.2.6))(react@19.2.6):
     dependencies:
       '@babel/runtime': 7.29.2
       '@types/js-cookie': 3.0.6
@@ -12065,8 +11702,8 @@ snapshots:
       intersection-observer: 0.12.2
       js-cookie: 3.0.5
       lodash: 4.18.0
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
       react-fast-compare: 3.2.2
       resize-observer-polyfill: 1.5.1
       screenfull: 5.2.0
@@ -12203,15 +11840,30 @@ snapshots:
       dotenv: 17.4.2
       exsolve: 1.0.8
       giget: 3.2.0
-      jiti: 2.6.1
+      jiti: 2.7.0
       ohash: 2.0.11
       pathe: 2.0.3
       perfect-debounce: 2.1.0
-      pkg-types: 2.3.0
+      pkg-types: 2.3.1
       rc9: 3.0.1
     optionalDependencies:
       magicast: 0.5.2
 
+  c12@4.0.0-beta.5(chokidar@5.0.0)(dotenv@17.4.2)(giget@3.2.0)(jiti@2.7.0)(magicast@0.5.2):
+    dependencies:
+      confbox: 0.2.4
+      defu: 6.1.7
+      exsolve: 1.0.8
+      pathe: 2.0.3
+      pkg-types: 2.3.1
+      rc9: 3.0.1
+    optionalDependencies:
+      chokidar: 5.0.0
+      dotenv: 17.4.2
+      giget: 3.2.0
+      jiti: 2.7.0
+      magicast: 0.5.2
+
   cac@7.0.0: {}
 
   camelize@1.0.1: {}
@@ -12285,20 +11937,6 @@ snapshots:
       undici: 7.24.0
       whatwg-mimetype: 4.0.0
 
-  chevrotain-allstar@0.3.1(chevrotain@11.1.2):
-    dependencies:
-      chevrotain: 11.1.2
-      lodash-es: 4.18.0
-
-  chevrotain@11.1.2:
-    dependencies:
-      '@chevrotain/cst-dts-gen': 11.1.2
-      '@chevrotain/gast': 11.1.2
-      '@chevrotain/regexp-to-ast': 11.1.2
-      '@chevrotain/types': 11.1.2
-      '@chevrotain/utils': 11.1.2
-      lodash-es: 4.18.0
-
   chokidar@5.0.0:
     dependencies:
       readdirp: 5.0.0
@@ -12342,14 +11980,14 @@ snapshots:
 
   clsx@2.1.1: {}
 
-  cmdk@1.1.1(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5):
+  cmdk@1.1.1(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6):
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.5)
-      '@radix-ui/react-dialog': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.5)
-      '@radix-ui/react-primitive': 2.1.4(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      '@radix-ui/react-compose-refs': 1.1.2(@types/react@19.2.14)(react@19.2.6)
+      '@radix-ui/react-dialog': 1.1.15(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@radix-ui/react-id': 1.1.1(@types/react@19.2.14)(react@19.2.6)
+      '@radix-ui/react-primitive': 2.1.4(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
     transitivePeerDependencies:
       - '@types/react'
       - '@types/react-dom'
@@ -12740,11 +12378,7 @@ snapshots:
     dependencies:
       domelementtype: 2.3.0
 
-  dompurify@3.3.2:
-    optionalDependencies:
-      '@types/trusted-types': 2.0.7
-
-  dompurify@3.4.1:
+  dompurify@3.4.2:
     optionalDependencies:
       '@types/trusted-types': 2.0.7
 
@@ -12758,11 +12392,11 @@ snapshots:
 
   dotenv@17.4.2: {}
 
-  echarts-for-react@3.0.6(echarts@6.0.0)(react@19.2.5):
+  echarts-for-react@3.0.6(echarts@6.0.0)(react@19.2.6):
     dependencies:
       echarts: 6.0.0
       fast-deep-equal: 3.1.3
-      react: 19.2.5
+      react: 19.2.6
       size-sensor: 1.0.3
 
   echarts@6.0.0:
@@ -12778,11 +12412,11 @@ snapshots:
     dependencies:
       embla-carousel: 8.6.0
 
-  embla-carousel-react@8.6.0(react@19.2.5):
+  embla-carousel-react@8.6.0(react@19.2.6):
     dependencies:
       embla-carousel: 8.6.0
       embla-carousel-reactive-utils: 8.6.0(embla-carousel@8.6.0)
-      react: 19.2.5
+      react: 19.2.6
 
   embla-carousel-reactive-utils@8.6.0(embla-carousel@8.6.0):
     dependencies:
@@ -12819,10 +12453,10 @@ snapshots:
 
   engine.io-parser@5.2.3: {}
 
-  enhanced-resolve@5.20.1:
+  enhanced-resolve@5.21.3:
     dependencies:
       graceful-fs: 4.2.11
-      tapable: 2.3.2
+      tapable: 2.3.3
 
   entities@4.5.0: {}
 
@@ -12840,9 +12474,9 @@ snapshots:
 
   es-module-lexer@1.7.0: {}
 
-  es-module-lexer@2.0.0: {}
+  es-module-lexer@2.1.0: {}
 
-  es-toolkit@1.46.0: {}
+  es-toolkit@1.46.1: {}
 
   esast-util-from-estree@2.0.0:
     dependencies:
@@ -12897,93 +12531,86 @@ snapshots:
 
   escape-string-regexp@5.0.0: {}
 
-  eslint-compat-utils@0.5.1(eslint@10.2.1(jiti@2.6.1)):
+  eslint-compat-utils@0.5.1(eslint@10.3.0(jiti@2.7.0)):
     dependencies:
-      eslint: 10.2.1(jiti@2.6.1)
+      eslint: 10.3.0(jiti@2.7.0)
       semver: 7.7.4
 
-  eslint-config-flat-gitignore@2.3.0(eslint@10.2.1(jiti@2.6.1)):
+  eslint-config-flat-gitignore@2.3.0(eslint@10.3.0(jiti@2.7.0)):
     dependencies:
-      '@eslint/compat': 2.0.3(eslint@10.2.1(jiti@2.6.1))
-      eslint: 10.2.1(jiti@2.6.1)
+      '@eslint/compat': 2.0.3(eslint@10.3.0(jiti@2.7.0))
+      eslint: 10.3.0(jiti@2.7.0)
 
-  eslint-flat-config-utils@3.1.0:
+  eslint-flat-config-utils@3.2.0:
     dependencies:
-      '@eslint/config-helpers': 0.5.4
+      '@eslint/config-helpers': 0.5.5
       pathe: 2.0.3
 
-  eslint-json-compat-utils@0.2.3(eslint@10.2.1(jiti@2.6.1))(jsonc-eslint-parser@3.1.0):
+  eslint-json-compat-utils@0.2.3(eslint@10.3.0(jiti@2.7.0))(jsonc-eslint-parser@3.1.0):
     dependencies:
-      eslint: 10.2.1(jiti@2.6.1)
+      eslint: 10.3.0(jiti@2.7.0)
       esquery: 1.7.0
       jsonc-eslint-parser: 3.1.0
 
-  eslint-markdown@0.7.0(eslint@10.2.1(jiti@2.6.1)):
+  eslint-markdown@0.9.0(eslint@10.3.0(jiti@2.7.0)):
     dependencies:
       '@eslint/markdown': 7.5.1
       micromark-util-normalize-identifier: 2.0.1
       parse5: 8.0.1
     optionalDependencies:
-      eslint: 10.2.1(jiti@2.6.1)
+      eslint: 10.3.0(jiti@2.7.0)
     transitivePeerDependencies:
       - supports-color
 
-  eslint-merge-processors@2.0.0(eslint@10.2.1(jiti@2.6.1)):
+  eslint-merge-processors@2.0.0(eslint@10.3.0(jiti@2.7.0)):
     dependencies:
-      eslint: 10.2.1(jiti@2.6.1)
+      eslint: 10.3.0(jiti@2.7.0)
 
-  eslint-plugin-antfu@3.2.2(eslint@10.2.1(jiti@2.6.1)):
+  eslint-plugin-antfu@3.2.3(eslint@10.3.0(jiti@2.7.0)):
     dependencies:
-      eslint: 10.2.1(jiti@2.6.1)
+      eslint: 10.3.0(jiti@2.7.0)
 
-  eslint-plugin-better-tailwindcss@4.5.0(eslint@10.2.1(jiti@2.6.1))(oxlint@1.61.0(oxlint-tsgolint@0.22.0))(tailwindcss@4.2.4)(typescript@6.0.3):
+  eslint-plugin-better-tailwindcss@4.5.0(eslint@10.3.0(jiti@2.7.0))(oxlint@1.61.0(oxlint-tsgolint@0.22.0))(tailwindcss@4.3.0)(typescript@6.0.3):
     dependencies:
       '@eslint/css-tree': 4.0.1
       '@valibot/to-json-schema': 1.6.0(valibot@1.3.1(typescript@6.0.3))
-      enhanced-resolve: 5.20.1
-      jiti: 2.6.1
+      enhanced-resolve: 5.21.3
+      jiti: 2.7.0
       synckit: 0.11.12
       tailwind-csstree: 0.3.1
-      tailwindcss: 4.2.4
+      tailwindcss: 4.3.0
       tsconfig-paths-webpack-plugin: 4.2.0
       valibot: 1.3.1(typescript@6.0.3)
     optionalDependencies:
-      eslint: 10.2.1(jiti@2.6.1)
+      eslint: 10.3.0(jiti@2.7.0)
       oxlint: 1.61.0(oxlint-tsgolint@0.22.0)
     transitivePeerDependencies:
       - '@eslint/css'
       - typescript
 
-  eslint-plugin-command@3.5.2(@typescript-eslint/typescript-estree@8.59.1(typescript@6.0.3))(@typescript-eslint/utils@8.59.1(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3))(eslint@10.2.1(jiti@2.6.1)):
+  eslint-plugin-command@3.5.2(@typescript-eslint/typescript-estree@8.59.3(typescript@6.0.3))(@typescript-eslint/utils@8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.3.0(jiti@2.7.0)):
     dependencies:
       '@es-joy/jsdoccomment': 0.84.0
-      '@typescript-eslint/typescript-estree': 8.59.1(typescript@6.0.3)
-      '@typescript-eslint/utils': 8.59.1(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      eslint: 10.2.1(jiti@2.6.1)
+      '@typescript-eslint/typescript-estree': 8.59.3(typescript@6.0.3)
+      '@typescript-eslint/utils': 8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      eslint: 10.3.0(jiti@2.7.0)
 
-  eslint-plugin-depend@1.5.0(eslint@10.2.1(jiti@2.6.1)):
+  eslint-plugin-es-x@7.8.0(eslint@10.3.0(jiti@2.7.0)):
     dependencies:
-      empathic: 2.0.0
-      eslint: 10.2.1(jiti@2.6.1)
-      module-replacements: 2.11.0
-      semver: 7.7.4
-
-  eslint-plugin-es-x@7.8.0(eslint@10.2.1(jiti@2.6.1)):
-    dependencies:
-      '@eslint-community/eslint-utils': 4.9.1(eslint@10.2.1(jiti@2.6.1))
+      '@eslint-community/eslint-utils': 4.9.1(eslint@10.3.0(jiti@2.7.0))
       '@eslint-community/regexpp': 4.12.2
-      eslint: 10.2.1(jiti@2.6.1)
-      eslint-compat-utils: 0.5.1(eslint@10.2.1(jiti@2.6.1))
+      eslint: 10.3.0(jiti@2.7.0)
+      eslint-compat-utils: 0.5.1(eslint@10.3.0(jiti@2.7.0))
 
-  eslint-plugin-hyoban@0.14.1(eslint@10.2.1(jiti@2.6.1)):
+  eslint-plugin-hyoban@0.14.1(eslint@10.3.0(jiti@2.7.0)):
     dependencies:
-      eslint: 10.2.1(jiti@2.6.1)
+      eslint: 10.3.0(jiti@2.7.0)
 
-  eslint-plugin-import-lite@0.6.0(eslint@10.2.1(jiti@2.6.1)):
+  eslint-plugin-import-lite@0.6.0(eslint@10.3.0(jiti@2.7.0)):
     dependencies:
-      eslint: 10.2.1(jiti@2.6.1)
+      eslint: 10.3.0(jiti@2.7.0)
 
-  eslint-plugin-jsdoc@62.9.0(eslint@10.2.1(jiti@2.6.1)):
+  eslint-plugin-jsdoc@62.9.0(eslint@10.3.0(jiti@2.7.0)):
     dependencies:
       '@es-joy/jsdoccomment': 0.86.0
       '@es-joy/resolve.exports': 1.2.0
@@ -12991,7 +12618,7 @@ snapshots:
       comment-parser: 1.4.6
       debug: 4.4.3(supports-color@8.1.1)
       escape-string-regexp: 4.0.0
-      eslint: 10.2.1(jiti@2.6.1)
+      eslint: 10.3.0(jiti@2.7.0)
       espree: 11.2.0
       esquery: 1.7.0
       html-entities: 2.6.0
@@ -13003,27 +12630,27 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-jsonc@3.1.2(eslint@10.2.1(jiti@2.6.1)):
+  eslint-plugin-jsonc@3.1.2(eslint@10.3.0(jiti@2.7.0)):
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.1(eslint@10.2.1(jiti@2.6.1))
-      '@eslint/core': 1.2.0
+      '@eslint-community/eslint-utils': 4.9.1(eslint@10.3.0(jiti@2.7.0))
+      '@eslint/core': 1.2.1
       '@eslint/plugin-kit': 0.6.1
       '@ota-meshi/ast-token-store': 0.3.0
       diff-sequences: 29.6.3
-      eslint: 10.2.1(jiti@2.6.1)
-      eslint-json-compat-utils: 0.2.3(eslint@10.2.1(jiti@2.6.1))(jsonc-eslint-parser@3.1.0)
+      eslint: 10.3.0(jiti@2.7.0)
+      eslint-json-compat-utils: 0.2.3(eslint@10.3.0(jiti@2.7.0))(jsonc-eslint-parser@3.1.0)
       jsonc-eslint-parser: 3.1.0
       natural-compare: 1.4.0
       synckit: 0.11.12
     transitivePeerDependencies:
       - '@eslint/json'
 
-  eslint-plugin-markdown-preferences@0.41.1(@eslint/markdown@8.0.1)(eslint@10.2.1(jiti@2.6.1)):
+  eslint-plugin-markdown-preferences@0.41.1(@eslint/markdown@8.0.1)(eslint@10.3.0(jiti@2.7.0)):
     dependencies:
       '@eslint/markdown': 8.0.1
       diff-sequences: 29.6.3
       emoji-regex-xs: 2.0.1
-      eslint: 10.2.1(jiti@2.6.1)
+      eslint: 10.3.0(jiti@2.7.0)
       mdast-util-from-markdown: 2.0.3
       mdast-util-frontmatter: 2.0.1
       mdast-util-gfm: 3.1.0
@@ -13038,44 +12665,43 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-n@17.24.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3):
+  eslint-plugin-n@18.0.1(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3):
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.1(eslint@10.2.1(jiti@2.6.1))
-      enhanced-resolve: 5.20.1
-      eslint: 10.2.1(jiti@2.6.1)
-      eslint-plugin-es-x: 7.8.0(eslint@10.2.1(jiti@2.6.1))
+      '@eslint-community/eslint-utils': 4.9.1(eslint@10.3.0(jiti@2.7.0))
+      enhanced-resolve: 5.21.3
+      eslint: 10.3.0(jiti@2.7.0)
+      eslint-plugin-es-x: 7.8.0(eslint@10.3.0(jiti@2.7.0))
       get-tsconfig: 4.14.0
       globals: 15.15.0
       globrex: 0.1.2
       ignore: 5.3.2
       semver: 7.7.4
-      ts-declaration-location: 1.0.7(typescript@6.0.3)
-    transitivePeerDependencies:
-      - typescript
+    optionalDependencies:
+      typescript: 6.0.3
 
-  eslint-plugin-no-barrel-files@1.3.1(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3):
+  eslint-plugin-no-barrel-files@1.3.1(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3):
     dependencies:
-      '@typescript-eslint/utils': 8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      eslint: 10.2.1(jiti@2.6.1)
+      '@typescript-eslint/utils': 8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      eslint: 10.3.0(jiti@2.7.0)
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  eslint-plugin-no-only-tests@3.3.0: {}
+  eslint-plugin-no-only-tests@3.4.0: {}
 
-  eslint-plugin-perfectionist@5.8.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3):
+  eslint-plugin-perfectionist@5.9.0(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3):
     dependencies:
-      '@typescript-eslint/utils': 8.59.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      eslint: 10.2.1(jiti@2.6.1)
+      '@typescript-eslint/utils': 8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      eslint: 10.3.0(jiti@2.7.0)
       natural-orderby: 5.0.0
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  eslint-plugin-pnpm@1.6.0(eslint@10.2.1(jiti@2.6.1)):
+  eslint-plugin-pnpm@1.6.0(eslint@10.3.0(jiti@2.7.0)):
     dependencies:
       empathic: 2.0.0
-      eslint: 10.2.1(jiti@2.6.1)
+      eslint: 10.3.0(jiti@2.7.0)
       jsonc-eslint-parser: 3.1.0
       pathe: 2.0.3
       pnpm-workspace-yaml: 1.6.0
@@ -13083,87 +12709,97 @@ snapshots:
       yaml: 2.8.3
       yaml-eslint-parser: 2.0.0
 
-  eslint-plugin-react-dom@3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3):
+  eslint-plugin-react-dom@5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3):
     dependencies:
-      '@eslint-react/ast': 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@eslint-react/core': 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@eslint-react/shared': 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@eslint-react/var': 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@typescript-eslint/scope-manager': 8.58.2
-      '@typescript-eslint/types': 8.58.2
-      '@typescript-eslint/utils': 8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
+      '@eslint-react/ast': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/eslint': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/jsx': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/shared': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@typescript-eslint/types': 8.59.3
+      '@typescript-eslint/utils': 8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
       compare-versions: 6.1.1
-      eslint: 10.2.1(jiti@2.6.1)
+      eslint: 10.3.0(jiti@2.7.0)
+      typescript: 6.0.3
+    transitivePeerDependencies:
+      - supports-color
+
+  eslint-plugin-react-jsx@5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3):
+    dependencies:
+      '@eslint-react/ast': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/core': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/eslint': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/jsx': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/shared': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@typescript-eslint/types': 8.59.3
+      '@typescript-eslint/utils': 8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      eslint: 10.3.0(jiti@2.7.0)
+      typescript: 6.0.3
+    transitivePeerDependencies:
+      - supports-color
+
+  eslint-plugin-react-naming-convention@5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3):
+    dependencies:
+      '@eslint-react/ast': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/core': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/eslint': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/var': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@typescript-eslint/types': 8.59.3
+      '@typescript-eslint/utils': 8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      eslint: 10.3.0(jiti@2.7.0)
       ts-pattern: 5.9.0
       typescript: 6.0.3
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-react-naming-convention@3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3):
+  eslint-plugin-react-refresh@0.5.2(eslint@10.3.0(jiti@2.7.0)):
     dependencies:
-      '@eslint-react/ast': 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@eslint-react/core': 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@eslint-react/shared': 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@eslint-react/var': 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@typescript-eslint/scope-manager': 8.58.2
-      '@typescript-eslint/type-utils': 8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@typescript-eslint/types': 8.58.2
-      '@typescript-eslint/utils': 8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      compare-versions: 6.1.1
-      eslint: 10.2.1(jiti@2.6.1)
-      string-ts: 2.3.1
-      ts-pattern: 5.9.0
+      eslint: 10.3.0(jiti@2.7.0)
+
+  eslint-plugin-react-rsc@5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3):
+    dependencies:
+      '@eslint-react/ast': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/core': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/eslint': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/shared': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/var': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@typescript-eslint/types': 8.59.3
+      '@typescript-eslint/utils': 8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      eslint: 10.3.0(jiti@2.7.0)
       typescript: 6.0.3
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-react-refresh@0.5.2(eslint@10.2.1(jiti@2.6.1)):
+  eslint-plugin-react-web-api@5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3):
     dependencies:
-      eslint: 10.2.1(jiti@2.6.1)
-
-  eslint-plugin-react-rsc@3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3):
-    dependencies:
-      '@eslint-react/ast': 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@eslint-react/shared': 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@eslint-react/var': 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@typescript-eslint/scope-manager': 8.58.2
-      '@typescript-eslint/type-utils': 8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@typescript-eslint/types': 8.58.2
-      '@typescript-eslint/utils': 8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      eslint: 10.2.1(jiti@2.6.1)
-      ts-pattern: 5.9.0
-      typescript: 6.0.3
-    transitivePeerDependencies:
-      - supports-color
-
-  eslint-plugin-react-web-api@3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3):
-    dependencies:
-      '@eslint-react/ast': 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@eslint-react/core': 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@eslint-react/shared': 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@eslint-react/var': 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@typescript-eslint/scope-manager': 8.58.2
-      '@typescript-eslint/types': 8.58.2
-      '@typescript-eslint/utils': 8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
+      '@eslint-react/ast': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/core': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/eslint': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/shared': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/var': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@typescript-eslint/types': 8.59.3
+      '@typescript-eslint/utils': 8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
       birecord: 0.1.1
-      eslint: 10.2.1(jiti@2.6.1)
+      eslint: 10.3.0(jiti@2.7.0)
       ts-pattern: 5.9.0
       typescript: 6.0.3
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-react-x@3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3):
+  eslint-plugin-react-x@5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3):
     dependencies:
-      '@eslint-react/ast': 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@eslint-react/core': 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@eslint-react/shared': 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@eslint-react/var': 3.0.0(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@typescript-eslint/scope-manager': 8.58.2
-      '@typescript-eslint/type-utils': 8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      '@typescript-eslint/types': 8.58.2
-      '@typescript-eslint/utils': 8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
+      '@eslint-react/ast': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/core': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/eslint': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/jsx': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/shared': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@eslint-react/var': 5.7.7(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@typescript-eslint/scope-manager': 8.59.3
+      '@typescript-eslint/type-utils': 8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      '@typescript-eslint/types': 8.59.3
+      '@typescript-eslint/typescript-estree': 8.59.3(typescript@6.0.3)
+      '@typescript-eslint/utils': 8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
       compare-versions: 6.1.1
-      eslint: 10.2.1(jiti@2.6.1)
+      eslint: 10.3.0(jiti@2.7.0)
       string-ts: 2.3.1
       ts-api-utils: 2.5.0(typescript@6.0.3)
       ts-pattern: 5.9.0
@@ -13171,25 +12807,25 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-regexp@3.1.0(eslint@10.2.1(jiti@2.6.1)):
+  eslint-plugin-regexp@3.1.0(eslint@10.3.0(jiti@2.7.0)):
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.1(eslint@10.2.1(jiti@2.6.1))
+      '@eslint-community/eslint-utils': 4.9.1(eslint@10.3.0(jiti@2.7.0))
       '@eslint-community/regexpp': 4.12.2
       comment-parser: 1.4.6
-      eslint: 10.2.1(jiti@2.6.1)
+      eslint: 10.3.0(jiti@2.7.0)
       jsdoc-type-pratt-parser: 7.2.0
       refa: 0.12.1
       regexp-ast-analysis: 0.7.1
       scslre: 0.3.0
 
-  eslint-plugin-sonarjs@4.0.3(eslint@10.2.1(jiti@2.6.1)):
+  eslint-plugin-sonarjs@4.0.3(eslint@10.3.0(jiti@2.7.0)):
     dependencies:
       '@eslint-community/regexpp': 4.12.2
       builtin-modules: 3.3.0
       bytes: 3.1.2
-      eslint: 10.2.1(jiti@2.6.1)
+      eslint: 10.3.0(jiti@2.7.0)
       functional-red-black-tree: 1.0.1
-      globals: 17.5.0
+      globals: 17.6.0
       jsx-ast-utils-x: 0.1.0
       lodash.merge: 4.6.2
       minimatch: 10.2.5
@@ -13198,37 +12834,37 @@ snapshots:
       ts-api-utils: 2.5.0(typescript@6.0.3)
       typescript: 6.0.3
 
-  eslint-plugin-storybook@10.3.5(eslint@10.2.1(jiti@2.6.1))(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(typescript@6.0.3):
+  eslint-plugin-storybook@10.3.6(eslint@10.3.0(jiti@2.7.0))(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))(typescript@6.0.3):
     dependencies:
-      '@typescript-eslint/utils': 8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
-      eslint: 10.2.1(jiti@2.6.1)
-      storybook: 10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@typescript-eslint/utils': 8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
+      eslint: 10.3.0(jiti@2.7.0)
+      storybook: 10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  eslint-plugin-toml@1.3.1(eslint@10.2.1(jiti@2.6.1)):
+  eslint-plugin-toml@1.3.1(eslint@10.3.0(jiti@2.7.0)):
     dependencies:
-      '@eslint/core': 1.2.0
+      '@eslint/core': 1.2.1
       '@eslint/plugin-kit': 0.6.1
       '@ota-meshi/ast-token-store': 0.3.0
       debug: 4.4.3(supports-color@8.1.1)
-      eslint: 10.2.1(jiti@2.6.1)
+      eslint: 10.3.0(jiti@2.7.0)
       toml-eslint-parser: 1.0.3
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-unicorn@64.0.0(eslint@10.2.1(jiti@2.6.1)):
+  eslint-plugin-unicorn@64.0.0(eslint@10.3.0(jiti@2.7.0)):
     dependencies:
       '@babel/helper-validator-identifier': 7.28.5
-      '@eslint-community/eslint-utils': 4.9.1(eslint@10.2.1(jiti@2.6.1))
+      '@eslint-community/eslint-utils': 4.9.1(eslint@10.3.0(jiti@2.7.0))
       change-case: 5.4.4
       ci-info: 4.4.0
       clean-regexp: 1.0.0
       core-js-compat: 3.49.0
-      eslint: 10.2.1(jiti@2.6.1)
+      eslint: 10.3.0(jiti@2.7.0)
       find-up-simple: 1.0.1
-      globals: 17.5.0
+      globals: 17.6.0
       indent-string: 5.0.0
       is-builtin-module: 5.0.0
       jsesc: 3.1.0
@@ -13238,43 +12874,40 @@ snapshots:
       semver: 7.7.4
       strip-indent: 4.1.1
 
-  eslint-plugin-unused-imports@4.4.1(@typescript-eslint/eslint-plugin@8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3))(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3))(eslint@10.2.1(jiti@2.6.1)):
+  eslint-plugin-unused-imports@4.4.1(@typescript-eslint/eslint-plugin@8.59.3(@typescript-eslint/parser@8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.3.0(jiti@2.7.0)):
     dependencies:
-      eslint: 10.2.1(jiti@2.6.1)
+      eslint: 10.3.0(jiti@2.7.0)
     optionalDependencies:
-      '@typescript-eslint/eslint-plugin': 8.58.2(@typescript-eslint/parser@8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3))(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
+      '@typescript-eslint/eslint-plugin': 8.59.3(@typescript-eslint/parser@8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
 
-  eslint-plugin-vue@10.8.0(@stylistic/eslint-plugin@5.10.0(eslint@10.2.1(jiti@2.6.1)))(@typescript-eslint/parser@8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3))(eslint@10.2.1(jiti@2.6.1))(vue-eslint-parser@10.4.0(eslint@10.2.1(jiti@2.6.1))):
+  eslint-plugin-vue@10.9.1(@stylistic/eslint-plugin@5.10.0(eslint@10.3.0(jiti@2.7.0)))(@typescript-eslint/parser@8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3))(eslint@10.3.0(jiti@2.7.0))(vue-eslint-parser@10.4.0(eslint@10.3.0(jiti@2.7.0))):
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.1(eslint@10.2.1(jiti@2.6.1))
-      eslint: 10.2.1(jiti@2.6.1)
+      '@eslint-community/eslint-utils': 4.9.1(eslint@10.3.0(jiti@2.7.0))
+      eslint: 10.3.0(jiti@2.7.0)
       natural-compare: 1.4.0
       nth-check: 2.1.1
       postcss-selector-parser: 7.1.1
       semver: 7.7.4
-      vue-eslint-parser: 10.4.0(eslint@10.2.1(jiti@2.6.1))
+      vue-eslint-parser: 10.4.0(eslint@10.3.0(jiti@2.7.0))
       xml-name-validator: 4.0.0
     optionalDependencies:
-      '@stylistic/eslint-plugin': 5.10.0(eslint@10.2.1(jiti@2.6.1))
-      '@typescript-eslint/parser': 8.58.2(eslint@10.2.1(jiti@2.6.1))(typescript@6.0.3)
+      '@stylistic/eslint-plugin': 5.10.0(eslint@10.3.0(jiti@2.7.0))
+      '@typescript-eslint/parser': 8.59.3(eslint@10.3.0(jiti@2.7.0))(typescript@6.0.3)
 
-  eslint-plugin-yml@3.3.1(eslint@10.2.1(jiti@2.6.1)):
+  eslint-plugin-yml@3.3.2(eslint@10.3.0(jiti@2.7.0)):
     dependencies:
-      '@eslint/core': 1.2.0
-      '@eslint/plugin-kit': 0.6.1
+      '@eslint/core': 1.2.1
+      '@eslint/plugin-kit': 0.7.1
       '@ota-meshi/ast-token-store': 0.3.0
-      debug: 4.4.3(supports-color@8.1.1)
       diff-sequences: 29.6.3
       escape-string-regexp: 5.0.0
-      eslint: 10.2.1(jiti@2.6.1)
+      eslint: 10.3.0(jiti@2.7.0)
       natural-compare: 1.4.0
       yaml-eslint-parser: 2.0.0
-    transitivePeerDependencies:
-      - supports-color
 
-  eslint-processor-vue-blocks@2.0.0(eslint@10.2.1(jiti@2.6.1)):
+  eslint-processor-vue-blocks@2.0.0(eslint@10.3.0(jiti@2.7.0)):
     dependencies:
-      eslint: 10.2.1(jiti@2.6.1)
+      eslint: 10.3.0(jiti@2.7.0)
 
   eslint-scope@9.1.2:
     dependencies:
@@ -13289,9 +12922,9 @@ snapshots:
 
   eslint-visitor-keys@5.0.1: {}
 
-  eslint@10.2.1(jiti@2.6.1):
+  eslint@10.3.0(jiti@2.7.0):
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.1(eslint@10.2.1(jiti@2.6.1))
+      '@eslint-community/eslint-utils': 4.9.1(eslint@10.3.0(jiti@2.7.0))
       '@eslint-community/regexpp': 4.12.2
       '@eslint/config-array': 0.23.5
       '@eslint/config-helpers': 0.5.5
@@ -13318,11 +12951,11 @@ snapshots:
       imurmurhash: 0.1.4
       is-glob: 4.0.3
       json-stable-stringify-without-jsonify: 1.0.1
-      minimatch: 10.2.4
+      minimatch: 10.2.5
       natural-compare: 1.4.0
       optionator: 0.9.4
     optionalDependencies:
-      jiti: 2.6.1
+      jiti: 2.7.0
     transitivePeerDependencies:
       - supports-color
 
@@ -13426,15 +13059,15 @@ snapshots:
 
   fast-levenshtein@2.0.6: {}
 
-  fast-string-truncated-width@1.2.1: {}
+  fast-string-truncated-width@3.0.3: {}
 
-  fast-string-width@1.1.0:
+  fast-string-width@3.0.2:
     dependencies:
-      fast-string-truncated-width: 1.2.1
+      fast-string-truncated-width: 3.0.3
 
-  fast-wrap-ansi@0.1.6:
+  fast-wrap-ansi@0.2.0:
     dependencies:
-      fast-string-width: 1.1.0
+      fast-string-width: 3.0.2
 
   fastq@1.20.1:
     dependencies:
@@ -13501,6 +13134,8 @@ snapshots:
 
   functional-red-black-tree@1.0.1: {}
 
+  fuse.js@7.3.0: {}
+
   gensync@1.0.0-beta.2: {}
 
   get-caller-file@2.0.5: {}
@@ -13513,10 +13148,6 @@ snapshots:
     dependencies:
       pump: 3.0.4
 
-  get-tsconfig@4.13.7:
-    dependencies:
-      resolve-pkg-maps: 1.0.0
-
   get-tsconfig@4.14.0:
     dependencies:
       resolve-pkg-maps: 1.0.0
@@ -13548,7 +13179,7 @@ snapshots:
 
   globals@15.15.0: {}
 
-  globals@17.5.0: {}
+  globals@17.6.0: {}
 
   globrex@0.1.2: {}
 
@@ -13562,7 +13193,7 @@ snapshots:
 
   happy-dom@20.9.0:
     dependencies:
-      '@types/node': 25.6.0
+      '@types/node': 25.7.0
       '@types/whatwg-mimetype': 3.0.2
       '@types/ws': 8.18.1
       entities: 7.0.1
@@ -13727,7 +13358,7 @@ snapshots:
 
   hex-rgb@4.3.0: {}
 
-  hono@4.12.15: {}
+  hono@4.12.18: {}
 
   hosted-git-info@9.0.2:
     dependencies:
@@ -13758,7 +13389,7 @@ snapshots:
     dependencies:
       '@babel/runtime': 7.29.2
 
-  i18next@26.0.8(typescript@6.0.3):
+  i18next@26.1.0(typescript@6.0.3):
     optionalDependencies:
       typescript: 6.0.3
 
@@ -13787,7 +13418,7 @@ snapshots:
 
   image-size@2.0.2: {}
 
-  immer@11.1.4: {}
+  immer@11.1.8: {}
 
   imurmurhash@0.1.4: {}
 
@@ -13874,14 +13505,14 @@ snapshots:
       html-escaper: 2.0.2
       istanbul-lib-report: 3.0.1
 
-  jiti@2.6.1: {}
+  jiti@2.7.0: {}
 
-  jotai@2.19.1(@babel/core@7.29.0)(@babel/template@7.28.6)(@types/react@19.2.14)(react@19.2.5):
+  jotai@2.20.0(@babel/core@7.29.0)(@babel/template@7.28.6)(@types/react@19.2.14)(react@19.2.6):
     optionalDependencies:
       '@babel/core': 7.29.0
       '@babel/template': 7.28.6
       '@types/react': 19.2.14
-      react: 19.2.5
+      react: 19.2.6
 
   js-audio-recorder@1.0.7: {}
 
@@ -13939,22 +13570,22 @@ snapshots:
 
   khroma@2.1.0: {}
 
-  knip@6.7.0(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2):
+  knip@6.13.1(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0):
     dependencies:
       fdir: 6.5.0(picomatch@4.0.4)
       formatly: 0.3.0
       get-tsconfig: 4.14.0
-      jiti: 2.6.1
+      jiti: 2.7.0
       minimist: 1.2.8
-      oxc-parser: 0.127.0
-      oxc-resolver: 11.19.1(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)
+      oxc-parser: 0.130.0
+      oxc-resolver: 11.19.1(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)
       picomatch: 4.0.4
       smol-toml: 1.6.1
       strip-json-comments: 5.0.3
       tinyglobby: 0.2.16
       unbash: 3.0.0
-      yaml: 2.8.3
-      zod: 4.3.6
+      yaml: 2.9.0
+      zod: 4.4.3
     transitivePeerDependencies:
       - '@emnapi/core'
       - '@emnapi/runtime'
@@ -13971,14 +13602,6 @@ snapshots:
     dependencies:
       use-strict: 1.0.1
 
-  langium@4.2.1:
-    dependencies:
-      chevrotain: 11.1.2
-      chevrotain-allstar: 0.3.1(chevrotain@11.1.2)
-      vscode-languageserver: 9.0.1
-      vscode-languageserver-textdocument: 1.0.12
-      vscode-uri: 3.1.0
-
   launch-ide@1.4.3:
     dependencies:
       chalk: 4.1.2
@@ -14057,7 +13680,7 @@ snapshots:
   local-pkg@1.1.2:
     dependencies:
       mlly: 1.8.2
-      pkg-types: 2.3.0
+      pkg-types: 2.3.1
       quansync: 0.2.11
 
   locate-path@6.0.0:
@@ -14080,7 +13703,7 @@ snapshots:
     dependencies:
       js-tokens: 4.0.0
 
-  loro-crdt@1.12.0: {}
+  loro-crdt@1.12.1: {}
 
   loupe@3.2.1: {}
 
@@ -14333,11 +13956,11 @@ snapshots:
 
   merge2@1.4.1: {}
 
-  mermaid@11.14.0:
+  mermaid@11.15.0:
     dependencies:
       '@braintree/sanitize-url': 7.1.2
       '@iconify/utils': 3.1.0
-      '@mermaid-js/parser': 1.1.0
+      '@mermaid-js/parser': 1.1.1
       '@types/d3': 7.4.3
       '@upsetjs/venn.js': 2.0.0
       cytoscape: 3.33.1
@@ -14347,15 +13970,15 @@ snapshots:
       d3-sankey: 0.12.3
       dagre-d3-es: 7.0.14
       dayjs: 1.11.20
-      dompurify: 3.3.2
+      dompurify: 3.4.2
+      es-toolkit: 1.46.1
       katex: 0.16.45
       khroma: 2.1.0
-      lodash-es: 4.18.0
       marked: 16.4.2
       roughjs: 4.6.6
       stylis: 4.3.6
       ts-dedent: 2.2.0
-      uuid: 11.1.0
+      uuid: 14.0.0
 
   micromark-core-commonmark@2.0.3:
     dependencies:
@@ -14662,10 +14285,6 @@ snapshots:
 
   min-indent@1.0.1: {}
 
-  minimatch@10.2.4:
-    dependencies:
-      brace-expansion: 5.0.5
-
   minimatch@10.2.5:
     dependencies:
       brace-expansion: 5.0.5
@@ -14694,7 +14313,7 @@ snapshots:
 
   module-alias@2.3.4: {}
 
-  module-replacements@2.11.0: {}
+  module-replacements@3.0.0-beta.7: {}
 
   moo-color@1.0.3:
     dependencies:
@@ -14723,31 +14342,31 @@ snapshots:
 
   neo-async@2.6.2: {}
 
-  next-themes@0.4.6(react-dom@19.2.5(react@19.2.5))(react@19.2.5):
+  next-themes@0.4.6(react-dom@19.2.6(react@19.2.6))(react@19.2.6):
     dependencies:
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
 
-  next@16.2.4(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5):
+  next@16.2.6(@babel/core@7.29.0)(@playwright/test@1.60.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6):
     dependencies:
-      '@next/env': 16.2.4
+      '@next/env': 16.2.6
       '@swc/helpers': 0.5.15
       baseline-browser-mapping: 2.10.12
       caniuse-lite: 1.0.30001781
-      postcss: 8.4.31
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
-      styled-jsx: 5.1.6(@babel/core@7.29.0)(react@19.2.5)
+      postcss: 8.5.14
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
+      styled-jsx: 5.1.6(@babel/core@7.29.0)(react@19.2.6)
     optionalDependencies:
-      '@next/swc-darwin-arm64': 16.2.4
-      '@next/swc-darwin-x64': 16.2.4
-      '@next/swc-linux-arm64-gnu': 16.2.4
-      '@next/swc-linux-arm64-musl': 16.2.4
-      '@next/swc-linux-x64-gnu': 16.2.4
-      '@next/swc-linux-x64-musl': 16.2.4
-      '@next/swc-win32-arm64-msvc': 16.2.4
-      '@next/swc-win32-x64-msvc': 16.2.4
-      '@playwright/test': 1.59.1
+      '@next/swc-darwin-arm64': 16.2.6
+      '@next/swc-darwin-x64': 16.2.6
+      '@next/swc-linux-arm64-gnu': 16.2.6
+      '@next/swc-linux-arm64-musl': 16.2.6
+      '@next/swc-linux-x64-gnu': 16.2.6
+      '@next/swc-linux-x64-musl': 16.2.6
+      '@next/swc-win32-arm64-msvc': 16.2.6
+      '@next/swc-win32-x64-msvc': 16.2.6
+      '@playwright/test': 1.60.0
       sharp: 0.34.5
     transitivePeerDependencies:
       - '@babel/core'
@@ -14780,12 +14399,12 @@ snapshots:
     dependencies:
       boolbase: 1.0.0
 
-  nuqs@2.8.9(next@16.2.4(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(react@19.2.5):
+  nuqs@2.8.9(next@16.2.6(@babel/core@7.29.0)(@playwright/test@1.60.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(react@19.2.6):
     dependencies:
       '@standard-schema/spec': 1.0.0
-      react: 19.2.5
+      react: 19.2.6
     optionalDependencies:
-      next: 16.2.4(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      next: 16.2.6(@babel/core@7.29.0)(@playwright/test@1.60.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
 
   object-assign@4.1.1: {}
 
@@ -14834,32 +14453,32 @@ snapshots:
       type-check: 0.4.0
       word-wrap: 1.2.5
 
-  oxc-parser@0.127.0:
+  oxc-parser@0.130.0:
     dependencies:
-      '@oxc-project/types': 0.127.0
+      '@oxc-project/types': 0.130.0
     optionalDependencies:
-      '@oxc-parser/binding-android-arm-eabi': 0.127.0
-      '@oxc-parser/binding-android-arm64': 0.127.0
-      '@oxc-parser/binding-darwin-arm64': 0.127.0
-      '@oxc-parser/binding-darwin-x64': 0.127.0
-      '@oxc-parser/binding-freebsd-x64': 0.127.0
-      '@oxc-parser/binding-linux-arm-gnueabihf': 0.127.0
-      '@oxc-parser/binding-linux-arm-musleabihf': 0.127.0
-      '@oxc-parser/binding-linux-arm64-gnu': 0.127.0
-      '@oxc-parser/binding-linux-arm64-musl': 0.127.0
-      '@oxc-parser/binding-linux-ppc64-gnu': 0.127.0
-      '@oxc-parser/binding-linux-riscv64-gnu': 0.127.0
-      '@oxc-parser/binding-linux-riscv64-musl': 0.127.0
-      '@oxc-parser/binding-linux-s390x-gnu': 0.127.0
-      '@oxc-parser/binding-linux-x64-gnu': 0.127.0
-      '@oxc-parser/binding-linux-x64-musl': 0.127.0
-      '@oxc-parser/binding-openharmony-arm64': 0.127.0
-      '@oxc-parser/binding-wasm32-wasi': 0.127.0
-      '@oxc-parser/binding-win32-arm64-msvc': 0.127.0
-      '@oxc-parser/binding-win32-ia32-msvc': 0.127.0
-      '@oxc-parser/binding-win32-x64-msvc': 0.127.0
+      '@oxc-parser/binding-android-arm-eabi': 0.130.0
+      '@oxc-parser/binding-android-arm64': 0.130.0
+      '@oxc-parser/binding-darwin-arm64': 0.130.0
+      '@oxc-parser/binding-darwin-x64': 0.130.0
+      '@oxc-parser/binding-freebsd-x64': 0.130.0
+      '@oxc-parser/binding-linux-arm-gnueabihf': 0.130.0
+      '@oxc-parser/binding-linux-arm-musleabihf': 0.130.0
+      '@oxc-parser/binding-linux-arm64-gnu': 0.130.0
+      '@oxc-parser/binding-linux-arm64-musl': 0.130.0
+      '@oxc-parser/binding-linux-ppc64-gnu': 0.130.0
+      '@oxc-parser/binding-linux-riscv64-gnu': 0.130.0
+      '@oxc-parser/binding-linux-riscv64-musl': 0.130.0
+      '@oxc-parser/binding-linux-s390x-gnu': 0.130.0
+      '@oxc-parser/binding-linux-x64-gnu': 0.130.0
+      '@oxc-parser/binding-linux-x64-musl': 0.130.0
+      '@oxc-parser/binding-openharmony-arm64': 0.130.0
+      '@oxc-parser/binding-wasm32-wasi': 0.130.0
+      '@oxc-parser/binding-win32-arm64-msvc': 0.130.0
+      '@oxc-parser/binding-win32-ia32-msvc': 0.130.0
+      '@oxc-parser/binding-win32-x64-msvc': 0.130.0
 
-  oxc-resolver@11.19.1(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2):
+  oxc-resolver@11.19.1(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0):
     optionalDependencies:
       '@oxc-resolver/binding-android-arm-eabi': 11.19.1
       '@oxc-resolver/binding-android-arm64': 11.19.1
@@ -14877,7 +14496,7 @@ snapshots:
       '@oxc-resolver/binding-linux-x64-gnu': 11.19.1
       '@oxc-resolver/binding-linux-x64-musl': 11.19.1
       '@oxc-resolver/binding-openharmony-arm64': 11.19.1
-      '@oxc-resolver/binding-wasm32-wasi': 11.19.1(@emnapi/core@1.9.2)(@emnapi/runtime@1.9.2)
+      '@oxc-resolver/binding-wasm32-wasi': 11.19.1(@emnapi/core@1.10.0)(@emnapi/runtime@1.10.0)
       '@oxc-resolver/binding-win32-arm64-msvc': 11.19.1
       '@oxc-resolver/binding-win32-ia32-msvc': 11.19.1
       '@oxc-resolver/binding-win32-x64-msvc': 11.19.1
@@ -15058,17 +14677,17 @@ snapshots:
       mlly: 1.8.2
       pathe: 2.0.3
 
-  pkg-types@2.3.0:
+  pkg-types@2.3.1:
     dependencies:
       confbox: 0.2.4
       exsolve: 1.0.8
       pathe: 2.0.3
 
-  playwright-core@1.59.1: {}
+  playwright-core@1.60.0: {}
 
-  playwright@1.59.1:
+  playwright@1.60.0:
     dependencies:
-      playwright-core: 1.59.1
+      playwright-core: 1.60.0
     optionalDependencies:
       fsevents: 2.3.2
 
@@ -15106,13 +14725,7 @@ snapshots:
 
   postcss-value-parser@4.2.0: {}
 
-  postcss@8.4.31:
-    dependencies:
-      nanoid: 3.3.11
-      picocolors: 1.1.1
-      source-map-js: 1.2.1
-
-  postcss@8.5.12:
+  postcss@8.5.14:
     dependencies:
       nanoid: 3.3.11
       picocolors: 1.1.1
@@ -15163,9 +14776,9 @@ snapshots:
 
   punycode@2.3.1: {}
 
-  qrcode.react@4.2.0(react@19.2.5):
+  qrcode.react@4.2.0(react@19.2.6):
     dependencies:
-      react: 19.2.5
+      react: 19.2.6
 
   qs@6.15.1:
     dependencies:
@@ -15190,15 +14803,15 @@ snapshots:
       strip-json-comments: 2.0.1
     optional: true
 
-  re-resizable@6.11.2(react-dom@19.2.5(react@19.2.5))(react@19.2.5):
+  re-resizable@6.11.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6):
     dependencies:
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
 
-  react-18-input-autosize@3.0.0(react@19.2.5):
+  react-18-input-autosize@3.0.0(react@19.2.6):
     dependencies:
       prop-types: 15.8.1
-      react: 19.2.5
+      react: 19.2.6
 
   react-docgen-typescript@2.4.0(typescript@6.0.3):
     dependencies:
@@ -15219,142 +14832,142 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  react-dom@19.2.5(react@19.2.5):
+  react-dom@19.2.6(react@19.2.6):
     dependencies:
-      react: 19.2.5
+      react: 19.2.6
       scheduler: 0.27.0
 
-  react-draggable@4.5.0(react-dom@19.2.5(react@19.2.5))(react@19.2.5):
+  react-draggable@4.5.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6):
     dependencies:
       clsx: 2.1.1
       prop-types: 15.8.1
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
 
-  react-easy-crop@5.5.7(react-dom@19.2.5(react@19.2.5))(react@19.2.5):
+  react-easy-crop@5.5.7(react-dom@19.2.6(react@19.2.6))(react@19.2.6):
     dependencies:
       normalize-wheel: 1.0.1
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
       tslib: 2.8.1
 
-  react-error-boundary@6.1.1(react@19.2.5):
+  react-error-boundary@6.1.1(react@19.2.6):
     dependencies:
-      react: 19.2.5
+      react: 19.2.6
 
   react-fast-compare@3.2.2: {}
 
-  react-hotkeys-hook@5.2.4(react-dom@19.2.5(react@19.2.5))(react@19.2.5):
+  react-hotkeys-hook@5.3.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6):
     dependencies:
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
 
-  react-i18next@16.5.8(i18next@26.0.8(typescript@6.0.3))(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(typescript@6.0.3):
+  react-i18next@16.5.8(i18next@26.1.0(typescript@6.0.3))(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(typescript@6.0.3):
     dependencies:
       '@babel/runtime': 7.29.2
       html-parse-stringify: 3.0.1
-      i18next: 26.0.8(typescript@6.0.3)
-      react: 19.2.5
-      use-sync-external-store: 1.6.0(react@19.2.5)
+      i18next: 26.1.0(typescript@6.0.3)
+      react: 19.2.6
+      use-sync-external-store: 1.6.0(react@19.2.6)
     optionalDependencies:
-      react-dom: 19.2.5(react@19.2.5)
+      react-dom: 19.2.6(react@19.2.6)
       typescript: 6.0.3
 
   react-is@16.13.1: {}
 
   react-is@17.0.2: {}
 
-  react-multi-email@1.0.25(react-dom@19.2.5(react@19.2.5))(react@19.2.5):
+  react-multi-email@1.0.25(react-dom@19.2.6(react@19.2.6))(react@19.2.6):
     dependencies:
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
 
   react-papaparse@4.4.0:
     dependencies:
       '@types/papaparse': 5.5.2
       papaparse: 5.5.3
 
-  react-pdf-highlighter@8.0.0-rc.0(react-dom@19.2.5(react@19.2.5))(react@19.2.5):
+  react-pdf-highlighter@8.0.0-rc.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6):
     dependencies:
       pdfjs-dist: 4.4.168
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
-      react-rnd: 10.5.3(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
+      react-rnd: 10.5.3(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       ts-debounce: 4.0.0
 
-  react-remove-scroll-bar@2.3.8(@types/react@19.2.14)(react@19.2.5):
+  react-remove-scroll-bar@2.3.8(@types/react@19.2.14)(react@19.2.6):
     dependencies:
-      react: 19.2.5
-      react-style-singleton: 2.2.3(@types/react@19.2.14)(react@19.2.5)
+      react: 19.2.6
+      react-style-singleton: 2.2.3(@types/react@19.2.14)(react@19.2.6)
       tslib: 2.8.1
     optionalDependencies:
       '@types/react': 19.2.14
 
-  react-remove-scroll@2.7.2(@types/react@19.2.14)(react@19.2.5):
+  react-remove-scroll@2.7.2(@types/react@19.2.14)(react@19.2.6):
     dependencies:
-      react: 19.2.5
-      react-remove-scroll-bar: 2.3.8(@types/react@19.2.14)(react@19.2.5)
-      react-style-singleton: 2.2.3(@types/react@19.2.14)(react@19.2.5)
+      react: 19.2.6
+      react-remove-scroll-bar: 2.3.8(@types/react@19.2.14)(react@19.2.6)
+      react-style-singleton: 2.2.3(@types/react@19.2.14)(react@19.2.6)
       tslib: 2.8.1
-      use-callback-ref: 1.3.3(@types/react@19.2.14)(react@19.2.5)
-      use-sidecar: 1.1.3(@types/react@19.2.14)(react@19.2.5)
+      use-callback-ref: 1.3.3(@types/react@19.2.14)(react@19.2.6)
+      use-sidecar: 1.1.3(@types/react@19.2.14)(react@19.2.6)
     optionalDependencies:
       '@types/react': 19.2.14
 
-  react-rnd@10.5.3(react-dom@19.2.5(react@19.2.5))(react@19.2.5):
+  react-rnd@10.5.3(react-dom@19.2.6(react@19.2.6))(react@19.2.6):
     dependencies:
-      re-resizable: 6.11.2(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
-      react-draggable: 4.5.0(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      re-resizable: 6.11.2(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
+      react-draggable: 4.5.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       tslib: 2.6.2
 
-  react-server-dom-webpack@19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5):
+  react-server-dom-webpack@19.2.6(react-dom@19.2.6(react@19.2.6))(react@19.2.6):
     dependencies:
       acorn-loose: 8.5.2
       neo-async: 2.6.2
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
       webpack-sources: 3.3.4
 
-  react-sortablejs@6.1.4(@types/sortablejs@1.15.9)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(sortablejs@1.15.7):
+  react-sortablejs@6.1.4(@types/sortablejs@1.15.9)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(sortablejs@1.15.7):
     dependencies:
       '@types/sortablejs': 1.15.9
       classnames: 2.3.1
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
       sortablejs: 1.15.7
       tiny-invariant: 1.2.0
 
-  react-style-singleton@2.2.3(@types/react@19.2.14)(react@19.2.5):
+  react-style-singleton@2.2.3(@types/react@19.2.14)(react@19.2.6):
     dependencies:
       get-nonce: 1.0.1
-      react: 19.2.5
+      react: 19.2.6
       tslib: 2.8.1
     optionalDependencies:
       '@types/react': 19.2.14
 
-  react-textarea-autosize@8.5.9(@types/react@19.2.14)(react@19.2.5):
+  react-textarea-autosize@8.5.9(@types/react@19.2.14)(react@19.2.6):
     dependencies:
       '@babel/runtime': 7.29.2
-      react: 19.2.5
-      use-composed-ref: 1.4.0(@types/react@19.2.14)(react@19.2.5)
-      use-latest: 1.3.0(@types/react@19.2.14)(react@19.2.5)
+      react: 19.2.6
+      use-composed-ref: 1.4.0(@types/react@19.2.14)(react@19.2.6)
+      use-latest: 1.3.0(@types/react@19.2.14)(react@19.2.6)
     transitivePeerDependencies:
       - '@types/react'
 
-  react@19.2.5: {}
+  react@19.2.6: {}
 
-  reactflow@11.11.4(@types/react@19.2.14)(immer@11.1.4)(react-dom@19.2.5(react@19.2.5))(react@19.2.5):
+  reactflow@11.11.4(@types/react@19.2.14)(immer@11.1.8)(react-dom@19.2.6(react@19.2.6))(react@19.2.6):
     dependencies:
-      '@reactflow/background': 11.3.14(@types/react@19.2.14)(immer@11.1.4)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      '@reactflow/controls': 11.2.14(@types/react@19.2.14)(immer@11.1.4)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      '@reactflow/core': 11.11.4(@types/react@19.2.14)(immer@11.1.4)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      '@reactflow/minimap': 11.7.14(@types/react@19.2.14)(immer@11.1.4)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      '@reactflow/node-resizer': 2.2.14(@types/react@19.2.14)(immer@11.1.4)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      '@reactflow/node-toolbar': 1.3.14(@types/react@19.2.14)(immer@11.1.4)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      '@reactflow/background': 11.3.14(@types/react@19.2.14)(immer@11.1.8)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@reactflow/controls': 11.2.14(@types/react@19.2.14)(immer@11.1.8)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@reactflow/core': 11.11.4(@types/react@19.2.14)(immer@11.1.8)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@reactflow/minimap': 11.7.14(@types/react@19.2.14)(immer@11.1.8)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@reactflow/node-resizer': 2.2.14(@types/react@19.2.14)(immer@11.1.8)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      '@reactflow/node-toolbar': 1.3.14(@types/react@19.2.14)(immer@11.1.8)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
     transitivePeerDependencies:
       - '@types/react'
       - immer
@@ -15779,10 +15392,10 @@ snapshots:
 
   std-semver@1.0.8: {}
 
-  storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5):
+  storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)):
     dependencies:
       '@storybook/global': 5.0.0
-      '@storybook/icons': 2.0.1(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@storybook/icons': 2.0.1(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@testing-library/jest-dom': 6.9.1
       '@testing-library/user-event': 14.6.1(@testing-library/dom@10.4.1)
       '@vitest/expect': 3.2.4
@@ -15792,8 +15405,10 @@ snapshots:
       open: 10.2.0
       recast: 0.23.11
       semver: 7.7.4
-      use-sync-external-store: 1.6.0(react@19.2.5)
+      use-sync-external-store: 1.6.0(react@19.2.6)
       ws: 8.20.0
+    optionalDependencies:
+      vite-plus: 0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
     transitivePeerDependencies:
       - '@testing-library/dom'
       - bufferutil
@@ -15801,15 +15416,15 @@ snapshots:
       - react-dom
       - utf-8-validate
 
-  streamdown@2.5.0(react-dom@19.2.5(react@19.2.5))(react@19.2.5):
+  streamdown@2.5.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6):
     dependencies:
       clsx: 2.1.1
       hast-util-to-jsx-runtime: 2.3.6
       html-url-attributes: 3.0.1
       marked: 17.0.5
-      mermaid: 11.14.0
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
+      mermaid: 11.15.0
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
       rehype-harden: 1.1.8
       rehype-raw: 7.0.0
       rehype-sanitize: 6.0.0
@@ -15817,7 +15432,7 @@ snapshots:
       remark-parse: 11.0.0
       remark-rehype: 11.1.2
       remend: 1.3.0
-      tailwind-merge: 3.5.0
+      tailwind-merge: 3.6.0
       unified: 11.0.5
       unist-util-visit: 5.1.0
       unist-util-visit-parents: 6.0.2
@@ -15880,10 +15495,10 @@ snapshots:
     dependencies:
       inline-style-parser: 0.2.7
 
-  styled-jsx@5.1.6(@babel/core@7.29.0)(react@19.2.5):
+  styled-jsx@5.1.6(@babel/core@7.29.0)(react@19.2.6):
     dependencies:
       client-only: 0.0.1
-      react: 19.2.5
+      react: 19.2.6
     optionalDependencies:
       '@babel/core': 7.29.0
 
@@ -15919,11 +15534,11 @@ snapshots:
 
   tailwind-csstree@0.3.1: {}
 
-  tailwind-merge@3.5.0: {}
+  tailwind-merge@3.6.0: {}
 
-  tailwindcss@4.2.4: {}
+  tailwindcss@4.3.0: {}
 
-  tapable@2.3.2: {}
+  tapable@2.3.3: {}
 
   tar-fs@2.1.4:
     dependencies:
@@ -15983,11 +15598,11 @@ snapshots:
 
   tinyspy@4.0.4: {}
 
-  tldts-core@7.0.29: {}
+  tldts-core@7.0.30: {}
 
-  tldts@7.0.29:
+  tldts@7.0.30:
     dependencies:
-      tldts-core: 7.0.29
+      tldts-core: 7.0.30
 
   to-regex-range@5.0.1:
     dependencies:
@@ -16018,11 +15633,6 @@ snapshots:
 
   ts-debounce@4.0.0: {}
 
-  ts-declaration-location@1.0.7(typescript@6.0.3):
-    dependencies:
-      picomatch: 4.0.4
-      typescript: 6.0.3
-
   ts-dedent@2.2.0: {}
 
   ts-pattern@5.9.0: {}
@@ -16034,8 +15644,8 @@ snapshots:
   tsconfig-paths-webpack-plugin@4.2.0:
     dependencies:
       chalk: 4.1.2
-      enhanced-resolve: 5.20.1
-      tapable: 2.3.2
+      enhanced-resolve: 5.21.3
+      tapable: 2.3.3
       tsconfig-paths: 4.2.0
 
   tsconfig-paths@4.2.0:
@@ -16053,7 +15663,7 @@ snapshots:
   tsx@4.21.0:
     dependencies:
       esbuild: 0.27.2
-      get-tsconfig: 4.13.7
+      get-tsconfig: 4.14.0
     optionalDependencies:
       fsevents: 2.3.3
 
@@ -16084,7 +15694,7 @@ snapshots:
 
   unbash@3.0.0: {}
 
-  undici-types@7.19.2: {}
+  undici-types@7.21.0: {}
 
   undici@7.24.0: {}
 
@@ -16172,57 +15782,55 @@ snapshots:
     dependencies:
       punycode: 2.3.1
 
-  use-callback-ref@1.3.3(@types/react@19.2.14)(react@19.2.5):
+  use-callback-ref@1.3.3(@types/react@19.2.14)(react@19.2.6):
     dependencies:
-      react: 19.2.5
+      react: 19.2.6
       tslib: 2.8.1
     optionalDependencies:
       '@types/react': 19.2.14
 
-  use-composed-ref@1.4.0(@types/react@19.2.14)(react@19.2.5):
+  use-composed-ref@1.4.0(@types/react@19.2.14)(react@19.2.6):
     dependencies:
-      react: 19.2.5
+      react: 19.2.6
     optionalDependencies:
       '@types/react': 19.2.14
 
-  use-context-selector@2.0.0(react@19.2.5)(scheduler@0.27.0):
+  use-context-selector@2.0.0(react@19.2.6)(scheduler@0.27.0):
     dependencies:
-      react: 19.2.5
+      react: 19.2.6
       scheduler: 0.27.0
 
-  use-isomorphic-layout-effect@1.2.1(@types/react@19.2.14)(react@19.2.5):
+  use-isomorphic-layout-effect@1.2.1(@types/react@19.2.14)(react@19.2.6):
     dependencies:
-      react: 19.2.5
+      react: 19.2.6
     optionalDependencies:
       '@types/react': 19.2.14
 
-  use-latest@1.3.0(@types/react@19.2.14)(react@19.2.5):
+  use-latest@1.3.0(@types/react@19.2.14)(react@19.2.6):
     dependencies:
-      react: 19.2.5
-      use-isomorphic-layout-effect: 1.2.1(@types/react@19.2.14)(react@19.2.5)
+      react: 19.2.6
+      use-isomorphic-layout-effect: 1.2.1(@types/react@19.2.14)(react@19.2.6)
     optionalDependencies:
       '@types/react': 19.2.14
 
-  use-sidecar@1.1.3(@types/react@19.2.14)(react@19.2.5):
+  use-sidecar@1.1.3(@types/react@19.2.14)(react@19.2.6):
     dependencies:
       detect-node-es: 1.1.0
-      react: 19.2.5
+      react: 19.2.6
       tslib: 2.8.1
     optionalDependencies:
       '@types/react': 19.2.14
 
   use-strict@1.0.1: {}
 
-  use-sync-external-store@1.6.0(react@19.2.5):
+  use-sync-external-store@1.6.0(react@19.2.6):
     dependencies:
-      react: 19.2.5
+      react: 19.2.6
 
   util-arity@1.1.0: {}
 
   util-deprecate@1.0.2: {}
 
-  uuid@11.1.0: {}
-
   uuid@14.0.0: {}
 
   valibot@1.3.1(typescript@6.0.3):
@@ -16249,21 +15857,22 @@ snapshots:
       '@types/unist': 3.0.3
       vfile-message: 4.0.3
 
-  vinext@0.0.45(@mdx-js/rollup@3.1.1)(@vitejs/plugin-react@6.0.1(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))(@vitejs/plugin-rsc@0.5.25(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(react-dom@19.2.5(react@19.2.5))(react-server-dom-webpack@19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(react@19.2.5))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(next@16.2.4(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(react-dom@19.2.5(react@19.2.5))(react-server-dom-webpack@19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(react@19.2.5)(typescript@6.0.3):
+  vinext@0.0.49(@mdx-js/rollup@3.1.1)(@vitejs/plugin-react@6.0.1(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))(@vitejs/plugin-rsc@0.5.26(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(react-dom@19.2.6(react@19.2.6))(react-server-dom-webpack@19.2.6(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(react@19.2.6))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(next@16.2.6(@babel/core@7.29.0)(@playwright/test@1.60.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(react-dom@19.2.6(react@19.2.6))(react-server-dom-webpack@19.2.6(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(react@19.2.6)(typescript@6.0.3):
     dependencies:
-      '@unpic/react': 1.0.2(next@16.2.4(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@unpic/react': 1.0.2(next@16.2.6(@babel/core@7.29.0)(@playwright/test@1.60.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@vercel/og': 0.8.6
-      '@vitejs/plugin-react': 6.0.1(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
+      '@vitejs/plugin-react': 6.0.1(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
+      image-size: 2.0.2
       magic-string: 0.30.21
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
-      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
+      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
       vite-plugin-commonjs: 0.10.4
-      vite-tsconfig-paths: 6.1.1(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(typescript@6.0.3)
+      vite-tsconfig-paths: 6.1.1(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(typescript@6.0.3)
     optionalDependencies:
       '@mdx-js/rollup': 3.1.1
-      '@vitejs/plugin-rsc': 0.5.25(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(react-dom@19.2.5(react@19.2.5))(react-server-dom-webpack@19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(react@19.2.5)
-      react-server-dom-webpack: 19.2.5(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      '@vitejs/plugin-rsc': 0.5.26(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(react-dom@19.2.6(react@19.2.6))(react-server-dom-webpack@19.2.6(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(react@19.2.6)
+      react-server-dom-webpack: 19.2.6(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
     transitivePeerDependencies:
       - next
       - supports-color
@@ -16282,9 +15891,9 @@ snapshots:
       fast-glob: 3.3.3
       magic-string: 0.30.21
 
-  vite-plugin-inspect@12.0.0-beta.1(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(typescript@6.0.3)(ws@8.20.0):
+  vite-plugin-inspect@12.0.0-beta.1(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(typescript@6.0.3)(ws@8.20.0):
     dependencies:
-      '@vitejs/devtools-kit': 0.1.11(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(typescript@6.0.3)(ws@8.20.0)
+      '@vitejs/devtools-kit': 0.1.11(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(typescript@6.0.3)(ws@8.20.0)
       ansis: 4.2.0
       error-stack-parser-es: 1.0.5
       obug: 2.1.1
@@ -16293,31 +15902,31 @@ snapshots:
       perfect-debounce: 2.1.0
       sirv: 3.0.2
       unplugin-utils: 0.3.1
-      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
     transitivePeerDependencies:
       - typescript
       - ws
 
-  vite-plugin-storybook-nextjs@3.2.4(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(next@16.2.4(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(storybook@10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5))(typescript@6.0.3):
+  vite-plugin-storybook-nextjs@3.2.4(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(next@16.2.6(@babel/core@7.29.0)(@playwright/test@1.60.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6))(storybook@10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)))(typescript@6.0.3):
     dependencies:
       '@next/env': 16.0.0
       image-size: 2.0.2
       magic-string: 0.30.21
       module-alias: 2.3.4
-      next: 16.2.4(@babel/core@7.29.0)(@playwright/test@1.59.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
-      storybook: 10.3.5(@testing-library/dom@10.4.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
+      next: 16.2.6(@babel/core@7.29.0)(@playwright/test@1.60.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+      storybook: 10.3.6(@testing-library/dom@10.4.1)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))
       ts-dedent: 2.2.0
-      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
-      vite-tsconfig-paths: 5.1.4(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(typescript@6.0.3)
+      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+      vite-tsconfig-paths: 5.1.4(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(typescript@6.0.3)
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  vite-plus@0.1.20(@types/node@25.6.0)(@vitest/coverage-v8@4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3):
+  vite-plus@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3):
     dependencies:
       '@oxc-project/types': 0.127.0
-      '@voidzero-dev/vite-plus-core': 0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
-      '@voidzero-dev/vite-plus-test': 0.1.20(@types/node@25.6.0)(@vitest/coverage-v8@4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
+      '@voidzero-dev/vite-plus-core': 0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
+      '@voidzero-dev/vite-plus-test': 0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)
       oxfmt: 0.46.0
       oxlint: 1.61.0(oxlint-tsgolint@0.22.0)
       oxlint-tsgolint: 0.22.0
@@ -16360,36 +15969,36 @@ snapshots:
       - vite
       - yaml
 
-  vite-tsconfig-paths@5.1.4(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(typescript@6.0.3):
+  vite-tsconfig-paths@5.1.4(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(typescript@6.0.3):
     dependencies:
       debug: 4.4.3(supports-color@8.1.1)
       globrex: 0.1.2
       tsconfck: 3.1.6(typescript@6.0.3)
     optionalDependencies:
-      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  vite-tsconfig-paths@6.1.1(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(typescript@6.0.3):
+  vite-tsconfig-paths@6.1.1(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(typescript@6.0.3):
     dependencies:
       debug: 4.4.3(supports-color@8.1.1)
       globrex: 0.1.2
       tsconfck: 3.1.6(typescript@6.0.3)
-      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  vitefu@1.1.3(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)):
+  vitefu@1.1.3(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)):
     optionalDependencies:
-      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+      vite: '@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
 
-  vitest-browser-react@2.2.0(@types/node@25.6.0)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(@vitest/coverage-v8@4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(react-dom@19.2.5(react@19.2.5))(react@19.2.5)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3):
+  vitest-browser-react@2.2.0(@types/node@25.7.0)(@types/react-dom@19.2.3(@types/react@19.2.14))(@types/react@19.2.14)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3):
     dependencies:
-      react: 19.2.5
-      react-dom: 19.2.5(react@19.2.5)
-      vitest: '@voidzero-dev/vite-plus-test@0.1.20(@types/node@25.6.0)(@vitest/coverage-v8@4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+      react: 19.2.6
+      react-dom: 19.2.6(react@19.2.6)
+      vitest: '@voidzero-dev/vite-plus-test@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
     optionalDependencies:
       '@types/react': 19.2.14
       '@types/react-dom': 19.2.3(@types/react@19.2.14)
@@ -16423,35 +16032,20 @@ snapshots:
       - vite
       - yaml
 
-  vitest-canvas-mock@1.1.4(@voidzero-dev/vite-plus-test@0.1.20(@types/node@25.6.0)(@vitest/coverage-v8@4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)):
+  vitest-canvas-mock@1.1.4(@voidzero-dev/vite-plus-test@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)):
     dependencies:
       cssfontparser: 1.2.1
       moo-color: 1.0.3
-      vitest: '@voidzero-dev/vite-plus-test@0.1.20(@types/node@25.6.0)(@vitest/coverage-v8@4.1.5(@types/node@25.6.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.6.0)(esbuild@0.27.2)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.6.1)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
+      vitest: '@voidzero-dev/vite-plus-test@0.1.20(@types/node@25.7.0)(@vitest/coverage-v8@4.1.6(@types/node@25.7.0)(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(@voidzero-dev/vite-plus-core@0.1.20(@types/node@25.7.0)(esbuild@0.27.2)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3))(esbuild@0.27.2)(happy-dom@20.9.0)(jiti@2.7.0)(tsx@4.21.0)(typescript@6.0.3)(yaml@2.8.3)'
 
   void-elements@3.1.0: {}
 
-  vscode-jsonrpc@8.2.0: {}
-
-  vscode-languageserver-protocol@3.17.5:
-    dependencies:
-      vscode-jsonrpc: 8.2.0
-      vscode-languageserver-types: 3.17.5
-
-  vscode-languageserver-textdocument@1.0.12: {}
-
-  vscode-languageserver-types@3.17.5: {}
-
-  vscode-languageserver@9.0.1:
-    dependencies:
-      vscode-languageserver-protocol: 3.17.5
-
   vscode-uri@3.1.0: {}
 
-  vue-eslint-parser@10.4.0(eslint@10.2.1(jiti@2.6.1)):
+  vue-eslint-parser@10.4.0(eslint@10.3.0(jiti@2.7.0)):
     dependencies:
       debug: 4.4.3(supports-color@8.1.1)
-      eslint: 10.2.1(jiti@2.6.1)
+      eslint: 10.3.0(jiti@2.7.0)
       eslint-scope: 9.1.2
       eslint-visitor-keys: 5.0.1
       espree: 11.2.0
@@ -16524,6 +16118,8 @@ snapshots:
 
   yaml@2.8.3: {}
 
+  yaml@2.9.0: {}
+
   yargs-parser@21.1.1: {}
 
   yargs@17.7.2:
@@ -16556,70 +16152,219 @@ snapshots:
 
   zen-observable@0.10.0: {}
 
-  zod@4.3.6: {}
+  zod@4.4.3: {}
 
   zrender@6.0.0:
     dependencies:
       tslib: 2.3.0
 
-  zundo@2.3.0(zustand@5.0.12(@types/react@19.2.14)(immer@11.1.4)(react@19.2.5)(use-sync-external-store@1.6.0(react@19.2.5))):
+  zundo@2.3.0(zustand@5.0.13(@types/react@19.2.14)(immer@11.1.8)(react@19.2.6)(use-sync-external-store@1.6.0(react@19.2.6))):
     dependencies:
-      zustand: 5.0.12(@types/react@19.2.14)(immer@11.1.4)(react@19.2.5)(use-sync-external-store@1.6.0(react@19.2.5))
+      zustand: 5.0.13(@types/react@19.2.14)(immer@11.1.8)(react@19.2.6)(use-sync-external-store@1.6.0(react@19.2.6))
 
-  zustand@4.5.7(@types/react@19.2.14)(immer@11.1.4)(react@19.2.5):
+  zustand@4.5.7(@types/react@19.2.14)(immer@11.1.8)(react@19.2.6):
     dependencies:
-      use-sync-external-store: 1.6.0(react@19.2.5)
+      use-sync-external-store: 1.6.0(react@19.2.6)
     optionalDependencies:
       '@types/react': 19.2.14
-      immer: 11.1.4
-      react: 19.2.5
+      immer: 11.1.8
+      react: 19.2.6
 
-  zustand@5.0.12(@types/react@19.2.14)(immer@11.1.4)(react@19.2.5)(use-sync-external-store@1.6.0(react@19.2.5)):
+  zustand@5.0.13(@types/react@19.2.14)(immer@11.1.8)(react@19.2.6)(use-sync-external-store@1.6.0(react@19.2.6)):
     optionalDependencies:
       '@types/react': 19.2.14
-      immer: 11.1.4
-      react: 19.2.5
-      use-sync-external-store: 1.6.0(react@19.2.5)
+      immer: 11.1.8
+      react: 19.2.6
+      use-sync-external-store: 1.6.0(react@19.2.6)
 
   zwitch@2.0.4: {}
 
 time:
-  '@amplitude/analytics-browser@2.42.0': '2026-04-28T17:01:08.442Z'
-  '@amplitude/plugin-session-replay-browser@1.28.1': '2026-04-28T17:01:37.145Z'
-  '@hey-api/openapi-ts@0.97.0': '2026-04-28T03:33:22.380Z'
-  '@hono/node-server@2.0.0': '2026-04-21T00:25:40.852Z'
+  '@amplitude/analytics-browser@2.42.2': '2026-05-11T17:04:38.650Z'
+  '@amplitude/plugin-session-replay-browser@1.30.3': '2026-05-11T20:01:33.769Z'
+  '@antfu/eslint-config@9.0.0': '2026-05-11T06:18:58.474Z'
+  '@base-ui/react@1.4.1': '2026-04-20T12:24:35.520Z'
+  '@chromatic-com/storybook@5.1.2': '2026-04-13T12:24:15.881Z'
+  '@cucumber/cucumber@12.8.3': '2026-05-09T07:25:30.576Z'
+  '@egoist/tailwindcss-icons@1.9.2': '2026-01-31T10:48:44.594Z'
+  '@emoji-mart/data@1.2.1': '2024-04-25T15:36:14.556Z'
+  '@eslint-react/eslint-plugin@5.7.7': '2026-05-12T10:42:48.233Z'
+  '@eslint/js@10.0.1': '2026-02-06T22:34:56.290Z'
+  '@floating-ui/react@0.27.19': '2026-03-03T03:02:09.664Z'
+  '@formatjs/intl-localematcher@0.8.7': '2026-05-12T12:17:56.565Z'
+  '@heroicons/react@2.2.0': '2024-11-18T15:33:27.317Z'
+  '@hey-api/openapi-ts@0.97.1': '2026-05-04T00:37:14.271Z'
+  '@hono/node-server@2.0.2': '2026-05-08T08:30:59.667Z'
+  '@iconify-json/heroicons@1.2.3': '2025-09-20T05:33:02.364Z'
+  '@iconify-json/ri@1.2.10': '2026-02-10T08:41:46.666Z'
   '@lexical/link@0.44.0': '2026-04-27T14:47:45.477Z'
   '@lexical/list@0.44.0': '2026-04-27T14:47:48.463Z'
   '@lexical/react@0.44.0': '2026-04-27T14:48:07.316Z'
   '@lexical/selection@0.44.0': '2026-04-27T14:48:15.054Z'
   '@lexical/text@0.44.0': '2026-04-27T14:48:23.958Z'
   '@lexical/utils@0.44.0': '2026-04-27T14:48:26.689Z'
-  '@orpc/contract@1.14.0': '2026-04-22T14:03:55.170Z'
-  '@tanstack/eslint-plugin-query@5.100.6': '2026-04-28T16:39:45.129Z'
+  '@mdx-js/loader@3.1.1': '2025-08-29T18:03:05.606Z'
+  '@mdx-js/react@3.1.1': '2025-08-29T18:02:56.462Z'
+  '@mdx-js/rollup@3.1.1': '2025-08-29T18:03:10.680Z'
+  '@monaco-editor/react@4.7.0': '2025-02-13T16:13:41.390Z'
+  '@next/eslint-plugin-next@16.2.6': '2026-05-07T19:01:24.678Z'
+  '@next/mdx@16.2.6': '2026-05-07T19:01:57.704Z'
+  '@orpc/client@1.14.3': '2026-05-12T06:29:27.973Z'
+  '@orpc/contract@1.14.3': '2026-05-12T06:29:34.868Z'
+  '@orpc/openapi-client@1.14.3': '2026-05-12T06:30:36.375Z'
+  '@orpc/tanstack-query@1.14.3': '2026-05-12T06:29:53.016Z'
+  '@playwright/test@1.60.0': '2026-05-11T19:09:45.394Z'
+  '@remixicon/react@4.9.0': '2026-01-29T10:53:18.993Z'
+  '@rgrove/parse-xml@4.2.0': '2024-10-25T03:58:22.145Z'
+  '@sentry/react@10.53.1': '2026-05-12T17:08:04.309Z'
+  '@storybook/addon-docs@10.3.6': '2026-04-29T14:02:41.653Z'
+  '@storybook/addon-links@10.3.6': '2026-04-29T14:02:45.236Z'
+  '@storybook/addon-onboarding@10.3.6': '2026-04-29T14:02:45.520Z'
+  '@storybook/addon-themes@10.3.6': '2026-04-29T14:02:49.188Z'
+  '@storybook/nextjs-vite@10.3.6': '2026-04-29T14:03:05.454Z'
+  '@storybook/react-vite@10.3.6': '2026-04-29T14:03:11.708Z'
+  '@storybook/react@10.3.6': '2026-04-29T14:03:45.907Z'
+  '@streamdown/math@1.0.2': '2026-02-09T17:31:31.085Z'
+  '@svgdotjs/svg.js@3.2.5': '2025-09-15T16:22:12.771Z'
+  '@t3-oss/env-nextjs@0.13.11': '2026-03-22T19:16:09.026Z'
+  '@tailwindcss/postcss@4.3.0': '2026-05-08T20:25:42.926Z'
+  '@tailwindcss/typography@0.5.19': '2025-09-24T14:49:08.735Z'
+  '@tailwindcss/vite@4.3.0': '2026-05-08T20:25:50.670Z'
+  '@tanstack/eslint-plugin-query@5.100.10': '2026-05-11T14:10:59.904Z'
+  '@tanstack/react-devtools@0.10.3': '2026-05-11T08:37:06.520Z'
+  '@tanstack/react-form-devtools@0.2.27': '2026-05-10T22:35:01.854Z'
+  '@tanstack/react-form@1.32.0': '2026-05-10T22:35:03.027Z'
   '@tanstack/react-hotkeys@0.10.0': '2026-04-25T12:28:06.989Z'
-  '@tanstack/react-query-devtools@5.100.6': '2026-04-28T16:39:51.334Z'
-  '@tanstack/react-query@5.100.6': '2026-04-28T16:39:52.105Z'
-  '@tsslint/cli@3.1.0': '2026-04-29T04:57:38.423Z'
-  '@tsslint/compat-eslint@3.1.0': '2026-04-29T04:57:34.593Z'
-  '@tsslint/config@3.1.0': '2026-04-29T04:57:36.446Z'
+  '@tanstack/react-query-devtools@5.100.10': '2026-05-11T14:11:05.796Z'
+  '@tanstack/react-query@5.100.10': '2026-05-11T14:11:06.587Z'
+  '@tanstack/react-virtual@3.13.24': '2026-04-17T11:51:33.949Z'
+  '@testing-library/dom@10.4.1': '2025-07-27T13:23:37.151Z'
+  '@testing-library/jest-dom@6.9.1': '2025-10-01T20:04:22.720Z'
+  '@testing-library/react@16.3.2': '2026-01-19T10:59:08.185Z'
+  '@testing-library/user-event@14.6.1': '2025-01-21T17:35:55.574Z'
+  '@tsslint/cli@3.1.2': '2026-05-12T07:48:27.034Z'
+  '@tsslint/compat-eslint@3.1.2': '2026-05-12T07:48:22.237Z'
+  '@tsslint/config@3.1.2': '2026-05-12T07:48:24.338Z'
+  '@types/js-cookie@3.0.6': '2023-11-07T08:41:16.889Z'
   '@types/js-yaml@4.0.9': '2023-11-07T20:20:13.264Z'
-  '@types/node@25.6.0': '2026-04-10T03:39:59.421Z'
-  '@typescript-eslint/eslint-plugin@8.59.1': '2026-04-27T17:31:50.020Z'
-  '@typescript-eslint/parser@8.59.1': '2026-04-27T17:31:29.147Z'
-  '@typescript/native-preview@7.0.0-dev.20260428.1': '2026-04-28T08:09:51.266Z'
+  '@types/negotiator@0.6.4': '2025-06-07T02:18:17.532Z'
+  '@types/node@25.7.0': '2026-05-11T20:06:54.429Z'
+  '@types/qs@6.15.1': '2026-05-06T23:46:01.024Z'
+  '@types/react-dom@19.2.3': '2025-11-12T04:37:39.524Z'
+  '@types/react@19.2.14': '2026-02-11T11:44:58.515Z'
+  '@types/sortablejs@1.15.9': '2025-10-24T04:31:45.132Z'
+  '@typescript-eslint/eslint-plugin@8.59.3': '2026-05-11T17:41:15.039Z'
+  '@typescript-eslint/parser@8.59.3': '2026-05-11T17:40:54.181Z'
+  '@typescript/native-preview@7.0.0-dev.20260512.1': '2026-05-12T07:57:54.400Z'
+  '@vitejs/plugin-react@6.0.1': '2026-03-13T10:43:19.598Z'
+  '@vitejs/plugin-rsc@0.5.26': '2026-05-07T02:07:38.518Z'
+  '@vitest/coverage-v8@4.1.6': '2026-05-11T14:38:12.233Z'
   '@voidzero-dev/vite-plus-core@0.1.20': '2026-04-29T03:08:39.629Z'
   '@voidzero-dev/vite-plus-test@0.1.20': '2026-04-29T03:08:45.501Z'
+  abcjs@6.6.3: '2026-04-24T17:38:01.079Z'
+  agentation@3.0.2: '2026-03-25T16:24:19.682Z'
+  ahooks@3.9.7: '2026-03-23T15:49:13.605Z'
+  c12@4.0.0-beta.5: '2026-05-06T17:28:34.367Z'
+  class-variance-authority@0.7.1: '2024-11-26T08:20:34.604Z'
+  client-only@0.0.1: '2022-09-03T01:07:11.981Z'
+  clsx@2.1.1: '2024-04-23T05:26:04.645Z'
+  cmdk@1.1.1: '2025-03-14T19:21:16.194Z'
+  code-inspector-plugin@1.5.1: '2026-04-03T03:44:06.420Z'
   concurrently@9.2.1: '2025-08-25T09:50:49.138Z'
   copy-to-clipboard@4.0.2: '2026-04-24T22:15:18.933Z'
-  eslint-markdown@0.7.0: '2026-04-25T11:31:20.226Z'
+  cron-parser@5.5.0: '2026-01-16T13:14:50.225Z'
+  dayjs@1.11.20: '2026-03-12T11:30:39.315Z'
+  decimal.js@10.6.0: '2025-07-06T22:50:38.844Z'
+  dompurify@3.4.2: '2026-04-30T15:45:30.615Z'
+  echarts-for-react@3.0.6: '2026-01-21T04:38:21.243Z'
+  echarts@6.0.0: '2025-07-30T02:38:34.897Z'
+  elkjs@0.11.1: '2026-03-03T12:21:48.463Z'
+  embla-carousel-autoplay@8.6.0: '2025-04-04T17:37:46.303Z'
+  embla-carousel-react@8.6.0: '2025-04-04T17:37:53.976Z'
+  emoji-mart@5.6.0: '2024-04-25T14:22:21.440Z'
+  es-toolkit@1.46.1: '2026-04-29T09:42:09.686Z'
+  eslint-markdown@0.9.0: '2026-05-07T02:56:36.428Z'
   eslint-plugin-better-tailwindcss@4.5.0: '2026-04-28T06:24:47.281Z'
-  eslint@10.2.1: '2026-04-17T20:17:44.852Z'
-  i18next@26.0.8: '2026-04-24T19:20:14.685Z'
+  eslint-plugin-hyoban@0.14.1: '2026-03-08T02:51:00.805Z'
+  eslint-plugin-markdown-preferences@0.41.1: '2026-04-09T23:28:41.552Z'
+  eslint-plugin-no-barrel-files@1.3.1: '2026-04-12T18:28:18.653Z'
+  eslint-plugin-react-refresh@0.5.2: '2026-02-23T19:49:32.404Z'
+  eslint-plugin-sonarjs@4.0.3: '2026-04-16T08:09:42.856Z'
+  eslint-plugin-storybook@10.3.6: '2026-04-29T14:03:32.305Z'
+  eslint@10.3.0: '2026-05-01T15:39:41.045Z'
+  fast-deep-equal@3.1.3: '2020-06-08T07:27:28.474Z'
+  fuse.js@7.3.0: '2026-04-04T16:58:52.671Z'
+  happy-dom@20.9.0: '2026-04-13T22:55:15.313Z'
+  hast-util-to-jsx-runtime@2.3.6: '2025-03-05T11:30:29.166Z'
+  hono@4.12.18: '2026-05-06T11:32:30.638Z'
+  html-entities@2.6.0: '2025-03-30T15:40:10.885Z'
+  html-to-image@1.11.13: '2025-02-14T01:43:48.709Z'
+  i18next-resources-to-backend@1.2.1: '2024-04-10T19:22:23.117Z'
+  i18next@26.1.0: '2026-05-11T07:37:25.367Z'
+  iconify-import-svg@0.2.0: '2026-04-20T06:18:25.132Z'
+  immer@11.1.8: '2026-05-08T15:09:33.021Z'
+  jotai@2.20.0: '2026-05-06T01:10:00.036Z'
+  js-audio-recorder@1.0.7: '2021-01-09T10:20:49.923Z'
+  js-cookie@3.0.5: '2023-04-24T09:23:51.443Z'
   js-yaml@4.1.1: '2025-11-12T15:18:03.524Z'
+  jsonschema@1.5.0: '2025-01-07T15:09:11.287Z'
+  katex@0.16.45: '2026-04-05T13:32:39.675Z'
+  knip@6.13.1: '2026-05-12T15:13:42.631Z'
+  ky@2.0.2: '2026-04-21T08:58:46.923Z'
+  lamejs@1.2.1: '2021-12-02T15:44:40.036Z'
+  lexical-code-no-prism@0.41.0: '2026-03-08T16:50:40.266Z'
   lexical@0.44.0: '2026-04-27T14:47:00.970Z'
-  tldts@7.0.29: '2026-04-28T12:21:32.710Z'
+  loro-crdt@1.12.1: '2026-04-29T20:11:51.397Z'
+  mermaid@11.15.0: '2026-05-11T11:15:09.824Z'
+  mime@4.1.0: '2025-09-12T17:53:01.376Z'
+  mitt@3.0.1: '2023-07-04T17:31:47.638Z'
+  negotiator@1.0.0: '2024-08-31T15:42:18.280Z'
+  next-themes@0.4.6: '2025-03-11T21:02:05.882Z'
+  next@16.2.6: '2026-05-07T19:01:54.751Z'
+  nuqs@2.8.9: '2026-02-27T15:51:04.508Z'
+  pinyin-pro@3.28.1: '2026-04-10T09:18:57.903Z'
+  playwright@1.60.0: '2026-05-11T19:09:33.114Z'
+  postcss@8.5.14: '2026-05-04T16:43:35.284Z'
+  qrcode.react@4.2.0: '2024-12-11T17:22:40.569Z'
+  qs@6.15.1: '2026-04-08T19:37:55.541Z'
+  react-18-input-autosize@3.0.0: '2022-08-05T17:22:57.225Z'
+  react-dom@19.2.6: '2026-05-06T16:16:56.080Z'
+  react-easy-crop@5.5.7: '2026-03-24T09:41:01.114Z'
+  react-hotkeys-hook@5.3.2: '2026-05-05T13:01:00.987Z'
+  react-i18next@16.5.8: '2026-03-11T14:19:02.440Z'
+  react-multi-email@1.0.25: '2024-07-18T04:31:06.176Z'
+  react-papaparse@4.4.0: '2023-10-13T10:27:07.978Z'
+  react-pdf-highlighter@8.0.0-rc.0: '2024-09-14T16:57:58.673Z'
+  react-server-dom-webpack@19.2.6: '2026-05-06T16:17:00.307Z'
+  react-sortablejs@6.1.4: '2022-05-31T07:19:03.552Z'
+  react-textarea-autosize@8.5.9: '2025-03-30T22:13:11.081Z'
+  react@19.2.6: '2026-05-06T16:16:47.653Z'
+  reactflow@11.11.4: '2024-06-20T11:31:29.797Z'
+  remark-breaks@4.0.0: '2023-09-22T16:45:41.061Z'
+  remark-directive@4.0.0: '2025-02-27T15:15:20.630Z'
+  scheduler@0.27.0: '2025-10-01T21:39:15.208Z'
+  sharp@0.34.5: '2025-11-06T14:19:40.989Z'
+  shiki@4.0.2: '2026-03-09T02:23:34.958Z'
+  socket.io-client@4.8.3: '2025-12-23T16:39:16.428Z'
+  sortablejs@1.15.7: '2026-02-11T22:42:31.720Z'
+  std-semver@1.0.8: '2026-03-09T17:23:55.795Z'
+  storybook@10.3.6: '2026-04-29T14:02:57.716Z'
+  streamdown@2.5.0: '2026-03-17T17:35:05.216Z'
+  string-ts@2.3.1: '2025-11-28T17:33:10.099Z'
+  tailwind-merge@3.6.0: '2026-05-10T12:56:43.142Z'
+  tailwindcss@4.3.0: '2026-05-08T20:25:26.174Z'
+  tldts@7.0.30: '2026-05-02T12:56:41.650Z'
+  tsx@4.21.0: '2025-11-30T15:56:09.488Z'
   typescript@6.0.3: '2026-04-16T23:38:27.905Z'
+  uglify-js@3.19.3: '2024-08-29T13:49:01.316Z'
+  unist-util-visit@5.1.0: '2026-01-22T19:02:58.977Z'
+  use-context-selector@2.0.0: '2024-05-06T11:23:59.259Z'
   uuid@14.0.0: '2026-04-19T15:15:42.302Z'
-  vinext@0.0.45: '2026-04-28T11:43:03.463Z'
+  vinext@0.0.49: '2026-05-06T20:21:33.910Z'
+  vite-plugin-inspect@12.0.0-beta.1: '2026-03-24T10:42:21.306Z'
   vite-plus@0.1.20: '2026-04-29T03:08:50.317Z'
-  zod@4.3.6: '2026-01-22T19:14:35.382Z'
+  vitest-browser-react@2.2.0: '2026-04-05T06:56:34.635Z'
+  vitest-canvas-mock@1.1.4: '2026-03-24T14:42:39.285Z'
+  zod@4.4.3: '2026-05-04T07:06:40.819Z'
+  zundo@2.3.0: '2024-11-17T16:35:11.372Z'
+  zustand@5.0.13: '2026-05-05T00:04:17.510Z'
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index b0c007ee4d..8b06c92a52 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -2,7 +2,7 @@ saveExact: true
 catalogMode: prefer
 dedupeDirectDeps: true
 engineStrict: true
-minimumReleaseAge: 1440
+minimumReleaseAge: 0
 optimisticRepeatInstall: true
 verifyDepsBeforeRun: install
 resolutionMode: time-based
@@ -30,7 +30,10 @@ overrides:
   '@monaco-editor/loader': 1.7.0
   brace-expansion@>=2.0.0 <2.0.3: 2.0.3
   canvas: ^3.2.2
-  dompurify@>=3.1.3 <=3.3.1: 3.3.2
+  dompurify@<3.4.0: ^3.4.0
+  dompurify@<=3.3.3: ^3.3.4
+  dompurify@>=1.0.10 <3.4.0: ^3.4.0
+  dompurify@>=3.0.1 <3.4.0: ^3.4.0
   esbuild@<0.27.2: 0.27.2
   flatted@<=3.4.1: 3.4.2
   glob@>=10.2.0 <10.5.0: 11.1.0
@@ -39,6 +42,7 @@ overrides:
   lodash@>=4.0.0 <= 4.17.23: 4.18.0
   picomatch@<2.3.2: 2.3.2
   picomatch@>=4.0.0 <4.0.4: 4.0.4
+  postcss@<8.5.10: ^8.5.10
   rollup@>=4.0.0 <4.59.0: 4.59.0
   safe-buffer: ^5.2.1
   safer-buffer: npm:@nolyfill/safer-buffer@^1.0.44
@@ -54,22 +58,21 @@ overrides:
   yaml@>=2.0.0 <2.8.3: 2.8.3
   yauzl@<3.2.1: 3.2.1
 catalog:
-  '@amplitude/analytics-browser': 2.42.0
-  '@amplitude/plugin-session-replay-browser': 1.28.1
-  '@antfu/eslint-config': 8.2.0
+  '@amplitude/analytics-browser': 2.42.2
+  '@amplitude/plugin-session-replay-browser': 1.30.3
+  '@antfu/eslint-config': 9.0.0
   '@base-ui/react': 1.4.1
   '@chromatic-com/storybook': 5.1.2
-  '@cucumber/cucumber': 12.8.2
+  '@cucumber/cucumber': 12.8.3
   '@egoist/tailwindcss-icons': 1.9.2
   '@emoji-mart/data': 1.2.1
-  '@eslint-react/eslint-plugin': 3.0.0
+  '@eslint-react/eslint-plugin': 5.7.7
   '@eslint/js': 10.0.1
   '@floating-ui/react': 0.27.19
-  '@formatjs/intl-localematcher': 0.8.4
-  '@headlessui/react': 2.2.10
+  '@formatjs/intl-localematcher': 0.8.7
   '@heroicons/react': 2.2.0
-  '@hey-api/openapi-ts': 0.97.0
-  '@hono/node-server': 2.0.0
+  '@hey-api/openapi-ts': 0.97.1
+  '@hono/node-server': 2.0.2
   '@iconify-json/heroicons': 1.2.3
   '@iconify-json/ri': 1.2.10
   '@lexical/code': 0.44.0
@@ -83,61 +86,62 @@ catalog:
   '@mdx-js/react': 3.1.1
   '@mdx-js/rollup': 3.1.1
   '@monaco-editor/react': 4.7.0
-  '@next/eslint-plugin-next': 16.2.4
-  '@next/mdx': 16.2.4
-  '@orpc/client': 1.14.0
-  '@orpc/contract': 1.14.0
-  '@orpc/openapi-client': 1.14.0
-  '@orpc/tanstack-query': 1.14.0
-  '@playwright/test': 1.59.1
+  '@next/eslint-plugin-next': 16.2.6
+  '@next/mdx': 16.2.6
+  '@orpc/client': 1.14.3
+  '@orpc/contract': 1.14.3
+  '@orpc/openapi-client': 1.14.3
+  '@orpc/tanstack-query': 1.14.3
+  '@playwright/test': 1.60.0
   '@remixicon/react': 4.9.0
   '@rgrove/parse-xml': 4.2.0
-  '@sentry/react': 10.50.0
-  '@storybook/addon-docs': 10.3.5
-  '@storybook/addon-links': 10.3.5
-  '@storybook/addon-onboarding': 10.3.5
-  '@storybook/addon-themes': 10.3.5
-  '@storybook/nextjs-vite': 10.3.5
-  '@storybook/react': 10.3.5
-  '@storybook/react-vite': 10.3.5
+  '@sentry/react': 10.53.1
+  '@storybook/addon-docs': 10.3.6
+  '@storybook/addon-links': 10.3.6
+  '@storybook/addon-onboarding': 10.3.6
+  '@storybook/addon-themes': 10.3.6
+  '@storybook/nextjs-vite': 10.3.6
+  '@storybook/react': 10.3.6
+  '@storybook/react-vite': 10.3.6
   '@streamdown/math': 1.0.2
   '@svgdotjs/svg.js': 3.2.5
   '@t3-oss/env-nextjs': 0.13.11
-  '@tailwindcss/postcss': 4.2.4
+  '@tailwindcss/postcss': 4.3.0
   '@tailwindcss/typography': 0.5.19
-  '@tailwindcss/vite': 4.2.4
-  '@tanstack/eslint-plugin-query': 5.100.6
-  '@tanstack/react-devtools': 0.10.2
-  '@tanstack/react-form': 1.29.1
-  '@tanstack/react-form-devtools': 0.2.22
+  '@tailwindcss/vite': 4.3.0
+  '@tanstack/eslint-plugin-query': 5.100.10
+  '@tanstack/react-devtools': 0.10.3
+  '@tanstack/react-form': 1.32.0
+  '@tanstack/react-form-devtools': 0.2.27
   '@tanstack/react-hotkeys': 0.10.0
-  '@tanstack/react-query': 5.100.6
-  '@tanstack/react-query-devtools': 5.100.6
+  '@tanstack/react-query': 5.100.10
+  '@tanstack/react-query-devtools': 5.100.10
   '@tanstack/react-virtual': 3.13.24
   '@testing-library/dom': 10.4.1
   '@testing-library/jest-dom': 6.9.1
   '@testing-library/react': 16.3.2
   '@testing-library/user-event': 14.6.1
-  '@tsslint/cli': 3.1.0
-  '@tsslint/compat-eslint': 3.1.0
-  '@tsslint/config': 3.1.0
+  '@tsslint/cli': 3.1.2
+  '@tsslint/compat-eslint': 3.1.2
+  '@tsslint/config': 3.1.2
   '@types/js-cookie': 3.0.6
   '@types/js-yaml': 4.0.9
   '@types/negotiator': 0.6.4
-  '@types/node': 25.6.0
-  '@types/qs': 6.15.0
+  '@types/node': 25.7.0
+  '@types/qs': 6.15.1
   '@types/react': 19.2.14
   '@types/react-dom': 19.2.3
   '@types/sortablejs': 1.15.9
-  '@typescript-eslint/eslint-plugin': 8.59.1
-  '@typescript-eslint/parser': 8.59.1
-  '@typescript/native-preview': 7.0.0-dev.20260428.1
+  '@typescript-eslint/eslint-plugin': 8.59.3
+  '@typescript-eslint/parser': 8.59.3
+  '@typescript/native-preview': 7.0.0-dev.20260512.1
   '@vitejs/plugin-react': 6.0.1
-  '@vitejs/plugin-rsc': 0.5.25
-  '@vitest/coverage-v8': 4.1.5
+  '@vitejs/plugin-rsc': 0.5.26
+  '@vitest/coverage-v8': 4.1.6
   abcjs: 6.6.3
   agentation: 3.0.2
   ahooks: 3.9.7
+  c12: 4.0.0-beta.5
   class-variance-authority: 0.7.1
   client-only: 0.0.1
   clsx: 2.1.1
@@ -148,66 +152,67 @@ catalog:
   cron-parser: 5.5.0
   dayjs: 1.11.20
   decimal.js: 10.6.0
-  dompurify: 3.4.1
+  dompurify: 3.4.2
   echarts: 6.0.0
   echarts-for-react: 3.0.6
   elkjs: 0.11.1
   embla-carousel-autoplay: 8.6.0
   embla-carousel-react: 8.6.0
   emoji-mart: 5.6.0
-  es-toolkit: 1.46.0
-  eslint: 10.2.1
-  eslint-markdown: 0.7.0
+  es-toolkit: 1.46.1
+  eslint: 10.3.0
+  eslint-markdown: 0.9.0
   eslint-plugin-better-tailwindcss: 4.5.0
   eslint-plugin-hyoban: 0.14.1
   eslint-plugin-markdown-preferences: 0.41.1
   eslint-plugin-no-barrel-files: 1.3.1
   eslint-plugin-react-refresh: 0.5.2
   eslint-plugin-sonarjs: 4.0.3
-  eslint-plugin-storybook: 10.3.5
+  eslint-plugin-storybook: 10.3.6
   fast-deep-equal: 3.1.3
+  fuse.js: 7.3.0
   happy-dom: 20.9.0
   hast-util-to-jsx-runtime: 2.3.6
-  hono: 4.12.15
+  hono: 4.12.18
   html-entities: 2.6.0
   html-to-image: 1.11.13
-  i18next: 26.0.8
+  i18next: 26.1.0
   i18next-resources-to-backend: 1.2.1
   iconify-import-svg: 0.2.0
-  immer: 11.1.4
-  jotai: 2.19.1
+  immer: 11.1.8
+  jotai: 2.20.0
   js-audio-recorder: 1.0.7
   js-cookie: 3.0.5
   js-yaml: 4.1.1
   jsonschema: 1.5.0
   katex: 0.16.45
-  knip: 6.7.0
+  knip: 6.13.1
   ky: 2.0.2
   lamejs: 1.2.1
   lexical: 0.44.0
-  loro-crdt: 1.12.0
-  mermaid: 11.14.0
+  loro-crdt: 1.12.1
+  mermaid: 11.15.0
   mime: 4.1.0
   mitt: 3.0.1
   negotiator: 1.0.0
-  next: 16.2.4
+  next: 16.2.6
   next-themes: 0.4.6
   nuqs: 2.8.9
   pinyin-pro: 3.28.1
-  playwright: 1.59.1
-  postcss: 8.5.12
+  playwright: 1.60.0
+  postcss: 8.5.14
   qrcode.react: 4.2.0
   qs: 6.15.1
-  react: 19.2.5
+  react: 19.2.6
   react-18-input-autosize: 3.0.0
-  react-dom: 19.2.5
+  react-dom: 19.2.6
   react-easy-crop: 5.5.7
-  react-hotkeys-hook: 5.2.4
+  react-hotkeys-hook: 5.3.2
   react-i18next: 16.5.8
   react-multi-email: 1.0.25
   react-papaparse: 4.4.0
   react-pdf-highlighter: 8.0.0-rc.0
-  react-server-dom-webpack: 19.2.5
+  react-server-dom-webpack: 19.2.6
   react-sortablejs: 6.1.4
   react-textarea-autosize: 8.5.9
   reactflow: 11.11.4
@@ -219,25 +224,25 @@ catalog:
   socket.io-client: 4.8.3
   sortablejs: 1.15.7
   std-semver: 1.0.8
-  storybook: 10.3.5
+  storybook: 10.3.6
   streamdown: 2.5.0
   string-ts: 2.3.1
-  tailwind-merge: 3.5.0
-  tailwindcss: 4.2.4
-  tldts: 7.0.29
+  tailwind-merge: 3.6.0
+  tailwindcss: 4.3.0
+  tldts: 7.0.30
   tsx: 4.21.0
   typescript: 6.0.3
   uglify-js: 3.19.3
   unist-util-visit: 5.1.0
   use-context-selector: 2.0.0
   uuid: 14.0.0
-  vinext: 0.0.45
+  vinext: 0.0.49
   vite: npm:@voidzero-dev/vite-plus-core@0.1.20
   vite-plugin-inspect: 12.0.0-beta.1
   vite-plus: 0.1.20
   vitest: npm:@voidzero-dev/vite-plus-test@0.1.20
   vitest-browser-react: 2.2.0
   vitest-canvas-mock: 1.1.4
-  zod: 4.3.6
+  zod: 4.4.3
   zundo: 2.3.0
-  zustand: 5.0.12
+  zustand: 5.0.13
diff --git a/web/.env.example b/web/.env.example
index 643aba482e..81fff4275d 100644
--- a/web/.env.example
+++ b/web/.env.example
@@ -17,14 +17,11 @@ NEXT_PUBLIC_COOKIE_DOMAIN=
 # WebSocket server URL.
 NEXT_PUBLIC_SOCKET_URL=ws://localhost:5001
 
-# Dev-only Hono proxy targets.
-# The frontend keeps requesting http://localhost:5001 directly,
-# the proxy server will forward the request to the target server,
-# so that you don't need to run a separate backend server and use online API in development.
-HONO_PROXY_HOST=127.0.0.1
-HONO_PROXY_PORT=5001
-HONO_CONSOLE_API_PROXY_TARGET=
-HONO_PUBLIC_API_PROXY_TARGET=
+# Dev proxy routes are configured in web/dev-proxy.config.ts.
+# pnpm -C web run dev:proxy loads web/.env.local before evaluating that config file.
+DEV_PROXY_TARGET=https://cloud.dify.ai
+DEV_PROXY_HOST=127.0.0.1
+DEV_PROXY_PORT=5001
 
 # The API PREFIX for MARKETPLACE
 NEXT_PUBLIC_MARKETPLACE_API_PREFIX=https://marketplace.dify.ai/api/v1
diff --git a/web/.storybook/main.ts b/web/.storybook/main.ts
index 918860c786..e5bf0ee65e 100644
--- a/web/.storybook/main.ts
+++ b/web/.storybook/main.ts
@@ -1,7 +1,10 @@
 import type { StorybookConfig } from '@storybook/nextjs-vite'
 
 const config: StorybookConfig = {
-  stories: ['../app/components/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
+  stories: [
+    '../app/components/**/*.stories.@(js|jsx|mjs|ts|tsx)',
+    '../features/**/*.stories.@(js|jsx|mjs|ts|tsx)',
+  ],
   addons: [
     // Not working with Storybook Vite framework
     // '@storybook/addon-onboarding',
diff --git a/web/.storybook/preview.tsx b/web/.storybook/preview.tsx
index 92b5baab0d..0209fc535c 100644
--- a/web/.storybook/preview.tsx
+++ b/web/.storybook/preview.tsx
@@ -6,7 +6,6 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { I18nClientProvider as I18N } from '../app/components/provider/i18n'
 import commonEnUS from '../i18n/en-US/common.json'
 
-import '../app/styles/globals.css'
 import '../app/styles/markdown.css'
 import './storybook.css'
 
diff --git a/web/.storybook/storybook.css b/web/.storybook/storybook.css
index 85df1087a0..159deff4fe 100644
--- a/web/.storybook/storybook.css
+++ b/web/.storybook/storybook.css
@@ -1,3 +1,16 @@
+@import '../app/styles/tailwind-core.css';
+
+@source '../app';
+@source '../context';
+@source '../hooks';
+@source '.';
+@source '../../packages/dify-ui/src';
+@source '../node_modules/streamdown/dist';
+@source '../node_modules/@streamdown/math/dist';
+@source not '../**/*.{spec,test}.{js,ts,jsx,tsx}';
+@source not '../../packages/dify-ui/src/**/*.{spec,test}.{ts,tsx}';
+@source not '../../packages/dify-ui/src/**/*.stories.{ts,tsx}';
+
 html,
 body {
   max-width: unset;
diff --git a/web/AGENTS.md b/web/AGENTS.md
index 5e9f7ed11c..a2ca3857e7 100644
--- a/web/AGENTS.md
+++ b/web/AGENTS.md
@@ -4,14 +4,10 @@
 
 ## Overlay Components (Mandatory)
 
-- `../packages/dify-ui/README.md` is the permanent contract for overlay primitives, portals, root `isolation: isolate`, and the `z-1002` / `z-1003` layering.
-- `./docs/overlay-migration.md` is the source of truth for the ongoing migration (deprecated import paths, allowlist, coexistence rules).
+- `../packages/dify-ui/README.md` is the permanent contract for overlay primitives, portals, root `isolation: isolate`, and the `z-50` / `z-60` layering.
+- `./docs/overlay.md` records the current web overlay best practices.
 - In new or modified code, use only overlay primitives from `@langgenius/dify-ui/*`.
-- Do not introduce deprecated overlay imports from `@/app/components/base/*`; when touching legacy callers, prefer migrating them and keep the allowlist shrinking (never expanding).
-
-## Query & Mutation (Mandatory)
-
-- `frontend-query-mutation` is the source of truth for Dify frontend contracts, query and mutation call-site patterns, conditional queries, invalidation, and mutation error handling.
+- Do not introduce overlay imports from `@/app/components/base/*`; when touching existing callers, migrate them.
 
 ## Design Token Mapping
 
diff --git a/web/README.md b/web/README.md
index eb964b01e3..1748ed6947 100644
--- a/web/README.md
+++ b/web/README.md
@@ -56,6 +56,8 @@ pnpm -C web run dev
 # or if you are using vinext which provides a better development experience
 pnpm -C web run dev:vinext
 # (optional) start the dev proxy server so that you can use online API in development
+# edit web/dev-proxy.config.ts to choose proxy paths
+# edit web/.env.local to override DEV_PROXY_TARGET, DEV_PROXY_ENTERPRISE_TARGET, DEV_PROXY_HOST, or DEV_PROXY_PORT
 pnpm -C web run dev:proxy
 ```
 
diff --git a/web/__mocks__/base-ui-dropdown-menu.tsx b/web/__mocks__/base-ui-dropdown-menu.tsx
new file mode 100644
index 0000000000..9e2bfa2d41
--- /dev/null
+++ b/web/__mocks__/base-ui-dropdown-menu.tsx
@@ -0,0 +1,172 @@
+import type { ReactNode } from 'react'
+import * as React from 'react'
+
+const DropdownMenuContext = React.createContext({
+  open: false,
+  onOpenChange: (_open: boolean) => {},
+})
+
+type DropdownMenuProps = {
+  children?: ReactNode
+  open?: boolean
+  onOpenChange?: (open: boolean) => void
+}
+
+type DropdownMenuTriggerProps = React.HTMLAttributes<HTMLElement> & {
+  children?: ReactNode
+  nativeButton?: boolean
+  render?: React.ReactElement
+}
+
+type DropdownMenuContentProps = React.HTMLAttributes<HTMLDivElement> & {
+  children?: ReactNode
+  placement?: string
+  sideOffset?: number
+  alignOffset?: number
+  popupClassName?: string
+}
+
+export const DropdownMenu = ({
+  children,
+  open,
+  onOpenChange,
+}: DropdownMenuProps) => {
+  const [localOpen, setLocalOpen] = React.useState(false)
+  const resolvedOpen = open ?? localOpen
+  const handleOpenChange = React.useCallback((nextOpen: boolean) => {
+    setLocalOpen(nextOpen)
+    onOpenChange?.(nextOpen)
+  }, [onOpenChange])
+
+  return (
+    <DropdownMenuContext.Provider value={{ open: resolvedOpen, onOpenChange: handleOpenChange }}>
+      <div data-testid="dropdown-menu" data-open={String(resolvedOpen)}>
+        {children}
+      </div>
+    </DropdownMenuContext.Provider>
+  )
+}
+
+export const DropdownMenuTrigger = ({
+  children,
+  render,
+  nativeButton: _nativeButton,
+  onClick,
+  ...props
+}: DropdownMenuTriggerProps) => {
+  const { open, onOpenChange } = React.useContext(DropdownMenuContext)
+  const node = render ?? children
+  const isNativeButton = React.isValidElement(node) && node.type === 'button'
+  const handleClick = (event: React.MouseEvent<HTMLElement>) => {
+    onClick?.(event)
+    if (!event.defaultPrevented)
+      onOpenChange(!open)
+  }
+
+  if (React.isValidElement(node)) {
+    const triggerElement = node as React.ReactElement<Record<string, unknown>>
+    const childProps = (triggerElement.props ?? {}) as React.HTMLAttributes<HTMLElement> & { 'data-testid'?: string }
+    const triggerProps = props as React.HTMLAttributes<HTMLElement> & { 'data-testid'?: string }
+    const role = childProps.role ?? triggerProps.role ?? (!isNativeButton && (childProps['aria-label'] || triggerProps['aria-label']) ? 'button' : undefined)
+    return React.cloneElement(triggerElement, {
+      ...props,
+      ...childProps,
+      'data-testid': childProps['data-testid'] ?? triggerProps['data-testid'] ?? 'dropdown-menu-trigger',
+      role,
+      'tabIndex': childProps.tabIndex ?? triggerProps.tabIndex ?? (role === 'button' ? 0 : undefined),
+      'onClick': (event: React.MouseEvent<HTMLElement>) => {
+        childProps.onClick?.(event)
+        handleClick(event)
+      },
+    }, render ? (children ?? childProps.children) : childProps.children)
+  }
+
+  return (
+    <div data-testid="dropdown-menu-trigger" role="button" tabIndex={0} onClick={handleClick} {...props}>
+      {node}
+    </div>
+  )
+}
+
+export const DropdownMenuContent = ({
+  children,
+  className,
+  popupClassName,
+  placement,
+  sideOffset,
+  alignOffset,
+  ...props
+}: DropdownMenuContentProps) => {
+  const { open } = React.useContext(DropdownMenuContext)
+  if (!open)
+    return null
+
+  return (
+    <div
+      data-testid="dropdown-menu-content"
+      data-placement={placement}
+      data-side-offset={sideOffset}
+      data-align-offset={alignOffset}
+      className={className || popupClassName}
+      {...props}
+    >
+      {children}
+    </div>
+  )
+}
+
+export const DropdownMenuItem = ({
+  children,
+  onClick,
+  ...props
+}: React.HTMLAttributes<HTMLDivElement> & { children?: ReactNode }) => (
+  <div role="menuitem" onClick={onClick} {...props}>
+    {children}
+  </div>
+)
+
+export const DropdownMenuRadioGroup = ({
+  children,
+  onValueChange,
+  ...props
+}: React.HTMLAttributes<HTMLDivElement> & { children?: ReactNode, value?: unknown, onValueChange?: (value: unknown) => void }) => (
+  <div
+    role="radiogroup"
+    {...props}
+    data-on-value-change={onValueChange ? 'true' : undefined}
+  >
+    {React.Children.map(children, (child) => {
+      if (!React.isValidElement(child))
+        return child
+      return React.cloneElement(child as React.ReactElement<{ __onValueChange?: (value: unknown) => void }>, { __onValueChange: onValueChange })
+    })}
+  </div>
+)
+
+export const DropdownMenuRadioItem = ({
+  children,
+  value,
+  onClick,
+  __onValueChange,
+  ...props
+}: React.HTMLAttributes<HTMLDivElement> & { children?: ReactNode, value?: unknown, __onValueChange?: (value: unknown) => void }) => (
+  <div
+    role="radio"
+    onClick={(event) => {
+      onClick?.(event)
+      __onValueChange?.(value)
+    }}
+    {...props}
+  >
+    {children}
+  </div>
+)
+
+export const DropdownMenuRadioItemIndicator = ({ children }: { children?: ReactNode }) => <>{children}</>
+export const DropdownMenuCheckboxItem = DropdownMenuItem
+export const DropdownMenuCheckboxItemIndicator = ({ children }: { children?: ReactNode }) => <>{children}</>
+export const DropdownMenuLabel = ({ children }: { children?: ReactNode }) => <>{children}</>
+export const DropdownMenuSeparator = (props: React.HTMLAttributes<HTMLDivElement>) => <div role="separator" {...props} />
+export const DropdownMenuSub = ({ children }: { children?: ReactNode }) => <>{children}</>
+export const DropdownMenuSubTrigger = DropdownMenuItem
+export const DropdownMenuSubContent = ({ children }: { children?: ReactNode }) => <>{children}</>
diff --git a/web/__mocks__/base-ui-popover.tsx b/web/__mocks__/base-ui-popover.tsx
index 8818f60f4e..c4d7a23827 100644
--- a/web/__mocks__/base-ui-popover.tsx
+++ b/web/__mocks__/base-ui-popover.tsx
@@ -23,17 +23,25 @@ type PopoverContentProps = React.HTMLAttributes<HTMLDivElement> & {
   placement?: string
   sideOffset?: number
   alignOffset?: number
+  popupClassName?: string
   positionerProps?: React.HTMLAttributes<HTMLDivElement>
   popupProps?: React.HTMLAttributes<HTMLDivElement>
 }
 
 export const Popover = ({
   children,
-  open = false,
+  open,
   onOpenChange,
 }: PopoverProps) => {
+  const [localOpen, setLocalOpen] = React.useState(false)
+  const resolvedOpen = open ?? localOpen
+  const handleOpenChange = React.useCallback((nextOpen: boolean) => {
+    setLocalOpen(nextOpen)
+    onOpenChange?.(nextOpen)
+  }, [onOpenChange])
+
   React.useEffect(() => {
-    if (!open)
+    if (!resolvedOpen)
       return
 
     const handleMouseDown = (event: MouseEvent) => {
@@ -41,12 +49,12 @@ export const Popover = ({
       if (target?.closest?.('[data-popover-trigger="true"], [data-popover-content="true"]'))
         return
 
-      onOpenChange?.(false)
+      handleOpenChange(false)
     }
 
     const handleKeyDown = (event: KeyboardEvent) => {
       if (event.key === 'Escape')
-        onOpenChange?.(false)
+        handleOpenChange(false)
     }
 
     document.addEventListener('mousedown', handleMouseDown)
@@ -56,15 +64,15 @@ export const Popover = ({
       document.removeEventListener('mousedown', handleMouseDown)
       document.removeEventListener('keydown', handleKeyDown)
     }
-  }, [open, onOpenChange])
+  }, [resolvedOpen, handleOpenChange])
 
   return (
     <PopoverContext.Provider value={{
-      open,
-      onOpenChange: onOpenChange ?? (() => {}),
+      open: resolvedOpen,
+      onOpenChange: handleOpenChange,
     }}
     >
-      <div data-testid="popover" data-open={String(open)}>
+      <div data-testid="popover" data-open={String(resolvedOpen)}>
         {children}
       </div>
     </PopoverContext.Provider>
@@ -84,11 +92,12 @@ export const PopoverTrigger = ({
   if (React.isValidElement(node)) {
     const triggerElement = node as React.ReactElement<Record<string, unknown>>
     const childProps = (triggerElement.props ?? {}) as React.HTMLAttributes<HTMLElement> & { 'data-testid'?: string }
+    const triggerProps = props as React.HTMLAttributes<HTMLElement> & { 'data-testid'?: string }
 
     return React.cloneElement(triggerElement, {
       ...props,
       ...childProps,
-      'data-testid': childProps['data-testid'] ?? 'popover-trigger',
+      'data-testid': childProps['data-testid'] ?? triggerProps['data-testid'] ?? 'popover-trigger',
       'data-popover-trigger': 'true',
       'onClick': (event: React.MouseEvent<HTMLElement>) => {
         childProps.onClick?.(event)
@@ -97,7 +106,7 @@ export const PopoverTrigger = ({
           return
         onOpenChange(!open)
       },
-    })
+    }, render ? (children ?? childProps.children) : childProps.children)
   }
 
   return (
@@ -123,6 +132,7 @@ export const PopoverContent = ({
   placement,
   sideOffset,
   alignOffset,
+  popupClassName,
   positionerProps,
   popupProps,
   ...props
@@ -139,7 +149,7 @@ export const PopoverContent = ({
       data-placement={placement}
       data-side-offset={sideOffset}
       data-align-offset={alignOffset}
-      className={className}
+      className={className || popupClassName}
       {...positionerProps}
       {...popupProps}
       {...props}
diff --git a/web/__mocks__/base-ui-select.tsx b/web/__mocks__/base-ui-select.tsx
new file mode 100644
index 0000000000..7655164419
--- /dev/null
+++ b/web/__mocks__/base-ui-select.tsx
@@ -0,0 +1,65 @@
+import type { ReactNode } from 'react'
+import * as React from 'react'
+
+const SelectContext = React.createContext({
+  value: undefined as unknown,
+  onValueChange: (_value: unknown) => {},
+})
+
+type SelectProps = {
+  children?: ReactNode
+  value?: unknown
+  onValueChange?: (value: unknown) => void
+}
+
+export const Select = ({
+  children,
+  value,
+  onValueChange,
+}: SelectProps) => (
+  <SelectContext.Provider value={{ value, onValueChange: onValueChange ?? (() => {}) }}>
+    <div data-testid="select-root">{children}</div>
+  </SelectContext.Provider>
+)
+
+export const SelectTrigger = ({
+  children,
+  ...props
+}: React.ButtonHTMLAttributes<HTMLButtonElement> & { children?: ReactNode }) => (
+  <button type="button" {...props}>
+    {children}
+  </button>
+)
+
+export const SelectValue = ({ placeholder }: { placeholder?: ReactNode }) => <>{placeholder}</>
+
+export const SelectContent = ({ children }: { children?: ReactNode }) => (
+  <div data-testid="select-content">{children}</div>
+)
+
+export const SelectItem = ({
+  children,
+  value,
+  onClick,
+  ...props
+}: React.HTMLAttributes<HTMLDivElement> & { children?: ReactNode, value?: unknown }) => {
+  const select = React.useContext(SelectContext)
+  return (
+    <div
+      role="option"
+      onClick={(event) => {
+        onClick?.(event)
+        select.onValueChange(value)
+      }}
+      {...props}
+    >
+      {children}
+    </div>
+  )
+}
+
+export const SelectItemText = ({ children }: { children?: ReactNode }) => <>{children}</>
+export const SelectItemIndicator = ({ children }: { children?: ReactNode }) => <>{children}</>
+export const SelectGroup = ({ children }: { children?: ReactNode }) => <>{children}</>
+export const SelectLabel = ({ children }: { children?: ReactNode }) => <>{children}</>
+export const SelectSeparator = (props: React.HTMLAttributes<HTMLDivElement>) => <div role="separator" {...props} />
diff --git a/web/__mocks__/base-ui-tooltip.tsx b/web/__mocks__/base-ui-tooltip.tsx
new file mode 100644
index 0000000000..23e05f0864
--- /dev/null
+++ b/web/__mocks__/base-ui-tooltip.tsx
@@ -0,0 +1,95 @@
+import type { ReactNode } from 'react'
+import * as React from 'react'
+
+const TooltipContext = React.createContext({
+  open: false,
+  onOpenChange: (_open: boolean) => {},
+})
+
+type TooltipProps = {
+  children?: ReactNode
+  open?: boolean
+  onOpenChange?: (open: boolean) => void
+}
+
+export const Tooltip = ({ children, open, onOpenChange }: TooltipProps) => {
+  const [localOpen, setLocalOpen] = React.useState(false)
+  const resolvedOpen = open ?? localOpen
+  const handleOpenChange = React.useCallback((nextOpen: boolean) => {
+    setLocalOpen(nextOpen)
+    onOpenChange?.(nextOpen)
+  }, [onOpenChange])
+
+  return (
+    <TooltipContext.Provider value={{ open: resolvedOpen, onOpenChange: handleOpenChange }}>
+      {children}
+    </TooltipContext.Provider>
+  )
+}
+
+export const TooltipTrigger = ({
+  children,
+  render,
+  nativeButton: _nativeButton,
+  ...props
+}: React.HTMLAttributes<HTMLElement> & { children?: ReactNode, render?: React.ReactElement, nativeButton?: boolean }) => {
+  const { open, onOpenChange } = React.useContext(TooltipContext)
+  const node = render ?? children
+
+  if (React.isValidElement(node)) {
+    const triggerElement = node as React.ReactElement<Record<string, unknown>>
+    const childProps = (triggerElement.props ?? {}) as React.HTMLAttributes<HTMLElement>
+
+    return React.cloneElement(triggerElement, {
+      ...props,
+      ...childProps,
+      onMouseEnter: (event: React.MouseEvent<HTMLElement>) => {
+        childProps.onMouseEnter?.(event)
+        props.onMouseEnter?.(event)
+        onOpenChange(true)
+      },
+      onMouseLeave: (event: React.MouseEvent<HTMLElement>) => {
+        childProps.onMouseLeave?.(event)
+        props.onMouseLeave?.(event)
+        onOpenChange(false)
+      },
+      onClick: (event: React.MouseEvent<HTMLElement>) => {
+        childProps.onClick?.(event)
+        props.onClick?.(event)
+        onOpenChange(!open)
+      },
+    })
+  }
+
+  return (
+    <span
+      {...props}
+      onMouseEnter={(event) => {
+        props.onMouseEnter?.(event)
+        onOpenChange(true)
+      }}
+      onMouseLeave={(event) => {
+        props.onMouseLeave?.(event)
+        onOpenChange(false)
+      }}
+      onClick={(event) => {
+        props.onClick?.(event)
+        onOpenChange(!open)
+      }}
+    >
+      {node}
+    </span>
+  )
+}
+
+export const TooltipContent = ({
+  children,
+  ...props
+}: React.HTMLAttributes<HTMLDivElement> & { children?: ReactNode }) => {
+  const { open } = React.useContext(TooltipContext)
+  if (!open)
+    return null
+  return <div {...props}>{children}</div>
+}
+
+export const TooltipProvider = ({ children }: { children?: ReactNode }) => <>{children}</>
diff --git a/web/__mocks__/provider-context.ts b/web/__mocks__/provider-context.ts
index d3296bacd0..10fac8d8b6 100644
--- a/web/__mocks__/provider-context.ts
+++ b/web/__mocks__/provider-context.ts
@@ -13,6 +13,7 @@ export const baseProviderContextValue: ProviderContextState = {
   isAPIKeySet: true,
   plan: defaultPlan,
   isFetchedPlan: false,
+  isFetchedPlanInfo: false,
   enableBilling: false,
   onPlanInfoChanged: noop,
   enableReplaceWebAppLogo: false,
diff --git a/web/__tests__/app-sidebar/sidebar-shell-flow.test.tsx b/web/__tests__/app-sidebar/sidebar-shell-flow.test.tsx
index a7c660105d..ef765c06f2 100644
--- a/web/__tests__/app-sidebar/sidebar-shell-flow.test.tsx
+++ b/web/__tests__/app-sidebar/sidebar-shell-flow.test.tsx
@@ -95,37 +95,8 @@ vi.mock('@/app/components/workflow/utils', () => ({
   getKeyboardKeyNameBySystem: (key: string) => key,
 }))
 
-vi.mock('@/app/components/base/portal-to-follow-elem', async () => {
-  const React = await vi.importActual<typeof import('react')>('react')
-  const OpenContext = React.createContext(false)
-
-  return {
-    PortalToFollowElem: ({ children, open }: { children: React.ReactNode, open: boolean }) => (
-      <OpenContext.Provider value={open}>
-        <div>{children}</div>
-      </OpenContext.Provider>
-    ),
-    PortalToFollowElemTrigger: ({
-      children,
-      onClick,
-    }: {
-      children: React.ReactNode
-      onClick?: () => void
-    }) => (
-      <button type="button" data-testid="portal-trigger" onClick={onClick}>
-        {children}
-      </button>
-    ),
-    PortalToFollowElemContent: ({ children }: { children: React.ReactNode }) => {
-      const open = React.useContext(OpenContext)
-      return open ? <div>{children}</div> : null
-    },
-  }
-})
-
-vi.mock('@/app/components/base/tooltip', () => ({
-  default: ({ children }: { children?: React.ReactNode }) => <>{children}</>,
-}))
+vi.mock('@langgenius/dify-ui/dropdown-menu', () => import('@/__mocks__/base-ui-dropdown-menu'))
+vi.mock('@langgenius/dify-ui/tooltip', () => import('@/__mocks__/base-ui-tooltip'))
 
 vi.mock('@/app/components/app-sidebar/app-info', () => ({
   default: ({
diff --git a/web/__tests__/app/app-publisher-flow.test.tsx b/web/__tests__/app/app-publisher-flow.test.tsx
index d4bf56e7e4..ff2e3f6f44 100644
--- a/web/__tests__/app/app-publisher-flow.test.tsx
+++ b/web/__tests__/app/app-publisher-flow.test.tsx
@@ -122,33 +122,7 @@ vi.mock('@/app/components/app/app-access-control', () => ({
   default: () => <div data-testid="app-access-control" />,
 }))
 
-vi.mock('@/app/components/base/portal-to-follow-elem', async () => {
-  const React = await vi.importActual<typeof import('react')>('react')
-  const OpenContext = React.createContext(false)
-
-  return {
-    PortalToFollowElem: ({ children, open }: { children: React.ReactNode, open: boolean }) => (
-      <OpenContext.Provider value={open}>
-        <div>{children}</div>
-      </OpenContext.Provider>
-    ),
-    PortalToFollowElemTrigger: ({
-      children,
-      onClick,
-    }: {
-      children: React.ReactNode
-      onClick?: () => void
-    }) => (
-      <div onClick={onClick}>
-        {children}
-      </div>
-    ),
-    PortalToFollowElemContent: ({ children }: { children: React.ReactNode }) => {
-      const open = React.useContext(OpenContext)
-      return open ? <div>{children}</div> : null
-    },
-  }
-})
+vi.mock('@langgenius/dify-ui/popover', () => import('@/__mocks__/base-ui-popover'))
 
 vi.mock('@/app/components/workflow/utils', () => ({
   getKeyboardKeyCodeBySystem: () => 'ctrl',
diff --git a/web/__tests__/apps/app-card-operations-flow.test.tsx b/web/__tests__/apps/app-card-operations-flow.test.tsx
index b0854072d2..8162f12dad 100644
--- a/web/__tests__/apps/app-card-operations-flow.test.tsx
+++ b/web/__tests__/apps/app-card-operations-flow.test.tsx
@@ -53,25 +53,13 @@ vi.mock('@/next/navigation', () => ({
   }),
 }))
 
-// Mock headless UI Popover so it renders content without transition
-vi.mock('@headlessui/react', async () => {
-  const actual = await vi.importActual<typeof import('@headlessui/react')>('@headlessui/react')
+vi.mock('@tanstack/react-query', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@tanstack/react-query')>()
   return {
     ...actual,
-    Popover: ({ children, className }: { children: ((bag: { open: boolean }) => React.ReactNode) | React.ReactNode, className?: string }) => (
-      <div className={className} data-testid="popover-wrapper">
-        {typeof children === 'function' ? children({ open: true }) : children}
-      </div>
-    ),
-    PopoverButton: ({ children, className, ref: _ref, ...rest }: Record<string, unknown>) => (
-      <button className={className as string} {...rest}>{children as React.ReactNode}</button>
-    ),
-    PopoverPanel: ({ children, className }: { children: ((bag: { close: () => void }) => React.ReactNode) | React.ReactNode, className?: string }) => (
-      <div className={className}>
-        {typeof children === 'function' ? children({ close: vi.fn() }) : children}
-      </div>
-    ),
-    Transition: ({ children }: { children: React.ReactNode }) => <>{children}</>,
+    useQuery: () => ({
+      data: [],
+    }),
   }
 })
 
diff --git a/web/__tests__/apps/app-list-browsing-flow.test.tsx b/web/__tests__/apps/app-list-browsing-flow.test.tsx
index f721777eab..0adef04a3f 100644
--- a/web/__tests__/apps/app-list-browsing-flow.test.tsx
+++ b/web/__tests__/apps/app-list-browsing-flow.test.tsx
@@ -9,7 +9,7 @@ import type { ReactElement, ReactNode } from 'react'
  */
 import type { AppListResponse } from '@/models/app'
 import type { App } from '@/types/app'
-import { fireEvent, render, screen } from '@testing-library/react'
+import { fireEvent, render, screen, waitFor } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { createSystemFeaturesWrapper } from '@/__tests__/utils/mock-system-features'
 import List from '@/app/components/apps/list'
@@ -95,46 +95,36 @@ vi.mock('@/service/tag', () => ({
   fetchTagList: vi.fn().mockResolvedValue([]),
 }))
 
-vi.mock('@/service/use-common', () => ({
-  useMembers: () => ({
-    data: {
-      accounts: [
-        { id: 'user-1', name: 'Current User', email: 'current@example.com', avatar: '', avatar_url: '', role: 'owner', last_login_at: '', created_at: '', status: 'active' },
-      ],
-    },
-  }),
-}))
-
-vi.mock('@/service/apps', () => ({
-  fetchWorkflowOnlineUsers: vi.fn().mockResolvedValue({}),
-}))
+vi.mock('@tanstack/react-query', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@tanstack/react-query')>()
+  return {
+    ...actual,
+    useQuery: () => ({
+      data: [],
+    }),
+    useInfiniteQuery: () => ({
+      data: { pages: mockPages },
+      isLoading: mockIsLoading,
+      isFetching: mockIsFetching,
+      isFetchingNextPage: mockIsFetchingNextPage,
+      fetchNextPage: mockFetchNextPage,
+      hasNextPage: mockHasNextPage,
+      error: mockError,
+      refetch: mockRefetch,
+    }),
+  }
+})
 
 vi.mock('@/service/use-apps', () => ({
-  useInfiniteAppList: () => ({
-    data: { pages: mockPages },
-    isLoading: mockIsLoading,
-    isFetching: mockIsFetching,
-    isFetchingNextPage: mockIsFetchingNextPage,
-    fetchNextPage: mockFetchNextPage,
-    hasNextPage: mockHasNextPage,
-    error: mockError,
-    refetch: mockRefetch,
-  }),
   useDeleteAppMutation: () => ({
     mutateAsync: vi.fn(),
     isPending: false,
   }),
 }))
 
-vi.mock('@/service/use-snippets', () => ({
-  useInfiniteSnippetList: () => ({
-    data: { pages: [] },
-    isLoading: false,
-    isFetching: false,
-    isFetchingNextPage: false,
-    fetchNextPage: vi.fn(),
-    hasNextPage: false,
-    error: null,
+vi.mock('@/app/components/apps/hooks/use-workflow-online-users', () => ({
+  useWorkflowOnlineUsers: () => ({
+    onlineUsersMap: {},
   }),
 }))
 
@@ -375,13 +365,18 @@ describe('App List Browsing Flow', () => {
       expect(input).toBeInTheDocument()
     })
 
-    it('should allow typing in search input', () => {
+    it('should update search query when typing in search input', async () => {
       mockPages = [createPage([createMockApp()])]
-      renderList()
+      const { onUrlUpdate } = renderList()
 
-      const input = document.querySelector('input')!
+      const input = screen.getByPlaceholderText('common.operation.search')
       fireEvent.change(input, { target: { value: 'test search' } })
-      expect(input.value).toBe('test search')
+
+      await waitFor(() => {
+        expect(onUrlUpdate).toHaveBeenCalled()
+      })
+      const lastCall = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
+      expect(lastCall.searchParams.get('keywords')).toBe('test search')
     })
   })
 
diff --git a/web/__tests__/apps/create-app-flow.test.tsx b/web/__tests__/apps/create-app-flow.test.tsx
index f63c3addb3..a415e7b82b 100644
--- a/web/__tests__/apps/create-app-flow.test.tsx
+++ b/web/__tests__/apps/create-app-flow.test.tsx
@@ -82,46 +82,36 @@ vi.mock('@/service/tag', () => ({
   fetchTagList: vi.fn().mockResolvedValue([]),
 }))
 
-vi.mock('@/service/use-common', () => ({
-  useMembers: () => ({
-    data: {
-      accounts: [
-        { id: 'user-1', name: 'Current User', email: 'current@example.com', avatar: '', avatar_url: '', role: 'owner', last_login_at: '', created_at: '', status: 'active' },
-      ],
-    },
-  }),
-}))
-
-vi.mock('@/service/apps', () => ({
-  fetchWorkflowOnlineUsers: vi.fn().mockResolvedValue({}),
-}))
+vi.mock('@tanstack/react-query', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@tanstack/react-query')>()
+  return {
+    ...actual,
+    useQuery: () => ({
+      data: [],
+    }),
+    useInfiniteQuery: () => ({
+      data: { pages: mockPages },
+      isLoading: mockIsLoading,
+      isFetching: mockIsFetching,
+      isFetchingNextPage: false,
+      fetchNextPage: mockFetchNextPage,
+      hasNextPage: false,
+      error: null,
+      refetch: mockRefetch,
+    }),
+  }
+})
 
 vi.mock('@/service/use-apps', () => ({
-  useInfiniteAppList: () => ({
-    data: { pages: mockPages },
-    isLoading: mockIsLoading,
-    isFetching: mockIsFetching,
-    isFetchingNextPage: false,
-    fetchNextPage: mockFetchNextPage,
-    hasNextPage: false,
-    error: null,
-    refetch: mockRefetch,
-  }),
   useDeleteAppMutation: () => ({
     mutateAsync: vi.fn(),
     isPending: false,
   }),
 }))
 
-vi.mock('@/service/use-snippets', () => ({
-  useInfiniteSnippetList: () => ({
-    data: { pages: [] },
-    isLoading: false,
-    isFetching: false,
-    isFetchingNextPage: false,
-    fetchNextPage: vi.fn(),
-    hasNextPage: false,
-    error: null,
+vi.mock('@/app/components/apps/hooks/use-workflow-online-users', () => ({
+  useWorkflowOnlineUsers: () => ({
+    onlineUsersMap: {},
   }),
 }))
 
diff --git a/web/__tests__/base/notion-page-selector-flow.test.tsx b/web/__tests__/base/notion-page-selector-flow.test.tsx
index 6295d2dc00..34f4c988e1 100644
--- a/web/__tests__/base/notion-page-selector-flow.test.tsx
+++ b/web/__tests__/base/notion-page-selector-flow.test.tsx
@@ -100,7 +100,7 @@ describe('Base Notion Page Selector Flow', () => {
       />,
     )
 
-    await user.click(screen.getByTestId('checkbox-notion-page-checkbox-root-1'))
+    await user.click(screen.getByRole('checkbox', { name: 'Root 1' }))
 
     expect(onSelect).toHaveBeenLastCalledWith(expect.arrayContaining([
       expect.objectContaining({ page_id: 'root-1', workspace_id: 'w1' }),
@@ -111,7 +111,7 @@ describe('Base Notion Page Selector Flow', () => {
     await user.type(screen.getByTestId('notion-search-input'), 'missing-page')
     expect(screen.getByText('common.dataSource.notion.selector.noSearchResult')).toBeInTheDocument()
 
-    await user.click(screen.getByTestId('notion-search-input-clear'))
+    await user.click(screen.getByRole('button', { name: 'common.operation.clear' }))
     expect(screen.getByTestId('notion-page-name-root-1')).toBeInTheDocument()
 
     await user.click(screen.getByTestId('notion-page-preview-root-1'))
@@ -134,7 +134,7 @@ describe('Base Notion Page Selector Flow', () => {
 
     expect(onSelectCredential).toHaveBeenCalledWith('c1')
 
-    await user.click(screen.getByTestId('notion-credential-selector-btn'))
+    await user.click(screen.getByRole('combobox', { name: /Workspace 1/ }))
     await user.click(screen.getByTestId('notion-credential-item-c2'))
 
     expect(mockInvalidPreImportNotionPages).toHaveBeenCalledWith({ datasetId: 'dataset-1', credentialId: 'c2' })
diff --git a/web/__tests__/billing/cloud-plan-payment-flow.test.tsx b/web/__tests__/billing/cloud-plan-payment-flow.test.tsx
index de145a73e6..7682de5f88 100644
--- a/web/__tests__/billing/cloud-plan-payment-flow.test.tsx
+++ b/web/__tests__/billing/cloud-plan-payment-flow.test.tsx
@@ -90,6 +90,8 @@ const renderCloudPlanItem = ({
   )
 }
 
+const getPlanButton = (name: string) => screen.getByRole('button', { name })
+
 // ═══════════════════════════════════════════════════════════════════════════════
 describe('Cloud Plan Payment Flow', () => {
   beforeEach(() => {
@@ -180,30 +182,30 @@ describe('Cloud Plan Payment Flow', () => {
     it('should disable sandbox button when user is on professional plan (downgrade)', () => {
       renderCloudPlanItem({ currentPlan: Plan.professional, plan: Plan.sandbox })
 
-      const button = screen.getByRole('button')
+      const button = getPlanButton('billing.plansCommon.startForFree')
       expect(button).toBeDisabled()
     })
 
     it('should disable sandbox and professional buttons when user is on team plan', () => {
       const { unmount } = renderCloudPlanItem({ currentPlan: Plan.team, plan: Plan.sandbox })
-      expect(screen.getByRole('button')).toBeDisabled()
+      expect(getPlanButton('billing.plansCommon.startForFree')).toBeDisabled()
       unmount()
 
       renderCloudPlanItem({ currentPlan: Plan.team, plan: Plan.professional })
-      expect(screen.getByRole('button')).toBeDisabled()
+      expect(getPlanButton('billing.plansCommon.startBuilding')).toBeDisabled()
     })
 
     it('should not disable current paid plan button (for invoice management)', () => {
       renderCloudPlanItem({ currentPlan: Plan.professional, plan: Plan.professional })
 
-      const button = screen.getByRole('button')
+      const button = getPlanButton('billing.plansCommon.currentPlan')
       expect(button).not.toBeDisabled()
     })
 
     it('should enable higher-tier plan buttons for upgrade', () => {
       renderCloudPlanItem({ currentPlan: Plan.sandbox, plan: Plan.team })
 
-      const button = screen.getByRole('button')
+      const button = getPlanButton('billing.plansCommon.getStarted')
       expect(button).not.toBeDisabled()
     })
   })
@@ -219,7 +221,7 @@ describe('Cloud Plan Payment Flow', () => {
         planRange: PlanRange.monthly,
       })
 
-      const button = screen.getByRole('button')
+      const button = getPlanButton('billing.plansCommon.startBuilding')
       await user.click(button)
 
       await waitFor(() => {
@@ -235,7 +237,7 @@ describe('Cloud Plan Payment Flow', () => {
         planRange: PlanRange.yearly,
       })
 
-      const button = screen.getByRole('button')
+      const button = getPlanButton('billing.plansCommon.getStarted')
       await user.click(button)
 
       await waitFor(() => {
@@ -247,7 +249,7 @@ describe('Cloud Plan Payment Flow', () => {
       const user = userEvent.setup()
       renderCloudPlanItem({ currentPlan: Plan.professional, plan: Plan.professional })
 
-      const button = screen.getByRole('button')
+      const button = getPlanButton('billing.plansCommon.currentPlan')
       await user.click(button)
 
       await waitFor(() => {
@@ -261,7 +263,7 @@ describe('Cloud Plan Payment Flow', () => {
       const user = userEvent.setup()
       renderCloudPlanItem({ currentPlan: Plan.sandbox, plan: Plan.sandbox })
 
-      const button = screen.getByRole('button')
+      const button = getPlanButton('billing.plansCommon.currentPlan')
       await user.click(button)
 
       // Wait a tick and verify no actions were taken
@@ -279,7 +281,7 @@ describe('Cloud Plan Payment Flow', () => {
       const user = userEvent.setup()
       renderCloudPlanItem({ currentPlan: Plan.sandbox, plan: Plan.professional })
 
-      const button = screen.getByRole('button')
+      const button = getPlanButton('billing.plansCommon.startBuilding')
       await user.click(button)
 
       await waitFor(() => {
diff --git a/web/__tests__/datasets/document-management.test.tsx b/web/__tests__/datasets/document-management.test.tsx
index 96937332a3..8ce661ff4f 100644
--- a/web/__tests__/datasets/document-management.test.tsx
+++ b/web/__tests__/datasets/document-management.test.tsx
@@ -184,7 +184,7 @@ describe('Document Management Flow', () => {
   })
 
   describe('Document Selection Integration', () => {
-    it('should manage selection state externally', () => {
+    it('should keep checkbox selection state owned outside the hook', () => {
       const docs = [
         createDoc({ id: 'doc-1' }),
         createDoc({ id: 'doc-2' }),
@@ -198,62 +198,9 @@ describe('Document Management Flow', () => {
         onSelectedIdChange,
       }))
 
-      expect(result.current.isAllSelected).toBe(false)
-      expect(result.current.isSomeSelected).toBe(false)
-    })
-
-    it('should select all documents', () => {
-      const docs = [
-        createDoc({ id: 'doc-1' }),
-        createDoc({ id: 'doc-2' }),
-      ]
-      const onSelectedIdChange = vi.fn()
-
-      const { result } = renderHook(() => useDocumentSelection({
-        documents: docs,
-        selectedIds: [],
-        onSelectedIdChange,
-      }))
-
-      act(() => {
-        result.current.onSelectAll()
-      })
-
-      expect(onSelectedIdChange).toHaveBeenCalledWith(
-        expect.arrayContaining(['doc-1', 'doc-2']),
-      )
-    })
-
-    it('should detect all-selected state', () => {
-      const docs = [
-        createDoc({ id: 'doc-1' }),
-        createDoc({ id: 'doc-2' }),
-      ]
-
-      const { result } = renderHook(() => useDocumentSelection({
-        documents: docs,
-        selectedIds: ['doc-1', 'doc-2'],
-        onSelectedIdChange: vi.fn(),
-      }))
-
-      expect(result.current.isAllSelected).toBe(true)
-    })
-
-    it('should detect partial selection', () => {
-      const docs = [
-        createDoc({ id: 'doc-1' }),
-        createDoc({ id: 'doc-2' }),
-        createDoc({ id: 'doc-3' }),
-      ]
-
-      const { result } = renderHook(() => useDocumentSelection({
-        documents: docs,
-        selectedIds: ['doc-1'],
-        onSelectedIdChange: vi.fn(),
-      }))
-
-      expect(result.current.isSomeSelected).toBe(true)
-      expect(result.current.isAllSelected).toBe(false)
+      expect(result.current.downloadableSelectedIds).toEqual([])
+      expect(result.current.hasErrorDocumentsSelected).toBe(false)
+      expect(onSelectedIdChange).not.toHaveBeenCalled()
     })
 
     it('should identify downloadable selected documents (FILE type only)', () => {
@@ -311,8 +258,9 @@ describe('Document Management Flow', () => {
       expect(sortResult.current.sortField).toBe('created_at')
       expect(sortResult.current.sortOrder).toBe('desc')
 
-      // Selection starts empty
-      expect(selResult.current.isAllSelected).toBe(false)
+      // Selection-derived batch metadata starts empty.
+      expect(selResult.current.downloadableSelectedIds).toEqual([])
+      expect(selResult.current.hasErrorDocumentsSelected).toBe(false)
     })
   })
 })
diff --git a/web/__tests__/develop/api-key-management-flow.test.tsx b/web/__tests__/develop/api-key-management-flow.test.tsx
index 188b8e6304..233e152f8f 100644
--- a/web/__tests__/develop/api-key-management-flow.test.tsx
+++ b/web/__tests__/develop/api-key-management-flow.test.tsx
@@ -13,7 +13,7 @@ import userEvent from '@testing-library/user-event'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import ApiServer from '@/app/components/develop/ApiServer'
 
-// ---------- fake timers (HeadlessUI Dialog transitions) ----------
+// ---------- fake timers (modal transitions) ----------
 beforeEach(() => {
   vi.useFakeTimers({ shouldAdvanceTime: true })
 })
@@ -100,7 +100,7 @@ describe('API Key management flow', () => {
     })
     await flushUI()
 
-    // SecretKeyModal should render with real HeadlessUI Dialog
+    // SecretKeyModal should render with real modal content
     await waitFor(() => {
       expect(screen.getByText('appApi.apiKeyModal.apiSecretKey')).toBeInTheDocument()
       expect(screen.getByText('appApi.apiKeyModal.apiSecretKeyTips')).toBeInTheDocument()
diff --git a/web/__tests__/explore/explore-app-list-flow.test.tsx b/web/__tests__/explore/explore-app-list-flow.test.tsx
index 6af17119be..dbbbbee456 100644
--- a/web/__tests__/explore/explore-app-list-flow.test.tsx
+++ b/web/__tests__/explore/explore-app-list-flow.test.tsx
@@ -127,7 +127,7 @@ const createApp = (overrides: Partial<App> = {}): App => ({
   copyright: overrides.copyright ?? '',
   privacy_policy: overrides.privacy_policy ?? null,
   custom_disclaimer: overrides.custom_disclaimer ?? null,
-  category: overrides.category ?? 'Writing',
+  categories: overrides.categories ?? ['Writing'],
   position: overrides.position ?? 1,
   is_listed: overrides.is_listed ?? true,
   install_count: overrides.install_count ?? 0,
@@ -165,9 +165,9 @@ describe('Explore App List Flow', () => {
     mockExploreData = {
       categories: ['Writing', 'Translate', 'Programming'],
       allList: [
-        createApp({ app_id: 'app-1', app: { ...createApp().app, name: 'Writer Bot' }, category: 'Writing' }),
-        createApp({ app_id: 'app-2', app: { ...createApp().app, id: 'app-id-2', name: 'Translator' }, category: 'Translate' }),
-        createApp({ app_id: 'app-3', app: { ...createApp().app, id: 'app-id-3', name: 'Code Helper' }, category: 'Programming' }),
+        createApp({ app_id: 'app-1', app: { ...createApp().app, name: 'Writer Bot' }, categories: ['Writing'] }),
+        createApp({ app_id: 'app-2', app: { ...createApp().app, id: 'app-id-2', name: 'Translator' }, categories: ['Translate'] }),
+        createApp({ app_id: 'app-3', app: { ...createApp().app, id: 'app-id-3', name: 'Code Helper' }, categories: ['Programming'] }),
       ],
     }
   })
@@ -190,6 +190,30 @@ describe('Explore App List Flow', () => {
       expect(screen.queryByText('Code Helper')).not.toBeInTheDocument()
     })
 
+    it('should only use categories when filtering by selected category', () => {
+      mockTabValue = 'Writing'
+      mockExploreData = {
+        categories: ['Writing', 'Translate'],
+        allList: [
+          createApp({
+            app_id: 'app-1',
+            app: { ...createApp().app, name: 'Active Writer' },
+            categories: ['Writing'],
+          }),
+          createApp({
+            app_id: 'app-2',
+            app: { ...createApp().app, id: 'app-id-2', name: 'Legacy Writer' },
+            categories: [],
+          }),
+        ],
+      }
+
+      renderAppList()
+
+      expect(screen.getByText('Active Writer')).toBeInTheDocument()
+      expect(screen.queryByText('Legacy Writer')).not.toBeInTheDocument()
+    })
+
     it('should filter apps by search keyword', async () => {
       renderAppList()
 
@@ -212,8 +236,8 @@ describe('Explore App List Flow', () => {
       mockHandleImportDSL.mockImplementation(async (_payload: unknown, options: { onSuccess?: () => void, onPending?: () => void }) => {
         options.onPending?.()
       })
-      mockHandleImportDSLConfirm.mockImplementation(async (options: { onSuccess?: () => void }) => {
-        options.onSuccess?.()
+      mockHandleImportDSLConfirm.mockImplementation(async (options: { onSuccess?: (payload: { app_mode: AppModeEnum }) => void }) => {
+        options.onSuccess?.({ app_mode: AppModeEnum.CHAT })
       })
 
       renderAppList(true, onSuccess)
diff --git a/web/__tests__/header/account-dropdown-flow.test.tsx b/web/__tests__/header/account-dropdown-flow.test.tsx
index b4a3befea0..eb128924c0 100644
--- a/web/__tests__/header/account-dropdown-flow.test.tsx
+++ b/web/__tests__/header/account-dropdown-flow.test.tsx
@@ -131,6 +131,7 @@ describe('Header Account Dropdown Flow', () => {
       payload: ACCOUNT_SETTING_TAB.MEMBERS,
     })
 
+    fireEvent.click(screen.getByRole('button', { name: 'common.account.account' }))
     fireEvent.click(screen.getByText('common.userProfile.about'))
 
     await waitFor(() => {
diff --git a/web/__tests__/header/nav-flow.test.tsx b/web/__tests__/header/nav-flow.test.tsx
index 667f1e36b7..dba7b4bf4a 100644
--- a/web/__tests__/header/nav-flow.test.tsx
+++ b/web/__tests__/header/nav-flow.test.tsx
@@ -1,4 +1,5 @@
 import { fireEvent, render, screen, waitFor } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
 import * as React from 'react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import Nav from '@/app/components/header/nav'
@@ -12,83 +13,6 @@ const mockOnLoadMore = vi.fn()
 let mockSelectedSegment = 'app'
 let mockIsCurrentWorkspaceEditor = true
 
-vi.mock('@headlessui/react', () => {
-  type MenuContextValue = {
-    open: boolean
-    setOpen: React.Dispatch<React.SetStateAction<boolean>>
-  }
-  const MenuContext = React.createContext<MenuContextValue | null>(null)
-
-  const Menu = ({
-    children,
-  }: {
-    children: React.ReactNode | ((props: { open: boolean }) => React.ReactNode)
-  }) => {
-    const [open, setOpen] = React.useState(false)
-    const value = React.useMemo(() => ({ open, setOpen }), [open])
-
-    return (
-      <MenuContext.Provider value={value}>
-        {typeof children === 'function' ? children({ open }) : children}
-      </MenuContext.Provider>
-    )
-  }
-
-  const MenuButton = ({
-    children,
-    onClick,
-    ...props
-  }: React.ButtonHTMLAttributes<HTMLButtonElement>) => {
-    const context = React.useContext(MenuContext)
-
-    return (
-      <button
-        type="button"
-        aria-expanded={context?.open ?? false}
-        onClick={(event) => {
-          context?.setOpen(v => !v)
-          onClick?.(event)
-        }}
-        {...props}
-      >
-        {children}
-      </button>
-    )
-  }
-
-  const MenuItems = ({
-    as: Component = 'div',
-    children,
-    ...props
-  }: {
-    as?: React.ElementType
-    children: React.ReactNode
-  } & Record<string, unknown>) => {
-    const context = React.useContext(MenuContext)
-    if (!context?.open)
-      return null
-
-    return <Component {...props}>{children}</Component>
-  }
-
-  const MenuItem = ({
-    as: Component = 'div',
-    children,
-    ...props
-  }: {
-    as?: React.ElementType
-    children: React.ReactNode
-  } & Record<string, unknown>) => <Component {...props}>{children}</Component>
-
-  return {
-    Menu,
-    MenuButton,
-    MenuItems,
-    MenuItem,
-    Transition: ({ children }: { children: React.ReactNode }) => <>{children}</>,
-  }
-})
-
 vi.mock('react-i18next', () => ({
   useTranslation: () => ({
     t: (key: string) => key,
@@ -192,27 +116,23 @@ describe('Header Nav Flow', () => {
   })
 
   it('opens the nested create menu and emits all app creation branches', async () => {
-    renderNav()
-
-    fireEvent.click(screen.getByRole('button', { name: /Alpha/i }))
-
-    const openCreateMenu = async () => {
-      fireEvent.click(await screen.findByText('menus.newApp'))
-      return screen.findByText('newApp.startFromBlank')
+    const user = userEvent.setup()
+    const clickCreateBranch = async (optionName: string) => {
+      const { unmount } = renderNav()
+      await user.click(screen.getByRole('button', { name: /Alpha/i }))
+      await user.hover(await screen.findByRole('menuitem', { name: /menus\.newApp/i }))
+      fireEvent.click(await screen.findByRole('menuitem', { name: optionName }))
+      unmount()
     }
 
-    await openCreateMenu()
-    fireEvent.click(await screen.findByText('newApp.startFromBlank'))
-
-    await openCreateMenu()
-    fireEvent.click(await screen.findByText('newApp.startFromTemplate'))
-
-    await openCreateMenu()
-    fireEvent.click(await screen.findByText('importDSL'))
+    await clickCreateBranch('newApp.startFromBlank')
+    await clickCreateBranch('newApp.startFromTemplate')
+    await clickCreateBranch('importDSL')
 
     expect(mockOnCreate).toHaveBeenNthCalledWith(1, 'blank')
     expect(mockOnCreate).toHaveBeenNthCalledWith(2, 'template')
     expect(mockOnCreate).toHaveBeenNthCalledWith(3, 'dsl')
+    expect(mockOnCreate).toHaveBeenCalledTimes(3)
   })
 
   it('keeps the current nav label in sync with prop updates', async () => {
diff --git a/web/__tests__/real-browser-flicker.test.tsx b/web/__tests__/real-browser-flicker.test.tsx
index 7c3b45af19..288a5198a8 100644
--- a/web/__tests__/real-browser-flicker.test.tsx
+++ b/web/__tests__/real-browser-flicker.test.tsx
@@ -255,7 +255,6 @@ const TestThemeProvider = ({ children }: { children: React.ReactNode }) => (
     defaultTheme="system"
     enableSystem
     disableTransitionOnChange
-    enableColorScheme={false}
   >
     {children}
   </ThemeProvider>
diff --git a/web/__tests__/share/text-generation-run-once-flow.test.tsx b/web/__tests__/share/text-generation-run-once-flow.test.tsx
index 2a5d1b882c..1471effa2d 100644
--- a/web/__tests__/share/text-generation-run-once-flow.test.tsx
+++ b/web/__tests__/share/text-generation-run-once-flow.test.tsx
@@ -119,7 +119,7 @@ describe('RunOnce – integration flow', () => {
     fireEvent.change(screen.getByPlaceholderText('Bio'), { target: { value: 'Hello' } })
 
     // Phase 3 – submit
-    fireEvent.click(screen.getByTestId('run-button'))
+    fireEvent.click(screen.getByRole('button', { name: 'share.generation.run' }))
     expect(onSend).toHaveBeenCalledTimes(1)
 
     // Phase 4 – simulate "running" state
@@ -132,7 +132,7 @@ describe('RunOnce – integration flow', () => {
       />,
     )
 
-    const stopBtn = screen.getByTestId('stop-button')
+    const stopBtn = screen.getByRole('button', { name: 'share.generation.stopRun:{"defaultValue":"Stop Run"}' })
     expect(stopBtn).toBeInTheDocument()
     fireEvent.click(stopBtn)
     expect(onStop).toHaveBeenCalledTimes(1)
@@ -145,7 +145,7 @@ describe('RunOnce – integration flow', () => {
         runControl={{ onStop, isStopping: true }}
       />,
     )
-    expect(screen.getByTestId('stop-button')).toBeDisabled()
+    expect(screen.getByRole('button', { name: 'share.generation.stopRun:{"defaultValue":"Stop Run"}' })).toBeDisabled()
   })
 
   it('clear resets all field types and allows re-submit', async () => {
@@ -174,7 +174,7 @@ describe('RunOnce – integration flow', () => {
 
     // Re-fill and submit
     fireEvent.change(screen.getByPlaceholderText('Question'), { target: { value: 'New' } })
-    fireEvent.click(screen.getByTestId('run-button'))
+    fireEvent.click(screen.getByRole('button', { name: 'share.generation.run' }))
     expect(onSend).toHaveBeenCalledTimes(1)
   })
 
@@ -212,7 +212,7 @@ describe('RunOnce – integration flow', () => {
     fireEvent.change(screen.getByPlaceholderText('Text'), { target: { value: 'hello' } })
     fireEvent.change(screen.getByTestId('code-editor'), { target: { value: '{"a":1}' } })
 
-    fireEvent.click(screen.getByTestId('run-button'))
+    fireEvent.click(screen.getByRole('button', { name: 'share.generation.run' }))
     expect(onSend).toHaveBeenCalledTimes(1)
   })
 })
diff --git a/web/__tests__/tools/tool-provider-detail-flow.test.tsx b/web/__tests__/tools/tool-provider-detail-flow.test.tsx
index 9cf4772152..5e3e94d4ff 100644
--- a/web/__tests__/tools/tool-provider-detail-flow.test.tsx
+++ b/web/__tests__/tools/tool-provider-detail-flow.test.tsx
@@ -120,19 +120,6 @@ vi.mock('@/utils/var', () => ({
   basePath: '',
 }))
 
-vi.mock('@/app/components/base/drawer', () => ({
-  default: ({ isOpen, children, onClose }: { isOpen: boolean, children: React.ReactNode, onClose: () => void }) => (
-    isOpen
-      ? (
-          <div data-testid="drawer">
-            {children}
-            <button data-testid="drawer-close" onClick={onClose}>Close Drawer</button>
-          </div>
-        )
-      : null
-  ),
-}))
-
 vi.mock('@langgenius/dify-ui/toast', () => ({
   default: { notify: vi.fn() },
   toast: {
@@ -205,7 +192,7 @@ vi.mock('@/app/components/tools/setting/build-in/config-credentials', () => ({
 }))
 
 vi.mock('@/app/components/tools/workflow-tool', () => ({
-  default: ({ onHide, onSave, onRemove }: { payload: unknown, onHide: () => void, onSave: (d: unknown) => void, onRemove: () => void }) => (
+  WorkflowToolDrawer: ({ onHide, onSave, onRemove }: { payload: unknown, onHide: () => void, onSave: (d: unknown) => void, onRemove: () => void }) => (
     <div data-testid="workflow-tool-modal">
       <button data-testid="wf-modal-hide" onClick={onHide}>Hide</button>
       <button data-testid="wf-modal-save" onClick={() => onSave({ name: 'updated-wf' })}>Save</button>
@@ -525,10 +512,10 @@ describe('Tool Provider Detail Flow Integration', () => {
       render(<ProviderDetail collection={collection} onHide={mockOnHide} onRefreshData={mockOnRefreshData} />)
 
       await waitFor(() => {
-        expect(screen.getByTestId('drawer')).toBeInTheDocument()
+        expect(screen.getByRole('dialog')).toBeInTheDocument()
       })
 
-      fireEvent.click(screen.getByTestId('drawer-close'))
+      fireEvent.click(screen.getByRole('button', { name: 'operation.close' }))
       expect(mockOnHide).toHaveBeenCalled()
     })
   })
diff --git a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/layout-main.tsx b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/layout-main.tsx
index 5c3a237aca..1e001a5ca4 100644
--- a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/layout-main.tsx
+++ b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/layout-main.tsx
@@ -19,32 +19,23 @@ import { useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useShallow } from 'zustand/react/shallow'
 import AppSideBar from '@/app/components/app-sidebar'
+import { AppInfoDetailLayer } from '@/app/components/app-sidebar/app-info'
+import { useAppInfoActions } from '@/app/components/app-sidebar/app-info/use-app-info-actions'
 import { useStore } from '@/app/components/app/store'
 import Loading from '@/app/components/base/loading'
-import { useStore as useTagStore } from '@/app/components/base/tag-management/store'
 import { useAppContext } from '@/context/app-context'
 import useBreakpoints, { MediaType } from '@/hooks/use-breakpoints'
 import useDocumentTitle from '@/hooks/use-document-title'
-import { useSnippetAndEvaluationPlanAccess } from '@/hooks/use-snippet-and-evaluation-plan-access'
-import dynamic from '@/next/dynamic'
 import { usePathname, useRouter } from '@/next/navigation'
 import { fetchAppDetailDirect } from '@/service/apps'
 import { AppModeEnum } from '@/types/app'
 import s from './style.module.css'
 
-const TagManagementModal = dynamic(() => import('@/app/components/base/tag-management'), {
-  ssr: false,
-})
-
 type IAppDetailLayoutProps = {
   children: React.ReactNode
   appId: string
 }
 
-const EvaluationIcon = ({ className }: { className?: string }) => {
-  return <span aria-hidden className={cn('i-custom-vender-line-others-evaluation', className)} />
-}
-
 const AppDetailLayout: FC<IAppDetailLayoutProps> = (props) => {
   const {
     children,
@@ -55,14 +46,13 @@ const AppDetailLayout: FC<IAppDetailLayoutProps> = (props) => {
   const pathname = usePathname()
   const media = useBreakpoints()
   const isMobile = media === MediaType.mobile
-  const { canAccess: canAccessSnippetsAndEvaluation } = useSnippetAndEvaluationPlanAccess()
   const { isCurrentWorkspaceEditor, isLoadingCurrentWorkspace, currentWorkspace } = useAppContext()
+  const appInfoActions = useAppInfoActions({ resetKey: appId })
   const { appDetail, setAppDetail, setAppSidebarExpand } = useStore(useShallow(state => ({
     appDetail: state.appDetail,
     setAppDetail: state.setAppDetail,
     setAppSidebarExpand: state.setAppSidebarExpand,
   })))
-  const showTagManagementModal = useTagStore(s => s.showTagManagementModal)
   const [isLoadingAppDetail, setIsLoadingAppDetail] = useState(false)
   const [appDetailRes, setAppDetailRes] = useState<App | null>(null)
   const [navigation, setNavigation] = useState<Array<{
@@ -73,53 +63,42 @@ const AppDetailLayout: FC<IAppDetailLayoutProps> = (props) => {
   }>>([])
 
   const getNavigationConfig = useCallback((appId: string, isCurrentWorkspaceEditor: boolean, mode: AppModeEnum) => {
-    const navConfig = []
-
-    if (isCurrentWorkspaceEditor) {
-      navConfig.push({
-        name: t('appMenus.promptEng', { ns: 'common' }),
-        href: `/app/${appId}/${(mode === AppModeEnum.WORKFLOW || mode === AppModeEnum.ADVANCED_CHAT) ? 'workflow' : 'configuration'}`,
-        icon: RiTerminalWindowLine,
-        selectedIcon: RiTerminalWindowFill,
-      })
-    }
-
-    navConfig.push({
-      name: t('appMenus.apiAccess', { ns: 'common' }),
-      href: `/app/${appId}/develop`,
-      icon: RiTerminalBoxLine,
-      selectedIcon: RiTerminalBoxFill,
-    })
-
-    if (isCurrentWorkspaceEditor) {
-      navConfig.push({
-        name: mode !== AppModeEnum.WORKFLOW
-          ? t('appMenus.logAndAnn', { ns: 'common' })
-          : t('appMenus.logs', { ns: 'common' }),
-        href: `/app/${appId}/logs`,
-        icon: RiFileList3Line,
-        selectedIcon: RiFileList3Fill,
-      })
-    }
-
-    navConfig.push({
-      name: t('appMenus.overview', { ns: 'common' }),
-      href: `/app/${appId}/overview`,
-      icon: RiDashboard2Line,
-      selectedIcon: RiDashboard2Fill,
-    })
-
-    if (isCurrentWorkspaceEditor && canAccessSnippetsAndEvaluation) {
-      navConfig.push({
-        name: t('appMenus.evaluation', { ns: 'common' }),
-        href: `/app/${appId}/evaluation`,
-        icon: EvaluationIcon,
-        selectedIcon: EvaluationIcon,
-      })
-    }
-
+    const navConfig = [
+      ...(isCurrentWorkspaceEditor
+        ? [{
+            name: t('appMenus.promptEng', { ns: 'common' }),
+            href: `/app/${appId}/${(mode === AppModeEnum.WORKFLOW || mode === AppModeEnum.ADVANCED_CHAT) ? 'workflow' : 'configuration'}`,
+            icon: RiTerminalWindowLine,
+            selectedIcon: RiTerminalWindowFill,
+          }]
+        : []
+      ),
+      {
+        name: t('appMenus.apiAccess', { ns: 'common' }),
+        href: `/app/${appId}/develop`,
+        icon: RiTerminalBoxLine,
+        selectedIcon: RiTerminalBoxFill,
+      },
+      ...(isCurrentWorkspaceEditor
+        ? [{
+            name: mode !== AppModeEnum.WORKFLOW
+              ? t('appMenus.logAndAnn', { ns: 'common' })
+              : t('appMenus.logs', { ns: 'common' }),
+            href: `/app/${appId}/logs`,
+            icon: RiFileList3Line,
+            selectedIcon: RiFileList3Fill,
+          }]
+        : []
+      ),
+      {
+        name: t('appMenus.overview', { ns: 'common' }),
+        href: `/app/${appId}/overview`,
+        icon: RiDashboard2Line,
+        selectedIcon: RiDashboard2Fill,
+      },
+    ]
     return navConfig
-  }, [canAccessSnippetsAndEvaluation, t])
+  }, [t])
 
   useDocumentTitle(appDetail?.name || t('menus.appDetail', { ns: 'common' }))
 
@@ -186,14 +165,13 @@ const AppDetailLayout: FC<IAppDetailLayoutProps> = (props) => {
       {appDetail && (
         <AppSideBar
           navigation={navigation}
+          appInfoActions={appInfoActions}
         />
       )}
       <div className="grow overflow-hidden bg-components-panel-bg">
         {children}
       </div>
-      {showTagManagementModal && (
-        <TagManagementModal type="app" show={showTagManagementModal} />
-      )}
+      <AppInfoDetailLayer actions={appInfoActions} />
     </div>
   )
 }
diff --git a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/provider-config-modal.tsx b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/provider-config-modal.tsx
index 734b39bd41..5b740971cb 100644
--- a/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/provider-config-modal.tsx
+++ b/web/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/provider-config-modal.tsx
@@ -311,7 +311,7 @@ const ProviderConfigModal: FC<Props> = ({
               onOpenChange={setIsConfigDialogOpen}
               onOpenChangeComplete={handleConfigDialogOpenChangeComplete}
             >
-              <DialogContent className="w-auto max-w-[calc(100vw-1rem)] overflow-visible border-none bg-transparent p-0 shadow-none">
+              <DialogContent className="max-h-[calc(100dvh-1rem)] w-auto max-w-[calc(100vw-1rem)] overflow-visible border-none bg-transparent p-0 shadow-none">
                 <div className="flex items-center justify-center">
                   <div className="mx-2 max-h-[calc(100vh-120px)] w-[640px] overflow-y-auto rounded-2xl bg-components-panel-bg shadow-xl">
                     <div className="px-8 pt-8">
diff --git a/web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/__tests__/layout-main.spec.tsx b/web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/__tests__/layout-main.spec.tsx
index 2831b0d464..0d7f01a210 100644
--- a/web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/__tests__/layout-main.spec.tsx
+++ b/web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/__tests__/layout-main.spec.tsx
@@ -1,20 +1,19 @@
-import type { ReactNode } from 'react'
-import type { DataSet } from '@/models/datasets'
-import { render, screen } from '@testing-library/react'
-import { IndexingType } from '@/app/components/datasets/create/step-two'
-import { ChunkingMode, DatasetPermission, DataSourceType } from '@/models/datasets'
-import { RETRIEVE_METHOD } from '@/types/app'
+import { render, screen, waitFor } from '@testing-library/react'
+import { usePathname, useRouter } from '@/next/navigation'
+import { useDatasetDetail, useDatasetRelatedApps } from '@/service/knowledge/use-dataset'
 import DatasetDetailLayout from '../layout-main'
 
-let mockPathname = '/datasets/test-dataset-id/documents'
-let mockDataset: DataSet | undefined
-let mockCanAccessSnippetsAndEvaluation = true
-
+const mockReplace = vi.fn()
 const mockSetAppSidebarExpand = vi.fn()
-const mockMutateDatasetRes = vi.fn()
 
 vi.mock('@/next/navigation', () => ({
-  usePathname: () => mockPathname,
+  usePathname: vi.fn(),
+  useRouter: vi.fn(),
+}))
+
+vi.mock('@/service/knowledge/use-dataset', () => ({
+  useDatasetDetail: vi.fn(),
+  useDatasetRelatedApps: vi.fn(),
 }))
 
 vi.mock('@/app/components/app/store', () => ({
@@ -23,208 +22,130 @@ vi.mock('@/app/components/app/store', () => ({
   }),
 }))
 
-vi.mock('@/hooks/use-breakpoints', () => ({
-  default: () => 'desktop',
-  MediaType: {
-    mobile: 'mobile',
-    desktop: 'desktop',
-  },
-}))
-
-vi.mock('@/context/event-emitter', () => ({
-  useEventEmitterContextContext: () => ({
-    eventEmitter: {
-      useSubscription: vi.fn(),
-    },
-  }),
-}))
-
 vi.mock('@/context/app-context', () => ({
   useAppContext: () => ({
     isCurrentWorkspaceDatasetOperator: false,
   }),
 }))
 
-vi.mock('@/hooks/use-snippet-and-evaluation-plan-access', () => ({
-  useSnippetAndEvaluationPlanAccess: () => ({
-    canAccess: mockCanAccessSnippetsAndEvaluation,
-    isReady: true,
+vi.mock('@/context/event-emitter', () => ({
+  useEventEmitterContextContext: () => ({
+    eventEmitter: undefined,
   }),
 }))
 
+vi.mock('@/hooks/use-breakpoints', () => ({
+  default: () => 'desktop',
+  MediaType: {
+    mobile: 'mobile',
+  },
+}))
+
 vi.mock('@/hooks/use-document-title', () => ({
   default: vi.fn(),
 }))
 
-vi.mock('@/service/knowledge/use-dataset', () => ({
-  useDatasetDetail: () => ({
-    data: mockDataset,
-    error: null,
-    refetch: mockMutateDatasetRes,
-  }),
-  useDatasetRelatedApps: () => ({
-    data: [],
-  }),
-}))
-
 vi.mock('@/app/components/app-sidebar', () => ({
-  default: ({
-    navigation,
-    children,
-  }: {
-    navigation: Array<{ name: string, href: string, disabled?: boolean }>
-    children?: ReactNode
-  }) => (
-    <div data-testid="app-sidebar">
-      {navigation.map(item => (
-        <button
-          key={item.href}
-          type="button"
-          disabled={item.disabled}
-        >
-          {item.name}
-        </button>
-      ))}
-      {children}
-    </div>
-  ),
+  default: () => <aside aria-label="dataset navigation" />,
 }))
 
 vi.mock('@/app/components/datasets/extra-info', () => ({
-  default: () => <div data-testid="dataset-extra-info" />,
+  default: () => <div />,
 }))
 
-vi.mock('@/app/components/base/loading', () => ({
-  default: () => <div role="status">loading</div>,
-}))
-
-const createDataset = (overrides: Partial<DataSet> = {}): DataSet => ({
-  id: 'test-dataset-id',
-  name: 'Test Dataset',
-  indexing_status: 'completed',
-  icon_info: {
-    icon: 'book',
-    icon_background: '#fff',
-    icon_type: 'emoji',
-    icon_url: '',
-  },
-  description: '',
-  permission: DatasetPermission.onlyMe,
-  data_source_type: DataSourceType.FILE,
-  indexing_technique: IndexingType.QUALIFIED,
-  created_by: 'user-1',
-  updated_by: 'user-1',
-  updated_at: 0,
-  app_count: 0,
-  doc_form: ChunkingMode.text,
-  document_count: 0,
-  total_document_count: 0,
-  word_count: 0,
-  provider: 'vendor',
-  embedding_model: 'text-embedding',
-  embedding_model_provider: 'openai',
-  embedding_available: true,
-  retrieval_model_dict: {
-    search_method: RETRIEVE_METHOD.semantic,
-    reranking_enable: false,
-    reranking_model: {
-      reranking_provider_name: '',
-      reranking_model_name: '',
-    },
-    top_k: 3,
-    score_threshold_enabled: false,
-    score_threshold: 0.5,
-  },
-  retrieval_model: {
-    search_method: RETRIEVE_METHOD.semantic,
-    reranking_enable: false,
-    reranking_model: {
-      reranking_provider_name: '',
-      reranking_model_name: '',
-    },
-    top_k: 3,
-    score_threshold_enabled: false,
-    score_threshold: 0.5,
-  },
-  tags: [],
-  external_knowledge_info: {
-    external_knowledge_id: '',
-    external_knowledge_api_id: '',
-    external_knowledge_api_name: '',
-    external_knowledge_api_endpoint: '',
-  },
-  external_retrieval_model: {
-    top_k: 3,
-    score_threshold: 0.5,
-    score_threshold_enabled: false,
-  },
-  built_in_field_enabled: false,
-  pipeline_id: 'pipeline-1',
-  is_published: true,
-  runtime_mode: 'rag_pipeline',
-  enable_api: false,
-  is_multimodal: false,
-  ...overrides,
-})
+const mockUsePathname = vi.mocked(usePathname)
+const mockUseRouter = vi.mocked(useRouter)
+const mockUseDatasetDetail = vi.mocked(useDatasetDetail)
+const mockUseDatasetRelatedApps = vi.mocked(useDatasetRelatedApps)
 
 describe('DatasetDetailLayout', () => {
   beforeEach(() => {
     vi.clearAllMocks()
-    mockPathname = '/datasets/test-dataset-id/documents'
-    mockDataset = createDataset()
-    mockCanAccessSnippetsAndEvaluation = true
+    mockUsePathname.mockReturnValue('/datasets/dataset-1/pipeline')
+    mockUseRouter.mockReturnValue({
+      back: vi.fn(),
+      forward: vi.fn(),
+      refresh: vi.fn(),
+      push: vi.fn(),
+      replace: mockReplace,
+      prefetch: vi.fn(),
+    })
+    mockUseDatasetRelatedApps.mockReturnValue({ data: undefined } as ReturnType<typeof useDatasetRelatedApps>)
   })
 
-  describe('Evaluation navigation', () => {
-    it('should hide the evaluation menu when the dataset is not a rag pipeline', () => {
-      mockDataset = createDataset({
-        runtime_mode: 'general',
-        is_published: false,
+  describe('Access Errors', () => {
+    it.each([403, 404])('should redirect to datasets page when dataset detail returns %s', async (status) => {
+      // Arrange
+      mockUseDatasetDetail.mockReturnValue({
+        data: undefined,
+        error: new Response(null, { status }),
+        refetch: vi.fn(),
+      } as unknown as ReturnType<typeof useDatasetDetail>)
+
+      // Act
+      render(
+        <DatasetDetailLayout datasetId="dataset-1">
+          <div>Pipeline content</div>
+        </DatasetDetailLayout>,
+      )
+
+      // Assert
+      await waitFor(() => {
+        expect(mockReplace).toHaveBeenCalledWith('/datasets')
       })
+      expect(mockUseDatasetRelatedApps).toHaveBeenCalledWith('dataset-1', { enabled: false })
+      expect(screen.queryByText('Pipeline content')).not.toBeInTheDocument()
+    })
 
+    it('should redirect when the dataset detail error exposes status without being a Response', async () => {
+      // Arrange
+      mockUseDatasetDetail.mockReturnValue({
+        data: undefined,
+        error: { status: 403 },
+        refetch: vi.fn(),
+      } as unknown as ReturnType<typeof useDatasetDetail>)
+
+      // Act
       render(
-        <DatasetDetailLayout datasetId="test-dataset-id">
-          <div data-testid="dataset-detail-content">content</div>
+        <DatasetDetailLayout datasetId="dataset-1">
+          <div>Pipeline content</div>
         </DatasetDetailLayout>,
       )
 
-      expect(screen.queryByRole('button', { name: 'common.datasetMenus.evaluation' })).not.toBeInTheDocument()
-    })
-
-    it('should disable the evaluation menu when the rag pipeline is unpublished', () => {
-      mockDataset = createDataset({
-        is_published: false,
+      // Assert
+      await waitFor(() => {
+        expect(mockReplace).toHaveBeenCalledWith('/datasets')
       })
-
-      render(
-        <DatasetDetailLayout datasetId="test-dataset-id">
-          <div data-testid="dataset-detail-content">content</div>
-        </DatasetDetailLayout>,
-      )
-
-      expect(screen.getByRole('button', { name: 'common.datasetMenus.evaluation' })).toBeDisabled()
+      expect(screen.queryByText('Pipeline content')).not.toBeInTheDocument()
     })
+  })
 
-    it('should enable the evaluation menu when the rag pipeline is published', () => {
+  describe('Rendering', () => {
+    it('should render children when dataset detail is available', () => {
+      // Arrange
+      mockUseDatasetDetail.mockReturnValue({
+        data: {
+          id: 'dataset-1',
+          name: 'Dataset 1',
+          provider: 'vendor',
+          runtime_mode: 'rag_pipeline',
+          is_published: true,
+        },
+        error: null,
+        refetch: vi.fn(),
+      } as unknown as ReturnType<typeof useDatasetDetail>)
+
+      // Act
       render(
-        <DatasetDetailLayout datasetId="test-dataset-id">
-          <div data-testid="dataset-detail-content">content</div>
+        <DatasetDetailLayout datasetId="dataset-1">
+          <div>Pipeline content</div>
         </DatasetDetailLayout>,
       )
 
-      expect(screen.getByRole('button', { name: 'common.datasetMenus.evaluation' })).toBeEnabled()
-    })
-
-    it('should hide the evaluation menu when snippet and evaluation access is unavailable', () => {
-      mockCanAccessSnippetsAndEvaluation = false
-
-      render(
-        <DatasetDetailLayout datasetId="test-dataset-id">
-          <div data-testid="dataset-detail-content">content</div>
-        </DatasetDetailLayout>,
-      )
-
-      expect(screen.queryByRole('button', { name: 'common.datasetMenus.evaluation' })).not.toBeInTheDocument()
+      // Assert
+      expect(screen.getByText('Pipeline content')).toBeInTheDocument()
+      expect(mockUseDatasetRelatedApps).toHaveBeenCalledWith('dataset-1', { enabled: true })
+      expect(mockReplace).not.toHaveBeenCalled()
     })
   })
 })
diff --git a/web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/layout-main.tsx b/web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/layout-main.tsx
index 179557b40e..83797b1fc5 100644
--- a/web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/layout-main.tsx
+++ b/web/app/(commonLayout)/datasets/(datasetDetailLayout)/[datasetId]/layout-main.tsx
@@ -23,8 +23,7 @@ import DatasetDetailContext from '@/context/dataset-detail'
 import { useEventEmitterContextContext } from '@/context/event-emitter'
 import useBreakpoints, { MediaType } from '@/hooks/use-breakpoints'
 import useDocumentTitle from '@/hooks/use-document-title'
-import { useSnippetAndEvaluationPlanAccess } from '@/hooks/use-snippet-and-evaluation-plan-access'
-import { usePathname } from '@/next/navigation'
+import { usePathname, useRouter } from '@/next/navigation'
 import { useDatasetDetail, useDatasetRelatedApps } from '@/service/knowledge/use-dataset'
 
 type IAppDetailLayoutProps = {
@@ -32,8 +31,17 @@ type IAppDetailLayoutProps = {
   datasetId: string
 }
 
-const EvaluationIcon = ({ className }: { className?: string }) => {
-  return <span aria-hidden className={cn('i-custom-vender-line-others-evaluation', className)} />
+const getResponseStatus = (error: unknown) => {
+  if (error instanceof Response)
+    return error.status
+
+  if (typeof error === 'object' && error && 'status' in error && typeof error.status === 'number')
+    return error.status
+}
+
+const shouldRedirectToDatasetList = (error: unknown) => {
+  const status = getResponseStatus(error)
+  return status === 403 || status === 404
 }
 
 const DatasetDetailLayout: FC<IAppDetailLayoutProps> = (props) => {
@@ -42,6 +50,7 @@ const DatasetDetailLayout: FC<IAppDetailLayoutProps> = (props) => {
     datasetId,
   } = props
   const { t } = useTranslation()
+  const router = useRouter()
   const pathname = usePathname()
   const hideSideBar = pathname.endsWith('documents/create') || pathname.endsWith('documents/create-from-pipeline')
   const isPipelineCanvas = pathname.endsWith('/pipeline')
@@ -54,15 +63,14 @@ const DatasetDetailLayout: FC<IAppDetailLayoutProps> = (props) => {
       setHideHeader(v.payload)
   })
   const { isCurrentWorkspaceDatasetOperator } = useAppContext()
-  const { canAccess: canAccessSnippetsAndEvaluation } = useSnippetAndEvaluationPlanAccess()
 
   const media = useBreakpoints()
   const isMobile = media === MediaType.mobile
 
   const { data: datasetRes, error, refetch: mutateDatasetRes } = useDatasetDetail(datasetId)
+  const shouldRedirect = shouldRedirectToDatasetList(error)
 
-  const { data: relatedApps } = useDatasetRelatedApps(datasetId)
-  const isRagPipelineDataset = datasetRes?.runtime_mode === 'rag_pipeline'
+  const { data: relatedApps } = useDatasetRelatedApps(datasetId, { enabled: !!datasetRes && !shouldRedirect })
 
   const isButtonDisabledWithPipeline = useMemo(() => {
     if (!datasetRes)
@@ -93,36 +101,24 @@ const DatasetDetailLayout: FC<IAppDetailLayoutProps> = (props) => {
     ]
 
     if (datasetRes?.provider !== 'external') {
-      return [
-        {
-          name: t('datasetMenus.documents', { ns: 'common' }),
-          href: `/datasets/${datasetId}/documents`,
-          icon: RiFileTextLine,
-          selectedIcon: RiFileTextFill,
-          disabled: isButtonDisabledWithPipeline,
-        },
-        {
-          name: t('datasetMenus.pipeline', { ns: 'common' }),
-          href: `/datasets/${datasetId}/pipeline`,
-          icon: PipelineLine as RemixiconComponentType,
-          selectedIcon: PipelineFill as RemixiconComponentType,
-          disabled: false,
-        },
-        ...baseNavigation,
-        ...(isRagPipelineDataset && canAccessSnippetsAndEvaluation
-          ? [{
-              name: t('datasetMenus.evaluation', { ns: 'common' }),
-              href: `/datasets/${datasetId}/evaluation`,
-              icon: EvaluationIcon,
-              selectedIcon: EvaluationIcon,
-              disabled: isButtonDisabledWithPipeline,
-            }]
-          : []),
-      ]
+      baseNavigation.unshift({
+        name: t('datasetMenus.pipeline', { ns: 'common' }),
+        href: `/datasets/${datasetId}/pipeline`,
+        icon: PipelineLine as RemixiconComponentType,
+        selectedIcon: PipelineFill as RemixiconComponentType,
+        disabled: false,
+      })
+      baseNavigation.unshift({
+        name: t('datasetMenus.documents', { ns: 'common' }),
+        href: `/datasets/${datasetId}/documents`,
+        icon: RiFileTextLine,
+        selectedIcon: RiFileTextFill,
+        disabled: isButtonDisabledWithPipeline,
+      })
     }
 
     return baseNavigation
-  }, [canAccessSnippetsAndEvaluation, t, datasetId, isButtonDisabledWithPipeline, isRagPipelineDataset, datasetRes?.provider])
+  }, [t, datasetId, isButtonDisabledWithPipeline, datasetRes?.provider])
 
   useDocumentTitle(datasetRes?.name || t('menus.datasets', { ns: 'common' }))
 
@@ -134,9 +130,17 @@ const DatasetDetailLayout: FC<IAppDetailLayoutProps> = (props) => {
     setAppSidebarExpand(isMobile ? mode : localeMode)
   }, [isMobile, setAppSidebarExpand])
 
+  useEffect(() => {
+    if (shouldRedirect)
+      router.replace('/datasets')
+  }, [router, shouldRedirect])
+
   if (!datasetRes && !error)
     return <Loading type="app" />
 
+  if (shouldRedirect)
+    return <Loading type="app" />
+
   return (
     <div
       className={cn(
diff --git a/web/app/(commonLayout)/datasets/layout.spec.tsx b/web/app/(commonLayout)/datasets/layout.spec.tsx
index 9c01cffba8..7abc2253ce 100644
--- a/web/app/(commonLayout)/datasets/layout.spec.tsx
+++ b/web/app/(commonLayout)/datasets/layout.spec.tsx
@@ -63,12 +63,12 @@ describe('DatasetsLayout', () => {
 
     render((
       <DatasetsLayout>
-        <div data-testid="datasets-content">datasets</div>
+        <div>datasets</div>
       </DatasetsLayout>
     ))
 
     expect(screen.getByRole('status')).toBeInTheDocument()
-    expect(screen.queryByTestId('datasets-content')).not.toBeInTheDocument()
+    expect(screen.queryByText('datasets')).not.toBeInTheDocument()
     expect(mockReplace).not.toHaveBeenCalled()
   })
 
@@ -80,11 +80,11 @@ describe('DatasetsLayout', () => {
 
     render((
       <DatasetsLayout>
-        <div data-testid="datasets-content">datasets</div>
+        <div>datasets</div>
       </DatasetsLayout>
     ))
 
-    expect(screen.queryByTestId('datasets-content')).not.toBeInTheDocument()
+    expect(screen.queryByText('datasets')).not.toBeInTheDocument()
     await waitFor(() => {
       expect(mockReplace).toHaveBeenCalledWith('/apps')
     })
@@ -98,11 +98,11 @@ describe('DatasetsLayout', () => {
 
     render((
       <DatasetsLayout>
-        <div data-testid="datasets-content">datasets</div>
+        <div>datasets</div>
       </DatasetsLayout>
     ))
 
-    expect(screen.getByTestId('datasets-content')).toBeInTheDocument()
+    expect(screen.getByText('datasets')).toBeInTheDocument()
     expect(mockReplace).not.toHaveBeenCalled()
   })
 })
diff --git a/web/app/(commonLayout)/education-apply/page.tsx b/web/app/(commonLayout)/education-apply/page.tsx
index 44ba5ee8ad..82e47d5c0b 100644
--- a/web/app/(commonLayout)/education-apply/page.tsx
+++ b/web/app/(commonLayout)/education-apply/page.tsx
@@ -1,10 +1,8 @@
 'use client'
 
-import {
-  useEffect,
-  useMemo,
-} from 'react'
+import { useEffect } from 'react'
 import EducationApplyPage from '@/app/education-apply/education-apply-page'
+import RootLoading from '@/app/loading'
 import { useProviderContext } from '@/context/provider-context'
 import {
   useRouter,
@@ -13,17 +11,24 @@ import {
 
 export default function EducationApply() {
   const router = useRouter()
-  const { enableEducationPlan } = useProviderContext()
+  const {
+    enableEducationPlan,
+    isFetchedPlanInfo,
+    isLoadingEducationAccountInfo,
+  } = useProviderContext()
   const searchParams = useSearchParams()
   const token = searchParams.get('token')
-  const showEducationApplyPage = useMemo(() => {
-    return enableEducationPlan && token
-  }, [enableEducationPlan, token])
 
   useEffect(() => {
-    if (!showEducationApplyPage)
+    if (!isFetchedPlanInfo)
+      return
+
+    if (!enableEducationPlan || !token)
       router.replace('/')
-  }, [showEducationApplyPage, router])
+  }, [enableEducationPlan, isFetchedPlanInfo, router, token])
+
+  if (!isFetchedPlanInfo || !enableEducationPlan || !token || isLoadingEducationAccountInfo)
+    return <RootLoading />
 
   return <EducationApplyPage />
 }
diff --git a/web/app/(commonLayout)/layout.tsx b/web/app/(commonLayout)/layout.tsx
index 699d2a4348..2467f35b7b 100644
--- a/web/app/(commonLayout)/layout.tsx
+++ b/web/app/(commonLayout)/layout.tsx
@@ -2,6 +2,7 @@ import type { ReactNode } from 'react'
 import * as React from 'react'
 import { AppInitializer } from '@/app/components/app-initializer'
 import InSiteMessageNotification from '@/app/components/app/in-site-message/notification'
+import AmplitudeProvider from '@/app/components/base/amplitude'
 import GA, { GaType } from '@/app/components/base/ga'
 import Zendesk from '@/app/components/base/zendesk'
 import { GotoAnything } from '@/app/components/goto-anything'
@@ -19,6 +20,7 @@ const Layout = ({ children }: { children: ReactNode }) => {
   return (
     <>
       <GA gaType={GaType.admin} />
+      <AmplitudeProvider />
       <AppInitializer>
         <AppContextProvider>
           <EventEmitterContextProvider>
diff --git a/web/app/(commonLayout)/role-route-guard.spec.tsx b/web/app/(commonLayout)/role-route-guard.spec.tsx
index ca1550f0b8..ef409393b0 100644
--- a/web/app/(commonLayout)/role-route-guard.spec.tsx
+++ b/web/app/(commonLayout)/role-route-guard.spec.tsx
@@ -48,12 +48,12 @@ describe('RoleRouteGuard', () => {
 
     render((
       <RoleRouteGuard>
-        <div data-testid="guarded-content">content</div>
+        <div>content</div>
       </RoleRouteGuard>
     ))
 
     expect(screen.getByRole('status')).toBeInTheDocument()
-    expect(screen.queryByTestId('guarded-content')).not.toBeInTheDocument()
+    expect(screen.queryByText('content')).not.toBeInTheDocument()
     expect(mockReplace).not.toHaveBeenCalled()
   })
 
@@ -64,11 +64,11 @@ describe('RoleRouteGuard', () => {
 
     render((
       <RoleRouteGuard>
-        <div data-testid="guarded-content">content</div>
+        <div>content</div>
       </RoleRouteGuard>
     ))
 
-    expect(screen.queryByTestId('guarded-content')).not.toBeInTheDocument()
+    expect(screen.queryByText('content')).not.toBeInTheDocument()
     await waitFor(() => {
       expect(mockReplace).toHaveBeenCalledWith('/datasets')
     })
@@ -82,11 +82,11 @@ describe('RoleRouteGuard', () => {
 
     render((
       <RoleRouteGuard>
-        <div data-testid="guarded-content">content</div>
+        <div>content</div>
       </RoleRouteGuard>
     ))
 
-    expect(screen.getByTestId('guarded-content')).toBeInTheDocument()
+    expect(screen.getByText('content')).toBeInTheDocument()
     expect(mockReplace).not.toHaveBeenCalled()
   })
 
@@ -98,11 +98,11 @@ describe('RoleRouteGuard', () => {
 
     render((
       <RoleRouteGuard>
-        <div data-testid="guarded-content">content</div>
+        <div>content</div>
       </RoleRouteGuard>
     ))
 
-    expect(screen.getByTestId('guarded-content')).toBeInTheDocument()
+    expect(screen.getByText('content')).toBeInTheDocument()
     expect(screen.queryByRole('status')).not.toBeInTheDocument()
     expect(mockReplace).not.toHaveBeenCalled()
   })
diff --git a/web/app/(shareLayout)/components/authenticated-layout.tsx b/web/app/(shareLayout)/components/authenticated-layout.tsx
index a7b65f33fe..3ee5d52603 100644
--- a/web/app/(shareLayout)/components/authenticated-layout.tsx
+++ b/web/app/(shareLayout)/components/authenticated-layout.tsx
@@ -39,7 +39,9 @@ const AuthenticatedLayout = ({ children }: { children: React.ReactNode }) => {
   const getSigninUrl = useCallback(() => {
     const params = new URLSearchParams(searchParams)
     params.delete('message')
-    params.set('redirect_url', pathname)
+    const query = params.toString()
+    const fullPath = query ? `${pathname}?${query}` : pathname
+    params.set('redirect_url', fullPath)
     return `/webapp-signin?${params.toString()}`
   }, [searchParams, pathname])
 
diff --git a/web/app/account/(commonLayout)/account-page/AvatarWithEdit.tsx b/web/app/account/(commonLayout)/account-page/AvatarWithEdit.tsx
index 429eece383..8aaf6c8ad5 100644
--- a/web/app/account/(commonLayout)/account-page/AvatarWithEdit.tsx
+++ b/web/app/account/(commonLayout)/account-page/AvatarWithEdit.tsx
@@ -8,7 +8,6 @@ import { Avatar } from '@langgenius/dify-ui/avatar'
 import { Button } from '@langgenius/dify-ui/button'
 import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
-import { RiDeleteBin5Line, RiPencilLine } from '@remixicon/react'
 import * as React from 'react'
 import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -29,9 +28,9 @@ const AvatarWithEdit = ({ onSave, ...props }: AvatarWithEditProps) => {
   const [isShowAvatarPicker, setIsShowAvatarPicker] = useState(false)
   const [uploading, setUploading] = useState(false)
   const [isShowDeleteConfirm, setIsShowDeleteConfirm] = useState(false)
-  const [hoverArea, setHoverArea] = useState<string>('left')
 
   const [onAvatarError, setOnAvatarError] = useState(false)
+  const canDeleteAvatar = !!props.avatar && !onAvatarError
 
   const handleImageInput: OnImageInput = useCallback(async (isCropped: boolean, fileOrTempUrl: string | File, croppedAreaPixels?: Area, fileName?: string) => {
     setInputImageInfo(
@@ -65,11 +64,16 @@ const AvatarWithEdit = ({ onSave, ...props }: AvatarWithEditProps) => {
     }
   }, [onSave, t])
 
+  const handleDeleteAvatarClick = useCallback(() => {
+    setIsShowAvatarPicker(false)
+    setIsShowDeleteConfirm(true)
+  }, [])
+
   const { handleLocalFileUpload } = useLocalFileUploader({
     limit: 3,
     disabled: false,
     onUpload: (imageFile: ImageFile) => {
-      if (imageFile.progress === 100) {
+      if (imageFile.progress === 100 && imageFile.fileId) {
         setUploading(false)
         setInputImageInfo(undefined)
         handleSaveAvatar(imageFile.fileId)
@@ -100,36 +104,17 @@ const AvatarWithEdit = ({ onSave, ...props }: AvatarWithEditProps) => {
   return (
     <>
       <div>
-        <div className="group relative">
+        <button
+          type="button"
+          aria-label={t('avatar.editAction', { ns: 'common' })}
+          className="group relative inline-flex overflow-hidden rounded-full border-none bg-transparent p-0 outline-hidden hover:opacity-90 focus-visible:ring-2 focus-visible:ring-components-input-border-hover active:opacity-80"
+          onClick={() => setIsShowAvatarPicker(true)}
+        >
           <Avatar {...props} onLoadingStatusChange={status => setOnAvatarError(status === 'error')} />
-          <div
-            className="absolute inset-0 flex cursor-pointer items-center justify-center rounded-full bg-black/50 opacity-0 transition-opacity group-hover:opacity-100"
-            onClick={() => {
-              if (hoverArea === 'right' && !onAvatarError)
-                setIsShowDeleteConfirm(true)
-              else
-                setIsShowAvatarPicker(true)
-            }}
-            onMouseMove={(e) => {
-              const rect = e.currentTarget.getBoundingClientRect()
-              const x = e.clientX - rect.left
-              const isRight = x > rect.width / 2
-              setHoverArea(isRight ? 'right' : 'left')
-            }}
-          >
-            {hoverArea === 'right' && !onAvatarError
-              ? (
-                  <span className="text-xs text-white">
-                    <RiDeleteBin5Line />
-                  </span>
-                )
-              : (
-                  <span className="text-xs text-white">
-                    <RiPencilLine />
-                  </span>
-                )}
-          </div>
-        </div>
+          <span className="pointer-events-none absolute inset-0 flex items-center justify-center rounded-full bg-black/50 text-white opacity-0 group-hover:opacity-100 motion-safe:transition-opacity">
+            <span aria-hidden="true" className="i-ri-pencil-line size-5" />
+          </span>
+        </button>
       </div>
 
       <Dialog open={isShowAvatarPicker} onOpenChange={open => !open && setIsShowAvatarPicker(false)}>
@@ -138,11 +123,16 @@ const AvatarWithEdit = ({ onSave, ...props }: AvatarWithEditProps) => {
           <Divider className="m-0" />
 
           <div className="flex w-full items-center justify-center gap-2 p-3">
-            <Button className="w-full" onClick={() => setIsShowAvatarPicker(false)}>
+            {canDeleteAvatar && (
+              <Button tone="destructive" className="shrink-0" onClick={handleDeleteAvatarClick}>
+                {t('operation.delete', { ns: 'common' })}
+              </Button>
+            )}
+            <Button className="min-w-0 flex-1" onClick={() => setIsShowAvatarPicker(false)}>
               {t('iconPicker.cancel', { ns: 'app' })}
             </Button>
 
-            <Button variant="primary" className="w-full" disabled={uploading || !inputImageInfo} loading={uploading} onClick={handleSelect}>
+            <Button variant="primary" className="min-w-0 flex-1" disabled={uploading || !inputImageInfo} loading={uploading} onClick={handleSelect}>
               {t('iconPicker.ok', { ns: 'app' })}
             </Button>
           </div>
diff --git a/web/app/account/(commonLayout)/account-page/email-change-modal.tsx b/web/app/account/(commonLayout)/account-page/email-change-modal.tsx
index f3bb71c2d2..83bca6a8cb 100644
--- a/web/app/account/(commonLayout)/account-page/email-change-modal.tsx
+++ b/web/app/account/(commonLayout)/account-page/email-change-modal.tsx
@@ -3,8 +3,7 @@ import { Button } from '@langgenius/dify-ui/button'
 import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
 import { RiCloseLine } from '@remixicon/react'
-import * as React from 'react'
-import { useState } from 'react'
+import { useCallback, useEffect, useRef, useState } from 'react'
 import { Trans, useTranslation } from 'react-i18next'
 import Input from '@/app/components/base/input'
 import { useRouter } from '@/next/navigation'
@@ -18,22 +17,23 @@ import { useLogout } from '@/service/use-common'
 import { asyncRunSafe } from '@/utils'
 
 type Props = {
-  show: boolean
   onClose: () => void
   email: string
 }
 
-enum STEP {
-  start = 'start',
-  verifyOrigin = 'verifyOrigin',
-  newEmail = 'newEmail',
-  verifyNew = 'verifyNew',
-}
+const STEP = {
+  start: 'start',
+  verifyOrigin: 'verifyOrigin',
+  newEmail: 'newEmail',
+  verifyNew: 'verifyNew',
+} as const
 
-const EmailChangeModal = ({ onClose, email, show }: Props) => {
+type Step = typeof STEP[keyof typeof STEP]
+
+const EmailChangeModal = ({ onClose, email }: Props) => {
   const { t } = useTranslation()
   const router = useRouter()
-  const [step, setStep] = useState<STEP>(STEP.start)
+  const [step, setStep] = useState<Step>(STEP.start)
   const [code, setCode] = useState<string>('')
   const [mail, setMail] = useState<string>('')
   const [time, setTime] = useState<number>(0)
@@ -41,13 +41,25 @@ const EmailChangeModal = ({ onClose, email, show }: Props) => {
   const [newEmailExited, setNewEmailExited] = useState<boolean>(false)
   const [unAvailableEmail, setUnAvailableEmail] = useState<boolean>(false)
   const [isCheckingEmail, setIsCheckingEmail] = useState<boolean>(false)
+  const timerRef = useRef<ReturnType<typeof setInterval> | null>(null)
+
+  const clearCountdown = useCallback(() => {
+    if (!timerRef.current)
+      return
+
+    clearInterval(timerRef.current)
+    timerRef.current = null
+  }, [])
+
+  useEffect(() => clearCountdown, [clearCountdown])
 
   const startCount = () => {
+    clearCountdown()
     setTime(60)
-    const timer = setInterval(() => {
+    timerRef.current = setInterval(() => {
       setTime((prev) => {
-        if (prev <= 0) {
-          clearInterval(timer)
+        if (prev <= 1) {
+          clearCountdown()
           return 0
         }
         return prev - 1
@@ -181,7 +193,7 @@ const EmailChangeModal = ({ onClose, email, show }: Props) => {
   }
 
   return (
-    <Dialog open={show} onOpenChange={open => !open && onClose()}>
+    <Dialog open onOpenChange={open => !open && onClose()}>
       <DialogContent className="w-[420px]! p-6!">
         <div className="absolute top-5 right-5 cursor-pointer p-1.5" onClick={onClose}>
           <RiCloseLine className="h-5 w-5 text-text-tertiary" />
diff --git a/web/app/account/(commonLayout)/account-page/index.tsx b/web/app/account/(commonLayout)/account-page/index.tsx
index 09c083b60b..b85fb1abba 100644
--- a/web/app/account/(commonLayout)/account-page/index.tsx
+++ b/web/app/account/(commonLayout)/account-page/index.tsx
@@ -7,7 +7,7 @@ import { toast } from '@langgenius/dify-ui/toast'
 import {
   RiGraduationCapFill,
 } from '@remixicon/react'
-import { useQueryClient, useSuspenseQuery } from '@tanstack/react-query'
+import { useQuery, useQueryClient, useSuspenseQuery } from '@tanstack/react-query'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import AppIcon from '@/app/components/base/app-icon'
@@ -16,9 +16,9 @@ import PremiumBadge from '@/app/components/base/premium-badge'
 import Collapse from '@/app/components/header/account-setting/collapse'
 import { IS_CE_EDITION, validPassword } from '@/config'
 import { useProviderContext } from '@/context/provider-context'
+import { consoleQuery } from '@/service/client'
 import { updateUserProfile } from '@/service/common'
 import { systemFeaturesQueryOptions } from '@/service/system-features'
-import { useAppList } from '@/service/use-apps'
 import { commonQueryKeys, userProfileQueryOptions } from '@/service/use-common'
 import DeleteAccount from '../delete-account'
 
@@ -35,7 +35,15 @@ const descriptionClassName = `
 export default function AccountPage() {
   const { t } = useTranslation()
   const { data: systemFeatures } = useSuspenseQuery(systemFeaturesQueryOptions())
-  const { data: appList } = useAppList({ page: 1, limit: 100, name: '' })
+  const { data: appList } = useQuery(consoleQuery.apps.list.queryOptions({
+    input: {
+      query: {
+        page: 1,
+        limit: 100,
+        name: '',
+      },
+    },
+  }))
   const apps = appList?.data || []
   const queryClient = useQueryClient()
   // Cache is warmed by AppContextProvider's useSuspenseQuery; this hits cache synchronously.
@@ -129,7 +137,7 @@ export default function AccountPage() {
   }
 
   const renderAppItem = (item: IItem) => {
-    const { icon, icon_background, icon_type, icon_url } = item as any
+    const { icon, icon_background, icon_type, icon_url } = item as IItem & Pick<App, 'icon' | 'icon_background' | 'icon_type' | 'icon_url'>
     return (
       <div className="flex px-3 py-1">
         <div className="mr-3">
@@ -158,7 +166,7 @@ export default function AccountPage() {
             {userProfile.name}
             {isEducationAccount && (
               <PremiumBadge size="s" color="blue" className="ml-1 !px-2">
-                <RiGraduationCapFill className="mr-1 h-3 w-3" />
+                <RiGraduationCapFill aria-hidden="true" className="mr-1 h-3 w-3" />
                 <span className="system-2xs-medium">EDU</span>
               </PremiumBadge>
             )}
@@ -215,116 +223,107 @@ export default function AccountPage() {
         )}
         {!IS_CE_EDITION && <Button className="mt-2 text-components-button-destructive-secondary-text" onClick={() => setShowDeleteAccountModal(true)}>{t('account.delete', { ns: 'common' })}</Button>}
       </div>
-      {
-        editNameModalVisible && (
-          <Dialog open={editNameModalVisible} onOpenChange={open => !open && setEditNameModalVisible(false)}>
-            <DialogContent className="w-[420px]! p-6!">
-              <div className="mb-6 title-2xl-semi-bold text-text-primary">{t('account.editName', { ns: 'common' })}</div>
-              <div className={titleClassName}>{t('account.name', { ns: 'common' })}</div>
-              <Input
-                className="mt-2"
-                value={editName}
-                onChange={e => setEditName(e.target.value)}
-              />
-              <div className="mt-10 flex justify-end">
-                <Button className="mr-2" onClick={() => setEditNameModalVisible(false)}>{t('operation.cancel', { ns: 'common' })}</Button>
-                <Button
-                  disabled={editing || !editName}
-                  variant="primary"
-                  onClick={handleSaveName}
-                >
-                  {t('operation.save', { ns: 'common' })}
-                </Button>
-              </div>
-            </DialogContent>
-          </Dialog>
-        )
-      }
-      {
-        editPasswordModalVisible && (
-          <Dialog open={editPasswordModalVisible} onOpenChange={open => !open && (setEditPasswordModalVisible(false), resetPasswordForm())}>
-            <DialogContent className="w-[420px]! p-6!">
-              <div className="mb-6 title-2xl-semi-bold text-text-primary">{userProfile.is_password_set ? t('account.resetPassword', { ns: 'common' }) : t('account.setPassword', { ns: 'common' })}</div>
-              {userProfile.is_password_set && (
-                <>
-                  <div className={titleClassName}>{t('account.currentPassword', { ns: 'common' })}</div>
-                  <div className="relative mt-2">
-                    <Input
-                      type={showCurrentPassword ? 'text' : 'password'}
-                      value={currentPassword}
-                      onChange={e => setCurrentPassword(e.target.value)}
-                    />
-
-                    <div className="absolute inset-y-0 right-0 flex items-center">
-                      <Button
-                        type="button"
-                        variant="ghost"
-                        onClick={() => setShowCurrentPassword(!showCurrentPassword)}
-                      >
-                        {showCurrentPassword ? '👀' : '😝'}
-                      </Button>
-                    </div>
-                  </div>
-                </>
-              )}
-              <div className="mt-8 system-sm-semibold text-text-secondary">
-                {userProfile.is_password_set ? t('account.newPassword', { ns: 'common' }) : t('account.password', { ns: 'common' })}
-              </div>
+      <Dialog open={editNameModalVisible} onOpenChange={open => !open && setEditNameModalVisible(false)}>
+        <DialogContent className="w-105 p-6">
+          <div className="mb-6 title-2xl-semi-bold text-text-primary">{t('account.editName', { ns: 'common' })}</div>
+          <div className={titleClassName}>{t('account.name', { ns: 'common' })}</div>
+          <Input
+            className="mt-2"
+            value={editName}
+            onChange={e => setEditName(e.target.value)}
+          />
+          <div className="mt-10 flex justify-end">
+            <Button className="mr-2" onClick={() => setEditNameModalVisible(false)}>{t('operation.cancel', { ns: 'common' })}</Button>
+            <Button
+              disabled={editing || !editName}
+              variant="primary"
+              onClick={handleSaveName}
+            >
+              {t('operation.save', { ns: 'common' })}
+            </Button>
+          </div>
+        </DialogContent>
+      </Dialog>
+      <Dialog open={editPasswordModalVisible} onOpenChange={open => !open && (setEditPasswordModalVisible(false), resetPasswordForm())}>
+        <DialogContent className="w-[420px]! p-6!">
+          <div className="mb-6 title-2xl-semi-bold text-text-primary">{userProfile.is_password_set ? t('account.resetPassword', { ns: 'common' }) : t('account.setPassword', { ns: 'common' })}</div>
+          {userProfile.is_password_set && (
+            <>
+              <div className={titleClassName}>{t('account.currentPassword', { ns: 'common' })}</div>
               <div className="relative mt-2">
                 <Input
-                  type={showPassword ? 'text' : 'password'}
-                  value={password}
-                  onChange={e => setPassword(e.target.value)}
+                  type={showCurrentPassword ? 'text' : 'password'}
+                  value={currentPassword}
+                  onChange={e => setCurrentPassword(e.target.value)}
                 />
                 <div className="absolute inset-y-0 right-0 flex items-center">
                   <Button
                     type="button"
                     variant="ghost"
-                    onClick={() => setShowPassword(!showPassword)}
+                    onClick={() => setShowCurrentPassword(!showCurrentPassword)}
                   >
-                    {showPassword ? '👀' : '😝'}
+                    {showCurrentPassword ? '👀' : '😝'}
                   </Button>
                 </div>
               </div>
-              <div className="mt-8 system-sm-semibold text-text-secondary">{t('account.confirmPassword', { ns: 'common' })}</div>
-              <div className="relative mt-2">
-                <Input
-                  type={showConfirmPassword ? 'text' : 'password'}
-                  value={confirmPassword}
-                  onChange={e => setConfirmPassword(e.target.value)}
-                />
-                <div className="absolute inset-y-0 right-0 flex items-center">
-                  <Button
-                    type="button"
-                    variant="ghost"
-                    onClick={() => setShowConfirmPassword(!showConfirmPassword)}
-                  >
-                    {showConfirmPassword ? '👀' : '😝'}
-                  </Button>
-                </div>
-              </div>
-              <div className="mt-10 flex justify-end">
-                <Button
-                  className="mr-2"
-                  onClick={() => {
-                    setEditPasswordModalVisible(false)
-                    resetPasswordForm()
-                  }}
-                >
-                  {t('operation.cancel', { ns: 'common' })}
-                </Button>
-                <Button
-                  disabled={editing}
-                  variant="primary"
-                  onClick={handleSavePassword}
-                >
-                  {userProfile.is_password_set ? t('operation.reset', { ns: 'common' }) : t('operation.save', { ns: 'common' })}
-                </Button>
-              </div>
-            </DialogContent>
-          </Dialog>
-        )
-      }
+            </>
+          )}
+          <div className="mt-8 system-sm-semibold text-text-secondary">
+            {userProfile.is_password_set ? t('account.newPassword', { ns: 'common' }) : t('account.password', { ns: 'common' })}
+          </div>
+          <div className="relative mt-2">
+            <Input
+              type={showPassword ? 'text' : 'password'}
+              value={password}
+              onChange={e => setPassword(e.target.value)}
+            />
+            <div className="absolute inset-y-0 right-0 flex items-center">
+              <Button
+                type="button"
+                variant="ghost"
+                onClick={() => setShowPassword(!showPassword)}
+              >
+                {showPassword ? '👀' : '😝'}
+              </Button>
+            </div>
+          </div>
+          <div className="mt-8 system-sm-semibold text-text-secondary">{t('account.confirmPassword', { ns: 'common' })}</div>
+          <div className="relative mt-2">
+            <Input
+              type={showConfirmPassword ? 'text' : 'password'}
+              value={confirmPassword}
+              onChange={e => setConfirmPassword(e.target.value)}
+            />
+            <div className="absolute inset-y-0 right-0 flex items-center">
+              <Button
+                type="button"
+                variant="ghost"
+                onClick={() => setShowConfirmPassword(!showConfirmPassword)}
+              >
+                {showConfirmPassword ? '👀' : '😝'}
+              </Button>
+            </div>
+          </div>
+          <div className="mt-10 flex justify-end">
+            <Button
+              className="mr-2"
+              onClick={() => {
+                setEditPasswordModalVisible(false)
+                resetPasswordForm()
+              }}
+            >
+              {t('operation.cancel', { ns: 'common' })}
+            </Button>
+            <Button
+              disabled={editing}
+              variant="primary"
+              onClick={handleSavePassword}
+            >
+              {userProfile.is_password_set ? t('operation.reset', { ns: 'common' }) : t('operation.save', { ns: 'common' })}
+            </Button>
+          </div>
+        </DialogContent>
+      </Dialog>
       {
         showDeleteAccountModal && (
           <DeleteAccount
@@ -333,13 +332,15 @@ export default function AccountPage() {
           />
         )
       }
-      {showUpdateEmail && (
-        <EmailChangeModal
-          show={showUpdateEmail}
-          onClose={() => setShowUpdateEmail(false)}
-          email={userProfile.email}
-        />
-      )}
+      {/* Use conditional JSX instead of a mounted controlled Dialog so closing destroys the email-change form session. */}
+      {showUpdateEmail
+        ? (
+            <EmailChangeModal
+              onClose={() => setShowUpdateEmail(false)}
+              email={userProfile.email}
+            />
+          )
+        : null}
     </>
   )
 }
diff --git a/web/app/account/(commonLayout)/avatar.tsx b/web/app/account/(commonLayout)/avatar.tsx
index ccae182c9a..b0cdd853eb 100644
--- a/web/app/account/(commonLayout)/avatar.tsx
+++ b/web/app/account/(commonLayout)/avatar.tsx
@@ -1,14 +1,15 @@
 'use client'
-import { Menu, MenuButton, MenuItem, MenuItems, Transition } from '@headlessui/react'
 import { Avatar } from '@langgenius/dify-ui/avatar'
+import { cn } from '@langgenius/dify-ui/cn'
 import {
-  RiGraduationCapFill,
-} from '@remixicon/react'
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from '@langgenius/dify-ui/dropdown-menu'
 import { useSuspenseQuery } from '@tanstack/react-query'
-import { Fragment } from 'react'
 import { useTranslation } from 'react-i18next'
 import { resetUser } from '@/app/components/base/amplitude/utils'
-import { LogOut01 } from '@/app/components/base/icons/src/vender/line/general'
 import PremiumBadge from '@/app/components/base/premium-badge'
 import { useProviderContext } from '@/context/provider-context'
 import { useRouter } from '@/next/navigation'
@@ -38,73 +39,48 @@ export default function AppSelector() {
   }
 
   return (
-    <Menu as="div" className="relative inline-block text-left">
-      {
-        ({ open }) => (
-          <>
-            <div>
-              <MenuButton
-                className={`
-                    p-1x inline-flex
-                    items-center rounded-[20px] text-sm
-                    text-text-primary
-                    mobile:px-1
-                    ${open && 'bg-components-panel-bg-blur'}
-                  `}
-              >
-                <Avatar avatar={userProfile.avatar_url} name={userProfile.name} />
-              </MenuButton>
+    <DropdownMenu modal={false}>
+      <DropdownMenuTrigger
+        aria-label={userProfile.name}
+        className={cn(
+          'inline-flex size-8 items-center justify-center rounded-full border-none bg-transparent p-0 text-sm text-text-primary outline-hidden',
+          'hover:opacity-80 focus-visible:ring-1 focus-visible:ring-components-input-border-hover active:opacity-70 data-popup-open:opacity-80',
+        )}
+      >
+        <Avatar avatar={userProfile.avatar_url} name={userProfile.name} />
+      </DropdownMenuTrigger>
+      <DropdownMenuContent
+        placement="bottom-end"
+        sideOffset={4}
+        popupClassName="w-60 max-w-80 divide-y divide-divider-subtle bg-components-panel-bg-blur p-0"
+      >
+        <div className="p-1">
+          <div className="flex flex-nowrap items-center px-3 py-2">
+            <div className="min-w-0 grow">
+              <div className="system-md-medium break-all text-text-primary">
+                {userProfile.name}
+                {isEducationAccount && (
+                  <PremiumBadge size="s" color="blue" className="ml-1 px-2!">
+                    <span aria-hidden="true" className="mr-1 i-ri-graduation-cap-fill h-3 w-3" />
+                    <span className="system-2xs-medium">EDU</span>
+                  </PremiumBadge>
+                )}
+              </div>
+              <div className="system-xs-regular break-all text-text-tertiary">{userProfile.email}</div>
             </div>
-            <Transition
-              as={Fragment}
-              enter="transition ease-out duration-100"
-              enterFrom="transform opacity-0 scale-95"
-              enterTo="transform opacity-100 scale-100"
-              leave="transition ease-in duration-75"
-              leaveFrom="transform opacity-100 scale-100"
-              leaveTo="transform opacity-0 scale-95"
-            >
-              <MenuItems
-                className="
-                    absolute -top-1 -right-2 w-60 max-w-80
-                    origin-top-right divide-y divide-divider-subtle rounded-lg bg-components-panel-bg-blur
-                    shadow-lg
-                  "
-              >
-                <MenuItem>
-                  <div className="p-1">
-                    <div className="flex flex-nowrap items-center px-3 py-2">
-                      <div className="grow">
-                        <div className="system-md-medium break-all text-text-primary">
-                          {userProfile.name}
-                          {isEducationAccount && (
-                            <PremiumBadge size="s" color="blue" className="ml-1 px-2!">
-                              <RiGraduationCapFill className="mr-1 h-3 w-3" />
-                              <span className="system-2xs-medium">EDU</span>
-                            </PremiumBadge>
-                          )}
-                        </div>
-                        <div className="system-xs-regular break-all text-text-tertiary">{userProfile.email}</div>
-                      </div>
-                      <Avatar avatar={userProfile.avatar_url} name={userProfile.name} />
-                    </div>
-                  </div>
-                </MenuItem>
-                <MenuItem>
-                  <div className="p-1" onClick={() => handleLogout()}>
-                    <div
-                      className="group flex h-9 cursor-pointer items-center justify-start rounded-lg px-3 hover:bg-state-base-hover"
-                    >
-                      <LogOut01 className="mr-1 flex h-4 w-4 text-text-tertiary" />
-                      <div className="text-[14px] font-normal text-text-secondary">{t('userProfile.logout', { ns: 'common' })}</div>
-                    </div>
-                  </div>
-                </MenuItem>
-              </MenuItems>
-            </Transition>
-          </>
-        )
-      }
-    </Menu>
+            <Avatar avatar={userProfile.avatar_url} name={userProfile.name} />
+          </div>
+        </div>
+        <div className="p-1">
+          <DropdownMenuItem
+            className="h-9 justify-start px-3"
+            onClick={handleLogout}
+          >
+            <span aria-hidden="true" className="mr-1 i-custom-vender-line-general-log-out-01 flex size-4 text-text-tertiary" />
+            <span className="text-[14px] font-normal text-text-secondary">{t('userProfile.logout', { ns: 'common' })}</span>
+          </DropdownMenuItem>
+        </div>
+      </DropdownMenuContent>
+    </DropdownMenu>
   )
 }
diff --git a/web/app/account/(commonLayout)/delete-account/components/feed-back.tsx b/web/app/account/(commonLayout)/delete-account/components/feed-back.tsx
index ee1e72e6e7..5b68290dd0 100644
--- a/web/app/account/(commonLayout)/delete-account/components/feed-back.tsx
+++ b/web/app/account/(commonLayout)/delete-account/components/feed-back.tsx
@@ -1,9 +1,9 @@
 'use client'
 import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
 import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import CustomDialog from '@/app/components/base/dialog'
 import Textarea from '@/app/components/base/textarea'
 import { useAppContext } from '@/context/app-context'
 import { useRouter } from '@/next/navigation'
@@ -47,26 +47,34 @@ export default function FeedBack(props: DeleteAccountProps) {
     handleSuccess()
   }, [handleSuccess, props])
   return (
-    <CustomDialog
-      show={true}
-      onClose={props.onCancel}
-      title={t('account.feedbackTitle', { ns: 'common' })}
-      className="max-w-[480px]"
-      footer={false}
+    <Dialog
+      open
+      onOpenChange={(open) => {
+        if (!open)
+          props.onCancel()
+      }}
     >
-      <label className="mt-3 mb-1 flex items-center system-sm-semibold text-text-secondary">{t('account.feedbackLabel', { ns: 'common' })}</label>
-      <Textarea
-        rows={6}
-        value={userFeedback}
-        placeholder={t('account.feedbackPlaceholder', { ns: 'common' }) as string}
-        onChange={(e) => {
-          setUserFeedback(e.target.value)
-        }}
-      />
-      <div className="mt-3 flex w-full flex-col gap-2">
-        <Button className="w-full" loading={isPending} variant="primary" onClick={handleSubmit}>{t('operation.submit', { ns: 'common' })}</Button>
-        <Button className="w-full" onClick={handleSkip}>{t('operation.skip', { ns: 'common' })}</Button>
-      </div>
-    </CustomDialog>
+      <DialogContent
+        className="max-w-[480px] overflow-hidden!"
+        backdropClassName="bg-background-overlay-backdrop backdrop-blur-[6px]"
+      >
+        <DialogTitle className="pr-8 pb-3 title-2xl-semi-bold text-text-primary">
+          {t('account.feedbackTitle', { ns: 'common' })}
+        </DialogTitle>
+        <label className="mt-3 mb-1 flex items-center system-sm-semibold text-text-secondary">{t('account.feedbackLabel', { ns: 'common' })}</label>
+        <Textarea
+          rows={6}
+          value={userFeedback}
+          placeholder={t('account.feedbackPlaceholder', { ns: 'common' }) as string}
+          onChange={(e) => {
+            setUserFeedback(e.target.value)
+          }}
+        />
+        <div className="mt-3 flex w-full flex-col gap-2">
+          <Button className="w-full" loading={isPending} variant="primary" onClick={handleSubmit}>{t('operation.submit', { ns: 'common' })}</Button>
+          <Button className="w-full" onClick={handleSkip}>{t('operation.skip', { ns: 'common' })}</Button>
+        </div>
+      </DialogContent>
+    </Dialog>
   )
 }
diff --git a/web/app/account/(commonLayout)/delete-account/index.tsx b/web/app/account/(commonLayout)/delete-account/index.tsx
index 416f680a60..e4af24e8bf 100644
--- a/web/app/account/(commonLayout)/delete-account/index.tsx
+++ b/web/app/account/(commonLayout)/delete-account/index.tsx
@@ -1,7 +1,7 @@
 'use client'
+import { Dialog, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import CustomDialog from '@/app/components/base/dialog'
 import { COUNT_DOWN_KEY, COUNT_DOWN_TIME_MS } from '@/app/components/signin/countdown'
 import CheckEmail from './components/check-email'
 import FeedBack from './components/feed-back'
@@ -30,22 +30,30 @@ export default function DeleteAccount(props: DeleteAccountProps) {
     return <FeedBack onCancel={props.onCancel} onConfirm={props.onConfirm} />
 
   return (
-    <CustomDialog
-      show={true}
-      onClose={props.onCancel}
-      title={t('account.delete', { ns: 'common' })}
-      className="max-w-[480px]"
-      footer={false}
+    <Dialog
+      open
+      onOpenChange={(open) => {
+        if (!open)
+          props.onCancel()
+      }}
     >
-      {!showVerifyEmail && <CheckEmail onCancel={props.onCancel} onConfirm={handleEmailCheckSuccess} />}
-      {showVerifyEmail && (
-        <VerifyEmail
-          onCancel={props.onCancel}
-          onConfirm={() => {
-            setShowFeedbackDialog(true)
-          }}
-        />
-      )}
-    </CustomDialog>
+      <DialogContent
+        className="max-w-[480px] overflow-hidden!"
+        backdropClassName="bg-background-overlay-backdrop backdrop-blur-[6px]"
+      >
+        <DialogTitle className="pr-8 pb-3 title-2xl-semi-bold text-text-primary">
+          {t('account.delete', { ns: 'common' })}
+        </DialogTitle>
+        {!showVerifyEmail && <CheckEmail onCancel={props.onCancel} onConfirm={handleEmailCheckSuccess} />}
+        {showVerifyEmail && (
+          <VerifyEmail
+            onCancel={props.onCancel}
+            onConfirm={() => {
+              setShowFeedbackDialog(true)
+            }}
+          />
+        )}
+      </DialogContent>
+    </Dialog>
   )
 }
diff --git a/web/app/account/(commonLayout)/layout.tsx b/web/app/account/(commonLayout)/layout.tsx
index f116cd00f9..8fdbd8a238 100644
--- a/web/app/account/(commonLayout)/layout.tsx
+++ b/web/app/account/(commonLayout)/layout.tsx
@@ -1,6 +1,7 @@
 import type { ReactNode } from 'react'
 import * as React from 'react'
 import { AppInitializer } from '@/app/components/app-initializer'
+import AmplitudeProvider from '@/app/components/base/amplitude'
 import GA, { GaType } from '@/app/components/base/ga'
 import HeaderWrapper from '@/app/components/header/header-wrapper'
 import { AppContextProvider } from '@/context/app-context-provider'
@@ -13,6 +14,7 @@ const Layout = ({ children }: { children: ReactNode }) => {
   return (
     <>
       <GA gaType={GaType.admin} />
+      <AmplitudeProvider />
       <AppInitializer>
         <AppContextProvider>
           <EventEmitterContextProvider>
diff --git a/web/app/components/app-sidebar/__tests__/index.spec.tsx b/web/app/components/app-sidebar/__tests__/index.spec.tsx
index 1b6046baee..6b3ec83d07 100644
--- a/web/app/components/app-sidebar/__tests__/index.spec.tsx
+++ b/web/app/components/app-sidebar/__tests__/index.spec.tsx
@@ -60,6 +60,9 @@ vi.mock('../app-info', () => ({
   default: ({ expand }: { expand: boolean }) => (
     <div data-testid="app-info" data-expand={expand} />
   ),
+  AppInfoView: ({ expand }: { expand: boolean }) => (
+    <div data-testid="app-info" data-expand={expand} />
+  ),
 }))
 
 vi.mock('../app-sidebar-dropdown', () => ({
diff --git a/web/app/components/app-sidebar/app-info/__tests__/app-info-detail-panel.spec.tsx b/web/app/components/app-sidebar/app-info/__tests__/app-info-detail-panel.spec.tsx
index 765a6932e8..a5f55c111f 100644
--- a/web/app/components/app-sidebar/app-info/__tests__/app-info-detail-panel.spec.tsx
+++ b/web/app/components/app-sidebar/app-info/__tests__/app-info-detail-panel.spec.tsx
@@ -11,17 +11,16 @@ vi.mock('../../../base/app-icon', () => ({
   ),
 }))
 
-vi.mock('@/app/components/base/content-dialog', () => ({
-  default: ({ show, onClose, children, className }: {
-    show: boolean
+vi.mock('../app-info-detail-drawer', () => ({
+  AppInfoDetailDrawer: ({ open, onClose, children }: {
+    open: boolean
     onClose: () => void
     children: React.ReactNode
-    className?: string
   }) => (
-    show
+    open
       ? (
-          <div data-testid="content-dialog" className={className}>
-            <button type="button" data-testid="dialog-close" onClick={onClose}>Close</button>
+          <div data-testid="app-info-detail-drawer">
+            <button type="button" data-testid="drawer-close" onClick={onClose}>Close</button>
             {children}
           </div>
         )
@@ -96,12 +95,12 @@ describe('AppInfoDetailPanel', () => {
   describe('Rendering', () => {
     it('should not render when show is false', () => {
       render(<AppInfoDetailPanel {...defaultProps} show={false} />)
-      expect(screen.queryByTestId('content-dialog')).not.toBeInTheDocument()
+      expect(screen.queryByTestId('app-info-detail-drawer')).not.toBeInTheDocument()
     })
 
-    it('should render dialog when show is true', () => {
+    it('should render drawer when show is true', () => {
       render(<AppInfoDetailPanel {...defaultProps} />)
-      expect(screen.getByTestId('content-dialog')).toBeInTheDocument()
+      expect(screen.getByTestId('app-info-detail-drawer')).toBeInTheDocument()
     })
 
     it('should display app name', () => {
@@ -296,12 +295,12 @@ describe('AppInfoDetailPanel', () => {
     })
   })
 
-  describe('Dialog interactions', () => {
-    it('should call onClose when dialog close button is clicked', async () => {
+  describe('Drawer interactions', () => {
+    it('should call onClose when drawer close button is clicked', async () => {
       const user = userEvent.setup()
       render(<AppInfoDetailPanel {...defaultProps} />)
 
-      await user.click(screen.getByTestId('dialog-close'))
+      await user.click(screen.getByTestId('drawer-close'))
 
       expect(defaultProps.onClose).toHaveBeenCalledTimes(1)
     })
diff --git a/web/app/components/app-sidebar/app-info/__tests__/app-info-modals.spec.tsx b/web/app/components/app-sidebar/app-info/__tests__/app-info-modals.spec.tsx
index 2fdd35cc43..218d4b94e6 100644
--- a/web/app/components/app-sidebar/app-info/__tests__/app-info-modals.spec.tsx
+++ b/web/app/components/app-sidebar/app-info/__tests__/app-info-modals.spec.tsx
@@ -46,6 +46,12 @@ vi.mock('@/app/components/workflow/update-dsl-modal', () => ({
 }))
 
 vi.mock('@/app/components/workflow/dsl-export-confirm-modal', () => ({
+  DSLExportConfirmContent: ({ onConfirm, onClose }: { onConfirm: (include?: boolean) => void, onClose: () => void }) => (
+    <div data-testid="dsl-export-confirm-modal">
+      <button type="button" onClick={() => onConfirm(true)}>Export Include</button>
+      <button type="button" onClick={onClose}>Close Export</button>
+    </div>
+  ),
   default: ({ onConfirm, onClose }: { onConfirm: (include?: boolean) => void, onClose: () => void }) => (
     <div data-testid="dsl-export-confirm-modal">
       <button type="button" onClick={() => onConfirm(true)}>Export Include</button>
diff --git a/web/app/components/app-sidebar/app-info/__tests__/app-operations.spec.tsx b/web/app/components/app-sidebar/app-info/__tests__/app-operations.spec.tsx
index ff6aed2c71..5daf0c7100 100644
--- a/web/app/components/app-sidebar/app-info/__tests__/app-operations.spec.tsx
+++ b/web/app/components/app-sidebar/app-info/__tests__/app-operations.spec.tsx
@@ -228,6 +228,21 @@ describe('AppOperations', () => {
   })
 
   describe('Visible operations click', () => {
+    it('should keep focus ring inside visible operation buttons', () => {
+      const cleanup = setupDomMeasurements(500, 60, [80])
+      const editOp = createOperation('edit', 'Edit')
+
+      render(<AppOperations gap={4} operations={[editOp]} />)
+
+      const visibleButton = screen.getAllByText('Edit')
+        .map(label => label.closest('button'))
+        .find(button => button?.tabIndex !== -1)
+
+      expect(visibleButton).toHaveClass('focus-visible:ring-inset')
+
+      cleanup()
+    })
+
     it('should call onClick when a visible operation is clicked', async () => {
       const cleanup = setupDomMeasurements(500, 60, [80, 80])
       const user = userEvent.setup()
diff --git a/web/app/components/app-sidebar/app-info/__tests__/use-app-info-actions.spec.ts b/web/app/components/app-sidebar/app-info/__tests__/use-app-info-actions.spec.ts
index 23e5e51949..fe5fa03f67 100644
--- a/web/app/components/app-sidebar/app-info/__tests__/use-app-info-actions.spec.ts
+++ b/web/app/components/app-sidebar/app-info/__tests__/use-app-info-actions.spec.ts
@@ -153,6 +153,27 @@ describe('useAppInfoActions', () => {
       expect(result.current.panelOpen).toBe(false)
       expect(onDetailExpand).toHaveBeenCalledWith(false)
     })
+
+    it('should reset app-scoped state when resetKey changes', () => {
+      const { result, rerender } = renderHook(
+        ({ resetKey }) => useAppInfoActions({ resetKey }),
+        { initialProps: { resetKey: 'app-1' } },
+      )
+
+      act(() => {
+        result.current.openModal('delete')
+        result.current.setPanelOpen(true)
+      })
+
+      expect(result.current.panelOpen).toBe(true)
+      expect(result.current.activeModal).toBe('delete')
+
+      rerender({ resetKey: 'app-2' })
+
+      expect(result.current.panelOpen).toBe(false)
+      expect(result.current.activeModal).toBeNull()
+      expect(result.current.secretEnvList).toEqual([])
+    })
   })
 
   describe('Modal management', () => {
diff --git a/web/app/components/app-sidebar/app-info/app-info-detail-drawer.tsx b/web/app/components/app-sidebar/app-info/app-info-detail-drawer.tsx
new file mode 100644
index 0000000000..e9217df03c
--- /dev/null
+++ b/web/app/components/app-sidebar/app-info/app-info-detail-drawer.tsx
@@ -0,0 +1,34 @@
+import type { ReactNode } from 'react'
+
+type AppInfoDetailDrawerProps = {
+  open: boolean
+  onClose: () => void
+  children: ReactNode
+}
+
+export function AppInfoDetailDrawer({
+  open,
+  onClose,
+  children,
+}: AppInfoDetailDrawerProps) {
+  if (!open)
+    return null
+
+  return (
+    <div className="absolute inset-0 z-50">
+      <button
+        type="button"
+        aria-label="Close app info"
+        className="absolute inset-0 cursor-default bg-app-detail-overlay-bg"
+        onClick={onClose}
+      />
+      <section
+        role="dialog"
+        aria-modal="false"
+        className="absolute top-2 bottom-2 left-2 flex w-[452px] max-w-[calc(100vw-1rem)] flex-col overflow-hidden rounded-2xl border-r border-divider-burn bg-app-detail-bg"
+      >
+        {children}
+      </section>
+    </div>
+  )
+}
diff --git a/web/app/components/app-sidebar/app-info/app-info-detail-panel.tsx b/web/app/components/app-sidebar/app-info/app-info-detail-panel.tsx
index b80ea5d522..13a55f8984 100644
--- a/web/app/components/app-sidebar/app-info/app-info-detail-panel.tsx
+++ b/web/app/components/app-sidebar/app-info/app-info-detail-panel.tsx
@@ -14,9 +14,9 @@ import * as React from 'react'
 import { useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import CardView from '@/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/card-view'
-import ContentDialog from '@/app/components/base/content-dialog'
-import { AppModeEnum, AppTypeEnum } from '@/types/app'
+import { AppModeEnum } from '@/types/app'
 import AppIcon from '../../base/app-icon'
+import { AppInfoDetailDrawer } from './app-info-detail-drawer'
 import { getAppModeLabel } from './app-mode-labels'
 import AppOperations from './app-operations'
 
@@ -94,10 +94,9 @@ const AppInfoDetailPanel = ({
   }, [appDetail.mode, t, openModal])
 
   return (
-    <ContentDialog
-      show={show}
+    <AppInfoDetailDrawer
+      open={show}
       onClose={onClose}
-      className="absolute top-2 bottom-2 left-2 flex w-[420px] flex-col rounded-2xl p-0!"
     >
       <div className="flex shrink-0 flex-col items-start justify-center gap-3 self-stretch p-4">
         <div className="flex items-center gap-3 self-stretch">
@@ -109,16 +108,16 @@ const AppInfoDetailPanel = ({
             imageUrl={appDetail.icon_url}
           />
           <div className="flex flex-1 flex-col items-start justify-center overflow-hidden">
-            <div className="w-full truncate system-md-semibold text-text-secondary">{appDetail.name}</div>
+            <h2 className="w-full truncate system-md-semibold text-text-secondary">{appDetail.name}</h2>
             <div className="system-2xs-medium-uppercase text-text-tertiary">
               {getAppModeLabel(appDetail.mode, t)}
             </div>
           </div>
         </div>
         {appDetail.description && (
-          <div className="overflow-wrap-anywhere max-h-[105px] w-full max-w-full overflow-y-auto system-xs-regular wrap-break-word whitespace-normal text-text-tertiary">
+          <p className="overflow-wrap-anywhere max-h-[105px] w-full max-w-full overflow-y-auto system-xs-regular wrap-break-word whitespace-normal text-text-tertiary">
             {appDetail.description}
-          </div>
+          </p>
         )}
         <AppOperations
           gap={4}
@@ -126,13 +125,11 @@ const AppInfoDetailPanel = ({
           secondaryOperations={secondaryOperations}
         />
       </div>
-      {appDetail.workflow_kind !== AppTypeEnum.EVALUATION && (
-        <CardView
-          appId={appDetail.id}
-          isInPanel={true}
-          className="flex flex-1 flex-col gap-2 overflow-auto px-2 py-1"
-        />
-      )}
+      <CardView
+        appId={appDetail.id}
+        isInPanel={true}
+        className="flex flex-1 flex-col gap-2 overflow-auto px-2 py-1"
+      />
       {switchOperation && (
         <div className="flex min-h-fit shrink-0 flex-col items-start justify-center gap-3 self-stretch pb-2">
           <Button
@@ -146,7 +143,7 @@ const AppInfoDetailPanel = ({
           </Button>
         </div>
       )}
-    </ContentDialog>
+    </AppInfoDetailDrawer>
   )
 }
 
diff --git a/web/app/components/app-sidebar/app-info/app-info-modals.tsx b/web/app/components/app-sidebar/app-info/app-info-modals.tsx
index 9535725cd3..7e8015f23f 100644
--- a/web/app/components/app-sidebar/app-info/app-info-modals.tsx
+++ b/web/app/components/app-sidebar/app-info/app-info-modals.tsx
@@ -14,15 +14,15 @@ import {
 } from '@langgenius/dify-ui/alert-dialog'
 import * as React from 'react'
 import { useCallback, useState } from 'react'
-import { useTranslation } from 'react-i18next'
+import { Trans, useTranslation } from 'react-i18next'
 import Input from '@/app/components/base/input'
+import { DSLExportConfirmContent } from '@/app/components/workflow/dsl-export-confirm-modal'
 import dynamic from '@/next/dynamic'
 
 const SwitchAppModal = dynamic(() => import('@/app/components/app/switch-app-modal'), { ssr: false })
 const CreateAppModal = dynamic(() => import('@/app/components/explore/create-app-modal'), { ssr: false })
 const DuplicateAppModal = dynamic(() => import('@/app/components/app/duplicate-modal'), { ssr: false })
 const UpdateDSLModal = dynamic(() => import('@/app/components/workflow/update-dsl-modal'), { ssr: false })
-const DSLExportConfirmModal = dynamic(() => import('@/app/components/workflow/dsl-export-confirm-modal'), { ssr: false })
 
 type AppInfoModalsProps = {
   appDetail: App & Partial<AppSSO>
@@ -54,7 +54,14 @@ const AppInfoModals = ({
   const { t } = useTranslation()
   const [confirmDeleteInput, setConfirmDeleteInput] = useState('')
   const [isConfirmingExport, setIsConfirmingExport] = useState(false)
+  const [isSecretExporting, setIsSecretExporting] = useState(false)
   const isDeleteConfirmDisabled = confirmDeleteInput !== appDetail.name
+  const exportDialogMode = secretEnvList.length > 0
+    ? 'secret'
+    : activeModal === 'exportWarning'
+      ? 'warning'
+      : null
+  const isExportDialogOpen = exportDialogMode !== null
 
   const handleDeleteDialogClose = () => {
     setConfirmDeleteInput('')
@@ -74,6 +81,22 @@ const AppInfoModals = ({
     }
   }, [handleConfirmExport, isConfirmingExport])
 
+  const handleExportDialogClose = useCallback(() => {
+    if (exportDialogMode === 'secret') {
+      setSecretEnvList([])
+      return
+    }
+
+    closeModal()
+  }, [closeModal, exportDialogMode, setSecretEnvList])
+
+  const handleExportDialogOpenChange = useCallback((open: boolean) => {
+    if (open || isConfirmingExport || isSecretExporting)
+      return
+
+    handleExportDialogClose()
+  }, [handleExportDialogClose, isConfirmingExport, isSecretExporting])
+
   return (
     <>
       {activeModal === 'switch' && (
@@ -134,7 +157,14 @@ const AppInfoModals = ({
               </AlertDialogDescription>
               <div className="mt-2">
                 <label className="mb-1 block system-sm-regular text-text-secondary">
-                  {t('deleteAppConfirmInputLabel', { ns: 'app', appName: appDetail.name })}
+                  <Trans
+                    i18nKey="deleteAppConfirmInputLabel"
+                    ns="app"
+                    values={{ appName: appDetail.name }}
+                    components={{
+                      appName: <span className="system-sm-semibold text-text-primary" translate="no" />,
+                    }}
+                  />
                 </label>
                 <Input
                   type="text"
@@ -163,38 +193,42 @@ const AppInfoModals = ({
           onBackup={exportCheck}
         />
       )}
-      <AlertDialog open={activeModal === 'exportWarning'} onOpenChange={open => !open && closeModal()}>
-        <AlertDialogContent>
-          <div className="flex flex-col gap-2 px-6 pt-6 pb-4">
-            <AlertDialogTitle className="w-full truncate title-2xl-semi-bold text-text-primary">
-              {t('sidebar.exportWarning', { ns: 'workflow' })}
-            </AlertDialogTitle>
-            <AlertDialogDescription className="w-full system-md-regular wrap-break-word whitespace-pre-wrap text-text-tertiary">
-              {t('sidebar.exportWarningDesc', { ns: 'workflow' })}
-            </AlertDialogDescription>
-          </div>
-          <AlertDialogActions>
-            <AlertDialogCancelButton>{t('operation.cancel', { ns: 'common' })}</AlertDialogCancelButton>
-            <AlertDialogConfirmButton
-              tone="default"
-              loading={isConfirmingExport}
-              disabled={isConfirmingExport}
-              onClick={handleExportWarningConfirm}
-            >
-              {isConfirmingExport
-                ? t('operation.exporting', { ns: 'common' })
-                : t('operation.confirm', { ns: 'common' })}
-            </AlertDialogConfirmButton>
-          </AlertDialogActions>
-        </AlertDialogContent>
+      <AlertDialog open={isExportDialogOpen} onOpenChange={handleExportDialogOpenChange}>
+        {exportDialogMode === 'secret'
+          ? (
+              <DSLExportConfirmContent
+                envList={secretEnvList}
+                onConfirm={onExport}
+                onClose={() => setSecretEnvList([])}
+                onExportingChange={setIsSecretExporting}
+              />
+            )
+          : exportDialogMode === 'warning' && (
+            <AlertDialogContent>
+              <div className="flex flex-col gap-2 px-6 pt-6 pb-4">
+                <AlertDialogTitle className="w-full truncate title-2xl-semi-bold text-text-primary">
+                  {t('sidebar.exportWarning', { ns: 'workflow' })}
+                </AlertDialogTitle>
+                <AlertDialogDescription className="w-full system-md-regular wrap-break-word whitespace-pre-wrap text-text-tertiary">
+                  {t('sidebar.exportWarningDesc', { ns: 'workflow' })}
+                </AlertDialogDescription>
+              </div>
+              <AlertDialogActions>
+                <AlertDialogCancelButton>{t('operation.cancel', { ns: 'common' })}</AlertDialogCancelButton>
+                <AlertDialogConfirmButton
+                  tone="default"
+                  loading={isConfirmingExport}
+                  disabled={isConfirmingExport}
+                  onClick={handleExportWarningConfirm}
+                >
+                  {isConfirmingExport
+                    ? t('operation.exporting', { ns: 'common' })
+                    : t('operation.confirm', { ns: 'common' })}
+                </AlertDialogConfirmButton>
+              </AlertDialogActions>
+            </AlertDialogContent>
+          )}
       </AlertDialog>
-      {secretEnvList.length > 0 && (
-        <DSLExportConfirmModal
-          envList={secretEnvList}
-          onConfirm={onExport}
-          onClose={() => setSecretEnvList([])}
-        />
-      )}
     </>
   )
 }
diff --git a/web/app/components/app-sidebar/app-info/app-operations.tsx b/web/app/components/app-sidebar/app-info/app-operations.tsx
index cc6afd739c..2e3270a222 100644
--- a/web/app/components/app-sidebar/app-info/app-operations.tsx
+++ b/web/app/components/app-sidebar/app-info/app-operations.tsx
@@ -133,7 +133,7 @@ const AppOperations = ({
             data-targetid={operation.id}
             size="small"
             variant="secondary"
-            className="gap-px"
+            className="gap-px focus-visible:ring-inset"
             tabIndex={-1}
           >
             {cloneElement(operation.icon, { className: 'h-3.5 w-3.5 text-components-button-secondary-text' })}
@@ -146,7 +146,7 @@ const AppOperations = ({
           id="more-measure"
           size="small"
           variant="secondary"
-          className="gap-px"
+          className="gap-px focus-visible:ring-inset"
           tabIndex={-1}
         >
           <RiMoreLine className="h-3.5 w-3.5 text-components-button-secondary-text" />
@@ -162,7 +162,7 @@ const AppOperations = ({
             data-targetid={operation.id}
             size="small"
             variant="secondary"
-            className="gap-px"
+            className="gap-px focus-visible:ring-inset"
             onClick={operation.onClick}
           >
             {cloneElement(operation.icon, { className: 'h-3.5 w-3.5 text-components-button-secondary-text' })}
@@ -178,7 +178,7 @@ const AppOperations = ({
                 <Button
                   size="small"
                   variant="secondary"
-                  className="gap-px"
+                  className="gap-px focus-visible:ring-inset"
                 />
               )}
             >
diff --git a/web/app/components/app-sidebar/app-info/index.tsx b/web/app/components/app-sidebar/app-info/index.tsx
index a0628ec786..14a2defc1e 100644
--- a/web/app/components/app-sidebar/app-info/index.tsx
+++ b/web/app/components/app-sidebar/app-info/index.tsx
@@ -1,3 +1,4 @@
+import type { AppInfoActions } from './use-app-info-actions'
 import * as React from 'react'
 import { useAppContext } from '@/context/app-context'
 import AppInfoDetailPanel from './app-info-detail-panel'
@@ -12,13 +13,22 @@ type IAppInfoProps = {
   onDetailExpand?: (expand: boolean) => void
 }
 
-const AppInfo = ({ expand, onlyShowDetail = false, openState = false, onDetailExpand }: IAppInfoProps) => {
-  const { isCurrentWorkspaceEditor } = useAppContext()
+type AppInfoViewProps = Omit<IAppInfoProps, 'onDetailExpand'> & {
+  actions: AppInfoActions
+  renderDetail?: boolean
+}
 
+type AppInfoDetailLayerProps = {
+  actions: AppInfoActions
+  open?: boolean
+}
+
+export const AppInfoDetailLayer = ({
+  actions,
+  open = actions.panelOpen,
+}: AppInfoDetailLayerProps) => {
   const {
     appDetail,
-    panelOpen,
-    setPanelOpen,
     closePanel,
     activeModal,
     openModal,
@@ -31,26 +41,16 @@ const AppInfo = ({ expand, onlyShowDetail = false, openState = false, onDetailEx
     exportCheck,
     handleConfirmExport,
     onConfirmDelete,
-  } = useAppInfoActions({ onDetailExpand })
+  } = actions
 
   if (!appDetail)
     return null
 
   return (
-    <div>
-      {!onlyShowDetail && (
-        <AppInfoTrigger
-          appDetail={appDetail}
-          expand={expand}
-          onClick={() => {
-            if (isCurrentWorkspaceEditor)
-              setPanelOpen(v => !v)
-          }}
-        />
-      )}
+    <>
       <AppInfoDetailPanel
         appDetail={appDetail}
-        show={onlyShowDetail ? openState : panelOpen}
+        show={open}
         onClose={closePanel}
         openModal={openModal}
         exportCheck={exportCheck}
@@ -68,8 +68,58 @@ const AppInfo = ({ expand, onlyShowDetail = false, openState = false, onDetailEx
         handleConfirmExport={handleConfirmExport}
         onConfirmDelete={onConfirmDelete}
       />
+    </>
+  )
+}
+
+export const AppInfoView = ({
+  expand,
+  onlyShowDetail = false,
+  openState = false,
+  actions,
+  renderDetail = true,
+}: AppInfoViewProps) => {
+  const { isCurrentWorkspaceEditor } = useAppContext()
+  const {
+    appDetail,
+    panelOpen,
+    setPanelOpen,
+  } = actions
+
+  if (!appDetail)
+    return null
+
+  return (
+    <div>
+      {!onlyShowDetail && (
+        <AppInfoTrigger
+          appDetail={appDetail}
+          expand={expand}
+          onClick={() => {
+            if (isCurrentWorkspaceEditor)
+              setPanelOpen(v => !v)
+          }}
+        />
+      )}
+      {renderDetail && (
+        <AppInfoDetailLayer
+          actions={actions}
+          open={onlyShowDetail ? openState : panelOpen}
+        />
+      )}
     </div>
   )
 }
 
+const AppInfo = ({ onDetailExpand, ...props }: IAppInfoProps) => {
+  const actions = useAppInfoActions({ onDetailExpand })
+
+  return (
+    <AppInfoView
+      {...props}
+      actions={actions}
+    />
+  )
+}
+
 export default React.memo(AppInfo)
diff --git a/web/app/components/app-sidebar/app-info/use-app-info-actions.ts b/web/app/components/app-sidebar/app-info/use-app-info-actions.ts
index 262a8c7db0..134726a50c 100644
--- a/web/app/components/app-sidebar/app-info/use-app-info-actions.ts
+++ b/web/app/components/app-sidebar/app-info/use-app-info-actions.ts
@@ -1,3 +1,4 @@
+import type { Dispatch, SetStateAction } from 'react'
 import type { DuplicateAppModalProps } from '@/app/components/app/duplicate-modal'
 import type { CreateAppModalProps } from '@/app/components/explore/create-app-modal'
 import type { EnvironmentVariable } from '@/app/components/workflow/types'
@@ -19,9 +20,36 @@ export type AppInfoModalType = 'edit' | 'duplicate' | 'delete' | 'switch' | 'imp
 
 type UseAppInfoActionsParams = {
   onDetailExpand?: (expand: boolean) => void
+  resetKey?: string
 }
 
-export function useAppInfoActions({ onDetailExpand }: UseAppInfoActionsParams) {
+type AppInfoUiState = {
+  resetKey?: string
+  panelOpen: boolean
+  activeModal: AppInfoModalType
+  secretEnvList: EnvironmentVariable[]
+}
+
+const emptySecretEnvList: EnvironmentVariable[] = []
+
+const createInitialUiState = (resetKey?: string): AppInfoUiState => ({
+  resetKey,
+  panelOpen: false,
+  activeModal: null,
+  secretEnvList: [],
+})
+
+const resolveStateAction = <T>(value: SetStateAction<T>, previous: T) => {
+  return typeof value === 'function'
+    ? (value as (previous: T) => T)(previous)
+    : value
+}
+
+const getCurrentUiState = (state: AppInfoUiState, resetKey?: string) => {
+  return state.resetKey === resetKey ? state : createInitialUiState(resetKey)
+}
+
+export function useAppInfoActions({ onDetailExpand, resetKey }: UseAppInfoActionsParams) {
   const { t } = useTranslation()
   const { replace } = useRouter()
   const { onPlanInfoChanged } = useProviderContext()
@@ -29,23 +57,55 @@ export function useAppInfoActions({ onDetailExpand }: UseAppInfoActionsParams) {
   const setAppDetail = useAppStore(state => state.setAppDetail)
   const invalidateAppList = useInvalidateAppList()
 
-  const [panelOpen, setPanelOpen] = useState(false)
-  const [activeModal, setActiveModal] = useState<AppInfoModalType>(null)
-  const [secretEnvList, setSecretEnvList] = useState<EnvironmentVariable[]>([])
+  const [uiState, setUiState] = useState(() => createInitialUiState(resetKey))
+  const uiStateMatchesResetKey = uiState.resetKey === resetKey
+  const panelOpen = uiStateMatchesResetKey ? uiState.panelOpen : false
+  const activeModal = uiStateMatchesResetKey ? uiState.activeModal : null
+  const secretEnvList = uiStateMatchesResetKey ? uiState.secretEnvList : emptySecretEnvList
+
+  const setPanelOpen = useCallback<Dispatch<SetStateAction<boolean>>>((value) => {
+    setUiState((state) => {
+      const current = getCurrentUiState(state, resetKey)
+      return {
+        ...current,
+        panelOpen: resolveStateAction(value, current.panelOpen),
+      }
+    })
+  }, [resetKey])
+
+  const setActiveModal = useCallback<Dispatch<SetStateAction<AppInfoModalType>>>((value) => {
+    setUiState((state) => {
+      const current = getCurrentUiState(state, resetKey)
+      return {
+        ...current,
+        activeModal: resolveStateAction(value, current.activeModal),
+      }
+    })
+  }, [resetKey])
+
+  const setSecretEnvList = useCallback<Dispatch<SetStateAction<EnvironmentVariable[]>>>((value) => {
+    setUiState((state) => {
+      const current = getCurrentUiState(state, resetKey)
+      return {
+        ...current,
+        secretEnvList: resolveStateAction(value, current.secretEnvList),
+      }
+    })
+  }, [resetKey])
 
   const closePanel = useCallback(() => {
     setPanelOpen(false)
     onDetailExpand?.(false)
-  }, [onDetailExpand])
+  }, [onDetailExpand, setPanelOpen])
 
   const openModal = useCallback((modal: Exclude<AppInfoModalType, null>) => {
     closePanel()
     setActiveModal(modal)
-  }, [closePanel])
+  }, [closePanel, setActiveModal])
 
   const closeModal = useCallback(() => {
     setActiveModal(null)
-  }, [])
+  }, [setActiveModal])
 
   const emitAppMetaUpdate = useCallback(() => {
     if (!appDetail?.id)
@@ -178,7 +238,7 @@ export function useAppInfoActions({ onDetailExpand }: UseAppInfoActionsParams) {
       return
     }
     setActiveModal('exportWarning')
-  }, [appDetail, onExport])
+  }, [appDetail, onExport, setActiveModal])
 
   const handleConfirmExport = useCallback(async () => {
     if (!appDetail)
@@ -198,7 +258,7 @@ export function useAppInfoActions({ onDetailExpand }: UseAppInfoActionsParams) {
     finally {
       closeModal()
     }
-  }, [appDetail, closeModal, onExport, t])
+  }, [appDetail, closeModal, onExport, setSecretEnvList, t])
 
   const onConfirmDelete = useCallback(async () => {
     if (!appDetail)
@@ -235,3 +295,5 @@ export function useAppInfoActions({ onDetailExpand }: UseAppInfoActionsParams) {
     onConfirmDelete,
   }
 }
+
+export type AppInfoActions = ReturnType<typeof useAppInfoActions>
diff --git a/web/app/components/app-sidebar/app-sidebar-dropdown.tsx b/web/app/components/app-sidebar/app-sidebar-dropdown.tsx
index 0b5f13d918..e0661b9c52 100644
--- a/web/app/components/app-sidebar/app-sidebar-dropdown.tsx
+++ b/web/app/components/app-sidebar/app-sidebar-dropdown.tsx
@@ -1,3 +1,4 @@
+import type { AppInfoActions } from './app-info/use-app-info-actions'
 import type { NavIcon } from './nav-link'
 import { cn } from '@langgenius/dify-ui/cn'
 import {
@@ -27,9 +28,10 @@ type Props = {
     icon: NavIcon
     selectedIcon: NavIcon
   }>
+  appInfoActions?: AppInfoActions
 }
 
-const AppSidebarDropdown = ({ navigation }: Props) => {
+const AppSidebarDropdown = ({ navigation, appInfoActions }: Props) => {
   const { t } = useTranslation()
   const { isCurrentWorkspaceEditor } = useAppContext()
   const appDetail = useAppStore(state => state.appDetail)
@@ -69,7 +71,10 @@ const AppSidebarDropdown = ({ navigation }: Props) => {
                 <div
                   className={cn('flex flex-col gap-2 rounded-lg p-2 pb-2.5', isCurrentWorkspaceEditor && 'cursor-pointer hover:bg-state-base-hover')}
                   onClick={() => {
-                    setDetailExpand(true)
+                    if (appInfoActions)
+                      appInfoActions.setPanelOpen(true)
+                    else
+                      setDetailExpand(true)
                     setOpen(false)
                   }}
                 >
@@ -109,9 +114,11 @@ const AppSidebarDropdown = ({ navigation }: Props) => {
           </DropdownMenuContent>
         </DropdownMenu>
       </div>
-      <div className="z-20">
-        <AppInfo expand onlyShowDetail openState={detailExpand} onDetailExpand={setDetailExpand} />
-      </div>
+      {!appInfoActions && (
+        <div className="z-20">
+          <AppInfo expand onlyShowDetail openState={detailExpand} onDetailExpand={setDetailExpand} />
+        </div>
+      )}
     </>
   )
 }
diff --git a/web/app/components/app-sidebar/index.tsx b/web/app/components/app-sidebar/index.tsx
index e0942a9706..6fe5fffe8c 100644
--- a/web/app/components/app-sidebar/index.tsx
+++ b/web/app/components/app-sidebar/index.tsx
@@ -1,3 +1,4 @@
+import type { AppInfoActions } from './app-info/use-app-info-actions'
 import type { NavIcon } from './nav-link'
 import { cn } from '@langgenius/dify-ui/cn'
 import { useHover, useKeyPress } from 'ahooks'
@@ -10,7 +11,7 @@ import useBreakpoints, { MediaType } from '@/hooks/use-breakpoints'
 import { usePathname } from '@/next/navigation'
 import Divider from '../base/divider'
 import { getKeyboardKeyCodeBySystem } from '../workflow/utils'
-import AppInfo from './app-info'
+import AppInfo, { AppInfoView } from './app-info'
 import AppSidebarDropdown from './app-sidebar-dropdown'
 import DatasetInfo from './dataset-info'
 import DatasetSidebarDropdown from './dataset-sidebar-dropdown'
@@ -36,16 +37,14 @@ type IAppDetailNavProps = {
     disabled?: boolean
   }>
   extraInfo?: (modeState: string) => React.ReactNode
-  renderHeader?: (modeState: string) => React.ReactNode
-  renderNavigation?: (modeState: string) => React.ReactNode
+  appInfoActions?: AppInfoActions
 }
 
 const AppDetailNav = ({
   navigation,
   extraInfo,
   iconType = 'app',
-  renderHeader,
-  renderNavigation,
+  appInfoActions,
 }: IAppDetailNavProps) => {
   const { appSidebarExpand, setAppSidebarExpand } = useAppStore(useShallow(state => ({
     appSidebarExpand: state.appSidebarExpand,
@@ -93,7 +92,10 @@ const AppDetailNav = ({
   if (inWorkflowCanvas && hideHeader) {
     return (
       <div className="flex w-0 shrink-0">
-        <AppSidebarDropdown navigation={navigation} />
+        <AppSidebarDropdown
+          navigation={navigation}
+          appInfoActions={appInfoActions}
+        />
       </div>
     )
   }
@@ -120,11 +122,18 @@ const AppDetailNav = ({
           expand ? 'p-2' : 'p-1',
         )}
       >
-        {renderHeader?.(appSidebarExpand)}
-        {!renderHeader && iconType === 'app' && (
-          <AppInfo expand={expand} />
+        {iconType === 'app' && (
+          appInfoActions
+            ? (
+                <AppInfoView
+                  expand={expand}
+                  actions={appInfoActions}
+                  renderDetail={false}
+                />
+              )
+            : <AppInfo expand={expand} />
         )}
-        {!renderHeader && iconType !== 'app' && (
+        {iconType !== 'app' && (
           <DatasetInfo expand={expand} />
         )}
       </div>
@@ -153,8 +162,7 @@ const AppDetailNav = ({
           expand ? 'px-3 py-2' : 'p-3',
         )}
       >
-        {renderNavigation?.(appSidebarExpand)}
-        {!renderNavigation && navigation.map((item, index) => {
+        {navigation.map((item, index) => {
           return (
             <NavLink
               key={index}
diff --git a/web/app/components/app/annotation/__tests__/filter.spec.tsx b/web/app/components/app/annotation/__tests__/filter.spec.tsx
index 8b69494e3f..1d7b895d6d 100644
--- a/web/app/components/app/annotation/__tests__/filter.spec.tsx
+++ b/web/app/components/app/annotation/__tests__/filter.spec.tsx
@@ -1,7 +1,7 @@
+import type { AnnotationCountResponse } from '@dify/contracts/api/console/apps/types.gen'
 import type { UseQueryResult } from '@tanstack/react-query'
 import type { Mock } from 'vitest'
 import type { QueryParam } from '../filter'
-import type { AnnotationsCountResponse } from '@/models/log'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { fireEvent, render, screen } from '@testing-library/react'
 import * as React from 'react'
@@ -69,7 +69,7 @@ describe('Filter', () => {
     it('should render nothing when data is loading', () => {
       // Arrange
       mockUseAnnotationsCount.mockReturnValue(
-        createMockQueryResult<AnnotationsCountResponse>({ isLoading: true }),
+        createMockQueryResult<AnnotationCountResponse>({ isLoading: true }),
       )
 
       // Act
@@ -90,7 +90,7 @@ describe('Filter', () => {
     it('should render nothing when data is undefined', () => {
       // Arrange
       mockUseAnnotationsCount.mockReturnValue(
-        createMockQueryResult<AnnotationsCountResponse>({ data: undefined, isLoading: false }),
+        createMockQueryResult<AnnotationCountResponse>({ data: undefined, isLoading: false }),
       )
 
       // Act
@@ -111,7 +111,7 @@ describe('Filter', () => {
     it('should render filter and children when data is available', () => {
       // Arrange
       mockUseAnnotationsCount.mockReturnValue(
-        createMockQueryResult<AnnotationsCountResponse>({
+        createMockQueryResult<AnnotationCountResponse>({
           data: { count: 20 },
           isLoading: false,
         }),
@@ -141,7 +141,7 @@ describe('Filter', () => {
     it('should call useAnnotationsCount with appId', () => {
       // Arrange
       mockUseAnnotationsCount.mockReturnValue(
-        createMockQueryResult<AnnotationsCountResponse>({
+        createMockQueryResult<AnnotationCountResponse>({
           data: { count: 10 },
           isLoading: false,
         }),
@@ -165,7 +165,7 @@ describe('Filter', () => {
     it('should display keyword value in input', () => {
       // Arrange
       mockUseAnnotationsCount.mockReturnValue(
-        createMockQueryResult<AnnotationsCountResponse>({
+        createMockQueryResult<AnnotationCountResponse>({
           data: { count: 10 },
           isLoading: false,
         }),
@@ -195,7 +195,7 @@ describe('Filter', () => {
     it('should call setQueryParams when typing in search input', () => {
       // Arrange
       mockUseAnnotationsCount.mockReturnValue(
-        createMockQueryResult<AnnotationsCountResponse>({
+        createMockQueryResult<AnnotationCountResponse>({
           data: { count: 20 },
           isLoading: false,
         }),
@@ -224,7 +224,7 @@ describe('Filter', () => {
     it('should call setQueryParams with empty keyword when clearing input', () => {
       // Arrange
       mockUseAnnotationsCount.mockReturnValue(
-        createMockQueryResult<AnnotationsCountResponse>({
+        createMockQueryResult<AnnotationCountResponse>({
           data: { count: 20 },
           isLoading: false,
         }),
@@ -243,10 +243,7 @@ describe('Filter', () => {
       )
 
       // Act
-      const input = screen.getByPlaceholderText('common.operation.search')
-      const clearButton = input.parentElement?.querySelector('div.cursor-pointer')
-      if (clearButton)
-        fireEvent.click(clearButton)
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.clear' }))
 
       // Assert
       expect(setQueryParams).toHaveBeenCalledWith({ ...queryParams, keyword: '' })
@@ -260,7 +257,7 @@ describe('Filter', () => {
     it('should handle empty keyword in queryParams', () => {
       // Arrange
       mockUseAnnotationsCount.mockReturnValue(
-        createMockQueryResult<AnnotationsCountResponse>({
+        createMockQueryResult<AnnotationCountResponse>({
           data: { count: 5 },
           isLoading: false,
         }),
@@ -284,7 +281,7 @@ describe('Filter', () => {
     it('should handle undefined keyword in queryParams', () => {
       // Arrange
       mockUseAnnotationsCount.mockReturnValue(
-        createMockQueryResult<AnnotationsCountResponse>({
+        createMockQueryResult<AnnotationCountResponse>({
           data: { count: 5 },
           isLoading: false,
         }),
@@ -308,7 +305,7 @@ describe('Filter', () => {
     it('should handle zero count', () => {
       // Arrange
       mockUseAnnotationsCount.mockReturnValue(
-        createMockQueryResult<AnnotationsCountResponse>({
+        createMockQueryResult<AnnotationCountResponse>({
           data: { count: 0 },
           isLoading: false,
         }),
diff --git a/web/app/components/app/annotation/__tests__/list.spec.tsx b/web/app/components/app/annotation/__tests__/list.spec.tsx
index ad6a1e5e9c..883c1adfe0 100644
--- a/web/app/components/app/annotation/__tests__/list.spec.tsx
+++ b/web/app/components/app/annotation/__tests__/list.spec.tsx
@@ -19,8 +19,6 @@ const createAnnotation = (overrides: Partial<AnnotationItem> = {}): AnnotationIt
   hit_count: overrides.hit_count ?? 2,
 })
 
-const getCheckboxes = (container: HTMLElement) => container.querySelectorAll('[data-testid^="checkbox"]')
-
 describe('List', () => {
   beforeEach(() => {
     vi.clearAllMocks()
@@ -51,7 +49,7 @@ describe('List', () => {
   it('should toggle single and bulk selection states', () => {
     const list = [createAnnotation({ id: 'a', question: 'A' }), createAnnotation({ id: 'b', question: 'B' })]
     const onSelectedIdsChange = vi.fn()
-    const { container, rerender } = render(
+    const { rerender } = render(
       <List
         list={list}
         onView={vi.fn()}
@@ -63,8 +61,7 @@ describe('List', () => {
       />,
     )
 
-    const checkboxes = getCheckboxes(container)
-    fireEvent.click(checkboxes[1]!)
+    fireEvent.click(screen.getByRole('checkbox', { name: 'A' }))
     expect(onSelectedIdsChange).toHaveBeenCalledWith(['a'])
 
     rerender(
@@ -78,11 +75,10 @@ describe('List', () => {
         onCancel={vi.fn()}
       />,
     )
-    const updatedCheckboxes = getCheckboxes(container)
-    fireEvent.click(updatedCheckboxes[1]!)
+    fireEvent.click(screen.getByRole('checkbox', { name: 'A' }))
     expect(onSelectedIdsChange).toHaveBeenCalledWith([])
 
-    fireEvent.click(updatedCheckboxes[0]!)
+    fireEvent.click(screen.getByRole('checkbox', { name: 'common.operation.selectAll' }))
     expect(onSelectedIdsChange).toHaveBeenCalledWith(['a', 'b'])
   })
 
diff --git a/web/app/components/app/annotation/add-annotation-modal/__tests__/index.spec.tsx b/web/app/components/app/annotation/add-annotation-modal/__tests__/index.spec.tsx
index 497c623f3e..00f91ab429 100644
--- a/web/app/components/app/annotation/add-annotation-modal/__tests__/index.spec.tsx
+++ b/web/app/components/app/annotation/add-annotation-modal/__tests__/index.spec.tsx
@@ -91,7 +91,7 @@ describe('AddAnnotationModal', () => {
 
     typeQuestion('Question value')
     typeAnswer('Answer value')
-    fireEvent.click(screen.getByTestId('checkbox-create-next-checkbox'))
+    fireEvent.click(screen.getByText('appAnnotation.addModal.createNext'))
 
     await act(async () => {
       fireEvent.click(screen.getByRole('button', { name: 'common.operation.add' }))
@@ -106,8 +106,7 @@ describe('AddAnnotationModal', () => {
 
     typeQuestion('Question value')
     typeAnswer('Answer value')
-    const createNextToggle = screen.getByText('appAnnotation.addModal.createNext').previousElementSibling as HTMLElement
-    fireEvent.click(createNextToggle)
+    fireEvent.click(screen.getByText('appAnnotation.addModal.createNext'))
 
     await act(async () => {
       fireEvent.click(screen.getByRole('button', { name: 'common.operation.add' }))
diff --git a/web/app/components/app/annotation/add-annotation-modal/index.tsx b/web/app/components/app/annotation/add-annotation-modal/index.tsx
index ba987a8a8a..f94b072e39 100644
--- a/web/app/components/app/annotation/add-annotation-modal/index.tsx
+++ b/web/app/components/app/annotation/add-annotation-modal/index.tsx
@@ -2,12 +2,21 @@
 import type { FC } from 'react'
 import type { AnnotationItemBasic } from '../type'
 import { Button } from '@langgenius/dify-ui/button'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
+import {
+  Drawer,
+  DrawerBackdrop,
+  DrawerCloseButton,
+  DrawerContent,
+  DrawerPopup,
+  DrawerPortal,
+  DrawerTitle,
+  DrawerViewport,
+} from '@langgenius/dify-ui/drawer'
 import { toast } from '@langgenius/dify-ui/toast'
 import * as React from 'react'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import Checkbox from '@/app/components/base/checkbox'
-import Drawer from '@/app/components/base/drawer-plus'
 import AnnotationFull from '@/app/components/billing/annotation-full'
 import { useProviderContext } from '@/context/provider-context'
 import EditItem, { EditItemType } from './edit-item'
@@ -67,52 +76,72 @@ const AddAnnotationModal: FC<Props> = ({
       onHide()
     }
   }
+  if (!isShow)
+    return null
+
   return (
     <div>
       <Drawer
-        isShow={isShow}
-        onHide={onHide}
-        maxWidthClassName="max-w-[480px]!"
-        title={t('addModal.title', { ns: 'appAnnotation' }) as string}
-        body={(
-          <div className="space-y-6 p-6 pb-4">
-            <EditItem
-              type={EditItemType.Query}
-              content={question}
-              onChange={setQuestion}
-            />
-            <EditItem
-              type={EditItemType.Answer}
-              content={answer}
-              onChange={setAnswer}
-            />
-          </div>
-        )}
-        foot={
-          (
-            <div>
-              {isAnnotationFull && (
-                <div className="mt-6 mb-4 px-6">
-                  <AnnotationFull />
-                </div>
-              )}
-              <div className="flex h-16 items-center justify-between rounded-br-xl rounded-bl-xl border-t border-divider-subtle bg-background-section-burn px-4 system-sm-medium text-text-tertiary">
-                <div
-                  className="flex items-center space-x-2"
-                >
-                  <Checkbox id="create-next-checkbox" checked={isCreateNext} onCheck={() => setIsCreateNext(!isCreateNext)} />
-                  <div>{t('addModal.createNext', { ns: 'appAnnotation' })}</div>
-                </div>
-                <div className="mt-2 flex space-x-2">
-                  <Button className="h-7 text-xs" onClick={onHide}>{t('operation.cancel', { ns: 'common' })}</Button>
-                  <Button className="h-7 text-xs" variant="primary" onClick={handleSave} loading={isSaving} disabled={isAnnotationFull}>{t('operation.add', { ns: 'common' })}</Button>
-                </div>
-              </div>
-            </div>
-
-          )
-        }
+        open
+        modal
+        disablePointerDismissal
+        swipeDirection="right"
+        onOpenChange={(open) => {
+          if (!open)
+            onHide()
+        }}
       >
+        <DrawerPortal>
+          <DrawerBackdrop />
+          <DrawerViewport>
+            <DrawerPopup className="data-[swipe-direction=right]:top-16 data-[swipe-direction=right]:right-2 data-[swipe-direction=right]:bottom-3 data-[swipe-direction=right]:h-auto data-[swipe-direction=right]:w-120 data-[swipe-direction=right]:max-w-[calc(100vw-1rem)] data-[swipe-direction=right]:rounded-xl data-[swipe-direction=right]:border-r-[0.5px] data-[swipe-direction=right]:border-divider-subtle">
+              <DrawerContent className="flex min-h-0 flex-1 flex-col p-0 pb-0">
+                <div className="shrink-0 border-b border-divider-subtle py-4">
+                  <div className="flex h-6 items-center justify-between pr-5 pl-6">
+                    <DrawerTitle className="min-w-0 truncate system-xl-semibold text-text-primary">
+                      {t('addModal.title', { ns: 'appAnnotation' })}
+                    </DrawerTitle>
+                    <DrawerCloseButton
+                      aria-label={t('operation.close', { ns: 'common' })}
+                      className="h-6 w-6 rounded-md"
+                    />
+                  </div>
+                </div>
+                <div className="min-h-0 flex-1 overflow-y-auto">
+                  <div className="space-y-6 p-6 pb-4">
+                    <EditItem
+                      type={EditItemType.Query}
+                      content={question}
+                      onChange={setQuestion}
+                    />
+                    <EditItem
+                      type={EditItemType.Answer}
+                      content={answer}
+                      onChange={setAnswer}
+                    />
+                  </div>
+                </div>
+                <div className="shrink-0">
+                  {isAnnotationFull && (
+                    <div className="mt-6 mb-4 px-6">
+                      <AnnotationFull />
+                    </div>
+                  )}
+                  <div className="flex h-16 items-center justify-between rounded-br-xl rounded-bl-xl border-t border-divider-subtle bg-background-section-burn px-4 system-sm-medium text-text-tertiary">
+                    <label className="flex items-center space-x-2">
+                      <Checkbox checked={isCreateNext} onCheckedChange={setIsCreateNext} />
+                      <span>{t('addModal.createNext', { ns: 'appAnnotation' })}</span>
+                    </label>
+                    <div className="mt-2 flex space-x-2">
+                      <Button className="h-7 text-xs" onClick={onHide}>{t('operation.cancel', { ns: 'common' })}</Button>
+                      <Button className="h-7 text-xs" variant="primary" onClick={handleSave} loading={isSaving} disabled={isAnnotationFull}>{t('operation.add', { ns: 'common' })}</Button>
+                    </div>
+                  </div>
+                </div>
+              </DrawerContent>
+            </DrawerPopup>
+          </DrawerViewport>
+        </DrawerPortal>
       </Drawer>
     </div>
   )
diff --git a/web/app/components/app/annotation/batch-action.tsx b/web/app/components/app/annotation/batch-action.tsx
index 938dcb03bd..961f313746 100644
--- a/web/app/components/app/annotation/batch-action.tsx
+++ b/web/app/components/app/annotation/batch-action.tsx
@@ -55,15 +55,23 @@ const BatchAction: FC<IBatchActionProps> = ({
           <span className="text-[13px] leading-[16px] font-semibold text-text-accent">{t(`${i18nPrefix}.selected`, { ns: 'appAnnotation' })}</span>
         </div>
         <Divider type="vertical" className="mx-0.5 h-3.5 bg-divider-regular" />
-        <div className="flex cursor-pointer items-center gap-x-0.5 px-3 py-2" onClick={showDeleteConfirm}>
-          <RiDeleteBinLine className="h-4 w-4 text-components-button-destructive-ghost-text" />
-          <button type="button" className="px-0.5 text-[13px] leading-[16px] font-medium text-components-button-destructive-ghost-text">
+        <button
+          type="button"
+          className="flex cursor-pointer items-center gap-x-0.5 border-none bg-transparent px-3 py-2 text-left text-components-button-destructive-ghost-text focus-visible:ring-1 focus-visible:ring-state-destructive-border focus-visible:outline-hidden"
+          onClick={showDeleteConfirm}
+        >
+          <RiDeleteBinLine className="h-4 w-4" aria-hidden="true" />
+          <span className="px-0.5 text-[13px] leading-[16px] font-medium">
             {t('operation.delete', { ns: 'common' })}
-          </button>
-        </div>
+          </span>
+        </button>
 
         <Divider type="vertical" className="mx-0.5 h-3.5 bg-divider-regular" />
-        <button type="button" className="px-3.5 py-2 text-[13px] leading-[16px] font-medium text-components-button-ghost-text" onClick={onCancel}>
+        <button
+          type="button"
+          className="border-none bg-transparent px-3.5 py-2 text-left text-[13px] leading-[16px] font-medium text-components-button-ghost-text focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+          onClick={onCancel}
+        >
           {t('operation.cancel', { ns: 'common' })}
         </button>
       </div>
diff --git a/web/app/components/app/annotation/batch-add-annotation-modal/__tests__/csv-uploader.spec.tsx b/web/app/components/app/annotation/batch-add-annotation-modal/__tests__/csv-uploader.spec.tsx
index 5fc1cd25e1..8e6dd6cc28 100644
--- a/web/app/components/app/annotation/batch-add-annotation-modal/__tests__/csv-uploader.spec.tsx
+++ b/web/app/components/app/annotation/batch-add-annotation-modal/__tests__/csv-uploader.spec.tsx
@@ -54,7 +54,7 @@ describe('CSVUploader', () => {
     const clickSpy = vi.spyOn(HTMLInputElement.prototype, 'click')
     renderComponent()
 
-    fireEvent.click(screen.getByText('appAnnotation.batchModal.browse'))
+    fireEvent.click(screen.getByRole('button', { name: 'appAnnotation.batchModal.browse' }))
 
     expect(clickSpy).toHaveBeenCalledTimes(1)
     clickSpy.mockRestore()
@@ -137,7 +137,7 @@ describe('CSVUploader', () => {
     clickSpy.mockRestore()
 
     const valueSetter = vi.spyOn(fileInput, 'value', 'set')
-    const removeTrigger = screen.getByTestId('remove-file-button')
+    const removeTrigger = screen.getByRole('button', { name: /operation\.delete$/ })
     fireEvent.click(removeTrigger)
 
     expect(updateFile).toHaveBeenCalledWith()
diff --git a/web/app/components/app/annotation/batch-add-annotation-modal/__tests__/index.spec.tsx b/web/app/components/app/annotation/batch-add-annotation-modal/__tests__/index.spec.tsx
index c5d7232e12..74b59ff79f 100644
--- a/web/app/components/app/annotation/batch-add-annotation-modal/__tests__/index.spec.tsx
+++ b/web/app/components/app/annotation/batch-add-annotation-modal/__tests__/index.spec.tsx
@@ -115,6 +115,14 @@ describe('BatchModal', () => {
     expect(props.onCancel).toHaveBeenCalledTimes(1)
   })
 
+  it('should call onCancel when close button is clicked', () => {
+    const { props } = renderComponent()
+
+    fireEvent.click(screen.getByRole('button', { name: /operation\.close$/ }))
+
+    expect(props.onCancel).toHaveBeenCalledTimes(1)
+  })
+
   it('should submit the csv file, poll status, and notify when import completes', async () => {
     vi.useFakeTimers({ shouldAdvanceTime: true })
     const { props } = renderComponent()
diff --git a/web/app/components/app/annotation/batch-add-annotation-modal/csv-uploader.tsx b/web/app/components/app/annotation/batch-add-annotation-modal/csv-uploader.tsx
index dc63b5c9be..75c3e8a66c 100644
--- a/web/app/components/app/annotation/batch-add-annotation-modal/csv-uploader.tsx
+++ b/web/app/components/app/annotation/batch-add-annotation-modal/csv-uploader.tsx
@@ -97,7 +97,13 @@ const CSVUploader: FC<Props> = ({
               <CSVIcon className="shrink-0" />
               <div className="text-text-tertiary">
                 {t('batchModal.csvUploadTitle', { ns: 'appAnnotation' })}
-                <span className="cursor-pointer text-text-accent" onClick={selectHandle}>{t('batchModal.browse', { ns: 'appAnnotation' })}</span>
+                <button
+                  type="button"
+                  className="inline cursor-pointer border-none bg-transparent p-0 text-left text-text-accent focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+                  onClick={selectHandle}
+                >
+                  {t('batchModal.browse', { ns: 'appAnnotation' })}
+                </button>
               </div>
             </div>
             {dragging && <div ref={dragRef} className="absolute top-0 left-0 h-full w-full" />}
@@ -113,9 +119,14 @@ const CSVUploader: FC<Props> = ({
             <div className="hidden items-center group-hover:flex">
               <Button variant="secondary" onClick={selectHandle}>{t('stepOne.uploader.change', { ns: 'datasetCreation' })}</Button>
               <div className="mx-2 h-4 w-px bg-divider-regular" />
-              <div className="cursor-pointer p-2" onClick={removeFile} data-testid="remove-file-button">
-                <RiDeleteBinLine className="h-4 w-4 text-text-tertiary" />
-              </div>
+              <button
+                type="button"
+                className="cursor-pointer border-none bg-transparent p-2 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+                aria-label={t('operation.delete', { ns: 'common' })}
+                onClick={removeFile}
+              >
+                <RiDeleteBinLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
+              </button>
             </div>
           </div>
         )}
diff --git a/web/app/components/app/annotation/batch-add-annotation-modal/index.tsx b/web/app/components/app/annotation/batch-add-annotation-modal/index.tsx
index 550794cce7..7f1905c025 100644
--- a/web/app/components/app/annotation/batch-add-annotation-modal/index.tsx
+++ b/web/app/components/app/annotation/batch-add-annotation-modal/index.tsx
@@ -1,13 +1,12 @@
 'use client'
 import type { FC } from 'react'
 import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
 import { RiCloseLine } from '@remixicon/react'
-import { noop } from 'es-toolkit/function'
 import * as React from 'react'
 import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import Modal from '@/app/components/base/modal'
 import AnnotationFull from '@/app/components/billing/annotation-full'
 import { useProviderContext } from '@/context/provider-context'
 import { annotationBatchImport, checkAnnotationBatchImportProgress } from '@/service/annotation'
@@ -88,37 +87,45 @@ const BatchModal: FC<IBatchModalProps> = ({
   }
 
   return (
-    <Modal isShow={isShow} onClose={noop} className="max-w-[520px]! rounded-xl! px-8 py-6">
-      <div className="relative pb-1 system-xl-medium text-text-primary">{t('batchModal.title', { ns: 'appAnnotation' })}</div>
-      <div className="absolute top-4 right-4 cursor-pointer p-2" onClick={onCancel}>
-        <RiCloseLine className="h-4 w-4 text-text-tertiary" />
-      </div>
-      <CSVUploader
-        file={currentCSV}
-        updateFile={handleFile}
-      />
-      <CSVDownloader />
+    <Dialog open={isShow}>
+      <DialogContent className="w-full max-w-[520px]! overflow-hidden! rounded-xl! border-none px-8 py-6 text-left align-middle">
 
-      {isAnnotationFull && (
-        <div className="mt-4">
-          <AnnotationFull />
-        </div>
-      )}
-
-      <div className="mt-[28px] flex justify-end pt-6">
-        <Button className="mr-2 system-sm-medium text-text-tertiary" onClick={onCancel}>
-          {t('batchModal.cancel', { ns: 'appAnnotation' })}
-        </Button>
-        <Button
-          variant="primary"
-          onClick={handleSend}
-          disabled={isAnnotationFull || !currentCSV}
-          loading={importStatus === ProcessStatus.PROCESSING || importStatus === ProcessStatus.WAITING}
+        <div className="relative pb-1 system-xl-medium text-text-primary">{t('batchModal.title', { ns: 'appAnnotation' })}</div>
+        <button
+          type="button"
+          className="absolute top-4 right-4 cursor-pointer border-none bg-transparent p-2 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+          aria-label={t('operation.close', { ns: 'common' })}
+          onClick={onCancel}
         >
-          {t('batchModal.run', { ns: 'appAnnotation' })}
-        </Button>
-      </div>
-    </Modal>
+          <RiCloseLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
+        </button>
+        <CSVUploader
+          file={currentCSV}
+          updateFile={handleFile}
+        />
+        <CSVDownloader />
+
+        {isAnnotationFull && (
+          <div className="mt-4">
+            <AnnotationFull />
+          </div>
+        )}
+
+        <div className="mt-[28px] flex justify-end pt-6">
+          <Button className="mr-2 system-sm-medium text-text-tertiary" onClick={onCancel}>
+            {t('batchModal.cancel', { ns: 'appAnnotation' })}
+          </Button>
+          <Button
+            variant="primary"
+            onClick={handleSend}
+            disabled={isAnnotationFull || !currentCSV}
+            loading={importStatus === ProcessStatus.PROCESSING || importStatus === ProcessStatus.WAITING}
+          >
+            {t('batchModal.run', { ns: 'appAnnotation' })}
+          </Button>
+        </div>
+      </DialogContent>
+    </Dialog>
   )
 }
 export default React.memo(BatchModal)
diff --git a/web/app/components/app/annotation/edit-annotation-modal/index.tsx b/web/app/components/app/annotation/edit-annotation-modal/index.tsx
index 8e690eca9b..0f6ee0dd1b 100644
--- a/web/app/components/app/annotation/edit-annotation-modal/index.tsx
+++ b/web/app/components/app/annotation/edit-annotation-modal/index.tsx
@@ -8,11 +8,20 @@ import {
   AlertDialogContent,
   AlertDialogTitle,
 } from '@langgenius/dify-ui/alert-dialog'
+import {
+  Drawer,
+  DrawerBackdrop,
+  DrawerCloseButton,
+  DrawerContent,
+  DrawerPopup,
+  DrawerPortal,
+  DrawerTitle,
+  DrawerViewport,
+} from '@langgenius/dify-ui/drawer'
 import { toast } from '@langgenius/dify-ui/toast'
 import * as React from 'react'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import Drawer from '@/app/components/base/drawer-plus'
 import { MessageCheckRemove } from '@/app/components/base/icons/src/vender/line/communication'
 import AnnotationFull from '@/app/components/billing/annotation-full'
 import { useProviderContext } from '@/context/provider-context'
@@ -90,92 +99,115 @@ const EditAnnotationModal: FC<Props> = ({
     }
   }
   const [showModal, setShowModal] = useState(false)
+  if (!isShow)
+    return null
 
   return (
     <div>
       <Drawer
-        isShow={isShow}
-        onHide={onHide}
-        maxWidthClassName="max-w-[480px]!"
-        title={t('editModal.title', { ns: 'appAnnotation' }) as string}
-        body={(
-          <div>
-            <div className="space-y-6 p-6 pb-4">
-              <EditItem
-                type={EditItemType.Query}
-                content={query}
-                readonly={(isAdd && isAnnotationFull) || onlyEditResponse}
-                onSave={editedContent => handleSave(EditItemType.Query, editedContent)}
-              />
-              <EditItem
-                type={EditItemType.Answer}
-                content={answer}
-                readonly={isAdd && isAnnotationFull}
-                onSave={editedContent => handleSave(EditItemType.Answer, editedContent)}
-              />
-              <AlertDialog open={showModal} onOpenChange={open => !open && setShowModal(false)}>
-                <AlertDialogContent>
-                  <div className="flex flex-col gap-2 px-6 pt-6 pb-4">
-                    <AlertDialogTitle
-                      title={t('feature.annotation.removeConfirm', { ns: 'appDebug' })}
-                      className="w-full truncate title-2xl-semi-bold text-text-primary"
-                    >
-                      {t('feature.annotation.removeConfirm', { ns: 'appDebug' })}
-                    </AlertDialogTitle>
+        open
+        modal
+        disablePointerDismissal
+        swipeDirection="right"
+        onOpenChange={(open) => {
+          if (!open)
+            onHide()
+        }}
+      >
+        <DrawerPortal>
+          <DrawerBackdrop />
+          <DrawerViewport>
+            <DrawerPopup className="data-[swipe-direction=right]:top-16 data-[swipe-direction=right]:right-2 data-[swipe-direction=right]:bottom-3 data-[swipe-direction=right]:h-auto data-[swipe-direction=right]:w-120 data-[swipe-direction=right]:max-w-[calc(100vw-1rem)] data-[swipe-direction=right]:rounded-xl data-[swipe-direction=right]:border-r-[0.5px] data-[swipe-direction=right]:border-divider-subtle">
+              <DrawerContent className="flex min-h-0 flex-1 flex-col p-0 pb-0">
+                <div className="shrink-0 border-b border-divider-subtle py-4">
+                  <div className="flex h-6 items-center justify-between pr-5 pl-6">
+                    <DrawerTitle className="min-w-0 truncate system-xl-semibold text-text-primary">
+                      {t('editModal.title', { ns: 'appAnnotation' })}
+                    </DrawerTitle>
+                    <DrawerCloseButton
+                      aria-label={t('operation.close', { ns: 'common' })}
+                      className="h-6 w-6 rounded-md"
+                    />
                   </div>
-                  <AlertDialogActions>
-                    <AlertDialogCancelButton>
-                      {t('operation.cancel', { ns: 'common' })}
-                    </AlertDialogCancelButton>
-                    <AlertDialogConfirmButton
-                      tone="destructive"
-                      onClick={() => {
-                        onRemove()
-                        setShowModal(false)
-                        onHide()
-                      }}
-                    >
-                      {t('operation.confirm', { ns: 'common' })}
-                    </AlertDialogConfirmButton>
-                  </AlertDialogActions>
-                </AlertDialogContent>
-              </AlertDialog>
-            </div>
-          </div>
-        )}
-        foot={(
-          <div>
-            {isAnnotationFull && (
-              <div className="mt-6 mb-4 px-6">
-                <AnnotationFull />
-              </div>
-            )}
-
-            {
-              annotationId
-                ? (
-                    <div className="flex h-16 items-center justify-between rounded-br-xl rounded-bl-xl border-t border-divider-subtle bg-background-section-burn px-4 system-sm-medium text-text-tertiary">
-                      <div
-                        className="flex cursor-pointer items-center space-x-2 pl-3"
-                        onClick={() => setShowModal(true)}
-                      >
-                        <MessageCheckRemove />
-                        <div>{t('editModal.removeThisCache', { ns: 'appAnnotation' })}</div>
-                      </div>
-                      {!!createdAt && (
-                        <div>
-                          {t('editModal.createdAt', { ns: 'appAnnotation' })}
-&nbsp;
-                          {formatTime(createdAt, t('dateTimeFormat', { ns: 'appLog' }) as string)}
+                </div>
+                <div className="min-h-0 flex-1 overflow-y-auto">
+                  <div className="space-y-6 p-6 pb-4">
+                    <EditItem
+                      type={EditItemType.Query}
+                      content={query}
+                      readonly={(isAdd && isAnnotationFull) || onlyEditResponse}
+                      onSave={editedContent => handleSave(EditItemType.Query, editedContent)}
+                    />
+                    <EditItem
+                      type={EditItemType.Answer}
+                      content={answer}
+                      readonly={isAdd && isAnnotationFull}
+                      onSave={editedContent => handleSave(EditItemType.Answer, editedContent)}
+                    />
+                    <AlertDialog open={showModal} onOpenChange={open => !open && setShowModal(false)}>
+                      <AlertDialogContent>
+                        <div className="flex flex-col gap-2 px-6 pt-6 pb-4">
+                          <AlertDialogTitle
+                            title={t('feature.annotation.removeConfirm', { ns: 'appDebug' })}
+                            className="w-full truncate title-2xl-semi-bold text-text-primary"
+                          >
+                            {t('feature.annotation.removeConfirm', { ns: 'appDebug' })}
+                          </AlertDialogTitle>
                         </div>
-                      )}
+                        <AlertDialogActions>
+                          <AlertDialogCancelButton>
+                            {t('operation.cancel', { ns: 'common' })}
+                          </AlertDialogCancelButton>
+                          <AlertDialogConfirmButton
+                            tone="destructive"
+                            onClick={() => {
+                              onRemove()
+                              setShowModal(false)
+                              onHide()
+                            }}
+                          >
+                            {t('operation.confirm', { ns: 'common' })}
+                          </AlertDialogConfirmButton>
+                        </AlertDialogActions>
+                      </AlertDialogContent>
+                    </AlertDialog>
+                  </div>
+                </div>
+                <div className="shrink-0">
+                  {isAnnotationFull && (
+                    <div className="mt-6 mb-4 px-6">
+                      <AnnotationFull />
                     </div>
-                  )
-                : undefined
-            }
-          </div>
-        )}
-      />
+                  )}
+
+                  {
+                    annotationId
+                      ? (
+                          <div className="flex h-16 items-center justify-between rounded-br-xl rounded-bl-xl border-t border-divider-subtle bg-background-section-burn px-4 system-sm-medium text-text-tertiary">
+                            <div
+                              className="flex cursor-pointer items-center space-x-2 pl-3"
+                              onClick={() => setShowModal(true)}
+                            >
+                              <MessageCheckRemove />
+                              <div>{t('editModal.removeThisCache', { ns: 'appAnnotation' })}</div>
+                            </div>
+                            {!!createdAt && (
+                              <div>
+                                {t('editModal.createdAt', { ns: 'appAnnotation' })}
+&nbsp;
+                                {formatTime(createdAt, t('dateTimeFormat', { ns: 'appLog' }) as string)}
+                              </div>
+                            )}
+                          </div>
+                        )
+                      : undefined
+                  }
+                </div>
+              </DrawerContent>
+            </DrawerPopup>
+          </DrawerViewport>
+        </DrawerPortal>
+      </Drawer>
     </div>
 
   )
diff --git a/web/app/components/app/annotation/header-opts/__tests__/index.spec.tsx b/web/app/components/app/annotation/header-opts/__tests__/index.spec.tsx
index 944a8563eb..f953514702 100644
--- a/web/app/components/app/annotation/header-opts/__tests__/index.spec.tsx
+++ b/web/app/components/app/annotation/header-opts/__tests__/index.spec.tsx
@@ -3,146 +3,22 @@ import type { ComponentProps } from 'react'
 import type { Mock } from 'vitest'
 import type { AnnotationItemBasic } from '../../type'
 import type { Locale } from '@/i18n-config'
-import { render, screen, waitFor } from '@testing-library/react'
+import { act, render, screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
-import * as React from 'react'
 import { useLocale } from '@/context/i18n'
 import { LanguagesSupported } from '@/i18n-config/language'
 import { clearAllAnnotations, fetchExportAnnotationList } from '@/service/annotation'
 import HeaderOptions from '../index'
 
-vi.mock('@headlessui/react', () => {
-  type PopoverContextValue = { open: boolean, setOpen: (open: boolean) => void }
-  type MenuContextValue = { open: boolean, setOpen: (open: boolean) => void }
-  const PopoverContext = React.createContext<PopoverContextValue | null>(null)
-  const MenuContext = React.createContext<MenuContextValue | null>(null)
-
-  const Popover = ({ children }: { children: React.ReactNode | ((props: { open: boolean }) => React.ReactNode) }) => {
-    const [open, setOpen] = React.useState(false)
-    const value = React.useMemo(() => ({ open, setOpen }), [open])
-    return (
-      <PopoverContext.Provider value={value}>
-        {typeof children === 'function' ? children({ open }) : children}
-      </PopoverContext.Provider>
-    )
-  }
-
-  const PopoverButton = React.forwardRef(({ onClick, children, ...props }: { onClick?: () => void, children?: React.ReactNode }, ref: React.Ref<HTMLButtonElement>) => {
-    const context = React.useContext(PopoverContext)
-    const handleClick = () => {
-      context?.setOpen(!context.open)
-      onClick?.()
-    }
-    return (
-      <button
-        ref={ref}
-        type="button"
-        aria-expanded={context?.open ?? false}
-        onClick={handleClick}
-        {...props}
-      >
-        {children}
-      </button>
-    )
-  })
-
-  const PopoverPanel = React.forwardRef(({ children, ...props }: { children: React.ReactNode | ((props: { close: () => void }) => React.ReactNode) }, ref: React.Ref<HTMLDivElement>) => {
-    const context = React.useContext(PopoverContext)
-    if (!context?.open)
-      return null
-    const content = typeof children === 'function' ? children({ close: () => context.setOpen(false) }) : children
-    return (
-      <div ref={ref} {...props}>
-        {content}
-      </div>
-    )
-  })
-
-  const Menu = ({ children }: { children: React.ReactNode }) => {
-    const [open, setOpen] = React.useState(false)
-    const value = React.useMemo(() => ({ open, setOpen }), [open])
-    return (
-      <MenuContext.Provider value={value}>
-        {children}
-      </MenuContext.Provider>
-    )
-  }
-
-  const MenuButton = ({ onClick, children, ...props }: { onClick?: () => void, children?: React.ReactNode }) => {
-    const context = React.useContext(MenuContext)
-    const handleClick = () => {
-      context?.setOpen(!context.open)
-      onClick?.()
-    }
-    return (
-      <button type="button" aria-expanded={context?.open ?? false} onClick={handleClick} {...props}>
-        {children}
-      </button>
-    )
-  }
-
-  const MenuItems = ({ children, ...props }: { children: React.ReactNode }) => {
-    const context = React.useContext(MenuContext)
-    if (!context?.open)
-      return null
-    return (
-      <div {...props}>
-        {children}
-      </div>
-    )
-  }
-
-  return {
-    Dialog: ({ open, children, className }: { open?: boolean, children: React.ReactNode, className?: string }) => {
-      if (open === false)
-        return null
-      return (
-        <div role="dialog" className={className}>
-          {children}
-        </div>
-      )
-    },
-    DialogBackdrop: ({ children, className, onClick }: { children?: React.ReactNode, className?: string, onClick?: () => void }) => (
-      <div className={className} onClick={onClick}>
-        {children}
-      </div>
-    ),
-    DialogPanel: ({ children, className, ...props }: { children: React.ReactNode, className?: string }) => (
-      <div className={className} {...props}>
-        {children}
-      </div>
-    ),
-    DialogTitle: ({ children, className, ...props }: { children: React.ReactNode, className?: string }) => (
-      <div className={className} {...props}>
-        {children}
-      </div>
-    ),
-    Popover,
-    PopoverButton,
-    PopoverPanel,
-    Menu,
-    MenuButton,
-    MenuItems,
-    Transition: ({ show = true, children }: { show?: boolean, children: React.ReactNode }) => (show ? <>{children}</> : null),
-    TransitionChild: ({ children }: { children: React.ReactNode }) => <>{children}</>,
-  }
-})
-
-let lastCSVDownloaderProps: Record<string, unknown> | undefined
-const mockCSVDownloader = vi.fn(({ children, ...props }) => {
-  lastCSVDownloaderProps = props
-  return (
-    <div data-testid="csv-downloader">
-      {children}
-    </div>
-  )
-})
+const mockJsonToCSV = vi.fn((_: unknown) => 'csv-content')
+const mockCSVDownloader = vi.fn(({ children }) => <>{children}</>)
 
 vi.mock('react-papaparse', () => ({
   useCSVDownloader: () => ({
     CSVDownloader: (props: any) => mockCSVDownloader(props),
     Type: { Link: 'link' },
   }),
+  jsonToCSV: (data: unknown) => mockJsonToCSV(data),
 }))
 
 vi.mock('@/service/annotation', () => ({
@@ -194,33 +70,28 @@ const openOperationsPopover = async (user: ReturnType<typeof userEvent.setup>) =
 
 const expandExportMenu = async (user: ReturnType<typeof userEvent.setup>) => {
   await openOperationsPopover(user)
-  const exportLabel = await screen.findByText('appAnnotation.table.header.bulkExport')
-  const exportButton = exportLabel.closest('button') as HTMLButtonElement
-  expect(exportButton).toBeTruthy()
-  await user.click(exportButton)
+  const exportItem = await screen.findByRole('menuitem', { name: /appAnnotation\.table\.header\.bulkExport/i })
+  await user.hover(exportItem)
 }
 
-const getExportButtons = async () => {
-  const csvLabel = await screen.findByText('CSV')
-  const jsonLabel = await screen.findByText('JSONL')
-  const csvButton = csvLabel.closest('button') as HTMLButtonElement
-  const jsonButton = jsonLabel.closest('button') as HTMLButtonElement
-  expect(csvButton).toBeTruthy()
-  expect(jsonButton).toBeTruthy()
+const getExportItems = async () => {
+  const csvItem = await screen.findByRole('menuitem', { name: 'CSV' })
+  const jsonItem = await screen.findByRole('menuitem', { name: 'JSONL' })
   return {
-    csvButton,
-    jsonButton,
+    csvItem,
+    jsonItem,
   }
 }
 
-const clickOperationAction = async (
-  user: ReturnType<typeof userEvent.setup>,
-  translationKey: string,
-) => {
-  const label = await screen.findByText(translationKey)
-  const button = label.closest('button') as HTMLButtonElement
-  expect(button).toBeTruthy()
-  await user.click(button)
+const clickMenuItem = async (item: HTMLElement) => {
+  await act(async () => {
+    item.click()
+  })
+}
+
+const clickOperationAction = async (translationKey: string) => {
+  const item = await screen.findByRole('menuitem', { name: translationKey })
+  await clickMenuItem(item)
 }
 
 const mockAnnotations: AnnotationItemBasic[] = [
@@ -237,11 +108,14 @@ describe('HeaderOptions', () => {
   beforeEach(() => {
     vi.clearAllMocks()
     vi.useRealTimers()
-    mockCSVDownloader.mockClear()
-    lastCSVDownloaderProps = undefined
+    mockJsonToCSV.mockReturnValue('csv-content')
     mockedFetchAnnotations.mockResolvedValue({ data: [] })
   })
 
+  afterEach(() => {
+    vi.restoreAllMocks()
+  })
+
   it('should fetch annotations on mount and render enabled export actions when data exist', async () => {
     mockedFetchAnnotations.mockResolvedValue({ data: mockAnnotations })
     const user = userEvent.setup()
@@ -253,22 +127,69 @@ describe('HeaderOptions', () => {
 
     await expandExportMenu(user)
 
-    const { csvButton, jsonButton } = await getExportButtons()
+    const { csvItem, jsonItem } = await getExportItems()
 
-    expect(csvButton).not.toBeDisabled()
-    expect(jsonButton).not.toBeDisabled()
+    expect(csvItem).not.toHaveAttribute('data-disabled')
+    expect(jsonItem).not.toHaveAttribute('data-disabled')
 
-    await waitFor(() => {
-      expect(lastCSVDownloaderProps).toMatchObject({
-        bom: true,
-        filename: 'annotations-en-US',
-        type: 'link',
-        data: [
-          ['Question', 'Answer'],
-          ['Question 1', 'Answer 1'],
-        ],
+    await clickMenuItem(csvItem)
+
+    expect(mockJsonToCSV).toHaveBeenCalledWith([
+      ['Question', 'Answer'],
+      ['Question 1', 'Answer 1'],
+    ])
+  })
+
+  it('should trigger CSV download with locale-specific filename', async () => {
+    mockedFetchAnnotations.mockResolvedValue({ data: mockAnnotations })
+    const user = userEvent.setup()
+    const originalCreateElement = document.createElement.bind(document)
+    const anchor = originalCreateElement('a') as HTMLAnchorElement
+    const clickSpy = vi.spyOn(anchor, 'click').mockImplementation(vi.fn())
+    const createElementSpy = vi.spyOn(document, 'createElement')
+      .mockImplementation((tagName: Parameters<Document['createElement']>[0]) => {
+        if (tagName === 'a')
+          return anchor
+        return originalCreateElement(tagName)
       })
+    let capturedBlob: Blob | null = null
+    const objectURLSpy = vi.spyOn(URL, 'createObjectURL')
+      .mockImplementation((blob) => {
+        capturedBlob = blob as Blob
+        return 'blob://mock-url'
+      })
+    const revokeSpy = vi.spyOn(URL, 'revokeObjectURL').mockImplementation(vi.fn())
+
+    renderComponent({}, LanguagesSupported[1])
+
+    await expandExportMenu(user)
+
+    const { csvItem } = await getExportItems()
+    await clickMenuItem(csvItem)
+
+    expect(mockJsonToCSV).toHaveBeenCalledWith([
+      ['问题', '答案'],
+      ['Question 1', 'Answer 1'],
+    ])
+    expect(createElementSpy).toHaveBeenCalled()
+    expect(anchor.download).toBe(`annotations-${LanguagesSupported[1]}.csv`)
+    expect(clickSpy).toHaveBeenCalled()
+    expect(revokeSpy).toHaveBeenCalledWith('blob://mock-url')
+
+    expect(capturedBlob).toBeInstanceOf(Blob)
+    expect(capturedBlob!.type).toBe('text/csv;charset=utf-8;')
+
+    const blobContent = await new Promise<string>((resolve) => {
+      const reader = new FileReader()
+      reader.onload = () => resolve(reader.result as string)
+      reader.readAsText(capturedBlob!)
     })
+    expect(blobContent).toBe('csv-content')
+
+    clickSpy.mockRestore()
+    createElementSpy.mockRestore()
+    objectURLSpy.mockRestore()
+    revokeSpy.mockRestore()
   })
 
   it('should disable export actions when there are no annotations', async () => {
@@ -277,14 +198,11 @@ describe('HeaderOptions', () => {
 
     await expandExportMenu(user)
 
-    const { csvButton, jsonButton } = await getExportButtons()
+    const { csvItem, jsonItem } = await getExportItems()
 
-    expect(csvButton)!.toBeDisabled()
-    expect(jsonButton)!.toBeDisabled()
-
-    expect(lastCSVDownloaderProps).toMatchObject({
-      data: [['Question', 'Answer']],
-    })
+    expect(csvItem).toHaveAttribute('data-disabled')
+    expect(jsonItem).toHaveAttribute('data-disabled')
+    expect(mockJsonToCSV).not.toHaveBeenCalled()
   })
 
   it('should open the add annotation modal and forward the onAdd callback', async () => {
@@ -321,7 +239,7 @@ describe('HeaderOptions', () => {
     renderComponent({ onAdded })
 
     await openOperationsPopover(user)
-    await clickOperationAction(user, 'appAnnotation.table.header.bulkImport')
+    await clickOperationAction('appAnnotation.table.header.bulkImport')
 
     expect(await screen.findByText('appAnnotation.batchModal.title'))!.toBeInTheDocument()
     await user.click(
@@ -354,10 +272,8 @@ describe('HeaderOptions', () => {
 
     await expandExportMenu(user)
 
-    await waitFor(() => expect(mockCSVDownloader).toHaveBeenCalled())
-
-    const { jsonButton } = await getExportButtons()
-    await user.click(jsonButton)
+    const { jsonItem } = await getExportItems()
+    await clickMenuItem(jsonItem)
 
     expect(createElementSpy).toHaveBeenCalled()
     expect(anchor.download).toBe(`annotations-${LanguagesSupported[1]}.jsonl`)
@@ -396,7 +312,7 @@ describe('HeaderOptions', () => {
     renderComponent({ onAdded })
 
     await openOperationsPopover(user)
-    await clickOperationAction(user, 'appAnnotation.table.header.clearAll')
+    await clickOperationAction('appAnnotation.table.header.clearAll')
 
     await screen.findByText('appAnnotation.table.header.clearAllConfirm')
     const confirmButton = screen.getByRole('button', { name: 'common.operation.confirm' })
@@ -416,7 +332,7 @@ describe('HeaderOptions', () => {
     renderComponent({ onAdded })
 
     await openOperationsPopover(user)
-    await clickOperationAction(user, 'appAnnotation.table.header.clearAll')
+    await clickOperationAction('appAnnotation.table.header.clearAll')
     await screen.findByText('appAnnotation.table.header.clearAllConfirm')
     const confirmButton = screen.getByRole('button', { name: 'common.operation.confirm' })
     await user.click(confirmButton)
diff --git a/web/app/components/app/annotation/header-opts/index.tsx b/web/app/components/app/annotation/header-opts/index.tsx
index fc27524c71..6814c3692c 100644
--- a/web/app/components/app/annotation/header-opts/index.tsx
+++ b/web/app/components/app/annotation/header-opts/index.tsx
@@ -1,19 +1,21 @@
 'use client'
 import type { FC } from 'react'
 import type { AnnotationItemBasic } from '../type'
-import { Menu, MenuButton, MenuItems, Transition } from '@headlessui/react'
 import { Button } from '@langgenius/dify-ui/button'
-import { cn } from '@langgenius/dify-ui/cn'
 import {
   DropdownMenu,
   DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuSub,
+  DropdownMenuSubContent,
+  DropdownMenuSubTrigger,
   DropdownMenuTrigger,
 } from '@langgenius/dify-ui/dropdown-menu'
 import * as React from 'react'
-import { Fragment, useEffect, useState } from 'react'
+import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import {
-  useCSVDownloader,
+  jsonToCSV,
 } from 'react-papaparse'
 import { useLocale } from '@/context/i18n'
 
@@ -54,6 +56,15 @@ const downloadAnnotationJsonl = (list: AnnotationItemBasic[], locale: string) =>
   downloadBlob({ data: file, fileName: `annotations-${locale}.jsonl` })
 }
 
+const downloadAnnotationCsv = (list: AnnotationItemBasic[], locale: string) => {
+  const content = jsonToCSV([
+    locale !== LanguagesSupported[1] ? CSV_HEADER_QA_EN : CSV_HEADER_QA_CN,
+    ...list.map(item => [item.question, item.answer]),
+  ])
+  const file = new Blob([`\uFEFF${content}`], { type: 'text/csv;charset=utf-8;' })
+  downloadBlob({ data: file, fileName: `annotations-${locale}.csv` })
+}
+
 const OperationsMenu: FC<OperationsMenuProps> = ({
   list,
   onClose,
@@ -63,88 +74,62 @@ const OperationsMenu: FC<OperationsMenuProps> = ({
 }) => {
   const { t } = useTranslation()
   const locale = useLocale()
-  const { CSVDownloader, Type } = useCSVDownloader()
   const annotationUnavailable = list.length === 0
 
   return (
-    <div className="w-full py-1">
-      <button
-        type="button"
-        className="mx-1 flex h-9 w-[calc(100%-8px)] cursor-pointer items-center space-x-2 rounded-lg px-3 py-2 hover:bg-components-panel-on-panel-item-bg-hover disabled:opacity-50"
+    <>
+      <DropdownMenuItem
+        className="gap-2"
         onClick={() => {
           onClose()
           onBulkImport()
         }}
       >
-        <span aria-hidden className="i-custom-vender-line-files-file-plus-02 h-4 w-4 text-text-tertiary" />
-        <span className="grow text-left system-sm-regular text-text-secondary">{t('table.header.bulkImport', { ns: 'appAnnotation' })}</span>
-      </button>
-      <Menu as="div" className="relative h-full w-full">
-        <MenuButton className="mx-1 flex h-9 w-[calc(100%-8px)] cursor-pointer items-center space-x-2 rounded-lg px-3 py-2 hover:bg-components-panel-on-panel-item-bg-hover disabled:opacity-50">
-          <span aria-hidden className="i-custom-vender-line-files-file-download-02 h-4 w-4 text-text-tertiary" />
-          <span className="grow text-left system-sm-regular text-text-secondary">{t('table.header.bulkExport', { ns: 'appAnnotation' })}</span>
-          <span aria-hidden className="i-custom-vender-line-arrows-chevron-right h-[14px] w-[14px] shrink-0 text-text-tertiary" />
-        </MenuButton>
-        <Transition
-          as={Fragment}
-          enter="transition ease-out duration-100"
-          enterFrom="transform opacity-0 scale-95"
-          enterTo="transform opacity-100 scale-100"
-          leave="transition ease-in duration-75"
-          leaveFrom="transform opacity-100 scale-100"
-          leaveTo="transform opacity-0 scale-95"
+        <span aria-hidden className="i-custom-vender-line-files-file-plus-02 size-4 shrink-0 text-text-tertiary" />
+        {t('table.header.bulkImport', { ns: 'appAnnotation' })}
+      </DropdownMenuItem>
+      <DropdownMenuSub>
+        <DropdownMenuSubTrigger className="gap-2">
+          <span aria-hidden className="i-custom-vender-line-files-file-download-02 size-4 shrink-0 text-text-tertiary" />
+          {t('table.header.bulkExport', { ns: 'appAnnotation' })}
+        </DropdownMenuSubTrigger>
+        <DropdownMenuSubContent
+          placement="left-start"
+          sideOffset={4}
+          popupClassName="min-w-[100px]"
         >
-          <MenuItems
-            className={cn(
-              'absolute top-px left-1 z-10 min-w-[100px] origin-top-right -translate-x-full rounded-xl border-[0.5px] border-components-panel-on-panel-item-bg bg-components-panel-bg py-1 shadow-xs',
-            )}
+          <DropdownMenuItem
+            disabled={annotationUnavailable}
+            onClick={() => {
+              onClose()
+              downloadAnnotationCsv(list, locale)
+            }}
           >
-            <CSVDownloader
-              type={Type.Link}
-              filename={`annotations-${locale}`}
-              bom={true}
-              data={[
-                locale !== LanguagesSupported[1] ? CSV_HEADER_QA_EN : CSV_HEADER_QA_CN,
-                ...list.map(item => [item.question, item.answer]),
-              ]}
-            >
-              <button
-                type="button"
-                disabled={annotationUnavailable}
-                className="mx-1 flex h-9 w-[calc(100%-8px)] cursor-pointer items-center space-x-2 rounded-lg px-3 py-2 hover:bg-components-panel-on-panel-item-bg-hover disabled:opacity-50"
-                onClick={onClose}
-              >
-                <span className="grow text-left system-sm-regular text-text-secondary">CSV</span>
-              </button>
-            </CSVDownloader>
-            <button
-              type="button"
-              disabled={annotationUnavailable}
-              className={cn('mx-1 flex h-9 w-[calc(100%-8px)] cursor-pointer items-center space-x-2 rounded-lg px-3 py-2 hover:bg-components-panel-on-panel-item-bg-hover disabled:opacity-50', 'border-0!')}
-              onClick={() => {
-                onClose()
-                onExportJsonl()
-              }}
-            >
-              <span className="grow text-left system-sm-regular text-text-secondary">JSONL</span>
-            </button>
-          </MenuItems>
-        </Transition>
-      </Menu>
-      <button
-        type="button"
+            CSV
+          </DropdownMenuItem>
+          <DropdownMenuItem
+            disabled={annotationUnavailable}
+            onClick={() => {
+              onClose()
+              onExportJsonl()
+            }}
+          >
+            JSONL
+          </DropdownMenuItem>
+        </DropdownMenuSubContent>
+      </DropdownMenuSub>
+      <DropdownMenuItem
+        variant="destructive"
+        className="gap-2"
         onClick={() => {
           onClose()
           onClearAll()
         }}
-        className="mx-1 flex h-9 w-[calc(100%-8px)] cursor-pointer items-center space-x-2 rounded-lg px-3 py-2 text-red-600 hover:bg-red-50 disabled:opacity-50"
       >
-        <span aria-hidden className="i-ri-delete-bin-line h-4 w-4" />
-        <span className="grow text-left system-sm-regular">
-          {t('table.header.clearAll', { ns: 'appAnnotation' })}
-        </span>
-      </button>
-    </div>
+        <span aria-hidden className="i-ri-delete-bin-line size-4 shrink-0" />
+        {t('table.header.clearAll', { ns: 'appAnnotation' })}
+      </DropdownMenuItem>
+    </>
   )
 }
 
@@ -204,7 +189,7 @@ const HeaderOptions: FC<Props> = ({
         <span aria-hidden className="mr-0.5 i-ri-add-line h-4 w-4" />
         <div>{t('table.header.addAnnotation', { ns: 'appAnnotation' })}</div>
       </Button>
-      <DropdownMenu open={isOperationsMenuOpen} onOpenChange={setIsOperationsMenuOpen}>
+      <DropdownMenu modal={false} open={isOperationsMenuOpen} onOpenChange={setIsOperationsMenuOpen}>
         <DropdownMenuTrigger
           aria-label={t('operation.more', { ns: 'common' })}
           className="mr-0 box-border inline-flex h-8 w-8 shrink-0 items-center justify-center rounded-lg border-[0.5px] border-components-button-secondary-border bg-components-button-secondary-bg p-0 text-components-button-secondary-text shadow-xs backdrop-blur-[5px] hover:border-components-button-secondary-border-hover hover:bg-components-button-secondary-bg-hover data-popup-open:border-components-button-secondary-border-hover data-popup-open:bg-components-button-secondary-bg-hover"
@@ -214,7 +199,7 @@ const HeaderOptions: FC<Props> = ({
         <DropdownMenuContent
           placement="bottom-end"
           sideOffset={4}
-          popupClassName="w-[155px] overflow-visible py-0"
+          popupClassName="w-[155px]"
         >
           <OperationsMenu
             list={list}
diff --git a/web/app/components/app/annotation/list.tsx b/web/app/components/app/annotation/list.tsx
index caad4dd523..fa12c95ae3 100644
--- a/web/app/components/app/annotation/list.tsx
+++ b/web/app/components/app/annotation/list.tsx
@@ -1,13 +1,13 @@
 'use client'
 import type { FC } from 'react'
 import type { AnnotationItem } from './type'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import { cn } from '@langgenius/dify-ui/cn'
 import { RiDeleteBinLine, RiEditLine } from '@remixicon/react'
 import * as React from 'react'
 import { useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import ActionButton from '@/app/components/base/action-button'
-import Checkbox from '@/app/components/base/checkbox'
 import useTimestamp from '@/hooks/use-timestamp'
 import BatchAction from './batch-action'
 import RemoveAnnotationConfirmModal from './remove-annotation-confirm-modal'
@@ -44,15 +44,15 @@ const List: FC<Props> = ({
     return list.some(item => selectedIds.includes(item.id))
   }, [list, selectedIds])
 
-  const handleSelectAll = useCallback(() => {
+  const handleSelectAll = useCallback((checked: boolean) => {
     const currentPageIds = list.map(item => item.id)
     const otherPageIds = selectedIds.filter(id => !currentPageIds.includes(id))
 
-    if (isAllSelected)
-      onSelectedIdsChange(otherPageIds)
-    else
+    if (checked)
       onSelectedIdsChange([...otherPageIds, ...currentPageIds])
-  }, [isAllSelected, list, selectedIds, onSelectedIdsChange])
+    else
+      onSelectedIdsChange(otherPageIds)
+  }, [list, selectedIds, onSelectedIdsChange])
 
   return (
     <>
@@ -65,7 +65,8 @@ const List: FC<Props> = ({
                   className="mr-2"
                   checked={isAllSelected}
                   indeterminate={!isAllSelected && isSomeSelected}
-                  onCheck={handleSelectAll}
+                  aria-label={t('operation.selectAll', { ns: 'common' })}
+                  onCheckedChange={handleSelectAll}
                 />
               </td>
               <td className="w-5 bg-background-section-burn pr-1 pl-2 whitespace-nowrap">{t('table.header.question', { ns: 'appAnnotation' })}</td>
@@ -90,11 +91,12 @@ const List: FC<Props> = ({
                   <Checkbox
                     className="mr-2"
                     checked={selectedIds.includes(item.id)}
-                    onCheck={() => {
-                      if (selectedIds.includes(item.id))
-                        onSelectedIdsChange(selectedIds.filter(id => id !== item.id))
-                      else
+                    aria-label={item.question}
+                    onCheckedChange={(checked) => {
+                      if (checked)
                         onSelectedIdsChange([...selectedIds, item.id])
+                      else
+                        onSelectedIdsChange(selectedIds.filter(id => id !== item.id))
                     }}
                   />
                 </td>
diff --git a/web/app/components/app/annotation/view-annotation-modal/index.tsx b/web/app/components/app/annotation/view-annotation-modal/index.tsx
index c9f7e8a78f..712fb29c2e 100644
--- a/web/app/components/app/annotation/view-annotation-modal/index.tsx
+++ b/web/app/components/app/annotation/view-annotation-modal/index.tsx
@@ -10,11 +10,20 @@ import {
   AlertDialogTitle,
 } from '@langgenius/dify-ui/alert-dialog'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  Drawer,
+  DrawerBackdrop,
+  DrawerCloseButton,
+  DrawerContent,
+  DrawerPopup,
+  DrawerPortal,
+  DrawerTitle,
+  DrawerViewport,
+} from '@langgenius/dify-ui/drawer'
 import * as React from 'react'
 import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Badge from '@/app/components/base/badge'
-import Drawer from '@/app/components/base/drawer-plus'
 import { MessageCheckRemove } from '@/app/components/base/icons/src/vender/line/communication'
 import Pagination from '@/app/components/base/pagination'
 import TabSlider from '@/app/components/base/tab-slider-plain'
@@ -198,75 +207,97 @@ const ViewAnnotationModal: FC<Props> = ({
         </div>
 
       )
+  if (!isShow)
+    return null
+
   return (
     <div>
       <Drawer
-        isShow={isShow}
-        onHide={onHide}
-        maxWidthClassName="max-w-[800px]!"
-        title={(
-          <TabSlider
-            className="relative top-[9px] shrink-0"
-            value={activeTab}
-            onChange={v => setActiveTab(v as TabType)}
-            options={tabs}
-            noBorderBottom
-            itemClassName="pb-3.5!"
-          />
-        )}
-        body={(
-          <div>
-            <div className="space-y-6 p-6 pb-4">
-              {activeTab === TabType.annotation ? annotationTab : hitHistoryTab}
-            </div>
-            <AlertDialog open={showModal} onOpenChange={open => !open && setShowModal(false)}>
-              <AlertDialogContent>
-                <div className="flex flex-col gap-2 px-6 pt-6 pb-4">
-                  <AlertDialogTitle
-                    title={t('feature.annotation.removeConfirm', { ns: 'appDebug' })}
-                    className="w-full truncate title-2xl-semi-bold text-text-primary"
-                  >
-                    {t('feature.annotation.removeConfirm', { ns: 'appDebug' })}
-                  </AlertDialogTitle>
+        open
+        modal
+        disablePointerDismissal
+        swipeDirection="right"
+        onOpenChange={(open) => {
+          if (!open)
+            onHide()
+        }}
+      >
+        <DrawerPortal>
+          <DrawerBackdrop />
+          <DrawerViewport>
+            <DrawerPopup className="data-[swipe-direction=right]:top-16 data-[swipe-direction=right]:right-2 data-[swipe-direction=right]:bottom-3 data-[swipe-direction=right]:h-auto data-[swipe-direction=right]:w-200 data-[swipe-direction=right]:max-w-[calc(100vw-1rem)] data-[swipe-direction=right]:rounded-xl data-[swipe-direction=right]:border-r-[0.5px] data-[swipe-direction=right]:border-divider-subtle">
+              <DrawerContent className="flex min-h-0 flex-1 flex-col p-0 pb-0">
+                <div className="shrink-0 border-b border-divider-subtle py-4">
+                  <div className="flex h-6 items-center justify-between pr-5 pl-6">
+                    <DrawerTitle render={<div />} className="min-w-0">
+                      <TabSlider
+                        className="relative top-[9px] shrink-0"
+                        value={activeTab}
+                        onChange={v => setActiveTab(v as TabType)}
+                        options={tabs}
+                        noBorderBottom
+                        itemClassName="pb-3.5!"
+                      />
+                    </DrawerTitle>
+                    <DrawerCloseButton
+                      aria-label={t('operation.close', { ns: 'common' })}
+                      className="h-6 w-6 rounded-md"
+                    />
+                  </div>
                 </div>
-                <AlertDialogActions>
-                  <AlertDialogCancelButton>
-                    {t('operation.cancel', { ns: 'common' })}
-                  </AlertDialogCancelButton>
-                  <AlertDialogConfirmButton
-                    tone="destructive"
-                    onClick={async () => {
-                      await onRemove()
-                      setShowModal(false)
-                      onHide()
-                    }}
-                  >
-                    {t('operation.confirm', { ns: 'common' })}
-                  </AlertDialogConfirmButton>
-                </AlertDialogActions>
-              </AlertDialogContent>
-            </AlertDialog>
-          </div>
-        )}
-        foot={id
-          ? (
-              <div className="flex h-16 items-center justify-between rounded-br-xl rounded-bl-xl border-t border-divider-subtle bg-background-section-burn px-4 system-sm-medium text-text-tertiary">
-                <div
-                  className="flex cursor-pointer items-center space-x-2 pl-3"
-                  onClick={() => setShowModal(true)}
-                >
-                  <MessageCheckRemove />
-                  <div>{t('editModal.removeThisCache', { ns: 'appAnnotation' })}</div>
+                <div className="min-h-0 flex-1 overflow-y-auto">
+                  <div className="space-y-6 p-6 pb-4">
+                    {activeTab === TabType.annotation ? annotationTab : hitHistoryTab}
+                  </div>
+                  <AlertDialog open={showModal} onOpenChange={open => !open && setShowModal(false)}>
+                    <AlertDialogContent>
+                      <div className="flex flex-col gap-2 px-6 pt-6 pb-4">
+                        <AlertDialogTitle
+                          title={t('feature.annotation.removeConfirm', { ns: 'appDebug' })}
+                          className="w-full truncate title-2xl-semi-bold text-text-primary"
+                        >
+                          {t('feature.annotation.removeConfirm', { ns: 'appDebug' })}
+                        </AlertDialogTitle>
+                      </div>
+                      <AlertDialogActions>
+                        <AlertDialogCancelButton>
+                          {t('operation.cancel', { ns: 'common' })}
+                        </AlertDialogCancelButton>
+                        <AlertDialogConfirmButton
+                          tone="destructive"
+                          onClick={async () => {
+                            await onRemove()
+                            setShowModal(false)
+                            onHide()
+                          }}
+                        >
+                          {t('operation.confirm', { ns: 'common' })}
+                        </AlertDialogConfirmButton>
+                      </AlertDialogActions>
+                    </AlertDialogContent>
+                  </AlertDialog>
                 </div>
-                <div>
-                  {t('editModal.createdAt', { ns: 'appAnnotation' })}
+                {id && (
+                  <div className="flex h-16 shrink-0 items-center justify-between rounded-br-xl rounded-bl-xl border-t border-divider-subtle bg-background-section-burn px-4 system-sm-medium text-text-tertiary">
+                    <div
+                      className="flex cursor-pointer items-center space-x-2 pl-3"
+                      onClick={() => setShowModal(true)}
+                    >
+                      <MessageCheckRemove />
+                      <div>{t('editModal.removeThisCache', { ns: 'appAnnotation' })}</div>
+                    </div>
+                    <div>
+                      {t('editModal.createdAt', { ns: 'appAnnotation' })}
 &nbsp;
-                  {formatTime(createdAt, t('dateTimeFormat', { ns: 'appLog' }) as string)}
-                </div>
-              </div>
-            )
-          : undefined}
-      />
+                      {formatTime(createdAt, t('dateTimeFormat', { ns: 'appLog' }) as string)}
+                    </div>
+                  </div>
+                )}
+              </DrawerContent>
+            </DrawerPopup>
+          </DrawerViewport>
+        </DrawerPortal>
+      </Drawer>
     </div>
 
   )
diff --git a/web/app/components/app/app-access-control/__tests__/access-control-dialog.spec.tsx b/web/app/components/app/app-access-control/__tests__/access-control-dialog.spec.tsx
index 9b3dd8ee05..03a35bd52a 100644
--- a/web/app/components/app/app-access-control/__tests__/access-control-dialog.spec.tsx
+++ b/web/app/components/app/app-access-control/__tests__/access-control-dialog.spec.tsx
@@ -10,6 +10,7 @@ describe('AccessControlDialog', () => {
     )
 
     expect(screen.getByRole('dialog')).toBeInTheDocument()
+    expect(screen.getByRole('dialog')).toHaveClass('custom-dialog')
     expect(screen.getByText('Dialog Content')).toBeInTheDocument()
   })
 
@@ -21,8 +22,7 @@ describe('AccessControlDialog', () => {
       </AccessControlDialog>,
     )
 
-    const closeButton = document.body.querySelector('div.absolute.right-5.top-5') as HTMLElement
-    fireEvent.click(closeButton)
+    fireEvent.click(screen.getByRole('button', { name: 'Close' }))
 
     await waitFor(() => {
       expect(onClose).toHaveBeenCalledTimes(1)
diff --git a/web/app/components/app/app-access-control/__tests__/access-control.spec.tsx b/web/app/components/app/app-access-control/__tests__/access-control.spec.tsx
index 21dd8c5fc2..52c2a0dd54 100644
--- a/web/app/components/app/app-access-control/__tests__/access-control.spec.tsx
+++ b/web/app/components/app/app-access-control/__tests__/access-control.spec.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable ts/no-explicit-any */
 import type { AccessControlAccount, AccessControlGroup, Subject } from '@/models/access-control'
 import type { App } from '@/types/app'
 import { toast } from '@langgenius/dify-ui/toast'
@@ -43,34 +42,6 @@ vi.mock('@/service/access-control', () => ({
   useUpdateAccessMode: () => mockUseUpdateAccessMode(),
 }))
 
-vi.mock('@headlessui/react', () => {
-  const DialogComponent: any = ({ children, className, ...rest }: any) => (
-    <div role="dialog" className={className} {...rest}>{children}</div>
-  )
-  DialogComponent.Panel = ({ children, className, ...rest }: any) => (
-    <div className={className} {...rest}>{children}</div>
-  )
-  const DialogTitle = ({ children, className, ...rest }: any) => (
-    <div className={className} {...rest}>{children}</div>
-  )
-  const DialogDescription = ({ children, className, ...rest }: any) => (
-    <div className={className} {...rest}>{children}</div>
-  )
-  const TransitionChild = ({ children }: any) => (
-    <>{typeof children === 'function' ? children({}) : children}</>
-  )
-  const Transition = ({ show = true, children }: any) => (
-    show ? <>{typeof children === 'function' ? children({}) : children}</> : null
-  )
-  Transition.Child = TransitionChild
-  return {
-    Dialog: DialogComponent,
-    Transition,
-    DialogTitle,
-    Description: DialogDescription,
-  }
-})
-
 vi.mock('ahooks', async (importOriginal) => {
   const actual = await importOriginal<typeof import('ahooks')>()
   return {
@@ -176,7 +147,7 @@ describe('AccessControlItem', () => {
   })
 })
 
-// AccessControlDialog renders a headless UI dialog with a manual close control
+// AccessControlDialog renders the shared dialog primitive with a close control.
 describe('AccessControlDialog', () => {
   it('should render dialog content when visible', () => {
     render(
@@ -191,13 +162,13 @@ describe('AccessControlDialog', () => {
 
   it('should trigger onClose when clicking the close control', async () => {
     const handleClose = vi.fn()
-    const { container } = render(
+    render(
       <AccessControlDialog show onClose={handleClose}>
         <div>Dialog Content</div>
       </AccessControlDialog>,
     )
 
-    const closeButton = container.querySelector('.absolute.right-5.top-5') as HTMLElement
+    const closeButton = screen.getByRole('button', { name: 'Close' })
     fireEvent.click(closeButton)
 
     await waitFor(() => {
@@ -241,16 +212,16 @@ describe('SpecificGroupsOrMembers', () => {
       expect(screen.getByText(baseMember.name)).toBeInTheDocument()
     })
 
-    const groupItem = screen.getByText(baseGroup.name).closest('div')
-    const groupRemove = groupItem?.querySelector('.h-4.w-4.cursor-pointer') as HTMLElement
+    const groupRemove = screen.getAllByRole('button', { name: /operation\.remove$/ })[0]!
+
     fireEvent.click(groupRemove)
 
     await waitFor(() => {
       expect(screen.queryByText(baseGroup.name)).not.toBeInTheDocument()
     })
 
-    const memberItem = screen.getByText(baseMember.name).closest('div')
-    const memberRemove = memberItem?.querySelector('.h-4.w-4.cursor-pointer') as HTMLElement
+    const memberRemove = screen.getAllByRole('button', { name: /operation\.remove$/ })[0]!
+
     fireEvent.click(memberRemove)
 
     await waitFor(() => {
@@ -283,9 +254,7 @@ describe('AddMemberOrGroupDialog', () => {
     await user.click(expandButton)
     expect(useAccessControlStore.getState().selectedGroupsForBreadcrumb).toEqual([baseGroup])
 
-    const memberLabel = screen.getByText(baseMember.name)
-    const memberCheckbox = memberLabel.parentElement?.previousElementSibling as HTMLElement
-    fireEvent.click(memberCheckbox)
+    await user.click(screen.getByRole('option', { name: /Member One/ }))
 
     expect(useAccessControlStore.getState().specificMembers).toEqual([baseMember])
   })
@@ -306,13 +275,13 @@ describe('AddMemberOrGroupDialog', () => {
     await user.type(screen.getByPlaceholderText('app.accessControlDialog.operateGroupAndMember.searchPlaceholder'), 'Group')
     expect(document.querySelector('.spin-animation')).toBeInTheDocument()
 
-    const groupCheckbox = screen.getByText(baseGroup.name).closest('div')?.previousElementSibling as HTMLElement
-    fireEvent.click(groupCheckbox)
-    fireEvent.click(groupCheckbox)
+    const groupOption = screen.getByRole('option', { name: /Group One/ })
+    fireEvent.click(groupOption)
+    fireEvent.click(groupOption)
 
-    const memberCheckbox = screen.getByText(baseMember.name).parentElement?.previousElementSibling as HTMLElement
-    fireEvent.click(memberCheckbox)
-    fireEvent.click(memberCheckbox)
+    const memberOption = screen.getByRole('option', { name: /Member One/ })
+    fireEvent.click(memberOption)
+    fireEvent.click(memberOption)
 
     fireEvent.click(screen.getByText('app.accessControlDialog.operateGroupAndMember.expand'))
     fireEvent.click(screen.getByText('app.accessControlDialog.operateGroupAndMember.allMembers'))
@@ -336,7 +305,7 @@ describe('AddMemberOrGroupDialog', () => {
 
     await user.click(screen.getByText('common.operation.add'))
 
-    expect(screen.getByText('app.accessControlDialog.operateGroupAndMember.noResult')).toBeInTheDocument()
+    expect(screen.getByRole('status')).toHaveTextContent('app.accessControlDialog.operateGroupAndMember.noResult')
   })
 })
 
diff --git a/web/app/components/app/app-access-control/__tests__/add-member-or-group-pop.spec.tsx b/web/app/components/app/app-access-control/__tests__/add-member-or-group-pop.spec.tsx
index 725b121d30..d34756e85e 100644
--- a/web/app/components/app/app-access-control/__tests__/add-member-or-group-pop.spec.tsx
+++ b/web/app/components/app/app-access-control/__tests__/add-member-or-group-pop.spec.tsx
@@ -1,5 +1,5 @@
 import type { AccessControlAccount, AccessControlGroup, Subject } from '@/models/access-control'
-import { fireEvent, render, screen } from '@testing-library/react'
+import { render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import useAccessControlStore from '@/context/access-control-store'
 import { SubjectType } from '@/models/access-control'
@@ -106,8 +106,7 @@ describe('AddMemberOrGroupDialog', () => {
 
     expect(useAccessControlStore.getState().selectedGroupsForBreadcrumb).toEqual([baseGroup])
 
-    const memberCheckbox = screen.getByText(baseMember.name).parentElement?.previousElementSibling as HTMLElement
-    fireEvent.click(memberCheckbox)
+    await user.click(screen.getByRole('option', { name: /Member One/ }))
 
     expect(useAccessControlStore.getState().specificMembers).toEqual([baseMember])
   })
@@ -125,6 +124,31 @@ describe('AddMemberOrGroupDialog', () => {
 
     await user.click(screen.getByText('common.operation.add'))
 
-    expect(screen.getByText('app.accessControlDialog.operateGroupAndMember.noResult')).toBeInTheDocument()
+    expect(screen.getByRole('status')).toHaveTextContent('app.accessControlDialog.operateGroupAndMember.noResult')
+  })
+
+  it('should keep breadcrumbs visible when the current group has no candidates', async () => {
+    useAccessControlStore.setState({
+      selectedGroupsForBreadcrumb: [baseGroup],
+    })
+    mockUseSearchForWhiteListCandidates.mockReturnValue({
+      isLoading: false,
+      isFetchingNextPage: false,
+      fetchNextPage: vi.fn(),
+      data: { pages: [{ currPage: 1, subjects: [], hasMore: false }] },
+    })
+
+    const user = userEvent.setup()
+    render(<AddMemberOrGroupDialog />)
+
+    await user.click(screen.getByText('common.operation.add'))
+
+    expect(screen.getByRole('button', { name: 'app.accessControlDialog.operateGroupAndMember.allMembers' })).toBeInTheDocument()
+    expect(screen.getByText(baseGroup.name)).toBeInTheDocument()
+    expect(screen.getByRole('status')).toHaveTextContent('app.accessControlDialog.operateGroupAndMember.noResult')
+
+    await user.click(screen.getByRole('button', { name: 'app.accessControlDialog.operateGroupAndMember.allMembers' }))
+
+    expect(useAccessControlStore.getState().selectedGroupsForBreadcrumb).toEqual([])
   })
 })
diff --git a/web/app/components/app/app-access-control/__tests__/specific-groups-or-members.spec.tsx b/web/app/components/app/app-access-control/__tests__/specific-groups-or-members.spec.tsx
index 7b198c4e66..e763521940 100644
--- a/web/app/components/app/app-access-control/__tests__/specific-groups-or-members.spec.tsx
+++ b/web/app/components/app/app-access-control/__tests__/specific-groups-or-members.spec.tsx
@@ -86,11 +86,13 @@ describe('SpecificGroupsOrMembers', () => {
       expect(screen.getByText(baseMember.name)).toBeInTheDocument()
     })
 
-    const groupRemove = screen.getByText(baseGroup.name).closest('div')?.querySelector('.h-4.w-4.cursor-pointer') as HTMLElement
+    const removeButtons = screen.getAllByRole('button', { name: /operation\.remove$/ })
+    const groupRemove = removeButtons[0]!
+    const memberRemove = removeButtons[1]!
+
     fireEvent.click(groupRemove)
     expect(useAccessControlStore.getState().specificGroups).toEqual([])
 
-    const memberRemove = screen.getByText(baseMember.name).closest('div')?.querySelector('.h-4.w-4.cursor-pointer') as HTMLElement
     fireEvent.click(memberRemove)
     expect(useAccessControlStore.getState().specificMembers).toEqual([])
   })
diff --git a/web/app/components/app/app-access-control/access-control-dialog.tsx b/web/app/components/app/app-access-control/access-control-dialog.tsx
index bbf5329c9d..8fa022a78b 100644
--- a/web/app/components/app/app-access-control/access-control-dialog.tsx
+++ b/web/app/components/app/app-access-control/access-control-dialog.tsx
@@ -1,8 +1,11 @@
 import type { ReactNode } from 'react'
-import { Dialog, Transition } from '@headlessui/react'
 import { cn } from '@langgenius/dify-ui/cn'
-import { RiCloseLine } from '@remixicon/react'
-import { Fragment, useCallback } from 'react'
+import {
+  Dialog,
+  DialogCloseButton,
+  DialogContent,
+} from '@langgenius/dify-ui/dialog'
+import { useCallback } from 'react'
 
 type DialogProps = {
   className?: string
@@ -20,41 +23,19 @@ const AccessControlDialog = ({
   const close = useCallback(() => {
     onClose?.()
   }, [onClose])
-  return (
-    <Transition appear show={show} as={Fragment}>
-      <Dialog as="div" open={true} className="relative z-99" onClose={() => null}>
-        <Transition.Child
-          as={Fragment}
-          enter="ease-out duration-300"
-          enterFrom="opacity-0"
-          enterTo="opacity-100"
-          leave="ease-in duration-200"
-          leaveFrom="opacity-100"
-          leaveTo="opacity-0"
-        >
-          <div className="fixed inset-0 bg-background-overlay" />
-        </Transition.Child>
 
-        <div className="fixed inset-0 flex items-center justify-center">
-          <Transition.Child
-            as={Fragment}
-            enter="ease-out duration-300"
-            enterFrom="opacity-0 scale-95"
-            enterTo="opacity-100 scale-100"
-            leave="ease-in duration-200"
-            leaveFrom="opacity-100 scale-100"
-            leaveTo="opacity-0 scale-95"
-          >
-            <Dialog.Panel className={cn('relative h-auto min-h-[323px] w-[600px] overflow-y-auto rounded-2xl bg-components-panel-bg p-0 shadow-xl transition-all', className)}>
-              <div onClick={() => close()} className="absolute top-5 right-5 z-10 flex h-8 w-8 cursor-pointer items-center justify-center">
-                <RiCloseLine className="h-5 w-5 text-text-tertiary" />
-              </div>
-              {children}
-            </Dialog.Panel>
-          </Transition.Child>
-        </div>
-      </Dialog>
-    </Transition>
+  return (
+    <Dialog open={show} disablePointerDismissal onOpenChange={open => !open && close()}>
+      <DialogContent
+        className={cn(
+          'h-auto max-h-[calc(100dvh-2rem)] min-h-[323px] w-[600px] max-w-none overflow-y-auto rounded-2xl border-none bg-components-panel-bg p-0 shadow-xl transition-all',
+          className,
+        )}
+      >
+        <DialogCloseButton className="top-5 right-5 h-8 w-8" />
+        {children}
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/components/app/app-access-control/add-member-or-group-pop.tsx b/web/app/components/app/app-access-control/add-member-or-group-pop.tsx
index 38f9c2ab50..1e3a992136 100644
--- a/web/app/components/app/app-access-control/add-member-or-group-pop.tsx
+++ b/web/app/components/app/app-access-control/add-member-or-group-pop.tsx
@@ -1,110 +1,207 @@
 'use client'
+import type { ComboboxRootChangeEventDetails } from '@langgenius/dify-ui/combobox'
 import type { AccessControlAccount, AccessControlGroup, Subject, SubjectAccount, SubjectGroup } from '@/models/access-control'
-import { FloatingOverlay } from '@floating-ui/react'
 import { Avatar } from '@langgenius/dify-ui/avatar'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
-import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
+import {
+  Combobox,
+  ComboboxContent,
+  ComboboxEmpty,
+  ComboboxInput,
+  ComboboxInputGroup,
+  ComboboxItem,
+  ComboboxItemText,
+  ComboboxList,
+  ComboboxStatus,
+  ComboboxTrigger,
+} from '@langgenius/dify-ui/combobox'
 import { RiAddCircleFill, RiArrowRightSLine, RiOrganizationChart } from '@remixicon/react'
 import { useDebounce } from 'ahooks'
-import { useCallback, useEffect, useRef, useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useSelector } from '@/context/app-context'
 import { SubjectType } from '@/models/access-control'
 import { useSearchForWhiteListCandidates } from '@/service/access-control'
 import useAccessControlStore from '../../../../context/access-control-store'
-import Checkbox from '../../base/checkbox'
-import Input from '../../base/input'
 import Loading from '../../base/loading'
 
 export default function AddMemberOrGroupDialog() {
   const { t } = useTranslation()
   const [open, setOpen] = useState(false)
   const [keyword, setKeyword] = useState('')
+  const scrollRootRef = useRef<HTMLDivElement>(null)
+  const anchorRef = useRef<HTMLDivElement>(null)
+  const specificGroups = useAccessControlStore(s => s.specificGroups)
+  const setSpecificGroups = useAccessControlStore(s => s.setSpecificGroups)
+  const specificMembers = useAccessControlStore(s => s.specificMembers)
+  const setSpecificMembers = useAccessControlStore(s => s.setSpecificMembers)
   const selectedGroupsForBreadcrumb = useAccessControlStore(s => s.selectedGroupsForBreadcrumb)
   const debouncedKeyword = useDebounce(keyword, { wait: 500 })
 
   const lastAvailableGroup = selectedGroupsForBreadcrumb[selectedGroupsForBreadcrumb.length - 1]
   const { isLoading, isFetchingNextPage, fetchNextPage, data } = useSearchForWhiteListCandidates({ keyword: debouncedKeyword, groupId: lastAvailableGroup?.id, resultsPerPage: 10 }, open)
-  const handleKeywordChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    setKeyword(e.target.value)
-  }
+  const pages = data?.pages ?? []
+  const subjects = pages.flatMap(page => page.subjects ?? [])
+  const selectedSubjects = [
+    ...specificGroups.map(groupToSubject),
+    ...specificMembers.map(memberToSubject),
+  ]
+  const hasResults = pages.length > 0 && subjects.length > 0
+  const shouldShowBreadcrumb = hasResults || selectedGroupsForBreadcrumb.length > 0
+  const hasMore = pages[pages.length - 1]?.hasMore ?? false
 
-  const anchorRef = useRef<HTMLDivElement>(null)
   useEffect(() => {
-    const hasMore = data?.pages?.[0]?.hasMore ?? false
     let observer: IntersectionObserver | undefined
     if (anchorRef.current) {
       observer = new IntersectionObserver((entries) => {
         if (entries[0]!.isIntersecting && !isLoading && hasMore)
           fetchNextPage()
-      }, { rootMargin: '20px' })
+      }, { root: scrollRootRef.current, rootMargin: '20px' })
       observer.observe(anchorRef.current)
     }
     return () => observer?.disconnect()
-  }, [isLoading, fetchNextPage, anchorRef, data])
+  }, [isLoading, fetchNextPage, hasMore])
+
+  const handleOpenChange = (nextOpen: boolean) => {
+    if (!nextOpen)
+      setKeyword('')
+
+    setOpen(nextOpen)
+  }
+
+  const handleInputValueChange = (inputValue: string, details: ComboboxRootChangeEventDetails) => {
+    if (details.reason !== 'item-press')
+      setKeyword(inputValue)
+  }
+
+  const handleValueChange = (nextSubjects: Subject[]) => {
+    const nextGroups: AccessControlGroup[] = []
+    const nextMembers: AccessControlAccount[] = []
+
+    for (const subject of nextSubjects) {
+      if (subject.subjectType === SubjectType.GROUP)
+        nextGroups.push((subject as SubjectGroup).groupData)
+      else
+        nextMembers.push((subject as SubjectAccount).accountData)
+    }
+
+    setSpecificGroups(nextGroups)
+    setSpecificMembers(nextMembers)
+  }
 
   return (
-    <Popover open={open} onOpenChange={setOpen}>
-      <PopoverTrigger
-        render={(
-          <Button variant="ghost-accent" size="small" className="flex shrink-0 items-center gap-x-0.5">
-            <RiAddCircleFill className="h-4 w-4" />
-            <span>{t('operation.add', { ns: 'common' })}</span>
-          </Button>
-        )}
-      />
-      {open && <FloatingOverlay />}
-      <PopoverContent
+    <Combobox<Subject, true>
+      multiple
+      open={open}
+      value={selectedSubjects}
+      inputValue={keyword}
+      items={subjects}
+      itemToStringLabel={getSubjectLabel}
+      itemToStringValue={getSubjectValue}
+      isItemEqualToValue={isSameSubject}
+      filter={null}
+      onOpenChange={handleOpenChange}
+      onInputValueChange={handleInputValueChange}
+      onValueChange={handleValueChange}
+    >
+      <ComboboxTrigger
+        aria-label={t('operation.add', { ns: 'common' })}
+        icon={false}
+        size="small"
+        className="flex h-6 w-auto shrink-0 items-center gap-x-0.5 rounded-md border-0 bg-transparent px-2 py-0 text-xs font-medium text-components-button-secondary-accent-text hover:bg-state-accent-hover focus-visible:bg-state-accent-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid data-open:bg-state-accent-hover"
+      >
+        <RiAddCircleFill className="h-4 w-4" aria-hidden="true" />
+        <span>{t('operation.add', { ns: 'common' })}</span>
+      </ComboboxTrigger>
+      <ComboboxContent
         placement="bottom-end"
         alignOffset={300}
-        popupClassName="border-none bg-transparent shadow-none"
+        popupClassName="relative flex max-h-[400px] w-[400px] flex-col overflow-hidden rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur p-0 shadow-lg backdrop-blur-[5px]"
       >
-        <div className="relative flex max-h-[400px] w-[400px] flex-col overflow-y-auto rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg backdrop-blur-[5px]">
+        <div ref={scrollRootRef} className="min-h-0 overflow-y-auto">
           <div className="sticky top-0 z-10 bg-components-panel-bg-blur p-2 pb-0.5 backdrop-blur-[5px]">
-            <Input value={keyword} onChange={handleKeywordChange} showLeftIcon placeholder={t('accessControlDialog.operateGroupAndMember.searchPlaceholder', { ns: 'app' }) as string} />
+            <ComboboxInputGroup className="h-8 min-h-8 px-2">
+              <span className="mr-0.5 i-ri-search-line size-4 shrink-0 text-text-tertiary" aria-hidden="true" />
+              <ComboboxInput
+                aria-label={t('accessControlDialog.operateGroupAndMember.searchPlaceholder', { ns: 'app' })}
+                placeholder={t('accessControlDialog.operateGroupAndMember.searchPlaceholder', { ns: 'app' })}
+                className="block h-4.5 grow px-1 py-0 text-[13px] text-text-primary"
+              />
+            </ComboboxInputGroup>
           </div>
-          {
-            isLoading
-              ? <div className="p-1"><Loading /></div>
-              : (data?.pages?.length ?? 0) > 0
-                  ? (
-                      <>
-                        <div className="flex h-7 items-center px-2 py-0.5">
-                          <SelectedGroupsBreadCrumb />
-                        </div>
-                        <div className="p-1">
-                          {renderGroupOrMember(data?.pages ?? [])}
+          {isLoading
+            ? (
+                <ComboboxStatus className="p-1">
+                  <Loading />
+                </ComboboxStatus>
+              )
+            : (
+                <>
+                  {shouldShowBreadcrumb && (
+                    <div className="flex h-7 items-center px-2 py-0.5">
+                      <SelectedGroupsBreadCrumb />
+                    </div>
+                  )}
+                  {hasResults
+                    ? (
+                        <>
+                          <ComboboxList className="max-h-none p-1">
+                            {(subject: Subject) => <SubjectItem key={getSubjectValue(subject)} subject={subject} />}
+                          </ComboboxList>
                           {isFetchingNextPage && <Loading />}
-                        </div>
-                        <div ref={anchorRef} className="h-0"> </div>
-                      </>
-                    )
-                  : (
-                      <div className="flex h-7 items-center justify-center px-2 py-0.5">
-                        <span className="system-xs-regular text-text-tertiary">{t('accessControlDialog.operateGroupAndMember.noResult', { ns: 'app' })}</span>
-                      </div>
-                    )
-          }
+                          <div ref={anchorRef} className="h-0" />
+                        </>
+                      )
+                    : (
+                        <ComboboxEmpty className="flex h-7 items-center justify-center px-2 py-0.5">
+                          {t('accessControlDialog.operateGroupAndMember.noResult', { ns: 'app' })}
+                        </ComboboxEmpty>
+                      )}
+                </>
+              )}
         </div>
-      </PopoverContent>
-    </Popover>
+      </ComboboxContent>
+    </Combobox>
   )
 }
 
-type GroupOrMemberData = { subjects: Subject[], currPage: number }[]
-function renderGroupOrMember(data: GroupOrMemberData) {
-  return data?.map((page) => {
-    return (
-      <div key={`search_group_member_page_${page.currPage}`}>
-        {page.subjects?.map((item, index) => {
-          if (item.subjectType === SubjectType.GROUP)
-            return <GroupItem key={index} group={(item as SubjectGroup).groupData} />
-          return <MemberItem key={index} member={(item as SubjectAccount).accountData} />
-        })}
-      </div>
-    )
-  }) ?? null
+function groupToSubject(group: AccessControlGroup): SubjectGroup {
+  return {
+    subjectId: group.id,
+    subjectType: SubjectType.GROUP,
+    groupData: group,
+  }
+}
+
+function memberToSubject(member: AccessControlAccount): SubjectAccount {
+  return {
+    subjectId: member.id,
+    subjectType: SubjectType.ACCOUNT,
+    accountData: member,
+  }
+}
+
+function getSubjectLabel(subject: Subject) {
+  if (subject.subjectType === SubjectType.GROUP)
+    return (subject as SubjectGroup).groupData.name
+
+  return (subject as SubjectAccount).accountData.name
+}
+
+function getSubjectValue(subject: Subject) {
+  return `${subject.subjectType}:${subject.subjectId}`
+}
+
+function isSameSubject(item: Subject, value: Subject) {
+  return item.subjectId === value.subjectId && item.subjectType === value.subjectType
+}
+
+function SubjectItem({ subject }: { subject: Subject }) {
+  if (subject.subjectType === SubjectType.GROUP)
+    return <GroupItem group={(subject as SubjectGroup).groupData} subject={subject} />
+
+  return <MemberItem member={(subject as SubjectAccount).accountData} subject={subject} />
 }
 
 function SelectedGroupsBreadCrumb() {
@@ -112,21 +209,47 @@ function SelectedGroupsBreadCrumb() {
   const setSelectedGroupsForBreadcrumb = useAccessControlStore(s => s.setSelectedGroupsForBreadcrumb)
   const { t } = useTranslation()
 
-  const handleBreadCrumbClick = useCallback((index: number) => {
+  const handleBreadCrumbClick = (index: number) => {
     const newGroups = selectedGroupsForBreadcrumb.slice(0, index + 1)
     setSelectedGroupsForBreadcrumb(newGroups)
-  }, [setSelectedGroupsForBreadcrumb, selectedGroupsForBreadcrumb])
-  const handleReset = useCallback(() => {
+  }
+  const handleReset = () => {
     setSelectedGroupsForBreadcrumb([])
-  }, [setSelectedGroupsForBreadcrumb])
+  }
+  const hasBreadcrumb = selectedGroupsForBreadcrumb.length > 0
+
   return (
     <div className="flex h-7 items-center gap-x-0.5 px-2 py-0.5">
-      <span className={cn('system-xs-regular text-text-tertiary', selectedGroupsForBreadcrumb.length > 0 && 'cursor-pointer text-text-accent')} onClick={handleReset}>{t('accessControlDialog.operateGroupAndMember.allMembers', { ns: 'app' })}</span>
+      {hasBreadcrumb
+        ? (
+            <button
+              type="button"
+              className="cursor-pointer border-none bg-transparent p-0 text-left system-xs-regular text-text-accent focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+              onClick={handleReset}
+            >
+              {t('accessControlDialog.operateGroupAndMember.allMembers', { ns: 'app' })}
+            </button>
+          )
+        : (
+            <span className="system-xs-regular text-text-tertiary">{t('accessControlDialog.operateGroupAndMember.allMembers', { ns: 'app' })}</span>
+          )}
       {selectedGroupsForBreadcrumb.map((group, index) => {
+        const isLastGroup = index === selectedGroupsForBreadcrumb.length - 1
+
         return (
           <div key={index} className="flex items-center gap-x-0.5 system-xs-regular text-text-tertiary">
             <span>/</span>
-            <span className={index === selectedGroupsForBreadcrumb.length - 1 ? '' : 'cursor-pointer text-text-accent'} onClick={() => handleBreadCrumbClick(index)}>{group.name}</span>
+            {isLastGroup
+              ? <span>{group.name}</span>
+              : (
+                  <button
+                    type="button"
+                    className="cursor-pointer border-none bg-transparent p-0 text-left system-xs-regular text-text-accent focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+                    onClick={() => handleBreadCrumbClick(index)}
+                  >
+                    {group.name}
+                  </button>
+                )}
           </div>
         )
       })}
@@ -136,104 +259,111 @@ function SelectedGroupsBreadCrumb() {
 
 type GroupItemProps = {
   group: AccessControlGroup
+  subject: Subject
 }
-function GroupItem({ group }: GroupItemProps) {
+function GroupItem({ group, subject }: GroupItemProps) {
   const { t } = useTranslation()
   const specificGroups = useAccessControlStore(s => s.specificGroups)
-  const setSpecificGroups = useAccessControlStore(s => s.setSpecificGroups)
   const selectedGroupsForBreadcrumb = useAccessControlStore(s => s.selectedGroupsForBreadcrumb)
   const setSelectedGroupsForBreadcrumb = useAccessControlStore(s => s.setSelectedGroupsForBreadcrumb)
   const isChecked = specificGroups.some(g => g.id === group.id)
-  const handleCheckChange = useCallback(() => {
-    if (!isChecked) {
-      const newGroups = [...specificGroups, group]
-      setSpecificGroups(newGroups)
-    }
-    else {
-      const newGroups = specificGroups.filter(g => g.id !== group.id)
-      setSpecificGroups(newGroups)
-    }
-  }, [specificGroups, setSpecificGroups, group, isChecked])
 
-  const handleExpandClick = useCallback(() => {
+  const handleExpandClick = () => {
     setSelectedGroupsForBreadcrumb([...selectedGroupsForBreadcrumb, group])
-  }, [selectedGroupsForBreadcrumb, setSelectedGroupsForBreadcrumb, group])
+  }
+
   return (
-    <BaseItem>
-      <Checkbox checked={isChecked} className="h-4 w-4 shrink-0" onCheck={handleCheckChange} />
-      <div className="item-center flex grow">
-        <div className="mr-2 h-5 w-5 overflow-hidden rounded-full bg-components-icon-bg-blue-solid">
-          <div className="bg-access-app-icon-mask-bg flex h-full w-full items-center justify-center">
-            <RiOrganizationChart className="h-[14px] w-[14px] text-components-avatar-shape-fill-stop-0" />
+    <div className="flex items-center gap-2 rounded-lg hover:bg-state-base-hover">
+      <BaseItem subject={subject}>
+        <SelectionBox checked={isChecked} />
+        <ComboboxItemText className="flex grow items-center px-0">
+          <div className="mr-2 h-5 w-5 overflow-hidden rounded-full bg-components-icon-bg-blue-solid">
+            <div className="bg-access-app-icon-mask-bg flex h-full w-full items-center justify-center">
+              <RiOrganizationChart className="h-[14px] w-[14px] text-components-avatar-shape-fill-stop-0" aria-hidden="true" />
+            </div>
           </div>
-        </div>
-        <p className="mr-1 system-sm-medium text-text-secondary">{group.name}</p>
-        <p className="system-xs-regular text-text-tertiary">{group.groupSize}</p>
-      </div>
+          <span className="mr-1 system-sm-medium text-text-secondary">{group.name}</span>
+          <span className="system-xs-regular text-text-tertiary">{group.groupSize}</span>
+        </ComboboxItemText>
+      </BaseItem>
       <Button
         size="small"
         disabled={isChecked}
         variant="ghost-accent"
-        className="flex shrink-0 items-center justify-between px-1.5 py-1"
+        className="mr-1 flex shrink-0 items-center justify-between px-1.5 py-1"
+        onPointerDown={event => event.preventDefault()}
         onClick={handleExpandClick}
       >
         <span className="px-[3px]">{t('accessControlDialog.operateGroupAndMember.expand', { ns: 'app' })}</span>
-        <RiArrowRightSLine className="h-4 w-4" />
+        <RiArrowRightSLine className="h-4 w-4" aria-hidden="true" />
       </Button>
-    </BaseItem>
+    </div>
   )
 }
 
 type MemberItemProps = {
   member: AccessControlAccount
+  subject: Subject
 }
-function MemberItem({ member }: MemberItemProps) {
+function MemberItem({ member, subject }: MemberItemProps) {
   const currentUser = useSelector(s => s.userProfile)
   const { t } = useTranslation()
   const specificMembers = useAccessControlStore(s => s.specificMembers)
-  const setSpecificMembers = useAccessControlStore(s => s.setSpecificMembers)
   const isChecked = specificMembers.some(m => m.id === member.id)
-  const handleCheckChange = useCallback(() => {
-    if (!isChecked) {
-      const newMembers = [...specificMembers, member]
-      setSpecificMembers(newMembers)
-    }
-    else {
-      const newMembers = specificMembers.filter(m => m.id !== member.id)
-      setSpecificMembers(newMembers)
-    }
-  }, [specificMembers, setSpecificMembers, member, isChecked])
   return (
-    <BaseItem className="pr-3">
-      <Checkbox checked={isChecked} className="h-4 w-4 shrink-0" onCheck={handleCheckChange} />
-      <div className="flex grow items-center">
+    <BaseItem subject={subject} className="pr-3">
+      <SelectionBox checked={isChecked} />
+      <ComboboxItemText className="flex grow items-center px-0">
         <div className="mr-2 h-5 w-5 overflow-hidden rounded-full bg-components-icon-bg-blue-solid">
           <div className="bg-access-app-icon-mask-bg flex h-full w-full items-center justify-center">
             <Avatar size="xxs" avatar={null} name={member.name} />
           </div>
         </div>
-        <p className="mr-1 system-sm-medium text-text-secondary">{member.name}</p>
+        <span className="mr-1 system-sm-medium text-text-secondary">{member.name}</span>
         {currentUser.email === member.email && (
-          <p className="system-xs-regular text-text-tertiary">
+          <span className="system-xs-regular text-text-tertiary">
             (
             {t('you', { ns: 'common' })}
             )
-          </p>
+          </span>
         )}
-      </div>
-      <p className="system-xs-regular text-text-quaternary">{member.email}</p>
+      </ComboboxItemText>
+      <span className="system-xs-regular text-text-quaternary">{member.email}</span>
     </BaseItem>
   )
 }
 
 type BaseItemProps = {
   className?: string
+  subject: Subject
   children: React.ReactNode
 }
-function BaseItem({ children, className }: BaseItemProps) {
+function BaseItem({ children, className, subject }: BaseItemProps) {
   return (
-    <div className={cn('flex cursor-pointer items-center space-x-2 p-1 pl-2 hover:rounded-lg hover:bg-state-base-hover', className)}>
+    <ComboboxItem
+      value={subject}
+      className={cn(
+        'mx-0 flex min-h-8 grow grid-cols-none items-center gap-2 rounded-lg p-1 pl-2',
+        className,
+      )}
+    >
       {children}
-    </div>
+    </ComboboxItem>
+  )
+}
+
+function SelectionBox({ checked }: { checked: boolean }) {
+  return (
+    <span
+      aria-hidden="true"
+      className={cn(
+        'flex size-4 shrink-0 items-center justify-center rounded-sm shadow-xs shadow-shadow-shadow-3',
+        checked
+          ? 'bg-components-checkbox-bg text-components-checkbox-icon'
+          : 'border border-components-checkbox-border bg-components-checkbox-bg-unchecked',
+      )}
+    >
+      {checked && <span className="i-ri-check-line size-3" />}
+    </span>
   )
 }
diff --git a/web/app/components/app/app-access-control/index.tsx b/web/app/components/app/app-access-control/index.tsx
index cff670e10f..593664c918 100644
--- a/web/app/components/app/app-access-control/index.tsx
+++ b/web/app/components/app/app-access-control/index.tsx
@@ -1,8 +1,8 @@
 'use client'
 import type { Subject } from '@/models/access-control'
 import type { App } from '@/types/app'
-import { Description as DialogDescription, DialogTitle } from '@headlessui/react'
 import { Button } from '@langgenius/dify-ui/button'
+import { DialogDescription, DialogTitle } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
 import { RiBuildingLine, RiGlobalLine, RiVerifiedBadgeLine } from '@remixicon/react'
 import { useSuspenseQuery } from '@tanstack/react-query'
diff --git a/web/app/components/app/app-access-control/specific-groups-or-members.tsx b/web/app/components/app/app-access-control/specific-groups-or-members.tsx
index 1caabb3ff9..ce6619ec80 100644
--- a/web/app/components/app/app-access-control/specific-groups-or-members.tsx
+++ b/web/app/components/app/app-access-control/specific-groups-or-members.tsx
@@ -1,14 +1,14 @@
 'use client'
 import type { AccessControlAccount, AccessControlGroup } from '@/models/access-control'
 import { Avatar } from '@langgenius/dify-ui/avatar'
-import { RiAlertFill, RiCloseCircleFill, RiLockLine, RiOrganizationChart } from '@remixicon/react'
+import { RiCloseCircleFill, RiLockLine, RiOrganizationChart } from '@remixicon/react'
 import { useCallback, useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
 import { AccessMode } from '@/models/access-control'
 import { useAppWhiteListSubjects } from '@/service/access-control'
 import useAccessControlStore from '../../../../context/access-control-store'
+import { Infotip } from '../../base/infotip'
 import Loading from '../../base/loading'
-import Tooltip from '../../base/tooltip'
 import AddMemberOrGroupDialog from './add-member-or-group-pop'
 
 export default function SpecificGroupsOrMembers() {
@@ -120,26 +120,38 @@ type BaseItemProps = {
   onRemove?: () => void
 }
 function BaseItem({ icon, onRemove, children }: BaseItemProps) {
+  const { t } = useTranslation()
+
   return (
-    <div className="group flex flex-row items-center gap-x-1 rounded-full border-[0.5px] bg-components-badge-white-to-dark p-1 pr-1.5 shadow-xs">
+    <div className="group flex flex-row items-center gap-x-1 rounded-full border-[0.5px] border-components-panel-border-subtle bg-components-badge-white-to-dark p-1 pr-1.5 shadow-xs">
       <div className="h-5 w-5 overflow-hidden rounded-full bg-components-icon-bg-blue-solid">
         <div className="bg-access-app-icon-mask-bg flex h-full w-full items-center justify-center">
           {icon}
         </div>
       </div>
       {children}
-      <div className="flex h-4 w-4 cursor-pointer items-center justify-center" onClick={onRemove}>
-        <RiCloseCircleFill className="h-[14px] w-[14px] text-text-quaternary" />
-      </div>
+      <button
+        type="button"
+        className="flex h-4 w-4 cursor-pointer items-center justify-center border-none bg-transparent p-0 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+        aria-label={t('operation.remove', { ns: 'common' })}
+        onClick={onRemove}
+      >
+        <RiCloseCircleFill className="h-[14px] w-[14px] text-text-quaternary" aria-hidden="true" />
+      </button>
     </div>
   )
 }
 
 export function WebAppSSONotEnabledTip() {
   const { t } = useTranslation()
+  const tip = t('accessControlDialog.webAppSSONotEnabledTip', { ns: 'app' })
+
   return (
-    <Tooltip asChild={false} popupContent={t('accessControlDialog.webAppSSONotEnabledTip', { ns: 'app' })}>
-      <RiAlertFill className="h-4 w-4 shrink-0 text-text-warning-secondary" />
-    </Tooltip>
+    <Infotip
+      aria-label={tip}
+      iconClassName="h-4 w-4 shrink-0 text-text-warning-secondary hover:text-text-warning-secondary"
+    >
+      {tip}
+    </Infotip>
   )
 }
diff --git a/web/app/components/app/app-publisher/__tests__/index.spec.tsx b/web/app/components/app/app-publisher/__tests__/index.spec.tsx
index 471eb9e3e5..0dfb4347e4 100644
--- a/web/app/components/app/app-publisher/__tests__/index.spec.tsx
+++ b/web/app/components/app/app-publisher/__tests__/index.spec.tsx
@@ -3,7 +3,7 @@ import { fireEvent, screen, waitFor } from '@testing-library/react'
 import * as React from 'react'
 import { renderWithSystemFeatures } from '@/__tests__/utils/mock-system-features'
 import { AccessMode } from '@/models/access-control'
-import { AppModeEnum, AppTypeEnum } from '@/types/app'
+import { AppModeEnum } from '@/types/app'
 import { basePath } from '@/utils/var'
 import AppPublisher from '../index'
 
@@ -20,11 +20,8 @@ const mockOpenAsyncWindow = vi.fn()
 const mockFetchInstalledAppList = vi.fn()
 const mockFetchAppDetailDirect = vi.fn()
 const mockToastError = vi.fn()
-const mockToastSuccess = vi.fn()
-const mockConvertWorkflowType = vi.fn()
-const mockRefetchEvaluationWorkflowAssociatedTargets = vi.fn()
+const mockWindowOpen = vi.fn()
 const mockInvalidateAppWorkflow = vi.fn()
-let mockCanAccessSnippetsAndEvaluation = true
 
 const sectionProps = vi.hoisted(() => ({
   summary: null as null | Record<string, any>,
@@ -36,12 +33,12 @@ const ahooksMocks = vi.hoisted(() => ({
 }))
 
 let mockAppDetail: Record<string, any> | null = null
-let mockEvaluationWorkflowAssociatedTargets: Record<string, any> | undefined
 
 vi.mock('react-i18next', () => ({
   useTranslation: () => ({
     t: (key: string) => key,
   }),
+  Trans: ({ i18nKey }: { i18nKey?: string }) => i18nKey ?? null,
 }))
 
 vi.mock('ahooks', async () => {
@@ -69,13 +66,6 @@ vi.mock('@/hooks/use-async-window-open', () => ({
   useAsyncWindowOpen: () => mockOpenAsyncWindow,
 }))
 
-vi.mock('@/hooks/use-snippet-and-evaluation-plan-access', () => ({
-  useSnippetAndEvaluationPlanAccess: () => ({
-    canAccess: mockCanAccessSnippetsAndEvaluation,
-    isReady: true,
-  }),
-}))
-
 vi.mock('@/service/access-control', () => ({
   useGetUserCanAccessApp: () => ({
     data: { result: true },
@@ -99,29 +89,28 @@ vi.mock('@/service/apps', () => ({
   publishToCreatorsPlatform: (...args: unknown[]) => mockPublishToCreatorsPlatform(...args),
 }))
 
-vi.mock('@/service/use-apps', () => ({
-  useConvertWorkflowTypeMutation: () => ({
-    mutateAsync: (...args: unknown[]) => mockConvertWorkflowType(...args),
-    isPending: false,
-  }),
-}))
-
-vi.mock('@/service/use-evaluation', () => ({
-  useEvaluationWorkflowAssociatedTargets: () => ({
-    data: mockEvaluationWorkflowAssociatedTargets,
-    refetch: mockRefetchEvaluationWorkflowAssociatedTargets,
-    isFetching: false,
-  }),
-}))
-
 vi.mock('@/service/use-workflow', () => ({
   useInvalidateAppWorkflow: () => mockInvalidateAppWorkflow,
 }))
 
+vi.mock('@/service/use-tools', () => ({
+  useWorkflowToolDetailByAppID: () => ({
+    data: undefined,
+    isLoading: false,
+  }),
+  useInvalidateAllWorkflowTools: () => vi.fn(),
+  useInvalidateWorkflowToolDetailByAppID: () => vi.fn(),
+}))
+
+vi.mock('@/context/app-context', () => ({
+  useAppContext: () => ({
+    isCurrentWorkspaceManager: true,
+  }),
+}))
+
 vi.mock('@langgenius/dify-ui/toast', () => ({
   toast: {
     error: (...args: unknown[]) => mockToastError(...args),
-    success: (...args: unknown[]) => mockToastSuccess(...args),
   },
 }))
 
@@ -149,25 +138,16 @@ vi.mock('../../app-access-control', () => ({
   ),
 }))
 
-vi.mock('@/app/components/base/portal-to-follow-elem', async () => {
-  const ReactModule = await vi.importActual<typeof import('react')>('react')
-  const OpenContext = ReactModule.createContext(false)
+vi.mock('@/app/components/tools/workflow-tool', () => ({
+  WorkflowToolDrawer: ({ onHide }: { onHide: () => void }) => (
+    <div data-testid="workflow-tool-drawer">
+      workflow tool drawer
+      <button onClick={onHide}>close-workflow-tool-drawer</button>
+    </div>
+  ),
+}))
 
-  return {
-    PortalToFollowElem: ({ children, open }: { children: React.ReactNode, open: boolean }) => (
-      <OpenContext value={open}>
-        <div>{children}</div>
-      </OpenContext>
-    ),
-    PortalToFollowElemTrigger: ({ children, onClick }: { children: React.ReactNode, onClick?: () => void }) => (
-      <div onClick={onClick}>{children}</div>
-    ),
-    PortalToFollowElemContent: ({ children }: { children: React.ReactNode }) => {
-      const open = ReactModule.use(OpenContext)
-      return open ? <div>{children}</div> : null
-    },
-  }
-})
+vi.mock('@langgenius/dify-ui/popover', () => import('@/__mocks__/base-ui-popover'))
 
 vi.mock('../sections', () => ({
   PublisherSummarySection: (props: Record<string, any>) => {
@@ -176,7 +156,6 @@ vi.mock('../sections', () => ({
       <div>
         <button onClick={() => void props.handlePublish()}>publisher-summary-publish</button>
         <button onClick={() => void props.handleRestore()}>publisher-summary-restore</button>
-        <button onClick={() => void props.onWorkflowTypeSwitch()}>publisher-switch-workflow-type</button>
       </div>
     )
   },
@@ -190,6 +169,13 @@ vi.mock('../sections', () => ({
       <div>
         <button onClick={props.handleEmbed}>publisher-embed</button>
         <button onClick={() => void props.handleOpenInExplore()}>publisher-open-in-explore</button>
+        {props.handleOpenRunConfig && (
+          <>
+            <button onClick={() => props.handleOpenRunConfig(props.appURL)}>publisher-run-config</button>
+            <button onClick={() => props.handleOpenRunConfig(`${props.appURL}?mode=batch`)}>publisher-batch-run-config</button>
+          </>
+        )}
+        <button onClick={props.onConfigureWorkflowTool}>publisher-workflow-tool</button>
       </div>
     )
   },
@@ -202,13 +188,11 @@ describe('AppPublisher', () => {
     sectionProps.summary = null
     sectionProps.access = null
     sectionProps.actions = null
-    mockCanAccessSnippetsAndEvaluation = true
     mockAppDetail = {
       id: 'app-1',
       name: 'Demo App',
       mode: AppModeEnum.CHAT,
       access_mode: AccessMode.SPECIFIC_GROUPS_MEMBERS,
-      type: AppTypeEnum.WORKFLOW,
       site: {
         app_base_url: 'https://example.com',
         access_token: 'token-1',
@@ -221,15 +205,13 @@ describe('AppPublisher', () => {
       id: 'app-1',
       access_mode: AccessMode.PUBLIC,
     })
-    mockConvertWorkflowType.mockResolvedValue({})
-    mockEvaluationWorkflowAssociatedTargets = { items: [] }
-    mockRefetchEvaluationWorkflowAssociatedTargets.mockResolvedValue({
-      data: { items: [] },
-      isError: false,
-    })
     mockOpenAsyncWindow.mockImplementation(async (resolver: () => Promise<string>) => {
       await resolver()
     })
+    Object.defineProperty(window, 'open', {
+      writable: true,
+      value: mockWindowOpen,
+    })
   })
 
   it('should open the publish popover and refetch access permission data', async () => {
@@ -286,6 +268,94 @@ describe('AppPublisher', () => {
     expect(screen.getByTestId('embedded-modal'))!.toBeInTheDocument()
   })
 
+  it('should collect hidden inputs before opening published run links from config actions', async () => {
+    render(
+      <AppPublisher
+        publishedAt={Date.now()}
+        inputs={[{
+          variable: 'secret',
+          label: 'Secret',
+          type: 'text-input',
+          required: true,
+          hide: true,
+          default: '',
+        } as any]}
+      />,
+    )
+
+    fireEvent.click(screen.getByText('common.publish'))
+    fireEvent.click(screen.getByText('publisher-run-config'))
+
+    expect(screen.getByText('overview.appInfo.workflowLaunchHiddenInputs.title')).toBeInTheDocument()
+
+    fireEvent.change(screen.getByLabelText('Secret'), {
+      target: { value: 'top-secret' },
+    })
+    fireEvent.click(screen.getByRole('button', { name: 'overview.appInfo.launch' }))
+
+    await waitFor(() => {
+      expect(mockWindowOpen).toHaveBeenCalledWith(
+        `https://example.com${basePath}/chat/token-1?secret=${encodeURIComponent('top-secret')}`,
+        '_blank',
+      )
+    })
+  })
+
+  it('should open batch run config links with the configured hidden inputs', async () => {
+    mockAppDetail = {
+      ...mockAppDetail,
+      mode: AppModeEnum.WORKFLOW,
+    }
+
+    render(
+      <AppPublisher
+        publishedAt={Date.now()}
+        inputs={[{
+          variable: 'batch_secret',
+          label: 'Batch Secret',
+          type: 'text-input',
+          required: true,
+          hide: true,
+          default: '',
+        } as any]}
+      />,
+    )
+
+    fireEvent.click(screen.getByText('common.publish'))
+    fireEvent.click(screen.getByText('publisher-batch-run-config'))
+
+    fireEvent.change(screen.getByLabelText('Batch Secret'), {
+      target: { value: 'batch-value' },
+    })
+    fireEvent.click(screen.getByRole('button', { name: 'overview.appInfo.launch' }))
+
+    await waitFor(() => {
+      expect(mockWindowOpen).toHaveBeenCalledWith(
+        `https://example.com${basePath}/workflow/token-1?mode=batch&batch_secret=${encodeURIComponent('batch-value')}`,
+        '_blank',
+      )
+    })
+  })
+
+  it('should keep workflow tool drawer mounted after closing the publish popover', () => {
+    mockAppDetail = {
+      ...mockAppDetail,
+      mode: AppModeEnum.WORKFLOW,
+    }
+
+    render(
+      <AppPublisher
+        publishedAt={Date.now()}
+      />,
+    )
+
+    fireEvent.click(screen.getByText('common.publish'))
+    fireEvent.click(screen.getByText('publisher-workflow-tool'))
+
+    expect(screen.queryByTestId('popover-content')).not.toBeInTheDocument()
+    expect(screen.getByTestId('workflow-tool-drawer')).toBeInTheDocument()
+  })
+
   it('should close embedded and access control panels through child callbacks', async () => {
     render(
       <AppPublisher
@@ -562,278 +632,4 @@ describe('AppPublisher', () => {
     })
     expect(screen.getByTestId('access-control'))!.toBeInTheDocument()
   })
-
-  it('should switch workflow type, refresh app detail, and close the popover for published apps', async () => {
-    mockAppDetail = {
-      ...mockAppDetail,
-      mode: AppModeEnum.WORKFLOW,
-    }
-    mockFetchAppDetailDirect.mockResolvedValueOnce({
-      id: 'app-1',
-      workflow_kind: AppTypeEnum.EVALUATION,
-    })
-
-    render(
-      <AppPublisher
-        publishedAt={Date.now()}
-      />,
-    )
-
-    fireEvent.click(screen.getByText('common.publish'))
-    fireEvent.click(screen.getByText('publisher-switch-workflow-type'))
-
-    await waitFor(() => {
-      expect(mockConvertWorkflowType).toHaveBeenCalledWith({
-        params: { appId: 'app-1' },
-        query: { target_type: AppTypeEnum.EVALUATION },
-      })
-      expect(mockFetchAppDetailDirect).toHaveBeenCalledWith({ url: '/apps', id: 'app-1' })
-      expect(mockSetAppDetail).toHaveBeenCalledWith({
-        id: 'app-1',
-        workflow_kind: AppTypeEnum.EVALUATION,
-      })
-      expect(mockToastSuccess).toHaveBeenCalledWith('api.actionSuccess')
-    })
-    await waitFor(() => {
-      expect(screen.queryByText('publisher-summary-publish')).not.toBeInTheDocument()
-    })
-  })
-
-  it('should publish an unpublished workflow as evaluation workflow through the evaluation publish endpoint', async () => {
-    mockAppDetail = {
-      ...mockAppDetail,
-      mode: AppModeEnum.WORKFLOW,
-    }
-    mockOnPublish.mockResolvedValue(undefined)
-    mockFetchAppDetailDirect.mockResolvedValueOnce({
-      id: 'app-1',
-      workflow_kind: AppTypeEnum.EVALUATION,
-    })
-
-    render(
-      <AppPublisher
-        onPublish={mockOnPublish}
-      />,
-    )
-
-    fireEvent.click(screen.getByText('common.publish'))
-    fireEvent.click(screen.getByText('publisher-switch-workflow-type'))
-
-    await waitFor(() => {
-      expect(mockOnPublish).toHaveBeenCalledWith({
-        url: '/apps/app-1/workflows/publish/evaluation',
-        title: '',
-        releaseNotes: '',
-      })
-      expect(mockConvertWorkflowType).not.toHaveBeenCalled()
-      expect(mockFetchAppDetailDirect).toHaveBeenCalledWith({ url: '/apps', id: 'app-1' })
-      expect(mockSetAppDetail).toHaveBeenCalledWith({
-        id: 'app-1',
-        workflow_kind: AppTypeEnum.EVALUATION,
-      })
-      expect(mockToastSuccess).toHaveBeenCalledWith('api.actionSuccess')
-    })
-  })
-
-  it('should hide access and actions sections for evaluation workflow apps', () => {
-    mockAppDetail = {
-      ...mockAppDetail,
-      mode: AppModeEnum.WORKFLOW,
-      workflow_kind: AppTypeEnum.EVALUATION,
-    }
-
-    render(
-      <AppPublisher
-        publishedAt={Date.now()}
-      />,
-    )
-
-    fireEvent.click(screen.getByText('common.publish'))
-
-    expect(screen.getByText('publisher-summary-publish')).toBeInTheDocument()
-    expect(screen.queryByText('publisher-access-control')).not.toBeInTheDocument()
-    expect(screen.queryByText('publisher-embed')).not.toBeInTheDocument()
-    expect(sectionProps.summary?.workflowTypeSwitchConfig).toEqual({
-      targetType: AppTypeEnum.WORKFLOW,
-      publishLabelKey: 'common.publishAsStandardWorkflow',
-      switchLabelKey: 'common.switchToStandardWorkflow',
-      tipKey: 'common.switchToStandardWorkflowTip',
-    })
-  })
-
-  it('should confirm before switching an evaluation workflow with associated targets to a standard workflow', async () => {
-    mockAppDetail = {
-      ...mockAppDetail,
-      mode: AppModeEnum.WORKFLOW,
-      workflow_kind: AppTypeEnum.EVALUATION,
-    }
-    mockEvaluationWorkflowAssociatedTargets = {
-      items: [
-        {
-          target_type: 'app',
-          target_id: 'dependent-app-1',
-          target_name: 'Dependent App',
-        },
-        {
-          target_type: 'knowledge_base',
-          target_id: 'knowledge-1',
-          target_name: 'Knowledge Base',
-        },
-      ],
-    }
-    mockRefetchEvaluationWorkflowAssociatedTargets.mockResolvedValueOnce({
-      data: mockEvaluationWorkflowAssociatedTargets,
-      isError: false,
-    })
-
-    render(
-      <AppPublisher
-        publishedAt={Date.now()}
-      />,
-    )
-
-    fireEvent.click(screen.getByText('common.publish'))
-    fireEvent.click(screen.getByText('publisher-switch-workflow-type'))
-
-    await waitFor(() => {
-      expect(mockRefetchEvaluationWorkflowAssociatedTargets).toHaveBeenCalledTimes(1)
-    })
-    expect(mockConvertWorkflowType).not.toHaveBeenCalled()
-    expect(screen.getByText('Dependent App')).toBeInTheDocument()
-    expect(screen.getByText('Knowledge Base')).toBeInTheDocument()
-
-    fireEvent.click(screen.getByRole('button', { name: 'common.switchToStandardWorkflowConfirm.switch' }))
-
-    await waitFor(() => {
-      expect(mockConvertWorkflowType).toHaveBeenCalledWith({
-        params: { appId: 'app-1' },
-        query: { target_type: AppTypeEnum.WORKFLOW },
-      })
-      expect(mockToastSuccess).toHaveBeenCalledWith('api.actionSuccess')
-    })
-  })
-
-  it('should switch an evaluation workflow directly when there are no associated targets', async () => {
-    mockAppDetail = {
-      ...mockAppDetail,
-      mode: AppModeEnum.WORKFLOW,
-      workflow_kind: AppTypeEnum.EVALUATION,
-    }
-
-    render(
-      <AppPublisher
-        publishedAt={Date.now()}
-      />,
-    )
-
-    fireEvent.click(screen.getByText('common.publish'))
-    fireEvent.click(screen.getByText('publisher-switch-workflow-type'))
-
-    await waitFor(() => {
-      expect(mockRefetchEvaluationWorkflowAssociatedTargets).toHaveBeenCalledTimes(1)
-      expect(mockConvertWorkflowType).toHaveBeenCalledWith({
-        params: { appId: 'app-1' },
-        query: { target_type: AppTypeEnum.WORKFLOW },
-      })
-      expect(mockToastSuccess).toHaveBeenCalledWith('api.actionSuccess')
-    })
-    expect(screen.queryByText('common.switchToStandardWorkflowConfirm.title')).not.toBeInTheDocument()
-  })
-
-  it('should block switching an evaluation workflow when associated targets fail to load', async () => {
-    mockAppDetail = {
-      ...mockAppDetail,
-      mode: AppModeEnum.WORKFLOW,
-      workflow_kind: AppTypeEnum.EVALUATION,
-    }
-    mockRefetchEvaluationWorkflowAssociatedTargets.mockResolvedValueOnce({
-      data: undefined,
-      isError: true,
-    })
-
-    render(
-      <AppPublisher
-        publishedAt={Date.now()}
-      />,
-    )
-
-    fireEvent.click(screen.getByText('common.publish'))
-    fireEvent.click(screen.getByText('publisher-switch-workflow-type'))
-
-    await waitFor(() => {
-      expect(mockToastError).toHaveBeenCalledWith('common.switchToStandardWorkflowConfirm.loadFailed')
-    })
-    expect(mockConvertWorkflowType).not.toHaveBeenCalled()
-  })
-
-  it('should block switching to evaluation workflow when restricted nodes exist', async () => {
-    mockAppDetail = {
-      ...mockAppDetail,
-      mode: AppModeEnum.WORKFLOW,
-    }
-
-    render(
-      <AppPublisher
-        publishedAt={Date.now()}
-        hasHumanInputNode
-      />,
-    )
-
-    fireEvent.click(screen.getByText('common.publish'))
-    fireEvent.click(screen.getByText('publisher-switch-workflow-type'))
-
-    await waitFor(() => {
-      expect(mockToastError).toHaveBeenCalledWith('common.switchToEvaluationWorkflowDisabledTip')
-    })
-
-    expect(mockConvertWorkflowType).not.toHaveBeenCalled()
-    expect(sectionProps.summary?.workflowTypeSwitchDisabled).toBe(true)
-    expect(sectionProps.summary?.workflowTypeSwitchDisabledReason).toBe('common.switchToEvaluationWorkflowDisabledTip')
-  })
-
-  it('should keep the evaluation workflow switch visible but disabled when the current plan cannot access it', () => {
-    mockCanAccessSnippetsAndEvaluation = false
-    mockAppDetail = {
-      ...mockAppDetail,
-      mode: AppModeEnum.WORKFLOW,
-    }
-
-    render(
-      <AppPublisher
-        publishedAt={Date.now()}
-      />,
-    )
-
-    fireEvent.click(screen.getByText('common.publish'))
-
-    expect(sectionProps.summary?.workflowTypeSwitchConfig).toEqual({
-      targetType: AppTypeEnum.EVALUATION,
-      publishLabelKey: 'common.publishAsEvaluationWorkflow',
-      switchLabelKey: 'common.switchToEvaluationWorkflow',
-      tipKey: 'common.switchToEvaluationWorkflowTip',
-    })
-    expect(sectionProps.summary?.workflowTypeSwitchDisabled).toBe(true)
-    expect(sectionProps.summary?.workflowTypeSwitchDisabledReason).toBe('compliance.sandboxUpgradeTooltip')
-  })
-
-  it('should not expose workflow type switching for non-workflow app modes', async () => {
-    render(
-      <AppPublisher
-        publishedAt={Date.now()}
-      />,
-    )
-
-    fireEvent.click(screen.getByText('common.publish'))
-
-    expect(sectionProps.summary?.workflowTypeSwitchConfig).toBeUndefined()
-
-    fireEvent.click(screen.getByText('publisher-switch-workflow-type'))
-
-    await waitFor(() => {
-      expect(mockConvertWorkflowType).not.toHaveBeenCalled()
-    })
-    expect(mockOnPublish).not.toHaveBeenCalled()
-    expect(mockFetchAppDetailDirect).not.toHaveBeenCalled()
-    expect(mockToastSuccess).not.toHaveBeenCalled()
-  })
 })
diff --git a/web/app/components/app/app-publisher/__tests__/sections.spec.tsx b/web/app/components/app/app-publisher/__tests__/sections.spec.tsx
index f242f1d6c2..20a40aa920 100644
--- a/web/app/components/app/app-publisher/__tests__/sections.spec.tsx
+++ b/web/app/components/app/app-publisher/__tests__/sections.spec.tsx
@@ -18,8 +18,32 @@ vi.mock('../publish-with-multiple-model', () => ({
 }))
 
 vi.mock('../suggested-action', () => ({
-  default: ({ children, onClick, link, disabled }: { children: ReactNode, onClick?: () => void, link?: string, disabled?: boolean }) => (
-    <button type="button" data-link={link} disabled={disabled} onClick={onClick}>{children}</button>
+  default: ({
+    children,
+    onClick,
+    link,
+    disabled,
+    actionButton,
+  }: {
+    children: ReactNode
+    onClick?: () => void
+    link?: string
+    disabled?: boolean
+    actionButton?: { ariaLabel: string, onClick: () => void }
+  }) => (
+    <div>
+      <button type="button" data-link={link} disabled={disabled} onClick={onClick}>{children}</button>
+      {actionButton && (
+        <button
+          type="button"
+          aria-label={actionButton.ariaLabel}
+          disabled={disabled}
+          onClick={actionButton.onClick}
+        >
+          {actionButton.ariaLabel}
+        </button>
+      )}
+    </div>
   ),
 }))
 
@@ -243,9 +267,25 @@ describe('app-publisher sections', () => {
     expect(render(<AccessModeDisplay />).container).toBeEmptyDOMElement()
   })
 
+  it('should hide access control content when enabled is false', () => {
+    render(
+      <PublisherAccessSection
+        enabled={false}
+        isAppAccessSet
+        isLoading={false}
+        accessMode={AccessMode.PUBLIC}
+        onClick={vi.fn()}
+      />,
+    )
+
+    expect(screen.queryByText('publishApp.title')).not.toBeInTheDocument()
+    expect(screen.queryByText('accessControlDialog.accessItems.anyone')).not.toBeInTheDocument()
+  })
+
   it('should render workflow actions, batch run links, and workflow tool configuration', () => {
     const handleOpenInExplore = vi.fn()
     const handleEmbed = vi.fn()
+    const handleOpenRunConfig = vi.fn()
 
     const { rerender } = render(
       <PublisherActionsSection
@@ -263,22 +303,30 @@ describe('app-publisher sections', () => {
         disabledFunctionTooltip="disabled"
         handleEmbed={handleEmbed}
         handleOpenInExplore={handleOpenInExplore}
+        handleOpenRunConfig={handleOpenRunConfig}
         handlePublish={vi.fn()}
         hasHumanInputNode={false}
         hasTriggerNode={false}
-        inputs={[]}
         missingStartNode={false}
-        onRefreshData={vi.fn()}
-        outputs={[]}
-        published={true}
+        published={false}
         publishedAt={Date.now()}
+        showBatchRunConfig
+        showRunConfig
         toolPublished
         workflowToolAvailable={false}
+        workflowToolIsLoading={false}
+        workflowToolOutdated={false}
+        workflowToolIsCurrentWorkspaceManager
         workflowToolMessage="workflow-disabled"
+        onConfigureWorkflowTool={vi.fn()}
       />,
     )
 
     expect(screen.getByText('common.batchRunApp')).toHaveAttribute('data-link', 'https://example.com/app?mode=batch')
+    fireEvent.click(screen.getAllByRole('button', { name: 'operation.config' })[0]!)
+    expect(handleOpenRunConfig).toHaveBeenCalledWith('https://example.com/app')
+    fireEvent.click(screen.getAllByRole('button', { name: 'operation.config' })[1]!)
+    expect(handleOpenRunConfig).toHaveBeenCalledWith('https://example.com/app?mode=batch')
     fireEvent.click(screen.getByText('common.openInExplore'))
     expect(handleOpenInExplore).toHaveBeenCalled()
     expect(screen.getByText('workflow-tool-configure')).toBeInTheDocument()
@@ -296,17 +344,19 @@ describe('app-publisher sections', () => {
         disabledFunctionTooltip="disabled"
         handleEmbed={handleEmbed}
         handleOpenInExplore={handleOpenInExplore}
+        handleOpenRunConfig={handleOpenRunConfig}
         handlePublish={vi.fn()}
         hasHumanInputNode={false}
         hasTriggerNode={false}
-        inputs={[]}
         missingStartNode
-        onRefreshData={vi.fn()}
-        outputs={[]}
         published={false}
         publishedAt={Date.now()}
         toolPublished={false}
         workflowToolAvailable
+        workflowToolIsLoading={false}
+        workflowToolOutdated={false}
+        workflowToolIsCurrentWorkspaceManager
+        onConfigureWorkflowTool={vi.fn()}
       />,
     )
 
@@ -321,16 +371,19 @@ describe('app-publisher sections', () => {
         disabledFunctionButton={false}
         handleEmbed={handleEmbed}
         handleOpenInExplore={handleOpenInExplore}
+        handleOpenRunConfig={handleOpenRunConfig}
         handlePublish={vi.fn()}
         hasHumanInputNode={false}
         hasTriggerNode
-        inputs={[]}
         missingStartNode={false}
-        outputs={[]}
         published={false}
         publishedAt={undefined}
         toolPublished={false}
         workflowToolAvailable
+        workflowToolIsLoading={false}
+        workflowToolOutdated={false}
+        workflowToolIsCurrentWorkspaceManager
+        onConfigureWorkflowTool={vi.fn()}
       />,
     )
 
diff --git a/web/app/components/app/app-publisher/__tests__/suggested-action.spec.tsx b/web/app/components/app/app-publisher/__tests__/suggested-action.spec.tsx
index ea199dfb78..2ca9e77abf 100644
--- a/web/app/components/app/app-publisher/__tests__/suggested-action.spec.tsx
+++ b/web/app/components/app/app-publisher/__tests__/suggested-action.spec.tsx
@@ -46,4 +46,47 @@ describe('SuggestedAction', () => {
 
     expect(handleClick).toHaveBeenCalledTimes(1)
   })
+
+  it('should render and trigger the trailing action button when configured', () => {
+    const handleActionClick = vi.fn()
+
+    render(
+      <SuggestedAction
+        link="https://example.com/docs"
+        actionButton={{
+          ariaLabel: 'Configure action',
+          icon: <span>config</span>,
+          onClick: handleActionClick,
+        }}
+      >
+        Configurable action
+      </SuggestedAction>,
+    )
+
+    fireEvent.click(screen.getByRole('button', { name: 'Configure action' }))
+
+    expect(screen.getByRole('link', { name: 'Configurable action' })).toHaveAttribute('href', 'https://example.com/docs')
+    expect(handleActionClick).toHaveBeenCalledTimes(1)
+  })
+
+  it('should block action button clicks when disabled', () => {
+    const handleActionClick = vi.fn()
+
+    render(
+      <SuggestedAction
+        link="https://example.com/docs"
+        disabled
+        actionButton={{
+          ariaLabel: 'Configure action',
+          icon: <span>config</span>,
+          onClick: handleActionClick,
+        }}
+      >
+        Disabled with action
+      </SuggestedAction>,
+    )
+
+    fireEvent.click(screen.getByRole('button', { name: 'Configure action' }))
+    expect(handleActionClick).not.toHaveBeenCalled()
+  })
 })
diff --git a/web/app/components/app/app-publisher/__tests__/version-info-modal.spec.tsx b/web/app/components/app/app-publisher/__tests__/version-info-modal.spec.tsx
index 4a461bd942..252eddb47e 100644
--- a/web/app/components/app/app-publisher/__tests__/version-info-modal.spec.tsx
+++ b/web/app/components/app/app-publisher/__tests__/version-info-modal.spec.tsx
@@ -87,6 +87,38 @@ describe('VersionInfoModal', () => {
     expect(handleClose).toHaveBeenCalledTimes(1)
   })
 
+  it('should close when the dialog requests close', () => {
+    const handleClose = vi.fn()
+
+    render(
+      <VersionInfoModal
+        isOpen
+        onClose={handleClose}
+        onPublish={vi.fn()}
+      />,
+    )
+
+    fireEvent.keyDown(document, { key: 'Escape', code: 'Escape' })
+
+    expect(handleClose).toHaveBeenCalledTimes(1)
+  })
+
+  it('should close when the close button is clicked', () => {
+    const handleClose = vi.fn()
+
+    render(
+      <VersionInfoModal
+        isOpen
+        onClose={handleClose}
+        onPublish={vi.fn()}
+      />,
+    )
+
+    fireEvent.click(screen.getByRole('button', { name: 'operation.close' }))
+
+    expect(handleClose).toHaveBeenCalledTimes(1)
+  })
+
   it('should validate release note length and clear previous errors before publishing', () => {
     const handlePublish = vi.fn()
     const handleClose = vi.fn()
diff --git a/web/app/components/app/app-publisher/index.tsx b/web/app/components/app/app-publisher/index.tsx
index 5e24b71961..f5b2c80ae8 100644
--- a/web/app/components/app/app-publisher/index.tsx
+++ b/web/app/components/app/app-publisher/index.tsx
@@ -1,4 +1,6 @@
+import type { FormEvent } from 'react'
 import type { ModelAndParameter } from '../configuration/debug/types'
+import type { WorkflowHiddenStartVariable, WorkflowLaunchInputValue } from '@/app/components/app/overview/app-card-utils'
 import type { CollaborationUpdate } from '@/app/components/workflow/collaboration/types/collaboration'
 import type { InputVar, Variable } from '@/app/components/workflow/types'
 import type { PublishWorkflowParams } from '@/types/workflow'
@@ -8,23 +10,33 @@ import { toast } from '@langgenius/dify-ui/toast'
 import { useSuspenseQuery } from '@tanstack/react-query'
 import { useKeyPress } from 'ahooks'
 import {
+
   memo,
+  use,
   useCallback,
-  useContext,
   useEffect,
   useMemo,
   useState,
 } from 'react'
 import { useTranslation } from 'react-i18next'
+import { WorkflowLaunchDialog } from '@/app/components/app/overview/app-card-sections'
+import {
+  buildWorkflowLaunchUrl,
+  createWorkflowLaunchInitialValues,
+  isWorkflowLaunchInputSupported,
+
+} from '@/app/components/app/overview/app-card-utils'
 import EmbeddedModal from '@/app/components/app/overview/embedded'
 import { useStore as useAppStore } from '@/app/components/app/store'
 import { trackEvent } from '@/app/components/base/amplitude'
+import { WorkflowToolDrawer } from '@/app/components/tools/workflow-tool'
+import { useConfigureButton } from '@/app/components/tools/workflow-tool/hooks/use-configure-button'
 import { collaborationManager } from '@/app/components/workflow/collaboration/core/collaboration-manager'
 import { webSocketClient } from '@/app/components/workflow/collaboration/core/websocket-manager'
 import { WorkflowContext } from '@/app/components/workflow/context'
+import { appDefaultIconBackground } from '@/config'
 import { useAsyncWindowOpen } from '@/hooks/use-async-window-open'
 import { useFormatTimeFromNow } from '@/hooks/use-format-time-from-now'
-import { useSnippetAndEvaluationPlanAccess } from '@/hooks/use-snippet-and-evaluation-plan-access'
 import { AccessMode } from '@/models/access-control'
 import { useAppWhiteListSubjects, useGetUserCanAccessApp } from '@/service/access-control'
 import { fetchAppDetailDirect, publishToCreatorsPlatform } from '@/service/apps'
@@ -36,27 +48,18 @@ import { AppModeEnum } from '@/types/app'
 import { basePath } from '@/utils/var'
 import { getKeyboardKeyCodeBySystem } from '../../workflow/utils'
 import AccessControl from '../app-access-control'
-import EvaluationWorkflowSwitchConfirmDialog from './evaluation-workflow-switch-confirm-dialog'
 import {
   PublisherAccessSection,
   PublisherActionsSection,
   PublisherSummarySection,
 } from './sections'
 import SuggestedAction from './suggested-action'
-import { useWorkflowTypeSwitch } from './use-workflow-type-switch'
 import {
   getDisabledFunctionTooltip,
   getPublisherAppUrl,
   isPublisherAccessConfigured,
 } from './utils'
 
-export type AppPublisherPublishParams
-  = | ModelAndParameter
-    | (Pick<PublishWorkflowParams, 'title' | 'releaseNotes'> & {
-      url?: string
-      id?: string
-    })
-
 export type AppPublisherProps = {
   disabled?: boolean
   publishDisabled?: boolean
@@ -66,8 +69,8 @@ export type AppPublisherProps = {
   debugWithMultipleModel?: boolean
   multipleModelConfigs?: ModelAndParameter[]
   /** modelAndParameter is passed when debugWithMultipleModel is true */
-  onPublish?: (params?: AppPublisherPublishParams) => Promise<unknown> | unknown
-  onRestore?: () => Promise<unknown> | unknown
+  onPublish?: AppPublisherPublishHandler
+  onRestore?: AppPublisherRestoreHandler
   onToggle?: (state: boolean) => void
   crossAxisOffset?: number
   toolPublished?: boolean
@@ -83,6 +86,12 @@ export type AppPublisherProps = {
 
 const PUBLISH_SHORTCUT = ['ctrl', '⇧', 'P']
 
+type AppPublisherPublishHandler
+  = | ((params?: ModelAndParameter | PublishWorkflowParams) => Promise<unknown> | unknown)
+    | ((params?: unknown) => Promise<unknown> | unknown)
+
+type AppPublisherRestoreHandler = () => Promise<unknown> | unknown
+
 const AppPublisher = ({
   disabled = false,
   publishDisabled = false,
@@ -109,20 +118,39 @@ const AppPublisher = ({
   const [published, setPublished] = useState(false)
   const [open, setOpen] = useState(false)
   const [showAppAccessControl, setShowAppAccessControl] = useState(false)
+  const [workflowToolDrawerOpen, setWorkflowToolDrawerOpen] = useState(false)
 
   const [embeddingModalOpen, setEmbeddingModalOpen] = useState(false)
+  const [workflowLaunchDialogOpen, setWorkflowLaunchDialogOpen] = useState(false)
+  const [workflowLaunchTargetUrl, setWorkflowLaunchTargetUrl] = useState('')
+  const [workflowLaunchValues, setWorkflowLaunchValues] = useState<Record<string, WorkflowLaunchInputValue>>({})
   const [publishingToMarketplace, setPublishingToMarketplace] = useState(false)
 
-  const workflowStore = useContext(WorkflowContext)
+  const workflowStore = use(WorkflowContext)
   const appDetail = useAppStore(state => state.appDetail)
   const setAppDetail = useAppStore(s => s.setAppDetail)
-  const { canAccess: canAccessSnippetsAndEvaluation } = useSnippetAndEvaluationPlanAccess()
   const { data: systemFeatures } = useSuspenseQuery(systemFeaturesQueryOptions())
   const { formatTimeFromNow } = useFormatTimeFromNow()
   const { app_base_url: appBaseURL = '', access_token: accessToken = '' } = appDetail?.site ?? {}
 
   const appURL = getPublisherAppUrl({ appBaseUrl: appBaseURL, accessToken, mode: appDetail?.mode })
   const isChatApp = [AppModeEnum.CHAT, AppModeEnum.AGENT_CHAT, AppModeEnum.COMPLETION].includes(appDetail?.mode || AppModeEnum.CHAT)
+  const hiddenLaunchVariables = useMemo<WorkflowHiddenStartVariable[]>(
+    () => (inputs ?? []).filter(input => input.hide === true),
+    [inputs],
+  )
+  const supportedWorkflowLaunchVariables = useMemo(
+    () => hiddenLaunchVariables.filter(isWorkflowLaunchInputSupported),
+    [hiddenLaunchVariables],
+  )
+  const unsupportedWorkflowLaunchVariables = useMemo(
+    () => hiddenLaunchVariables.filter(variable => !isWorkflowLaunchInputSupported(variable)),
+    [hiddenLaunchVariables],
+  )
+  const initialWorkflowLaunchValues = useMemo(
+    () => createWorkflowLaunchInitialValues(supportedWorkflowLaunchVariables),
+    [supportedWorkflowLaunchVariables],
+  )
 
   const { data: userCanAccessApp, isLoading: isGettingUserCanAccessApp, refetch } = useGetUserCanAccessApp({ appId: appDetail?.id, enabled: false })
   const { data: appAccessSubjects, isLoading: isGettingAppWhiteListSubjects } = useAppWhiteListSubjects(appDetail?.id, open && systemFeatures.webapp_auth.enabled && appDetail?.access_mode === AccessMode.SPECIFIC_GROUPS_MEMBERS)
@@ -150,7 +178,7 @@ const AppPublisher = ({
       refetch()
   }, [open, appDetail, refetch, systemFeatures])
 
-  const handlePublish = useCallback(async (params?: AppPublisherPublishParams) => {
+  const handlePublish = useCallback(async (params?: ModelAndParameter | PublishWorkflowParams) => {
     try {
       await onPublish?.(params)
       setPublished(true)
@@ -232,34 +260,31 @@ const AppPublisher = ({
     }
   }, [appDetail, setAppDetail])
 
-  const handlePublishedWorkflowTypeSwitch = useCallback(() => {
-    setOpen(false)
+  const handleOpenWorkflowLaunchDialog = useCallback((targetUrl: string) => {
+    setWorkflowLaunchValues(initialWorkflowLaunchValues)
+    setWorkflowLaunchTargetUrl(targetUrl)
+    setWorkflowLaunchDialogOpen(true)
+  }, [initialWorkflowLaunchValues])
+
+  const handleWorkflowLaunchValueChange = useCallback((variable: string, value: WorkflowLaunchInputValue) => {
+    setWorkflowLaunchValues(prev => ({
+      ...prev,
+      [variable]: value,
+    }))
   }, [])
 
-  const {
-    evaluationWorkflowSwitchTargets,
-    handleEvaluationWorkflowSwitchConfirmOpenChange,
-    handleWorkflowTypeSwitch,
-    isConvertingWorkflowType,
-    isEvaluationWorkflowType,
-    performWorkflowTypeSwitch,
-    showEvaluationWorkflowSwitchConfirm,
-    workflowTypeSwitchConfig,
-    workflowTypeSwitchDisabled,
-    workflowTypeSwitchDisabledReason,
-  } = useWorkflowTypeSwitch({
-    appDetail,
-    canAccessSnippetsAndEvaluation,
-    hasHumanInputNode,
-    hasTriggerNode,
-    onPublish: handlePublish,
-    onPublishedSwitch: handlePublishedWorkflowTypeSwitch,
-    published,
-    publishedAt,
-    publishDisabled,
-    setAppDetail,
-  })
+  const handleWorkflowLaunchConfirm = useCallback(async (event: FormEvent<HTMLFormElement>) => {
+    event.preventDefault()
 
+    const targetUrl = await buildWorkflowLaunchUrl({
+      accessibleUrl: workflowLaunchTargetUrl,
+      variables: supportedWorkflowLaunchVariables,
+      values: workflowLaunchValues,
+    })
+
+    window.open(targetUrl, '_blank')
+    setWorkflowLaunchDialogOpen(false)
+  }, [supportedWorkflowLaunchVariables, workflowLaunchTargetUrl, workflowLaunchValues])
   const handlePublishToMarketplace = useCallback(async () => {
     if (!appDetail?.id || publishingToMarketplace)
       return
@@ -311,6 +336,31 @@ const AppPublisher = ({
   const workflowToolMessage = !hasPublishedVersion || !workflowToolAvailable
     ? t('common.workflowAsToolDisabledHint', { ns: 'workflow' })
     : undefined
+  const workflowToolVisible = appDetail?.mode === AppModeEnum.WORKFLOW && !hasHumanInputNode && !hasTriggerNode
+  const workflowToolPublished = !!toolPublished
+  const closeWorkflowToolDrawer = useCallback(() => setWorkflowToolDrawerOpen(false), [])
+  const workflowToolIcon = useMemo(() => ({
+    content: (appDetail?.icon_type === 'image' ? '🤖' : appDetail?.icon) || '🤖',
+    background: (appDetail?.icon_type === 'image' ? appDefaultIconBackground : appDetail?.icon_background) || appDefaultIconBackground,
+  }), [appDetail?.icon, appDetail?.icon_background, appDetail?.icon_type])
+  const workflowTool = useConfigureButton({
+    enabled: workflowToolVisible,
+    published: workflowToolPublished,
+    detailNeedUpdate: workflowToolPublished && published,
+    workflowAppId: appDetail?.id ?? '',
+    icon: workflowToolIcon,
+    name: appDetail?.name ?? '',
+    description: appDetail?.description ?? '',
+    inputs,
+    outputs,
+    handlePublish,
+    onRefreshData,
+    onConfigured: closeWorkflowToolDrawer,
+  })
+  const openWorkflowToolDrawer = useCallback(() => {
+    handleOpenChange(false)
+    setWorkflowToolDrawerOpen(true)
+  }, [handleOpenChange])
   const upgradeHighlightStyle = useMemo(() => ({
     background: 'linear-gradient(97deg, var(--components-input-border-active-prompt-1, rgba(11, 165, 236, 0.95)) -3.64%, var(--components-input-border-active-prompt-2, rgba(21, 90, 239, 0.95)) 45.14%)',
     WebkitBackgroundClip: 'text',
@@ -357,63 +407,59 @@ const AppPublisher = ({
               publishShortcut={PUBLISH_SHORTCUT}
               startNodeLimitExceeded={startNodeLimitExceeded}
               upgradeHighlightStyle={upgradeHighlightStyle}
-              workflowTypeSwitchConfig={workflowTypeSwitchConfig}
-              workflowTypeSwitchDisabled={workflowTypeSwitchDisabled}
-              workflowTypeSwitchDisabledReason={workflowTypeSwitchDisabledReason}
-              onWorkflowTypeSwitch={handleWorkflowTypeSwitch}
             />
-            {!isEvaluationWorkflowType && (
-              <>
-                <PublisherAccessSection
-                  enabled={systemFeatures.webapp_auth.enabled}
-                  isAppAccessSet={isAppAccessSet}
-                  isLoading={Boolean(systemFeatures.webapp_auth.enabled && (isGettingUserCanAccessApp || isGettingAppWhiteListSubjects))}
-                  accessMode={appDetail?.access_mode}
-                  onClick={() => {
-                    setShowAppAccessControl(true)
-                    handleOpenChange(false)
-                  }}
-                />
-                <PublisherActionsSection
-                  appDetail={appDetail}
-                  appURL={appURL}
-                  disabledFunctionButton={disabledFunctionButton}
-                  disabledFunctionTooltip={disabledFunctionTooltip}
-                  handleEmbed={() => {
-                    setEmbeddingModalOpen(true)
-                    handleOpenChange(false)
-                  }}
-                  handleOpenInExplore={() => {
-                    handleOpenChange(false)
-                    handleOpenInExplore()
-                  }}
-                  handlePublish={handlePublish}
-                  hasHumanInputNode={hasHumanInputNode}
-                  hasTriggerNode={hasTriggerNode}
-                  inputs={inputs}
-                  missingStartNode={missingStartNode}
-                  onRefreshData={onRefreshData}
-                  outputs={outputs}
-                  published={published}
-                  publishedAt={publishedAt}
-                  toolPublished={toolPublished}
-                  workflowToolAvailable={workflowToolAvailable}
-                  workflowToolMessage={workflowToolMessage}
-                />
-                {systemFeatures.enable_creators_platform && (
-                  <div className="border-t border-divider-subtle p-4">
-                    <SuggestedAction
-                      icon={<span className="i-ri-store-line h-4 w-4" />}
-                      disabled={!publishedAt || publishingToMarketplace}
-                      onClick={handlePublishToMarketplace}
-                    >
-                      {publishingToMarketplace
-                        ? t('common.publishingToMarketplace', { ns: 'workflow' })
-                        : t('common.publishToMarketplace', { ns: 'workflow' })}
-                    </SuggestedAction>
-                  </div>
-                )}
-              </>
+            <PublisherAccessSection
+              enabled={systemFeatures.webapp_auth.enabled}
+              isAppAccessSet={isAppAccessSet}
+              isLoading={Boolean(systemFeatures.webapp_auth.enabled && (isGettingUserCanAccessApp || isGettingAppWhiteListSubjects))}
+              accessMode={appDetail?.access_mode}
+              onClick={() => {
+                handleOpenChange(false)
+                setShowAppAccessControl(true)
+              }}
+            />
+            <PublisherActionsSection
+              appDetail={appDetail}
+              appURL={appURL}
+              disabledFunctionButton={disabledFunctionButton}
+              disabledFunctionTooltip={disabledFunctionTooltip}
+              handleEmbed={() => {
+                setEmbeddingModalOpen(true)
+                handleOpenChange(false)
+              }}
+              handleOpenInExplore={() => {
+                handleOpenChange(false)
+                handleOpenInExplore()
+              }}
+              handleOpenRunConfig={handleOpenWorkflowLaunchDialog}
+              handlePublish={handlePublish}
+              hasHumanInputNode={hasHumanInputNode}
+              hasTriggerNode={hasTriggerNode}
+              missingStartNode={missingStartNode}
+              published={published}
+              publishedAt={publishedAt}
+              showBatchRunConfig={hiddenLaunchVariables.length > 0 && (appDetail?.mode === AppModeEnum.WORKFLOW || appDetail?.mode === AppModeEnum.COMPLETION)}
+              showRunConfig={hiddenLaunchVariables.length > 0}
+              toolPublished={toolPublished}
+              workflowToolAvailable={workflowToolAvailable}
+              workflowToolIsLoading={workflowTool.isLoading}
+              workflowToolOutdated={workflowTool.outdated}
+              workflowToolIsCurrentWorkspaceManager={workflowTool.isCurrentWorkspaceManager}
+              workflowToolMessage={workflowToolMessage}
+              onConfigureWorkflowTool={openWorkflowToolDrawer}
+            />
+            {systemFeatures.enable_creators_platform && (
+              <div className="border-t border-divider-subtle p-4">
+                <SuggestedAction
+                  icon={<span className="i-ri-store-line h-4 w-4" />}
+                  disabled={!publishedAt || publishingToMarketplace}
+                  onClick={handlePublishToMarketplace}
+                >
+                  {publishingToMarketplace
+                    ? t('common.publishingToMarketplace', { ns: 'workflow' })
+                    : t('common.publishToMarketplace', { ns: 'workflow' })}
+                </SuggestedAction>
+              </div>
             )}
           </div>
         </PopoverContent>
@@ -423,16 +469,29 @@ const AppPublisher = ({
           onClose={() => setEmbeddingModalOpen(false)}
           appBaseUrl={appBaseURL}
           accessToken={accessToken}
+          hiddenInputs={hiddenLaunchVariables}
         />
         {showAppAccessControl && <AccessControl app={appDetail!} onConfirm={handleAccessControlUpdate} onClose={() => { setShowAppAccessControl(false) }} />}
+        <WorkflowLaunchDialog
+          t={t}
+          open={workflowLaunchDialogOpen}
+          hiddenVariables={supportedWorkflowLaunchVariables}
+          unsupportedVariables={unsupportedWorkflowLaunchVariables}
+          values={workflowLaunchValues}
+          onOpenChange={setWorkflowLaunchDialogOpen}
+          onValueChange={handleWorkflowLaunchValueChange}
+          onSubmit={handleWorkflowLaunchConfirm}
+        />
       </Popover>
-      <EvaluationWorkflowSwitchConfirmDialog
-        open={showEvaluationWorkflowSwitchConfirm}
-        targets={evaluationWorkflowSwitchTargets}
-        loading={isConvertingWorkflowType}
-        onOpenChange={handleEvaluationWorkflowSwitchConfirmOpenChange}
-        onConfirm={() => void performWorkflowTypeSwitch()}
-      />
+      {workflowToolDrawerOpen && (
+        <WorkflowToolDrawer
+          isAdd={!workflowToolPublished}
+          payload={workflowTool.payload}
+          onHide={closeWorkflowToolDrawer}
+          onCreate={workflowTool.handleCreate}
+          onSave={workflowTool.handleUpdate}
+        />
+      )}
     </>
   )
 }
diff --git a/web/app/components/app/app-publisher/sections.tsx b/web/app/components/app/app-publisher/sections.tsx
index aff78699aa..712312b744 100644
--- a/web/app/components/app/app-publisher/sections.tsx
+++ b/web/app/components/app/app-publisher/sections.tsx
@@ -1,7 +1,6 @@
 import type { CSSProperties, ReactNode } from 'react'
 import type { ModelAndParameter } from '../configuration/debug/types'
 import type { AppPublisherProps } from './index'
-import type { WorkflowTypeSwitchConfig } from './use-workflow-type-switch'
 import type { PublishWorkflowParams } from '@/types/workflow'
 import { Button } from '@langgenius/dify-ui/button'
 import {
@@ -9,12 +8,12 @@ import {
   TooltipContent,
   TooltipTrigger,
 } from '@langgenius/dify-ui/tooltip'
+import { RiSettings2Line } from '@remixicon/react'
 import { useTranslation } from 'react-i18next'
 import Divider from '@/app/components/base/divider'
 import Loading from '@/app/components/base/loading'
 import UpgradeBtn from '@/app/components/billing/upgrade-btn'
 import WorkflowToolConfigureButton from '@/app/components/tools/workflow-tool/configure-button'
-import { appDefaultIconBackground } from '@/config'
 import { AppModeEnum } from '@/types/app'
 import ShortcutsName from '../../workflow/shortcuts-name'
 import PublishWithMultipleModel from './publish-with-multiple-model'
@@ -31,13 +30,9 @@ type SummarySectionProps = Pick<AppPublisherProps, | 'debugWithMultipleModel'
     handlePublish: (params?: ModelAndParameter | PublishWorkflowParams) => Promise<void>
     handleRestore: () => Promise<void>
     isChatApp: boolean
-    onWorkflowTypeSwitch: () => Promise<void>
     published: boolean
     publishShortcut: string[]
     upgradeHighlightStyle: CSSProperties
-    workflowTypeSwitchConfig?: WorkflowTypeSwitchConfig
-    workflowTypeSwitchDisabled: boolean
-    workflowTypeSwitchDisabledReason?: string
   }
 
 type AccessSectionProps = {
@@ -50,11 +45,8 @@ type AccessSectionProps = {
 
 type ActionsSectionProps = Pick<AppPublisherProps, | 'hasHumanInputNode'
   | 'hasTriggerNode'
-  | 'inputs'
   | 'missingStartNode'
-  | 'onRefreshData'
   | 'toolPublished'
-  | 'outputs'
   | 'publishedAt'
   | 'workflowToolAvailable'> & {
     appDetail: {
@@ -71,9 +63,16 @@ type ActionsSectionProps = Pick<AppPublisherProps, | 'hasHumanInputNode'
     disabledFunctionTooltip?: string
     handleEmbed: () => void
     handleOpenInExplore: () => void
+    handleOpenRunConfig?: (url: string) => void
     handlePublish: (params?: ModelAndParameter | PublishWorkflowParams) => Promise<void>
     published: boolean
+    showBatchRunConfig?: boolean
+    showRunConfig?: boolean
+    workflowToolIsLoading: boolean
+    workflowToolOutdated: boolean
+    workflowToolIsCurrentWorkspaceManager: boolean
     workflowToolMessage?: string
+    onConfigureWorkflowTool: () => void
   }
 
 export const AccessModeDisplay = ({ mode }: { mode?: keyof typeof ACCESS_MODE_MAP }) => {
@@ -94,28 +93,6 @@ export const AccessModeDisplay = ({ mode }: { mode?: keyof typeof ACCESS_MODE_MA
   )
 }
 
-const ActionTooltip = ({
-  disabled,
-  tooltip,
-  children,
-}: {
-  disabled: boolean
-  tooltip?: ReactNode
-  children: ReactNode
-}) => {
-  if (!disabled || !tooltip)
-    return <>{children}</>
-
-  return (
-    <Tooltip>
-      <TooltipTrigger render={<div className="flex">{children}</div>} />
-      <TooltipContent>
-        {tooltip}
-      </TooltipContent>
-    </Tooltip>
-  )
-}
-
 export const PublisherSummarySection = ({
   debugWithMultipleModel = false,
   draftUpdatedAt,
@@ -124,16 +101,12 @@ export const PublisherSummarySection = ({
   handleRestore,
   isChatApp,
   multipleModelConfigs = [],
-  onWorkflowTypeSwitch,
   publishDisabled = false,
   published,
   publishedAt,
   publishShortcut,
   startNodeLimitExceeded = false,
   upgradeHighlightStyle,
-  workflowTypeSwitchConfig,
-  workflowTypeSwitchDisabled,
-  workflowTypeSwitchDisabledReason,
 }: SummarySectionProps) => {
   const { t } = useTranslation()
 
@@ -194,47 +167,6 @@ export const PublisherSummarySection = ({
                       </div>
                     )}
               </Button>
-              {workflowTypeSwitchConfig && (
-                <ActionTooltip disabled={workflowTypeSwitchDisabled} tooltip={workflowTypeSwitchDisabledReason}>
-                  <Button
-                    variant="ghost"
-                    className="mt-1 w-full gap-0.5 px-3 text-text-tertiary"
-                    onClick={() => void onWorkflowTypeSwitch()}
-                    disabled={workflowTypeSwitchDisabled}
-                  >
-                    <span className="px-0.5">
-                      {t(
-                        publishedAt
-                          ? workflowTypeSwitchConfig.switchLabelKey
-                          : workflowTypeSwitchConfig.publishLabelKey,
-                        { ns: 'workflow' },
-                      )}
-                    </span>
-                    <Tooltip>
-                      <TooltipTrigger
-                        render={(
-                          <span
-                            className="flex h-4 w-4 items-center justify-center text-text-quaternary hover:text-text-tertiary"
-                            aria-label={t(workflowTypeSwitchConfig.tipKey, { ns: 'workflow' })}
-                            onClick={(e) => {
-                              e.preventDefault()
-                              e.stopPropagation()
-                            }}
-                          >
-                            <span className="i-ri-question-line h-3.5 w-3.5" />
-                          </span>
-                        )}
-                      />
-                      <TooltipContent
-                        placement="top"
-                        className="w-[180px]"
-                      >
-                        {t(workflowTypeSwitchConfig.tipKey, { ns: 'workflow' })}
-                      </TooltipContent>
-                    </Tooltip>
-                  </Button>
-                </ActionTooltip>
-              )}
               {startNodeLimitExceeded && (
                 <div className="mt-3 flex flex-col items-stretch">
                   <p
@@ -298,6 +230,28 @@ export const PublisherAccessSection = ({
   )
 }
 
+const ActionTooltip = ({
+  disabled,
+  tooltip,
+  children,
+}: {
+  disabled: boolean
+  tooltip?: ReactNode
+  children: ReactNode
+}) => {
+  if (!disabled || !tooltip)
+    return <>{children}</>
+
+  return (
+    <Tooltip>
+      <TooltipTrigger render={<div className="flex">{children}</div>} />
+      <TooltipContent>
+        {tooltip}
+      </TooltipContent>
+    </Tooltip>
+  )
+}
+
 export const PublisherActionsSection = ({
   appDetail,
   appURL,
@@ -305,18 +259,20 @@ export const PublisherActionsSection = ({
   disabledFunctionTooltip,
   handleEmbed,
   handleOpenInExplore,
-  handlePublish,
+  handleOpenRunConfig,
   hasHumanInputNode = false,
   hasTriggerNode = false,
-  inputs,
   missingStartNode = false,
-  onRefreshData,
-  outputs,
-  published,
   publishedAt,
+  showBatchRunConfig = false,
+  showRunConfig = false,
   toolPublished,
   workflowToolAvailable = true,
+  workflowToolIsLoading,
+  workflowToolOutdated,
+  workflowToolIsCurrentWorkspaceManager,
   workflowToolMessage,
+  onConfigureWorkflowTool,
 }: ActionsSectionProps) => {
   const { t } = useTranslation()
 
@@ -333,6 +289,13 @@ export const PublisherActionsSection = ({
           disabled={disabledFunctionButton}
           link={appURL}
           icon={<span className="i-ri-play-circle-line h-4 w-4" />}
+          actionButton={showRunConfig
+            ? {
+                ariaLabel: t('operation.config', { ns: 'common' }),
+                icon: <RiSettings2Line className="h-4 w-4" />,
+                onClick: () => handleOpenRunConfig?.(appURL),
+              }
+            : undefined}
         >
           {t('common.runApp', { ns: 'workflow' })}
         </SuggestedAction>
@@ -345,6 +308,13 @@ export const PublisherActionsSection = ({
                 disabled={disabledFunctionButton}
                 link={`${appURL}${appURL.includes('?') ? '&' : '?'}mode=batch`}
                 icon={<span className="i-ri-play-list-2-line h-4 w-4" />}
+                actionButton={showBatchRunConfig
+                  ? {
+                      ariaLabel: t('operation.config', { ns: 'common' }),
+                      icon: <RiSettings2Line className="h-4 w-4" />,
+                      onClick: () => handleOpenRunConfig?.(`${appURL}${appURL.includes('?') ? '&' : '?'}mode=batch`),
+                    }
+                  : undefined}
               >
                 {t('common.batchRunApp', { ns: 'workflow' })}
               </SuggestedAction>
@@ -389,18 +359,10 @@ export const PublisherActionsSection = ({
         <WorkflowToolConfigureButton
           disabled={workflowToolDisabled}
           published={!!toolPublished}
-          detailNeedUpdate={!!toolPublished && published}
-          workflowAppId={appDetail?.id ?? ''}
-          icon={{
-            content: (appDetail.icon_type === 'image' ? '🤖' : appDetail?.icon) || '🤖',
-            background: (appDetail.icon_type === 'image' ? appDefaultIconBackground : appDetail?.icon_background) || appDefaultIconBackground,
-          }}
-          name={appDetail?.name ?? ''}
-          description={appDetail?.description ?? ''}
-          inputs={inputs}
-          outputs={outputs}
-          handlePublish={handlePublish}
-          onRefreshData={onRefreshData}
+          isLoading={workflowToolIsLoading}
+          outdated={workflowToolOutdated}
+          isCurrentWorkspaceManager={workflowToolIsCurrentWorkspaceManager}
+          onConfigure={onConfigureWorkflowTool}
           disabledReason={workflowToolMessage}
         />
       )}
diff --git a/web/app/components/app/app-publisher/suggested-action.tsx b/web/app/components/app/app-publisher/suggested-action.tsx
index db13364eb9..c1cec6f819 100644
--- a/web/app/components/app/app-publisher/suggested-action.tsx
+++ b/web/app/components/app/app-publisher/suggested-action.tsx
@@ -1,33 +1,93 @@
-import type { HTMLProps, PropsWithChildren } from 'react'
+import type { HTMLProps, PropsWithChildren, MouseEvent as ReactMouseEvent } from 'react'
 import { cn } from '@langgenius/dify-ui/cn'
 import { RiArrowRightUpLine } from '@remixicon/react'
 
+type SuggestedActionButton = {
+  ariaLabel: string
+  icon: React.ReactNode
+  onClick: (event: ReactMouseEvent<HTMLButtonElement>) => void
+}
+
 type SuggestedActionProps = PropsWithChildren<HTMLProps<HTMLAnchorElement> & {
   icon?: React.ReactNode
   link?: string
   disabled?: boolean
+  actionButton?: SuggestedActionButton
 }>
 
-const SuggestedAction = ({ icon, link, disabled, children, className, onClick, ...props }: SuggestedActionProps) => {
-  const handleClick = (e: React.MouseEvent<HTMLAnchorElement>) => {
-    if (disabled)
+const SuggestedAction = ({
+  icon,
+  link,
+  disabled,
+  children,
+  className,
+  onClick,
+  actionButton,
+  ...props
+}: SuggestedActionProps) => {
+  const handleClick = (event: ReactMouseEvent<HTMLAnchorElement>) => {
+    if (disabled) {
+      event.preventDefault()
       return
-    onClick?.(e)
+    }
+
+    onClick?.(event)
   }
-  return (
+
+  const handleActionClick = (event: ReactMouseEvent<HTMLButtonElement>) => {
+    if (disabled) {
+      event.preventDefault()
+      return
+    }
+
+    actionButton?.onClick(event)
+  }
+
+  const mainAction = (
     <a
       href={disabled ? undefined : link}
       target="_blank"
       rel="noreferrer"
-      className={cn('flex items-center justify-start gap-2 rounded-lg bg-background-section-burn px-2.5 py-2 text-text-secondary transition-colors not-first:mt-1', disabled ? 'cursor-not-allowed opacity-30 shadow-xs' : 'cursor-pointer text-text-secondary hover:bg-state-accent-hover hover:text-text-accent', className)}
+      className={cn(
+        'flex min-w-0 items-center justify-start gap-2 px-2.5 py-2 text-text-secondary transition-colors',
+        actionButton ? 'flex-1 rounded-l-lg' : 'rounded-lg bg-background-section-burn not-first:mt-1',
+        disabled ? 'cursor-not-allowed opacity-30 shadow-xs' : 'cursor-pointer hover:bg-state-accent-hover hover:text-text-accent',
+      )}
       onClick={handleClick}
       {...props}
     >
-      <div className="relative h-4 w-4">{icon}</div>
+      <div className="relative h-4 w-4 shrink-0">{icon}</div>
       <div className="shrink grow basis-0 system-sm-medium">{children}</div>
-      <RiArrowRightUpLine className="h-3.5 w-3.5" />
+      <RiArrowRightUpLine className="h-3.5 w-3.5 shrink-0" />
     </a>
   )
+
+  if (!actionButton)
+    return mainAction
+
+  return (
+    <div
+      className={cn(
+        'flex items-stretch rounded-lg bg-background-section-burn not-first:mt-1',
+        disabled ? 'opacity-30 shadow-xs' : '',
+        className,
+      )}
+    >
+      {mainAction}
+      <button
+        type="button"
+        aria-label={actionButton.ariaLabel}
+        disabled={disabled}
+        className={cn(
+          'flex w-9 shrink-0 items-center justify-center rounded-r-lg border-l-[0.5px] border-divider-subtle text-text-tertiary transition-colors',
+          disabled ? 'cursor-not-allowed' : 'cursor-pointer hover:bg-state-accent-hover hover:text-text-accent',
+        )}
+        onClick={handleActionClick}
+      >
+        {actionButton.icon}
+      </button>
+    </div>
+  )
 }
 
 export default SuggestedAction
diff --git a/web/app/components/app/app-publisher/version-info-modal.tsx b/web/app/components/app/app-publisher/version-info-modal.tsx
index 3fe4c61fb7..4e5493d1b2 100644
--- a/web/app/components/app/app-publisher/version-info-modal.tsx
+++ b/web/app/components/app/app-publisher/version-info-modal.tsx
@@ -1,12 +1,12 @@
 import type { FC } from 'react'
 import type { VersionHistory } from '@/types/workflow'
 import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
 import { RiCloseLine } from '@remixicon/react'
 import * as React from 'react'
 import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import Modal from '@/app/components/base/modal'
 import Input from '../../base/input'
 import Textarea from '../../base/textarea'
 
@@ -66,46 +66,60 @@ const VersionInfoModal: FC<VersionInfoModalProps> = ({
   }, [])
 
   return (
-    <Modal className="p-0" isShow={isOpen} onClose={onClose}>
-      <div className="relative w-full p-6 pr-14 pb-4">
-        <div className="title-2xl-semi-bold text-text-primary first-letter:capitalize">
-          {versionInfo?.marked_name ? t('versionHistory.editVersionInfo', { ns: 'workflow' }) : t('versionHistory.nameThisVersion', { ns: 'workflow' })}
-        </div>
-        <div className="absolute top-5 right-5 flex h-8 w-8 cursor-pointer items-center justify-center p-1.5" onClick={onClose}>
-          <RiCloseLine className="h-[18px] w-[18px] text-text-tertiary" />
-        </div>
-      </div>
-      <div className="flex flex-col gap-y-4 px-6 py-3">
-        <div className="flex flex-col gap-y-1">
-          <div className="flex h-6 items-center system-sm-semibold text-text-secondary">
-            {t('versionHistory.editField.title', { ns: 'workflow' })}
+    <Dialog
+      open={isOpen}
+      onOpenChange={(open) => {
+        if (!open)
+          onClose()
+      }}
+    >
+      <DialogContent className="w-full max-w-[480px] overflow-hidden! border-none p-0 text-left align-middle">
+
+        <div className="relative w-full p-6 pr-14 pb-4">
+          <div className="title-2xl-semi-bold text-text-primary first-letter:capitalize">
+            {versionInfo?.marked_name ? t('versionHistory.editVersionInfo', { ns: 'workflow' }) : t('versionHistory.nameThisVersion', { ns: 'workflow' })}
           </div>
-          <Input
-            value={title}
-            placeholder={`${t('versionHistory.nameThisVersion', { ns: 'workflow' })}${t('panel.optional', { ns: 'workflow' })}`}
-            onChange={handleTitleChange}
-            destructive={titleError}
-          />
+          <button
+            type="button"
+            className="absolute top-5 right-5 flex h-8 w-8 cursor-pointer items-center justify-center border-none bg-transparent p-1.5 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+            aria-label={t('operation.close', { ns: 'common' })}
+            onClick={onClose}
+          >
+            <RiCloseLine className="h-[18px] w-[18px] text-text-tertiary" aria-hidden="true" />
+          </button>
         </div>
-        <div className="flex flex-col gap-y-1">
-          <div className="flex h-6 items-center system-sm-semibold text-text-secondary">
-            {t('versionHistory.editField.releaseNotes', { ns: 'workflow' })}
+        <div className="flex flex-col gap-y-4 px-6 py-3">
+          <div className="flex flex-col gap-y-1">
+            <div className="flex h-6 items-center system-sm-semibold text-text-secondary">
+              {t('versionHistory.editField.title', { ns: 'workflow' })}
+            </div>
+            <Input
+              value={title}
+              placeholder={`${t('versionHistory.nameThisVersion', { ns: 'workflow' })}${t('panel.optional', { ns: 'workflow' })}`}
+              onChange={handleTitleChange}
+              destructive={titleError}
+            />
+          </div>
+          <div className="flex flex-col gap-y-1">
+            <div className="flex h-6 items-center system-sm-semibold text-text-secondary">
+              {t('versionHistory.editField.releaseNotes', { ns: 'workflow' })}
+            </div>
+            <Textarea
+              value={releaseNotes}
+              placeholder={`${t('versionHistory.releaseNotesPlaceholder', { ns: 'workflow' })}${t('panel.optional', { ns: 'workflow' })}`}
+              onChange={handleDescriptionChange}
+              destructive={releaseNotesError}
+            />
           </div>
-          <Textarea
-            value={releaseNotes}
-            placeholder={`${t('versionHistory.releaseNotesPlaceholder', { ns: 'workflow' })}${t('panel.optional', { ns: 'workflow' })}`}
-            onChange={handleDescriptionChange}
-            destructive={releaseNotesError}
-          />
         </div>
-      </div>
-      <div className="flex justify-end p-6 pt-5">
-        <div className="flex items-center gap-x-3">
-          <Button onClick={onClose}>{t('operation.cancel', { ns: 'common' })}</Button>
-          <Button variant="primary" onClick={handlePublish}>{t('common.publish', { ns: 'workflow' })}</Button>
+        <div className="flex justify-end p-6 pt-5">
+          <div className="flex items-center gap-x-3">
+            <Button nativeButton={false} onClick={onClose}>{t('operation.cancel', { ns: 'common' })}</Button>
+            <Button nativeButton={false} variant="primary" onClick={handlePublish}>{t('common.publish', { ns: 'workflow' })}</Button>
+          </div>
         </div>
-      </div>
-    </Modal>
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/components/app/configuration/config-prompt/advanced-prompt-input.tsx b/web/app/components/app/configuration/config-prompt/advanced-prompt-input.tsx
index 5fd394ad45..418982fcb6 100644
--- a/web/app/components/app/configuration/config-prompt/advanced-prompt-input.tsx
+++ b/web/app/components/app/configuration/config-prompt/advanced-prompt-input.tsx
@@ -5,11 +5,6 @@ import type { PromptRole, PromptVariable } from '@/models/debug'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
 import { toast } from '@langgenius/dify-ui/toast'
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipTrigger,
-} from '@langgenius/dify-ui/tooltip'
 import {
   RiDeleteBinLine,
   RiErrorWarningFill,
@@ -25,6 +20,7 @@ import {
   Copy,
   CopyCheck,
 } from '@/app/components/base/icons/src/vender/line/files'
+import { Infotip } from '@/app/components/base/infotip'
 import PromptEditor from '@/app/components/base/prompt-editor'
 import { INSERT_VARIABLE_VALUE_BLOCK_COMMAND } from '@/app/components/base/prompt-editor/plugins/variable-block'
 import ConfigContext from '@/context/debug-configuration'
@@ -183,18 +179,13 @@ const AdvancedPromptInput: FC<Props> = ({
                         <div className="text-sm font-semibold text-indigo-800 uppercase">
                           {t('pageTitle.line1', { ns: 'appDebug' })}
                         </div>
-                        <Tooltip>
-                          <TooltipTrigger
-                            render={(
-                              <span className="ml-1 i-ri-question-line h-4 w-4 shrink-0 text-text-quaternary" />
-                            )}
-                          />
-                          <TooltipContent>
-                            <div className="w-[180px]">
-                              {t('promptTip', { ns: 'appDebug' })}
-                            </div>
-                          </TooltipContent>
-                        </Tooltip>
+                        <Infotip
+                          aria-label={t('promptTip', { ns: 'appDebug' })}
+                          className="ml-1"
+                          popupClassName="w-[180px]"
+                        >
+                          {t('promptTip', { ns: 'appDebug' })}
+                        </Infotip>
                       </div>
                     )}
                 <div className={cn(s.optionWrap, 'items-center space-x-1')}>
diff --git a/web/app/components/app/configuration/config-prompt/conversation-history/__tests__/edit-modal.spec.tsx b/web/app/components/app/configuration/config-prompt/conversation-history/__tests__/edit-modal.spec.tsx
index 236f9403c9..1dd5d03889 100644
--- a/web/app/components/app/configuration/config-prompt/conversation-history/__tests__/edit-modal.spec.tsx
+++ b/web/app/components/app/configuration/config-prompt/conversation-history/__tests__/edit-modal.spec.tsx
@@ -3,8 +3,11 @@ import { fireEvent, render, screen } from '@testing-library/react'
 import * as React from 'react'
 import EditModal from '../edit-modal'
 
-vi.mock('@/app/components/base/modal', () => ({
-  default: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
+vi.mock('@langgenius/dify-ui/dialog', () => ({
+  Dialog: ({ children, open }: { children: React.ReactNode, open?: boolean }) =>
+    open === false ? null : <>{children}</>,
+  DialogContent: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
+  DialogTitle: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
 }))
 
 describe('Conversation history edit modal', () => {
diff --git a/web/app/components/app/configuration/config-prompt/conversation-history/edit-modal.tsx b/web/app/components/app/configuration/config-prompt/conversation-history/edit-modal.tsx
index 7906a5f8da..ad73e111c7 100644
--- a/web/app/components/app/configuration/config-prompt/conversation-history/edit-modal.tsx
+++ b/web/app/components/app/configuration/config-prompt/conversation-history/edit-modal.tsx
@@ -2,10 +2,10 @@
 import type { FC } from 'react'
 import type { ConversationHistoriesRole } from '@/models/debug'
 import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import * as React from 'react'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import Modal from '@/app/components/base/modal'
 
 type Props = {
   isShow: boolean
@@ -25,37 +25,45 @@ const EditModal: FC<Props> = ({
   const { t } = useTranslation()
   const [tempData, setTempData] = useState(data)
   return (
-    <Modal
-      title={t('feature.conversationHistory.editModal.title', { ns: 'appDebug' })}
-      isShow={isShow}
-      onClose={onClose}
+    <Dialog
+      open={isShow}
+      onOpenChange={(open) => {
+        if (!open)
+          onClose()
+      }}
     >
-      <div className="mt-6 text-sm leading-[21px] font-medium text-text-primary">{t('feature.conversationHistory.editModal.userPrefix', { ns: 'appDebug' })}</div>
-      <input
-        className="mt-2 box-border h-10 w-full rounded-lg bg-components-input-bg-normal px-3 text-sm leading-10"
-        value={tempData.user_prefix}
-        onChange={e => setTempData({
-          ...tempData,
-          user_prefix: e.target.value,
-        })}
-      />
+      <DialogContent className="w-full max-w-[480px] overflow-hidden! border-none p-6 text-left align-middle">
+        <DialogTitle className="title-2xl-semi-bold text-text-primary">
+          {t('feature.conversationHistory.editModal.title', { ns: 'appDebug' })}
+        </DialogTitle>
 
-      <div className="mt-6 text-sm leading-[21px] font-medium text-text-primary">{t('feature.conversationHistory.editModal.assistantPrefix', { ns: 'appDebug' })}</div>
-      <input
-        className="mt-2 box-border h-10 w-full rounded-lg bg-components-input-bg-normal px-3 text-sm leading-10"
-        value={tempData.assistant_prefix}
-        onChange={e => setTempData({
-          ...tempData,
-          assistant_prefix: e.target.value,
-        })}
-        placeholder={t('chat.conversationNamePlaceholder', { ns: 'common' }) || ''}
-      />
+        <div className="mt-6 text-sm leading-[21px] font-medium text-text-primary">{t('feature.conversationHistory.editModal.userPrefix', { ns: 'appDebug' })}</div>
+        <input
+          className="mt-2 box-border h-10 w-full rounded-lg bg-components-input-bg-normal px-3 text-sm leading-10"
+          value={tempData.user_prefix}
+          onChange={e => setTempData({
+            ...tempData,
+            user_prefix: e.target.value,
+          })}
+        />
 
-      <div className="mt-10 flex justify-end">
-        <Button className="mr-2 shrink-0" onClick={onClose}>{t('operation.cancel', { ns: 'common' })}</Button>
-        <Button variant="primary" className="shrink-0" onClick={() => onSave(tempData)} loading={saveLoading}>{t('operation.save', { ns: 'common' })}</Button>
-      </div>
-    </Modal>
+        <div className="mt-6 text-sm leading-[21px] font-medium text-text-primary">{t('feature.conversationHistory.editModal.assistantPrefix', { ns: 'appDebug' })}</div>
+        <input
+          className="mt-2 box-border h-10 w-full rounded-lg bg-components-input-bg-normal px-3 text-sm leading-10"
+          value={tempData.assistant_prefix}
+          onChange={e => setTempData({
+            ...tempData,
+            assistant_prefix: e.target.value,
+          })}
+          placeholder={t('chat.conversationNamePlaceholder', { ns: 'common' }) || ''}
+        />
+
+        <div className="mt-10 flex justify-end">
+          <Button className="mr-2 shrink-0" onClick={onClose}>{t('operation.cancel', { ns: 'common' })}</Button>
+          <Button variant="primary" className="shrink-0" onClick={() => onSave(tempData)} loading={saveLoading}>{t('operation.save', { ns: 'common' })}</Button>
+        </div>
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/components/app/configuration/config-prompt/simple-prompt-input.tsx b/web/app/components/app/configuration/config-prompt/simple-prompt-input.tsx
index 2935504f15..63cb16083e 100644
--- a/web/app/components/app/configuration/config-prompt/simple-prompt-input.tsx
+++ b/web/app/components/app/configuration/config-prompt/simple-prompt-input.tsx
@@ -5,11 +5,6 @@ import type { PromptVariable } from '@/models/debug'
 import type { GenRes } from '@/service/debug'
 import { cn } from '@langgenius/dify-ui/cn'
 import { toast } from '@langgenius/dify-ui/toast'
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipTrigger,
-} from '@langgenius/dify-ui/tooltip'
 import { useBoolean } from 'ahooks'
 import { noop } from 'es-toolkit/function'
 import { produce } from 'immer'
@@ -21,6 +16,7 @@ import { ADD_EXTERNAL_DATA_TOOL } from '@/app/components/app/configuration/confi
 import AutomaticBtn from '@/app/components/app/configuration/config/automatic/automatic-btn'
 import GetAutomaticResModal from '@/app/components/app/configuration/config/automatic/get-automatic-res'
 import { useFeaturesStore } from '@/app/components/base/features/hooks'
+import { Infotip } from '@/app/components/base/infotip'
 import PromptEditor from '@/app/components/base/prompt-editor'
 import { PROMPT_EDITOR_UPDATE_VALUE_BY_EVENT_EMITTER } from '@/app/components/base/prompt-editor/plugins/update-block'
 import { INSERT_VARIABLE_VALUE_BLOCK_COMMAND } from '@/app/components/base/prompt-editor/plugins/variable-block'
@@ -183,18 +179,13 @@ const Prompt: FC<ISimplePromptInput> = ({
             <div className="flex items-center space-x-1">
               <div className="system-sm-semibold-uppercase text-text-secondary">{mode !== AppModeEnum.COMPLETION ? t('chatSubTitle', { ns: 'appDebug' }) : t('completionSubTitle', { ns: 'appDebug' })}</div>
               {!readonly && (
-                <Tooltip>
-                  <TooltipTrigger
-                    render={(
-                      <span className="ml-1 i-ri-question-line h-4 w-4 shrink-0 text-text-quaternary" />
-                    )}
-                  />
-                  <TooltipContent>
-                    <div className="w-[180px]">
-                      {t('promptTip', { ns: 'appDebug' })}
-                    </div>
-                  </TooltipContent>
-                </Tooltip>
+                <Infotip
+                  aria-label={t('promptTip', { ns: 'appDebug' })}
+                  className="ml-1"
+                  popupClassName="w-[180px]"
+                >
+                  {t('promptTip', { ns: 'appDebug' })}
+                </Infotip>
               )}
             </div>
             <div className="flex items-center">
diff --git a/web/app/components/app/configuration/config-var/__tests__/index.spec.tsx b/web/app/components/app/configuration/config-var/__tests__/index.spec.tsx
index 51683ad948..604db8288a 100644
--- a/web/app/components/app/configuration/config-var/__tests__/index.spec.tsx
+++ b/web/app/components/app/configuration/config-var/__tests__/index.spec.tsx
@@ -233,9 +233,7 @@ describe('ConfigVar', () => {
       const item = screen.getByTitle('name · Name')
       const itemContainer = item.closest('div.group')
       expect(itemContainer).not.toBeNull()
-      const actionButtons = itemContainer!.querySelectorAll('div.h-6.w-6')
-      expect(actionButtons).toHaveLength(2)
-      fireEvent.click(actionButtons[0]!)
+      fireEvent.click(within(itemContainer as HTMLElement).getByRole('button', { name: 'common.operation.edit' }))
 
       const editDialog = await screen.findByRole('dialog')
       const saveButton = within(editDialog).getByRole('button', { name: 'common.operation.save' })
@@ -259,9 +257,7 @@ describe('ConfigVar', () => {
       const item = screen.getByTitle('first · First')
       const itemContainer = item.closest('div.group')
       expect(itemContainer).not.toBeNull()
-      const actionButtons = itemContainer!.querySelectorAll('div.h-6.w-6')
-      expect(actionButtons).toHaveLength(2)
-      fireEvent.click(actionButtons[0]!)
+      fireEvent.click(within(itemContainer as HTMLElement).getByRole('button', { name: 'common.operation.edit' }))
 
       const inputs = await screen.findAllByPlaceholderText('appDebug.variableConfig.inputPlaceholder')
       fireEvent.change(inputs[0]!, { target: { value: 'second' } })
@@ -285,9 +281,7 @@ describe('ConfigVar', () => {
       const item = screen.getByTitle('first · First')
       const itemContainer = item.closest('div.group')
       expect(itemContainer).not.toBeNull()
-      const actionButtons = itemContainer!.querySelectorAll('div.h-6.w-6')
-      expect(actionButtons).toHaveLength(2)
-      fireEvent.click(actionButtons[0]!)
+      fireEvent.click(within(itemContainer as HTMLElement).getByRole('button', { name: 'common.operation.edit' }))
 
       const inputs = await screen.findAllByPlaceholderText('appDebug.variableConfig.inputPlaceholder')
       fireEvent.change(inputs[1]!, { target: { value: 'Second' } })
@@ -318,7 +312,7 @@ describe('ConfigVar', () => {
         onPromptVariablesChange,
       })
 
-      const removeBtn = screen.getByTestId('var-item-delete-btn')
+      const removeBtn = screen.getByRole('button', { name: 'common.operation.delete' })
       fireEvent.click(removeBtn)
 
       expect(onPromptVariablesChange).toHaveBeenCalledWith([])
@@ -343,7 +337,7 @@ describe('ConfigVar', () => {
         },
       )
 
-      const deleteBtn = screen.getByTestId('var-item-delete-btn')
+      const deleteBtn = screen.getByRole('button', { name: 'common.operation.delete' })
       fireEvent.click(deleteBtn)
       // confirmation modal should show up
       fireEvent.click(screen.getByRole('button', { name: 'common.operation.confirm' }))
@@ -411,8 +405,7 @@ describe('ConfigVar', () => {
       const itemContainer = item.closest('div.group')
       expect(itemContainer).not.toBeNull()
 
-      const actionButtons = itemContainer!.querySelectorAll('div.h-6.w-6')
-      fireEvent.click(actionButtons[0]!)
+      fireEvent.click(within(itemContainer as HTMLElement).getByRole('button', { name: 'common.operation.edit' }))
 
       const modalState = setShowExternalDataToolModal.mock.calls.at(-1)?.[0]
 
@@ -460,8 +453,7 @@ describe('ConfigVar', () => {
       const itemContainer = item.closest('div.group')
       expect(itemContainer).not.toBeNull()
 
-      const actionButtons = itemContainer!.querySelectorAll('div.h-6.w-6')
-      fireEvent.click(actionButtons[0]!)
+      fireEvent.click(within(itemContainer as HTMLElement).getByRole('button', { name: 'common.operation.edit' }))
 
       const modalState = setShowExternalDataToolModal.mock.calls.at(-1)?.[0]
 
diff --git a/web/app/components/app/configuration/config-var/__tests__/select-var-type.spec.tsx b/web/app/components/app/configuration/config-var/__tests__/select-var-type.spec.tsx
index 611aaa1c8a..42d0de5ed7 100644
--- a/web/app/components/app/configuration/config-var/__tests__/select-var-type.spec.tsx
+++ b/web/app/components/app/configuration/config-var/__tests__/select-var-type.spec.tsx
@@ -1,8 +1,8 @@
-import { fireEvent, render, screen } from '@testing-library/react'
+import { fireEvent, render, screen, waitFor } from '@testing-library/react'
 import SelectVarType from '../select-var-type'
 
 describe('SelectVarType', () => {
-  it('should open the menu and return the selected variable type', () => {
+  it('should open the menu and return the selected variable type', async () => {
     const onChange = vi.fn()
 
     render(<SelectVarType onChange={onChange} />)
@@ -11,6 +11,8 @@ describe('SelectVarType', () => {
     fireEvent.click(screen.getByText('appDebug.variableConfig.checkbox'))
 
     expect(onChange).toHaveBeenCalledWith('checkbox')
-    expect(screen.queryByText('appDebug.variableConfig.checkbox')).not.toBeInTheDocument()
+    await waitFor(() => {
+      expect(screen.queryByText('appDebug.variableConfig.checkbox')).not.toBeInTheDocument()
+    })
   })
 })
diff --git a/web/app/components/app/configuration/config-var/__tests__/var-item.spec.tsx b/web/app/components/app/configuration/config-var/__tests__/var-item.spec.tsx
index aae00bb2b7..6f4fe5f11a 100644
--- a/web/app/components/app/configuration/config-var/__tests__/var-item.spec.tsx
+++ b/web/app/components/app/configuration/config-var/__tests__/var-item.spec.tsx
@@ -39,7 +39,7 @@ describe('VarItem', () => {
       />,
     )
 
-    fireEvent.click(screen.getByTestId('var-item-delete-btn'))
+    fireEvent.click(screen.getByRole('button', { name: 'common.operation.delete' }))
 
     expect(onRemove).toHaveBeenCalledTimes(1)
   })
diff --git a/web/app/components/app/configuration/config-var/config-modal/__tests__/form-fields.spec.tsx b/web/app/components/app/configuration/config-var/config-modal/__tests__/form-fields.spec.tsx
index 7a63df3350..7a77821c18 100644
--- a/web/app/components/app/configuration/config-var/config-modal/__tests__/form-fields.spec.tsx
+++ b/web/app/components/app/configuration/config-var/config-modal/__tests__/form-fields.spec.tsx
@@ -4,6 +4,29 @@ import { fireEvent, render, screen } from '@testing-library/react'
 import { InputVarType } from '@/app/components/workflow/types'
 import ConfigModalFormFields from '../form-fields'
 
+vi.mock('react-i18next', async () => {
+  const React = await import('react')
+  return {
+    useTranslation: () => ({
+      t: (key: string, options?: Record<string, unknown>) => {
+        const ns = options?.ns as string | undefined
+        return ns ? `${ns}.${key}` : key
+      },
+      i18n: { language: 'en', changeLanguage: vi.fn() },
+    }),
+    Trans: ({ i18nKey, components }: { i18nKey: string, components?: Record<string, ReactNode> }) => (
+      <span data-i18n-key={i18nKey}>
+        {i18nKey}
+        {components?.docLink}
+      </span>
+    ),
+  }
+})
+
+vi.mock('@/context/i18n', () => ({
+  useDocLink: () => (path?: string) => `https://docs.example.com${path || ''}`,
+}))
+
 vi.mock('@/app/components/base/file-uploader', () => ({
   FileUploaderInAttachmentWrapper: ({
     onChange,
@@ -47,12 +70,6 @@ vi.mock('@/app/components/workflow/nodes/_base/components/editor/code-editor', (
   ),
 }))
 
-vi.mock('@/app/components/base/checkbox', () => ({
-  default: ({ onCheck, checked }: { onCheck: () => void, checked: boolean }) => (
-    <button type="button" onClick={onCheck}>{checked ? 'checked' : 'unchecked'}</button>
-  ),
-}))
-
 vi.mock('@langgenius/dify-ui/select', async (importOriginal) => {
   const actual = await importOriginal<typeof import('@langgenius/dify-ui/select')>()
 
@@ -74,6 +91,12 @@ vi.mock('@langgenius/dify-ui/select', async (importOriginal) => {
   }
 })
 
+vi.mock('@langgenius/dify-ui/tooltip', () => ({
+  Tooltip: ({ children }: { children: ReactNode }) => <div>{children}</div>,
+  TooltipTrigger: ({ children }: { children: ReactNode }) => <div>{children}</div>,
+  TooltipContent: ({ children }: { children: ReactNode }) => <div>{children}</div>,
+}))
+
 vi.mock('../field', () => ({
   default: ({ children, title }: { children: ReactNode, title: string }) => (
     <div>
@@ -176,7 +199,18 @@ describe('ConfigModalFormFields', () => {
     expect(selectProps.payloadChangeHandlers.default).toHaveBeenCalledWith('beta')
   })
 
-  it('should wire file, json schema, and visibility controls', () => {
+  it('should wire file, json schema, and visibility controls', async () => {
+    const textInputProps = createBaseProps()
+    const textInputView = render(<ConfigModalFormFields {...textInputProps} />)
+    expect(screen.getByText('variableConfig.hidden')).toBeInTheDocument()
+    fireEvent.click(screen.getByRole('button', { name: 'variableConfig.hiddenDescription' }))
+    expect(await screen.findByText('variableConfig.hiddenDescription')).toBeInTheDocument()
+    const docLink = await screen.findByRole('link')
+    expect(docLink).toHaveAttribute('href', 'https://docs.example.com/use-dify/nodes/user-input#hide-and-pre-fill-input-fields')
+    expect(docLink).toHaveAttribute('target', '_blank')
+    expect(docLink).toHaveAttribute('rel', 'noopener noreferrer')
+    textInputView.unmount()
+
     const singleFileProps = createBaseProps()
     singleFileProps.tempPayload = {
       ...singleFileProps.tempPayload,
@@ -185,18 +219,20 @@ describe('ConfigModalFormFields', () => {
       allowed_file_extensions: [],
       allowed_file_upload_methods: ['remote_url'],
     }
-    render(<ConfigModalFormFields {...singleFileProps} />)
+    const singleFileView = render(<ConfigModalFormFields {...singleFileProps} />)
+    expect(screen.queryByText('variableConfig.hidden')).not.toBeInTheDocument()
+    expect(screen.queryByText('variableConfig.hiddenDescription')).not.toBeInTheDocument()
     fireEvent.click(screen.getByText('single-file-setting'))
     fireEvent.click(screen.getByText('upload-file'))
-    fireEvent.click(screen.getAllByText('unchecked')[0]!)
-    fireEvent.click(screen.getAllByText('unchecked')[1]!)
+    fireEvent.click(screen.getByRole('checkbox', { name: 'variableConfig.required' }))
 
     expect(singleFileProps.onFilePayloadChange).toHaveBeenCalledWith({ number_limits: 1 })
     expect(singleFileProps.payloadChangeHandlers.default).toHaveBeenCalledWith(expect.objectContaining({
       fileId: 'file-1',
     }))
     expect(singleFileProps.payloadChangeHandlers.required).toHaveBeenCalledWith(true)
-    expect(singleFileProps.payloadChangeHandlers.hide).toHaveBeenCalledWith(true)
+    expect(singleFileProps.payloadChangeHandlers.hide).not.toHaveBeenCalled()
+    singleFileView.unmount()
 
     const multiFileProps = createBaseProps()
     multiFileProps.tempPayload = {
@@ -207,8 +243,9 @@ describe('ConfigModalFormFields', () => {
       allowed_file_upload_methods: ['remote_url'],
     }
     render(<ConfigModalFormFields {...multiFileProps} />)
+    expect(screen.queryByText('variableConfig.hidden')).not.toBeInTheDocument()
     fireEvent.click(screen.getByText('multi-file-setting'))
-    fireEvent.click(screen.getAllByText('upload-file')[1]!)
+    fireEvent.click(screen.getAllByText('upload-file')[0]!)
     expect(multiFileProps.onFilePayloadChange).toHaveBeenCalledWith({ number_limits: 3 })
     expect(multiFileProps.payloadChangeHandlers.default).toHaveBeenCalledWith([
       expect.objectContaining({ fileId: 'file-1' }),
@@ -367,4 +404,20 @@ describe('ConfigModalFormFields', () => {
 
     expect(screen.getByRole('spinbutton')).toHaveValue(null)
   })
+
+  it('should disable hide checkbox when required is true and disable required when hide is true', () => {
+    const requiredProps = createBaseProps()
+    requiredProps.tempPayload = { ...requiredProps.tempPayload, type: InputVarType.textInput, required: true, hide: false }
+    const { unmount } = render(<ConfigModalFormFields {...requiredProps} />)
+
+    expect(screen.getByRole('checkbox', { name: 'variableConfig.hidden' })).toHaveAttribute('aria-disabled', 'true')
+    unmount()
+
+    const hideProps = createBaseProps()
+    hideProps.tempPayload = { ...hideProps.tempPayload, type: InputVarType.textInput, required: false, hide: true }
+    render(<ConfigModalFormFields {...hideProps} />)
+
+    expect(screen.getByRole('checkbox', { name: 'variableConfig.required' })).toHaveAttribute('aria-disabled', 'true')
+    expect(screen.getByRole('checkbox', { name: 'variableConfig.hidden' })).toHaveAttribute('aria-checked', 'true')
+  })
 })
diff --git a/web/app/components/app/configuration/config-var/config-modal/__tests__/index-logic.spec.tsx b/web/app/components/app/configuration/config-var/config-modal/__tests__/index-logic.spec.tsx
index e6cb56f490..d32bcec755 100644
--- a/web/app/components/app/configuration/config-var/config-modal/__tests__/index-logic.spec.tsx
+++ b/web/app/components/app/configuration/config-var/config-modal/__tests__/index-logic.spec.tsx
@@ -25,6 +25,7 @@ vi.mock('../form-fields', () => ({
     return (
       <div data-testid="config-form-fields">
         <div data-testid="payload-type">{String(props.tempPayload.type)}</div>
+        <div data-testid="payload-hide">{String(props.tempPayload.hide)}</div>
         <div data-testid="payload-label">{String(props.tempPayload.label ?? '')}</div>
         <div data-testid="payload-schema">{String(props.tempPayload.json_schema ?? '')}</div>
         <div data-testid="payload-default">{String(props.tempPayload.default ?? '')}</div>
@@ -115,7 +116,7 @@ describe('ConfigModal logic', () => {
   })
 
   it('should derive payload fields from mocked form-field callbacks', async () => {
-    renderConfigModal()
+    renderConfigModal(createPayload({ hide: true }))
 
     fireEvent.click(screen.getByTestId('valid-key-blur'))
     await waitFor(() => {
@@ -138,6 +139,7 @@ describe('ConfigModal logic', () => {
     fireEvent.click(screen.getByTestId('type-change'))
     await waitFor(() => {
       expect(screen.getByTestId('payload-type')).toHaveTextContent(InputVarType.singleFile)
+      expect(screen.getByTestId('payload-hide')).toHaveTextContent('false')
     })
 
     fireEvent.click(screen.getByTestId('file-payload-change'))
diff --git a/web/app/components/app/configuration/config-var/config-modal/__tests__/index.spec.tsx b/web/app/components/app/configuration/config-var/config-modal/__tests__/index.spec.tsx
index 094a293943..a0679a0376 100644
--- a/web/app/components/app/configuration/config-var/config-modal/__tests__/index.spec.tsx
+++ b/web/app/components/app/configuration/config-var/config-modal/__tests__/index.spec.tsx
@@ -71,6 +71,25 @@ describe('ConfigModal', () => {
     }), undefined)
   })
 
+  it('should keep scrolling inside the form body so scrollbars do not cover dialog corners', () => {
+    render(
+      <ConfigModal
+        isCreate
+        isShow
+        payload={createPayload({ label: 'Question' })}
+        onClose={vi.fn()}
+        onConfirm={vi.fn()}
+      />,
+    )
+
+    const dialog = screen.getByRole('dialog')
+    const scrollArea = screen.getByTestId('config-modal-scroll-area')
+
+    expect(dialog).toHaveClass('overflow-hidden!')
+    expect(scrollArea).toHaveClass('overflow-y-auto')
+    expect(scrollArea).toHaveClass('overflow-x-hidden')
+  })
+
   it('should block save when the label is missing', () => {
     render(
       <ConfigModal
diff --git a/web/app/components/app/configuration/config-var/config-modal/__tests__/type-select.spec.tsx b/web/app/components/app/configuration/config-var/config-modal/__tests__/type-select.spec.tsx
index 2512aa93e8..f1356c9b61 100644
--- a/web/app/components/app/configuration/config-var/config-modal/__tests__/type-select.spec.tsx
+++ b/web/app/components/app/configuration/config-var/config-modal/__tests__/type-select.spec.tsx
@@ -2,13 +2,7 @@
 import { fireEvent, render, screen } from '@testing-library/react'
 import TypeSelector from '../type-select'
 
-vi.mock('@/app/components/base/portal-to-follow-elem', () => ({
-  PortalToFollowElem: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
-  PortalToFollowElemTrigger: ({ children, onClick }: { children: React.ReactNode, onClick?: () => void }) => (
-    <button type="button" onClick={onClick}>{children}</button>
-  ),
-  PortalToFollowElemContent: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
-}))
+vi.mock('@langgenius/dify-ui/select', () => import('@/__mocks__/base-ui-select'))
 
 vi.mock('@/app/components/workflow/nodes/_base/components/input-var-type-icon', () => ({
   default: ({ type }: { type: string }) => <span>{type}</span>,
diff --git a/web/app/components/app/configuration/config-var/config-modal/__tests__/utils.spec.ts b/web/app/components/app/configuration/config-var/config-modal/__tests__/utils.spec.ts
index 1c00e1c5b2..2317868004 100644
--- a/web/app/components/app/configuration/config-var/config-modal/__tests__/utils.spec.ts
+++ b/web/app/components/app/configuration/config-var/config-modal/__tests__/utils.spec.ts
@@ -49,11 +49,13 @@ describe('config-modal utils', () => {
       const payload = createInputVar({
         type: InputVarType.textInput,
         default: 'hello',
+        hide: true,
       })
 
       const nextPayload = createPayloadForType(payload, InputVarType.multiFiles)
 
       expect(nextPayload.type).toBe(InputVarType.multiFiles)
+      expect(nextPayload.hide).toBe(false)
       expect(nextPayload.max_length).toBe(DEFAULT_FILE_UPLOAD_SETTING.max_length)
       expect(nextPayload.allowed_file_types).toEqual(DEFAULT_FILE_UPLOAD_SETTING.allowed_file_types)
       expect(nextPayload.default).toBe('hello')
@@ -249,6 +251,24 @@ describe('config-modal utils', () => {
       })
     })
 
+    it('should force file inputs to stay visible when saving', () => {
+      const result = validateConfigModalPayload({
+        tempPayload: createInputVar({
+          type: InputVarType.singleFile,
+          hide: true,
+          allowed_file_types: [SupportUploadFileTypes.document],
+          allowed_file_extensions: [],
+        }),
+        payload: createInputVar(),
+        checkVariableName: () => true,
+        t,
+      })
+
+      expect(result.payloadToSave).toEqual(expect.objectContaining({
+        hide: false,
+      }))
+    })
+
     it('should stop validation when the variable name checker rejects the payload', () => {
       const result = validateConfigModalPayload({
         tempPayload: createInputVar({
diff --git a/web/app/components/app/configuration/config-var/config-modal/form-fields.tsx b/web/app/components/app/configuration/config-var/config-modal/form-fields.tsx
index 748108e19a..c932c15896 100644
--- a/web/app/components/app/configuration/config-var/config-modal/form-fields.tsx
+++ b/web/app/components/app/configuration/config-var/config-modal/form-fields.tsx
@@ -3,6 +3,7 @@ import type { ChangeEvent, FC } from 'react'
 import type { Item as SelectOptionItem } from './type-select'
 import type { FileEntity } from '@/app/components/base/file-uploader/types'
 import type { InputVar, UploadFileSetting } from '@/app/components/workflow/types'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import {
   Select,
   SelectContent,
@@ -13,14 +14,16 @@ import {
   SelectValue,
 } from '@langgenius/dify-ui/select'
 import * as React from 'react'
-import Checkbox from '@/app/components/base/checkbox'
+import { Trans } from 'react-i18next'
 import { FileUploaderInAttachmentWrapper } from '@/app/components/base/file-uploader'
+import { Infotip } from '@/app/components/base/infotip'
 import Input from '@/app/components/base/input'
 import Textarea from '@/app/components/base/textarea'
 import CodeEditor from '@/app/components/workflow/nodes/_base/components/editor/code-editor'
 import FileUploadSetting from '@/app/components/workflow/nodes/_base/components/file-upload-setting'
 import { CodeLanguage } from '@/app/components/workflow/nodes/code/types'
 import { InputVarType, SupportUploadFileTypes } from '@/app/components/workflow/types'
+import { useDocLink } from '@/context/i18n'
 import { TransferMethod } from '@/types/app'
 import ConfigSelect from '../config-select'
 import ConfigString from '../config-string'
@@ -68,6 +71,9 @@ const ConfigModalFormFields: FC<ConfigModalFormFieldsProps> = ({
   t,
 }) => {
   const { type, label, variable } = tempPayload
+  const isFileInput = [InputVarType.singleFile, InputVarType.multiFiles].includes(type)
+  const docLink = useDocLink()
+  const hiddenDescriptionAriaLabel = t('variableConfig.hiddenDescription', { ns: 'appDebug' }).replace(/<[^>]+>/g, '')
 
   return (
     <div className="space-y-2">
@@ -105,7 +111,7 @@ const ConfigModalFormFields: FC<ConfigModalFormFieldsProps> = ({
       {type === InputVarType.textInput && (
         <Field title={t('variableConfig.defaultValue', { ns: 'appDebug' })}>
           <Input
-            value={tempPayload.default || ''}
+            value={typeof tempPayload.default === 'string' ? tempPayload.default : ''}
             onChange={e => onPayloadChange('default')(e.target.value || undefined)}
             placeholder={t('variableConfig.inputPlaceholder', { ns: 'appDebug' })}
           />
@@ -126,7 +132,7 @@ const ConfigModalFormFields: FC<ConfigModalFormFieldsProps> = ({
         <Field title={t('variableConfig.defaultValue', { ns: 'appDebug' })}>
           <Input
             type="number"
-            value={tempPayload.default || ''}
+            value={typeof tempPayload.default === 'number' || typeof tempPayload.default === 'string' ? tempPayload.default : ''}
             onChange={e => onPayloadChange('default')(e.target.value || undefined)}
             placeholder={t('variableConfig.inputPlaceholder', { ns: 'appDebug' })}
           />
@@ -186,7 +192,7 @@ const ConfigModalFormFields: FC<ConfigModalFormFieldsProps> = ({
         </>
       )}
 
-      {[InputVarType.singleFile, InputVarType.multiFiles].includes(type) && (
+      {isFileInput && (
         <>
           <FileUploadSetting
             payload={tempPayload as UploadFileSetting}
@@ -226,15 +232,48 @@ const ConfigModalFormFields: FC<ConfigModalFormFieldsProps> = ({
         </Field>
       )}
 
-      <div className="mt-5! flex h-6 items-center space-x-2">
-        <Checkbox checked={tempPayload.required} disabled={tempPayload.hide} onCheck={() => onPayloadChange('required')(!tempPayload.required)} />
+      <label className="mt-5! flex h-6 items-center space-x-2">
+        <Checkbox
+          checked={tempPayload.required}
+          disabled={!isFileInput && tempPayload.hide}
+          onCheckedChange={checked => onPayloadChange('required')(checked)}
+        />
         <span className="system-sm-semibold text-text-secondary">{t('variableConfig.required', { ns: 'appDebug' })}</span>
-      </div>
+      </label>
 
-      <div className="mt-5! flex h-6 items-center space-x-2">
-        <Checkbox checked={tempPayload.hide} disabled={tempPayload.required} onCheck={() => onPayloadChange('hide')(!tempPayload.hide)} />
-        <span className="system-sm-semibold text-text-secondary">{t('variableConfig.hide', { ns: 'appDebug' })}</span>
-      </div>
+      {!isFileInput && (
+        <div className="mt-5! flex h-6 items-center gap-2">
+          <label className="flex items-center gap-2">
+            <Checkbox
+              checked={tempPayload.hide}
+              disabled={tempPayload.required}
+              onCheckedChange={checked => onPayloadChange('hide')(checked)}
+            />
+            <span className="system-sm-semibold text-text-secondary">{t('variableConfig.hidden', { ns: 'appDebug' })}</span>
+          </label>
+          <div className="flex items-center gap-1">
+            <Infotip
+              aria-label={hiddenDescriptionAriaLabel}
+              popupClassName="max-w-[300px]"
+            >
+              <Trans
+                i18nKey="variableConfig.hiddenDescription"
+                ns="appDebug"
+                components={{
+                  docLink: (
+                    <a
+                      href={docLink('/use-dify/nodes/user-input#hide-and-pre-fill-input-fields')}
+                      target="_blank"
+                      rel="noopener noreferrer"
+                      className="text-text-accent hover:underline"
+                    />
+                  ),
+                }}
+              />
+            </Infotip>
+          </div>
+        </div>
+      )}
     </div>
   )
 }
diff --git a/web/app/components/app/configuration/config-var/config-modal/index.tsx b/web/app/components/app/configuration/config-var/config-modal/index.tsx
index 824b8a8d82..7e553092c0 100644
--- a/web/app/components/app/configuration/config-var/config-modal/index.tsx
+++ b/web/app/components/app/configuration/config-var/config-modal/index.tsx
@@ -2,13 +2,13 @@
 import type { ChangeEvent, FC } from 'react'
 import type { Item as SelectItem } from './type-select'
 import type { InputVar, InputVarType, MoreInfo } from '@/app/components/workflow/types'
+import { Dialog, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
 import * as React from 'react'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useContext } from 'use-context-selector'
 import { useStore as useAppStore } from '@/app/components/app/store'
-import Modal from '@/app/components/base/modal'
 import ConfigContext from '@/context/debug-configuration'
 import { AppModeEnum } from '@/types/app'
 import { checkKeys, getNewVarInWorkflow, replaceSpaceWithUnderscoreInVarNameInput } from '@/utils/var'
@@ -141,35 +141,50 @@ const ConfigModal: FC<IConfigModalProps> = ({
   }
 
   return (
-    <Modal
-      title={t(`variableConfig.${isCreate ? 'addModalTitle' : 'editModalTitle'}`, { ns: 'appDebug' })}
-      isShow={isShow}
-      onClose={onClose}
+    <Dialog
+      open={isShow}
+      onOpenChange={(open) => {
+        if (!open)
+          onClose()
+      }}
     >
-      <div className="mb-8" ref={modalRef} tabIndex={-1}>
-        <ConfigModalFormFields
-          checkboxDefaultSelectValue={checkboxDefaultSelectValue}
-          isStringInput={isStringInput}
-          jsonSchemaStr={jsonSchemaStr}
-          maxLength={max_length}
-          modelId={modelConfig.model_id}
-          onFilePayloadChange={payload => setTempPayload(payload as InputVar)}
-          onJSONSchemaChange={handleJSONSchemaChange}
-          onPayloadChange={handlePayloadChange}
-          onTypeChange={handleTypeChange}
-          onVarKeyBlur={handleVarKeyBlur}
-          onVarNameChange={handleVarNameChange}
-          options={options}
-          selectOptions={selectOptions}
-          tempPayload={tempPayload}
-          t={t}
-        />
-      </div>
-      <ModalFoot
-        onConfirm={handleConfirm}
-        onCancel={onClose}
-      />
-    </Modal>
+      <DialogContent className="flex max-h-[calc(100dvh-2rem)] flex-col overflow-hidden! border-none p-0! text-left align-middle">
+        <DialogTitle className="shrink-0 px-6 pt-6 title-2xl-semi-bold text-text-primary">
+          {t(`variableConfig.${isCreate ? 'addModalTitle' : 'editModalTitle'}`, { ns: 'appDebug' })}
+        </DialogTitle>
+
+        <div
+          ref={modalRef}
+          tabIndex={-1}
+          data-testid="config-modal-scroll-area"
+          className="min-h-0 min-w-0 flex-1 overflow-x-hidden overflow-y-auto px-6 py-4 pb-8"
+        >
+          <ConfigModalFormFields
+            checkboxDefaultSelectValue={checkboxDefaultSelectValue}
+            isStringInput={isStringInput}
+            jsonSchemaStr={jsonSchemaStr}
+            maxLength={max_length}
+            modelId={modelConfig.model_id}
+            onFilePayloadChange={payload => setTempPayload(payload as InputVar)}
+            onJSONSchemaChange={handleJSONSchemaChange}
+            onPayloadChange={handlePayloadChange}
+            onTypeChange={handleTypeChange}
+            onVarKeyBlur={handleVarKeyBlur}
+            onVarNameChange={handleVarNameChange}
+            options={options}
+            selectOptions={selectOptions}
+            tempPayload={tempPayload}
+            t={t}
+          />
+        </div>
+        <div className="shrink-0 px-6 pt-2 pb-6">
+          <ModalFoot
+            onConfirm={handleConfirm}
+            onCancel={onClose}
+          />
+        </div>
+      </DialogContent>
+    </Dialog>
   )
 }
 export default React.memo(ConfigModal)
diff --git a/web/app/components/app/configuration/config-var/config-modal/type-select.tsx b/web/app/components/app/configuration/config-var/config-modal/type-select.tsx
index 5fd7c88b82..acd3253f6b 100644
--- a/web/app/components/app/configuration/config-var/config-modal/type-select.tsx
+++ b/web/app/components/app/configuration/config-var/config-modal/type-select.tsx
@@ -1,16 +1,17 @@
 'use client'
 import type { FC } from 'react'
 import type { InputVarType } from '@/app/components/workflow/types'
-import { ChevronDownIcon } from '@heroicons/react/20/solid'
 import { cn } from '@langgenius/dify-ui/cn'
-import * as React from 'react'
-import { useState } from 'react'
-import Badge from '@/app/components/base/badge'
 import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectItemIndicator,
+  SelectItemText,
+  SelectTrigger,
+} from '@langgenius/dify-ui/select'
+import * as React from 'react'
+import Badge from '@/app/components/base/badge'
 import InputVarTypeIcon from '@/app/components/workflow/nodes/_base/components/input-var-type-icon'
 import { inputVarTypeToVarType } from '@/app/components/workflow/nodes/_base/components/variable/utils'
 
@@ -35,21 +36,26 @@ const TypeSelector: FC<Props> = ({
   popupInnerClassName,
   readonly,
 }) => {
-  const [open, setOpen] = useState(false)
   const selectedItem = value ? items.find(item => item.value === value) : undefined
 
   return (
-    <PortalToFollowElem
-      open={open}
-      onOpenChange={setOpen}
-      placement="bottom-start"
-      offset={4}
+    <Select
+      value={selectedItem?.value}
+      readOnly={readonly}
+      onValueChange={(nextValue) => {
+        const selected = items.find(item => item.value === nextValue)
+        if (selected)
+          onSelect(selected)
+      }}
     >
-      <PortalToFollowElemTrigger onClick={() => !readonly && setOpen(v => !v)} className="w-full">
-        <div
-          className={cn(`group flex h-9 items-center justify-between rounded-lg border-0 bg-components-input-bg-normal px-2 text-sm hover:bg-state-base-hover-alt ${readonly ? 'cursor-not-allowed' : 'cursor-pointer'}`)}
-          title={selectedItem?.name}
-        >
+      <SelectTrigger
+        className={cn(
+          'h-9 rounded-lg px-2 text-sm',
+          readonly ? 'cursor-not-allowed' : 'cursor-pointer',
+        )}
+        title={selectedItem?.name}
+      >
+        <div className="flex min-w-0 items-center justify-between">
           <div className="flex items-center">
             <InputVarTypeIcon type={selectedItem?.value as InputVarType} className="size-4 shrink-0 text-text-secondary" />
             <span
@@ -60,37 +66,35 @@ const TypeSelector: FC<Props> = ({
               {selectedItem?.name}
             </span>
           </div>
-          <div className="flex items-center space-x-1">
+          <div className="ml-2 flex shrink-0 items-center space-x-1">
             <Badge uppercase={false}>{inputVarTypeToVarType(selectedItem?.value as InputVarType)}</Badge>
-            <ChevronDownIcon className={cn('h-4 w-4 shrink-0 text-text-quaternary group-hover:text-text-secondary', open && 'text-text-secondary')} />
           </div>
         </div>
-
-      </PortalToFollowElemTrigger>
-      <PortalToFollowElemContent className="z-61">
-        <div
-          className={cn('w-[432px] rounded-md border-[0.5px] border-components-panel-border bg-components-panel-bg px-1 py-1 text-base shadow-lg focus:outline-hidden sm:text-sm', popupInnerClassName)}
-        >
-          {items.map((item: Item) => (
-            <div
-              key={item.value}
-              className="flex h-9 cursor-pointer items-center justify-between rounded-lg px-2 text-text-secondary hover:bg-state-base-hover"
-              title={item.name}
-              onClick={() => {
-                onSelect(item)
-                setOpen(false)
-              }}
+      </SelectTrigger>
+      <SelectContent
+        sideOffset={4}
+        popupClassName={cn('w-[432px] rounded-md px-1 py-1 text-base sm:text-sm', popupInnerClassName)}
+        listClassName="max-h-80 p-0"
+      >
+        {items.map((item: Item) => (
+          <SelectItem
+            key={item.value}
+            value={item.value}
+            className="h-9 justify-between px-2 text-text-secondary"
+            title={item.name}
+          >
+            <SelectItemText
+              className="flex items-center space-x-2 px-0"
             >
-              <div className="flex items-center space-x-2">
-                <InputVarTypeIcon type={item.value} className="size-4 shrink-0 text-text-secondary" />
-                <span title={item.name}>{item.name}</span>
-              </div>
-              <Badge uppercase={false}>{inputVarTypeToVarType(item.value)}</Badge>
-            </div>
-          ))}
-        </div>
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
+              <InputVarTypeIcon type={item.value} className="size-4 shrink-0 text-text-secondary" />
+              <span title={item.name}>{item.name}</span>
+            </SelectItemText>
+            <Badge uppercase={false}>{inputVarTypeToVarType(item.value)}</Badge>
+            <SelectItemIndicator />
+          </SelectItem>
+        ))}
+      </SelectContent>
+    </Select>
   )
 }
 
diff --git a/web/app/components/app/configuration/config-var/config-modal/utils.ts b/web/app/components/app/configuration/config-var/config-modal/utils.ts
index fdc0ac3501..e24e4b6593 100644
--- a/web/app/components/app/configuration/config-var/config-modal/utils.ts
+++ b/web/app/components/app/configuration/config-var/config-modal/utils.ts
@@ -88,7 +88,9 @@ export const createPayloadForType = (payload: InputVar, type: InputVarType) => {
       draft.default = undefined
 
     if ([InputVarType.singleFile, InputVarType.multiFiles].includes(type)) {
-      (Object.keys(DEFAULT_FILE_UPLOAD_SETTING) as Array<keyof typeof DEFAULT_FILE_UPLOAD_SETTING>).forEach((key) => {
+      draft.hide = false
+      const fileUploadSettingKeys = Object.keys(DEFAULT_FILE_UPLOAD_SETTING) as Array<keyof typeof DEFAULT_FILE_UPLOAD_SETTING>
+      fileUploadSettingKeys.forEach((key) => {
         if (key !== 'max_length')
           draft[key] = DEFAULT_FILE_UPLOAD_SETTING[key] as never
       })
@@ -158,38 +160,41 @@ export const validateConfigModalPayload = ({
   checkVariableName,
   t,
 }: ValidateConfigModalPayloadOptions): ValidateConfigModalPayloadResult => {
+  const normalizedTempPayload = [InputVarType.singleFile, InputVarType.multiFiles].includes(tempPayload.type)
+    ? { ...tempPayload, hide: false }
+    : tempPayload
   const jsonSchemaValue = tempPayload.json_schema
   const schemaEmpty = isJsonSchemaEmpty(jsonSchemaValue)
   const normalizedJsonSchema = schemaEmpty ? undefined : jsonSchemaValue
-  const payloadToSave = tempPayload.type === InputVarType.jsonObject && schemaEmpty
-    ? { ...tempPayload, json_schema: undefined }
-    : tempPayload
+  const payloadToSave = normalizedTempPayload.type === InputVarType.jsonObject && schemaEmpty
+    ? { ...normalizedTempPayload, json_schema: undefined }
+    : normalizedTempPayload
 
-  const moreInfo = tempPayload.variable === payload?.variable
+  const moreInfo = normalizedTempPayload.variable === payload?.variable
     ? undefined
     : {
         type: ChangeType.changeVarName,
-        payload: { beforeKey: payload?.variable || '', afterKey: tempPayload.variable },
+        payload: { beforeKey: payload?.variable || '', afterKey: normalizedTempPayload.variable },
       }
 
-  if (!checkVariableName(tempPayload.variable))
+  if (!checkVariableName(normalizedTempPayload.variable))
     return {}
 
-  if (!tempPayload.label) {
+  if (!normalizedTempPayload.label) {
     return {
       errorMessage: t('variableConfig.errorMsg.labelNameRequired', { ns: 'appDebug' }),
     }
   }
 
-  if (tempPayload.type === InputVarType.select) {
-    if (!tempPayload.options?.length) {
+  if (normalizedTempPayload.type === InputVarType.select) {
+    if (!normalizedTempPayload.options?.length) {
       return {
         errorMessage: t('variableConfig.errorMsg.atLeastOneOption', { ns: 'appDebug' }),
       }
     }
 
     const duplicated = new Set<string>()
-    const hasRepeatedItem = tempPayload.options.some((option) => {
+    const hasRepeatedItem = normalizedTempPayload.options.some((option) => {
       if (duplicated.has(option))
         return true
 
@@ -204,8 +209,8 @@ export const validateConfigModalPayload = ({
     }
   }
 
-  if ([InputVarType.singleFile, InputVarType.multiFiles].includes(tempPayload.type)) {
-    if (!tempPayload.allowed_file_types?.length) {
+  if ([InputVarType.singleFile, InputVarType.multiFiles].includes(normalizedTempPayload.type)) {
+    if (!normalizedTempPayload.allowed_file_types?.length) {
       return {
         errorMessage: t('errorMsg.fieldRequired', {
           ns: 'workflow',
@@ -214,7 +219,7 @@ export const validateConfigModalPayload = ({
       }
     }
 
-    if (tempPayload.allowed_file_types.includes(SupportUploadFileTypes.custom) && !tempPayload.allowed_file_extensions?.length) {
+    if (normalizedTempPayload.allowed_file_types.includes(SupportUploadFileTypes.custom) && !normalizedTempPayload.allowed_file_extensions?.length) {
       return {
         errorMessage: t('errorMsg.fieldRequired', {
           ns: 'workflow',
@@ -224,7 +229,7 @@ export const validateConfigModalPayload = ({
     }
   }
 
-  if (tempPayload.type === InputVarType.jsonObject && !schemaEmpty && typeof normalizedJsonSchema === 'string') {
+  if (normalizedTempPayload.type === InputVarType.jsonObject && !schemaEmpty && typeof normalizedJsonSchema === 'string') {
     try {
       const schema = JSON.parse(normalizedJsonSchema)
       if (schema?.type !== 'object') {
diff --git a/web/app/components/app/configuration/config-var/config-select/__tests__/index.spec.tsx b/web/app/components/app/configuration/config-var/config-select/__tests__/index.spec.tsx
index 337b3bfe1c..24517eb341 100644
--- a/web/app/components/app/configuration/config-var/config-select/__tests__/index.spec.tsx
+++ b/web/app/components/app/configuration/config-var/config-select/__tests__/index.spec.tsx
@@ -44,12 +44,7 @@ describe('ConfigSelect Component', () => {
 
   it('handles option deletion', () => {
     render(<ConfigSelect {...defaultProps} />)
-    const optionContainer = screen.getByDisplayValue('Option 1').closest('div')
-    const deleteButton = optionContainer?.querySelector('div[role="button"]')
-
-    if (!deleteButton)
-      return
-    fireEvent.click(deleteButton)
+    fireEvent.click(screen.getAllByRole('button', { name: 'common.operation.delete' })[0]!)
     expect(defaultProps.onChange).toHaveBeenCalledWith(['Option 2'])
   })
 
@@ -86,7 +81,7 @@ describe('ConfigSelect Component', () => {
   it('applies delete hover styles', () => {
     render(<ConfigSelect {...defaultProps} />)
     const optionContainer = screen.getByDisplayValue('Option 1').closest('div')
-    const deleteButton = optionContainer?.querySelector('div[role="button"]')
+    const deleteButton = screen.getAllByRole('button', { name: 'common.operation.delete' })[0]
 
     if (!deleteButton)
       return
diff --git a/web/app/components/app/configuration/config-var/config-select/index.tsx b/web/app/components/app/configuration/config-var/config-select/index.tsx
index 24bc3b4a06..42878852d9 100644
--- a/web/app/components/app/configuration/config-var/config-select/index.tsx
+++ b/web/app/components/app/configuration/config-var/config-select/index.tsx
@@ -67,9 +67,10 @@ const ConfigSelect: FC<IConfigSelectProps> = ({
                   onFocus={() => setFocusID(index)}
                   onBlur={() => setFocusID(null)}
                 />
-                <div
-                  role="button"
-                  className="absolute top-1/2 right-1.5 block translate-y-[-50%] cursor-pointer rounded-md p-1 text-text-tertiary hover:bg-state-destructive-hover hover:text-text-destructive"
+                <button
+                  type="button"
+                  aria-label={t('operation.delete', { ns: 'common' })}
+                  className="absolute top-1/2 right-1.5 block translate-y-[-50%] cursor-pointer rounded-md border-none bg-transparent p-1 text-text-tertiary hover:bg-state-destructive-hover hover:text-text-destructive focus-visible:ring-1 focus-visible:ring-state-destructive-border focus-visible:outline-hidden"
                   onClick={() => {
                     onChange(options.filter((_, i) => index !== i))
                     setDeletingID(null)
@@ -77,8 +78,8 @@ const ConfigSelect: FC<IConfigSelectProps> = ({
                   onMouseEnter={() => setDeletingID(index)}
                   onMouseLeave={() => setDeletingID(null)}
                 >
-                  <RiDeleteBinLine className="h-3.5 w-3.5" />
-                </div>
+                  <RiDeleteBinLine className="h-3.5 w-3.5" aria-hidden="true" />
+                </button>
               </div>
             ))}
           </ReactSortable>
diff --git a/web/app/components/app/configuration/config-var/index.tsx b/web/app/components/app/configuration/config-var/index.tsx
index 34c6bf5786..7c9ae5bea3 100644
--- a/web/app/components/app/configuration/config-var/index.tsx
+++ b/web/app/components/app/configuration/config-var/index.tsx
@@ -22,7 +22,7 @@ import { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { ReactSortable } from 'react-sortablejs'
 import { useContext } from 'use-context-selector'
-import Tooltip from '@/app/components/base/tooltip'
+import { Infotip } from '@/app/components/base/infotip'
 import { InputVarType } from '@/app/components/workflow/types'
 import ConfigContext from '@/context/debug-configuration'
 import { useEventEmitterContextContext } from '@/context/event-emitter'
@@ -257,13 +257,9 @@ const ConfigVar: FC<IConfigVarProps> = ({ promptVariables, readonly, onPromptVar
         <div className="flex items-center">
           <div className="mr-1">{t('variableTitle', { ns: 'appDebug' })}</div>
           {!readonly && (
-            <Tooltip
-              popupContent={(
-                <div className="w-[180px]">
-                  {t('variableTip', { ns: 'appDebug' })}
-                </div>
-              )}
-            />
+            <Infotip aria-label={t('variableTip', { ns: 'appDebug' })} popupClassName="w-[180px]">
+              {t('variableTip', { ns: 'appDebug' })}
+            </Infotip>
           )}
         </div>
       )}
diff --git a/web/app/components/app/configuration/config-var/select-var-type.tsx b/web/app/components/app/configuration/config-var/select-var-type.tsx
index fc59bcd54b..4d3a96775c 100644
--- a/web/app/components/app/configuration/config-var/select-var-type.tsx
+++ b/web/app/components/app/configuration/config-var/select-var-type.tsx
@@ -1,15 +1,16 @@
 'use client'
 import type { FC } from 'react'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger,
+} from '@langgenius/dify-ui/dropdown-menu'
 import * as React from 'react'
-import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import OperationBtn from '@/app/components/app/configuration/base/operation-btn'
 import { ApiConnection } from '@/app/components/base/icons/src/vender/solid/development'
-import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
 import InputVarTypeIcon from '@/app/components/workflow/nodes/_base/components/input-var-type-icon'
 import { InputVarType } from '@/app/components/workflow/types'
 
@@ -27,13 +28,14 @@ type ItemProps = {
 
 const SelectItem: FC<ItemProps> = ({ text, type, value, Icon, onClick }) => {
   return (
-    <div
-      className="flex h-8 cursor-pointer items-center rounded-lg px-3 hover:bg-state-base-hover"
+    <DropdownMenuItem
+      closeOnClick
+      className="h-8 rounded-lg px-3 text-text-primary"
       onClick={() => onClick(value)}
     >
       {Icon ? <Icon className="h-4 w-4 text-text-secondary" /> : <InputVarTypeIcon type={type!} className="h-4 w-4 text-text-secondary" />}
       <div className="ml-2 truncate text-xs text-text-primary">{text}</div>
-    </div>
+    </DropdownMenuItem>
   )
 }
 
@@ -41,40 +43,36 @@ const SelectVarType: FC<Props> = ({
   onChange,
 }) => {
   const { t } = useTranslation()
-  const [open, setOpen] = useState(false)
   const handleChange = (value: string) => {
     onChange(value)
-    setOpen(false)
   }
   return (
-    <PortalToFollowElem
-      open={open}
-      onOpenChange={setOpen}
-      placement="bottom-end"
-      offset={{
-        mainAxis: 8,
-        crossAxis: -2,
-      }}
-    >
-      <PortalToFollowElemTrigger onClick={() => setOpen(v => !v)}>
+    <DropdownMenu>
+      <DropdownMenuTrigger
+        nativeButton={false}
+        render={<div className="block" />}
+      >
         <OperationBtn type="add" />
-      </PortalToFollowElemTrigger>
-      <PortalToFollowElemContent style={{ zIndex: 1000 }}>
-        <div className="min-w-[192px] rounded-lg border border-components-panel-border bg-components-panel-bg-blur shadow-lg backdrop-blur-xs">
-          <div className="p-1">
-            <SelectItem type={InputVarType.textInput} value="string" text={t('variableConfig.string', { ns: 'appDebug' })} onClick={handleChange}></SelectItem>
-            <SelectItem type={InputVarType.paragraph} value="paragraph" text={t('variableConfig.paragraph', { ns: 'appDebug' })} onClick={handleChange}></SelectItem>
-            <SelectItem type={InputVarType.select} value="select" text={t('variableConfig.select', { ns: 'appDebug' })} onClick={handleChange}></SelectItem>
-            <SelectItem type={InputVarType.number} value="number" text={t('variableConfig.number', { ns: 'appDebug' })} onClick={handleChange}></SelectItem>
-            <SelectItem type={InputVarType.checkbox} value="checkbox" text={t('variableConfig.checkbox', { ns: 'appDebug' })} onClick={handleChange}></SelectItem>
-          </div>
-          <div className="h-px border-t border-components-panel-border"></div>
-          <div className="p-1">
-            <SelectItem Icon={ApiConnection} value="api" text={t('variableConfig.apiBasedVar', { ns: 'appDebug' })} onClick={handleChange}></SelectItem>
-          </div>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent
+        placement="bottom-end"
+        sideOffset={8}
+        alignOffset={-2}
+        popupClassName="min-w-[192px] rounded-lg border bg-components-panel-bg-blur p-0 backdrop-blur-xs"
+      >
+        <div className="p-1">
+          <SelectItem type={InputVarType.textInput} value="string" text={t('variableConfig.string', { ns: 'appDebug' })} onClick={handleChange}></SelectItem>
+          <SelectItem type={InputVarType.paragraph} value="paragraph" text={t('variableConfig.paragraph', { ns: 'appDebug' })} onClick={handleChange}></SelectItem>
+          <SelectItem type={InputVarType.select} value="select" text={t('variableConfig.select', { ns: 'appDebug' })} onClick={handleChange}></SelectItem>
+          <SelectItem type={InputVarType.number} value="number" text={t('variableConfig.number', { ns: 'appDebug' })} onClick={handleChange}></SelectItem>
+          <SelectItem type={InputVarType.checkbox} value="checkbox" text={t('variableConfig.checkbox', { ns: 'appDebug' })} onClick={handleChange}></SelectItem>
         </div>
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
+        <DropdownMenuSeparator className="my-0" />
+        <div className="p-1">
+          <SelectItem Icon={ApiConnection} value="api" text={t('variableConfig.apiBasedVar', { ns: 'appDebug' })} onClick={handleChange}></SelectItem>
+        </div>
+      </DropdownMenuContent>
+    </DropdownMenu>
   )
 }
 export default React.memo(SelectVarType)
diff --git a/web/app/components/app/configuration/config-var/var-item.tsx b/web/app/components/app/configuration/config-var/var-item.tsx
index 80c0bf6ac6..17568683d2 100644
--- a/web/app/components/app/configuration/config-var/var-item.tsx
+++ b/web/app/components/app/configuration/config-var/var-item.tsx
@@ -9,6 +9,7 @@ import {
 } from '@remixicon/react'
 import * as React from 'react'
 import { useState } from 'react'
+import { useTranslation } from 'react-i18next'
 import Badge from '@/app/components/base/badge'
 import { BracketsX as VarIcon } from '@/app/components/base/icons/src/vender/line/development'
 import IconTypeIcon from './input-type-icon'
@@ -36,6 +37,7 @@ const VarItem: FC<ItemProps> = ({
   onRemove,
   canDrag,
 }) => {
+  const { t } = useTranslation()
   const [isDeleting, setIsDeleting] = useState(false)
 
   return (
@@ -58,21 +60,24 @@ const VarItem: FC<ItemProps> = ({
           <IconTypeIcon type={type as IInputTypeIconProps['type']} className="text-text-tertiary" />
         </div>
         <div className={cn('hidden items-center justify-end rounded-lg', !readonly && 'group-hover:flex')}>
-          <div
-            className="mr-1 flex h-6 w-6 cursor-pointer items-center justify-center rounded-md hover:bg-black/5"
+          <button
+            type="button"
+            aria-label={t('operation.edit', { ns: 'common' })}
+            className="mr-1 flex h-6 w-6 cursor-pointer items-center justify-center rounded-md border-none bg-transparent p-0 hover:bg-black/5 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
             onClick={onEdit}
           >
-            <RiEditLine className="h-4 w-4 text-text-tertiary" />
-          </div>
-          <div
-            data-testid="var-item-delete-btn"
-            className="flex h-6 w-6 cursor-pointer items-center justify-center text-text-tertiary hover:text-text-destructive"
+            <RiEditLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
+          </button>
+          <button
+            type="button"
+            aria-label={t('operation.delete', { ns: 'common' })}
+            className="flex h-6 w-6 cursor-pointer items-center justify-center border-none bg-transparent p-0 text-text-tertiary hover:text-text-destructive focus-visible:ring-1 focus-visible:ring-state-destructive-border focus-visible:outline-hidden"
             onClick={onRemove}
             onMouseOver={() => setIsDeleting(true)}
             onMouseLeave={() => setIsDeleting(false)}
           >
-            <RiDeleteBinLine className="h-4 w-4" />
-          </div>
+            <RiDeleteBinLine className="h-4 w-4" aria-hidden="true" />
+          </button>
         </div>
       </div>
     </div>
diff --git a/web/app/components/app/configuration/config/agent/agent-setting/index.tsx b/web/app/components/app/configuration/config/agent/agent-setting/index.tsx
index beae6b2a49..ea24d129ef 100644
--- a/web/app/components/app/configuration/config/agent/agent-setting/index.tsx
+++ b/web/app/components/app/configuration/config/agent/agent-setting/index.tsx
@@ -74,7 +74,7 @@ const AgentSetting: FC<Props> = ({
         </div>
         {/* Body */}
         <div
-          className="grow overflow-y-auto border-b p-6 pt-5 pb-[68px]"
+          className="grow overflow-y-auto border-b border-divider-regular p-6 pt-5 pb-[68px]"
           style={{
             borderBottom: 'rgba(0, 0, 0, 0.05)',
           }}
diff --git a/web/app/components/app/configuration/config/agent/agent-setting/item-panel.tsx b/web/app/components/app/configuration/config/agent/agent-setting/item-panel.tsx
index 56f1863ec1..54ffee0600 100644
--- a/web/app/components/app/configuration/config/agent/agent-setting/item-panel.tsx
+++ b/web/app/components/app/configuration/config/agent/agent-setting/item-panel.tsx
@@ -2,7 +2,7 @@
 import type { FC } from 'react'
 import { cn } from '@langgenius/dify-ui/cn'
 import * as React from 'react'
-import Tooltip from '@/app/components/base/tooltip'
+import { Infotip } from '@/app/components/base/infotip'
 
 type Props = {
   className?: string
@@ -24,14 +24,9 @@ const ItemPanel: FC<Props> = ({
       <div className="flex items-center">
         {icon}
         <div className="mr-1 ml-3 text-sm leading-6 font-semibold text-text-secondary">{name}</div>
-        <Tooltip
-          popupContent={(
-            <div className="w-[180px]">
-              {description}
-            </div>
-          )}
-        >
-        </Tooltip>
+        <Infotip aria-label={description} popupClassName="w-[180px]">
+          {description}
+        </Infotip>
       </div>
       <div>
         {children}
diff --git a/web/app/components/app/configuration/config/agent/agent-tools/__tests__/index.spec.tsx b/web/app/components/app/configuration/config/agent/agent-tools/__tests__/index.spec.tsx
index d668737a0a..628e34bbe0 100644
--- a/web/app/components/app/configuration/config/agent/agent-tools/__tests__/index.spec.tsx
+++ b/web/app/components/app/configuration/config/agent/agent-tools/__tests__/index.spec.tsx
@@ -368,7 +368,7 @@ describe('AgentTools', () => {
 
   it('should remove tool when delete action is clicked', async () => {
     const { getModelConfig } = renderAgentTools()
-    const deleteButton = screen.getByTestId('delete-removed-tool')
+    const deleteButton = screen.getByRole('button', { name: /operation\.delete/i })
     if (!deleteButton)
       throw new Error('Delete button not found')
     await userEvent.click(deleteButton)
diff --git a/web/app/components/app/configuration/config/agent/agent-tools/index.tsx b/web/app/components/app/configuration/config/agent/agent-tools/index.tsx
index 3242bcdcf8..8ad9ad1f8f 100644
--- a/web/app/components/app/configuration/config/agent/agent-tools/index.tsx
+++ b/web/app/components/app/configuration/config/agent/agent-tools/index.tsx
@@ -96,6 +96,7 @@ const AgentTools: FC = () => {
   }
 
   const [isDeleting, setIsDeleting] = useState<number>(-1)
+  const getDeleteToolLabel = (tool: AgentTool) => `${t('operation.delete', { ns: 'common' })} ${tool.tool_label || tool.tool_name}`
   const getToolValue = (tool: ToolDefaultValue) => {
     const currToolInCollections = collectionList.find(c => c.id === tool.provider_id)
     const currToolWithConfigs = currToolInCollections?.tools.find(t => t.name === tool.tool_name)
@@ -249,7 +250,7 @@ const AgentTools: FC = () => {
                           <div className="mb-1.5 text-text-tertiary">{t('toolNameUsageTip', { ns: 'tools' })}</div>
                           <button
                             type="button"
-                            className="cursor-pointer rounded-sm text-text-accent outline-hidden hover:underline focus-visible:ring-1 focus-visible:ring-components-input-border-hover"
+                            className="cursor-pointer rounded-sm border-none bg-transparent p-0 text-left text-text-accent outline-hidden hover:underline focus-visible:ring-1 focus-visible:ring-components-input-border-hover"
                             onClick={() => copy(item.tool_name)}
                           >
                             {t('copyToolName', { ns: 'tools' })}
@@ -280,8 +281,10 @@ const AgentTools: FC = () => {
                         {t('toolRemoved', { ns: 'tools' })}
                       </PopoverContent>
                     </Popover>
-                    <div
-                      className="cursor-pointer rounded-md p-1 text-text-tertiary hover:text-text-destructive"
+                    <button
+                      type="button"
+                      aria-label={getDeleteToolLabel(item)}
+                      className="cursor-pointer rounded-md border-none bg-transparent p-1 text-text-tertiary outline-hidden hover:text-text-destructive focus-visible:ring-1 focus-visible:ring-components-input-border-hover"
                       onClick={() => {
                         const newModelConfig = produce(modelConfig, (draft) => {
                           draft.agentConfig.tools.splice(index, 1)
@@ -292,8 +295,8 @@ const AgentTools: FC = () => {
                       onMouseOver={() => setIsDeleting(index)}
                       onMouseLeave={() => setIsDeleting(-1)}
                     >
-                      <RiDeleteBinLine className="h-4 w-4" />
-                    </div>
+                      <RiDeleteBinLine className="h-4 w-4" aria-hidden="true" />
+                    </button>
                   </div>
                 )}
                 {!item.isDeleted && !readonly && (
@@ -320,8 +323,10 @@ const AgentTools: FC = () => {
                         </TooltipContent>
                       </Tooltip>
                     )}
-                    <div
-                      className="cursor-pointer rounded-md p-1 text-text-tertiary hover:text-text-destructive"
+                    <button
+                      type="button"
+                      aria-label={getDeleteToolLabel(item)}
+                      className="cursor-pointer rounded-md border-none bg-transparent p-1 text-text-tertiary outline-hidden hover:text-text-destructive focus-visible:ring-1 focus-visible:ring-components-input-border-hover"
                       onClick={() => {
                         const newModelConfig = produce(modelConfig, (draft) => {
                           draft.agentConfig.tools.splice(index, 1)
@@ -331,10 +336,9 @@ const AgentTools: FC = () => {
                       }}
                       onMouseOver={() => setIsDeleting(index)}
                       onMouseLeave={() => setIsDeleting(-1)}
-                      data-testid="delete-removed-tool"
                     >
-                      <RiDeleteBinLine className="h-4 w-4" />
-                    </div>
+                      <RiDeleteBinLine className="h-4 w-4" aria-hidden="true" />
+                    </button>
                   </div>
                 )}
                 <div className={cn(item.isDeleted && 'opacity-50')}>
diff --git a/web/app/components/app/configuration/config/agent/agent-tools/setting-built-in-tool.tsx b/web/app/components/app/configuration/config/agent/agent-tools/setting-built-in-tool.tsx
index 71922d5a7e..806fdd5e93 100644
--- a/web/app/components/app/configuration/config/agent/agent-tools/setting-built-in-tool.tsx
+++ b/web/app/components/app/configuration/config/agent/agent-tools/setting-built-in-tool.tsx
@@ -4,6 +4,14 @@ import type { Collection, Tool } from '@/app/components/tools/types'
 import type { ToolWithProvider } from '@/app/components/workflow/types'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  Drawer,
+  DrawerBackdrop,
+  DrawerContent,
+  DrawerPopup,
+  DrawerPortal,
+  DrawerViewport,
+} from '@langgenius/dify-ui/drawer'
 import {
   RiArrowLeftLine,
   RiCloseLine,
@@ -12,7 +20,6 @@ import * as React from 'react'
 import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import ActionButton from '@/app/components/base/action-button'
-import Drawer from '@/app/components/base/drawer'
 import Loading from '@/app/components/base/loading'
 import TabSlider from '@/app/components/base/tab-slider-plain'
 import Form from '@/app/components/header/account-setting/model-provider-page/model-modal/Form'
@@ -165,98 +172,105 @@ const SettingBuiltInTool: FC<Props> = ({
 
   return (
     <Drawer
-      isOpen
-      clickOutsideNotOpen={false}
-      onClose={onHide}
-      footer={null}
-      mask={false}
-      positionCenter={false}
-      panelClassName={cn('mt-[64px] mr-2 mb-2 w-[420px]! max-w-[420px]! justify-start rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg! p-0! shadow-xl')}
+      open
+      modal
+      swipeDirection="right"
+      onOpenChange={(open) => {
+        if (!open)
+          onHide()
+      }}
     >
-      <>
-        {isLoading && <Loading type="app" />}
-        {!isLoading && (
-          <>
-            {/* header */}
-            <div className="relative border-b border-divider-subtle p-4 pb-3">
-              <div className="absolute top-3 right-3">
-                <ActionButton onClick={onHide}>
-                  <RiCloseLine className="h-4 w-4" />
-                </ActionButton>
-              </div>
-              {showBackButton && (
-                <div
-                  className="mb-2 flex cursor-pointer items-center gap-1 system-xs-semibold-uppercase text-text-accent-secondary"
-                  onClick={onHide}
-                >
-                  <RiArrowLeftLine className="h-4 w-4" />
-                  {t('detailPanel.operation.back', { ns: 'plugin' })}
-                </div>
-              )}
-              <div className="flex items-center gap-1">
-                <Icon size="tiny" className="h-6 w-6" src={collection.icon} />
-                <OrgInfo
-                  packageNameClassName="w-auto"
-                  orgName={collection.author}
-                  packageName={collection.name.split('/').pop() || ''}
-                />
-              </div>
-              <div className="mt-1 system-md-semibold text-text-primary">{currTool?.label[language]}</div>
-              {!!currTool?.description[language] && (
-                <Description className="mt-3 mb-2 h-auto" text={currTool.description[language]} descriptionLineRows={2}></Description>
-              )}
-              {
-                collection.allow_delete && collection.type === CollectionType.builtIn && (
-                  <PluginAuthInAgent
-                    pluginPayload={{
-                      provider: collection.name,
-                      category: AuthCategory.tool,
-                      providerType: collection.type,
-                      detail: collection as any,
-                    }}
-                    credentialId={credentialId}
-                    onAuthorizationItemClick={onAuthorizationItemClick}
-                  />
-                )
-              }
-            </div>
-            {/* form */}
-            <div className="h-full">
-              <div className="flex h-full flex-col">
-                {(hasSetting && !readonly)
-                  ? (
-                      <TabSlider
-                        className="mt-1 shrink-0 px-4"
-                        itemClassName="py-3"
-                        noBorderBottom
-                        value={currType}
-                        onChange={(value) => {
-                          setCurrType(value)
-                        }}
-                        options={[
-                          { value: 'info', text: t('setBuiltInTools.parameters', { ns: 'tools' })! },
-                          { value: 'setting', text: t('setBuiltInTools.setting', { ns: 'tools' })! },
-                        ]}
-                      />
-                    )
-                  : (
-                      <div className="p-4 pb-1 system-sm-semibold-uppercase text-text-primary">{t('setBuiltInTools.parameters', { ns: 'tools' })}</div>
-                    )}
-                <div className="h-0 grow overflow-y-auto px-4">
-                  {isInfoActive ? infoUI : settingUI}
-                  {!readonly && !isInfoActive && (
-                    <div className="flex shrink-0 justify-end space-x-2 rounded-b-[10px] bg-components-panel-bg py-2">
-                      <Button className="flex h-8 items-center px-3! text-[13px]! font-medium" onClick={onHide}>{t('operation.cancel', { ns: 'common' })}</Button>
-                      <Button className="flex h-8 items-center px-3! text-[13px]! font-medium" variant="primary" disabled={!isValid} onClick={() => onSave?.(tempSetting)}>{t('operation.save', { ns: 'common' })}</Button>
+      <DrawerPortal>
+        <DrawerBackdrop className="bg-transparent" />
+        <DrawerViewport>
+          <DrawerPopup className={cn('justify-start bg-components-panel-bg! p-0! shadow-xl data-[swipe-direction=right]:top-16 data-[swipe-direction=right]:right-2 data-[swipe-direction=right]:bottom-2 data-[swipe-direction=right]:h-auto data-[swipe-direction=right]:w-[420px] data-[swipe-direction=right]:max-w-[420px] data-[swipe-direction=right]:rounded-2xl data-[swipe-direction=right]:border-[0.5px] data-[swipe-direction=right]:border-components-panel-border')}>
+            <DrawerContent className="flex min-h-0 flex-1 flex-col p-0 pb-0">
+              {isLoading && <Loading type="app" />}
+              {!isLoading && (
+                <>
+                  {/* header */}
+                  <div className="relative border-b border-divider-subtle p-4 pb-3">
+                    <div className="absolute top-3 right-3">
+                      <ActionButton onClick={onHide}>
+                        <RiCloseLine className="h-4 w-4" />
+                      </ActionButton>
                     </div>
-                  )}
-                </div>
-                <ReadmeEntrance pluginDetail={collection as any} className="mt-auto" />
-              </div>
-            </div>
-          </>
-        )}
-      </>
+                    {showBackButton && (
+                      <div
+                        className="mb-2 flex cursor-pointer items-center gap-1 system-xs-semibold-uppercase text-text-accent-secondary"
+                        onClick={onHide}
+                      >
+                        <RiArrowLeftLine className="h-4 w-4" />
+                        {t('detailPanel.operation.back', { ns: 'plugin' })}
+                      </div>
+                    )}
+                    <div className="flex items-center gap-1">
+                      <Icon size="tiny" className="h-6 w-6" src={collection.icon} />
+                      <OrgInfo
+                        packageNameClassName="w-auto"
+                        orgName={collection.author}
+                        packageName={collection.name.split('/').pop() || ''}
+                      />
+                    </div>
+                    <div className="mt-1 system-md-semibold text-text-primary">{currTool?.label[language]}</div>
+                    {!!currTool?.description[language] && (
+                      <Description className="mt-3 mb-2 h-auto" text={currTool.description[language]} descriptionLineRows={2}></Description>
+                    )}
+                    {
+                      collection.allow_delete && collection.type === CollectionType.builtIn && (
+                        <PluginAuthInAgent
+                          pluginPayload={{
+                            provider: collection.name,
+                            category: AuthCategory.tool,
+                            providerType: collection.type,
+                            detail: collection as any,
+                          }}
+                          credentialId={credentialId}
+                          onAuthorizationItemClick={onAuthorizationItemClick}
+                        />
+                      )
+                    }
+                  </div>
+                  {/* form */}
+                  <div className="h-full">
+                    <div className="flex h-full flex-col">
+                      {(hasSetting && !readonly)
+                        ? (
+                            <TabSlider
+                              className="mt-1 shrink-0 px-4"
+                              itemClassName="py-3"
+                              noBorderBottom
+                              value={currType}
+                              onChange={(value) => {
+                                setCurrType(value)
+                              }}
+                              options={[
+                                { value: 'info', text: t('setBuiltInTools.parameters', { ns: 'tools' })! },
+                                { value: 'setting', text: t('setBuiltInTools.setting', { ns: 'tools' })! },
+                              ]}
+                            />
+                          )
+                        : (
+                            <div className="p-4 pb-1 system-sm-semibold-uppercase text-text-primary">{t('setBuiltInTools.parameters', { ns: 'tools' })}</div>
+                          )}
+                      <div className="h-0 grow overflow-y-auto px-4">
+                        {isInfoActive ? infoUI : settingUI}
+                        {!readonly && !isInfoActive && (
+                          <div className="flex shrink-0 justify-end space-x-2 rounded-b-[10px] bg-components-panel-bg py-2">
+                            <Button className="flex h-8 items-center px-3! text-[13px]! font-medium" onClick={onHide}>{t('operation.cancel', { ns: 'common' })}</Button>
+                            <Button className="flex h-8 items-center px-3! text-[13px]! font-medium" variant="primary" disabled={!isValid} onClick={() => onSave?.(tempSetting)}>{t('operation.save', { ns: 'common' })}</Button>
+                          </div>
+                        )}
+                      </div>
+                      <ReadmeEntrance pluginDetail={collection as any} className="mt-auto" />
+                    </div>
+                  </div>
+                </>
+              )}
+            </DrawerContent>
+          </DrawerPopup>
+        </DrawerViewport>
+      </DrawerPortal>
     </Drawer>
   )
 }
diff --git a/web/app/components/app/configuration/config/assistant-type-picker/__tests__/index.spec.tsx b/web/app/components/app/configuration/config/assistant-type-picker/__tests__/index.spec.tsx
index b32f14d089..7b2d3414f6 100644
--- a/web/app/components/app/configuration/config/assistant-type-picker/__tests__/index.spec.tsx
+++ b/web/app/components/app/configuration/config/assistant-type-picker/__tests__/index.spec.tsx
@@ -841,11 +841,11 @@ describe('AssistantTypePicker', () => {
     it('should have proper ARIA state for dropdown', async () => {
       // Arrange
       const user = userEvent.setup()
-      const { container } = renderComponent()
+      renderComponent()
 
       // Act - Check initial state
-      const portalContainer = container.querySelector('[data-state]')
-      expect(portalContainer)!.toHaveAttribute('data-state', 'closed')
+      const triggerButton = screen.getByRole('button', { name: /chatAssistant\.name/i })
+      expect(triggerButton).toHaveAttribute('aria-expanded', 'false')
 
       // Open dropdown
       const trigger = screen.getByText(/chatAssistant.name/i)
@@ -853,23 +853,22 @@ describe('AssistantTypePicker', () => {
 
       // Assert - State should change to open
       await waitFor(() => {
-        const openPortal = container.querySelector('[data-state="open"]')
-        expect(openPortal)!.toBeInTheDocument()
+        expect(triggerButton).toHaveAttribute('aria-expanded', 'true')
       })
     })
 
     it('should have proper data-state attribute', () => {
       // Arrange & Act
-      const { container } = renderComponent()
+      renderComponent()
 
-      // Assert - Portal should have data-state for accessibility
-      const portalContainer = container.querySelector('[data-state]')
-      expect(portalContainer)!.toBeInTheDocument()
-      expect(portalContainer)!.toHaveAttribute('data-state')
+      // Assert - Trigger should expose expanded state for accessibility
+      const triggerButton = screen.getByRole('button', { name: /chatAssistant\.name/i })
+      expect(triggerButton).toBeInTheDocument()
+      expect(triggerButton).toHaveAttribute('aria-expanded')
 
       // Should start in closed state
       // Should start in closed state
-      expect(portalContainer)!.toHaveAttribute('data-state', 'closed')
+      expect(triggerButton).toHaveAttribute('aria-expanded', 'false')
     })
 
     it('should maintain accessible structure for screen readers', () => {
diff --git a/web/app/components/app/configuration/config/assistant-type-picker/index.tsx b/web/app/components/app/configuration/config/assistant-type-picker/index.tsx
index df0baa2f36..801645940f 100644
--- a/web/app/components/app/configuration/config/assistant-type-picker/index.tsx
+++ b/web/app/components/app/configuration/config/assistant-type-picker/index.tsx
@@ -2,6 +2,11 @@
 import type { FC } from 'react'
 import type { AgentConfig } from '@/models/debug'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from '@langgenius/dify-ui/popover'
 import { RiArrowDownSLine } from '@remixicon/react'
 import * as React from 'react'
 import { useState } from 'react'
@@ -10,11 +15,6 @@ import { ArrowUpRight } from '@/app/components/base/icons/src/vender/line/arrows
 import { Settings04 } from '@/app/components/base/icons/src/vender/line/general'
 import { CuteRobot } from '@/app/components/base/icons/src/vender/solid/communication'
 import { BubbleText } from '@/app/components/base/icons/src/vender/solid/education'
-import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
 import Radio from '@/app/components/base/radio/ui'
 import AgentSetting from '../agent/agent-setting'
 
@@ -107,47 +107,48 @@ const AssistantTypePicker: FC<Props> = ({
   )
   return (
     <>
-      <PortalToFollowElem
+      <Popover
         open={open}
         onOpenChange={setOpen}
-        placement="bottom-end"
-        offset={{
-          mainAxis: 8,
-          crossAxis: -2,
-        }}
       >
-        <PortalToFollowElemTrigger onClick={() => setOpen(v => !v)}>
-          <div className={cn(open && 'bg-gray-50', 'flex h-8 cursor-pointer items-center space-x-1 rounded-lg border border-black/5 px-3 text-indigo-600 select-none')}>
-            {isAgent ? <BubbleText className="h-3 w-3" /> : <CuteRobot className="h-3 w-3" />}
-            <div className="text-xs font-medium">{t(`assistantType.${isAgent ? 'agentAssistant' : 'chatAssistant'}.name`, { ns: 'appDebug' })}</div>
-            <RiArrowDownSLine className="h-3 w-3" />
-          </div>
-        </PortalToFollowElemTrigger>
-        <PortalToFollowElemContent style={{ zIndex: 1000 }}>
-          <div className="relative left-0.5 w-[480px] rounded-xl border border-black/8 bg-white p-6 shadow-lg">
-            <div className="mb-2 text-sm leading-5 font-semibold text-gray-900">{t('assistantType.name', { ns: 'appDebug' })}</div>
-            <SelectItem
-              Icon={BubbleText}
-              value="chat"
-              disabled={disabled}
-              text={t('assistantType.chatAssistant.name', { ns: 'appDebug' })}
-              description={t('assistantType.chatAssistant.description', { ns: 'appDebug' })}
-              isChecked={!isAgent}
-              onClick={handleChange}
-            />
-            <SelectItem
-              Icon={CuteRobot}
-              value="agent"
-              disabled={disabled}
-              text={t('assistantType.agentAssistant.name', { ns: 'appDebug' })}
-              description={t('assistantType.agentAssistant.description', { ns: 'appDebug' })}
-              isChecked={isAgent}
-              onClick={handleChange}
-            />
-            {!disabled && agentConfigUI}
-          </div>
-        </PortalToFollowElemContent>
-      </PortalToFollowElem>
+        <PopoverTrigger
+          nativeButton={false}
+          render={(
+            <div className={cn(open && 'bg-gray-50', 'flex h-8 cursor-pointer items-center space-x-1 rounded-lg border border-black/5 px-3 text-indigo-600 select-none')} />
+          )}
+        >
+          {isAgent ? <BubbleText className="h-3 w-3" /> : <CuteRobot className="h-3 w-3" />}
+          <div className="text-xs font-medium">{t(`assistantType.${isAgent ? 'agentAssistant' : 'chatAssistant'}.name`, { ns: 'appDebug' })}</div>
+          <RiArrowDownSLine className="h-3 w-3" />
+        </PopoverTrigger>
+        <PopoverContent
+          placement="bottom-end"
+          sideOffset={8}
+          alignOffset={-2}
+          popupClassName="relative left-0.5 w-[480px] rounded-xl border border-black/8 bg-white p-6 shadow-lg"
+        >
+          <div className="mb-2 text-sm leading-5 font-semibold text-gray-900">{t('assistantType.name', { ns: 'appDebug' })}</div>
+          <SelectItem
+            Icon={BubbleText}
+            value="chat"
+            disabled={disabled}
+            text={t('assistantType.chatAssistant.name', { ns: 'appDebug' })}
+            description={t('assistantType.chatAssistant.description', { ns: 'appDebug' })}
+            isChecked={!isAgent}
+            onClick={handleChange}
+          />
+          <SelectItem
+            Icon={CuteRobot}
+            value="agent"
+            disabled={disabled}
+            text={t('assistantType.agentAssistant.name', { ns: 'appDebug' })}
+            description={t('assistantType.agentAssistant.description', { ns: 'appDebug' })}
+            isChecked={isAgent}
+            onClick={handleChange}
+          />
+          {!disabled && agentConfigUI}
+        </PopoverContent>
+      </Popover>
       {isShowAgentSetting && (
         <AgentSetting
           isFunctionCall={isFunctionCall}
diff --git a/web/app/components/app/configuration/config/automatic/__tests__/instruction-editor.spec.tsx b/web/app/components/app/configuration/config/automatic/__tests__/instruction-editor.spec.tsx
index c1d7edac13..da4f591b51 100644
--- a/web/app/components/app/configuration/config/automatic/__tests__/instruction-editor.spec.tsx
+++ b/web/app/components/app/configuration/config/automatic/__tests__/instruction-editor.spec.tsx
@@ -82,7 +82,7 @@ describe('InstructionEditor', () => {
     expect(screen.getByTestId('error-block')).toHaveTextContent('true')
     expect(screen.getByTestId('last-run-block')).toHaveTextContent('true')
 
-    fireEvent.click(screen.getByText('generate.insertContext'))
+    fireEvent.click(screen.getByRole('button', { name: 'generate.insertContext' }))
 
     expect(mockEmit).toHaveBeenCalledWith(expect.objectContaining({
       instanceId: 'editor-1',
diff --git a/web/app/components/app/configuration/config/automatic/__tests__/version-selector.spec.tsx b/web/app/components/app/configuration/config/automatic/__tests__/version-selector.spec.tsx
index 0f792a7491..3c56ef3c21 100644
--- a/web/app/components/app/configuration/config/automatic/__tests__/version-selector.spec.tsx
+++ b/web/app/components/app/configuration/config/automatic/__tests__/version-selector.spec.tsx
@@ -1,4 +1,4 @@
-import { fireEvent, render, screen } from '@testing-library/react'
+import { fireEvent, render, screen, waitFor } from '@testing-library/react'
 import VersionSelector from '../version-selector'
 
 vi.mock('react-i18next', () => ({
@@ -25,7 +25,7 @@ describe('VersionSelector', () => {
     expect(onChange).not.toHaveBeenCalled()
   })
 
-  it('should open the selector and switch versions when multiple versions exist', () => {
+  it('should open the selector and switch versions when multiple versions exist', async () => {
     const onChange = vi.fn()
 
     render(
@@ -44,6 +44,8 @@ describe('VersionSelector', () => {
     fireEvent.click(screen.getByText('generate.version 1'))
 
     expect(onChange).toHaveBeenCalledWith(0)
-    expect(screen.queryByText('generate.versions')).not.toBeInTheDocument()
+    await waitFor(() => {
+      expect(screen.queryByText('generate.versions')).not.toBeInTheDocument()
+    })
   })
 })
diff --git a/web/app/components/app/configuration/config/automatic/get-automatic-res.tsx b/web/app/components/app/configuration/config/automatic/get-automatic-res.tsx
index ff6044cf75..9862e80405 100644
--- a/web/app/components/app/configuration/config/automatic/get-automatic-res.tsx
+++ b/web/app/components/app/configuration/config/automatic/get-automatic-res.tsx
@@ -14,6 +14,7 @@ import {
   AlertDialogTitle,
 } from '@langgenius/dify-ui/alert-dialog'
 import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
 import {
   RiDatabase2Line,
@@ -32,9 +33,8 @@ import { useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Generator } from '@/app/components/base/icons/src/vender/other'
 import Loading from '@/app/components/base/loading'
-import Modal from '@/app/components/base/modal'
-import { ModelTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
 
+import { ModelTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import { useModelListAndDefaultModelAndCurrentProviderAndModel } from '@/app/components/header/account-setting/model-provider-page/hooks'
 import ModelParameterModal from '@/app/components/header/account-setting/model-provider-page/model-parameter-modal'
 import { generateBasicAppFirstTimeRule, generateRule } from '@/service/debug'
@@ -282,143 +282,148 @@ const GetAutomaticRes: FC<IGetAutomaticResProps> = ({
   }
 
   return (
-    <Modal
-      isShow={isShow}
-      onClose={onClose}
-      className="min-w-[1140px] p-0!"
+    <Dialog
+      open={isShow}
+      onOpenChange={(open) => {
+        if (!open)
+          onClose()
+      }}
     >
-      <div className="flex h-[680px] flex-wrap">
-        <div className="h-full w-[570px] shrink-0 overflow-y-auto border-r border-divider-regular p-6">
-          <div className="mb-5">
-            <div className={`text-lg leading-[28px] font-bold ${s.textGradient}`}>{t('generate.title', { ns: 'appDebug' })}</div>
-            <div className="mt-1 text-[13px] font-normal text-text-tertiary">{t('generate.description', { ns: 'appDebug' })}</div>
-          </div>
-          <div>
-            <ModelParameterModal
-              popupClassName="w-[520px]!"
-              isAdvancedMode={true}
-              provider={model.provider}
-              completionParams={model.completion_params}
-              modelId={model.name}
-              setModel={handleModelChange}
-              onCompletionParamsChange={handleCompletionParamsChange}
-              hideDebugWithMultipleModel
-            />
-          </div>
-          {isBasicMode && (
-            <div className="mt-4">
-              <div className="flex items-center">
-                <div className="mr-3 shrink-0 text-xs leading-[18px] font-semibold text-text-tertiary uppercase">{t('generate.tryIt', { ns: 'appDebug' })}</div>
-                <div
-                  className="h-px grow"
-                  style={{
-                    background: 'linear-gradient(to right, rgba(243, 244, 246, 1), rgba(243, 244, 246, 0))',
-                  }}
-                >
+      <DialogContent className="h-[min(680px,calc(100dvh-2rem))] max-h-none! w-[1140px] max-w-none! min-w-[1140px] overflow-hidden! border-none p-0! text-left align-middle">
+
+        <div className="flex h-full min-h-0 flex-wrap">
+          <div className="h-full w-[570px] shrink-0 overflow-y-auto border-r border-divider-regular p-6">
+            <div className="mb-5">
+              <div className={`text-lg leading-[28px] font-bold ${s.textGradient}`}>{t('generate.title', { ns: 'appDebug' })}</div>
+              <div className="mt-1 text-[13px] font-normal text-text-tertiary">{t('generate.description', { ns: 'appDebug' })}</div>
+            </div>
+            <div>
+              <ModelParameterModal
+                popupClassName="w-[520px]!"
+                isAdvancedMode={true}
+                provider={model.provider}
+                completionParams={model.completion_params}
+                modelId={model.name}
+                setModel={handleModelChange}
+                onCompletionParamsChange={handleCompletionParamsChange}
+                hideDebugWithMultipleModel
+              />
+            </div>
+            {isBasicMode && (
+              <div className="mt-4">
+                <div className="flex items-center">
+                  <div className="mr-3 shrink-0 text-xs leading-[18px] font-semibold text-text-tertiary uppercase">{t('generate.tryIt', { ns: 'appDebug' })}</div>
+                  <div
+                    className="h-px grow"
+                    style={{
+                      background: 'linear-gradient(to right, rgba(243, 244, 246, 1), rgba(243, 244, 246, 0))',
+                    }}
+                  >
+                  </div>
+                </div>
+                <div className="flex flex-wrap">
+                  {tryList.map(item => (
+                    <TryLabel
+                      key={item.key}
+                      Icon={item.icon}
+                      text={t(`generate.template.${item.key}.name`, { ns: 'appDebug' })}
+                      onClick={handleChooseTemplate(item.key)}
+                    />
+                  ))}
                 </div>
               </div>
-              <div className="flex flex-wrap">
-                {tryList.map(item => (
-                  <TryLabel
-                    key={item.key}
-                    Icon={item.icon}
-                    text={t(`generate.template.${item.key}.name`, { ns: 'appDebug' })}
-                    onClick={handleChooseTemplate(item.key)}
-                  />
-                ))}
+            )}
+
+            {/* inputs */}
+            <div className="mt-4">
+              <div>
+                <div className="mb-1.5 system-sm-semibold-uppercase text-text-secondary">{t('generate.instruction', { ns: 'appDebug' })}</div>
+                {isBasicMode
+                  ? (
+                      <InstructionEditorInBasic
+                        editorKey={editorKey}
+                        generatorType={GeneratorType.prompt}
+                        value={instruction}
+                        onChange={setInstruction}
+                        availableVars={[]}
+                        availableNodes={[]}
+                        isShowCurrentBlock={!!currentPrompt}
+                        isShowLastRunBlock={false}
+                      />
+                    )
+                  : (
+                      <InstructionEditorInWorkflow
+                        editorKey={editorKey}
+                        generatorType={GeneratorType.prompt}
+                        value={instruction}
+                        onChange={setInstruction}
+                        nodeId={nodeId || ''}
+                        isShowCurrentBlock={!!currentPrompt}
+                      />
+                    )}
+              </div>
+              <IdeaOutput
+                value={ideaOutput}
+                onChange={setIdeaOutput}
+              />
+
+              <div className="mt-7 flex justify-end space-x-2">
+                <Button onClick={onClose}>{t(`${i18nPrefix}.dismiss`, { ns: 'appDebug' })}</Button>
+                <Button
+                  className="flex space-x-1"
+                  variant="primary"
+                  onClick={onGenerate}
+                  disabled={isLoading}
+                >
+                  <Generator className="h-4 w-4" />
+                  <span className="text-xs font-semibold">{t('generate.generate', { ns: 'appDebug' })}</span>
+                </Button>
               </div>
             </div>
+          </div>
+
+          {(!isLoading && current) && (
+            <div className="h-full w-0 grow bg-background-default-subtle p-6 pb-0">
+              <Result
+                current={current!}
+                isBasicMode={isBasicMode}
+                nodeId={nodeId!}
+                currentVersionIndex={currentVersionIndex || 0}
+                setCurrentVersionIndex={setCurrentVersionIndex}
+                versions={versions || []}
+                onApply={showConfirmOverwrite}
+                generatorType={GeneratorType.prompt}
+              />
+            </div>
           )}
-
-          {/* inputs */}
-          <div className="mt-4">
-            <div>
-              <div className="mb-1.5 system-sm-semibold-uppercase text-text-secondary">{t('generate.instruction', { ns: 'appDebug' })}</div>
-              {isBasicMode
-                ? (
-                    <InstructionEditorInBasic
-                      editorKey={editorKey}
-                      generatorType={GeneratorType.prompt}
-                      value={instruction}
-                      onChange={setInstruction}
-                      availableVars={[]}
-                      availableNodes={[]}
-                      isShowCurrentBlock={!!currentPrompt}
-                      isShowLastRunBlock={false}
-                    />
-                  )
-                : (
-                    <InstructionEditorInWorkflow
-                      editorKey={editorKey}
-                      generatorType={GeneratorType.prompt}
-                      value={instruction}
-                      onChange={setInstruction}
-                      nodeId={nodeId || ''}
-                      isShowCurrentBlock={!!currentPrompt}
-                    />
-                  )}
-            </div>
-            <IdeaOutput
-              value={ideaOutput}
-              onChange={setIdeaOutput}
-            />
-
-            <div className="mt-7 flex justify-end space-x-2">
-              <Button onClick={onClose}>{t(`${i18nPrefix}.dismiss`, { ns: 'appDebug' })}</Button>
-              <Button
-                className="flex space-x-1"
-                variant="primary"
-                onClick={onGenerate}
-                disabled={isLoading}
-              >
-                <Generator className="h-4 w-4" />
-                <span className="text-xs font-semibold">{t('generate.generate', { ns: 'appDebug' })}</span>
-              </Button>
-            </div>
-          </div>
+          {isLoading && renderLoading}
+          {isShowAutoPromptResPlaceholder() && <ResPlaceholder />}
+          <AlertDialog open={isShowConfirmOverwrite} onOpenChange={open => !open && hideShowConfirmOverwrite()}>
+            <AlertDialogContent>
+              <div className="flex flex-col gap-2 px-6 pt-6 pb-4">
+                <AlertDialogTitle className="w-full truncate title-2xl-semi-bold text-text-primary">
+                  {t('generate.overwriteTitle', { ns: 'appDebug' })}
+                </AlertDialogTitle>
+                <AlertDialogDescription className="w-full system-md-regular wrap-break-word whitespace-pre-wrap text-text-tertiary">
+                  {t('generate.overwriteMessage', { ns: 'appDebug' })}
+                </AlertDialogDescription>
+              </div>
+              <AlertDialogActions>
+                <AlertDialogCancelButton>{t('operation.cancel', { ns: 'common' })}</AlertDialogCancelButton>
+                <AlertDialogConfirmButton
+                  onClick={() => {
+                    hideShowConfirmOverwrite()
+                    onFinished(current!)
+                  }}
+                >
+                  {t('operation.confirm', { ns: 'common' })}
+                </AlertDialogConfirmButton>
+              </AlertDialogActions>
+            </AlertDialogContent>
+          </AlertDialog>
         </div>
-
-        {(!isLoading && current) && (
-          <div className="h-full w-0 grow bg-background-default-subtle p-6 pb-0">
-            <Result
-              current={current!}
-              isBasicMode={isBasicMode}
-              nodeId={nodeId!}
-              currentVersionIndex={currentVersionIndex || 0}
-              setCurrentVersionIndex={setCurrentVersionIndex}
-              versions={versions || []}
-              onApply={showConfirmOverwrite}
-              generatorType={GeneratorType.prompt}
-            />
-          </div>
-        )}
-        {isLoading && renderLoading}
-        {isShowAutoPromptResPlaceholder() && <ResPlaceholder />}
-        <AlertDialog open={isShowConfirmOverwrite} onOpenChange={open => !open && hideShowConfirmOverwrite()}>
-          <AlertDialogContent>
-            <div className="flex flex-col gap-2 px-6 pt-6 pb-4">
-              <AlertDialogTitle className="w-full truncate title-2xl-semi-bold text-text-primary">
-                {t('generate.overwriteTitle', { ns: 'appDebug' })}
-              </AlertDialogTitle>
-              <AlertDialogDescription className="w-full system-md-regular wrap-break-word whitespace-pre-wrap text-text-tertiary">
-                {t('generate.overwriteMessage', { ns: 'appDebug' })}
-              </AlertDialogDescription>
-            </div>
-            <AlertDialogActions>
-              <AlertDialogCancelButton>{t('operation.cancel', { ns: 'common' })}</AlertDialogCancelButton>
-              <AlertDialogConfirmButton
-                onClick={() => {
-                  hideShowConfirmOverwrite()
-                  onFinished(current!)
-                }}
-              >
-                {t('operation.confirm', { ns: 'common' })}
-              </AlertDialogConfirmButton>
-            </AlertDialogActions>
-          </AlertDialogContent>
-        </AlertDialog>
-      </div>
-    </Modal>
+      </DialogContent>
+    </Dialog>
   )
 }
 export default React.memo(GetAutomaticRes)
diff --git a/web/app/components/app/configuration/config/automatic/instruction-editor.tsx b/web/app/components/app/configuration/config/automatic/instruction-editor.tsx
index 5596b335df..710f530c9e 100644
--- a/web/app/components/app/configuration/config/automatic/instruction-editor.tsx
+++ b/web/app/components/app/configuration/config/automatic/instruction-editor.tsx
@@ -113,7 +113,13 @@ const InstructionEditor: FC<Props> = ({
         <span>{t('generate.press', { ns: 'appDebug' })}</span>
         <span className="flex h-4 w-3.5 items-center justify-center rounded-sm bg-components-kbd-bg-gray system-kbd text-text-placeholder">/</span>
         <span>{t('generate.to', { ns: 'appDebug' })}</span>
-        <span onClick={handleInsertVariable} className="ml-1! cursor-pointer hover:border-b hover:border-dotted hover:border-text-tertiary hover:text-text-tertiary">{t('generate.insertContext', { ns: 'appDebug' })}</span>
+        <button
+          type="button"
+          className="ml-1! cursor-pointer border-none bg-transparent p-0 text-left hover:border-b hover:border-dotted hover:border-text-tertiary hover:text-text-tertiary focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+          onClick={handleInsertVariable}
+        >
+          {t('generate.insertContext', { ns: 'appDebug' })}
+        </button>
       </div>
     </div>
   )
diff --git a/web/app/components/app/configuration/config/automatic/version-selector.tsx b/web/app/components/app/configuration/config/automatic/version-selector.tsx
index 25846e9b54..13b99dafde 100644
--- a/web/app/components/app/configuration/config/automatic/version-selector.tsx
+++ b/web/app/components/app/configuration/config/automatic/version-selector.tsx
@@ -1,10 +1,16 @@
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuTrigger,
+} from '@langgenius/dify-ui/dropdown-menu'
 import { RiArrowDownSLine, RiCheckLine } from '@remixicon/react'
 import { useBoolean } from 'ahooks'
 import * as React from 'react'
 import { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
-import { PortalToFollowElem, PortalToFollowElemContent, PortalToFollowElemTrigger } from '@/app/components/base/portal-to-follow-elem'
 
 type VersionSelectorProps = {
   versionLen: number
@@ -16,19 +22,14 @@ const VersionSelector: React.FC<VersionSelectorProps> = ({ versionLen, value, on
   const { t } = useTranslation()
   const [isOpen, {
     setFalse: handleOpenFalse,
-    toggle: handleOpenToggle,
     set: handleOpenSet,
   }] = useBoolean(false)
 
   const moreThanOneVersion = versionLen > 1
-  const handleOpen = useCallback((value: boolean) => {
+  const handleOpen = useCallback((nextOpen: boolean) => {
     if (moreThanOneVersion)
-      handleOpenSet(value)
-  }, [moreThanOneVersion, handleOpenToggle])
-  const handleToggle = useCallback(() => {
-    if (moreThanOneVersion)
-      handleOpenToggle()
-  }, [moreThanOneVersion, handleOpenToggle])
+      handleOpenSet(nextOpen)
+  }, [moreThanOneVersion, handleOpenSet])
 
   const versions = Array.from({ length: versionLen }, (_, index) => ({
     label: `${t('generate.version', { ns: 'appDebug' })} ${index + 1}${index === versionLen - 1 ? ` · ${t('generate.latest', { ns: 'appDebug' })}` : ''}`,
@@ -38,67 +39,59 @@ const VersionSelector: React.FC<VersionSelectorProps> = ({ versionLen, value, on
   const isLatest = value === versionLen - 1
 
   return (
-    <PortalToFollowElem
-      placement="bottom-start"
-      offset={{
-        mainAxis: 4,
-        crossAxis: -12,
-      }}
+    <DropdownMenu
       open={isOpen}
       onOpenChange={handleOpen}
     >
-      <PortalToFollowElemTrigger
-        onClick={handleToggle}
-        asChild
+      <DropdownMenuTrigger
+        nativeButton={false}
+        render={(
+          <div className={cn('flex items-center system-xs-medium text-text-tertiary', isOpen && 'text-text-secondary', moreThanOneVersion && 'cursor-pointer')} />
+        )}
       >
-
-        <div className={cn('flex items-center system-xs-medium text-text-tertiary', isOpen && 'text-text-secondary', moreThanOneVersion && 'cursor-pointer')}>
-          <div>
-            {t('generate.version', { ns: 'appDebug' })}
-            {' '}
-            {value + 1}
-            {isLatest && ` · ${t('generate.latest', { ns: 'appDebug' })}`}
-          </div>
-          {moreThanOneVersion && <RiArrowDownSLine className="size-3" />}
+        <div>
+          {t('generate.version', { ns: 'appDebug' })}
+          {' '}
+          {value + 1}
+          {isLatest && ` · ${t('generate.latest', { ns: 'appDebug' })}`}
         </div>
-      </PortalToFollowElemTrigger>
-      <PortalToFollowElemContent className={cn(
-        'z-99',
-      )}
+        {moreThanOneVersion && <RiArrowDownSLine className="size-3" />}
+      </DropdownMenuTrigger>
+      <DropdownMenuContent
+        placement="bottom-start"
+        sideOffset={4}
+        alignOffset={-12}
+        popupClassName="w-[208px] rounded-xl border-[0.5px] bg-components-panel-bg-blur p-1"
       >
-        <div
-          className={cn(
-            'w-[208px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur p-1 shadow-lg',
-          )}
+        <div className={cn('flex h-[22px] items-center px-3 pl-3 system-xs-medium-uppercase text-text-tertiary')}>
+          {t('generate.versions', { ns: 'appDebug' })}
+        </div>
+        <DropdownMenuRadioGroup
+          value={value}
+          onValueChange={(nextValue) => {
+            onChange(nextValue)
+            handleOpenFalse()
+          }}
         >
-          <div className={cn('flex h-[22px] items-center px-3 pl-3 system-xs-medium-uppercase text-text-tertiary')}>
-            {t('generate.versions', { ns: 'appDebug' })}
-          </div>
-          {
-            versions.map(option => (
-              <div
-                key={option.value}
-                className={cn(
-                  'flex h-7 cursor-pointer items-center rounded-lg px-2 system-sm-medium text-text-secondary hover:bg-state-base-hover',
-                )}
-                title={option.label}
-                onClick={() => {
-                  onChange(option.value)
-                  handleOpenFalse()
-                }}
-              >
-                <div className="mr-1 grow truncate px-1 pl-1">
-                  {option.label}
-                </div>
-                {
-                  value === option.value && <RiCheckLine className="h-4 w-4 shrink-0 text-text-accent" />
-                }
+          {versions.map(option => (
+            <DropdownMenuRadioItem
+              key={option.value}
+              value={option.value}
+              closeOnClick
+              className="h-7 rounded-lg px-2 system-sm-medium text-text-secondary"
+              title={option.label}
+            >
+              <div className="mr-1 grow truncate px-1 pl-1">
+                {option.label}
               </div>
-            ))
-          }
-        </div>
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
+              {
+                value === option.value && <RiCheckLine className="h-4 w-4 shrink-0 text-text-accent" />
+              }
+            </DropdownMenuRadioItem>
+          ))}
+        </DropdownMenuRadioGroup>
+      </DropdownMenuContent>
+    </DropdownMenu>
   )
 }
 
diff --git a/web/app/components/app/configuration/config/code-generator/get-code-generator-res.tsx b/web/app/components/app/configuration/config/code-generator/get-code-generator-res.tsx
index ca2718ce7b..d6c3db26e7 100644
--- a/web/app/components/app/configuration/config/code-generator/get-code-generator-res.tsx
+++ b/web/app/components/app/configuration/config/code-generator/get-code-generator-res.tsx
@@ -13,6 +13,7 @@ import {
   AlertDialogTitle,
 } from '@langgenius/dify-ui/alert-dialog'
 import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
 import {
   useBoolean,
@@ -23,7 +24,6 @@ import { useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Generator } from '@/app/components/base/icons/src/vender/other'
 import Loading from '@/app/components/base/loading'
-import Modal from '@/app/components/base/modal'
 import { ModelTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import { useModelListAndDefaultModelAndCurrentProviderAndModel } from '@/app/components/header/account-setting/model-provider-page/hooks'
 import ModelParameterModal from '@/app/components/header/account-setting/model-provider-page/model-parameter-modal'
@@ -202,99 +202,104 @@ export const GetCodeGeneratorResModal: FC<IGetCodeGeneratorResProps> = (
   )
 
   return (
-    <Modal
-      isShow={isShow}
-      onClose={onClose}
-      className="min-w-[1140px] p-0!"
+    <Dialog
+      open={isShow}
+      onOpenChange={(open) => {
+        if (!open)
+          onClose()
+      }}
     >
-      <div className="relative flex h-[680px] flex-wrap">
-        <div className="h-full w-[570px] shrink-0 overflow-y-auto border-r border-divider-regular p-6">
-          <div className="mb-5">
-            <div className={`text-lg leading-[28px] font-bold ${s.textGradient}`}>{t('codegen.title', { ns: 'appDebug' })}</div>
-            <div className="mt-1 text-[13px] font-normal text-text-tertiary">{t('codegen.description', { ns: 'appDebug' })}</div>
-          </div>
-          <div className="mb-4">
-            <ModelParameterModal
-              popupClassName="w-[520px]!"
-              isAdvancedMode={true}
-              provider={model.provider}
-              completionParams={model.completion_params}
-              modelId={model.name}
-              setModel={handleModelChange}
-              onCompletionParamsChange={handleCompletionParamsChange}
-              hideDebugWithMultipleModel
-            />
-          </div>
-          <div>
-            <div className="text-[0px]">
-              <div className="mb-1.5 system-sm-semibold-uppercase text-text-secondary">{t('codegen.instruction', { ns: 'appDebug' })}</div>
-              <InstructionEditor
-                editorKey={editorKey}
-                value={instruction}
-                onChange={setInstruction}
-                nodeId={nodeId}
-                generatorType={GeneratorType.code}
-                isShowCurrentBlock={!!currentCode}
+      <DialogContent className="h-[min(680px,calc(100dvh-2rem))] max-h-none! w-full min-w-[1140px] overflow-hidden! border-none p-0! text-left align-middle">
+
+        <div className="relative flex h-full min-h-0 flex-wrap">
+          <div className="h-full w-[570px] shrink-0 overflow-y-auto border-r border-divider-regular p-6">
+            <div className="mb-5">
+              <div className={`text-lg leading-[28px] font-bold ${s.textGradient}`}>{t('codegen.title', { ns: 'appDebug' })}</div>
+              <div className="mt-1 text-[13px] font-normal text-text-tertiary">{t('codegen.description', { ns: 'appDebug' })}</div>
+            </div>
+            <div className="mb-4">
+              <ModelParameterModal
+                popupClassName="w-[520px]!"
+                isAdvancedMode={true}
+                provider={model.provider}
+                completionParams={model.completion_params}
+                modelId={model.name}
+                setModel={handleModelChange}
+                onCompletionParamsChange={handleCompletionParamsChange}
+                hideDebugWithMultipleModel
               />
             </div>
-            <IdeaOutput
-              value={ideaOutput}
-              onChange={setIdeaOutput}
-            />
+            <div>
+              <div className="text-[0px]">
+                <div className="mb-1.5 system-sm-semibold-uppercase text-text-secondary">{t('codegen.instruction', { ns: 'appDebug' })}</div>
+                <InstructionEditor
+                  editorKey={editorKey}
+                  value={instruction}
+                  onChange={setInstruction}
+                  nodeId={nodeId}
+                  generatorType={GeneratorType.code}
+                  isShowCurrentBlock={!!currentCode}
+                />
+              </div>
+              <IdeaOutput
+                value={ideaOutput}
+                onChange={setIdeaOutput}
+              />
 
-            <div className="mt-7 flex justify-end space-x-2">
-              <Button onClick={onClose}>{t(`${i18nPrefix}.dismiss`, { ns: 'appDebug' })}</Button>
-              <Button
-                className="flex space-x-1"
-                variant="primary"
-                onClick={onGenerate}
-                disabled={isLoading}
-              >
-                <Generator className="h-4 w-4" />
-                <span className="text-xs font-semibold">{t('codegen.generate', { ns: 'appDebug' })}</span>
-              </Button>
+              <div className="mt-7 flex justify-end space-x-2">
+                <Button onClick={onClose}>{t(`${i18nPrefix}.dismiss`, { ns: 'appDebug' })}</Button>
+                <Button
+                  className="flex space-x-1"
+                  variant="primary"
+                  onClick={onGenerate}
+                  disabled={isLoading}
+                >
+                  <Generator className="h-4 w-4" />
+                  <span className="text-xs font-semibold">{t('codegen.generate', { ns: 'appDebug' })}</span>
+                </Button>
+              </div>
             </div>
           </div>
+          {isLoading && renderLoading}
+          {!isLoading && !current && <ResPlaceholder />}
+          {(!isLoading && current) && (
+            <div className="h-full w-0 grow bg-background-default-subtle p-6 pb-0">
+              <Result
+                current={current!}
+                currentVersionIndex={currentVersionIndex || 0}
+                setCurrentVersionIndex={setCurrentVersionIndex}
+                versions={versions || []}
+                onApply={showConfirmOverwrite}
+                generatorType={GeneratorType.code}
+              />
+            </div>
+          )}
         </div>
-        {isLoading && renderLoading}
-        {!isLoading && !current && <ResPlaceholder />}
-        {(!isLoading && current) && (
-          <div className="h-full w-0 grow bg-background-default-subtle p-6 pb-0">
-            <Result
-              current={current!}
-              currentVersionIndex={currentVersionIndex || 0}
-              setCurrentVersionIndex={setCurrentVersionIndex}
-              versions={versions || []}
-              onApply={showConfirmOverwrite}
-              generatorType={GeneratorType.code}
-            />
-          </div>
-        )}
-      </div>
-      <AlertDialog open={isShowConfirmOverwrite} onOpenChange={open => !open && hideShowConfirmOverwrite()}>
-        <AlertDialogContent>
-          <div className="flex flex-col gap-2 px-6 pt-6 pb-4">
-            <AlertDialogTitle className="w-full truncate title-2xl-semi-bold text-text-primary">
-              {t('codegen.overwriteConfirmTitle', { ns: 'appDebug' })}
-            </AlertDialogTitle>
-            <AlertDialogDescription className="w-full system-md-regular wrap-break-word whitespace-pre-wrap text-text-tertiary">
-              {t('codegen.overwriteConfirmMessage', { ns: 'appDebug' })}
-            </AlertDialogDescription>
-          </div>
-          <AlertDialogActions>
-            <AlertDialogCancelButton>{t('operation.cancel', { ns: 'common' })}</AlertDialogCancelButton>
-            <AlertDialogConfirmButton
-              onClick={() => {
-                hideShowConfirmOverwrite()
-                onFinished(current!)
-              }}
-            >
-              {t('operation.confirm', { ns: 'common' })}
-            </AlertDialogConfirmButton>
-          </AlertDialogActions>
-        </AlertDialogContent>
-      </AlertDialog>
-    </Modal>
+        <AlertDialog open={isShowConfirmOverwrite} onOpenChange={open => !open && hideShowConfirmOverwrite()}>
+          <AlertDialogContent>
+            <div className="flex flex-col gap-2 px-6 pt-6 pb-4">
+              <AlertDialogTitle className="w-full truncate title-2xl-semi-bold text-text-primary">
+                {t('codegen.overwriteConfirmTitle', { ns: 'appDebug' })}
+              </AlertDialogTitle>
+              <AlertDialogDescription className="w-full system-md-regular wrap-break-word whitespace-pre-wrap text-text-tertiary">
+                {t('codegen.overwriteConfirmMessage', { ns: 'appDebug' })}
+              </AlertDialogDescription>
+            </div>
+            <AlertDialogActions>
+              <AlertDialogCancelButton>{t('operation.cancel', { ns: 'common' })}</AlertDialogCancelButton>
+              <AlertDialogConfirmButton
+                onClick={() => {
+                  hideShowConfirmOverwrite()
+                  onFinished(current!)
+                }}
+              >
+                {t('operation.confirm', { ns: 'common' })}
+              </AlertDialogConfirmButton>
+            </AlertDialogActions>
+          </AlertDialogContent>
+        </AlertDialog>
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/components/app/configuration/configuration-view.tsx b/web/app/components/app/configuration/configuration-view.tsx
index 3a9882db18..80c2934195 100644
--- a/web/app/components/app/configuration/configuration-view.tsx
+++ b/web/app/components/app/configuration/configuration-view.tsx
@@ -12,6 +12,15 @@ import {
   AlertDialogTitle,
 } from '@langgenius/dify-ui/alert-dialog'
 import { Button } from '@langgenius/dify-ui/button'
+import {
+  Drawer,
+  DrawerBackdrop,
+  DrawerCloseButton,
+  DrawerContent,
+  DrawerPopup,
+  DrawerPortal,
+  DrawerViewport,
+} from '@langgenius/dify-ui/drawer'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import AppPublisher from '@/app/components/app/app-publisher/features-wrapper'
@@ -21,7 +30,6 @@ import AgentSettingButton from '@/app/components/app/configuration/config/agent-
 import SelectDataSet from '@/app/components/app/configuration/dataset-config/select-dataset'
 import Debug from '@/app/components/app/configuration/debug'
 import Divider from '@/app/components/base/divider'
-import Drawer from '@/app/components/base/drawer'
 import { FeaturesProvider } from '@/app/components/base/features'
 import NewFeaturePanel from '@/app/components/base/features/new-feature-panel'
 import Loading from '@/app/components/base/loading'
@@ -174,14 +182,12 @@ const ConfigurationView: FC<ConfigurationViewModel> = ({
             </AlertDialogContent>
           </AlertDialog>
 
-          {isShowSelectDataSet && (
-            <SelectDataSet
-              isShow={isShowSelectDataSet}
-              onClose={onCloseSelectDataSet}
-              selectedIds={selectedIds}
-              onSelect={onSelectDataSets}
-            />
-          )}
+          <SelectDataSet
+            isShow={isShowSelectDataSet}
+            onClose={onCloseSelectDataSet}
+            selectedIds={selectedIds}
+            onSelect={onSelectDataSets}
+          />
 
           {isShowHistoryModal && (
             <EditHistoryModal
@@ -194,19 +200,42 @@ const ConfigurationView: FC<ConfigurationViewModel> = ({
           )}
 
           {isMobile && (
-            <Drawer showClose isOpen={isShowDebugPanel} onClose={onHideDebugPanel} mask footer={null}>
-              <Debug
-                isAPIKeySet={contextValue.isAPIKeySet}
-                onSetting={onOpenAccountSettings}
-                inputs={contextValue.inputs}
-                modelParameterParams={{
-                  setModel: onModelChange,
-                  onCompletionParamsChange,
-                }}
-                debugWithMultipleModel={!!debugWithMultipleModel}
-                multipleModelConfigs={multipleModelConfigs}
-                onMultipleModelConfigsChange={onMultipleModelConfigsChange}
-              />
+            <Drawer
+              open={isShowDebugPanel}
+              modal
+              swipeDirection="right"
+              onOpenChange={(open) => {
+                if (!open)
+                  onHideDebugPanel()
+              }}
+            >
+              <DrawerPortal>
+                <DrawerBackdrop className="bg-black/30" />
+                <DrawerViewport>
+                  <DrawerPopup className="data-[swipe-direction=right]:w-full data-[swipe-direction=right]:max-w-sm">
+                    <DrawerContent className="flex min-h-0 flex-1 flex-col">
+                      <div className="mb-4 flex shrink-0 justify-end">
+                        <DrawerCloseButton
+                          aria-label={t('operation.close', { ns: 'common' })}
+                          className="h-6 w-6 rounded-md"
+                        />
+                      </div>
+                      <Debug
+                        isAPIKeySet={contextValue.isAPIKeySet}
+                        onSetting={onOpenAccountSettings}
+                        inputs={contextValue.inputs}
+                        modelParameterParams={{
+                          setModel: onModelChange,
+                          onCompletionParamsChange,
+                        }}
+                        debugWithMultipleModel={!!debugWithMultipleModel}
+                        multipleModelConfigs={multipleModelConfigs}
+                        onMultipleModelConfigsChange={onMultipleModelConfigsChange}
+                      />
+                    </DrawerContent>
+                  </DrawerPopup>
+                </DrawerViewport>
+              </DrawerPortal>
             </Drawer>
           )}
 
diff --git a/web/app/components/app/configuration/ctrl-btn-group/__tests__/index.spec.tsx b/web/app/components/app/configuration/ctrl-btn-group/__tests__/index.spec.tsx
index 65f03c92cd..036820f1b3 100644
--- a/web/app/components/app/configuration/ctrl-btn-group/__tests__/index.spec.tsx
+++ b/web/app/components/app/configuration/ctrl-btn-group/__tests__/index.spec.tsx
@@ -17,8 +17,8 @@ describe('ContrlBtnGroup', () => {
       render(<ContrlBtnGroup onSave={onSave} onReset={onReset} />)
 
       // Assert
-      expect(screen.getByTestId('apply-btn')).toBeInTheDocument()
-      expect(screen.getByTestId('reset-btn')).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'appDebug.operation.applyConfig' })).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'appDebug.operation.resetConfig' })).toBeInTheDocument()
     })
   })
 
@@ -31,8 +31,8 @@ describe('ContrlBtnGroup', () => {
       render(<ContrlBtnGroup onSave={onSave} onReset={onReset} />)
 
       // Act
-      fireEvent.click(screen.getByTestId('apply-btn'))
-      fireEvent.click(screen.getByTestId('reset-btn'))
+      fireEvent.click(screen.getByRole('button', { name: 'appDebug.operation.applyConfig' }))
+      fireEvent.click(screen.getByRole('button', { name: 'appDebug.operation.resetConfig' }))
 
       // Assert
       expect(onSave).toHaveBeenCalledTimes(1)
diff --git a/web/app/components/app/configuration/ctrl-btn-group/index.tsx b/web/app/components/app/configuration/ctrl-btn-group/index.tsx
index 6ac485c097..c746d273ba 100644
--- a/web/app/components/app/configuration/ctrl-btn-group/index.tsx
+++ b/web/app/components/app/configuration/ctrl-btn-group/index.tsx
@@ -15,8 +15,8 @@ const ContrlBtnGroup: FC<IContrlBtnGroupProps> = ({ onSave, onReset }) => {
   return (
     <div className="fixed bottom-0 left-[224px] h-[64px] w-[519px]">
       <div className={`${s.ctrlBtn} flex h-full items-center gap-2 bg-white pl-4`}>
-        <Button variant="primary" onClick={onSave} data-testid="apply-btn">{t('operation.applyConfig', { ns: 'appDebug' })}</Button>
-        <Button onClick={onReset} data-testid="reset-btn">{t('operation.resetConfig', { ns: 'appDebug' })}</Button>
+        <Button variant="primary" onClick={onSave}>{t('operation.applyConfig', { ns: 'appDebug' })}</Button>
+        <Button onClick={onReset}>{t('operation.resetConfig', { ns: 'appDebug' })}</Button>
       </div>
     </div>
   )
diff --git a/web/app/components/app/configuration/dataset-config/card-item/__tests__/index.spec.tsx b/web/app/components/app/configuration/dataset-config/card-item/__tests__/index.spec.tsx
index 1d14f7dbd2..cffed4b846 100644
--- a/web/app/components/app/configuration/dataset-config/card-item/__tests__/index.spec.tsx
+++ b/web/app/components/app/configuration/dataset-config/card-item/__tests__/index.spec.tsx
@@ -230,8 +230,12 @@ describe('dataset-config/card-item', () => {
     expect(screen.getByText('Mock settings modal'))!.toBeInTheDocument()
 
     const overlay = [...document.querySelectorAll('[class]')]
-      .find(element => element.className.toString().includes('bg-black/30'))
+      .find(element =>
+        element instanceof HTMLElement
+        && element.classList.contains('bg-background-overlay')
+        && !element.classList.contains('bg-transparent'),
+      )
 
-    expect(overlay)!.toBeInTheDocument()
+    expect(overlay).toBeInTheDocument()
   })
 })
diff --git a/web/app/components/app/configuration/dataset-config/card-item/index.tsx b/web/app/components/app/configuration/dataset-config/card-item/index.tsx
index 8eb856feb3..62dd17f4b1 100644
--- a/web/app/components/app/configuration/dataset-config/card-item/index.tsx
+++ b/web/app/components/app/configuration/dataset-config/card-item/index.tsx
@@ -2,6 +2,14 @@
 import type { FC } from 'react'
 import type { DataSet } from '@/models/datasets'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  Drawer,
+  DrawerBackdrop,
+  DrawerContent,
+  DrawerPopup,
+  DrawerPortal,
+  DrawerViewport,
+} from '@langgenius/dify-ui/drawer'
 import {
   RiDeleteBinLine,
   RiEditLine,
@@ -12,7 +20,6 @@ import { useTranslation } from 'react-i18next'
 import ActionButton, { ActionButtonState } from '@/app/components/base/action-button'
 import AppIcon from '@/app/components/base/app-icon'
 import Badge from '@/app/components/base/badge'
-import Drawer from '@/app/components/base/drawer'
 import useBreakpoints, { MediaType } from '@/hooks/use-breakpoints'
 import { useKnowledge } from '@/hooks/use-knowledge'
 import SettingsModal from '../settings-modal'
@@ -112,14 +119,31 @@ const Item: FC<ItemProps> = ({
           />
         )
       }
-      <Drawer isOpen={showSettingsModal} onClose={() => setShowSettingsModal(false)} footer={null} mask={isMobile} panelClassName="mt-16 mx-2 sm:mr-2 mb-3 p-0! max-w-[640px]! rounded-xl">
-        {showSettingsModal && (
-          <SettingsModal
-            currentDataset={config}
-            onCancel={() => setShowSettingsModal(false)}
-            onSave={handleSave}
-          />
-        )}
+      <Drawer
+        open={showSettingsModal}
+        modal
+        swipeDirection="right"
+        onOpenChange={(open) => {
+          if (!open)
+            setShowSettingsModal(false)
+        }}
+      >
+        <DrawerPortal>
+          <DrawerBackdrop className={cn(!isMobile && 'bg-transparent')} />
+          <DrawerViewport>
+            <DrawerPopup className="p-0! data-[swipe-direction=right]:top-16 data-[swipe-direction=right]:right-2 data-[swipe-direction=right]:bottom-3 data-[swipe-direction=right]:h-auto data-[swipe-direction=right]:w-full data-[swipe-direction=right]:max-w-[640px] data-[swipe-direction=right]:rounded-xl">
+              <DrawerContent className="flex min-h-0 flex-1 flex-col p-0 pb-0">
+                {showSettingsModal && (
+                  <SettingsModal
+                    currentDataset={config}
+                    onCancel={() => setShowSettingsModal(false)}
+                    onSave={handleSave}
+                  />
+                )}
+              </DrawerContent>
+            </DrawerPopup>
+          </DrawerViewport>
+        </DrawerPortal>
       </Drawer>
     </div>
   )
diff --git a/web/app/components/app/configuration/dataset-config/context-var/__tests__/index.spec.tsx b/web/app/components/app/configuration/dataset-config/context-var/__tests__/index.spec.tsx
index e8b1583171..f8017c3585 100644
--- a/web/app/components/app/configuration/dataset-config/context-var/__tests__/index.spec.tsx
+++ b/web/app/components/app/configuration/dataset-config/context-var/__tests__/index.spec.tsx
@@ -1,7 +1,7 @@
+import type * as React from 'react'
 import type { Props } from '../var-picker'
 import { render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
-import * as React from 'react'
 import ContextVar from '../index'
 
 // Mock external dependencies only
@@ -76,57 +76,6 @@ vi.mock('@langgenius/dify-ui/popover', async () => {
   }
 })
 
-type PortalToFollowElemProps = {
-  children: React.ReactNode
-  open?: boolean
-  onOpenChange?: (open: boolean) => void
-}
-type PortalToFollowElemTriggerProps = React.HTMLAttributes<HTMLElement> & { children?: React.ReactNode, asChild?: boolean }
-type PortalToFollowElemContentProps = React.HTMLAttributes<HTMLDivElement> & { children?: React.ReactNode }
-
-vi.mock('@/app/components/base/portal-to-follow-elem', () => {
-  const PortalContext = React.createContext({ open: false })
-
-  const PortalToFollowElem = ({ children, open }: PortalToFollowElemProps) => {
-    return (
-      <PortalContext.Provider value={{ open: !!open }}>
-        <div data-testid="portal">{children}</div>
-      </PortalContext.Provider>
-    )
-  }
-
-  const PortalToFollowElemContent = ({ children, ...props }: PortalToFollowElemContentProps) => {
-    const { open } = React.useContext(PortalContext)
-    if (!open)
-      return null
-    return (
-      <div data-testid="portal-content" {...props}>
-        {children}
-      </div>
-    )
-  }
-
-  const PortalToFollowElemTrigger = ({ children, asChild, ...props }: PortalToFollowElemTriggerProps) => {
-    if (asChild && React.isValidElement(children)) {
-      return React.cloneElement(children, {
-        ...props,
-        'data-testid': 'portal-trigger',
-      } as React.HTMLAttributes<HTMLElement>)
-    }
-    return (
-      <div data-testid="portal-trigger" {...props}>
-        {children}
-      </div>
-    )
-  }
-
-  return {
-    PortalToFollowElem,
-    PortalToFollowElemContent,
-    PortalToFollowElemTrigger,
-  }
-})
-
 describe('ContextVar', () => {
   const mockOptions: Props['options'] = [
     { name: 'Variable 1', value: 'var1', type: 'string' },
diff --git a/web/app/components/app/configuration/dataset-config/context-var/__tests__/var-picker.spec.tsx b/web/app/components/app/configuration/dataset-config/context-var/__tests__/var-picker.spec.tsx
index 7890343720..5b77134468 100644
--- a/web/app/components/app/configuration/dataset-config/context-var/__tests__/var-picker.spec.tsx
+++ b/web/app/components/app/configuration/dataset-config/context-var/__tests__/var-picker.spec.tsx
@@ -10,41 +10,41 @@ vi.mock('@/next/navigation', () => ({
   usePathname: () => '/test',
 }))
 
-type PortalToFollowElemProps = {
+type PopoverProps = {
   children: React.ReactNode
   open?: boolean
   onOpenChange?: (open: boolean) => void
 }
-type PortalToFollowElemTriggerProps = React.HTMLAttributes<HTMLElement> & { children?: React.ReactNode, asChild?: boolean }
-type PortalToFollowElemContentProps = React.HTMLAttributes<HTMLDivElement> & { children?: React.ReactNode }
+type PopoverTriggerProps = React.HTMLAttributes<HTMLElement> & { children?: React.ReactNode, asChild?: boolean }
+type PopoverContentProps = React.HTMLAttributes<HTMLDivElement> & { children?: React.ReactNode }
 
 vi.mock('@langgenius/dify-ui/popover', () => {
-  const PortalContext = React.createContext({
+  const PopoverContext = React.createContext({
     open: false,
     onOpenChange: undefined as ((open: boolean) => void) | undefined,
   })
 
-  const Popover = ({ children, open, onOpenChange }: PortalToFollowElemProps) => {
+  const Popover = ({ children, open, onOpenChange }: PopoverProps) => {
     return (
-      <PortalContext.Provider value={{ open: !!open, onOpenChange }}>
-        <div data-testid="portal">{children}</div>
-      </PortalContext.Provider>
+      <PopoverContext.Provider value={{ open: !!open, onOpenChange }}>
+        <div data-testid="popover">{children}</div>
+      </PopoverContext.Provider>
     )
   }
 
-  const PopoverContent = ({ children, ...props }: PortalToFollowElemContentProps) => {
-    const { open } = React.useContext(PortalContext)
+  const PopoverContent = ({ children, ...props }: PopoverContentProps) => {
+    const { open } = React.useContext(PopoverContext)
     if (!open)
       return null
     return (
-      <div data-testid="portal-content" {...props}>
+      <div data-testid="popover-content" {...props}>
         {children}
       </div>
     )
   }
 
-  const PopoverTrigger = ({ children, asChild, render, ...props }: PortalToFollowElemTriggerProps & { render?: React.ReactNode }) => {
-    const { open, onOpenChange } = React.useContext(PortalContext)
+  const PopoverTrigger = ({ children, asChild, render, ...props }: PopoverTriggerProps & { render?: React.ReactNode }) => {
+    const { open, onOpenChange } = React.useContext(PopoverContext)
     const content = render ?? children
     const handleClick = (e: React.MouseEvent<HTMLElement>) => {
       props.onClick?.(e)
@@ -56,7 +56,7 @@ vi.mock('@langgenius/dify-ui/popover', () => {
       return React.cloneElement(content, {
         ...props,
         'onClick': handleClick,
-        'data-testid': 'portal-trigger',
+        'data-testid': 'popover-trigger',
       } as React.HTMLAttributes<HTMLElement>)
     }
 
@@ -64,11 +64,11 @@ vi.mock('@langgenius/dify-ui/popover', () => {
       return React.cloneElement(children, {
         ...props,
         'onClick': handleClick,
-        'data-testid': 'portal-trigger',
+        'data-testid': 'popover-trigger',
       } as React.HTMLAttributes<HTMLElement>)
     }
     return (
-      <div data-testid="portal-trigger" {...props} onClick={handleClick}>
+      <div data-testid="popover-trigger" {...props} onClick={handleClick}>
         {content}
       </div>
     )
@@ -109,7 +109,7 @@ describe('VarPicker', () => {
 
       // Assert
       // Assert
-      expect(screen.getByTestId('portal-trigger'))!.toBeInTheDocument()
+      expect(screen.getByTestId('popover-trigger'))!.toBeInTheDocument()
       expect(screen.getByText('var1'))!.toBeInTheDocument()
     })
 
@@ -201,7 +201,7 @@ describe('VarPicker', () => {
 
       // Assert - Trigger should be present
       // Assert - Trigger should be present
-      expect(screen.getByTestId('portal-trigger'))!.toBeInTheDocument()
+      expect(screen.getByTestId('popover-trigger'))!.toBeInTheDocument()
     })
   })
 
@@ -234,7 +234,7 @@ describe('VarPicker', () => {
 
       // Assert
       // Assert
-      expect(screen.getByTestId('portal-trigger'))!.toHaveClass('custom-trigger-class')
+      expect(screen.getByTestId('popover-trigger'))!.toHaveClass('custom-trigger-class')
     })
 
     it('should display selected value with proper formatting', () => {
@@ -268,11 +268,11 @@ describe('VarPicker', () => {
 
       // Act
       render(<VarPicker {...props} />)
-      await user.click(screen.getByTestId('portal-trigger'))
+      await user.click(screen.getByTestId('popover-trigger'))
 
       // Assert
       // Assert
-      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
+      expect(screen.getByTestId('popover-content'))!.toBeInTheDocument()
     })
 
     it('should call onChange and close dropdown when selecting an option', async () => {
@@ -285,8 +285,8 @@ describe('VarPicker', () => {
       render(<VarPicker {...props} />)
 
       // Open dropdown
-      await user.click(screen.getByTestId('portal-trigger'))
-      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
+      await user.click(screen.getByTestId('popover-trigger'))
+      expect(screen.getByTestId('popover-content'))!.toBeInTheDocument()
 
       // Select a different option
       const options = screen.getAllByText('var2')
@@ -295,7 +295,7 @@ describe('VarPicker', () => {
 
       // Assert
       expect(onChange).toHaveBeenCalledWith('var2')
-      expect(screen.queryByTestId('portal-content')).not.toBeInTheDocument()
+      expect(screen.queryByTestId('popover-content')).not.toBeInTheDocument()
     })
 
     it('should toggle dropdown when clicking trigger button multiple times', async () => {
@@ -306,15 +306,15 @@ describe('VarPicker', () => {
       // Act
       render(<VarPicker {...props} />)
 
-      const trigger = screen.getByTestId('portal-trigger')
+      const trigger = screen.getByTestId('popover-trigger')
 
       // Open dropdown
       await user.click(trigger)
-      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
+      expect(screen.getByTestId('popover-content'))!.toBeInTheDocument()
 
       // Close dropdown
       await user.click(trigger)
-      expect(screen.queryByTestId('portal-content')).not.toBeInTheDocument()
+      expect(screen.queryByTestId('popover-content')).not.toBeInTheDocument()
     })
   })
 
@@ -359,7 +359,7 @@ describe('VarPicker', () => {
       // Assert
       // Assert
       // Assert
-      expect(screen.queryByTestId('portal-content')).not.toBeInTheDocument()
+      expect(screen.queryByTestId('popover-content')).not.toBeInTheDocument()
     })
 
     it('should toggle dropdown state on trigger click', async () => {
@@ -370,16 +370,16 @@ describe('VarPicker', () => {
       // Act
       render(<VarPicker {...props} />)
 
-      const trigger = screen.getByTestId('portal-trigger')
-      expect(screen.queryByTestId('portal-content')).not.toBeInTheDocument()
+      const trigger = screen.getByTestId('popover-trigger')
+      expect(screen.queryByTestId('popover-content')).not.toBeInTheDocument()
 
       // Open dropdown
       await user.click(trigger)
-      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
+      expect(screen.getByTestId('popover-content'))!.toBeInTheDocument()
 
       // Close dropdown
       await user.click(trigger)
-      expect(screen.queryByTestId('portal-content')).not.toBeInTheDocument()
+      expect(screen.queryByTestId('popover-content')).not.toBeInTheDocument()
     })
 
     it('should preserve selected value when dropdown is closed without selection', async () => {
@@ -391,7 +391,7 @@ describe('VarPicker', () => {
       render(<VarPicker {...props} />)
 
       // Open and close dropdown without selecting anything
-      const trigger = screen.getByTestId('portal-trigger')
+      const trigger = screen.getByTestId('popover-trigger')
       await user.click(trigger)
       await user.click(trigger)
 
@@ -416,7 +416,7 @@ describe('VarPicker', () => {
       // Assert
       // Assert
       expect(screen.getByText('appDebug.feature.dataSet.queryVariable.choosePlaceholder'))!.toBeInTheDocument()
-      expect(screen.getByTestId('portal-trigger'))!.toBeInTheDocument()
+      expect(screen.getByTestId('popover-trigger'))!.toBeInTheDocument()
     })
 
     it('should handle empty options array', () => {
@@ -432,7 +432,7 @@ describe('VarPicker', () => {
 
       // Assert
       // Assert
-      expect(screen.getByTestId('portal-trigger'))!.toBeInTheDocument()
+      expect(screen.getByTestId('popover-trigger'))!.toBeInTheDocument()
       expect(screen.getByText('appDebug.feature.dataSet.queryVariable.choosePlaceholder'))!.toBeInTheDocument()
     })
 
@@ -485,7 +485,7 @@ describe('VarPicker', () => {
       // Assert
       // Assert
       expect(screen.getByText('longVar'))!.toBeInTheDocument()
-      expect(screen.getByTestId('portal-trigger'))!.toBeInTheDocument()
+      expect(screen.getByTestId('popover-trigger'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/app/configuration/dataset-config/context-var/var-picker.tsx b/web/app/components/app/configuration/dataset-config/context-var/var-picker.tsx
index 9bac1c7a41..0938d0aea4 100644
--- a/web/app/components/app/configuration/dataset-config/context-var/var-picker.tsx
+++ b/web/app/components/app/configuration/dataset-config/context-var/var-picker.tsx
@@ -83,7 +83,6 @@ const VarPicker: FC<Props> = ({
         placement="bottom-end"
         sideOffset={8}
         popupClassName="border-none bg-transparent p-0 shadow-none backdrop-blur-none"
-        positionerProps={{ style: { zIndex: 1000 } }}
       >
         {options.length > 0
           ? (
diff --git a/web/app/components/app/configuration/dataset-config/params-config/__tests__/index.spec.tsx b/web/app/components/app/configuration/dataset-config/params-config/__tests__/index.spec.tsx
index b5924a5f23..e9f535999b 100644
--- a/web/app/components/app/configuration/dataset-config/params-config/__tests__/index.spec.tsx
+++ b/web/app/components/app/configuration/dataset-config/params-config/__tests__/index.spec.tsx
@@ -13,37 +13,6 @@ import { RerankingModeEnum } from '@/models/datasets'
 import { RETRIEVE_TYPE } from '@/types/app'
 import ParamsConfig from '../index'
 
-vi.mock('@headlessui/react', () => ({
-  Dialog: ({ children, className }: { children: React.ReactNode, className?: string }) => (
-    <div role="dialog" className={className}>
-      {children}
-    </div>
-  ),
-  DialogPanel: ({ children, className, ...props }: { children: React.ReactNode, className?: string }) => (
-    <div className={className} {...props}>
-      {children}
-    </div>
-  ),
-  DialogTitle: ({ children, className, ...props }: { children: React.ReactNode, className?: string }) => (
-    <div className={className} {...props}>
-      {children}
-    </div>
-  ),
-  Transition: ({ show, children }: { show: boolean, children: React.ReactNode }) => (show ? <>{children}</> : null),
-  TransitionChild: ({ children }: { children: React.ReactNode }) => <>{children}</>,
-  Switch: ({ checked, onChange, children, ...props }: { checked: boolean, onChange?: (value: boolean) => void, children?: React.ReactNode }) => (
-    <button
-      type="button"
-      role="switch"
-      aria-checked={checked}
-      onClick={() => onChange?.(!checked)}
-      {...props}
-    >
-      {children}
-    </button>
-  ),
-}))
-
 vi.mock('@/app/components/header/account-setting/model-provider-page/hooks', () => ({
   useModelListAndDefaultModelAndCurrentProviderAndModel: vi.fn(),
   useCurrentProviderAndModel: vi.fn(),
diff --git a/web/app/components/app/configuration/dataset-config/params-config/index.tsx b/web/app/components/app/configuration/dataset-config/params-config/index.tsx
index d4578af1d7..edfffd5726 100644
--- a/web/app/components/app/configuration/dataset-config/params-config/index.tsx
+++ b/web/app/components/app/configuration/dataset-config/params-config/index.tsx
@@ -3,12 +3,12 @@ import type { DataSet } from '@/models/datasets'
 import type { DatasetConfigs } from '@/models/debug'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
 import { RiEqualizer2Line } from '@remixicon/react'
 import { memo, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useContext } from 'use-context-selector'
-import Modal from '@/app/components/base/modal'
 import { ModelTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import { useCurrentProviderAndModel, useModelListAndDefaultModelAndCurrentProviderAndModel } from '@/app/components/header/account-setting/model-provider-page/hooks'
 import {
@@ -123,32 +123,36 @@ const ParamsConfig = ({
       </Button>
       {
         rerankSettingModalOpen && (
-          <Modal
-            isShow={rerankSettingModalOpen}
-            onClose={() => {
-              setRerankSettingModalOpen(false)
+          <Dialog
+            open={rerankSettingModalOpen}
+            onOpenChange={(open) => {
+              if (!open) {
+                setRerankSettingModalOpen(false)
+              }
             }}
-            className="sm:min-w-[528px]"
           >
-            <ConfigContent
-              datasetConfigs={tempDataSetConfigs}
-              onChange={handleSetTempDataSetConfigs}
-              selectedDatasets={selectedDatasets}
-            />
+            <DialogContent className="w-full max-w-[480px] border-none text-left align-middle sm:min-w-[528px]">
 
-            <div className="mt-6 flex justify-end">
-              <Button
-                className="mr-2 shrink-0"
-                onClick={() => {
-                  setTempDataSetConfigs(datasetConfigs)
-                  setRerankSettingModalOpen(false)
-                }}
-              >
-                {t('operation.cancel', { ns: 'common' })}
-              </Button>
-              <Button variant="primary" className="shrink-0" onClick={handleSave}>{t('operation.save', { ns: 'common' })}</Button>
-            </div>
-          </Modal>
+              <ConfigContent
+                datasetConfigs={tempDataSetConfigs}
+                onChange={handleSetTempDataSetConfigs}
+                selectedDatasets={selectedDatasets}
+              />
+
+              <div className="mt-6 flex justify-end">
+                <Button
+                  className="mr-2 shrink-0"
+                  onClick={() => {
+                    setTempDataSetConfigs(datasetConfigs)
+                    setRerankSettingModalOpen(false)
+                  }}
+                >
+                  {t('operation.cancel', { ns: 'common' })}
+                </Button>
+                <Button variant="primary" className="shrink-0" onClick={handleSave}>{t('operation.save', { ns: 'common' })}</Button>
+              </div>
+            </DialogContent>
+          </Dialog>
         )
       }
 
diff --git a/web/app/components/app/configuration/dataset-config/select-dataset/index.tsx b/web/app/components/app/configuration/dataset-config/select-dataset/index.tsx
index 13d11574d5..45647160a0 100644
--- a/web/app/components/app/configuration/dataset-config/select-dataset/index.tsx
+++ b/web/app/components/app/configuration/dataset-config/select-dataset/index.tsx
@@ -3,14 +3,14 @@ import type { FC } from 'react'
 import type { DataSet } from '@/models/datasets'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogCloseButton, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import { useInfiniteScroll } from 'ahooks'
 import * as React from 'react'
-import { useMemo, useRef, useState } from 'react'
+import { useCallback, 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'
 import Loading from '@/app/components/base/loading'
-import Modal from '@/app/components/base/modal'
 import { ModelFeatureEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import FeatureIcon from '@/app/components/header/account-setting/model-provider-page/model-selector/feature-icon'
 import { useKnowledge } from '@/hooks/use-knowledge'
@@ -79,100 +79,103 @@ const SelectDataSet: FC<ISelectDataSetProps> = ({
     onSelect(selected)
   }
 
+  const handleClose = useCallback(() => {
+    setSelectedIdsInModal(selectedIds)
+    onClose()
+  }, [onClose, selectedIds])
+
+  const handleOpenChange = useCallback((open: boolean) => {
+    if (!open)
+      handleClose()
+  }, [handleClose])
+
   return (
-    <Modal
-      isShow={isShow}
-      onClose={onClose}
-      className="w-[400px]"
-      title={t('feature.dataSet.selectTitle', { ns: 'appDebug' })}
-    >
-      {(isLoading && datasets.length === 0) && (
-        <div className="flex h-[200px]">
-          <Loading type="area" />
-        </div>
-      )}
+    <Dialog open={isShow} onOpenChange={handleOpenChange}>
+      <DialogContent className="w-100 overflow-hidden">
+        <DialogTitle className="title-2xl-semi-bold text-text-primary">
+          {t('feature.dataSet.selectTitle', { ns: 'appDebug' })}
+        </DialogTitle>
+        <DialogCloseButton aria-label={t('operation.close', { ns: 'common' })} />
+        {(isLoading && datasets.length === 0) && (
+          <div className="flex h-50">
+            <Loading type="area" />
+          </div>
+        )}
 
-      {hasNoData && (
-        <div
-          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',
-          }}
-        >
-          <span className="text-text-tertiary">{t('feature.dataSet.noDataSet', { ns: 'appDebug' })}</span>
-          <Link href="/datasets/create" className="font-normal text-text-accent">{t('feature.dataSet.toCreate', { ns: 'appDebug' })}</Link>
-        </div>
-      )}
+        {hasNoData && (
+          <div className="mt-6 flex h-32 items-center justify-center space-x-1 rounded-lg border border-divider-subtle bg-components-panel-on-panel-item-bg text-[13px]">
+            <span className="text-text-tertiary">{t('feature.dataSet.noDataSet', { ns: 'appDebug' })}</span>
+            <Link href="/datasets/create" className="font-normal text-text-accent">{t('feature.dataSet.toCreate', { ns: 'appDebug' })}</Link>
+          </div>
+        )}
 
-      {datasets.length > 0 && (
-        <>
-          <div ref={listRef} className="mt-7 max-h-[286px] space-y-1 overflow-y-auto">
-            {datasets.map(item => (
-              <div
-                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',
-                  !item.embedding_available && 'hover:border-components-panel-border-subtle hover:bg-components-panel-on-panel-item-bg hover:shadow-xs',
-                )}
-                onClick={() => {
-                  if (!item.embedding_available)
-                    return
-                  toggleSelect(item)
-                }}
-              >
-                <div className="mr-1 flex grow items-center overflow-hidden">
-                  <div className={cn('mr-2', !item.embedding_available && 'opacity-30')}>
-                    <AppIcon
-                      size="tiny"
-                      iconType={item.icon_info.icon_type}
-                      icon={item.icon_info.icon}
-                      background={item.icon_info.icon_type === 'image' ? undefined : item.icon_info.icon_background}
-                      imageUrl={item.icon_info.icon_type === 'image' ? item.icon_info.icon_url : undefined}
-                    />
-                  </div>
-                  <div className={cn('max-w-[200px] truncate text-[13px] font-medium text-text-secondary', !item.embedding_available && 'max-w-[120px]! opacity-30')}>{item.name}</div>
-                  {!item.embedding_available && (
-                    <span className="ml-1 shrink-0 rounded-md border border-divider-deep px-1 text-xs leading-[18px] font-normal text-text-tertiary">{t('unavailable', { ns: 'dataset' })}</span>
+        {datasets.length > 0 && (
+          <>
+            <div ref={listRef} className="mt-7 max-h-71.5 space-y-1 overflow-y-auto">
+              {datasets.map(item => (
+                <button
+                  key={item.id}
+                  type="button"
+                  disabled={!item.embedding_available}
+                  className={cn(
+                    'flex h-10 w-full cursor-pointer items-center rounded-lg border-[0.5px] border-components-panel-border-subtle bg-components-panel-on-panel-item-bg px-2 text-left shadow-xs outline-hidden hover:border-components-panel-border hover:bg-components-panel-on-panel-item-bg-hover hover:shadow-sm focus-visible:ring-2 focus-visible:ring-state-accent-solid',
+                    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',
+                    !item.embedding_available && 'cursor-default hover:border-components-panel-border-subtle hover:bg-components-panel-on-panel-item-bg hover:shadow-xs',
                   )}
-                </div>
-                {item.is_multimodal && (
-                  <div className="mr-1 shrink-0">
-                    <FeatureIcon feature={ModelFeatureEnum.vision} />
+                  onClick={() => toggleSelect(item)}
+                >
+                  <div className="mr-1 flex grow items-center overflow-hidden">
+                    <div className={cn('mr-2', !item.embedding_available && 'opacity-30')}>
+                      <AppIcon
+                        size="tiny"
+                        iconType={item.icon_info.icon_type}
+                        icon={item.icon_info.icon}
+                        background={item.icon_info.icon_type === 'image' ? undefined : item.icon_info.icon_background}
+                        imageUrl={item.icon_info.icon_type === 'image' ? item.icon_info.icon_url : undefined}
+                      />
+                    </div>
+                    <div className={cn('max-w-50 truncate text-[13px] font-medium text-text-secondary', !item.embedding_available && 'max-w-30! opacity-30')}>{item.name}</div>
+                    {!item.embedding_available && (
+                      <span className="ml-1 shrink-0 rounded-md border border-divider-deep px-1 text-xs leading-[18px] font-normal text-text-tertiary">{t('unavailable', { ns: 'dataset' })}</span>
+                    )}
                   </div>
-                )}
-                {
-                  !!item.indexing_technique && (
-                    <Badge
-                      className="shrink-0"
-                      text={formatIndexingTechniqueAndMethod(item.indexing_technique, item.retrieval_model_dict?.search_method)}
-                    />
-                  )
-                }
-                {
-                  item.provider === 'external' && (
-                    <Badge className="shrink-0" text={t('externalTag', { ns: 'dataset' })} />
-                  )
-                }
-              </div>
-            ))}
-            {isFetchingNextPage && <Loading />}
+                  {item.is_multimodal && (
+                    <div className="mr-1 shrink-0">
+                      <FeatureIcon feature={ModelFeatureEnum.vision} />
+                    </div>
+                  )}
+                  {
+                    !!item.indexing_technique && (
+                      <Badge
+                        className="shrink-0"
+                        text={formatIndexingTechniqueAndMethod(item.indexing_technique, item.retrieval_model_dict?.search_method)}
+                      />
+                    )
+                  }
+                  {
+                    item.provider === 'external' && (
+                      <Badge className="shrink-0" text={t('externalTag', { ns: 'dataset' })} />
+                    )
+                  }
+                </button>
+              ))}
+              {isFetchingNextPage && <Loading />}
+            </div>
+          </>
+        )}
+        {!isLoading && (
+          <div className="mt-8 flex items-center justify-between">
+            <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">
+              <Button onClick={handleClose}>{t('operation.cancel', { ns: 'common' })}</Button>
+              <Button variant="primary" onClick={handleSelect} disabled={hasNoData}>{t('operation.add', { ns: 'common' })}</Button>
+            </div>
           </div>
-        </>
-      )}
-      {!isLoading && (
-        <div className="mt-8 flex items-center justify-between">
-          <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">
-            <Button onClick={onClose}>{t('operation.cancel', { ns: 'common' })}</Button>
-            <Button variant="primary" onClick={handleSelect} disabled={hasNoData}>{t('operation.add', { ns: 'common' })}</Button>
-          </div>
-        </div>
-      )}
-    </Modal>
+        )}
+      </DialogContent>
+    </Dialog>
   )
 }
 export default React.memo(SelectDataSet)
diff --git a/web/app/components/app/configuration/dataset-config/settings-modal/__tests__/index.spec.tsx b/web/app/components/app/configuration/dataset-config/settings-modal/__tests__/index.spec.tsx
index cf1df79d1e..cc7f574208 100644
--- a/web/app/components/app/configuration/dataset-config/settings-modal/__tests__/index.spec.tsx
+++ b/web/app/components/app/configuration/dataset-config/settings-modal/__tests__/index.spec.tsx
@@ -372,7 +372,7 @@ describe('SettingsModal', () => {
 
       // Act
       await renderSettingsModal(createDataset())
-      await user.click(screen.getByText('datasetSettings.form.embeddingModelTipLink'))
+      await user.click(screen.getByRole('button', { name: 'datasetSettings.form.embeddingModelTipLink' }))
 
       // Assert
       expect(mockSetShowAccountSettingModal).toHaveBeenCalledWith({ payload: ACCOUNT_SETTING_TAB.PROVIDER })
diff --git a/web/app/components/app/configuration/dataset-config/settings-modal/index.tsx b/web/app/components/app/configuration/dataset-config/settings-modal/index.tsx
index 74e4ca5fe5..7e32ecde11 100644
--- a/web/app/components/app/configuration/dataset-config/settings-modal/index.tsx
+++ b/web/app/components/app/configuration/dataset-config/settings-modal/index.tsx
@@ -281,7 +281,13 @@ const SettingsModal: FC<SettingsModalProps> = ({
               </div>
               <div className="mt-2 w-full text-xs leading-6 text-text-tertiary">
                 {t('form.embeddingModelTip', { ns: 'datasetSettings' })}
-                <span className="cursor-pointer text-text-accent" onClick={() => setShowAccountSettingModal({ payload: ACCOUNT_SETTING_TAB.PROVIDER })}>{t('form.embeddingModelTipLink', { ns: 'datasetSettings' })}</span>
+                <button
+                  type="button"
+                  className="cursor-pointer border-none bg-transparent p-0 text-left text-text-accent focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+                  onClick={() => setShowAccountSettingModal({ payload: ACCOUNT_SETTING_TAB.PROVIDER })}
+                >
+                  {t('form.embeddingModelTipLink', { ns: 'datasetSettings' })}
+                </button>
               </div>
             </div>
           </div>
diff --git a/web/app/components/app/configuration/debug/chat-user-input.tsx b/web/app/components/app/configuration/debug/chat-user-input.tsx
index 2eff7ac3ca..5d6b6cdf89 100644
--- a/web/app/components/app/configuration/debug/chat-user-input.tsx
+++ b/web/app/components/app/configuration/debug/chat-user-input.tsx
@@ -113,7 +113,7 @@ const ChatUserInput = ({
                     <SelectTrigger className="w-full">
                       {String(inputs[key] || t('placeholder.select', { ns: 'common' }))}
                     </SelectTrigger>
-                    <SelectContent popupClassName="w-(--anchor-width)">
+                    <SelectContent>
                       {(options || []).map(option => (
                         <SelectItem key={option} value={option}>
                           <SelectItemText>{option}</SelectItemText>
diff --git a/web/app/components/app/configuration/prompt-value-panel/__tests__/index.spec.tsx b/web/app/components/app/configuration/prompt-value-panel/__tests__/index.spec.tsx
index 81c90deab6..f935abcee6 100644
--- a/web/app/components/app/configuration/prompt-value-panel/__tests__/index.spec.tsx
+++ b/web/app/components/app/configuration/prompt-value-panel/__tests__/index.spec.tsx
@@ -439,7 +439,7 @@ describe('PromptValuePanel', () => {
   it('collapses the user input panel and hides the clear and run actions', () => {
     renderPanel()
 
-    fireEvent.click(screen.getByText('appDebug.inputs.userInputField'))
+    fireEvent.click(screen.getByRole('button', { name: 'appDebug.inputs.userInputField' }))
 
     expect(screen.queryByRole('button', { name: 'common.operation.clear' })).not.toBeInTheDocument()
     expect(screen.queryByRole('button', { name: 'appDebug.inputs.run' })).not.toBeInTheDocument()
diff --git a/web/app/components/app/configuration/prompt-value-panel/index.tsx b/web/app/components/app/configuration/prompt-value-panel/index.tsx
index c2a438b5e9..97988939d4 100644
--- a/web/app/components/app/configuration/prompt-value-panel/index.tsx
+++ b/web/app/components/app/configuration/prompt-value-panel/index.tsx
@@ -111,11 +111,15 @@ const PromptValuePanel: FC<IPromptValuePanelProps> = ({
     <>
       <div className="relative z-1 mx-3 rounded-xl border-[0.5px] border-components-panel-border-subtle bg-components-panel-on-panel-item-bg shadow-md">
         <div className={cn('px-4 pt-3', userInputFieldCollapse ? 'pb-3' : 'pb-1')}>
-          <div className="flex cursor-pointer items-center gap-0.5 py-0.5" onClick={() => setUserInputFieldCollapse(!userInputFieldCollapse)}>
+          <button
+            type="button"
+            className="flex cursor-pointer items-center gap-0.5 border-none bg-transparent px-0 py-0.5 text-left focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+            onClick={() => setUserInputFieldCollapse(!userInputFieldCollapse)}
+          >
             <div className="system-md-semibold-uppercase text-text-secondary">{t('inputs.userInputField', { ns: 'appDebug' })}</div>
-            {userInputFieldCollapse && <RiArrowRightSLine className="h-4 w-4 text-text-secondary" />}
-            {!userInputFieldCollapse && <RiArrowDownSLine className="h-4 w-4 text-text-secondary" />}
-          </div>
+            {userInputFieldCollapse && <RiArrowRightSLine className="h-4 w-4 text-text-secondary" aria-hidden="true" />}
+            {!userInputFieldCollapse && <RiArrowDownSLine className="h-4 w-4 text-text-secondary" aria-hidden="true" />}
+          </button>
           {!userInputFieldCollapse && (
             <div className="mt-1 system-xs-regular text-text-tertiary">{t('inputs.completionVarTip', { ns: 'appDebug' })}</div>
           )}
@@ -167,7 +171,7 @@ const PromptValuePanel: FC<IPromptValuePanelProps> = ({
                         <SelectTrigger className="w-full bg-gray-50">
                           {String(inputs[key] || t('placeholder.select', { ns: 'common' }))}
                         </SelectTrigger>
-                        <SelectContent popupClassName="w-(--anchor-width)">
+                        <SelectContent>
                           {(options || []).map(option => (
                             <SelectItem key={option} value={option}>
                               <SelectItemText>{option}</SelectItemText>
diff --git a/web/app/components/app/create-app-dialog-shell.tsx b/web/app/components/app/create-app-dialog-shell.tsx
new file mode 100644
index 0000000000..80466efaa1
--- /dev/null
+++ b/web/app/components/app/create-app-dialog-shell.tsx
@@ -0,0 +1,51 @@
+'use client'
+
+import type { ReactNode } from 'react'
+import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
+
+type CreateAppDialogShellProps = {
+  children: ReactNode
+  contentClassName?: string
+  onClose: () => void
+  show: boolean
+  title: ReactNode
+}
+
+export function CreateAppDialogShell({
+  children,
+  contentClassName,
+  onClose,
+  show,
+  title,
+}: CreateAppDialogShellProps) {
+  return (
+    <Dialog
+      open={show}
+      onOpenChange={(nextOpen) => {
+        if (!nextOpen)
+          onClose()
+      }}
+    >
+      <DialogContent
+        backdropClassName="bg-background-overlay-backdrop backdrop-blur-[6px]"
+        className="top-0 left-0 h-screen max-h-none w-screen max-w-none translate-x-0 translate-y-0 overflow-hidden rounded-none border-none bg-transparent p-4 shadow-none"
+      >
+        <div className="h-full w-full rounded-2xl border border-effects-highlight bg-background-default-subtle">
+          <div className={cn('relative h-full overflow-hidden', contentClassName)}>
+            <DialogTitle className="sr-only">{title}</DialogTitle>
+            <button
+              type="button"
+              aria-label="Close"
+              className="absolute top-3 right-3 z-50 flex h-9 w-9 cursor-pointer items-center justify-center rounded-[10px] bg-components-button-tertiary-bg hover:bg-components-button-tertiary-bg-hover"
+              onClick={onClose}
+            >
+              <span aria-hidden="true" className="i-ri-close-large-line h-3.5 w-3.5 text-components-button-tertiary-text" />
+            </button>
+            {children}
+          </div>
+        </div>
+      </DialogContent>
+    </Dialog>
+  )
+}
diff --git a/web/app/components/app/create-app-dialog/__tests__/index.spec.tsx b/web/app/components/app/create-app-dialog/__tests__/index.spec.tsx
index cc59ce7456..b80e98f8d7 100644
--- a/web/app/components/app/create-app-dialog/__tests__/index.spec.tsx
+++ b/web/app/components/app/create-app-dialog/__tests__/index.spec.tsx
@@ -11,12 +11,12 @@ vi.mock('../app-list', () => ({
     onSuccess: () => void
   }) {
     return (
-      <div data-testid="app-list">
-        <button data-testid="app-list-success" onClick={onSuccess}>
+      <div role="region" aria-label="App list">
+        <button type="button" onClick={onSuccess}>
           Success
         </button>
         {onCreateFromBlank && (
-          <button data-testid="create-from-blank" onClick={onCreateFromBlank}>
+          <button type="button" onClick={onCreateFromBlank}>
             Create from Blank
           </button>
         )}
@@ -25,17 +25,6 @@ vi.mock('../app-list', () => ({
   },
 }))
 
-// Store captured callbacks from useKeyPress
-let capturedEscCallback: (() => void) | undefined
-const mockUseKeyPress = vi.fn((key: string, callback: () => void) => {
-  if (key === 'esc')
-    capturedEscCallback = callback
-})
-
-vi.mock('ahooks', () => ({
-  useKeyPress: (key: string, callback: () => void) => mockUseKeyPress(key, callback),
-}))
-
 describe('CreateAppTemplateDialog', () => {
   const defaultProps = {
     show: false,
@@ -46,61 +35,26 @@ describe('CreateAppTemplateDialog', () => {
 
   beforeEach(() => {
     vi.clearAllMocks()
-    capturedEscCallback = undefined
   })
 
   describe('Rendering', () => {
     it('should not render when show is false', () => {
       render(<CreateAppTemplateDialog {...defaultProps} />)
 
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
-      // FullScreenModal should not render any content when open is false
       expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
     })
 
     it('should render modal when show is true', () => {
       render(<CreateAppTemplateDialog {...defaultProps} show={true} />)
 
-      // FullScreenModal renders with role="dialog"
-      // FullScreenModal renders with role="dialog"
       expect(screen.getByRole('dialog'))!.toBeInTheDocument()
-      expect(screen.getByTestId('app-list'))!.toBeInTheDocument()
+      expect(screen.getByRole('region', { name: 'App list' }))!.toBeInTheDocument()
     })
 
     it('should render create from blank button when onCreateFromBlank is provided', () => {
       render(<CreateAppTemplateDialog {...defaultProps} show={true} />)
 
-      expect(screen.getByTestId('create-from-blank'))!.toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'Create from Blank' }))!.toBeInTheDocument()
     })
 
     it('should not render create from blank button when onCreateFromBlank is not provided', () => {
@@ -108,12 +62,12 @@ describe('CreateAppTemplateDialog', () => {
 
       render(<CreateAppTemplateDialog {...propsWithoutOnCreate} show={true} />)
 
-      expect(screen.queryByTestId('create-from-blank')).not.toBeInTheDocument()
+      expect(screen.queryByRole('button', { name: 'Create from Blank' })).not.toBeInTheDocument()
     })
   })
 
   describe('Props', () => {
-    it('should pass show prop to FullScreenModal', () => {
+    it('should pass show prop to the dialog shell', () => {
       const { rerender } = render(<CreateAppTemplateDialog {...defaultProps} />)
 
       expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
@@ -122,15 +76,17 @@ describe('CreateAppTemplateDialog', () => {
       expect(screen.getByRole('dialog'))!.toBeInTheDocument()
     })
 
-    it('should pass closable prop to FullScreenModal', () => {
-      // Since the FullScreenModal is always rendered with closable=true
-      // we can verify that the modal renders with the proper structure
-      render(<CreateAppTemplateDialog {...defaultProps} show={true} />)
+    it('should close from the dialog shell close button', () => {
+      const mockOnClose = vi.fn()
 
-      // Verify that the modal has the proper dialog structure
-      const dialog = screen.getByRole('dialog')
-      expect(dialog)!.toBeInTheDocument()
-      expect(dialog)!.toHaveAttribute('aria-modal', 'true')
+      render(<CreateAppTemplateDialog {...defaultProps} show={true} onClose={mockOnClose} />)
+
+      const closeButton = screen.getByRole('button', { name: 'Close' })
+      expect(closeButton)!.toBeInTheDocument()
+
+      fireEvent.click(closeButton)
+
+      expect(mockOnClose).toHaveBeenCalledTimes(1)
     })
   })
 
@@ -143,10 +99,8 @@ describe('CreateAppTemplateDialog', () => {
       const dialog = screen.getByRole('dialog')
       expect(dialog)!.toBeInTheDocument()
 
-      // Test that AppList component renders (child component interactions)
-      // Test that AppList component renders (child component interactions)
-      expect(screen.getByTestId('app-list'))!.toBeInTheDocument()
-      expect(screen.getByTestId('app-list-success'))!.toBeInTheDocument()
+      expect(screen.getByRole('region', { name: 'App list' }))!.toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'Success' }))!.toBeInTheDocument()
     })
 
     it('should call both onSuccess and onClose when app list success is triggered', () => {
@@ -161,7 +115,7 @@ describe('CreateAppTemplateDialog', () => {
         />,
       )
 
-      fireEvent.click(screen.getByTestId('app-list-success'))
+      fireEvent.click(screen.getByRole('button', { name: 'Success' }))
 
       expect(mockOnSuccess).toHaveBeenCalledTimes(1)
       expect(mockOnClose).toHaveBeenCalledTimes(1)
@@ -177,71 +131,12 @@ describe('CreateAppTemplateDialog', () => {
         />,
       )
 
-      fireEvent.click(screen.getByTestId('create-from-blank'))
+      fireEvent.click(screen.getByRole('button', { name: 'Create from Blank' }))
 
       expect(mockOnCreateFromBlank).toHaveBeenCalledTimes(1)
     })
   })
 
-  describe('useKeyPress Integration', () => {
-    it('should set up ESC key listener when modal is shown', () => {
-      render(<CreateAppTemplateDialog {...defaultProps} show={true} />)
-
-      expect(mockUseKeyPress).toHaveBeenCalledWith('esc', expect.any(Function))
-    })
-
-    it('should handle ESC key press to close modal', () => {
-      const mockOnClose = vi.fn()
-      render(
-        <CreateAppTemplateDialog
-          {...defaultProps}
-          show={true}
-          onClose={mockOnClose}
-        />,
-      )
-
-      expect(capturedEscCallback).toBeDefined()
-      expect(typeof capturedEscCallback).toBe('function')
-
-      // Simulate ESC key press
-      capturedEscCallback?.()
-
-      expect(mockOnClose).toHaveBeenCalledTimes(1)
-    })
-
-    it('should not call onClose when ESC key is pressed and modal is not shown', () => {
-      const mockOnClose = vi.fn()
-      render(
-        <CreateAppTemplateDialog
-          {...defaultProps}
-          show={false} // Modal not shown
-          onClose={mockOnClose}
-        />,
-      )
-
-      // The callback should still be created but not execute onClose
-      expect(capturedEscCallback).toBeDefined()
-
-      // Simulate ESC key press
-      capturedEscCallback?.()
-
-      // onClose should not be called because modal is not shown
-      expect(mockOnClose).not.toHaveBeenCalled()
-    })
-  })
-
-  describe('Callback Dependencies', () => {
-    it('should create stable callback reference for ESC key handler', () => {
-      render(<CreateAppTemplateDialog {...defaultProps} show={true} />)
-
-      // Verify that useKeyPress was called with a function
-      const calls = mockUseKeyPress.mock.calls
-      expect(calls.length).toBeGreaterThan(0)
-      expect(calls[0]![0]).toBe('esc')
-      expect(typeof calls[0]![1]).toBe('function')
-    })
-  })
-
   describe('Edge Cases', () => {
     it('should handle null props gracefully', () => {
       expect(() => {
@@ -291,8 +186,8 @@ describe('CreateAppTemplateDialog', () => {
         render(<CreateAppTemplateDialog {...propsWithoutOnCreate} show={true} />)
       }).not.toThrow()
 
-      expect(screen.getByTestId('app-list'))!.toBeInTheDocument()
-      expect(screen.queryByTestId('create-from-blank')).not.toBeInTheDocument()
+      expect(screen.getByRole('region', { name: 'App list' }))!.toBeInTheDocument()
+      expect(screen.queryByRole('button', { name: 'Create from Blank' })).not.toBeInTheDocument()
     })
 
     it('should work with all required props only', () => {
@@ -307,7 +202,7 @@ describe('CreateAppTemplateDialog', () => {
       }).not.toThrow()
 
       expect(screen.getByRole('dialog'))!.toBeInTheDocument()
-      expect(screen.getByTestId('app-list'))!.toBeInTheDocument()
+      expect(screen.getByRole('region', { name: 'App list' }))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/app/create-app-dialog/app-card/__tests__/index.spec.tsx b/web/app/components/app/create-app-dialog/app-card/__tests__/index.spec.tsx
index 16971f77d5..d1b7dedac3 100644
--- a/web/app/components/app/create-app-dialog/app-card/__tests__/index.spec.tsx
+++ b/web/app/components/app/create-app-dialog/app-card/__tests__/index.spec.tsx
@@ -35,7 +35,7 @@ const mockApp: App = {
   copyright: 'Test Corp',
   privacy_policy: null,
   custom_disclaimer: null,
-  category: 'Assistant',
+  categories: ['Assistant'],
   position: 1,
   is_listed: true,
   install_count: 100,
@@ -253,7 +253,7 @@ describe('AppCard', () => {
         template_id: mockApp.app_id,
         template_name: mockApp.app.name,
         template_mode: mockApp.app.mode,
-        template_category: mockApp.category,
+        template_categories: mockApp.categories,
         page: 'studio',
       })
       expect(mockSetShowTryAppPanel).toHaveBeenCalledWith(true, {
diff --git a/web/app/components/app/create-app-dialog/app-card/index.tsx b/web/app/components/app/create-app-dialog/app-card/index.tsx
index e710e21436..27232b0350 100644
--- a/web/app/components/app/create-app-dialog/app-card/index.tsx
+++ b/web/app/components/app/create-app-dialog/app-card/index.tsx
@@ -35,7 +35,7 @@ const AppCard = ({
       template_id: app.app_id,
       template_name: appBasicInfo.name,
       template_mode: appBasicInfo.mode,
-      template_category: app.category,
+      template_categories: app.categories,
       page: 'studio',
     })
     setShowTryAppPanel?.(true, { appId: app.app_id, app })
diff --git a/web/app/components/app/create-app-dialog/app-list/__tests__/index.spec.tsx b/web/app/components/app/create-app-dialog/app-list/__tests__/index.spec.tsx
index 0c6462c2f9..6f76273c77 100644
--- a/web/app/components/app/create-app-dialog/app-list/__tests__/index.spec.tsx
+++ b/web/app/components/app/create-app-dialog/app-list/__tests__/index.spec.tsx
@@ -115,7 +115,7 @@ vi.mock('@/next/navigation', () => ({
 
 const createAppEntry = (name: string, category: string) => ({
   app_id: name,
-  category,
+  categories: [category],
   app: {
     id: name,
     name,
@@ -247,7 +247,9 @@ describe('Apps', () => {
     })
 
     expect(mockTrackCreateApp).toHaveBeenCalledWith({
+      source: 'studio_template_list',
       appMode: AppModeEnum.CHAT,
+      templateId: 'Alpha',
     })
     expect(mockToastSuccess).toHaveBeenCalledWith('app.newApp.appCreated')
     expect(onSuccess).toHaveBeenCalled()
diff --git a/web/app/components/app/create-app-dialog/app-list/index.tsx b/web/app/components/app/create-app-dialog/app-list/index.tsx
index 1924de3893..20bb18460b 100644
--- a/web/app/components/app/create-app-dialog/app-list/index.tsx
+++ b/web/app/components/app/create-app-dialog/app-list/index.tsx
@@ -74,7 +74,7 @@ const Apps = ({
     const filteredByCategory = allList.filter((item) => {
       if (currCategory === allCategoriesEn)
         return true
-      return item.category === currCategory
+      return item.categories?.includes(currCategory) ?? false
     })
     if (currentType.length === 0)
       return filteredByCategory
@@ -127,7 +127,7 @@ const Apps = ({
         icon_background,
         description,
       })
-      trackCreateApp({ appMode: mode })
+      trackCreateApp({ source: 'studio_template_list', appMode: mode, templateId: currApp?.app_id })
 
       setIsShowCreateModal(false)
       toast.success(t('newApp.appCreated', { ns: 'app' }))
diff --git a/web/app/components/app/create-app-dialog/app-list/sidebar.tsx b/web/app/components/app/create-app-dialog/app-list/sidebar.tsx
index 128e597259..5b1eb1ac1f 100644
--- a/web/app/components/app/create-app-dialog/app-list/sidebar.tsx
+++ b/web/app/components/app/create-app-dialog/app-list/sidebar.tsx
@@ -27,10 +27,14 @@ export default function Sidebar({ current, categories, onClick, onCreateFromBlan
         {categories.map(category => (<CategoryItem key={category} category={category} active={current === category} onClick={onClick} />))}
       </ul>
       <Divider bgStyle="gradient" />
-      <div className="flex cursor-pointer items-center gap-1 px-3 py-1 text-text-tertiary" onClick={onCreateFromBlank}>
-        <RiStickyNoteAddLine className="h-3.5 w-3.5" />
+      <button
+        type="button"
+        className="flex w-full cursor-pointer items-center gap-1 border-none bg-transparent px-3 py-1 text-left text-text-tertiary focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+        onClick={onCreateFromBlank}
+      >
+        <RiStickyNoteAddLine className="h-3.5 w-3.5" aria-hidden="true" />
         <span className="system-xs-regular">{t('newApp.startFromBlank', { ns: 'app' })}</span>
-      </div>
+      </button>
     </div>
   )
 }
@@ -42,19 +46,22 @@ type CategoryItemProps = {
 }
 function CategoryItem({ category, active, onClick }: CategoryItemProps) {
   return (
-    <li
-      className={cn('group flex h-8 cursor-pointer items-center gap-2 rounded-lg p-1 pl-3 hover:bg-state-base-hover [&.active]:bg-state-base-active', active && 'active')}
-      onClick={() => { onClick?.(category) }}
-    >
-      {category === AppCategories.RECOMMENDED && (
-        <div className="inline-flex h-5 w-5 items-center justify-center rounded-md">
-          <RiThumbUpLine className="h-4 w-4 text-components-menu-item-text group-[.active]:text-components-menu-item-text-active" />
-        </div>
-      )}
-      <AppCategoryLabel
-        category={category}
-        className={cn('system-sm-medium text-components-menu-item-text group-hover:text-components-menu-item-text-hover group-[.active]:text-components-menu-item-text-active', active && 'system-sm-semibold')}
-      />
+    <li>
+      <button
+        type="button"
+        className={cn('group flex h-8 w-full cursor-pointer items-center gap-2 rounded-lg border-none bg-transparent p-1 pl-3 text-left hover:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden [&.active]:bg-state-base-active', active && 'active')}
+        onClick={() => { onClick?.(category) }}
+      >
+        {category === AppCategories.RECOMMENDED && (
+          <div className="inline-flex h-5 w-5 items-center justify-center rounded-md">
+            <RiThumbUpLine className="h-4 w-4 text-components-menu-item-text group-[.active]:text-components-menu-item-text-active" aria-hidden="true" />
+          </div>
+        )}
+        <AppCategoryLabel
+          category={category}
+          className={cn('system-sm-medium text-components-menu-item-text group-hover:text-components-menu-item-text-hover group-[.active]:text-components-menu-item-text-active', active && 'system-sm-semibold')}
+        />
+      </button>
     </li>
   )
 }
diff --git a/web/app/components/app/create-app-dialog/index.tsx b/web/app/components/app/create-app-dialog/index.tsx
index 762dddc028..45950a9f62 100644
--- a/web/app/components/app/create-app-dialog/index.tsx
+++ b/web/app/components/app/create-app-dialog/index.tsx
@@ -1,7 +1,6 @@
 'use client'
-import { useKeyPress } from 'ahooks'
-import { useCallback } from 'react'
-import FullScreenModal from '@/app/components/base/fullscreen-modal'
+import { useTranslation } from 'react-i18next'
+import { CreateAppDialogShell } from '../create-app-dialog-shell'
 import AppList from './app-list'
 
 type CreateAppDialogProps = {
@@ -12,19 +11,10 @@ type CreateAppDialogProps = {
 }
 
 const CreateAppTemplateDialog = ({ show, onSuccess, onClose, onCreateFromBlank }: CreateAppDialogProps) => {
-  const handleEscKeyPress = useCallback(() => {
-    if (show)
-      onClose()
-  }, [show, onClose])
-
-  useKeyPress('esc', handleEscKeyPress)
+  const { t } = useTranslation()
 
   return (
-    <FullScreenModal
-      open={show}
-      closable
-      onClose={onClose}
-    >
+    <CreateAppDialogShell show={show} title={t('newApp.startFromTemplate', { ns: 'app' })} onClose={onClose}>
       <AppList
         onCreateFromBlank={onCreateFromBlank}
         onSuccess={() => {
@@ -32,7 +22,7 @@ const CreateAppTemplateDialog = ({ show, onSuccess, onClose, onCreateFromBlank }
           onClose()
         }}
       />
-    </FullScreenModal>
+    </CreateAppDialogShell>
   )
 }
 
diff --git a/web/app/components/app/create-app-modal/__tests__/index.spec.tsx b/web/app/components/app/create-app-modal/__tests__/index.spec.tsx
index 24fb21747f..bf1e698fc6 100644
--- a/web/app/components/app/create-app-modal/__tests__/index.spec.tsx
+++ b/web/app/components/app/create-app-modal/__tests__/index.spec.tsx
@@ -170,7 +170,7 @@ describe('CreateAppModal', () => {
       mode: AppModeEnum.ADVANCED_CHAT,
     }))
 
-    expect(mockTrackCreateApp).toHaveBeenCalledWith({ appMode: AppModeEnum.ADVANCED_CHAT })
+    expect(mockTrackCreateApp).toHaveBeenCalledWith({ source: 'studio_blank', appMode: AppModeEnum.ADVANCED_CHAT })
     expect(mockToastSuccess).toHaveBeenCalledWith('app.newApp.appCreated')
     expect(onSuccess).toHaveBeenCalled()
     expect(onClose).toHaveBeenCalled()
diff --git a/web/app/components/app/create-app-modal/index.tsx b/web/app/components/app/create-app-modal/index.tsx
index 2ff8a0aacd..e81ad0f862 100644
--- a/web/app/components/app/create-app-modal/index.tsx
+++ b/web/app/components/app/create-app-modal/index.tsx
@@ -7,11 +7,10 @@ import { cn } from '@langgenius/dify-ui/cn'
 import { toast } from '@langgenius/dify-ui/toast'
 import { RiArrowRightLine, RiArrowRightSLine, RiExchange2Fill } from '@remixicon/react'
 import { useDebounceFn, useKeyPress } from 'ahooks'
-import { useCallback, useEffect, useRef, useState } from 'react'
+import { useCallback, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import AppIcon from '@/app/components/base/app-icon'
 import Divider from '@/app/components/base/divider'
-import FullScreenModal from '@/app/components/base/fullscreen-modal'
 import { BubbleTextMod, ChatBot, ListSparkle, Logic } from '@/app/components/base/icons/src/vender/solid/communication'
 import Input from '@/app/components/base/input'
 import Textarea from '@/app/components/base/textarea'
@@ -28,6 +27,7 @@ import { trackCreateApp } from '@/utils/create-app-tracking'
 import { basePath } from '@/utils/var'
 import AppIconPicker from '../../base/app-icon-picker'
 import ShortcutsName from '../../workflow/shortcuts-name'
+import { CreateAppDialogShell } from '../create-app-dialog-shell'
 
 type CreateAppProps = {
   onSuccess: () => void
@@ -36,6 +36,10 @@ type CreateAppProps = {
   defaultAppMode?: AppModeEnum
 }
 
+const shouldExpandBeginnerAppTypes = (appMode?: AppModeEnum) => {
+  return appMode === AppModeEnum.CHAT || appMode === AppModeEnum.AGENT_CHAT || appMode === AppModeEnum.COMPLETION
+}
+
 function CreateApp({ onClose, onSuccess, onCreateFromTemplate, defaultAppMode }: CreateAppProps) {
   const { t } = useTranslation()
   const { push } = useRouter()
@@ -45,7 +49,7 @@ function CreateApp({ onClose, onSuccess, onCreateFromTemplate, defaultAppMode }:
   const [showAppIconPicker, setShowAppIconPicker] = useState(false)
   const [name, setName] = useState('')
   const [description, setDescription] = useState('')
-  const [isAppTypeExpanded, setIsAppTypeExpanded] = useState(false)
+  const [isAppTypeExpanded, setIsAppTypeExpanded] = useState(() => shouldExpandBeginnerAppTypes(defaultAppMode))
 
   const { plan, enableBilling } = useProviderContext()
   const isAppsFull = (enableBilling && plan.usage.buildApps >= plan.total.buildApps)
@@ -53,11 +57,6 @@ function CreateApp({ onClose, onSuccess, onCreateFromTemplate, defaultAppMode }:
 
   const isCreatingRef = useRef(false)
 
-  useEffect(() => {
-    if (appMode === AppModeEnum.CHAT || appMode === AppModeEnum.AGENT_CHAT || appMode === AppModeEnum.COMPLETION)
-      setIsAppTypeExpanded(true)
-  }, [appMode])
-
   const onCreate = useCallback(async () => {
     if (!appMode) {
       toast.error(t('newApp.appTypeRequired', { ns: 'app' }))
@@ -80,7 +79,7 @@ function CreateApp({ onClose, onSuccess, onCreateFromTemplate, defaultAppMode }:
         mode: appMode,
       })
 
-      trackCreateApp({ appMode: app.mode })
+      trackCreateApp({ source: 'studio_blank', appMode: app.mode })
 
       toast.success(t('newApp.appCreated', { ns: 'app' }))
       onSuccess()
@@ -88,8 +87,8 @@ function CreateApp({ onClose, onSuccess, onCreateFromTemplate, defaultAppMode }:
       localStorage.setItem(NEED_REFRESH_APP_LIST_KEY, '1')
       getRedirection(isCurrentWorkspaceEditor, app, push)
     }
-    catch (e: any) {
-      toast.error(e.message || t('newApp.appCreateFailed', { ns: 'app' }))
+    catch (error) {
+      toast.error(error instanceof Error ? error.message : t('newApp.appCreateFailed', { ns: 'app' }))
     }
     isCreatingRef.current = false
   }, [name, t, appMode, appIcon, description, onSuccess, onClose, push, isCurrentWorkspaceEditor])
@@ -147,11 +146,11 @@ function CreateApp({ onClose, onSuccess, onCreateFromTemplate, defaultAppMode }:
                 <div className="mb-2 flex items-center">
                   <button
                     type="button"
-                    className="flex cursor-pointer items-center border-0 bg-transparent p-0"
+                    className="flex cursor-pointer items-center border-0 bg-transparent p-0 text-left focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
                     onClick={() => setIsAppTypeExpanded(!isAppTypeExpanded)}
                   >
                     <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' : ''}`} />
+                    <RiArrowRightSLine className={`ml-1 h-4 w-4 text-text-tertiary transition-transform ${isAppTypeExpanded ? 'rotate-90' : ''}`} aria-hidden="true" />
                   </button>
                 </div>
                 {isAppTypeExpanded && (
@@ -250,12 +249,16 @@ function CreateApp({ onClose, onSuccess, onCreateFromTemplate, defaultAppMode }:
             </div>
             {isAppsFull && <AppsFull className="mt-4" loc="app-create" />}
             <div className="flex items-center justify-between pt-5 pb-10">
-              <div className="flex cursor-pointer items-center gap-1 system-xs-regular text-text-tertiary" onClick={onCreateFromTemplate}>
+              <button
+                type="button"
+                className="flex cursor-pointer items-center gap-1 border-none bg-transparent p-0 text-left system-xs-regular text-text-tertiary focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+                onClick={onCreateFromTemplate}
+              >
                 <span>{t('newApp.noIdeaTip', { ns: 'app' })}</span>
                 <div className="p-px">
-                  <RiArrowRightLine className="h-3.5 w-3.5" />
+                  <RiArrowRightLine className="h-3.5 w-3.5" aria-hidden="true" />
                 </div>
-              </div>
+              </button>
               <div className="flex gap-2">
                 <Button onClick={onClose}>{t('newApp.Cancel', { ns: 'app' })}</Button>
                 <Button disabled={isAppsFull || !name} className="gap-1" variant="primary" onClick={handleCreateApp}>
@@ -290,15 +293,17 @@ type CreateAppDialogProps = CreateAppProps & {
   show: boolean
 }
 const CreateAppModal = ({ show, onClose, onSuccess, onCreateFromTemplate, defaultAppMode }: CreateAppDialogProps) => {
+  const { t } = useTranslation()
+
   return (
-    <FullScreenModal
-      overflowVisible
-      closable
-      open={show}
+    <CreateAppDialogShell
+      show={show}
+      title={t('newApp.startFromBlank', { ns: 'app' })}
+      contentClassName="overflow-visible"
       onClose={onClose}
     >
       <CreateApp onClose={onClose} onSuccess={onSuccess} onCreateFromTemplate={onCreateFromTemplate} defaultAppMode={defaultAppMode} />
-    </FullScreenModal>
+    </CreateAppDialogShell>
   )
 }
 
diff --git a/web/app/components/app/create-from-dsl-modal/__tests__/index.spec.tsx b/web/app/components/app/create-from-dsl-modal/__tests__/index.spec.tsx
index b3d007c2e7..c6be430fac 100644
--- a/web/app/components/app/create-from-dsl-modal/__tests__/index.spec.tsx
+++ b/web/app/components/app/create-from-dsl-modal/__tests__/index.spec.tsx
@@ -197,7 +197,7 @@ describe('CreateFromDSLModal', () => {
       mode: DSLImportMode.YAML_URL,
       yaml_url: 'https://example.com/app.yml',
     })
-    expect(mockTrackCreateApp).toHaveBeenCalledWith({ appMode: AppModeEnum.CHAT })
+    expect(mockTrackCreateApp).toHaveBeenCalledWith({ source: 'studio_upload', appMode: AppModeEnum.CHAT })
     expect(handleSuccess).toHaveBeenCalledTimes(1)
     expect(handleClose).toHaveBeenCalledTimes(1)
     expect(localStorage.getItem(NEED_REFRESH_APP_LIST_KEY)).toBe('1')
@@ -304,7 +304,79 @@ describe('CreateFromDSLModal', () => {
     expect(mockImportDSLConfirm).toHaveBeenCalledWith({
       import_id: 'import-3',
     })
-    expect(mockTrackCreateApp).toHaveBeenCalledWith({ appMode: AppModeEnum.WORKFLOW })
+    expect(mockTrackCreateApp).toHaveBeenCalledWith({ source: 'studio_upload', appMode: AppModeEnum.WORKFLOW })
+  })
+
+  it('should close the DSL mismatch modal when dialog requests close', async () => {
+    vi.useFakeTimers()
+    mockImportDSL.mockResolvedValue({
+      id: 'import-close',
+      status: DSLImportStatus.PENDING,
+      imported_dsl_version: '1.0.0',
+      current_dsl_version: '2.0.0',
+    })
+
+    render(
+      <CreateFromDSLModal
+        show
+        onClose={vi.fn()}
+        activeTab={CreateFromDSLModalTab.FROM_URL}
+        dslUrl="https://example.com/app.yml"
+      />,
+    )
+
+    await act(async () => {
+      fireEvent.click(getCreateButton())
+    })
+
+    await act(async () => {
+      vi.advanceTimersByTime(300)
+    })
+
+    expect(screen.getByText('newApp.appCreateDSLErrorTitle'))!.toBeInTheDocument()
+
+    vi.useRealTimers()
+    fireEvent.keyDown(document, { key: 'Escape', code: 'Escape' })
+
+    await waitFor(() => {
+      expect(screen.queryByText('newApp.appCreateDSLErrorTitle')).not.toBeInTheDocument()
+    })
+  })
+
+  it('should close the DSL mismatch modal when cancel is clicked', async () => {
+    vi.useFakeTimers()
+    mockImportDSL.mockResolvedValue({
+      id: 'import-cancel',
+      status: DSLImportStatus.PENDING,
+      imported_dsl_version: '1.0.0',
+      current_dsl_version: '2.0.0',
+    })
+
+    render(
+      <CreateFromDSLModal
+        show
+        onClose={vi.fn()}
+        activeTab={CreateFromDSLModalTab.FROM_URL}
+        dslUrl="https://example.com/app.yml"
+      />,
+    )
+
+    await act(async () => {
+      fireEvent.click(getCreateButton())
+    })
+
+    await act(async () => {
+      vi.advanceTimersByTime(300)
+    })
+
+    expect(screen.getByText('newApp.appCreateDSLErrorTitle'))!.toBeInTheDocument()
+
+    vi.useRealTimers()
+    fireEvent.click(screen.getAllByRole('button', { name: 'newApp.Cancel' }).at(-1)!)
+
+    await waitFor(() => {
+      expect(screen.queryByText('newApp.appCreateDSLErrorTitle')).not.toBeInTheDocument()
+    })
   })
 
   it('should ignore empty import responses and prevent duplicate submissions while a request is in flight', async () => {
@@ -397,6 +469,7 @@ describe('CreateFromDSLModal', () => {
     mockImportDSL.mockResolvedValueOnce({
       id: 'import-failed',
       status: DSLImportStatus.FAILED,
+      error: 'Invalid YAML format',
     })
     mockImportDSL.mockRejectedValueOnce(new Error('boom'))
 
@@ -412,7 +485,7 @@ describe('CreateFromDSLModal', () => {
     await act(async () => {
       fireEvent.click(getCreateButton())
     })
-    expect(toastMocks.error).toHaveBeenCalledWith('newApp.appCreateFailed')
+    expect(toastMocks.error).toHaveBeenCalledWith('Invalid YAML format')
 
     rerender(
       <CreateFromDSLModal
@@ -427,6 +500,7 @@ describe('CreateFromDSLModal', () => {
       fireEvent.click(getCreateButton())
     })
     expect(toastMocks.error).toHaveBeenCalledTimes(2)
+    expect(toastMocks.error).toHaveBeenLastCalledWith('newApp.appCreateFailed')
   })
 
   it('should handle pending import confirmation failures and cancellation', async () => {
@@ -438,7 +512,7 @@ describe('CreateFromDSLModal', () => {
       current_dsl_version: '2.0.0',
     })
     mockImportDSLConfirm
-      .mockResolvedValueOnce({ status: DSLImportStatus.FAILED })
+      .mockResolvedValueOnce({ status: DSLImportStatus.FAILED, error: 'Confirm failed' })
       .mockRejectedValueOnce(new Error('boom'))
 
     render(
@@ -465,11 +539,12 @@ describe('CreateFromDSLModal', () => {
     await act(async () => {
       fireEvent.click(screen.getAllByRole('button', { name: 'newApp.Confirm' })[0]!)
     })
-    expect(toastMocks.error).toHaveBeenCalledWith('newApp.appCreateFailed')
+    expect(toastMocks.error).toHaveBeenCalledWith('Confirm failed')
 
     await act(async () => {
       fireEvent.click(screen.getAllByRole('button', { name: 'newApp.Confirm' })[0]!)
     })
     expect(toastMocks.error).toHaveBeenCalledTimes(2)
+    expect(toastMocks.error).toHaveBeenLastCalledWith('newApp.appCreateFailed')
   })
 })
diff --git a/web/app/components/app/create-from-dsl-modal/__tests__/uploader.spec.tsx b/web/app/components/app/create-from-dsl-modal/__tests__/uploader.spec.tsx
index ba097b355c..0240136d3e 100644
--- a/web/app/components/app/create-from-dsl-modal/__tests__/uploader.spec.tsx
+++ b/web/app/components/app/create-from-dsl-modal/__tests__/uploader.spec.tsx
@@ -157,7 +157,7 @@ describe('Uploader', () => {
     const hiddenInput = getHiddenInput()
     const clickSpy = vi.spyOn(hiddenInput, 'click')
 
-    fireEvent.click(screen.getByText('dslUploader.browse'))
+    fireEvent.click(screen.getByRole('button', { name: 'dslUploader.browse' }))
 
     expect(clickSpy).toHaveBeenCalled()
 
diff --git a/web/app/components/app/create-from-dsl-modal/dsl-confirm-modal.tsx b/web/app/components/app/create-from-dsl-modal/dsl-confirm-modal.tsx
index d0c97e185c..726b3f1742 100644
--- a/web/app/components/app/create-from-dsl-modal/dsl-confirm-modal.tsx
+++ b/web/app/components/app/create-from-dsl-modal/dsl-confirm-modal.tsx
@@ -1,6 +1,13 @@
-import { Button } from '@langgenius/dify-ui/button'
+import {
+  AlertDialog,
+  AlertDialogActions,
+  AlertDialogCancelButton,
+  AlertDialogConfirmButton,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogTitle,
+} from '@langgenius/dify-ui/alert-dialog'
 import { useTranslation } from 'react-i18next'
-import Modal from '@/app/components/base/modal'
 
 type DSLConfirmModalProps = {
   versions?: {
@@ -20,32 +27,36 @@ const DSLConfirmModal = ({
   const { t } = useTranslation()
 
   return (
-    <Modal
-      isShow
-      onClose={() => onCancel()}
-      className="w-[480px]"
+    <AlertDialog
+      open
+      onOpenChange={(open) => {
+        if (!open)
+          onCancel()
+      }}
     >
-      <div className="flex flex-col items-start gap-2 self-stretch pb-4">
-        <div className="title-2xl-semi-bold text-text-primary">{t('newApp.appCreateDSLErrorTitle', { ns: 'app' })}</div>
-        <div className="flex grow flex-col system-md-regular text-text-secondary">
-          <div>{t('newApp.appCreateDSLErrorPart1', { ns: 'app' })}</div>
-          <div>{t('newApp.appCreateDSLErrorPart2', { ns: 'app' })}</div>
-          <br />
-          <div>
-            {t('newApp.appCreateDSLErrorPart3', { ns: 'app' })}
-            <span className="system-md-medium">{versions.importedVersion}</span>
-          </div>
-          <div>
-            {t('newApp.appCreateDSLErrorPart4', { ns: 'app' })}
-            <span className="system-md-medium">{versions.systemVersion}</span>
-          </div>
+      <AlertDialogContent className="w-[480px] overflow-hidden! border-none text-left align-middle shadow-xl">
+        <div className="flex flex-col items-start gap-2 self-stretch p-6 pb-4">
+          <AlertDialogTitle className="title-2xl-semi-bold text-text-primary">{t('newApp.appCreateDSLErrorTitle', { ns: 'app' })}</AlertDialogTitle>
+          <AlertDialogDescription render={<div />} className="flex grow flex-col system-md-regular text-text-secondary">
+            <div>{t('newApp.appCreateDSLErrorPart1', { ns: 'app' })}</div>
+            <div>{t('newApp.appCreateDSLErrorPart2', { ns: 'app' })}</div>
+            <br />
+            <div>
+              {t('newApp.appCreateDSLErrorPart3', { ns: 'app' })}
+              <span className="system-md-medium">{versions.importedVersion}</span>
+            </div>
+            <div>
+              {t('newApp.appCreateDSLErrorPart4', { ns: 'app' })}
+              <span className="system-md-medium">{versions.systemVersion}</span>
+            </div>
+          </AlertDialogDescription>
         </div>
-      </div>
-      <div className="flex items-start justify-end gap-2 self-stretch pt-6">
-        <Button variant="secondary" onClick={() => onCancel()}>{t('newApp.Cancel', { ns: 'app' })}</Button>
-        <Button variant="primary" tone="destructive" onClick={onConfirm} disabled={confirmDisabled}>{t('newApp.Confirm', { ns: 'app' })}</Button>
-      </div>
-    </Modal>
+        <AlertDialogActions>
+          <AlertDialogCancelButton variant="secondary">{t('newApp.Cancel', { ns: 'app' })}</AlertDialogCancelButton>
+          <AlertDialogConfirmButton onClick={onConfirm} disabled={confirmDisabled}>{t('newApp.Confirm', { ns: 'app' })}</AlertDialogConfirmButton>
+        </AlertDialogActions>
+      </AlertDialogContent>
+    </AlertDialog>
   )
 }
 
diff --git a/web/app/components/app/create-from-dsl-modal/index.tsx b/web/app/components/app/create-from-dsl-modal/index.tsx
index bc5f352634..85ed284506 100644
--- a/web/app/components/app/create-from-dsl-modal/index.tsx
+++ b/web/app/components/app/create-from-dsl-modal/index.tsx
@@ -3,14 +3,12 @@
 import type { MouseEventHandler } from 'react'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
-import { RiCloseLine } from '@remixicon/react'
 import { useDebounceFn, useKeyPress } from 'ahooks'
-import { noop } from 'es-toolkit/function'
-import { useEffect, useMemo, useRef, useState } from 'react'
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Input from '@/app/components/base/input'
-import Modal from '@/app/components/base/modal'
 import AppsFull from '@/app/components/billing/apps-full-in-dialog'
 import { usePluginDependencies } from '@/app/components/workflow/plugin-dependency/hooks'
 import { NEED_REFRESH_APP_LIST_KEY } from '@/config'
@@ -47,7 +45,7 @@ export enum CreateFromDSLModalTab {
 const CreateFromDSLModal = ({ show, onSuccess, onClose, activeTab = CreateFromDSLModalTab.FROM_FILE, dslUrl = '', droppedFile }: CreateFromDSLModalProps) => {
   const { push } = useRouter()
   const { t } = useTranslation()
-  const [currentFile, setDSLFile] = useState<File | undefined>(droppedFile)
+  const [currentFile, setCurrentFile] = useState<File | undefined>(droppedFile)
   const [fileContent, setFileContent] = useState<string>()
   const [currentTab, setCurrentTab] = useState(activeTab)
   const [dslUrlValue, setDslUrlValue] = useState(dslUrl)
@@ -56,22 +54,22 @@ const CreateFromDSLModal = ({ show, onSuccess, onClose, activeTab = CreateFromDS
   const [importId, setImportId] = useState<string>()
   const { handleCheckPluginDependencies } = usePluginDependencies()
 
-  const readFile = (file: File) => {
+  const readFile = useCallback((file: File) => {
     const reader = new FileReader()
     reader.onload = function (event) {
       const content = event.target?.result
       setFileContent(content as string)
     }
     reader.readAsText(file)
-  }
+  }, [])
 
-  const handleFile = (file?: File) => {
-    setDSLFile(file)
+  const handleFile = useCallback((file?: File) => {
+    setCurrentFile(file)
     if (file)
       readFile(file)
     if (!file)
       setFileContent('')
-  }
+  }, [readFile])
 
   const { isCurrentWorkspaceEditor } = useAppContext()
   const { plan, enableBilling } = useProviderContext()
@@ -82,7 +80,7 @@ const CreateFromDSLModal = ({ show, onSuccess, onClose, activeTab = CreateFromDS
   useEffect(() => {
     if (droppedFile)
       handleFile(droppedFile)
-  }, [droppedFile])
+  }, [droppedFile, handleFile])
 
   const onCreate = async (_e?: React.MouseEvent) => {
     if (currentTab === CreateFromDSLModalTab.FROM_FILE && !currentFile)
@@ -112,7 +110,7 @@ const CreateFromDSLModal = ({ show, onSuccess, onClose, activeTab = CreateFromDS
         return
       const { id, status, app_id, app_mode, imported_dsl_version, current_dsl_version } = response
       if (status === DSLImportStatus.COMPLETED || status === DSLImportStatus.COMPLETED_WITH_WARNINGS) {
-        trackCreateApp({ appMode: app_mode })
+        trackCreateApp({ source: 'studio_upload', appMode: app_mode })
 
         if (onSuccess)
           onSuccess()
@@ -141,11 +139,10 @@ const CreateFromDSLModal = ({ show, onSuccess, onClose, activeTab = CreateFromDS
         setImportId(id)
       }
       else {
-        toast.error(t('newApp.appCreateFailed', { ns: 'app' }))
+        toast.error(response.error || t('newApp.appCreateFailed', { ns: 'app' }))
       }
     }
-    // eslint-disable-next-line unused-imports/no-unused-vars
-    catch (e) {
+    catch {
       toast.error(t('newApp.appCreateFailed', { ns: 'app' }))
     }
     isCreatingRef.current = false
@@ -174,7 +171,7 @@ const CreateFromDSLModal = ({ show, onSuccess, onClose, activeTab = CreateFromDS
       const { status, app_id, app_mode } = response
 
       if (status === DSLImportStatus.COMPLETED) {
-        trackCreateApp({ appMode: app_mode })
+        trackCreateApp({ source: 'studio_upload', appMode: app_mode })
         if (onSuccess)
           onSuccess()
         if (onClose)
@@ -187,11 +184,10 @@ const CreateFromDSLModal = ({ show, onSuccess, onClose, activeTab = CreateFromDS
         getRedirection(isCurrentWorkspaceEditor, { id: app_id!, mode: app_mode }, push)
       }
       else if (status === DSLImportStatus.FAILED) {
-        toast.error(t('newApp.appCreateFailed', { ns: 'app' }))
+        toast.error(response.error || t('newApp.appCreateFailed', { ns: 'app' }))
       }
     }
-    // eslint-disable-next-line unused-imports/no-unused-vars
-    catch (e) {
+    catch {
       toast.error(t('newApp.appCreateFailed', { ns: 'app' }))
     }
   }
@@ -219,108 +215,112 @@ const CreateFromDSLModal = ({ show, onSuccess, onClose, activeTab = CreateFromDS
 
   return (
     <>
-      <Modal
-        className="w-[520px] rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg p-0 shadow-xl"
-        isShow={show}
-        onClose={noop}
-      >
-        <div className="flex items-center justify-between pt-6 pr-5 pb-3 pl-6 title-2xl-semi-bold text-text-primary">
-          {t('importApp', { ns: 'app' })}
-          <div
-            className="flex h-8 w-8 cursor-pointer items-center"
-            onClick={() => onClose()}
-          >
-            <RiCloseLine className="h-5 w-5 text-text-tertiary" />
+      <Dialog open={show}>
+        <DialogContent className="w-full max-w-[480px]! overflow-hidden! rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg p-0! text-left align-middle shadow-xl">
+
+          <div className="flex items-center justify-between pt-6 pr-5 pb-3 pl-6 title-2xl-semi-bold text-text-primary">
+            {t('importApp', { ns: 'app' })}
+            <div
+              className="flex h-8 w-8 cursor-pointer items-center"
+              onClick={() => onClose()}
+            >
+              <span className="i-ri-close-line h-5 w-5 text-text-tertiary" />
+            </div>
           </div>
-        </div>
-        <div className="flex h-9 items-center space-x-6 border-b border-divider-subtle px-6 system-md-semibold text-text-tertiary">
-          {
-            tabs.map(tab => (
-              <div
-                key={tab.key}
-                className={cn(
-                  'relative flex h-full cursor-pointer items-center',
-                  currentTab === tab.key && 'text-text-primary',
-                )}
-                onClick={() => setCurrentTab(tab.key)}
-              >
-                {tab.label}
-                {
-                  currentTab === tab.key && (
-                    <div className="absolute bottom-0 h-[2px] w-full bg-util-colors-blue-brand-blue-brand-600"></div>
-                  )
-                }
-              </div>
-            ))
-          }
-        </div>
-        <div className="px-6 py-4">
-          {
-            currentTab === CreateFromDSLModalTab.FROM_FILE && (
-              <Uploader
-                className="mt-0"
-                file={currentFile}
-                updateFile={handleFile}
-              />
-            )
-          }
-          {
-            currentTab === CreateFromDSLModalTab.FROM_URL && (
-              <div>
-                <div className="mb-1 system-md-semibold text-text-secondary">DSL URL</div>
-                <Input
-                  placeholder={t('importFromDSLUrlPlaceholder', { ns: 'app' }) || ''}
-                  value={dslUrlValue}
-                  onChange={e => setDslUrlValue(e.target.value)}
+          <div className="flex h-9 items-center space-x-6 border-b border-divider-subtle px-6 system-md-semibold text-text-tertiary">
+            {
+              tabs.map(tab => (
+                <div
+                  key={tab.key}
+                  className={cn(
+                    'relative flex h-full cursor-pointer items-center',
+                    currentTab === tab.key && 'text-text-primary',
+                  )}
+                  onClick={() => setCurrentTab(tab.key)}
+                >
+                  {tab.label}
+                  {
+                    currentTab === tab.key && (
+                      <div className="absolute bottom-0 h-[2px] w-full bg-util-colors-blue-brand-blue-brand-600"></div>
+                    )
+                  }
+                </div>
+              ))
+            }
+          </div>
+          <div className="px-6 py-4">
+            {
+              currentTab === CreateFromDSLModalTab.FROM_FILE && (
+                <Uploader
+                  className="mt-0"
+                  file={currentFile}
+                  updateFile={handleFile}
                 />
-              </div>
-            )
-          }
-        </div>
-        {isAppsFull && (
-          <div className="px-6">
-            <AppsFull className="mt-0" loc="app-create-dsl" />
+              )
+            }
+            {
+              currentTab === CreateFromDSLModalTab.FROM_URL && (
+                <div>
+                  <div className="mb-1 system-md-semibold text-text-secondary">DSL URL</div>
+                  <Input
+                    placeholder={t('importFromDSLUrlPlaceholder', { ns: 'app' }) || ''}
+                    value={dslUrlValue}
+                    onChange={e => setDslUrlValue(e.target.value)}
+                  />
+                </div>
+              )
+            }
           </div>
-        )}
-        <div className="flex justify-end px-6 py-5">
-          <Button className="mr-2" onClick={onClose}>{t('newApp.Cancel', { ns: 'app' })}</Button>
-          <Button
-            disabled={buttonDisabled}
-            variant="primary"
-            onClick={handleCreateApp}
-            className="gap-1"
-          >
-            <span>{t('newApp.Create', { ns: 'app' })}</span>
-            <ShortcutsName keys={['ctrl', '↵']} bgColor="white" />
-          </Button>
-        </div>
-      </Modal>
-      <Modal
-        isShow={showErrorModal}
-        onClose={() => setShowErrorModal(false)}
-        className="w-[480px]"
+          {isAppsFull && (
+            <div className="px-6">
+              <AppsFull className="mt-0" loc="app-create-dsl" />
+            </div>
+          )}
+          <div className="flex justify-end px-6 py-5">
+            <Button className="mr-2" onClick={onClose}>{t('newApp.Cancel', { ns: 'app' })}</Button>
+            <Button
+              disabled={buttonDisabled}
+              variant="primary"
+              onClick={handleCreateApp}
+              className="gap-1"
+            >
+              <span>{t('newApp.Create', { ns: 'app' })}</span>
+              <ShortcutsName keys={['ctrl', '↵']} bgColor="white" />
+            </Button>
+          </div>
+        </DialogContent>
+      </Dialog>
+      <Dialog
+        open={showErrorModal}
+        onOpenChange={(open) => {
+          if (!open)
+            setShowErrorModal(false)
+        }}
       >
-        <div className="flex flex-col items-start gap-2 self-stretch pb-4">
-          <div className="title-2xl-semi-bold text-text-primary">{t('newApp.appCreateDSLErrorTitle', { ns: 'app' })}</div>
-          <div className="flex grow flex-col system-md-regular text-text-secondary">
-            <div>{t('newApp.appCreateDSLErrorPart1', { ns: 'app' })}</div>
-            <div>{t('newApp.appCreateDSLErrorPart2', { ns: 'app' })}</div>
-            <br />
-            <div>
-              {t('newApp.appCreateDSLErrorPart3', { ns: 'app' })}
-              <span className="system-md-medium">{versions?.importedVersion}</span>
-            </div>
-            <div>
-              {t('newApp.appCreateDSLErrorPart4', { ns: 'app' })}
-              <span className="system-md-medium">{versions?.systemVersion}</span>
+        <DialogContent className="w-full max-w-[480px]! overflow-hidden! border-none text-left align-middle">
+
+          <div className="flex flex-col items-start gap-2 self-stretch pb-4">
+            <div className="title-2xl-semi-bold text-text-primary">{t('newApp.appCreateDSLErrorTitle', { ns: 'app' })}</div>
+            <div className="flex grow flex-col system-md-regular text-text-secondary">
+              <div>{t('newApp.appCreateDSLErrorPart1', { ns: 'app' })}</div>
+              <div>{t('newApp.appCreateDSLErrorPart2', { ns: 'app' })}</div>
+              <br />
+              <div>
+                {t('newApp.appCreateDSLErrorPart3', { ns: 'app' })}
+                <span className="system-md-medium">{versions?.importedVersion}</span>
+              </div>
+              <div>
+                {t('newApp.appCreateDSLErrorPart4', { ns: 'app' })}
+                <span className="system-md-medium">{versions?.systemVersion}</span>
+              </div>
             </div>
           </div>
-        </div>
-        <div className="flex items-start justify-end gap-2 self-stretch pt-6">
-          <Button variant="secondary" onClick={() => setShowErrorModal(false)}>{t('newApp.Cancel', { ns: 'app' })}</Button>
-          <Button variant="primary" tone="destructive" onClick={onDSLConfirm}>{t('newApp.Confirm', { ns: 'app' })}</Button>
-        </div>
-      </Modal>
+          <div className="flex items-start justify-end gap-2 self-stretch pt-6">
+            <Button variant="secondary" onClick={() => setShowErrorModal(false)}>{t('newApp.Cancel', { ns: 'app' })}</Button>
+            <Button variant="primary" tone="destructive" onClick={onDSLConfirm}>{t('newApp.Confirm', { ns: 'app' })}</Button>
+          </div>
+        </DialogContent>
+      </Dialog>
     </>
   )
 }
diff --git a/web/app/components/app/create-from-dsl-modal/uploader.tsx b/web/app/components/app/create-from-dsl-modal/uploader.tsx
index aeecb280d0..5b380bd9c5 100644
--- a/web/app/components/app/create-from-dsl-modal/uploader.tsx
+++ b/web/app/components/app/create-from-dsl-modal/uploader.tsx
@@ -112,7 +112,13 @@ const Uploader: FC<Props> = ({
               <RiUploadCloud2Line className="h-6 w-6 text-text-tertiary" />
               <div className="text-text-tertiary">
                 {t('dslUploader.button', { ns: 'app' })}
-                <span className="cursor-pointer pl-1 text-text-accent" onClick={selectHandle}>{t('dslUploader.browse', { ns: 'app' })}</span>
+                <button
+                  type="button"
+                  className="inline cursor-pointer border-none bg-transparent p-0 pl-1 text-left text-text-accent focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+                  onClick={selectHandle}
+                >
+                  {t('dslUploader.browse', { ns: 'app' })}
+                </button>
               </div>
             </div>
             {dragging && <div ref={dragRef} className="absolute top-0 left-0 h-full w-full" />}
diff --git a/web/app/components/app/duplicate-modal/__tests__/index.spec.tsx b/web/app/components/app/duplicate-modal/__tests__/index.spec.tsx
index ceec1aa3c0..d8473378a0 100644
--- a/web/app/components/app/duplicate-modal/__tests__/index.spec.tsx
+++ b/web/app/components/app/duplicate-modal/__tests__/index.spec.tsx
@@ -106,6 +106,27 @@ describe('DuplicateAppModal', () => {
     expect(onHide).toHaveBeenCalled()
   })
 
+  it('should call onHide when close button is clicked', async () => {
+    const onHide = vi.fn()
+    const user = userEvent.setup()
+
+    render(
+      <DuplicateAppModal
+        appName="Demo App"
+        icon_type="emoji"
+        icon="🤖"
+        icon_background="#FFEAD5"
+        show
+        onConfirm={vi.fn()}
+        onHide={onHide}
+      />,
+    )
+
+    await user.click(screen.getByRole('button', { name: 'operation.close' }))
+
+    expect(onHide).toHaveBeenCalledTimes(1)
+  })
+
   it('should restore the original image icon when the picker closes without selecting', async () => {
     const onConfirm = vi.fn()
     const user = userEvent.setup()
diff --git a/web/app/components/app/duplicate-modal/index.tsx b/web/app/components/app/duplicate-modal/index.tsx
index e55ac6cf66..996952ff2f 100644
--- a/web/app/components/app/duplicate-modal/index.tsx
+++ b/web/app/components/app/duplicate-modal/index.tsx
@@ -1,16 +1,14 @@
 'use client'
 import type { AppIconType } from '@/types/app'
 import { Button } from '@langgenius/dify-ui/button'
-import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
 import { RiCloseLine } from '@remixicon/react'
-import { noop } from 'es-toolkit/function'
 import * as React from 'react'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import AppIcon from '@/app/components/base/app-icon'
 import Input from '@/app/components/base/input'
-import Modal from '@/app/components/base/modal'
 import AppsFull from '@/app/components/billing/apps-full-in-dialog'
 import { useProviderContext } from '@/context/provider-context'
 import AppIconPicker from '../../base/app-icon-picker'
@@ -71,40 +69,44 @@ const DuplicateAppModal = ({
 
   return (
     <>
-      <Modal
-        isShow={show}
-        onClose={noop}
-        className={cn('relative max-w-[480px]!', 'px-8')}
-      >
-        <div className="absolute top-4 right-4 cursor-pointer p-2" onClick={onHide}>
-          <RiCloseLine className="h-4 w-4 text-text-tertiary" />
-        </div>
-        <div className="relative mt-3 mb-9 text-xl leading-[30px] font-semibold text-text-primary">{t('duplicateTitle', { ns: 'app' })}</div>
-        <div className="mb-9 system-sm-regular text-text-secondary">
-          <div className="mb-2 system-md-medium">{t('appCustomize.subTitle', { ns: 'explore' })}</div>
-          <div className="flex items-center justify-between space-x-2">
-            <AppIcon
-              size="large"
-              onClick={() => { setShowAppIconPicker(true) }}
-              className="cursor-pointer"
-              iconType={appIcon.type}
-              icon={appIcon.type === 'image' ? appIcon.fileId : appIcon.icon}
-              background={appIcon.type === 'image' ? undefined : appIcon.background}
-              imageUrl={appIcon.type === 'image' ? appIcon.url : undefined}
-            />
-            <Input
-              value={name}
-              onChange={e => setName(e.target.value)}
-              className="h-10"
-            />
+      <Dialog open={show}>
+        <DialogContent className="w-full max-w-[480px]! overflow-hidden! border-none px-8 text-left align-middle">
+
+          <button
+            type="button"
+            className="absolute top-4 right-4 cursor-pointer border-none bg-transparent p-2 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+            aria-label={t('operation.close', { ns: 'common' })}
+            onClick={onHide}
+          >
+            <RiCloseLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
+          </button>
+          <div className="relative mt-3 mb-9 text-xl leading-[30px] font-semibold text-text-primary">{t('duplicateTitle', { ns: 'app' })}</div>
+          <div className="mb-9 system-sm-regular text-text-secondary">
+            <div className="mb-2 system-md-medium">{t('appCustomize.subTitle', { ns: 'explore' })}</div>
+            <div className="flex items-center justify-between space-x-2">
+              <AppIcon
+                size="large"
+                onClick={() => { setShowAppIconPicker(true) }}
+                className="cursor-pointer"
+                iconType={appIcon.type}
+                icon={appIcon.type === 'image' ? appIcon.fileId : appIcon.icon}
+                background={appIcon.type === 'image' ? undefined : appIcon.background}
+                imageUrl={appIcon.type === 'image' ? appIcon.url : undefined}
+              />
+              <Input
+                value={name}
+                onChange={e => setName(e.target.value)}
+                className="h-10"
+              />
+            </div>
+            {isAppsFull && <AppsFull className="mt-4" loc="app-duplicate-create" />}
           </div>
-          {isAppsFull && <AppsFull className="mt-4" loc="app-duplicate-create" />}
-        </div>
-        <div className="flex flex-row-reverse">
-          <Button disabled={isAppsFull} className="ml-2 w-24" variant="primary" onClick={submit}>{t('duplicate', { ns: 'app' })}</Button>
-          <Button className="w-24" onClick={onHide}>{t('operation.cancel', { ns: 'common' })}</Button>
-        </div>
-      </Modal>
+          <div className="flex flex-row-reverse">
+            <Button disabled={isAppsFull} className="ml-2 w-24" variant="primary" onClick={submit}>{t('duplicate', { ns: 'app' })}</Button>
+            <Button className="w-24" onClick={onHide}>{t('operation.cancel', { ns: 'common' })}</Button>
+          </div>
+        </DialogContent>
+      </Dialog>
       {showAppIconPicker && (
         <AppIconPicker
           onSelect={(payload) => {
diff --git a/web/app/components/app/log-annotation/__tests__/index.spec.tsx b/web/app/components/app/log-annotation/__tests__/index.spec.tsx
index f75e782953..db657ed29a 100644
--- a/web/app/components/app/log-annotation/__tests__/index.spec.tsx
+++ b/web/app/components/app/log-annotation/__tests__/index.spec.tsx
@@ -15,19 +15,19 @@ vi.mock('@/next/navigation', () => ({
 
 vi.mock('@/app/components/app/annotation', () => ({
   default: ({ appDetail }: { appDetail: App }) => (
-    <div data-testid="annotation" data-app-id={appDetail.id} />
+    <section aria-label="Annotation log">{appDetail.id}</section>
   ),
 }))
 
 vi.mock('@/app/components/app/log', () => ({
   default: ({ appDetail }: { appDetail: App }) => (
-    <div data-testid="log" data-app-id={appDetail.id} />
+    <section aria-label="App log">{appDetail.id}</section>
   ),
 }))
 
 vi.mock('@/app/components/app/workflow-log', () => ({
   default: ({ appDetail }: { appDetail: App }) => (
-    <div data-testid="workflow-log" data-app-id={appDetail.id} />
+    <section aria-label="Workflow log">{appDetail.id}</section>
   ),
 }))
 
@@ -113,7 +113,7 @@ describe('LogAnnotation', () => {
 
       // Assert
       expect(screen.queryByText('appLog.title')).not.toBeInTheDocument()
-      expect(screen.getByTestId('workflow-log')).toBeInTheDocument()
+      expect(screen.getByRole('region', { name: 'Workflow log' })).toBeInTheDocument()
     })
   })
 
@@ -127,8 +127,8 @@ describe('LogAnnotation', () => {
       render(<LogAnnotation pageType={PageType.log} />)
 
       // Assert
-      expect(screen.getByTestId('log')).toBeInTheDocument()
-      expect(screen.queryByTestId('annotation')).not.toBeInTheDocument()
+      expect(screen.getByRole('region', { name: 'App log' })).toBeInTheDocument()
+      expect(screen.queryByRole('region', { name: 'Annotation log' })).not.toBeInTheDocument()
     })
 
     it('should render annotation content when page type is annotation', () => {
@@ -139,8 +139,8 @@ describe('LogAnnotation', () => {
       render(<LogAnnotation pageType={PageType.annotation} />)
 
       // Assert
-      expect(screen.getByTestId('annotation')).toBeInTheDocument()
-      expect(screen.queryByTestId('log')).not.toBeInTheDocument()
+      expect(screen.getByRole('region', { name: 'Annotation log' })).toBeInTheDocument()
+      expect(screen.queryByRole('region', { name: 'App log' })).not.toBeInTheDocument()
     })
   })
 
diff --git a/web/app/components/app/log/__tests__/empty-element.spec.tsx b/web/app/components/app/log/__tests__/empty-element.spec.tsx
index 3967097c12..41f82375f9 100644
--- a/web/app/components/app/log/__tests__/empty-element.spec.tsx
+++ b/web/app/components/app/log/__tests__/empty-element.spec.tsx
@@ -8,7 +8,7 @@ vi.mock('react-i18next', () => ({
     t: (key: string) => key,
   }),
   Trans: ({ i18nKey, components }: { i18nKey: string, components: Record<string, React.ReactNode> }) => (
-    <span data-testid="trans-component" data-i18n-key={i18nKey}>
+    <span>
       {i18nKey}
       {components.shareLink}
       {components.testLink}
@@ -54,8 +54,7 @@ describe('EmptyElement', () => {
       const appDetail = createMockAppDetail(AppModeEnum.CHAT)
       render(<EmptyElement appDetail={appDetail} />)
 
-      const transComponent = screen.getByTestId('trans-component')
-      expect(transComponent).toHaveAttribute('data-i18n-key', 'table.empty.element.content')
+      expect(screen.getByText('table.empty.element.content', { exact: false })).toBeInTheDocument()
     })
 
     it('should render ThreeDotsIcon SVG', () => {
diff --git a/web/app/components/app/log/__tests__/filter.spec.tsx b/web/app/components/app/log/__tests__/filter.spec.tsx
index ec1a0183be..3692c76a85 100644
--- a/web/app/components/app/log/__tests__/filter.spec.tsx
+++ b/web/app/components/app/log/__tests__/filter.spec.tsx
@@ -146,7 +146,7 @@ describe('Filter', () => {
 
       render(<Filter {...propsWithKeyword} />)
 
-      const clearButton = screen.getByTestId('input-clear')
+      const clearButton = screen.getByRole('button', { name: 'operation.clear' })
       fireEvent.click(clearButton)
 
       expect(mockSetQueryParams).toHaveBeenCalledWith({
diff --git a/web/app/components/app/log/__tests__/list.spec.tsx b/web/app/components/app/log/__tests__/list.spec.tsx
index 25512ed689..dbd350f16b 100644
--- a/web/app/components/app/log/__tests__/list.spec.tsx
+++ b/web/app/components/app/log/__tests__/list.spec.tsx
@@ -84,23 +84,6 @@ vi.mock('@/app/components/app/store', () => ({
   }),
 }))
 
-vi.mock('@/app/components/base/tooltip', () => ({
-  default: ({ children }: { children: ReactNode }) => <>{children}</>,
-}))
-
-vi.mock('@/app/components/base/drawer', () => ({
-  default: ({ children, isOpen, onClose }: { children: ReactNode, isOpen: boolean, onClose: () => void }) => (
-    isOpen
-      ? (
-          <div data-testid="drawer">
-            <button onClick={onClose}>close-drawer</button>
-            {children}
-          </div>
-        )
-      : null
-  ),
-}))
-
 vi.mock('@/app/components/base/loading', () => ({
   default: () => <div>loading</div>,
 }))
@@ -287,7 +270,7 @@ describe('ConversationList', () => {
 
     await waitFor(() => {
       expect(onUrlUpdate).toHaveBeenCalled()
-      expect(screen.getByTestId('drawer')).toBeInTheDocument()
+      expect(screen.getByRole('dialog')).toBeInTheDocument()
     })
 
     const update = onUrlUpdate.mock.calls.at(-1)![0]
@@ -297,11 +280,26 @@ describe('ConversationList', () => {
   })
 
   it('should close the drawer, refresh, and clear modal flags', async () => {
+    mockChatConversationDetail = {
+      id: 'conversation-1',
+      created_at: 1710000000,
+      model_config: {
+        model: 'gpt-4o',
+        configs: {
+          introduction: 'Hello there',
+        },
+        user_input_form: [],
+      },
+      message: {
+        inputs: {},
+      },
+    }
+
     const { onUrlUpdate } = renderConversationList({
       searchParams: '?page=2&conversation_id=conversation-1',
     })
 
-    fireEvent.click(screen.getByText('close-drawer'))
+    fireEvent.click(await screen.findByRole('button', { name: 'operation.close' }))
 
     expect(mockOnRefresh).toHaveBeenCalledTimes(1)
     expect(mockSetShowPromptLogModal).toHaveBeenCalledWith(false)
diff --git a/web/app/components/app/log/list.tsx b/web/app/components/app/log/list.tsx
index 1633d53ccc..2e078b7b93 100644
--- a/web/app/components/app/log/list.tsx
+++ b/web/app/components/app/log/list.tsx
@@ -9,6 +9,14 @@ import {
   HandThumbUpIcon,
 } from '@heroicons/react/24/outline'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  Drawer,
+  DrawerBackdrop,
+  DrawerContent,
+  DrawerPopup,
+  DrawerPortal,
+  DrawerViewport,
+} from '@langgenius/dify-ui/drawer'
 import { toast } from '@langgenius/dify-ui/toast'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { RiCloseLine, RiEditFill } from '@remixicon/react'
@@ -28,7 +36,6 @@ import TextGeneration from '@/app/components/app/text-generate/item'
 import ActionButton from '@/app/components/base/action-button'
 import Chat from '@/app/components/base/chat/chat'
 import CopyIcon from '@/app/components/base/copy-icon'
-import Drawer from '@/app/components/base/drawer'
 import Loading from '@/app/components/base/loading'
 import MessageLogModal from '@/app/components/base/message-log-modal'
 import { WorkflowContextProvider } from '@/app/components/workflow/context'
@@ -429,7 +436,7 @@ function DetailPanel({ detail, onFeedback }: IDetailPanel) {
         <div className="flex grow flex-wrap items-center justify-end gap-y-1">
           {!isAdvanced && <ModelInfo model={detail.model_config.model} />}
         </div>
-        <ActionButton size="l" onClick={onClose}>
+        <ActionButton size="l" aria-label={t('operation.close', { ns: 'common' })} onClick={onClose}>
           <RiCloseLine className="h-4 w-4 text-text-tertiary" />
         </ActionButton>
       </div>
@@ -872,21 +879,32 @@ const ConversationList: FC<IConversationList> = ({ logs, appDetail, onRefresh })
         </tbody>
       </table>
       <Drawer
-        isOpen={showDrawer}
-        onClose={onCloseDrawer}
-        mask={isMobile}
-        footer={null}
-        panelClassName="mt-16 mx-2 sm:mr-2 mb-4 p-0! max-w-[640px]! rounded-xl bg-components-panel-bg"
-      >
-        <DrawerContext.Provider value={{
-          onClose: onCloseDrawer,
-          appDetail,
+        open={showDrawer}
+        modal
+        swipeDirection="right"
+        onOpenChange={(open) => {
+          if (!open)
+            onCloseDrawer()
         }}
-        >
-          {isChatMode
-            ? <ChatConversationDetailComp appId={appDetail.id} conversationId={currentConversation?.id} />
-            : <CompletionConversationDetailComp appId={appDetail.id} conversationId={currentConversation?.id} />}
-        </DrawerContext.Provider>
+      >
+        <DrawerPortal>
+          <DrawerBackdrop className={cn(!isMobile && 'bg-transparent')} />
+          <DrawerViewport>
+            <DrawerPopup className="bg-components-panel-bg p-0! data-[swipe-direction=right]:top-16 data-[swipe-direction=right]:right-2 data-[swipe-direction=right]:bottom-4 data-[swipe-direction=right]:h-auto data-[swipe-direction=right]:w-full data-[swipe-direction=right]:max-w-[640px] data-[swipe-direction=right]:rounded-xl">
+              <DrawerContent className="flex min-h-0 flex-1 flex-col p-0 pb-0">
+                <DrawerContext.Provider value={{
+                  onClose: onCloseDrawer,
+                  appDetail,
+                }}
+                >
+                  {isChatMode
+                    ? <ChatConversationDetailComp appId={appDetail.id} conversationId={currentConversation?.id} />
+                    : <CompletionConversationDetailComp appId={appDetail.id} conversationId={currentConversation?.id} />}
+                </DrawerContext.Provider>
+              </DrawerContent>
+            </DrawerPopup>
+          </DrawerViewport>
+        </DrawerPortal>
       </Drawer>
     </div>
   )
diff --git a/web/app/components/app/overview/__tests__/app-card-sections.spec.tsx b/web/app/components/app/overview/__tests__/app-card-sections.spec.tsx
index 9820e15ad8..d3f83d5d9c 100644
--- a/web/app/components/app/overview/__tests__/app-card-sections.spec.tsx
+++ b/web/app/components/app/overview/__tests__/app-card-sections.spec.tsx
@@ -1,8 +1,38 @@
+import type { FormEvent } from 'react'
 import type { AppDetailResponse } from '@/models/app'
 import { fireEvent, render, screen, within } from '@testing-library/react'
+import { InputVarType } from '@/app/components/workflow/types'
 import { AccessMode } from '@/models/access-control'
 import { AppModeEnum } from '@/types/app'
-import { AppCardAccessControlSection, AppCardOperations, AppCardUrlSection, createAppCardOperations } from '../app-card-sections'
+import { AppCardAccessControlSection, AppCardDialogs, AppCardOperations, AppCardUrlSection, createAppCardOperations, WorkflowLaunchDialog } from '../app-card-sections'
+
+vi.mock('react-i18next', () => ({
+  useTranslation: () => ({
+    t: (key: string) => key,
+  }),
+  Trans: ({ i18nKey }: { i18nKey: string }) => <span>{i18nKey}</span>,
+}))
+
+vi.mock('../settings', () => ({
+  default: () => <div data-testid="settings-modal" />,
+}))
+
+vi.mock('../embedded', () => ({
+  default: () => <div data-testid="embedded-modal" />,
+}))
+
+vi.mock('../customize', () => ({
+  default: () => <div data-testid="customize-modal" />,
+}))
+
+vi.mock('../../app-access-control', () => ({
+  default: ({ onClose, onConfirm }: { onClose: () => void, onConfirm: () => void }) => (
+    <div data-testid="access-control">
+      <button type="button" onClick={onClose}>close-access</button>
+      <button type="button" onClick={onConfirm}>confirm-access</button>
+    </div>
+  ),
+}))
 
 describe('app-card-sections', () => {
   const t = (key: string) => key
@@ -52,6 +82,7 @@ describe('app-card-sections', () => {
 
   it('should render operation buttons and execute enabled actions', () => {
     const onLaunch = vi.fn()
+    const onLaunchConfig = vi.fn()
     const operations = createAppCardOperations({
       operationKeys: ['launch', 'embedded'],
       t: t as never,
@@ -68,12 +99,19 @@ describe('app-card-sections', () => {
       <AppCardOperations
         t={t as never}
         operations={operations}
+        launchConfigAction={{
+          label: 'operation.config',
+          disabled: false,
+          onClick: onLaunchConfig,
+        }}
       />,
     )
 
     fireEvent.click(screen.getByRole('button', { name: /overview\.appInfo\.launch/i }))
+    fireEvent.click(screen.getByRole('button', { name: /operation\.config/i }))
 
     expect(onLaunch).toHaveBeenCalledTimes(1)
+    expect(onLaunchConfig).toHaveBeenCalledTimes(1)
     expect(screen.getByRole('button', { name: /overview\.appInfo\.embedded\.entry/i })).toBeInTheDocument()
   })
 
@@ -127,4 +165,127 @@ describe('app-card-sections', () => {
     fireEvent.click(within(dialog).getByRole('button', { name: /operation\.confirm/i }))
     expect(onRegenerate).toHaveBeenCalledTimes(1)
   })
+
+  it('should disable all operations when triggerModeDisabled is true', () => {
+    const operations = createAppCardOperations({
+      operationKeys: ['launch', 'settings'],
+      t: t as never,
+      runningStatus: true,
+      triggerModeDisabled: true,
+      onLaunch: vi.fn(),
+      onEmbedded: vi.fn(),
+      onCustomize: vi.fn(),
+      onSettings: vi.fn(),
+      onDevelop: vi.fn(),
+    })
+
+    expect(operations[0]!.disabled).toBe(true)
+    expect(operations[1]!.disabled).toBe(true)
+  })
+
+  it('should render WorkflowLaunchDialog and submit values', () => {
+    const onOpenChange = vi.fn()
+    const onValueChange = vi.fn()
+    const onSubmit = vi.fn((event: FormEvent<HTMLFormElement>) => {
+      event.preventDefault()
+    })
+
+    render(
+      <WorkflowLaunchDialog
+        t={t as never}
+        open
+        hiddenVariables={[{
+          variable: 'secret',
+          label: 'Secret',
+          type: InputVarType.textInput,
+          hide: true,
+          required: true,
+        }]}
+        unsupportedVariables={[]}
+        values={{ secret: 'hello' }}
+        onOpenChange={onOpenChange}
+        onValueChange={onValueChange}
+        onSubmit={onSubmit}
+      />,
+    )
+
+    expect(screen.getByText('overview.appInfo.workflowLaunchHiddenInputs.title')).toBeInTheDocument()
+    fireEvent.submit(screen.getByRole('button', { name: /overview\.appInfo\.launch/i }).closest('form')!)
+    expect(onSubmit).toHaveBeenCalled()
+  })
+
+  it('should return null for WorkflowLaunchDialog when no variables are provided', () => {
+    const { container } = render(
+      <WorkflowLaunchDialog
+        t={t as never}
+        open
+        hiddenVariables={[]}
+        unsupportedVariables={[]}
+        values={{}}
+        onOpenChange={vi.fn()}
+        onValueChange={vi.fn()}
+        onSubmit={vi.fn()}
+      />,
+    )
+
+    expect(container).toBeEmptyDOMElement()
+  })
+
+  it('should render AppCardDialogs with all modals for web apps', () => {
+    const appInfo = {
+      id: 'app-1',
+      mode: AppModeEnum.CHAT,
+      enable_site: true,
+      enable_api: false,
+      site: { app_base_url: 'https://example.com', access_token: 'token-1' },
+      api_base_url: 'https://api.example.com',
+    } as never
+
+    render(
+      <AppCardDialogs
+        isApp
+        appInfo={appInfo}
+        appMode={AppModeEnum.CHAT}
+        showSettingsModal
+        showEmbedded
+        showCustomizeModal
+        showAccessControl
+        appDetail={{ id: 'app-1', access_mode: AccessMode.PUBLIC } as AppDetailResponse}
+        onCloseSettings={vi.fn()}
+        onCloseEmbedded={vi.fn()}
+        onCloseCustomize={vi.fn()}
+        onCloseAccessControl={vi.fn()}
+        onSaveSiteConfig={vi.fn()}
+        onConfirmAccessControl={vi.fn()}
+      />,
+    )
+
+    expect(screen.getByTestId('settings-modal')).toBeInTheDocument()
+    expect(screen.getByTestId('embedded-modal')).toBeInTheDocument()
+    expect(screen.getByTestId('customize-modal')).toBeInTheDocument()
+    expect(screen.getByTestId('access-control')).toBeInTheDocument()
+  })
+
+  it('should return null for AppCardDialogs when not an app', () => {
+    const { container } = render(
+      <AppCardDialogs
+        isApp={false}
+        appInfo={{} as never}
+        appMode={AppModeEnum.CHAT}
+        showSettingsModal={false}
+        showEmbedded={false}
+        showCustomizeModal={false}
+        showAccessControl={false}
+        appDetail={null}
+        onCloseSettings={vi.fn()}
+        onCloseEmbedded={vi.fn()}
+        onCloseCustomize={vi.fn()}
+        onCloseAccessControl={vi.fn()}
+        onSaveSiteConfig={vi.fn()}
+        onConfirmAccessControl={vi.fn()}
+      />,
+    )
+
+    expect(container).toBeEmptyDOMElement()
+  })
 })
diff --git a/web/app/components/app/overview/__tests__/app-card-utils.spec.ts b/web/app/components/app/overview/__tests__/app-card-utils.spec.ts
index fbfcdaf955..0a6d7f7dd7 100644
--- a/web/app/components/app/overview/__tests__/app-card-utils.spec.ts
+++ b/web/app/components/app/overview/__tests__/app-card-utils.spec.ts
@@ -1,9 +1,22 @@
 import type { AppDetailResponse } from '@/models/app'
-import { BlockEnum } from '@/app/components/workflow/types'
+import { BlockEnum, InputVarType } from '@/app/components/workflow/types'
 import { AccessMode } from '@/models/access-control'
 import { AppModeEnum } from '@/types/app'
 import { basePath } from '@/utils/var'
-import { getAppCardDisplayState, getAppCardOperationKeys, hasWorkflowStartNode, isAppAccessConfigured } from '../app-card-utils'
+import {
+  buildWorkflowLaunchUrl,
+  compressAndEncodeBase64,
+  createWorkflowLaunchInitialValues,
+  getAppCardDisplayState,
+  getAppCardOperationKeys,
+  getAppHiddenLaunchVariables,
+  getEmbeddedIframeSnippet,
+  getEmbeddedScriptSnippet,
+  getWorkflowHiddenStartVariables,
+  hasWorkflowStartNode,
+  isAppAccessConfigured,
+  isWorkflowLaunchInputSupported,
+} from '../app-card-utils'
 
 describe('app-card-utils', () => {
   const baseAppInfo = {
@@ -33,6 +46,108 @@ describe('app-card-utils', () => {
     })).toBe(false)
   })
 
+  it('should return hidden workflow start variables and their initial launch values', () => {
+    const hiddenVariables = getWorkflowHiddenStartVariables({
+      graph: {
+        nodes: [{
+          data: {
+            type: BlockEnum.Start,
+            variables: [
+              {
+                variable: 'visible',
+                label: 'Visible',
+                type: InputVarType.textInput,
+                hide: false,
+                required: false,
+              },
+              {
+                variable: 'secret',
+                label: 'Secret',
+                type: InputVarType.textInput,
+                hide: true,
+                default: 'prefilled',
+                required: false,
+              },
+              {
+                variable: 'enabled',
+                label: 'Enabled',
+                type: InputVarType.checkbox,
+                hide: true,
+                default: true,
+                required: false,
+              },
+            ],
+          },
+        }],
+      },
+    })
+
+    expect(hiddenVariables.map(variable => variable.variable)).toEqual(['secret', 'enabled'])
+    expect(createWorkflowLaunchInitialValues(hiddenVariables)).toEqual({
+      secret: 'prefilled',
+      enabled: true,
+    })
+  })
+
+  it('should return hidden advanced-chat launch variables from the workflow start node first', () => {
+    const hiddenVariables = getAppHiddenLaunchVariables({
+      appInfo: {
+        ...baseAppInfo,
+        mode: AppModeEnum.ADVANCED_CHAT,
+        model_config: {
+          user_input_form: [
+            {
+              'text-input': {
+                label: 'Visible',
+                variable: 'visible',
+                required: true,
+                max_length: 48,
+                default: '',
+                hide: false,
+              },
+            },
+            {
+              checkbox: {
+                label: 'Hidden Toggle',
+                variable: 'hidden_toggle',
+                required: false,
+                default: true,
+                hide: true,
+              },
+            },
+          ],
+        },
+      } as AppDetailResponse,
+      currentWorkflow: {
+        graph: {
+          nodes: [{
+            data: {
+              type: BlockEnum.Start,
+              variables: [
+                {
+                  variable: 'start_secret',
+                  label: 'Start Secret',
+                  type: InputVarType.textInput,
+                  hide: true,
+                  default: 'from-start',
+                  required: false,
+                },
+              ],
+            },
+          }],
+        },
+      },
+    })
+
+    expect(hiddenVariables).toEqual([
+      expect.objectContaining({
+        variable: 'start_secret',
+        type: InputVarType.textInput,
+        default: 'from-start',
+      }),
+    ])
+  })
+
   it('should build the display state for a published web app', () => {
     const state = getAppCardDisplayState({
       appInfo: baseAppInfo,
@@ -104,4 +219,108 @@ describe('app-card-utils', () => {
       isCurrentWorkspaceEditor: false,
     })).toEqual(['launch', 'embedded', 'customize'])
   })
+
+  it('should build a workflow launch URL with serialized parameters', async () => {
+    const url = await buildWorkflowLaunchUrl({
+      accessibleUrl: 'https://example.com/app/workflow/token-1',
+      variables: [
+        { variable: 'name', label: 'Name', type: InputVarType.textInput, hide: true, required: false },
+        { variable: 'enabled', label: 'Enabled', type: InputVarType.checkbox, hide: true, required: false },
+      ],
+      values: { name: 'Alice', enabled: true },
+    })
+
+    const parsed = new URL(url)
+    expect(parsed.searchParams.get('name')).toBe('Alice')
+    expect(parsed.searchParams.get('enabled')).toBe('true')
+  })
+
+  it('should serialize checkbox false and empty string values in launch URL', async () => {
+    const url = await buildWorkflowLaunchUrl({
+      accessibleUrl: 'https://example.com/app/workflow/token-1',
+      variables: [
+        { variable: 'flag', label: 'Flag', type: InputVarType.checkbox, hide: true, required: false },
+        { variable: 'empty', label: 'Empty', type: InputVarType.textInput, hide: true, required: false },
+      ],
+      values: { flag: false, empty: '' },
+    })
+
+    const parsed = new URL(url)
+    expect(parsed.searchParams.get('flag')).toBe('false')
+    expect(parsed.searchParams.get('empty')).toBe('')
+  })
+
+  it('should generate an iframe snippet with the provided URL', () => {
+    const snippet = getEmbeddedIframeSnippet('https://example.com/chatbot/token-1')
+    expect(snippet).toContain('src="https://example.com/chatbot/token-1"')
+    expect(snippet).toContain('frameborder="0"')
+    expect(snippet).toContain('allow="microphone"')
+  })
+
+  it('should generate an embedded script snippet with inputs', () => {
+    const snippet = getEmbeddedScriptSnippet({
+      url: 'https://example.com',
+      token: 'abc123',
+      primaryColor: '#FF0000',
+      isTestEnv: true,
+      inputValues: { name: 'Alice', count: '5' },
+    })
+
+    expect(snippet).toContain('token: \'abc123\'')
+    expect(snippet).toContain('isDev: true')
+    expect(snippet).toContain('name: "Alice"')
+    expect(snippet).toContain('count: "5"')
+    expect(snippet).toContain('background-color: #FF0000')
+  })
+
+  it('should generate an embedded script snippet with empty inputs comment', () => {
+    const snippet = getEmbeddedScriptSnippet({
+      url: 'https://example.com',
+      token: 'abc123',
+      primaryColor: '#1C64F2',
+      inputValues: {},
+    })
+
+    expect(snippet).toContain('// You can define the inputs from the Start node here')
+    expect(snippet).not.toContain('isDev: true')
+  })
+
+  it('should compress and encode base64 using CompressionStream when available', async () => {
+    const result = await compressAndEncodeBase64('hello')
+    expect(typeof result).toBe('string')
+    expect(result.length).toBeGreaterThan(0)
+  })
+
+  it('should fallback to plain base64 when CompressionStream is unavailable', async () => {
+    const original = globalThis.CompressionStream
+    // @ts-expect-error remove for test
+    delete globalThis.CompressionStream
+
+    const result = await compressAndEncodeBase64('hello')
+    expect(result).toBe(btoa('hello'))
+
+    globalThis.CompressionStream = original
+  })
+
+  it('should identify supported workflow launch input types', () => {
+    expect(isWorkflowLaunchInputSupported({ variable: 'v', label: 'V', type: InputVarType.textInput, hide: true, required: false })).toBe(true)
+    expect(isWorkflowLaunchInputSupported({ variable: 'v', label: 'V', type: InputVarType.paragraph, hide: true, required: false })).toBe(true)
+    expect(isWorkflowLaunchInputSupported({ variable: 'v', label: 'V', type: InputVarType.select, hide: true, required: false })).toBe(true)
+    expect(isWorkflowLaunchInputSupported({ variable: 'v', label: 'V', type: InputVarType.number, hide: true, required: false })).toBe(true)
+    expect(isWorkflowLaunchInputSupported({ variable: 'v', label: 'V', type: InputVarType.checkbox, hide: true, required: false })).toBe(true)
+    expect(isWorkflowLaunchInputSupported({ variable: 'v', label: 'V', type: InputVarType.json, hide: true, required: false })).toBe(true)
+    expect(isWorkflowLaunchInputSupported({ variable: 'v', label: 'V', type: InputVarType.jsonObject, hide: true, required: false })).toBe(true)
+    expect(isWorkflowLaunchInputSupported({ variable: 'v', label: 'V', type: InputVarType.url, hide: true, required: false })).toBe(true)
+    expect(isWorkflowLaunchInputSupported({ variable: 'v', label: 'V', type: InputVarType.files, hide: true, required: false })).toBe(false)
+    expect(isWorkflowLaunchInputSupported({ variable: 'v', label: 'V', type: InputVarType.singleFile, hide: true, required: false })).toBe(false)
+  })
+
+  it('should coerce numeric defaults to string in createWorkflowLaunchInitialValues', () => {
+    const result = createWorkflowLaunchInitialValues([
+      { variable: 'count', label: 'Count', type: InputVarType.number, hide: true, required: false, default: 42 },
+      { variable: 'empty', label: 'Empty', type: InputVarType.textInput, hide: true, required: false },
+    ])
+
+    expect(result).toEqual({ count: '42', empty: '' })
+  })
 })
diff --git a/web/app/components/app/overview/__tests__/app-card.spec.tsx b/web/app/components/app/overview/__tests__/app-card.spec.tsx
index 2f730ad278..1e9ba71a4f 100644
--- a/web/app/components/app/overview/__tests__/app-card.spec.tsx
+++ b/web/app/components/app/overview/__tests__/app-card.spec.tsx
@@ -1,7 +1,8 @@
-import type { ReactElement, ReactNode } from 'react'
+import type { ReactElement } from 'react'
 import type { AppDetailResponse } from '@/models/app'
 import { fireEvent, screen, waitFor } from '@testing-library/react'
 import { renderWithSystemFeatures } from '@/__tests__/utils/mock-system-features'
+import { InputVarType } from '@/app/components/workflow/types'
 import { AccessMode } from '@/models/access-control'
 import { AppModeEnum } from '@/types/app'
 import { basePath } from '@/utils/var'
@@ -17,7 +18,7 @@ const mockSetAppDetail = vi.fn()
 const mockOnChangeStatus = vi.fn()
 const mockOnGenerateCode = vi.fn()
 
-let mockWorkflow: { graph?: { nodes?: Array<{ data?: { type?: string } }> } } | null = null
+let mockWorkflow: { graph?: { nodes?: Array<{ data?: { type?: string, variables?: Array<Record<string, unknown>> } }> } } | null = null
 let mockAccessSubjects: { groups?: unknown[], members?: unknown[] } = { groups: [], members: [] }
 let mockAppDetail: AppDetailResponse | undefined
 
@@ -25,6 +26,7 @@ vi.mock('react-i18next', () => ({
   useTranslation: () => ({
     t: (key: string) => key,
   }),
+  Trans: ({ i18nKey }: { i18nKey?: string }) => i18nKey ?? null,
 }))
 
 vi.mock('@/context/app-context', () => ({
@@ -96,15 +98,6 @@ vi.mock('../../app-access-control', () => ({
   ),
 }))
 
-vi.mock('@/app/components/base/tooltip', () => ({
-  default: ({ children, popupContent }: { children: ReactNode, popupContent?: ReactNode }) => (
-    <div>
-      {children}
-      {popupContent}
-    </div>
-  ),
-}))
-
 const mockWindowOpen = vi.fn()
 Object.defineProperty(window, 'open', {
   writable: true,
@@ -164,6 +157,182 @@ describe('AppCard', () => {
     expect(mockWindowOpen).toHaveBeenCalledWith(`https://example.com${basePath}/chat/access-token`, '_blank')
   })
 
+  it('should open the workflow web app directly when launch is clicked even with hidden inputs', () => {
+    mockWorkflow = {
+      graph: {
+        nodes: [{
+          data: {
+            type: 'start',
+            variables: [
+              {
+                variable: 'secret',
+                label: 'Secret',
+                type: InputVarType.textInput,
+                hide: true,
+                required: true,
+                default: '',
+              },
+            ],
+          },
+        }],
+      },
+    }
+
+    render(
+      <AppCard
+        appInfo={{
+          ...appInfo,
+          mode: AppModeEnum.WORKFLOW,
+        }}
+        onChangeStatus={mockOnChangeStatus}
+      />,
+    )
+
+    fireEvent.click(screen.getByText('overview.appInfo.launch'))
+
+    expect(mockWindowOpen).toHaveBeenCalledWith(
+      `https://example.com${basePath}/workflow/access-token`,
+      '_blank',
+    )
+    expect(screen.queryByText('overview.appInfo.workflowLaunchHiddenInputs.title')).not.toBeInTheDocument()
+  })
+
+  it('should collect hidden workflow inputs from the config action before launching the workflow web app', async () => {
+    mockWorkflow = {
+      graph: {
+        nodes: [{
+          data: {
+            type: 'start',
+            variables: [
+              {
+                variable: 'secret',
+                label: 'Secret',
+                type: InputVarType.textInput,
+                hide: true,
+                required: true,
+                default: '',
+              },
+            ],
+          },
+        }],
+      },
+    }
+
+    render(
+      <AppCard
+        appInfo={{
+          ...appInfo,
+          mode: AppModeEnum.WORKFLOW,
+        }}
+        onChangeStatus={mockOnChangeStatus}
+      />,
+    )
+
+    fireEvent.click(screen.getByRole('button', { name: 'operation.config' }))
+
+    expect(screen.getByText('overview.appInfo.workflowLaunchHiddenInputs.title')).toBeInTheDocument()
+
+    fireEvent.change(screen.getByLabelText('Secret'), {
+      target: { value: 'top-secret' },
+    })
+    fireEvent.click(screen.getByRole('button', { name: 'overview.appInfo.launch' }))
+
+    await waitFor(() => {
+      expect(mockWindowOpen).toHaveBeenCalledWith(
+        `https://example.com${basePath}/workflow/access-token?secret=${encodeURIComponent('top-secret')}`,
+        '_blank',
+      )
+    })
+  })
+
+  it('should open the chat web app directly when launch is clicked even with hidden inputs', () => {
+    mockWorkflow = {
+      graph: {
+        nodes: [{
+          data: {
+            type: 'start',
+            variables: [
+              {
+                variable: 'chat_secret',
+                label: 'Chat Secret',
+                type: InputVarType.textInput,
+                hide: true,
+                required: true,
+                default: '',
+              },
+            ],
+          },
+        }],
+      },
+    }
+
+    render(
+      <AppCard
+        appInfo={{
+          ...appInfo,
+          mode: AppModeEnum.ADVANCED_CHAT,
+        } as AppDetailResponse}
+        onChangeStatus={mockOnChangeStatus}
+      />,
+    )
+
+    fireEvent.click(screen.getByText('overview.appInfo.launch'))
+
+    expect(mockWindowOpen).toHaveBeenCalledWith(
+      `https://example.com${basePath}/chat/access-token`,
+      '_blank',
+    )
+    expect(screen.queryByText('overview.appInfo.workflowLaunchHiddenInputs.title')).not.toBeInTheDocument()
+  })
+
+  it('should collect hidden chatflow inputs from the config action before launching the chat web app', async () => {
+    mockWorkflow = {
+      graph: {
+        nodes: [{
+          data: {
+            type: 'start',
+            variables: [
+              {
+                variable: 'chat_secret',
+                label: 'Chat Secret',
+                type: InputVarType.textInput,
+                hide: true,
+                required: true,
+                default: '',
+              },
+            ],
+          },
+        }],
+      },
+    }
+
+    render(
+      <AppCard
+        appInfo={{
+          ...appInfo,
+          mode: AppModeEnum.ADVANCED_CHAT,
+        } as AppDetailResponse}
+        onChangeStatus={mockOnChangeStatus}
+      />,
+    )
+
+    fireEvent.click(screen.getByRole('button', { name: 'operation.config' }))
+
+    expect(screen.getByText('overview.appInfo.workflowLaunchHiddenInputs.title')).toBeInTheDocument()
+
+    fireEvent.change(screen.getByLabelText('Chat Secret'), {
+      target: { value: 'chat-secret' },
+    })
+    fireEvent.click(screen.getByRole('button', { name: 'overview.appInfo.launch' }))
+
+    await waitFor(() => {
+      expect(mockWindowOpen).toHaveBeenCalledWith(
+        `https://example.com${basePath}/chat/access-token?chat_secret=${encodeURIComponent('chat-secret')}`,
+        '_blank',
+      )
+    })
+  })
+
   it('should show the access-control not-set badge when specific access has no subjects', () => {
     render(
       <AppCard
@@ -302,7 +471,7 @@ describe('AppCard', () => {
   })
 
   it('should report refresh failures from access control updates', async () => {
-    const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
+    const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => { })
     mockFetchAppDetailDirect.mockRejectedValueOnce(new Error('refresh failed'))
 
     render(
diff --git a/web/app/components/app/overview/__tests__/workflow-hidden-input-fields.spec.tsx b/web/app/components/app/overview/__tests__/workflow-hidden-input-fields.spec.tsx
new file mode 100644
index 0000000000..309df540a6
--- /dev/null
+++ b/web/app/components/app/overview/__tests__/workflow-hidden-input-fields.spec.tsx
@@ -0,0 +1,214 @@
+import { fireEvent, render, screen } from '@testing-library/react'
+import { InputVarType } from '@/app/components/workflow/types'
+import WorkflowHiddenInputFields from '../workflow-hidden-input-fields'
+
+describe('WorkflowHiddenInputFields', () => {
+  const onValueChange = vi.fn()
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('should render a text input with label and placeholder', () => {
+    render(
+      <WorkflowHiddenInputFields
+        hiddenVariables={[{
+          variable: 'name',
+          label: 'Full Name',
+          type: InputVarType.textInput,
+          hide: true,
+          required: true,
+        }]}
+        values={{ name: 'Alice' }}
+        onValueChange={onValueChange}
+      />,
+    )
+
+    const input = screen.getByLabelText('Full Name')
+    expect(input).toHaveValue('Alice')
+
+    fireEvent.change(input, { target: { value: 'Bob' } })
+    expect(onValueChange).toHaveBeenCalledWith('name', 'Bob')
+  })
+
+  it('should render a number input for number-typed variables', () => {
+    render(
+      <WorkflowHiddenInputFields
+        hiddenVariables={[{
+          variable: 'count',
+          label: 'Count',
+          type: InputVarType.number,
+          hide: true,
+          required: false,
+        }]}
+        values={{ count: '5' }}
+        onValueChange={onValueChange}
+      />,
+    )
+
+    const input = screen.getByLabelText('Count')
+    expect(input).toHaveAttribute('type', 'number')
+
+    fireEvent.change(input, { target: { value: '10' } })
+    expect(onValueChange).toHaveBeenCalledWith('count', '10')
+  })
+
+  it('should render a checkbox input without a separate label element above', () => {
+    render(
+      <WorkflowHiddenInputFields
+        hiddenVariables={[{
+          variable: 'enabled',
+          label: 'Enable Feature',
+          type: InputVarType.checkbox,
+          hide: true,
+          required: false,
+        }]}
+        values={{ enabled: true }}
+        onValueChange={onValueChange}
+      />,
+    )
+
+    const checkbox = screen.getByRole('checkbox')
+    expect(checkbox).toBeChecked()
+    expect(screen.getByText('Enable Feature')).toBeInTheDocument()
+
+    fireEvent.click(checkbox)
+    expect(onValueChange).toHaveBeenCalledWith('enabled', false)
+  })
+
+  it('should render a select dropdown for select-typed variables', () => {
+    render(
+      <WorkflowHiddenInputFields
+        hiddenVariables={[{
+          variable: 'color',
+          label: 'Color',
+          type: InputVarType.select,
+          hide: true,
+          required: false,
+          options: ['red', 'green', 'blue'],
+        }]}
+        values={{ color: 'red' }}
+        onValueChange={onValueChange}
+      />,
+    )
+
+    expect(screen.getByRole('combobox', { name: 'Color' })).toBeInTheDocument()
+  })
+
+  it('should render a textarea for paragraph-typed variables', () => {
+    render(
+      <WorkflowHiddenInputFields
+        hiddenVariables={[{
+          variable: 'description',
+          label: 'Description',
+          type: InputVarType.paragraph,
+          hide: true,
+          required: false,
+          max_length: 500,
+        }]}
+        values={{ description: 'Hello world' }}
+        onValueChange={onValueChange}
+      />,
+    )
+
+    const textarea = screen.getByPlaceholderText('Description')
+    expect(textarea).toHaveValue('Hello world')
+
+    fireEvent.change(textarea, { target: { value: 'Updated' } })
+    expect(onValueChange).toHaveBeenCalledWith('description', 'Updated')
+  })
+
+  it('should render a textarea for json-typed variables', () => {
+    render(
+      <WorkflowHiddenInputFields
+        hiddenVariables={[{
+          variable: 'config',
+          label: 'Config JSON',
+          type: InputVarType.json,
+          hide: true,
+          required: false,
+        }]}
+        values={{ config: '{"key": "value"}' }}
+        onValueChange={onValueChange}
+      />,
+    )
+
+    const textarea = screen.getByPlaceholderText('Config JSON')
+    expect(textarea).toHaveValue('{"key": "value"}')
+  })
+
+  it('should render a textarea for jsonObject-typed variables', () => {
+    render(
+      <WorkflowHiddenInputFields
+        hiddenVariables={[{
+          variable: 'schema',
+          label: 'Schema',
+          type: InputVarType.jsonObject,
+          hide: true,
+          required: false,
+        }]}
+        values={{ schema: '{}' }}
+        onValueChange={onValueChange}
+      />,
+    )
+
+    const textarea = screen.getByPlaceholderText('Schema')
+    expect(textarea).toHaveValue('{}')
+  })
+
+  it('should use the variable key as label when label is not a string', () => {
+    render(
+      <WorkflowHiddenInputFields
+        hiddenVariables={[{
+          variable: 'my_var',
+          label: { nodeType: 'start' as never, nodeName: 'Start', variable: 'my_var' },
+          type: InputVarType.textInput,
+          hide: true,
+          required: false,
+        }]}
+        values={{ my_var: '' }}
+        onValueChange={onValueChange}
+      />,
+    )
+
+    expect(screen.getByText('my_var')).toBeInTheDocument()
+  })
+
+  it('should use the custom fieldIdPrefix for element ids', () => {
+    const { container } = render(
+      <WorkflowHiddenInputFields
+        hiddenVariables={[{
+          variable: 'token',
+          label: 'Token',
+          type: InputVarType.textInput,
+          hide: true,
+          required: false,
+        }]}
+        values={{ token: 'abc' }}
+        onValueChange={onValueChange}
+        fieldIdPrefix="custom-prefix"
+      />,
+    )
+
+    expect(container.querySelector('#custom-prefix-token')).toBeInTheDocument()
+  })
+
+  it('should render empty string for non-string fieldValue in text inputs', () => {
+    render(
+      <WorkflowHiddenInputFields
+        hiddenVariables={[{
+          variable: 'flag',
+          label: 'Flag',
+          type: InputVarType.textInput,
+          hide: true,
+          required: false,
+        }]}
+        values={{ flag: true as never }}
+        onValueChange={onValueChange}
+      />,
+    )
+
+    const input = screen.getByLabelText('Flag')
+    expect(input).toHaveValue('')
+  })
+})
diff --git a/web/app/components/app/overview/apikey-info-panel/apikey-info-panel.test-utils.tsx b/web/app/components/app/overview/apikey-info-panel/apikey-info-panel.test-utils.tsx
index 5d3c008989..e8d8266586 100644
--- a/web/app/components/app/overview/apikey-info-panel/apikey-info-panel.test-utils.tsx
+++ b/web/app/components/app/overview/apikey-info-panel/apikey-info-panel.test-utils.tsx
@@ -31,6 +31,7 @@ const defaultProviderContext = {
   isAPIKeySet: false,
   plan: defaultPlan,
   isFetchedPlan: false,
+  isFetchedPlanInfo: false,
   enableBilling: false,
   onPlanInfoChanged: noop,
   enableReplaceWebAppLogo: false,
@@ -58,7 +59,6 @@ const defaultProviderContext = {
 
 const defaultModalContext: ModalContextState = {
   setShowAccountSettingModal: noop,
-  setShowApiBasedExtensionModal: noop,
   setShowModerationSettingModal: noop,
   setShowExternalDataToolModal: noop,
   setShowPricingModal: noop,
diff --git a/web/app/components/app/overview/app-card-sections.tsx b/web/app/components/app/overview/app-card-sections.tsx
index 8fef355f34..5328efab02 100644
--- a/web/app/components/app/overview/app-card-sections.tsx
+++ b/web/app/components/app/overview/app-card-sections.tsx
@@ -1,7 +1,11 @@
 /* eslint-disable react-refresh/only-export-components */
 import type { TFunction } from 'i18next'
-import type { ComponentType, ReactNode } from 'react'
-import type { OverviewOperationKey } from './app-card-utils'
+import type { ComponentType, FormEvent, ReactNode } from 'react'
+import type {
+  OverviewOperationKey,
+  WorkflowHiddenStartVariable,
+  WorkflowLaunchInputValue,
+} from './app-card-utils'
 import type { ConfigParams } from './settings'
 import type { AppDetailResponse } from '@/models/app'
 import type { AppSSO } from '@/types/app'
@@ -15,12 +19,19 @@ import {
   AlertDialogTitle,
 } from '@langgenius/dify-ui/alert-dialog'
 import { Button } from '@langgenius/dify-ui/button'
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogTitle,
+} from '@langgenius/dify-ui/dialog'
 import {
   Tooltip,
   TooltipContent,
   TooltipTrigger,
 } from '@langgenius/dify-ui/tooltip'
-import { RiArrowRightSLine, RiBookOpenLine, RiBuildingLine, RiEqualizer2Line, RiExternalLinkLine, RiGlobalLine, RiLockLine, RiPaintBrushLine, RiVerifiedBadgeLine, RiWindowLine } from '@remixicon/react'
+import { RiArrowRightSLine, RiBookOpenLine, RiBuildingLine, RiEqualizer2Line, RiExternalLinkLine, RiGlobalLine, RiLockLine, RiPaintBrushLine, RiSettings2Line, RiVerifiedBadgeLine, RiWindowLine } from '@remixicon/react'
+import { Trans } from 'react-i18next'
 import CopyFeedback from '@/app/components/base/copy-feedback'
 import Divider from '@/app/components/base/divider'
 import ShareQRCode from '@/app/components/base/qrcode'
@@ -31,6 +42,7 @@ import CustomizeModal from './customize'
 import EmbeddedModal from './embedded'
 import SettingsModal from './settings'
 import style from './style.module.css'
+import WorkflowHiddenInputFields from './workflow-hidden-input-fields'
 
 type AppInfo = AppDetailResponse & Partial<AppSSO>
 
@@ -50,6 +62,12 @@ type AppCardOperation = {
   onClick: () => void
 }
 
+type LaunchConfigAction = {
+  label: string
+  disabled: boolean
+  onClick: () => void
+}
+
 const OPERATION_ICON_MAP: Record<OverviewOperationKey, OperationIcon> = {
   launch: RiExternalLinkLine,
   embedded: RiWindowLine,
@@ -96,6 +114,65 @@ const MaybeTooltip = ({
   )
 }
 
+export const WorkflowLaunchDialog = ({
+  t,
+  open,
+  hiddenVariables,
+  unsupportedVariables,
+  values,
+  onOpenChange,
+  onValueChange,
+  onSubmit,
+}: {
+  t: TFunction
+  open: boolean
+  hiddenVariables: WorkflowHiddenStartVariable[]
+  unsupportedVariables: WorkflowHiddenStartVariable[]
+  values: Record<string, WorkflowLaunchInputValue>
+  onOpenChange: (open: boolean) => void
+  onValueChange: (variable: string, value: WorkflowLaunchInputValue) => void
+  onSubmit: (event: FormEvent<HTMLFormElement>) => void
+}) => {
+  if (!hiddenVariables.length && !unsupportedVariables.length)
+    return null
+
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent className="w-[560px]! max-w-[calc(100vw-2rem)]! p-0!">
+        <div className="flex flex-col gap-2 px-6 pt-6 pb-4">
+          <DialogTitle className="title-2xl-semi-bold text-text-primary">
+            {t('overview.appInfo.workflowLaunchHiddenInputs.title', { ns: 'appOverview' })}
+          </DialogTitle>
+          <DialogDescription className="system-md-regular text-text-tertiary">
+            <Trans
+              i18nKey="overview.appInfo.workflowLaunchHiddenInputs.description"
+              ns="appOverview"
+              components={{ bold: <span className="system-md-medium" /> }}
+            />
+          </DialogDescription>
+        </div>
+        <form onSubmit={onSubmit}>
+          <div className="space-y-4 px-6 pb-4">
+            <WorkflowHiddenInputFields
+              hiddenVariables={hiddenVariables}
+              values={values}
+              onValueChange={onValueChange}
+            />
+          </div>
+          <div className="flex items-center justify-end gap-2 border-t-[0.5px] border-divider-subtle px-6 py-4">
+            <Button onClick={() => onOpenChange(false)}>
+              {t('operation.cancel', { ns: 'common' })}
+            </Button>
+            <Button type="submit" variant="primary">
+              {t('overview.appInfo.launch', { ns: 'appOverview' })}
+            </Button>
+          </div>
+        </form>
+      </DialogContent>
+    </Dialog>
+  )
+}
+
 export const createAppCardOperations = ({
   operationKeys,
   t,
@@ -251,20 +328,15 @@ export const AppCardAccessControlSection = ({
 export const AppCardOperations = ({
   t,
   operations,
+  launchConfigAction,
 }: {
   t: TFunction
   operations: AppCardOperation[]
+  launchConfigAction?: LaunchConfigAction
 }) => (
   <>
-    {operations.map(({ key, label, Icon, disabled, onClick }) => (
-      <Button
-        className="mr-1 min-w-[88px]"
-        size="small"
-        variant="ghost"
-        key={key}
-        onClick={onClick}
-        disabled={disabled}
-      >
+    {operations.map(({ key, label, Icon, disabled, onClick }) => {
+      const buttonContent = (
         <MaybeTooltip
           content={t('overview.appInfo.preUseReminder', { ns: 'appOverview' }) ?? ''}
           tooltipClassName="mt-[-8px]"
@@ -275,8 +347,66 @@ export const AppCardOperations = ({
             <div className={`${disabled ? 'text-components-button-ghost-text-disabled' : 'text-text-tertiary'} px-[3px] system-xs-medium`}>{label}</div>
           </div>
         </MaybeTooltip>
-      </Button>
-    ))}
+      )
+
+      if (key === 'launch' && launchConfigAction) {
+        return (
+          <div key={key} className="mr-1 inline-flex">
+            <MaybeTooltip
+              content={t('overview.appInfo.preUseReminder', { ns: 'appOverview' }) ?? ''}
+              tooltipClassName="mt-[-8px]"
+              show={disabled}
+            >
+              <Button
+                className="min-w-[88px] rounded-r-none border-0 px-0 py-0 shadow-none backdrop-blur-none hover:bg-components-button-secondary-bg"
+                size="small"
+                variant="secondary"
+                onClick={onClick}
+                disabled={disabled}
+              >
+                <div className="flex h-full min-w-[88px] items-center justify-center rounded-l-md px-2 hover:bg-components-button-secondary-bg-hover">
+                  <div className="flex items-center justify-center gap-px">
+                    <Icon className="h-3.5 w-3.5" />
+                    <div className="px-[3px] system-xs-medium">{label}</div>
+                  </div>
+                </div>
+              </Button>
+            </MaybeTooltip>
+            <div
+              aria-hidden="true"
+              className="h-6 w-px shrink-0 bg-divider-regular opacity-100"
+            />
+            <Button
+              aria-label={launchConfigAction.label}
+              className="w-8 rounded-l-none border-0 px-0 py-0 shadow-none backdrop-blur-none hover:bg-components-button-secondary-bg-hover"
+              size="small"
+              variant="secondary"
+              onClick={launchConfigAction.onClick}
+              disabled={disabled || launchConfigAction.disabled}
+            >
+              <div className="flex h-full w-8 shrink-0 items-center justify-center rounded-r-md">
+                <div className="flex items-center justify-center gap-px">
+                  <RiSettings2Line className="h-3.5 w-3.5" aria-hidden="true" />
+                </div>
+              </div>
+            </Button>
+          </div>
+        )
+      }
+
+      return (
+        <Button
+          className="mr-1 min-w-[88px]"
+          size="small"
+          variant="ghost"
+          key={key}
+          onClick={onClick}
+          disabled={disabled}
+        >
+          {buttonContent}
+        </Button>
+      )
+    })}
   </>
 )
 
@@ -295,6 +425,7 @@ export const AppCardDialogs = ({
   onCloseAccessControl,
   onSaveSiteConfig,
   onConfirmAccessControl,
+  hiddenInputs,
 }: {
   isApp: boolean
   appInfo: AppInfo
@@ -310,6 +441,7 @@ export const AppCardDialogs = ({
   onCloseAccessControl: () => void
   onSaveSiteConfig?: (params: ConfigParams) => Promise<void>
   onConfirmAccessControl: () => Promise<void>
+  hiddenInputs?: WorkflowHiddenStartVariable[]
 }) => {
   if (!isApp)
     return null
@@ -329,6 +461,7 @@ export const AppCardDialogs = ({
         onClose={onCloseEmbedded}
         appBaseUrl={appInfo.site?.app_base_url}
         accessToken={appInfo.site?.access_token}
+        hiddenInputs={hiddenInputs}
       />
       <CustomizeModal
         isShow={showCustomizeModal}
diff --git a/web/app/components/app/overview/app-card-utils.ts b/web/app/components/app/overview/app-card-utils.ts
index 345531091d..c08fa73b18 100644
--- a/web/app/components/app/overview/app-card-utils.ts
+++ b/web/app/components/app/overview/app-card-utils.ts
@@ -1,6 +1,8 @@
+import type { InputVar } from '@/app/components/workflow/types'
 import type { AppDetailResponse } from '@/models/app'
 import type { AppSSO } from '@/types/app'
-import { BlockEnum } from '@/app/components/workflow/types'
+import { BlockEnum, InputVarType } from '@/app/components/workflow/types'
+import { IS_CE_EDITION } from '@/config'
 import { AccessMode } from '@/models/access-control'
 import { AppModeEnum } from '@/types/app'
 import { basePath } from '@/utils/var'
@@ -8,6 +10,11 @@ import { basePath } from '@/utils/var'
 type OverviewCardType = 'api' | 'webapp'
 
 export type OverviewOperationKey = 'launch' | 'embedded' | 'customize' | 'settings' | 'develop'
+export type WorkflowLaunchInputValue = string | boolean
+export type WorkflowHiddenStartVariable = Pick<
+  InputVar,
+  'default' | 'hide' | 'label' | 'max_length' | 'options' | 'required' | 'type' | 'variable'
+>
 
 type AppInfo = AppDetailResponse & Partial<AppSSO>
 
@@ -16,6 +23,7 @@ type WorkflowLike = {
     nodes?: Array<{
       data?: {
         type?: string
+        variables?: InputVar[]
       }
     }>
   }
@@ -42,10 +50,173 @@ const getCardAppMode = (mode: AppModeEnum) => {
   return (mode !== AppModeEnum.COMPLETION && mode !== AppModeEnum.WORKFLOW) ? AppModeEnum.CHAT : mode
 }
 
+const SUPPORTED_WORKFLOW_LAUNCH_INPUT_TYPES = new Set<InputVarType>([
+  InputVarType.textInput,
+  InputVarType.paragraph,
+  InputVarType.select,
+  InputVarType.number,
+  InputVarType.checkbox,
+  InputVarType.json,
+  InputVarType.jsonObject,
+  InputVarType.url,
+])
+
+const coerceWorkflowLaunchDefaultValue = (variable: WorkflowHiddenStartVariable): WorkflowLaunchInputValue => {
+  if (variable.type === InputVarType.checkbox) {
+    if (typeof variable.default === 'boolean')
+      return variable.default
+
+    return String(variable.default).toLowerCase() === 'true'
+  }
+
+  if (typeof variable.default === 'number')
+    return String(variable.default)
+
+  return String(variable.default ?? '')
+}
+
 export const hasWorkflowStartNode = (currentWorkflow: WorkflowLike) => {
   return currentWorkflow?.graph?.nodes?.some(node => node.data?.type === BlockEnum.Start) ?? false
 }
 
+export const getWorkflowHiddenStartVariables = (currentWorkflow: WorkflowLike): WorkflowHiddenStartVariable[] => {
+  const startNode = currentWorkflow?.graph?.nodes?.find(node => node.data?.type === BlockEnum.Start)
+  return (startNode?.data?.variables ?? []).filter(variable => variable.hide === true)
+}
+
+export const getAppHiddenLaunchVariables = ({
+  appInfo,
+  currentWorkflow,
+}: {
+  appInfo: AppInfo
+  currentWorkflow: WorkflowLike
+}) => {
+  if ([AppModeEnum.WORKFLOW, AppModeEnum.ADVANCED_CHAT].includes(appInfo.mode))
+    return getWorkflowHiddenStartVariables(currentWorkflow)
+}
+
+export const isWorkflowLaunchInputSupported = (variable: WorkflowHiddenStartVariable) => {
+  return SUPPORTED_WORKFLOW_LAUNCH_INPUT_TYPES.has(variable.type)
+}
+
+export const createWorkflowLaunchInitialValues = (variables: WorkflowHiddenStartVariable[]) => {
+  return variables.reduce<Record<string, WorkflowLaunchInputValue>>((acc, variable) => {
+    acc[variable.variable] = coerceWorkflowLaunchDefaultValue(variable)
+    return acc
+  }, {})
+}
+
+export const buildWorkflowLaunchUrl = async ({
+  accessibleUrl,
+  variables,
+  values,
+}: {
+  accessibleUrl: string
+  variables: WorkflowHiddenStartVariable[]
+  values: Record<string, WorkflowLaunchInputValue>
+}) => {
+  const targetUrl = new URL(accessibleUrl, window.location.origin)
+  variables.forEach((variable) => {
+    const rawValue = values[variable.variable]
+    const serializedValue = variable.type === InputVarType.checkbox
+      ? String(Boolean(rawValue))
+      : String(rawValue ?? '')
+
+    targetUrl.searchParams.set(variable.variable, serializedValue)
+  })
+
+  return targetUrl.toString()
+}
+
+export const getEmbeddedIframeSnippet = (iframeUrl: string) =>
+  `<iframe
+ src="${iframeUrl}"
+ style="width: 100%; height: 100%; min-height: 700px"
+ frameborder="0"
+ allow="microphone">
+</iframe>`
+
+const getScriptInputsContent = (values: Record<string, WorkflowLaunchInputValue>) => {
+  const entries = Object.entries(values)
+
+  if (!entries.length) {
+    return `{
+    // You can define the inputs from the Start node here
+    // key is the variable name
+    // e.g.
+    // name: "NAME"
+  }`
+  }
+
+  return `{
+${entries.map(([key, value]) => `    ${key}: ${JSON.stringify(value)},`).join('\n')}
+  }`
+}
+
+export const getEmbeddedScriptSnippet = ({
+  url,
+  token,
+  primaryColor,
+  isTestEnv,
+  inputValues,
+}: {
+  url: string
+  token: string
+  primaryColor: string
+  isTestEnv?: boolean
+  inputValues: Record<string, WorkflowLaunchInputValue>
+}) =>
+  `<script>
+ window.difyChatbotConfig = {
+  token: '${token}'${isTestEnv
+    ? `,
+  isDev: true`
+    : ''}${IS_CE_EDITION
+    ? `,
+  baseUrl: '${url}${basePath}'`
+    : ''},
+  inputs: ${getScriptInputsContent(inputValues)},
+  systemVariables: {
+    // user_id: 'YOU CAN DEFINE USER ID HERE',
+    // conversation_id: 'YOU CAN DEFINE CONVERSATION ID HERE, IT MUST BE A VALID UUID',
+  },
+  userVariables: {
+    // avatar_url: 'YOU CAN DEFINE USER AVATAR URL HERE',
+    // name: 'YOU CAN DEFINE USER NAME HERE',
+  },
+ }
+</script>
+<script
+ src="${url}${basePath}/embed.min.js"
+ id="${token}"
+ defer>
+</script>
+<style>
+  #dify-chatbot-bubble-button {
+    background-color: ${primaryColor} !important;
+  }
+  #dify-chatbot-bubble-window {
+    width: 24rem !important;
+    height: 40rem !important;
+  }
+</style>`
+
+export const getChromePluginContent = (iframeUrl: string) => `ChatBot URL: ${iframeUrl}`
+
+export const compressAndEncodeBase64 = async (input: string) => {
+  const uint8Array = new TextEncoder().encode(input)
+  if (typeof CompressionStream === 'undefined')
+    return btoa(String.fromCharCode(...uint8Array))
+
+  const compressedStream = new Response(
+    new Blob([uint8Array])
+      .stream()
+      .pipeThrough(new CompressionStream('gzip')),
+  ).arrayBuffer()
+  const compressedUint8Array = new Uint8Array(await compressedStream)
+  return btoa(String.fromCharCode(...compressedUint8Array))
+}
+
 export const getAppCardDisplayState = ({
   appInfo,
   cardType,
diff --git a/web/app/components/app/overview/app-card.tsx b/web/app/components/app/overview/app-card.tsx
index b7ec4a2d81..9b1fc3a032 100644
--- a/web/app/components/app/overview/app-card.tsx
+++ b/web/app/components/app/overview/app-card.tsx
@@ -1,4 +1,5 @@
 'use client'
+import type { WorkflowLaunchInputValue } from './app-card-utils'
 import type { ConfigParams } from './settings'
 import type { AppDetailResponse } from '@/models/app'
 import type { AppSSO } from '@/types/app'
@@ -28,11 +29,16 @@ import {
   AppCardOperations,
   AppCardUrlSection,
   createAppCardOperations,
+  WorkflowLaunchDialog,
 } from './app-card-sections'
 import {
+  buildWorkflowLaunchUrl,
+  createWorkflowLaunchInitialValues,
   getAppCardDisplayState,
   getAppCardOperationKeys,
+  getAppHiddenLaunchVariables,
   isAppAccessConfigured,
+  isWorkflowLaunchInputSupported,
 } from './app-card-utils'
 
 export type IAppCardProps = {
@@ -63,7 +69,8 @@ function AppCard({
   const router = useRouter()
   const pathname = usePathname()
   const { isCurrentWorkspaceManager, isCurrentWorkspaceEditor } = useAppContext()
-  const { data: currentWorkflow } = useAppWorkflow(appInfo.mode === AppModeEnum.WORKFLOW ? appInfo.id : '')
+  const shouldFetchWorkflow = appInfo.mode === AppModeEnum.WORKFLOW || appInfo.mode === AppModeEnum.ADVANCED_CHAT
+  const { data: currentWorkflow } = useAppWorkflow(shouldFetchWorkflow ? appInfo.id : '')
   const docLink = useDocLink()
   const appDetail = useAppStore(state => state.appDetail)
   const setAppDetail = useAppStore(state => state.setAppDetail)
@@ -73,6 +80,8 @@ function AppCard({
   const [genLoading, setGenLoading] = useState(false)
   const [showConfirmDelete, setShowConfirmDelete] = useState(false)
   const [showAccessControl, setShowAccessControl] = useState(false)
+  const [showWorkflowLaunchDialog, setShowWorkflowLaunchDialog] = useState(false)
+  const [workflowLaunchValues, setWorkflowLaunchValues] = useState<Record<string, WorkflowLaunchInputValue>>({})
   const { t } = useTranslation()
   const { data: systemFeatures } = useSuspenseQuery(systemFeaturesQueryOptions())
   const { data: appAccessSubjects } = useAppWhiteListSubjects(
@@ -98,6 +107,25 @@ function AppCard({
     () => isAppAccessConfigured(appDetail, appAccessSubjects),
     [appAccessSubjects, appDetail],
   )
+  const hiddenLaunchVariables = useMemo(
+    () => getAppHiddenLaunchVariables({
+      appInfo,
+      currentWorkflow,
+    }) || [],
+    [appInfo, currentWorkflow],
+  )
+  const supportedWorkflowLaunchVariables = useMemo(
+    () => hiddenLaunchVariables.filter(isWorkflowLaunchInputSupported),
+    [hiddenLaunchVariables],
+  )
+  const unsupportedWorkflowLaunchVariables = useMemo(
+    () => hiddenLaunchVariables.filter(variable => !isWorkflowLaunchInputSupported(variable)),
+    [hiddenLaunchVariables],
+  )
+  const initialWorkflowLaunchValues = useMemo(
+    () => createWorkflowLaunchInitialValues(supportedWorkflowLaunchVariables),
+    [supportedWorkflowLaunchVariables],
+  )
 
   const onGenCode = async () => {
     if (!onGenerateCode)
@@ -139,6 +167,31 @@ function AppCard({
     window.open(cardState.accessibleUrl, '_blank')
   }, [cardState.accessibleUrl])
 
+  const handleOpenWorkflowLaunchDialog = useCallback(() => {
+    setWorkflowLaunchValues(initialWorkflowLaunchValues)
+    setShowWorkflowLaunchDialog(true)
+  }, [initialWorkflowLaunchValues])
+
+  const handleWorkflowLaunchValueChange = useCallback((variable: string, value: WorkflowLaunchInputValue) => {
+    setWorkflowLaunchValues(prev => ({
+      ...prev,
+      [variable]: value,
+    }))
+  }, [])
+
+  const handleWorkflowLaunchConfirm = useCallback(async (event: React.FormEvent<HTMLFormElement>) => {
+    event.preventDefault()
+
+    const targetUrl = await buildWorkflowLaunchUrl({
+      accessibleUrl: cardState.accessibleUrl,
+      variables: supportedWorkflowLaunchVariables,
+      values: workflowLaunchValues,
+    })
+
+    window.open(targetUrl, '_blank')
+    setShowWorkflowLaunchDialog(false)
+  }, [cardState.accessibleUrl, supportedWorkflowLaunchVariables, workflowLaunchValues])
+
   const handleOpenCustomize = useCallback(() => {
     setShowCustomizeModal(true)
   }, [])
@@ -304,7 +357,17 @@ function AppCard({
         {!cardState.isMinimalState && (
           <div className="flex items-center gap-1 self-stretch p-3">
             {!isApp && <SecretKeyButton appId={appInfo.id} />}
-            <AppCardOperations t={t} operations={operations} />
+            <AppCardOperations
+              t={t}
+              operations={operations}
+              launchConfigAction={hiddenLaunchVariables.length > 0
+                ? {
+                    label: t('operation.config', { ns: 'common' }),
+                    disabled: triggerModeDisabled || !cardState.runningStatus,
+                    onClick: handleOpenWorkflowLaunchDialog,
+                  }
+                : undefined}
+            />
           </div>
         )}
       </div>
@@ -323,6 +386,17 @@ function AppCard({
         onCloseAccessControl={() => setShowAccessControl(false)}
         onSaveSiteConfig={onSaveSiteConfig}
         onConfirmAccessControl={handleAccessControlUpdate}
+        hiddenInputs={hiddenLaunchVariables}
+      />
+      <WorkflowLaunchDialog
+        t={t}
+        open={showWorkflowLaunchDialog}
+        hiddenVariables={supportedWorkflowLaunchVariables}
+        unsupportedVariables={unsupportedWorkflowLaunchVariables}
+        values={workflowLaunchValues}
+        onOpenChange={setShowWorkflowLaunchDialog}
+        onValueChange={handleWorkflowLaunchValueChange}
+        onSubmit={handleWorkflowLaunchConfirm}
       />
     </div>
   )
diff --git a/web/app/components/app/overview/customize/__tests__/index.spec.tsx b/web/app/components/app/overview/customize/__tests__/index.spec.tsx
index 0e065fcdfe..6b33cadcf7 100644
--- a/web/app/components/app/overview/customize/__tests__/index.spec.tsx
+++ b/web/app/components/app/overview/customize/__tests__/index.spec.tsx
@@ -8,13 +8,6 @@ vi.mock('@/context/i18n', () => ({
   useDocLink: () => mockDocLink,
 }))
 
-// Mock window.open
-const mockWindowOpen = vi.fn()
-Object.defineProperty(window, 'open', {
-  value: mockWindowOpen,
-  writable: true,
-})
-
 describe('CustomizeModal', () => {
   const defaultProps = {
     isShow: true,
@@ -287,7 +280,7 @@ describe('CustomizeModal', () => {
 
   // User interactions tests - verify user actions trigger expected behaviors
   describe('User Interactions', () => {
-    it('should call window.open with doc link when way 2 button is clicked', async () => {
+    it('should render the API docs link for way 2', async () => {
       // Arrange
       const props = { ...defaultProps }
 
@@ -298,16 +291,10 @@ describe('CustomizeModal', () => {
         expect(screen.getByText('appOverview.overview.appInfo.customize.way2.operation')).toBeInTheDocument()
       })
 
-      const way2Button = screen.getByText('appOverview.overview.appInfo.customize.way2.operation').closest('button')
-      expect(way2Button).toBeInTheDocument()
-      fireEvent.click(way2Button!)
-
-      // Assert
-      expect(mockWindowOpen).toHaveBeenCalledTimes(1)
-      expect(mockWindowOpen).toHaveBeenCalledWith(
-        expect.stringContaining('/use-dify/publish/developing-with-apis'),
-        '_blank',
-      )
+      const way2Link = screen.getByRole('link', { name: /way2\.operation/i })
+      expect(way2Link).toHaveAttribute('href', expect.stringContaining('/use-dify/publish/developing-with-apis'))
+      expect(way2Link).toHaveAttribute('target', '_blank')
+      expect(way2Link).toHaveAttribute('rel', 'noopener noreferrer')
     })
 
     it('should call onClose when modal close button is clicked', async () => {
@@ -323,7 +310,7 @@ describe('CustomizeModal', () => {
         expect(screen.getByText('appOverview.overview.appInfo.customize.title')).toBeInTheDocument()
       })
 
-      const closeButton = screen.getByTestId('modal-close-button')
+      const closeButton = screen.getByRole('button', { name: 'Close' })
       fireEvent.click(closeButton)
       expect(onClose).toHaveBeenCalledTimes(1)
     })
diff --git a/web/app/components/app/overview/customize/index.tsx b/web/app/components/app/overview/customize/index.tsx
index e4b8aabf69..e27e1e7653 100644
--- a/web/app/components/app/overview/customize/index.tsx
+++ b/web/app/components/app/overview/customize/index.tsx
@@ -1,10 +1,9 @@
 'use client'
 import type { FC } from 'react'
-import { ArrowTopRightOnSquareIcon } from '@heroicons/react/24/outline'
 import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogCloseButton, DialogContent, DialogDescription, DialogTitle } from '@langgenius/dify-ui/dialog'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
-import Modal from '@/app/components/base/modal'
 import Tag from '@/app/components/base/tag'
 import { useDocLink } from '@/context/i18n'
 import { AppModeEnum } from '@/types/app'
@@ -25,7 +24,7 @@ const StepNum: FC<{ children: React.ReactNode }> = ({ children }) => (
 
 const GithubIcon = ({ className }: { className: string }) => {
   return (
-    <svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg" className={className}>
+    <svg aria-hidden="true" width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg" className={className}>
       <path d="M5.80078 13.7109C5.80078 13.6406 5.73047 13.5703 5.625 13.5703C5.51953 13.5703 5.44922 13.6406 5.44922 13.7109C5.44922 13.7812 5.51953 13.8516 5.625 13.8164C5.73047 13.8164 5.80078 13.7812 5.80078 13.7109ZM4.71094 13.5352C4.71094 13.6055 4.78125 13.7109 4.88672 13.7109C4.95703 13.7461 5.0625 13.7109 5.09766 13.6406C5.09766 13.5703 5.0625 13.5 4.95703 13.4648C4.85156 13.4297 4.74609 13.4648 4.71094 13.5352ZM6.29297 13.5C6.1875 13.5 6.11719 13.5703 6.11719 13.6758C6.11719 13.7461 6.22266 13.7812 6.32812 13.7461C6.43359 13.7109 6.50391 13.6758 6.46875 13.6055C6.46875 13.5352 6.36328 13.4648 6.29297 13.5ZM8.57812 0C3.72656 0 0 3.72656 0 8.57812C0 12.4805 2.42578 15.8203 5.94141 17.0156C6.39844 17.0859 6.53906 16.8047 6.53906 16.5938C6.53906 16.3477 6.53906 15.1523 6.53906 14.4141C6.53906 14.4141 4.07812 14.9414 3.55078 13.3594C3.55078 13.3594 3.16406 12.3398 2.60156 12.0938C2.60156 12.0938 1.79297 11.5312 2.63672 11.5312C2.63672 11.5312 3.51562 11.6016 4.00781 12.4453C4.78125 13.8164 6.04688 13.4297 6.57422 13.1836C6.64453 12.6211 6.85547 12.2344 7.13672 11.9883C5.16797 11.7773 3.16406 11.4961 3.16406 8.12109C3.16406 7.13672 3.44531 6.67969 4.00781 6.04688C3.90234 5.80078 3.62109 4.88672 4.11328 3.65625C4.81641 3.44531 6.53906 4.60547 6.53906 4.60547C7.24219 4.39453 7.98047 4.32422 8.71875 4.32422C9.49219 4.32422 10.2305 4.39453 10.9336 4.60547C10.9336 4.60547 12.6211 3.41016 13.3594 3.65625C13.8516 4.88672 13.5352 5.80078 13.4648 6.04688C14.0273 6.67969 14.3789 7.13672 14.3789 8.12109C14.3789 11.4961 12.3047 11.7773 10.3359 11.9883C10.6523 12.2695 10.9336 12.7969 10.9336 13.6406C10.9336 14.8008 10.8984 16.2773 10.8984 16.5586C10.8984 16.8047 11.0742 17.0859 11.5312 16.9805C15.0469 15.8203 17.4375 12.4805 17.4375 8.57812C17.4375 3.72656 13.4648 0 8.57812 0ZM3.41016 12.1289C3.33984 12.1641 3.375 12.2695 3.41016 12.3398C3.48047 12.375 3.55078 12.4102 3.62109 12.375C3.65625 12.3398 3.65625 12.2344 3.58594 12.1641C3.51562 12.1289 3.44531 12.0938 3.41016 12.1289ZM3.02344 11.8477C2.98828 11.918 3.02344 11.9531 3.09375 11.9883C3.16406 12.0234 3.23438 12.0234 3.26953 11.9531C3.26953 11.918 3.23438 11.8828 3.16406 11.8477C3.09375 11.8125 3.05859 11.8125 3.02344 11.8477ZM4.14844 13.1133C4.11328 13.1484 4.11328 13.2539 4.21875 13.3242C4.28906 13.3945 4.39453 13.4297 4.42969 13.3594C4.46484 13.3242 4.46484 13.2188 4.39453 13.1484C4.32422 13.0781 4.21875 13.043 4.14844 13.1133ZM3.76172 12.5859C3.69141 12.6211 3.69141 12.7266 3.76172 12.7969C3.83203 12.8672 3.90234 12.9023 3.97266 12.8672C4.00781 12.832 4.00781 12.7266 3.97266 12.6562C3.90234 12.5859 3.83203 12.5508 3.76172 12.5859Z" fill="#1F2A37" />
     </svg>
   )
@@ -43,90 +42,87 @@ const CustomizeModal: FC<IShareLinkProps> = ({
   const { t } = useTranslation()
   const docLink = useDocLink()
   const isChatApp = mode === AppModeEnum.CHAT || mode === AppModeEnum.ADVANCED_CHAT
+  const apiDocLink = docLink('/use-dify/publish/developing-with-apis')
 
   return (
-    <Modal
-      title={t(`${prefixCustomize}.title`, { ns: 'appOverview' })}
-      description={t(`${prefixCustomize}.explanation`, { ns: 'appOverview' })}
-      isShow={isShow}
-      onClose={onClose}
-      className="w-[640px] max-w-2xl!"
-      closable={true}
-    >
-      <div className="mt-4 w-full rounded-lg border-[0.5px] border-components-panel-border px-6 py-5">
-        <Tag bordered={true} hideBg={true} className="border-text-accent-secondary text-text-accent-secondary uppercase">
-          {t(`${prefixCustomize}.way`, { ns: 'appOverview' })}
-          {' '}
-          1
-        </Tag>
-        <p className="my-2 system-sm-medium text-text-secondary">{t(`${prefixCustomize}.way1.name`, { ns: 'appOverview' })}</p>
-        <div className="flex py-4">
-          <StepNum>1</StepNum>
-          <div className="flex flex-col">
-            <div className="text-text-primary">{t(`${prefixCustomize}.way1.step1`, { ns: 'appOverview' })}</div>
-            <div className="mt-1 mb-2 text-xs text-text-tertiary">{t(`${prefixCustomize}.way1.step1Tip`, { ns: 'appOverview' })}</div>
-            <a href={`https://github.com/langgenius/${isChatApp ? 'webapp-conversation' : 'webapp-text-generator'}`} target="_blank" rel="noopener noreferrer">
-              <Button>
-                <GithubIcon className="mr-2 text-text-secondary" />
-                {t(`${prefixCustomize}.way1.step1Operation`, { ns: 'appOverview' })}
-              </Button>
-            </a>
-          </div>
-        </div>
-        <div className="flex pt-4">
-          <StepNum>2</StepNum>
-          <div className="flex flex-col">
-            <div className="text-text-primary">{t(`${prefixCustomize}.way1.step2`, { ns: 'appOverview' })}</div>
-            <div className="mt-1 mb-2 text-xs text-text-tertiary">{t(`${prefixCustomize}.way1.step2Tip`, { ns: 'appOverview' })}</div>
-            <a href="https://vercel.com/docs/concepts/deployments/git/vercel-for-github" target="_blank" rel="noopener noreferrer">
-              <Button>
-                <div className="mr-1.5 border-t-0 border-r-[7px] border-b-12 border-l-[7px] border-solid border-text-primary border-t-transparent border-r-transparent border-l-transparent"></div>
-                <span>{t(`${prefixCustomize}.way1.step2Operation`, { ns: 'appOverview' })}</span>
-              </Button>
-            </a>
-          </div>
-        </div>
-        <div className="flex py-4">
-          <StepNum>3</StepNum>
-          <div className="flex w-full flex-col overflow-hidden">
-            <div className="text-text-primary">{t(`${prefixCustomize}.way1.step3`, { ns: 'appOverview' })}</div>
-            <div className="mt-1 mb-2 text-xs text-text-tertiary">{t(`${prefixCustomize}.way1.step3Tip`, { ns: 'appOverview' })}</div>
-            <pre className="box-border overflow-x-scroll rounded-lg border-[0.5px] border-components-panel-border bg-background-section px-4 py-3 text-xs font-medium text-text-secondary select-text">
-              NEXT_PUBLIC_APP_ID=
-              {`'${appId}'`}
+    <Dialog open={isShow} onOpenChange={open => !open && onClose()}>
+      <DialogContent className="flex max-h-[calc(100dvh-2rem)] w-[640px] flex-col overflow-hidden!">
+        <DialogTitle className="shrink-0 title-2xl-semi-bold text-text-primary">
+          {t(`${prefixCustomize}.title`, { ns: 'appOverview' })}
+        </DialogTitle>
+        <DialogDescription className="mt-2 shrink-0 body-md-regular text-text-secondary">
+          {t(`${prefixCustomize}.explanation`, { ns: 'appOverview' })}
+        </DialogDescription>
+        <DialogCloseButton />
+        <div className="mt-4 min-h-0 flex-1 overflow-y-auto overscroll-contain">
+          <div className="w-full rounded-lg border-[0.5px] border-components-panel-border px-6 py-5">
+            <Tag bordered={true} hideBg={true} className="border-text-accent-secondary text-text-accent-secondary uppercase">
+              {t(`${prefixCustomize}.way`, { ns: 'appOverview' })}
               {' '}
-              <br />
-              NEXT_PUBLIC_APP_KEY=
-              {'\'<Web API Key From Dify>\''}
-              {' '}
-              <br />
-              NEXT_PUBLIC_API_URL=
-              {`'${api_base_url}'`}
-            </pre>
-          </div>
-        </div>
+              1
+            </Tag>
+            <p className="my-2 system-sm-medium text-text-secondary">{t(`${prefixCustomize}.way1.name`, { ns: 'appOverview' })}</p>
+            <div className="flex py-4">
+              <StepNum>1</StepNum>
+              <div className="flex flex-col">
+                <div className="text-text-primary">{t(`${prefixCustomize}.way1.step1`, { ns: 'appOverview' })}</div>
+                <div className="mt-1 mb-2 text-xs text-text-tertiary">{t(`${prefixCustomize}.way1.step1Tip`, { ns: 'appOverview' })}</div>
+                <Button render={<a href={`https://github.com/langgenius/${isChatApp ? 'webapp-conversation' : 'webapp-text-generator'}`} target="_blank" rel="noopener noreferrer" />}>
+                  <GithubIcon className="mr-2 text-text-secondary" />
+                  {t(`${prefixCustomize}.way1.step1Operation`, { ns: 'appOverview' })}
+                </Button>
+              </div>
+            </div>
+            <div className="flex pt-4">
+              <StepNum>2</StepNum>
+              <div className="flex flex-col">
+                <div className="text-text-primary">{t(`${prefixCustomize}.way1.step2`, { ns: 'appOverview' })}</div>
+                <div className="mt-1 mb-2 text-xs text-text-tertiary">{t(`${prefixCustomize}.way1.step2Tip`, { ns: 'appOverview' })}</div>
+                <Button render={<a href="https://vercel.com/docs/concepts/deployments/git/vercel-for-github" target="_blank" rel="noopener noreferrer" />}>
+                  <div className="mr-1.5 border-t-0 border-r-[7px] border-b-12 border-l-[7px] border-solid border-text-primary border-t-transparent border-r-transparent border-l-transparent"></div>
+                  <span>{t(`${prefixCustomize}.way1.step2Operation`, { ns: 'appOverview' })}</span>
+                </Button>
+              </div>
+            </div>
+            <div className="flex py-4">
+              <StepNum>3</StepNum>
+              <div className="flex w-full flex-col overflow-hidden">
+                <div className="text-text-primary">{t(`${prefixCustomize}.way1.step3`, { ns: 'appOverview' })}</div>
+                <div className="mt-1 mb-2 text-xs text-text-tertiary">{t(`${prefixCustomize}.way1.step3Tip`, { ns: 'appOverview' })}</div>
+                <pre className="box-border overflow-x-scroll rounded-lg border-[0.5px] border-components-panel-border bg-background-section px-4 py-3 text-xs font-medium text-text-secondary select-text">
+                  NEXT_PUBLIC_APP_ID=
+                  {`'${appId}'`}
+                  {' '}
+                  <br />
+                  NEXT_PUBLIC_APP_KEY=
+                  {'\'<Web API Key From Dify>\''}
+                  {' '}
+                  <br />
+                  NEXT_PUBLIC_API_URL=
+                  {`'${api_base_url}'`}
+                </pre>
+              </div>
+            </div>
 
-      </div>
-      <div className="mt-4 w-full rounded-lg border-[0.5px] border-components-panel-border px-6 py-5">
-        <Tag bordered={true} hideBg={true} className="border-text-accent-secondary text-text-accent-secondary uppercase">
-          {t(`${prefixCustomize}.way`, { ns: 'appOverview' })}
-          {' '}
-          2
-        </Tag>
-        <p className="my-2 system-sm-medium text-text-secondary">{t(`${prefixCustomize}.way2.name`, { ns: 'appOverview' })}</p>
-        <Button
-          className="mt-2"
-          onClick={() =>
-            window.open(
-              docLink('/use-dify/publish/developing-with-apis'),
-              '_blank',
-            )}
-        >
-          <span className="text-sm text-text-secondary">{t(`${prefixCustomize}.way2.operation`, { ns: 'appOverview' })}</span>
-          <ArrowTopRightOnSquareIcon className="ml-1 h-4 w-4 shrink-0 text-text-secondary" />
-        </Button>
-      </div>
-    </Modal>
+          </div>
+          <div className="mt-4 w-full rounded-lg border-[0.5px] border-components-panel-border px-6 py-5">
+            <Tag bordered={true} hideBg={true} className="border-text-accent-secondary text-text-accent-secondary uppercase">
+              {t(`${prefixCustomize}.way`, { ns: 'appOverview' })}
+              {' '}
+              2
+            </Tag>
+            <p className="my-2 system-sm-medium text-text-secondary">{t(`${prefixCustomize}.way2.name`, { ns: 'appOverview' })}</p>
+            <Button
+              render={<a href={apiDocLink} target="_blank" rel="noopener noreferrer" />}
+              className="mt-2"
+            >
+              <span className="text-sm text-text-secondary">{t(`${prefixCustomize}.way2.operation`, { ns: 'appOverview' })}</span>
+              <span aria-hidden="true" className="ml-1 i-heroicons-arrow-top-right-on-square h-4 w-4 shrink-0 text-text-secondary" />
+            </Button>
+          </div>
+        </div>
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/components/app/overview/embedded/__tests__/index.spec.tsx b/web/app/components/app/overview/embedded/__tests__/index.spec.tsx
index 0a843c26fd..a6e391cb0e 100644
--- a/web/app/components/app/overview/embedded/__tests__/index.spec.tsx
+++ b/web/app/components/app/overview/embedded/__tests__/index.spec.tsx
@@ -1,10 +1,11 @@
 import type { SiteInfo } from '@/models/share'
-import { fireEvent, render, screen } from '@testing-library/react'
+import { fireEvent, render, screen, waitFor } from '@testing-library/react'
 import copy from 'copy-to-clipboard'
 import * as React from 'react'
-
 import { act } from 'react'
-import { afterAll, afterEach, describe, expect, it, vi } from 'vitest'
+
+import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from 'vitest'
+import { InputVarType } from '@/app/components/workflow/types'
 import Embedded from '../index'
 
 vi.mock('../style.module.css', () => ({
@@ -46,6 +47,7 @@ vi.mock('@/context/app-context', () => ({
 }))
 const mockWindowOpen = vi.spyOn(window, 'open').mockImplementation(() => null)
 const mockedCopy = vi.mocked(copy)
+const originalCompressionStream = globalThis.CompressionStream
 
 const siteInfo: SiteInfo = {
   title: 'test site',
@@ -70,6 +72,22 @@ const getCopyButton = () => {
 }
 
 describe('Embedded', () => {
+  beforeAll(() => {
+    class MockCompressionStream {
+      readable: ReadableStream<Uint8Array>
+      writable: WritableStream<Uint8Array>
+
+      constructor() {
+        const transformStream = new TransformStream<Uint8Array, Uint8Array>()
+        this.readable = transformStream.readable
+        this.writable = transformStream.writable
+      }
+    }
+
+    // @ts-expect-error test polyfill
+    globalThis.CompressionStream = MockCompressionStream
+  })
+
   afterEach(() => {
     vi.clearAllMocks()
     mockWindowOpen.mockClear()
@@ -77,6 +95,7 @@ describe('Embedded', () => {
 
   afterAll(() => {
     mockWindowOpen.mockRestore()
+    globalThis.CompressionStream = originalCompressionStream
   })
 
   it('builds theme and copies iframe snippet', async () => {
@@ -84,14 +103,20 @@ describe('Embedded', () => {
       render(<Embedded {...baseProps} />)
     })
 
+    await waitFor(() => {
+      expect(screen.getByText((content, node) => node?.tagName.toLowerCase() === 'pre' && content.includes('/chatbot/token'))).toBeInTheDocument()
+    })
+
     const actionButton = getCopyButton()
     const innerDiv = actionButton.querySelector('div')
-    act(() => {
+    await act(async () => {
       fireEvent.click(innerDiv ?? actionButton)
     })
 
     expect(mockThemeBuilder.buildTheme).toHaveBeenCalledWith(siteInfo.chat_color_theme, siteInfo.chat_color_theme_inverted)
-    expect(mockedCopy).toHaveBeenCalledWith(expect.stringContaining('/chatbot/token'))
+    await waitFor(() => {
+      expect(mockedCopy).toHaveBeenCalledWith(expect.stringContaining('/chatbot/token'))
+    })
   })
 
   it('opens chrome plugin store link when chrome option selected', async () => {
@@ -116,4 +141,106 @@ describe('Embedded', () => {
       'noopener,noreferrer',
     )
   })
+
+  it('keeps hidden inputs collapsed by default and updates iframe and script content when values change', async () => {
+    render(
+      <Embedded
+        {...baseProps}
+        hiddenInputs={[{
+          variable: 'secret',
+          label: 'Secret',
+          type: InputVarType.textInput,
+          hide: true,
+          required: true,
+          default: '',
+        }]}
+      />,
+    )
+
+    expect(screen.queryByLabelText('Secret')).not.toBeInTheDocument()
+
+    await act(async () => {
+      fireEvent.click(screen.getByText('appOverview.overview.appInfo.embedded.hiddenInputs.title').closest('button')!)
+    })
+
+    await waitFor(() => {
+      expect(screen.getByLabelText('Secret')).toBeInTheDocument()
+    })
+
+    await act(async () => {
+      fireEvent.change(screen.getByLabelText('Secret'), {
+        target: { value: 'top-secret' },
+      })
+    })
+
+    expect(document.querySelector('pre')?.textContent ?? '').toContain('/chatbot/token')
+
+    await waitFor(() => {
+      const codeBlock = document.querySelector('pre')
+      expect(codeBlock?.textContent ?? '').toContain('/chatbot/token?secret=dG9wLXNlY3JldA%3D%3D')
+    })
+
+    const optionButtons = document.body.querySelectorAll('[class*="option"]')
+    act(() => {
+      fireEvent.click(optionButtons[1]!)
+    })
+
+    await waitFor(() => {
+      const codeBlock = document.querySelector('pre')
+      expect(codeBlock?.textContent ?? '').toContain('secret: "top-secret"')
+    })
+  })
+
+  it('copies script content when scripts option is selected', async () => {
+    await act(async () => {
+      render(<Embedded {...baseProps} />)
+    })
+
+    const optionButtons = document.body.querySelectorAll('[class*="option"]')
+    act(() => {
+      fireEvent.click(optionButtons[1]!)
+    })
+
+    await waitFor(() => {
+      const codeBlock = document.querySelector('pre')
+      expect(codeBlock?.textContent ?? '').toContain('token: \'token\'')
+    })
+
+    const actionButton = getCopyButton()
+    const innerDiv = actionButton.querySelector('div')
+    await act(async () => {
+      fireEvent.click(innerDiv ?? actionButton)
+    })
+
+    await waitFor(() => {
+      expect(mockedCopy).toHaveBeenCalledWith(expect.stringContaining('token: \'token\''))
+    })
+  })
+
+  it('copies chrome plugin URL (without prefix) when chromePlugin option is selected', async () => {
+    await act(async () => {
+      render(<Embedded {...baseProps} />)
+    })
+
+    const optionButtons = document.body.querySelectorAll('[class*="option"]')
+    act(() => {
+      fireEvent.click(optionButtons[2]!)
+    })
+
+    await waitFor(() => {
+      const codeBlock = document.querySelector('pre')
+      expect(codeBlock?.textContent ?? '').toContain('ChatBot URL:')
+    })
+
+    const actionButton = getCopyButton()
+    const innerDiv = actionButton.querySelector('div')
+    await act(async () => {
+      fireEvent.click(innerDiv ?? actionButton)
+    })
+
+    await waitFor(() => {
+      expect(mockedCopy).toHaveBeenCalledWith(expect.stringContaining('/chatbot/token'))
+      expect(mockedCopy).not.toHaveBeenCalledWith(expect.stringContaining('ChatBot URL:'))
+    })
+  })
 })
diff --git a/web/app/components/app/overview/embedded/index.tsx b/web/app/components/app/overview/embedded/index.tsx
index e810c7f1eb..a0dcc1b535 100644
--- a/web/app/components/app/overview/embedded/index.tsx
+++ b/web/app/components/app/overview/embedded/index.tsx
@@ -1,172 +1,262 @@
+import type { MutableRefObject } from 'react'
+import type { WorkflowHiddenStartVariable, WorkflowLaunchInputValue } from '../app-card-utils'
 import type { SiteInfo } from '@/models/share'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogCloseButton, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import {
-  RiClipboardFill,
-  RiClipboardLine,
+  RiArrowDownSLine,
+  RiArrowRightSLine,
 } from '@remixicon/react'
 import copy from 'copy-to-clipboard'
-import * as React from 'react'
-import { useEffect, useState } from 'react'
+import { Suspense, use, useEffect, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import ActionButton from '@/app/components/base/action-button'
 import { useThemeContext } from '@/app/components/base/chat/embedded-chatbot/theme/theme-context'
-import Modal from '@/app/components/base/modal'
-import { IS_CE_EDITION } from '@/config'
+import { InputVarType } from '@/app/components/workflow/types'
 import { useAppContext } from '@/context/app-context'
 import { basePath } from '@/utils/var'
+import {
+  compressAndEncodeBase64,
+  createWorkflowLaunchInitialValues,
+  getChromePluginContent,
+  getEmbeddedIframeSnippet,
+  getEmbeddedScriptSnippet,
+  isWorkflowLaunchInputSupported,
+} from '../app-card-utils'
+import WorkflowHiddenInputFields from '../workflow-hidden-input-fields'
 import style from './style.module.css'
 
 type Props = {
   siteInfo?: SiteInfo
   isShow: boolean
   onClose: () => void
-  accessToken: string
-  appBaseUrl: string
+  accessToken?: string
+  appBaseUrl?: string
+  hiddenInputs?: WorkflowHiddenStartVariable[]
   className?: string
 }
 
-const OPTION_MAP = {
-  iframe: {
-    getContent: (url: string, token: string) =>
-      `<iframe
- src="${url}${basePath}/chatbot/${token}"
- style="width: 100%; height: 100%; min-height: 700px"
- frameborder="0"
- allow="microphone">
-</iframe>`,
-  },
-  scripts: {
-    getContent: (url: string, token: string, primaryColor: string, isTestEnv?: boolean) =>
-      `<script>
- window.difyChatbotConfig = {
-  token: '${token}'${isTestEnv
-    ? `,
-  isDev: true`
-    : ''}${IS_CE_EDITION
-    ? `,
-  baseUrl: '${url}${basePath}'`
-    : ''},
-  inputs: {
-    // You can define the inputs from the Start node here
-    // key is the variable name
-    // e.g.
-    // name: "NAME"
-  },
-  systemVariables: {
-    // user_id: 'YOU CAN DEFINE USER ID HERE',
-    // conversation_id: 'YOU CAN DEFINE CONVERSATION ID HERE, IT MUST BE A VALID UUID',
-  },
-  userVariables: {
-    // avatar_url: 'YOU CAN DEFINE USER AVATAR URL HERE',
-    // name: 'YOU CAN DEFINE USER NAME HERE',
-  },
- }
-</script>
-<script
- src="${url}${basePath}/embed.min.js"
- id="${token}"
- defer>
-</script>
-<style>
-  #dify-chatbot-bubble-button {
-    background-color: ${primaryColor} !important;
-  }
-  #dify-chatbot-bubble-window {
-    width: 24rem !important;
-    height: 40rem !important;
-  }
-</style>`,
-  },
-  chromePlugin: {
-    getContent: (url: string, token: string) => `ChatBot URL: ${url}${basePath}/chatbot/${token}`,
-  },
-}
+const OPTION_KEYS = ['iframe', 'scripts', 'chromePlugin'] as const
 const prefixEmbedded = 'overview.appInfo.embedded'
 
-type Option = keyof typeof OPTION_MAP
+type Option = typeof OPTION_KEYS[number]
 
-type OptionStatus = {
-  iframe: boolean
-  scripts: boolean
-  chromePlugin: boolean
+const optionIconClassName: Record<Option, string> = {
+  iframe: style.iframeIcon!,
+  scripts: style.scriptsIcon!,
+  chromePlugin: style.chromePluginIcon!,
 }
 
-const Embedded = ({ siteInfo, isShow, onClose, appBaseUrl, accessToken, className }: Props) => {
+const getSerializedHiddenInputValue = (
+  variable: WorkflowHiddenStartVariable,
+  values: Record<string, WorkflowLaunchInputValue>,
+) => {
+  const rawValue = values[variable.variable]
+  if (variable.type === InputVarType.checkbox)
+    return String(Boolean(rawValue))
+
+  return String(rawValue ?? '')
+}
+
+const buildEmbeddedIframeUrl = async ({
+  appBaseUrl,
+  accessToken,
+  variables,
+  values,
+}: {
+  appBaseUrl: string
+  accessToken: string
+  variables: WorkflowHiddenStartVariable[]
+  values: Record<string, WorkflowLaunchInputValue>
+}) => {
+  const iframeUrl = new URL(`${appBaseUrl}${basePath}/chatbot/${accessToken}`, window.location.origin)
+
+  await Promise.all(variables.map(async (variable) => {
+    iframeUrl.searchParams.set(variable.variable, await compressAndEncodeBase64(getSerializedHiddenInputValue(variable, values)))
+  }))
+
+  return iframeUrl.toString()
+}
+
+const AsyncEmbeddedOptionContent = ({
+  option,
+  iframeUrlPromise,
+  latestResolvedIframeUrlRef,
+}: {
+  option: Option
+  iframeUrlPromise: Promise<string>
+  latestResolvedIframeUrlRef: MutableRefObject<string>
+}) => {
+  const iframeUrl = use(iframeUrlPromise)
+  latestResolvedIframeUrlRef.current = iframeUrl
+
+  if (option === 'chromePlugin')
+    return getChromePluginContent(iframeUrl)
+
+  return getEmbeddedIframeSnippet(iframeUrl)
+}
+
+const EmbeddedContent = ({
+  siteInfo,
+  appBaseUrl,
+  accessToken,
+  hiddenInputs,
+}: Required<Pick<Props, 'accessToken' | 'appBaseUrl'>> & Pick<Props, 'siteInfo' | 'hiddenInputs'>) => {
   const { t } = useTranslation()
+  const supportedHiddenInputs = useMemo<WorkflowHiddenStartVariable[]>(
+    () => (hiddenInputs ?? []).filter(isWorkflowLaunchInputSupported),
+    [hiddenInputs],
+  )
+  const initialHiddenInputValues = useMemo(
+    () => createWorkflowLaunchInitialValues(supportedHiddenInputs),
+    [supportedHiddenInputs],
+  )
   const [option, setOption] = useState<Option>('iframe')
-  const [isCopied, setIsCopied] = useState<OptionStatus>({ iframe: false, scripts: false, chromePlugin: false })
+  const [copiedOption, setCopiedOption] = useState<Option | null>(null)
+  const [hiddenInputsCollapsed, setHiddenInputsCollapsed] = useState(true)
+  const [hiddenInputValues, setHiddenInputValues] = useState<Record<string, WorkflowLaunchInputValue>>(
+    () => initialHiddenInputValues,
+  )
+  const [previewIframeUrlPromise, setPreviewIframeUrlPromise] = useState<Promise<string>>(
+    () => buildEmbeddedIframeUrl({
+      appBaseUrl,
+      accessToken,
+      variables: supportedHiddenInputs,
+      values: initialHiddenInputValues,
+    }),
+  )
+  const latestResolvedIframeUrlRef = useRef('')
 
   const { langGeniusVersionInfo } = useAppContext()
   const themeBuilder = useThemeContext()
-  themeBuilder.buildTheme(siteInfo?.chat_color_theme ?? null, siteInfo?.chat_color_theme_inverted ?? false)
   const isTestEnv = langGeniusVersionInfo.current_env === 'TESTING' || langGeniusVersionInfo.current_env === 'DEVELOPMENT'
-  const onClickCopy = () => {
+
+  const handleHiddenInputValueChange = (variable: string, value: WorkflowLaunchInputValue) => {
+    const nextHiddenInputValues = {
+      ...hiddenInputValues,
+      [variable]: value,
+    }
+
+    setCopiedOption(null)
+    setHiddenInputValues(nextHiddenInputValues)
+    setPreviewIframeUrlPromise(buildEmbeddedIframeUrl({
+      appBaseUrl,
+      accessToken,
+      variables: supportedHiddenInputs,
+      values: nextHiddenInputValues,
+    }))
+  }
+  const scriptsContent = useMemo(() => getEmbeddedScriptSnippet({
+    url: appBaseUrl,
+    token: accessToken,
+    primaryColor: themeBuilder.theme?.primaryColor ?? '#1C64F2',
+    isTestEnv,
+    inputValues: hiddenInputValues,
+  }), [accessToken, appBaseUrl, hiddenInputValues, isTestEnv, themeBuilder.theme?.primaryColor])
+
+  const onClickCopy = async () => {
+    const latestIframeUrl = await buildEmbeddedIframeUrl({
+      appBaseUrl,
+      accessToken,
+      variables: supportedHiddenInputs,
+      values: hiddenInputValues,
+    })
+
     if (option === 'chromePlugin') {
-      const splitUrl = OPTION_MAP[option].getContent(appBaseUrl, accessToken).split(': ')
+      const splitUrl = getChromePluginContent(latestIframeUrl).split(': ')
       if (splitUrl.length > 1)
         copy(splitUrl[1]!)
     }
-    else {
-      copy(OPTION_MAP[option].getContent(appBaseUrl, accessToken, themeBuilder.theme?.primaryColor ?? '#1C64F2', isTestEnv))
+    else if (option === 'iframe') {
+      copy(getEmbeddedIframeSnippet(latestIframeUrl))
     }
-    setIsCopied({ ...isCopied, [option]: true })
-  }
-
-  // when toggle option, reset then copy status
-  const resetCopyStatus = () => {
-    const cache = { ...isCopied }
-    Object.keys(cache).forEach((key) => {
-      cache[key as keyof OptionStatus] = false
-    })
-    setIsCopied(cache)
+    else {
+      copy(scriptsContent)
+    }
+    setCopiedOption(option)
   }
+  const previewFallback = latestResolvedIframeUrlRef.current
+    ? (option === 'chromePlugin'
+        ? getChromePluginContent(latestResolvedIframeUrlRef.current)
+        : getEmbeddedIframeSnippet(latestResolvedIframeUrlRef.current))
+    : ''
 
   const navigateToChromeUrl = () => {
     window.open('https://chrome.google.com/webstore/detail/dify-chatbot/ceehdapohffmjmkdcifjofadiaoeggaf', '_blank', 'noopener,noreferrer')
   }
 
   useEffect(() => {
-    resetCopyStatus()
-  }, [isShow])
+    themeBuilder.buildTheme(siteInfo?.chat_color_theme ?? null, siteInfo?.chat_color_theme_inverted ?? false)
+  }, [siteInfo?.chat_color_theme, siteInfo?.chat_color_theme_inverted, themeBuilder])
 
   return (
-    <Modal
-      title={t(`${prefixEmbedded}.title`, { ns: 'appOverview' })}
-      isShow={isShow}
-      onClose={onClose}
-      className="w-[640px] max-w-2xl!"
-      wrapperClassName={className}
-      closable={true}
-    >
+    <>
       <div className="mt-8 mb-4 system-sm-medium text-text-primary">
         {t(`${prefixEmbedded}.explanation`, { ns: 'appOverview' })}
       </div>
+      {supportedHiddenInputs.length > 0 && (
+        <div className="mb-6 rounded-xl border-[0.5px] border-components-panel-border bg-background-section">
+          <button
+            type="button"
+            className="flex w-full items-center justify-between gap-3 px-4 py-3 text-left"
+            onClick={() => setHiddenInputsCollapsed(prev => !prev)}
+          >
+            <div>
+              <div className="system-sm-medium text-text-primary">
+                {t(`${prefixEmbedded}.hiddenInputs.title`, { ns: 'appOverview' })}
+              </div>
+              <div className="mt-1 system-xs-regular text-text-tertiary">
+                {t(`${prefixEmbedded}.hiddenInputs.description`, { ns: 'appOverview' })}
+              </div>
+            </div>
+            {hiddenInputsCollapsed
+              ? <RiArrowRightSLine className="h-4 w-4 shrink-0 text-text-tertiary" />
+              : <RiArrowDownSLine className="h-4 w-4 shrink-0 text-text-tertiary" />}
+          </button>
+          {!hiddenInputsCollapsed && (
+            <div className="max-h-72 space-y-4 overflow-y-auto border-t-[0.5px] border-divider-subtle px-4 py-4">
+              <WorkflowHiddenInputFields
+                hiddenVariables={supportedHiddenInputs}
+                values={hiddenInputValues}
+                onValueChange={handleHiddenInputValueChange}
+                fieldIdPrefix="embedded-hidden-input"
+              />
+            </div>
+          )}
+        </div>
+      )}
       <div className="flex flex-wrap items-center justify-between gap-y-2">
-        {Object.keys(OPTION_MAP).map((v, index) => {
+        {OPTION_KEYS.map((v) => {
           return (
-            <div
-              key={index}
+            <button
+              type="button"
+              key={v}
+              aria-label={t(`${prefixEmbedded}.${v}`, { ns: 'appOverview' }) || v}
               className={cn(
                 style.option,
-                style[`${v}Icon`],
+                optionIconClassName[v],
                 option === v && style.active,
               )}
               onClick={() => {
-                setOption(v as Option)
-                resetCopyStatus()
+                setOption(v)
+                setCopiedOption(null)
               }}
             >
-            </div>
+            </button>
           )
         })}
       </div>
       {option === 'chromePlugin' && (
         <div className="mt-6 w-full">
-          <div className={cn('inline-flex w-full items-center justify-center gap-2 rounded-lg py-3', 'shrink-0 cursor-pointer bg-primary-600 text-white hover:bg-primary-600/75 hover:shadow-sm')}>
+          <button
+            type="button"
+            className={cn('inline-flex w-full items-center justify-center gap-2 rounded-lg py-3', 'shrink-0 bg-primary-600 text-white hover:bg-primary-600/75 hover:shadow-sm')}
+            onClick={navigateToChromeUrl}
+          >
             <div className={`relative h-4 w-4 ${style.pluginInstallIcon}`}></div>
-            <div className="font-['Inter'] text-sm leading-tight font-medium text-white" onClick={navigateToChromeUrl}>{t(`${prefixEmbedded}.chromePlugin`, { ns: 'appOverview' })}</div>
-          </div>
+            <div className="font-['Inter'] text-sm leading-tight font-medium text-white">{t(`${prefixEmbedded}.chromePlugin`, { ns: 'appOverview' })}</div>
+          </button>
         </div>
       )}
       <div className={cn('inline-flex w-full flex-col items-start justify-start rounded-lg border-[0.5px] border-components-panel-border bg-background-section', 'mt-6')}>
@@ -177,30 +267,76 @@ const Embedded = ({ siteInfo, isShow, onClose, appBaseUrl, accessToken, classNam
           <Tooltip>
             <TooltipTrigger
               render={(
-                <ActionButton>
-                  <div
-                    onClick={onClickCopy}
-                  >
-                    {isCopied[option] && <RiClipboardFill className="h-4 w-4" />}
-                    {!isCopied[option] && <RiClipboardLine className="h-4 w-4" />}
-                  </div>
+                <ActionButton
+                  aria-label={(copiedOption === option
+                    ? t(`${prefixEmbedded}.copied`, { ns: 'appOverview' })
+                    : t(`${prefixEmbedded}.copy`, { ns: 'appOverview' })) || ''}
+                  onClick={() => void onClickCopy()}
+                >
+                  {copiedOption === option && <span aria-hidden="true" className="i-ri-clipboard-fill h-4 w-4" />}
+                  {copiedOption !== option && <span aria-hidden="true" className="i-ri-clipboard-line h-4 w-4" />}
                 </ActionButton>
               )}
             />
             <TooltipContent>
-              {(isCopied[option]
+              {(copiedOption === option
                 ? t(`${prefixEmbedded}.copied`, { ns: 'appOverview' })
                 : t(`${prefixEmbedded}.copy`, { ns: 'appOverview' })) || ''}
             </TooltipContent>
           </Tooltip>
         </div>
-        <div className="flex w-full items-start justify-start gap-2 overflow-x-auto p-3">
+        <div className="flex max-h-[clamp(180px,calc(100dvh-320px),360px)] w-full items-start justify-start gap-2 overflow-auto p-3">
           <div className="shrink grow basis-0 font-mono text-[13px] leading-tight text-text-secondary">
-            <pre className="select-text">{OPTION_MAP[option].getContent(appBaseUrl, accessToken, themeBuilder.theme?.primaryColor ?? '#1C64F2', isTestEnv)}</pre>
+            <pre className="select-text">
+              {option === 'scripts'
+                ? scriptsContent
+                : (
+                    <Suspense fallback={previewFallback}>
+                      <AsyncEmbeddedOptionContent
+                        option={option}
+                        iframeUrlPromise={previewIframeUrlPromise}
+                        latestResolvedIframeUrlRef={latestResolvedIframeUrlRef}
+                      />
+                    </Suspense>
+                  )}
+            </pre>
           </div>
         </div>
       </div>
-    </Modal>
+    </>
+  )
+}
+
+const Embedded = ({ siteInfo, isShow, onClose, appBaseUrl, accessToken, hiddenInputs, className }: Props) => {
+  const { t } = useTranslation()
+
+  return (
+    <Dialog
+      open={isShow}
+      onOpenChange={(open) => {
+        if (open)
+          return
+        onClose()
+      }}
+    >
+      <DialogContent className={cn('flex max-h-[calc(100dvh-2rem)] w-[640px] flex-col overflow-hidden!', className)}>
+        <DialogTitle className="shrink-0 title-2xl-semi-bold text-text-primary">
+          {t(`${prefixEmbedded}.title`, { ns: 'appOverview' })}
+        </DialogTitle>
+        <DialogCloseButton />
+        <div className="min-h-0 flex-1 overflow-y-auto overscroll-contain">
+          {isShow && (
+            <EmbeddedContent
+              key={`${appBaseUrl ?? ''}:${accessToken ?? ''}:${JSON.stringify(hiddenInputs ?? [])}`}
+              siteInfo={siteInfo}
+              appBaseUrl={appBaseUrl ?? ''}
+              accessToken={accessToken ?? ''}
+              hiddenInputs={hiddenInputs}
+            />
+          )}
+        </div>
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/components/app/overview/settings/__tests__/index.spec.tsx b/web/app/components/app/overview/settings/__tests__/index.spec.tsx
index a13ccad1f1..462227fbbe 100644
--- a/web/app/components/app/overview/settings/__tests__/index.spec.tsx
+++ b/web/app/components/app/overview/settings/__tests__/index.spec.tsx
@@ -3,7 +3,7 @@ import type { ModalContextState } from '@/context/modal-context'
 import type { ProviderContextState } from '@/context/provider-context'
 import type { AppDetailResponse } from '@/models/app'
 import type { AppSSO } from '@/types/app'
-import { act, fireEvent, render, screen, waitFor } from '@testing-library/react'
+import { fireEvent, render, screen, waitFor } from '@testing-library/react'
 import { Plan } from '@/app/components/billing/type'
 import { baseProviderContextValue } from '@/context/provider-context'
 import { AppModeEnum } from '@/types/app'
@@ -55,7 +55,6 @@ const mockUseProviderContext = vi.fn<() => ProviderContextState>()
 
 const buildModalContext = (): ModalContextState => ({
   setShowAccountSettingModal: mockSetShowAccountSettingModal,
-  setShowApiBasedExtensionModal: vi.fn(),
   setShowModerationSettingModal: vi.fn(),
   setShowExternalDataToolModal: vi.fn(),
   setShowPricingModal: mockSetShowPricingModal,
@@ -224,54 +223,51 @@ describe('SettingsModal', () => {
     expect(mockOnClose).toHaveBeenCalled()
   })
 
-  it('should clear the delayed hide-more timer when the modal unmounts after closing', () => {
-    vi.useFakeTimers()
-    const clearTimeoutSpy = vi.spyOn(globalThis, 'clearTimeout')
-    const { unmount } = renderSettingsModal()
-
-    fireEvent.click(screen.getByText('appOverview.overview.appInfo.settings.more.entry'))
-    fireEvent.click(screen.getByText('common.operation.cancel'))
-    unmount()
-
-    expect(clearTimeoutSpy).toHaveBeenCalled()
-    vi.runAllTimers()
-  })
-
-  it('should replace the pending hide-more timer and clear the ref after the timeout completes', async () => {
-    const hideCallbacks: Array<() => void> = []
-    const originalSetTimeout = globalThis.setTimeout
-    const setTimeoutSpy = vi.spyOn(globalThis, 'setTimeout').mockImplementation(((
-      callback: TimerHandler,
-      delay?: number,
-      ...args: unknown[]
-    ) => {
-      if (delay === 200) {
-        hideCallbacks.push(() => {
-          if (typeof callback === 'function')
-            callback(...args)
-        })
-        return hideCallbacks.length as unknown as ReturnType<typeof setTimeout>
-      }
-
-      return originalSetTimeout(callback, delay, ...args)
-    }) as unknown as typeof setTimeout)
-    const clearTimeoutSpy = vi.spyOn(globalThis, 'clearTimeout')
+  it('should collapse the expanded settings section immediately when closing', () => {
     renderSettingsModal()
 
-    act(() => {
-      fireEvent.click(screen.getByText('common.operation.cancel'))
-      fireEvent.click(screen.getByText('common.operation.cancel'))
-    })
+    fireEvent.click(screen.getByText('appOverview.overview.appInfo.settings.more.entry'))
+    expect(screen.getByPlaceholderText('appOverview.overview.appInfo.settings.more.privacyPolicyPlaceholder')).toBeInTheDocument()
 
-    expect(clearTimeoutSpy).toHaveBeenCalled()
-    expect(hideCallbacks.length).toBeGreaterThanOrEqual(2)
+    fireEvent.click(screen.getByText('common.operation.cancel'))
 
-    act(() => {
-      hideCallbacks.at(-1)?.()
-    })
+    expect(screen.getByText('appOverview.overview.appInfo.settings.more.entry')).toBeInTheDocument()
+  })
 
-    setTimeoutSpy.mockRestore()
-    clearTimeoutSpy.mockRestore()
+  it('should reset local form state when the controlled dialog reopens', () => {
+    const { rerender } = render(
+      <SettingsModal
+        isChat
+        isShow={true}
+        appInfo={mockAppInfo}
+        onClose={mockOnClose}
+        onSave={mockOnSave}
+      />,
+    )
+
+    fireEvent.click(screen.getByText('appOverview.overview.appInfo.settings.more.entry'))
+    expect(screen.getByPlaceholderText('appOverview.overview.appInfo.settings.more.privacyPolicyPlaceholder')).toBeInTheDocument()
+
+    rerender(
+      <SettingsModal
+        isChat
+        isShow={false}
+        appInfo={mockAppInfo}
+        onClose={mockOnClose}
+        onSave={mockOnSave}
+      />,
+    )
+    rerender(
+      <SettingsModal
+        isChat
+        isShow={true}
+        appInfo={mockAppInfo}
+        onClose={mockOnClose}
+        onSave={mockOnSave}
+      />,
+    )
+
+    expect(screen.getByText('appOverview.overview.appInfo.settings.more.entry')).toBeInTheDocument()
   })
 
   it('should open the pricing modal from the copyright upgrade badge for sandbox plans', async () => {
diff --git a/web/app/components/app/overview/settings/index.tsx b/web/app/components/app/overview/settings/index.tsx
index 3a3eea4d5c..e03d22d7e0 100644
--- a/web/app/components/app/overview/settings/index.tsx
+++ b/web/app/components/app/overview/settings/index.tsx
@@ -5,23 +5,20 @@ import type { AppDetailResponse } from '@/models/app'
 import type { AppIconType, AppSSO, Language } from '@/types/app'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogCloseButton, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import { Select, SelectContent, SelectItem, SelectItemIndicator, SelectItemText, SelectTrigger } from '@langgenius/dify-ui/select'
 import { Switch } from '@langgenius/dify-ui/switch'
 import { toast } from '@langgenius/dify-ui/toast'
-import { RiArrowRightSLine, RiCloseLine } from '@remixicon/react'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import * as React from 'react'
-import { useCallback, useEffect, useRef, useState } from 'react'
+import { useCallback, useState } from 'react'
 import { Trans, useTranslation } from 'react-i18next'
-import ActionButton from '@/app/components/base/action-button'
 import AppIcon from '@/app/components/base/app-icon'
 import AppIconPicker from '@/app/components/base/app-icon-picker'
 import Divider from '@/app/components/base/divider'
-import { SparklesSoft } from '@/app/components/base/icons/src/public/common'
 import Input from '@/app/components/base/input'
-import Modal from '@/app/components/base/modal'
-import PremiumBadge from '@/app/components/base/premium-badge'
+import { PremiumBadgeButton } from '@/app/components/base/premium-badge'
 import Textarea from '@/app/components/base/textarea'
-import Tooltip from '@/app/components/base/tooltip'
 import { ACCOUNT_SETTING_TAB } from '@/app/components/header/account-setting/constants'
 import { useModalContext } from '@/context/modal-context'
 import { useProviderContext } from '@/context/provider-context'
@@ -58,35 +55,26 @@ export type ConfigParams = {
 
 const prefixSettings = 'overview.appInfo.settings'
 type SelectOption = {
-  value: string
+  value: Language
   name: string
 }
 
-const SettingsModal: FC<ISettingsModalProps> = ({
-  isChat,
-  appInfo,
-  isShow = false,
-  onClose,
-  onSave,
-}) => {
-  const [isShowMore, setIsShowMore] = useState(false)
+const LANGUAGE_OPTIONS: SelectOption[] = languages.filter(item => item.supported)
+
+const createInputInfo = (appInfo: ISettingsModalProps['appInfo']) => {
   const {
     title,
-    icon_type,
-    icon,
-    icon_background,
-    icon_url,
     description,
     chat_color_theme,
     chat_color_theme_inverted,
     copyright,
     privacy_policy,
     custom_disclaimer,
-    default_language,
     show_workflow_steps,
     use_icon_as_answer_icon,
   } = appInfo.site
-  const [inputInfo, setInputInfo] = useState({
+
+  return {
     title,
     desc: description,
     chatColorTheme: chat_color_theme,
@@ -98,24 +86,68 @@ const SettingsModal: FC<ISettingsModalProps> = ({
     show_workflow_steps,
     use_icon_as_answer_icon,
     enable_sso: appInfo.enable_sso,
-  })
+  }
+}
+
+const createAppIcon = (appInfo: ISettingsModalProps['appInfo']): AppIconSelection => {
+  const { icon_type, icon, icon_background, icon_url } = appInfo.site
+
+  return icon_type === 'image'
+    ? { type: 'image', url: icon_url!, fileId: icon }
+    : { type: 'emoji', icon, background: icon_background! }
+}
+
+const getSettingsResetKey = (appInfo: ISettingsModalProps['appInfo']) => JSON.stringify([
+  appInfo.id,
+  appInfo.enable_sso,
+  appInfo.site.title,
+  appInfo.site.description,
+  appInfo.site.chat_color_theme,
+  appInfo.site.chat_color_theme_inverted,
+  appInfo.site.copyright,
+  appInfo.site.privacy_policy,
+  appInfo.site.custom_disclaimer,
+  appInfo.site.default_language,
+  appInfo.site.icon_type,
+  appInfo.site.icon,
+  appInfo.site.icon_background,
+  appInfo.site.icon_url,
+  appInfo.site.show_workflow_steps,
+  appInfo.site.use_icon_as_answer_icon,
+])
+
+const SettingsModal: FC<ISettingsModalProps> = ({
+  isChat,
+  appInfo,
+  isShow = false,
+  onClose,
+  onSave,
+}) => {
+  const [isShowMore, setIsShowMore] = useState(false)
+  const { default_language } = appInfo.site
+  const nextInputInfo = createInputInfo(appInfo)
+  const nextAppIcon = createAppIcon(appInfo)
+  const settingsResetKey = getSettingsResetKey(appInfo)
+  const [inputInfo, setInputInfo] = useState(nextInputInfo)
   const [language, setLanguage] = useState(default_language)
   const [saveLoading, setSaveLoading] = useState(false)
   const { t } = useTranslation()
-  const hideMoreTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
 
   const [showAppIconPicker, setShowAppIconPicker] = useState(false)
-  const [appIcon, setAppIcon] = useState<AppIconSelection>(
-    icon_type === 'image'
-      ? { type: 'image', url: icon_url!, fileId: icon }
-      : { type: 'emoji', icon, background: icon_background! },
-  )
+  const [appIcon, setAppIcon] = useState<AppIconSelection>(nextAppIcon)
+  const [previousIsShow, setPreviousIsShow] = useState(isShow)
+  const [previousSettingsResetKey, setPreviousSettingsResetKey] = useState(settingsResetKey)
 
   const { enableBilling, plan, webappCopyrightEnabled } = useProviderContext()
   const { setShowPricingModal, setShowAccountSettingModal } = useModalContext()
   const isFreePlan = plan.type === 'sandbox'
-  const languageOptions: SelectOption[] = languages.filter(item => item.supported)
-  const selectedLanguage = languageOptions.find(item => item.value === language)
+  const selectedLanguage = LANGUAGE_OPTIONS.find(item => item.value === language)
+
+  const handleLanguageChange = (nextValue: string | null) => {
+    const nextLanguage = LANGUAGE_OPTIONS.find(item => item.value === nextValue)
+    if (nextLanguage)
+      setLanguage(nextLanguage.value)
+  }
   const handlePlanClick = useCallback(() => {
     if (isFreePlan)
       setShowPricingModal()
@@ -123,43 +155,21 @@ const SettingsModal: FC<ISettingsModalProps> = ({
       setShowAccountSettingModal({ payload: ACCOUNT_SETTING_TAB.BILLING })
   }, [isFreePlan, setShowAccountSettingModal, setShowPricingModal])
 
-  useEffect(() => {
-    setInputInfo({
-      title,
-      desc: description,
-      chatColorTheme: chat_color_theme,
-      chatColorThemeInverted: chat_color_theme_inverted,
-      copyright,
-      copyrightSwitchValue: !!copyright,
-      privacyPolicy: privacy_policy,
-      customDisclaimer: custom_disclaimer,
-      show_workflow_steps,
-      use_icon_as_answer_icon,
-      enable_sso: appInfo.enable_sso,
-    })
-    setLanguage(default_language)
-    setAppIcon(icon_type === 'image'
-      ? { type: 'image', url: icon_url!, fileId: icon }
-      : { type: 'emoji', icon, background: icon_background! })
-  }, [appInfo, chat_color_theme, chat_color_theme_inverted, copyright, custom_disclaimer, default_language, description, icon, icon_background, icon_type, icon_url, privacy_policy, show_workflow_steps, title, use_icon_as_answer_icon])
-
-  useEffect(() => {
-    return () => {
-      if (hideMoreTimerRef.current) {
-        clearTimeout(hideMoreTimerRef.current)
-        hideMoreTimerRef.current = null
-      }
+  const shouldResetForm = isShow && (!previousIsShow || settingsResetKey !== previousSettingsResetKey)
+  if (isShow !== previousIsShow || shouldResetForm) {
+    setPreviousIsShow(isShow)
+    if (shouldResetForm) {
+      setInputInfo(nextInputInfo)
+      setLanguage(default_language)
+      setAppIcon(nextAppIcon)
+      setIsShowMore(false)
+      setPreviousSettingsResetKey(settingsResetKey)
     }
-  }, [])
+  }
 
   const onHide = () => {
     onClose()
-    if (hideMoreTimerRef.current)
-      clearTimeout(hideMoreTimerRef.current)
-    hideMoreTimerRef.current = setTimeout(() => {
-      setIsShowMore(false)
-      hideMoreTimerRef.current = null
-    }, 200)
+    setIsShowMore(false)
   }
 
   const onClickSave = async () => {
@@ -172,7 +182,7 @@ const SettingsModal: FC<ISettingsModalProps> = ({
       if (hex === null || hex?.length === 0)
         return true
 
-      const regex = /#([A-F0-9]{6})/i
+      const regex = /#[A-F0-9]{6}/i
       const check = regex.test(hex)
       return check
     }
@@ -240,245 +250,250 @@ const SettingsModal: FC<ISettingsModalProps> = ({
 
   return (
     <>
-      <Modal
-        isShow={isShow}
-        closable={false}
-        onClose={onHide}
-        className="max-w-[520px] p-0"
-      >
-        {/* header */}
-        <div className="pt-5 pr-5 pb-3 pl-6">
-          <div className="flex items-center gap-1">
-            <div className="grow title-2xl-semi-bold text-text-primary">{t(`${prefixSettings}.title`, { ns: 'appOverview' })}</div>
-            <ActionButton className="shrink-0" onClick={onHide}>
-              <RiCloseLine className="h-4 w-4" />
-            </ActionButton>
+      <Dialog open={isShow} onOpenChange={open => !open && onHide()}>
+        <DialogContent className="flex max-h-[calc(100dvh-2rem)] w-[520px] flex-col overflow-hidden! p-0!">
+          {/* header */}
+          <div className="shrink-0 pt-5 pr-5 pb-3 pl-6">
+            <div className="flex items-center gap-1">
+              <DialogTitle className="grow title-2xl-semi-bold text-text-primary">{t(`${prefixSettings}.title`, { ns: 'appOverview' })}</DialogTitle>
+              <DialogCloseButton className="relative top-auto right-auto shrink-0" />
+            </div>
+            <div className="mt-0.5 system-xs-regular text-text-tertiary">
+              <span>{t(`${prefixSettings}.modalTip`, { ns: 'appOverview' })}</span>
+            </div>
           </div>
-          <div className="mt-0.5 system-xs-regular text-text-tertiary">
-            <span>{t(`${prefixSettings}.modalTip`, { ns: 'appOverview' })}</span>
-          </div>
-        </div>
-        {/* form body */}
-        <div className="space-y-5 px-6 py-3">
-          {/* name & icon */}
-          <div className="flex gap-4">
-            <div className="grow">
-              <div className={cn('mb-1 py-1 system-sm-semibold text-text-secondary')}>{t(`${prefixSettings}.webName`, { ns: 'appOverview' })}</div>
-              <Input
-                className="w-full"
-                value={inputInfo.title}
-                onChange={onChange('title')}
-                placeholder={t('appNamePlaceholder', { ns: 'app' }) || ''}
+          {/* form body */}
+          <div className="min-h-0 flex-1 space-y-5 overflow-y-auto overscroll-contain px-6 py-3">
+            {/* name & icon */}
+            <div className="flex gap-4">
+              <div className="grow">
+                <div className={cn('mb-1 py-1 system-sm-semibold text-text-secondary')}>{t(`${prefixSettings}.webName`, { ns: 'appOverview' })}</div>
+                <Input
+                  className="w-full"
+                  value={inputInfo.title}
+                  onChange={onChange('title')}
+                  placeholder={t('appNamePlaceholder', { ns: 'app' }) || ''}
+                />
+              </div>
+              <AppIcon
+                size="xxl"
+                onClick={() => { setShowAppIconPicker(true) }}
+                className="mt-2 cursor-pointer"
+                iconType={appIcon.type}
+                icon={appIcon.type === 'image' ? appIcon.fileId : appIcon.icon}
+                background={appIcon.type === 'image' ? undefined : appIcon.background}
+                imageUrl={appIcon.type === 'image' ? appIcon.url : undefined}
               />
             </div>
-            <AppIcon
-              size="xxl"
-              onClick={() => { setShowAppIconPicker(true) }}
-              className="mt-2 cursor-pointer"
-              iconType={appIcon.type}
-              icon={appIcon.type === 'image' ? appIcon.fileId : appIcon.icon}
-              background={appIcon.type === 'image' ? undefined : appIcon.background}
-              imageUrl={appIcon.type === 'image' ? appIcon.url : undefined}
-            />
-          </div>
-          {/* description */}
-          <div className="relative">
-            <div className={cn('py-1 system-sm-semibold text-text-secondary')}>{t(`${prefixSettings}.webDesc`, { ns: 'appOverview' })}</div>
-            <Textarea
-              className="mt-1"
-              value={inputInfo.desc}
-              onChange={e => onDesChange(e.target.value)}
-              placeholder={t(`${prefixSettings}.webDescPlaceholder`, { ns: 'appOverview' }) as string}
-            />
-            <p className={cn('pb-0.5 body-xs-regular text-text-tertiary')}>{t(`${prefixSettings}.webDescTip`, { ns: 'appOverview' })}</p>
-          </div>
-          <Divider className="my-0 h-px" />
-          {/* answer icon */}
-          {isChat && (
+            {/* description */}
+            <div className="relative">
+              <div className={cn('py-1 system-sm-semibold text-text-secondary')}>{t(`${prefixSettings}.webDesc`, { ns: 'appOverview' })}</div>
+              <Textarea
+                className="mt-1"
+                value={inputInfo.desc}
+                onChange={e => onDesChange(e.target.value)}
+                placeholder={t(`${prefixSettings}.webDescPlaceholder`, { ns: 'appOverview' }) as string}
+              />
+              <p className={cn('pb-0.5 body-xs-regular text-text-tertiary')}>{t(`${prefixSettings}.webDescTip`, { ns: 'appOverview' })}</p>
+            </div>
+            <Divider className="my-0 h-px" />
+            {/* answer icon */}
+            {isChat && (
+              <div className="w-full">
+                <div className="flex items-center justify-between">
+                  <div className={cn('py-1 system-sm-semibold text-text-secondary')}>{t('answerIcon.title', { ns: 'app' })}</div>
+                  <Switch
+                    checked={inputInfo.use_icon_as_answer_icon}
+                    onCheckedChange={v => setInputInfo({ ...inputInfo, use_icon_as_answer_icon: v })}
+                  />
+                </div>
+                <p className="pb-0.5 body-xs-regular text-text-tertiary">{t('answerIcon.description', { ns: 'app' })}</p>
+              </div>
+            )}
+            {/* language */}
+            <div className="flex items-center">
+              <div className={cn('grow py-1 system-sm-semibold text-text-secondary')}>{t(`${prefixSettings}.language`, { ns: 'appOverview' })}</div>
+              <Select
+                value={selectedLanguage?.value ?? null}
+                onValueChange={handleLanguageChange}
+              >
+                <SelectTrigger
+                  aria-label={t(`${prefixSettings}.language`, { ns: 'appOverview' })}
+                  size="large"
+                  className="w-[200px]"
+                >
+                  {selectedLanguage?.name ?? t('placeholder.select', { ns: 'common' })}
+                </SelectTrigger>
+                <SelectContent>
+                  {LANGUAGE_OPTIONS.map(item => (
+                    <SelectItem key={item.value} value={item.value}>
+                      <SelectItemText>{item.name}</SelectItemText>
+                      <SelectItemIndicator />
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+            </div>
+            {/* theme color */}
+            {isChat && (
+              <div className="flex items-center">
+                <div className="grow">
+                  <div className={cn('py-1 system-sm-semibold text-text-secondary')}>{t(`${prefixSettings}.chatColorTheme`, { ns: 'appOverview' })}</div>
+                  <div className="pb-0.5 body-xs-regular text-text-tertiary">{t(`${prefixSettings}.chatColorThemeDesc`, { ns: 'appOverview' })}</div>
+                </div>
+                <div className="shrink-0">
+                  <Input
+                    className="mb-1 w-[200px]"
+                    value={inputInfo.chatColorTheme ?? ''}
+                    onChange={onChange('chatColorTheme')}
+                    placeholder="E.g #A020F0"
+                  />
+                  <div className="flex items-center justify-between">
+                    <p className={cn('body-xs-regular text-text-tertiary')}>{t(`${prefixSettings}.chatColorThemeInverted`, { ns: 'appOverview' })}</p>
+                    <Switch checked={inputInfo.chatColorThemeInverted} onCheckedChange={v => setInputInfo({ ...inputInfo, chatColorThemeInverted: v })}></Switch>
+                  </div>
+                </div>
+              </div>
+            )}
+            {/* workflow detail */}
             <div className="w-full">
               <div className="flex items-center justify-between">
-                <div className={cn('py-1 system-sm-semibold text-text-secondary')}>{t('answerIcon.title', { ns: 'app' })}</div>
+                <div className={cn('py-1 system-sm-semibold text-text-secondary')}>{t(`${prefixSettings}.workflow.subTitle`, { ns: 'appOverview' })}</div>
                 <Switch
-                  checked={inputInfo.use_icon_as_answer_icon}
-                  onCheckedChange={v => setInputInfo({ ...inputInfo, use_icon_as_answer_icon: v })}
+                  disabled={!(appInfo.mode === AppModeEnum.WORKFLOW || appInfo.mode === AppModeEnum.ADVANCED_CHAT)}
+                  checked={inputInfo.show_workflow_steps}
+                  onCheckedChange={v => setInputInfo({ ...inputInfo, show_workflow_steps: v })}
                 />
               </div>
-              <p className="pb-0.5 body-xs-regular text-text-tertiary">{t('answerIcon.description', { ns: 'app' })}</p>
+              <p className="pb-0.5 body-xs-regular text-text-tertiary">{t(`${prefixSettings}.workflow.showDesc`, { ns: 'appOverview' })}</p>
             </div>
-          )}
-          {/* language */}
-          <div className="flex items-center">
-            <div className={cn('grow py-1 system-sm-semibold text-text-secondary')}>{t(`${prefixSettings}.language`, { ns: 'appOverview' })}</div>
-            <Select
-              value={selectedLanguage?.value ?? null}
-              onValueChange={(nextValue) => {
-                if (!nextValue)
-                  return
-                setLanguage(nextValue as Language)
-              }}
-            >
-              <SelectTrigger size="large" className="w-[200px]">
-                {selectedLanguage?.name ?? t('placeholder.select', { ns: 'common' })}
-              </SelectTrigger>
-              <SelectContent popupClassName="w-(--anchor-width)">
-                {languageOptions.map(item => (
-                  <SelectItem key={item.value} value={item.value}>
-                    <SelectItemText>{item.name}</SelectItemText>
-                    <SelectItemIndicator />
-                  </SelectItem>
-                ))}
-              </SelectContent>
-            </Select>
-          </div>
-          {/* theme color */}
-          {isChat && (
-            <div className="flex items-center">
-              <div className="grow">
-                <div className={cn('py-1 system-sm-semibold text-text-secondary')}>{t(`${prefixSettings}.chatColorTheme`, { ns: 'appOverview' })}</div>
-                <div className="pb-0.5 body-xs-regular text-text-tertiary">{t(`${prefixSettings}.chatColorThemeDesc`, { ns: 'appOverview' })}</div>
-              </div>
-              <div className="shrink-0">
-                <Input
-                  className="mb-1 w-[200px]"
-                  value={inputInfo.chatColorTheme ?? ''}
-                  onChange={onChange('chatColorTheme')}
-                  placeholder="E.g #A020F0"
-                />
-                <div className="flex items-center justify-between">
-                  <p className={cn('body-xs-regular text-text-tertiary')}>{t(`${prefixSettings}.chatColorThemeInverted`, { ns: 'appOverview' })}</p>
-                  <Switch checked={inputInfo.chatColorThemeInverted} onCheckedChange={v => setInputInfo({ ...inputInfo, chatColorThemeInverted: v })}></Switch>
+            {/* more settings switch */}
+            <Divider className="my-0 h-px" />
+            {!isShowMore && (
+              <div className="flex cursor-pointer items-center" onClick={() => setIsShowMore(true)}>
+                <div className="grow">
+                  <div className={cn('py-1 system-sm-semibold text-text-secondary')}>{t(`${prefixSettings}.more.entry`, { ns: 'appOverview' })}</div>
+                  <p className={cn('pb-0.5 body-xs-regular text-text-tertiary')}>
+                    {t(`${prefixSettings}.more.copyRightPlaceholder`, { ns: 'appOverview' })}
+                    {' '}
+                    &
+                    {' '}
+                    {t(`${prefixSettings}.more.privacyPolicyPlaceholder`, { ns: 'appOverview' })}
+                  </p>
                 </div>
+                <span aria-hidden="true" className="ml-1 i-ri-arrow-right-s-line h-4 w-4 shrink-0 text-text-secondary" />
               </div>
-            </div>
-          )}
-          {/* workflow detail */}
-          <div className="w-full">
-            <div className="flex items-center justify-between">
-              <div className={cn('py-1 system-sm-semibold text-text-secondary')}>{t(`${prefixSettings}.workflow.subTitle`, { ns: 'appOverview' })}</div>
-              <Switch
-                disabled={!(appInfo.mode === AppModeEnum.WORKFLOW || appInfo.mode === AppModeEnum.ADVANCED_CHAT)}
-                checked={inputInfo.show_workflow_steps}
-                onCheckedChange={v => setInputInfo({ ...inputInfo, show_workflow_steps: v })}
+            )}
+            {/* more settings */}
+            {isShowMore && (
+              <>
+                {/* copyright */}
+                <div className="w-full">
+                  <div className="flex items-center">
+                    <div className="flex grow items-center">
+                      <div className={cn('mr-1 py-1 system-sm-semibold text-text-secondary')}>{t(`${prefixSettings}.more.copyright`, { ns: 'appOverview' })}</div>
+                      {/* upgrade button */}
+                      {enableBilling && isFreePlan && (
+                        <div className="h-[18px] select-none">
+                          <PremiumBadgeButton size="s" color="blue" onClick={handlePlanClick}>
+                            <span aria-hidden="true" className="i-custom-public-common-sparkles-soft flex h-3.5 w-3.5 items-center py-px pl-[3px] text-components-premium-badge-indigo-text-stop-0" />
+                            <div className="system-xs-medium">
+                              <span className="p-1">
+                                {t('upgradeBtn.encourageShort', { ns: 'billing' })}
+                              </span>
+                            </div>
+                          </PremiumBadgeButton>
+                        </div>
+                      )}
+                    </div>
+                    {webappCopyrightEnabled
+                      ? (
+                          <Switch
+                            checked={inputInfo.copyrightSwitchValue}
+                            onCheckedChange={v => setInputInfo({ ...inputInfo, copyrightSwitchValue: v })}
+                          />
+                        )
+                      : (
+                          <Tooltip>
+                            <TooltipTrigger
+                              render={(
+                                <div>
+                                  <Switch
+                                    disabled
+                                    checked={inputInfo.copyrightSwitchValue}
+                                    onCheckedChange={v => setInputInfo({ ...inputInfo, copyrightSwitchValue: v })}
+                                  />
+                                </div>
+                              )}
+                            />
+                            <TooltipContent className="w-[180px]">
+                              {t(`${prefixSettings}.more.copyrightTooltip`, { ns: 'appOverview' })}
+                            </TooltipContent>
+                          </Tooltip>
+                        )}
+                  </div>
+                  <p className="pb-0.5 body-xs-regular text-text-tertiary">{t(`${prefixSettings}.more.copyrightTip`, { ns: 'appOverview' })}</p>
+                  {inputInfo.copyrightSwitchValue && (
+                    <Input
+                      className="mt-2 h-10"
+                      value={inputInfo.copyright}
+                      onChange={onChange('copyright')}
+                      placeholder={t(`${prefixSettings}.more.copyRightPlaceholder`, { ns: 'appOverview' }) as string}
+                    />
+                  )}
+                </div>
+                {/* privacy policy */}
+                <div className="w-full">
+                  <div className={cn('py-1 system-sm-semibold text-text-secondary')}>{t(`${prefixSettings}.more.privacyPolicy`, { ns: 'appOverview' })}</div>
+                  <p className={cn('pb-0.5 body-xs-regular text-text-tertiary')}>
+                    <Trans
+                      i18nKey={`${prefixSettings}.more.privacyPolicyTip`}
+                      ns="appOverview"
+                      components={{ privacyPolicyLink: <Link href="https://dify.ai/privacy" target="_blank" rel="noopener noreferrer" className="text-text-accent" /> }}
+                    />
+                  </p>
+                  <Input
+                    className="mt-1"
+                    value={inputInfo.privacyPolicy}
+                    onChange={onChange('privacyPolicy')}
+                    placeholder={t(`${prefixSettings}.more.privacyPolicyPlaceholder`, { ns: 'appOverview' }) as string}
+                  />
+                </div>
+                {/* custom disclaimer */}
+                <div className="w-full">
+                  <div className={cn('py-1 system-sm-semibold text-text-secondary')}>{t(`${prefixSettings}.more.customDisclaimer`, { ns: 'appOverview' })}</div>
+                  <p className={cn('pb-0.5 body-xs-regular text-text-tertiary')}>{t(`${prefixSettings}.more.customDisclaimerTip`, { ns: 'appOverview' })}</p>
+                  <Textarea
+                    className="mt-1"
+                    value={inputInfo.customDisclaimer}
+                    onChange={onChange('customDisclaimer')}
+                    placeholder={t(`${prefixSettings}.more.customDisclaimerPlaceholder`, { ns: 'appOverview' }) as string}
+                  />
+                </div>
+              </>
+            )}
+          </div>
+          {/* footer */}
+          <div className="flex shrink-0 justify-end p-6 pt-5">
+            <Button className="mr-2" onClick={onHide}>{t('operation.cancel', { ns: 'common' })}</Button>
+            <Button variant="primary" onClick={onClickSave} loading={saveLoading}>{t('operation.save', { ns: 'common' })}</Button>
+          </div>
+          {showAppIconPicker && (
+            <div onClick={e => e.stopPropagation()}>
+              <AppIconPicker
+                onSelect={(payload) => {
+                  setAppIcon(payload)
+                  setShowAppIconPicker(false)
+                }}
+                onClose={() => {
+                  setAppIcon(createAppIcon(appInfo))
+                  setShowAppIconPicker(false)
+                }}
               />
             </div>
-            <p className="pb-0.5 body-xs-regular text-text-tertiary">{t(`${prefixSettings}.workflow.showDesc`, { ns: 'appOverview' })}</p>
-          </div>
-          {/* more settings switch */}
-          <Divider className="my-0 h-px" />
-          {!isShowMore && (
-            <div className="flex cursor-pointer items-center" onClick={() => setIsShowMore(true)}>
-              <div className="grow">
-                <div className={cn('py-1 system-sm-semibold text-text-secondary')}>{t(`${prefixSettings}.more.entry`, { ns: 'appOverview' })}</div>
-                <p className={cn('pb-0.5 body-xs-regular text-text-tertiary')}>
-                  {t(`${prefixSettings}.more.copyRightPlaceholder`, { ns: 'appOverview' })}
-                  {' '}
-                  &
-                  {' '}
-                  {t(`${prefixSettings}.more.privacyPolicyPlaceholder`, { ns: 'appOverview' })}
-                </p>
-              </div>
-              <RiArrowRightSLine className="ml-1 h-4 w-4 shrink-0 text-text-secondary" />
-            </div>
           )}
-          {/* more settings */}
-          {isShowMore && (
-            <>
-              {/* copyright */}
-              <div className="w-full">
-                <div className="flex items-center">
-                  <div className="flex grow items-center">
-                    <div className={cn('mr-1 py-1 system-sm-semibold text-text-secondary')}>{t(`${prefixSettings}.more.copyright`, { ns: 'appOverview' })}</div>
-                    {/* upgrade button */}
-                    {enableBilling && isFreePlan && (
-                      <div className="h-[18px] select-none">
-                        <PremiumBadge size="s" color="blue" allowHover={true} onClick={handlePlanClick}>
-                          <SparklesSoft className="flex h-3.5 w-3.5 items-center py-px pl-[3px] text-components-premium-badge-indigo-text-stop-0" />
-                          <div className="system-xs-medium">
-                            <span className="p-1">
-                              {t('upgradeBtn.encourageShort', { ns: 'billing' })}
-                            </span>
-                          </div>
-                        </PremiumBadge>
-                      </div>
-                    )}
-                  </div>
-                  <Tooltip
-                    disabled={webappCopyrightEnabled}
-                    popupContent={
-                      <div className="w-[180px]">{t(`${prefixSettings}.more.copyrightTooltip`, { ns: 'appOverview' })}</div>
-                    }
-                    asChild={false}
-                  >
-                    <Switch
-                      disabled={!webappCopyrightEnabled}
-                      checked={inputInfo.copyrightSwitchValue}
-                      onCheckedChange={v => setInputInfo({ ...inputInfo, copyrightSwitchValue: v })}
-                    />
-                  </Tooltip>
-                </div>
-                <p className="pb-0.5 body-xs-regular text-text-tertiary">{t(`${prefixSettings}.more.copyrightTip`, { ns: 'appOverview' })}</p>
-                {inputInfo.copyrightSwitchValue && (
-                  <Input
-                    className="mt-2 h-10"
-                    value={inputInfo.copyright}
-                    onChange={onChange('copyright')}
-                    placeholder={t(`${prefixSettings}.more.copyRightPlaceholder`, { ns: 'appOverview' }) as string}
-                  />
-                )}
-              </div>
-              {/* privacy policy */}
-              <div className="w-full">
-                <div className={cn('py-1 system-sm-semibold text-text-secondary')}>{t(`${prefixSettings}.more.privacyPolicy`, { ns: 'appOverview' })}</div>
-                <p className={cn('pb-0.5 body-xs-regular text-text-tertiary')}>
-                  <Trans
-                    i18nKey={`${prefixSettings}.more.privacyPolicyTip`}
-                    ns="appOverview"
-                    components={{ privacyPolicyLink: <Link href="https://dify.ai/privacy" target="_blank" rel="noopener noreferrer" className="text-text-accent" /> }}
-                  />
-                </p>
-                <Input
-                  className="mt-1"
-                  value={inputInfo.privacyPolicy}
-                  onChange={onChange('privacyPolicy')}
-                  placeholder={t(`${prefixSettings}.more.privacyPolicyPlaceholder`, { ns: 'appOverview' }) as string}
-                />
-              </div>
-              {/* custom disclaimer */}
-              <div className="w-full">
-                <div className={cn('py-1 system-sm-semibold text-text-secondary')}>{t(`${prefixSettings}.more.customDisclaimer`, { ns: 'appOverview' })}</div>
-                <p className={cn('pb-0.5 body-xs-regular text-text-tertiary')}>{t(`${prefixSettings}.more.customDisclaimerTip`, { ns: 'appOverview' })}</p>
-                <Textarea
-                  className="mt-1"
-                  value={inputInfo.customDisclaimer}
-                  onChange={onChange('customDisclaimer')}
-                  placeholder={t(`${prefixSettings}.more.customDisclaimerPlaceholder`, { ns: 'appOverview' }) as string}
-                />
-              </div>
-            </>
-          )}
-        </div>
-        {/* footer */}
-        <div className="flex justify-end p-6 pt-5">
-          <Button className="mr-2" onClick={onHide}>{t('operation.cancel', { ns: 'common' })}</Button>
-          <Button variant="primary" onClick={onClickSave} loading={saveLoading}>{t('operation.save', { ns: 'common' })}</Button>
-        </div>
-        {showAppIconPicker && (
-          <div onClick={e => e.stopPropagation()}>
-            <AppIconPicker
-              onSelect={(payload) => {
-                setAppIcon(payload)
-                setShowAppIconPicker(false)
-              }}
-              onClose={() => {
-                setAppIcon(icon_type === 'image'
-                  ? { type: 'image', url: icon_url!, fileId: icon }
-                  : { type: 'emoji', icon, background: icon_background! })
-                setShowAppIconPicker(false)
-              }}
-            />
-          </div>
-        )}
-      </Modal>
+        </DialogContent>
+      </Dialog>
     </>
   )
 }
diff --git a/web/app/components/app/overview/workflow-hidden-input-fields.tsx b/web/app/components/app/overview/workflow-hidden-input-fields.tsx
new file mode 100644
index 0000000000..3983087e1c
--- /dev/null
+++ b/web/app/components/app/overview/workflow-hidden-input-fields.tsx
@@ -0,0 +1,116 @@
+import type { ChangeEvent } from 'react'
+import type { WorkflowHiddenStartVariable, WorkflowLaunchInputValue } from './app-card-utils'
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@langgenius/dify-ui/select'
+import Input from '@/app/components/base/input'
+import Textarea from '@/app/components/base/textarea'
+
+import { InputVarType } from '@/app/components/workflow/types'
+
+type WorkflowHiddenInputFieldsProps = {
+  hiddenVariables: WorkflowHiddenStartVariable[]
+  values: Record<string, WorkflowLaunchInputValue>
+  onValueChange: (variable: string, value: WorkflowLaunchInputValue) => void
+  fieldIdPrefix?: string
+}
+
+const WorkflowHiddenInputFields = ({
+  hiddenVariables,
+  values,
+  onValueChange,
+  fieldIdPrefix = 'workflow-launch-hidden-input',
+}: WorkflowHiddenInputFieldsProps) => {
+  const renderField = (variable: WorkflowHiddenStartVariable) => {
+    const fieldId = `${fieldIdPrefix}-${variable.variable}`
+    const fieldValue = values[variable.variable]
+    const label = typeof variable.label === 'string' ? variable.label : variable.variable
+
+    if (variable.type === InputVarType.select) {
+      return (
+        <Select
+          value={typeof fieldValue === 'string' ? fieldValue : ''}
+          onValueChange={value => onValueChange(variable.variable, value ?? '')}
+        >
+          <SelectTrigger className="w-full" aria-label={label}>
+            <SelectValue placeholder={label} />
+          </SelectTrigger>
+          <SelectContent>
+            {(variable.options ?? []).map(option => (
+              <SelectItem key={option} value={option}>
+                {option}
+              </SelectItem>
+            ))}
+          </SelectContent>
+        </Select>
+      )
+    }
+
+    if (variable.type === InputVarType.checkbox) {
+      return (
+        <label className="flex min-h-10 w-full cursor-pointer items-center gap-3 rounded-lg bg-components-input-bg-normal px-3 py-2">
+          <input
+            id={fieldId}
+            type="checkbox"
+            checked={Boolean(fieldValue)}
+            onChange={(event: ChangeEvent<HTMLInputElement>) => onValueChange(variable.variable, event.target.checked)}
+            className="h-4 w-4 rounded border-divider-subtle"
+          />
+          <span className="system-sm-regular text-text-secondary">{label}</span>
+        </label>
+      )
+    }
+
+    if (
+      variable.type === InputVarType.paragraph
+      || variable.type === InputVarType.json
+      || variable.type === InputVarType.jsonObject
+    ) {
+      return (
+        <Textarea
+          id={fieldId}
+          value={typeof fieldValue === 'string' ? fieldValue : ''}
+          onChange={(event: ChangeEvent<HTMLTextAreaElement>) => onValueChange(variable.variable, event.target.value)}
+          placeholder={label}
+          maxLength={variable.max_length}
+          className="min-h-24"
+        />
+      )
+    }
+
+    return (
+      <Input
+        id={fieldId}
+        type={variable.type === InputVarType.number ? 'number' : 'text'}
+        value={typeof fieldValue === 'string' ? fieldValue : ''}
+        onChange={(event: ChangeEvent<HTMLInputElement>) => onValueChange(variable.variable, event.target.value)}
+        placeholder={label}
+        maxLength={variable.max_length}
+      />
+    )
+  }
+
+  return (
+    <>
+      {hiddenVariables.map(variable => (
+        <div key={variable.variable} className="space-y-1.5">
+          {variable.type !== InputVarType.checkbox && (
+            <label
+              htmlFor={`${fieldIdPrefix}-${variable.variable}`}
+              className="block system-sm-medium text-text-secondary"
+            >
+              {typeof variable.label === 'string' ? variable.label : variable.variable}
+            </label>
+          )}
+          {renderField(variable)}
+        </div>
+      ))}
+    </>
+  )
+}
+
+export default WorkflowHiddenInputFields
diff --git a/web/app/components/app/switch-app-modal/__tests__/index.spec.tsx b/web/app/components/app/switch-app-modal/__tests__/index.spec.tsx
index 99bf1e7436..d043046dc8 100644
--- a/web/app/components/app/switch-app-modal/__tests__/index.spec.tsx
+++ b/web/app/components/app/switch-app-modal/__tests__/index.spec.tsx
@@ -273,6 +273,15 @@ describe('SwitchAppModal', () => {
       expect(onClose).toHaveBeenCalledTimes(1)
     })
 
+    it('should call onClose when close button is clicked', async () => {
+      const user = userEvent.setup()
+      const { onClose } = renderComponent()
+
+      await user.click(screen.getByRole('button', { name: /operation\.close$/ }))
+
+      expect(onClose).toHaveBeenCalledTimes(1)
+    })
+
     it('should switch app and navigate with push when keeping original', async () => {
       const user = userEvent.setup()
       // Arrange
diff --git a/web/app/components/app/switch-app-modal/index.tsx b/web/app/components/app/switch-app-modal/index.tsx
index 8da710210e..f3ca9a911a 100644
--- a/web/app/components/app/switch-app-modal/index.tsx
+++ b/web/app/components/app/switch-app-modal/index.tsx
@@ -11,18 +11,17 @@ import {
   AlertDialogTitle,
 } from '@langgenius/dify-ui/alert-dialog'
 import { Button } from '@langgenius/dify-ui/button'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
 import { RiCloseLine } from '@remixicon/react'
-import { noop } from 'es-toolkit/function'
 import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useStore as useAppStore } from '@/app/components/app/store'
 import AppIcon from '@/app/components/base/app-icon'
-import Checkbox from '@/app/components/base/checkbox'
 import { AlertTriangle } from '@/app/components/base/icons/src/vender/solid/alertsAndFeedback'
 import Input from '@/app/components/base/input'
-import Modal from '@/app/components/base/modal'
 import AppsFull from '@/app/components/billing/apps-full-in-dialog'
 import { NEED_REFRESH_APP_LIST_KEY } from '@/config'
 import { useAppContext } from '@/context/app-context'
@@ -109,69 +108,77 @@ const SwitchAppModal = ({ show, appDetail, inAppDetail = false, onSuccess, onClo
 
   return (
     <>
-      <Modal
-        className={cn('w-[600px] max-w-[600px] p-8')}
-        isShow={show}
-        onClose={noop}
-      >
-        <div className="absolute top-4 right-4 cursor-pointer p-2" onClick={onClose}>
-          <RiCloseLine className="h-4 w-4 text-text-tertiary" />
-        </div>
-        <div className="h-12 w-12 rounded-xl border-[0.5px] border-divider-regular bg-background-default-burn p-3 shadow-xl">
-          <AlertTriangle className="h-6 w-6 text-[rgb(247,144,9)]" />
-        </div>
-        <div className="relative mt-3 text-xl leading-[30px] font-semibold text-text-primary">{t('switch', { ns: 'app' })}</div>
-        <div className="my-1 text-sm leading-5 text-text-tertiary">
-          <span>{t('switchTipStart', { ns: 'app' })}</span>
-          <span className="font-medium text-text-secondary">{t('switchTip', { ns: 'app' })}</span>
-          <span>{t('switchTipEnd', { ns: 'app' })}</span>
-        </div>
-        <div className="pb-4">
-          <div className="py-2 text-sm leading-[20px] font-medium text-text-primary">{t('switchLabel', { ns: 'app' })}</div>
-          <div className="flex items-center justify-between space-x-2">
-            <AppIcon
-              size="large"
-              onClick={() => { setShowAppIconPicker(true) }}
-              className="cursor-pointer"
-              iconType={appIcon.type}
-              icon={appIcon.type === 'image' ? appIcon.fileId : appIcon.icon}
-              background={appIcon.type === 'image' ? undefined : appIcon.background}
-              imageUrl={appIcon.type === 'image' ? appIcon.url : undefined}
-            />
-            <Input
-              value={name}
-              onChange={e => setName(e.target.value)}
-              placeholder={t('newApp.appNamePlaceholder', { ns: 'app' }) || ''}
-              className="h-10 grow"
-            />
+      <Dialog open={show}>
+        <DialogContent className={cn('w-full overflow-hidden! border-none text-left align-middle', cn('w-[600px] max-w-[600px] p-8'))}>
+
+          <button
+            type="button"
+            className="absolute top-4 right-4 cursor-pointer border-none bg-transparent p-2 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+            aria-label={t('operation.close', { ns: 'common' })}
+            onClick={onClose}
+          >
+            <RiCloseLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
+          </button>
+          <div className="h-12 w-12 rounded-xl border-[0.5px] border-divider-regular bg-background-default-burn p-3 shadow-xl">
+            <AlertTriangle className="h-6 w-6 text-[rgb(247,144,9)]" />
           </div>
-          {showAppIconPicker && (
-            <AppIconPicker
-              onSelect={(payload) => {
-                setAppIcon(payload)
-                setShowAppIconPicker(false)
-              }}
-              onClose={() => {
-                setAppIcon(appDetail.icon_type === 'image'
-                  ? { type: 'image' as const, url: appDetail.icon_url, fileId: appDetail.icon }
-                  : { type: 'emoji' as const, icon: appDetail.icon, background: appDetail.icon_background })
-                setShowAppIconPicker(false)
-              }}
-            />
-          )}
-        </div>
-        {isAppsFull && <AppsFull loc="app-switch" />}
-        <div className="flex items-center justify-between pt-6">
-          <div className="flex items-center">
-            <Checkbox className="shrink-0" checked={removeOriginal} onCheck={() => setRemoveOriginal(!removeOriginal)} />
-            <div className="ml-2 cursor-pointer text-sm leading-5 text-text-secondary" onClick={() => setRemoveOriginal(!removeOriginal)}>{t('removeOriginal', { ns: 'app' })}</div>
+          <div className="relative mt-3 text-xl leading-[30px] font-semibold text-text-primary">{t('switch', { ns: 'app' })}</div>
+          <div className="my-1 text-sm leading-5 text-text-tertiary">
+            <span>{t('switchTipStart', { ns: 'app' })}</span>
+            <span className="font-medium text-text-secondary">{t('switchTip', { ns: 'app' })}</span>
+            <span>{t('switchTipEnd', { ns: 'app' })}</span>
           </div>
-          <div className="flex items-center">
-            <Button className="mr-2" onClick={onClose}>{t('newApp.Cancel', { ns: 'app' })}</Button>
-            <Button className="border-red-700" disabled={isAppsFull || !name} variant="primary" tone="destructive" onClick={goStart}>{t('switchStart', { ns: 'app' })}</Button>
+          <div className="pb-4">
+            <div className="py-2 text-sm leading-[20px] font-medium text-text-primary">{t('switchLabel', { ns: 'app' })}</div>
+            <div className="flex items-center justify-between space-x-2">
+              <AppIcon
+                size="large"
+                onClick={() => { setShowAppIconPicker(true) }}
+                className="cursor-pointer"
+                iconType={appIcon.type}
+                icon={appIcon.type === 'image' ? appIcon.fileId : appIcon.icon}
+                background={appIcon.type === 'image' ? undefined : appIcon.background}
+                imageUrl={appIcon.type === 'image' ? appIcon.url : undefined}
+              />
+              <Input
+                value={name}
+                onChange={e => setName(e.target.value)}
+                placeholder={t('newApp.appNamePlaceholder', { ns: 'app' }) || ''}
+                className="h-10 grow"
+              />
+            </div>
+            {showAppIconPicker && (
+              <AppIconPicker
+                onSelect={(payload) => {
+                  setAppIcon(payload)
+                  setShowAppIconPicker(false)
+                }}
+                onClose={() => {
+                  setAppIcon(appDetail.icon_type === 'image'
+                    ? { type: 'image' as const, url: appDetail.icon_url, fileId: appDetail.icon }
+                    : { type: 'emoji' as const, icon: appDetail.icon, background: appDetail.icon_background })
+                  setShowAppIconPicker(false)
+                }}
+              />
+            )}
           </div>
-        </div>
-      </Modal>
+          {isAppsFull && <AppsFull loc="app-switch" />}
+          <div className="flex items-center justify-between pt-6">
+            <div className="flex items-center">
+              <label className="flex cursor-pointer items-center">
+                <Checkbox className="shrink-0" checked={removeOriginal} onCheckedChange={setRemoveOriginal} />
+                <span className="ml-2 text-left text-sm leading-5 text-text-secondary">
+                  {t('removeOriginal', { ns: 'app' })}
+                </span>
+              </label>
+            </div>
+            <div className="flex items-center">
+              <Button className="mr-2" onClick={onClose}>{t('newApp.Cancel', { ns: 'app' })}</Button>
+              <Button className="border-red-700" disabled={isAppsFull || !name} variant="primary" tone="destructive" onClick={goStart}>{t('switchStart', { ns: 'app' })}</Button>
+            </div>
+          </div>
+        </DialogContent>
+      </Dialog>
       <AlertDialog
         open={showConfirmDelete}
         onOpenChange={handleConfirmDeleteOpenChange}
diff --git a/web/app/components/app/workflow-log/__tests__/detail.spec.tsx b/web/app/components/app/workflow-log/__tests__/detail.spec.tsx
index a58f55b031..4abbfa24a5 100644
--- a/web/app/components/app/workflow-log/__tests__/detail.spec.tsx
+++ b/web/app/components/app/workflow-log/__tests__/detail.spec.tsx
@@ -117,11 +117,9 @@ describe('DetailPanel', () => {
     })
 
     it('should render close button', () => {
-      const { container } = render(<DetailPanel runID="run-123" onClose={defaultOnClose} />)
+      render(<DetailPanel runID="run-123" onClose={defaultOnClose} />)
 
-      // Close button has RiCloseLine icon
-      const closeButton = container.querySelector('span.cursor-pointer')
-      expect(closeButton).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'common.operation.close' })).toBeInTheDocument()
     })
 
     it('should render Run component with correct URLs', () => {
@@ -173,12 +171,11 @@ describe('DetailPanel', () => {
       const user = userEvent.setup()
       const onClose = vi.fn()
 
-      const { container } = render(<DetailPanel runID="run-123" onClose={onClose} />)
+      render(<DetailPanel runID="run-123" onClose={onClose} />)
 
-      const closeButton = container.querySelector('span.cursor-pointer')
-      expect(closeButton).toBeInTheDocument()
+      const closeButton = screen.getByRole('button', { name: 'common.operation.close' })
 
-      await user.click(closeButton!)
+      await user.click(closeButton)
 
       expect(onClose).toHaveBeenCalledTimes(1)
     })
diff --git a/web/app/components/app/workflow-log/__tests__/filter.spec.tsx b/web/app/components/app/workflow-log/__tests__/filter.spec.tsx
index 237862fd71..59063dfb98 100644
--- a/web/app/components/app/workflow-log/__tests__/filter.spec.tsx
+++ b/web/app/components/app/workflow-log/__tests__/filter.spec.tsx
@@ -328,22 +328,14 @@ describe('Filter', () => {
       const user = userEvent.setup()
       const setQueryParams = vi.fn()
 
-      const { container } = render(
+      render(
         <Filter
           queryParams={createDefaultQueryParams({ keyword: 'test' })}
           setQueryParams={setQueryParams}
         />,
       )
 
-      // The Input component renders a clear icon div inside the input wrapper
-      // when showClearIcon is true and value exists
-      const inputWrapper = container.querySelector('.w-\\[200px\\]')
-
-      // Find the clear icon div (has cursor-pointer class and contains RiCloseCircleFill)
-      const clearIconDiv = inputWrapper?.querySelector('div.cursor-pointer')
-
-      expect(clearIconDiv)!.toBeInTheDocument()
-      await user.click(clearIconDiv!)
+      await user.click(screen.getByRole('button', { name: 'common.operation.clear' }))
 
       expect(setQueryParams).toHaveBeenCalledWith({
         status: 'all',
diff --git a/web/app/components/app/workflow-log/__tests__/list.spec.tsx b/web/app/components/app/workflow-log/__tests__/list.spec.tsx
index a99b3b9ce5..5608303fb6 100644
--- a/web/app/components/app/workflow-log/__tests__/list.spec.tsx
+++ b/web/app/components/app/workflow-log/__tests__/list.spec.tsx
@@ -462,9 +462,10 @@ describe('WorkflowAppLogList', () => {
       // Open drawer
       const dataRows = screen.getAllByRole('row')
       await user.click(dataRows[1]!)
-      await screen.findByRole('dialog')
+      const dialog = await screen.findByRole('dialog')
 
       // Close drawer using Escape key
+      dialog.focus()
       await user.keyboard('{Escape}')
 
       await waitFor(() => {
diff --git a/web/app/components/app/workflow-log/detail.tsx b/web/app/components/app/workflow-log/detail.tsx
index e191bfb794..f0e80f11c0 100644
--- a/web/app/components/app/workflow-log/detail.tsx
+++ b/web/app/components/app/workflow-log/detail.tsx
@@ -1,9 +1,9 @@
 'use client'
 import type { FC } from 'react'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { RiCloseLine, RiPlayLargeLine } from '@remixicon/react'
 import { useTranslation } from 'react-i18next'
 import { useStore } from '@/app/components/app/store'
-import TooltipPlus from '@/app/components/base/tooltip'
 import { WorkflowContextProvider } from '@/app/components/workflow/context'
 import Run from '@/app/components/workflow/run'
 import { useRouter } from '@/next/navigation'
@@ -27,25 +27,34 @@ const DetailPanel: FC<ILogDetail> = ({ runID, onClose, canReplay = false }) => {
 
   return (
     <div className="relative flex grow flex-col pt-3">
-      <span className="absolute top-4 right-3 z-20 cursor-pointer p-1" onClick={onClose}>
-        <RiCloseLine className="h-4 w-4 text-text-tertiary" />
-      </span>
+      <button
+        type="button"
+        aria-label={t('operation.close', { ns: 'common' })}
+        className="absolute top-4 right-3 z-20 cursor-pointer border-none bg-transparent p-1 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+        onClick={onClose}
+      >
+        <RiCloseLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
+      </button>
       <div className="flex items-center bg-components-panel-bg">
         <h1 className="shrink-0 px-4 py-1 system-xl-semibold text-text-primary">{t('runDetail.workflowTitle', { ns: 'appLog' })}</h1>
         {canReplay && (
-          <TooltipPlus
-            popupContent={t('runDetail.testWithParams', { ns: 'appLog' })}
-            popupClassName="rounded-xl"
-          >
-            <button
-              type="button"
-              className="mr-1 flex h-6 w-6 items-center justify-center rounded-md hover:bg-state-base-hover"
-              aria-label={t('runDetail.testWithParams', { ns: 'appLog' })}
-              onClick={handleReplay}
-            >
-              <RiPlayLargeLine className="h-4 w-4 text-text-tertiary" />
-            </button>
-          </TooltipPlus>
+          <Tooltip>
+            <TooltipTrigger
+              render={(
+                <button
+                  type="button"
+                  className="mr-1 flex h-6 w-6 items-center justify-center rounded-md border-none bg-transparent p-0 hover:bg-state-base-hover"
+                  aria-label={t('runDetail.testWithParams', { ns: 'appLog' })}
+                  onClick={handleReplay}
+                >
+                  <RiPlayLargeLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
+                </button>
+              )}
+            />
+            <TooltipContent className="rounded-xl">
+              {t('runDetail.testWithParams', { ns: 'appLog' })}
+            </TooltipContent>
+          </Tooltip>
         )}
       </div>
       <WorkflowContextProvider>
diff --git a/web/app/components/app/workflow-log/list.tsx b/web/app/components/app/workflow-log/list.tsx
index 0f9b3f9620..51e038dbb6 100644
--- a/web/app/components/app/workflow-log/list.tsx
+++ b/web/app/components/app/workflow-log/list.tsx
@@ -2,18 +2,25 @@
 import type { FC } from 'react'
 import type { WorkflowAppLogDetail, WorkflowLogsResponse, WorkflowRunTriggeredFrom } from '@/models/log'
 import type { App } from '@/types/app'
+import { ArrowDownIcon } from '@heroicons/react/24/outline'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  Drawer,
+  DrawerBackdrop,
+  DrawerContent,
+  DrawerPopup,
+  DrawerPortal,
+  DrawerViewport,
+} from '@langgenius/dify-ui/drawer'
 import * as React from 'react'
 import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import Drawer from '@/app/components/base/drawer'
 import Loading from '@/app/components/base/loading'
 import Indicator from '@/app/components/header/indicator'
 import useBreakpoints, { MediaType } from '@/hooks/use-breakpoints'
 import useTimestamp from '@/hooks/use-timestamp'
 import { AppModeEnum } from '@/types/app'
 import DetailPanel from './detail'
-import EvaluationCell from './evaluation-cell'
 import TriggerByDisplay from './trigger-by-display'
 
 type ILogs = {
@@ -118,21 +125,27 @@ const WorkflowAppLogList: FC<ILogs> = ({ logs, appDetail, onRefresh }) => {
 
   return (
     <div className="overflow-x-auto">
-      <table className={cn('mt-2 w-full min-w-[560px] border-collapse border-0')}>
+      <table className={cn('mt-2 w-full min-w-[440px] border-collapse border-0')}>
         <thead className="system-xs-medium-uppercase text-text-tertiary">
           <tr>
             <td className="w-5 rounded-l-lg bg-background-section-burn pr-1 pl-2 whitespace-nowrap"></td>
             <td className="bg-background-section-burn py-1.5 pl-3 whitespace-nowrap">
-              <div className="flex cursor-pointer items-center hover:text-text-secondary" onClick={handleSort}>
+              <button
+                type="button"
+                className="flex cursor-pointer items-center border-none bg-transparent p-0 text-left hover:text-text-secondary focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+                onClick={handleSort}
+              >
                 {t('table.header.startTime', { ns: 'appLog' })}
-                <span className={cn('i-heroicons-arrow-down', 'ml-0.5 h-3 w-3 stroke-current stroke-2 transition-all', 'text-text-tertiary', sortOrder === 'asc' ? 'rotate-180' : '')} />
-              </div>
+                <ArrowDownIcon
+                  className={cn('ml-0.5 h-3 w-3 stroke-current stroke-2 transition-all', 'text-text-tertiary', sortOrder === 'asc' ? 'rotate-180' : '')}
+                  aria-hidden="true"
+                />
+              </button>
             </td>
             <td className="bg-background-section-burn py-1.5 pl-3 whitespace-nowrap">{t('table.header.status', { ns: 'appLog' })}</td>
             <td className="bg-background-section-burn py-1.5 pl-3 whitespace-nowrap">{t('table.header.runtime', { ns: 'appLog' })}</td>
             <td className="bg-background-section-burn py-1.5 pl-3 whitespace-nowrap">{t('table.header.tokens', { ns: 'appLog' })}</td>
-            <td className="bg-background-section-burn py-1.5 pl-3 whitespace-nowrap">{t('table.header.user', { ns: 'appLog' })}</td>
-            <td className={cn('bg-background-section-burn py-1.5 px-3 whitespace-nowrap text-center', !isWorkflow ? 'rounded-r-lg' : '')}>{t('table.header.evaluation', { ns: 'appLog' })}</td>
+            <td className={cn('bg-background-section-burn py-1.5 pl-3 whitespace-nowrap', !isWorkflow ? 'rounded-r-lg' : '')}>{t('table.header.user', { ns: 'appLog' })}</td>
             {isWorkflow && <td className="rounded-r-lg bg-background-section-burn py-1.5 pl-3 whitespace-nowrap">{t('table.header.triggered_from', { ns: 'appLog' })}</td>}
           </tr>
         </thead>
@@ -171,9 +184,6 @@ const WorkflowAppLogList: FC<ILogs> = ({ logs, appDetail, onRefresh }) => {
                     {endUser}
                   </div>
                 </td>
-                <td className="p-2 pr-2" onClick={event => event.stopPropagation()}>
-                  <EvaluationCell evaluation={log.evaluation} />
-                </td>
                 {isWorkflow && (
                   <td className="p-3 pr-2">
                     <TriggerByDisplay triggeredFrom={log.workflow_run.triggered_from as WorkflowRunTriggeredFrom} triggerMetadata={log.details?.trigger_metadata} />
@@ -185,17 +195,28 @@ const WorkflowAppLogList: FC<ILogs> = ({ logs, appDetail, onRefresh }) => {
         </tbody>
       </table>
       <Drawer
-        isOpen={showDrawer}
-        onClose={onCloseDrawer}
-        mask={isMobile}
-        footer={null}
-        panelClassName="mt-16 mx-2 sm:mr-2 mb-3 p-0! max-w-[600px]! rounded-xl border border-components-panel-border"
+        open={showDrawer}
+        modal
+        swipeDirection="right"
+        onOpenChange={(open) => {
+          if (!open)
+            onCloseDrawer()
+        }}
       >
-        <DetailPanel
-          onClose={onCloseDrawer}
-          runID={currentLog?.workflow_run.id || ''}
-          canReplay={currentLog?.workflow_run.triggered_from === 'app-run' || currentLog?.workflow_run.triggered_from === 'debugging'}
-        />
+        <DrawerPortal>
+          <DrawerBackdrop className={cn(!isMobile && 'bg-transparent')} />
+          <DrawerViewport>
+            <DrawerPopup className="p-0! data-[swipe-direction=right]:top-16 data-[swipe-direction=right]:right-2 data-[swipe-direction=right]:bottom-3 data-[swipe-direction=right]:h-auto data-[swipe-direction=right]:w-full data-[swipe-direction=right]:max-w-[600px] data-[swipe-direction=right]:rounded-xl data-[swipe-direction=right]:border data-[swipe-direction=right]:border-components-panel-border">
+              <DrawerContent className="flex min-h-0 flex-1 flex-col p-0 pb-0">
+                <DetailPanel
+                  onClose={onCloseDrawer}
+                  runID={currentLog?.workflow_run.id || ''}
+                  canReplay={currentLog?.workflow_run.triggered_from === 'app-run' || currentLog?.workflow_run.triggered_from === 'debugging'}
+                />
+              </DrawerContent>
+            </DrawerPopup>
+          </DrawerViewport>
+        </DrawerPortal>
       </Drawer>
     </div>
   )
diff --git a/web/app/components/apps/__tests__/app-card.spec.tsx b/web/app/components/apps/__tests__/app-card.spec.tsx
index 6a71dbac52..d61ca306ae 100644
--- a/web/app/components/apps/__tests__/app-card.spec.tsx
+++ b/web/app/components/apps/__tests__/app-card.spec.tsx
@@ -296,14 +296,9 @@ vi.mock('@langgenius/dify-ui/dropdown-menu', () => {
   }
 })
 
-// Tooltip uses portals - minimal mock preserving popup content as title attribute
-vi.mock('@/app/components/base/tooltip', () => ({
-  default: ({ children, popupContent }: { children: React.ReactNode, popupContent: React.ReactNode }) => React.createElement('div', { title: popupContent }, children),
-}))
-
-// TagSelector has API dependency (service/tag) - mock for isolated testing
-vi.mock('@/app/components/base/tag-management/selector', () => ({
-  default: ({ tags }: { tags?: { id: string, name: string }[] }) => {
+// AppCardTags has tag API dependencies - mock for isolated testing
+vi.mock('@/features/tag-management/components/app-card-tags', () => ({
+  AppCardTags: ({ tags }: { tags?: { id: string, name: string }[] }) => {
     return React.createElement('div', { 'aria-label': 'tag-selector' }, tags?.map((tag: { id: string, name: string }) => React.createElement('span', { key: tag.id }, tag.name)))
   },
 }))
@@ -400,13 +395,30 @@ describe('AppCard', () => {
     it('should handle app with tags', () => {
       const appWithTags = {
         ...mockApp,
-        tags: [{ id: 'tag1', name: 'Tag 1', type: 'app', binding_count: 0 }],
+        tags: [{ id: 'tag1', name: 'Tag 1', type: 'app' as const, binding_count: 0 }],
       }
       render(<AppCard app={appWithTags} />)
       // Verify the tag selector component renders
       expect(screen.getByLabelText('tag-selector')).toBeInTheDocument()
     })
 
+    it('should display refreshed tag names from app props when tag ids stay the same', () => {
+      const firstApp = createMockApp({
+        tags: [{ id: 'tag1', name: 'Old Tag', type: 'app' as const, binding_count: 0 }],
+      })
+      const refreshedApp = createMockApp({
+        tags: [{ id: 'tag1', name: 'New Tag', type: 'app' as const, binding_count: 0 }],
+      })
+
+      const { rerender } = render(<AppCard app={firstApp} />)
+      expect(screen.getByText('Old Tag')).toBeInTheDocument()
+
+      rerender(<AppCard app={refreshedApp} />)
+
+      expect(screen.getByText('New Tag')).toBeInTheDocument()
+      expect(screen.queryByText('Old Tag')).not.toBeInTheDocument()
+    })
+
     it('should render with onRefresh callback', () => {
       render(<AppCard app={mockApp} onRefresh={mockOnRefresh} />)
       expect(screen.getByTitle('Test App')).toBeInTheDocument()
@@ -469,6 +481,15 @@ describe('AppCard', () => {
       expect(screen.getByTestId('dropdown-menu')).toHaveAttribute('data-modal', 'false')
     })
 
+    it('should reveal operations trigger when card receives keyboard focus', () => {
+      render(<AppCard app={mockApp} />)
+      const operationsTriggerWrapper = screen.getByTestId('dropdown-menu-trigger').closest('.absolute')
+
+      expect(operationsTriggerWrapper).toHaveClass('group-focus-within:pointer-events-auto')
+      expect(operationsTriggerWrapper).toHaveClass('group-focus-within:opacity-100')
+      expect(screen.getByTestId('dropdown-menu-trigger')).toHaveClass('focus-visible:ring-1')
+    })
+
     it('should show edit option when dropdown menu is opened', async () => {
       render(<AppCard app={mockApp} />)
 
@@ -1167,9 +1188,9 @@ describe('AppCard', () => {
       const multiTagApp = {
         ...mockApp,
         tags: [
-          { id: 'tag1', name: 'Tag 1', type: 'app', binding_count: 0 },
-          { id: 'tag2', name: 'Tag 2', type: 'app', binding_count: 0 },
-          { id: 'tag3', name: 'Tag 3', type: 'app', binding_count: 0 },
+          { id: 'tag1', name: 'Tag 1', type: 'app' as const, binding_count: 0 },
+          { id: 'tag2', name: 'Tag 2', type: 'app' as const, binding_count: 0 },
+          { id: 'tag3', name: 'Tag 3', type: 'app' as const, binding_count: 0 },
         ],
       }
       render(<AppCard app={multiTagApp} />)
@@ -1324,7 +1345,7 @@ describe('AppCard', () => {
 
     it('should stop propagation when clicking tag selector area', () => {
       const multiTagApp = createMockApp({
-        tags: [{ id: 'tag1', name: 'Tag 1', type: 'app', binding_count: 0 }],
+        tags: [{ id: 'tag1', name: 'Tag 1', type: 'app' as const, binding_count: 0 }],
       })
 
       render(<AppCard app={multiTagApp} />)
diff --git a/web/app/components/apps/__tests__/index.spec.tsx b/web/app/components/apps/__tests__/index.spec.tsx
index 94fa9f3484..32ebd35eba 100644
--- a/web/app/components/apps/__tests__/index.spec.tsx
+++ b/web/app/components/apps/__tests__/index.spec.tsx
@@ -31,7 +31,7 @@ const mockFetchAppDetail = vi.mocked(fetchAppDetail)
 
 const mockTemplateApp: App = {
   app_id: 'template-1',
-  category: 'Assistant',
+  categories: ['Assistant'],
   app: {
     id: 'template-1',
     mode: AppModeEnum.CHAT,
@@ -262,8 +262,8 @@ describe('Apps', () => {
     })
 
     it('should track template preview creation after a successful import', async () => {
-      mockHandleImportDSL.mockImplementation(async (_payload: unknown, options: { onSuccess?: () => void }) => {
-        options.onSuccess?.()
+      mockHandleImportDSL.mockImplementation(async (_payload: unknown, options: { onSuccess?: (payload: { app_mode: AppModeEnum }) => void }) => {
+        options.onSuccess?.({ app_mode: AppModeEnum.CHAT })
       })
 
       renderWithClient(<Apps />)
@@ -275,7 +275,9 @@ describe('Apps', () => {
       await waitFor(() => {
         expect(mockFetchAppDetail).toHaveBeenCalledWith('template-1')
         expect(mockTrackCreateApp).toHaveBeenCalledWith({
+          source: 'studio_template_preview',
           appMode: AppModeEnum.CHAT,
+          templateId: 'template-1',
         })
       })
     })
@@ -284,8 +286,8 @@ describe('Apps', () => {
       mockHandleImportDSL.mockImplementation(async (_payload: unknown, options: { onPending?: () => void }) => {
         options.onPending?.()
       })
-      mockHandleImportDSLConfirm.mockImplementation(async (options: { onSuccess?: () => void }) => {
-        options.onSuccess?.()
+      mockHandleImportDSLConfirm.mockImplementation(async (options: { onSuccess?: (payload: { app_mode: AppModeEnum }) => void }) => {
+        options.onSuccess?.({ app_mode: AppModeEnum.WORKFLOW })
       })
 
       renderWithClient(<Apps />)
@@ -299,7 +301,9 @@ describe('Apps', () => {
       await waitFor(() => {
         expect(mockHandleImportDSLConfirm).toHaveBeenCalledTimes(1)
         expect(mockTrackCreateApp).toHaveBeenCalledWith({
-          appMode: AppModeEnum.CHAT,
+          source: 'studio_template_preview',
+          appMode: AppModeEnum.WORKFLOW,
+          templateId: 'template-1',
         })
       })
     })
@@ -365,8 +369,8 @@ describe('Apps', () => {
     })
 
     it('should import DSL from marketplace template on confirm', async () => {
-      mockHandleImportDSL.mockImplementation(async (_payload: unknown, options: { onSuccess?: () => void }) => {
-        options.onSuccess?.()
+      mockHandleImportDSL.mockImplementation(async (_payload: unknown, options: { onSuccess?: (payload: { app_mode: AppModeEnum }) => void }) => {
+        options.onSuccess?.({ app_mode: AppModeEnum.CHAT })
       })
       mockSearchParams = new URLSearchParams('template-id=tpl-42')
       renderWithClient(<Apps />)
@@ -378,14 +382,22 @@ describe('Apps', () => {
           { mode: 'yaml-content', yaml_content: 'yaml-dsl-content' },
           expect.objectContaining({ onSuccess: expect.any(Function) }),
         )
+        expect(mockTrackCreateApp).toHaveBeenCalledWith({
+          source: 'external',
+          appMode: AppModeEnum.CHAT,
+          templateId: 'tpl-42',
+        })
         expect(mockReplace).toHaveBeenCalled()
       })
     })
 
-    it('should show DSL confirm modal when marketplace import is pending', async () => {
+    it('should track marketplace template creation after confirming a pending import', async () => {
       mockHandleImportDSL.mockImplementation(async (_payload: unknown, options: { onPending?: () => void }) => {
         options.onPending?.()
       })
+      mockHandleImportDSLConfirm.mockImplementation(async (options: { onSuccess?: (payload: { app_mode: AppModeEnum }) => void }) => {
+        options.onSuccess?.({ app_mode: AppModeEnum.WORKFLOW })
+      })
       mockSearchParams = new URLSearchParams('template-id=tpl-42')
       renderWithClient(<Apps />)
 
@@ -395,6 +407,16 @@ describe('Apps', () => {
         expect(screen.getByTestId('dsl-confirm-modal')).toBeInTheDocument()
         expect(mockReplace).toHaveBeenCalled()
       })
+
+      fireEvent.click(screen.getByTestId('confirm-dsl'))
+
+      await waitFor(() => {
+        expect(mockTrackCreateApp).toHaveBeenCalledWith({
+          source: 'external',
+          appMode: AppModeEnum.WORKFLOW,
+          templateId: 'tpl-42',
+        })
+      })
     })
   })
 
diff --git a/web/app/components/apps/__tests__/list.spec.tsx b/web/app/components/apps/__tests__/list.spec.tsx
index 6fec23cd81..75442c1ebd 100644
--- a/web/app/components/apps/__tests__/list.spec.tsx
+++ b/web/app/components/apps/__tests__/list.spec.tsx
@@ -1,12 +1,16 @@
-import { act, fireEvent, screen, waitFor } from '@testing-library/react'
+import { act, fireEvent, screen } from '@testing-library/react'
 import * as React from 'react'
 import { createSystemFeaturesWrapper } from '@/__tests__/utils/mock-system-features'
-import { useStore as useTagStore } from '@/app/components/base/tag-management/store'
 import { renderWithNuqs } from '@/test/nuqs-testing'
 import { AppModeEnum } from '@/types/app'
 
 import List from '../list'
 
+const mockAppListInfiniteOptions = vi.hoisted(() => vi.fn((options: unknown) => options))
+const mockUseWorkflowOnlineUsers = vi.hoisted(() => vi.fn((_options: unknown) => ({
+  onlineUsersMap: {},
+})))
+
 const mockReplace = vi.fn()
 const mockRouter = { replace: mockReplace }
 vi.mock('@/next/navigation', () => ({
@@ -14,52 +18,59 @@ vi.mock('@/next/navigation', () => ({
   useSearchParams: () => new URLSearchParams(''),
 }))
 
+vi.mock('@/service/client', () => ({
+  consoleClient: {
+    systemFeatures: vi.fn(),
+  },
+  consoleQuery: {
+    apps: {
+      list: {
+        infiniteOptions: (options: unknown) => mockAppListInfiniteOptions(options),
+      },
+    },
+    tags: {
+      list: {
+        queryOptions: (options: unknown) => options,
+      },
+    },
+    systemFeatures: {
+      queryKey: () => ['console', 'systemFeatures'],
+    },
+  },
+}))
+
 const mockIsCurrentWorkspaceEditor = vi.fn(() => true)
 const mockIsCurrentWorkspaceDatasetOperator = vi.fn(() => false)
-const mockIsLoadingCurrentWorkspace = vi.fn(() => false)
-const mockCanAccessSnippetsAndEvaluation = vi.fn(() => true)
-
 vi.mock('@/context/app-context', () => ({
   useAppContext: () => ({
     isCurrentWorkspaceEditor: mockIsCurrentWorkspaceEditor(),
     isCurrentWorkspaceDatasetOperator: mockIsCurrentWorkspaceDatasetOperator(),
-    isLoadingCurrentWorkspace: mockIsLoadingCurrentWorkspace(),
   }),
 }))
 
-vi.mock('@/context/global-public-context', () => ({
-  useGlobalPublicStore: () => ({
-    systemFeatures: {
-      branding: { enabled: false },
-    },
-  }),
-}))
-
-vi.mock('@/hooks/use-snippet-and-evaluation-plan-access', () => ({
-  useSnippetAndEvaluationPlanAccess: () => ({
-    canAccess: mockCanAccessSnippetsAndEvaluation(),
-    isReady: true,
-  }),
-}))
-
-const mockSetQuery = vi.fn()
+const mockSetKeywords = vi.fn()
+const mockSetTagIDs = vi.fn()
+const mockSetIsCreatedByMe = vi.fn()
+const mockSetCategory = vi.fn()
 const mockQueryState = {
+  category: 'all',
   tagIDs: [] as string[],
-  creatorIDs: [] as string[],
   keywords: '',
   isCreatedByMe: false,
 }
-
 vi.mock('../hooks/use-apps-query-state', () => ({
-  default: () => ({
+  isAppListCategory: (value: string) => value === 'all' || Object.values(AppModeEnum).includes(value as AppModeEnum),
+  useAppsQueryState: () => ({
     query: mockQueryState,
-    setQuery: mockSetQuery,
+    setCategory: mockSetCategory,
+    setKeywords: mockSetKeywords,
+    setTagIDs: mockSetTagIDs,
+    setIsCreatedByMe: mockSetIsCreatedByMe,
   }),
 }))
 
 let mockOnDSLFileDropped: ((file: File) => void) | null = null
 let mockDragging = false
-
 vi.mock('../hooks/use-dsl-drag-drop', () => ({
   useDSLDragDrop: ({ onDSLFileDropped }: { onDSLFileDropped: (file: File) => void }) => {
     mockOnDSLFileDropped = onDSLFileDropped
@@ -67,17 +78,18 @@ vi.mock('../hooks/use-dsl-drag-drop', () => ({
   },
 }))
 
+vi.mock('../hooks/use-workflow-online-users', () => ({
+  useWorkflowOnlineUsers: (options: unknown) => mockUseWorkflowOnlineUsers(options),
+}))
+
 const mockRefetch = vi.fn()
 const mockFetchNextPage = vi.fn()
-const mockFetchSnippetNextPage = vi.fn()
-const mockUseInfiniteAppList = vi.fn()
-const mockUseInfiniteSnippetList = vi.fn()
 
 const mockServiceState = {
   error: null as Error | null,
   hasNextPage: false,
-  isLoading: false,
   isFetching: false,
+  isLoading: false,
   isFetchingNextPage: false,
 }
 
@@ -115,10 +127,11 @@ const defaultAppData = {
   }],
 }
 
-vi.mock('@/service/use-apps', () => ({
-  useInfiniteAppList: (params: unknown, options: unknown) => {
-    mockUseInfiniteAppList(params, options)
-    return {
+vi.mock('@tanstack/react-query', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@tanstack/react-query')>()
+  return {
+    ...actual,
+    useInfiniteQuery: () => ({
       data: defaultAppData,
       isLoading: mockServiceState.isLoading,
       isFetching: mockServiceState.isFetching,
@@ -127,79 +140,17 @@ vi.mock('@/service/use-apps', () => ({
       hasNextPage: mockServiceState.hasNextPage,
       error: mockServiceState.error,
       refetch: mockRefetch,
-    }
-  },
+    }),
+  }
+})
+
+vi.mock('@/service/use-apps', () => ({
   useDeleteAppMutation: () => ({
     mutateAsync: vi.fn(),
     isPending: false,
   }),
 }))
 
-const mockSnippetServiceState = {
-  error: null as Error | null,
-  hasNextPage: false,
-  isLoading: false,
-  isFetching: false,
-  isFetchingNextPage: false,
-}
-
-const defaultSnippetData = {
-  pages: [{
-    data: [
-      {
-        id: 'snippet-1',
-        name: 'Tone Rewriter',
-        description: 'Rewrites rough drafts into a concise, professional tone for internal stakeholder updates.',
-        type: 'node',
-        is_published: false,
-        use_count: 19,
-        icon_info: {
-          icon_type: 'emoji',
-          icon: '🪄',
-          icon_background: '#E0EAFF',
-          icon_url: '',
-        },
-        created_at: 1704067200,
-        created_by: 'user-1',
-        updated_at: 1704153600,
-        updated_by: 'user-2',
-      },
-    ],
-    total: 1,
-  }],
-}
-
-vi.mock('@/service/use-snippets', () => ({
-  useInfiniteSnippetList: (params: unknown, options: unknown) => {
-    mockUseInfiniteSnippetList(params, options)
-    return {
-      data: defaultSnippetData,
-      isLoading: mockSnippetServiceState.isLoading,
-      isFetching: mockSnippetServiceState.isFetching,
-      isFetchingNextPage: mockSnippetServiceState.isFetchingNextPage,
-      fetchNextPage: mockFetchSnippetNextPage,
-      hasNextPage: mockSnippetServiceState.hasNextPage,
-      error: mockSnippetServiceState.error,
-    }
-  },
-  useCreateSnippetMutation: () => ({
-    mutate: vi.fn(),
-    isPending: false,
-  }),
-  useImportSnippetDSLMutation: () => ({
-    mutate: vi.fn(),
-    isPending: false,
-  }),
-  useConfirmSnippetImportMutation: () => ({
-    mutate: vi.fn(),
-    isPending: false,
-  }),
-}))
-
-vi.mock('@/service/tag', () => ({
-  fetchTagList: vi.fn().mockResolvedValue([{ id: 'tag-1', name: 'Test Tag', type: 'app' }]),
-}))
-
 vi.mock('@/config', async (importOriginal) => {
   const actual = await importOriginal<typeof import('@/config')>()
   return {
@@ -208,17 +159,6 @@ vi.mock('@/config', async (importOriginal) => {
   }
 })
 
-vi.mock('@/service/use-common', () => ({
-  useMembers: () => ({
-    data: {
-      accounts: [
-        { id: 'user-1', name: 'Current User', email: 'current@example.com', avatar: '', avatar_url: '', role: 'owner', last_login_at: '', created_at: '', status: 'active' },
-        { id: 'user-2', name: 'Alice', email: 'alice@example.com', avatar: '', avatar_url: '', role: 'admin', last_login_at: '', created_at: '', status: 'active' },
-      ],
-    },
-  }),
-}))
-
 vi.mock('@/hooks/use-pay', () => ({
   CheckModal: () => null,
 }))
@@ -232,21 +172,13 @@ vi.mock('@/next/dynamic', () => ({
         return React.createElement('div', { 'data-testid': 'tag-management-modal' })
       }
     }
-
     if (fnString.includes('create-from-dsl-modal')) {
       return function MockCreateFromDSLModal({ show, onClose, onSuccess }: { show: boolean, onClose: () => void, onSuccess: () => void }) {
         if (!show)
           return null
-
-        return React.createElement(
-          'div',
-          { 'data-testid': 'create-dsl-modal' },
-          React.createElement('button', { 'data-testid': 'close-dsl-modal', 'onClick': onClose }, 'Close'),
-          React.createElement('button', { 'data-testid': 'success-dsl-modal', 'onClick': onSuccess }, 'Success'),
-        )
+        return React.createElement('div', { 'data-testid': 'create-dsl-modal' }, React.createElement('button', { 'onClick': onClose, 'data-testid': 'close-dsl-modal' }, 'Close'), React.createElement('button', { 'onClick': onSuccess, 'data-testid': 'success-dsl-modal' }, 'Success'))
       }
     }
-
     return () => null
   },
 }))
@@ -264,8 +196,8 @@ vi.mock('../new-app-card', () => ({
 }))
 
 vi.mock('../empty', () => ({
-  default: ({ message }: { message: string }) => {
-    return React.createElement('div', { 'data-testid': 'empty-state', 'role': 'status' }, message)
+  default: () => {
+    return React.createElement('div', { 'data-testid': 'empty-state', 'role': 'status' }, 'No apps found')
   },
 }))
 
@@ -297,115 +229,173 @@ beforeAll(() => {
 
 // Render helper wrapping with shared nuqs testing helper plus a seeded
 // systemFeatures cache so List can resolve its useSuspenseQuery.
-const renderList = (props: React.ComponentProps<typeof List> = {}, searchParams = '') => {
+const renderList = (searchParams = '') => {
   const { wrapper: SystemFeaturesWrapper } = createSystemFeaturesWrapper({
     systemFeatures: { branding: { enabled: false } },
   })
-  return renderWithNuqs(<SystemFeaturesWrapper><List {...props} /></SystemFeaturesWrapper>, { searchParams })
+  return renderWithNuqs(<SystemFeaturesWrapper><List /></SystemFeaturesWrapper>, { searchParams })
+}
+
+type AppListInfiniteOptions = {
+  input: (pageParam: number) => { query: Record<string, unknown> }
+  getNextPageParam: (lastPage: { has_more: boolean, page: number }) => number | undefined
 }
 
 describe('List', () => {
   beforeEach(() => {
     vi.clearAllMocks()
-    defaultSnippetData.pages[0]!.data = [
-      {
-        id: 'snippet-1',
-        name: 'Tone Rewriter',
-        description: 'Rewrites rough drafts into a concise, professional tone for internal stakeholder updates.',
-        type: 'node',
-        is_published: false,
-        use_count: 19,
-        icon_info: {
-          icon_type: 'emoji',
-          icon: '🪄',
-          icon_background: '#E0EAFF',
-          icon_url: '',
-        },
-        created_at: 1704067200,
-        created_by: 'user-1',
-        updated_at: 1704153600,
-        updated_by: 'user-2',
-      },
-    ]
-    defaultSnippetData.pages[0]!.total = 1
-    useTagStore.setState({
-      tagList: [{ id: 'tag-1', name: 'Test Tag', type: 'app', binding_count: 0 }],
-      showTagManagementModal: false,
-    })
     mockIsCurrentWorkspaceEditor.mockReturnValue(true)
     mockIsCurrentWorkspaceDatasetOperator.mockReturnValue(false)
-    mockIsLoadingCurrentWorkspace.mockReturnValue(false)
-    mockCanAccessSnippetsAndEvaluation.mockReturnValue(true)
     mockDragging = false
     mockOnDSLFileDropped = null
     mockServiceState.error = null
     mockServiceState.hasNextPage = false
     mockServiceState.isLoading = false
-    mockServiceState.isFetching = false
     mockServiceState.isFetchingNextPage = false
+    mockQueryState.category = 'all'
     mockQueryState.tagIDs = []
-    mockQueryState.creatorIDs = []
     mockQueryState.keywords = ''
     mockQueryState.isCreatedByMe = false
-    mockSnippetServiceState.error = null
-    mockSnippetServiceState.hasNextPage = false
-    mockSnippetServiceState.isLoading = false
-    mockSnippetServiceState.isFetching = false
-    mockSnippetServiceState.isFetchingNextPage = false
-    mockUseInfiniteAppList.mockClear()
-    mockUseInfiniteSnippetList.mockClear()
+    mockUseWorkflowOnlineUsers.mockClear()
     intersectionCallback = null
     localStorage.clear()
   })
 
-  describe('Apps Mode', () => {
-    it('should render the apps route switch, dropdown filters, and app cards', () => {
+  describe('Rendering', () => {
+    it('should render without crashing', () => {
+      renderList()
+      expect(screen.getByText('app.types.all'))!.toBeInTheDocument()
+    })
+
+    it('should render tab slider with all app types', () => {
       renderList()
 
-      expect(screen.getByRole('link', { name: 'app.studio.apps' })).toHaveAttribute('href', '/apps')
-      expect(screen.getByRole('link', { name: 'workflow.tabs.snippets' })).toHaveAttribute('href', '/snippets')
-      expect(screen.getByText('app.studio.filters.types')).toBeInTheDocument()
-      expect(screen.getByText('app.studio.filters.allCreators')).toBeInTheDocument()
-      expect(screen.getByText('common.tag.placeholder')).toBeInTheDocument()
-      expect(screen.getByTestId('app-card-app-1')).toBeInTheDocument()
-      expect(screen.getByTestId('app-card-app-2')).toBeInTheDocument()
-      expect(screen.getByTestId('new-app-card')).toBeInTheDocument()
+      expect(screen.getByText('app.types.all'))!.toBeInTheDocument()
+      expect(screen.getByText('app.types.workflow'))!.toBeInTheDocument()
+      expect(screen.getByText('app.types.advanced'))!.toBeInTheDocument()
+      expect(screen.getByText('app.types.chatbot'))!.toBeInTheDocument()
+      expect(screen.getByText('app.types.agent'))!.toBeInTheDocument()
+      expect(screen.getByText('app.types.completion'))!.toBeInTheDocument()
     })
 
-    it('should update the category query when selecting an app type from the dropdown', async () => {
-      const { onUrlUpdate } = renderList()
-
-      fireEvent.click(screen.getByText('app.studio.filters.types'))
-      fireEvent.click(await screen.findByText('app.types.workflow'))
-
-      await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const lastCall = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
-      expect(lastCall.searchParams.get('category')).toBe(AppModeEnum.WORKFLOW)
+    it('should render search input', () => {
+      renderList()
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
     })
 
-    it('should update creatorIDs when selecting a creator from the dropdown', async () => {
+    it('should render tag filter', () => {
+      renderList()
+      expect(screen.getByText('common.tag.placeholder'))!.toBeInTheDocument()
+    })
+
+    it('should render created by me checkbox', () => {
+      renderList()
+      expect(screen.getByText('app.showMyCreatedAppsOnly'))!.toBeInTheDocument()
+    })
+
+    it('should render app cards when apps exist', () => {
       renderList()
 
-      fireEvent.click(screen.getByText('app.studio.filters.allCreators'))
-      fireEvent.click(await screen.findByText('Current User'))
-
-      expect(mockSetQuery).toHaveBeenCalledTimes(1)
+      expect(screen.getByTestId('app-card-app-1'))!.toBeInTheDocument()
+      expect(screen.getByTestId('app-card-app-2'))!.toBeInTheDocument()
     })
 
-    it('should pass creator_id to the app list query when creatorIDs are selected', () => {
-      mockQueryState.creatorIDs = ['user-1', 'user-2']
+    it('should render new app card for editors', () => {
+      renderList()
+      expect(screen.getByTestId('new-app-card'))!.toBeInTheDocument()
+    })
+
+    it('should render footer when branding is disabled', () => {
+      renderList()
+      expect(screen.getByTestId('footer'))!.toBeInTheDocument()
+    })
+
+    it('should render drop DSL hint for editors', () => {
+      renderList()
+      expect(screen.getByText('app.newApp.dropDSLToCreateApp'))!.toBeInTheDocument()
+    })
+
+    it('should pass workflow app ids to online users hook', () => {
+      renderList()
+
+      expect(mockUseWorkflowOnlineUsers).toHaveBeenCalledWith({
+        appIds: ['app-2'],
+        enabled: expect.any(Boolean),
+      })
+    })
+  })
+
+  describe('Tab Navigation', () => {
+    it('should update category when workflow tab is clicked', () => {
+      renderList()
+
+      fireEvent.click(screen.getByText('app.types.workflow'))
+
+      expect(mockSetCategory).toHaveBeenCalledWith(AppModeEnum.WORKFLOW)
+    })
+
+    it('should update category when all tab is clicked', () => {
+      mockQueryState.category = AppModeEnum.WORKFLOW
+      renderList()
+
+      fireEvent.click(screen.getByText('app.types.all'))
+
+      expect(mockSetCategory).toHaveBeenCalledWith('all')
+    })
+  })
+
+  describe('Search Functionality', () => {
+    it('should render search input field', () => {
+      renderList()
+      expect(screen.getByRole('textbox'))!.toBeInTheDocument()
+    })
+
+    it('should handle search input change', () => {
+      renderList()
+
+      const input = screen.getByRole('textbox')
+      fireEvent.change(input, { target: { value: 'test search' } })
+
+      expect(mockSetKeywords).toHaveBeenCalledWith('test search')
+    })
+
+    it('should handle search clear button click', () => {
+      mockQueryState.keywords = 'existing search'
 
       renderList()
 
-      expect(mockUseInfiniteAppList).toHaveBeenCalledWith(expect.objectContaining({
-        creator_id: 'user-1,user-2',
-      }), expect.any(Object))
       const clearButton = document.querySelector('.group')
       expect(clearButton)!.toBeInTheDocument()
       if (clearButton)
         fireEvent.click(clearButton)
 
-      expect(mockSetQuery).toHaveBeenCalled()
+      expect(mockSetKeywords).toHaveBeenCalledWith('')
+    })
+  })
+
+  describe('App List Query', () => {
+    it('should build paged query input from active filters', () => {
+      mockQueryState.tagIDs = ['tag-1']
+      mockQueryState.keywords = 'sales'
+      mockQueryState.isCreatedByMe = true
+      mockQueryState.category = AppModeEnum.WORKFLOW
+
+      renderList()
+
+      const options = mockAppListInfiniteOptions.mock.calls.at(-1)?.[0] as AppListInfiniteOptions
+
+      expect(options.input(2)).toEqual({
+        query: {
+          page: 2,
+          limit: 30,
+          name: 'sales',
+          tag_ids: ['tag-1'],
+          is_created_by_me: true,
+          mode: AppModeEnum.WORKFLOW,
+        },
+      })
+      expect(options.getNextPageParam({ has_more: true, page: 2 })).toBe(3)
+      expect(options.getNextPageParam({ has_more: false, page: 2 })).toBeUndefined()
     })
   })
 
@@ -425,10 +415,10 @@ describe('List', () => {
     it('should handle checkbox change', () => {
       renderList()
 
-      const checkbox = screen.getByTestId('checkbox-undefined')
+      const checkbox = screen.getByRole('checkbox', { name: 'app.showMyCreatedAppsOnly' })
       fireEvent.click(checkbox)
 
-      expect(mockSetQuery).toHaveBeenCalled()
+      expect(mockSetIsCreatedByMe).toHaveBeenCalledWith(true)
     })
   })
 
@@ -522,8 +512,8 @@ describe('List', () => {
       expect(screen.getByText('app.types.completion'))!.toBeInTheDocument()
     })
 
-    it('should update URL for each app type tab click', async () => {
-      const { onUrlUpdate } = renderList()
+    it('should update category for each app type tab click', () => {
+      renderList()
 
       const appTypeTexts = [
         { mode: AppModeEnum.WORKFLOW, text: 'app.types.workflow' },
@@ -534,11 +524,9 @@ describe('List', () => {
       ]
 
       for (const { mode, text } of appTypeTexts) {
-        onUrlUpdate.mockClear()
+        mockSetCategory.mockClear()
         fireEvent.click(screen.getByText(text))
-        await vi.waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-        const lastCall = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
-        expect(lastCall.searchParams.get('category')).toBe(mode)
+        expect(mockSetCategory).toHaveBeenCalledWith(mode)
       }
     })
   })
@@ -591,40 +579,19 @@ describe('List', () => {
       expect(screen.getByTestId('create-dsl-modal'))!.toBeInTheDocument()
 
       fireEvent.click(screen.getByTestId('close-dsl-modal'))
+
       expect(screen.queryByTestId('create-dsl-modal')).not.toBeInTheDocument()
     })
 
-    it('should hide the snippets route switch when snippet access is unavailable', () => {
-      mockCanAccessSnippetsAndEvaluation.mockReturnValue(false)
-
+    it('should close DSL modal and refetch when onSuccess is called', () => {
       renderList()
 
-      expect(screen.getByRole('link', { name: 'app.studio.apps' })).toHaveAttribute('href', '/apps')
-      expect(screen.queryByRole('link', { name: 'workflow.tabs.snippets' })).not.toBeInTheDocument()
-    })
-  })
-
-  describe('Snippets Mode', () => {
-    it('should render the snippets create card and snippet card from the real query hook', () => {
-      renderList({ pageType: 'snippets' })
-
-      expect(screen.getByText('snippet.create')).toBeInTheDocument()
-      expect(screen.getByText('Tone Rewriter')).toBeInTheDocument()
-      expect(screen.getByText('Rewrites rough drafts into a concise, professional tone for internal stakeholder updates.')).toBeInTheDocument()
-      expect(screen.getByRole('link', { name: /Tone Rewriter/i })).toHaveAttribute('href', '/snippets/snippet-1/orchestrate')
-      expect(screen.queryByTestId('new-app-card')).not.toBeInTheDocument()
-      expect(screen.queryByTestId('app-card-app-1')).not.toBeInTheDocument()
-    })
-
-    it('should request the next snippet page when the infinite-scroll anchor intersects', () => {
-      mockSnippetServiceState.hasNextPage = true
-      renderList({ pageType: 'snippets' })
-
+      const mockFile = new File(['test content'], 'test.yml', { type: 'application/yaml' })
       act(() => {
-        intersectionCallback?.([{ isIntersecting: true } as IntersectionObserverEntry], {} as IntersectionObserver)
+        if (mockOnDSLFileDropped)
+          mockOnDSLFileDropped(mockFile)
       })
 
-      expect(mockFetchSnippetNextPage).toHaveBeenCalled()
       expect(screen.getByTestId('create-dsl-modal'))!.toBeInTheDocument()
 
       fireEvent.click(screen.getByTestId('success-dsl-modal'))
@@ -651,43 +618,40 @@ describe('List', () => {
       expect(mockFetchNextPage).toHaveBeenCalled()
     })
 
-    it('should not render app-only controls in snippets mode', () => {
-      renderList({ pageType: 'snippets' })
+    it('should not call fetchNextPage when not intersecting', () => {
+      mockServiceState.hasNextPage = true
+      renderList()
 
-      expect(screen.queryByText('app.studio.filters.types')).not.toBeInTheDocument()
-      expect(screen.queryByText('common.tag.placeholder')).not.toBeInTheDocument()
-      expect(screen.queryByText('app.newApp.dropDSLToCreateApp')).not.toBeInTheDocument()
+      if (intersectionCallback) {
+        act(() => {
+          intersectionCallback!(
+            [{ isIntersecting: false } as IntersectionObserverEntry],
+            {} as IntersectionObserver,
+          )
+        })
+      }
+
+      expect(mockFetchNextPage).not.toHaveBeenCalled()
     })
 
-    it('should pass creator_id to the snippet list query when creatorIDs are selected', () => {
-      mockQueryState.creatorIDs = ['user-1', 'user-2']
+    it('should not call fetchNextPage when loading', () => {
+      mockServiceState.hasNextPage = true
+      mockServiceState.isLoading = true
+      renderList()
 
-      renderList({ pageType: 'snippets' })
+      if (intersectionCallback) {
+        act(() => {
+          intersectionCallback!(
+            [{ isIntersecting: true } as IntersectionObserverEntry],
+            {} as IntersectionObserver,
+          )
+        })
+      }
 
-      expect(mockUseInfiniteSnippetList).toHaveBeenCalledWith(expect.objectContaining({
-        creator_id: 'user-1,user-2',
-      }), expect.any(Object))
-    })
-
-    it('should not fetch the next snippet page when no more data is available', () => {
-      renderList({ pageType: 'snippets' })
-
-      act(() => {
-        intersectionCallback?.([{ isIntersecting: true } as IntersectionObserverEntry], {} as IntersectionObserver)
-      })
-
-      expect(mockFetchSnippetNextPage).not.toHaveBeenCalled()
-    })
-
-    it('should reuse the shared empty state when no snippets are available', () => {
-      defaultSnippetData.pages[0]!.data = []
-      defaultSnippetData.pages[0]!.total = 0
-
-      renderList({ pageType: 'snippets' })
-
-      expect(screen.getByTestId('empty-state')).toHaveTextContent('workflow.tabs.noSnippetsFound')
+      expect(mockFetchNextPage).not.toHaveBeenCalled()
     })
   })
+
   describe('Error State', () => {
     it('should handle error state in useEffect', () => {
       mockServiceState.error = new Error('Test error')
diff --git a/web/app/components/apps/app-card.tsx b/web/app/components/apps/app-card.tsx
index 80aab3ce4d..f623f8ce53 100644
--- a/web/app/components/apps/app-card.tsx
+++ b/web/app/components/apps/app-card.tsx
@@ -1,7 +1,6 @@
 'use client'
 
 import type { DuplicateAppModalProps } from '@/app/components/app/duplicate-modal'
-import type { Tag } from '@/app/components/base/tag-management/constant'
 import type { CreateAppModalProps } from '@/app/components/explore/create-app-modal'
 import type { EnvironmentVariable } from '@/app/components/workflow/types'
 import type { WorkflowOnlineUser } from '@/models/app'
@@ -24,19 +23,23 @@ import {
   DropdownMenuTrigger,
 } from '@langgenius/dify-ui/dropdown-menu'
 import { toast } from '@langgenius/dify-ui/toast'
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from '@langgenius/dify-ui/tooltip'
 import { useSuspenseQuery } from '@tanstack/react-query'
 import * as React from 'react'
-import { useCallback, useEffect, useId, useMemo, useState } from 'react'
+import { useCallback, useId, useMemo, useState } from 'react'
 import { Trans, useTranslation } from 'react-i18next'
 import { AppTypeIcon } from '@/app/components/app/type-selector'
 import AppIcon from '@/app/components/base/app-icon'
 import Input from '@/app/components/base/input'
-import TagSelector from '@/app/components/base/tag-management/selector'
-import Tooltip from '@/app/components/base/tooltip'
 import { UserAvatarList } from '@/app/components/base/user-avatar-list'
 import { NEED_REFRESH_APP_LIST_KEY } from '@/config'
 import { useAppContext } from '@/context/app-context'
 import { useProviderContext } from '@/context/provider-context'
+import { AppCardTags } from '@/features/tag-management/components/app-card-tags'
 import { useAsyncWindowOpen } from '@/hooks/use-async-window-open'
 import { AccessMode } from '@/models/access-control'
 import dynamic from '@/next/dynamic'
@@ -73,6 +76,7 @@ type AppCardProps = {
   app: App
   onlineUsers?: WorkflowOnlineUser[]
   onRefresh?: () => void
+  onOpenTagManagement?: () => void
 }
 
 type AppCardOperationsMenuProps = {
@@ -203,7 +207,7 @@ const AppCardOperationsMenuContent: React.FC<AppCardOperationsMenuContentProps>
   )
 }
 
-const AppCard = ({ app, onlineUsers = [], onRefresh }: AppCardProps) => {
+const AppCard = ({ app, onlineUsers = [], onRefresh, onOpenTagManagement = () => {} }: AppCardProps) => {
   const { t } = useTranslation()
   const deleteAppNameInputId = useId()
   const { data: systemFeatures } = useSuspenseQuery(systemFeaturesQueryOptions())
@@ -229,8 +233,9 @@ const AppCard = ({ app, onlineUsers = [], onRefresh }: AppCardProps) => {
       setShowConfirmDelete(false)
       setConfirmDeleteInput('')
     }
-    catch (e: any) {
-      toast.error(`${t('appDeleteFailed', { ns: 'app' })}${'message' in e ? `: ${e.message}` : ''}`)
+    catch (e) {
+      const message = e instanceof Error ? e.message : ''
+      toast.error(`${t('appDeleteFailed', { ns: 'app' })}${message ? `: ${message}` : ''}`)
     }
   }, [app.id, mutateDeleteApp, onPlanInfoChanged, t])
 
@@ -313,8 +318,8 @@ const AppCard = ({ app, onlineUsers = [], onRefresh }: AppCardProps) => {
       if (onRefresh)
         onRefresh()
     }
-    catch (e: any) {
-      toast.error(e.message || t('editFailed', { ns: 'app' }))
+    catch (e) {
+      toast.error(e instanceof Error ? e.message : t('editFailed', { ns: 'app' }))
     }
   }, [app.id, onRefresh, t])
 
@@ -391,11 +396,6 @@ const AppCard = ({ app, onlineUsers = [], onRefresh }: AppCardProps) => {
   const shouldShowAccessControlOption = systemFeatures.webapp_auth.enabled && isCurrentWorkspaceEditor
   const operationsMenuWidthClassName = shouldShowSwitchOption ? 'w-[256px]' : 'w-[216px]'
 
-  const [tags, setTags] = useState<Tag[]>(app.tags)
-  useEffect(() => {
-    setTags(app.tags)
-  }, [app.tags])
-
   const EditTimeText = useMemo(() => {
     const timeText = formatTime({
       date: (app.updated_at || app.created_at) * 1000,
@@ -425,7 +425,7 @@ const AppCard = ({ app, onlineUsers = [], onRefresh }: AppCardProps) => {
           e.preventDefault()
           getRedirection(isCurrentWorkspaceEditor, app, push)
         }}
-        className="group relative col-span-1 inline-flex h-[160px] cursor-pointer flex-col rounded-xl border border-solid border-components-card-border bg-components-card-bg shadow-sm transition-all duration-200 ease-in-out hover:shadow-lg"
+        className="group relative col-span-1 inline-flex h-[160px] cursor-pointer flex-col rounded-xl border border-solid border-components-card-border bg-components-card-bg shadow-sm transition-shadow duration-200 ease-in-out hover:shadow-lg"
       >
         <div className="flex h-[66px] shrink-0 grow-0 items-center gap-3 px-[14px] pt-[14px] pb-3">
           <div className="relative shrink-0">
@@ -454,23 +454,39 @@ const AppCard = ({ app, onlineUsers = [], onRefresh }: AppCardProps) => {
             )}
             <div className="flex h-5 w-5 items-center justify-center">
               {app.access_mode === AccessMode.PUBLIC && (
-                <Tooltip asChild={false} popupContent={t('accessItemsDescription.anyone', { ns: 'app' })}>
-                  <span aria-hidden className="i-ri-global-line h-4 w-4 text-text-quaternary" />
+                <Tooltip>
+                  <TooltipTrigger
+                    aria-label={t('accessItemsDescription.anyone', { ns: 'app' })}
+                    render={<span title={t('accessItemsDescription.anyone', { ns: 'app' })} className="i-ri-global-line h-4 w-4 text-text-quaternary" />}
+                  />
+                  <TooltipContent>{t('accessItemsDescription.anyone', { ns: 'app' })}</TooltipContent>
                 </Tooltip>
               )}
               {app.access_mode === AccessMode.SPECIFIC_GROUPS_MEMBERS && (
-                <Tooltip asChild={false} popupContent={t('accessItemsDescription.specific', { ns: 'app' })}>
-                  <span aria-hidden className="i-ri-lock-line h-4 w-4 text-text-quaternary" />
+                <Tooltip>
+                  <TooltipTrigger
+                    aria-label={t('accessItemsDescription.specific', { ns: 'app' })}
+                    render={<span title={t('accessItemsDescription.specific', { ns: 'app' })} className="i-ri-lock-line h-4 w-4 text-text-quaternary" />}
+                  />
+                  <TooltipContent>{t('accessItemsDescription.specific', { ns: 'app' })}</TooltipContent>
                 </Tooltip>
               )}
               {app.access_mode === AccessMode.ORGANIZATION && (
-                <Tooltip asChild={false} popupContent={t('accessItemsDescription.organization', { ns: 'app' })}>
-                  <span aria-hidden className="i-ri-building-line h-4 w-4 text-text-quaternary" />
+                <Tooltip>
+                  <TooltipTrigger
+                    aria-label={t('accessItemsDescription.organization', { ns: 'app' })}
+                    render={<span title={t('accessItemsDescription.organization', { ns: 'app' })} className="i-ri-building-line h-4 w-4 text-text-quaternary" />}
+                  />
+                  <TooltipContent>{t('accessItemsDescription.organization', { ns: 'app' })}</TooltipContent>
                 </Tooltip>
               )}
               {app.access_mode === AccessMode.EXTERNAL_MEMBERS && (
-                <Tooltip asChild={false} popupContent={t('accessItemsDescription.external', { ns: 'app' })}>
-                  <span aria-hidden className="i-ri-verified-badge-line h-4 w-4 text-text-quaternary" />
+                <Tooltip>
+                  <TooltipTrigger
+                    aria-label={t('accessItemsDescription.external', { ns: 'app' })}
+                    render={<span title={t('accessItemsDescription.external', { ns: 'app' })} className="i-ri-verified-badge-line h-4 w-4 text-text-quaternary" />}
+                  />
+                  <TooltipContent>{t('accessItemsDescription.external', { ns: 'app' })}</TooltipContent>
                 </Tooltip>
               )}
             </div>
@@ -494,15 +510,12 @@ const AppCard = ({ app, onlineUsers = [], onRefresh }: AppCardProps) => {
                   e.preventDefault()
                 }}
               >
-                <div className="mr-[41px] w-full grow">
-                  <TagSelector
-                    position="bl"
-                    type="app"
-                    targetID={app.id}
-                    value={tags.map(tag => tag.id)}
-                    selectedTags={tags}
-                    onCacheUpdate={setTags}
-                    onChange={onRefresh}
+                <div className="mr-[41px] min-w-0 grow overflow-hidden">
+                  <AppCardTags
+                    appId={app.id}
+                    tags={app.tags}
+                    onOpenTagManagement={onOpenTagManagement}
+                    onTagsChange={onRefresh}
                   />
                 </div>
               </div>
@@ -511,7 +524,7 @@ const AppCard = ({ app, onlineUsers = [], onRefresh }: AppCardProps) => {
                   'absolute top-1/2 right-[6px] flex -translate-y-1/2 items-center transition-opacity',
                   isOperationsMenuOpen
                     ? 'pointer-events-auto opacity-100'
-                    : 'pointer-events-none opacity-0 group-hover:pointer-events-auto group-hover:opacity-100',
+                    : 'pointer-events-none opacity-0 group-focus-within:pointer-events-auto group-focus-within:opacity-100 group-hover:pointer-events-auto group-hover:opacity-100',
                 )}
               >
                 <div className="mx-1 h-[14px] w-px shrink-0 bg-divider-regular" />
@@ -520,7 +533,7 @@ const AppCard = ({ app, onlineUsers = [], onRefresh }: AppCardProps) => {
                     aria-label={t('operation.more', { ns: 'common' })}
                     className={cn(
                       isOperationsMenuOpen ? 'bg-state-base-hover shadow-none' : 'bg-transparent',
-                      'flex h-8 w-8 items-center justify-center rounded-md border-none p-2 hover:bg-state-base-hover',
+                      'flex h-8 w-8 items-center justify-center rounded-md border-none p-2 hover:bg-state-base-hover focus-visible:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:ring-inset',
                     )}
                     onClick={(e) => {
                       e.stopPropagation()
@@ -532,42 +545,40 @@ const AppCard = ({ app, onlineUsers = [], onRefresh }: AppCardProps) => {
                       <span aria-hidden className="i-ri-more-fill h-4 w-4 text-text-tertiary" />
                     </div>
                   </DropdownMenuTrigger>
-                  {isOperationsMenuOpen && (
-                    <DropdownMenuContent
-                      placement="bottom-end"
-                      sideOffset={4}
-                      popupClassName={operationsMenuWidthClassName}
-                    >
-                      {systemFeatures.webapp_auth.enabled
-                        ? (
-                            <AppCardOperationsMenuContent
-                              app={app}
-                              shouldShowSwitchOption={shouldShowSwitchOption}
-                              shouldShowAccessControlOption={shouldShowAccessControlOption}
-                              onEdit={handleShowEditModal}
-                              onDuplicate={handleShowDuplicateModal}
-                              onExport={exportCheck}
-                              onSwitch={handleShowSwitchModal}
-                              onDelete={handleShowDeleteConfirm}
-                              onAccessControl={handleShowAccessControl}
-                            />
-                          )
-                        : (
-                            <AppCardOperationsMenu
-                              app={app}
-                              shouldShowSwitchOption={shouldShowSwitchOption}
-                              shouldShowOpenInExploreOption={!app.has_draft_trigger}
-                              shouldShowAccessControlOption={shouldShowAccessControlOption}
-                              onEdit={handleShowEditModal}
-                              onDuplicate={handleShowDuplicateModal}
-                              onExport={exportCheck}
-                              onSwitch={handleShowSwitchModal}
-                              onDelete={handleShowDeleteConfirm}
-                              onAccessControl={handleShowAccessControl}
-                            />
-                          )}
-                    </DropdownMenuContent>
-                  )}
+                  <DropdownMenuContent
+                    placement="bottom-end"
+                    sideOffset={4}
+                    popupClassName={operationsMenuWidthClassName}
+                  >
+                    {systemFeatures.webapp_auth.enabled
+                      ? (
+                          <AppCardOperationsMenuContent
+                            app={app}
+                            shouldShowSwitchOption={shouldShowSwitchOption}
+                            shouldShowAccessControlOption={shouldShowAccessControlOption}
+                            onEdit={handleShowEditModal}
+                            onDuplicate={handleShowDuplicateModal}
+                            onExport={exportCheck}
+                            onSwitch={handleShowSwitchModal}
+                            onDelete={handleShowDeleteConfirm}
+                            onAccessControl={handleShowAccessControl}
+                          />
+                        )
+                      : (
+                          <AppCardOperationsMenu
+                            app={app}
+                            shouldShowSwitchOption={shouldShowSwitchOption}
+                            shouldShowOpenInExploreOption={!app.has_draft_trigger}
+                            shouldShowAccessControlOption={shouldShowAccessControlOption}
+                            onEdit={handleShowEditModal}
+                            onDuplicate={handleShowDuplicateModal}
+                            onExport={exportCheck}
+                            onSwitch={handleShowSwitchModal}
+                            onDelete={handleShowDeleteConfirm}
+                            onAccessControl={handleShowAccessControl}
+                          />
+                        )}
+                  </DropdownMenuContent>
                 </DropdownMenu>
               </div>
             </>
diff --git a/web/app/components/apps/constants.ts b/web/app/components/apps/constants.ts
new file mode 100644
index 0000000000..95c3dcff42
--- /dev/null
+++ b/web/app/components/apps/constants.ts
@@ -0,0 +1 @@
+export const APP_LIST_SEARCH_DEBOUNCE_MS = 500
diff --git a/web/app/components/apps/empty.tsx b/web/app/components/apps/empty.tsx
index 0876101d79..0dee3c908a 100644
--- a/web/app/components/apps/empty.tsx
+++ b/web/app/components/apps/empty.tsx
@@ -1,4 +1,5 @@
 import * as React from 'react'
+import { useTranslation } from 'react-i18next'
 
 const DefaultCards = React.memo(() => {
   const renderArray = Array.from({ length: 36 })
@@ -16,17 +17,15 @@ const DefaultCards = React.memo(() => {
   )
 })
 
-type Props = {
-  message: string
-}
+const Empty = () => {
+  const { t } = useTranslation()
 
-const Empty = ({ message }: Props) => {
   return (
     <>
       <DefaultCards />
       <div className="pointer-events-none absolute inset-0 z-20 flex items-center justify-center bg-linear-to-t from-background-body to-transparent">
         <span className="system-md-medium text-text-tertiary">
-          {message}
+          {t('newApp.noAppsFound', { ns: 'app' })}
         </span>
       </div>
     </>
diff --git a/web/app/components/apps/hooks/__tests__/use-apps-query-state.spec.tsx b/web/app/components/apps/hooks/__tests__/use-apps-query-state.spec.tsx
index d5734cce07..782f6ec353 100644
--- a/web/app/components/apps/hooks/__tests__/use-apps-query-state.spec.tsx
+++ b/web/app/components/apps/hooks/__tests__/use-apps-query-state.spec.tsx
@@ -1,6 +1,8 @@
 import { act, waitFor } from '@testing-library/react'
 import { renderHookWithNuqs } from '@/test/nuqs-testing'
-import useAppsQueryState from '../use-apps-query-state'
+import { AppModeEnum } from '@/types/app'
+import { APP_LIST_SEARCH_DEBOUNCE_MS } from '../../constants'
+import { useAppsQueryState } from '../use-apps-query-state'
 
 const renderWithAdapter = (searchParams = '') => {
   return renderHookWithNuqs(() => useAppsQueryState(), { searchParams })
@@ -11,261 +13,161 @@ describe('useAppsQueryState', () => {
     vi.clearAllMocks()
   })
 
-  describe('Initialization', () => {
-    it('should expose query and setQuery when initialized', () => {
-      const { result } = renderWithAdapter()
+  it('should expose app list query state actions', () => {
+    const { result } = renderWithAdapter()
 
-      expect(result.current.query).toBeDefined()
-      expect(typeof result.current.setQuery).toBe('function')
+    expect(result.current.query).toEqual({
+      category: 'all',
+      tagIDs: [],
+      keywords: '',
+      isCreatedByMe: false,
     })
+    expect(typeof result.current.setCategory).toBe('function')
+    expect(typeof result.current.setKeywords).toBe('function')
+    expect(typeof result.current.setTagIDs).toBe('function')
+    expect(typeof result.current.setIsCreatedByMe).toBe('function')
+  })
 
-    it('should default to empty filters when search params are missing', () => {
-      const { result } = renderWithAdapter()
+  it('should parse app list filters from URL', () => {
+    const { result } = renderWithAdapter(
+      '?category=workflow&tagIDs=tag1;tag2&keywords=search+term&isCreatedByMe=true',
+    )
 
-      expect(result.current.query.tagIDs).toBeUndefined()
-      expect(result.current.query.creatorIDs).toBeUndefined()
-      expect(result.current.query.keywords).toBeUndefined()
-      expect(result.current.query.isCreatedByMe).toBe(false)
+    expect(result.current.query).toEqual({
+      category: AppModeEnum.WORKFLOW,
+      tagIDs: ['tag1', 'tag2'],
+      keywords: 'search term',
+      isCreatedByMe: true,
     })
   })
 
-  describe('Parsing search params', () => {
-    it('should parse tagIDs when URL includes tagIDs', () => {
-      const { result } = renderWithAdapter('?tagIDs=tag1;tag2;tag3')
+  it('should update category URL state', async () => {
+    const { result, onUrlUpdate } = renderWithAdapter()
 
-      expect(result.current.query.tagIDs).toEqual(['tag1', 'tag2', 'tag3'])
+    act(() => {
+      result.current.setCategory(AppModeEnum.WORKFLOW)
     })
 
-    it('should parse keywords when URL includes keywords', () => {
-      const { result } = renderWithAdapter('?keywords=search+term')
-
-      expect(result.current.query.keywords).toBe('search term')
-    })
-
-    it('should parse creatorIDs when URL includes creatorIDs', () => {
-      const { result } = renderWithAdapter('?creatorIDs=user-1;user-2')
-
-      expect(result.current.query.creatorIDs).toEqual(['user-1', 'user-2'])
-    })
-
-    it('should parse isCreatedByMe when URL includes true value', () => {
-      const { result } = renderWithAdapter('?isCreatedByMe=true')
-
-      expect(result.current.query.isCreatedByMe).toBe(true)
-    })
-
-    it('should parse all params when URL includes multiple filters', () => {
-      const { result } = renderWithAdapter(
-        '?tagIDs=tag1;tag2&creatorIDs=user-1;user-2&keywords=test&isCreatedByMe=true',
-      )
-
-      expect(result.current.query.tagIDs).toEqual(['tag1', 'tag2'])
-      expect(result.current.query.creatorIDs).toEqual(['user-1', 'user-2'])
-      expect(result.current.query.keywords).toBe('test')
-      expect(result.current.query.isCreatedByMe).toBe(true)
-    })
+    await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
+    const update = onUrlUpdate.mock.calls.at(-1)![0]
+    expect(result.current.query.category).toBe(AppModeEnum.WORKFLOW)
+    expect(update.searchParams.get('category')).toBe(AppModeEnum.WORKFLOW)
+    expect(update.options.history).toBe('push')
   })
 
-  describe('Updating query state', () => {
-    it('should update keywords when setQuery receives keywords', () => {
-      const { result } = renderWithAdapter()
+  it('should remove category from URL when set to all', async () => {
+    const { result, onUrlUpdate } = renderWithAdapter('?category=workflow')
 
-      act(() => {
-        result.current.setQuery({ keywords: 'new search' })
-      })
-
-      expect(result.current.query.keywords).toBe('new search')
+    act(() => {
+      result.current.setCategory('all')
     })
 
-    it('should update tagIDs when setQuery receives tagIDs', () => {
-      const { result } = renderWithAdapter()
-
-      act(() => {
-        result.current.setQuery({ tagIDs: ['tag1', 'tag2'] })
-      })
-
-      expect(result.current.query.tagIDs).toEqual(['tag1', 'tag2'])
-    })
-
-    it('should update creatorIDs when setQuery receives creatorIDs', () => {
-      const { result } = renderWithAdapter()
-
-      act(() => {
-        result.current.setQuery({ creatorIDs: ['user-1', 'user-2'] })
-      })
-
-      expect(result.current.query.creatorIDs).toEqual(['user-1', 'user-2'])
-    })
-
-    it('should update isCreatedByMe when setQuery receives true', () => {
-      const { result } = renderWithAdapter()
-
-      act(() => {
-        result.current.setQuery({ isCreatedByMe: true })
-      })
-
-      expect(result.current.query.isCreatedByMe).toBe(true)
-    })
-
-    it('should support partial updates when setQuery uses callback', () => {
-      const { result } = renderWithAdapter()
-
-      act(() => {
-        result.current.setQuery({ keywords: 'initial' })
-      })
-
-      act(() => {
-        result.current.setQuery(prev => ({ ...prev, isCreatedByMe: true }))
-      })
-
-      expect(result.current.query.keywords).toBe('initial')
-      expect(result.current.query.isCreatedByMe).toBe(true)
-    })
+    await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
+    const update = onUrlUpdate.mock.calls.at(-1)![0]
+    expect(result.current.query.category).toBe('all')
+    expect(update.searchParams.has('category')).toBe(false)
   })
 
-  describe('URL synchronization', () => {
-    it('should sync keywords to URL when keywords change', async () => {
+  it('should update keywords state immediately while debouncing URL writes', async () => {
+    vi.useFakeTimers()
+    try {
       const { result, onUrlUpdate } = renderWithAdapter()
 
       act(() => {
-        result.current.setQuery({ keywords: 'search' })
+        result.current.setKeywords('search')
       })
 
-      await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
+      expect(result.current.query.keywords).toBe('search')
+      expect(onUrlUpdate).not.toHaveBeenCalled()
+
+      await act(async () => {
+        await vi.advanceTimersByTimeAsync(APP_LIST_SEARCH_DEBOUNCE_MS + 100)
+      })
+
+      expect(onUrlUpdate).toHaveBeenCalled()
+      const update = onUrlUpdate.mock.calls.at(-1)![0]
       expect(update.searchParams.get('keywords')).toBe('search')
-      expect(update.options.history).toBe('push')
-    })
+    }
+    finally {
+      vi.useRealTimers()
+    }
+  })
 
-    it('should sync tagIDs to URL when tagIDs change', async () => {
-      const { result, onUrlUpdate } = renderWithAdapter()
-
-      act(() => {
-        result.current.setQuery({ tagIDs: ['tag1', 'tag2'] })
-      })
-
-      await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
-      expect(update.searchParams.get('tagIDs')).toBe('tag1;tag2')
-    })
-
-    it('should sync creatorIDs to URL when creatorIDs change', async () => {
-      const { result, onUrlUpdate } = renderWithAdapter()
-
-      act(() => {
-        result.current.setQuery({ creatorIDs: ['user-1', 'user-2'] })
-      })
-
-      await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
-      expect(update.searchParams.get('creatorIDs')).toBe('user-1;user-2')
-    })
-
-    it('should sync isCreatedByMe to URL when enabled', async () => {
-      const { result, onUrlUpdate } = renderWithAdapter()
-
-      act(() => {
-        result.current.setQuery({ isCreatedByMe: true })
-      })
-
-      await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
-      expect(update.searchParams.get('isCreatedByMe')).toBe('true')
-    })
-
-    it('should remove keywords from URL when keywords are cleared', async () => {
+  it('should remove keywords from URL when cleared', async () => {
+    vi.useFakeTimers()
+    try {
       const { result, onUrlUpdate } = renderWithAdapter('?keywords=existing')
 
       act(() => {
-        result.current.setQuery({ keywords: '' })
+        result.current.setKeywords('')
       })
 
-      await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
+      expect(result.current.query.keywords).toBe('')
+
+      await act(async () => {
+        await vi.advanceTimersByTimeAsync(APP_LIST_SEARCH_DEBOUNCE_MS + 100)
+      })
+
+      expect(onUrlUpdate).toHaveBeenCalled()
+      const update = onUrlUpdate.mock.calls.at(-1)![0]
       expect(update.searchParams.has('keywords')).toBe(false)
-    })
-
-    it('should remove tagIDs from URL when tagIDs are empty', async () => {
-      const { result, onUrlUpdate } = renderWithAdapter('?tagIDs=tag1;tag2')
-
-      act(() => {
-        result.current.setQuery({ tagIDs: [] })
-      })
-
-      await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
-      expect(update.searchParams.has('tagIDs')).toBe(false)
-    })
-
-    it('should remove creatorIDs from URL when creatorIDs are empty', async () => {
-      const { result, onUrlUpdate } = renderWithAdapter('?creatorIDs=user-1;user-2')
-
-      act(() => {
-        result.current.setQuery({ creatorIDs: [] })
-      })
-
-      await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1][0]
-      expect(update.searchParams.has('creatorIDs')).toBe(false)
-    })
-
-    it('should remove isCreatedByMe from URL when disabled', async () => {
-      const { result, onUrlUpdate } = renderWithAdapter('?isCreatedByMe=true')
-
-      act(() => {
-        result.current.setQuery({ isCreatedByMe: false })
-      })
-
-      await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
-      const update = onUrlUpdate.mock.calls[onUrlUpdate.mock.calls.length - 1]![0]
-      expect(update.searchParams.has('isCreatedByMe')).toBe(false)
-    })
+    }
+    finally {
+      vi.useRealTimers()
+    }
   })
 
-  describe('Edge cases', () => {
-    it('should treat empty tagIDs as empty list when URL param is empty', () => {
-      const { result } = renderWithAdapter('?tagIDs=')
+  it('should update tag filter URL state', async () => {
+    const { result, onUrlUpdate } = renderWithAdapter()
 
-      expect(result.current.query.tagIDs).toEqual([])
+    act(() => {
+      result.current.setTagIDs(['tag1', 'tag2'])
     })
 
-    it('should treat empty keywords as undefined when URL param is empty', () => {
-      const { result } = renderWithAdapter('?keywords=')
-
-      expect(result.current.query.keywords).toBeUndefined()
-    })
-
-    it('should decode keywords with spaces when URL contains encoded spaces', () => {
-      const { result } = renderWithAdapter('?keywords=test+with+spaces')
-
-      expect(result.current.query.keywords).toBe('test with spaces')
-    })
+    await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
+    const update = onUrlUpdate.mock.calls.at(-1)![0]
+    expect(result.current.query.tagIDs).toEqual(['tag1', 'tag2'])
+    expect(update.searchParams.get('tagIDs')).toBe('tag1;tag2')
+    expect(update.options.history).toBe('push')
   })
 
-  describe('Integration scenarios', () => {
-    it('should keep accumulated filters when updates are sequential', () => {
-      const { result } = renderWithAdapter()
+  it('should remove tagIDs from URL when empty', async () => {
+    const { result, onUrlUpdate } = renderWithAdapter('?tagIDs=tag1;tag2')
 
-      act(() => {
-        result.current.setQuery({ keywords: 'first' })
-      })
-
-      act(() => {
-        result.current.setQuery(prev => ({ ...prev, tagIDs: ['tag1'] }))
-      })
-
-      act(() => {
-        result.current.setQuery(prev => ({ ...prev, creatorIDs: ['user-1'] }))
-      })
-
-      act(() => {
-        result.current.setQuery(prev => ({ ...prev, isCreatedByMe: true }))
-      })
-
-      expect(result.current.query.keywords).toBe('first')
-      expect(result.current.query.tagIDs).toEqual(['tag1'])
-      expect(result.current.query.creatorIDs).toEqual(['user-1'])
-      expect(result.current.query.isCreatedByMe).toBe(true)
+    act(() => {
+      result.current.setTagIDs([])
     })
+
+    await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
+    const update = onUrlUpdate.mock.calls.at(-1)![0]
+    expect(result.current.query.tagIDs).toEqual([])
+    expect(update.searchParams.has('tagIDs')).toBe(false)
+  })
+
+  it('should update created-by-me URL state', async () => {
+    const { result, onUrlUpdate } = renderWithAdapter()
+
+    act(() => {
+      result.current.setIsCreatedByMe(true)
+    })
+
+    await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
+    const update = onUrlUpdate.mock.calls.at(-1)![0]
+    expect(result.current.query.isCreatedByMe).toBe(true)
+    expect(update.searchParams.get('isCreatedByMe')).toBe('true')
+    expect(update.options.history).toBe('push')
+  })
+
+  it('should remove isCreatedByMe from URL when disabled', async () => {
+    const { result, onUrlUpdate } = renderWithAdapter('?isCreatedByMe=true')
+
+    act(() => {
+      result.current.setIsCreatedByMe(false)
+    })
+
+    await waitFor(() => expect(onUrlUpdate).toHaveBeenCalled())
+    const update = onUrlUpdate.mock.calls.at(-1)![0]
+    expect(result.current.query.isCreatedByMe).toBe(false)
+    expect(update.searchParams.has('isCreatedByMe')).toBe(false)
   })
 })
diff --git a/web/app/components/apps/hooks/use-apps-query-state.ts b/web/app/components/apps/hooks/use-apps-query-state.ts
index 50ae13a425..a0109eb061 100644
--- a/web/app/components/apps/hooks/use-apps-query-state.ts
+++ b/web/app/components/apps/hooks/use-apps-query-state.ts
@@ -1,63 +1,56 @@
-import { parseAsArrayOf, parseAsBoolean, parseAsString, useQueryStates } from 'nuqs'
+import { debounce, parseAsArrayOf, parseAsBoolean, parseAsString, parseAsStringLiteral, useQueryStates } from 'nuqs'
 import { useCallback, useMemo } from 'react'
+import { AppModes } from '@/types/app'
+import { APP_LIST_SEARCH_DEBOUNCE_MS } from '../constants'
 
-type AppsQuery = {
-  tagIDs?: string[]
-  creatorIDs?: string[]
-  keywords?: string
-  isCreatedByMe?: boolean
+const APP_LIST_CATEGORY_VALUES = ['all', ...AppModes] as const
+export type AppListCategory = typeof APP_LIST_CATEGORY_VALUES[number]
+
+const appListCategorySet = new Set<string>(APP_LIST_CATEGORY_VALUES)
+
+export const isAppListCategory = (value: string): value is AppListCategory => {
+  return appListCategorySet.has(value)
 }
 
-const normalizeKeywords = (value: string | null) => value || undefined
-
-function useAppsQueryState() {
-  const [urlQuery, setUrlQuery] = useQueryStates(
-    {
-      tagIDs: parseAsArrayOf(parseAsString, ';'),
-      creatorIDs: parseAsArrayOf(parseAsString, ';'),
-      keywords: parseAsString,
-      isCreatedByMe: parseAsBoolean,
-    },
-    {
-      history: 'push',
-    },
-  )
-
-  const query = useMemo<AppsQuery>(() => ({
-    tagIDs: urlQuery.tagIDs ?? undefined,
-    creatorIDs: urlQuery.creatorIDs ?? undefined,
-    keywords: normalizeKeywords(urlQuery.keywords),
-    isCreatedByMe: urlQuery.isCreatedByMe ?? false,
-  }), [urlQuery.creatorIDs, urlQuery.isCreatedByMe, urlQuery.keywords, urlQuery.tagIDs])
-
-  const setQuery = useCallback((next: AppsQuery | ((prev: AppsQuery) => AppsQuery)) => {
-    const buildPatch = (patch: AppsQuery) => {
-      const result: Partial<typeof urlQuery> = {}
-      if ('tagIDs' in patch)
-        result.tagIDs = patch.tagIDs && patch.tagIDs.length > 0 ? patch.tagIDs : null
-      if ('creatorIDs' in patch)
-        result.creatorIDs = patch.creatorIDs && patch.creatorIDs.length > 0 ? patch.creatorIDs : null
-      if ('keywords' in patch)
-        result.keywords = patch.keywords ? patch.keywords : null
-      if ('isCreatedByMe' in patch)
-        result.isCreatedByMe = patch.isCreatedByMe ? true : null
-      return result
-    }
-
-    if (typeof next === 'function') {
-      setUrlQuery(prev => buildPatch(next({
-        tagIDs: prev.tagIDs ?? undefined,
-        creatorIDs: prev.creatorIDs ?? undefined,
-        keywords: normalizeKeywords(prev.keywords),
-        isCreatedByMe: prev.isCreatedByMe ?? false,
-      })))
-      return
-    }
-
-    setUrlQuery(buildPatch(next))
-  }, [setUrlQuery])
-
-  return useMemo(() => ({ query, setQuery }), [query, setQuery])
+const appListQueryParsers = {
+  category: parseAsStringLiteral(APP_LIST_CATEGORY_VALUES)
+    .withDefault('all')
+    .withOptions({ history: 'push' }),
+  tagIDs: parseAsArrayOf(parseAsString, ';')
+    .withDefault([])
+    .withOptions({ history: 'push' }),
+  keywords: parseAsString.withDefault('').withOptions({
+    limitUrlUpdates: debounce(APP_LIST_SEARCH_DEBOUNCE_MS),
+  }),
+  isCreatedByMe: parseAsBoolean
+    .withDefault(false)
+    .withOptions({ history: 'push' }),
 }
 
-export default useAppsQueryState
+export function useAppsQueryState() {
+  const [query, setQuery] = useQueryStates(appListQueryParsers)
+
+  const setCategory = useCallback((category: AppListCategory) => {
+    setQuery({ category })
+  }, [setQuery])
+
+  const setKeywords = useCallback((keywords: string) => {
+    setQuery({ keywords })
+  }, [setQuery])
+
+  const setTagIDs = useCallback((tagIDs: string[]) => {
+    setQuery({ tagIDs })
+  }, [setQuery])
+
+  const setIsCreatedByMe = useCallback((isCreatedByMe: boolean) => {
+    setQuery({ isCreatedByMe })
+  }, [setQuery])
+
+  return useMemo(() => ({
+    query,
+    setCategory,
+    setKeywords,
+    setTagIDs,
+    setIsCreatedByMe,
+  }), [query, setCategory, setKeywords, setTagIDs, setIsCreatedByMe])
+}
diff --git a/web/app/components/apps/hooks/use-workflow-online-users.ts b/web/app/components/apps/hooks/use-workflow-online-users.ts
new file mode 100644
index 0000000000..a1778306f3
--- /dev/null
+++ b/web/app/components/apps/hooks/use-workflow-online-users.ts
@@ -0,0 +1,49 @@
+import type { WorkflowOnlineUser, WorkflowOnlineUsersResponse } from '@/models/app'
+import { skipToken, useQuery } from '@tanstack/react-query'
+import { consoleQuery } from '@/service/client'
+
+type WorkflowOnlineUsersMap = Record<string, WorkflowOnlineUser[]>
+
+type UseWorkflowOnlineUsersParams = {
+  appIds: string[]
+  enabled: boolean
+}
+
+const normalizeWorkflowOnlineUsers = (response?: WorkflowOnlineUsersResponse): WorkflowOnlineUsersMap => {
+  const data = response?.data
+
+  if (!data)
+    return {}
+
+  if (Array.isArray(data)) {
+    return data.reduce<WorkflowOnlineUsersMap>((acc, item) => {
+      if (item?.app_id)
+        acc[item.app_id] = item.users || []
+      return acc
+    }, {})
+  }
+
+  return Object.entries(data).reduce<WorkflowOnlineUsersMap>((acc, [appId, users]) => {
+    if (appId)
+      acc[appId] = users || []
+    return acc
+  }, {})
+}
+
+export const useWorkflowOnlineUsers = ({
+  appIds,
+  enabled,
+}: UseWorkflowOnlineUsersParams) => {
+  const shouldFetch = enabled && appIds.length > 0
+  const { data: onlineUsersMap = {} } = useQuery(consoleQuery.apps.workflowOnlineUsers.queryOptions({
+    input: shouldFetch
+      ? { body: { app_ids: appIds } }
+      : skipToken,
+    select: normalizeWorkflowOnlineUsers,
+    refetchInterval: shouldFetch ? 10000 : false,
+  }))
+
+  return {
+    onlineUsersMap,
+  }
+}
diff --git a/web/app/components/apps/index.tsx b/web/app/components/apps/index.tsx
index 9623299336..4b7fe7dcdd 100644
--- a/web/app/components/apps/index.tsx
+++ b/web/app/components/apps/index.tsx
@@ -1,6 +1,7 @@
 'use client'
 import type { CreateAppModalProps } from '../explore/create-app-modal'
 import type { TryAppSelection } from '@/types/try-app'
+import type { TrackCreateAppParams } from '@/utils/create-app-tracking'
 import { useCallback, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useEducationInit } from '@/app/education-apply/hooks'
@@ -41,6 +42,7 @@ const Apps = ({
 
   const [currentTryAppParams, setCurrentTryAppParams] = useState<TryAppSelection | undefined>(undefined)
   const currentCreateAppModeRef = useRef<TryAppSelection['app']['app']['mode'] | null>(null)
+  const currentCreateAppTrackingRef = useRef<Pick<TrackCreateAppParams, 'source' | 'templateId'> | null>(null)
   const currApp = currentTryAppParams?.app
   const [isShowTryAppPanel, setIsShowTryAppPanel] = useState(false)
   const hideTryAppPanel = useCallback(() => {
@@ -56,13 +58,24 @@ const Apps = ({
   const [isShowCreateModal, setIsShowCreateModal] = useState(false)
 
   const handleShowFromTryApp = useCallback(() => {
+    currentCreateAppTrackingRef.current = {
+      source: 'studio_template_preview',
+      templateId: currentTryAppParams?.appId || currentTryAppParams?.app.app_id,
+    }
     setIsShowCreateModal(true)
-  }, [])
-  const trackCurrentCreateApp = useCallback(() => {
-    if (!currentCreateAppModeRef.current)
+  }, [currentTryAppParams?.app.app_id, currentTryAppParams?.appId])
+  const trackCurrentCreateApp = useCallback((appMode?: TryAppSelection['app']['app']['mode'] | null) => {
+    const currentCreateAppTracking = currentCreateAppTrackingRef.current
+    const resolvedAppMode = appMode ?? currentCreateAppModeRef.current
+    if (!resolvedAppMode || !currentCreateAppTracking)
       return
 
-    trackCreateApp({ appMode: currentCreateAppModeRef.current })
+    trackCreateApp({
+      ...currentCreateAppTracking,
+      appMode: resolvedAppMode,
+    })
+    currentCreateAppTrackingRef.current = null
+    currentCreateAppModeRef.current = null
   }, [])
 
   const [controlRefreshList, setControlRefreshList] = useState(0)
@@ -91,19 +104,25 @@ const Apps = ({
 
   const onConfirmDSL = useCallback(async () => {
     await handleImportDSLConfirm({
-      onSuccess: () => {
-        trackCurrentCreateApp()
+      onSuccess: (response) => {
+        trackCurrentCreateApp(response.app_mode)
         onSuccess()
       },
     })
   }, [handleImportDSLConfirm, onSuccess, trackCurrentCreateApp])
 
   const handleMarketplaceTemplateConfirm = useCallback(async (dslContent: string) => {
+    currentCreateAppModeRef.current = null
+    currentCreateAppTrackingRef.current = {
+      source: 'external',
+      templateId: templateId || undefined,
+    }
     await handleImportDSL({
       mode: DSLImportMode.YAML_CONTENT,
       yaml_content: dslContent,
     }, {
-      onSuccess: () => {
+      onSuccess: (response) => {
+        trackCurrentCreateApp(response.app_mode)
         handleCloseTemplateModal()
         onSuccess()
       },
@@ -112,7 +131,7 @@ const Apps = ({
         setShowDSLConfirmModal(true)
       },
     })
-  }, [handleImportDSL, handleCloseTemplateModal, onSuccess])
+  }, [handleImportDSL, handleCloseTemplateModal, onSuccess, templateId, trackCurrentCreateApp])
 
   const onCreate: CreateAppModalProps['onConfirm'] = useCallback(async ({
     name,
@@ -137,8 +156,8 @@ const Apps = ({
       description,
     }
     await handleImportDSL(payload, {
-      onSuccess: () => {
-        trackCurrentCreateApp()
+      onSuccess: (response) => {
+        trackCurrentCreateApp(response.app_mode)
         setIsShowCreateModal(false)
       },
       onPending: () => {
@@ -161,7 +180,7 @@ const Apps = ({
           <TryApp
             appId={currentTryAppParams?.appId || ''}
             app={currentTryAppParams?.app}
-            category={currentTryAppParams?.app?.category}
+            categories={currentTryAppParams?.app?.categories}
             onClose={hideTryAppPanel}
             onCreate={handleShowFromTryApp}
           />
diff --git a/web/app/components/apps/list.tsx b/web/app/components/apps/list.tsx
index ab6168352a..b1145fe5de 100644
--- a/web/app/components/apps/list.tsx
+++ b/web/app/components/apps/list.tsx
@@ -1,42 +1,34 @@
 'use client'
 
 import type { FC } from 'react'
-import type { StudioPageType } from '.'
-import type { WorkflowOnlineUser } from '@/models/app'
+import type { AppListQuery } from '@/contract/console/apps'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import { cn } from '@langgenius/dify-ui/cn'
-import { useSuspenseQuery } from '@tanstack/react-query'
-import { useDebounceFn } from 'ahooks'
-import { useQueryState } from 'nuqs'
+import { keepPreviousData, useInfiniteQuery, useSuspenseQuery } from '@tanstack/react-query'
+import { useDebounce } from 'ahooks'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Input from '@/app/components/base/input'
-import TagFilter from '@/app/components/base/tag-management/filter'
-import { useStore as useTagStore } from '@/app/components/base/tag-management/store'
+import TabSliderNew from '@/app/components/base/tab-slider-new'
 import { NEED_REFRESH_APP_LIST_KEY } from '@/config'
 import { useAppContext } from '@/context/app-context'
+import { TagFilter } from '@/features/tag-management/components/tag-filter'
 import { CheckModal } from '@/hooks/use-pay'
-import { useSnippetAndEvaluationPlanAccess } from '@/hooks/use-snippet-and-evaluation-plan-access'
 import dynamic from '@/next/dynamic'
-import { fetchWorkflowOnlineUsers } from '@/service/apps'
+import { consoleQuery } from '@/service/client'
 import { systemFeaturesQueryOptions } from '@/service/system-features'
-import { useInfiniteAppList } from '@/service/use-apps'
-import { useInfiniteSnippetList } from '@/service/use-snippets'
 import { AppModeEnum } from '@/types/app'
-import SnippetCard from '../snippets/components/snippet-card'
-import SnippetCreateCard from '../snippets/components/snippet-create-card'
 import AppCard from './app-card'
 import { AppCardSkeleton } from './app-card-skeleton'
-import AppTypeFilter from './app-type-filter'
-import { parseAsAppListCategory } from './app-type-filter-shared'
-import CreatorsFilter from './creators-filter'
+import { APP_LIST_SEARCH_DEBOUNCE_MS } from './constants'
 import Empty from './empty'
 import Footer from './footer'
-import useAppsQueryState from './hooks/use-apps-query-state'
+import { isAppListCategory, useAppsQueryState } from './hooks/use-apps-query-state'
 import { useDSLDragDrop } from './hooks/use-dsl-drag-drop'
+import { useWorkflowOnlineUsers } from './hooks/use-workflow-online-users'
 import NewAppCard from './new-app-card'
-import StudioRouteSwitch from './studio-route-switch'
 
-const TagManagementModal = dynamic(() => import('@/app/components/base/tag-management'), {
+const TagManagementModal = dynamic(() => import('@/features/tag-management/components/tag-management-modal').then(mod => mod.TagManagementModal), {
   ssr: false,
 })
 const CreateFromDSLModal = dynamic(() => import('@/app/components/app/create-from-dsl-modal'), {
@@ -45,47 +37,28 @@ const CreateFromDSLModal = dynamic(() => import('@/app/components/app/create-fro
 
 type Props = {
   controlRefreshList?: number
-  pageType?: StudioPageType
 }
-
 const List: FC<Props> = ({
   controlRefreshList = 0,
-  pageType = 'apps',
 }) => {
   const { t } = useTranslation()
-  const isAppsPage = pageType === 'apps'
-  const { canAccess: canAccessSnippetsAndEvaluation } = useSnippetAndEvaluationPlanAccess()
   const { data: systemFeatures } = useSuspenseQuery(systemFeaturesQueryOptions())
   const { isCurrentWorkspaceEditor, isCurrentWorkspaceDatasetOperator, isLoadingCurrentWorkspace } = useAppContext()
-  const showTagManagementModal = useTagStore(s => s.showTagManagementModal)
-  const [activeTab, setActiveTab] = useQueryState(
-    'category',
-    parseAsAppListCategory,
-  )
 
-  const { query: { tagIDs = [], creatorIDs = [], keywords = '', isCreatedByMe: queryIsCreatedByMe = false }, setQuery } = useAppsQueryState()
-  const [tagFilterValue, setTagFilterValue] = useState<string[]>(tagIDs)
-  const [appKeywords, setAppKeywords] = useState(keywords)
-  const [snippetKeywordsInput, setSnippetKeywordsInput] = useState('')
-  const [snippetKeywords, setSnippetKeywords] = useState('')
+  // eslint-disable-next-line react/use-state -- custom URL query hook, not React.useState
+  const {
+    query: { category, tagIDs, keywords, isCreatedByMe },
+    setCategory,
+    setKeywords,
+    setTagIDs,
+    setIsCreatedByMe,
+  } = useAppsQueryState()
+  const debouncedKeywords = useDebounce(keywords, { wait: APP_LIST_SEARCH_DEBOUNCE_MS })
+  const newAppCardRef = useRef<HTMLDivElement>(null)
+  const containerRef = useRef<HTMLDivElement>(null)
+  const [showTagManagementModal, setShowTagManagementModal] = useState(false)
   const [showCreateFromDSLModal, setShowCreateFromDSLModal] = useState(false)
   const [droppedDSLFile, setDroppedDSLFile] = useState<File | undefined>()
-  const containerRef = useRef<HTMLDivElement>(null)
-  const anchorRef = useRef<HTMLDivElement>(null)
-  const newAppCardRef = useRef<HTMLDivElement>(null)
-
-  const [workflowOnlineUsersMap, setWorkflowOnlineUsersMap] = useState<Record<string, WorkflowOnlineUser[]>>({})
-  const setKeywords = useCallback((keywords: string) => {
-    setQuery(prev => ({ ...prev, keywords }))
-  }, [setQuery])
-
-  const setTagIDs = useCallback((nextTagIDs: string[]) => {
-    setQuery(prev => ({ ...prev, tagIDs: nextTagIDs }))
-  }, [setQuery])
-
-  const setCreatorIDs = useCallback((nextCreatorIDs: string[]) => {
-    setQuery(prev => ({ ...prev, creatorIDs: nextCreatorIDs }))
-  }, [setQuery])
 
   const handleDSLFileDropped = useCallback((file: File) => {
     setDroppedDSLFile(file)
@@ -95,18 +68,17 @@ const List: FC<Props> = ({
   const { dragging } = useDSLDragDrop({
     onDSLFileDropped: handleDSLFileDropped,
     containerRef,
-    enabled: isAppsPage && isCurrentWorkspaceEditor,
+    enabled: isCurrentWorkspaceEditor,
   })
 
-  const appListQueryParams = {
+  const appListQuery = useMemo<AppListQuery>(() => ({
     page: 1,
     limit: 30,
-    name: appKeywords,
-    tag_ids: tagIDs,
-    is_created_by_me: queryIsCreatedByMe,
-    ...(creatorIDs.length > 0 ? { creator_id: creatorIDs.join(',') } : {}),
-    ...(activeTab !== 'all' ? { mode: activeTab } : {}),
-  }
+    name: debouncedKeywords,
+    ...(tagIDs.length ? { tag_ids: tagIDs } : {}),
+    ...(isCreatedByMe ? { is_created_by_me: isCreatedByMe } : {}),
+    ...(category !== 'all' ? { mode: category } : {}),
+  }), [category, debouncedKeywords, isCreatedByMe, tagIDs])
 
   const {
     data,
@@ -117,169 +89,101 @@ const List: FC<Props> = ({
     hasNextPage,
     error,
     refetch,
-  } = useInfiniteAppList(appListQueryParams, {
-    enabled: isAppsPage && !isCurrentWorkspaceDatasetOperator,
-  })
-
-  const {
-    data: snippetData,
-    isLoading: isSnippetListLoading,
-    isFetching: isSnippetListFetching,
-    isFetchingNextPage: isSnippetListFetchingNextPage,
-    fetchNextPage: fetchSnippetNextPage,
-    hasNextPage: hasSnippetNextPage,
-    error: snippetError,
-  } = useInfiniteSnippetList({
-    page: 1,
-    limit: 30,
-    keyword: snippetKeywords || undefined,
-    creator_id: creatorIDs.length > 0 ? creatorIDs.join(',') : undefined,
-  }, {
-    enabled: !isAppsPage,
+  } = useInfiniteQuery({
+    ...consoleQuery.apps.list.infiniteOptions({
+      input: pageParam => ({
+        query: {
+          ...appListQuery,
+          page: Number(pageParam),
+        },
+      }),
+      getNextPageParam: lastPage => lastPage.has_more ? lastPage.page + 1 : undefined,
+      initialPageParam: 1,
+      placeholderData: keepPreviousData,
+    }),
+    enabled: !isCurrentWorkspaceDatasetOperator,
+    refetchInterval: systemFeatures.enable_collaboration_mode ? 10000 : false,
   })
 
   useEffect(() => {
-    if (isAppsPage && controlRefreshList > 0)
+    if (controlRefreshList > 0) {
       refetch()
-  }, [controlRefreshList, isAppsPage, refetch])
+    }
+  }, [controlRefreshList, refetch])
+
+  const anchorRef = useRef<HTMLDivElement>(null)
+  const options = [
+    { value: 'all', text: t('types.all', { ns: 'app' }), icon: <span className="mr-1 i-ri-apps-2-line h-[14px] w-[14px]" /> },
+    { value: AppModeEnum.WORKFLOW, text: t('types.workflow', { ns: 'app' }), icon: <span className="mr-1 i-ri-exchange-2-line h-[14px] w-[14px]" /> },
+    { value: AppModeEnum.ADVANCED_CHAT, text: t('types.advanced', { ns: 'app' }), icon: <span className="mr-1 i-ri-message-3-line h-[14px] w-[14px]" /> },
+    { value: AppModeEnum.CHAT, text: t('types.chatbot', { ns: 'app' }), icon: <span className="mr-1 i-ri-message-3-line h-[14px] w-[14px]" /> },
+    { value: AppModeEnum.AGENT_CHAT, text: t('types.agent', { ns: 'app' }), icon: <span className="mr-1 i-ri-robot-3-line h-[14px] w-[14px]" /> },
+    { value: AppModeEnum.COMPLETION, text: t('types.completion', { ns: 'app' }), icon: <span className="mr-1 i-ri-file-4-line h-[14px] w-[14px]" /> },
+  ]
 
   useEffect(() => {
-    if (!isAppsPage)
-      return
-
     if (localStorage.getItem(NEED_REFRESH_APP_LIST_KEY) === '1') {
       localStorage.removeItem(NEED_REFRESH_APP_LIST_KEY)
       refetch()
     }
-  }, [isAppsPage, refetch])
+  }, [refetch])
 
   useEffect(() => {
     if (isCurrentWorkspaceDatasetOperator)
       return
-
-    const hasMore = isAppsPage ? (hasNextPage ?? true) : (hasSnippetNextPage ?? true)
-    const isPageLoading = isAppsPage ? isLoading : isSnippetListLoading
-    const isNextPageFetching = isAppsPage ? isFetchingNextPage : isSnippetListFetchingNextPage
-    const currentError = isAppsPage ? error : snippetError
+    const hasMore = hasNextPage ?? true
     let observer: IntersectionObserver | undefined
 
-    if (currentError) {
-      observer?.disconnect()
+    if (error) {
+      if (observer)
+        observer.disconnect()
       return
     }
 
     if (anchorRef.current && containerRef.current) {
+      // Calculate dynamic rootMargin: clamps to 100-200px range, using 20% of container height as the base value for better responsiveness
       const containerHeight = containerRef.current.clientHeight
-      const dynamicMargin = Math.max(100, Math.min(containerHeight * 0.2, 200))
+      const dynamicMargin = Math.max(100, Math.min(containerHeight * 0.2, 200)) // Clamps to 100-200px range, using 20% of container height as the base value
 
       observer = new IntersectionObserver((entries) => {
-        if (entries[0]!.isIntersecting && !isPageLoading && !isNextPageFetching && !currentError && hasMore) {
-          if (isAppsPage)
-            fetchNextPage()
-          else
-            fetchSnippetNextPage()
-        }
+        if (entries[0]!.isIntersecting && !isLoading && !isFetchingNextPage && !error && hasMore)
+          fetchNextPage()
       }, {
         root: containerRef.current,
         rootMargin: `${dynamicMargin}px`,
-        threshold: 0.1,
+        threshold: 0.1, // Trigger when 10% of the anchor element is visible
       })
       observer.observe(anchorRef.current)
     }
-
     return () => observer?.disconnect()
-  }, [error, fetchNextPage, fetchSnippetNextPage, hasNextPage, hasSnippetNextPage, isAppsPage, isCurrentWorkspaceDatasetOperator, isFetchingNextPage, isLoading, isSnippetListFetchingNextPage, isSnippetListLoading, snippetError])
+  }, [isLoading, isFetchingNextPage, fetchNextPage, error, hasNextPage, isCurrentWorkspaceDatasetOperator])
 
-  const { run: handleAppSearch } = useDebounceFn((value: string) => {
-    setAppKeywords(value)
-  }, { wait: 500 })
+  const handleCreatedByMeChange = useCallback((checked: boolean) => {
+    setIsCreatedByMe(checked)
+  }, [setIsCreatedByMe])
 
-  const { run: handleSnippetSearch } = useDebounceFn((value: string) => {
-    setSnippetKeywords(value)
-  }, { wait: 500 })
-
-  const handleKeywordsChange = useCallback((value: string) => {
-    if (isAppsPage) {
-      setKeywords(value)
-      handleAppSearch(value)
-      return
-    }
-
-    setSnippetKeywordsInput(value)
-    handleSnippetSearch(value)
-  }, [handleAppSearch, handleSnippetSearch, isAppsPage, setKeywords])
-
-  const { run: handleTagsUpdate } = useDebounceFn((value: string[]) => {
-    setTagIDs(value)
-  }, { wait: 500 })
-
-  const handleTagsChange = useCallback((value: string[]) => {
-    setTagFilterValue(value)
-    handleTagsUpdate(value)
-  }, [handleTagsUpdate])
-
-  const snippetItems = useMemo(() => {
-    return (snippetData?.pages ?? []).flatMap(({ data }) => data)
-  }, [snippetData?.pages])
-
-  const showSkeleton = isAppsPage
-    ? (isLoading || (isFetching && data?.pages?.length === 0))
-    : (isSnippetListLoading || (isSnippetListFetching && snippetItems.length === 0))
-  const hasAnyApp = (data?.pages?.[0]?.total ?? 0) > 0
-  const hasAnySnippet = snippetItems.length > 0
-  const currentKeywords = isAppsPage ? keywords : snippetKeywordsInput
-  const showEmptyState = !showSkeleton && (isAppsPage ? !hasAnyApp : !hasAnySnippet)
-  const emptyStateMessage = isAppsPage
-    ? t('newApp.noAppsFound', { ns: 'app' })
-    : t('tabs.noSnippetsFound', { ns: 'workflow' })
   const pages = useMemo(() => data?.pages ?? [], [data?.pages])
+  const apps = useMemo(() => pages.flatMap(({ data: pageApps }) => pageApps), [pages])
 
   const workflowOnlineUserAppIds = useMemo(() => {
     const appIds = new Set<string>()
-    pages.forEach(({ data: apps }) => {
-      apps.forEach((app) => {
-        if (app.mode === AppModeEnum.WORKFLOW || app.mode === AppModeEnum.ADVANCED_CHAT)
-          appIds.add(app.id)
-      })
+    apps.forEach((app) => {
+      if (app.mode === AppModeEnum.WORKFLOW || app.mode === AppModeEnum.ADVANCED_CHAT)
+        appIds.add(app.id)
     })
     return Array.from(appIds)
-  }, [pages])
+  }, [apps])
 
-  const refreshWorkflowOnlineUsers = useCallback(async () => {
-    if (!systemFeatures.enable_collaboration_mode) {
-      setWorkflowOnlineUsersMap({})
-      return
-    }
+  const {
+    onlineUsersMap: workflowOnlineUsersMap,
+  } = useWorkflowOnlineUsers({
+    appIds: workflowOnlineUserAppIds,
+    enabled: systemFeatures.enable_collaboration_mode,
+  })
 
-    if (!workflowOnlineUserAppIds.length) {
-      setWorkflowOnlineUsersMap({})
-      return
-    }
-
-    try {
-      const onlineUsersMap = await fetchWorkflowOnlineUsers({ appIds: workflowOnlineUserAppIds })
-      setWorkflowOnlineUsersMap(onlineUsersMap)
-    }
-    catch {
-      setWorkflowOnlineUsersMap({})
-    }
-  }, [systemFeatures.enable_collaboration_mode, workflowOnlineUserAppIds])
-
-  useEffect(() => {
-    void refreshWorkflowOnlineUsers()
-  }, [refreshWorkflowOnlineUsers])
-
-  useEffect(() => {
-    if (!systemFeatures.enable_collaboration_mode)
-      return
-
-    const timer = window.setInterval(() => {
-      void refetch()
-      void refreshWorkflowOnlineUsers()
-    }, 10000)
-
-    return () => window.clearInterval(timer)
-  }, [refetch, refreshWorkflowOnlineUsers, systemFeatures.enable_collaboration_mode])
+  const hasAnyApp = (pages[0]?.total ?? 0) > 0
+  // Show skeleton during initial load or when refetching with no previous data
+  const showSkeleton = isLoading || (isFetching && pages.length === 0)
 
   return (
     <>
@@ -290,91 +194,67 @@ const List: FC<Props> = ({
         )}
 
         <div className="sticky top-0 z-10 flex flex-wrap items-center justify-between gap-y-2 bg-background-body px-12 pt-7 pb-5">
-          <div className="flex flex-wrap items-center gap-2">
-            <StudioRouteSwitch
-              pageType={pageType}
-              appsLabel={t('studio.apps', { ns: 'app' })}
-              snippetsLabel={t('tabs.snippets', { ns: 'workflow' })}
-              showSnippets={canAccessSnippetsAndEvaluation}
-            />
-            {isAppsPage && (
-              <AppTypeFilter
-                activeTab={activeTab}
-                onChange={(value) => {
-                  void setActiveTab(value)
-                }}
-              />
-            )}
-            <CreatorsFilter value={creatorIDs} onChange={setCreatorIDs} />
-            {isAppsPage && (
-              <TagFilter type="app" value={tagFilterValue} onChange={handleTagsChange} />
-            )}
-          </div>
-
+          <TabSliderNew
+            value={category}
+            onChange={(nextValue) => {
+              if (isAppListCategory(nextValue))
+                setCategory(nextValue)
+            }}
+            options={options}
+          />
           <div className="flex items-center gap-2">
+            <label className="mr-2 flex h-7 items-center space-x-2">
+              <Checkbox checked={isCreatedByMe} onCheckedChange={handleCreatedByMeChange} />
+              <div className="text-sm font-normal text-text-secondary">
+                {t('showMyCreatedAppsOnly', { ns: 'app' })}
+              </div>
+            </label>
+            <TagFilter type="app" value={tagIDs} onChange={setTagIDs} onOpenTagManagement={() => setShowTagManagementModal(true)} />
             <Input
               showLeftIcon
               showClearIcon
               wrapperClassName="w-[200px]"
-              placeholder={isAppsPage ? undefined : t('tabs.searchSnippets', { ns: 'workflow' })}
-              value={currentKeywords}
-              onChange={e => handleKeywordsChange(e.target.value)}
-              onClear={() => handleKeywordsChange('')}
+              value={keywords}
+              onChange={e => setKeywords(e.target.value)}
+              onClear={() => setKeywords('')}
             />
           </div>
         </div>
-
         <div className={cn(
           'relative grid grow grid-cols-1 content-start gap-4 px-12 pt-2 2k:grid-cols-6 sm:grid-cols-1 md:grid-cols-2 xl:grid-cols-4 2xl:grid-cols-5',
-          showEmptyState && 'overflow-hidden',
+          !hasAnyApp && 'overflow-hidden',
         )}
         >
           {(isCurrentWorkspaceEditor || isLoadingCurrentWorkspace) && (
-            isAppsPage
-              ? (
-                  <NewAppCard
-                    ref={newAppCardRef}
-                    isLoading={isLoadingCurrentWorkspace}
-                    onSuccess={refetch}
-                    selectedAppType={activeTab}
-                    className={cn(!hasAnyApp && 'z-10')}
-                  />
-                )
-              : canAccessSnippetsAndEvaluation && <SnippetCreateCard />
-          )}
-
-          {showSkeleton && <AppCardSkeleton count={6} />}
-
-          {!showSkeleton && isAppsPage && hasAnyApp && pages.flatMap(({ data: apps }) => apps).map(app => (
-            <AppCard
-              key={app.id}
-              app={app}
-              onlineUsers={workflowOnlineUsersMap[app.id] ?? []}
-              onRefresh={refetch}
+            <NewAppCard
+              ref={newAppCardRef}
+              isLoading={isLoadingCurrentWorkspace}
+              onSuccess={refetch}
+              selectedAppType={category}
+              className={cn(!hasAnyApp && 'z-10')}
             />
-          ))}
-
-          {!showSkeleton && !isAppsPage && hasAnySnippet && snippetItems.map(snippet => (
-            <SnippetCard key={snippet.id} snippet={snippet} />
-          ))}
-
-          {showEmptyState && <Empty message={emptyStateMessage} />}
-
-          {isAppsPage && isFetchingNextPage && (
-            <AppCardSkeleton count={3} />
           )}
-
-          {!isAppsPage && isSnippetListFetchingNextPage && (
+          {showSkeleton
+            ? <AppCardSkeleton count={6} />
+            : hasAnyApp
+              ? apps.map(app => (
+                  <AppCard
+                    key={app.id}
+                    app={app}
+                    onlineUsers={workflowOnlineUsersMap[app.id] ?? []}
+                    onRefresh={refetch}
+                    onOpenTagManagement={() => setShowTagManagementModal(true)}
+                  />
+                ))
+              : <Empty />}
+          {isFetchingNextPage && (
             <AppCardSkeleton count={3} />
           )}
         </div>
 
-        {isAppsPage && isCurrentWorkspaceEditor && (
+        {isCurrentWorkspaceEditor && (
           <div
-            className={cn(
-              'flex items-center justify-center gap-2 py-4',
-              dragging ? 'text-text-accent' : 'text-text-quaternary',
-            )}
+            className={`flex items-center justify-center gap-2 py-4 ${dragging ? 'text-text-accent' : 'text-text-quaternary'}`}
             role="region"
             aria-label={t('newApp.dropDSLToCreateApp', { ns: 'app' })}
           >
@@ -382,18 +262,20 @@ const List: FC<Props> = ({
             <span className="system-xs-regular">{t('newApp.dropDSLToCreateApp', { ns: 'app' })}</span>
           </div>
         )}
-
         {!systemFeatures.branding.enabled && (
           <Footer />
         )}
         <CheckModal />
         <div ref={anchorRef} className="h-0"> </div>
-        {isAppsPage && showTagManagementModal && (
-          <TagManagementModal type="app" show={showTagManagementModal} />
-        )}
+        <TagManagementModal
+          type="app"
+          show={showTagManagementModal}
+          onClose={() => setShowTagManagementModal(false)}
+          onTagsChange={refetch}
+        />
       </div>
 
-      {isAppsPage && showCreateFromDSLModal && (
+      {showCreateFromDSLModal && (
         <CreateFromDSLModal
           show={showCreateFromDSLModal}
           onClose={() => {
diff --git a/web/app/components/base/__tests__/alert.spec.tsx b/web/app/components/base/__tests__/alert.spec.tsx
index 10c1a6bbfa..3d4e683d19 100644
--- a/web/app/components/base/__tests__/alert.spec.tsx
+++ b/web/app/components/base/__tests__/alert.spec.tsx
@@ -25,8 +25,7 @@ describe('Alert', () => {
 
     it('should render the close icon', () => {
       render(<Alert {...defaultProps} />)
-      const closeIcon = screen.getByTestId('close-icon')
-      expect(closeIcon).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'common.operation.close' })).toBeInTheDocument()
     })
   })
 
@@ -66,7 +65,7 @@ describe('Alert', () => {
     it('should call onHide when close button is clicked', () => {
       const onHide = vi.fn()
       render(<Alert {...defaultProps} onHide={onHide} />)
-      const closeButton = screen.getByTestId('close-icon')
+      const closeButton = screen.getByRole('button', { name: 'common.operation.close' })
       fireEvent.click(closeButton)
       expect(onHide).toHaveBeenCalledTimes(1)
     })
diff --git a/web/app/components/base/agent-log-modal/__tests__/detail.spec.tsx b/web/app/components/base/agent-log-modal/__tests__/detail.spec.tsx
index 78d4a06c4a..4c8a1d24bf 100644
--- a/web/app/components/base/agent-log-modal/__tests__/detail.spec.tsx
+++ b/web/app/components/base/agent-log-modal/__tests__/detail.spec.tsx
@@ -172,7 +172,7 @@ describe('AgentLogDetail', () => {
 
       await renderAndWaitForData()
 
-      fireEvent.click(screen.getByText(/runLog.tracing/i))
+      fireEvent.click(screen.getByRole('button', { name: /runLog.tracing/i }))
 
       await waitFor(() => {
         const tracingTab = screen.getByText(/runLog.tracing/i)
@@ -188,13 +188,13 @@ describe('AgentLogDetail', () => {
 
       await renderAndWaitForData()
 
-      fireEvent.click(screen.getByText(/runLog.tracing/i))
+      fireEvent.click(screen.getByRole('button', { name: /runLog.tracing/i }))
 
       await waitFor(() => {
         expect(screen.getByText(/runLog.tracing/i).getAttribute('data-active')).toBe('true')
       })
 
-      fireEvent.click(screen.getByText(/runLog.detail/i))
+      fireEvent.click(screen.getByRole('button', { name: /runLog.detail/i }))
 
       await waitFor(() => {
         const detailTab = screen.getByText(/runLog.detail/i)
diff --git a/web/app/components/base/agent-log-modal/__tests__/index.spec.tsx b/web/app/components/base/agent-log-modal/__tests__/index.spec.tsx
index d8c595202a..1c8e79f4aa 100644
--- a/web/app/components/base/agent-log-modal/__tests__/index.spec.tsx
+++ b/web/app/components/base/agent-log-modal/__tests__/index.spec.tsx
@@ -124,7 +124,7 @@ describe('AgentLogModal', () => {
 
     render(<AgentLogModal {...mockProps} />)
 
-    const closeBtn = screen.getByRole('heading', { name: /appLog.runDetail.workflowTitle/i }).nextElementSibling!
+    const closeBtn = screen.getByRole('button', { name: 'common.operation.close' })
     fireEvent.click(closeBtn)
 
     expect(mockProps.onCancel).toHaveBeenCalledTimes(1)
diff --git a/web/app/components/base/agent-log-modal/detail.tsx b/web/app/components/base/agent-log-modal/detail.tsx
index b12777dfe5..24c192c47e 100644
--- a/web/app/components/base/agent-log-modal/detail.tsx
+++ b/web/app/components/base/agent-log-modal/detail.tsx
@@ -67,12 +67,22 @@ const AgentLogDetail: FC<AgentLogDetailProps> = ({ activeTab = 'DETAIL', convers
     <div className="relative flex grow flex-col">
       {/* tab */}
       <div className="flex shrink-0 items-center border-b-[0.5px] border-divider-regular px-4">
-        <div className={cn('mr-6 cursor-pointer border-b-2 border-transparent py-3 text-[13px] leading-[18px] font-semibold text-text-tertiary', currentTab === 'DETAIL' && '!border-[rgb(21,94,239)] text-text-secondary')} data-active={currentTab === 'DETAIL'} onClick={() => switchTab('DETAIL')}>
+        <button
+          type="button"
+          className={cn('mr-6 cursor-pointer border-x-0 border-t-0 border-b-2 border-transparent bg-transparent px-0 py-3 text-left text-[13px] leading-[18px] font-semibold text-text-tertiary focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden', currentTab === 'DETAIL' && '!border-[rgb(21,94,239)] text-text-secondary')}
+          data-active={currentTab === 'DETAIL'}
+          onClick={() => switchTab('DETAIL')}
+        >
           {t('detail', { ns: 'runLog' })}
-        </div>
-        <div className={cn('mr-6 cursor-pointer border-b-2 border-transparent py-3 text-[13px] leading-[18px] font-semibold text-text-tertiary', currentTab === 'TRACING' && '!border-[rgb(21,94,239)] text-text-secondary')} data-active={currentTab === 'TRACING'} onClick={() => switchTab('TRACING')}>
+        </button>
+        <button
+          type="button"
+          className={cn('mr-6 cursor-pointer border-x-0 border-t-0 border-b-2 border-transparent bg-transparent px-0 py-3 text-left text-[13px] leading-[18px] font-semibold text-text-tertiary focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden', currentTab === 'TRACING' && '!border-[rgb(21,94,239)] text-text-secondary')}
+          data-active={currentTab === 'TRACING'}
+          onClick={() => switchTab('TRACING')}
+        >
           {t('tracing', { ns: 'runLog' })}
-        </div>
+        </button>
       </div>
       {/* panel detail */}
       <div className={cn('h-0 grow overflow-y-auto rounded-b-2xl bg-components-panel-bg', currentTab !== 'DETAIL' && '!bg-background-section')}>
diff --git a/web/app/components/base/agent-log-modal/index.tsx b/web/app/components/base/agent-log-modal/index.tsx
index 0739d0774a..c6f036ede0 100644
--- a/web/app/components/base/agent-log-modal/index.tsx
+++ b/web/app/components/base/agent-log-modal/index.tsx
@@ -46,9 +46,14 @@ const AgentLogModal: FC<AgentLogModalProps> = ({
       ref={ref}
     >
       <h1 className="text-md shrink-0 px-4 py-1 font-semibold text-text-primary">{t('runDetail.workflowTitle', { ns: 'appLog' })}</h1>
-      <span className="absolute top-4 right-3 z-20 cursor-pointer p-1" onClick={onCancel}>
-        <RiCloseLine className="h-4 w-4 text-text-tertiary" />
-      </span>
+      <button
+        type="button"
+        aria-label={t('operation.close', { ns: 'common' })}
+        className="absolute top-4 right-3 z-20 cursor-pointer border-none bg-transparent p-1 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+        onClick={onCancel}
+      >
+        <RiCloseLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
+      </button>
       <AgentLogDetail
         conversationID={currentLogItem.conversationId}
         messageID={currentLogItem.id}
diff --git a/web/app/components/base/alert.tsx b/web/app/components/base/alert.tsx
index 8dfe0e4ff5..4072e113d2 100644
--- a/web/app/components/base/alert.tsx
+++ b/web/app/components/base/alert.tsx
@@ -3,6 +3,7 @@ import { cva } from 'class-variance-authority'
 import {
   memo,
 } from 'react'
+import { useTranslation } from 'react-i18next'
 
 type Props = {
   type?: 'info'
@@ -26,6 +27,8 @@ const Alert: React.FC<Props> = ({
   onHide,
   className,
 }) => {
+  const { t } = useTranslation()
+
   return (
     <div className={cn('pointer-events-none w-full', className)}>
       <div
@@ -41,12 +44,14 @@ const Alert: React.FC<Props> = ({
             {message}
           </div>
         </div>
-        <div
-          className="pointer-events-auto flex h-6 w-6 cursor-pointer items-center justify-center"
+        <button
+          type="button"
+          aria-label={t('operation.close', { ns: 'common' })}
+          className="pointer-events-auto flex h-6 w-6 cursor-pointer items-center justify-center rounded-md border-none bg-transparent p-0 focus:outline-none focus-visible:ring-2 focus-visible:ring-components-button-secondary-accent-border"
           onClick={onHide}
         >
-          <span className="i-ri-close-line h-4 w-4 text-text-tertiary" data-testid="close-icon" />
-        </div>
+          <span className="i-ri-close-line h-4 w-4 text-text-tertiary" aria-hidden="true" />
+        </button>
       </div>
     </div>
   )
diff --git a/web/app/components/base/app-icon-picker/ImageInput.tsx b/web/app/components/base/app-icon-picker/ImageInput.tsx
index 92a3f8a9f6..fddee6d58a 100644
--- a/web/app/components/base/app-icon-picker/ImageInput.tsx
+++ b/web/app/components/base/app-icon-picker/ImageInput.tsx
@@ -95,7 +95,7 @@ const ImageInput: FC<UploaderProps> = ({
   return (
     <div className={cn(className, 'w-full px-3 py-1.5')}>
       <div
-        className={cn(isDragActive && 'border-primary-600', 'relative flex aspect-square flex-col items-center justify-center rounded-lg border-[1.5px] border-dashed text-gray-500')}
+        className={cn('relative flex aspect-square flex-col items-center justify-center rounded-lg border-[1.5px] border-dashed border-components-input-border-hover text-gray-500', isDragActive && 'border-primary-600')}
         onDragEnter={handleDragEnter}
         onDragOver={handleDragOver}
         onDragLeave={handleDragLeave}
diff --git a/web/app/components/base/app-icon-picker/__tests__/index.spec.tsx b/web/app/components/base/app-icon-picker/__tests__/index.spec.tsx
index 7f452e64e9..589ad5554e 100644
--- a/web/app/components/base/app-icon-picker/__tests__/index.spec.tsx
+++ b/web/app/components/base/app-icon-picker/__tests__/index.spec.tsx
@@ -195,10 +195,10 @@ describe('AppIconPicker', () => {
       const { onSelect } = renderPicker()
 
       await waitFor(() => {
-        expect(screen.queryAllByTestId(/emoji-container-/i).length).toBeGreaterThan(0)
+        expect(document.querySelector('em-emoji')?.closest('button'))!.toBeInTheDocument()
       })
 
-      const firstEmoji = screen.queryAllByTestId(/emoji-container-/i)[0]
+      const firstEmoji = document.querySelector('em-emoji')?.closest('button')
       if (!firstEmoji)
         throw new Error('Could not find emoji option')
 
diff --git a/web/app/components/base/app-icon-picker/index.tsx b/web/app/components/base/app-icon-picker/index.tsx
index 64a88f16e1..9fcf9faf43 100644
--- a/web/app/components/base/app-icon-picker/index.tsx
+++ b/web/app/components/base/app-icon-picker/index.tsx
@@ -4,15 +4,14 @@ import type { OnImageInput } from './ImageInput'
 import type { AppIconType, ImageFile } from '@/types/app'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { RiImageCircleAiLine } from '@remixicon/react'
-import { noop } from 'es-toolkit/function'
 import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { DISABLE_UPLOAD_IMAGE_AS_ICON } from '@/config'
 import Divider from '../divider'
 import EmojiPickerInner from '../emoji-picker/Inner'
 import { useLocalFileUploader } from '../image-uploader/hooks'
-import Modal from '../modal'
 import ImageInput from './ImageInput'
 import s from './style.module.css'
 import getCroppedImg from './utils'
@@ -45,7 +44,6 @@ const AppIconPicker: FC<AppIconPickerProps> = ({
   onSelect,
   onClose,
   initialEmoji,
-  className,
 }) => {
   const { t } = useTranslation()
 
@@ -113,57 +111,54 @@ const AppIconPicker: FC<AppIconPickerProps> = ({
   }
 
   return (
-    <Modal
-      onClose={noop}
-      isShow
-      closable={false}
-      wrapperClassName={className}
-      className={cn(s.container, 'h-[462px]! w-[362px]! p-0!')}
-    >
-      {!DISABLE_UPLOAD_IMAGE_AS_ICON && (
-        <div className="w-full p-2 pb-0">
-          <div className="flex items-center justify-center gap-2 rounded-xl bg-background-body p-1 text-text-primary">
-            {tabs.map(tab => (
-              <button
-                type="button"
-                key={tab.key}
-                className={cn(
-                  'flex h-8 flex-1 shrink-0 items-center justify-center rounded-lg p-2 system-sm-medium text-text-tertiary',
-                  activeTab === tab.key && 'bg-components-main-nav-nav-button-bg-active text-text-accent shadow-md',
-                )}
-                onClick={() => setActiveTab(tab.key as AppIconType)}
-              >
-                {tab.icon}
-                {' '}
+    <Dialog open>
+      <DialogContent className={cn('w-full overflow-hidden! border-none text-left align-middle', s.container, 'h-[min(462px,calc(100dvh-2rem))]! max-h-none! w-[362px]! p-0!')}>
+
+        {!DISABLE_UPLOAD_IMAGE_AS_ICON && (
+          <div className="w-full p-2 pb-0">
+            <div className="flex items-center justify-center gap-2 rounded-xl bg-background-body p-1 text-text-primary">
+              {tabs.map(tab => (
+                <button
+                  type="button"
+                  key={tab.key}
+                  className={cn(
+                    'flex h-8 flex-1 shrink-0 items-center justify-center rounded-lg p-2 system-sm-medium text-text-tertiary',
+                    activeTab === tab.key && 'bg-components-main-nav-nav-button-bg-active text-text-accent shadow-md',
+                  )}
+                  onClick={() => setActiveTab(tab.key as AppIconType)}
+                >
+                  {tab.icon}
+                  {' '}
 &nbsp;
-                {tab.label}
-              </button>
-            ))}
+                  {tab.label}
+                </button>
+              ))}
+            </div>
           </div>
+        )}
+
+        {activeTab === 'emoji' && (
+          <EmojiPickerInner
+            className={cn('flex-1 overflow-hidden pt-2')}
+            emoji={initialEmoji?.icon}
+            background={initialEmoji?.background ?? undefined}
+            onSelect={handleSelectEmoji}
+          />
+        )}
+        {activeTab === 'image' && <ImageInput className={cn('flex-1 overflow-hidden')} onImageInput={handleImageInput} />}
+
+        <Divider className="m-0" />
+        <div className="flex w-full items-center justify-center gap-2 p-3">
+          <Button className="w-full" onClick={() => onClose?.()}>
+            {t('iconPicker.cancel', { ns: 'app' })}
+          </Button>
+
+          <Button variant="primary" className="w-full" disabled={uploading} loading={uploading} onClick={handleSelect}>
+            {t('iconPicker.ok', { ns: 'app' })}
+          </Button>
         </div>
-      )}
-
-      {activeTab === 'emoji' && (
-        <EmojiPickerInner
-          className={cn('flex-1 overflow-hidden pt-2')}
-          emoji={initialEmoji?.icon}
-          background={initialEmoji?.background ?? undefined}
-          onSelect={handleSelectEmoji}
-        />
-      )}
-      {activeTab === 'image' && <ImageInput className={cn('flex-1 overflow-hidden')} onImageInput={handleImageInput} />}
-
-      <Divider className="m-0" />
-      <div className="flex w-full items-center justify-center gap-2 p-3">
-        <Button className="w-full" onClick={() => onClose?.()}>
-          {t('iconPicker.cancel', { ns: 'app' })}
-        </Button>
-
-        <Button variant="primary" className="w-full" disabled={uploading} loading={uploading} onClick={handleSelect}>
-          {t('iconPicker.ok', { ns: 'app' })}
-        </Button>
-      </div>
-    </Modal>
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/components/base/app-icon/__tests__/index.spec.tsx b/web/app/components/base/app-icon/__tests__/index.spec.tsx
index 4bbea1e0ae..54c1b8c361 100644
--- a/web/app/components/base/app-icon/__tests__/index.spec.tsx
+++ b/web/app/components/base/app-icon/__tests__/index.spec.tsx
@@ -26,9 +26,8 @@ describe('AppIcon', () => {
           super()
         }
 
-        // Mock basic functionality
         connectedCallback() {
-          this.innerHTML = '🤖'
+          this.innerHTML = this.getAttribute('id') || '🤖'
         }
       })
     }
@@ -51,6 +50,15 @@ describe('AppIcon', () => {
     expect(emojiElement?.getAttribute('id')).toBe('smile')
   })
 
+  it('updates the rendered emoji when icon changes', () => {
+    const { rerender } = render(<AppIcon icon="smile" />)
+    expect(document.querySelector('em-emoji')).toHaveTextContent('smile')
+
+    rerender(<AppIcon icon="robot" />)
+
+    expect(document.querySelector('em-emoji')).toHaveTextContent('robot')
+  })
+
   it('renders image when iconType is image and imageUrl is provided', () => {
     render(<AppIcon iconType="image" imageUrl="test-image.jpg" />)
     const imgElement = screen.getByAltText('app icon')
diff --git a/web/app/components/base/app-icon/index.tsx b/web/app/components/base/app-icon/index.tsx
index 5c15179446..b08ac5e981 100644
--- a/web/app/components/base/app-icon/index.tsx
+++ b/web/app/components/base/app-icon/index.tsx
@@ -104,7 +104,8 @@ const AppIcon: FC<AppIconProps> = ({
   showEditIcon = false,
 }) => {
   const isValidImageIcon = iconType === 'image' && imageUrl
-  const Icon = (icon && icon !== '') ? <em-emoji id={icon} /> : <em-emoji id="🤖" />
+  const emojiIcon = (icon && icon !== '') ? icon : '🤖'
+  const Icon = <em-emoji key={emojiIcon} id={emojiIcon} />
   const wrapperRef = useRef<HTMLSpanElement>(null)
   const isHovering = useHover(wrapperRef)
 
diff --git a/web/app/components/base/audio-btn/audio.ts b/web/app/components/base/audio-btn/audio.ts
index 24615b333f..9d524640fa 100644
--- a/web/app/components/base/audio-btn/audio.ts
+++ b/web/app/components/base/audio-btn/audio.ts
@@ -136,6 +136,10 @@ export default class AudioPlayer {
     }
     else {
       this.isLoadData = true
+      this.audioContext.resume().then((_) => {
+        this.audio.play()
+        this.callback?.('play')
+      })
       this.loadAudio()
     }
   }
diff --git a/web/app/components/base/audio-btn/index.tsx b/web/app/components/base/audio-btn/index.tsx
index 3ca453213d..999193deed 100644
--- a/web/app/components/base/audio-btn/index.tsx
+++ b/web/app/components/base/audio-btn/index.tsx
@@ -88,8 +88,9 @@ const AudioBtn = ({
             <span className="inline-flex">
               <button
                 type="button"
+                aria-label={tooltipContent}
                 disabled={audioState === 'loading'}
-                className={`box-border flex h-6 w-6 cursor-pointer items-center justify-center ${isAudition ? 'p-0.5' : 'rounded-md bg-white p-0'}`}
+                className={`box-border flex h-6 w-6 cursor-pointer items-center justify-center border-none bg-transparent ${isAudition ? 'p-0.5' : 'rounded-md bg-white p-0'}`}
                 onClick={handleToggle}
               >
                 {audioState === 'loading'
diff --git a/web/app/components/base/audio-gallery/AudioPlayer.tsx b/web/app/components/base/audio-gallery/AudioPlayer.tsx
index 1290fff871..cb7146a8c6 100644
--- a/web/app/components/base/audio-gallery/AudioPlayer.tsx
+++ b/web/app/components/base/audio-gallery/AudioPlayer.tsx
@@ -1,8 +1,8 @@
 import { cn } from '@langgenius/dify-ui/cn'
 import { toast } from '@langgenius/dify-ui/toast'
-import { t } from 'i18next'
 import * as React from 'react'
 import { useCallback, useEffect, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
 import useTheme from '@/hooks/use-theme'
 import { Theme } from '@/types/app'
 
@@ -11,6 +11,7 @@ type AudioPlayerProps = {
   srcs?: string[] // Support multiple sources
 }
 const AudioPlayer: React.FC<AudioPlayerProps> = ({ src, srcs }) => {
+  const { t } = useTranslation()
   const [isPlaying, setIsPlaying] = useState(false)
   const [currentTime, setCurrentTime] = useState(0)
   const [duration, setDuration] = useState(0)
@@ -22,6 +23,7 @@ const AudioPlayer: React.FC<AudioPlayerProps> = ({ src, srcs }) => {
   const [hoverTime, setHoverTime] = useState(0)
   const [isAudioAvailable, setIsAudioAvailable] = useState(true)
   const { theme } = useTheme()
+  const playPauseLabel = t(isPlaying ? 'operation.pause' : 'operation.play', { ns: 'common' })
   useEffect(() => {
     const audio = audioRef.current
     /* v8 ignore next 2 - @preserve */
@@ -245,10 +247,10 @@ const AudioPlayer: React.FC<AudioPlayerProps> = ({ src, srcs }) => {
         {/* If srcs array is provided, render multiple source elements */}
         {srcs && srcs.map((srcUrl, index) => (<source key={index} src={srcUrl} />))}
       </audio>
-      <button type="button" data-testid="play-pause-btn" className="inline-flex shrink-0 cursor-pointer items-center justify-center border-none text-text-accent transition-all hover:text-text-accent-secondary disabled:text-components-button-primary-bg-disabled" onClick={togglePlay} disabled={!isAudioAvailable}>
+      <button type="button" aria-label={playPauseLabel} className="inline-flex shrink-0 cursor-pointer items-center justify-center border-none text-text-accent transition-all hover:text-text-accent-secondary disabled:text-components-button-primary-bg-disabled" onClick={togglePlay} disabled={!isAudioAvailable}>
         {isPlaying
-          ? (<div className="i-ri-pause-circle-fill h-5 w-5" />)
-          : (<div className="i-ri-play-large-fill h-5 w-5" />)}
+          ? (<div className="i-ri-pause-circle-fill h-5 w-5" aria-hidden="true" />)
+          : (<div className="i-ri-play-large-fill h-5 w-5" aria-hidden="true" />)}
       </button>
       <div className={cn(isAudioAvailable && 'grow')} hidden={!isAudioAvailable}>
         <div className="flex h-8 items-center justify-center">
diff --git a/web/app/components/base/audio-gallery/__tests__/AudioPlayer.spec.tsx b/web/app/components/base/audio-gallery/__tests__/AudioPlayer.spec.tsx
index f05c5d2582..3d27286c76 100644
--- a/web/app/components/base/audio-gallery/__tests__/AudioPlayer.spec.tsx
+++ b/web/app/components/base/audio-gallery/__tests__/AudioPlayer.spec.tsx
@@ -50,6 +50,9 @@ function getReactProps<T extends Element>(el: T): Record<string, ReactEventHandl
   return key ? (el as unknown as Record<string, Record<string, ReactEventHandler>>)[key]! : {}
 }
 
+const getPlayButton = () => screen.getByRole('button', { name: 'common.operation.play' })
+const getPauseButton = () => screen.getByRole('button', { name: 'common.operation.pause' })
+
 // ─── Setup / teardown ─────────────────────────────────────────────────────────
 
 beforeEach(() => {
@@ -77,7 +80,7 @@ describe('AudioPlayer — rendering', () => {
   it('should render the play button and audio element when given a src', () => {
     render(<AudioPlayer src="https://example.com/a.mp3" />)
 
-    expect(screen.getByTestId('play-pause-btn'))!.toBeInTheDocument()
+    expect(getPlayButton())!.toBeInTheDocument()
     expect(document.querySelector('audio'))!.toBeInTheDocument()
     expect(document.querySelector('audio')?.getAttribute('src')).toBe('https://example.com/a.mp3')
   })
@@ -93,7 +96,7 @@ describe('AudioPlayer — rendering', () => {
 
   it('should render without crashing when no props are supplied', () => {
     render(<AudioPlayer />)
-    expect(screen.getByTestId('play-pause-btn'))!.toBeInTheDocument()
+    expect(getPlayButton())!.toBeInTheDocument()
   })
 })
 
@@ -102,7 +105,7 @@ describe('AudioPlayer — rendering', () => {
 describe('AudioPlayer — play/pause', () => {
   it('should call audio.play() on first button click', async () => {
     render(<AudioPlayer src="https://example.com/a.mp3" />)
-    const btn = screen.getByTestId('play-pause-btn')
+    const btn = getPlayButton()
 
     await act(async () => {
       fireEvent.click(btn)
@@ -113,13 +116,13 @@ describe('AudioPlayer — play/pause', () => {
 
   it('should call audio.pause() on second button click', async () => {
     render(<AudioPlayer src="https://example.com/a.mp3" />)
-    const btn = screen.getByTestId('play-pause-btn')
+    const btn = getPlayButton()
 
     await act(async () => {
       fireEvent.click(btn)
     })
     await act(async () => {
-      fireEvent.click(btn)
+      fireEvent.click(getPauseButton())
     })
 
     expect(HTMLMediaElement.prototype.pause).toHaveBeenCalledTimes(1)
@@ -127,7 +130,7 @@ describe('AudioPlayer — play/pause', () => {
 
   it('should show the pause icon while playing and play icon while paused', async () => {
     render(<AudioPlayer src="https://example.com/a.mp3" />)
-    const btn = screen.getByTestId('play-pause-btn')
+    const btn = getPlayButton()
 
     expect(btn.querySelector('.i-ri-play-large-fill'))!.toBeInTheDocument()
     expect(btn.querySelector('.i-ri-pause-circle-fill')).not.toBeInTheDocument()
@@ -136,23 +139,25 @@ describe('AudioPlayer — play/pause', () => {
       fireEvent.click(btn)
     })
 
-    expect(btn.querySelector('.i-ri-pause-circle-fill'))!.toBeInTheDocument()
-    expect(btn.querySelector('.i-ri-play-large-fill')).not.toBeInTheDocument()
+    const pauseBtn = getPauseButton()
+    expect(pauseBtn.querySelector('.i-ri-pause-circle-fill'))!.toBeInTheDocument()
+    expect(pauseBtn.querySelector('.i-ri-play-large-fill')).not.toBeInTheDocument()
   })
 
   it('should reset to stopped state when the audio ends', async () => {
     render(<AudioPlayer src="https://example.com/a.mp3" />)
-    const btn = screen.getByTestId('play-pause-btn')
+    const btn = getPlayButton()
 
     await act(async () => {
       fireEvent.click(btn)
     })
-    expect(btn.querySelector('.i-ri-pause-circle-fill'))!.toBeInTheDocument()
+    expect(getPauseButton().querySelector('.i-ri-pause-circle-fill'))!.toBeInTheDocument()
 
     const audio = document.querySelector('audio') as HTMLAudioElement
     await act(async () => {
       audio.dispatchEvent(new Event('ended'))
     })
+    expect(getPlayButton().querySelector('.i-ri-play-large-fill'))!.toBeInTheDocument()
 
     expect(btn.querySelector('.i-ri-play-large-fill'))!.toBeInTheDocument()
   })
@@ -165,7 +170,7 @@ describe('AudioPlayer — play/pause', () => {
       audio.dispatchEvent(new Event('error'))
     })
 
-    expect(screen.getByTestId('play-pause-btn'))!.toBeDisabled()
+    expect(getPlayButton())!.toBeDisabled()
   })
 })
 
@@ -216,7 +221,7 @@ describe('AudioPlayer — audio events', () => {
       audio.dispatchEvent(new Event('error'))
     })
 
-    expect(screen.getByTestId('play-pause-btn'))!.toBeDisabled()
+    expect(getPlayButton())!.toBeDisabled()
   })
 })
 
@@ -276,7 +281,7 @@ describe('AudioPlayer — waveform generation', () => {
     render(<AudioPlayer srcs={['blob:something']} />)
     await advanceWaveformTimer()
 
-    expect(screen.getByTestId('play-pause-btn'))!.toBeDisabled()
+    expect(getPlayButton())!.toBeDisabled()
   })
 
   it('should not trigger waveform generation when no src or srcs provided', async () => {
@@ -462,7 +467,7 @@ describe('AudioPlayer — missing coverage', () => {
     vi.spyOn(HTMLMediaElement.prototype, 'play').mockRejectedValue(new Error('play failed'))
 
     render(<AudioPlayer src="https://example.com/audio.mp3" />)
-    const btn = screen.getByTestId('play-pause-btn')
+    const btn = getPlayButton()
 
     await act(async () => {
       fireEvent.click(btn)
@@ -530,7 +535,7 @@ describe('AudioPlayer — missing coverage', () => {
     render(<AudioPlayer src="blob:https://example.com" />)
     await advanceWaveformTimer() // sets isAudioAvailable to false (invalid protocol)
 
-    const btn = screen.getByTestId('play-pause-btn')
+    const btn = getPlayButton()
     await act(async () => {
       fireEvent.click(btn)
     })
@@ -549,7 +554,7 @@ describe('AudioPlayer — missing coverage', () => {
       audio.dispatchEvent(new Event('error'))
     })
 
-    const btn = screen.getByTestId('play-pause-btn')
+    const btn = getPlayButton()
     const props = getReactProps(btn)
 
     await act(async () => {
@@ -606,7 +611,7 @@ describe('AudioPlayer — additional branch coverage', () => {
       audio.dispatchEvent(new Event('error'))
     })
 
-    expect(screen.queryByTestId('play-pause-btn'))!.toBeDisabled()
+    expect(getPlayButton())!.toBeDisabled()
   })
 
   it('should update current time on timeupdate event', async () => {
@@ -627,7 +632,7 @@ describe('AudioPlayer — additional branch coverage', () => {
       audio.dispatchEvent(new Event('error'))
     })
 
-    const btn = screen.getByTestId('play-pause-btn')
+    const btn = getPlayButton()
     await act(async () => {
       fireEvent.click(btn)
     })
diff --git a/web/app/components/base/chat/__tests__/utils.spec.ts b/web/app/components/base/chat/__tests__/utils.spec.ts
index 0951880f9c..4cf20f716a 100644
--- a/web/app/components/base/chat/__tests__/utils.spec.ts
+++ b/web/app/components/base/chat/__tests__/utils.spec.ts
@@ -321,47 +321,86 @@ describe('chat utils - url params and answer helpers', () => {
       expect(res).toEqual({ custom: '123', encoded: 'a b' })
     })
 
+    it('getRawInputsFromUrlParams keeps encoded launch params as decoded plain values', async () => {
+      setSearch(`?custom=${encodeURIComponent('YWJjZA==')}`)
+      const res = await getRawInputsFromUrlParams()
+      expect(res).toEqual({ custom: 'YWJjZA==' })
+    })
+
     it('getRawUserVariablesFromUrlParams extracts only user. prefixed params', async () => {
       setSearch('?custom=123&sys.param=456&user.param=789&user.encoded=a%20b')
       const res = await getRawUserVariablesFromUrlParams()
       expect(res).toEqual({ param: '789', encoded: 'a b' })
     })
 
+    it('getRawUserVariablesFromUrlParams keeps encoded user values as decoded plain values', async () => {
+      setSearch(`?user.param=${encodeURIComponent('YWJjZA==')}`)
+      const res = await getRawUserVariablesFromUrlParams()
+      expect(res).toEqual({ param: 'YWJjZA==' })
+    })
+
     it('getProcessedInputsFromUrlParams decompresses base64 inputs', async () => {
-      setSearch('?custom=123&sys.param=456&user.param=789')
+      setSearch(`?custom=${encodeURIComponent('YWJjZA==')}&sys.param=456&user.param=789`)
       const res = await getProcessedInputsFromUrlParams()
       expect(res).toEqual({ custom: 'decompressed_text' })
     })
 
+    it('getProcessedInputsFromUrlParams returns undefined for plain decoded values', async () => {
+      vi.stubGlobal('atob', () => {
+        throw new Error('invalid')
+      })
+      setSearch('?custom=a%20b')
+      const res = await getProcessedInputsFromUrlParams()
+      expect(res).toEqual({ custom: undefined })
+    })
+
     it('getProcessedSystemVariablesFromUrlParams decompresses sys. prefixed params', async () => {
-      setSearch('?custom=123&sys.param=456&user.param=789')
+      setSearch(`?custom=123&sys.param=${encodeURIComponent('YWJjZA==')}&user.param=789`)
       const res = await getProcessedSystemVariablesFromUrlParams()
       expect(res).toEqual({ param: 'decompressed_text' })
     })
 
+    it('getProcessedSystemVariablesFromUrlParams returns undefined for plain decoded values', async () => {
+      vi.stubGlobal('atob', () => {
+        throw new Error('invalid')
+      })
+      setSearch('?sys.param=a%20b')
+      const res = await getProcessedSystemVariablesFromUrlParams()
+      expect(res).toEqual({ param: undefined })
+    })
+
     it('getProcessedSystemVariablesFromUrlParams parses redirect_url without query string', async () => {
-      setSearch(`?redirect_url=${encodeURIComponent('http://example.com')}&sys.param=456`)
+      setSearch(`?redirect_url=${encodeURIComponent('http://example.com')}&sys.param=${encodeURIComponent('YWJjZA==')}`)
       const res = await getProcessedSystemVariablesFromUrlParams()
       expect(res).toEqual({ param: 'decompressed_text' })
     })
 
     it('getProcessedSystemVariablesFromUrlParams parses redirect_url', async () => {
-      setSearch(`?redirect_url=${encodeURIComponent('http://example.com?sys.redirected=abc')}&sys.param=456`)
+      setSearch(`?redirect_url=${encodeURIComponent(`http://example.com?sys.redirected=${encodeURIComponent('YWJjZA==')}`)}&sys.param=${encodeURIComponent('YWJjZA==')}`)
       const res = await getProcessedSystemVariablesFromUrlParams()
       expect(res).toEqual({ param: 'decompressed_text', redirected: 'decompressed_text' })
     })
 
     it('getProcessedUserVariablesFromUrlParams decompresses user. prefixed params', async () => {
-      setSearch('?custom=123&sys.param=456&user.param=789')
+      setSearch(`?custom=123&sys.param=456&user.param=${encodeURIComponent('YWJjZA==')}`)
       const res = await getProcessedUserVariablesFromUrlParams()
       expect(res).toEqual({ param: 'decompressed_text' })
     })
 
+    it('getProcessedUserVariablesFromUrlParams returns undefined for plain decoded values', async () => {
+      vi.stubGlobal('atob', () => {
+        throw new Error('invalid')
+      })
+      setSearch('?user.param=a%20b')
+      const res = await getProcessedUserVariablesFromUrlParams()
+      expect(res).toEqual({ param: undefined })
+    })
+
     it('decodeBase64AndDecompress failure returns undefined softly', async () => {
       vi.stubGlobal('atob', () => {
         throw new Error('invalid')
       })
-      setSearch('?custom=invalid_base64')
+      setSearch(`?custom=${encodeURIComponent('YWJjZA==')}`)
       const res = await getProcessedInputsFromUrlParams()
       expect(res).toEqual({ custom: undefined })
     })
diff --git a/web/app/components/base/chat/chat-with-history/__tests__/chat-wrapper.spec.tsx b/web/app/components/base/chat/chat-with-history/__tests__/chat-wrapper.spec.tsx
index 83a8666e79..563adbd59e 100644
--- a/web/app/components/base/chat/chat-with-history/__tests__/chat-wrapper.spec.tsx
+++ b/web/app/components/base/chat/chat-with-history/__tests__/chat-wrapper.spec.tsx
@@ -1333,10 +1333,10 @@ describe('ChatWrapper', () => {
 
     render(<ChatWrapper />)
 
-    fireEvent.click(await screen.findByTestId('edit-btn'))
+    fireEvent.click(await screen.findByRole('button', { name: 'common.operation.edit' }))
     const editedTextarea = await screen.findByDisplayValue('Original question')
     fireEvent.change(editedTextarea, { target: { value: 'Edited question text' } })
-    fireEvent.click(screen.getByTestId('save-edit-btn'))
+    fireEvent.click(screen.getByRole('button', { name: 'common.operation.save' }))
 
     await waitFor(() => {
       expect(handleSend).toHaveBeenCalledWith(
diff --git a/web/app/components/base/chat/chat-with-history/__tests__/header-in-mobile.spec.tsx b/web/app/components/base/chat/chat-with-history/__tests__/header-in-mobile.spec.tsx
index 4cbe4ce8d1..084911c75a 100644
--- a/web/app/components/base/chat/chat-with-history/__tests__/header-in-mobile.spec.tsx
+++ b/web/app/components/base/chat/chat-with-history/__tests__/header-in-mobile.spec.tsx
@@ -40,43 +40,24 @@ vi.mock('../../embedded-chatbot/theme/theme-context', () => ({
   })),
 }))
 
-// Mock PortalToFollowElem using React Context
-vi.mock('@/app/components/base/portal-to-follow-elem', async () => {
-  const React = await import('react')
-  const MockContext = React.createContext(false)
+vi.mock('@langgenius/dify-ui/dropdown-menu', () => import('@/__mocks__/base-ui-dropdown-menu'))
+vi.mock('@langgenius/dify-ui/tooltip', () => import('@/__mocks__/base-ui-tooltip'))
 
-  return {
-    PortalToFollowElem: ({ children, open }: { children: React.ReactNode, open: boolean }) => {
-      return (
-        <MockContext.Provider value={open}>
-          <div data-open={open}>{children}</div>
-        </MockContext.Provider>
-      )
-    },
-    PortalToFollowElemContent: ({ children }: { children: React.ReactNode }) => {
-      const open = React.useContext(MockContext)
-      if (!open)
-        return null
-      return <div>{children}</div>
-    },
-    PortalToFollowElemTrigger: ({ children, onClick, ...props }: { children: React.ReactNode, onClick: () => void } & React.HTMLAttributes<HTMLDivElement>) => (
-      <div onClick={onClick} {...props}>{children}</div>
-    ),
-  }
-})
-
-// Mock Modal to avoid Headless UI issues in tests
-vi.mock('@/app/components/base/modal', () => ({
-  default: ({ children, isShow, title }: { children: React.ReactNode, isShow: boolean, title: React.ReactNode }) => {
-    if (!isShow)
+// Mock Dialog to avoid Base UI focus/portal behavior in tests
+vi.mock('@langgenius/dify-ui/dialog', () => ({
+  Dialog: ({ children, open }: { children: React.ReactNode, open?: boolean }) => {
+    if (!open)
       return null
     return (
-      <div role="dialog" data-testid="modal">
-        {!!title && <div>{title}</div>}
+      <div data-testid="modal">
         {children}
       </div>
     )
   },
+  DialogContent: ({ children }: { children: React.ReactNode }) => (
+    <div role="dialog" data-testid="modal-content">{children}</div>
+  ),
+  DialogTitle: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
 }))
 
 // Sidebar mock removed to use real component
@@ -203,7 +184,7 @@ describe('HeaderInMobile', () => {
     render(<HeaderInMobile />)
 
     // Open dropdown (More button)
-    fireEvent.click(await screen.findByTestId('mobile-more-btn'))
+    fireEvent.click(await screen.findByRole('button', { name: 'common.operation.more' }))
 
     // Find and click "View Chat Settings"
     await waitFor(() => {
@@ -232,7 +213,7 @@ describe('HeaderInMobile', () => {
     render(<HeaderInMobile />)
 
     // Open dropdown and chat settings
-    fireEvent.click(await screen.findByTestId('mobile-more-btn'))
+    fireEvent.click(await screen.findByRole('button', { name: 'common.operation.more' }))
     await waitFor(() => {
       expect(screen.getByText(/share\.chat\.viewChatSettings/i))!.toBeInTheDocument()
     })
@@ -260,7 +241,7 @@ describe('HeaderInMobile', () => {
     render(<HeaderInMobile />)
 
     // Open dropdown
-    fireEvent.click(await screen.findByTestId('mobile-more-btn'))
+    fireEvent.click(await screen.findByRole('button', { name: 'common.operation.more' }))
 
     // "View Chat Settings" should not be present
     await waitFor(() => {
@@ -278,7 +259,7 @@ describe('HeaderInMobile', () => {
     render(<HeaderInMobile />)
 
     // Open dropdown
-    fireEvent.click(await screen.findByTestId('mobile-more-btn'))
+    fireEvent.click(await screen.findByRole('button', { name: 'common.operation.more' }))
 
     // Click "New Conversation" or "Reset Chat"
     await waitFor(() => {
diff --git a/web/app/components/base/chat/chat-with-history/header/__tests__/index.spec.tsx b/web/app/components/base/chat/chat-with-history/header/__tests__/index.spec.tsx
index b1c23a129b..b3f2f6fcb4 100644
--- a/web/app/components/base/chat/chat-with-history/header/__tests__/index.spec.tsx
+++ b/web/app/components/base/chat/chat-with-history/header/__tests__/index.spec.tsx
@@ -16,43 +16,24 @@ vi.mock('@/app/components/base/chat/chat-with-history/inputs-form/content', () =
   default: () => <div data-testid="inputs-form-content">InputsFormContent</div>,
 }))
 
-// Mock PortalToFollowElem using React Context
-vi.mock('@/app/components/base/portal-to-follow-elem', async () => {
-  const React = await import('react')
-  const MockContext = React.createContext(false)
+vi.mock('@langgenius/dify-ui/dropdown-menu', () => import('@/__mocks__/base-ui-dropdown-menu'))
+vi.mock('@langgenius/dify-ui/tooltip', () => import('@/__mocks__/base-ui-tooltip'))
 
-  return {
-    PortalToFollowElem: ({ children, open }: { children: React.ReactNode, open: boolean }) => {
-      return (
-        <MockContext.Provider value={open}>
-          <div data-open={open}>{children}</div>
-        </MockContext.Provider>
-      )
-    },
-    PortalToFollowElemContent: ({ children }: { children: React.ReactNode }) => {
-      const open = React.useContext(MockContext)
-      if (!open)
-        return null
-      return <div>{children}</div>
-    },
-    PortalToFollowElemTrigger: ({ children, onClick }: { children: React.ReactNode, onClick: () => void }) => (
-      <div onClick={onClick}>{children}</div>
-    ),
-  }
-})
-
-// Mock Modal to avoid Headless UI issues in tests
-vi.mock('@/app/components/base/modal', () => ({
-  default: ({ children, isShow, title }: { children: React.ReactNode, isShow: boolean, title: React.ReactNode }) => {
-    if (!isShow)
+// Mock Dialog to avoid Base UI focus/portal behavior in tests
+vi.mock('@langgenius/dify-ui/dialog', () => ({
+  Dialog: ({ children, open }: { children: React.ReactNode, open?: boolean }) => {
+    if (!open)
       return null
     return (
       <div data-testid="modal">
-        {!!title && <div>{title}</div>}
         {children}
       </div>
     )
   },
+  DialogContent: ({ children }: { children: React.ReactNode }) => (
+    <div role="dialog" data-testid="modal-content">{children}</div>
+  ),
+  DialogTitle: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
 }))
 
 const mockAppData: AppData = {
diff --git a/web/app/components/base/chat/chat-with-history/header/__tests__/mobile-operation-dropdown.spec.tsx b/web/app/components/base/chat/chat-with-history/header/__tests__/mobile-operation-dropdown.spec.tsx
index 525f9b89a5..3a2cbfd4cb 100644
--- a/web/app/components/base/chat/chat-with-history/header/__tests__/mobile-operation-dropdown.spec.tsx
+++ b/web/app/components/base/chat/chat-with-history/header/__tests__/mobile-operation-dropdown.spec.tsx
@@ -19,7 +19,7 @@ describe('MobileOperationDropdown Component', () => {
     render(<MobileOperationDropdown {...defaultProps} />)
 
     // Trigger button should be present (ActionButton renders a button)
-    const trigger = screen.getByRole('button')
+    const trigger = screen.getByRole('button', { name: 'common.operation.more' })
     expect(trigger).toBeInTheDocument()
 
     // Menu should be hidden initially
@@ -39,7 +39,7 @@ describe('MobileOperationDropdown Component', () => {
     const user = userEvent.setup()
     render(<MobileOperationDropdown {...defaultProps} hideViewChatSettings={true} />)
 
-    await user.click(screen.getByRole('button'))
+    await user.click(screen.getByRole('button', { name: 'common.operation.more' }))
 
     expect(screen.getByText('share.chat.resetChat')).toBeInTheDocument()
     expect(screen.queryByText('share.chat.viewChatSettings')).not.toBeInTheDocument()
@@ -49,7 +49,7 @@ describe('MobileOperationDropdown Component', () => {
     const user = userEvent.setup()
     render(<MobileOperationDropdown {...defaultProps} />)
 
-    await user.click(screen.getByRole('button'))
+    await user.click(screen.getByRole('button', { name: 'common.operation.more' }))
 
     // Reset Chat
     await user.click(screen.getByText('share.chat.resetChat'))
@@ -57,7 +57,7 @@ describe('MobileOperationDropdown Component', () => {
       expect(defaultProps.handleResetChat).toHaveBeenCalledTimes(1)
     })
 
-    await user.click(screen.getByRole('button'))
+    await user.click(screen.getByRole('button', { name: 'common.operation.more' }))
     // View Chat Settings
     await user.click(screen.getByText('share.chat.viewChatSettings'))
     await waitFor(() => {
@@ -68,7 +68,7 @@ describe('MobileOperationDropdown Component', () => {
   it('applies hover state to ActionButton when open', async () => {
     const user = userEvent.setup()
     render(<MobileOperationDropdown {...defaultProps} />)
-    const trigger = screen.getByRole('button')
+    const trigger = screen.getByRole('button', { name: 'common.operation.more' })
 
     // closed state
     expect(trigger).not.toHaveClass('action-btn-hover')
@@ -82,7 +82,7 @@ describe('MobileOperationDropdown Component', () => {
     const user = userEvent.setup()
     render(<MobileOperationDropdown {...defaultProps} />)
 
-    await user.click(screen.getByRole('button'))
+    await user.click(screen.getByRole('button', { name: 'common.operation.more' }))
     await user.click(screen.getByText('share.chat.resetChat'))
 
     await waitFor(() => {
diff --git a/web/app/components/base/chat/chat-with-history/header/mobile-operation-dropdown.tsx b/web/app/components/base/chat/chat-with-history/header/mobile-operation-dropdown.tsx
index 97180704f8..29821e3c5a 100644
--- a/web/app/components/base/chat/chat-with-history/header/mobile-operation-dropdown.tsx
+++ b/web/app/components/base/chat/chat-with-history/header/mobile-operation-dropdown.tsx
@@ -32,13 +32,16 @@ const MobileOperationDropdown = ({
       onOpenChange={setOpen}
     >
       <DropdownMenuTrigger
-        render={<div />}
-        data-testid="mobile-more-btn"
-      >
-        <ActionButton size="l" state={open ? ActionButtonState.Hover : ActionButtonState.Default}>
-          <div className="i-ri-more-fill h-[18px] w-[18px]" />
-        </ActionButton>
-      </DropdownMenuTrigger>
+        render={(
+          <ActionButton
+            aria-label={t('operation.more', { ns: 'common' })}
+            size="l"
+            state={open ? ActionButtonState.Hover : ActionButtonState.Default}
+          >
+            <div className="i-ri-more-fill h-[18px] w-[18px]" aria-hidden="true" />
+          </ActionButton>
+        )}
+      />
       <DropdownMenuContent
         placement="bottom-end"
         sideOffset={4}
diff --git a/web/app/components/base/chat/chat-with-history/inputs-form/__tests__/content.spec.tsx b/web/app/components/base/chat/chat-with-history/inputs-form/__tests__/content.spec.tsx
index 126ee77ae5..a53bdc3b93 100644
--- a/web/app/components/base/chat/chat-with-history/inputs-form/__tests__/content.spec.tsx
+++ b/web/app/components/base/chat/chat-with-history/inputs-form/__tests__/content.spec.tsx
@@ -248,7 +248,7 @@ describe('InputsFormContent', () => {
     expect(mockSetCurrentConversationInputs).toHaveBeenCalledWith(expect.objectContaining({ sel: 'A' }))
   })
 
-  it('renders select dropdown above the settings dialog layer', async () => {
+  it('renders select dropdown on the shared dify-ui overlay layer', async () => {
     const user = userEvent.setup()
     const context = createMockContext({
       inputsForms: [{ variable: 'sel', type: InputVarType.select, label: 'Sel', options: ['A', 'B'], default: 'B' }],
@@ -258,7 +258,7 @@ describe('InputsFormContent', () => {
     renderWithContext(<InputsFormContent />, context)
     await user.click(screen.getByText('B'))
 
-    expect(screen.getByText('A').closest('.z-\\[60\\]')).not.toBeNull()
+    expect(screen.getByText('A').closest('.z-50')).not.toBeNull()
   })
 
   it('handles select input with existing value (value not in options -> shows placeholder)', () => {
diff --git a/web/app/components/base/chat/chat-with-history/inputs-form/content.tsx b/web/app/components/base/chat/chat-with-history/inputs-form/content.tsx
index 380b914492..4e9f827aa8 100644
--- a/web/app/components/base/chat/chat-with-history/inputs-form/content.tsx
+++ b/web/app/components/base/chat/chat-with-history/inputs-form/content.tsx
@@ -92,7 +92,7 @@ const InputsFormContent = ({ showTip }: Props) => {
               <SelectTrigger className="w-full">
                 {String(inputsFormValue?.[form.variable] ?? form.default ?? form.label)}
               </SelectTrigger>
-              <SelectContent popupClassName="z-[60] w-(--anchor-width)">
+              <SelectContent>
                 {form.options.map((option: string) => (
                   <SelectItem key={option} value={option}>
                     <SelectItemText>{option}</SelectItemText>
diff --git a/web/app/components/base/chat/chat-with-history/sidebar/__tests__/index.spec.tsx b/web/app/components/base/chat/chat-with-history/sidebar/__tests__/index.spec.tsx
index 170f6d7fb5..19513deff1 100644
--- a/web/app/components/base/chat/chat-with-history/sidebar/__tests__/index.spec.tsx
+++ b/web/app/components/base/chat/chat-with-history/sidebar/__tests__/index.spec.tsx
@@ -62,18 +62,15 @@ vi.mock('@/next/navigation', () => ({
   usePathname: () => '/test',
 }))
 
-// Mock Modal to avoid Headless UI issues in tests
-vi.mock('@/app/components/base/modal', () => ({
-  default: ({ children, isShow, title }: { children: React.ReactNode, isShow: boolean, title: React.ReactNode }) => {
-    if (!isShow)
-      return null
-    return (
-      <div data-testid="modal">
-        {!!title && <div data-testid="modal-title">{title}</div>}
-        {children}
-      </div>
-    )
-  },
+vi.mock('@langgenius/dify-ui/dialog', () => ({
+  Dialog: ({ children, open }: { children: React.ReactNode, open?: boolean }) =>
+    open === false ? null : <>{children}</>,
+  DialogContent: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid="modal">{children}</div>
+  ),
+  DialogTitle: ({ children }: { children: React.ReactNode }) => (
+    <div data-testid="modal-title">{children}</div>
+  ),
 }))
 
 describe('Sidebar Index', () => {
@@ -490,7 +487,7 @@ describe('Sidebar Index', () => {
       render(<Sidebar />)
 
       await user.click(screen.getByTestId('rename-1'))
-      expect(screen.getByTestId('modal')).toBeInTheDocument()
+      expect(screen.getByText('common.chat.renameConversation')).toBeInTheDocument()
     })
 
     it('should pass correct props to rename modal', async () => {
@@ -499,7 +496,9 @@ describe('Sidebar Index', () => {
 
       await user.click(screen.getByTestId('rename-1'))
       // The modal should have title and save/cancel
-      expect(screen.getByTestId('modal')).toBeInTheDocument()
+      expect(screen.getByText('common.chat.renameConversation')).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'common.operation.save' })).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'common.operation.cancel' })).toBeInTheDocument()
     })
 
     it('should call handleRenameConversation with new name', async () => {
@@ -531,13 +530,13 @@ describe('Sidebar Index', () => {
       render(<Sidebar />)
 
       await user.click(screen.getByTestId('rename-1'))
-      expect(screen.getByTestId('modal')).toBeInTheDocument()
+      expect(screen.getByText('common.chat.renameConversation')).toBeInTheDocument()
 
       const cancelButton = screen.getByText('common.operation.cancel')
       await user.click(cancelButton)
 
       await waitFor(() => {
-        expect(screen.queryByTestId('modal')).not.toBeInTheDocument()
+        expect(screen.queryByText('common.chat.renameConversation')).not.toBeInTheDocument()
       })
     })
 
@@ -882,8 +881,7 @@ describe('RenameModal', () => {
       />,
     )
 
-    expect(screen.getByTestId('modal')).toBeInTheDocument()
-    expect(screen.getByTestId('modal-title')).toHaveTextContent('common.chat.renameConversation')
+    expect(screen.getByText('common.chat.renameConversation')).toBeInTheDocument()
   })
 
   it('should handle empty placeholder translation fallback', () => {
diff --git a/web/app/components/base/chat/chat-with-history/sidebar/__tests__/item.spec.tsx b/web/app/components/base/chat/chat-with-history/sidebar/__tests__/item.spec.tsx
index b46bcc4607..afd4178d56 100644
--- a/web/app/components/base/chat/chat-with-history/sidebar/__tests__/item.spec.tsx
+++ b/web/app/components/base/chat/chat-with-history/sidebar/__tests__/item.spec.tsx
@@ -7,9 +7,9 @@ import Item from '../item'
 vi.mock('@/app/components/base/chat/chat-with-history/sidebar/operation', () => ({
   default: ({ togglePin, onRenameConversation, onDelete, isItemHovering, isActive, isPinned }: { togglePin: () => void, onRenameConversation: () => void, onDelete: () => void, isItemHovering: boolean, isActive: boolean, isPinned: boolean }) => (
     <div data-testid="mock-operation">
-      <button onClick={togglePin} data-testid="pin-button">Pin</button>
-      <button onClick={onRenameConversation} data-testid="rename-button">Rename</button>
-      <button onClick={onDelete} data-testid="delete-button">Delete</button>
+      <button onClick={togglePin}>Pin</button>
+      <button onClick={onRenameConversation}>Rename</button>
+      <button onClick={onDelete}>Delete</button>
       <span data-hovering={isItemHovering} data-testid="hover-indicator">Hovering</span>
       <span data-active={isActive} data-testid="active-indicator">Active</span>
       <span data-pinned={isPinned} data-testid="pinned-indicator">Pinned</span>
@@ -137,7 +137,7 @@ describe('Item', () => {
       const onOperate = vi.fn()
       render(<Item {...defaultProps} onOperate={onOperate} isPin={true} />)
 
-      await user.click(screen.getByTestId('pin-button'))
+      await user.click(screen.getByRole('button', { name: 'Pin' }))
       expect(onOperate).toHaveBeenCalledWith('unpin', mockItem)
     })
 
@@ -146,7 +146,7 @@ describe('Item', () => {
       const onOperate = vi.fn()
       render(<Item {...defaultProps} onOperate={onOperate} isPin={false} />)
 
-      await user.click(screen.getByTestId('pin-button'))
+      await user.click(screen.getByRole('button', { name: 'Pin' }))
       expect(onOperate).toHaveBeenCalledWith('pin', mockItem)
     })
 
@@ -155,7 +155,7 @@ describe('Item', () => {
       const onOperate = vi.fn()
       render(<Item {...defaultProps} onOperate={onOperate} />)
 
-      await user.click(screen.getByTestId('pin-button'))
+      await user.click(screen.getByRole('button', { name: 'Pin' }))
       expect(onOperate).toHaveBeenCalledWith('pin', mockItem)
     })
   })
@@ -213,7 +213,7 @@ describe('Item', () => {
       const onChangeConversation = vi.fn()
       render(<Item {...defaultProps} onChangeConversation={onChangeConversation} />)
 
-      const deleteButton = screen.getByTestId('delete-button')
+      const deleteButton = screen.getByRole('button', { name: 'Delete' })
       await user.click(deleteButton)
 
       // onChangeConversation should not be called when Operation button is clicked
@@ -225,7 +225,7 @@ describe('Item', () => {
       const onOperate = vi.fn()
       render(<Item {...defaultProps} onOperate={onOperate} />)
 
-      await user.click(screen.getByTestId('delete-button'))
+      await user.click(screen.getByRole('button', { name: 'Delete' }))
       expect(onOperate).toHaveBeenCalledWith('delete', mockItem)
     })
 
@@ -234,7 +234,7 @@ describe('Item', () => {
       const onOperate = vi.fn()
       render(<Item {...defaultProps} onOperate={onOperate} />)
 
-      await user.click(screen.getByTestId('rename-button'))
+      await user.click(screen.getByRole('button', { name: 'Rename' }))
       expect(onOperate).toHaveBeenCalledWith('rename', mockItem)
     })
 
@@ -243,9 +243,9 @@ describe('Item', () => {
       const onOperate = vi.fn()
       render(<Item {...defaultProps} onOperate={onOperate} />)
 
-      await user.click(screen.getByTestId('rename-button'))
-      await user.click(screen.getByTestId('pin-button'))
-      await user.click(screen.getByTestId('delete-button'))
+      await user.click(screen.getByRole('button', { name: 'Rename' }))
+      await user.click(screen.getByRole('button', { name: 'Pin' }))
+      await user.click(screen.getByRole('button', { name: 'Delete' }))
 
       expect(onOperate).toHaveBeenCalledTimes(3)
     })
@@ -296,13 +296,13 @@ describe('Item', () => {
       const onOperate = vi.fn()
       render(<Item {...defaultProps} onOperate={onOperate} />)
 
-      await user.click(screen.getByTestId('rename-button'))
+      await user.click(screen.getByRole('button', { name: 'Rename' }))
       expect(onOperate).toHaveBeenNthCalledWith(1, 'rename', mockItem)
 
-      await user.click(screen.getByTestId('pin-button'))
+      await user.click(screen.getByRole('button', { name: 'Pin' }))
       expect(onOperate).toHaveBeenNthCalledWith(2, 'pin', mockItem)
 
-      await user.click(screen.getByTestId('delete-button'))
+      await user.click(screen.getByRole('button', { name: 'Delete' }))
       expect(onOperate).toHaveBeenNthCalledWith(3, 'delete', mockItem)
     })
 
@@ -314,12 +314,12 @@ describe('Item', () => {
         <Item {...defaultProps} onOperate={onOperate} isPin={false} />,
       )
 
-      await user.click(screen.getByTestId('pin-button'))
+      await user.click(screen.getByRole('button', { name: 'Pin' }))
       expect(onOperate).toHaveBeenCalledWith('pin', mockItem)
 
       rerender(<Item {...defaultProps} onOperate={onOperate} isPin={true} />)
 
-      await user.click(screen.getByTestId('pin-button'))
+      await user.click(screen.getByRole('button', { name: 'Pin' }))
       expect(onOperate).toHaveBeenCalledWith('unpin', mockItem)
     })
   })
@@ -412,7 +412,7 @@ describe('Item', () => {
 
       rerender(<Item {...defaultProps} onOperate={newOnOperate} />)
 
-      await user.click(screen.getByTestId('delete-button'))
+      await user.click(screen.getByRole('button', { name: 'Delete' }))
 
       expect(newOnOperate).toHaveBeenCalledWith('delete', mockItem)
       expect(oldOnOperate).not.toHaveBeenCalled()
diff --git a/web/app/components/base/chat/chat-with-history/sidebar/__tests__/rename-modal.spec.tsx b/web/app/components/base/chat/chat-with-history/sidebar/__tests__/rename-modal.spec.tsx
index 754d5c89b4..9c741beb0e 100644
--- a/web/app/components/base/chat/chat-with-history/sidebar/__tests__/rename-modal.spec.tsx
+++ b/web/app/components/base/chat/chat-with-history/sidebar/__tests__/rename-modal.spec.tsx
@@ -4,25 +4,13 @@ import userEvent from '@testing-library/user-event'
 import * as ReactI18next from 'react-i18next'
 import RenameModal from '../rename-modal'
 
-vi.mock('@/app/components/base/modal', () => ({
-  default: ({
-    title,
-    isShow,
-    children,
-  }: {
-    title: ReactNode
-    isShow: boolean
-    children: ReactNode
-  }) => {
-    if (!isShow)
-      return null
-    return (
-      <div role="dialog">
-        <h2>{title}</h2>
-        {children}
-      </div>
-    )
-  },
+vi.mock('@langgenius/dify-ui/dialog', () => ({
+  Dialog: ({ children, open }: { children: ReactNode, open?: boolean }) =>
+    open === false ? null : <>{children}</>,
+  DialogContent: ({ children }: { children: ReactNode }) => (
+    <div role="dialog">{children}</div>
+  ),
+  DialogTitle: ({ children }: { children: ReactNode }) => <h2>{children}</h2>,
 }))
 
 describe('RenameModal', () => {
diff --git a/web/app/components/base/chat/chat-with-history/sidebar/operation.tsx b/web/app/components/base/chat/chat-with-history/sidebar/operation.tsx
index a350e3f316..261ad1a280 100644
--- a/web/app/components/base/chat/chat-with-history/sidebar/operation.tsx
+++ b/web/app/components/base/chat/chat-with-history/sidebar/operation.tsx
@@ -54,22 +54,22 @@ const Operation: FC<Props> = ({
       onOpenChange={setOpen}
     >
       <DropdownMenuTrigger
-        render={<div />}
+        render={(
+          <ActionButton
+            className={cn((isItemHovering || open) ? 'pointer-events-auto opacity-100' : 'pointer-events-none opacity-0')}
+            state={
+              isActive
+                ? ActionButtonState.Active
+                : open
+                  ? ActionButtonState.Hover
+                  : ActionButtonState.Default
+            }
+          >
+            <span aria-hidden className="i-ri-more-fill h-4 w-4" />
+          </ActionButton>
+        )}
         onClick={e => e.stopPropagation()}
-      >
-        <ActionButton
-          className={cn((isItemHovering || open) ? 'pointer-events-auto opacity-100' : 'pointer-events-none opacity-0')}
-          state={
-            isActive
-              ? ActionButtonState.Active
-              : open
-                ? ActionButtonState.Hover
-                : ActionButtonState.Default
-          }
-        >
-          <span aria-hidden className="i-ri-more-fill h-4 w-4" />
-        </ActionButton>
-      </DropdownMenuTrigger>
+      />
       <DropdownMenuContent
         placement="bottom-end"
         sideOffset={4}
diff --git a/web/app/components/base/chat/chat-with-history/sidebar/rename-modal.tsx b/web/app/components/base/chat/chat-with-history/sidebar/rename-modal.tsx
index 5cf981363c..54822659f2 100644
--- a/web/app/components/base/chat/chat-with-history/sidebar/rename-modal.tsx
+++ b/web/app/components/base/chat/chat-with-history/sidebar/rename-modal.tsx
@@ -1,11 +1,15 @@
 'use client'
 import type { FC } from 'react'
 import { Button } from '@langgenius/dify-ui/button'
+import {
+  Dialog,
+  DialogContent,
+  DialogTitle,
+} from '@langgenius/dify-ui/dialog'
 import * as React from 'react'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Input from '@/app/components/base/input'
-import Modal from '@/app/components/base/modal'
 
 type IRenameModalProps = {
   isShow: boolean
@@ -27,24 +31,28 @@ const RenameModal: FC<IRenameModalProps> = ({
   const conversationNamePlaceholder = t('chat.conversationNamePlaceholder', { ns: 'common' }) || ''
 
   return (
-    <Modal
-      title={t('chat.renameConversation', { ns: 'common' })}
-      isShow={isShow}
-      onClose={onClose}
+    <Dialog
+      open={isShow}
+      onOpenChange={open => !open && onClose()}
     >
-      <div className="mt-6 text-sm leading-[21px] font-medium text-text-primary">{t('chat.conversationName', { ns: 'common' })}</div>
-      <Input
-        className="mt-2 h-10 w-full"
-        value={tempName}
-        onChange={e => setTempName(e.target.value)}
-        placeholder={conversationNamePlaceholder}
-      />
+      <DialogContent>
+        <DialogTitle className="title-2xl-semi-bold text-text-primary">
+          {t('chat.renameConversation', { ns: 'common' })}
+        </DialogTitle>
+        <div className="mt-6 text-sm leading-[21px] font-medium text-text-primary">{t('chat.conversationName', { ns: 'common' })}</div>
+        <Input
+          className="mt-2 h-10 w-full"
+          value={tempName}
+          onChange={e => setTempName(e.target.value)}
+          placeholder={conversationNamePlaceholder}
+        />
 
-      <div className="mt-10 flex justify-end">
-        <Button className="mr-2 shrink-0" onClick={onClose}>{t('operation.cancel', { ns: 'common' })}</Button>
-        <Button variant="primary" className="shrink-0" onClick={() => onSave(tempName)} loading={saveLoading}>{t('operation.save', { ns: 'common' })}</Button>
-      </div>
-    </Modal>
+        <div className="mt-10 flex justify-end">
+          <Button className="mr-2 shrink-0" onClick={onClose}>{t('operation.cancel', { ns: 'common' })}</Button>
+          <Button variant="primary" className="shrink-0" onClick={() => onSave(tempName)} loading={saveLoading}>{t('operation.save', { ns: 'common' })}</Button>
+        </div>
+      </DialogContent>
+    </Dialog>
   )
 }
 export default React.memo(RenameModal)
diff --git a/web/app/components/base/chat/chat/__tests__/chat-log-modals.spec.tsx b/web/app/components/base/chat/chat/__tests__/chat-log-modals.spec.tsx
index 36e7cec67d..d888fbce98 100644
--- a/web/app/components/base/chat/chat/__tests__/chat-log-modals.spec.tsx
+++ b/web/app/components/base/chat/chat/__tests__/chat-log-modals.spec.tsx
@@ -98,7 +98,7 @@ describe('ChatLogModals', () => {
         />,
       )
 
-      await user.click(screen.getByTestId('close-btn-container'))
+      await user.click(screen.getByRole('button', { name: 'common.operation.close' }))
 
       expect(setCurrentLogItem).toHaveBeenCalled()
       expect(setShowPromptLogModal).toHaveBeenCalledWith(false)
diff --git a/web/app/components/base/chat/chat/__tests__/question.spec.tsx b/web/app/components/base/chat/chat/__tests__/question.spec.tsx
index df02cc1e03..9da528737a 100644
--- a/web/app/components/base/chat/chat/__tests__/question.spec.tsx
+++ b/web/app/components/base/chat/chat/__tests__/question.spec.tsx
@@ -183,7 +183,7 @@ describe('Question component', () => {
 
     renderWithProvider(makeItem())
 
-    const copyBtn = screen.getByTestId('copy-btn')
+    const copyBtn = screen.getByRole('button', { name: 'common.operation.copy' })
     await user.click(copyBtn)
 
     await waitFor(() => {
@@ -195,8 +195,8 @@ describe('Question component', () => {
   it('should not show edit action when enableEdit is false', () => {
     renderWithProvider(makeItem(), vi.fn() as unknown as OnRegenerate, { enableEdit: false })
 
-    expect(screen.getByTestId('copy-btn')).toBeInTheDocument()
-    expect(screen.queryByTestId('edit-btn')).not.toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'common.operation.copy' })).toBeInTheDocument()
+    expect(screen.queryByRole('button', { name: 'common.operation.edit' })).not.toBeInTheDocument()
   })
 
   it('should enter edit mode when edit action clicked, allow editing and call onRegenerate on resend', async () => {
@@ -206,7 +206,7 @@ describe('Question component', () => {
     const item = makeItem()
     renderWithProvider(item, onRegenerate)
 
-    const editBtn = screen.getByTestId('edit-btn')
+    const editBtn = screen.getByRole('button', { name: 'common.operation.edit' })
     await user.click(editBtn)
 
     const textbox = await screen.findByRole('textbox')
@@ -227,14 +227,14 @@ describe('Question component', () => {
     const user = userEvent.setup()
     const { container } = renderWithProvider(makeItem())
 
-    const editBtn = screen.getByTestId('edit-btn')
+    const editBtn = screen.getByRole('button', { name: 'common.operation.edit' })
     await user.click(editBtn)
 
     const textbox = await screen.findByRole('textbox')
     await user.clear(textbox)
     await user.type(textbox, 'Edited question')
 
-    const cancelBtn = await screen.findByTestId('cancel-edit-btn')
+    const cancelBtn = await screen.findByRole('button', { name: 'common.operation.cancel' })
     await user.click(cancelBtn)
 
     await waitFor(() => {
@@ -250,7 +250,7 @@ describe('Question component', () => {
 
     renderWithProvider(makeItem(), onRegenerate)
 
-    await user.click(screen.getByTestId('edit-btn'))
+    await user.click(screen.getByRole('button', { name: 'common.operation.edit' }))
     const textbox = await screen.findByRole('textbox')
 
     await user.clear(textbox)
@@ -269,7 +269,7 @@ describe('Question component', () => {
 
     renderWithProvider(makeItem(), onRegenerate)
 
-    await user.click(screen.getByTestId('edit-btn'))
+    await user.click(screen.getByRole('button', { name: 'common.operation.edit' }))
     const textbox = await screen.findByRole('textbox')
 
     await user.clear(textbox)
@@ -285,7 +285,7 @@ describe('Question component', () => {
 
     renderWithProvider(makeItem(), onRegenerate)
 
-    fireEvent.click(screen.getByTestId('edit-btn'))
+    fireEvent.click(screen.getByRole('button', { name: 'common.operation.edit' }))
     const textbox = screen.getByRole('textbox')
 
     fireEvent.compositionStart(textbox)
@@ -302,7 +302,7 @@ describe('Question component', () => {
       const onRegenerate = vi.fn() as unknown as OnRegenerate
       renderWithProvider(makeItem(), onRegenerate)
 
-      fireEvent.click(screen.getByTestId('edit-btn'))
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.edit' }))
       const textbox = screen.getByRole('textbox')
       fireEvent.change(textbox, { target: { value: 'IME guard text' } })
 
@@ -392,7 +392,7 @@ describe('Question component', () => {
 
     renderWithProvider(item, onRegenerate)
 
-    const editBtn = screen.getByTestId('edit-btn')
+    const editBtn = screen.getByRole('button', { name: 'common.operation.edit' })
     await user.click(editBtn)
 
     const textbox = await screen.findByRole('textbox')
@@ -431,7 +431,7 @@ describe('Question component', () => {
 
     renderWithProvider(item, onRegenerate)
 
-    await user.click(screen.getByTestId('edit-btn'))
+    await user.click(screen.getByRole('button', { name: 'common.operation.edit' }))
     const textbox = await screen.findByRole('textbox')
 
     // Press Shift+Enter
@@ -445,7 +445,7 @@ describe('Question component', () => {
     const onRegenerate = vi.fn() as unknown as OnRegenerate
     renderWithProvider(makeItem(), onRegenerate)
 
-    await user.click(screen.getByTestId('edit-btn'))
+    await user.click(screen.getByRole('button', { name: 'common.operation.edit' }))
     const textbox = await screen.findByRole('textbox')
 
     // Create an event with nativeEvent.isComposing = true
@@ -461,7 +461,7 @@ describe('Question component', () => {
     const onRegenerate = vi.fn() as unknown as OnRegenerate
     const { unmount } = renderWithProvider(makeItem(), onRegenerate)
 
-    await user.click(screen.getByTestId('edit-btn'))
+    await user.click(screen.getByRole('button', { name: 'common.operation.edit' }))
     const textbox = await screen.findByRole('textbox')
 
     fireEvent.compositionStart(textbox)
@@ -471,11 +471,11 @@ describe('Question component', () => {
     fireEvent.compositionStart(textbox)
     fireEvent.compositionEnd(textbox)
 
-    const cancelBtn = await screen.findByTestId('cancel-edit-btn')
+    const cancelBtn = await screen.findByRole('button', { name: 'common.operation.cancel' })
     await user.click(cancelBtn)
 
     // Test unmount clearing timer
-    await user.click(screen.getByTestId('edit-btn'))
+    await user.click(screen.getByRole('button', { name: 'common.operation.edit' }))
     const textbox2 = await screen.findByRole('textbox')
     fireEvent.compositionStart(textbox2)
     fireEvent.compositionEnd(textbox2)
@@ -489,13 +489,13 @@ describe('Question component', () => {
     const onRegenerate = vi.fn() as unknown as OnRegenerate
     renderWithProvider(makeItem(), onRegenerate)
 
-    await user.click(screen.getByTestId('edit-btn'))
+    await user.click(screen.getByRole('button', { name: 'common.operation.edit' }))
     const textbox = await screen.findByRole('textbox')
 
     fireEvent.compositionStart(textbox)
     fireEvent.compositionEnd(textbox) // starts timer
 
-    const saveBtn = screen.getByTestId('save-edit-btn')
+    const saveBtn = screen.getByRole('button', { name: 'common.operation.save' })
     await user.click(saveBtn) // handleResend clears timer
 
     expect(onRegenerate).toHaveBeenCalled()
@@ -661,14 +661,14 @@ describe('Question component', () => {
   it('should hide edit button when enableEdit is explicitly true', () => {
     renderWithProvider(makeItem(), vi.fn() as unknown as OnRegenerate, { enableEdit: true })
 
-    expect(screen.getByTestId('edit-btn')).toBeInTheDocument()
-    expect(screen.getByTestId('copy-btn')).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'common.operation.edit' })).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'common.operation.copy' })).toBeInTheDocument()
   })
 
   it('should show copy button always regardless of enableEdit setting', () => {
     renderWithProvider(makeItem(), vi.fn() as unknown as OnRegenerate, { enableEdit: false })
 
-    expect(screen.getByTestId('copy-btn')).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'common.operation.copy' })).toBeInTheDocument()
   })
 
   it('should not render content switch when no siblings exist', () => {
@@ -687,7 +687,7 @@ describe('Question component', () => {
     const user = userEvent.setup()
     renderWithProvider(makeItem())
 
-    await user.click(screen.getByTestId('edit-btn'))
+    await user.click(screen.getByRole('button', { name: 'common.operation.edit' }))
     const textbox = await screen.findByRole('textbox')
 
     expect(textbox).toHaveValue('This is the question content')
@@ -713,7 +713,7 @@ describe('Question component', () => {
 
     const { container } = renderWithProvider(makeItem({ message_files: files }))
 
-    await user.click(screen.getByTestId('edit-btn'))
+    await user.click(screen.getByRole('button', { name: 'common.operation.edit' }))
 
     // FileList should be visible in edit mode with mb-3 margin
     expect(screen.getByText(/test.txt/i)).toBeInTheDocument()
@@ -769,7 +769,7 @@ describe('Question component', () => {
     const onRegenerate = vi.fn() as unknown as OnRegenerate
     renderWithProvider(makeItem(), onRegenerate)
 
-    await userEvent.click(screen.getByTestId('edit-btn'))
+    await userEvent.click(screen.getByRole('button', { name: 'common.operation.edit' }))
     const textbox = await screen.findByRole('textbox')
 
     // Rapid composition cycles
@@ -792,7 +792,7 @@ describe('Question component', () => {
     const onRegenerate = vi.fn() as unknown as OnRegenerate
     renderWithProvider(makeItem(), onRegenerate)
 
-    await user.click(screen.getByTestId('edit-btn'))
+    await user.click(screen.getByRole('button', { name: 'common.operation.edit' }))
     const textbox = await screen.findByRole('textbox')
 
     await user.clear(textbox)
@@ -821,7 +821,7 @@ describe('Question component', () => {
     const item = makeItem({ message_files: files })
     renderWithProvider(item, onRegenerate)
 
-    await user.click(screen.getByTestId('edit-btn'))
+    await user.click(screen.getByRole('button', { name: 'common.operation.edit' }))
     const textbox = await screen.findByRole('textbox')
 
     await user.clear(textbox)
@@ -842,24 +842,24 @@ describe('Question component', () => {
     renderWithProvider(makeItem())
 
     // First edit cycle
-    await user.click(screen.getByTestId('edit-btn'))
+    await user.click(screen.getByRole('button', { name: 'common.operation.edit' }))
     let textbox = await screen.findByRole('textbox')
     fireEvent.compositionStart(textbox)
     fireEvent.compositionEnd(textbox)
 
     // Cancel and re-edit
-    let cancelBtn = await screen.findByTestId('cancel-edit-btn')
+    let cancelBtn = await screen.findByRole('button', { name: 'common.operation.cancel' })
     await user.click(cancelBtn)
 
     // Second edit cycle
-    await user.click(screen.getByTestId('edit-btn'))
+    await user.click(screen.getByRole('button', { name: 'common.operation.edit' }))
     textbox = await screen.findByRole('textbox')
     expect(textbox).toHaveValue('This is the question content')
 
     fireEvent.compositionStart(textbox)
     fireEvent.compositionEnd(textbox)
 
-    cancelBtn = await screen.findByTestId('cancel-edit-btn')
+    cancelBtn = await screen.findByRole('button', { name: 'common.operation.cancel' })
     await user.click(cancelBtn)
 
     expect(screen.queryByRole('textbox')).not.toBeInTheDocument()
@@ -875,7 +875,7 @@ describe('Question component', () => {
     expect(contentContainer).toHaveClass('rounded-2xl')
     expect(contentContainer).toHaveClass('bg-background-gradient-bg-fill-chat-bubble-bg-3')
 
-    await user.click(screen.getByTestId('edit-btn'))
+    await user.click(screen.getByRole('button', { name: 'common.operation.edit' }))
 
     // Edit mode classes
     expect(contentContainer).toHaveClass('rounded-[24px]')
@@ -918,8 +918,8 @@ describe('Question component', () => {
       </ChatContextProvider>,
     )
 
-    await user.click(screen.getByTestId('edit-btn'))
-    await user.click(screen.getByTestId('save-edit-btn'))
+    await user.click(screen.getByRole('button', { name: 'common.operation.edit' }))
+    await user.click(screen.getByRole('button', { name: 'common.operation.save' }))
     // Should not throw
   })
 
@@ -969,7 +969,7 @@ describe('Question component', () => {
   it('should clear timer on unmount when timer is active', async () => {
     const user = userEvent.setup()
     const { unmount } = renderWithProvider(makeItem())
-    await user.click(screen.getByTestId('edit-btn'))
+    await user.click(screen.getByRole('button', { name: 'common.operation.edit' }))
     const textbox = await screen.findByRole('textbox')
     fireEvent.compositionStart(textbox)
     fireEvent.compositionEnd(textbox) // starts timer
diff --git a/web/app/components/base/chat/chat/__tests__/use-chat-layout.spec.tsx b/web/app/components/base/chat/chat/__tests__/use-chat-layout.spec.tsx
index 15da63e4d0..cf7f63075d 100644
--- a/web/app/components/base/chat/chat/__tests__/use-chat-layout.spec.tsx
+++ b/web/app/components/base/chat/chat/__tests__/use-chat-layout.spec.tsx
@@ -182,11 +182,13 @@ describe('useChatLayout', () => {
 
       act(() => {
         capturedResizeCallbacks[0]?.([makeResizeEntry(80, 400)], {} as ResizeObserver)
+        flushAnimationFrames()
       })
       expect(screen.getByTestId('chat-container').style.paddingBottom).toBe('80px')
 
       act(() => {
         capturedResizeCallbacks[1]?.([makeResizeEntry(50, 560)], {} as ResizeObserver)
+        flushAnimationFrames()
       })
       expect(screen.getByTestId('chat-footer').style.width).toBe('560px')
 
diff --git a/web/app/components/base/chat/chat/answer/__tests__/operation.spec.tsx b/web/app/components/base/chat/chat/answer/__tests__/operation.spec.tsx
index 9eaf5fe374..816fd33341 100644
--- a/web/app/components/base/chat/chat/answer/__tests__/operation.spec.tsx
+++ b/web/app/components/base/chat/chat/answer/__tests__/operation.spec.tsx
@@ -219,13 +219,13 @@ describe('Operation', () => {
 
     it('should show copy and regenerate buttons', () => {
       renderOperation()
-      expect(screen.getByTestId('copy-btn'))!.toBeInTheDocument()
-      expect(screen.getByTestId('regenerate-btn'))!.toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'operation.copy' }))!.toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'operation.regenerate' }))!.toBeInTheDocument()
     })
 
     it('should hide regenerate button when noChatInput is true', () => {
       renderOperation({ ...baseProps, noChatInput: true })
-      expect(screen.queryByTestId('regenerate-btn')).not.toBeInTheDocument()
+      expect(screen.queryByRole('button', { name: 'operation.regenerate' })).not.toBeInTheDocument()
     })
 
     it('should show TTS button when text_to_speech is enabled', () => {
@@ -259,7 +259,7 @@ describe('Operation', () => {
     it('should copy content on copy click', async () => {
       const user = userEvent.setup()
       renderOperation()
-      await user.click(screen.getByTestId('copy-btn'))
+      await user.click(screen.getByRole('button', { name: 'operation.copy' }))
       expect(copy).toHaveBeenCalledWith('Hello world')
     })
 
@@ -274,7 +274,7 @@ describe('Operation', () => {
         ],
       }
       renderOperation({ ...baseProps, item })
-      await user.click(screen.getByTestId('copy-btn'))
+      await user.click(screen.getByRole('button', { name: 'operation.copy' }))
       expect(copy).toHaveBeenCalledWith('Hello World')
     })
   })
@@ -283,7 +283,7 @@ describe('Operation', () => {
     it('should call onRegenerate on regenerate click', async () => {
       const user = userEvent.setup()
       renderOperation()
-      await user.click(screen.getByTestId('regenerate-btn'))
+      await user.click(screen.getByRole('button', { name: 'operation.regenerate' }))
       expect(mockContextValue.onRegenerate).toHaveBeenCalledWith(baseItem)
     })
   })
@@ -299,7 +299,7 @@ describe('Operation', () => {
       const item = { ...baseItem, humanInputFormDataList: [{}] } as ChatItem
       renderOperation({ ...baseProps, item })
       expect(screen.queryByTestId('audio-btn')).not.toBeInTheDocument()
-      expect(screen.queryByTestId('copy-btn')).not.toBeInTheDocument()
+      expect(screen.queryByRole('button', { name: 'operation.copy' })).not.toBeInTheDocument()
     })
   })
 
@@ -441,9 +441,8 @@ describe('Operation', () => {
       renderOperation()
       const thumbDown = screen.getByTestId('operation-bar').querySelector('.i-ri-thumb-down-line')!.closest('button')!
       await user.click(thumbDown)
-      // Check if modal title/labels fallback works
-      // Check if modal title/labels fallback works
-      expect(screen.getByRole('tooltip'))!.toBeInTheDocument()
+      expect(screen.getByRole('dialog', { name: 'Provide Feedback' }))!.toBeInTheDocument()
+      expect(screen.getByLabelText('Feedback Content'))!.toBeInTheDocument()
       mockT.mockImplementation(key => key)
     })
   })
@@ -794,7 +793,7 @@ describe('Operation', () => {
       const user = userEvent.setup()
       const item: ChatItem = { ...baseItem, agent_thoughts: [] }
       renderOperation({ ...baseProps, item })
-      await user.click(screen.getByTestId('copy-btn'))
+      await user.click(screen.getByRole('button', { name: 'operation.copy' }))
       expect(copy).toHaveBeenCalledWith('Hello world')
     })
 
diff --git a/web/app/components/base/chat/chat/answer/human-input-content/__tests__/human-input-form.spec.tsx b/web/app/components/base/chat/chat/answer/human-input-content/__tests__/human-input-form.spec.tsx
index 4b3f7b2445..fb6c1259c0 100644
--- a/web/app/components/base/chat/chat/answer/human-input-content/__tests__/human-input-form.spec.tsx
+++ b/web/app/components/base/chat/chat/answer/human-input-content/__tests__/human-input-form.spec.tsx
@@ -50,7 +50,7 @@ describe('HumanInputForm', () => {
     expect(contentItems[1])!.toHaveTextContent('{{#$output.field1#}}')
     expect(contentItems[2])!.toHaveTextContent('Part 2')
 
-    const buttons = screen.getAllByTestId('action-button')
+    const buttons = screen.getAllByRole('button').filter(button => button.textContent !== 'Update')
     expect(buttons).toHaveLength(4)
     expect(buttons[0])!.toHaveTextContent('Submit')
     expect(buttons[1])!.toHaveTextContent('Cancel')
diff --git a/web/app/components/base/chat/chat/answer/human-input-content/human-input-form.tsx b/web/app/components/base/chat/chat/answer/human-input-content/human-input-form.tsx
index 0e7881d972..18d9d72376 100644
--- a/web/app/components/base/chat/chat/answer/human-input-content/human-input-form.tsx
+++ b/web/app/components/base/chat/chat/answer/human-input-content/human-input-form.tsx
@@ -49,7 +49,6 @@ const HumanInputForm = ({
             disabled={isSubmitting}
             variant={getButtonStyle(action.button_style) as ButtonProps['variant']}
             onClick={() => submit(formToken, action.id, inputs)}
-            data-testid="action-button"
           >
             {action.title}
           </Button>
diff --git a/web/app/components/base/chat/chat/answer/operation.tsx b/web/app/components/base/chat/chat/answer/operation.tsx
index e7d1c17a3e..265435acb0 100644
--- a/web/app/components/base/chat/chat/answer/operation.tsx
+++ b/web/app/components/base/chat/chat/answer/operation.tsx
@@ -1,13 +1,17 @@
-import type { FC } from 'react'
+import type { ReactElement, ReactNode } from 'react'
 import type {
   ChatItem,
   Feedback,
 } from '../../types'
+import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogCloseButton, DialogContent, DialogDescription, DialogTitle } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import copy from 'copy-to-clipboard'
 import {
   memo,
+  useId,
   useMemo,
   useState,
 } from 'react'
@@ -16,10 +20,8 @@ import EditReplyModal from '@/app/components/app/annotation/edit-annotation-moda
 import ActionButton, { ActionButtonState } from '@/app/components/base/action-button'
 import Log from '@/app/components/base/chat/chat/log'
 import AnnotationCtrlButton from '@/app/components/base/features/new-feature-panel/annotation-reply/annotation-ctrl-button'
-import Modal from '@/app/components/base/modal/modal'
 import NewAudioButton from '@/app/components/base/new-audio-button'
 import Textarea from '@/app/components/base/textarea'
-import Tooltip from '@/app/components/base/tooltip'
 import { useChatContext } from '../context'
 
 type OperationProps = {
@@ -33,7 +35,25 @@ type OperationProps = {
   noChatInput?: boolean
 }
 
-const Operation: FC<OperationProps> = ({
+type FeedbackTooltipProps = {
+  content: ReactNode
+  children: ReactElement
+}
+
+const feedbackTooltipClassName = 'max-w-[260px]'
+
+const FeedbackTooltip = ({ content, children }: FeedbackTooltipProps) => {
+  return (
+    <Tooltip>
+      <TooltipTrigger render={children} />
+      <TooltipContent className={feedbackTooltipClassName}>
+        {content}
+      </TooltipContent>
+    </Tooltip>
+  )
+}
+
+function Operation({
   item,
   question,
   index,
@@ -42,7 +62,7 @@ const Operation: FC<OperationProps> = ({
   contentWidth,
   hasWorkflowProcess,
   noChatInput,
-}) => {
+}: OperationProps) {
   const { t } = useTranslation()
   const {
     config,
@@ -68,8 +88,8 @@ const Operation: FC<OperationProps> = ({
   const [userLocalFeedback, setUserLocalFeedback] = useState(feedback)
   const [adminLocalFeedback, setAdminLocalFeedback] = useState(adminFeedback)
   const [feedbackTarget, setFeedbackTarget] = useState<'user' | 'admin'>('user')
+  const feedbackTextareaId = useId()
 
-  // Separate feedback types for display
   const userFeedback = feedback
 
   const content = useMemo(() => {
@@ -89,7 +109,11 @@ const Operation: FC<OperationProps> = ({
 
   const userFeedbackLabel = t('table.header.userRate', { ns: 'appLog' }) || 'User feedback'
   const adminFeedbackLabel = t('table.header.adminRate', { ns: 'appLog' }) || 'Admin feedback'
-  const feedbackTooltipClassName = 'max-w-[260px]'
+  const likeLabel = t('detail.operation.like', { ns: 'appLog' }) || 'Like'
+  const dislikeLabel = t('detail.operation.dislike', { ns: 'appLog' }) || 'Dislike'
+  const removeFeedbackLabel = t('operation.remove', { ns: 'common' }) || 'Remove'
+  const copyLabel = t('operation.copy', { ns: 'common' }) || 'Copy'
+  const regenerateLabel = t('operation.regenerate', { ns: 'common' }) || 'Regenerate'
 
   const buildFeedbackTooltip = (feedbackData?: Feedback | null, label = userFeedbackLabel) => {
     if (!feedbackData?.rating)
@@ -180,33 +204,35 @@ const Operation: FC<OperationProps> = ({
           >
             {hasUserFeedback
               ? (
-                  <Tooltip
-                    popupContent={buildFeedbackTooltip(displayUserFeedback, userFeedbackLabel)}
-                    popupClassName={feedbackTooltipClassName}
+                  <FeedbackTooltip
+                    content={buildFeedbackTooltip(displayUserFeedback, userFeedbackLabel)}
                   >
                     <ActionButton
+                      aria-label={`${userFeedbackLabel}: ${removeFeedbackLabel}`}
                       state={displayUserFeedback?.rating === 'like' ? ActionButtonState.Active : ActionButtonState.Destructive}
                       onClick={() => handleFeedback(null, undefined, 'user')}
                     >
                       {displayUserFeedback?.rating === 'like'
-                        ? <div className="i-ri-thumb-up-line h-4 w-4" />
-                        : <div className="i-ri-thumb-down-line h-4 w-4" />}
+                        ? <span aria-hidden="true" className="i-ri-thumb-up-line h-4 w-4" />
+                        : <span aria-hidden="true" className="i-ri-thumb-down-line h-4 w-4" />}
                     </ActionButton>
-                  </Tooltip>
+                  </FeedbackTooltip>
                 )
               : (
                   <>
                     <ActionButton
+                      aria-label={`${userFeedbackLabel}: ${likeLabel}`}
                       state={displayUserFeedback?.rating === 'like' ? ActionButtonState.Active : ActionButtonState.Default}
                       onClick={() => handleLikeClick('user')}
                     >
-                      <div className="i-ri-thumb-up-line h-4 w-4" />
+                      <span aria-hidden="true" className="i-ri-thumb-up-line h-4 w-4" />
                     </ActionButton>
                     <ActionButton
+                      aria-label={`${userFeedbackLabel}: ${dislikeLabel}`}
                       state={displayUserFeedback?.rating === 'dislike' ? ActionButtonState.Destructive : ActionButtonState.Default}
                       onClick={() => handleDislikeClick('user')}
                     >
-                      <div className="i-ri-thumb-down-line h-4 w-4" />
+                      <span aria-hidden="true" className="i-ri-thumb-down-line h-4 w-4" />
                     </ActionButton>
                   </>
                 )}
@@ -218,68 +244,65 @@ const Operation: FC<OperationProps> = ({
             (hasAdminFeedback || hasUserFeedback) ? 'flex' : 'hidden group-hover:flex',
           )}
           >
-            {/* User Feedback Display */}
             {displayUserFeedback?.rating && (
-              <Tooltip
-                popupContent={buildFeedbackTooltip(displayUserFeedback, userFeedbackLabel)}
-                popupClassName={feedbackTooltipClassName}
+              <FeedbackTooltip
+                content={buildFeedbackTooltip(displayUserFeedback, userFeedbackLabel)}
               >
                 {displayUserFeedback.rating === 'like'
                   ? (
-                      <ActionButton state={ActionButtonState.Active}>
-                        <div className="i-ri-thumb-up-line h-4 w-4" />
+                      <ActionButton aria-label={`${userFeedbackLabel}: ${likeLabel}`} state={ActionButtonState.Active}>
+                        <span aria-hidden="true" className="i-ri-thumb-up-line h-4 w-4" />
                       </ActionButton>
                     )
                   : (
-                      <ActionButton state={ActionButtonState.Destructive}>
-                        <div className="i-ri-thumb-down-line h-4 w-4" />
+                      <ActionButton aria-label={`${userFeedbackLabel}: ${dislikeLabel}`} state={ActionButtonState.Destructive}>
+                        <span aria-hidden="true" className="i-ri-thumb-down-line h-4 w-4" />
                       </ActionButton>
                     )}
-              </Tooltip>
+              </FeedbackTooltip>
             )}
 
-            {/* Admin Feedback Controls */}
             {displayUserFeedback?.rating && <div className="mx-1 h-3 w-[0.5px] bg-components-actionbar-border" />}
             {hasAdminFeedback
               ? (
-                  <Tooltip
-                    popupContent={buildFeedbackTooltip(adminLocalFeedback, adminFeedbackLabel)}
-                    popupClassName={feedbackTooltipClassName}
+                  <FeedbackTooltip
+                    content={buildFeedbackTooltip(adminLocalFeedback, adminFeedbackLabel)}
                   >
                     <ActionButton
+                      aria-label={`${adminFeedbackLabel}: ${removeFeedbackLabel}`}
                       state={adminLocalFeedback?.rating === 'like' ? ActionButtonState.Active : ActionButtonState.Destructive}
                       onClick={() => handleFeedback(null, undefined, 'admin')}
                     >
                       {adminLocalFeedback?.rating === 'like'
-                        ? <div className="i-ri-thumb-up-line h-4 w-4" />
-                        : <div className="i-ri-thumb-down-line h-4 w-4" />}
+                        ? <span aria-hidden="true" className="i-ri-thumb-up-line h-4 w-4" />
+                        : <span aria-hidden="true" className="i-ri-thumb-down-line h-4 w-4" />}
                     </ActionButton>
-                  </Tooltip>
+                  </FeedbackTooltip>
                 )
               : (
                   <>
-                    <Tooltip
-                      popupContent={buildFeedbackTooltip(adminLocalFeedback, adminFeedbackLabel)}
-                      popupClassName={feedbackTooltipClassName}
+                    <FeedbackTooltip
+                      content={buildFeedbackTooltip(adminLocalFeedback, adminFeedbackLabel)}
                     >
                       <ActionButton
+                        aria-label={`${adminFeedbackLabel}: ${likeLabel}`}
                         state={adminLocalFeedback?.rating === 'like' ? ActionButtonState.Active : ActionButtonState.Default}
                         onClick={() => handleLikeClick('admin')}
                       >
-                        <div className="i-ri-thumb-up-line h-4 w-4" />
+                        <span aria-hidden="true" className="i-ri-thumb-up-line h-4 w-4" />
                       </ActionButton>
-                    </Tooltip>
-                    <Tooltip
-                      popupContent={buildFeedbackTooltip(adminLocalFeedback, adminFeedbackLabel)}
-                      popupClassName={feedbackTooltipClassName}
+                    </FeedbackTooltip>
+                    <FeedbackTooltip
+                      content={buildFeedbackTooltip(adminLocalFeedback, adminFeedbackLabel)}
                     >
                       <ActionButton
+                        aria-label={`${adminFeedbackLabel}: ${dislikeLabel}`}
                         state={adminLocalFeedback?.rating === 'dislike' ? ActionButtonState.Destructive : ActionButtonState.Default}
                         onClick={() => handleDislikeClick('admin')}
                       >
-                        <div className="i-ri-thumb-down-line h-4 w-4" />
+                        <span aria-hidden="true" className="i-ri-thumb-down-line h-4 w-4" />
                       </ActionButton>
-                    </Tooltip>
+                    </FeedbackTooltip>
                   </>
                 )}
           </div>
@@ -300,18 +323,18 @@ const Operation: FC<OperationProps> = ({
             )}
             {!humanInputFormDataList?.length && (
               <ActionButton
+                aria-label={copyLabel}
                 onClick={() => {
                   copy(content)
                   toast.success(t('actionMsg.copySuccessfully', { ns: 'common' }))
                 }}
-                data-testid="copy-btn"
               >
-                <div className="i-ri-clipboard-line h-4 w-4" />
+                <span aria-hidden="true" className="i-ri-clipboard-line h-4 w-4" />
               </ActionButton>
             )}
             {!noChatInput && (
-              <ActionButton onClick={() => onRegenerate?.(item)} data-testid="regenerate-btn">
-                <div className="i-ri-reset-left-line h-4 w-4" />
+              <ActionButton aria-label={regenerateLabel} onClick={() => onRegenerate?.(item)}>
+                <span aria-hidden="true" className="i-ri-reset-left-line h-4 w-4" />
               </ActionButton>
             )}
             {config?.supportAnnotation && config.annotation_reply?.enabled && !humanInputFormDataList?.length && (
@@ -342,30 +365,56 @@ const Operation: FC<OperationProps> = ({
         onRemove={() => onAnnotationRemoved?.(index)}
       />
       {isShowFeedbackModal && (
-        <Modal
-          title={t('feedback.title', { ns: 'common' }) || 'Provide Feedback'}
-          subTitle={t('feedback.subtitle', { ns: 'common' }) || 'Please tell us what went wrong with this response'}
-          onClose={handleFeedbackCancel}
-          onConfirm={handleFeedbackSubmit}
-          onCancel={handleFeedbackCancel}
-          confirmButtonText={t('operation.submit', { ns: 'common' }) || 'Submit'}
-          cancelButtonText={t('operation.cancel', { ns: 'common' }) || 'Cancel'}
+        <Dialog
+          open
+          onOpenChange={(open) => {
+            if (!open)
+              handleFeedbackCancel()
+          }}
         >
-          <div className="space-y-3">
-            <div>
-              <label className="mb-2 block system-sm-semibold text-text-secondary">
-                {t('feedback.content', { ns: 'common' }) || 'Feedback Content'}
-              </label>
-              <Textarea
-                value={feedbackContent}
-                onChange={e => setFeedbackContent(e.target.value)}
-                placeholder={t('feedback.placeholder', { ns: 'common' }) || 'Please describe what went wrong or how we can improve...'}
-                rows={4}
-                className="w-full"
-              />
+          <DialogContent
+            backdropProps={{ forceRender: true }}
+            className="p-0"
+          >
+            <div className="flex max-h-[80dvh] flex-col">
+              <div className="relative shrink-0 p-6 pr-14 pb-3">
+                <DialogTitle className="title-2xl-semi-bold text-text-primary">
+                  {t('feedback.title', { ns: 'common' }) || 'Provide Feedback'}
+                </DialogTitle>
+                <DialogDescription className="mt-1 system-xs-regular text-text-tertiary">
+                  {t('feedback.subtitle', { ns: 'common' }) || 'Please tell us what went wrong with this response'}
+                </DialogDescription>
+                <DialogCloseButton className="top-5 right-5 h-8 w-8 rounded-lg" />
+              </div>
+              <div className="min-h-0 flex-1 overflow-y-auto px-6 py-3">
+                <label htmlFor={feedbackTextareaId} className="mb-2 block system-sm-semibold text-text-secondary">
+                  {t('feedback.content', { ns: 'common' }) || 'Feedback Content'}
+                </label>
+                <Textarea
+                  id={feedbackTextareaId}
+                  name="feedback-content"
+                  value={feedbackContent}
+                  onChange={e => setFeedbackContent(e.target.value)}
+                  placeholder={t('feedback.placeholder', { ns: 'common' }) || 'Please describe what went wrong or how we can improve…'}
+                  rows={4}
+                  className="w-full"
+                />
+              </div>
+              <div className="flex shrink-0 justify-end p-6 pt-5">
+                <Button onClick={handleFeedbackCancel}>
+                  {t('operation.cancel', { ns: 'common' }) || 'Cancel'}
+                </Button>
+                <Button
+                  className="ml-2"
+                  variant="primary"
+                  onClick={handleFeedbackSubmit}
+                >
+                  {t('operation.submit', { ns: 'common' }) || 'Submit'}
+                </Button>
+              </div>
             </div>
-          </div>
-        </Modal>
+          </DialogContent>
+        </Dialog>
       )}
     </>
   )
diff --git a/web/app/components/base/chat/chat/chat-input-area/__tests__/index.spec.tsx b/web/app/components/base/chat/chat/chat-input-area/__tests__/index.spec.tsx
index f17f94ff9e..8896533f28 100644
--- a/web/app/components/base/chat/chat/chat-input-area/__tests__/index.spec.tsx
+++ b/web/app/components/base/chat/chat/chat-input-area/__tests__/index.spec.tsx
@@ -312,7 +312,7 @@ describe('ChatInputArea', () => {
 
     it('should render the send button', () => {
       render(<ChatInputArea visionConfig={mockVisionConfig} />)
-      expect(screen.getByTestId('send-button')).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'common.operation.send' })).toBeInTheDocument()
     })
   })
 
@@ -334,7 +334,7 @@ describe('ChatInputArea', () => {
       const textarea = getTextarea()!
 
       await user.type(textarea, 'Hello world')
-      await user.click(screen.getByTestId('send-button'))
+      await user.click(screen.getByRole('button', { name: 'common.operation.send' }))
 
       expect(onSend).toHaveBeenCalled()
       expect(textarea).toHaveValue('')
@@ -448,14 +448,14 @@ describe('ChatInputArea', () => {
   describe('Voice Input', () => {
     it('should render the voice input button when enabled', () => {
       render(<ChatInputArea speechToTextConfig={{ enabled: true }} visionConfig={mockVisionConfig} />)
-      expect(screen.getByTestId('voice-input-button')).toBeTruthy()
+      expect(screen.getByRole('button', { name: 'common.voiceInput.start' })).toBeTruthy()
     })
 
     it('should handle stop recording in VoiceInput', async () => {
       const user = userEvent.setup({ delay: null })
       render(<ChatInputArea speechToTextConfig={{ enabled: true }} visionConfig={mockVisionConfig} />)
 
-      await user.click(screen.getByTestId('voice-input-button'))
+      await user.click(screen.getByRole('button', { name: 'common.voiceInput.start' }))
       // Wait for VoiceInput to show speaking
       await screen.findByText(/voiceInput.speaking/i)
       const stopBtn = screen.getByTestId('voice-input-stop')
@@ -473,7 +473,7 @@ describe('ChatInputArea', () => {
       const user = userEvent.setup({ delay: null })
       render(<ChatInputArea speechToTextConfig={{ enabled: true }} visionConfig={mockVisionConfig} />)
 
-      await user.click(screen.getByTestId('voice-input-button'))
+      await user.click(screen.getByRole('button', { name: 'common.voiceInput.start' }))
       await screen.findByText(/voiceInput.speaking/i)
       const stopBtn = screen.getByTestId('voice-input-stop')
       await user.click(stopBtn)
@@ -493,7 +493,7 @@ describe('ChatInputArea', () => {
 
       render(<ChatInputArea speechToTextConfig={{ enabled: true }} visionConfig={mockVisionConfig} />)
 
-      await user.click(screen.getByTestId('voice-input-button'))
+      await user.click(screen.getByRole('button', { name: 'common.voiceInput.start' }))
 
       // Permission denied should trigger error toast
       await waitFor(() => {
@@ -513,7 +513,7 @@ describe('ChatInputArea', () => {
 
       render(<ChatInputArea speechToTextConfig={{ enabled: true }} visionConfig={mockVisionConfig} />)
 
-      await user.click(screen.getByTestId('voice-input-button'))
+      await user.click(screen.getByRole('button', { name: 'common.voiceInput.start' }))
       await screen.findByText(/voiceInput.speaking/i)
       const stopBtn = screen.getByTestId('voice-input-stop')
       await user.click(stopBtn)
@@ -532,7 +532,7 @@ describe('ChatInputArea', () => {
       const onSend = vi.fn()
       render(<ChatInputArea onSend={onSend} visionConfig={mockVisionConfig} />)
 
-      await user.click(screen.getByTestId('send-button'))
+      await user.click(screen.getByRole('button', { name: 'common.operation.send' }))
       expect(onSend).not.toHaveBeenCalled()
       expect(mockNotify).toHaveBeenCalledWith(expect.objectContaining({ type: 'info' }))
     })
@@ -543,7 +543,7 @@ describe('ChatInputArea', () => {
       render(<ChatInputArea onSend={onSend} isResponding visionConfig={mockVisionConfig} />)
 
       await user.type(getTextarea()!, 'Hello')
-      await user.click(screen.getByTestId('send-button'))
+      await user.click(screen.getByRole('button', { name: 'common.operation.send' }))
       expect(onSend).not.toHaveBeenCalled()
       expect(mockNotify).toHaveBeenCalledWith(expect.objectContaining({ type: 'info' }))
     })
@@ -555,7 +555,7 @@ describe('ChatInputArea', () => {
 
       render(<ChatInputArea onSend={onSend} visionConfig={mockVisionConfig} />)
       await user.type(getTextarea()!, 'Hello')
-      await user.click(screen.getByTestId('send-button'))
+      await user.click(screen.getByRole('button', { name: 'common.operation.send' }))
 
       expect(onSend).not.toHaveBeenCalled()
       expect(mockNotify).toHaveBeenCalledWith(expect.objectContaining({ type: 'info' }))
@@ -569,7 +569,7 @@ describe('ChatInputArea', () => {
 
       render(<ChatInputArea onSend={onSend} visionConfig={mockVisionConfig} />)
       await user.type(getTextarea()!, 'Hello')
-      await user.click(screen.getByTestId('send-button'))
+      await user.click(screen.getByRole('button', { name: 'common.operation.send' }))
 
       expect(onSend).toHaveBeenCalledWith('Hello', [completedFile])
     })
@@ -586,7 +586,7 @@ describe('ChatInputArea', () => {
 
       render(<ChatInputArea onSend={onSend} visionConfig={mockVisionConfig} />)
       await user.type(getTextarea()!, 'Remote test')
-      await user.click(screen.getByTestId('send-button'))
+      await user.click(screen.getByRole('button', { name: 'common.operation.send' }))
 
       expect(onSend).toHaveBeenCalledWith('Remote test', [remoteFile])
     })
@@ -598,7 +598,7 @@ describe('ChatInputArea', () => {
       render(<ChatInputArea onSend={onSend} visionConfig={mockVisionConfig} />)
 
       await user.type(getTextarea()!, 'Validation fail')
-      await user.click(screen.getByTestId('send-button'))
+      await user.click(screen.getByRole('button', { name: 'common.operation.send' }))
 
       expect(onSend).not.toHaveBeenCalled()
     })
@@ -608,7 +608,7 @@ describe('ChatInputArea', () => {
       render(<ChatInputArea visionConfig={mockVisionConfig} />)
 
       await user.type(getTextarea()!, 'No onSend')
-      await user.click(screen.getByTestId('send-button'))
+      await user.click(screen.getByRole('button', { name: 'common.operation.send' }))
       // Should not throw
     })
   })
@@ -663,7 +663,7 @@ describe('ChatInputArea', () => {
       mockIsMultipleLine.value = true
       render(<ChatInputArea visionConfig={mockVisionConfig} />)
       // Send button should still be present
-      expect(screen.getByTestId('send-button')).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'common.operation.send' })).toBeInTheDocument()
     })
 
     it('should handle drag enter event on textarea', () => {
diff --git a/web/app/components/base/chat/chat/chat-input-area/__tests__/operation.spec.tsx b/web/app/components/base/chat/chat/chat-input-area/__tests__/operation.spec.tsx
index bda994cd43..5a34a7a7ea 100644
--- a/web/app/components/base/chat/chat/chat-input-area/__tests__/operation.spec.tsx
+++ b/web/app/components/base/chat/chat/chat-input-area/__tests__/operation.spec.tsx
@@ -58,7 +58,8 @@ describe('Operation', () => {
         />,
       )
 
-      expect(screen.getAllByRole('button')).toHaveLength(2)
+      expect(screen.getByRole('button', { name: 'common.voiceInput.start' })).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'common.operation.send' })).toBeInTheDocument()
     })
 
     it('should not render voice input button when speechToTextConfig.enabled is false', () => {
@@ -136,8 +137,7 @@ describe('Operation', () => {
         />,
       )
 
-      const buttons = screen.getAllByRole('button')
-      const voiceButton = buttons[0]
+      const voiceButton = screen.getByRole('button', { name: 'common.voiceInput.start' })
 
       await user.click(voiceButton!)
 
@@ -157,8 +157,7 @@ describe('Operation', () => {
         />,
       )
 
-      const buttons = screen.getAllByRole('button')
-      const voiceButton = buttons[0]
+      const voiceButton = screen.getByRole('button', { name: 'common.voiceInput.start' })
 
       expect(voiceButton)!.toBeDisabled()
 
diff --git a/web/app/components/base/chat/chat/chat-input-area/index.tsx b/web/app/components/base/chat/chat/chat-input-area/index.tsx
index a5d441114b..9f8fb57767 100644
--- a/web/app/components/base/chat/chat/chat-input-area/index.tsx
+++ b/web/app/components/base/chat/chat/chat-input-area/index.tsx
@@ -146,7 +146,7 @@ const ChatInputArea = ({ readonly, botName, showFeatureBar, showFileUpload, feat
               <div ref={textValueRef} className="pointer-events-none invisible absolute h-auto w-auto p-1 body-lg-regular leading-6 whitespace-pre">
                 {query}
               </div>
-              <Textarea ref={ref => textareaRef.current = ref as any} className={cn('w-full resize-none bg-transparent p-1 body-lg-regular leading-6 text-text-primary outline-none')} placeholder={decode(t(readonly ? 'chat.inputDisabledPlaceholder' : 'chat.inputPlaceholder', { ns: 'common', botName }) || '')} autoFocus minRows={1} value={query} onChange={e => handleQueryChange(e.target.value)} onKeyDown={handleKeyDown} onCompositionStart={handleCompositionStart} onCompositionEnd={handleCompositionEnd} onPaste={handleClipboardPasteFile} onDragEnter={handleDragFileEnter} onDragLeave={handleDragFileLeave} onDragOver={handleDragFileOver} onDrop={handleDropFile} readOnly={readonly} />
+              <Textarea ref={ref => textareaRef.current = ref as any} className={cn('w-full resize-none bg-transparent p-1 body-lg-regular leading-6 text-text-primary outline-hidden')} placeholder={decode(t(readonly ? 'chat.inputDisabledPlaceholder' : 'chat.inputPlaceholder', { ns: 'common', botName }) || '')} autoFocus minRows={1} value={query} onChange={e => handleQueryChange(e.target.value)} onKeyDown={handleKeyDown} onCompositionStart={handleCompositionStart} onCompositionEnd={handleCompositionEnd} onPaste={handleClipboardPasteFile} onDragEnter={handleDragFileEnter} onDragLeave={handleDragFileLeave} onDragOver={handleDragFileOver} onDrop={handleDropFile} readOnly={readonly} />
             </div>
             {!isMultipleLine && operation}
           </div>
diff --git a/web/app/components/base/chat/chat/chat-input-area/operation.tsx b/web/app/components/base/chat/chat/chat-input-area/operation.tsx
index 05e55e038a..d09ea0da5d 100644
--- a/web/app/components/base/chat/chat/chat-input-area/operation.tsx
+++ b/web/app/components/base/chat/chat/chat-input-area/operation.tsx
@@ -12,6 +12,7 @@ import {
 } from '@remixicon/react'
 import { noop } from 'es-toolkit/function'
 import { memo } from 'react'
+import { useTranslation } from 'react-i18next'
 import ActionButton from '@/app/components/base/action-button'
 import { FileUploaderInChatInput } from '@/app/components/base/file-uploader'
 
@@ -33,6 +34,8 @@ const Operation: FC<OperationProps> = ({
   onSend,
   theme,
 }) => {
+  const { t } = useTranslation()
+
   return (
     <div
       className={cn(
@@ -49,20 +52,20 @@ const Operation: FC<OperationProps> = ({
             speechToTextConfig?.enabled && (
               <ActionButton
                 size="l"
+                aria-label={t('voiceInput.start', { ns: 'common' })}
                 disabled={readonly}
                 onClick={onShowVoiceInput}
-                data-testid="voice-input-button"
               >
-                <RiMicLine className="h-5 w-5" />
+                <RiMicLine className="h-5 w-5" aria-hidden="true" />
               </ActionButton>
             )
           }
         </div>
         <Button
+          aria-label={t('operation.send', { ns: 'common' })}
           className="ml-3 w-8 px-0"
           variant="primary"
           onClick={readonly ? noop : onSend}
-          data-testid="send-button"
           style={
             theme
               ? {
@@ -71,7 +74,7 @@ const Operation: FC<OperationProps> = ({
               : {}
           }
         >
-          <RiSendPlane2Fill className="h-4 w-4" />
+          <RiSendPlane2Fill className="h-4 w-4" aria-hidden="true" />
         </Button>
       </div>
     </div>
diff --git a/web/app/components/base/chat/chat/citation/__tests__/popup.spec.tsx b/web/app/components/base/chat/chat/citation/__tests__/popup.spec.tsx
index 1b8518e869..d861014305 100644
--- a/web/app/components/base/chat/chat/citation/__tests__/popup.spec.tsx
+++ b/web/app/components/base/chat/chat/citation/__tests__/popup.spec.tsx
@@ -61,6 +61,8 @@ const makeData = (overrides: Partial<Resources> = {}): Resources => ({
 const openPopup = async (user: ReturnType<typeof userEvent.setup>) => {
   await user.click(screen.getByTestId('popup-trigger'))
 }
+const getDownloadButton = (name = 'report.pdf') => screen.getByRole('button', { name })
+const queryDownloadButton = (name = 'report.pdf') => screen.queryByRole('button', { name })
 
 describe('Popup', () => {
   beforeEach(() => {
@@ -142,7 +144,7 @@ describe('Popup', () => {
 
       await openPopup(user)
 
-      expect(screen.getByTestId('popup-download-btn'))!.toBeInTheDocument()
+      expect(getDownloadButton()).toBeInTheDocument()
     })
 
     it('should render download button in header for file dataSourceType with dataset_id', async () => {
@@ -157,7 +159,7 @@ describe('Popup', () => {
 
       await openPopup(user)
 
-      expect(screen.getByTestId('popup-download-btn'))!.toBeInTheDocument()
+      expect(getDownloadButton()).toBeInTheDocument()
     })
 
     it('should render plain document name in header (no button) for notion type', async () => {
@@ -173,7 +175,7 @@ describe('Popup', () => {
 
       await openPopup(user)
 
-      expect(screen.queryByTestId('popup-download-btn')).not.toBeInTheDocument()
+      expect(queryDownloadButton('Notion Doc')).not.toBeInTheDocument()
     })
 
     it('should render plain document name in header when dataset_id is absent', async () => {
@@ -188,7 +190,7 @@ describe('Popup', () => {
 
       await openPopup(user)
 
-      expect(screen.queryByTestId('popup-download-btn')).not.toBeInTheDocument()
+      expect(queryDownloadButton()).not.toBeInTheDocument()
     })
 
     it('should disable the download button while isDownloading is true', async () => {
@@ -201,7 +203,7 @@ describe('Popup', () => {
 
       await openPopup(user)
 
-      expect(screen.getByTestId('popup-download-btn'))!.toBeDisabled()
+      expect(getDownloadButton()).toBeDisabled()
     })
   })
 
@@ -457,7 +459,7 @@ describe('Popup', () => {
       render(<Popup data={makeData({ dataSourceType: 'upload_file' })} />)
 
       await openPopup(user)
-      await user.click(screen.getByTestId('popup-download-btn'))
+      await user.click(getDownloadButton())
 
       await waitFor(() => {
         expect(mockDownloadDocument).toHaveBeenCalledWith({ datasetId: 'ds-1', documentId: 'doc-1' })
@@ -471,7 +473,7 @@ describe('Popup', () => {
       render(<Popup data={makeData({ dataSourceType: 'upload_file' })} />)
 
       await openPopup(user)
-      await user.click(screen.getByTestId('popup-download-btn'))
+      await user.click(getDownloadButton())
 
       await waitFor(() => expect(mockDownloadDocument).toHaveBeenCalled())
       expect(mockDownloadUrl).not.toHaveBeenCalled()
@@ -489,7 +491,7 @@ describe('Popup', () => {
 
       await openPopup(user)
 
-      expect(screen.queryByTestId('popup-download-btn')).not.toBeInTheDocument()
+      expect(queryDownloadButton('Notion Doc')).not.toBeInTheDocument()
       expect(mockDownloadDocument).not.toHaveBeenCalled()
     })
 
@@ -502,7 +504,7 @@ describe('Popup', () => {
       render(<Popup data={makeData({ dataSourceType: 'upload_file' })} />)
 
       await openPopup(user)
-      await user.click(screen.getByTestId('popup-download-btn'))
+      await user.click(getDownloadButton())
 
       expect(mockDownloadDocument).not.toHaveBeenCalled()
     })
@@ -520,7 +522,7 @@ describe('Popup', () => {
       )
 
       await openPopup(user)
-      await user.click(screen.getByTestId('popup-download-btn'))
+      await user.click(getDownloadButton())
 
       await waitFor(() => {
         expect(mockDownloadDocument).toHaveBeenCalledWith({ datasetId: 'ds-1', documentId: 'primary-doc-id' })
@@ -539,7 +541,7 @@ describe('Popup', () => {
       )
 
       await openPopup(user)
-      await user.click(screen.getByTestId('popup-download-btn'))
+      await user.click(getDownloadButton())
 
       await waitFor(() => {
         expect(mockDownloadDocument).toHaveBeenCalled()
@@ -559,7 +561,7 @@ describe('Popup', () => {
       )
 
       await openPopup(user)
-      await user.click(screen.getByTestId('popup-download-btn'))
+      await user.click(getDownloadButton())
 
       expect(mockDownloadDocument).not.toHaveBeenCalled()
     })
@@ -741,7 +743,7 @@ describe('Popup', () => {
         // we check the handler directly if possible, or just the button absence.
         // Even if the button is rendered (it shouldn't be based on line 71),
         // we check the handler directly if possible, or just the button absence.
-        expect(screen.queryByTestId('popup-download-btn')).not.toBeInTheDocument()
+        expect(queryDownloadButton()).not.toBeInTheDocument()
       })
 
       it('should return early if both documentIds are missing', async () => {
@@ -756,7 +758,7 @@ describe('Popup', () => {
           />,
         )
         await openPopup(user)
-        const btn = screen.queryByTestId('popup-download-btn')
+        const btn = queryDownloadButton()
         if (btn) {
           await user.click(btn)
           expect(mockDownloadDocument).not.toHaveBeenCalled()
@@ -774,7 +776,7 @@ describe('Popup', () => {
           />,
         )
         await openPopup(user)
-        expect(screen.queryByTestId('popup-download-btn')).not.toBeInTheDocument()
+        expect(queryDownloadButton()).not.toBeInTheDocument()
       })
     })
   })
diff --git a/web/app/components/base/chat/chat/citation/__tests__/progress-tooltip.spec.tsx b/web/app/components/base/chat/chat/citation/__tests__/progress-tooltip.spec.tsx
index a47123aafd..f53e7d15c3 100644
--- a/web/app/components/base/chat/chat/citation/__tests__/progress-tooltip.spec.tsx
+++ b/web/app/components/base/chat/chat/citation/__tests__/progress-tooltip.spec.tsx
@@ -55,7 +55,7 @@ describe('ProgressTooltip', () => {
 
       await user.hover(screen.getByTestId('progress-trigger-content'))
 
-      expect(screen.getByTestId('progress-tooltip-popup')).toBeInTheDocument()
+      expect(await screen.findByTestId('progress-tooltip-popup')).toBeInTheDocument()
     })
 
     it('should hide the tooltip popup on mouse leave', async () => {
@@ -74,7 +74,7 @@ describe('ProgressTooltip', () => {
 
       await user.hover(screen.getByTestId('progress-trigger-content'))
 
-      expect(screen.getByTestId('progress-tooltip-popup')).toHaveTextContent(/hitScore/i)
+      expect(await screen.findByTestId('progress-tooltip-popup')).toHaveTextContent(/hitScore/i)
     })
 
     it('should show the data value inside the tooltip popup', async () => {
@@ -83,7 +83,7 @@ describe('ProgressTooltip', () => {
 
       await user.hover(screen.getByTestId('progress-trigger-content'))
 
-      expect(screen.getByTestId('progress-tooltip-popup')).toHaveTextContent('0.8')
+      expect(await screen.findByTestId('progress-tooltip-popup')).toHaveTextContent('0.8')
     })
   })
 
@@ -126,7 +126,7 @@ describe('ProgressTooltip', () => {
       await user.unhover(screen.getByTestId('progress-trigger-content'))
       await user.hover(screen.getByTestId('progress-trigger-content'))
 
-      expect(screen.getByTestId('progress-tooltip-popup')).toBeInTheDocument()
+      expect(await screen.findByTestId('progress-tooltip-popup')).toBeInTheDocument()
     })
 
     it('should keep tooltip closed without any interaction', () => {
diff --git a/web/app/components/base/chat/chat/citation/__tests__/tooltip.spec.tsx b/web/app/components/base/chat/chat/citation/__tests__/tooltip.spec.tsx
index 45ac4b4fb4..58a3c5c654 100644
--- a/web/app/components/base/chat/chat/citation/__tests__/tooltip.spec.tsx
+++ b/web/app/components/base/chat/chat/citation/__tests__/tooltip.spec.tsx
@@ -41,7 +41,7 @@ describe('Tooltip', () => {
 
       await user.hover(screen.getByTestId('tooltip-trigger-content'))
 
-      expect(screen.getByTestId('tooltip-popup')).toHaveTextContent('Word Count')
+      expect(await screen.findByTestId('tooltip-popup')).toHaveTextContent('Word Count')
     })
 
     it('should render the data value inside the tooltip popup', async () => {
@@ -50,7 +50,7 @@ describe('Tooltip', () => {
 
       await user.hover(screen.getByTestId('tooltip-trigger-content'))
 
-      expect(screen.getByTestId('tooltip-popup')).toHaveTextContent('99')
+      expect(await screen.findByTestId('tooltip-popup')).toHaveTextContent('99')
     })
 
     it('should render a string data value inside the tooltip popup', async () => {
@@ -59,7 +59,7 @@ describe('Tooltip', () => {
 
       await user.hover(screen.getByTestId('tooltip-trigger-content'))
 
-      expect(screen.getByTestId('tooltip-popup')).toHaveTextContent('abc1234')
+      expect(await screen.findByTestId('tooltip-popup')).toHaveTextContent('abc1234')
     })
 
     it('should render both text and data together inside the tooltip popup', async () => {
@@ -68,7 +68,7 @@ describe('Tooltip', () => {
 
       await user.hover(screen.getByTestId('tooltip-trigger-content'))
 
-      const popup = screen.getByTestId('tooltip-popup')
+      const popup = await screen.findByTestId('tooltip-popup')
       expect(popup).toHaveTextContent('Characters')
       expect(popup).toHaveTextContent('55')
     })
@@ -90,10 +90,10 @@ describe('Tooltip', () => {
       const user = userEvent.setup()
       const { rerender } = render(<Tooltip data={10} text="Original" icon={<span />} />)
       await user.hover(screen.getByTestId('tooltip-trigger-content'))
-      expect(screen.getByTestId('tooltip-popup')).toHaveTextContent('Original')
+      expect(await screen.findByTestId('tooltip-popup')).toHaveTextContent('Original')
 
       rerender(<Tooltip data={10} text="Updated" icon={<span />} />)
-      expect(screen.getByTestId('tooltip-popup')).toHaveTextContent('Updated')
+      expect(await screen.findByTestId('tooltip-popup')).toHaveTextContent('Updated')
     })
   })
 
@@ -104,7 +104,7 @@ describe('Tooltip', () => {
 
       await user.hover(screen.getByTestId('tooltip-trigger-content'))
 
-      expect(screen.getByTestId('tooltip-popup')).toBeInTheDocument()
+      expect(await screen.findByTestId('tooltip-popup')).toBeInTheDocument()
     })
 
     it('should hide the tooltip popup on mouse leave', async () => {
@@ -125,7 +125,7 @@ describe('Tooltip', () => {
       await user.unhover(screen.getByTestId('tooltip-trigger-content'))
       await user.hover(screen.getByTestId('tooltip-trigger-content'))
 
-      expect(screen.getByTestId('tooltip-popup')).toBeInTheDocument()
+      expect(await screen.findByTestId('tooltip-popup')).toBeInTheDocument()
     })
   })
 
diff --git a/web/app/components/base/chat/chat/citation/popup.tsx b/web/app/components/base/chat/chat/citation/popup.tsx
index 9ea4a6b742..5854fdceac 100644
--- a/web/app/components/base/chat/chat/citation/popup.tsx
+++ b/web/app/components/base/chat/chat/citation/popup.tsx
@@ -70,9 +70,8 @@ const Popup: FC<PopupProps> = ({
                 {(data.dataSourceType === 'upload_file' || data.dataSourceType === 'file') && !!data.sources?.[0]?.dataset_id
                   ? (
                       <button
-                        data-testid="popup-download-btn"
                         type="button"
-                        className="cursor-pointer truncate text-text-tertiary hover:underline"
+                        className="cursor-pointer truncate border-none bg-transparent p-0 text-left text-text-tertiary hover:underline"
                         onClick={handleDownloadUploadFile}
                         disabled={isDownloading}
                       >
diff --git a/web/app/components/base/chat/chat/citation/progress-tooltip.tsx b/web/app/components/base/chat/chat/citation/progress-tooltip.tsx
index fd75c2f3b0..be9a4b2661 100644
--- a/web/app/components/base/chat/chat/citation/progress-tooltip.tsx
+++ b/web/app/components/base/chat/chat/citation/progress-tooltip.tsx
@@ -1,11 +1,10 @@
 import type { FC } from 'react'
-import { useState } from 'react'
-import { useTranslation } from 'react-i18next'
 import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from '@langgenius/dify-ui/tooltip'
+import { useTranslation } from 'react-i18next'
 
 type ProgressTooltipProps = {
   data: number
@@ -15,38 +14,33 @@ const ProgressTooltip: FC<ProgressTooltipProps> = ({
   data,
 }) => {
   const { t } = useTranslation()
-  const [open, setOpen] = useState(false)
 
   return (
-    <PortalToFollowElem
-      open={open}
-      onOpenChange={setOpen}
-      placement="top-start"
-    >
-      <PortalToFollowElemTrigger
-        onMouseEnter={() => setOpen(true)}
-        onMouseLeave={() => setOpen(false)}
+    <Tooltip>
+      <TooltipTrigger
+        data-testid="progress-trigger-content"
+        className="flex grow items-center border-0 bg-transparent p-0 text-left"
       >
-        <div data-testid="progress-trigger-content" className="flex grow items-center">
-          <div className="mr-1 h-1.5 w-16 overflow-hidden rounded-[3px] border border-components-progress-gray-border">
-            <div
-              data-testid="progress-bar-fill"
-              className="h-full bg-components-progress-gray-progress"
-              style={{ width: `${data * 100}%` }}
-            >
-            </div>
+        <div className="mr-1 h-1.5 w-16 overflow-hidden rounded-[3px] border border-components-progress-gray-border">
+          <div
+            data-testid="progress-bar-fill"
+            className="h-full bg-components-progress-gray-progress"
+            style={{ width: `${data * 100}%` }}
+          >
           </div>
-          {data}
         </div>
-      </PortalToFollowElemTrigger>
-      <PortalToFollowElemContent style={{ zIndex: 1001 }}>
-        <div data-testid="progress-tooltip-popup" className="rounded-lg bg-components-tooltip-bg p-3 system-xs-medium text-text-quaternary shadow-lg">
-          {t('chat.citation.hitScore', { ns: 'common' })}
-          {' '}
-          {data}
-        </div>
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
+        {data}
+      </TooltipTrigger>
+      <TooltipContent
+        data-testid="progress-tooltip-popup"
+        placement="top-start"
+        className="rounded-lg bg-components-tooltip-bg p-3 system-xs-medium text-text-quaternary shadow-lg"
+      >
+        {t('chat.citation.hitScore', { ns: 'common' })}
+        {' '}
+        {data}
+      </TooltipContent>
+    </Tooltip>
   )
 }
 
diff --git a/web/app/components/base/chat/chat/citation/tooltip.tsx b/web/app/components/base/chat/chat/citation/tooltip.tsx
index 16e122bc04..f3460abd22 100644
--- a/web/app/components/base/chat/chat/citation/tooltip.tsx
+++ b/web/app/components/base/chat/chat/citation/tooltip.tsx
@@ -1,49 +1,42 @@
 import type { FC } from 'react'
-import * as React from 'react'
-import { useState } from 'react'
 import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from '@langgenius/dify-ui/tooltip'
+import * as React from 'react'
 
-type TooltipProps = {
+type CitationTooltipProps = {
   data: number | string
   text: string
   icon: React.ReactNode
 }
 
-const Tooltip: FC<TooltipProps> = ({
+const CitationTooltip: FC<CitationTooltipProps> = ({
   data,
   text,
   icon,
 }) => {
-  const [open, setOpen] = useState(false)
-
   return (
-    <PortalToFollowElem
-      open={open}
-      onOpenChange={setOpen}
-      placement="top-start"
-    >
-      <PortalToFollowElemTrigger
-        onMouseEnter={() => setOpen(true)}
-        onMouseLeave={() => setOpen(false)}
+    <Tooltip>
+      <TooltipTrigger
+        data-testid="tooltip-trigger-content"
+        className="mr-6 flex items-center border-0 bg-transparent p-0 text-left"
       >
-        <div data-testid="tooltip-trigger-content" className="mr-6 flex items-center">
-          {icon}
-          {data}
-        </div>
-      </PortalToFollowElemTrigger>
-      <PortalToFollowElemContent style={{ zIndex: 1001 }}>
-        <div data-testid="tooltip-popup" className="rounded-lg bg-components-tooltip-bg p-3 system-xs-medium text-text-quaternary shadow-lg">
-          {text}
-          {' '}
-          {data}
-        </div>
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
+        {icon}
+        {data}
+      </TooltipTrigger>
+      <TooltipContent
+        data-testid="tooltip-popup"
+        placement="top-start"
+        className="rounded-lg bg-components-tooltip-bg p-3 system-xs-medium text-text-quaternary shadow-lg"
+      >
+        {text}
+        {' '}
+        {data}
+      </TooltipContent>
+    </Tooltip>
   )
 }
 
-export default Tooltip
+export default CitationTooltip
diff --git a/web/app/components/base/chat/chat/question.tsx b/web/app/components/base/chat/chat/question.tsx
index 5bfd8a3000..e5393d1737 100644
--- a/web/app/components/base/chat/chat/question.tsx
+++ b/web/app/components/base/chat/chat/question.tsx
@@ -52,6 +52,8 @@ const Question: FC<QuestionProps> = ({
   const {
     onRegenerate,
   } = useChatContext()
+  const copyLabel = t('operation.copy', { ns: 'common' })
+  const editLabel = t('operation.edit', { ns: 'common' })
 
   const [isEditing, setIsEditing] = useState(false)
   const [editedContent, setEditedContent] = useState(content)
@@ -168,17 +170,17 @@ const Question: FC<QuestionProps> = ({
             style={{ right: contentWidth + 8 }}
           >
             <ActionButton
-              data-testid="copy-btn"
+              aria-label={copyLabel}
               onClick={() => {
                 copy(content)
                 toast.success(t('actionMsg.copySuccessfully', { ns: 'common' }))
               }}
             >
-              <div className="i-ri-clipboard-line h-4 w-4" />
+              <div className="i-ri-clipboard-line h-4 w-4" aria-hidden="true" />
             </ActionButton>
             {enableEdit && (
-              <ActionButton data-testid="edit-btn" onClick={handleEdit}>
-                <div className="i-ri-edit-line h-4 w-4" />
+              <ActionButton aria-label={editLabel} onClick={handleEdit}>
+                <div className="i-ri-edit-line h-4 w-4" aria-hidden="true" />
               </ActionButton>
             )}
           </div>
@@ -222,8 +224,8 @@ const Question: FC<QuestionProps> = ({
                     />
                   </div>
                   <div className="flex items-center justify-end gap-2">
-                    <Button className="min-w-24" onClick={handleCancelEditing} data-testid="cancel-edit-btn">{t('operation.cancel', { ns: 'common' })}</Button>
-                    <Button className="min-w-24" variant="primary" onClick={handleResend} data-testid="save-edit-btn">{t('operation.save', { ns: 'common' })}</Button>
+                    <Button className="min-w-24" onClick={handleCancelEditing}>{t('operation.cancel', { ns: 'common' })}</Button>
+                    <Button className="min-w-24" variant="primary" onClick={handleResend}>{t('operation.save', { ns: 'common' })}</Button>
                   </div>
                 </div>
               )}
diff --git a/web/app/components/base/chat/chat/use-chat-layout.ts b/web/app/components/base/chat/chat/use-chat-layout.ts
index 712382070d..1983a928ca 100644
--- a/web/app/components/base/chat/chat/use-chat-layout.ts
+++ b/web/app/components/base/chat/chat/use-chat-layout.ts
@@ -12,6 +12,11 @@ type UseChatLayoutOptions = {
   sidebarCollapseState?: boolean
 }
 
+const setStyleValue = (element: HTMLElement, property: 'paddingBottom' | 'width', value: string) => {
+  if (element.style[property] !== value)
+    element.style[property] = value
+}
+
 export const useChatLayout = ({ chatList, sidebarCollapseState }: UseChatLayoutOptions) => {
   const [width, setWidth] = useState(0)
   const chatContainerRef = useRef<HTMLDivElement>(null)
@@ -21,6 +26,9 @@ export const useChatLayout = ({ chatList, sidebarCollapseState }: UseChatLayoutO
   const userScrolledRef = useRef(false)
   const isAutoScrollingRef = useRef(false)
   const prevFirstMessageIdRef = useRef<string | undefined>(undefined)
+  const resizeObserverFrameRef = useRef<number | null>(null)
+  const pendingFooterBlockSizeRef = useRef<number | null>(null)
+  const pendingContainerInlineSizeRef = useRef<number | null>(null)
 
   const handleScrollToBottom = useCallback(() => {
     if (chatList.length > 1 && chatContainerRef.current && !userScrolledRef.current) {
@@ -34,16 +42,39 @@ export const useChatLayout = ({ chatList, sidebarCollapseState }: UseChatLayoutO
   }, [chatList.length])
 
   const handleWindowResize = useCallback(() => {
-    if (chatContainerRef.current)
-      setWidth(document.body.clientWidth - (chatContainerRef.current.clientWidth + 16) - 8)
+    if (chatContainerRef.current) {
+      const nextWidth = document.body.clientWidth - (chatContainerRef.current.clientWidth + 16) - 8
+      setWidth(currentWidth => currentWidth === nextWidth ? currentWidth : nextWidth)
+    }
 
     if (chatContainerRef.current && chatFooterRef.current)
-      chatFooterRef.current.style.width = `${chatContainerRef.current.clientWidth}px`
+      setStyleValue(chatFooterRef.current, 'width', `${chatContainerRef.current.clientWidth}px`)
 
     if (chatContainerInnerRef.current && chatFooterInnerRef.current)
-      chatFooterInnerRef.current.style.width = `${chatContainerInnerRef.current.clientWidth}px`
+      setStyleValue(chatFooterInnerRef.current, 'width', `${chatContainerInnerRef.current.clientWidth}px`)
   }, [])
 
+  const scheduleResizeObserverUpdate = useCallback(() => {
+    if (resizeObserverFrameRef.current !== null)
+      return
+
+    resizeObserverFrameRef.current = requestAnimationFrame(() => {
+      resizeObserverFrameRef.current = null
+
+      const footerBlockSize = pendingFooterBlockSizeRef.current
+      pendingFooterBlockSizeRef.current = null
+      if (footerBlockSize !== null && chatContainerRef.current) {
+        setStyleValue(chatContainerRef.current, 'paddingBottom', `${footerBlockSize}px`)
+        handleScrollToBottom()
+      }
+
+      const containerInlineSize = pendingContainerInlineSizeRef.current
+      pendingContainerInlineSizeRef.current = null
+      if (containerInlineSize !== null && chatFooterRef.current)
+        setStyleValue(chatFooterRef.current, 'width', `${containerInlineSize}px`)
+    })
+  }, [handleScrollToBottom])
+
   useEffect(() => {
     handleScrollToBottom()
     const animationFrame = requestAnimationFrame(handleWindowResize)
@@ -77,26 +108,31 @@ export const useChatLayout = ({ chatList, sidebarCollapseState }: UseChatLayoutO
       const resizeContainerObserver = new ResizeObserver((entries) => {
         for (const entry of entries) {
           const { blockSize } = entry.borderBoxSize[0]!
-          chatContainerRef.current!.style.paddingBottom = `${blockSize}px`
-          handleScrollToBottom()
+          pendingFooterBlockSizeRef.current = blockSize
         }
+        scheduleResizeObserverUpdate()
       })
       resizeContainerObserver.observe(chatFooterRef.current)
 
       const resizeFooterObserver = new ResizeObserver((entries) => {
         for (const entry of entries) {
           const { inlineSize } = entry.borderBoxSize[0]!
-          chatFooterRef.current!.style.width = `${inlineSize}px`
+          pendingContainerInlineSizeRef.current = inlineSize
         }
+        scheduleResizeObserverUpdate()
       })
       resizeFooterObserver.observe(chatContainerRef.current)
 
       return () => {
+        if (resizeObserverFrameRef.current !== null) {
+          cancelAnimationFrame(resizeObserverFrameRef.current)
+          resizeObserverFrameRef.current = null
+        }
         resizeContainerObserver.disconnect()
         resizeFooterObserver.disconnect()
       }
     }
-  }, [handleScrollToBottom])
+  }, [scheduleResizeObserverUpdate])
 
   useEffect(() => {
     const setUserScrolled = () => {
diff --git a/web/app/components/base/chat/embedded-chatbot/header/__tests__/index.spec.tsx b/web/app/components/base/chat/embedded-chatbot/header/__tests__/index.spec.tsx
index 3142bcd315..8b3c6bb3ca 100644
--- a/web/app/components/base/chat/embedded-chatbot/header/__tests__/index.spec.tsx
+++ b/web/app/components/base/chat/embedded-chatbot/header/__tests__/index.spec.tsx
@@ -153,7 +153,7 @@ describe('EmbeddedChatbot Header', () => {
     it('should render reset button when allowResetChat is true and conversation exists', () => {
       render(<Header title="Test Chatbot" allowResetChat={true} />)
 
-      expect(screen.getByTestId('reset-chat-button')).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'share.chat.resetChat' })).toBeInTheDocument()
     })
 
     it('should call onCreateNewChat when reset button is clicked', async () => {
@@ -161,7 +161,7 @@ describe('EmbeddedChatbot Header', () => {
       const onCreateNewChat = vi.fn()
       render(<Header title="Test Chatbot" allowResetChat={true} onCreateNewChat={onCreateNewChat} />)
 
-      await user.click(screen.getByTestId('reset-chat-button'))
+      await user.click(screen.getByRole('button', { name: 'share.chat.resetChat' }))
       expect(onCreateNewChat).toHaveBeenCalled()
     })
 
@@ -218,7 +218,7 @@ describe('EmbeddedChatbot Header', () => {
     it('should render mobile reset button when allowed', () => {
       render(<Header title="Mobile Chatbot" isMobile allowResetChat />)
 
-      expect(screen.getByTestId('mobile-reset-chat-button')).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'share.chat.resetChat' })).toBeInTheDocument()
     })
 
     it('should NOT render mobile reset button when currentConversationId is missing', () => {
@@ -228,7 +228,7 @@ describe('EmbeddedChatbot Header', () => {
       } as EmbeddedChatbotContextValue)
       render(<Header title="Mobile Chatbot" isMobile allowResetChat />)
 
-      expect(screen.queryByTestId('mobile-reset-chat-button')).not.toBeInTheDocument()
+      expect(screen.queryByRole('button', { name: 'share.chat.resetChat' })).not.toBeInTheDocument()
     })
 
     it('should render ViewFormDropdown in mobile when conditions are met', () => {
@@ -247,7 +247,7 @@ describe('EmbeddedChatbot Header', () => {
 
       await dispatchChatbotConfigMessage('https://parent.com', { isToggledByButton: true, isDraggable: false })
 
-      const expandBtn = await screen.findByTestId('mobile-expand-button')
+      const expandBtn = await screen.findByRole('button', { name: 'share.chat.expand' })
       expect(expandBtn).toBeInTheDocument()
 
       await user.click(expandBtn)
@@ -276,7 +276,7 @@ describe('EmbeddedChatbot Header', () => {
 
       await dispatchChatbotConfigMessage('https://parent.com', { isToggledByButton: true, isDraggable: false })
 
-      const expandBtn = await screen.findByTestId('expand-button')
+      const expandBtn = await screen.findByRole('button', { name: 'share.chat.expand' })
       expect(expandBtn).toBeInTheDocument()
 
       await user.click(expandBtn)
@@ -295,7 +295,7 @@ describe('EmbeddedChatbot Header', () => {
       await dispatchChatbotConfigMessage('https://parent.com', { isToggledByButton: true, isDraggable: true })
 
       await waitFor(() => {
-        expect(screen.queryByTestId('expand-button')).not.toBeInTheDocument()
+        expect(screen.queryByRole('button', { name: 'share.chat.expand' })).not.toBeInTheDocument()
       })
     })
 
@@ -305,12 +305,12 @@ describe('EmbeddedChatbot Header', () => {
 
       await dispatchChatbotConfigMessage('https://secure.com', { isToggledByButton: true, isDraggable: false })
 
-      await screen.findByTestId('expand-button')
+      await screen.findByRole('button', { name: 'share.chat.expand' })
 
       await dispatchChatbotConfigMessage('https://malicious.com', { isToggledByButton: false, isDraggable: false })
 
       // Should still be visible (not hidden by the malicious message)
-      expect(screen.getByTestId('expand-button')).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'share.chat.expand' })).toBeInTheDocument()
     })
 
     it('should ignore non-config messages for origin locking', async () => {
@@ -327,7 +327,7 @@ describe('EmbeddedChatbot Header', () => {
       await dispatchChatbotConfigMessage('https://second.com', { isToggledByButton: true, isDraggable: false })
 
       // Should lock to second.com
-      const expandBtn = await screen.findByTestId('expand-button')
+      const expandBtn = await screen.findByRole('button', { name: 'share.chat.expand' })
       expect(expandBtn).toBeInTheDocument()
     })
 
diff --git a/web/app/components/base/chat/embedded-chatbot/header/index.tsx b/web/app/components/base/chat/embedded-chatbot/header/index.tsx
index 6d0cc9bc06..22c1e95bc8 100644
--- a/web/app/components/base/chat/embedded-chatbot/header/index.tsx
+++ b/web/app/components/base/chat/embedded-chatbot/header/index.tsx
@@ -114,11 +114,15 @@ const Header: FC<IHeaderProps> = ({
               <Tooltip>
                 <TooltipTrigger
                   render={(
-                    <ActionButton size="l" onClick={handleToggleExpand} data-testid="expand-button">
+                    <ActionButton
+                      size="l"
+                      aria-label={expanded ? t('chat.collapse', { ns: 'share' }) : t('chat.expand', { ns: 'share' })}
+                      onClick={handleToggleExpand}
+                    >
                       {
                         expanded
-                          ? <div className="i-ri-collapse-diagonal-2-line h-[18px] w-[18px]" />
-                          : <div className="i-ri-expand-diagonal-2-line h-[18px] w-[18px]" />
+                          ? <div className="i-ri-collapse-diagonal-2-line h-[18px] w-[18px]" aria-hidden="true" />
+                          : <div className="i-ri-expand-diagonal-2-line h-[18px] w-[18px]" aria-hidden="true" />
                       }
                     </ActionButton>
                   )}
@@ -133,8 +137,12 @@ const Header: FC<IHeaderProps> = ({
             <Tooltip>
               <TooltipTrigger
                 render={(
-                  <ActionButton size="l" onClick={onCreateNewChat} data-testid="reset-chat-button">
-                    <div className="i-ri-reset-left-line h-[18px] w-[18px]" />
+                  <ActionButton
+                    size="l"
+                    aria-label={t('chat.resetChat', { ns: 'share' })}
+                    onClick={onCreateNewChat}
+                  >
+                    <div className="i-ri-reset-left-line h-[18px] w-[18px]" aria-hidden="true" />
                   </ActionButton>
                 )}
               />
@@ -171,11 +179,15 @@ const Header: FC<IHeaderProps> = ({
             <Tooltip>
               <TooltipTrigger
                 render={(
-                  <ActionButton size="l" onClick={handleToggleExpand} data-testid="mobile-expand-button">
+                  <ActionButton
+                    size="l"
+                    aria-label={expanded ? t('chat.collapse', { ns: 'share' }) : t('chat.expand', { ns: 'share' })}
+                    onClick={handleToggleExpand}
+                  >
                     {
                       expanded
-                        ? <div className={cn('i-ri-collapse-diagonal-2-line h-[18px] w-[18px]', theme?.colorPathOnHeader)} />
-                        : <div className={cn('i-ri-expand-diagonal-2-line h-[18px] w-[18px]', theme?.colorPathOnHeader)} />
+                        ? <div className={cn('i-ri-collapse-diagonal-2-line h-[18px] w-[18px]', theme?.colorPathOnHeader)} aria-hidden="true" />
+                        : <div className={cn('i-ri-expand-diagonal-2-line h-[18px] w-[18px]', theme?.colorPathOnHeader)} aria-hidden="true" />
                     }
                   </ActionButton>
                 )}
@@ -190,8 +202,12 @@ const Header: FC<IHeaderProps> = ({
           <Tooltip>
             <TooltipTrigger
               render={(
-                <ActionButton size="l" onClick={onCreateNewChat} data-testid="mobile-reset-chat-button">
-                  <div className={cn('i-ri-reset-left-line h-[18px] w-[18px]', theme?.colorPathOnHeader)} />
+                <ActionButton
+                  size="l"
+                  aria-label={t('chat.resetChat', { ns: 'share' })}
+                  onClick={onCreateNewChat}
+                >
+                  <div className={cn('i-ri-reset-left-line h-[18px] w-[18px]', theme?.colorPathOnHeader)} aria-hidden="true" />
                 </ActionButton>
               )}
             />
diff --git a/web/app/components/base/chat/embedded-chatbot/inputs-form/__tests__/content.spec.tsx b/web/app/components/base/chat/embedded-chatbot/inputs-form/__tests__/content.spec.tsx
index 40a62cf451..10bdf5ecb0 100644
--- a/web/app/components/base/chat/embedded-chatbot/inputs-form/__tests__/content.spec.tsx
+++ b/web/app/components/base/chat/embedded-chatbot/inputs-form/__tests__/content.spec.tsx
@@ -179,7 +179,7 @@ describe('InputsFormContent', () => {
 
   it('should handle bool input changes', async () => {
     render(<InputsFormContent />)
-    const checkbox = screen.getByTestId(/checkbox-/i)
+    const checkbox = screen.getByRole('checkbox', { name: 'Bool Label' })
     await user.click(checkbox)
 
     expect(mockContextValue.setCurrentConversationInputs).toHaveBeenCalled()
@@ -200,7 +200,7 @@ describe('InputsFormContent', () => {
     expect(mockContextValue.handleNewConversationInputsChange).toHaveBeenCalled()
   })
 
-  it('should render select dropdown above the settings dialog layer', async () => {
+  it('should render select dropdown on the shared dify-ui overlay layer', async () => {
     render(<InputsFormContent />)
     const selectTrigger = screen.getAllByText(/Select Label/i).find(el => el.tagName === 'SPAN')
     if (!selectTrigger)
@@ -208,7 +208,7 @@ describe('InputsFormContent', () => {
 
     await user.click(selectTrigger)
 
-    expect(screen.getByText('Option 1').closest('.z-\\[60\\]')).not.toBeNull()
+    expect(screen.getByText('Option 1').closest('.z-50')).not.toBeNull()
   })
 
   it('should handle single file upload change', async () => {
diff --git a/web/app/components/base/chat/embedded-chatbot/inputs-form/__tests__/index.spec.tsx b/web/app/components/base/chat/embedded-chatbot/inputs-form/__tests__/index.spec.tsx
index 42cf7f8b21..e688ebe17c 100644
--- a/web/app/components/base/chat/embedded-chatbot/inputs-form/__tests__/index.spec.tsx
+++ b/web/app/components/base/chat/embedded-chatbot/inputs-form/__tests__/index.spec.tsx
@@ -56,19 +56,19 @@ describe('InputsFormNode', () => {
     render(<InputsFormNode collapsed={false} setCollapsed={setCollapsed} />)
     expect(screen.getByText(/chat.chatSettingsTitle/i)).toBeInTheDocument()
     expect(screen.getByTestId('mock-inputs-form-content')).toBeInTheDocument()
-    expect(screen.getByTestId('inputs-form-start-chat-button')).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'share.chat.startChat' })).toBeInTheDocument()
   })
 
   it('should render collapsed state correctly', () => {
     render(<InputsFormNode collapsed={true} setCollapsed={setCollapsed} />)
     expect(screen.getByText(/chat.chatSettingsTitle/i)).toBeInTheDocument()
     expect(screen.queryByTestId('mock-inputs-form-content')).not.toBeInTheDocument()
-    expect(screen.getByTestId('inputs-form-edit-button')).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'common.operation.edit' })).toBeInTheDocument()
   })
 
   it('should handle edit button click', async () => {
     render(<InputsFormNode collapsed={true} setCollapsed={setCollapsed} />)
-    await user.click(screen.getByTestId('inputs-form-edit-button'))
+    await user.click(screen.getByRole('button', { name: 'common.operation.edit' }))
     expect(setCollapsed).toHaveBeenCalledWith(false)
   })
 
@@ -78,7 +78,7 @@ describe('InputsFormNode', () => {
       currentConversationId: 'conv-123',
     } as unknown as any)
     render(<InputsFormNode collapsed={false} setCollapsed={setCollapsed} />)
-    await user.click(screen.getByTestId('inputs-form-close-button'))
+    await user.click(screen.getByRole('button', { name: 'common.operation.close' }))
     expect(setCollapsed).toHaveBeenCalledWith(true)
   })
 
@@ -90,7 +90,7 @@ describe('InputsFormNode', () => {
       handleStartChat,
     } as unknown as any)
     render(<InputsFormNode collapsed={false} setCollapsed={setCollapsed} />)
-    await user.click(screen.getByTestId('inputs-form-start-chat-button'))
+    await user.click(screen.getByRole('button', { name: 'share.chat.startChat' }))
     expect(handleStartChat).toHaveBeenCalled()
     expect(setCollapsed).toHaveBeenCalledWith(true)
   })
@@ -105,7 +105,7 @@ describe('InputsFormNode', () => {
       },
     } as unknown as any)
     render(<InputsFormNode collapsed={false} setCollapsed={setCollapsed} />)
-    const button = screen.getByTestId('inputs-form-start-chat-button')
+    const button = screen.getByRole('button', { name: 'share.chat.startChat' })
     expect(button).toHaveStyle({ backgroundColor: '#ff0000' })
   })
 
@@ -138,7 +138,7 @@ describe('InputsFormNode', () => {
     expect(screen.getByTestId('mock-inputs-form-content').parentElement).toHaveClass('p-4')
 
     // Start chat button container
-    expect(screen.getByTestId('inputs-form-start-chat-button').parentElement).toHaveClass('p-4')
+    expect(screen.getByRole('button', { name: 'share.chat.startChat' }).parentElement).toHaveClass('p-4')
 
     // Collapsed state mobile styles
     rerender(<InputsFormNode collapsed={true} setCollapsed={setCollapsed} />)
diff --git a/web/app/components/base/chat/embedded-chatbot/inputs-form/__tests__/view-form-dropdown.spec.tsx b/web/app/components/base/chat/embedded-chatbot/inputs-form/__tests__/view-form-dropdown.spec.tsx
index 8e0ddedbe7..4368228070 100644
--- a/web/app/components/base/chat/embedded-chatbot/inputs-form/__tests__/view-form-dropdown.spec.tsx
+++ b/web/app/components/base/chat/embedded-chatbot/inputs-form/__tests__/view-form-dropdown.spec.tsx
@@ -7,7 +7,7 @@ vi.mock('../content', () => ({
   default: () => <div data-testid="mock-inputs-form-content" />,
 }))
 
-// Note: PortalToFollowElem is mocked globally in vitest.setup.ts
+// Note: Popover is mocked globally in vitest.setup.ts
 // to render children in the normal DOM flow when open is true.
 
 describe('ViewFormDropdown', () => {
diff --git a/web/app/components/base/chat/embedded-chatbot/inputs-form/content.tsx b/web/app/components/base/chat/embedded-chatbot/inputs-form/content.tsx
index a6d49c4e61..0b6e3ec466 100644
--- a/web/app/components/base/chat/embedded-chatbot/inputs-form/content.tsx
+++ b/web/app/components/base/chat/embedded-chatbot/inputs-form/content.tsx
@@ -92,7 +92,7 @@ const InputsFormContent = ({ showTip }: Props) => {
               <SelectTrigger className="w-full">
                 {String(inputsFormValue?.[form.variable] ?? form.default ?? form.label)}
               </SelectTrigger>
-              <SelectContent popupClassName="z-[60] w-(--anchor-width)">
+              <SelectContent>
                 {form.options.map((option: string) => (
                   <SelectItem key={option} value={option}>
                     <SelectItemText>{option}</SelectItemText>
diff --git a/web/app/components/base/chat/embedded-chatbot/inputs-form/index.tsx b/web/app/components/base/chat/embedded-chatbot/inputs-form/index.tsx
index 7cf9ee2968..1282126f7d 100644
--- a/web/app/components/base/chat/embedded-chatbot/inputs-form/index.tsx
+++ b/web/app/components/base/chat/embedded-chatbot/inputs-form/index.tsx
@@ -56,7 +56,6 @@ const InputsFormNode = ({
               size="small"
               variant="ghost"
               onClick={() => setCollapsed(false)}
-              data-testid="inputs-form-edit-button"
             >
               {t('operation.edit', { ns: 'common' })}
             </Button>
@@ -67,7 +66,6 @@ const InputsFormNode = ({
               size="small"
               variant="ghost"
               onClick={() => setCollapsed(true)}
-              data-testid="inputs-form-close-button"
             >
               {t('operation.close', { ns: 'common' })}
             </Button>
@@ -84,7 +82,6 @@ const InputsFormNode = ({
               variant="primary"
               className="w-full"
               onClick={() => handleStartChat(() => setCollapsed(true))}
-              data-testid="inputs-form-start-chat-button"
               style={
                 themeBuilder?.theme
                   ? {
diff --git a/web/app/components/base/chat/utils.ts b/web/app/components/base/chat/utils.ts
index ff9085c4e6..1b2574a6e0 100644
--- a/web/app/components/base/chat/utils.ts
+++ b/web/app/components/base/chat/utils.ts
@@ -19,11 +19,13 @@ async function getRawInputsFromUrlParams(): Promise<Record<string, any>> {
   const urlParams = new URLSearchParams(window.location.search)
   const inputs: Record<string, any> = {}
   const entriesArray = Array.from(urlParams.entries())
-  entriesArray.forEach(([key, value]) => {
+  await Promise.all(entriesArray.map(async ([key, value]) => {
     const prefixArray = ['sys.', 'user.']
-    if (!prefixArray.some(prefix => key.startsWith(prefix)))
-      inputs[key] = decodeURIComponent(value)
-  })
+    if (prefixArray.some(prefix => key.startsWith(prefix)))
+      return
+
+    inputs[key] = decodeURIComponent(value)
+  }))
   return inputs
 }
 
@@ -81,10 +83,12 @@ async function getRawUserVariablesFromUrlParams(): Promise<Record<string, any>>
   const urlParams = new URLSearchParams(window.location.search)
   const userVariables: Record<string, any> = {}
   const entriesArray = Array.from(urlParams.entries())
-  entriesArray.forEach(([key, value]) => {
-    if (key.startsWith('user.'))
-      userVariables[key.slice(5)] = decodeURIComponent(value)
-  })
+  await Promise.all(entriesArray.map(async ([key, value]) => {
+    if (!key.startsWith('user.'))
+      return
+
+    userVariables[key.slice(5)] = decodeURIComponent(value)
+  }))
   return userVariables
 }
 
diff --git a/web/app/components/base/checkbox-list/__tests__/index.spec.tsx b/web/app/components/base/checkbox-list/__tests__/index.spec.tsx
index 10c390962b..7d536a766a 100644
--- a/web/app/components/base/checkbox-list/__tests__/index.spec.tsx
+++ b/web/app/components/base/checkbox-list/__tests__/index.spec.tsx
@@ -1,8 +1,9 @@
 import { render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
-import CheckboxList from '..'
+import { CheckboxList } from '..'
 
 describe('checkbox list component', () => {
+  const selectAllName = 'common.operation.selectAll'
   const options = [
     { label: 'Option 1', value: 'option1' },
     { label: 'Option 2', value: 'option2' },
@@ -38,8 +39,7 @@ describe('checkbox list component', () => {
 
   it('renders select-all checkbox', () => {
     render(<CheckboxList options={options} showSelectAll />)
-    const checkboxes = screen.getByTestId('checkbox-selectAll')
-    expect(checkboxes)!.toBeInTheDocument()
+    expect(screen.getByRole('checkbox', { name: selectAllName })).toBeInTheDocument()
   })
 
   it('selects all options when select-all is clicked', async () => {
@@ -54,7 +54,7 @@ describe('checkbox list component', () => {
       />,
     )
 
-    const selectAll = screen.getByTestId('checkbox-selectAll')
+    const selectAll = screen.getByRole('checkbox', { name: selectAllName })
     await userEvent.click(selectAll)
 
     expect(onChange).toHaveBeenCalledWith(['option1', 'option2', 'option3', 'apple'])
@@ -73,7 +73,7 @@ describe('checkbox list component', () => {
       />,
     )
 
-    const selectAll = screen.getByTestId('checkbox-selectAll')
+    const selectAll = screen.getByRole('checkbox', { name: selectAllName })
     await userEvent.click(selectAll)
 
     expect(onChange).not.toHaveBeenCalled()
@@ -91,7 +91,7 @@ describe('checkbox list component', () => {
       />,
     )
 
-    const selectAll = screen.getByTestId('checkbox-selectAll')
+    const selectAll = screen.getByRole('checkbox', { name: selectAllName })
     await userEvent.click(selectAll)
 
     expect(onChange).toHaveBeenCalledWith([])
@@ -109,14 +109,14 @@ describe('checkbox list component', () => {
       />,
     )
 
-    const selectAll = screen.getByTestId('checkbox-selectAll')
-    expect(selectAll.querySelector('[data-testid="check-icon-selectAll"]'))!.toBeInTheDocument()
+    const selectAll = screen.getByRole('checkbox', { name: selectAllName })
+    expect(selectAll).toHaveAttribute('aria-checked', 'true')
   })
 
   it('hides select-all checkbox when searching', async () => {
     render(<CheckboxList options={options} />)
     await userEvent.type(screen.getByRole('textbox'), 'app')
-    expect(screen.queryByTestId('checkbox-selectAll')).not.toBeInTheDocument()
+    expect(screen.queryByRole('checkbox', { name: selectAllName })).not.toBeInTheDocument()
   })
 
   it('selects options when checkbox is clicked', async () => {
@@ -131,7 +131,7 @@ describe('checkbox list component', () => {
       />,
     )
 
-    const selectOption = screen.getByTestId('checkbox-option1')
+    const selectOption = screen.getByRole('checkbox', { name: 'Option 1' })
     await userEvent.click(selectOption)
     expect(onChange).toHaveBeenCalledWith(['option1'])
   })
@@ -148,7 +148,7 @@ describe('checkbox list component', () => {
       />,
     )
 
-    const selectOption = screen.getByTestId('checkbox-option1')
+    const selectOption = screen.getByRole('checkbox', { name: 'Option 1' })
     await userEvent.click(selectOption)
     expect(onChange).toHaveBeenCalledWith([])
   })
@@ -165,7 +165,7 @@ describe('checkbox list component', () => {
       />,
     )
 
-    const selectOption = screen.getByTestId('checkbox-option1')
+    const selectOption = screen.getByRole('checkbox', { name: 'Option 1' })
     await userEvent.click(selectOption)
     expect(onChange).not.toHaveBeenCalled()
   })
@@ -202,12 +202,12 @@ describe('checkbox list component', () => {
       />,
     )
 
-    const disabledCheckbox = screen.getByTestId('checkbox-disabled')
+    const disabledCheckbox = screen.getByRole('checkbox', { name: 'Disabled' })
     await userEvent.click(disabledCheckbox)
     expect(onChange).not.toHaveBeenCalled()
   })
 
-  it('does not toggle option when component is disabled and option is clicked via div', async () => {
+  it('does not toggle option when component is disabled and option label is clicked', async () => {
     const onChange = vi.fn()
 
     render(
@@ -219,11 +219,7 @@ describe('checkbox list component', () => {
       />,
     )
 
-    // Find option and click the div container
-    const optionLabels = screen.getAllByText('Option 1')
-    const optionDiv = optionLabels[0]!.closest('[data-testid="option-item"]')
-    expect(optionDiv)!.toBeInTheDocument()
-    await userEvent.click(optionDiv as HTMLElement)
+    await userEvent.click(screen.getByText('Option 1'))
     expect(onChange).not.toHaveBeenCalled()
   })
 
@@ -246,7 +242,7 @@ describe('checkbox list component', () => {
         showSearch={false}
       />,
     )
-    expect(screen.queryByTestId('checkbox-selectAll')).not.toBeInTheDocument()
+    expect(screen.queryByRole('checkbox', { name: selectAllName })).not.toBeInTheDocument()
     options.forEach((option) => {
       expect(screen.getByText(option.label))!.toBeInTheDocument()
     })
@@ -284,7 +280,7 @@ describe('checkbox list component', () => {
       />,
     )
     // When some but not all options are selected, clicking select-all should select all remaining options
-    const selectAll = screen.getByTestId('checkbox-selectAll')
+    const selectAll = screen.getByRole('checkbox', { name: selectAllName })
     expect(selectAll)!.toBeInTheDocument()
     expect(selectAll)!.toHaveAttribute('aria-checked', 'mixed')
 
@@ -326,7 +322,7 @@ describe('checkbox list component', () => {
     )
 
     const optionLabel = screen.getByText('Option 1')
-    const optionRow = optionLabel.closest('div[data-testid="option-item"]')
+    const optionRow = optionLabel.closest('label[data-testid="option-item"]')
     expect(optionRow)!.toBeInTheDocument()
     await userEvent.click(optionRow as HTMLElement)
 
@@ -347,7 +343,7 @@ describe('checkbox list component', () => {
       />,
     )
 
-    const optionRow = screen.getByText('Option 1').closest('div[data-testid="option-item"]')
+    const optionRow = screen.getByText('Option 1').closest('label[data-testid="option-item"]')
     expect(optionRow)!.toBeInTheDocument()
     await userEvent.click(optionRow as HTMLElement)
 
@@ -404,7 +400,7 @@ describe('checkbox list component', () => {
       />,
     )
 
-    const checkbox = screen.getByTestId('checkbox-option')
+    const checkbox = screen.getByRole('checkbox', { name: 'Option' })
     await userEvent.click(checkbox)
     expect(onChange).not.toHaveBeenCalled()
   })
diff --git a/web/app/components/base/checkbox-list/index.tsx b/web/app/components/base/checkbox-list/index.tsx
index e6b2f5b260..22cd1a5718 100644
--- a/web/app/components/base/checkbox-list/index.tsx
+++ b/web/app/components/base/checkbox-list/index.tsx
@@ -1,11 +1,11 @@
 'use client'
-import type { FC } from 'react'
 import { Button } from '@langgenius/dify-ui/button'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
+import { CheckboxGroup } from '@langgenius/dify-ui/checkbox-group'
 import { cn } from '@langgenius/dify-ui/cn'
-import { useCallback, useMemo, useState } from 'react'
+import { useId, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Badge from '@/app/components/base/badge'
-import Checkbox from '@/app/components/base/checkbox'
 import SearchInput from '@/app/components/base/search-input'
 import SearchMenu from '@/assets/search-menu.svg'
 
@@ -30,7 +30,7 @@ type CheckboxListProps = {
   maxHeight?: string | number
 }
 
-const CheckboxList: FC<CheckboxListProps> = ({
+export const CheckboxList = ({
   title = '',
   label,
   description,
@@ -43,8 +43,9 @@ const CheckboxList: FC<CheckboxListProps> = ({
   showCount = true,
   showSearch = true,
   maxHeight,
-}) => {
+}: CheckboxListProps) => {
   const { t } = useTranslation()
+  const groupLabelId = useId()
   const [searchQuery, setSearchQuery] = useState('')
 
   const filteredOptions = useMemo(() => {
@@ -59,48 +60,15 @@ const CheckboxList: FC<CheckboxListProps> = ({
 
   const selectedCount = value.length
 
-  const isAllSelected = useMemo(() => {
-    const selectableOptions = options.filter(option => !option.disabled)
-    return selectableOptions.length > 0 && selectableOptions.every(option => value.includes(option.value))
-  }, [options, value])
-
-  const isIndeterminate = useMemo(() => {
-    const selectableOptions = options.filter(option => !option.disabled)
-    const selectedCount = selectableOptions.filter(option => value.includes(option.value)).length
-    return selectedCount > 0 && selectedCount < selectableOptions.length
-  }, [options, value])
-
-  const handleSelectAll = useCallback(() => {
-    if (disabled)
-      return
-
-    if (isAllSelected) {
-      // Deselect all
-      onChange?.([])
-    }
-    else {
-      // Select all non-disabled options
-      const allValues = options
-        .filter(option => !option.disabled)
-        .map(option => option.value)
-      onChange?.(allValues)
-    }
-  }, [isAllSelected, options, onChange, disabled])
-
-  const handleToggleOption = useCallback((optionValue: string) => {
-    if (disabled)
-      return
-
-    const newValue = value.includes(optionValue)
-      ? value.filter(v => v !== optionValue)
-      : [...value, optionValue]
-    onChange?.(newValue)
-  }, [value, onChange, disabled])
+  const selectableOptionValues = useMemo(
+    () => options.filter(option => !option.disabled).map(option => option.value),
+    [options],
+  )
 
   return (
     <div className={cn('flex w-full flex-col gap-1', containerClassName)}>
       {label && (
-        <div className="system-sm-medium text-text-secondary">
+        <div id={groupLabelId} className="system-sm-medium text-text-secondary">
           {label}
         </div>
       )}
@@ -110,17 +78,24 @@ const CheckboxList: FC<CheckboxListProps> = ({
         </div>
       )}
 
-      <div className="rounded-lg border border-components-panel-border bg-components-panel-bg">
+      <CheckboxGroup
+        aria-labelledby={label ? groupLabelId : undefined}
+        value={value}
+        onValueChange={nextValue => onChange?.(nextValue)}
+        allValues={selectableOptionValues}
+        disabled={disabled}
+        className="rounded-lg border border-components-panel-border bg-components-panel-bg"
+      >
         {(showSelectAll || title || showSearch) && (
           <div className="relative flex items-center gap-2 border-b border-divider-subtle px-3 py-2">
             {!searchQuery && showSelectAll && (
-              <Checkbox
-                checked={isAllSelected}
-                indeterminate={isIndeterminate}
-                onCheck={handleSelectAll}
-                disabled={disabled}
-                id="selectAll"
-              />
+              <label className={cn('flex shrink-0 items-center', !disabled && 'cursor-pointer')}>
+                <Checkbox
+                  parent
+                  disabled={disabled}
+                />
+                <span className="sr-only">{t('operation.selectAll', { ns: 'common' })}</span>
+              </label>
             )}
             {!searchQuery
               ? (
@@ -177,45 +152,30 @@ const CheckboxList: FC<CheckboxListProps> = ({
                 </div>
               )
             : (
-                filteredOptions.map((option) => {
-                  const selected = value.includes(option.value)
-
-                  return (
-                    <div
-                      key={option.value}
-                      data-testid="option-item"
-                      className={cn(
-                        'flex cursor-pointer items-center gap-2 rounded-md px-2 py-1.5 transition-colors hover:bg-state-base-hover',
-                        option.disabled && 'cursor-not-allowed opacity-50',
-                      )}
-                      onClick={() => {
-                        if (!option.disabled && !disabled)
-                          handleToggleOption(option.value)
-                      }}
+                filteredOptions.map(option => (
+                  <label
+                    key={option.value}
+                    data-testid="option-item"
+                    className={cn(
+                      'flex cursor-pointer items-center gap-2 rounded-md px-2 py-1.5 transition-colors hover:bg-state-base-hover',
+                      (option.disabled || disabled) && 'cursor-not-allowed opacity-50',
+                    )}
+                  >
+                    <Checkbox
+                      value={option.value}
+                      disabled={option.disabled || disabled}
+                    />
+                    <span
+                      className="flex-1 truncate system-sm-medium text-text-secondary"
+                      title={option.label}
                     >
-                      <Checkbox
-                        checked={selected}
-                        onCheck={() => {
-                          if (!option.disabled && !disabled)
-                            handleToggleOption(option.value)
-                        }}
-                        disabled={option.disabled || disabled}
-                        id={option.value}
-                      />
-                      <div
-                        className="flex-1 truncate system-sm-medium text-text-secondary"
-                        title={option.label}
-                      >
-                        {option.label}
-                      </div>
-                    </div>
-                  )
-                })
+                      {option.label}
+                    </span>
+                  </label>
+                ))
               )}
         </div>
-      </div>
+      </CheckboxGroup>
     </div>
   )
 }
-
-export default CheckboxList
diff --git a/web/app/components/base/checkbox/__tests__/index.spec.tsx b/web/app/components/base/checkbox/__tests__/index.spec.tsx
deleted file mode 100644
index 8a83172250..0000000000
--- a/web/app/components/base/checkbox/__tests__/index.spec.tsx
+++ /dev/null
@@ -1,110 +0,0 @@
-import { fireEvent, render, screen } from '@testing-library/react'
-import Checkbox from '../index'
-
-describe('Checkbox Component', () => {
-  const mockProps = {
-    id: 'test',
-  }
-
-  it('renders unchecked checkbox by default', () => {
-    render(<Checkbox {...mockProps} />)
-    const checkbox = screen.getByTestId('checkbox-test')
-    expect(checkbox).toBeInTheDocument()
-    expect(checkbox).not.toHaveClass('bg-components-checkbox-bg')
-  })
-
-  it('renders checked checkbox when checked prop is true', () => {
-    render(<Checkbox {...mockProps} checked />)
-    const checkbox = screen.getByTestId('checkbox-test')
-    expect(checkbox).toHaveClass('bg-components-checkbox-bg')
-    expect(screen.getByTestId('check-icon-test')).toBeInTheDocument()
-  })
-
-  it('renders indeterminate state correctly', () => {
-    render(<Checkbox {...mockProps} indeterminate />)
-    expect(screen.getByTestId('indeterminate-icon')).toBeInTheDocument()
-  })
-
-  it('handles click events when not disabled', () => {
-    const onCheck = vi.fn()
-    render(<Checkbox {...mockProps} onCheck={onCheck} />)
-    const checkbox = screen.getByTestId('checkbox-test')
-
-    fireEvent.click(checkbox)
-    expect(onCheck).toHaveBeenCalledTimes(1)
-  })
-
-  it('does not handle click events when disabled', () => {
-    const onCheck = vi.fn()
-    render(<Checkbox {...mockProps} disabled onCheck={onCheck} />)
-    const checkbox = screen.getByTestId('checkbox-test')
-
-    fireEvent.click(checkbox)
-    expect(onCheck).not.toHaveBeenCalled()
-    expect(checkbox).toHaveClass('cursor-not-allowed')
-  })
-
-  it('applies custom className when provided', () => {
-    const customClass = 'custom-class'
-    render(<Checkbox {...mockProps} className={customClass} />)
-    const checkbox = screen.getByTestId('checkbox-test')
-    expect(checkbox).toHaveClass(customClass)
-  })
-
-  it('applies correct styles for disabled checked state', () => {
-    render(<Checkbox {...mockProps} checked disabled />)
-    const checkbox = screen.getByTestId('checkbox-test')
-    expect(checkbox).toHaveClass('bg-components-checkbox-bg-disabled-checked')
-    expect(checkbox).toHaveClass('cursor-not-allowed')
-  })
-
-  it('applies correct styles for disabled unchecked state', () => {
-    render(<Checkbox {...mockProps} disabled />)
-    const checkbox = screen.getByTestId('checkbox-test')
-    expect(checkbox).toHaveClass('bg-components-checkbox-bg-disabled')
-    expect(checkbox).toHaveClass('cursor-not-allowed')
-  })
-
-  it('handles keyboard events (Space and Enter) when not disabled', () => {
-    const onCheck = vi.fn()
-    render(<Checkbox {...mockProps} onCheck={onCheck} />)
-    const checkbox = screen.getByTestId('checkbox-test')
-
-    fireEvent.keyDown(checkbox, { key: ' ' })
-    expect(onCheck).toHaveBeenCalledTimes(1)
-
-    fireEvent.keyDown(checkbox, { key: 'Enter' })
-    expect(onCheck).toHaveBeenCalledTimes(2)
-  })
-
-  it('does not handle keyboard events when disabled', () => {
-    const onCheck = vi.fn()
-    render(<Checkbox {...mockProps} disabled onCheck={onCheck} />)
-    const checkbox = screen.getByTestId('checkbox-test')
-
-    fireEvent.keyDown(checkbox, { key: ' ' })
-    expect(onCheck).not.toHaveBeenCalled()
-
-    fireEvent.keyDown(checkbox, { key: 'Enter' })
-    expect(onCheck).not.toHaveBeenCalled()
-  })
-
-  it('exposes aria-disabled attribute', () => {
-    const { rerender } = render(<Checkbox {...mockProps} />)
-    expect(screen.getByTestId('checkbox-test')).toHaveAttribute('aria-disabled', 'false')
-
-    rerender(<Checkbox {...mockProps} disabled />)
-    expect(screen.getByTestId('checkbox-test')).toHaveAttribute('aria-disabled', 'true')
-  })
-
-  it('normalizes aria-checked attribute', () => {
-    const { rerender } = render(<Checkbox {...mockProps} />)
-    expect(screen.getByTestId('checkbox-test')).toHaveAttribute('aria-checked', 'false')
-
-    rerender(<Checkbox {...mockProps} checked />)
-    expect(screen.getByTestId('checkbox-test')).toHaveAttribute('aria-checked', 'true')
-
-    rerender(<Checkbox {...mockProps} indeterminate />)
-    expect(screen.getByTestId('checkbox-test')).toHaveAttribute('aria-checked', 'mixed')
-  })
-})
diff --git a/web/app/components/base/checkbox/assets/__tests__/indeterminate-icon.spec.tsx b/web/app/components/base/checkbox/assets/__tests__/indeterminate-icon.spec.tsx
deleted file mode 100644
index e226562da7..0000000000
--- a/web/app/components/base/checkbox/assets/__tests__/indeterminate-icon.spec.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { render, screen } from '@testing-library/react'
-import IndeterminateIcon from '../indeterminate-icon'
-
-describe('IndeterminateIcon', () => {
-  describe('Rendering', () => {
-    it('should render without crashing', () => {
-      render(<IndeterminateIcon />)
-      expect(screen.getByTestId('indeterminate-icon')).toBeInTheDocument()
-    })
-
-    it('should render an svg element', () => {
-      const { container } = render(<IndeterminateIcon />)
-      const svg = container.querySelector('svg')
-      expect(svg).toBeInTheDocument()
-    })
-  })
-})
diff --git a/web/app/components/base/checkbox/assets/indeterminate-icon.tsx b/web/app/components/base/checkbox/assets/indeterminate-icon.tsx
deleted file mode 100644
index 29e9e6315c..0000000000
--- a/web/app/components/base/checkbox/assets/indeterminate-icon.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-const IndeterminateIcon = () => {
-  return (
-    <div data-testid="indeterminate-icon">
-      <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="none">
-        <path d="M2.5 6H9.5" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" />
-      </svg>
-    </div>
-  )
-}
-
-export default IndeterminateIcon
diff --git a/web/app/components/base/checkbox/index.stories.tsx b/web/app/components/base/checkbox/index.stories.tsx
deleted file mode 100644
index 1c8ffe8993..0000000000
--- a/web/app/components/base/checkbox/index.stories.tsx
+++ /dev/null
@@ -1,399 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/nextjs-vite'
-import { useState } from 'react'
-import Checkbox from '.'
-
-// Helper function for toggling items in an array
-const createToggleItem = <T extends { id: string, checked: boolean }>(
-  items: T[],
-  setItems: (items: T[]) => void,
-) => (id: string) => {
-  setItems(items.map(item =>
-    item.id === id ? { ...item, checked: !item.checked } as T : item,
-  ))
-}
-
-const meta = {
-  title: 'Base/Data Entry/Checkbox',
-  component: Checkbox,
-  parameters: {
-    layout: 'centered',
-    docs: {
-      description: {
-        component: 'Checkbox component with support for checked, unchecked, indeterminate, and disabled states.',
-      },
-    },
-  },
-  tags: ['autodocs'],
-  argTypes: {
-    checked: {
-      control: 'boolean',
-      description: 'Checked state',
-    },
-    indeterminate: {
-      control: 'boolean',
-      description: 'Indeterminate state (partially checked)',
-    },
-    disabled: {
-      control: 'boolean',
-      description: 'Disabled state',
-    },
-    className: {
-      control: 'text',
-      description: 'Additional CSS classes',
-    },
-    id: {
-      control: 'text',
-      description: 'HTML id attribute',
-    },
-  },
-} satisfies Meta<typeof Checkbox>
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-// Interactive demo wrapper
-const CheckboxDemo = (args: any) => {
-  const [checked, setChecked] = useState(args.checked || false)
-
-  return (
-    <div className="flex items-center gap-3">
-      <Checkbox
-        {...args}
-        checked={checked}
-        onCheck={() => {
-          if (!args.disabled) {
-            setChecked(!checked)
-            console.log('Checkbox toggled:', !checked)
-          }
-        }}
-      />
-      <span className="text-sm text-gray-700">
-        {checked ? 'Checked' : 'Unchecked'}
-      </span>
-    </div>
-  )
-}
-
-// Default unchecked
-export const Default: Story = {
-  render: args => <CheckboxDemo {...args} />,
-  args: {
-    checked: false,
-    disabled: false,
-    indeterminate: false,
-  },
-}
-
-// Checked state
-export const Checked: Story = {
-  render: args => <CheckboxDemo {...args} />,
-  args: {
-    checked: true,
-    disabled: false,
-    indeterminate: false,
-  },
-}
-
-// Indeterminate state
-export const Indeterminate: Story = {
-  render: args => <CheckboxDemo {...args} />,
-  args: {
-    checked: false,
-    disabled: false,
-    indeterminate: true,
-  },
-}
-
-// Disabled unchecked
-export const DisabledUnchecked: Story = {
-  render: args => <CheckboxDemo {...args} />,
-  args: {
-    checked: false,
-    disabled: true,
-    indeterminate: false,
-  },
-}
-
-// Disabled checked
-export const DisabledChecked: Story = {
-  render: args => <CheckboxDemo {...args} />,
-  args: {
-    checked: true,
-    disabled: true,
-    indeterminate: false,
-  },
-}
-
-// Disabled indeterminate
-export const DisabledIndeterminate: Story = {
-  render: args => <CheckboxDemo {...args} />,
-  args: {
-    checked: false,
-    disabled: true,
-    indeterminate: true,
-  },
-}
-
-// State comparison
-export const StateComparison: Story = {
-  render: () => (
-    <div className="flex flex-col gap-6">
-      <div className="flex items-center gap-4">
-        <div className="flex flex-col items-center gap-2">
-          <Checkbox checked={false} onCheck={() => undefined} />
-          <span className="text-xs text-gray-600">Unchecked</span>
-        </div>
-        <div className="flex flex-col items-center gap-2">
-          <Checkbox checked={true} onCheck={() => undefined} />
-          <span className="text-xs text-gray-600">Checked</span>
-        </div>
-        <div className="flex flex-col items-center gap-2">
-          <Checkbox checked={false} indeterminate={true} onCheck={() => undefined} />
-          <span className="text-xs text-gray-600">Indeterminate</span>
-        </div>
-      </div>
-      <div className="flex items-center gap-4">
-        <div className="flex flex-col items-center gap-2">
-          <Checkbox checked={false} disabled={true} onCheck={() => undefined} />
-          <span className="text-xs text-gray-600">Disabled</span>
-        </div>
-        <div className="flex flex-col items-center gap-2">
-          <Checkbox checked={true} disabled={true} onCheck={() => undefined} />
-          <span className="text-xs text-gray-600">Disabled Checked</span>
-        </div>
-        <div className="flex flex-col items-center gap-2">
-          <Checkbox checked={false} indeterminate={true} disabled={true} onCheck={() => undefined} />
-          <span className="text-xs text-gray-600">Disabled Indeterminate</span>
-        </div>
-      </div>
-    </div>
-  ),
-}
-
-// With labels
-const WithLabelsDemo = () => {
-  const [items, setItems] = useState([
-    { id: '1', label: 'Enable notifications', checked: true },
-    { id: '2', label: 'Enable email updates', checked: false },
-    { id: '3', label: 'Enable SMS alerts', checked: false },
-  ])
-
-  const toggleItem = createToggleItem(items, setItems)
-
-  return (
-    <div className="flex flex-col gap-3">
-      {items.map(item => (
-        <div key={item.id} className="flex items-center gap-3">
-          <Checkbox
-            id={item.id}
-            checked={item.checked}
-            onCheck={() => toggleItem(item.id)}
-          />
-          <label
-            htmlFor={item.id}
-            className="cursor-pointer text-sm text-gray-700"
-            onClick={() => toggleItem(item.id)}
-          >
-            {item.label}
-          </label>
-        </div>
-      ))}
-    </div>
-  )
-}
-
-export const WithLabels: Story = {
-  render: () => <WithLabelsDemo />,
-}
-
-// Select all example
-const SelectAllExampleDemo = () => {
-  const [items, setItems] = useState([
-    { id: '1', label: 'Item 1', checked: false },
-    { id: '2', label: 'Item 2', checked: false },
-    { id: '3', label: 'Item 3', checked: false },
-  ])
-
-  const allChecked = items.every(item => item.checked)
-  const someChecked = items.some(item => item.checked)
-  const indeterminate = someChecked && !allChecked
-
-  const toggleAll = () => {
-    const newChecked = !allChecked
-    setItems(items.map(item => ({ ...item, checked: newChecked })))
-  }
-
-  const toggleItem = createToggleItem(items, setItems)
-
-  return (
-    <div className="flex flex-col gap-3 rounded-lg bg-gray-50 p-4">
-      <div className="flex items-center gap-3 border-b border-gray-200 pb-3">
-        <Checkbox
-          checked={allChecked}
-          indeterminate={indeterminate}
-          onCheck={toggleAll}
-        />
-        <span className="text-sm font-medium text-gray-700">Select All</span>
-      </div>
-      <div className="flex flex-col gap-2 pl-7">
-        {items.map(item => (
-          <div key={item.id} className="flex items-center gap-3">
-            <Checkbox
-              id={item.id}
-              checked={item.checked}
-              onCheck={() => toggleItem(item.id)}
-            />
-            <label
-              htmlFor={item.id}
-              className="cursor-pointer text-sm text-gray-600"
-              onClick={() => toggleItem(item.id)}
-            >
-              {item.label}
-            </label>
-          </div>
-        ))}
-      </div>
-    </div>
-  )
-}
-
-export const SelectAllExample: Story = {
-  render: () => <SelectAllExampleDemo />,
-}
-
-// Form example
-const FormExampleDemo = () => {
-  const [formData, setFormData] = useState({
-    terms: false,
-    newsletter: false,
-    privacy: false,
-  })
-
-  return (
-    <div className="w-96 rounded-lg border border-gray-200 bg-white p-6">
-      <h3 className="mb-4 text-lg font-semibold">Account Settings</h3>
-      <div className="flex flex-col gap-4">
-        <div className="flex items-start gap-3">
-          <Checkbox
-            id="terms"
-            checked={formData.terms}
-            onCheck={() => setFormData({ ...formData, terms: !formData.terms })}
-          />
-          <div>
-            <label htmlFor="terms" className="cursor-pointer text-sm font-medium text-gray-700">
-              I agree to the terms and conditions
-            </label>
-            <p className="mt-1 text-xs text-gray-500">
-              Required to continue
-            </p>
-          </div>
-        </div>
-        <div className="flex items-start gap-3">
-          <Checkbox
-            id="newsletter"
-            checked={formData.newsletter}
-            onCheck={() => setFormData({ ...formData, newsletter: !formData.newsletter })}
-          />
-          <div>
-            <label htmlFor="newsletter" className="cursor-pointer text-sm font-medium text-gray-700">
-              Subscribe to newsletter
-            </label>
-            <p className="mt-1 text-xs text-gray-500">
-              Get updates about new features
-            </p>
-          </div>
-        </div>
-        <div className="flex items-start gap-3">
-          <Checkbox
-            id="privacy"
-            checked={formData.privacy}
-            onCheck={() => setFormData({ ...formData, privacy: !formData.privacy })}
-          />
-          <div>
-            <label htmlFor="privacy" className="cursor-pointer text-sm font-medium text-gray-700">
-              I have read the privacy policy
-            </label>
-            <p className="mt-1 text-xs text-gray-500">
-              Required to continue
-            </p>
-          </div>
-        </div>
-      </div>
-    </div>
-  )
-}
-
-export const FormExample: Story = {
-  render: () => <FormExampleDemo />,
-}
-
-// Task list example
-const TaskListExampleDemo = () => {
-  const [tasks, setTasks] = useState([
-    { id: '1', title: 'Review pull request', completed: true },
-    { id: '2', title: 'Update documentation', completed: true },
-    { id: '3', title: 'Fix navigation bug', completed: false },
-    { id: '4', title: 'Deploy to staging', completed: false },
-  ])
-
-  const toggleTask = (id: string) => {
-    setTasks(tasks.map(task =>
-      task.id === id ? { ...task, completed: !task.completed } : task,
-    ))
-  }
-
-  const completedCount = tasks.filter(t => t.completed).length
-
-  return (
-    <div className="w-96 rounded-lg border border-gray-200 bg-white p-4">
-      <div className="mb-4 flex items-center justify-between">
-        <h3 className="text-sm font-semibold text-gray-700">Today's Tasks</h3>
-        <span className="text-xs text-gray-500">
-          {completedCount}
-          {' '}
-          of
-          {tasks.length}
-          {' '}
-          completed
-        </span>
-      </div>
-      <div className="flex flex-col gap-2">
-        {tasks.map(task => (
-          <div
-            key={task.id}
-            className="flex items-center gap-3 rounded-sm p-2 hover:bg-gray-50"
-          >
-            <Checkbox
-              id={task.id}
-              checked={task.completed}
-              onCheck={() => toggleTask(task.id)}
-            />
-            <span
-              className={`cursor-pointer text-sm ${
-                task.completed ? 'text-gray-400 line-through' : 'text-gray-700'
-              }`}
-              onClick={() => toggleTask(task.id)}
-            >
-              {task.title}
-            </span>
-          </div>
-        ))}
-      </div>
-    </div>
-  )
-}
-
-export const TaskListExample: Story = {
-  render: () => <TaskListExampleDemo />,
-}
-
-// Interactive playground
-export const Playground: Story = {
-  render: args => <CheckboxDemo {...args} />,
-  args: {
-    checked: false,
-    indeterminate: false,
-    disabled: false,
-    id: 'playground-checkbox',
-  },
-}
diff --git a/web/app/components/base/checkbox/index.tsx b/web/app/components/base/checkbox/index.tsx
deleted file mode 100644
index 7457dc9016..0000000000
--- a/web/app/components/base/checkbox/index.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { cn } from '@langgenius/dify-ui/cn'
-import IndeterminateIcon from './assets/indeterminate-icon'
-
-type CheckboxProps = {
-  id?: string
-  checked?: boolean
-  onCheck?: (event: React.MouseEvent<HTMLDivElement> | React.KeyboardEvent<HTMLDivElement>) => void
-  className?: string
-  disabled?: boolean
-  indeterminate?: boolean
-  ariaLabel?: string
-  ariaLabelledBy?: string
-}
-
-const Checkbox = ({
-  id,
-  checked,
-  onCheck,
-  className,
-  disabled,
-  indeterminate,
-  ariaLabel,
-  ariaLabelledBy,
-}: CheckboxProps) => {
-  const checkClassName = (checked || indeterminate)
-    ? 'bg-components-checkbox-bg text-components-checkbox-icon hover:bg-components-checkbox-bg-hover'
-    : 'border border-components-checkbox-border bg-components-checkbox-bg-unchecked hover:bg-components-checkbox-bg-unchecked-hover hover:border-components-checkbox-border-hover'
-  const disabledClassName = (checked || indeterminate)
-    ? 'cursor-not-allowed bg-components-checkbox-bg-disabled-checked text-components-checkbox-icon-disabled hover:bg-components-checkbox-bg-disabled-checked'
-    : 'cursor-not-allowed border-components-checkbox-border-disabled bg-components-checkbox-bg-disabled hover:border-components-checkbox-border-disabled hover:bg-components-checkbox-bg-disabled'
-
-  return (
-    <div
-      id={id}
-      className={cn(
-        'flex h-4 w-4 shrink-0 cursor-pointer items-center justify-center rounded-sm shadow-xs shadow-shadow-shadow-3',
-        checkClassName,
-        disabled && disabledClassName,
-        className,
-      )}
-      onClick={(event) => {
-        if (disabled)
-          return
-        onCheck?.(event)
-      }}
-      onKeyDown={(event) => {
-        if (disabled)
-          return
-        if (event.key === ' ' || event.key === 'Enter') {
-          if (event.key === ' ')
-            event.preventDefault()
-          onCheck?.(event)
-        }
-      }}
-      data-testid={`checkbox-${id}`}
-      role="checkbox"
-      aria-checked={indeterminate ? 'mixed' : !!checked}
-      aria-disabled={!!disabled}
-      aria-label={ariaLabel}
-      aria-labelledby={ariaLabelledBy}
-      tabIndex={disabled ? -1 : 0}
-    >
-      {!checked && indeterminate && <IndeterminateIcon />}
-      {checked && <div className="i-ri-check-line h-3 w-3" data-testid={`check-icon-${id}`} />}
-    </div>
-  )
-}
-
-export default Checkbox
diff --git a/web/app/components/base/chip/__tests__/index.spec.tsx b/web/app/components/base/chip/__tests__/index.spec.tsx
index ac3a68292c..40ecbb7a33 100644
--- a/web/app/components/base/chip/__tests__/index.spec.tsx
+++ b/web/app/components/base/chip/__tests__/index.spec.tsx
@@ -40,7 +40,7 @@ describe('Chip', () => {
 
   // Helper function to get the trigger element
   const getTrigger = (container: HTMLElement) => {
-    return container.querySelector('[data-state]')
+    return container.querySelector('[role="button"][aria-haspopup="menu"]') as HTMLElement | null
   }
 
   // Helper function to open dropdown panel
@@ -102,7 +102,7 @@ describe('Chip', () => {
 
       // When showLeftIcon is false, there should be no filter icon before the text
       const textElement = screen.getByText('All Items')
-      const parent = textElement.closest('div[data-state]')
+      const parent = textElement.closest('[role="button"]')
       const icons = parent?.querySelectorAll('svg')
 
       // Should only have the arrow icon, not the filter icon
@@ -142,20 +142,20 @@ describe('Chip', () => {
     it('should toggle dropdown panel on trigger click', () => {
       const { container } = renderChip()
 
-      // Initially closed - check data-state attribute
+      // Initially closed - check aria-expanded attribute
       const trigger = getTrigger(container)
-      expect(trigger)!.toHaveAttribute('data-state', 'closed')
+      expect(trigger)!.toHaveAttribute('aria-expanded', 'false')
 
       // Open panel
       openPanel(container)
-      expect(trigger)!.toHaveAttribute('data-state', 'open')
+      expect(trigger)!.toHaveAttribute('aria-expanded', 'true')
       // Panel items should be visible
       expect(screen.getAllByText('All Items').length).toBeGreaterThan(1)
 
       // Close panel
       if (trigger)
         fireEvent.click(trigger)
-      expect(trigger)!.toHaveAttribute('data-state', 'closed')
+      expect(trigger)!.toHaveAttribute('aria-expanded', 'false')
     })
 
     it('should close panel after selecting an item', () => {
@@ -163,14 +163,14 @@ describe('Chip', () => {
 
       openPanel(container)
       const trigger = getTrigger(container)
-      expect(trigger)!.toHaveAttribute('data-state', 'open')
+      expect(trigger)!.toHaveAttribute('aria-expanded', 'true')
 
       // Click on an item in the dropdown panel
       const activeItems = screen.getAllByText('Active')
       // The second one should be in the dropdown
       fireEvent.click(activeItems[activeItems.length - 1]!)
 
-      expect(trigger)!.toHaveAttribute('data-state', 'closed')
+      expect(trigger)!.toHaveAttribute('aria-expanded', 'false')
     })
   })
 
@@ -208,7 +208,7 @@ describe('Chip', () => {
       const { container } = renderChip({ value: 'active' })
 
       const trigger = getTrigger(container)
-      expect(trigger)!.toHaveAttribute('data-state', 'closed')
+      expect(trigger)!.toHaveAttribute('aria-expanded', 'false')
 
       // Find the close icon (last SVG) and click its parent
       const svgs = trigger?.querySelectorAll('svg')
@@ -220,7 +220,7 @@ describe('Chip', () => {
 
       // Panel should remain closed
       // Panel should remain closed
-      expect(trigger)!.toHaveAttribute('data-state', 'closed')
+      expect(trigger)!.toHaveAttribute('aria-expanded', 'false')
       expect(onClear).toHaveBeenCalledTimes(1)
     })
 
@@ -232,17 +232,17 @@ describe('Chip', () => {
       // Click 1: open
       if (trigger)
         fireEvent.click(trigger)
-      expect(trigger)!.toHaveAttribute('data-state', 'open')
+      expect(trigger)!.toHaveAttribute('aria-expanded', 'true')
 
       // Click 2: close
       if (trigger)
         fireEvent.click(trigger)
-      expect(trigger)!.toHaveAttribute('data-state', 'closed')
+      expect(trigger)!.toHaveAttribute('aria-expanded', 'false')
 
       // Click 3: open again
       if (trigger)
         fireEvent.click(trigger)
-      expect(trigger)!.toHaveAttribute('data-state', 'open')
+      expect(trigger)!.toHaveAttribute('aria-expanded', 'true')
     })
   })
 
@@ -285,10 +285,10 @@ describe('Chip', () => {
 
       // Closed by default
       // Closed by default
-      expect(trigger)!.toHaveAttribute('data-state', 'closed')
+      expect(trigger)!.toHaveAttribute('aria-expanded', 'false')
 
       openPanel(container)
-      expect(trigger)!.toHaveAttribute('data-state', 'open')
+      expect(trigger)!.toHaveAttribute('aria-expanded', 'true')
       // Items should be duplicated (once in trigger, once in panel)
       expect(screen.getAllByText('All Items').length).toBeGreaterThan(1)
     })
@@ -327,7 +327,7 @@ describe('Chip', () => {
       const { container } = renderChip({ items: [], value: '' })
 
       // Trigger should still render
-      const trigger = container.querySelector('[data-state]')
+      const trigger = getTrigger(container)
       expect(trigger)!.toBeInTheDocument()
     })
 
diff --git a/web/app/components/base/chip/index.tsx b/web/app/components/base/chip/index.tsx
index 50f4744b07..35ad48039b 100644
--- a/web/app/components/base/chip/index.tsx
+++ b/web/app/components/base/chip/index.tsx
@@ -1,12 +1,14 @@
 import type { FC } from 'react'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuTrigger,
+} from '@langgenius/dify-ui/dropdown-menu'
 import { RiArrowDownSLine, RiCheckLine, RiCloseCircleFill, RiFilter3Line } from '@remixicon/react'
 import { useMemo, useState } from 'react'
-import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
 
 export type Item = {
   value: number | string
@@ -40,16 +42,14 @@ const Chip: FC<Props> = ({
   }, [items, value])
 
   return (
-    <PortalToFollowElem
+    <DropdownMenu
       open={open}
       onOpenChange={setOpen}
-      placement="bottom-start"
-      offset={4}
     >
       <div className="relative">
-        <PortalToFollowElemTrigger
-          onClick={() => setOpen(v => !v)}
-          className="block"
+        <DropdownMenuTrigger
+          nativeButton={false}
+          render={<div className="block" />}
         >
           <div className={cn(
             'flex min-h-8 cursor-pointer items-center rounded-lg border-[0.5px] border-transparent bg-components-input-bg-normal px-2 py-1 hover:bg-state-base-hover-alt',
@@ -84,28 +84,36 @@ const Chip: FC<Props> = ({
               </div>
             )}
           </div>
-        </PortalToFollowElemTrigger>
-        <PortalToFollowElemContent className="z-1002">
-          <div className={cn('relative w-[240px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg', panelClassName)}>
-            <div className="max-h-72 overflow-auto p-1">
-              {items.map(item => (
-                <div
-                  key={item.value}
-                  className="flex cursor-pointer items-center gap-2 rounded-lg px-2 py-[6px] pl-3 hover:bg-state-base-hover"
-                  onClick={() => {
-                    onSelect(item)
-                    setOpen(false)
-                  }}
-                >
-                  <div title={item.name} className="grow truncate system-sm-medium text-text-secondary">{item.name}</div>
-                  {value === item.value && <RiCheckLine className="h-4 w-4 shrink-0 text-util-colors-blue-light-blue-light-600" />}
-                </div>
-              ))}
-            </div>
-          </div>
-        </PortalToFollowElemContent>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent
+          placement="bottom-start"
+          sideOffset={4}
+          popupClassName={cn('relative w-[240px] rounded-xl border-[0.5px] bg-components-panel-bg-blur p-0', panelClassName)}
+        >
+          <DropdownMenuRadioGroup
+            value={value}
+            onValueChange={(nextValue) => {
+              const selected = items.find(item => item.value === nextValue)
+              if (selected)
+                onSelect(selected)
+            }}
+            className="max-h-72 overflow-auto p-1"
+          >
+            {items.map(item => (
+              <DropdownMenuRadioItem
+                key={item.value}
+                value={item.value}
+                closeOnClick
+                className="gap-2 rounded-lg px-2 py-[6px] pl-3"
+              >
+                <div title={item.name} className="grow truncate system-sm-medium text-text-secondary">{item.name}</div>
+                {value === item.value && <RiCheckLine className="h-4 w-4 shrink-0 text-util-colors-blue-light-blue-light-600" />}
+              </DropdownMenuRadioItem>
+            ))}
+          </DropdownMenuRadioGroup>
+        </DropdownMenuContent>
       </div>
-    </PortalToFollowElem>
+    </DropdownMenu>
 
   )
 }
diff --git a/web/app/components/base/content-dialog/__tests__/index.spec.tsx b/web/app/components/base/content-dialog/__tests__/index.spec.tsx
deleted file mode 100644
index e987d306a1..0000000000
--- a/web/app/components/base/content-dialog/__tests__/index.spec.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import { render, screen } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
-import ContentDialog from '../index'
-
-describe('ContentDialog', () => {
-  it('renders children when show is true', async () => {
-    render(
-      <ContentDialog show={true}>
-        <div>Dialog body</div>
-      </ContentDialog>,
-    )
-
-    await screen.findByText('Dialog body')
-    expect(screen.getByText('Dialog body')).toBeInTheDocument()
-
-    const backdrop = document.querySelector('.bg-app-detail-overlay-bg')
-    expect(backdrop).toBeTruthy()
-  })
-
-  it('does not render children when show is false', () => {
-    render(
-      <ContentDialog show={false}>
-        <div>Hidden content</div>
-      </ContentDialog>,
-    )
-
-    expect(screen.queryByText('Hidden content')).toBeNull()
-    expect(document.querySelector('.bg-app-detail-overlay-bg')).toBeNull()
-  })
-
-  it('calls onClose when backdrop is clicked', async () => {
-    const onClose = vi.fn()
-    render(
-      <ContentDialog show={true} onClose={onClose}>
-        <div>Body</div>
-      </ContentDialog>,
-    )
-
-    const user = userEvent.setup()
-    const backdrop = document.querySelector('.bg-app-detail-overlay-bg') as HTMLElement | null
-    expect(backdrop).toBeTruthy()
-
-    await user.click(backdrop!)
-    expect(onClose).toHaveBeenCalledTimes(1)
-  })
-
-  it('applies provided className to the content panel', () => {
-    render(
-      <ContentDialog show={true} className="my-panel-class">
-        <div>Panel content</div>
-      </ContentDialog>,
-    )
-
-    const contentPanel = document.querySelector('.bg-app-detail-bg') as HTMLElement | null
-    expect(contentPanel).toBeTruthy()
-    expect(contentPanel?.className).toContain('my-panel-class')
-    expect(screen.getByText('Panel content')).toBeInTheDocument()
-  })
-})
diff --git a/web/app/components/base/content-dialog/index.stories.tsx b/web/app/components/base/content-dialog/index.stories.tsx
deleted file mode 100644
index 8ddd5c667d..0000000000
--- a/web/app/components/base/content-dialog/index.stories.tsx
+++ /dev/null
@@ -1,119 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/nextjs-vite'
-import { useEffect, useState } from 'react'
-import ContentDialog from '.'
-
-type Props = React.ComponentProps<typeof ContentDialog>
-
-const meta = {
-  title: 'Base/Feedback/ContentDialog',
-  component: ContentDialog,
-  parameters: {
-    layout: 'fullscreen',
-    docs: {
-      description: {
-        component: 'Sliding panel overlay used in the app detail view. Includes dimmed backdrop and animated entrance/exit transitions.',
-      },
-    },
-  },
-  tags: ['autodocs'],
-  argTypes: {
-    className: {
-      control: 'text',
-      description: 'Additional classes applied to the sliding panel container.',
-    },
-    show: {
-      control: 'boolean',
-      description: 'Controls visibility of the dialog.',
-    },
-    onClose: {
-      control: false,
-      description: 'Invoked when the overlay/backdrop is clicked.',
-    },
-    children: {
-      control: false,
-      table: { disable: true },
-    },
-  },
-  args: {
-    show: false,
-    children: null,
-  },
-} satisfies Meta<typeof ContentDialog>
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-const DemoWrapper = (props: Props) => {
-  const [open, setOpen] = useState(props.show)
-
-  useEffect(() => {
-    setOpen(props.show)
-  }, [props.show])
-
-  return (
-    <div className="relative h-[480px] w-full overflow-hidden bg-gray-100">
-      <div className="flex h-full items-center justify-center">
-        <button
-          className="rounded-md bg-primary-600 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-primary-700"
-          onClick={() => setOpen(true)}
-        >
-          Open dialog
-        </button>
-      </div>
-
-      <ContentDialog
-        {...props}
-        show={open}
-        onClose={() => {
-          props.onClose?.()
-          setOpen(false)
-        }}
-      >
-        <div className="flex h-full flex-col space-y-4 bg-white p-6">
-          <h2 className="text-lg font-semibold text-gray-900">Plan summary</h2>
-          <p className="text-sm text-gray-600">
-            Use this area to present rich content for the selected run, configuration details, or
-            any supporting context.
-          </p>
-          <div className="flex-1 overflow-y-auto rounded-md border border-dashed border-gray-200 bg-gray-50 p-4 text-xs text-gray-500">
-            Scrollable placeholder content. Add domain-specific information, activity logs, or
-            editors in the real application.
-          </div>
-          <div className="flex justify-end gap-2 pt-4">
-            <button
-              className="rounded-md border border-gray-300 px-3 py-1.5 text-sm text-gray-600 hover:bg-gray-50"
-              onClick={() => setOpen(false)}
-            >
-              Cancel
-            </button>
-            <button className="rounded-md bg-primary-600 px-3 py-1.5 text-sm text-white hover:bg-primary-700">
-              Apply changes
-            </button>
-          </div>
-        </div>
-      </ContentDialog>
-    </div>
-  )
-}
-
-export const Default: Story = {
-  args: {
-    children: null,
-  },
-  render: args => <DemoWrapper {...args} />,
-}
-
-export const NarrowPanel: Story = {
-  render: args => <DemoWrapper {...args} />,
-  args: {
-    className: 'max-w-[420px]',
-    children: null,
-  },
-  parameters: {
-    docs: {
-      description: {
-        story: 'Applies a custom width class to show the dialog as a narrower information panel.',
-      },
-    },
-  },
-}
diff --git a/web/app/components/base/content-dialog/index.tsx b/web/app/components/base/content-dialog/index.tsx
deleted file mode 100644
index 5367a35fc4..0000000000
--- a/web/app/components/base/content-dialog/index.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import type { ReactNode } from 'react'
-import { Transition, TransitionChild } from '@headlessui/react'
-import { cn } from '@langgenius/dify-ui/cn'
-
-type ContentDialogProps = {
-  className?: string
-  show: boolean
-  onClose?: () => void
-  children: ReactNode
-}
-
-const ContentDialog = ({
-  className,
-  show,
-  onClose,
-  children,
-}: ContentDialogProps) => {
-  return (
-    <Transition
-      show={show}
-      as="div"
-      className="absolute top-0 left-0 z-[70] box-border h-full w-full p-2"
-    >
-      <TransitionChild>
-        <div
-          className={cn('absolute inset-0 left-0 w-full bg-app-detail-overlay-bg', 'duration-300 ease-in data-closed:opacity-0', 'data-enter:opacity-100', 'data-leave:opacity-0')}
-          onClick={onClose}
-        />
-      </TransitionChild>
-
-      <TransitionChild>
-        <div className={cn('absolute left-0 w-full border-r border-divider-burn bg-app-detail-bg', 'duration-100 ease-in data-closed:-translate-x-full', 'data-enter:translate-x-0 data-enter:duration-300 data-enter:ease-out', 'data-leave:-translate-x-full data-leave:duration-200 data-leave:ease-in', className)}>
-          {children}
-        </div>
-      </TransitionChild>
-    </Transition>
-  )
-}
-
-export default ContentDialog
diff --git a/web/app/components/base/copy-feedback/__tests__/index.spec.tsx b/web/app/components/base/copy-feedback/__tests__/index.spec.tsx
index 83e873ab89..b2484031db 100644
--- a/web/app/components/base/copy-feedback/__tests__/index.spec.tsx
+++ b/web/app/components/base/copy-feedback/__tests__/index.spec.tsx
@@ -35,15 +35,15 @@ describe('CopyFeedback', () => {
   describe('User Interactions', () => {
     it('calls copy with content when clicked', () => {
       render(<CopyFeedback content="test content" />)
-      const button = screen.getByRole('button')
-      fireEvent.click(button.firstChild as Element)
+      const button = screen.getByRole('button', { name: 'appOverview.overview.appInfo.embedded.copy' })
+      fireEvent.click(button)
       expect(mockCopy).toHaveBeenCalledWith('test content')
     })
 
     it('does not reset on mouse leave (relies on hook timeout)', () => {
       render(<CopyFeedback content="test content" />)
-      const button = screen.getByRole('button')
-      fireEvent.mouseLeave(button.firstChild as Element)
+      const button = screen.getByRole('button', { name: 'appOverview.overview.appInfo.embedded.copy' })
+      fireEvent.mouseLeave(button)
       expect(mockReset).not.toHaveBeenCalled()
     })
   })
@@ -57,8 +57,8 @@ describe('CopyFeedbackNew', () => {
 
   describe('Rendering', () => {
     it('renders the component', () => {
-      const { container } = render(<CopyFeedbackNew content="test content" />)
-      expect(container.querySelector('.cursor-pointer')).toBeInTheDocument()
+      render(<CopyFeedbackNew content="test content" />)
+      expect(screen.getByRole('button', { name: 'appOverview.overview.appInfo.embedded.copy' })).toBeInTheDocument()
     })
 
     it('renders with custom className', () => {
@@ -82,16 +82,14 @@ describe('CopyFeedbackNew', () => {
 
   describe('User Interactions', () => {
     it('calls copy with content when clicked', () => {
-      const { container } = render(<CopyFeedbackNew content="test content" />)
-      const clickableArea = container.querySelector('.cursor-pointer')!.firstChild as HTMLElement
-      fireEvent.click(clickableArea)
+      render(<CopyFeedbackNew content="test content" />)
+      fireEvent.click(screen.getByRole('button', { name: 'appOverview.overview.appInfo.embedded.copy' }))
       expect(mockCopy).toHaveBeenCalledWith('test content')
     })
 
     it('does not reset on mouse leave (relies on hook timeout)', () => {
-      const { container } = render(<CopyFeedbackNew content="test content" />)
-      const clickableArea = container.querySelector('.cursor-pointer')!.firstChild as HTMLElement
-      fireEvent.mouseLeave(clickableArea)
+      render(<CopyFeedbackNew content="test content" />)
+      fireEvent.mouseLeave(screen.getByRole('button', { name: 'appOverview.overview.appInfo.embedded.copy' }))
       expect(mockReset).not.toHaveBeenCalled()
     })
   })
diff --git a/web/app/components/base/copy-feedback/index.tsx b/web/app/components/base/copy-feedback/index.tsx
index 860b88b245..027e34d665 100644
--- a/web/app/components/base/copy-feedback/index.tsx
+++ b/web/app/components/base/copy-feedback/index.tsx
@@ -38,11 +38,9 @@ const CopyFeedback = ({ content }: Props) => {
     <Tooltip>
       <TooltipTrigger
         render={(
-          <ActionButton>
-            <div onClick={handleCopy}>
-              {copied && <RiClipboardFill className="h-4 w-4" />}
-              {!copied && <RiClipboardLine className="h-4 w-4" />}
-            </div>
+          <ActionButton aria-label={safeText} onClick={handleCopy}>
+            {copied && <RiClipboardFill className="h-4 w-4" aria-hidden="true" />}
+            {!copied && <RiClipboardLine className="h-4 w-4" aria-hidden="true" />}
           </ActionButton>
         )}
       />
@@ -73,15 +71,17 @@ export const CopyFeedbackNew = ({ content, className }: Pick<Props, 'className'
     <Tooltip>
       <TooltipTrigger
         render={(
-          <div
-            className={`h-8 w-8 cursor-pointer rounded-lg hover:bg-components-button-ghost-bg-hover ${className ?? ''}`}
+          <button
+            type="button"
+            aria-label={safeText}
+            className={`h-8 w-8 cursor-pointer rounded-lg border-none bg-transparent p-0 hover:bg-components-button-ghost-bg-hover focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden ${className ?? ''}`}
+            onClick={handleCopy}
           >
             <div
-              onClick={handleCopy}
               className={`h-full w-full ${copyStyle.copyIcon} ${copied ? copyStyle.copied : ''}`}
             >
             </div>
-          </div>
+          </button>
         )}
       />
       <TooltipContent>
diff --git a/web/app/components/base/copy-icon/__tests__/index.spec.tsx b/web/app/components/base/copy-icon/__tests__/index.spec.tsx
index 1ce9e6dbf5..28044a20d0 100644
--- a/web/app/components/base/copy-icon/__tests__/index.spec.tsx
+++ b/web/app/components/base/copy-icon/__tests__/index.spec.tsx
@@ -21,29 +21,24 @@ describe('copy icon component', () => {
 
   it('renders normally', () => {
     render(<CopyIcon content="this is some test content for the copy icon component" />)
-    const icon = screen.getByTestId('copy-icon')
-    expect(icon).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'appOverview.overview.appInfo.embedded.copy' })).toBeInTheDocument()
   })
 
   it('shows copy check icon when copied', () => {
     copied = true
     render(<CopyIcon content="this is some test content for the copy icon component" />)
-    const icon = screen.getByTestId('copied-icon')
-    expect(icon).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'appOverview.overview.appInfo.embedded.copied' })).toBeInTheDocument()
   })
 
   it('handles copy when clicked', () => {
     render(<CopyIcon content="this is some test content for the copy icon component" />)
-    const icon = screen.getByTestId('copy-icon')
-    fireEvent.click(icon as Element)
+    fireEvent.click(screen.getByRole('button', { name: 'appOverview.overview.appInfo.embedded.copy' }))
     expect(copy).toBeCalledTimes(1)
   })
 
   it('resets on mouse leave', () => {
     render(<CopyIcon content="this is some test content for the copy icon component" />)
-    const icon = screen.getByTestId('copy-icon')
-    const div = icon?.parentElement as HTMLElement
-    fireEvent.mouseLeave(div)
+    fireEvent.mouseLeave(screen.getByRole('button', { name: 'appOverview.overview.appInfo.embedded.copy' }))
     expect(reset).toBeCalledTimes(1)
   })
 })
diff --git a/web/app/components/base/copy-icon/index.tsx b/web/app/components/base/copy-icon/index.tsx
index b0b4635a39..2cc714dae5 100644
--- a/web/app/components/base/copy-icon/index.tsx
+++ b/web/app/components/base/copy-icon/index.tsx
@@ -1,8 +1,8 @@
 'use client'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useClipboard } from '@/hooks/use-clipboard'
-import Tooltip from '../tooltip'
 
 type Props = {
   content: string
@@ -25,14 +25,25 @@ const CopyIcon = ({ content }: Props) => {
   const safeTooltipText = tooltipText || ''
 
   return (
-    <Tooltip
-      popupContent={safeTooltipText}
-    >
-      <div onMouseLeave={reset}>
-        {!copied
-          ? (<span className="mx-1 i-custom-vender-line-files-copy h-3.5 w-3.5 cursor-pointer text-text-tertiary" onClick={handleCopy} data-testid="copy-icon" />)
-          : (<span className="mx-1 i-custom-vender-line-files-copy-check h-3.5 w-3.5 text-text-tertiary" data-testid="copied-icon" />)}
-      </div>
+    <Tooltip>
+      <TooltipTrigger
+        render={(
+          <button
+            type="button"
+            aria-label={safeTooltipText}
+            className="mx-1 inline-flex h-3.5 w-3.5 cursor-pointer border-0 bg-transparent p-0 text-text-tertiary"
+            onClick={handleCopy}
+            onMouseLeave={reset}
+          >
+            {!copied
+              ? (<span aria-hidden className="i-custom-vender-line-files-copy h-3.5 w-3.5" />)
+              : (<span aria-hidden className="i-custom-vender-line-files-copy-check h-3.5 w-3.5" />)}
+          </button>
+        )}
+      />
+      <TooltipContent>
+        {safeTooltipText}
+      </TooltipContent>
     </Tooltip>
   )
 }
diff --git a/web/app/components/base/date-and-time-picker/date-picker/__tests__/index.spec.tsx b/web/app/components/base/date-and-time-picker/date-picker/__tests__/index.spec.tsx
index d37647f358..6163d70151 100644
--- a/web/app/components/base/date-and-time-picker/date-picker/__tests__/index.spec.tsx
+++ b/web/app/components/base/date-and-time-picker/date-picker/__tests__/index.spec.tsx
@@ -513,10 +513,7 @@ describe('DatePicker', () => {
       // Open year/month picker
       fireEvent.click(screen.getByText(/2024/))
 
-      // The header in year/month view shows selected month/year with an up arrow
-      // Clicking it closes the year/month picker
-      const headerButtons = screen.getAllByRole('button')
-      fireEvent.click(headerButtons[0]!) // First button in year/month view is the header
+      fireEvent.click(screen.getByRole('button', { name: /time\.months\.June 2024/ }))
 
       // Should return to date view
       expect(screen.getAllByText(/daysInWeek/).length).toBeGreaterThan(0)
diff --git a/web/app/components/base/date-and-time-picker/date-picker/index.tsx b/web/app/components/base/date-and-time-picker/date-picker/index.tsx
index 7858fa2fbe..454ac1ad9c 100644
--- a/web/app/components/base/date-and-time-picker/date-picker/index.tsx
+++ b/web/app/components/base/date-and-time-picker/date-picker/index.tsx
@@ -31,7 +31,6 @@ const DatePicker = ({
   needTimePicker = true,
   renderTrigger,
   triggerWrapClassName,
-  popupZIndexClassname,
   noConfirm,
   getIsDateDisabled,
 }: DatePickerProps) => {
@@ -229,14 +228,20 @@ const DatePicker = ({
                   placeholder={placeholderDate}
                 />
                 <span className={cn('i-ri-calendar-line h-4 w-4 shrink-0 text-text-quaternary', isOpen ? 'text-text-secondary' : 'group-hover:text-text-secondary', (displayValue || (isOpen && selectedDate)) && 'group-hover:hidden')} />
-                <span className={cn('i-ri-close-circle-fill hidden h-4 w-4 shrink-0 text-text-quaternary', (displayValue || (isOpen && selectedDate)) && 'group-hover:inline-block hover:text-text-secondary')} onClick={handleClear} data-testid="date-picker-clear-button" />
+                <button
+                  type="button"
+                  aria-label={t('operation.clear', { ns: 'common' })}
+                  className={cn('hidden h-4 w-4 shrink-0 border-none bg-transparent p-0 text-text-quaternary hover:text-text-secondary focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden', (displayValue || (isOpen && selectedDate)) && 'group-hover:inline-block')}
+                  onClick={handleClear}
+                >
+                  <span className="i-ri-close-circle-fill h-4 w-4" aria-hidden="true" />
+                </button>
               </div>
             )}
       />
       <PopoverContent
         placement="bottom-end"
         sideOffset={0}
-        className={popupZIndexClassname}
         popupClassName="border-none bg-transparent shadow-none"
       >
         <div className="mt-1 w-[252px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-lg shadow-shadow-shadow-5">
diff --git a/web/app/components/base/date-and-time-picker/index.stories.tsx b/web/app/components/base/date-and-time-picker/index.stories.tsx
index 1ed35afe88..430688d0e8 100644
--- a/web/app/components/base/date-and-time-picker/index.stories.tsx
+++ b/web/app/components/base/date-and-time-picker/index.stories.tsx
@@ -35,7 +35,6 @@ const DatePickerPlayground = (props: DatePickerProps) => {
   return (
     <div className="inline-flex flex-col items-start gap-3">
       <DatePicker
-        popupZIndexClassname="z-50"
         {...props}
         value={value}
         onChange={setValue}
@@ -65,7 +64,6 @@ export const Playground: Story = {
 const [value, setValue] = useState(getDateWithTimezone({}))
 
 <DatePicker
-  popupZIndexClassname="z-50"
   value={value}
   timezone={dayjs.tz.guess()}
   onChange={setValue}
diff --git a/web/app/components/base/date-and-time-picker/time-picker/index.tsx b/web/app/components/base/date-and-time-picker/time-picker/index.tsx
index 34ec21f0a5..f0aa55a316 100644
--- a/web/app/components/base/date-and-time-picker/time-picker/index.tsx
+++ b/web/app/components/base/date-and-time-picker/time-picker/index.tsx
@@ -227,7 +227,14 @@ const TimePicker = ({
                   <TimezoneLabel timezone={timezone} inline className="shrink-0 text-xs select-none" />
                 )}
                 <span className={cn('i-ri-time-line h-4 w-4 shrink-0 text-text-quaternary', isOpen ? 'text-text-secondary' : 'group-hover:text-text-secondary', (displayValue || (isOpen && selectedTime)) && !notClearable && 'group-hover:hidden')} />
-                <span className={cn('i-ri-close-circle-fill hidden h-4 w-4 shrink-0 text-text-quaternary', (displayValue || (isOpen && selectedTime)) && !notClearable && 'group-hover:inline-block hover:text-text-secondary')} role="button" aria-label={t('operation.clear', { ns: 'common' })} onClick={handleClear} />
+                <button
+                  type="button"
+                  className={cn('hidden h-4 w-4 shrink-0 border-none bg-transparent p-0 text-text-quaternary hover:text-text-secondary focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden', (displayValue || (isOpen && selectedTime)) && !notClearable && 'group-hover:inline-block')}
+                  aria-label={t('operation.clear', { ns: 'common' })}
+                  onClick={handleClear}
+                >
+                  <span className="i-ri-close-circle-fill h-4 w-4" aria-hidden="true" />
+                </button>
               </div>
             )}
       />
diff --git a/web/app/components/base/date-and-time-picker/types.ts b/web/app/components/base/date-and-time-picker/types.ts
index 7dda1d013c..8d27f03ad1 100644
--- a/web/app/components/base/date-and-time-picker/types.ts
+++ b/web/app/components/base/date-and-time-picker/types.ts
@@ -30,7 +30,6 @@ export type DatePickerProps = {
   triggerWrapClassName?: string
   renderTrigger?: (props: TriggerProps) => React.ReactElement
   minuteFilter?: (minutes: string[]) => string[]
-  popupZIndexClassname?: string
   noConfirm?: boolean
   getIsDateDisabled?: (date: Dayjs) => boolean
 }
diff --git a/web/app/components/base/dialog/__tests__/index.spec.tsx b/web/app/components/base/dialog/__tests__/index.spec.tsx
deleted file mode 100644
index 241e89be26..0000000000
--- a/web/app/components/base/dialog/__tests__/index.spec.tsx
+++ /dev/null
@@ -1,138 +0,0 @@
-import { act, render, screen } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
-import { describe, expect, it, vi } from 'vitest'
-import CustomDialog from '../index'
-
-describe('CustomDialog Component', () => {
-  const setup = () => userEvent.setup()
-
-  it('should render children and title when show is true', async () => {
-    render(
-      <CustomDialog show={true} title="Modal Title">
-        <div data-testid="dialog-content">Main Content</div>
-      </CustomDialog>,
-    )
-
-    const title = await screen.findByText('Modal Title')
-    const content = screen.getByTestId('dialog-content')
-
-    expect(title).toBeInTheDocument()
-    expect(content).toBeInTheDocument()
-    expect(screen.getByRole('dialog')).toBeInTheDocument()
-  })
-
-  it('should not render anything when show is false', async () => {
-    render(
-      <CustomDialog show={false} title="Hidden Title">
-        <div>Content</div>
-      </CustomDialog>,
-    )
-
-    expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
-    expect(screen.queryByText('Hidden Title')).not.toBeInTheDocument()
-  })
-
-  it('should apply the correct semantic tag to title using titleAs', async () => {
-    render(
-      <CustomDialog show={true} title="Semantic Title" titleAs="h1">
-        Content
-      </CustomDialog>,
-    )
-
-    const title = await screen.findByRole('heading', { level: 1 })
-    expect(title).toHaveTextContent('Semantic Title')
-  })
-
-  it('should render the footer only when the prop is provided', async () => {
-    const { rerender } = render(
-      <CustomDialog show={true}>Content</CustomDialog>,
-    )
-
-    await screen.findByRole('dialog')
-    expect(screen.queryByText('Footer Content')).not.toBeInTheDocument()
-
-    rerender(
-      <CustomDialog show={true} footer={<div data-testid="footer-node">Footer Content</div>}>
-        Content
-      </CustomDialog>,
-    )
-
-    expect(await screen.findByTestId('footer-node')).toBeInTheDocument()
-  })
-
-  it('should call onClose when Escape key is pressed', async () => {
-    const user = setup()
-    const onCloseMock = vi.fn()
-
-    render(
-      <CustomDialog show={true} onClose={onCloseMock}>
-        Content
-      </CustomDialog>,
-    )
-
-    await screen.findByRole('dialog')
-
-    await act(async () => {
-      await user.keyboard('{Escape}')
-    })
-
-    expect(onCloseMock).toHaveBeenCalledTimes(1)
-  })
-
-  it('should call onClose when the backdrop is clicked', async () => {
-    const user = setup()
-    const onCloseMock = vi.fn()
-
-    render(
-      <CustomDialog show={true} onClose={onCloseMock}>
-        Content
-      </CustomDialog>,
-    )
-
-    await screen.findByRole('dialog')
-
-    const backdrop = document.querySelector('.bg-background-overlay-backdrop')
-    expect(backdrop).toBeInTheDocument()
-
-    await act(async () => {
-      await user.click(backdrop!)
-    })
-
-    expect(onCloseMock).toHaveBeenCalledTimes(1)
-  })
-
-  it('should apply custom class names to internal elements', async () => {
-    render(
-      <CustomDialog
-        show={true}
-        title="Title"
-        className="custom-panel-container"
-        titleClassName="custom-title-style"
-        bodyClassName="custom-body-style"
-        footer="Footer"
-        footerClassName="custom-footer-style"
-      >
-        <div data-testid="content">Content</div>
-      </CustomDialog>,
-    )
-
-    await screen.findByRole('dialog')
-
-    expect(document.querySelector('.custom-panel-container')).toBeInTheDocument()
-    expect(document.querySelector('.custom-title-style')).toBeInTheDocument()
-    expect(document.querySelector('.custom-body-style')).toBeInTheDocument()
-    expect(document.querySelector('.custom-footer-style')).toBeInTheDocument()
-  })
-
-  it('should maintain accessibility attributes (aria-modal)', async () => {
-    render(
-      <CustomDialog show={true} title="Accessibility Test">
-        <button>Focusable Item</button>
-      </CustomDialog>,
-    )
-
-    const dialog = await screen.findByRole('dialog')
-    // Headless UI should automatically set aria-modal="true"
-    expect(dialog).toHaveAttribute('aria-modal', 'true')
-  })
-})
diff --git a/web/app/components/base/dialog/index.stories.tsx b/web/app/components/base/dialog/index.stories.tsx
deleted file mode 100644
index 2c9863da3b..0000000000
--- a/web/app/components/base/dialog/index.stories.tsx
+++ /dev/null
@@ -1,152 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/nextjs-vite'
-import { useEffect, useState } from 'react'
-import Dialog from '.'
-
-const meta = {
-  title: 'Base/Feedback/Dialog',
-  component: Dialog,
-  parameters: {
-    layout: 'fullscreen',
-    docs: {
-      description: {
-        component: 'Modal dialog built on Headless UI. Provides animated overlay, title slot, and optional footer region.',
-      },
-    },
-  },
-  tags: ['autodocs'],
-  argTypes: {
-    className: {
-      control: 'text',
-      description: 'Additional classes applied to the panel.',
-    },
-    titleClassName: {
-      control: 'text',
-      description: 'Extra classes for the title element.',
-    },
-    bodyClassName: {
-      control: 'text',
-      description: 'Extra classes for the content area.',
-    },
-    footerClassName: {
-      control: 'text',
-      description: 'Extra classes for the footer container.',
-    },
-    title: {
-      control: 'text',
-      description: 'Dialog title.',
-    },
-    show: {
-      control: 'boolean',
-      description: 'Controls visibility of the dialog.',
-    },
-    onClose: {
-      control: false,
-      description: 'Called when the dialog backdrop or close handler fires.',
-    },
-  },
-  args: {
-    title: 'Manage API Keys',
-    show: false,
-    children: null,
-  },
-} satisfies Meta<typeof Dialog>
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-const DialogDemo = (props: React.ComponentProps<typeof Dialog>) => {
-  const [open, setOpen] = useState(props.show)
-  useEffect(() => {
-    setOpen(props.show)
-  }, [props.show])
-
-  return (
-    <div className="relative flex h-[480px] items-center justify-center bg-gray-100">
-      <button
-        className="rounded-md bg-primary-600 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-primary-700"
-        onClick={() => setOpen(true)}
-      >
-        Show dialog
-      </button>
-
-      <Dialog
-        {...props}
-        show={open}
-        onClose={() => {
-          props.onClose?.()
-          setOpen(false)
-        }}
-      >
-        <div className="space-y-4 text-sm text-gray-600">
-          <p>
-            Centralize API key management for collaborators. You can revoke, rotate, or generate new keys directly from this dialog.
-          </p>
-          <div className="rounded-lg border border-dashed border-gray-200 bg-gray-50 p-4 text-xs text-gray-500">
-            This placeholder area represents a form or table that would live inside the dialog body.
-          </div>
-        </div>
-      </Dialog>
-    </div>
-  )
-}
-
-export const Default: Story = {
-  render: args => <DialogDemo {...args} />,
-  args: {
-    footer: (
-      <>
-        <button className="rounded-md border border-gray-300 px-3 py-1.5 text-sm text-gray-600 hover:bg-gray-50">
-          Cancel
-        </button>
-        <button className="rounded-md bg-primary-600 px-3 py-1.5 text-sm text-white hover:bg-primary-700">
-          Save changes
-        </button>
-      </>
-    ),
-  },
-}
-
-export const WithoutFooter: Story = {
-  render: args => <DialogDemo {...args} />,
-  args: {
-    footer: undefined,
-    title: 'Read-only summary',
-  },
-  parameters: {
-    docs: {
-      description: {
-        story: 'Demonstrates the dialog when no footer actions are provided.',
-      },
-    },
-  },
-}
-
-export const CustomStyling: Story = {
-  render: args => <DialogDemo {...args} />,
-  args: {
-    className: 'max-w-[560px] bg-white/95 backdrop-blur-sm',
-    bodyClassName: 'bg-gray-50 rounded-xl p-5',
-    footerClassName: 'justify-between px-4 pb-4 pt-4',
-    titleClassName: 'text-lg text-primary-600',
-    footer: (
-      <>
-        <span className="text-xs text-gray-400">Last synced 2 minutes ago</span>
-        <div className="flex gap-2">
-          <button className="rounded-md border border-gray-300 px-3 py-1.5 text-sm text-gray-600 hover:bg-gray-50">
-            Close
-          </button>
-          <button className="rounded-md bg-primary-600 px-3 py-1.5 text-sm text-white hover:bg-primary-700">
-            Refresh data
-          </button>
-        </div>
-      </>
-    ),
-  },
-  parameters: {
-    docs: {
-      description: {
-        story: 'Applies custom classes to the panel, body, title, and footer to match different surfaces.',
-      },
-    },
-  },
-}
diff --git a/web/app/components/base/dialog/index.tsx b/web/app/components/base/dialog/index.tsx
deleted file mode 100644
index 84d0c9b999..0000000000
--- a/web/app/components/base/dialog/index.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import type { ElementType, ReactNode } from 'react'
-import { Dialog, DialogPanel, DialogTitle, Transition, TransitionChild } from '@headlessui/react'
-import { cn } from '@langgenius/dify-ui/cn'
-import { Fragment, useCallback } from 'react'
-
-// https://headlessui.com/react/dialog
-
-type DialogProps = {
-  className?: string
-  titleClassName?: string
-  bodyClassName?: string
-  footerClassName?: string
-  titleAs?: ElementType
-  title?: ReactNode
-  children: ReactNode
-  footer?: ReactNode
-  show: boolean
-  onClose?: () => void
-}
-
-const CustomDialog = ({
-  className,
-  titleClassName,
-  bodyClassName,
-  footerClassName,
-  titleAs,
-  title,
-  children,
-  footer,
-  show,
-  onClose,
-}: DialogProps) => {
-  const close = useCallback(() => onClose?.(), [onClose])
-  return (
-    <Transition appear show={show} as={Fragment}>
-      <Dialog as="div" className="relative z-40" onClose={close}>
-        <TransitionChild>
-          <div className={cn('fixed inset-0 bg-background-overlay-backdrop backdrop-blur-[6px]', 'duration-300 ease-in data-closed:opacity-0', 'data-enter:opacity-100', 'data-leave:opacity-0')} />
-        </TransitionChild>
-
-        <div className="fixed inset-0 overflow-y-auto">
-          <div className="flex min-h-full items-center justify-center">
-            <TransitionChild>
-              <DialogPanel className={cn('w-full max-w-[800px] overflow-hidden rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg p-6 shadow-xl transition-all', 'duration-100 ease-in data-closed:scale-95 data-closed:opacity-0', 'data-enter:scale-100 data-enter:opacity-100', 'data-enter:scale-95 data-leave:opacity-0', className)}>
-                {Boolean(title) && (
-                  <DialogTitle
-                    as={titleAs || 'h3'}
-                    className={cn('pr-8 pb-3 title-2xl-semi-bold text-text-primary', titleClassName)}
-                  >
-                    {title}
-                  </DialogTitle>
-                )}
-                <div className={cn(bodyClassName)}>
-                  {children}
-                </div>
-                {Boolean(footer) && (
-                  <div className={cn('flex items-center justify-end gap-2 px-6 pt-3 pb-6', footerClassName)}>
-                    {footer}
-                  </div>
-                )}
-              </DialogPanel>
-            </TransitionChild>
-          </div>
-        </div>
-      </Dialog>
-    </Transition>
-  )
-}
-
-export default CustomDialog
diff --git a/web/app/components/base/drawer-plus/__tests__/index.spec.tsx b/web/app/components/base/drawer-plus/__tests__/index.spec.tsx
deleted file mode 100644
index 2d3667dd8f..0000000000
--- a/web/app/components/base/drawer-plus/__tests__/index.spec.tsx
+++ /dev/null
@@ -1,447 +0,0 @@
-import { fireEvent, render, screen } from '@testing-library/react'
-import * as React from 'react'
-import DrawerPlus from '..'
-
-vi.mock('@/hooks/use-breakpoints', () => ({
-  default: () => 'desktop',
-  MediaType: { mobile: 'mobile', desktop: 'desktop', tablet: 'tablet' },
-}))
-
-describe('DrawerPlus', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  describe('Rendering', () => {
-    it('should not render when isShow is false', () => {
-      render(
-        <DrawerPlus
-          isShow={false}
-          onHide={() => {}}
-          title="Test Drawer"
-          body={<div>Content</div>}
-        />,
-      )
-
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
-    })
-
-    it('should render when isShow is true', () => {
-      const bodyContent = <div>Body Content</div>
-      render(
-        <DrawerPlus
-          isShow={true}
-          onHide={() => {}}
-          title="Test Drawer"
-          body={bodyContent}
-        />,
-      )
-
-      expect(screen.getByRole('dialog')).toBeInTheDocument()
-      expect(screen.getByText('Test Drawer')).toBeInTheDocument()
-      expect(screen.getByText('Body Content')).toBeInTheDocument()
-    })
-
-    it('should render footer when provided', () => {
-      const footerContent = <div>Footer Content</div>
-      render(
-        <DrawerPlus
-          isShow={true}
-          onHide={() => {}}
-          title="Test Drawer"
-          body={<div>Body</div>}
-          foot={footerContent}
-        />,
-      )
-
-      expect(screen.getByText('Footer Content')).toBeInTheDocument()
-    })
-
-    it('should render JSX element as title', () => {
-      const titleElement = <h1 data-testid="custom-title">Custom Title</h1>
-      render(
-        <DrawerPlus
-          isShow={true}
-          onHide={() => {}}
-          title={titleElement}
-          body={<div>Body</div>}
-        />,
-      )
-
-      expect(screen.getByTestId('custom-title')).toBeInTheDocument()
-    })
-
-    it('should render titleDescription when provided', () => {
-      render(
-        <DrawerPlus
-          isShow={true}
-          onHide={() => {}}
-          title="Test Drawer"
-          titleDescription="Description text"
-          body={<div>Body</div>}
-        />,
-      )
-
-      expect(screen.getByText('Description text')).toBeInTheDocument()
-    })
-
-    it('should not render titleDescription when not provided', () => {
-      render(
-        <DrawerPlus
-          isShow={true}
-          onHide={() => {}}
-          title="Test Drawer"
-          body={<div>Body</div>}
-        />,
-      )
-
-      expect(screen.queryByText(/Description/)).not.toBeInTheDocument()
-    })
-
-    it('should render JSX element as titleDescription', () => {
-      const descElement = <span data-testid="custom-desc">Custom Description</span>
-      render(
-        <DrawerPlus
-          isShow={true}
-          onHide={() => {}}
-          title="Test"
-          titleDescription={descElement}
-          body={<div>Body</div>}
-        />,
-      )
-
-      expect(screen.getByTestId('custom-desc')).toBeInTheDocument()
-    })
-  })
-
-  describe('Props - Display Options', () => {
-    it('should apply default maxWidthClassName', () => {
-      render(
-        <DrawerPlus
-          isShow={true}
-          onHide={() => {}}
-          title="Test"
-          body={<div>Body</div>}
-        />,
-      )
-      const innerPanel = screen.getByText('Test').closest('.bg-components-panel-bg')
-      const outerPanel = innerPanel?.parentElement
-      expect(outerPanel?.className).toContain('max-w-[640px]!')
-    })
-
-    it('should apply custom maxWidthClassName', () => {
-      render(
-        <DrawerPlus
-          isShow={true}
-          onHide={() => {}}
-          title="Test"
-          body={<div>Body</div>}
-          maxWidthClassName="max-w-[800px]!"
-        />,
-      )
-
-      const innerPanel = screen.getByText('Test').closest('.bg-components-panel-bg')
-      const outerPanel = innerPanel?.parentElement
-      expect(outerPanel?.className).toContain('max-w-[800px]!')
-    })
-
-    it('should apply custom panelClassName', () => {
-      render(
-        <DrawerPlus
-          isShow={true}
-          onHide={() => {}}
-          title="Test"
-          body={<div>Body</div>}
-          panelClassName="custom-panel"
-        />,
-      )
-
-      const innerPanel = screen.getByText('Test').closest('.bg-components-panel-bg')
-      const outerPanel = innerPanel?.parentElement
-      expect(outerPanel?.className).toContain('custom-panel')
-    })
-
-    it('should apply custom dialogClassName', () => {
-      render(
-        <DrawerPlus
-          isShow={true}
-          onHide={() => {}}
-          title="Test"
-          body={<div>Body</div>}
-          dialogClassName="custom-dialog"
-        />,
-      )
-
-      const dialog = screen.getByRole('dialog')
-      expect(dialog.className).toContain('custom-dialog')
-    })
-
-    it('should apply custom contentClassName', () => {
-      render(
-        <DrawerPlus
-          isShow={true}
-          onHide={() => {}}
-          title="Test"
-          body={<div>Body</div>}
-          contentClassName="custom-content"
-        />,
-      )
-      const title = screen.getByText('Test')
-      const header = title.closest('.shrink-0.border-b.border-divider-subtle')
-      const content = header?.parentElement
-      expect(content?.className).toContain('custom-content')
-    })
-
-    it('should apply custom headerClassName', () => {
-      render(
-        <DrawerPlus
-          isShow={true}
-          onHide={() => {}}
-          title="Test"
-          body={<div>Body</div>}
-          headerClassName="custom-header"
-        />,
-      )
-
-      const title = screen.getByText('Test')
-      const header = title.closest('.shrink-0.border-b.border-divider-subtle')
-      expect(header?.className).toContain('custom-header')
-    })
-
-    it('should apply custom height', () => {
-      render(
-        <DrawerPlus
-          isShow={true}
-          onHide={() => {}}
-          title="Test"
-          body={<div>Body</div>}
-          height="500px"
-        />,
-      )
-
-      const title = screen.getByText('Test')
-      const header = title.closest('.shrink-0.border-b.border-divider-subtle')
-      const content = header?.parentElement
-      expect(content?.getAttribute('style')).toContain('height: 500px')
-    })
-
-    it('should use default height', () => {
-      render(
-        <DrawerPlus
-          isShow={true}
-          onHide={() => {}}
-          title="Test"
-          body={<div>Body</div>}
-        />,
-      )
-
-      const title = screen.getByText('Test')
-      const header = title.closest('.shrink-0.border-b.border-divider-subtle')
-      const content = header?.parentElement
-      expect(content?.getAttribute('style')).toContain('calc(100vh - 72px)')
-    })
-  })
-
-  describe('Event Handlers', () => {
-    it('should call onHide when close button is clicked', () => {
-      const handleHide = vi.fn()
-      render(
-        <DrawerPlus
-          isShow={true}
-          onHide={handleHide}
-          title="Test"
-          body={<div>Body</div>}
-        />,
-      )
-
-      const title = screen.getByText('Test')
-      const headerRight = title.nextElementSibling // .flex items-center
-      const closeDiv = headerRight?.querySelector('.cursor-pointer') as HTMLElement
-
-      fireEvent.click(closeDiv)
-      expect(handleHide).toHaveBeenCalledTimes(1)
-    })
-  })
-
-  describe('Complex Content', () => {
-    it('should render complex JSX elements in body', () => {
-      const complexBody = (
-        <div>
-          <h2>Header</h2>
-          <p>Paragraph</p>
-          <button>Action Button</button>
-        </div>
-      )
-
-      render(
-        <DrawerPlus
-          isShow={true}
-          onHide={() => {}}
-          title="Test"
-          body={complexBody}
-        />,
-      )
-
-      expect(screen.getByText('Header')).toBeInTheDocument()
-      expect(screen.getByText('Paragraph')).toBeInTheDocument()
-      expect(screen.getByRole('button', { name: 'Action Button' })).toBeInTheDocument()
-    })
-
-    it('should render complex footer', () => {
-      const complexFooter = (
-        <div className="footer-actions">
-          <button>Cancel</button>
-          <button>Save</button>
-        </div>
-      )
-
-      render(
-        <DrawerPlus
-          isShow={true}
-          onHide={() => {}}
-          title="Test"
-          body={<div>Body</div>}
-          foot={complexFooter}
-        />,
-      )
-
-      expect(screen.getByRole('button', { name: 'Cancel' })).toBeInTheDocument()
-      expect(screen.getByRole('button', { name: 'Save' })).toBeInTheDocument()
-    })
-  })
-
-  describe('Edge Cases', () => {
-    it('should handle empty title', () => {
-      render(
-        <DrawerPlus
-          isShow={true}
-          onHide={() => {}}
-          title=""
-          body={<div>Body</div>}
-        />,
-      )
-
-      expect(screen.getByRole('dialog')).toBeInTheDocument()
-    })
-
-    it('should handle undefined titleDescription', () => {
-      render(
-        <DrawerPlus
-          isShow={true}
-          onHide={() => {}}
-          title="Test"
-          titleDescription={undefined}
-          body={<div>Body</div>}
-        />,
-      )
-
-      expect(screen.getByRole('dialog')).toBeInTheDocument()
-    })
-
-    it('should handle rapid isShow toggle', () => {
-      const { rerender } = render(
-        <DrawerPlus
-          isShow={true}
-          onHide={() => {}}
-          title="Test"
-          body={<div>Body</div>}
-        />,
-      )
-
-      expect(screen.getByRole('dialog')).toBeInTheDocument()
-
-      rerender(
-        <DrawerPlus
-          isShow={false}
-          onHide={() => {}}
-          title="Test"
-          body={<div>Body</div>}
-        />,
-      )
-
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
-
-      rerender(
-        <DrawerPlus
-          isShow={true}
-          onHide={() => {}}
-          title="Test"
-          body={<div>Body</div>}
-        />,
-      )
-
-      expect(screen.getByRole('dialog')).toBeInTheDocument()
-    })
-
-    it('should handle special characters in title', () => {
-      const specialTitle = 'Test <> & " \' | Drawer'
-      render(
-        <DrawerPlus
-          isShow={true}
-          onHide={() => {}}
-          title={specialTitle}
-          body={<div>Body</div>}
-        />,
-      )
-
-      expect(screen.getByText(specialTitle)).toBeInTheDocument()
-    })
-
-    it('should handle empty body content', () => {
-      render(
-        <DrawerPlus
-          isShow={true}
-          onHide={() => {}}
-          title="Test"
-          body={<div></div>}
-        />,
-      )
-
-      expect(screen.getByRole('dialog')).toBeInTheDocument()
-    })
-
-    it('should apply both custom maxWidth and panel classNames', () => {
-      render(
-        <DrawerPlus
-          isShow={true}
-          onHide={() => {}}
-          title="Test"
-          body={<div>Body</div>}
-          maxWidthClassName="max-w-[500px]!"
-          panelClassName="custom-style"
-        />,
-      )
-
-      const innerPanel = screen.getByText('Test').closest('.bg-components-panel-bg')
-      const outerPanel = innerPanel?.parentElement
-      expect(outerPanel?.className).toContain('max-w-[500px]!')
-      expect(outerPanel?.className).toContain('custom-style')
-    })
-  })
-
-  describe('Memoization', () => {
-    it('should be memoized and not re-render on parent changes', () => {
-      const { rerender } = render(
-        <DrawerPlus
-          isShow={true}
-          onHide={() => {}}
-          title="Test"
-          body={<div>Body</div>}
-        />,
-      )
-
-      const dialog = screen.getByRole('dialog')
-
-      rerender(
-        <DrawerPlus
-          isShow={true}
-          onHide={() => {}}
-          title="Test"
-          body={<div>Body</div>}
-        />,
-      )
-
-      expect(dialog).toBeInTheDocument()
-    })
-  })
-})
diff --git a/web/app/components/base/drawer-plus/index.stories.tsx b/web/app/components/base/drawer-plus/index.stories.tsx
deleted file mode 100644
index 4bdfef2ab3..0000000000
--- a/web/app/components/base/drawer-plus/index.stories.tsx
+++ /dev/null
@@ -1,124 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/nextjs-vite'
-import { useState } from 'react'
-import { fn } from 'storybook/test'
-import DrawerPlus from '.'
-
-const meta = {
-  title: 'Base/Feedback/DrawerPlus',
-  component: DrawerPlus,
-  parameters: {
-    layout: 'fullscreen',
-    docs: {
-      description: {
-        component: 'Enhanced drawer built atop the base drawer component. Provides header/foot slots, mask control, and mobile breakpoints.',
-      },
-    },
-  },
-  tags: ['autodocs'],
-} satisfies Meta<typeof DrawerPlus>
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-type DrawerPlusProps = React.ComponentProps<typeof DrawerPlus>
-
-const storyBodyElement: React.JSX.Element = (
-  <div className="space-y-3 p-6 text-sm text-text-secondary">
-    <p>
-      DrawerPlus allows rich content with sticky header/footer and responsive masking on mobile. Great for editing flows or showing execution logs.
-    </p>
-    <div className="rounded-lg border border-divider-subtle bg-components-panel-bg p-3 text-xs">
-      Body content scrolls if it exceeds the allotted height.
-    </div>
-  </div>
-)
-
-const DrawerPlusDemo = (props: Partial<DrawerPlusProps>) => {
-  const [open, setOpen] = useState(false)
-
-  const {
-    body,
-    title,
-    foot,
-    isShow: _isShow,
-    onHide: _onHide,
-    ...rest
-  } = props
-
-  const resolvedBody: React.JSX.Element = body ?? storyBodyElement
-
-  return (
-    <div className="flex h-[400px] items-center justify-center bg-background-default-subtle">
-      <button
-        type="button"
-        className="rounded-md bg-primary-600 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-primary-700"
-        onClick={() => setOpen(true)}
-      >
-        Open drawer plus
-      </button>
-
-      <DrawerPlus
-        {...rest as Omit<DrawerPlusProps, 'isShow' | 'onHide' | 'title' | 'body' | 'foot'>}
-        isShow={open}
-        onHide={() => setOpen(false)}
-        title={title ?? 'Workflow execution details'}
-        body={resolvedBody}
-        foot={foot}
-      />
-    </div>
-  )
-}
-
-export const Playground: Story = {
-  render: args => <DrawerPlusDemo {...args} />,
-  args: {
-    isShow: false,
-    onHide: fn(),
-    title: 'Edit configuration',
-    body: storyBodyElement,
-  },
-}
-
-export const WithFooter: Story = {
-  render: (args) => {
-    const FooterDemo = () => {
-      const [open, setOpen] = useState(false)
-      return (
-        <div className="flex h-[400px] items-center justify-center bg-background-default-subtle">
-          <button
-            type="button"
-            className="rounded-md bg-primary-600 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-primary-700"
-            onClick={() => setOpen(true)}
-          >
-            Open drawer plus
-          </button>
-
-          <DrawerPlus
-            {...args}
-            isShow={open}
-            onHide={() => setOpen(false)}
-            title={args.title ?? 'Workflow execution details'}
-            body={args.body ?? (
-              <div className="space-y-3 p-6 text-sm text-text-secondary">
-                <p>Populate the body with scrollable content. Footer stays pinned.</p>
-              </div>
-            )}
-            foot={(
-              <div className="flex justify-end gap-2 border-t border-divider-subtle bg-components-panel-bg p-4">
-                <button className="rounded-md border border-divider-subtle px-3 py-1.5 text-sm text-text-secondary" onClick={() => setOpen(false)}>Cancel</button>
-                <button className="rounded-md bg-primary-600 px-3 py-1.5 text-sm text-white">Save</button>
-              </div>
-            )}
-          />
-        </div>
-      )
-    }
-    return <FooterDemo />
-  },
-  args: {
-    isShow: false,
-    onHide: fn(),
-    title: 'Edit configuration!',
-    body: storyBodyElement,
-  },
-}
diff --git a/web/app/components/base/drawer-plus/index.tsx b/web/app/components/base/drawer-plus/index.tsx
deleted file mode 100644
index 261022669b..0000000000
--- a/web/app/components/base/drawer-plus/index.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-'use client'
-import type { FC } from 'react'
-import { cn } from '@langgenius/dify-ui/cn'
-import { RiCloseLine } from '@remixicon/react'
-import * as React from 'react'
-import { useRef } from 'react'
-import Drawer from '@/app/components/base/drawer'
-import useBreakpoints, { MediaType } from '@/hooks/use-breakpoints'
-
-type Props = {
-  isShow: boolean
-  onHide: () => void
-  dialogClassName?: string
-  dialogBackdropClassName?: string
-  panelClassName?: string
-  maxWidthClassName?: string
-  contentClassName?: string
-  headerClassName?: string
-  height?: number | string
-  title: string | React.JSX.Element
-  titleDescription?: string | React.JSX.Element
-  body: React.JSX.Element
-  foot?: React.JSX.Element
-  isShowMask?: boolean
-  clickOutsideNotOpen?: boolean
-  positionCenter?: boolean
-}
-
-const DrawerPlus: FC<Props> = ({
-  isShow,
-  onHide,
-  dialogClassName = '',
-  dialogBackdropClassName = '',
-  panelClassName = '',
-  maxWidthClassName = 'max-w-[640px]!',
-  height = 'calc(100vh - 72px)',
-  contentClassName,
-  headerClassName,
-  title,
-  titleDescription,
-  body,
-  foot,
-  isShowMask,
-  clickOutsideNotOpen = true,
-  positionCenter,
-}) => {
-  const ref = useRef(null)
-  const media = useBreakpoints()
-  const isMobile = media === MediaType.mobile
-
-  if (!isShow)
-    return null
-
-  return (
-    // clickOutsideNotOpen to fix confirm modal click cause drawer close
-    <Drawer
-      isOpen={isShow}
-      clickOutsideNotOpen={clickOutsideNotOpen}
-      onClose={onHide}
-      footer={null}
-      mask={isMobile || isShowMask}
-      positionCenter={positionCenter}
-      dialogClassName={dialogClassName}
-      dialogBackdropClassName={dialogBackdropClassName}
-      panelClassName={cn('mx-2 mt-16 mb-3 rounded-xl p-0! sm:mr-2', panelClassName, maxWidthClassName)}
-    >
-      <div
-        className={cn(contentClassName, 'flex w-full flex-col rounded-xl border-[0.5px] border-divider-subtle bg-components-panel-bg shadow-xl')}
-        style={{
-          height,
-        }}
-        ref={ref}
-      >
-        <div className={cn(headerClassName, 'shrink-0 border-b border-divider-subtle py-4')}>
-          <div className="flex h-6 items-center justify-between pr-5 pl-6">
-            <div className="system-xl-semibold text-text-primary">
-              {title}
-            </div>
-            <div className="flex items-center">
-              <div
-                onClick={onHide}
-                className="flex h-6 w-6 cursor-pointer items-center justify-center"
-              >
-                <RiCloseLine className="h-4 w-4 text-text-tertiary" />
-              </div>
-            </div>
-          </div>
-          {titleDescription && (
-            <div className="pr-10 pl-6 system-xs-regular text-text-tertiary">
-              {titleDescription}
-            </div>
-          )}
-        </div>
-        <div className="grow overflow-y-auto">
-          {body}
-        </div>
-        {foot && (
-          <div className="shrink-0">
-            {foot}
-          </div>
-        )}
-      </div>
-    </Drawer>
-  )
-}
-export default React.memo(DrawerPlus)
diff --git a/web/app/components/base/drawer/__tests__/index.spec.tsx b/web/app/components/base/drawer/__tests__/index.spec.tsx
deleted file mode 100644
index cd7eb937cc..0000000000
--- a/web/app/components/base/drawer/__tests__/index.spec.tsx
+++ /dev/null
@@ -1,668 +0,0 @@
-import type { IDrawerProps } from '../index'
-import { fireEvent, render, screen } from '@testing-library/react'
-import * as React from 'react'
-import Drawer from '../index'
-
-// Capture dialog onClose for testing
-let capturedDialogOnClose: (() => void) | null = null
-
-// Mock @headlessui/react
-vi.mock('@headlessui/react', () => ({
-  Dialog: ({ children, open, onClose, className, unmount }: {
-    children: React.ReactNode
-    open: boolean
-    onClose: () => void
-    className: string
-    unmount: boolean
-  }) => {
-    capturedDialogOnClose = onClose
-    if (!open)
-      return null
-    return (
-      <div
-        data-testid="dialog"
-        data-open={open}
-        data-unmount={unmount}
-        className={className}
-        role="dialog"
-      >
-        {children}
-      </div>
-    )
-  },
-  DialogBackdrop: ({ children, className, onClick }: {
-    children?: React.ReactNode
-    className: string
-    onClick: () => void
-  }) => (
-    <div
-      data-testid="dialog-backdrop"
-      className={className}
-      onClick={onClick}
-    >
-      {children}
-    </div>
-  ),
-  DialogTitle: ({ children, as: _as, className, ...props }: {
-    children: React.ReactNode
-    as?: string
-    className?: string
-  }) => (
-    <div data-testid="dialog-title" className={className} {...props}>
-      {children}
-    </div>
-  ),
-}))
-
-// Mock XMarkIcon
-vi.mock('@heroicons/react/24/outline', () => ({
-  XMarkIcon: ({ className, onClick }: { className: string, onClick?: () => void }) => (
-    <svg data-testid="close-icon" className={className} onClick={onClick} />
-  ),
-}))
-
-// Helper function to render Drawer with default props
-const defaultProps: IDrawerProps = {
-  isOpen: true,
-  onClose: vi.fn(),
-  children: <div data-testid="drawer-content">Content</div>,
-}
-
-const renderDrawer = (props: Partial<IDrawerProps> = {}) => {
-  const mergedProps = { ...defaultProps, ...props }
-  return render(<Drawer {...mergedProps} />)
-}
-
-describe('Drawer', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    capturedDialogOnClose = null
-  })
-
-  // Basic rendering tests
-  describe('Rendering', () => {
-    it('should render when isOpen is true', () => {
-      // Arrange & Act
-      renderDrawer({ isOpen: true })
-
-      // Assert
-      expect(screen.getByRole('dialog')).toBeInTheDocument()
-      expect(screen.getByTestId('drawer-content')).toBeInTheDocument()
-    })
-
-    it('should not render when isOpen is false', () => {
-      // Arrange & Act
-      renderDrawer({ isOpen: false })
-
-      // Assert
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
-    })
-
-    it('should render children content', () => {
-      // Arrange
-      const childContent = <p data-testid="custom-child">Custom Content</p>
-
-      // Act
-      renderDrawer({ children: childContent })
-
-      // Assert
-      expect(screen.getByTestId('custom-child')).toBeInTheDocument()
-      expect(screen.getByText('Custom Content')).toBeInTheDocument()
-    })
-  })
-
-  // Title and description tests
-  describe('Title and Description', () => {
-    it('should render title when provided', () => {
-      // Arrange & Act
-      renderDrawer({ title: 'Test Title' })
-
-      // Assert
-      expect(screen.getByText('Test Title')).toBeInTheDocument()
-    })
-
-    it('should not render title when not provided', () => {
-      // Arrange & Act
-      renderDrawer({ title: '' })
-
-      // Assert
-      const titles = screen.queryAllByTestId('dialog-title')
-      const titleWithText = titles.find(el => el.textContent !== '')
-      expect(titleWithText).toBeUndefined()
-    })
-
-    it('should render description when provided', () => {
-      // Arrange & Act
-      renderDrawer({ description: 'Test Description' })
-
-      // Assert
-      expect(screen.getByText('Test Description')).toBeInTheDocument()
-    })
-
-    it('should not render description when not provided', () => {
-      // Arrange & Act
-      renderDrawer({ description: '' })
-
-      // Assert
-      expect(screen.queryByText('Test Description')).not.toBeInTheDocument()
-    })
-
-    it('should render both title and description together', () => {
-      // Arrange & Act
-      renderDrawer({
-        title: 'My Title',
-        description: 'My Description',
-      })
-
-      // Assert
-      expect(screen.getByText('My Title')).toBeInTheDocument()
-      expect(screen.getByText('My Description')).toBeInTheDocument()
-    })
-  })
-
-  // Close button tests
-  describe('Close Button', () => {
-    it('should render close icon when showClose is true', () => {
-      // Arrange & Act
-      renderDrawer({ showClose: true })
-
-      // Assert
-      expect(screen.getByTestId('close-icon')).toBeInTheDocument()
-    })
-
-    it('should not render close icon when showClose is false', () => {
-      // Arrange & Act
-      renderDrawer({ showClose: false })
-
-      // Assert
-      expect(screen.queryByTestId('close-icon')).not.toBeInTheDocument()
-    })
-
-    it('should not render close icon by default', () => {
-      // Arrange & Act
-      renderDrawer({})
-
-      // Assert
-      expect(screen.queryByTestId('close-icon')).not.toBeInTheDocument()
-    })
-
-    it('should call onClose when close icon is clicked', () => {
-      // Arrange
-      const onClose = vi.fn()
-      renderDrawer({ showClose: true, onClose })
-
-      // Act
-      fireEvent.click(screen.getByTestId('close-icon'))
-
-      // Assert
-      expect(onClose).toHaveBeenCalledTimes(1)
-    })
-  })
-
-  // Backdrop/Mask tests
-  describe('Backdrop and Mask', () => {
-    it('should render backdrop when noOverlay is false', () => {
-      // Arrange & Act
-      renderDrawer({ noOverlay: false })
-
-      // Assert
-      expect(screen.getByTestId('dialog-backdrop')).toBeInTheDocument()
-    })
-
-    it('should not render backdrop when noOverlay is true', () => {
-      // Arrange & Act
-      renderDrawer({ noOverlay: true })
-
-      // Assert
-      expect(screen.queryByTestId('dialog-backdrop')).not.toBeInTheDocument()
-    })
-
-    it('should apply mask background when mask is true', () => {
-      // Arrange & Act
-      renderDrawer({ mask: true })
-
-      // Assert
-      const backdrop = screen.getByTestId('dialog-backdrop')
-      expect(backdrop.className).toContain('bg-black/30')
-    })
-
-    it('should not apply mask background when mask is false', () => {
-      // Arrange & Act
-      renderDrawer({ mask: false })
-
-      // Assert
-      const backdrop = screen.getByTestId('dialog-backdrop')
-      expect(backdrop.className).not.toContain('bg-black/30')
-    })
-
-    it('should call onClose when backdrop is clicked and clickOutsideNotOpen is false', () => {
-      // Arrange
-      const onClose = vi.fn()
-      renderDrawer({ onClose, clickOutsideNotOpen: false })
-
-      // Act
-      fireEvent.click(screen.getByTestId('dialog-backdrop'))
-
-      // Assert
-      expect(onClose).toHaveBeenCalledTimes(1)
-    })
-
-    it('should not call onClose when backdrop is clicked and clickOutsideNotOpen is true', () => {
-      // Arrange
-      const onClose = vi.fn()
-      renderDrawer({ onClose, clickOutsideNotOpen: true })
-
-      // Act
-      fireEvent.click(screen.getByTestId('dialog-backdrop'))
-
-      // Assert
-      expect(onClose).not.toHaveBeenCalled()
-    })
-  })
-
-  // Footer tests
-  describe('Footer', () => {
-    it('should render default footer with cancel and save buttons when footer is undefined', () => {
-      // Arrange & Act
-      renderDrawer({ footer: undefined })
-
-      // Assert
-      expect(screen.getByText('common.operation.cancel')).toBeInTheDocument()
-      expect(screen.getByText('common.operation.save')).toBeInTheDocument()
-    })
-
-    it('should not render footer when footer is null', () => {
-      // Arrange & Act
-      renderDrawer({ footer: null })
-
-      // Assert
-      expect(screen.queryByText('common.operation.cancel')).not.toBeInTheDocument()
-      expect(screen.queryByText('common.operation.save')).not.toBeInTheDocument()
-    })
-
-    it('should render custom footer when provided', () => {
-      // Arrange
-      const customFooter = <div data-testid="custom-footer">Custom Footer</div>
-
-      // Act
-      renderDrawer({ footer: customFooter })
-
-      // Assert
-      expect(screen.getByTestId('custom-footer')).toBeInTheDocument()
-      expect(screen.queryByText('common.operation.cancel')).not.toBeInTheDocument()
-    })
-
-    it('should call onCancel when cancel button is clicked', () => {
-      // Arrange
-      const onCancel = vi.fn()
-      renderDrawer({ onCancel })
-
-      // Act
-      const cancelButton = screen.getByText('common.operation.cancel')
-      fireEvent.click(cancelButton)
-
-      // Assert
-      expect(onCancel).toHaveBeenCalledTimes(1)
-    })
-
-    it('should call onOk when save button is clicked', () => {
-      // Arrange
-      const onOk = vi.fn()
-      renderDrawer({ onOk })
-
-      // Act
-      const saveButton = screen.getByText('common.operation.save')
-      fireEvent.click(saveButton)
-
-      // Assert
-      expect(onOk).toHaveBeenCalledTimes(1)
-    })
-
-    it('should not throw when onCancel is not provided and cancel is clicked', () => {
-      // Arrange
-      renderDrawer({ onCancel: undefined })
-
-      // Act & Assert
-      expect(() => {
-        fireEvent.click(screen.getByText('common.operation.cancel'))
-      }).not.toThrow()
-    })
-
-    it('should not throw when onOk is not provided and save is clicked', () => {
-      // Arrange
-      renderDrawer({ onOk: undefined })
-
-      // Act & Assert
-      expect(() => {
-        fireEvent.click(screen.getByText('common.operation.save'))
-      }).not.toThrow()
-    })
-  })
-
-  // Custom className tests
-  describe('Custom ClassNames', () => {
-    it('should apply custom dialogClassName', () => {
-      // Arrange & Act
-      renderDrawer({ dialogClassName: 'custom-dialog-class' })
-
-      // Assert
-      expect(screen.getByRole('dialog').className).toContain('custom-dialog-class')
-    })
-
-    it('should apply custom dialogBackdropClassName', () => {
-      // Arrange & Act
-      renderDrawer({ dialogBackdropClassName: 'custom-backdrop-class' })
-
-      // Assert
-      expect(screen.getByTestId('dialog-backdrop').className).toContain('custom-backdrop-class')
-    })
-
-    it('should apply custom containerClassName', () => {
-      // Arrange & Act
-      const { container } = renderDrawer({ containerClassName: 'custom-container-class' })
-
-      // Assert
-      const containerDiv = container.querySelector('.custom-container-class')
-      expect(containerDiv).toBeInTheDocument()
-    })
-
-    it('should apply custom panelClassName', () => {
-      // Arrange & Act
-      const { container } = renderDrawer({ panelClassName: 'custom-panel-class' })
-
-      // Assert
-      const panelDiv = container.querySelector('.custom-panel-class')
-      expect(panelDiv).toBeInTheDocument()
-    })
-  })
-
-  // Position tests
-  describe('Position', () => {
-    it('should apply center position class when positionCenter is true', () => {
-      // Arrange & Act
-      const { container } = renderDrawer({ positionCenter: true })
-
-      // Assert
-      const containerDiv = container.querySelector('.justify-center\\!')
-      expect(containerDiv).toBeInTheDocument()
-    })
-
-    it('should use end position by default when positionCenter is false', () => {
-      // Arrange & Act
-      const { container } = renderDrawer({ positionCenter: false })
-
-      // Assert
-      const containerDiv = container.querySelector('.justify-end')
-      expect(containerDiv).toBeInTheDocument()
-    })
-  })
-
-  // Unmount prop tests
-  describe('Unmount Prop', () => {
-    it('should pass unmount prop to Dialog component', () => {
-      // Arrange & Act
-      renderDrawer({ unmount: true })
-
-      // Assert
-      expect(screen.getByTestId('dialog').getAttribute('data-unmount')).toBe('true')
-    })
-
-    it('should default unmount to false', () => {
-      // Arrange & Act
-      renderDrawer({})
-
-      // Assert
-      expect(screen.getByTestId('dialog').getAttribute('data-unmount')).toBe('false')
-    })
-  })
-
-  // Edge cases
-  describe('Edge Cases', () => {
-    it('should handle empty string title', () => {
-      // Arrange & Act
-      renderDrawer({ title: '' })
-
-      // Assert
-      expect(screen.getByRole('dialog')).toBeInTheDocument()
-    })
-
-    it('should handle empty string description', () => {
-      // Arrange & Act
-      renderDrawer({ description: '' })
-
-      // Assert
-      expect(screen.getByRole('dialog')).toBeInTheDocument()
-    })
-
-    it('should handle special characters in title', () => {
-      // Arrange
-      const specialTitle = '<script>alert("xss")</script>'
-
-      // Act
-      renderDrawer({ title: specialTitle })
-
-      // Assert
-      expect(screen.getByText(specialTitle)).toBeInTheDocument()
-    })
-
-    it('should handle very long title', () => {
-      // Arrange
-      const longTitle = 'A'.repeat(500)
-
-      // Act
-      renderDrawer({ title: longTitle })
-
-      // Assert
-      expect(screen.getByText(longTitle)).toBeInTheDocument()
-    })
-
-    it('should handle complex children with multiple elements', () => {
-      // Arrange
-      const complexChildren = (
-        <div data-testid="complex-children">
-          <h1>Heading</h1>
-          <p>Paragraph</p>
-          <input data-testid="input-element" />
-          <button data-testid="button-element">Button</button>
-        </div>
-      )
-
-      // Act
-      renderDrawer({ children: complexChildren })
-
-      // Assert
-      expect(screen.getByTestId('complex-children')).toBeInTheDocument()
-      expect(screen.getByText('Heading')).toBeInTheDocument()
-      expect(screen.getByText('Paragraph')).toBeInTheDocument()
-      expect(screen.getByTestId('input-element')).toBeInTheDocument()
-      expect(screen.getByTestId('button-element')).toBeInTheDocument()
-    })
-
-    it('should handle null children gracefully', () => {
-      // Arrange & Act
-      renderDrawer({ children: null as unknown as React.ReactNode })
-
-      // Assert
-      expect(screen.getByRole('dialog')).toBeInTheDocument()
-    })
-
-    it('should handle undefined footer without crashing', () => {
-      // Arrange & Act
-      renderDrawer({ footer: undefined })
-
-      // Assert
-      expect(screen.getByRole('dialog')).toBeInTheDocument()
-    })
-
-    it('should handle rapid open/close toggles', () => {
-      // Arrange
-      const onClose = vi.fn()
-      const { rerender } = render(
-        <Drawer {...defaultProps} isOpen={true} onClose={onClose}>
-          <div>Content</div>
-        </Drawer>,
-      )
-
-      // Act - Toggle multiple times
-      rerender(
-        <Drawer {...defaultProps} isOpen={false} onClose={onClose}>
-          <div>Content</div>
-        </Drawer>,
-      )
-      rerender(
-        <Drawer {...defaultProps} isOpen={true} onClose={onClose}>
-          <div>Content</div>
-        </Drawer>,
-      )
-      rerender(
-        <Drawer {...defaultProps} isOpen={false} onClose={onClose}>
-          <div>Content</div>
-        </Drawer>,
-      )
-
-      // Assert
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
-    })
-  })
-
-  // Combined prop scenarios
-  describe('Combined Prop Scenarios', () => {
-    it('should render with all optional props', () => {
-      // Arrange & Act
-      renderDrawer({
-        title: 'Full Feature Title',
-        description: 'Full Feature Description',
-        dialogClassName: 'custom-dialog',
-        dialogBackdropClassName: 'custom-backdrop',
-        containerClassName: 'custom-container',
-        panelClassName: 'custom-panel',
-        showClose: true,
-        mask: true,
-        positionCenter: true,
-        unmount: true,
-        noOverlay: false,
-        footer: <div data-testid="custom-full-footer">Footer</div>,
-      })
-
-      // Assert
-      expect(screen.getByRole('dialog')).toBeInTheDocument()
-      expect(screen.getByText('Full Feature Title')).toBeInTheDocument()
-      expect(screen.getByText('Full Feature Description')).toBeInTheDocument()
-      expect(screen.getByTestId('close-icon')).toBeInTheDocument()
-      expect(screen.getByTestId('custom-full-footer')).toBeInTheDocument()
-    })
-
-    it('should render minimal drawer with only required props', () => {
-      // Arrange
-      const minimalProps: IDrawerProps = {
-        isOpen: true,
-        onClose: vi.fn(),
-        children: <div>Minimal Content</div>,
-      }
-
-      // Act
-      render(<Drawer {...minimalProps} />)
-
-      // Assert
-      expect(screen.getByRole('dialog')).toBeInTheDocument()
-      expect(screen.getByText('Minimal Content')).toBeInTheDocument()
-    })
-
-    it('should handle showClose with title simultaneously', () => {
-      // Arrange & Act
-      renderDrawer({
-        title: 'Title with Close',
-        showClose: true,
-      })
-
-      // Assert
-      expect(screen.getByText('Title with Close')).toBeInTheDocument()
-      expect(screen.getByTestId('close-icon')).toBeInTheDocument()
-    })
-
-    it('should handle noOverlay with clickOutsideNotOpen', () => {
-      // Arrange
-      const onClose = vi.fn()
-
-      // Act
-      renderDrawer({
-        noOverlay: true,
-        clickOutsideNotOpen: true,
-        onClose,
-      })
-
-      // Assert - backdrop should not exist
-      expect(screen.queryByTestId('dialog-backdrop')).not.toBeInTheDocument()
-    })
-  })
-
-  // Dialog onClose callback tests (e.g., Escape key)
-  describe('Dialog onClose Callback', () => {
-    it('should call onClose when Dialog triggers close and clickOutsideNotOpen is false', () => {
-      // Arrange
-      const onClose = vi.fn()
-      renderDrawer({ onClose, clickOutsideNotOpen: false })
-
-      // Act - Simulate Dialog's onClose (e.g., pressing Escape)
-      capturedDialogOnClose?.()
-
-      // Assert
-      expect(onClose).toHaveBeenCalledTimes(1)
-    })
-
-    it('should not call onClose when Dialog triggers close and clickOutsideNotOpen is true', () => {
-      // Arrange
-      const onClose = vi.fn()
-      renderDrawer({ onClose, clickOutsideNotOpen: true })
-
-      // Act - Simulate Dialog's onClose (e.g., pressing Escape)
-      capturedDialogOnClose?.()
-
-      // Assert
-      expect(onClose).not.toHaveBeenCalled()
-    })
-
-    it('should call onClose by default when Dialog triggers close', () => {
-      // Arrange
-      const onClose = vi.fn()
-      renderDrawer({ onClose })
-
-      // Act
-      capturedDialogOnClose?.()
-
-      // Assert
-      expect(onClose).toHaveBeenCalledTimes(1)
-    })
-  })
-
-  // Event handler interaction tests
-  describe('Event Handler Interactions', () => {
-    it('should handle multiple consecutive close icon clicks', () => {
-      // Arrange
-      const onClose = vi.fn()
-      renderDrawer({ showClose: true, onClose })
-
-      // Act
-      const closeIcon = screen.getByTestId('close-icon')
-      fireEvent.click(closeIcon)
-      fireEvent.click(closeIcon)
-      fireEvent.click(closeIcon)
-
-      // Assert
-      expect(onClose).toHaveBeenCalledTimes(3)
-    })
-
-    it('should handle onCancel and onOk being the same function', () => {
-      // Arrange
-      const handler = vi.fn()
-      renderDrawer({ onCancel: handler, onOk: handler })
-
-      // Act
-      fireEvent.click(screen.getByText('common.operation.cancel'))
-      fireEvent.click(screen.getByText('common.operation.save'))
-
-      // Assert
-      expect(handler).toHaveBeenCalledTimes(2)
-    })
-  })
-})
diff --git a/web/app/components/base/drawer/index.stories.tsx b/web/app/components/base/drawer/index.stories.tsx
deleted file mode 100644
index ca7b3bc243..0000000000
--- a/web/app/components/base/drawer/index.stories.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/nextjs-vite'
-import { useState } from 'react'
-import { fn } from 'storybook/test'
-import Drawer from '.'
-
-const meta = {
-  title: 'Base/Feedback/Drawer',
-  component: Drawer,
-  parameters: {
-    layout: 'fullscreen',
-    docs: {
-      description: {
-        component: 'Sliding panel built on Headless UI dialog primitives. Supports optional mask, custom footer, and close behaviour.',
-      },
-    },
-  },
-  tags: ['autodocs'],
-} satisfies Meta<typeof Drawer>
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-const DrawerDemo = (props: React.ComponentProps<typeof Drawer>) => {
-  const [open, setOpen] = useState(false)
-
-  return (
-    <div className="flex h-[400px] items-center justify-center bg-background-default-subtle">
-      <button
-        type="button"
-        className="rounded-md bg-primary-600 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-primary-700"
-        onClick={() => setOpen(true)}
-      >
-        Open drawer
-      </button>
-
-      <Drawer
-        {...props}
-        isOpen={open}
-        onClose={() => setOpen(false)}
-        title={props.title ?? 'Edit configuration'}
-        description={props.description ?? 'Adjust settings in the side panel and save.'}
-        footer={props.footer ?? undefined}
-      >
-        <div className="mt-4 space-y-3 text-sm text-text-secondary">
-          <p>
-            This example renders arbitrary content inside the drawer body. Use it for contextual forms, settings, or informational panels.
-          </p>
-          <div className="rounded-lg border border-divider-subtle bg-components-panel-bg p-3 text-xs">
-            Content area
-          </div>
-        </div>
-      </Drawer>
-    </div>
-  )
-}
-
-export const Playground: Story = {
-  render: args => <DrawerDemo {...args} />,
-  args: {
-    children: null,
-    isOpen: false,
-    onClose: fn(),
-  },
-  parameters: {
-    docs: {
-      source: {
-        language: 'tsx',
-        code: `
-const [open, setOpen] = useState(false)
-
-<Drawer
-  isOpen={open}
-  onClose={() => setOpen(false)}
-  title="Edit configuration"
-  description="Adjust settings in the side panel and save."
->
-  ...
-</Drawer>
-        `.trim(),
-      },
-    },
-  },
-}
-
-export const CustomFooter: Story = {
-  render: args => (
-    <DrawerDemo
-      {...args}
-      footer={(
-        <div className="mt-6 flex justify-end gap-2">
-          <button className="rounded-md border border-divider-subtle px-3 py-1.5 text-sm text-text-secondary" onClick={() => args.onCancel?.()}>Discard</button>
-          <button className="rounded-md bg-primary-600 px-3 py-1.5 text-sm text-white">Save changes</button>
-        </div>
-      )}
-    />
-  ),
-  args: {
-    children: null,
-    isOpen: false,
-    onClose: fn(),
-  },
-  parameters: {
-    docs: {
-      source: {
-        language: 'tsx',
-        code: `
-<Drawer footer={<CustomFooter />}>
-  ...
-</Drawer>
-        `.trim(),
-      },
-    },
-  },
-}
diff --git a/web/app/components/base/drawer/index.tsx b/web/app/components/base/drawer/index.tsx
deleted file mode 100644
index 88c5874dd5..0000000000
--- a/web/app/components/base/drawer/index.tsx
+++ /dev/null
@@ -1,126 +0,0 @@
-'use client'
-import { Dialog, DialogBackdrop, DialogTitle } from '@headlessui/react'
-import { Button } from '@langgenius/dify-ui/button'
-import { cn } from '@langgenius/dify-ui/cn'
-import { useTranslation } from 'react-i18next'
-
-export type IDrawerProps = {
-  title?: string
-  description?: string
-  dialogClassName?: string
-  dialogBackdropClassName?: string
-  containerClassName?: string
-  panelClassName?: string
-  children: React.ReactNode
-  footer?: React.ReactNode
-  mask?: boolean
-  positionCenter?: boolean
-  isOpen: boolean
-  showClose?: boolean
-  clickOutsideNotOpen?: boolean
-  onClose: () => void
-  onCancel?: () => void
-  onOk?: () => void
-  unmount?: boolean
-  noOverlay?: boolean
-}
-
-export default function Drawer({
-  title = '',
-  description = '',
-  dialogClassName = '',
-  dialogBackdropClassName = '',
-  containerClassName = '',
-  panelClassName = '',
-  children,
-  footer,
-  mask = true,
-  positionCenter,
-  showClose = false,
-  isOpen,
-  clickOutsideNotOpen,
-  onClose,
-  onCancel,
-  onOk,
-  unmount = false,
-  noOverlay = false,
-}: IDrawerProps) {
-  const { t } = useTranslation()
-  return (
-    <Dialog
-      unmount={unmount}
-      open={isOpen}
-      onClose={() => {
-        if (!clickOutsideNotOpen)
-          onClose()
-      }}
-      className={cn('fixed inset-0 z-30 overflow-y-auto', dialogClassName)}
-    >
-      <div className={cn('flex h-screen w-screen justify-end', positionCenter && 'justify-center!', containerClassName)}>
-        {/* mask */}
-        {!noOverlay && (
-          <DialogBackdrop
-            className={cn('fixed inset-0 z-40', mask && 'bg-black/30', dialogBackdropClassName)}
-            onClick={() => {
-              if (!clickOutsideNotOpen)
-                onClose()
-            }}
-          />
-        )}
-        <div className={cn('relative z-50 flex w-full max-w-sm flex-col justify-between overflow-hidden bg-components-panel-bg p-6 text-left align-middle shadow-xl', panelClassName)}>
-          <>
-            <div className="flex justify-between">
-              {title && (
-                <DialogTitle
-                  as="h3"
-                  className="text-lg leading-6 font-medium text-text-primary"
-                >
-                  {title}
-                </DialogTitle>
-              )}
-              {showClose && (
-                <DialogTitle className="mb-4 flex cursor-pointer items-center" as="div">
-                  <span
-                    className="i-heroicons-x-mark h-4 w-4 text-text-tertiary"
-                    onClick={onClose}
-                    onKeyDown={(e) => {
-                      if (e.key === 'Enter' || e.key === ' ')
-                        onClose()
-                    }}
-                    role="button"
-                    tabIndex={0}
-                    aria-label={t('operation.close', { ns: 'common' })}
-                    data-testid="close-icon"
-                  />
-                </DialogTitle>
-              )}
-            </div>
-            {description && <div className="mt-2 text-xs font-normal text-text-tertiary">{description}</div>}
-            {children}
-          </>
-          {footer || (footer === null
-            ? null
-            : (
-                <div className="mt-10 flex flex-row justify-end">
-                  <Button
-                    className="mr-2"
-                    onClick={() => {
-                      onCancel?.()
-                    }}
-                  >
-                    {t('operation.cancel', { ns: 'common' })}
-                  </Button>
-                  <Button
-                    onClick={() => {
-                      onOk?.()
-                    }}
-                  >
-                    {t('operation.save', { ns: 'common' })}
-                  </Button>
-                </div>
-              ))}
-        </div>
-      </div>
-    </Dialog>
-  )
-}
diff --git a/web/app/components/base/emoji-picker/Inner.tsx b/web/app/components/base/emoji-picker/Inner.tsx
index 36a98f7dd1..f05221989d 100644
--- a/web/app/components/base/emoji-picker/Inner.tsx
+++ b/web/app/components/base/emoji-picker/Inner.tsx
@@ -57,6 +57,7 @@ const EmojiPickerInner: FC<IEmojiPickerInnerProps> = ({
 
   const [searchedEmojis, setSearchedEmojis] = useState<string[]>([])
   const [isSearching, setIsSearching] = useState(false)
+  const styleColorsLabelId = React.useId()
 
   React.useEffect(() => {
     if (selectedEmoji) {
@@ -101,18 +102,20 @@ const EmojiPickerInner: FC<IEmojiPickerInnerProps> = ({
               <div className="grid h-full w-full grid-cols-8 gap-1">
                 {searchedEmojis.map((emoji: string, index: number) => {
                   return (
-                    <div
+                    <button
+                      type="button"
                       key={`emoji-search-${index}`}
-                      className="inline-flex h-10 w-10 items-center justify-center rounded-lg"
+                      aria-label={emoji}
+                      className="inline-flex h-10 w-10 items-center justify-center rounded-lg border-none bg-transparent p-0"
                       onClick={() => {
                         setSelectedEmoji(emoji)
                         setShowStyleColors(true)
                       }}
                     >
-                      <div className="flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg p-1 ring-components-input-border-hover ring-offset-1 hover:ring-1" data-testid={`emoji-search-result-${emoji}`}>
+                      <span className="flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg p-1 ring-components-input-border-hover ring-offset-1 hover:ring-1">
                         <em-emoji id={emoji} />
-                      </div>
-                    </div>
+                      </span>
+                    </button>
                   )
                 })}
               </div>
@@ -127,18 +130,20 @@ const EmojiPickerInner: FC<IEmojiPickerInnerProps> = ({
               <div className="grid h-full w-full grid-cols-8 gap-1">
                 {category.emojis.map((emoji, index: number) => {
                   return (
-                    <div
+                    <button
+                      type="button"
                       key={`emoji-${index}`}
-                      className="inline-flex h-10 w-10 items-center justify-center rounded-lg"
+                      aria-label={emoji}
+                      className="inline-flex h-10 w-10 items-center justify-center rounded-lg border-none bg-transparent p-0"
                       onClick={() => {
                         setSelectedEmoji(emoji)
                         setShowStyleColors(true)
                       }}
                     >
-                      <div className="flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg p-1 ring-components-input-border-hover ring-offset-1 hover:ring-1" data-testid={`emoji-container-${emoji}`}>
+                      <span className="flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg p-1 ring-components-input-border-hover ring-offset-1 hover:ring-1">
                         <em-emoji id={emoji} />
-                      </div>
-                    </div>
+                      </span>
+                    </button>
                   )
                 })}
 
@@ -150,21 +155,40 @@ const EmojiPickerInner: FC<IEmojiPickerInnerProps> = ({
 
       {/* Color Select */}
       <div className={cn('flex items-center justify-between p-3 pb-0')}>
-        <p className="mb-2 system-xs-medium-uppercase text-text-primary">Choose Style</p>
+        <p id={styleColorsLabelId} className="mb-2 system-xs-medium-uppercase text-text-primary">Choose Style</p>
         {showStyleColors
-          ? <span className="i-heroicons-chevron-down h-4 w-4 cursor-pointer text-text-quaternary" onClick={() => setShowStyleColors(!showStyleColors)} data-testid="toggle-colors" />
-          : <span className="i-heroicons-chevron-up h-4 w-4 cursor-pointer text-text-quaternary" onClick={() => setShowStyleColors(!showStyleColors)} data-testid="toggle-colors" />}
+          ? (
+              <button
+                type="button"
+                aria-labelledby={styleColorsLabelId}
+                aria-expanded="true"
+                className="i-heroicons-chevron-down h-4 w-4 cursor-pointer border-none bg-transparent p-0 text-text-quaternary"
+                onClick={() => setShowStyleColors(!showStyleColors)}
+              />
+            )
+          : (
+              <button
+                type="button"
+                aria-labelledby={styleColorsLabelId}
+                aria-expanded="false"
+                className="i-heroicons-chevron-up h-4 w-4 cursor-pointer border-none bg-transparent p-0 text-text-quaternary"
+                onClick={() => setShowStyleColors(!showStyleColors)}
+              />
+            )}
       </div>
       {showStyleColors && (
         <div className="grid w-full grid-cols-8 gap-1 px-3">
           {backgroundColors.map((color) => {
             return (
-              <div
+              <button
+                type="button"
                 key={color}
+                aria-label={color}
                 className={
                   cn(
                     'cursor-pointer',
-                    'ring-offset-1 hover:ring-1',
+                    'border-none bg-transparent p-0',
+                    'ring-components-input-border-hover ring-offset-1 hover:ring-1',
                     'inline-flex h-10 w-10 items-center justify-center rounded-lg',
                     color === selectedBackground ? 'ring-1 ring-components-input-border-hover' : '',
                   )
@@ -173,15 +197,15 @@ const EmojiPickerInner: FC<IEmojiPickerInnerProps> = ({
                   setSelectedBackground(color)
                 }}
               >
-                <div
+                <span
                   className={cn(
                     'flex h-8 w-8 items-center justify-center rounded-lg p-1',
                   )}
                   style={{ background: color }}
                 >
                   {selectedEmoji !== '' && <em-emoji id={selectedEmoji} />}
-                </div>
-              </div>
+                </span>
+              </button>
             )
           })}
         </div>
diff --git a/web/app/components/base/emoji-picker/__tests__/Inner.spec.tsx b/web/app/components/base/emoji-picker/__tests__/Inner.spec.tsx
index 41683d7af3..c2f4bce55c 100644
--- a/web/app/components/base/emoji-picker/__tests__/Inner.spec.tsx
+++ b/web/app/components/base/emoji-picker/__tests__/Inner.spec.tsx
@@ -75,10 +75,10 @@ describe('EmojiPickerInner', () => {
 
     it('updates selected emoji and calls onSelect when an emoji is clicked', async () => {
       render(<EmojiPickerInner onSelect={mockOnSelect} />)
-      const emojiContainers = screen.getAllByTestId(/^emoji-container-/)
+      const emojiButton = screen.getByRole('button', { name: 'rabbit' })
 
       await act(async () => {
-        fireEvent.click(emojiContainers[0]!)
+        fireEvent.click(emojiButton)
       })
 
       expect(mockOnSelect).toHaveBeenCalledWith('rabbit', expect.any(String))
@@ -89,7 +89,7 @@ describe('EmojiPickerInner', () => {
 
       expect(screen.queryByText('#FFEAD5')).not.toBeInTheDocument()
 
-      const toggleButton = screen.getByTestId('toggle-colors')
+      const toggleButton = screen.getByRole('button', { name: 'Choose Style' })
       expect(toggleButton)!.toBeInTheDocument()
 
       await act(async () => {
@@ -104,21 +104,21 @@ describe('EmojiPickerInner', () => {
     it('updates background color and calls onSelect when a color is clicked', async () => {
       render(<EmojiPickerInner onSelect={mockOnSelect} />)
 
-      const toggleButton = screen.getByTestId('toggle-colors')
+      const toggleButton = screen.getByRole('button', { name: 'Choose Style' })
       await act(async () => {
         fireEvent.click(toggleButton!)
       })
 
-      const emojiContainers = screen.getAllByTestId(/^emoji-container-/)
+      const emojiButton = screen.getByRole('button', { name: 'rabbit' })
       await act(async () => {
-        fireEvent.click(emojiContainers[0]!)
+        fireEvent.click(emojiButton)
       })
 
       mockOnSelect.mockClear()
 
-      const colorOptions = document.querySelectorAll('[style^="background:"]')
+      const colorOptions = screen.getAllByRole('button', { name: /^#/ })
       await act(async () => {
-        fireEvent.click(colorOptions[1]!.parentElement!)
+        fireEvent.click(colorOptions[1]!)
       })
 
       expect(mockOnSelect).toHaveBeenCalledWith('rabbit', '#E4FBCC')
@@ -134,9 +134,9 @@ describe('EmojiPickerInner', () => {
 
       await screen.findByText('Search')
 
-      const searchEmojis = screen.getAllByTestId(/^emoji-search-result-/)
+      const searchEmoji = screen.getByRole('button', { name: 'dog' })
       await act(async () => {
-        fireEvent.click(searchEmojis![0]!)
+        fireEvent.click(searchEmoji)
       })
 
       expect(mockOnSelect).toHaveBeenCalledWith('dog', expect.any(String))
@@ -145,7 +145,7 @@ describe('EmojiPickerInner', () => {
     it('toggles style colors display back and forth', async () => {
       render(<EmojiPickerInner onSelect={mockOnSelect} />)
 
-      const toggleButton = screen.getByTestId('toggle-colors')
+      const toggleButton = screen.getByRole('button', { name: 'Choose Style' })
 
       await act(async () => {
         fireEvent.click(toggleButton!)
@@ -153,7 +153,7 @@ describe('EmojiPickerInner', () => {
       expect(screen.getByText('Choose Style'))!.toBeInTheDocument()
 
       await act(async () => {
-        fireEvent.click(screen.getByTestId('toggle-colors')!) // It should be the other icon now
+        fireEvent.click(screen.getByRole('button', { name: 'Choose Style' }))
       })
       expect(screen.queryByText('#FFEAD5')).not.toBeInTheDocument()
     })
diff --git a/web/app/components/base/emoji-picker/__tests__/index.spec.tsx b/web/app/components/base/emoji-picker/__tests__/index.spec.tsx
index 36b161b7c7..ed5f9bed75 100644
--- a/web/app/components/base/emoji-picker/__tests__/index.spec.tsx
+++ b/web/app/components/base/emoji-picker/__tests__/index.spec.tsx
@@ -81,10 +81,8 @@ describe('EmojiPicker', () => {
         )
       })
 
-      const emojiWrappers = screen.getAllByTestId(/^emoji-container-/)
-      expect(emojiWrappers.length).toBeGreaterThan(0)
       await act(async () => {
-        fireEvent.click(emojiWrappers[0]!)
+        fireEvent.click(screen.getByRole('button', { name: 'emoji1' }))
       })
 
       const okButton = screen.getByText(/OK/i)
diff --git a/web/app/components/base/emoji-picker/index.tsx b/web/app/components/base/emoji-picker/index.tsx
index 75112e70eb..9ff81b999f 100644
--- a/web/app/components/base/emoji-picker/index.tsx
+++ b/web/app/components/base/emoji-picker/index.tsx
@@ -2,12 +2,11 @@
 import type { FC } from 'react'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
-import { noop } from 'es-toolkit/function'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import * as React from 'react'
 import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Divider from '@/app/components/base/divider'
-import Modal from '@/app/components/base/modal'
 import EmojiPickerInner from './Inner'
 
 type IEmojiPickerProps = {
@@ -34,39 +33,42 @@ const EmojiPicker: FC<IEmojiPickerProps> = ({
 
   return isModal
     ? (
-        <Modal
-          onClose={noop}
-          isShow
-          closable={false}
-          wrapperClassName={className}
-          className={cn('flex max-h-[552px] flex-col rounded-xl border-[0.5px] border-divider-subtle p-0 shadow-xl')}
-        >
-          <EmojiPickerInner
-            className="pt-3"
-            onSelect={handleSelectEmoji}
-          />
-          <Divider className="mt-3 mb-0" />
-          <div className="flex w-full items-center justify-center gap-2 p-3">
-            <Button
-              className="w-full"
-              onClick={() => {
-                onClose?.()
-              }}
-            >
-              {t('iconPicker.cancel', { ns: 'app' })}
-            </Button>
-            <Button
-              disabled={selectedEmoji === '' || !selectedBackground}
-              variant="primary"
-              className="w-full"
-              onClick={() => {
-                onSelect?.(selectedEmoji, selectedBackground!)
-              }}
-            >
-              {t('iconPicker.ok', { ns: 'app' })}
-            </Button>
-          </div>
-        </Modal>
+        <Dialog open>
+          <DialogContent
+            className={cn(
+              'max-h-none w-full overflow-hidden! text-left align-middle',
+              'flex max-h-[552px] flex-col rounded-xl border-[0.5px] border-divider-subtle p-0 shadow-xl',
+              className,
+            )}
+          >
+
+            <EmojiPickerInner
+              className="pt-3"
+              onSelect={handleSelectEmoji}
+            />
+            <Divider className="mt-3 mb-0" />
+            <div className="flex w-full items-center justify-center gap-2 p-3">
+              <Button
+                className="w-full"
+                onClick={() => {
+                  onClose?.()
+                }}
+              >
+                {t('iconPicker.cancel', { ns: 'app' })}
+              </Button>
+              <Button
+                disabled={selectedEmoji === '' || !selectedBackground}
+                variant="primary"
+                className="w-full"
+                onClick={() => {
+                  onSelect?.(selectedEmoji, selectedBackground!)
+                }}
+              >
+                {t('iconPicker.ok', { ns: 'app' })}
+              </Button>
+            </div>
+          </DialogContent>
+        </Dialog>
       )
     : <></>
 }
diff --git a/web/app/components/base/features/new-feature-panel/__tests__/dialog-wrapper.spec.tsx b/web/app/components/base/features/new-feature-panel/__tests__/feature-panel-drawer.spec.tsx
similarity index 51%
rename from web/app/components/base/features/new-feature-panel/__tests__/dialog-wrapper.spec.tsx
rename to web/app/components/base/features/new-feature-panel/__tests__/feature-panel-drawer.spec.tsx
index 374976c366..a4c45ff1e4 100644
--- a/web/app/components/base/features/new-feature-panel/__tests__/dialog-wrapper.spec.tsx
+++ b/web/app/components/base/features/new-feature-panel/__tests__/feature-panel-drawer.spec.tsx
@@ -1,7 +1,7 @@
 import { fireEvent, render, screen, waitFor } from '@testing-library/react'
-import DialogWrapper from '../dialog-wrapper'
+import { FeaturePanelDrawer } from '../feature-panel-drawer'
 
-describe('DialogWrapper', () => {
+describe('FeaturePanelDrawer', () => {
   beforeEach(() => {
     vi.clearAllMocks()
   })
@@ -9,9 +9,9 @@ describe('DialogWrapper', () => {
   describe('Rendering', () => {
     it('should render children when show is true', () => {
       render(
-        <DialogWrapper show>
+        <FeaturePanelDrawer show>
           <div data-testid="content">Content</div>
-        </DialogWrapper>,
+        </FeaturePanelDrawer>,
       )
 
       expect(screen.getByTestId('content')).toBeInTheDocument()
@@ -19,9 +19,9 @@ describe('DialogWrapper', () => {
 
     it('should not render children when show is false', () => {
       render(
-        <DialogWrapper show={false}>
+        <FeaturePanelDrawer show={false}>
           <div data-testid="content">Content</div>
-        </DialogWrapper>,
+        </FeaturePanelDrawer>,
       )
 
       expect(screen.queryByTestId('content')).not.toBeInTheDocument()
@@ -31,45 +31,44 @@ describe('DialogWrapper', () => {
   describe('Props', () => {
     it('should apply workflow styles by default', () => {
       render(
-        <DialogWrapper show>
+        <FeaturePanelDrawer show>
           <div data-testid="content">Content</div>
-        </DialogWrapper>,
+        </FeaturePanelDrawer>,
       )
 
-      const wrapper = screen.getByTestId('content').parentElement
-      expect(wrapper).toHaveClass('rounded-l-2xl')
-      expect(wrapper).not.toHaveClass('rounded-2xl')
+      const drawer = screen.getByRole('dialog')
+      expect(drawer).toHaveClass('data-[swipe-direction=right]:!top-[112px]')
+      expect(drawer).toHaveClass('data-[swipe-direction=right]:!rounded-l-2xl')
+      expect(drawer).not.toHaveClass('data-[swipe-direction=right]:!rounded-2xl')
     })
 
     it('should apply non-workflow styles when inWorkflow is false', () => {
       render(
-        <DialogWrapper show inWorkflow={false}>
+        <FeaturePanelDrawer show inWorkflow={false}>
           <div data-testid="content">Content</div>
-        </DialogWrapper>,
+        </FeaturePanelDrawer>,
       )
 
-      const content = screen.getByTestId('content')
-      const panel = content.parentElement
-      const layoutContainer = screen.getByTestId('dialog-layout-container')
+      const drawer = screen.getByRole('dialog')
+      const layoutContainer = screen.getByTestId('feature-panel-drawer-layout')
 
-      expect(layoutContainer).toHaveClass('pr-2')
-      expect(layoutContainer).toHaveClass('pt-[64px]')
-      expect(layoutContainer).not.toHaveClass('pt-[112px]')
+      expect(layoutContainer).toBeInTheDocument()
 
-      expect(panel).toHaveClass('rounded-2xl')
-      expect(panel).toHaveClass('border-[0.5px]')
-      expect(panel).not.toHaveClass('rounded-l-2xl')
+      expect(drawer).toHaveClass('data-[swipe-direction=right]:!top-[64px]')
+      expect(drawer).toHaveClass('data-[swipe-direction=right]:!right-2')
+      expect(drawer).toHaveClass('data-[swipe-direction=right]:!rounded-2xl')
+      expect(drawer).toHaveClass('data-[swipe-direction=right]:!border-[0.5px]')
+      expect(drawer).not.toHaveClass('data-[swipe-direction=right]:!rounded-l-2xl')
     })
 
     it('should accept custom className', () => {
       render(
-        <DialogWrapper show className="custom-class">
+        <FeaturePanelDrawer show className="custom-class">
           <div data-testid="content">Content</div>
-        </DialogWrapper>,
+        </FeaturePanelDrawer>,
       )
 
-      const wrapper = screen.getByTestId('content').parentElement
-      expect(wrapper).toHaveClass('custom-class')
+      expect(screen.getByRole('dialog')).toHaveClass('custom-class')
     })
   })
 
@@ -78,9 +77,9 @@ describe('DialogWrapper', () => {
       const onClose = vi.fn()
 
       render(
-        <DialogWrapper show onClose={onClose}>
+        <FeaturePanelDrawer show onClose={onClose}>
           <div>Content</div>
-        </DialogWrapper>,
+        </FeaturePanelDrawer>,
       )
 
       fireEvent.keyDown(document, { key: 'Escape' })
@@ -92,9 +91,9 @@ describe('DialogWrapper', () => {
 
     it('should not throw when escape is pressed without onClose', () => {
       render(
-        <DialogWrapper show>
+        <FeaturePanelDrawer show>
           <div>Content</div>
-        </DialogWrapper>,
+        </FeaturePanelDrawer>,
       )
 
       expect(() => {
diff --git a/web/app/components/base/features/new-feature-panel/annotation-reply/__tests__/config-param-modal.spec.tsx b/web/app/components/base/features/new-feature-panel/annotation-reply/__tests__/config-param-modal.spec.tsx
index b07f48d4bb..39c1244980 100644
--- a/web/app/components/base/features/new-feature-panel/annotation-reply/__tests__/config-param-modal.spec.tsx
+++ b/web/app/components/base/features/new-feature-panel/annotation-reply/__tests__/config-param-modal.spec.tsx
@@ -40,7 +40,7 @@ vi.mock('../score-slider', () => ({
     <input
       role="slider"
       type="range"
-      min={80}
+      min={0}
       max={100}
       value={value}
       onChange={e => onChange(Number((e.target as HTMLInputElement).value))}
@@ -272,7 +272,7 @@ describe('ConfigParamModal', () => {
     )
 
     const slider = screen.getByRole('slider')
-    expect(slider).toHaveAttribute('min', '80')
+    expect(slider).toHaveAttribute('min', '0')
     expect(slider).toHaveAttribute('max', '100')
     expect(slider).toHaveValue('90')
   })
@@ -375,7 +375,7 @@ describe('ConfigParamModal', () => {
   it('should use ANNOTATION_DEFAULT score_threshold when config has no score_threshold', () => {
     const configWithoutThreshold = {
       ...defaultAnnotationConfig,
-      score_threshold: 0,
+      score_threshold: undefined as unknown as number,
     }
     render(
       <ConfigParamModal
@@ -390,6 +390,35 @@ describe('ConfigParamModal', () => {
     expect(screen.getByRole('slider')).toHaveValue('90')
   })
 
+  it('should preserve zero score threshold instead of falling back to default', async () => {
+    const onSave = vi.fn().mockResolvedValue(undefined)
+    render(
+      <ConfigParamModal
+        appId="test-app"
+        isShow={true}
+        onHide={vi.fn()}
+        onSave={onSave}
+        annotationConfig={{
+          ...defaultAnnotationConfig,
+          score_threshold: 0,
+        }}
+      />,
+    )
+
+    expect(screen.getByRole('slider')).toHaveValue('0')
+
+    const buttons = screen.getAllByRole('button')
+    const saveBtn = buttons.find(b => b.textContent?.includes('initSetup'))
+    fireEvent.click(saveBtn!)
+
+    await waitFor(() => {
+      expect(onSave).toHaveBeenCalledWith(
+        expect.objectContaining({ embedding_provider_name: 'openai' }),
+        0,
+      )
+    })
+  })
+
   it('should set loading state while saving', async () => {
     let resolveOnSave: () => void
     const onSave = vi.fn().mockImplementation(() => new Promise<void>((resolve) => {
diff --git a/web/app/components/base/features/new-feature-panel/annotation-reply/__tests__/index.spec.tsx b/web/app/components/base/features/new-feature-panel/annotation-reply/__tests__/index.spec.tsx
index 03ddbc6322..4aae34387e 100644
--- a/web/app/components/base/features/new-feature-panel/annotation-reply/__tests__/index.spec.tsx
+++ b/web/app/components/base/features/new-feature-panel/annotation-reply/__tests__/index.spec.tsx
@@ -175,6 +175,22 @@ describe('AnnotationReply', () => {
     expect(screen.getByText('text-embedding-ada-002')).toBeInTheDocument()
   })
 
+  it('should show zero score threshold when enabled', () => {
+    renderWithProvider({}, {
+      annotationReply: {
+        enabled: true,
+        score_threshold: 0,
+        embedding_model: {
+          embedding_provider_name: 'openai',
+          embedding_model_name: 'text-embedding-ada-002',
+        },
+      },
+    })
+
+    expect(screen.getByText('0')).toBeInTheDocument()
+    expect(screen.getByText('text-embedding-ada-002')).toBeInTheDocument()
+  })
+
   it('should show dash when score threshold is not set', () => {
     renderWithProvider({}, {
       annotationReply: {
diff --git a/web/app/components/base/features/new-feature-panel/annotation-reply/__tests__/use-annotation-config.spec.ts b/web/app/components/base/features/new-feature-panel/annotation-reply/__tests__/use-annotation-config.spec.ts
index 14f6d68bda..6f6deb7ae1 100644
--- a/web/app/components/base/features/new-feature-panel/annotation-reply/__tests__/use-annotation-config.spec.ts
+++ b/web/app/components/base/features/new-feature-panel/annotation-reply/__tests__/use-annotation-config.spec.ts
@@ -1,6 +1,6 @@
 import type { AnnotationReplyConfig } from '@/models/debug'
 import { act, renderHook } from '@testing-library/react'
-import { queryAnnotationJobStatus } from '@/service/annotation'
+import { queryAnnotationJobStatus, updateAnnotationStatus } from '@/service/annotation'
 import { sleep } from '@/utils'
 import useAnnotationConfig from '../use-annotation-config'
 
@@ -162,6 +162,35 @@ describe('useAnnotationConfig', () => {
     expect(updatedConfig.score_threshold).toBe(0.85)
   })
 
+  it('should preserve zero score threshold when enabling annotation', async () => {
+    const zeroScoreConfig = { ...defaultConfig, score_threshold: 0 }
+    const setAnnotationConfig = vi.fn()
+    const { result } = renderHook(() => useAnnotationConfig({
+      appId: 'test-app',
+      annotationConfig: zeroScoreConfig,
+      setAnnotationConfig,
+    }))
+
+    await act(async () => {
+      await result.current.handleEnableAnnotation({
+        embedding_provider_name: 'openai',
+        embedding_model_name: 'text-embedding-3-small',
+      }, 0)
+    })
+
+    expect(updateAnnotationStatus).toHaveBeenCalledWith(
+      'test-app',
+      'enable',
+      {
+        embedding_provider_name: 'openai',
+        embedding_model_name: 'text-embedding-3-small',
+      },
+      0,
+    )
+    const updatedConfig = setAnnotationConfig.mock.calls[0]![0]
+    expect(updatedConfig.score_threshold).toBe(0)
+  })
+
   it('should set score and embedding model together', () => {
     const setAnnotationConfig = vi.fn()
     const { result } = renderHook(() => useAnnotationConfig({
diff --git a/web/app/components/base/features/new-feature-panel/annotation-reply/config-param-modal.tsx b/web/app/components/base/features/new-feature-panel/annotation-reply/config-param-modal.tsx
index 13b4133ab6..9c341d4ec1 100644
--- a/web/app/components/base/features/new-feature-panel/annotation-reply/config-param-modal.tsx
+++ b/web/app/components/base/features/new-feature-panel/annotation-reply/config-param-modal.tsx
@@ -2,11 +2,11 @@
 import type { FC } from 'react'
 import type { AnnotationReplyConfig } from '@/models/debug'
 import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
 import * as React from 'react'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import Modal from '@/app/components/base/modal'
 import { ModelTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import { useModelListAndDefaultModelAndCurrentProviderAndModel } from '@/app/components/header/account-setting/model-provider-page/hooks'
 import ModelSelector from '@/app/components/header/account-setting/model-provider-page/model-selector'
@@ -58,52 +58,61 @@ const ConfigParamModal: FC<Props> = ({ isShow, onHide: doHide, onSave, isInit, a
     setLoading(false)
   }
   return (
-    <Modal isShow={isShow} onClose={onHide} className="!mt-14 !w-[640px] !max-w-none !p-6">
-      <div className="mb-2 title-2xl-semi-bold text-text-primary">
-        {t(`initSetup.${isInit ? 'title' : 'configTitle'}`, { ns: 'appAnnotation' })}
-      </div>
+    <Dialog
+      open={isShow}
+      onOpenChange={(open) => {
+        if (!open)
+          onHide()
+      }}
+    >
+      <DialogContent className="!mt-14 !w-[640px] !max-w-none border-none !p-6 text-left align-middle">
 
-      <div className="mt-6 space-y-3">
-        <Item title={t('feature.annotation.scoreThreshold.title', { ns: 'appDebug' })} tooltip={t('feature.annotation.scoreThreshold.description', { ns: 'appDebug' })}>
-          <ScoreSlider
-            className="mt-1"
-            value={(annotationConfig.score_threshold || ANNOTATION_DEFAULT.score_threshold) * 100}
-            onChange={(val) => {
-              setAnnotationConfig({
-                ...annotationConfig,
-                score_threshold: val / 100,
-              })
-            }}
-          />
-        </Item>
+        <div className="mb-2 title-2xl-semi-bold text-text-primary">
+          {t(`initSetup.${isInit ? 'title' : 'configTitle'}`, { ns: 'appAnnotation' })}
+        </div>
 
-        <Item title={t('modelProvider.embeddingModel.key', { ns: 'common' })} tooltip={t('embeddingModelSwitchTip', { ns: 'appAnnotation' })}>
-          <div className="pt-1">
-            <ModelSelector
-              defaultModel={embeddingModel && {
-                provider: embeddingModel.providerName,
-                model: embeddingModel.modelName,
-              }}
-              modelList={embeddingsModelList}
-              onSelect={(val) => {
-                setEmbeddingModel({
-                  providerName: val.provider,
-                  modelName: val.model,
+        <div className="mt-6 space-y-3">
+          <Item title={t('feature.annotation.scoreThreshold.title', { ns: 'appDebug' })} tooltip={t('feature.annotation.scoreThreshold.description', { ns: 'appDebug' })}>
+            <ScoreSlider
+              className="mt-1"
+              value={(annotationConfig.score_threshold ?? ANNOTATION_DEFAULT.score_threshold) * 100}
+              onChange={(val) => {
+                setAnnotationConfig({
+                  ...annotationConfig,
+                  score_threshold: val / 100,
                 })
               }}
             />
-          </div>
-        </Item>
-      </div>
+          </Item>
 
-      <div className="mt-6 flex justify-end gap-2">
-        <Button onClick={onHide}>{t('operation.cancel', { ns: 'common' })}</Button>
-        <Button variant="primary" onClick={handleSave} loading={isLoading}>
-          <div></div>
-          <div>{t(`initSetup.${isInit ? 'confirmBtn' : 'configConfirmBtn'}`, { ns: 'appAnnotation' })}</div>
-        </Button>
-      </div>
-    </Modal>
+          <Item title={t('modelProvider.embeddingModel.key', { ns: 'common' })} tooltip={t('embeddingModelSwitchTip', { ns: 'appAnnotation' })}>
+            <div className="pt-1">
+              <ModelSelector
+                defaultModel={embeddingModel && {
+                  provider: embeddingModel.providerName,
+                  model: embeddingModel.modelName,
+                }}
+                modelList={embeddingsModelList}
+                onSelect={(val) => {
+                  setEmbeddingModel({
+                    providerName: val.provider,
+                    modelName: val.model,
+                  })
+                }}
+              />
+            </div>
+          </Item>
+        </div>
+
+        <div className="mt-6 flex justify-end gap-2">
+          <Button onClick={onHide}>{t('operation.cancel', { ns: 'common' })}</Button>
+          <Button variant="primary" onClick={handleSave} loading={isLoading}>
+            <div></div>
+            <div>{t(`initSetup.${isInit ? 'confirmBtn' : 'configConfirmBtn'}`, { ns: 'appAnnotation' })}</div>
+          </Button>
+        </div>
+      </DialogContent>
+    </Dialog>
   )
 }
 export default React.memo(ConfigParamModal)
diff --git a/web/app/components/base/features/new-feature-panel/annotation-reply/config-param.tsx b/web/app/components/base/features/new-feature-panel/annotation-reply/config-param.tsx
index 0335587af0..16cbefe87a 100644
--- a/web/app/components/base/features/new-feature-panel/annotation-reply/config-param.tsx
+++ b/web/app/components/base/features/new-feature-panel/annotation-reply/config-param.tsx
@@ -1,7 +1,7 @@
 'use client'
 import type { FC } from 'react'
 import * as React from 'react'
-import Tooltip from '@/app/components/base/tooltip'
+import { Infotip } from '@/app/components/base/infotip'
 
 export const Item: FC<{ title: string, tooltip: string, children: React.JSX.Element }> = ({
   title,
@@ -12,11 +12,9 @@ export const Item: FC<{ title: string, tooltip: string, children: React.JSX.Elem
     <div>
       <div className="mb-1 flex items-center space-x-1">
         <div className="py-1 system-sm-semibold text-text-secondary">{title}</div>
-        <Tooltip
-          popupContent={
-            <div className="max-w-[200px] system-sm-regular text-text-secondary">{tooltip}</div>
-          }
-        />
+        <Infotip aria-label={tooltip} popupClassName="max-w-[200px] system-sm-regular text-text-secondary">
+          {tooltip}
+        </Infotip>
       </div>
       <div>{children}</div>
     </div>
diff --git a/web/app/components/base/features/new-feature-panel/annotation-reply/index.tsx b/web/app/components/base/features/new-feature-panel/annotation-reply/index.tsx
index 80ebaf9614..b73699359b 100644
--- a/web/app/components/base/features/new-feature-panel/annotation-reply/index.tsx
+++ b/web/app/components/base/features/new-feature-panel/annotation-reply/index.tsx
@@ -100,7 +100,7 @@ const AnnotationReply = ({
                 <div className="flex items-center gap-4 pt-0.5">
                   <div className="">
                     <div className="mb-0.5 system-2xs-medium-uppercase text-text-tertiary">{t('feature.annotation.scoreThreshold.title', { ns: 'appDebug' })}</div>
-                    <div className="system-xs-regular text-text-secondary">{annotationReply.score_threshold || '-'}</div>
+                    <div className="system-xs-regular text-text-secondary">{annotationReply.score_threshold ?? '-'}</div>
                   </div>
                   <div className="h-[27px] w-px rotate-12 bg-divider-subtle"></div>
                   <div className="">
diff --git a/web/app/components/base/features/new-feature-panel/annotation-reply/score-slider/__tests__/index.spec.tsx b/web/app/components/base/features/new-feature-panel/annotation-reply/score-slider/__tests__/index.spec.tsx
index ffa9c33043..97493ab441 100644
--- a/web/app/components/base/features/new-feature-panel/annotation-reply/score-slider/__tests__/index.spec.tsx
+++ b/web/app/components/base/features/new-feature-panel/annotation-reply/score-slider/__tests__/index.spec.tsx
@@ -17,7 +17,7 @@ describe('ScoreSlider', () => {
   it('should display easy match and accurate match labels', () => {
     render(<ScoreSlider value={90} onChange={vi.fn()} />)
 
-    expect(screen.getByText('0.8')).toBeInTheDocument()
+    expect(screen.getByText('0.0')).toBeInTheDocument()
     expect(screen.getByText('1.0')).toBeInTheDocument()
     expect(screen.getByText(/feature\.annotation\.scoreThreshold\.easyMatch/)).toBeInTheDocument()
     expect(screen.getByText(/feature\.annotation\.scoreThreshold\.accurateMatch/)).toBeInTheDocument()
@@ -36,4 +36,11 @@ describe('ScoreSlider', () => {
     expect(getSliderInput()).toHaveValue('95')
     expect(screen.getByText('0.95')).toBeInTheDocument()
   })
+
+  it('should allow zero as the minimum score threshold', () => {
+    render(<ScoreSlider value={0} onChange={vi.fn()} />)
+
+    expect(getSliderInput()).toHaveValue('0')
+    expect(screen.getByText('0.00')).toBeInTheDocument()
+  })
 })
diff --git a/web/app/components/base/features/new-feature-panel/annotation-reply/score-slider/index.tsx b/web/app/components/base/features/new-feature-panel/annotation-reply/score-slider/index.tsx
index 8a2dc18fc0..d3b6340c89 100644
--- a/web/app/components/base/features/new-feature-panel/annotation-reply/score-slider/index.tsx
+++ b/web/app/components/base/features/new-feature-panel/annotation-reply/score-slider/index.tsx
@@ -17,13 +17,16 @@ const clamp = (value: number, min: number, max: number) => {
   return Math.min(Math.max(value, min), max)
 }
 
+const SCORE_MIN = 0
+const SCORE_MAX = 100
+
 const ScoreSlider: FC<Props> = ({
   className,
   value,
   onChange,
 }) => {
   const { t } = useTranslation()
-  const safeValue = clamp(value, 80, 100)
+  const safeValue = clamp(value, SCORE_MIN, SCORE_MAX)
 
   return (
     <div className={className}>
@@ -31,8 +34,8 @@ const ScoreSlider: FC<Props> = ({
         <Slider
           className="w-full"
           value={safeValue}
-          min={80}
-          max={100}
+          min={SCORE_MIN}
+          max={SCORE_MAX}
           step={1}
           onValueChange={onChange}
           aria-label={t('feature.annotation.scoreThreshold.title', { ns: 'appDebug' })}
@@ -40,7 +43,7 @@ const ScoreSlider: FC<Props> = ({
         <div
           className="pointer-events-none absolute top-[-16px] system-sm-semibold text-text-primary"
           style={{
-            left: `calc(4px + ${(safeValue - 80) / 20} * (100% - 8px))`,
+            left: `calc(4px + ${safeValue / SCORE_MAX} * (100% - 8px))`,
             transform: 'translateX(-50%)',
           }}
         >
@@ -49,7 +52,7 @@ const ScoreSlider: FC<Props> = ({
       </div>
       <div className="mt-[10px] flex items-center justify-between system-xs-semibold-uppercase">
         <div className="flex space-x-1 text-util-colors-cyan-cyan-500">
-          <div>0.8</div>
+          <div>0.0</div>
           <div>·</div>
           <div>{t('feature.annotation.scoreThreshold.easyMatch', { ns: 'appDebug' })}</div>
         </div>
diff --git a/web/app/components/base/features/new-feature-panel/annotation-reply/use-annotation-config.ts b/web/app/components/base/features/new-feature-panel/annotation-reply/use-annotation-config.ts
index c74175846d..64c714df4e 100644
--- a/web/app/components/base/features/new-feature-panel/annotation-reply/use-annotation-config.ts
+++ b/web/app/components/base/features/new-feature-panel/annotation-reply/use-annotation-config.ts
@@ -53,7 +53,7 @@ const useAnnotationConfig = ({
     setAnnotationConfig(produce(annotationConfig, (draft: AnnotationReplyConfig) => {
       draft.enabled = true
       draft.embedding_model = embeddingModel
-      if (!draft.score_threshold)
+      if (draft.score_threshold === undefined || draft.score_threshold === null)
         draft.score_threshold = ANNOTATION_DEFAULT.score_threshold
     }))
   }
diff --git a/web/app/components/base/features/new-feature-panel/conversation-opener/__tests__/modal.spec.tsx b/web/app/components/base/features/new-feature-panel/conversation-opener/__tests__/modal.spec.tsx
index d8cdc56849..e41079e66a 100644
--- a/web/app/components/base/features/new-feature-panel/conversation-opener/__tests__/modal.spec.tsx
+++ b/web/app/components/base/features/new-feature-panel/conversation-opener/__tests__/modal.spec.tsx
@@ -146,7 +146,7 @@ describe('OpeningSettingModal', () => {
       />,
     )
 
-    const closeButton = screen.getByTestId('close-modal')
+    const closeButton = screen.getByRole('button', { name: 'common.operation.close' })
     await userEvent.click(closeButton)
 
     expect(onCancel).toHaveBeenCalled()
@@ -162,7 +162,7 @@ describe('OpeningSettingModal', () => {
       />,
     )
 
-    const closeButton = screen.getByTestId('close-modal')
+    const closeButton = screen.getByRole('button', { name: 'common.operation.close' })
     closeButton.focus()
     await userEvent.keyboard('{Enter}')
 
@@ -179,9 +179,9 @@ describe('OpeningSettingModal', () => {
       />,
     )
 
-    const closeButton = screen.getByTestId('close-modal')
+    const closeButton = screen.getByRole('button', { name: 'common.operation.close' })
     closeButton.focus()
-    fireEvent.keyDown(closeButton, { key: ' ' })
+    await userEvent.keyboard(' ')
 
     expect(onCancel).toHaveBeenCalledTimes(1)
   })
@@ -196,7 +196,7 @@ describe('OpeningSettingModal', () => {
       />,
     )
 
-    const closeButton = screen.getByTestId('close-modal')
+    const closeButton = screen.getByRole('button', { name: 'common.operation.close' })
     closeButton.focus()
     fireEvent.keyDown(closeButton, { key: 'Escape' })
 
@@ -369,7 +369,7 @@ describe('OpeningSettingModal', () => {
     expect(screen.getByTestId('opener-input-section')).toBeInTheDocument()
     expect(screen.getByTestId('opener-questions-section')).toBeInTheDocument()
     expect(screen.getByText(/openingStatement\.editorTitle/)).toBeInTheDocument()
-    expect(screen.getByTestId('opening-questions-tooltip')).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: /openingStatement\.openingQuestionDescription/ })).toBeInTheDocument()
     expect(screen.queryByText(/openingStatement\.openingQuestionDescription/)).not.toBeInTheDocument()
   })
 
@@ -383,7 +383,7 @@ describe('OpeningSettingModal', () => {
     )
 
     act(() => {
-      fireEvent.mouseEnter(screen.getByTestId('opening-questions-tooltip'))
+      fireEvent.mouseEnter(screen.getByRole('button', { name: /openingStatement\.openingQuestionDescription/ }))
     })
 
     expect(screen.getByText(/openingStatement\.openingQuestionDescription/)).toBeInTheDocument()
diff --git a/web/app/components/base/features/new-feature-panel/conversation-opener/modal.tsx b/web/app/components/base/features/new-feature-panel/conversation-opener/modal.tsx
index f69b507115..fb2f341e64 100644
--- a/web/app/components/base/features/new-feature-panel/conversation-opener/modal.tsx
+++ b/web/app/components/base/features/new-feature-panel/conversation-opener/modal.tsx
@@ -4,7 +4,6 @@ import type { PromptVariable } from '@/models/debug'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
 import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { useBoolean } from 'ahooks'
 import { produce } from 'immer'
 import * as React from 'react'
@@ -14,6 +13,7 @@ import { ReactSortable } from 'react-sortablejs'
 import ConfirmAddVar from '@/app/components/app/configuration/config-prompt/confirm-add-var'
 import { getInputKeys } from '@/app/components/base/block-input'
 import Divider from '@/app/components/base/divider'
+import { Infotip } from '@/app/components/base/infotip'
 import PromptEditor from '@/app/components/base/prompt-editor'
 import { checkKeys, getNewVar } from '@/utils/var'
 
@@ -117,24 +117,14 @@ const OpeningSettingModal = ({
             <div className="text-sm font-medium text-text-primary">
               {t('openingStatement.openingQuestion', { ns: 'appDebug' })}
             </div>
-            <Tooltip>
-              <TooltipTrigger
-                delay={0}
-                render={(
-                  <button
-                    type="button"
-                    className="flex items-center rounded-sm p-px text-text-quaternary hover:text-text-tertiary"
-                    data-testid="opening-questions-tooltip"
-                    aria-label={t('openingStatement.openingQuestionDescription', { ns: 'appDebug' })}
-                  >
-                    <span className="i-ri-question-line h-3.5 w-3.5" />
-                  </button>
-                )}
-              />
-              <TooltipContent className="max-w-[220px] system-sm-regular text-text-secondary">
-                {t('openingStatement.openingQuestionDescription', { ns: 'appDebug' })}
-              </TooltipContent>
-            </Tooltip>
+            <Infotip
+              aria-label={t('openingStatement.openingQuestionDescription', { ns: 'appDebug' })}
+              className="h-3.5 w-3.5"
+              popupClassName="max-w-[220px] system-sm-regular text-text-secondary"
+              delay={0}
+            >
+              {t('openingStatement.openingQuestionDescription', { ns: 'appDebug' })}
+            </Infotip>
           </div>
           <div className="text-xs leading-[18px] font-medium text-text-tertiary">
             {tempSuggestedQuestions.length}
@@ -227,21 +217,14 @@ const OpeningSettingModal = ({
       <DialogContent className="mt-14 w-[640px] max-w-none rounded-2xl bg-components-panel-bg-blur p-6">
         <div className="mb-6 flex items-center justify-between">
           <div className="title-2xl-semi-bold text-text-primary">{t('feature.conversationOpener.title', { ns: 'appDebug' })}</div>
-          <div
-            className="cursor-pointer p-1"
+          <button
+            type="button"
+            aria-label={t('operation.close', { ns: 'common' })}
+            className="cursor-pointer border-none bg-transparent p-1 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
             onClick={onCancel}
-            data-testid="close-modal"
-            role="button"
-            tabIndex={0}
-            onKeyDown={(e) => {
-              if (e.key === 'Enter' || e.key === ' ') {
-                e.preventDefault()
-                onCancel()
-              }
-            }}
           >
-            <span className="i-ri-close-line h-4 w-4 text-text-tertiary" />
-          </div>
+            <span className="i-ri-close-line h-4 w-4 text-text-tertiary" aria-hidden="true" />
+          </button>
         </div>
         <div className="mb-8 space-y-4">
           <div
diff --git a/web/app/components/base/features/new-feature-panel/dialog-wrapper.tsx b/web/app/components/base/features/new-feature-panel/dialog-wrapper.tsx
deleted file mode 100644
index d3e0814777..0000000000
--- a/web/app/components/base/features/new-feature-panel/dialog-wrapper.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import type { ReactNode } from 'react'
-import { Dialog, DialogPanel, Transition, TransitionChild } from '@headlessui/react'
-import { cn } from '@langgenius/dify-ui/cn'
-import { Fragment, useCallback } from 'react'
-
-type DialogProps = {
-  className?: string
-  children: ReactNode
-  show: boolean
-  onClose?: () => void
-  inWorkflow?: boolean
-}
-
-const DialogWrapper = ({
-  className,
-  children,
-  show,
-  onClose,
-  inWorkflow = true,
-}: DialogProps) => {
-  const close = useCallback(() => onClose?.(), [onClose])
-  return (
-    <Transition appear show={show} as={Fragment}>
-      <Dialog as="div" className="relative z-40" onClose={close}>
-        <TransitionChild>
-          <div className={cn(
-            'fixed inset-0 bg-black/25',
-            'data-closed:opacity-0',
-            'data-enter:opacity-100 data-enter:duration-300 data-enter:ease-out',
-            'data-leave:opacity-0 data-leave:duration-200 data-leave:ease-in',
-          )}
-          />
-        </TransitionChild>
-
-        <div className="fixed inset-0">
-          <div className={cn('flex min-h-full flex-col items-end justify-center pb-2', inWorkflow ? 'pt-[112px]' : 'pt-[64px] pr-2')} data-testid="dialog-layout-container">
-            <TransitionChild>
-              <DialogPanel className={cn(
-                'relative flex h-0 w-[420px] grow flex-col overflow-hidden border-components-panel-border bg-components-panel-bg-alt p-0 text-left align-middle shadow-xl transition-all',
-                inWorkflow ? 'rounded-l-2xl border-t-[0.5px] border-b-[0.5px] border-l-[0.5px]' : 'rounded-2xl border-[0.5px]',
-                'data-closed:scale-95 data-closed:opacity-0',
-                'data-enter:scale-100 data-enter:opacity-100 data-enter:duration-300 data-enter:ease-out',
-                'data-leave:scale-95 data-leave:opacity-0 data-leave:duration-200 data-leave:ease-in',
-                className,
-              )}
-              >
-                {children}
-              </DialogPanel>
-            </TransitionChild>
-          </div>
-        </div>
-      </Dialog>
-    </Transition>
-  )
-}
-
-export default DialogWrapper
diff --git a/web/app/components/base/features/new-feature-panel/feature-card.tsx b/web/app/components/base/features/new-feature-panel/feature-card.tsx
index 0c25a514fe..953487352c 100644
--- a/web/app/components/base/features/new-feature-panel/feature-card.tsx
+++ b/web/app/components/base/features/new-feature-panel/feature-card.tsx
@@ -1,9 +1,6 @@
 import { Switch } from '@langgenius/dify-ui/switch'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
-import {
-  RiQuestionLine,
-} from '@remixicon/react'
 import * as React from 'react'
+import { Infotip } from '@/app/components/base/infotip'
 
 type Props = {
   icon: any
@@ -41,16 +38,12 @@ const FeatureCard = ({
         <div className="flex grow items-center system-sm-semibold text-text-secondary">
           {title}
           {tooltip && (
-            <Tooltip>
-              <TooltipTrigger
-                render={(
-                  <div className="ml-0.5 p-px"><RiQuestionLine className="h-3.5 w-3.5 text-text-quaternary" /></div>
-                )}
-              />
-              <TooltipContent>
-                {tooltip}
-              </TooltipContent>
-            </Tooltip>
+            <Infotip
+              aria-label={typeof tooltip === 'string' ? tooltip : String(title)}
+              className="ml-0.5 h-3.5 w-3.5"
+            >
+              {tooltip}
+            </Infotip>
           )}
         </div>
         <Switch disabled={disabled} className="shrink-0" onCheckedChange={state => onChange?.(state)} checked={value} />
diff --git a/web/app/components/base/features/new-feature-panel/feature-panel-drawer.tsx b/web/app/components/base/features/new-feature-panel/feature-panel-drawer.tsx
new file mode 100644
index 0000000000..42a89a156d
--- /dev/null
+++ b/web/app/components/base/features/new-feature-panel/feature-panel-drawer.tsx
@@ -0,0 +1,60 @@
+import type { ReactNode } from 'react'
+import { cn } from '@langgenius/dify-ui/cn'
+import {
+  Drawer,
+  DrawerBackdrop,
+  DrawerContent,
+  DrawerPopup,
+  DrawerPortal,
+  DrawerViewport,
+} from '@langgenius/dify-ui/drawer'
+import { useCallback } from 'react'
+
+type FeaturePanelDrawerProps = {
+  className?: string
+  children: ReactNode
+  show: boolean
+  onClose?: () => void
+  inWorkflow?: boolean
+}
+
+export function FeaturePanelDrawer({
+  className,
+  children,
+  show,
+  onClose,
+  inWorkflow = true,
+}: FeaturePanelDrawerProps) {
+  const close = useCallback(() => onClose?.(), [onClose])
+
+  return (
+    <Drawer
+      open={show}
+      swipeDirection="right"
+      onOpenChange={(open) => {
+        if (!open)
+          close()
+      }}
+    >
+      <DrawerPortal>
+        <DrawerBackdrop className="bg-black/25" />
+        <DrawerViewport data-testid="feature-panel-drawer-layout">
+          <DrawerPopup
+            className={cn(
+              'border-components-panel-border bg-components-panel-bg-alt p-0 text-left align-middle',
+              'data-[swipe-direction=right]:!h-auto data-[swipe-direction=right]:!w-[420px] data-[swipe-direction=right]:!max-w-[calc(100vw-2rem)]',
+              inWorkflow
+                ? 'data-[swipe-direction=right]:!top-[112px] data-[swipe-direction=right]:!right-0 data-[swipe-direction=right]:!bottom-2 data-[swipe-direction=right]:!rounded-l-2xl data-[swipe-direction=right]:!rounded-r-none data-[swipe-direction=right]:!border-t-[0.5px] data-[swipe-direction=right]:!border-r-0 data-[swipe-direction=right]:!border-b-[0.5px] data-[swipe-direction=right]:!border-l-[0.5px]'
+                : 'data-[swipe-direction=right]:!top-[64px] data-[swipe-direction=right]:!right-2 data-[swipe-direction=right]:!bottom-2 data-[swipe-direction=right]:!rounded-2xl data-[swipe-direction=right]:!border-[0.5px]',
+              className,
+            )}
+          >
+            <DrawerContent className="flex min-h-0 flex-1 touch-auto flex-col overflow-hidden p-0 pb-0">
+              {children}
+            </DrawerContent>
+          </DrawerPopup>
+        </DrawerViewport>
+      </DrawerPortal>
+    </Drawer>
+  )
+}
diff --git a/web/app/components/base/features/new-feature-panel/file-upload/__tests__/setting-content.spec.tsx b/web/app/components/base/features/new-feature-panel/file-upload/__tests__/setting-content.spec.tsx
index 4b26c411e3..92841a2e04 100644
--- a/web/app/components/base/features/new-feature-panel/file-upload/__tests__/setting-content.spec.tsx
+++ b/web/app/components/base/features/new-feature-panel/file-upload/__tests__/setting-content.spec.tsx
@@ -120,7 +120,7 @@ describe('SettingContent', () => {
     const onClose = vi.fn()
     renderWithProvider({ onClose })
 
-    const closeIconButton = screen.getByTestId('close-setting-modal')
+    const closeIconButton = screen.getByRole('button', { name: 'common.operation.close' })
     expect(closeIconButton).toBeInTheDocument()
     if (!closeIconButton)
       throw new Error('Close icon button should exist')
@@ -134,7 +134,7 @@ describe('SettingContent', () => {
     const onClose = vi.fn()
     renderWithProvider({ onClose })
 
-    const closeIconButton = screen.getByTestId('close-setting-modal')
+    const closeIconButton = screen.getByRole('button', { name: 'common.operation.close' })
     closeIconButton.focus()
     await userEvent.keyboard('{Enter}')
     expect(onClose).toHaveBeenCalledTimes(1)
@@ -144,9 +144,9 @@ describe('SettingContent', () => {
     const onClose = vi.fn()
     renderWithProvider({ onClose })
 
-    const closeIconButton = screen.getByTestId('close-setting-modal')
+    const closeIconButton = screen.getByRole('button', { name: 'common.operation.close' })
     closeIconButton.focus()
-    fireEvent.keyDown(closeIconButton, { key: ' ' })
+    await userEvent.keyboard(' ')
     expect(onClose).toHaveBeenCalledTimes(1)
   })
 
@@ -154,7 +154,7 @@ describe('SettingContent', () => {
     const onClose = vi.fn()
     renderWithProvider({ onClose })
 
-    const closeIconButton = screen.getByTestId('close-setting-modal')
+    const closeIconButton = screen.getByRole('button', { name: 'common.operation.close' })
     closeIconButton.focus()
     fireEvent.keyDown(closeIconButton, { key: 'Escape' })
 
diff --git a/web/app/components/base/features/new-feature-panel/file-upload/setting-content.tsx b/web/app/components/base/features/new-feature-panel/file-upload/setting-content.tsx
index 393b66ba19..10d83f3a8f 100644
--- a/web/app/components/base/features/new-feature-panel/file-upload/setting-content.tsx
+++ b/web/app/components/base/features/new-feature-panel/file-upload/setting-content.tsx
@@ -58,21 +58,14 @@ const SettingContent = ({
     <>
       <div className="mb-4 flex items-center justify-between">
         <div className="system-xl-semibold text-text-primary">{!imageUpload ? t('feature.fileUpload.modalTitle', { ns: 'appDebug' }) : t('feature.imageUpload.modalTitle', { ns: 'appDebug' })}</div>
-        <div
-          className="cursor-pointer p-1"
+        <button
+          type="button"
+          aria-label={t('operation.close', { ns: 'common' })}
+          className="cursor-pointer border-none bg-transparent p-1 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
           onClick={onClose}
-          data-testid="close-setting-modal"
-          role="button"
-          tabIndex={0}
-          onKeyDown={(e) => {
-            if (e.key === 'Enter' || e.key === ' ') {
-              e.preventDefault()
-              onClose()
-            }
-          }}
         >
-          <span className="i-ri-close-line h-4 w-4 text-text-tertiary" />
-        </div>
+          <span className="i-ri-close-line h-4 w-4 text-text-tertiary" aria-hidden="true" />
+        </button>
       </div>
       <FileUploadSetting
         isMultiple
diff --git a/web/app/components/base/features/new-feature-panel/index.tsx b/web/app/components/base/features/new-feature-panel/index.tsx
index 84c7715577..61e961c82b 100644
--- a/web/app/components/base/features/new-feature-panel/index.tsx
+++ b/web/app/components/base/features/new-feature-panel/index.tsx
@@ -1,13 +1,13 @@
 import type { OnFeaturesChange } from '@/app/components/base/features/types'
 import type { InputVar } from '@/app/components/workflow/types'
 import type { PromptVariable } from '@/models/debug'
-import { RiCloseLine } from '@remixicon/react'
+import { DrawerCloseButton } from '@langgenius/dify-ui/drawer'
 import { useTranslation } from 'react-i18next'
 import AnnotationReply from '@/app/components/base/features/new-feature-panel/annotation-reply'
 
 import Citation from '@/app/components/base/features/new-feature-panel/citation'
 import ConversationOpener from '@/app/components/base/features/new-feature-panel/conversation-opener'
-import DialogWrapper from '@/app/components/base/features/new-feature-panel/dialog-wrapper'
+import { FeaturePanelDrawer } from '@/app/components/base/features/new-feature-panel/feature-panel-drawer'
 import FileUpload from '@/app/components/base/features/new-feature-panel/file-upload'
 import FollowUp from '@/app/components/base/features/new-feature-panel/follow-up'
 import ImageUpload from '@/app/components/base/features/new-feature-panel/image-upload'
@@ -48,7 +48,7 @@ const NewFeaturePanel = ({
   const { data: text2speechDefaultModel } = useDefaultModel(ModelTypeEnum.tts)
 
   return (
-    <DialogWrapper
+    <FeaturePanelDrawer
       show={show}
       onClose={onClose}
       inWorkflow={inWorkflow}
@@ -60,7 +60,10 @@ const NewFeaturePanel = ({
             <div className="system-xl-semibold text-text-primary">{t('common.features', { ns: 'workflow' })}</div>
             <div className="body-xs-regular text-text-tertiary">{t('common.featuresDescription', { ns: 'workflow' })}</div>
           </div>
-          <div className="h-8 w-8 cursor-pointer p-2" onClick={onClose}><RiCloseLine className="h-4 w-4 text-text-tertiary" /></div>
+          <DrawerCloseButton
+            aria-label={t('operation.close', { ns: 'common' })}
+            className="h-8 w-8 p-2"
+          />
         </div>
         {/* list */}
         <div className="grow basis-0 overflow-y-auto px-4 pb-4">
@@ -96,7 +99,7 @@ const NewFeaturePanel = ({
           )}
         </div>
       </div>
-    </DialogWrapper>
+    </FeaturePanelDrawer>
   )
 }
 
diff --git a/web/app/components/base/features/new-feature-panel/moderation/__tests__/moderation-setting-modal.spec.tsx b/web/app/components/base/features/new-feature-panel/moderation/__tests__/moderation-setting-modal.spec.tsx
index da4c658080..a42766c349 100644
--- a/web/app/components/base/features/new-feature-panel/moderation/__tests__/moderation-setting-modal.spec.tsx
+++ b/web/app/components/base/features/new-feature-panel/moderation/__tests__/moderation-setting-modal.spec.tsx
@@ -1,5 +1,6 @@
 import type { ModerationConfig } from '@/models/debug'
 import { act, fireEvent, render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
 import * as i18n from 'react-i18next'
 import ModerationSettingModal from '../moderation-setting-modal'
 
@@ -181,10 +182,10 @@ describe('ModerationSettingModal', () => {
       />,
     )
 
-    const closeButton = document.querySelector('div[role="button"][tabindex="0"]') as HTMLElement
-    expect(closeButton)!.toBeInTheDocument()
+    const user = userEvent.setup()
+    const closeButton = screen.getByRole('button', { name: 'common.operation.close' })
     closeButton.focus()
-    fireEvent.keyDown(closeButton, { key: 'Enter' })
+    await user.keyboard('{Enter}')
 
     expect(onCancel).toHaveBeenCalledTimes(1)
   })
@@ -199,10 +200,10 @@ describe('ModerationSettingModal', () => {
       />,
     )
 
-    const closeButton = document.querySelector('div[role="button"][tabindex="0"]') as HTMLElement
-    expect(closeButton)!.toBeInTheDocument()
+    const user = userEvent.setup()
+    const closeButton = screen.getByRole('button', { name: 'common.operation.close' })
     closeButton.focus()
-    fireEvent.keyDown(closeButton, { key: ' ' })
+    await user.keyboard(' ')
 
     expect(onCancel).toHaveBeenCalledTimes(1)
   })
@@ -217,8 +218,7 @@ describe('ModerationSettingModal', () => {
       />,
     )
 
-    const closeButton = document.querySelector('div[role="button"][tabindex="0"]') as HTMLElement
-    expect(closeButton)!.toBeInTheDocument()
+    const closeButton = screen.getByRole('button', { name: 'common.operation.close' })
     closeButton.focus()
     fireEvent.keyDown(closeButton, { key: 'Escape' })
 
diff --git a/web/app/components/base/features/new-feature-panel/moderation/form-generation.tsx b/web/app/components/base/features/new-feature-panel/moderation/form-generation.tsx
index 0392aa2b55..d78b11a12c 100644
--- a/web/app/components/base/features/new-feature-panel/moderation/form-generation.tsx
+++ b/web/app/components/base/features/new-feature-panel/moderation/form-generation.tsx
@@ -69,7 +69,7 @@ const FormGeneration: FC<FormGenerationProps> = ({
                     <SelectTrigger className="w-full">
                       {selectedOption?.name ?? form.placeholder}
                     </SelectTrigger>
-                    <SelectContent popupClassName="z-102 w-(--anchor-width)">
+                    <SelectContent>
                       {selectOptions.map(option => (
                         <SelectItem key={option.value} value={option.value}>
                           <SelectItemText>{option.name}</SelectItemText>
diff --git a/web/app/components/base/features/new-feature-panel/moderation/moderation-setting-modal.tsx b/web/app/components/base/features/new-feature-panel/moderation/moderation-setting-modal.tsx
index 0ae2f458e1..7ebe539a3d 100644
--- a/web/app/components/base/features/new-feature-panel/moderation/moderation-setting-modal.tsx
+++ b/web/app/components/base/features/new-feature-panel/moderation/moderation-setting-modal.tsx
@@ -3,12 +3,11 @@ import type { CodeBasedExtensionItem } from '@/models/common'
 import type { ModerationConfig, ModerationContentConfig } from '@/models/debug'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
-import { noop } from 'es-toolkit/function'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Divider from '@/app/components/base/divider'
-import Modal from '@/app/components/base/modal'
 import ApiBasedExtensionSelector from '@/app/components/header/account-setting/api-based-extension-page/selector'
 import { ACCOUNT_SETTING_TAB } from '@/app/components/header/account-setting/constants'
 import { CustomConfigurationStatusEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
@@ -226,165 +225,158 @@ const ModerationSettingModal: FC<ModerationSettingModalProps> = ({
   }
 
   return (
-    <Modal
-      isShow
-      onClose={noop}
-      className="mt-14! w-[600px]! max-w-none! p-6!"
-    >
-      <div className="flex items-center justify-between">
-        <div className="title-2xl-semi-bold text-text-primary">{t('feature.moderation.modal.title', { ns: 'appDebug' })}</div>
-        <div
-          role="button"
-          tabIndex={0}
-          className="cursor-pointer p-1"
-          onClick={onCancel}
-          onKeyDown={(e) => {
-            if (e.key === 'Enter' || e.key === ' ') {
-              e.preventDefault()
-              onCancel()
-            }
-          }}
-        >
-          <span className="i-ri-close-line h-4 w-4 text-text-tertiary" />
+    <Dialog open>
+      <DialogContent className="mt-14! w-[600px]! max-w-none! border-none p-6! text-left align-middle">
+
+        <div className="flex items-center justify-between">
+          <div className="title-2xl-semi-bold text-text-primary">{t('feature.moderation.modal.title', { ns: 'appDebug' })}</div>
+          <button
+            type="button"
+            aria-label={t('operation.close', { ns: 'common' })}
+            className="cursor-pointer border-none bg-transparent p-1 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+            onClick={onCancel}
+          >
+            <span className="i-ri-close-line h-4 w-4 text-text-tertiary" aria-hidden="true" />
+          </button>
         </div>
-      </div>
-      <div className="py-2">
-        <div className="text-sm leading-9 font-medium text-text-primary">
-          {t('feature.moderation.modal.provider.title', { ns: 'appDebug' })}
-        </div>
-        <div className="grid grid-cols-3 gap-2.5">
-          {
-            providers.map(provider => (
-              <div
-                key={provider.key}
-                className={cn(
-                  'flex h-8 cursor-default items-center rounded-md border border-components-option-card-option-border bg-components-option-card-option-bg px-2 system-sm-regular text-text-secondary',
-                  localeData.type !== provider.key && 'cursor-pointer hover:border-components-option-card-option-border-hover hover:bg-components-option-card-option-bg-hover hover:shadow-xs',
-                  localeData.type === provider.key && 'border-[1.5px] border-components-option-card-option-selected-border bg-components-option-card-option-selected-bg system-sm-medium shadow-xs',
-                  localeData.type === 'openai_moderation' && provider.key === 'openai_moderation' && !isOpenAIProviderConfigured && 'text-text-disabled',
-                )}
-                onClick={() => handleDataTypeChange(provider.key)}
-              >
-                <div className={cn(
-                  'mr-2 h-4 w-4 rounded-full border border-components-radio-border bg-components-radio-bg shadow-xs',
-                  localeData.type === provider.key && 'border-[5px] border-components-radio-border-checked',
-                )}
+        <div className="py-2">
+          <div className="text-sm leading-9 font-medium text-text-primary">
+            {t('feature.moderation.modal.provider.title', { ns: 'appDebug' })}
+          </div>
+          <div className="grid grid-cols-3 gap-2.5">
+            {
+              providers.map(provider => (
+                <div
+                  key={provider.key}
+                  className={cn(
+                    'flex h-8 cursor-default items-center rounded-md border border-components-option-card-option-border bg-components-option-card-option-bg px-2 system-sm-regular text-text-secondary',
+                    localeData.type !== provider.key && 'cursor-pointer hover:border-components-option-card-option-border-hover hover:bg-components-option-card-option-bg-hover hover:shadow-xs',
+                    localeData.type === provider.key && 'border-[1.5px] border-components-option-card-option-selected-border bg-components-option-card-option-selected-bg system-sm-medium shadow-xs',
+                    localeData.type === 'openai_moderation' && provider.key === 'openai_moderation' && !isOpenAIProviderConfigured && 'text-text-disabled',
+                  )}
+                  onClick={() => handleDataTypeChange(provider.key)}
                 >
+                  <div className={cn(
+                    'mr-2 h-4 w-4 rounded-full border border-components-radio-border bg-components-radio-bg shadow-xs',
+                    localeData.type === provider.key && 'border-[5px] border-components-radio-border-checked',
+                  )}
+                  >
+                  </div>
+                  {provider.name}
+                </div>
+              ))
+            }
+          </div>
+          {
+            !isLoading && !isOpenAIProviderConfigured && localeData.type === 'openai_moderation' && (
+              <div className="mt-2 flex items-center rounded-lg border border-[#FEF0C7] bg-[#FFFAEB] px-3 py-2">
+                <span className="mr-1 i-custom-vender-line-general-info-circle h-4 w-4 text-[#F79009]" />
+                <div className="flex items-center text-xs font-medium text-gray-700">
+                  {t('feature.moderation.modal.openaiNotConfig.before', { ns: 'appDebug' })}
+                  <span
+                    className="cursor-pointer text-primary-600"
+                    onClick={handleOpenSettingsModal}
+                  >
+                  &nbsp;
+                    {t('settings.provider', { ns: 'common' })}
+&nbsp;
+                  </span>
+                  {t('feature.moderation.modal.openaiNotConfig.after', { ns: 'appDebug' })}
                 </div>
-                {provider.name}
               </div>
-            ))
+            )
           }
         </div>
         {
-          !isLoading && !isOpenAIProviderConfigured && localeData.type === 'openai_moderation' && (
-            <div className="mt-2 flex items-center rounded-lg border border-[#FEF0C7] bg-[#FFFAEB] px-3 py-2">
-              <span className="mr-1 i-custom-vender-line-general-info-circle h-4 w-4 text-[#F79009]" />
-              <div className="flex items-center text-xs font-medium text-gray-700">
-                {t('feature.moderation.modal.openaiNotConfig.before', { ns: 'appDebug' })}
-                <span
-                  className="cursor-pointer text-primary-600"
-                  onClick={handleOpenSettingsModal}
-                >
-                  &nbsp;
-                  {t('settings.provider', { ns: 'common' })}
-&nbsp;
-                </span>
-                {t('feature.moderation.modal.openaiNotConfig.after', { ns: 'appDebug' })}
+          localeData.type === 'keywords' && (
+            <div className="py-2">
+              <div className="mb-1 text-sm font-medium text-text-primary">{t('feature.moderation.modal.provider.keywords', { ns: 'appDebug' })}</div>
+              <div className="mb-2 text-xs text-text-tertiary">{t('feature.moderation.modal.keywords.tip', { ns: 'appDebug' })}</div>
+              <div className="relative h-[88px] rounded-lg bg-components-input-bg-normal px-3 py-2">
+                <textarea
+                  value={localeData.config?.keywords || ''}
+                  onChange={handleDataKeywordsChange}
+                  className="block h-full w-full resize-none appearance-none bg-transparent text-sm text-text-secondary outline-hidden"
+                  placeholder={t('feature.moderation.modal.keywords.placeholder', { ns: 'appDebug' }) || ''}
+                />
+                <div className="absolute right-2 bottom-2 flex h-5 items-center rounded-md bg-background-section px-1 text-xs font-medium text-text-quaternary">
+                  <span>{(localeData.config?.keywords || '').split('\n').filter(Boolean).length}</span>
+                  /
+                  <span className="text-text-tertiary">
+                    100
+                    {t('feature.moderation.modal.keywords.line', { ns: 'appDebug' })}
+                  </span>
+                </div>
               </div>
             </div>
           )
         }
-      </div>
-      {
-        localeData.type === 'keywords' && (
-          <div className="py-2">
-            <div className="mb-1 text-sm font-medium text-text-primary">{t('feature.moderation.modal.provider.keywords', { ns: 'appDebug' })}</div>
-            <div className="mb-2 text-xs text-text-tertiary">{t('feature.moderation.modal.keywords.tip', { ns: 'appDebug' })}</div>
-            <div className="relative h-[88px] rounded-lg bg-components-input-bg-normal px-3 py-2">
-              <textarea
-                value={localeData.config?.keywords || ''}
-                onChange={handleDataKeywordsChange}
-                className="block h-full w-full resize-none appearance-none bg-transparent text-sm text-text-secondary outline-hidden"
-                placeholder={t('feature.moderation.modal.keywords.placeholder', { ns: 'appDebug' }) || ''}
-              />
-              <div className="absolute right-2 bottom-2 flex h-5 items-center rounded-md bg-background-section px-1 text-xs font-medium text-text-quaternary">
-                <span>{(localeData.config?.keywords || '').split('\n').filter(Boolean).length}</span>
-                /
-                <span className="text-text-tertiary">
-                  100
-                  {t('feature.moderation.modal.keywords.line', { ns: 'appDebug' })}
-                </span>
+        {
+          localeData.type === 'api' && (
+            <div className="py-2">
+              <div className="flex h-9 items-center justify-between">
+                <div className="text-sm font-medium text-text-primary">{t('apiBasedExtension.selector.title', { ns: 'common' })}</div>
+                <a
+                  href={docLink('/use-dify/workspace/api-extension/api-extension')}
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  className="group flex items-center text-xs text-text-tertiary hover:text-primary-600"
+                >
+                  <span className="mr-1 i-custom-vender-line-education-book-open-01 h-3 w-3 text-text-tertiary group-hover:text-primary-600" />
+                  {t('apiBasedExtension.link', { ns: 'common' })}
+                </a>
               </div>
+              <ApiBasedExtensionSelector
+                value={localeData.config?.api_based_extension_id || ''}
+                onChange={handleDataApiBasedChange}
+              />
             </div>
-          </div>
-        )
-      }
-      {
-        localeData.type === 'api' && (
-          <div className="py-2">
-            <div className="flex h-9 items-center justify-between">
-              <div className="text-sm font-medium text-text-primary">{t('apiBasedExtension.selector.title', { ns: 'common' })}</div>
-              <a
-                href={docLink('/use-dify/workspace/api-extension/api-extension')}
-                target="_blank"
-                rel="noopener noreferrer"
-                className="group flex items-center text-xs text-text-tertiary hover:text-primary-600"
-              >
-                <span className="mr-1 i-custom-vender-line-education-book-open-01 h-3 w-3 text-text-tertiary group-hover:text-primary-600" />
-                {t('apiBasedExtension.link', { ns: 'common' })}
-              </a>
-            </div>
-            <ApiBasedExtensionSelector
-              value={localeData.config?.api_based_extension_id || ''}
-              onChange={handleDataApiBasedChange}
+          )
+        }
+        {
+          systemTypes.findIndex(t => t === localeData.type) < 0
+          && currentProvider?.form_schema
+          && (
+            <FormGeneration
+              forms={currentProvider?.form_schema}
+              value={localeData.config}
+              onChange={handleDataExtraChange}
             />
-          </div>
-        )
-      }
-      {
-        systemTypes.findIndex(t => t === localeData.type) < 0
-        && currentProvider?.form_schema
-        && (
-          <FormGeneration
-            forms={currentProvider?.form_schema}
-            value={localeData.config}
-            onChange={handleDataExtraChange}
-          />
-        )
-      }
-      <Divider bgStyle="gradient" className="my-3 h-px" />
-      <ModerationContent
-        title={t('feature.moderation.modal.content.input', { ns: 'appDebug' }) || ''}
-        config={localeData.config?.inputs_config || { enabled: false, preset_response: '' }}
-        onConfigChange={config => handleDataContentChange('inputs_config', config)}
-        info={(localeData.type === 'api' && t('feature.moderation.modal.content.fromApi', { ns: 'appDebug' })) || ''}
-        showPreset={localeData.type !== 'api'}
-      />
-      <ModerationContent
-        title={t('feature.moderation.modal.content.output', { ns: 'appDebug' }) || ''}
-        config={localeData.config?.outputs_config || { enabled: false, preset_response: '' }}
-        onConfigChange={config => handleDataContentChange('outputs_config', config)}
-        info={(localeData.type === 'api' && t('feature.moderation.modal.content.fromApi', { ns: 'appDebug' })) || ''}
-        showPreset={localeData.type !== 'api'}
-      />
-      <div className="mt-1 mb-8 text-xs font-medium text-text-tertiary">{t('feature.moderation.modal.content.condition', { ns: 'appDebug' })}</div>
-      <div className="flex items-center justify-end">
-        <Button
-          onClick={onCancel}
-          className="mr-2"
-        >
-          {t('operation.cancel', { ns: 'common' })}
-        </Button>
-        <Button
-          variant="primary"
-          onClick={handleSave}
-          disabled={localeData.type === 'openai_moderation' && !isOpenAIProviderConfigured}
-        >
-          {t('operation.save', { ns: 'common' })}
-        </Button>
-      </div>
-    </Modal>
+          )
+        }
+        <Divider bgStyle="gradient" className="my-3 h-px" />
+        <ModerationContent
+          title={t('feature.moderation.modal.content.input', { ns: 'appDebug' }) || ''}
+          config={localeData.config?.inputs_config || { enabled: false, preset_response: '' }}
+          onConfigChange={config => handleDataContentChange('inputs_config', config)}
+          info={(localeData.type === 'api' && t('feature.moderation.modal.content.fromApi', { ns: 'appDebug' })) || ''}
+          showPreset={localeData.type !== 'api'}
+        />
+        <ModerationContent
+          title={t('feature.moderation.modal.content.output', { ns: 'appDebug' }) || ''}
+          config={localeData.config?.outputs_config || { enabled: false, preset_response: '' }}
+          onConfigChange={config => handleDataContentChange('outputs_config', config)}
+          info={(localeData.type === 'api' && t('feature.moderation.modal.content.fromApi', { ns: 'appDebug' })) || ''}
+          showPreset={localeData.type !== 'api'}
+        />
+        <div className="mt-1 mb-8 text-xs font-medium text-text-tertiary">{t('feature.moderation.modal.content.condition', { ns: 'appDebug' })}</div>
+        <div className="flex items-center justify-end">
+          <Button
+            onClick={onCancel}
+            className="mr-2"
+          >
+            {t('operation.cancel', { ns: 'common' })}
+          </Button>
+          <Button
+            variant="primary"
+            onClick={handleSave}
+            disabled={localeData.type === 'openai_moderation' && !isOpenAIProviderConfigured}
+          >
+            {t('operation.save', { ns: 'common' })}
+          </Button>
+        </div>
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/components/base/features/new-feature-panel/text-to-speech/__tests__/param-config-content.spec.tsx b/web/app/components/base/features/new-feature-panel/text-to-speech/__tests__/param-config-content.spec.tsx
index 754bde98a6..06ed515efe 100644
--- a/web/app/components/base/features/new-feature-panel/text-to-speech/__tests__/param-config-content.spec.tsx
+++ b/web/app/components/base/features/new-feature-panel/text-to-speech/__tests__/param-config-content.spec.tsx
@@ -64,6 +64,9 @@ const renderWithProvider = (
   )
 }
 
+const getLanguageSelect = () => screen.getByRole('combobox', { name: /voice\.voiceSettings\.language/ })
+const getVoiceSelect = () => screen.getByRole('combobox', { name: /voice\.voiceSettings\.voice/ })
+
 describe('ParamConfigContent', () => {
   beforeEach(() => {
     vi.clearAllMocks()
@@ -110,29 +113,25 @@ describe('ParamConfigContent', () => {
 
       const languageLabel = screen.getByText(/voice\.voiceSettings\.language/)
       expect(languageLabel)!.toBeInTheDocument()
-      const tooltip = languageLabel.parentElement as HTMLElement
-      expect(tooltip.querySelector('svg'))!.toBeInTheDocument()
+      expect(screen.getByRole('button', { name: /voice\.voiceSettings\.resolutionTooltip/ }))!.toBeInTheDocument()
     })
 
     it('should display language listbox button', () => {
       renderWithProvider()
 
-      const buttons = screen.getAllByRole('button')
-      expect(buttons.length).toBeGreaterThanOrEqual(1)
+      expect(getLanguageSelect()).toBeInTheDocument()
     })
 
     it('should display current voice in listbox button', () => {
       renderWithProvider()
 
-      const buttons = screen.getAllByRole('button')
-      const voiceButton = buttons.find(btn => btn.textContent?.includes('Alloy'))
-      expect(voiceButton)!.toBeInTheDocument()
+      expect(getVoiceSelect()).toHaveTextContent('Alloy')
     })
 
     it('should render audition button when language has example', () => {
       renderWithProvider()
 
-      const auditionButton = screen.queryByTestId('audition-button')
+      const auditionButton = screen.queryByRole('group', { name: /appApi\.play|play/i })
       expect(auditionButton)!.toBeInTheDocument()
     })
 
@@ -144,7 +143,7 @@ describe('ParamConfigContent', () => {
 
       renderWithProvider()
 
-      const auditionButton = screen.queryByTestId('audition-button')
+      const auditionButton = screen.queryByRole('group', { name: /appApi\.play|play/i })
       expect(auditionButton).toBeNull()
     })
 
@@ -153,8 +152,7 @@ describe('ParamConfigContent', () => {
         text2speech: { enabled: true, language: '', voice: '', autoPlay: TtsAutoPlay.disabled },
       })
 
-      const buttons = screen.getAllByRole('button')
-      expect(buttons.length).toBeGreaterThan(0)
+      expect(getLanguageSelect()).toBeInTheDocument()
     })
 
     it('should render with no voice set and use first as default', () => {
@@ -162,9 +160,7 @@ describe('ParamConfigContent', () => {
         text2speech: { enabled: true, language: 'en-US', voice: 'nonexistent', autoPlay: TtsAutoPlay.disabled },
       })
 
-      const buttons = screen.getAllByRole('button')
-      const voiceButton = buttons.find(btn => btn.textContent?.includes('Alloy'))
-      expect(voiceButton)!.toBeInTheDocument()
+      expect(getVoiceSelect()).toHaveTextContent('Alloy')
     })
   })
 
@@ -240,10 +236,7 @@ describe('ParamConfigContent', () => {
     it('should open language listbox and show options', async () => {
       renderWithProvider()
 
-      const buttons = screen.getAllByRole('button')
-      const languageButton = buttons.find(btn => btn.textContent?.includes('voice.language.'))
-      expect(languageButton).toBeDefined()
-      await userEvent.click(languageButton!)
+      await userEvent.click(getLanguageSelect())
 
       const options = await screen.findAllByRole('option')
       expect(options.length).toBeGreaterThanOrEqual(2)
@@ -253,10 +246,7 @@ describe('ParamConfigContent', () => {
       const onChange = vi.fn()
       renderWithProvider({ onChange })
 
-      const buttons = screen.getAllByRole('button')
-      const languageButton = buttons.find(btn => btn.textContent?.includes('voice.language.'))
-      expect(languageButton).toBeDefined()
-      await userEvent.click(languageButton!)
+      await userEvent.click(getLanguageSelect())
       const options = await screen.findAllByRole('option')
       expect(options.length).toBeGreaterThan(1)
       await userEvent.click(options[1]!)
@@ -267,10 +257,7 @@ describe('ParamConfigContent', () => {
       const onChange = vi.fn()
       renderWithProvider({ onChange })
 
-      const buttons = screen.getAllByRole('button')
-      const voiceButton = buttons.find(btn => btn.textContent?.includes('Alloy'))
-      expect(voiceButton).toBeDefined()
-      await userEvent.click(voiceButton!)
+      await userEvent.click(getVoiceSelect())
       const options = await screen.findAllByRole('option')
       expect(options.length).toBeGreaterThan(1)
       await userEvent.click(options[1]!)
@@ -280,10 +267,7 @@ describe('ParamConfigContent', () => {
     it('should show selected language option in listbox', async () => {
       renderWithProvider()
 
-      const buttons = screen.getAllByRole('button')
-      const languageButton = buttons.find(btn => btn.textContent?.includes('voice.language.'))
-      expect(languageButton).toBeDefined()
-      await userEvent.click(languageButton!)
+      await userEvent.click(getLanguageSelect())
       const options = await screen.findAllByRole('option')
       expect(options.length).toBeGreaterThanOrEqual(1)
 
@@ -295,10 +279,7 @@ describe('ParamConfigContent', () => {
     it('should show selected voice option in listbox', async () => {
       renderWithProvider()
 
-      const buttons = screen.getAllByRole('button')
-      const voiceButton = buttons.find(btn => btn.textContent?.includes('Alloy'))
-      expect(voiceButton).toBeDefined()
-      await userEvent.click(voiceButton!)
+      await userEvent.click(getVoiceSelect())
       const options = await screen.findAllByRole('option')
       expect(options.length).toBeGreaterThanOrEqual(1)
 
@@ -321,11 +302,7 @@ describe('ParamConfigContent', () => {
       const placeholderTexts = screen.getAllByText(/placeholder\.select/)
       expect(placeholderTexts.length).toBeGreaterThanOrEqual(2)
 
-      const disabledButtons = screen
-        .getAllByRole('button')
-        .filter(button => button.hasAttribute('disabled') || button.getAttribute('aria-disabled') === 'true')
-
-      expect(disabledButtons.length).toBeGreaterThanOrEqual(1)
+      expect(getVoiceSelect()).toHaveAttribute('data-disabled')
     })
 
     it('should call useAppVoices with empty appId when pathname has no app segment', () => {
diff --git a/web/app/components/base/features/new-feature-panel/text-to-speech/param-config-content.tsx b/web/app/components/base/features/new-feature-panel/text-to-speech/param-config-content.tsx
index 199cbecccb..5f3c895054 100644
--- a/web/app/components/base/features/new-feature-panel/text-to-speech/param-config-content.tsx
+++ b/web/app/components/base/features/new-feature-panel/text-to-speech/param-config-content.tsx
@@ -1,16 +1,20 @@
 'use client'
 import type { OnFeaturesChange } from '@/app/components/base/features/types'
-import { Listbox, ListboxButton, ListboxOption, ListboxOptions, Transition } from '@headlessui/react'
-import { cn } from '@langgenius/dify-ui/cn'
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectItemIndicator,
+  SelectItemText,
+  SelectTrigger,
+} from '@langgenius/dify-ui/select'
 import { Switch } from '@langgenius/dify-ui/switch'
 import { produce } from 'immer'
-import * as React from 'react'
-import { Fragment } from 'react'
 import { useTranslation } from 'react-i18next'
 import { replace } from 'string-ts'
 import AudioBtn from '@/app/components/base/audio-btn'
 import { useFeatures, useFeaturesStore } from '@/app/components/base/features/hooks'
-import Tooltip from '@/app/components/base/tooltip'
+import { Infotip } from '@/app/components/base/infotip'
 import { languages } from '@/i18n-config/language'
 import { usePathname } from '@/next/navigation'
 import { useAppVoices } from '@/service/use-apps'
@@ -35,6 +39,9 @@ const VoiceParamConfig = ({
   const appId = (matched?.length && matched[1]) ? matched[1] : ''
   const text2speech = useFeatures(state => state.features.text2speech)
   const featuresStore = useFeaturesStore()
+  const formatLanguageName = (item: SelectOption) => {
+    return t(`voice.language.${replace(String(item.value), '-', '')}`, item.name, { ns: 'common' as const })
+  }
 
   let languageItem = languages.find(item => item.value === text2speech?.language)
   if (languages && !languageItem)
@@ -70,162 +77,92 @@ const VoiceParamConfig = ({
     <>
       <div className="mb-4 flex items-center justify-between">
         <div className="system-xl-semibold text-text-primary">{t('voice.voiceSettings.title', { ns: 'appDebug' })}</div>
-        <div
-          className="cursor-pointer p-1"
-          role="button"
-          tabIndex={0}
+        <button
+          type="button"
+          className="rounded-md border-none bg-transparent p-1 hover:bg-state-base-hover focus-visible:bg-state-base-hover focus-visible:outline-hidden"
           aria-label={t('appDebug:voice.voiceSettings.close')}
           onClick={onClose}
-          onKeyDown={(e) => {
-            if (e.key === 'Enter' || e.key === ' ') {
-              e.preventDefault()
-              onClose()
-            }
-          }}
         >
-          <span className="i-ri-close-line h-4 w-4 text-text-tertiary" />
-        </div>
+          <span aria-hidden className="i-ri-close-line h-4 w-4 text-text-tertiary" />
+        </button>
       </div>
       <div className="mb-3">
         <div className="mb-1 flex items-center py-1 system-sm-semibold text-text-secondary">
           {t('voice.voiceSettings.language', { ns: 'appDebug' })}
-          <Tooltip
-            popupContent={(
-              <div className="w-[180px]">
-                {t('voice.voiceSettings.resolutionTooltip', { ns: 'appDebug' }).split('\n').map(item => (
-                  <div key={item}>
-                    {item}
-                  </div>
-                ))}
+          <Infotip
+            aria-label={t('voice.voiceSettings.resolutionTooltip', { ns: 'appDebug' })}
+            popupClassName="w-[180px]"
+          >
+            {t('voice.voiceSettings.resolutionTooltip', { ns: 'appDebug' }).split('\n').map(item => (
+              <div key={item}>
+                {item}
               </div>
-            )}
-          />
+            ))}
+          </Infotip>
         </div>
-        <Listbox
-          value={languageItem}
-          onChange={(value: SelectOption) => {
+        <Select
+          value={languageItem ? String(languageItem.value) : null}
+          onValueChange={(nextValue) => {
+            if (!nextValue)
+              return
             handleChange({
-              language: String(value.value),
+              language: nextValue,
             })
           }}
         >
-          <div className="relative h-8">
-            <ListboxButton
-              className="h-full w-full cursor-pointer rounded-lg border-0 bg-components-input-bg-normal py-1.5 pr-10 pl-3 group-hover:bg-state-base-hover focus-visible:bg-state-base-hover focus-visible:outline-hidden sm:text-sm sm:leading-6"
-            >
-              <span className={cn('block truncate text-left text-text-secondary', !languageItem?.name && 'text-text-tertiary')}>
-                {languageItem?.name
-                  ? t(`voice.language.${replace(languageItem?.value ?? '', '-', '')}`, languageItem?.name, { ns: 'common' as const })
-                  : localLanguagePlaceholder}
-              </span>
-              <span className="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2">
-                <span className="i-heroicons-chevron-down-20-solid h-4 w-4 text-text-tertiary" aria-hidden="true" />
-              </span>
-            </ListboxButton>
-            <Transition
-              as={Fragment}
-              leave="transition ease-in duration-100"
-              leaveFrom="opacity-100"
-              leaveTo="opacity-0"
-            >
-
-              <ListboxOptions
-                className="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-md border-[0.5px] border-components-panel-border bg-components-panel-bg px-1 py-1 text-base shadow-lg focus:outline-hidden sm:text-sm"
-              >
-                {languages.map(item => (
-                  <ListboxOption
-                    key={item.value}
-                    className="relative cursor-pointer rounded-lg py-2 pr-9 pl-3 text-text-secondary select-none hover:bg-state-base-hover data-active:bg-state-base-active"
-                    value={item}
-                    disabled={false}
-                  >
-                    {({ /* active, */ selected }) => (
-                      <>
-                        <span
-                          className={cn('block', selected && 'font-normal')}
-                        >
-                          {t(`voice.language.${replace((item.value), '-', '')}`, item.name, { ns: 'common' as const })}
-                        </span>
-                        {(selected || item.value === text2speech?.language) && (
-                          <span
-                            className={cn('absolute inset-y-0 right-0 flex items-center pr-4 text-text-secondary')}
-                          >
-                            <span className="i-heroicons-check-20-solid h-4 w-4" aria-hidden="true" />
-                          </span>
-                        )}
-                      </>
-                    )}
-                  </ListboxOption>
-                ))}
-              </ListboxOptions>
-            </Transition>
-          </div>
-        </Listbox>
+          <SelectTrigger aria-label={t('voice.voiceSettings.language', { ns: 'appDebug' })} className="w-full">
+            {languageItem ? formatLanguageName(languageItem) : localLanguagePlaceholder}
+          </SelectTrigger>
+          <SelectContent listClassName="max-h-60">
+            {languages.map(item => (
+              <SelectItem key={item.value} value={String(item.value)}>
+                <SelectItemText>
+                  {formatLanguageName(item)}
+                </SelectItemText>
+                <SelectItemIndicator />
+              </SelectItem>
+            ))}
+          </SelectContent>
+        </Select>
       </div>
       <div className="mb-3">
         <div className="mb-1 py-1 system-sm-semibold text-text-secondary">
           {t('voice.voiceSettings.voice', { ns: 'appDebug' })}
         </div>
         <div className="flex items-center gap-1">
-          <Listbox
-            value={voiceItem}
+          <Select
+            value={voiceItem ? String(voiceItem.value) : null}
             disabled={!languageItem}
-            onChange={(value: SelectOption) => {
+            onValueChange={(nextValue) => {
+              if (!nextValue)
+                return
               handleChange({
-                voice: String(value.value),
+                voice: nextValue,
               })
             }}
           >
-            <div className="relative h-8 grow">
-              <ListboxButton
-                className="h-full w-full cursor-pointer rounded-lg border-0 bg-components-input-bg-normal py-1.5 pr-10 pl-3 group-hover:bg-state-base-hover focus-visible:bg-state-base-hover focus-visible:outline-hidden sm:text-sm sm:leading-6"
-              >
-                <span
-                  className={cn('block truncate text-left text-text-secondary', !voiceItem?.name && 'text-text-tertiary')}
-                >
-                  {voiceItem?.name ?? localVoicePlaceholder}
-                </span>
-                <span className="pointer-events-none absolute inset-y-0 right-0 flex items-center pr-2">
-                  <span className="i-heroicons-chevron-down-20-solid h-4 w-4 text-text-tertiary" aria-hidden="true" />
-                </span>
-              </ListboxButton>
-              <Transition
-                as={Fragment}
-                leave="transition ease-in duration-100"
-                leaveFrom="opacity-100"
-                leaveTo="opacity-0"
-              >
-
-                <ListboxOptions
-                  className="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-md border-[0.5px] border-components-panel-border bg-components-panel-bg px-1 py-1 text-base shadow-lg focus:outline-hidden sm:text-sm"
-                >
-                  {voiceItems?.map((item: SelectOption) => (
-                    <ListboxOption
-                      key={item.value}
-                      className="relative cursor-pointer rounded-lg py-2 pr-9 pl-3 text-text-secondary select-none hover:bg-state-base-hover data-active:bg-state-base-active"
-                      value={item}
-                      disabled={false}
-                    >
-                      {({ /* active, */ selected }) => (
-                        <>
-                          <span className={cn('block', selected && 'font-normal')}>{item.name}</span>
-                          {(selected || item.value === text2speech?.voice) && (
-                            <span
-                              className={cn('absolute inset-y-0 right-0 flex items-center pr-4 text-text-secondary')}
-                            >
-                              <span className="i-heroicons-check-20-solid h-4 w-4" aria-hidden="true" />
-                            </span>
-                          )}
-                        </>
-                      )}
-                    </ListboxOption>
-                  ))}
-                </ListboxOptions>
-              </Transition>
+            <div className="grow">
+              <SelectTrigger aria-label={t('voice.voiceSettings.voice', { ns: 'appDebug' })} className="w-full">
+                {voiceItem?.name ?? localVoicePlaceholder}
+              </SelectTrigger>
+              <SelectContent listClassName="max-h-60">
+                {voiceItems?.map((item: SelectOption) => (
+                  <SelectItem key={item.value} value={String(item.value)}>
+                    <SelectItemText>
+                      {item.name}
+                    </SelectItemText>
+                    <SelectItemIndicator />
+                  </SelectItem>
+                ))}
+              </SelectContent>
             </div>
-          </Listbox>
+          </Select>
           {languageItem?.example && (
-            <div className="h-8 shrink-0 rounded-lg bg-components-button-tertiary-bg p-1" data-testid="audition-button">
+            <div
+              className="h-8 shrink-0 rounded-lg bg-components-button-tertiary-bg p-1"
+              role="group"
+              aria-label={t('play', { ns: 'appApi', defaultValue: 'Play' })}
+            >
               <AudioBtn
                 value={languageItem?.example}
                 isAudition
@@ -254,4 +191,4 @@ const VoiceParamConfig = ({
   )
 }
 
-export default React.memo(VoiceParamConfig)
+export default VoiceParamConfig
diff --git a/web/app/components/base/file-thumb/index.tsx b/web/app/components/base/file-thumb/index.tsx
index 960d39d948..cf34c5fd88 100644
--- a/web/app/components/base/file-thumb/index.tsx
+++ b/web/app/components/base/file-thumb/index.tsx
@@ -1,11 +1,11 @@
 import type { VariantProps } from 'class-variance-authority'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { cva } from 'class-variance-authority'
 import * as React from 'react'
 import { useCallback } from 'react'
 import { FileTypeIcon } from '../file-uploader'
 import { getFileAppearanceType } from '../file-uploader/utils'
-import Tooltip from '../tooltip'
 import ImageRender from './image-render'
 
 const FileThumbVariants = cva(
@@ -46,43 +46,49 @@ const FileThumb = ({
   const { name, mimeType, sourceUrl } = file
   const isImage = mimeType.startsWith('image/')
 
-  const handleClick = useCallback((e: React.MouseEvent<HTMLDivElement>) => {
+  const handleClick = useCallback((e: React.MouseEvent<HTMLButtonElement>) => {
     e.stopPropagation()
     e.preventDefault()
     onClick?.(file)
   }, [onClick, file])
 
   return (
-    <Tooltip
-      popupContent={name}
-      popupClassName="p-1.5 rounded-lg system-xs-medium text-text-secondary"
-      position="top"
-    >
-      <div
-        className={cn(
-          FileThumbVariants({ size, className }),
-          isImage
-            ? 'p-px'
-            : 'rounded-md border-[0.5px] border-components-panel-border bg-components-panel-on-panel-item-bg shadow-xs hover:bg-components-panel-on-panel-item-bg-alt',
+    <Tooltip>
+      <TooltipTrigger
+        render={(
+          <button
+            type="button"
+            aria-label={name}
+            className={cn(
+              FileThumbVariants({ size, className }),
+              'border-0 bg-transparent p-0',
+              isImage
+                ? 'p-px'
+                : 'rounded-md border-[0.5px] border-components-panel-border bg-components-panel-on-panel-item-bg shadow-xs hover:bg-components-panel-on-panel-item-bg-alt',
+            )}
+            onClick={handleClick}
+          >
+            {
+              isImage
+                ? (
+                    <ImageRender
+                      sourceUrl={sourceUrl}
+                      name={name}
+                    />
+                  )
+                : (
+                    <FileTypeIcon
+                      type={getFileAppearanceType(name, mimeType)}
+                      size="sm"
+                    />
+                  )
+            }
+          </button>
         )}
-        onClick={handleClick}
-      >
-        {
-          isImage
-            ? (
-                <ImageRender
-                  sourceUrl={sourceUrl}
-                  name={name}
-                />
-              )
-            : (
-                <FileTypeIcon
-                  type={getFileAppearanceType(name, mimeType)}
-                  size="sm"
-                />
-              )
-        }
-      </div>
+      />
+      <TooltipContent placement="top" className="rounded-lg p-1.5 system-xs-medium text-text-secondary">
+        {name}
+      </TooltipContent>
     </Tooltip>
   )
 }
diff --git a/web/app/components/base/file-uploader/__tests__/audio-preview.spec.tsx b/web/app/components/base/file-uploader/__tests__/audio-preview.spec.tsx
index 5a5740ef0d..9313efa071 100644
--- a/web/app/components/base/file-uploader/__tests__/audio-preview.spec.tsx
+++ b/web/app/components/base/file-uploader/__tests__/audio-preview.spec.tsx
@@ -25,29 +25,26 @@ describe('AudioPreview', () => {
   it('should render close button with icon', () => {
     render(<AudioPreview url="https://example.com/audio.mp3" title="Test Audio" onCancel={vi.fn()} />)
 
-    const closeIcon = screen.getByTestId('close-btn')
-    expect(closeIcon).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'common.operation.close' })).toBeInTheDocument()
   })
 
   it('should call onCancel when close button is clicked', () => {
     const onCancel = vi.fn()
     render(<AudioPreview url="https://example.com/audio.mp3" title="Test Audio" onCancel={onCancel} />)
 
-    const closeIcon = screen.getByTestId('close-btn')
-    fireEvent.click(closeIcon.parentElement!)
+    fireEvent.click(screen.getByRole('button', { name: 'common.operation.close' }))
 
     expect(onCancel).toHaveBeenCalled()
   })
 
-  it('should stop propagation when backdrop is clicked', () => {
-    const { baseElement } = render(<AudioPreview url="https://example.com/audio.mp3" title="Test Audio" onCancel={vi.fn()} />)
+  it('should not close when backdrop is clicked', () => {
+    const onCancel = vi.fn()
+    render(<AudioPreview url="https://example.com/audio.mp3" title="Test Audio" onCancel={onCancel} />)
 
-    const backdrop = baseElement.querySelector('[tabindex="-1"]')
-    const event = new MouseEvent('click', { bubbles: true })
-    const stopPropagation = vi.spyOn(event, 'stopPropagation')
-    backdrop!.dispatchEvent(event)
+    const dialog = screen.getByRole('dialog')
+    fireEvent.click(dialog)
 
-    expect(stopPropagation).toHaveBeenCalled()
+    expect(onCancel).not.toHaveBeenCalled()
   })
 
   it('should call onCancel when Escape key is pressed', () => {
@@ -64,6 +61,6 @@ describe('AudioPreview', () => {
     render(<AudioPreview url="https://example.com/audio.mp3" title="Test Audio" onCancel={vi.fn()} />)
 
     const audio = document.querySelector('audio')
-    expect(audio?.closest('[tabindex="-1"]')?.parentElement).toBe(document.body)
+    expect(audio?.closest('[data-base-ui-portal]')?.parentElement).toBe(document.body)
   })
 })
diff --git a/web/app/components/base/file-uploader/__tests__/pdf-preview.spec.tsx b/web/app/components/base/file-uploader/__tests__/pdf-preview.spec.tsx
index b3c48a7061..3aa0f9e6d6 100644
--- a/web/app/components/base/file-uploader/__tests__/pdf-preview.spec.tsx
+++ b/web/app/components/base/file-uploader/__tests__/pdf-preview.spec.tsx
@@ -35,7 +35,7 @@ describe('PdfPreview', () => {
   }
 
   const getControl = (rightClass: 'right-24' | 'right-16' | 'right-6') => {
-    const control = document.querySelector(`div.absolute.${rightClass}.top-6`) as HTMLDivElement | null
+    const control = document.querySelector(`button.absolute.${rightClass}.top-6`) as HTMLButtonElement | null
     expect(control).toBeInTheDocument()
     return control!
   }
@@ -129,14 +129,12 @@ describe('PdfPreview', () => {
     expect(mockOnCancel).toHaveBeenCalled()
   })
 
-  it('should render the overlay and stop click propagation', () => {
+  it('should render the overlay and keep backdrop clicks from closing', () => {
     render(<PdfPreview url="https://example.com/doc.pdf" onCancel={mockOnCancel} />)
 
-    const overlay = document.querySelector('[tabindex="-1"]')
+    const overlay = screen.getByRole('dialog')
     expect(overlay).toBeInTheDocument()
-    const event = new MouseEvent('click', { bubbles: true })
-    const stopPropagation = vi.spyOn(event, 'stopPropagation')
-    overlay!.dispatchEvent(event)
-    expect(stopPropagation).toHaveBeenCalled()
+    fireEvent.click(overlay)
+    expect(mockOnCancel).not.toHaveBeenCalled()
   })
 })
diff --git a/web/app/components/base/file-uploader/__tests__/video-preview.spec.tsx b/web/app/components/base/file-uploader/__tests__/video-preview.spec.tsx
index c95455caf3..fc6a9d6f79 100644
--- a/web/app/components/base/file-uploader/__tests__/video-preview.spec.tsx
+++ b/web/app/components/base/file-uploader/__tests__/video-preview.spec.tsx
@@ -1,4 +1,4 @@
-import { fireEvent, render } from '@testing-library/react'
+import { fireEvent, render, screen } from '@testing-library/react'
 import VideoPreview from '../video-preview'
 
 describe('VideoPreview', () => {
@@ -23,31 +23,28 @@ describe('VideoPreview', () => {
   })
 
   it('should render close button with icon', () => {
-    const { getByTestId } = render(<VideoPreview url="https://example.com/video.mp4" title="Test Video" onCancel={vi.fn()} />)
+    render(<VideoPreview url="https://example.com/video.mp4" title="Test Video" onCancel={vi.fn()} />)
 
-    const closeIcon = getByTestId('video-preview-close-btn')
-    expect(closeIcon).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'common.operation.close' })).toBeInTheDocument()
   })
 
   it('should call onCancel when close button is clicked', () => {
     const onCancel = vi.fn()
-    const { getByTestId } = render(<VideoPreview url="https://example.com/video.mp4" title="Test Video" onCancel={onCancel} />)
+    render(<VideoPreview url="https://example.com/video.mp4" title="Test Video" onCancel={onCancel} />)
 
-    const closeIcon = getByTestId('video-preview-close-btn')
-    fireEvent.click(closeIcon.parentElement!)
+    fireEvent.click(screen.getByRole('button', { name: 'common.operation.close' }))
 
     expect(onCancel).toHaveBeenCalled()
   })
 
-  it('should stop propagation when backdrop is clicked', () => {
-    const { baseElement } = render(<VideoPreview url="https://example.com/video.mp4" title="Test Video" onCancel={vi.fn()} />)
+  it('should not close when backdrop is clicked', () => {
+    const onCancel = vi.fn()
+    render(<VideoPreview url="https://example.com/video.mp4" title="Test Video" onCancel={onCancel} />)
 
-    const backdrop = baseElement.querySelector('[tabindex="-1"]')
-    const event = new MouseEvent('click', { bubbles: true })
-    const stopPropagation = vi.spyOn(event, 'stopPropagation')
-    backdrop!.dispatchEvent(event)
+    const dialog = screen.getByRole('dialog')
+    fireEvent.click(dialog)
 
-    expect(stopPropagation).toHaveBeenCalled()
+    expect(onCancel).not.toHaveBeenCalled()
   })
 
   it('should call onCancel when Escape key is pressed', () => {
@@ -64,6 +61,6 @@ describe('VideoPreview', () => {
     render(<VideoPreview url="https://example.com/video.mp4" title="Test Video" onCancel={vi.fn()} />)
 
     const video = document.querySelector('video')
-    expect(video?.closest('[tabindex="-1"]')?.parentElement).toBe(document.body)
+    expect(video?.closest('[data-base-ui-portal]')?.parentElement).toBe(document.body)
   })
 })
diff --git a/web/app/components/base/file-uploader/audio-preview.tsx b/web/app/components/base/file-uploader/audio-preview.tsx
index 28988b3a7c..c60500bef9 100644
--- a/web/app/components/base/file-uploader/audio-preview.tsx
+++ b/web/app/components/base/file-uploader/audio-preview.tsx
@@ -1,8 +1,6 @@
 import type { FC } from 'react'
-import * as React from 'react'
-import { createPortal } from 'react-dom'
-
-import { useHotkeys } from 'react-hotkeys-hook'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
+import { useTranslation } from 'react-i18next'
 
 type AudioPreviewProps = {
   url: string
@@ -14,31 +12,44 @@ const AudioPreview: FC<AudioPreviewProps> = ({
   title,
   onCancel,
 }) => {
-  useHotkeys('esc', onCancel)
+  const { t } = useTranslation()
 
-  return createPortal(
-    <div
-      className="fixed inset-0 z-1000 flex items-center justify-center bg-black/80 p-8"
-      onClick={e => e.stopPropagation()}
-      tabIndex={-1}
+  return (
+    <Dialog
+      open
+      onOpenChange={(open) => {
+        if (!open)
+          onCancel()
+      }}
+      disablePointerDismissal
     >
-      <div>
-        <audio controls title={title} autoPlay={false} preload="metadata">
-          <source
-            type="audio/mpeg"
-            src={url}
-            className="max-h-full max-w-full"
-          />
-        </audio>
-      </div>
-      <div
-        className="absolute top-6 right-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg bg-white/[0.08] backdrop-blur-[2px]"
-        onClick={onCancel}
+      <DialogContent
+        className="inset-0! top-0! left-0! flex h-dvh! max-h-none! w-screen! max-w-none! translate-x-0! translate-y-0! items-center justify-center overflow-hidden! rounded-none! border-none! bg-black/80 p-8! shadow-none!"
+        backdropClassName="bg-transparent!"
       >
-        <span className="i-ri-close-line h-4 w-4 text-gray-500" data-testid="close-btn" />
-      </div>
-    </div>,
-    document.body,
+        <div
+          aria-label={title}
+          tabIndex={-1}
+          onClick={e => e.stopPropagation()}
+        >
+          <audio controls title={title} autoPlay={false} preload="metadata">
+            <source
+              type="audio/mpeg"
+              src={url}
+              className="max-h-full max-w-full"
+            />
+          </audio>
+        </div>
+        <button
+          type="button"
+          aria-label={t('operation.close', { ns: 'common' })}
+          className="absolute top-6 right-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg border-none bg-white/[0.08] p-0 backdrop-blur-[2px]"
+          onClick={onCancel}
+        >
+          <span className="i-ri-close-line h-4 w-4 text-gray-500" aria-hidden="true" />
+        </button>
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/components/base/file-uploader/file-list-in-log.tsx b/web/app/components/base/file-uploader/file-list-in-log.tsx
index 9edd1ffed4..c8cb76b8cf 100644
--- a/web/app/components/base/file-uploader/file-list-in-log.tsx
+++ b/web/app/components/base/file-uploader/file-list-in-log.tsx
@@ -39,7 +39,13 @@ const FileListInLog = ({ fileList, isExpanded = false, noBorder = false, noPaddi
     <div className={cn('px-3 py-2', expanded && 'py-3', !noBorder && 'border-t border-divider-subtle', noPadding && 'p-0!')}>
       <div className="flex justify-between gap-1">
         {expanded && (
-          <div className="grow cursor-pointer py-1 system-xs-semibold-uppercase text-text-secondary" onClick={() => setExpanded(!expanded)}>{t('runDetail.fileListLabel', { ns: 'appLog' })}</div>
+          <button
+            type="button"
+            className="grow cursor-pointer border-none bg-transparent px-0 py-1 text-left system-xs-semibold-uppercase text-text-secondary focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+            onClick={() => setExpanded(!expanded)}
+          >
+            {t('runDetail.fileListLabel', { ns: 'appLog' })}
+          </button>
         )}
         {!expanded && (
           <div className="flex gap-1">
@@ -87,10 +93,15 @@ const FileListInLog = ({ fileList, isExpanded = false, noBorder = false, noPaddi
             })}
           </div>
         )}
-        <div className="flex cursor-pointer items-center gap-1" onClick={() => setExpanded(!expanded)}>
+        <button
+          type="button"
+          aria-label={t('runDetail.fileListDetail', { ns: 'appLog' })}
+          className="flex cursor-pointer items-center gap-1 border-none bg-transparent p-0 text-left focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+          onClick={() => setExpanded(!expanded)}
+        >
           {!expanded && <div className="system-xs-medium-uppercase text-text-tertiary">{t('runDetail.fileListDetail', { ns: 'appLog' })}</div>}
-          <RiArrowRightSLine className={cn('h-4 w-4 text-text-tertiary', expanded && 'rotate-90')} />
-        </div>
+          <RiArrowRightSLine className={cn('h-4 w-4 text-text-tertiary', expanded && 'rotate-90')} aria-hidden="true" />
+        </button>
       </div>
       {expanded && (
         <div className="flex flex-col gap-3">
diff --git a/web/app/components/base/file-uploader/file-uploader-in-attachment/__tests__/file-item.spec.tsx b/web/app/components/base/file-uploader/file-uploader-in-attachment/__tests__/file-item.spec.tsx
index 002eced6ca..83ab265084 100644
--- a/web/app/components/base/file-uploader/file-uploader-in-attachment/__tests__/file-item.spec.tsx
+++ b/web/app/components/base/file-uploader/file-uploader-in-attachment/__tests__/file-item.spec.tsx
@@ -186,13 +186,13 @@ describe('FileInAttachmentItem', () => {
     const buttons = screen.getAllByRole('button')
     fireEvent.click(buttons[0]!)
 
-    // ImagePreview renders via createPortal with class "image-preview-container"
+    // ImagePreview renders through Dialog with class "image-preview-container"
     const previewContainer = document.querySelector('.image-preview-container')!
     expect(previewContainer)!.toBeInTheDocument()
 
     // Close button is the last clickable div with an SVG in the preview container
-    const closeIcon = screen.getByTestId('image-preview-close-button')
-    fireEvent.click(closeIcon.parentElement!)
+    const closeIcon = screen.getByRole('button', { name: 'common.operation.cancel' })
+    fireEvent.click(closeIcon)
 
     // Preview should be removed
     // Preview should be removed
diff --git a/web/app/components/base/file-uploader/file-uploader-in-chat-input/__tests__/file-image-item.spec.tsx b/web/app/components/base/file-uploader/file-uploader-in-chat-input/__tests__/file-image-item.spec.tsx
index cfe6719b20..983bdf9393 100644
--- a/web/app/components/base/file-uploader/file-uploader-in-chat-input/__tests__/file-image-item.spec.tsx
+++ b/web/app/components/base/file-uploader/file-uploader-in-chat-input/__tests__/file-image-item.spec.tsx
@@ -44,16 +44,14 @@ describe('FileImageItem', () => {
   it('should render delete button when showDeleteAction is true', () => {
     render(<FileImageItem file={createFile()} showDeleteAction />)
 
-    const buttons = screen.getAllByRole('button')
-    expect(buttons.length).toBeGreaterThanOrEqual(1)
+    expect(screen.getByRole('button', { name: 'common.operation.remove' })).toBeInTheDocument()
   })
 
   it('should call onRemove when delete button is clicked', () => {
     const onRemove = vi.fn()
     render(<FileImageItem file={createFile()} showDeleteAction onRemove={onRemove} />)
 
-    const buttons = screen.getAllByRole('button')
-    fireEvent.click(buttons[0]!)
+    fireEvent.click(screen.getByRole('button', { name: 'common.operation.remove' }))
 
     expect(onRemove).toHaveBeenCalledWith('file-1')
   })
@@ -69,21 +67,18 @@ describe('FileImageItem', () => {
   })
 
   it('should render replay icon when upload failed', () => {
-    const { container } = render(<FileImageItem file={createFile({ progress: -1 })} />)
+    render(<FileImageItem file={createFile({ progress: -1 })} />)
 
-    // ReplayLine renders as an SVG icon with data-icon attribute
-    const replaySvg = container.querySelector('svg[data-icon="ReplayLine"]')
-    expect(replaySvg)!.toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'common.operation.retry' })).toBeInTheDocument()
   })
 
   it('should call onReUpload when replay icon is clicked', () => {
     const onReUpload = vi.fn()
-    const { container } = render(
+    render(
       <FileImageItem file={createFile({ progress: -1 })} onReUpload={onReUpload} />,
     )
 
-    const replaySvg = container.querySelector('svg[data-icon="ReplayLine"]')
-    fireEvent.click(replaySvg!)
+    fireEvent.click(screen.getByRole('button', { name: 'common.operation.retry' }))
 
     expect(onReUpload).toHaveBeenCalledWith('file-1')
   })
@@ -95,8 +90,7 @@ describe('FileImageItem', () => {
     const img = screen.getByRole('img')
     fireEvent.click(img.parentElement!)
 
-    // ImagePreview renders via createPortal with class "image-preview-container", not role="dialog"
-    // ImagePreview renders via createPortal with class "image-preview-container", not role="dialog"
+    // ImagePreview renders through Dialog with class "image-preview-container"
     expect(document.querySelector('.image-preview-container'))!.toBeInTheDocument()
   })
 
@@ -114,35 +108,28 @@ describe('FileImageItem', () => {
 
     const img = screen.getByRole('img')
     fireEvent.click(img.parentElement!)
-    // ImagePreview renders via createPortal with class "image-preview-container"
+    // ImagePreview renders through Dialog with class "image-preview-container"
     const previewContainer = document.querySelector('.image-preview-container')!
     expect(previewContainer)!.toBeInTheDocument()
 
     // Close button is the last clickable div with an SVG in the preview container
-    const closeIcon = screen.getByTestId('image-preview-close-button')
-    fireEvent.click(closeIcon.parentElement!)
+    const closeIcon = screen.getByRole('button', { name: 'common.operation.cancel' })
+    fireEvent.click(closeIcon)
 
     expect(document.querySelector('.image-preview-container')).not.toBeInTheDocument()
   })
 
   it('should render download overlay when showDownloadAction is true', () => {
-    const { container } = render(<FileImageItem file={createFile()} showDownloadAction />)
+    render(<FileImageItem file={createFile()} showDownloadAction />)
 
-    // The download icon SVG should be present
-    const svgs = container.querySelectorAll('svg')
-    expect(svgs.length).toBeGreaterThanOrEqual(1)
+    expect(screen.getByRole('button', { name: 'common.operation.download' })).toBeInTheDocument()
   })
 
   it('should call downloadUrl when download button is clicked', async () => {
     const { downloadUrl } = await import('@/utils/download')
-    const { container } = render(<FileImageItem file={createFile()} showDownloadAction />)
+    render(<FileImageItem file={createFile()} showDownloadAction />)
 
-    // Find the RiDownloadLine SVG (it doesn't have data-icon attribute, unlike ReplayLine)
-    const svgs = container.querySelectorAll('svg')
-    const downloadSvg = Array.from(svgs).find(
-      svg => !svg.hasAttribute('data-icon') && !svg.querySelector('circle'),
-    )
-    fireEvent.click(downloadSvg!.parentElement!)
+    fireEvent.click(screen.getByRole('button', { name: 'common.operation.download' }))
 
     expect(downloadUrl).toHaveBeenCalled()
   })
@@ -170,15 +157,9 @@ describe('FileImageItem', () => {
   it('should use url with attachment param for download_url when url is available', async () => {
     const { downloadUrl } = await import('@/utils/download')
     const file = createFile({ url: 'https://example.com/photo.png' })
-    const { container } = render(<FileImageItem file={file} showDownloadAction />)
+    render(<FileImageItem file={file} showDownloadAction />)
 
-    // The download SVG should be rendered
-    const svgs = container.querySelectorAll('svg')
-    expect(svgs.length).toBeGreaterThanOrEqual(1)
-    const downloadSvg = Array.from(svgs).find(
-      svg => !svg.hasAttribute('data-icon') && !svg.querySelector('circle'),
-    )
-    fireEvent.click(downloadSvg!.parentElement!)
+    fireEvent.click(screen.getByRole('button', { name: 'common.operation.download' }))
     expect(downloadUrl).toHaveBeenCalledWith(expect.objectContaining({
       url: expect.stringContaining('as_attachment=true'),
     }))
@@ -187,13 +168,9 @@ describe('FileImageItem', () => {
   it('should use base64Url for download_url when url is not available', async () => {
     const { downloadUrl } = await import('@/utils/download')
     const file = createFile({ url: undefined, base64Url: 'data:image/png;base64,abc' })
-    const { container } = render(<FileImageItem file={file} showDownloadAction />)
+    render(<FileImageItem file={file} showDownloadAction />)
 
-    const svgs = container.querySelectorAll('svg')
-    const downloadSvg = Array.from(svgs).find(
-      svg => !svg.hasAttribute('data-icon') && !svg.querySelector('circle'),
-    )
-    fireEvent.click(downloadSvg!.parentElement!)
+    fireEvent.click(screen.getByRole('button', { name: 'common.operation.download' }))
 
     expect(downloadUrl).toHaveBeenCalledWith(expect.objectContaining({
       url: 'data:image/png;base64,abc',
@@ -224,37 +201,6 @@ describe('FileImageItem', () => {
     const img = screen.getByRole('img')
     fireEvent.click(img.parentElement!)
 
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
-    // Preview won't show because imagePreviewUrl is empty string (falsy)
     // Preview won't show because imagePreviewUrl is empty string (falsy)
     expect(document.querySelector('.image-preview-container')).not.toBeInTheDocument()
   })
@@ -262,13 +208,9 @@ describe('FileImageItem', () => {
   it('should call downloadUrl with correct params when download button is clicked', async () => {
     const { downloadUrl } = await import('@/utils/download')
     const file = createFile({ url: 'https://example.com/photo.png', name: 'photo.png' })
-    const { container } = render(<FileImageItem file={file} showDownloadAction />)
+    render(<FileImageItem file={file} showDownloadAction />)
 
-    const svgs = container.querySelectorAll('svg')
-    const downloadSvg = Array.from(svgs).find(
-      svg => !svg.hasAttribute('data-icon') && !svg.querySelector('circle'),
-    )
-    fireEvent.click(downloadSvg!.parentElement!)
+    fireEvent.click(screen.getByRole('button', { name: 'common.operation.download' }))
 
     expect(downloadUrl).toHaveBeenCalledWith(expect.objectContaining({
       url: expect.stringContaining('as_attachment=true'),
diff --git a/web/app/components/base/file-uploader/file-uploader-in-chat-input/__tests__/file-item.spec.tsx b/web/app/components/base/file-uploader/file-uploader-in-chat-input/__tests__/file-item.spec.tsx
index 00dd7d9971..0a1902c9c5 100644
--- a/web/app/components/base/file-uploader/file-uploader-in-chat-input/__tests__/file-item.spec.tsx
+++ b/web/app/components/base/file-uploader/file-uploader-in-chat-input/__tests__/file-item.spec.tsx
@@ -61,14 +61,13 @@ describe('FileItem (chat-input)', () => {
   it('should render delete button when showDeleteAction is true', () => {
     render(<FileItem file={createFile()} showDeleteAction />)
 
-    const buttons = screen.getAllByRole('button')
-    expect(buttons.length).toBeGreaterThanOrEqual(1)
+    expect(screen.getByRole('button', { name: 'common.operation.remove' })).toBeInTheDocument()
   })
 
   it('should call onRemove when delete button is clicked', () => {
     const onRemove = vi.fn()
     render(<FileItem file={createFile()} showDeleteAction onRemove={onRemove} />)
-    const delete_button = screen.getByTestId('delete-button')
+    const delete_button = screen.getByRole('button', { name: 'common.operation.remove' })
     fireEvent.click(delete_button)
     expect(onRemove).toHaveBeenCalledWith('file-1')
   })
@@ -85,8 +84,7 @@ describe('FileItem (chat-input)', () => {
   it('should render replay icon when upload failed', () => {
     render(<FileItem file={createFile({ progress: -1 })} />)
 
-    const replayIcon = screen.getByTestId('replay-icon')
-    expect(replayIcon).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'common.operation.retry' })).toBeInTheDocument()
   })
 
   it('should call onReUpload when replay icon is clicked', () => {
@@ -95,7 +93,7 @@ describe('FileItem (chat-input)', () => {
       <FileItem file={createFile({ progress: -1 })} onReUpload={onReUpload} />,
     )
 
-    const replayIcon = screen.getByTestId('replay-icon')
+    const replayIcon = screen.getByRole('button', { name: 'common.operation.retry' })
     fireEvent.click(replayIcon!)
 
     expect(onReUpload).toHaveBeenCalledWith('file-1')
@@ -176,7 +174,7 @@ describe('FileItem (chat-input)', () => {
     fireEvent.click(screen.getByText(/audio\.mp3/i))
     expect(document.querySelector('audio')).toBeInTheDocument()
 
-    const deleteButton = screen.getByTestId('close-btn')
+    const deleteButton = screen.getByRole('button', { name: 'common.operation.close' })
     fireEvent.click(deleteButton)
 
     expect(document.querySelector('audio')).not.toBeInTheDocument()
@@ -185,15 +183,14 @@ describe('FileItem (chat-input)', () => {
   it('should render download button when showDownloadAction is true and url exists', () => {
     render(<FileItem file={createFile()} showDownloadAction />)
 
-    const buttons = screen.getAllByRole('button')
-    expect(buttons.length).toBeGreaterThanOrEqual(1)
+    expect(screen.getByRole('button', { name: 'common.operation.download' })).toBeInTheDocument()
   })
 
   it('should call downloadUrl when download button is clicked', async () => {
     const { downloadUrl } = await import('@/utils/download')
     render(<FileItem file={createFile()} showDownloadAction />)
 
-    const downloadBtn = screen.getByTestId('download-button')
+    const downloadBtn = screen.getByRole('button', { name: 'common.operation.download' })
     fireEvent.click(downloadBtn)
 
     expect(downloadUrl).toHaveBeenCalled()
@@ -252,7 +249,7 @@ describe('FileItem (chat-input)', () => {
     fireEvent.click(screen.getByText(/video\.mp4/i))
     expect(document.querySelector('video')).toBeInTheDocument()
 
-    const closeBtn = screen.getByTestId('video-preview-close-btn')
+    const closeBtn = screen.getByRole('button', { name: 'common.operation.close' })
     fireEvent.click(closeBtn)
 
     expect(document.querySelector('video')).not.toBeInTheDocument()
@@ -334,8 +331,7 @@ describe('FileItem (chat-input)', () => {
       />,
     )
 
-    const buttons = screen.getAllByRole('button')
-    expect(buttons.length).toBeGreaterThanOrEqual(1)
+    expect(screen.getByRole('button', { name: 'common.operation.download' })).toBeInTheDocument()
   })
 
   it('should not render extension separator when ext is empty', () => {
diff --git a/web/app/components/base/file-uploader/file-uploader-in-chat-input/file-image-item.tsx b/web/app/components/base/file-uploader/file-uploader-in-chat-input/file-image-item.tsx
index be34abce4e..485a351e55 100644
--- a/web/app/components/base/file-uploader/file-uploader-in-chat-input/file-image-item.tsx
+++ b/web/app/components/base/file-uploader/file-uploader-in-chat-input/file-image-item.tsx
@@ -5,6 +5,7 @@ import {
   RiDownloadLine,
 } from '@remixicon/react'
 import { useState } from 'react'
+import { useTranslation } from 'react-i18next'
 import { ReplayLine } from '@/app/components/base/icons/src/vender/other'
 import ImagePreview from '@/app/components/base/image-uploader/image-preview'
 import ProgressCircle from '@/app/components/base/progress-bar/progress-circle'
@@ -30,6 +31,7 @@ const FileImageItem = ({
   onRemove,
   onReUpload,
 }: FileImageItemProps) => {
+  const { t } = useTranslation()
   const { id, progress, base64Url, url, name } = file
   const [imagePreviewUrl, setImagePreviewUrl] = useState('')
   const download_url = url ? `${url}&as_attachment=true` : base64Url
@@ -43,10 +45,14 @@ const FileImageItem = ({
         {
           showDeleteAction && (
             <Button
+              aria-label={t('operation.remove', { ns: 'common' })}
               className="absolute -top-1.5 -right-1.5 z-11 hidden h-5 w-5 rounded-full p-0 group-hover/file-image:flex"
-              onClick={() => onRemove?.(id)}
+              onClick={(e) => {
+                e.stopPropagation()
+                onRemove?.(id)
+              }}
             >
-              <RiCloseLine className="h-4 w-4 text-components-button-secondary-text" />
+              <RiCloseLine className="h-4 w-4 text-components-button-secondary-text" aria-hidden="true" />
             </Button>
           )
         }
@@ -71,25 +77,34 @@ const FileImageItem = ({
         {
           progress === -1 && (
             <div className="absolute inset-0 z-10 flex items-center justify-center border-2 border-state-destructive-border bg-background-overlay-destructive">
-              <ReplayLine
-                className="h-5 w-5"
-                onClick={() => onReUpload?.(id)}
-              />
+              <button
+                type="button"
+                aria-label={t('operation.retry', { ns: 'common' })}
+                className="h-5 w-5 border-none bg-transparent p-0"
+                onClick={(e) => {
+                  e.stopPropagation()
+                  onReUpload?.(id)
+                }}
+              >
+                <ReplayLine className="h-5 w-5" aria-hidden="true" />
+              </button>
             </div>
           )
         }
         {
           showDownloadAction && (
-            <div className="bg-opacity-[0.3] absolute inset-0.5 z-10 hidden bg-background-overlay-alt group-hover/file-image:block">
-              <div
-                className="absolute right-0.5 bottom-0.5 flex h-6 w-6 items-center justify-center rounded-lg bg-components-actionbar-bg shadow-md"
+            <div className="absolute inset-0.5 z-10 hidden bg-background-overlay-alt group-hover/file-image:block">
+              <button
+                type="button"
+                aria-label={t('operation.download', { ns: 'common' })}
+                className="absolute right-0.5 bottom-0.5 flex h-6 w-6 items-center justify-center rounded-lg border-none bg-components-actionbar-bg p-0 shadow-md"
                 onClick={(e) => {
                   e.stopPropagation()
                   downloadUrl({ url: download_url || '', fileName: name, target: '_blank' })
                 }}
               >
-                <RiDownloadLine className="h-4 w-4 text-text-tertiary" />
-              </div>
+                <RiDownloadLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
+              </button>
             </div>
           )
         }
diff --git a/web/app/components/base/file-uploader/file-uploader-in-chat-input/file-item.tsx b/web/app/components/base/file-uploader/file-uploader-in-chat-input/file-item.tsx
index 3dae5f60f8..ee65a79f6d 100644
--- a/web/app/components/base/file-uploader/file-uploader-in-chat-input/file-item.tsx
+++ b/web/app/components/base/file-uploader/file-uploader-in-chat-input/file-item.tsx
@@ -2,6 +2,7 @@ import type { FileEntity } from '../types'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
 import { useState } from 'react'
+import { useTranslation } from 'react-i18next'
 import ActionButton from '@/app/components/base/action-button'
 import AudioPreview from '@/app/components/base/file-uploader/audio-preview'
 import PdfPreview from '@/app/components/base/file-uploader/dynamic-pdf-preview'
@@ -32,6 +33,7 @@ const FileItem = ({
   onReUpload,
   canPreview,
 }: FileItemProps) => {
+  const { t } = useTranslation()
   const { id, name, type, progress, url, base64Url, isRemote } = file
   const [previewUrl, setPreviewUrl] = useState('')
   const ext = getFileExtension(name, type, isRemote)
@@ -56,11 +58,11 @@ const FileItem = ({
         {
           showDeleteAction && (
             <Button
+              aria-label={t('operation.remove', { ns: 'common' })}
               className="absolute -top-1.5 -right-1.5 z-11 hidden h-5 w-5 rounded-full p-0 group-hover/file-item:flex"
               onClick={() => onRemove?.(id)}
-              data-testid="delete-button"
             >
-              <span className="i-ri-close-line h-4 w-4 text-components-button-secondary-text" />
+              <span className="i-ri-close-line h-4 w-4 text-components-button-secondary-text" aria-hidden="true" />
             </Button>
           )
         }
@@ -93,15 +95,15 @@ const FileItem = ({
           {
             showDownloadAction && download_url && (
               <ActionButton
+                aria-label={t('operation.download', { ns: 'common' })}
                 size="m"
                 className="absolute -top-1 -right-1 hidden group-hover/file-item:flex"
                 onClick={(e) => {
                   e.stopPropagation()
                   downloadUrl({ url: download_url || '', fileName: name, target: '_blank' })
                 }}
-                data-testid="download-button"
               >
-                <span className="i-ri-download-line h-3.5 w-3.5 text-text-tertiary" />
+                <span className="i-ri-download-line h-3.5 w-3.5 text-text-tertiary" aria-hidden="true" />
               </ActionButton>
             )
           }
@@ -116,7 +118,14 @@ const FileItem = ({
           }
           {
             uploadError && (
-              <span className="i-custom-vender-other-replay-line h-4 w-4 cursor-pointer text-text-tertiary" onClick={() => onReUpload?.(id)} data-testid="replay-icon" role="button" tabIndex={0} />
+              <button
+                type="button"
+                aria-label={t('operation.retry', { ns: 'common' })}
+                className="h-4 w-4 cursor-pointer border-none bg-transparent p-0 text-text-tertiary focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+                onClick={() => onReUpload?.(id)}
+              >
+                <span className="i-custom-vender-other-replay-line block h-4 w-4" aria-hidden="true" />
+              </button>
             )
           }
         </div>
diff --git a/web/app/components/base/file-uploader/pdf-preview.tsx b/web/app/components/base/file-uploader/pdf-preview.tsx
index c129f9cfb3..07fb2bab76 100644
--- a/web/app/components/base/file-uploader/pdf-preview.tsx
+++ b/web/app/components/base/file-uploader/pdf-preview.tsx
@@ -1,12 +1,11 @@
 import type { FC } from 'react'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { RiCloseLine, RiZoomInLine, RiZoomOutLine } from '@remixicon/react'
 import { noop } from 'es-toolkit/function'
-import { t } from 'i18next'
-import * as React from 'react'
 import { useState } from 'react'
-import { createPortal } from 'react-dom'
 import { useHotkeys } from 'react-hotkeys-hook'
+import { useTranslation } from 'react-i18next'
 import Loading from '@/app/components/base/loading'
 import useBreakpoints, { MediaType } from '@/hooks/use-breakpoints'
 import { PdfHighlighter, PdfLoader } from './pdf-highlighter-adapter'
@@ -20,6 +19,7 @@ const PdfPreview: FC<PdfPreviewProps> = ({
   url,
   onCancel,
 }) => {
+  const { t } = useTranslation()
   const media = useBreakpoints()
   const [scale, setScale] = useState(1)
   const [position, setPosition] = useState({ x: 0, y: 0 })
@@ -42,87 +42,106 @@ const PdfPreview: FC<PdfPreviewProps> = ({
     })
   }
 
-  useHotkeys('esc', onCancel)
   useHotkeys('up', zoomIn)
   useHotkeys('down', zoomOut)
 
-  return createPortal(
-    <div
-      className={`fixed inset-0 z-1000 flex items-center justify-center bg-black/80 ${!isMobile && 'p-8'}`}
-      onClick={e => e.stopPropagation()}
-      tabIndex={-1}
+  const zoomOutLabel = t('operation.zoomOut', { ns: 'common' })
+  const zoomInLabel = t('operation.zoomIn', { ns: 'common' })
+  const cancelLabel = t('operation.cancel', { ns: 'common' })
+
+  return (
+    <Dialog
+      open
+      onOpenChange={(open) => {
+        if (!open)
+          onCancel()
+      }}
+      disablePointerDismissal
     >
-      <div
-        className="h-[95vh] max-h-full w-screen max-w-full overflow-hidden"
-        style={{ transform: `scale(${scale})`, transformOrigin: 'center', scrollbarWidth: 'none', msOverflowStyle: 'none' }}
+      <DialogContent
+        className={`inset-0! top-0! left-0! flex h-dvh! max-h-none! w-screen! max-w-none! translate-x-0! translate-y-0! items-center justify-center overflow-hidden! rounded-none! border-none! bg-black/80 shadow-none! ${!isMobile ? 'p-8!' : 'p-0!'}`}
+        backdropClassName="bg-transparent!"
       >
-        <PdfLoader
-          workerSrc="/pdf.worker.min.mjs"
-          url={url}
-          beforeLoad={<div className="flex h-64 items-center justify-center"><Loading type="app" /></div>}
+        <div
+          aria-label={url}
+          tabIndex={-1}
+          onClick={e => e.stopPropagation()}
+          className="h-[95vh] max-h-full w-screen max-w-full overflow-hidden"
+          style={{ transform: `scale(${scale})`, transformOrigin: 'center', scrollbarWidth: 'none', msOverflowStyle: 'none' }}
         >
-          {(pdfDocument) => {
-            return (
-              <PdfHighlighter
-                pdfDocument={pdfDocument}
-                enableAreaSelection={event => event.altKey}
-                scrollRef={noop}
-                onScrollChange={noop}
-                onSelectionFinished={() => null}
-                highlightTransform={() => { return <div /> }}
-                highlights={[]}
-              />
-            )
-          }}
-        </PdfLoader>
-      </div>
-      <Tooltip>
-        <TooltipTrigger
-          render={(
-            <div
-              className="absolute top-6 right-24 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
-              onClick={zoomOut}
-            >
-              <RiZoomOutLine className="h-4 w-4 text-gray-500" />
-            </div>
-          )}
-        />
-        <TooltipContent>
-          {t('operation.zoomOut', { ns: 'common' })}
-        </TooltipContent>
-      </Tooltip>
-      <Tooltip>
-        <TooltipTrigger
-          render={(
-            <div
-              className="absolute top-6 right-16 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
-              onClick={zoomIn}
-            >
-              <RiZoomInLine className="h-4 w-4 text-gray-500" />
-            </div>
-          )}
-        />
-        <TooltipContent>
-          {t('operation.zoomIn', { ns: 'common' })}
-        </TooltipContent>
-      </Tooltip>
-      <Tooltip>
-        <TooltipTrigger
-          render={(
-            <div
-              className="absolute top-6 right-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg bg-white/8 backdrop-blur-[2px]"
-              onClick={onCancel}
-            >
-              <RiCloseLine className="h-4 w-4 text-gray-500" />
-            </div>
-          )}
-        />
-        <TooltipContent>
-          {t('operation.cancel', { ns: 'common' })}
-        </TooltipContent>
-      </Tooltip>
-    </div>,
-    document.body,
+          <PdfLoader
+            workerSrc="/pdf.worker.min.mjs"
+            url={url}
+            beforeLoad={<div className="flex h-64 items-center justify-center"><Loading type="app" /></div>}
+          >
+            {(pdfDocument) => {
+              return (
+                <PdfHighlighter
+                  pdfDocument={pdfDocument}
+                  enableAreaSelection={event => event.altKey}
+                  scrollRef={noop}
+                  onScrollChange={noop}
+                  onSelectionFinished={() => null}
+                  highlightTransform={() => { return <div /> }}
+                  highlights={[]}
+                />
+              )
+            }}
+          </PdfLoader>
+        </div>
+        <Tooltip>
+          <TooltipTrigger
+            render={(
+              <button
+                type="button"
+                aria-label={zoomOutLabel}
+                className="absolute top-6 right-24 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
+                onClick={zoomOut}
+              >
+                <RiZoomOutLine className="h-4 w-4 text-gray-500" />
+              </button>
+            )}
+          />
+          <TooltipContent>
+            {zoomOutLabel}
+          </TooltipContent>
+        </Tooltip>
+        <Tooltip>
+          <TooltipTrigger
+            render={(
+              <button
+                type="button"
+                aria-label={zoomInLabel}
+                className="absolute top-6 right-16 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
+                onClick={zoomIn}
+              >
+                <RiZoomInLine className="h-4 w-4 text-gray-500" />
+              </button>
+            )}
+          />
+          <TooltipContent>
+            {zoomInLabel}
+          </TooltipContent>
+        </Tooltip>
+        <Tooltip>
+          <TooltipTrigger
+            render={(
+              <button
+                type="button"
+                aria-label={cancelLabel}
+                className="absolute top-6 right-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg bg-white/8 backdrop-blur-[2px]"
+                onClick={onCancel}
+              >
+                <RiCloseLine className="h-4 w-4 text-gray-500" />
+              </button>
+            )}
+          />
+          <TooltipContent>
+            {cancelLabel}
+          </TooltipContent>
+        </Tooltip>
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/components/base/file-uploader/video-preview.tsx b/web/app/components/base/file-uploader/video-preview.tsx
index ec1644400f..c42fed42bf 100644
--- a/web/app/components/base/file-uploader/video-preview.tsx
+++ b/web/app/components/base/file-uploader/video-preview.tsx
@@ -1,7 +1,6 @@
 import type { FC } from 'react'
-import * as React from 'react'
-import { createPortal } from 'react-dom'
-import { useHotkeys } from 'react-hotkeys-hook'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
+import { useTranslation } from 'react-i18next'
 
 type VideoPreviewProps = {
   url: string
@@ -13,31 +12,44 @@ const VideoPreview: FC<VideoPreviewProps> = ({
   title,
   onCancel,
 }) => {
-  useHotkeys('esc', onCancel)
+  const { t } = useTranslation()
 
-  return createPortal(
-    <div
-      className="fixed inset-0 z-1000 flex items-center justify-center bg-black/80 p-8"
-      onClick={e => e.stopPropagation()}
-      tabIndex={-1}
+  return (
+    <Dialog
+      open
+      onOpenChange={(open) => {
+        if (!open)
+          onCancel()
+      }}
+      disablePointerDismissal
     >
-      <div>
-        <video controls title={title} autoPlay={false} preload="metadata">
-          <source
-            type="video/mp4"
-            src={url}
-            className="max-h-full max-w-full"
-          />
-        </video>
-      </div>
-      <div
-        className="absolute top-6 right-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg bg-white/[0.08] backdrop-blur-[2px]"
-        onClick={onCancel}
+      <DialogContent
+        className="inset-0! top-0! left-0! flex h-dvh! max-h-none! w-screen! max-w-none! translate-x-0! translate-y-0! items-center justify-center overflow-hidden! rounded-none! border-none! bg-black/80 p-8! shadow-none!"
+        backdropClassName="bg-transparent!"
       >
-        <span className="i-ri-close-line h-4 w-4 text-gray-500" data-testid="video-preview-close-btn" />
-      </div>
-    </div>,
-    document.body,
+        <div
+          aria-label={title}
+          tabIndex={-1}
+          onClick={e => e.stopPropagation()}
+        >
+          <video controls title={title} autoPlay={false} preload="metadata">
+            <source
+              type="video/mp4"
+              src={url}
+              className="max-h-full max-w-full"
+            />
+          </video>
+        </div>
+        <button
+          type="button"
+          aria-label={t('operation.close', { ns: 'common' })}
+          className="absolute top-6 right-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg border-none bg-white/[0.08] p-0 backdrop-blur-[2px]"
+          onClick={onCancel}
+        >
+          <span className="i-ri-close-line h-4 w-4 text-gray-500" aria-hidden="true" />
+        </button>
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/components/base/float-right-container/__tests__/index.spec.tsx b/web/app/components/base/float-right-container/__tests__/index.spec.tsx
index ee820230d8..6f84e5afd8 100644
--- a/web/app/components/base/float-right-container/__tests__/index.spec.tsx
+++ b/web/app/components/base/float-right-container/__tests__/index.spec.tsx
@@ -32,7 +32,6 @@ describe('FloatRightContainer', () => {
           isMobile={true}
           isOpen={false}
           onClose={vi.fn()}
-          unmount={true}
         >
           <div>Closed mobile content</div>
         </FloatRightContainer>,
@@ -91,7 +90,7 @@ describe('FloatRightContainer', () => {
       )
 
       await screen.findByRole('dialog')
-      const closeIcon = screen.getByTestId('close-icon')
+      const closeIcon = screen.getByRole('button', { name: 'common.operation.close' })
       expect(closeIcon).toBeInTheDocument()
 
       await userEvent.click(closeIcon)
@@ -99,53 +98,12 @@ describe('FloatRightContainer', () => {
       expect(onClose).toHaveBeenCalledTimes(1)
     })
 
-    it('should call onClose when close is done using escape key', async () => {
-      const onClose = vi.fn()
-      render(
-        <FloatRightContainer
-          isMobile={true}
-          isOpen={true}
-          onClose={onClose}
-          showClose={true}
-        >
-          <div>Closable content</div>
-        </FloatRightContainer>,
-      )
-
-      const closeIcon = screen.getByTestId('close-icon')
-      closeIcon.focus()
-      await userEvent.keyboard('{Enter}')
-
-      expect(onClose).toHaveBeenCalledTimes(1)
-    })
-
-    it('should call onClose when close is done using space key', async () => {
-      const onClose = vi.fn()
-      render(
-        <FloatRightContainer
-          isMobile={true}
-          isOpen={true}
-          onClose={onClose}
-          showClose={true}
-        >
-          <div>Closable content</div>
-        </FloatRightContainer>,
-      )
-
-      const closeIcon = screen.getByTestId('close-icon')
-      closeIcon.focus()
-      await userEvent.keyboard(' ')
-
-      expect(onClose).toHaveBeenCalledTimes(1)
-    })
-
-    it('should apply drawer className props in mobile drawer mode', async () => {
+    it('should apply panel className in mobile drawer mode', async () => {
       render(
         <FloatRightContainer
           isMobile={true}
           isOpen={true}
           onClose={vi.fn()}
-          dialogClassName="custom-dialog-class"
           panelClassName="custom-panel-class"
         >
           <div>Class forwarding content</div>
@@ -153,10 +111,10 @@ describe('FloatRightContainer', () => {
       )
 
       const dialog = await screen.findByRole('dialog')
-      expect(dialog).toHaveClass('custom-dialog-class')
 
       const panel = document.querySelector('.custom-panel-class')
       expect(panel).toBeInTheDocument()
+      expect(dialog).toHaveClass('custom-panel-class')
     })
   })
 
diff --git a/web/app/components/base/float-right-container/index.stories.tsx b/web/app/components/base/float-right-container/index.stories.tsx
index 5887afd1e3..ec26bb7be0 100644
--- a/web/app/components/base/float-right-container/index.stories.tsx
+++ b/web/app/components/base/float-right-container/index.stories.tsx
@@ -49,7 +49,6 @@ const ContainerDemo = () => {
         isOpen={open}
         onClose={() => setOpen(false)}
         title="Responsive panel"
-        description="Switch the toggle to see drawer vs inline behaviour."
         mask
       >
         <div className="rounded-xl border border-divider-subtle bg-components-panel-bg p-4 text-xs text-text-secondary">
diff --git a/web/app/components/base/float-right-container/index.tsx b/web/app/components/base/float-right-container/index.tsx
index 7435fd9643..ee79b22226 100644
--- a/web/app/components/base/float-right-container/index.tsx
+++ b/web/app/components/base/float-right-container/index.tsx
@@ -1,17 +1,78 @@
 'use client'
-import type { IDrawerProps } from '@/app/components/base/drawer'
-import Drawer from '@/app/components/base/drawer'
+import { cn } from '@langgenius/dify-ui/cn'
+import {
+  Drawer,
+  DrawerBackdrop,
+  DrawerCloseButton,
+  DrawerContent,
+  DrawerPopup,
+  DrawerPortal,
+  DrawerTitle,
+  DrawerViewport,
+} from '@langgenius/dify-ui/drawer'
+import { useTranslation } from 'react-i18next'
 
 type IFloatRightContainerProps = {
   isMobile: boolean
+  isOpen: boolean
+  onClose: () => void
   children?: React.ReactNode
-} & IDrawerProps
+  showClose?: boolean
+  panelClassName?: string
+  title?: string
+  mask?: boolean
+}
+
+const FloatRightContainer = ({
+  isMobile,
+  children,
+  isOpen,
+  onClose,
+  showClose = false,
+  panelClassName,
+  title,
+  mask = true,
+}: IFloatRightContainerProps) => {
+  const { t } = useTranslation()
 
-const FloatRightContainer = ({ isMobile, children, isOpen, ...drawerProps }: IFloatRightContainerProps) => {
   return (
     <>
       {isMobile && (
-        <Drawer isOpen={isOpen} {...drawerProps}>{children}</Drawer>
+        <Drawer
+          open={isOpen}
+          modal
+          swipeDirection="right"
+          onOpenChange={(open) => {
+            if (!open)
+              onClose()
+          }}
+        >
+          <DrawerPortal>
+            <DrawerBackdrop className={cn(!mask && 'bg-transparent')} />
+            <DrawerViewport>
+              <DrawerPopup className={cn('data-[swipe-direction=right]:w-full data-[swipe-direction=right]:max-w-sm', panelClassName)}>
+                <DrawerContent className="flex min-h-0 flex-1 flex-col">
+                  {(title || showClose) && (
+                    <div className="mb-4 flex shrink-0 items-center justify-between">
+                      {title && (
+                        <DrawerTitle className="text-lg leading-6 font-medium text-text-primary">
+                          {title}
+                        </DrawerTitle>
+                      )}
+                      {showClose && (
+                        <DrawerCloseButton
+                          aria-label={t('operation.close', { ns: 'common' })}
+                          className="h-6 w-6 rounded-md"
+                        />
+                      )}
+                    </div>
+                  )}
+                  {children}
+                </DrawerContent>
+              </DrawerPopup>
+            </DrawerViewport>
+          </DrawerPortal>
+        </Drawer>
       )}
       {(!isMobile && isOpen) && (
         <>{children}</>
diff --git a/web/app/components/base/form/components/__tests__/label.spec.tsx b/web/app/components/base/form/components/__tests__/label.spec.tsx
index a3f564dafe..99471e5171 100644
--- a/web/app/components/base/form/components/__tests__/label.spec.tsx
+++ b/web/app/components/base/form/components/__tests__/label.spec.tsx
@@ -41,8 +41,8 @@ describe('Label', () => {
     const tooltipText = 'Test Tooltip'
     render(<Label {...defaultProps} tooltip={tooltipText} />)
 
-    await user.hover(screen.getByTestId('test-input-tooltip'))
-    expect(screen.getByText(tooltipText)).toBeInTheDocument()
+    await user.hover(screen.getByRole('button', { name: tooltipText }))
+    expect(await screen.findByText(tooltipText)).toBeInTheDocument()
   })
 
   it('should hide optional text when required is true', () => {
diff --git a/web/app/components/base/form/components/base/__tests__/base-field.spec.tsx b/web/app/components/base/form/components/base/__tests__/base-field.spec.tsx
index a4d1323e6a..715a27a408 100644
--- a/web/app/components/base/form/components/base/__tests__/base-field.spec.tsx
+++ b/web/app/components/base/form/components/base/__tests__/base-field.spec.tsx
@@ -353,7 +353,9 @@ describe('BaseField', () => {
     expect(screen.getByText('This is a warning')).toBeInTheDocument()
   })
 
-  it('should render tooltip when provided', async () => {
+  it('should render infotip when tooltip content is provided', async () => {
+    const user = userEvent.setup()
+
     renderBaseField({
       formSchema: {
         type: FormTypeEnum.textInput,
@@ -366,8 +368,7 @@ describe('BaseField', () => {
 
     expect(screen.getByText('Info')).toBeInTheDocument()
 
-    const tooltipTrigger = screen.getByTestId('base-field-tooltip-trigger')
-    fireEvent.mouseEnter(tooltipTrigger)
+    await user.click(screen.getByRole('button', { name: 'Extra info' }))
 
     expect(screen.getByText('Extra info')).toBeInTheDocument()
   })
@@ -393,8 +394,8 @@ describe('BaseField', () => {
       fireEvent.click(screen.getByText('Feature B'))
     })
 
-    const checkboxB = screen.getByTestId('checkbox-b')
-    expect(checkboxB).toBeChecked()
+    const checkboxB = screen.getByRole('checkbox', { name: 'Feature B' })
+    expect(checkboxB).toHaveAttribute('aria-checked', 'true')
   })
 
   it('should handle dynamic select error state', () => {
diff --git a/web/app/components/base/form/components/base/base-field.tsx b/web/app/components/base/form/components/base/base-field.tsx
index a256bccd8b..2fd65e1202 100644
--- a/web/app/components/base/form/components/base/base-field.tsx
+++ b/web/app/components/base/form/components/base/base-field.tsx
@@ -18,12 +18,12 @@ import {
   useMemo,
 } from 'react'
 import { useTranslation } from 'react-i18next'
-import CheckboxList from '@/app/components/base/checkbox-list'
+import { CheckboxList } from '@/app/components/base/checkbox-list'
 import { FormItemValidateStatusEnum, FormTypeEnum } from '@/app/components/base/form/types'
+import { Infotip } from '@/app/components/base/infotip'
 import Input from '@/app/components/base/input'
 import Radio from '@/app/components/base/radio'
 import RadioE from '@/app/components/base/radio/ui'
-import Tooltip from '@/app/components/base/tooltip'
 import { useRenderI18nObject } from '@/hooks/use-i18n'
 import { useTriggerPluginDynamicOptions } from '@/service/use-triggers'
 
@@ -95,7 +95,7 @@ export type BaseFieldProps = {
   formSchema: FormSchema
   field: AnyFieldApi
   disabled?: boolean
-  onChange?: (field: string, value: any) => void
+  onChange?: (field: string, value: unknown) => void
   fieldState?: FieldState
 }
 
@@ -156,7 +156,7 @@ const BaseField = ({
   }, [options])
 
   const watchedValues = useStore(field.form.store, (s) => {
-    const result: Record<string, any> = {}
+    const result: Record<string, unknown> = {}
     for (const variable of watchedVariables)
       result[variable] = s.values[variable]
 
@@ -201,7 +201,7 @@ const BaseField = ({
     }))
   }, [dynamicOptionsData, renderI18nObject])
 
-  const handleChange = useCallback((value: any) => {
+  const handleChange = useCallback((value: unknown) => {
     field.handleChange(value)
     onChange?.(field.name, value)
   }, [field, onChange])
@@ -223,12 +223,10 @@ const BaseField = ({
               <span className="ml-1 text-text-destructive-secondary">*</span>
             )
           }
-          {tooltip && (
-            <Tooltip
-              triggerTestId="base-field-tooltip-trigger"
-              popupContent={<div className="w-[200px]">{translatedTooltip}</div>}
-              triggerClassName="ml-0.5 w-4 h-4"
-            />
+          {translatedTooltip && (
+            <Infotip aria-label={translatedTooltip} className="ml-0.5" popupClassName="w-[200px]">
+              {translatedTooltip}
+            </Infotip>
           )}
         </div>
         <div className={cn(inputContainerClassName)}>
@@ -267,7 +265,7 @@ const BaseField = ({
                           : translatedPlaceholder}
                       </SelectValue>
                     </SelectTrigger>
-                    <SelectContent popupClassName="max-h-[320px] w-(--anchor-width) bg-components-panel-bg-blur">
+                    <SelectContent popupClassName="max-h-[320px] bg-components-panel-bg-blur">
                       {memorizedOptions.map(option => (
                         <SelectItem key={option.value} value={option.value}>
                           <SelectItemText>{option.label}</SelectItemText>
@@ -293,7 +291,7 @@ const BaseField = ({
                         {nextValue => getSingleSelectLabel(nextValue, memorizedOptions, translatedPlaceholder)}
                       </SelectValue>
                     </SelectTrigger>
-                    <SelectContent popupClassName="max-h-[320px] w-(--anchor-width) bg-components-panel-bg-blur">
+                    <SelectContent popupClassName="max-h-[320px] bg-components-panel-bg-blur">
                       {memorizedOptions.map(option => (
                         <SelectItem key={option.value} value={option.value}>
                           <SelectItemText>{option.label}</SelectItemText>
@@ -332,7 +330,7 @@ const BaseField = ({
                           : dynamicPlaceholder}
                       </SelectValue>
                     </SelectTrigger>
-                    <SelectContent popupClassName="w-(--anchor-width) bg-components-panel-bg-blur">
+                    <SelectContent popupClassName="bg-components-panel-bg-blur">
                       {dynamicNoticeTitle && (
                         <div className={cn(
                           'flex h-[22px] items-center px-3 system-xs-medium-uppercase text-text-tertiary',
@@ -367,7 +365,7 @@ const BaseField = ({
                         {nextValue => getSingleSelectLabel(nextValue, dynamicOptions, dynamicPlaceholder)}
                       </SelectValue>
                     </SelectTrigger>
-                    <SelectContent popupClassName="w-(--anchor-width) bg-components-panel-bg-blur">
+                    <SelectContent popupClassName="bg-components-panel-bg-blur">
                       {dynamicNoticeTitle && (
                         <div className={cn(
                           'flex h-[22px] items-center px-3 system-xs-medium-uppercase text-text-tertiary',
diff --git a/web/app/components/base/form/components/field/__tests__/checkbox.spec.tsx b/web/app/components/base/form/components/field/__tests__/checkbox.spec.tsx
index 6005d9261b..d5e5a6d25c 100644
--- a/web/app/components/base/form/components/field/__tests__/checkbox.spec.tsx
+++ b/web/app/components/base/form/components/field/__tests__/checkbox.spec.tsx
@@ -21,7 +21,7 @@ describe('CheckboxField', () => {
   it('should toggle on when unchecked users click the checkbox', () => {
     mockField.state.value = false
     render(<CheckboxField label="Enable feature" />)
-    fireEvent.click(screen.getByTestId('checkbox-checkbox-field'))
+    fireEvent.click(screen.getByRole('checkbox', { name: 'Enable feature' }))
     expect(mockField.handleChange).toHaveBeenCalledWith(true)
   })
 
diff --git a/web/app/components/base/form/components/field/__tests__/variable-or-constant-input.spec.tsx b/web/app/components/base/form/components/field/__tests__/variable-or-constant-input.spec.tsx
deleted file mode 100644
index b4aa8bd24e..0000000000
--- a/web/app/components/base/form/components/field/__tests__/variable-or-constant-input.spec.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import { fireEvent, render, screen } from '@testing-library/react'
-import VariableOrConstantInputField from '../variable-or-constant-input'
-
-vi.mock('@/app/components/workflow/nodes/_base/components/variable/var-reference-picker', () => ({
-  default: ({ onChange }: { onChange?: () => void }) => (
-    <button onClick={() => onChange?.()}>
-      Variable picker
-    </button>
-  ),
-}))
-
-describe('VariableOrConstantInputField', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it('should render variable picker by default', () => {
-    render(<VariableOrConstantInputField label="Input source" />)
-    expect(screen.getByRole('button', { name: 'Variable picker' }))!.toBeInTheDocument()
-  })
-
-  it('should switch to constant input when users choose constant', () => {
-    render(<VariableOrConstantInputField label="Input source" />)
-    fireEvent.click(screen.getAllByRole('button')[1]!)
-    expect(screen.queryByRole('button', { name: 'Variable picker' })).not.toBeInTheDocument()
-    expect(screen.getByRole('textbox'))!.toBeInTheDocument()
-  })
-
-  it('should show typed constant value in the input', () => {
-    render(<VariableOrConstantInputField label="Input source" />)
-    fireEvent.click(screen.getAllByRole('button')[1]!)
-    const textbox = screen.getByRole('textbox')
-    fireEvent.change(textbox, { target: { value: 'constant-value' } })
-    expect(textbox)!.toHaveValue('constant-value')
-  })
-
-  it('should switch back to variable mode when users choose variable again', () => {
-    render(<VariableOrConstantInputField label="Input source" />)
-    const modeButtons = screen.getAllByRole('button')
-
-    fireEvent.click(modeButtons[1]!)
-    expect(screen.getByRole('textbox'))!.toBeInTheDocument()
-
-    fireEvent.click(modeButtons[0]!)
-    expect(screen.getByRole('button', { name: 'Variable picker' }))!.toBeInTheDocument()
-  })
-
-  it('should handle variable picker changes', () => {
-    const logSpy = vi.spyOn(console, 'log').mockImplementation(() => { })
-    try {
-      render(<VariableOrConstantInputField label="Input source" />)
-      fireEvent.click(screen.getByRole('button', { name: 'Variable picker' }))
-      expect(logSpy).toHaveBeenCalledWith('Variable value changed')
-    }
-    finally {
-      logSpy.mockRestore()
-    }
-  })
-})
diff --git a/web/app/components/base/form/components/field/checkbox.tsx b/web/app/components/base/form/components/field/checkbox.tsx
index cd5b95f2fa..9125b713b2 100644
--- a/web/app/components/base/form/components/field/checkbox.tsx
+++ b/web/app/components/base/form/components/field/checkbox.tsx
@@ -1,6 +1,6 @@
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import { cn } from '@langgenius/dify-ui/cn'
 import { useFieldContext } from '../..'
-import Checkbox from '../../../checkbox'
 
 type CheckboxFieldProps = {
   label: string
@@ -14,29 +14,22 @@ const CheckboxField = ({
   const field = useFieldContext<boolean>()
 
   return (
-    <div className="flex gap-2">
-      <div className="flex h-6 shrink-0 items-center">
+    <label className="flex cursor-pointer gap-2">
+      <span className="flex h-6 shrink-0 items-center">
         <Checkbox
-          id={field.name}
           checked={field.state.value}
-          onCheck={() => {
-            field.handleChange(!field.state.value)
-          }}
+          onCheckedChange={checked => field.handleChange(checked)}
         />
-      </div>
-      <label
-        htmlFor={field.name}
+      </span>
+      <span
         className={cn(
-          'grow cursor-pointer pt-1 system-sm-medium text-text-secondary',
+          'grow pt-1 system-sm-medium text-text-secondary',
           labelClassName,
         )}
-        onClick={() => {
-          field.handleChange(!field.state.value)
-        }}
       >
         {label}
-      </label>
-    </div>
+      </span>
+    </label>
   )
 }
 
diff --git a/web/app/components/base/form/components/field/input-type-select/index.tsx b/web/app/components/base/form/components/field/input-type-select/index.tsx
index 37f9a510d4..176d82a492 100644
--- a/web/app/components/base/form/components/field/input-type-select/index.tsx
+++ b/web/app/components/base/form/components/field/input-type-select/index.tsx
@@ -12,6 +12,7 @@ import Label from '../../label'
 import { useInputTypeOptions } from './hooks'
 import Option from './option'
 import Trigger from './trigger'
+import { InputTypeEnum } from './types'
 
 type InputTypeSelectFieldProps = {
   label: string
@@ -32,6 +33,12 @@ const InputTypeSelectField = ({
   const inputTypeOptions = useInputTypeOptions(supportFile)
   const selected = inputTypeOptions.find(option => option.value === field.state.value)
 
+  const handleInputTypeChange = (next: string | null) => {
+    const inputType = InputTypeEnum.safeParse(next)
+    if (inputType.success)
+      field.handleChange(inputType.data)
+  }
+
   return (
     <div className={cn('flex flex-col gap-y-0.5', className)}>
       <Label
@@ -43,11 +50,7 @@ const InputTypeSelectField = ({
         items={inputTypeOptions}
         value={field.state.value ?? null}
         disabled={disabled}
-        onValueChange={(next) => {
-          if (next == null)
-            return
-          field.handleChange(next as InputType)
-        }}
+        onValueChange={handleInputTypeChange}
       >
         <SelectTrigger id={field.name} className="gap-x-0.5 px-2">
           <Trigger option={selected} />
diff --git a/web/app/components/base/form/components/field/select.tsx b/web/app/components/base/form/components/field/select.tsx
index a8b49a2691..2e2913add4 100644
--- a/web/app/components/base/form/components/field/select.tsx
+++ b/web/app/components/base/form/components/field/select.tsx
@@ -80,7 +80,7 @@ const SelectField = ({
             {(nextValue: string | null) => getDisplayLabel(nextValue, options, placeholderText)}
           </SelectValue>
         </SelectTrigger>
-        <SelectContent popupClassName={cn('w-(--anchor-width) bg-components-panel-bg-blur', popupProps?.className)}>
+        <SelectContent popupClassName={cn('bg-components-panel-bg-blur', popupProps?.className)}>
           {popupProps?.title && (
             <div
               className={cn(
diff --git a/web/app/components/base/form/components/field/variable-or-constant-input.tsx b/web/app/components/base/form/components/field/variable-or-constant-input.tsx
deleted file mode 100644
index 04ecf99330..0000000000
--- a/web/app/components/base/form/components/field/variable-or-constant-input.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import type { ChangeEvent } from 'react'
-import type { LabelProps } from '../label'
-import { cn } from '@langgenius/dify-ui/cn'
-import { RiEditLine } from '@remixicon/react'
-import { useCallback, useState } from 'react'
-import { VariableX } from '@/app/components/base/icons/src/vender/workflow'
-import Input from '@/app/components/base/input'
-import SegmentedControl from '@/app/components/base/segmented-control'
-import VarReferencePicker from '@/app/components/workflow/nodes/_base/components/variable/var-reference-picker'
-import Label from '../label'
-
-type VariableOrConstantInputFieldProps = {
-  label: string
-  labelOptions?: Omit<LabelProps, 'htmlFor' | 'label'>
-  className?: string
-}
-
-const VariableOrConstantInputField = ({
-  className,
-  label,
-  labelOptions,
-}: VariableOrConstantInputFieldProps) => {
-  const [variableType, setVariableType] = useState('variable')
-
-  const options = [
-    {
-      Icon: VariableX,
-      value: 'variable',
-    },
-    {
-      Icon: RiEditLine,
-      value: 'constant',
-    },
-  ]
-
-  const handleVariableOrConstantChange = useCallback((value: string) => {
-    setVariableType(value)
-  }, [setVariableType])
-
-  const handleVariableValueChange = () => {
-    console.log('Variable value changed')
-  }
-
-  const handleConstantValueChange = (e: ChangeEvent<HTMLInputElement>) => {
-    console.log('Constant value changed:', e.target.value)
-  }
-
-  return (
-    <div className={cn('flex flex-col gap-y-0.5', className)}>
-      <Label
-        htmlFor="variable-or-constant"
-        label={label}
-        {...(labelOptions ?? {})}
-      />
-      <div className="flex items-center">
-        <SegmentedControl
-          className="mr-1 shrink-0"
-          value={variableType}
-          onChange={handleVariableOrConstantChange as any}
-          options={options as any}
-        />
-        {
-          variableType === 'variable' && (
-            <VarReferencePicker
-              className="grow"
-              nodeId=""
-              readonly={false}
-              value={[]}
-              onChange={handleVariableValueChange}
-            />
-          )
-        }
-        {
-          variableType === 'constant' && (
-            <Input
-              className="ml-1"
-              onChange={handleConstantValueChange}
-            />
-          )
-        }
-      </div>
-    </div>
-  )
-}
-
-export default VariableOrConstantInputField
diff --git a/web/app/components/base/form/components/label.tsx b/web/app/components/base/form/components/label.tsx
index cd23043593..8987e350ff 100644
--- a/web/app/components/base/form/components/label.tsx
+++ b/web/app/components/base/form/components/label.tsx
@@ -1,6 +1,6 @@
 import { cn } from '@langgenius/dify-ui/cn'
 import { useTranslation } from 'react-i18next'
-import Tooltip from '../../tooltip'
+import { Infotip } from '../../infotip'
 
 export type LabelProps = {
   htmlFor: string
@@ -33,13 +33,9 @@ const Label = ({
       {!isRequired && showOptional && <div className="ml-1 system-xs-regular text-text-tertiary">{t('label.optional', { ns: 'common' })}</div>}
       {isRequired && <div className="ml-1 system-xs-regular text-text-destructive-secondary">*</div>}
       {tooltip && (
-        <Tooltip
-          popupContent={
-            <div className="w-[200px]">{tooltip}</div>
-          }
-          triggerClassName="ml-0.5 w-4 h-4"
-          triggerTestId={`${htmlFor}-tooltip`}
-        />
+        <Infotip aria-label={tooltip} className="ml-0.5 h-4 w-4" popupClassName="w-[200px]">
+          {tooltip}
+        </Infotip>
       )}
     </div>
   )
diff --git a/web/app/components/base/form/index.stories.tsx b/web/app/components/base/form/index.stories.tsx
index a8afc4f3f3..30ecec185b 100644
--- a/web/app/components/base/form/index.stories.tsx
+++ b/web/app/components/base/form/index.stories.tsx
@@ -44,7 +44,7 @@ type PlaygroundFormFieldsProps = {
 const PlaygroundFormFields = ({ form, status }: PlaygroundFormFieldsProps) => {
   type PlaygroundFormValues = typeof demoFormOpts.defaultValues
   const name = useStore(form.store, state => (state.values as PlaygroundFormValues).name)
-  const contactFormApi = form as ContactFieldsFormApi
+  const contactFormApi = form as unknown as ContactFieldsFormApi
 
   return (
     <form
diff --git a/web/app/components/base/fullscreen-modal/__tests__/index.spec.tsx b/web/app/components/base/fullscreen-modal/__tests__/index.spec.tsx
deleted file mode 100644
index f238ea79f7..0000000000
--- a/web/app/components/base/fullscreen-modal/__tests__/index.spec.tsx
+++ /dev/null
@@ -1,214 +0,0 @@
-import { act, fireEvent, render, screen } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
-import { describe, expect, it, vi } from 'vitest'
-import FullScreenModal from '../index'
-
-describe('FullScreenModal Component', () => {
-  it('should not render anything when open is false', () => {
-    render(
-      <FullScreenModal open={false}>
-        <div data-testid="modal-content">Content</div>
-      </FullScreenModal>,
-    )
-    expect(screen.queryByTestId('modal-content')).not.toBeInTheDocument()
-  })
-
-  it('should render content when open is true', async () => {
-    render(
-      <FullScreenModal open={true}>
-        <div data-testid="modal-content">Content</div>
-      </FullScreenModal>,
-    )
-    expect(await screen.findByTestId('modal-content')).toBeInTheDocument()
-  })
-
-  it('should not crash when provided with title and description props', async () => {
-    await act(async () => {
-      render(
-        <FullScreenModal
-          open={true}
-          title="My Title"
-          description="My Description"
-        >
-          Content
-        </FullScreenModal>,
-      )
-    })
-  })
-
-  describe('Props Handling', () => {
-    it('should apply wrapperClassName to the dialog root', async () => {
-      render(
-        <FullScreenModal
-          open={true}
-          wrapperClassName="custom-wrapper-class"
-        >
-          Content
-        </FullScreenModal>,
-      )
-
-      await screen.findByRole('dialog')
-      const element = document.querySelector('.custom-wrapper-class')
-      expect(element).toBeInTheDocument()
-      expect(element).toHaveClass('relative', 'z-50')
-    })
-
-    it('should apply className to the inner panel', async () => {
-      await act(async () => {
-        render(
-          <FullScreenModal
-            open={true}
-            className="custom-panel-class"
-          >
-            Content
-          </FullScreenModal>,
-        )
-      })
-      const panel = document.querySelector('.custom-panel-class')
-      expect(panel).toBeInTheDocument()
-      expect(panel).toHaveClass('h-full')
-    })
-
-    it('should handle overflowVisible prop', async () => {
-      const { rerender } = await act(async () => {
-        return render(
-          <FullScreenModal
-            open={true}
-            overflowVisible={true}
-            className="target-panel"
-          >
-            Content
-          </FullScreenModal>,
-        )
-      })
-      let panel = document.querySelector('.target-panel')
-      expect(panel).toHaveClass('overflow-visible')
-      expect(panel).not.toHaveClass('overflow-hidden')
-
-      await act(async () => {
-        rerender(
-          <FullScreenModal
-            open={true}
-            overflowVisible={false}
-            className="target-panel"
-          >
-            Content
-          </FullScreenModal>,
-        )
-      })
-      panel = document.querySelector('.target-panel')
-      expect(panel).toHaveClass('overflow-hidden')
-      expect(panel).not.toHaveClass('overflow-visible')
-    })
-
-    it('should render close button when closable is true', async () => {
-      await act(async () => {
-        render(
-          <FullScreenModal open={true} closable={true}>
-            Content
-          </FullScreenModal>,
-        )
-      })
-      const closeButton = document.querySelector('.bg-components-button-tertiary-bg')
-      expect(closeButton).toBeInTheDocument()
-    })
-
-    it('should not render close button when closable is false', async () => {
-      await act(async () => {
-        render(
-          <FullScreenModal open={true} closable={false}>
-            Content
-          </FullScreenModal>,
-        )
-      })
-      const closeButton = document.querySelector('.bg-components-button-tertiary-bg')
-      expect(closeButton).not.toBeInTheDocument()
-    })
-  })
-
-  describe('Interactions', () => {
-    it('should call onClose when close button is clicked', async () => {
-      const user = userEvent.setup()
-      const onClose = vi.fn()
-
-      render(
-        <FullScreenModal open={true} closable={true} onClose={onClose}>
-          Content
-        </FullScreenModal>,
-      )
-
-      const closeBtn = document.querySelector('.bg-components-button-tertiary-bg')
-      expect(closeBtn).toBeInTheDocument()
-
-      await user.click(closeBtn!)
-      expect(onClose).toHaveBeenCalledTimes(1)
-    })
-
-    it('should call onClose when clicking the backdrop', async () => {
-      const user = userEvent.setup()
-      const onClose = vi.fn()
-
-      render(
-        <FullScreenModal open={true} onClose={onClose}>
-          <div data-testid="inner">Content</div>
-        </FullScreenModal>,
-      )
-
-      const dialog = document.querySelector('.relative.z-50')
-      if (dialog) {
-        await user.click(dialog)
-        expect(onClose).toHaveBeenCalled()
-      }
-      else {
-        throw new Error('Dialog root not found')
-      }
-    })
-
-    it('should call onClose when Escape key is pressed', async () => {
-      const user = userEvent.setup()
-      const onClose = vi.fn()
-
-      render(
-        <FullScreenModal open={true} onClose={onClose}>
-          Content
-        </FullScreenModal>,
-      )
-
-      await user.keyboard('{Escape}')
-      expect(onClose).toHaveBeenCalled()
-    })
-
-    it('should not call onClose when clicking inside the content', async () => {
-      const user = userEvent.setup()
-      const onClose = vi.fn()
-
-      render(
-        <FullScreenModal open={true} onClose={onClose}>
-          <div className="bg-background-default-subtle">
-            <button>Action</button>
-          </div>
-        </FullScreenModal>,
-      )
-
-      const innerButton = screen.getByRole('button', { name: 'Action' })
-      await user.click(innerButton)
-      expect(onClose).not.toHaveBeenCalled()
-
-      const contentPanel = document.querySelector('.bg-background-default-subtle')
-      await act(async () => {
-        fireEvent.click(contentPanel!)
-      })
-      expect(onClose).not.toHaveBeenCalled()
-    })
-  })
-
-  describe('Default Props', () => {
-    it('should not throw if onClose is not provided', async () => {
-      const user = userEvent.setup()
-      render(<FullScreenModal open={true} closable={true}>Content</FullScreenModal>)
-
-      const closeButton = document.querySelector('.bg-components-button-tertiary-bg')
-      await user.click(closeButton!)
-    })
-  })
-})
diff --git a/web/app/components/base/fullscreen-modal/index.stories.tsx b/web/app/components/base/fullscreen-modal/index.stories.tsx
deleted file mode 100644
index 3285b1c4ea..0000000000
--- a/web/app/components/base/fullscreen-modal/index.stories.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/nextjs-vite'
-import { useState } from 'react'
-import FullScreenModal from '.'
-
-const meta = {
-  title: 'Base/Feedback/FullScreenModal',
-  component: FullScreenModal,
-  parameters: {
-    layout: 'fullscreen',
-    docs: {
-      description: {
-        component: 'Backdrop-blurred fullscreen modal. Supports close button, custom content, and optional overflow visibility.',
-      },
-    },
-  },
-  tags: ['autodocs'],
-} satisfies Meta<typeof FullScreenModal>
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-const ModalDemo = (props: React.ComponentProps<typeof FullScreenModal>) => {
-  const [open, setOpen] = useState(false)
-
-  return (
-    <div className="flex h-[360px] items-center justify-center bg-background-default-subtle">
-      <button
-        type="button"
-        className="rounded-md bg-primary-600 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-primary-700"
-        onClick={() => setOpen(true)}
-      >
-        Launch full-screen modal
-      </button>
-
-      <FullScreenModal
-        {...props}
-        open={open}
-        onClose={() => setOpen(false)}
-        closable
-      >
-        <div className="flex h-full flex-col bg-background-default-subtle">
-          <div className="flex h-16 items-center justify-center border-b border-divider-subtle text-lg font-semibold text-text-primary">
-            Full-screen experience
-          </div>
-          <div className="flex flex-1 items-center justify-center text-sm text-text-secondary">
-            Place dashboards, flow builders, or immersive previews here.
-          </div>
-        </div>
-      </FullScreenModal>
-    </div>
-  )
-}
-
-export const Playground: Story = {
-  render: args => <ModalDemo {...args} />,
-  args: {
-    open: false,
-  },
-}
diff --git a/web/app/components/base/fullscreen-modal/index.tsx b/web/app/components/base/fullscreen-modal/index.tsx
deleted file mode 100644
index 95f593ec3d..0000000000
--- a/web/app/components/base/fullscreen-modal/index.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import { Dialog, DialogPanel, Transition, TransitionChild } from '@headlessui/react'
-import { cn } from '@langgenius/dify-ui/cn'
-import { RiCloseLargeLine } from '@remixicon/react'
-import { noop } from 'es-toolkit/function'
-
-type IModal = {
-  className?: string
-  wrapperClassName?: string
-  open: boolean
-  onClose?: () => void
-  title?: React.ReactNode
-  description?: React.ReactNode
-  children?: React.ReactNode
-  closable?: boolean
-  overflowVisible?: boolean
-}
-
-export default function FullScreenModal({
-  className,
-  wrapperClassName,
-  open,
-  onClose = noop,
-  children,
-  closable = false,
-  overflowVisible = false,
-}: IModal) {
-  return (
-    <Transition show={open} appear>
-      <Dialog as="div" className={cn('relative z-50', wrapperClassName)} onClose={onClose}>
-        <TransitionChild>
-          <div className={cn('fixed inset-0 bg-background-overlay-backdrop backdrop-blur-[6px]', 'duration-300 ease-in data-closed:opacity-0', 'data-enter:opacity-100', 'data-leave:opacity-0')} />
-        </TransitionChild>
-
-        <div
-          className="fixed inset-0 h-screen w-screen p-4"
-          onClick={(e) => {
-            e.preventDefault()
-            e.stopPropagation()
-          }}
-        >
-          <div className="relative h-full w-full rounded-2xl border border-effects-highlight bg-background-default-subtle">
-            <TransitionChild>
-              <DialogPanel className={cn('h-full', overflowVisible ? 'overflow-visible' : 'overflow-hidden', 'duration-100 ease-in data-closed:scale-95 data-closed:opacity-0', 'data-enter:scale-100 data-enter:opacity-100', 'data-enter:scale-95 data-leave:opacity-0', className)}>
-                {closable
-                  && (
-                    <div
-                      className="absolute top-3 right-3 z-50 flex h-9 w-9 cursor-pointer items-center justify-center
-                  rounded-[10px] bg-components-button-tertiary-bg hover:bg-components-button-tertiary-bg-hover"
-                      onClick={(e) => {
-                        e.stopPropagation()
-                        onClose()
-                      }}
-                    >
-                      <RiCloseLargeLine className="h-3.5 w-3.5 text-components-button-tertiary-text" />
-                    </div>
-                  )}
-                {children}
-              </DialogPanel>
-            </TransitionChild>
-          </div>
-        </div>
-      </Dialog>
-    </Transition>
-  )
-}
diff --git a/web/app/components/base/icons/src/vender/line/general/index.ts b/web/app/components/base/icons/src/vender/line/general/index.ts
index 33f67f01a5..e5e1116ad1 100644
--- a/web/app/components/base/icons/src/vender/line/general/index.ts
+++ b/web/app/components/base/icons/src/vender/line/general/index.ts
@@ -5,8 +5,6 @@ export { default as CodeAssistant } from './CodeAssistant'
 export { default as Link03 } from './Link03'
 export { default as LinkExternal02 } from './LinkExternal02'
 
-export { default as LogOut01 } from './LogOut01'
-
 export { default as MagicEdit } from './MagicEdit'
 
 export { default as Pin02 } from './Pin02'
diff --git a/web/app/components/base/image-gallery/__tests__/index.spec.tsx b/web/app/components/base/image-gallery/__tests__/index.spec.tsx
index 4975ac8f1c..92ff807d75 100644
--- a/web/app/components/base/image-gallery/__tests__/index.spec.tsx
+++ b/web/app/components/base/image-gallery/__tests__/index.spec.tsx
@@ -113,7 +113,7 @@ describe('ImageGallery', () => {
       await user.click(getImages(container)[0]!)
       expect(screen.queryByTestId('image-preview-container'))!.toBeInTheDocument()
 
-      await user.keyboard('{Escape}')
+      fireEvent.keyDown(document, { key: 'Escape', code: 'Escape' })
 
       await waitFor(() => {
         expect(screen.queryByTestId('image-preview-container')).not.toBeInTheDocument()
diff --git a/web/app/components/base/image-uploader/__tests__/audio-preview.spec.tsx b/web/app/components/base/image-uploader/__tests__/audio-preview.spec.tsx
index 0c92afba0a..5608e1cabb 100644
--- a/web/app/components/base/image-uploader/__tests__/audio-preview.spec.tsx
+++ b/web/app/components/base/image-uploader/__tests__/audio-preview.spec.tsx
@@ -35,15 +35,14 @@ describe('AudioPreview', () => {
 
     it('should render close button', () => {
       render(<AudioPreview {...defaultProps} />)
-      const closeBtn = screen.getByTestId('close-preview')
-      expect(closeBtn).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'common.operation.close' })).toBeInTheDocument()
     })
 
     it('should render via portal into document.body', () => {
       render(<AudioPreview {...defaultProps} />)
       const overlay = screen.getByTestId('audio-preview-overlay')
       expect(overlay).toBeInTheDocument()
-      expect(overlay.parentElement).toBe(document.body)
+      expect(overlay.closest('[data-base-ui-portal]')?.parentElement).toBe(document.body)
     })
   })
 
@@ -78,7 +77,7 @@ describe('AudioPreview', () => {
       const onCancel = vi.fn()
       render(<AudioPreview {...defaultProps} onCancel={onCancel} />)
 
-      const closeBtn = screen.getByTestId('close-preview')
+      const closeBtn = screen.getByRole('button', { name: 'common.operation.close' })
       await user.click(closeBtn)
 
       expect(onCancel).toHaveBeenCalledTimes(1)
diff --git a/web/app/components/base/image-uploader/__tests__/image-list.spec.tsx b/web/app/components/base/image-uploader/__tests__/image-list.spec.tsx
index 44353ca19f..feb4294643 100644
--- a/web/app/components/base/image-uploader/__tests__/image-list.spec.tsx
+++ b/web/app/components/base/image-uploader/__tests__/image-list.spec.tsx
@@ -31,7 +31,7 @@ describe('ImageList', () => {
   describe('Rendering', () => {
     it('should render without crashing with empty list', () => {
       render(<ImageList list={[]} />)
-      expect(screen.getByTestId('image-list')).toBeInTheDocument()
+      expect(screen.getByRole('list', { name: 'common.imageUploader.imageList' })).toBeInTheDocument()
     })
 
     it('should render images for each item in the list', () => {
@@ -73,7 +73,7 @@ describe('ImageList', () => {
       const list = [createLocalFile({ _id: 'file-1' })]
       render(<ImageList list={list} onRemove={vi.fn()} />)
 
-      expect(screen.getByRole('button')).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'common.operation.remove' })).toBeInTheDocument()
     })
 
     it('should not show remove buttons when readonly', () => {
@@ -104,7 +104,7 @@ describe('ImageList', () => {
       const list = [createLocalFile({ _id: 'file-1', progress: -1 })]
       render(<ImageList list={list} onReUpload={onReUpload} />)
 
-      expect(screen.getByTestId('retry-icon')).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'common.operation.retry' })).toBeInTheDocument()
       expect(screen.queryByText(/\d+\s*%/)).not.toBeInTheDocument()
     })
   })
@@ -150,8 +150,7 @@ describe('ImageList', () => {
       const onReUpload = vi.fn()
       const list = [createLocalFile({ _id: 'file-1', progress: -1 })]
       render(<ImageList list={list} onReUpload={onReUpload} />)
-      const retryIcon = screen.getByTestId('retry-icon')
-      await user.click(retryIcon)
+      await user.click(screen.getByRole('button', { name: 'common.operation.retry' }))
       expect(onReUpload).toHaveBeenCalledWith('file-1')
     })
 
@@ -186,7 +185,7 @@ describe('ImageList', () => {
       expect(screen.queryByTestId('image-preview-container')).toBeInTheDocument()
 
       // Close preview
-      const closeButton = screen.getByTestId('image-preview-close-button')
+      const closeButton = screen.getByRole('button', { name: 'common.operation.cancel' })
       await user.click(closeButton)
       expect(screen.queryByTestId('image-preview-container')).not.toBeInTheDocument()
     })
diff --git a/web/app/components/base/image-uploader/__tests__/image-preview.spec.tsx b/web/app/components/base/image-uploader/__tests__/image-preview.spec.tsx
index b2a2952bf8..b82075fdd7 100644
--- a/web/app/components/base/image-uploader/__tests__/image-preview.spec.tsx
+++ b/web/app/components/base/image-uploader/__tests__/image-preview.spec.tsx
@@ -1,4 +1,4 @@
-import { act, render, screen, waitFor } from '@testing-library/react'
+import { act, fireEvent, render, screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import ImagePreview from '../image-preview'
 
@@ -28,12 +28,12 @@ vi.mock('@/utils/download', () => ({
 }))
 
 const getOverlay = () => screen.getByTestId('image-preview-container') as HTMLDivElement
-const getCloseButton = () => screen.getByTestId('image-preview-close-button') as HTMLDivElement
-const getCopyButton = () => screen.getByTestId('image-preview-copy-button') as HTMLDivElement
-const getZoomOutButton = () => screen.getByTestId('image-preview-zoom-out-button') as HTMLDivElement
-const getZoomInButton = () => screen.getByTestId('image-preview-zoom-in-button') as HTMLDivElement
-const getDownloadButton = () => screen.getByTestId('image-preview-download-button') as HTMLDivElement
-const getOpenInTabButton = () => screen.getByTestId('image-preview-open-in-tab-button') as HTMLDivElement
+const getCloseButton = () => screen.getByRole('button', { name: 'common.operation.cancel' }) as HTMLButtonElement
+const getCopyButton = () => screen.getByRole('button', { name: 'common.operation.copyImage' }) as HTMLButtonElement
+const getZoomOutButton = () => screen.getByRole('button', { name: 'common.operation.zoomOut' }) as HTMLButtonElement
+const getZoomInButton = () => screen.getByRole('button', { name: 'common.operation.zoomIn' }) as HTMLButtonElement
+const getDownloadButton = () => screen.getByRole('button', { name: 'common.operation.download' }) as HTMLButtonElement
+const getOpenInTabButton = () => screen.getByRole('button', { name: 'common.operation.openInNewTab' }) as HTMLButtonElement
 
 const base64Image = 'aGVsbG8='
 const dataImage = `data:image/png;base64,${base64Image}`
@@ -89,7 +89,7 @@ describe('ImagePreview', () => {
 
       const overlay = getOverlay()
       expect(overlay).toBeInTheDocument()
-      expect(overlay?.parentElement).toBe(document.body)
+      expect(overlay.closest('[data-base-ui-portal]')?.parentElement).toBe(document.body)
       expect(screen.getByRole('img', { name: 'Preview Image' })).toHaveAttribute('src', 'https://example.com/image.png')
     })
 
@@ -108,7 +108,6 @@ describe('ImagePreview', () => {
 
   describe('Hotkeys', () => {
     it('should trigger esc/left/right handlers from keyboard', async () => {
-      const user = userEvent.setup()
       const onCancel = vi.fn()
       const onPrev = vi.fn()
       const onNext = vi.fn()
@@ -122,7 +121,9 @@ describe('ImagePreview', () => {
         />,
       )
 
-      await user.keyboard('{Escape}{ArrowLeft}{ArrowRight}')
+      fireEvent.keyDown(document, { key: 'Escape', code: 'Escape' })
+      fireEvent.keyDown(document, { key: 'ArrowLeft', code: 'ArrowLeft' })
+      fireEvent.keyDown(document, { key: 'ArrowRight', code: 'ArrowRight' })
 
       expect(onCancel).toHaveBeenCalledTimes(1)
       expect(onPrev).toHaveBeenCalledTimes(1)
@@ -130,7 +131,6 @@ describe('ImagePreview', () => {
     })
 
     it('should zoom in and out from keyboard up/down hotkeys', async () => {
-      const user = userEvent.setup()
       render(
         <ImagePreview
           url="https://example.com/image.png"
@@ -140,12 +140,12 @@ describe('ImagePreview', () => {
       )
       const image = screen.getByRole('img', { name: 'Preview Image' })
 
-      await user.keyboard('{ArrowUp}')
+      fireEvent.keyDown(document, { key: 'ArrowUp', code: 'ArrowUp' })
       await waitFor(() => {
         expect(image).toHaveStyle({ transform: 'scale(1.2) translate(0px, 0px)' })
       })
 
-      await user.keyboard('{ArrowDown}')
+      fireEvent.keyDown(document, { key: 'ArrowDown', code: 'ArrowDown' })
       await waitFor(() => {
         expect(image).toHaveStyle({ transform: 'scale(1) translate(0px, 0px)' })
       })
diff --git a/web/app/components/base/image-uploader/__tests__/video-preview.spec.tsx b/web/app/components/base/image-uploader/__tests__/video-preview.spec.tsx
index f56a4b82e4..4b98b4af9c 100644
--- a/web/app/components/base/image-uploader/__tests__/video-preview.spec.tsx
+++ b/web/app/components/base/image-uploader/__tests__/video-preview.spec.tsx
@@ -3,7 +3,7 @@ import userEvent from '@testing-library/user-event'
 import VideoPreview from '../video-preview'
 
 const getOverlay = () => screen.getByTestId('video-preview')
-const getCloseButton = () => screen.getByTestId('close-button')
+const getCloseButton = () => screen.getByRole('button', { name: 'common.operation.close' })
 describe('VideoPreview', () => {
   const defaultProps = {
     url: 'https://example.com/video.mp4',
@@ -51,7 +51,7 @@ describe('VideoPreview', () => {
 
       const overlay = getOverlay()
       expect(overlay).toBeInTheDocument()
-      expect(overlay.parentElement).toBe(document.body)
+      expect(overlay.closest('[data-base-ui-portal]')?.parentElement).toBe(document.body)
     })
   })
 
diff --git a/web/app/components/base/image-uploader/audio-preview.tsx b/web/app/components/base/image-uploader/audio-preview.tsx
index aa87d9d04e..d5e15fd3bf 100644
--- a/web/app/components/base/image-uploader/audio-preview.tsx
+++ b/web/app/components/base/image-uploader/audio-preview.tsx
@@ -1,5 +1,6 @@
 import type { FC } from 'react'
-import { createPortal } from 'react-dom'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
+import { useTranslation } from 'react-i18next'
 
 type AudioPreviewProps = {
   url: string
@@ -11,26 +12,45 @@ const AudioPreview: FC<AudioPreviewProps> = ({
   title,
   onCancel,
 }) => {
-  return createPortal(
-    <div className="fixed inset-0 z-1000 flex items-center justify-center bg-black/80 p-8" onClick={e => e.stopPropagation()} data-testid="audio-preview-overlay">
-      <div>
-        <audio controls title={title} autoPlay={false} preload="metadata" data-testid="audio-element">
-          <source
-            type="audio/mpeg"
-            src={url}
-            className="max-h-full max-w-full"
-          />
-        </audio>
-      </div>
-      <div
-        className="absolute top-6 right-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg bg-white/[0.08] backdrop-blur-[2px]"
-        onClick={onCancel}
-        data-testid="close-preview"
+  const { t } = useTranslation()
+
+  return (
+    <Dialog
+      open
+      onOpenChange={(open) => {
+        if (!open)
+          onCancel()
+      }}
+      disablePointerDismissal
+    >
+      <DialogContent
+        className="inset-0! top-0! left-0! flex h-dvh! max-h-none! w-screen! max-w-none! translate-x-0! translate-y-0! items-center justify-center overflow-hidden! rounded-none! border-none! bg-black/80 p-8! shadow-none!"
+        backdropClassName="bg-transparent!"
       >
-        <span className="i-ri-close-line h-4 w-4 text-gray-500" />
-      </div>
-    </div>,
-    document.body,
+        <div
+          aria-label={title}
+          data-testid="audio-preview-overlay"
+          tabIndex={-1}
+          onClick={e => e.stopPropagation()}
+        >
+          <audio controls title={title} autoPlay={false} preload="metadata" data-testid="audio-element">
+            <source
+              type="audio/mpeg"
+              src={url}
+              className="max-h-full max-w-full"
+            />
+          </audio>
+        </div>
+        <button
+          type="button"
+          aria-label={t('operation.close', { ns: 'common' })}
+          className="absolute top-6 right-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg border-none bg-white/[0.08] p-0 backdrop-blur-[2px]"
+          onClick={onCancel}
+        >
+          <span className="i-ri-close-line h-4 w-4 text-gray-500" aria-hidden="true" />
+        </button>
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/components/base/image-uploader/image-list.tsx b/web/app/components/base/image-uploader/image-list.tsx
index 2e56b88f65..a149d675d2 100644
--- a/web/app/components/base/image-uploader/image-list.tsx
+++ b/web/app/components/base/image-uploader/image-list.tsx
@@ -43,10 +43,11 @@ const ImageList: FC<ImageListProps> = ({
   }
 
   return (
-    <div className="flex flex-wrap" data-testid="image-list">
+    <div className="flex flex-wrap" role="list" aria-label={t('imageUploader.imageList', { ns: 'common' })}>
       {list.map(item => (
         <div
           key={item._id}
+          role="listitem"
           className="group relative mr-1 rounded-lg border-[0.5px] border-black/5"
         >
           {item.type === TransferMethod.local_file && item.progress !== 100 && (
@@ -56,7 +57,14 @@ const ImageList: FC<ImageListProps> = ({
                 style={{ left: item.progress > -1 ? `${item.progress}%` : 0 }}
               >
                 {item.progress === -1 && (
-                  <span className="i-custom-vender-line-arrows-refresh-ccw-01 h-5 w-5 text-white" onClick={() => onReUpload?.(item._id)} data-testid="retry-icon" />
+                  <button
+                    type="button"
+                    aria-label={t('operation.retry', { ns: 'common' })}
+                    className="h-5 w-5 border-none bg-transparent p-0 text-white focus-visible:ring-1 focus-visible:ring-white focus-visible:outline-hidden"
+                    onClick={() => onReUpload?.(item._id)}
+                  >
+                    <span className="i-custom-vender-line-arrows-refresh-ccw-01 h-5 w-5" aria-hidden="true" />
+                  </button>
                 )}
               </div>
               {item.progress > -1 && (
@@ -117,14 +125,14 @@ const ImageList: FC<ImageListProps> = ({
             <button
               type="button"
               className={cn(
-                'absolute -top-[9px] -right-[9px] z-10 h-[18px] w-[18px] items-center justify-center',
+                'absolute -top-[9px] -right-[9px] z-10 h-[18px] w-[18px] items-center justify-center border-none bg-transparent p-0',
                 'rounded-2xl shadow-lg hover:bg-state-base-hover',
                 item.progress === -1 ? 'flex' : 'hidden group-hover:flex',
               )}
               onClick={() => onRemove?.(item._id)}
-              data-testid="remove-button"
+              aria-label={t('operation.remove', { ns: 'common' })}
             >
-              <span className="i-ri-close-line h-3 w-3 text-text-tertiary" />
+              <span className="i-ri-close-line h-3 w-3 text-text-tertiary" aria-hidden="true" />
             </button>
           )}
         </div>
diff --git a/web/app/components/base/image-uploader/image-preview.tsx b/web/app/components/base/image-uploader/image-preview.tsx
index 354fb5ff2a..1400ac111f 100644
--- a/web/app/components/base/image-uploader/image-preview.tsx
+++ b/web/app/components/base/image-uploader/image-preview.tsx
@@ -1,12 +1,12 @@
 import type { FC } from 'react'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { noop } from 'es-toolkit/function'
-import { t } from 'i18next'
 import * as React from 'react'
 import { useCallback, useEffect, useRef, useState } from 'react'
-import { createPortal } from 'react-dom'
 import { useHotkeys } from 'react-hotkeys-hook'
+import { useTranslation } from 'react-i18next'
 import { downloadUrl } from '@/utils/download'
 
 type ImagePreviewProps = {
@@ -33,6 +33,7 @@ const ImagePreview: FC<ImagePreviewProps> = ({
   onPrev,
   onNext,
 }) => {
+  const { t } = useTranslation()
   const [scale, setScale] = useState(1)
   const [position, setPosition] = useState({ x: 0, y: 0 })
   const [isDragging, setIsDragging] = useState(false)
@@ -119,7 +120,7 @@ const ImagePreview: FC<ImagePreviewProps> = ({
       }
     }
     shareImage()
-  }, [title, url])
+  }, [t, title, url])
 
   const handleWheel = useCallback((e: React.WheelEvent<HTMLDivElement>) => {
     if (e.deltaY < 0)
@@ -167,131 +168,161 @@ const ImagePreview: FC<ImagePreviewProps> = ({
     }
   }, [handleMouseUp])
 
-  useHotkeys('esc', onCancel)
   useHotkeys('up', zoomIn)
   useHotkeys('down', zoomOut)
   useHotkeys('left', onPrev || noop)
   useHotkeys('right', onNext || noop)
 
-  return createPortal(
-    <div
-      className="image-preview-container fixed inset-0 z-1000 flex items-center justify-center bg-black/80 p-8"
-      onClick={e => e.stopPropagation()}
-      onWheel={handleWheel}
-      onMouseDown={handleMouseDown}
-      onMouseMove={handleMouseMove}
-      onMouseUp={handleMouseUp}
-      style={{ cursor: scale > 1 ? 'move' : 'default' }}
-      tabIndex={-1}
-      data-testid="image-preview-container"
+  const copyImageLabel = t('operation.copyImage', { ns: 'common' })
+  const zoomOutLabel = t('operation.zoomOut', { ns: 'common' })
+  const zoomInLabel = t('operation.zoomIn', { ns: 'common' })
+  const downloadLabel = t('operation.download', { ns: 'common' })
+  const openInNewTabLabel = t('operation.openInNewTab', { ns: 'common' })
+  const cancelLabel = t('operation.cancel', { ns: 'common' })
+
+  return (
+    <Dialog
+      open
+      onOpenChange={(open) => {
+        if (!open)
+          onCancel()
+      }}
+      disablePointerDismissal
     >
-      { }
-      { }
-      <img
-        ref={imgRef}
-        alt={title}
-        src={isBase64(url) ? `data:image/png;base64,${url}` : url}
-        className="max-h-full max-w-full"
-        style={{
-          transform: `scale(${scale}) translate(${position.x}px, ${position.y}px)`,
-          transition: isDragging ? 'none' : 'transform 0.2s ease-in-out',
-        }}
-        data-testid="image-preview-image"
-      />
-      <Tooltip>
-        <TooltipTrigger
-          render={(
-            <div
-              className="absolute top-6 right-48 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
-              onClick={imageCopy}
-            >
-              {isCopied
-                ? <span className="i-ri-file-copy-line h-4 w-4 text-green-500" data-testid="image-preview-copied-icon" />
-                : <span className="i-ri-file-copy-line h-4 w-4 text-gray-500" data-testid="image-preview-copy-button" />}
-            </div>
-          )}
-        />
-        <TooltipContent>
-          {t('operation.copyImage', { ns: 'common' })}
-        </TooltipContent>
-      </Tooltip>
-      <Tooltip>
-        <TooltipTrigger
-          render={(
-            <div
-              className="absolute top-6 right-40 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
-              onClick={zoomOut}
-            >
-              <span className="i-ri-zoom-out-line h-4 w-4 text-gray-500" data-testid="image-preview-zoom-out-button" />
-            </div>
-          )}
-        />
-        <TooltipContent>
-          {t('operation.zoomOut', { ns: 'common' })}
-        </TooltipContent>
-      </Tooltip>
-      <Tooltip>
-        <TooltipTrigger
-          render={(
-            <div
-              className="absolute top-6 right-32 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
-              onClick={zoomIn}
-            >
-              <span className="i-ri-zoom-in-line h-4 w-4 text-gray-500" data-testid="image-preview-zoom-in-button" />
-            </div>
-          )}
-        />
-        <TooltipContent>
-          {t('operation.zoomIn', { ns: 'common' })}
-        </TooltipContent>
-      </Tooltip>
-      <Tooltip>
-        <TooltipTrigger
-          render={(
-            <div
-              className="absolute top-6 right-24 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
-              onClick={downloadImage}
-            >
-              <span className="i-ri-download-cloud-2-line h-4 w-4 text-gray-500" data-testid="image-preview-download-button" />
-            </div>
-          )}
-        />
-        <TooltipContent>
-          {t('operation.download', { ns: 'common' })}
-        </TooltipContent>
-      </Tooltip>
-      <Tooltip>
-        <TooltipTrigger
-          render={(
-            <div
-              className="absolute top-6 right-16 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
-              onClick={openInNewTab}
-            >
-              <span className="i-ri-add-box-line h-4 w-4 text-gray-500" data-testid="image-preview-open-in-tab-button" />
-            </div>
-          )}
-        />
-        <TooltipContent>
-          {t('operation.openInNewTab', { ns: 'common' })}
-        </TooltipContent>
-      </Tooltip>
-      <Tooltip>
-        <TooltipTrigger
-          render={(
-            <div
-              className="absolute top-6 right-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg bg-white/8 backdrop-blur-[2px]"
-              onClick={onCancel}
-            >
-              <span className="i-ri-close-line h-4 w-4 text-gray-500" data-testid="image-preview-close-button" />
-            </div>
-          )}
-        />
-        <TooltipContent>
-          {t('operation.cancel', { ns: 'common' })}
-        </TooltipContent>
-      </Tooltip>
-    </div>,
-    document.body,
+      <DialogContent
+        className="image-preview-container inset-0! top-0! left-0! flex h-dvh! max-h-none! w-screen! max-w-none! translate-x-0! translate-y-0! items-center justify-center overflow-hidden! rounded-none! border-none! bg-black/80 p-8! shadow-none!"
+        backdropClassName="bg-transparent!"
+      >
+        <div
+          aria-label={title}
+          data-testid="image-preview-container"
+          tabIndex={-1}
+          className="flex h-full w-full items-center justify-center"
+          onClick={e => e.stopPropagation()}
+          onWheel={handleWheel}
+          onMouseDown={handleMouseDown}
+          onMouseMove={handleMouseMove}
+          onMouseUp={handleMouseUp}
+          style={{ cursor: scale > 1 ? 'move' : 'default' }}
+        >
+          <img
+            ref={imgRef}
+            alt={title}
+            src={isBase64(url) ? `data:image/png;base64,${url}` : url}
+            className="max-h-full max-w-full"
+            style={{
+              transform: `scale(${scale}) translate(${position.x}px, ${position.y}px)`,
+              transition: isDragging ? 'none' : 'transform 0.2s ease-in-out',
+            }}
+            data-testid="image-preview-image"
+          />
+        </div>
+        <Tooltip>
+          <TooltipTrigger
+            render={(
+              <button
+                type="button"
+                aria-label={copyImageLabel}
+                className="absolute top-6 right-48 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
+                onClick={imageCopy}
+              >
+                {isCopied
+                  ? <span className="i-ri-file-copy-line h-4 w-4 text-green-500" aria-hidden="true" />
+                  : <span className="i-ri-file-copy-line h-4 w-4 text-gray-500" aria-hidden="true" />}
+              </button>
+            )}
+          />
+          <TooltipContent>
+            {copyImageLabel}
+          </TooltipContent>
+        </Tooltip>
+        <Tooltip>
+          <TooltipTrigger
+            render={(
+              <button
+                type="button"
+                aria-label={zoomOutLabel}
+                className="absolute top-6 right-40 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
+                onClick={zoomOut}
+              >
+                <span className="i-ri-zoom-out-line h-4 w-4 text-gray-500" aria-hidden="true" />
+              </button>
+            )}
+          />
+          <TooltipContent>
+            {zoomOutLabel}
+          </TooltipContent>
+        </Tooltip>
+        <Tooltip>
+          <TooltipTrigger
+            render={(
+              <button
+                type="button"
+                aria-label={zoomInLabel}
+                className="absolute top-6 right-32 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
+                onClick={zoomIn}
+              >
+                <span className="i-ri-zoom-in-line h-4 w-4 text-gray-500" aria-hidden="true" />
+              </button>
+            )}
+          />
+          <TooltipContent>
+            {zoomInLabel}
+          </TooltipContent>
+        </Tooltip>
+        <Tooltip>
+          <TooltipTrigger
+            render={(
+              <button
+                type="button"
+                aria-label={downloadLabel}
+                className="absolute top-6 right-24 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
+                onClick={downloadImage}
+              >
+                <span className="i-ri-download-cloud-2-line h-4 w-4 text-gray-500" aria-hidden="true" />
+              </button>
+            )}
+          />
+          <TooltipContent>
+            {downloadLabel}
+          </TooltipContent>
+        </Tooltip>
+        <Tooltip>
+          <TooltipTrigger
+            render={(
+              <button
+                type="button"
+                aria-label={openInNewTabLabel}
+                className="absolute top-6 right-16 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
+                onClick={openInNewTab}
+              >
+                <span className="i-ri-add-box-line h-4 w-4 text-gray-500" aria-hidden="true" />
+              </button>
+            )}
+          />
+          <TooltipContent>
+            {openInNewTabLabel}
+          </TooltipContent>
+        </Tooltip>
+        <Tooltip>
+          <TooltipTrigger
+            render={(
+              <button
+                type="button"
+                aria-label={cancelLabel}
+                className="absolute top-6 right-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg bg-white/8 backdrop-blur-[2px]"
+                onClick={onCancel}
+              >
+                <span className="i-ri-close-line h-4 w-4 text-gray-500" aria-hidden="true" />
+              </button>
+            )}
+          />
+          <TooltipContent>
+            {cancelLabel}
+          </TooltipContent>
+        </Tooltip>
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/components/base/image-uploader/video-preview.tsx b/web/app/components/base/image-uploader/video-preview.tsx
index d2a0179b57..c7302d700f 100644
--- a/web/app/components/base/image-uploader/video-preview.tsx
+++ b/web/app/components/base/image-uploader/video-preview.tsx
@@ -1,5 +1,6 @@
 import type { FC } from 'react'
-import { createPortal } from 'react-dom'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
+import { useTranslation } from 'react-i18next'
 
 type VideoPreviewProps = {
   url: string
@@ -11,25 +12,45 @@ const VideoPreview: FC<VideoPreviewProps> = ({
   title,
   onCancel,
 }) => {
-  return createPortal(
-    <div className="fixed inset-0 z-1000 flex items-center justify-center bg-black/80 p-8" onClick={e => e.stopPropagation()} data-testid="video-preview">
-      <div>
-        <video controls title={title} autoPlay={false} preload="metadata" data-testid="video-element">
-          <source
-            type="video/mp4"
-            src={url}
-            className="max-h-full max-w-full"
-          />
-        </video>
-      </div>
-      <div
-        className="absolute top-6 right-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg bg-white/[0.08] backdrop-blur-[2px]"
-        onClick={onCancel}
+  const { t } = useTranslation()
+
+  return (
+    <Dialog
+      open
+      onOpenChange={(open) => {
+        if (!open)
+          onCancel()
+      }}
+      disablePointerDismissal
+    >
+      <DialogContent
+        className="inset-0! top-0! left-0! flex h-dvh! max-h-none! w-screen! max-w-none! translate-x-0! translate-y-0! items-center justify-center overflow-hidden! rounded-none! border-none! bg-black/80 p-8! shadow-none!"
+        backdropClassName="bg-transparent!"
       >
-        <span className="i-ri-close-line h-4 w-4 text-gray-500" data-testid="close-button" />
-      </div>
-    </div>,
-    document.body,
+        <div
+          aria-label={title}
+          data-testid="video-preview"
+          tabIndex={-1}
+          onClick={e => e.stopPropagation()}
+        >
+          <video controls title={title} autoPlay={false} preload="metadata" data-testid="video-element">
+            <source
+              type="video/mp4"
+              src={url}
+              className="max-h-full max-w-full"
+            />
+          </video>
+        </div>
+        <button
+          type="button"
+          aria-label={t('operation.close', { ns: 'common' })}
+          className="absolute top-6 right-6 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg border-none bg-white/[0.08] p-0 backdrop-blur-[2px]"
+          onClick={onCancel}
+        >
+          <span className="i-ri-close-line h-4 w-4 text-gray-500" aria-hidden="true" />
+        </button>
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/components/base/infotip/index.tsx b/web/app/components/base/infotip/index.tsx
index 0927e6ac27..94c35a101d 100644
--- a/web/app/components/base/infotip/index.tsx
+++ b/web/app/components/base/infotip/index.tsx
@@ -1,7 +1,7 @@
 'use client'
 
 import type { Placement } from '@langgenius/dify-ui/popover'
-import type { ReactNode } from 'react'
+import type { MouseEvent, ReactNode } from 'react'
 import { cn } from '@langgenius/dify-ui/cn'
 import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
 
@@ -58,6 +58,10 @@ export function Infotip({
   delay = 300,
   closeDelay = 200,
 }: InfotipProps) {
+  const handleClick = (event: MouseEvent<HTMLButtonElement>) => {
+    event.stopPropagation()
+  }
+
   return (
     <Popover>
       <PopoverTrigger
@@ -65,6 +69,7 @@ export function Infotip({
         delay={delay}
         closeDelay={closeDelay}
         aria-label={ariaLabel}
+        onClick={handleClick}
         className={cn(
           'inline-flex h-4 w-4 shrink-0 cursor-pointer items-center justify-center border-0 bg-transparent p-0 focus-visible:ring-1 focus-visible:ring-components-input-border-hover focus-visible:outline-hidden',
           className,
diff --git a/web/app/components/base/input-with-copy/__tests__/index.spec.tsx b/web/app/components/base/input-with-copy/__tests__/index.spec.tsx
index 33ebec5cbc..b985a0f018 100644
--- a/web/app/components/base/input-with-copy/__tests__/index.spec.tsx
+++ b/web/app/components/base/input-with-copy/__tests__/index.spec.tsx
@@ -163,13 +163,8 @@ describe('InputWithCopy component', () => {
     const mockOnChange = vi.fn()
     render(<InputWithCopy value="test value" onChange={mockOnChange} />)
 
-    // The tooltip content should use the 'copied' translation
-    const copyButton = screen.getByRole('button')
+    const copyButton = screen.getByRole('button', { name: 'appOverview.overview.appInfo.embedded.copied' })
     expect(copyButton).toBeInTheDocument()
-
-    // Verify the filled clipboard icon is rendered (not the line variant)
-    const filledIcon = screen.getByTestId('copied-icon')
-    expect(filledIcon).toBeInTheDocument()
   })
 
   it('shows copy tooltip text when copied state is false', () => {
@@ -177,20 +172,16 @@ describe('InputWithCopy component', () => {
     const mockOnChange = vi.fn()
     render(<InputWithCopy value="test value" onChange={mockOnChange} />)
 
-    const copyButton = screen.getByRole('button')
+    const copyButton = screen.getByRole('button', { name: 'appOverview.overview.appInfo.embedded.copy' })
     expect(copyButton).toBeInTheDocument()
-
-    const lineIcon = screen.getByTestId('copy-icon')
-    expect(lineIcon).toBeInTheDocument()
   })
 
   it('calls reset on mouse leave from copy button wrapper', () => {
     const mockOnChange = vi.fn()
     render(<InputWithCopy value="test value" onChange={mockOnChange} />)
 
-    const wrapper = screen.getByTestId('copy-button-wrapper')
-    expect(wrapper).toBeInTheDocument()
-    fireEvent.mouseLeave(wrapper)
+    const copyButton = screen.getByRole('button')
+    fireEvent.mouseLeave(copyButton)
 
     expect(mockReset).toHaveBeenCalled()
   })
diff --git a/web/app/components/base/input-with-copy/index.tsx b/web/app/components/base/input-with-copy/index.tsx
index 2da2e547c2..7e1ee60331 100644
--- a/web/app/components/base/input-with-copy/index.tsx
+++ b/web/app/components/base/input-with-copy/index.tsx
@@ -1,11 +1,11 @@
 'use client'
 import type { InputProps } from '../input'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import { useClipboard } from '@/hooks/use-clipboard'
 import ActionButton from '../action-button'
-import Tooltip from '../tooltip'
 
 type InputWithCopyProps = {
   showCopyButton?: boolean
@@ -61,21 +61,26 @@ const InputWithCopy = React.forwardRef<HTMLInputElement, InputWithCopyProps>((
       {showCopyButton && (
         <div
           className="absolute top-1/2 right-2 -translate-y-1/2"
-          onMouseLeave={reset}
-          data-testid="copy-button-wrapper"
         >
-          <Tooltip
-            popupContent={safeTooltipText}
-          >
-            <ActionButton
-              size="xs"
-              onClick={handleCopy}
-              className="hover:bg-components-button-ghost-bg-hover"
-            >
-              {copied
-                ? (<span className="i-ri-clipboard-fill h-3.5 w-3.5 text-text-tertiary" data-testid="copied-icon" />)
-                : (<span className="i-ri-clipboard-line h-3.5 w-3.5 text-text-tertiary" data-testid="copy-icon" />)}
-            </ActionButton>
+          <Tooltip>
+            <TooltipTrigger
+              render={(
+                <ActionButton
+                  size="xs"
+                  aria-label={safeTooltipText}
+                  onClick={handleCopy}
+                  onMouseLeave={reset}
+                  className="hover:bg-components-button-ghost-bg-hover"
+                >
+                  {copied
+                    ? (<span className="i-ri-clipboard-fill h-3.5 w-3.5 text-text-tertiary" aria-hidden="true" />)
+                    : (<span className="i-ri-clipboard-line h-3.5 w-3.5 text-text-tertiary" aria-hidden="true" />)}
+                </ActionButton>
+              )}
+            />
+            <TooltipContent>
+              {safeTooltipText}
+            </TooltipContent>
           </Tooltip>
         </div>
       )}
diff --git a/web/app/components/base/input/__tests__/index.spec.tsx b/web/app/components/base/input/__tests__/index.spec.tsx
index 7dc5d22eab..90bac0095f 100644
--- a/web/app/components/base/input/__tests__/index.spec.tsx
+++ b/web/app/components/base/input/__tests__/index.spec.tsx
@@ -66,7 +66,7 @@ describe('Input component', () => {
   it('calls onClear when clear icon is clicked', () => {
     const onClear = vi.fn()
     render(<Input showClearIcon value="test" onClear={onClear} />)
-    const clearIconContainer = screen.getByTestId('input-clear')
+    const clearIconContainer = screen.getByRole('button', { name: 'common.operation.clear' })
     fireEvent.click(clearIconContainer!)
     expect(onClear).toHaveBeenCalledTimes(1)
   })
diff --git a/web/app/components/base/input/index.tsx b/web/app/components/base/input/index.tsx
index d41cd2c0cf..deeca1e3c4 100644
--- a/web/app/components/base/input/index.tsx
+++ b/web/app/components/base/input/index.tsx
@@ -109,13 +109,14 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(({
         {...props}
       />
       {!!(showClearIcon && value && !disabled && !destructive) && (
-        <div
-          className={cn('group absolute top-1/2 right-2 -translate-y-1/2 cursor-pointer p-px')}
+        <button
+          type="button"
+          aria-label={t('operation.clear', { ns: 'common' })}
+          className={cn('group absolute top-1/2 right-2 -translate-y-1/2 cursor-pointer border-none bg-transparent p-px')}
           onClick={onClear}
-          data-testid="input-clear"
         >
-          <span className="i-ri-close-circle-fill h-3.5 w-3.5 cursor-pointer text-text-quaternary group-hover:text-text-tertiary" />
-        </div>
+          <span className="i-ri-close-circle-fill h-3.5 w-3.5 cursor-pointer text-text-quaternary group-hover:text-text-tertiary" aria-hidden="true" />
+        </button>
       )}
       {destructive && (
         <span className="absolute top-1/2 right-2 i-ri-error-warning-line h-4 w-4 -translate-y-1/2 text-text-destructive-secondary" />
diff --git a/web/app/components/base/markdown-blocks/__tests__/form.spec.tsx b/web/app/components/base/markdown-blocks/__tests__/form.spec.tsx
index ebf70b6b77..3425983102 100644
--- a/web/app/components/base/markdown-blocks/__tests__/form.spec.tsx
+++ b/web/app/components/base/markdown-blocks/__tests__/form.spec.tsx
@@ -291,7 +291,25 @@ describe('MarkdownForm', () => {
 
       render(<MarkdownForm node={node} />)
 
-      await user.click(screen.getByTestId('checkbox-acceptTerms'))
+      await user.click(screen.getByRole('checkbox', { name: 'Accept terms' }))
+      await user.click(screen.getByRole('button', { name: 'Submit' }))
+
+      await waitFor(() => {
+        expect(mockOnSend).toHaveBeenCalledWith('acceptTerms: true')
+      })
+    })
+
+    it('should toggle checkbox when external label is clicked', async () => {
+      const user = userEvent.setup()
+      const node = createRootNode([
+        createElementNode('label', { htmlFor: 'acceptTerms' }, [createTextNode('Accept terms')]),
+        createElementNode('input', { type: 'checkbox', name: 'acceptTerms', value: false }),
+        createElementNode('button', {}, [createTextNode('Submit')]),
+      ])
+
+      render(<MarkdownForm node={node} />)
+
+      await user.click(screen.getByText('Accept terms'))
       await user.click(screen.getByRole('button', { name: 'Submit' }))
 
       await waitFor(() => {
@@ -369,8 +387,8 @@ describe('MarkdownForm', () => {
 
       render(<MarkdownForm node={node} />)
 
-      const clearIcon = screen.getByTestId('date-picker-clear-button')
-      await user.click(clearIcon)
+      const clearButton = screen.getByRole('button', { name: 'common.operation.clear' })
+      await user.click(clearButton)
 
       await user.click(screen.getByRole('button', { name: 'Submit' }))
 
@@ -689,7 +707,7 @@ describe('MarkdownForm', () => {
 
       render(<MarkdownForm node={node} />)
 
-      expect(screen.getByTestId('checkbox-agree'))!.toBeInTheDocument()
+      expect(screen.getByRole('checkbox', { name: 'agree' }))!.toBeInTheDocument()
     })
 
     it('should render select with no options when dataOptions is missing', () => {
diff --git a/web/app/components/base/markdown-blocks/form.tsx b/web/app/components/base/markdown-blocks/form.tsx
index 7c80590e24..cd2e44012e 100644
--- a/web/app/components/base/markdown-blocks/form.tsx
+++ b/web/app/components/base/markdown-blocks/form.tsx
@@ -1,39 +1,43 @@
 import type { ButtonProps } from '@langgenius/dify-ui/button'
 import type { Dayjs } from 'dayjs'
 import { Button } from '@langgenius/dify-ui/button'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import { Select, SelectContent, SelectItem, SelectItemIndicator, SelectItemText, SelectTrigger, SelectValue } from '@langgenius/dify-ui/select'
 import * as React from 'react'
 import { useCallback, useMemo, useState } from 'react'
 import { useChatContext } from '@/app/components/base/chat/chat/context'
-import Checkbox from '@/app/components/base/checkbox'
 import DatePicker from '@/app/components/base/date-and-time-picker/date-picker'
 import TimePicker from '@/app/components/base/date-and-time-picker/time-picker'
 import { formatDateForOutput, toDayjs } from '@/app/components/base/date-and-time-picker/utils/dayjs'
 import Input from '@/app/components/base/input'
 import Textarea from '@/app/components/base/textarea'
 
-enum DATA_FORMAT {
-  TEXT = 'text',
-  JSON = 'json',
-}
-enum SUPPORTED_TAGS {
-  LABEL = 'label',
-  INPUT = 'input',
-  TEXTAREA = 'textarea',
-  BUTTON = 'button',
-}
-enum SUPPORTED_TYPES {
-  TEXT = 'text',
-  PASSWORD = 'password',
-  EMAIL = 'email',
-  NUMBER = 'number',
-  DATE = 'date',
-  TIME = 'time',
-  DATETIME = 'datetime',
-  CHECKBOX = 'checkbox',
-  SELECT = 'select',
-  HIDDEN = 'hidden',
-}
+const DATA_FORMAT = {
+  TEXT: 'text',
+  JSON: 'json',
+} as const
+
+const SUPPORTED_TAGS = {
+  LABEL: 'label',
+  INPUT: 'input',
+  TEXTAREA: 'textarea',
+  BUTTON: 'button',
+} as const
+
+const SUPPORTED_TYPES = {
+  TEXT: 'text',
+  PASSWORD: 'password',
+  EMAIL: 'email',
+  NUMBER: 'number',
+  DATE: 'date',
+  TIME: 'time',
+  DATETIME: 'datetime',
+  CHECKBOX: 'checkbox',
+  SELECT: 'select',
+  HIDDEN: 'hidden',
+} as const
+
+type SupportedType = typeof SUPPORTED_TYPES[keyof typeof SUPPORTED_TYPES]
 
 const SUPPORTED_TYPES_SET = new Set<string>(Object.values(SUPPORTED_TYPES))
 
@@ -83,6 +87,10 @@ function getTextContent(node: HastElement): string {
   return textChild?.value ?? ''
 }
 
+function getLabelTarget(node: HastElement): string {
+  return str(node.properties.htmlFor || node.properties.for || node.properties.name)
+}
+
 function str(val: unknown): string {
   if (val == null)
     return ''
@@ -239,7 +247,7 @@ const MarkdownForm = ({ node }: { node: HastElement }) => {
           return (
             <label
               key={key}
-              htmlFor={str(child.properties.htmlFor || child.properties.name)}
+              htmlFor={getLabelTarget(child)}
               className="my-2 system-md-semibold text-text-secondary"
               data-testid="label-field"
             >
@@ -253,7 +261,7 @@ const MarkdownForm = ({ node }: { node: HastElement }) => {
           if (!isSafeName(name))
             return null
 
-          const type = str(child.properties.type) as SUPPORTED_TYPES
+          const type = str(child.properties.type) as SupportedType
 
           if (type === SUPPORTED_TYPES.DATE || type === SUPPORTED_TYPES.DATETIME) {
             return (
@@ -277,14 +285,20 @@ const MarkdownForm = ({ node }: { node: HastElement }) => {
             )
           }
           if (type === SUPPORTED_TYPES.CHECKBOX) {
+            const label = str(child.properties.dataTip || child.properties['data-tip'])
+            const hasExternalLabel = elementChildren.some(node =>
+              node.tagName === SUPPORTED_TAGS.LABEL && getLabelTarget(node) === name,
+            )
+            const checkboxAriaLabel = label || (hasExternalLabel ? undefined : name)
             return (
               <div className="mt-2 flex h-6 items-center space-x-2" key={key}>
                 <Checkbox
-                  checked={!!formValues[name]}
-                  onCheck={() => updateValue(name, !formValues[name])}
                   id={name}
+                  checked={!!formValues[name]}
+                  aria-label={checkboxAriaLabel}
+                  onCheckedChange={checked => updateValue(name, checked)}
                 />
-                <span>{str(child.properties.dataTip || child.properties['data-tip'])}</span>
+                {label && <span>{label}</span>}
               </div>
             )
           }
@@ -309,7 +323,10 @@ const MarkdownForm = ({ node }: { node: HastElement }) => {
               <Select
                 key={key}
                 defaultValue={formValues[name] as string | undefined}
-                onValueChange={val => updateValue(name, val as string)}
+                onValueChange={(val) => {
+                  if (val != null)
+                    updateValue(name, val)
+                }}
               >
                 <SelectTrigger className="w-full">
                   <SelectValue />
diff --git a/web/app/components/base/markdown-with-directive/__tests__/index.spec.tsx b/web/app/components/base/markdown-with-directive/__tests__/index.spec.tsx
index e71abd6620..d2b2d2a249 100644
--- a/web/app/components/base/markdown-with-directive/__tests__/index.spec.tsx
+++ b/web/app/components/base/markdown-with-directive/__tests__/index.spec.tsx
@@ -185,6 +185,15 @@ describe('markdown-with-directive', () => {
       })
       expect(screen.getByText('Sanitized')).toBeInTheDocument()
       expectDecorativeIcon(container, 'https://example.com/safe.png')
+      sanitizeSpy.mockRestore()
+    })
+
+    it('should render markdown links without underline', () => {
+      render(<MarkdownWithDirective markdown="[Langfuse](https://langfuse.com)" />)
+
+      const link = screen.getByRole('link', { name: 'Langfuse' })
+      expect(link).toHaveClass('text-text-accent')
+      expect(link).toHaveStyle({ textDecoration: 'none' })
     })
 
     it('should render empty output and skip sanitizer when markdown is empty', () => {
diff --git a/web/app/components/base/markdown-with-directive/index.tsx b/web/app/components/base/markdown-with-directive/index.tsx
index 8da4cf7ede..e8feca39a3 100644
--- a/web/app/components/base/markdown-with-directive/index.tsx
+++ b/web/app/components/base/markdown-with-directive/index.tsx
@@ -1,5 +1,5 @@
 'use client'
-import type { ReactNode } from 'react'
+import type { AnchorHTMLAttributes, ClassAttributes, ReactNode } from 'react'
 import type { Components, StreamdownProps } from 'streamdown'
 import DOMPurify from 'dompurify'
 import remarkDirective from 'remark-directive'
@@ -241,10 +241,25 @@ function directivePlugin() {
   }
 }
 
-const directiveComponents = {
+const directiveComponents: Components = {
+  a: (props) => {
+    const { children, href } = props as ClassAttributes<HTMLAnchorElement> & AnchorHTMLAttributes<HTMLAnchorElement>
+
+    return (
+      <a
+        href={href}
+        target="_blank"
+        rel="noopener noreferrer"
+        className="text-text-accent"
+        style={{ textDecoration: 'none' }}
+      >
+        {children}
+      </a>
+    )
+  },
   withiconcardlist: WithIconCardListAdapter,
   withiconcarditem: WithIconCardItemAdapter,
-} satisfies Components
+}
 
 type MarkdownWithDirectiveProps = {
   markdown: string
diff --git a/web/app/components/base/mermaid/__tests__/index.spec.tsx b/web/app/components/base/mermaid/__tests__/index.spec.tsx
index 310f346083..14c178e418 100644
--- a/web/app/components/base/mermaid/__tests__/index.spec.tsx
+++ b/web/app/components/base/mermaid/__tests__/index.spec.tsx
@@ -414,7 +414,7 @@ describe('Mermaid Flowchart Component', () => {
       })
 
       // Wait for image preview to appear
-      const cancelBtn = await screen.findByTestId('image-preview-close-button')
+      const cancelBtn = await screen.findByRole('button', { name: 'common.operation.cancel' })
       expect(cancelBtn).toBeInTheDocument()
 
       await act(async () => {
@@ -423,7 +423,7 @@ describe('Mermaid Flowchart Component', () => {
 
       await waitFor(() => {
         expect(screen.queryByTestId('image-preview-container')).not.toBeInTheDocument()
-        expect(screen.queryByTestId('image-preview-close-button')).not.toBeInTheDocument()
+        expect(screen.queryByRole('button', { name: 'common.operation.cancel' })).not.toBeInTheDocument()
       })
     })
 
diff --git a/web/app/components/base/message-log-modal/__tests__/index.spec.tsx b/web/app/components/base/message-log-modal/__tests__/index.spec.tsx
index 525f190743..f7e0158896 100644
--- a/web/app/components/base/message-log-modal/__tests__/index.spec.tsx
+++ b/web/app/components/base/message-log-modal/__tests__/index.spec.tsx
@@ -4,11 +4,9 @@ import { useStore } from '@/app/components/app/store'
 import MessageLogModal from '../index'
 
 let clickAwayHandler: (() => void) | null = null
-let clickAwayHandlers: (() => void)[] = []
 vi.mock('ahooks', () => ({
   useClickAway: (fn: () => void) => {
     clickAwayHandler = fn
-    clickAwayHandlers.push(fn)
   },
 }))
 
@@ -40,7 +38,6 @@ describe('MessageLogModal', () => {
   beforeEach(() => {
     vi.clearAllMocks()
     clickAwayHandler = null
-    clickAwayHandlers = []
     // eslint-disable-next-line ts/no-explicit-any
     vi.mocked(useStore).mockImplementation((selector: any) => selector({
       appDetail: { id: 'app-1' },
@@ -76,38 +73,40 @@ describe('MessageLogModal', () => {
 
     it('sets fixed style when fixedWidth is false (floating)', () => {
       const { container } = render(<MessageLogModal width={1000} onCancel={onCancel} currentLogItem={mockLog} fixedWidth={false} />)
-      const modal = container.firstChild as HTMLElement
-      expect(modal.style.position).toBe('fixed')
-      expect(modal.style.width).toBe('480px')
+      const modal = screen.getByRole('dialog')
+      expect(container).not.toContainElement(modal)
+      expect(document.body).toContainElement(modal)
+      expect(modal).toHaveClass('fixed', 'z-50', 'w-[480px]!', 'left-[max(8px,calc(100vw-1136px))]!')
     })
 
     it('sets fixed width when fixedWidth is true', () => {
       const { container } = render(<MessageLogModal width={1000} onCancel={onCancel} currentLogItem={mockLog} fixedWidth={true} />)
-      const modal = container.firstChild as HTMLElement
-      expect(modal.style.width).toBe('1000px')
+      const panel = container.firstElementChild as HTMLElement
+      expect(panel).toHaveClass('relative', 'z-10')
+      expect(panel.style.width).toBe('1000px')
     })
   })
 
   describe('Interaction', () => {
     it('calls onCancel when close icon is clicked', () => {
       render(<MessageLogModal width={800} onCancel={onCancel} currentLogItem={mockLog} />)
-      const closeButton = screen.getByTestId('close-button')
+      const closeButton = screen.getByRole('button', { name: 'common.operation.close' })
       expect(closeButton)!.toBeInTheDocument()
       fireEvent.click(closeButton)
       expect(onCancel).toHaveBeenCalledTimes(1)
     })
 
     it('calls onCancel when clicked away', () => {
-      render(<MessageLogModal width={800} onCancel={onCancel} currentLogItem={mockLog} />)
+      render(<MessageLogModal width={800} onCancel={onCancel} currentLogItem={mockLog} fixedWidth />)
       expect(clickAwayHandler).toBeTruthy()
       clickAwayHandler!()
       expect(onCancel).toHaveBeenCalledTimes(1)
     })
 
-    it('does not call onCancel when clicked away if not mounted', () => {
+    it('does not use click away to close the floating dialog', () => {
       render(<MessageLogModal width={800} onCancel={onCancel} currentLogItem={mockLog} />)
-      expect(clickAwayHandlers.length).toBeGreaterThan(0)
-      clickAwayHandlers[0]!() // This is the closure from the initial render, where mounted is false
+      expect(clickAwayHandler).toBeTruthy()
+      clickAwayHandler!()
       expect(onCancel).not.toHaveBeenCalled()
     })
   })
diff --git a/web/app/components/base/message-log-modal/index.tsx b/web/app/components/base/message-log-modal/index.tsx
index 2d8d1dec66..6b63ccdf3f 100644
--- a/web/app/components/base/message-log-modal/index.tsx
+++ b/web/app/components/base/message-log-modal/index.tsx
@@ -1,13 +1,18 @@
 import type { FC } from 'react'
 import type { IChatItem } from '@/app/components/base/chat/chat/type'
 import { cn } from '@langgenius/dify-ui/cn'
-import { RiCloseLine } from '@remixicon/react'
+import { Dialog, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import { useClickAway } from 'ahooks'
-import { useEffect, useRef, useState } from 'react'
+import { useRef } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useStore } from '@/app/components/app/store'
 import Run from '@/app/components/workflow/run'
 
+type RunActiveTab = 'RESULT' | 'DETAIL' | 'TRACING'
+
+const isRunActiveTab = (tab: string): tab is RunActiveTab =>
+  tab === 'RESULT' || tab === 'DETAIL' || tab === 'TRACING'
+
 type MessageLogModalProps = {
   currentLogItem?: IChatItem
   defaultTab?: string
@@ -24,46 +29,80 @@ const MessageLogModal: FC<MessageLogModalProps> = ({
 }) => {
   const { t } = useTranslation()
   const ref = useRef(null)
-  const [mounted, setMounted] = useState(false)
   const appDetail = useStore(state => state.appDetail)
 
   useClickAway(() => {
-    if (mounted)
+    if (fixedWidth)
       onCancel()
   }, ref)
 
-  useEffect(() => {
-    setMounted(true)
-  }, [])
-
   if (!currentLogItem || !currentLogItem.workflow_run_id)
     return null
 
+  const activeTab = isRunActiveTab(defaultTab) ? defaultTab : 'DETAIL'
+  const modalContent = (
+    <>
+      <DialogTitle className="shrink-0 px-4 py-1 system-xl-semibold text-text-primary">{t('runDetail.title', { ns: 'appLog' })}</DialogTitle>
+      <button
+        type="button"
+        aria-label={t('operation.close', { ns: 'common' })}
+        className="absolute top-4 right-3 z-20 cursor-pointer border-none bg-transparent p-1 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+        onClick={onCancel}
+      >
+        <span className="i-ri-close-line h-4 w-4 text-text-tertiary" aria-hidden="true" />
+      </button>
+      <Run
+        hideResult
+        activeTab={activeTab}
+        runDetailUrl={`/apps/${appDetail?.id}/workflow-runs/${currentLogItem.workflow_run_id}`}
+        tracingListUrl={`/apps/${appDetail?.id}/workflow-runs/${currentLogItem.workflow_run_id}/node-executions`}
+      />
+    </>
+  )
+
+  if (!fixedWidth) {
+    return (
+      <Dialog
+        open
+        onOpenChange={(open) => {
+          if (!open)
+            onCancel()
+        }}
+      >
+        <DialogContent
+          backdropClassName="bg-transparent!"
+          className="top-16! bottom-4! left-[max(8px,calc(100vw-1136px))]! flex max-h-none! w-[480px]! max-w-[calc(100vw-16px)]! translate-x-0! translate-y-0! flex-col overflow-hidden! rounded-xl! border-[0.5px]! border-components-panel-border! bg-components-panel-bg! p-0! pt-3! shadow-xl!"
+        >
+          {modalContent}
+        </DialogContent>
+      </Dialog>
+    )
+  }
+
   return (
     <div
-      className={cn('relative z-10 flex flex-col rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg pt-3 shadow-xl')}
+      className={cn(
+        'relative z-10',
+        'flex flex-col rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg pt-3 shadow-xl',
+      )}
       style={{
-        width: fixedWidth ? width : 480,
-        ...(!fixedWidth
-          ? {
-              position: 'fixed',
-              top: 56 + 8,
-              left: 8 + (width - 480),
-              bottom: 16,
-            }
-          : {
-              marginRight: 8,
-            }),
+        width,
+        marginRight: 8,
       }}
       ref={ref}
     >
       <h1 className="shrink-0 px-4 py-1 system-xl-semibold text-text-primary">{t('runDetail.title', { ns: 'appLog' })}</h1>
-      <span className="absolute top-4 right-3 z-20 cursor-pointer p-1" onClick={onCancel} data-testid="close-button">
-        <RiCloseLine className="h-4 w-4 text-text-tertiary" />
-      </span>
+      <button
+        type="button"
+        aria-label={t('operation.close', { ns: 'common' })}
+        className="absolute top-4 right-3 z-20 cursor-pointer border-none bg-transparent p-1 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+        onClick={onCancel}
+      >
+        <span className="i-ri-close-line h-4 w-4 text-text-tertiary" aria-hidden="true" />
+      </button>
       <Run
         hideResult
-        activeTab={defaultTab as any}
+        activeTab={activeTab}
         runDetailUrl={`/apps/${appDetail?.id}/workflow-runs/${currentLogItem.workflow_run_id}`}
         tracingListUrl={`/apps/${appDetail?.id}/workflow-runs/${currentLogItem.workflow_run_id}/node-executions`}
       />
diff --git a/web/app/components/base/modal-like-wrap/__tests__/index.spec.tsx b/web/app/components/base/modal-like-wrap/__tests__/index.spec.tsx
deleted file mode 100644
index dc7b0758fa..0000000000
--- a/web/app/components/base/modal-like-wrap/__tests__/index.spec.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-import { act, fireEvent, render, screen } from '@testing-library/react'
-import ModalLikeWrap from '..'
-
-describe('ModalLikeWrap', () => {
-  const defaultProps = {
-    title: 'Test Title',
-    onClose: vi.fn(),
-    onConfirm: vi.fn(),
-    children: <div>Test Content</div>,
-  }
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  describe('Render', () => {
-    it('renders title and content correctly', () => {
-      render(<ModalLikeWrap {...defaultProps} />)
-
-      expect(screen.getByText('Test Title')).toBeInTheDocument()
-      expect(screen.getByText('Test Content')).toBeInTheDocument()
-    })
-
-    it('renders beforeHeader if provided', () => {
-      const beforeHeader = <div data-testid="before-header">Before Header</div>
-      render(<ModalLikeWrap {...defaultProps} beforeHeader={beforeHeader} />)
-
-      expect(screen.getByTestId('before-header')).toBeInTheDocument()
-      expect(screen.getByText('Before Header')).toBeInTheDocument()
-    })
-  })
-
-  describe('Interactions', () => {
-    it('calls onClose when close icon is clicked', async () => {
-      render(<ModalLikeWrap {...defaultProps} />)
-
-      const closeBtn = screen.getByTestId('modal-close-btn')
-      expect(closeBtn).toBeInTheDocument()
-
-      await act(async () => {
-        fireEvent.click(closeBtn)
-      })
-
-      expect(defaultProps.onClose).toHaveBeenCalledTimes(1)
-    })
-
-    it('calls onClose when Cancel button is clicked', async () => {
-      render(<ModalLikeWrap {...defaultProps} />)
-
-      const cancelBtn = screen.getByText('common.operation.cancel')
-      await act(async () => {
-        fireEvent.click(cancelBtn)
-      })
-
-      expect(defaultProps.onClose).toHaveBeenCalled()
-    })
-
-    it('calls onConfirm when Save button is clicked', async () => {
-      render(<ModalLikeWrap {...defaultProps} />)
-
-      const saveBtn = screen.getByText('common.operation.save')
-      await act(async () => {
-        fireEvent.click(saveBtn)
-      })
-
-      expect(defaultProps.onConfirm).toHaveBeenCalled()
-    })
-  })
-
-  describe('Props', () => {
-    it('hides close icon when hideCloseBtn is true', () => {
-      render(<ModalLikeWrap {...defaultProps} hideCloseBtn={true} />)
-
-      const closeBtn = document.querySelector('.remixicon')
-      expect(closeBtn).not.toBeInTheDocument()
-    })
-
-    it('applies custom className', () => {
-      const { container } = render(<ModalLikeWrap {...defaultProps} className="custom-class" />)
-
-      expect(container.firstChild).toHaveClass('custom-class')
-    })
-  })
-})
diff --git a/web/app/components/base/modal-like-wrap/index.stories.tsx b/web/app/components/base/modal-like-wrap/index.stories.tsx
deleted file mode 100644
index 38d969b2ce..0000000000
--- a/web/app/components/base/modal-like-wrap/index.stories.tsx
+++ /dev/null
@@ -1,131 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/nextjs-vite'
-import ModalLikeWrap from '.'
-
-const meta = {
-  title: 'Base/Feedback/ModalLikeWrap',
-  component: ModalLikeWrap,
-  parameters: {
-    layout: 'centered',
-    docs: {
-      description: {
-        component: 'Compact “modal-like” card used in wizards. Provides header actions, optional back slot, and confirm/cancel buttons.',
-      },
-    },
-  },
-  tags: ['autodocs'],
-  argTypes: {
-    title: {
-      control: 'text',
-      description: 'Header title text.',
-    },
-    className: {
-      control: 'text',
-      description: 'Additional classes on the wrapper.',
-    },
-    beforeHeader: {
-      control: false,
-      description: 'Slot rendered before the header (commonly a back link).',
-    },
-    hideCloseBtn: {
-      control: 'boolean',
-      description: 'Hides the top-right close icon when true.',
-    },
-    children: {
-      control: false,
-    },
-    onClose: {
-      control: false,
-    },
-    onConfirm: {
-      control: false,
-    },
-  },
-  args: {
-    title: 'Create dataset field',
-    hideCloseBtn: false,
-    onClose: () => console.log('close'),
-    onConfirm: () => console.log('confirm'),
-    children: null,
-  },
-} satisfies Meta<typeof ModalLikeWrap>
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-const BaseContent = () => (
-  <div className="space-y-3 text-sm text-gray-600">
-    <p>
-      Describe the new field your dataset should collect. Provide a clear label and optional helper text.
-    </p>
-    <div className="rounded-lg border border-dashed border-gray-200 bg-gray-50 p-4 text-xs text-gray-500">
-      Form inputs would be placed here in the real flow.
-    </div>
-  </div>
-)
-
-export const Default: Story = {
-  render: args => (
-    <ModalLikeWrap {...args}>
-      <BaseContent />
-    </ModalLikeWrap>
-  ),
-  args: {
-    children: null,
-  },
-}
-
-export const WithBackLink: Story = {
-  render: args => (
-    <ModalLikeWrap
-      {...args}
-      hideCloseBtn
-      beforeHeader={(
-        <button
-          className="mb-1 flex items-center gap-1 text-xs font-medium text-text-accent uppercase"
-          onClick={() => console.log('back')}
-        >
-          <span className="inline-block h-4 w-4 rounded-sm bg-text-accent/10 text-center text-[10px] leading-4 text-text-accent">{'<'}</span>
-          Back
-        </button>
-      )}
-    >
-      <BaseContent />
-    </ModalLikeWrap>
-  ),
-  args: {
-    title: 'Select metadata type',
-    children: null,
-  },
-  parameters: {
-    docs: {
-      description: {
-        story: 'Demonstrates feeding content into `beforeHeader` while hiding the close button.',
-      },
-    },
-  },
-}
-
-export const CustomWidth: Story = {
-  render: args => (
-    <ModalLikeWrap
-      {...args}
-      className="w-[420px]"
-    >
-      <BaseContent />
-      <div className="mt-4 rounded-md bg-blue-50 p-3 text-xs text-blue-600">
-        Tip: metadata keys may only include letters, numbers, and underscores.
-      </div>
-    </ModalLikeWrap>
-  ),
-  args: {
-    title: 'Advanced configuration',
-    children: null,
-  },
-  parameters: {
-    docs: {
-      description: {
-        story: 'Applies extra width and helper messaging to emulate configuration panels.',
-      },
-    },
-  },
-}
diff --git a/web/app/components/base/modal-like-wrap/index.tsx b/web/app/components/base/modal-like-wrap/index.tsx
deleted file mode 100644
index 1c049eb5f4..0000000000
--- a/web/app/components/base/modal-like-wrap/index.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-'use client'
-import type { FC } from 'react'
-import { Button } from '@langgenius/dify-ui/button'
-import { cn } from '@langgenius/dify-ui/cn'
-import * as React from 'react'
-import { useTranslation } from 'react-i18next'
-
-type Props = {
-  title: string
-  className?: string
-  beforeHeader?: React.ReactNode
-  onClose: () => void
-  hideCloseBtn?: boolean
-  onConfirm: () => void
-  children: React.ReactNode
-}
-
-const ModalLikeWrap: FC<Props> = ({
-  title,
-  className,
-  beforeHeader,
-  children,
-  onClose,
-  hideCloseBtn,
-  onConfirm,
-}) => {
-  const { t } = useTranslation()
-
-  return (
-    <div className={cn('w-[320px] rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg px-3 pt-3.5 pb-4 shadow-xl', className)}>
-      {beforeHeader || null}
-      <div className="mb-1 flex h-6 items-center justify-between">
-        <div className="system-xl-semibold text-text-primary">{title}</div>
-        {!hideCloseBtn && (
-          <div
-            className="cursor-pointer p-1.5 text-text-tertiary"
-            onClick={onClose}
-          >
-            <span className="i-ri-close-line size-4" data-testid="modal-close-btn" />
-          </div>
-        )}
-      </div>
-      <div className="mt-2">{children}</div>
-      <div className="mt-4 flex justify-end">
-        <Button
-          className="mr-2"
-          onClick={onClose}
-        >
-          {t('operation.cancel', { ns: 'common' })}
-        </Button>
-        <Button
-          onClick={onConfirm}
-          variant="primary"
-        >
-          {t('operation.save', { ns: 'common' })}
-        </Button>
-      </div>
-    </div>
-  )
-}
-
-export default React.memo(ModalLikeWrap)
diff --git a/web/app/components/base/modal/__tests__/index.spec.tsx b/web/app/components/base/modal/__tests__/index.spec.tsx
deleted file mode 100644
index 4705d0defd..0000000000
--- a/web/app/components/base/modal/__tests__/index.spec.tsx
+++ /dev/null
@@ -1,172 +0,0 @@
-import { act, fireEvent, render, screen } from '@testing-library/react'
-import Modal from '..'
-
-describe('Modal', () => {
-  describe('Render', () => {
-    it('should not render content when isShow is false', () => {
-      render(
-        <Modal isShow={false} title="Test Modal">
-          <div>Modal Content</div>
-        </Modal>,
-      )
-
-      expect(screen.queryByText('Test Modal')).not.toBeInTheDocument()
-      expect(screen.queryByText('Modal Content')).not.toBeInTheDocument()
-    })
-
-    it('should render content when isShow is true', async () => {
-      await act(async () => {
-        render(
-          <Modal isShow={true} title="Test Modal">
-            <div>Modal Content</div>
-          </Modal>,
-        )
-      })
-
-      expect(screen.getByText('Test Modal')).toBeInTheDocument()
-      expect(screen.getByText('Modal Content')).toBeInTheDocument()
-    })
-
-    it('should render description when provided', async () => {
-      await act(async () => {
-        render(
-          <Modal isShow={true} title="Test Modal" description="Test Description">
-            <div>Content</div>
-          </Modal>,
-        )
-      })
-
-      expect(screen.getByText('Test Description')).toBeInTheDocument()
-    })
-  })
-
-  describe('Interaction', () => {
-    it('should call onClose when close button is clicked', async () => {
-      const handleClose = vi.fn()
-      await act(async () => {
-        render(
-          <Modal isShow={true} title="Test Modal" closable={true} onClose={handleClose}>
-            <div>Content</div>
-          </Modal>,
-        )
-      })
-
-      const closeButton = screen.getByTestId('modal-close-button')
-      expect(closeButton).toBeInTheDocument()
-      await act(async () => {
-        fireEvent.click(closeButton!)
-      })
-      expect(handleClose).toHaveBeenCalledTimes(1)
-    })
-
-    it('should prevent propagation when clicking the scrollable container', async () => {
-      await act(async () => {
-        render(
-          <Modal isShow={true} title="Test Modal">
-            <div>Content</div>
-          </Modal>,
-        )
-      })
-
-      const wrapper = document.querySelector('.overflow-y-auto')
-      expect(wrapper).toBeInTheDocument()
-
-      const event = new MouseEvent('click', { bubbles: true, cancelable: true })
-      const stopPropagationSpy = vi.spyOn(event, 'stopPropagation')
-      const preventDefaultSpy = vi.spyOn(event, 'preventDefault')
-
-      await act(async () => {
-        wrapper!.dispatchEvent(event)
-      })
-
-      expect(stopPropagationSpy).toHaveBeenCalled()
-      expect(preventDefaultSpy).toHaveBeenCalled()
-    })
-
-    it('should handle clickOutsideNotClose prop', async () => {
-      const handleClose = vi.fn()
-      await act(async () => {
-        render(
-          <Modal isShow={true} title="Test Modal" clickOutsideNotClose={true} onClose={handleClose}>
-            <div>Content</div>
-          </Modal>,
-        )
-      })
-
-      await act(async () => {
-        fireEvent.keyDown(screen.getByRole('dialog'), { key: 'Escape', code: 'Escape' })
-      })
-
-      expect(handleClose).not.toHaveBeenCalled()
-    })
-  })
-
-  describe('Props', () => {
-    it('should apply custom className to the panel', async () => {
-      await act(async () => {
-        render(
-          <Modal isShow={true} title="Test Modal" className="custom-panel-class">
-            <div>Content</div>
-          </Modal>,
-        )
-      })
-
-      const panel = screen.getByText('Test Modal').parentElement
-      expect(panel).toHaveClass('custom-panel-class')
-    })
-
-    it('should apply wrapperClassName and containerClassName', async () => {
-      await act(async () => {
-        render(
-          <Modal
-            isShow={true}
-            title="Test Modal"
-            wrapperClassName="custom-wrapper"
-            containerClassName="custom-container"
-          >
-            <div>Content</div>
-          </Modal>,
-        )
-      })
-
-      const dialog = document.querySelector('.custom-wrapper')
-      expect(dialog).toBeInTheDocument()
-      const container = document.querySelector('.custom-container')
-      expect(container).toBeInTheDocument()
-    })
-
-    it('should apply overlayOpacity background when overlayOpacity is true', async () => {
-      await act(async () => {
-        render(
-          <Modal isShow={true} title="Test Modal" overlayOpacity={true}>
-            <div>Content</div>
-          </Modal>,
-        )
-      })
-
-      const overlay = document.querySelector('.bg-workflow-canvas-canvas-overlay')
-      expect(overlay).toBeInTheDocument()
-    })
-
-    it('should toggle overflow-visible class based on overflowVisible prop', async () => {
-      const { rerender } = render(
-        <Modal isShow={true} title="Test Modal" overflowVisible={true}>
-          <div>Content</div>
-        </Modal>,
-      )
-
-      let panel = screen.getByText('Test Modal').parentElement
-      expect(panel).toHaveClass('overflow-visible')
-
-      await act(async () => {
-        rerender(
-          <Modal isShow={true} title="Test Modal" overflowVisible={false}>
-            <div>Content</div>
-          </Modal>,
-        )
-      })
-      panel = screen.getByText('Test Modal').parentElement
-      expect(panel).toHaveClass('overflow-hidden')
-    })
-  })
-})
diff --git a/web/app/components/base/modal/__tests__/modal.spec.tsx b/web/app/components/base/modal/__tests__/modal.spec.tsx
deleted file mode 100644
index 47a679c843..0000000000
--- a/web/app/components/base/modal/__tests__/modal.spec.tsx
+++ /dev/null
@@ -1,128 +0,0 @@
-import { fireEvent, render, screen } from '@testing-library/react'
-import Modal from '../modal'
-
-describe('Modal Component', () => {
-  const defaultProps = {
-    title: 'Test Modal',
-    onClose: vi.fn(),
-    onConfirm: vi.fn(),
-    onCancel: vi.fn(),
-  }
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  describe('Render', () => {
-    it('renders correctly with title and children', () => {
-      render(
-        <Modal {...defaultProps}>
-          <div data-testid="modal-child">Child Content</div>
-        </Modal>,
-      )
-
-      expect(screen.getByText('Test Modal')).toBeInTheDocument()
-      expect(screen.getByTestId('modal-child')).toBeInTheDocument()
-      expect(screen.getByText(/cancel/i)).toBeInTheDocument()
-      expect(screen.getByText(/save/i)).toBeInTheDocument()
-    })
-
-    it('renders subTitle when provided', () => {
-      render(<Modal {...defaultProps} subTitle="Test Subtitle" />)
-      expect(screen.getByText('Test Subtitle')).toBeInTheDocument()
-    })
-
-    it('renders and handles extra button', () => {
-      const onExtraClick = vi.fn()
-      render(
-        <Modal
-          {...defaultProps}
-          showExtraButton={true}
-          extraButtonText="Extra Action"
-          onExtraButtonClick={onExtraClick}
-        />,
-      )
-
-      const extraBtn = screen.getByText('Extra Action')
-      expect(extraBtn).toBeInTheDocument()
-      fireEvent.click(extraBtn)
-      expect(onExtraClick).toHaveBeenCalledTimes(1)
-    })
-
-    it('renders md size class and default extra button label', () => {
-      const { container } = render(
-        <Modal
-          {...defaultProps}
-          size="md"
-          showExtraButton={true}
-          onExtraButtonClick={vi.fn()}
-        />,
-      )
-
-      expect(screen.getByText(/remove/i)).toBeInTheDocument()
-      expect(container.querySelector('.w-\\[640px\\]')).toBeInTheDocument()
-    })
-
-    it('renders footerSlot and bottomSlot', () => {
-      render(
-        <Modal
-          {...defaultProps}
-          footerSlot={<div data-testid="footer-slot">Footer</div>}
-          bottomSlot={<div data-testid="bottom-slot">Bottom</div>}
-        />,
-      )
-
-      expect(screen.getByTestId('footer-slot')).toBeInTheDocument()
-      expect(screen.getByTestId('bottom-slot')).toBeInTheDocument()
-    })
-  })
-
-  describe('Interactions', () => {
-    it('calls onClose when close icon is clicked', () => {
-      render(<Modal {...defaultProps} />)
-      const closeIcon = screen.getByTestId('close-icon').parentElement
-      fireEvent.click(closeIcon!)
-      expect(defaultProps.onClose).toHaveBeenCalledTimes(1)
-    })
-
-    it('calls onConfirm when confirm button is clicked', () => {
-      render(<Modal {...defaultProps} confirmButtonText="Confirm Me" />)
-      fireEvent.click(screen.getByText(/confirm/i))
-      expect(defaultProps.onConfirm).toHaveBeenCalledTimes(1)
-    })
-
-    it('calls onCancel when cancel button is clicked', () => {
-      render(<Modal {...defaultProps} cancelButtonText="Cancel Me" />)
-      fireEvent.click(screen.getByText('Cancel Me'))
-      expect(defaultProps.onCancel).toHaveBeenCalledTimes(1)
-    })
-
-    it('handles clickOutsideNotClose logic', () => {
-      const onClose = vi.fn()
-      const { rerender } = render(<Modal {...defaultProps} onClose={onClose} clickOutsideNotClose={false} />)
-
-      fireEvent.click(screen.getByRole('tooltip'))
-      expect(onClose).toHaveBeenCalledTimes(1)
-
-      onClose.mockClear()
-      rerender(<Modal {...defaultProps} onClose={onClose} clickOutsideNotClose={true} />)
-      fireEvent.click(screen.getByRole('tooltip'))
-      expect(onClose).not.toHaveBeenCalled()
-    })
-
-    it('prevents propagation on internal container click', () => {
-      const onClose = vi.fn()
-      render(<Modal {...defaultProps} onClose={onClose} clickOutsideNotClose={false} />)
-      fireEvent.click(screen.getByText('Test Modal'))
-      expect(onClose).not.toHaveBeenCalled()
-    })
-  })
-
-  describe('Props', () => {
-    it('disables buttons when disabled prop is true', () => {
-      render(<Modal {...defaultProps} disabled={true} />)
-      expect(screen.getByText(/cancel/i).closest('button')).toBeDisabled()
-      expect(screen.getByText(/save/i).closest('button')).toBeDisabled()
-    })
-  })
-})
diff --git a/web/app/components/base/modal/index.stories.tsx b/web/app/components/base/modal/index.stories.tsx
deleted file mode 100644
index 33d0366324..0000000000
--- a/web/app/components/base/modal/index.stories.tsx
+++ /dev/null
@@ -1,128 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/nextjs-vite'
-import { useEffect, useState } from 'react'
-import Modal from '.'
-
-const meta = {
-  title: 'Base/Feedback/Modal',
-  component: Modal,
-  parameters: {
-    layout: 'fullscreen',
-    docs: {
-      description: {
-        component: 'Lightweight modal wrapper with optional header/description and close icon.',
-      },
-    },
-  },
-  tags: ['autodocs'],
-  argTypes: {
-    className: {
-      control: 'text',
-      description: 'Extra classes applied to the modal panel.',
-    },
-    wrapperClassName: {
-      control: 'text',
-      description: 'Additional wrapper classes for the dialog.',
-    },
-    isShow: {
-      control: 'boolean',
-      description: 'Controls whether the modal is visible.',
-    },
-    title: {
-      control: 'text',
-      description: 'Heading displayed at the top of the modal.',
-    },
-    description: {
-      control: 'text',
-      description: 'Secondary text beneath the title.',
-    },
-    closable: {
-      control: 'boolean',
-      description: 'Whether the close icon should be shown.',
-    },
-    overflowVisible: {
-      control: 'boolean',
-      description: 'Allows content to overflow the modal panel.',
-    },
-    onClose: {
-      control: false,
-      description: 'Callback invoked when the modal requests to close.',
-    },
-  },
-  args: {
-    isShow: false,
-    title: 'Create new API key',
-    description: 'Generate a scoped key for this workspace. You can revoke it at any time.',
-    closable: true,
-  },
-} satisfies Meta<typeof Modal>
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-const ModalDemo = (props: React.ComponentProps<typeof Modal>) => {
-  const [open, setOpen] = useState(props.isShow)
-
-  useEffect(() => {
-    setOpen(props.isShow)
-  }, [props.isShow])
-
-  return (
-    <div className="relative flex h-[480px] items-center justify-center bg-gray-100">
-      <button
-        className="rounded-md bg-primary-600 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-primary-700"
-        onClick={() => setOpen(true)}
-      >
-        Show modal
-      </button>
-
-      <Modal
-        {...props}
-        isShow={open}
-        onClose={() => {
-          props.onClose?.()
-          setOpen(false)
-        }}
-      >
-        <div className="mt-6 space-y-4 text-sm text-gray-600">
-          <p>
-            Provide a descriptive name for this key so collaborators know its purpose. Restrict usage with scopes to limit access.
-          </p>
-          <div className="rounded-lg border border-dashed border-gray-200 bg-gray-50 p-4 text-xs text-gray-500">
-            Form fields and validation messaging would appear here. This placeholder keeps the story lightweight.
-          </div>
-        </div>
-        <div className="mt-8 flex justify-end gap-3">
-          <button
-            className="rounded-md border border-gray-300 px-3 py-1.5 text-sm text-gray-600 hover:bg-gray-50"
-            onClick={() => setOpen(false)}
-          >
-            Cancel
-          </button>
-          <button className="rounded-md bg-primary-600 px-3 py-1.5 text-sm text-white hover:bg-primary-700">
-            Create key
-          </button>
-        </div>
-      </Modal>
-    </div>
-  )
-}
-
-export const Default: Story = {
-  render: args => <ModalDemo {...args} />,
-}
-
-export const OverflowVisible: Story = {
-  render: args => <ModalDemo {...args} />,
-  args: {
-    overflowVisible: true,
-    description: 'Demonstrates the modal configured to let the body content overflow.',
-    className: 'max-w-[540px]',
-  },
-  parameters: {
-    docs: {
-      description: {
-        story: 'Shows the modal with `overflowVisible` enabled for content that needs to escape the panel bounds.',
-      },
-    },
-  },
-}
diff --git a/web/app/components/base/modal/index.tsx b/web/app/components/base/modal/index.tsx
deleted file mode 100644
index 8b4b6174a3..0000000000
--- a/web/app/components/base/modal/index.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * @deprecated Use `@langgenius/dify-ui/dialog` instead.
- * This component will be removed after migration is complete.
- * See: https://github.com/langgenius/dify/issues/32767
- */
-import { Dialog, DialogPanel, DialogTitle, Transition, TransitionChild } from '@headlessui/react'
-import { cn } from '@langgenius/dify-ui/cn'
-import { noop } from 'es-toolkit/function'
-import { Fragment } from 'react'
-// https://headlessui.com/react/dialog
-
-type IModal = {
-  className?: string
-  wrapperClassName?: string
-  containerClassName?: string
-  isShow: boolean
-  onClose?: () => void
-  title?: React.ReactNode
-  description?: React.ReactNode
-  children?: React.ReactNode
-  closable?: boolean
-  overflowVisible?: boolean
-  overlayOpacity?: boolean // For semi-transparent overlay instead of default
-  clickOutsideNotClose?: boolean // Prevent closing when clicking outside modal
-}
-
-export default function Modal({
-  className,
-  wrapperClassName,
-  containerClassName,
-  isShow,
-  onClose = noop,
-  title,
-  description,
-  children,
-  closable = false,
-  overflowVisible = false,
-  overlayOpacity = false,
-  clickOutsideNotClose = false,
-}: IModal) {
-  return (
-    <Transition appear show={isShow} as={Fragment}>
-      <Dialog as="div" className={cn('relative z-60', wrapperClassName)} onClose={clickOutsideNotClose ? noop : onClose}>
-        <TransitionChild>
-          <div className={cn('fixed inset-0', overlayOpacity ? 'bg-workflow-canvas-canvas-overlay' : 'bg-background-overlay', 'duration-300 ease-in data-closed:opacity-0', 'data-enter:opacity-100', 'data-leave:opacity-0')} />
-        </TransitionChild>
-        <div
-          className="fixed inset-0 overflow-y-auto"
-          onClick={(e) => {
-            e.preventDefault()
-            e.stopPropagation()
-          }}
-        >
-          <div className={cn('flex min-h-full items-center justify-center p-4 text-center', containerClassName)}>
-            <TransitionChild>
-              <DialogPanel className={cn('relative w-full max-w-[480px] rounded-2xl bg-components-panel-bg p-6 text-left align-middle shadow-xl transition-all', overflowVisible ? 'overflow-visible' : 'overflow-hidden', 'duration-100 ease-in data-closed:scale-95 data-closed:opacity-0', 'data-enter:scale-100 data-enter:opacity-100', 'data-enter:scale-95 data-leave:opacity-0', className)}>
-                {!!title && (
-                  <DialogTitle
-                    as="h3"
-                    className="title-2xl-semi-bold text-text-primary"
-                  >
-                    {title}
-                  </DialogTitle>
-                )}
-                {!!description && (
-                  <div className="mt-2 body-md-regular text-text-secondary">
-                    {description}
-                  </div>
-                )}
-                {closable
-                  && (
-                    <div className="absolute top-6 right-6 z-10 flex h-5 w-5 items-center justify-center rounded-2xl hover:cursor-pointer hover:bg-state-base-hover">
-                      <span
-                        className="i-ri-close-line h-4 w-4 text-text-tertiary"
-                        onClick={
-                          (e) => {
-                            e.stopPropagation()
-                            onClose()
-                          }
-                        }
-                        data-testid="modal-close-button"
-                      />
-                    </div>
-                  )}
-                {children}
-              </DialogPanel>
-            </TransitionChild>
-          </div>
-        </div>
-      </Dialog>
-    </Transition>
-  )
-}
diff --git a/web/app/components/base/modal/modal.stories.tsx b/web/app/components/base/modal/modal.stories.tsx
deleted file mode 100644
index 7093e82f2d..0000000000
--- a/web/app/components/base/modal/modal.stories.tsx
+++ /dev/null
@@ -1,216 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/nextjs-vite'
-import { useEffect, useState } from 'react'
-import Modal from './modal'
-
-const meta = {
-  title: 'Base/Feedback/RichModal',
-  component: Modal,
-  parameters: {
-    layout: 'fullscreen',
-    docs: {
-      description: {
-        component: 'Full-featured modal with header, subtitle, customizable footer buttons, and optional extra action.',
-      },
-    },
-  },
-  tags: ['autodocs'],
-  argTypes: {
-    size: {
-      control: 'radio',
-      options: ['sm', 'md'],
-      description: 'Defines the panel width.',
-    },
-    title: {
-      control: 'text',
-      description: 'Primary heading text.',
-    },
-    subTitle: {
-      control: 'text',
-      description: 'Secondary text below the title.',
-    },
-    confirmButtonText: {
-      control: 'text',
-      description: 'Label for the confirm button.',
-    },
-    cancelButtonText: {
-      control: 'text',
-      description: 'Label for the cancel button.',
-    },
-    showExtraButton: {
-      control: 'boolean',
-      description: 'Whether to render the extra button.',
-    },
-    extraButtonText: {
-      control: 'text',
-      description: 'Label for the extra button.',
-    },
-    extraButtonVariant: {
-      control: 'select',
-      options: ['primary', 'secondary', 'secondary-accent', 'ghost', 'ghost-accent', 'tertiary'],
-      description: 'Visual style for the extra button.',
-    },
-    disabled: {
-      control: 'boolean',
-      description: 'Disables footer actions when true.',
-    },
-    footerSlot: {
-      control: false,
-    },
-    bottomSlot: {
-      control: false,
-    },
-    onClose: {
-      control: false,
-      description: 'Handler fired when the close icon or backdrop is clicked.',
-    },
-    onConfirm: {
-      control: false,
-      description: 'Handler fired when confirm is pressed.',
-    },
-    onCancel: {
-      control: false,
-      description: 'Handler fired when cancel is pressed.',
-    },
-    onExtraButtonClick: {
-      control: false,
-      description: 'Handler fired when the extra button is pressed.',
-    },
-    children: {
-      control: false,
-    },
-  },
-  args: {
-    size: 'sm',
-    title: 'Delete integration',
-    subTitle: 'Disabling this integration will revoke access tokens and webhooks.',
-    confirmButtonText: 'Delete integration',
-    cancelButtonText: 'Cancel',
-    showExtraButton: false,
-    extraButtonText: 'Disable temporarily',
-    extraButtonVariant: 'primary',
-    disabled: false,
-    onClose: () => console.log('Modal closed'),
-    onConfirm: () => console.log('Confirm pressed'),
-    onCancel: () => console.log('Cancel pressed'),
-    onExtraButtonClick: () => console.log('Extra button pressed'),
-  },
-} satisfies Meta<typeof Modal>
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-type ModalProps = React.ComponentProps<typeof Modal>
-
-const ModalDemo = (props: ModalProps) => {
-  const [open, setOpen] = useState(false)
-
-  useEffect(() => {
-    if (props.disabled && open)
-      setOpen(false)
-  }, [props.disabled, open])
-
-  const {
-    onClose,
-    onConfirm,
-    onCancel,
-    onExtraButtonClick,
-    children,
-    ...rest
-  } = props
-
-  const handleClose = () => {
-    onClose?.()
-    setOpen(false)
-  }
-
-  const handleConfirm = () => {
-    onConfirm?.()
-    setOpen(false)
-  }
-
-  const handleCancel = () => {
-    onCancel?.()
-    setOpen(false)
-  }
-
-  const handleExtra = () => {
-    onExtraButtonClick?.()
-  }
-
-  return (
-    <div className="relative flex h-[480px] items-center justify-center bg-gray-100">
-      <button
-        className="rounded-md bg-primary-600 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-primary-700"
-        onClick={() => setOpen(true)}
-      >
-        Show rich modal
-      </button>
-
-      {open && (
-        <Modal
-          {...rest}
-          onClose={handleClose}
-          onConfirm={handleConfirm}
-          onCancel={handleCancel}
-          onExtraButtonClick={handleExtra}
-          children={children ?? (
-            <div className="space-y-4 text-sm text-gray-600">
-              <p>
-                Removing integrations immediately stops workflow automations related to this connection.
-                Make sure no scheduled jobs depend on this integration before proceeding.
-              </p>
-              <ul className="list-disc space-y-1 pl-4 text-xs text-gray-500">
-                <li>All API credentials issued by this integration will be revoked.</li>
-                <li>Historical logs remain accessible for auditing.</li>
-                <li>You can re-enable the integration later with fresh credentials.</li>
-              </ul>
-            </div>
-          )}
-        />
-      )}
-    </div>
-  )
-}
-
-export const Default: Story = {
-  render: args => <ModalDemo {...args} />,
-}
-
-export const WithExtraAction: Story = {
-  render: args => <ModalDemo {...args} />,
-  args: {
-    showExtraButton: true,
-    extraButtonVariant: 'secondary',
-    extraButtonText: 'Disable only',
-    footerSlot: (
-      <span className="text-xs text-gray-400">Last synced 5 minutes ago</span>
-    ),
-  },
-  parameters: {
-    docs: {
-      description: {
-        story: 'Illustrates the optional extra button and footer slot for advanced workflows.',
-      },
-    },
-  },
-}
-
-export const MediumSized: Story = {
-  render: args => <ModalDemo {...args} />,
-  args: {
-    size: 'md',
-    subTitle: 'Use the larger width to surface forms with more fields or supporting descriptions.',
-    bottomSlot: (
-      <div className="border-t border-divider-subtle bg-components-panel-bg px-6 py-4 text-xs text-gray-500">
-        Need finer control? Configure automation rules in the integration settings page.
-      </div>
-    ),
-  },
-  parameters: {
-    docs: {
-      description: {
-        story: 'Shows the medium sized panel and a populated `bottomSlot` for supplemental messaging.',
-      },
-    },
-  },
-}
diff --git a/web/app/components/base/modal/modal.tsx b/web/app/components/base/modal/modal.tsx
deleted file mode 100644
index 10164e5f33..0000000000
--- a/web/app/components/base/modal/modal.tsx
+++ /dev/null
@@ -1,143 +0,0 @@
-/**
- * @deprecated Use `@langgenius/dify-ui/dialog` instead.
- * This component will be removed after migration is complete.
- * See: https://github.com/langgenius/dify/issues/32767
- */
-import type { ButtonProps } from '@langgenius/dify-ui/button'
-import { Button } from '@langgenius/dify-ui/button'
-import { cn } from '@langgenius/dify-ui/cn'
-import { noop } from 'es-toolkit/function'
-import { memo } from 'react'
-import { useTranslation } from 'react-i18next'
-import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-} from '@/app/components/base/portal-to-follow-elem'
-
-type ModalProps = {
-  onClose?: () => void
-  size?: 'sm' | 'md'
-  title: string
-  subTitle?: string
-  children?: React.ReactNode
-  confirmButtonText?: string
-  onConfirm?: () => void
-  cancelButtonText?: string
-  onCancel?: () => void
-  showExtraButton?: boolean
-  extraButtonText?: string
-  extraButtonVariant?: ButtonProps['variant']
-  onExtraButtonClick?: () => void
-  footerSlot?: React.ReactNode
-  bottomSlot?: React.ReactNode
-  disabled?: boolean
-  containerClassName?: string
-  wrapperClassName?: string
-  clickOutsideNotClose?: boolean
-}
-const Modal = ({
-  onClose,
-  size = 'sm',
-  title,
-  subTitle,
-  children,
-  confirmButtonText,
-  onConfirm,
-  cancelButtonText,
-  onCancel,
-  showExtraButton,
-  extraButtonVariant = 'primary',
-  extraButtonText,
-  onExtraButtonClick,
-  footerSlot,
-  bottomSlot,
-  disabled,
-  containerClassName,
-  wrapperClassName,
-  clickOutsideNotClose = false,
-}: ModalProps) => {
-  const { t } = useTranslation()
-
-  return (
-    <PortalToFollowElem open>
-      <PortalToFollowElemContent
-        className={cn('z-9998 flex h-full w-full items-center justify-center bg-background-overlay', wrapperClassName)}
-        onClick={clickOutsideNotClose ? noop : onClose}
-      >
-        <div
-          className={cn(
-            'flex max-h-[80%] flex-col rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-xs',
-            size === 'sm' && 'w-[480px]',
-            size === 'md' && 'w-[640px]',
-            containerClassName,
-          )}
-          onClick={e => e.stopPropagation()}
-        >
-          <div className="relative shrink-0 p-6 pr-14 pb-3 title-2xl-semi-bold text-text-primary">
-            {title}
-            {
-              subTitle && (
-                <div className="mt-1 system-xs-regular text-text-tertiary">
-                  {subTitle}
-                </div>
-              )
-            }
-            <div
-              className="absolute top-5 right-5 flex h-8 w-8 cursor-pointer items-center justify-center rounded-lg"
-              onClick={onClose}
-            >
-              <span className="i-ri-close-line h-5 w-5 text-text-tertiary" data-testid="close-icon" />
-            </div>
-          </div>
-          {
-            !!children && (
-              <div className="min-h-0 flex-1 overflow-y-auto px-6 py-3">{children}</div>
-            )
-          }
-          <div className="flex shrink-0 justify-between p-6 pt-5">
-            <div>
-              {footerSlot}
-            </div>
-            <div className="flex items-center">
-              {
-                showExtraButton && (
-                  <>
-                    <Button
-                      variant={extraButtonVariant}
-                      onClick={onExtraButtonClick}
-                      disabled={disabled}
-                    >
-                      {extraButtonText || t('operation.remove', { ns: 'common' })}
-                    </Button>
-                    <div className="mx-3 h-4 w-px bg-divider-regular"></div>
-                  </>
-                )
-              }
-              <Button
-                onClick={onCancel}
-                disabled={disabled}
-              >
-                {cancelButtonText || t('operation.cancel', { ns: 'common' })}
-              </Button>
-              <Button
-                className="ml-2"
-                variant="primary"
-                onClick={onConfirm}
-                disabled={disabled}
-              >
-                {confirmButtonText || t('operation.save', { ns: 'common' })}
-              </Button>
-            </div>
-          </div>
-          {!!bottomSlot && (
-            <div className="shrink-0">
-              {bottomSlot}
-            </div>
-          )}
-        </div>
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
-  )
-}
-
-export default memo(Modal)
diff --git a/web/app/components/base/new-audio-button/index.tsx b/web/app/components/base/new-audio-button/index.tsx
index 56ada77df6..d9da5fd286 100644
--- a/web/app/components/base/new-audio-button/index.tsx
+++ b/web/app/components/base/new-audio-button/index.tsx
@@ -88,10 +88,11 @@ const AudioBtn = ({
                   ? ActionButtonState.Active
                   : ActionButtonState.Default
               }
+              aria-label={tooltipContent}
               onClick={handleToggle}
               disabled={audioState === 'loading'}
             >
-              <RiVolumeUpLine className="h-4 w-4" />
+              <RiVolumeUpLine className="h-4 w-4" aria-hidden="true" />
             </ActionButton>
           </span>
         )}
diff --git a/web/app/components/base/notion-page-selector/__tests__/base.spec.tsx b/web/app/components/base/notion-page-selector/__tests__/base.spec.tsx
index 54e33b8fbe..8911d4d150 100644
--- a/web/app/components/base/notion-page-selector/__tests__/base.spec.tsx
+++ b/web/app/components/base/notion-page-selector/__tests__/base.spec.tsx
@@ -120,7 +120,7 @@ describe('NotionPageSelector Base', () => {
 
     expect(screen.getByTestId('notion-page-selector-base')).toBeInTheDocument()
     expect(screen.getByTestId('notion-page-name-root-1')).toBeInTheDocument()
-    const checkbox = screen.getByTestId('checkbox-notion-page-checkbox-root-1')
+    const checkbox = screen.getByRole('checkbox', { name: 'Root 1' })
     await user.click(checkbox)
 
     expect(handleSelect).toHaveBeenCalled()
@@ -137,8 +137,8 @@ describe('NotionPageSelector Base', () => {
     const user = userEvent.setup()
     render(<NotionPageSelector credentialList={mockCredentialList} onSelect={handleSelect} />)
 
-    const boundCheckbox = screen.getByTestId('checkbox-notion-page-checkbox-bound-1')
-    expect(screen.getByTestId('check-icon-notion-page-checkbox-bound-1')).toBeInTheDocument()
+    const boundCheckbox = screen.getByRole('checkbox', { name: 'Bound 1' })
+    expect(boundCheckbox).toHaveAttribute('aria-checked', 'true')
     await user.click(boundCheckbox)
     expect(handleSelect).not.toHaveBeenCalled()
   })
@@ -148,11 +148,11 @@ describe('NotionPageSelector Base', () => {
     const user = userEvent.setup()
     render(<NotionPageSelector credentialList={mockCredentialList} onSelect={vi.fn()} />)
 
-    const searchInput = screen.getByTestId('notion-search-input')
+    const searchInput = screen.getByPlaceholderText('common.dataSource.notion.selector.searchPages')
     await user.type(searchInput, 'no-such-page')
     expect(screen.getByText('common.dataSource.notion.selector.noSearchResult')).toBeInTheDocument()
 
-    await user.click(screen.getByTestId('notion-search-input-clear'))
+    await user.click(screen.getByRole('button', { name: 'common.operation.clear' }))
     expect(screen.getByTestId('notion-page-name-root-1')).toBeInTheDocument()
   })
 
@@ -170,7 +170,7 @@ describe('NotionPageSelector Base', () => {
       />,
     )
 
-    const selectorBtn = screen.getByTestId('notion-credential-selector-btn')
+    const selectorBtn = screen.getByRole('combobox', { name: /Workspace 1/ })
     await user.click(selectorBtn)
     const item2 = screen.getByTestId('notion-credential-item-c2')
     await user.click(item2)
@@ -263,10 +263,10 @@ describe('NotionPageSelector Base', () => {
     const { rerender } = render(
       <NotionPageSelector credentialList={mockCredentialList} onSelect={vi.fn()} value={['root-1']} />,
     )
-    expect(screen.getByTestId('check-icon-notion-page-checkbox-root-1')).toBeInTheDocument()
+    expect(screen.getByRole('checkbox', { name: 'Root 1' })).toHaveAttribute('aria-checked', 'true')
 
     rerender(<NotionPageSelector credentialList={mockCredentialList} onSelect={vi.fn()} value={[]} />)
-    expect(screen.queryByTestId('check-icon-notion-page-checkbox-root-1')).not.toBeInTheDocument()
+    expect(screen.getByRole('checkbox', { name: 'Root 1' })).toHaveAttribute('aria-checked', 'false')
   })
 
   it('should hide preview actions when canPreview is false', () => {
diff --git a/web/app/components/base/notion-page-selector/credential-selector/__tests__/index.spec.tsx b/web/app/components/base/notion-page-selector/credential-selector/__tests__/index.spec.tsx
index f1f1cf08d2..5ad5f63840 100644
--- a/web/app/components/base/notion-page-selector/credential-selector/__tests__/index.spec.tsx
+++ b/web/app/components/base/notion-page-selector/credential-selector/__tests__/index.spec.tsx
@@ -32,7 +32,7 @@ describe('CredentialSelector', () => {
     const user = userEvent.setup()
     render(<CredentialSelector value="1" items={mockItems} onSelect={vi.fn()} />)
 
-    const btn = screen.getByTestId('notion-credential-selector-btn')
+    const btn = screen.getByRole('combobox', { name: /Notion Workspace 1/ })
     await user.click(btn)
 
     expect(screen.getByTestId('notion-credential-item-1')).toBeInTheDocument()
@@ -44,7 +44,7 @@ describe('CredentialSelector', () => {
     const user = userEvent.setup()
     render(<CredentialSelector value="1" items={mockItems} onSelect={handleSelect} />)
 
-    const btn = screen.getByTestId('notion-credential-selector-btn')
+    const btn = screen.getByRole('combobox', { name: /Notion Workspace 1/ })
     await user.click(btn)
 
     const item2 = screen.getByTestId('notion-credential-item-2')
diff --git a/web/app/components/base/notion-page-selector/credential-selector/index.tsx b/web/app/components/base/notion-page-selector/credential-selector/index.tsx
index c8db7bc978..6820720c07 100644
--- a/web/app/components/base/notion-page-selector/credential-selector/index.tsx
+++ b/web/app/components/base/notion-page-selector/credential-selector/index.tsx
@@ -1,7 +1,12 @@
 'use client'
-import { Menu, MenuButton, MenuItem, MenuItems, Transition } from '@headlessui/react'
-import * as React from 'react'
-import { Fragment, useMemo } from 'react'
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectItemIndicator,
+  SelectItemText,
+  SelectTrigger,
+} from '@langgenius/dify-ui/select'
 import { CredentialIcon } from '@/app/components/datasets/common/credential-icon'
 
 export type NotionCredential = {
@@ -17,99 +22,66 @@ type CredentialSelectorProps = {
   onSelect: (v: string) => void
 }
 
+const getDisplayName = (item?: NotionCredential) => {
+  return item?.workspaceName || item?.credentialName || ''
+}
+
 const CredentialSelector = ({
   value,
   items,
   onSelect,
 }: CredentialSelectorProps) => {
-  const currentCredential = items.find(item => item.credentialId === value)!
-
-  const getDisplayName = (item: NotionCredential) => {
-    return item.workspaceName || item.credentialName
-  }
-
-  const currentDisplayName = useMemo(() => {
-    return getDisplayName(currentCredential)
-  }, [currentCredential])
+  const currentCredential = items.find(item => item.credentialId === value) ?? items[0]
+  const currentDisplayName = getDisplayName(currentCredential)
 
   return (
-    <Menu as="div" className="relative inline-block text-left">
-      {
-        ({ open }) => (
-          <>
-            <MenuButton
-              className={`flex h-7 items-center justify-center rounded-md p-1 pr-2 hover:bg-state-base-hover ${open && 'bg-state-base-hover'} cursor-pointer`}
-              data-testid="notion-credential-selector-btn"
+    <Select value={currentCredential?.credentialId ?? null} onValueChange={nextValue => nextValue && onSelect(nextValue)}>
+      <SelectTrigger
+        aria-label={currentDisplayName}
+        className="w-[168px]"
+      >
+        <span className="flex min-w-0 items-center">
+          <CredentialIcon
+            className="mr-2 shrink-0"
+            avatarUrl={currentCredential?.workspaceIcon}
+            name={currentDisplayName}
+            size={20}
+          />
+          <span
+            className="truncate"
+            title={currentDisplayName}
+            data-testid="notion-credential-selector-name"
+          >
+            {currentDisplayName}
+          </span>
+        </span>
+      </SelectTrigger>
+      <SelectContent popupClassName="w-80" listClassName="max-h-50">
+        {items.map((item) => {
+          const displayName = getDisplayName(item)
+          return (
+            <SelectItem
+              key={item.credentialId}
+              value={item.credentialId}
+              className="h-9 px-3"
+              data-testid={`notion-credential-item-${item.credentialId}`}
             >
               <CredentialIcon
-                className="mr-2"
-                avatarUrl={currentCredential?.workspaceIcon}
-                name={currentDisplayName}
+                className="mr-2 shrink-0"
+                avatarUrl={item.workspaceIcon}
+                name={displayName}
                 size={20}
               />
-              <div
-                className="mr-1 w-[90px] truncate text-left text-sm font-medium text-text-secondary"
-                title={currentDisplayName}
-                data-testid="notion-credential-selector-name"
-              >
-                {currentDisplayName}
-              </div>
-              <div className="i-ri-arrow-down-s-line h-4 w-4 text-text-secondary" />
-            </MenuButton>
-            <Transition
-              as={Fragment}
-              enter="transition ease-out duration-100"
-              enterFrom="transform opacity-0 scale-95"
-              enterTo="transform opacity-100 scale-100"
-              leave="transition ease-in duration-75"
-              leaveFrom="transform opacity-100 scale-100"
-              leaveTo="transform opacity-0 scale-95"
-            >
-              <MenuItems
-                className="absolute top-8 left-0 z-10 w-80
-                  origin-top-right rounded-lg border-[0.5px]
-                  border-components-panel-border bg-components-panel-bg-blur shadow-lg shadow-shadow-shadow-5"
-              >
-                <div className="max-h-50 overflow-auto p-1">
-                  {
-                    items.map((item) => {
-                      const displayName = getDisplayName(item)
-                      return (
-                        <MenuItem key={item.credentialId}>
-                          <div
-                            className="flex h-9 cursor-pointer items-center rounded-lg px-3 hover:bg-state-base-hover"
-                            onClick={() => onSelect(item.credentialId)}
-                            data-testid={`notion-credential-item-${item.credentialId}`}
-                          >
-                            <CredentialIcon
-                              className="mr-2 shrink-0"
-                              avatarUrl={item.workspaceIcon}
-                              name={displayName}
-                              size={20}
-                            />
-                            <div
-                              className="mr-2 grow truncate system-sm-medium text-text-secondary"
-                              title={displayName}
-                            >
-                              {displayName}
-                            </div>
-                            {/* // ?Cannot get page length with new auth system */}
-                            {/* <div className='system-xs-medium shrink-0 text-text-accent'>
-                            {item.pages.length} {t('common.dataSource.notion.selector.pageSelected')}
-                          </div> */}
-                          </div>
-                        </MenuItem>
-                      )
-                    })
-                  }
-                </div>
-              </MenuItems>
-            </Transition>
-          </>
-        )
-      }
-    </Menu>
+              <SelectItemText title={displayName}>
+                {displayName}
+              </SelectItemText>
+              <SelectItemIndicator />
+            </SelectItem>
+          )
+        })}
+      </SelectContent>
+    </Select>
   )
 }
 
-export default React.memo(CredentialSelector)
+export default CredentialSelector
diff --git a/web/app/components/base/notion-page-selector/page-selector/__tests__/index.spec.tsx b/web/app/components/base/notion-page-selector/page-selector/__tests__/index.spec.tsx
index 21a7a08d63..8ceb6d73b6 100644
--- a/web/app/components/base/notion-page-selector/page-selector/__tests__/index.spec.tsx
+++ b/web/app/components/base/notion-page-selector/page-selector/__tests__/index.spec.tsx
@@ -58,7 +58,7 @@ describe('PageSelector', () => {
     const user = userEvent.setup()
     render(<PageSelector value={new Set()} disabledValue={new Set()} searchValue="" pagesMap={mockPagesMap} list={[mockList[0]!, mockList[1]!, mockList[2]!]} onSelect={handleSelect} />)
 
-    const checkbox = screen.getByTestId('checkbox-notion-page-checkbox-root-1')
+    const checkbox = screen.getByRole('checkbox', { name: 'Root 1' })
     await user.click(checkbox)
 
     expect(handleSelect).toHaveBeenCalledWith(new Set(['root-1', 'child-1', 'grandchild-1']))
@@ -69,7 +69,7 @@ describe('PageSelector', () => {
     const user = userEvent.setup()
     render(<PageSelector value={new Set(['root-1', 'child-1', 'grandchild-1'])} disabledValue={new Set()} searchValue="" pagesMap={mockPagesMap} list={mockList} onSelect={handleSelect} />)
 
-    const checkbox = screen.getByTestId('checkbox-notion-page-checkbox-root-1')
+    const checkbox = screen.getByRole('checkbox', { name: 'Root 1' })
     await user.click(checkbox)
 
     expect(handleSelect).toHaveBeenCalledWith(new Set())
@@ -103,7 +103,7 @@ describe('PageSelector', () => {
     const user = userEvent.setup()
     render(<PageSelector value={new Set()} disabledValue={new Set()} searchValue="Child" pagesMap={mockPagesMap} list={mockList} onSelect={handleSelect} />)
 
-    const checkbox = screen.getByTestId('checkbox-notion-page-checkbox-child-1')
+    const checkbox = screen.getByRole('checkbox', { name: 'Child 1' })
     await user.click(checkbox)
 
     expect(handleSelect).toHaveBeenCalledWith(new Set(['child-1']))
@@ -135,7 +135,7 @@ describe('PageSelector', () => {
     const user = userEvent.setup()
     render(<PageSelector value={new Set()} disabledValue={new Set(['root-1'])} searchValue="" pagesMap={mockPagesMap} list={mockList} onSelect={handleSelect} />)
 
-    const checkbox = screen.getByTestId('checkbox-notion-page-checkbox-root-1')
+    const checkbox = screen.getByRole('checkbox', { name: 'Root 1' })
     await user.click(checkbox)
     expect(handleSelect).not.toHaveBeenCalled()
   })
@@ -169,8 +169,8 @@ describe('PageSelector', () => {
     const user = userEvent.setup()
     const { rerender } = render(<PageSelector value={new Set()} disabledValue={new Set()} searchValue="Child" pagesMap={mockPagesMap} list={mockList} onSelect={handleSelect} />)
 
-    const checkbox1 = screen.getByTestId('checkbox-notion-page-checkbox-child-1')
-    const checkbox2 = screen.getByTestId('checkbox-notion-page-checkbox-child-2')
+    const checkbox1 = screen.getByRole('checkbox', { name: 'Child 1' })
+    const checkbox2 = screen.getByRole('checkbox', { name: 'Child 2' })
 
     await user.click(checkbox1)
     expect(handleSelect).toHaveBeenCalledWith(new Set(['child-1']))
@@ -219,7 +219,7 @@ describe('PageSelector', () => {
     const user = userEvent.setup()
     render(<PageSelector value={new Set(['root-1', 'child-1', 'grandchild-1', 'child-2'])} disabledValue={new Set()} searchValue="" pagesMap={mockPagesMap} list={mockList} onSelect={handleSelect} />)
 
-    const checkbox = screen.getByTestId('checkbox-notion-page-checkbox-root-1')
+    const checkbox = screen.getByRole('checkbox', { name: 'Root 1' })
     await user.click(checkbox)
 
     expect(handleSelect).toHaveBeenCalledWith(new Set())
@@ -230,7 +230,7 @@ describe('PageSelector', () => {
     const user = userEvent.setup()
     render(<PageSelector value={new Set()} disabledValue={new Set()} searchValue="Child" pagesMap={mockPagesMap} list={[mockList[1]!]} onSelect={handleSelect} />)
 
-    const checkbox = screen.getByTestId('checkbox-notion-page-checkbox-child-1')
+    const checkbox = screen.getByRole('checkbox', { name: 'Child 1' })
     await user.click(checkbox)
 
     // When searching, only the item itself is selected, not descendants
@@ -242,7 +242,7 @@ describe('PageSelector', () => {
     const user = userEvent.setup()
     render(<PageSelector value={new Set(['child-1'])} disabledValue={new Set()} searchValue="Child" pagesMap={mockPagesMap} list={[mockList[1]!]} onSelect={handleSelect} />)
 
-    const checkbox = screen.getByTestId('checkbox-notion-page-checkbox-child-1')
+    const checkbox = screen.getByRole('checkbox', { name: 'Child 1' })
     await user.click(checkbox)
 
     expect(handleSelect).toHaveBeenCalledWith(new Set())
diff --git a/web/app/components/base/notion-page-selector/page-selector/__tests__/page-row.spec.tsx b/web/app/components/base/notion-page-selector/page-selector/__tests__/page-row.spec.tsx
index dba53d7642..429d4a3c6d 100644
--- a/web/app/components/base/notion-page-selector/page-selector/__tests__/page-row.spec.tsx
+++ b/web/app/components/base/notion-page-selector/page-selector/__tests__/page-row.spec.tsx
@@ -54,7 +54,7 @@ describe('PageRow', () => {
 
     renderPageRow({ onSelect })
 
-    await user.click(screen.getByTestId('checkbox-notion-page-checkbox-page-1'))
+    await user.click(screen.getByRole('checkbox', { name: 'Page 1' }))
 
     expect(onSelect).toHaveBeenCalledWith('page-1')
   })
diff --git a/web/app/components/base/notion-page-selector/page-selector/page-row.tsx b/web/app/components/base/notion-page-selector/page-selector/page-row.tsx
index 156dfe8e66..56d8ba8cff 100644
--- a/web/app/components/base/notion-page-selector/page-selector/page-row.tsx
+++ b/web/app/components/base/notion-page-selector/page-selector/page-row.tsx
@@ -1,10 +1,10 @@
 import type { CSSProperties } from 'react'
 import type { NotionPageRow as NotionPageRowData, NotionPageSelectionMode } from './types'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import { cn } from '@langgenius/dify-ui/cn'
 import { RiArrowDownSLine, RiArrowRightSLine } from '@remixicon/react'
 import { memo } from 'react'
 import { useTranslation } from 'react-i18next'
-import Checkbox from '@/app/components/base/checkbox'
 import NotionIcon from '@/app/components/base/notion-icon'
 import Radio from '@/app/components/base/radio/ui'
 
@@ -51,8 +51,8 @@ const NotionPageRow = ({
               className="mr-2 shrink-0"
               checked={checked}
               disabled={disabled}
-              onCheck={() => onSelect(pageId)}
-              id={`notion-page-checkbox-${pageId}`}
+              aria-label={row.page.page_name}
+              onCheckedChange={() => onSelect(pageId)}
             />
           )
         : (
diff --git a/web/app/components/base/notion-page-selector/search-input/__tests__/index.spec.tsx b/web/app/components/base/notion-page-selector/search-input/__tests__/index.spec.tsx
index 39e7e09cf8..e68409d3ef 100644
--- a/web/app/components/base/notion-page-selector/search-input/__tests__/index.spec.tsx
+++ b/web/app/components/base/notion-page-selector/search-input/__tests__/index.spec.tsx
@@ -16,7 +16,7 @@ describe('SearchInput', () => {
     const user = userEvent.setup()
     render(<SearchInput value="" onChange={handleChange} />)
 
-    const input = screen.getByTestId('notion-search-input')
+    const input = screen.getByPlaceholderText('common.dataSource.notion.selector.searchPages')
     await user.type(input, 'test query')
 
     expect(handleChange).toHaveBeenCalled()
@@ -25,7 +25,7 @@ describe('SearchInput', () => {
   it('should show clear button when value is not empty', () => {
     render(<SearchInput value="some value" onChange={vi.fn()} />)
 
-    expect(screen.getByTestId('notion-search-input-clear')).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'common.operation.clear' })).toBeInTheDocument()
   })
 
   it('should call onChange with empty string when clear button is clicked', async () => {
@@ -33,7 +33,7 @@ describe('SearchInput', () => {
     const user = userEvent.setup()
     render(<SearchInput value="some value" onChange={handleChange} />)
 
-    const clearBtn = screen.getByTestId('notion-search-input-clear')
+    const clearBtn = screen.getByRole('button', { name: 'common.operation.clear' })
     await user.click(clearBtn)
 
     expect(handleChange).toHaveBeenCalledWith('')
@@ -42,6 +42,6 @@ describe('SearchInput', () => {
   it('should not show clear button when value is empty', () => {
     render(<SearchInput value="" onChange={vi.fn()} />)
 
-    expect(screen.queryByTestId('notion-search-input-clear')).not.toBeInTheDocument()
+    expect(screen.queryByRole('button', { name: 'common.operation.clear' })).not.toBeInTheDocument()
   })
 })
diff --git a/web/app/components/base/notion-page-selector/search-input/index.tsx b/web/app/components/base/notion-page-selector/search-input/index.tsx
index 55bf506ce6..a7102e19b2 100644
--- a/web/app/components/base/notion-page-selector/search-input/index.tsx
+++ b/web/app/components/base/notion-page-selector/search-input/index.tsx
@@ -35,13 +35,18 @@ const SearchInput = ({
         data-testid="notion-search-input"
       />
       {
-        value && (
-          <div
-            className="i-ri-close-circle-fill h-4 w-4 shrink-0 cursor-pointer text-components-input-text-placeholder"
-            onClick={handleClear}
-            data-testid="notion-search-input-clear"
-          />
-        )
+        value
+          ? (
+              <button
+                type="button"
+                aria-label={t('operation.clear', { ns: 'common' })}
+                className="flex h-4 w-4 shrink-0 cursor-pointer items-center justify-center rounded-full border-none bg-transparent p-0 focus:outline-none focus-visible:ring-2 focus-visible:ring-components-input-border-active"
+                onClick={handleClear}
+              >
+                <span className="i-ri-close-circle-fill h-4 w-4 text-components-input-text-placeholder" aria-hidden="true" />
+              </button>
+            )
+          : null
       }
     </div>
   )
diff --git a/web/app/components/base/portal-to-follow-elem/__tests__/index.spec.tsx b/web/app/components/base/portal-to-follow-elem/__tests__/index.spec.tsx
deleted file mode 100644
index 3c1b09d947..0000000000
--- a/web/app/components/base/portal-to-follow-elem/__tests__/index.spec.tsx
+++ /dev/null
@@ -1,230 +0,0 @@
-import { cleanup, fireEvent, render } from '@testing-library/react'
-import * as React from 'react'
-import { PortalToFollowElem, PortalToFollowElemContent, PortalToFollowElemTrigger } from '..'
-
-type MockFloatingData = {
-  middlewareData?: {
-    hide?: {
-      referenceHidden?: boolean
-    }
-  }
-}
-
-let mockFloatingData: MockFloatingData = {}
-const useFloatingMock = vi.fn()
-
-vi.mock('@floating-ui/react', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('@floating-ui/react')>()
-  return {
-    ...actual,
-    useFloating: (options: unknown) => {
-      useFloatingMock(options)
-      const data = actual.useFloating(options as Parameters<typeof actual.useFloating>[0])
-      return {
-        ...data,
-        ...mockFloatingData,
-        middlewareData: {
-          ...data.middlewareData,
-          ...mockFloatingData.middlewareData,
-        },
-      }
-    },
-  }
-})
-
-afterEach(cleanup)
-
-describe('PortalToFollowElem', () => {
-  describe('Context and Provider', () => {
-    it('should throw error when using context outside provider', () => {
-      // Suppress console.error for this test
-      const originalError = console.error
-      console.error = vi.fn()
-
-      expect(() => {
-        render(
-          <PortalToFollowElemTrigger>Trigger</PortalToFollowElemTrigger>,
-        )
-      }).toThrow('PortalToFollowElem components must be wrapped in <PortalToFollowElem />')
-
-      console.error = originalError
-    })
-
-    it('should not throw when used within provider', () => {
-      expect(() => {
-        render(
-          <PortalToFollowElem>
-            <PortalToFollowElemTrigger>Trigger</PortalToFollowElemTrigger>
-          </PortalToFollowElem>,
-        )
-      }).not.toThrow()
-    })
-  })
-
-  describe('PortalToFollowElemTrigger', () => {
-    it('should render children correctly', () => {
-      const { getByText } = render(
-        <PortalToFollowElem>
-          <PortalToFollowElemTrigger>Trigger Text</PortalToFollowElemTrigger>
-        </PortalToFollowElem>,
-      )
-      expect(getByText('Trigger Text'))!.toBeInTheDocument()
-    })
-
-    it('should handle asChild prop correctly', () => {
-      const { getByRole } = render(
-        <PortalToFollowElem>
-          <PortalToFollowElemTrigger asChild>
-            <button>Button Trigger</button>
-          </PortalToFollowElemTrigger>
-        </PortalToFollowElem>,
-      )
-
-      expect(getByRole('button'))!.toHaveTextContent('Button Trigger')
-    })
-  })
-
-  describe('PortalToFollowElemContent', () => {
-    it('should not render content when closed', () => {
-      const { queryByText } = render(
-        <PortalToFollowElem open={false}>
-          <PortalToFollowElemTrigger>Trigger</PortalToFollowElemTrigger>
-          <PortalToFollowElemContent>Popup Content</PortalToFollowElemContent>
-        </PortalToFollowElem>,
-      )
-
-      expect(queryByText('Popup Content')).not.toBeInTheDocument()
-    })
-
-    it('should render content when open', () => {
-      const { getByText } = render(
-        <PortalToFollowElem open={true}>
-          <PortalToFollowElemTrigger>Trigger </PortalToFollowElemTrigger>
-          <PortalToFollowElemContent>Popup Content</PortalToFollowElemContent>
-        </PortalToFollowElem>,
-      )
-
-      expect(getByText('Popup Content'))!.toBeInTheDocument()
-    })
-  })
-
-  describe('Controlled behavior', () => {
-    it('should call onOpenChange when interaction happens', () => {
-      const handleOpenChange = vi.fn()
-
-      const { getByText } = render(
-        <PortalToFollowElem onOpenChange={handleOpenChange}>
-          <PortalToFollowElemTrigger>Hover Me</PortalToFollowElemTrigger>
-          <PortalToFollowElemContent>Content</PortalToFollowElemContent>
-        </PortalToFollowElem>,
-      )
-
-      fireEvent.mouseEnter(getByText('Hover Me'))
-      expect(handleOpenChange).toHaveBeenCalled()
-
-      fireEvent.mouseLeave(getByText('Hover Me'))
-      expect(handleOpenChange).toHaveBeenCalled()
-    })
-  })
-
-  describe('Configuration options', () => {
-    it('should accept placement prop', () => {
-      render(
-        <PortalToFollowElem placement="top-start">
-          <PortalToFollowElemTrigger>Trigger</PortalToFollowElemTrigger>
-        </PortalToFollowElem>,
-      )
-
-      expect(useFloatingMock).toHaveBeenCalledWith(
-        expect.objectContaining({
-          placement: 'top-start',
-        }),
-      )
-    })
-
-    it('should handle triggerPopupSameWidth prop', () => {
-      render(
-        <PortalToFollowElem triggerPopupSameWidth>
-          <PortalToFollowElemTrigger>Trigger</PortalToFollowElemTrigger>
-          <PortalToFollowElemContent>Content</PortalToFollowElemContent>
-        </PortalToFollowElem>,
-      )
-
-      type SizeMiddleware = {
-        name: 'size'
-        options: [{
-          apply: (args: {
-            elements: { floating: { style: Record<string, string> } }
-            rects: { reference: { width: number } }
-            availableHeight: number
-          }) => void
-        }]
-      }
-
-      const sizeMiddleware = useFloatingMock.mock.calls[0]![0].middleware.find(
-        (m: { name: string }) => m.name === 'size',
-      ) as SizeMiddleware
-      expect(sizeMiddleware).toBeDefined()
-
-      // Manually trigger the apply function to cover line 81-82
-      const mockElements = {
-        floating: { style: {} as Record<string, string> },
-      }
-      const mockRects = {
-        reference: { width: 100 },
-      }
-      sizeMiddleware.options[0].apply({
-        elements: mockElements,
-        rects: mockRects,
-        availableHeight: 500,
-      })
-
-      expect(mockElements.floating.style.width).toBe('100px')
-      expect(mockElements.floating.style.maxHeight).toBe('500px')
-    })
-  })
-
-  describe('PortalToFollowElemTrigger asChild', () => {
-    it('should render correct data-state when open', () => {
-      const { getByRole } = render(
-        <PortalToFollowElem open={true}>
-          <PortalToFollowElemTrigger asChild>
-            <button>Trigger</button>
-          </PortalToFollowElemTrigger>
-        </PortalToFollowElem>,
-      )
-      expect(getByRole('button'))!.toHaveAttribute('data-state', 'open')
-    })
-
-    it('should handle missing ref on child', () => {
-      const { getByRole } = render(
-        <PortalToFollowElem>
-          <PortalToFollowElemTrigger asChild>
-            <button>Trigger</button>
-          </PortalToFollowElemTrigger>
-        </PortalToFollowElem>,
-      )
-      expect(getByRole('button'))!.toBeInTheDocument()
-    })
-  })
-
-  describe('Visibility', () => {
-    it('should hide content when reference is hidden', () => {
-      mockFloatingData = {
-        middlewareData: {
-          hide: { referenceHidden: true },
-        },
-      }
-
-      const { getByTestId } = render(
-        <PortalToFollowElem open={true}>
-          <PortalToFollowElemTrigger>Trigger</PortalToFollowElemTrigger>
-          <PortalToFollowElemContent data-testid="content">Hidden Content</PortalToFollowElemContent>
-        </PortalToFollowElem>,
-      )
-
-      expect(getByTestId('content'))!.toHaveStyle('visibility: hidden')
-      mockFloatingData = {}
-    })
-  })
-})
diff --git a/web/app/components/base/portal-to-follow-elem/index.stories.tsx b/web/app/components/base/portal-to-follow-elem/index.stories.tsx
deleted file mode 100644
index 8f0fc48921..0000000000
--- a/web/app/components/base/portal-to-follow-elem/index.stories.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/nextjs-vite'
-import { useState } from 'react'
-import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '.'
-
-const TooltipCard = ({ title, description }: { title: string, description: string }) => (
-  <div className="w-[220px] rounded-lg border border-divider-subtle bg-components-panel-bg px-3 py-2 text-sm text-text-secondary shadow-lg">
-    <div className="mb-1 text-xs font-semibold tracking-[0.14em] text-text-tertiary uppercase">
-      {title}
-    </div>
-    <p className="leading-5">{description}</p>
-  </div>
-)
-
-const PortalDemo = ({
-  placement = 'bottom',
-  triggerPopupSameWidth = false,
-}: {
-  placement?: Parameters<typeof PortalToFollowElem>[0]['placement']
-  triggerPopupSameWidth?: boolean
-}) => {
-  const [controlledOpen, setControlledOpen] = useState(false)
-
-  return (
-    <div className="flex w-full max-w-3xl flex-col gap-6 rounded-2xl border border-divider-subtle bg-components-panel-bg p-6">
-      <div className="flex flex-wrap items-center gap-4">
-        <PortalToFollowElem placement={placement} triggerPopupSameWidth={triggerPopupSameWidth}>
-          <PortalToFollowElemTrigger className="rounded-md border border-divider-subtle bg-background-default px-3 py-2 text-sm text-text-secondary">
-            Hover me
-          </PortalToFollowElemTrigger>
-          <PortalToFollowElemContent className="z-40">
-            <TooltipCard
-              title="Auto follow"
-              description="The floating element repositions itself when the trigger moves, using Floating UI under the hood."
-            />
-          </PortalToFollowElemContent>
-        </PortalToFollowElem>
-
-        <PortalToFollowElem
-          placement="bottom-start"
-          triggerPopupSameWidth
-          open={controlledOpen}
-          onOpenChange={setControlledOpen}
-        >
-          <PortalToFollowElemTrigger asChild>
-            <button
-              type="button"
-              className="rounded-md border border-divider-subtle bg-background-default-subtle px-3 py-2 text-sm font-medium text-text-secondary hover:bg-state-base-hover"
-              onClick={() => setControlledOpen(prev => !prev)}
-            >
-              Controlled toggle
-            </button>
-          </PortalToFollowElemTrigger>
-          <PortalToFollowElemContent className="z-40">
-            <TooltipCard
-              title="Controlled"
-              description="This panel uses the controlled API via onOpenChange/open props, and matches the trigger width."
-            />
-          </PortalToFollowElemContent>
-        </PortalToFollowElem>
-      </div>
-    </div>
-  )
-}
-
-const meta = {
-  title: 'Base/Feedback/PortalToFollowElem',
-  component: PortalDemo,
-  parameters: {
-    layout: 'centered',
-    docs: {
-      description: {
-        component: 'Floating UI based portal that tracks trigger positioning. Demonstrates both hover-driven and controlled usage.',
-      },
-    },
-  },
-  argTypes: {
-    placement: {
-      control: 'select',
-      options: ['top', 'top-start', 'top-end', 'bottom', 'bottom-start', 'bottom-end'],
-    },
-    triggerPopupSameWidth: { control: 'boolean' },
-  },
-  args: {
-    placement: 'bottom',
-    triggerPopupSameWidth: false,
-  },
-  tags: ['autodocs'],
-} satisfies Meta<typeof PortalDemo>
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Playground: Story = {}
-
-export const SameWidthPanel: Story = {
-  args: {
-    triggerPopupSameWidth: true,
-  },
-}
diff --git a/web/app/components/base/portal-to-follow-elem/index.tsx b/web/app/components/base/portal-to-follow-elem/index.tsx
deleted file mode 100644
index 866f22bcc5..0000000000
--- a/web/app/components/base/portal-to-follow-elem/index.tsx
+++ /dev/null
@@ -1,218 +0,0 @@
-'use client'
-/**
- * @deprecated Use semantic overlay primitives from `@langgenius/dify-ui/*` instead.
- * This component will be removed after migration is complete.
- * See: https://github.com/langgenius/dify/issues/32767
- *
- * Migration guide:
- * - Tooltip → `@langgenius/dify-ui/tooltip`
- * - Menu/Dropdown → `@langgenius/dify-ui/dropdown-menu`
- * - Popover → `@langgenius/dify-ui/popover`
- * - Dialog/Modal → `@langgenius/dify-ui/dialog`
- * - Select → `@langgenius/dify-ui/select`
- */
-import type { OffsetOptions, Placement } from '@floating-ui/react'
-import {
-  autoUpdate,
-  flip,
-  FloatingPortal,
-  offset,
-  shift,
-  size,
-  useDismiss,
-  useFloating,
-  useFocus,
-  useHover,
-  useInteractions,
-  useMergeRefs,
-  useRole,
-} from '@floating-ui/react'
-
-import { cn } from '@langgenius/dify-ui/cn'
-import * as React from 'react'
-import { useCallback, useState } from 'react'
-
-type PortalToFollowElemOptions = {
-  /*
-  * top, bottom, left, right
-  * start, end. Default is middle
-  * combine: top-start, top-end
-  */
-  placement?: Placement
-  open?: boolean
-  offset?: number | OffsetOptions
-  onOpenChange?: (open: boolean) => void
-  triggerPopupSameWidth?: boolean
-}
-
-/** @deprecated Use semantic overlay primitives instead. See #32767. */
-function usePortalToFollowElem({
-  placement = 'bottom',
-  open: controlledOpen,
-  offset: offsetValue = 0,
-  onOpenChange: setControlledOpen,
-  triggerPopupSameWidth,
-}: PortalToFollowElemOptions = {}) {
-  const [localOpen, setLocalOpen] = useState(false)
-  const open = controlledOpen ?? localOpen
-  const handleOpenChange = useCallback((newOpen: boolean) => {
-    setLocalOpen(newOpen)
-    setControlledOpen?.(newOpen)
-  }, [setControlledOpen, setLocalOpen])
-
-  const data = useFloating({
-    placement,
-    open,
-    onOpenChange: handleOpenChange,
-    whileElementsMounted: autoUpdate,
-    middleware: [
-      offset(offsetValue),
-      flip({
-        crossAxis: placement.includes('-'),
-        fallbackAxisSideDirection: 'start',
-        padding: 5,
-      }),
-      shift({ padding: 5 }),
-      size({
-        apply({ rects, elements, availableHeight }) {
-          Object.assign(elements.floating.style, {
-            maxHeight: `${Math.max(0, availableHeight)}px`,
-            overflowY: 'auto',
-            ...(triggerPopupSameWidth && { width: `${rects.reference.width}px` }),
-          })
-        },
-      }),
-    ],
-  })
-
-  const context = data.context
-
-  const hover = useHover(context, {
-    move: false,
-    enabled: controlledOpen === undefined,
-  })
-  const focus = useFocus(context, {
-    enabled: controlledOpen === undefined,
-  })
-  const dismiss = useDismiss(context)
-  const role = useRole(context, { role: 'tooltip' })
-
-  const interactions = useInteractions([hover, focus, dismiss, role])
-
-  return React.useMemo(
-    () => ({
-      open,
-      setOpen: handleOpenChange,
-      ...interactions,
-      ...data,
-    }),
-    [open, handleOpenChange, interactions, data],
-  )
-}
-
-type ContextType = ReturnType<typeof usePortalToFollowElem> | null
-
-const PortalToFollowElemContext = React.createContext<ContextType>(null)
-
-function usePortalToFollowElemContext() {
-  const context = React.useContext(PortalToFollowElemContext)
-
-  if (context == null)
-    throw new Error('PortalToFollowElem components must be wrapped in <PortalToFollowElem />')
-
-  return context
-}
-
-/** @deprecated Use semantic overlay primitives instead. See #32767. */
-export function PortalToFollowElem({
-  children,
-  ...options
-}: { children: React.ReactNode } & PortalToFollowElemOptions) {
-  // This can accept any props as options, e.g. `placement`,
-  // or other positioning options.
-  const tooltip = usePortalToFollowElem(options)
-  return (
-    <PortalToFollowElemContext.Provider value={tooltip}>
-      {children}
-    </PortalToFollowElemContext.Provider>
-  )
-}
-
-/** @deprecated Use semantic overlay primitives instead. See #32767. */
-export const PortalToFollowElemTrigger = (
-  {
-    ref: propRef,
-    children,
-    asChild = false,
-    ...props
-  }: React.HTMLProps<HTMLElement> & { ref?: React.RefObject<HTMLElement | null>, asChild?: boolean },
-) => {
-  const context = usePortalToFollowElemContext()
-  const childElement = React.isValidElement<{ ref?: React.Ref<HTMLElement | null> }>(children)
-    ? children
-    : null
-  const childrenRef = childElement?.props.ref
-  const ref = useMergeRefs([context.refs.setReference, propRef, childrenRef])
-
-  // `asChild` allows the user to pass any element as the anchor
-  if (asChild && childElement) {
-    const childProps = (childElement.props ?? {}) as Record<string, unknown>
-    return React.cloneElement(
-      childElement,
-      context.getReferenceProps({
-        ref,
-        ...props,
-        ...childProps,
-        'data-state': context.open ? 'open' : 'closed',
-      } as React.HTMLProps<HTMLElement>),
-    )
-  }
-
-  return (
-    <div
-      ref={ref}
-      className={cn('inline-block', props.className)}
-      // The user can style the trigger based on the state
-      data-state={context.open ? 'open' : 'closed'}
-      {...context.getReferenceProps(props)}
-    >
-      {children}
-    </div>
-  )
-}
-PortalToFollowElemTrigger.displayName = 'PortalToFollowElemTrigger'
-
-/** @deprecated Use semantic overlay primitives instead. See #32767. */
-export const PortalToFollowElemContent = (
-  {
-    ref: propRef,
-    style,
-    ...props
-  }: React.HTMLProps<HTMLDivElement> & {
-    ref?: React.RefObject<HTMLDivElement | null>
-  },
-) => {
-  const context = usePortalToFollowElemContext()
-  const ref = useMergeRefs([context.refs.setFloating, propRef])
-
-  if (!context.open)
-    return null
-
-  const body = document.body
-
-  return (
-    <FloatingPortal root={body}>
-      <div
-        ref={ref}
-        style={{
-          ...context.floatingStyles,
-          ...style,
-          visibility: context.middlewareData.hide?.referenceHidden ? 'hidden' : 'visible',
-        }}
-        {...context.getFloatingProps(props)}
-      />
-    </FloatingPortal>
-  )
-}
-
-PortalToFollowElemContent.displayName = 'PortalToFollowElemContent'
diff --git a/web/app/components/base/premium-badge/__tests__/index.spec.tsx b/web/app/components/base/premium-badge/__tests__/index.spec.tsx
index c3eb31c72e..ccbe4dfc92 100644
--- a/web/app/components/base/premium-badge/__tests__/index.spec.tsx
+++ b/web/app/components/base/premium-badge/__tests__/index.spec.tsx
@@ -1,5 +1,6 @@
 import { render, screen } from '@testing-library/react'
-import PremiumBadge from '../index'
+import userEvent from '@testing-library/user-event'
+import PremiumBadge, { PremiumBadgeButton } from '../index'
 
 describe('PremiumBadge', () => {
   it('renders with default props', () => {
@@ -24,9 +25,9 @@ describe('PremiumBadge', () => {
 
   it('applies allowHover class when allowHover is true', () => {
     render(
-      <PremiumBadge allowHover>
+      <PremiumBadgeButton>
         Premium
-      </PremiumBadge>,
+      </PremiumBadgeButton>,
     )
     const badge = screen.getByText('Premium')
     expect(badge).toBeInTheDocument()
@@ -43,4 +44,22 @@ describe('PremiumBadge', () => {
     expect(badge).toBeInTheDocument()
     expect(badge).toHaveStyle('background-color: red')
   })
+
+  it('renders a static badge without button semantics', () => {
+    render(<PremiumBadge>Premium</PremiumBadge>)
+
+    expect(screen.queryByRole('button')).not.toBeInTheDocument()
+  })
+
+  it('renders an action badge as a button', async () => {
+    const user = userEvent.setup()
+    const handleClick = vi.fn()
+
+    render(<PremiumBadgeButton onClick={handleClick}>Upgrade</PremiumBadgeButton>)
+
+    const button = screen.getByRole('button', { name: 'Upgrade' })
+    await user.click(button)
+
+    expect(handleClick).toHaveBeenCalledTimes(1)
+  })
 })
diff --git a/web/app/components/base/premium-badge/index.css b/web/app/components/base/premium-badge/index.css
index f192a51e57..0796bf3cf6 100644
--- a/web/app/components/base/premium-badge/index.css
+++ b/web/app/components/base/premium-badge/index.css
@@ -1,5 +1,5 @@
 @utility premium-badge {
-  @apply shrink-0 relative inline-flex justify-center items-center rounded-md box-border border border-transparent text-white shadow-xs hover:shadow-lg bg-origin-border overflow-hidden transition-all duration-100 ease-out;
+  @apply shrink-0 relative inline-flex justify-center items-center rounded-md box-border border border-transparent text-white shadow-xs hover:shadow-lg bg-origin-border overflow-hidden transition-[background-color,background-image,box-shadow] duration-100 ease-out motion-reduce:transition-none;
   background-clip: padding-box, border-box;
 }
 
diff --git a/web/app/components/base/premium-badge/index.stories.tsx b/web/app/components/base/premium-badge/index.stories.tsx
index 5f3786a2ea..a0c16c19aa 100644
--- a/web/app/components/base/premium-badge/index.stories.tsx
+++ b/web/app/components/base/premium-badge/index.stories.tsx
@@ -1,14 +1,12 @@
 import type { Meta, StoryObj } from '@storybook/nextjs-vite'
-import PremiumBadge from '.'
+import PremiumBadge, { PremiumBadgeButton } from '.'
 
 const colors: Array<NonNullable<React.ComponentProps<typeof PremiumBadge>['color']>> = ['blue', 'indigo', 'gray', 'orange']
 
 const PremiumBadgeGallery = ({
   size = 'm',
-  allowHover = false,
 }: {
   size?: 's' | 'm'
-  allowHover?: boolean
 }) => {
   return (
     <div className="flex w-full max-w-xl flex-col gap-4 rounded-2xl border border-divider-subtle bg-components-panel-bg p-6">
@@ -16,7 +14,7 @@ const PremiumBadgeGallery = ({
       <div className="grid grid-cols-2 gap-4 sm:grid-cols-4">
         {colors.map(color => (
           <div key={color} className="flex flex-col items-center gap-2 rounded-xl border border-transparent px-2 py-4 hover:border-divider-subtle hover:bg-background-default-subtle">
-            <PremiumBadge color={color} size={size} allowHover={allowHover}>
+            <PremiumBadge color={color} size={size}>
               <span className="px-2 text-xs font-semibold tracking-[0.14em] uppercase">Premium</span>
             </PremiumBadge>
             <span className="text-[11px] tracking-[0.16em] text-text-tertiary uppercase">{color}</span>
@@ -43,11 +41,9 @@ const meta = {
       control: 'radio',
       options: ['s', 'm'],
     },
-    allowHover: { control: 'boolean' },
   },
   args: {
     size: 'm',
-    allowHover: false,
   },
   tags: ['autodocs'],
 } satisfies Meta<typeof PremiumBadgeGallery>
@@ -57,8 +53,10 @@ type Story = StoryObj<typeof meta>
 
 export const Playground: Story = {}
 
-export const HoverEnabled: Story = {
-  args: {
-    allowHover: true,
-  },
+export const Action: Story = {
+  render: () => (
+    <PremiumBadgeButton color="blue" onClick={() => {}}>
+      <span className="px-2 text-xs font-semibold">Upgrade</span>
+    </PremiumBadgeButton>
+  ),
 }
diff --git a/web/app/components/base/premium-badge/index.tsx b/web/app/components/base/premium-badge/index.tsx
index 42ce158606..55628ea0e9 100644
--- a/web/app/components/base/premium-badge/index.tsx
+++ b/web/app/components/base/premium-badge/index.tsx
@@ -1,8 +1,7 @@
 import type { VariantProps } from 'class-variance-authority'
-import type { CSSProperties, ReactNode } from 'react'
+import type { ButtonHTMLAttributes, CSSProperties, ReactNode } from 'react'
 import { cn } from '@langgenius/dify-ui/cn'
 import { cva } from 'class-variance-authority'
-import * as React from 'react'
 import { Highlight } from '@/app/components/base/icons/src/public/common'
 
 const PremiumBadgeVariants = cva(
@@ -38,31 +37,66 @@ type PremiumBadgeProps = {
   color?: 'blue' | 'indigo' | 'gray' | 'orange'
   allowHover?: boolean
   styleCss?: CSSProperties
+  className?: string
   children?: ReactNode
-} & React.HTMLAttributes<HTMLDivElement> & VariantProps<typeof PremiumBadgeVariants>
+} & VariantProps<typeof PremiumBadgeVariants>
 
-const PremiumBadge: React.FC<PremiumBadgeProps> = ({
+type PremiumBadgeButtonProps = Omit<ButtonHTMLAttributes<HTMLButtonElement>, 'color'> & Omit<PremiumBadgeProps, 'styleCss'> & {
+  style?: CSSProperties
+}
+
+function BadgeHighlight({ size }: { size?: PremiumBadgeProps['size'] }) {
+  return (
+    <Highlight
+      aria-hidden="true"
+      className={cn('absolute top-0 right-1/2 translate-x-[20%] opacity-50 transition-[opacity,transform] duration-100 ease-out hover:translate-x-[30%] hover:opacity-80 motion-reduce:transition-none', size === 's' ? 'h-[18px] w-12' : 'h-6 w-12')}
+    />
+  )
+}
+
+function PremiumBadge({
   className,
   size,
   color,
   allowHover,
   styleCss,
   children,
-  ...props
-}) => {
+}: PremiumBadgeProps) {
   return (
-    <div
+    <span
       className={cn(PremiumBadgeVariants({ size, color, allowHover, className }), 'relative text-nowrap')}
       style={styleCss}
+    >
+      {children}
+      <BadgeHighlight size={size} />
+    </span>
+  )
+}
+
+export function PremiumBadgeButton({
+  className,
+  size,
+  color,
+  allowHover = true,
+  style,
+  children,
+  type = 'button',
+  ...props
+}: PremiumBadgeButtonProps) {
+  return (
+    <button
+      type={type}
+      className={cn(
+        PremiumBadgeVariants({ size, color, allowHover, className }),
+        'relative touch-manipulation text-nowrap focus-visible:ring-2 focus-visible:ring-state-accent-solid focus-visible:outline-hidden',
+      )}
+      style={style}
       {...props}
     >
       {children}
-      <Highlight
-        className={cn('absolute top-0 right-1/2 translate-x-[20%] opacity-50 transition-all duration-100 ease-out hover:translate-x-[30%] hover:opacity-80', size === 's' ? 'h-[18px] w-12' : 'h-6 w-12')}
-      />
-    </div>
+      <BadgeHighlight size={size} />
+    </button>
   )
 }
-PremiumBadge.displayName = 'PremiumBadge'
 
 export default PremiumBadge
diff --git a/web/app/components/base/prompt-editor/__tests__/index.spec.tsx b/web/app/components/base/prompt-editor/__tests__/index.spec.tsx
index 9d75b9e061..31e25ab19e 100644
--- a/web/app/components/base/prompt-editor/__tests__/index.spec.tsx
+++ b/web/app/components/base/prompt-editor/__tests__/index.spec.tsx
@@ -365,6 +365,14 @@ describe('PromptEditor', () => {
       expect(() => unmount()).not.toThrow()
     })
 
+    it('should rerender without ref-driven update loops', () => {
+      const { rerender } = render(<PromptEditor value="first" />)
+
+      expect(() => {
+        rerender(<PromptEditor value="second" />)
+      }).not.toThrow()
+    })
+
     it('should render hitl block when show=true', () => {
       render(
         <PromptEditor
diff --git a/web/app/components/base/prompt-editor/hooks.ts b/web/app/components/base/prompt-editor/hooks.ts
index 70869d6a17..ff95cc497c 100644
--- a/web/app/components/base/prompt-editor/hooks.ts
+++ b/web/app/components/base/prompt-editor/hooks.ts
@@ -110,9 +110,9 @@ export const useSelectOrDelete: UseSelectOrDeleteHandler = (nodeKey: string, com
   return [ref, isSelected]
 }
 
-type UseTriggerHandler = () => [RefObject<HTMLDivElement | null>, boolean, Dispatch<SetStateAction<boolean>>]
-export const useTrigger: UseTriggerHandler = () => {
-  const triggerRef = useRef<HTMLDivElement>(null)
+type UseTriggerHandler = <T extends HTMLElement = HTMLDivElement>() => [RefObject<T | null>, boolean, Dispatch<SetStateAction<boolean>>]
+export const useTrigger: UseTriggerHandler = <T extends HTMLElement = HTMLDivElement>() => {
+  const triggerRef = useRef<T>(null)
   const [open, setOpen] = useState(false)
   const handleOpen = useCallback((e: MouseEvent) => {
     e.stopPropagation()
diff --git a/web/app/components/base/prompt-editor/index.tsx b/web/app/components/base/prompt-editor/index.tsx
index fce70d2781..29d0d71715 100644
--- a/web/app/components/base/prompt-editor/index.tsx
+++ b/web/app/components/base/prompt-editor/index.tsx
@@ -29,7 +29,7 @@ import {
   TextNode,
 } from 'lexical'
 import * as React from 'react'
-import { useEffect, useState } from 'react'
+import { useCallback, useEffect, useState } from 'react'
 import { useEventEmitterContextContext } from '@/context/event-emitter'
 import {
   UPDATE_DATASETS_EVENT_EMITTER,
@@ -203,12 +203,16 @@ const PromptEditor: FC<PromptEditorProps> = ({
     } as any)
   }, [eventEmitter, historyBlock?.history])
 
-  const [floatingAnchorElem, setFloatingAnchorElem] = useState(null)
+  const [floatingAnchorElem, setFloatingAnchorElem] = useState<HTMLDivElement | null>(null)
 
-  const onRef = (_floatingAnchorElem: any) => {
-    if (_floatingAnchorElem !== null)
-      setFloatingAnchorElem(_floatingAnchorElem)
-  }
+  const onRef = useCallback((nextFloatingAnchorElem: HTMLDivElement | null) => {
+    setFloatingAnchorElem((currentFloatingAnchorElem) => {
+      if (currentFloatingAnchorElem === nextFloatingAnchorElem)
+        return currentFloatingAnchorElem
+
+      return nextFloatingAnchorElem
+    })
+  }, [])
 
   return (
     <LexicalComposer initialConfig={{ ...initialConfig, editable }}>
diff --git a/web/app/components/base/prompt-editor/plugins/context-block/__tests__/component.spec.tsx b/web/app/components/base/prompt-editor/plugins/context-block/__tests__/component.spec.tsx
index 64bca0a24d..f7bb4a17fc 100644
--- a/web/app/components/base/prompt-editor/plugins/context-block/__tests__/component.spec.tsx
+++ b/web/app/components/base/prompt-editor/plugins/context-block/__tests__/component.spec.tsx
@@ -252,7 +252,7 @@ describe('ContextBlockComponent', () => {
         />,
       )
 
-      const addButton = screen.getByTestId('add-button')
+      const addButton = screen.getByRole('button', { name: 'common.promptEditor.context.modal.add' })
       await userEvent.click(addButton)
       expect(handleAddContext).toHaveBeenCalledTimes(1)
     })
diff --git a/web/app/components/base/prompt-editor/plugins/context-block/component.tsx b/web/app/components/base/prompt-editor/plugins/context-block/component.tsx
index 05fff5b4e8..b12e632843 100644
--- a/web/app/components/base/prompt-editor/plugins/context-block/component.tsx
+++ b/web/app/components/base/prompt-editor/plugins/context-block/component.tsx
@@ -25,7 +25,7 @@ const ContextBlockComponent: FC<ContextBlockComponentProps> = ({
 }) => {
   const { t } = useTranslation()
   const [ref, isSelected] = useSelectOrDelete(nodeKey, DELETE_CONTEXT_BLOCK_COMMAND)
-  const [triggerRef, open, setOpen] = useTrigger()
+  const [triggerRef, open, setOpen] = useTrigger<HTMLButtonElement>()
   const { eventEmitter } = useEventEmitterContextContext()
   const [localDatasets, setLocalDatasets] = useState<Dataset[]>(datasets)
 
@@ -54,18 +54,19 @@ const ContextBlockComponent: FC<ContextBlockComponentProps> = ({
           onOpenChange={setOpen}
         >
           <PopoverTrigger
-            nativeButton={false}
             render={(
-              <div
+              <button
+                type="button"
+                aria-label={t('promptEditor.context.item.title', { ns: 'common' })}
                 className={`
-            flex h-[18px] w-[18px] cursor-pointer items-center justify-center rounded text-[11px] font-semibold
+            flex h-[18px] w-[18px] cursor-pointer items-center justify-center rounded border-none p-0 text-[11px] font-semibold
             ${open ? 'bg-[#6938EF] text-white' : 'bg-white/50 group-hover:bg-white group-hover:shadow-xs'}
           `}
                 ref={triggerRef}
                 onClick={e => e.preventDefault()}
               >
                 {localDatasets.length}
-              </div>
+              </button>
             )}
           />
           <PopoverContent
@@ -91,12 +92,16 @@ const ContextBlockComponent: FC<ContextBlockComponentProps> = ({
                     ))
                   }
                 </div>
-                <div className="flex h-8 cursor-pointer items-center text-[#155EEF]" onClick={onAddContext}>
-                  <div className="mr-2 flex h-6 w-6 shrink-0 items-center justify-center rounded-md border-[0.5px] border-gray-100" data-testid="add-button">
-                    <span className="i-ri-add-line h-[14px] w-[14px]" />
+                <button
+                  type="button"
+                  className="flex h-8 cursor-pointer items-center border-none bg-transparent p-0 text-left text-[#155EEF] focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+                  onClick={onAddContext}
+                >
+                  <div className="mr-2 flex h-6 w-6 shrink-0 items-center justify-center rounded-md border-[0.5px] border-gray-100">
+                    <span className="i-ri-add-line h-[14px] w-[14px]" aria-hidden="true" />
                   </div>
                   <div className="text-[13px] font-medium" title="">{t('promptEditor.context.modal.add', { ns: 'common' })}</div>
-                </div>
+                </button>
               </div>
               <div className="rounded-b-xl border-t-[0.5px] border-gray-50 bg-gray-50 px-4 py-3 text-xs text-gray-500">
                 {t('promptEditor.context.modal.footer', { ns: 'common' })}
diff --git a/web/app/components/base/prompt-editor/plugins/hitl-input-block/__tests__/component-ui.spec.tsx b/web/app/components/base/prompt-editor/plugins/hitl-input-block/__tests__/component-ui.spec.tsx
index 1520c24abe..ca279a1d4d 100644
--- a/web/app/components/base/prompt-editor/plugins/hitl-input-block/__tests__/component-ui.spec.tsx
+++ b/web/app/components/base/prompt-editor/plugins/hitl-input-block/__tests__/component-ui.spec.tsx
@@ -4,7 +4,7 @@ import type { FormInputItem } from '@/app/components/workflow/nodes/human-input/
 import type { ValueSelector } from '@/app/components/workflow/types'
 
 import { LexicalComposer } from '@lexical/react/LexicalComposer'
-import { cleanup, fireEvent, render } from '@testing-library/react'
+import { cleanup, fireEvent, render, screen } from '@testing-library/react'
 import { BlockEnum, InputVarType } from '@/app/components/workflow/types'
 import HITLInputComponentUI from '../component-ui'
 import { HITLInputNode } from '../node'
@@ -83,10 +83,10 @@ describe('HITLInputComponentUI', () => {
 
   describe('Rendering', () => {
     it('should render action buttons correctly', () => {
-      const { getAllByTestId } = renderComponent()
+      renderComponent()
 
-      const buttons = getAllByTestId(/action-btn-/)
-      expect(buttons).toHaveLength(2)
+      expect(screen.getByRole('button', { name: 'common.operation.edit' })).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'common.operation.remove' })).toBeInTheDocument()
     })
 
     it('should render variable block when default type is variable', () => {
@@ -107,17 +107,18 @@ describe('HITLInputComponentUI', () => {
     })
 
     it('should hide action buttons when readonly is true', () => {
-      const { queryAllByTestId } = renderComponent({ readonly: true })
+      renderComponent({ readonly: true })
 
-      expect(queryAllByTestId(/action-btn-/)).toHaveLength(0)
+      expect(screen.queryByRole('button', { name: 'common.operation.edit' })).not.toBeInTheDocument()
+      expect(screen.queryByRole('button', { name: 'common.operation.remove' })).not.toBeInTheDocument()
     })
   })
 
   describe('Remove action', () => {
     it('should call onRemove when remove button is clicked', () => {
-      const { getByTestId, onRemove } = renderComponent()
+      const { onRemove } = renderComponent()
 
-      fireEvent.click(getByTestId('action-btn-remove'))
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.remove' }))
 
       expect(onRemove).toHaveBeenCalledWith(varName)
       expect(onRemove).toHaveBeenCalledTimes(1)
@@ -125,39 +126,19 @@ describe('HITLInputComponentUI', () => {
   })
 
   describe('Edit flow', () => {
-    // it('should call onChange when name is unchanged', async () => {
-    //   const { findByRole, findByTestId, onChange, onRename } = renderComponent()
-
-    //   fireEvent.click(await findByTestId('action-btn-edit'))
-
-    //   await findByRole('textbox')
-
-    //   const saveBtn = await findByTestId('hitl-input-save-btn')
-    //   fireEvent.click(saveBtn)
-
-    //   expect(onChange).toHaveBeenCalledWith(
-    //     expect.objectContaining({
-    //       output_variable_name: varName,
-    //     }),
-    //   )
-
-    //   expect(onRename).not.toHaveBeenCalled()
-    // })
-
     it('should close modal without update when cancel is clicked', async () => {
       const {
         findByRole,
-        findByTestId,
         queryByRole,
         onChange,
         onRename,
       } = renderComponent()
 
-      fireEvent.click(await findByTestId('action-btn-edit'))
+      fireEvent.click(await screen.findByRole('button', { name: 'common.operation.edit' }))
 
       await findByRole('textbox')
 
-      fireEvent.click(await findByTestId('hitl-input-cancel-btn'))
+      fireEvent.click(await screen.findByRole('button', { name: 'common.operation.cancel' }))
 
       expect(onChange).not.toHaveBeenCalled()
       expect(onRename).not.toHaveBeenCalled()
@@ -168,45 +149,19 @@ describe('HITLInputComponentUI', () => {
 
   describe('Default formInput', () => {
     it('should pass default payload to InputField when formInput is undefined', async () => {
-      const { findByTestId, findByRole } = renderComponent({
+      const { findByRole } = renderComponent({
         formInput: undefined,
       })
 
-      fireEvent.click(await findByTestId('action-btn-edit'))
+      fireEvent.click(await screen.findByRole('button', { name: 'common.operation.edit' }))
 
       const textbox = await findByRole('textbox')
 
-      fireEvent.click(await findByTestId('hitl-input-save-btn'))
+      fireEvent.click(await screen.findByRole('button', { name: 'common.operation.save' }))
 
       expect(textbox).toHaveValue('customer_name')
     })
 
-    // it('should call onRename when variable name changes', async () => {
-    //   const {
-    //     findByRole,
-    //     findByTestId,
-    //     onChange,
-    //     onRename,
-    //   } = renderComponent()
-
-    //   fireEvent.click(await findByTestId('action-btn-edit'))
-
-    //   const input = (await findByRole('textbox')) as HTMLInputElement
-
-    //   fireEvent.change(input, { target: { value: 'updated_name' } })
-
-    //   fireEvent.click(await screen.findByTestId('hitl-input-save-btn'))
-
-    //   expect(onChange).not.toHaveBeenCalled()
-
-    //   expect(onRename).toHaveBeenCalledWith(
-    //     expect.objectContaining({
-    //       output_variable_name: 'updated_name',
-    //     }),
-    //     varName,
-    //   )
-    // })
-
     it('should render variable selector when workflowNodesMap fallback is used', () => {
       const { getByText } = renderComponent({
         workflowNodesMap: undefined as unknown as WorkflowNodesMap,
diff --git a/web/app/components/base/prompt-editor/plugins/hitl-input-block/__tests__/type-switch.spec.tsx b/web/app/components/base/prompt-editor/plugins/hitl-input-block/__tests__/type-switch.spec.tsx
index a23ef088f9..f487dbaae5 100644
--- a/web/app/components/base/prompt-editor/plugins/hitl-input-block/__tests__/type-switch.spec.tsx
+++ b/web/app/components/base/prompt-editor/plugins/hitl-input-block/__tests__/type-switch.spec.tsx
@@ -15,7 +15,7 @@ describe('TypeSwitch', () => {
       <TypeSwitch isVariable={false} onIsVariableChange={onIsVariableChange} />,
     )
 
-    const trigger = screen.getByText('workflow.nodes.humanInput.insertInputField.useVarInstead')
+    const trigger = screen.getByRole('button', { name: 'workflow.nodes.humanInput.insertInputField.useVarInstead' })
     await user.click(trigger)
 
     expect(onIsVariableChange).toHaveBeenCalledWith(true)
@@ -29,7 +29,7 @@ describe('TypeSwitch', () => {
       <TypeSwitch isVariable onIsVariableChange={onIsVariableChange} />,
     )
 
-    const trigger = screen.getByText('workflow.nodes.humanInput.insertInputField.useConstantInstead')
+    const trigger = screen.getByRole('button', { name: 'workflow.nodes.humanInput.insertInputField.useConstantInstead' })
     await user.click(trigger)
 
     expect(onIsVariableChange).toHaveBeenCalledWith(false)
diff --git a/web/app/components/base/prompt-editor/plugins/hitl-input-block/component-ui.tsx b/web/app/components/base/prompt-editor/plugins/hitl-input-block/component-ui.tsx
index 9a752062ea..322e2e0d75 100644
--- a/web/app/components/base/prompt-editor/plugins/hitl-input-block/component-ui.tsx
+++ b/web/app/components/base/prompt-editor/plugins/hitl-input-block/component-ui.tsx
@@ -4,6 +4,7 @@ import type { WorkflowNodesMap } from '../workflow-variable-block/node'
 import type { FormInputItem } from '@/app/components/workflow/nodes/human-input/types'
 import type { Type } from '@/app/components/workflow/nodes/llm/types'
 import type { ValueSelector, Var } from '@/app/components/workflow/types'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { useBoolean } from 'ahooks'
 import * as React from 'react'
 import { useCallback, useEffect, useMemo, useRef } from 'react'
@@ -11,7 +12,6 @@ import { useTranslation } from 'react-i18next'
 import { InputVarType } from '@/app/components/workflow/types'
 import ActionButton from '../../../action-button'
 import { VariableX } from '../../../icons/src/vender/workflow'
-import Modal from '../../../modal'
 import InputField from './input-field'
 import VariableBlock from './variable-block'
 
@@ -136,20 +136,18 @@ const HITLInputComponentUI: FC<HITLInputComponentUIProps> = ({
             <div className="flex h-full items-center" ref={editBtnRef}>
               <ActionButton
                 size="s"
-                data-testid="action-btn-edit"
                 aria-label={t('operation.edit', { ns: 'common' })}
               >
-                <span className="i-ri-edit-line size-4 text-text-tertiary" />
+                <span className="i-ri-edit-line size-4 text-text-tertiary" aria-hidden="true" />
               </ActionButton>
             </div>
 
             <div className="flex h-full items-center" ref={removeBtnRef}>
               <ActionButton
                 size="s"
-                data-testid="action-btn-remove"
                 aria-label={t('operation.remove', { ns: 'common' })}
               >
-                <span className="i-ri-delete-bin-line size-4 text-text-tertiary" />
+                <span className="i-ri-delete-bin-line size-4 text-text-tertiary" aria-hidden="true" />
               </ActionButton>
             </div>
           </div>
@@ -157,20 +155,24 @@ const HITLInputComponentUI: FC<HITLInputComponentUIProps> = ({
       </div>
 
       {isShowEditModal && (
-        <Modal
-          isShow
-          onClose={hideEditModal}
-          wrapperClassName="z-999"
-          className="max-w-[372px] p-0!"
+        <Dialog
+          open
+          onOpenChange={(open) => {
+            if (!open)
+              hideEditModal()
+          }}
         >
-          <InputField
-            nodeId={nodeId}
-            isEdit
-            payload={formInput}
-            onChange={handleChange}
-            onCancel={hideEditModal}
-          />
-        </Modal>
+          <DialogContent className="w-full max-w-[372px] overflow-hidden! border-none p-0! text-left align-middle">
+
+            <InputField
+              nodeId={nodeId}
+              isEdit
+              payload={formInput}
+              onChange={handleChange}
+              onCancel={hideEditModal}
+            />
+          </DialogContent>
+        </Dialog>
       )}
     </div>
   )
diff --git a/web/app/components/base/prompt-editor/plugins/hitl-input-block/input-field.tsx b/web/app/components/base/prompt-editor/plugins/hitl-input-block/input-field.tsx
index 7511406718..ca7dc387ed 100644
--- a/web/app/components/base/prompt-editor/plugins/hitl-input-block/input-field.tsx
+++ b/web/app/components/base/prompt-editor/plugins/hitl-input-block/input-field.tsx
@@ -82,7 +82,9 @@ const InputField: React.FC<InputFieldProps> = ({
   }, [handleSave])
 
   return (
-    <div className="w-[372px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur p-3 shadow-lg backdrop-blur-[5px]">
+    <div className="w-[372px]
+     rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur p-3 shadow-lg backdrop-blur-[5px]"
+    >
       <div className="system-md-semibold text-text-primary">{t(`${i18nPrefix}.title`, { ns: 'workflow' })}</div>
       <div className="mt-3">
         <div className="system-xs-medium text-text-secondary">
@@ -121,11 +123,10 @@ const InputField: React.FC<InputFieldProps> = ({
         />
       </div>
       <div className="mt-4 flex justify-end space-x-2">
-        <Button data-testid="hitl-input-cancel-btn" onClick={onCancel}>{t('operation.cancel', { ns: 'common' })}</Button>
+        <Button onClick={onCancel}>{t('operation.cancel', { ns: 'common' })}</Button>
         {isEdit
           ? (
               <Button
-                data-testid="hitl-input-save-btn"
                 variant="primary"
                 onClick={handleSave}
                 disabled={!nameValid}
@@ -135,7 +136,6 @@ const InputField: React.FC<InputFieldProps> = ({
             )
           : (
               <Button
-                data-testid="hitl-input-insert-btn"
                 className="flex"
                 variant="primary"
                 disabled={!nameValid}
diff --git a/web/app/components/base/prompt-editor/plugins/hitl-input-block/type-switch.tsx b/web/app/components/base/prompt-editor/plugins/hitl-input-block/type-switch.tsx
index 86ab518fc5..f4e0f4304e 100644
--- a/web/app/components/base/prompt-editor/plugins/hitl-input-block/type-switch.tsx
+++ b/web/app/components/base/prompt-editor/plugins/hitl-input-block/type-switch.tsx
@@ -18,10 +18,14 @@ const TypeSwitch: FC<Props> = ({
 }) => {
   const { t } = useTranslation()
   return (
-    <div className={cn('inline-flex h-6 cursor-pointer items-center space-x-1 rounded-md pr-2 pl-1.5 text-text-tertiary select-none hover:bg-components-button-ghost-bg-hover', className)} onClick={() => onIsVariableChange?.(!isVariable)}>
-      <Variable02 className="size-3.5" />
+    <button
+      type="button"
+      className={cn('inline-flex h-6 cursor-pointer items-center space-x-1 rounded-md border-none bg-transparent py-0 pr-2 pl-1.5 text-left text-text-tertiary select-none hover:bg-components-button-ghost-bg-hover focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden', className)}
+      onClick={() => onIsVariableChange?.(!isVariable)}
+    >
+      <Variable02 className="size-3.5" aria-hidden="true" />
       <div className="system-xs-medium">{t(`nodes.humanInput.insertInputField.${isVariable ? 'useConstantInstead' : 'useVarInstead'}`, { ns: 'workflow' })}</div>
-    </div>
+    </button>
   )
 }
 export default React.memo(TypeSwitch)
diff --git a/web/app/components/base/prompt-editor/plugins/shortcuts-popup-plugin/__tests__/index.spec.tsx b/web/app/components/base/prompt-editor/plugins/shortcuts-popup-plugin/__tests__/index.spec.tsx
index e3fba27cf2..114d1d7802 100644
--- a/web/app/components/base/prompt-editor/plugins/shortcuts-popup-plugin/__tests__/index.spec.tsx
+++ b/web/app/components/base/prompt-editor/plugins/shortcuts-popup-plugin/__tests__/index.spec.tsx
@@ -1,4 +1,4 @@
-import type { LexicalCommand } from 'lexical'
+import type { ShortcutPopupInsertHandler } from '../index'
 import { LexicalComposer } from '@lexical/react/LexicalComposer'
 import { ContentEditable } from '@lexical/react/LexicalContentEditable'
 import { LexicalErrorBoundary } from '@lexical/react/LexicalErrorBoundary'
@@ -50,7 +50,7 @@ const CONTENT_EDITABLE_ID = 'ce'
 type MinimalEditorProps = {
   withContainer?: boolean
   hotkey?: string | string[] | string[][] | ((e: KeyboardEvent) => boolean)
-  children?: React.ReactNode | ((close: () => void, onInsert: (command: LexicalCommand<unknown>, params: unknown[]) => void) => React.ReactNode)
+  children?: React.ReactNode | ((close: () => void, onInsert: ShortcutPopupInsertHandler) => React.ReactNode)
   className?: string
   onOpen?: () => void
   onClose?: () => void
@@ -316,7 +316,7 @@ describe('ShortcutsPopupPlugin', () => {
 
   it('renders children as render function and provides close/onInsert', async () => {
     const TEST_COMMAND = createCommand<unknown>('TEST_COMMAND')
-    const childrenFn = vi.fn((close: () => void, onInsert: (cmd: LexicalCommand<unknown>, params: unknown[]) => void) => (
+    const childrenFn = vi.fn((close: () => void, onInsert: ShortcutPopupInsertHandler) => (
       <div>
         <button type="button" data-testid="close-btn" onClick={close}>Close</button>
         <button type="button" data-testid="insert-btn" onClick={() => onInsert(TEST_COMMAND, ['param1'])}>Insert</button>
@@ -346,7 +346,7 @@ describe('ShortcutsPopupPlugin', () => {
     const TEST_COMMAND = createCommand<unknown>('TEST_INSERT_COMMAND')
     render(
       <MinimalEditor>
-        {(close: () => void, onInsert: (cmd: LexicalCommand<unknown>, params: unknown[]) => void) => (
+        {(close: () => void, onInsert: ShortcutPopupInsertHandler) => (
           <div>
             <button type="button" data-testid="insert-btn" onClick={() => onInsert(TEST_COMMAND, ['value'])}>Insert</button>
           </div>
diff --git a/web/app/components/base/prompt-editor/plugins/shortcuts-popup-plugin/index.tsx b/web/app/components/base/prompt-editor/plugins/shortcuts-popup-plugin/index.tsx
index 19a2efb5bc..ec03b2fc3d 100644
--- a/web/app/components/base/prompt-editor/plugins/shortcuts-popup-plugin/index.tsx
+++ b/web/app/components/base/prompt-editor/plugins/shortcuts-popup-plugin/index.tsx
@@ -23,6 +23,7 @@ import {
 import { createPortal } from 'react-dom'
 
 export const SHORTCUTS_EMPTY_CONTENT = 'shortcuts_empty_content'
+export type ShortcutPopupInsertHandler = <Payload>(command: LexicalCommand<Payload>, params: Payload) => void
 
 // Hotkey can be:
 // - string: 'mod+/'
@@ -33,7 +34,7 @@ export type Hotkey = string | string[] | string[][] | ((e: KeyboardEvent) => boo
 
 type ShortcutPopupPluginProps = {
   hotkey?: Hotkey
-  children?: React.ReactNode | ((close: () => void, onInsert: (command: LexicalCommand<unknown>, params: any[]) => void) => React.ReactNode)
+  children?: React.ReactNode | ((close: () => void, onInsert: ShortcutPopupInsertHandler) => React.ReactNode)
   className?: string
   container?: Element | null
   onOpen?: () => void
@@ -158,8 +159,9 @@ export default function ShortcutsPopupPlugin({
         apply({ availableWidth, availableHeight, elements }) {
           Object.assign(elements.floating.style, {
             maxWidth: `${Math.min(400, availableWidth)}px`,
-            maxHeight: `${Math.min(300, availableHeight)}px`,
-            overflow: 'auto',
+            maxHeight: `${Math.max(0, availableHeight)}px`,
+            overflowX: 'hidden',
+            overflowY: 'auto',
           })
         },
         padding: 8,
@@ -236,7 +238,7 @@ export default function ShortcutsPopupPlugin({
 
     setOpen(true)
     onOpen?.()
-  }, [onOpen])
+  }, [editor, onOpen, refs])
 
   const closePortal = useCallback(() => {
     setOpen(false)
@@ -280,7 +282,7 @@ export default function ShortcutsPopupPlugin({
     return () => document.removeEventListener('mousedown', onMouseDown, false)
   }, [open, closePortal])
 
-  const handleInsert = useCallback((command: LexicalCommand<unknown>, params: any) => {
+  const handleInsert = useCallback(<Payload,>(command: LexicalCommand<Payload>, params: Payload) => {
     editor.dispatchCommand(command, params)
     closePortal()
   }, [editor, closePortal])
diff --git a/web/app/components/base/prompt-log-modal/__tests__/index.spec.tsx b/web/app/components/base/prompt-log-modal/__tests__/index.spec.tsx
index 95de5aff39..d47cafd14b 100644
--- a/web/app/components/base/prompt-log-modal/__tests__/index.spec.tsx
+++ b/web/app/components/base/prompt-log-modal/__tests__/index.spec.tsx
@@ -43,7 +43,7 @@ describe('PromptLogModal', () => {
 
     it('renders copy feedback when log length is 1', () => {
       render(<PromptLogModal {...defaultProps} />)
-      expect(screen.getByTestId('close-btn-container'))!.toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'common.operation.close' }))!.toBeInTheDocument()
     })
 
     it('renders multiple logs in Card correctly', () => {
@@ -72,7 +72,7 @@ describe('PromptLogModal', () => {
   describe('Interactions', () => {
     it('calls onCancel when close button is clicked', () => {
       render(<PromptLogModal {...defaultProps} />)
-      const closeBtn = screen.getByTestId('close-btn')
+      const closeBtn = screen.getByRole('button', { name: 'common.operation.close' })
       expect(closeBtn)!.toBeInTheDocument()
       fireEvent.click(closeBtn)
       expect(defaultProps.onCancel).toHaveBeenCalled()
diff --git a/web/app/components/base/prompt-log-modal/index.tsx b/web/app/components/base/prompt-log-modal/index.tsx
index 08200623ae..b9225fabb4 100644
--- a/web/app/components/base/prompt-log-modal/index.tsx
+++ b/web/app/components/base/prompt-log-modal/index.tsx
@@ -2,6 +2,7 @@ import type { FC } from 'react'
 import type { IChatItem } from '@/app/components/base/chat/chat/type'
 import { useClickAway } from 'ahooks'
 import { useEffect, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
 import { CopyFeedbackNew } from '@/app/components/base/copy-feedback'
 import Card from './card'
 
@@ -15,6 +16,7 @@ const PromptLogModal: FC<PromptLogModalProps> = ({
   width,
   onCancel,
 }) => {
+  const { t } = useTranslation()
   const ref = useRef(null)
   const [mounted, setMounted] = useState(false)
 
@@ -53,13 +55,14 @@ const PromptLogModal: FC<PromptLogModalProps> = ({
               </>
             )
           }
-          <div
+          <button
+            type="button"
+            aria-label={t('operation.close', { ns: 'common' })}
             onClick={onCancel}
-            className="flex h-6 w-6 cursor-pointer items-center justify-center"
-            data-testid="close-btn-container"
+            className="flex h-6 w-6 cursor-pointer items-center justify-center rounded-md border-none bg-transparent p-0 focus:outline-none focus-visible:ring-2 focus-visible:ring-components-button-secondary-accent-border"
           >
-            <span className="i-ri-close-line h-4 w-4 text-text-tertiary" data-testid="close-btn" />
-          </div>
+            <span className="i-ri-close-line h-4 w-4 text-text-tertiary" aria-hidden="true" />
+          </button>
         </div>
       </div>
       <div className="grow overflow-y-auto p-2">
diff --git a/web/app/components/base/qrcode/__tests__/index.spec.tsx b/web/app/components/base/qrcode/__tests__/index.spec.tsx
index cfc78cef85..0029f1840a 100644
--- a/web/app/components/base/qrcode/__tests__/index.spec.tsx
+++ b/web/app/components/base/qrcode/__tests__/index.spec.tsx
@@ -17,7 +17,7 @@ describe('ShareQRCode', () => {
   describe('Rendering', () => {
     it('renders correctly', () => {
       render(<ShareQRCode content={content} />)
-      expect(screen.getByRole('button').firstElementChild).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'appOverview.overview.appInfo.qrcode.title' })).toBeInTheDocument()
     })
   })
 
@@ -27,7 +27,7 @@ describe('ShareQRCode', () => {
       render(<ShareQRCode content={content} />)
 
       expect(screen.queryByRole('img')).not.toBeInTheDocument()
-      const trigger = screen.getByTestId('qrcode-container')
+      const trigger = screen.getByRole('button', { name: 'appOverview.overview.appInfo.qrcode.title' })
       await user.click(trigger)
 
       expect(screen.getByRole('img')).toBeInTheDocument()
@@ -40,16 +40,16 @@ describe('ShareQRCode', () => {
       const user = userEvent.setup()
       render(
         <div>
-          <div data-testid="outside">Outside</div>
+          <div>Outside</div>
           <ShareQRCode content={content} />
         </div>,
       )
 
-      const trigger = screen.getByTestId('qrcode-container')
+      const trigger = screen.getByRole('button', { name: 'appOverview.overview.appInfo.qrcode.title' })
       await user.click(trigger)
       expect(screen.getByRole('img')).toBeInTheDocument()
 
-      await user.click(screen.getByTestId('outside'))
+      await user.click(screen.getByText('Outside'))
       expect(screen.queryByRole('img')).not.toBeInTheDocument()
     })
 
@@ -57,7 +57,7 @@ describe('ShareQRCode', () => {
       const user = userEvent.setup()
       render(<ShareQRCode content={content} />)
 
-      const trigger = screen.getByTestId('qrcode-container')
+      const trigger = screen.getByRole('button', { name: 'appOverview.overview.appInfo.qrcode.title' })
       await user.click(trigger)
 
       const canvas = screen.getByRole('img')
@@ -75,10 +75,10 @@ describe('ShareQRCode', () => {
       try {
         render(<ShareQRCode content={content} />)
 
-        const trigger = screen.getByTestId('qrcode-container')
+        const trigger = screen.getByRole('button', { name: 'appOverview.overview.appInfo.qrcode.title' })
         await user.click(trigger!)
 
-        const downloadBtn = screen.getByText('appOverview.overview.appInfo.qrcode.download')
+        const downloadBtn = screen.getByRole('button', { name: 'appOverview.overview.appInfo.qrcode.download' })
         await user.click(downloadBtn)
 
         expect(downloadUrl).toHaveBeenCalledWith({
@@ -95,7 +95,7 @@ describe('ShareQRCode', () => {
       const user = userEvent.setup()
       render(<ShareQRCode content={content} />)
 
-      const trigger = screen.getByTestId('qrcode-container')
+      const trigger = screen.getByRole('button', { name: 'appOverview.overview.appInfo.qrcode.title' })
       await user.click(trigger)
 
       // Override querySelector on the panel to simulate canvas not being found
@@ -108,7 +108,7 @@ describe('ShareQRCode', () => {
       }) as typeof panel.querySelector
 
       try {
-        const downloadBtn = screen.getByText('appOverview.overview.appInfo.qrcode.download')
+        const downloadBtn = screen.getByRole('button', { name: 'appOverview.overview.appInfo.qrcode.download' })
         await user.click(downloadBtn)
         expect(downloadUrl).not.toHaveBeenCalled()
       }
@@ -121,7 +121,7 @@ describe('ShareQRCode', () => {
       const user = userEvent.setup()
       render(<ShareQRCode content={content} />)
 
-      const trigger = screen.getByTestId('qrcode-container')
+      const trigger = screen.getByRole('button', { name: 'appOverview.overview.appInfo.qrcode.title' })
       await user.click(trigger)
 
       // Click on the scan text inside the panel — panel should remain open
diff --git a/web/app/components/base/qrcode/index.tsx b/web/app/components/base/qrcode/index.tsx
index cfc30d752b..d4c9918aa6 100644
--- a/web/app/components/base/qrcode/index.tsx
+++ b/web/app/components/base/qrcode/index.tsx
@@ -52,32 +52,39 @@ const ShareQRCode = ({ content }: Props) => {
   const tooltipText = t(`${prefixEmbedded}`, { ns: 'appOverview' })
   /* v8 ignore next -- react-i18next returns a non-empty key/string in configured runtime; empty fallback protects against missing i18n payloads. @preserve */
   const safeTooltipText = tooltipText || ''
+  const downloadText = t('overview.appInfo.qrcode.download', { ns: 'appOverview' })
 
   return (
     <Tooltip>
-      <TooltipTrigger
-        render={(
-          <div className="relative h-6 w-6" onClick={toggleQRCode} data-testid="qrcode-container">
-            <ActionButton>
-              <span className="i-ri-qr-code-line h-4 w-4" />
+      <div className="relative h-6 w-6">
+        <TooltipTrigger
+          render={(
+            <ActionButton aria-label={safeTooltipText} onClick={toggleQRCode}>
+              <span className="i-ri-qr-code-line h-4 w-4" aria-hidden="true" />
             </ActionButton>
-            {isShow && (
-              <div
-                ref={qrCodeRef}
-                className="absolute top-8 -right-8 z-10 flex w-[232px] flex-col items-center rounded-lg bg-components-panel-bg p-4 shadow-xs"
-                onClick={handlePanelClick}
+          )}
+        />
+        {isShow && (
+          <div
+            ref={qrCodeRef}
+            className="absolute top-8 -right-8 z-10 flex w-[232px] flex-col items-center rounded-lg bg-components-panel-bg p-4 shadow-xs"
+            onClick={handlePanelClick}
+          >
+            <QRCode size={160} value={content} className="mb-2" />
+            <div className="flex items-center system-xs-regular">
+              <div className="text-text-tertiary">{t('overview.appInfo.qrcode.scan', { ns: 'appOverview' })}</div>
+              <div className="text-text-tertiary">·</div>
+              <button
+                type="button"
+                className="cursor-pointer border-none bg-transparent p-0 text-left text-text-accent-secondary focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+                onClick={downloadQR}
               >
-                <QRCode size={160} value={content} className="mb-2" />
-                <div className="flex items-center system-xs-regular">
-                  <div className="text-text-tertiary">{t('overview.appInfo.qrcode.scan', { ns: 'appOverview' })}</div>
-                  <div className="text-text-tertiary">·</div>
-                  <div className="cursor-pointer text-text-accent-secondary" onClick={downloadQR}>{t('overview.appInfo.qrcode.download', { ns: 'appOverview' })}</div>
-                </div>
-              </div>
-            )}
+                {downloadText}
+              </button>
+            </div>
           </div>
         )}
-      />
+      </div>
       <TooltipContent>
         {safeTooltipText}
       </TooltipContent>
diff --git a/web/app/components/base/radio-card/__tests__/index.spec.tsx b/web/app/components/base/radio-card/__tests__/index.spec.tsx
index f4bc7a5b0e..b2d21fa123 100644
--- a/web/app/components/base/radio-card/__tests__/index.spec.tsx
+++ b/web/app/components/base/radio-card/__tests__/index.spec.tsx
@@ -32,7 +32,7 @@ describe('RadioCard', () => {
       />,
     )
 
-    await user.click(screen.getByText('Clickable'))
+    await user.click(screen.getByRole('button', { name: /Clickable/ }))
     expect(onChosen).toHaveBeenCalledTimes(1)
   })
 
@@ -117,7 +117,7 @@ describe('RadioCard', () => {
     )
 
     // click title should trigger onChosen
-    await user.click(screen.getByText('ClickNoRadio'))
+    await user.click(screen.getByRole('button', { name: /ClickNoRadio/ }))
     expect(onChosen).toHaveBeenCalledTimes(1)
 
     // radio area should be absent
diff --git a/web/app/components/base/radio-card/index.tsx b/web/app/components/base/radio-card/index.tsx
index 87e2c96258..dad810e1e1 100644
--- a/web/app/components/base/radio-card/index.tsx
+++ b/web/app/components/base/radio-card/index.tsx
@@ -37,7 +37,11 @@ const RadioCard: FC<Props> = ({
         className,
       )}
     >
-      <div className="flex gap-x-2" onClick={onChosen}>
+      <button
+        type="button"
+        className="flex w-full gap-x-2 border-none bg-transparent p-0 text-left focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+        onClick={onChosen}
+      >
         <div className={cn(iconBgClassName, 'flex size-8 shrink-0 items-center justify-center rounded-lg shadow-md')}>
           {icon}
         </div>
@@ -47,15 +51,17 @@ const RadioCard: FC<Props> = ({
         </div>
         {!noRadio && (
           <div className="absolute top-3 right-3">
-            <div className={cn(
-              'h-4 w-4 rounded-full border border-components-radio-border bg-components-radio-bg shadow-xs',
-              isChosen && 'border-[5px] border-components-radio-border-checked',
-            )}
+            <div
+              className={cn(
+                'h-4 w-4 rounded-full border border-components-radio-border bg-components-radio-bg shadow-xs',
+                isChosen && 'border-[5px] border-components-radio-border-checked',
+              )}
+              aria-hidden="true"
             >
             </div>
           </div>
         )}
-      </div>
+      </button>
       {!!((isChosen && chosenConfig) || noRadio) && (
         <div className="mt-2 flex gap-x-2">
           <div className="size-8 shrink-0"></div>
diff --git a/web/app/components/base/segmented-control/__tests__/index.spec.tsx b/web/app/components/base/segmented-control/__tests__/index.spec.tsx
deleted file mode 100644
index fd01b62764..0000000000
--- a/web/app/components/base/segmented-control/__tests__/index.spec.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-import { fireEvent, render, screen } from '@testing-library/react'
-import SegmentedControl from '../index'
-
-describe('SegmentedControl', () => {
-  const options = [
-    { value: 'option1', text: 'Option 1' },
-    { value: 'option2', text: 'Option 2' },
-    { value: 'option3', text: 'Option 3' },
-  ]
-
-  const optionsWithDisabled = [
-    { value: 'option1', text: 'Option 1' },
-    { value: 'option2', text: 'Option 2', disabled: true },
-    { value: 'option3', text: 'Option 3' },
-  ]
-
-  const onSelectMock = vi.fn((value: string | number | symbol) => value)
-
-  beforeEach(() => {
-    onSelectMock.mockClear()
-  })
-
-  it('renders all options correctly', () => {
-    render(<SegmentedControl options={options} value="option1" onChange={onSelectMock} />)
-
-    options.forEach((option) => {
-      expect(screen.getByText(option.text)).toBeInTheDocument()
-    })
-
-    const divider = screen.getByTestId('segmented-control-divider-1')
-    expect(divider).toBeInTheDocument()
-  })
-
-  it('renders with custom activeClassName when provided', () => {
-    render(
-      <SegmentedControl
-        options={options}
-        value="option1"
-        onChange={onSelectMock}
-        activeClassName="custom-active-class"
-      />,
-    )
-
-    const selectedOption = screen.getByText('Option 1').closest('button')
-    expect(selectedOption).toHaveClass('custom-active-class')
-  })
-
-  it('highlights the selected option', () => {
-    render(<SegmentedControl options={options} value="option2" onChange={onSelectMock} />)
-
-    const selectedOption = screen.getByText('Option 2').closest('button')
-    expect(selectedOption).toHaveClass('sc-active')
-  })
-
-  it('calls onChange when an option is clicked', () => {
-    render(<SegmentedControl options={options} value="option1" onChange={onSelectMock} />)
-
-    fireEvent.click(screen.getByText('Option 3'))
-    expect(onSelectMock).toHaveBeenCalledWith('option3')
-  })
-
-  it('does not call onChange when clicking the already selected option', () => {
-    render(<SegmentedControl options={options} value="option1" onChange={onSelectMock} />)
-
-    fireEvent.click(screen.getByText('Option 1'))
-    expect(onSelectMock).not.toHaveBeenCalled()
-  })
-
-  it('handles disabled state correctly', () => {
-    render(<SegmentedControl options={optionsWithDisabled} value="option1" onChange={onSelectMock} />)
-
-    fireEvent.click(screen.getByText('Option 2'))
-    expect(onSelectMock).not.toHaveBeenCalled()
-
-    const optionElement = screen.getByText('Option 2').closest('button')
-    expect(optionElement).toHaveAttribute('disabled')
-    expect(optionElement).toHaveClass('sc-disabled')
-
-    fireEvent.click(screen.getByText('Option 3'))
-    expect(onSelectMock).toHaveBeenCalledWith('option3')
-  })
-
-  it('renders with custom className when provided', () => {
-    const customClass = 'my-custom-class'
-    render(
-      <SegmentedControl
-        options={options}
-        value="option1"
-        onChange={onSelectMock}
-        className={customClass}
-      />,
-    )
-
-    const selectedOption = screen.getByText('Option 1').closest('button')?.closest('div')
-    expect(selectedOption).toHaveClass(customClass)
-  })
-
-  it('renders Icon when provided', () => {
-    const MockIcon = () => <svg data-testid="mock-icon" />
-    const optionsWithIcon = [
-      { value: 'option1', text: 'Option 1', Icon: MockIcon },
-    ]
-    render(<SegmentedControl options={optionsWithIcon} value="option1" onChange={onSelectMock} />)
-    expect(screen.getByTestId('mock-icon')).toBeInTheDocument()
-  })
-
-  it('renders count when provided and size is large', () => {
-    const optionsWithCount = [
-      { value: 'option1', text: 'Option 1', count: 42 },
-    ]
-    render(<SegmentedControl options={optionsWithCount} value="option1" onChange={onSelectMock} size="large" />)
-    expect(screen.getByText('42')).toBeInTheDocument()
-  })
-})
diff --git a/web/app/components/base/segmented-control/index.css b/web/app/components/base/segmented-control/index.css
deleted file mode 100644
index c0fbc914b6..0000000000
--- a/web/app/components/base/segmented-control/index.css
+++ /dev/null
@@ -1,109 +0,0 @@
-@utility segmented-control {
-  @apply flex items-center bg-components-segmented-control-bg-normal gap-x-px;
-}
-
-@utility segmented-control-regular {
-  @apply rounded-lg;
-
-  &.sc-padding {
-    @apply p-0.5;
-  }
-}
-
-@utility segmented-control-large {
-  @apply rounded-lg;
-
-  &.sc-padding {
-    @apply p-0.5;
-  }
-}
-
-@utility sc-padding {
-  &.segmented-control-large {
-    @apply p-0.5;
-  }
-
-  & .segmented-control-regular {
-    @apply p-0.5;
-  }
-
-  &.segmented-control-small {
-    @apply p-px;
-  }
-}
-
-@utility segmented-control-small {
-  @apply rounded-md;
-
-  &.sc-padding {
-    @apply p-px;
-  }
-}
-
-@utility sc-no-padding {
-  @apply border-[0.5px] border-divider-subtle;
-}
-
-@utility segmented-control-item {
-  @apply flex items-center justify-center relative border-[0.5px] border-transparent;
-}
-
-@utility segmented-control-item-regular {
-  @apply px-2 h-7 gap-x-0.5 rounded-lg;
-}
-
-@utility segmented-control-item-small {
-  @apply p-px h-[22px] rounded-md;
-}
-
-@utility segmented-control-item-large {
-  @apply px-2.5 h-8 gap-x-0.5 rounded-lg;
-}
-
-@utility segmented-control-item-disabled {
-  @apply cursor-not-allowed text-text-disabled;
-}
-
-@utility sc-default {
-  @apply hover:bg-state-base-hover text-text-tertiary hover:text-text-secondary;
-}
-
-@utility sc-active {
-  @apply border-components-segmented-control-item-active-border bg-components-segmented-control-item-active-bg shadow-xs shadow-shadow-shadow-3 text-text-secondary;
-
-  &.sc-accent {
-    @apply text-text-accent;
-  }
-
-  &.sc-accent-light {
-    @apply text-text-accent-light-mode-only;
-  }
-}
-
-@utility sc-disabled {
-  @apply cursor-not-allowed text-text-disabled hover:text-text-disabled bg-transparent hover:bg-transparent;
-}
-
-@utility sc-accent {
-  &.sc-active {
-    @apply text-text-accent;
-  }
-}
-
-@utility sc-accent-light {
-  &.sc-active {
-    @apply text-text-accent-light-mode-only;
-  }
-}
-
-@utility sc-item-text-regular {
-  @apply p-0.5;
-}
-
-@utility sc-item-text-small {
-  @apply p-0.5 pr-1;
-}
-
-@utility sc-item-text-large {
-  @apply px-0.5;
-}
diff --git a/web/app/components/base/segmented-control/index.stories.tsx b/web/app/components/base/segmented-control/index.stories.tsx
deleted file mode 100644
index 3f8f9b7c62..0000000000
--- a/web/app/components/base/segmented-control/index.stories.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/nextjs-vite'
-import { RiLineChartLine, RiListCheck2, RiRobot2Line } from '@remixicon/react'
-import { useState } from 'react'
-import { SegmentedControl } from '.'
-
-const SEGMENTS = [
-  { value: 'overview', text: 'Overview', Icon: RiLineChartLine },
-  { value: 'tasks', text: 'Tasks', Icon: RiListCheck2, count: 8 },
-  { value: 'agents', text: 'Agents', Icon: RiRobot2Line },
-]
-
-const SegmentedControlDemo = ({
-  initialValue = 'overview',
-  size = 'regular',
-  padding = 'with',
-  activeState = 'default',
-}: {
-  initialValue?: string
-  size?: 'regular' | 'small' | 'large'
-  padding?: 'none' | 'with'
-  activeState?: 'default' | 'accent' | 'accentLight'
-}) => {
-  const [value, setValue] = useState(initialValue)
-
-  return (
-    <div className="flex w-full max-w-lg flex-col gap-4 rounded-2xl border border-divider-subtle bg-components-panel-bg p-6">
-      <div className="flex items-center justify-between text-xs tracking-[0.18em] text-text-tertiary uppercase">
-        <span>Segmented control</span>
-        <code className="rounded-md bg-background-default px-2 py-1 text-[11px] text-text-tertiary">
-          value="
-          {value}
-          "
-        </code>
-      </div>
-      <SegmentedControl
-        options={SEGMENTS}
-        value={value}
-        onChange={setValue}
-        size={size}
-        padding={padding}
-        activeState={activeState}
-      />
-    </div>
-  )
-}
-
-const meta = {
-  title: 'Base/Data Entry/SegmentedControl',
-  component: SegmentedControlDemo,
-  parameters: {
-    layout: 'centered',
-    docs: {
-      description: {
-        component: 'Multi-tab segmented control with optional icons and badge counts. Adjust sizing and accent states via controls.',
-      },
-    },
-  },
-  argTypes: {
-    initialValue: {
-      control: 'radio',
-      options: SEGMENTS.map(segment => segment.value),
-    },
-    size: {
-      control: 'inline-radio',
-      options: ['small', 'regular', 'large'],
-    },
-    padding: {
-      control: 'inline-radio',
-      options: ['none', 'with'],
-    },
-    activeState: {
-      control: 'inline-radio',
-      options: ['default', 'accent', 'accentLight'],
-    },
-  },
-  args: {
-    initialValue: 'overview',
-    size: 'regular',
-    padding: 'with',
-    activeState: 'default',
-  },
-  tags: ['autodocs'],
-} satisfies Meta<typeof SegmentedControlDemo>
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Playground: Story = {}
-
-export const AccentState: Story = {
-  args: {
-    activeState: 'accent',
-  },
-}
diff --git a/web/app/components/base/segmented-control/index.tsx b/web/app/components/base/segmented-control/index.tsx
deleted file mode 100644
index 1f0d09472f..0000000000
--- a/web/app/components/base/segmented-control/index.tsx
+++ /dev/null
@@ -1,151 +0,0 @@
-import type { RemixiconComponentType } from '@remixicon/react'
-import type { VariantProps } from 'class-variance-authority'
-import { cn } from '@langgenius/dify-ui/cn'
-import { cva } from 'class-variance-authority'
-import * as React from 'react'
-import Divider from '../divider'
-
-type SegmentedControlOption<T> = {
-  value: T
-  text?: string
-  Icon?: RemixiconComponentType
-  count?: number
-  disabled?: boolean
-}
-
-type SegmentedControlProps<T extends string | number | symbol> = {
-  options: SegmentedControlOption<T>[]
-  value: T
-  onChange: (value: T) => void
-  className?: string
-  activeClassName?: string
-  btnClassName?: string
-}
-
-const SegmentedControlVariants = cva(
-  'segmented-control',
-  {
-    variants: {
-      size: {
-        regular: 'segmented-control-regular',
-        small: 'segmented-control-small',
-        large: 'segmented-control-large',
-      },
-      padding: {
-        none: 'sc-no-padding',
-        with: 'sc-padding',
-      },
-    },
-    defaultVariants: {
-      size: 'regular',
-      padding: 'with',
-    },
-  },
-)
-
-const SegmentedControlItemVariants = cva(
-  'segmented-control-item disabled:segmented-control-item-disabled',
-  {
-    variants: {
-      size: {
-        regular: ['segmented-control-item-regular', 'system-sm-medium'],
-        small: ['segmented-control-item-small', 'system-xs-medium'],
-        large: ['segmented-control-item-large', 'system-md-semibold'],
-      },
-      activeState: {
-        default: '',
-        accent: 'sc-accent',
-        accentLight: 'sc-accent-light',
-      },
-    },
-    defaultVariants: {
-      size: 'regular',
-      activeState: 'default',
-    },
-  },
-)
-
-const ItemTextWrapperVariants = cva(
-  '',
-  {
-    variants: {
-      size: {
-        regular: 'sc-item-text-regular',
-        small: 'sc-item-text-small',
-        large: 'sc-item-text-large',
-      },
-    },
-    defaultVariants: {
-      size: 'regular',
-    },
-  },
-)
-
-export const SegmentedControl = <T extends string | number | symbol>({
-  options,
-  value,
-  onChange,
-  className,
-  size,
-  padding,
-  activeState,
-  activeClassName,
-  btnClassName,
-}: SegmentedControlProps<T>
-  & VariantProps<typeof SegmentedControlVariants>
-  & VariantProps<typeof SegmentedControlItemVariants>
-  & VariantProps<typeof ItemTextWrapperVariants>) => {
-  const selectedOptionIndex = options.findIndex(option => option.value === value)
-
-  return (
-    <div className={cn(
-      SegmentedControlVariants({ size, padding }),
-      className,
-    )}
-    >
-      {options.map((option, index) => {
-        const { Icon, text, count, disabled } = option
-        const isSelected = index === selectedOptionIndex
-        const isNextSelected = index === selectedOptionIndex - 1
-        const isLast = index === options.length - 1
-        return (
-          <button
-            type="button"
-            key={String(option.value)}
-            className={cn(
-              isSelected ? 'sc-active' : 'sc-default',
-              SegmentedControlItemVariants({ size, activeState: isSelected ? activeState : 'default' }),
-              isSelected && activeClassName,
-              disabled && 'sc-disabled',
-              btnClassName,
-            )}
-            onClick={() => {
-              if (!isSelected)
-                onChange(option.value)
-            }}
-            disabled={disabled}
-          >
-            {Icon && <Icon className="size-4 shrink-0" />}
-            {text && (
-              <div className={cn('inline-flex items-center gap-x-1', ItemTextWrapperVariants({ size }))}>
-                <span>{text}</span>
-                {!!(count && size === 'large') && (
-                  <div className="inline-flex h-[18px] min-w-[18px] items-center justify-center rounded-[5px] border border-divider-deep bg-components-badge-bg-dimm px-[5px] system-2xs-medium-uppercase text-text-tertiary">
-                    {count}
-                  </div>
-                )}
-              </div>
-            )}
-            {!isLast && !isSelected && !isNextSelected && (
-              <div data-testid={`segmented-control-divider-${index}`} className="absolute top-0 -right-px flex h-full items-center">
-                <Divider type="vertical" className="mx-0 h-3.5" />
-              </div>
-            )}
-          </button>
-        )
-      })}
-    </div>
-  )
-}
-
-export default React.memo(SegmentedControl)
diff --git a/web/app/components/base/sort/__tests__/index.spec.tsx b/web/app/components/base/sort/__tests__/index.spec.tsx
index e51ec23805..ea85e8f3fe 100644
--- a/web/app/components/base/sort/__tests__/index.spec.tsx
+++ b/web/app/components/base/sort/__tests__/index.spec.tsx
@@ -11,18 +11,16 @@ const mockItems = [
 ]
 
 describe('Sort component — real portal integration', () => {
-  const setup = (props = {}) => {
+  const setup = (props: Partial<React.ComponentProps<typeof Sort>> = {}) => {
     const onSelect = vi.fn()
     const user = userEvent.setup()
-    const { container, rerender } = render(
+    const { rerender } = render(
       <Sort value="created_at" items={mockItems} onSelect={onSelect} order="" {...props} />,
     )
 
     // helper: returns a non-null HTMLElement or throws with a clear message
     const getTriggerWrapper = (): HTMLElement => {
-      const labelNode = screen.getByText('appLog.filter.sortBy')
-      // try to find a reasonable wrapper element; prefer '.block' but fallback to any ancestor div
-      const wrapper = labelNode.closest('.block') ?? labelNode.closest('div')
+      const wrapper = screen.getByRole('button', { name: /appLog\.filter\.sortBy/i })
       if (!wrapper)
         throw new Error('Trigger wrapper element not found for "Sort by" label')
       return wrapper as HTMLElement
@@ -30,10 +28,9 @@ describe('Sort component — real portal integration', () => {
 
     // helper: returns right-side sort button element
     const getSortButton = (): HTMLElement => {
-      const btn = container.querySelector('.rounded-r-lg')
-      if (!btn)
-        throw new Error('Sort button (rounded-r-lg) not found in rendered container')
-      return btn as HTMLElement
+      return screen.getByRole('button', {
+        name: props.order ? 'appLog.filter.ascending' : 'appLog.filter.descending',
+      })
     }
 
     return { user, onSelect, rerender, getTriggerWrapper, getSortButton }
@@ -49,32 +46,30 @@ describe('Sort component — real portal integration', () => {
     expect(sortButton.querySelector('svg')).toBeInTheDocument()
   })
 
-  it('opens and closes the tooltip (portal mounts to document.body)', async () => {
+  it('opens and closes the menu', async () => {
     const { user, getTriggerWrapper } = setup()
 
     await user.click(getTriggerWrapper())
-    const tooltip = await screen.findByRole('tooltip')
-    expect(tooltip).toBeInTheDocument()
-    expect(document.body.contains(tooltip)).toBe(true)
+    expect(await screen.findByText('Name')).toBeInTheDocument()
 
     // clicking the trigger again should close it
     await user.click(getTriggerWrapper())
-    await waitFor(() => expect(screen.queryByRole('tooltip')).not.toBeInTheDocument())
+    await waitFor(() => expect(screen.queryByText('Name')).not.toBeInTheDocument())
   })
 
   it('renders options and calls onSelect with descending prefix when order is "-"', async () => {
     const { user, onSelect, getTriggerWrapper } = setup({ order: '-' })
 
     await user.click(getTriggerWrapper())
-    const tooltip = await screen.findByRole('tooltip')
+    await screen.findByText('Name')
 
     mockItems.forEach((item) => {
-      expect(within(tooltip).getByText(item.name)).toBeInTheDocument()
+      expect(within(document.body).getAllByText(item.name).length).toBeGreaterThan(0)
     })
 
-    await user.click(within(tooltip).getByText('Name'))
+    await user.click(screen.getByText('Name'))
     expect(onSelect).toHaveBeenCalledWith('-name')
-    await waitFor(() => expect(screen.queryByRole('tooltip')).not.toBeInTheDocument())
+    await waitFor(() => expect(screen.queryByText('Name')).not.toBeInTheDocument())
   })
 
   it('toggles sorting order: ascending -> descending via right-side button', async () => {
@@ -93,10 +88,10 @@ describe('Sort component — real portal integration', () => {
     const { user, getTriggerWrapper } = setup({ value: 'status' })
 
     await user.click(getTriggerWrapper())
-    const tooltip = await screen.findByRole('tooltip')
+    await screen.findByText('Name')
 
-    const statusRow = within(tooltip).getByText('Status').closest('.flex')
-    const nameRow = within(tooltip).getByText('Name').closest('.flex')
+    const statusRow = screen.getAllByText('Status').at(-1)?.closest('.flex')
+    const nameRow = screen.getByText('Name').closest('.flex')
 
     if (!statusRow)
       throw new Error('Status option row not found in menu')
@@ -120,9 +115,9 @@ describe('Sort component — real portal integration', () => {
     const { user, onSelect, getTriggerWrapper } = setup({ order: undefined })
 
     await user.click(getTriggerWrapper())
-    const tooltip = await screen.findByRole('tooltip')
+    await screen.findByText('Name')
 
-    await user.click(within(tooltip).getByText('Name'))
+    await user.click(screen.getByText('Name'))
 
     expect(onSelect).toHaveBeenCalled()
     expect(onSelect).toHaveBeenCalledWith(expect.stringMatching(/name$/))
@@ -131,11 +126,10 @@ describe('Sort component — real portal integration', () => {
   it('clicking outside the open menu closes the portal', async () => {
     const { user, getTriggerWrapper } = setup()
     await user.click(getTriggerWrapper())
-    const tooltip = await screen.findByRole('tooltip')
-    expect(tooltip).toBeInTheDocument()
+    expect(await screen.findByText('Name')).toBeInTheDocument()
 
     // click outside: body click should close the tooltip
     await user.click(document.body)
-    await waitFor(() => expect(screen.queryByRole('tooltip')).not.toBeInTheDocument())
+    await waitFor(() => expect(screen.queryByText('Name')).not.toBeInTheDocument())
   })
 })
diff --git a/web/app/components/base/sort/index.tsx b/web/app/components/base/sort/index.tsx
index ef9aebb0d7..57affdd96b 100644
--- a/web/app/components/base/sort/index.tsx
+++ b/web/app/components/base/sort/index.tsx
@@ -1,13 +1,15 @@
 import type { FC } from 'react'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuTrigger,
+} from '@langgenius/dify-ui/dropdown-menu'
 import { RiArrowDownSLine, RiCheckLine, RiSortAsc, RiSortDesc } from '@remixicon/react'
 import { useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
 
 type Item = {
   value: number | string
@@ -35,16 +37,14 @@ const Sort: FC<Props> = ({
 
   return (
     <div className="inline-flex items-center">
-      <PortalToFollowElem
+      <DropdownMenu
         open={open}
         onOpenChange={setOpen}
-        placement="bottom-start"
-        offset={4}
       >
         <div className="relative">
-          <PortalToFollowElemTrigger
-            onClick={() => setOpen(v => !v)}
-            className="block"
+          <DropdownMenuTrigger
+            nativeButton={false}
+            render={<div className="block" />}
           >
             <div className={cn(
               'flex min-h-8 cursor-pointer items-center rounded-l-lg bg-components-input-bg-normal px-2 py-1 hover:bg-state-base-hover-alt',
@@ -59,32 +59,41 @@ const Sort: FC<Props> = ({
               </div>
               <RiArrowDownSLine className="h-4 w-4 text-text-tertiary" />
             </div>
-          </PortalToFollowElemTrigger>
-          <PortalToFollowElemContent className="z-1002">
-            <div className="relative w-[240px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg">
-              <div className="max-h-72 overflow-auto p-1">
-                {items.map(item => (
-                  <div
-                    key={item.value}
-                    className="flex cursor-pointer items-center gap-2 rounded-lg px-2 py-[6px] pl-3 hover:bg-state-base-hover"
-                    onClick={() => {
-                      onSelect(`${order}${item.value}`)
-                      setOpen(false)
-                    }}
-                  >
-                    <div title={item.name} className="grow truncate system-sm-medium text-text-secondary">{item.name}</div>
-                    {value === item.value && <RiCheckLine className="h-4 w-4 shrink-0 text-util-colors-blue-light-blue-light-600" />}
-                  </div>
-                ))}
-              </div>
-            </div>
-          </PortalToFollowElemContent>
+          </DropdownMenuTrigger>
+          <DropdownMenuContent
+            placement="bottom-start"
+            sideOffset={4}
+            popupClassName="relative w-[240px] rounded-xl border-[0.5px] bg-components-panel-bg-blur p-0"
+          >
+            <DropdownMenuRadioGroup
+              value={value}
+              onValueChange={nextValue => onSelect(`${order}${nextValue}`)}
+              className="max-h-72 overflow-auto p-1"
+            >
+              {items.map(item => (
+                <DropdownMenuRadioItem
+                  key={item.value}
+                  value={item.value}
+                  closeOnClick
+                  className="gap-2 rounded-lg px-2 py-[6px] pl-3"
+                >
+                  <div title={item.name} className="grow truncate system-sm-medium text-text-secondary">{item.name}</div>
+                  {value === item.value && <RiCheckLine className="h-4 w-4 shrink-0 text-util-colors-blue-light-blue-light-600" />}
+                </DropdownMenuRadioItem>
+              ))}
+            </DropdownMenuRadioGroup>
+          </DropdownMenuContent>
         </div>
-      </PortalToFollowElem>
-      <div className="ml-px cursor-pointer rounded-r-lg bg-components-button-tertiary-bg p-2 hover:bg-components-button-tertiary-bg-hover" onClick={() => onSelect(`${order ? '' : '-'}${value}`)}>
-        {!order && <RiSortAsc className="h-4 w-4 text-components-button-tertiary-text" />}
-        {order && <RiSortDesc className="h-4 w-4 text-components-button-tertiary-text" />}
-      </div>
+      </DropdownMenu>
+      <button
+        type="button"
+        aria-label={t(`filter.${order ? 'ascending' : 'descending'}`, { ns: 'appLog' })}
+        className="ml-px cursor-pointer rounded-r-lg border-none bg-components-button-tertiary-bg p-2 hover:bg-components-button-tertiary-bg-hover focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+        onClick={() => onSelect(`${order ? '' : '-'}${value}`)}
+      >
+        {!order && <RiSortAsc className="h-4 w-4 text-components-button-tertiary-text" aria-hidden="true" />}
+        {order && <RiSortDesc className="h-4 w-4 text-components-button-tertiary-text" aria-hidden="true" />}
+      </button>
     </div>
 
   )
diff --git a/web/app/components/base/svg-gallery/__tests__/index.spec.tsx b/web/app/components/base/svg-gallery/__tests__/index.spec.tsx
index c08b527d94..a93cc9da0e 100644
--- a/web/app/components/base/svg-gallery/__tests__/index.spec.tsx
+++ b/web/app/components/base/svg-gallery/__tests__/index.spec.tsx
@@ -131,7 +131,7 @@ describe('SVGRenderer', () => {
 
       expect(screen.getByAltText('Preview'))!.toBeInTheDocument()
 
-      await user.click(screen.getByTestId('image-preview-close-button'))
+      await user.click(screen.getByRole('button', { name: 'common.operation.cancel' }))
 
       await waitFor(() => {
         expect(screen.queryByAltText('Preview')).not.toBeInTheDocument()
diff --git a/web/app/components/base/tag-input/__tests__/index.spec.tsx b/web/app/components/base/tag-input/__tests__/index.spec.tsx
index b64f4aaab6..78bfeb33a8 100644
--- a/web/app/components/base/tag-input/__tests__/index.spec.tsx
+++ b/web/app/components/base/tag-input/__tests__/index.spec.tsx
@@ -63,7 +63,7 @@ describe('TagInput', () => {
     it('should hide remove controls when remove is disabled', () => {
       renderTagInput({ items: ['alpha'], disableRemove: true })
 
-      expect(screen.queryByTestId('remove-tag')).not.toBeInTheDocument()
+      expect(screen.queryByRole('button', { name: 'common.operation.remove alpha' })).not.toBeInTheDocument()
     })
 
     it('should apply focused style in special mode when input is focused', async () => {
@@ -83,9 +83,9 @@ describe('TagInput', () => {
     it('should remove item when remove control is clicked', async () => {
       const { onChange } = renderTagInput({ items: ['alpha', 'beta'] })
 
-      const removeControl = screen.getAllByTestId('remove-tag')[0]
+      const removeControl = screen.getByRole('button', { name: 'common.operation.remove alpha' })
 
-      await userEvent.click(removeControl!)
+      await userEvent.click(removeControl)
 
       expect(onChange).toHaveBeenCalledWith(['beta'])
     })
diff --git a/web/app/components/base/tag-input/index.tsx b/web/app/components/base/tag-input/index.tsx
index 8312a890a5..81f4d12af5 100644
--- a/web/app/components/base/tag-input/index.tsx
+++ b/web/app/components/base/tag-input/index.tsx
@@ -67,9 +67,14 @@ const TagInput: FC<TagInputProps> = ({ items, onChange, disableAdd, disableRemov
         <div key={item} className={cn('mt-1 mr-1 flex items-center rounded-md border border-divider-deep bg-components-badge-white-to-dark py-1 pr-1 pl-1.5 system-xs-regular text-text-secondary')}>
           {item}
           {!disableRemove && (
-            <div className="flex h-4 w-4 cursor-pointer items-center justify-center" onClick={() => handleRemove(index)}>
-              <span className="ml-0.5 i-ri-close-line h-3.5 w-3.5 text-text-tertiary" data-testid="remove-tag" />
-            </div>
+            <button
+              type="button"
+              aria-label={`${t('operation.remove', { ns: 'common' })} ${item}`}
+              className="flex h-4 w-4 cursor-pointer items-center justify-center border-none bg-transparent p-0 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+              onClick={() => handleRemove(index)}
+            >
+              <span className="ml-0.5 i-ri-close-line h-3.5 w-3.5 text-text-tertiary" aria-hidden="true" />
+            </button>
           )}
         </div>
       ))}
@@ -77,7 +82,7 @@ const TagInput: FC<TagInputProps> = ({ items, onChange, disableAdd, disableRemov
         <div className={cn('group/tag-add mt-1 flex items-center gap-x-0.5', !isSpecialMode ? 'rounded-md border border-dashed border-divider-deep px-1.5' : '')}>
           {!isSpecialMode && !focused && <span className="i-ri-add-line h-3.5 w-3.5 text-text-placeholder group-hover/tag-add:text-text-secondary" />}
           <AutosizeInput
-            inputClassName={cn('appearance-none text-text-primary caret-[#295EFF] outline-none placeholder:text-text-placeholder group-hover/tag-add:placeholder:text-text-secondary', isSpecialMode ? 'bg-transparent' : '', inputClassName)}
+            inputClassName={cn('appearance-none text-text-primary caret-[#295EFF] outline-hidden placeholder:text-text-placeholder group-hover/tag-add:placeholder:text-text-secondary', isSpecialMode ? 'bg-transparent' : '', inputClassName)}
             className={cn(!isInWorkflow && 'max-w-[300px]', isInWorkflow && 'max-w-[146px]', 'overflow-hidden rounded-md py-1 system-xs-regular', isSpecialMode && 'border border-transparent px-1.5', focused && isSpecialMode && 'border-dashed border-divider-deep')}
             onFocus={() => setFocused(true)}
             onBlur={handleBlur}
diff --git a/web/app/components/base/tag-management/__tests__/panel.spec.tsx b/web/app/components/base/tag-management/__tests__/panel.spec.tsx
deleted file mode 100644
index a2ddb93745..0000000000
--- a/web/app/components/base/tag-management/__tests__/panel.spec.tsx
+++ /dev/null
@@ -1,726 +0,0 @@
-import type { Tag } from '@/app/components/base/tag-management/constant'
-import { render, screen, waitFor, within } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
-import * as React from 'react'
-import { act } from 'react'
-import * as ReactI18next from 'react-i18next'
-import Panel from '../panel'
-import { useStore as useTagStore } from '../store'
-
-const { mockNotify, mockToast } = vi.hoisted(() => {
-  const mockNotify = vi.fn()
-  const mockToast = Object.assign(mockNotify, {
-    success: vi.fn((message, options) => mockNotify({ type: 'success', message, ...options })),
-    error: vi.fn((message, options) => mockNotify({ type: 'error', message, ...options })),
-    warning: vi.fn((message, options) => mockNotify({ type: 'warning', message, ...options })),
-    info: vi.fn((message, options) => mockNotify({ type: 'info', message, ...options })),
-    dismiss: vi.fn(),
-    update: vi.fn(),
-    promise: vi.fn(),
-  })
-  return { mockNotify, mockToast }
-})
-
-vi.mock('@langgenius/dify-ui/toast', () => ({
-  toast: mockToast,
-}))
-
-// Hoisted mocks
-const { createTag, bindTag, unBindTag } = vi.hoisted(() => ({
-  createTag: vi.fn(),
-  bindTag: vi.fn(),
-  unBindTag: vi.fn(),
-}))
-
-vi.mock('@/service/tag', () => ({
-  createTag,
-  bindTag,
-  unBindTag,
-}))
-
-// i18n mock renders "ns.key" format (dot-separated)
-const i18n = {
-  selectorPlaceholder: 'common.tag.selectorPlaceholder',
-  create: 'common.tag.create',
-  created: 'common.tag.created',
-  failed: 'common.tag.failed',
-  noTag: 'common.tag.noTag',
-  manageTags: 'common.tag.manageTags',
-  modifiedSuccessfully: 'common.actionMsg.modifiedSuccessfully',
-  modifiedUnsuccessfully: 'common.actionMsg.modifiedUnsuccessfully',
-}
-
-const appTags: Tag[] = [
-  { id: 'tag-1', name: 'Frontend', type: 'app', binding_count: 3 },
-  { id: 'tag-2', name: 'Backend', type: 'app', binding_count: 5 },
-  { id: 'tag-3', name: 'API', type: 'app', binding_count: 1 },
-]
-
-const knowledgeTag: Tag = { id: 'tag-k1', name: 'KnowledgeDB', type: 'knowledge', binding_count: 2 }
-
-const defaultProps = {
-  targetID: 'target-1',
-  type: 'app' as const,
-  value: ['tag-1'!], // tag-1 is already selected/bound
-  selectedTags: [appTags[0]!], // pre-selected tags shown separately
-  onCacheUpdate: vi.fn<(tags: Tag[]) => void>(),
-  onChange: vi.fn<() => void>(),
-  onCreate: vi.fn<() => void>(),
-}
-
-describe('Panel', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    vi.mocked(createTag).mockResolvedValue({ id: 'new-tag', name: 'NewTag', type: 'app', binding_count: 0 })
-    vi.mocked(bindTag).mockResolvedValue(undefined)
-    vi.mocked(unBindTag).mockResolvedValue(undefined)
-    act(() => {
-      useTagStore.setState({ tagList: [...appTags, knowledgeTag], showTagManagementModal: false })
-    })
-  })
-
-  describe('Rendering', () => {
-    it('should render without crashing', () => {
-      render(<Panel {...defaultProps} />)
-      expect(screen.getByPlaceholderText(i18n.selectorPlaceholder))!.toBeInTheDocument()
-    })
-
-    it('should render the search input', () => {
-      render(<Panel {...defaultProps} />)
-      const input = screen.getByPlaceholderText(i18n.selectorPlaceholder)
-      expect(input)!.toBeInTheDocument()
-      expect(input.tagName).toBe('INPUT')
-    })
-
-    it('should fallback to empty placeholder when translation is empty', () => {
-      const mockedTranslation = {
-        t: vi.fn().mockReturnValue(''),
-        i18n: {} as ReturnType<typeof ReactI18next.useTranslation>['i18n'],
-        ready: true,
-      } as unknown as ReturnType<typeof ReactI18next.useTranslation>
-
-      vi.spyOn(ReactI18next, 'useTranslation').mockReturnValueOnce(mockedTranslation)
-
-      render(<Panel {...defaultProps} />)
-
-      expect(screen.getByRole('textbox'))!.toHaveAttribute('placeholder', '')
-    })
-
-    it('should render selected tags from selectedTags prop', () => {
-      render(<Panel {...defaultProps} />)
-      expect(screen.getByText('Frontend'))!.toBeInTheDocument()
-    })
-
-    it('should render unselected tags matching the type', () => {
-      render(<Panel {...defaultProps} />)
-      // tag-2 and tag-3 are app type and not in value[]
-      // tag-2 and tag-3 are app type and not in value[]
-      expect(screen.getByText('Backend'))!.toBeInTheDocument()
-      expect(screen.getByText('API'))!.toBeInTheDocument()
-    })
-
-    it('should not render tags of a different type', () => {
-      render(<Panel {...defaultProps} />)
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      // knowledgeTag is type 'knowledge', should not appear
-      expect(screen.queryByText('KnowledgeDB')).not.toBeInTheDocument()
-    })
-
-    it('should render the manage tags button', () => {
-      render(<Panel {...defaultProps} />)
-      expect(screen.getByText(i18n.manageTags))!.toBeInTheDocument()
-    })
-
-    it('should show no-tag message when there are no tags', () => {
-      act(() => {
-        useTagStore.setState({ tagList: [] })
-      })
-      render(<Panel {...defaultProps} value={[]} selectedTags={[]} />)
-      expect(screen.getByText(i18n.noTag))!.toBeInTheDocument()
-    })
-
-    it('should not show no-tag message when tags exist', () => {
-      render(<Panel {...defaultProps} />)
-      expect(screen.queryByText(i18n.noTag)).not.toBeInTheDocument()
-    })
-  })
-
-  describe('Search / Filter', () => {
-    it('should filter tags by keyword', async () => {
-      const user = userEvent.setup()
-      render(<Panel {...defaultProps} />)
-
-      const input = screen.getByPlaceholderText(i18n.selectorPlaceholder)
-      await user.type(input, 'Back')
-
-      expect(screen.getByText('Backend'))!.toBeInTheDocument()
-      expect(screen.queryByText('API')).not.toBeInTheDocument()
-    })
-
-    it('should filter selected tags by keyword', async () => {
-      const user = userEvent.setup()
-      render(<Panel {...defaultProps} />)
-
-      const input = screen.getByPlaceholderText(i18n.selectorPlaceholder)
-      await user.type(input, 'Front')
-
-      expect(screen.getByText('Frontend'))!.toBeInTheDocument()
-      expect(screen.queryByText('Backend')).not.toBeInTheDocument()
-    })
-
-    it('should show create option when keyword does not match any tag', async () => {
-      const user = userEvent.setup()
-      // notExisted uses .every(tag => tag.type === type && tag.name !== keywords)
-      // so store must only contain same-type tags for notExisted to be true
-      act(() => {
-        useTagStore.setState({ tagList: appTags })
-      })
-      render(<Panel {...defaultProps} />)
-
-      const input = screen.getByPlaceholderText(i18n.selectorPlaceholder)
-      await user.type(input, 'BrandNewTag')
-
-      // The create row shows "Create 'BrandNewTag'"
-      // The create row shows "Create 'BrandNewTag'"
-      expect(screen.getByText(/BrandNewTag/))!.toBeInTheDocument()
-      expect(screen.getByText(i18n.create, { exact: false }))!.toBeInTheDocument()
-    })
-
-    it('should not show create option when keyword matches an existing tag name', async () => {
-      const user = userEvent.setup()
-      // Use only same-type tags so we can verify name matching specifically
-      act(() => {
-        useTagStore.setState({ tagList: appTags })
-      })
-      render(<Panel {...defaultProps} />)
-
-      const input = screen.getByPlaceholderText(i18n.selectorPlaceholder)
-      await user.type(input, 'Frontend')
-
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      // 'Frontend' matches tag-1 name, so notExisted = false
-      expect(screen.queryByText(i18n.create, { exact: false })).not.toBeInTheDocument()
-    })
-
-    it('should clear search when clear button is clicked', async () => {
-      const user = userEvent.setup()
-      render(<Panel {...defaultProps} />)
-
-      const input = screen.getByPlaceholderText(i18n.selectorPlaceholder)
-      await user.type(input, 'Back')
-      expect(input)!.toHaveValue('Back')
-
-      // The Input component renders a clear icon with data-testid="input-clear"
-      const clearButton = screen.getByTestId('input-clear')
-      await user.click(clearButton)
-
-      expect(input)!.toHaveValue('')
-      // All tags should be visible again
-      // All tags should be visible again
-      expect(screen.getByText('Backend'))!.toBeInTheDocument()
-      expect(screen.getByText('API'))!.toBeInTheDocument()
-    })
-  })
-
-  describe('Tag Selection', () => {
-    const getTagRow = (tagName: string) => {
-      const row = screen.getByText(tagName).closest('[data-testid="tag-row"]')
-      expect(row).not.toBeNull()
-      return row as HTMLElement
-    }
-
-    it('should select an unselected tag when clicked', async () => {
-      const user = userEvent.setup()
-      render(<Panel {...defaultProps} />)
-
-      const backendRowBeforeSelect = getTagRow('Backend')
-      expect(within(backendRowBeforeSelect).queryByTestId('check-icon-tag-2')).not.toBeInTheDocument()
-
-      await user.click(screen.getByText('Backend'))
-
-      const backendRowAfterSelect = getTagRow('Backend')
-      expect(within(backendRowAfterSelect).getByTestId('check-icon-tag-2'))!.toBeInTheDocument()
-    })
-
-    it('should deselect a selected tag when clicked', async () => {
-      const user = userEvent.setup()
-      render(<Panel {...defaultProps} />)
-
-      const frontendRowBeforeDeselect = getTagRow('Frontend')
-      expect(within(frontendRowBeforeDeselect).getByTestId('check-icon-tag-1'))!.toBeInTheDocument()
-
-      await user.click(screen.getByText('Frontend'))
-
-      const frontendRowAfterDeselect = getTagRow('Frontend')
-      expect(within(frontendRowAfterDeselect).queryByTestId('check-icon-tag-1')).not.toBeInTheDocument()
-    })
-
-    it('should toggle tag selection on multiple clicks', async () => {
-      const user = userEvent.setup()
-      render(<Panel {...defaultProps} />)
-
-      const backendRowBeforeToggle = getTagRow('Backend')
-      expect(within(backendRowBeforeToggle).queryByTestId('check-icon-tag-2')).not.toBeInTheDocument()
-
-      await user.click(screen.getByText('Backend'))
-
-      const backendRowAfterFirstClick = getTagRow('Backend')
-      expect(within(backendRowAfterFirstClick).getByTestId('check-icon-tag-2'))!.toBeInTheDocument()
-
-      await user.click(screen.getByText('Backend'))
-
-      const backendRowAfterSecondClick = getTagRow('Backend')
-      expect(within(backendRowAfterSecondClick).queryByTestId('check-icon-tag-2')).not.toBeInTheDocument()
-    })
-  })
-
-  describe('Tag Creation', () => {
-    beforeEach(() => {
-      // notExisted requires all tags to be same type, so remove knowledgeTag
-      act(() => {
-        useTagStore.setState({ tagList: appTags })
-      })
-    })
-
-    it('should create a new tag when clicking the create option', async () => {
-      const user = userEvent.setup()
-      render(<Panel {...defaultProps} />)
-
-      const input = screen.getByPlaceholderText(i18n.selectorPlaceholder)
-      await user.type(input, 'BrandNewTag')
-
-      const createOption = await screen.findByTestId('create-tag-option')
-      await user.click(createOption)
-
-      await waitFor(() => {
-        expect(createTag).toHaveBeenCalledWith('BrandNewTag', 'app')
-      })
-    })
-
-    it('should show success notification after tag creation', async () => {
-      const user = userEvent.setup()
-      render(<Panel {...defaultProps} />)
-
-      const input = screen.getByPlaceholderText(i18n.selectorPlaceholder)
-      await user.type(input, 'BrandNewTag')
-
-      const createOption = await screen.findByTestId('create-tag-option')
-      await user.click(createOption)
-
-      await waitFor(() => {
-        expect(mockNotify).toHaveBeenCalledWith({
-          type: 'success',
-          message: i18n.created,
-        })
-      })
-    })
-
-    it('should clear keywords after successful tag creation', async () => {
-      const user = userEvent.setup()
-      render(<Panel {...defaultProps} />)
-
-      const input = screen.getByPlaceholderText(i18n.selectorPlaceholder)
-      await user.type(input, 'BrandNewTag')
-
-      const createOption = await screen.findByTestId('create-tag-option')
-      await user.click(createOption)
-
-      await waitFor(() => {
-        expect(input)!.toHaveValue('')
-      })
-    })
-
-    it('should call onCreate callback after successful tag creation', async () => {
-      const user = userEvent.setup()
-      render(<Panel {...defaultProps} />)
-
-      const input = screen.getByPlaceholderText(i18n.selectorPlaceholder)
-      await user.type(input, 'BrandNewTag')
-
-      const createOption = await screen.findByTestId('create-tag-option')
-      await user.click(createOption)
-
-      await waitFor(() => {
-        expect(defaultProps.onCreate).toHaveBeenCalled()
-      })
-    })
-
-    it('should add new tag to the store tag list', async () => {
-      const user = userEvent.setup()
-      const newTag: Tag = { id: 'new-tag', name: 'BrandNewTag', type: 'app', binding_count: 0 }
-      vi.mocked(createTag).mockResolvedValue(newTag)
-
-      render(<Panel {...defaultProps} />)
-
-      const input = screen.getByPlaceholderText(i18n.selectorPlaceholder)
-      await user.type(input, 'BrandNewTag')
-
-      const createOption = await screen.findByTestId('create-tag-option')
-      await user.click(createOption)
-
-      await waitFor(() => {
-        const storeTagList = useTagStore.getState().tagList
-        expect(storeTagList).toContainEqual(newTag)
-      })
-    })
-
-    it('should show error notification when tag creation fails', async () => {
-      const user = userEvent.setup()
-      vi.mocked(createTag).mockRejectedValue(new Error('Creation failed'))
-
-      render(<Panel {...defaultProps} />)
-
-      const input = screen.getByPlaceholderText(i18n.selectorPlaceholder)
-      await user.type(input, 'FailTag')
-
-      const createOption = await screen.findByTestId('create-tag-option')
-      await user.click(createOption)
-
-      await waitFor(() => {
-        expect(mockNotify).toHaveBeenCalledWith({
-          type: 'error',
-          message: i18n.failed,
-        })
-      })
-    })
-
-    it('should not create tag when keywords is empty', () => {
-      render(<Panel {...defaultProps} />)
-
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      // The create option should not appear when no keywords
-      expect(screen.queryByText(i18n.create, { exact: false })).not.toBeInTheDocument()
-      expect(createTag).not.toHaveBeenCalled()
-    })
-
-    it('should not allow duplicate creation while pending', async () => {
-      const user = userEvent.setup()
-      let resolveCreate!: (value: Tag) => void
-      vi.mocked(createTag).mockImplementation(() => new Promise((resolve) => {
-        resolveCreate = resolve
-      }))
-
-      render(<Panel {...defaultProps} />)
-
-      const input = screen.getByPlaceholderText(i18n.selectorPlaceholder)
-      await user.type(input, 'BrandNewTag')
-
-      const createOption = await screen.findByTestId('create-tag-option')
-      await user.click(createOption)
-
-      expect(createTag).toHaveBeenCalledTimes(1)
-
-      // Try clicking again while still pending
-      await user.click(createOption)
-
-      // Should still be only 1 call because creating guard blocks it
-      expect(createTag).toHaveBeenCalledTimes(1)
-
-      // Resolve the pending promise
-      await act(async () => {
-        resolveCreate({ id: 'new-tag', name: 'BrandNewTag', type: 'app', binding_count: 0 })
-      })
-    })
-  })
-
-  describe('Bind/Unbind on Unmount', () => {
-    it('should call bindTag for newly selected tags on unmount', async () => {
-      const user = userEvent.setup()
-      const { unmount } = render(<Panel {...defaultProps} />)
-
-      // Select 'Backend' (tag-2) — currently not in value[]
-      await user.click(screen.getByText('Backend'))
-
-      unmount()
-
-      await waitFor(() => {
-        expect(bindTag).toHaveBeenCalledWith(['tag-2'], 'target-1', 'app')
-      })
-    })
-
-    it('should call unBindTag for deselected tags on unmount', async () => {
-      const user = userEvent.setup()
-      const { unmount } = render(<Panel {...defaultProps} />)
-
-      // Deselect 'Frontend' (tag-1) — currently in value[]
-      await user.click(screen.getByText('Frontend'))
-
-      unmount()
-
-      await waitFor(() => {
-        expect(unBindTag).toHaveBeenCalledWith('tag-1', 'target-1', 'app')
-      })
-    })
-
-    it('should call onCacheUpdate with selected tags on unmount when value changed', async () => {
-      const user = userEvent.setup()
-      const { unmount } = render(<Panel {...defaultProps} />)
-
-      // Select 'Backend' (tag-2)
-      await user.click(screen.getByText('Backend'))
-
-      unmount()
-
-      await waitFor(() => {
-        expect(defaultProps.onCacheUpdate).toHaveBeenCalledTimes(1)
-      })
-
-      const [updatedTags] = (vi.mocked(defaultProps.onCacheUpdate).mock.calls[0] ?? []) as [any]
-      expect(updatedTags.map((tag: any) => tag.id)).toEqual(['tag-1', 'tag-2'])
-    })
-
-    it('should not call bind/unbind when value has not changed', async () => {
-      const { unmount } = render(<Panel {...defaultProps} />)
-
-      unmount()
-
-      await act(async () => { })
-      expect(bindTag).not.toHaveBeenCalled()
-      expect(unBindTag).not.toHaveBeenCalled()
-    })
-
-    it('should call onChange after all operations complete on unmount', async () => {
-      const user = userEvent.setup()
-      const { unmount } = render(<Panel {...defaultProps} />)
-
-      await user.click(screen.getByText('Backend'))
-
-      unmount()
-
-      await waitFor(() => {
-        expect(defaultProps.onChange).toHaveBeenCalled()
-      })
-    })
-
-    it('should skip onChange callback when onChange prop is undefined', async () => {
-      const user = userEvent.setup()
-      const onChange = vi.fn()
-      const { unmount } = render(<Panel {...defaultProps} onChange={undefined} />)
-
-      await user.click(screen.getByText('Backend'))
-      unmount()
-
-      await waitFor(() => {
-        expect(bindTag).toHaveBeenCalledWith(['tag-2'], 'target-1', 'app')
-      })
-      expect(onChange).not.toHaveBeenCalled()
-    })
-
-    it('should show success notification after successful bind', async () => {
-      const user = userEvent.setup()
-      const { unmount } = render(<Panel {...defaultProps} />)
-
-      await user.click(screen.getByText('Backend'))
-
-      unmount()
-
-      await waitFor(() => {
-        expect(mockNotify).toHaveBeenCalledWith({
-          type: 'success',
-          message: i18n.modifiedSuccessfully,
-        })
-      })
-    })
-
-    it('should show error notification when bind fails', async () => {
-      const user = userEvent.setup()
-      vi.mocked(bindTag).mockRejectedValue(new Error('Bind failed'))
-
-      const { unmount } = render(<Panel {...defaultProps} />)
-
-      await user.click(screen.getByText('Backend'))
-
-      unmount()
-
-      await waitFor(() => {
-        expect(mockNotify).toHaveBeenCalledWith({
-          type: 'error',
-          message: i18n.modifiedUnsuccessfully,
-        })
-      })
-    })
-
-    it('should show error notification when unbind fails', async () => {
-      const user = userEvent.setup()
-      vi.mocked(unBindTag).mockRejectedValue(new Error('Unbind failed'))
-
-      const { unmount } = render(<Panel {...defaultProps} />)
-
-      await user.click(screen.getByText('Frontend'))
-
-      unmount()
-
-      await waitFor(() => {
-        expect(mockNotify).toHaveBeenCalledWith({
-          type: 'error',
-          message: i18n.modifiedUnsuccessfully,
-        })
-      })
-    })
-  })
-
-  describe('Manage Tags Modal', () => {
-    it('should open the tag management modal when manage tags is clicked', async () => {
-      const user = userEvent.setup()
-      render(<Panel {...defaultProps} />)
-
-      await user.click(screen.getByText(i18n.manageTags))
-
-      expect(useTagStore.getState().showTagManagementModal).toBe(true)
-    })
-  })
-
-  describe('Edge Cases', () => {
-    it('should handle empty value array', () => {
-      render(<Panel {...defaultProps} value={[]} selectedTags={[]} />)
-      // All app-type tags should appear in the unselected list
-      // All app-type tags should appear in the unselected list
-      expect(screen.getByText('Frontend'))!.toBeInTheDocument()
-      expect(screen.getByText('Backend'))!.toBeInTheDocument()
-      expect(screen.getByText('API'))!.toBeInTheDocument()
-    })
-
-    it('should handle empty tagList in store', () => {
-      act(() => {
-        useTagStore.setState({ tagList: [] })
-      })
-      render(<Panel {...defaultProps} value={[]} selectedTags={[]} />)
-      expect(screen.getByText(i18n.noTag))!.toBeInTheDocument()
-    })
-
-    it('should handle all tags already selected', () => {
-      render(
-        <Panel
-          {...defaultProps}
-          value={['tag-1', 'tag-2', 'tag-3']}
-          selectedTags={appTags}
-        />,
-      )
-      // All app tags appear in selectedTags, filteredTagList should be empty
-      // All app tags appear in selectedTags, filteredTagList should be empty
-      expect(screen.getByText('Frontend'))!.toBeInTheDocument()
-      expect(screen.getByText('Backend'))!.toBeInTheDocument()
-      expect(screen.getByText('API'))!.toBeInTheDocument()
-    })
-
-    it('should show divider between create option and tag list when both present', async () => {
-      const user = userEvent.setup()
-      // Only same-type tags for notExisted to work
-      act(() => {
-        useTagStore.setState({ tagList: appTags })
-      })
-      render(<Panel {...defaultProps} />)
-      const input = screen.getByPlaceholderText(i18n.selectorPlaceholder)
-      await user.type(input, 'Back')
-      // 'Back' matches Backend (unselected), notExisted is true (no tag named 'Back')
-      // filteredTagList has items, so the conditional divider between create-option and tag-list renders
-      const dividers = screen.getAllByTestId('divider')
-      expect(dividers.length).toBeGreaterThanOrEqual(2)
-    })
-
-    it('should handle knowledge type tags correctly', () => {
-      act(() => {
-        useTagStore.setState({ tagList: [knowledgeTag] })
-      })
-      render(
-        <Panel
-          {...defaultProps}
-          type="knowledge"
-          value={[]}
-          selectedTags={[]}
-        />,
-      )
-      expect(screen.getByText('KnowledgeDB'))!.toBeInTheDocument()
-    })
-  })
-})
diff --git a/web/app/components/base/tag-management/__tests__/selector.spec.tsx b/web/app/components/base/tag-management/__tests__/selector.spec.tsx
deleted file mode 100644
index 84fa351cfa..0000000000
--- a/web/app/components/base/tag-management/__tests__/selector.spec.tsx
+++ /dev/null
@@ -1,347 +0,0 @@
-import type { Tag } from '@/app/components/base/tag-management/constant'
-import { render, screen, waitFor, within } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
-import { act } from 'react'
-import TagSelector from '../selector'
-import { useStore as useTagStore } from '../store'
-
-const { mockToast } = vi.hoisted(() => {
-  const mockToast = Object.assign(vi.fn(), {
-    success: vi.fn(),
-    error: vi.fn(),
-    warning: vi.fn(),
-    info: vi.fn(),
-    dismiss: vi.fn(),
-    update: vi.fn(),
-    promise: vi.fn(),
-  })
-  return { mockToast }
-})
-
-vi.mock('@langgenius/dify-ui/toast', () => ({
-  toast: mockToast,
-}))
-
-// Hoisted mocks
-const { fetchTagList, createTag, bindTag, unBindTag } = vi.hoisted(() => ({
-  fetchTagList: vi.fn(),
-  createTag: vi.fn(),
-  bindTag: vi.fn(),
-  unBindTag: vi.fn(),
-}))
-
-vi.mock('@/service/tag', () => ({
-  fetchTagList,
-  createTag,
-  bindTag,
-  unBindTag,
-}))
-
-// i18n keys rendered in "ns.key" format
-const i18n = {
-  addTag: 'common.tag.addTag',
-  selectorPlaceholder: 'common.tag.selectorPlaceholder',
-  manageTags: 'common.tag.manageTags',
-  noTag: 'common.tag.noTag',
-}
-
-const appTags: Tag[] = [
-  { id: 'tag-1', name: 'Frontend', type: 'app', binding_count: 3 },
-  { id: 'tag-2', name: 'Backend', type: 'app', binding_count: 5 },
-]
-
-const defaultProps = {
-  targetID: 'target-1',
-  type: 'app' as const,
-  value: ['tag-1'!],
-  selectedTags: [appTags[0]!],
-  onCacheUpdate: vi.fn(),
-  onChange: vi.fn(),
-}
-
-describe('TagSelector', () => {
-  const getPanelTagRow = (tagName: string) => {
-    const row = screen.getAllByTestId('tag-row').find(tagRow => within(tagRow).queryByText(tagName))
-    expect(row).toBeDefined()
-    return row as HTMLElement
-  }
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    vi.mocked(fetchTagList).mockResolvedValue(appTags)
-    vi.mocked(createTag).mockResolvedValue({ id: 'new-tag', name: 'NewTag', type: 'app', binding_count: 0 })
-    vi.mocked(bindTag).mockResolvedValue(undefined)
-    vi.mocked(unBindTag).mockResolvedValue(undefined)
-    act(() => {
-      useTagStore.setState({ tagList: appTags, showTagManagementModal: false })
-    })
-  })
-
-  describe('Rendering', () => {
-    it('should render TagSelector trigger with selected tag names from defaultProps when isPopover defaults to true', () => {
-      render(<TagSelector {...defaultProps} />)
-      expect(screen.getByText('Frontend'))!.toBeInTheDocument()
-    })
-
-    it('should render TagSelector add-tag placeholder when defaultProps are overridden with empty selectedTags and value', () => {
-      render(<TagSelector {...defaultProps} selectedTags={[]} value={[]} />)
-      expect(screen.getByText(i18n.addTag))!.toBeInTheDocument()
-    })
-
-    it('should render nothing when isPopover is false', () => {
-      const { container } = render(<TagSelector {...defaultProps} isPopover={false} />)
-      // Only the empty fragment wrapper
-      // Only the empty fragment wrapper
-      expect(container)!.toBeEmptyDOMElement()
-    })
-
-    it('should render the popover trigger button', () => {
-      render(<TagSelector {...defaultProps} />)
-      // The trigger is wrapped in a PopoverButton
-      // The trigger is wrapped in a PopoverButton
-      expect(screen.getByRole('button'))!.toBeInTheDocument()
-    })
-
-    it('should render when minWidth is provided', () => {
-      render(<TagSelector {...defaultProps} minWidth="320px" />)
-      expect(screen.getByRole('button'))!.toBeInTheDocument()
-    })
-  })
-
-  describe('Props', () => {
-    it('should filter selectedTags to only those present in store tagList', () => {
-      const unknownTag: Tag = { id: 'unknown', name: 'Unknown', type: 'app', binding_count: 0 }
-      render(
-        <TagSelector
-          {...defaultProps}
-          selectedTags={[appTags[0]!, unknownTag]}
-          value={['tag-1', 'unknown']}
-        />,
-      )
-      // 'Frontend' is in tagList, 'Unknown' is not
-      // 'Frontend' is in tagList, 'Unknown' is not
-      expect(screen.getByText('Frontend'))!.toBeInTheDocument()
-      expect(screen.queryByText('Unknown')).not.toBeInTheDocument()
-    })
-
-    it('should display multiple tag names when multiple are selected', () => {
-      render(
-        <TagSelector
-          {...defaultProps}
-          selectedTags={appTags}
-          value={['tag-1', 'tag-2']}
-        />,
-      )
-      expect(screen.getByText('Frontend'))!.toBeInTheDocument()
-      expect(screen.getByText('Backend'))!.toBeInTheDocument()
-    })
-  })
-
-  describe('Popover Interaction', () => {
-    it('should show the panel when the trigger is clicked', async () => {
-      const user = userEvent.setup()
-      render(<TagSelector {...defaultProps} />)
-
-      await user.click(screen.getByRole('button'))
-
-      // Panel renders the search input and manage tags
-      await waitFor(() => {
-        expect(screen.getByPlaceholderText(i18n.selectorPlaceholder))!.toBeInTheDocument()
-        expect(screen.getByText(i18n.manageTags))!.toBeInTheDocument()
-      })
-    })
-
-    it('should show unselected tags in the panel', async () => {
-      const user = userEvent.setup()
-      render(<TagSelector {...defaultProps} />)
-
-      await user.click(screen.getByRole('button'))
-
-      await waitFor(() => {
-        expect(screen.getByText('Backend'))!.toBeInTheDocument()
-      })
-    })
-
-    it('should show the no-tag message when tag list is empty', async () => {
-      const user = userEvent.setup()
-      act(() => {
-        useTagStore.setState({ tagList: [] })
-      })
-      render(<TagSelector {...defaultProps} selectedTags={[]} value={[]} />)
-
-      await user.click(screen.getByRole('button'))
-
-      await waitFor(() => {
-        expect(screen.getByText(i18n.noTag))!.toBeInTheDocument()
-      })
-    })
-
-    it('should bind a newly selected tag and update cache when closing the panel', async () => {
-      const user = userEvent.setup()
-      render(<TagSelector {...defaultProps} />)
-
-      const triggerButton = screen.getByRole('button', { name: /Frontend/i })
-      await user.click(triggerButton)
-
-      await screen.findByPlaceholderText(i18n.selectorPlaceholder)
-      await user.click(getPanelTagRow('Backend'))
-
-      // Close panel to trigger unmount side effects.
-      await user.click(triggerButton)
-
-      await waitFor(() => {
-        expect(bindTag).toHaveBeenCalledTimes(1)
-        expect(bindTag).toHaveBeenCalledWith(['tag-2'], 'target-1', 'app')
-        expect(defaultProps.onCacheUpdate).toHaveBeenCalledTimes(1)
-        expect(defaultProps.onCacheUpdate).toHaveBeenCalledWith(appTags)
-      })
-    })
-
-    it('should unbind a deselected tag and update cache when closing the panel', async () => {
-      const user = userEvent.setup()
-      render(<TagSelector {...defaultProps} />)
-
-      const triggerButton = screen.getByRole('button', { name: /Frontend/i })
-      await user.click(triggerButton)
-
-      await screen.findByPlaceholderText(i18n.selectorPlaceholder)
-      await user.click(getPanelTagRow('Frontend'))
-
-      // Close panel to trigger unmount side effects.
-      await user.click(triggerButton)
-
-      await waitFor(() => {
-        expect(unBindTag).toHaveBeenCalledTimes(1)
-        expect(unBindTag).toHaveBeenCalledWith('tag-1', 'target-1', 'app')
-        expect(defaultProps.onCacheUpdate).toHaveBeenCalledTimes(1)
-        expect(defaultProps.onCacheUpdate).toHaveBeenCalledWith([])
-      })
-    })
-  })
-
-  describe('Data Fetching (getTagList / onCreate)', () => {
-    it('should update the store tagList after fetching', async () => {
-      const user = userEvent.setup()
-      const freshTags: Tag[] = [
-        ...appTags,
-        { id: 'new-tag', name: 'BrandNewTag', type: 'app', binding_count: 0 },
-      ]
-      vi.mocked(createTag).mockResolvedValue({ id: 'new-tag', name: 'BrandNewTag', type: 'app', binding_count: 0 })
-      vi.mocked(fetchTagList).mockResolvedValue(freshTags)
-
-      render(<TagSelector {...defaultProps} />)
-
-      await user.click(screen.getByRole('button'))
-
-      await waitFor(() => {
-        expect(screen.getByPlaceholderText(i18n.selectorPlaceholder))!.toBeInTheDocument()
-      })
-
-      const input = screen.getByPlaceholderText(i18n.selectorPlaceholder)
-      await user.type(input, 'BrandNewTag')
-
-      const createOption = await screen.findByTestId('create-tag-option')
-      await user.click(createOption)
-
-      await waitFor(() => {
-        expect(createTag).toHaveBeenCalledWith('BrandNewTag', 'app')
-      })
-
-      await waitFor(() => {
-        expect(fetchTagList).toHaveBeenCalled()
-      })
-
-      await waitFor(() => {
-        expect(useTagStore.getState().tagList).toEqual(freshTags)
-      })
-    })
-  })
-
-  describe('Edge Cases', () => {
-    it('should handle selectedTags with no matching tags in store', () => {
-      const orphanTags: Tag[] = [
-        { id: 'orphan-1', name: 'Orphan', type: 'app', binding_count: 0 },
-      ]
-      render(
-        <TagSelector
-          {...defaultProps}
-          selectedTags={orphanTags}
-          value={['orphan-1']}
-        />,
-      )
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      // Orphan tag is not in store tagList, so tags memo returns []
-      expect(screen.queryByText('Orphan')).not.toBeInTheDocument()
-      expect(screen.getByText(i18n.addTag))!.toBeInTheDocument()
-    })
-
-    it('should handle knowledge type', async () => {
-      const user = userEvent.setup()
-      const knowledgeTags: Tag[] = [
-        { id: 'k-1', name: 'KnowledgeDB', type: 'knowledge', binding_count: 2 },
-      ]
-      vi.mocked(fetchTagList).mockResolvedValue(knowledgeTags)
-      act(() => {
-        useTagStore.setState({ tagList: knowledgeTags })
-      })
-
-      render(
-        <TagSelector
-          {...defaultProps}
-          type="knowledge"
-          selectedTags={knowledgeTags}
-          value={['k-1']}
-        />,
-      )
-
-      expect(screen.getByText('KnowledgeDB'))!.toBeInTheDocument()
-
-      // Open popover and verify panel uses knowledge type
-      await user.click(screen.getByRole('button'))
-
-      await waitFor(() => {
-        expect(screen.getByPlaceholderText(i18n.selectorPlaceholder))!.toBeInTheDocument()
-      })
-
-      const input = screen.getByPlaceholderText(i18n.selectorPlaceholder)
-      await user.type(input, 'NewKnowledgeTag')
-
-      const createOption = await screen.findByTestId('create-tag-option')
-      await user.click(createOption)
-
-      await waitFor(() => {
-        expect(createTag).toHaveBeenCalledWith('NewKnowledgeTag', 'knowledge')
-      })
-    })
-  })
-})
diff --git a/web/app/components/base/tag-management/__tests__/tag-remove-modal.spec.tsx b/web/app/components/base/tag-management/__tests__/tag-remove-modal.spec.tsx
deleted file mode 100644
index 943b7bc8ff..0000000000
--- a/web/app/components/base/tag-management/__tests__/tag-remove-modal.spec.tsx
+++ /dev/null
@@ -1,123 +0,0 @@
-import type { Tag } from '../constant'
-import { render, screen } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
-import TagRemoveModal from '../tag-remove-modal'
-
-const mockTag: Tag = {
-  id: 'tag-1',
-  name: 'Frontend',
-  type: 'app',
-  binding_count: 3,
-}
-
-describe('TagRemoveModal', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  // Rendering behavior and visibility control.
-  describe('Rendering', () => {
-    it('should render modal content when show is true', () => {
-      render(
-        <TagRemoveModal
-          show={true}
-          tag={mockTag}
-          onConfirm={vi.fn()}
-          onClose={vi.fn()}
-        />,
-      )
-
-      expect(screen.getByText('common.tag.delete')).toBeInTheDocument()
-      expect(screen.getByText('"Frontend"')).toBeInTheDocument()
-      expect(screen.getByText('common.tag.deleteTip')).toBeInTheDocument()
-      expect(screen.getByText('common.operation.cancel')).toBeInTheDocument()
-      expect(screen.getByText('common.operation.delete')).toBeInTheDocument()
-    })
-
-    it('should not render modal content when show is false', () => {
-      render(
-        <TagRemoveModal
-          show={false}
-          tag={mockTag}
-          onConfirm={vi.fn()}
-          onClose={vi.fn()}
-        />,
-      )
-
-      expect(screen.queryByText('common.tag.delete')).not.toBeInTheDocument()
-      expect(screen.queryByText('common.tag.deleteTip')).not.toBeInTheDocument()
-    })
-  })
-
-  // User interactions for closing and confirming actions.
-  describe('User Interactions', () => {
-    it('should call onClose when top-right close icon is clicked', async () => {
-      const user = userEvent.setup()
-      const onClose = vi.fn()
-      render(
-        <TagRemoveModal
-          show={true}
-          tag={mockTag}
-          onConfirm={vi.fn()}
-          onClose={onClose}
-        />,
-      )
-
-      const closeIconButton = screen.getByTestId('tag-remove-modal-close-button')
-      expect(closeIconButton).toBeInTheDocument()
-      await user.click(closeIconButton)
-
-      expect(onClose).toHaveBeenCalledTimes(1)
-    })
-
-    it('should call onClose when cancel button is clicked', async () => {
-      const user = userEvent.setup()
-      const onClose = vi.fn()
-
-      render(
-        <TagRemoveModal
-          show={true}
-          tag={mockTag}
-          onConfirm={vi.fn()}
-          onClose={onClose}
-        />,
-      )
-
-      await user.click(screen.getByText('common.operation.cancel'))
-      expect(onClose).toHaveBeenCalledTimes(1)
-    })
-
-    it('should call onConfirm when delete button is clicked', async () => {
-      const user = userEvent.setup()
-      const onConfirm = vi.fn()
-
-      render(
-        <TagRemoveModal
-          show={true}
-          tag={mockTag}
-          onConfirm={onConfirm}
-          onClose={vi.fn()}
-        />,
-      )
-
-      await user.click(screen.getByText('common.operation.delete'))
-      expect(onConfirm).toHaveBeenCalledTimes(1)
-    })
-  })
-
-  // Edge case for unusual tag names in the title.
-  describe('Edge Cases', () => {
-    it('should render quoted empty tag name safely', () => {
-      render(
-        <TagRemoveModal
-          show={true}
-          tag={{ ...mockTag, name: '' }}
-          onConfirm={vi.fn()}
-          onClose={vi.fn()}
-        />,
-      )
-
-      expect(screen.getByText('""')).toBeInTheDocument()
-    })
-  })
-})
diff --git a/web/app/components/base/tag-management/constant.ts b/web/app/components/base/tag-management/constant.ts
deleted file mode 100644
index 3c60041383..0000000000
--- a/web/app/components/base/tag-management/constant.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export type Tag = {
-  id: string
-  name: string
-  type: string
-  binding_count: number
-}
diff --git a/web/app/components/base/tag-management/filter.tsx b/web/app/components/base/tag-management/filter.tsx
deleted file mode 100644
index 01729c43af..0000000000
--- a/web/app/components/base/tag-management/filter.tsx
+++ /dev/null
@@ -1,157 +0,0 @@
-import type { FC } from 'react'
-import type { Tag } from '@/app/components/base/tag-management/constant'
-import { cn } from '@langgenius/dify-ui/cn'
-import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from '@langgenius/dify-ui/popover'
-import { useMount } from 'ahooks'
-import { useMemo, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import { Tag01, Tag03 } from '@/app/components/base/icons/src/vender/line/financeAndECommerce'
-import Input from '@/app/components/base/input'
-import { fetchTagList } from '@/service/tag'
-
-import { useStore as useTagStore } from './store'
-
-type TagFilterProps = {
-  type: 'knowledge' | 'app'
-  value: string[]
-  onChange: (v: string[]) => void
-}
-const TagFilter: FC<TagFilterProps> = ({
-  type,
-  value,
-  onChange,
-}) => {
-  const { t } = useTranslation()
-  const [open, setOpen] = useState(false)
-
-  const tagList = useTagStore(s => s.tagList)
-  const setTagList = useTagStore(s => s.setTagList)
-  const setShowTagManagementModal = useTagStore(s => s.setShowTagManagementModal)
-
-  const [keywords, setKeywords] = useState('')
-
-  const filteredTagList = useMemo(() => {
-    return tagList.filter(tag => tag.type === type && tag.name.includes(keywords))
-  }, [type, tagList, keywords])
-
-  const currentTag = useMemo(() => {
-    return tagList.find(tag => tag.id === value[0])
-  }, [value, tagList])
-
-  const selectTag = (tag: Tag) => {
-    if (value.includes(tag.id))
-      onChange(value.filter(v => v !== tag.id))
-    else
-      onChange([...value, tag.id])
-  }
-
-  useMount(() => {
-    fetchTagList(type).then((res) => {
-      setTagList(res)
-    })
-  })
-
-  return (
-    <Popover
-      open={open}
-      onOpenChange={setOpen}
-    >
-      <div className="relative">
-        <PopoverTrigger
-          render={(
-            <button
-              type="button"
-              className={cn(
-                'flex h-8 cursor-pointer items-center gap-1 rounded-lg border-[0.5px] border-transparent bg-components-input-bg-normal px-2 text-left select-none',
-                !!value.length && 'pr-6 shadow-xs',
-              )}
-            >
-              <div className="p-px">
-                <Tag01 className="h-3.5 w-3.5 text-text-tertiary" data-testid="tag-filter-trigger-icon" />
-              </div>
-              <div className="min-w-0 truncate text-[13px] leading-[18px] text-text-secondary">
-                {!value.length && t('tag.placeholder', { ns: 'common' })}
-                {!!value.length && currentTag?.name}
-              </div>
-              {value.length > 1 && (
-                <div className="shrink-0 text-xs leading-[18px] font-medium text-text-tertiary">{`+${value.length - 1}`}</div>
-              )}
-              {!value.length && (
-                <div className="shrink-0 p-px">
-                  <span className="i-ri-arrow-down-s-line h-3.5 w-3.5 text-text-tertiary" data-testid="tag-filter-arrow-down-icon" />
-                </div>
-              )}
-            </button>
-          )}
-        />
-        {!!value.length && (
-          <button
-            type="button"
-            className="group/clear absolute top-1/2 right-2 -translate-y-1/2 p-px"
-            onClick={() => onChange([])}
-            data-testid="tag-filter-clear-button"
-          >
-            <span className="i-custom-vender-solid-general-x-circle h-3.5 w-3.5 text-text-tertiary group-hover/clear:text-text-secondary" />
-          </button>
-        )}
-        <PopoverContent
-          placement="bottom-start"
-          sideOffset={4}
-          popupClassName="w-[240px] rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg backdrop-blur-[5px]"
-        >
-          <div className="relative">
-            <div className="p-2">
-              <Input
-                showLeftIcon
-                showClearIcon
-                value={keywords}
-                onChange={e => setKeywords(e.target.value)}
-                onClear={() => setKeywords('')}
-              />
-            </div>
-            <div className="max-h-72 overflow-auto p-1">
-              {filteredTagList.map(tag => (
-                <div
-                  key={tag.id}
-                  className="flex cursor-pointer items-center gap-2 rounded-lg py-[6px] pr-2 pl-3 select-none hover:bg-state-base-hover"
-                  onClick={() => selectTag(tag)}
-                >
-                  <div title={tag.name} className="grow truncate text-sm leading-5 text-text-tertiary">{tag.name}</div>
-                  {value.includes(tag.id) && <span className="i-custom-vender-line-general-check h-4 w-4 shrink-0 text-text-secondary" data-testid="tag-filter-selected-icon" />}
-                </div>
-              ))}
-              {!filteredTagList.length && (
-                <div className="flex flex-col items-center gap-1 p-3">
-                  <Tag03 className="h-6 w-6 text-text-tertiary" />
-                  <div className="text-xs leading-[14px] text-text-tertiary">{t('tag.noTag', { ns: 'common' })}</div>
-                </div>
-              )}
-            </div>
-            <div className="border-t-[0.5px] border-divider-regular" />
-            <div className="p-1">
-              <div
-                className="flex cursor-pointer items-center gap-2 rounded-lg py-[6px] pr-2 pl-3 select-none hover:bg-state-base-hover"
-                onClick={() => {
-                  setShowTagManagementModal(true)
-                  setOpen(false)
-                }}
-              >
-                <Tag03 className="h-4 w-4 text-text-tertiary" />
-                <div className="grow truncate text-sm leading-5 text-text-secondary">
-                  {t('tag.manageTags', { ns: 'common' })}
-                </div>
-              </div>
-            </div>
-          </div>
-        </PopoverContent>
-      </div>
-    </Popover>
-
-  )
-}
-
-export default TagFilter
diff --git a/web/app/components/base/tag-management/index.stories.tsx b/web/app/components/base/tag-management/index.stories.tsx
deleted file mode 100644
index 6ab2fcb926..0000000000
--- a/web/app/components/base/tag-management/index.stories.tsx
+++ /dev/null
@@ -1,132 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/nextjs-vite'
-import type { Tag } from './constant'
-import { ToastHost } from '@langgenius/dify-ui/toast'
-import { useEffect, useRef } from 'react'
-import TagManagementModal from '.'
-import { useStore as useTagStore } from './store'
-
-const INITIAL_TAGS: Tag[] = [
-  { id: 'tag-product', name: 'Product', type: 'app', binding_count: 12 },
-  { id: 'tag-growth', name: 'Growth', type: 'app', binding_count: 4 },
-  { id: 'tag-beta', name: 'Beta User', type: 'app', binding_count: 2 },
-  { id: 'tag-rag', name: 'RAG', type: 'knowledge', binding_count: 3 },
-  { id: 'tag-updates', name: 'Release Notes', type: 'knowledge', binding_count: 6 },
-]
-
-const TagManagementPlayground = ({
-  type = 'app',
-}: {
-  type?: 'app' | 'knowledge'
-}) => {
-  const originalFetchRef = useRef<typeof globalThis.fetch>(null)
-  const tagsRef = useRef<Tag[]>(INITIAL_TAGS)
-  const setTagList = useTagStore(s => s.setTagList)
-  const showModal = useTagStore(s => s.showTagManagementModal)
-  const setShowModal = useTagStore(s => s.setShowTagManagementModal)
-
-  useEffect(() => {
-    setTagList(tagsRef.current)
-    setShowModal(true)
-  }, [setTagList, setShowModal])
-
-  useEffect(() => {
-    originalFetchRef.current = globalThis.fetch?.bind(globalThis)
-
-    const handler = async (input: RequestInfo | URL, init?: RequestInit) => {
-      const request = input instanceof Request ? input : new Request(input, init)
-      const url = request.url
-      const method = request.method.toUpperCase()
-      const parsedUrl = new URL(url, window.location.origin)
-
-      if (parsedUrl.pathname.endsWith('/tags')) {
-        if (method === 'GET') {
-          const tagType = parsedUrl.searchParams.get('type') || 'app'
-          const payload = tagsRef.current.filter(tag => tag.type === tagType)
-          return new Response(JSON.stringify(payload), {
-            status: 200,
-            headers: { 'Content-Type': 'application/json' },
-          })
-        }
-        if (method === 'POST') {
-          const body = await request.clone().json() as { name: string, type: string }
-          const newTag: Tag = {
-            id: `tag-${Date.now()}`,
-            name: body.name,
-            type: body.type,
-            binding_count: 0,
-          }
-          tagsRef.current = [newTag, ...tagsRef.current]
-          setTagList(tagsRef.current)
-          return new Response(JSON.stringify(newTag), {
-            status: 200,
-            headers: { 'Content-Type': 'application/json' },
-          })
-        }
-      }
-
-      if (parsedUrl.pathname.endsWith('/tag-bindings/create') || parsedUrl.pathname.endsWith('/tag-bindings/remove')) {
-        return new Response(JSON.stringify({ ok: true }), {
-          status: 200,
-          headers: { 'Content-Type': 'application/json' },
-        })
-      }
-
-      if (originalFetchRef.current)
-        return originalFetchRef.current(request)
-
-      throw new Error(`Unhandled request in mock fetch: ${url}`)
-    }
-
-    globalThis.fetch = handler as typeof globalThis.fetch
-
-    return () => {
-      if (originalFetchRef.current)
-        globalThis.fetch = originalFetchRef.current
-    }
-  }, [setTagList])
-
-  return (
-    <>
-      <ToastHost />
-      <div className="flex w-full max-w-xl flex-col gap-4 rounded-2xl border border-divider-subtle bg-components-panel-bg p-6">
-        <button
-          type="button"
-          className="self-start rounded-md border border-divider-subtle bg-background-default px-3 py-1.5 text-xs font-medium text-text-secondary hover:bg-state-base-hover"
-          onClick={() => setShowModal(true)}
-        >
-          Manage tags
-        </button>
-        <p className="text-xs text-text-tertiary">Mocked tag management flows with create and bind actions.</p>
-      </div>
-      <TagManagementModal show={showModal} type={type} />
-    </>
-  )
-}
-
-const meta = {
-  title: 'Base/Data Display/TagManagementModal',
-  component: TagManagementPlayground,
-  parameters: {
-    layout: 'centered',
-    docs: {
-      description: {
-        component: 'Complete tag management modal with mocked service calls for browsing and creating tags.',
-      },
-    },
-  },
-  argTypes: {
-    type: {
-      control: 'radio',
-      options: ['app', 'knowledge'],
-    },
-  },
-  args: {
-    type: 'app',
-  },
-  tags: ['autodocs'],
-} satisfies Meta<typeof TagManagementPlayground>
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Playground: Story = {}
diff --git a/web/app/components/base/tag-management/index.tsx b/web/app/components/base/tag-management/index.tsx
deleted file mode 100644
index 6a050de834..0000000000
--- a/web/app/components/base/tag-management/index.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-'use client'
-import { toast } from '@langgenius/dify-ui/toast'
-import { useEffect, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import Modal from '@/app/components/base/modal'
-import { createTag, fetchTagList } from '@/service/tag'
-import { useStore as useTagStore } from './store'
-import TagItemEditor from './tag-item-editor'
-
-type TagManagementModalProps = {
-  type: 'knowledge' | 'app'
-  show: boolean
-}
-const TagManagementModal = ({ show, type }: TagManagementModalProps) => {
-  const { t } = useTranslation()
-  const tagList = useTagStore(s => s.tagList)
-  const setTagList = useTagStore(s => s.setTagList)
-  const setShowTagManagementModal = useTagStore(s => s.setShowTagManagementModal)
-  const getTagList = async (type: 'knowledge' | 'app') => {
-    const res = await fetchTagList(type)
-    setTagList(res)
-  }
-  const [pending, setPending] = useState<boolean>(false)
-  const [name, setName] = useState<string>('')
-  const createNewTag = async () => {
-    if (!name)
-      return
-    if (pending)
-      return
-    try {
-      setPending(true)
-      const newTag = await createTag(name, type)
-      toast.success(t('tag.created', { ns: 'common' }))
-      setTagList([
-        newTag,
-        ...tagList,
-      ])
-      setName('')
-      setPending(false)
-    }
-    catch {
-      toast.error(t('tag.failed', { ns: 'common' }))
-      setPending(false)
-    }
-  }
-  useEffect(() => {
-    getTagList(type)
-  }, [type])
-  return (
-    <Modal className="!w-[600px] !max-w-[600px] rounded-xl px-8 py-6" isShow={show} onClose={() => setShowTagManagementModal(false)}>
-      <div className="relative pb-2 text-xl leading-[30px] font-semibold text-text-primary">{t('tag.manageTags', { ns: 'common' })}</div>
-      <div className="absolute top-4 right-4 cursor-pointer p-2" onClick={() => setShowTagManagementModal(false)}>
-        <span className="i-ri-close-line h-4 w-4 text-text-tertiary" data-testid="tag-management-modal-close-button" />
-      </div>
-      <div className="mt-3 flex flex-wrap gap-2">
-        <input className="w-[100px] shrink-0 appearance-none rounded-lg border border-dashed border-divider-regular bg-transparent px-2 py-1 text-sm leading-5 text-text-secondary caret-primary-600 outline-none placeholder:text-text-quaternary focus:border-solid" placeholder={t('tag.addNew', { ns: 'common' }) || ''} autoFocus value={name} onChange={e => setName(e.target.value)} onKeyDown={e => e.key === 'Enter' && !e.nativeEvent.isComposing && createNewTag()} onBlur={createNewTag} />
-        {tagList.map(tag => (<TagItemEditor key={tag.id} tag={tag} />))}
-      </div>
-    </Modal>
-  )
-}
-export default TagManagementModal
diff --git a/web/app/components/base/tag-management/panel.tsx b/web/app/components/base/tag-management/panel.tsx
deleted file mode 100644
index 3f64355c43..0000000000
--- a/web/app/components/base/tag-management/panel.tsx
+++ /dev/null
@@ -1,165 +0,0 @@
-import type { TagSelectorProps } from './selector'
-import type { Tag } from '@/app/components/base/tag-management/constant'
-import { toast } from '@langgenius/dify-ui/toast'
-import { useUnmount } from 'ahooks'
-import { noop } from 'es-toolkit/function'
-import * as React from 'react'
-import { useMemo, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import Checkbox from '@/app/components/base/checkbox'
-import Divider from '@/app/components/base/divider'
-import Input from '@/app/components/base/input'
-import { bindTag, createTag, unBindTag } from '@/service/tag'
-import { useStore as useTagStore } from './store'
-
-type PanelProps = {
-  onCreate: () => void
-} & TagSelectorProps
-const Panel = (props: PanelProps) => {
-  const { t } = useTranslation()
-  const { targetID, type, value, selectedTags, onCacheUpdate, onChange, onCreate } = props
-  const tagList = useTagStore(s => s.tagList)
-  const setTagList = useTagStore(s => s.setTagList)
-  const setShowTagManagementModal = useTagStore(s => s.setShowTagManagementModal)
-  const [selectedTagIDs, setSelectedTagIDs] = useState<string[]>(value)
-  const [keywords, setKeywords] = useState('')
-  const handleKeywordsChange = (value: string) => {
-    setKeywords(value)
-  }
-  const notExisted = useMemo(() => {
-    return tagList.every(tag => tag.type === type && tag.name !== keywords)
-  }, [type, tagList, keywords])
-  const filteredSelectedTagList = useMemo(() => {
-    return selectedTags.filter(tag => tag.name.includes(keywords))
-  }, [keywords, selectedTags])
-  const filteredTagList = useMemo(() => {
-    return tagList.filter(tag => tag.type === type && !value.includes(tag.id) && tag.name.includes(keywords))
-  }, [type, tagList, value, keywords])
-  const [creating, setCreating] = useState<boolean>(false)
-  const createNewTag = async () => {
-    if (!keywords)
-      return
-    if (creating)
-      return
-    try {
-      setCreating(true)
-      const newTag = await createTag(keywords, type)
-      toast.success(t('tag.created', { ns: 'common' }))
-      setTagList([
-        ...tagList,
-        newTag,
-      ])
-      setKeywords('')
-      setCreating(false)
-      onCreate()
-    }
-    catch {
-      toast.error(t('tag.failed', { ns: 'common' }))
-      setCreating(false)
-    }
-  }
-  const bind = async (tagIDs: string[]) => {
-    try {
-      await bindTag(tagIDs, targetID, type)
-      toast.success(t('actionMsg.modifiedSuccessfully', { ns: 'common' }))
-    }
-    catch {
-      toast.error(t('actionMsg.modifiedUnsuccessfully', { ns: 'common' }))
-    }
-  }
-  const unbind = async (tagID: string) => {
-    try {
-      await unBindTag(tagID, targetID, type)
-      toast.success(t('actionMsg.modifiedSuccessfully', { ns: 'common' }))
-    }
-    catch {
-      toast.error(t('actionMsg.modifiedUnsuccessfully', { ns: 'common' }))
-    }
-  }
-  const selectTag = (tag: Tag) => {
-    if (selectedTagIDs.includes(tag.id))
-      setSelectedTagIDs(selectedTagIDs.filter(v => v !== tag.id))
-    else
-      setSelectedTagIDs([...selectedTagIDs, tag.id])
-  }
-  const valueNotChanged = useMemo(() => {
-    return value.length === selectedTagIDs.length && value.every(v => selectedTagIDs.includes(v)) && selectedTagIDs.every(v => value.includes(v))
-  }, [value, selectedTagIDs])
-  const handleValueChange = () => {
-    const addTagIDs = selectedTagIDs.filter(v => !value.includes(v))
-    const removeTagIDs = value.filter(v => !selectedTagIDs.includes(v))
-    const selectedTags = tagList.filter(tag => selectedTagIDs.includes(tag.id))
-    onCacheUpdate(selectedTags)
-    const operations: Promise<unknown>[] = []
-    if (addTagIDs.length)
-      operations.push(bind(addTagIDs))
-    if (removeTagIDs.length)
-      operations.push(...removeTagIDs.map(tagID => unbind(tagID)))
-    Promise.all(operations).finally(() => {
-      if (onChange)
-        onChange()
-    })
-  }
-  useUnmount(() => {
-    if (valueNotChanged)
-      return
-    handleValueChange()
-  })
-  return (
-    <div className="relative w-full rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg-blur">
-      <div className="p-2 pb-1">
-        <Input showLeftIcon showClearIcon value={keywords} placeholder={t('tag.selectorPlaceholder', { ns: 'common' }) || ''} onChange={e => handleKeywordsChange(e.target.value)} onClear={() => handleKeywordsChange('')} />
-      </div>
-      {keywords && notExisted && (
-        <div className="p-1">
-          <div className="flex cursor-pointer items-center gap-x-1 rounded-lg px-2 py-1.5 hover:bg-state-base-hover" data-testid="create-tag-option" onClick={createNewTag}>
-            <span className="i-ri-add-line h-4 w-4 text-text-tertiary" />
-            <div className="grow truncate px-1 system-md-regular text-text-secondary">
-              {`${t('tag.create', { ns: 'common' })} `}
-              <span className="system-md-medium">{`'${keywords}'`}</span>
-            </div>
-          </div>
-        </div>
-      )}
-      {keywords && notExisted && filteredTagList.length > 0 && (<Divider type="horizontal" className="my-0 h-px bg-divider-subtle" />)}
-      {(filteredTagList.length > 0 || filteredSelectedTagList.length > 0) && (
-        <div className="max-h-[232px] overflow-y-auto p-1">
-          {filteredSelectedTagList.map(tag => (
-            <div key={tag.id} className="flex cursor-pointer items-center gap-x-1 rounded-lg px-2 py-1.5 hover:bg-state-base-hover" onClick={() => selectTag(tag)} data-testid="tag-row">
-              <Checkbox className="shrink-0" checked={selectedTagIDs.includes(tag.id)} onCheck={noop} id={tag.id} />
-              <div title={tag.name} className="grow truncate px-1 system-md-regular text-text-secondary">
-                {tag.name}
-              </div>
-            </div>
-          ))}
-          {filteredTagList.map(tag => (
-            <div key={tag.id} className="flex cursor-pointer items-center gap-x-1 rounded-lg px-2 py-1.5 hover:bg-state-base-hover" onClick={() => selectTag(tag)} data-testid="tag-row">
-              <Checkbox className="shrink-0" checked={selectedTagIDs.includes(tag.id)} onCheck={noop} id={tag.id} />
-              <div title={tag.name} className="grow truncate px-1 system-md-regular text-text-secondary">
-                {tag.name}
-              </div>
-            </div>
-          ))}
-        </div>
-      )}
-      {!keywords && !filteredTagList.length && !filteredSelectedTagList.length && (
-        <div className="p-1">
-          <div className="flex flex-col items-center gap-y-1 p-3">
-            <span className="i-ri-price-tag-3-line h-6 w-6 text-text-quaternary" />
-            <div className="system-xs-regular text-text-tertiary">{t('tag.noTag', { ns: 'common' })}</div>
-          </div>
-        </div>
-      )}
-      <Divider type="horizontal" className="my-0 h-px bg-divider-subtle" />
-      <div className="p-1">
-        <div className="flex cursor-pointer items-center gap-x-1 rounded-lg px-2 py-1.5 hover:bg-state-base-hover" onClick={() => setShowTagManagementModal(true)}>
-          <span className="i-ri-price-tag-3-line h-4 w-4 text-text-tertiary" />
-          <div className="grow truncate px-1 system-md-regular text-text-secondary">
-            {t('tag.manageTags', { ns: 'common' })}
-          </div>
-        </div>
-      </div>
-    </div>
-  )
-}
-export default React.memo(Panel)
diff --git a/web/app/components/base/tag-management/selector.tsx b/web/app/components/base/tag-management/selector.tsx
deleted file mode 100644
index 0eb233ba4b..0000000000
--- a/web/app/components/base/tag-management/selector.tsx
+++ /dev/null
@@ -1,116 +0,0 @@
-import type { FC } from 'react'
-import type { Tag } from '@/app/components/base/tag-management/constant'
-import { cn } from '@langgenius/dify-ui/cn'
-import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from '@langgenius/dify-ui/popover'
-import { useCallback, useMemo, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import { fetchTagList } from '@/service/tag'
-import Panel from './panel'
-import { useStore as useTagStore } from './store'
-import Trigger from './trigger'
-
-export type TagSelectorProps = {
-  targetID: string
-  isPopover?: boolean
-  position?: 'bl' | 'br'
-  type: 'knowledge' | 'app'
-  value: string[]
-  selectedTags: Tag[]
-  onCacheUpdate: (tags: Tag[]) => void
-  onChange?: () => void
-  minWidth?: number | string
-}
-
-const TagSelector: FC<TagSelectorProps> = ({
-  targetID,
-  isPopover = true,
-  position,
-  type,
-  value,
-  selectedTags,
-  onCacheUpdate,
-  onChange,
-  minWidth,
-}) => {
-  const { t } = useTranslation()
-  const tagList = useTagStore(s => s.tagList)
-  const setTagList = useTagStore(s => s.setTagList)
-  const [open, setOpen] = useState(false)
-
-  const getTagList = useCallback(async () => {
-    const res = await fetchTagList(type)
-    setTagList(res)
-  }, [setTagList, type])
-
-  const tags = useMemo(() => {
-    if (selectedTags?.length)
-      return selectedTags.filter(selectedTag => tagList.find(tag => tag.id === selectedTag.id)).map(tag => tag.name)
-    return []
-  }, [selectedTags, tagList])
-
-  const placement = useMemo(() => {
-    if (position === 'bl')
-      return 'bottom-start' as const
-    if (position === 'br')
-      return 'bottom-end' as const
-    return 'bottom' as const
-  }, [position])
-
-  const resolvedMinWidth = useMemo(() => {
-    if (minWidth == null)
-      return undefined
-
-    return typeof minWidth === 'number' ? `${minWidth}px` : minWidth
-  }, [minWidth])
-
-  const triggerLabel = useMemo(() => {
-    if (tags.length)
-      return tags.join(', ')
-
-    return t('tag.addTag', { ns: 'common' })
-  }, [tags, t])
-
-  if (!isPopover)
-    return null
-
-  return (
-    <Popover open={open} onOpenChange={setOpen}>
-      <PopoverTrigger
-        aria-label={triggerLabel}
-        className={cn(
-          open ? 'bg-state-base-hover' : 'bg-transparent',
-          'block w-full rounded-lg border-0 p-0 text-left focus:outline-hidden',
-        )}
-      >
-        <Trigger tags={tags} />
-      </PopoverTrigger>
-      <PopoverContent
-        placement={placement}
-        sideOffset={4}
-        popupClassName="overflow-hidden rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg backdrop-blur-[5px]"
-        popupProps={{
-          style: {
-            width: 'var(--anchor-width, auto)',
-            minWidth: resolvedMinWidth,
-          },
-        }}
-      >
-        <Panel
-          type={type}
-          targetID={targetID}
-          value={value}
-          selectedTags={selectedTags}
-          onCacheUpdate={onCacheUpdate}
-          onChange={onChange}
-          onCreate={getTagList}
-        />
-      </PopoverContent>
-    </Popover>
-  )
-}
-
-export default TagSelector
diff --git a/web/app/components/base/tag-management/store.ts b/web/app/components/base/tag-management/store.ts
deleted file mode 100644
index 197d31ed7a..0000000000
--- a/web/app/components/base/tag-management/store.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import type { Tag } from './constant'
-import { create } from 'zustand'
-
-type State = {
-  tagList: Tag[]
-  showTagManagementModal: boolean
-}
-
-type Action = {
-  setTagList: (tagList?: Tag[]) => void
-  setShowTagManagementModal: (showTagManagementModal: boolean) => void
-}
-
-export const useStore = create<State & Action>(set => ({
-  tagList: [],
-  setTagList: tagList => set(() => ({ tagList })),
-  showTagManagementModal: false,
-  setShowTagManagementModal: showTagManagementModal => set(() => ({ showTagManagementModal })),
-}))
diff --git a/web/app/components/base/tag-management/tag-item-editor.tsx b/web/app/components/base/tag-management/tag-item-editor.tsx
deleted file mode 100644
index 777abec139..0000000000
--- a/web/app/components/base/tag-management/tag-item-editor.tsx
+++ /dev/null
@@ -1,160 +0,0 @@
-import type { FC } from 'react'
-import type { Tag } from '@/app/components/base/tag-management/constant'
-import {
-  AlertDialog,
-  AlertDialogActions,
-  AlertDialogCancelButton,
-  AlertDialogConfirmButton,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogTitle,
-} from '@langgenius/dify-ui/alert-dialog'
-import { cn } from '@langgenius/dify-ui/cn'
-import { toast } from '@langgenius/dify-ui/toast'
-import { useDebounceFn } from 'ahooks'
-import { useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import Tooltip from '@/app/components/base/tooltip'
-import { deleteTag, updateTag } from '@/service/tag'
-import { useStore as useTagStore } from './store'
-
-type TagItemEditorProps = {
-  tag: Tag
-}
-const TagItemEditor: FC<TagItemEditorProps> = ({ tag }) => {
-  const { t } = useTranslation()
-  const tagList = useTagStore(s => s.tagList)
-  const setTagList = useTagStore(s => s.setTagList)
-  const [isEditing, setIsEditing] = useState(false)
-  const [name, setName] = useState(tag.name)
-  const editTag = async (tagID: string, name: string) => {
-    if (name === tag.name) {
-      setIsEditing(false)
-      return
-    }
-    if (!name) {
-      toast.error('tag name is empty')
-      setName(tag.name)
-      setIsEditing(false)
-      return
-    }
-    try {
-      const newList = tagList.map((tag) => {
-        if (tag.id === tagID) {
-          return {
-            ...tag,
-            name,
-          }
-        }
-        return tag
-      })
-      setTagList([
-        ...newList,
-      ])
-      setIsEditing(false)
-      await updateTag(tagID, name)
-      toast.success(t('actionMsg.modifiedSuccessfully', { ns: 'common' }))
-      setName(name)
-    }
-    catch {
-      toast.error(t('actionMsg.modifiedUnsuccessfully', { ns: 'common' }))
-      setName(tag.name)
-      const recoverList = tagList.map((tag) => {
-        if (tag.id === tagID) {
-          return {
-            ...tag,
-            name: tag.name,
-          }
-        }
-        return tag
-      })
-      setTagList([
-        ...recoverList,
-      ])
-      setIsEditing(false)
-    }
-  }
-  const [showRemoveModal, setShowRemoveModal] = useState(false)
-  const [pending, setPending] = useState<boolean>(false)
-  const removeTag = async (tagID: string) => {
-    if (pending)
-      return
-    try {
-      setPending(true)
-      await deleteTag(tagID)
-      toast.success(t('actionMsg.modifiedSuccessfully', { ns: 'common' }))
-      const newList = tagList.filter(tag => tag.id !== tagID)
-      setTagList([
-        ...newList,
-      ])
-      setPending(false)
-    }
-    catch {
-      toast.error(t('actionMsg.modifiedUnsuccessfully', { ns: 'common' }))
-      setPending(false)
-    }
-  }
-  const { run: handleRemove } = useDebounceFn(() => {
-    removeTag(tag.id)
-  }, { wait: 200 })
-  return (
-    <>
-      <div className={cn('flex shrink-0 items-center gap-0.5 rounded-lg border border-components-panel-border py-1 pr-1 pl-2 text-sm leading-5 text-text-secondary')}>
-        {!isEditing && (
-          <>
-            <div className="text-sm leading-5 text-text-secondary">
-              {tag.name}
-            </div>
-            <Tooltip popupContent={<div>{t('common.tagBound', { ns: 'workflow' })}</div>} needsDelay>
-              <div className="shrink-0 px-1 text-sm leading-4.5 font-medium text-text-tertiary">{tag.binding_count}</div>
-            </Tooltip>
-            <div className="group/edit shrink-0 cursor-pointer rounded-md p-1 hover:bg-state-base-hover" onClick={() => setIsEditing(true)}>
-              <span className="i-ri-edit-line h-3 w-3 text-text-tertiary group-hover/edit:text-text-secondary" data-testid="tag-item-editor-edit-button" />
-            </div>
-            <div
-              className="group/remove shrink-0 cursor-pointer rounded-md p-1 hover:bg-state-base-hover"
-              onClick={() => {
-                if (tag.binding_count)
-                  setShowRemoveModal(true)
-                else
-                  handleRemove()
-              }}
-            >
-              <span className="i-ri-delete-bin-line h-3 w-3 text-text-tertiary group-hover/remove:text-text-secondary" data-testid="tag-item-editor-remove-button" />
-            </div>
-          </>
-        )}
-        {isEditing && (<input className="shrink-0 appearance-none caret-primary-600 outline-none placeholder:text-text-quaternary" autoFocus value={name} onChange={e => setName(e.target.value)} onKeyDown={e => e.key === 'Enter' && editTag(tag.id, name)} onBlur={() => editTag(tag.id, name)} />)}
-      </div>
-      <AlertDialog open={showRemoveModal} onOpenChange={open => !open && setShowRemoveModal(false)}>
-        <AlertDialogContent>
-          <div className="flex flex-col gap-2 px-6 pt-6 pb-4">
-            <AlertDialogTitle
-              title={`${t('tag.delete', { ns: 'common' })} "${tag.name}"`}
-              className="w-full truncate title-2xl-semi-bold text-text-primary"
-            >
-              {`${t('tag.delete', { ns: 'common' })} "${tag.name}"`}
-            </AlertDialogTitle>
-            <AlertDialogDescription className="w-full system-md-regular wrap-break-word whitespace-pre-wrap text-text-tertiary">
-              {t('tag.deleteTip', { ns: 'common' })}
-            </AlertDialogDescription>
-          </div>
-          <AlertDialogActions>
-            <AlertDialogCancelButton>
-              {t('operation.cancel', { ns: 'common' })}
-            </AlertDialogCancelButton>
-            <AlertDialogConfirmButton
-              onClick={() => {
-                handleRemove()
-                setShowRemoveModal(false)
-              }}
-            >
-              {t('operation.confirm', { ns: 'common' })}
-            </AlertDialogConfirmButton>
-          </AlertDialogActions>
-        </AlertDialogContent>
-      </AlertDialog>
-    </>
-  )
-}
-export default TagItemEditor
diff --git a/web/app/components/base/tag-management/tag-remove-modal.tsx b/web/app/components/base/tag-management/tag-remove-modal.tsx
deleted file mode 100644
index 1088ca2043..0000000000
--- a/web/app/components/base/tag-management/tag-remove-modal.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-'use client'
-
-import type { Tag } from '@/app/components/base/tag-management/constant'
-import { Button } from '@langgenius/dify-ui/button'
-import { cn } from '@langgenius/dify-ui/cn'
-import { noop } from 'es-toolkit/function'
-import { useTranslation } from 'react-i18next'
-import { AlertTriangle } from '@/app/components/base/icons/src/vender/solid/alertsAndFeedback'
-import Modal from '@/app/components/base/modal'
-
-type TagRemoveModalProps = {
-  show: boolean
-  tag: Tag
-  onConfirm: () => void
-  onClose: () => void
-}
-
-const TagRemoveModal = ({ show, tag, onConfirm, onClose }: TagRemoveModalProps) => {
-  const { t } = useTranslation()
-
-  return (
-    <Modal
-      className={cn('w-[480px] max-w-[480px] p-8')}
-      isShow={show}
-      onClose={noop}
-    >
-      <div className="absolute top-4 right-4 cursor-pointer p-2" onClick={onClose} data-testid="tag-remove-modal-close-button">
-        <span className="i-ri-close-line h-4 w-4 text-text-tertiary" />
-      </div>
-      <div className="h-12 w-12 rounded-xl border-[0.5px] border-divider-regular bg-background-default-burn p-3 shadow-xl">
-        <AlertTriangle className="h-6 w-6 text-[rgb(247,144,9)]" />
-      </div>
-      <div className="mt-3 text-xl leading-[30px] font-semibold text-text-primary">
-        {`${t('tag.delete', { ns: 'common' })} `}
-        <span>{`"${tag.name}"`}</span>
-      </div>
-      <div className="my-1 text-sm leading-5 text-text-tertiary">
-        {t('tag.deleteTip', { ns: 'common' })}
-      </div>
-      <div className="flex items-center justify-end pt-6">
-        <Button className="mr-2" onClick={onClose}>{t('operation.cancel', { ns: 'common' })}</Button>
-        <Button className="border-red-700" variant="primary" tone="destructive" onClick={onConfirm}>{t('operation.delete', { ns: 'common' })}</Button>
-      </div>
-    </Modal>
-  )
-}
-
-export default TagRemoveModal
diff --git a/web/app/components/base/tag-management/trigger.tsx b/web/app/components/base/tag-management/trigger.tsx
deleted file mode 100644
index def88b2c79..0000000000
--- a/web/app/components/base/tag-management/trigger.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import * as React from 'react'
-import { useTranslation } from 'react-i18next'
-
-type TriggerProps = {
-  tags: string[]
-}
-
-const Trigger = ({
-  tags,
-}: TriggerProps) => {
-  const { t } = useTranslation()
-
-  return (
-    <div className="flex w-full cursor-pointer items-center gap-1 overflow-hidden rounded-lg p-1 hover:bg-state-base-hover">
-      {!tags.length
-        ? (
-            <div className="flex items-center gap-x-0.5 rounded-[5px] border border-dashed border-divider-deep bg-components-badge-bg-dimm px-[5px] py-[3px]">
-              <span className="i-ri-price-tag-3-line h-3 w-3 shrink-0 text-text-quaternary" />
-              <div className="system-2xs-medium-uppercase text-nowrap text-text-tertiary">
-                {t('tag.addTag', { ns: 'common' })}
-              </div>
-            </div>
-          )
-        : (
-            <>
-              {
-                tags.map((content, index) => {
-                  return (
-                    <div
-                      key={index}
-                      className="flex items-center gap-x-0.5 rounded-[5px] border border-divider-deep bg-components-badge-bg-dimm px-[5px] py-[3px]"
-                      data-testid={`tag-badge-${index}`}
-                    >
-                      <span className="i-ri-price-tag-3-line h-3 w-3 shrink-0 text-text-quaternary" />
-                      <div className="system-2xs-medium-uppercase text-nowrap text-text-tertiary">
-                        {content}
-                      </div>
-                    </div>
-                  )
-                })
-              }
-            </>
-          )}
-    </div>
-  )
-}
-
-export default React.memo(Trigger)
diff --git a/web/app/components/base/tag/index.tsx b/web/app/components/base/tag/index.tsx
index d76784caab..251df7d0d5 100644
--- a/web/app/components/base/tag/index.tsx
+++ b/web/app/components/base/tag/index.tsx
@@ -31,7 +31,7 @@ const COLOR_MAP = {
 export default function Tag({ children, color = 'green', className = '', bordered = false, hideBg = false }: ITagProps) {
   return (
     <div className={
-      cn('inline-flex shrink-0 items-center rounded-md px-2.5 py-px text-xs leading-5', COLOR_MAP[color] ? `${COLOR_MAP[color].text} ${COLOR_MAP[color].bg}` : '', bordered ? 'border' : '', hideBg ? 'bg-transparent' : '', className)
+      cn('inline-flex shrink-0 items-center rounded-md px-2.5 py-px text-xs leading-5', COLOR_MAP[color] ? `${COLOR_MAP[color].text} ${COLOR_MAP[color].bg}` : '', bordered ? 'border border-divider-regular' : '', hideBg ? 'bg-transparent' : '', className)
     }
     >
       {children}
diff --git a/web/app/components/base/theme-selector.tsx b/web/app/components/base/theme-selector.tsx
index 1676dfff72..67dc7b7b29 100644
--- a/web/app/components/base/theme-selector.tsx
+++ b/web/app/components/base/theme-selector.tsx
@@ -12,7 +12,12 @@ import { useTheme } from 'next-themes'
 import { useTranslation } from 'react-i18next'
 import ActionButton from '@/app/components/base/action-button'
 
-export type Theme = 'light' | 'dark' | 'system'
+const THEMES = ['light', 'dark', 'system'] as const
+export type Theme = typeof THEMES[number]
+
+const isTheme = (value: string): value is Theme => {
+  return (THEMES as readonly string[]).includes(value)
+}
 
 export default function ThemeSelector() {
   const { t } = useTranslation()
@@ -22,6 +27,11 @@ export default function ThemeSelector() {
     setTheme(newTheme)
   }
 
+  const handleThemeValueChange = (value: string) => {
+    if (isTheme(value))
+      handleThemeChange(value)
+  }
+
   const getCurrentIcon = () => {
     switch (theme) {
       case 'light': return <span className="i-ri-sun-line h-4 w-4 text-text-tertiary" />
@@ -43,7 +53,7 @@ export default function ThemeSelector() {
         {getCurrentIcon()}
       </DropdownMenuTrigger>
       <DropdownMenuContent placement="bottom-end" sideOffset={6} popupClassName="w-[144px]">
-        <DropdownMenuRadioGroup value={theme || 'system'} onValueChange={value => handleThemeChange(value as Theme)}>
+        <DropdownMenuRadioGroup value={theme || 'system'} onValueChange={handleThemeValueChange}>
           <DropdownMenuRadioItem value="light" closeOnClick>
             <span className="i-ri-sun-line h-4 w-4 text-text-tertiary" />
             <span className="grow px-1 system-md-regular">{t('theme.light', { ns: 'common' })}</span>
diff --git a/web/app/components/base/tooltip/TooltipManager.ts b/web/app/components/base/tooltip/TooltipManager.ts
deleted file mode 100644
index b0138af4b3..0000000000
--- a/web/app/components/base/tooltip/TooltipManager.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-class TooltipManager {
-  private activeCloser: (() => void) | null = null
-
-  register(closeFn: () => void) {
-    if (this.activeCloser)
-      this.activeCloser()
-    this.activeCloser = closeFn
-  }
-
-  clear(closeFn: () => void) {
-    if (this.activeCloser === closeFn)
-      this.activeCloser = null
-  }
-
-  /**
-   * Closes the currently active tooltip by calling its closer function
-   * and clearing the reference to it
-   */
-  closeActiveTooltip() {
-    if (this.activeCloser) {
-      this.activeCloser()
-      this.activeCloser = null
-    }
-  }
-}
-
-export const tooltipManager = new TooltipManager()
diff --git a/web/app/components/base/tooltip/__tests__/TooltipManager.spec.ts b/web/app/components/base/tooltip/__tests__/TooltipManager.spec.ts
deleted file mode 100644
index 406c48259a..0000000000
--- a/web/app/components/base/tooltip/__tests__/TooltipManager.spec.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-import { tooltipManager } from '../TooltipManager'
-
-describe('TooltipManager', () => {
-  // Test the singleton instance directly
-  let manager: typeof tooltipManager
-
-  beforeEach(() => {
-    // Get fresh reference to the singleton
-    manager = tooltipManager
-    // Clean up any active tooltip by calling closeActiveTooltip
-    // This ensures each test starts with a clean state
-    manager.closeActiveTooltip()
-  })
-
-  describe('register', () => {
-    it('should register a close function', () => {
-      const closeFn = vi.fn()
-      manager.register(closeFn)
-      expect(closeFn).not.toHaveBeenCalled()
-    })
-
-    it('should call the existing close function when registering a new one', () => {
-      const firstCloseFn = vi.fn()
-      const secondCloseFn = vi.fn()
-
-      manager.register(firstCloseFn)
-      manager.register(secondCloseFn)
-
-      expect(firstCloseFn).toHaveBeenCalledTimes(1)
-      expect(secondCloseFn).not.toHaveBeenCalled()
-    })
-
-    it('should replace the active closer with the new one', () => {
-      const firstCloseFn = vi.fn()
-      const secondCloseFn = vi.fn()
-
-      // Register first function
-      manager.register(firstCloseFn)
-
-      // Register second function - this should call firstCloseFn and replace it
-      manager.register(secondCloseFn)
-
-      // Verify firstCloseFn was called during register (replacement behavior)
-      expect(firstCloseFn).toHaveBeenCalledTimes(1)
-
-      // Now close the active tooltip - this should call secondCloseFn
-      manager.closeActiveTooltip()
-
-      // Verify secondCloseFn was called, not firstCloseFn
-      expect(secondCloseFn).toHaveBeenCalledTimes(1)
-    })
-  })
-
-  describe('clear', () => {
-    it('should not clear if the close function does not match', () => {
-      const closeFn = vi.fn()
-      const otherCloseFn = vi.fn()
-
-      manager.register(closeFn)
-      manager.clear(otherCloseFn)
-
-      manager.closeActiveTooltip()
-      expect(closeFn).toHaveBeenCalledTimes(1)
-    })
-
-    it('should clear the close function if it matches', () => {
-      const closeFn = vi.fn()
-
-      manager.register(closeFn)
-      manager.clear(closeFn)
-
-      manager.closeActiveTooltip()
-      expect(closeFn).not.toHaveBeenCalled()
-    })
-
-    it('should not call the close function when clearing', () => {
-      const closeFn = vi.fn()
-
-      manager.register(closeFn)
-      manager.clear(closeFn)
-
-      expect(closeFn).not.toHaveBeenCalled()
-    })
-  })
-
-  describe('closeActiveTooltip', () => {
-    it('should do nothing when no active closer is registered', () => {
-      expect(() => manager.closeActiveTooltip()).not.toThrow()
-    })
-
-    it('should call the active closer function', () => {
-      const closeFn = vi.fn()
-      manager.register(closeFn)
-
-      manager.closeActiveTooltip()
-
-      expect(closeFn).toHaveBeenCalledTimes(1)
-    })
-
-    it('should clear the active closer after calling it', () => {
-      const closeFn = vi.fn()
-      manager.register(closeFn)
-
-      manager.closeActiveTooltip()
-      manager.closeActiveTooltip()
-
-      expect(closeFn).toHaveBeenCalledTimes(1)
-    })
-
-    it('should handle multiple register and close cycles', () => {
-      const closeFn1 = vi.fn()
-      const closeFn2 = vi.fn()
-      const closeFn3 = vi.fn()
-
-      manager.register(closeFn1)
-      manager.closeActiveTooltip()
-
-      manager.register(closeFn2)
-      manager.closeActiveTooltip()
-
-      manager.register(closeFn3)
-      manager.closeActiveTooltip()
-
-      expect(closeFn1).toHaveBeenCalledTimes(1)
-      expect(closeFn2).toHaveBeenCalledTimes(1)
-      expect(closeFn3).toHaveBeenCalledTimes(1)
-    })
-  })
-})
diff --git a/web/app/components/base/tooltip/__tests__/content.spec.tsx b/web/app/components/base/tooltip/__tests__/content.spec.tsx
deleted file mode 100644
index fa5d86756e..0000000000
--- a/web/app/components/base/tooltip/__tests__/content.spec.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { render, screen } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
-import { describe, expect, it, vi } from 'vitest'
-import { ToolTipContent } from '../content'
-
-describe('ToolTipContent', () => {
-  it('should render children correctly', () => {
-    render(
-      <ToolTipContent>
-        <span>Tooltip body text</span>
-      </ToolTipContent>,
-    )
-    expect(screen.getByTestId('tooltip-content')).toBeInTheDocument()
-    expect(screen.getByTestId('tooltip-content-body')).toHaveTextContent('Tooltip body text')
-    expect(screen.queryByTestId('tooltip-content-title')).not.toBeInTheDocument()
-    expect(screen.queryByTestId('tooltip-content-action')).not.toBeInTheDocument()
-  })
-
-  it('should render title when provided', () => {
-    render(
-      <ToolTipContent title="Tooltip Title">
-        <span>Tooltip body text</span>
-      </ToolTipContent>,
-    )
-    expect(screen.getByTestId('tooltip-content-title')).toHaveTextContent('Tooltip Title')
-  })
-
-  it('should render action when provided', () => {
-    render(
-      <ToolTipContent action={<span>Action Text</span>}>
-        <span>Tooltip body text</span>
-      </ToolTipContent>,
-    )
-    expect(screen.getByTestId('tooltip-content-action')).toHaveTextContent('Action Text')
-  })
-
-  it('should handle action click', async () => {
-    const user = userEvent.setup()
-    const handleActionClick = vi.fn()
-    render(
-      <ToolTipContent action={<span onClick={handleActionClick}>Action Text</span>}>
-        <span>Tooltip body text</span>
-      </ToolTipContent>,
-    )
-
-    await user.click(screen.getByText('Action Text'))
-    expect(handleActionClick).toHaveBeenCalledTimes(1)
-  })
-})
diff --git a/web/app/components/base/tooltip/__tests__/index.spec.tsx b/web/app/components/base/tooltip/__tests__/index.spec.tsx
deleted file mode 100644
index 39f8f1b503..0000000000
--- a/web/app/components/base/tooltip/__tests__/index.spec.tsx
+++ /dev/null
@@ -1,333 +0,0 @@
-import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
-import * as React from 'react'
-import Tooltip from '../index'
-import { tooltipManager } from '../TooltipManager'
-
-afterEach(() => {
-  cleanup()
-  vi.clearAllTimers()
-  vi.useRealTimers()
-})
-
-describe('Tooltip', () => {
-  describe('Rendering', () => {
-    it('should render default tooltip with question icon', () => {
-      const triggerClassName = 'custom-trigger'
-      const { container } = render(<Tooltip popupContent="Tooltip content" triggerClassName={triggerClassName} />)
-      const trigger = container.querySelector(`.${triggerClassName}`)
-      expect(trigger).not.toBeNull()
-      expect(trigger?.querySelector('svg')).not.toBeNull() // question icon
-    })
-
-    it('should render with custom children', () => {
-      const { getByText } = render(
-        <Tooltip popupContent="Tooltip content">
-          <button>Hover me</button>
-        </Tooltip>,
-      )
-      expect(getByText('Hover me').textContent).toBe('Hover me')
-    })
-
-    it('should render correctly when asChild is false', () => {
-      const { container } = render(
-        <Tooltip popupContent="Tooltip" asChild={false} triggerClassName="custom-parent-trigger">
-          <span>Trigger</span>
-        </Tooltip>,
-      )
-      const trigger = container.querySelector('.custom-parent-trigger')
-      expect(trigger).not.toBeNull()
-    })
-
-    it('should render with a fallback question icon when children are null', () => {
-      const { container } = render(
-        <Tooltip popupContent="Tooltip" triggerClassName="custom-fallback-trigger">
-          {null}
-        </Tooltip>,
-      )
-      const trigger = container.querySelector('.custom-fallback-trigger')
-      expect(trigger).not.toBeNull()
-      expect(trigger?.querySelector('svg')).not.toBeNull()
-    })
-  })
-
-  describe('Disabled state', () => {
-    it('should not show tooltip when disabled', () => {
-      const triggerClassName = 'custom-trigger'
-      const { container } = render(<Tooltip popupContent="Tooltip content" disabled triggerClassName={triggerClassName} />)
-      const trigger = container.querySelector(`.${triggerClassName}`)
-      act(() => {
-        fireEvent.mouseEnter(trigger!)
-      })
-      expect(screen.queryByText('Tooltip content')).not.toBeInTheDocument()
-    })
-  })
-
-  describe('Trigger methods', () => {
-    beforeEach(() => {
-      vi.useFakeTimers()
-    })
-
-    it('should open on hover when triggerMethod is hover', () => {
-      const triggerClassName = 'custom-trigger'
-      const { container } = render(<Tooltip popupContent="Tooltip content" triggerClassName={triggerClassName} />)
-      const trigger = container.querySelector(`.${triggerClassName}`)
-      act(() => {
-        fireEvent.mouseEnter(trigger!)
-      })
-      expect(screen.queryByText('Tooltip content')).toBeInTheDocument()
-    })
-
-    it('should close on mouse leave when triggerMethod is hover and needsDelay is false', () => {
-      const triggerClassName = 'custom-trigger'
-      const { container } = render(<Tooltip popupContent="Tooltip content" triggerClassName={triggerClassName} needsDelay={false} />)
-      const trigger = container.querySelector(`.${triggerClassName}`)
-      act(() => {
-        fireEvent.mouseEnter(trigger!)
-        fireEvent.mouseLeave(trigger!)
-      })
-      expect(screen.queryByText('Tooltip content')).not.toBeInTheDocument()
-    })
-
-    it('should toggle on click when triggerMethod is click', () => {
-      const triggerClassName = 'custom-trigger'
-      const { container } = render(<Tooltip popupContent="Tooltip content" triggerMethod="click" triggerClassName={triggerClassName} />)
-      const trigger = container.querySelector(`.${triggerClassName}`)
-      act(() => {
-        fireEvent.click(trigger!)
-      })
-      expect(screen.queryByText('Tooltip content')).toBeInTheDocument()
-
-      // Test toggle off
-      act(() => {
-        fireEvent.click(trigger!)
-      })
-      expect(screen.queryByText('Tooltip content')).not.toBeInTheDocument()
-    })
-
-    it('should do nothing on mouse enter if triggerMethod is click', () => {
-      const triggerClassName = 'custom-trigger'
-      const { container } = render(<Tooltip popupContent="Tooltip content" triggerMethod="click" triggerClassName={triggerClassName} />)
-      const trigger = container.querySelector(`.${triggerClassName}`)
-      act(() => {
-        fireEvent.mouseEnter(trigger!)
-      })
-      expect(screen.queryByText('Tooltip content')).not.toBeInTheDocument()
-    })
-
-    it('should delay closing on mouse leave when needsDelay is true', () => {
-      const triggerClassName = 'custom-trigger'
-      const { container } = render(<Tooltip popupContent="Tooltip content" triggerMethod="hover" needsDelay triggerClassName={triggerClassName} />)
-      const trigger = container.querySelector(`.${triggerClassName}`)
-
-      act(() => {
-        fireEvent.mouseEnter(trigger!)
-      })
-      expect(screen.getByText('Tooltip content')).toBeInTheDocument()
-
-      act(() => {
-        fireEvent.mouseLeave(trigger!)
-      })
-      // Shouldn't close immediately
-      expect(screen.getByText('Tooltip content')).toBeInTheDocument()
-
-      act(() => {
-        vi.advanceTimersByTime(350)
-      })
-      // Should close after delay
-      expect(screen.queryByText('Tooltip content')).not.toBeInTheDocument()
-    })
-
-    it('should not close if mouse enters popup before delay finishes', () => {
-      const triggerClassName = 'custom-trigger'
-      const { container } = render(<Tooltip popupContent="Tooltip content" triggerMethod="hover" needsDelay triggerClassName={triggerClassName} />)
-      const trigger = container.querySelector(`.${triggerClassName}`)
-
-      act(() => {
-        fireEvent.mouseEnter(trigger!)
-      })
-
-      const popup = screen.getByText('Tooltip content')
-      expect(popup).toBeInTheDocument()
-
-      act(() => {
-        fireEvent.mouseLeave(trigger!)
-      })
-
-      act(() => {
-        vi.advanceTimersByTime(150)
-        // Simulate mouse entering popup area itself during the delay timeframe
-        fireEvent.mouseEnter(popup)
-      })
-
-      act(() => {
-        vi.advanceTimersByTime(200) // Complete the 300ms original delay
-      })
-
-      // Should still be open because we are hovering the popup
-      expect(screen.getByText('Tooltip content')).toBeInTheDocument()
-
-      // Now mouse leaves popup
-      act(() => {
-        fireEvent.mouseLeave(popup)
-      })
-
-      act(() => {
-        vi.advanceTimersByTime(350)
-      })
-      // Should now close
-      expect(screen.queryByText('Tooltip content')).not.toBeInTheDocument()
-    })
-
-    it('should do nothing on mouse enter/leave of popup when triggerMethod is not hover', () => {
-      const triggerClassName = 'custom-trigger'
-      const { container } = render(<Tooltip popupContent="Tooltip content" triggerMethod="click" needsDelay triggerClassName={triggerClassName} />)
-      const trigger = container.querySelector(`.${triggerClassName}`)
-
-      act(() => {
-        fireEvent.click(trigger!)
-      })
-
-      const popup = screen.getByText('Tooltip content')
-
-      act(() => {
-        fireEvent.mouseEnter(popup)
-        fireEvent.mouseLeave(popup)
-        vi.advanceTimersByTime(350)
-      })
-
-      // Should still be open because click method requires another click to close, not hover leave
-      expect(screen.getByText('Tooltip content')).toBeInTheDocument()
-    })
-
-    it('should clear close timeout if trigger is hovered again before delay finishes', () => {
-      const triggerClassName = 'custom-trigger'
-      const { container } = render(<Tooltip popupContent="Tooltip content" triggerMethod="hover" needsDelay triggerClassName={triggerClassName} />)
-      const trigger = container.querySelector(`.${triggerClassName}`)
-
-      act(() => {
-        fireEvent.mouseEnter(trigger!)
-      })
-      expect(screen.getByText('Tooltip content')).toBeInTheDocument()
-
-      act(() => {
-        fireEvent.mouseLeave(trigger!)
-      })
-
-      act(() => {
-        vi.advanceTimersByTime(150)
-        // Re-hover trigger before it closes
-        fireEvent.mouseEnter(trigger!)
-      })
-
-      act(() => {
-        vi.advanceTimersByTime(200) // Original 300ms would be up
-      })
-
-      // Should still be open because we reset it
-      expect(screen.getByText('Tooltip content')).toBeInTheDocument()
-    })
-
-    it('should test clear close timeout if trigger is hovered again before delay finishes and isHoverPopupRef is true', () => {
-      const triggerClassName = 'custom-trigger'
-      const { container } = render(<Tooltip popupContent="Tooltip content" triggerMethod="hover" needsDelay triggerClassName={triggerClassName} />)
-      const trigger = container.querySelector(`.${triggerClassName}`)
-
-      act(() => {
-        fireEvent.mouseEnter(trigger!)
-      })
-
-      const popup = screen.getByText('Tooltip content')
-      expect(popup).toBeInTheDocument()
-
-      act(() => {
-        fireEvent.mouseEnter(popup)
-        fireEvent.mouseLeave(trigger!)
-      })
-
-      act(() => {
-        vi.advanceTimersByTime(350)
-      })
-
-      // Should still be open because we are hovering the popup
-      expect(screen.getByText('Tooltip content')).toBeInTheDocument()
-    })
-  })
-
-  describe('TooltipManager', () => {
-    it('should close active tooltips when triggered centrally, overriding other closes', () => {
-      const triggerClassName1 = 'custom-trigger-1'
-      const triggerClassName2 = 'custom-trigger-2'
-
-      const { container } = render(
-        <div>
-          <Tooltip popupContent="Tooltip content 1" triggerMethod="hover" triggerClassName={triggerClassName1} />
-          <Tooltip popupContent="Tooltip content 2" triggerMethod="hover" triggerClassName={triggerClassName2} />
-        </div>,
-      )
-
-      const trigger1 = container.querySelector(`.${triggerClassName1}`)
-      const trigger2 = container.querySelector(`.${triggerClassName2}`)
-
-      expect(trigger2).not.toBeNull()
-
-      // Open first tooltip
-      act(() => {
-        fireEvent.mouseEnter(trigger1!)
-      })
-      expect(screen.queryByText('Tooltip content 1')).toBeInTheDocument()
-
-      // TooltipManager should keep track of it
-      // Next, immediately open the second one without leaving first (e.g., via TooltipManager)
-      // TooltipManager registers the newest one and closes the old one when doing full external operations, but internally the manager allows direct closing
-
-      act(() => {
-        tooltipManager.closeActiveTooltip()
-      })
-
-      expect(screen.queryByText('Tooltip content 1')).not.toBeInTheDocument()
-
-      // Safe to call again
-      expect(() => tooltipManager.closeActiveTooltip()).not.toThrow()
-    })
-  })
-
-  describe('Styling and positioning', () => {
-    it('should apply custom trigger className', () => {
-      const triggerClassName = 'custom-trigger'
-      const { container } = render(<Tooltip popupContent="Tooltip content" triggerClassName={triggerClassName} />)
-      const trigger = container.querySelector(`.${triggerClassName}`)
-      expect(trigger?.className).toContain('custom-trigger')
-    })
-
-    it('should pass triggerTestId to the fallback icon wrapper', () => {
-      render(<Tooltip popupContent="Tooltip content" triggerTestId="test-tooltip-icon" />)
-      expect(screen.getByTestId('test-tooltip-icon')).toBeInTheDocument()
-    })
-
-    it('should apply custom popup className', async () => {
-      const triggerClassName = 'custom-trigger'
-      const { container } = render(<Tooltip popupContent="Tooltip content" triggerClassName={triggerClassName} popupClassName="custom-popup" />)
-      const trigger = container.querySelector(`.${triggerClassName}`)
-      act(() => {
-        fireEvent.mouseEnter(trigger!)
-      })
-      expect((await screen.findByText('Tooltip content'))?.className).toContain('custom-popup')
-    })
-
-    it('should apply noDecoration when specified', async () => {
-      const triggerClassName = 'custom-trigger'
-      const { container } = render(
-        <Tooltip
-          popupContent="Tooltip content"
-          triggerClassName={triggerClassName}
-          noDecoration
-        />,
-      )
-      const trigger = container.querySelector(`.${triggerClassName}`)
-      act(() => {
-        fireEvent.mouseEnter(trigger!)
-      })
-      expect((await screen.findByText('Tooltip content'))?.className).not.toContain('bg-components-panel-bg')
-    })
-  })
-})
diff --git a/web/app/components/base/tooltip/content.tsx b/web/app/components/base/tooltip/content.tsx
deleted file mode 100644
index 191ee933f1..0000000000
--- a/web/app/components/base/tooltip/content.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import type { FC, PropsWithChildren, ReactNode } from 'react'
-
-type ToolTipContentProps = {
-  title?: ReactNode
-  action?: ReactNode
-} & PropsWithChildren
-
-export const ToolTipContent: FC<ToolTipContentProps> = ({
-  title,
-  action,
-  children,
-}) => {
-  return (
-    <div className="w-[180px]" data-testid="tooltip-content">
-      {!!title && (
-        <div className="mb-1.5 font-semibold text-text-secondary" data-testid="tooltip-content-title">{title}</div>
-      )}
-      <div className="mb-1.5 text-text-tertiary" data-testid="tooltip-content-body">{children}</div>
-      {!!action && <div className="cursor-pointer text-text-accent" data-testid="tooltip-content-action">{action}</div>}
-    </div>
-  )
-}
diff --git a/web/app/components/base/tooltip/index.stories.tsx b/web/app/components/base/tooltip/index.stories.tsx
deleted file mode 100644
index 69d0c5d2b6..0000000000
--- a/web/app/components/base/tooltip/index.stories.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import type { Meta, StoryObj } from '@storybook/nextjs-vite'
-import Tooltip from '.'
-
-const TooltipGrid = () => {
-  return (
-    <div className="flex w-full max-w-xl flex-col gap-6 rounded-2xl border border-divider-subtle bg-components-panel-bg p-6">
-      <div className="text-xs tracking-[0.18em] text-text-tertiary uppercase">Hover tooltips</div>
-      <div className="flex flex-wrap gap-4">
-        <Tooltip popupContent="Helpful hint explaining the setting.">
-          <button
-            type="button"
-            className="rounded-md border border-divider-subtle bg-background-default px-3 py-1 text-xs font-medium text-text-secondary hover:bg-state-base-hover"
-          >
-            Hover me
-          </button>
-        </Tooltip>
-        <Tooltip popupContent="Placement can vary." position="right">
-          <span className="rounded-md bg-background-default px-3 py-1 text-xs text-text-secondary">
-            Right tooltip
-          </span>
-        </Tooltip>
-      </div>
-      <div className="text-xs tracking-[0.18em] text-text-tertiary uppercase">Click tooltips</div>
-      <div className="flex flex-wrap gap-4">
-        <Tooltip popupContent="Click again to close." triggerMethod="click" position="bottom-start">
-          <button
-            type="button"
-            className="rounded-md border border-divider-subtle bg-background-default px-3 py-1 text-xs font-medium text-text-secondary hover:bg-state-base-hover"
-          >
-            Click trigger
-          </button>
-        </Tooltip>
-        <Tooltip popupContent="Decoration disabled" triggerMethod="click" noDecoration>
-          <span className="rounded-md border border-dashed border-divider-regular px-3 py-1 text-xs text-text-secondary">
-            Plain content
-          </span>
-        </Tooltip>
-      </div>
-    </div>
-  )
-}
-
-const meta = {
-  title: 'Base/Feedback/Tooltip',
-  component: TooltipGrid,
-  parameters: {
-    layout: 'centered',
-    docs: {
-      description: {
-        component: 'Portal-based tooltip component supporting hover and click triggers, custom placements, and decorated content.',
-      },
-    },
-  },
-  tags: ['autodocs'],
-} satisfies Meta<typeof TooltipGrid>
-
-export default meta
-type Story = StoryObj<typeof meta>
-
-export const Playground: Story = {}
diff --git a/web/app/components/base/tooltip/index.tsx b/web/app/components/base/tooltip/index.tsx
deleted file mode 100644
index 0bf7659635..0000000000
--- a/web/app/components/base/tooltip/index.tsx
+++ /dev/null
@@ -1,157 +0,0 @@
-'use client'
-/**
- * @deprecated Use `@langgenius/dify-ui/tooltip` instead.
- * This component will be removed after migration is complete.
- * See: https://github.com/langgenius/dify/issues/32767
- */
-import type { OffsetOptions, Placement } from '@floating-ui/react'
-import type { FC } from 'react'
-import { cn } from '@langgenius/dify-ui/cn'
-import { RiQuestionLine } from '@remixicon/react'
-import { useBoolean } from 'ahooks'
-import * as React from 'react'
-import { useCallback, useEffect, useRef, useState } from 'react'
-import { PortalToFollowElem, PortalToFollowElemContent, PortalToFollowElemTrigger } from '@/app/components/base/portal-to-follow-elem'
-import { tooltipManager } from './TooltipManager'
-
-type TooltipProps = {
-  position?: Placement
-  triggerMethod?: 'hover' | 'click'
-  triggerClassName?: string
-  triggerTestId?: string
-  disabled?: boolean
-  popupContent?: React.ReactNode
-  children?: React.ReactNode
-  popupClassName?: string
-  portalContentClassName?: string
-  noDecoration?: boolean
-  offset?: OffsetOptions
-  needsDelay?: boolean
-  asChild?: boolean
-}
-
-const Tooltip: FC<TooltipProps> = ({
-  position = 'top',
-  triggerMethod = 'hover',
-  triggerClassName,
-  triggerTestId,
-  disabled = false,
-  popupContent,
-  children,
-  popupClassName,
-  portalContentClassName,
-  noDecoration,
-  offset,
-  asChild = true,
-  needsDelay = true,
-}) => {
-  const [open, setOpen] = useState(false)
-  const [isHoverPopup, {
-    setTrue: setHoverPopup,
-    setFalse: setNotHoverPopup,
-  }] = useBoolean(false)
-
-  const isHoverPopupRef = useRef(isHoverPopup)
-  useEffect(() => {
-    isHoverPopupRef.current = isHoverPopup
-  }, [isHoverPopup])
-
-  const [isHoverTrigger, {
-    setTrue: setHoverTrigger,
-    setFalse: setNotHoverTrigger,
-  }] = useBoolean(false)
-
-  const isHoverTriggerRef = useRef(isHoverTrigger)
-  useEffect(() => {
-    isHoverTriggerRef.current = isHoverTrigger
-  }, [isHoverTrigger])
-
-  const closeTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null)
-  const clearCloseTimeout = useCallback(() => {
-    if (closeTimeoutRef.current) {
-      clearTimeout(closeTimeoutRef.current)
-      closeTimeoutRef.current = null
-    }
-  }, [])
-
-  useEffect(() => {
-    return () => {
-      clearCloseTimeout()
-    }
-  }, [clearCloseTimeout])
-
-  const close = () => setOpen(false)
-
-  const handleLeave = (isTrigger: boolean) => {
-    if (isTrigger)
-      setNotHoverTrigger()
-    else
-      setNotHoverPopup()
-
-    // give time to move to the popup
-    if (needsDelay) {
-      clearCloseTimeout()
-      closeTimeoutRef.current = setTimeout(() => {
-        closeTimeoutRef.current = null
-        if (!isHoverPopupRef.current && !isHoverTriggerRef.current) {
-          setOpen(false)
-          tooltipManager.clear(close)
-        }
-      }, 300)
-    }
-    else {
-      clearCloseTimeout()
-      setOpen(false)
-      tooltipManager.clear(close)
-    }
-  }
-
-  return (
-    <PortalToFollowElem
-      open={disabled ? false : open}
-      onOpenChange={setOpen}
-      placement={position}
-      offset={offset ?? 8}
-    >
-      <PortalToFollowElemTrigger
-        onClick={() => triggerMethod === 'click' && setOpen(v => !v)}
-        onMouseEnter={() => {
-          if (triggerMethod === 'hover') {
-            clearCloseTimeout()
-            setHoverTrigger()
-            tooltipManager.register(close)
-            setOpen(true)
-          }
-        }}
-        onMouseLeave={() => triggerMethod === 'hover' && handleLeave(true)}
-        asChild={asChild}
-        className={!asChild ? triggerClassName : ''}
-      >
-        {children || <div data-testid={triggerTestId} className={triggerClassName || 'h-3.5 w-3.5 shrink-0 p-px'}><RiQuestionLine className="h-full w-full text-text-quaternary hover:text-text-tertiary" /></div>}
-      </PortalToFollowElemTrigger>
-      <PortalToFollowElemContent
-        className={cn('z-9999', portalContentClassName || '')}
-      >
-        {!!popupContent && (
-          <div
-            className={cn(
-              !noDecoration && 'relative max-w-[300px] rounded-md bg-components-panel-bg px-3 py-2 text-left system-xs-regular wrap-break-word text-text-tertiary shadow-lg',
-              popupClassName,
-            )}
-            onMouseEnter={() => {
-              if (triggerMethod === 'hover') {
-                clearCloseTimeout()
-                setHoverPopup()
-              }
-            }}
-            onMouseLeave={() => triggerMethod === 'hover' && handleLeave(false)}
-          >
-            {popupContent}
-          </div>
-        )}
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
-  )
-}
-
-export default React.memo(Tooltip)
diff --git a/web/app/components/base/video-gallery/VideoPlayer.tsx b/web/app/components/base/video-gallery/VideoPlayer.tsx
index 889836258f..6f7304474a 100644
--- a/web/app/components/base/video-gallery/VideoPlayer.tsx
+++ b/web/app/components/base/video-gallery/VideoPlayer.tsx
@@ -1,5 +1,6 @@
 import * as React from 'react'
 import { useCallback, useEffect, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
 import styles from './VideoPlayer.module.css'
 
 type VideoPlayerProps = {
@@ -8,36 +9,37 @@ type VideoPlayerProps = {
 }
 
 const PlayIcon = () => (
-  <svg width="20" height="20" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <svg aria-hidden="true" width="20" height="20" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
     <path d="M8 5V19L19 12L8 5Z" fill="currentColor" />
   </svg>
 )
 
 const PauseIcon = () => (
-  <svg width="20" height="20" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <svg aria-hidden="true" width="20" height="20" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
     <path d="M6 19H10V5H6V19ZM14 5V19H18V5H14Z" fill="currentColor" />
   </svg>
 )
 
 const MuteIcon = () => (
-  <svg width="20" height="20" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <svg aria-hidden="true" width="20" height="20" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
     <path d="M3 9V15H7L12 20V4L7 9H3ZM16.5 12C16.5 10.23 15.48 8.71 14 7.97V16.02C15.48 15.29 16.5 13.77 16.5 12ZM14 3.23V5.29C16.89 6.15 19 8.83 19 12C19 15.17 16.89 17.85 14 18.71V20.77C18.01 19.86 21 16.28 21 12C21 7.72 18.01 4.14 14 3.23Z" fill="currentColor" />
   </svg>
 )
 
 const UnmuteIcon = () => (
-  <svg width="20" height="20" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <svg aria-hidden="true" width="20" height="20" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
     <path d="M4.34 2.93L2.93 4.34L7.29 8.7L7 9H3V15H7L12 20V13.41L16.18 17.59C15.69 17.96 15.16 18.27 14.58 18.5V20.58C15.94 20.22 17.15 19.56 18.13 18.67L19.66 20.2L21.07 18.79L4.34 2.93ZM10 15.17L7.83 13H5V11H7.83L10 8.83V15.17ZM19 12C19 12.82 18.85 13.61 18.59 14.34L20.12 15.87C20.68 14.7 21 13.39 21 12C21 7.72 18.01 4.14 14 3.23V5.29C16.89 6.15 19 8.83 19 12ZM12 4L10.12 5.88L12 7.76V4ZM16.5 12C16.5 10.23 15.48 8.71 14 7.97V10.18L16.45 12.63C16.48 12.43 16.5 12.22 16.5 12Z" fill="currentColor" />
   </svg>
 )
 
 const FullscreenIcon = () => (
-  <svg width="20" height="20" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <svg aria-hidden="true" width="20" height="20" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
     <path d="M7 14H5V19H10V17H7V14ZM5 10H7V7H10V5H5V10ZM17 17H14V19H19V14H17V17ZM14 5V7H17V10H19V5H14Z" fill="currentColor" />
   </svg>
 )
 
 const VideoPlayer: React.FC<VideoPlayerProps> = ({ src, srcs }) => {
+  const { t } = useTranslation()
   const [isPlaying, setIsPlaying] = useState(false)
   const [currentTime, setCurrentTime] = useState(0)
   const [duration, setDuration] = useState(0)
@@ -52,6 +54,9 @@ const VideoPlayer: React.FC<VideoPlayerProps> = ({ src, srcs }) => {
   const controlsTimeoutRef = useRef<NodeJS.Timeout | null>(null)
   const [isSmallSize, setIsSmallSize] = useState(false)
   const containerRef = useRef<HTMLDivElement>(null)
+  const playPauseLabel = t(isPlaying ? 'operation.pause' : 'operation.play', { ns: 'common' })
+  const toggleMuteLabel = t('operation.toggleMute', { ns: 'common' })
+  const toggleFullscreenLabel = t('operation.toggleFullscreen', { ns: 'common' })
 
   useEffect(() => {
     const video = videoRef.current
@@ -256,7 +261,7 @@ const VideoPlayer: React.FC<VideoPlayerProps> = ({ src, srcs }) => {
           </div>
           <div className={styles.controlsContent}>
             <div className={styles.leftControls}>
-              <button type="button" className={styles.playPauseButton} onClick={togglePlayPause} data-testid="video-play-pause-button">
+              <button type="button" aria-label={playPauseLabel} className={styles.playPauseButton} onClick={togglePlayPause}>
                 {isPlaying ? <PauseIcon /> : <PlayIcon />}
               </button>
               {!isSmallSize && (
@@ -270,7 +275,7 @@ const VideoPlayer: React.FC<VideoPlayerProps> = ({ src, srcs }) => {
               )}
             </div>
             <div className={styles.rightControls}>
-              <button type="button" className={styles.muteButton} onClick={toggleMute} data-testid="video-mute-button">
+              <button type="button" aria-label={toggleMuteLabel} className={styles.muteButton} onClick={toggleMute}>
                 {isMuted ? <UnmuteIcon /> : <MuteIcon />}
               </button>
               {!isSmallSize && (
@@ -295,7 +300,7 @@ const VideoPlayer: React.FC<VideoPlayerProps> = ({ src, srcs }) => {
                   </div>
                 </div>
               )}
-              <button type="button" className={styles.fullscreenButton} onClick={toggleFullscreen} data-testid="video-fullscreen-button">
+              <button type="button" aria-label={toggleFullscreenLabel} className={styles.fullscreenButton} onClick={toggleFullscreen}>
                 <FullscreenIcon />
               </button>
             </div>
diff --git a/web/app/components/base/video-gallery/__tests__/VideoPlayer.spec.tsx b/web/app/components/base/video-gallery/__tests__/VideoPlayer.spec.tsx
index 20a6298419..6a72170607 100644
--- a/web/app/components/base/video-gallery/__tests__/VideoPlayer.spec.tsx
+++ b/web/app/components/base/video-gallery/__tests__/VideoPlayer.spec.tsx
@@ -21,6 +21,11 @@ describe('VideoPlayer', () => {
     } as DOMRect)
   }
 
+  const getPlayButton = () => screen.getByRole('button', { name: 'common.operation.play' })
+  const getPauseButton = () => screen.getByRole('button', { name: 'common.operation.pause' })
+  const getMuteButton = () => screen.getByRole('button', { name: 'common.operation.toggleMute' })
+  const getFullscreenButton = () => screen.getByRole('button', { name: 'common.operation.toggleFullscreen' })
+
   beforeEach(() => {
     vi.clearAllMocks()
     vi.useRealTimers()
@@ -98,12 +103,12 @@ describe('VideoPlayer', () => {
     it('should toggle play/pause on button click', async () => {
       const user = userEvent.setup()
       render(<VideoPlayer src={mockSrc} />)
-      const playPauseBtn = screen.getByTestId('video-play-pause-button')
+      const playPauseBtn = getPlayButton()
 
       await user.click(playPauseBtn)
       expect(window.HTMLVideoElement.prototype.play).toHaveBeenCalled()
 
-      await user.click(playPauseBtn)
+      await user.click(getPauseButton())
       expect(window.HTMLVideoElement.prototype.pause).toHaveBeenCalled()
     })
 
@@ -111,7 +116,7 @@ describe('VideoPlayer', () => {
       const user = userEvent.setup()
       render(<VideoPlayer src={mockSrc} />)
       const video = screen.getByTestId('video-element') as HTMLVideoElement
-      const muteBtn = screen.getByTestId('video-mute-button')
+      const muteBtn = getMuteButton()
 
       // Ensure volume is positive before muting
       video.volume = 0.7
@@ -132,7 +137,7 @@ describe('VideoPlayer', () => {
     it('should toggle fullscreen on button click', async () => {
       const user = userEvent.setup()
       render(<VideoPlayer src={mockSrc} />)
-      const fullscreenBtn = screen.getByTestId('video-fullscreen-button')
+      const fullscreenBtn = getFullscreenButton()
 
       await user.click(fullscreenBtn)
       expect(window.HTMLVideoElement.prototype.requestFullscreen).toHaveBeenCalled()
@@ -166,12 +171,12 @@ describe('VideoPlayer', () => {
       const user = userEvent.setup()
       render(<VideoPlayer src={mockSrc} />)
       const video = screen.getByTestId('video-element')
-      const playPauseBtn = screen.getByTestId('video-play-pause-button')
+      const playPauseBtn = getPlayButton()
 
       await user.click(playPauseBtn)
       fireEvent(video, new Event('ended'))
 
-      expect(playPauseBtn)!.toBeInTheDocument()
+      expect(getPlayButton())!.toBeInTheDocument()
     })
 
     it('should show/hide controls on mouse move and timeout', () => {
@@ -273,7 +278,7 @@ describe('VideoPlayer', () => {
 
       try {
         render(<VideoPlayer src={mockSrc} />)
-        const playPauseBtn = screen.getByTestId('video-play-pause-button')
+        const playPauseBtn = getPlayButton()
 
         await user.click(playPauseBtn)
 
@@ -290,7 +295,7 @@ describe('VideoPlayer', () => {
       const user = userEvent.setup()
       render(<VideoPlayer src={mockSrc} />)
       const video = screen.getByTestId('video-element') as HTMLVideoElement
-      const muteBtn = screen.getByTestId('video-mute-button')
+      const muteBtn = getMuteButton()
 
       // First click mutes — this sets volume to 0 and muted to true
       await user.click(muteBtn)
diff --git a/web/app/components/billing/annotation-full/__tests__/modal.spec.tsx b/web/app/components/billing/annotation-full/__tests__/modal.spec.tsx
index 0033ced4ce..3f7862b24b 100644
--- a/web/app/components/billing/annotation-full/__tests__/modal.spec.tsx
+++ b/web/app/components/billing/annotation-full/__tests__/modal.spec.tsx
@@ -29,26 +29,26 @@ type ModalSnapshot = {
   className?: string
 }
 let mockModalProps: ModalSnapshot | null = null
-vi.mock('../../../base/modal', () => ({
-  default: ({ isShow, children, onClose, closable, className }: { isShow: boolean, children: React.ReactNode, onClose: () => void, closable?: boolean, className?: string }) => {
+let mockOnOpenChange: ((open: boolean) => void) | undefined
+vi.mock('@langgenius/dify-ui/dialog', () => ({
+  Dialog: ({ open, onOpenChange, children }: { open?: boolean, onOpenChange?: (open: boolean) => void, children: React.ReactNode }) => {
+    mockOnOpenChange = onOpenChange
+    mockModalProps = { isShow: open !== false }
+    return open === false ? null : <>{children}</>
+  },
+  DialogContent: ({ children, className }: { children: React.ReactNode, className?: string }) => {
     mockModalProps = {
-      isShow,
-      closable,
+      isShow: true,
+      closable: true,
       className,
     }
-    if (!isShow)
-      return null
     return (
       <div data-testid="annotation-full-modal" data-classname={className ?? ''}>
-        {closable && (
-          <button type="button" data-testid="mock-modal-close" onClick={onClose}>
-            close
-          </button>
-        )}
         {children}
       </div>
     )
   },
+  DialogCloseButton: () => <button type="button" data-testid="mock-modal-close" onClick={() => mockOnOpenChange?.(false)}>close</button>,
 }))
 
 describe('AnnotationFullModal', () => {
@@ -56,6 +56,7 @@ describe('AnnotationFullModal', () => {
     vi.clearAllMocks()
     mockUpgradeBtnProps = null
     mockModalProps = null
+    mockOnOpenChange = undefined
   })
 
   // Rendering marketing copy inside modal
@@ -71,8 +72,9 @@ describe('AnnotationFullModal', () => {
       expect(mockModalProps).toEqual(expect.objectContaining({
         isShow: true,
         closable: true,
-        className: 'p-0!',
+        className: expect.stringContaining('p-0!'),
       }))
+      expect(mockModalProps?.className).toContain('w-full')
     })
   })
 
diff --git a/web/app/components/billing/annotation-full/modal.tsx b/web/app/components/billing/annotation-full/modal.tsx
index 4308cad160..00f38734d1 100644
--- a/web/app/components/billing/annotation-full/modal.tsx
+++ b/web/app/components/billing/annotation-full/modal.tsx
@@ -1,10 +1,10 @@
 'use client'
 import type { FC } from 'react'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogCloseButton, DialogContent } from '@langgenius/dify-ui/dialog'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import GridMask from '@/app/components/base/grid-mask'
-import Modal from '../../base/modal'
 import UpgradeBtn from '../upgrade-btn'
 import s from './style.module.css'
 import Usage from './usage'
@@ -20,28 +20,33 @@ const AnnotationFullModal: FC<Props> = ({
   const { t } = useTranslation()
 
   return (
-    <Modal
-      isShow={show}
-      onClose={onHide}
-      closable
-      className="p-0!"
+    <Dialog
+      open={show}
+      onOpenChange={(open) => {
+        if (!open)
+          onHide()
+      }}
     >
-      <GridMask wrapperClassName="rounded-lg" canvasClassName="rounded-lg" gradientClassName="rounded-lg">
-        <div className="mt-6 flex cursor-pointer flex-col rounded-lg border-2 border-solid border-transparent px-7 py-6 shadow-md transition-all duration-200 ease-in-out">
-          <div className="flex items-center justify-between">
-            <div className={cn(s.textGradient, 'text-[18px] leading-[27px] font-semibold')}>
-              <div>{t('annotatedResponse.fullTipLine1', { ns: 'billing' })}</div>
-              <div>{t('annotatedResponse.fullTipLine2', { ns: 'billing' })}</div>
-            </div>
+      <DialogContent className="w-full overflow-hidden! border-none p-0! text-left align-middle">
+        <DialogCloseButton />
 
+        <GridMask wrapperClassName="rounded-lg" canvasClassName="rounded-lg" gradientClassName="rounded-lg">
+          <div className="mt-6 flex cursor-pointer flex-col rounded-lg border-2 border-solid border-transparent px-7 py-6 shadow-md transition-all duration-200 ease-in-out">
+            <div className="flex items-center justify-between">
+              <div className={cn(s.textGradient, 'text-[18px] leading-[27px] font-semibold')}>
+                <div>{t('annotatedResponse.fullTipLine1', { ns: 'billing' })}</div>
+                <div>{t('annotatedResponse.fullTipLine2', { ns: 'billing' })}</div>
+              </div>
+
+            </div>
+            <Usage className="mt-4" />
+            <div className="mt-7 flex justify-end">
+              <UpgradeBtn loc="annotation-create" />
+            </div>
           </div>
-          <Usage className="mt-4" />
-          <div className="mt-7 flex justify-end">
-            <UpgradeBtn loc="annotation-create" />
-          </div>
-        </div>
-      </GridMask>
-    </Modal>
+        </GridMask>
+      </DialogContent>
+    </Dialog>
   )
 }
 export default React.memo(AnnotationFullModal)
diff --git a/web/app/components/billing/header-billing-btn/index.tsx b/web/app/components/billing/header-billing-btn/index.tsx
index 4091dca4cb..a71c123622 100644
--- a/web/app/components/billing/header-billing-btn/index.tsx
+++ b/web/app/components/billing/header-billing-btn/index.tsx
@@ -48,8 +48,8 @@ const HeaderBillingBtn: FC<Props> = ({
     <div
       onClick={handleClick}
       className={cn(
+        'flex h-[22px] items-center rounded-md border border-divider-regular px-2 text-xs font-semibold uppercase',
         classNames,
-        'flex h-[22px] items-center rounded-md border px-2 text-xs font-semibold uppercase',
         isDisplayOnly ? 'cursor-default' : 'cursor-pointer',
       )}
     >
diff --git a/web/app/components/billing/hooks/use-education-discount.ts b/web/app/components/billing/hooks/use-education-discount.ts
new file mode 100644
index 0000000000..dedad4707e
--- /dev/null
+++ b/web/app/components/billing/hooks/use-education-discount.ts
@@ -0,0 +1,37 @@
+'use client'
+import { toast } from '@langgenius/dify-ui/toast'
+import { useCallback, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { useAppContext } from '@/context/app-context'
+import { fetchSubscriptionUrls } from '@/service/billing'
+import { Plan } from '../type'
+
+export const useEducationDiscount = () => {
+  const { t } = useTranslation()
+  const { isCurrentWorkspaceManager } = useAppContext()
+  const [isEducationDiscountLoading, setIsEducationDiscountLoading] = useState(false)
+
+  const handleEducationDiscount = useCallback(async () => {
+    if (isEducationDiscountLoading)
+      return
+
+    if (!isCurrentWorkspaceManager) {
+      toast.error(t('buyPermissionDeniedTip', { ns: 'billing' }))
+      return
+    }
+
+    setIsEducationDiscountLoading(true)
+    try {
+      const res = await fetchSubscriptionUrls(Plan.professional, 'year')
+      window.location.href = res.url
+    }
+    finally {
+      setIsEducationDiscountLoading(false)
+    }
+  }, [isCurrentWorkspaceManager, isEducationDiscountLoading, t])
+
+  return {
+    handleEducationDiscount,
+    isEducationDiscountLoading,
+  }
+}
diff --git a/web/app/components/billing/plan/__tests__/index.spec.tsx b/web/app/components/billing/plan/__tests__/index.spec.tsx
index 27f6b3005d..e9e0fd7012 100644
--- a/web/app/components/billing/plan/__tests__/index.spec.tsx
+++ b/web/app/components/billing/plan/__tests__/index.spec.tsx
@@ -1,11 +1,15 @@
 import { act, fireEvent, render, screen, waitFor } from '@testing-library/react'
 import { EDUCATION_VERIFYING_LOCALSTORAGE_ITEM } from '@/app/education-apply/constants'
+import { fetchSubscriptionUrls } from '@/service/billing'
 import { Plan, SelfHostedPlan } from '../../type'
 import PlanComp from '../index'
 
 let currentPath = '/billing'
 
 const push = vi.fn()
+let isCurrentWorkspaceManager = true
+let assignedHref = ''
+const originalLocation = window.location
 
 vi.mock('@/next/navigation', () => ({
   useRouter: () => ({ push }),
@@ -27,10 +31,16 @@ vi.mock('@/context/provider-context', () => ({
 vi.mock('@/context/app-context', () => ({
   useAppContext: () => ({
     userProfile: { email: 'user@example.com' },
-    isCurrentWorkspaceManager: true,
+    isCurrentWorkspaceManager,
   }),
 }))
 
+vi.mock('@/service/billing', () => ({
+  fetchSubscriptionUrls: vi.fn(),
+}))
+
+const fetchSubscriptionUrlsMock = vi.mocked(fetchSubscriptionUrls)
+
 const mutateAsyncMock = vi.fn()
 let isPending = false
 vi.mock('@/service/use-education', () => ({
@@ -78,10 +88,26 @@ describe('PlanComp', () => {
     },
   }
 
+  beforeAll(() => {
+    Object.defineProperty(window, 'location', {
+      configurable: true,
+      value: {
+        get href() {
+          return assignedHref
+        },
+        set href(value: string) {
+          assignedHref = value
+        },
+      } as unknown as Location,
+    })
+  })
+
   beforeEach(() => {
     vi.clearAllMocks()
     currentPath = '/billing'
     isPending = false
+    isCurrentWorkspaceManager = true
+    assignedHref = ''
     providerContextMock.mockReturnValue({
       plan: planMock,
       enableEducationPlan: true,
@@ -90,6 +116,14 @@ describe('PlanComp', () => {
     })
     mutateAsyncMock.mockReset()
     mutateAsyncMock.mockResolvedValue({ token: 'token' })
+    fetchSubscriptionUrlsMock.mockResolvedValue({ url: 'https://subscription.example' })
+  })
+
+  afterAll(() => {
+    Object.defineProperty(window, 'location', {
+      configurable: true,
+      value: originalLocation,
+    })
   })
 
   it('renders plan info and handles education verify success', async () => {
@@ -170,6 +204,49 @@ describe('PlanComp', () => {
     expect(screen.getByText('education.toVerified'))!.toBeInTheDocument()
   })
 
+  it('shows education discount button and keeps upgrade button for education accounts', async () => {
+    providerContextMock.mockReturnValue({
+      plan: { ...planMock, type: Plan.sandbox },
+      enableEducationPlan: true,
+      allowRefreshEducationVerify: false,
+      isEducationAccount: true,
+    })
+    render(<PlanComp loc="billing-page" />)
+
+    fireEvent.click(screen.getByText('education.useEducationDiscount'))
+
+    await waitFor(() => {
+      expect(fetchSubscriptionUrlsMock).toHaveBeenCalledWith(Plan.professional, 'year')
+      expect(assignedHref).toBe('https://subscription.example')
+    })
+    expect(screen.getByTestId('plan-upgrade-btn'))!.toBeInTheDocument()
+  })
+
+  it('does not show education discount button for non-sandbox education accounts', () => {
+    providerContextMock.mockReturnValue({
+      plan: planMock,
+      enableEducationPlan: true,
+      allowRefreshEducationVerify: false,
+      isEducationAccount: true,
+    })
+    render(<PlanComp loc="billing-page" />)
+
+    expect(screen.queryByText('education.useEducationDiscount')).not.toBeInTheDocument()
+  })
+
+  it('does not show education discount button for non-manager sandbox education accounts', () => {
+    isCurrentWorkspaceManager = false
+    providerContextMock.mockReturnValue({
+      plan: { ...planMock, type: Plan.sandbox },
+      enableEducationPlan: true,
+      allowRefreshEducationVerify: false,
+      isEducationAccount: true,
+    })
+    render(<PlanComp loc="billing-page" />)
+
+    expect(screen.queryByText('education.useEducationDiscount')).not.toBeInTheDocument()
+  })
+
   it('renders enterprise plan without upgrade button', () => {
     providerContextMock.mockReturnValue({
       plan: { ...planMock, type: SelfHostedPlan.enterprise },
diff --git a/web/app/components/billing/plan/index.tsx b/web/app/components/billing/plan/index.tsx
index 49d4ffa779..498736475c 100644
--- a/web/app/components/billing/plan/index.tsx
+++ b/web/app/components/billing/plan/index.tsx
@@ -23,6 +23,7 @@ import { useEducationVerify } from '@/service/use-education'
 import { getDaysUntilEndOfMonth } from '@/utils/time'
 import { Loading } from '../../base/icons/src/public/thought'
 import { NUM_INFINITE } from '../config'
+import { useEducationDiscount } from '../hooks/use-education-discount'
 import { Plan, SelfHostedPlan } from '../type'
 import UpgradeBtn from '../upgrade-btn'
 import AppsInfo from '../usage-info/apps-info'
@@ -39,12 +40,13 @@ const PlanComp: FC<Props> = ({
   const { t } = useTranslation()
   const router = useRouter()
   const path = usePathname()
-  const { userProfile } = useAppContext()
+  const { userProfile, isCurrentWorkspaceManager } = useAppContext()
   const { plan, enableEducationPlan, allowRefreshEducationVerify, isEducationAccount } = useProviderContext()
   const isAboutToExpire = allowRefreshEducationVerify
   const {
     type,
   } = plan
+  const isEnterprisePlan = String(type) === SelfHostedPlan.enterprise
 
   const {
     usage,
@@ -65,6 +67,7 @@ const PlanComp: FC<Props> = ({
   })()
 
   const [showModal, setShowModal] = React.useState(false)
+  const { handleEducationDiscount, isEducationDiscountLoading } = useEducationDiscount()
   const { mutateAsync, isPending } = useEducationVerify()
   const setShowAccountSettingModal = useModalContextSelector(s => s.setShowAccountSettingModal)
   const unmountedRef = useUnmountedRef()
@@ -97,7 +100,7 @@ const PlanComp: FC<Props> = ({
         {plan.type === Plan.team && (
           <Team />
         )}
-        {(plan.type as any) === SelfHostedPlan.enterprise && (
+        {isEnterprisePlan && (
           <Enterprise />
         )}
         <div className="mt-1 flex items-center">
@@ -115,7 +118,14 @@ const PlanComp: FC<Props> = ({
                 {isPending && <Loading className="ml-1 animate-spin-slow" />}
               </Button>
             )}
-            {(plan.type as any) !== SelfHostedPlan.enterprise && (
+            {enableEducationPlan && isEducationAccount && type === Plan.sandbox && isCurrentWorkspaceManager && (
+              <Button variant="ghost" onClick={handleEducationDiscount} disabled={isEducationDiscountLoading}>
+                <RiGraduationCapLine className="mr-1 h-4 w-4" />
+                {t('useEducationDiscount', { ns: 'education' })}
+                {isEducationDiscountLoading && <Loading className="ml-1 animate-spin-slow" />}
+              </Button>
+            )}
+            {!isEnterprisePlan && (
               <UpgradeBtn
                 className="shrink-0"
                 isPlain={type === Plan.team}
diff --git a/web/app/components/billing/pricing/__tests__/index.spec.tsx b/web/app/components/billing/pricing/__tests__/index.spec.tsx
index a8d0a4329e..264c80c5e7 100644
--- a/web/app/components/billing/pricing/__tests__/index.spec.tsx
+++ b/web/app/components/billing/pricing/__tests__/index.spec.tsx
@@ -60,6 +60,8 @@ describe('Pricing', () => {
         usage: buildUsage(),
         total: buildUsage(),
       },
+      enableEducationPlan: false,
+      isEducationAccount: false,
     })
     ;(useGetPricingPageLanguage as Mock).mockImplementation(() => mockLanguage)
   })
@@ -72,6 +74,39 @@ describe('Pricing', () => {
       expect(screen.getByText('billing.plansCommon.title.plans')).toBeInTheDocument()
       expect(screen.getByTestId('pricing-link')).toHaveAttribute('href', 'https://dify.ai/en/pricing#plans-and-features')
     })
+
+    it('should default to yearly billing for education accounts', () => {
+      ;(useProviderContext as Mock).mockReturnValue({
+        plan: {
+          type: Plan.sandbox,
+          usage: buildUsage(),
+          total: buildUsage(),
+        },
+        enableEducationPlan: true,
+        isEducationAccount: true,
+      })
+
+      render(<Pricing onCancel={vi.fn()} />)
+
+      expect(screen.getByRole('switch')).toBeChecked()
+    })
+
+    it('should not default to yearly billing for non-manager education accounts', () => {
+      ;(useAppContext as Mock).mockReturnValue({ isCurrentWorkspaceManager: false })
+      ;(useProviderContext as Mock).mockReturnValue({
+        plan: {
+          type: Plan.sandbox,
+          usage: buildUsage(),
+          total: buildUsage(),
+        },
+        enableEducationPlan: true,
+        isEducationAccount: true,
+      })
+
+      render(<Pricing onCancel={vi.fn()} />)
+
+      expect(screen.getByRole('switch')).not.toBeChecked()
+    })
   })
 
   describe('Props', () => {
diff --git a/web/app/components/billing/pricing/index.tsx b/web/app/components/billing/pricing/index.tsx
index cd88be5fb3..6d9b0f67cf 100644
--- a/web/app/components/billing/pricing/index.tsx
+++ b/web/app/components/billing/pricing/index.tsx
@@ -39,9 +39,11 @@ const pricingScrollAreaClassNames = {
 const Pricing: FC<PricingProps> = ({
   onCancel,
 }) => {
-  const { plan } = useProviderContext()
+  const { plan, enableEducationPlan, isEducationAccount } = useProviderContext()
   const { isCurrentWorkspaceManager } = useAppContext()
-  const [planRange, setPlanRange] = React.useState<PlanRange>(PlanRange.monthly)
+  const shouldDefaultToYearly = isCurrentWorkspaceManager && enableEducationPlan && isEducationAccount
+  const [selectedPlanRange, setSelectedPlanRange] = React.useState<PlanRange>()
+  const planRange = selectedPlanRange ?? (shouldDefaultToYearly ? PlanRange.yearly : PlanRange.monthly)
   const [currentCategory, setCurrentCategory] = useState<Category>(CategoryEnum.CLOUD)
   const canPay = isCurrentWorkspaceManager
 
@@ -73,7 +75,7 @@ const Pricing: FC<PricingProps> = ({
                   currentCategory={currentCategory}
                   onChangeCategory={setCurrentCategory}
                   currentPlanRange={planRange}
-                  onChangePlanRange={setPlanRange}
+                  onChangePlanRange={setSelectedPlanRange}
                 />
                 <Plans
                   plan={plan}
diff --git a/web/app/components/billing/pricing/plans/cloud-plan-item/__tests__/index.spec.tsx b/web/app/components/billing/pricing/plans/cloud-plan-item/__tests__/index.spec.tsx
index cb83fdc366..65c710e37e 100644
--- a/web/app/components/billing/pricing/plans/cloud-plan-item/__tests__/index.spec.tsx
+++ b/web/app/components/billing/pricing/plans/cloud-plan-item/__tests__/index.spec.tsx
@@ -3,6 +3,7 @@ import { toast, ToastHost } from '@langgenius/dify-ui/toast'
 import { fireEvent, render, screen, waitFor } from '@testing-library/react'
 import * as React from 'react'
 import { useAppContext } from '@/context/app-context'
+import { useProviderContext } from '@/context/provider-context'
 import { useAsyncWindowOpen } from '@/hooks/use-async-window-open'
 import { fetchSubscriptionUrls } from '@/service/billing'
 import { consoleClient } from '@/service/client'
@@ -15,6 +16,10 @@ vi.mock('@/context/app-context', () => ({
   useAppContext: vi.fn(),
 }))
 
+vi.mock('@/context/provider-context', () => ({
+  useProviderContext: vi.fn(),
+}))
+
 vi.mock('@/service/billing', () => ({
   fetchSubscriptionUrls: vi.fn(),
 }))
@@ -38,6 +43,7 @@ vi.mock('../../../assets', () => ({
 }))
 
 const mockUseAppContext = useAppContext as Mock
+const mockUseProviderContext = useProviderContext as Mock
 const mockUseAsyncWindowOpen = useAsyncWindowOpen as Mock
 const mockBillingInvoices = consoleClient.billing.invoices as Mock
 const mockFetchSubscriptionUrls = fetchSubscriptionUrls as Mock
@@ -72,6 +78,10 @@ beforeEach(() => {
   vi.clearAllMocks()
   toast.dismiss()
   mockUseAppContext.mockReturnValue({ isCurrentWorkspaceManager: true })
+  mockUseProviderContext.mockReturnValue({
+    enableEducationPlan: false,
+    isEducationAccount: false,
+  })
   mockUseAsyncWindowOpen.mockReturnValue(vi.fn(async open => await open()))
   mockBillingInvoices.mockResolvedValue({ url: 'https://billing.example' })
   mockFetchSubscriptionUrls.mockResolvedValue({ url: 'https://subscription.example' })
@@ -231,7 +241,7 @@ describe('CloudPlanItem', () => {
       )
 
       // Sandbox viewed from a higher plan is disabled, but let's verify no API calls
-      const button = screen.getByRole('button')
+      const button = screen.getByRole('button', { name: 'billing.plansCommon.startForFree' })
       fireEvent.click(button)
 
       await waitFor(() => {
@@ -260,6 +270,152 @@ describe('CloudPlanItem', () => {
       })
     })
 
+    it('should use education discount checkout for yearly professional plan when education account is active', async () => {
+      mockUseProviderContext.mockReturnValue({
+        enableEducationPlan: true,
+        isEducationAccount: true,
+      })
+
+      render(
+        <CloudPlanItem
+          plan={Plan.professional}
+          currentPlan={Plan.sandbox}
+          planRange={PlanRange.yearly}
+          canPay
+        />,
+      )
+
+      fireEvent.click(screen.getByRole('button', { name: 'education.useEducationDiscount' }))
+
+      await waitFor(() => {
+        expect(mockFetchSubscriptionUrls).toHaveBeenCalledWith(Plan.professional, 'year')
+        expect(assignedHref).toBe('https://subscription.example')
+      })
+    })
+
+    it('should show default CTA and hide warning when current user is not workspace manager', () => {
+      mockUseAppContext.mockReturnValue({ isCurrentWorkspaceManager: false })
+      mockUseProviderContext.mockReturnValue({
+        enableEducationPlan: true,
+        isEducationAccount: true,
+      })
+
+      render(
+        <CloudPlanItem
+          plan={Plan.professional}
+          currentPlan={Plan.sandbox}
+          planRange={PlanRange.yearly}
+          canPay={false}
+        />,
+      )
+
+      expect(screen.getByRole('button', { name: 'billing.plansCommon.startBuilding' }))!.toBeInTheDocument()
+      expect(screen.queryByRole('button', { name: 'education.useEducationDiscount' })).not.toBeInTheDocument()
+      expect(screen.queryByText('education.planNotSupportEducationDiscount')).not.toBeInTheDocument()
+    })
+
+    it('should hide education unsupported warning when current user is not workspace manager', () => {
+      mockUseAppContext.mockReturnValue({ isCurrentWorkspaceManager: false })
+      mockUseProviderContext.mockReturnValue({
+        enableEducationPlan: true,
+        isEducationAccount: true,
+      })
+
+      render(
+        <CloudPlanItem
+          plan={Plan.professional}
+          currentPlan={Plan.sandbox}
+          planRange={PlanRange.monthly}
+          canPay={false}
+        />,
+      )
+
+      expect(screen.getByRole('button', { name: 'billing.plansCommon.startBuilding' }))!.toBeInTheDocument()
+      expect(screen.queryByText('education.planNotSupportEducationDiscount')).not.toBeInTheDocument()
+    })
+
+    it('should show education unsupported warning and switch checkout to professional annual', async () => {
+      mockUseProviderContext.mockReturnValue({
+        enableEducationPlan: true,
+        isEducationAccount: true,
+      })
+
+      render(
+        <CloudPlanItem
+          plan={Plan.professional}
+          currentPlan={Plan.sandbox}
+          planRange={PlanRange.monthly}
+          canPay
+        />,
+      )
+
+      const button = screen.getByRole('button', { name: 'billing.plansCommon.startBuilding' })
+      expect(button)!.not.toBeDisabled()
+      expect(screen.getByText('education.planNotSupportEducationDiscount'))!.toBeInTheDocument()
+
+      fireEvent.click(button)
+      expect(screen.getByText('education.educationPricingConfirm.title'))!.toBeInTheDocument()
+      expect(screen.getByText('education.educationPricingConfirm.description'))!.toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'common.operation.close' }))!.toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'education.educationPricingConfirm.cancel' }))!.toBeInTheDocument()
+      fireEvent.click(screen.getByRole('button', { name: 'education.educationPricingConfirm.continue' }))
+
+      await waitFor(() => {
+        expect(mockFetchSubscriptionUrls).toHaveBeenCalledWith(Plan.professional, 'year')
+        expect(assignedHref).toBe('https://subscription.example')
+      })
+    })
+
+    it('should continue selected plan checkout when keeping current plan', async () => {
+      mockUseProviderContext.mockReturnValue({
+        enableEducationPlan: true,
+        isEducationAccount: true,
+      })
+
+      render(
+        <CloudPlanItem
+          plan={Plan.team}
+          currentPlan={Plan.sandbox}
+          planRange={PlanRange.yearly}
+          canPay
+        />,
+      )
+
+      fireEvent.click(screen.getByRole('button', { name: 'billing.plansCommon.getStarted' }))
+      fireEvent.click(screen.getByRole('button', { name: 'education.educationPricingConfirm.cancel' }))
+
+      await waitFor(() => {
+        expect(screen.queryByText('education.educationPricingConfirm.title'))!.not.toBeInTheDocument()
+        expect(mockFetchSubscriptionUrls).toHaveBeenCalledWith(Plan.team, 'year')
+        expect(assignedHref).toBe('https://subscription.example')
+      })
+    })
+
+    it('should close the unsupported plan confirm without checkout when using the close button', async () => {
+      mockUseProviderContext.mockReturnValue({
+        enableEducationPlan: true,
+        isEducationAccount: true,
+      })
+
+      render(
+        <CloudPlanItem
+          plan={Plan.team}
+          currentPlan={Plan.sandbox}
+          planRange={PlanRange.yearly}
+          canPay
+        />,
+      )
+
+      fireEvent.click(screen.getByRole('button', { name: 'billing.plansCommon.getStarted' }))
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.close' }))
+
+      await waitFor(() => {
+        expect(screen.queryByText('education.educationPricingConfirm.title'))!.not.toBeInTheDocument()
+      })
+      expect(mockFetchSubscriptionUrls).not.toHaveBeenCalled()
+      expect(assignedHref).toBe('')
+    })
+
     // Covers L62-63: loading guard prevents double click
     it('should ignore second click while loading', async () => {
       // Make the first fetch hang until we resolve it
diff --git a/web/app/components/billing/pricing/plans/cloud-plan-item/button.tsx b/web/app/components/billing/pricing/plans/cloud-plan-item/button.tsx
index 8115646748..5e3f1cab0d 100644
--- a/web/app/components/billing/pricing/plans/cloud-plan-item/button.tsx
+++ b/web/app/components/billing/pricing/plans/cloud-plan-item/button.tsx
@@ -1,6 +1,5 @@
 import type { BasicPlan } from '../../../type'
 import { cn } from '@langgenius/dify-ui/cn'
-import { RiArrowRightLine } from '@remixicon/react'
 import * as React from 'react'
 import { Plan } from '../../../type'
 
@@ -24,6 +23,7 @@ type ButtonProps = {
   isPlanDisabled: boolean
   btnText: string
   handleGetPayUrl: () => void
+  warningText?: string
 }
 
 const Button = ({
@@ -31,22 +31,30 @@ const Button = ({
   isPlanDisabled,
   btnText,
   handleGetPayUrl,
+  warningText,
 }: ButtonProps) => {
   return (
-    <button
-      type="button"
-      disabled={isPlanDisabled}
-      className={cn(
-        'flex items-center gap-x-2 py-3 pr-4 pl-5 system-xl-semibold',
-        BUTTON_CLASSNAME[plan].btnClassname,
-        isPlanDisabled && BUTTON_CLASSNAME[plan].btnDisabledClassname,
-        isPlanDisabled && 'cursor-not-allowed',
+    <div className="relative">
+      <button
+        type="button"
+        disabled={isPlanDisabled}
+        className={cn(
+          'flex w-full items-center gap-x-2 py-3 pr-4 pl-5 system-xl-semibold',
+          BUTTON_CLASSNAME[plan].btnClassname,
+          isPlanDisabled && BUTTON_CLASSNAME[plan].btnDisabledClassname,
+          isPlanDisabled && 'cursor-not-allowed',
+        )}
+        onClick={handleGetPayUrl}
+      >
+        <span className="grow text-start">{btnText}</span>
+        {!isPlanDisabled && <span className="i-ri-arrow-right-line size-5 shrink-0" />}
+      </button>
+      {warningText && (
+        <div className="absolute top-full right-0 left-0 mt-1.5 text-left system-2xs-medium text-text-tertiary">
+          {warningText}
+        </div>
       )}
-      onClick={handleGetPayUrl}
-    >
-      <span className="grow text-start">{btnText}</span>
-      {!isPlanDisabled && <RiArrowRightLine className="size-5 shrink-0" />}
-    </button>
+    </div>
   )
 }
 
diff --git a/web/app/components/billing/pricing/plans/cloud-plan-item/index.tsx b/web/app/components/billing/pricing/plans/cloud-plan-item/index.tsx
index 53d5025f08..9dfc145303 100644
--- a/web/app/components/billing/pricing/plans/cloud-plan-item/index.tsx
+++ b/web/app/components/billing/pricing/plans/cloud-plan-item/index.tsx
@@ -1,19 +1,29 @@
 'use client'
 import type { FC } from 'react'
 import type { BasicPlan } from '../../../type'
+import { Button } from '@langgenius/dify-ui/button'
+import {
+  Dialog,
+  DialogCloseButton,
+  DialogContent,
+  DialogDescription,
+  DialogTitle,
+} from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
 import * as React from 'react'
 import { useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useAppContext } from '@/context/app-context'
+import { useProviderContext } from '@/context/provider-context'
 import { useAsyncWindowOpen } from '@/hooks/use-async-window-open'
 import { fetchSubscriptionUrls } from '@/service/billing'
 import { consoleClient } from '@/service/client'
 import { ALL_PLANS } from '../../../config'
+import { useEducationDiscount } from '../../../hooks/use-education-discount'
 import { Plan } from '../../../type'
 import { Professional, Sandbox, Team } from '../../assets'
 import { PlanRange } from '../../plan-switcher/plan-range-switcher'
-import Button from './button'
+import PlanButton from './button'
 import List from './list'
 
 const ICON_MAP = {
@@ -33,6 +43,7 @@ const CloudPlanItem: FC<CloudPlanItemProps> = ({
   plan,
   currentPlan,
   planRange,
+  canPay,
 }) => {
   const { t } = useTranslation()
   const [loading, setLoading] = React.useState(false)
@@ -45,9 +56,20 @@ const CloudPlanItem: FC<CloudPlanItemProps> = ({
   const isCurrentPaidPlan = isCurrent && !isFreePlan
   const isPlanDisabled = isCurrentPaidPlan ? false : planInfo.level <= ALL_PLANS[currentPlan].level
   const { isCurrentWorkspaceManager } = useAppContext()
+  const { enableEducationPlan, isEducationAccount } = useProviderContext()
+  const isEducationDiscountMode = enableEducationPlan && isEducationAccount
+  const isEducationDiscountSupportedPlan = plan === Plan.professional && isYear
+  const educationDiscountWarningText = canPay && isEducationDiscountMode && !isFreePlan && !isEducationDiscountSupportedPlan
+    ? t('planNotSupportEducationDiscount', { ns: 'education' })
+    : undefined
   const openAsyncWindow = useAsyncWindowOpen()
+  const { handleEducationDiscount, isEducationDiscountLoading } = useEducationDiscount()
+  const [showEducationPricingConfirm, setShowEducationPricingConfirm] = React.useState(false)
 
   const btnText = useMemo(() => {
+    if (canPay && isEducationDiscountMode && isEducationDiscountSupportedPlan && !isCurrent)
+      return t('useEducationDiscount', { ns: 'education' })
+
     if (isCurrent)
       return t('plansCommon.currentPlan', { ns: 'billing' })
 
@@ -56,15 +78,20 @@ const CloudPlanItem: FC<CloudPlanItemProps> = ({
       [Plan.professional]: t('plansCommon.startBuilding', { ns: 'billing' }),
       [Plan.team]: t('plansCommon.getStarted', { ns: 'billing' }),
     })[plan]
-  }, [isCurrent, plan, t])
+  }, [canPay, isCurrent, isEducationDiscountMode, isEducationDiscountSupportedPlan, plan, t])
 
-  const handleGetPayUrl = async () => {
-    if (loading)
+  const handlePayCurrentPlan = async () => {
+    if (loading || isEducationDiscountLoading)
       return
 
     if (isPlanDisabled)
       return
 
+    if (isEducationDiscountMode && isEducationDiscountSupportedPlan && !isCurrentPaidPlan) {
+      await handleEducationDiscount()
+      return
+    }
+
     if (!isCurrentWorkspaceManager) {
       toast.error(t('buyPermissionDeniedTip', { ns: 'billing' }))
       return
@@ -96,12 +123,27 @@ const CloudPlanItem: FC<CloudPlanItemProps> = ({
       setLoading(false)
     }
   }
+  const handleGetPayUrl = async () => {
+    if (educationDiscountWarningText && !isPlanDisabled) {
+      setShowEducationPricingConfirm(true)
+      return
+    }
+
+    await handlePayCurrentPlan()
+  }
+  const handleSwitchToProfessionalAnnual = async () => {
+    await handleEducationDiscount()
+  }
+  const handleKeepCurrentPlan = async () => {
+    await handlePayCurrentPlan()
+    setShowEducationPricingConfirm(false)
+  }
   return (
     <div className="flex min-w-0 flex-1 flex-col pb-3">
       <div className="flex flex-col px-5 py-4">
         <div className="flex flex-col gap-y-6 px-1 pt-10">
           {ICON_MAP[plan]}
-          <div className="flex min-h-[104px] flex-col gap-y-2">
+          <div className="flex min-h-26 flex-col gap-y-2">
             <div className="flex items-center gap-x-2.5">
               <div className="text-[30px] leading-[1.2] font-medium text-text-primary">{t(`${i18nPrefix}.name`, { ns: 'billing' })}</div>
               {
@@ -141,14 +183,58 @@ const CloudPlanItem: FC<CloudPlanItemProps> = ({
             </>
           )}
         </div>
-        <Button
+        <PlanButton
           plan={plan}
           isPlanDisabled={isPlanDisabled}
           btnText={btnText}
           handleGetPayUrl={handleGetPayUrl}
+          warningText={educationDiscountWarningText}
         />
       </div>
       <List plan={plan} />
+      <Dialog
+        open={showEducationPricingConfirm}
+        onOpenChange={setShowEducationPricingConfirm}
+      >
+        <DialogContent
+          backdropProps={{ forceRender: true }}
+          className="w-[520px]"
+        >
+          <DialogCloseButton
+            aria-label={t('operation.close', { ns: 'common' })}
+            className="top-6 right-6"
+          />
+          <div className="flex flex-col gap-2 pr-10">
+            <DialogTitle className="w-full title-2xl-semi-bold text-text-primary">
+              {t('educationPricingConfirm.title', { ns: 'education' })}
+            </DialogTitle>
+            <DialogDescription className="w-full system-md-regular text-text-tertiary">
+              {t('educationPricingConfirm.description', { ns: 'education' })}
+            </DialogDescription>
+          </div>
+          <div className="mt-10 flex items-start justify-end gap-3">
+            <Button
+              size="large"
+              onClick={handleKeepCurrentPlan}
+              disabled={loading || isEducationDiscountLoading}
+              loading={loading}
+              className="min-w-38"
+            >
+              {t('educationPricingConfirm.cancel', { ns: 'education' })}
+            </Button>
+            <Button
+              variant="primary"
+              size="large"
+              onClick={handleSwitchToProfessionalAnnual}
+              disabled={isEducationDiscountLoading}
+              loading={isEducationDiscountLoading}
+              className="min-w-61"
+            >
+              {t('educationPricingConfirm.continue', { ns: 'education' })}
+            </Button>
+          </div>
+        </DialogContent>
+      </Dialog>
     </div>
   )
 }
diff --git a/web/app/components/billing/pricing/plans/cloud-plan-item/list/__tests__/index.spec.tsx b/web/app/components/billing/pricing/plans/cloud-plan-item/list/__tests__/index.spec.tsx
index 5a06509355..e6a0d78273 100644
--- a/web/app/components/billing/pricing/plans/cloud-plan-item/list/__tests__/index.spec.tsx
+++ b/web/app/components/billing/pricing/plans/cloud-plan-item/list/__tests__/index.spec.tsx
@@ -1,4 +1,5 @@
 import { render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
 import * as React from 'react'
 import { Plan } from '../../../../../type'
 import List from '../index'
@@ -12,11 +13,13 @@ describe('CloudPlanItem/List', () => {
     expect(screen.getByText('billing.plansCommon.startNodes.limited:{"count":2}')).toBeInTheDocument()
   })
 
-  it('should show professional monthly quotas and tooltips', () => {
+  it('should show professional monthly quotas and tooltips', async () => {
+    const user = userEvent.setup()
     render(<List plan={Plan.professional} />)
 
     expect(screen.getByText('billing.plansCommon.messageRequest.titlePerMonth:{"count":5000}')).toBeInTheDocument()
-    expect(screen.getByText('billing.plansCommon.vectorSpaceTooltip')).toBeInTheDocument()
+    await user.hover(screen.getByRole('button', { name: 'billing.plansCommon.vectorSpaceTooltip' }))
+    expect(await screen.findByText('billing.plansCommon.vectorSpaceTooltip')).toBeInTheDocument()
     expect(screen.getByText('billing.plansCommon.workflowExecution.faster')).toBeInTheDocument()
   })
 
diff --git a/web/app/components/billing/pricing/plans/cloud-plan-item/list/item/__tests__/index.spec.tsx b/web/app/components/billing/pricing/plans/cloud-plan-item/list/item/__tests__/index.spec.tsx
index e1aada80f8..f75b334fd9 100644
--- a/web/app/components/billing/pricing/plans/cloud-plan-item/list/item/__tests__/index.spec.tsx
+++ b/web/app/components/billing/pricing/plans/cloud-plan-item/list/item/__tests__/index.spec.tsx
@@ -1,4 +1,5 @@
 import { render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
 import Item from '../index'
 
 describe('Item', () => {
@@ -20,14 +21,16 @@ describe('Item', () => {
 
   // Toggling the optional tooltip indicator
   describe('Tooltip behavior', () => {
-    it('should render tooltip content when tooltip text is provided', () => {
+    it('should render tooltip content when tooltip text is provided', async () => {
+      const user = userEvent.setup()
       const label = 'Workspace seats'
       const tooltip = 'Seats define how many teammates can join the workspace.'
 
       const { container } = render(<Item label={label} tooltip={tooltip} />)
 
       expect(screen.getByText(label)).toBeInTheDocument()
-      expect(screen.getByText(tooltip)).toBeInTheDocument()
+      await user.hover(screen.getByRole('button', { name: tooltip }))
+      expect(await screen.findByText(tooltip)).toBeInTheDocument()
       expect(container.querySelector('.group')).not.toBeNull()
     })
 
diff --git a/web/app/components/billing/pricing/plans/cloud-plan-item/list/item/__tests__/tooltip.spec.tsx b/web/app/components/billing/pricing/plans/cloud-plan-item/list/item/__tests__/tooltip.spec.tsx
index 86e4cb1061..c744fdb60e 100644
--- a/web/app/components/billing/pricing/plans/cloud-plan-item/list/item/__tests__/tooltip.spec.tsx
+++ b/web/app/components/billing/pricing/plans/cloud-plan-item/list/item/__tests__/tooltip.spec.tsx
@@ -1,4 +1,5 @@
 import { render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
 import Tooltip from '../tooltip'
 
 describe('Tooltip', () => {
@@ -8,12 +9,14 @@ describe('Tooltip', () => {
 
   // Rendering the info tooltip container
   describe('Rendering', () => {
-    it('should render the content panel when provide with text', () => {
+    it('should render the content panel when hovered', async () => {
+      const user = userEvent.setup()
       const content = 'Usage resets on the first day of every month.'
 
       render(<Tooltip content={content} />)
+      await user.hover(screen.getByRole('button', { name: content }))
 
-      expect(() => screen.getByText(content)).not.toThrow()
+      expect(await screen.findByText(content)).toBeInTheDocument()
     })
   })
 
diff --git a/web/app/components/billing/pricing/plans/cloud-plan-item/list/item/tooltip.tsx b/web/app/components/billing/pricing/plans/cloud-plan-item/list/item/tooltip.tsx
index fe6aa9c2cb..be53ef6b1b 100644
--- a/web/app/components/billing/pricing/plans/cloud-plan-item/list/item/tooltip.tsx
+++ b/web/app/components/billing/pricing/plans/cloud-plan-item/list/item/tooltip.tsx
@@ -1,3 +1,4 @@
+import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
 import { RiInfoI } from '@remixicon/react'
 import * as React from 'react'
 
@@ -11,14 +12,20 @@ const Tooltip = ({
   if (!content)
     return null
   return (
-    <div className="group relative z-10 size-[18px] overflow-visible">
-      <div className="absolute right-0 bottom-0 -z-10 hidden w-[260px] bg-saas-dify-blue-static px-5 py-[18px] system-xs-regular text-text-primary-on-surface group-hover:block">
-        {content}
-      </div>
-      <div className="flex h-full w-full items-center justify-center rounded-sm bg-state-base-hover transition-all duration-500 ease-in-out group-hover:rounded-none group-hover:bg-saas-dify-blue-static">
+    <Popover>
+      <PopoverTrigger
+        openOnHover
+        delay={0}
+        closeDelay={0}
+        aria-label={content}
+        className="group relative z-10 flex size-[18px] items-center justify-center rounded-sm border-0 bg-state-base-hover p-0 transition-[border-radius,background-color] duration-500 ease-in-out hover:rounded-none hover:bg-saas-dify-blue-static"
+      >
         <RiInfoI className="size-3.5 text-text-tertiary group-hover:text-text-primary-on-surface" data-testid="tooltip-icon" />
-      </div>
-    </div>
+      </PopoverTrigger>
+      <PopoverContent placement="top-end" popupClassName="w-[260px] rounded-none border-0 bg-saas-dify-blue-static px-5 py-[18px] system-xs-regular text-text-primary-on-surface shadow-none">
+        {content}
+      </PopoverContent>
+    </Popover>
   )
 }
 
diff --git a/web/app/components/billing/upgrade-btn/__tests__/index.spec.tsx b/web/app/components/billing/upgrade-btn/__tests__/index.spec.tsx
index 7eda24b944..5f6dc60038 100644
--- a/web/app/components/billing/upgrade-btn/__tests__/index.spec.tsx
+++ b/web/app/components/billing/upgrade-btn/__tests__/index.spec.tsx
@@ -38,10 +38,11 @@ describe('UpgradeBtn', () => {
       expect(screen.getByText(/billing\.upgradeBtn\.encourage/i)).toBeInTheDocument()
     })
 
-    it('should render premium badge by default', () => {
+    it('should render premium badge button by default', () => {
       render(<UpgradeBtn />)
 
-      expect(screen.getByText(/billing\.upgradeBtn\.encourage/i)).toBeInTheDocument()
+      const button = screen.getByRole('button', { name: /billing\.upgradeBtn\.encourage/i })
+      expect(button).toHaveClass('premium-badge')
     })
 
     it('should render plain button when isPlain is true', () => {
@@ -75,7 +76,7 @@ describe('UpgradeBtn', () => {
 
   // Props tests (REQUIRED)
   describe('Props', () => {
-    it('should apply custom className to premium badge', () => {
+    it('should apply custom className to premium badge button', () => {
       const customClass = 'custom-upgrade-btn'
 
       const { container } = render(<UpgradeBtn className={customClass} />)
@@ -93,7 +94,7 @@ describe('UpgradeBtn', () => {
       expect(button).toHaveClass(customClass)
     })
 
-    it('should apply custom style to premium badge', () => {
+    it('should apply custom style to premium badge button', () => {
       const customStyle = { padding: '10px' }
 
       const { container } = render(<UpgradeBtn style={customStyle} />)
@@ -132,13 +133,13 @@ describe('UpgradeBtn', () => {
 
   // User Interactions
   describe('User Interactions', () => {
-    it('should call custom onClick when provided and premium badge is clicked', async () => {
+    it('should call custom onClick when provided and premium badge button is clicked', async () => {
       const user = userEvent.setup()
       const handleClick = vi.fn()
 
       render(<UpgradeBtn onClick={handleClick} />)
-      const badge = screen.getByText(/billing\.upgradeBtn\.encourage/i)
-      await user.click(badge)
+      const button = screen.getByRole('button', { name: /billing\.upgradeBtn\.encourage/i })
+      await user.click(button)
 
       expect(handleClick).toHaveBeenCalledTimes(1)
       expect(mockSetShowPricingModal).not.toHaveBeenCalled()
@@ -156,12 +157,12 @@ describe('UpgradeBtn', () => {
       expect(mockSetShowPricingModal).not.toHaveBeenCalled()
     })
 
-    it('should open pricing modal when no custom onClick is provided and premium badge is clicked', async () => {
+    it('should open pricing modal when no custom onClick is provided and premium badge button is clicked', async () => {
       const user = userEvent.setup()
 
       render(<UpgradeBtn />)
-      const badge = screen.getByText(/billing\.upgradeBtn\.encourage/i)
-      await user.click(badge)
+      const button = screen.getByRole('button', { name: /billing\.upgradeBtn\.encourage/i })
+      await user.click(button)
 
       expect(mockSetShowPricingModal).toHaveBeenCalledTimes(1)
     })
@@ -176,13 +177,13 @@ describe('UpgradeBtn', () => {
       expect(mockSetShowPricingModal).toHaveBeenCalledTimes(1)
     })
 
-    it('should track gtag event when loc is provided and badge is clicked', async () => {
+    it('should track gtag event when loc is provided and badge button is clicked', async () => {
       const user = userEvent.setup()
       const loc = 'header-navigation'
 
       render(<UpgradeBtn loc={loc} />)
-      const badge = screen.getByText(/billing\.upgradeBtn\.encourage/i)
-      await user.click(badge)
+      const button = screen.getByRole('button', { name: /billing\.upgradeBtn\.encourage/i })
+      await user.click(button)
 
       expect(mockGtag).toHaveBeenCalledTimes(1)
       expect(mockGtag).toHaveBeenCalledWith('event', 'click_upgrade_btn', {
@@ -208,8 +209,8 @@ describe('UpgradeBtn', () => {
       const user = userEvent.setup()
 
       render(<UpgradeBtn />)
-      const badge = screen.getByText(/billing\.upgradeBtn\.encourage/i)
-      await user.click(badge)
+      const button = screen.getByRole('button', { name: /billing\.upgradeBtn\.encourage/i })
+      await user.click(button)
 
       expect(mockGtag).not.toHaveBeenCalled()
     })
@@ -219,8 +220,8 @@ describe('UpgradeBtn', () => {
       delete gtagWindow.gtag
 
       render(<UpgradeBtn loc="test-location" />)
-      const badge = screen.getByText(/billing\.upgradeBtn\.encourage/i)
-      await user.click(badge)
+      const button = screen.getByRole('button', { name: /billing\.upgradeBtn\.encourage/i })
+      await user.click(button)
 
       expect(mockGtag).not.toHaveBeenCalled()
     })
@@ -231,8 +232,8 @@ describe('UpgradeBtn', () => {
       const loc = 'settings-page'
 
       render(<UpgradeBtn onClick={handleClick} loc={loc} />)
-      const badge = screen.getByText(/billing\.upgradeBtn\.encourage/i)
-      await user.click(badge)
+      const button = screen.getByRole('button', { name: /billing\.upgradeBtn\.encourage/i })
+      await user.click(button)
 
       expect(handleClick).toHaveBeenCalledTimes(1)
       expect(mockGtag).toHaveBeenCalledTimes(1)
@@ -260,8 +261,8 @@ describe('UpgradeBtn', () => {
       const user = userEvent.setup()
 
       render(<UpgradeBtn onClick={undefined} />)
-      const badge = screen.getByText(/billing\.upgradeBtn\.encourage/i)
-      await user.click(badge)
+      const button = screen.getByRole('button', { name: /billing\.upgradeBtn\.encourage/i })
+      await user.click(button)
 
       expect(mockSetShowPricingModal).toHaveBeenCalledTimes(1)
     })
@@ -270,8 +271,8 @@ describe('UpgradeBtn', () => {
       const user = userEvent.setup()
 
       render(<UpgradeBtn loc={undefined} />)
-      const badge = screen.getByText(/billing\.upgradeBtn\.encourage/i)
-      await user.click(badge)
+      const button = screen.getByRole('button', { name: /billing\.upgradeBtn\.encourage/i })
+      await user.click(button)
 
       expect(mockGtag).not.toHaveBeenCalled()
     })
@@ -292,8 +293,8 @@ describe('UpgradeBtn', () => {
       const user = userEvent.setup()
 
       render(<UpgradeBtn loc="" />)
-      const badge = screen.getByText(/billing\.upgradeBtn\.encourage/i)
-      await user.click(badge)
+      const button = screen.getByRole('button', { name: /billing\.upgradeBtn\.encourage/i })
+      await user.click(button)
 
       expect(mockGtag).not.toHaveBeenCalled()
     })
@@ -391,19 +392,26 @@ describe('UpgradeBtn', () => {
       expect(handleClick).toHaveBeenCalledTimes(1)
     })
 
-    it('should be clickable for premium badge variant', async () => {
+    it('should be keyboard accessible for premium badge button variant', async () => {
       const user = userEvent.setup()
       const handleClick = vi.fn()
 
       render(<UpgradeBtn onClick={handleClick} />)
-      const badge = screen.getByText(/billing\.upgradeBtn\.encourage/i)
-
-      // Click badge
-      await user.click(badge)
+      const button = screen.getByRole('button', { name: /billing\.upgradeBtn\.encourage/i })
+      await user.tab()
+      expect(button).toHaveFocus()
+      await user.keyboard('{Enter}')
 
       expect(handleClick).toHaveBeenCalledTimes(1)
     })
 
+    it('should have proper button role for premium badge button variant', () => {
+      render(<UpgradeBtn />)
+
+      const button = screen.getByRole('button', { name: /billing\.upgradeBtn\.encourage/i })
+      expect(button).toHaveClass('premium-badge')
+    })
+
     it('should have proper button role when isPlain is true', () => {
       render(<UpgradeBtn isPlain />)
 
@@ -418,8 +426,8 @@ describe('UpgradeBtn', () => {
       const user = userEvent.setup()
 
       render(<UpgradeBtn />)
-      const badge = screen.getByText(/billing\.upgradeBtn\.encourage/i)
-      await user.click(badge)
+      const button = screen.getByRole('button', { name: /billing\.upgradeBtn\.encourage/i })
+      await user.click(button)
 
       await waitFor(() => {
         expect(mockSetShowPricingModal).toHaveBeenCalledTimes(1)
@@ -431,8 +439,8 @@ describe('UpgradeBtn', () => {
       const handleClick = vi.fn()
 
       render(<UpgradeBtn onClick={handleClick} loc="integration-test" />)
-      const badge = screen.getByText(/billing\.upgradeBtn\.encourage/i)
-      await user.click(badge)
+      const button = screen.getByRole('button', { name: /billing\.upgradeBtn\.encourage/i })
+      await user.click(button)
 
       await waitFor(() => {
         expect(handleClick).toHaveBeenCalledTimes(1)
diff --git a/web/app/components/billing/upgrade-btn/index.tsx b/web/app/components/billing/upgrade-btn/index.tsx
index 5eb1eb1d7f..e5b53555c2 100644
--- a/web/app/components/billing/upgrade-btn/index.tsx
+++ b/web/app/components/billing/upgrade-btn/index.tsx
@@ -6,7 +6,7 @@ import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import { SparklesSoft } from '@/app/components/base/icons/src/public/common'
 import { useModalContext } from '@/context/modal-context'
-import PremiumBadge from '../../base/premium-badge'
+import { PremiumBadgeButton } from '../../base/premium-badge'
 
 type Props = {
   className?: string
@@ -20,6 +20,8 @@ type Props = {
   labelKey?: Exclude<I18nKeysWithPrefix<'billing'>, 'plans.community.features' | 'plans.enterprise.features' | 'plans.premium.features'>
 }
 
+type GtagHandler = (command: 'event', action: 'click_upgrade_btn', payload: { loc: string }) => void
+
 const UpgradeBtn: FC<Props> = ({
   className,
   size = 'm',
@@ -36,12 +38,13 @@ const UpgradeBtn: FC<Props> = ({
     if (_onClick)
       _onClick()
     else
-      (setShowPricingModal as any)()
+      setShowPricingModal()
   }
   const onClick = () => {
     handleClick()
-    if (loc && (window as any).gtag) {
-      (window as any).gtag('event', 'click_upgrade_btn', {
+    const gtag = (window as Window & { gtag?: GtagHandler }).gtag
+    if (loc && gtag) {
+      gtag('event', 'click_upgrade_btn', {
         loc,
       })
     }
@@ -63,21 +66,20 @@ const UpgradeBtn: FC<Props> = ({
   }
 
   return (
-    <PremiumBadge
+    <PremiumBadgeButton
       size={size}
       color="blue"
-      allowHover={true}
       onClick={onClick}
       className={className}
       style={style}
     >
-      <SparklesSoft className="flex h-3.5 w-3.5 items-center py-px pl-[3px] text-components-premium-badge-indigo-text-stop-0" />
+      <SparklesSoft aria-hidden="true" className="flex h-3.5 w-3.5 items-center py-px pl-[3px] text-components-premium-badge-indigo-text-stop-0" />
       <div className="system-xs-medium">
         <span className="p-1">
           {label}
         </span>
       </div>
-    </PremiumBadge>
+    </PremiumBadgeButton>
   )
 }
 export default React.memo(UpgradeBtn)
diff --git a/web/app/components/custom/custom-page/__tests__/index.spec.tsx b/web/app/components/custom/custom-page/__tests__/index.spec.tsx
index 1f3655a9f8..b31db0a29f 100644
--- a/web/app/components/custom/custom-page/__tests__/index.spec.tsx
+++ b/web/app/components/custom/custom-page/__tests__/index.spec.tsx
@@ -133,7 +133,7 @@ describe('CustomPage', () => {
       expect(screen.getByText('custom.upgradeTip.title')).toBeInTheDocument()
       expect(screen.queryByText('custom.customize.contactUs')).not.toBeInTheDocument()
 
-      await user.click(screen.getByText('billing.upgradeBtn.encourageShort'))
+      await user.click(screen.getByRole('button', { name: 'billing.upgradeBtn.encourageShort' }))
 
       expect(setShowPricingModal).toHaveBeenCalledTimes(1)
     })
diff --git a/web/app/components/custom/custom-page/index.tsx b/web/app/components/custom/custom-page/index.tsx
index cd85a91230..0362267a6f 100644
--- a/web/app/components/custom/custom-page/index.tsx
+++ b/web/app/components/custom/custom-page/index.tsx
@@ -20,7 +20,13 @@ const CustomPage = () => {
             <div className="title-xl-semi-bold">{t('upgradeTip.title', { ns: 'custom' })}</div>
             <div className="system-sm-regular">{t('upgradeTip.des', { ns: 'custom' })}</div>
           </div>
-          <div className="flex h-10 w-[120px] cursor-pointer items-center justify-center rounded-3xl bg-white system-md-semibold text-text-accent shadow-xs hover:opacity-95" onClick={() => setShowPricingModal()}>{t('upgradeBtn.encourageShort', { ns: 'billing' })}</div>
+          <button
+            type="button"
+            className="flex h-10 w-[120px] cursor-pointer items-center justify-center rounded-3xl border-none bg-white p-0 system-md-semibold text-text-accent shadow-xs hover:opacity-95"
+            onClick={() => setShowPricingModal()}
+          >
+            {t('upgradeBtn.encourageShort', { ns: 'billing' })}
+          </button>
         </div>
       )}
       <CustomWebAppBrand />
diff --git a/web/app/components/datasets/common/document-picker/__tests__/document-list.spec.tsx b/web/app/components/datasets/common/document-picker/__tests__/document-list.spec.tsx
index 83063cedf5..fa21f71c9d 100644
--- a/web/app/components/datasets/common/document-picker/__tests__/document-list.spec.tsx
+++ b/web/app/components/datasets/common/document-picker/__tests__/document-list.spec.tsx
@@ -1,6 +1,8 @@
-import type { DocumentItem } from '@/models/datasets'
-import { fireEvent, render, screen } from '@testing-library/react'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type { SimpleDocumentDetail } from '@/models/datasets'
+import { Combobox } from '@langgenius/dify-ui/combobox'
+import { render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { ChunkingMode, DataSourceType } from '@/models/datasets'
 import DocumentList from '../document-list'
 
 vi.mock('../../document-file-icon', () => ({
@@ -13,37 +15,92 @@ vi.mock('../../document-file-icon', () => ({
   ),
 }))
 
+const createDocument = (overrides: Partial<SimpleDocumentDetail> = {}): SimpleDocumentDetail => ({
+  id: 'doc-1',
+  batch: 'batch-1',
+  position: 1,
+  dataset_id: 'dataset-1',
+  data_source_type: DataSourceType.FILE,
+  data_source_info: {
+    upload_file: {
+      id: 'file-1',
+      name: 'report.pdf',
+      size: 1024,
+      extension: 'pdf',
+      mime_type: 'application/pdf',
+      created_by: 'user-1',
+      created_at: Date.now(),
+    },
+    job_id: 'job-1',
+    url: '',
+  },
+  dataset_process_rule_id: 'rule-1',
+  name: 'report',
+  created_from: 'web',
+  created_by: 'user-1',
+  created_at: Date.now(),
+  indexing_status: 'completed',
+  display_status: 'enabled',
+  doc_form: ChunkingMode.text,
+  doc_language: 'en',
+  enabled: true,
+  word_count: 1000,
+  archived: false,
+  updated_at: Date.now(),
+  hit_count: 0,
+  data_source_detail_dict: {
+    upload_file: {
+      name: 'report.pdf',
+      extension: 'pdf',
+    },
+  },
+  ...overrides,
+})
+
+const renderDocumentList = (list: SimpleDocumentDetail[], onValueChange = vi.fn()) => ({
+  onValueChange,
+  ...render(
+    <Combobox
+      open
+      items={list}
+      itemToStringLabel={document => document.name}
+      itemToStringValue={document => document.id}
+      onValueChange={onValueChange}
+    >
+      <DocumentList />
+    </Combobox>,
+  ),
+})
+
 describe('DocumentList', () => {
-  const mockList = [
-    { id: 'doc-1', name: 'report', extension: 'pdf' },
-    { id: 'doc-2', name: 'data', extension: 'csv' },
-  ] as DocumentItem[]
-
-  const onChange = vi.fn()
-
   beforeEach(() => {
     vi.clearAllMocks()
   })
 
-  it('should render all documents', () => {
-    render(<DocumentList list={mockList} onChange={onChange} />)
-    expect(screen.getByText('report')).toBeInTheDocument()
-    expect(screen.getByText('data')).toBeInTheDocument()
-  })
+  it('should render documents as combobox options', () => {
+    renderDocumentList([
+      createDocument({ id: 'doc-1', name: 'report' }),
+      createDocument({ id: 'doc-2', name: 'data' }),
+    ])
 
-  it('should render file icons', () => {
-    render(<DocumentList list={mockList} onChange={onChange} />)
+    expect(screen.getByRole('option', { name: /report/ })).toBeInTheDocument()
+    expect(screen.getByRole('option', { name: /data/ })).toBeInTheDocument()
     expect(screen.getAllByTestId('file-icon')).toHaveLength(2)
   })
 
-  it('should call onChange with document on click', () => {
-    render(<DocumentList list={mockList} onChange={onChange} />)
-    fireEvent.click(screen.getByText('report'))
-    expect(onChange).toHaveBeenCalledWith(mockList[0])
+  it('should keep item spacing symmetric with the search field', () => {
+    renderDocumentList([createDocument({ id: 'doc-1', name: 'report' })])
+
+    expect(screen.getByRole('option', { name: /report/ })).toHaveClass('px-3')
   })
 
-  it('should render empty list without errors', () => {
-    const { container } = render(<DocumentList list={[]} onChange={onChange} />)
-    expect(container.firstChild).toBeInTheDocument()
+  it('should select a document through combobox value change', async () => {
+    const user = userEvent.setup()
+    const selectedDocument = createDocument({ id: 'doc-1', name: 'report' })
+    const { onValueChange } = renderDocumentList([selectedDocument])
+
+    await user.click(screen.getByRole('option', { name: /report/ }))
+
+    expect(onValueChange).toHaveBeenCalledWith(selectedDocument, expect.any(Object))
   })
 })
diff --git a/web/app/components/datasets/common/document-picker/__tests__/index.spec.tsx b/web/app/components/datasets/common/document-picker/__tests__/index.spec.tsx
index 1251eab9fb..a6c2078836 100644
--- a/web/app/components/datasets/common/document-picker/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/common/document-picker/__tests__/index.spec.tsx
@@ -1,33 +1,22 @@
-import type { ParentMode, SimpleDocumentDetail } from '@/models/datasets'
+import type { SimpleDocumentDetail } from '@/models/datasets'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
-import { fireEvent, render, screen } from '@testing-library/react'
-import * as React from 'react'
+import { render, screen, waitFor } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
 import { ChunkingMode, DataSourceType } from '@/models/datasets'
-import DocumentPicker from '../index'
+import { DocumentPicker } from '../index'
 
-vi.mock('@langgenius/dify-ui/popover', () => import('@/__mocks__/base-ui-popover'))
-
-// Mock useDocumentList hook with controllable return value
 let mockDocumentListData: { data: SimpleDocumentDetail[] } | undefined
-let mockDocumentListLoading = false
 
 const { mockUseDocumentList } = vi.hoisted(() => ({
   mockUseDocumentList: vi.fn(),
 }))
 
-// Set up the implementation after variables are defined
-mockUseDocumentList.mockImplementation(() => ({
-  data: mockDocumentListLoading ? undefined : mockDocumentListData,
-  isLoading: mockDocumentListLoading,
-}))
-
 vi.mock('@/service/knowledge/use-document', () => ({
   useDocumentList: mockUseDocumentList,
 }))
 
-// Factory function to create mock SimpleDocumentDetail
-const createMockDocument = (overrides: Partial<SimpleDocumentDetail> = {}): SimpleDocumentDetail => ({
-  id: `doc-${Math.random().toString(36).substr(2, 9)}`,
+const createDocument = (overrides: Partial<SimpleDocumentDetail> = {}): SimpleDocumentDetail => ({
+  id: 'doc-1',
   batch: 'batch-1',
   position: 1,
   dataset_id: 'dataset-1',
@@ -35,19 +24,18 @@ const createMockDocument = (overrides: Partial<SimpleDocumentDetail> = {}): Simp
   data_source_info: {
     upload_file: {
       id: 'file-1',
-      name: 'test-file.txt',
+      name: 'document.pdf',
       size: 1024,
-      extension: 'txt',
-      mime_type: 'text/plain',
+      extension: 'pdf',
+      mime_type: 'application/pdf',
       created_by: 'user-1',
       created_at: Date.now(),
     },
-    // Required fields for LegacyDataSourceInfo
     job_id: 'job-1',
     url: '',
   },
   dataset_process_rule_id: 'rule-1',
-  name: 'Test Document',
+  name: 'Document 1',
   created_from: 'web',
   created_by: 'user-1',
   created_at: Date.now(),
@@ -62,937 +50,146 @@ const createMockDocument = (overrides: Partial<SimpleDocumentDetail> = {}): Simp
   hit_count: 0,
   data_source_detail_dict: {
     upload_file: {
-      name: 'test-file.txt',
-      extension: 'txt',
+      name: 'document.pdf',
+      extension: 'pdf',
     },
   },
   ...overrides,
 })
 
-// Factory function to create multiple documents
-const createMockDocumentList = (count: number): SimpleDocumentDetail[] => {
-  return Array.from({ length: count }, (_, index) =>
-    createMockDocument({
-      id: `doc-${index + 1}`,
-      name: `Document ${index + 1}`,
-      data_source_detail_dict: {
-        upload_file: {
-          name: `document-${index + 1}.pdf`,
-          extension: 'pdf',
-        },
-      },
-    }))
-}
-
-// Factory function to create props
-const createDefaultProps = (overrides: Partial<React.ComponentProps<typeof DocumentPicker>> = {}) => ({
+const createProps = (overrides: Partial<React.ComponentProps<typeof DocumentPicker>> = {}) => ({
   datasetId: 'dataset-1',
-  value: {
-    name: 'Test Document',
-    extension: 'txt',
-    chunkingMode: ChunkingMode.text,
-    parentMode: undefined as ParentMode | undefined,
-  },
+  value: createDocument({ id: 'doc-1', name: 'Document 1' }),
   onChange: vi.fn(),
   ...overrides,
 })
 
-// Create a new QueryClient for each test
-const createTestQueryClient = () =>
-  new QueryClient({
+const renderDocumentPicker = (props: Partial<React.ComponentProps<typeof DocumentPicker>> = {}) => {
+  const queryClient = new QueryClient({
     defaultOptions: {
       queries: {
         retry: false,
-        gcTime: 0,
-        staleTime: 0,
       },
     },
   })
-
-// Helper to render component with providers
-const renderComponent = (props: Partial<React.ComponentProps<typeof DocumentPicker>> = {}) => {
-  const queryClient = createTestQueryClient()
-  const defaultProps = createDefaultProps(props)
+  const defaultProps = createProps(props)
 
   return {
+    props: defaultProps,
     ...render(
       <QueryClientProvider client={queryClient}>
         <DocumentPicker {...defaultProps} />
       </QueryClientProvider>,
     ),
-    queryClient,
-    props: defaultProps,
   }
 }
 
-const openPopover = () => {
-  fireEvent.click(screen.getByTestId('popover-trigger'))
-}
-
 describe('DocumentPicker', () => {
   beforeEach(() => {
     vi.clearAllMocks()
-    // Reset mock state
-    mockDocumentListData = { data: createMockDocumentList(5) }
-    mockDocumentListLoading = false
+    mockDocumentListData = {
+      data: [
+        createDocument({ id: 'doc-1', name: 'Document 1' }),
+        createDocument({ id: 'doc-2', name: 'Document 2' }),
+      ],
+    }
+    mockUseDocumentList.mockImplementation(() => ({
+      data: mockDocumentListData,
+    }))
   })
 
-  // Tests for basic rendering
-  describe('Rendering', () => {
-    it('should render without crashing', () => {
-      renderComponent()
-
-      expect(screen.getByTestId('popover')).toBeInTheDocument()
+  it('should render the current document and chunking mode', () => {
+    renderDocumentPicker({
+      value: createDocument({
+        id: 'current-doc',
+        name: 'Current Document',
+        doc_form: ChunkingMode.parentChild,
+      }),
+      parentMode: 'paragraph',
     })
 
-    it('should render document name when provided', () => {
-      renderComponent({
-        value: {
-          name: 'My Document',
-          extension: 'pdf',
-          chunkingMode: ChunkingMode.text,
-        },
-      })
-
-      expect(screen.getByText('My Document')).toBeInTheDocument()
-    })
-
-    it('should render placeholder when name is not provided', () => {
-      renderComponent({
-        value: {
-          name: undefined,
-          extension: 'pdf',
-          chunkingMode: ChunkingMode.text,
-        },
-      })
-
-      expect(screen.getByText('--')).toBeInTheDocument()
-    })
-
-    it('should render general mode label', () => {
-      renderComponent({
-        value: {
-          name: 'Test',
-          extension: 'txt',
-          chunkingMode: ChunkingMode.text,
-        },
-      })
-
-      expect(screen.getByText('dataset.chunkingMode.general')).toBeInTheDocument()
-    })
-
-    it('should render QA mode label', () => {
-      renderComponent({
-        value: {
-          name: 'Test',
-          extension: 'txt',
-          chunkingMode: ChunkingMode.qa,
-        },
-      })
-
-      expect(screen.getByText('dataset.chunkingMode.qa')).toBeInTheDocument()
-    })
-
-    it('should render parentChild mode label with paragraph parent mode', () => {
-      renderComponent({
-        value: {
-          name: 'Test',
-          extension: 'txt',
-          chunkingMode: ChunkingMode.parentChild,
-          parentMode: 'paragraph',
-        },
-      })
-
-      expect(screen.getByText(/dataset.chunkingMode.parentChild/)).toBeInTheDocument()
-      expect(screen.getByText(/dataset.parentMode.paragraph/)).toBeInTheDocument()
-    })
-
-    it('should render parentChild mode label with full-doc parent mode', () => {
-      renderComponent({
-        value: {
-          name: 'Test',
-          extension: 'txt',
-          chunkingMode: ChunkingMode.parentChild,
-          parentMode: 'full-doc',
-        },
-      })
-
-      expect(screen.getByText(/dataset.chunkingMode.parentChild/)).toBeInTheDocument()
-      expect(screen.getByText(/dataset.parentMode.fullDoc/)).toBeInTheDocument()
-    })
-
-    it('should render placeholder for parentMode when not provided', () => {
-      renderComponent({
-        value: {
-          name: 'Test',
-          extension: 'txt',
-          chunkingMode: ChunkingMode.parentChild,
-          parentMode: undefined,
-        },
-      })
-
-      // parentModeLabel should be '--' when parentMode is not provided
-      expect(screen.getByText(/--/)).toBeInTheDocument()
-    })
+    expect(screen.getByRole('combobox', { name: 'Current Document' })).toBeInTheDocument()
+    expect(screen.getByText(/dataset.chunkingMode.parentChild/)).toBeInTheDocument()
+    expect(screen.getByText(/dataset.parentMode.paragraph/)).toBeInTheDocument()
   })
 
-  // Tests for props handling
-  describe('Props', () => {
-    it('should accept required props', () => {
-      const onChange = vi.fn()
-      renderComponent({
-        datasetId: 'test-dataset',
-        value: {
-          name: 'Test',
-          extension: 'txt',
-          chunkingMode: ChunkingMode.text,
-        },
-        onChange,
-      })
+  it('should fetch documents with the current dataset and search keyword', async () => {
+    const user = userEvent.setup()
+    renderDocumentPicker({ datasetId: 'dataset-custom' })
 
-      expect(screen.getByTestId('popover')).toBeInTheDocument()
-    })
+    await user.click(screen.getByRole('combobox', { name: 'Document 1' }))
+    await user.type(screen.getByPlaceholderText('common.operation.search'), 'report')
 
-    it('should handle value with all fields', () => {
-      renderComponent({
-        value: {
-          name: 'Full Document',
-          extension: 'docx',
-          chunkingMode: ChunkingMode.parentChild,
-          parentMode: 'paragraph',
-        },
-      })
-
-      expect(screen.getByText('Full Document')).toBeInTheDocument()
-    })
-
-    it('should handle value with minimal fields', () => {
-      renderComponent({
-        value: {
-          name: undefined,
-          extension: undefined,
-          chunkingMode: undefined,
-          parentMode: undefined,
-        },
-      })
-
-      expect(screen.getByText('--')).toBeInTheDocument()
-    })
-
-    it('should pass datasetId to mockUseDocumentList hook', () => {
-      renderComponent({ datasetId: 'custom-dataset-id' })
-
-      expect(mockUseDocumentList).toHaveBeenCalledWith(
-        expect.objectContaining({
-          datasetId: 'custom-dataset-id',
-        }),
-      )
-    })
-  })
-
-  // Tests for state management and updates
-  describe('State Management', () => {
-    it('should initialize with popup closed', () => {
-      renderComponent()
-
-      expect(screen.getByTestId('popover')).toHaveAttribute('data-open', 'false')
-    })
-
-    it('should open popup when trigger is clicked', () => {
-      renderComponent()
-
-      const trigger = screen.getByTestId('popover-trigger')
-      fireEvent.click(trigger)
-
-      // Verify click handler is called
-      expect(trigger).toBeInTheDocument()
-    })
-
-    it('should maintain search query state', async () => {
-      renderComponent()
-
-      // Initial call should have empty keyword
-      expect(mockUseDocumentList).toHaveBeenCalledWith(
-        expect.objectContaining({
-          query: expect.objectContaining({
-            keyword: '',
-          }),
-        }),
-      )
-    })
-
-    it('should update query when search input changes', () => {
-      renderComponent()
-
-      // Verify the component uses mockUseDocumentList with query parameter
-
-      expect(mockUseDocumentList).toHaveBeenCalledWith(
-        expect.objectContaining({
-          query: expect.objectContaining({
-            keyword: '',
-          }),
-        }),
-      )
-    })
-  })
-
-  // Tests for callback stability and memoization
-  describe('Callback Stability', () => {
-    it('should maintain stable onChange callback when value changes', () => {
-      const onChange = vi.fn()
-      const value1 = {
-        name: 'Doc 1',
-        extension: 'txt',
-        chunkingMode: ChunkingMode.text,
-      }
-      const value2 = {
-        name: 'Doc 2',
-        extension: 'pdf',
-        chunkingMode: ChunkingMode.text,
-      }
-
-      const queryClient = createTestQueryClient()
-      const { rerender } = render(
-        <QueryClientProvider client={queryClient}>
-          <DocumentPicker
-            datasetId="dataset-1"
-            value={value1}
-            onChange={onChange}
-          />
-        </QueryClientProvider>,
-      )
-
-      rerender(
-        <QueryClientProvider client={queryClient}>
-          <DocumentPicker
-            datasetId="dataset-1"
-            value={value2}
-            onChange={onChange}
-          />
-        </QueryClientProvider>,
-      )
-
-      // Component should still render correctly after rerender
-      expect(screen.getByText('Doc 2')).toBeInTheDocument()
-    })
-
-    it('should use updated onChange callback after rerender', () => {
-      const onChange1 = vi.fn()
-      const onChange2 = vi.fn()
-      const value = {
-        name: 'Test Doc',
-        extension: 'txt',
-        chunkingMode: ChunkingMode.text,
-      }
-
-      const queryClient = createTestQueryClient()
-      const { rerender } = render(
-        <QueryClientProvider client={queryClient}>
-          <DocumentPicker
-            datasetId="dataset-1"
-            value={value}
-            onChange={onChange1}
-          />
-        </QueryClientProvider>,
-      )
-
-      rerender(
-        <QueryClientProvider client={queryClient}>
-          <DocumentPicker
-            datasetId="dataset-1"
-            value={value}
-            onChange={onChange2}
-          />
-        </QueryClientProvider>,
-      )
-
-      // The component should use the new callback
-      expect(screen.getByTestId('popover')).toBeInTheDocument()
-    })
-
-    it('should memoize handleChange callback with useCallback', () => {
-      // The handleChange callback is created with useCallback and depends on
-      // documentsList, onChange, and setOpen
-      const onChange = vi.fn()
-      renderComponent({ onChange })
-
-      // Verify component renders correctly, callback memoization is internal
-      expect(screen.getByTestId('popover')).toBeInTheDocument()
-    })
-  })
-
-  // Tests for memoization logic and dependencies
-  describe('Memoization Logic', () => {
-    it('should be wrapped with React.memo', () => {
-      // React.memo components have a $$typeof property
-      expect((DocumentPicker as unknown as { $$typeof: symbol }).$$typeof).toBeDefined()
-    })
-
-    it('should compute parentModeLabel correctly with useMemo', () => {
-      // Test paragraph mode
-      renderComponent({
-        value: {
-          name: 'Test',
-          extension: 'txt',
-          chunkingMode: ChunkingMode.parentChild,
-          parentMode: 'paragraph',
-        },
-      })
-
-      expect(screen.getByText(/dataset.parentMode.paragraph/)).toBeInTheDocument()
-    })
-
-    it('should update parentModeLabel when parentMode changes', () => {
-      // Test full-doc mode
-      renderComponent({
-        value: {
-          name: 'Test',
-          extension: 'txt',
-          chunkingMode: ChunkingMode.parentChild,
-          parentMode: 'full-doc',
-        },
-      })
-
-      expect(screen.getByText(/dataset.parentMode.fullDoc/)).toBeInTheDocument()
-    })
-
-    it('should not re-render when props are the same', () => {
-      const onChange = vi.fn()
-      const value = {
-        name: 'Stable Doc',
-        extension: 'txt',
-        chunkingMode: ChunkingMode.text,
-      }
-
-      const queryClient = createTestQueryClient()
-      const { rerender } = render(
-        <QueryClientProvider client={queryClient}>
-          <DocumentPicker
-            datasetId="dataset-1"
-            value={value}
-            onChange={onChange}
-          />
-        </QueryClientProvider>,
-      )
-
-      // Rerender with same props reference
-      rerender(
-        <QueryClientProvider client={queryClient}>
-          <DocumentPicker
-            datasetId="dataset-1"
-            value={value}
-            onChange={onChange}
-          />
-        </QueryClientProvider>,
-      )
-
-      expect(screen.getByText('Stable Doc')).toBeInTheDocument()
-    })
-  })
-
-  // Tests for user interactions and event handlers
-  describe('User Interactions', () => {
-    it('should toggle popup when trigger is clicked', () => {
-      renderComponent()
-
-      const trigger = screen.getByTestId('popover-trigger')
-      fireEvent.click(trigger)
-
-      // Trigger click should be handled
-      expect(trigger).toBeInTheDocument()
-    })
-
-    it('should handle document selection when popup is open', () => {
-      // Test the handleChange callback logic
-      const onChange = vi.fn()
-      const mockDocs = createMockDocumentList(3)
-      mockDocumentListData = { data: mockDocs }
-
-      renderComponent({ onChange })
-
-      // The handleChange callback should find the document and call onChange
-      // We can verify this by checking that mockUseDocumentList was called
-
-      expect(mockUseDocumentList).toHaveBeenCalled()
-    })
-
-    it('should handle search input change', () => {
-      renderComponent()
-
-      // The search input is only visible when popup is open
-      // We verify that the component initializes with empty query
-
-      expect(mockUseDocumentList).toHaveBeenCalledWith(
-        expect.objectContaining({
-          query: expect.objectContaining({
-            keyword: '',
-          }),
-        }),
-      )
-    })
-
-    it('should initialize with default query parameters', () => {
-      renderComponent()
-
-      expect(mockUseDocumentList).toHaveBeenCalledWith(
-        expect.objectContaining({
-          query: {
-            keyword: '',
-            page: 1,
-            limit: 20,
-          },
-        }),
-      )
-    })
-  })
-
-  // Tests for API calls
-  describe('API Calls', () => {
-    it('should call mockUseDocumentList with correct parameters', () => {
-      renderComponent({ datasetId: 'test-dataset-123' })
-
-      expect(mockUseDocumentList).toHaveBeenCalledWith({
-        datasetId: 'test-dataset-123',
+    await waitFor(() => {
+      expect(mockUseDocumentList).toHaveBeenLastCalledWith({
+        datasetId: 'dataset-custom',
         query: {
-          keyword: '',
+          keyword: 'report',
           page: 1,
           limit: 20,
         },
       })
     })
-
-    it('should handle loading state', () => {
-      mockDocumentListLoading = true
-      mockDocumentListData = undefined
-
-      renderComponent()
-
-      // When loading, component should still render without crashing
-      expect(screen.getByTestId('popover')).toBeInTheDocument()
-    })
-
-    it('should fetch documents on mount', () => {
-      mockDocumentListLoading = false
-      mockDocumentListData = { data: createMockDocumentList(3) }
-
-      renderComponent()
-
-      // Verify the hook was called
-
-      expect(mockUseDocumentList).toHaveBeenCalled()
-    })
-
-    it('should handle empty document list', () => {
-      mockDocumentListData = { data: [] }
-
-      renderComponent()
-
-      // Component should render without crashing
-      expect(screen.getByTestId('popover')).toBeInTheDocument()
-    })
-
-    it('should handle undefined data response', () => {
-      mockDocumentListData = undefined
-
-      renderComponent()
-
-      // Should not crash
-      expect(screen.getByTestId('popover')).toBeInTheDocument()
-    })
   })
 
-  // Tests for component memoization
-  describe('Component Memoization', () => {
-    it('should export as React.memo wrapped component', () => {
-      // Check that the component is memoized
-      expect(DocumentPicker).toBeDefined()
-      expect(typeof DocumentPicker).toBe('object') // React.memo returns an object
-    })
+  it('should keep focus in the search input while deleting quickly', async () => {
+    const user = userEvent.setup()
+    renderDocumentPicker()
 
-    it('should preserve render output when datasetId is the same', () => {
-      const queryClient = createTestQueryClient()
-      const value = {
-        name: 'Memo Test',
-        extension: 'txt',
-        chunkingMode: ChunkingMode.text,
-      }
-      const onChange = vi.fn()
+    const trigger = screen.getByRole('combobox', { name: 'Document 1' })
+    await user.click(trigger)
 
-      const { rerender } = render(
-        <QueryClientProvider client={queryClient}>
-          <DocumentPicker
-            datasetId="same-dataset"
-            value={value}
-            onChange={onChange}
-          />
-        </QueryClientProvider>,
-      )
+    const searchInput = screen.getByPlaceholderText('common.operation.search')
+    await user.type(searchInput, 'report')
+    await user.keyboard('{Backspace}{Backspace}{Backspace}{Backspace}{Backspace}{Backspace}')
 
-      expect(screen.getByText('Memo Test')).toBeInTheDocument()
-
-      rerender(
-        <QueryClientProvider client={queryClient}>
-          <DocumentPicker
-            datasetId="same-dataset"
-            value={value}
-            onChange={onChange}
-          />
-        </QueryClientProvider>,
-      )
-
-      expect(screen.getByText('Memo Test')).toBeInTheDocument()
-    })
+    expect(trigger).toHaveAttribute('aria-expanded', 'true')
+    expect(searchInput).toHaveFocus()
+    expect(trigger).not.toHaveFocus()
   })
 
-  // Tests for edge cases and error handling
-  describe('Edge Cases', () => {
-    it('should handle null name', () => {
-      renderComponent({
-        value: {
-          name: undefined,
-          extension: 'txt',
-          chunkingMode: ChunkingMode.text,
-        },
-      })
+  it('should keep focus in the search input while typing quickly', async () => {
+    const user = userEvent.setup()
+    renderDocumentPicker()
 
-      expect(screen.getByText('--')).toBeInTheDocument()
-    })
+    const trigger = screen.getByRole('combobox', { name: 'Document 1' })
+    await user.click(trigger)
 
-    it('should handle empty string name', () => {
-      renderComponent({
-        value: {
-          name: '',
-          extension: 'txt',
-          chunkingMode: ChunkingMode.text,
-        },
-      })
+    const searchInput = screen.getByPlaceholderText('common.operation.search')
+    await user.keyboard('quarterly-report-final')
 
-      // Empty string is falsy, so should show '--'
-      expect(screen.queryByText('--')).toBeInTheDocument()
-    })
-
-    it('should handle undefined extension', () => {
-      renderComponent({
-        value: {
-          name: 'Test Doc',
-          extension: undefined,
-          chunkingMode: ChunkingMode.text,
-        },
-      })
-
-      // Should not crash
-      expect(screen.getByText('Test Doc')).toBeInTheDocument()
-    })
-
-    it('should handle undefined chunkingMode', () => {
-      renderComponent({
-        value: {
-          name: 'Test Doc',
-          extension: 'txt',
-          chunkingMode: undefined,
-        },
-      })
-
-      // When chunkingMode is undefined, none of the mode conditions are true
-      expect(screen.getByText('Test Doc')).toBeInTheDocument()
-    })
-
-    it('should handle document without data_source_detail_dict', () => {
-      const docWithoutDetail = createMockDocument({
-        id: 'doc-no-detail',
-        name: 'Doc Without Detail',
-        data_source_detail_dict: undefined,
-      })
-      mockDocumentListData = { data: [docWithoutDetail] }
-
-      // Component should handle mapping documents even without data_source_detail_dict
-      renderComponent()
-
-      // Should not crash
-      expect(screen.getByTestId('popover')).toBeInTheDocument()
-    })
-
-    it('should handle rapid toggle clicks', () => {
-      renderComponent()
-
-      const trigger = screen.getByTestId('popover-trigger')
-
-      // Rapid clicks
-      fireEvent.click(trigger)
-      fireEvent.click(trigger)
-      fireEvent.click(trigger)
-      fireEvent.click(trigger)
-
-      // Should not crash
-      expect(trigger).toBeInTheDocument()
-    })
-
-    it('should handle very long document names in trigger', () => {
-      const longName = 'A'.repeat(500)
-      renderComponent({
-        value: {
-          name: longName,
-          extension: 'txt',
-          chunkingMode: ChunkingMode.text,
-        },
-      })
-
-      // Should render long name without crashing
-      expect(screen.getByText(longName)).toBeInTheDocument()
-    })
-
-    it('should handle special characters in document name', () => {
-      const specialName = '<script>alert("xss")</script>'
-      renderComponent({
-        value: {
-          name: specialName,
-          extension: 'txt',
-          chunkingMode: ChunkingMode.text,
-        },
-      })
-
-      // React should escape the text
-      expect(screen.getByText(specialName)).toBeInTheDocument()
-    })
-
-    it('should handle documents with missing extension in data_source_detail_dict', () => {
-      const docWithEmptyExtension = createMockDocument({
-        id: 'doc-empty-ext',
-        name: 'Doc Empty Ext',
-        data_source_detail_dict: {
-          upload_file: {
-            name: 'file-no-ext',
-            extension: '',
-          },
-        },
-      })
-      mockDocumentListData = { data: [docWithEmptyExtension] }
-
-      // Component should handle mapping documents with empty extension
-      renderComponent()
-
-      // Should not crash
-      expect(screen.getByTestId('popover')).toBeInTheDocument()
-    })
-
-    it('should handle document list mapping with various data_source_detail_dict states', () => {
-      // Test the mapping logic: d.data_source_detail_dict?.upload_file?.extension || ''
-      const docs = [
-        createMockDocument({
-          id: 'doc-1',
-          name: 'With Extension',
-          data_source_detail_dict: {
-            upload_file: { name: 'file.pdf', extension: 'pdf' },
-          },
-        }),
-        createMockDocument({
-          id: 'doc-2',
-          name: 'Without Detail Dict',
-          data_source_detail_dict: undefined,
-        }),
-      ]
-      mockDocumentListData = { data: docs }
-
-      renderComponent()
-
-      // Should not crash during mapping
-      expect(screen.getByTestId('popover')).toBeInTheDocument()
-    })
+    expect(trigger).toHaveAttribute('aria-expanded', 'true')
+    expect(searchInput).toHaveFocus()
+    expect(trigger).not.toHaveFocus()
   })
 
-  // Tests for all prop variations
-  describe('Prop Variations', () => {
-    describe('datasetId variations', () => {
-      it('should handle empty datasetId', () => {
-        renderComponent({ datasetId: '' })
+  it('should call onChange with the selected document', async () => {
+    const user = userEvent.setup()
+    const onChange = vi.fn()
+    const selectedDocument = createDocument({ id: 'doc-2', name: 'Document 2' })
+    mockDocumentListData = {
+      data: [
+        createDocument({ id: 'doc-1', name: 'Document 1' }),
+        selectedDocument,
+      ],
+    }
 
-        expect(screen.getByTestId('popover')).toBeInTheDocument()
-      })
+    renderDocumentPicker({ onChange })
 
-      it('should handle UUID format datasetId', () => {
-        renderComponent({ datasetId: '123e4567-e89b-12d3-a456-426614174000' })
+    await user.click(screen.getByRole('combobox', { name: 'Document 1' }))
+    await user.click(await screen.findByRole('option', { name: /Document 2/ }))
 
-        expect(screen.getByTestId('popover')).toBeInTheDocument()
-      })
-    })
-
-    describe('value.chunkingMode variations', () => {
-      const chunkingModes = [
-        { mode: ChunkingMode.text, label: 'dataset.chunkingMode.general' },
-        { mode: ChunkingMode.qa, label: 'dataset.chunkingMode.qa' },
-        { mode: ChunkingMode.parentChild, label: 'dataset.chunkingMode.parentChild' },
-      ]
-
-      it.each(chunkingModes)(
-        'should display correct label for $mode mode',
-        ({ mode, label }) => {
-          renderComponent({
-            value: {
-              name: 'Test',
-              extension: 'txt',
-              chunkingMode: mode,
-              parentMode: mode === ChunkingMode.parentChild ? 'paragraph' : undefined,
-            },
-          })
-
-          expect(screen.getByText(new RegExp(label))).toBeInTheDocument()
-        },
-      )
-    })
-
-    describe('value.parentMode variations', () => {
-      const parentModes: Array<{ mode: ParentMode, label: string }> = [
-        { mode: 'paragraph', label: 'dataset.parentMode.paragraph' },
-        { mode: 'full-doc', label: 'dataset.parentMode.fullDoc' },
-      ]
-
-      it.each(parentModes)(
-        'should display correct label for $mode parentMode',
-        ({ mode, label }) => {
-          renderComponent({
-            value: {
-              name: 'Test',
-              extension: 'txt',
-              chunkingMode: ChunkingMode.parentChild,
-              parentMode: mode,
-            },
-          })
-
-          expect(screen.getByText(new RegExp(label))).toBeInTheDocument()
-        },
-      )
-    })
-
-    describe('value.extension variations', () => {
-      const extensions = ['txt', 'pdf', 'docx', 'xlsx', 'csv', 'md', 'html']
-
-      it.each(extensions)('should handle %s extension', (ext) => {
-        renderComponent({
-          value: {
-            name: `File.${ext}`,
-            extension: ext,
-            chunkingMode: ChunkingMode.text,
-          },
-        })
-
-        expect(screen.getByText(`File.${ext}`)).toBeInTheDocument()
-      })
-    })
+    expect(onChange).toHaveBeenCalledWith(selectedDocument)
   })
 
-  // Tests for document selection
-  describe('Document Selection', () => {
-    it('should fetch documents list via mockUseDocumentList', () => {
-      const mockDoc = createMockDocument({
-        id: 'selected-doc',
-        name: 'Selected Document',
-      })
-      mockDocumentListData = { data: [mockDoc] }
-      const onChange = vi.fn()
+  it('should show an empty state when no documents match', async () => {
+    const user = userEvent.setup()
+    mockDocumentListData = { data: [] }
 
-      renderComponent({ onChange })
+    renderDocumentPicker()
 
-      // Verify the hook was called
+    await user.click(screen.getByRole('combobox', { name: 'Document 1' }))
 
-      expect(mockUseDocumentList).toHaveBeenCalled()
-    })
-
-    it('should call onChange when document is selected', () => {
-      const docs = createMockDocumentList(3)
-      mockDocumentListData = { data: docs }
-      const onChange = vi.fn()
-
-      renderComponent({ onChange })
-      openPopover()
-
-      fireEvent.click(screen.getByText('Document 2'))
-
-      // handleChange should find the document and call onChange with full document
-      expect(onChange).toHaveBeenCalledTimes(1)
-      expect(onChange).toHaveBeenCalledWith(docs[1])
-    })
-
-    it('should map document list items correctly', () => {
-      const docs = createMockDocumentList(3)
-      mockDocumentListData = { data: docs }
-
-      renderComponent()
-      openPopover()
-
-      // Documents should be rendered in the list
-      expect(screen.getByText('Document 1')).toBeInTheDocument()
-      expect(screen.getByText('Document 2')).toBeInTheDocument()
-      expect(screen.getByText('Document 3')).toBeInTheDocument()
-    })
-  })
-
-  // Tests for integration with child components
-  describe('Child Component Integration', () => {
-    it('should pass correct data to DocumentList when popup is open', () => {
-      const docs = createMockDocumentList(3)
-      mockDocumentListData = { data: docs }
-
-      renderComponent()
-
-      // DocumentList receives mapped documents: { id, name, extension }
-      // We verify the data is fetched
-
-      expect(mockUseDocumentList).toHaveBeenCalled()
-    })
-
-    it('should map document data_source_detail_dict extension correctly', () => {
-      const doc = createMockDocument({
-        id: 'mapped-doc',
-        name: 'Mapped Document',
-        data_source_detail_dict: {
-          upload_file: {
-            name: 'mapped.pdf',
-            extension: 'pdf',
-          },
-        },
-      })
-      mockDocumentListData = { data: [doc] }
-
-      renderComponent()
-
-      // The mapping: d.data_source_detail_dict?.upload_file?.extension || ''
-      // Should extract 'pdf' from the document
-      expect(screen.getByTestId('popover')).toBeInTheDocument()
-    })
-
-    it('should render trigger with SearchInput integration', () => {
-      renderComponent()
-
-      // The trigger is always rendered
-      expect(screen.getByTestId('popover-trigger')).toBeInTheDocument()
-    })
-
-    it('should integrate FileIcon component', () => {
-      // Use empty document list to avoid duplicate icons from list
-      mockDocumentListData = { data: [] }
-
-      renderComponent({
-        value: {
-          name: 'test.pdf',
-          extension: 'pdf',
-          chunkingMode: ChunkingMode.text,
-        },
-      })
-
-      // FileIcon should render an SVG icon for the file extension
-      const trigger = screen.getByTestId('popover-trigger')
-      expect(trigger.querySelector('svg')).toBeInTheDocument()
-    })
-  })
-
-  // Tests for visual states
-  describe('Visual States', () => {
-    it('should render portal content for document selection', () => {
-      renderComponent()
-      openPopover()
-
-      // Popover content is rendered after opening the trigger in our mock
-      expect(screen.getByTestId('popover-content')).toBeInTheDocument()
-    })
+    expect(await screen.findByRole('status')).toHaveTextContent('common.noData')
   })
 })
diff --git a/web/app/components/datasets/common/document-picker/document-list.tsx b/web/app/components/datasets/common/document-picker/document-list.tsx
index d2d8d1966c..366e744cbd 100644
--- a/web/app/components/datasets/common/document-picker/document-list.tsx
+++ b/web/app/components/datasets/common/document-picker/document-list.tsx
@@ -1,43 +1,49 @@
 'use client'
-import type { FC } from 'react'
-import type { DocumentItem } from '@/models/datasets'
+import type { SimpleDocumentDetail } from '@/models/datasets'
 import { cn } from '@langgenius/dify-ui/cn'
-import * as React from 'react'
-import { useCallback } from 'react'
+import {
+  ComboboxItem,
+  ComboboxItemText,
+  ComboboxList,
+} from '@langgenius/dify-ui/combobox'
 import FileIcon from '../document-file-icon'
 
 type Props = {
   className?: string
-  list: DocumentItem[]
-  onChange: (value: DocumentItem) => void
 }
 
-const DocumentList: FC<Props> = ({
-  className,
-  list,
-  onChange,
-}) => {
-  const handleChange = useCallback((item: DocumentItem) => {
-    return () => onChange(item)
-  }, [onChange])
+function getDocumentExtension(document: SimpleDocumentDetail) {
+  const detailExtension = document.data_source_detail_dict?.upload_file?.extension
+  if (detailExtension)
+    return detailExtension
 
+  const dataSourceInfo = document.data_source_info
+  if (dataSourceInfo && 'upload_file' in dataSourceInfo)
+    return dataSourceInfo.upload_file.extension
+
+  return ''
+}
+
+export default function DocumentList({
+  className,
+}: Props) {
   return (
-    <div className={cn('max-h-[calc(100vh-120px)] overflow-auto', className)}>
-      {list.map((item) => {
-        const { id, name, extension } = item
+    <ComboboxList className={cn('max-h-[calc(100vh-120px)] p-0', className)}>
+      {(item: SimpleDocumentDetail) => {
+        const extension = getDocumentExtension(item)
         return (
-          <div
-            key={id}
-            className="flex h-8 cursor-pointer items-center space-x-2 rounded-lg px-2 hover:bg-state-base-hover"
-            onClick={handleChange(item)}
+          <ComboboxItem
+            key={item.id}
+            value={item}
+            className="mx-0 flex h-8 grid-cols-none items-center gap-2 rounded-lg px-3 py-0"
           >
             <FileIcon name={item.name} extension={extension} size="lg" />
-            <div className="truncate text-sm text-text-secondary">{name}</div>
-          </div>
+            <ComboboxItemText className="min-w-0 px-0 system-sm-regular text-text-secondary">
+              {item.name}
+            </ComboboxItemText>
+          </ComboboxItem>
         )
-      })}
-    </div>
+      }}
+    </ComboboxList>
   )
 }
-
-export default React.memo(DocumentList)
diff --git a/web/app/components/datasets/common/document-picker/index.tsx b/web/app/components/datasets/common/document-picker/index.tsx
index 0566b590de..07f7443764 100644
--- a/web/app/components/datasets/common/document-picker/index.tsx
+++ b/web/app/components/datasets/common/document-picker/index.tsx
@@ -1,20 +1,22 @@
 'use client'
-import type { FC } from 'react'
-import type { DocumentItem, ParentMode, SimpleDocumentDetail } from '@/models/datasets'
+import type { ComboboxRootChangeEventDetails } from '@langgenius/dify-ui/combobox'
+import type { ParentMode, SimpleDocumentDetail } from '@/models/datasets'
 import { cn } from '@langgenius/dify-ui/cn'
 import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from '@langgenius/dify-ui/popover'
+  Combobox,
+  ComboboxContent,
+  ComboboxEmpty,
+  ComboboxInput,
+  ComboboxInputGroup,
+  ComboboxStatus,
+  ComboboxTrigger,
+  ComboboxValue,
+} from '@langgenius/dify-ui/combobox'
 import { RiArrowDownSLine } from '@remixicon/react'
-import { useBoolean } from 'ahooks'
-import * as React from 'react'
-import { useCallback, useMemo, useState } from 'react'
+import { useDeferredValue, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { GeneralChunk, ParentChildChunk } from '@/app/components/base/icons/src/vender/knowledge'
 import Loading from '@/app/components/base/loading'
-import SearchInput from '@/app/components/base/search-input'
 import { ChunkingMode } from '@/models/datasets'
 import { useDocumentList } from '@/service/knowledge/use-document'
 import FileIcon from '../document-file-icon'
@@ -22,116 +24,177 @@ import DocumentList from './document-list'
 
 type Props = {
   datasetId: string
-  value: {
-    name?: string
-    extension?: string
-    chunkingMode?: ChunkingMode
-    parentMode?: ParentMode
-  }
+  value?: SimpleDocumentDetail | null
+  parentMode?: ParentMode
   onChange: (value: SimpleDocumentDetail) => void
 }
 
-const DocumentPicker: FC<Props> = ({
+function getDocumentLabel(document: SimpleDocumentDetail) {
+  return document.name
+}
+
+function getDocumentValue(document: SimpleDocumentDetail) {
+  return document.id
+}
+
+function isSameDocument(item: SimpleDocumentDetail, value: SimpleDocumentDetail) {
+  return item.id === value.id
+}
+
+function getDocumentExtension(document?: SimpleDocumentDetail | null) {
+  if (!document)
+    return ''
+
+  const detailExtension = document.data_source_detail_dict?.upload_file?.extension
+  if (detailExtension)
+    return detailExtension
+
+  const dataSourceInfo = document.data_source_info
+  if (dataSourceInfo && 'upload_file' in dataSourceInfo)
+    return dataSourceInfo.upload_file.extension
+
+  return ''
+}
+
+function DocumentPickerTriggerValue({
+  document,
+  parentMode,
+}: {
+  document?: SimpleDocumentDetail | null
+  parentMode?: ParentMode
+}) {
+  const { t } = useTranslation()
+  const isGeneralMode = document?.doc_form === ChunkingMode.text
+  const isParentChild = document?.doc_form === ChunkingMode.parentChild
+  const isQAMode = document?.doc_form === ChunkingMode.qa
+  const TypeIcon = isParentChild ? ParentChildChunk : GeneralChunk
+  const ArrowIcon = RiArrowDownSLine
+  const parentModeLabel = (() => {
+    if (!parentMode)
+      return '--'
+    return parentMode === 'paragraph' ? t('parentMode.paragraph', { ns: 'dataset' }) : t('parentMode.fullDoc', { ns: 'dataset' })
+  })()
+
+  return (
+    <span className="flex min-w-0 items-center gap-1.5">
+      <FileIcon name={document?.name} extension={getDocumentExtension(document)} size="xl" />
+      <span className="flex min-w-0 flex-col items-start">
+        <span className="flex max-w-full min-w-0 items-center gap-1">
+          <span className="max-w-[280px] min-w-0 truncate system-md-semibold text-text-primary">
+            {document?.name || '--'}
+          </span>
+          <ArrowIcon className="h-4 w-4 shrink-0 text-text-primary" aria-hidden="true" />
+        </span>
+        <span className="flex h-3 max-w-[300px] items-center gap-0.5 text-text-tertiary">
+          <TypeIcon className="h-3 w-3 shrink-0" />
+          <span className={cn('truncate system-2xs-medium-uppercase', isParentChild && 'mt-0.5')}>
+            {isGeneralMode && t('chunkingMode.general', { ns: 'dataset' })}
+            {isQAMode && t('chunkingMode.qa', { ns: 'dataset' })}
+            {isParentChild && `${t('chunkingMode.parentChild', { ns: 'dataset' })} · ${parentModeLabel}`}
+          </span>
+        </span>
+      </span>
+    </span>
+  )
+}
+
+export function DocumentPicker({
   datasetId,
   value,
+  parentMode,
   onChange,
-}) => {
+}: Props) {
   const { t } = useTranslation()
-  const {
-    name,
-    extension,
-    chunkingMode,
-    parentMode,
-  } = value
-  const [query, setQuery] = useState('')
+  const [searchValue, setSearchValue] = useState('')
+  const deferredSearchValue = useDeferredValue(searchValue)
 
   const { data } = useDocumentList({
     datasetId,
     query: {
-      keyword: query,
+      keyword: deferredSearchValue,
       page: 1,
       limit: 20,
     },
   })
-  const documentsList = data?.data
-  const isGeneralMode = chunkingMode === ChunkingMode.text
-  const isParentChild = chunkingMode === ChunkingMode.parentChild
-  const isQAMode = chunkingMode === ChunkingMode.qa
-  const TypeIcon = isParentChild ? ParentChildChunk : GeneralChunk
+  const documentsList = data?.data ?? []
 
-  const [open, {
-    set: setOpen,
-  }] = useBoolean(false)
-  const ArrowIcon = RiArrowDownSLine
+  const handleInputValueChange = (inputValue: string, details: ComboboxRootChangeEventDetails) => {
+    if (details.reason !== 'item-press')
+      setSearchValue(inputValue)
+  }
 
-  const handleChange = useCallback(({ id }: DocumentItem) => {
-    onChange(documentsList?.find(item => item.id === id) as SimpleDocumentDetail)
-    setOpen(false)
-  }, [documentsList, onChange, setOpen])
+  const handleOpenChange = (nextOpen: boolean) => {
+    if (!nextOpen)
+      setSearchValue('')
+  }
 
-  const parentModeLabel = useMemo(() => {
-    if (!parentMode)
-      return '--'
-    return parentMode === 'paragraph' ? t('parentMode.paragraph', { ns: 'dataset' }) : t('parentMode.fullDoc', { ns: 'dataset' })
-  }, [parentMode, t])
+  const handleDocumentChange = (document: SimpleDocumentDetail | null) => {
+    if (!document)
+      return
+
+    onChange(document)
+    setSearchValue('')
+  }
 
   return (
-    <Popover
-      open={open}
-      onOpenChange={setOpen}
+    <Combobox<SimpleDocumentDetail>
+      items={documentsList}
+      value={value ?? null}
+      inputValue={searchValue}
+      onOpenChange={handleOpenChange}
+      onInputValueChange={handleInputValueChange}
+      onValueChange={handleDocumentChange}
+      isItemEqualToValue={isSameDocument}
+      itemToStringLabel={getDocumentLabel}
+      itemToStringValue={getDocumentValue}
+      filter={null}
     >
-      <PopoverTrigger
-        nativeButton={false}
-        render={(
-          <div className={cn('ml-1 flex cursor-pointer items-center rounded-lg px-2 py-0.5 select-none hover:bg-state-base-hover', open && 'bg-state-base-hover')}>
-            <FileIcon name={name} extension={extension} size="xl" />
-            <div className="mr-0.5 ml-1 flex flex-col items-start">
-              <div className="flex items-center space-x-0.5">
-                <span className={cn('system-md-semibold text-text-primary')}>
-                  {' '}
-                  {name || '--'}
-                </span>
-                <ArrowIcon className="h-4 w-4 text-text-primary" />
-              </div>
-              <div className="flex h-3 items-center space-x-0.5 text-text-tertiary">
-                <TypeIcon className="h-3 w-3" />
-                <span className={cn('system-2xs-medium-uppercase', isParentChild && 'mt-0.5' /* to icon problem cause not ver align */)}>
-                  {isGeneralMode && t('chunkingMode.general', { ns: 'dataset' })}
-                  {isQAMode && t('chunkingMode.qa', { ns: 'dataset' })}
-                  {isParentChild && `${t('chunkingMode.parentChild', { ns: 'dataset' })} · ${parentModeLabel}`}
-                </span>
-              </div>
-            </div>
-          </div>
+      <ComboboxTrigger
+        aria-label={value?.name || t('operation.search', { ns: 'common' })}
+        icon={false}
+        className={cn(
+          'ml-1 flex h-auto w-auto rounded-lg border-0 bg-transparent px-2 py-1 hover:bg-state-base-hover focus-visible:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-active data-open:bg-state-base-hover',
         )}
-      />
-      <PopoverContent
+      >
+        <ComboboxValue>
+          {(document: SimpleDocumentDetail | null) => (
+            <DocumentPickerTriggerValue document={document} parentMode={parentMode} />
+          )}
+        </ComboboxValue>
+      </ComboboxTrigger>
+      <ComboboxContent
         placement="bottom-start"
         sideOffset={0}
-        popupClassName="border-none bg-transparent shadow-none"
+        popupClassName="w-[360px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur p-2 shadow-lg backdrop-blur-[5px]"
       >
-        <div className="w-[360px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur p-1 pt-2 shadow-lg backdrop-blur-[5px]">
-          <SearchInput value={query} onChange={setQuery} className="mx-1" />
-          {documentsList
-            ? (
-                <DocumentList
-                  className="mt-2"
-                  list={documentsList.map(d => ({
-                    id: d.id,
-                    name: d.name,
-                    extension: d.data_source_detail_dict?.upload_file?.extension || '',
-                  }))}
-                  onChange={handleChange}
-                />
-              )
-            : (
-                <div className="mt-2 flex h-[100px] w-[360px] items-center justify-center">
-                  <Loading />
-                </div>
-              )}
-        </div>
-      </PopoverContent>
-    </Popover>
+        <ComboboxInputGroup className="h-8 min-h-8 px-2">
+          <span className="mr-0.5 i-ri-search-line size-4 shrink-0 text-text-tertiary" aria-hidden="true" />
+          <ComboboxInput
+            aria-label={t('operation.search', { ns: 'common' })}
+            placeholder={t('operation.search', { ns: 'common' })}
+            className="block h-4.5 grow px-1 py-0 text-[13px] text-text-primary"
+          />
+        </ComboboxInputGroup>
+        {data
+          ? (
+              documentsList.length > 0
+                ? (
+                    <DocumentList
+                      className="mt-2"
+                    />
+                  )
+                : (
+                    <ComboboxEmpty className="mt-2 flex h-[100px] w-full items-center justify-center">
+                      {t('noData', { ns: 'common' })}
+                    </ComboboxEmpty>
+                  )
+            )
+          : (
+              <ComboboxStatus className="mt-2 flex h-[100px] w-full items-center justify-center">
+                <Loading />
+              </ComboboxStatus>
+            )}
+      </ComboboxContent>
+    </Combobox>
   )
 }
-export default React.memo(DocumentPicker)
diff --git a/web/app/components/datasets/common/document-picker/preview-document-picker.tsx b/web/app/components/datasets/common/document-picker/preview-document-picker.tsx
index 597ceda9a5..fb90bf57f7 100644
--- a/web/app/components/datasets/common/document-picker/preview-document-picker.tsx
+++ b/web/app/components/datasets/common/document-picker/preview-document-picker.tsx
@@ -14,7 +14,6 @@ import { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 import Loading from '@/app/components/base/loading'
 import FileIcon from '../document-file-icon'
-import DocumentList from './document-list'
 
 type Props = {
   className?: string
@@ -74,7 +73,7 @@ const PreviewDocumentPicker: FC<Props> = ({
           {files?.length > 1 && <div className="flex h-8 items-center pl-2 system-xs-medium-uppercase text-text-tertiary">{t('preprocessDocument', { ns: 'dataset', num: files.length })}</div>}
           {files?.length > 0
             ? (
-                <DocumentList
+                <PreviewDocumentList
                   list={files}
                   onChange={handleChange}
                 />
@@ -90,3 +89,27 @@ const PreviewDocumentPicker: FC<Props> = ({
   )
 }
 export default React.memo(PreviewDocumentPicker)
+
+function PreviewDocumentList({
+  list,
+  onChange,
+}: {
+  list: DocumentItem[]
+  onChange: (value: DocumentItem) => void
+}) {
+  return (
+    <div className="max-h-[calc(100vh-120px)] overflow-auto">
+      {list.map(item => (
+        <button
+          key={item.id}
+          type="button"
+          className="flex h-8 w-full cursor-pointer items-center gap-2 rounded-lg border-0 bg-transparent px-2 text-left hover:bg-state-base-hover"
+          onClick={() => onChange(item)}
+        >
+          <FileIcon name={item.name} extension={item.extension} size="lg" />
+          <span className="truncate text-sm text-text-secondary">{item.name}</span>
+        </button>
+      ))}
+    </div>
+  )
+}
diff --git a/web/app/components/datasets/common/document-status-with-action/__tests__/status-with-action.spec.tsx b/web/app/components/datasets/common/document-status-with-action/__tests__/status-with-action.spec.tsx
index ee8b4eff1e..0688adf1c6 100644
--- a/web/app/components/datasets/common/document-status-with-action/__tests__/status-with-action.spec.tsx
+++ b/web/app/components/datasets/common/document-status-with-action/__tests__/status-with-action.spec.tsx
@@ -60,7 +60,7 @@ describe('StatusWithAction', () => {
           onAction={onAction}
         />,
       )
-      expect(screen.getByText('Click me')).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'Click me' })).toBeInTheDocument()
     })
 
     it('should not render action button when onAction is not provided', () => {
@@ -92,12 +92,11 @@ describe('StatusWithAction', () => {
         />,
       )
 
-      fireEvent.click(screen.getByText('Click me'))
+      fireEvent.click(screen.getByRole('button', { name: 'Click me' }))
       expect(onAction).toHaveBeenCalledTimes(1)
     })
 
-    it('should call onAction even when disabled (style only)', () => {
-      // Note: disabled prop only affects styling, not actual click behavior
+    it('should not call onAction when disabled', () => {
       const onAction = vi.fn()
       render(
         <StatusWithAction
@@ -108,8 +107,8 @@ describe('StatusWithAction', () => {
         />,
       )
 
-      fireEvent.click(screen.getByText('Click me'))
-      expect(onAction).toHaveBeenCalledTimes(1)
+      fireEvent.click(screen.getByRole('button', { name: 'Click me' }))
+      expect(onAction).not.toHaveBeenCalled()
     })
 
     it('should apply disabled styles when disabled prop is true', () => {
@@ -122,9 +121,10 @@ describe('StatusWithAction', () => {
         />,
       )
 
-      const actionButton = screen.getByText('Click me')
+      const actionButton = screen.getByRole('button', { name: 'Click me' })
       expect(actionButton).toHaveClass('cursor-not-allowed')
       expect(actionButton).toHaveClass('text-text-disabled')
+      expect(actionButton).toBeDisabled()
     })
   })
 
diff --git a/web/app/components/datasets/common/document-status-with-action/status-with-action.tsx b/web/app/components/datasets/common/document-status-with-action/status-with-action.tsx
index 3c2536fa5e..08053aa7bf 100644
--- a/web/app/components/datasets/common/document-status-with-action/status-with-action.tsx
+++ b/web/app/components/datasets/common/document-status-with-action/status-with-action.tsx
@@ -58,10 +58,17 @@ const StatusAction: FC<Props> = ({
       <div className="relative z-10 flex h-full items-center space-x-2">
         <Icon className={cn('h-4 w-4', color)} />
         <div className="text-[13px] font-normal text-text-secondary">{description}</div>
-        {onAction && (
+        {onAction && actionText && (
           <>
             <Divider type="vertical" className="h-4!" />
-            <div onClick={onAction} className={cn('cursor-pointer text-[13px] font-semibold text-text-accent', disabled && 'cursor-not-allowed text-text-disabled')}>{actionText}</div>
+            <button
+              type="button"
+              disabled={disabled}
+              onClick={onAction}
+              className={cn('cursor-pointer border-none bg-transparent p-0 text-left text-[13px] font-semibold text-text-accent focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden', disabled && 'cursor-not-allowed text-text-disabled')}
+            >
+              {actionText}
+            </button>
           </>
         )}
       </div>
diff --git a/web/app/components/datasets/common/image-list/__tests__/index.spec.tsx b/web/app/components/datasets/common/image-list/__tests__/index.spec.tsx
index e1fde328bb..12d44a3eec 100644
--- a/web/app/components/datasets/common/image-list/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/common/image-list/__tests__/index.spec.tsx
@@ -42,7 +42,7 @@ type ImageInfo = {
   size: number
 }
 
-// Mock ImagePreviewer since it uses createPortal
+// Mock ImagePreviewer since it renders through a Dialog portal
 vi.mock('../../image-previewer', () => ({
   default: ({ images, initialIndex, onClose }: ImagePreviewerProps) => (
     <div data-testid="image-previewer">
@@ -135,7 +135,7 @@ describe('ImageList', () => {
       const images = createMockImages(15)
       render(<ImageList images={images} size="md" limit={9} />)
 
-      const moreButton = screen.getByText(/\+6/)
+      const moreButton = screen.getByRole('button', { name: '+6' })
       fireEvent.click(moreButton)
 
       // More button should disappear
diff --git a/web/app/components/datasets/common/image-list/__tests__/more.spec.tsx b/web/app/components/datasets/common/image-list/__tests__/more.spec.tsx
index cc6341694a..a192c7acc6 100644
--- a/web/app/components/datasets/common/image-list/__tests__/more.spec.tsx
+++ b/web/app/components/datasets/common/image-list/__tests__/more.spec.tsx
@@ -47,7 +47,7 @@ describe('More', () => {
       const onClick = vi.fn()
       render(<More count={5} onClick={onClick} />)
 
-      fireEvent.click(screen.getByText('+5'))
+      fireEvent.click(screen.getByRole('button', { name: '+5' }))
       expect(onClick).toHaveBeenCalledTimes(1)
     })
 
@@ -56,7 +56,7 @@ describe('More', () => {
 
       // Should not throw
       expect(() => {
-        fireEvent.click(screen.getByText('+5'))
+        fireEvent.click(screen.getByRole('button', { name: '+5' }))
       }).not.toThrow()
     })
 
@@ -70,7 +70,7 @@ describe('More', () => {
         </div>,
       )
 
-      fireEvent.click(screen.getByText('+5'))
+      fireEvent.click(screen.getByRole('button', { name: '+5' }))
       expect(childClick).toHaveBeenCalled()
       expect(parentClick).not.toHaveBeenCalled()
     })
diff --git a/web/app/components/datasets/common/image-list/more.tsx b/web/app/components/datasets/common/image-list/more.tsx
index 255e5e4d87..39f6367556 100644
--- a/web/app/components/datasets/common/image-list/more.tsx
+++ b/web/app/components/datasets/common/image-list/more.tsx
@@ -17,23 +17,29 @@ const More = ({ count, onClick }: MoreProps) => {
     return `${(num / 1000000).toFixed(1)}M`
   }
 
-  const handleClick = useCallback((e: React.MouseEvent<HTMLDivElement>) => {
+  const handleClick = useCallback((e: React.MouseEvent<HTMLButtonElement>) => {
     e.stopPropagation()
     e.preventDefault()
     onClick?.()
   }, [onClick])
 
+  const label = `+${formatNumber(count)}`
+
   return (
-    <div className="relative size-8 cursor-pointer p-[0.5px]" onClick={handleClick}>
+    <button
+      type="button"
+      className="relative block size-8 cursor-pointer border-none bg-transparent p-[0.5px] text-center"
+      onClick={handleClick}
+    >
       <div className="relative z-10 size-full rounded-md border-[1.5px] border-components-panel-bg bg-divider-regular">
         <div className="flex size-full items-center justify-center">
           <span className="system-xs-regular text-text-tertiary">
-            {`+${formatNumber(count)}`}
+            {label}
           </span>
         </div>
       </div>
       <div className="absolute top-1 -right-0.5 z-0 h-6 w-1 rounded-r-md bg-divider-regular" />
-    </div>
+    </button>
   )
 }
 
diff --git a/web/app/components/datasets/common/image-previewer/__tests__/index.spec.tsx b/web/app/components/datasets/common/image-previewer/__tests__/index.spec.tsx
index 1ff5cb33f8..aea1a181ff 100644
--- a/web/app/components/datasets/common/image-previewer/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/common/image-previewer/__tests__/index.spec.tsx
@@ -474,23 +474,18 @@ describe('ImagePreviewer', () => {
       expect(nextButton)!.toBeDisabled()
     })
 
-    it('should stop event propagation on container click', async () => {
+    it('should not close on container click', async () => {
       const onClose = vi.fn()
-      const parentClick = vi.fn()
       const images = createMockImages()
 
       await act(async () => {
-        render(
-          <div onClick={parentClick}>
-            <ImagePreviewer images={images} onClose={onClose} />
-          </div>,
-        )
+        render(<ImagePreviewer images={images} onClose={onClose} />)
       })
 
       const container = document.querySelector('.image-previewer')
       if (container) {
         fireEvent.click(container)
-        expect(parentClick).not.toHaveBeenCalled()
+        expect(onClose).not.toHaveBeenCalled()
       }
     })
 
diff --git a/web/app/components/datasets/common/image-previewer/index.tsx b/web/app/components/datasets/common/image-previewer/index.tsx
index 42b4ce33a9..7520f62f81 100644
--- a/web/app/components/datasets/common/image-previewer/index.tsx
+++ b/web/app/components/datasets/common/image-previewer/index.tsx
@@ -1,7 +1,7 @@
 import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { RiArrowLeftLine, RiArrowRightLine, RiCloseLine, RiRefreshLine } from '@remixicon/react'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { createPortal } from 'react-dom'
 import { useHotkeys } from 'react-hotkeys-hook'
 import Loading from '@/app/components/base/loading'
 import { formatFileSize } from '@/utils/format'
@@ -145,81 +145,87 @@ const ImagePreviewer = ({
     fetchImage(image)
   }, [fetchImage])
 
-  useHotkeys('esc', onClose)
   useHotkeys('left', prevImage)
   useHotkeys('right', nextImage)
 
-  return createPortal(
-    <div
-      className="image-previewer fixed inset-0 z-10000 flex items-center justify-center bg-background-overlay-fullscreen p-5 pb-4 backdrop-blur-[6px]"
-      onClick={e => e.stopPropagation()}
-      tabIndex={-1}
+  return (
+    <Dialog
+      open
+      onOpenChange={(open) => {
+        if (!open)
+          onClose()
+      }}
+      disablePointerDismissal
     >
-      <div className="absolute top-6 right-6 z-10 flex cursor-pointer flex-col items-center gap-y-1">
-        <Button
-          variant="tertiary"
-          onClick={onClose}
-          className="size-9 rounded-[10px] p-0"
-          size="large"
-        >
-          <RiCloseLine className="size-5" />
-        </Button>
-        <span className="system-2xs-medium-uppercase text-text-tertiary">
-          Esc
-        </span>
-      </div>
-      {cachedImages[currentImage!.url]!.status === 'loading' && (
-        <Loading type="app" />
-      )}
-      {cachedImages[currentImage!.url]!.status === 'error' && (
-        <div className="flex max-w-sm flex-col items-center gap-y-2 system-sm-regular text-text-tertiary">
-          <span>{`Failed to load image: ${currentImage!.url}. Please try again.`}</span>
+      <DialogContent
+        className="image-previewer inset-0! top-0! left-0! flex h-dvh! max-h-none! w-screen! max-w-none! translate-x-0! translate-y-0! items-center justify-center overflow-hidden! rounded-none! border-none! bg-background-overlay-fullscreen p-5! pb-4! shadow-none! backdrop-blur-[6px]"
+        backdropClassName="bg-transparent!"
+      >
+        <div className="absolute top-6 right-6 z-10 flex cursor-pointer flex-col items-center gap-y-1">
           <Button
-            variant="secondary"
-            onClick={() => retryImage(currentImage!)}
-            className="size-9 rounded-full p-0"
+            variant="tertiary"
+            onClick={onClose}
+            className="size-9 rounded-[10px] p-0"
             size="large"
           >
-            <RiRefreshLine className="size-5" />
+            <RiCloseLine className="size-5" />
           </Button>
+          <span className="system-2xs-medium-uppercase text-text-tertiary">
+            Esc
+          </span>
         </div>
-      )}
-      {cachedImages[currentImage!.url]!.status === 'loaded' && (
-        <div className="flex size-full flex-col items-center justify-center gap-y-2">
-          <img
-            alt={currentImage!.name}
-            src={cachedImages[currentImage!.url]!.blobUrl}
-            className="max-h-[calc(100%-2.5rem)] max-w-full object-contain shadow-lg ring-8 ring-effects-image-frame backdrop-blur-[5px]"
-          />
-          <div className="flex shrink-0 gap-x-2 pt-3 pb-1 system-sm-regular text-text-tertiary">
-            <span>{currentImage!.name}</span>
-            <span>·</span>
-            <span>{`${cachedImages[currentImage!.url]!.width} ×  ${cachedImages[currentImage!.url]!.height}`}</span>
-            <span>·</span>
-            <span>{formatFileSize(currentImage!.size)}</span>
+        {cachedImages[currentImage!.url]!.status === 'loading' && (
+          <Loading type="app" />
+        )}
+        {cachedImages[currentImage!.url]!.status === 'error' && (
+          <div className="flex max-w-sm flex-col items-center gap-y-2 system-sm-regular text-text-tertiary">
+            <span>{`Failed to load image: ${currentImage!.url}. Please try again.`}</span>
+            <Button
+              variant="secondary"
+              onClick={() => retryImage(currentImage!)}
+              className="size-9 rounded-full p-0"
+              size="large"
+            >
+              <RiRefreshLine className="size-5" />
+            </Button>
           </div>
-        </div>
-      )}
-      <Button
-        variant="secondary"
-        onClick={prevImage}
-        className="absolute top-1/2 left-8 z-10 size-9 -translate-y-1/2 rounded-full p-0"
-        disabled={currentIndex === 0}
-        size="large"
-      >
-        <RiArrowLeftLine className="size-5" />
-      </Button>
-      <Button
-        variant="secondary"
-        onClick={nextImage}
-        className="absolute top-1/2 right-8 z-10 size-9 -translate-y-1/2 rounded-full p-0"
-        disabled={currentIndex === images.length - 1}
-        size="large"
-      >
-        <RiArrowRightLine className="size-5" />
-      </Button>
-    </div>,
-    document.body,
+        )}
+        {cachedImages[currentImage!.url]!.status === 'loaded' && (
+          <div className="flex size-full flex-col items-center justify-center gap-y-2">
+            <img
+              alt={currentImage!.name}
+              src={cachedImages[currentImage!.url]!.blobUrl}
+              className="max-h-[calc(100%-2.5rem)] max-w-full object-contain shadow-lg ring-8 ring-effects-image-frame backdrop-blur-[5px]"
+            />
+            <div className="flex shrink-0 gap-x-2 pt-3 pb-1 system-sm-regular text-text-tertiary">
+              <span>{currentImage!.name}</span>
+              <span>·</span>
+              <span>{`${cachedImages[currentImage!.url]!.width} ×  ${cachedImages[currentImage!.url]!.height}`}</span>
+              <span>·</span>
+              <span>{formatFileSize(currentImage!.size)}</span>
+            </div>
+          </div>
+        )}
+        <Button
+          variant="secondary"
+          onClick={prevImage}
+          className="absolute top-1/2 left-8 z-10 size-9 -translate-y-1/2 rounded-full p-0"
+          disabled={currentIndex === 0}
+          size="large"
+        >
+          <RiArrowLeftLine className="size-5" />
+        </Button>
+        <Button
+          variant="secondary"
+          onClick={nextImage}
+          className="absolute top-1/2 right-8 z-10 size-9 -translate-y-1/2 rounded-full p-0"
+          disabled={currentIndex === images.length - 1}
+          size="large"
+        >
+          <RiArrowRightLine className="size-5" />
+        </Button>
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/__tests__/index.spec.tsx b/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/__tests__/index.spec.tsx
index b5c73f3422..2021320616 100644
--- a/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/__tests__/index.spec.tsx
@@ -1352,7 +1352,7 @@ describe('Uploader', () => {
       )
 
       expect(screen.getByText('app.dslUploader.button'))!.toBeInTheDocument()
-      expect(screen.getByText('app.dslUploader.browse'))!.toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'app.dslUploader.browse' }))!.toBeInTheDocument()
     })
 
     it('should render file info when file is selected', () => {
@@ -1436,7 +1436,7 @@ describe('Uploader', () => {
         />,
       )
 
-      const browseLink = screen.getByText('app.dslUploader.browse')
+      const browseLink = screen.getByRole('button', { name: 'app.dslUploader.browse' })
       const fileInput = document.querySelector('input[type="file"]') as HTMLInputElement
 
       // Mock click on input
@@ -1659,7 +1659,7 @@ describe('Uploader', () => {
         // After click, oncancel should be set
       })
 
-      const browseLink = screen.getByText('app.dslUploader.browse')
+      const browseLink = screen.getByRole('button', { name: 'app.dslUploader.browse' })
       fireEvent.click(browseLink)
 
       // selectHandle should have triggered click on input
diff --git a/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/__tests__/uploader.spec.tsx b/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/__tests__/uploader.spec.tsx
index f4263ab439..bab1d505b7 100644
--- a/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/__tests__/uploader.spec.tsx
+++ b/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/__tests__/uploader.spec.tsx
@@ -50,7 +50,7 @@ describe('Uploader', () => {
 
     it('should render browse link when no file', () => {
       render(<Uploader {...defaultProps} />)
-      expect(screen.getByText(/dslUploader\.browse/i)).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: /dslUploader\.browse/i })).toBeInTheDocument()
     })
 
     it('should render upload icon when no file', () => {
@@ -108,7 +108,7 @@ describe('Uploader', () => {
       const input = document.getElementById('fileUploader') as HTMLInputElement
       const clickSpy = vi.spyOn(input, 'click')
 
-      const browseLink = screen.getByText(/dslUploader\.browse/i)
+      const browseLink = screen.getByRole('button', { name: /dslUploader\.browse/i })
       fireEvent.click(browseLink)
 
       expect(clickSpy).toHaveBeenCalled()
diff --git a/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/dsl-confirm-modal.tsx b/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/dsl-confirm-modal.tsx
index d0c97e185c..849d36807f 100644
--- a/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/dsl-confirm-modal.tsx
+++ b/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/dsl-confirm-modal.tsx
@@ -1,6 +1,13 @@
-import { Button } from '@langgenius/dify-ui/button'
+import {
+  AlertDialog,
+  AlertDialogActions,
+  AlertDialogCancelButton,
+  AlertDialogConfirmButton,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogTitle,
+} from '@langgenius/dify-ui/alert-dialog'
 import { useTranslation } from 'react-i18next'
-import Modal from '@/app/components/base/modal'
 
 type DSLConfirmModalProps = {
   versions?: {
@@ -20,32 +27,36 @@ const DSLConfirmModal = ({
   const { t } = useTranslation()
 
   return (
-    <Modal
-      isShow
-      onClose={() => onCancel()}
-      className="w-[480px]"
+    <AlertDialog
+      open
+      onOpenChange={(open) => {
+        if (!open)
+          onCancel()
+      }}
     >
-      <div className="flex flex-col items-start gap-2 self-stretch pb-4">
-        <div className="title-2xl-semi-bold text-text-primary">{t('newApp.appCreateDSLErrorTitle', { ns: 'app' })}</div>
-        <div className="flex grow flex-col system-md-regular text-text-secondary">
-          <div>{t('newApp.appCreateDSLErrorPart1', { ns: 'app' })}</div>
-          <div>{t('newApp.appCreateDSLErrorPart2', { ns: 'app' })}</div>
-          <br />
-          <div>
-            {t('newApp.appCreateDSLErrorPart3', { ns: 'app' })}
-            <span className="system-md-medium">{versions.importedVersion}</span>
-          </div>
-          <div>
-            {t('newApp.appCreateDSLErrorPart4', { ns: 'app' })}
-            <span className="system-md-medium">{versions.systemVersion}</span>
-          </div>
+      <AlertDialogContent className="w-[480px] max-w-none! overflow-hidden! border-none p-6 text-left align-middle shadow-xl">
+        <div className="flex flex-col items-start gap-2 self-stretch pb-4">
+          <AlertDialogTitle className="title-2xl-semi-bold text-text-primary">{t('newApp.appCreateDSLErrorTitle', { ns: 'app' })}</AlertDialogTitle>
+          <AlertDialogDescription render={<div />} className="flex grow flex-col system-md-regular text-text-secondary">
+            <div>{t('newApp.appCreateDSLErrorPart1', { ns: 'app' })}</div>
+            <div>{t('newApp.appCreateDSLErrorPart2', { ns: 'app' })}</div>
+            <br />
+            <div>
+              {t('newApp.appCreateDSLErrorPart3', { ns: 'app' })}
+              <span className="system-md-medium">{versions.importedVersion}</span>
+            </div>
+            <div>
+              {t('newApp.appCreateDSLErrorPart4', { ns: 'app' })}
+              <span className="system-md-medium">{versions.systemVersion}</span>
+            </div>
+          </AlertDialogDescription>
         </div>
-      </div>
-      <div className="flex items-start justify-end gap-2 self-stretch pt-6">
-        <Button variant="secondary" onClick={() => onCancel()}>{t('newApp.Cancel', { ns: 'app' })}</Button>
-        <Button variant="primary" tone="destructive" onClick={onConfirm} disabled={confirmDisabled}>{t('newApp.Confirm', { ns: 'app' })}</Button>
-      </div>
-    </Modal>
+        <AlertDialogActions className="items-start p-0 pt-6">
+          <AlertDialogCancelButton variant="secondary">{t('newApp.Cancel', { ns: 'app' })}</AlertDialogCancelButton>
+          <AlertDialogConfirmButton onClick={onConfirm} disabled={confirmDisabled}>{t('newApp.Confirm', { ns: 'app' })}</AlertDialogConfirmButton>
+        </AlertDialogActions>
+      </AlertDialogContent>
+    </AlertDialog>
   )
 }
 
diff --git a/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/hooks/__tests__/use-dsl-import.spec.tsx b/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/hooks/__tests__/use-dsl-import.spec.tsx
index b95fa4d5db..a00cdf6098 100644
--- a/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/hooks/__tests__/use-dsl-import.spec.tsx
+++ b/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/hooks/__tests__/use-dsl-import.spec.tsx
@@ -418,7 +418,10 @@ describe('useDSLImport', () => {
 
     it('should handle FAILED status', async () => {
       vi.useFakeTimers({ shouldAdvanceTime: true })
-      mockImportDSL.mockResolvedValue(createImportDSLResponse({ status: 'failed' }))
+      mockImportDSL.mockResolvedValue(createImportDSLResponse({
+        status: 'failed',
+        error: 'Missing rag_pipeline data in YAML content',
+      }))
 
       const { result } = renderHook(
         () => useDSLImport({
@@ -434,9 +437,42 @@ describe('useDSLImport', () => {
       })
 
       await waitFor(() => {
-        expect(toastMocks.record).toHaveBeenCalledWith(expect.objectContaining({
+        expect(toastMocks.record).toHaveBeenCalledWith({
           type: 'error',
-        }))
+          message: 'Missing rag_pipeline data in YAML content',
+        })
+      })
+
+      vi.useRealTimers()
+    })
+
+    it('should show response error when import request rejects with a response body', async () => {
+      vi.useFakeTimers({ shouldAdvanceTime: true })
+      mockImportDSL.mockRejectedValue(new Response(JSON.stringify({
+        error: 'Missing rag_pipeline data in YAML content',
+      }), {
+        status: 400,
+        headers: { 'Content-Type': 'application/json' },
+      }))
+
+      const { result } = renderHook(
+        () => useDSLImport({
+          activeTab: CreateFromDSLModalTab.FROM_URL,
+          dslUrl: 'https://example.com/test.pipeline',
+        }),
+        { wrapper: createWrapper() },
+      )
+
+      await act(async () => {
+        result.current.handleCreateApp()
+        vi.advanceTimersByTime(400)
+      })
+
+      await waitFor(() => {
+        expect(toastMocks.record).toHaveBeenCalledWith({
+          type: 'error',
+          message: 'Missing rag_pipeline data in YAML content',
+        })
       })
 
       vi.useRealTimers()
@@ -692,6 +728,7 @@ describe('useDSLImport', () => {
         status: 'failed',
         pipeline_id: 'pipeline-456',
         dataset_id: 'dataset-789',
+        error: 'Import information expired or does not exist',
       })
 
       const { result } = renderHook(
@@ -718,9 +755,56 @@ describe('useDSLImport', () => {
       })
 
       await waitFor(() => {
-        expect(toastMocks.record).toHaveBeenCalledWith(expect.objectContaining({
+        expect(toastMocks.record).toHaveBeenCalledWith({
           type: 'error',
-        }))
+          message: 'Import information expired or does not exist',
+        })
+      })
+
+      vi.useRealTimers()
+    })
+
+    it('should show response error when confirm request rejects with a response body', async () => {
+      vi.useFakeTimers({ shouldAdvanceTime: true })
+
+      mockImportDSL.mockResolvedValue(createImportDSLResponse({
+        id: 'import-123',
+        status: 'pending',
+      }))
+
+      mockImportDSLConfirm.mockRejectedValue(new Response(JSON.stringify({
+        error: 'Import information expired or does not exist',
+      }), {
+        status: 400,
+        headers: { 'Content-Type': 'application/json' },
+      }))
+
+      const { result } = renderHook(
+        () => useDSLImport({
+          activeTab: CreateFromDSLModalTab.FROM_URL,
+          dslUrl: 'https://example.com/test.pipeline',
+        }),
+        { wrapper: createWrapper() },
+      )
+
+      await act(async () => {
+        result.current.handleCreateApp()
+        vi.advanceTimersByTime(400)
+      })
+
+      await act(async () => {
+        vi.advanceTimersByTime(400)
+      })
+
+      await act(async () => {
+        result.current.onDSLConfirm()
+      })
+
+      await waitFor(() => {
+        expect(toastMocks.record).toHaveBeenCalledWith({
+          type: 'error',
+          message: 'Import information expired or does not exist',
+        })
       })
 
       vi.useRealTimers()
diff --git a/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/hooks/use-dsl-import.ts b/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/hooks/use-dsl-import.ts
index e085ffe1bc..0dbfdf2156 100644
--- a/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/hooks/use-dsl-import.ts
+++ b/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/hooks/use-dsl-import.ts
@@ -22,6 +22,31 @@ type DSLVersions = {
   importedVersion: string
   systemVersion: string
 }
+type ImportErrorResponse = {
+  message?: unknown
+  error?: unknown
+}
+const getNonEmptyString = (value: unknown): string | undefined => {
+  if (typeof value !== 'string')
+    return undefined
+
+  const trimmedValue = value.trim()
+  return trimmedValue || undefined
+}
+const getImportErrorMessage = async (error: unknown): Promise<string | undefined> => {
+  if (error instanceof Response && !error.bodyUsed) {
+    try {
+      const errorData = await error.clone().json() as ImportErrorResponse
+      return getNonEmptyString(errorData.message) ?? getNonEmptyString(errorData.error)
+    }
+    catch {}
+  }
+
+  if (error instanceof Error)
+    return getNonEmptyString(error.message)
+
+  return undefined
+}
 export const useDSLImport = ({ activeTab = CreateFromDSLModalTab.FROM_FILE, dslUrl = '', onSuccess, onClose }: UseDSLImportOptions) => {
   const { push } = useRouter()
   const { t } = useTranslation()
@@ -37,6 +62,9 @@ export const useDSLImport = ({ activeTab = CreateFromDSLModalTab.FROM_FILE, dslU
   const isCreatingRef = useRef(false)
   const { mutateAsync: importDSL } = useImportPipelineDSL()
   const { mutateAsync: importDSLConfirm } = useImportPipelineDSLConfirm()
+  const notifyError = useCallback((message?: string) => {
+    toast.error(message || t('creation.errorTip', { ns: 'datasetPipeline' }))
+  }, [t])
   const readFile = useCallback((file: File) => {
     const reader = new FileReader()
     reader.onload = (event) => {
@@ -60,51 +88,55 @@ export const useDSLImport = ({ activeTab = CreateFromDSLModalTab.FROM_FILE, dslU
     if (isCreatingRef.current)
       return
     isCreatingRef.current = true
-    let response
-    if (currentTab === CreateFromDSLModalTab.FROM_FILE) {
-      response = await importDSL({
-        mode: DSLImportMode.YAML_CONTENT,
-        yaml_content: fileContent || '',
-      })
+    try {
+      let response
+      if (currentTab === CreateFromDSLModalTab.FROM_FILE) {
+        response = await importDSL({
+          mode: DSLImportMode.YAML_CONTENT,
+          yaml_content: fileContent || '',
+        })
+      }
+      if (currentTab === CreateFromDSLModalTab.FROM_URL) {
+        response = await importDSL({
+          mode: DSLImportMode.YAML_URL,
+          yaml_url: dslUrlValue || '',
+        })
+      }
+      if (!response) {
+        notifyError()
+        return
+      }
+      const { id, status, pipeline_id, dataset_id, imported_dsl_version, current_dsl_version } = response
+      if (status === DSLImportStatus.COMPLETED || status === DSLImportStatus.COMPLETED_WITH_WARNINGS) {
+        onSuccess?.()
+        onClose?.()
+        toast(t(status === DSLImportStatus.COMPLETED ? 'creation.successTip' : 'creation.caution', { ns: 'datasetPipeline' }), {
+          type: status === DSLImportStatus.COMPLETED ? 'success' : 'warning',
+          description: status === DSLImportStatus.COMPLETED_WITH_WARNINGS && t('newApp.appCreateDSLWarning', { ns: 'app' }),
+        })
+        if (pipeline_id)
+          await handleCheckPluginDependencies(pipeline_id, true)
+        push(`/datasets/${dataset_id}/pipeline`)
+      }
+      else if (status === DSLImportStatus.PENDING) {
+        setVersions({
+          importedVersion: imported_dsl_version ?? '',
+          systemVersion: current_dsl_version ?? '',
+        })
+        onClose?.()
+        setTimeout(() => {
+          setShowConfirmModal(true)
+        }, 300)
+        setImportId(id)
+      }
+      else {
+        notifyError(response.error)
+      }
     }
-    if (currentTab === CreateFromDSLModalTab.FROM_URL) {
-      response = await importDSL({
-        mode: DSLImportMode.YAML_URL,
-        yaml_url: dslUrlValue || '',
-      })
+    catch (error) {
+      notifyError(await getImportErrorMessage(error))
     }
-    if (!response) {
-      toast.error(t('creation.errorTip', { ns: 'datasetPipeline' }))
-      isCreatingRef.current = false
-      return
-    }
-    const { id, status, pipeline_id, dataset_id, imported_dsl_version, current_dsl_version } = response
-    if (status === DSLImportStatus.COMPLETED || status === DSLImportStatus.COMPLETED_WITH_WARNINGS) {
-      onSuccess?.()
-      onClose?.()
-      toast(t(status === DSLImportStatus.COMPLETED ? 'creation.successTip' : 'creation.caution', { ns: 'datasetPipeline' }), {
-        type: status === DSLImportStatus.COMPLETED ? 'success' : 'warning',
-        description: status === DSLImportStatus.COMPLETED_WITH_WARNINGS && t('newApp.appCreateDSLWarning', { ns: 'app' }),
-      })
-      if (pipeline_id)
-        await handleCheckPluginDependencies(pipeline_id, true)
-      push(`/datasets/${dataset_id}/pipeline`)
-      isCreatingRef.current = false
-    }
-    else if (status === DSLImportStatus.PENDING) {
-      setVersions({
-        importedVersion: imported_dsl_version ?? '',
-        systemVersion: current_dsl_version ?? '',
-      })
-      onClose?.()
-      setTimeout(() => {
-        setShowConfirmModal(true)
-      }, 300)
-      setImportId(id)
-      isCreatingRef.current = false
-    }
-    else {
-      toast.error(t('creation.errorTip', { ns: 'datasetPipeline' }))
+    finally {
       isCreatingRef.current = false
     }
   }, [
@@ -114,6 +146,7 @@ export const useDSLImport = ({ activeTab = CreateFromDSLModalTab.FROM_FILE, dslU
     fileContent,
     importDSL,
     t,
+    notifyError,
     onSuccess,
     onClose,
     handleCheckPluginDependencies,
@@ -124,25 +157,32 @@ export const useDSLImport = ({ activeTab = CreateFromDSLModalTab.FROM_FILE, dslU
     if (!importId)
       return
     setIsConfirming(true)
-    const response = await importDSLConfirm(importId)
-    setIsConfirming(false)
-    if (!response) {
-      toast.error(t('creation.errorTip', { ns: 'datasetPipeline' }))
-      return
+    try {
+      const response = await importDSLConfirm(importId)
+      if (!response) {
+        notifyError()
+        return
+      }
+      const { status, pipeline_id, dataset_id, error } = response
+      if (status === DSLImportStatus.COMPLETED) {
+        onSuccess?.()
+        setShowConfirmModal(false)
+        toast.success(t('creation.successTip', { ns: 'datasetPipeline' }))
+        if (pipeline_id)
+          await handleCheckPluginDependencies(pipeline_id, true)
+        push(`/datasets/${dataset_id}/pipeline`)
+      }
+      else if (status === DSLImportStatus.FAILED) {
+        notifyError(error)
+      }
     }
-    const { status, pipeline_id, dataset_id } = response
-    if (status === DSLImportStatus.COMPLETED) {
-      onSuccess?.()
-      setShowConfirmModal(false)
-      toast.success(t('creation.successTip', { ns: 'datasetPipeline' }))
-      if (pipeline_id)
-        await handleCheckPluginDependencies(pipeline_id, true)
-      push(`/datasets/${dataset_id}/pipeline`)
+    catch (error) {
+      notifyError(await getImportErrorMessage(error))
     }
-    else if (status === DSLImportStatus.FAILED) {
-      toast.error(t('creation.errorTip', { ns: 'datasetPipeline' }))
+    finally {
+      setIsConfirming(false)
     }
-  }, [importId, importDSLConfirm, t, onSuccess, handleCheckPluginDependencies, push])
+  }, [importId, importDSLConfirm, notifyError, t, onSuccess, handleCheckPluginDependencies, push])
   const handleCancelConfirm = useCallback(() => {
     setShowConfirmModal(false)
   }, [])
diff --git a/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/index.tsx b/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/index.tsx
index 4f5b5c23fd..8aeaed3ebd 100644
--- a/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/index.tsx
+++ b/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/index.tsx
@@ -1,10 +1,9 @@
 'use client'
 import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { useKeyPress } from 'ahooks'
-import { noop } from 'es-toolkit/function'
 import { useTranslation } from 'react-i18next'
 import Input from '@/app/components/base/input'
-import Modal from '@/app/components/base/modal'
 import DSLConfirmModal from './dsl-confirm-modal'
 import Header from './header'
 import { CreateFromDSLModalTab, useDSLImport } from './hooks/use-dsl-import'
@@ -54,55 +53,54 @@ const CreateFromDSLModal = ({
   useKeyPress('esc', () => {
     if (show && !showConfirmModal)
       onClose()
-  })
+  }, { target: () => document })
 
   return (
     <>
-      <Modal
-        className="w-[520px] rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg p-0 shadow-xl"
-        isShow={show}
-        onClose={noop}
-      >
-        <Header onClose={onClose} />
-        <Tab
-          currentTab={currentTab}
-          setCurrentTab={setCurrentTab}
-        />
-        <div className="px-6 py-4">
-          {currentTab === CreateFromDSLModalTab.FROM_FILE && (
-            <Uploader
-              className="mt-0"
-              file={currentFile}
-              updateFile={handleFile}
-            />
-          )}
-          {currentTab === CreateFromDSLModalTab.FROM_URL && (
-            <div>
-              <div className="leading6 mb-1 system-md-semibold text-text-secondary">
-                DSL URL
-              </div>
-              <Input
-                placeholder={t('importFromDSLUrlPlaceholder', { ns: 'app' }) || ''}
-                value={dslUrlValue}
-                onChange={e => setDslUrlValue(e.target.value)}
+      <Dialog open={show}>
+        <DialogContent className="w-full max-w-[480px]! overflow-hidden! rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg p-0! text-left align-middle shadow-xl">
+
+          <Header onClose={onClose} />
+          <Tab
+            currentTab={currentTab}
+            setCurrentTab={setCurrentTab}
+          />
+          <div className="px-6 py-4">
+            {currentTab === CreateFromDSLModalTab.FROM_FILE && (
+              <Uploader
+                className="mt-0"
+                file={currentFile}
+                updateFile={handleFile}
               />
-            </div>
-          )}
-        </div>
-        <div className="flex justify-end gap-x-2 p-6 pt-5">
-          <Button onClick={onClose}>
-            {t('newApp.Cancel', { ns: 'app' })}
-          </Button>
-          <Button
-            disabled={buttonDisabled}
-            variant="primary"
-            onClick={handleCreateApp}
-            className="gap-1"
-          >
-            <span>{t('newApp.import', { ns: 'app' })}</span>
-          </Button>
-        </div>
-      </Modal>
+            )}
+            {currentTab === CreateFromDSLModalTab.FROM_URL && (
+              <div>
+                <div className="leading6 mb-1 system-md-semibold text-text-secondary">
+                  DSL URL
+                </div>
+                <Input
+                  placeholder={t('importFromDSLUrlPlaceholder', { ns: 'app' }) || ''}
+                  value={dslUrlValue}
+                  onChange={e => setDslUrlValue(e.target.value)}
+                />
+              </div>
+            )}
+          </div>
+          <div className="flex justify-end gap-x-2 p-6 pt-5">
+            <Button onClick={onClose}>
+              {t('newApp.Cancel', { ns: 'app' })}
+            </Button>
+            <Button
+              disabled={buttonDisabled}
+              variant="primary"
+              onClick={handleCreateApp}
+              className="gap-1"
+            >
+              <span>{t('newApp.import', { ns: 'app' })}</span>
+            </Button>
+          </div>
+        </DialogContent>
+      </Dialog>
       {showConfirmModal && (
         <DSLConfirmModal
           versions={versions}
diff --git a/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/uploader.tsx b/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/uploader.tsx
index f0499c6965..9b4cf2c488 100644
--- a/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/uploader.tsx
+++ b/web/app/components/datasets/create-from-pipeline/create-options/create-from-dsl-modal/uploader.tsx
@@ -90,9 +90,13 @@ const Uploader: FC<Props> = ({ file, updateFile, className }) => {
               <RiUploadCloud2Line className="h-6 w-6 text-text-tertiary" />
               <div className="text-text-tertiary">
                 {t('dslUploader.button', { ns: 'app' })}
-                <span className="cursor-pointer pl-1 text-text-accent" onClick={selectHandle}>
+                <button
+                  type="button"
+                  className="inline cursor-pointer border-none bg-transparent p-0 pl-1 text-left text-text-accent focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+                  onClick={selectHandle}
+                >
                   {t('dslUploader.browse', { ns: 'app' })}
-                </span>
+                </button>
               </div>
             </div>
             {dragging && <div ref={dragRef} className="absolute top-0 left-0 h-full w-full" />}
diff --git a/web/app/components/datasets/create-from-pipeline/list/template-card/__tests__/index.spec.tsx b/web/app/components/datasets/create-from-pipeline/list/template-card/__tests__/index.spec.tsx
index bcf2c068ef..8f28f75045 100644
--- a/web/app/components/datasets/create-from-pipeline/list/template-card/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/create-from-pipeline/list/template-card/__tests__/index.spec.tsx
@@ -323,6 +323,21 @@ describe('TemplateCard', () => {
       })
     })
 
+    it('should close details modal when dialog requests close', async () => {
+      render(<TemplateCard {...defaultProps} />)
+      fireEvent.click(screen.getByTestId('action-details'))
+
+      await waitFor(() => {
+        expect(screen.getByTestId('details-component')).toBeInTheDocument()
+      })
+
+      fireEvent.keyDown(document, { key: 'Escape', code: 'Escape' })
+
+      await waitFor(() => {
+        expect(screen.queryByTestId('details-component')).not.toBeInTheDocument()
+      })
+    })
+
     it('should trigger use template from details modal', async () => {
       mockCreateDataset.mockImplementation((_data, callbacks) => {
         callbacks.onSuccess({ dataset_id: 'new-dataset-123', pipeline_id: 'pipe-123' })
@@ -593,6 +608,21 @@ describe('TemplateCard', () => {
         expect(screen.queryByTestId('edit-pipeline-info')).not.toBeInTheDocument()
       })
     })
+
+    it('should close edit modal when dialog requests close', async () => {
+      render(<TemplateCard {...defaultProps} />)
+      fireEvent.click(screen.getByTestId('action-edit'))
+
+      await waitFor(() => {
+        expect(screen.getByTestId('edit-pipeline-info')).toBeInTheDocument()
+      })
+
+      fireEvent.keyDown(document, { key: 'Escape', code: 'Escape' })
+
+      await waitFor(() => {
+        expect(screen.queryByTestId('edit-pipeline-info')).not.toBeInTheDocument()
+      })
+    })
   })
 
   // Props Tests
diff --git a/web/app/components/datasets/create-from-pipeline/list/template-card/index.tsx b/web/app/components/datasets/create-from-pipeline/list/template-card/index.tsx
index 03bda31f1f..46fb673ce8 100644
--- a/web/app/components/datasets/create-from-pipeline/list/template-card/index.tsx
+++ b/web/app/components/datasets/create-from-pipeline/list/template-card/index.tsx
@@ -8,12 +8,12 @@ import {
   AlertDialogDescription,
   AlertDialogTitle,
 } from '@langgenius/dify-ui/alert-dialog'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
 import * as React from 'react'
 import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { trackEvent } from '@/app/components/base/amplitude'
-import Modal from '@/app/components/base/modal'
 import { usePluginDependencies } from '@/app/components/workflow/plugin-dependency/hooks'
 import { useRouter } from '@/next/navigation'
 import { useCreatePipelineDatasetFromCustomized } from '@/service/knowledge/use-create-dataset'
@@ -153,16 +153,21 @@ const TemplateCard = ({
         handleDelete={handleDelete}
       />
       {showEditModal && (
-        <Modal
-          isShow={showEditModal}
-          onClose={closeEditModal}
-          className="max-w-[520px] p-0"
+        <Dialog
+          open={showEditModal}
+          onOpenChange={(open) => {
+            if (!open)
+              closeEditModal()
+          }}
         >
-          <EditPipelineInfo
-            pipeline={pipeline}
-            onClose={closeEditModal}
-          />
-        </Modal>
+          <DialogContent className="w-[calc(100vw-2rem)] max-w-[520px]! overflow-hidden! border-none p-0 text-left align-middle">
+
+            <EditPipelineInfo
+              pipeline={pipeline}
+              onClose={closeEditModal}
+            />
+          </DialogContent>
+        </Dialog>
       )}
       <AlertDialog open={showDeleteConfirm} onOpenChange={open => !open && onCancelDelete()}>
         <AlertDialogContent>
@@ -183,18 +188,23 @@ const TemplateCard = ({
         </AlertDialogContent>
       </AlertDialog>
       {showDetailModal && (
-        <Modal
-          isShow={showDetailModal}
-          onClose={closeDetailsModal}
-          className="h-[calc(100vh-64px)] max-w-[1680px] rounded-3xl p-0"
+        <Dialog
+          open={showDetailModal}
+          onOpenChange={(open) => {
+            if (!open)
+              closeDetailsModal()
+          }}
         >
-          <Details
-            id={pipeline.id}
-            type={type}
-            onClose={closeDetailsModal}
-            onApplyTemplate={handleUseTemplate}
-          />
-        </Modal>
+          <DialogContent className="h-[calc(100dvh-64px)] max-h-[calc(100dvh-64px)] w-[calc(100vw-2rem)] max-w-[1680px]! overflow-hidden! rounded-3xl border-none p-0 text-left align-middle">
+
+            <Details
+              id={pipeline.id}
+              type={type}
+              onClose={closeDetailsModal}
+              onApplyTemplate={handleUseTemplate}
+            />
+          </DialogContent>
+        </Dialog>
       )}
     </div>
   )
diff --git a/web/app/components/datasets/create/empty-dataset-creation-modal/__tests__/index.spec.tsx b/web/app/components/datasets/create/empty-dataset-creation-modal/__tests__/index.spec.tsx
index a9b91fb1bc..32b7b1d17d 100644
--- a/web/app/components/datasets/create/empty-dataset-creation-modal/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/create/empty-dataset-creation-modal/__tests__/index.spec.tsx
@@ -148,14 +148,8 @@ describe('EmptyDatasetCreationModal', () => {
         const mockOnHide = vi.fn()
         render(<EmptyDatasetCreationModal show={true} onHide={mockOnHide} />)
 
-        // Act - Wait for modal to be rendered, then find the close span
-        // The close span is located in the modalHeader div, next to the title
-        const titleElement = await screen.findByText('datasetCreation.stepOne.modal.title')
-        const headerDiv = titleElement.parentElement
-        const closeButton = headerDiv?.querySelector('span')
-
-        expect(closeButton).toBeInTheDocument()
-        fireEvent.click(closeButton!)
+        const closeButton = await screen.findByRole('button', { name: /operation\.close$/ })
+        fireEvent.click(closeButton)
 
         expect(mockOnHide).toHaveBeenCalledTimes(1)
       })
diff --git a/web/app/components/datasets/create/empty-dataset-creation-modal/index.module.css b/web/app/components/datasets/create/empty-dataset-creation-modal/index.module.css
index 435aeaf3c0..803bcac413 100644
--- a/web/app/components/datasets/create/empty-dataset-creation-modal/index.module.css
+++ b/web/app/components/datasets/create/empty-dataset-creation-modal/index.module.css
@@ -1,9 +1,5 @@
 @reference "../../../../styles/globals.css";
 
-.modal {
-  position: relative;
-}
-
 .modalHeader {
   @apply flex items-center place-content-between h-8;
 }
@@ -19,7 +15,7 @@
   background-size: 16px;
 }
 
-.modal .tip {
+.tip {
   @apply mt-1 mb-8 text-text-tertiary;
   font-weight: 400;
   font-size: 13px;
diff --git a/web/app/components/datasets/create/empty-dataset-creation-modal/index.tsx b/web/app/components/datasets/create/empty-dataset-creation-modal/index.tsx
index fdb032b1ef..1e539ac12b 100644
--- a/web/app/components/datasets/create/empty-dataset-creation-modal/index.tsx
+++ b/web/app/components/datasets/create/empty-dataset-creation-modal/index.tsx
@@ -1,13 +1,13 @@
 'use client'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
 import * as React from 'react'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { trackEvent } from '@/app/components/base/amplitude'
 import Input from '@/app/components/base/input'
-import Modal from '@/app/components/base/modal'
 import { useRouter } from '@/next/navigation'
 import { createEmptyDataset } from '@/service/datasets'
 import { useInvalidDatasetList } from '@/service/knowledge/use-dataset'
@@ -46,21 +46,35 @@ const EmptyDatasetCreationModal = ({ show = false, onHide }: IProps) => {
     }
   }
   return (
-    <Modal isShow={show} onClose={onHide} className={cn(s.modal, '!max-w-[520px]', 'px-8')}>
-      <div className={s.modalHeader}>
-        <div className={s.title}>{t('stepOne.modal.title', { ns: 'datasetCreation' })}</div>
-        <span className={s.close} onClick={onHide} />
-      </div>
-      <div className={s.tip}>{t('stepOne.modal.tip', { ns: 'datasetCreation' })}</div>
-      <div className={s.form}>
-        <div className={s.label}>{t('stepOne.modal.input', { ns: 'datasetCreation' })}</div>
-        <Input value={inputValue} placeholder={t('stepOne.modal.placeholder', { ns: 'datasetCreation' }) || ''} onChange={e => setInputValue(e.target.value)} />
-      </div>
-      <div className="flex flex-row-reverse">
-        <Button className="ml-2 w-24" variant="primary" onClick={submit}>{t('stepOne.modal.confirmButton', { ns: 'datasetCreation' })}</Button>
-        <Button className="w-24" onClick={onHide}>{t('stepOne.modal.cancelButton', { ns: 'datasetCreation' })}</Button>
-      </div>
-    </Modal>
+    <Dialog
+      open={show}
+      onOpenChange={(open) => {
+        if (!open)
+          onHide()
+      }}
+    >
+      <DialogContent className="w-full max-w-[520px]! overflow-hidden! border-none px-8 text-left align-middle">
+
+        <div className={s.modalHeader}>
+          <div className={s.title}>{t('stepOne.modal.title', { ns: 'datasetCreation' })}</div>
+          <button
+            type="button"
+            className={cn(s.close, 'border-none bg-transparent p-0 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden')}
+            aria-label={t('operation.close', { ns: 'common' })}
+            onClick={onHide}
+          />
+        </div>
+        <div className={s.tip}>{t('stepOne.modal.tip', { ns: 'datasetCreation' })}</div>
+        <div className={s.form}>
+          <div className={s.label}>{t('stepOne.modal.input', { ns: 'datasetCreation' })}</div>
+          <Input value={inputValue} placeholder={t('stepOne.modal.placeholder', { ns: 'datasetCreation' }) || ''} onChange={e => setInputValue(e.target.value)} />
+        </div>
+        <div className="flex flex-row-reverse">
+          <Button className="ml-2 w-24" variant="primary" onClick={submit}>{t('stepOne.modal.confirmButton', { ns: 'datasetCreation' })}</Button>
+          <Button className="w-24" onClick={onHide}>{t('stepOne.modal.cancelButton', { ns: 'datasetCreation' })}</Button>
+        </div>
+      </DialogContent>
+    </Dialog>
   )
 }
 export default EmptyDatasetCreationModal
diff --git a/web/app/components/datasets/create/file-preview/__tests__/index.spec.tsx b/web/app/components/datasets/create/file-preview/__tests__/index.spec.tsx
index 6839a8cc87..c016807186 100644
--- a/web/app/components/datasets/create/file-preview/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/create/file-preview/__tests__/index.spec.tsx
@@ -73,9 +73,9 @@ describe('FilePreview', () => {
     })
 
     it('should render close button with XMarkIcon', async () => {
-      const { container } = renderFilePreview()
+      renderFilePreview()
 
-      const closeButton = container.querySelector('.cursor-pointer')
+      const closeButton = screen.getByRole('button', { name: /operation\.close$/ })
       expect(closeButton)!.toBeInTheDocument()
       const xMarkIcon = closeButton?.querySelector('svg')
       expect(xMarkIcon)!.toBeInTheDocument()
@@ -269,20 +269,18 @@ describe('FilePreview', () => {
   describe('User Interactions', () => {
     it('should call hidePreview when close button is clicked', async () => {
       const hidePreview = vi.fn()
-      const { container } = renderFilePreview({ hidePreview })
+      renderFilePreview({ hidePreview })
 
-      const closeButton = container.querySelector('.cursor-pointer') as HTMLElement
-      fireEvent.click(closeButton)
+      fireEvent.click(screen.getByRole('button', { name: /operation\.close$/ }))
 
       expect(hidePreview).toHaveBeenCalledTimes(1)
     })
 
     it('should call hidePreview with event object when clicked', async () => {
       const hidePreview = vi.fn()
-      const { container } = renderFilePreview({ hidePreview })
+      renderFilePreview({ hidePreview })
 
-      const closeButton = container.querySelector('.cursor-pointer') as HTMLElement
-      fireEvent.click(closeButton)
+      fireEvent.click(screen.getByRole('button', { name: /operation\.close$/ }))
 
       // Assert - onClick receives the event object
       expect(hidePreview).toHaveBeenCalled()
@@ -291,9 +289,9 @@ describe('FilePreview', () => {
 
     it('should handle multiple clicks on close button', async () => {
       const hidePreview = vi.fn()
-      const { container } = renderFilePreview({ hidePreview })
+      renderFilePreview({ hidePreview })
 
-      const closeButton = container.querySelector('.cursor-pointer') as HTMLElement
+      const closeButton = screen.getByRole('button', { name: /operation\.close$/ })
       fireEvent.click(closeButton)
       fireEvent.click(closeButton)
       fireEvent.click(closeButton)
diff --git a/web/app/components/datasets/create/file-preview/index.tsx b/web/app/components/datasets/create/file-preview/index.tsx
index 2b4041eaf2..ae1cdd3dd1 100644
--- a/web/app/components/datasets/create/file-preview/index.tsx
+++ b/web/app/components/datasets/create/file-preview/index.tsx
@@ -50,9 +50,14 @@ const FilePreview = ({
       <div className={cn(s.previewHeader)}>
         <div className={cn(s.title, 'title-md-semi-bold')}>
           <span>{t('stepOne.filePreview', { ns: 'datasetCreation' })}</span>
-          <div className="flex h-6 w-6 cursor-pointer items-center justify-center" onClick={hidePreview}>
-            <XMarkIcon className="h-4 w-4"></XMarkIcon>
-          </div>
+          <button
+            type="button"
+            className="flex h-6 w-6 cursor-pointer items-center justify-center border-none bg-transparent p-0 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+            aria-label={t('operation.close', { ns: 'common' })}
+            onClick={hidePreview}
+          >
+            <XMarkIcon className="h-4 w-4" aria-hidden="true"></XMarkIcon>
+          </button>
         </div>
         <div className={cn(s.fileName, 'system-xs-medium')}>
           <span>{getFileName(file)}</span>
diff --git a/web/app/components/datasets/create/notion-page-preview/__tests__/index.spec.tsx b/web/app/components/datasets/create/notion-page-preview/__tests__/index.spec.tsx
index 572677ced7..d69a3b5513 100644
--- a/web/app/components/datasets/create/notion-page-preview/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/create/notion-page-preview/__tests__/index.spec.tsx
@@ -118,9 +118,9 @@ describe('NotionPagePreview', () => {
     })
 
     it('should render close button with XMarkIcon', async () => {
-      const { container } = await renderNotionPagePreview()
+      await renderNotionPagePreview()
 
-      const closeButton = container.querySelector('.cursor-pointer')
+      const closeButton = screen.getByRole('button', { name: /operation\.close$/ })
       expect(closeButton).toBeInTheDocument()
       const xMarkIcon = closeButton?.querySelector('svg')
       expect(xMarkIcon).toBeInTheDocument()
@@ -348,19 +348,18 @@ describe('NotionPagePreview', () => {
   describe('User Interactions', () => {
     it('should call hidePreview when close button is clicked', async () => {
       const hidePreview = vi.fn()
-      const { container } = await renderNotionPagePreview({ hidePreview })
+      await renderNotionPagePreview({ hidePreview })
 
-      const closeButton = container.querySelector('.cursor-pointer') as HTMLElement
-      fireEvent.click(closeButton)
+      fireEvent.click(screen.getByRole('button', { name: /operation\.close$/ }))
 
       expect(hidePreview).toHaveBeenCalledTimes(1)
     })
 
     it('should handle multiple clicks on close button', async () => {
       const hidePreview = vi.fn()
-      const { container } = await renderNotionPagePreview({ hidePreview })
+      await renderNotionPagePreview({ hidePreview })
 
-      const closeButton = container.querySelector('.cursor-pointer') as HTMLElement
+      const closeButton = screen.getByRole('button', { name: /operation\.close$/ })
       fireEvent.click(closeButton)
       fireEvent.click(closeButton)
       fireEvent.click(closeButton)
diff --git a/web/app/components/datasets/create/notion-page-preview/index.tsx b/web/app/components/datasets/create/notion-page-preview/index.tsx
index 116090413a..c2eed225c0 100644
--- a/web/app/components/datasets/create/notion-page-preview/index.tsx
+++ b/web/app/components/datasets/create/notion-page-preview/index.tsx
@@ -52,9 +52,14 @@ const NotionPagePreview = ({
       <div className={cn(s.previewHeader)}>
         <div className={cn(s.title, 'title-md-semi-bold')}>
           <span>{t('stepOne.pagePreview', { ns: 'datasetCreation' })}</span>
-          <div className="flex h-6 w-6 cursor-pointer items-center justify-center" onClick={hidePreview}>
-            <XMarkIcon className="h-4 w-4"></XMarkIcon>
-          </div>
+          <button
+            type="button"
+            className="flex h-6 w-6 cursor-pointer items-center justify-center border-none bg-transparent p-0 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+            aria-label={t('operation.close', { ns: 'common' })}
+            onClick={hidePreview}
+          >
+            <XMarkIcon className="h-4 w-4" aria-hidden="true"></XMarkIcon>
+          </button>
         </div>
         <div className={cn(s.fileName, 'system-xs-medium')}>
           <NotionIcon
diff --git a/web/app/components/datasets/create/step-two/components/general-chunking-options.tsx b/web/app/components/datasets/create/step-two/components/general-chunking-options.tsx
index f0740e9cf4..8e32989d3f 100644
--- a/web/app/components/datasets/create/step-two/components/general-chunking-options.tsx
+++ b/web/app/components/datasets/create/step-two/components/general-chunking-options.tsx
@@ -3,14 +3,14 @@
 import type { FC } from 'react'
 import type { PreProcessingRule, SummaryIndexSetting as SummaryIndexSettingType } from '@/models/datasets'
 import { Button } from '@langgenius/dify-ui/button'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import {
   RiAlertFill,
   RiSearchEyeLine,
 } from '@remixicon/react'
 import { useTranslation } from 'react-i18next'
-import Checkbox from '@/app/components/base/checkbox'
 import Divider from '@/app/components/base/divider'
+import { Infotip } from '@/app/components/base/infotip'
 import SummaryIndexSetting from '@/app/components/datasets/settings/summary-index-setting'
 import { IS_CE_EDITION } from '@/config'
 import { ChunkingMode } from '@/models/datasets'
@@ -141,16 +141,18 @@ export const GeneralChunkingOptions: FC<GeneralChunkingOptionsProps> = ({
           </div>
           <div className="mt-1">
             {rules.map(rule => (
-              <div
+              <label
                 key={rule.id}
-                className={s.ruleItem}
-                onClick={() => onRuleToggle(rule.id)}
+                className={`${s.ruleItem} cursor-pointer`}
               >
-                <Checkbox checked={rule.enabled} />
-                <label className="ml-2 cursor-pointer system-sm-regular text-text-secondary">
+                <Checkbox
+                  checked={rule.enabled}
+                  onCheckedChange={() => onRuleToggle(rule.id)}
+                />
+                <span className="ml-2 system-sm-regular text-text-secondary">
                   {getRuleName(rule.id)}
-                </label>
-              </div>
+                </span>
+              </label>
             ))}
             {
               showSummaryIndexSetting && IS_CE_EDITION && (
@@ -167,42 +169,37 @@ export const GeneralChunkingOptions: FC<GeneralChunkingOptionsProps> = ({
               <>
                 <Divider type="horizontal" className="my-4 bg-divider-subtle" />
                 <div className="flex items-center py-0.5">
-                  <div
-                    className="flex items-center"
-                    onClick={() => {
-                      if (hasCurrentDatasetDocForm)
-                        return
-                      if (currentDocForm === ChunkingMode.qa)
-                        onDocFormChange(ChunkingMode.text)
-                      else
-                        onDocFormChange(ChunkingMode.qa)
-                    }}
+                  <label
+                    className={`flex items-center ${hasCurrentDatasetDocForm ? '' : 'cursor-pointer'}`}
                   >
                     <Checkbox
                       checked={currentDocForm === ChunkingMode.qa}
                       disabled={hasCurrentDatasetDocForm}
+                      onCheckedChange={() => {
+                        if (hasCurrentDatasetDocForm)
+                          return
+                        if (currentDocForm === ChunkingMode.qa)
+                          onDocFormChange(ChunkingMode.text)
+                        else
+                          onDocFormChange(ChunkingMode.qa)
+                      }}
                     />
-                    <label className="ml-2 cursor-pointer system-sm-regular text-text-secondary">
+                    <span className="ml-2 system-sm-regular text-text-secondary">
                       {t('stepTwo.useQALanguage', { ns: 'datasetCreation' })}
-                    </label>
-                  </div>
+                    </span>
+                  </label>
                   <LanguageSelect
                     currentLanguage={docLanguage || locale}
                     onSelect={onDocLanguageChange}
                     disabled={currentDocForm !== ChunkingMode.qa}
                   />
-                  <Tooltip>
-                    <TooltipTrigger
-                      render={(
-                        <span className="flex h-3.5 w-3.5 shrink-0 p-px">
-                          <span aria-hidden className="i-ri-question-line h-full w-full text-text-quaternary hover:text-text-tertiary" />
-                        </span>
-                      )}
-                    />
-                    <TooltipContent>
-                      {t('stepTwo.QATip', { ns: 'datasetCreation' })}
-                    </TooltipContent>
-                  </Tooltip>
+                  <Infotip
+                    aria-label={t('stepTwo.QATip', { ns: 'datasetCreation' })}
+                    className="h-3.5 w-3.5"
+                    iconClassName="h-full w-full"
+                  >
+                    {t('stepTwo.QATip', { ns: 'datasetCreation' })}
+                  </Infotip>
                 </div>
                 {currentDocForm === ChunkingMode.qa && (
                   <div
diff --git a/web/app/components/datasets/create/step-two/components/parent-child-options.tsx b/web/app/components/datasets/create/step-two/components/parent-child-options.tsx
index d3f0509e93..a7e447eaf7 100644
--- a/web/app/components/datasets/create/step-two/components/parent-child-options.tsx
+++ b/web/app/components/datasets/create/step-two/components/parent-child-options.tsx
@@ -4,9 +4,9 @@ import type { FC } from 'react'
 import type { ParentChildConfig } from '../hooks'
 import type { ParentMode, PreProcessingRule, SummaryIndexSetting as SummaryIndexSettingType } from '@/models/datasets'
 import { Button } from '@langgenius/dify-ui/button'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import { RiSearchEyeLine } from '@remixicon/react'
 import { useTranslation } from 'react-i18next'
-import Checkbox from '@/app/components/base/checkbox'
 import Divider from '@/app/components/base/divider'
 import { ParentChildChunk } from '@/app/components/base/icons/src/vender/knowledge'
 import RadioCard from '@/app/components/base/radio-card'
@@ -179,16 +179,18 @@ export const ParentChildOptions: FC<ParentChildOptionsProps> = ({
           </div>
           <div className="mt-1">
             {rules.map(rule => (
-              <div
+              <label
                 key={rule.id}
-                className={s.ruleItem}
-                onClick={() => onRuleToggle(rule.id)}
+                className={`${s.ruleItem} cursor-pointer`}
               >
-                <Checkbox checked={rule.enabled} />
-                <label className="ml-2 cursor-pointer system-sm-regular text-text-secondary">
+                <Checkbox
+                  checked={rule.enabled}
+                  onCheckedChange={() => onRuleToggle(rule.id)}
+                />
+                <span className="ml-2 system-sm-regular text-text-secondary">
                   {getRuleName(rule.id)}
-                </label>
-              </div>
+                </span>
+              </label>
             ))}
             {
               showSummaryIndexSetting && IS_CE_EDITION && (
diff --git a/web/app/components/datasets/create/step-two/components/preview-panel.tsx b/web/app/components/datasets/create/step-two/components/preview-panel.tsx
index 254a28619c..9f10863288 100644
--- a/web/app/components/datasets/create/step-two/components/preview-panel.tsx
+++ b/web/app/components/datasets/create/step-two/components/preview-panel.tsx
@@ -54,7 +54,7 @@ export const PreviewPanel: FC<PreviewPanelProps> = ({
   const { t } = useTranslation()
 
   return (
-    <FloatRightContainer isMobile={isMobile} isOpen={true} onClose={noop} footer={null}>
+    <FloatRightContainer isMobile={isMobile} isOpen={true} onClose={noop}>
       <PreviewContainer
         header={(
           <PreviewHeader title={t('stepTwo.preview', { ns: 'datasetCreation' })}>
diff --git a/web/app/components/datasets/create/stop-embedding-modal/__tests__/index.spec.tsx b/web/app/components/datasets/create/stop-embedding-modal/__tests__/index.spec.tsx
index 1b3abfeadc..5f0cd67fbf 100644
--- a/web/app/components/datasets/create/stop-embedding-modal/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/create/stop-embedding-modal/__tests__/index.spec.tsx
@@ -25,8 +25,7 @@ const renderStopEmbeddingModal = (props: Partial<StopEmbeddingModalProps> = {})
 
 // StopEmbeddingModal Component Tests
 describe('StopEmbeddingModal', () => {
-  // Suppress Headless UI warnings in tests
-  // These warnings are from the library's internal behavior, not our code
+  // Suppress expected modal warnings in tests.
   let consoleWarnSpy: MockInstance
   let consoleErrorSpy: MockInstance
 
@@ -85,9 +84,8 @@ describe('StopEmbeddingModal', () => {
     it('should render buttons in correct order (cancel first, then confirm)', () => {
       renderStopEmbeddingModal({ show: true })
 
-      // Assert - Due to flex-row-reverse, confirm appears first visually but cancel is first in DOM
-      const buttons = screen.getAllByRole('button')
-      expect(buttons).toHaveLength(2)
+      expect(screen.getByRole('button', { name: 'datasetCreation.stepThree.modelButtonCancel' })).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'datasetCreation.stepThree.modelButtonConfirm' })).toBeInTheDocument()
     })
 
     it('should render confirm button with primary variant styling', () => {
@@ -291,48 +289,28 @@ describe('StopEmbeddingModal', () => {
     })
 
     describe('Close Icon', () => {
-      it('should call onHide when close span is clicked', async () => {
+      it('should call onHide when close button is clicked', async () => {
         const onConfirm = vi.fn()
         const onHide = vi.fn()
-        const { container } = renderStopEmbeddingModal({ onConfirm, onHide })
+        renderStopEmbeddingModal({ onConfirm, onHide })
 
-        // Act - Find the close span (it should be the span with onClick handler)
-        const spans = container.querySelectorAll('span')
-        const closeSpan = Array.from(spans).find(span =>
-          span.className && span.getAttribute('class')?.includes('close'),
-        )
+        await act(async () => {
+          fireEvent.click(screen.getByRole('button', { name: /operation\.close$/ }))
+        })
 
-        if (closeSpan) {
-          await act(async () => {
-            fireEvent.click(closeSpan)
-          })
-
-          expect(onHide).toHaveBeenCalledTimes(1)
-        }
-        else {
-          // If no close span found with class, just verify the modal renders
-          // If no close span found with class, just verify the modal renders
-          expect(screen.getByText('datasetCreation.stepThree.modelTitle'))!.toBeInTheDocument()
-        }
+        expect(onHide).toHaveBeenCalledTimes(1)
       })
 
-      it('should not call onConfirm when close span is clicked', async () => {
+      it('should not call onConfirm when close button is clicked', async () => {
         const onConfirm = vi.fn()
         const onHide = vi.fn()
-        const { container } = renderStopEmbeddingModal({ onConfirm, onHide })
+        renderStopEmbeddingModal({ onConfirm, onHide })
 
-        const spans = container.querySelectorAll('span')
-        const closeSpan = Array.from(spans).find(span =>
-          span.className && span.getAttribute('class')?.includes('close'),
-        )
+        await act(async () => {
+          fireEvent.click(screen.getByRole('button', { name: /operation\.close$/ }))
+        })
 
-        if (closeSpan) {
-          await act(async () => {
-            fireEvent.click(closeSpan)
-          })
-
-          expect(onConfirm).not.toHaveBeenCalled()
-        }
+        expect(onConfirm).not.toHaveBeenCalled()
       })
     })
 
@@ -445,8 +423,8 @@ describe('StopEmbeddingModal', () => {
     it('should have buttons container with flex-row-reverse', () => {
       renderStopEmbeddingModal({ show: true })
 
-      const buttons = screen.getAllByRole('button')
-      expect(buttons[0]!.closest('div'))!.toHaveClass('flex', 'flex-row-reverse')
+      const confirmButton = screen.getByRole('button', { name: 'datasetCreation.stepThree.modelButtonConfirm' })
+      expect(confirmButton.closest('div'))!.toHaveClass('flex', 'flex-row-reverse')
     })
 
     it('should render title and content elements', () => {
@@ -456,11 +434,11 @@ describe('StopEmbeddingModal', () => {
       expect(screen.getByText('datasetCreation.stepThree.modelContent'))!.toBeInTheDocument()
     })
 
-    it('should render two buttons', () => {
+    it('should render two action buttons', () => {
       renderStopEmbeddingModal({ show: true })
 
-      const buttons = screen.getAllByRole('button')
-      expect(buttons).toHaveLength(2)
+      expect(screen.getByRole('button', { name: 'datasetCreation.stepThree.modelButtonCancel' })).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'datasetCreation.stepThree.modelButtonConfirm' })).toBeInTheDocument()
     })
   })
 
@@ -564,8 +542,9 @@ describe('StopEmbeddingModal', () => {
     it('should have semantic button elements', () => {
       renderStopEmbeddingModal({ show: true })
 
-      const buttons = screen.getAllByRole('button')
-      expect(buttons).toHaveLength(2)
+      expect(screen.getByRole('button', { name: /operation\.close$/ })).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'datasetCreation.stepThree.modelButtonCancel' })).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'datasetCreation.stepThree.modelButtonConfirm' })).toBeInTheDocument()
     })
 
     it('should have accessible text content', () => {
diff --git a/web/app/components/datasets/create/stop-embedding-modal/index.module.css b/web/app/components/datasets/create/stop-embedding-modal/index.module.css
index 90f300d2ce..3fab1ff377 100644
--- a/web/app/components/datasets/create/stop-embedding-modal/index.module.css
+++ b/web/app/components/datasets/create/stop-embedding-modal/index.module.css
@@ -1,9 +1,6 @@
 @reference "../../../../styles/globals.css";
 
-.modal {
-  position: relative;
-}
-.modal .icon {
+.icon {
   width: 48px;
   height: 48px;
   background: rgba(255, 255, 255, 0.9) center no-repeat url(../assets/annotation-info.svg);
@@ -12,7 +9,7 @@
   box-shadow: 0px 20px 24px -4px rgba(16, 24, 40, 0.08), 0px 8px 8px -4px rgba(16, 24, 40, 0.03);
   border-radius: 12px;
 }
-.modal .close {
+.close {
   position: absolute;
   right: 16px;
   top: 16px;
@@ -23,14 +20,14 @@
   background-size: 16px;
   cursor: pointer;
 }
-.modal .title {
+.title {
   @apply mt-3 mb-1;
   font-weight: 600;
   font-size: 20px;
   line-height: 30px;
   color: #101828;
 }
-.modal .content {
+.content {
   @apply mb-10;
   font-weight: 400;
   font-size: 14px;
diff --git a/web/app/components/datasets/create/stop-embedding-modal/index.tsx b/web/app/components/datasets/create/stop-embedding-modal/index.tsx
index 93df58d276..6828ae81a9 100644
--- a/web/app/components/datasets/create/stop-embedding-modal/index.tsx
+++ b/web/app/components/datasets/create/stop-embedding-modal/index.tsx
@@ -1,9 +1,16 @@
 'use client'
-import { Button } from '@langgenius/dify-ui/button'
+import {
+  AlertDialog,
+  AlertDialogActions,
+  AlertDialogCancelButton,
+  AlertDialogConfirmButton,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogTitle,
+} from '@langgenius/dify-ui/alert-dialog'
 import { cn } from '@langgenius/dify-ui/cn'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
-import Modal from '@/app/components/base/modal'
 import s from './index.module.css'
 
 type IProps = {
@@ -25,20 +32,29 @@ const StopEmbeddingModal = ({
   }
 
   return (
-    <Modal
-      isShow={show}
-      onClose={onHide}
-      className={cn(s.modal, 'max-w-[480px]!', 'px-8')}
+    <AlertDialog
+      open={show}
+      onOpenChange={(open) => {
+        if (!open)
+          onHide()
+      }}
     >
-      <div className={s.icon} />
-      <span className={s.close} onClick={onHide} />
-      <div className={s.title}>{t('stepThree.modelTitle', { ns: 'datasetCreation' })}</div>
-      <div className={s.content}>{t('stepThree.modelContent', { ns: 'datasetCreation' })}</div>
-      <div className="flex flex-row-reverse">
-        <Button className="ml-2 w-24" variant="primary" onClick={submit}>{t('stepThree.modelButtonConfirm', { ns: 'datasetCreation' })}</Button>
-        <Button className="w-24" onClick={onHide}>{t('stepThree.modelButtonCancel', { ns: 'datasetCreation' })}</Button>
-      </div>
-    </Modal>
+      <AlertDialogContent className="max-w-[480px]! overflow-hidden! border-none px-8 py-6 text-left align-middle shadow-xl">
+        <div className={s.icon} />
+        <button
+          type="button"
+          className={cn(s.close, 'border-none bg-transparent p-0 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden')}
+          aria-label={t('operation.close', { ns: 'common' })}
+          onClick={onHide}
+        />
+        <AlertDialogTitle className={s.title}>{t('stepThree.modelTitle', { ns: 'datasetCreation' })}</AlertDialogTitle>
+        <AlertDialogDescription className={s.content}>{t('stepThree.modelContent', { ns: 'datasetCreation' })}</AlertDialogDescription>
+        <AlertDialogActions className="flex-row-reverse gap-0 p-0">
+          <AlertDialogConfirmButton className="ml-2 w-24" tone="default" onClick={submit}>{t('stepThree.modelButtonConfirm', { ns: 'datasetCreation' })}</AlertDialogConfirmButton>
+          <AlertDialogCancelButton className="w-24" variant="secondary">{t('stepThree.modelButtonCancel', { ns: 'datasetCreation' })}</AlertDialogCancelButton>
+        </AlertDialogActions>
+      </AlertDialogContent>
+    </AlertDialog>
   )
 }
 
diff --git a/web/app/components/datasets/create/website/__tests__/base.spec.tsx b/web/app/components/datasets/create/website/__tests__/base.spec.tsx
index 3a3954f305..b6ce254c3d 100644
--- a/web/app/components/datasets/create/website/__tests__/base.spec.tsx
+++ b/web/app/components/datasets/create/website/__tests__/base.spec.tsx
@@ -277,8 +277,7 @@ describe('CrawledResultItem', () => {
       const props = createItemProps()
       render(<CrawledResultItem {...props} />)
 
-      // Find checkbox by data-testid
-      const checkbox = screen.getByTestId('checkbox-test-item')
+      const checkbox = screen.getByRole('checkbox', { name: /test page title/i })
       expect(checkbox)!.toBeInTheDocument()
     })
 
@@ -296,7 +295,7 @@ describe('CrawledResultItem', () => {
       const props = createItemProps({ isChecked: false, onCheckChange })
 
       render(<CrawledResultItem {...props} />)
-      const checkbox = screen.getByTestId('checkbox-test-item')
+      const checkbox = screen.getByRole('checkbox', { name: /test page title/i })
       await userEvent.click(checkbox)
 
       expect(onCheckChange).toHaveBeenCalledWith(true)
@@ -307,7 +306,7 @@ describe('CrawledResultItem', () => {
       const props = createItemProps({ isChecked: true, onCheckChange })
 
       render(<CrawledResultItem {...props} />)
-      const checkbox = screen.getByTestId('checkbox-test-item')
+      const checkbox = screen.getByRole('checkbox', { name: /test page title/i })
       await userEvent.click(checkbox)
 
       expect(onCheckChange).toHaveBeenCalledWith(false)
@@ -365,9 +364,8 @@ describe('CrawledResult', () => {
     ...overrides,
   })
 
-  // Helper functions to get checkboxes by data-testid
-  const getSelectAllCheckbox = () => screen.getByTestId('checkbox-select-all')
-  const getItemCheckbox = (index: number) => screen.getByTestId(`checkbox-item-${index}`)
+  const getSelectAllCheckbox = () => screen.getByRole('checkbox', { name: /selectAll|resetAll/ })
+  const getItemCheckbox = (index: number) => screen.getByRole('checkbox', { name: new RegExp(`Page ${index + 1}`) })
 
   describe('Rendering', () => {
     it('should render all items in list', () => {
diff --git a/web/app/components/datasets/create/website/__tests__/preview.spec.tsx b/web/app/components/datasets/create/website/__tests__/preview.spec.tsx
index 9fe447c95c..da8c270509 100644
--- a/web/app/components/datasets/create/website/__tests__/preview.spec.tsx
+++ b/web/app/components/datasets/create/website/__tests__/preview.spec.tsx
@@ -84,9 +84,7 @@ describe('WebsitePreview', () => {
 
       render(<WebsitePreview payload={payload} hidePreview={mockHidePreview} />)
 
-      // Assert - the close button container is a div with cursor-pointer
-      const closeButton = screen.getByText(/pagePreview/i).parentElement?.querySelector('.cursor-pointer')
-      expect(closeButton).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: /operation\.close$/ })).toBeInTheDocument()
     })
   })
 
@@ -95,11 +93,7 @@ describe('WebsitePreview', () => {
       const payload = createPayload()
       render(<WebsitePreview payload={payload} hidePreview={mockHidePreview} />)
 
-      // Act - find the close button div with cursor-pointer class
-      const closeButton = screen.getByText(/pagePreview/i)
-        .closest('[class*="title"]')!
-        .querySelector('.cursor-pointer') as HTMLElement
-      fireEvent.click(closeButton)
+      fireEvent.click(screen.getByRole('button', { name: /operation\.close$/ }))
 
       expect(mockHidePreview).toHaveBeenCalledTimes(1)
     })
@@ -108,9 +102,7 @@ describe('WebsitePreview', () => {
       const payload = createPayload()
       render(<WebsitePreview payload={payload} hidePreview={mockHidePreview} />)
 
-      const closeButton = screen.getByText(/pagePreview/i)
-        .closest('[class*="title"]')!
-        .querySelector('.cursor-pointer') as HTMLElement
+      const closeButton = screen.getByRole('button', { name: /operation\.close$/ })
       fireEvent.click(closeButton)
       fireEvent.click(closeButton)
 
diff --git a/web/app/components/datasets/create/website/base/__tests__/checkbox-with-label.spec.tsx b/web/app/components/datasets/create/website/base/__tests__/checkbox-with-label.spec.tsx
index 47224c641f..612c2e516f 100644
--- a/web/app/components/datasets/create/website/base/__tests__/checkbox-with-label.spec.tsx
+++ b/web/app/components/datasets/create/website/base/__tests__/checkbox-with-label.spec.tsx
@@ -32,8 +32,8 @@ describe('CheckboxWithLabel', () => {
   })
 
   it('should toggle checked state on checkbox click', () => {
-    render(<CheckboxWithLabel isChecked={false} onChange={onChange} label="Toggle" testId="my-check" />)
-    fireEvent.click(screen.getByTestId('checkbox-my-check'))
+    render(<CheckboxWithLabel isChecked={false} onChange={onChange} label="Toggle" />)
+    fireEvent.click(screen.getByRole('checkbox', { name: 'Toggle' }))
     expect(onChange).toHaveBeenCalledWith(true)
   })
 })
diff --git a/web/app/components/datasets/create/website/base/__tests__/crawled-result-item.spec.tsx b/web/app/components/datasets/create/website/base/__tests__/crawled-result-item.spec.tsx
index 5087bfdbda..a6a85d3eef 100644
--- a/web/app/components/datasets/create/website/base/__tests__/crawled-result-item.spec.tsx
+++ b/web/app/components/datasets/create/website/base/__tests__/crawled-result-item.spec.tsx
@@ -28,15 +28,15 @@ describe('CrawledResultItem', () => {
   })
 
   it('should call onCheckChange with true when unchecked checkbox is clicked', () => {
-    render(<CrawledResultItem {...defaultProps} isChecked={false} testId="crawl-item" />)
-    const checkbox = screen.getByTestId('checkbox-crawl-item')
+    render(<CrawledResultItem {...defaultProps} isChecked={false} />)
+    const checkbox = screen.getByRole('checkbox', { name: 'Example Page https://example.com/page' })
     fireEvent.click(checkbox)
     expect(defaultProps.onCheckChange).toHaveBeenCalledWith(true)
   })
 
   it('should call onCheckChange with false when checked checkbox is clicked', () => {
-    render(<CrawledResultItem {...defaultProps} isChecked={true} testId="crawl-item" />)
-    const checkbox = screen.getByTestId('checkbox-crawl-item')
+    render(<CrawledResultItem {...defaultProps} isChecked={true} />)
+    const checkbox = screen.getByRole('checkbox', { name: 'Example Page https://example.com/page' })
     fireEvent.click(checkbox)
     expect(defaultProps.onCheckChange).toHaveBeenCalledWith(false)
   })
diff --git a/web/app/components/datasets/create/website/base/__tests__/crawled-result.spec.tsx b/web/app/components/datasets/create/website/base/__tests__/crawled-result.spec.tsx
index 749b50e6f4..7ca2f5b138 100644
--- a/web/app/components/datasets/create/website/base/__tests__/crawled-result.spec.tsx
+++ b/web/app/components/datasets/create/website/base/__tests__/crawled-result.spec.tsx
@@ -3,48 +3,6 @@ import { fireEvent, render, screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import CrawledResult from '../crawled-result'
 
-vi.mock('../checkbox-with-label', () => ({
-  default: ({ isChecked, onChange, label, testId }: {
-    isChecked: boolean
-    onChange: (checked: boolean) => void
-    label: string
-    testId?: string
-  }) => (
-    <label data-testid={testId}>
-      <input
-        type="checkbox"
-        checked={isChecked}
-        onChange={() => onChange(!isChecked)}
-        data-testid={`checkbox-${testId}`}
-      />
-      <span>{label}</span>
-    </label>
-  ),
-}))
-
-vi.mock('../crawled-result-item', () => ({
-  default: ({ payload, isChecked, isPreview, onCheckChange, onPreview, testId }: {
-    payload: CrawlResultItem
-    isChecked: boolean
-    isPreview: boolean
-    onCheckChange: (checked: boolean) => void
-    onPreview: () => void
-    testId?: string
-  }) => (
-    <div data-testid={testId} data-preview={isPreview}>
-      <input
-        type="checkbox"
-        checked={isChecked}
-        onChange={() => onCheckChange(!isChecked)}
-        data-testid={`check-${testId}`}
-      />
-      <span>{payload.title}</span>
-      <span>{payload.source_url}</span>
-      <button onClick={onPreview} data-testid={`preview-${testId}`}>Preview</button>
-    </div>
-  ),
-}))
-
 const createMockItem = (overrides: Partial<CrawlResultItem> = {}): CrawlResultItem => ({
   title: 'Test Page',
   markdown: '# Test',
@@ -80,7 +38,7 @@ describe('CrawledResult', () => {
         />,
       )
 
-      expect(screen.getByTestId('select-all'))!.toBeInTheDocument()
+      expect(screen.getByRole('checkbox', { name: /selectAll/i })).toBeInTheDocument()
     })
 
     it('should render all items from list', () => {
@@ -95,9 +53,9 @@ describe('CrawledResult', () => {
         />,
       )
 
-      expect(screen.getByTestId('item-0'))!.toBeInTheDocument()
-      expect(screen.getByTestId('item-1'))!.toBeInTheDocument()
-      expect(screen.getByTestId('item-2'))!.toBeInTheDocument()
+      expect(screen.getByText('Page 1')).toBeInTheDocument()
+      expect(screen.getByText('Page 2')).toBeInTheDocument()
+      expect(screen.getByText('Page 3')).toBeInTheDocument()
     })
 
     it('should render scrap time info', () => {
@@ -146,7 +104,7 @@ describe('CrawledResult', () => {
         />,
       )
 
-      const selectAllCheckbox = screen.getByTestId('checkbox-select-all')
+      const selectAllCheckbox = screen.getByRole('checkbox', { name: /selectAll/i })
       fireEvent.click(selectAllCheckbox)
 
       expect(mockOnSelectedChange).toHaveBeenCalledWith(list)
@@ -164,7 +122,7 @@ describe('CrawledResult', () => {
         />,
       )
 
-      const selectAllCheckbox = screen.getByTestId('checkbox-select-all')
+      const selectAllCheckbox = screen.getByRole('checkbox', { name: /resetAll/i })
       fireEvent.click(selectAllCheckbox)
 
       expect(mockOnSelectedChange).toHaveBeenCalledWith([])
@@ -215,7 +173,7 @@ describe('CrawledResult', () => {
         />,
       )
 
-      const item1Checkbox = screen.getByTestId('check-item-1')
+      const item1Checkbox = screen.getByRole('checkbox', { name: /Page 2/ })
       fireEvent.click(item1Checkbox)
 
       expect(mockOnSelectedChange).toHaveBeenCalledWith([list[0], list[1]])
@@ -234,7 +192,7 @@ describe('CrawledResult', () => {
         />,
       )
 
-      const item0Checkbox = screen.getByTestId('check-item-0')
+      const item0Checkbox = screen.getByRole('checkbox', { name: /Page 1/ })
       fireEvent.click(item0Checkbox)
 
       expect(mockOnSelectedChange).toHaveBeenCalledWith([list[1]])
@@ -254,7 +212,7 @@ describe('CrawledResult', () => {
         />,
       )
 
-      const previewButton = screen.getByTestId('preview-item-1')
+      const previewButton = screen.getAllByRole('button', { name: /preview/i })[1]!
       fireEvent.click(previewButton)
 
       expect(mockOnPreview).toHaveBeenCalledWith(list[1])
@@ -272,11 +230,11 @@ describe('CrawledResult', () => {
         />,
       )
 
-      const previewButton = screen.getByTestId('preview-item-0')
+      const previewButton = screen.getAllByRole('button', { name: /preview/i })[0]!
       fireEvent.click(previewButton)
 
-      const item0 = screen.getByTestId('item-0')
-      expect(item0)!.toHaveAttribute('data-preview', 'true')
+      const item0 = screen.getByText('Page 1').closest('.rounded-lg')
+      expect(item0).toHaveClass('bg-state-base-active')
     })
   })
 
@@ -292,7 +250,7 @@ describe('CrawledResult', () => {
         />,
       )
 
-      expect(screen.getByTestId('select-all'))!.toBeInTheDocument()
+      expect(screen.getByRole('checkbox', { name: /resetAll/i })).toBeInTheDocument()
     })
 
     it('should handle single item list', () => {
@@ -307,7 +265,7 @@ describe('CrawledResult', () => {
         />,
       )
 
-      expect(screen.getByTestId('item-0'))!.toBeInTheDocument()
+      expect(screen.getByText('Test Page')).toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/datasets/create/website/base/checkbox-with-label.tsx b/web/app/components/datasets/create/website/base/checkbox-with-label.tsx
index 117a16f401..5ccb5cbf06 100644
--- a/web/app/components/datasets/create/website/base/checkbox-with-label.tsx
+++ b/web/app/components/datasets/create/website/base/checkbox-with-label.tsx
@@ -1,9 +1,6 @@
 'use client'
-import type { FC } from 'react'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import { cn } from '@langgenius/dify-ui/cn'
-import * as React from 'react'
-import { useId } from 'react'
-import Checkbox from '@/app/components/base/checkbox'
 import { Infotip } from '@/app/components/base/infotip'
 
 type Props = {
@@ -13,33 +10,28 @@ type Props = {
   label: string
   labelClassName?: string
   tooltip?: string
-  testId?: string
 }
 
-const CheckboxWithLabel: FC<Props> = ({
+export default function CheckboxWithLabel({
   className = '',
   isChecked,
   onChange,
   label,
   labelClassName,
   tooltip,
-  testId,
-}) => {
-  const labelId = useId()
-  const handleToggle = () => onChange(!isChecked)
-
+}: Props) {
   return (
     <div className={cn(className, 'flex h-7 items-center')}>
-      <Checkbox checked={isChecked} onCheck={handleToggle} id={testId} ariaLabelledBy={labelId} />
-      <div className="ml-2 flex min-w-0 items-center gap-1">
-        <button
-          type="button"
-          id={labelId}
-          className={cn('min-w-0 cursor-pointer border-0 bg-transparent p-0 text-left text-sm font-normal text-text-secondary', labelClassName)}
-          onClick={handleToggle}
-        >
+      <label className="flex min-w-0 cursor-pointer items-center">
+        <Checkbox
+          checked={isChecked}
+          onCheckedChange={checked => onChange(checked)}
+        />
+        <span className={cn('ml-2 min-w-0 text-left text-sm font-normal text-text-secondary', labelClassName)}>
           {label}
-        </button>
+        </span>
+      </label>
+      <div className="ml-1 flex min-w-0 items-center">
         {tooltip && (
           <Infotip aria-label={tooltip} popupClassName="w-[200px]">
             {tooltip}
@@ -49,4 +41,3 @@ const CheckboxWithLabel: FC<Props> = ({
     </div>
   )
 }
-export default React.memo(CheckboxWithLabel)
diff --git a/web/app/components/datasets/create/website/base/crawled-result-item.tsx b/web/app/components/datasets/create/website/base/crawled-result-item.tsx
index 967e981069..2283e2d36b 100644
--- a/web/app/components/datasets/create/website/base/crawled-result-item.tsx
+++ b/web/app/components/datasets/create/website/base/crawled-result-item.tsx
@@ -2,11 +2,10 @@
 import type { FC } from 'react'
 import type { CrawlResultItem as CrawlResultItemType } from '@/models/datasets'
 import { Button } from '@langgenius/dify-ui/button'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import { cn } from '@langgenius/dify-ui/cn'
 import * as React from 'react'
-import { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
-import Checkbox from '@/app/components/base/checkbox'
 
 type Props = {
   payload: CrawlResultItemType
@@ -14,7 +13,6 @@ type Props = {
   isPreview: boolean
   onCheckChange: (checked: boolean) => void
   onPreview: () => void
-  testId?: string
 }
 
 const CrawledResultItem: FC<Props> = ({
@@ -23,33 +21,34 @@ const CrawledResultItem: FC<Props> = ({
   isChecked,
   onCheckChange,
   onPreview,
-  testId,
 }) => {
   const { t } = useTranslation()
-
-  const handleCheckChange = useCallback(() => {
-    onCheckChange(!isChecked)
-  }, [isChecked, onCheckChange])
   return (
-    <div className={cn(isPreview ? 'bg-state-base-active' : 'group hover:bg-state-base-hover', 'cursor-pointer rounded-lg p-2')}>
+    <div className={cn(isPreview ? 'bg-state-base-active' : 'group hover:bg-state-base-hover', 'rounded-lg p-2')}>
       <div className="relative flex">
-        <div className="flex h-5 items-center">
-          <Checkbox className="mr-2 shrink-0" checked={isChecked} onCheck={handleCheckChange} id={testId} />
-        </div>
-        <div className="flex min-w-0 grow flex-col">
-          <div
-            className="truncate text-sm font-medium text-text-secondary"
-            title={payload.title}
-          >
-            {payload.title}
+        <label className="flex min-w-0 grow cursor-pointer">
+          <div className="flex h-5 items-center">
+            <Checkbox
+              className="mr-2 shrink-0"
+              checked={isChecked}
+              onCheckedChange={checked => onCheckChange(checked)}
+            />
           </div>
-          <div
-            className="mt-0.5 truncate text-xs text-text-tertiary"
-            title={payload.source_url}
-          >
-            {payload.source_url}
+          <div className="flex min-w-0 grow flex-col">
+            <div
+              className="truncate text-sm font-medium text-text-secondary"
+              title={payload.title}
+            >
+              {payload.title}
+            </div>
+            <div
+              className="mt-0.5 truncate text-xs text-text-tertiary"
+              title={payload.source_url}
+            >
+              {payload.source_url}
+            </div>
           </div>
-        </div>
+        </label>
         <Button
           onClick={onPreview}
           className="top-0 right-0 hidden h-6 px-1.5 text-xs font-medium uppercase group-hover:absolute group-hover:block"
diff --git a/web/app/components/datasets/create/website/base/crawled-result.tsx b/web/app/components/datasets/create/website/base/crawled-result.tsx
index 8f34b75d37..b008f9e7c6 100644
--- a/web/app/components/datasets/create/website/base/crawled-result.tsx
+++ b/web/app/components/datasets/create/website/base/crawled-result.tsx
@@ -65,7 +65,6 @@ const CrawledResult: FC<Props> = ({
           onChange={handleCheckedAll}
           label={isCheckAll ? t(`${I18N_PREFIX}.resetAll`, { ns: 'datasetCreation' }) : t(`${I18N_PREFIX}.selectAll`, { ns: 'datasetCreation' })}
           labelClassName="system-[13px] leading-[16px] font-medium text-text-secondary"
-          testId="select-all"
         />
         <div className="text-xs text-text-tertiary">
           {t(`${I18N_PREFIX}.scrapTimeInfo`, {
@@ -84,7 +83,6 @@ const CrawledResult: FC<Props> = ({
             payload={item}
             isChecked={checkedList.some(checkedItem => checkedItem.source_url === item.source_url)}
             onCheckChange={handleItemCheckChange(item)}
-            testId={`item-${index}`}
           />
         ))}
       </div>
diff --git a/web/app/components/datasets/create/website/firecrawl/__tests__/index.spec.tsx b/web/app/components/datasets/create/website/firecrawl/__tests__/index.spec.tsx
index 32b536c8f0..29bdafc1fc 100644
--- a/web/app/components/datasets/create/website/firecrawl/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/create/website/firecrawl/__tests__/index.spec.tsx
@@ -662,11 +662,9 @@ describe('FireCrawl', () => {
     })
 
     it('should call onCrawlOptionsChange when checkbox changes', () => {
-      const { container } = render(<FireCrawl {...defaultProps} />)
+      render(<FireCrawl {...defaultProps} />)
 
-      // Use data-testid to find checkboxes since they are custom div elements
-      const checkboxes = container.querySelectorAll('[data-testid^="checkbox-"]')
-      fireEvent.click(checkboxes[0]!) // crawl_sub_pages
+      fireEvent.click(screen.getByRole('checkbox', { name: /crawlSubPage/ }))
 
       expect(mockOnCrawlOptionsChange).toHaveBeenCalledWith(
         expect.objectContaining({ crawl_sub_pages: false }),
diff --git a/web/app/components/datasets/create/website/firecrawl/__tests__/options.spec.tsx b/web/app/components/datasets/create/website/firecrawl/__tests__/options.spec.tsx
index 946c04aa93..60c239bfa1 100644
--- a/web/app/components/datasets/create/website/firecrawl/__tests__/options.spec.tsx
+++ b/web/app/components/datasets/create/website/firecrawl/__tests__/options.spec.tsx
@@ -24,11 +24,6 @@ describe('Options', () => {
     vi.clearAllMocks()
   })
 
-  // Helper to get checkboxes by test id pattern
-  const getCheckboxes = (container: HTMLElement) => {
-    return container.querySelectorAll('[data-testid^="checkbox-"]')
-  }
-
   describe('Rendering', () => {
     it('should render without crashing', () => {
       const payload = createMockCrawlOptions()
@@ -95,10 +90,9 @@ describe('Options', () => {
 
     it('should render two checkboxes', () => {
       const payload = createMockCrawlOptions()
-      const { container } = render(<Options payload={payload} onChange={mockOnChange} />)
+      render(<Options payload={payload} onChange={mockOnChange} />)
 
-      const checkboxes = getCheckboxes(container)
-      expect(checkboxes.length).toBe(2)
+      expect(screen.getAllByRole('checkbox')).toHaveLength(2)
     })
   })
 
@@ -108,27 +102,25 @@ describe('Options', () => {
       const payload = createMockCrawlOptions({ crawl_sub_pages: true })
       render(<Options payload={payload} onChange={mockOnChange} />)
 
-      // First checkbox should have check icon when checked
-      // First checkbox should have check icon when checked
-      expect(screen.queryByTestId('check-icon-crawl-sub-page'))!.toBeInTheDocument()
+      expect(screen.getByRole('checkbox', { name: /crawlSubPage/i })).toHaveAttribute('aria-checked', 'true')
     })
 
     it('should display crawl_sub_pages checkbox without check icon when false', () => {
       const payload = createMockCrawlOptions({ crawl_sub_pages: false })
       render(<Options payload={payload} onChange={mockOnChange} />)
-      expect(screen.queryByTestId('check-icon-crawl-sub-page')).not.toBeInTheDocument()
+      expect(screen.getByRole('checkbox', { name: /crawlSubPage/i })).toHaveAttribute('aria-checked', 'false')
     })
 
     it('should display only_main_content checkbox with check icon when true', () => {
       const payload = createMockCrawlOptions({ only_main_content: true })
       render(<Options payload={payload} onChange={mockOnChange} />)
-      expect(screen.getByTestId('check-icon-only-main-content'))!.toBeInTheDocument()
+      expect(screen.getByRole('checkbox', { name: /extractOnlyMainContent/i })).toHaveAttribute('aria-checked', 'true')
     })
 
     it('should display only_main_content checkbox without check icon when false', () => {
       const payload = createMockCrawlOptions({ only_main_content: false })
       render(<Options payload={payload} onChange={mockOnChange} />)
-      expect(screen.queryByTestId('check-icon-only-main-content')).not.toBeInTheDocument()
+      expect(screen.getByRole('checkbox', { name: /extractOnlyMainContent/i })).toHaveAttribute('aria-checked', 'false')
     })
 
     it('should display limit value in input', () => {
@@ -167,10 +159,9 @@ describe('Options', () => {
   describe('User Interactions', () => {
     it('should call onChange with updated crawl_sub_pages when checkbox is clicked', () => {
       const payload = createMockCrawlOptions({ crawl_sub_pages: true })
-      const { container } = render(<Options payload={payload} onChange={mockOnChange} />)
+      render(<Options payload={payload} onChange={mockOnChange} />)
 
-      const checkboxes = getCheckboxes(container)
-      fireEvent.click(checkboxes[0]!)
+      fireEvent.click(screen.getByRole('checkbox', { name: /crawlSubPage/i }))
 
       expect(mockOnChange).toHaveBeenCalledWith({
         ...payload,
@@ -180,10 +171,9 @@ describe('Options', () => {
 
     it('should call onChange with updated only_main_content when checkbox is clicked', () => {
       const payload = createMockCrawlOptions({ only_main_content: false })
-      const { container } = render(<Options payload={payload} onChange={mockOnChange} />)
+      render(<Options payload={payload} onChange={mockOnChange} />)
 
-      const checkboxes = getCheckboxes(container)
-      fireEvent.click(checkboxes[1]!)
+      fireEvent.click(screen.getByRole('checkbox', { name: /extractOnlyMainContent/i }))
 
       expect(mockOnChange).toHaveBeenCalledWith({
         ...payload,
diff --git a/web/app/components/datasets/create/website/firecrawl/options.tsx b/web/app/components/datasets/create/website/firecrawl/options.tsx
index e4ce8b56a2..3496bbb236 100644
--- a/web/app/components/datasets/create/website/firecrawl/options.tsx
+++ b/web/app/components/datasets/create/website/firecrawl/options.tsx
@@ -35,7 +35,6 @@ const Options: FC<Props> = ({
     <div className={cn(className, 'space-y-2')}>
       <CheckboxWithLabel
         label={t(`${I18N_PREFIX}.crawlSubPage`, { ns: 'datasetCreation' })}
-        testId="crawl-sub-page"
         isChecked={payload.crawl_sub_pages}
         onChange={handleChange('crawl_sub_pages')}
         labelClassName="text-[13px] leading-[16px] font-medium text-text-secondary"
@@ -77,7 +76,6 @@ const Options: FC<Props> = ({
       </div>
       <CheckboxWithLabel
         label={t(`${I18N_PREFIX}.extractOnlyMainContent`, { ns: 'datasetCreation' })}
-        testId="only-main-content"
         isChecked={payload.only_main_content}
         onChange={handleChange('only_main_content')}
         labelClassName="text-[13px] leading-[16px] font-medium text-text-secondary"
diff --git a/web/app/components/datasets/create/website/jina-reader/__tests__/base.spec.tsx b/web/app/components/datasets/create/website/jina-reader/__tests__/base.spec.tsx
index bcfcf39060..5922a11cce 100644
--- a/web/app/components/datasets/create/website/jina-reader/__tests__/base.spec.tsx
+++ b/web/app/components/datasets/create/website/jina-reader/__tests__/base.spec.tsx
@@ -54,7 +54,7 @@ describe('UrlInput', () => {
       render(<UrlInput {...props} />)
 
       // Assert - find button by data-testid when in loading state
-      const runButton = screen.getByTestId('url-input-run-button')
+      const runButton = screen.getByRole('button', { name: /run/i })
       expect(runButton).toBeInTheDocument()
       // Button text should be empty when running
       expect(runButton).not.toHaveTextContent(/run/i)
@@ -67,7 +67,7 @@ describe('UrlInput', () => {
       render(<UrlInput {...props} />)
 
       // Assert - find button by data-testid when in loading state
-      const runButton = screen.getByTestId('url-input-run-button')
+      const runButton = screen.getByRole('button', { name: /run/i })
       expect(runButton).toBeInTheDocument()
 
       // Verify button is empty (loading state removes text)
@@ -143,7 +143,7 @@ describe('UrlInput', () => {
       const props = createUrlInputProps({ onRun, isRunning: true })
 
       render(<UrlInput {...props} />)
-      const runButton = screen.getByTestId('url-input-run-button')
+      const runButton = screen.getByRole('button', { name: /run/i })
       fireEvent.click(runButton)
 
       expect(onRun).not.toHaveBeenCalled()
@@ -161,7 +161,7 @@ describe('UrlInput', () => {
       rerender(<UrlInput isRunning={true} onRun={onRun} />)
 
       // Find and click the button by data-testid (loading state has no text)
-      const runButton = screen.getByTestId('url-input-run-button')
+      const runButton = screen.getByRole('button', { name: /run/i })
       fireEvent.click(runButton)
 
       // Assert - onRun should not be called due to early return at line 28
@@ -173,7 +173,7 @@ describe('UrlInput', () => {
       const props = createUrlInputProps({ onRun, isRunning: true })
 
       render(<UrlInput {...props} />)
-      const runButton = screen.getByTestId('url-input-run-button')
+      const runButton = screen.getByRole('button', { name: /run/i })
       fireEvent.click(runButton)
       fireEvent.click(runButton)
       fireEvent.click(runButton)
@@ -194,7 +194,7 @@ describe('UrlInput', () => {
       rerender(<UrlInput {...props} isRunning={true} />)
 
       // Assert - find button by data-testid and verify it's now in loading state
-      const runButton = screen.getByTestId('url-input-run-button')
+      const runButton = screen.getByRole('button', { name: /run/i })
       expect(runButton).toBeInTheDocument()
       // When loading, the button text should be empty
       expect(runButton).not.toHaveTextContent(/run/i)
diff --git a/web/app/components/datasets/create/website/jina-reader/__tests__/index.spec.tsx b/web/app/components/datasets/create/website/jina-reader/__tests__/index.spec.tsx
index 16896df2bb..e4ee4462ad 100644
--- a/web/app/components/datasets/create/website/jina-reader/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/create/website/jina-reader/__tests__/index.spec.tsx
@@ -499,11 +499,9 @@ describe('JinaReader', () => {
 
       render(<JinaReader {...props} />)
 
-      // Find and click the checkbox by data-testid
-      const checkbox = screen.getByTestId('checkbox-crawl-sub-pages')
+      const checkbox = screen.getByRole('checkbox', { name: /crawlSubPage/ })
       fireEvent.click(checkbox)
 
-      // Assert - onCrawlOptionsChange should be called
       expect(onCrawlOptionsChange).toHaveBeenCalled()
     })
 
diff --git a/web/app/components/datasets/create/website/jina-reader/__tests__/options.spec.tsx b/web/app/components/datasets/create/website/jina-reader/__tests__/options.spec.tsx
index da87629ba4..92f6ccc90c 100644
--- a/web/app/components/datasets/create/website/jina-reader/__tests__/options.spec.tsx
+++ b/web/app/components/datasets/create/website/jina-reader/__tests__/options.spec.tsx
@@ -25,10 +25,6 @@ describe('Options (jina-reader)', () => {
     vi.clearAllMocks()
   })
 
-  const getCheckboxes = (container: HTMLElement) => {
-    return container.querySelectorAll('[data-testid^="checkbox-"]')
-  }
-
   describe('Rendering', () => {
     it('should render crawlSubPage and useSitemap checkboxes and limit field', () => {
       const payload = createMockCrawlOptions()
@@ -41,10 +37,9 @@ describe('Options (jina-reader)', () => {
 
     it('should render two checkboxes', () => {
       const payload = createMockCrawlOptions()
-      const { container } = render(<Options payload={payload} onChange={mockOnChange} />)
+      render(<Options payload={payload} onChange={mockOnChange} />)
 
-      const checkboxes = getCheckboxes(container)
-      expect(checkboxes.length).toBe(2)
+      expect(screen.getAllByRole('checkbox')).toHaveLength(2)
     })
 
     it('should render limit field with required indicator', () => {
@@ -71,25 +66,25 @@ describe('Options (jina-reader)', () => {
     it('should display crawl_sub_pages checkbox with check icon when true', () => {
       const payload = createMockCrawlOptions({ crawl_sub_pages: true })
       render(<Options payload={payload} onChange={mockOnChange} />)
-      expect(screen.getByTestId('check-icon-crawl-sub-pages')).toBeInTheDocument()
+      expect(screen.getByRole('checkbox', { name: /crawlSubPage/i })).toHaveAttribute('aria-checked', 'true')
     })
 
     it('should display crawl_sub_pages checkbox without check icon when false', () => {
       const payload = createMockCrawlOptions({ crawl_sub_pages: false })
       render(<Options payload={payload} onChange={mockOnChange} />)
-      expect(screen.queryByTestId('check-icon-crawl-sub-pages')).not.toBeInTheDocument()
+      expect(screen.getByRole('checkbox', { name: /crawlSubPage/i })).toHaveAttribute('aria-checked', 'false')
     })
 
     it('should display use_sitemap checkbox with check icon when true', () => {
       const payload = createMockCrawlOptions({ use_sitemap: true })
       render(<Options payload={payload} onChange={mockOnChange} />)
-      expect(screen.getByTestId('check-icon-use-sitemap')).toBeInTheDocument()
+      expect(screen.getByRole('checkbox', { name: /useSitemap/i })).toHaveAttribute('aria-checked', 'true')
     })
 
     it('should display use_sitemap checkbox without check icon when false', () => {
       const payload = createMockCrawlOptions({ use_sitemap: false })
       render(<Options payload={payload} onChange={mockOnChange} />)
-      expect(screen.queryByTestId('check-icon-use-sitemap')).not.toBeInTheDocument()
+      expect(screen.getByRole('checkbox', { name: /useSitemap/i })).toHaveAttribute('aria-checked', 'false')
     })
 
     it('should display limit value in input', () => {
@@ -105,7 +100,7 @@ describe('Options (jina-reader)', () => {
       const payload = createMockCrawlOptions({ crawl_sub_pages: true })
       render(<Options payload={payload} onChange={mockOnChange} />)
 
-      fireEvent.click(screen.getByTestId('checkbox-crawl-sub-pages'))
+      fireEvent.click(screen.getByRole('checkbox', { name: /crawlSubPage/i }))
 
       expect(mockOnChange).toHaveBeenCalledWith({
         ...payload,
@@ -117,7 +112,7 @@ describe('Options (jina-reader)', () => {
       const payload = createMockCrawlOptions({ use_sitemap: false })
       render(<Options payload={payload} onChange={mockOnChange} />)
 
-      fireEvent.click(screen.getByTestId('checkbox-use-sitemap'))
+      fireEvent.click(screen.getByRole('checkbox', { name: /useSitemap/i }))
 
       expect(mockOnChange).toHaveBeenCalledWith({
         ...payload,
diff --git a/web/app/components/datasets/create/website/jina-reader/base/url-input.tsx b/web/app/components/datasets/create/website/jina-reader/base/url-input.tsx
index 6b78833ccf..77887c4301 100644
--- a/web/app/components/datasets/create/website/jina-reader/base/url-input.tsx
+++ b/web/app/components/datasets/create/website/jina-reader/base/url-input.tsx
@@ -42,7 +42,7 @@ const UrlInput: FC<Props> = ({
         onClick={handleOnRun}
         className="ml-2"
         loading={isRunning}
-        data-testid="url-input-run-button"
+        aria-label={t(`${I18N_PREFIX}.run`, { ns: 'datasetCreation' })}
       >
         {!isRunning ? t(`${I18N_PREFIX}.run`, { ns: 'datasetCreation' }) : ''}
       </Button>
diff --git a/web/app/components/datasets/create/website/jina-reader/options.tsx b/web/app/components/datasets/create/website/jina-reader/options.tsx
index a0ea118fe9..ce13f38ee3 100644
--- a/web/app/components/datasets/create/website/jina-reader/options.tsx
+++ b/web/app/components/datasets/create/website/jina-reader/options.tsx
@@ -38,7 +38,6 @@ const Options: FC<Props> = ({
         isChecked={payload.crawl_sub_pages}
         onChange={handleChange('crawl_sub_pages')}
         labelClassName="text-[13px] leading-[16px] font-medium text-text-secondary"
-        testId="crawl-sub-pages"
       />
       <CheckboxWithLabel
         label={t(`${I18N_PREFIX}.useSitemap`, { ns: 'datasetCreation' })}
@@ -46,7 +45,6 @@ const Options: FC<Props> = ({
         onChange={handleChange('use_sitemap')}
         tooltip={t(`${I18N_PREFIX}.useSitemapTooltip`, { ns: 'datasetCreation' }) as string}
         labelClassName="text-[13px] leading-[16px] font-medium text-text-secondary"
-        testId="use-sitemap"
       />
       <div className="flex justify-between space-x-4">
         <Field
diff --git a/web/app/components/datasets/create/website/preview.tsx b/web/app/components/datasets/create/website/preview.tsx
index a46437325f..edbd72d9a1 100644
--- a/web/app/components/datasets/create/website/preview.tsx
+++ b/web/app/components/datasets/create/website/preview.tsx
@@ -22,9 +22,14 @@ const WebsitePreview = ({
       <div className={cn(s.previewHeader)}>
         <div className={cn(s.title, 'title-md-semi-bold')}>
           <span>{t('stepOne.pagePreview', { ns: 'datasetCreation' })}</span>
-          <div className="flex h-6 w-6 cursor-pointer items-center justify-center" onClick={hidePreview}>
-            <XMarkIcon className="h-4 w-4"></XMarkIcon>
-          </div>
+          <button
+            type="button"
+            className="flex h-6 w-6 cursor-pointer items-center justify-center border-none bg-transparent p-0 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+            aria-label={t('operation.close', { ns: 'common' })}
+            onClick={hidePreview}
+          >
+            <XMarkIcon className="h-4 w-4" aria-hidden="true"></XMarkIcon>
+          </button>
         </div>
         <div className="title-sm-semi-bold wrap-break-word text-text-primary">
           {payload.title}
diff --git a/web/app/components/datasets/create/website/watercrawl/__tests__/index.spec.tsx b/web/app/components/datasets/create/website/watercrawl/__tests__/index.spec.tsx
index 1023cbd045..28ab81b624 100644
--- a/web/app/components/datasets/create/website/watercrawl/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/create/website/watercrawl/__tests__/index.spec.tsx
@@ -502,11 +502,9 @@ describe('WaterCrawl', () => {
 
       render(<WaterCrawl {...props} />)
 
-      // Find and click the checkbox by data-testid
-      const checkbox = screen.getByTestId('checkbox-crawl-sub-pages')
+      const checkbox = screen.getByRole('checkbox', { name: /crawlSubPage/ })
       fireEvent.click(checkbox)
 
-      // Assert - onCrawlOptionsChange should be called
       expect(onCrawlOptionsChange).toHaveBeenCalled()
     })
 
diff --git a/web/app/components/datasets/create/website/watercrawl/__tests__/options.spec.tsx b/web/app/components/datasets/create/website/watercrawl/__tests__/options.spec.tsx
index b65df109ad..60504fe0a7 100644
--- a/web/app/components/datasets/create/website/watercrawl/__tests__/options.spec.tsx
+++ b/web/app/components/datasets/create/website/watercrawl/__tests__/options.spec.tsx
@@ -25,10 +25,6 @@ describe('Options (watercrawl)', () => {
     vi.clearAllMocks()
   })
 
-  const getCheckboxes = (container: HTMLElement) => {
-    return container.querySelectorAll('[data-testid^="checkbox-"]')
-  }
-
   describe('Rendering', () => {
     it('should render all form fields', () => {
       const payload = createMockCrawlOptions()
@@ -44,10 +40,9 @@ describe('Options (watercrawl)', () => {
 
     it('should render two checkboxes', () => {
       const payload = createMockCrawlOptions()
-      const { container } = render(<Options payload={payload} onChange={mockOnChange} />)
+      render(<Options payload={payload} onChange={mockOnChange} />)
 
-      const checkboxes = getCheckboxes(container)
-      expect(checkboxes.length).toBe(2)
+      expect(screen.getAllByRole('checkbox')).toHaveLength(2)
     })
 
     it('should render limit field with required indicator', () => {
@@ -89,29 +84,27 @@ describe('Options (watercrawl)', () => {
       const payload = createMockCrawlOptions({ crawl_sub_pages: true })
       render(<Options payload={payload} onChange={mockOnChange} />)
 
-      expect(screen.getByTestId('check-icon-crawl-sub-pages'))!.toBeInTheDocument()
+      expect(screen.getByRole('checkbox', { name: /crawlSubPage/i })).toHaveAttribute('aria-checked', 'true')
     })
 
     it('should display crawl_sub_pages checkbox without check icon when false', () => {
       const payload = createMockCrawlOptions({ crawl_sub_pages: false })
-      const { container } = render(<Options payload={payload} onChange={mockOnChange} />)
+      render(<Options payload={payload} onChange={mockOnChange} />)
 
-      const checkboxes = getCheckboxes(container)
-      expect(checkboxes[0]!.querySelector('svg')).not.toBeInTheDocument()
+      expect(screen.getByRole('checkbox', { name: /crawlSubPage/i })).toHaveAttribute('aria-checked', 'false')
     })
 
     it('should display only_main_content checkbox with check icon when true', () => {
       const payload = createMockCrawlOptions({ only_main_content: true })
       render(<Options payload={payload} onChange={mockOnChange} />)
-      expect(screen.getByTestId('check-icon-only-main-content'))!.toBeInTheDocument()
+      expect(screen.getByRole('checkbox', { name: /extractOnlyMainContent/i })).toHaveAttribute('aria-checked', 'true')
     })
 
     it('should display only_main_content checkbox without check icon when false', () => {
       const payload = createMockCrawlOptions({ only_main_content: false })
-      const { container } = render(<Options payload={payload} onChange={mockOnChange} />)
+      render(<Options payload={payload} onChange={mockOnChange} />)
 
-      const checkboxes = getCheckboxes(container)
-      expect(checkboxes[1]!.querySelector('svg')).not.toBeInTheDocument()
+      expect(screen.getByRole('checkbox', { name: /extractOnlyMainContent/i })).toHaveAttribute('aria-checked', 'false')
     })
 
     it('should display limit value in input', () => {
@@ -146,10 +139,9 @@ describe('Options (watercrawl)', () => {
   describe('User Interactions', () => {
     it('should call onChange with updated crawl_sub_pages when checkbox is clicked', () => {
       const payload = createMockCrawlOptions({ crawl_sub_pages: true })
-      const { container } = render(<Options payload={payload} onChange={mockOnChange} />)
+      render(<Options payload={payload} onChange={mockOnChange} />)
 
-      const checkboxes = getCheckboxes(container)
-      fireEvent.click(checkboxes[0]!)
+      fireEvent.click(screen.getByRole('checkbox', { name: /crawlSubPage/i }))
 
       expect(mockOnChange).toHaveBeenCalledWith({
         ...payload,
@@ -159,10 +151,9 @@ describe('Options (watercrawl)', () => {
 
     it('should call onChange with updated only_main_content when checkbox is clicked', () => {
       const payload = createMockCrawlOptions({ only_main_content: false })
-      const { container } = render(<Options payload={payload} onChange={mockOnChange} />)
+      render(<Options payload={payload} onChange={mockOnChange} />)
 
-      const checkboxes = getCheckboxes(container)
-      fireEvent.click(checkboxes[1]!)
+      fireEvent.click(screen.getByRole('checkbox', { name: /extractOnlyMainContent/i }))
 
       expect(mockOnChange).toHaveBeenCalledWith({
         ...payload,
diff --git a/web/app/components/datasets/create/website/watercrawl/options.tsx b/web/app/components/datasets/create/website/watercrawl/options.tsx
index 999bb3c61d..3496bbb236 100644
--- a/web/app/components/datasets/create/website/watercrawl/options.tsx
+++ b/web/app/components/datasets/create/website/watercrawl/options.tsx
@@ -38,7 +38,6 @@ const Options: FC<Props> = ({
         isChecked={payload.crawl_sub_pages}
         onChange={handleChange('crawl_sub_pages')}
         labelClassName="text-[13px] leading-[16px] font-medium text-text-secondary"
-        testId="crawl-sub-pages"
       />
       <div className="flex justify-between space-x-4">
         <Field
@@ -80,7 +79,6 @@ const Options: FC<Props> = ({
         isChecked={payload.only_main_content}
         onChange={handleChange('only_main_content')}
         labelClassName="text-[13px] leading-[16px] font-medium text-text-secondary"
-        testId="only-main-content"
       />
     </div>
   )
diff --git a/web/app/components/datasets/documents/components/__tests__/list.spec.tsx b/web/app/components/datasets/documents/components/__tests__/list.spec.tsx
index bb7e170783..0af39a5e28 100644
--- a/web/app/components/datasets/documents/components/__tests__/list.spec.tsx
+++ b/web/app/components/datasets/documents/components/__tests__/list.spec.tsx
@@ -7,8 +7,6 @@ import DocumentList from '../list'
 
 // Mock hooks used by DocumentList
 const mockHandleSort = vi.fn()
-const mockOnSelectAll = vi.fn()
-const mockOnSelectOne = vi.fn()
 const mockClearSelection = vi.fn()
 const mockHandleAction = vi.fn(() => vi.fn())
 const mockHandleBatchReIndex = vi.fn()
@@ -24,10 +22,6 @@ vi.mock('../document-list/hooks', () => ({
     handleSort: mockHandleSort,
   })),
   useDocumentSelection: vi.fn(() => ({
-    isAllSelected: false,
-    isSomeSelected: false,
-    onSelectAll: mockOnSelectAll,
-    onSelectOne: mockOnSelectOne,
     hasErrorDocumentsSelected: false,
     downloadableSelectedIds: [],
     clearSelection: mockClearSelection,
@@ -144,11 +138,9 @@ describe('DocumentList', () => {
     })
 
     it('should render select-all area when embeddingAvailable is true', () => {
-      const { container } = render(<DocumentList {...defaultProps} embeddingAvailable={true} />)
+      render(<DocumentList {...defaultProps} embeddingAvailable={true} />)
 
-      // Checkbox component renders inside the first td
-      const firstTd = container.querySelector('thead td')
-      expect(firstTd?.textContent).toContain('#')
+      expect(screen.getByRole('checkbox', { name: 'common.operation.selectAll' })).toBeInTheDocument()
     })
 
     it('should still render # column when embeddingAvailable is false', () => {
@@ -171,6 +163,17 @@ describe('DocumentList', () => {
       expect(screen.getByTestId('doc-row-a')).toBeInTheDocument()
       expect(screen.getByTestId('doc-row-b')).toBeInTheDocument()
     })
+
+    it('should call onSelectedIdChange when select-all is clicked', () => {
+      const docs = [createDoc({ id: 'a', name: 'Doc A' }), createDoc({ id: 'b', name: 'Doc B' })]
+      const onSelectedIdChange = vi.fn()
+
+      render(<DocumentList {...defaultProps} documents={docs} onSelectedIdChange={onSelectedIdChange} />)
+
+      fireEvent.click(screen.getByRole('checkbox', { name: 'common.operation.selectAll' }))
+
+      expect(onSelectedIdChange).toHaveBeenCalledWith(['a', 'b'])
+    })
   })
 
   // Verify sort headers trigger sort handler
diff --git a/web/app/components/datasets/documents/components/document-list/__tests__/index.spec.tsx b/web/app/components/datasets/documents/components/document-list/__tests__/index.spec.tsx
index 01d6299492..a7f89c0d85 100644
--- a/web/app/components/datasets/documents/components/document-list/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/components/document-list/__tests__/index.spec.tsx
@@ -189,11 +189,9 @@ describe('DocumentList', () => {
       }
       render(<DocumentList {...props} />, { wrapper: createWrapper() })
 
-      // When checked, checkbox should have a check icon (svg) inside
-      props.selectedIds.forEach((id) => {
-        const checkIcon = screen.getByTestId(`check-icon-doc-row-${id}`)
-        expect(checkIcon)!.toBeInTheDocument()
-      })
+      expect(screen.getByRole('checkbox', { name: 'Document 1.txt' })).toHaveAttribute('aria-checked', 'true')
+      expect(screen.getByRole('checkbox', { name: 'Document 2.txt' })).toHaveAttribute('aria-checked', 'true')
+      expect(screen.getByRole('checkbox', { name: 'Document 3.txt' })).toHaveAttribute('aria-checked', 'true')
     })
 
     it('should show indeterminate state when some are selected', () => {
diff --git a/web/app/components/datasets/documents/components/document-list/components/__tests__/document-table-row.spec.tsx b/web/app/components/datasets/documents/components/document-list/components/__tests__/document-table-row.spec.tsx
index b6b02ed829..135b7c2135 100644
--- a/web/app/components/datasets/documents/components/document-list/components/__tests__/document-table-row.spec.tsx
+++ b/web/app/components/datasets/documents/components/document-list/components/__tests__/document-table-row.spec.tsx
@@ -1,5 +1,6 @@
 import type { ReactNode } from 'react'
 import type { SimpleDocumentDetail } from '@/models/datasets'
+import { CheckboxGroup } from '@langgenius/dify-ui/checkbox-group'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { fireEvent, render, screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
@@ -23,15 +24,21 @@ const createTestQueryClient = () => new QueryClient({
   },
 })
 
-const createWrapper = () => {
+const createWrapper = (value: string[] = [], onValueChange = vi.fn()) => {
   const queryClient = createTestQueryClient()
   return ({ children }: { children: ReactNode }) => (
     <QueryClientProvider client={queryClient}>
-      <table>
-        <tbody>
-          {children}
-        </tbody>
-      </table>
+      <CheckboxGroup
+        value={value}
+        onValueChange={nextValue => onValueChange(nextValue)}
+        allValues={['doc-1']}
+      >
+        <table>
+          <tbody>
+            {children}
+          </tbody>
+        </table>
+      </CheckboxGroup>
     </QueryClientProvider>
   )
 }
@@ -74,22 +81,17 @@ const createMockDoc = (overrides: Record<string, unknown> = {}): LocalDoc => ({
   ...overrides,
 }) as unknown as LocalDoc
 
-// Helper to find the custom checkbox div (Checkbox component renders as a div, not a native checkbox)
-const findCheckbox = (container: HTMLElement): HTMLElement | null => {
-  return container.querySelector('[class*="shadow-xs"]')
-}
+const getRowCheckbox = () => screen.getByRole('checkbox', { name: 'test-document.txt' })
 
 describe('DocumentTableRow', () => {
   const defaultProps = {
     doc: createMockDoc(),
     index: 0,
     datasetId: 'dataset-1',
-    isSelected: false,
     isGeneralMode: true,
     isQAMode: false,
     embeddingAvailable: true,
     selectedIds: [],
-    onSelectOne: vi.fn(),
     onSelectedIdChange: vi.fn(),
     onShowRenameModal: vi.fn(),
     onUpdate: vi.fn(),
@@ -117,36 +119,28 @@ describe('DocumentTableRow', () => {
     })
 
     it('should render checkbox element', () => {
-      const { container } = render(<DocumentTableRow {...defaultProps} />, { wrapper: createWrapper() })
-      const checkbox = findCheckbox(container)
-      expect(checkbox)!.toBeInTheDocument()
+      render(<DocumentTableRow {...defaultProps} />, { wrapper: createWrapper() })
+      expect(getRowCheckbox())!.toBeInTheDocument()
     })
   })
 
   describe('Selection', () => {
-    it('should show check icon when isSelected is true', () => {
-      const { container } = render(<DocumentTableRow {...defaultProps} isSelected />, { wrapper: createWrapper() })
-      const checkbox = findCheckbox(container)
-      expect(checkbox)!.toBeInTheDocument()
-      expect(screen.getByTestId('check-icon-doc-row-doc-1'))!.toBeInTheDocument()
+    it('should show check icon when document id is selected by CheckboxGroup', () => {
+      render(<DocumentTableRow {...defaultProps} />, { wrapper: createWrapper(['doc-1']) })
+      expect(getRowCheckbox()).toHaveAttribute('aria-checked', 'true')
     })
 
-    it('should not show check icon when isSelected is false', () => {
-      const { container } = render(<DocumentTableRow {...defaultProps} isSelected={false} />, { wrapper: createWrapper() })
-      const checkbox = findCheckbox(container)
-      expect(checkbox)!.toBeInTheDocument()
-      expect(screen.queryByTestId('check-icon-doc-row-doc-1')).not.toBeInTheDocument()
+    it('should not show check icon when document id is not selected by CheckboxGroup', () => {
+      render(<DocumentTableRow {...defaultProps} />, { wrapper: createWrapper() })
+      expect(getRowCheckbox()).toHaveAttribute('aria-checked', 'false')
     })
 
-    it('should call onSelectOne when checkbox is clicked', () => {
-      const onSelectOne = vi.fn()
-      const { container } = render(<DocumentTableRow {...defaultProps} onSelectOne={onSelectOne} />, { wrapper: createWrapper() })
+    it('should call CheckboxGroup onValueChange when checkbox is clicked', () => {
+      const onValueChange = vi.fn()
+      render(<DocumentTableRow {...defaultProps} />, { wrapper: createWrapper([], onValueChange) })
 
-      const checkbox = findCheckbox(container)
-      if (checkbox) {
-        fireEvent.click(checkbox)
-        expect(onSelectOne).toHaveBeenCalledWith('doc-1')
-      }
+      fireEvent.click(getRowCheckbox())
+      expect(onValueChange).toHaveBeenCalledWith(['doc-1'])
     })
 
     it('should stop propagation when checkbox container is clicked', () => {
diff --git a/web/app/components/datasets/documents/components/document-list/components/document-table-row.tsx b/web/app/components/datasets/documents/components/document-list/components/document-table-row.tsx
index a6c8486ae3..b6b28a63fe 100644
--- a/web/app/components/datasets/documents/components/document-list/components/document-table-row.tsx
+++ b/web/app/components/datasets/documents/components/document-list/components/document-table-row.tsx
@@ -1,11 +1,10 @@
-import type { FC } from 'react'
 import type { SimpleDocumentDetail } from '@/models/datasets'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { pick } from 'es-toolkit/object'
 import * as React from 'react'
 import { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
-import Checkbox from '@/app/components/base/checkbox'
 import ChunkingModeLabel from '@/app/components/datasets/common/chunking-mode-label'
 import Operations from '@/app/components/datasets/documents/components/operations'
 import SummaryStatus from '@/app/components/datasets/documents/detail/completed/common/summary-status'
@@ -23,12 +22,10 @@ type DocumentTableRowProps = {
   doc: LocalDoc
   index: number
   datasetId: string
-  isSelected: boolean
   isGeneralMode: boolean
   isQAMode: boolean
   embeddingAvailable: boolean
   selectedIds: string[]
-  onSelectOne: (docId: string) => void
   onSelectedIdChange: (ids: string[]) => void
   onShowRenameModal: (doc: LocalDoc) => void
   onUpdate: () => void
@@ -44,24 +41,23 @@ const renderCount = (count: number | undefined) => {
   return `${formatNumber((count / 1000).toFixed(1))}k`
 }
 
-const DocumentTableRow: FC<DocumentTableRowProps> = React.memo(({
+const DocumentTableRow = React.memo(({
   doc,
   index,
   datasetId,
-  isSelected,
   isGeneralMode,
   isQAMode,
   embeddingAvailable,
   selectedIds,
-  onSelectOne,
   onSelectedIdChange,
   onShowRenameModal,
   onUpdate,
-}) => {
+}: DocumentTableRowProps) => {
   const { t } = useTranslation()
   const { formatTime } = useTimestamp()
   const router = useRouter()
   const searchParams = useSearchParams()
+  const documentNameId = React.useId()
 
   const isFile = doc.data_source_type === DataSourceType.FILE
   const fileType = isFile ? doc.data_source_detail_dict?.upload_file?.extension : ''
@@ -89,9 +85,8 @@ const DocumentTableRow: FC<DocumentTableRowProps> = React.memo(({
         <div className="flex items-center" onClick={handleCheckboxClick}>
           <Checkbox
             className="mr-2 shrink-0"
-            checked={isSelected}
-            onCheck={() => onSelectOne(doc.id)}
-            id={`doc-row-${doc.id}`}
+            value={doc.id}
+            aria-labelledby={documentNameId}
           />
           {index + 1}
         </div>
@@ -104,7 +99,7 @@ const DocumentTableRow: FC<DocumentTableRowProps> = React.memo(({
           <Tooltip>
             <TooltipTrigger
               render={(
-                <span className="grow truncate text-sm">{doc.name}</span>
+                <span id={documentNameId} className="grow truncate text-sm">{doc.name}</span>
               )}
             />
             <TooltipContent>
diff --git a/web/app/components/datasets/documents/components/document-list/hooks/__tests__/use-document-selection.spec.ts b/web/app/components/datasets/documents/components/document-list/hooks/__tests__/use-document-selection.spec.ts
index 32e4ff88b4..d266a2d4bd 100644
--- a/web/app/components/datasets/documents/components/document-list/hooks/__tests__/use-document-selection.spec.ts
+++ b/web/app/components/datasets/documents/components/document-list/hooks/__tests__/use-document-selection.spec.ts
@@ -25,199 +25,6 @@ const createMockDocument = (overrides: Partial<LocalDoc> = {}): LocalDoc => ({
 } as LocalDoc)
 
 describe('useDocumentSelection', () => {
-  describe('isAllSelected', () => {
-    it('should return false when documents is empty', () => {
-      const onSelectedIdChange = vi.fn()
-      const { result } = renderHook(() =>
-        useDocumentSelection({
-          documents: [],
-          selectedIds: [],
-          onSelectedIdChange,
-        }),
-      )
-
-      expect(result.current.isAllSelected).toBe(false)
-    })
-
-    it('should return true when all documents are selected', () => {
-      const docs = [
-        createMockDocument({ id: 'doc1' }),
-        createMockDocument({ id: 'doc2' }),
-      ]
-      const onSelectedIdChange = vi.fn()
-
-      const { result } = renderHook(() =>
-        useDocumentSelection({
-          documents: docs,
-          selectedIds: ['doc1', 'doc2'],
-          onSelectedIdChange,
-        }),
-      )
-
-      expect(result.current.isAllSelected).toBe(true)
-    })
-
-    it('should return false when not all documents are selected', () => {
-      const docs = [
-        createMockDocument({ id: 'doc1' }),
-        createMockDocument({ id: 'doc2' }),
-      ]
-      const onSelectedIdChange = vi.fn()
-
-      const { result } = renderHook(() =>
-        useDocumentSelection({
-          documents: docs,
-          selectedIds: ['doc1'],
-          onSelectedIdChange,
-        }),
-      )
-
-      expect(result.current.isAllSelected).toBe(false)
-    })
-  })
-
-  describe('isSomeSelected', () => {
-    it('should return false when no documents are selected', () => {
-      const docs = [createMockDocument({ id: 'doc1' })]
-      const onSelectedIdChange = vi.fn()
-
-      const { result } = renderHook(() =>
-        useDocumentSelection({
-          documents: docs,
-          selectedIds: [],
-          onSelectedIdChange,
-        }),
-      )
-
-      expect(result.current.isSomeSelected).toBe(false)
-    })
-
-    it('should return true when some documents are selected', () => {
-      const docs = [
-        createMockDocument({ id: 'doc1' }),
-        createMockDocument({ id: 'doc2' }),
-      ]
-      const onSelectedIdChange = vi.fn()
-
-      const { result } = renderHook(() =>
-        useDocumentSelection({
-          documents: docs,
-          selectedIds: ['doc1'],
-          onSelectedIdChange,
-        }),
-      )
-
-      expect(result.current.isSomeSelected).toBe(true)
-    })
-  })
-
-  describe('onSelectAll', () => {
-    it('should select all documents when none are selected', () => {
-      const docs = [
-        createMockDocument({ id: 'doc1' }),
-        createMockDocument({ id: 'doc2' }),
-      ]
-      const onSelectedIdChange = vi.fn()
-
-      const { result } = renderHook(() =>
-        useDocumentSelection({
-          documents: docs,
-          selectedIds: [],
-          onSelectedIdChange,
-        }),
-      )
-
-      act(() => {
-        result.current.onSelectAll()
-      })
-
-      expect(onSelectedIdChange).toHaveBeenCalledWith(['doc1', 'doc2'])
-    })
-
-    it('should deselect all when all are selected', () => {
-      const docs = [
-        createMockDocument({ id: 'doc1' }),
-        createMockDocument({ id: 'doc2' }),
-      ]
-      const onSelectedIdChange = vi.fn()
-
-      const { result } = renderHook(() =>
-        useDocumentSelection({
-          documents: docs,
-          selectedIds: ['doc1', 'doc2'],
-          onSelectedIdChange,
-        }),
-      )
-
-      act(() => {
-        result.current.onSelectAll()
-      })
-
-      expect(onSelectedIdChange).toHaveBeenCalledWith([])
-    })
-
-    it('should add to existing selection when some are selected', () => {
-      const docs = [
-        createMockDocument({ id: 'doc1' }),
-        createMockDocument({ id: 'doc2' }),
-        createMockDocument({ id: 'doc3' }),
-      ]
-      const onSelectedIdChange = vi.fn()
-
-      const { result } = renderHook(() =>
-        useDocumentSelection({
-          documents: docs,
-          selectedIds: ['doc1'],
-          onSelectedIdChange,
-        }),
-      )
-
-      act(() => {
-        result.current.onSelectAll()
-      })
-
-      expect(onSelectedIdChange).toHaveBeenCalledWith(['doc1', 'doc2', 'doc3'])
-    })
-  })
-
-  describe('onSelectOne', () => {
-    it('should add document to selection when not selected', () => {
-      const onSelectedIdChange = vi.fn()
-
-      const { result } = renderHook(() =>
-        useDocumentSelection({
-          documents: [],
-          selectedIds: [],
-          onSelectedIdChange,
-        }),
-      )
-
-      act(() => {
-        result.current.onSelectOne('doc1')
-      })
-
-      expect(onSelectedIdChange).toHaveBeenCalledWith(['doc1'])
-    })
-
-    it('should remove document from selection when already selected', () => {
-      const onSelectedIdChange = vi.fn()
-
-      const { result } = renderHook(() =>
-        useDocumentSelection({
-          documents: [],
-          selectedIds: ['doc1', 'doc2'],
-          onSelectedIdChange,
-        }),
-      )
-
-      act(() => {
-        result.current.onSelectOne('doc1')
-      })
-
-      expect(onSelectedIdChange).toHaveBeenCalledWith(['doc2'])
-    })
-  })
-
   describe('hasErrorDocumentsSelected', () => {
     it('should return false when no error documents are selected', () => {
       const docs = [
diff --git a/web/app/components/datasets/documents/components/document-list/hooks/use-document-selection.ts b/web/app/components/datasets/documents/components/document-list/hooks/use-document-selection.ts
index ad12b2b00f..5344ac88f3 100644
--- a/web/app/components/datasets/documents/components/document-list/hooks/use-document-selection.ts
+++ b/web/app/components/datasets/documents/components/document-list/hooks/use-document-selection.ts
@@ -1,5 +1,4 @@
 import type { SimpleDocumentDetail } from '@/models/datasets'
-import { uniq } from 'es-toolkit/array'
 import { useCallback, useMemo } from 'react'
 import { DataSourceType } from '@/models/datasets'
 
@@ -16,29 +15,6 @@ export const useDocumentSelection = ({
   selectedIds,
   onSelectedIdChange,
 }: UseDocumentSelectionOptions) => {
-  const isAllSelected = useMemo(() => {
-    return documents.length > 0 && documents.every(doc => selectedIds.includes(doc.id))
-  }, [documents, selectedIds])
-
-  const isSomeSelected = useMemo(() => {
-    return documents.some(doc => selectedIds.includes(doc.id))
-  }, [documents, selectedIds])
-
-  const onSelectAll = useCallback(() => {
-    if (isAllSelected)
-      onSelectedIdChange([])
-    else
-      onSelectedIdChange(uniq([...selectedIds, ...documents.map(doc => doc.id)]))
-  }, [isAllSelected, documents, onSelectedIdChange, selectedIds])
-
-  const onSelectOne = useCallback((docId: string) => {
-    onSelectedIdChange(
-      selectedIds.includes(docId)
-        ? selectedIds.filter(id => id !== docId)
-        : [...selectedIds, docId],
-    )
-  }, [selectedIds, onSelectedIdChange])
-
   const hasErrorDocumentsSelected = useMemo(() => {
     return documents.some(doc => selectedIds.includes(doc.id) && doc.display_status === 'error')
   }, [documents, selectedIds])
@@ -55,10 +31,6 @@ export const useDocumentSelection = ({
   }, [onSelectedIdChange])
 
   return {
-    isAllSelected,
-    isSomeSelected,
-    onSelectAll,
-    onSelectOne,
     hasErrorDocumentsSelected,
     downloadableSelectedIds,
     clearSelection,
diff --git a/web/app/components/datasets/documents/components/list.tsx b/web/app/components/datasets/documents/components/list.tsx
index abd40c33a0..64cb626c05 100644
--- a/web/app/components/datasets/documents/components/list.tsx
+++ b/web/app/components/datasets/documents/components/list.tsx
@@ -1,12 +1,11 @@
 'use client'
-import type { FC } from 'react'
 import type { Props as PaginationProps } from '@/app/components/base/pagination'
 import type { SimpleDocumentDetail } from '@/models/datasets'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
+import { CheckboxGroup } from '@langgenius/dify-ui/checkbox-group'
 import { useBoolean } from 'ahooks'
-import * as React from 'react'
-import { useCallback, useState } from 'react'
+import { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import Checkbox from '@/app/components/base/checkbox'
 import Pagination from '@/app/components/base/pagination'
 import EditMetadataBatchModal from '@/app/components/datasets/metadata/edit-metadata-batch/modal'
 import useBatchEditDocumentMetadata from '@/app/components/datasets/metadata/hooks/use-batch-edit-document-metadata'
@@ -36,7 +35,7 @@ type DocumentListProps = {
 /**
  * Document list component including basic information
  */
-const DocumentList: FC<DocumentListProps> = ({
+const DocumentList = ({
   embeddingAvailable,
   documents = [],
   selectedIds,
@@ -47,7 +46,7 @@ const DocumentList: FC<DocumentListProps> = ({
   onManageMetadata,
   remoteSortValue,
   onSortChange,
-}) => {
+}: DocumentListProps) => {
   const { t } = useTranslation()
   const datasetConfig = useDatasetDetailContext(s => s.dataset)
   const chunkingMode = datasetConfig?.doc_form
@@ -62,10 +61,6 @@ const DocumentList: FC<DocumentListProps> = ({
 
   // Selection
   const {
-    isAllSelected,
-    isSomeSelected,
-    onSelectAll,
-    onSelectOne,
     hasErrorDocumentsSelected,
     downloadableSelectedIds,
     clearSelection,
@@ -74,6 +69,7 @@ const DocumentList: FC<DocumentListProps> = ({
     selectedIds,
     onSelectedIdChange,
   })
+  const documentIds = useMemo(() => documents.map(doc => doc.id), [documents])
 
   // Actions
   const { handleAction, handleBatchReIndex, handleBatchDownload } = useDocumentActions({
@@ -116,7 +112,12 @@ const DocumentList: FC<DocumentListProps> = ({
 
   return (
     <div className="relative mt-3 flex h-full w-full flex-col">
-      <div className="relative h-0 grow overflow-x-auto">
+      <CheckboxGroup
+        value={selectedIds}
+        onValueChange={nextSelectedIds => onSelectedIdChange(nextSelectedIds)}
+        allValues={documentIds}
+        className="relative h-0 grow overflow-x-auto"
+      >
         <table className={`w-full max-w-full min-w-[700px] border-collapse border-0 text-sm ${s.documentTable}`}>
           <thead className="h-8 border-b border-divider-subtle text-xs leading-8 font-medium text-text-tertiary uppercase">
             <tr>
@@ -125,9 +126,8 @@ const DocumentList: FC<DocumentListProps> = ({
                   {embeddingAvailable && (
                     <Checkbox
                       className="mr-2 shrink-0"
-                      checked={isAllSelected}
-                      indeterminate={!isAllSelected && isSomeSelected}
-                      onCheck={onSelectAll}
+                      parent
+                      aria-label={t('operation.selectAll', { ns: 'common' })}
                     />
                   )}
                   #
@@ -167,12 +167,10 @@ const DocumentList: FC<DocumentListProps> = ({
                 doc={doc}
                 index={index}
                 datasetId={datasetId}
-                isSelected={selectedIds.includes(doc.id)}
                 isGeneralMode={isGeneralMode}
                 isQAMode={isQAMode}
                 embeddingAvailable={embeddingAvailable}
                 selectedIds={selectedIds}
-                onSelectOne={onSelectOne}
                 onSelectedIdChange={onSelectedIdChange}
                 onShowRenameModal={handleShowRenameModal}
                 onUpdate={onUpdate}
@@ -180,7 +178,7 @@ const DocumentList: FC<DocumentListProps> = ({
             ))}
           </tbody>
         </table>
-      </div>
+      </CheckboxGroup>
 
       {selectedIds.length > 0 && (
         <BatchAction
diff --git a/web/app/components/datasets/documents/components/operations.tsx b/web/app/components/datasets/documents/components/operations.tsx
index 8692da927d..d4bd828de6 100644
--- a/web/app/components/datasets/documents/components/operations.tsx
+++ b/web/app/components/datasets/documents/components/operations.tsx
@@ -16,15 +16,16 @@ import {
   DropdownMenuContent,
   DropdownMenuTrigger,
 } from '@langgenius/dify-ui/dropdown-menu'
+import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
 import { Switch } from '@langgenius/dify-ui/switch'
 import { toast } from '@langgenius/dify-ui/toast'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { useBoolean, useDebounceFn } from 'ahooks'
 import { noop } from 'es-toolkit/function'
 import * as React from 'react'
 import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Divider from '@/app/components/base/divider'
-import Tooltip from '@/app/components/base/tooltip'
 import { IS_CE_EDITION } from '@/config'
 import { DataSourceType, DocumentActionType } from '@/models/datasets'
 import { useRouter } from '@/next/navigation'
@@ -191,13 +192,15 @@ const Operations = ({ embeddingAvailable, datasetId, detail, selectedIds, onSele
     closeOperationsMenu()
     setShowModal(true)
   }, [closeOperationsMenu])
-  const handleDownloadClick = useCallback((evt: React.MouseEvent<HTMLDivElement>) => {
+  const handleDownloadClick = useCallback((evt: React.MouseEvent<HTMLElement>) => {
     evt.preventDefault()
     evt.stopPropagation()
     evt.nativeEvent.stopImmediatePropagation?.()
     closeOperationsMenu()
     void handleDownload()
   }, [closeOperationsMenu, handleDownload])
+  const menuActionClassName = cn(s.actionItem, 'border-none bg-transparent')
+  const menuDeleteActionClassName = cn(menuActionClassName, s.deleteActionItem, 'group')
   return (
     <div className="flex items-center" onClick={e => e.stopPropagation()}>
       {isListScene && !embeddingAvailable && (<Switch checked={false} onCheckedChange={noop} disabled={true} size="md" />)}
@@ -205,11 +208,12 @@ const Operations = ({ embeddingAvailable, datasetId, detail, selectedIds, onSele
         <>
           {archived
             ? (
-                <Tooltip popupContent={t('list.action.enableWarning', { ns: 'datasetDocuments' })} popupClassName="!font-semibold">
-                  <div>
-                    <Switch checked={false} onCheckedChange={noop} disabled={true} size="md" />
-                  </div>
-                </Tooltip>
+                <Popover>
+                  <PopoverTrigger nativeButton={false} openOnHover render={<div><Switch checked={false} onCheckedChange={noop} disabled={true} size="md" /></div>} />
+                  <PopoverContent popupClassName="px-3 py-2 font-semibold system-xs-regular text-text-tertiary">
+                    {t('list.action.enableWarning', { ns: 'datasetDocuments' })}
+                  </PopoverContent>
+                </Popover>
               )
             : <Switch checked={enabled} onCheckedChange={v => handleSwitch(v ? 'enable' : 'disable')} size="md" />}
           <Divider className="!mr-2 !ml-4 !h-3" type="vertical" />
@@ -217,16 +221,24 @@ const Operations = ({ embeddingAvailable, datasetId, detail, selectedIds, onSele
       )}
       {embeddingAvailable && (
         <>
-          <Tooltip popupContent={t('list.action.settings', { ns: 'datasetDocuments' })} popupClassName="text-text-secondary system-xs-medium" needsDelay={false}>
-            <button
-              type="button"
-              className={cn('mr-2 cursor-pointer rounded-lg', !isListScene
-                ? 'border-[0.5px] border-components-button-secondary-border bg-components-button-secondary-bg p-2 shadow-xs shadow-shadow-shadow-3 backdrop-blur-[5px] hover:border-components-button-secondary-border-hover hover:bg-components-button-secondary-bg-hover'
-                : 'p-0.5 hover:bg-state-base-hover')}
-              onClick={() => router.push(`/datasets/${datasetId}/documents/${detail.id}/settings`)}
-            >
-              <span aria-hidden className="i-ri-equalizer-2-line h-4 w-4 text-components-button-secondary-text" />
-            </button>
+          <Tooltip>
+            <TooltipTrigger
+              render={(
+                <button
+                  type="button"
+                  aria-label={t('list.action.settings', { ns: 'datasetDocuments' })}
+                  className={cn('mr-2 cursor-pointer rounded-lg', !isListScene
+                    ? 'border-[0.5px] border-components-button-secondary-border bg-components-button-secondary-bg p-2 shadow-xs shadow-shadow-shadow-3 backdrop-blur-[5px] hover:border-components-button-secondary-border-hover hover:bg-components-button-secondary-bg-hover'
+                    : 'border-none bg-transparent p-0.5 hover:bg-state-base-hover')}
+                  onClick={() => router.push(`/datasets/${datasetId}/documents/${detail.id}/settings`)}
+                >
+                  <span aria-hidden className="i-ri-equalizer-2-line h-4 w-4 text-components-button-secondary-text" />
+                </button>
+              )}
+            />
+            <TooltipContent className="system-xs-medium text-text-secondary">
+              {t('list.action.settings', { ns: 'datasetDocuments' })}
+            </TooltipContent>
           </Tooltip>
           <DropdownMenu open={isOperationsMenuOpen} onOpenChange={setIsOperationsMenuOpen}>
             <DropdownMenuTrigger
@@ -256,68 +268,68 @@ const Operations = ({ embeddingAvailable, datasetId, detail, selectedIds, onSele
               <div className="w-full py-1">
                 {!archived && (
                   <>
-                    <div className={s.actionItem} onClick={handleShowRename}>
+                    <button type="button" className={cn(menuActionClassName, 'text-left')} onClick={handleShowRename}>
                       <span aria-hidden className="i-ri-edit-line h-4 w-4 text-text-tertiary" />
                       <span className={s.actionName}>{t('list.table.rename', { ns: 'datasetDocuments' })}</span>
-                    </div>
+                    </button>
                     {data_source_type === DataSourceType.FILE && (
-                      <div className={s.actionItem} onClick={handleDownloadClick}>
+                      <button type="button" className={cn(menuActionClassName, 'text-left')} onClick={handleDownloadClick}>
                         <span aria-hidden className="i-ri-download-2-line h-4 w-4 text-text-tertiary" />
                         <span className={s.actionName}>{t('list.action.download', { ns: 'datasetDocuments' })}</span>
-                      </div>
+                      </button>
                     )}
                     {['notion_import', DataSourceType.WEB].includes(data_source_type) && (
-                      <div className={s.actionItem} onClick={() => handleMenuOperation('sync')}>
+                      <button type="button" className={cn(menuActionClassName, 'text-left')} onClick={() => handleMenuOperation('sync')}>
                         <span aria-hidden className="i-ri-loop-left-line h-4 w-4 text-text-tertiary" />
                         <span className={s.actionName}>{t('list.action.sync', { ns: 'datasetDocuments' })}</span>
-                      </div>
+                      </button>
                     )}
                     {IS_CE_EDITION && (
-                      <div className={s.actionItem} onClick={() => handleMenuOperation('summary')}>
+                      <button type="button" className={cn(menuActionClassName, 'text-left')} onClick={() => handleMenuOperation('summary')}>
                         <span aria-hidden className="i-custom-vender-knowledge-search-lines-sparkle h-4 w-4 text-text-tertiary" />
                         <span className={s.actionName}>{t('list.action.summary', { ns: 'datasetDocuments' })}</span>
-                      </div>
+                      </button>
                     )}
                     <Divider className="my-1" />
                   </>
                 )}
                 {archived && data_source_type === DataSourceType.FILE && (
                   <>
-                    <div className={s.actionItem} onClick={handleDownloadClick}>
+                    <button type="button" className={cn(menuActionClassName, 'text-left')} onClick={handleDownloadClick}>
                       <span aria-hidden className="i-ri-download-2-line h-4 w-4 text-text-tertiary" />
                       <span className={s.actionName}>{t('list.action.download', { ns: 'datasetDocuments' })}</span>
-                    </div>
+                    </button>
                     <Divider className="my-1" />
                   </>
                 )}
                 {!archived && display_status?.toLowerCase() === 'indexing' && (
-                  <div className={s.actionItem} onClick={() => handleMenuOperation('pause')}>
+                  <button type="button" className={cn(menuActionClassName, 'text-left')} onClick={() => handleMenuOperation('pause')}>
                     <span aria-hidden className="i-ri-pause-circle-line h-4 w-4 text-text-tertiary" />
                     <span className={s.actionName}>{t('list.action.pause', { ns: 'datasetDocuments' })}</span>
-                  </div>
+                  </button>
                 )}
                 {!archived && display_status?.toLowerCase() === 'paused' && (
-                  <div className={s.actionItem} onClick={() => handleMenuOperation('resume')}>
+                  <button type="button" className={cn(menuActionClassName, 'text-left')} onClick={() => handleMenuOperation('resume')}>
                     <span aria-hidden className="i-ri-play-circle-line h-4 w-4 text-text-tertiary" />
                     <span className={s.actionName}>{t('list.action.resume', { ns: 'datasetDocuments' })}</span>
-                  </div>
+                  </button>
                 )}
                 {!archived && (
-                  <div className={s.actionItem} onClick={() => handleMenuOperation('archive')}>
+                  <button type="button" className={cn(menuActionClassName, 'text-left')} onClick={() => handleMenuOperation('archive')}>
                     <span aria-hidden className="i-ri-archive-2-line h-4 w-4 text-text-tertiary" />
                     <span className={s.actionName}>{t('list.action.archive', { ns: 'datasetDocuments' })}</span>
-                  </div>
+                  </button>
                 )}
                 {archived && (
-                  <div className={s.actionItem} onClick={() => handleMenuOperation('un_archive')}>
+                  <button type="button" className={cn(menuActionClassName, 'text-left')} onClick={() => handleMenuOperation('un_archive')}>
                     <span aria-hidden className="i-ri-archive-2-line h-4 w-4 text-text-tertiary" />
                     <span className={s.actionName}>{t('list.action.unarchive', { ns: 'datasetDocuments' })}</span>
-                  </div>
+                  </button>
                 )}
-                <div className={cn(s.actionItem, s.deleteActionItem, 'group')} onClick={handleDeleteClick}>
+                <button type="button" className={cn(menuDeleteActionClassName, 'text-left')} onClick={handleDeleteClick}>
                   <span aria-hidden className="i-ri-delete-bin-line h-4 w-4 text-text-tertiary group-hover:text-text-destructive" />
                   <span className={cn(s.actionName, 'group-hover:text-text-destructive')}>{t('list.action.delete', { ns: 'datasetDocuments' })}</span>
-                </div>
+                </button>
               </div>
             </DropdownMenuContent>
           </DropdownMenu>
diff --git a/web/app/components/datasets/documents/components/rename-modal.tsx b/web/app/components/datasets/documents/components/rename-modal.tsx
index fc4626676b..ac4fc7fc84 100644
--- a/web/app/components/datasets/documents/components/rename-modal.tsx
+++ b/web/app/components/datasets/documents/components/rename-modal.tsx
@@ -1,13 +1,13 @@
 'use client'
 import type { FC } from 'react'
 import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
 import { useBoolean } from 'ahooks'
 import * as React from 'react'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Input from '@/app/components/base/input'
-import Modal from '@/app/components/base/modal'
 import { renameDocumentName } from '@/service/datasets'
 
 type Props = {
@@ -55,23 +55,31 @@ const RenameModal: FC<Props> = ({
   }
 
   return (
-    <Modal
-      title={t('list.table.rename', { ns: 'datasetDocuments' })}
-      isShow
-      onClose={onClose}
+    <Dialog
+      open
+      onOpenChange={(open) => {
+        if (!open)
+          onClose()
+      }}
     >
-      <div className="mt-6 text-sm leading-[21px] font-medium text-text-primary">{t('list.table.name', { ns: 'datasetDocuments' })}</div>
-      <Input
-        className="mt-2 h-10"
-        value={newName}
-        onChange={e => setNewName(e.target.value)}
-      />
+      <DialogContent className="overflow-hidden! border-none text-left align-middle">
+        <DialogTitle className="title-2xl-semi-bold text-text-primary">
+          {t('list.table.rename', { ns: 'datasetDocuments' })}
+        </DialogTitle>
 
-      <div className="mt-10 flex justify-end">
-        <Button className="mr-2 shrink-0" onClick={onClose}>{t('operation.cancel', { ns: 'common' })}</Button>
-        <Button variant="primary" className="shrink-0" onClick={handleSave} loading={saveLoading}>{t('operation.save', { ns: 'common' })}</Button>
-      </div>
-    </Modal>
+        <div className="mt-6 text-sm leading-[21px] font-medium text-text-primary">{t('list.table.name', { ns: 'datasetDocuments' })}</div>
+        <Input
+          className="mt-2 h-10"
+          value={newName}
+          onChange={e => setNewName(e.target.value)}
+        />
+
+        <div className="mt-10 flex justify-end">
+          <Button className="mr-2 shrink-0" onClick={onClose}>{t('operation.cancel', { ns: 'common' })}</Button>
+          <Button variant="primary" className="shrink-0" onClick={handleSave} loading={saveLoading}>{t('operation.save', { ns: 'common' })}</Button>
+        </div>
+      </DialogContent>
+    </Dialog>
   )
 }
 export default React.memo(RenameModal)
diff --git a/web/app/components/datasets/documents/create-from-pipeline/__tests__/index.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/__tests__/index.spec.tsx
index 18241f2139..1029714661 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/__tests__/index.spec.tsx
@@ -1327,7 +1327,7 @@ describe('useDatasourceActions', () => {
     const { result } = renderHook(() => useDatasourceActions(params))
 
     act(() => {
-      result.current.handleSelectAll()
+      result.current.handleSelectAll(true)
     })
 
     // Verify the callback was executed (no error thrown)
@@ -1351,7 +1351,7 @@ describe('useDatasourceActions', () => {
     const { result } = renderHook(() => useDatasourceActions(params))
 
     act(() => {
-      result.current.handleSelectAll()
+      result.current.handleSelectAll(true)
     })
 
     expect(true).toBe(true)
@@ -1961,7 +1961,7 @@ describe('useDatasourceActions - Async Functions', () => {
     const { result } = renderHook(() => useDatasourceActions(params))
 
     act(() => {
-      result.current.handleSelectAll()
+      result.current.handleSelectAll(false)
     })
 
     // Should deselect all since documents.length >= allIds.length
@@ -2002,7 +2002,7 @@ describe('useDatasourceActions - Async Functions', () => {
     const { result } = renderHook(() => useDatasourceActions(params))
 
     act(() => {
-      result.current.handleSelectAll()
+      result.current.handleSelectAll(false)
     })
 
     // Should deselect all since selectedFileIds.length >= allKeys.length
@@ -2531,7 +2531,7 @@ describe('useDatasourceActions - Edge Case Branches', () => {
     const { result } = renderHook(() => useDatasourceActions(params))
 
     act(() => {
-      result.current.handleSelectAll()
+      result.current.handleSelectAll(false)
     })
 
     // Should use empty array when currentWorkspacePages is undefined
diff --git a/web/app/components/datasets/documents/create-from-pipeline/actions/__tests__/index.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/actions/__tests__/index.spec.tsx
index 93861ef76a..dac136dd7f 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/actions/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/actions/__tests__/index.spec.tsx
@@ -1,4 +1,5 @@
 import { fireEvent, render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
 import * as React from 'react'
 import Actions from '../index'
 
@@ -17,6 +18,8 @@ vi.mock('@/next/link', () => ({
   ),
 }))
 
+const getSelectAllCheckbox = () => screen.getByRole('checkbox', { name: 'common.operation.selectAll' })
+
 describe('Actions', () => {
   // Default mock for required props
   const defaultProps = {
@@ -166,8 +169,9 @@ describe('Actions', () => {
       expect(handleNextStep).not.toHaveBeenCalled()
     })
 
-    it('should call onSelectAll when checkbox is clicked', () => {
+    it('should call onSelectAll when checkbox is clicked', async () => {
       const onSelectAll = vi.fn()
+      const user = userEvent.setup()
       render(
         <Actions
           {...defaultProps}
@@ -178,14 +182,10 @@ describe('Actions', () => {
         />,
       )
 
-      // Act - find the checkbox container and click it
-      const selectAllLabel = screen.getByText('common.operation.selectAll')
-      const checkboxContainer = selectAllLabel.closest('.flex.shrink-0.items-center')
-      const checkbox = checkboxContainer?.querySelector('[class*="cursor-pointer"]')
-      if (checkbox)
-        fireEvent.click(checkbox)
+      await user.click(screen.getByText('common.operation.selectAll'))
 
       expect(onSelectAll).toHaveBeenCalledTimes(1)
+      expect(onSelectAll).toHaveBeenCalledWith(true)
     })
   })
 
@@ -209,7 +209,7 @@ describe('Actions', () => {
       })
 
       it('should return false when selectedOptions is undefined', () => {
-        const { container } = render(
+        render(
           <Actions
             {...defaultProps}
             showSelect={true}
@@ -220,12 +220,11 @@ describe('Actions', () => {
         )
 
         // Assert - checkbox should not be indeterminate
-        const checkbox = container.querySelector('[class*="cursor-pointer"]')
-        expect(checkbox).toBeInTheDocument()
+        expect(getSelectAllCheckbox()).toHaveAttribute('aria-checked', 'false')
       })
 
       it('should return false when totalOptions is undefined', () => {
-        const { container } = render(
+        render(
           <Actions
             {...defaultProps}
             showSelect={true}
@@ -236,12 +235,11 @@ describe('Actions', () => {
         )
 
         // Assert - checkbox should exist
-        const checkbox = container.querySelector('[class*="cursor-pointer"]')
-        expect(checkbox).toBeInTheDocument()
+        expect(getSelectAllCheckbox()).toHaveAttribute('aria-checked', 'false')
       })
 
       it('should return true when some options are selected (0 < selectedOptions < totalOptions)', () => {
-        const { container } = render(
+        render(
           <Actions
             {...defaultProps}
             showSelect={true}
@@ -252,13 +250,11 @@ describe('Actions', () => {
         )
 
         // Assert - checkbox should render in indeterminate state
-        // The checkbox component renders IndeterminateIcon when indeterminate and not checked
-        const selectAllContainer = container.querySelector('.flex.shrink-0.items-center')
-        expect(selectAllContainer).toBeInTheDocument()
+        expect(getSelectAllCheckbox()).toHaveAttribute('aria-checked', 'mixed')
       })
 
       it('should return false when no options are selected (selectedOptions === 0)', () => {
-        const { container } = render(
+        render(
           <Actions
             {...defaultProps}
             showSelect={true}
@@ -269,12 +265,11 @@ describe('Actions', () => {
         )
 
         // Assert - checkbox should be unchecked and not indeterminate
-        const checkbox = container.querySelector('[class*="cursor-pointer"]')
-        expect(checkbox).toBeInTheDocument()
+        expect(getSelectAllCheckbox()).toHaveAttribute('aria-checked', 'false')
       })
 
       it('should return false when all options are selected (selectedOptions === totalOptions)', () => {
-        const { container } = render(
+        render(
           <Actions
             {...defaultProps}
             showSelect={true}
@@ -285,8 +280,7 @@ describe('Actions', () => {
         )
 
         // Assert - checkbox should be checked, not indeterminate
-        const checkbox = container.querySelector('[class*="cursor-pointer"]')
-        expect(checkbox).toBeInTheDocument()
+        expect(getSelectAllCheckbox()).toHaveAttribute('aria-checked', 'true')
       })
     })
 
@@ -307,7 +301,7 @@ describe('Actions', () => {
       })
 
       it('should return false when selectedOptions is undefined', () => {
-        const { container } = render(
+        render(
           <Actions
             {...defaultProps}
             showSelect={true}
@@ -317,12 +311,11 @@ describe('Actions', () => {
           />,
         )
 
-        const checkbox = container.querySelector('[class*="cursor-pointer"]')
-        expect(checkbox).toBeInTheDocument()
+        expect(getSelectAllCheckbox()).toHaveAttribute('aria-checked', 'false')
       })
 
       it('should return false when totalOptions is undefined', () => {
-        const { container } = render(
+        render(
           <Actions
             {...defaultProps}
             showSelect={true}
@@ -332,12 +325,11 @@ describe('Actions', () => {
           />,
         )
 
-        const checkbox = container.querySelector('[class*="cursor-pointer"]')
-        expect(checkbox).toBeInTheDocument()
+        expect(getSelectAllCheckbox()).toHaveAttribute('aria-checked', 'false')
       })
 
       it('should return true when all options are selected (selectedOptions === totalOptions)', () => {
-        const { container } = render(
+        render(
           <Actions
             {...defaultProps}
             showSelect={true}
@@ -348,12 +340,11 @@ describe('Actions', () => {
         )
 
         // Assert - checkbox should show checked state (RiCheckLine icon)
-        const checkbox = container.querySelector('[class*="cursor-pointer"]')
-        expect(checkbox).toBeInTheDocument()
+        expect(getSelectAllCheckbox()).toHaveAttribute('aria-checked', 'true')
       })
 
       it('should return false when selectedOptions is 0', () => {
-        const { container } = render(
+        render(
           <Actions
             {...defaultProps}
             showSelect={true}
@@ -364,12 +355,11 @@ describe('Actions', () => {
         )
 
         // Assert - checkbox should be unchecked
-        const checkbox = container.querySelector('[class*="cursor-pointer"]')
-        expect(checkbox).toBeInTheDocument()
+        expect(getSelectAllCheckbox()).toHaveAttribute('aria-checked', 'false')
       })
 
       it('should return false when not all options are selected', () => {
-        const { container } = render(
+        render(
           <Actions
             {...defaultProps}
             showSelect={true}
@@ -380,8 +370,7 @@ describe('Actions', () => {
         )
 
         // Assert - checkbox should be indeterminate, not checked
-        const checkbox = container.querySelector('[class*="cursor-pointer"]')
-        expect(checkbox).toBeInTheDocument()
+        expect(getSelectAllCheckbox()).toHaveAttribute('aria-checked', 'mixed')
       })
     })
   })
@@ -443,7 +432,7 @@ describe('Actions', () => {
   describe('Edge Cases', () => {
     // Tests for boundary conditions and unusual inputs
     it('should handle totalOptions of 0', () => {
-      const { container } = render(
+      render(
         <Actions
           {...defaultProps}
           showSelect={true}
@@ -454,12 +443,11 @@ describe('Actions', () => {
       )
 
       // Assert - should render checkbox
-      const checkbox = container.querySelector('[class*="cursor-pointer"]')
-      expect(checkbox).toBeInTheDocument()
+      expect(getSelectAllCheckbox()).toHaveAttribute('aria-checked', 'false')
     })
 
     it('should handle very large totalOptions', () => {
-      const { container } = render(
+      render(
         <Actions
           {...defaultProps}
           showSelect={true}
@@ -469,8 +457,7 @@ describe('Actions', () => {
         />,
       )
 
-      const checkbox = container.querySelector('[class*="cursor-pointer"]')
-      expect(checkbox).toBeInTheDocument()
+      expect(getSelectAllCheckbox()).toHaveAttribute('aria-checked', 'mixed')
     })
 
     it('should handle very long tip text', () => {
@@ -523,7 +510,7 @@ describe('Actions', () => {
 
     it('should handle selectedOptions greater than totalOptions', () => {
       // This is an edge case that shouldn't happen but should be handled gracefully
-      const { container } = render(
+      render(
         <Actions
           {...defaultProps}
           showSelect={true}
@@ -534,12 +521,11 @@ describe('Actions', () => {
       )
 
       // Assert - should still render
-      const checkbox = container.querySelector('[class*="cursor-pointer"]')
-      expect(checkbox).toBeInTheDocument()
+      expect(getSelectAllCheckbox()).toHaveAttribute('aria-checked', 'false')
     })
 
     it('should handle negative selectedOptions', () => {
-      const { container } = render(
+      render(
         <Actions
           {...defaultProps}
           showSelect={true}
@@ -550,12 +536,12 @@ describe('Actions', () => {
       )
 
       // Assert - should still render (though this is an invalid state)
-      const checkbox = container.querySelector('[class*="cursor-pointer"]')
-      expect(checkbox).toBeInTheDocument()
+      expect(getSelectAllCheckbox()).toHaveAttribute('aria-checked', 'false')
     })
 
-    it('should handle onSelectAll being undefined when showSelect is true', () => {
-      const { container } = render(
+    it('should handle onSelectAll being undefined when showSelect is true', async () => {
+      const user = userEvent.setup()
+      render(
         <Actions
           {...defaultProps}
           showSelect={true}
@@ -566,11 +552,8 @@ describe('Actions', () => {
       )
 
       // Assert - should render checkbox
-      const checkbox = container.querySelector('[class*="cursor-pointer"]')
-      expect(checkbox).toBeInTheDocument()
-
-      if (checkbox)
-        expect(() => fireEvent.click(checkbox)).not.toThrow()
+      expect(getSelectAllCheckbox()).toBeInTheDocument()
+      await expect(user.click(screen.getByText('common.operation.selectAll'))).resolves.toBeUndefined()
     })
 
     it('should handle empty datasetId from params', () => {
@@ -654,8 +637,8 @@ describe('Actions', () => {
 
     it.each(selectionStates)(
       'should render with $expectedState state when totalOptions=$totalOptions and selectedOptions=$selectedOptions',
-      ({ totalOptions, selectedOptions }) => {
-        const { container } = render(
+      ({ totalOptions, selectedOptions, expectedState }) => {
+        render(
           <Actions
             {...defaultProps}
             showSelect={true}
@@ -666,8 +649,10 @@ describe('Actions', () => {
         )
 
         // Assert - component should render without errors
-        const checkbox = container.querySelector('[class*="cursor-pointer"]')
-        expect(checkbox).toBeInTheDocument()
+        const expectedAriaChecked = expectedState === 'indeterminate'
+          ? 'mixed'
+          : expectedState === 'checked' ? 'true' : 'false'
+        expect(getSelectAllCheckbox()).toHaveAttribute('aria-checked', expectedAriaChecked)
         expect(screen.getByText('common.operation.selectAll')).toBeInTheDocument()
       },
     )
@@ -692,7 +677,7 @@ describe('Actions', () => {
     })
 
     it('should position select all section before buttons when showSelect is true', () => {
-      const { container } = render(
+      render(
         <Actions
           {...defaultProps}
           showSelect={true}
@@ -703,8 +688,7 @@ describe('Actions', () => {
       )
 
       // Assert - select all section should exist
-      const selectAllSection = container.querySelector('.flex.shrink-0.items-center')
-      expect(selectAllSection).toBeInTheDocument()
+      expect(getSelectAllCheckbox()).toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/datasets/documents/create-from-pipeline/actions/index.tsx b/web/app/components/datasets/documents/create-from-pipeline/actions/index.tsx
index caffed6500..d0db9cc4c1 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/actions/index.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/actions/index.tsx
@@ -1,9 +1,9 @@
 import { Button } from '@langgenius/dify-ui/button'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import { RiArrowRightLine } from '@remixicon/react'
 import * as React from 'react'
 import { useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
-import Checkbox from '@/app/components/base/checkbox'
 import Link from '@/next/link'
 import { useParams } from '@/next/navigation'
 
@@ -13,7 +13,7 @@ type ActionsProps = {
   showSelect?: boolean
   totalOptions?: number
   selectedOptions?: number
-  onSelectAll?: () => void
+  onSelectAll?: (checked: boolean) => void
   tip?: string
 }
 
@@ -49,16 +49,16 @@ const Actions = ({
     <div className="flex items-center gap-x-2 overflow-hidden">
       {showSelect && (
         <>
-          <div className="flex shrink-0 items-center gap-x-2 py-[3px] pr-2 pl-4">
+          <label className="flex shrink-0 cursor-pointer items-center gap-x-2 py-[3px] pr-2 pl-4">
             <Checkbox
-              onCheck={onSelectAll}
+              onCheckedChange={checked => onSelectAll?.(checked)}
               indeterminate={indeterminate}
               checked={checked}
             />
             <span className="system-sm-medium text-text-accent">
               {t('operation.selectAll', { ns: 'common' })}
             </span>
-          </div>
+          </label>
           {tip && (
             <div title={tip} className="max-w-full truncate system-xs-regular text-text-tertiary">
               {tip}
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/__tests__/index.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/__tests__/index.spec.tsx
index 49b0cb0789..0db8f54df4 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/__tests__/index.spec.tsx
@@ -18,43 +18,7 @@ vi.mock('@/app/components/plugins/plugin-auth', () => ({
   },
 }))
 
-// Mock portal-to-follow-elem - use React state to properly handle open/close
-vi.mock('@/app/components/base/portal-to-follow-elem', () => {
-  const MockPortalToFollowElem = ({ children, open }: { children: React.ReactNode, open: boolean }) => {
-    return (
-      <div data-testid="portal-root" data-open={open}>
-        {React.Children.map(children, (child) => {
-          if (!React.isValidElement(child))
-            return null
-          return React.cloneElement(child as React.ReactElement<{ __portalOpen?: boolean }>, { __portalOpen: open })
-        })}
-      </div>
-    )
-  }
-
-  const MockPortalToFollowElemTrigger = ({ children, onClick, className, __portalOpen }: { children: React.ReactNode, onClick?: React.MouseEventHandler, className?: string, __portalOpen?: boolean }) => (
-    <div data-testid="portal-trigger" onClick={onClick} className={className} data-open={__portalOpen}>
-      {children}
-    </div>
-  )
-
-  const MockPortalToFollowElemContent = ({ children, className, __portalOpen }: { children: React.ReactNode, className?: string, __portalOpen?: boolean }) => {
-    // Match actual behavior: returns null when not open
-    if (!__portalOpen)
-      return null
-    return (
-      <div data-testid="portal-content" className={className}>
-        {children}
-      </div>
-    )
-  }
-
-  return {
-    PortalToFollowElem: MockPortalToFollowElem,
-    PortalToFollowElemTrigger: MockPortalToFollowElemTrigger,
-    PortalToFollowElemContent: MockPortalToFollowElemContent,
-  }
-})
+vi.mock('@langgenius/dify-ui/popover', () => import('@/__mocks__/base-ui-popover'))
 
 // CredentialIcon - imported directly (not mocked)
 // This is a simple UI component with no external dependencies
@@ -97,8 +61,8 @@ describe('CredentialSelector', () => {
 
       render(<CredentialSelector {...props} />)
 
-      expect(screen.getByTestId('portal-root'))!.toBeInTheDocument()
-      expect(screen.getByTestId('portal-trigger'))!.toBeInTheDocument()
+      expect(screen.getByTestId('popover'))!.toBeInTheDocument()
+      expect(screen.getByTestId('popover-trigger'))!.toBeInTheDocument()
     })
 
     it('should render current credential name in trigger', () => {
@@ -134,7 +98,7 @@ describe('CredentialSelector', () => {
 
       render(<CredentialSelector {...props} />)
 
-      expect(screen.queryByTestId('portal-content')).not.toBeInTheDocument()
+      expect(screen.queryByTestId('popover-content')).not.toBeInTheDocument()
     })
 
     it('should render all credentials in dropdown when opened', () => {
@@ -142,12 +106,12 @@ describe('CredentialSelector', () => {
       render(<CredentialSelector {...props} />)
 
       // Act - Click trigger to open dropdown
-      const trigger = screen.getByTestId('portal-trigger')
+      const trigger = screen.getByTestId('popover-trigger')
       fireEvent.click(trigger)
 
       // Assert - All credentials should be visible (current credential appears in both trigger and list)
       // Assert - All credentials should be visible (current credential appears in both trigger and list)
-      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
+      expect(screen.getByTestId('popover-content'))!.toBeInTheDocument()
       // 3 in dropdown list + 1 in trigger (current) = 4 total
       expect(screen.getAllByText(/Credential \d/)).toHaveLength(4)
     })
@@ -212,7 +176,7 @@ describe('CredentialSelector', () => {
         })
         render(<CredentialSelector {...props} />)
 
-        const trigger = screen.getByTestId('portal-trigger')
+        const trigger = screen.getByTestId('popover-trigger')
         fireEvent.click(trigger)
 
         // Assert - 5 in dropdown + 1 in trigger (current credential appears twice)
@@ -238,7 +202,7 @@ describe('CredentialSelector', () => {
         render(<CredentialSelector {...props} />)
 
         // Act - Open dropdown
-        const trigger = screen.getByTestId('portal-trigger')
+        const trigger = screen.getByTestId('popover-trigger')
         fireEvent.click(trigger)
 
         const credential2 = screen.getByText('Credential 2')
@@ -256,11 +220,11 @@ describe('CredentialSelector', () => {
         render(<CredentialSelector {...props} />)
 
         // Act - Open dropdown and select credential
-        const trigger = screen.getByTestId('portal-trigger')
+        const trigger = screen.getByTestId('popover-trigger')
         fireEvent.click(trigger)
 
         // Get the dropdown item using within() to scope query to portal content
-        const portalContent = screen.getByTestId('portal-content')
+        const portalContent = screen.getByTestId('popover-content')
         const credentialOption = within(portalContent).getByText(credentialName)
         fireEvent.click(credentialOption)
 
@@ -277,7 +241,7 @@ describe('CredentialSelector', () => {
         render(<CredentialSelector {...props} />)
 
         // Act - Open dropdown and select Credential 1
-        const trigger = screen.getByTestId('portal-trigger')
+        const trigger = screen.getByTestId('popover-trigger')
         fireEvent.click(trigger)
 
         const credential1 = screen.getByText('Credential 1')
@@ -326,15 +290,15 @@ describe('CredentialSelector', () => {
       // Assert - Initially closed
       // Assert - Initially closed
       // Assert - Initially closed
-      expect(screen.queryByTestId('portal-content')).not.toBeInTheDocument()
+      expect(screen.queryByTestId('popover-content')).not.toBeInTheDocument()
 
       // Act - Click trigger
-      const trigger = screen.getByTestId('portal-trigger')
+      const trigger = screen.getByTestId('popover-trigger')
       fireEvent.click(trigger)
 
       // Assert - Now open
       // Assert - Now open
-      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
+      expect(screen.getByTestId('popover-content'))!.toBeInTheDocument()
     })
 
     it('should call onCredentialChange when clicking a credential item', () => {
@@ -342,7 +306,7 @@ describe('CredentialSelector', () => {
       const props = createDefaultProps({ onCredentialChange: mockOnChange })
       render(<CredentialSelector {...props} />)
 
-      const trigger = screen.getByTestId('portal-trigger')
+      const trigger = screen.getByTestId('popover-trigger')
       fireEvent.click(trigger)
       const credential2 = screen.getByText('Credential 2')
       fireEvent.click(credential2)
@@ -357,10 +321,10 @@ describe('CredentialSelector', () => {
       render(<CredentialSelector {...props} />)
 
       // Act - Open and select
-      const trigger = screen.getByTestId('portal-trigger')
+      const trigger = screen.getByTestId('popover-trigger')
       fireEvent.click(trigger)
 
-      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
+      expect(screen.getByTestId('popover-content'))!.toBeInTheDocument()
 
       const credential2 = screen.getByText('Credential 2')
       fireEvent.click(credential2)
@@ -374,7 +338,7 @@ describe('CredentialSelector', () => {
       render(<CredentialSelector {...props} />)
 
       // Act - Rapid clicks
-      const trigger = screen.getByTestId('portal-trigger')
+      const trigger = screen.getByTestId('popover-trigger')
       fireEvent.click(trigger)
       fireEvent.click(trigger)
       fireEvent.click(trigger)
@@ -395,7 +359,7 @@ describe('CredentialSelector', () => {
       render(<CredentialSelector {...props} />)
 
       // Act & Assert - Select Credential 1 (different from current)
-      const trigger = screen.getByTestId('portal-trigger')
+      const trigger = screen.getByTestId('popover-trigger')
       fireEvent.click(trigger)
 
       const credential1 = screen.getByText('Credential 1')
@@ -499,7 +463,7 @@ describe('CredentialSelector', () => {
       render(<CredentialSelector {...props} />)
 
       // Act - Open dropdown and select
-      const trigger = screen.getByTestId('portal-trigger')
+      const trigger = screen.getByTestId('popover-trigger')
       fireEvent.click(trigger)
       const credential = screen.getByText('Credential 2')
       fireEvent.click(credential)
@@ -519,7 +483,7 @@ describe('CredentialSelector', () => {
       rerender(<CredentialSelector {...props} onCredentialChange={mockOnChange2} />)
 
       // Open and select
-      const trigger = screen.getByTestId('portal-trigger')
+      const trigger = screen.getByTestId('popover-trigger')
       fireEvent.click(trigger)
       const credential = screen.getByText('Credential 2')
       fireEvent.click(credential)
@@ -651,7 +615,7 @@ describe('CredentialSelector', () => {
       rerender(<CredentialSelector {...props} onCredentialChange={mockOnChange2} />)
 
       // Open and select
-      const trigger = screen.getByTestId('portal-trigger')
+      const trigger = screen.getByTestId('popover-trigger')
       fireEvent.click(trigger)
       const credential = screen.getByText('Credential 2')
       fireEvent.click(credential)
@@ -672,7 +636,7 @@ describe('CredentialSelector', () => {
 
       // Assert - Should render without crashing
       // Assert - Should render without crashing
-      expect(screen.getByTestId('portal-root'))!.toBeInTheDocument()
+      expect(screen.getByTestId('popover'))!.toBeInTheDocument()
     })
 
     it('should handle undefined avatar_url in credential', () => {
@@ -713,7 +677,7 @@ describe('CredentialSelector', () => {
 
       // Assert - Should render without crashing
       // Assert - Should render without crashing
-      expect(screen.getByTestId('portal-trigger'))!.toBeInTheDocument()
+      expect(screen.getByTestId('popover-trigger'))!.toBeInTheDocument()
     })
 
     it('should handle very long credential name', () => {
@@ -788,7 +752,7 @@ describe('CredentialSelector', () => {
       })
 
       render(<CredentialSelector {...props} />)
-      const trigger = screen.getByTestId('portal-trigger')
+      const trigger = screen.getByTestId('popover-trigger')
       fireEvent.click(trigger)
 
       // Get all "Same Name" elements
@@ -807,7 +771,7 @@ describe('CredentialSelector', () => {
       const props = createDefaultProps({ onCredentialChange: mockOnChange })
       const { unmount } = render(<CredentialSelector {...props} />)
 
-      const trigger = screen.getByTestId('portal-trigger')
+      const trigger = screen.getByTestId('popover-trigger')
       fireEvent.click(trigger)
 
       unmount()
@@ -832,7 +796,7 @@ describe('CredentialSelector', () => {
 
       // Assert - Should render without crashing
       // Assert - Should render without crashing
-      expect(screen.getByTestId('portal-trigger'))!.toBeInTheDocument()
+      expect(screen.getByTestId('popover-trigger'))!.toBeInTheDocument()
     })
   })
 
@@ -843,7 +807,7 @@ describe('CredentialSelector', () => {
 
       render(<CredentialSelector {...props} />)
 
-      const trigger = screen.getByTestId('portal-trigger')
+      const trigger = screen.getByTestId('popover-trigger')
       expect(trigger)!.toHaveClass('overflow-hidden')
     })
 
@@ -852,19 +816,21 @@ describe('CredentialSelector', () => {
 
       render(<CredentialSelector {...props} />)
 
-      const trigger = screen.getByTestId('portal-trigger')
+      const trigger = screen.getByTestId('popover-trigger')
       expect(trigger)!.toHaveClass('grow')
     })
 
-    it('should apply z-10 class to dropdown content', () => {
+    it('should configure dropdown placement through popover props', () => {
       const props = createDefaultProps()
       render(<CredentialSelector {...props} />)
 
-      const trigger = screen.getByTestId('portal-trigger')
+      const trigger = screen.getByTestId('popover-trigger')
       fireEvent.click(trigger)
 
-      const content = screen.getByTestId('portal-content')
-      expect(content)!.toHaveClass('z-10')
+      const content = screen.getByTestId('popover-content')
+      expect(content)!.toHaveAttribute('data-placement', 'bottom-start')
+      expect(content)!.toHaveAttribute('data-side-offset', '4')
+      expect(content)!.not.toHaveClass('z-10')
     })
   })
 
@@ -885,11 +851,11 @@ describe('CredentialSelector', () => {
       render(<CredentialSelector {...props} />)
 
       // Assert - Initially closed
-      const portalRoot = screen.getByTestId('portal-root')
+      const portalRoot = screen.getByTestId('popover')
       expect(portalRoot)!.toHaveAttribute('data-open', 'false')
 
       // Act - Open
-      const trigger = screen.getByTestId('portal-trigger')
+      const trigger = screen.getByTestId('popover-trigger')
       fireEvent.click(trigger)
 
       // Assert - Now open
@@ -901,7 +867,7 @@ describe('CredentialSelector', () => {
       const props = createDefaultProps()
       render(<CredentialSelector {...props} />)
 
-      const trigger = screen.getByTestId('portal-trigger')
+      const trigger = screen.getByTestId('popover-trigger')
       fireEvent.click(trigger)
 
       // Assert - All credentials should be rendered in list
@@ -914,7 +880,7 @@ describe('CredentialSelector', () => {
       const props = createDefaultProps({ currentCredentialId: 'cred-2' })
       render(<CredentialSelector {...props} />)
 
-      const trigger = screen.getByTestId('portal-trigger')
+      const trigger = screen.getByTestId('popover-trigger')
       fireEvent.click(trigger)
 
       // Assert - Current credential (Credential 2) appears twice:
@@ -928,7 +894,7 @@ describe('CredentialSelector', () => {
       const props = createDefaultProps({ onCredentialChange: mockOnChange })
       render(<CredentialSelector {...props} />)
 
-      const trigger = screen.getByTestId('portal-trigger')
+      const trigger = screen.getByTestId('popover-trigger')
       fireEvent.click(trigger)
       const credential3 = screen.getByText('Credential 3')
       fireEvent.click(credential3)
@@ -938,23 +904,23 @@ describe('CredentialSelector', () => {
     })
   })
 
-  // Portal Configuration
-  describe('Portal Configuration', () => {
-    it('should configure PortalToFollowElem with placement bottom-start', () => {
+  // Popover Configuration
+  describe('Popover Configuration', () => {
+    it('should configure Popover with placement bottom-start', () => {
       // This test verifies the portal is configured correctly
       // The actual placement is handled by the mock, but we verify the component renders
       const props = createDefaultProps()
       render(<CredentialSelector {...props} />)
 
-      expect(screen.getByTestId('portal-root'))!.toBeInTheDocument()
+      expect(screen.getByTestId('popover'))!.toBeInTheDocument()
     })
 
-    it('should configure PortalToFollowElem with offset mainAxis 4', () => {
+    it('should configure Popover with offset mainAxis 4', () => {
       // This test verifies the offset configuration doesn't break rendering
       const props = createDefaultProps()
       render(<CredentialSelector {...props} />)
 
-      expect(screen.getByTestId('portal-root'))!.toBeInTheDocument()
+      expect(screen.getByTestId('popover'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/index.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/index.tsx
index 116b762277..b00564f9b4 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/index.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/base/credential-selector/index.tsx
@@ -1,12 +1,12 @@
 import type { DataSourceCredential } from '@/types/pipeline'
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from '@langgenius/dify-ui/popover'
 import { useBoolean } from 'ahooks'
 import * as React from 'react'
 import { useCallback, useEffect, useMemo } from 'react'
-import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
 import List from './list'
 import Trigger from './trigger'
 
@@ -21,7 +21,7 @@ const CredentialSelector = ({
   onCredentialChange,
   credentials,
 }: CredentialSelectorProps) => {
-  const [open, { toggle }] = useBoolean(false)
+  const [open, { set, setFalse }] = useBoolean(false)
 
   const currentCredential = useMemo(() => {
     return credentials.find(cred => cred.id === currentCredentialId)
@@ -34,32 +34,35 @@ const CredentialSelector = ({
 
   const handleCredentialChange = useCallback((credentialId: string) => {
     onCredentialChange(credentialId)
-    toggle()
-  }, [onCredentialChange, toggle])
+    setFalse()
+  }, [onCredentialChange, setFalse])
 
   return (
-    <PortalToFollowElem
+    <Popover
       open={open}
-      onOpenChange={toggle}
-      placement="bottom-start"
-      offset={{
-        mainAxis: 4,
-      }}
+      onOpenChange={set}
     >
-      <PortalToFollowElemTrigger onClick={toggle} className="grow overflow-hidden">
+      <PopoverTrigger
+        nativeButton={false}
+        render={<div className="grow overflow-hidden" />}
+      >
         <Trigger
           currentCredential={currentCredential}
           isOpen={open}
         />
-      </PortalToFollowElemTrigger>
-      <PortalToFollowElemContent className="z-10">
+      </PopoverTrigger>
+      <PopoverContent
+        placement="bottom-start"
+        sideOffset={4}
+        popupClassName="border-none bg-transparent shadow-none"
+      >
         <List
           currentCredentialId={currentCredentialId}
           credentials={credentials}
           onCredentialChange={handleCredentialChange}
         />
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
+      </PopoverContent>
+    </Popover>
   )
 }
 
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-documents/page-selector/__tests__/index.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-documents/page-selector/__tests__/index.spec.tsx
index 04676156e6..8d9787f126 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-documents/page-selector/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-documents/page-selector/__tests__/index.spec.tsx
@@ -9,20 +9,17 @@ vi.mock('@tanstack/react-virtual')
 
 // Note: NotionIcon from @/app/components/base/ is NOT mocked - using real component per testing guidelines
 
-// Helper Functions for Base Components
-// Get checkbox element (uses data-testid pattern from base Checkbox component)
-const getCheckbox = () => document.querySelector('[data-testid^="checkbox-"]') as HTMLElement
-const getAllCheckboxes = () => document.querySelectorAll('[data-testid^="checkbox-"]')
+const getCheckbox = (name = 'Test Page') => screen.getByRole('checkbox', { name })
+const queryCheckbox = (name = 'Test Page') => screen.queryByRole('checkbox', { name })
+const getAllCheckboxes = () => screen.getAllByRole('checkbox')
 
 // Get radio element (uses size-4 rounded-full class pattern from base Radio component)
 const getRadio = () => document.querySelector('.size-4.rounded-full') as HTMLElement
 const getAllRadios = () => document.querySelectorAll('.size-4.rounded-full')
 
-// Check if checkbox is checked by looking for check icon
-const isCheckboxChecked = (checkbox: Element) => checkbox.querySelector('[data-testid^="check-icon-"]') !== null
+const isCheckboxChecked = (checkbox: Element) => checkbox.getAttribute('aria-checked') === 'true'
 
-// Check if checkbox is disabled by looking for disabled class
-const isCheckboxDisabled = (checkbox: Element) => checkbox.classList.contains('cursor-not-allowed')
+const isCheckboxDisabled = (checkbox: Element) => checkbox.hasAttribute('data-disabled') || checkbox.getAttribute('aria-disabled') === 'true'
 
 const createMockPage = (overrides?: Partial<DataSourceNotionPage>): DataSourceNotionPage => ({
   page_id: 'page-1',
@@ -443,7 +440,7 @@ describe('PageSelector', () => {
         render(<PageSelector {...props} />)
 
         expect(getRadio())!.toBeInTheDocument()
-        expect(getCheckbox()).not.toBeInTheDocument()
+        expect(queryCheckbox()).not.toBeInTheDocument()
       })
 
       it('should use default value true when isMultipleChoice is not provided', () => {
@@ -795,7 +792,7 @@ describe('PageSelector', () => {
       render(<PageSelector {...props} />)
 
       // Check the root page
-      fireEvent.click(getCheckbox())
+      fireEvent.click(getCheckbox('Root Page'))
 
       // Assert - onSelect should be called with the page and its descendants
       expect(mockOnSelect).toHaveBeenCalled()
@@ -817,7 +814,7 @@ describe('PageSelector', () => {
       render(<PageSelector {...props} />)
 
       // Uncheck the root page
-      fireEvent.click(getCheckbox())
+      fireEvent.click(getCheckbox('Root Page'))
 
       // Assert - onSelect should be called with empty/reduced set
       expect(mockOnSelect).toHaveBeenCalled()
@@ -1042,7 +1039,7 @@ describe('PageSelector', () => {
       })
 
       render(<PageSelector {...props} />)
-      fireEvent.click(getCheckbox())
+      fireEvent.click(getCheckbox('Root Page'))
 
       // Assert - Only the clicked page should be selected (no descendants)
       expect(mockOnSelect).toHaveBeenCalled()
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/__tests__/index.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/__tests__/index.spec.tsx
index b0cbedd428..c7060b092e 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/__tests__/index.spec.tsx
@@ -189,11 +189,8 @@ describe('FileList', () => {
 
         render(<FileList {...props} />)
 
-        // Assert - The checkbox for file-1 should be checked (check icon present)
-        expect(screen.getByTestId('checkbox-file-1')).toBeInTheDocument()
-        expect(screen.getByTestId('check-icon-file-1')).toBeInTheDocument()
-        expect(screen.getByTestId('checkbox-file-2')).toBeInTheDocument()
-        expect(screen.queryByTestId('check-icon-file-2')).not.toBeInTheDocument()
+        expect(screen.getByRole('checkbox', { name: 'file1.txt' })).toHaveAttribute('aria-checked', 'true')
+        expect(screen.getByRole('checkbox', { name: 'file2.txt' })).toHaveAttribute('aria-checked', 'false')
       })
     })
 
@@ -236,8 +233,7 @@ describe('FileList', () => {
 
         render(<FileList {...props} />)
 
-        // Assert - Checkbox component has data-testid="checkbox-{id}"
-        expect(screen.getByTestId('checkbox-file-1')).toBeInTheDocument()
+        expect(screen.getByRole('checkbox', { name: 'file1.txt' })).toBeInTheDocument()
       })
 
       it('should render radio buttons when supportBatchUpload is false', () => {
@@ -249,7 +245,7 @@ describe('FileList', () => {
         // Assert - Radio is rendered as a div with rounded-full class
         expect(container.querySelector('.rounded-full')).toBeInTheDocument()
         // And checkbox should not be present
-        expect(screen.queryByTestId('checkbox-file-1')).not.toBeInTheDocument()
+        expect(screen.queryByRole('checkbox', { name: 'file1.txt' })).not.toBeInTheDocument()
       })
     })
   })
@@ -337,7 +333,7 @@ describe('FileList', () => {
         render(<FileList {...props} />)
 
         // Act - Click the clear icon div (it contains RiCloseCircleFill icon)
-        const clearButton = screen.getByTestId('input-clear')
+        const clearButton = screen.getByRole('button', { name: 'common.operation.clear' })
         expect(clearButton).toBeInTheDocument()
         fireEvent.click(clearButton!)
 
@@ -351,7 +347,7 @@ describe('FileList', () => {
         fireEvent.change(input, { target: { value: 'some-search' } })
 
         // Act - Find and click the clear icon
-        const clearButton = screen.getByTestId('input-clear')
+        const clearButton = screen.getByRole('button', { name: 'common.operation.clear' })
         expect(clearButton).toBeInTheDocument()
         fireEvent.click(clearButton!)
 
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/__tests__/index.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/__tests__/index.spec.tsx
index dcb1922fe9..c4ce60274b 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/header/__tests__/index.spec.tsx
@@ -320,7 +320,7 @@ describe('Header', () => {
         render(<Header {...props} />)
 
         // Act - Find and click the clear icon container
-        const clearButton = screen.getByTestId('input-clear')
+        const clearButton = screen.getByRole('button', { name: 'common.operation.clear' })
         expect(clearButton)!.toBeInTheDocument()
         fireEvent.click(clearButton!)
 
@@ -332,7 +332,7 @@ describe('Header', () => {
         render(<Header {...props} />)
 
         // Act & Assert - Clear icon should not be visible
-        const clearIcon = screen.queryByTestId('input-clear')
+        const clearIcon = screen.queryByRole('button', { name: 'common.operation.clear' })
         expect(clearIcon).not.toBeInTheDocument()
       })
 
@@ -341,7 +341,7 @@ describe('Header', () => {
         render(<Header {...props} />)
 
         // Act & Assert - Clear icon should be visible
-        const clearIcon = screen.getByTestId('input-clear')
+        const clearIcon = screen.getByRole('button', { name: 'common.operation.clear' })
         expect(clearIcon)!.toBeInTheDocument()
       })
     })
@@ -582,9 +582,9 @@ describe('Header', () => {
       const { rerender } = render(<Header {...props} />)
 
       // Act - Click clear, rerender, click again
-      fireEvent.click(screen.getByTestId('input-clear'))
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.clear' }))
       rerender(<Header {...props} />)
-      fireEvent.click(screen.getByTestId('input-clear'))
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.clear' }))
 
       expect(mockHandleResetKeywords).toHaveBeenCalledTimes(2)
     })
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/list/__tests__/index.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/list/__tests__/index.spec.tsx
index 921bf7e207..5b80b8ef31 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/list/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/list/__tests__/index.spec.tsx
@@ -1286,8 +1286,8 @@ describe('Item', () => {
     ...overrides,
   })
 
-  // Helper to find custom checkbox element (div-based implementation)
-  const findCheckbox = (container: HTMLElement) => container.querySelector('[data-testid^="checkbox-"]')
+  const queryCheckbox = () => screen.queryByRole('checkbox')
+  const getCheckbox = () => screen.getByRole('checkbox')
   const getRadio = () => screen.getByRole('radio')
 
   beforeEach(() => {
@@ -1330,8 +1330,8 @@ describe('Item', () => {
         isMultipleChoice: true,
         file: createMockOnlineDriveFile({ type: OnlineDriveFileType.file }),
       })
-      const { container } = render(<ActualItem {...props} />)
-      expect(findCheckbox(container)).toBeInTheDocument()
+      render(<ActualItem {...props} />)
+      expect(getCheckbox()).toBeInTheDocument()
     })
 
     it('should render radio in single choice mode for file', () => {
@@ -1348,8 +1348,8 @@ describe('Item', () => {
         file: createMockOnlineDriveFile({ type: OnlineDriveFileType.bucket, name: 'my-bucket' }),
         isMultipleChoice: true,
       })
-      const { container } = render(<ActualItem {...props} />)
-      expect(findCheckbox(container)).not.toBeInTheDocument()
+      render(<ActualItem {...props} />)
+      expect(queryCheckbox()).not.toBeInTheDocument()
       expect(screen.queryByRole('radio')).not.toBeInTheDocument()
     })
 
@@ -1366,18 +1366,14 @@ describe('Item', () => {
     describe('isSelected prop', () => {
       it('should show checkbox as checked when isSelected is true', () => {
         const props = createItemProps({ isSelected: true, isMultipleChoice: true })
-        const { container } = render(<ActualItem {...props} />)
-        const checkbox = findCheckbox(container)
-        // Checked checkbox shows check icon
-        expect(checkbox?.querySelector('[data-testid^="check-icon-"]')).toBeInTheDocument()
+        render(<ActualItem {...props} />)
+        expect(getCheckbox()).toHaveAttribute('aria-checked', 'true')
       })
 
       it('should show checkbox as unchecked when isSelected is false', () => {
         const props = createItemProps({ isSelected: false, isMultipleChoice: true })
-        const { container } = render(<ActualItem {...props} />)
-        const checkbox = findCheckbox(container)
-        // Unchecked checkbox has no check icon
-        expect(checkbox?.querySelector('[data-testid^="check-icon-"]')).not.toBeInTheDocument()
+        render(<ActualItem {...props} />)
+        expect(getCheckbox()).toHaveAttribute('aria-checked', 'false')
       })
 
       it('should show radio as checked when isSelected is true', () => {
@@ -1392,9 +1388,8 @@ describe('Item', () => {
       it('should not call onSelect when clicking disabled checkbox', () => {
         const onSelect = vi.fn()
         const props = createItemProps({ disabled: true, isMultipleChoice: true, onSelect })
-        const { container } = render(<ActualItem {...props} />)
-        const checkbox = findCheckbox(container)
-        fireEvent.click(checkbox!)
+        render(<ActualItem {...props} />)
+        fireEvent.click(getCheckbox())
         expect(onSelect).not.toHaveBeenCalled()
       })
 
@@ -1412,22 +1407,22 @@ describe('Item', () => {
       it('should default to true', () => {
         const props = createItemProps()
         delete (props as Partial<ItemProps>).isMultipleChoice
-        const { container } = render(<ActualItem {...props} />)
-        expect(findCheckbox(container)).toBeInTheDocument()
+        render(<ActualItem {...props} />)
+        expect(getCheckbox()).toBeInTheDocument()
       })
 
       it('should render checkbox when true', () => {
         const props = createItemProps({ isMultipleChoice: true })
-        const { container } = render(<ActualItem {...props} />)
-        expect(findCheckbox(container)).toBeInTheDocument()
+        render(<ActualItem {...props} />)
+        expect(getCheckbox()).toBeInTheDocument()
         expect(screen.queryByRole('radio')).not.toBeInTheDocument()
       })
 
       it('should render radio when false', () => {
         const props = createItemProps({ isMultipleChoice: false })
-        const { container } = render(<ActualItem {...props} />)
+        render(<ActualItem {...props} />)
         expect(getRadio()).toBeInTheDocument()
-        expect(findCheckbox(container)).not.toBeInTheDocument()
+        expect(queryCheckbox()).not.toBeInTheDocument()
       })
     })
   })
@@ -1477,9 +1472,8 @@ describe('Item', () => {
         const onSelect = vi.fn()
         const file = createMockOnlineDriveFile()
         const props = createItemProps({ file, onSelect, isMultipleChoice: true })
-        const { container } = render(<ActualItem {...props} />)
-        const checkbox = findCheckbox(container)
-        fireEvent.click(checkbox!)
+        render(<ActualItem {...props} />)
+        fireEvent.click(getCheckbox())
         expect(onSelect).toHaveBeenCalledWith(file)
       })
 
@@ -1497,9 +1491,8 @@ describe('Item', () => {
         const onSelect = vi.fn()
         const file = createMockOnlineDriveFile()
         const props = createItemProps({ file, onSelect, isMultipleChoice: true })
-        const { container } = render(<ActualItem {...props} />)
-        const checkbox = findCheckbox(container)
-        fireEvent.click(checkbox!)
+        render(<ActualItem {...props} />)
+        fireEvent.click(getCheckbox())
         expect(onSelect).toHaveBeenCalledTimes(1)
       })
     })
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/list/__tests__/item.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/list/__tests__/item.spec.tsx
index 5da25e5cb0..f4ad53bbe7 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/list/__tests__/item.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/list/__tests__/item.spec.tsx
@@ -3,24 +3,12 @@ import { fireEvent, render, screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import Item from '../item'
 
-vi.mock('@/app/components/base/checkbox', () => ({
-  default: ({ checked, onCheck, disabled }: { checked: boolean, onCheck: () => void, disabled?: boolean }) => (
-    <input type="checkbox" data-testid="checkbox" checked={checked} onChange={onCheck} disabled={disabled} />
-  ),
-}))
-
 vi.mock('@/app/components/base/radio/ui', () => ({
   default: ({ isChecked, onCheck }: { isChecked: boolean, onCheck: () => void }) => (
     <input type="radio" data-testid="radio" checked={isChecked} onChange={onCheck} />
   ),
 }))
 
-vi.mock('@/app/components/base/tooltip', () => ({
-  default: ({ children, popupContent }: { children: React.ReactNode, popupContent: string }) => (
-    <div data-testid="tooltip" title={popupContent}>{children}</div>
-  ),
-}))
-
 vi.mock('../file-icon', () => ({
   default: () => <span data-testid="file-icon" />,
 }))
@@ -51,7 +39,7 @@ describe('Item', () => {
 
   it('should render checkbox for file type in multiple choice mode', () => {
     render(<Item {...defaultProps} />)
-    expect(screen.getByTestId('checkbox')).toBeInTheDocument()
+    expect(screen.getByRole('checkbox', { name: 'test.pdf' })).toBeInTheDocument()
   })
 
   it('should render radio for file type in single choice mode', () => {
@@ -61,7 +49,7 @@ describe('Item', () => {
 
   it('should not render checkbox for bucket type', () => {
     render(<Item {...defaultProps} file={makeFile('bucket', 'my-bucket')} />)
-    expect(screen.queryByTestId('checkbox')).not.toBeInTheDocument()
+    expect(screen.queryByRole('checkbox')).not.toBeInTheDocument()
   })
 
   it('should call onOpen for folder click', () => {
@@ -77,6 +65,16 @@ describe('Item', () => {
     expect(defaultProps.onSelect).toHaveBeenCalledWith(defaultProps.file)
   })
 
+  it('should call onSelect once without bubbling to row click when checkbox is clicked', () => {
+    render(<Item {...defaultProps} />)
+
+    fireEvent.click(screen.getByRole('checkbox', { name: 'test.pdf' }))
+
+    expect(defaultProps.onSelect).toHaveBeenCalledTimes(1)
+    expect(defaultProps.onSelect).toHaveBeenCalledWith(defaultProps.file)
+    expect(defaultProps.onOpen).not.toHaveBeenCalled()
+  })
+
   it('should not call handlers when disabled', () => {
     render(<Item {...defaultProps} disabled={true} />)
     fireEvent.click(screen.getByText('test.pdf'))
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/list/item.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/list/item.tsx
index 5018806265..447b7a9346 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/list/item.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/online-drive/file-list/list/item.tsx
@@ -1,12 +1,10 @@
-import type { Placement } from '@floating-ui/react'
 import type { OnlineDriveFile } from '@/models/pipeline'
-import { cn } from '@langgenius/dify-ui/cn'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
+import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
 import * as React from 'react'
 import { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
-import Checkbox from '@/app/components/base/checkbox'
 import Radio from '@/app/components/base/radio/ui'
-import Tooltip from '@/app/components/base/tooltip'
 import { formatFileSize } from '@/utils/format'
 import FileIcon from './file-icon'
 
@@ -28,25 +26,22 @@ const Item = ({
   onOpen,
 }: ItemProps) => {
   const { t } = useTranslation()
-  const { id, name, type, size } = file
+  const { name, type, size } = file
 
   const isBucket = type === 'bucket'
   const isFolder = type === 'folder'
 
-  const Wrapper = disabled ? Tooltip : React.Fragment
-  const wrapperProps = disabled
-    ? {
-        popupContent: t('onlineDrive.notSupportedFileType', { ns: 'datasetPipeline' }),
-        position: 'top-end' as Placement,
-        offset: { mainAxis: 4, crossAxis: -104 },
-      }
-    : {}
+  const disabledTip = t('onlineDrive.notSupportedFileType', { ns: 'datasetPipeline' })
 
   const handleSelect = useCallback((e: React.MouseEvent<HTMLDivElement> | React.KeyboardEvent<HTMLDivElement>) => {
     e.stopPropagation()
     onSelect(file)
   }, [file, onSelect])
 
+  const handleCheckboxSelect = useCallback(() => {
+    onSelect(file)
+  }, [file, onSelect])
+
   const handleClickItem = useCallback((e: React.MouseEvent<HTMLDivElement>) => {
     e.stopPropagation()
     if (disabled)
@@ -64,13 +59,15 @@ const Item = ({
       onClick={handleClickItem}
     >
       {!isBucket && isMultipleChoice && (
-        <Checkbox
-          className="shrink-0"
-          disabled={disabled}
-          id={id}
-          checked={isSelected}
-          onCheck={handleSelect}
-        />
+        <span onClick={event => event.stopPropagation()}>
+          <Checkbox
+            className="shrink-0"
+            disabled={disabled}
+            checked={isSelected}
+            aria-label={name}
+            onCheckedChange={() => handleCheckboxSelect()}
+          />
+        </span>
       )}
       {!isBucket && !isMultipleChoice && (
         <Radio
@@ -80,27 +77,44 @@ const Item = ({
           onCheck={handleSelect}
         />
       )}
-      <Wrapper
-        {...wrapperProps}
-      >
-        <div
-          className={cn(
-            'flex grow items-center gap-x-1 overflow-hidden py-0.5',
-            disabled && 'opacity-30',
+      {disabled
+        ? (
+            <Popover>
+              <PopoverTrigger
+                openOnHover
+                aria-label={disabledTip}
+                className="flex grow items-center gap-x-1 overflow-hidden border-0 bg-transparent p-0 py-0.5 text-left opacity-30"
+              >
+                <FileIcon type={type} fileName={name} className="shrink-0 transform-gpu" />
+                <span
+                  className="grow truncate system-sm-medium text-text-secondary"
+                  title={name}
+                >
+                  {name}
+                </span>
+                {!isFolder && typeof size === 'number' && (
+                  <span className="shrink-0 system-xs-regular text-text-tertiary">{formatFileSize(size)}</span>
+                )}
+              </PopoverTrigger>
+              <PopoverContent placement="top-end" popupClassName="px-3 py-2 system-xs-regular text-text-tertiary">
+                {disabledTip}
+              </PopoverContent>
+            </Popover>
+          )
+        : (
+            <div className="flex grow items-center gap-x-1 overflow-hidden py-0.5">
+              <FileIcon type={type} fileName={name} className="shrink-0 transform-gpu" />
+              <span
+                className="grow truncate system-sm-medium text-text-secondary"
+                title={name}
+              >
+                {name}
+              </span>
+              {!isFolder && typeof size === 'number' && (
+                <span className="shrink-0 system-xs-regular text-text-tertiary">{formatFileSize(size)}</span>
+              )}
+            </div>
           )}
-        >
-          <FileIcon type={type} fileName={name} className="shrink-0 transform-gpu" />
-          <span
-            className="grow truncate system-sm-medium text-text-secondary"
-            title={name}
-          >
-            {name}
-          </span>
-          {!isFolder && typeof size === 'number' && (
-            <span className="shrink-0 system-xs-regular text-text-tertiary">{formatFileSize(size)}</span>
-          )}
-        </div>
-      </Wrapper>
     </div>
   )
 }
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/__tests__/checkbox-with-label.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/__tests__/checkbox-with-label.spec.tsx
index da97a84371..cd0e9d88b5 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/__tests__/checkbox-with-label.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/__tests__/checkbox-with-label.spec.tsx
@@ -2,12 +2,6 @@ import { render, screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import CheckboxWithLabel from '../checkbox-with-label'
 
-vi.mock('@/app/components/base/checkbox', () => ({
-  default: ({ checked, onCheck }: { checked: boolean, onCheck: () => void }) => (
-    <input type="checkbox" data-testid="checkbox" checked={checked} onChange={onCheck} />
-  ),
-}))
-
 describe('CheckboxWithLabel', () => {
   const defaultProps = {
     isChecked: false,
@@ -26,7 +20,7 @@ describe('CheckboxWithLabel', () => {
 
   it('should render checkbox', () => {
     render(<CheckboxWithLabel {...defaultProps} />)
-    expect(screen.getByTestId('checkbox')).toBeInTheDocument()
+    expect(screen.getByRole('checkbox', { name: 'Test Label' })).toBeInTheDocument()
   })
 
   it('should render tooltip when provided', () => {
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/__tests__/crawled-result-item.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/__tests__/crawled-result-item.spec.tsx
index cded02b431..b1bfc208d0 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/__tests__/crawled-result-item.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/__tests__/crawled-result-item.spec.tsx
@@ -9,12 +9,6 @@ vi.mock('@langgenius/dify-ui/button', () => ({
   ),
 }))
 
-vi.mock('@/app/components/base/checkbox', () => ({
-  default: ({ checked, onCheck }: { checked: boolean, onCheck: () => void }) => (
-    <input type="checkbox" data-testid="checkbox" checked={checked} onChange={onCheck} />
-  ),
-}))
-
 vi.mock('@/app/components/base/radio/ui', () => ({
   default: ({ isChecked, onCheck }: { isChecked: boolean, onCheck: () => void }) => (
     <input type="radio" data-testid="radio" checked={isChecked} onChange={onCheck} />
@@ -49,7 +43,7 @@ describe('CrawledResultItem', () => {
 
   it('should render checkbox in multiple choice mode', () => {
     render(<CrawledResultItem {...defaultProps} />)
-    expect(screen.getByTestId('checkbox')).toBeInTheDocument()
+    expect(screen.getByRole('checkbox', { name: /Test Page/ })).toBeInTheDocument()
   })
 
   it('should render radio in single choice mode', () => {
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/__tests__/index.spec.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/__tests__/index.spec.tsx
index db3e369722..f594f5c918 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/__tests__/index.spec.tsx
@@ -1,5 +1,6 @@
 import type { CrawlResultItem as CrawlResultItemType } from '@/models/datasets'
 import { fireEvent, render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
 import * as React from 'react'
 import CheckboxWithLabel from '../checkbox-with-label'
 import CrawledResult from '../crawled-result'
@@ -43,20 +44,15 @@ describe('CheckboxWithLabel', () => {
     })
 
     it('should render checkbox in unchecked state', () => {
-      const { container } = render(<CheckboxWithLabel {...defaultProps} isChecked={false} />)
+      render(<CheckboxWithLabel {...defaultProps} isChecked={false} />)
 
-      // Assert - Custom checkbox component uses div with data-testid
-      const checkbox = container.querySelector('[data-testid^="checkbox"]')
-      expect(checkbox)!.toBeInTheDocument()
-      expect(checkbox).not.toHaveClass('bg-components-checkbox-bg')
+      expect(screen.getByRole('checkbox', { name: 'Test Label' })).toHaveAttribute('aria-checked', 'false')
     })
 
     it('should render checkbox in checked state', () => {
-      const { container } = render(<CheckboxWithLabel {...defaultProps} isChecked={true} />)
+      render(<CheckboxWithLabel {...defaultProps} isChecked={true} />)
 
-      // Assert - Checked state has check icon
-      const checkIcon = container.querySelector('[data-testid^="check-icon"]')
-      expect(checkIcon)!.toBeInTheDocument()
+      expect(screen.getByRole('checkbox', { name: 'Test Label' })).toHaveAttribute('aria-checked', 'true')
     })
 
     it('should render tooltip when provided', () => {
@@ -90,32 +86,32 @@ describe('CheckboxWithLabel', () => {
   })
 
   describe('User Interactions', () => {
-    it('should call onChange with true when clicking unchecked checkbox', () => {
+    it('should call onChange with true when clicking unchecked checkbox', async () => {
       const mockOnChange = vi.fn()
-      const { container } = render(<CheckboxWithLabel {...defaultProps} isChecked={false} onChange={mockOnChange} />)
+      const user = userEvent.setup()
+      render(<CheckboxWithLabel {...defaultProps} isChecked={false} onChange={mockOnChange} />)
 
-      const checkbox = container.querySelector('[data-testid^="checkbox"]')!
-      fireEvent.click(checkbox)
+      await user.click(screen.getByText('Test Label'))
 
       expect(mockOnChange).toHaveBeenCalledWith(true)
     })
 
-    it('should call onChange with false when clicking checked checkbox', () => {
+    it('should call onChange with false when clicking checked checkbox', async () => {
       const mockOnChange = vi.fn()
-      const { container } = render(<CheckboxWithLabel {...defaultProps} isChecked={true} onChange={mockOnChange} />)
+      const user = userEvent.setup()
+      render(<CheckboxWithLabel {...defaultProps} isChecked={true} onChange={mockOnChange} />)
 
-      const checkbox = container.querySelector('[data-testid^="checkbox"]')!
-      fireEvent.click(checkbox)
+      await user.click(screen.getByText('Test Label'))
 
       expect(mockOnChange).toHaveBeenCalledWith(false)
     })
 
-    it('should trigger onChange when clicking label text', () => {
+    it('should trigger onChange when clicking label text', async () => {
       const mockOnChange = vi.fn()
+      const user = userEvent.setup()
       render(<CheckboxWithLabel {...defaultProps} onChange={mockOnChange} />)
 
-      const labelText = screen.getByText('Test Label')
-      fireEvent.click(labelText)
+      await user.click(screen.getByText('Test Label'))
 
       expect(mockOnChange).toHaveBeenCalledWith(true)
     })
@@ -146,11 +142,9 @@ describe('CrawledResultItem', () => {
     })
 
     it('should render checkbox when isMultipleChoice is true', () => {
-      const { container } = render(<CrawledResultItem {...defaultProps} isMultipleChoice={true} />)
+      render(<CrawledResultItem {...defaultProps} isMultipleChoice={true} />)
 
-      // Assert - Custom checkbox uses data-testid
-      const checkbox = container.querySelector('[data-testid^="checkbox"]')
-      expect(checkbox)!.toBeInTheDocument()
+      expect(screen.getByRole('checkbox', { name: /Test Page Title/ })).toBeInTheDocument()
     })
 
     it('should render radio when isMultipleChoice is false', () => {
@@ -162,11 +156,9 @@ describe('CrawledResultItem', () => {
     })
 
     it('should render checkbox as checked when isChecked is true', () => {
-      const { container } = render(<CrawledResultItem {...defaultProps} isChecked={true} />)
+      render(<CrawledResultItem {...defaultProps} isChecked={true} />)
 
-      // Assert - Checked state shows check icon
-      const checkIcon = container.querySelector('[data-testid^="check-icon"]')
-      expect(checkIcon)!.toBeInTheDocument()
+      expect(screen.getByRole('checkbox', { name: /Test Page Title/ })).toHaveAttribute('aria-checked', 'true')
     })
 
     it('should render preview button when showPreview is true', () => {
@@ -225,9 +217,10 @@ describe('CrawledResultItem', () => {
   })
 
   describe('User Interactions', () => {
-    it('should call onCheckChange with true when clicking unchecked checkbox', () => {
+    it('should call onCheckChange with true when clicking unchecked checkbox', async () => {
       const mockOnCheckChange = vi.fn()
-      const { container } = render(
+      const user = userEvent.setup()
+      render(
         <CrawledResultItem
           {...defaultProps}
           isChecked={false}
@@ -235,15 +228,15 @@ describe('CrawledResultItem', () => {
         />,
       )
 
-      const checkbox = container.querySelector('[data-testid^="checkbox"]')!
-      fireEvent.click(checkbox)
+      await user.click(screen.getByText('Test Page Title'))
 
       expect(mockOnCheckChange).toHaveBeenCalledWith(true)
     })
 
-    it('should call onCheckChange with false when clicking checked checkbox', () => {
+    it('should call onCheckChange with false when clicking checked checkbox', async () => {
       const mockOnCheckChange = vi.fn()
-      const { container } = render(
+      const user = userEvent.setup()
+      render(
         <CrawledResultItem
           {...defaultProps}
           isChecked={true}
@@ -251,8 +244,7 @@ describe('CrawledResultItem', () => {
         />,
       )
 
-      const checkbox = container.querySelector('[data-testid^="checkbox"]')!
-      fireEvent.click(checkbox)
+      await user.click(screen.getByText('Test Page Title'))
 
       expect(mockOnCheckChange).toHaveBeenCalledWith(false)
     })
@@ -325,19 +317,16 @@ describe('CrawledResult', () => {
     })
 
     it('should render select all checkbox when isMultipleChoice is true', () => {
-      const { container } = render(<CrawledResult {...defaultProps} isMultipleChoice={true} />)
+      render(<CrawledResult {...defaultProps} isMultipleChoice={true} />)
 
-      // Assert - Multiple custom checkboxes (select all + items)
-      const checkboxes = container.querySelectorAll('[data-testid^="checkbox"]')
-      expect(checkboxes.length).toBe(4) // 1 select all + 3 items
+      expect(screen.getAllByRole('checkbox')).toHaveLength(4)
     })
 
     it('should not render select all checkbox when isMultipleChoice is false', () => {
       const { container } = render(<CrawledResult {...defaultProps} isMultipleChoice={false} />)
 
       // Assert - No select all checkbox, only radio buttons for items
-      const checkboxes = container.querySelectorAll('[data-testid^="checkbox"]')
-      expect(checkboxes.length).toBe(0)
+      expect(screen.queryAllByRole('checkbox')).toHaveLength(0)
       // Radio buttons have size-4 and rounded-full classes
       const radios = container.querySelectorAll('.size-4.rounded-full')
       expect(radios.length).toBe(3)
@@ -368,13 +357,12 @@ describe('CrawledResult', () => {
     })
 
     it('should highlight item at previewIndex', () => {
-      const { container } = render(
+      render(
         <CrawledResult {...defaultProps} previewIndex={1} />,
       )
 
       // Assert - Second item should have active state
-      const items = container.querySelectorAll('[class*="rounded-lg"][class*="cursor-pointer"]')
-      expect(items[1])!.toHaveClass('bg-state-base-active')
+      expect(screen.getByText('Page 2').closest('.relative')).toHaveClass('bg-state-base-active')
     })
 
     it('should pass showPreview to items', () => {
@@ -392,10 +380,11 @@ describe('CrawledResult', () => {
   })
 
   describe('User Interactions', () => {
-    it('should call onSelectedChange with all items when clicking select all', () => {
+    it('should call onSelectedChange with all items when clicking select all', async () => {
       const mockOnSelectedChange = vi.fn()
       const list = createMockCrawlResultItems(3)
-      const { container } = render(
+      const user = userEvent.setup()
+      render(
         <CrawledResult
           {...defaultProps}
           list={list}
@@ -404,17 +393,16 @@ describe('CrawledResult', () => {
         />,
       )
 
-      // Act - Click select all checkbox (first checkbox)
-      const checkboxes = container.querySelectorAll('[data-testid^="checkbox"]')
-      fireEvent.click(checkboxes[0]!)
+      await user.click(screen.getByText(/selectAll/i))
 
       expect(mockOnSelectedChange).toHaveBeenCalledWith(list)
     })
 
-    it('should call onSelectedChange with empty array when clicking reset all', () => {
+    it('should call onSelectedChange with empty array when clicking reset all', async () => {
       const mockOnSelectedChange = vi.fn()
       const list = createMockCrawlResultItems(3)
-      const { container } = render(
+      const user = userEvent.setup()
+      render(
         <CrawledResult
           {...defaultProps}
           list={list}
@@ -423,16 +411,16 @@ describe('CrawledResult', () => {
         />,
       )
 
-      const checkboxes = container.querySelectorAll('[data-testid^="checkbox"]')
-      fireEvent.click(checkboxes[0]!)
+      await user.click(screen.getByText(/resetAll/i))
 
       expect(mockOnSelectedChange).toHaveBeenCalledWith([])
     })
 
-    it('should add item to checkedList when checking unchecked item', () => {
+    it('should add item to checkedList when checking unchecked item', async () => {
       const mockOnSelectedChange = vi.fn()
       const list = createMockCrawlResultItems(3)
-      const { container } = render(
+      const user = userEvent.setup()
+      render(
         <CrawledResult
           {...defaultProps}
           list={list}
@@ -441,17 +429,16 @@ describe('CrawledResult', () => {
         />,
       )
 
-      // Act - Click second item checkbox (index 2, accounting for select all)
-      const checkboxes = container.querySelectorAll('[data-testid^="checkbox"]')
-      fireEvent.click(checkboxes[2]!)
+      await user.click(screen.getByText('Page 2'))
 
       expect(mockOnSelectedChange).toHaveBeenCalledWith([list[0], list[1]])
     })
 
-    it('should remove item from checkedList when unchecking checked item', () => {
+    it('should remove item from checkedList when unchecking checked item', async () => {
       const mockOnSelectedChange = vi.fn()
       const list = createMockCrawlResultItems(3)
-      const { container } = render(
+      const user = userEvent.setup()
+      render(
         <CrawledResult
           {...defaultProps}
           list={list}
@@ -460,9 +447,7 @@ describe('CrawledResult', () => {
         />,
       )
 
-      // Act - Uncheck first item (index 1, after select all)
-      const checkboxes = container.querySelectorAll('[data-testid^="checkbox"]')
-      fireEvent.click(checkboxes[1]!)
+      await user.click(screen.getByText('Page 1'))
 
       expect(mockOnSelectedChange).toHaveBeenCalledWith([list[1]])
     })
@@ -751,7 +736,7 @@ describe('Base Components Integration', () => {
   it('should render CrawledResult with CheckboxWithLabel for select all', () => {
     const list = createMockCrawlResultItems(2)
 
-    const { container } = render(
+    render(
       <CrawledResult
         list={list}
         checkedList={[]}
@@ -762,16 +747,16 @@ describe('Base Components Integration', () => {
     )
 
     // Assert - Should have select all checkbox + item checkboxes
-    const checkboxes = container.querySelectorAll('[data-testid^="checkbox"]')
-    expect(checkboxes.length).toBe(3) // select all + 2 items
+    expect(screen.getAllByRole('checkbox')).toHaveLength(3)
   })
 
-  it('should allow selecting and previewing items', () => {
+  it('should allow selecting and previewing items', async () => {
     const list = createMockCrawlResultItems(3)
     const mockOnSelectedChange = vi.fn()
     const mockOnPreview = vi.fn()
+    const user = userEvent.setup()
 
-    const { container } = render(
+    render(
       <CrawledResult
         list={list}
         checkedList={[]}
@@ -782,9 +767,7 @@ describe('Base Components Integration', () => {
       />,
     )
 
-    // Act - Select first item (index 1, after select all)
-    const checkboxes = container.querySelectorAll('[data-testid^="checkbox"]')
-    fireEvent.click(checkboxes[1]!)
+    await user.click(screen.getByText('Page 1'))
 
     expect(mockOnSelectedChange).toHaveBeenCalledWith([list[0]])
 
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/checkbox-with-label.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/checkbox-with-label.tsx
index 99c6625793..682bb85a65 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/checkbox-with-label.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/checkbox-with-label.tsx
@@ -1,8 +1,6 @@
 'use client'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import { cn } from '@langgenius/dify-ui/cn'
-import * as React from 'react'
-import { useId } from 'react'
-import Checkbox from '@/app/components/base/checkbox'
 import { Infotip } from '@/app/components/base/infotip'
 
 type CheckboxWithLabelProps = {
@@ -14,29 +12,23 @@ type CheckboxWithLabelProps = {
   tooltip?: string
 }
 
-const CheckboxWithLabel = ({
+export default function CheckboxWithLabel({
   className = '',
   isChecked,
   onChange,
   label,
   labelClassName,
   tooltip,
-}: CheckboxWithLabelProps) => {
-  const labelId = useId()
-  const handleToggle = () => onChange(!isChecked)
-
+}: CheckboxWithLabelProps) {
   return (
     <div className={cn('flex items-center', className)}>
-      <Checkbox checked={isChecked} onCheck={handleToggle} ariaLabelledBy={labelId} />
-      <div className="ml-2 flex min-w-0 items-center gap-1">
-        <button
-          type="button"
-          id={labelId}
-          className={cn('min-w-0 cursor-pointer border-0 bg-transparent p-0 text-left system-sm-medium text-text-secondary', labelClassName)}
-          onClick={handleToggle}
-        >
+      <label className="flex min-w-0 cursor-pointer items-center">
+        <Checkbox checked={isChecked} onCheckedChange={checked => onChange(checked)} />
+        <span className={cn('ml-2 min-w-0 text-left system-sm-medium text-text-secondary', labelClassName)}>
           {label}
-        </button>
+        </span>
+      </label>
+      <div className="ml-1 flex min-w-0 items-center">
         {tooltip && (
           <Infotip aria-label={tooltip} popupClassName="w-[200px]">
             {tooltip}
@@ -46,4 +38,3 @@ const CheckboxWithLabel = ({
     </div>
   )
 }
-export default React.memo(CheckboxWithLabel)
diff --git a/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/crawled-result-item.tsx b/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/crawled-result-item.tsx
index 19019b4dd7..a1df2ed33c 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/crawled-result-item.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/data-source/website-crawl/base/crawled-result-item.tsx
@@ -1,11 +1,11 @@
 'use client'
 import type { CrawlResultItem as CrawlResultItemType } from '@/models/datasets'
 import { Button } from '@langgenius/dify-ui/button'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import { cn } from '@langgenius/dify-ui/cn'
 import * as React from 'react'
 import { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
-import Checkbox from '@/app/components/base/checkbox'
 import Radio from '@/app/components/base/radio/ui'
 
 type CrawledResultItemProps = {
@@ -35,41 +35,59 @@ const CrawledResultItem = ({
 
   return (
     <div className={cn(
-      'relative flex cursor-pointer gap-x-2 rounded-lg p-2',
+      'relative flex gap-x-2 rounded-lg p-2',
       isPreview ? 'bg-state-base-active' : 'group hover:bg-state-base-hover',
     )}
     >
       {
         isMultipleChoice
           ? (
-              <Checkbox
-                className="shrink-0"
-                checked={isChecked}
-                onCheck={handleCheckChange}
-              />
+              <label className="flex min-w-0 grow cursor-pointer gap-x-2">
+                <Checkbox
+                  className="shrink-0"
+                  checked={isChecked}
+                  onCheckedChange={checked => onCheckChange(checked)}
+                />
+                <div className="flex min-w-0 grow flex-col gap-y-0.5">
+                  <div
+                    className="truncate system-sm-medium text-text-secondary"
+                    title={payload.title}
+                  >
+                    {payload.title}
+                  </div>
+                  <div
+                    className="truncate system-xs-regular text-text-tertiary"
+                    title={payload.source_url}
+                  >
+                    {payload.source_url}
+                  </div>
+                </div>
+              </label>
             )
           : (
-              <Radio
-                className="shrink-0"
-                isChecked={isChecked}
-                onCheck={handleCheckChange}
-              />
+              <>
+                <Radio
+                  className="shrink-0"
+                  isChecked={isChecked}
+                  onCheck={handleCheckChange}
+                />
+                <div className="flex min-w-0 grow flex-col gap-y-0.5">
+                  <div
+                    className="truncate system-sm-medium text-text-secondary"
+                    title={payload.title}
+                  >
+                    {payload.title}
+                  </div>
+                  <div
+                    className="truncate system-xs-regular text-text-tertiary"
+                    title={payload.source_url}
+                  >
+                    {payload.source_url}
+                  </div>
+                </div>
+              </>
             )
       }
-      <div className="flex min-w-0 grow flex-col gap-y-0.5">
-        <div
-          className="truncate system-sm-medium text-text-secondary"
-          title={payload.title}
-        >
-          {payload.title}
-        </div>
-        <div
-          className="truncate system-xs-regular text-text-tertiary"
-          title={payload.source_url}
-        >
-          {payload.source_url}
-        </div>
-      </div>
       {showPreview && (
         <Button
           size="small"
diff --git a/web/app/components/datasets/documents/create-from-pipeline/hooks/__tests__/use-datasource-actions.spec.ts b/web/app/components/datasets/documents/create-from-pipeline/hooks/__tests__/use-datasource-actions.spec.ts
index e6da4313f1..2328541cd1 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/hooks/__tests__/use-datasource-actions.spec.ts
+++ b/web/app/components/datasets/documents/create-from-pipeline/hooks/__tests__/use-datasource-actions.spec.ts
@@ -146,13 +146,13 @@ describe('useDatasourceActions', () => {
 
     // First call: select all
     act(() => {
-      result.current.handleSelectAll()
+      result.current.handleSelectAll(true)
     })
     expect(store.getState().onlineDocuments).toHaveLength(2)
 
     // Second call: deselect all
     act(() => {
-      result.current.handleSelectAll()
+      result.current.handleSelectAll(false)
     })
     expect(store.getState().onlineDocuments).toEqual([])
   })
@@ -170,7 +170,7 @@ describe('useDatasourceActions', () => {
     const { result } = renderHook(() => useDatasourceActions(params))
 
     act(() => {
-      result.current.handleSelectAll()
+      result.current.handleSelectAll(true)
     })
     // Should select f1, f2 but not b1 (bucket)
     expect(store.getState().selectedFileIds).toEqual(['f1', 'f2'])
diff --git a/web/app/components/datasets/documents/create-from-pipeline/hooks/use-datasource-actions.ts b/web/app/components/datasets/documents/create-from-pipeline/hooks/use-datasource-actions.ts
index bad3b779fa..ae6472118c 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/hooks/use-datasource-actions.ts
+++ b/web/app/components/datasets/documents/create-from-pipeline/hooks/use-datasource-actions.ts
@@ -238,11 +238,9 @@ export const useDatasourceActions = ({
   }, [dataSourceStore, onClickPreview])
 
   // Select all handler
-  const handleSelectAll = useCallback(() => {
+  const handleSelectAll = useCallback((checked: boolean) => {
     const {
-      onlineDocuments,
       onlineDriveFileList,
-      selectedFileIds,
       setOnlineDocuments,
       setSelectedFileIds,
       setSelectedPagesId,
@@ -250,7 +248,7 @@ export const useDatasourceActions = ({
 
     if (datasourceType === DatasourceType.onlineDocument) {
       const allIds = currentWorkspacePages?.map(page => page.page_id) || []
-      if (onlineDocuments.length < allIds.length) {
+      if (checked) {
         const selectedPages = Array.from(allIds).map(pageId => PagesMapAndSelectedPagesId[pageId]!)
         setOnlineDocuments(selectedPages)
         setSelectedPagesId(new Set(allIds))
@@ -263,7 +261,7 @@ export const useDatasourceActions = ({
 
     if (datasourceType === DatasourceType.onlineDrive) {
       const allKeys = onlineDriveFileList.filter(item => item.type !== 'bucket').map(file => file.id)
-      if (selectedFileIds.length < allKeys.length)
+      if (checked)
         setSelectedFileIds(allKeys)
       else
         setSelectedFileIds([])
diff --git a/web/app/components/datasets/documents/create-from-pipeline/processing/embedding-process/index.tsx b/web/app/components/datasets/documents/create-from-pipeline/processing/embedding-process/index.tsx
index 797f7b296a..58d77b387c 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/processing/embedding-process/index.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/processing/embedding-process/index.tsx
@@ -4,6 +4,7 @@ import type { InitialDocumentDetail } from '@/models/pipeline'
 import type { RETRIEVE_METHOD } from '@/types/app'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
 import {
   RiAedFill,
   RiArrowRightLine,
@@ -17,7 +18,6 @@ import { useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Divider from '@/app/components/base/divider'
 import NotionIcon from '@/app/components/base/notion-icon'
-import Tooltip from '@/app/components/base/tooltip'
 import PriorityLabel from '@/app/components/billing/priority-label'
 import { Plan } from '@/app/components/billing/type'
 import UpgradeBtn from '@/app/components/billing/upgrade-btn'
@@ -203,15 +203,18 @@ const EmbeddingProcess = ({
                   <div className="shrink-0 text-xs text-text-secondary">{`${getSourcePercent(indexingStatusDetail)}%`}</div>
                 )}
                 {indexingStatusDetail.indexing_status === 'error' && (
-                  <Tooltip
-                    popupClassName="px-4 py-[14px] max-w-60 body-xs-regular text-text-secondary border-[0.5px] border-components-panel-border rounded-xl"
-                    offset={4}
-                    popupContent={indexingStatusDetail.error}
-                  >
-                    <span>
+                  <Popover>
+                    <PopoverTrigger
+                      openOnHover
+                      aria-label={indexingStatusDetail.error}
+                      className="inline-flex border-0 bg-transparent p-0"
+                    >
                       <RiErrorWarningFill className="size-4 shrink-0 text-text-destructive" />
-                    </span>
-                  </Tooltip>
+                    </PopoverTrigger>
+                    <PopoverContent popupClassName="max-w-60 rounded-xl border-[0.5px] border-components-panel-border px-4 py-[14px] body-xs-regular text-text-secondary">
+                      {indexingStatusDetail.error}
+                    </PopoverContent>
+                  </Popover>
                 )}
                 {indexingStatusDetail.indexing_status === 'completed' && (
                   <RiCheckboxCircleFill className="size-4 shrink-0 text-text-success" />
diff --git a/web/app/components/datasets/documents/create-from-pipeline/steps/step-one-content.tsx b/web/app/components/datasets/documents/create-from-pipeline/steps/step-one-content.tsx
index 8eed6d00b9..31871b10f1 100644
--- a/web/app/components/datasets/documents/create-from-pipeline/steps/step-one-content.tsx
+++ b/web/app/components/datasets/documents/create-from-pipeline/steps/step-one-content.tsx
@@ -28,7 +28,7 @@ type StepOneContentProps = {
   nextBtnDisabled: boolean
   onSelectDataSource: (dataSource: Datasource) => void
   onCredentialChange: (credentialId: string) => void
-  onSelectAll: () => void
+  onSelectAll: (checked: boolean) => void
   onNextStep: () => void
 }
 
diff --git a/web/app/components/datasets/documents/detail/__tests__/document-title.spec.tsx b/web/app/components/datasets/documents/detail/__tests__/document-title.spec.tsx
index 3eb1017b8d..b48575d209 100644
--- a/web/app/components/datasets/documents/detail/__tests__/document-title.spec.tsx
+++ b/web/app/components/datasets/documents/detail/__tests__/document-title.spec.tsx
@@ -1,6 +1,7 @@
+import type { SimpleDocumentDetail } from '@/models/datasets'
 import { render } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { ChunkingMode } from '@/models/datasets'
+import { ChunkingMode, DataSourceType } from '@/models/datasets'
 
 import { DocumentTitle } from '../document-title'
 
@@ -11,13 +12,23 @@ vi.mock('@/next/navigation', () => ({
   }),
 }))
 
-// Mock DocumentPicker
 vi.mock('../../../common/document-picker', () => ({
-  default: ({ datasetId, value, onChange }: { datasetId: string, value: unknown, onChange: (doc: { id: string }) => void }) => (
+  DocumentPicker: ({
+    datasetId,
+    value,
+    parentMode,
+    onChange,
+  }: {
+    datasetId: string
+    value?: SimpleDocumentDetail | null
+    parentMode?: string
+    onChange: (doc: { id: string }) => void
+  }) => (
     <div
       data-testid="document-picker"
       data-dataset-id={datasetId}
-      data-value={JSON.stringify(value)}
+      data-value-id={value?.id ?? ''}
+      data-parent-mode={parentMode ?? ''}
       onClick={() => onChange({ id: 'new-doc-id' })}
     >
       Document Picker
@@ -25,6 +36,42 @@ vi.mock('../../../common/document-picker', () => ({
   ),
 }))
 
+const createDocument = (overrides: Partial<SimpleDocumentDetail> = {}): SimpleDocumentDetail => ({
+  id: 'doc-1',
+  batch: 'batch-1',
+  position: 1,
+  dataset_id: 'dataset-1',
+  data_source_type: DataSourceType.FILE,
+  data_source_info: {
+    upload_file: {
+      id: 'file-1',
+      name: 'document.pdf',
+      size: 1024,
+      extension: 'pdf',
+      mime_type: 'application/pdf',
+      created_by: 'user-1',
+      created_at: Date.now(),
+    },
+    job_id: 'job-1',
+    url: '',
+  },
+  dataset_process_rule_id: 'rule-1',
+  name: 'Document 1',
+  created_from: 'web',
+  created_by: 'user-1',
+  created_at: Date.now(),
+  indexing_status: 'completed',
+  display_status: 'enabled',
+  doc_form: ChunkingMode.text,
+  doc_language: 'en',
+  enabled: true,
+  word_count: 1000,
+  archived: false,
+  updated_at: Date.now(),
+  hit_count: 0,
+  ...overrides,
+})
+
 describe('DocumentTitle', () => {
   beforeEach(() => {
     vi.clearAllMocks()
@@ -69,31 +116,26 @@ describe('DocumentTitle', () => {
       expect(getByTestId('document-picker').getAttribute('data-dataset-id')).toBe('test-dataset-id')
     })
 
-    it('should pass value props to DocumentPicker', () => {
+    it('should pass the selected document to DocumentPicker', () => {
+      const document = createDocument({ id: 'doc-current' })
       const { getByTestId } = render(
         <DocumentTitle
           datasetId="dataset-1"
-          name="test-document"
-          extension="pdf"
-          chunkingMode={ChunkingMode.text}
-          parent_mode="paragraph"
+          document={document}
+          parentMode="paragraph"
         />,
       )
 
-      const value = JSON.parse(getByTestId('document-picker').getAttribute('data-value') || '{}')
-      expect(value.name).toBe('test-document')
-      expect(value.extension).toBe('pdf')
-      expect(value.chunkingMode).toBe(ChunkingMode.text)
-      expect(value.parentMode).toBe('paragraph')
+      expect(getByTestId('document-picker')).toHaveAttribute('data-value-id', 'doc-current')
+      expect(getByTestId('document-picker')).toHaveAttribute('data-parent-mode', 'paragraph')
     })
 
-    it('should default parentMode to paragraph when parent_mode is undefined', () => {
+    it('should pass no parent mode when it is undefined', () => {
       const { getByTestId } = render(
         <DocumentTitle datasetId="dataset-1" />,
       )
 
-      const value = JSON.parse(getByTestId('document-picker').getAttribute('data-value') || '{}')
-      expect(value.parentMode).toBe('paragraph')
+      expect(getByTestId('document-picker')).toHaveAttribute('data-parent-mode', '')
     })
 
     it('should apply custom wrapperCls', () => {
@@ -119,24 +161,23 @@ describe('DocumentTitle', () => {
   })
 
   describe('Edge Cases', () => {
-    it('should handle undefined optional props', () => {
+    it('should handle an empty document value', () => {
       const { getByTestId } = render(
         <DocumentTitle datasetId="dataset-1" />,
       )
 
-      const value = JSON.parse(getByTestId('document-picker').getAttribute('data-value') || '{}')
-      expect(value.name).toBeUndefined()
-      expect(value.extension).toBeUndefined()
+      expect(getByTestId('document-picker')).toHaveAttribute('data-value-id', '')
     })
 
     it('should maintain structure when rerendered', () => {
       const { rerender, getByTestId } = render(
-        <DocumentTitle datasetId="dataset-1" name="doc1" />,
+        <DocumentTitle datasetId="dataset-1" document={createDocument({ id: 'doc-1' })} />,
       )
 
-      rerender(<DocumentTitle datasetId="dataset-2" name="doc2" />)
+      rerender(<DocumentTitle datasetId="dataset-2" document={createDocument({ id: 'doc-2' })} />)
 
       expect(getByTestId('document-picker').getAttribute('data-dataset-id')).toBe('dataset-2')
+      expect(getByTestId('document-picker').getAttribute('data-value-id')).toBe('doc-2')
     })
   })
 })
diff --git a/web/app/components/datasets/documents/detail/__tests__/index.spec.tsx b/web/app/components/datasets/documents/detail/__tests__/index.spec.tsx
index dc0dd438ce..e8946ce584 100644
--- a/web/app/components/datasets/documents/detail/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/detail/__tests__/index.spec.tsx
@@ -114,24 +114,29 @@ vi.mock('../batch-modal', () => ({
 }))
 
 vi.mock('../document-title', () => ({
-  DocumentTitle: ({ name, extension }: { name?: string, extension?: string }) => (
-    <div data-testid="document-title" data-extension={extension}>{name}</div>
-  ),
+  DocumentTitle: ({
+    document,
+  }: {
+    document?: {
+      name?: string
+      data_source_detail_dict?: { upload_file?: { extension?: string } }
+      data_source_info?: { upload_file?: { extension?: string } }
+    } | null
+  }) => {
+    const extension = document?.data_source_detail_dict?.upload_file?.extension
+      ?? document?.data_source_info?.upload_file?.extension
+
+    return <div data-testid="document-title" data-extension={extension}>{document?.name}</div>
+  },
 }))
 
 vi.mock('../segment-add', () => ({
-  default: ({ showNewSegmentModal, showBatchModal, embedding }: { showNewSegmentModal?: () => void, showBatchModal?: () => void, embedding?: boolean }) => (
+  SegmentAdd: ({ showNewSegmentModal, showBatchModal, embedding }: { showNewSegmentModal?: () => void, showBatchModal?: () => void, embedding?: boolean }) => (
     <div data-testid="segment-add" data-embedding={embedding}>
       <button data-testid="new-segment-btn" onClick={showNewSegmentModal}>New Segment</button>
       <button data-testid="batch-btn" onClick={showBatchModal}>Batch Import</button>
     </div>
   ),
-  ProcessStatus: {
-    WAITING: 'waiting',
-    PROCESSING: 'processing',
-    ERROR: 'error',
-    COMPLETED: 'completed',
-  },
 }))
 
 vi.mock('../../components/operations', () => ({
@@ -317,19 +322,19 @@ describe('DocumentDetail', () => {
   describe('Navigation', () => {
     it('should navigate back when back button clicked', () => {
       render(<DocumentDetail datasetId="ds-1" documentId="doc-1" />)
-      fireEvent.click(screen.getByTestId('document-detail-back-button'))
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.back' }))
       expect(mocks.push).toHaveBeenCalledWith('/datasets/ds-1/documents')
     })
 
     it('should expose aria label for back button', () => {
       render(<DocumentDetail datasetId="ds-1" documentId="doc-1" />)
-      expect(screen.getByTestId('document-detail-back-button')).toHaveAttribute('aria-label')
+      expect(screen.getByRole('button', { name: 'common.operation.back' })).toHaveAttribute('aria-label')
     })
 
     it('should preserve query params when navigating back', () => {
       mocks.state.searchParams = 'page=2&status=active'
       render(<DocumentDetail datasetId="ds-1" documentId="doc-1" />)
-      fireEvent.click(screen.getByTestId('document-detail-back-button'))
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.back' }))
       expect(mocks.push).toHaveBeenCalledWith('/datasets/ds-1/documents?page=2&status=active')
     })
   })
diff --git a/web/app/components/datasets/documents/detail/__tests__/new-segment.spec.tsx b/web/app/components/datasets/documents/detail/__tests__/new-segment.spec.tsx
index f6ebf0d29d..9121056ea4 100644
--- a/web/app/components/datasets/documents/detail/__tests__/new-segment.spec.tsx
+++ b/web/app/components/datasets/documents/detail/__tests__/new-segment.spec.tsx
@@ -58,15 +58,15 @@ vi.mock('../completed/common/action-buttons', () => ({
 }))
 
 vi.mock('../completed/common/add-another', () => ({
-  default: ({ isChecked, onCheck, className }: { isChecked: boolean, onCheck: () => void, className?: string }) => (
-    <div data-testid="add-another" className={className}>
+  default: ({ checked, onCheckedChange, className }: { checked: boolean, onCheckedChange: (checked: boolean) => void, className?: string }) => (
+    <label className={className}>
       <input
         type="checkbox"
-        checked={isChecked}
-        onChange={onCheck}
-        data-testid="add-another-checkbox"
+        checked={checked}
+        onChange={event => onCheckedChange(event.currentTarget.checked)}
       />
-    </div>
+      datasetDocuments.segment.addAnother
+    </label>
   ),
 }))
 
@@ -201,13 +201,9 @@ describe('NewSegmentModal', () => {
   describe('User Interactions', () => {
     it('should call onCancel when close button is clicked', () => {
       const mockOnCancel = vi.fn()
-      const { container } = render(<NewSegmentModal {...defaultProps} onCancel={mockOnCancel} />)
+      render(<NewSegmentModal {...defaultProps} onCancel={mockOnCancel} />)
 
-      // Act - find and click close button (RiCloseLine icon wrapper)
-      const closeButtons = container.querySelectorAll('.cursor-pointer')
-      // The close button is the second cursor-pointer element
-      if (closeButtons.length > 1)
-        fireEvent.click(closeButtons[1]!)
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.close' }))
 
       expect(mockOnCancel).toHaveBeenCalled()
     })
@@ -232,12 +228,10 @@ describe('NewSegmentModal', () => {
 
     it('should toggle add another checkbox', () => {
       render(<NewSegmentModal {...defaultProps} />)
-      const checkbox = screen.getByTestId('add-another-checkbox')
+      const checkbox = screen.getByRole('checkbox', { name: 'datasetDocuments.segment.addAnother' })
 
       fireEvent.click(checkbox)
 
-      // Assert - checkbox state should toggle
-      // Assert - checkbox state should toggle
       expect(checkbox)!.toBeInTheDocument()
     })
   })
@@ -346,16 +340,13 @@ describe('NewSegmentModal', () => {
 
       render(<NewSegmentModal {...defaultProps} />)
 
-      expect(screen.getByTestId('add-another'))!.toBeInTheDocument()
+      expect(screen.getByRole('checkbox', { name: 'datasetDocuments.segment.addAnother' }))!.toBeInTheDocument()
     })
 
     it('should call toggleFullScreen when expand button is clicked', () => {
-      const { container } = render(<NewSegmentModal {...defaultProps} />)
+      render(<NewSegmentModal {...defaultProps} />)
 
-      // Act - click the expand button (first cursor-pointer)
-      const expandButtons = container.querySelectorAll('.cursor-pointer')
-      if (expandButtons.length > 0)
-        fireEvent.click(expandButtons[0]!)
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.zoomIn' }))
 
       expect(mockToggleFullScreen).toHaveBeenCalled()
     })
@@ -548,8 +539,7 @@ describe('NewSegmentModal', () => {
 
       render(<NewSegmentModal {...defaultProps} onCancel={mockOnCancel} docForm={ChunkingMode.text} />)
 
-      // Uncheck "add another"
-      const checkbox = screen.getByTestId('add-another-checkbox')
+      const checkbox = screen.getByRole('checkbox', { name: 'datasetDocuments.segment.addAnother' })
       fireEvent.click(checkbox)
 
       // Enter content and save
@@ -605,9 +595,7 @@ describe('NewSegmentModal', () => {
 
       render(<NewSegmentModal {...defaultProps} />)
 
-      // Assert - footer should have both AddAnother and ActionButtons
-      // Assert - footer should have both AddAnother and ActionButtons
-      expect(screen.getByTestId('add-another'))!.toBeInTheDocument()
+      expect(screen.getByRole('checkbox', { name: 'datasetDocuments.segment.addAnother' }))!.toBeInTheDocument()
       expect(screen.getByTestId('action-buttons'))!.toBeInTheDocument()
     })
   })
diff --git a/web/app/components/datasets/documents/detail/batch-modal/__tests__/csv-uploader.spec.tsx b/web/app/components/datasets/documents/detail/batch-modal/__tests__/csv-uploader.spec.tsx
index 0cd2a31491..a4d7871719 100644
--- a/web/app/components/datasets/documents/detail/batch-modal/__tests__/csv-uploader.spec.tsx
+++ b/web/app/components/datasets/documents/detail/batch-modal/__tests__/csv-uploader.spec.tsx
@@ -74,7 +74,7 @@ describe('CSVUploader', () => {
       render(<CSVUploader {...defaultProps} />)
 
       expect(screen.getByText(/list\.batchModal\.csvUploadTitle/i)).toBeInTheDocument()
-      expect(screen.getByText(/list\.batchModal\.browse/i)).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: /list\.batchModal\.browse/i })).toBeInTheDocument()
     })
 
     it('should render hidden file input', () => {
@@ -139,11 +139,32 @@ describe('CSVUploader', () => {
       const fileInput = container.querySelector('input[type="file"]') as HTMLInputElement
       const clickSpy = vi.spyOn(fileInput, 'click')
 
-      fireEvent.click(screen.getByText(/list\.batchModal\.browse/i))
+      fireEvent.click(screen.getByRole('button', { name: /list\.batchModal\.browse/i }))
 
       expect(clickSpy).toHaveBeenCalled()
     })
 
+    it('should clear the selected file when delete is clicked', () => {
+      const mockUpdateFile = vi.fn()
+      const mockFile: FileItem = {
+        fileID: 'file-1',
+        file: new File(['content'], 'test.csv', { type: 'text/csv' }) as CustomFile,
+        progress: 100,
+      }
+      const { container } = render(<CSVUploader {...defaultProps} file={mockFile} updateFile={mockUpdateFile} />)
+      const fileInput = container.querySelector('input[type="file"]') as HTMLInputElement
+      Object.defineProperty(fileInput, 'value', {
+        configurable: true,
+        value: 'C:\\fakepath\\test.csv',
+        writable: true,
+      })
+
+      fireEvent.click(screen.getByRole('button', { name: /operation\.delete$/ }))
+
+      expect(fileInput.value).toBe('')
+      expect(mockUpdateFile).toHaveBeenCalledWith()
+    })
+
     it('should call updateFile when file is selected', async () => {
       const mockUpdateFile = vi.fn()
       mockUpload.mockResolvedValueOnce({ id: 'uploaded-id' })
diff --git a/web/app/components/datasets/documents/detail/batch-modal/csv-uploader.tsx b/web/app/components/datasets/documents/detail/batch-modal/csv-uploader.tsx
index 0e86c057cc..15d6d803d4 100644
--- a/web/app/components/datasets/documents/detail/batch-modal/csv-uploader.tsx
+++ b/web/app/components/datasets/documents/detail/batch-modal/csv-uploader.tsx
@@ -175,7 +175,13 @@ const CSVUploader: FC<Props> = ({ file, updateFile }) => {
               <CSVIcon className="shrink-0" />
               <div className="text-text-secondary">
                 {t('list.batchModal.csvUploadTitle', { ns: 'datasetDocuments' })}
-                <span className="cursor-pointer text-text-accent" onClick={selectHandle}>{t('list.batchModal.browse', { ns: 'datasetDocuments' })}</span>
+                <button
+                  type="button"
+                  className="inline cursor-pointer border-none bg-transparent p-0 text-left text-text-accent focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+                  onClick={selectHandle}
+                >
+                  {t('list.batchModal.browse', { ns: 'datasetDocuments' })}
+                </button>
               </div>
             </div>
             {dragging && <div ref={dragRef} className="absolute top-0 left-0 h-full w-full" />}
@@ -197,9 +203,14 @@ const CSVUploader: FC<Props> = ({ file, updateFile }) => {
               )}
               <Button onClick={selectHandle}>{t('stepOne.uploader.change', { ns: 'datasetCreation' })}</Button>
               <div className="mx-2 h-4 w-px bg-text-secondary" />
-              <div className="cursor-pointer p-2" onClick={removeFile}>
-                <RiDeleteBinLine className="h-4 w-4 text-text-secondary" />
-              </div>
+              <button
+                type="button"
+                className="cursor-pointer border-none bg-transparent p-2 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+                aria-label={t('operation.delete', { ns: 'common' })}
+                onClick={removeFile}
+              >
+                <RiDeleteBinLine className="h-4 w-4 text-text-secondary" aria-hidden="true" />
+              </button>
             </div>
           </div>
         )}
diff --git a/web/app/components/datasets/documents/detail/batch-modal/index.tsx b/web/app/components/datasets/documents/detail/batch-modal/index.tsx
index c0d9a58e98..4e190ef3fd 100644
--- a/web/app/components/datasets/documents/detail/batch-modal/index.tsx
+++ b/web/app/components/datasets/documents/detail/batch-modal/index.tsx
@@ -2,12 +2,15 @@
 import type { FC } from 'react'
 import type { ChunkingMode, FileItem } from '@/models/datasets'
 import { Button } from '@langgenius/dify-ui/button'
-import { RiCloseLine } from '@remixicon/react'
-import { noop } from 'es-toolkit/function'
+import {
+  Dialog,
+  DialogCloseButton,
+  DialogContent,
+  DialogTitle,
+} from '@langgenius/dify-ui/dialog'
 import * as React from 'react'
-import { useEffect, useState } from 'react'
+import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import Modal from '@/app/components/base/modal'
 import CSVDownloader from './csv-downloader'
 import CSVUploader from './csv-uploader'
 
@@ -18,8 +21,9 @@ type IBatchModalProps = {
   onConfirm: (file: FileItem) => void
 }
 
-const BatchModal: FC<IBatchModalProps> = ({
-  isShow,
+type BatchModalContentProps = Omit<IBatchModalProps, 'isShow'>
+
+const BatchModalContent: FC<BatchModalContentProps> = ({
   docForm,
   onCancel,
   onConfirm,
@@ -35,17 +39,13 @@ const BatchModal: FC<IBatchModalProps> = ({
     onConfirm(currentCSV)
   }
 
-  useEffect(() => {
-    if (!isShow)
-      setCurrentCSV(undefined)
-  }, [isShow])
-
   return (
-    <Modal isShow={isShow} onClose={noop} className="max-w-[520px]! rounded-xl! px-8 py-6">
-      <div className="relative pb-1 text-xl leading-[30px] font-medium text-text-primary">{t('list.batchModal.title', { ns: 'datasetDocuments' })}</div>
-      <div className="absolute top-4 right-4 cursor-pointer p-2" onClick={onCancel}>
-        <RiCloseLine className="h-4 w-4 text-text-secondary" />
-      </div>
+    <DialogContent className="w-[520px]! overflow-hidden! rounded-xl! border-0! px-8 py-6">
+      <DialogTitle className="relative pb-1 text-xl leading-[30px] font-medium text-text-primary">{t('list.batchModal.title', { ns: 'datasetDocuments' })}</DialogTitle>
+      <DialogCloseButton
+        className="top-4 right-4"
+        aria-label={t('list.batchModal.cancel', { ns: 'datasetDocuments' })}
+      />
       <CSVUploader
         file={currentCSV}
         updateFile={handleFile}
@@ -61,7 +61,33 @@ const BatchModal: FC<IBatchModalProps> = ({
           {t('list.batchModal.run', { ns: 'datasetDocuments' })}
         </Button>
       </div>
-    </Modal>
+    </DialogContent>
   )
 }
+
+const BatchModal: FC<IBatchModalProps> = ({
+  isShow,
+  docForm,
+  onCancel,
+  onConfirm,
+}) => {
+  return (
+    <Dialog
+      open={isShow}
+      onOpenChange={open => !open && onCancel()}
+      disablePointerDismissal
+    >
+      {isShow
+        ? (
+            <BatchModalContent
+              docForm={docForm}
+              onCancel={onCancel}
+              onConfirm={onConfirm}
+            />
+          )
+        : null}
+    </Dialog>
+  )
+}
+
 export default React.memo(BatchModal)
diff --git a/web/app/components/datasets/documents/detail/completed/__tests__/child-segment-detail.spec.tsx b/web/app/components/datasets/documents/detail/completed/__tests__/child-segment-detail.spec.tsx
index b3bec1b0b8..a7de0258c0 100644
--- a/web/app/components/datasets/documents/detail/completed/__tests__/child-segment-detail.spec.tsx
+++ b/web/app/components/datasets/documents/detail/completed/__tests__/child-segment-detail.spec.tsx
@@ -129,23 +129,19 @@ describe('ChildSegmentDetail', () => {
   describe('User Interactions', () => {
     it('should call onCancel when close button is clicked', () => {
       const mockOnCancel = vi.fn()
-      const { container } = render(
+      render(
         <ChildSegmentDetail {...defaultProps} onCancel={mockOnCancel} />,
       )
 
-      const closeButtons = container.querySelectorAll('.cursor-pointer')
-      if (closeButtons.length > 1)
-        fireEvent.click(closeButtons[1]!)
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.close' }))
 
       expect(mockOnCancel).toHaveBeenCalled()
     })
 
     it('should call toggleFullScreen when expand button is clicked', () => {
-      const { container } = render(<ChildSegmentDetail {...defaultProps} />)
+      render(<ChildSegmentDetail {...defaultProps} />)
 
-      const expandButtons = container.querySelectorAll('.cursor-pointer')
-      if (expandButtons.length > 0)
-        fireEvent.click(expandButtons[0]!)
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.zoomIn' }))
 
       expect(mockToggleFullScreen).toHaveBeenCalled()
     })
diff --git a/web/app/components/datasets/documents/detail/completed/__tests__/index.spec.tsx b/web/app/components/datasets/documents/detail/completed/__tests__/index.spec.tsx
index f50b405c6f..900c974252 100644
--- a/web/app/components/datasets/documents/detail/completed/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/detail/completed/__tests__/index.spec.tsx
@@ -137,9 +137,8 @@ vi.mock('../hooks/use-child-segment-data', () => ({
   },
 }))
 
-// Mock child components to simplify testing
-vi.mock('../components', () => ({
-  MenuBar: ({ totalText, onInputChange, inputValue, isLoading, onSelectedAll, onChangeStatus }: {
+vi.mock('../components/menu-bar', () => ({
+  default: ({ totalText, onInputChange, inputValue, isLoading, onSelectedAll, onChangeStatus }: {
     totalText: string
     onInputChange: (value: string) => void
     inputValue: string
@@ -167,7 +166,13 @@ vi.mock('../components', () => ({
       )}
     </div>
   ),
+}))
+
+vi.mock('../components/drawer-group', () => ({
   DrawerGroup: () => <div data-testid="drawer-group" />,
+}))
+
+vi.mock('../components/segment-list-content', () => ({
   FullDocModeContent: () => <div data-testid="full-doc-mode-content" />,
   GeneralModeContent: () => <div data-testid="general-mode-content" />,
 }))
@@ -563,7 +568,7 @@ describe('Edge Cases', () => {
     expect(screen.getByTestId('general-mode-content'))!.toBeInTheDocument()
   })
 
-  it('should handle ProcessStatus.COMPLETED importStatus', () => {
+  it('should handle completed importStatus', () => {
     render(<Completed {...defaultProps} importStatus="completed" />, { wrapper: createWrapper() })
 
     expect(screen.getByTestId('general-mode-content'))!.toBeInTheDocument()
diff --git a/web/app/components/datasets/documents/detail/completed/__tests__/new-child-segment.spec.tsx b/web/app/components/datasets/documents/detail/completed/__tests__/new-child-segment.spec.tsx
index d993ff849e..082dfb6ab7 100644
--- a/web/app/components/datasets/documents/detail/completed/__tests__/new-child-segment.spec.tsx
+++ b/web/app/components/datasets/documents/detail/completed/__tests__/new-child-segment.spec.tsx
@@ -57,15 +57,15 @@ vi.mock('../common/action-buttons', () => ({
 }))
 
 vi.mock('../common/add-another', () => ({
-  default: ({ isChecked, onCheck, className }: { isChecked: boolean, onCheck: () => void, className?: string }) => (
-    <div data-testid="add-another" className={className}>
+  default: ({ checked, onCheckedChange, className }: { checked: boolean, onCheckedChange: (checked: boolean) => void, className?: string }) => (
+    <label className={className}>
       <input
         type="checkbox"
-        checked={isChecked}
-        onChange={onCheck}
-        data-testid="add-another-checkbox"
+        checked={checked}
+        onChange={event => onCheckedChange(event.currentTarget.checked)}
       />
-    </div>
+      datasetDocuments.segment.addAnother
+    </label>
   ),
 }))
 
@@ -134,30 +134,26 @@ describe('NewChildSegmentModal', () => {
     it('should render add another checkbox', () => {
       render(<NewChildSegmentModal {...defaultProps} />)
 
-      expect(screen.getByTestId('add-another'))!.toBeInTheDocument()
+      expect(screen.getByRole('checkbox', { name: 'datasetDocuments.segment.addAnother' }))!.toBeInTheDocument()
     })
   })
 
   describe('User Interactions', () => {
     it('should call onCancel when close button is clicked', () => {
       const mockOnCancel = vi.fn()
-      const { container } = render(
+      render(
         <NewChildSegmentModal {...defaultProps} onCancel={mockOnCancel} />,
       )
 
-      const closeButtons = container.querySelectorAll('.cursor-pointer')
-      if (closeButtons.length > 1)
-        fireEvent.click(closeButtons[1]!)
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.close' }))
 
       expect(mockOnCancel).toHaveBeenCalled()
     })
 
     it('should call toggleFullScreen when expand button is clicked', () => {
-      const { container } = render(<NewChildSegmentModal {...defaultProps} />)
+      render(<NewChildSegmentModal {...defaultProps} />)
 
-      const expandButtons = container.querySelectorAll('.cursor-pointer')
-      if (expandButtons.length > 0)
-        fireEvent.click(expandButtons[0]!)
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.zoomIn' }))
 
       expect(mockToggleFullScreen).toHaveBeenCalled()
     })
@@ -174,7 +170,7 @@ describe('NewChildSegmentModal', () => {
 
     it('should toggle add another checkbox', () => {
       render(<NewChildSegmentModal {...defaultProps} />)
-      const checkbox = screen.getByTestId('add-another-checkbox')
+      const checkbox = screen.getByRole('checkbox', { name: 'datasetDocuments.segment.addAnother' })
 
       fireEvent.click(checkbox)
 
@@ -261,7 +257,7 @@ describe('NewChildSegmentModal', () => {
 
       render(<NewChildSegmentModal {...defaultProps} />)
 
-      expect(screen.getByTestId('add-another'))!.toBeInTheDocument()
+      expect(screen.getByRole('checkbox', { name: 'datasetDocuments.segment.addAnother' }))!.toBeInTheDocument()
     })
   })
 
@@ -316,8 +312,7 @@ describe('NewChildSegmentModal', () => {
 
       render(<NewChildSegmentModal {...defaultProps} onCancel={mockOnCancel} />)
 
-      // Uncheck add another
-      fireEvent.click(screen.getByTestId('add-another-checkbox'))
+      fireEvent.click(screen.getByRole('checkbox', { name: 'datasetDocuments.segment.addAnother' }))
 
       // Enter valid content
       fireEvent.change(screen.getByTestId('content-input'), {
diff --git a/web/app/components/datasets/documents/detail/completed/__tests__/segment-detail.spec.tsx b/web/app/components/datasets/documents/detail/completed/__tests__/segment-detail.spec.tsx
index 4e17cd39b3..8ac57759cd 100644
--- a/web/app/components/datasets/documents/detail/completed/__tests__/segment-detail.spec.tsx
+++ b/web/app/components/datasets/documents/detail/completed/__tests__/segment-detail.spec.tsx
@@ -3,7 +3,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { IndexingType } from '@/app/components/datasets/create/step-two'
 import { ChunkingMode } from '@/models/datasets'
 
-import SegmentDetail from '../segment-detail'
+import { SegmentDetail } from '../segment-detail'
 
 // Mock dataset detail context
 let mockIndexingTechnique = IndexingType.QUALIFIED
@@ -167,7 +167,6 @@ describe('SegmentDetail', () => {
     onCancel: vi.fn(),
     isEditMode: false,
     docForm: ChunkingMode.text,
-    onModalStateChange: vi.fn(),
   }
 
   describe('Rendering', () => {
@@ -279,21 +278,17 @@ describe('SegmentDetail', () => {
   describe('User Interactions', () => {
     it('should call onCancel when close button is clicked', () => {
       const mockOnCancel = vi.fn()
-      const { container } = render(<SegmentDetail {...defaultProps} onCancel={mockOnCancel} />)
+      render(<SegmentDetail {...defaultProps} onCancel={mockOnCancel} />)
 
-      const closeButtons = container.querySelectorAll('.cursor-pointer')
-      if (closeButtons.length > 1)
-        fireEvent.click(closeButtons[1]!)
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.close' }))
 
       expect(mockOnCancel).toHaveBeenCalled()
     })
 
     it('should call toggleFullScreen when expand button is clicked', () => {
-      const { container } = render(<SegmentDetail {...defaultProps} />)
+      render(<SegmentDetail {...defaultProps} />)
 
-      const expandButtons = container.querySelectorAll('.cursor-pointer')
-      if (expandButtons.length > 0)
-        fireEvent.click(expandButtons[0]!)
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.zoomIn' }))
 
       expect(mockToggleFullScreen).toHaveBeenCalled()
     })
@@ -352,35 +347,12 @@ describe('SegmentDetail', () => {
       expect(screen.getByTestId('regeneration-modal'))!.toBeInTheDocument()
     })
 
-    it('should call onModalStateChange when regeneration modal opens', () => {
-      const mockOnModalStateChange = vi.fn()
-      render(
-        <SegmentDetail
-          {...defaultProps}
-          isEditMode={true}
-          onModalStateChange={mockOnModalStateChange}
-        />,
-      )
-
-      fireEvent.click(screen.getByTestId('regenerate-btn'))
-
-      expect(mockOnModalStateChange).toHaveBeenCalledWith(true)
-    })
-
     it('should close modal when cancel is clicked', () => {
-      const mockOnModalStateChange = vi.fn()
-      render(
-        <SegmentDetail
-          {...defaultProps}
-          isEditMode={true}
-          onModalStateChange={mockOnModalStateChange}
-        />,
-      )
+      render(<SegmentDetail {...defaultProps} isEditMode={true} />)
       fireEvent.click(screen.getByTestId('regenerate-btn'))
 
       fireEvent.click(screen.getByTestId('cancel-regeneration'))
 
-      expect(mockOnModalStateChange).toHaveBeenCalledWith(false)
       expect(screen.queryByTestId('regeneration-modal')).not.toBeInTheDocument()
     })
   })
@@ -504,22 +476,18 @@ describe('SegmentDetail', () => {
 
     it('should close modal and edit drawer when close after regeneration is clicked', () => {
       const mockOnCancel = vi.fn()
-      const mockOnModalStateChange = vi.fn()
       render(
         <SegmentDetail
           {...defaultProps}
           isEditMode={true}
           onCancel={mockOnCancel}
-          onModalStateChange={mockOnModalStateChange}
         />,
       )
 
-      // Open regeneration modal
       fireEvent.click(screen.getByTestId('regenerate-btn'))
 
       fireEvent.click(screen.getByTestId('close-regeneration'))
 
-      expect(mockOnModalStateChange).toHaveBeenCalledWith(false)
       expect(mockOnCancel).toHaveBeenCalled()
     })
   })
diff --git a/web/app/components/datasets/documents/detail/completed/__tests__/segment-list.spec.tsx b/web/app/components/datasets/documents/detail/completed/__tests__/segment-list.spec.tsx
index caab14a8e9..d76bac26e6 100644
--- a/web/app/components/datasets/documents/detail/completed/__tests__/segment-list.spec.tsx
+++ b/web/app/components/datasets/documents/detail/completed/__tests__/segment-list.spec.tsx
@@ -284,11 +284,9 @@ describe('SegmentList', () => {
   // Checkbox Selection
   describe('Checkbox Selection', () => {
     it('should render checkbox for each segment', () => {
-      const { container } = render(<SegmentList {...defaultProps} />)
+      render(<SegmentList {...defaultProps} />)
 
-      // Assert - Checkbox component should exist
-      const checkboxes = container.querySelectorAll('[class*="checkbox"]')
-      expect(checkboxes.length).toBeGreaterThan(0)
+      expect(screen.getAllByRole('checkbox')).toHaveLength(defaultProps.items.length)
     })
 
     it('should pass selectedSegmentIds to check state', () => {
diff --git a/web/app/components/datasets/documents/detail/completed/child-segment-detail.tsx b/web/app/components/datasets/documents/detail/completed/child-segment-detail.tsx
index 88767d628f..c4b3fc89f4 100644
--- a/web/app/components/datasets/documents/detail/completed/child-segment-detail.tsx
+++ b/web/app/components/datasets/documents/detail/completed/child-segment-detail.tsx
@@ -99,12 +99,24 @@ const ChildSegmentDetail: FC<IChildSegmentDetailProps> = ({
               <Divider type="vertical" className="mr-2 ml-4 h-3.5 bg-divider-regular" />
             </>
           )}
-          <div className="mr-1 flex h-8 w-8 cursor-pointer items-center justify-center p-1.5" onClick={toggleFullScreen}>
-            {fullScreen ? <RiCollapseDiagonalLine className="h-4 w-4 text-text-tertiary" /> : <RiExpandDiagonalLine className="h-4 w-4 text-text-tertiary" />}
-          </div>
-          <div className="flex h-8 w-8 cursor-pointer items-center justify-center p-1.5" onClick={onCancel}>
-            <RiCloseLine className="h-4 w-4 text-text-tertiary" />
-          </div>
+          <button
+            type="button"
+            aria-label={t(fullScreen ? 'operation.zoomOut' : 'operation.zoomIn', { ns: 'common' })}
+            className="mr-1 flex h-8 w-8 cursor-pointer items-center justify-center border-none bg-transparent p-1.5"
+            onClick={toggleFullScreen}
+          >
+            {fullScreen
+              ? <RiCollapseDiagonalLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
+              : <RiExpandDiagonalLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />}
+          </button>
+          <button
+            type="button"
+            aria-label={t('operation.close', { ns: 'common' })}
+            className="flex h-8 w-8 cursor-pointer items-center justify-center border-none bg-transparent p-1.5"
+            onClick={onCancel}
+          >
+            <RiCloseLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
+          </button>
         </div>
       </div>
       <div className={cn('flex w-full grow', fullScreen ? 'flex-row justify-center px-6 pt-6' : 'px-4 py-3')}>
diff --git a/web/app/components/datasets/documents/detail/completed/common/__tests__/add-another.spec.tsx b/web/app/components/datasets/documents/detail/completed/common/__tests__/add-another.spec.tsx
index 852119b854..350591c645 100644
--- a/web/app/components/datasets/documents/detail/completed/common/__tests__/add-another.spec.tsx
+++ b/web/app/components/datasets/documents/detail/completed/common/__tests__/add-another.spec.tsx
@@ -1,4 +1,5 @@
-import { fireEvent, render, screen } from '@testing-library/react'
+import { render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import AddAnother from '../add-another'
 
@@ -7,27 +8,27 @@ describe('AddAnother', () => {
     vi.clearAllMocks()
   })
 
+  const getCheckbox = () => screen.getByRole('checkbox', { name: /segment\.addAnother/i })
+
   describe('Rendering', () => {
     it('should render without crashing', () => {
       const { container } = render(
-        <AddAnother isChecked={false} onCheck={vi.fn()} />,
+        <AddAnother checked={false} onCheckedChange={vi.fn()} />,
       )
 
       expect(container.firstChild).toBeInTheDocument()
     })
 
     it('should render the checkbox', () => {
-      const { container } = render(
-        <AddAnother isChecked={false} onCheck={vi.fn()} />,
+      render(
+        <AddAnother checked={false} onCheckedChange={vi.fn()} />,
       )
 
-      // Assert - Checkbox component renders with shrink-0 class
-      const checkbox = container.querySelector('.shrink-0')
-      expect(checkbox).toBeInTheDocument()
+      expect(getCheckbox()).toBeInTheDocument()
     })
 
     it('should render the add another text', () => {
-      render(<AddAnother isChecked={false} onCheck={vi.fn()} />)
+      render(<AddAnother checked={false} onCheckedChange={vi.fn()} />)
 
       // Assert - i18n key format
       expect(screen.getByText(/segment\.addAnother/i)).toBeInTheDocument()
@@ -35,7 +36,7 @@ describe('AddAnother', () => {
 
     it('should render with correct base styling classes', () => {
       const { container } = render(
-        <AddAnother isChecked={false} onCheck={vi.fn()} />,
+        <AddAnother checked={false} onCheckedChange={vi.fn()} />,
       )
 
       const wrapper = container.firstChild as HTMLElement
@@ -47,31 +48,27 @@ describe('AddAnother', () => {
   })
 
   describe('Props', () => {
-    it('should render unchecked state when isChecked is false', () => {
-      const { container } = render(
-        <AddAnother isChecked={false} onCheck={vi.fn()} />,
+    it('should render unchecked state when checked is false', () => {
+      render(
+        <AddAnother checked={false} onCheckedChange={vi.fn()} />,
       )
 
-      // Assert - unchecked checkbox has border class
-      const checkbox = container.querySelector('.border-components-checkbox-border')
-      expect(checkbox).toBeInTheDocument()
+      expect(getCheckbox()).toHaveAttribute('aria-checked', 'false')
     })
 
-    it('should render checked state when isChecked is true', () => {
-      const { container } = render(
-        <AddAnother isChecked={true} onCheck={vi.fn()} />,
+    it('should render checked state when checked is true', () => {
+      render(
+        <AddAnother checked={true} onCheckedChange={vi.fn()} />,
       )
 
-      // Assert - checked checkbox has bg-components-checkbox-bg class
-      const checkbox = container.querySelector('.bg-components-checkbox-bg')
-      expect(checkbox).toBeInTheDocument()
+      expect(getCheckbox()).toHaveAttribute('aria-checked', 'true')
     })
 
     it('should apply custom className', () => {
       const { container } = render(
         <AddAnother
-          isChecked={false}
-          onCheck={vi.fn()}
+          checked={false}
+          onCheckedChange={vi.fn()}
           className="custom-class"
         />,
       )
@@ -82,42 +79,37 @@ describe('AddAnother', () => {
   })
 
   describe('User Interactions', () => {
-    it('should call onCheck when checkbox is clicked', () => {
-      const mockOnCheck = vi.fn()
-      const { container } = render(
-        <AddAnother isChecked={false} onCheck={mockOnCheck} />,
+    it('should call mockOnCheckedChange when checkbox is clicked', async () => {
+      const mockOnCheckedChange = vi.fn()
+      const user = userEvent.setup()
+      render(
+        <AddAnother checked={false} onCheckedChange={mockOnCheckedChange} />,
       )
 
-      // Act - click on the checkbox element
-      const checkbox = container.querySelector('.shrink-0')
-      if (checkbox)
-        fireEvent.click(checkbox)
+      await user.click(screen.getByText(/segment\.addAnother/i))
 
-      expect(mockOnCheck).toHaveBeenCalledTimes(1)
+      expect(mockOnCheckedChange).toHaveBeenCalledTimes(1)
     })
 
-    it('should toggle checked state on multiple clicks', () => {
-      const mockOnCheck = vi.fn()
-      const { container, rerender } = render(
-        <AddAnother isChecked={false} onCheck={mockOnCheck} />,
+    it('should toggle checked state on multiple clicks', async () => {
+      const mockOnCheckedChange = vi.fn()
+      const user = userEvent.setup()
+      const { rerender } = render(
+        <AddAnother checked={false} onCheckedChange={mockOnCheckedChange} />,
       )
 
-      // Act - first click
-      const checkbox = container.querySelector('.shrink-0')
-      if (checkbox) {
-        fireEvent.click(checkbox)
-        rerender(<AddAnother isChecked={true} onCheck={mockOnCheck} />)
-        fireEvent.click(checkbox)
-      }
+      await user.click(screen.getByText(/segment\.addAnother/i))
+      rerender(<AddAnother checked={true} onCheckedChange={mockOnCheckedChange} />)
+      await user.click(screen.getByText(/segment\.addAnother/i))
 
-      expect(mockOnCheck).toHaveBeenCalledTimes(2)
+      expect(mockOnCheckedChange).toHaveBeenCalledTimes(2)
     })
   })
 
   describe('Structure', () => {
     it('should render text with tertiary text color', () => {
       const { container } = render(
-        <AddAnother isChecked={false} onCheck={vi.fn()} />,
+        <AddAnother checked={false} onCheckedChange={vi.fn()} />,
       )
 
       const textElement = container.querySelector('.text-text-tertiary')
@@ -126,7 +118,7 @@ describe('AddAnother', () => {
 
     it('should render text with xs medium font styling', () => {
       const { container } = render(
-        <AddAnother isChecked={false} onCheck={vi.fn()} />,
+        <AddAnother checked={false} onCheckedChange={vi.fn()} />,
       )
 
       const textElement = container.querySelector('.system-xs-medium')
@@ -136,30 +128,27 @@ describe('AddAnother', () => {
 
   describe('Edge Cases', () => {
     it('should maintain structure when rerendered', () => {
-      const mockOnCheck = vi.fn()
-      const { rerender, container } = render(
-        <AddAnother isChecked={false} onCheck={mockOnCheck} />,
+      const mockOnCheckedChange = vi.fn()
+      const { rerender } = render(
+        <AddAnother checked={false} onCheckedChange={mockOnCheckedChange} />,
       )
 
-      rerender(<AddAnother isChecked={true} onCheck={mockOnCheck} />)
+      rerender(<AddAnother checked={true} onCheckedChange={mockOnCheckedChange} />)
 
-      const checkbox = container.querySelector('.shrink-0')
-      expect(checkbox).toBeInTheDocument()
+      expect(getCheckbox()).toBeInTheDocument()
     })
 
-    it('should handle rapid state changes', () => {
-      const mockOnCheck = vi.fn()
-      const { container } = render(
-        <AddAnother isChecked={false} onCheck={mockOnCheck} />,
+    it('should handle rapid state changes', async () => {
+      const mockOnCheckedChange = vi.fn()
+      const user = userEvent.setup()
+      render(
+        <AddAnother checked={false} onCheckedChange={mockOnCheckedChange} />,
       )
 
-      const checkbox = container.querySelector('.shrink-0')
-      if (checkbox) {
-        for (let i = 0; i < 5; i++)
-          fireEvent.click(checkbox)
-      }
+      for (let i = 0; i < 5; i++)
+        await user.click(screen.getByText(/segment\.addAnother/i))
 
-      expect(mockOnCheck).toHaveBeenCalledTimes(5)
+      expect(mockOnCheckedChange).toHaveBeenCalledTimes(5)
     })
   })
 })
diff --git a/web/app/components/datasets/documents/detail/completed/common/__tests__/drawer.spec.tsx b/web/app/components/datasets/documents/detail/completed/common/__tests__/drawer.spec.tsx
index d9a87ea3e4..4ba28f3335 100644
--- a/web/app/components/datasets/documents/detail/completed/common/__tests__/drawer.spec.tsx
+++ b/web/app/components/datasets/documents/detail/completed/common/__tests__/drawer.spec.tsx
@@ -1,27 +1,16 @@
-import { render, screen } from '@testing-library/react'
+import { fireEvent, render, screen, waitFor } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import Drawer from '../drawer'
+import { CompletedDrawer } from '../drawer'
 
-let capturedKeyPressCallback: ((e: KeyboardEvent) => void) | undefined
+(
+  globalThis as typeof globalThis & {
+    BASE_UI_ANIMATIONS_DISABLED: boolean
+  }
+).BASE_UI_ANIMATIONS_DISABLED = true
 
-// Mock useKeyPress: required because tests capture the registered callback
-// and invoke it directly to verify ESC key handling behavior.
-vi.mock('ahooks', () => ({
-  useKeyPress: vi.fn((_key: string, cb: (e: KeyboardEvent) => void) => {
-    capturedKeyPressCallback = cb
-  }),
-}))
-
-vi.mock('../..', () => ({
-  useSegmentListContext: (selector: (state: {
-    currSegment: { showModal: boolean }
-    currChildChunk: { showModal: boolean }
-  }) => unknown) =>
-    selector({
-      currSegment: { showModal: false },
-      currChildChunk: { showModal: false },
-    }),
-}))
+const getOverlay = () =>
+  Array.from(document.querySelectorAll<HTMLElement>('[class]'))
+    .find(element => element.className.includes('bg-background-overlay'))
 
 describe('Drawer', () => {
   const defaultProps = {
@@ -31,103 +20,109 @@ describe('Drawer', () => {
 
   beforeEach(() => {
     vi.clearAllMocks()
-    capturedKeyPressCallback = undefined
   })
 
   describe('Rendering', () => {
     it('should return null when open is false', () => {
       const { container } = render(
-        <Drawer open={false} onClose={vi.fn()}>
+        <CompletedDrawer open={false} onClose={vi.fn()}>
           <span>Content</span>
-        </Drawer>,
+        </CompletedDrawer>,
       )
 
       expect(container.innerHTML).toBe('')
       expect(screen.queryByText('Content')).not.toBeInTheDocument()
     })
 
-    it('should render children in portal when open is true', () => {
+    it('should render children in the drawer portal when open is true', () => {
       render(
-        <Drawer {...defaultProps}>
+        <CompletedDrawer {...defaultProps}>
           <span>Drawer content</span>
-        </Drawer>,
+        </CompletedDrawer>,
       )
 
       expect(screen.getByText('Drawer content')).toBeInTheDocument()
-    })
-
-    it('should render dialog with role="dialog"', () => {
-      render(
-        <Drawer {...defaultProps}>
-          <span>Content</span>
-        </Drawer>,
-      )
-
       expect(screen.getByRole('dialog')).toBeInTheDocument()
     })
   })
 
-  // Overlay visibility
-  describe('Overlay', () => {
-    it('should show overlay when showOverlay is true', () => {
+  describe('Variant', () => {
+    it('should render a panel drawer without overlay by default', () => {
       render(
-        <Drawer {...defaultProps} showOverlay={true}>
+        <CompletedDrawer {...defaultProps}>
           <span>Content</span>
-        </Drawer>,
-      )
-
-      const overlay = document.querySelector('[aria-hidden="true"]')
-      expect(overlay).toBeInTheDocument()
-    })
-
-    it('should hide overlay when showOverlay is false', () => {
-      render(
-        <Drawer {...defaultProps} showOverlay={false}>
-          <span>Content</span>
-        </Drawer>,
-      )
-
-      const overlay = document.querySelector('[aria-hidden="true"]')
-      expect(overlay).not.toBeInTheDocument()
-    })
-  })
-
-  // aria-modal attribute
-  describe('aria-modal', () => {
-    it('should set aria-modal="true" when modal is true', () => {
-      render(
-        <Drawer {...defaultProps} modal={true}>
-          <span>Content</span>
-        </Drawer>,
-      )
-
-      expect(screen.getByRole('dialog')).toHaveAttribute('aria-modal', 'true')
-    })
-
-    it('should set aria-modal="false" when modal is false', () => {
-      render(
-        <Drawer {...defaultProps} modal={false}>
-          <span>Content</span>
-        </Drawer>,
+        </CompletedDrawer>,
       )
 
+      expect(getOverlay()).toBeUndefined()
       expect(screen.getByRole('dialog')).toHaveAttribute('aria-modal', 'false')
     })
-  })
 
-  // ESC key handling
-  describe('ESC Key', () => {
-    it('should call onClose when ESC is pressed and drawer is open', () => {
-      const onClose = vi.fn()
+    it('should render a modal drawer with overlay', () => {
       render(
-        <Drawer open={true} onClose={onClose}>
+        <CompletedDrawer {...defaultProps} modal>
           <span>Content</span>
-        </Drawer>,
+        </CompletedDrawer>,
       )
 
-      expect(capturedKeyPressCallback).toBeDefined()
-      const fakeEvent = { preventDefault: vi.fn() } as unknown as KeyboardEvent
-      capturedKeyPressCallback!(fakeEvent)
+      expect(getOverlay()).toBeInTheDocument()
+      expect(screen.getByRole('dialog')).toHaveAttribute('aria-modal', 'true')
+    })
+  })
+
+  describe('Dismissal', () => {
+    it('should call onClose when Escape is pressed', async () => {
+      const onClose = vi.fn()
+      render(
+        <CompletedDrawer open={true} onClose={onClose}>
+          <span>Content</span>
+        </CompletedDrawer>,
+      )
+
+      fireEvent.keyDown(document, { key: 'Escape' })
+
+      await waitFor(() => {
+        expect(onClose).toHaveBeenCalledTimes(1)
+      })
+    })
+
+    it('should keep a panel drawer open when the underlying page is clicked', () => {
+      const onClose = vi.fn()
+      render(
+        <>
+          <button type="button">Outside</button>
+          <CompletedDrawer open={true} onClose={onClose}>
+            <span>Content</span>
+          </CompletedDrawer>
+        </>,
+      )
+
+      fireEvent.pointerDown(screen.getByRole('button', { name: 'Outside' }))
+
+      expect(onClose).not.toHaveBeenCalled()
+    })
+
+    it('should keep a panel drawer open when the pointer down starts inside content', () => {
+      const onClose = vi.fn()
+      render(
+        <CompletedDrawer open={true} onClose={onClose}>
+          <button type="button">Inside</button>
+        </CompletedDrawer>,
+      )
+
+      fireEvent.pointerDown(screen.getByRole('button', { name: 'Inside' }))
+
+      expect(onClose).not.toHaveBeenCalled()
+    })
+    it('should close a modal drawer when the overlay is clicked', () => {
+      const onClose = vi.fn()
+      render(
+        <CompletedDrawer open={true} onClose={onClose} modal>
+          <span>Content</span>
+        </CompletedDrawer>,
+      )
+
+      fireEvent.click(getOverlay()!)
 
       expect(onClose).toHaveBeenCalledTimes(1)
     })
diff --git a/web/app/components/datasets/documents/detail/completed/common/__tests__/full-screen-drawer.spec.tsx b/web/app/components/datasets/documents/detail/completed/common/__tests__/full-screen-drawer.spec.tsx
index ae870c8e1c..6b6227492a 100644
--- a/web/app/components/datasets/documents/detail/completed/common/__tests__/full-screen-drawer.spec.tsx
+++ b/web/app/components/datasets/documents/detail/completed/common/__tests__/full-screen-drawer.spec.tsx
@@ -1,11 +1,11 @@
 import type { ReactNode } from 'react'
 import { render, screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import FullScreenDrawer from '../full-screen-drawer'
+import { DocumentDetailDrawer } from '../full-screen-drawer'
 
 // Mock the Drawer component since it has high complexity
 vi.mock('../drawer', () => ({
-  default: ({ children, open, panelClassName, panelContentClassName, showOverlay, needCheckChunks, modal }: { children: ReactNode, open: boolean, panelClassName: string, panelContentClassName: string, showOverlay: boolean, needCheckChunks: boolean, modal: boolean }) => {
+  CompletedDrawer: ({ children, open, panelClassName, panelContentClassName, modal }: { children: ReactNode, open: boolean, panelClassName: string, panelContentClassName: string, modal: boolean }) => {
     if (!open)
       return null
     return (
@@ -13,8 +13,6 @@ vi.mock('../drawer', () => ({
         data-testid="drawer-mock"
         data-panel-class={panelClassName}
         data-panel-content-class={panelContentClassName}
-        data-show-overlay={showOverlay}
-        data-need-check-chunks={needCheckChunks}
         data-modal={modal}
       >
         {children}
@@ -23,7 +21,7 @@ vi.mock('../drawer', () => ({
   },
 }))
 
-describe('FullScreenDrawer', () => {
+describe('DocumentDetailDrawer', () => {
   beforeEach(() => {
     vi.clearAllMocks()
   })
@@ -31,9 +29,9 @@ describe('FullScreenDrawer', () => {
   describe('Rendering', () => {
     it('should render without crashing when open', () => {
       render(
-        <FullScreenDrawer isOpen={true} fullScreen={false}>
+        <DocumentDetailDrawer open={true} fullScreen={false}>
           <div>Content</div>
-        </FullScreenDrawer>,
+        </DocumentDetailDrawer>,
       )
 
       expect(screen.getByTestId('drawer-mock')).toBeInTheDocument()
@@ -41,9 +39,9 @@ describe('FullScreenDrawer', () => {
 
     it('should not render when closed', () => {
       render(
-        <FullScreenDrawer isOpen={false} fullScreen={false}>
+        <DocumentDetailDrawer open={false} fullScreen={false}>
           <div>Content</div>
-        </FullScreenDrawer>,
+        </DocumentDetailDrawer>,
       )
 
       expect(screen.queryByTestId('drawer-mock')).not.toBeInTheDocument()
@@ -51,9 +49,9 @@ describe('FullScreenDrawer', () => {
 
     it('should render children content', () => {
       render(
-        <FullScreenDrawer isOpen={true} fullScreen={false}>
+        <DocumentDetailDrawer open={true} fullScreen={false}>
           <div>Test Content</div>
-        </FullScreenDrawer>,
+        </DocumentDetailDrawer>,
       )
 
       expect(screen.getByText('Test Content')).toBeInTheDocument()
@@ -63,86 +61,46 @@ describe('FullScreenDrawer', () => {
   describe('Props', () => {
     it('should pass fullScreen=true to Drawer with full width class', () => {
       render(
-        <FullScreenDrawer isOpen={true} fullScreen={true}>
+        <DocumentDetailDrawer open={true} fullScreen={true}>
           <div>Content</div>
-        </FullScreenDrawer>,
+        </DocumentDetailDrawer>,
       )
 
       const drawer = screen.getByTestId('drawer-mock')
       expect(drawer.getAttribute('data-panel-class')).toContain('w-full')
+      expect(drawer.getAttribute('data-panel-class')).toContain('data-[swipe-direction=right]:w-full')
+      expect(drawer.getAttribute('data-panel-class')).toContain('data-[swipe-direction=left]:w-full')
     })
 
     it('should pass fullScreen=false to Drawer with fixed width class', () => {
       render(
-        <FullScreenDrawer isOpen={true} fullScreen={false}>
+        <DocumentDetailDrawer open={true} fullScreen={false}>
           <div>Content</div>
-        </FullScreenDrawer>,
+        </DocumentDetailDrawer>,
       )
 
       const drawer = screen.getByTestId('drawer-mock')
       expect(drawer.getAttribute('data-panel-class')).toContain('w-[568px]')
+      expect(drawer.getAttribute('data-panel-class')).toContain('data-[swipe-direction=right]:w-[568px]')
+      expect(drawer.getAttribute('data-panel-class')).toContain('data-[swipe-direction=left]:w-[568px]')
     })
 
-    it('should pass showOverlay prop with default true', () => {
+    it('should render as non-modal by default', () => {
       render(
-        <FullScreenDrawer isOpen={true} fullScreen={false}>
+        <DocumentDetailDrawer open={true} fullScreen={false}>
           <div>Content</div>
-        </FullScreenDrawer>,
-      )
-
-      const drawer = screen.getByTestId('drawer-mock')
-      expect(drawer.getAttribute('data-show-overlay')).toBe('true')
-    })
-
-    it('should pass showOverlay=false when specified', () => {
-      render(
-        <FullScreenDrawer isOpen={true} fullScreen={false} showOverlay={false}>
-          <div>Content</div>
-        </FullScreenDrawer>,
-      )
-
-      const drawer = screen.getByTestId('drawer-mock')
-      expect(drawer.getAttribute('data-show-overlay')).toBe('false')
-    })
-
-    it('should pass needCheckChunks prop with default false', () => {
-      render(
-        <FullScreenDrawer isOpen={true} fullScreen={false}>
-          <div>Content</div>
-        </FullScreenDrawer>,
-      )
-
-      const drawer = screen.getByTestId('drawer-mock')
-      expect(drawer.getAttribute('data-need-check-chunks')).toBe('false')
-    })
-
-    it('should pass needCheckChunks=true when specified', () => {
-      render(
-        <FullScreenDrawer isOpen={true} fullScreen={false} needCheckChunks={true}>
-          <div>Content</div>
-        </FullScreenDrawer>,
-      )
-
-      const drawer = screen.getByTestId('drawer-mock')
-      expect(drawer.getAttribute('data-need-check-chunks')).toBe('true')
-    })
-
-    it('should pass modal prop with default false', () => {
-      render(
-        <FullScreenDrawer isOpen={true} fullScreen={false}>
-          <div>Content</div>
-        </FullScreenDrawer>,
+        </DocumentDetailDrawer>,
       )
 
       const drawer = screen.getByTestId('drawer-mock')
       expect(drawer.getAttribute('data-modal')).toBe('false')
     })
 
-    it('should pass modal=true when specified', () => {
+    it('should pass modal when specified', () => {
       render(
-        <FullScreenDrawer isOpen={true} fullScreen={false} modal={true}>
+        <DocumentDetailDrawer open={true} fullScreen={false} modal>
           <div>Content</div>
-        </FullScreenDrawer>,
+        </DocumentDetailDrawer>,
       )
 
       const drawer = screen.getByTestId('drawer-mock')
@@ -154,9 +112,9 @@ describe('FullScreenDrawer', () => {
   describe('Styling', () => {
     it('should apply panel content classes for non-fullScreen mode', () => {
       render(
-        <FullScreenDrawer isOpen={true} fullScreen={false}>
+        <DocumentDetailDrawer open={true} fullScreen={false}>
           <div>Content</div>
-        </FullScreenDrawer>,
+        </DocumentDetailDrawer>,
       )
 
       const drawer = screen.getByTestId('drawer-mock')
@@ -167,9 +125,9 @@ describe('FullScreenDrawer', () => {
 
     it('should apply panel content classes without border for fullScreen mode', () => {
       render(
-        <FullScreenDrawer isOpen={true} fullScreen={true}>
+        <DocumentDetailDrawer open={true} fullScreen={true}>
           <div>Content</div>
-        </FullScreenDrawer>,
+        </DocumentDetailDrawer>,
       )
 
       const drawer = screen.getByTestId('drawer-mock')
@@ -184,24 +142,24 @@ describe('FullScreenDrawer', () => {
       // Arrange & Act & Assert - should not throw
       expect(() => {
         render(
-          <FullScreenDrawer isOpen={true} fullScreen={false}>
+          <DocumentDetailDrawer open={true} fullScreen={false}>
             <div>Content</div>
-          </FullScreenDrawer>,
+          </DocumentDetailDrawer>,
         )
       }).not.toThrow()
     })
 
     it('should maintain structure when rerendered', () => {
       const { rerender } = render(
-        <FullScreenDrawer isOpen={true} fullScreen={false}>
+        <DocumentDetailDrawer open={true} fullScreen={false}>
           <div>Content</div>
-        </FullScreenDrawer>,
+        </DocumentDetailDrawer>,
       )
 
       rerender(
-        <FullScreenDrawer isOpen={true} fullScreen={true}>
+        <DocumentDetailDrawer open={true} fullScreen={true}>
           <div>Updated Content</div>
-        </FullScreenDrawer>,
+        </DocumentDetailDrawer>,
       )
 
       expect(screen.getByText('Updated Content')).toBeInTheDocument()
@@ -209,16 +167,16 @@ describe('FullScreenDrawer', () => {
 
     it('should handle toggle between open and closed states', () => {
       const { rerender } = render(
-        <FullScreenDrawer isOpen={true} fullScreen={false}>
+        <DocumentDetailDrawer open={true} fullScreen={false}>
           <div>Content</div>
-        </FullScreenDrawer>,
+        </DocumentDetailDrawer>,
       )
       expect(screen.getByTestId('drawer-mock')).toBeInTheDocument()
 
       rerender(
-        <FullScreenDrawer isOpen={false} fullScreen={false}>
+        <DocumentDetailDrawer open={false} fullScreen={false}>
           <div>Content</div>
-        </FullScreenDrawer>,
+        </DocumentDetailDrawer>,
       )
 
       expect(screen.queryByTestId('drawer-mock')).not.toBeInTheDocument()
diff --git a/web/app/components/datasets/documents/detail/completed/common/add-another.tsx b/web/app/components/datasets/documents/detail/completed/common/add-another.tsx
index 253b9bd7b1..923ecdc6e1 100644
--- a/web/app/components/datasets/documents/detail/completed/common/add-another.tsx
+++ b/web/app/components/datasets/documents/detail/completed/common/add-another.tsx
@@ -1,32 +1,32 @@
 import type { FC } from 'react'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import { cn } from '@langgenius/dify-ui/cn'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
-import Checkbox from '@/app/components/base/checkbox'
 
 type AddAnotherProps = {
   className?: string
-  isChecked: boolean
-  onCheck: () => void
+  checked: boolean
+  onCheckedChange: (checked: boolean) => void
 }
 
 const AddAnother: FC<AddAnotherProps> = ({
   className,
-  isChecked,
-  onCheck,
+  checked,
+  onCheckedChange,
 }) => {
   const { t } = useTranslation()
 
   return (
-    <div className={cn('flex items-center gap-x-1 pl-1', className)}>
+    <label className={cn('flex cursor-pointer items-center gap-x-1 pl-1', className)}>
       <Checkbox
         key="add-another-checkbox"
         className="shrink-0"
-        checked={isChecked}
-        onCheck={onCheck}
+        checked={checked}
+        onCheckedChange={onCheckedChange}
       />
       <span className="system-xs-medium text-text-tertiary">{t('segment.addAnother', { ns: 'datasetDocuments' })}</span>
-    </div>
+    </label>
   )
 }
 
diff --git a/web/app/components/datasets/documents/detail/completed/common/drawer.tsx b/web/app/components/datasets/documents/detail/completed/common/drawer.tsx
index 47b381e0ff..86c40a7367 100644
--- a/web/app/components/datasets/documents/detail/completed/common/drawer.tsx
+++ b/web/app/components/datasets/documents/detail/completed/common/drawer.tsx
@@ -1,143 +1,92 @@
+import type { ComponentProps, ReactNode } from 'react'
 import { cn } from '@langgenius/dify-ui/cn'
-import { useKeyPress } from 'ahooks'
-import * as React from 'react'
-import { useCallback, useEffect, useRef } from 'react'
-import { createPortal } from 'react-dom'
-import { useSegmentListContext } from '..'
+import {
+  Drawer,
+  DrawerBackdrop,
+  DrawerContent,
+  DrawerPopup,
+  DrawerPortal,
+  DrawerViewport,
+} from '@langgenius/dify-ui/drawer'
 
-type DrawerProps = {
+type DrawerSide = 'right' | 'left' | 'bottom' | 'top'
+type DrawerSwipeDirection = 'right' | 'left' | 'down' | 'up'
+type DrawerOpenChange = NonNullable<ComponentProps<typeof Drawer>['onOpenChange']>
+
+type CompletedDrawerProps = {
   open: boolean
   onClose: () => void
-  side?: 'right' | 'left' | 'bottom' | 'top'
-  showOverlay?: boolean
-  modal?: boolean // click outside event can pass through if modal is false
-  closeOnOutsideClick?: boolean
+  side?: DrawerSide
   panelClassName?: string
   panelContentClassName?: string
-  needCheckChunks?: boolean
+  modal?: boolean
+  children: ReactNode
 }
 
-const SIDE_POSITION_CLASS = {
-  right: 'right-0',
-  left: 'left-0',
-  bottom: 'bottom-0',
-  top: 'top-0',
-} as const
-
-function containsTarget(selector: string, target: Node | null): boolean {
-  const elements = document.querySelectorAll(selector)
-  return Array.from(elements).some(el => el?.contains(target))
+const SIDE_TO_SWIPE_DIRECTION: Record<DrawerSide, DrawerSwipeDirection> = {
+  right: 'right',
+  left: 'left',
+  bottom: 'down',
+  top: 'up',
 }
 
-function shouldReopenChunkDetail(
-  isClickOnChunk: boolean,
-  isClickOnChildChunk: boolean,
-  segmentModalOpen: boolean,
-  childChunkModalOpen: boolean,
-): boolean {
-  if (segmentModalOpen && isClickOnChildChunk)
-    return true
-  if (childChunkModalOpen && isClickOnChunk && !isClickOnChildChunk)
-    return true
-  return !isClickOnChunk && !isClickOnChildChunk
-}
+const DRAWER_POPUP_CLASS_NAME = [
+  'pointer-events-auto overflow-visible border-0 bg-transparent shadow-none',
+  'data-[swipe-direction=right]:h-screen data-[swipe-direction=right]:max-w-none data-[swipe-direction=right]:rounded-none data-[swipe-direction=right]:border-0',
+  'data-[swipe-direction=left]:h-screen data-[swipe-direction=left]:max-w-none data-[swipe-direction=left]:rounded-none data-[swipe-direction=left]:border-0',
+  'data-[swipe-direction=down]:max-h-none data-[swipe-direction=down]:rounded-none data-[swipe-direction=down]:border-0',
+  'data-[swipe-direction=up]:max-h-none data-[swipe-direction=up]:rounded-none data-[swipe-direction=up]:border-0',
+].join(' ')
 
-const Drawer = ({
+export function CompletedDrawer({
   open,
   onClose,
   side = 'right',
-  showOverlay = true,
-  modal = false,
-  needCheckChunks = false,
   children,
   panelClassName,
   panelContentClassName,
-}: React.PropsWithChildren<DrawerProps>) => {
-  const panelContentRef = useRef<HTMLDivElement>(null)
-  const currSegment = useSegmentListContext(s => s.currSegment)
-  const currChildChunk = useSegmentListContext(s => s.currChildChunk)
-
-  useKeyPress('esc', (e) => {
-    if (!open)
+  modal = false,
+}: CompletedDrawerProps) {
+  const handleOpenChange: DrawerOpenChange = (nextOpen, eventDetails) => {
+    if (nextOpen)
       return
-    e.preventDefault()
+
+    if (eventDetails.reason === 'focus-out' || eventDetails.reason === 'outside-press')
+      return
+
     onClose()
-  }, { exactMatch: true, useCapture: true })
-
-  const shouldCloseDrawer = useCallback((target: Node | null) => {
-    const panelContent = panelContentRef.current
-    if (!panelContent || !target)
-      return false
-
-    if (panelContent.contains(target))
-      return false
-
-    if (containsTarget('.image-previewer', target))
-      return false
-
-    if (!needCheckChunks)
-      return true
-
-    const isClickOnChunk = containsTarget('.chunk-card', target)
-    const isClickOnChildChunk = containsTarget('.child-chunk', target)
-    return shouldReopenChunkDetail(isClickOnChunk, isClickOnChildChunk, currSegment.showModal, currChildChunk.showModal)
-  }, [currSegment.showModal, currChildChunk.showModal, needCheckChunks])
-
-  const onDownCapture = useCallback((e: PointerEvent) => {
-    if (!open || modal)
-      return
-    const panelContent = panelContentRef.current
-    if (!panelContent)
-      return
-    const target = e.target as Node | null
-    if (shouldCloseDrawer(target))
-      queueMicrotask(onClose)
-  }, [shouldCloseDrawer, onClose, open, modal])
-
-  useEffect(() => {
-    window.addEventListener('pointerdown', onDownCapture, { capture: true })
-    return () =>
-      window.removeEventListener('pointerdown', onDownCapture, { capture: true })
-  }, [onDownCapture])
-
-  const isHorizontal = side === 'left' || side === 'right'
-
-  const overlayPointerEvents = modal && open ? 'pointer-events-auto' : 'pointer-events-none'
-
-  const content = (
-    <div className="pointer-events-none fixed inset-0 z-9999">
-      {showOverlay && (
-        <div
-          onClick={modal ? onClose : undefined}
-          aria-hidden="true"
-          className={cn(
-            'fixed inset-0 bg-black/30 opacity-0 transition-opacity duration-200 ease-in',
-            open && 'opacity-100',
-            overlayPointerEvents,
-          )}
-        />
-      )}
-      <div
-        role="dialog"
-        aria-modal={modal ? 'true' : 'false'}
-        className={cn(
-          'pointer-events-auto fixed flex flex-col',
-          SIDE_POSITION_CLASS[side],
-          isHorizontal ? 'h-screen' : 'w-screen',
-          panelClassName,
-        )}
-      >
-        <div ref={panelContentRef} className={cn('flex grow flex-col', panelContentClassName)}>
-          {children}
-        </div>
-      </div>
-    </div>
-  )
+  }
 
   if (!open)
     return null
 
-  return createPortal(content, document.body)
+  return (
+    <Drawer
+      open={open}
+      modal={modal}
+      swipeDirection={SIDE_TO_SWIPE_DIRECTION[side]}
+      disablePointerDismissal
+      onOpenChange={handleOpenChange}
+    >
+      <DrawerPortal>
+        {modal && (
+          <DrawerBackdrop
+            onClick={onClose}
+          />
+        )}
+        <DrawerViewport className="pointer-events-none">
+          <DrawerPopup
+            aria-modal={modal ? 'true' : 'false'}
+            className={cn(DRAWER_POPUP_CLASS_NAME, panelClassName)}
+          >
+            <DrawerContent
+              className={cn('flex grow flex-col overflow-visible p-0 pb-0', panelContentClassName)}
+            >
+              {children}
+            </DrawerContent>
+          </DrawerPopup>
+        </DrawerViewport>
+      </DrawerPortal>
+    </Drawer>
+  )
 }
-
-export default Drawer
diff --git a/web/app/components/datasets/documents/detail/completed/common/full-screen-drawer.tsx b/web/app/components/datasets/documents/detail/completed/common/full-screen-drawer.tsx
index 01cc264a76..28a0d89262 100644
--- a/web/app/components/datasets/documents/detail/completed/common/full-screen-drawer.tsx
+++ b/web/app/components/datasets/documents/detail/completed/common/full-screen-drawer.tsx
@@ -1,46 +1,39 @@
+import type { ReactNode } from 'react'
 import { cn } from '@langgenius/dify-ui/cn'
 import { noop } from 'es-toolkit/function'
-import * as React from 'react'
-import Drawer from './drawer'
+import { CompletedDrawer } from './drawer'
 
-type IFullScreenDrawerProps = {
-  isOpen: boolean
+type DocumentDetailDrawerProps = {
+  open: boolean
   onClose?: () => void
   fullScreen: boolean
-  showOverlay?: boolean
-  needCheckChunks?: boolean
   modal?: boolean
+  children: ReactNode
 }
 
-const FullScreenDrawer = ({
-  isOpen,
+export function DocumentDetailDrawer({
+  open,
   onClose = noop,
   fullScreen,
   children,
-  showOverlay = true,
-  needCheckChunks = false,
   modal = false,
-}: React.PropsWithChildren<IFullScreenDrawerProps>) => {
+}: DocumentDetailDrawerProps) {
   return (
-    <Drawer
-      open={isOpen}
+    <CompletedDrawer
+      open={open}
       onClose={onClose}
       panelClassName={cn(
         fullScreen
-          ? 'w-full'
-          : 'w-[568px] pt-16 pr-2 pb-2',
+          ? 'w-full data-[swipe-direction=left]:w-full data-[swipe-direction=right]:w-full'
+          : 'w-[568px] pt-16 pr-2 pb-2 data-[swipe-direction=left]:w-[568px] data-[swipe-direction=right]:w-[568px]',
       )}
       panelContentClassName={cn(
         'bg-components-panel-bg',
         !fullScreen && 'rounded-xl border-[0.5px] border-components-panel-border',
       )}
-      showOverlay={showOverlay}
-      needCheckChunks={needCheckChunks}
       modal={modal}
     >
       {children}
-    </Drawer>
+    </CompletedDrawer>
   )
 }
-
-export default FullScreenDrawer
diff --git a/web/app/components/datasets/documents/detail/completed/common/regeneration-modal.tsx b/web/app/components/datasets/documents/detail/completed/common/regeneration-modal.tsx
index 9b2a2e36ee..3999e113af 100644
--- a/web/app/components/datasets/documents/detail/completed/common/regeneration-modal.tsx
+++ b/web/app/components/datasets/documents/detail/completed/common/regeneration-modal.tsx
@@ -1,12 +1,16 @@
 import type { FC } from 'react'
+import {
+  AlertDialog,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogTitle,
+} from '@langgenius/dify-ui/alert-dialog'
 import { Button } from '@langgenius/dify-ui/button'
 import { RiLoader2Line } from '@remixicon/react'
 import { useCountDown } from 'ahooks'
-import { noop } from 'es-toolkit/function'
 import * as React from 'react'
 import { useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import Modal from '@/app/components/base/modal'
 import { useEventEmitterContextContext } from '@/context/event-emitter'
 
 type IDefaultContentProps = {
@@ -23,8 +27,8 @@ const DefaultContent: FC<IDefaultContentProps> = React.memo(({
   return (
     <>
       <div className="pb-4">
-        <span className="title-2xl-semi-bold text-text-primary">{t('segment.regenerationConfirmTitle', { ns: 'datasetDocuments' })}</span>
-        <p className="system-md-regular text-text-secondary">{t('segment.regenerationConfirmMessage', { ns: 'datasetDocuments' })}</p>
+        <AlertDialogTitle className="title-2xl-semi-bold text-text-primary">{t('segment.regenerationConfirmTitle', { ns: 'datasetDocuments' })}</AlertDialogTitle>
+        <AlertDialogDescription className="system-md-regular text-text-secondary">{t('segment.regenerationConfirmMessage', { ns: 'datasetDocuments' })}</AlertDialogDescription>
       </div>
       <div className="flex justify-end gap-x-2 pt-6">
         <Button onClick={onCancel}>
@@ -123,11 +127,13 @@ const RegenerationModal: FC<IRegenerationModalProps> = ({
   })
 
   return (
-    <Modal isShow={isShow} onClose={noop} className="max-w-[480px]! rounded-2xl!" wrapperClassName="z-10000!">
-      {!loading && !updateSucceeded && <DefaultContent onCancel={onCancel} onConfirm={onConfirm} />}
-      {loading && !updateSucceeded && <RegeneratingContent />}
-      {!loading && updateSucceeded && <RegenerationCompletedContent onClose={onClose} />}
-    </Modal>
+    <AlertDialog open={isShow}>
+      <AlertDialogContent className="w-[calc(100vw-2rem)] max-w-[480px]! overflow-hidden! rounded-2xl! border-none p-6 text-left align-middle shadow-xl">
+        {!loading && !updateSucceeded && <DefaultContent onCancel={onCancel} onConfirm={onConfirm} />}
+        {loading && !updateSucceeded && <RegeneratingContent />}
+        {!loading && updateSucceeded && <RegenerationCompletedContent onClose={onClose} />}
+      </AlertDialogContent>
+    </AlertDialog>
   )
 }
 
diff --git a/web/app/components/datasets/documents/detail/completed/components/__tests__/drawer-group.spec.tsx b/web/app/components/datasets/documents/detail/completed/components/__tests__/drawer-group.spec.tsx
index dfcb02215c..4e3c935f0a 100644
--- a/web/app/components/datasets/documents/detail/completed/components/__tests__/drawer-group.spec.tsx
+++ b/web/app/components/datasets/documents/detail/completed/components/__tests__/drawer-group.spec.tsx
@@ -2,16 +2,16 @@ import type { ChildChunkDetail, SegmentDetailModel } from '@/models/datasets'
 import { render, screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { ChunkingMode } from '@/models/datasets'
-import DrawerGroup from '../drawer-group'
+import { DrawerGroup } from '../drawer-group'
 
 vi.mock('../../common/full-screen-drawer', () => ({
-  default: ({ isOpen, children }: { isOpen: boolean, children: React.ReactNode }) => (
-    isOpen ? <div data-testid="full-screen-drawer">{children}</div> : null
+  DocumentDetailDrawer: ({ open, children, modal = false }: { open: boolean, children: React.ReactNode, modal?: boolean }) => (
+    open ? <div data-testid="document-detail-drawer" data-modal={modal}>{children}</div> : null
   ),
 }))
 
 vi.mock('../../segment-detail', () => ({
-  default: () => <div data-testid="segment-detail" />,
+  SegmentDetail: () => <div data-testid="segment-detail" />,
 }))
 
 vi.mock('../../child-segment-detail', () => ({
@@ -31,8 +31,6 @@ describe('DrawerGroup', () => {
     currSegment: { segInfo: undefined, showModal: false, isEditMode: false },
     onCloseSegmentDetail: vi.fn(),
     onUpdateSegment: vi.fn(),
-    isRegenerationModalOpen: false,
-    setIsRegenerationModalOpen: vi.fn(),
     showNewSegmentModal: false,
     onCloseNewSegmentModal: vi.fn(),
     onSaveNewSegment: vi.fn(),
@@ -55,7 +53,7 @@ describe('DrawerGroup', () => {
 
   it('should render nothing when all modals are closed', () => {
     const { container } = render(<DrawerGroup {...defaultProps} />)
-    expect(container.querySelector('[data-testid="full-screen-drawer"]')).toBeNull()
+    expect(container.querySelector('[data-testid="document-detail-drawer"]')).toBeNull()
   })
 
   it('should render segment detail when segment modal is open', () => {
@@ -66,6 +64,7 @@ describe('DrawerGroup', () => {
       />,
     )
     expect(screen.getByTestId('segment-detail')).toBeInTheDocument()
+    expect(screen.getByTestId('document-detail-drawer')).toHaveAttribute('data-modal', 'false')
   })
 
   it('should render new segment modal when showNewSegmentModal is true', () => {
@@ -73,6 +72,7 @@ describe('DrawerGroup', () => {
       <DrawerGroup {...defaultProps} showNewSegmentModal={true} />,
     )
     expect(screen.getByTestId('new-segment')).toBeInTheDocument()
+    expect(screen.getByTestId('document-detail-drawer')).toHaveAttribute('data-modal', 'true')
   })
 
   it('should render child segment detail when child chunk modal is open', () => {
@@ -83,6 +83,7 @@ describe('DrawerGroup', () => {
       />,
     )
     expect(screen.getByTestId('child-segment-detail')).toBeInTheDocument()
+    expect(screen.getByTestId('document-detail-drawer')).toHaveAttribute('data-modal', 'false')
   })
 
   it('should render new child segment modal when showNewChildSegmentModal is true', () => {
@@ -90,6 +91,7 @@ describe('DrawerGroup', () => {
       <DrawerGroup {...defaultProps} showNewChildSegmentModal={true} />,
     )
     expect(screen.getByTestId('new-child-segment')).toBeInTheDocument()
+    expect(screen.getByTestId('document-detail-drawer')).toHaveAttribute('data-modal', 'true')
   })
 
   it('should render multiple drawers simultaneously', () => {
diff --git a/web/app/components/datasets/documents/detail/completed/components/__tests__/menu-bar.spec.tsx b/web/app/components/datasets/documents/detail/completed/components/__tests__/menu-bar.spec.tsx
index 9c170f3a32..f3bb01a804 100644
--- a/web/app/components/datasets/documents/detail/completed/components/__tests__/menu-bar.spec.tsx
+++ b/web/app/components/datasets/documents/detail/completed/components/__tests__/menu-bar.spec.tsx
@@ -44,9 +44,9 @@ describe('MenuBar', () => {
   })
 
   it('should render checkbox', () => {
-    const { container } = render(<MenuBar {...defaultProps} />)
-    const checkbox = container.querySelector('[class*="shrink-0"]')
-    expect(checkbox).toBeInTheDocument()
+    render(<MenuBar {...defaultProps} />)
+
+    expect(screen.getByRole('checkbox', { name: 'common.operation.selectAll' })).toBeInTheDocument()
   })
 
   it('should call onInputChange when input changes', () => {
@@ -69,7 +69,7 @@ describe('MenuBar', () => {
 
   it('should call onInputChange with empty string when input is cleared', () => {
     render(<MenuBar {...defaultProps} inputValue="some text" />)
-    const clearButton = screen.getByTestId('input-clear')
+    const clearButton = screen.getByRole('button', { name: 'common.operation.clear' })
     fireEvent.click(clearButton)
     expect(defaultProps.onInputChange).toHaveBeenCalledWith('')
   })
diff --git a/web/app/components/datasets/documents/detail/completed/components/drawer-group.tsx b/web/app/components/datasets/documents/detail/completed/components/drawer-group.tsx
index 04f993b98c..d79433e0ff 100644
--- a/web/app/components/datasets/documents/detail/completed/components/drawer-group.tsx
+++ b/web/app/components/datasets/documents/detail/completed/components/drawer-group.tsx
@@ -1,15 +1,13 @@
 'use client'
-import type { FC } from 'react'
 import type { FileEntity } from '@/app/components/datasets/common/image-uploader/types'
 import type { ChildChunkDetail, ChunkingMode, SegmentDetailModel } from '@/models/datasets'
 import NewSegment from '@/app/components/datasets/documents/detail/new-segment'
 import ChildSegmentDetail from '../child-segment-detail'
-import FullScreenDrawer from '../common/full-screen-drawer'
+import { DocumentDetailDrawer } from '../common/full-screen-drawer'
 import NewChildSegment from '../new-child-segment'
-import SegmentDetail from '../segment-detail'
+import { SegmentDetail } from '../segment-detail'
 
 type DrawerGroupProps = {
-  // Segment detail drawer
   currSegment: {
     segInfo?: SegmentDetailModel
     showModal: boolean
@@ -25,14 +23,10 @@ type DrawerGroupProps = {
     summary?: string,
     needRegenerate?: boolean,
   ) => Promise<void>
-  isRegenerationModalOpen: boolean
-  setIsRegenerationModalOpen: (open: boolean) => void
-  // New segment drawer
   showNewSegmentModal: boolean
   onCloseNewSegmentModal: () => void
   onSaveNewSegment: () => void
   viewNewlyAddedChunk: () => void
-  // Child segment detail drawer
   currChildChunk: {
     childChunkInfo?: ChildChunkDetail
     showModal: boolean
@@ -40,52 +34,39 @@ type DrawerGroupProps = {
   currChunkId: string
   onCloseChildSegmentDetail: () => void
   onUpdateChildChunk: (segmentId: string, childChunkId: string, content: string) => Promise<void>
-  // New child segment drawer
   showNewChildSegmentModal: boolean
   onCloseNewChildChunkModal: () => void
   onSaveNewChildChunk: (newChildChunk?: ChildChunkDetail) => void
   viewNewlyAddedChildChunk: () => void
-  // Common props
   fullScreen: boolean
   docForm: ChunkingMode
 }
 
-const DrawerGroup: FC<DrawerGroupProps> = ({
-  // Segment detail drawer
+export function DrawerGroup({
   currSegment,
   onCloseSegmentDetail,
   onUpdateSegment,
-  isRegenerationModalOpen,
-  setIsRegenerationModalOpen,
-  // New segment drawer
   showNewSegmentModal,
   onCloseNewSegmentModal,
   onSaveNewSegment,
   viewNewlyAddedChunk,
-  // Child segment detail drawer
   currChildChunk,
   currChunkId,
   onCloseChildSegmentDetail,
   onUpdateChildChunk,
-  // New child segment drawer
   showNewChildSegmentModal,
   onCloseNewChildChunkModal,
   onSaveNewChildChunk,
   viewNewlyAddedChildChunk,
-  // Common props
   fullScreen,
   docForm,
-}) => {
+}: DrawerGroupProps) {
   return (
     <>
-      {/* Edit or view segment detail */}
-      <FullScreenDrawer
-        isOpen={currSegment.showModal}
+      <DocumentDetailDrawer
+        open={currSegment.showModal}
         fullScreen={fullScreen}
         onClose={onCloseSegmentDetail}
-        showOverlay={false}
-        needCheckChunks
-        modal={isRegenerationModalOpen}
       >
         <SegmentDetail
           key={currSegment.segInfo?.id}
@@ -94,13 +75,11 @@ const DrawerGroup: FC<DrawerGroupProps> = ({
           isEditMode={currSegment.isEditMode}
           onUpdate={onUpdateSegment}
           onCancel={onCloseSegmentDetail}
-          onModalStateChange={setIsRegenerationModalOpen}
         />
-      </FullScreenDrawer>
+      </DocumentDetailDrawer>
 
-      {/* Create New Segment */}
-      <FullScreenDrawer
-        isOpen={showNewSegmentModal}
+      <DocumentDetailDrawer
+        open={showNewSegmentModal}
         fullScreen={fullScreen}
         onClose={onCloseNewSegmentModal}
         modal
@@ -111,15 +90,12 @@ const DrawerGroup: FC<DrawerGroupProps> = ({
           onSave={onSaveNewSegment}
           viewNewlyAddedChunk={viewNewlyAddedChunk}
         />
-      </FullScreenDrawer>
+      </DocumentDetailDrawer>
 
-      {/* Edit or view child segment detail */}
-      <FullScreenDrawer
-        isOpen={currChildChunk.showModal}
+      <DocumentDetailDrawer
+        open={currChildChunk.showModal}
         fullScreen={fullScreen}
         onClose={onCloseChildSegmentDetail}
-        showOverlay={false}
-        needCheckChunks
       >
         <ChildSegmentDetail
           key={currChildChunk.childChunkInfo?.id}
@@ -129,11 +105,10 @@ const DrawerGroup: FC<DrawerGroupProps> = ({
           onUpdate={onUpdateChildChunk}
           onCancel={onCloseChildSegmentDetail}
         />
-      </FullScreenDrawer>
+      </DocumentDetailDrawer>
 
-      {/* Create New Child Segment */}
-      <FullScreenDrawer
-        isOpen={showNewChildSegmentModal}
+      <DocumentDetailDrawer
+        open={showNewChildSegmentModal}
         fullScreen={fullScreen}
         onClose={onCloseNewChildChunkModal}
         modal
@@ -144,9 +119,7 @@ const DrawerGroup: FC<DrawerGroupProps> = ({
           onSave={onSaveNewChildChunk}
           viewNewlyAddedChildChunk={viewNewlyAddedChildChunk}
         />
-      </FullScreenDrawer>
+      </DocumentDetailDrawer>
     </>
   )
 }
-
-export default DrawerGroup
diff --git a/web/app/components/datasets/documents/detail/completed/components/index.ts b/web/app/components/datasets/documents/detail/completed/components/index.ts
deleted file mode 100644
index 67bd6ae643..0000000000
--- a/web/app/components/datasets/documents/detail/completed/components/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { default as DrawerGroup } from './drawer-group'
-export { default as MenuBar } from './menu-bar'
-export { FullDocModeContent, GeneralModeContent } from './segment-list-content'
diff --git a/web/app/components/datasets/documents/detail/completed/components/menu-bar.tsx b/web/app/components/datasets/documents/detail/completed/components/menu-bar.tsx
index 6d0cf8ddc6..4d0f48f223 100644
--- a/web/app/components/datasets/documents/detail/completed/components/menu-bar.tsx
+++ b/web/app/components/datasets/documents/detail/completed/components/menu-bar.tsx
@@ -1,8 +1,9 @@
 'use client'
 import type { FC } from 'react'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import { cn } from '@langgenius/dify-ui/cn'
 import { Select, SelectContent, SelectItem, SelectItemIndicator, SelectItemText, SelectTrigger } from '@langgenius/dify-ui/select'
-import Checkbox from '@/app/components/base/checkbox'
+import { useTranslation } from 'react-i18next'
 import Divider from '@/app/components/base/divider'
 import Input from '@/app/components/base/input'
 import DisplayToggle from '../display-toggle'
@@ -43,6 +44,7 @@ const MenuBar: FC<MenuBarProps> = ({
   isCollapsed,
   toggleCollapsed,
 }) => {
+  const { t } = useTranslation()
   const selectedStatus = statusList.find(item => item.value === selectDefaultValue) ?? null
 
   return (
@@ -51,7 +53,8 @@ const MenuBar: FC<MenuBarProps> = ({
         className="shrink-0"
         checked={isAllSelected}
         indeterminate={!isAllSelected && isSomeSelected}
-        onCheck={onSelectedAll}
+        aria-label={t('operation.selectAll', { ns: 'common' })}
+        onCheckedChange={() => onSelectedAll()}
         disabled={isLoading}
       />
       <div className="flex-1 pl-5 system-sm-semibold-uppercase text-text-secondary">{totalText}</div>
diff --git a/web/app/components/datasets/documents/detail/completed/display-toggle.tsx b/web/app/components/datasets/documents/detail/completed/display-toggle.tsx
index 6e961ac43f..6735399cd2 100644
--- a/web/app/components/datasets/documents/detail/completed/display-toggle.tsx
+++ b/web/app/components/datasets/documents/detail/completed/display-toggle.tsx
@@ -1,9 +1,9 @@
 import type { FC } from 'react'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { RiLineHeight } from '@remixicon/react'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import { Collapse } from '@/app/components/base/icons/src/vender/knowledge'
-import Tooltip from '@/app/components/base/tooltip'
 
 type DisplayToggleProps = {
   isCollapsed: boolean
@@ -15,25 +15,30 @@ const DisplayToggle: FC<DisplayToggleProps> = ({
   toggleCollapsed,
 }) => {
   const { t } = useTranslation()
+  const label = isCollapsed ? t('segment.expandChunks', { ns: 'datasetDocuments' }) : t('segment.collapseChunks', { ns: 'datasetDocuments' })
 
   return (
-    <Tooltip
-      popupContent={isCollapsed ? t('segment.expandChunks', { ns: 'datasetDocuments' }) : t('segment.collapseChunks', { ns: 'datasetDocuments' })}
-      popupClassName="text-text-secondary system-xs-medium border-[0.5px] border-components-panel-border"
-    >
-      <button
-        type="button"
-        className="flex items-center justify-center rounded-lg border-[0.5px] border-components-button-secondary-border
-        bg-components-button-secondary-bg p-2 shadow-xs shadow-shadow-shadow-3 backdrop-blur-[5px]"
-        onClick={toggleCollapsed}
-      >
-        {
-          isCollapsed
-            ? <RiLineHeight className="h-4 w-4 text-components-button-secondary-text" />
-            : <Collapse className="h-4 w-4 text-components-button-secondary-text" />
-        }
-      </button>
-
+    <Tooltip>
+      <TooltipTrigger
+        render={(
+          <button
+            type="button"
+            aria-label={label}
+            className="flex items-center justify-center rounded-lg border-[0.5px] border-components-button-secondary-border
+            bg-components-button-secondary-bg p-2 shadow-xs shadow-shadow-shadow-3 backdrop-blur-[5px]"
+            onClick={toggleCollapsed}
+          >
+            {
+              isCollapsed
+                ? <RiLineHeight className="h-4 w-4 text-components-button-secondary-text" />
+                : <Collapse className="h-4 w-4 text-components-button-secondary-text" />
+            }
+          </button>
+        )}
+      />
+      <TooltipContent className="border-[0.5px] border-components-panel-border system-xs-medium text-text-secondary">
+        {label}
+      </TooltipContent>
     </Tooltip>
   )
 }
diff --git a/web/app/components/datasets/documents/detail/completed/hooks/__tests__/use-modal-state.spec.ts b/web/app/components/datasets/documents/detail/completed/hooks/__tests__/use-modal-state.spec.ts
index 57e7ae5d5e..0f887083c2 100644
--- a/web/app/components/datasets/documents/detail/completed/hooks/__tests__/use-modal-state.spec.ts
+++ b/web/app/components/datasets/documents/detail/completed/hooks/__tests__/use-modal-state.spec.ts
@@ -1,7 +1,9 @@
 import type { ChildChunkDetail, SegmentDetailModel } from '@/models/datasets'
 import { act, renderHook } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { useModalState } from '../use-modal-state'
+import * as modalStateHooks from '../use-modal-state'
+
+const renderDatasetModalState = modalStateHooks.useModalState
 
 describe('useModalState', () => {
   const onNewSegmentModalChange = vi.fn()
@@ -10,22 +12,21 @@ describe('useModalState', () => {
     vi.clearAllMocks()
   })
 
-  const renderUseModalState = () =>
-    renderHook(() => useModalState({ onNewSegmentModalChange }))
+  const renderModalState = () =>
+    renderHook(() => renderDatasetModalState({ onNewSegmentModalChange }))
 
   it('should initialize with all modals closed', () => {
-    const { result } = renderUseModalState()
+    const { result } = renderModalState()
 
     expect(result.current.currSegment.showModal).toBe(false)
     expect(result.current.currChildChunk.showModal).toBe(false)
     expect(result.current.showNewChildSegmentModal).toBe(false)
-    expect(result.current.isRegenerationModalOpen).toBe(false)
     expect(result.current.fullScreen).toBe(false)
     expect(result.current.isCollapsed).toBe(true)
   })
 
   it('should open segment detail on card click', () => {
-    const { result } = renderUseModalState()
+    const { result } = renderModalState()
     const detail = { id: 'seg-1', content: 'test' } as unknown as SegmentDetailModel
 
     act(() => {
@@ -37,8 +38,25 @@ describe('useModalState', () => {
     expect(result.current.currSegment.isEditMode).toBe(true)
   })
 
+  it('should close child detail when opening segment detail', () => {
+    const { result } = renderModalState()
+    const childDetail = { id: 'child-1', segment_id: 'seg-1' } as unknown as ChildChunkDetail
+    const segmentDetail = { id: 'seg-1' } as unknown as SegmentDetailModel
+
+    act(() => {
+      result.current.onClickSlice(childDetail)
+    })
+    act(() => {
+      result.current.onClickCard(segmentDetail)
+    })
+
+    expect(result.current.currSegment.showModal).toBe(true)
+    expect(result.current.currSegment.segInfo).toBe(segmentDetail)
+    expect(result.current.currChildChunk.showModal).toBe(false)
+  })
+
   it('should close segment detail and reset fullscreen', () => {
-    const { result } = renderUseModalState()
+    const { result } = renderModalState()
 
     act(() => {
       result.current.onClickCard({ id: 'seg-1' } as unknown as SegmentDetailModel)
@@ -55,7 +73,7 @@ describe('useModalState', () => {
   })
 
   it('should open child segment detail on slice click', () => {
-    const { result } = renderUseModalState()
+    const { result } = renderModalState()
     const childDetail = { id: 'child-1', segment_id: 'seg-1' } as unknown as ChildChunkDetail
 
     act(() => {
@@ -67,8 +85,25 @@ describe('useModalState', () => {
     expect(result.current.currChunkId).toBe('seg-1')
   })
 
+  it('should close segment detail when opening child detail', () => {
+    const { result } = renderModalState()
+    const segmentDetail = { id: 'seg-1' } as unknown as SegmentDetailModel
+    const childDetail = { id: 'child-1', segment_id: 'seg-1' } as unknown as ChildChunkDetail
+
+    act(() => {
+      result.current.onClickCard(segmentDetail)
+    })
+    act(() => {
+      result.current.onClickSlice(childDetail)
+    })
+
+    expect(result.current.currSegment.showModal).toBe(false)
+    expect(result.current.currChildChunk.showModal).toBe(true)
+    expect(result.current.currChildChunk.childChunkInfo).toBe(childDetail)
+  })
+
   it('should close child segment detail', () => {
-    const { result } = renderUseModalState()
+    const { result } = renderModalState()
 
     act(() => {
       result.current.onClickSlice({ id: 'c1', segment_id: 's1' } as unknown as ChildChunkDetail)
@@ -81,7 +116,7 @@ describe('useModalState', () => {
   })
 
   it('should handle new child chunk modal', () => {
-    const { result } = renderUseModalState()
+    const { result } = renderModalState()
 
     act(() => {
       result.current.handleAddNewChildChunk('parent-chunk-1')
@@ -98,7 +133,7 @@ describe('useModalState', () => {
   })
 
   it('should close new segment modal and notify parent', () => {
-    const { result } = renderUseModalState()
+    const { result } = renderModalState()
 
     act(() => {
       result.current.onCloseNewSegmentModal()
@@ -108,7 +143,7 @@ describe('useModalState', () => {
   })
 
   it('should toggle full screen', () => {
-    const { result } = renderUseModalState()
+    const { result } = renderModalState()
 
     act(() => {
       result.current.toggleFullScreen()
@@ -122,7 +157,7 @@ describe('useModalState', () => {
   })
 
   it('should toggle collapsed', () => {
-    const { result } = renderUseModalState()
+    const { result } = renderModalState()
 
     act(() => {
       result.current.toggleCollapsed()
@@ -134,13 +169,4 @@ describe('useModalState', () => {
     })
     expect(result.current.isCollapsed).toBe(true)
   })
-
-  it('should set regeneration modal state', () => {
-    const { result } = renderUseModalState()
-
-    act(() => {
-      result.current.setIsRegenerationModalOpen(true)
-    })
-    expect(result.current.isRegenerationModalOpen).toBe(true)
-  })
 })
diff --git a/web/app/components/datasets/documents/detail/completed/hooks/__tests__/use-segment-list-data.spec.ts b/web/app/components/datasets/documents/detail/completed/hooks/__tests__/use-segment-list-data.spec.ts
index 5b8f8d7e53..5616af241d 100644
--- a/web/app/components/datasets/documents/detail/completed/hooks/__tests__/use-segment-list-data.spec.ts
+++ b/web/app/components/datasets/documents/detail/completed/hooks/__tests__/use-segment-list-data.spec.ts
@@ -1,11 +1,12 @@
 import type { FileEntity } from '@/app/components/datasets/common/image-uploader/types'
 import type { DocumentContextValue } from '@/app/components/datasets/documents/detail/context'
 import type { ChunkingMode, ParentMode, SegmentDetailModel, SegmentsResponse } from '@/models/datasets'
+import type { SegmentImportStatus } from '@/types/dataset'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { act, renderHook } from '@testing-library/react'
 import * as React from 'react'
 import { ChunkingMode as ChunkingModeEnum } from '@/models/datasets'
-import { ProcessStatus } from '../../../segment-add'
+import { segmentImportStatus } from '@/types/dataset'
 import { useSegmentListData } from '../use-segment-list-data'
 
 // Type for mutation callbacks
@@ -176,7 +177,7 @@ const defaultOptions = {
   searchValue: '',
   selectedStatus: 'all' as boolean | 'all',
   selectedSegmentIds: [] as string[],
-  importStatus: undefined as ProcessStatus | string | undefined,
+  importStatus: undefined as SegmentImportStatus | undefined,
   currentPage: 1,
   limit: 10,
   onCloseSegmentDetail: vi.fn(),
@@ -689,7 +690,7 @@ describe('useSegmentListData', () => {
 
       renderHook(() => useSegmentListData({
         ...defaultOptions,
-        importStatus: ProcessStatus.COMPLETED,
+        importStatus: segmentImportStatus.completed,
         clearSelection,
       }), {
         wrapper: createWrapper(),
diff --git a/web/app/components/datasets/documents/detail/completed/hooks/use-modal-state.ts b/web/app/components/datasets/documents/detail/completed/hooks/use-modal-state.ts
index fa314bec25..71e21a5a80 100644
--- a/web/app/components/datasets/documents/detail/completed/hooks/use-modal-state.ts
+++ b/web/app/components/datasets/documents/detail/completed/hooks/use-modal-state.ts
@@ -13,29 +13,20 @@ type CurrChildChunkType = {
 }
 
 type UseModalStateReturn = {
-  // Segment detail modal
   currSegment: CurrSegmentType
   onClickCard: (detail: SegmentDetailModel, isEditMode?: boolean) => void
   onCloseSegmentDetail: () => void
-  // Child segment detail modal
   currChildChunk: CurrChildChunkType
   currChunkId: string
   onClickSlice: (detail: ChildChunkDetail) => void
   onCloseChildSegmentDetail: () => void
-  // New segment modal
   onCloseNewSegmentModal: () => void
-  // New child segment modal
   showNewChildSegmentModal: boolean
   handleAddNewChildChunk: (parentChunkId: string) => void
   onCloseNewChildChunkModal: () => void
-  // Regeneration modal
-  isRegenerationModalOpen: boolean
-  setIsRegenerationModalOpen: (open: boolean) => void
-  // Full screen
   fullScreen: boolean
   toggleFullScreen: () => void
   setFullScreen: (fullScreen: boolean) => void
-  // Collapsed state
   isCollapsed: boolean
   toggleCollapsed: () => void
 }
@@ -47,25 +38,15 @@ type UseModalStateOptions = {
 export const useModalState = (options: UseModalStateOptions): UseModalStateReturn => {
   const { onNewSegmentModalChange } = options
 
-  // Segment detail modal state
   const [currSegment, setCurrSegment] = useState<CurrSegmentType>({ showModal: false })
-
-  // Child segment detail modal state
   const [currChildChunk, setCurrChildChunk] = useState<CurrChildChunkType>({ showModal: false })
   const [currChunkId, setCurrChunkId] = useState('')
-
-  // New child segment modal state
   const [showNewChildSegmentModal, setShowNewChildSegmentModal] = useState(false)
-
-  // Regeneration modal state
-  const [isRegenerationModalOpen, setIsRegenerationModalOpen] = useState(false)
-
-  // Display state
   const [fullScreen, setFullScreen] = useState(false)
   const [isCollapsed, setIsCollapsed] = useState(true)
 
-  // Segment detail handlers
   const onClickCard = useCallback((detail: SegmentDetailModel, isEditMode = false) => {
+    setCurrChildChunk({ showModal: false })
     setCurrSegment({ segInfo: detail, showModal: true, isEditMode })
   }, [])
 
@@ -74,8 +55,8 @@ export const useModalState = (options: UseModalStateOptions): UseModalStateRetur
     setFullScreen(false)
   }, [])
 
-  // Child segment detail handlers
   const onClickSlice = useCallback((detail: ChildChunkDetail) => {
+    setCurrSegment({ showModal: false })
     setCurrChildChunk({ childChunkInfo: detail, showModal: true })
     setCurrChunkId(detail.segment_id)
   }, [])
@@ -85,13 +66,11 @@ export const useModalState = (options: UseModalStateOptions): UseModalStateRetur
     setFullScreen(false)
   }, [])
 
-  // New segment modal handlers
   const onCloseNewSegmentModal = useCallback(() => {
     onNewSegmentModalChange(false)
     setFullScreen(false)
   }, [onNewSegmentModalChange])
 
-  // New child segment modal handlers
   const handleAddNewChildChunk = useCallback((parentChunkId: string) => {
     setShowNewChildSegmentModal(true)
     setCurrChunkId(parentChunkId)
@@ -102,7 +81,6 @@ export const useModalState = (options: UseModalStateOptions): UseModalStateRetur
     setFullScreen(false)
   }, [])
 
-  // Display handlers - handles both direct calls and click events
   const toggleFullScreen = useCallback(() => {
     setFullScreen(prev => !prev)
   }, [])
@@ -112,29 +90,20 @@ export const useModalState = (options: UseModalStateOptions): UseModalStateRetur
   }, [])
 
   return {
-    // Segment detail modal
     currSegment,
     onClickCard,
     onCloseSegmentDetail,
-    // Child segment detail modal
     currChildChunk,
     currChunkId,
     onClickSlice,
     onCloseChildSegmentDetail,
-    // New segment modal
     onCloseNewSegmentModal,
-    // New child segment modal
     showNewChildSegmentModal,
     handleAddNewChildChunk,
     onCloseNewChildChunkModal,
-    // Regeneration modal
-    isRegenerationModalOpen,
-    setIsRegenerationModalOpen,
-    // Full screen
     fullScreen,
     toggleFullScreen,
     setFullScreen,
-    // Collapsed state
     isCollapsed,
     toggleCollapsed,
   }
diff --git a/web/app/components/datasets/documents/detail/completed/hooks/use-segment-list-data.ts b/web/app/components/datasets/documents/detail/completed/hooks/use-segment-list-data.ts
index 1c55d12d15..22bdecccb4 100644
--- a/web/app/components/datasets/documents/detail/completed/hooks/use-segment-list-data.ts
+++ b/web/app/components/datasets/documents/detail/completed/hooks/use-segment-list-data.ts
@@ -1,5 +1,6 @@
 import type { FileEntity } from '@/app/components/datasets/common/image-uploader/types'
 import type { SegmentDetailModel, SegmentsResponse, SegmentUpdater } from '@/models/datasets'
+import type { SegmentImportStatus } from '@/types/dataset'
 import { toast } from '@langgenius/dify-ui/toast'
 import { useQueryClient } from '@tanstack/react-query'
 import { useCallback, useEffect, useMemo, useRef } from 'react'
@@ -9,16 +10,16 @@ import { ChunkingMode } from '@/models/datasets'
 import { usePathname } from '@/next/navigation'
 import { useChunkListAllKey, useChunkListDisabledKey, useChunkListEnabledKey, useDeleteSegment, useDisableSegment, useEnableSegment, useSegmentList, useSegmentListKey, useUpdateSegment } from '@/service/knowledge/use-segment'
 import { useInvalid } from '@/service/use-base'
+import { segmentImportStatus } from '@/types/dataset'
 import { formatNumber } from '@/utils/format'
 import { useDocumentContext } from '../../context'
-import { ProcessStatus } from '../../segment-add'
 
 const DEFAULT_LIMIT = 10
 type UseSegmentListDataOptions = {
   searchValue: string
   selectedStatus: boolean | 'all'
   selectedSegmentIds: string[]
-  importStatus: ProcessStatus | string | undefined
+  importStatus: SegmentImportStatus | undefined
   currentPage: number
   limit: number
   onCloseSegmentDetail: () => void
@@ -92,7 +93,7 @@ export const useSegmentListData = (options: UseSegmentListDataOptions): UseSegme
   }, [pathname])
   // Reset list on import completion
   useEffect(() => {
-    if (importStatus === ProcessStatus.COMPLETED) {
+    if (importStatus === segmentImportStatus.completed) {
       clearSelection()
       invalidSegmentList()
     }
diff --git a/web/app/components/datasets/documents/detail/completed/index.tsx b/web/app/components/datasets/documents/detail/completed/index.tsx
index 0251919e26..d38dbb3bfe 100644
--- a/web/app/components/datasets/documents/detail/completed/index.tsx
+++ b/web/app/components/datasets/documents/detail/completed/index.tsx
@@ -1,7 +1,7 @@
 'use client'
 import type { FC } from 'react'
-import type { ProcessStatus } from '../segment-add'
 import type { SegmentListContextValue } from './segment-list-context'
+import type { SegmentImportStatus } from '@/types/dataset'
 import { useCallback, useMemo, useState } from 'react'
 import Divider from '@/app/components/base/divider'
 import Pagination from '@/app/components/base/pagination'
@@ -13,7 +13,9 @@ import {
 import { useInvalid } from '@/service/use-base'
 import { useDocumentContext } from '../context'
 import BatchAction from './common/batch-action'
-import { DrawerGroup, FullDocModeContent, GeneralModeContent, MenuBar } from './components'
+import { DrawerGroup } from './components/drawer-group'
+import MenuBar from './components/menu-bar'
+import { FullDocModeContent, GeneralModeContent } from './components/segment-list-content'
 import {
   useChildSegmentData,
   useModalState,
@@ -32,7 +34,7 @@ type ICompletedProps = {
   embeddingAvailable: boolean
   showNewSegmentModal: boolean
   onNewSegmentModalChange: (state: boolean) => void
-  importStatus: ProcessStatus | string | undefined
+  importStatus: SegmentImportStatus | undefined
   archived?: boolean
 }
 
@@ -225,8 +227,6 @@ const Completed: FC<ICompletedProps> = ({
           currSegment={modalState.currSegment}
           onCloseSegmentDetail={modalState.onCloseSegmentDetail}
           onUpdateSegment={segmentListDataHook.handleUpdateSegment}
-          isRegenerationModalOpen={modalState.isRegenerationModalOpen}
-          setIsRegenerationModalOpen={modalState.setIsRegenerationModalOpen}
           showNewSegmentModal={showNewSegmentModal}
           onCloseNewSegmentModal={modalState.onCloseNewSegmentModal}
           onSaveNewSegment={segmentListDataHook.resetList}
diff --git a/web/app/components/datasets/documents/detail/completed/new-child-segment.tsx b/web/app/components/datasets/documents/detail/completed/new-child-segment.tsx
index 386757a5b2..aac2ad8348 100644
--- a/web/app/components/datasets/documents/detail/completed/new-child-segment.tsx
+++ b/web/app/components/datasets/documents/detail/completed/new-child-segment.tsx
@@ -100,7 +100,7 @@ const NewChildSegmentModal: FC<NewChildSegmentModalProps> = ({
         <div className="flex items-center">
           {fullScreen && (
             <>
-              <AddAnother className="mr-3" isChecked={addAnother} onCheck={() => setAddAnother(!addAnother)} />
+              <AddAnother className="mr-3" checked={addAnother} onCheckedChange={setAddAnother} />
               <ActionButtons
                 handleCancel={handleCancel.bind(null, 'esc')}
                 handleSave={handleSave}
@@ -111,12 +111,22 @@ const NewChildSegmentModal: FC<NewChildSegmentModalProps> = ({
               <Divider type="vertical" className="mr-2 ml-4 h-3.5 bg-divider-regular" />
             </>
           )}
-          <div className="mr-1 flex h-8 w-8 cursor-pointer items-center justify-center p-1.5" onClick={toggleFullScreen}>
-            <RiExpandDiagonalLine className="h-4 w-4 text-text-tertiary" />
-          </div>
-          <div className="flex h-8 w-8 cursor-pointer items-center justify-center p-1.5" onClick={handleCancel.bind(null, 'esc')}>
-            <RiCloseLine className="h-4 w-4 text-text-tertiary" />
-          </div>
+          <button
+            type="button"
+            aria-label={t('operation.zoomIn', { ns: 'common' })}
+            className="mr-1 flex h-8 w-8 cursor-pointer items-center justify-center border-none bg-transparent p-1.5"
+            onClick={toggleFullScreen}
+          >
+            <RiExpandDiagonalLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
+          </button>
+          <button
+            type="button"
+            aria-label={t('operation.close', { ns: 'common' })}
+            className="flex h-8 w-8 cursor-pointer items-center justify-center border-none bg-transparent p-1.5"
+            onClick={handleCancel.bind(null, 'esc')}
+          >
+            <RiCloseLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
+          </button>
         </div>
       </div>
       <div className={cn('flex w-full grow', fullScreen ? 'flex-row justify-center px-6 pt-6' : 'px-4 py-3')}>
@@ -131,7 +141,7 @@ const NewChildSegmentModal: FC<NewChildSegmentModalProps> = ({
       </div>
       {!fullScreen && (
         <div className="flex items-center justify-between border-t border-t-divider-subtle p-4 pt-3">
-          <AddAnother isChecked={addAnother} onCheck={() => setAddAnother(!addAnother)} />
+          <AddAnother checked={addAnother} onCheckedChange={setAddAnother} />
           <ActionButtons
             handleCancel={handleCancel.bind(null, 'esc')}
             handleSave={handleSave}
diff --git a/web/app/components/datasets/documents/detail/completed/segment-card/__tests__/index.spec.tsx b/web/app/components/datasets/documents/detail/completed/segment-card/__tests__/index.spec.tsx
index fd431af95d..6df95ddaba 100644
--- a/web/app/components/datasets/documents/detail/completed/segment-card/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/detail/completed/segment-card/__tests__/index.spec.tsx
@@ -221,8 +221,8 @@ describe('SegmentCard', () => {
         />,
       )
 
-      expect(screen.getByTestId('segment-edit-button')).toBeInTheDocument()
-      expect(screen.getByTestId('segment-delete-button')).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'common.operation.edit' })).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'common.operation.delete' })).toBeInTheDocument()
       expect(screen.getByRole('switch')).toBeInTheDocument()
     })
 
@@ -270,7 +270,7 @@ describe('SegmentCard', () => {
         />,
       )
 
-      const deleteButton = screen.getByTestId('segment-delete-button')
+      const deleteButton = screen.getByRole('button', { name: 'common.operation.delete' })
       fireEvent.click(deleteButton)
 
       await waitFor(() => {
@@ -290,7 +290,7 @@ describe('SegmentCard', () => {
         />,
       )
 
-      const deleteButton = screen.getByTestId('segment-delete-button')
+      const deleteButton = screen.getByRole('button', { name: 'common.operation.delete' })
       fireEvent.click(deleteButton)
 
       await waitFor(() => {
@@ -365,7 +365,7 @@ describe('SegmentCard', () => {
         />,
       )
 
-      const editButton = screen.getByTestId('segment-edit-button')
+      const editButton = screen.getByRole('button', { name: 'common.operation.edit' })
       fireEvent.click(editButton)
 
       expect(onClickEdit).toHaveBeenCalledTimes(1)
@@ -385,7 +385,7 @@ describe('SegmentCard', () => {
         />,
       )
 
-      const deleteButton = screen.getByTestId('segment-delete-button')
+      const deleteButton = screen.getByRole('button', { name: 'common.operation.delete' })
       fireEvent.click(deleteButton)
 
       await waitFor(() => {
@@ -437,7 +437,7 @@ describe('SegmentCard', () => {
         />,
       )
 
-      const editButton = screen.getByTestId('segment-edit-button')
+      const editButton = screen.getByRole('button', { name: 'common.operation.edit' })
       fireEvent.click(editButton)
 
       expect(onClickEdit).toHaveBeenCalledTimes(1)
diff --git a/web/app/components/datasets/documents/detail/completed/segment-card/index.tsx b/web/app/components/datasets/documents/detail/completed/segment-card/index.tsx
index 1111bb6411..c30d123052 100644
--- a/web/app/components/datasets/documents/detail/completed/segment-card/index.tsx
+++ b/web/app/components/datasets/documents/detail/completed/segment-card/index.tsx
@@ -10,13 +10,13 @@ import {
 } from '@langgenius/dify-ui/alert-dialog'
 import { cn } from '@langgenius/dify-ui/cn'
 import { Switch } from '@langgenius/dify-ui/switch'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { RiDeleteBinLine, RiEditLine } from '@remixicon/react'
 import * as React from 'react'
 import { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Badge from '@/app/components/base/badge'
 import Divider from '@/app/components/base/divider'
-import Tooltip from '@/app/components/base/tooltip'
 import ImageList from '@/app/components/datasets/common/image-list'
 import { ChunkingMode } from '@/models/datasets'
 import { formatNumber } from '@/utils/format'
@@ -182,35 +182,41 @@ const SegmentCard: FC<ISegmentCardProps> = ({
                     >
                       {!archived && (
                         <>
-                          <Tooltip
-                            popupContent="Edit"
-                            popupClassName="text-text-secondary system-xs-medium"
-                          >
-                            <div
-                              data-testid="segment-edit-button"
-                              className="flex h-6 w-6 shrink-0 cursor-pointer items-center justify-center rounded-lg hover:bg-state-base-hover"
-                              onClick={(e) => {
-                                e.stopPropagation()
-                                onClickEdit?.()
-                              }}
-                            >
-                              <RiEditLine className="h-4 w-4 text-text-tertiary" />
-                            </div>
+                          <Tooltip>
+                            <TooltipTrigger
+                              render={(
+                                <button
+                                  type="button"
+                                  aria-label={t('operation.edit', { ns: 'common' })}
+                                  className="flex h-6 w-6 shrink-0 cursor-pointer items-center justify-center rounded-lg border-none bg-transparent p-0 hover:bg-state-base-hover"
+                                  onClick={(e) => {
+                                    e.stopPropagation()
+                                    onClickEdit?.()
+                                  }}
+                                >
+                                  <RiEditLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
+                                </button>
+                              )}
+                            />
+                            <TooltipContent className="system-xs-medium text-text-secondary">Edit</TooltipContent>
                           </Tooltip>
-                          <Tooltip
-                            popupContent="Delete"
-                            popupClassName="text-text-secondary system-xs-medium"
-                          >
-                            <div
-                              data-testid="segment-delete-button"
-                              className="group/delete flex h-6 w-6 shrink-0 cursor-pointer items-center justify-center rounded-lg hover:bg-state-destructive-hover"
-                              onClick={(e) => {
-                                e.stopPropagation()
-                                setShowModal(true)
-                              }}
-                            >
-                              <RiDeleteBinLine className="h-4 w-4 text-text-tertiary group-hover/delete:text-text-destructive" />
-                            </div>
+                          <Tooltip>
+                            <TooltipTrigger
+                              render={(
+                                <button
+                                  type="button"
+                                  aria-label={t('operation.delete', { ns: 'common' })}
+                                  className="group/delete flex h-6 w-6 shrink-0 cursor-pointer items-center justify-center rounded-lg border-none bg-transparent p-0 hover:bg-state-destructive-hover"
+                                  onClick={(e) => {
+                                    e.stopPropagation()
+                                    setShowModal(true)
+                                  }}
+                                >
+                                  <RiDeleteBinLine className="h-4 w-4 text-text-tertiary group-hover/delete:text-text-destructive" aria-hidden="true" />
+                                </button>
+                              )}
+                            />
+                            <TooltipContent className="system-xs-medium text-text-secondary">Delete</TooltipContent>
                           </Tooltip>
                           <Divider type="vertical" className="h-3.5 bg-divider-regular" />
                         </>
@@ -261,7 +267,7 @@ const SegmentCard: FC<ISegmentCardProps> = ({
           ? (
               <button
                 type="button"
-                className="mt-0.5 mb-2 system-xs-semibold-uppercase text-text-accent"
+                className="mt-0.5 mb-2 border-none bg-transparent p-0 text-left system-xs-semibold-uppercase text-text-accent"
                 onClick={() => onClick?.()}
               >
                 {t('operation.viewMore', { ns: 'common' })}
diff --git a/web/app/components/datasets/documents/detail/completed/segment-detail.tsx b/web/app/components/datasets/documents/detail/completed/segment-detail.tsx
index 91174c1bf6..0713289ef4 100644
--- a/web/app/components/datasets/documents/detail/completed/segment-detail.tsx
+++ b/web/app/components/datasets/documents/detail/completed/segment-detail.tsx
@@ -1,4 +1,3 @@
-import type { FC } from 'react'
 import type { FileEntity } from '@/app/components/datasets/common/image-uploader/types'
 import type { SegmentDetailModel } from '@/models/datasets'
 import { cn } from '@langgenius/dify-ui/cn'
@@ -7,7 +6,6 @@ import {
   RiCollapseDiagonalLine,
   RiExpandDiagonalLine,
 } from '@remixicon/react'
-import * as React from 'react'
 import { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { v4 as uuid4 } from 'uuid'
@@ -42,20 +40,15 @@ type ISegmentDetailProps = {
   onCancel: () => void
   isEditMode?: boolean
   docForm: ChunkingMode
-  onModalStateChange?: (isOpen: boolean) => void
 }
 
-/**
- * Show all the contents of the segment
- */
-const SegmentDetail: FC<ISegmentDetailProps> = ({
+export function SegmentDetail({
   segInfo,
   onUpdate,
   onCancel,
   isEditMode,
   docForm,
-  onModalStateChange,
-}) => {
+}: ISegmentDetailProps) {
   const { t } = useTranslation()
   const [question, setQuestion] = useState(isEditMode ? segInfo?.content || '' : segInfo?.sign_content || '')
   const [answer, setAnswer] = useState(segInfo?.answer || '')
@@ -99,19 +92,16 @@ const SegmentDetail: FC<ISegmentDetailProps> = ({
 
   const handleRegeneration = useCallback(() => {
     setShowRegenerationModal(true)
-    onModalStateChange?.(true)
-  }, [onModalStateChange])
+  }, [])
 
   const onCancelRegeneration = useCallback(() => {
     setShowRegenerationModal(false)
-    onModalStateChange?.(false)
-  }, [onModalStateChange])
+  }, [])
 
   const onCloseAfterRegeneration = useCallback(() => {
     setShowRegenerationModal(false)
-    onModalStateChange?.(false)
-    onCancel() // Close the edit drawer
-  }, [onCancel, onModalStateChange])
+    onCancel()
+  }, [onCancel])
 
   const onConfirmRegeneration = useCallback(() => {
     onUpdate(segInfo?.id || '', question, answer, keywords, attachments, summary, true)
@@ -161,16 +151,26 @@ const SegmentDetail: FC<ISegmentDetailProps> = ({
               <Divider type="vertical" className="mr-2 ml-4 h-3.5 bg-divider-regular" />
             </>
           )}
-          <div className="mr-1 flex h-8 w-8 cursor-pointer items-center justify-center p-1.5" onClick={toggleFullScreen}>
+          <button
+            type="button"
+            aria-label={t(fullScreen ? 'operation.zoomOut' : 'operation.zoomIn', { ns: 'common' })}
+            className="mr-1 flex h-8 w-8 cursor-pointer items-center justify-center border-none bg-transparent p-1.5"
+            onClick={toggleFullScreen}
+          >
             {
               fullScreen
-                ? <RiCollapseDiagonalLine className="h-4 w-4 text-text-tertiary" />
-                : <RiExpandDiagonalLine className="h-4 w-4 text-text-tertiary" />
+                ? <RiCollapseDiagonalLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
+                : <RiExpandDiagonalLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
             }
-          </div>
-          <div className="flex h-8 w-8 cursor-pointer items-center justify-center p-1.5" onClick={onCancel}>
-            <RiCloseLine className="h-4 w-4 text-text-tertiary" />
-          </div>
+          </button>
+          <button
+            type="button"
+            aria-label={t('operation.close', { ns: 'common' })}
+            className="flex h-8 w-8 cursor-pointer items-center justify-center border-none bg-transparent p-1.5"
+            onClick={onCancel}
+          >
+            <RiCloseLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
+          </button>
         </div>
       </div>
       <div className={cn(
@@ -241,5 +241,3 @@ const SegmentDetail: FC<ISegmentDetailProps> = ({
     </div>
   )
 }
-
-export default React.memo(SegmentDetail)
diff --git a/web/app/components/datasets/documents/detail/completed/segment-list.tsx b/web/app/components/datasets/documents/detail/completed/segment-list.tsx
index 3a554fc0b6..faf9338a4d 100644
--- a/web/app/components/datasets/documents/detail/completed/segment-list.tsx
+++ b/web/app/components/datasets/documents/detail/completed/segment-list.tsx
@@ -1,7 +1,8 @@
 import type { ChildChunkDetail, SegmentDetailModel } from '@/models/datasets'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import * as React from 'react'
 import { useMemo } from 'react'
-import Checkbox from '@/app/components/base/checkbox'
+import { useTranslation } from 'react-i18next'
 import Divider from '@/app/components/base/divider'
 import { ChunkingMode } from '@/models/datasets'
 import { useDocumentContext } from '../context'
@@ -47,6 +48,7 @@ const SegmentList = (
     ref: React.LegacyRef<HTMLDivElement>
   },
 ) => {
+  const { t } = useTranslation()
   const docForm = useDocumentContext(s => s.docForm)
   const parentMode = useDocumentContext(s => s.parentMode)
   const currSegment = useSegmentListContext(s => s.currSegment)
@@ -83,7 +85,8 @@ const SegmentList = (
                 key={`${segItem.id}-checkbox`}
                 className="mt-3.5 shrink-0"
                 checked={selectedSegmentIds.includes(segItem.id)}
-                onCheck={() => onSelected(segItem.id)}
+                aria-label={`${t('segment.chunk', { ns: 'datasetDocuments' })} ${segItem.position}`}
+                onCheckedChange={() => onSelected(segItem.id)}
               />
               <div className="min-w-0 grow">
                 <SegmentCard
diff --git a/web/app/components/datasets/documents/detail/completed/skeleton/__tests__/general-list-skeleton.spec.tsx b/web/app/components/datasets/documents/detail/completed/skeleton/__tests__/general-list-skeleton.spec.tsx
index 54e36019c4..29c2b570a4 100644
--- a/web/app/components/datasets/documents/detail/completed/skeleton/__tests__/general-list-skeleton.spec.tsx
+++ b/web/app/components/datasets/documents/detail/completed/skeleton/__tests__/general-list-skeleton.spec.tsx
@@ -84,12 +84,11 @@ describe('GeneralListSkeleton', () => {
 
   // Checkbox tests
   describe('Checkboxes', () => {
-    it('should render disabled checkboxes', () => {
+    it('should render checkbox skeleton placeholders', () => {
       const { container } = render(<GeneralListSkeleton />)
 
-      // Assert - Checkbox component uses cursor-not-allowed class when disabled
-      const disabledCheckboxes = container.querySelectorAll('.cursor-not-allowed')
-      expect(disabledCheckboxes.length).toBeGreaterThan(0)
+      const checkboxSkeletons = container.querySelectorAll('[class*="size-4"][class*="rounded-sm"]')
+      expect(checkboxSkeletons).toHaveLength(10)
     })
 
     it('should render checkboxes with shrink-0 class for consistent sizing', () => {
diff --git a/web/app/components/datasets/documents/detail/completed/skeleton/__tests__/paragraph-list-skeleton.spec.tsx b/web/app/components/datasets/documents/detail/completed/skeleton/__tests__/paragraph-list-skeleton.spec.tsx
index 556a9de50f..a9b6c83a3e 100644
--- a/web/app/components/datasets/documents/detail/completed/skeleton/__tests__/paragraph-list-skeleton.spec.tsx
+++ b/web/app/components/datasets/documents/detail/completed/skeleton/__tests__/paragraph-list-skeleton.spec.tsx
@@ -40,12 +40,11 @@ describe('ParagraphListSkeleton', () => {
 
   // Checkbox tests
   describe('Checkboxes', () => {
-    it('should render disabled checkboxes', () => {
+    it('should render checkbox skeleton placeholders', () => {
       const { container } = render(<ParagraphListSkeleton />)
 
-      // Assert - Checkbox component uses cursor-not-allowed class when disabled
-      const disabledCheckboxes = container.querySelectorAll('.cursor-not-allowed')
-      expect(disabledCheckboxes.length).toBeGreaterThan(0)
+      const checkboxSkeletons = container.querySelectorAll('[class*="size-4"][class*="rounded-sm"]')
+      expect(checkboxSkeletons).toHaveLength(10)
     })
 
     it('should render checkboxes with shrink-0 class for consistent sizing', () => {
diff --git a/web/app/components/datasets/documents/detail/completed/skeleton/general-list-skeleton.tsx b/web/app/components/datasets/documents/detail/completed/skeleton/general-list-skeleton.tsx
index c8e581fa1f..e27c5020c1 100644
--- a/web/app/components/datasets/documents/detail/completed/skeleton/general-list-skeleton.tsx
+++ b/web/app/components/datasets/documents/detail/completed/skeleton/general-list-skeleton.tsx
@@ -1,5 +1,5 @@
+import { CheckboxSkeleton } from '@langgenius/dify-ui/checkbox'
 import * as React from 'react'
-import Checkbox from '@/app/components/base/checkbox'
 import Divider from '@/app/components/base/divider'
 import {
   SkeletonContainer,
@@ -53,10 +53,9 @@ const GeneralListSkeleton = () => {
       {Array.from({ length: 10 }).map((_, index) => {
         return (
           <div key={index} className="flex items-start gap-x-2">
-            <Checkbox
+            <CheckboxSkeleton
               key={`${index}-checkbox`}
               className="mt-3.5 shrink-0"
-              disabled
             />
             <div className="grow">
               <CardSkelton />
diff --git a/web/app/components/datasets/documents/detail/completed/skeleton/paragraph-list-skeleton.tsx b/web/app/components/datasets/documents/detail/completed/skeleton/paragraph-list-skeleton.tsx
index f2c4c9e6c4..a664589568 100644
--- a/web/app/components/datasets/documents/detail/completed/skeleton/paragraph-list-skeleton.tsx
+++ b/web/app/components/datasets/documents/detail/completed/skeleton/paragraph-list-skeleton.tsx
@@ -1,6 +1,6 @@
+import { CheckboxSkeleton } from '@langgenius/dify-ui/checkbox'
 import { RiArrowRightSLine } from '@remixicon/react'
 import * as React from 'react'
-import Checkbox from '@/app/components/base/checkbox'
 import Divider from '@/app/components/base/divider'
 import {
   SkeletonContainer,
@@ -55,10 +55,9 @@ const ParagraphListSkeleton = () => {
       {Array.from({ length: 10 }).map((_, index) => {
         return (
           <div key={index} className="flex items-start gap-x-2">
-            <Checkbox
+            <CheckboxSkeleton
               key={`${index}-checkbox`}
               className="mt-3.5 shrink-0"
-              disabled
             />
             <div className="grow">
               <CardSkelton />
diff --git a/web/app/components/datasets/documents/detail/document-title.tsx b/web/app/components/datasets/documents/detail/document-title.tsx
index d5bf5345ae..0a1cfbf61a 100644
--- a/web/app/components/datasets/documents/detail/document-title.tsx
+++ b/web/app/components/datasets/documents/detail/document-title.tsx
@@ -1,39 +1,29 @@
-import type { FC } from 'react'
-import type { ChunkingMode, ParentMode } from '@/models/datasets'
+import type { ParentMode, SimpleDocumentDetail } from '@/models/datasets'
 import { cn } from '@langgenius/dify-ui/cn'
 import { useRouter } from '@/next/navigation'
-import DocumentPicker from '../../common/document-picker'
+import { DocumentPicker } from '../../common/document-picker'
 
 type DocumentTitleProps = {
   datasetId: string
-  extension?: string
-  name?: string
-  chunkingMode?: ChunkingMode
-  parent_mode?: ParentMode
-  iconCls?: string
-  textCls?: string
+  document?: SimpleDocumentDetail | null
+  parentMode?: ParentMode
   wrapperCls?: string
 }
 
-export const DocumentTitle: FC<DocumentTitleProps> = ({
+export function DocumentTitle({
   datasetId,
-  extension,
-  name,
-  chunkingMode,
-  parent_mode,
+  document,
+  parentMode,
   wrapperCls,
-}) => {
+}: DocumentTitleProps) {
   const router = useRouter()
+
   return (
     <div className={cn('flex flex-1 items-center justify-start', wrapperCls)}>
       <DocumentPicker
         datasetId={datasetId}
-        value={{
-          name,
-          extension,
-          chunkingMode,
-          parentMode: parent_mode || 'paragraph',
-        }}
+        value={document}
+        parentMode={parentMode}
         onChange={(doc) => {
           router.push(`/datasets/${datasetId}/documents/${doc.id}`)
         }}
diff --git a/web/app/components/datasets/documents/detail/index.tsx b/web/app/components/datasets/documents/detail/index.tsx
index 8a684a4e44..190cf8edf7 100644
--- a/web/app/components/datasets/documents/detail/index.tsx
+++ b/web/app/components/datasets/documents/detail/index.tsx
@@ -1,6 +1,7 @@
 'use client'
 import type { FC } from 'react'
-import type { DataSourceInfo, DocumentDisplayStatus, FileItem, FullDocumentDetail, LegacyDataSourceInfo } from '@/models/datasets'
+import type { DocumentDisplayStatus, FileItem, FullDocumentDetail } from '@/models/datasets'
+import type { SegmentImportStatus } from '@/types/dataset'
 import { cn } from '@langgenius/dify-ui/cn'
 import { toast } from '@langgenius/dify-ui/toast'
 import * as React from 'react'
@@ -17,6 +18,7 @@ import { useRouter, useSearchParams } from '@/next/navigation'
 import { useDocumentDetail, useDocumentMetadata, useInvalidDocumentList } from '@/service/knowledge/use-document'
 import { useCheckSegmentBatchImportProgress, useChildSegmentListKey, useSegmentBatchImport, useSegmentListKey } from '@/service/knowledge/use-segment'
 import { useInvalid } from '@/service/use-base'
+import { segmentImportStatus } from '@/types/dataset'
 import Operations from '../components/operations'
 import StatusItem from '../status-item'
 import BatchModal from './batch-modal'
@@ -24,7 +26,7 @@ import Completed from './completed'
 import { DocumentContext } from './context'
 import { DocumentTitle } from './document-title'
 import Embedding from './embedding'
-import SegmentAdd, { ProcessStatus } from './segment-add'
+import { SegmentAdd } from './segment-add'
 import style from './style.module.css'
 
 type DocumentDetailProps = {
@@ -36,10 +38,6 @@ const NON_TERMINAL_DISPLAY_STATUSES = new Set<typeof DisplayStatusList[number]>(
   DisplayStatusList.filter(s => s === 'queuing' || s === 'indexing' || s === 'paused'),
 )
 
-const isLegacyDataSourceInfo = (info?: DataSourceInfo): info is LegacyDataSourceInfo => {
-  return !!info && 'upload_file' in info
-}
-
 const DocumentDetail: FC<DocumentDetailProps> = ({ datasetId, documentId }) => {
   const router = useRouter()
   const searchParams = useSearchParams()
@@ -53,20 +51,20 @@ const DocumentDetail: FC<DocumentDetailProps> = ({ datasetId, documentId }) => {
   const [showMetadata, setShowMetadata] = useState(!isMobile)
   const [newSegmentModalVisible, setNewSegmentModalVisible] = useState(false)
   const [batchModalVisible, setBatchModalVisible] = useState(false)
-  const [importStatus, setImportStatus] = useState<ProcessStatus | string>()
+  const [importStatus, setImportStatus] = useState<SegmentImportStatus>()
   const showNewSegmentModal = () => setNewSegmentModalVisible(true)
   const showBatchModal = () => setBatchModalVisible(true)
   const hideBatchModal = () => setBatchModalVisible(false)
-  const resetProcessStatus = () => setImportStatus('')
+  const resetImportStatus = () => setImportStatus(undefined)
 
   const { mutateAsync: checkSegmentBatchImportProgress } = useCheckSegmentBatchImportProgress()
   const checkProcess = async (jobID: string) => {
     await checkSegmentBatchImportProgress({ jobID }, {
       onSuccess: (res) => {
         setImportStatus(res.job_status)
-        if (res.job_status === ProcessStatus.WAITING || res.job_status === ProcessStatus.PROCESSING)
+        if (res.job_status === segmentImportStatus.waiting || res.job_status === segmentImportStatus.processing)
           setTimeout(() => checkProcess(res.job_id), 2500)
-        if (res.job_status === ProcessStatus.ERROR)
+        if (res.job_status === segmentImportStatus.error)
           toast.error(`${t('list.batchModal.runError', { ns: 'datasetDocuments' })}`)
       },
       onError: (e) => {
@@ -121,14 +119,6 @@ const DocumentDetail: FC<DocumentDetailProps> = ({ datasetId, documentId }) => {
 
   const embedding = NON_TERMINAL_DISPLAY_STATUSES.has(documentDetail?.display_status as DocumentDisplayStatus)
 
-  const documentUploadFile = useMemo(() => {
-    if (!documentDetail?.data_source_info)
-      return undefined
-    if (isLegacyDataSourceInfo(documentDetail.data_source_info))
-      return documentDetail.data_source_info.upload_file
-    return undefined
-  }, [documentDetail?.data_source_info])
-
   const invalidChunkList = useInvalid(useSegmentListKey)
   const invalidChildChunkList = useInvalid(useChildSegmentListKey)
   const invalidDocumentList = useInvalidDocumentList(datasetId)
@@ -198,11 +188,10 @@ const DocumentDetail: FC<DocumentDetailProps> = ({ datasetId, documentId }) => {
         <div className="flex min-h-16 flex-wrap items-center justify-between border-b border-b-divider-subtle py-2.5 pr-4 pl-3">
           <button
             type="button"
-            data-testid="document-detail-back-button"
             aria-label={backButtonLabel}
             title={backButtonLabel}
             onClick={backToPrev}
-            className="flex h-8 w-8 shrink-0 cursor-pointer items-center justify-center rounded-full hover:bg-components-button-tertiary-bg"
+            className="flex h-8 w-8 shrink-0 cursor-pointer items-center justify-center rounded-full border-none bg-transparent p-0 hover:bg-components-button-tertiary-bg focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
           >
             <span
               aria-hidden="true"
@@ -211,18 +200,16 @@ const DocumentDetail: FC<DocumentDetailProps> = ({ datasetId, documentId }) => {
           </button>
           <DocumentTitle
             datasetId={datasetId}
-            extension={documentUploadFile?.extension}
-            name={documentDetail?.name}
+            document={documentDetail}
             wrapperCls="mr-2"
-            parent_mode={parentMode}
-            chunkingMode={documentDetail?.doc_form as ChunkingMode}
+            parentMode={parentMode}
           />
           <div className="flex flex-wrap items-center">
             {embeddingAvailable && documentDetail && !documentDetail.archived && !isFullDocMode && (
               <>
                 <SegmentAdd
                   importStatus={importStatus}
-                  clearProcessStatus={resetProcessStatus}
+                  clearImportStatus={resetImportStatus}
                   showNewSegmentModal={showNewSegmentModal}
                   showBatchModal={showBatchModal}
                   embedding={embedding}
@@ -290,7 +277,7 @@ const DocumentDetail: FC<DocumentDetailProps> = ({ datasetId, documentId }) => {
                       )}
                 </div>
               )}
-          <FloatRightContainer showClose isOpen={showMetadata} onClose={() => setShowMetadata(false)} isMobile={isMobile} panelClassName="justify-start!" footer={null}>
+          <FloatRightContainer showClose isOpen={showMetadata} onClose={() => setShowMetadata(false)} isMobile={isMobile} panelClassName="justify-start!">
             <Metadata
               className="mt-3 mr-2"
               datasetId={datasetId}
diff --git a/web/app/components/datasets/documents/detail/metadata/components/__tests__/doc-type-selector.spec.tsx b/web/app/components/datasets/documents/detail/metadata/components/__tests__/doc-type-selector.spec.tsx
index 55295579f0..d09077846e 100644
--- a/web/app/components/datasets/documents/detail/metadata/components/__tests__/doc-type-selector.spec.tsx
+++ b/web/app/components/datasets/documents/detail/metadata/components/__tests__/doc-type-selector.spec.tsx
@@ -133,7 +133,7 @@ describe('DocumentTypeDisplay', () => {
       const onClick = vi.fn()
       render(<DocumentTypeDisplay displayType="book" showChangeLink={true} onChangeClick={onClick} />)
 
-      fireEvent.click(screen.getByText(/operation\.change/))
+      fireEvent.click(screen.getByRole('button', { name: /operation\.change/ }))
 
       expect(onClick).toHaveBeenCalled()
     })
diff --git a/web/app/components/datasets/documents/detail/metadata/components/doc-type-selector.tsx b/web/app/components/datasets/documents/detail/metadata/components/doc-type-selector.tsx
index 5dfa02aa80..9cce66822b 100644
--- a/web/app/components/datasets/documents/detail/metadata/components/doc-type-selector.tsx
+++ b/web/app/components/datasets/documents/detail/metadata/components/doc-type-selector.tsx
@@ -122,9 +122,13 @@ export const DocumentTypeDisplay: FC<DocumentTypeDisplayProps> = ({
           {showChangeLink && (
             <div className="ml-1 inline-flex items-center gap-1">
               ·
-              <div onClick={onChangeClick} className="cursor-pointer hover:text-text-accent">
+              <button
+                type="button"
+                className="inline cursor-pointer border-none bg-transparent p-0 text-left hover:text-text-accent"
+                onClick={onChangeClick}
+              >
                 {t('operation.change', { ns: 'common' })}
-              </div>
+              </button>
             </div>
           )}
         </>
diff --git a/web/app/components/datasets/documents/detail/metadata/components/field-info.tsx b/web/app/components/datasets/documents/detail/metadata/components/field-info.tsx
index 9e083a158e..7e80566fa1 100644
--- a/web/app/components/datasets/documents/detail/metadata/components/field-info.tsx
+++ b/web/app/components/datasets/documents/detail/metadata/components/field-info.tsx
@@ -55,7 +55,7 @@ const FieldInfo: FC<FieldInfoProps> = ({
           <SelectTrigger className={cn(s.select, s.selectWrapper)}>
             {selectedOption?.name ?? `${t('metadata.placeholder.select', { ns: 'datasetDocuments' })}${label}`}
           </SelectTrigger>
-          <SelectContent popupClassName="w-(--anchor-width)">
+          <SelectContent>
             {selectOptions.map(option => (
               <SelectItem key={option.value} value={option.value}>
                 <SelectItemText>{option.name}</SelectItemText>
diff --git a/web/app/components/datasets/documents/detail/new-segment.tsx b/web/app/components/datasets/documents/detail/new-segment.tsx
index 0426bb9584..92e3aafd46 100644
--- a/web/app/components/datasets/documents/detail/new-segment.tsx
+++ b/web/app/components/datasets/documents/detail/new-segment.tsx
@@ -132,7 +132,7 @@ const NewSegmentModal: FC<NewSegmentModalProps> = ({
         <div className="flex items-center">
           {fullScreen && (
             <>
-              <AddAnother className="mr-3" isChecked={addAnother} onCheck={() => setAddAnother(!addAnother)} />
+              <AddAnother className="mr-3" checked={addAnother} onCheckedChange={setAddAnother} />
               <ActionButtons
                 handleCancel={handleCancel.bind(null, 'esc')}
                 handleSave={handleSave}
@@ -142,12 +142,22 @@ const NewSegmentModal: FC<NewSegmentModalProps> = ({
               <Divider type="vertical" className="mr-2 ml-4 h-3.5 bg-divider-regular" />
             </>
           )}
-          <div className="mr-1 flex h-8 w-8 cursor-pointer items-center justify-center p-1.5" onClick={toggleFullScreen}>
-            <RiExpandDiagonalLine className="h-4 w-4 text-text-tertiary" />
-          </div>
-          <div className="flex h-8 w-8 cursor-pointer items-center justify-center p-1.5" onClick={handleCancel.bind(null, 'esc')}>
-            <RiCloseLine className="h-4 w-4 text-text-tertiary" />
-          </div>
+          <button
+            type="button"
+            aria-label={t('operation.zoomIn', { ns: 'common' })}
+            className="mr-1 flex h-8 w-8 cursor-pointer items-center justify-center border-none bg-transparent p-1.5"
+            onClick={toggleFullScreen}
+          >
+            <RiExpandDiagonalLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
+          </button>
+          <button
+            type="button"
+            aria-label={t('operation.close', { ns: 'common' })}
+            className="flex h-8 w-8 cursor-pointer items-center justify-center border-none bg-transparent p-1.5"
+            onClick={handleCancel.bind(null, 'esc')}
+          >
+            <RiCloseLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
+          </button>
         </div>
       </div>
       <div className={cn('flex grow', fullScreen ? 'w-full flex-row justify-center gap-x-8 px-6 pt-6' : 'flex-col gap-y-1 px-4 py-3')}>
@@ -180,7 +190,7 @@ const NewSegmentModal: FC<NewSegmentModalProps> = ({
       </div>
       {!fullScreen && (
         <div className="flex items-center justify-between border-t border-t-divider-subtle p-4 pt-3">
-          <AddAnother isChecked={addAnother} onCheck={() => setAddAnother(!addAnother)} />
+          <AddAnother checked={addAnother} onCheckedChange={setAddAnother} />
           <ActionButtons
             handleCancel={handleCancel.bind(null, 'esc')}
             handleSave={handleSave}
diff --git a/web/app/components/datasets/documents/detail/segment-add/__tests__/index.spec.tsx b/web/app/components/datasets/documents/detail/segment-add/__tests__/index.spec.tsx
index b9d967a692..b31641a076 100644
--- a/web/app/components/datasets/documents/detail/segment-add/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/documents/detail/segment-add/__tests__/index.spec.tsx
@@ -1,8 +1,10 @@
+import type { SegmentImportStatus } from '@/types/dataset'
 import { fireEvent, render, screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { Plan } from '@/app/components/billing/type'
+import { segmentImportStatus } from '@/types/dataset'
 
-import SegmentAdd, { ProcessStatus } from '../index'
+import { SegmentAdd } from '../index'
 
 // Mock provider context
 let mockPlan = { type: Plan.professional }
@@ -22,8 +24,8 @@ describe('SegmentAdd', () => {
   })
 
   const defaultProps = {
-    importStatus: undefined as ProcessStatus | string | undefined,
-    clearProcessStatus: vi.fn(),
+    importStatus: undefined as SegmentImportStatus | undefined,
+    clearImportStatus: vi.fn(),
     showNewSegmentModal: vi.fn(),
     showBatchModal: vi.fn(),
     embedding: false,
@@ -52,33 +54,33 @@ describe('SegmentAdd', () => {
   // Import Status displays
   describe('Import Status Display', () => {
     it('should show processing indicator when status is WAITING', () => {
-      render(<SegmentAdd {...defaultProps} importStatus={ProcessStatus.WAITING} />)
+      render(<SegmentAdd {...defaultProps} importStatus={segmentImportStatus.waiting} />)
 
       expect(screen.getByText(/list\.batchModal\.processing/i)).toBeInTheDocument()
     })
 
     it('should show processing indicator when status is PROCESSING', () => {
-      render(<SegmentAdd {...defaultProps} importStatus={ProcessStatus.PROCESSING} />)
+      render(<SegmentAdd {...defaultProps} importStatus={segmentImportStatus.processing} />)
 
       expect(screen.getByText(/list\.batchModal\.processing/i)).toBeInTheDocument()
     })
 
     it('should show completed status with ok button', () => {
-      render(<SegmentAdd {...defaultProps} importStatus={ProcessStatus.COMPLETED} />)
+      render(<SegmentAdd {...defaultProps} importStatus={segmentImportStatus.completed} />)
 
       expect(screen.getByText(/list\.batchModal\.completed/i)).toBeInTheDocument()
       expect(screen.getByText(/list\.batchModal\.ok/i)).toBeInTheDocument()
     })
 
     it('should show error status with ok button', () => {
-      render(<SegmentAdd {...defaultProps} importStatus={ProcessStatus.ERROR} />)
+      render(<SegmentAdd {...defaultProps} importStatus={segmentImportStatus.error} />)
 
       expect(screen.getByText(/list\.batchModal\.error/i)).toBeInTheDocument()
       expect(screen.getByText(/list\.batchModal\.ok/i)).toBeInTheDocument()
     })
 
     it('should not show add button when importStatus is set', () => {
-      render(<SegmentAdd {...defaultProps} importStatus={ProcessStatus.PROCESSING} />)
+      render(<SegmentAdd {...defaultProps} importStatus={segmentImportStatus.processing} />)
 
       expect(screen.queryByText(/list\.action\.addButton/i)).not.toBeInTheDocument()
     })
@@ -94,34 +96,34 @@ describe('SegmentAdd', () => {
       expect(mockShowNewSegmentModal).toHaveBeenCalledTimes(1)
     })
 
-    it('should call clearProcessStatus when ok is clicked on completed status', () => {
-      const mockClearProcessStatus = vi.fn()
+    it('should call clearImportStatus when ok is clicked on completed status', () => {
+      const mockClearImportStatus = vi.fn()
       render(
         <SegmentAdd
           {...defaultProps}
-          importStatus={ProcessStatus.COMPLETED}
-          clearProcessStatus={mockClearProcessStatus}
+          importStatus={segmentImportStatus.completed}
+          clearImportStatus={mockClearImportStatus}
         />,
       )
 
-      fireEvent.click(screen.getByText(/list\.batchModal\.ok/i))
+      fireEvent.click(screen.getByRole('button', { name: /list\.batchModal\.ok/i }))
 
-      expect(mockClearProcessStatus).toHaveBeenCalledTimes(1)
+      expect(mockClearImportStatus).toHaveBeenCalledTimes(1)
     })
 
-    it('should call clearProcessStatus when ok is clicked on error status', () => {
-      const mockClearProcessStatus = vi.fn()
+    it('should call clearImportStatus when ok is clicked on error status', () => {
+      const mockClearImportStatus = vi.fn()
       render(
         <SegmentAdd
           {...defaultProps}
-          importStatus={ProcessStatus.ERROR}
-          clearProcessStatus={mockClearProcessStatus}
+          importStatus={segmentImportStatus.error}
+          clearImportStatus={mockClearImportStatus}
         />,
       )
 
-      fireEvent.click(screen.getByText(/list\.batchModal\.ok/i))
+      fireEvent.click(screen.getByRole('button', { name: /list\.batchModal\.ok/i }))
 
-      expect(mockClearProcessStatus).toHaveBeenCalledTimes(1)
+      expect(mockClearImportStatus).toHaveBeenCalledTimes(1)
     })
 
     it('should render batch add option in dropdown', async () => {
@@ -215,14 +217,14 @@ describe('SegmentAdd', () => {
   // Progress bar width tests
   describe('Progress Bar', () => {
     it('should show 3/12 width progress bar for WAITING status', () => {
-      const { container } = render(<SegmentAdd {...defaultProps} importStatus={ProcessStatus.WAITING} />)
+      const { container } = render(<SegmentAdd {...defaultProps} importStatus={segmentImportStatus.waiting} />)
 
       const progressBar = container.querySelector('.w-3\\/12')
       expect(progressBar).toBeInTheDocument()
     })
 
     it('should show 2/3 width progress bar for PROCESSING status', () => {
-      const { container } = render(<SegmentAdd {...defaultProps} importStatus={ProcessStatus.PROCESSING} />)
+      const { container } = render(<SegmentAdd {...defaultProps} importStatus={segmentImportStatus.processing} />)
 
       const progressBar = container.querySelector('.w-2\\/3')
       expect(progressBar).toBeInTheDocument()
@@ -230,15 +232,6 @@ describe('SegmentAdd', () => {
   })
 
   describe('Edge Cases', () => {
-    it('should handle unknown importStatus string', () => {
-      // Arrange & Act - pass unknown status
-      const { container } = render(<SegmentAdd {...defaultProps} importStatus="unknown" />)
-
-      // Assert - empty fragment is rendered for unknown status (container exists but has no visible content)
-      expect(container).toBeInTheDocument()
-      expect(container.textContent).toBe('')
-    })
-
     it('should maintain structure when rerendered', () => {
       const { rerender } = render(<SegmentAdd {...defaultProps} />)
 
diff --git a/web/app/components/datasets/documents/detail/segment-add/index.tsx b/web/app/components/datasets/documents/detail/segment-add/index.tsx
index 5ee0a2bcb3..43b30f7906 100644
--- a/web/app/components/datasets/documents/detail/segment-add/index.tsx
+++ b/web/app/components/datasets/documents/detail/segment-add/index.tsx
@@ -1,5 +1,5 @@
 'use client'
-import type { FC } from 'react'
+import type { SegmentImportStatus } from '@/types/dataset'
 import { cn } from '@langgenius/dify-ui/cn'
 import {
   DropdownMenu,
@@ -7,95 +7,104 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from '@langgenius/dify-ui/dropdown-menu'
-import { useBoolean } from 'ahooks'
-import * as React from 'react'
-import { useCallback, useMemo, useRef, useState } from 'react'
+import { useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { PlanUpgradeModal } from '@/app/components/billing/plan-upgrade-modal'
 import { Plan } from '@/app/components/billing/type'
 import { useProviderContext } from '@/context/provider-context'
+import { segmentImportStatus } from '@/types/dataset'
 
-type ISegmentAddProps = {
-  importStatus: ProcessStatus | string | undefined
-  clearProcessStatus: () => void
+type SegmentAddProps = {
+  importStatus: SegmentImportStatus | undefined
+  clearImportStatus: () => void
   showNewSegmentModal: () => void
   showBatchModal: () => void
   embedding: boolean
 }
 
-export enum ProcessStatus {
-  WAITING = 'waiting',
-  PROCESSING = 'processing',
-  COMPLETED = 'completed',
-  ERROR = 'error',
-}
-
-const SegmentAdd: FC<ISegmentAddProps> = ({
+export function SegmentAdd({
   importStatus,
-  clearProcessStatus,
+  clearImportStatus,
   showNewSegmentModal,
   showBatchModal,
   embedding,
-}) => {
+}: SegmentAddProps) {
   const { t } = useTranslation()
-  const [isShowPlanUpgradeModal, {
-    setTrue: showPlanUpgradeModal,
-    setFalse: hidePlanUpgradeModal,
-  }] = useBoolean(false)
-  const { plan, enableBilling } = useProviderContext()
-  const { type } = plan
-  const canAdd = enableBilling ? type !== Plan.sandbox : true
   const [isBatchMenuOpen, setIsBatchMenuOpen] = useState(false)
+  const [isPlanUpgradeModalOpen, setIsPlanUpgradeModalOpen] = useState(false)
   const batchMenuAnchorRef = useRef<HTMLDivElement>(null)
+  const { plan, enableBilling } = useProviderContext()
+  const canAddChunks = !enableBilling || plan.type !== Plan.sandbox
 
-  const withNeedUpgradeCheck = useCallback((fn: () => void) => {
-    return () => {
-      if (!canAdd) {
-        showPlanUpgradeModal()
-        return
-      }
-      fn()
+  const textColor = embedding
+    ? 'text-components-button-secondary-accent-text-disabled'
+    : 'text-components-button-secondary-accent-text'
+
+  const handleAddClick = () => {
+    if (!canAddChunks) {
+      setIsPlanUpgradeModalOpen(true)
+      return
     }
-  }, [canAdd, showPlanUpgradeModal])
-  const textColor = useMemo(() => {
-    return embedding
-      ? 'text-components-button-secondary-accent-text-disabled'
-      : 'text-components-button-secondary-accent-text'
-  }, [embedding])
+
+    showNewSegmentModal()
+  }
+
+  const handleBatchAddClick = () => {
+    setIsBatchMenuOpen(false)
+
+    if (!canAddChunks) {
+      setIsPlanUpgradeModalOpen(true)
+      return
+    }
+
+    showBatchModal()
+  }
 
   if (importStatus) {
     return (
       <>
-        {(importStatus === ProcessStatus.WAITING || importStatus === ProcessStatus.PROCESSING) && (
+        {(importStatus === segmentImportStatus.waiting || importStatus === segmentImportStatus.processing) && (
           <div className="relative mr-2 inline-flex items-center overflow-hidden rounded-lg border-[0.5px] border-components-progress-bar-border
             bg-components-progress-bar-border px-2.5 py-2 text-components-button-secondary-accent-text
             shadow-xs shadow-shadow-shadow-3 backdrop-blur-[5px]"
           >
-            <div className={cn('absolute top-0 left-0 z-0 h-full border-r-[1.5px] border-r-components-progress-bar-progress-highlight bg-components-progress-bar-progress', importStatus === ProcessStatus.WAITING ? 'w-3/12' : 'w-2/3')} />
+            <div className={cn('absolute top-0 left-0 z-0 h-full border-r-[1.5px] border-r-components-progress-bar-progress-highlight bg-components-progress-bar-progress', importStatus === segmentImportStatus.waiting ? 'w-3/12' : 'w-2/3')} />
             <span aria-hidden className="mr-1 i-ri-loader-2-line h-4 w-4 animate-spin" />
             <span className="z-10 pr-0.5 system-sm-medium">{t('list.batchModal.processing', { ns: 'datasetDocuments' })}</span>
           </div>
         )}
-        {importStatus === ProcessStatus.COMPLETED && (
+        {importStatus === segmentImportStatus.completed && (
           <div className="relative mr-2 inline-flex items-center overflow-hidden rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-xs shadow-shadow-shadow-3 backdrop-blur-[5px]">
             <div className="inline-flex items-center border-r border-r-divider-subtle px-2.5 py-2 text-text-success">
               <span aria-hidden className="mr-1 i-custom-vender-solid-general-check-circle h-4 w-4" />
               <span className="pr-0.5 system-sm-medium">{t('list.batchModal.completed', { ns: 'datasetDocuments' })}</span>
             </div>
             <div className="m-1 inline-flex items-center">
-              <span className="cursor-pointer rounded-md px-1.5 py-1 system-xs-medium text-components-button-ghost-text hover:bg-components-button-ghost-bg-hover" onClick={clearProcessStatus}>{t('list.batchModal.ok', { ns: 'datasetDocuments' })}</span>
+              <button
+                type="button"
+                className="cursor-pointer rounded-md border-none bg-transparent px-1.5 py-1 text-left system-xs-medium text-components-button-ghost-text hover:bg-components-button-ghost-bg-hover focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+                onClick={clearImportStatus}
+              >
+                {t('list.batchModal.ok', { ns: 'datasetDocuments' })}
+              </button>
             </div>
             <div className="absolute top-0 left-0 -z-10 h-full w-full bg-dataset-chunk-process-success-bg opacity-40" />
           </div>
         )}
-        {importStatus === ProcessStatus.ERROR && (
+        {importStatus === segmentImportStatus.error && (
           <div className="relative mr-2 inline-flex items-center overflow-hidden rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-xs shadow-shadow-shadow-3 backdrop-blur-[5px]">
             <div className="inline-flex items-center border-r border-r-divider-subtle px-2.5 py-2 text-text-destructive">
               <span aria-hidden className="mr-1 i-ri-error-warning-fill h-4 w-4" />
               <span className="pr-0.5 system-sm-medium">{t('list.batchModal.error', { ns: 'datasetDocuments' })}</span>
             </div>
             <div className="m-1 inline-flex items-center">
-              <span className="cursor-pointer rounded-md px-1.5 py-1 system-xs-medium text-components-button-ghost-text hover:bg-components-button-ghost-bg-hover" onClick={clearProcessStatus}>{t('list.batchModal.ok', { ns: 'datasetDocuments' })}</span>
+              <button
+                type="button"
+                className="cursor-pointer rounded-md border-none bg-transparent px-1.5 py-1 text-left system-xs-medium text-components-button-ghost-text hover:bg-components-button-ghost-bg-hover focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+                onClick={clearImportStatus}
+              >
+                {t('list.batchModal.ok', { ns: 'datasetDocuments' })}
+              </button>
             </div>
             <div className="absolute top-0 left-0 -z-10 h-full w-full bg-dataset-chunk-process-error-bg opacity-40" />
           </div>
@@ -114,9 +123,9 @@ const SegmentAdd: FC<ISegmentAddProps> = ({
     >
       <button
         type="button"
-        className={`inline-flex items-center rounded-l-lg border-r border-r-divider-subtle px-2.5 py-2
+        className={`inline-flex items-center rounded-l-lg border-0 border-r border-r-divider-subtle bg-transparent px-2.5 py-2 text-left
           hover:bg-state-base-hover disabled:cursor-not-allowed disabled:hover:bg-transparent`}
-        onClick={withNeedUpgradeCheck(showNewSegmentModal)}
+        onClick={handleAddClick}
         disabled={embedding}
       >
         <span aria-hidden className={cn('i-ri-add-line h-4 w-4', textColor)} />
@@ -129,7 +138,7 @@ const SegmentAdd: FC<ISegmentAddProps> = ({
           aria-label={t('list.action.batchAdd', { ns: 'datasetDocuments' })}
           disabled={embedding}
           className={cn(
-            `rounded-l-none rounded-r-lg border-0 p-2 backdrop-blur-[5px]
+            `rounded-l-none rounded-r-lg border-0 bg-transparent p-2 backdrop-blur-[5px]
             hover:bg-state-base-hover disabled:cursor-not-allowed disabled:bg-transparent disabled:hover:bg-transparent`,
             isBatchMenuOpen && 'bg-state-base-hover',
           )}
@@ -142,25 +151,20 @@ const SegmentAdd: FC<ISegmentAddProps> = ({
           placement="bottom-start"
           sideOffset={4}
           positionerProps={{ anchor: batchMenuAnchorRef }}
-          popupClassName="w-[var(--anchor-width)] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur py-0 shadow-xl shadow-shadow-shadow-5 backdrop-blur-[5px]"
+          popupClassName="w-[var(--anchor-width)]"
         >
-          <div className="w-full p-1">
-            <DropdownMenuItem
-              className="h-auto w-full px-2 py-1.5 system-md-regular"
-              onClick={() => {
-                setIsBatchMenuOpen(false)
-                withNeedUpgradeCheck(showBatchModal)()
-              }}
-            >
-              {t('list.action.batchAdd', { ns: 'datasetDocuments' })}
-            </DropdownMenuItem>
-          </div>
+          <DropdownMenuItem
+            className="system-md-regular"
+            onClick={handleBatchAddClick}
+          >
+            {t('list.action.batchAdd', { ns: 'datasetDocuments' })}
+          </DropdownMenuItem>
         </DropdownMenuContent>
       </DropdownMenu>
-      {isShowPlanUpgradeModal && (
+      {isPlanUpgradeModalOpen && (
         <PlanUpgradeModal
           show
-          onClose={hidePlanUpgradeModal}
+          onClose={() => setIsPlanUpgradeModalOpen(false)}
           title={t('upgrade.addChunks.title', { ns: 'billing' })!}
           description={t('upgrade.addChunks.description', { ns: 'billing' })!}
         />
@@ -169,4 +173,3 @@ const SegmentAdd: FC<ISegmentAddProps> = ({
 
   )
 }
-export default React.memo(SegmentAdd)
diff --git a/web/app/components/datasets/documents/style.module.css b/web/app/components/datasets/documents/style.module.css
index 2d3f808c0e..dccc964942 100644
--- a/web/app/components/datasets/documents/style.module.css
+++ b/web/app/components/datasets/documents/style.module.css
@@ -17,7 +17,7 @@
   @apply !p-2 !border-[0.5px] !border-components-button-secondary-border !bg-components-button-secondary-bg shadow-xs shadow-shadow-shadow-3 hover:!border-components-button-secondary-border-hover hover:!bg-components-button-secondary-bg-hover;
 }
 .actionItem {
-  @apply h-9 py-2 px-3 mx-1 flex items-center gap-2 hover:bg-state-base-hover rounded-lg cursor-pointer;
+  @apply h-9 py-2 px-3 mx-1 flex items-center gap-2 rounded-lg border-none bg-transparent text-left hover:bg-state-base-hover cursor-pointer;
 }
 .deleteActionItem {
   @apply hover:!bg-state-destructive-hover;
@@ -26,7 +26,7 @@
   @apply text-text-secondary text-sm;
 }
 .addFileBtn {
-  @apply mt-4 w-fit !text-[13px] font-medium border-[0.5px];
+  @apply mt-4 w-fit !text-[13px] font-medium border-[0.5px] border-components-button-secondary-border;
 }
 .plusIcon {
   @apply w-4 h-4 mr-2 stroke-current stroke-[1.5px];
diff --git a/web/app/components/datasets/external-api/external-api-modal/index.tsx b/web/app/components/datasets/external-api/external-api-modal/index.tsx
index 0179a31b89..406ab815e6 100644
--- a/web/app/components/datasets/external-api/external-api-modal/index.tsx
+++ b/web/app/components/datasets/external-api/external-api-modal/index.tsx
@@ -121,9 +121,9 @@ const AddExternalAPIModal: FC<AddExternalAPIModalProps> = ({ data, onSave, onCan
           onCancel()
       }}
     >
-      <DialogContent className="w-[480px]! max-w-none! overflow-visible! rounded-2xl! border-[0.5px]! border-components-panel-border! bg-components-panel-bg! p-0! shadow-xl!">
-        <div className="relative flex w-full flex-col items-start">
-          <div className="flex flex-col items-start gap-2 self-stretch pt-6 pr-14 pb-3 pl-6">
+      <DialogContent className="flex max-h-[calc(100dvh-2rem)] w-[480px]! max-w-none! flex-col overflow-hidden! rounded-2xl! border-[0.5px]! border-components-panel-border! bg-components-panel-bg! p-0! shadow-xl!">
+        <div className="relative flex min-h-0 w-full flex-1 flex-col items-start">
+          <div className="flex shrink-0 flex-col items-start gap-2 self-stretch pt-6 pr-14 pb-3 pl-6">
             <DialogTitle className="grow self-stretch title-2xl-semi-bold text-text-primary">
               {isEditMode ? t('editExternalAPIFormTitle', { ns: 'dataset' }) : t('createExternalAPI', { ns: 'dataset' })}
             </DialogTitle>
@@ -173,8 +173,8 @@ const AddExternalAPIModal: FC<AddExternalAPIModalProps> = ({ data, onSave, onCan
           <ActionButton className="absolute top-5 right-5" onClick={onCancel}>
             <RiCloseLine className="h-[18px] w-[18px] shrink-0 text-text-tertiary" />
           </ActionButton>
-          <Form value={formData} onChange={handleDataChange} formSchemas={formSchemas} className="flex flex-col items-start justify-center gap-4 self-stretch px-6 py-3" />
-          <div className="flex items-center justify-end gap-2 self-stretch p-6 pt-5">
+          <Form value={formData} onChange={handleDataChange} formSchemas={formSchemas} className="min-h-0 w-full flex-1 overflow-y-auto px-6 py-3" />
+          <div className="flex shrink-0 items-center justify-end gap-2 self-stretch p-6 pt-5">
             <Button type="button" variant="secondary" onClick={onCancel}>
               {t('externalAPIForm.cancel', { ns: 'dataset' })}
             </Button>
@@ -194,7 +194,7 @@ const AddExternalAPIModal: FC<AddExternalAPIModalProps> = ({ data, onSave, onCan
               {t('externalAPIForm.save', { ns: 'dataset' })}
             </Button>
           </div>
-          <div className="flex items-center justify-center gap-1 self-stretch rounded-b-2xl border-t-[0.5px] border-divider-subtle
+          <div className="flex shrink-0 items-center justify-center gap-1 self-stretch rounded-b-2xl border-t-[0.5px] border-divider-subtle
             bg-background-soft px-2 py-3 system-xs-regular text-text-tertiary"
           >
             <RiLock2Fill className="h-3 w-3 text-text-quaternary" />
diff --git a/web/app/components/datasets/external-knowledge-base/create/ExternalApiSelect.tsx b/web/app/components/datasets/external-knowledge-base/create/ExternalApiSelect.tsx
index f0b22ad448..0e26d290d9 100644
--- a/web/app/components/datasets/external-knowledge-base/create/ExternalApiSelect.tsx
+++ b/web/app/components/datasets/external-knowledge-base/create/ExternalApiSelect.tsx
@@ -79,7 +79,7 @@ const ExternalApiSelect: React.FC<ExternalApiSelectProps> = ({ items, value, onS
         <RiArrowDownSLine className={`h-4 w-4 text-text-quaternary transition-transform ${isOpen ? 'text-text-secondary' : ''}`} />
       </div>
       {isOpen && (
-        <div className="absolute z-10 mt-1 w-full rounded-xl border bg-components-panel-bg-blur shadow-lg">
+        <div className="absolute z-10 mt-1 w-full rounded-xl border border-components-panel-border bg-components-panel-bg-blur shadow-lg">
           {items.map(item => (
             <div
               key={item.value}
diff --git a/web/app/components/datasets/hit-testing/__tests__/modify-retrieval-modal.spec.tsx b/web/app/components/datasets/hit-testing/__tests__/modify-retrieval-modal.spec.tsx
index aa64962aa6..366732cbbc 100644
--- a/web/app/components/datasets/hit-testing/__tests__/modify-retrieval-modal.spec.tsx
+++ b/web/app/components/datasets/hit-testing/__tests__/modify-retrieval-modal.spec.tsx
@@ -22,8 +22,8 @@ vi.mock('@langgenius/dify-ui/toast', () => ({
 }))
 
 vi.mock('@langgenius/dify-ui/button', () => ({
-  Button: ({ children, onClick, variant }: { children: React.ReactNode, onClick: () => void, variant?: string }) => (
-    <button data-testid={variant === 'primary' ? 'save-button' : 'cancel-button'} onClick={onClick}>
+  Button: ({ children, onClick }: { children: React.ReactNode, onClick: () => void, variant?: string }) => (
+    <button onClick={onClick}>
       {children}
     </button>
   ),
@@ -104,13 +104,19 @@ describe('ModifyRetrievalModal', () => {
 
   it('should call onHide when cancel button clicked', () => {
     render(<ModifyRetrievalModal {...defaultProps} />)
-    fireEvent.click(screen.getByTestId('cancel-button'))
+    fireEvent.click(screen.getByRole('button', { name: /operation\.cancel$/ }))
+    expect(defaultProps.onHide).toHaveBeenCalled()
+  })
+
+  it('should call onHide when close button clicked', () => {
+    render(<ModifyRetrievalModal {...defaultProps} />)
+    fireEvent.click(screen.getByRole('button', { name: /operation\.close$/ }))
     expect(defaultProps.onHide).toHaveBeenCalled()
   })
 
   it('should call onSave with retrieval config when save clicked', () => {
     render(<ModifyRetrievalModal {...defaultProps} />)
-    fireEvent.click(screen.getByTestId('save-button'))
+    fireEvent.click(screen.getByRole('button', { name: /operation\.save$/ }))
     expect(defaultProps.onSave).toHaveBeenCalled()
   })
 
diff --git a/web/app/components/datasets/hit-testing/components/__tests__/chunk-detail-modal.spec.tsx b/web/app/components/datasets/hit-testing/components/__tests__/chunk-detail-modal.spec.tsx
index 109d2f9cfe..90e52bf271 100644
--- a/web/app/components/datasets/hit-testing/components/__tests__/chunk-detail-modal.spec.tsx
+++ b/web/app/components/datasets/hit-testing/components/__tests__/chunk-detail-modal.spec.tsx
@@ -1,5 +1,5 @@
 import type { HitTesting } from '@/models/datasets'
-import { render, screen } from '@testing-library/react'
+import { fireEvent, render, screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import ChunkDetailModal from '../chunk-detail-modal'
 
@@ -11,16 +11,6 @@ vi.mock('@/app/components/base/markdown', () => ({
   Markdown: ({ content }: { content: string }) => <div data-testid="markdown">{content}</div>,
 }))
 
-vi.mock('@/app/components/base/modal', () => ({
-  default: ({ children, title, onClose }: { children: React.ReactNode, title: string, onClose: () => void }) => (
-    <div data-testid="modal">
-      <div data-testid="modal-title">{title}</div>
-      <button data-testid="modal-close" onClick={onClose}>close</button>
-      {children}
-    </div>
-  ),
-}))
-
 vi.mock('../../../common/image-list', () => ({
   default: () => <div data-testid="image-list" />,
 }))
@@ -85,7 +75,7 @@ describe('ChunkDetailModal', () => {
 
   it('should render modal with title', () => {
     render(<ChunkDetailModal payload={makePayload()} onHide={onHide} />)
-    expect(screen.getByTestId('modal-title')).toHaveTextContent('chunkDetail')
+    expect(screen.getByRole('dialog')).toHaveTextContent('chunkDetail')
   })
 
   it('should render segment index tag and score', () => {
@@ -134,4 +124,18 @@ describe('ChunkDetailModal', () => {
     render(<ChunkDetailModal payload={makePayload()} onHide={onHide} />)
     expect(screen.getByTestId('mask')).toBeInTheDocument()
   })
+
+  it('should call onHide when close button is clicked', () => {
+    render(<ChunkDetailModal payload={makePayload()} onHide={onHide} />)
+    fireEvent.click(screen.getByRole('button', { name: 'Close' }))
+    expect(onHide).toHaveBeenCalled()
+  })
+
+  it('should call onHide when the dialog requests close', () => {
+    render(<ChunkDetailModal payload={makePayload()} onHide={onHide} />)
+
+    fireEvent.keyDown(document, { key: 'Escape', code: 'Escape' })
+
+    expect(onHide).toHaveBeenCalledTimes(1)
+  })
 })
diff --git a/web/app/components/datasets/hit-testing/components/__tests__/result-item-footer.spec.tsx b/web/app/components/datasets/hit-testing/components/__tests__/result-item-footer.spec.tsx
index 44a7dc2c89..425066dbb6 100644
--- a/web/app/components/datasets/hit-testing/components/__tests__/result-item-footer.spec.tsx
+++ b/web/app/components/datasets/hit-testing/components/__tests__/result-item-footer.spec.tsx
@@ -61,8 +61,7 @@ describe('ResultItemFooter', () => {
         />,
       )
 
-      const openButton = screen.getByText(/open/i)
-      fireEvent.click(openButton)
+      fireEvent.click(screen.getByRole('button', { name: /open/i }))
 
       expect(mockShowDetailModal).toHaveBeenCalledTimes(1)
     })
diff --git a/web/app/components/datasets/hit-testing/components/chunk-detail-modal.tsx b/web/app/components/datasets/hit-testing/components/chunk-detail-modal.tsx
index ee0d949a7e..692ea17104 100644
--- a/web/app/components/datasets/hit-testing/components/chunk-detail-modal.tsx
+++ b/web/app/components/datasets/hit-testing/components/chunk-detail-modal.tsx
@@ -2,12 +2,12 @@
 import type { FileAppearanceTypeEnum } from '@/app/components/base/file-uploader/types'
 import type { HitTesting } from '@/models/datasets'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogCloseButton, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import * as React from 'react'
 import { useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import FileIcon from '@/app/components/base/file-uploader/file-type-icon'
 import { Markdown } from '@/app/components/base/markdown'
-import Modal from '@/app/components/base/modal'
 import Tag from '@/app/components/datasets/documents/detail/completed/common/tag'
 import ImageList from '../../common/image-list'
 import Dot from '../../documents/detail/completed/common/dot'
@@ -52,93 +52,105 @@ const ChunkDetailModal = ({
   const showKeywords = !isParentChildRetrieval && keywords && keywords.length > 0
 
   return (
-    <Modal
-      title={t(`${i18nPrefix}chunkDetail`, { ns: 'datasetHitTesting' })}
-      isShow
-      closable
-      onClose={onHide}
-      className={cn(isParentChildRetrieval ? 'min-w-[1200px]!' : 'min-w-[800px]!')}
+    <Dialog
+      open
+      onOpenChange={(open) => {
+        if (!open)
+          onHide()
+      }}
     >
-      <div className="mt-4 flex">
-        <div className={cn('flex-1', isParentChildRetrieval && 'pr-6')}>
-          {/* Meta info */}
-          <div className="flex items-center justify-between">
-            <div className="flex grow items-center space-x-2">
-              <SegmentIndexTag
-                labelPrefix={labelPrefix}
-                positionId={position}
-                className={cn('w-fit group-hover:opacity-100')}
-              />
-              <Dot />
-              <div className="flex grow items-center space-x-1">
-                <FileIcon type={extension} size="sm" />
-                <span className="w-0 grow truncate text-[13px] font-normal text-text-secondary">{document.name}</span>
+      <DialogContent className={cn('max-h-[calc(100dvh-2rem)] overflow-y-auto! border-none p-6 text-left align-middle', isParentChildRetrieval ? 'w-[1200px] max-w-none! min-w-[1200px]!' : 'w-[800px] max-w-none! min-w-[800px]!')}>
+        <DialogCloseButton
+          onClick={(e) => {
+            e.stopPropagation()
+            onHide()
+          }}
+        />
+        <DialogTitle className="title-2xl-semi-bold text-text-primary">
+          {t(`${i18nPrefix}chunkDetail`, { ns: 'datasetHitTesting' })}
+        </DialogTitle>
+
+        <div className="mt-4 flex">
+          <div className={cn('flex-1', isParentChildRetrieval && 'pr-6')}>
+            {/* Meta info */}
+            <div className="flex items-center justify-between">
+              <div className="flex grow items-center space-x-2">
+                <SegmentIndexTag
+                  labelPrefix={labelPrefix}
+                  positionId={position}
+                  className={cn('w-fit group-hover:opacity-100')}
+                />
+                <Dot />
+                <div className="flex grow items-center space-x-1">
+                  <FileIcon type={extension} size="sm" />
+                  <span className="w-0 grow truncate text-[13px] font-normal text-text-secondary">{document.name}</span>
+                </div>
               </div>
+              <Score value={score} />
             </div>
-            <Score value={score} />
-          </div>
-          {/* Content */}
-          <div className="relative">
-            {!answer && (
-              <Markdown
-                className={cn('mt-2! text-text-secondary!', heighClassName)}
-                content={sign_content || content}
-                customDisallowedElements={['input']}
-              />
-            )}
-            {answer && (
-              <div className="break-all">
-                <div className="flex gap-x-1">
-                  <div className="w-4 shrink-0 text-[13px] leading-[20px] font-medium text-text-tertiary">Q</div>
-                  <div className={cn('line-clamp-20 body-md-regular text-text-secondary')}>
-                    {content}
+            {/* Content */}
+            <div className="relative">
+              {!answer && (
+                <Markdown
+                  className={cn('mt-2! text-text-secondary!', heighClassName)}
+                  content={sign_content || content}
+                  customDisallowedElements={['input']}
+                />
+              )}
+              {answer && (
+                <div className="break-all">
+                  <div className="flex gap-x-1">
+                    <div className="w-4 shrink-0 text-[13px] leading-[20px] font-medium text-text-tertiary">Q</div>
+                    <div className={cn('line-clamp-20 body-md-regular text-text-secondary')}>
+                      {content}
+                    </div>
+                  </div>
+                  <div className="flex gap-x-1">
+                    <div className="w-4 shrink-0 text-[13px] leading-[20px] font-medium text-text-tertiary">A</div>
+                    <div className={cn('line-clamp-20 body-md-regular text-text-secondary')}>
+                      {answer}
+                    </div>
                   </div>
                 </div>
-                <div className="flex gap-x-1">
-                  <div className="w-4 shrink-0 text-[13px] leading-[20px] font-medium text-text-tertiary">A</div>
-                  <div className={cn('line-clamp-20 body-md-regular text-text-secondary')}>
-                    {answer}
+              )}
+              {/* Mask */}
+              <Mask className="absolute inset-x-0 bottom-0" />
+            </div>
+            {(showImages || showKeywords || !!summary) && (
+              <div className="flex flex-col gap-y-3 pt-3">
+                {showImages && (
+                  <ImageList images={images} size="md" className="py-1" />
+                )}
+                {!!summary && (
+                  <SummaryText value={summary} disabled />
+                )}
+                {showKeywords && (
+                  <div className="flex flex-col gap-y-1">
+                    <div className="text-xs font-medium text-text-tertiary uppercase">{t(`${i18nPrefix}keyword`, { ns: 'datasetHitTesting' })}</div>
+                    <div className="flex flex-wrap gap-x-2">
+                      {keywords.map(keyword => (
+                        <Tag key={keyword} text={keyword} />
+                      ))}
+                    </div>
                   </div>
-                </div>
+                )}
               </div>
             )}
-            {/* Mask */}
-            <Mask className="absolute inset-x-0 bottom-0" />
           </div>
-          {(showImages || showKeywords || !!summary) && (
-            <div className="flex flex-col gap-y-3 pt-3">
-              {showImages && (
-                <ImageList images={images} size="md" className="py-1" />
-              )}
-              {!!summary && (
-                <SummaryText value={summary} disabled />
-              )}
-              {showKeywords && (
-                <div className="flex flex-col gap-y-1">
-                  <div className="text-xs font-medium text-text-tertiary uppercase">{t(`${i18nPrefix}keyword`, { ns: 'datasetHitTesting' })}</div>
-                  <div className="flex flex-wrap gap-x-2">
-                    {keywords.map(keyword => (
-                      <Tag key={keyword} text={keyword} />
-                    ))}
-                  </div>
-                </div>
-              )}
+
+          {isParentChildRetrieval && (
+            <div className="flex-1 pb-6 pl-6">
+              <div className="system-xs-semibold-uppercase text-text-secondary">{t(`${i18nPrefix}hitChunks`, { ns: 'datasetHitTesting', num: child_chunks.length })}</div>
+              <div className={cn('mt-1 space-y-2', heighClassName)}>
+                {child_chunks.map(item => (
+                  <ChildChunksItem key={item.id} payload={item} isShowAll />
+                ))}
+              </div>
             </div>
           )}
         </div>
-
-        {isParentChildRetrieval && (
-          <div className="flex-1 pb-6 pl-6">
-            <div className="system-xs-semibold-uppercase text-text-secondary">{t(`${i18nPrefix}hitChunks`, { ns: 'datasetHitTesting', num: child_chunks.length })}</div>
-            <div className={cn('mt-1 space-y-2', heighClassName)}>
-              {child_chunks.map(item => (
-                <ChildChunksItem key={item.id} payload={item} isShowAll />
-              ))}
-            </div>
-          </div>
-        )}
-      </div>
-    </Modal>
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/components/datasets/hit-testing/components/result-item-external.tsx b/web/app/components/datasets/hit-testing/components/result-item-external.tsx
index 68e9930665..069ad8fa59 100644
--- a/web/app/components/datasets/hit-testing/components/result-item-external.tsx
+++ b/web/app/components/datasets/hit-testing/components/result-item-external.tsx
@@ -2,11 +2,11 @@
 import type { FC } from 'react'
 import type { ExternalKnowledgeBaseHitTesting } from '@/models/datasets'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogCloseButton, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import { useBoolean } from 'ahooks'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import { FileAppearanceTypeEnum } from '@/app/components/base/file-uploader/types'
-import Modal from '@/app/components/base/modal'
 import ResultItemFooter from './result-item-footer'
 import ResultItemMeta from './result-item-meta'
 
@@ -38,20 +38,27 @@ const ResultItemExternal: FC<Props> = ({ payload, positionId }) => {
       <ResultItemFooter docType={FileAppearanceTypeEnum.custom} docTitle={title} showDetailModal={showDetailModal} />
 
       {isShowDetailModal && (
-        <Modal
-          title={t(`${i18nPrefix}chunkDetail`, { ns: 'datasetHitTesting' })}
-          className="min-w-[800px]!"
-          closable
-          onClose={hideDetailModal}
-          isShow={isShowDetailModal}
+        <Dialog
+          open={isShowDetailModal}
+          onOpenChange={(open) => {
+            if (!open)
+              hideDetailModal()
+          }}
         >
-          <div className="mt-4 flex-1">
-            <ResultItemMeta labelPrefix="Chunk" positionId={positionId} wordCount={content.length} score={score} />
-            <div className={cn('mt-2 body-md-regular break-all text-text-secondary', 'h-[min(539px,80vh)] overflow-y-auto')}>
-              {content}
+          <DialogContent className="flex max-h-[calc(100dvh-2rem)] w-full min-w-[800px]! flex-col overflow-hidden! border-none text-left align-middle">
+            <DialogCloseButton />
+            <DialogTitle className="shrink-0 title-2xl-semi-bold text-text-primary">
+              {t(`${i18nPrefix}chunkDetail`, { ns: 'datasetHitTesting' })}
+            </DialogTitle>
+
+            <div className="mt-4 flex min-h-0 flex-1 flex-col">
+              <ResultItemMeta labelPrefix="Chunk" positionId={positionId} wordCount={content.length} score={score} />
+              <div className="mt-2 min-h-0 flex-1 overflow-y-auto body-md-regular break-all text-text-secondary">
+                {content}
+              </div>
             </div>
-          </div>
-        </Modal>
+          </DialogContent>
+        </Dialog>
       )}
     </div>
   )
diff --git a/web/app/components/datasets/hit-testing/components/result-item-footer.tsx b/web/app/components/datasets/hit-testing/components/result-item-footer.tsx
index 5b1198fcc1..bb1b7c172d 100644
--- a/web/app/components/datasets/hit-testing/components/result-item-footer.tsx
+++ b/web/app/components/datasets/hit-testing/components/result-item-footer.tsx
@@ -28,13 +28,14 @@ const ResultItemFooter: FC<Props> = ({
           {docTitle}
         </span>
       </div>
-      <div
-        className="flex cursor-pointer items-center space-x-1 text-text-tertiary"
+      <button
+        type="button"
+        className="flex cursor-pointer items-center space-x-1 border-none bg-transparent p-0 text-left text-text-tertiary"
         onClick={showDetailModal}
       >
         <div className="text-xs uppercase">{t(`${i18nPrefix}open`, { ns: 'datasetHitTesting' })}</div>
-        <RiArrowRightUpLine className="size-3.5" />
-      </div>
+        <RiArrowRightUpLine className="size-3.5" aria-hidden />
+      </button>
     </div>
   )
 }
diff --git a/web/app/components/datasets/hit-testing/index.tsx b/web/app/components/datasets/hit-testing/index.tsx
index ec9100bb97..7c1ce62860 100644
--- a/web/app/components/datasets/hit-testing/index.tsx
+++ b/web/app/components/datasets/hit-testing/index.tsx
@@ -10,12 +10,19 @@ import type {
 } from '@/models/datasets'
 import type { RetrievalConfig } from '@/types/app'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  Drawer,
+  DrawerBackdrop,
+  DrawerContent,
+  DrawerPopup,
+  DrawerPortal,
+  DrawerViewport,
+} from '@langgenius/dify-ui/drawer'
 import { useBoolean } from 'ahooks'
 import * as React from 'react'
 import { useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useContext } from 'use-context-selector'
-import Drawer from '@/app/components/base/drawer'
 import FloatRightContainer from '@/app/components/base/float-right-container'
 import Loading from '@/app/components/base/loading'
 import Pagination from '@/app/components/base/pagination'
@@ -158,7 +165,6 @@ const HitTestingPage: FC<Props> = ({ datasetId }: Props) => {
         isMobile={isMobile}
         isOpen={isShowRightPanel}
         onClose={hideRightPanel}
-        footer={null}
       >
         <div className="flex min-w-0 flex-1 flex-col pt-3">
           {isRetrievalLoading
@@ -181,23 +187,33 @@ const HitTestingPage: FC<Props> = ({ datasetId }: Props) => {
         </div>
       </FloatRightContainer>
       <Drawer
-        unmount={true}
-        isOpen={isShowModifyRetrievalModal}
-        onClose={() => setIsShowModifyRetrievalModal(false)}
-        footer={null}
-        mask={isMobile}
-        panelClassName="mt-16 mx-2 sm:mr-2 mb-3 p-0! max-w-[640px]! rounded-xl"
-      >
-        <ModifyRetrievalModal
-          indexMethod={currentDataset?.indexing_technique || ''}
-          value={retrievalConfig}
-          isShow={isShowModifyRetrievalModal}
-          onHide={() => setIsShowModifyRetrievalModal(false)}
-          onSave={(value) => {
-            setRetrievalConfig(value)
+        open={isShowModifyRetrievalModal}
+        modal
+        swipeDirection="right"
+        onOpenChange={(open) => {
+          if (!open)
             setIsShowModifyRetrievalModal(false)
-          }}
-        />
+        }}
+      >
+        <DrawerPortal>
+          <DrawerBackdrop className={cn(!isMobile && 'bg-transparent')} />
+          <DrawerViewport>
+            <DrawerPopup className="p-0! data-[swipe-direction=right]:top-16 data-[swipe-direction=right]:right-2 data-[swipe-direction=right]:bottom-3 data-[swipe-direction=right]:h-auto data-[swipe-direction=right]:w-full data-[swipe-direction=right]:max-w-[640px] data-[swipe-direction=right]:rounded-xl">
+              <DrawerContent className="flex min-h-0 flex-1 flex-col p-0 pb-0">
+                <ModifyRetrievalModal
+                  indexMethod={currentDataset?.indexing_technique || ''}
+                  value={retrievalConfig}
+                  isShow={isShowModifyRetrievalModal}
+                  onHide={() => setIsShowModifyRetrievalModal(false)}
+                  onSave={(value) => {
+                    setRetrievalConfig(value)
+                    setIsShowModifyRetrievalModal(false)
+                  }}
+                />
+              </DrawerContent>
+            </DrawerPopup>
+          </DrawerViewport>
+        </DrawerPortal>
       </Drawer>
     </div>
   )
diff --git a/web/app/components/datasets/hit-testing/modify-retrieval-modal.tsx b/web/app/components/datasets/hit-testing/modify-retrieval-modal.tsx
index 98bcab2755..02103e02c8 100644
--- a/web/app/components/datasets/hit-testing/modify-retrieval-modal.tsx
+++ b/web/app/components/datasets/hit-testing/modify-retrieval-modal.tsx
@@ -85,9 +85,14 @@ const ModifyRetrievalModal: FC<Props> = ({ indexMethod, value, isShow, onHide, o
           </div>
         </div>
         <div className="flex">
-          <div onClick={onHide} className="flex h-8 w-8 cursor-pointer items-center justify-center">
-            <RiCloseLine className="h-4 w-4 text-text-tertiary" />
-          </div>
+          <button
+            type="button"
+            className="flex h-8 w-8 cursor-pointer items-center justify-center border-none bg-transparent p-0 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+            aria-label={t('operation.close', { ns: 'common' })}
+            onClick={onHide}
+          >
+            <RiCloseLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
+          </button>
         </div>
       </div>
 
diff --git a/web/app/components/datasets/list/__tests__/datasets.spec.tsx b/web/app/components/datasets/list/__tests__/datasets.spec.tsx
index 5b777e0b2e..f78622a9cd 100644
--- a/web/app/components/datasets/list/__tests__/datasets.spec.tsx
+++ b/web/app/components/datasets/list/__tests__/datasets.spec.tsx
@@ -56,8 +56,6 @@ vi.mock('@/context/app-context', () => ({
 // Mock useDatasetCardState hook
 vi.mock('../dataset-card/hooks/use-dataset-card-state', () => ({
   useDatasetCardState: () => ({
-    tags: [],
-    setTags: vi.fn(),
     modalState: {
       showRenameModal: false,
       showConfirmDelete: false,
@@ -77,6 +75,14 @@ vi.mock('../../rename-modal', () => ({
   default: () => null,
 }))
 
+vi.mock('../dataset-card', () => ({
+  default: ({ dataset }: { dataset: DataSet }) => (
+    <article data-testid={`dataset-card-${dataset.id}`}>
+      {dataset.name}
+    </article>
+  ),
+}))
+
 function createMockDataset(overrides: Partial<DataSet> = {}): DataSet {
   return {
     id: 'dataset-1',
diff --git a/web/app/components/datasets/list/__tests__/index.spec.tsx b/web/app/components/datasets/list/__tests__/index.spec.tsx
index adc53debbd..7e46c46f1a 100644
--- a/web/app/components/datasets/list/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/list/__tests__/index.spec.tsx
@@ -36,11 +36,6 @@ vi.mock('@/context/external-api-panel-context', () => ({
   }),
 }))
 
-// Mock tag management store
-vi.mock('@/app/components/base/tag-management/store', () => ({
-  useStore: () => false,
-}))
-
 // Mock useDocumentTitle hook
 vi.mock('@/hooks/use-document-title', () => ({
   default: vi.fn(),
@@ -108,15 +103,16 @@ vi.mock('@/app/components/develop/secret-key/secret-key-modal', () => ({
 }))
 
 // Mock TagManagementModal
-vi.mock('@/app/components/base/tag-management', () => ({
-  default: () => <div data-testid="tag-management-modal" />,
+vi.mock('@/features/tag-management/components/tag-management-modal', () => ({
+  TagManagementModal: ({ show }: { show: boolean }) => show ? <div data-testid="tag-management-modal" /> : null,
 }))
 
 // Mock TagFilter
-vi.mock('@/app/components/base/tag-management/filter', () => ({
-  default: ({ onChange }: { value: string[], onChange: (val: string[]) => void }) => (
+vi.mock('@/features/tag-management/components/tag-filter', () => ({
+  TagFilter: ({ onChange, onOpenTagManagement }: { value: string[], onChange: (val: string[]) => void, onOpenTagManagement: () => void }) => (
     <div data-testid="tag-filter">
       <button onClick={() => onChange(['tag-1', 'tag-2'])}>Select Tags</button>
+      <button onClick={onOpenTagManagement}>Manage Tags</button>
     </div>
   ),
 }))
@@ -226,7 +222,7 @@ describe('List', () => {
     it('should have correct container styling', () => {
       const { container } = render(<List />)
       const mainContainer = container.firstChild as HTMLElement
-      expect(mainContainer).toHaveClass('scroll-container', 'relative', 'flex', 'grow', 'flex-col')
+      expect(mainContainer).toHaveClass('relative', 'flex', 'grow', 'flex-col')
     })
   })
 
@@ -312,15 +308,9 @@ describe('List', () => {
       expect(mockSetShowExternalApiPanel).toHaveBeenCalledWith(false)
     })
 
-    it('should show TagManagementModal when showTagManagementModal is true', async () => {
-      vi.doMock('@/app/components/base/tag-management/store', () => ({
-        useStore: () => true, // showTagManagementModal is true
-      }))
-
-      vi.resetModules()
-      const { default: ListComponent } = await import('../index')
-
-      render(<ListComponent />)
+    it('should show TagManagementModal when tag management is opened', () => {
+      render(<List />)
+      fireEvent.click(screen.getByText('Manage Tags'))
 
       expect(screen.getByTestId('tag-management-modal')).toBeInTheDocument()
     })
diff --git a/web/app/components/datasets/list/dataset-card/__tests__/index.spec.tsx b/web/app/components/datasets/list/dataset-card/__tests__/index.spec.tsx
index f6c7e1e93d..55176faf47 100644
--- a/web/app/components/datasets/list/dataset-card/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/list/dataset-card/__tests__/index.spec.tsx
@@ -30,8 +30,6 @@ vi.mock('@/context/app-context', () => ({
 
 vi.mock('../hooks/use-dataset-card-state', () => ({
   useDatasetCardState: () => ({
-    tags: [],
-    setTags: vi.fn(),
     modalState: {
       showRenameModal: false,
       showConfirmDelete: false,
@@ -55,8 +53,8 @@ vi.mock('../components/dataset-card-header', () => ({
 vi.mock('../components/dataset-card-modals', () => ({
   default: () => <div data-testid="card-modals" />,
 }))
-vi.mock('../components/tag-area', () => ({
-  default: ({ onClick }: { onClick: (e: React.MouseEvent) => void, ref?: React.Ref<HTMLDivElement> }) => (
+vi.mock('@/features/tag-management/components/dataset-card-tags', () => ({
+  DatasetCardTags: ({ onClick }: { onClick: (e: React.MouseEvent) => void }) => (
     <div data-testid="tag-area" onClick={onClick} />
   ),
 }))
diff --git a/web/app/components/datasets/list/dataset-card/components/__tests__/tag-area.spec.tsx b/web/app/components/datasets/list/dataset-card/components/__tests__/tag-area.spec.tsx
deleted file mode 100644
index 2858469cdb..0000000000
--- a/web/app/components/datasets/list/dataset-card/components/__tests__/tag-area.spec.tsx
+++ /dev/null
@@ -1,198 +0,0 @@
-import type { Tag } from '@/app/components/base/tag-management/constant'
-import type { DataSet } from '@/models/datasets'
-import { fireEvent, render, screen } from '@testing-library/react'
-import { useRef } from 'react'
-import { describe, expect, it, vi } from 'vitest'
-import { IndexingType } from '@/app/components/datasets/create/step-two'
-import { ChunkingMode, DatasetPermission, DataSourceType } from '@/models/datasets'
-import TagArea from '../tag-area'
-
-// Mock TagSelector as it's a complex component from base
-vi.mock('@/app/components/base/tag-management/selector', () => ({
-  default: ({ value, selectedTags, onCacheUpdate, onChange }: {
-    value: string[]
-    selectedTags: Tag[]
-    onCacheUpdate: (tags: Tag[]) => void
-    onChange?: () => void
-  }) => (
-    <div data-testid="tag-selector">
-      <div data-testid="tag-values">{value.join(',')}</div>
-      <div data-testid="selected-count">
-        {selectedTags.length}
-        {' '}
-        tags
-      </div>
-      <button onClick={() => onCacheUpdate([{ id: 'new-tag', name: 'New Tag', type: 'knowledge', binding_count: 0 }])}>
-        Update Tags
-      </button>
-      <button onClick={onChange}>
-        Trigger Change
-      </button>
-    </div>
-  ),
-}))
-
-describe('TagArea', () => {
-  const createMockDataset = (overrides: Partial<DataSet> = {}): DataSet => ({
-    id: 'dataset-1',
-    name: 'Test Dataset',
-    description: 'Test description',
-    provider: 'vendor',
-    permission: DatasetPermission.allTeamMembers,
-    data_source_type: DataSourceType.FILE,
-    indexing_technique: IndexingType.QUALIFIED,
-    embedding_available: true,
-    app_count: 5,
-    document_count: 10,
-    word_count: 1000,
-    updated_at: 1609545600,
-    tags: [],
-    embedding_model: 'text-embedding-ada-002',
-    embedding_model_provider: 'openai',
-    created_by: 'user-1',
-    doc_form: ChunkingMode.text,
-    ...overrides,
-  } as DataSet)
-
-  const mockTags: Tag[] = [
-    { id: 'tag-1', name: 'Tag 1', type: 'knowledge', binding_count: 0 },
-    { id: 'tag-2', name: 'Tag 2', type: 'knowledge', binding_count: 0 },
-  ]
-
-  const defaultProps = {
-    dataset: createMockDataset(),
-    tags: mockTags,
-    setTags: vi.fn(),
-    onSuccess: vi.fn(),
-    isHoveringTagSelector: false,
-    onClick: vi.fn(),
-  }
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  describe('Rendering', () => {
-    it('should render without crashing', () => {
-      render(<TagArea {...defaultProps} />)
-      expect(screen.getByTestId('tag-selector')).toBeInTheDocument()
-    })
-
-    it('should render TagSelector with correct value', () => {
-      render(<TagArea {...defaultProps} />)
-      expect(screen.getByTestId('tag-values')).toHaveTextContent('tag-1,tag-2')
-    })
-
-    it('should display selected tags count', () => {
-      render(<TagArea {...defaultProps} />)
-      expect(screen.getByTestId('selected-count')).toHaveTextContent('2 tags')
-    })
-  })
-
-  describe('Props', () => {
-    it('should pass dataset id to TagSelector', () => {
-      const dataset = createMockDataset({ id: 'custom-dataset-id' })
-      render(<TagArea {...defaultProps} dataset={dataset} />)
-      expect(screen.getByTestId('tag-selector')).toBeInTheDocument()
-    })
-
-    it('should render with empty tags', () => {
-      render(<TagArea {...defaultProps} tags={[]} />)
-      expect(screen.getByTestId('selected-count')).toHaveTextContent('0 tags')
-    })
-
-    it('should forward ref correctly', () => {
-      const TestComponent = () => {
-        const ref = useRef<HTMLDivElement>(null)
-        return <TagArea {...defaultProps} ref={ref} />
-      }
-      render(<TestComponent />)
-      expect(screen.getByTestId('tag-selector')).toBeInTheDocument()
-    })
-  })
-
-  describe('User Interactions', () => {
-    it('should call onClick when container is clicked', () => {
-      const onClick = vi.fn()
-      const { container } = render(<TagArea {...defaultProps} onClick={onClick} />)
-
-      const wrapper = container.firstChild as HTMLElement
-      fireEvent.click(wrapper)
-
-      expect(onClick).toHaveBeenCalledTimes(1)
-    })
-
-    it('should call setTags when tags are updated', () => {
-      const setTags = vi.fn()
-      render(<TagArea {...defaultProps} setTags={setTags} />)
-
-      fireEvent.click(screen.getByText('Update Tags'))
-
-      expect(setTags).toHaveBeenCalledWith([{ id: 'new-tag', name: 'New Tag', type: 'knowledge', binding_count: 0 }])
-    })
-
-    it('should call onSuccess when onChange is triggered', () => {
-      const onSuccess = vi.fn()
-      render(<TagArea {...defaultProps} onSuccess={onSuccess} />)
-
-      fireEvent.click(screen.getByText('Trigger Change'))
-
-      expect(onSuccess).toHaveBeenCalledTimes(1)
-    })
-  })
-
-  describe('Styles', () => {
-    it('should have opacity class when embedding is not available', () => {
-      const dataset = createMockDataset({ embedding_available: false })
-      const { container } = render(<TagArea {...defaultProps} dataset={dataset} />)
-      const wrapper = container.firstChild as HTMLElement
-      expect(wrapper).toHaveClass('opacity-30')
-    })
-
-    it('should not have opacity class when embedding is available', () => {
-      const dataset = createMockDataset({ embedding_available: true })
-      const { container } = render(<TagArea {...defaultProps} dataset={dataset} />)
-      const wrapper = container.firstChild as HTMLElement
-      expect(wrapper).not.toHaveClass('opacity-30')
-    })
-
-    it('should show mask when not hovering and has tags', () => {
-      const { container } = render(<TagArea {...defaultProps} isHoveringTagSelector={false} tags={mockTags} />)
-      const maskDiv = container.querySelector('.bg-tag-selector-mask-bg')
-      expect(maskDiv).toBeInTheDocument()
-      expect(maskDiv).not.toHaveClass('hidden')
-    })
-
-    it('should hide mask when hovering', () => {
-      const { container } = render(<TagArea {...defaultProps} isHoveringTagSelector={true} />)
-      // When hovering, the mask div should have 'hidden' class
-      const maskDiv = container.querySelector('.absolute.right-0.top-0')
-      expect(maskDiv).toHaveClass('hidden')
-    })
-
-    it('should make TagSelector visible when tags exist', () => {
-      const { container } = render(<TagArea {...defaultProps} tags={mockTags} />)
-      const tagSelectorWrapper = container.querySelector('.visible')
-      expect(tagSelectorWrapper).toBeInTheDocument()
-    })
-  })
-
-  describe('Edge Cases', () => {
-    it('should handle undefined onSuccess', () => {
-      render(<TagArea {...defaultProps} onSuccess={undefined} />)
-      // Should not throw when clicking Trigger Change
-      expect(() => fireEvent.click(screen.getByText('Trigger Change'))).not.toThrow()
-    })
-
-    it('should handle many tags', () => {
-      const manyTags: Tag[] = Array.from({ length: 20 }, (_, i) => ({
-        id: `tag-${i}`,
-        name: `Tag ${i}`,
-        type: 'knowledge' as const,
-        binding_count: 0,
-      }))
-      render(<TagArea {...defaultProps} tags={manyTags} />)
-      expect(screen.getByTestId('selected-count')).toHaveTextContent('20 tags')
-    })
-  })
-})
diff --git a/web/app/components/datasets/list/dataset-card/components/tag-area.tsx b/web/app/components/datasets/list/dataset-card/components/tag-area.tsx
deleted file mode 100644
index 2c8d6aa73a..0000000000
--- a/web/app/components/datasets/list/dataset-card/components/tag-area.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import type { Tag } from '@/app/components/base/tag-management/constant'
-import type { DataSet } from '@/models/datasets'
-import { cn } from '@langgenius/dify-ui/cn'
-import * as React from 'react'
-import TagSelector from '@/app/components/base/tag-management/selector'
-
-type TagAreaProps = {
-  dataset: DataSet
-  tags: Tag[]
-  setTags: (tags: Tag[]) => void
-  onSuccess?: () => void
-  isHoveringTagSelector: boolean
-  onClick: (e: React.MouseEvent) => void
-}
-
-const TagArea = React.forwardRef<HTMLDivElement, TagAreaProps>(({
-  dataset,
-  tags,
-  setTags,
-  onSuccess,
-  isHoveringTagSelector,
-  onClick,
-}, ref) => (
-  <div
-    className={cn('relative w-full px-3', !dataset.embedding_available && 'opacity-30')}
-    onClick={onClick}
-  >
-    <div
-      ref={ref}
-      className={cn(
-        'invisible w-full group-hover:visible',
-        tags.length > 0 && 'visible',
-      )}
-    >
-      <TagSelector
-        position="bl"
-        type="knowledge"
-        targetID={dataset.id}
-        value={tags.map(tag => tag.id)}
-        selectedTags={tags}
-        onCacheUpdate={setTags}
-        onChange={onSuccess}
-      />
-    </div>
-    <div
-      className={cn(
-        'absolute top-0 right-0 z-5 h-full w-20 bg-tag-selector-mask-bg group-hover:bg-tag-selector-mask-hover-bg',
-        isHoveringTagSelector && 'hidden',
-      )}
-    />
-  </div>
-))
-TagArea.displayName = 'TagArea'
-
-export default TagArea
diff --git a/web/app/components/datasets/list/dataset-card/hooks/__tests__/use-dataset-card-state.spec.ts b/web/app/components/datasets/list/dataset-card/hooks/__tests__/use-dataset-card-state.spec.ts
index 7d07bcf9d0..fa4868f391 100644
--- a/web/app/components/datasets/list/dataset-card/hooks/__tests__/use-dataset-card-state.spec.ts
+++ b/web/app/components/datasets/list/dataset-card/hooks/__tests__/use-dataset-card-state.spec.ts
@@ -66,15 +66,6 @@ describe('useDatasetCardState', () => {
   })
 
   describe('Initial State', () => {
-    it('should return tags from dataset', () => {
-      const dataset = createMockDataset()
-      const { result } = renderHook(() =>
-        useDatasetCardState({ dataset, onSuccess: vi.fn() }),
-      )
-
-      expect(result.current.tags).toEqual(dataset.tags)
-    })
-
     it('should have initial modal state closed', () => {
       const dataset = createMockDataset()
       const { result } = renderHook(() =>
@@ -96,36 +87,6 @@ describe('useDatasetCardState', () => {
     })
   })
 
-  describe('Tags State', () => {
-    it('should update tags when setTags is called', () => {
-      const dataset = createMockDataset()
-      const { result } = renderHook(() =>
-        useDatasetCardState({ dataset, onSuccess: vi.fn() }),
-      )
-
-      act(() => {
-        result.current.setTags([{ id: 'tag-2', name: 'Tag 2', type: 'knowledge', binding_count: 0 }])
-      })
-
-      expect(result.current.tags).toEqual([{ id: 'tag-2', name: 'Tag 2', type: 'knowledge', binding_count: 0 }])
-    })
-
-    it('should sync tags when dataset tags change', () => {
-      const dataset = createMockDataset()
-      const { result, rerender } = renderHook(
-        ({ dataset }) => useDatasetCardState({ dataset, onSuccess: vi.fn() }),
-        { initialProps: { dataset } },
-      )
-
-      const newTags = [{ id: 'tag-3', name: 'Tag 3', type: 'knowledge', binding_count: 0 }]
-      const updatedDataset = createMockDataset({ tags: newTags })
-
-      rerender({ dataset: updatedDataset })
-
-      expect(result.current.tags).toEqual(newTags)
-    })
-  })
-
   describe('Modal Handlers', () => {
     it('should open rename modal when openRenameModal is called', () => {
       const dataset = createMockDataset()
@@ -279,15 +240,6 @@ describe('useDatasetCardState', () => {
   })
 
   describe('Edge Cases', () => {
-    it('should handle empty tags array', () => {
-      const dataset = createMockDataset({ tags: [] })
-      const { result } = renderHook(() =>
-        useDatasetCardState({ dataset, onSuccess: vi.fn() }),
-      )
-
-      expect(result.current.tags).toEqual([])
-    })
-
     it('should handle undefined onSuccess', async () => {
       const dataset = createMockDataset()
       const { result } = renderHook(() =>
diff --git a/web/app/components/datasets/list/dataset-card/hooks/use-dataset-card-state.ts b/web/app/components/datasets/list/dataset-card/hooks/use-dataset-card-state.ts
index 6cffbb6828..88aa7b50ae 100644
--- a/web/app/components/datasets/list/dataset-card/hooks/use-dataset-card-state.ts
+++ b/web/app/components/datasets/list/dataset-card/hooks/use-dataset-card-state.ts
@@ -1,7 +1,6 @@
-import type { Tag } from '@/app/components/base/tag-management/constant'
 import type { DataSet } from '@/models/datasets'
 import { toast } from '@langgenius/dify-ui/toast'
-import { useCallback, useEffect, useState } from 'react'
+import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useCheckDatasetUsage, useDeleteDataset } from '@/service/use-dataset-card'
 import { useExportPipelineDSL } from '@/service/use-pipeline'
@@ -20,11 +19,6 @@ type UseDatasetCardStateOptions = {
 
 export const useDatasetCardState = ({ dataset, onSuccess }: UseDatasetCardStateOptions) => {
   const { t } = useTranslation()
-  const [tags, setTags] = useState<Tag[]>(dataset.tags)
-
-  useEffect(() => {
-    setTags(dataset.tags)
-  }, [dataset.tags])
 
   // Modal state
   const [modalState, setModalState] = useState<ModalState>({
@@ -113,10 +107,6 @@ export const useDatasetCardState = ({ dataset, onSuccess }: UseDatasetCardStateO
   }, [dataset.id, deleteDatasetMutation, onSuccess, t, closeConfirmDelete])
 
   return {
-    // Tag state
-    tags,
-    setTags,
-
     // Modal state
     modalState,
     openRenameModal,
diff --git a/web/app/components/datasets/list/dataset-card/index.tsx b/web/app/components/datasets/list/dataset-card/index.tsx
index 5bd032d151..3fe4b6f7c0 100644
--- a/web/app/components/datasets/list/dataset-card/index.tsx
+++ b/web/app/components/datasets/list/dataset-card/index.tsx
@@ -1,8 +1,8 @@
 'use client'
 import type { DataSet } from '@/models/datasets'
-import { useHover } from 'ahooks'
-import { useMemo, useRef } from 'react'
+import { useMemo } from 'react'
 import { useSelector as useAppContextWithSelector } from '@/context/app-context'
+import { DatasetCardTags } from '@/features/tag-management/components/dataset-card-tags'
 import { useRouter } from '@/next/navigation'
 import CornerLabels from './components/corner-labels'
 import DatasetCardFooter from './components/dataset-card-footer'
@@ -10,29 +10,27 @@ import DatasetCardHeader from './components/dataset-card-header'
 import DatasetCardModals from './components/dataset-card-modals'
 import Description from './components/description'
 import OperationsDropdown from './components/operations-dropdown'
-import TagArea from './components/tag-area'
-import { useDatasetCardState } from './hooks/use-dataset-card-state'
+import { useDatasetCardState as useDatasetCardController } from './hooks/use-dataset-card-state'
 
 const EXTERNAL_PROVIDER = 'external'
 
 type DatasetCardProps = {
   dataset: DataSet
   onSuccess?: () => void
+  onOpenTagManagement?: () => void
 }
 
 const DatasetCard = ({
   dataset,
   onSuccess,
+  onOpenTagManagement = () => {},
 }: DatasetCardProps) => {
   const { push } = useRouter()
 
   const isCurrentWorkspaceDatasetOperator = useAppContextWithSelector(state => state.isCurrentWorkspaceDatasetOperator)
-  const tagSelectorRef = useRef<HTMLDivElement>(null)
-  const isHoveringTagSelector = useHover(tagSelectorRef)
 
+  const datasetCard = useDatasetCardController({ dataset, onSuccess })
   const {
-    tags,
-    setTags,
     modalState,
     openRenameModal,
     closeRenameModal,
@@ -40,7 +38,7 @@ const DatasetCard = ({
     handleExportPipeline,
     detectIsUsedByApp,
     onConfirmDelete,
-  } = useDatasetCardState({ dataset, onSuccess })
+  } = datasetCard
 
   const isExternalProvider = dataset.provider === EXTERNAL_PROVIDER
   const isPipelineUnpublished = useMemo(() => {
@@ -72,14 +70,13 @@ const DatasetCard = ({
         <CornerLabels dataset={dataset} />
         <DatasetCardHeader dataset={dataset} />
         <Description dataset={dataset} />
-        <TagArea
-          ref={tagSelectorRef}
-          dataset={dataset}
-          tags={tags}
-          setTags={setTags}
-          onSuccess={onSuccess}
-          isHoveringTagSelector={isHoveringTagSelector}
+        <DatasetCardTags
+          datasetId={dataset.id}
+          embeddingAvailable={dataset.embedding_available}
+          tags={dataset.tags}
           onClick={handleTagAreaClick}
+          onOpenTagManagement={onOpenTagManagement}
+          onTagsChange={onSuccess}
         />
         <DatasetCardFooter dataset={dataset} />
         <OperationsDropdown
diff --git a/web/app/components/datasets/list/datasets.tsx b/web/app/components/datasets/list/datasets.tsx
index 8d7006a08a..1e5c268636 100644
--- a/web/app/components/datasets/list/datasets.tsx
+++ b/web/app/components/datasets/list/datasets.tsx
@@ -12,12 +12,14 @@ type Props = {
   tags: string[]
   keywords: string
   includeAll: boolean
+  onOpenTagManagement?: () => void
 }
 
 const Datasets = ({
   tags,
   keywords,
   includeAll,
+  onOpenTagManagement = () => {},
 }: Props) => {
   const { t } = useTranslation()
   const isCurrentWorkspaceEditor = useAppContextWithSelector(state => state.isCurrentWorkspaceEditor)
@@ -60,7 +62,7 @@ const Datasets = ({
       <nav className="grid grow grid-cols-1 content-start gap-3 px-12 pt-2 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
         {isCurrentWorkspaceEditor && <NewDatasetCard />}
         {datasetList?.pages.map(({ data: datasets }) => datasets.map(dataset => (
-          <DatasetCard key={dataset.id} dataset={dataset} onSuccess={invalidDatasetList} />),
+          <DatasetCard key={dataset.id} dataset={dataset} onSuccess={invalidDatasetList} onOpenTagManagement={onOpenTagManagement} />),
         ))}
         {isFetchingNextPage && <Loading />}
         <div ref={anchorRef} className="h-0" />
diff --git a/web/app/components/datasets/list/index.tsx b/web/app/components/datasets/list/index.tsx
index 1f7eba63c6..3d405de95d 100644
--- a/web/app/components/datasets/list/index.tsx
+++ b/web/app/components/datasets/list/index.tsx
@@ -8,15 +8,13 @@ import { useBoolean, useDebounceFn } from 'ahooks'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Input from '@/app/components/base/input'
-import TagManagementModal from '@/app/components/base/tag-management'
-import TagFilter from '@/app/components/base/tag-management/filter'
-// Hooks
-import { useStore as useTagStore } from '@/app/components/base/tag-management/store'
 import CheckboxWithLabel from '@/app/components/datasets/create/website/base/checkbox-with-label'
 import { useAppContext, useSelector as useAppContextSelector } from '@/context/app-context'
 import { useExternalApiPanel } from '@/context/external-api-panel-context'
+import { TagFilter } from '@/features/tag-management/components/tag-filter'
+import { TagManagementModal } from '@/features/tag-management/components/tag-management-modal'
 import useDocumentTitle from '@/hooks/use-document-title'
-import { useDatasetApiBaseUrl } from '@/service/knowledge/use-dataset'
+import { useDatasetApiBaseUrl, useInvalidDatasetList } from '@/service/knowledge/use-dataset'
 import { systemFeaturesQueryOptions } from '@/service/system-features'
 // Components
 import ExternalAPIPanel from '../external-api/external-api-panel'
@@ -28,9 +26,10 @@ const List = () => {
   const { t } = useTranslation()
   const { data: systemFeatures } = useSuspenseQuery(systemFeaturesQueryOptions())
   const { isCurrentWorkspaceOwner } = useAppContext()
-  const showTagManagementModal = useTagStore(s => s.showTagManagementModal)
+  const [showTagManagementModal, setShowTagManagementModal] = useState(false)
   const { showExternalApiPanel, setShowExternalApiPanel } = useExternalApiPanel()
   const [includeAll, { toggle: toggleIncludeAll }] = useBoolean(false)
+  const invalidDatasetList = useInvalidDatasetList()
   useDocumentTitle(t('knowledge', { ns: 'dataset' }))
 
   const [keywords, setKeywords] = useState('')
@@ -56,7 +55,7 @@ const List = () => {
   const { data: apiBaseInfo } = useDatasetApiBaseUrl()
 
   return (
-    <div className="scroll-container relative flex grow flex-col overflow-y-auto bg-background-body">
+    <div className="relative flex grow flex-col overflow-y-auto bg-background-body">
       <div className="sticky top-0 z-10 flex items-center justify-end gap-x-1 bg-background-body px-12 pt-4 pb-2">
         <div className="flex items-center justify-center gap-2">
           {isCurrentWorkspaceOwner && (
@@ -69,7 +68,7 @@ const List = () => {
               tooltip={t('allKnowledgeDescription', { ns: 'dataset' }) as string}
             />
           )}
-          <TagFilter type="knowledge" value={tagFilterValue} onChange={handleTagsChange} />
+          <TagFilter type="knowledge" value={tagFilterValue} onChange={handleTagsChange} onOpenTagManagement={() => setShowTagManagementModal(true)} />
           <Input
             showLeftIcon
             showClearIcon
@@ -93,11 +92,14 @@ const List = () => {
           </Button>
         </div>
       </div>
-      <Datasets tags={tagIDs} keywords={searchKeywords} includeAll={includeAll} />
+      <Datasets tags={tagIDs} keywords={searchKeywords} includeAll={includeAll} onOpenTagManagement={() => setShowTagManagementModal(true)} />
       {!systemFeatures.branding.enabled && <DatasetFooter />}
-      {showTagManagementModal && (
-        <TagManagementModal type="knowledge" show={showTagManagementModal} />
-      )}
+      <TagManagementModal
+        type="knowledge"
+        show={showTagManagementModal}
+        onClose={() => setShowTagManagementModal(false)}
+        onTagsChange={invalidDatasetList}
+      />
       {showExternalApiPanel && <ExternalAPIPanel onClose={() => setShowExternalApiPanel(false)} />}
     </div>
   )
diff --git a/web/app/components/datasets/metadata/__tests__/add-metadata-button.spec.tsx b/web/app/components/datasets/metadata/__tests__/add-metadata-button.spec.tsx
deleted file mode 100644
index 2dbfb6febe..0000000000
--- a/web/app/components/datasets/metadata/__tests__/add-metadata-button.spec.tsx
+++ /dev/null
@@ -1,92 +0,0 @@
-import { fireEvent, render, screen } from '@testing-library/react'
-import { describe, expect, it, vi } from 'vitest'
-import AddedMetadataButton from '../add-metadata-button'
-
-describe('AddedMetadataButton', () => {
-  describe('Rendering', () => {
-    it('should render without crashing', () => {
-      render(<AddedMetadataButton />)
-      expect(screen.getByRole('button')).toBeInTheDocument()
-    })
-
-    it('should render with translated text', () => {
-      render(<AddedMetadataButton />)
-      // The button should contain text from i18n
-      expect(screen.getByRole('button')).toBeInTheDocument()
-    })
-
-    it('should render add icon', () => {
-      const { container } = render(<AddedMetadataButton />)
-      // Check if there's an SVG element (the RiAddLine icon)
-      const svg = container.querySelector('svg')
-      expect(svg).toBeInTheDocument()
-    })
-  })
-
-  describe('Props', () => {
-    it('should apply custom className', () => {
-      render(<AddedMetadataButton className="custom-class" />)
-      const button = screen.getByRole('button')
-      expect(button).toHaveClass('custom-class')
-    })
-
-    it('should apply default classes', () => {
-      render(<AddedMetadataButton />)
-      const button = screen.getByRole('button')
-      expect(button).toHaveClass('flex', 'w-full', 'items-center')
-    })
-
-    it('should merge custom className with default classes', () => {
-      render(<AddedMetadataButton className="my-custom-class" />)
-      const button = screen.getByRole('button')
-      expect(button).toHaveClass('flex', 'w-full', 'items-center', 'my-custom-class')
-    })
-  })
-
-  describe('User Interactions', () => {
-    it('should call onClick when button is clicked', () => {
-      const handleClick = vi.fn()
-      render(<AddedMetadataButton onClick={handleClick} />)
-
-      fireEvent.click(screen.getByRole('button'))
-
-      expect(handleClick).toHaveBeenCalledTimes(1)
-    })
-
-    it('should not throw when onClick is not provided and button is clicked', () => {
-      render(<AddedMetadataButton />)
-
-      expect(() => {
-        fireEvent.click(screen.getByRole('button'))
-      }).not.toThrow()
-    })
-
-    it('should call onClick multiple times on multiple clicks', () => {
-      const handleClick = vi.fn()
-      render(<AddedMetadataButton onClick={handleClick} />)
-
-      fireEvent.click(screen.getByRole('button'))
-      fireEvent.click(screen.getByRole('button'))
-      fireEvent.click(screen.getByRole('button'))
-
-      expect(handleClick).toHaveBeenCalledTimes(3)
-    })
-  })
-
-  describe('Edge Cases', () => {
-    it('should render with undefined className', () => {
-      render(<AddedMetadataButton className={undefined} />)
-      expect(screen.getByRole('button')).toBeInTheDocument()
-    })
-
-    it('should render with empty className', () => {
-      render(<AddedMetadataButton className="" />)
-      expect(screen.getByRole('button')).toBeInTheDocument()
-    })
-
-    it('should render with undefined onClick', () => {
-      render(<AddedMetadataButton onClick={undefined} />)
-      expect(screen.getByRole('button')).toBeInTheDocument()
-    })
-  })
-})
diff --git a/web/app/components/datasets/metadata/add-metadata-button.tsx b/web/app/components/datasets/metadata/add-metadata-button.tsx
deleted file mode 100644
index a8070dcaa1..0000000000
--- a/web/app/components/datasets/metadata/add-metadata-button.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-'use client'
-import type { FC } from 'react'
-import { Button } from '@langgenius/dify-ui/button'
-import { cn } from '@langgenius/dify-ui/cn'
-import { RiAddLine } from '@remixicon/react'
-import * as React from 'react'
-import { useTranslation } from 'react-i18next'
-
-type Props = {
-  className?: string
-  onClick?: () => void
-}
-
-const AddedMetadataButton: FC<Props> = ({
-  className,
-  onClick,
-}) => {
-  const { t } = useTranslation()
-  return (
-    <Button
-      className={cn('flex w-full items-center', className)}
-      size="small"
-      variant="tertiary"
-      onClick={onClick}
-    >
-      <RiAddLine className="mr-1 size-3.5" />
-      <div>{t('metadata.addMetadata', { ns: 'dataset' })}</div>
-    </Button>
-  )
-}
-export default React.memo(AddedMetadataButton)
diff --git a/web/app/components/datasets/metadata/base/__tests__/date-picker.spec.tsx b/web/app/components/datasets/metadata/base/__tests__/date-picker.spec.tsx
index 2684278777..c42186c375 100644
--- a/web/app/components/datasets/metadata/base/__tests__/date-picker.spec.tsx
+++ b/web/app/components/datasets/metadata/base/__tests__/date-picker.spec.tsx
@@ -20,13 +20,13 @@ vi.mock('@/app/components/base/date-and-time-picker/date-picker', () => ({
       handleClickTrigger: () => {},
     })
     return (
-      <div data-testid="date-picker-wrapper">
+      <div role="group" aria-label="Date picker">
         {trigger}
-        <button data-testid="select-date" onClick={() => onChange(value || null)}>
+        <button onClick={() => onChange(value || null)}>
           Select Date
         </button>
-        <button data-testid="clear-date" onClick={() => onClear()}>
-          Clear
+        <button onClick={() => onClear()}>
+          Clear Date
         </button>
       </div>
     )
@@ -49,21 +49,20 @@ describe('WrappedDatePicker', () => {
     it('should render without crashing', () => {
       const handleChange = vi.fn()
       render(<WrappedDatePicker onChange={handleChange} />)
-      expect(screen.getByTestId('date-picker-wrapper')).toBeInTheDocument()
+      expect(screen.getByRole('group', { name: 'Date picker' })).toBeInTheDocument()
     })
 
     it('should render placeholder text when no value', () => {
       const handleChange = vi.fn()
       render(<WrappedDatePicker onChange={handleChange} />)
-      // When no value, should show placeholder from i18n
-      expect(screen.getByTestId('date-picker-wrapper')).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'dataset.metadata.chooseTime' })).toBeInTheDocument()
     })
 
     it('should render formatted date when value is provided', () => {
       const handleChange = vi.fn()
       const timestamp = Math.floor(Date.now() / 1000)
       render(<WrappedDatePicker value={timestamp} onChange={handleChange} />)
-      expect(screen.getByTestId('date-picker-wrapper')).toBeInTheDocument()
+      expect(screen.getByRole('group', { name: 'Date picker' })).toBeInTheDocument()
     })
 
     it('should render calendar icon', () => {
@@ -76,24 +75,22 @@ describe('WrappedDatePicker', () => {
     it('should render select date button', () => {
       const handleChange = vi.fn()
       render(<WrappedDatePicker onChange={handleChange} />)
-      expect(screen.getByTestId('select-date')).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'Select Date' })).toBeInTheDocument()
     })
 
     it('should render clear date button', () => {
       const handleChange = vi.fn()
       render(<WrappedDatePicker onChange={handleChange} />)
-      expect(screen.getByTestId('clear-date')).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'Clear Date' })).toBeInTheDocument()
     })
 
     it('should render close icon for clearing', () => {
       const handleChange = vi.fn()
       const timestamp = Math.floor(Date.now() / 1000)
-      const { container } = render(
+      render(
         <WrappedDatePicker value={timestamp} onChange={handleChange} />,
       )
-      // RiCloseCircleFill should be rendered
-      const closeIcon = container.querySelectorAll('svg')
-      expect(closeIcon.length).toBeGreaterThan(0)
+      expect(screen.getByRole('button', { name: 'common.operation.clear' })).toBeInTheDocument()
     })
   })
 
@@ -110,14 +107,14 @@ describe('WrappedDatePicker', () => {
     it('should accept undefined value', () => {
       const handleChange = vi.fn()
       render(<WrappedDatePicker value={undefined} onChange={handleChange} />)
-      expect(screen.getByTestId('date-picker-wrapper')).toBeInTheDocument()
+      expect(screen.getByRole('group', { name: 'Date picker' })).toBeInTheDocument()
     })
 
     it('should accept number value', () => {
       const handleChange = vi.fn()
       const timestamp = 1609459200 // 2021-01-01
       render(<WrappedDatePicker value={timestamp} onChange={handleChange} />)
-      expect(screen.getByTestId('date-picker-wrapper')).toBeInTheDocument()
+      expect(screen.getByRole('group', { name: 'Date picker' })).toBeInTheDocument()
     })
   })
 
@@ -127,7 +124,7 @@ describe('WrappedDatePicker', () => {
       const timestamp = Math.floor(Date.now() / 1000)
       render(<WrappedDatePicker value={timestamp} onChange={handleChange} />)
 
-      fireEvent.click(screen.getByTestId('select-date'))
+      fireEvent.click(screen.getByRole('button', { name: 'Select Date' }))
 
       expect(handleChange).toHaveBeenCalled()
     })
@@ -137,7 +134,7 @@ describe('WrappedDatePicker', () => {
       const timestamp = Math.floor(Date.now() / 1000)
       render(<WrappedDatePicker value={timestamp} onChange={handleChange} />)
 
-      fireEvent.click(screen.getByTestId('clear-date'))
+      fireEvent.click(screen.getByRole('button', { name: 'Clear Date' }))
 
       expect(handleChange).toHaveBeenCalledWith(null)
     })
@@ -145,16 +142,13 @@ describe('WrappedDatePicker', () => {
     it('should call onChange with null when close icon is clicked directly', () => {
       const handleChange = vi.fn()
       const timestamp = Math.floor(Date.now() / 1000)
-      const { container } = render(
+      render(
         <WrappedDatePicker value={timestamp} onChange={handleChange} />,
       )
 
-      // Find the RiCloseCircleFill icon (it has specific classes)
-      const closeIcon = container.querySelector('.cursor-pointer.hover\\:text-components-input-text-filled')
-      if (closeIcon) {
-        fireEvent.click(closeIcon)
-        expect(handleChange).toHaveBeenCalledWith(null)
-      }
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.clear' }))
+
+      expect(handleChange).toHaveBeenCalledWith(null)
     })
 
     it('should show close button on hover when value exists', () => {
@@ -180,7 +174,7 @@ describe('WrappedDatePicker', () => {
       if (trigger)
         fireEvent.click(trigger)
 
-      expect(screen.getByTestId('date-picker-wrapper')).toBeInTheDocument()
+      expect(screen.getByRole('group', { name: 'Date picker' })).toBeInTheDocument()
     })
   })
 
@@ -224,15 +218,14 @@ describe('WrappedDatePicker', () => {
     it('should handle timestamp of 0', () => {
       const handleChange = vi.fn()
       render(<WrappedDatePicker value={0} onChange={handleChange} />)
-      // 0 is falsy but is a valid timestamp (epoch)
-      expect(screen.getByTestId('date-picker-wrapper')).toBeInTheDocument()
+      expect(screen.getByRole('group', { name: 'Date picker' })).toBeInTheDocument()
     })
 
     it('should handle very large timestamp', () => {
       const handleChange = vi.fn()
       const farFuture = 4102444800 // 2100-01-01
       render(<WrappedDatePicker value={farFuture} onChange={handleChange} />)
-      expect(screen.getByTestId('date-picker-wrapper')).toBeInTheDocument()
+      expect(screen.getByRole('group', { name: 'Date picker' })).toBeInTheDocument()
     })
 
     it('should handle switching between no value and value', () => {
@@ -241,12 +234,12 @@ describe('WrappedDatePicker', () => {
         <WrappedDatePicker onChange={handleChange} />,
       )
 
-      expect(screen.getByTestId('date-picker-wrapper')).toBeInTheDocument()
+      expect(screen.getByRole('group', { name: 'Date picker' })).toBeInTheDocument()
 
       const timestamp = Math.floor(Date.now() / 1000)
       rerender(<WrappedDatePicker value={timestamp} onChange={handleChange} />)
 
-      expect(screen.getByTestId('date-picker-wrapper')).toBeInTheDocument()
+      expect(screen.getByRole('group', { name: 'Date picker' })).toBeInTheDocument()
     })
 
     it('should handle clearing date multiple times', () => {
@@ -254,9 +247,9 @@ describe('WrappedDatePicker', () => {
       const timestamp = Math.floor(Date.now() / 1000)
       render(<WrappedDatePicker value={timestamp} onChange={handleChange} />)
 
-      fireEvent.click(screen.getByTestId('clear-date'))
-      fireEvent.click(screen.getByTestId('clear-date'))
-      fireEvent.click(screen.getByTestId('clear-date'))
+      fireEvent.click(screen.getByRole('button', { name: 'Clear Date' }))
+      fireEvent.click(screen.getByRole('button', { name: 'Clear Date' }))
+      fireEvent.click(screen.getByRole('button', { name: 'Clear Date' }))
 
       expect(handleChange).toHaveBeenCalledTimes(3)
     })
@@ -266,9 +259,9 @@ describe('WrappedDatePicker', () => {
       const timestamp = Math.floor(Date.now() / 1000)
       render(<WrappedDatePicker value={timestamp} onChange={handleChange} />)
 
-      fireEvent.click(screen.getByTestId('select-date'))
-      fireEvent.click(screen.getByTestId('select-date'))
-      fireEvent.click(screen.getByTestId('select-date'))
+      fireEvent.click(screen.getByRole('button', { name: 'Select Date' }))
+      fireEvent.click(screen.getByRole('button', { name: 'Select Date' }))
+      fireEvent.click(screen.getByRole('button', { name: 'Select Date' }))
 
       expect(handleChange).toHaveBeenCalledTimes(3)
     })
@@ -277,10 +270,8 @@ describe('WrappedDatePicker', () => {
       const handleChange = vi.fn()
       render(<WrappedDatePicker onChange={handleChange} />)
 
-      // The mock triggers onChange with the value prop
-      fireEvent.click(screen.getByTestId('select-date'))
+      fireEvent.click(screen.getByRole('button', { name: 'Select Date' }))
 
-      // onChange should have been called
       expect(handleChange).toHaveBeenCalled()
     })
   })
diff --git a/web/app/components/datasets/metadata/base/date-picker.tsx b/web/app/components/datasets/metadata/base/date-picker.tsx
index 79c61469de..b76c2e8060 100644
--- a/web/app/components/datasets/metadata/base/date-picker.tsx
+++ b/web/app/components/datasets/metadata/base/date-picker.tsx
@@ -35,29 +35,49 @@ const WrappedDatePicker = ({
   const renderTrigger = useCallback(({
     handleClickTrigger,
   }: TriggerProps) => {
+    const hasValue = Boolean(value)
+    const triggerText = value ? formatTimestamp(value, t('metadata.dateTimeFormat', { ns: 'datasetDocuments' })) : t('metadata.chooseTime', { ns: 'dataset' })
+
     return (
-      <div onClick={handleClickTrigger} className={cn('group flex items-center rounded-md bg-components-input-bg-normal', className)}>
-        <div
-          className={cn(
-            'grow',
-            value ? 'text-text-secondary' : 'text-text-tertiary',
-          )}
+      <div className={cn('group flex items-center rounded-md bg-components-input-bg-normal', className)}>
+        <button
+          type="button"
+          className="flex min-w-0 grow items-center border-none bg-transparent p-0 text-left focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+          onClick={handleClickTrigger}
         >
-          {value ? formatTimestamp(value, t('metadata.dateTimeFormat', { ns: 'datasetDocuments' })) : t('metadata.chooseTime', { ns: 'dataset' })}
-        </div>
-        <RiCloseCircleFill
-          className={cn(
-            'hidden h-4 w-4 cursor-pointer group-hover:block hover:text-components-input-text-filled',
-            value && 'text-text-quaternary',
-          )}
-          onClick={() => handleDateChange()}
-        />
-        <RiCalendarLine
-          className={cn(
-            'block h-4 w-4 shrink-0 group-hover:hidden',
-            value ? 'text-text-quaternary' : 'text-text-tertiary',
-          )}
-        />
+          <span
+            className={cn(
+              'grow',
+              hasValue ? 'text-text-secondary' : 'text-text-tertiary',
+            )}
+          >
+            {triggerText}
+          </span>
+          <RiCalendarLine
+            aria-hidden="true"
+            className={cn(
+              'block h-4 w-4 shrink-0',
+              hasValue ? 'text-text-quaternary group-hover:hidden' : 'text-text-tertiary',
+            )}
+          />
+        </button>
+        {hasValue
+          ? (
+              <button
+                type="button"
+                aria-label={t('operation.clear', { ns: 'common' })}
+                className={cn(
+                  'hidden h-4 w-4 cursor-pointer rounded-full border-none bg-transparent p-0 text-text-quaternary group-hover:block hover:text-components-input-text-filled focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden',
+                )}
+                onClick={(event) => {
+                  event.stopPropagation()
+                  handleDateChange()
+                }}
+              >
+                <RiCloseCircleFill className="h-4 w-4" aria-hidden="true" />
+              </button>
+            )
+          : null}
       </div>
     )
   }, [className, value, formatTimestamp, t, handleDateChange])
@@ -70,7 +90,6 @@ const WrappedDatePicker = ({
       onClear={handleDateChange}
       renderTrigger={renderTrigger}
       triggerWrapClassName="w-full"
-      popupZIndexClassname="z-1000"
     />
   )
 }
diff --git a/web/app/components/datasets/metadata/edit-metadata-batch/__tests__/edited-beacon.spec.tsx b/web/app/components/datasets/metadata/edit-metadata-batch/__tests__/edited-beacon.spec.tsx
index 39c8c9effc..3bb83e79d5 100644
--- a/web/app/components/datasets/metadata/edit-metadata-batch/__tests__/edited-beacon.spec.tsx
+++ b/web/app/components/datasets/metadata/edit-metadata-batch/__tests__/edited-beacon.spec.tsx
@@ -1,4 +1,4 @@
-import { fireEvent, render, waitFor } from '@testing-library/react'
+import { fireEvent, render, screen, waitFor } from '@testing-library/react'
 import { describe, expect, it, vi } from 'vitest'
 import EditedBeacon from '../edited-beacon'
 
@@ -97,16 +97,8 @@ describe('EditedBeacon', () => {
       // Hover to show reset button
       fireEvent.mouseEnter(wrapper)
 
-      await waitFor(() => {
-        const resetButton = container.querySelector('.bg-text-accent-secondary')
-        expect(resetButton).toBeInTheDocument()
-      })
-
-      // Find and click the reset button (the clickable element with onClick)
-      const clickableElement = container.querySelector('.flex.size-4.items-center.justify-center.rounded-full.bg-text-accent-secondary')
-      if (clickableElement) {
-        fireEvent.click(clickableElement)
-      }
+      const resetButton = await screen.findByRole('button', { name: 'common.operation.reset' })
+      fireEvent.click(resetButton)
 
       expect(handleReset).toHaveBeenCalledTimes(1)
     })
diff --git a/web/app/components/datasets/metadata/edit-metadata-batch/__tests__/modal.spec.tsx b/web/app/components/datasets/metadata/edit-metadata-batch/__tests__/modal.spec.tsx
index 060befe7d3..8535528b48 100644
--- a/web/app/components/datasets/metadata/edit-metadata-batch/__tests__/modal.spec.tsx
+++ b/web/app/components/datasets/metadata/edit-metadata-batch/__tests__/modal.spec.tsx
@@ -1,5 +1,6 @@
 import type { MetadataItemInBatchEdit, MetadataItemWithEdit } from '../../types'
 import { fireEvent, render, screen, waitFor } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
 import { describe, expect, it, vi } from 'vitest'
 import { DataType, UpdateType } from '../../types'
 import EditMetadataBatchModal from '../modal'
@@ -56,42 +57,44 @@ type AddRowProps = {
   onRemove: () => void
 }
 
-type SelectModalProps = {
-  trigger: React.ReactNode
-  onSelect: (item: MetadataItemInBatchEdit) => void
-  onSave: (data: { name: string, type: DataType }) => Promise<void>
-  onManage: () => void
-}
-
-// Mock child components with callback exposure
+// Mock row components to exercise parent state transitions with accessible controls.
 vi.mock('../edit-row', () => ({
   default: ({ payload, onChange, onRemove, onReset }: EditRowProps) => (
-    <div data-testid="edit-row" data-id={payload.id}>
-      <span data-testid="edit-row-name">{payload.name}</span>
-      <button data-testid={`change-${payload.id}`} onClick={() => onChange({ ...payload, value: 'changed', isUpdated: true, updateType: UpdateType.changeValue })}>Change</button>
-      <button data-testid={`remove-${payload.id}`} onClick={() => onRemove(payload.id)}>Remove</button>
-      <button data-testid={`reset-${payload.id}`} onClick={() => onReset(payload.id)}>Reset</button>
+    <div role="group" aria-label={`Edit metadata ${payload.name}`}>
+      <span>{payload.name}</span>
+      <button type="button" onClick={() => onChange({ ...payload, value: 'changed', isUpdated: true, updateType: UpdateType.changeValue })}>
+        Change
+        {' '}
+        {payload.name}
+      </button>
+      <button type="button" onClick={() => onRemove(payload.id)}>
+        Remove
+        {' '}
+        {payload.name}
+      </button>
+      <button type="button" onClick={() => onReset(payload.id)}>
+        Reset
+        {' '}
+        {payload.name}
+      </button>
     </div>
   ),
 }))
 
 vi.mock('../add-row', () => ({
   default: ({ payload, onChange, onRemove }: AddRowProps) => (
-    <div data-testid="add-row" data-id={payload.id}>
-      <span data-testid="add-row-name">{payload.name}</span>
-      <button data-testid={`add-change-${payload.id}`} onClick={() => onChange({ ...payload, value: 'new_value' })}>Change</button>
-      <button data-testid="add-remove" onClick={onRemove}>Remove</button>
-    </div>
-  ),
-}))
-
-vi.mock('../../metadata-dataset/select-metadata-modal', () => ({
-  default: ({ trigger, onSelect, onSave, onManage }: SelectModalProps) => (
-    <div data-testid="select-modal">
-      {trigger}
-      <button data-testid="select-metadata" onClick={() => onSelect({ id: 'new-1', name: 'new_field', type: DataType.string, value: null, isMultipleValue: false })}>Select</button>
-      <button data-testid="save-metadata" onClick={() => onSave({ name: 'created_field', type: DataType.string }).catch(() => { })}>Save</button>
-      <button data-testid="manage-metadata" onClick={onManage}>Manage</button>
+    <div role="group" aria-label={`Added metadata ${payload.name}`}>
+      <span>{payload.name}</span>
+      <button type="button" onClick={() => onChange({ ...payload, value: 'new_value' })}>
+        Change
+        {' '}
+        {payload.name}
+      </button>
+      <button type="button" onClick={onRemove}>
+        Remove
+        {' '}
+        {payload.name}
+      </button>
     </div>
   ),
 }))
@@ -116,6 +119,25 @@ describe('EditMetadataBatchModal', () => {
     mockCheckNameResult = { errorMsg: '' }
   })
 
+  const getEditRows = () => screen.getAllByRole('group', { name: /^Edit metadata / })
+  const getEditRow = (name: string) => screen.getByRole('group', { name: `Edit metadata ${name}` })
+  const getAddedRow = (name: string) => screen.getByRole('group', { name: `Added metadata ${name}` })
+  const queryAddedRow = (name: string) => screen.queryByRole('group', { name: `Added metadata ${name}` })
+  const openMetadataPicker = () => {
+    fireEvent.click(screen.getByRole('button', { name: 'dataset.metadata.addMetadata' }))
+  }
+  const selectMetadata = async (name = 'existing_field') => {
+    openMetadataPicker()
+    fireEvent.click(await screen.findByRole('option', { name: new RegExp(name) }))
+  }
+  const createMetadata = async (name = 'created_field') => {
+    openMetadataPicker()
+    fireEvent.click(screen.getByRole('button', { name: 'dataset.metadata.selectMetadata.newAction' }))
+    fireEvent.change(screen.getByRole('textbox', { name: 'dataset.metadata.createMetadata.name' }), { target: { value: name } })
+    const saveButtons = screen.getAllByRole('button', { name: 'common.operation.save' })
+    fireEvent.click(saveButtons[saveButtons.length - 1]!)
+  }
+
   describe('Rendering', () => {
     it('should render without crashing', async () => {
       render(<EditMetadataBatchModal {...defaultProps} />)
@@ -134,8 +156,7 @@ describe('EditMetadataBatchModal', () => {
     it('should render all edit rows for existing items', async () => {
       render(<EditMetadataBatchModal {...defaultProps} />)
       await waitFor(() => {
-        const editRows = screen.getAllByTestId('edit-row')
-        expect(editRows).toHaveLength(2)
+        expect(getEditRows()).toHaveLength(2)
       })
     })
 
@@ -150,15 +171,14 @@ describe('EditMetadataBatchModal', () => {
     it('should render checkbox for apply to all', async () => {
       render(<EditMetadataBatchModal {...defaultProps} />)
       await waitFor(() => {
-        const checkboxes = document.querySelectorAll('[data-testid*="checkbox"]')
-        expect(checkboxes.length).toBeGreaterThan(0)
+        expect(screen.getByRole('checkbox', { name: 'dataset.metadata.batchEditMetadata.applyToAllSelectDocument' })).toBeInTheDocument()
       })
     })
 
-    it('should render select metadata modal', async () => {
+    it('should render dataset metadata picker', async () => {
       render(<EditMetadataBatchModal {...defaultProps} />)
       await waitFor(() => {
-        expect(screen.getByTestId('select-modal'))!.toBeInTheDocument()
+        expect(screen.getByRole('button', { name: 'dataset.metadata.addMetadata' }))!.toBeInTheDocument()
       })
     })
   })
@@ -186,29 +206,26 @@ describe('EditMetadataBatchModal', () => {
         expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
-      // Find the primary save button (not the one in SelectMetadataModal)
+      // Find the primary save button (not the one in DatasetMetadataPicker)
       fireEvent.click(screen.getByRole('button', { name: 'common.operation.save' }))
 
       expect(onSave).toHaveBeenCalled()
     })
 
     it('should toggle apply to all checkbox', async () => {
+      const user = userEvent.setup()
       render(<EditMetadataBatchModal {...defaultProps} />)
 
       await waitFor(() => {
         expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
-      const checkboxContainer = document.querySelector('[data-testid*="checkbox"]')
-      expect(checkboxContainer)!.toBeInTheDocument()
+      const checkbox = screen.getByRole('checkbox', { name: 'dataset.metadata.batchEditMetadata.applyToAllSelectDocument' })
+      await user.click(checkbox)
 
-      if (checkboxContainer) {
-        fireEvent.click(checkboxContainer)
-        await waitFor(() => {
-          const checkIcon = screen.getByTestId('check-icon-apply-to-all')
-          expect(checkIcon)!.toBeInTheDocument()
-        })
-      }
+      await waitFor(() => {
+        expect(checkbox).toHaveAttribute('aria-checked', 'true')
+      })
     })
 
     it('should call onHide when modal close button is clicked', async () => {
@@ -229,10 +246,10 @@ describe('EditMetadataBatchModal', () => {
         expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
-      fireEvent.click(screen.getByTestId('change-1'))
+      fireEvent.click(screen.getByRole('button', { name: 'Change field_one' }))
 
       // The component should update internally
-      expect(screen.getAllByTestId('edit-row').length).toBe(2)
+      expect(getEditRows()).toHaveLength(2)
     })
 
     it('should mark item as deleted when remove is clicked', async () => {
@@ -242,10 +259,10 @@ describe('EditMetadataBatchModal', () => {
         expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
-      fireEvent.click(screen.getByTestId('remove-1'))
+      fireEvent.click(screen.getByRole('button', { name: 'Remove field_one' }))
 
       // The component should update internally - item marked as deleted
-      expect(screen.getAllByTestId('edit-row').length).toBe(2)
+      expect(getEditRows()).toHaveLength(2)
     })
 
     it('should reset item when reset is clicked', async () => {
@@ -256,11 +273,11 @@ describe('EditMetadataBatchModal', () => {
       })
 
       // First change the item
-      fireEvent.click(screen.getByTestId('change-1'))
+      fireEvent.click(screen.getByRole('button', { name: 'Change field_one' }))
       // Then reset it
-      fireEvent.click(screen.getByTestId('reset-1'))
+      fireEvent.click(screen.getByRole('button', { name: 'Reset field_one' }))
 
-      expect(screen.getAllByTestId('edit-row').length).toBe(2)
+      expect(getEditRows()).toHaveLength(2)
     })
   })
 
@@ -272,11 +289,11 @@ describe('EditMetadataBatchModal', () => {
         expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
-      fireEvent.click(screen.getByTestId('select-metadata'))
+      await selectMetadata()
 
       // Should now have add-row for the new item
       await waitFor(() => {
-        expect(screen.getByTestId('add-row'))!.toBeInTheDocument()
+        expect(getAddedRow('existing_field'))!.toBeInTheDocument()
       })
     })
 
@@ -288,17 +305,17 @@ describe('EditMetadataBatchModal', () => {
       })
 
       // First add an item
-      fireEvent.click(screen.getByTestId('select-metadata'))
+      await selectMetadata()
 
       await waitFor(() => {
-        expect(screen.getByTestId('add-row'))!.toBeInTheDocument()
+        expect(getAddedRow('existing_field'))!.toBeInTheDocument()
       })
 
       // Then remove it
-      fireEvent.click(screen.getByTestId('add-remove'))
+      fireEvent.click(screen.getByRole('button', { name: 'Remove existing_field' }))
 
       await waitFor(() => {
-        expect(screen.queryByTestId('add-row')).not.toBeInTheDocument()
+        expect(queryAddedRow('existing_field')).not.toBeInTheDocument()
       })
     })
 
@@ -310,16 +327,16 @@ describe('EditMetadataBatchModal', () => {
       })
 
       // First add an item
-      fireEvent.click(screen.getByTestId('select-metadata'))
+      await selectMetadata()
 
       await waitFor(() => {
-        expect(screen.getByTestId('add-row'))!.toBeInTheDocument()
+        expect(getAddedRow('existing_field'))!.toBeInTheDocument()
       })
 
       // Then change it
-      fireEvent.click(screen.getByTestId('add-change-new-1'))
+      fireEvent.click(screen.getByRole('button', { name: 'Change existing_field' }))
 
-      expect(screen.getByTestId('add-row'))!.toBeInTheDocument()
+      expect(getAddedRow('existing_field'))!.toBeInTheDocument()
     })
 
     it('should call doAddMetaData when saving new metadata with valid name', async () => {
@@ -331,7 +348,7 @@ describe('EditMetadataBatchModal', () => {
         expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
-      fireEvent.click(screen.getByTestId('save-metadata'))
+      await createMetadata()
 
       await waitFor(() => {
         expect(mockDoAddMetaData).toHaveBeenCalled()
@@ -347,7 +364,7 @@ describe('EditMetadataBatchModal', () => {
         expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
-      fireEvent.click(screen.getByTestId('save-metadata'))
+      await createMetadata()
 
       await waitFor(() => {
         expect(mockDoAddMetaData).toHaveBeenCalled()
@@ -371,7 +388,7 @@ describe('EditMetadataBatchModal', () => {
         expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
-      fireEvent.click(screen.getByTestId('save-metadata'))
+      await createMetadata()
 
       await waitFor(() => {
         expect(mockToastNotify).toHaveBeenCalledWith(
@@ -391,7 +408,8 @@ describe('EditMetadataBatchModal', () => {
         expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
-      fireEvent.click(screen.getByTestId('manage-metadata'))
+      openMetadataPicker()
+      fireEvent.click(screen.getByRole('button', { name: 'dataset.metadata.selectMetadata.manageAction' }))
 
       expect(onShowManage).toHaveBeenCalled()
     })
@@ -415,7 +433,7 @@ describe('EditMetadataBatchModal', () => {
     it('should handle empty list', async () => {
       render(<EditMetadataBatchModal {...defaultProps} list={[]} />)
       await waitFor(() => {
-        expect(screen.queryByTestId('edit-row')).not.toBeInTheDocument()
+        expect(screen.queryByRole('group', { name: /^Edit metadata / })).not.toBeInTheDocument()
       })
     })
   })
@@ -427,7 +445,7 @@ describe('EditMetadataBatchModal', () => {
       ]
       render(<EditMetadataBatchModal {...defaultProps} list={multipleValueList} />)
       await waitFor(() => {
-        expect(screen.getByTestId('edit-row'))!.toBeInTheDocument()
+        expect(getEditRow('field'))!.toBeInTheDocument()
       })
     })
 
@@ -466,6 +484,7 @@ describe('EditMetadataBatchModal', () => {
     })
 
     it('should pass isApplyToAllSelectDocument as true when checked', async () => {
+      const user = userEvent.setup()
       const onSave = vi.fn()
       render(<EditMetadataBatchModal {...defaultProps} onSave={onSave} />)
 
@@ -473,9 +492,7 @@ describe('EditMetadataBatchModal', () => {
         expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
-      const checkboxContainer = document.querySelector('[data-testid*="checkbox"]')
-      if (checkboxContainer)
-        fireEvent.click(checkboxContainer)
+      await user.click(screen.getByRole('checkbox', { name: 'dataset.metadata.batchEditMetadata.applyToAllSelectDocument' }))
 
       fireEvent.click(screen.getByRole('button', { name: 'common.operation.save' }))
 
@@ -497,7 +514,7 @@ describe('EditMetadataBatchModal', () => {
       })
 
       // Remove an item
-      fireEvent.click(screen.getByTestId('remove-1'))
+      fireEvent.click(screen.getByRole('button', { name: 'Remove field_one' }))
 
       fireEvent.click(screen.getByRole('button', { name: 'common.operation.save' }))
 
@@ -516,22 +533,22 @@ describe('EditMetadataBatchModal', () => {
       })
 
       // Add first item
-      fireEvent.click(screen.getByTestId('select-metadata'))
+      await selectMetadata()
       await waitFor(() => {
-        expect(screen.getByTestId('add-row'))!.toBeInTheDocument()
+        expect(getAddedRow('existing_field'))!.toBeInTheDocument()
       })
 
       // Remove it
-      fireEvent.click(screen.getByTestId('add-remove'))
+      fireEvent.click(screen.getByRole('button', { name: 'Remove existing_field' }))
 
       await waitFor(() => {
-        expect(screen.queryByTestId('add-row')).not.toBeInTheDocument()
+        expect(queryAddedRow('existing_field')).not.toBeInTheDocument()
       })
 
       // Add again
-      fireEvent.click(screen.getByTestId('select-metadata'))
+      await selectMetadata()
       await waitFor(() => {
-        expect(screen.getByTestId('add-row'))!.toBeInTheDocument()
+        expect(getAddedRow('existing_field'))!.toBeInTheDocument()
       })
     })
   })
diff --git a/web/app/components/datasets/metadata/edit-metadata-batch/edited-beacon.tsx b/web/app/components/datasets/metadata/edit-metadata-batch/edited-beacon.tsx
index 25f1e19f8d..da531146af 100644
--- a/web/app/components/datasets/metadata/edit-metadata-batch/edited-beacon.tsx
+++ b/web/app/components/datasets/metadata/edit-metadata-batch/edited-beacon.tsx
@@ -25,9 +25,14 @@ const EditedBeacon: FC<Props> = ({
             <Tooltip>
               <TooltipTrigger
                 render={(
-                  <div className="flex size-4 items-center justify-center rounded-full bg-text-accent-secondary" onClick={onReset}>
-                    <RiResetLeftLine className="size-[10px] text-text-primary-on-surface" />
-                  </div>
+                  <button
+                    type="button"
+                    aria-label={t('operation.reset', { ns: 'common' })}
+                    className="flex size-4 items-center justify-center rounded-full border-none bg-text-accent-secondary p-0"
+                    onClick={onReset}
+                  >
+                    <RiResetLeftLine className="size-[10px] text-text-primary-on-surface" aria-hidden="true" />
+                  </button>
                 )}
               />
               <TooltipContent>
diff --git a/web/app/components/datasets/metadata/edit-metadata-batch/modal.tsx b/web/app/components/datasets/metadata/edit-metadata-batch/modal.tsx
index 8253f7faf6..10f5e5cbc4 100644
--- a/web/app/components/datasets/metadata/edit-metadata-batch/modal.tsx
+++ b/web/app/components/datasets/metadata/edit-metadata-batch/modal.tsx
@@ -2,20 +2,18 @@
 import type { FC } from 'react'
 import type { BuiltInMetadataItem, MetadataItemInBatchEdit, MetadataItemWithEdit } from '../types'
 import { Button } from '@langgenius/dify-ui/button'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
+import { Dialog, DialogCloseButton, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
-import { RiQuestionLine } from '@remixicon/react'
 import { produce } from 'immer'
 import * as React from 'react'
 import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Divider from '@/app/components/base/divider'
 import { useCreateMetaData } from '@/service/knowledge/use-metadata'
-import Checkbox from '../../../base/checkbox'
-import Modal from '../../../base/modal'
-import Tooltip from '../../../base/tooltip'
-import AddMetadataButton from '../add-metadata-button'
+import { Infotip } from '../../../base/infotip'
 import useCheckMetadataName from '../hooks/use-check-metadata-name'
-import SelectMetadataModal from '../metadata-dataset/select-metadata-modal'
+import { DatasetMetadataPicker } from '../metadata-dataset/dataset-metadata-picker'
 import { UpdateType } from '../types'
 import AddedMetadataItem from './add-row'
 import EditMetadataBatchItem from './edit-row'
@@ -91,46 +89,77 @@ const EditMetadataBatchModal: FC<Props> = ({ datasetId, documentNum, list, onSav
     onSave(templeList.filter(item => item.updateType !== UpdateType.delete), addedList, isApplyToAllSelectDocument)
   }, [templeList, addedList, isApplyToAllSelectDocument, onSave])
   return (
-    <Modal title={t(`${i18nPrefix}.editMetadata`, { ns: 'dataset' })} isShow closable onClose={onHide} className="!max-w-[640px]">
-      <div className="mt-1 system-xs-medium text-text-accent">{t(`${i18nPrefix}.editDocumentsNum`, { ns: 'dataset', num: documentNum })}</div>
-      <div className="max-h-[305px] overflow-x-hidden overflow-y-auto">
-        <div className="mt-4 space-y-2">
-          {templeList.map(item => (<EditMetadataBatchItem key={item.id} payload={item} onChange={handleTemplesChange} onRemove={handleTempleItemRemove} onReset={handleItemReset} />))}
-        </div>
-        <div className="mt-4 pl-[18px]">
-          <div className="flex items-center">
-            <div className="mr-2 shrink-0 system-xs-medium-uppercase text-text-tertiary">{t('metadata.createMetadata.title', { ns: 'dataset' })}</div>
-            <Divider bgStyle="gradient" />
-          </div>
-          <div className="mt-2 space-y-2">
-            {addedList.map((item, i) => (<AddedMetadataItem key={i} payload={item} onChange={handleAddedListChange} onRemove={handleAddedItemRemove(i)} />))}
-          </div>
-          <div className="mt-3">
-            <SelectMetadataModal datasetId={datasetId} popupPlacement="top-start" popupOffset={{ mainAxis: 4, crossAxis: 0 }} trigger={<AddMetadataButton />} onSave={handleAddMetaData} onSelect={data => setAddedList([...addedList, data as MetadataItemWithEdit])} onManage={onShowManage} />
-          </div>
-        </div>
-      </div>
+    <Dialog
+      open
+      onOpenChange={(open) => {
+        if (!open)
+          onHide()
+      }}
+    >
+      <DialogContent className="w-full !max-w-[640px] overflow-hidden! border-none text-left align-middle">
+        <DialogCloseButton />
+        <DialogTitle className="title-2xl-semi-bold text-text-primary">
+          {t(`${i18nPrefix}.editMetadata`, { ns: 'dataset' })}
+        </DialogTitle>
 
-      <div className="mt-4 flex items-center justify-between">
-        <div className="flex items-center select-none">
-          <Checkbox checked={isApplyToAllSelectDocument} onCheck={() => setIsApplyToAllSelectDocument(!isApplyToAllSelectDocument)} id="apply-to-all" />
-          <div className="mr-1 ml-2 system-xs-medium text-text-secondary">{t(`${i18nPrefix}.applyToAllSelectDocument`, { ns: 'dataset' })}</div>
-          <Tooltip popupContent={<div className="max-w-[240px]">{t(`${i18nPrefix}.applyToAllSelectDocumentTip`, { ns: 'dataset' })}</div>}>
-            <div className="cursor-pointer p-px">
-              <RiQuestionLine className="size-3.5 text-text-tertiary" />
+        <div className="mt-1 system-xs-medium text-text-accent">{t(`${i18nPrefix}.editDocumentsNum`, { ns: 'dataset', num: documentNum })}</div>
+        <div className="max-h-[305px] overflow-x-hidden overflow-y-auto">
+          <div className="mt-4 space-y-2">
+            {templeList.map(item => (<EditMetadataBatchItem key={item.id} payload={item} onChange={handleTemplesChange} onRemove={handleTempleItemRemove} onReset={handleItemReset} />))}
+          </div>
+          <div className="mt-4 pl-[18px]">
+            <div className="flex items-center">
+              <div className="mr-2 shrink-0 system-xs-medium-uppercase text-text-tertiary">{t('metadata.createMetadata.title', { ns: 'dataset' })}</div>
+              <Divider bgStyle="gradient" />
             </div>
-          </Tooltip>
+            <div className="mt-2 space-y-2">
+              {addedList.map((item, i) => (<AddedMetadataItem key={i} payload={item} onChange={handleAddedListChange} onRemove={handleAddedItemRemove(i)} />))}
+            </div>
+            <div className="mt-3">
+              <DatasetMetadataPicker
+                datasetId={datasetId}
+                placement="top-start"
+                sideOffset={4}
+                alignOffset={0}
+                onCreateMetadata={handleAddMetaData}
+                onSelectMetadata={data => setAddedList([...addedList, data as MetadataItemWithEdit])}
+                onOpenMetadataManagement={onShowManage}
+              />
+            </div>
+          </div>
         </div>
-        <div className="flex items-center space-x-2">
-          <Button onClick={onHide}>
-            {t('operation.cancel', { ns: 'common' })}
-          </Button>
-          <Button onClick={handleSave} variant="primary">
-            {t('operation.save', { ns: 'common' })}
-          </Button>
+
+        <div className="mt-4 flex items-center justify-between">
+          <div className="flex items-center select-none">
+            <label className="flex cursor-pointer items-center">
+              <Checkbox
+                checked={isApplyToAllSelectDocument}
+                onCheckedChange={setIsApplyToAllSelectDocument}
+              />
+              <span className="mr-1 ml-2 system-xs-medium text-text-secondary">
+                {t(`${i18nPrefix}.applyToAllSelectDocument`, { ns: 'dataset' })}
+              </span>
+            </label>
+            <Infotip
+              aria-label={t(`${i18nPrefix}.applyToAllSelectDocumentTip`, { ns: 'dataset' })}
+              className="p-px"
+              iconClassName="size-3.5 text-text-tertiary"
+              popupClassName="max-w-[240px]"
+            >
+              {t(`${i18nPrefix}.applyToAllSelectDocumentTip`, { ns: 'dataset' })}
+            </Infotip>
+          </div>
+          <div className="flex items-center space-x-2">
+            <Button onClick={onHide}>
+              {t('operation.cancel', { ns: 'common' })}
+            </Button>
+            <Button onClick={handleSave} variant="primary">
+              {t('operation.save', { ns: 'common' })}
+            </Button>
+          </div>
         </div>
-      </div>
-    </Modal>
+      </DialogContent>
+    </Dialog>
   )
 }
 export default React.memo(EditMetadataBatchModal)
diff --git a/web/app/components/datasets/metadata/metadata-dataset/__tests__/create-content.spec.tsx b/web/app/components/datasets/metadata/metadata-dataset/__tests__/create-content.spec.tsx
index 8070061776..f0cd4d0fc8 100644
--- a/web/app/components/datasets/metadata/metadata-dataset/__tests__/create-content.spec.tsx
+++ b/web/app/components/datasets/metadata/metadata-dataset/__tests__/create-content.spec.tsx
@@ -1,148 +1,117 @@
+import type { Props as CreateContentProps } from '../create-content'
+import { Popover } from '@langgenius/dify-ui/popover'
 import { fireEvent, render, screen } from '@testing-library/react'
 import { describe, expect, it, vi } from 'vitest'
 import { DataType } from '../../types'
-import CreateContent from '../create-content'
+import { CreateContent } from '../create-content'
 
-type ModalLikeWrapProps = {
-  children: React.ReactNode
-  title: string
-  onClose?: () => void
-  onConfirm: () => void
-  beforeHeader?: React.ReactNode
+const renderCreateContent = (props: CreateContentProps) => {
+  return render(
+    <Popover open>
+      <CreateContent {...props} />
+    </Popover>,
+  )
 }
 
-type OptionCardProps = {
-  title: string
-  selected: boolean
-  onSelect: () => void
-}
-
-type FieldProps = {
-  label: string
-  children: React.ReactNode
-}
-
-// Mock ModalLikeWrap
-vi.mock('../../../../base/modal-like-wrap', () => ({
-  default: ({ children, title, onClose, onConfirm, beforeHeader }: ModalLikeWrapProps) => (
-    <div data-testid="modal-wrap">
-      <div data-testid="modal-title">{title}</div>
-      {!!beforeHeader && <div data-testid="before-header">{beforeHeader}</div>}
-      <div data-testid="modal-content">{children}</div>
-      <button data-testid="close-btn" onClick={onClose}>Close</button>
-      <button data-testid="confirm-btn" onClick={onConfirm}>Confirm</button>
-    </div>
-  ),
-}))
-
-// Mock OptionCard
-vi.mock('../../../../workflow/nodes/_base/components/option-card', () => ({
-  default: ({ title, selected, onSelect }: OptionCardProps) => (
-    <button
-      data-testid={`option-${title.toLowerCase()}`}
-      data-selected={selected}
-      onClick={onSelect}
-    >
-      {title}
-    </button>
-  ),
-}))
-
-// Mock Field
-vi.mock('../field', () => ({
-  default: ({ label, children }: FieldProps) => (
-    <div data-testid="field">
-      <label data-testid="field-label">{label}</label>
-      {children}
-    </div>
-  ),
-}))
-
 describe('CreateContent', () => {
   describe('Rendering', () => {
     it('should render without crashing', () => {
       const handleSave = vi.fn()
-      render(<CreateContent onSave={handleSave} />)
-      expect(screen.getByTestId('modal-wrap')).toBeInTheDocument()
+      renderCreateContent({ onSave: handleSave })
+      expect(screen.getByText('dataset.metadata.createMetadata.title')).toBeInTheDocument()
     })
 
     it('should render modal title', () => {
       const handleSave = vi.fn()
-      render(<CreateContent onSave={handleSave} />)
-      expect(screen.getByTestId('modal-title')).toBeInTheDocument()
+      renderCreateContent({ onSave: handleSave })
+      expect(screen.getByText('dataset.metadata.createMetadata.title')).toBeInTheDocument()
     })
 
     it('should render type selection options', () => {
       const handleSave = vi.fn()
-      render(<CreateContent onSave={handleSave} />)
-      expect(screen.getByTestId('option-string')).toBeInTheDocument()
-      expect(screen.getByTestId('option-number')).toBeInTheDocument()
-      expect(screen.getByTestId('option-time')).toBeInTheDocument()
+      renderCreateContent({ onSave: handleSave })
+      expect(screen.getByText('String')).toBeInTheDocument()
+      expect(screen.getByText('Number')).toBeInTheDocument()
+      expect(screen.getByText('Time')).toBeInTheDocument()
     })
 
     it('should render name input field', () => {
       const handleSave = vi.fn()
-      render(<CreateContent onSave={handleSave} />)
+      renderCreateContent({ onSave: handleSave })
       expect(screen.getByRole('textbox')).toBeInTheDocument()
     })
 
     it('should render confirm button', () => {
       const handleSave = vi.fn()
-      render(<CreateContent onSave={handleSave} />)
-      expect(screen.getByTestId('confirm-btn')).toBeInTheDocument()
+      renderCreateContent({ onSave: handleSave })
+      expect(screen.getByRole('button', { name: 'common.operation.save' })).toBeInTheDocument()
     })
 
     it('should render close button', () => {
       const handleSave = vi.fn()
-      render(<CreateContent onSave={handleSave} />)
-      expect(screen.getByTestId('close-btn')).toBeInTheDocument()
+      renderCreateContent({ onSave: handleSave })
+      expect(screen.getByRole('button', { name: 'common.operation.close' })).toBeInTheDocument()
     })
   })
 
   describe('Type Selection', () => {
-    it('should default to string type', () => {
+    it('should save string type by default', () => {
       const handleSave = vi.fn()
-      render(<CreateContent onSave={handleSave} />)
-      expect(screen.getByTestId('option-string')).toHaveAttribute('data-selected', 'true')
+      renderCreateContent({ onSave: handleSave })
+
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.save' }))
+
+      expect(handleSave).toHaveBeenCalledWith({
+        type: DataType.string,
+        name: '',
+      })
     })
 
-    it('should select number type when clicked', () => {
+    it('should save number type when number is clicked', () => {
       const handleSave = vi.fn()
-      render(<CreateContent onSave={handleSave} />)
+      renderCreateContent({ onSave: handleSave })
 
-      fireEvent.click(screen.getByTestId('option-number'))
+      fireEvent.click(screen.getByText('Number'))
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.save' }))
 
-      expect(screen.getByTestId('option-number')).toHaveAttribute('data-selected', 'true')
+      expect(handleSave).toHaveBeenCalledWith({
+        type: DataType.number,
+        name: '',
+      })
     })
 
-    it('should select time type when clicked', () => {
+    it('should save time type when time is clicked', () => {
       const handleSave = vi.fn()
-      render(<CreateContent onSave={handleSave} />)
+      renderCreateContent({ onSave: handleSave })
 
-      fireEvent.click(screen.getByTestId('option-time'))
+      fireEvent.click(screen.getByText('Time'))
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.save' }))
 
-      expect(screen.getByTestId('option-time')).toHaveAttribute('data-selected', 'true')
+      expect(handleSave).toHaveBeenCalledWith({
+        type: DataType.time,
+        name: '',
+      })
     })
 
-    it('should deselect previous type when new type is selected', () => {
+    it('should use the latest selected type when type changes', () => {
       const handleSave = vi.fn()
-      render(<CreateContent onSave={handleSave} />)
+      renderCreateContent({ onSave: handleSave })
 
-      // Initially string is selected
-      expect(screen.getByTestId('option-string')).toHaveAttribute('data-selected', 'true')
+      fireEvent.click(screen.getByText('Number'))
+      fireEvent.click(screen.getByText('Time'))
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.save' }))
 
-      // Select number
-      fireEvent.click(screen.getByTestId('option-number'))
-
-      expect(screen.getByTestId('option-string')).toHaveAttribute('data-selected', 'false')
-      expect(screen.getByTestId('option-number')).toHaveAttribute('data-selected', 'true')
+      expect(handleSave).toHaveBeenCalledWith({
+        type: DataType.time,
+        name: '',
+      })
     })
   })
 
   describe('Name Input', () => {
     it('should update name when typing', () => {
       const handleSave = vi.fn()
-      render(<CreateContent onSave={handleSave} />)
+      renderCreateContent({ onSave: handleSave })
 
       const input = screen.getByRole('textbox')
       fireEvent.change(input, { target: { value: 'new_field' } })
@@ -152,7 +121,7 @@ describe('CreateContent', () => {
 
     it('should start with empty name', () => {
       const handleSave = vi.fn()
-      render(<CreateContent onSave={handleSave} />)
+      renderCreateContent({ onSave: handleSave })
 
       expect(screen.getByRole('textbox')).toHaveValue('')
     })
@@ -161,11 +130,11 @@ describe('CreateContent', () => {
   describe('User Interactions', () => {
     it('should call onSave with type and name when confirmed', () => {
       const handleSave = vi.fn()
-      render(<CreateContent onSave={handleSave} />)
+      renderCreateContent({ onSave: handleSave })
 
       const input = screen.getByRole('textbox')
       fireEvent.change(input, { target: { value: 'test_field' } })
-      fireEvent.click(screen.getByTestId('confirm-btn'))
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.save' }))
 
       expect(handleSave).toHaveBeenCalledWith({
         type: DataType.string,
@@ -175,12 +144,12 @@ describe('CreateContent', () => {
 
     it('should call onSave with correct type after changing type', () => {
       const handleSave = vi.fn()
-      render(<CreateContent onSave={handleSave} />)
+      renderCreateContent({ onSave: handleSave })
 
-      fireEvent.click(screen.getByTestId('option-number'))
+      fireEvent.click(screen.getByText('Number'))
       const input = screen.getByRole('textbox')
       fireEvent.change(input, { target: { value: 'num_field' } })
-      fireEvent.click(screen.getByTestId('confirm-btn'))
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.save' }))
 
       expect(handleSave).toHaveBeenCalledWith({
         type: DataType.number,
@@ -191,9 +160,9 @@ describe('CreateContent', () => {
     it('should call onClose when close button is clicked', () => {
       const handleSave = vi.fn()
       const handleClose = vi.fn()
-      render(<CreateContent onSave={handleSave} onClose={handleClose} />)
+      renderCreateContent({ onSave: handleSave, onClose: handleClose })
 
-      fireEvent.click(screen.getByTestId('close-btn'))
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.close' }))
 
       expect(handleClose).toHaveBeenCalled()
     })
@@ -202,40 +171,35 @@ describe('CreateContent', () => {
   describe('Back Button', () => {
     it('should show back button when hasBack is true', () => {
       const handleSave = vi.fn()
-      render(<CreateContent onSave={handleSave} hasBack />)
+      renderCreateContent({ onSave: handleSave, hasBack: true })
 
-      expect(screen.getByTestId('before-header')).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: /dataset\.metadata\.createMetadata\.back/ })).toBeInTheDocument()
     })
 
     it('should not show back button when hasBack is false', () => {
       const handleSave = vi.fn()
-      render(<CreateContent onSave={handleSave} hasBack={false} />)
+      renderCreateContent({ onSave: handleSave, hasBack: false })
 
-      expect(screen.queryByTestId('before-header')).not.toBeInTheDocument()
+      expect(screen.queryByRole('button', { name: /dataset\.metadata\.createMetadata\.back/ })).not.toBeInTheDocument()
     })
 
     it('should call onBack when back button is clicked', () => {
       const handleSave = vi.fn()
       const handleBack = vi.fn()
-      render(<CreateContent onSave={handleSave} hasBack onBack={handleBack} />)
+      renderCreateContent({ onSave: handleSave, hasBack: true, onBack: handleBack })
 
-      const backButton = screen.getByTestId('before-header')
-      // Find the clickable element inside
-      const clickable = backButton.querySelector('.cursor-pointer') || backButton.firstChild
-      if (clickable)
-        fireEvent.click(clickable)
+      fireEvent.click(screen.getByRole('button', { name: /dataset\.metadata\.createMetadata\.back/ }))
 
-      // The back functionality is tested through the actual implementation
-      expect(screen.getByTestId('before-header')).toBeInTheDocument()
+      expect(handleBack).toHaveBeenCalled()
     })
   })
 
   describe('Edge Cases', () => {
     it('should handle empty name submission', () => {
       const handleSave = vi.fn()
-      render(<CreateContent onSave={handleSave} />)
+      renderCreateContent({ onSave: handleSave })
 
-      fireEvent.click(screen.getByTestId('confirm-btn'))
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.save' }))
 
       expect(handleSave).toHaveBeenCalledWith({
         type: DataType.string,
@@ -245,19 +209,23 @@ describe('CreateContent', () => {
 
     it('should handle type cycling', () => {
       const handleSave = vi.fn()
-      render(<CreateContent onSave={handleSave} />)
+      renderCreateContent({ onSave: handleSave })
 
       // Cycle through all types
-      fireEvent.click(screen.getByTestId('option-number'))
-      fireEvent.click(screen.getByTestId('option-time'))
-      fireEvent.click(screen.getByTestId('option-string'))
+      fireEvent.click(screen.getByText('Number'))
+      fireEvent.click(screen.getByText('Time'))
+      fireEvent.click(screen.getByText('String'))
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.save' }))
 
-      expect(screen.getByTestId('option-string')).toHaveAttribute('data-selected', 'true')
+      expect(handleSave).toHaveBeenCalledWith({
+        type: DataType.string,
+        name: '',
+      })
     })
 
     it('should handle special characters in name', () => {
       const handleSave = vi.fn()
-      render(<CreateContent onSave={handleSave} />)
+      renderCreateContent({ onSave: handleSave })
 
       const input = screen.getByRole('textbox')
       fireEvent.change(input, { target: { value: 'test_field_123' } })
diff --git a/web/app/components/datasets/metadata/metadata-dataset/__tests__/create-metadata-modal.spec.tsx b/web/app/components/datasets/metadata/metadata-dataset/__tests__/create-metadata-modal.spec.tsx
index 7d09f4749a..a987104d70 100644
--- a/web/app/components/datasets/metadata/metadata-dataset/__tests__/create-metadata-modal.spec.tsx
+++ b/web/app/components/datasets/metadata/metadata-dataset/__tests__/create-metadata-modal.spec.tsx
@@ -1,77 +1,10 @@
 import { fireEvent, render, screen } from '@testing-library/react'
 import { describe, expect, it, vi } from 'vitest'
 import { DataType } from '../../types'
-import CreateMetadataModal from '../create-metadata-modal'
-
-type PopoverProps = {
-  children: React.ReactNode
-  open: boolean
-  onOpenChange?: (open: boolean) => void
-}
-
-type TriggerProps = {
-  children?: React.ReactNode
-  render?: React.ReactNode
-}
-
-type ContentProps = {
-  children: React.ReactNode
-  className?: string
-}
-
-type CreateContentProps = {
-  onSave: (data: { type: DataType, name: string }) => void
-  onClose?: () => void
-  onBack?: () => void
-  hasBack?: boolean
-}
-
-vi.mock('@langgenius/dify-ui/popover', async () => {
-  const React = await import('react')
-  const PopoverContext = React.createContext<{ open: boolean, onOpenChange?: (open: boolean) => void } | null>(null)
-
-  return {
-    Popover: ({ children, open, onOpenChange }: PopoverProps) => (
-      <PopoverContext.Provider value={{ open, onOpenChange }}>
-        <div data-testid="popover-root" data-open={String(open)}>{children}</div>
-      </PopoverContext.Provider>
-    ),
-    PopoverTrigger: ({ children, render }: TriggerProps) => {
-      const context = React.useContext(PopoverContext)
-      const content = render ?? children
-      const handleClick = () => context?.onOpenChange?.(!context.open)
-
-      if (React.isValidElement(content)) {
-        const element = content as React.ReactElement<{ onClick?: () => void }>
-        return React.cloneElement(element, { onClick: handleClick })
-      }
-
-      return <button type="button" data-testid="popover-trigger" onClick={handleClick}>{content}</button>
-    },
-    PopoverContent: ({ children, className }: ContentProps) => {
-      const context = React.useContext(PopoverContext)
-      if (!context?.open)
-        return null
-
-      return <div data-testid="popover-content" className={className}>{children}</div>
-    },
-  }
-})
-
-// Mock CreateContent component
-vi.mock('../create-content', () => ({
-  default: ({ onSave, onClose, onBack, hasBack }: CreateContentProps) => (
-    <div data-testid="create-content">
-      <span data-testid="has-back">{String(hasBack)}</span>
-      <button data-testid="save-btn" onClick={() => onSave({ type: DataType.string, name: 'test' })}>Save</button>
-      <button data-testid="close-btn" onClick={onClose}>Close</button>
-      {hasBack && <button data-testid="back-btn" onClick={onBack}>Back</button>}
-    </div>
-  ),
-}))
+import { CreateMetadataModal } from '../create-metadata-modal'
 
 describe('CreateMetadataModal', () => {
-  const mockTrigger = <button data-testid="trigger-button">Open Modal</button>
+  const mockTrigger = <button>Open Modal</button>
 
   describe('Rendering', () => {
     it('should render trigger when closed', () => {
@@ -83,8 +16,8 @@ describe('CreateMetadataModal', () => {
           onSave={vi.fn()}
         />,
       )
-      expect(screen.getByTestId('popover-root')).toBeInTheDocument()
-      expect(screen.getByTestId('popover-root')).toHaveAttribute('data-open', 'false')
+      expect(screen.getByRole('button', { name: 'Open Modal' })).toBeInTheDocument()
+      expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
     })
 
     it('should render content when open', () => {
@@ -96,8 +29,8 @@ describe('CreateMetadataModal', () => {
           onSave={vi.fn()}
         />,
       )
-      expect(screen.getByTestId('popover-root')).toBeInTheDocument()
-      expect(screen.getByTestId('create-content')).toBeInTheDocument()
+      expect(screen.getByRole('dialog')).toBeInTheDocument()
+      expect(screen.getByRole('textbox', { name: 'dataset.metadata.createMetadata.name' })).toBeInTheDocument()
     })
 
     it('should render trigger element', () => {
@@ -109,7 +42,7 @@ describe('CreateMetadataModal', () => {
           onSave={vi.fn()}
         />,
       )
-      expect(screen.getByTestId('trigger-button')).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'Open Modal' })).toBeInTheDocument()
     })
   })
 
@@ -124,7 +57,7 @@ describe('CreateMetadataModal', () => {
           hasBack
         />,
       )
-      expect(screen.getByTestId('has-back')).toHaveTextContent('true')
+      expect(screen.getByRole('button', { name: 'dataset.metadata.createMetadata.back' })).toBeInTheDocument()
     })
 
     it('should pass hasBack=undefined when not provided', () => {
@@ -136,7 +69,7 @@ describe('CreateMetadataModal', () => {
           onSave={vi.fn()}
         />,
       )
-      expect(screen.getByTestId('has-back')).toHaveTextContent('undefined')
+      expect(screen.queryByRole('button', { name: 'dataset.metadata.createMetadata.back' })).not.toBeInTheDocument()
     })
 
     it('should accept custom popupLeft', () => {
@@ -149,7 +82,7 @@ describe('CreateMetadataModal', () => {
           popupLeft={50}
         />,
       )
-      expect(screen.getByTestId('popover-root')).toBeInTheDocument()
+      expect(screen.getByRole('dialog')).toBeInTheDocument()
     })
   })
 
@@ -165,9 +98,9 @@ describe('CreateMetadataModal', () => {
         />,
       )
 
-      fireEvent.click(screen.getByTestId('trigger-button'))
+      fireEvent.click(screen.getByRole('button', { name: 'Open Modal' }))
 
-      expect(setOpen).toHaveBeenCalledWith(true)
+      expect(setOpen).toHaveBeenCalledWith(true, expect.any(Object))
     })
 
     it('should call onSave when save button is clicked', () => {
@@ -181,7 +114,10 @@ describe('CreateMetadataModal', () => {
         />,
       )
 
-      fireEvent.click(screen.getByTestId('save-btn'))
+      fireEvent.change(screen.getByRole('textbox', { name: 'dataset.metadata.createMetadata.name' }), {
+        target: { value: 'test' },
+      })
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.save' }))
 
       expect(handleSave).toHaveBeenCalledWith({
         type: DataType.string,
@@ -200,7 +136,7 @@ describe('CreateMetadataModal', () => {
         />,
       )
 
-      fireEvent.click(screen.getByTestId('close-btn'))
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.close' }))
 
       expect(setOpen).toHaveBeenCalledWith(false)
     })
@@ -217,7 +153,7 @@ describe('CreateMetadataModal', () => {
         />,
       )
 
-      fireEvent.click(screen.getByTestId('back-btn'))
+      fireEvent.click(screen.getByRole('button', { name: 'dataset.metadata.createMetadata.back' }))
 
       expect(setOpen).toHaveBeenCalledWith(false)
     })
@@ -234,7 +170,7 @@ describe('CreateMetadataModal', () => {
         />,
       )
 
-      expect(screen.getByTestId('popover-root')).toHaveAttribute('data-open', 'false')
+      expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
 
       rerender(
         <CreateMetadataModal
@@ -245,11 +181,11 @@ describe('CreateMetadataModal', () => {
         />,
       )
 
-      expect(screen.getByTestId('popover-root')).toHaveAttribute('data-open', 'true')
+      expect(screen.getByRole('dialog')).toBeInTheDocument()
     })
 
     it('should handle different trigger elements', () => {
-      const customTrigger = <div data-testid="custom-trigger">Custom</div>
+      const customTrigger = <button>Custom</button>
       render(
         <CreateMetadataModal
           open={false}
@@ -259,7 +195,7 @@ describe('CreateMetadataModal', () => {
         />,
       )
 
-      expect(screen.getByTestId('custom-trigger')).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'Custom' })).toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/datasets/metadata/metadata-dataset/__tests__/dataset-metadata-drawer.spec.tsx b/web/app/components/datasets/metadata/metadata-dataset/__tests__/dataset-metadata-drawer.spec.tsx
index 55e5f9de65..f6d168dbe9 100644
--- a/web/app/components/datasets/metadata/metadata-dataset/__tests__/dataset-metadata-drawer.spec.tsx
+++ b/web/app/components/datasets/metadata/metadata-dataset/__tests__/dataset-metadata-drawer.spec.tsx
@@ -35,31 +35,6 @@ vi.mock('@langgenius/dify-ui/toast', () => ({
   },
 }))
 
-// Type definitions for mock props
-type CreateModalProps = {
-  open: boolean
-  setOpen: (open: boolean) => void
-  trigger: React.ReactNode
-  onSave: (data: BuiltInMetadataItem) => void
-}
-
-// Mock CreateModal to expose callbacks
-vi.mock('@/app/components/datasets/metadata/metadata-dataset/create-metadata-modal', () => ({
-  default: ({ open, setOpen, trigger, onSave }: CreateModalProps) => (
-    <div data-testid="create-modal-wrapper">
-      <div data-testid="create-trigger" onClick={() => setOpen(true)}>{trigger}</div>
-      {open && (
-        <div data-testid="create-modal">
-          <button data-testid="create-save" onClick={() => onSave({ name: 'new_field', type: DataType.string })}>
-            Save
-          </button>
-          <button data-testid="create-close" onClick={() => setOpen(false)}>Close</button>
-        </div>
-      )}
-    </div>
-  ),
-}))
-
 describe('DatasetMetadataDrawer', () => {
   const mockUserMetadata: MetadataItemWithValueLength[] = [
     { id: '1', name: 'field_one', type: DataType.string, count: 5 },
@@ -86,6 +61,24 @@ describe('DatasetMetadataDrawer', () => {
     vi.clearAllMocks()
   })
 
+  const clickFirstMetadataAction = (name: string) => {
+    fireEvent.click(screen.getAllByRole('button', { name })[0]!)
+  }
+
+  const openCreateMetadata = async () => {
+    fireEvent.click(screen.getByRole('button', { name: 'dataset.metadata.datasetMetadata.addMetaData' }))
+    await waitFor(() => {
+      expect(screen.getByRole('textbox', { name: 'dataset.metadata.createMetadata.name' })).toBeInTheDocument()
+    })
+  }
+
+  const saveCreatedMetadata = (name = 'new_field') => {
+    fireEvent.change(screen.getByRole('textbox', { name: 'dataset.metadata.createMetadata.name' }), {
+      target: { value: name },
+    })
+    fireEvent.click(screen.getByRole('button', { name: 'common.operation.save' }))
+  }
+
   describe('Rendering', () => {
     it('should render without crashing', async () => {
       render(<DatasetMetadataDrawer {...defaultProps} />)
@@ -121,7 +114,7 @@ describe('DatasetMetadataDrawer', () => {
     it('should render add metadata button', async () => {
       render(<DatasetMetadataDrawer {...defaultProps} />)
       await waitFor(() => {
-        expect(screen.getByTestId('create-trigger'))!.toBeInTheDocument()
+        expect(screen.getByRole('button', { name: 'dataset.metadata.datasetMetadata.addMetaData' }))!.toBeInTheDocument()
       })
     })
 
@@ -135,6 +128,19 @@ describe('DatasetMetadataDrawer', () => {
   })
 
   describe('User Interactions', () => {
+    it('should call onClose when drawer close button is clicked', async () => {
+      const onClose = vi.fn()
+      render(<DatasetMetadataDrawer {...defaultProps} onClose={onClose} />)
+
+      await waitFor(() => {
+        expect(screen.getByRole('dialog'))!.toBeInTheDocument()
+      })
+
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.close' }))
+
+      expect(onClose).toHaveBeenCalledTimes(1)
+    })
+
     it('should call onIsBuiltInEnabledChange when switch is toggled', async () => {
       const onIsBuiltInEnabledChange = vi.fn()
       render(
@@ -163,12 +169,9 @@ describe('DatasetMetadataDrawer', () => {
         expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
-      const trigger = screen.getByTestId('create-trigger')
-      fireEvent.click(trigger)
+      await openCreateMetadata()
 
-      await waitFor(() => {
-        expect(screen.getByTestId('create-modal'))!.toBeInTheDocument()
-      })
+      expect(screen.getByRole('textbox', { name: 'dataset.metadata.createMetadata.name' }))!.toBeInTheDocument()
     })
 
     it('should call onAdd and show success toast when metadata is added', async () => {
@@ -180,15 +183,10 @@ describe('DatasetMetadataDrawer', () => {
       })
 
       // Open create modal
-      const trigger = screen.getByTestId('create-trigger')
-      fireEvent.click(trigger)
-
-      await waitFor(() => {
-        expect(screen.getByTestId('create-modal'))!.toBeInTheDocument()
-      })
+      await openCreateMetadata()
 
       // Save new metadata
-      fireEvent.click(screen.getByTestId('create-save'))
+      saveCreatedMetadata()
 
       await waitFor(() => {
         expect(onAdd).toHaveBeenCalled()
@@ -212,16 +210,12 @@ describe('DatasetMetadataDrawer', () => {
       })
 
       // Open create modal
-      fireEvent.click(screen.getByTestId('create-trigger'))
+      await openCreateMetadata()
+
+      saveCreatedMetadata()
 
       await waitFor(() => {
-        expect(screen.getByTestId('create-modal'))!.toBeInTheDocument()
-      })
-
-      fireEvent.click(screen.getByTestId('create-save'))
-
-      await waitFor(() => {
-        expect(screen.queryByTestId('create-modal')).not.toBeInTheDocument()
+        expect(screen.queryByRole('textbox', { name: 'dataset.metadata.createMetadata.name' })).not.toBeInTheDocument()
       })
     })
   })
@@ -234,21 +228,7 @@ describe('DatasetMetadataDrawer', () => {
         expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
-      // Find user metadata items with group/item class (these have edit/delete icons)
-      const dialog = screen.getByRole('dialog')
-      const items = dialog.querySelectorAll('.group\\/item')
-      expect(items.length).toBe(2) // 2 user metadata items
-
-      // Find the hidden container with edit/delete icons
-      const actionsContainer = items[0]!.querySelector('.hidden.items-center')
-      expect(actionsContainer).toBeTruthy()
-
-      // Find and click the first SVG (edit icon)
-      if (actionsContainer) {
-        const svgs = actionsContainer.querySelectorAll('svg')
-        expect(svgs.length).toBeGreaterThan(0)
-        fireEvent.click(svgs[0]!)
-      }
+      clickFirstMetadataAction('common.operation.edit')
 
       // Wait for rename modal (contains input)
       await waitFor(() => {
@@ -265,14 +245,7 @@ describe('DatasetMetadataDrawer', () => {
         expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
-      // Find and click edit icon
-      const dialog = screen.getByRole('dialog')
-      const items = dialog.querySelectorAll('.group\\/item')
-      const actionsContainer = items[0]!.querySelector('.hidden.items-center')
-      if (actionsContainer) {
-        const svgs = actionsContainer.querySelectorAll('svg')
-        fireEvent.click(svgs[0]!)
-      }
+      clickFirstMetadataAction('common.operation.edit')
 
       // Change name and save
       await waitFor(() => {
@@ -280,8 +253,8 @@ describe('DatasetMetadataDrawer', () => {
         expect(inputs.length).toBeGreaterThan(0)
       })
 
-      const inputs = document.querySelectorAll('input')
-      fireEvent.change(inputs[0]!, { target: { value: 'renamed_field' } })
+      const input = screen.getByRole('textbox', { name: 'dataset.metadata.datasetMetadata.name' })
+      fireEvent.change(input, { target: { value: 'renamed_field' } })
 
       // Find and click save button
       fireEvent.click(screen.getByRole('button', { name: 'common.operation.save' }))
@@ -306,14 +279,7 @@ describe('DatasetMetadataDrawer', () => {
         expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
-      // Find and click edit icon
-      const dialog = screen.getByRole('dialog')
-      const items = dialog.querySelectorAll('.group\\/item')
-      const actionsContainer = items[0]!.querySelector('.hidden.items-center')
-      if (actionsContainer) {
-        const svgs = actionsContainer.querySelectorAll('svg')
-        fireEvent.click(svgs[0]!)
-      }
+      clickFirstMetadataAction('common.operation.edit')
 
       // Wait for modal and click cancel
       await waitFor(() => {
@@ -322,8 +288,8 @@ describe('DatasetMetadataDrawer', () => {
       })
 
       // Change name first
-      const inputs = document.querySelectorAll('input')
-      fireEvent.change(inputs[0]!, { target: { value: 'changed_name' } })
+      const input = screen.getByRole('textbox', { name: 'dataset.metadata.datasetMetadata.name' })
+      fireEvent.change(input, { target: { value: 'changed_name' } })
 
       // Find and click cancel button
       fireEvent.click(screen.getByRole('button', { name: 'common.operation.cancel' }))
@@ -335,21 +301,14 @@ describe('DatasetMetadataDrawer', () => {
       })
     })
 
-    it('should close rename modal when modal close button is clicked', async () => {
+    it('should close rename modal when dialog requests close', async () => {
       render(<DatasetMetadataDrawer {...defaultProps} />)
 
       await waitFor(() => {
         expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
-      // Find and click edit icon
-      const dialog = screen.getByRole('dialog')
-      const items = dialog.querySelectorAll('.group\\/item')
-      const actionsContainer = items[0]!.querySelector('.hidden.items-center')
-      if (actionsContainer) {
-        const svgs = actionsContainer.querySelectorAll('svg')
-        fireEvent.click(svgs[0]!)
-      }
+      clickFirstMetadataAction('common.operation.edit')
 
       // Wait for rename modal
       await waitFor(() => {
@@ -357,23 +316,12 @@ describe('DatasetMetadataDrawer', () => {
         expect(inputs.length).toBeGreaterThan(0)
       })
 
-      // Find and click the modal close button (X button)
-      // The Modal component has a close button in the header
-      const dialogs = screen.getAllByRole('dialog')
-      const renameModal = dialogs.find(d => d.querySelector('input'))
-      if (renameModal) {
-        // Find close button by looking for a button with close-related class or X icon
-        const closeButtons = renameModal.querySelectorAll('button')
-        for (const btn of Array.from(closeButtons)) {
-          // Skip cancel/save buttons
-          if (!btn.textContent?.toLowerCase().includes('cancel')
-            && !btn.textContent?.toLowerCase().includes('save')
-            && btn.querySelector('svg')) {
-            fireEvent.click(btn)
-            break
-          }
-        }
-      }
+      fireEvent.keyDown(document, { key: 'Escape', code: 'Escape' })
+
+      await waitFor(() => {
+        expect(screen.queryByRole('dialog', { name: 'dataset.metadata.datasetMetadata.rename' })).not.toBeInTheDocument()
+        expect(screen.getAllByRole('dialog')).toHaveLength(1)
+      })
     })
   })
 
@@ -385,19 +333,7 @@ describe('DatasetMetadataDrawer', () => {
         expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
-      // Find user metadata items
-      const dialog = screen.getByRole('dialog')
-      const items = dialog.querySelectorAll('.group\\/item')
-
-      // Find the delete container
-      const deleteContainer = items[0]!.querySelector('.hover\\:text-text-destructive')
-      expect(deleteContainer).toBeTruthy()
-
-      if (deleteContainer) {
-        const deleteIcon = deleteContainer.querySelector('svg')
-        if (deleteIcon)
-          fireEvent.click(deleteIcon)
-      }
+      clickFirstMetadataAction('common.operation.remove')
 
       // Confirm dialog should appear
       await waitFor(() => {
@@ -417,15 +353,7 @@ describe('DatasetMetadataDrawer', () => {
         expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
-      // Find and click delete icon
-      const dialog = screen.getByRole('dialog')
-      const items = dialog.querySelectorAll('.group\\/item')
-      const deleteContainer = items[0]!.querySelector('.hover\\:text-text-destructive')
-      if (deleteContainer) {
-        const deleteIcon = deleteContainer.querySelector('svg')
-        if (deleteIcon)
-          fireEvent.click(deleteIcon)
-      }
+      clickFirstMetadataAction('common.operation.remove')
 
       // Wait for confirm dialog
       await waitFor(() => {
@@ -463,15 +391,7 @@ describe('DatasetMetadataDrawer', () => {
         expect(screen.getByRole('dialog'))!.toBeInTheDocument()
       })
 
-      // Find and click delete icon
-      const dialog = screen.getByRole('dialog')
-      const items = dialog.querySelectorAll('.group\\/item')
-      const deleteContainer = items[0]!.querySelector('.hover\\:text-text-destructive')
-      if (deleteContainer) {
-        const deleteIcon = deleteContainer.querySelector('svg')
-        if (deleteIcon)
-          fireEvent.click(deleteIcon)
-      }
+      clickFirstMetadataAction('common.operation.remove')
 
       // Wait for confirm dialog
       await waitFor(() => {
diff --git a/web/app/components/datasets/metadata/metadata-dataset/__tests__/dataset-metadata-picker.spec.tsx b/web/app/components/datasets/metadata/metadata-dataset/__tests__/dataset-metadata-picker.spec.tsx
new file mode 100644
index 0000000000..48b8d3ad66
--- /dev/null
+++ b/web/app/components/datasets/metadata/metadata-dataset/__tests__/dataset-metadata-picker.spec.tsx
@@ -0,0 +1,175 @@
+import type { MetadataItem } from '../../types'
+import { render, screen, waitFor } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { DataType } from '../../types'
+import { DatasetMetadataPicker } from '../dataset-metadata-picker'
+
+const { mockUseDatasetMetaData } = vi.hoisted(() => ({
+  mockUseDatasetMetaData: vi.fn(),
+}))
+
+vi.mock('@/service/knowledge/use-metadata', () => ({
+  useDatasetMetaData: mockUseDatasetMetaData,
+}))
+
+const metadataItems: MetadataItem[] = [
+  { id: '1', name: 'field_one', type: DataType.string },
+  { id: '2', name: 'field_two', type: DataType.number },
+  { id: '3', name: 'field_three', type: DataType.time },
+]
+
+function renderDatasetMetadataPicker(overrides: Partial<React.ComponentProps<typeof DatasetMetadataPicker>> = {}) {
+  const props = {
+    datasetId: 'dataset-1',
+    onSelectMetadata: vi.fn(),
+    onCreateMetadata: vi.fn(),
+    onOpenMetadataManagement: vi.fn(),
+    ...overrides,
+  }
+
+  return {
+    props,
+    ...render(<DatasetMetadataPicker {...props} />),
+  }
+}
+
+describe('DatasetMetadataPicker', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockUseDatasetMetaData.mockReturnValue({
+      data: {
+        doc_metadata: metadataItems,
+      },
+    })
+  })
+
+  describe('Rendering', () => {
+    it('should render an add metadata picker trigger', () => {
+      renderDatasetMetadataPicker()
+
+      expect(screen.getByRole('button', { name: 'dataset.metadata.addMetadata' })).toBeInTheDocument()
+    })
+
+    it('should show metadata options when opened', async () => {
+      const user = userEvent.setup()
+      renderDatasetMetadataPicker()
+
+      await user.click(screen.getByRole('button', { name: 'dataset.metadata.addMetadata' }))
+
+      expect(await screen.findByRole('option', { name: /field_one/ })).toBeInTheDocument()
+      expect(screen.getByRole('option', { name: /field_two/ })).toBeInTheDocument()
+      expect(screen.getByRole('option', { name: /field_three/ })).toBeInTheDocument()
+    })
+  })
+
+  describe('Search', () => {
+    it('should filter metadata options by search query', async () => {
+      const user = userEvent.setup()
+      renderDatasetMetadataPicker()
+
+      await user.click(screen.getByRole('button', { name: 'dataset.metadata.addMetadata' }))
+      await user.type(screen.getByRole('combobox', { name: 'dataset.metadata.selectMetadata.search' }), 'two')
+
+      expect(screen.getByRole('option', { name: /field_two/ })).toBeInTheDocument()
+      expect(screen.queryByRole('option', { name: /field_one/ })).not.toBeInTheDocument()
+      expect(screen.queryByRole('option', { name: /field_three/ })).not.toBeInTheDocument()
+    })
+
+    it('should show an empty state when no metadata matches', async () => {
+      const user = userEvent.setup()
+      renderDatasetMetadataPicker()
+
+      await user.click(screen.getByRole('button', { name: 'dataset.metadata.addMetadata' }))
+      await user.type(screen.getByRole('combobox', { name: 'dataset.metadata.selectMetadata.search' }), 'missing')
+
+      expect(await screen.findByRole('status')).toHaveTextContent('common.noData')
+    })
+  })
+
+  describe('Selection', () => {
+    it('should call onSelectMetadata and close when an option is selected', async () => {
+      const user = userEvent.setup()
+      const onSelectMetadata = vi.fn()
+      renderDatasetMetadataPicker({ onSelectMetadata })
+
+      await user.click(screen.getByRole('button', { name: 'dataset.metadata.addMetadata' }))
+      await user.click(await screen.findByRole('option', { name: /field_two/ }))
+
+      expect(onSelectMetadata).toHaveBeenCalledWith({
+        id: '2',
+        name: 'field_two',
+        type: DataType.number,
+      })
+      await waitFor(() => {
+        expect(screen.getByRole('button', { name: 'dataset.metadata.addMetadata' })).toHaveAttribute('aria-expanded', 'false')
+      })
+    })
+  })
+
+  describe('Actions', () => {
+    it('should switch to create view and save a new metadata item', async () => {
+      const user = userEvent.setup()
+      const onCreateMetadata = vi.fn().mockResolvedValue(undefined)
+      renderDatasetMetadataPicker({ onCreateMetadata })
+
+      await user.click(screen.getByRole('button', { name: 'dataset.metadata.addMetadata' }))
+      await user.click(screen.getByRole('button', { name: 'dataset.metadata.selectMetadata.newAction' }))
+      await user.type(screen.getByRole('textbox', { name: 'dataset.metadata.createMetadata.name' }), 'new_field')
+      await user.click(screen.getByRole('button', { name: 'common.operation.save' }))
+
+      expect(onCreateMetadata).toHaveBeenCalledWith({
+        name: 'new_field',
+        type: DataType.string,
+      })
+      await waitFor(() => {
+        expect(screen.getByRole('combobox', { name: 'dataset.metadata.selectMetadata.search' })).toBeInTheDocument()
+      })
+    })
+
+    it('should return from create view without closing the picker', async () => {
+      const user = userEvent.setup()
+      renderDatasetMetadataPicker()
+
+      await user.click(screen.getByRole('button', { name: 'dataset.metadata.addMetadata' }))
+      await user.click(screen.getByRole('button', { name: 'dataset.metadata.selectMetadata.newAction' }))
+      await user.click(screen.getByRole('button', { name: 'dataset.metadata.createMetadata.back' }))
+
+      expect(screen.getByRole('combobox', { name: 'dataset.metadata.selectMetadata.search' })).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'dataset.metadata.addMetadata' })).toHaveAttribute('aria-expanded', 'true')
+    })
+
+    it('should open metadata management and close the picker', async () => {
+      const user = userEvent.setup()
+      const onOpenMetadataManagement = vi.fn()
+      renderDatasetMetadataPicker({ onOpenMetadataManagement })
+
+      await user.click(screen.getByRole('button', { name: 'dataset.metadata.addMetadata' }))
+      await user.click(screen.getByRole('button', { name: 'dataset.metadata.selectMetadata.manageAction' }))
+
+      expect(onOpenMetadataManagement).toHaveBeenCalled()
+      await waitFor(() => {
+        expect(screen.getByRole('button', { name: 'dataset.metadata.addMetadata' })).toHaveAttribute('aria-expanded', 'false')
+      })
+    })
+  })
+
+  describe('Edge Cases', () => {
+    it('should keep action buttons available when metadata list is empty', async () => {
+      const user = userEvent.setup()
+      mockUseDatasetMetaData.mockReturnValue({
+        data: {
+          doc_metadata: [],
+        },
+      })
+
+      renderDatasetMetadataPicker()
+
+      await user.click(screen.getByRole('button', { name: 'dataset.metadata.addMetadata' }))
+
+      expect(await screen.findByRole('status')).toHaveTextContent('common.noData')
+      expect(screen.getByRole('button', { name: 'dataset.metadata.selectMetadata.newAction' })).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'dataset.metadata.selectMetadata.manageAction' })).toBeInTheDocument()
+    })
+  })
+})
diff --git a/web/app/components/datasets/metadata/metadata-dataset/__tests__/select-metadata-modal.spec.tsx b/web/app/components/datasets/metadata/metadata-dataset/__tests__/select-metadata-modal.spec.tsx
deleted file mode 100644
index 0ac3743a86..0000000000
--- a/web/app/components/datasets/metadata/metadata-dataset/__tests__/select-metadata-modal.spec.tsx
+++ /dev/null
@@ -1,374 +0,0 @@
-import { fireEvent, render, screen, waitFor } from '@testing-library/react'
-import { describe, expect, it, vi } from 'vitest'
-import { DataType } from '../../types'
-import SelectMetadataModal from '../select-metadata-modal'
-
-type MetadataItem = {
-  id: string
-  name: string
-  type: DataType
-}
-
-type PopoverProps = {
-  children: React.ReactNode
-  open: boolean
-  onOpenChange?: (open: boolean) => void
-}
-
-type TriggerProps = {
-  children?: React.ReactNode
-  render?: React.ReactNode
-}
-
-type ContentProps = {
-  children: React.ReactNode
-}
-
-type SelectMetadataProps = {
-  onSelect: (item: MetadataItem) => void
-  onNew: () => void
-  onManage: () => void
-  list: MetadataItem[]
-}
-
-type CreateContentProps = {
-  onSave: (data: { type: DataType, name: string }) => void
-  onBack?: () => void
-  onClose?: () => void
-  hasBack?: boolean
-}
-
-// Mock useDatasetMetaData hook
-vi.mock('@/service/knowledge/use-metadata', () => ({
-  useDatasetMetaData: () => ({
-    data: {
-      doc_metadata: [
-        { id: '1', name: 'field_one', type: DataType.string },
-        { id: '2', name: 'field_two', type: DataType.number },
-      ],
-    },
-  }),
-}))
-
-vi.mock('@langgenius/dify-ui/popover', async () => {
-  const React = await import('react')
-  const PopoverContext = React.createContext<{ open: boolean, onOpenChange?: (open: boolean) => void } | null>(null)
-
-  return {
-    Popover: ({ children, open, onOpenChange }: PopoverProps) => (
-      <PopoverContext.Provider value={{ open, onOpenChange }}>
-        <div data-testid="popover-root" data-open={String(open)}>{children}</div>
-      </PopoverContext.Provider>
-    ),
-    PopoverTrigger: ({ children, render }: TriggerProps) => {
-      const context = React.useContext(PopoverContext)
-      const content = render ?? children
-      const handleClick = () => context?.onOpenChange?.(!context.open)
-
-      if (React.isValidElement(content)) {
-        const element = content as React.ReactElement<{ onClick?: () => void }>
-        return React.cloneElement(element, { onClick: handleClick })
-      }
-
-      return <button type="button" data-testid="popover-trigger" onClick={handleClick}>{content}</button>
-    },
-    PopoverContent: ({ children }: ContentProps) => {
-      const context = React.useContext(PopoverContext)
-      if (!context?.open)
-        return null
-
-      return <div data-testid="popover-content">{children}</div>
-    },
-  }
-})
-
-// Mock SelectMetadata component
-vi.mock('../select-metadata', () => ({
-  default: ({ onSelect, onNew, onManage, list }: SelectMetadataProps) => (
-    <div data-testid="select-metadata">
-      <span data-testid="list-count">{list?.length || 0}</span>
-      <button data-testid="select-item" onClick={() => onSelect({ id: '1', name: 'field_one', type: DataType.string })}>Select</button>
-      <button data-testid="new-btn" onClick={onNew}>New</button>
-      <button data-testid="manage-btn" onClick={onManage}>Manage</button>
-    </div>
-  ),
-}))
-
-// Mock CreateContent component
-vi.mock('../create-content', () => ({
-  default: ({ onSave, onBack, onClose, hasBack }: CreateContentProps) => (
-    <div data-testid="create-content">
-      <button data-testid="save-btn" onClick={() => onSave({ type: DataType.string, name: 'new_field' })}>Save</button>
-      {hasBack && <button data-testid="back-btn" onClick={onBack}>Back</button>}
-      <button data-testid="close-btn" onClick={onClose}>Close</button>
-    </div>
-  ),
-}))
-
-describe('SelectMetadataModal', () => {
-  const mockTrigger = <button data-testid="trigger-button">Select Metadata</button>
-
-  describe('Rendering', () => {
-    it('should render without crashing', () => {
-      render(
-        <SelectMetadataModal
-          datasetId="dataset-1"
-          trigger={mockTrigger}
-          onSelect={vi.fn()}
-          onSave={vi.fn()}
-          onManage={vi.fn()}
-        />,
-      )
-      expect(screen.getByTestId('popover-root')).toBeInTheDocument()
-    })
-
-    it('should render trigger element', () => {
-      render(
-        <SelectMetadataModal
-          datasetId="dataset-1"
-          trigger={mockTrigger}
-          onSelect={vi.fn()}
-          onSave={vi.fn()}
-          onManage={vi.fn()}
-        />,
-      )
-      expect(screen.getByTestId('trigger-button')).toBeInTheDocument()
-    })
-
-    it('should not render SelectMetadata before opening', () => {
-      render(
-        <SelectMetadataModal
-          datasetId="dataset-1"
-          trigger={mockTrigger}
-          onSelect={vi.fn()}
-          onSave={vi.fn()}
-          onManage={vi.fn()}
-        />,
-      )
-      expect(screen.queryByTestId('select-metadata')).not.toBeInTheDocument()
-    })
-
-    it('should pass dataset metadata to SelectMetadata', () => {
-      render(
-        <SelectMetadataModal
-          datasetId="dataset-1"
-          trigger={mockTrigger}
-          onSelect={vi.fn()}
-          onSave={vi.fn()}
-          onManage={vi.fn()}
-        />,
-      )
-      fireEvent.click(screen.getByTestId('trigger-button'))
-      expect(screen.getByTestId('list-count')).toHaveTextContent('2')
-    })
-  })
-
-  describe('User Interactions', () => {
-    it('should toggle open state when trigger is clicked', () => {
-      render(
-        <SelectMetadataModal
-          datasetId="dataset-1"
-          trigger={mockTrigger}
-          onSelect={vi.fn()}
-          onSave={vi.fn()}
-          onManage={vi.fn()}
-        />,
-      )
-
-      fireEvent.click(screen.getByTestId('trigger-button'))
-
-      expect(screen.getByTestId('popover-root')).toHaveAttribute('data-open', 'true')
-      expect(screen.getByTestId('select-metadata')).toBeInTheDocument()
-    })
-
-    it('should call onSelect and close when item is selected', () => {
-      const handleSelect = vi.fn()
-      render(
-        <SelectMetadataModal
-          datasetId="dataset-1"
-          trigger={mockTrigger}
-          onSelect={handleSelect}
-          onSave={vi.fn()}
-          onManage={vi.fn()}
-        />,
-      )
-
-      fireEvent.click(screen.getByTestId('trigger-button'))
-      fireEvent.click(screen.getByTestId('select-item'))
-
-      expect(handleSelect).toHaveBeenCalledWith({
-        id: '1',
-        name: 'field_one',
-        type: DataType.string,
-      })
-    })
-
-    it('should switch to create step when new button is clicked', async () => {
-      render(
-        <SelectMetadataModal
-          datasetId="dataset-1"
-          trigger={mockTrigger}
-          onSelect={vi.fn()}
-          onSave={vi.fn()}
-          onManage={vi.fn()}
-        />,
-      )
-
-      fireEvent.click(screen.getByTestId('trigger-button'))
-      fireEvent.click(screen.getByTestId('new-btn'))
-
-      await waitFor(() => {
-        expect(screen.getByTestId('create-content')).toBeInTheDocument()
-      })
-    })
-
-    it('should call onManage when manage button is clicked', () => {
-      const handleManage = vi.fn()
-      render(
-        <SelectMetadataModal
-          datasetId="dataset-1"
-          trigger={mockTrigger}
-          onSelect={vi.fn()}
-          onSave={vi.fn()}
-          onManage={handleManage}
-        />,
-      )
-
-      fireEvent.click(screen.getByTestId('trigger-button'))
-      fireEvent.click(screen.getByTestId('manage-btn'))
-
-      expect(handleManage).toHaveBeenCalled()
-    })
-  })
-
-  describe('Create Flow', () => {
-    it('should switch back to select when back is clicked in create step', async () => {
-      render(
-        <SelectMetadataModal
-          datasetId="dataset-1"
-          trigger={mockTrigger}
-          onSelect={vi.fn()}
-          onSave={vi.fn()}
-          onManage={vi.fn()}
-        />,
-      )
-
-      // Go to create step
-      fireEvent.click(screen.getByTestId('trigger-button'))
-      fireEvent.click(screen.getByTestId('new-btn'))
-
-      await waitFor(() => {
-        expect(screen.getByTestId('create-content')).toBeInTheDocument()
-      })
-
-      // Go back to select step
-      fireEvent.click(screen.getByTestId('back-btn'))
-
-      await waitFor(() => {
-        expect(screen.getByTestId('select-metadata')).toBeInTheDocument()
-      })
-    })
-
-    it('should call onSave and return to select step when save is clicked', async () => {
-      const handleSave = vi.fn().mockResolvedValue(undefined)
-      render(
-        <SelectMetadataModal
-          datasetId="dataset-1"
-          trigger={mockTrigger}
-          onSelect={vi.fn()}
-          onSave={handleSave}
-          onManage={vi.fn()}
-        />,
-      )
-
-      // Go to create step
-      fireEvent.click(screen.getByTestId('trigger-button'))
-      fireEvent.click(screen.getByTestId('new-btn'))
-
-      await waitFor(() => {
-        expect(screen.getByTestId('create-content')).toBeInTheDocument()
-      })
-
-      // Save new metadata
-      fireEvent.click(screen.getByTestId('save-btn'))
-
-      await waitFor(() => {
-        expect(handleSave).toHaveBeenCalledWith({
-          type: DataType.string,
-          name: 'new_field',
-        })
-      })
-    })
-  })
-
-  describe('Props', () => {
-    it('should accept custom popupPlacement', () => {
-      render(
-        <SelectMetadataModal
-          datasetId="dataset-1"
-          trigger={mockTrigger}
-          onSelect={vi.fn()}
-          onSave={vi.fn()}
-          onManage={vi.fn()}
-          popupPlacement="bottom-start"
-        />,
-      )
-      expect(screen.getByTestId('popover-root')).toBeInTheDocument()
-    })
-
-    it('should accept custom popupOffset', () => {
-      render(
-        <SelectMetadataModal
-          datasetId="dataset-1"
-          trigger={mockTrigger}
-          onSelect={vi.fn()}
-          onSave={vi.fn()}
-          onManage={vi.fn()}
-          popupOffset={{ mainAxis: 10, crossAxis: 5 }}
-        />,
-      )
-      expect(screen.getByTestId('popover-root')).toBeInTheDocument()
-    })
-  })
-
-  describe('Edge Cases', () => {
-    it('should handle different datasetIds', () => {
-      const { rerender } = render(
-        <SelectMetadataModal
-          datasetId="dataset-1"
-          trigger={mockTrigger}
-          onSelect={vi.fn()}
-          onSave={vi.fn()}
-          onManage={vi.fn()}
-        />,
-      )
-
-      expect(screen.getByTestId('popover-root')).toBeInTheDocument()
-
-      rerender(
-        <SelectMetadataModal
-          datasetId="dataset-2"
-          trigger={mockTrigger}
-          onSelect={vi.fn()}
-          onSave={vi.fn()}
-          onManage={vi.fn()}
-        />,
-      )
-
-      expect(screen.getByTestId('popover-root')).toBeInTheDocument()
-    })
-
-    it('should handle empty trigger', () => {
-      render(
-        <SelectMetadataModal
-          datasetId="dataset-1"
-          trigger={<span data-testid="empty-trigger" />}
-          onSelect={vi.fn()}
-          onSave={vi.fn()}
-          onManage={vi.fn()}
-        />,
-      )
-      expect(screen.getByTestId('empty-trigger')).toBeInTheDocument()
-    })
-  })
-})
diff --git a/web/app/components/datasets/metadata/metadata-dataset/__tests__/select-metadata.spec.tsx b/web/app/components/datasets/metadata/metadata-dataset/__tests__/select-metadata.spec.tsx
deleted file mode 100644
index c1406d1233..0000000000
--- a/web/app/components/datasets/metadata/metadata-dataset/__tests__/select-metadata.spec.tsx
+++ /dev/null
@@ -1,332 +0,0 @@
-import type { MetadataItem } from '../../types'
-import { fireEvent, render, screen } from '@testing-library/react'
-import { describe, expect, it, vi } from 'vitest'
-import { DataType } from '../../types'
-import SelectMetadata from '../select-metadata'
-
-type IconProps = {
-  className?: string
-}
-
-// Mock getIcon utility
-vi.mock('../../utils/get-icon', () => ({
-  getIcon: () => (props: IconProps) => <span data-testid="icon" className={props.className}>Icon</span>,
-}))
-
-describe('SelectMetadata', () => {
-  const mockList: MetadataItem[] = [
-    { id: '1', name: 'field_one', type: DataType.string },
-    { id: '2', name: 'field_two', type: DataType.number },
-    { id: '3', name: 'field_three', type: DataType.time },
-  ]
-
-  describe('Rendering', () => {
-    it('should render without crashing', () => {
-      const { container } = render(
-        <SelectMetadata
-          list={mockList}
-          onSelect={vi.fn()}
-          onNew={vi.fn()}
-          onManage={vi.fn()}
-        />,
-      )
-      expect(container.firstChild).toBeInTheDocument()
-    })
-
-    it('should render search input', () => {
-      render(
-        <SelectMetadata
-          list={mockList}
-          onSelect={vi.fn()}
-          onNew={vi.fn()}
-          onManage={vi.fn()}
-        />,
-      )
-      expect(screen.getByRole('textbox')).toBeInTheDocument()
-    })
-
-    it('should render all metadata items', () => {
-      render(
-        <SelectMetadata
-          list={mockList}
-          onSelect={vi.fn()}
-          onNew={vi.fn()}
-          onManage={vi.fn()}
-        />,
-      )
-      expect(screen.getByText('field_one')).toBeInTheDocument()
-      expect(screen.getByText('field_two')).toBeInTheDocument()
-      expect(screen.getByText('field_three')).toBeInTheDocument()
-    })
-
-    it('should render new action button', () => {
-      render(
-        <SelectMetadata
-          list={mockList}
-          onSelect={vi.fn()}
-          onNew={vi.fn()}
-          onManage={vi.fn()}
-        />,
-      )
-      // New action button should be present (from i18n)
-      expect(screen.getByText(/new/i)).toBeInTheDocument()
-    })
-
-    it('should render manage action button', () => {
-      render(
-        <SelectMetadata
-          list={mockList}
-          onSelect={vi.fn()}
-          onNew={vi.fn()}
-          onManage={vi.fn()}
-        />,
-      )
-      // Manage action button should be present (from i18n)
-      expect(screen.getByText(/manage/i)).toBeInTheDocument()
-    })
-
-    it('should display type for each item', () => {
-      render(
-        <SelectMetadata
-          list={mockList}
-          onSelect={vi.fn()}
-          onNew={vi.fn()}
-          onManage={vi.fn()}
-        />,
-      )
-      expect(screen.getAllByText(DataType.string).length).toBeGreaterThan(0)
-      expect(screen.getAllByText(DataType.number).length).toBeGreaterThan(0)
-      expect(screen.getAllByText(DataType.time).length).toBeGreaterThan(0)
-    })
-  })
-
-  describe('Search Functionality', () => {
-    it('should filter items based on search query', () => {
-      render(
-        <SelectMetadata
-          list={mockList}
-          onSelect={vi.fn()}
-          onNew={vi.fn()}
-          onManage={vi.fn()}
-        />,
-      )
-
-      const searchInput = screen.getByRole('textbox')
-      fireEvent.change(searchInput, { target: { value: 'one' } })
-
-      expect(screen.getByText('field_one')).toBeInTheDocument()
-      expect(screen.queryByText('field_two')).not.toBeInTheDocument()
-      expect(screen.queryByText('field_three')).not.toBeInTheDocument()
-    })
-
-    it('should be case insensitive search', () => {
-      render(
-        <SelectMetadata
-          list={mockList}
-          onSelect={vi.fn()}
-          onNew={vi.fn()}
-          onManage={vi.fn()}
-        />,
-      )
-
-      const searchInput = screen.getByRole('textbox')
-      fireEvent.change(searchInput, { target: { value: 'ONE' } })
-
-      expect(screen.getByText('field_one')).toBeInTheDocument()
-    })
-
-    it('should show all items when search is cleared', () => {
-      render(
-        <SelectMetadata
-          list={mockList}
-          onSelect={vi.fn()}
-          onNew={vi.fn()}
-          onManage={vi.fn()}
-        />,
-      )
-
-      const searchInput = screen.getByRole('textbox')
-
-      // Search for something
-      fireEvent.change(searchInput, { target: { value: 'one' } })
-      expect(screen.queryByText('field_two')).not.toBeInTheDocument()
-
-      // Clear search
-      fireEvent.change(searchInput, { target: { value: '' } })
-      expect(screen.getByText('field_two')).toBeInTheDocument()
-    })
-
-    it('should show no results when search matches nothing', () => {
-      render(
-        <SelectMetadata
-          list={mockList}
-          onSelect={vi.fn()}
-          onNew={vi.fn()}
-          onManage={vi.fn()}
-        />,
-      )
-
-      const searchInput = screen.getByRole('textbox')
-      fireEvent.change(searchInput, { target: { value: 'xyz' } })
-
-      expect(screen.queryByText('field_one')).not.toBeInTheDocument()
-      expect(screen.queryByText('field_two')).not.toBeInTheDocument()
-      expect(screen.queryByText('field_three')).not.toBeInTheDocument()
-    })
-  })
-
-  describe('User Interactions', () => {
-    it('should call onSelect with item data when item is clicked', () => {
-      const handleSelect = vi.fn()
-      render(
-        <SelectMetadata
-          list={mockList}
-          onSelect={handleSelect}
-          onNew={vi.fn()}
-          onManage={vi.fn()}
-        />,
-      )
-
-      fireEvent.click(screen.getByText('field_one'))
-
-      expect(handleSelect).toHaveBeenCalledWith({
-        id: '1',
-        name: 'field_one',
-        type: DataType.string,
-      })
-    })
-
-    it('should call onNew when new button is clicked', () => {
-      const handleNew = vi.fn()
-      render(
-        <SelectMetadata
-          list={mockList}
-          onSelect={vi.fn()}
-          onNew={handleNew}
-          onManage={vi.fn()}
-        />,
-      )
-
-      // Find and click the new action button
-      const newButton = screen.getByText(/new/i)
-      fireEvent.click(newButton.closest('div') || newButton)
-
-      expect(handleNew).toHaveBeenCalled()
-    })
-
-    it('should call onManage when manage button is clicked', () => {
-      const handleManage = vi.fn()
-      render(
-        <SelectMetadata
-          list={mockList}
-          onSelect={vi.fn()}
-          onNew={vi.fn()}
-          onManage={handleManage}
-        />,
-      )
-
-      // Find and click the manage action button
-      const manageButton = screen.getByText(/manage/i)
-      fireEvent.click(manageButton.closest('div') || manageButton)
-
-      expect(handleManage).toHaveBeenCalled()
-    })
-  })
-
-  describe('Empty State', () => {
-    it('should render empty list', () => {
-      const { container } = render(
-        <SelectMetadata
-          list={[]}
-          onSelect={vi.fn()}
-          onNew={vi.fn()}
-          onManage={vi.fn()}
-        />,
-      )
-      expect(container.firstChild).toBeInTheDocument()
-    })
-
-    it('should still show new and manage buttons with empty list', () => {
-      render(
-        <SelectMetadata
-          list={[]}
-          onSelect={vi.fn()}
-          onNew={vi.fn()}
-          onManage={vi.fn()}
-        />,
-      )
-      expect(screen.getByText(/new/i)).toBeInTheDocument()
-      expect(screen.getByText(/manage/i)).toBeInTheDocument()
-    })
-  })
-
-  describe('Styling', () => {
-    it('should have correct container styling', () => {
-      const { container } = render(
-        <SelectMetadata
-          list={mockList}
-          onSelect={vi.fn()}
-          onNew={vi.fn()}
-          onManage={vi.fn()}
-        />,
-      )
-      expect(container.firstChild).toHaveClass('w-[320px]', 'rounded-xl')
-    })
-  })
-
-  describe('Edge Cases', () => {
-    it('should handle single item list', () => {
-      const singleItem: MetadataItem[] = [
-        { id: '1', name: 'only_one', type: DataType.string },
-      ]
-      render(
-        <SelectMetadata
-          list={singleItem}
-          onSelect={vi.fn()}
-          onNew={vi.fn()}
-          onManage={vi.fn()}
-        />,
-      )
-      expect(screen.getByText('only_one')).toBeInTheDocument()
-    })
-
-    it('should handle item with long name', () => {
-      const longNameItem: MetadataItem[] = [
-        { id: '1', name: 'this_is_a_very_long_field_name_that_might_overflow', type: DataType.string },
-      ]
-      render(
-        <SelectMetadata
-          list={longNameItem}
-          onSelect={vi.fn()}
-          onNew={vi.fn()}
-          onManage={vi.fn()}
-        />,
-      )
-      expect(screen.getByText('this_is_a_very_long_field_name_that_might_overflow')).toBeInTheDocument()
-    })
-
-    it('should handle rapid search input changes', () => {
-      render(
-        <SelectMetadata
-          list={mockList}
-          onSelect={vi.fn()}
-          onNew={vi.fn()}
-          onManage={vi.fn()}
-        />,
-      )
-
-      const searchInput = screen.getByRole('textbox')
-
-      // Rapid typing
-      fireEvent.change(searchInput, { target: { value: 'f' } })
-      fireEvent.change(searchInput, { target: { value: 'fi' } })
-      fireEvent.change(searchInput, { target: { value: 'fie' } })
-      fireEvent.change(searchInput, { target: { value: 'fiel' } })
-      fireEvent.change(searchInput, { target: { value: 'field' } })
-
-      expect(screen.getByText('field_one')).toBeInTheDocument()
-      expect(screen.getByText('field_two')).toBeInTheDocument()
-      expect(screen.getByText('field_three')).toBeInTheDocument()
-    })
-  })
-})
diff --git a/web/app/components/datasets/metadata/metadata-dataset/create-content.tsx b/web/app/components/datasets/metadata/metadata-dataset/create-content.tsx
index ee1b9cbcdc..a1236f0ea3 100644
--- a/web/app/components/datasets/metadata/metadata-dataset/create-content.tsx
+++ b/web/app/components/datasets/metadata/metadata-dataset/create-content.tsx
@@ -1,12 +1,10 @@
 'use client'
-import type { FC } from 'react'
-import { RiArrowLeftLine } from '@remixicon/react'
+import type { BuiltInMetadataItem } from '../types'
+import { Button } from '@langgenius/dify-ui/button'
 import { noop } from 'es-toolkit/function'
-import * as React from 'react'
 import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Input from '@/app/components/base/input'
-import ModalLikeWrap from '../../../base/modal-like-wrap'
 import OptionCard from '../../../workflow/nodes/_base/components/option-card'
 import { DataType } from '../types'
 import Field from './field'
@@ -15,17 +13,17 @@ const i18nPrefix = 'metadata.createMetadata'
 
 export type Props = {
   onClose?: () => void
-  onSave: (data: any) => void
+  onSave: (data: BuiltInMetadataItem) => void
   hasBack?: boolean
   onBack?: () => void
 }
 
-const CreateContent: FC<Props> = ({
+export function CreateContent({
   onClose = noop,
   hasBack,
   onBack,
   onSave,
-}) => {
+}: Props) {
   const { t } = useTranslation()
   const [type, setType] = useState(DataType.string)
 
@@ -45,47 +43,77 @@ const CreateContent: FC<Props> = ({
   }, [onSave, type, name])
 
   return (
-    <ModalLikeWrap
-      title={t(`${i18nPrefix}.title`, { ns: 'dataset' })}
-      onClose={onClose}
-      onConfirm={handleSave}
-      hideCloseBtn={hasBack}
-      beforeHeader={hasBack && (
-        <div className="relative left-[-4px] mb-1 flex cursor-pointer items-center space-x-1 py-1 text-text-accent" onClick={onBack}>
-          <RiArrowLeftLine className="size-4" />
-          <div className="system-xs-semibold-uppercase">{t(`${i18nPrefix}.back`, { ns: 'dataset' })}</div>
-        </div>
+    <div className="px-3 pt-3.5 pb-4">
+      {hasBack && (
+        <button
+          type="button"
+          className="relative left-[-4px] mb-1 flex cursor-pointer items-center space-x-1 border-none bg-transparent px-0 py-1 text-left text-text-accent"
+          onClick={onBack}
+        >
+          <span className="i-ri-arrow-left-line size-4" aria-hidden="true" />
+          <span className="system-xs-semibold-uppercase">{t(`${i18nPrefix}.back`, { ns: 'dataset' })}</span>
+        </button>
       )}
-    >
-      <div className="space-y-3">
-        <Field label={t(`${i18nPrefix}.type`, { ns: 'dataset' })}>
-          <div className="grid grid-cols-3 gap-2">
-            <OptionCard
-              title="String"
-              selected={type === DataType.string}
-              onSelect={handleTypeChange(DataType.string)}
-            />
-            <OptionCard
-              title="Number"
-              selected={type === DataType.number}
-              onSelect={handleTypeChange(DataType.number)}
-            />
-            <OptionCard
-              title="Time"
-              selected={type === DataType.time}
-              onSelect={handleTypeChange(DataType.time)}
-            />
-          </div>
-        </Field>
-        <Field label={t(`${i18nPrefix}.name`, { ns: 'dataset' })}>
-          <Input
-            value={name}
-            onChange={handleNameChange}
-            placeholder={t(`${i18nPrefix}.namePlaceholder`, { ns: 'dataset' })}
-          />
-        </Field>
+      <div className="mb-1 flex h-6 items-center justify-between">
+        <div className="system-xl-semibold text-text-primary">
+          {t(`${i18nPrefix}.title`, { ns: 'dataset' })}
+        </div>
+        {!hasBack && (
+          <button
+            type="button"
+            aria-label={t('operation.close', { ns: 'common' })}
+            className="cursor-pointer border-none bg-transparent p-1.5 text-text-tertiary"
+            onClick={onClose}
+          >
+            <span className="i-ri-close-line size-4" aria-hidden="true" />
+          </button>
+        )}
       </div>
-    </ModalLikeWrap>
+      <div className="mt-2">
+        <div className="space-y-3">
+          <Field label={t(`${i18nPrefix}.type`, { ns: 'dataset' })}>
+            <div className="grid grid-cols-3 gap-2">
+              <OptionCard
+                title="String"
+                selected={type === DataType.string}
+                onSelect={handleTypeChange(DataType.string)}
+              />
+              <OptionCard
+                title="Number"
+                selected={type === DataType.number}
+                onSelect={handleTypeChange(DataType.number)}
+              />
+              <OptionCard
+                title="Time"
+                selected={type === DataType.time}
+                onSelect={handleTypeChange(DataType.time)}
+              />
+            </div>
+          </Field>
+          <Field label={t(`${i18nPrefix}.name`, { ns: 'dataset' })}>
+            <Input
+              aria-label={t(`${i18nPrefix}.name`, { ns: 'dataset' })}
+              value={name}
+              onChange={handleNameChange}
+              placeholder={t(`${i18nPrefix}.namePlaceholder`, { ns: 'dataset' })}
+            />
+          </Field>
+        </div>
+      </div>
+      <div className="mt-4 flex justify-end">
+        <Button
+          className="mr-2"
+          onClick={onClose}
+        >
+          {t('operation.cancel', { ns: 'common' })}
+        </Button>
+        <Button
+          onClick={handleSave}
+          variant="primary"
+        >
+          {t('operation.save', { ns: 'common' })}
+        </Button>
+      </div>
+    </div>
   )
 }
-export default React.memo(CreateContent)
diff --git a/web/app/components/datasets/metadata/metadata-dataset/create-metadata-modal.tsx b/web/app/components/datasets/metadata/metadata-dataset/create-metadata-modal.tsx
index 687266eed9..68163bd8d5 100644
--- a/web/app/components/datasets/metadata/metadata-dataset/create-metadata-modal.tsx
+++ b/web/app/components/datasets/metadata/metadata-dataset/create-metadata-modal.tsx
@@ -1,25 +1,23 @@
 'use client'
-import type { FC } from 'react'
 import type { Props as CreateContentProps } from './create-content'
 import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
 import * as React from 'react'
-import CreateContent from './create-content'
+import { CreateContent } from './create-content'
 
 type Props = {
   open: boolean
   setOpen: (open: boolean) => void
-  onSave: (data: any) => void
   trigger: React.ReactNode
   popupLeft?: number
 } & CreateContentProps
 
-const CreateMetadataModal: FC<Props> = ({
+export function CreateMetadataModal({
   open,
   setOpen,
   trigger,
   popupLeft = 20,
   ...createContentProps
-}) => {
+}: Props) {
   const triggerElement = React.isValidElement(trigger)
     ? trigger
     : <button type="button">{trigger}</button>
@@ -34,7 +32,7 @@ const CreateMetadataModal: FC<Props> = ({
         placement="left-start"
         sideOffset={popupLeft}
         alignOffset={-38}
-        popupClassName="border-none bg-transparent shadow-none"
+        popupClassName="w-[320px]"
       >
         <CreateContent {...createContentProps} onClose={() => setOpen(false)} onBack={() => setOpen(false)} />
       </PopoverContent>
@@ -42,4 +40,3 @@ const CreateMetadataModal: FC<Props> = ({
 
   )
 }
-export default React.memo(CreateMetadataModal)
diff --git a/web/app/components/datasets/metadata/metadata-dataset/dataset-metadata-drawer.tsx b/web/app/components/datasets/metadata/metadata-dataset/dataset-metadata-drawer.tsx
index 03c9883fbf..9bf31766c0 100644
--- a/web/app/components/datasets/metadata/metadata-dataset/dataset-metadata-drawer.tsx
+++ b/web/app/components/datasets/metadata/metadata-dataset/dataset-metadata-drawer.tsx
@@ -12,6 +12,17 @@ import {
 } from '@langgenius/dify-ui/alert-dialog'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
+import {
+  Drawer,
+  DrawerBackdrop,
+  DrawerCloseButton,
+  DrawerContent,
+  DrawerPopup,
+  DrawerPortal,
+  DrawerTitle,
+  DrawerViewport,
+} from '@langgenius/dify-ui/drawer'
 import { Switch } from '@langgenius/dify-ui/switch'
 import { toast } from '@langgenius/dify-ui/toast'
 import { RiAddLine, RiDeleteBinLine, RiEditLine } from '@remixicon/react'
@@ -19,12 +30,10 @@ import { useBoolean, useHover } from 'ahooks'
 import * as React from 'react'
 import { useCallback, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import Drawer from '@/app/components/base/drawer'
+import { Infotip } from '@/app/components/base/infotip'
 import Input from '@/app/components/base/input'
-import Modal from '@/app/components/base/modal'
-import Tooltip from '@/app/components/base/tooltip'
-import CreateModal from '@/app/components/datasets/metadata/metadata-dataset/create-metadata-modal'
-import { getIcon } from '../utils/get-icon'
+import { CreateMetadataModal } from '@/app/components/datasets/metadata/metadata-dataset/create-metadata-modal'
+import { getIconClassName } from '../utils/get-icon'
 import Field from './field'
 
 const i18nPrefix = 'metadata.datasetMetadata'
@@ -55,13 +64,13 @@ const Item: FC<ItemProps> = ({
   onDelete,
 }) => {
   const { t } = useTranslation()
-  const Icon = getIcon(payload.type)
+  const iconClassName = getIconClassName(payload.type)
 
   const handleRename = useCallback(() => {
     onRename?.()
   }, [onRename])
 
-  const deleteBtnRef = useRef<HTMLDivElement>(null)
+  const deleteBtnRef = useRef<HTMLButtonElement>(null)
   const isDeleteHovering = useHover(deleteBtnRef)
   const [isShowDeleteConfirm, {
     setTrue: showDeleteConfirm,
@@ -88,7 +97,7 @@ const Item: FC<ItemProps> = ({
         )}
       >
         <div className="flex h-full items-center space-x-1 text-text-tertiary">
-          <Icon className="size-4 shrink-0" />
+          <span className={cn(iconClassName, 'size-4 shrink-0')} aria-hidden="true" />
           <div className="max-w-[250px] truncate system-sm-medium text-text-primary">{payload.name}</div>
           <div className="shrink-0 system-xs-regular">{payload.type}</div>
         </div>
@@ -98,10 +107,23 @@ const Item: FC<ItemProps> = ({
           </div>
         )}
         <div className="ml-2 hidden items-center space-x-1 text-text-tertiary group-hover/item:flex">
-          <RiEditLine className="size-4 cursor-pointer" onClick={handleRename} />
-          <div ref={deleteBtnRef} className="hover:text-text-destructive">
-            <RiDeleteBinLine className="size-4 cursor-pointer" onClick={showDeleteConfirm} />
-          </div>
+          <button
+            type="button"
+            aria-label={t('operation.edit', { ns: 'common' })}
+            className="cursor-pointer rounded-md border-none bg-transparent p-0.5 hover:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+            onClick={handleRename}
+          >
+            <RiEditLine className="size-4" aria-hidden="true" />
+          </button>
+          <button
+            type="button"
+            ref={deleteBtnRef}
+            aria-label={t('operation.remove', { ns: 'common' })}
+            className="cursor-pointer rounded-md border-none bg-transparent p-0.5 hover:bg-state-destructive-hover hover:text-text-destructive focus-visible:ring-1 focus-visible:ring-state-destructive-border focus-visible:outline-hidden"
+            onClick={showDeleteConfirm}
+          >
+            <RiDeleteBinLine className="size-4" aria-hidden="true" />
+          </button>
         </div>
         <AlertDialog open={isShowDeleteConfirm} onOpenChange={open => !open && hideDeleteConfirm()}>
           <AlertDialogContent>
@@ -149,7 +171,7 @@ const DatasetMetadataDrawer: FC<Props> = ({
   }, [setCurrPayload, setIsShowRenameModal])
 
   const [open, setOpen] = useState(false)
-  const handleAdd = useCallback(async (data: MetadataItemWithValueLength) => {
+  const handleAdd = useCallback(async (data: BuiltInMetadataItem) => {
     await onAdd(data)
     toast.success(t('api.actionSuccess', { ns: 'common' }))
     setOpen(false)
@@ -176,89 +198,123 @@ const DatasetMetadataDrawer: FC<Props> = ({
 
   return (
     <Drawer
-      isOpen={true}
-      onClose={onClose}
-      showClose
-      title={t('metadata.metadata', { ns: 'dataset' })}
-      footer={null}
-      panelClassName="px-4 block max-w-[420px]! my-2 rounded-l-2xl"
+      open
+      modal
+      swipeDirection="right"
+      onOpenChange={(open) => {
+        if (!open)
+          onClose()
+      }}
     >
-      <div className="h-full overflow-y-auto">
-        <div className="system-sm-regular text-text-tertiary">{t(`${i18nPrefix}.description`, { ns: 'dataset' })}</div>
-        <CreateModal
-          open={open}
-          setOpen={setOpen}
-          trigger={(
-            <Button variant="primary" className="mt-3">
-              <RiAddLine className="mr-1" />
-              {t(`${i18nPrefix}.addMetaData`, { ns: 'dataset' })}
-            </Button>
-          )}
-          hasBack
-          onSave={handleAdd}
-        />
+      <DrawerPortal>
+        <DrawerBackdrop />
+        <DrawerViewport>
+          <DrawerPopup className="data-[swipe-direction=right]:top-2 data-[swipe-direction=right]:bottom-2 data-[swipe-direction=right]:h-[calc(100dvh-16px)] data-[swipe-direction=right]:w-full data-[swipe-direction=right]:max-w-[420px]">
+            <DrawerContent className="flex min-h-0 flex-1 flex-col p-0 pb-0">
+              <div className="flex shrink-0 justify-between px-4 pt-6 pb-4">
+                <DrawerTitle className="text-lg leading-6 font-medium text-text-primary">
+                  {t('metadata.metadata', { ns: 'dataset' })}
+                </DrawerTitle>
+                <DrawerCloseButton
+                  aria-label={t('operation.close', { ns: 'common' })}
+                  className="h-6 w-6 rounded-md"
+                />
+              </div>
+              <div className="min-h-0 flex-1 overflow-y-auto px-4 pb-6">
+                <div className="system-sm-regular text-text-tertiary">{t(`${i18nPrefix}.description`, { ns: 'dataset' })}</div>
+                <CreateMetadataModal
+                  open={open}
+                  setOpen={setOpen}
+                  trigger={(
+                    <Button variant="primary" className="mt-3">
+                      <RiAddLine className="mr-1" />
+                      {t(`${i18nPrefix}.addMetaData`, { ns: 'dataset' })}
+                    </Button>
+                  )}
+                  hasBack
+                  onSave={handleAdd}
+                />
 
-        <div className="mt-3 space-y-1">
-          {userMetadata.map(payload => (
-            <Item
-              key={payload.id}
-              payload={payload}
-              onRename={handleRename(payload)}
-              onDelete={handleDelete(payload)}
-            />
-          ))}
-        </div>
+                <div className="mt-3 space-y-1">
+                  {userMetadata.map(payload => (
+                    <Item
+                      key={payload.id}
+                      payload={payload}
+                      onRename={handleRename(payload)}
+                      onDelete={handleDelete(payload)}
+                    />
+                  ))}
+                </div>
 
-        <div className="mt-3 flex h-6 items-center">
-          <Switch
-            checked={isBuiltInEnabled}
-            onCheckedChange={onIsBuiltInEnabledChange}
-          />
-          <div className="mr-0.5 ml-2 system-sm-semibold text-text-secondary">{t(`${i18nPrefix}.builtIn`, { ns: 'dataset' })}</div>
-          <Tooltip popupContent={<div className="max-w-[100px]">{t(`${i18nPrefix}.builtInDescription`, { ns: 'dataset' })}</div>} />
-        </div>
+                <div className="mt-3 flex h-6 items-center">
+                  <Switch
+                    checked={isBuiltInEnabled}
+                    onCheckedChange={onIsBuiltInEnabledChange}
+                  />
+                  <div className="mr-0.5 ml-2 system-sm-semibold text-text-secondary">{t(`${i18nPrefix}.builtIn`, { ns: 'dataset' })}</div>
+                  <Infotip aria-label={t(`${i18nPrefix}.builtInDescription`, { ns: 'dataset' })} popupClassName="max-w-[100px]">
+                    {t(`${i18nPrefix}.builtInDescription`, { ns: 'dataset' })}
+                  </Infotip>
+                </div>
 
-        <div className="mt-1 space-y-1">
-          {builtInMetadata.map(payload => (
-            <Item
-              key={payload.name}
-              readonly
-              disabled={!isBuiltInEnabled}
-              payload={payload as MetadataItemWithValueLength}
-            />
-          ))}
-        </div>
+                <div className="mt-1 space-y-1">
+                  {builtInMetadata.map(payload => (
+                    <Item
+                      key={payload.name}
+                      readonly
+                      disabled={!isBuiltInEnabled}
+                      payload={payload as MetadataItemWithValueLength}
+                    />
+                  ))}
+                </div>
 
-        {isShowRenameModal && (
-          <Modal isShow title={t(`${i18nPrefix}.rename`, { ns: 'dataset' })} onClose={() => setIsShowRenameModal(false)}>
-            <Field label={t(`${i18nPrefix}.name`, { ns: 'dataset' })} className="mt-4">
-              <Input
-                value={templeName}
-                onChange={e => setTempleName(e.target.value)}
-                placeholder={t(`${i18nPrefix}.namePlaceholder`, { ns: 'dataset' })}
-              />
-            </Field>
-            <div className="mt-4 flex justify-end">
-              <Button
-                className="mr-2"
-                onClick={() => {
-                  setIsShowRenameModal(false)
-                  setTempleName(currPayload!.name)
-                }}
-              >
-                {t('operation.cancel', { ns: 'common' })}
-              </Button>
-              <Button
-                onClick={handleRenamed}
-                variant="primary"
-                disabled={!templeName}
-              >
-                {t('operation.save', { ns: 'common' })}
-              </Button>
-            </div>
-          </Modal>
-        )}
-      </div>
+                {isShowRenameModal && (
+                  <Dialog
+                    open
+                    onOpenChange={(open) => {
+                      if (!open)
+                        setIsShowRenameModal(false)
+                    }}
+                  >
+                    <DialogContent className="overflow-hidden! border-none text-left align-middle">
+                      <DialogTitle className="title-2xl-semi-bold text-text-primary">
+                        {t(`${i18nPrefix}.rename`, { ns: 'dataset' })}
+                      </DialogTitle>
+
+                      <Field label={t(`${i18nPrefix}.name`, { ns: 'dataset' })} className="mt-4">
+                        <Input
+                          aria-label={t(`${i18nPrefix}.name`, { ns: 'dataset' })}
+                          value={templeName}
+                          onChange={e => setTempleName(e.target.value)}
+                          placeholder={t(`${i18nPrefix}.namePlaceholder`, { ns: 'dataset' })}
+                        />
+                      </Field>
+                      <div className="mt-4 flex justify-end">
+                        <Button
+                          className="mr-2"
+                          onClick={() => {
+                            setIsShowRenameModal(false)
+                            setTempleName(currPayload!.name)
+                          }}
+                        >
+                          {t('operation.cancel', { ns: 'common' })}
+                        </Button>
+                        <Button
+                          onClick={handleRenamed}
+                          variant="primary"
+                          disabled={!templeName}
+                        >
+                          {t('operation.save', { ns: 'common' })}
+                        </Button>
+                      </div>
+                    </DialogContent>
+                  </Dialog>
+                )}
+              </div>
+            </DrawerContent>
+          </DrawerPopup>
+        </DrawerViewport>
+      </DrawerPortal>
     </Drawer>
   )
 }
diff --git a/web/app/components/datasets/metadata/metadata-dataset/dataset-metadata-picker.tsx b/web/app/components/datasets/metadata/metadata-dataset/dataset-metadata-picker.tsx
new file mode 100644
index 0000000000..81ac317010
--- /dev/null
+++ b/web/app/components/datasets/metadata/metadata-dataset/dataset-metadata-picker.tsx
@@ -0,0 +1,285 @@
+'use client'
+
+import type { ComboboxRootChangeEventDetails, Placement } from '@langgenius/dify-ui/combobox'
+import type { BuiltInMetadataItem, MetadataItem } from '../types'
+import { cn } from '@langgenius/dify-ui/cn'
+import {
+  Combobox,
+  ComboboxClear,
+  ComboboxEmpty,
+  ComboboxInput,
+  ComboboxInputGroup,
+  ComboboxItem,
+  ComboboxItemText,
+  ComboboxList,
+  ComboboxSeparator,
+} from '@langgenius/dify-ui/combobox'
+import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
+import { useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { useDatasetMetaData } from '@/service/knowledge/use-metadata'
+import { getIconClassName } from '../utils/get-icon'
+import { CreateContent } from './create-content'
+
+const i18nPrefix = 'metadata.selectMetadata'
+
+const PickerView = {
+  select: 'select',
+  create: 'create',
+} as const
+
+type PickerView = typeof PickerView[keyof typeof PickerView]
+
+export type DatasetMetadataPickerProps = {
+  datasetId: string
+  placement?: Placement
+  sideOffset?: number
+  alignOffset?: number
+  onSelectMetadata: (metadata: MetadataItem) => void
+  onCreateMetadata: (metadata: BuiltInMetadataItem) => void | Promise<void>
+  onOpenMetadataManagement: () => void
+}
+
+function getMetadataLabel(metadata: MetadataItem) {
+  return metadata.name
+}
+
+function getMetadataValue(metadata: MetadataItem) {
+  return metadata.id
+}
+
+function isSameMetadata(item: MetadataItem, value: MetadataItem) {
+  return item.id === value.id
+}
+
+function metadataFilter(metadata: MetadataItem, query: string) {
+  return metadata.name.toLowerCase().includes(query.toLowerCase())
+}
+
+export function DatasetMetadataPicker({
+  datasetId,
+  placement = 'left-start',
+  sideOffset = -38,
+  alignOffset = 4,
+  onSelectMetadata,
+  onCreateMetadata,
+  onOpenMetadataManagement,
+}: DatasetMetadataPickerProps) {
+  const { t } = useTranslation()
+  const { data: datasetMetaData } = useDatasetMetaData(datasetId)
+  const metadataItems = datasetMetaData?.doc_metadata ?? []
+  const [open, setOpen] = useState(false)
+  const [view, setView] = useState<PickerView>(PickerView.select)
+  const [query, setQuery] = useState('')
+
+  const resetPicker = () => {
+    setView(PickerView.select)
+    setQuery('')
+  }
+
+  const handleOpenChange = (nextOpen: boolean) => {
+    setOpen(nextOpen)
+    if (!nextOpen)
+      resetPicker()
+  }
+
+  const handleInputValueChange = (inputValue: string, details: ComboboxRootChangeEventDetails) => {
+    if (details.reason !== 'item-press')
+      setQuery(inputValue)
+  }
+
+  const handleMetadataChange = (metadata: MetadataItem | null) => {
+    if (!metadata)
+      return
+
+    onSelectMetadata({
+      id: metadata.id,
+      name: metadata.name,
+      type: metadata.type,
+    })
+    setOpen(false)
+    resetPicker()
+  }
+
+  const handleCreateMetadata = async (metadata: BuiltInMetadataItem) => {
+    try {
+      await onCreateMetadata(metadata)
+      resetPicker()
+    }
+    catch {
+      // Keep the create view open so callers can surface validation feedback and the user can correct the input.
+    }
+  }
+
+  const handleOpenManagement = () => {
+    setOpen(false)
+    resetPicker()
+    onOpenMetadataManagement()
+  }
+
+  return (
+    <Popover
+      open={open}
+      onOpenChange={handleOpenChange}
+    >
+      <PopoverTrigger
+        render={(
+          <button
+            type="button"
+            aria-label={t('metadata.addMetadata', { ns: 'dataset' })}
+            aria-expanded={open}
+            className="flex h-6 w-full cursor-pointer items-center justify-center rounded-md border-0 bg-components-button-tertiary-bg px-2 py-0 text-xs font-medium text-components-button-tertiary-text hover:bg-components-button-tertiary-bg-hover focus-visible:bg-components-button-tertiary-bg-hover"
+          >
+            <span className="flex min-w-0 items-center justify-center gap-1">
+              <span className="i-ri-add-line size-3.5 shrink-0 text-components-button-tertiary-text" aria-hidden="true" />
+              <span className="truncate text-components-button-tertiary-text">{t('metadata.addMetadata', { ns: 'dataset' })}</span>
+            </span>
+          </button>
+        )}
+      />
+      <PopoverContent
+        placement={placement}
+        sideOffset={sideOffset}
+        alignOffset={alignOffset}
+        popupClassName="w-[320px] bg-components-panel-bg-blur backdrop-blur-[5px]"
+      >
+        {view === PickerView.select
+          ? (
+              <Combobox<MetadataItem>
+                value={null}
+                items={metadataItems}
+                inputValue={query}
+                onInputValueChange={handleInputValueChange}
+                onValueChange={handleMetadataChange}
+                itemToStringLabel={getMetadataLabel}
+                itemToStringValue={getMetadataValue}
+                isItemEqualToValue={isSameMetadata}
+                filter={metadataFilter}
+              >
+                <MetadataPickerSelectPanel
+                  query={query}
+                  onNewMetadata={() => {
+                    setView(PickerView.create)
+                    setQuery('')
+                  }}
+                  onOpenMetadataManagement={handleOpenManagement}
+                />
+              </Combobox>
+            )
+          : (
+              <CreateContent
+                onSave={handleCreateMetadata}
+                hasBack
+                onBack={resetPicker}
+                onClose={resetPicker}
+              />
+            )}
+      </PopoverContent>
+    </Popover>
+  )
+}
+
+function MetadataPickerSelectPanel({
+  query,
+  onNewMetadata,
+  onOpenMetadataManagement,
+}: {
+  query: string
+  onNewMetadata: () => void
+  onOpenMetadataManagement: () => void
+}) {
+  const { t } = useTranslation()
+
+  return (
+    <>
+      <div className="p-2 pb-1">
+        <ComboboxInputGroup>
+          <span className="ml-2 i-ri-search-line size-4 shrink-0 text-text-tertiary" aria-hidden="true" />
+          <ComboboxInput
+            aria-label={t(`${i18nPrefix}.search`, { ns: 'dataset' })}
+            placeholder={t(`${i18nPrefix}.search`, { ns: 'dataset' })}
+            className="pl-2"
+          />
+          {query && (
+            <ComboboxClear
+              aria-label={t('operation.clear', { ns: 'common' })}
+            />
+          )}
+        </ComboboxInputGroup>
+      </div>
+      <ComboboxList>
+        {(metadata: MetadataItem) => (
+          <MetadataOption key={metadata.id} metadata={metadata} />
+        )}
+      </ComboboxList>
+      <ComboboxEmpty>
+        {t('noData', { ns: 'common' })}
+      </ComboboxEmpty>
+      <ComboboxSeparator />
+      <MetadataPickerActions
+        onNewMetadata={onNewMetadata}
+        onOpenMetadataManagement={onOpenMetadataManagement}
+      />
+    </>
+  )
+}
+
+function MetadataOption({
+  metadata,
+}: {
+  metadata: MetadataItem
+}) {
+  const iconClassName = getIconClassName(metadata.type)
+
+  return (
+    <ComboboxItem value={metadata}>
+      <ComboboxItemText className="flex items-center gap-1.5 px-0">
+        <span className={cn(iconClassName, 'size-3.5 shrink-0')} aria-hidden="true" />
+        <span className="min-w-0 grow truncate">{metadata.name}</span>
+      </ComboboxItemText>
+      <span className="shrink-0 system-xs-regular text-text-tertiary">
+        {metadata.type}
+      </span>
+    </ComboboxItem>
+  )
+}
+
+function MetadataPickerActions({
+  onNewMetadata,
+  onOpenMetadataManagement,
+}: {
+  onNewMetadata: () => void
+  onOpenMetadataManagement: () => void
+}) {
+  const { t } = useTranslation()
+
+  return (
+    <div className="flex items-center justify-between p-1">
+      <button
+        type="button"
+        className={cn(
+          'flex h-8 min-w-0 cursor-pointer items-center gap-1 rounded-lg border-none bg-transparent px-2 text-left text-text-secondary outline-hidden',
+          'hover:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-active',
+        )}
+        onClick={onNewMetadata}
+      >
+        <span className="i-ri-add-line size-4 shrink-0 text-text-tertiary" aria-hidden="true" />
+        <span className="truncate system-sm-medium">{t(`${i18nPrefix}.newAction`, { ns: 'dataset' })}</span>
+      </button>
+      <div className="flex h-8 shrink-0 items-center text-text-secondary">
+        <div className="mx-1 h-3 w-px bg-divider-regular" />
+        <button
+          type="button"
+          className={cn(
+            'flex h-8 cursor-pointer items-center gap-1 rounded-lg border-none bg-transparent px-2 text-left text-text-secondary outline-hidden',
+            'hover:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-active',
+          )}
+          onClick={onOpenMetadataManagement}
+        >
+          <span className="system-sm-medium">{t(`${i18nPrefix}.manageAction`, { ns: 'dataset' })}</span>
+          <span className="i-ri-arrow-right-up-line size-4 shrink-0 text-text-tertiary" aria-hidden="true" />
+        </button>
+      </div>
+    </div>
+  )
+}
diff --git a/web/app/components/datasets/metadata/metadata-dataset/select-metadata-modal.tsx b/web/app/components/datasets/metadata/metadata-dataset/select-metadata-modal.tsx
deleted file mode 100644
index e0ed692677..0000000000
--- a/web/app/components/datasets/metadata/metadata-dataset/select-metadata-modal.tsx
+++ /dev/null
@@ -1,95 +0,0 @@
-'use client'
-import type { Placement } from '@langgenius/dify-ui/popover'
-import type { FC } from 'react'
-import type { MetadataItem } from '../types'
-import type { Props as CreateContentProps } from './create-content'
-import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
-import * as React from 'react'
-import { useCallback, useState } from 'react'
-import { useDatasetMetaData } from '@/service/knowledge/use-metadata'
-import CreateContent from './create-content'
-import SelectMetadata from './select-metadata'
-
-type Props = {
-  datasetId: string
-  popupPlacement?: Placement
-  popupOffset?: { mainAxis: number, crossAxis: number }
-  onSelect: (data: MetadataItem) => void
-  onSave: (data: MetadataItem) => void
-  trigger: React.ReactNode
-  onManage: () => void
-} & CreateContentProps
-
-enum Step {
-  select = 'select',
-  create = 'create',
-}
-
-const SelectMetadataModal: FC<Props> = ({
-  datasetId,
-  popupPlacement = 'left-start',
-  popupOffset = { mainAxis: -38, crossAxis: 4 },
-  trigger,
-  onSelect,
-  onSave,
-  onManage,
-}) => {
-  const { data: datasetMetaData } = useDatasetMetaData(datasetId)
-
-  const [open, setOpen] = useState(false)
-  const [step, setStep] = useState(Step.select)
-  const triggerElement = React.isValidElement(trigger)
-    ? trigger
-    : <button type="button">{trigger}</button>
-  const handleOpenChange = useCallback((nextOpen: boolean) => {
-    setOpen(nextOpen)
-    if (!nextOpen)
-      setStep(Step.select)
-  }, [])
-
-  const handleSave = useCallback(async (data: MetadataItem) => {
-    await onSave(data)
-    setStep(Step.select)
-  }, [onSave])
-  return (
-    <Popover
-      open={open}
-      onOpenChange={handleOpenChange}
-    >
-      <PopoverTrigger render={triggerElement as React.ReactElement} />
-      <PopoverContent
-        placement={popupPlacement}
-        sideOffset={popupOffset.mainAxis}
-        alignOffset={popupOffset.crossAxis}
-        popupClassName="border-none bg-transparent shadow-none"
-      >
-        {step === Step.select
-          ? (
-              <SelectMetadata
-                onSelect={(data) => {
-                  onSelect(data)
-                  setOpen(false)
-                }}
-                list={datasetMetaData?.doc_metadata || []}
-                onNew={() => setStep(Step.create)}
-                onManage={() => {
-                  setOpen(false)
-                  setStep(Step.select)
-                  onManage()
-                }}
-              />
-            )
-          : (
-              <CreateContent
-                onSave={handleSave}
-                hasBack
-                onBack={() => setStep(Step.select)}
-                onClose={() => setStep(Step.select)}
-              />
-            )}
-      </PopoverContent>
-    </Popover>
-
-  )
-}
-export default React.memo(SelectMetadataModal)
diff --git a/web/app/components/datasets/metadata/metadata-dataset/select-metadata.tsx b/web/app/components/datasets/metadata/metadata-dataset/select-metadata.tsx
deleted file mode 100644
index 4d86ddf28e..0000000000
--- a/web/app/components/datasets/metadata/metadata-dataset/select-metadata.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-'use client'
-import type { FC } from 'react'
-import type { MetadataItem } from '../types'
-import { RiAddLine, RiArrowRightUpLine } from '@remixicon/react'
-import * as React from 'react'
-import { useMemo, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import SearchInput from '@/app/components/base/search-input'
-import { getIcon } from '../utils/get-icon'
-
-const i18nPrefix = 'metadata.selectMetadata'
-
-type Props = {
-  list: MetadataItem[]
-  onSelect: (data: MetadataItem) => void
-  onNew: () => void
-  onManage: () => void
-}
-
-const SelectMetadata: FC<Props> = ({
-  list: notFilteredList,
-  onSelect,
-  onNew,
-  onManage,
-}) => {
-  const { t } = useTranslation()
-
-  const [query, setQuery] = useState('')
-  const list = useMemo(() => {
-    if (!query)
-      return notFilteredList
-    return notFilteredList.filter((item) => {
-      return item.name.toLowerCase().includes(query.toLowerCase())
-    })
-  }, [query, notFilteredList])
-  return (
-    <div className="w-[320px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur pt-2 pb-0 shadow-lg backdrop-blur-[5px]">
-      <SearchInput
-        className="mx-2"
-        value={query}
-        onChange={setQuery}
-        placeholder={t(`${i18nPrefix}.search`, { ns: 'dataset' })}
-      />
-      <div className="mt-2">
-        {list.map((item) => {
-          const Icon = getIcon(item.type)
-          return (
-            <div
-              key={item.id}
-              className="mx-1 flex h-6 cursor-pointer items-center justify-between rounded-md px-3 hover:bg-state-base-hover"
-              onClick={() => onSelect({
-                id: item.id,
-                name: item.name,
-                type: item.type,
-              })}
-            >
-              <div className="flex h-full w-0 grow items-center text-text-secondary">
-                <Icon className="mr-[5px] size-3.5 shrink-0" />
-                <div className="w-0 grow truncate system-sm-medium">{item.name}</div>
-              </div>
-              <div className="ml-1 shrink-0 system-xs-regular text-text-tertiary">
-                {item.type}
-              </div>
-            </div>
-          )
-        })}
-      </div>
-      <div className="mt-1 flex justify-between border-t border-divider-subtle p-1">
-        <div className="flex h-6 cursor-pointer items-center space-x-1 rounded-md px-3 text-text-secondary hover:bg-state-base-hover" onClick={onNew}>
-          <RiAddLine className="size-3.5" />
-          <div className="system-sm-medium">{t(`${i18nPrefix}.newAction`, { ns: 'dataset' })}</div>
-        </div>
-        <div className="flex h-6 items-center text-text-secondary">
-          <div className="mr-[3px] h-3 w-px bg-divider-regular"></div>
-          <div className="flex h-full cursor-pointer items-center rounded-md px-1.5 hover:bg-state-base-hover" onClick={onManage}>
-            <div className="mr-1 system-sm-medium">{t(`${i18nPrefix}.manageAction`, { ns: 'dataset' })}</div>
-            <RiArrowRightUpLine className="size-3.5" />
-          </div>
-        </div>
-      </div>
-    </div>
-  )
-}
-export default React.memo(SelectMetadata)
diff --git a/web/app/components/datasets/metadata/metadata-document/__tests__/index.spec.tsx b/web/app/components/datasets/metadata/metadata-document/__tests__/index.spec.tsx
index 71f23324f6..d51ef2be4d 100644
--- a/web/app/components/datasets/metadata/metadata-document/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/metadata/metadata-document/__tests__/index.spec.tsx
@@ -377,7 +377,7 @@ describe('MetadataDocument', () => {
         setTempList,
       })
 
-      const { container } = render(
+      render(
         <MetadataDocument
           datasetId="ds-1"
           documentId="doc-1"
@@ -385,14 +385,12 @@ describe('MetadataDocument', () => {
         />,
       )
 
-      const inputs = container.querySelectorAll('input')
-      if (inputs.length > 0) {
-        fireEvent.change(inputs[0]!, { target: { value: 'new value' } })
+      const valueInput = screen.getByDisplayValue('Value 1')
+      fireEvent.change(valueInput, { target: { value: 'new value' } })
 
-        await waitFor(() => {
-          expect(setTempList).toHaveBeenCalled()
-        })
-      }
+      await waitFor(() => {
+        expect(setTempList).toHaveBeenCalled()
+      })
     })
 
     it('should have handleAddMetaData function available', () => {
@@ -445,7 +443,7 @@ describe('MetadataDocument', () => {
         setTempList,
       })
 
-      const { container } = render(
+      render(
         <MetadataDocument
           datasetId="ds-1"
           documentId="doc-1"
@@ -453,13 +451,11 @@ describe('MetadataDocument', () => {
         />,
       )
 
-      const inputs = container.querySelectorAll('input')
-      if (inputs.length > 0) {
-        fireEvent.change(inputs[0]!, { target: { value: 'updated' } })
-        await waitFor(() => {
-          expect(setTempList).toHaveBeenCalled()
-        })
-      }
+      const valueInput = screen.getByDisplayValue('Value 1')
+      fireEvent.change(valueInput, { target: { value: 'updated' } })
+      await waitFor(() => {
+        expect(setTempList).toHaveBeenCalled()
+      })
     })
 
     it('should pass onDelete callback to InfoGroup', async () => {
diff --git a/web/app/components/datasets/metadata/metadata-document/__tests__/info-group.spec.tsx b/web/app/components/datasets/metadata/metadata-document/__tests__/info-group.spec.tsx
index c4dc89cafc..1086db9fd6 100644
--- a/web/app/components/datasets/metadata/metadata-document/__tests__/info-group.spec.tsx
+++ b/web/app/components/datasets/metadata/metadata-document/__tests__/info-group.spec.tsx
@@ -1,30 +1,32 @@
 import type { MetadataItemWithValue } from '../../types'
 import { fireEvent, render, screen } from '@testing-library/react'
-import { describe, expect, it, vi } from 'vitest'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { DataType } from '../../types'
 import InfoGroup from '../info-group'
 
-type SelectModalProps = {
-  trigger: React.ReactNode
-  onSelect: (item: MetadataItemWithValue) => void
-  onSave: (data: { name: string, type: DataType }) => void
-  onManage: () => void
-}
-
-type FieldProps = {
-  label: string
-  children: React.ReactNode
-}
-
 type InputCombinedProps = {
   value: string | number | null
   onChange: (value: string | number) => void
   type: DataType
 }
 
+const { mockRouterPush } = vi.hoisted(() => ({
+  mockRouterPush: vi.fn(),
+}))
+
 vi.mock('@/next/navigation', () => ({
   useRouter: () => ({
-    push: vi.fn(),
+    push: mockRouterPush,
+  }),
+}))
+
+vi.mock('@/service/knowledge/use-metadata', () => ({
+  useDatasetMetaData: () => ({
+    data: {
+      doc_metadata: [
+        { id: '1', name: 'test', type: DataType.string },
+      ],
+    },
   }),
 }))
 
@@ -39,16 +41,11 @@ vi.mock('@/hooks/use-timestamp', () => ({
   }),
 }))
 
-// Mock AddMetadataButton
-vi.mock('../../add-metadata-button', () => ({
-  default: () => <button data-testid="add-metadata-btn">Add Metadata</button>,
-}))
-
 // Mock InputCombined
 vi.mock('../../edit-metadata-batch/input-combined', () => ({
   default: ({ value, onChange, type }: InputCombinedProps) => (
     <input
-      data-testid="input-combined"
+      aria-label={`Metadata ${type} value`}
       data-type={type}
       value={value || ''}
       onChange={e => onChange(e.target.value)}
@@ -56,28 +53,6 @@ vi.mock('../../edit-metadata-batch/input-combined', () => ({
   ),
 }))
 
-// Mock SelectMetadataModal
-vi.mock('../../metadata-dataset/select-metadata-modal', () => ({
-  default: ({ trigger, onSelect, onSave, onManage }: SelectModalProps) => (
-    <div data-testid="select-metadata-modal">
-      {trigger}
-      <button data-testid="select-action" onClick={() => onSelect({ id: '1', name: 'test', type: DataType.string, value: null })}>Select</button>
-      <button data-testid="save-action" onClick={() => onSave({ name: 'new_field', type: DataType.string })}>Save</button>
-      <button data-testid="manage-action" onClick={onManage}>Manage</button>
-    </div>
-  ),
-}))
-
-// Mock Field
-vi.mock('../field', () => ({
-  default: ({ label, children }: FieldProps) => (
-    <div data-testid="field">
-      <span data-testid="field-label">{label}</span>
-      <div data-testid="field-content">{children}</div>
-    </div>
-  ),
-}))
-
 describe('InfoGroup', () => {
   const mockList: MetadataItemWithValue[] = [
     { id: '1', name: 'field_one', type: DataType.string, value: 'Value 1' },
@@ -85,6 +60,10 @@ describe('InfoGroup', () => {
     { id: '3', name: 'built-in', type: DataType.time, value: 1609459200 },
   ]
 
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
   describe('Rendering', () => {
     it('should render without crashing', () => {
       const { container } = render(
@@ -111,8 +90,9 @@ describe('InfoGroup', () => {
       render(
         <InfoGroup dataSetId="ds-1" list={mockList} />,
       )
-      const fields = screen.getAllByTestId('field')
-      expect(fields).toHaveLength(3)
+      expect(screen.getByText('field_one'))!.toBeInTheDocument()
+      expect(screen.getByText('field_two'))!.toBeInTheDocument()
+      expect(screen.getByText('built-in'))!.toBeInTheDocument()
     })
 
     it('should render tooltip when titleTooltip is provided', () => {
@@ -133,42 +113,41 @@ describe('InfoGroup', () => {
           dataSetId="ds-1"
           list={mockList}
           title="Test"
-          headerRight={<button data-testid="header-right-btn">Action</button>}
+          headerRight={<button>Action</button>}
         />,
       )
-      expect(screen.getByTestId('header-right-btn'))!.toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'Action' }))!.toBeInTheDocument()
     })
   })
 
   describe('Edit Mode', () => {
-    it('should render add metadata button when isEdit is true', () => {
+    it('should render dataset metadata picker when isEdit is true', () => {
       render(
         <InfoGroup dataSetId="ds-1" list={mockList} isEdit />,
       )
-      expect(screen.getByTestId('add-metadata-btn'))!.toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'dataset.metadata.addMetadata' }))!.toBeInTheDocument()
     })
 
-    it('should not render add metadata button when isEdit is false', () => {
+    it('should not render dataset metadata picker when isEdit is false', () => {
       render(
         <InfoGroup dataSetId="ds-1" list={mockList} isEdit={false} />,
       )
-      expect(screen.queryByTestId('add-metadata-btn')).not.toBeInTheDocument()
+      expect(screen.queryByRole('button', { name: 'dataset.metadata.addMetadata' })).not.toBeInTheDocument()
     })
 
     it('should render input combined for each item in edit mode', () => {
       render(
         <InfoGroup dataSetId="ds-1" list={mockList} isEdit />,
       )
-      const inputs = screen.getAllByTestId('input-combined')
+      const inputs = screen.getAllByRole('textbox')
       expect(inputs).toHaveLength(3)
     })
 
     it('should render delete icons in edit mode', () => {
-      const { container } = render(
+      render(
         <InfoGroup dataSetId="ds-1" list={mockList} isEdit />,
       )
-      const deleteIcons = container.querySelectorAll('.cursor-pointer svg')
-      expect(deleteIcons.length).toBeGreaterThan(0)
+      expect(screen.getAllByRole('button', { name: 'common.operation.remove' })).toHaveLength(3)
     })
   })
 
@@ -179,7 +158,7 @@ describe('InfoGroup', () => {
         <InfoGroup dataSetId="ds-1" list={mockList} isEdit onChange={handleChange} />,
       )
 
-      const inputs = screen.getAllByTestId('input-combined')
+      const inputs = screen.getAllByRole('textbox')
       fireEvent.change(inputs[0]!, { target: { value: 'New Value' } })
 
       expect(handleChange).toHaveBeenCalled()
@@ -187,41 +166,43 @@ describe('InfoGroup', () => {
 
     it('should call onDelete when delete icon is clicked', () => {
       const handleDelete = vi.fn()
-      const { container } = render(
+      render(
         <InfoGroup dataSetId="ds-1" list={mockList} isEdit onDelete={handleDelete} />,
       )
 
-      // Find delete icons (RiDeleteBinLine SVGs inside cursor-pointer divs)
-      const deleteButtons = container.querySelectorAll('svg.size-4')
-      if (deleteButtons.length > 0)
-        fireEvent.click(deleteButtons[0]!)
+      fireEvent.click(screen.getAllByRole('button', { name: 'common.operation.remove' })[0]!)
 
       expect(handleDelete).toHaveBeenCalled()
     })
 
-    it('should call onSelect when metadata is selected', () => {
+    it('should call onSelect when metadata is selected', async () => {
       const handleSelect = vi.fn()
       render(
         <InfoGroup dataSetId="ds-1" list={mockList} isEdit onSelect={handleSelect} />,
       )
 
-      fireEvent.click(screen.getByTestId('select-action'))
+      fireEvent.click(screen.getByRole('button', { name: 'dataset.metadata.addMetadata' }))
+      fireEvent.click(await screen.findByRole('option', { name: /test/ }))
 
       expect(handleSelect).toHaveBeenCalledWith({
         id: '1',
         name: 'test',
         type: DataType.string,
-        value: null,
       })
     })
 
-    it('should call onAdd when new metadata is saved', () => {
+    it('should call onAdd when new metadata is saved', async () => {
       const handleAdd = vi.fn()
       render(
         <InfoGroup dataSetId="ds-1" list={mockList} isEdit onAdd={handleAdd} />,
       )
 
-      fireEvent.click(screen.getByTestId('save-action'))
+      fireEvent.click(screen.getByRole('button', { name: 'dataset.metadata.addMetadata' }))
+      fireEvent.click(await screen.findByRole('button', { name: 'dataset.metadata.selectMetadata.newAction' }))
+      fireEvent.change(screen.getByRole('textbox', { name: 'dataset.metadata.createMetadata.name' }), {
+        target: { value: 'new_field' },
+      })
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.save' }))
 
       expect(handleAdd).toHaveBeenCalledWith({
         name: 'new_field',
@@ -229,16 +210,15 @@ describe('InfoGroup', () => {
       })
     })
 
-    it('should navigate to documents page when manage is clicked', () => {
+    it('should navigate to documents page when manage is clicked', async () => {
       render(
         <InfoGroup dataSetId="ds-1" list={mockList} isEdit />,
       )
 
-      fireEvent.click(screen.getByTestId('manage-action'))
+      fireEvent.click(screen.getByRole('button', { name: 'dataset.metadata.addMetadata' }))
+      fireEvent.click(await screen.findByRole('button', { name: 'dataset.metadata.selectMetadata.manageAction' }))
 
-      // The onManage callback triggers the navigation
-      // The onManage callback triggers the navigation
-      expect(screen.getByTestId('manage-action'))!.toBeInTheDocument()
+      expect(mockRouterPush).toHaveBeenCalledWith('/datasets/ds-1/documents')
     })
   })
 
@@ -305,7 +285,7 @@ describe('InfoGroup', () => {
       )
       // The mock formatTime returns formatted date
       // The mock formatTime returns formatted date
-      expect(screen.getByTestId('field-content'))!.toBeInTheDocument()
+      expect(screen.getByText('field'))!.toBeInTheDocument()
     })
   })
 
@@ -324,7 +304,7 @@ describe('InfoGroup', () => {
       render(
         <InfoGroup dataSetId="ds-1" list={nullList} />,
       )
-      expect(screen.getByTestId('field'))!.toBeInTheDocument()
+      expect(screen.getByText('field'))!.toBeInTheDocument()
     })
 
     it('should handle items with built-in id', () => {
@@ -334,7 +314,7 @@ describe('InfoGroup', () => {
       render(
         <InfoGroup dataSetId="ds-1" list={builtInList} />,
       )
-      expect(screen.getByTestId('field'))!.toBeInTheDocument()
+      expect(screen.getByText('field'))!.toBeInTheDocument()
     })
   })
 })
diff --git a/web/app/components/datasets/metadata/metadata-document/info-group.tsx b/web/app/components/datasets/metadata/metadata-document/info-group.tsx
index 16f5e573fb..3c4c8729f1 100644
--- a/web/app/components/datasets/metadata/metadata-document/info-group.tsx
+++ b/web/app/components/datasets/metadata/metadata-document/info-group.tsx
@@ -1,6 +1,6 @@
 'use client'
 import type { FC } from 'react'
-import type { MetadataItemWithValue } from '../types'
+import type { BuiltInMetadataItem, MetadataItemWithValue } from '../types'
 import { cn } from '@langgenius/dify-ui/cn'
 import { RiDeleteBinLine } from '@remixicon/react'
 import * as React from 'react'
@@ -9,9 +9,8 @@ import Divider from '@/app/components/base/divider'
 import { Infotip } from '@/app/components/base/infotip'
 import useTimestamp from '@/hooks/use-timestamp'
 import { useRouter } from '@/next/navigation'
-import AddMetadataButton from '../add-metadata-button'
 import InputCombined from '../edit-metadata-batch/input-combined'
-import SelectMetadataModal from '../metadata-dataset/select-metadata-modal'
+import { DatasetMetadataPicker } from '../metadata-dataset/dataset-metadata-picker'
 import { DataType, isShowManageMetadataLocalStorageKey } from '../types'
 import Field from './field'
 
@@ -29,7 +28,7 @@ type Props = {
   onChange?: (item: MetadataItemWithValue) => void
   onDelete?: (item: MetadataItemWithValue) => void
   onSelect?: (item: MetadataItemWithValue) => void
-  onAdd?: (item: MetadataItemWithValue) => void
+  onAdd?: (item: BuiltInMetadataItem) => void
 }
 
 const InfoGroup: FC<Props> = ({
@@ -76,14 +75,11 @@ const InfoGroup: FC<Props> = ({
       <div className={cn('mt-3 space-y-1', contentClassName)}>
         {isEdit && (
           <div>
-            <SelectMetadataModal
+            <DatasetMetadataPicker
               datasetId={dataSetId}
-              trigger={
-                <AddMetadataButton />
-              }
-              onSelect={data => onSelect?.(data as MetadataItemWithValue)}
-              onSave={data => onAdd?.(data)}
-              onManage={handleMangeMetadata}
+              onSelectMetadata={data => onSelect?.(data as MetadataItemWithValue)}
+              onCreateMetadata={data => onAdd?.(data)}
+              onOpenMetadataManagement={handleMangeMetadata}
             />
             {list.length > 0 && <Divider className="my-3" bgStyle="gradient" />}
           </div>
@@ -99,9 +95,14 @@ const InfoGroup: FC<Props> = ({
                       value={item.value}
                       onChange={value => onChange?.({ ...item, value })}
                     />
-                    <div className="shrink-0 cursor-pointer rounded-md p-1 text-text-tertiary hover:bg-state-destructive-hover hover:text-text-destructive">
-                      <RiDeleteBinLine className="size-4" onClick={() => onDelete?.(item)} />
-                    </div>
+                    <button
+                      type="button"
+                      aria-label={t('operation.remove', { ns: 'common' })}
+                      className="shrink-0 cursor-pointer rounded-md border-none bg-transparent p-1 text-text-tertiary hover:bg-state-destructive-hover hover:text-text-destructive focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+                      onClick={() => onDelete?.(item)}
+                    >
+                      <RiDeleteBinLine className="size-4" aria-hidden="true" />
+                    </button>
                   </div>
                 )
               : (<div className="py-1 system-xs-regular text-text-secondary">{(item.value && item.type === DataType.time) ? formatTimestamp((item.value as number), t('metadata.dateTimeFormat', { ns: 'datasetDocuments' })) : item.value}</div>)}
diff --git a/web/app/components/datasets/metadata/utils/__tests__/get-icon.spec.ts b/web/app/components/datasets/metadata/utils/__tests__/get-icon.spec.ts
index 07eef6c320..737401cfcb 100644
--- a/web/app/components/datasets/metadata/utils/__tests__/get-icon.spec.ts
+++ b/web/app/components/datasets/metadata/utils/__tests__/get-icon.spec.ts
@@ -1,45 +1,44 @@
-import { RiHashtag, RiTextSnippet, RiTimeLine } from '@remixicon/react'
 import { describe, expect, it } from 'vitest'
 import { DataType } from '../../types'
-import { getIcon } from '../get-icon'
+import { getIconClassName } from '../get-icon'
 
-describe('getIcon', () => {
+describe('getIconClassName', () => {
   describe('Rendering', () => {
-    it('should return RiTextSnippet for DataType.string', () => {
-      const result = getIcon(DataType.string)
-      expect(result).toBe(RiTextSnippet)
+    it('should return text snippet icon class for DataType.string', () => {
+      const result = getIconClassName(DataType.string)
+      expect(result).toBe('i-ri-text-snippet')
     })
 
-    it('should return RiHashtag for DataType.number', () => {
-      const result = getIcon(DataType.number)
-      expect(result).toBe(RiHashtag)
+    it('should return hashtag icon class for DataType.number', () => {
+      const result = getIconClassName(DataType.number)
+      expect(result).toBe('i-ri-hashtag')
     })
 
-    it('should return RiTimeLine for DataType.time', () => {
-      const result = getIcon(DataType.time)
-      expect(result).toBe(RiTimeLine)
+    it('should return time line icon class for DataType.time', () => {
+      const result = getIconClassName(DataType.time)
+      expect(result).toBe('i-ri-time-line')
     })
   })
 
   describe('Edge Cases', () => {
-    it('should return RiTextSnippet as fallback for unknown type', () => {
-      const result = getIcon('unknown' as DataType)
-      expect(result).toBe(RiTextSnippet)
+    it('should return text snippet class as fallback for unknown type', () => {
+      const result = getIconClassName('unknown' as DataType)
+      expect(result).toBe('i-ri-text-snippet')
     })
 
-    it('should return RiTextSnippet for undefined type', () => {
-      const result = getIcon(undefined as unknown as DataType)
-      expect(result).toBe(RiTextSnippet)
+    it('should return text snippet class for undefined type', () => {
+      const result = getIconClassName(undefined as unknown as DataType)
+      expect(result).toBe('i-ri-text-snippet')
     })
 
-    it('should return RiTextSnippet for null type', () => {
-      const result = getIcon(null as unknown as DataType)
-      expect(result).toBe(RiTextSnippet)
+    it('should return text snippet class for null type', () => {
+      const result = getIconClassName(null as unknown as DataType)
+      expect(result).toBe('i-ri-text-snippet')
     })
 
-    it('should return RiTextSnippet for empty string type', () => {
-      const result = getIcon('' as DataType)
-      expect(result).toBe(RiTextSnippet)
+    it('should return text snippet class for empty string type', () => {
+      const result = getIconClassName('' as DataType)
+      expect(result).toBe('i-ri-text-snippet')
     })
   })
 })
diff --git a/web/app/components/datasets/metadata/utils/get-icon.ts b/web/app/components/datasets/metadata/utils/get-icon.ts
index 2d446e5eed..6c39b7ec9c 100644
--- a/web/app/components/datasets/metadata/utils/get-icon.ts
+++ b/web/app/components/datasets/metadata/utils/get-icon.ts
@@ -1,10 +1,11 @@
-import { RiHashtag, RiTextSnippet, RiTimeLine } from '@remixicon/react'
 import { DataType } from '../types'
 
-export const getIcon = (type: DataType) => {
-  return ({
-    [DataType.string]: RiTextSnippet,
-    [DataType.number]: RiHashtag,
-    [DataType.time]: RiTimeLine,
-  }[type] || RiTextSnippet)
+const metadataTypeIconClassMap: Record<DataType, string> = {
+  [DataType.string]: 'i-ri-text-snippet',
+  [DataType.number]: 'i-ri-hashtag',
+  [DataType.time]: 'i-ri-time-line',
+}
+
+export function getIconClassName(type: DataType) {
+  return metadataTypeIconClassMap[type] ?? metadataTypeIconClassMap[DataType.string]
 }
diff --git a/web/app/components/datasets/rename-modal/__tests__/index.spec.tsx b/web/app/components/datasets/rename-modal/__tests__/index.spec.tsx
index 4f8a421a52..ac4075fa5b 100644
--- a/web/app/components/datasets/rename-modal/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/rename-modal/__tests__/index.spec.tsx
@@ -167,11 +167,7 @@ describe('RenameDatasetModal', () => {
 
     it('should render close icon button', () => {
       render(<RenameDatasetModal {...defaultProps} />)
-      // The modal renders with title and other elements
-      // The close functionality is tested in user interactions
-      // The modal renders with title and other elements
-      // The close functionality is tested in user interactions
-      expect(screen.getByText('datasetSettings.title'))!.toBeInTheDocument()
+      expect(screen.getByRole('button', { name: /operation\.close$/ }))!.toBeInTheDocument()
     })
 
     it('should render form labels', () => {
@@ -296,14 +292,10 @@ describe('RenameDatasetModal', () => {
     })
 
     it('should call onClose when close icon is clicked', () => {
-      // This test is covered by the cancel button test
-      // The close icon functionality works the same way as cancel button
       const handleClose = vi.fn()
       render(<RenameDatasetModal {...defaultProps} onClose={handleClose} />)
 
-      // Use the cancel button to verify close callback works
-      const cancelButton = screen.getByText('common.operation.cancel')
-      fireEvent.click(cancelButton)
+      fireEvent.click(screen.getByRole('button', { name: /operation\.close$/ }))
 
       expect(handleClose).toHaveBeenCalledTimes(1)
     })
diff --git a/web/app/components/datasets/rename-modal/index.tsx b/web/app/components/datasets/rename-modal/index.tsx
index a62c1c93be..d2750ae21b 100644
--- a/web/app/components/datasets/rename-modal/index.tsx
+++ b/web/app/components/datasets/rename-modal/index.tsx
@@ -4,13 +4,12 @@ import type { AppIconSelection } from '../../base/app-icon-picker'
 import type { DataSet } from '@/models/datasets'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
 import { RiCloseLine } from '@remixicon/react'
-import { noop } from 'es-toolkit/function'
 import { useCallback, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Input from '@/app/components/base/input'
-import Modal from '@/app/components/base/modal'
 import Textarea from '@/app/components/base/textarea'
 import { updateDatasetSetting } from '@/service/datasets'
 import AppIcon from '../../base/app-icon'
@@ -89,38 +88,46 @@ const RenameDatasetModal = ({ show, dataset, onSuccess, onClose }: RenameDataset
     }
   }, [appIcon, description, dataset.id, externalKnowledgeApiId, externalKnowledgeId, name, onClose, onSuccess, t])
   return (
-    <Modal className="w-[520px] max-w-[520px] rounded-xl px-8 py-6" isShow={show} onClose={noop}>
-      <div className="flex items-center justify-between pb-2">
-        <div className="text-xl leading-[30px] font-medium text-text-primary">{t('title', { ns: 'datasetSettings' })}</div>
-        <div className="cursor-pointer p-2" onClick={onClose}>
-          <RiCloseLine className="h-4 w-4 text-text-tertiary" />
+    <Dialog open={show}>
+      <DialogContent className="w-full max-w-[520px] overflow-hidden! rounded-xl border-none px-8 py-6 text-left align-middle">
+
+        <div className="flex items-center justify-between pb-2">
+          <div className="text-xl leading-[30px] font-medium text-text-primary">{t('title', { ns: 'datasetSettings' })}</div>
+          <button
+            type="button"
+            className="cursor-pointer border-none bg-transparent p-2 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+            aria-label={t('operation.close', { ns: 'common' })}
+            onClick={onClose}
+          >
+            <RiCloseLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
+          </button>
         </div>
-      </div>
-      <div>
-        <div className={cn('flex flex-col py-4')}>
-          <div className="shrink-0 py-2 text-sm leading-[20px] font-medium text-text-primary">
-            {t('form.name', { ns: 'datasetSettings' })}
+        <div>
+          <div className={cn('flex flex-col py-4')}>
+            <div className="shrink-0 py-2 text-sm leading-[20px] font-medium text-text-primary">
+              {t('form.name', { ns: 'datasetSettings' })}
+            </div>
+            <div className="flex items-center gap-x-2">
+              <AppIcon size="medium" onClick={handleOpenAppIconPicker} className="cursor-pointer" iconType={appIcon.type} icon={appIcon.type === 'image' ? appIcon.fileId : appIcon.icon} background={appIcon.type === 'image' ? undefined : appIcon.background} imageUrl={appIcon.type === 'image' ? appIcon.url : undefined} showEditIcon />
+              <Input value={name} onChange={e => setName(e.target.value)} className="h-9 grow" placeholder={t('form.namePlaceholder', { ns: 'datasetSettings' }) || ''} />
+            </div>
           </div>
-          <div className="flex items-center gap-x-2">
-            <AppIcon size="medium" onClick={handleOpenAppIconPicker} className="cursor-pointer" iconType={appIcon.type} icon={appIcon.type === 'image' ? appIcon.fileId : appIcon.icon} background={appIcon.type === 'image' ? undefined : appIcon.background} imageUrl={appIcon.type === 'image' ? appIcon.url : undefined} showEditIcon />
-            <Input value={name} onChange={e => setName(e.target.value)} className="h-9 grow" placeholder={t('form.namePlaceholder', { ns: 'datasetSettings' }) || ''} />
+          <div className={cn('flex flex-col py-4')}>
+            <div className="shrink-0 py-2 text-sm leading-[20px] font-medium text-text-primary">
+              {t('form.desc', { ns: 'datasetSettings' })}
+            </div>
+            <div className="w-full">
+              <Textarea value={description} onChange={e => setDescription(e.target.value)} className="resize-none" placeholder={t('form.descPlaceholder', { ns: 'datasetSettings' }) || ''} />
+            </div>
           </div>
         </div>
-        <div className={cn('flex flex-col py-4')}>
-          <div className="shrink-0 py-2 text-sm leading-[20px] font-medium text-text-primary">
-            {t('form.desc', { ns: 'datasetSettings' })}
-          </div>
-          <div className="w-full">
-            <Textarea value={description} onChange={e => setDescription(e.target.value)} className="resize-none" placeholder={t('form.descPlaceholder', { ns: 'datasetSettings' }) || ''} />
-          </div>
+        <div className="flex justify-end pt-6">
+          <Button className="mr-2" onClick={onClose}>{t('operation.cancel', { ns: 'common' })}</Button>
+          <Button disabled={loading} variant="primary" onClick={onConfirm}>{t('operation.save', { ns: 'common' })}</Button>
         </div>
-      </div>
-      <div className="flex justify-end pt-6">
-        <Button className="mr-2" onClick={onClose}>{t('operation.cancel', { ns: 'common' })}</Button>
-        <Button disabled={loading} variant="primary" onClick={onConfirm}>{t('operation.save', { ns: 'common' })}</Button>
-      </div>
-      {showAppIconPicker && (<AppIconPicker onSelect={handleSelectAppIcon} onClose={handleCloseAppIconPicker} />)}
-    </Modal>
+        {showAppIconPicker && (<AppIconPicker onSelect={handleSelectAppIcon} onClose={handleCloseAppIconPicker} />)}
+      </DialogContent>
+    </Dialog>
   )
 }
 export default RenameDatasetModal
diff --git a/web/app/components/datasets/settings/index-method/__tests__/index.spec.tsx b/web/app/components/datasets/settings/index-method/__tests__/index.spec.tsx
index 5e81611fc4..eb55acfb38 100644
--- a/web/app/components/datasets/settings/index-method/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/settings/index-method/__tests__/index.spec.tsx
@@ -14,7 +14,9 @@ describe('IndexMethod', () => {
     vi.clearAllMocks()
   })
 
-  const getKeywordSlider = () => screen.getByLabelText('datasetSettings.form.numberOfKeywords')
+  const getKeywordSlider = () => screen.getByLabelText('datasetSettings.form.numberOfKeywords', {
+    selector: 'input[type="range"]',
+  })
 
   describe('Rendering', () => {
     it('should render without crashing', () => {
@@ -134,6 +136,16 @@ describe('IndexMethod', () => {
       expect(input)!.toHaveValue('25')
     })
 
+    it('should keep keyword number input visible next to steppers', () => {
+      render(<IndexMethod {...defaultProps} value={IndexingType.ECONOMICAL} keywordNumber={25} />)
+
+      const input = screen.getByRole('textbox')
+
+      expect(input)!.toHaveClass('w-12')
+      expect(input)!.toHaveClass('flex-none')
+      expect(input)!.toHaveClass('text-center')
+    })
+
     it('should call onKeywordNumberChange when KeywordNumber changes', () => {
       const handleKeywordChange = vi.fn()
       render(<IndexMethod {...defaultProps} onKeywordNumberChange={handleKeywordChange} />)
@@ -147,7 +159,7 @@ describe('IndexMethod', () => {
 
   describe('Tooltip', () => {
     it('should show tooltip when hovering over disabled Economy option', () => {
-      // The tooltip is shown via PortalToFollowElem when hovering
+      // The tooltip is shown via Popover when hovering
       // This is controlled by useHover hook
       render(<IndexMethod {...defaultProps} currentValue={IndexingType.QUALIFIED} />)
       // The tooltip content should exist in DOM but may not be visible
diff --git a/web/app/components/datasets/settings/index-method/__tests__/keyword-number.spec.tsx b/web/app/components/datasets/settings/index-method/__tests__/keyword-number.spec.tsx
index cd0d56bbeb..92516f00a4 100644
--- a/web/app/components/datasets/settings/index-method/__tests__/keyword-number.spec.tsx
+++ b/web/app/components/datasets/settings/index-method/__tests__/keyword-number.spec.tsx
@@ -11,7 +11,9 @@ describe('KeyWordNumber', () => {
     vi.clearAllMocks()
   })
 
-  const getSlider = () => screen.getByLabelText('datasetSettings.form.numberOfKeywords')
+  const getSlider = () => screen.getByLabelText('datasetSettings.form.numberOfKeywords', {
+    selector: 'input[type="range"]',
+  })
 
   describe('Rendering', () => {
     it('should render without crashing', () => {
@@ -24,9 +26,10 @@ describe('KeyWordNumber', () => {
       expect(screen.getByText(/form\.numberOfKeywords/)).toBeInTheDocument()
     })
 
-    it('should render tooltip with question icon', () => {
+    it('should render infotip with question icon', () => {
       render(<KeyWordNumber {...defaultProps} />)
-      const container = screen.getByText(/form\.numberOfKeywords/).closest('div')?.parentElement
+      const trigger = screen.getByRole('button', { name: 'datasetSettings.form.numberOfKeywords' })
+      const container = trigger.parentElement
       const questionIcon = container?.querySelector('.i-ri-question-line')
       expect(questionIcon).toBeInTheDocument()
     })
diff --git a/web/app/components/datasets/settings/index-method/index.tsx b/web/app/components/datasets/settings/index-method/index.tsx
index 7e925b869c..9e9b0e1759 100644
--- a/web/app/components/datasets/settings/index-method/index.tsx
+++ b/web/app/components/datasets/settings/index-method/index.tsx
@@ -1,14 +1,12 @@
 'use client'
 import { cn } from '@langgenius/dify-ui/cn'
-import { useHover } from 'ahooks'
-import { useRef } from 'react'
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from '@langgenius/dify-ui/popover'
 import { useTranslation } from 'react-i18next'
 import { Economic, HighQuality } from '@/app/components/base/icons/src/vender/knowledge'
-import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
 import { IndexingType } from '../../create/step-two'
 import { EffectColor } from '../chunk-structure/types'
 import OptionCard from '../option-card'
@@ -32,8 +30,6 @@ const IndexMethod = ({
   onKeywordNumberChange,
 }: IndexMethodProps) => {
   const { t } = useTranslation()
-  const economyDomRef = useRef<HTMLDivElement>(null)
-  const isHoveringEconomy = useHover(economyDomRef)
   const isEconomyDisabled = currentValue === IndexingType.QUALIFIED
 
   return (
@@ -54,14 +50,13 @@ const IndexMethod = ({
         className="gap-x-2"
       />
       {/* Economy */}
-      <PortalToFollowElem
-        open={isHoveringEconomy}
-        offset={4}
-        placement="right"
-      >
-        <PortalToFollowElemTrigger>
+      <Popover>
+        <PopoverTrigger
+          nativeButton={false}
+          openOnHover={isEconomyDisabled}
+          render={<div />}
+        >
           <OptionCard
-            ref={economyDomRef}
             id={IndexingType.ECONOMICAL}
             isActive={value === IndexingType.ECONOMICAL}
             onClick={onChange}
@@ -80,13 +75,17 @@ const IndexMethod = ({
               onKeywordNumberChange={onKeywordNumberChange}
             />
           </OptionCard>
-        </PortalToFollowElemTrigger>
-        <PortalToFollowElemContent style={{ zIndex: 60 }}>
-          <div className="rounded-lg border-components-panel-border bg-components-tooltip-bg p-3 text-xs font-medium text-text-secondary shadow-lg">
+        </PopoverTrigger>
+        {isEconomyDisabled && (
+          <PopoverContent
+            placement="right"
+            sideOffset={4}
+            popupClassName="rounded-lg border-0 bg-components-tooltip-bg p-3 text-xs font-medium text-text-secondary shadow-lg"
+          >
             {t('form.indexMethodChangeToEconomyDisabledTip', { ns: 'datasetSettings' })}
-          </div>
-        </PortalToFollowElemContent>
-      </PortalToFollowElem>
+          </PopoverContent>
+        )}
+      </Popover>
     </div>
   )
 }
diff --git a/web/app/components/datasets/settings/index-method/keyword-number.tsx b/web/app/components/datasets/settings/index-method/keyword-number.tsx
index 3cbc18393f..b6a90155f0 100644
--- a/web/app/components/datasets/settings/index-method/keyword-number.tsx
+++ b/web/app/components/datasets/settings/index-method/keyword-number.tsx
@@ -7,10 +7,10 @@ import {
   NumberFieldInput,
 } from '@langgenius/dify-ui/number-field'
 import { Slider } from '@langgenius/dify-ui/slider'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import * as React from 'react'
 import { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
+import { Infotip } from '@/app/components/base/infotip'
 
 const MIN_KEYWORD_NUMBER = 0
 const MAX_KEYWORD_NUMBER = 50
@@ -36,16 +36,12 @@ const KeyWordNumber = ({
         <div className="truncate system-xs-medium text-text-secondary">
           {t('form.numberOfKeywords', { ns: 'datasetSettings' })}
         </div>
-        <Tooltip>
-          <TooltipTrigger
-            render={(
-              <span className="i-ri-question-line h-3.5 w-3.5 text-text-quaternary" />
-            )}
-          />
-          <TooltipContent>
-            {t('form.numberOfKeywords', { ns: 'datasetSettings' })}
-          </TooltipContent>
-        </Tooltip>
+        <Infotip
+          aria-label={t('form.numberOfKeywords', { ns: 'datasetSettings' })}
+          className="h-3.5 w-3.5"
+        >
+          {t('form.numberOfKeywords', { ns: 'datasetSettings' })}
+        </Infotip>
       </div>
       <Slider
         className="mr-3 w-[206px] shrink-0"
@@ -56,14 +52,14 @@ const KeyWordNumber = ({
         aria-label={t('form.numberOfKeywords', { ns: 'datasetSettings' })}
       />
       <NumberField
-        className="w-12 shrink-0"
+        className="w-[74px] shrink-0"
         min={MIN_KEYWORD_NUMBER}
         max={MAX_KEYWORD_NUMBER}
         value={keywordNumber}
         onValueChange={handleInputChange}
       >
         <NumberFieldGroup>
-          <NumberFieldInput />
+          <NumberFieldInput className="w-12 flex-none px-2 text-center" />
           <NumberFieldControls>
             <NumberFieldIncrement />
             <NumberFieldDecrement />
diff --git a/web/app/components/datasets/settings/permission-selector/__tests__/index.spec.tsx b/web/app/components/datasets/settings/permission-selector/__tests__/index.spec.tsx
index 355946402b..84d5ae6455 100644
--- a/web/app/components/datasets/settings/permission-selector/__tests__/index.spec.tsx
+++ b/web/app/components/datasets/settings/permission-selector/__tests__/index.spec.tsx
@@ -287,7 +287,7 @@ describe('PermissionSelector', () => {
       fireEvent.change(searchInput, { target: { value: 'test' } })
       expect(searchInput)!.toHaveValue('test')
 
-      const clearButton = screen.getByTestId('input-clear')
+      const clearButton = screen.getByRole('button', { name: 'common.operation.clear' })
       fireEvent.click(clearButton)
 
       // After clicking clear, input should be empty
diff --git a/web/app/components/develop/__tests__/ApiServer.spec.tsx b/web/app/components/develop/__tests__/ApiServer.spec.tsx
index 1364513ce8..a805a3d2e0 100644
--- a/web/app/components/develop/__tests__/ApiServer.spec.tsx
+++ b/web/app/components/develop/__tests__/ApiServer.spec.tsx
@@ -5,7 +5,13 @@ import ApiServer from '../ApiServer'
 
 vi.mock('@/app/components/develop/secret-key/secret-key-modal', () => ({
   default: ({ isShow, onClose }: { isShow: boolean, onClose: () => void }) => (
-    isShow ? <div data-testid="secret-key-modal"><button onClick={onClose}>Close Modal</button></div> : null
+    isShow
+      ? (
+          <div role="dialog" aria-label="Secret key">
+            <button type="button" onClick={onClose}>Close Modal</button>
+          </div>
+        )
+      : null
   ),
 }))
 
@@ -81,7 +87,7 @@ describe('ApiServer', () => {
         await user.click(apiKeyButton)
       })
 
-      expect(screen.getByTestId('secret-key-modal')).toBeInTheDocument()
+      expect(screen.getByRole('dialog', { name: 'Secret key' })).toBeInTheDocument()
     })
 
     it('should close modal when close button is clicked', async () => {
@@ -93,14 +99,14 @@ describe('ApiServer', () => {
         await user.click(apiKeyButton)
       })
 
-      expect(screen.getByTestId('secret-key-modal')).toBeInTheDocument()
+      expect(screen.getByRole('dialog', { name: 'Secret key' })).toBeInTheDocument()
 
-      const closeButton = screen.getByText('Close Modal')
+      const closeButton = screen.getByRole('button', { name: 'Close Modal' })
       await act(async () => {
         await user.click(closeButton)
       })
 
-      expect(screen.queryByTestId('secret-key-modal')).not.toBeInTheDocument()
+      expect(screen.queryByRole('dialog', { name: 'Secret key' })).not.toBeInTheDocument()
     })
   })
 
diff --git a/web/app/components/develop/__tests__/code.spec.tsx b/web/app/components/develop/__tests__/code.spec.tsx
index e5eaebb600..34a1f22380 100644
--- a/web/app/components/develop/__tests__/code.spec.tsx
+++ b/web/app/components/develop/__tests__/code.spec.tsx
@@ -139,6 +139,7 @@ describe('code.tsx components', () => {
         await waitFor(() => {
           expect(screen.getByText('second content')).toBeInTheDocument()
         })
+        expect(tab2).toHaveAttribute('aria-selected', 'true')
       })
 
       it('should use "Code" as default title when title not provided', () => {
@@ -329,7 +330,8 @@ describe('code.tsx components', () => {
           <pre><code>fallback</code></pre>
         </CodeGroup>,
       )
-      expect(screen.getByRole('tablist')).toBeInTheDocument()
+      expect(screen.getByRole('tablist')).toHaveClass('-mb-px', 'gap-4', 'bg-transparent')
+      expect(screen.getByRole('tab', { name: 'cURL' })).toHaveClass('data-active:text-emerald-400')
     })
   })
 
diff --git a/web/app/components/develop/code.tsx b/web/app/components/develop/code.tsx
index 86d57c806d..2ecd13f4ab 100644
--- a/web/app/components/develop/code.tsx
+++ b/web/app/components/develop/code.tsx
@@ -1,7 +1,12 @@
 'use client'
 import type { PropsWithChildren, ReactElement, ReactNode } from 'react'
-import { Tab, TabGroup, TabList, TabPanel, TabPanels } from '@headlessui/react'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  Tabs,
+  TabsList,
+  TabsPanel,
+  TabsTab,
+} from '@langgenius/dify-ui/tabs'
 import {
   Children,
   createContext,
@@ -103,6 +108,11 @@ type CodeExample = {
   code: string
 }
 
+type CodeTab = {
+  title: string
+  value: string
+}
+
 type ICodePanelProps = {
   children?: React.ReactNode
   tag?: string
@@ -142,12 +152,11 @@ function CodePanel({ tag, label, children, targetCode }: ICodePanelProps) {
 
 type CodeGroupHeaderProps = {
   title?: string
-  tabTitles?: string[]
-  selectedIndex?: number
+  tabs?: CodeTab[]
 }
 
-function CodeGroupHeader({ title, tabTitles, selectedIndex }: CodeGroupHeaderProps) {
-  const hasTabs = (tabTitles?.length ?? 0) > 1
+function CodeGroupHeader({ title, tabs }: CodeGroupHeaderProps) {
+  const hasTabs = (tabs?.length ?? 0) > 1
 
   return (
     <div className="flex min-h-[calc(--spacing(12)+1px)] flex-wrap items-start gap-x-4 border-b border-zinc-700 bg-zinc-800 px-4 dark:border-zinc-800 dark:bg-transparent">
@@ -157,18 +166,19 @@ function CodeGroupHeader({ title, tabTitles, selectedIndex }: CodeGroupHeaderPro
         </h3>
       )}
       {hasTabs && (
-        <TabList className="-mb-px flex gap-4 text-xs font-medium">
-          {tabTitles!.map((tabTitle, tabIndex) => (
-            <Tab
-              key={tabIndex}
-              className={cn('border-b py-3 transition focus:not-focus-visible:outline-hidden', tabIndex === selectedIndex
-                ? 'border-emerald-500 text-emerald-400'
-                : 'border-transparent text-zinc-400 hover:text-zinc-300')}
+        <TabsList
+          className="-mb-px flex gap-4 rounded-none bg-transparent p-0 text-xs font-medium"
+        >
+          {tabs!.map(tab => (
+            <TabsTab
+              key={tab.value}
+              value={tab.value}
+              className="h-auto rounded-none border-0 border-b border-transparent bg-transparent px-0 py-3 text-xs font-medium text-zinc-400 shadow-none transition hover:bg-transparent hover:text-zinc-300 focus:not-focus-visible:outline-hidden focus-visible:ring-0 data-active:border-emerald-500 data-active:bg-transparent data-active:text-emerald-400 data-active:shadow-none"
             >
-              {tabTitle}
-            </Tab>
+              {tab.title}
+            </TabsTab>
           ))}
-        </TabList>
+        </TabsList>
       )}
     </div>
   )
@@ -176,19 +186,24 @@ function CodeGroupHeader({ title, tabTitles, selectedIndex }: CodeGroupHeaderPro
 
 type ICodeGroupPanelsProps = PropsWithChildren<{
   targetCode?: CodeExample[]
+  tabs?: CodeTab[]
   [key: string]: any
 }>
 
-function CodeGroupPanels({ children, targetCode, ...props }: ICodeGroupPanelsProps) {
-  if ((targetCode?.length ?? 0) > 1) {
+function CodeGroupPanels({ children, targetCode, tabs, ...props }: ICodeGroupPanelsProps) {
+  if ((targetCode?.length ?? 0) > 1 && tabs) {
     return (
-      <TabPanels>
-        {targetCode!.map((code, index) => (
-          <TabPanel key={code.title || code.tag || index}>
-            <CodePanel {...props} targetCode={code} />
-          </TabPanel>
-        ))}
-      </TabPanels>
+      <>
+        {targetCode!.map((code, index) => {
+          const tab = tabs[index]
+
+          return (
+            <TabsPanel key={code.title || code.tag || index} value={tab?.value ?? String(index)}>
+              <CodePanel {...props} targetCode={code} />
+            </TabsPanel>
+          )
+        })}
+      </>
     )
   }
 
@@ -201,18 +216,27 @@ function usePreventLayoutShift() {
 
   useEffect(() => {
     return () => {
-      window.cancelAnimationFrame(rafRef.current)
+      if (rafRef.current)
+        window.cancelAnimationFrame(rafRef.current)
     }
   }, [])
 
   return {
     positionRef,
-    preventLayoutShift(callback: () => {}) {
+    preventLayoutShift(callback: () => void) {
+      if (!positionRef.current) {
+        callback()
+        return
+      }
+
       const initialTop = positionRef.current.getBoundingClientRect().top
 
       callback()
 
       rafRef.current = window.requestAnimationFrame(() => {
+        if (!positionRef.current)
+          return
+
         const newTop = positionRef.current.getBoundingClientRect().top
         window.scrollBy(0, newTop - initialTop)
       })
@@ -220,27 +244,27 @@ function usePreventLayoutShift() {
   }
 }
 
-function useTabGroupProps(availableLanguages: string[]) {
-  const [preferredLanguages, addPreferredLanguage] = useState<any>([])
-  const [selectedIndex, setSelectedIndex] = useState(0)
-  const activeLanguage = [...(availableLanguages || [])].sort(
-    (a, z) => preferredLanguages.indexOf(z) - preferredLanguages.indexOf(a),
-  )[0]
-  const languageIndex = availableLanguages?.indexOf(activeLanguage!) || 0
-  const newSelectedIndex = languageIndex === -1 ? selectedIndex : languageIndex
-  if (newSelectedIndex !== selectedIndex)
-    setSelectedIndex(newSelectedIndex)
-
+function useTabGroupProps(tabValues: string[]) {
+  const [selectedValue, setSelectedValue] = useState(tabValues[0] ?? '')
   const { positionRef, preventLayoutShift } = usePreventLayoutShift()
+  const value = tabValues.includes(selectedValue)
+    ? selectedValue
+    : tabValues[0] ?? ''
 
   return {
-    as: 'div',
     ref: positionRef,
-    selectedIndex,
-    onChange: (newSelectedIndex: number) => {
-      preventLayoutShift(() =>
-        (addPreferredLanguage(availableLanguages[newSelectedIndex]) as any),
-      )
+    value,
+    onValueChange: (newValue: string | number | null) => {
+      if (newValue == null)
+        return
+
+      const nextValue = String(newValue)
+      if (!tabValues.includes(nextValue))
+        return
+
+      preventLayoutShift(() => {
+        setSelectedValue(nextValue)
+      })
     },
   }
 }
@@ -260,24 +284,35 @@ type CodeGroupProps = PropsWithChildren<{
 
 export function CodeGroup({ children, title, targetCode, ...props }: CodeGroupProps) {
   const examples = typeof targetCode === 'string' ? [{ code: targetCode }] as CodeExample[] : targetCode
-  const tabTitles = examples?.map(({ title }) => title || 'Code') || []
-  const tabGroupProps = useTabGroupProps(tabTitles)
-  const hasTabs = tabTitles.length > 1
-  const Container = hasTabs ? TabGroup : 'div'
-  const containerProps = hasTabs ? tabGroupProps : {}
-  const headerProps = hasTabs
-    ? { selectedIndex: tabGroupProps.selectedIndex, tabTitles }
-    : {}
+  const tabs = examples?.map(({ title }, index) => ({
+    title: title || 'Code',
+    value: String(index),
+  })) || []
+  const tabGroupProps = useTabGroupProps(tabs.map(tab => tab.value))
+  const hasTabs = tabs.length > 1
+  const content = (
+    <>
+      <CodeGroupHeader title={title} tabs={hasTabs ? tabs : undefined} />
+      <CodeGroupPanels {...props} targetCode={examples} tabs={hasTabs ? tabs : undefined}>{children}</CodeGroupPanels>
+    </>
+  )
 
   return (
     <CodeGroupContext.Provider value={true}>
-      <Container
-        {...containerProps}
-        className="not-prose my-6 overflow-hidden rounded-2xl bg-zinc-900 shadow-md dark:ring-1 dark:ring-white/10"
-      >
-        <CodeGroupHeader title={title} {...headerProps} />
-        <CodeGroupPanels {...props} targetCode={examples}>{children}</CodeGroupPanels>
-      </Container>
+      {hasTabs
+        ? (
+            <Tabs
+              {...tabGroupProps}
+              className="not-prose my-6 overflow-hidden rounded-2xl bg-zinc-900 shadow-md dark:ring-1 dark:ring-white/10"
+            >
+              {content}
+            </Tabs>
+          )
+        : (
+            <div className="not-prose my-6 overflow-hidden rounded-2xl bg-zinc-900 shadow-md dark:ring-1 dark:ring-white/10">
+              {content}
+            </div>
+          )}
     </CodeGroupContext.Provider>
   )
 }
diff --git a/web/app/components/develop/secret-key/__tests__/input-copy.spec.tsx b/web/app/components/develop/secret-key/__tests__/input-copy.spec.tsx
index e7a0ebb880..accd106305 100644
--- a/web/app/components/develop/secret-key/__tests__/input-copy.spec.tsx
+++ b/web/app/components/develop/secret-key/__tests__/input-copy.spec.tsx
@@ -158,8 +158,9 @@ describe('InputCopy', () => {
     it('should have cursor-pointer on clickable area', async () => {
       await renderAndFlush(<InputCopy value="test" />)
       const valueText = screen.getByText('test')
-      const clickableArea = valueText.closest('div[class*="cursor-pointer"]')
+      const clickableArea = valueText.closest('button')
       expect(clickableArea).toBeInTheDocument()
+      expect(clickableArea?.className).toContain('cursor-pointer')
     })
   })
 
@@ -188,8 +189,9 @@ describe('InputCopy', () => {
     it('should have truncate class for long values', async () => {
       await renderAndFlush(<InputCopy value="very-long-api-key-value-that-might-overflow" />)
       const valueText = screen.getByText('very-long-api-key-value-that-might-overflow')
-      const container = valueText.closest('div[class*="truncate"]')
+      const container = valueText.closest('button')
       expect(container).toBeInTheDocument()
+      expect(container?.className).toContain('truncate')
     })
 
     it('should have text-secondary color on value', async () => {
@@ -201,8 +203,9 @@ describe('InputCopy', () => {
     it('should have absolute positioning for overlay', async () => {
       await renderAndFlush(<InputCopy value="test" />)
       const valueText = screen.getByText('test')
-      const container = valueText.closest('div[class*="absolute"]')
+      const container = valueText.closest('button')
       expect(container).toBeInTheDocument()
+      expect(container?.className).toContain('absolute')
     })
   })
 
diff --git a/web/app/components/develop/secret-key/__tests__/secret-key-modal.spec.tsx b/web/app/components/develop/secret-key/__tests__/secret-key-modal.spec.tsx
index 333ef45162..0dbf7318b2 100644
--- a/web/app/components/develop/secret-key/__tests__/secret-key-modal.spec.tsx
+++ b/web/app/components/develop/secret-key/__tests__/secret-key-modal.spec.tsx
@@ -88,7 +88,7 @@ describe('SecretKeyModal', () => {
 
   beforeEach(() => {
     vi.clearAllMocks()
-    // Suppress expected React act() warnings from Headless UI Dialog transitions and async API state updates
+    // Suppress expected React act() warnings from modal transitions and async API state updates.
     vi.spyOn(console, 'error').mockImplementation(() => {})
     vi.useFakeTimers({ shouldAdvanceTime: true })
     mockCurrentWorkspace.mockReturnValue({ id: 'workspace-1', name: 'Test Workspace' })
@@ -290,6 +290,36 @@ describe('SecretKeyModal', () => {
       })
     })
 
+    it('should place the generated key backdrop above the API keys modal', async () => {
+      const user = userEvent.setup({ advanceTimers: vi.advanceTimersByTime })
+      mockAppApiKeysData.mockReturnValue({
+        data: [
+          { id: 'key-1', token: 'sk-abc123def456ghi789', created_at: 1700000000, last_used_at: null },
+        ],
+      })
+      await renderModal(<SecretKeyModal {...defaultProps} appId="app-123" />)
+
+      const createButton = screen.getByText('appApi.apiKeyModal.createNewSecretKey')
+      await act(async () => {
+        await user.click(createButton)
+      })
+
+      await waitFor(() => {
+        expect(screen.getByText('appApi.apiKeyModal.generateTips')).toBeInTheDocument()
+      })
+
+      const parentDialog = screen.getByText('appApi.apiKeyModal.apiSecretKeyTips').closest('[role="dialog"]')
+      const generatedKeyDialog = screen.getByText('appApi.apiKeyModal.generateTips').closest('[role="dialog"]')
+      const backdrops = document.body.querySelectorAll('.bg-background-overlay')
+      const generatedKeyBackdrop = backdrops[1]
+
+      expect(parentDialog).toBeInTheDocument()
+      expect(generatedKeyDialog).toBeInTheDocument()
+      expect(backdrops).toHaveLength(2)
+      expect(parentDialog!.compareDocumentPosition(generatedKeyBackdrop!) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy()
+      expect(generatedKeyBackdrop!.compareDocumentPosition(generatedKeyDialog!) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy()
+    })
+
     it('should invalidate app API keys after creating', async () => {
       const user = userEvent.setup({ advanceTimers: vi.advanceTimersByTime })
       await renderModal(<SecretKeyModal {...defaultProps} appId="app-123" />)
diff --git a/web/app/components/develop/secret-key/input-copy.tsx b/web/app/components/develop/secret-key/input-copy.tsx
index 28a6aa4cc5..741cdd9bf5 100644
--- a/web/app/components/develop/secret-key/input-copy.tsx
+++ b/web/app/components/develop/secret-key/input-copy.tsx
@@ -42,18 +42,11 @@ const InputCopy = ({
       <div className="flex h-5 grow items-center">
         {children}
         <div className="relative h-full grow text-[13px]">
-          <div
-            className="r-0 absolute top-0 left-0 w-full cursor-pointer truncate pr-2 pl-2"
-            role="button"
+          <button
+            type="button"
+            className="r-0 absolute top-0 left-0 w-full cursor-pointer truncate border-none bg-transparent py-0 pr-2 pl-2 text-left"
             aria-label={copyLabel}
-            tabIndex={0}
             onClick={handleCopy}
-            onKeyDown={(event) => {
-              if (event.key === 'Enter' || event.key === ' ') {
-                event.preventDefault()
-                handleCopy()
-              }
-            }}
           >
             <Tooltip>
               <TooltipTrigger
@@ -63,7 +56,7 @@ const InputCopy = ({
                 {copyLabel}
               </TooltipContent>
             </Tooltip>
-          </div>
+          </button>
         </div>
         <div className="h-4 w-px shrink-0 bg-divider-regular" />
         <div className="mx-1"><CopyFeedback content={value} /></div>
diff --git a/web/app/components/develop/secret-key/secret-key-generate.tsx b/web/app/components/develop/secret-key/secret-key-generate.tsx
index 1fb6e65714..cc9b4c778d 100644
--- a/web/app/components/develop/secret-key/secret-key-generate.tsx
+++ b/web/app/components/develop/secret-key/secret-key-generate.tsx
@@ -2,8 +2,9 @@
 import type { CreateApiKeyResponse } from '@/models/app'
 import { XMarkIcon } from '@heroicons/react/20/solid'
 import { Button } from '@langgenius/dify-ui/button'
+import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import { useTranslation } from 'react-i18next'
-import Modal from '@/app/components/base/modal'
 import InputCopy from './input-copy'
 import s from './style.module.css'
 
@@ -22,21 +23,33 @@ const SecretKeyGenerateModal = ({
 }: ISecretKeyGenerateModalProps) => {
   const { t } = useTranslation()
   return (
-    <Modal isShow={isShow} onClose={onClose} title={`${t('apiKeyModal.apiSecretKey', { ns: 'appApi' })}`} className={`px-8 ${className}`}>
-      <div className="-mt-6 -mr-2 mb-4 flex justify-end">
-        <XMarkIcon className="h-6 w-6 cursor-pointer text-text-tertiary" onClick={onClose} />
-      </div>
-      <p className="mt-1 text-[13px] leading-5 font-normal text-text-tertiary">{t('apiKeyModal.generateTips', { ns: 'appApi' })}</p>
-      <div className="my-4">
-        <InputCopy className="w-full" value={newKey?.token} />
-      </div>
-      <div className="my-4 flex justify-end">
-        <Button className={`shrink-0 ${s.w64}`} onClick={onClose}>
-          <span className="text-xs font-medium text-text-secondary">{t('actionMsg.ok', { ns: 'appApi' })}</span>
-        </Button>
-      </div>
+    <Dialog
+      open={isShow}
+      onOpenChange={(open) => {
+        if (!open)
+          onClose()
+      }}
+    >
+      <DialogContent className={cn('w-full max-w-[480px] overflow-hidden! border-none px-8 text-left align-middle', className)}>
+        <DialogTitle className="title-2xl-semi-bold text-text-primary">
+          {`${t('apiKeyModal.apiSecretKey', { ns: 'appApi' })}`}
+        </DialogTitle>
 
-    </Modal>
+        <div className="-mt-6 -mr-2 mb-4 flex justify-end">
+          <XMarkIcon className="h-6 w-6 cursor-pointer text-text-tertiary" onClick={onClose} />
+        </div>
+        <p className="mt-1 text-[13px] leading-5 font-normal text-text-tertiary">{t('apiKeyModal.generateTips', { ns: 'appApi' })}</p>
+        <div className="my-4">
+          <InputCopy className="w-full" value={newKey?.token} />
+        </div>
+        <div className="my-4 flex justify-end">
+          <Button className={`shrink-0 ${s.w64}`} onClick={onClose}>
+            <span className="text-xs font-medium text-text-secondary">{t('actionMsg.ok', { ns: 'appApi' })}</span>
+          </Button>
+        </div>
+
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/components/develop/secret-key/secret-key-modal.tsx b/web/app/components/develop/secret-key/secret-key-modal.tsx
index e8d9204318..71cb87019c 100644
--- a/web/app/components/develop/secret-key/secret-key-modal.tsx
+++ b/web/app/components/develop/secret-key/secret-key-modal.tsx
@@ -11,6 +11,8 @@ import {
   AlertDialogTitle,
 } from '@langgenius/dify-ui/alert-dialog'
 import { Button } from '@langgenius/dify-ui/button'
+import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import { RiDeleteBinLine } from '@remixicon/react'
 import {
   useState,
@@ -19,7 +21,6 @@ import { useTranslation } from 'react-i18next'
 import ActionButton from '@/app/components/base/action-button'
 import CopyFeedback from '@/app/components/base/copy-feedback'
 import Loading from '@/app/components/base/loading'
-import Modal from '@/app/components/base/modal'
 import { useAppContext } from '@/context/app-context'
 import useTimestamp from '@/hooks/use-timestamp'
 import {
@@ -103,78 +104,99 @@ const SecretKeyModal = ({
     setShowConfirmDelete(false)
   }
 
+  const handleClose = () => {
+    setVisible(false)
+    onClose()
+  }
+
   return (
-    <Modal isShow={isShow} onClose={onClose} title={`${t('apiKeyModal.apiSecretKey', { ns: 'appApi' })}`} className={`${s.customModal} flex flex-col px-8`}>
-      <div className="-mt-6 -mr-2 mb-4 flex justify-end">
-        <XMarkIcon className="h-6 w-6 cursor-pointer text-text-tertiary" onClick={onClose} />
-      </div>
-      <p className="mt-1 shrink-0 text-[13px] leading-5 font-normal text-text-tertiary">{t('apiKeyModal.apiSecretKeyTips', { ns: 'appApi' })}</p>
-      {isApiKeysLoading && <div className="mt-4"><Loading /></div>}
-      {
-        !!apiKeysList?.data?.length && (
-          <div className="mt-4 flex grow flex-col overflow-hidden">
-            <div className="flex h-9 shrink-0 items-center border-b border-divider-regular text-xs font-semibold text-text-tertiary">
-              <div className="w-64 shrink-0 px-3">{t('apiKeyModal.secretKey', { ns: 'appApi' })}</div>
-              <div className="w-[200px] shrink-0 px-3">{t('apiKeyModal.created', { ns: 'appApi' })}</div>
-              <div className="w-[200px] shrink-0 px-3">{t('apiKeyModal.lastUsed', { ns: 'appApi' })}</div>
-              <div className="grow px-3"></div>
-            </div>
-            <div className="grow overflow-auto">
-              {apiKeysList.data.map(api => (
-                <div className="flex h-9 items-center border-b border-divider-regular text-sm font-normal text-text-secondary" key={api.id}>
-                  <div className="w-64 shrink-0 truncate px-3 font-mono">{generateToken(api.token)}</div>
-                  <div className="w-[200px] shrink-0 truncate px-3">{formatTime(Number(api.created_at), t('dateTimeFormat', { ns: 'appLog' }) as string)}</div>
-                  <div className="w-[200px] shrink-0 truncate px-3">{api.last_used_at ? formatTime(Number(api.last_used_at), t('dateTimeFormat', { ns: 'appLog' }) as string) : t('never', { ns: 'appApi' })}</div>
-                  <div className="flex grow space-x-2 px-3">
-                    <CopyFeedback content={api.token} />
-                    {isCurrentWorkspaceManager && (
-                      <ActionButton
-                        onClick={() => {
-                          setDelKeyId(api.id)
-                          setShowConfirmDelete(true)
-                        }}
-                      >
-                        <RiDeleteBinLine className="h-4 w-4" />
-                      </ActionButton>
-                    )}
-                  </div>
-                </div>
-              ))}
-            </div>
-          </div>
-        )
-      }
-      <div className="flex">
-        <Button className={`mt-4 flex shrink-0 ${s.autoWidth}`} onClick={onCreate} disabled={!currentWorkspace || !isCurrentWorkspaceEditor}>
-          <PlusIcon className="mr-1 flex h-4 w-4 shrink-0" />
-          <div className="text-xs font-medium text-text-secondary">{t('apiKeyModal.createNewSecretKey', { ns: 'appApi' })}</div>
-        </Button>
-      </div>
-      <SecretKeyGenerateModal className="shrink-0" isShow={isVisible} onClose={() => setVisible(false)} newKey={newKey} />
-      <AlertDialog
-        open={showConfirmDelete}
-        onOpenChange={handleDeleteConfirmOpenChange}
+    <>
+      <Dialog
+        open={isShow}
+        onOpenChange={(open) => {
+          if (!open)
+            handleClose()
+        }}
       >
-        <AlertDialogContent>
-          <div className="flex flex-col gap-2 px-6 pt-6 pb-4">
-            <AlertDialogTitle className="w-full truncate title-2xl-semi-bold text-text-primary">
-              {t('actionMsg.deleteConfirmTitle', { ns: 'appApi' })}
-            </AlertDialogTitle>
-            <AlertDialogDescription className="w-full system-md-regular wrap-break-word whitespace-pre-wrap text-text-tertiary">
-              {t('actionMsg.deleteConfirmTips', { ns: 'appApi' })}
-            </AlertDialogDescription>
+        <DialogContent className={cn('max-h-[calc(100vh-80px)]! w-full max-w-[800px]! overflow-hidden! border-none text-left align-middle', `${s.customModal} flex flex-col px-8`)}>
+          <DialogTitle className="title-2xl-semi-bold text-text-primary">
+            {`${t('apiKeyModal.apiSecretKey', { ns: 'appApi' })}`}
+          </DialogTitle>
+
+          <div className="-mt-6 -mr-2 mb-4 flex justify-end">
+            <XMarkIcon className="h-6 w-6 cursor-pointer text-text-tertiary" onClick={handleClose} />
           </div>
-          <AlertDialogActions>
-            <AlertDialogCancelButton>
-              {t('operation.cancel', { ns: 'common' })}
-            </AlertDialogCancelButton>
-            <AlertDialogConfirmButton onClick={onDel}>
-              {t('operation.confirm', { ns: 'common' })}
-            </AlertDialogConfirmButton>
-          </AlertDialogActions>
-        </AlertDialogContent>
-      </AlertDialog>
-    </Modal>
+          <p className="mt-1 shrink-0 text-[13px] leading-5 font-normal text-text-tertiary">{t('apiKeyModal.apiSecretKeyTips', { ns: 'appApi' })}</p>
+          {isApiKeysLoading && <div className="mt-4"><Loading /></div>}
+          {
+            !!apiKeysList?.data?.length && (
+              <div className="mt-4 flex grow flex-col overflow-hidden">
+                <div className="flex h-9 shrink-0 items-center border-b border-divider-regular text-xs font-semibold text-text-tertiary">
+                  <div className="w-64 shrink-0 px-3">{t('apiKeyModal.secretKey', { ns: 'appApi' })}</div>
+                  <div className="w-[200px] shrink-0 px-3">{t('apiKeyModal.created', { ns: 'appApi' })}</div>
+                  <div className="w-[200px] shrink-0 px-3">{t('apiKeyModal.lastUsed', { ns: 'appApi' })}</div>
+                  <div className="grow px-3"></div>
+                </div>
+                <div className="grow overflow-auto">
+                  {apiKeysList.data.map(api => (
+                    <div className="flex h-9 items-center border-b border-divider-regular text-sm font-normal text-text-secondary" key={api.id}>
+                      <div className="w-64 shrink-0 truncate px-3 font-mono">{generateToken(api.token)}</div>
+                      <div className="w-[200px] shrink-0 truncate px-3">{formatTime(Number(api.created_at), t('dateTimeFormat', { ns: 'appLog' }) as string)}</div>
+                      <div className="w-[200px] shrink-0 truncate px-3">{api.last_used_at ? formatTime(Number(api.last_used_at), t('dateTimeFormat', { ns: 'appLog' }) as string) : t('never', { ns: 'appApi' })}</div>
+                      <div className="flex grow space-x-2 px-3">
+                        <CopyFeedback content={api.token} />
+                        {isCurrentWorkspaceManager && (
+                          <ActionButton
+                            onClick={() => {
+                              setDelKeyId(api.id)
+                              setShowConfirmDelete(true)
+                            }}
+                          >
+                            <RiDeleteBinLine className="h-4 w-4" />
+                          </ActionButton>
+                        )}
+                      </div>
+                    </div>
+                  ))}
+                </div>
+              </div>
+            )
+          }
+          <div className="flex">
+            <Button className={`mt-4 flex shrink-0 ${s.autoWidth}`} onClick={onCreate} disabled={!currentWorkspace || !isCurrentWorkspaceEditor}>
+              <PlusIcon className="mr-1 flex h-4 w-4 shrink-0" />
+              <div className="text-xs font-medium text-text-secondary">{t('apiKeyModal.createNewSecretKey', { ns: 'appApi' })}</div>
+            </Button>
+          </div>
+          <AlertDialog
+            open={showConfirmDelete}
+            onOpenChange={handleDeleteConfirmOpenChange}
+          >
+            <AlertDialogContent>
+              <div className="flex flex-col gap-2 px-6 pt-6 pb-4">
+                <AlertDialogTitle className="w-full truncate title-2xl-semi-bold text-text-primary">
+                  {t('actionMsg.deleteConfirmTitle', { ns: 'appApi' })}
+                </AlertDialogTitle>
+                <AlertDialogDescription className="w-full system-md-regular wrap-break-word whitespace-pre-wrap text-text-tertiary">
+                  {t('actionMsg.deleteConfirmTips', { ns: 'appApi' })}
+                </AlertDialogDescription>
+              </div>
+              <AlertDialogActions>
+                <AlertDialogCancelButton>
+                  {t('operation.cancel', { ns: 'common' })}
+                </AlertDialogCancelButton>
+                <AlertDialogConfirmButton onClick={onDel}>
+                  {t('operation.confirm', { ns: 'common' })}
+                </AlertDialogConfirmButton>
+              </AlertDialogActions>
+            </AlertDialogContent>
+          </AlertDialog>
+        </DialogContent>
+      </Dialog>
+      {isShow && (
+        <SecretKeyGenerateModal className="shrink-0" isShow={isVisible} onClose={() => setVisible(false)} newKey={newKey} />
+      )}
+    </>
   )
 }
 
diff --git a/web/app/components/explore/app-card/__tests__/index.spec.tsx b/web/app/components/explore/app-card/__tests__/index.spec.tsx
index 43b8e4fde2..68cb802acf 100644
--- a/web/app/components/explore/app-card/__tests__/index.spec.tsx
+++ b/web/app/components/explore/app-card/__tests__/index.spec.tsx
@@ -22,7 +22,7 @@ const createApp = (overrides?: Partial<App>): App => ({
   copyright: '2024',
   privacy_policy: null,
   custom_disclaimer: null,
-  category: 'Assistant',
+  categories: ['Assistant'],
   position: 1,
   is_listed: true,
   install_count: 0,
@@ -167,7 +167,7 @@ describe('AppCard', () => {
         template_id: app.app_id,
         template_name: app.app.name,
         template_mode: app.app.mode,
-        template_category: app.category,
+        template_categories: app.categories,
         page: 'explore',
       })
     })
diff --git a/web/app/components/explore/app-card/index.tsx b/web/app/components/explore/app-card/index.tsx
index afa46f6ed4..3a6d4962e2 100644
--- a/web/app/components/explore/app-card/index.tsx
+++ b/web/app/components/explore/app-card/index.tsx
@@ -37,7 +37,7 @@ const AppCard = ({
       template_id: app.app_id,
       template_name: appBasicInfo.name,
       template_mode: appBasicInfo.mode,
-      template_category: app.category,
+      template_categories: app.categories,
       page: 'explore',
     })
     onTry({ appId: app.app_id, app })
diff --git a/web/app/components/explore/app-list/__tests__/index.spec.tsx b/web/app/components/explore/app-list/__tests__/index.spec.tsx
index 4da92dd568..0986df44e0 100644
--- a/web/app/components/explore/app-list/__tests__/index.spec.tsx
+++ b/web/app/components/explore/app-list/__tests__/index.spec.tsx
@@ -115,7 +115,7 @@ const createApp = (overrides: Partial<App> = {}): App => ({
   copyright: overrides.copyright ?? '',
   privacy_policy: overrides.privacy_policy ?? null,
   custom_disclaimer: overrides.custom_disclaimer ?? null,
-  category: overrides.category ?? 'Writing',
+  categories: overrides.categories ?? ['Writing'],
   position: overrides.position ?? 1,
   is_listed: overrides.is_listed ?? true,
   install_count: overrides.install_count ?? 0,
@@ -185,7 +185,7 @@ describe('AppList', () => {
     it('should render app cards when data is available', () => {
       mockExploreData = {
         categories: ['Writing', 'Translate'],
-        allList: [createApp(), createApp({ app_id: 'app-2', app: { ...createApp().app, name: 'Beta' }, category: 'Translate' })],
+        allList: [createApp(), createApp({ app_id: 'app-2', app: { ...createApp().app, name: 'Beta' }, categories: ['Translate'] })],
       }
 
       renderAppList()
@@ -199,7 +199,7 @@ describe('AppList', () => {
     it('should filter apps by selected category', () => {
       mockExploreData = {
         categories: ['Writing', 'Translate'],
-        allList: [createApp(), createApp({ app_id: 'app-2', app: { ...createApp().app, name: 'Beta' }, category: 'Translate' })],
+        allList: [createApp(), createApp({ app_id: 'app-2', app: { ...createApp().app, name: 'Beta' }, categories: ['Translate'] })],
       }
 
       renderAppList(false, undefined, { category: 'Writing' })
@@ -239,8 +239,8 @@ describe('AppList', () => {
       mockHandleImportDSL.mockImplementation(async (_payload: unknown, options: { onSuccess?: () => void, onPending?: () => void }) => {
         options.onPending?.()
       })
-      mockHandleImportDSLConfirm.mockImplementation(async (options: { onSuccess?: () => void }) => {
-        options.onSuccess?.()
+      mockHandleImportDSLConfirm.mockImplementation(async (options: { onSuccess?: (payload: { app_mode: AppModeEnum }) => void }) => {
+        options.onSuccess?.({ app_mode: AppModeEnum.CHAT })
       })
 
       renderAppList(true, onSuccess)
@@ -257,7 +257,9 @@ describe('AppList', () => {
       await waitFor(() => {
         expect(mockHandleImportDSLConfirm).toHaveBeenCalledTimes(1)
         expect(mockTrackCreateApp).toHaveBeenCalledWith({
+          source: 'explore_template_list',
           appMode: AppModeEnum.CHAT,
+          templateId: 'app-1',
         })
         expect(onSuccess).toHaveBeenCalledTimes(1)
       })
@@ -279,7 +281,7 @@ describe('AppList', () => {
       })
       expect(screen.queryByText('Alpha')).not.toBeInTheDocument()
 
-      fireEvent.click(screen.getByTestId('input-clear'))
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.clear' }))
       await act(async () => {
         await vi.advanceTimersByTimeAsync(500)
       })
@@ -351,8 +353,8 @@ describe('AppList', () => {
         allList: [createApp()],
       };
       (fetchAppDetail as unknown as Mock).mockResolvedValue({ export_data: 'yaml', mode: AppModeEnum.CHAT })
-      mockHandleImportDSL.mockImplementation(async (_payload: unknown, options: { onSuccess?: () => void }) => {
-        options.onSuccess?.()
+      mockHandleImportDSL.mockImplementation(async (_payload: unknown, options: { onSuccess?: (payload: { app_mode: AppModeEnum }) => void }) => {
+        options.onSuccess?.({ app_mode: AppModeEnum.CHAT })
       })
 
       renderAppList(true)
@@ -417,8 +419,8 @@ describe('AppList', () => {
         allList: [createApp()],
       };
       (fetchAppDetail as unknown as Mock).mockResolvedValue({ export_data: 'yaml', mode: AppModeEnum.CHAT })
-      mockHandleImportDSL.mockImplementation(async (_payload: unknown, options: { onSuccess?: () => void }) => {
-        options.onSuccess?.()
+      mockHandleImportDSL.mockImplementation(async (_payload: unknown, options: { onSuccess?: (payload: { app_mode: AppModeEnum }) => void }) => {
+        options.onSuccess?.({ app_mode: AppModeEnum.CHAT })
       })
 
       renderAppList(true)
@@ -429,7 +431,9 @@ describe('AppList', () => {
 
       await waitFor(() => {
         expect(mockTrackCreateApp).toHaveBeenCalledWith({
+          source: 'explore_template_preview',
           appMode: AppModeEnum.CHAT,
+          templateId: 'app-1',
         })
       })
     })
diff --git a/web/app/components/explore/app-list/index.tsx b/web/app/components/explore/app-list/index.tsx
index 0cb0e30d2e..41485e0e89 100644
--- a/web/app/components/explore/app-list/index.tsx
+++ b/web/app/components/explore/app-list/index.tsx
@@ -3,6 +3,7 @@
 import type { CreateAppModalProps } from '@/app/components/explore/create-app-modal'
 import type { App } from '@/models/explore'
 import type { TryAppSelection } from '@/types/try-app'
+import type { TrackCreateAppParams } from '@/utils/create-app-tracking'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
 import { useSuspenseQuery } from '@tanstack/react-query'
@@ -77,7 +78,10 @@ const Apps = ({
   const filteredList = useMemo(() => {
     if (!data)
       return []
-    return data.allList.filter(item => currCategory === allCategoriesEn || item.category === currCategory)
+    return data.allList.filter(item => (
+      currCategory === allCategoriesEn
+      || item.categories?.includes(currCategory)
+    ))
   }, [data, currCategory, allCategoriesEn])
 
   const searchFilteredList = useMemo(() => {
@@ -104,6 +108,7 @@ const Apps = ({
 
   const [currentTryApp, setCurrentTryApp] = useState<TryAppSelection | undefined>(undefined)
   const currentCreateAppModeRef = useRef<App['app']['mode'] | null>(null)
+  const currentCreateAppTrackingRef = useRef<Pick<TrackCreateAppParams, 'source' | 'templateId'> | null>(null)
   const isShowTryAppPanel = !!currentTryApp
   const hideTryAppPanel = useCallback(() => {
     setCurrentTryApp(undefined)
@@ -113,13 +118,24 @@ const Apps = ({
   }, [])
   const handleShowFromTryApp = useCallback(() => {
     setCurrApp(currentTryApp?.app || null)
+    currentCreateAppTrackingRef.current = {
+      source: 'explore_template_preview',
+      templateId: currentTryApp?.appId || currentTryApp?.app.app_id,
+    }
     setIsShowCreateModal(true)
-  }, [currentTryApp?.app])
-  const trackCurrentCreateApp = useCallback(() => {
-    if (!currentCreateAppModeRef.current)
+  }, [currentTryApp?.app, currentTryApp?.appId])
+  const trackCurrentCreateApp = useCallback((appMode?: App['app']['mode'] | null) => {
+    const currentCreateAppTracking = currentCreateAppTrackingRef.current
+    const resolvedAppMode = appMode ?? currentCreateAppModeRef.current
+    if (!resolvedAppMode || !currentCreateAppTracking)
       return
 
-    trackCreateApp({ appMode: currentCreateAppModeRef.current })
+    trackCreateApp({
+      ...currentCreateAppTracking,
+      appMode: resolvedAppMode,
+    })
+    currentCreateAppTrackingRef.current = null
+    currentCreateAppModeRef.current = null
   }, [])
 
   const onCreate: CreateAppModalProps['onConfirm'] = useCallback(async ({
@@ -145,8 +161,8 @@ const Apps = ({
       description,
     }
     await handleImportDSL(payload, {
-      onSuccess: () => {
-        trackCurrentCreateApp()
+      onSuccess: (response) => {
+        trackCurrentCreateApp(response.app_mode)
         setIsShowCreateModal(false)
       },
       onPending: () => {
@@ -157,8 +173,8 @@ const Apps = ({
 
   const onConfirmDSL = useCallback(async () => {
     await handleImportDSLConfirm({
-      onSuccess: () => {
-        trackCurrentCreateApp()
+      onSuccess: (response) => {
+        trackCurrentCreateApp(response.app_mode)
         onSuccess?.()
       },
     })
@@ -239,6 +255,10 @@ const Apps = ({
                 app={app}
                 canCreate={hasEditPermission}
                 onCreate={() => {
+                  currentCreateAppTrackingRef.current = {
+                    source: 'explore_template_list',
+                    templateId: app.app_id,
+                  }
                   setCurrApp(app)
                   setIsShowCreateModal(true)
                 }}
@@ -277,7 +297,7 @@ const Apps = ({
         <TryApp
           appId={currentTryApp?.appId || ''}
           app={currentTryApp?.app}
-          category={currentTryApp?.app?.category}
+          categories={currentTryApp?.app?.categories}
           onClose={hideTryAppPanel}
           onCreate={handleShowFromTryApp}
         />
diff --git a/web/app/components/explore/category.tsx b/web/app/components/explore/category.tsx
index de0f5967e4..ef7ac13cd5 100644
--- a/web/app/components/explore/category.tsx
+++ b/web/app/components/explore/category.tsx
@@ -33,6 +33,11 @@ const Category: FC<ICategoryProps> = ({
     isSelected && 'border-components-main-nav-nav-button-border bg-components-main-nav-nav-button-bg-active text-components-main-nav-nav-button-text-active shadow-xs',
   )
 
+  const renderCategoryName = (name: AppCategory) => {
+    const categoryKey = `category.${name}` as keyof typeof exploreI18n
+    return categoryKey in exploreI18n ? t(categoryKey, { ns: 'explore' }) : name
+  }
+
   return (
     <div className={cn(className, 'flex flex-wrap gap-1 text-[13px]')}>
       <div
@@ -48,7 +53,7 @@ const Category: FC<ICategoryProps> = ({
           className={itemClassName(name === value)}
           onClick={() => onChange(name)}
         >
-          {`category.${name}` in exploreI18n ? t(`category.${name}`, { ns: 'explore' }) : name}
+          {renderCategoryName(name)}
         </div>
       ))}
     </div>
diff --git a/web/app/components/explore/create-app-modal/__tests__/index.spec.tsx b/web/app/components/explore/create-app-modal/__tests__/index.spec.tsx
index 882dc8f9a0..2b4a2d74cc 100644
--- a/web/app/components/explore/create-app-modal/__tests__/index.spec.tsx
+++ b/web/app/components/explore/create-app-modal/__tests__/index.spec.tsx
@@ -177,22 +177,6 @@ describe('CreateAppModal', () => {
       expect(onHide).toHaveBeenCalledTimes(1)
       expect(onConfirm).not.toHaveBeenCalled()
     })
-
-    it('should call onHide when pressing Escape while visible', async () => {
-      const { onHide } = await setup()
-
-      fireEvent.keyDown(window, { key: 'Escape', keyCode: 27 })
-
-      expect(onHide).toHaveBeenCalledTimes(1)
-    })
-
-    it('should not call onHide when pressing Escape while hidden', async () => {
-      const { onHide } = await setup({ show: false })
-
-      fireEvent.keyDown(window, { key: 'Escape', keyCode: 27 })
-
-      expect(onHide).not.toHaveBeenCalled()
-    })
   })
 
   describe('Quota Gating', () => {
diff --git a/web/app/components/explore/create-app-modal/index.tsx b/web/app/components/explore/create-app-modal/index.tsx
index a7c9e06655..1b52ec2ad7 100644
--- a/web/app/components/explore/create-app-modal/index.tsx
+++ b/web/app/components/explore/create-app-modal/index.tsx
@@ -1,17 +1,15 @@
 'use client'
 import type { AppIconType } from '@/types/app'
 import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogCloseButton, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import { Switch } from '@langgenius/dify-ui/switch'
 import { toast } from '@langgenius/dify-ui/toast'
-import { RiCloseLine } from '@remixicon/react'
 import { useDebounceFn, useKeyPress } from 'ahooks'
-import { noop } from 'es-toolkit/function'
 import * as React from 'react'
 import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import AppIcon from '@/app/components/base/app-icon'
 import Input from '@/app/components/base/input'
-import Modal from '@/app/components/base/modal'
 import Textarea from '@/app/components/base/textarea'
 import AppsFull from '@/app/components/billing/apps-full-in-dialog'
 import { useProviderContext } from '@/context/provider-context'
@@ -44,6 +42,8 @@ export type CreateAppModalProps = {
   onHide: () => void
 }
 
+type CreateAppPayload = Parameters<CreateAppModalProps['onConfirm']>[0]
+
 const CreateAppModal = ({
   show = false,
   isEditModal = false,
@@ -84,8 +84,9 @@ const CreateAppModal = ({
       toast(t('appCustomize.nameRequired', { ns: 'explore' }), { type: 'error' })
       return
     }
-    const isValid = maxActiveRequestsInput.trim() !== '' && !isNaN(Number(maxActiveRequestsInput))
-    const payload: any = {
+    const parsedMaxActiveRequests = Number(maxActiveRequestsInput)
+    const isValid = maxActiveRequestsInput.trim() !== '' && !Number.isNaN(parsedMaxActiveRequests)
+    const payload: CreateAppPayload = {
       name,
       icon_type: appIcon.type,
       icon: appIcon.type === 'emoji' ? appIcon.icon : appIcon.fileId,
@@ -94,7 +95,7 @@ const CreateAppModal = ({
       use_icon_as_answer_icon: useIconAsAnswerIcon,
     }
     if (isValid)
-      payload.max_active_requests = Number(maxActiveRequestsInput)
+      payload.max_active_requests = parsedMaxActiveRequests
 
     onConfirm(payload)
     onHide()
@@ -107,103 +108,94 @@ const CreateAppModal = ({
       handleSubmit()
   })
 
-  useKeyPress('esc', () => {
-    if (show)
-      onHide()
-  })
-
   return (
     <>
-      <Modal
-        isShow={show}
-        onClose={noop}
-        className="relative max-w-[480px]! px-8"
-      >
-        <div className="absolute top-4 right-4 cursor-pointer p-2" onClick={onHide}>
-          <RiCloseLine className="h-4 w-4 text-text-tertiary" />
-        </div>
-        {isEditModal && (
-          <div className="mb-9 text-xl leading-[30px] font-semibold text-text-primary">{t('editAppTitle', { ns: 'app' })}</div>
-        )}
-        {!isEditModal && (
-          <div className="mb-9 text-xl leading-[30px] font-semibold text-text-primary">{t('appCustomize.title', { ns: 'explore', name: appName })}</div>
-        )}
-        <div className="mb-9">
-          {/* icon & name */}
-          <div className="pt-2">
-            <div className="py-2 text-sm leading-[20px] font-medium text-text-primary">{t('newApp.captionName', { ns: 'app' })}</div>
-            <div className="flex items-center justify-between space-x-2">
-              <AppIcon
-                size="large"
-                onClick={() => { setShowAppIconPicker(true) }}
-                className="cursor-pointer"
-                iconType={appIcon.type}
-                icon={appIcon.type === 'image' ? appIcon.fileId : appIcon.icon}
-                background={appIcon.type === 'image' ? undefined : appIcon.background}
-                imageUrl={appIcon.type === 'image' ? appIcon.url : undefined}
-              />
-              <Input
-                value={name}
-                onChange={e => setName(e.target.value)}
-                placeholder={t('newApp.appNamePlaceholder', { ns: 'app' }) || ''}
-                className="h-10 grow"
-              />
-            </div>
-          </div>
-          {/* description */}
-          <div className="pt-2">
-            <div className="py-2 text-sm leading-[20px] font-medium text-text-primary">{t('newApp.captionDescription', { ns: 'app' })}</div>
-            <Textarea
-              className="resize-none"
-              placeholder={t('newApp.appDescriptionPlaceholder', { ns: 'app' }) || ''}
-              value={description}
-              onChange={e => setDescription(e.target.value)}
-            />
-          </div>
-          {/* answer icon */}
-          {isEditModal && (appMode === AppModeEnum.CHAT || appMode === AppModeEnum.ADVANCED_CHAT || appMode === AppModeEnum.AGENT_CHAT) && (
+      <Dialog open={show} onOpenChange={open => !open && onHide()} disablePointerDismissal>
+        <DialogContent className="px-8">
+          <DialogCloseButton />
+          {isEditModal && (
+            <DialogTitle className="mb-9 text-xl leading-[30px] font-semibold text-text-primary">{t('editAppTitle', { ns: 'app' })}</DialogTitle>
+          )}
+          {!isEditModal && (
+            <DialogTitle className="mb-9 text-xl leading-[30px] font-semibold text-text-primary">{t('appCustomize.title', { ns: 'explore', name: appName })}</DialogTitle>
+          )}
+          <div className="mb-9">
+            {/* icon & name */}
             <div className="pt-2">
-              <div className="flex items-center justify-between">
-                <div className="py-2 text-sm leading-[20px] font-medium text-text-primary">{t('answerIcon.title', { ns: 'app' })}</div>
-                <Switch
-                  checked={useIconAsAnswerIcon}
-                  onCheckedChange={v => setUseIconAsAnswerIcon(v)}
+              <div className="py-2 text-sm leading-[20px] font-medium text-text-primary">{t('newApp.captionName', { ns: 'app' })}</div>
+              <div className="flex items-center justify-between space-x-2">
+                <AppIcon
+                  size="large"
+                  onClick={() => { setShowAppIconPicker(true) }}
+                  className="cursor-pointer"
+                  iconType={appIcon.type}
+                  icon={appIcon.type === 'image' ? appIcon.fileId : appIcon.icon}
+                  background={appIcon.type === 'image' ? undefined : appIcon.background}
+                  imageUrl={appIcon.type === 'image' ? appIcon.url : undefined}
+                />
+                <Input
+                  value={name}
+                  onChange={e => setName(e.target.value)}
+                  placeholder={t('newApp.appNamePlaceholder', { ns: 'app' }) || ''}
+                  className="h-10 grow"
                 />
               </div>
-              <p className="body-xs-regular text-text-tertiary">{t('answerIcon.descriptionInExplore', { ns: 'app' })}</p>
             </div>
-          )}
-          {isEditModal && (
+            {/* description */}
             <div className="pt-2">
-              <div className="mt-2 mb-2 text-sm leading-[20px] font-medium text-text-primary">{t('maxActiveRequests', { ns: 'app' })}</div>
-              <Input
-                type="number"
-                min={1}
-                placeholder={t('maxActiveRequestsPlaceholder', { ns: 'app' })}
-                value={maxActiveRequestsInput}
-                onChange={(e) => {
-                  setMaxActiveRequestsInput(e.target.value)
-                }}
-                className="h-10 w-full"
+              <div className="py-2 text-sm leading-[20px] font-medium text-text-primary">{t('newApp.captionDescription', { ns: 'app' })}</div>
+              <Textarea
+                className="resize-none"
+                placeholder={t('newApp.appDescriptionPlaceholder', { ns: 'app' }) || ''}
+                value={description}
+                onChange={e => setDescription(e.target.value)}
               />
-              <p className="mt-2 mb-0 body-xs-regular text-text-tertiary">{t('maxActiveRequestsTip', { ns: 'app' })}</p>
             </div>
-          )}
-          {!isEditModal && isAppsFull && <AppsFull className="mt-4" loc="app-explore-create" />}
-        </div>
-        <div className="flex flex-row-reverse">
-          <Button
-            disabled={(!isEditModal && isAppsFull) || !name.trim() || confirmDisabled}
-            className="ml-2 w-24 gap-1"
-            variant="primary"
-            onClick={handleSubmit}
-          >
-            <span>{!isEditModal ? t('operation.create', { ns: 'common' }) : t('operation.save', { ns: 'common' })}</span>
-            <ShortcutsName keys={['ctrl', '↵']} bgColor="white" />
-          </Button>
-          <Button className="w-24" onClick={onHide}>{t('operation.cancel', { ns: 'common' })}</Button>
-        </div>
-      </Modal>
+            {/* answer icon */}
+            {isEditModal && (appMode === AppModeEnum.CHAT || appMode === AppModeEnum.ADVANCED_CHAT || appMode === AppModeEnum.AGENT_CHAT) && (
+              <div className="pt-2">
+                <div className="flex items-center justify-between">
+                  <div className="py-2 text-sm leading-[20px] font-medium text-text-primary">{t('answerIcon.title', { ns: 'app' })}</div>
+                  <Switch
+                    checked={useIconAsAnswerIcon}
+                    onCheckedChange={v => setUseIconAsAnswerIcon(v)}
+                  />
+                </div>
+                <p className="body-xs-regular text-text-tertiary">{t('answerIcon.descriptionInExplore', { ns: 'app' })}</p>
+              </div>
+            )}
+            {isEditModal && (
+              <div className="pt-2">
+                <div className="mt-2 mb-2 text-sm leading-[20px] font-medium text-text-primary">{t('maxActiveRequests', { ns: 'app' })}</div>
+                <Input
+                  type="number"
+                  min={1}
+                  placeholder={t('maxActiveRequestsPlaceholder', { ns: 'app' })}
+                  value={maxActiveRequestsInput}
+                  onChange={(e) => {
+                    setMaxActiveRequestsInput(e.target.value)
+                  }}
+                  className="h-10 w-full"
+                />
+                <p className="mt-2 mb-0 body-xs-regular text-text-tertiary">{t('maxActiveRequestsTip', { ns: 'app' })}</p>
+              </div>
+            )}
+            {!isEditModal && isAppsFull && <AppsFull className="mt-4" loc="app-explore-create" />}
+          </div>
+          <div className="flex flex-row-reverse">
+            <Button
+              disabled={(!isEditModal && isAppsFull) || !name.trim() || confirmDisabled}
+              className="ml-2 w-24 gap-1"
+              variant="primary"
+              onClick={handleSubmit}
+            >
+              <span>{!isEditModal ? t('operation.create', { ns: 'common' }) : t('operation.save', { ns: 'common' })}</span>
+              <ShortcutsName keys={['ctrl', '↵']} bgColor="white" />
+            </Button>
+            <Button className="w-24" onClick={onHide}>{t('operation.cancel', { ns: 'common' })}</Button>
+          </div>
+        </DialogContent>
+      </Dialog>
       {showAppIconPicker && (
         <AppIconPicker
           initialEmoji={appIcon.type === 'emoji'
diff --git a/web/app/components/explore/try-app/__tests__/index.spec.tsx b/web/app/components/explore/try-app/__tests__/index.spec.tsx
index a84989dea9..84d6332e67 100644
--- a/web/app/components/explore/try-app/__tests__/index.spec.tsx
+++ b/web/app/components/explore/try-app/__tests__/index.spec.tsx
@@ -39,14 +39,14 @@ vi.mock('../app-info', () => ({
   default: ({
     appId,
     appDetail,
-    category,
+    categories,
     className,
     onCreate,
-  }: { appId: string, appDetail: TryAppInfo, category?: string, className?: string, onCreate: () => void }) => (
+  }: { appId: string, appDetail: TryAppInfo, categories?: string[], className?: string, onCreate: () => void }) => (
     <div
       data-testid="app-info-component"
       data-app-id={appId}
-      data-category={category}
+      data-categories={categories?.join(',')}
       className={className}
     >
       <button data-testid="create-button" onClick={onCreate}>Create</button>
@@ -120,6 +120,42 @@ describe('TryApp (main index.tsx)', () => {
 
       expect(document.body.querySelector('[role="status"]')).toBeInTheDocument()
     })
+
+    it('renders unavailable state when the app detail request fails', () => {
+      mockUseGetTryAppInfo.mockReturnValue({
+        data: null,
+        isError: true,
+        error: new Error('App is unavailable'),
+      })
+
+      render(
+        <TryApp
+          appId="test-app-id"
+          onClose={vi.fn()}
+          onCreate={vi.fn()}
+        />,
+      )
+
+      expect(screen.getByText('App is unavailable')).toBeInTheDocument()
+    })
+
+    it('renders unknown unavailable state when app detail is empty', () => {
+      mockUseGetTryAppInfo.mockReturnValue({
+        data: null,
+        isLoading: false,
+        isError: false,
+      })
+
+      render(
+        <TryApp
+          appId="test-app-id"
+          onClose={vi.fn()}
+          onCreate={vi.fn()}
+        />,
+      )
+
+      expect(screen.getByText('share.common.appUnknownError')).toBeInTheDocument()
+    })
   })
 
   describe('content rendering', () => {
@@ -257,6 +293,26 @@ describe('TryApp (main index.tsx)', () => {
 
       expect(mockOnClose).toHaveBeenCalled()
     })
+
+    it('calls onClose when the dialog requests close', async () => {
+      const mockOnClose = vi.fn()
+
+      render(
+        <TryApp
+          appId="test-app-id"
+          onClose={mockOnClose}
+          onCreate={vi.fn()}
+        />,
+      )
+
+      await waitFor(() => {
+        expect(screen.getByRole('dialog')).toBeInTheDocument()
+      })
+
+      fireEvent.keyDown(document, { key: 'Escape', code: 'Escape' })
+
+      expect(mockOnClose).toHaveBeenCalledTimes(1)
+    })
   })
 
   describe('create functionality', () => {
@@ -283,12 +339,12 @@ describe('TryApp (main index.tsx)', () => {
     })
   })
 
-  describe('category prop', () => {
-    it('passes category to AppInfo when provided', async () => {
+  describe('categories prop', () => {
+    it('passes categories to AppInfo when provided', async () => {
       render(
         <TryApp
           appId="test-app-id"
-          category="AI Assistant"
+          categories={['AI Assistant', 'Workflow']}
           onClose={vi.fn()}
           onCreate={vi.fn()}
         />,
@@ -296,11 +352,11 @@ describe('TryApp (main index.tsx)', () => {
 
       await waitFor(() => {
         const appInfo = document.body.querySelector('[data-testid="app-info-component"]')
-        expect(appInfo).toHaveAttribute('data-category', 'AI Assistant')
+        expect(appInfo).toHaveAttribute('data-categories', 'AI Assistant,Workflow')
       })
     })
 
-    it('does not pass category to AppInfo when not provided', async () => {
+    it('does not pass categories to AppInfo when not provided', async () => {
       render(
         <TryApp
           appId="test-app-id"
@@ -311,7 +367,7 @@ describe('TryApp (main index.tsx)', () => {
 
       await waitFor(() => {
         const appInfo = document.body.querySelector('[data-testid="app-info-component"]')
-        expect(appInfo).not.toHaveAttribute('data-category', expect.any(String))
+        expect(appInfo).not.toHaveAttribute('data-categories', expect.any(String))
       })
     })
   })
diff --git a/web/app/components/explore/try-app/app-info/__tests__/index.spec.tsx b/web/app/components/explore/try-app/app-info/__tests__/index.spec.tsx
index 599d66596b..e517dbb980 100644
--- a/web/app/components/explore/try-app/app-info/__tests__/index.spec.tsx
+++ b/web/app/components/explore/try-app/app-info/__tests__/index.spec.tsx
@@ -235,8 +235,8 @@ describe('AppInfo', () => {
     })
   })
 
-  describe('category', () => {
-    it('renders category when provided', () => {
+  describe('categories', () => {
+    it('renders categories when provided', () => {
       const appDetail = createMockAppDetail('chat')
       const mockOnCreate = vi.fn()
 
@@ -244,16 +244,17 @@ describe('AppInfo', () => {
         <AppInfo
           appId="test-app-id"
           appDetail={appDetail}
-          category="AI Assistant"
+          categories={['AI Assistant', 'Workflow']}
           onCreate={mockOnCreate}
         />,
       )
 
       expect(screen.getByText('explore.tryApp.category')).toBeInTheDocument()
       expect(screen.getByText('AI Assistant')).toBeInTheDocument()
+      expect(screen.getByText('Workflow')).toBeInTheDocument()
     })
 
-    it('does not render category section when not provided', () => {
+    it('does not render categories section when not provided', () => {
       const appDetail = createMockAppDetail('chat')
       const mockOnCreate = vi.fn()
 
diff --git a/web/app/components/explore/try-app/app-info/index.tsx b/web/app/components/explore/try-app/app-info/index.tsx
index a2c8c26e9f..c5749bee7c 100644
--- a/web/app/components/explore/try-app/app-info/index.tsx
+++ b/web/app/components/explore/try-app/app-info/index.tsx
@@ -12,7 +12,7 @@ import useGetRequirements from './use-get-requirements'
 type Props = {
   appId: string
   appDetail: TryAppInfo
-  category?: string
+  categories?: string[]
   className?: string
   onCreate: () => void
 }
@@ -52,12 +52,13 @@ const RequirementIcon: FC<RequirementIconProps> = ({ iconUrl }) => {
 const AppInfo: FC<Props> = ({
   appId,
   className,
-  category,
+  categories,
   appDetail,
   onCreate,
 }) => {
   const { t } = useTranslation()
   const mode = appDetail?.mode
+  const visibleCategories = Array.from(new Set(categories?.filter(Boolean) ?? []))
   const { requirements } = useGetRequirements({ appDetail, appId })
   return (
     <div className={cn('flex h-full flex-col px-4 pt-2', className)}>
@@ -98,10 +99,19 @@ const AppInfo: FC<Props> = ({
         <span className="truncate">{t('tryApp.createFromSampleApp', { ns: 'explore' })}</span>
       </Button>
 
-      {category && (
+      {visibleCategories.length > 0 && (
         <div className="mt-6 shrink-0">
           <div className={headerClassName}>{t('tryApp.category', { ns: 'explore' })}</div>
-          <div className="system-md-regular text-text-secondary">{category}</div>
+          <div className="flex flex-wrap gap-1.5">
+            {visibleCategories.map(category => (
+              <span
+                key={category}
+                className="rounded-md border-[0.5px] border-components-panel-border-subtle bg-components-badge-white-to-dark px-2 py-0.5 system-xs-medium text-text-secondary shadow-xs"
+              >
+                {category}
+              </span>
+            ))}
+          </div>
         </div>
       )}
       {requirements.length > 0 && (
diff --git a/web/app/components/explore/try-app/app/__tests__/chat.spec.tsx b/web/app/components/explore/try-app/app/__tests__/chat.spec.tsx
index 6335678a19..8fc2cb530e 100644
--- a/web/app/components/explore/try-app/app/__tests__/chat.spec.tsx
+++ b/web/app/components/explore/try-app/app/__tests__/chat.spec.tsx
@@ -172,7 +172,7 @@ describe('TryApp (chat.tsx)', () => {
         />,
       )
 
-      expect(screen.queryByRole('button')).not.toBeInTheDocument()
+      expect(screen.queryByRole('button', { name: 'share.chat.resetChat' })).not.toBeInTheDocument()
     })
 
     it('renders reset button when conversation exists', () => {
@@ -193,7 +193,7 @@ describe('TryApp (chat.tsx)', () => {
         />,
       )
 
-      expect(screen.getByRole('button')).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'share.chat.resetChat' })).toBeInTheDocument()
     })
 
     it('calls handleNewConversation when reset button is clicked', () => {
@@ -214,7 +214,7 @@ describe('TryApp (chat.tsx)', () => {
         />,
       )
 
-      fireEvent.click(screen.getByRole('button'))
+      fireEvent.click(screen.getByRole('button', { name: 'share.chat.resetChat' }))
 
       expect(mockRemoveConversationIdInfo).toHaveBeenCalledWith('test-app-id')
       expect(mockHandleNewConversation).toHaveBeenCalled()
diff --git a/web/app/components/explore/try-app/app/chat.tsx b/web/app/components/explore/try-app/app/chat.tsx
index 0c319b4c21..c1c404e49e 100644
--- a/web/app/components/explore/try-app/app/chat.tsx
+++ b/web/app/components/explore/try-app/app/chat.tsx
@@ -81,8 +81,12 @@ const TryApp: FC<Props> = ({
               <Tooltip>
                 <TooltipTrigger
                   render={(
-                    <ActionButton size="l" onClick={handleNewConversation}>
-                      <RiResetLeftLine className="h-[18px] w-[18px]" />
+                    <ActionButton
+                      size="l"
+                      aria-label={t('chat.resetChat', { ns: 'share' })}
+                      onClick={handleNewConversation}
+                    >
+                      <RiResetLeftLine className="h-[18px] w-[18px]" aria-hidden="true" />
                     </ActionButton>
                   )}
                 />
diff --git a/web/app/components/explore/try-app/index.tsx b/web/app/components/explore/try-app/index.tsx
index 8bb27d9086..52937f0fd7 100644
--- a/web/app/components/explore/try-app/index.tsx
+++ b/web/app/components/explore/try-app/index.tsx
@@ -3,12 +3,12 @@
 import type { FC } from 'react'
 import type { App as AppType } from '@/models/explore'
 import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { useSuspenseQuery } from '@tanstack/react-query'
 import * as React from 'react'
 import { useState } from 'react'
 import AppUnavailable from '@/app/components/base/app-unavailable'
 import Loading from '@/app/components/base/loading'
-import Modal from '@/app/components/base/modal/index'
 import { IS_CLOUD_EDITION } from '@/config'
 import { systemFeaturesQueryOptions } from '@/service/system-features'
 import { useGetTryAppInfo } from '@/service/use-try-app'
@@ -20,7 +20,7 @@ import Tab, { TypeEnum } from './tab'
 type Props = {
   appId: string
   app?: AppType
-  category?: string
+  categories?: string[]
   onClose: () => void
   onCreate: () => void
 }
@@ -28,7 +28,7 @@ type Props = {
 const TryApp: FC<Props> = ({
   appId,
   app,
-  category,
+  categories,
   onClose,
   onCreate,
 }) => {
@@ -40,54 +40,59 @@ const TryApp: FC<Props> = ({
   const { data: appDetail, isLoading, isError, error } = useGetTryAppInfo(appId)
 
   return (
-    <Modal
-      isShow
-      onClose={onClose}
-      className="h-[calc(100vh-32px)] max-w-[calc(100vw-32px)] min-w-[1280px] overflow-x-auto p-2"
+    <Dialog
+      open
+      onOpenChange={(open) => {
+        if (!open)
+          onClose()
+      }}
     >
-      {isLoading ? (
-        <div className="flex h-full items-center justify-center">
-          <Loading type="area" />
-        </div>
-      ) : isError ? (
-        <div className="flex h-full items-center justify-center">
-          <AppUnavailable className="h-auto w-auto" isUnknownReason={!error} unknownReason={error instanceof Error ? error.message : undefined} />
-        </div>
-      ) : !appDetail ? (
-        <div className="flex h-full items-center justify-center">
-          <AppUnavailable className="h-auto w-auto" isUnknownReason />
-        </div>
-      ) : (
-        <div className="flex h-full flex-col">
-          <div className="flex shrink-0 justify-between pl-4">
-            <Tab
-              value={activeType}
-              onChange={setType}
-              disableTry={app ? !isTrialApp : false}
-            />
-            <Button
-              size="large"
-              variant="tertiary"
-              className="flex size-7 items-center justify-center rounded-[10px] p-0 text-components-button-tertiary-text"
-              onClick={onClose}
-            >
-              <span className="i-ri-close-line size-5" />
-            </Button>
+      <DialogContent className="h-[calc(100dvh-32px)] max-h-[calc(100dvh-32px)] w-full max-w-[calc(100vw-32px)] min-w-[1280px] overflow-hidden overflow-x-auto border-none p-2 text-left align-middle">
+
+        {isLoading ? (
+          <div className="flex h-full items-center justify-center">
+            <Loading type="area" />
           </div>
-          {/* Main content */}
-          <div className="mt-2 flex h-0 grow justify-between space-x-2">
-            {activeType === TypeEnum.TRY ? <App appId={appId} appDetail={appDetail} /> : <Preview appId={appId} appDetail={appDetail} />}
-            <AppInfo
-              className="w-[360px] shrink-0"
-              appDetail={appDetail}
-              appId={appId}
-              category={category}
-              onCreate={onCreate}
-            />
+        ) : isError ? (
+          <div className="flex h-full items-center justify-center">
+            <AppUnavailable className="h-auto w-auto" isUnknownReason={!error} unknownReason={error instanceof Error ? error.message : undefined} />
           </div>
-        </div>
-      )}
-    </Modal>
+        ) : !appDetail ? (
+          <div className="flex h-full items-center justify-center">
+            <AppUnavailable className="h-auto w-auto" isUnknownReason />
+          </div>
+        ) : (
+          <div className="flex h-full flex-col">
+            <div className="flex shrink-0 justify-between pl-4">
+              <Tab
+                value={activeType}
+                onChange={setType}
+                disableTry={app ? !isTrialApp : false}
+              />
+              <Button
+                size="large"
+                variant="tertiary"
+                className="flex size-7 items-center justify-center rounded-[10px] p-0 text-components-button-tertiary-text"
+                onClick={onClose}
+              >
+                <span className="i-ri-close-line size-5" />
+              </Button>
+            </div>
+            {/* Main content */}
+            <div className="mt-2 flex h-0 grow justify-between space-x-2">
+              {activeType === TypeEnum.TRY ? <App appId={appId} appDetail={appDetail} /> : <Preview appId={appId} appDetail={appDetail} />}
+              <AppInfo
+                className="w-[360px] shrink-0"
+                appDetail={appDetail}
+                appId={appId}
+                categories={categories}
+                onCreate={onCreate}
+              />
+            </div>
+          </div>
+        )}
+      </DialogContent>
+    </Dialog>
   )
 }
 export default React.memo(TryApp)
diff --git a/web/app/components/header/__tests__/index.spec.tsx b/web/app/components/header/__tests__/index.spec.tsx
index ba284829f3..0e9ef6493d 100644
--- a/web/app/components/header/__tests__/index.spec.tsx
+++ b/web/app/components/header/__tests__/index.spec.tsx
@@ -45,7 +45,7 @@ vi.mock('@/app/components/header/tools-nav', () => ({
 }))
 
 vi.mock('@/app/components/header/plan-badge', () => ({
-  default: ({ onClick, plan }: { onClick?: () => void, plan?: string }) => (
+  PlanBadge: ({ onClick, plan }: { onClick?: () => void, plan?: string }) => (
     <button data-testid="plan-badge" onClick={onClick} data-plan={plan} />
   ),
 }))
diff --git a/web/app/components/header/__tests__/maintenance-notice.spec.tsx b/web/app/components/header/__tests__/maintenance-notice.spec.tsx
index 82c66a05b8..bab8c014fc 100644
--- a/web/app/components/header/__tests__/maintenance-notice.spec.tsx
+++ b/web/app/components/header/__tests__/maintenance-notice.spec.tsx
@@ -5,7 +5,7 @@ import { NOTICE_I18N } from '@/i18n-config/language'
 import MaintenanceNotice from '../maintenance-notice'
 
 vi.mock('@/app/components/base/icons/src/vender/line/general', () => ({
-  X: ({ onClick }: { onClick?: () => void }) => <button type="button" aria-label="close notice" onClick={onClick} />,
+  X: (props: React.SVGProps<SVGSVGElement>) => <svg {...props} />,
 }))
 
 vi.mock(
@@ -78,7 +78,7 @@ describe('MaintenanceNotice', () => {
       render(<MaintenanceNotice />)
       expect(screen.getByText('Notice Title')).toBeInTheDocument()
 
-      fireEvent.click(screen.getByRole('button', { name: /close notice/i }))
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.close' }))
 
       expect(screen.queryByText('Notice Title')).not.toBeInTheDocument()
       expect(localStorage.getItem('hide-maintenance-notice')).toBe('1')
@@ -88,7 +88,7 @@ describe('MaintenanceNotice', () => {
       setNoticeHref('https://dify.ai/notice')
       render(<MaintenanceNotice />)
 
-      const desc = screen.getByText('Notice Description')
+      const desc = screen.getByRole('button', { name: 'Notice Description' })
       fireEvent.click(desc)
 
       expect(windowOpenSpy).toHaveBeenCalledWith(
diff --git a/web/app/components/header/account-about/__tests__/index.spec.tsx b/web/app/components/header/account-about/__tests__/index.spec.tsx
index 694a632039..cc9508e50f 100644
--- a/web/app/components/header/account-about/__tests__/index.spec.tsx
+++ b/web/app/components/header/account-about/__tests__/index.spec.tsx
@@ -90,15 +90,9 @@ describe('AccountAbout', () => {
   describe('User Interactions', () => {
     it('should call onCancel when close button is clicked', () => {
       renderWithSystemFeatures(<AccountAbout langGeniusVersionInfo={mockVersionInfo} onCancel={mockOnCancel} />)
-      // Modal uses Headless UI Dialog which renders into a portal, so we need to use document
-      const closeButton = document.querySelector('div.absolute.cursor-pointer')
 
-      if (!closeButton)
-        throw new Error('Close button not found')
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.close' }))
 
-      fireEvent.click(closeButton)
-
-      // Assert
       expect(mockOnCancel).toHaveBeenCalled()
     })
   })
diff --git a/web/app/components/header/account-about/index.tsx b/web/app/components/header/account-about/index.tsx
index e2535144f9..a47b24a743 100644
--- a/web/app/components/header/account-about/index.tsx
+++ b/web/app/components/header/account-about/index.tsx
@@ -1,15 +1,15 @@
 'use client'
 import type { LangGeniusVersionResponse } from '@/models/common'
 import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { RiCloseLine } from '@remixicon/react'
 import { useSuspenseQuery } from '@tanstack/react-query'
 import dayjs from 'dayjs'
 import { useTranslation } from 'react-i18next'
 import DifyLogo from '@/app/components/base/logo/dify-logo'
-import Modal from '@/app/components/base/modal'
 import { IS_CE_EDITION } from '@/config'
-import Link from '@/next/link'
 
+import Link from '@/next/link'
 import { systemFeaturesQueryOptions } from '@/service/system-features'
 
 type IAccountSettingProps = {
@@ -26,87 +26,97 @@ export default function AccountAbout({
   const { data: systemFeatures } = useSuspenseQuery(systemFeaturesQueryOptions())
 
   return (
-    <Modal
-      isShow
-      onClose={onCancel}
-      className="w-[480px]! max-w-[480px]! px-6! py-4!"
+    <Dialog
+      open
+      onOpenChange={(open) => {
+        if (!open)
+          onCancel()
+      }}
     >
-      <div className="relative">
-        <div className="absolute top-0 right-0 flex h-8 w-8 cursor-pointer items-center justify-center" onClick={onCancel}>
-          <RiCloseLine className="h-4 w-4 text-text-tertiary" />
-        </div>
-        <div className="flex flex-col items-center gap-4 py-8">
-          {systemFeatures.branding.enabled && systemFeatures.branding.workspace_logo
-            ? (
-                <img
-                  src={systemFeatures.branding.workspace_logo}
-                  className="block h-7 w-auto object-contain"
-                  alt="logo"
-                />
-              )
-            : <DifyLogo size="large" className="mx-auto" />}
+      <DialogContent className="w-[calc(100vw-2rem)]! max-w-[480px]! overflow-hidden! border-none px-6! py-4! text-left align-middle">
 
-          <div className="text-center text-xs font-normal text-text-tertiary">
-            Version
-            {langGeniusVersionInfo?.current_version}
-          </div>
-          <div className="flex flex-col items-center gap-2 text-center text-xs font-normal text-text-secondary">
-            <div>
-              ©
-              {dayjs().year()}
-              {' '}
-              LangGenius, Inc., Contributors.
+        <div className="relative">
+          <button
+            type="button"
+            className="absolute top-0 right-0 flex h-8 w-8 cursor-pointer items-center justify-center border-none bg-transparent p-0 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+            aria-label={t('operation.close', { ns: 'common' })}
+            onClick={onCancel}
+          >
+            <RiCloseLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
+          </button>
+          <div className="flex flex-col items-center gap-4 py-8">
+            {systemFeatures.branding.enabled && systemFeatures.branding.workspace_logo
+              ? (
+                  <img
+                    src={systemFeatures.branding.workspace_logo}
+                    className="block h-7 w-auto object-contain"
+                    alt="logo"
+                  />
+                )
+              : <DifyLogo size="large" className="mx-auto" />}
+
+            <div className="text-center text-xs font-normal text-text-tertiary">
+              Version
+              {langGeniusVersionInfo?.current_version}
             </div>
-            <div className="text-text-accent">
+            <div className="flex flex-col items-center gap-2 text-center text-xs font-normal text-text-secondary">
+              <div>
+                ©
+                {dayjs().year()}
+                {' '}
+                LangGenius, Inc., Contributors.
+              </div>
+              <div className="text-text-accent">
+                {
+                  IS_CE_EDITION
+                    ? <Link href="https://github.com/langgenius/dify/blob/main/LICENSE" target="_blank" rel="noopener noreferrer">Open Source License</Link>
+                    : (
+                        <>
+                          <Link href="https://dify.ai/privacy" target="_blank" rel="noopener noreferrer">Privacy Policy</Link>
+                          ,&nbsp;
+                          <Link href="https://dify.ai/terms" target="_blank" rel="noopener noreferrer">Terms of Service</Link>
+                        </>
+                      )
+                }
+              </div>
+            </div>
+          </div>
+          <div className="-mx-6 mb-4 h-[0.5px] bg-divider-regular" />
+          <div className="flex items-center justify-between gap-3">
+            <div className="min-w-0 text-xs font-medium text-text-tertiary">
               {
-                IS_CE_EDITION
-                  ? <Link href="https://github.com/langgenius/dify/blob/main/LICENSE" target="_blank" rel="noopener noreferrer">Open Source License</Link>
-                  : (
-                      <>
-                        <Link href="https://dify.ai/privacy" target="_blank" rel="noopener noreferrer">Privacy Policy</Link>
-                        ,&nbsp;
-                        <Link href="https://dify.ai/terms" target="_blank" rel="noopener noreferrer">Terms of Service</Link>
-                      </>
-                    )
+                isLatest
+                  ? t('about.latestAvailable', { ns: 'common', version: langGeniusVersionInfo.latest_version })
+                  : t('about.nowAvailable', { ns: 'common', version: langGeniusVersionInfo.latest_version })
+              }
+            </div>
+            <div className="flex shrink-0 items-center">
+              <Button className="mr-2" size="small">
+                <Link
+                  href="https://github.com/langgenius/dify/releases"
+                  target="_blank"
+                  rel="noopener noreferrer"
+                >
+                  {t('about.changeLog', { ns: 'common' })}
+                </Link>
+              </Button>
+              {
+                !isLatest && !IS_CE_EDITION && (
+                  <Button variant="primary" size="small">
+                    <Link
+                      href={langGeniusVersionInfo.release_notes}
+                      target="_blank"
+                      rel="noopener noreferrer"
+                    >
+                      {t('about.updateNow', { ns: 'common' })}
+                    </Link>
+                  </Button>
+                )
               }
             </div>
           </div>
         </div>
-        <div className="-mx-8 mb-4 h-[0.5px] bg-divider-regular" />
-        <div className="flex items-center justify-between">
-          <div className="text-xs font-medium text-text-tertiary">
-            {
-              isLatest
-                ? t('about.latestAvailable', { ns: 'common', version: langGeniusVersionInfo.latest_version })
-                : t('about.nowAvailable', { ns: 'common', version: langGeniusVersionInfo.latest_version })
-            }
-          </div>
-          <div className="flex items-center">
-            <Button className="mr-2" size="small">
-              <Link
-                href="https://github.com/langgenius/dify/releases"
-                target="_blank"
-                rel="noopener noreferrer"
-              >
-                {t('about.changeLog', { ns: 'common' })}
-              </Link>
-            </Button>
-            {
-              !isLatest && !IS_CE_EDITION && (
-                <Button variant="primary" size="small">
-                  <Link
-                    href={langGeniusVersionInfo.release_notes}
-                    target="_blank"
-                    rel="noopener noreferrer"
-                  >
-                    {t('about.updateNow', { ns: 'common' })}
-                  </Link>
-                </Button>
-              )
-            }
-          </div>
-        </div>
-      </div>
-    </Modal>
+      </DialogContent>
+    </Dialog>
   )
 }
diff --git a/web/app/components/header/account-dropdown/compliance.tsx b/web/app/components/header/account-dropdown/compliance.tsx
index 75d7200666..e1e134e864 100644
--- a/web/app/components/header/account-dropdown/compliance.tsx
+++ b/web/app/components/header/account-dropdown/compliance.tsx
@@ -65,7 +65,7 @@ function ComplianceDocActionVisual({
         disabled={!canShowUpgradeTooltip}
         render={(
           <PremiumBadge color="blue" allowHover={true}>
-            <SparklesSoft className="flex h-3.5 w-3.5 items-center py-px pl-[3px] text-components-premium-badge-indigo-text-stop-0" />
+            <SparklesSoft aria-hidden="true" className="flex h-3.5 w-3.5 items-center py-px pl-[3px] text-components-premium-badge-indigo-text-stop-0" />
             <div className="px-1 system-xs-medium">
               {upgradeText}
             </div>
diff --git a/web/app/components/header/account-dropdown/workplace-selector/index.tsx b/web/app/components/header/account-dropdown/workplace-selector/index.tsx
index ae6f6729fd..934a003c4c 100644
--- a/web/app/components/header/account-dropdown/workplace-selector/index.tsx
+++ b/web/app/components/header/account-dropdown/workplace-selector/index.tsx
@@ -1,4 +1,5 @@
 import type { Plan } from '@/app/components/billing/type'
+import type { IWorkspace } from '@/models/common'
 import {
   Select,
   SelectContent,
@@ -9,12 +10,58 @@ import {
   SelectTrigger,
 } from '@langgenius/dify-ui/select'
 import { toast } from '@langgenius/dify-ui/toast'
+import { memo } from 'react'
 import { useTranslation } from 'react-i18next'
-import PlanBadge from '@/app/components/header/plan-badge'
+import { PlanBadge } from '@/app/components/header/plan-badge'
 import { useWorkspacesContext } from '@/context/workspace-context'
 import { switchWorkspace } from '@/service/common'
 import { basePath } from '@/utils/var'
 
+type WorkplaceSelectorContentProps = {
+  workspaces: IWorkspace[]
+  popupClassName?: string
+}
+
+type WorkplaceSelectorItemProps = {
+  workspace: IWorkspace
+}
+
+const WorkplaceSelectorItem = memo(({
+  workspace,
+}: WorkplaceSelectorItemProps) => (
+  <SelectItem value={workspace.id} className="gap-2 py-1 pr-2 pl-3">
+    <div className="flex h-6 w-6 shrink-0 items-center justify-center rounded-md bg-components-icon-bg-blue-solid text-[13px]">
+      <span className="h-6 bg-gradient-to-r from-components-avatar-shape-fill-stop-0 to-components-avatar-shape-fill-stop-100 bg-clip-text align-middle leading-6 font-semibold text-shadow-shadow-1 uppercase opacity-90">
+        {workspace.name[0]?.toLocaleUpperCase()}
+      </span>
+    </div>
+    <SelectItemText className="system-md-regular">{workspace.name}</SelectItemText>
+    <PlanBadge plan={workspace.plan as Plan} />
+  </SelectItem>
+))
+WorkplaceSelectorItem.displayName = 'WorkplaceSelectorItem'
+
+export const WorkplaceSelectorContent = memo(({
+  workspaces,
+  popupClassName = 'w-[280px] transition-none data-starting-style:scale-100 data-starting-style:opacity-100 data-ending-style:scale-100 data-ending-style:opacity-100',
+}: WorkplaceSelectorContentProps) => {
+  const { t } = useTranslation()
+
+  return (
+    <SelectContent popupClassName={popupClassName}>
+      <SelectGroup>
+        <SelectLabel>
+          {t('userProfile.workspace', { ns: 'common' })}
+        </SelectLabel>
+        {workspaces.map(workspace => (
+          <WorkplaceSelectorItem key={workspace.id} workspace={workspace} />
+        ))}
+      </SelectGroup>
+    </SelectContent>
+  )
+})
+WorkplaceSelectorContent.displayName = 'WorkplaceSelectorContent'
+
 const WorkplaceSelector = () => {
   const { t } = useTranslation()
   const { workspaces } = useWorkspacesContext()
@@ -55,24 +102,7 @@ const WorkplaceSelector = () => {
           </div>
         </div>
       </SelectTrigger>
-      <SelectContent popupClassName="w-[280px]">
-        <SelectGroup>
-          <SelectLabel>
-            {t('userProfile.workspace', { ns: 'common' })}
-          </SelectLabel>
-          {workspaces.map(workspace => (
-            <SelectItem key={workspace.id} value={workspace.id} className="gap-2 py-1 pr-2 pl-3">
-              <div className="flex h-6 w-6 shrink-0 items-center justify-center rounded-md bg-components-icon-bg-blue-solid text-[13px]">
-                <span className="h-6 bg-gradient-to-r from-components-avatar-shape-fill-stop-0 to-components-avatar-shape-fill-stop-100 bg-clip-text align-middle leading-6 font-semibold text-shadow-shadow-1 uppercase opacity-90">
-                  {workspace.name[0]?.toLocaleUpperCase()}
-                </span>
-              </div>
-              <SelectItemText className="system-md-regular">{workspace.name}</SelectItemText>
-              <PlanBadge plan={workspace.plan as Plan} />
-            </SelectItem>
-          ))}
-        </SelectGroup>
-      </SelectContent>
+      <WorkplaceSelectorContent workspaces={workspaces} />
     </Select>
   )
 }
diff --git a/web/app/components/header/account-setting/api-based-extension-page/__tests__/index.spec.tsx b/web/app/components/header/account-setting/api-based-extension-page/__tests__/index.spec.tsx
index adac0f7c6c..e45d6c2d16 100644
--- a/web/app/components/header/account-setting/api-based-extension-page/__tests__/index.spec.tsx
+++ b/web/app/components/header/account-setting/api-based-extension-page/__tests__/index.spec.tsx
@@ -1,8 +1,6 @@
-import type { SetStateAction } from 'react'
-import type { ModalContextState, ModalState } from '@/context/modal-context'
-import type { ApiBasedExtension } from '@/models/common'
-import { fireEvent, render, screen } from '@testing-library/react'
-import { useModalContext } from '@/context/modal-context'
+import type { ApiBasedExtensionResponse } from '@dify/contracts/api/console/api-based-extension/types.gen'
+import { fireEvent, render, screen, waitFor } from '@testing-library/react'
+import { addApiBasedExtension, updateApiBasedExtension } from '@/service/common'
 import { useApiBasedExtensions } from '@/service/use-common'
 import ApiBasedExtensionPage from '../index'
 
@@ -10,19 +8,16 @@ vi.mock('@/service/use-common', () => ({
   useApiBasedExtensions: vi.fn(),
 }))
 
-vi.mock('@/context/modal-context', () => ({
-  useModalContext: vi.fn(),
+vi.mock('@/service/common', () => ({
+  addApiBasedExtension: vi.fn(),
+  updateApiBasedExtension: vi.fn(),
 }))
 
 describe('ApiBasedExtensionPage', () => {
   const mockRefetch = vi.fn<() => void>()
-  const mockSetShowApiBasedExtensionModal = vi.fn<(value: SetStateAction<ModalState<ApiBasedExtension> | null>) => void>()
 
   beforeEach(() => {
     vi.clearAllMocks()
-    vi.mocked(useModalContext).mockReturnValue({
-      setShowApiBasedExtensionModal: mockSetShowApiBasedExtensionModal,
-    } as unknown as ModalContextState)
   })
 
   describe('Rendering', () => {
@@ -44,9 +39,9 @@ describe('ApiBasedExtensionPage', () => {
 
     it('should render list of extensions when data exists', () => {
       // Arrange
-      const mockData = [
-        { id: '1', name: 'Extension 1', api_endpoint: 'url1' },
-        { id: '2', name: 'Extension 2', api_endpoint: 'url2' },
+      const mockData: ApiBasedExtensionResponse[] = [
+        { id: '1', name: 'Extension 1', api_endpoint: 'url1', api_key: 'key1' },
+        { id: '2', name: 'Extension 2', api_endpoint: 'url2', api_key: 'key2' },
       ]
 
       vi.mocked(useApiBasedExtensions).mockReturnValue({
@@ -128,13 +123,17 @@ describe('ApiBasedExtensionPage', () => {
       fireEvent.click(screen.getByText('common.apiBasedExtension.add'))
 
       // Assert
-      expect(mockSetShowApiBasedExtensionModal).toHaveBeenCalledWith(expect.objectContaining({
-        payload: {},
-      }))
+      expect(screen.getByRole('dialog', { name: 'common.apiBasedExtension.modal.title' })).toBeInTheDocument()
     })
 
-    it('should call refetch when onSaveCallback is executed from the modal', () => {
+    it('should call refetch when add modal saves successfully', async () => {
       // Arrange
+      vi.mocked(addApiBasedExtension).mockResolvedValue({
+        id: 'new-id',
+        name: 'New Ext',
+        api_endpoint: 'https://api.test',
+        api_key: 'secret-key',
+      })
       vi.mocked(useApiBasedExtensions).mockReturnValue({
         data: [],
         isPending: false,
@@ -144,23 +143,23 @@ describe('ApiBasedExtensionPage', () => {
       // Act
       render(<ApiBasedExtensionPage />)
       fireEvent.click(screen.getByText('common.apiBasedExtension.add'))
+      fireEvent.change(screen.getByPlaceholderText('common.apiBasedExtension.modal.name.placeholder'), { target: { value: 'New Ext' } })
+      fireEvent.change(screen.getByPlaceholderText('common.apiBasedExtension.modal.apiEndpoint.placeholder'), { target: { value: 'https://api.test' } })
+      fireEvent.change(screen.getByPlaceholderText('common.apiBasedExtension.modal.apiKey.placeholder'), { target: { value: 'secret-key' } })
+      fireEvent.click(screen.getByText('common.operation.save'))
 
-      // Trigger callback manually from the mock call
-      const callArgs = mockSetShowApiBasedExtensionModal.mock.calls[0]![0]
-      if (typeof callArgs === 'object' && callArgs !== null && 'onSaveCallback' in callArgs) {
-        if (callArgs.onSaveCallback) {
-          callArgs.onSaveCallback()
-          // Assert
-          expect(mockRefetch).toHaveBeenCalled()
-        }
-      }
+      // Assert
+      await waitFor(() => {
+        expect(mockRefetch).toHaveBeenCalled()
+      })
     })
 
-    it('should call refetch when an item is updated', () => {
+    it('should call refetch when an item is updated', async () => {
       // Arrange
-      const mockData = [{ id: '1', name: 'Extension 1', api_endpoint: 'url1' }]
+      const extension: ApiBasedExtensionResponse = { id: '1', name: 'Extension 1', api_endpoint: 'url1', api_key: 'long-api-key' }
+      vi.mocked(updateApiBasedExtension).mockResolvedValue({ ...extension, name: 'Updated' })
       vi.mocked(useApiBasedExtensions).mockReturnValue({
-        data: mockData,
+        data: [extension],
         isPending: false,
         refetch: mockRefetch,
       } as unknown as ReturnType<typeof useApiBasedExtensions>)
@@ -169,16 +168,12 @@ describe('ApiBasedExtensionPage', () => {
 
       // Act - Click edit on the rendered item
       fireEvent.click(screen.getByText('common.operation.edit'))
-
-      // Retrieve the onSaveCallback from the modal call and execute it
-      const callArgs = mockSetShowApiBasedExtensionModal.mock.calls[0]![0]
-      if (typeof callArgs === 'object' && callArgs !== null && 'onSaveCallback' in callArgs) {
-        if (callArgs.onSaveCallback)
-          callArgs.onSaveCallback()
-      }
+      fireEvent.click(screen.getByText('common.operation.save'))
 
       // Assert
-      expect(mockRefetch).toHaveBeenCalled()
+      await waitFor(() => {
+        expect(mockRefetch).toHaveBeenCalled()
+      })
     })
   })
 })
diff --git a/web/app/components/header/account-setting/api-based-extension-page/__tests__/item.spec.tsx b/web/app/components/header/account-setting/api-based-extension-page/__tests__/item.spec.tsx
index 38dcf9dec5..2bbfc91c3e 100644
--- a/web/app/components/header/account-setting/api-based-extension-page/__tests__/item.spec.tsx
+++ b/web/app/components/header/account-setting/api-based-extension-page/__tests__/item.spec.tsx
@@ -1,42 +1,32 @@
+import type { ApiBasedExtensionResponse } from '@dify/contracts/api/console/api-based-extension/types.gen'
 import type { TFunction } from 'i18next'
-import type { ModalContextState } from '@/context/modal-context'
-import type { ApiBasedExtension } from '@/models/common'
 import { fireEvent, render, screen, waitFor, within } from '@testing-library/react'
 import * as reactI18next from 'react-i18next'
-import { useModalContext } from '@/context/modal-context'
 import { deleteApiBasedExtension } from '@/service/common'
 import Item from '../item'
 
-// Mock dependencies
-vi.mock('@/context/modal-context', () => ({
-  useModalContext: vi.fn(),
-}))
-
 vi.mock('@/service/common', () => ({
   deleteApiBasedExtension: vi.fn(),
 }))
 
 describe('Item Component', () => {
-  const mockData: ApiBasedExtension = {
+  const mockData: ApiBasedExtensionResponse = {
     id: '1',
     name: 'Test Extension',
     api_endpoint: 'https://api.example.com',
     api_key: 'test-api-key',
   }
   const mockOnUpdate = vi.fn()
-  const mockSetShowApiBasedExtensionModal = vi.fn()
+  const mockOnEdit = vi.fn()
 
   beforeEach(() => {
     vi.clearAllMocks()
-    vi.mocked(useModalContext).mockReturnValue({
-      setShowApiBasedExtensionModal: mockSetShowApiBasedExtensionModal,
-    } as unknown as ModalContextState)
   })
 
   describe('Rendering', () => {
     it('should render extension data correctly', () => {
       // Act
-      render(<Item data={mockData} onUpdate={mockOnUpdate} />)
+      render(<Item data={mockData} onEdit={mockOnEdit} onUpdate={mockOnUpdate} />)
 
       // Assert
       // Assert
@@ -46,10 +36,15 @@ describe('Item Component', () => {
 
     it('should render with minimal extension data', () => {
       // Arrange
-      const minimalData: ApiBasedExtension = { id: '2' }
+      const minimalData: ApiBasedExtensionResponse = {
+        id: '2',
+        name: '',
+        api_endpoint: '',
+        api_key: '',
+      }
 
       // Act
-      render(<Item data={minimalData} onUpdate={mockOnUpdate} />)
+      render(<Item data={minimalData} onEdit={mockOnEdit} onUpdate={mockOnUpdate} />)
 
       // Assert
       // Assert
@@ -59,41 +54,20 @@ describe('Item Component', () => {
   })
 
   describe('Modal Interactions', () => {
-    it('should open edit modal with correct payload when clicking edit button', () => {
+    it('should request editing with the current extension when clicking edit button', () => {
       // Act
-      render(<Item data={mockData} onUpdate={mockOnUpdate} />)
+      render(<Item data={mockData} onEdit={mockOnEdit} onUpdate={mockOnUpdate} />)
       fireEvent.click(screen.getByText('common.operation.edit'))
 
       // Assert
-      expect(mockSetShowApiBasedExtensionModal).toHaveBeenCalledWith(expect.objectContaining({
-        payload: mockData,
-      }))
-      const lastCall = mockSetShowApiBasedExtensionModal.mock.calls[0]![0]
-      if (typeof lastCall === 'object' && lastCall !== null && 'onSaveCallback' in lastCall)
-        expect(lastCall.onSaveCallback).toBeInstanceOf(Function)
-    })
-
-    it('should execute onUpdate callback when edit modal save callback is invoked', () => {
-      // Act
-      render(<Item data={mockData} onUpdate={mockOnUpdate} />)
-      fireEvent.click(screen.getByText('common.operation.edit'))
-
-      // Assert
-      const modalCallArg = mockSetShowApiBasedExtensionModal.mock.calls[0]![0]
-      if (typeof modalCallArg === 'object' && modalCallArg !== null && 'onSaveCallback' in modalCallArg) {
-        const onSaveCallback = modalCallArg.onSaveCallback
-        if (onSaveCallback) {
-          onSaveCallback()
-          expect(mockOnUpdate).toHaveBeenCalledTimes(1)
-        }
-      }
+      expect(mockOnEdit).toHaveBeenCalledWith(mockData)
     })
   })
 
   describe('Deletion', () => {
     it('should show delete confirmation dialog when clicking delete button', () => {
       // Act
-      render(<Item data={mockData} onUpdate={mockOnUpdate} />)
+      render(<Item data={mockData} onEdit={mockOnEdit} onUpdate={mockOnUpdate} />)
       fireEvent.click(screen.getByText('common.operation.delete'))
 
       // Assert
@@ -104,7 +78,7 @@ describe('Item Component', () => {
     it('should call delete API and triggers onUpdate when confirming deletion', async () => {
       // Arrange
       vi.mocked(deleteApiBasedExtension).mockResolvedValue({ result: 'success' })
-      render(<Item data={mockData} onUpdate={mockOnUpdate} />)
+      render(<Item data={mockData} onEdit={mockOnEdit} onUpdate={mockOnUpdate} />)
 
       // Act
       fireEvent.click(screen.getByText('common.operation.delete'))
@@ -124,7 +98,7 @@ describe('Item Component', () => {
     it('should hide delete confirmation dialog after successful deletion', async () => {
       // Arrange
       vi.mocked(deleteApiBasedExtension).mockResolvedValue({ result: 'success' })
-      render(<Item data={mockData} onUpdate={mockOnUpdate} />)
+      render(<Item data={mockData} onEdit={mockOnEdit} onUpdate={mockOnUpdate} />)
 
       // Act
       fireEvent.click(screen.getByText('common.operation.delete'))
@@ -142,7 +116,7 @@ describe('Item Component', () => {
 
     it('should close delete confirmation when clicking cancel button', async () => {
       // Act
-      render(<Item data={mockData} onUpdate={mockOnUpdate} />)
+      render(<Item data={mockData} onEdit={mockOnEdit} onUpdate={mockOnUpdate} />)
       fireEvent.click(screen.getByText('common.operation.delete'))
       fireEvent.click(screen.getByText('common.operation.cancel'))
 
@@ -154,7 +128,7 @@ describe('Item Component', () => {
 
     it('should not call delete API when canceling deletion', () => {
       // Act
-      render(<Item data={mockData} onUpdate={mockOnUpdate} />)
+      render(<Item data={mockData} onEdit={mockOnEdit} onUpdate={mockOnUpdate} />)
       fireEvent.click(screen.getByText('common.operation.delete'))
       fireEvent.click(screen.getByText('common.operation.cancel'))
 
@@ -183,7 +157,7 @@ describe('Item Component', () => {
       } as unknown as ReturnType<typeof reactI18next.useTranslation>)
 
       // Act
-      render(<Item data={mockData} onUpdate={mockOnUpdate} />)
+      render(<Item data={mockData} onEdit={mockOnEdit} onUpdate={mockOnUpdate} />)
       const allButtons = screen.getAllByRole('button')
       const editBtn = screen.getByText('operation.edit')
       const deleteBtn = allButtons.find(btn => btn !== editBtn)
diff --git a/web/app/components/header/account-setting/api-based-extension-page/__tests__/modal.spec.tsx b/web/app/components/header/account-setting/api-based-extension-page/__tests__/modal.spec.tsx
index e006a6be03..dcff720cdf 100644
--- a/web/app/components/header/account-setting/api-based-extension-page/__tests__/modal.spec.tsx
+++ b/web/app/components/header/account-setting/api-based-extension-page/__tests__/modal.spec.tsx
@@ -1,5 +1,6 @@
+import type { ApiBasedExtensionResponse } from '@dify/contracts/api/console/api-based-extension/types.gen'
 import type { TFunction } from 'i18next'
-import type { ReactElement } from 'react'
+import type { ComponentProps, ReactElement } from 'react'
 import { fireEvent, render as RTLRender, screen, waitFor } from '@testing-library/react'
 import * as reactI18next from 'react-i18next'
 import { useDocLink } from '@/context/i18n'
@@ -33,11 +34,31 @@ vi.mock('@langgenius/dify-ui/toast', () => ({
 }))
 
 describe('ApiBasedExtensionModal', () => {
-  const mockOnCancel = vi.fn()
+  const mockOnOpenChange = vi.fn()
   const mockOnSave = vi.fn()
   const mockDocLink = vi.fn((path?: string) => `https://docs.dify.ai${path || ''}`)
+  const mockExtension = (overrides: Partial<ApiBasedExtensionResponse> = {}): ApiBasedExtensionResponse => ({
+    id: '1',
+    name: 'Existing',
+    api_endpoint: 'url',
+    api_key: 'key',
+    ...overrides,
+  })
 
   const render = (ui: ReactElement) => RTLRender(ui)
+  const renderModal = (props: Partial<ComponentProps<typeof ApiBasedExtensionModal>> = {}) => render(
+    <ApiBasedExtensionModal
+      open
+      extension={{}}
+      onOpenChange={mockOnOpenChange}
+      onSave={mockOnSave}
+      {...props}
+    />,
+  )
+  const expectCloseRequested = () => {
+    const calls = mockOnOpenChange.mock.calls
+    expect(calls[calls.length - 1]?.[0]).toBe(false)
+  }
 
   beforeEach(() => {
     vi.clearAllMocks()
@@ -47,9 +68,10 @@ describe('ApiBasedExtensionModal', () => {
   describe('Rendering', () => {
     it('should render correctly for adding a new extension', () => {
       // Act
-      render(<ApiBasedExtensionModal data={{}} onCancel={mockOnCancel} onSave={mockOnSave} />)
+      renderModal()
 
       // Assert
+      expect(screen.getByRole('dialog', { name: 'common.apiBasedExtension.modal.title' })).toBeInTheDocument()
       expect(screen.getByText('common.apiBasedExtension.modal.title')).toBeInTheDocument()
       expect(screen.getByPlaceholderText('common.apiBasedExtension.modal.name.placeholder')).toBeInTheDocument()
       expect(screen.getByPlaceholderText('common.apiBasedExtension.modal.apiEndpoint.placeholder')).toBeInTheDocument()
@@ -58,10 +80,10 @@ describe('ApiBasedExtensionModal', () => {
 
     it('should render correctly for editing an existing extension', () => {
       // Arrange
-      const data = { id: '1', name: 'Existing', api_endpoint: 'url', api_key: 'key' }
+      const data = mockExtension()
 
       // Act
-      render(<ApiBasedExtensionModal data={data} onCancel={mockOnCancel} onSave={mockOnSave} />)
+      renderModal({ extension: data })
 
       // Assert
       expect(screen.getByText('common.apiBasedExtension.modal.editTitle')).toBeInTheDocument()
@@ -69,13 +91,27 @@ describe('ApiBasedExtensionModal', () => {
       expect(screen.getByDisplayValue('url')).toBeInTheDocument()
       expect(screen.getByDisplayValue('key')).toBeInTheDocument()
     })
+
+    it('should not render dialog content when closed', () => {
+      // Act
+      renderModal({ open: false })
+
+      // Assert
+      expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
+    })
   })
 
   describe('Form Submissions', () => {
     it('should call addApiBasedExtension on save for new extension', async () => {
       // Arrange
-      vi.mocked(addApiBasedExtension).mockResolvedValue({ id: 'new-id' })
-      render(<ApiBasedExtensionModal data={{}} onCancel={mockOnCancel} onSave={mockOnSave} />)
+      const newExtension = mockExtension({
+        id: 'new-id',
+        name: 'New Ext',
+        api_endpoint: 'https://api.test',
+        api_key: 'secret-key',
+      })
+      vi.mocked(addApiBasedExtension).mockResolvedValue(newExtension)
+      renderModal()
 
       // Act
       fireEvent.change(screen.getByPlaceholderText('common.apiBasedExtension.modal.name.placeholder'), { target: { value: 'New Ext' } })
@@ -93,15 +129,15 @@ describe('ApiBasedExtensionModal', () => {
             api_key: 'secret-key',
           },
         })
-        expect(mockOnSave).toHaveBeenCalledWith({ id: 'new-id' })
+        expect(mockOnSave).toHaveBeenCalledWith(newExtension)
       })
     })
 
     it('should call updateApiBasedExtension on save for existing extension', async () => {
       // Arrange
-      const data = { id: '1', name: 'Existing', api_endpoint: 'url', api_key: 'long-secret-key' }
+      const data = mockExtension({ api_key: 'long-secret-key' })
       vi.mocked(updateApiBasedExtension).mockResolvedValue({ ...data, name: 'Updated' })
-      render(<ApiBasedExtensionModal data={data} onCancel={mockOnCancel} onSave={mockOnSave} />)
+      renderModal({ extension: data })
 
       // Act
       fireEvent.change(screen.getByDisplayValue('Existing'), { target: { value: 'Updated' } })
@@ -111,12 +147,11 @@ describe('ApiBasedExtensionModal', () => {
       await waitFor(() => {
         expect(updateApiBasedExtension).toHaveBeenCalledWith({
           url: '/api-based-extension/1',
-          body: expect.objectContaining({
-            id: '1',
+          body: {
             name: 'Updated',
             api_endpoint: 'url',
             api_key: '[__HIDDEN__]',
-          }),
+          },
         })
         expect(mockToast.success).toHaveBeenCalledWith('common.actionMsg.modifiedSuccessfully')
         expect(mockOnSave).toHaveBeenCalled()
@@ -125,9 +160,9 @@ describe('ApiBasedExtensionModal', () => {
 
     it('should call updateApiBasedExtension with new api_key when key is changed', async () => {
       // Arrange
-      const data = { id: '1', name: 'Existing', api_endpoint: 'url', api_key: 'old-key' }
+      const data = mockExtension({ api_key: 'old-key' })
       vi.mocked(updateApiBasedExtension).mockResolvedValue({ ...data, api_key: 'new-longer-key' })
-      render(<ApiBasedExtensionModal data={data} onCancel={mockOnCancel} onSave={mockOnSave} />)
+      renderModal({ extension: data })
 
       // Act
       fireEvent.change(screen.getByDisplayValue('old-key'), { target: { value: 'new-longer-key' } })
@@ -137,9 +172,11 @@ describe('ApiBasedExtensionModal', () => {
       await waitFor(() => {
         expect(updateApiBasedExtension).toHaveBeenCalledWith({
           url: '/api-based-extension/1',
-          body: expect.objectContaining({
+          body: {
+            name: 'Existing',
+            api_endpoint: 'url',
             api_key: 'new-longer-key',
-          }),
+          },
         })
       })
     })
@@ -148,7 +185,7 @@ describe('ApiBasedExtensionModal', () => {
   describe('Validation', () => {
     it('should show error if api key is too short', async () => {
       // Arrange
-      render(<ApiBasedExtensionModal data={{}} onCancel={mockOnCancel} onSave={mockOnSave} />)
+      renderModal()
 
       // Act
       fireEvent.change(screen.getByPlaceholderText('common.apiBasedExtension.modal.name.placeholder'), { target: { value: 'Ext' } })
@@ -165,8 +202,8 @@ describe('ApiBasedExtensionModal', () => {
   describe('Interactions', () => {
     it('should work when onSave is not provided', async () => {
       // Arrange
-      vi.mocked(addApiBasedExtension).mockResolvedValue({ id: 'new-id' })
-      render(<ApiBasedExtensionModal data={{}} onCancel={mockOnCancel} />)
+      vi.mocked(addApiBasedExtension).mockResolvedValue(mockExtension({ id: 'new-id' }))
+      renderModal({ onSave: undefined })
 
       // Act
       fireEvent.change(screen.getByPlaceholderText('common.apiBasedExtension.modal.name.placeholder'), { target: { value: 'New Ext' } })
@@ -180,15 +217,56 @@ describe('ApiBasedExtensionModal', () => {
       })
     })
 
-    it('should call onCancel when clicking cancel button', () => {
+    it('should request closing when clicking cancel button', () => {
       // Arrange
-      render(<ApiBasedExtensionModal data={{}} onCancel={mockOnCancel} onSave={mockOnSave} />)
+      renderModal()
 
       // Act
       fireEvent.click(screen.getByText('common.operation.cancel'))
 
       // Assert
-      expect(mockOnCancel).toHaveBeenCalled()
+      expectCloseRequested()
+    })
+
+    it('should request closing when clicking close button', async () => {
+      // Arrange
+      renderModal()
+
+      // Act
+      fireEvent.click(screen.getByRole('button', { name: 'Close' }))
+
+      // Assert
+      await waitFor(() => {
+        expectCloseRequested()
+      })
+    })
+
+    it('should request closing when pressing Escape', async () => {
+      // Arrange
+      renderModal()
+
+      // Act
+      fireEvent.keyDown(document, { key: 'Escape' })
+
+      // Assert
+      await waitFor(() => {
+        expectCloseRequested()
+      })
+    })
+
+    it('should keep open when clicking outside the dialog', () => {
+      // Arrange
+      renderModal()
+
+      // Act
+      const backdrop = document.querySelector('.bg-background-overlay')
+      expect(backdrop).toBeInTheDocument()
+      fireEvent.pointerDown(backdrop!)
+      fireEvent.pointerUp(backdrop!)
+      fireEvent.click(backdrop!)
+
+      // Assert
+      expect(mockOnOpenChange).not.toHaveBeenCalled()
     })
   })
 
@@ -216,7 +294,7 @@ describe('ApiBasedExtensionModal', () => {
       } as unknown as ReturnType<typeof reactI18next.useTranslation>)
 
       // Act
-      const { container } = render(<ApiBasedExtensionModal data={{}} onCancel={mockOnCancel} />)
+      const { container } = renderModal({ onSave: undefined })
 
       // Assert
       const inputs = container.querySelectorAll('input')
diff --git a/web/app/components/header/account-setting/api-based-extension-page/__tests__/selector.spec.tsx b/web/app/components/header/account-setting/api-based-extension-page/__tests__/selector.spec.tsx
index 44dfdbc5a5..1eb4f9495f 100644
--- a/web/app/components/header/account-setting/api-based-extension-page/__tests__/selector.spec.tsx
+++ b/web/app/components/header/account-setting/api-based-extension-page/__tests__/selector.spec.tsx
@@ -1,9 +1,10 @@
+import type { ApiBasedExtensionResponse } from '@dify/contracts/api/console/api-based-extension/types.gen'
 import type { UseQueryResult } from '@tanstack/react-query'
 import type { ModalContextState } from '@/context/modal-context'
-import type { ApiBasedExtension } from '@/models/common'
-import { fireEvent, render, screen } from '@testing-library/react'
+import { fireEvent, render, screen, waitFor } from '@testing-library/react'
 import { ACCOUNT_SETTING_TAB } from '@/app/components/header/account-setting/constants'
 import { useModalContext } from '@/context/modal-context'
+import { addApiBasedExtension } from '@/service/common'
 import { useApiBasedExtensions } from '@/service/use-common'
 import ApiBasedExtensionSelector from '../selector'
 
@@ -15,31 +16,33 @@ vi.mock('@/service/use-common', () => ({
   useApiBasedExtensions: vi.fn(),
 }))
 
+vi.mock('@/service/common', () => ({
+  addApiBasedExtension: vi.fn(),
+}))
+
 vi.mock('@langgenius/dify-ui/popover', async () => await import('@/__mocks__/base-ui-popover'))
 
 describe('ApiBasedExtensionSelector', () => {
   const mockOnChange = vi.fn()
   const mockSetShowAccountSettingModal = vi.fn()
-  const mockSetShowApiBasedExtensionModal = vi.fn()
   const mockRefetch = vi.fn()
 
-  const mockData: ApiBasedExtension[] = [
-    { id: '1', name: 'Extension 1', api_endpoint: 'https://api1.test' },
-    { id: '2', name: 'Extension 2', api_endpoint: 'https://api2.test' },
+  const mockData: ApiBasedExtensionResponse[] = [
+    { id: '1', name: 'Extension 1', api_endpoint: 'https://api1.test', api_key: 'key1' },
+    { id: '2', name: 'Extension 2', api_endpoint: 'https://api2.test', api_key: 'key2' },
   ]
 
   beforeEach(() => {
     vi.clearAllMocks()
     vi.mocked(useModalContext).mockReturnValue({
       setShowAccountSettingModal: mockSetShowAccountSettingModal,
-      setShowApiBasedExtensionModal: mockSetShowApiBasedExtensionModal,
     } as unknown as ModalContextState)
     vi.mocked(useApiBasedExtensions).mockReturnValue({
       data: mockData,
       refetch: mockRefetch,
       isPending: false,
       isError: false,
-    } as unknown as UseQueryResult<ApiBasedExtension[], Error>)
+    } as unknown as UseQueryResult<ApiBasedExtensionResponse[], Error>)
   })
 
   describe('Rendering', () => {
@@ -103,26 +106,29 @@ describe('ApiBasedExtensionSelector', () => {
     })
 
     it('should open add modal when clicking add button and refetches on save', async () => {
+      // Arrange
+      vi.mocked(addApiBasedExtension).mockResolvedValue({
+        id: 'new-id',
+        name: 'New Ext',
+        api_endpoint: 'https://api.test',
+        api_key: 'secret-key',
+      })
+
       // Act
       render(<ApiBasedExtensionSelector value="" onChange={mockOnChange} />)
       fireEvent.click(screen.getByText('common.apiBasedExtension.selector.placeholder'))
 
       const addButton = await screen.findByText('common.operation.add')
       fireEvent.click(addButton)
+      fireEvent.change(screen.getByPlaceholderText('common.apiBasedExtension.modal.name.placeholder'), { target: { value: 'New Ext' } })
+      fireEvent.change(screen.getByPlaceholderText('common.apiBasedExtension.modal.apiEndpoint.placeholder'), { target: { value: 'https://api.test' } })
+      fireEvent.change(screen.getByPlaceholderText('common.apiBasedExtension.modal.apiKey.placeholder'), { target: { value: 'secret-key' } })
+      fireEvent.click(screen.getByText('common.operation.save'))
 
       // Assert
-      expect(mockSetShowApiBasedExtensionModal).toHaveBeenCalledWith(expect.objectContaining({
-        payload: {},
-      }))
-
-      // Trigger callback
-      const lastCall = mockSetShowApiBasedExtensionModal.mock.calls[0]![0]
-      if (typeof lastCall === 'object' && lastCall !== null && 'onSaveCallback' in lastCall) {
-        if (lastCall.onSaveCallback) {
-          lastCall.onSaveCallback()
-          expect(mockRefetch).toHaveBeenCalled()
-        }
-      }
+      await waitFor(() => {
+        expect(mockRefetch).toHaveBeenCalled()
+      })
     })
   })
 })
diff --git a/web/app/components/header/account-setting/api-based-extension-page/index.tsx b/web/app/components/header/account-setting/api-based-extension-page/index.tsx
index bc26f63838..ccef2022e7 100644
--- a/web/app/components/header/account-setting/api-based-extension-page/index.tsx
+++ b/web/app/components/header/account-setting/api-based-extension-page/index.tsx
@@ -1,24 +1,42 @@
+import type { ApiBasedExtensionResponse } from '@dify/contracts/api/console/api-based-extension/types.gen'
 import { Button } from '@langgenius/dify-ui/button'
-import {
-  RiAddLine,
-} from '@remixicon/react'
+import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { useModalContext } from '@/context/modal-context'
 import { useApiBasedExtensions } from '@/service/use-common'
 import Empty from './empty'
 import Item from './item'
+import ApiBasedExtensionModal from './modal'
+
+type ApiBasedExtensionDialogState = {
+  extension: Partial<ApiBasedExtensionResponse>
+  onSave: () => void
+} | null
 
 const ApiBasedExtensionPage = () => {
   const { t } = useTranslation()
-  const { setShowApiBasedExtensionModal } = useModalContext()
   const { data, refetch: mutate, isPending: isLoading } = useApiBasedExtensions()
+  const [dialogState, setDialogState] = useState<ApiBasedExtensionDialogState>(null)
 
   const handleOpenApiBasedExtensionModal = () => {
-    setShowApiBasedExtensionModal({
-      payload: {},
-      onSaveCallback: () => mutate(),
+    setDialogState({
+      extension: {},
+      onSave: () => mutate(),
     })
   }
+  const handleEditApiBasedExtension = (extension: ApiBasedExtensionResponse) => {
+    setDialogState({
+      extension,
+      onSave: () => mutate(),
+    })
+  }
+  const handleSaveApiBasedExtension = () => {
+    dialogState?.onSave()
+    setDialogState(null)
+  }
+  const handleApiBasedExtensionModalOpenChange = (open: boolean) => {
+    if (!open)
+      setDialogState(null)
+  }
 
   return (
     <div>
@@ -33,6 +51,7 @@ const ApiBasedExtensionPage = () => {
             <Item
               key={item.id}
               data={item}
+              onEdit={handleEditApiBasedExtension}
               onUpdate={() => mutate()}
             />
           ))
@@ -43,9 +62,19 @@ const ApiBasedExtensionPage = () => {
         className="w-full"
         onClick={handleOpenApiBasedExtensionModal}
       >
-        <RiAddLine className="mr-1 h-4 w-4" />
+        <span className="mr-1 i-ri-add-line h-4 w-4" aria-hidden="true" />
         {t('apiBasedExtension.add', { ns: 'common' })}
       </Button>
+      {
+        dialogState && (
+          <ApiBasedExtensionModal
+            open
+            extension={dialogState.extension}
+            onOpenChange={handleApiBasedExtensionModalOpenChange}
+            onSave={handleSaveApiBasedExtension}
+          />
+        )
+      }
     </div>
   )
 }
diff --git a/web/app/components/header/account-setting/api-based-extension-page/item.tsx b/web/app/components/header/account-setting/api-based-extension-page/item.tsx
index cfda9a672f..625e9ffaf3 100644
--- a/web/app/components/header/account-setting/api-based-extension-page/item.tsx
+++ b/web/app/components/header/account-setting/api-based-extension-page/item.tsx
@@ -1,5 +1,4 @@
-import type { FC } from 'react'
-import type { ApiBasedExtension } from '@/models/common'
+import type { ApiBasedExtensionResponse } from '@dify/contracts/api/console/api-based-extension/types.gen'
 import {
   AlertDialog,
   AlertDialogActions,
@@ -9,32 +8,25 @@ import {
   AlertDialogTitle,
 } from '@langgenius/dify-ui/alert-dialog'
 import { Button } from '@langgenius/dify-ui/button'
-import {
-  RiDeleteBinLine,
-  RiEditLine,
-} from '@remixicon/react'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { useModalContext } from '@/context/modal-context'
 import { deleteApiBasedExtension } from '@/service/common'
 
 type ItemProps = {
-  data: ApiBasedExtension
+  data: ApiBasedExtensionResponse
+  onEdit: (extension: ApiBasedExtensionResponse) => void
   onUpdate: () => void
 }
-const Item: FC<ItemProps> = ({
+const Item = ({
   data,
+  onEdit,
   onUpdate,
-}) => {
+}: ItemProps) => {
   const { t } = useTranslation()
-  const { setShowApiBasedExtensionModal } = useModalContext()
   const [showDeleteConfirm, setShowDeleteConfirm] = useState(false)
 
   const handleOpenApiBasedExtensionModal = () => {
-    setShowApiBasedExtensionModal({
-      payload: data,
-      onSaveCallback: () => onUpdate(),
-    })
+    onEdit(data)
   }
   const handleDeleteApiBasedExtension = async () => {
     await deleteApiBasedExtension(`/api-based-extension/${data.id}`)
@@ -44,28 +36,27 @@ const Item: FC<ItemProps> = ({
   }
 
   return (
-    <div className="group mb-2 flex items-center rounded-xl border-[0.5px] border-transparent bg-components-input-bg-normal px-4 py-2 hover:border-components-input-border-active hover:shadow-xs">
-      <div className="grow">
+    <div className="group mb-2 flex items-center rounded-xl border-[0.5px] border-transparent bg-components-input-bg-normal px-4 py-2 focus-within:border-components-input-border-active focus-within:shadow-xs hover:border-components-input-border-active hover:shadow-xs">
+      <div className="min-w-0 grow">
         <div className="mb-0.5 text-[13px] font-medium text-text-secondary">{data.name}</div>
-        <div className="text-xs text-text-tertiary">{data.api_endpoint}</div>
+        <div className="truncate text-xs text-text-tertiary">{data.api_endpoint}</div>
       </div>
-      <div className="hidden items-center group-hover:flex">
+      <div className="pointer-events-none flex shrink-0 items-center gap-1 opacity-0 transition-opacity group-focus-within:pointer-events-auto group-focus-within:opacity-100 group-hover:pointer-events-auto group-hover:opacity-100">
         <Button
-          className="mr-1"
           onClick={handleOpenApiBasedExtensionModal}
         >
-          <RiEditLine className="mr-1 h-4 w-4" />
+          <span className="mr-1 i-ri-edit-line h-4 w-4" aria-hidden="true" />
           {t('operation.edit', { ns: 'common' })}
         </Button>
         <Button
           onClick={() => setShowDeleteConfirm(true)}
         >
-          <RiDeleteBinLine className="mr-1 h-4 w-4" />
+          <span className="mr-1 i-ri-delete-bin-line h-4 w-4" aria-hidden="true" />
           {t('operation.delete', { ns: 'common' })}
         </Button>
       </div>
       <AlertDialog open={showDeleteConfirm} onOpenChange={open => !open && setShowDeleteConfirm(false)}>
-        <AlertDialogContent>
+        <AlertDialogContent backdropProps={{ forceRender: true }}>
           <div className="flex flex-col gap-2 px-6 pt-6 pb-4">
             <AlertDialogTitle className="w-full truncate title-2xl-semi-bold text-text-primary">
               {`${t('operation.delete', { ns: 'common' })} \u201C${data.name}\u201D?`}
diff --git a/web/app/components/header/account-setting/api-based-extension-page/modal.tsx b/web/app/components/header/account-setting/api-based-extension-page/modal.tsx
index b7d2e09734..ba7c6e4eb6 100644
--- a/web/app/components/header/account-setting/api-based-extension-page/modal.tsx
+++ b/web/app/components/header/account-setting/api-based-extension-page/modal.tsx
@@ -1,54 +1,57 @@
-import type { FC } from 'react'
-import type { ApiBasedExtension } from '@/models/common'
+import type {
+  ApiBasedExtensionPayload,
+  ApiBasedExtensionResponse,
+} from '@dify/contracts/api/console/api-based-extension/types.gen'
 import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogCloseButton, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
-import { noop } from 'es-toolkit/function'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { BookOpen01 } from '@/app/components/base/icons/src/vender/line/education'
-import Modal from '@/app/components/base/modal'
 import { useDocLink } from '@/context/i18n'
 import { addApiBasedExtension, updateApiBasedExtension } from '@/service/common'
 
-export type ApiBasedExtensionData = {
-  name?: string
-  apiEndpoint?: string
-  apiKey?: string
-}
+type ApiBasedExtensionField = 'name' | 'api_endpoint' | 'api_key'
+
 type ApiBasedExtensionModalProps = {
-  data: ApiBasedExtension
-  onCancel: () => void
-  onSave?: (newData: ApiBasedExtension) => void
+  open: boolean
+  extension: Partial<ApiBasedExtensionResponse>
+  onOpenChange: (open: boolean) => void
+  onSave?: (newData: ApiBasedExtensionResponse) => void
 }
-const ApiBasedExtensionModal: FC<ApiBasedExtensionModalProps> = ({ data, onCancel, onSave }) => {
+const ApiBasedExtensionModal = ({ open, extension, onOpenChange, onSave }: ApiBasedExtensionModalProps) => {
   const { t } = useTranslation()
   const docLink = useDocLink()
-  const [localeData, setLocaleData] = useState(data)
+  const [localData, setLocalData] = useState(extension)
   const [loading, setLoading] = useState(false)
-  const handleDataChange = (type: string, value: string) => {
-    setLocaleData({ ...localeData, [type]: value })
+  const handleDataChange = (field: ApiBasedExtensionField, value: string) => {
+    setLocalData({ ...localData, [field]: value })
   }
   const handleSave = async () => {
     setLoading(true)
-    if (localeData && localeData.api_key && localeData.api_key?.length < 5) {
+    if (localData.api_key && localData.api_key.length < 5) {
       toast.error(t('apiBasedExtension.modal.apiKey.lengthError', { ns: 'common' }))
       setLoading(false)
       return
     }
     try {
-      let res: ApiBasedExtension = {}
-      if (!data.id) {
+      const payload: ApiBasedExtensionPayload = {
+        name: localData.name || '',
+        api_endpoint: localData.api_endpoint || '',
+        api_key: localData.api_key || '',
+      }
+      let res = {} as ApiBasedExtensionResponse
+      if (!extension.id) {
         res = await addApiBasedExtension({
           url: '/api-based-extension',
-          body: localeData,
+          body: payload,
         })
       }
       else {
         res = await updateApiBasedExtension({
-          url: `/api-based-extension/${data.id}`,
+          url: `/api-based-extension/${extension.id}`,
           body: {
-            ...localeData,
-            api_key: data.api_key === localeData.api_key ? '[__HIDDEN__]' : localeData.api_key,
+            ...payload,
+            api_key: extension.api_key === localData.api_key ? '[__HIDDEN__]' : payload.api_key,
           },
         })
         toast.success(t('actionMsg.modifiedSuccessfully', { ns: 'common' }))
@@ -60,46 +63,52 @@ const ApiBasedExtensionModal: FC<ApiBasedExtensionModalProps> = ({ data, onCance
       setLoading(false)
     }
   }
+
   return (
-    <Modal isShow onClose={noop} wrapperClassName="z-1002" className="w-[640px]! max-w-none! p-8! pb-6!">
-      <div className="mb-2 text-xl font-semibold text-text-primary">
-        {data.name
-          ? t('apiBasedExtension.modal.editTitle', { ns: 'common' })
-          : t('apiBasedExtension.modal.title', { ns: 'common' })}
-      </div>
-      <div className="py-2">
-        <div className="text-sm leading-9 font-medium text-text-primary">
-          {t('apiBasedExtension.modal.name.title', { ns: 'common' })}
+    <Dialog open={open} onOpenChange={onOpenChange} disablePointerDismissal>
+      <DialogContent
+        backdropProps={{ forceRender: true }}
+        className="w-160 border-none p-8 pb-6 text-left"
+      >
+        <DialogCloseButton />
+
+        <DialogTitle className="mb-2 pr-8 text-xl font-semibold text-text-primary">
+          {extension.name
+            ? t('apiBasedExtension.modal.editTitle', { ns: 'common' })
+            : t('apiBasedExtension.modal.title', { ns: 'common' })}
+        </DialogTitle>
+        <div className="py-2">
+          <div className="text-sm leading-9 font-medium text-text-primary">
+            {t('apiBasedExtension.modal.name.title', { ns: 'common' })}
+          </div>
+          <input value={localData.name || ''} onChange={e => handleDataChange('name', e.target.value)} className="block h-9 w-full appearance-none rounded-lg bg-components-input-bg-normal px-3 text-sm text-text-primary outline-hidden" placeholder={t('apiBasedExtension.modal.name.placeholder', { ns: 'common' }) || ''} />
         </div>
-        <input value={localeData.name || ''} onChange={e => handleDataChange('name', e.target.value)} className="block h-9 w-full appearance-none rounded-lg bg-components-input-bg-normal px-3 text-sm text-text-primary outline-hidden" placeholder={t('apiBasedExtension.modal.name.placeholder', { ns: 'common' }) || ''} />
-      </div>
-      <div className="py-2">
-        <div className="flex h-9 items-center justify-between text-sm font-medium text-text-primary">
-          {t('apiBasedExtension.modal.apiEndpoint.title', { ns: 'common' })}
-          <a href={docLink('/use-dify/workspace/api-extension/api-extension')} target="_blank" rel="noopener noreferrer" className="group flex items-center text-xs font-normal text-text-accent">
-            <BookOpen01 className="mr-1 h-3 w-3" />
-            {t('apiBasedExtension.link', { ns: 'common' })}
-          </a>
+        <div className="py-2">
+          <div className="flex h-9 items-center justify-between text-sm font-medium text-text-primary">
+            {t('apiBasedExtension.modal.apiEndpoint.title', { ns: 'common' })}
+            <a href={docLink('/use-dify/workspace/api-extension/api-extension')} target="_blank" rel="noopener noreferrer" className="flex items-center text-xs font-normal text-text-accent">
+              <span className="mr-1 i-custom-vender-line-education-book-open-01 h-3 w-3" aria-hidden="true" />
+              {t('apiBasedExtension.link', { ns: 'common' })}
+            </a>
+          </div>
+          <input value={localData.api_endpoint || ''} onChange={e => handleDataChange('api_endpoint', e.target.value)} className="block h-9 w-full appearance-none rounded-lg bg-components-input-bg-normal px-3 text-sm text-text-primary outline-hidden" placeholder={t('apiBasedExtension.modal.apiEndpoint.placeholder', { ns: 'common' }) || ''} />
         </div>
-        <input value={localeData.api_endpoint || ''} onChange={e => handleDataChange('api_endpoint', e.target.value)} className="block h-9 w-full appearance-none rounded-lg bg-components-input-bg-normal px-3 text-sm text-text-primary outline-hidden" placeholder={t('apiBasedExtension.modal.apiEndpoint.placeholder', { ns: 'common' }) || ''} />
-      </div>
-      <div className="py-2">
-        <div className="text-sm leading-9 font-medium text-text-primary">
-          {t('apiBasedExtension.modal.apiKey.title', { ns: 'common' })}
+        <div className="py-2">
+          <div className="text-sm leading-9 font-medium text-text-primary">
+            {t('apiBasedExtension.modal.apiKey.title', { ns: 'common' })}
+          </div>
+          <input value={localData.api_key || ''} onChange={e => handleDataChange('api_key', e.target.value)} className="block h-9 w-full appearance-none rounded-lg bg-components-input-bg-normal px-3 text-sm text-text-primary outline-hidden" placeholder={t('apiBasedExtension.modal.apiKey.placeholder', { ns: 'common' }) || ''} />
         </div>
-        <div className="flex items-center">
-          <input value={localeData.api_key || ''} onChange={e => handleDataChange('api_key', e.target.value)} className="mr-2 block h-9 grow appearance-none rounded-lg bg-components-input-bg-normal px-3 text-sm text-text-primary outline-hidden" placeholder={t('apiBasedExtension.modal.apiKey.placeholder', { ns: 'common' }) || ''} />
+        <div className="mt-6 flex items-center justify-end gap-2">
+          <Button onClick={() => onOpenChange(false)}>
+            {t('operation.cancel', { ns: 'common' })}
+          </Button>
+          <Button variant="primary" disabled={!localData.name || !localData.api_endpoint || !localData.api_key || loading} onClick={handleSave}>
+            {t('operation.save', { ns: 'common' })}
+          </Button>
         </div>
-      </div>
-      <div className="mt-6 flex items-center justify-end">
-        <Button onClick={onCancel} className="mr-2">
-          {t('operation.cancel', { ns: 'common' })}
-        </Button>
-        <Button variant="primary" disabled={!localeData.name || !localeData.api_endpoint || !localeData.api_key || loading} onClick={handleSave}>
-          {t('operation.save', { ns: 'common' })}
-        </Button>
-      </div>
-    </Modal>
+      </DialogContent>
+    </Dialog>
   )
 }
 export default ApiBasedExtensionModal
diff --git a/web/app/components/header/account-setting/api-based-extension-page/selector.tsx b/web/app/components/header/account-setting/api-based-extension-page/selector.tsx
index 3f207ef23f..e98ff593cf 100644
--- a/web/app/components/header/account-setting/api-based-extension-page/selector.tsx
+++ b/web/app/components/header/account-setting/api-based-extension-page/selector.tsx
@@ -1,32 +1,25 @@
-import type { FC } from 'react'
 import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
-import {
-  RiAddLine,
-  RiArrowDownSLine,
-} from '@remixicon/react'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import {
-  ArrowUpRight,
-} from '@/app/components/base/icons/src/vender/line/arrows'
 import { ACCOUNT_SETTING_TAB } from '@/app/components/header/account-setting/constants'
 import { useModalContext } from '@/context/modal-context'
 import { useApiBasedExtensions } from '@/service/use-common'
+import ApiBasedExtensionModal from './modal'
 
 type ApiBasedExtensionSelectorProps = {
   value: string
   onChange: (value: string) => void
 }
 
-const ApiBasedExtensionSelector: FC<ApiBasedExtensionSelectorProps> = ({
+const ApiBasedExtensionSelector = ({
   value,
   onChange,
-}) => {
+}: ApiBasedExtensionSelectorProps) => {
   const { t } = useTranslation()
   const [open, setOpen] = useState(false)
+  const [addModalOpen, setAddModalOpen] = useState(false)
   const {
     setShowAccountSettingModal,
-    setShowApiBasedExtensionModal,
   } = useModalContext()
   const { data, refetch: mutate } = useApiBasedExtensions()
   const handleSelect = (id: string) => {
@@ -36,91 +29,115 @@ const ApiBasedExtensionSelector: FC<ApiBasedExtensionSelectorProps> = ({
 
   const currentItem = data?.find(item => item.id === value)
 
+  const handleSaveApiBasedExtension = () => {
+    mutate()
+    setAddModalOpen(false)
+  }
+  const handleAddModalOpenChange = (nextOpen: boolean) => {
+    if (!nextOpen)
+      setAddModalOpen(false)
+  }
+
   return (
-    <Popover
-      open={open}
-      onOpenChange={setOpen}
-    >
-      <PopoverTrigger
-        render={(
-          <button type="button" className="block w-full border-0 bg-transparent p-0 text-left">
-            {
-              currentItem
-                ? (
-                    <div className="flex h-9 cursor-pointer items-center justify-between rounded-lg bg-components-input-bg-normal pr-2.5 pl-3">
-                      <div className="text-sm text-text-primary">{currentItem.name}</div>
-                      <div className="flex items-center">
-                        <div className="mr-1.5 w-[270px] truncate text-right text-xs text-text-quaternary">
-                          {currentItem.api_endpoint}
-                        </div>
-                        <RiArrowDownSLine className={`h-4 w-4 text-text-secondary ${!open && 'opacity-60'}`} />
-                      </div>
-                    </div>
-                  )
-                : (
-                    <div className="flex h-9 cursor-pointer items-center justify-between rounded-lg bg-components-input-bg-normal pr-2.5 pl-3 text-sm text-text-quaternary">
-                      {t('apiBasedExtension.selector.placeholder', { ns: 'common' })}
-                      <RiArrowDownSLine className={`h-4 w-4 text-text-secondary ${!open && 'opacity-60'}`} />
-                    </div>
-                  )
-            }
-          </button>
-        )}
-      />
-      <PopoverContent
-        placement="bottom-start"
-        sideOffset={4}
-        className="w-[calc(100%-32px)] max-w-[576px]"
-        popupClassName="border-0 bg-transparent p-0 shadow-none backdrop-blur-none"
+    <>
+      <Popover
+        open={open}
+        onOpenChange={setOpen}
       >
-        <div className="z-10 w-full rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-lg">
-          <div className="p-1">
-            <div className="flex items-center justify-between px-3 pt-2 pb-1">
-              <div className="text-xs font-medium text-text-tertiary">
-                {t('apiBasedExtension.selector.title', { ns: 'common' })}
+        <PopoverTrigger
+          render={(
+            <button type="button" className="block w-full border-0 bg-transparent p-0 text-left">
+              {
+                currentItem
+                  ? (
+                      <div className="flex h-9 cursor-pointer items-center justify-between rounded-lg bg-components-input-bg-normal pr-2.5 pl-3">
+                        <div className="text-sm text-text-primary">{currentItem.name}</div>
+                        <div className="flex items-center">
+                          <div className="mr-1.5 w-[270px] truncate text-right text-xs text-text-quaternary">
+                            {currentItem.api_endpoint}
+                          </div>
+                          <span className={`i-ri-arrow-down-s-line h-4 w-4 text-text-secondary ${!open && 'opacity-60'}`} aria-hidden="true" />
+                        </div>
+                      </div>
+                    )
+                  : (
+                      <div className="flex h-9 cursor-pointer items-center justify-between rounded-lg bg-components-input-bg-normal pr-2.5 pl-3 text-sm text-text-quaternary">
+                        {t('apiBasedExtension.selector.placeholder', { ns: 'common' })}
+                        <span className={`i-ri-arrow-down-s-line h-4 w-4 text-text-secondary ${!open && 'opacity-60'}`} aria-hidden="true" />
+                      </div>
+                    )
+              }
+            </button>
+          )}
+        />
+        <PopoverContent
+          placement="bottom-start"
+          sideOffset={4}
+          className="w-[calc(100%-32px)] max-w-[576px]"
+          popupClassName="border-0 bg-transparent p-0 shadow-none backdrop-blur-none"
+        >
+          <div className="z-10 w-full rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-lg">
+            <div className="p-1">
+              <div className="flex items-center justify-between px-3 pt-2 pb-1">
+                <div className="text-xs font-medium text-text-tertiary">
+                  {t('apiBasedExtension.selector.title', { ns: 'common' })}
+                </div>
+                <button
+                  type="button"
+                  className="flex cursor-pointer items-center border-none bg-transparent p-0 text-xs text-text-accent"
+                  onClick={() => {
+                    setOpen(false)
+                    setShowAccountSettingModal({ payload: ACCOUNT_SETTING_TAB.API_BASED_EXTENSION })
+                  }}
+                >
+                  {t('apiBasedExtension.selector.manage', { ns: 'common' })}
+                  <span className="ml-0.5 i-custom-vender-line-arrows-arrow-up-right h-3 w-3" aria-hidden="true" />
+                </button>
               </div>
-              <div
-                className="flex cursor-pointer items-center text-xs text-text-accent"
+              <div className="max-h-[250px] overflow-y-auto">
+                {
+                  data?.map(item => (
+                    <button
+                      type="button"
+                      key={item.id}
+                      className="w-full cursor-pointer rounded-md border-none bg-transparent px-3 py-1.5 text-left hover:bg-state-base-hover"
+                      onClick={() => handleSelect(item.id!)}
+                    >
+                      <div className="text-sm text-text-primary">{item.name}</div>
+                      <div className="text-xs text-text-tertiary">{item.api_endpoint}</div>
+                    </button>
+                  ))
+                }
+              </div>
+            </div>
+            <div className="h-px bg-divider-regular" />
+            <div className="p-1">
+              <button
+                type="button"
+                className="flex h-8 w-full cursor-pointer items-center border-none bg-transparent px-3 text-left text-sm text-text-accent"
                 onClick={() => {
                   setOpen(false)
-                  setShowAccountSettingModal({ payload: ACCOUNT_SETTING_TAB.API_BASED_EXTENSION })
+                  setAddModalOpen(true)
                 }}
               >
-                {t('apiBasedExtension.selector.manage', { ns: 'common' })}
-                <ArrowUpRight className="ml-0.5 h-3 w-3" />
-              </div>
-            </div>
-            <div className="max-h-[250px] overflow-y-auto">
-              {
-                data?.map(item => (
-                  <div
-                    key={item.id}
-                    className="w-full cursor-pointer rounded-md px-3 py-1.5 text-left hover:stroke-state-base-hover"
-                    onClick={() => handleSelect(item.id!)}
-                  >
-                    <div className="text-sm text-text-primary">{item.name}</div>
-                    <div className="text-xs text-text-tertiary">{item.api_endpoint}</div>
-                  </div>
-                ))
-              }
+                <span className="mr-2 i-ri-add-line h-4 w-4" aria-hidden="true" />
+                {t('operation.add', { ns: 'common' })}
+              </button>
             </div>
           </div>
-          <div className="h-px bg-divider-regular" />
-          <div className="p-1">
-            <div
-              className="flex h-8 cursor-pointer items-center px-3 text-sm text-text-accent"
-              onClick={() => {
-                setOpen(false)
-                setShowApiBasedExtensionModal({ payload: {}, onSaveCallback: () => mutate() })
-              }}
-            >
-              <RiAddLine className="mr-2 h-4 w-4" />
-              {t('operation.add', { ns: 'common' })}
-            </div>
-          </div>
-        </div>
-      </PopoverContent>
-    </Popover>
+        </PopoverContent>
+      </Popover>
+      {
+        addModalOpen && (
+          <ApiBasedExtensionModal
+            open
+            extension={{}}
+            onOpenChange={handleAddModalOpenChange}
+            onSave={handleSaveApiBasedExtension}
+          />
+        )
+      }
+    </>
   )
 }
 
diff --git a/web/app/components/header/account-setting/collapse/__tests__/index.spec.tsx b/web/app/components/header/account-setting/collapse/__tests__/index.spec.tsx
index d39f70d0a9..4cce58d83a 100644
--- a/web/app/components/header/account-setting/collapse/__tests__/index.spec.tsx
+++ b/web/app/components/header/account-setting/collapse/__tests__/index.spec.tsx
@@ -68,12 +68,12 @@ describe('Collapse', () => {
       expect(screen.queryByTestId('item-1')).not.toBeInTheDocument()
 
       // Click to open
-      fireEvent.click(screen.getByText('Test Title'))
+      fireEvent.click(screen.getByRole('button', { name: 'Test Title' }))
       expect(screen.getByTestId('item-1')).toBeInTheDocument()
       expect(screen.getByTestId('item-2')).toBeInTheDocument()
 
       // Click to close
-      fireEvent.click(screen.getByText('Test Title'))
+      fireEvent.click(screen.getByRole('button', { name: 'Test Title' }))
       expect(screen.queryByTestId('item-1')).not.toBeInTheDocument()
     })
 
@@ -89,7 +89,7 @@ describe('Collapse', () => {
       )
 
       // Act
-      fireEvent.click(screen.getByText('Test Title'))
+      fireEvent.click(screen.getByRole('button', { name: 'Test Title' }))
       const item1 = screen.getByTestId('item-1')
       fireEvent.click(item1)
 
@@ -109,7 +109,7 @@ describe('Collapse', () => {
       )
 
       // Act
-      fireEvent.click(screen.getByText('Test Title'))
+      fireEvent.click(screen.getByRole('button', { name: 'Test Title' }))
       const item1 = screen.getByTestId('item-1')
       fireEvent.click(item1)
 
diff --git a/web/app/components/header/account-setting/collapse/index.tsx b/web/app/components/header/account-setting/collapse/index.tsx
index f7cf1edcc8..78003bad3a 100644
--- a/web/app/components/header/account-setting/collapse/index.tsx
+++ b/web/app/components/header/account-setting/collapse/index.tsx
@@ -26,22 +26,31 @@ const Collapse = ({
 
   return (
     <div className={cn('overflow-hidden rounded-xl bg-background-section-burn', wrapperClassName)}>
-      <div className="flex cursor-pointer items-center justify-between px-3 py-2 text-xs leading-[18px] font-medium text-text-secondary" onClick={toggle}>
+      <button
+        type="button"
+        className="flex w-full cursor-pointer items-center justify-between border-none bg-transparent px-3 py-2 text-left text-xs leading-[18px] font-medium text-text-secondary focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+        onClick={toggle}
+      >
         {title}
         {
           open
-            ? <ChevronDownIcon className="h-3 w-3 text-components-button-tertiary-text" />
-            : <ChevronRightIcon className="h-3 w-3 text-components-button-tertiary-text" />
+            ? <ChevronDownIcon className="h-3 w-3 text-components-button-tertiary-text" aria-hidden="true" />
+            : <ChevronRightIcon className="h-3 w-3 text-components-button-tertiary-text" aria-hidden="true" />
         }
-      </div>
+      </button>
       {
         open && (
           <div className="mx-1 mb-1 rounded-lg border-t border-divider-subtle bg-components-panel-on-panel-item-bg py-1">
             {
               items.map(item => (
-                <div key={item.key} onClick={() => onSelect?.(item)}>
+                <button
+                  key={item.key}
+                  type="button"
+                  className="block w-full border-none bg-transparent p-0 text-left"
+                  onClick={() => onSelect?.(item)}
+                >
                   {renderItem(item)}
-                </div>
+                </button>
               ))
             }
           </div>
diff --git a/web/app/components/header/account-setting/data-source-page-new/install-from-marketplace.tsx b/web/app/components/header/account-setting/data-source-page-new/install-from-marketplace.tsx
index d952559fbf..9deff0cc1f 100644
--- a/web/app/components/header/account-setting/data-source-page-new/install-from-marketplace.tsx
+++ b/web/app/components/header/account-setting/data-source-page-new/install-from-marketplace.tsx
@@ -48,10 +48,15 @@ const InstallFromMarketplace = ({
     <div className="mb-2">
       <Divider className="mt-4! h-px" />
       <div className="flex items-center justify-between">
-        <div className="flex cursor-pointer items-center gap-1 system-md-semibold text-text-primary" onClick={() => setCollapse(!collapse)}>
-          <RiArrowDownSLine className={cn('h-4 w-4', collapse && '-rotate-90')} />
+        <button
+          type="button"
+          aria-expanded={!collapse}
+          className="flex cursor-pointer items-center gap-1 border-none bg-transparent p-0 text-left system-md-semibold text-text-primary"
+          onClick={() => setCollapse(!collapse)}
+        >
+          <RiArrowDownSLine className={cn('h-4 w-4', collapse && '-rotate-90')} aria-hidden="true" />
           {t('modelProvider.installDataSourceProvider', { ns: 'common' })}
-        </div>
+        </button>
         <div className="mb-2 flex items-center pt-2">
           <span className="pr-1 system-sm-regular text-text-tertiary">{t('modelProvider.discoverMore', { ns: 'common' })}</span>
           <Link target="_blank" href={getMarketplaceUrl('', { theme })} className="inline-flex items-center system-sm-medium text-text-accent">
diff --git a/web/app/components/header/account-setting/language-page/index.tsx b/web/app/components/header/account-setting/language-page/index.tsx
index 1197fbd283..5708a2c547 100644
--- a/web/app/components/header/account-setting/language-page/index.tsx
+++ b/web/app/components/header/account-setting/language-page/index.tsx
@@ -85,7 +85,7 @@ export default function LanguagePage() {
           <SelectTrigger size="large">
             {selectedLanguage?.name ?? t('placeholder.select', { ns: 'common' })}
           </SelectTrigger>
-          <SelectContent popupClassName="w-(--anchor-width)">
+          <SelectContent>
             {languageOptions.map(item => (
               <SelectItem key={item.value} value={item.value}>
                 <SelectItemText>{item.name}</SelectItemText>
@@ -111,7 +111,7 @@ export default function LanguagePage() {
           <SelectTrigger size="large">
             {selectedTimezone?.name ?? t('placeholder.select', { ns: 'common' })}
           </SelectTrigger>
-          <SelectContent popupClassName="w-(--anchor-width)">
+          <SelectContent>
             {timezones.map(item => (
               <SelectItem key={item.value} value={String(item.value)}>
                 <SelectItemText>{item.name}</SelectItemText>
diff --git a/web/app/components/header/account-setting/members-page/__tests__/index.spec.tsx b/web/app/components/header/account-setting/members-page/__tests__/index.spec.tsx
index c09f32ea83..e129800487 100644
--- a/web/app/components/header/account-setting/members-page/__tests__/index.spec.tsx
+++ b/web/app/components/header/account-setting/members-page/__tests__/index.spec.tsx
@@ -52,7 +52,13 @@ vi.mock('../invited-modal', () => ({
   ),
 }))
 vi.mock('../operation', () => ({
-  default: () => <div>Member Operation</div>,
+  default: ({ member }: { member: Member }) => (
+    <div>
+      Member Operation
+      {' '}
+      {member.role}
+    </div>
+  ),
 }))
 vi.mock('../operation/transfer-ownership', () => ({
   default: ({ onOperate }: { onOperate: () => void }) => <button onClick={onOperate}>Transfer ownership</button>,
@@ -200,7 +206,7 @@ describe('MembersPage', () => {
 
     renderMembersPage()
 
-    await user.click(screen.getByTestId('edit-workspace-pencil'))
+    await user.click(screen.getByRole('button', { name: /account\.editWorkspaceInfo/i }))
     expect(screen.getByText('Edit Workspace Modal'))!.toBeInTheDocument()
 
     await user.click(screen.getByRole('button', { name: 'Close Edit Workspace' }))
@@ -296,6 +302,37 @@ describe('MembersPage', () => {
     expect(screen.queryByRole('button', { name: /transfer ownership/i })).not.toBeInTheDocument()
   })
 
+  it('should allow admins to operate other non-owner members only', () => {
+    vi.mocked(useAppContext).mockReturnValue({
+      userProfile: { email: 'admin@example.com' },
+      currentWorkspace: { name: 'Test Workspace', role: 'admin' } as ICurrentWorkspace,
+      isCurrentWorkspaceOwner: false,
+      isCurrentWorkspaceManager: true,
+    } as unknown as AppContextValue)
+    vi.mocked(useMembers).mockReturnValue({
+      data: {
+        accounts: [
+          mockAccounts[0],
+          mockAccounts[1],
+          { ...mockAccounts[1]!, id: '3', email: 'editor@example.com', name: 'Editor User', role: 'editor' },
+          { ...mockAccounts[1]!, id: '4', email: 'normal@example.com', name: 'Normal User', role: 'normal' },
+          { ...mockAccounts[1]!, id: '5', email: 'dataset@example.com', name: 'Dataset User', role: 'dataset_operator' },
+          { ...mockAccounts[1]!, id: '6', email: 'other-admin@example.com', name: 'Other Admin User', role: 'admin' },
+        ],
+      },
+      refetch: mockRefetch,
+    } as unknown as ReturnType<typeof useMembers>)
+
+    renderMembersPage()
+
+    expect(screen.getByText('Member Operation editor'))!.toBeInTheDocument()
+    expect(screen.getByText('Member Operation normal'))!.toBeInTheDocument()
+    expect(screen.getByText('Member Operation dataset_operator'))!.toBeInTheDocument()
+    expect(screen.getByText('Member Operation admin'))!.toBeInTheDocument()
+    expect(screen.getAllByText('common.members.admin')).toHaveLength(1)
+    expect(screen.queryByText('Member Operation owner')).not.toBeInTheDocument()
+  })
+
   it('should use created_at as fallback when last_active_at is empty', () => {
     const memberNoLastActive: Member = {
       ...mockAccounts[1]!,
diff --git a/web/app/components/header/account-setting/members-page/edit-workspace-modal/__tests__/index.spec.tsx b/web/app/components/header/account-setting/members-page/edit-workspace-modal/__tests__/index.spec.tsx
index 206a7c0148..1b85319613 100644
--- a/web/app/components/header/account-setting/members-page/edit-workspace-modal/__tests__/index.spec.tsx
+++ b/web/app/components/header/account-setting/members-page/edit-workspace-modal/__tests__/index.spec.tsx
@@ -11,6 +11,8 @@ const toastMocks = vi.hoisted(() => ({
   mockNotify: vi.fn(),
 }))
 
+const getSaveButton = () => screen.getByRole('button', { name: /operation\.(save|saving)/i })
+
 vi.mock('@/context/app-context')
 vi.mock('@/service/common')
 vi.mock('@langgenius/dify-ui/toast', () => ({
@@ -57,7 +59,7 @@ describe('EditWorkspaceModal', () => {
   it('should render on the dify-ui overlay layer', async () => {
     renderModal()
 
-    expect(await screen.findByRole('dialog')).toHaveClass('z-1002')
+    expect(await screen.findByRole('dialog')).toHaveClass('z-50')
   })
 
   it('should let user edit workspace name', async () => {
@@ -83,7 +85,7 @@ describe('EditWorkspaceModal', () => {
     const input = screen.getByLabelText(/account\.workspaceName/i)
     await user.clear(input)
     await user.type(input, 'Renamed Workspace')
-    await user.click(screen.getByTestId('edit-workspace-save'))
+    await user.click(getSaveButton())
 
     await waitFor(() => {
       expect(updateWorkspaceInfo).toHaveBeenCalledWith({
@@ -106,7 +108,7 @@ describe('EditWorkspaceModal', () => {
     const input = screen.getByLabelText(/account\.workspaceName/i)
     await user.clear(input)
     await user.type(input, 'Broken Workspace')
-    await user.click(screen.getByTestId('edit-workspace-save'))
+    await user.click(getSaveButton())
 
     await waitFor(() => {
       expect(mockNotify).toHaveBeenCalledWith(expect.objectContaining({
@@ -118,7 +120,7 @@ describe('EditWorkspaceModal', () => {
   it('should disable save button when there are no changes', async () => {
     renderModal()
 
-    expect(screen.getByTestId('edit-workspace-save')).toBeDisabled()
+    expect(getSaveButton()).toBeDisabled()
   })
 
   it('should disable save button and show error when the name is empty', async () => {
@@ -129,7 +131,7 @@ describe('EditWorkspaceModal', () => {
     const input = screen.getByLabelText(/account\.workspaceName/i)
     await user.clear(input)
 
-    expect(screen.getByTestId('edit-workspace-save')).toBeDisabled()
+    expect(getSaveButton()).toBeDisabled()
     expect(input).toHaveAttribute('aria-invalid', 'true')
     expect(screen.getByTestId('edit-workspace-error')).toBeInTheDocument()
   })
@@ -137,7 +139,7 @@ describe('EditWorkspaceModal', () => {
   it('should not submit when the form is submitted while save is disabled', async () => {
     renderModal()
 
-    const saveButton = screen.getByTestId('edit-workspace-save')
+    const saveButton = getSaveButton()
     const form = saveButton.closest('form')
 
     expect(saveButton).toBeDisabled()
@@ -157,14 +159,14 @@ describe('EditWorkspaceModal', () => {
 
     renderModal()
 
-    expect(screen.getByTestId('edit-workspace-save')).toBeDisabled()
+    expect(getSaveButton()).toBeDisabled()
   })
 
   it('should call onCancel when close icon is clicked', async () => {
     const user = userEvent.setup()
     renderModal()
 
-    await user.click(screen.getByTestId('edit-workspace-close'))
+    await user.click(screen.getByRole('button', { name: /Close|operation.close/ }))
     expect(mockOnCancel).toHaveBeenCalled()
   })
 
@@ -172,7 +174,7 @@ describe('EditWorkspaceModal', () => {
     const user = userEvent.setup()
     renderModal()
 
-    await user.click(screen.getByTestId('edit-workspace-cancel'))
+    await user.click(screen.getByRole('button', { name: /operation\.cancel/i }))
     expect(mockOnCancel).toHaveBeenCalled()
   })
 
diff --git a/web/app/components/header/account-setting/members-page/edit-workspace-modal/index.tsx b/web/app/components/header/account-setting/members-page/edit-workspace-modal/index.tsx
index 0f6a6fb8d6..f9d84d414b 100644
--- a/web/app/components/header/account-setting/members-page/edit-workspace-modal/index.tsx
+++ b/web/app/components/header/account-setting/members-page/edit-workspace-modal/index.tsx
@@ -60,8 +60,8 @@ const EditWorkspaceModal = ({ onCancel }: IEditWorkspaceModalProps) => {
           onCancel()
       }}
     >
-      <DialogContent backdropProps={{ forceRender: true }} className="overflow-visible">
-        <DialogCloseButton data-testid="edit-workspace-close" />
+      <DialogContent backdropProps={{ forceRender: true }}>
+        <DialogCloseButton />
 
         <form
           className="flex flex-col"
@@ -102,10 +102,10 @@ const EditWorkspaceModal = ({ onCancel }: IEditWorkspaceModalProps) => {
           </div>
 
           <div className="sticky bottom-0 -mx-2 mt-2 flex flex-wrap items-center justify-end gap-x-2 bg-components-panel-bg px-2 pt-4">
-            <Button size="large" type="button" data-testid="edit-workspace-cancel" onClick={onCancel}>
+            <Button size="large" type="button" onClick={onCancel}>
               {t('operation.cancel', { ns: 'common' })}
             </Button>
-            <Button size="large" type="submit" variant="primary" data-testid="edit-workspace-save" disabled={isSaveDisabled} loading={isSubmitting}>
+            <Button size="large" type="submit" variant="primary" disabled={isSaveDisabled} loading={isSubmitting}>
               {t(isSubmitting ? 'operation.saving' : 'operation.save', { ns: 'common' })}
             </Button>
           </div>
diff --git a/web/app/components/header/account-setting/members-page/index.tsx b/web/app/components/header/account-setting/members-page/index.tsx
index cf25a2446a..694d9ffeed 100644
--- a/web/app/components/header/account-setting/members-page/index.tsx
+++ b/web/app/components/header/account-setting/members-page/index.tsx
@@ -1,5 +1,5 @@
 'use client'
-import type { InvitationResult } from '@/models/common'
+import type { InvitationResult, Member } from '@/models/common'
 import { Avatar } from '@langgenius/dify-ui/avatar'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { useSuspenseQuery } from '@tanstack/react-query'
@@ -47,6 +47,12 @@ const MembersPage = () => {
   const isMemberFull = enableBilling && isNotUnlimitedMemberPlan && accounts.length >= plan.total.teamMembers
   const [editWorkspaceModalVisible, setEditWorkspaceModalVisible] = useState(false)
   const [showTransferOwnershipModal, setShowTransferOwnershipModal] = useState(false)
+  const canOperateMember = (account: Member) => {
+    if (isCurrentWorkspaceOwner)
+      return account.role !== 'owner'
+
+    return currentWorkspace.role === 'admin' && account.role !== 'owner' && account.email !== userProfile.email
+  }
 
   return (
     <>
@@ -63,17 +69,19 @@ const MembersPage = () => {
                   <Tooltip>
                     <TooltipTrigger
                       render={(
-                        <div
-                          className="cursor-pointer rounded-md p-1 hover:bg-black/5"
+                        <button
+                          type="button"
+                          aria-label={t('account.editWorkspaceInfo', { ns: 'common' })}
+                          className="cursor-pointer rounded-md border-none bg-transparent p-1 hover:bg-black/5"
                           onClick={() => {
                             setEditWorkspaceModalVisible(true)
                           }}
                         >
-                          <div
-                            data-testid="edit-workspace-pencil"
+                          <span
+                            aria-hidden="true"
                             className="i-ri-pencil-line h-4 w-4 text-text-tertiary"
                           />
-                        </div>
+                        </button>
                       )}
                     />
                     <TooltipContent>
@@ -144,10 +152,10 @@ const MembersPage = () => {
                     {isCurrentWorkspaceOwner && account.role === 'owner' && !isAllowTransferWorkspace && (
                       <div className="px-3 system-sm-regular text-text-secondary">{RoleMap[account.role] || RoleMap.normal}</div>
                     )}
-                    {isCurrentWorkspaceOwner && account.role !== 'owner' && (
+                    {account.role !== 'owner' && canOperateMember(account) && (
                       <Operation member={account} operatorRole={currentWorkspace.role} onOperate={refetch} />
                     )}
-                    {!isCurrentWorkspaceOwner && (
+                    {account.role !== 'owner' && !canOperateMember(account) && (
                       <div className="px-3 system-sm-regular text-text-secondary">{RoleMap[account.role] || RoleMap.normal}</div>
                     )}
                   </div>
diff --git a/web/app/components/header/account-setting/members-page/invite-modal/__tests__/index.spec.tsx b/web/app/components/header/account-setting/members-page/invite-modal/__tests__/index.spec.tsx
index 9ed99614e4..9b262a3f31 100644
--- a/web/app/components/header/account-setting/members-page/invite-modal/__tests__/index.spec.tsx
+++ b/web/app/components/header/account-setting/members-page/invite-modal/__tests__/index.spec.tsx
@@ -136,7 +136,7 @@ describe('InviteModal', () => {
     const user = userEvent.setup()
     renderModal()
 
-    await user.click(screen.getByTestId('invite-modal-close'))
+    await user.click(screen.getByRole('button', { name: /Close|operation.close/ }))
 
     expect(mockOnCancel).toHaveBeenCalled()
   })
@@ -161,7 +161,7 @@ describe('InviteModal', () => {
 
     expect(screen.getByText('user@example.com')).toBeInTheDocument()
 
-    const removeBtn = screen.getByTestId('remove-email-btn')
+    const removeBtn = screen.getByRole('button', { name: /operation\.remove.*user@example\.com/i })
     await user.click(removeBtn)
 
     expect(screen.queryByText('user@example.com')).not.toBeInTheDocument()
diff --git a/web/app/components/header/account-setting/members-page/invite-modal/__tests__/role-selector.spec.tsx b/web/app/components/header/account-setting/members-page/invite-modal/__tests__/role-selector.spec.tsx
index af2c64179b..1284a7abb1 100644
--- a/web/app/components/header/account-setting/members-page/invite-modal/__tests__/role-selector.spec.tsx
+++ b/web/app/components/header/account-setting/members-page/invite-modal/__tests__/role-selector.spec.tsx
@@ -1,4 +1,4 @@
-import { render, screen, waitFor } from '@testing-library/react'
+import { render, screen, waitFor, within } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { useState } from 'react'
 import { vi } from 'vitest'
@@ -17,6 +17,10 @@ const RoleSelectorWrapper = ({ initialRole = 'normal' }: WrapperProps) => {
   return <RoleSelector value={role} onChange={setRole} />
 }
 
+const getTrigger = () => screen.getByRole('button', { name: /members\.invitedAsRole/i })
+const getRoleDialog = () => screen.getByRole('dialog')
+const getRoleOption = (role: string) => within(getRoleDialog()).getByRole('button', { name: new RegExp(`common\\.members\\.${role}`, 'i') })
+
 describe('RoleSelector', () => {
   beforeEach(() => {
     vi.clearAllMocks()
@@ -36,16 +40,16 @@ describe('RoleSelector', () => {
     const user = userEvent.setup()
     render(<RoleSelectorWrapper />)
 
-    const trigger = screen.getByTestId('role-selector-trigger')
+    const trigger = getTrigger()
 
     // Open
     await user.click(trigger)
-    expect(screen.getByTestId('role-option-normal')).toBeInTheDocument()
+    expect(getRoleOption('normal')).toBeInTheDocument()
 
     // Close
     await user.click(trigger)
     await waitFor(() => {
-      expect(screen.queryByTestId('role-option-normal')).not.toBeInTheDocument()
+      expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
     })
   })
 
@@ -53,28 +57,27 @@ describe('RoleSelector', () => {
     const user = userEvent.setup()
     render(<RoleSelectorWrapper initialRole="editor" />)
 
-    await user.click(screen.getByTestId('role-selector-trigger'))
+    await user.click(getTrigger())
 
-    const editorOption = screen.getByTestId('role-option-editor')
-    expect(editorOption.querySelector('[data-testid="role-option-check"]')).toBeInTheDocument()
+    expect(getRoleOption('editor')).toHaveAttribute('aria-pressed', 'true')
   })
 
   it.each([
-    ['normal', 'role-option-normal', 'common.members.normal'],
-    ['editor', 'role-option-editor', 'common.members.editor'],
-    ['admin', 'role-option-admin', 'common.members.admin'],
-    ['dataset_operator', 'role-option-dataset_operator', 'common.members.datasetOperator'],
-  ])('should update selected role after user chooses %s', async (_roleKey, testId) => {
+    ['normal'],
+    ['editor'],
+    ['admin'],
+    ['datasetOperator'],
+  ])('should update selected role after user chooses %s', async (roleKey) => {
     const user = userEvent.setup()
 
     render(<RoleSelectorWrapper initialRole="normal" />)
 
-    await user.click(screen.getByTestId('role-selector-trigger'))
-    await user.click(screen.getByTestId(testId))
+    await user.click(getTrigger())
+    await user.click(getRoleOption(roleKey))
 
     // Verify dropdown closed
     await waitFor(() => {
-      expect(screen.queryByTestId(testId)).not.toBeInTheDocument()
+      expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
     })
 
     // Verify trigger text updated (using translation key pattern from global mock)
@@ -90,9 +93,9 @@ describe('RoleSelector', () => {
 
     render(<RoleSelectorWrapper />)
 
-    await user.click(screen.getByTestId('role-selector-trigger'))
+    await user.click(getTrigger())
 
-    expect(screen.queryByTestId('role-option-dataset_operator')).not.toBeInTheDocument()
-    expect(screen.getByTestId('role-option-normal')).toBeInTheDocument()
+    expect(within(getRoleDialog()).queryByRole('button', { name: /common\.members\.datasetOperator/i })).not.toBeInTheDocument()
+    expect(getRoleOption('normal')).toBeInTheDocument()
   })
 })
diff --git a/web/app/components/header/account-setting/members-page/invite-modal/index.tsx b/web/app/components/header/account-setting/members-page/invite-modal/index.tsx
index 426d0491a2..3227a23d4c 100644
--- a/web/app/components/header/account-setting/members-page/invite-modal/index.tsx
+++ b/web/app/components/header/account-setting/members-page/invite-modal/index.tsx
@@ -6,7 +6,7 @@ import { cn } from '@langgenius/dify-ui/cn'
 import { Dialog, DialogCloseButton, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
 import { useBoolean } from 'ahooks'
-import { useCallback, useEffect, useState } from 'react'
+import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { ReactMultiEmail } from 'react-multi-email'
 import { emailRegex } from '@/config'
@@ -31,16 +31,9 @@ const InviteModal = ({
   const licenseLimit = useProviderContextSelector(s => s.licenseLimit)
   const refreshLicenseLimit = useProviderContextSelector(s => s.refreshLicenseLimit)
   const [emails, setEmails] = useState<string[]>([])
-  const [isLimited, setIsLimited] = useState(false)
-  const [isLimitExceeded, setIsLimitExceeded] = useState(false)
-  const [usedSize, setUsedSize] = useState(licenseLimit.workspace_members.size ?? 0)
-  useEffect(() => {
-    const limited = licenseLimit.workspace_members.limit > 0
-    const used = emails.length + licenseLimit.workspace_members.size
-    setIsLimited(limited)
-    setUsedSize(used)
-    setIsLimitExceeded(limited && (used > licenseLimit.workspace_members.limit))
-  }, [licenseLimit, emails])
+  const isLimited = licenseLimit.workspace_members.limit > 0
+  const usedSize = emails.length + licenseLimit.workspace_members.size
+  const isLimitExceeded = isLimited && (usedSize > licenseLimit.workspace_members.limit)
 
   const locale = useLocale()
   const [role, setRole] = useState<RoleKey>('normal')
@@ -85,9 +78,9 @@ const InviteModal = ({
     >
       <DialogContent
         backdropProps={{ forceRender: true }}
-        className="w-[400px] overflow-visible px-8 py-6"
+        className="w-[400px] px-8 py-6"
       >
-        <DialogCloseButton data-testid="invite-modal-close" className="top-6 right-8" />
+        <DialogCloseButton className="top-6 right-8" />
         <div className="mb-2 pr-8">
           <DialogTitle className="text-xl font-semibold text-text-primary">
             {t('members.inviteTeamMember', { ns: 'common' })}
@@ -122,13 +115,15 @@ const InviteModal = ({
               getLabel={(email, index, removeEmail) => (
                 <div data-tag key={index} className={cn('bg-components-button-secondary-bg!')}>
                   <div data-tag-item>{email}</div>
-                  <span
-                    data-testid="remove-email-btn"
+                  <button
+                    type="button"
                     data-tag-handle
+                    aria-label={`${t('operation.remove', { ns: 'common' })} ${email}`}
+                    className="border-none bg-transparent p-0 text-inherit"
                     onClick={() => removeEmail(index)}
                   >
                     ×
-                  </span>
+                  </button>
                 </div>
               )}
               placeholder={t('members.emailPlaceholder', { ns: 'common' }) || ''}
diff --git a/web/app/components/header/account-setting/members-page/invite-modal/role-selector.tsx b/web/app/components/header/account-setting/members-page/invite-modal/role-selector.tsx
index 9c44e8b93d..f22be94ddf 100644
--- a/web/app/components/header/account-setting/members-page/invite-modal/role-selector.tsx
+++ b/web/app/components/header/account-setting/members-page/invite-modal/role-selector.tsx
@@ -48,9 +48,10 @@ const RoleSelector = ({ value, onChange }: RoleSelectorProps) => {
         popupClassName="w-[336px] rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-lg"
       >
         <div className="p-1">
-          <div
-            data-testid="role-option-normal"
-            className="cursor-pointer rounded-lg p-2 hover:bg-state-base-hover"
+          <button
+            type="button"
+            aria-pressed={value === 'normal'}
+            className="w-full cursor-pointer rounded-lg border-none bg-transparent p-2 text-left hover:bg-state-base-hover"
             onClick={() => {
               onChange('normal')
               setOpen(false)
@@ -61,15 +62,16 @@ const RoleSelector = ({ value, onChange }: RoleSelectorProps) => {
               <div className="text-xs leading-[18px] text-text-tertiary">{t('members.normalTip', { ns: 'common' })}</div>
               {value === 'normal' && (
                 <div
-                  data-testid="role-option-check"
+                  aria-hidden="true"
                   className="absolute top-0.5 left-0 i-custom-vender-line-general-check h-4 w-4 text-text-accent"
                 />
               )}
             </div>
-          </div>
-          <div
-            data-testid="role-option-editor"
-            className="cursor-pointer rounded-lg p-2 hover:bg-state-base-hover"
+          </button>
+          <button
+            type="button"
+            aria-pressed={value === 'editor'}
+            className="w-full cursor-pointer rounded-lg border-none bg-transparent p-2 text-left hover:bg-state-base-hover"
             onClick={() => {
               onChange('editor')
               setOpen(false)
@@ -80,15 +82,16 @@ const RoleSelector = ({ value, onChange }: RoleSelectorProps) => {
               <div className="text-xs leading-[18px] text-text-tertiary">{t('members.editorTip', { ns: 'common' })}</div>
               {value === 'editor' && (
                 <div
-                  data-testid="role-option-check"
+                  aria-hidden="true"
                   className="absolute top-0.5 left-0 i-custom-vender-line-general-check h-4 w-4 text-text-accent"
                 />
               )}
             </div>
-          </div>
-          <div
-            data-testid="role-option-admin"
-            className="cursor-pointer rounded-lg p-2 hover:bg-state-base-hover"
+          </button>
+          <button
+            type="button"
+            aria-pressed={value === 'admin'}
+            className="w-full cursor-pointer rounded-lg border-none bg-transparent p-2 text-left hover:bg-state-base-hover"
             onClick={() => {
               onChange('admin')
               setOpen(false)
@@ -99,16 +102,17 @@ const RoleSelector = ({ value, onChange }: RoleSelectorProps) => {
               <div className="text-xs leading-[18px] text-text-tertiary">{t('members.adminTip', { ns: 'common' })}</div>
               {value === 'admin' && (
                 <div
-                  data-testid="role-option-check"
+                  aria-hidden="true"
                   className="absolute top-0.5 left-0 i-custom-vender-line-general-check h-4 w-4 text-text-accent"
                 />
               )}
             </div>
-          </div>
+          </button>
           {datasetOperatorEnabled && (
-            <div
-              data-testid="role-option-dataset_operator"
-              className="cursor-pointer rounded-lg p-2 hover:bg-state-base-hover"
+            <button
+              type="button"
+              aria-pressed={value === 'dataset_operator'}
+              className="w-full cursor-pointer rounded-lg border-none bg-transparent p-2 text-left hover:bg-state-base-hover"
               onClick={() => {
                 onChange('dataset_operator')
                 setOpen(false)
@@ -119,12 +123,12 @@ const RoleSelector = ({ value, onChange }: RoleSelectorProps) => {
                 <div className="text-xs leading-[18px] text-text-tertiary">{t('members.datasetOperatorTip', { ns: 'common' })}</div>
                 {value === 'dataset_operator' && (
                   <div
-                    data-testid="role-option-check"
+                    aria-hidden="true"
                     className="absolute top-0.5 left-0 i-custom-vender-line-general-check h-4 w-4 text-text-accent"
                   />
                 )}
               </div>
-            </div>
+            </button>
           )}
         </div>
       </PopoverContent>
diff --git a/web/app/components/header/account-setting/members-page/invited-modal/__tests__/invitation-link.spec.tsx b/web/app/components/header/account-setting/members-page/invited-modal/__tests__/invitation-link.spec.tsx
index 06761da8cb..ddc06ab6e9 100644
--- a/web/app/components/header/account-setting/members-page/invited-modal/__tests__/invitation-link.spec.tsx
+++ b/web/app/components/header/account-setting/members-page/invited-modal/__tests__/invitation-link.spec.tsx
@@ -28,7 +28,7 @@ describe('InvitationLink', () => {
 
     render(<InvitationLink value={value} />)
 
-    const copyBtn = screen.getByTestId('invitation-link-copy')
+    const copyBtn = screen.getByRole('button', { name: 'appApi.copy' })
     await user.click(copyBtn)
 
     expect(copy).toHaveBeenCalledWith('http://localhost:3000/invite/123')
@@ -45,7 +45,7 @@ describe('InvitationLink', () => {
 
     render(<InvitationLink value={absoluteValue} />)
 
-    await user.click(screen.getByTestId('invitation-link-url'))
+    await user.click(screen.getByRole('button', { name: 'https://dify.ai/invite/123' }))
 
     expect(copy).toHaveBeenCalledWith('https://dify.ai/invite/123')
   })
@@ -54,7 +54,7 @@ describe('InvitationLink', () => {
     vi.useFakeTimers()
     render(<InvitationLink value={value} />)
 
-    const url = screen.getByTestId('invitation-link-url')
+    const url = screen.getByRole('button', { name: '/invite/123' })
 
     // Initial state check - PopupContent should be "copy"
     // Since we mock i18next to return the key, we check for 'appApi.copy'
diff --git a/web/app/components/header/account-setting/members-page/invited-modal/invitation-link.tsx b/web/app/components/header/account-setting/members-page/invited-modal/invitation-link.tsx
index 778d9fc8c9..098c87cc99 100644
--- a/web/app/components/header/account-setting/members-page/invited-modal/invitation-link.tsx
+++ b/web/app/components/header/account-setting/members-page/invited-modal/invitation-link.tsx
@@ -2,9 +2,9 @@
 import type { SuccessInvitationResult } from '.'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import copy from 'copy-to-clipboard'
-import { t } from 'i18next'
 import * as React from 'react'
 import { useCallback, useEffect, useState } from 'react'
+import { useTranslation } from 'react-i18next'
 import s from './index.module.css'
 
 type IInvitationLinkProps = {
@@ -14,6 +14,7 @@ type IInvitationLinkProps = {
 const InvitationLink = ({
   value,
 }: IInvitationLinkProps) => {
+  const { t } = useTranslation()
   const [isCopied, setIsCopied] = useState(false)
 
   const copyHandle = useCallback(() => {
@@ -35,25 +36,37 @@ const InvitationLink = ({
   }, [isCopied])
 
   return (
-    <div className="flex items-center rounded-lg border border-components-input-border-active bg-components-input-bg-normal py-2 hover:bg-state-base-hover" data-testid="invitation-link-container">
+    <div className="flex items-center rounded-lg border border-components-input-border-active bg-components-input-bg-normal py-2 hover:bg-state-base-hover">
       <div className="flex h-5 grow items-center">
         <div className="relative h-full grow text-[13px]">
           <Tooltip>
             <TooltipTrigger
-              render={<div className="absolute top-0 right-0 left-0 w-full cursor-pointer truncate pr-2 pl-2 text-text-primary" onClick={copyHandle} data-testid="invitation-link-url">{value.url}</div>}
+              render={(
+                <button
+                  type="button"
+                  className="absolute top-0 right-0 left-0 block w-full cursor-pointer truncate border-none bg-transparent p-0 pr-2 pl-2 text-left text-text-primary"
+                  onClick={copyHandle}
+                >
+                  {value.url}
+                </button>
+              )}
             />
             <TooltipContent>
               {isCopied ? t('copied', { ns: 'appApi' }) : t('copy', { ns: 'appApi' })}
             </TooltipContent>
           </Tooltip>
         </div>
-        <div className="h-4 shrink-0 border bg-divider-regular" />
+        <div className="h-4 shrink-0 border border-divider-regular bg-divider-regular" />
         <Tooltip>
           <TooltipTrigger
             render={(
               <div className="shrink-0 px-0.5">
-                <div className={`box-border flex h-[30px] w-[30px] cursor-pointer items-center justify-center rounded-lg hover:bg-state-base-hover ${s.copyIcon} ${isCopied ? s.copied : ''}`} onClick={copyHandle} data-testid="invitation-link-copy">
-                </div>
+                <button
+                  type="button"
+                  aria-label={t('copy', { ns: 'appApi' })}
+                  className={`box-border flex h-[30px] w-[30px] cursor-pointer items-center justify-center rounded-lg border-none bg-transparent p-0 hover:bg-state-base-hover ${s.copyIcon} ${isCopied ? s.copied : ''}`}
+                  onClick={copyHandle}
+                />
               </div>
             )}
           />
diff --git a/web/app/components/header/account-setting/members-page/operation/__tests__/index.spec.tsx b/web/app/components/header/account-setting/members-page/operation/__tests__/index.spec.tsx
index 8c9081833d..728ccf82e1 100644
--- a/web/app/components/header/account-setting/members-page/operation/__tests__/index.spec.tsx
+++ b/web/app/components/header/account-setting/members-page/operation/__tests__/index.spec.tsx
@@ -8,8 +8,8 @@ const mockUpdateMemberRole = vi.fn()
 const mockDeleteMemberOrCancelInvitation = vi.fn()
 
 vi.mock('@/service/common', () => ({
-  deleteMemberOrCancelInvitation: () => mockDeleteMemberOrCancelInvitation(),
-  updateMemberRole: () => mockUpdateMemberRole(),
+  deleteMemberOrCancelInvitation: (args: unknown) => mockDeleteMemberOrCancelInvitation(args),
+  updateMemberRole: (args: unknown) => mockUpdateMemberRole(args),
 }))
 
 const mockUseProviderContext = vi.fn(() => ({
@@ -65,18 +65,21 @@ describe('Operation', () => {
     expect(await screen.findByText('common.members.datasetOperator')).toBeInTheDocument()
   })
 
-  it('should show owner-allowed role options when operator role is admin', async () => {
+  it('should show admin-allowed role options when operator role is admin', async () => {
     const user = userEvent.setup()
 
     renderOperation({}, 'admin')
 
     await user.click(screen.getByText('common.members.editor'))
 
-    expect(screen.queryByText('common.members.admin')).not.toBeInTheDocument()
+    expect(screen.getByText('common.members.admin')).toBeInTheDocument()
+    expect(screen.getAllByText('common.members.editor')).toHaveLength(2)
     expect(screen.getByText('common.members.normal')).toBeInTheDocument()
+    expect(screen.queryByText('common.members.datasetOperator')).not.toBeInTheDocument()
+    expect(screen.getByText('common.members.removeFromTeam')).toBeInTheDocument()
   })
 
-  it('should not show role options when operator role is unsupported', async () => {
+  it('should not show role options or remove action when operator role is unsupported', async () => {
     const user = userEvent.setup()
 
     renderOperation({}, 'normal')
@@ -84,7 +87,7 @@ describe('Operation', () => {
     await user.click(screen.getByText('common.members.editor'))
 
     expect(screen.queryByText('common.members.normal')).not.toBeInTheDocument()
-    expect(screen.getByText('common.members.removeFromTeam')).toBeInTheDocument()
+    expect(screen.queryByText('common.members.removeFromTeam')).not.toBeInTheDocument()
   })
 
   it('should call updateMemberRole and onOperate when selecting another role', async () => {
@@ -96,7 +99,10 @@ describe('Operation', () => {
     await user.click(await screen.findByText('common.members.normal'))
 
     await waitFor(() => {
-      expect(mockUpdateMemberRole).toHaveBeenCalled()
+      expect(mockUpdateMemberRole).toHaveBeenCalledWith({
+        url: '/workspaces/current/members/member-id/update-role',
+        body: { role: 'normal' },
+      })
       expect(onOperate).toHaveBeenCalled()
     })
   })
@@ -109,7 +115,7 @@ describe('Operation', () => {
     await user.click(screen.getByText('common.members.editor'))
 
     expect(await screen.findByText('common.members.datasetOperator')).toBeInTheDocument()
-    expect(screen.queryByText('common.members.admin')).not.toBeInTheDocument()
+    expect(screen.getByText('common.members.admin')).toBeInTheDocument()
   })
 
   it('should fall back to normal role label when member role is unknown', () => {
@@ -127,7 +133,9 @@ describe('Operation', () => {
     await user.click(await screen.findByText('common.members.removeFromTeam'))
 
     await waitFor(() => {
-      expect(mockDeleteMemberOrCancelInvitation).toHaveBeenCalled()
+      expect(mockDeleteMemberOrCancelInvitation).toHaveBeenCalledWith({
+        url: '/workspaces/current/members/member-id',
+      })
       expect(onOperate).toHaveBeenCalled()
     })
   })
diff --git a/web/app/components/header/account-setting/members-page/operation/index.tsx b/web/app/components/header/account-setting/members-page/operation/index.tsx
index b67fb26bcd..7d2f609177 100644
--- a/web/app/components/header/account-setting/members-page/operation/index.tsx
+++ b/web/app/components/header/account-setting/members-page/operation/index.tsx
@@ -26,6 +26,9 @@ const roleI18nKeyMap = {
   dataset_operator: { label: 'members.datasetOperator', tip: 'members.datasetOperatorTip' },
 } as const
 type OperationRoleKey = keyof typeof roleI18nKeyMap
+const nonOwnerRoles = ['admin', 'editor', 'normal'] as const
+const isNonOwnerRole = (role: Member['role']) => role !== 'owner'
+
 const Operation = ({ member, operatorRole, onOperate }: IOperationProps) => {
   const [open, setOpen] = useState(false)
   const { t } = useTranslation()
@@ -48,13 +51,13 @@ const Operation = ({ member, operatorRole, onOperate }: IOperationProps) => {
     }
     if (operatorRole === 'admin') {
       return [
-        'editor',
-        'normal',
+        ...nonOwnerRoles,
         ...(datasetOperatorEnabled ? ['dataset_operator'] as const : []),
       ]
     }
     return []
   }, [operatorRole, datasetOperatorEnabled])
+  const canRemoveMember = operatorRole === 'owner' || (operatorRole === 'admin' && isNonOwnerRole(member.role))
   const handleDeleteMemberOrCancelInvitation = async () => {
     setOpen(false)
     try {
@@ -81,7 +84,7 @@ const Operation = ({ member, operatorRole, onOperate }: IOperationProps) => {
   return (
     <DropdownMenu open={open} onOpenChange={setOpen}>
       <DropdownMenuTrigger
-        render={<div className={cn('group flex h-full w-full cursor-pointer items-center justify-between px-3 system-sm-regular text-text-secondary hover:bg-state-base-hover', open && 'bg-state-base-hover')} />}
+        render={<button type="button" className={cn('group flex h-full w-full cursor-pointer items-center justify-between border-none bg-transparent px-3 text-left system-sm-regular text-text-secondary hover:bg-state-base-hover', open && 'bg-state-base-hover')} />}
       >
         {RoleMap[member.role] || RoleMap.normal}
         <span aria-hidden className={cn('i-ri-arrow-down-s-line h-4 w-4 shrink-0 group-hover:block', open ? 'block' : 'hidden')} />
@@ -108,19 +111,23 @@ const Operation = ({ member, operatorRole, onOperate }: IOperationProps) => {
             </DropdownMenuItem>
           ))}
         </div>
-        <DropdownMenuSeparator className="my-0" />
-        <div className="p-1">
-          <DropdownMenuItem
-            className="h-auto items-start gap-2 rounded-lg px-3 py-2"
-            onClick={handleDeleteMemberOrCancelInvitation}
-          >
-            <span aria-hidden className="mt-[2px] h-4 w-4 shrink-0" />
-            <div>
-              <div className="system-sm-semibold whitespace-nowrap text-text-secondary">{t('members.removeFromTeam', { ns: 'common' })}</div>
-              <div className="system-xs-regular whitespace-nowrap text-text-tertiary">{t('members.removeFromTeamTip', { ns: 'common' })}</div>
+        {canRemoveMember && (
+          <>
+            <DropdownMenuSeparator className="my-0" />
+            <div className="p-1">
+              <DropdownMenuItem
+                className="h-auto items-start gap-2 rounded-lg px-3 py-2"
+                onClick={handleDeleteMemberOrCancelInvitation}
+              >
+                <span aria-hidden className="mt-[2px] h-4 w-4 shrink-0" />
+                <div>
+                  <div className="system-sm-semibold whitespace-nowrap text-text-secondary">{t('members.removeFromTeam', { ns: 'common' })}</div>
+                  <div className="system-xs-regular whitespace-nowrap text-text-tertiary">{t('members.removeFromTeamTip', { ns: 'common' })}</div>
+                </div>
+              </DropdownMenuItem>
             </div>
-          </DropdownMenuItem>
-        </div>
+          </>
+        )}
       </DropdownMenuContent>
     </DropdownMenu>
   )
diff --git a/web/app/components/header/account-setting/members-page/operation/transfer-ownership.tsx b/web/app/components/header/account-setting/members-page/operation/transfer-ownership.tsx
index 97a4a5b2f2..e46989643e 100644
--- a/web/app/components/header/account-setting/members-page/operation/transfer-ownership.tsx
+++ b/web/app/components/header/account-setting/members-page/operation/transfer-ownership.tsx
@@ -1,11 +1,15 @@
 'use client'
-import { Menu, MenuButton, MenuItem, MenuItems, Transition } from '@headlessui/react'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from '@langgenius/dify-ui/dropdown-menu'
 import {
   RiArrowDownSLine,
 } from '@remixicon/react'
 import { useSuspenseQuery } from '@tanstack/react-query'
-import { Fragment } from 'react'
 import { useTranslation } from 'react-i18next'
 import Loading from '@/app/components/base/loading'
 import { useAppContext } from '@/context/app-context'
@@ -31,39 +35,29 @@ const TransferOwnership = ({ onOperate }: Props) => {
   }
 
   return (
-    <Menu as="div" className="relative h-full w-full">
-      {
-        ({ open }) => (
-          <>
-            <MenuButton className={cn('group flex h-full w-full cursor-pointer items-center justify-between px-3 system-sm-regular text-text-secondary hover:bg-state-base-hover', open && 'bg-state-base-hover')}>
-              {t('members.owner', { ns: 'common' })}
-              <RiArrowDownSLine className={cn('h-4 w-4 group-hover:block', open ? 'block' : 'hidden')} />
-            </MenuButton>
-            <Transition
-              as={Fragment}
-              enter="transition ease-out duration-100"
-              enterFrom="transform opacity-0 scale-95"
-              enterTo="transform opacity-100 scale-100"
-              leave="transition ease-in duration-75"
-              leaveFrom="transform opacity-100 scale-100"
-              leaveTo="transform opacity-0 scale-95"
-            >
-              <MenuItems
-                className={cn('absolute top-[52px] right-0 z-10 origin-top-right rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg backdrop-blur-xs')}
-              >
-                <div className="p-1">
-                  <MenuItem>
-                    <div className="flex cursor-pointer rounded-lg px-3 py-2 hover:bg-state-base-hover" onClick={onOperate}>
-                      <div className="system-md-regular whitespace-nowrap text-text-secondary">{t('members.transferOwnership', { ns: 'common' })}</div>
-                    </div>
-                  </MenuItem>
-                </div>
-              </MenuItems>
-            </Transition>
-          </>
-        )
-      }
-    </Menu>
+    <DropdownMenu modal={false}>
+      <DropdownMenuTrigger
+        className={cn(
+          'group flex h-full w-full cursor-pointer items-center justify-between px-3 system-sm-regular text-text-secondary outline-hidden',
+          'hover:bg-state-base-hover focus-visible:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-hover data-popup-open:bg-state-base-hover',
+        )}
+      >
+        {t('members.owner', { ns: 'common' })}
+        <RiArrowDownSLine className="hidden h-4 w-4 group-hover:block group-data-popup-open:block" />
+      </DropdownMenuTrigger>
+      <DropdownMenuContent
+        placement="bottom-end"
+        sideOffset={4}
+        popupClassName="bg-components-panel-bg-blur p-1 backdrop-blur-xs"
+      >
+        <DropdownMenuItem
+          className="h-auto px-3 py-2"
+          onClick={onOperate}
+        >
+          <span className="system-md-regular whitespace-nowrap text-text-secondary">{t('members.transferOwnership', { ns: 'common' })}</span>
+        </DropdownMenuItem>
+      </DropdownMenuContent>
+    </DropdownMenu>
   )
 }
 
diff --git a/web/app/components/header/account-setting/members-page/transfer-ownership-modal/__tests__/index.spec.tsx b/web/app/components/header/account-setting/members-page/transfer-ownership-modal/__tests__/index.spec.tsx
index 9e05a93c7a..07371740bd 100644
--- a/web/app/components/header/account-setting/members-page/transfer-ownership-modal/__tests__/index.spec.tsx
+++ b/web/app/components/header/account-setting/members-page/transfer-ownership-modal/__tests__/index.spec.tsx
@@ -90,7 +90,7 @@ describe('TransferOwnershipModal', () => {
   }
 
   const goToTransferStep = async (user: ReturnType<typeof userEvent.setup>) => {
-    await user.click(screen.getByTestId('transfer-modal-send-code'))
+    await user.click(screen.getByRole('button', { name: /members\.transferModal\.sendVerifyCode/i }))
     const input = await screen.findByTestId('transfer-modal-code-input')
     await user.type(input, '123456')
     await user.click(screen.getByTestId('transfer-modal-continue'))
@@ -126,7 +126,7 @@ describe('TransferOwnershipModal', () => {
     renderModal()
     // Trigger the email send (which starts the timer)
     await act(async () => {
-      fireEvent.click(screen.getByTestId('transfer-modal-send-code'))
+      fireEvent.click(screen.getByRole('button', { name: /members\.transferModal\.sendVerifyCode/i }))
     })
 
     // Step Verify shows up
@@ -144,7 +144,7 @@ describe('TransferOwnershipModal', () => {
     })
     expect(screen.queryByText(/members\.transferModal\.resendCount/i)).not.toBeInTheDocument()
 
-    const resendBtn = screen.getByTestId('transfer-modal-resend')
+    const resendBtn = screen.getByRole('button', { name: /members\.transferModal\.resend/i })
     await act(async () => {
       fireEvent.click(resendBtn)
     })
@@ -183,18 +183,20 @@ describe('TransferOwnershipModal', () => {
     })
   })
 
-  it('should show error when sending verification email fails', async () => {
+  it('should not show a modal-level toast and should stay on start step when sending verification email fails', async () => {
     const user = userEvent.setup()
     vi.mocked(sendOwnerEmail).mockRejectedValue(new Error('network error'))
     renderModal()
-    await user.click(screen.getByTestId('transfer-modal-send-code'))
+    await user.click(screen.getByRole('button', { name: /members\.transferModal\.sendVerifyCode/i }))
 
+    // The base service layer surfaces the real backend error. The modal itself
+    // must NOT show an additional toast (e.g. "Error sending verification code: undefined").
     await waitFor(() => {
-      expect(mockNotify).toHaveBeenCalledWith(expect.objectContaining({
-        type: 'error',
-        message: expect.stringContaining('network error'),
-      }))
+      expect(sendOwnerEmail).toHaveBeenCalled()
     })
+    expect(mockNotify).not.toHaveBeenCalled()
+    // Should remain on the start step instead of advancing to the verify step.
+    expect(screen.getByRole('button', { name: /members\.transferModal\.sendVerifyCode/i })).toBeInTheDocument()
   })
 
   it('should show error when ownership transfer fails', async () => {
@@ -221,7 +223,7 @@ describe('TransferOwnershipModal', () => {
     } as unknown as Awaited<ReturnType<typeof sendOwnerEmail>>)
 
     renderModal()
-    await user.click(screen.getByTestId('transfer-modal-send-code'))
+    await user.click(screen.getByRole('button', { name: /members\.transferModal\.sendVerifyCode/i }))
 
     // Should advance to verify step even with null data
     await waitFor(() => {
@@ -229,19 +231,18 @@ describe('TransferOwnershipModal', () => {
     })
   })
 
-  it('should show fallback error prefix when sendOwnerEmail throws null', async () => {
+  it('should swallow null rejection from sendOwnerEmail without showing a modal-level toast', async () => {
     const user = userEvent.setup()
     vi.mocked(sendOwnerEmail).mockRejectedValue(null)
 
     renderModal()
-    await user.click(screen.getByTestId('transfer-modal-send-code'))
+    await user.click(screen.getByRole('button', { name: /members\.transferModal\.sendVerifyCode/i }))
 
     await waitFor(() => {
-      expect(mockNotify).toHaveBeenCalledWith(expect.objectContaining({
-        type: 'error',
-        message: expect.stringContaining('Error sending verification code:'),
-      }))
+      expect(sendOwnerEmail).toHaveBeenCalled()
     })
+    expect(mockNotify).not.toHaveBeenCalled()
+    expect(screen.getByRole('button', { name: /members\.transferModal\.sendVerifyCode/i })).toBeInTheDocument()
   })
 
   it('should show fallback error prefix when verifyOwnerEmail throws null', async () => {
@@ -280,7 +281,7 @@ describe('TransferOwnershipModal', () => {
   it('should close when close button is clicked', async () => {
     const user = userEvent.setup()
     renderModal()
-    await user.click(screen.getByTestId('transfer-modal-close'))
+    await user.click(screen.getByRole('button', { name: /operation\.close$/ }))
     expect(mockOnClose).toHaveBeenCalled()
   })
 
diff --git a/web/app/components/header/account-setting/members-page/transfer-ownership-modal/index.tsx b/web/app/components/header/account-setting/members-page/transfer-ownership-modal/index.tsx
index 85a3ac3b22..6dab5ab93a 100644
--- a/web/app/components/header/account-setting/members-page/transfer-ownership-modal/index.tsx
+++ b/web/app/components/header/account-setting/members-page/transfer-ownership-modal/index.tsx
@@ -1,11 +1,10 @@
 import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
-import { noop } from 'es-toolkit/function'
 import * as React from 'react'
 import { useCallback, useState } from 'react'
 import { Trans, useTranslation } from 'react-i18next'
 import Input from '@/app/components/base/input'
-import Modal from '@/app/components/base/modal'
 import { useAppContext } from '@/context/app-context'
 import { ownershipTransfer, sendOwnerEmail, verifyOwnerEmail } from '@/service/common'
 import MemberSelector from './member-selector'
@@ -52,15 +51,10 @@ const TransferOwnershipModal = ({ onClose, show }: Props) => {
     }, 1000))
   }
   const sendEmail = async () => {
-    try {
-      const res = await sendOwnerEmail({})
-      startCount()
-      if (res.data)
-        setStepToken(res.data)
-    }
-    catch (error) {
-      toast.error(`Error sending verification code: ${error ? (error as any).message : ''}`)
-    }
+    const res = await sendOwnerEmail({})
+    startCount()
+    if (res.data)
+      setStepToken(res.data)
   }
   const verifyEmailAddress = async (code: string, token: string, callback?: () => void) => {
     try {
@@ -81,8 +75,13 @@ const TransferOwnershipModal = ({ onClose, show }: Props) => {
     }
   }
   const sendCodeToOriginEmail = async () => {
-    await sendEmail()
-    setStep(STEP.verify)
+    try {
+      await sendEmail()
+      setStep(STEP.verify)
+    }
+    catch {
+      // The base service layer already surfaces the backend error (e.g. rate-limit) as a toast.
+    }
   }
   const handleVerifyOriginEmail = async () => {
     await verifyEmailAddress(code, stepToken, () => setStep(STEP.transfer))
@@ -104,85 +103,96 @@ const TransferOwnershipModal = ({ onClose, show }: Props) => {
     }
   }
   return (
-    <Modal isShow={show} onClose={noop} wrapperClassName="z-1002" className="w-[420px]! p-6!">
-      <div data-testid="transfer-modal-close" className="absolute top-5 right-5 cursor-pointer p-1.5" onClick={onClose}>
-        <div className="i-ri-close-line h-5 w-5 text-text-tertiary" />
-      </div>
-      {step === STEP.start && (
-        <>
-          <div className="pb-3 title-2xl-semi-bold text-text-primary">{t('members.transferModal.title', { ns: 'common' })}</div>
-          <div className="space-y-1 pt-1 pb-2">
-            <div className="body-md-medium text-text-destructive">{t('members.transferModal.warning', { ns: 'common', workspace: currentWorkspace.name.replace(/'/g, '’') })}</div>
-            <div className="body-md-regular text-text-secondary">{t('members.transferModal.warningTip', { ns: 'common' })}</div>
-            <div className="body-md-regular text-text-secondary">
-              <Trans i18nKey="members.transferModal.sendTip" ns="common" components={{ email: <span className="body-md-medium text-text-primary"></span> }} values={{ email: userProfile.email }} />
+    <Dialog open={show}>
+      <DialogContent className="w-[420px]">
+        <button
+          type="button"
+          className="absolute top-5 right-5 cursor-pointer border-none bg-transparent p-1.5 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+          aria-label={t('operation.close', { ns: 'common' })}
+          onClick={onClose}
+        >
+          <span className="i-ri-close-line h-5 w-5 text-text-tertiary" aria-hidden="true" />
+        </button>
+        {step === STEP.start && (
+          <>
+            <div className="pb-3 title-2xl-semi-bold text-text-primary">{t('members.transferModal.title', { ns: 'common' })}</div>
+            <div className="space-y-1 pt-1 pb-2">
+              <div className="body-md-medium text-text-destructive">{t('members.transferModal.warning', { ns: 'common', workspace: currentWorkspace.name.replace(/'/g, '’') })}</div>
+              <div className="body-md-regular text-text-secondary">{t('members.transferModal.warningTip', { ns: 'common' })}</div>
+              <div className="body-md-regular text-text-secondary">
+                <Trans i18nKey="members.transferModal.sendTip" ns="common" components={{ email: <span className="body-md-medium text-text-primary"></span> }} values={{ email: userProfile.email }} />
+              </div>
             </div>
-          </div>
-          <div className="pt-3"></div>
-          <div className="space-y-2">
-            <Button data-testid="transfer-modal-send-code" className="w-full!" variant="primary" onClick={sendCodeToOriginEmail}>
-              {t('members.transferModal.sendVerifyCode', { ns: 'common' })}
-            </Button>
-            <Button data-testid="transfer-modal-cancel" className="w-full!" onClick={onClose}>
-              {t('operation.cancel', { ns: 'common' })}
-            </Button>
-          </div>
-        </>
-      )}
-      {step === STEP.verify && (
-        <>
-          <div className="pb-3 title-2xl-semi-bold text-text-primary">{t('members.transferModal.verifyEmail', { ns: 'common' })}</div>
-          <div className="pt-1 pb-2">
-            <div className="body-md-regular text-text-secondary">
-              <Trans i18nKey="members.transferModal.verifyContent" ns="common" components={{ email: <span className="body-md-medium text-text-primary"></span> }} values={{ email: userProfile.email }} />
+            <div className="pt-3"></div>
+            <div className="space-y-2">
+              <Button className="w-full!" variant="primary" onClick={sendCodeToOriginEmail}>
+                {t('members.transferModal.sendVerifyCode', { ns: 'common' })}
+              </Button>
+              <Button data-testid="transfer-modal-cancel" className="w-full!" onClick={onClose}>
+                {t('operation.cancel', { ns: 'common' })}
+              </Button>
             </div>
-            <div className="body-md-regular text-text-secondary">{t('members.transferModal.verifyContent2', { ns: 'common' })}</div>
-          </div>
-          <div className="pt-3">
-            <div className="mb-1 flex h-6 items-center system-sm-medium text-text-secondary">{t('members.transferModal.codeLabel', { ns: 'common' })}</div>
-            <Input data-testid="transfer-modal-code-input" className="w-full!" placeholder={t('members.transferModal.codePlaceholder', { ns: 'common' })} value={code} onChange={e => setCode(e.target.value)} maxLength={6} />
-          </div>
-          <div className="mt-3 space-y-2">
-            <Button data-testid="transfer-modal-continue" disabled={code.length !== 6} className="w-full!" variant="primary" onClick={handleVerifyOriginEmail}>
-              {t('members.transferModal.continue', { ns: 'common' })}
-            </Button>
-            <Button data-testid="transfer-modal-cancel" className="w-full!" onClick={onClose}>
-              {t('operation.cancel', { ns: 'common' })}
-            </Button>
-          </div>
-          <div className="mt-3 flex items-center gap-1 system-xs-regular text-text-tertiary">
-            <span>{t('members.transferModal.resendTip', { ns: 'common' })}</span>
-            {time > 0 && (<span>{t('members.transferModal.resendCount', { ns: 'common', count: time })}</span>)}
-            {!time && (
-              <span data-testid="transfer-modal-resend" onClick={sendCodeToOriginEmail} className="cursor-pointer system-xs-medium text-text-accent-secondary">
-                {t('members.transferModal.resend', { ns: 'common' })}
-              </span>
-            )}
-          </div>
-        </>
-      )}
-      {step === STEP.transfer && (
-        <>
-          <div className="pb-3 title-2xl-semi-bold text-text-primary">{t('members.transferModal.title', { ns: 'common' })}</div>
-          <div className="space-y-1 pt-1 pb-2">
-            <div className="body-md-medium text-text-destructive">{t('members.transferModal.warning', { ns: 'common', workspace: currentWorkspace.name.replace(/'/g, '’') })}</div>
-            <div className="body-md-regular text-text-secondary">{t('members.transferModal.warningTip', { ns: 'common' })}</div>
-          </div>
-          <div className="pt-3">
-            <div className="mb-1 flex h-6 items-center system-sm-medium text-text-secondary">{t('members.transferModal.transferLabel', { ns: 'common' })}</div>
-            <MemberSelector exclude={[userProfile.id]} value={newOwner} onSelect={setNewOwner} />
-          </div>
-          <div className="mt-4 space-y-2">
-            <Button data-testid="transfer-modal-submit" disabled={!newOwner || isTransfer} className="w-full!" variant="primary" tone="destructive" onClick={handleTransfer}>
-              {t('members.transferModal.transfer', { ns: 'common' })}
-            </Button>
-            <Button data-testid="transfer-modal-cancel" className="w-full!" onClick={onClose}>
-              {t('operation.cancel', { ns: 'common' })}
-            </Button>
-          </div>
-        </>
-      )}
-    </Modal>
+          </>
+        )}
+        {step === STEP.verify && (
+          <>
+            <div className="pb-3 title-2xl-semi-bold text-text-primary">{t('members.transferModal.verifyEmail', { ns: 'common' })}</div>
+            <div className="pt-1 pb-2">
+              <div className="body-md-regular text-text-secondary">
+                <Trans i18nKey="members.transferModal.verifyContent" ns="common" components={{ email: <span className="body-md-medium text-text-primary"></span> }} values={{ email: userProfile.email }} />
+              </div>
+              <div className="body-md-regular text-text-secondary">{t('members.transferModal.verifyContent2', { ns: 'common' })}</div>
+            </div>
+            <div className="pt-3">
+              <div className="mb-1 flex h-6 items-center system-sm-medium text-text-secondary">{t('members.transferModal.codeLabel', { ns: 'common' })}</div>
+              <Input data-testid="transfer-modal-code-input" className="w-full!" placeholder={t('members.transferModal.codePlaceholder', { ns: 'common' })} value={code} onChange={e => setCode(e.target.value)} maxLength={6} />
+            </div>
+            <div className="mt-3 space-y-2">
+              <Button data-testid="transfer-modal-continue" disabled={code.length !== 6} className="w-full!" variant="primary" onClick={handleVerifyOriginEmail}>
+                {t('members.transferModal.continue', { ns: 'common' })}
+              </Button>
+              <Button data-testid="transfer-modal-cancel" className="w-full!" onClick={onClose}>
+                {t('operation.cancel', { ns: 'common' })}
+              </Button>
+            </div>
+            <div className="mt-3 flex items-center gap-1 system-xs-regular text-text-tertiary">
+              <span>{t('members.transferModal.resendTip', { ns: 'common' })}</span>
+              {time > 0 && (<span>{t('members.transferModal.resendCount', { ns: 'common', count: time })}</span>)}
+              {!time && (
+                <button
+                  type="button"
+                  onClick={sendCodeToOriginEmail}
+                  className="cursor-pointer border-none bg-transparent p-0 text-left system-xs-medium text-text-accent-secondary"
+                >
+                  {t('members.transferModal.resend', { ns: 'common' })}
+                </button>
+              )}
+            </div>
+          </>
+        )}
+        {step === STEP.transfer && (
+          <>
+            <div className="pb-3 title-2xl-semi-bold text-text-primary">{t('members.transferModal.title', { ns: 'common' })}</div>
+            <div className="space-y-1 pt-1 pb-2">
+              <div className="body-md-medium text-text-destructive">{t('members.transferModal.warning', { ns: 'common', workspace: currentWorkspace.name.replace(/'/g, '’') })}</div>
+              <div className="body-md-regular text-text-secondary">{t('members.transferModal.warningTip', { ns: 'common' })}</div>
+            </div>
+            <div className="pt-3">
+              <div className="mb-1 flex h-6 items-center system-sm-medium text-text-secondary">{t('members.transferModal.transferLabel', { ns: 'common' })}</div>
+              <MemberSelector exclude={[userProfile.id]} value={newOwner} onSelect={setNewOwner} />
+            </div>
+            <div className="mt-4 space-y-2">
+              <Button data-testid="transfer-modal-submit" disabled={!newOwner || isTransfer} className="w-full!" variant="primary" tone="destructive" onClick={handleTransfer}>
+                {t('members.transferModal.transfer', { ns: 'common' })}
+              </Button>
+              <Button data-testid="transfer-modal-cancel" className="w-full!" onClick={onClose}>
+                {t('operation.cancel', { ns: 'common' })}
+              </Button>
+            </div>
+          </>
+        )}
+      </DialogContent>
+    </Dialog>
   )
 }
 export default TransferOwnershipModal
diff --git a/web/app/components/header/account-setting/members-page/transfer-ownership-modal/member-selector.tsx b/web/app/components/header/account-setting/members-page/transfer-ownership-modal/member-selector.tsx
index 4dc41a307b..6dc0f56a0a 100644
--- a/web/app/components/header/account-setting/members-page/transfer-ownership-modal/member-selector.tsx
+++ b/web/app/components/header/account-setting/members-page/transfer-ownership-modal/member-selector.tsx
@@ -76,7 +76,6 @@ const MemberSelector: FC<Props> = ({
         placement="bottom"
         sideOffset={4}
         popupClassName="border-none bg-transparent p-0 shadow-none backdrop-blur-none"
-        positionerProps={{ style: { zIndex: 1002 } }}
       >
         <div className="min-w-[372px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg backdrop-blur-xs">
           <div className="p-2 pb-1">
diff --git a/web/app/components/header/account-setting/model-provider-page/model-auth/__tests__/switch-credential-in-load-balancing.spec.tsx b/web/app/components/header/account-setting/model-provider-page/model-auth/__tests__/switch-credential-in-load-balancing.spec.tsx
index 0232adcf4a..73aa8f9bfc 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-auth/__tests__/switch-credential-in-load-balancing.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-auth/__tests__/switch-credential-in-load-balancing.spec.tsx
@@ -1,5 +1,6 @@
 import type { CustomModel, ModelProvider } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import { fireEvent, render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
 import { ModelTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import SwitchCredentialInLoadBalancing from '../switch-credential-in-load-balancing'
 
@@ -20,6 +21,7 @@ vi.mock('@/app/components/header/indicator', () => ({
 
 vi.mock('@remixicon/react', () => ({
   RiArrowDownSLine: () => <div data-testid="arrow-icon" />,
+  RiQuestionLine: () => <div data-testid="question-icon" />,
 }))
 
 describe('SwitchCredentialInLoadBalancing', () => {
@@ -104,7 +106,8 @@ describe('SwitchCredentialInLoadBalancing', () => {
     expect(mockSetCustomModelCredential).toHaveBeenCalledWith(mockCredentials[0])
   })
 
-  it('should show tooltip when empty and custom credentials not allowed', () => {
+  it('should show tooltip when empty and custom credentials not allowed', async () => {
+    const user = userEvent.setup()
     const restrictedProvider = { ...mockProvider, allow_custom_token: false }
     render(
       <SwitchCredentialInLoadBalancing
@@ -116,8 +119,8 @@ describe('SwitchCredentialInLoadBalancing', () => {
       />,
     )
 
-    fireEvent.mouseEnter(screen.getByText(/auth.credentialUnavailableInButton/))
-    expect(screen.getByText('plugin.auth.credentialUnavailable'))!.toBeInTheDocument()
+    await user.hover(screen.getByRole('button', { name: /auth.credentialUnavailableInButton/ }))
+    expect(await screen.findByText('plugin.auth.credentialUnavailable'))!.toBeInTheDocument()
   })
 
   // Empty credentials with allowed custom: no tooltip but still shows unavailable text
diff --git a/web/app/components/header/account-setting/model-provider-page/model-auth/config-provider.tsx b/web/app/components/header/account-setting/model-provider-page/model-auth/config-provider.tsx
index 4a268168ba..7529ef9afb 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-auth/config-provider.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-auth/config-provider.tsx
@@ -5,6 +5,7 @@ import type {
 import {
   Button,
 } from '@langgenius/dify-ui/button'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import {
   RiEqualizer2Line,
 } from '@remixicon/react'
@@ -13,7 +14,6 @@ import {
   useCallback,
 } from 'react'
 import { useTranslation } from 'react-i18next'
-import Tooltip from '@/app/components/base/tooltip'
 import { ConfigurationMethodEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import Authorized from './authorized'
 import { useCredentialStatus } from './hooks'
@@ -53,11 +53,11 @@ const ConfigProvider = ({
     )
     if (notAllowCustomCredential && !hasCredential) {
       return (
-        <Tooltip
-          asChild
-          popupContent={t('auth.credentialUnavailable', { ns: 'plugin' })}
-        >
-          {Item}
+        <Tooltip>
+          <TooltipTrigger render={Item} />
+          <TooltipContent>
+            {t('auth.credentialUnavailable', { ns: 'plugin' })}
+          </TooltipContent>
         </Tooltip>
       )
     }
diff --git a/web/app/components/header/account-setting/model-provider-page/model-auth/credential-selector.tsx b/web/app/components/header/account-setting/model-provider-page/model-auth/credential-selector.tsx
index be3e9edb93..8eaf18440f 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-auth/credential-selector.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-auth/credential-selector.tsx
@@ -1,4 +1,9 @@
 import type { Credential } from '@/app/components/header/account-setting/model-provider-page/declarations'
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from '@langgenius/dify-ui/popover'
 import {
   RiAddLine,
   RiArrowDownSLine,
@@ -10,11 +15,6 @@ import {
 } from 'react'
 import { useTranslation } from 'react-i18next'
 import Badge from '@/app/components/base/badge'
-import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
 import Indicator from '@/app/components/header/indicator'
 import CredentialItem from './authorized/credential-item'
 
@@ -47,68 +47,71 @@ const CredentialSelector = ({
   }, [handleSelect, t])
 
   return (
-    <PortalToFollowElem
+    <Popover
       open={open}
       onOpenChange={setOpen}
-      triggerPopupSameWidth
     >
-      <PortalToFollowElemTrigger asChild onClick={() => !disabled && setOpen(v => !v)}>
-        <div className="flex h-8 w-full items-center justify-between rounded-lg bg-components-input-bg-normal px-2 system-sm-regular">
+      <PopoverTrigger
+        nativeButton={false}
+        disabled={disabled}
+        render={<div className="flex h-8 w-full items-center justify-between rounded-lg bg-components-input-bg-normal px-2 system-sm-regular" />}
+      >
+        {
+          selectedCredential && (
+            <div className="flex items-center">
+              {
+                !selectedCredential.addNewCredential && <Indicator className="mr-2 ml-1 shrink-0" />
+              }
+              <div className="truncate system-sm-regular text-components-input-text-filled" title={selectedCredential.credential_name}>{selectedCredential.credential_name}</div>
+              {
+                selectedCredential.from_enterprise && (
+                  <Badge className="shrink-0">Enterprise</Badge>
+                )
+              }
+            </div>
+          )
+        }
+        {
+          !selectedCredential && (
+            <div className="grow truncate system-sm-regular text-components-input-text-placeholder">{t('modelProvider.auth.selectModelCredential', { ns: 'common' })}</div>
+          )
+        }
+        <RiArrowDownSLine className="h-4 w-4 text-text-quaternary" />
+      </PopoverTrigger>
+      <PopoverContent
+        sideOffset={0}
+        popupClassName="border-ccomponents-panel-border rounded-xl border-[0.5px] bg-components-panel-bg-blur p-0"
+        popupProps={{ style: { width: 'var(--anchor-width, auto)' } }}
+      >
+        <div className="max-h-[320px] overflow-y-auto p-1">
           {
-            selectedCredential && (
-              <div className="flex items-center">
-                {
-                  !selectedCredential.addNewCredential && <Indicator className="mr-2 ml-1 shrink-0" />
-                }
-                <div className="truncate system-sm-regular text-components-input-text-filled" title={selectedCredential.credential_name}>{selectedCredential.credential_name}</div>
-                {
-                  selectedCredential.from_enterprise && (
-                    <Badge className="shrink-0">Enterprise</Badge>
-                  )
-                }
-              </div>
-            )
-          }
-          {
-            !selectedCredential && (
-              <div className="grow truncate system-sm-regular text-components-input-text-placeholder">{t('modelProvider.auth.selectModelCredential', { ns: 'common' })}</div>
-            )
-          }
-          <RiArrowDownSLine className="h-4 w-4 text-text-quaternary" />
-        </div>
-      </PortalToFollowElemTrigger>
-      <PortalToFollowElemContent className="z-1002">
-        <div className="border-ccomponents-panel-border rounded-xl border-[0.5px] bg-components-panel-bg-blur shadow-lg">
-          <div className="max-h-[320px] overflow-y-auto p-1">
-            {
-              credentials.map(credential => (
-                <CredentialItem
-                  key={credential.credential_id}
-                  credential={credential}
-                  disableDelete
-                  disableEdit
-                  disableRename
-                  onItemClick={handleSelect}
-                  showSelectedIcon
-                  selectedCredentialId={selectedCredential?.credential_id}
-                />
-              ))
-            }
-          </div>
-          {
-            !notAllowAddNewCredential && (
-              <div
-                className="flex h-10 cursor-pointer items-center border-t border-t-divider-subtle px-7 system-xs-medium text-text-accent-light-mode-only"
-                onClick={handleAddNewCredential}
-              >
-                <RiAddLine className="mr-1 h-4 w-4" />
-                {t('modelProvider.auth.addNewModelCredential', { ns: 'common' })}
-              </div>
-            )
+            credentials.map(credential => (
+              <CredentialItem
+                key={credential.credential_id}
+                credential={credential}
+                disableDelete
+                disableEdit
+                disableRename
+                onItemClick={handleSelect}
+                showSelectedIcon
+                selectedCredentialId={selectedCredential?.credential_id}
+              />
+            ))
           }
         </div>
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
+        {
+          !notAllowAddNewCredential && (
+            <div
+              className="flex h-10 cursor-pointer items-center border-t border-t-divider-subtle px-7 system-xs-medium text-text-accent-light-mode-only"
+              onClick={handleAddNewCredential}
+            >
+              <RiAddLine className="mr-1 h-4 w-4" />
+              {t('modelProvider.auth.addNewModelCredential', { ns: 'common' })}
+            </div>
+          )
+        }
+      </PopoverContent>
+    </Popover>
   )
 }
 
diff --git a/web/app/components/header/account-setting/model-provider-page/model-auth/switch-credential-in-load-balancing.tsx b/web/app/components/header/account-setting/model-provider-page/model-auth/switch-credential-in-load-balancing.tsx
index 58ffc180dd..8ccfc0a640 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-auth/switch-credential-in-load-balancing.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-auth/switch-credential-in-load-balancing.tsx
@@ -6,6 +6,7 @@ import type {
 } from '../declarations'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { RiArrowDownSLine } from '@remixicon/react'
 import {
   memo,
@@ -13,7 +14,6 @@ import {
 } from 'react'
 import { useTranslation } from 'react-i18next'
 import Badge from '@/app/components/base/badge'
-import Tooltip from '@/app/components/base/tooltip'
 import { ConfigurationMethodEnum, ModelModalModeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import Indicator from '@/app/components/header/indicator'
 import Authorized from './authorized'
@@ -89,11 +89,11 @@ const SwitchCredentialInLoadBalancing = ({
     )
     if (empty && notAllowCustomCredential) {
       return (
-        <Tooltip
-          asChild
-          popupContent={t('auth.credentialUnavailable', { ns: 'plugin' })}
-        >
-          {Item}
+        <Tooltip>
+          <TooltipTrigger render={Item} />
+          <TooltipContent>
+            {t('auth.credentialUnavailable', { ns: 'plugin' })}
+          </TooltipContent>
         </Tooltip>
       )
     }
diff --git a/web/app/components/header/account-setting/model-provider-page/model-modal/Form.tsx b/web/app/components/header/account-setting/model-provider-page/model-modal/Form.tsx
index bcfcb5cbe6..fe84ddea13 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-modal/Form.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-modal/Form.tsx
@@ -15,10 +15,10 @@ import type {
 import { cn } from '@langgenius/dify-ui/cn'
 import { Select, SelectContent, SelectItem, SelectItemIndicator, SelectItemText, SelectTrigger } from '@langgenius/dify-ui/select'
 import { useCallback, useState } from 'react'
+import { Infotip } from '@/app/components/base/infotip'
 import Radio from '@/app/components/base/radio'
 import RadioE from '@/app/components/base/radio/ui'
-import Tooltip from '@/app/components/base/tooltip'
-import AppSelector from '@/app/components/plugins/plugin-detail-panel/app-selector'
+import { AppSelector } from '@/app/components/plugins/plugin-detail-panel/app-selector'
 import ModelParameterModal from '@/app/components/plugins/plugin-detail-panel/model-selector'
 import MultipleToolSelector from '@/app/components/plugins/plugin-detail-panel/multiple-tool-selector'
 import ToolSelector from '@/app/components/plugins/plugin-detail-panel/tool-selector'
@@ -28,6 +28,23 @@ import { FormTypeEnum } from '../declarations'
 import { useLanguage } from '../hooks'
 import Input from './Input'
 
+const radioGridColumnsClassNames: Record<number, string> = {
+  1: 'grid-cols-1',
+  2: 'grid-cols-2',
+  3: 'grid-cols-3',
+  4: 'grid-cols-4',
+  5: 'grid-cols-5',
+  6: 'grid-cols-6',
+  7: 'grid-cols-7',
+  8: 'grid-cols-8',
+  9: 'grid-cols-9',
+  10: 'grid-cols-10',
+  11: 'grid-cols-11',
+  12: 'grid-cols-12',
+}
+
+type ModelSelectorValue = Record<string, unknown>
+
 type FormProps<
   CustomFormSchema extends Omit<CredentialFormSchema, 'type'> & { type: string } = never,
 > = {
@@ -100,7 +117,7 @@ function Form<
     fieldMoreInfo,
   }
 
-  const handleFormChange = (key: string, val: string | boolean) => {
+  const handleFormChange = (key: string, val: FormValue[string]) => {
     if (isEditMode && (key === '__model_type' || key === '__model_name'))
       return
 
@@ -115,7 +132,7 @@ function Form<
     onChange({ ...value, [key]: val, ...shouldClearVariable })
   }
 
-  const handleModelChanged = useCallback((key: string, model: any) => {
+  const handleModelChanged = useCallback((key: string, model: ModelSelectorValue) => {
     const newValue = {
       ...value[key],
       ...model,
@@ -125,17 +142,16 @@ function Form<
   }, [onChange, value])
 
   const renderField = (formSchema: CredentialFormSchema | CustomFormSchema) => {
-    const tooltip = formSchema.tooltip
-    const tooltipContent = (tooltip && (
-      <Tooltip
-        popupContent={(
-          <div className="w-[200px]">
-            {tooltip[language] || tooltip.en_US}
-          </div>
-        )}
-        triggerClassName="ml-1 w-4 h-4"
-        asChild={false}
-      />
+    const infotip = formSchema.tooltip
+    const infotipText = infotip?.[language] || infotip?.en_US
+    const infotipContent = (infotipText && (
+      <Infotip
+        aria-label={infotipText}
+        className="ml-1"
+        popupClassName="w-[200px] max-w-[200px]"
+      >
+        {infotipText}
+      </Infotip>
     ))
     if (override) {
       const [overrideTypes, overrideRender] = override
@@ -166,7 +182,7 @@ function Form<
             {required && (
               <span className="ml-1 text-red-500">*</span>
             )}
-            {tooltipContent}
+            {infotipContent}
           </div>
           <Input
             className={cn(inputClassName, `${disabled && 'cursor-not-allowed opacity-60'}`)}
@@ -201,6 +217,7 @@ function Form<
         return null
 
       const disabled = isEditMode && (variable === '__model_type' || variable === '__model_name')
+      const gridColumnsClassName = radioGridColumnsClassNames[options.length] ?? 'grid-cols-1'
 
       return (
         <div key={variable} className={cn(itemClassName, 'py-3')}>
@@ -209,10 +226,9 @@ function Form<
             {required && (
               <span className="ml-1 text-red-500">*</span>
             )}
-            {tooltipContent}
+            {infotipContent}
           </div>
-          {/* eslint-disable-next-line tailwindcss/no-unknown-classes */}
-          <div className={cn('grid gap-3', `grid-cols-${options?.length}`)}>
+          <div className={cn('grid gap-3', gridColumnsClassName)}>
             {options.filter((option) => {
               if (option.show_on.length)
                 return option.show_on.every(showOnItem => value[showOnItem.variable] === showOnItem.value)
@@ -272,7 +288,7 @@ function Form<
             {required && (
               <span className="ml-1 text-red-500">*</span>
             )}
-            {tooltipContent}
+            {infotipContent}
           </div>
           <Select
             disabled={readonly}
@@ -286,7 +302,7 @@ function Form<
             <SelectTrigger size="medium" className={cn(inputClassName)}>
               {selectedOption?.name ?? placeholder?.[language] ?? placeholder?.en_US}
             </SelectTrigger>
-            <SelectContent popupClassName="w-(--anchor-width)">
+            <SelectContent>
               {filteredOptions.map(option => (
                 <SelectItem key={option.value} value={option.value}>
                   <SelectItemText>{option.name}</SelectItemText>
@@ -320,7 +336,7 @@ function Form<
               {required && (
                 <span className="ml-1 text-red-500">*</span>
               )}
-              {tooltipContent}
+              {infotipContent}
             </div>
             <Radio.Group
               className="flex items-center"
@@ -350,7 +366,7 @@ function Form<
             {required && (
               <span className="ml-1 text-red-500">*</span>
             )}
-            {tooltipContent}
+            {infotipContent}
           </div>
           <ModelParameterModal
             popupClassName="w-[387px]!"
@@ -382,7 +398,7 @@ function Form<
             {required && (
               <span className="ml-1 text-red-500">*</span>
             )}
-            {tooltipContent}
+            {infotipContent}
           </div>
           <ToolSelector
             scope={scope}
@@ -392,8 +408,8 @@ function Form<
             disabled={readonly}
             value={value[variable]}
             // selectedTools={value[variable] ? [value[variable]] : []}
-            onSelect={item => handleFormChange(variable, item as any)}
-            onDelete={() => handleFormChange(variable, null as any)}
+            onSelect={item => handleFormChange(variable, item)}
+            onDelete={() => handleFormChange(variable, null)}
           />
           {fieldMoreInfo?.(formSchema)}
           {validating && changeKey === variable && <ValidatingTip />}
@@ -405,7 +421,7 @@ function Form<
       const {
         variable,
         label,
-        tooltip,
+        tooltip: infotip,
         required,
         scope,
       } = formSchema as (CredentialFormSchemaTextInput | CredentialFormSchemaSecretInput)
@@ -420,9 +436,9 @@ function Form<
             scope={scope}
             label={label[language] || label.en_US}
             required={required}
-            tooltip={tooltip?.[language] || tooltip?.en_US}
+            tooltip={infotip?.[language] || infotip?.en_US}
             value={value[variable] || []}
-            onChange={item => handleFormChange(variable, item as any)}
+            onChange={item => handleFormChange(variable, item)}
             supportCollapse
           />
           {fieldMoreInfo?.(formSchema)}
@@ -446,13 +462,13 @@ function Form<
             {required && (
               <span className="ml-1 text-red-500">*</span>
             )}
-            {tooltipContent}
+            {infotipContent}
           </div>
           <AppSelector
             disabled={readonly}
             scope={scope}
             value={value[variable]}
-            onSelect={item => handleFormChange(variable, { ...item, type: FormTypeEnum.appSelector } as any)}
+            onSelect={item => handleFormChange(variable, { ...item, type: FormTypeEnum.appSelector })}
           />
           {fieldMoreInfo?.(formSchema)}
           {validating && changeKey === variable && <ValidatingTip />}
@@ -475,15 +491,14 @@ function Form<
             {required && (
               <span className="ml-1 text-red-500">*</span>
             )}
-            {tooltipContent}
+            {infotipContent}
           </div>
           <VarReferencePicker
-            zIndex={1001}
             readonly={false}
             isShowNodeName
             nodeId={nodeId || ''}
             value={value[variable] || []}
-            onChange={item => handleFormChange(variable, item as any)}
+            onChange={item => handleFormChange(variable, item)}
             filterVar={(varPayload) => {
               if (!scope)
                 return true
diff --git a/web/app/components/header/account-setting/model-provider-page/model-modal/__tests__/Form.spec.tsx b/web/app/components/header/account-setting/model-provider-page/model-modal/__tests__/Form.spec.tsx
index b9df3ec9c3..11ff189393 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-modal/__tests__/Form.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-modal/__tests__/Form.spec.tsx
@@ -8,6 +8,7 @@ import type {
   CredentialFormSchemaTextInput,
   FormValue,
 } from '../../declarations'
+import type { AppSelectorValue } from '@/app/components/plugins/plugin-detail-panel/app-selector'
 import type { NodeOutPutVar } from '@/app/components/workflow/types'
 import { fireEvent, render, screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
@@ -29,8 +30,8 @@ vi.mock('../../hooks', () => ({
 }))
 
 vi.mock('@/app/components/plugins/plugin-detail-panel/app-selector', () => ({
-  default: ({ onSelect }: { onSelect: (item: { id: string }) => void }) => (
-    <button type="button" onClick={() => onSelect({ id: 'app-1' })}>Select App</button>
+  AppSelector: ({ onSelect }: { onSelect: (item: AppSelectorValue) => void }) => (
+    <button type="button" onClick={() => onSelect({ app_id: 'app-1', inputs: {}, files: [] })}>Select App</button>
   ),
 }))
 
@@ -408,7 +409,7 @@ describe('Form', () => {
         multi_tool: [{ id: 'tool-1' }],
       }))
       expect(onChange).toHaveBeenCalledWith(expect.objectContaining({
-        app_selector: { id: 'app-1', type: FormTypeEnum.appSelector },
+        app_selector: { app_id: 'app-1', inputs: {}, files: [], type: FormTypeEnum.appSelector },
       }))
     })
 
@@ -1235,6 +1236,10 @@ describe('Form', () => {
       expect(screen.getByText('Region'))!.toBeInTheDocument()
       expect(screen.getByText('Model'))!.toBeInTheDocument()
       expect(screen.getByText('Agree'))!.toBeInTheDocument()
+      expect(screen.getByLabelText('Enter your API key here'))!.toBeInTheDocument()
+      expect(screen.getByLabelText('Select region'))!.toBeInTheDocument()
+      expect(screen.getByLabelText('Choose model'))!.toBeInTheDocument()
+      expect(screen.getByLabelText('Agree tooltip'))!.toBeInTheDocument()
     })
 
     it('should render required asterisk for radio, select, checkbox, and other field types', () => {
diff --git a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/__tests__/index.spec.tsx b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/__tests__/index.spec.tsx
index 5c8d5e7489..b3f1ee9be1 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/__tests__/index.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/__tests__/index.spec.tsx
@@ -13,6 +13,7 @@ let parameterRules: Array<Record<string, unknown>> | undefined = [
   },
 ]
 let isRulesLoading = false
+let isRulesPending = false
 let currentProvider: Record<string, unknown> | undefined = { provider: 'openai', label: { en_US: 'OpenAI' } }
 let currentModel: Record<string, unknown> | undefined = {
   model: 'gpt-3.5-turbo',
@@ -49,7 +50,7 @@ vi.mock('@/service/use-common', () => ({
       data: parameterRules,
     },
     isLoading: isRulesLoading,
-    isPending: isRulesLoading,
+    isPending: isRulesPending,
   }),
 }))
 
@@ -92,9 +93,21 @@ vi.mock('../../model-selector', () => ({
 }))
 
 vi.mock('../presets-parameter', () => ({
-  default: ({ onSelect }: { onSelect: (id: number) => void }) => (
-    <button onClick={() => onSelect(1)}>Preset 1</button>
-  ),
+  default: ({ onSelect, supportedParameterNames }: { onSelect: (id: number) => void, supportedParameterNames?: string[] }) => {
+    if (supportedParameterNames && !supportedParameterNames.includes('temperature'))
+      return null
+
+    return <button onClick={() => onSelect(1)}>Preset 1</button>
+  },
+}))
+
+vi.mock('../presets-parameter-utils', () => ({
+  getSupportedPresetConfig: (_toneId: number, supportedParameterNames?: string[]) => {
+    if (supportedParameterNames && !supportedParameterNames.includes('temperature'))
+      return {}
+
+    return { temperature: 0.8 }
+  },
 }))
 
 vi.mock('../trigger', () => ({
@@ -126,6 +139,7 @@ describe('ModelParameterModal', () => {
   beforeEach(() => {
     vi.clearAllMocks()
     isRulesLoading = false
+    isRulesPending = false
     parameterRules = [
       {
         name: 'temperature',
@@ -194,7 +208,28 @@ describe('ModelParameterModal', () => {
     render(<ModelParameterModal {...defaultProps} />)
     fireEvent.click(screen.getByText('Open Settings'))
     fireEvent.click(screen.getByText('Preset 1'))
-    expect(defaultProps.onCompletionParamsChange).toHaveBeenCalled()
+    expect(defaultProps.onCompletionParamsChange).toHaveBeenCalledWith({
+      ...defaultProps.completionParams,
+      temperature: 0.8,
+    })
+  })
+
+  it('should not render preset control when visible parameters do not support preset keys', () => {
+    parameterRules = [
+      {
+        name: 'max_tokens',
+        label: { en_US: 'Max Tokens' },
+        type: 'int',
+        default: 256,
+        min: 1,
+        max: 4096,
+      },
+    ]
+
+    render(<ModelParameterModal {...defaultProps} />)
+    fireEvent.click(screen.getByText('Open Settings'))
+
+    expect(screen.queryByText('Preset 1')).not.toBeInTheDocument()
   })
 
   it('should call setModel when model selector picks another model', () => {
@@ -219,11 +254,29 @@ describe('ModelParameterModal', () => {
 
   it('should render loading state when parameter rules are loading', () => {
     isRulesLoading = true
+    isRulesPending = true
     render(<ModelParameterModal {...defaultProps} />)
     fireEvent.click(screen.getByText('Open Settings'))
     expect(screen.getByRole('status')).toBeInTheDocument()
   })
 
+  it('should not render parameter loading when model is not configured and parameter rules query is pending but disabled', () => {
+    isRulesPending = true
+    parameterRules = []
+
+    render(
+      <ModelParameterModal
+        {...defaultProps}
+        provider=""
+        modelId=""
+      />,
+    )
+    fireEvent.click(screen.getByText('Open Settings'))
+
+    expect(screen.queryByRole('status')).not.toBeInTheDocument()
+    expect(screen.getByTestId('model-selector')).toBeInTheDocument()
+  })
+
   it('should not open content when readonly is true', () => {
     render(<ModelParameterModal {...defaultProps} readonly />)
     fireEvent.click(screen.getByText('Open Settings'))
@@ -299,6 +352,7 @@ describe('ModelParameterModal', () => {
   it('should render the empty loading fallback when rules resolve to an empty list', () => {
     parameterRules = []
     isRulesLoading = true
+    isRulesPending = true
 
     render(<ModelParameterModal {...defaultProps} />)
     fireEvent.click(screen.getByText('Open Settings'))
diff --git a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/__tests__/presets-parameter.spec.tsx b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/__tests__/presets-parameter.spec.tsx
index 33437afbf7..67ad4c6915 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/__tests__/presets-parameter.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/__tests__/presets-parameter.spec.tsx
@@ -1,6 +1,7 @@
 import { fireEvent, render, screen } from '@testing-library/react'
 import { vi } from 'vitest'
 import PresetsParameter from '../presets-parameter'
+import { getSupportedPresetConfig } from '../presets-parameter-utils'
 
 describe('PresetsParameter', () => {
   beforeEach(() => {
@@ -47,4 +48,22 @@ describe('PresetsParameter', () => {
 
     expect(onSelect).toHaveBeenCalledWith(3)
   })
+
+  it('should render presets when at least one preset parameter is supported', () => {
+    render(<PresetsParameter onSelect={vi.fn()} supportedParameterNames={['temperature']} />)
+
+    expect(screen.getByRole('button', { name: /common\.modelProvider\.loadPresets/i })).toBeInTheDocument()
+  })
+
+  it('should not render presets when no preset parameters are supported', () => {
+    render(<PresetsParameter onSelect={vi.fn()} supportedParameterNames={['max_tokens']} />)
+
+    expect(screen.queryByRole('button', { name: /common\.modelProvider\.loadPresets/i })).not.toBeInTheDocument()
+  })
+
+  it('should return only supported preset config keys', () => {
+    expect(getSupportedPresetConfig(1, ['temperature'])).toEqual({
+      temperature: 0.8,
+    })
+  })
 })
diff --git a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/__tests__/status-indicators.spec.tsx b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/__tests__/status-indicators.spec.tsx
index 9e28c9e204..b204462ab5 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/__tests__/status-indicators.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/__tests__/status-indicators.spec.tsx
@@ -21,6 +21,12 @@ describe('StatusIndicators', () => {
     installedPlugins = [{ name: 'demo-plugin', plugin_unique_identifier: 'demo@1.0.0' }]
   })
 
+  const getPopoverTrigger = (name: string) => {
+    const trigger = screen.getByRole('button', { name })
+    expect(trigger).toBeInTheDocument()
+    return trigger
+  }
+
   it('should render nothing when model is available and enabled', () => {
     const { container } = render(
       <StatusIndicators
@@ -37,7 +43,7 @@ describe('StatusIndicators', () => {
 
   it('should render deprecated tooltip when provider model is disabled and in model list', async () => {
     const user = userEvent.setup()
-    const { container } = render(
+    render(
       <StatusIndicators
         needsConfiguration={false}
         modelProvider={true}
@@ -48,16 +54,14 @@ describe('StatusIndicators', () => {
       />,
     )
 
-    const trigger = container.querySelector('[data-state]')
-    expect(trigger).toBeInTheDocument()
-    await user.hover(trigger as HTMLElement)
+    await user.hover(getPopoverTrigger('nodes.agent.modelSelectorTooltips.deprecated'))
 
     expect(await screen.findByText('nodes.agent.modelSelectorTooltips.deprecated')).toBeInTheDocument()
   })
 
   it('should render model-not-support tooltip when disabled model is not in model list and has no pluginInfo', async () => {
     const user = userEvent.setup()
-    const { container } = render(
+    render(
       <StatusIndicators
         needsConfiguration={false}
         modelProvider={true}
@@ -68,9 +72,7 @@ describe('StatusIndicators', () => {
       />,
     )
 
-    const trigger = container.querySelector('[data-state]')
-    expect(trigger).toBeInTheDocument()
-    await user.hover(trigger as HTMLElement)
+    await user.hover(getPopoverTrigger('nodes.agent.modelNotSupport.title'))
 
     expect(await screen.findByText('nodes.agent.modelNotSupport.title')).toBeInTheDocument()
   })
@@ -123,7 +125,7 @@ describe('StatusIndicators', () => {
 
   it('should render marketplace warning tooltip when provider is unavailable', async () => {
     const user = userEvent.setup()
-    const { container } = render(
+    render(
       <StatusIndicators
         needsConfiguration={false}
         modelProvider={false}
@@ -134,9 +136,7 @@ describe('StatusIndicators', () => {
       />,
     )
 
-    const trigger = container.querySelector('[data-state]')
-    expect(trigger).toBeInTheDocument()
-    await user.hover(trigger as HTMLElement)
+    await user.hover(getPopoverTrigger('nodes.agent.modelNotInMarketplace.title'))
 
     expect(await screen.findByText('nodes.agent.modelNotInMarketplace.title')).toBeInTheDocument()
   })
diff --git a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/index.tsx b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/index.tsx
index 6f37775052..f0764fade0 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/index.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/index.tsx
@@ -24,7 +24,7 @@ import { useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { ArrowNarrowLeft } from '@/app/components/base/icons/src/vender/line/arrows'
 import Loading from '@/app/components/base/loading'
-import { PROVIDER_WITH_PRESET_TONE, STOP_PARAMETER_RULE, TONE_LIST } from '@/config'
+import { PROVIDER_WITH_PRESET_TONE, STOP_PARAMETER_RULE } from '@/config'
 import { useModelParameterRules } from '@/service/use-common'
 import {
   useTextGenerationCurrentProviderAndModelAndModelList,
@@ -32,6 +32,7 @@ import {
 import ModelSelector from '../model-selector'
 import ParameterItem from './parameter-item'
 import PresetsParameter from './presets-parameter'
+import { getSupportedPresetConfig } from './presets-parameter-utils'
 import Trigger from './trigger'
 
 export type ModelParameterModalProps = {
@@ -75,10 +76,9 @@ const ModelParameterModal: FC<ModelParameterModalProps> = ({
   const settingsIconRef = useRef<HTMLDivElement>(null)
   const {
     data: parameterRulesData,
-    isPending,
     isLoading,
   } = useModelParameterRules(provider, modelId)
-  const isRulesLoading = isPending || isLoading
+  const isRulesLoading = !!provider && !!modelId && isLoading
   const {
     currentProvider,
     currentModel,
@@ -90,6 +90,9 @@ const ModelParameterModal: FC<ModelParameterModalProps> = ({
   const parameterRules: ModelParameterRule[] = useMemo(() => {
     return parameterRulesData?.data || []
   }, [parameterRulesData])
+  const supportedPresetParameterNames = useMemo(() => {
+    return parameterRules.map(parameterRule => parameterRule.name)
+  }, [parameterRules])
 
   const handleParamChange = (key: string, value: ParameterValue) => {
     onCompletionParamsChange({
@@ -125,13 +128,10 @@ const ModelParameterModal: FC<ModelParameterModalProps> = ({
   }
 
   const handleSelectPresetParameter = (toneId: number) => {
-    const tone = TONE_LIST.find(tone => tone.id === toneId)
-    if (tone) {
-      onCompletionParamsChange({
-        ...completionParams,
-        ...tone.config,
-      })
-    }
+    onCompletionParamsChange({
+      ...completionParams,
+      ...getSupportedPresetConfig(toneId, supportedPresetParameterNames),
+    })
   }
 
   return (
@@ -199,7 +199,10 @@ const ModelParameterModal: FC<ModelParameterModalProps> = ({
                   <div className="flex flex-1 items-center system-sm-semibold-uppercase text-text-secondary">{t('modelProvider.parameters', { ns: 'common' })}</div>
                   {
                     PROVIDER_WITH_PRESET_TONE.includes(provider) && (
-                      <PresetsParameter onSelect={handleSelectPresetParameter} />
+                      <PresetsParameter
+                        onSelect={handleSelectPresetParameter}
+                        supportedParameterNames={supportedPresetParameterNames}
+                      />
                     )
                   }
                 </div>
diff --git a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/presets-parameter-utils.ts b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/presets-parameter-utils.ts
new file mode 100644
index 0000000000..88aa5fb4ce
--- /dev/null
+++ b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/presets-parameter-utils.ts
@@ -0,0 +1,19 @@
+import { TONE_LIST } from '@/config'
+
+export const getSupportedPresetConfig = (toneId: number, supportedParameterNames?: string[]) => {
+  const tone = TONE_LIST.find(tone => tone.id === toneId)
+  if (!tone?.config)
+    return {}
+
+  if (!supportedParameterNames)
+    return { ...tone.config }
+
+  const supportedParameterNameSet = new Set(supportedParameterNames)
+
+  return Object.entries(tone.config).reduce<Record<string, number>>((acc, [key, value]) => {
+    if (supportedParameterNameSet.has(key))
+      acc[key] = value
+
+    return acc
+  }, {})
+}
diff --git a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/presets-parameter.tsx b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/presets-parameter.tsx
index cb537ab18f..6fcca9dab7 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/presets-parameter.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/presets-parameter.tsx
@@ -12,6 +12,8 @@ import { Scales02 } from '@/app/components/base/icons/src/vender/solid/FinanceAn
 import { Target04 } from '@/app/components/base/icons/src/vender/solid/general'
 import { TONE_LIST } from '@/config'
 
+const PRESET_TONE_LIST = TONE_LIST.slice(0, 3)
+
 const toneI18nKeyMap = {
   Creative: 'model.tone.Creative',
   Balanced: 'model.tone.Balanced',
@@ -27,10 +29,18 @@ const TONE_ICONS: Record<number, ReactNode> = {
 
 type PresetsParameterProps = {
   onSelect: (toneId: number) => void
+  supportedParameterNames?: string[]
 }
 
-function PresetsParameter({ onSelect }: PresetsParameterProps) {
+function PresetsParameter({ onSelect, supportedParameterNames }: PresetsParameterProps) {
   const { t } = useTranslation()
+  const supportedParameterNameSet = supportedParameterNames ? new Set(supportedParameterNames) : undefined
+  const visiblePresetTones = supportedParameterNameSet
+    ? PRESET_TONE_LIST.filter(tone => Object.keys(tone.config ?? {}).some(key => supportedParameterNameSet.has(key)))
+    : PRESET_TONE_LIST
+
+  if (!visiblePresetTones.length)
+    return null
 
   return (
     <DropdownMenu>
@@ -47,7 +57,7 @@ function PresetsParameter({ onSelect }: PresetsParameterProps) {
         <span className="ml-0.5 i-ri-arrow-down-s-line h-3.5 w-3.5" />
       </DropdownMenuTrigger>
       <DropdownMenuContent>
-        {TONE_LIST.slice(0, 3).map(tone => (
+        {visiblePresetTones.map(tone => (
           <DropdownMenuItem key={tone.id} onClick={() => onSelect(tone.id)}>
             {TONE_ICONS[tone.id]}
             {t(toneI18nKeyMap[tone.name], { ns: 'common' })}
diff --git a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/status-indicators.tsx b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/status-indicators.tsx
index cca5846390..bc505657e2 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/status-indicators.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/status-indicators.tsx
@@ -1,5 +1,6 @@
+import type { ReactNode } from 'react'
+import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
 import { RiErrorWarningFill } from '@remixicon/react'
-import Tooltip from '@/app/components/base/tooltip'
 import { SwitchPluginVersion } from '@/app/components/workflow/nodes/_base/components/switch-plugin-version'
 import Link from '@/next/link'
 import { useInstalledPluginList } from '@/service/use-plugins'
@@ -13,6 +14,28 @@ type StatusIndicatorsProps = {
   t: any
 }
 
+type StatusPopoverProps = {
+  ariaLabel: string
+  content: ReactNode
+  children: ReactNode
+}
+
+const StatusPopover = ({ ariaLabel, content, children }: StatusPopoverProps) => (
+  <Popover>
+    <PopoverTrigger
+      openOnHover
+      aria-label={ariaLabel}
+      className="inline-flex border-0 bg-transparent p-0"
+      onClick={e => e.stopPropagation()}
+    >
+      {children}
+    </PopoverTrigger>
+    <PopoverContent placement="top" popupClassName="rounded-md px-3 py-2 system-xs-regular text-text-tertiary">
+      {content}
+    </PopoverContent>
+  </Popover>
+)
+
 const StatusIndicators = ({ needsConfiguration, modelProvider, inModelList, disabled, pluginInfo, t }: StatusIndicatorsProps) => {
   const { data: pluginList } = useInstalledPluginList()
   const renderTooltipContent = (title: string, description?: string, linkText?: string, linkHref?: string) => {
@@ -48,27 +71,26 @@ const StatusIndicators = ({ needsConfiguration, modelProvider, inModelList, disa
         <>
           {inModelList
             ? (
-                <Tooltip
-                  popupContent={t('nodes.agent.modelSelectorTooltips.deprecated', { ns: 'workflow' })}
-                  asChild={false}
-                  needsDelay={false}
+                <StatusPopover
+                  ariaLabel={t('nodes.agent.modelSelectorTooltips.deprecated', { ns: 'workflow' })}
+                  content={t('nodes.agent.modelSelectorTooltips.deprecated', { ns: 'workflow' })}
                 >
                   <RiErrorWarningFill className="h-4 w-4 text-text-destructive" />
-                </Tooltip>
+                </StatusPopover>
               )
             : !pluginInfo
                 ? (
-                    <Tooltip
-                      popupContent={renderTooltipContent(
+                    <StatusPopover
+                      ariaLabel={t('nodes.agent.modelNotSupport.title', { ns: 'workflow' })}
+                      content={renderTooltipContent(
                         t('nodes.agent.modelNotSupport.title', { ns: 'workflow' }),
                         t('nodes.agent.modelNotSupport.desc', { ns: 'workflow' }),
                         t('nodes.agent.linkToPlugin', { ns: 'workflow' }),
                         '/plugins',
                       )}
-                      asChild={false}
                     >
                       <RiErrorWarningFill className="h-4 w-4 text-text-destructive" />
-                    </Tooltip>
+                    </StatusPopover>
                   )
                 : (
                     <SwitchPluginVersion
@@ -82,17 +104,17 @@ const StatusIndicators = ({ needsConfiguration, modelProvider, inModelList, disa
         </>
       )}
       {!modelProvider && !pluginInfo && (
-        <Tooltip
-          popupContent={renderTooltipContent(
+        <StatusPopover
+          ariaLabel={t('nodes.agent.modelNotInMarketplace.title', { ns: 'workflow' })}
+          content={renderTooltipContent(
             t('nodes.agent.modelNotInMarketplace.title', { ns: 'workflow' }),
             t('nodes.agent.modelNotInMarketplace.desc', { ns: 'workflow' }),
             t('nodes.agent.linkToPlugin', { ns: 'workflow' }),
             '/plugins',
           )}
-          asChild={false}
         >
           <RiErrorWarningFill className="h-4 w-4 text-text-destructive" />
-        </Tooltip>
+        </StatusPopover>
       )}
     </>
   )
diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/index.spec.tsx b/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/index.spec.tsx
index 2bcb7b712b..b7af6a14a3 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/index.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/index.spec.tsx
@@ -25,18 +25,22 @@ vi.mock('../model-selector-trigger', () => ({
   },
 }))
 
-vi.mock('../popup', () => ({
-  default: ({ onHide, onSelect }: { onHide: () => void, onSelect: (provider: string, model: ModelItem) => void }) => (
-    <>
-      <button type="button" onClick={() => onSelect('openai', { model: 'gpt-4' } as ModelItem)}>
-        select
-      </button>
-      <button type="button" onClick={onHide}>
-        hide
-      </button>
-    </>
-  ),
-}))
+vi.mock('../popup', async () => {
+  const { ComboboxItem } = await vi.importActual<typeof import('@langgenius/dify-ui/combobox')>('@langgenius/dify-ui/combobox')
+
+  return {
+    default: ({ onHide }: { onHide: () => void }) => (
+      <>
+        <ComboboxItem value={{ provider: 'openai', model: 'gpt-4' }}>
+          select
+        </ComboboxItem>
+        <button type="button" onClick={onHide}>
+          hide
+        </button>
+      </>
+    ),
+  }
+})
 
 const makeModelItem = (overrides: Partial<ModelItem> = {}): ModelItem => ({
   model: 'gpt-4',
@@ -82,7 +86,7 @@ describe('ModelSelector', () => {
   it('should toggle popup and close it after selecting a model', () => {
     renderWithQueryClient(<ModelSelector modelList={[makeModel()]} />)
 
-    const triggerButton = screen.getByRole('button', { name: 'empty-trigger' })
+    const triggerButton = screen.getByRole('combobox')
 
     fireEvent.click(triggerButton)
     expect(triggerButton).toHaveAttribute('aria-expanded', 'true')
@@ -96,7 +100,7 @@ describe('ModelSelector', () => {
     const onSelect = vi.fn()
     renderWithQueryClient(<ModelSelector modelList={[makeModel()]} onSelect={onSelect} />)
 
-    fireEvent.click(screen.getByText('empty-trigger'))
+    fireEvent.click(screen.getByRole('combobox'))
     fireEvent.click(screen.getByText('select'))
 
     expect(onSelect).toHaveBeenCalledWith({ provider: 'openai', model: 'gpt-4' })
@@ -105,7 +109,7 @@ describe('ModelSelector', () => {
   it('should close popup when popup requests hide', () => {
     renderWithQueryClient(<ModelSelector modelList={[makeModel()]} />)
 
-    const triggerButton = screen.getByRole('button', { name: 'empty-trigger' })
+    const triggerButton = screen.getByRole('combobox')
     fireEvent.click(triggerButton)
     expect(triggerButton).toHaveAttribute('aria-expanded', 'true')
     expect(screen.getByText('hide')).toBeInTheDocument()
@@ -114,6 +118,23 @@ describe('ModelSelector', () => {
     expect(triggerButton).toHaveAttribute('aria-expanded', 'false')
   })
 
+  it('should use the default model settings popup width when the trigger is narrow', () => {
+    renderWithQueryClient(
+      <div className="w-[355px]">
+        <ModelSelector modelList={[makeModel()]} />
+      </div>,
+    )
+
+    fireEvent.click(screen.getByRole('combobox'))
+
+    expect(
+      Array.from(document.body.querySelectorAll('[class]')).some(element =>
+        element.className.includes('w-[432px]')
+        && element.className.includes('max-w-[432px]'),
+      ),
+    ).toBe(true)
+  })
+
   it('should not open popup when readonly', () => {
     renderWithQueryClient(<ModelSelector modelList={[makeModel()]} readonly />)
 
diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/popover.spec.tsx b/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/popover.spec.tsx
index d7501672f4..528a5416ee 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/popover.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/popover.spec.tsx
@@ -1,14 +1,6 @@
-import type { ReactNode } from 'react'
-import { act, fireEvent, render, screen } from '@testing-library/react'
+import { fireEvent, render, screen } from '@testing-library/react'
 import ModelSelector from '../index'
 
-type PopoverProps = {
-  children: ReactNode
-  onOpenChange?: (open: boolean) => void
-}
-
-let latestOnOpenChange: PopoverProps['onOpenChange']
-
 vi.mock('../../hooks', () => ({
   useCurrentProviderAndModel: () => ({
     currentProvider: undefined,
@@ -16,15 +8,6 @@ vi.mock('../../hooks', () => ({
   }),
 }))
 
-vi.mock('@langgenius/dify-ui/popover', () => ({
-  Popover: ({ children, onOpenChange }: PopoverProps) => {
-    latestOnOpenChange = onOpenChange
-    return <div>{children}</div>
-  },
-  PopoverTrigger: ({ render }: { render: ReactNode }) => <>{render}</>,
-  PopoverContent: ({ children }: { children: ReactNode }) => <div>{children}</div>,
-}))
-
 vi.mock('../model-selector-trigger', () => ({
   default: ({ open, readonly }: { open: boolean, readonly?: boolean }) => (
     <span>
@@ -43,19 +26,16 @@ vi.mock('../popup', () => ({
   ),
 }))
 
-describe('ModelSelector popover branches', () => {
+describe('ModelSelector combobox branches', () => {
   beforeEach(() => {
     vi.clearAllMocks()
-    latestOnOpenChange = undefined
   })
 
-  it('should open and close through popover callbacks when editable', () => {
+  it('should open and close through combobox trigger when editable', () => {
     const onHide = vi.fn()
     render(<ModelSelector modelList={[]} onHide={onHide} />)
 
-    act(() => {
-      latestOnOpenChange?.(true)
-    })
+    fireEvent.click(screen.getByRole('combobox'))
 
     expect(screen.getByText('open-editable')).toBeInTheDocument()
 
@@ -65,12 +45,10 @@ describe('ModelSelector popover branches', () => {
     expect(onHide).toHaveBeenCalledTimes(1)
   })
 
-  it('should ignore popover open changes when readonly', () => {
+  it('should ignore combobox open requests when readonly', () => {
     render(<ModelSelector modelList={[]} readonly />)
 
-    act(() => {
-      latestOnOpenChange?.(true)
-    })
+    fireEvent.click(screen.getByRole('combobox'))
 
     expect(screen.getByText('closed-readonly')).toBeInTheDocument()
   })
diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/popup-item.spec.tsx b/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/popup-item.spec.tsx
index 341a9c6abc..a3db35302c 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/popup-item.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/popup-item.spec.tsx
@@ -1,4 +1,7 @@
+import type { ReactElement, ReactNode } from 'react'
 import type { DefaultModel, Model, ModelItem } from '../../declarations'
+import { Combobox } from '@langgenius/dify-ui/combobox'
+import { createPreviewCardHandle } from '@langgenius/dify-ui/preview-card'
 import { fireEvent, render, screen } from '@testing-library/react'
 import {
   ConfigurationMethodEnum,
@@ -25,7 +28,7 @@ vi.mock('../../hooks', async () => {
 })
 
 vi.mock('../../model-badge', () => ({
-  default: ({ children }: { children: React.ReactNode }) => <span>{children}</span>,
+  default: ({ children }: { children: ReactNode }) => <span>{children}</span>,
 }))
 
 vi.mock('../../model-icon', () => ({
@@ -40,16 +43,6 @@ vi.mock('../feature-icon', () => ({
   default: ({ feature }: { feature: string }) => <span data-testid="feature-icon">{feature}</span>,
 }))
 
-vi.mock('@/app/components/base/tooltip', () => ({
-  default: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
-}))
-
-vi.mock('@langgenius/dify-ui/popover', () => ({
-  Popover: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
-  PopoverTrigger: ({ render }: { render: React.ReactNode }) => <>{render}</>,
-  PopoverContent: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
-}))
-
 const mockCredentialPanelState = vi.hoisted(() => vi.fn())
 vi.mock('../../provider-added-card/use-credential-panel-state', () => ({
   useCredentialPanelState: mockCredentialPanelState,
@@ -114,6 +107,29 @@ const makeProvider = (overrides: Record<string, unknown> = {}) => ({
   ...overrides,
 })
 
+const previewCardProps = () => ({
+  previewCardHandle: createPreviewCardHandle(),
+  onPreviewCardClose: vi.fn(),
+})
+
+const createComboboxNode = (
+  node: ReactElement,
+  onValueChange = vi.fn(),
+) => (
+  <Combobox filter={null} open onValueChange={onValueChange}>
+    {node}
+  </Combobox>
+)
+
+const renderWithCombobox = (
+  node: ReactElement,
+  onValueChange = vi.fn(),
+) => {
+  return render(
+    createComboboxNode(node, onValueChange),
+  )
+}
+
 describe('PopupItem', () => {
   beforeEach(() => {
     vi.clearAllMocks()
@@ -141,48 +157,68 @@ describe('PopupItem', () => {
       modelProviders: [],
     })
 
-    const { container } = render(
-      <PopupItem model={makeModel()} onSelect={vi.fn()} onHide={vi.fn()} />,
+    const { container } = renderWithCombobox(
+      <PopupItem {...previewCardProps()} model={makeModel()} onHide={vi.fn()} />,
     )
 
-    expect(container.innerHTML).toBe('')
+    expect(container.textContent).toBe('')
   })
 
-  it('should call onSelect when clicking an active model', () => {
-    const onSelect = vi.fn()
-    render(<PopupItem model={makeModel()} onSelect={onSelect} onHide={vi.fn()} />)
+  it('should select the combobox value when clicking an active model', () => {
+    const onValueChange = vi.fn()
+    renderWithCombobox(<PopupItem {...previewCardProps()} model={makeModel()} onHide={vi.fn()} />, onValueChange)
 
     fireEvent.click(screen.getByText('GPT-4'))
 
-    expect(onSelect).toHaveBeenCalledWith('openai', expect.objectContaining({ model: 'gpt-4' }))
+    expect(onValueChange).toHaveBeenCalledWith(
+      { provider: 'openai', model: 'gpt-4' },
+      expect.objectContaining({ reason: 'item-press' }),
+    )
   })
 
-  it('should not call onSelect when model is not active', () => {
-    const onSelect = vi.fn()
-    render(
+  it('should close the shared preview before pressing an active model', () => {
+    const onPreviewCardClose = vi.fn()
+    renderWithCombobox(
       <PopupItem
-        model={makeModel({ models: [makeModelItem({ status: ModelStatusEnum.disabled })] })}
-        onSelect={onSelect}
+        previewCardHandle={createPreviewCardHandle()}
+        onPreviewCardClose={onPreviewCardClose}
+        model={makeModel()}
         onHide={vi.fn()}
       />,
     )
 
+    fireEvent.pointerDown(screen.getByText('GPT-4'))
+
+    expect(onPreviewCardClose).toHaveBeenCalledTimes(1)
+  })
+
+  it('should not select the combobox value when model is not active', () => {
+    const onValueChange = vi.fn()
+    renderWithCombobox(
+      <PopupItem
+        {...previewCardProps()}
+        model={makeModel({ models: [makeModelItem({ status: ModelStatusEnum.disabled })] })}
+        onHide={vi.fn()}
+      />,
+      onValueChange,
+    )
+
     fireEvent.click(screen.getByText('GPT-4'))
 
-    expect(onSelect).not.toHaveBeenCalled()
+    expect(onValueChange).not.toHaveBeenCalled()
   })
 
   it('should open model modal when clicking add on unconfigured model', () => {
-    const { rerender } = render(
-      <PopupItem
-        model={makeModel({ models: [makeModelItem({ status: ModelStatusEnum.noConfigure })] })}
-        onSelect={vi.fn()}
-        onHide={vi.fn()}
-      />,
+    const onValueChange = vi.fn()
+    const { rerender } = renderWithCombobox(
+      <PopupItem {...previewCardProps()} model={makeModel({ models: [makeModelItem({ status: ModelStatusEnum.noConfigure })] })} onHide={vi.fn()} />,
+      onValueChange,
     )
 
+    fireEvent.click(screen.getByText('GPT-4'))
     fireEvent.click(screen.getByText('COMMON.OPERATION.ADD'))
 
+    expect(onValueChange).not.toHaveBeenCalled()
     expect(mockSetShowModelModal).toHaveBeenCalled()
 
     const call = mockSetShowModelModal.mock.calls[0]![0] as { onSaveCallback?: () => void }
@@ -191,15 +227,15 @@ describe('PopupItem', () => {
     expect(mockUpdateModelProviders).toHaveBeenCalled()
     expect(mockUpdateModelList).toHaveBeenCalledWith(ModelTypeEnum.textGeneration)
 
-    rerender(
+    rerender(createComboboxNode(
       <PopupItem
+        {...previewCardProps()}
         model={makeModel({
           models: [makeModelItem({ status: ModelStatusEnum.noConfigure, model_type: undefined as unknown as ModelTypeEnum })],
         })}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
       />,
-    )
+    ))
 
     fireEvent.click(screen.getByText('COMMON.OPERATION.ADD'))
     const call2 = mockSetShowModelModal.mock.calls.at(-1)?.[0] as { onSaveCallback?: () => void } | undefined
@@ -211,11 +247,11 @@ describe('PopupItem', () => {
 
   it('should show selected state when defaultModel matches', () => {
     const defaultModel: DefaultModel = { provider: 'openai', model: 'gpt-4' }
-    render(
+    renderWithCombobox(
       <PopupItem
+        {...previewCardProps()}
         defaultModel={defaultModel}
         model={makeModel()}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
       />,
     )
@@ -226,13 +262,13 @@ describe('PopupItem', () => {
   it('should fall back to english labels when the current language is unavailable', () => {
     mockUseLanguage.mockReturnValue('zh_Hans')
 
-    render(
+    renderWithCombobox(
       <PopupItem
+        {...previewCardProps()}
         model={makeModel({
           label: { en_US: 'OpenAI only' } as Model['label'],
           models: [makeModelItem({ label: { en_US: 'GPT-4 only' } as ModelItem['label'] })],
         })}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
       />,
     )
@@ -242,7 +278,7 @@ describe('PopupItem', () => {
   })
 
   it('should toggle collapsed state when clicking provider header', () => {
-    render(<PopupItem model={makeModel()} onSelect={vi.fn()} onHide={vi.fn()} />)
+    renderWithCombobox(<PopupItem {...previewCardProps()} model={makeModel()} onHide={vi.fn()} />)
 
     expect(screen.getByText('GPT-4'))!.toBeInTheDocument()
 
@@ -256,7 +292,7 @@ describe('PopupItem', () => {
   })
 
   it('should show credential name when using custom provider', () => {
-    render(<PopupItem model={makeModel()} onSelect={vi.fn()} onHide={vi.fn()} />)
+    renderWithCombobox(<PopupItem {...previewCardProps()} model={makeModel()} onHide={vi.fn()} />)
 
     expect(screen.getByText('my-api-key'))!.toBeInTheDocument()
   })
@@ -273,7 +309,7 @@ describe('PopupItem', () => {
       credits: 200,
     })
 
-    render(<PopupItem model={makeModel()} onSelect={vi.fn()} onHide={vi.fn()} />)
+    renderWithCombobox(<PopupItem {...previewCardProps()} model={makeModel()} onHide={vi.fn()} />)
 
     expect(screen.getByText('stale-key'))!.toBeInTheDocument()
     expect(document.querySelector('.bg-components-badge-status-light-error-bg')).not.toBeNull()
@@ -299,7 +335,7 @@ describe('PopupItem', () => {
       credits: 0,
     })
 
-    render(<PopupItem model={makeModel()} onSelect={vi.fn()} onHide={vi.fn()} />)
+    renderWithCombobox(<PopupItem {...previewCardProps()} model={makeModel()} onHide={vi.fn()} />)
 
     expect(screen.getByText(/modelProvider\.selector\.configureRequired/))!.toBeInTheDocument()
   })
@@ -321,7 +357,7 @@ describe('PopupItem', () => {
       credits: 200,
     })
 
-    render(<PopupItem model={makeModel()} onSelect={vi.fn()} onHide={vi.fn()} />)
+    renderWithCombobox(<PopupItem {...previewCardProps()} model={makeModel()} onHide={vi.fn()} />)
 
     expect(screen.getByText(/modelProvider\.selector\.aiCredits/))!.toBeInTheDocument()
   })
@@ -346,7 +382,7 @@ describe('PopupItem', () => {
       credits: 0,
     })
 
-    render(<PopupItem model={makeModel()} onSelect={vi.fn()} onHide={vi.fn()} />)
+    renderWithCombobox(<PopupItem {...previewCardProps()} model={makeModel()} onHide={vi.fn()} />)
 
     expect(screen.getByText(/modelProvider\.selector\.creditsExhausted/))!.toBeInTheDocument()
   })
@@ -354,8 +390,9 @@ describe('PopupItem', () => {
   it('should close the dropdown through dropdown content callbacks', () => {
     const onHide = vi.fn()
 
-    render(<PopupItem model={makeModel()} onSelect={vi.fn()} onHide={onHide} />)
+    renderWithCombobox(<PopupItem {...previewCardProps()} model={makeModel()} onHide={onHide} />)
 
+    fireEvent.click(screen.getByRole('button', { name: /my-api-key/ }))
     fireEvent.click(screen.getByRole('button', { name: 'close dropdown' }))
 
     expect(onHide).toHaveBeenCalled()
diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/popup.spec.tsx b/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/popup.spec.tsx
index 42232a71c0..4776ad2268 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/popup.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/popup.spec.tsx
@@ -1,7 +1,11 @@
 import type { ReactElement } from 'react'
 import type { Model, ModelItem, ModelProvider } from '../../declarations'
+import type { PopupProps } from '../popup'
 import type { SystemFeatures } from '@/types/feature'
+import { Combobox } from '@langgenius/dify-ui/combobox'
 import { fireEvent, screen, waitFor } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { useState } from 'react'
 import { renderWithSystemFeatures } from '@/__tests__/utils/mock-system-features'
 import {
   ConfigurationMethodEnum,
@@ -69,10 +73,31 @@ vi.mock('@/context/provider-context', () => ({
   useProviderContext: () => ({ modelProviders: mockContextModelProviders.current }),
 }))
 
-const renderPopup = (ui: ReactElement) => renderWithSystemFeatures(ui, {
-  // The Popup component never inspects trial_models beyond passing them
-  // through, so an opaque string[] is enough; cast to satisfy the
-  // ModelProviderQuotaGetPaid[] declared on SystemFeatures.
+type PopupTestProps = Omit<PopupProps, 'inputValue' | 'onInputValueChange'>
+
+function PopupHarness(props: PopupTestProps) {
+  const [inputValue, setInputValue] = useState('')
+
+  return (
+    <Combobox
+      filter={null}
+      inputValue={inputValue}
+      open
+      onInputValueChange={(newInputValue, details) => {
+        if (details.reason !== 'item-press')
+          setInputValue(newInputValue)
+      }}
+    >
+      <Popup
+        {...props}
+        inputValue={inputValue}
+        onInputValueChange={setInputValue}
+      />
+    </Combobox>
+  )
+}
+
+const renderPopup = (ui: ReactElement<PopupTestProps>) => renderWithSystemFeatures(ui, {
   systemFeatures: { trial_models: mockTrialModels.current as unknown as SystemFeatures['trial_models'] },
 })
 
@@ -193,11 +218,12 @@ describe('Popup', () => {
     })
   })
 
-  it('should filter models by search and allow clearing search', () => {
-    const { container } = renderPopup(
-      <Popup
+  it('should filter models by search and allow clearing search without blurring the input', async () => {
+    const user = userEvent.setup()
+
+    renderPopup(
+      <PopupHarness
         modelList={[makeModel()]}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
       />,
     )
@@ -205,18 +231,21 @@ describe('Popup', () => {
     expect(screen.getByText('openai'))!.toBeInTheDocument()
 
     const input = screen.getByPlaceholderText('datasetSettings.form.searchModel')
-    fireEvent.change(input, { target: { value: 'not-found' } })
+    await user.click(input)
+    await user.keyboard('not-found')
     expect(screen.getByText('No model found for \u201Cnot-found\u201D'))!.toBeInTheDocument()
 
-    const clearIcon = container.querySelector('.i-custom-vender-solid-general-x-circle')
-    expect(clearIcon)!.toBeInTheDocument()
-    fireEvent.click(clearIcon!)
+    const clearButton = screen.getByRole('button', { name: 'common.operation.clear' })
+    expect(clearButton)!.toBeInTheDocument()
+    await user.click(clearButton)
+
     expect((input as HTMLInputElement).value).toBe('')
+    expect(input).toHaveFocus()
   })
 
   it('should show matching models when searching by model name', () => {
     renderPopup(
-      <Popup
+      <PopupHarness
         modelList={[
           makeModel({
             models: [makeModelItem({ model: 'gpt-4', label: { en_US: 'GPT-4', zh_Hans: 'GPT-4' } })],
@@ -227,7 +256,6 @@ describe('Popup', () => {
             models: [makeModelItem({ model: 'claude-3', label: { en_US: 'Claude 3', zh_Hans: 'Claude 3' } })],
           }),
         ]}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
       />,
     )
@@ -246,7 +274,7 @@ describe('Popup', () => {
 
   it('should show empty search placeholder when no provider or model name matches', () => {
     renderPopup(
-      <Popup
+      <PopupHarness
         modelList={[
           makeModel({
             label: { en_US: 'OpenAI', zh_Hans: 'OpenAI' },
@@ -255,7 +283,6 @@ describe('Popup', () => {
             ],
           }),
         ]}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
       />,
     )
@@ -272,7 +299,7 @@ describe('Popup', () => {
 
   it('should show all models of a provider when searching by provider label', () => {
     renderPopup(
-      <Popup
+      <PopupHarness
         modelList={[
           makeModel({
             provider: 'openai',
@@ -290,7 +317,6 @@ describe('Popup', () => {
             ],
           }),
         ]}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
       />,
     )
@@ -307,9 +333,183 @@ describe('Popup', () => {
     expect(screen.queryByText('claude-3')).not.toBeInTheDocument()
   })
 
+  it('should fuzzy match provider labels and keep all compatible provider models visible', () => {
+    renderPopup(
+      <PopupHarness
+        modelList={[
+          makeModel({
+            provider: 'openai',
+            label: { en_US: 'OpenAI', zh_Hans: 'OpenAI' },
+            models: [
+              makeModelItem({ model: 'gpt-4', label: { en_US: 'GPT-4', zh_Hans: 'GPT-4' } }),
+              makeModelItem({ model: 'gpt-4o', label: { en_US: 'GPT-4o', zh_Hans: 'GPT-4o' } }),
+            ],
+          }),
+          makeModel({
+            provider: 'anthropic',
+            label: { en_US: 'Anthropic', zh_Hans: 'Anthropic' },
+            models: [
+              makeModelItem({ model: 'claude-3', label: { en_US: 'Claude 3', zh_Hans: 'Claude 3' } }),
+            ],
+          }),
+        ]}
+        onHide={vi.fn()}
+      />,
+    )
+
+    fireEvent.change(
+      screen.getByPlaceholderText('datasetSettings.form.searchModel'),
+      { target: { value: 'opnai' } },
+    )
+
+    expect(screen.getByText('openai'))!.toBeInTheDocument()
+    expect(screen.getByText('gpt-4'))!.toBeInTheDocument()
+    expect(screen.getByText('gpt-4o'))!.toBeInTheDocument()
+    expect(screen.queryByText('anthropic')).not.toBeInTheDocument()
+  })
+
+  it('should match model labels without expanding unmatched provider models', () => {
+    renderPopup(
+      <PopupHarness
+        modelList={[
+          makeModel({
+            provider: 'openai',
+            label: { en_US: 'OpenAI', zh_Hans: 'OpenAI' },
+            models: [
+              makeModelItem({ model: 'gpt-4', label: { en_US: 'GPT-4', zh_Hans: 'GPT-4' } }),
+            ],
+          }),
+          makeModel({
+            provider: 'anthropic',
+            label: { en_US: 'Anthropic', zh_Hans: 'Anthropic' },
+            models: [
+              makeModelItem({ model: 'claude-3', label: { en_US: 'Claude 3', zh_Hans: 'Claude 3' } }),
+              makeModelItem({ model: 'claude-instant', label: { en_US: 'Claude Instant', zh_Hans: 'Claude Instant' } }),
+            ],
+          }),
+        ]}
+        onHide={vi.fn()}
+      />,
+    )
+
+    fireEvent.change(
+      screen.getByPlaceholderText('datasetSettings.form.searchModel'),
+      { target: { value: 'claude3' } },
+    )
+
+    expect(screen.queryByText('openai')).not.toBeInTheDocument()
+    expect(screen.getByText('anthropic'))!.toBeInTheDocument()
+    expect(screen.getByText('claude-3'))!.toBeInTheDocument()
+    expect(screen.queryByText('claude-instant')).not.toBeInTheDocument()
+  })
+
+  it('should match model names without separators', () => {
+    renderPopup(
+      <PopupHarness
+        modelList={[
+          makeModel({
+            provider: 'langgenius/openai/openai',
+            label: { en_US: 'OpenAI', zh_Hans: 'OpenAI' },
+            models: [
+              makeModelItem({ model: 'gpt-5.4', label: { en_US: 'gpt-5.4', zh_Hans: 'gpt-5.4' } }),
+              makeModelItem({ model: 'gpt-5.4-2026-03-05', label: { en_US: 'gpt-5.4-2026-03-05', zh_Hans: 'gpt-5.4-2026-03-05' } }),
+              makeModelItem({ model: 'gpt-5.4-mini', label: { en_US: 'gpt-5.4-mini', zh_Hans: 'gpt-5.4-mini' } }),
+              makeModelItem({ model: 'gpt-5.4-nano', label: { en_US: 'gpt-5.4-nano', zh_Hans: 'gpt-5.4-nano' } }),
+              makeModelItem({ model: 'gpt-5.3-chat-latest', label: { en_US: 'gpt-5.3-chat-latest', zh_Hans: 'gpt-5.3-chat-latest' } }),
+              makeModelItem({ model: 'gpt-5.2', label: { en_US: 'gpt-5.2', zh_Hans: 'gpt-5.2' } }),
+              makeModelItem({ model: 'gpt-4.1', label: { en_US: 'gpt-4.1', zh_Hans: 'gpt-4.1' } }),
+            ],
+          }),
+        ]}
+        onHide={vi.fn()}
+      />,
+    )
+
+    fireEvent.change(
+      screen.getByPlaceholderText('datasetSettings.form.searchModel'),
+      { target: { value: 'gpt5.4' } },
+    )
+
+    expect(screen.getByText('gpt-5.4'))!.toBeInTheDocument()
+    expect(screen.getByText('gpt-5.4-2026-03-05'))!.toBeInTheDocument()
+    expect(screen.getByText('gpt-5.4-mini'))!.toBeInTheDocument()
+    expect(screen.getByText('gpt-5.4-nano'))!.toBeInTheDocument()
+    expect(screen.queryByText('gpt-5.3-chat-latest')).not.toBeInTheDocument()
+    expect(screen.queryByText('gpt-5.2')).not.toBeInTheDocument()
+    expect(screen.queryByText('gpt-4.1')).not.toBeInTheDocument()
+  })
+
+  it('should not fuzzy match unrelated providers that share the langgenius namespace', () => {
+    renderPopup(
+      <PopupHarness
+        modelList={[
+          makeModel({
+            provider: 'langgenius/openai/openai',
+            label: { en_US: 'OpenAI', zh_Hans: 'OpenAI' },
+            models: [makeModelItem({ model: 'gpt-5.4', label: { en_US: 'gpt-5.4', zh_Hans: 'gpt-5.4' } })],
+          }),
+          makeModel({
+            provider: 'langgenius/openrouter/openrouter',
+            label: { en_US: 'OpenRouter', zh_Hans: 'OpenRouter' },
+            models: [makeModelItem({ model: 'openrouter-model', label: { en_US: 'OpenRouter Model', zh_Hans: 'OpenRouter Model' } })],
+          }),
+          makeModel({
+            provider: 'langgenius/openai_api_compatible/openai_api_compatible',
+            label: { en_US: 'OpenAI-API-compatible', zh_Hans: 'OpenAI-API-compatible' },
+            models: [makeModelItem({ model: 'compatible-model', label: { en_US: 'Compatible Model', zh_Hans: 'Compatible Model' } })],
+          }),
+        ]}
+        onHide={vi.fn()}
+      />,
+    )
+
+    fireEvent.change(
+      screen.getByPlaceholderText('datasetSettings.form.searchModel'),
+      { target: { value: 'openai' } },
+    )
+
+    expect(screen.getByText('langgenius/openai/openai'))!.toBeInTheDocument()
+    expect(screen.getByText('langgenius/openai_api_compatible/openai_api_compatible'))!.toBeInTheDocument()
+    expect(screen.queryByText('langgenius/openrouter/openrouter')).not.toBeInTheDocument()
+  })
+
+  it('should fuzzy match provider names without matching every langgenius provider', () => {
+    renderPopup(
+      <PopupHarness
+        modelList={[
+          makeModel({
+            provider: 'langgenius/zhipuai/zhipuai',
+            label: { en_US: 'ZHIPU AI', zh_Hans: '智谱 AI' },
+            models: [makeModelItem({ model: 'glm-4.7', label: { en_US: 'GLM-4.7', zh_Hans: 'GLM-4.7' } })],
+          }),
+          makeModel({
+            provider: 'langgenius/gemini/google',
+            label: { en_US: 'Gemini', zh_Hans: 'Gemini' },
+            models: [makeModelItem({ model: 'gemini-3-flash-preview', label: { en_US: 'gemini-3-flash-preview', zh_Hans: 'gemini-3-flash-preview' } })],
+          }),
+          makeModel({
+            provider: 'langgenius/tongyi/tongyi',
+            label: { en_US: 'Tongyi', zh_Hans: '通义' },
+            models: [makeModelItem({ model: 'qwen-plus', label: { en_US: 'qwen-plus', zh_Hans: 'qwen-plus' } })],
+          }),
+        ]}
+        onHide={vi.fn()}
+      />,
+    )
+
+    fireEvent.change(
+      screen.getByPlaceholderText('datasetSettings.form.searchModel'),
+      { target: { value: 'gemni' } },
+    )
+
+    expect(screen.getByText('langgenius/gemini/google'))!.toBeInTheDocument()
+    expect(screen.queryByText('langgenius/zhipuai/zhipuai')).not.toBeInTheDocument()
+    expect(screen.queryByText('langgenius/tongyi/tongyi')).not.toBeInTheDocument()
+  })
+
   it('should match by model provider key when model label does not contain the search text', () => {
     renderPopup(
-      <Popup
+      <PopupHarness
         modelList={[
           makeModel({
             provider: 'azure_openai',
@@ -319,7 +519,6 @@ describe('Popup', () => {
             ],
           }),
         ]}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
       />,
     )
@@ -337,7 +536,7 @@ describe('Popup', () => {
     mockSupportFunctionCall.mockReturnValue(false)
 
     renderPopup(
-      <Popup
+      <PopupHarness
         modelList={[
           makeModel({
             provider: 'openai',
@@ -348,7 +547,6 @@ describe('Popup', () => {
             ],
           }),
         ]}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
         scopeFeatures={[ModelFeatureEnum.toolCall]}
       />,
@@ -366,9 +564,8 @@ describe('Popup', () => {
 
   it('should not show compatible-only helper text when no scope features are applied', () => {
     renderPopup(
-      <Popup
+      <PopupHarness
         modelList={[makeModel()]}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
       />,
     )
@@ -378,9 +575,8 @@ describe('Popup', () => {
 
   it('should show compatible-only helper text when scope features are applied', () => {
     renderPopup(
-      <Popup
+      <PopupHarness
         modelList={[makeModel()]}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
         scopeFeatures={[ModelFeatureEnum.vision]}
       />,
@@ -392,9 +588,8 @@ describe('Popup', () => {
 
   it('should keep search and footer outside the scrollable model list', () => {
     renderPopup(
-      <Popup
+      <PopupHarness
         modelList={[makeModel()]}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
         scopeFeatures={[ModelFeatureEnum.vision]}
       />,
@@ -417,9 +612,8 @@ describe('Popup', () => {
 
     mockSupportFunctionCall.mockReturnValue(false)
     const { unmount } = renderPopup(
-      <Popup
+      <PopupHarness
         modelList={modelList}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
         scopeFeatures={[ModelFeatureEnum.toolCall, ModelFeatureEnum.vision]}
       />,
@@ -429,9 +623,8 @@ describe('Popup', () => {
     unmount()
     mockSupportFunctionCall.mockReturnValue(true)
     const { unmount: unmount2 } = renderPopup(
-      <Popup
+      <PopupHarness
         modelList={modelList}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
         scopeFeatures={[ModelFeatureEnum.toolCall, ModelFeatureEnum.vision]}
       />,
@@ -440,9 +633,8 @@ describe('Popup', () => {
 
     unmount2()
     const { unmount: unmount3 } = renderPopup(
-      <Popup
+      <PopupHarness
         modelList={modelList}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
         scopeFeatures={[ModelFeatureEnum.vision]}
       />,
@@ -451,9 +643,8 @@ describe('Popup', () => {
 
     unmount3()
     renderPopup(
-      <Popup
+      <PopupHarness
         modelList={[makeModel({ models: [makeModelItem({ features: undefined })] })]}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
         scopeFeatures={[ModelFeatureEnum.vision]}
       />,
@@ -465,7 +656,7 @@ describe('Popup', () => {
     mockLanguage = 'fr_FR'
 
     renderPopup(
-      <Popup
+      <PopupHarness
         modelList={[
           makeModel({
             models: [
@@ -475,7 +666,6 @@ describe('Popup', () => {
             ],
           }),
         ]}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
       />,
     )
@@ -504,9 +694,8 @@ describe('Popup', () => {
     ]
 
     renderPopup(
-      <Popup
+      <PopupHarness
         modelList={[makeModel()]}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
       />,
     )
@@ -531,9 +720,8 @@ describe('Popup', () => {
     ]
 
     renderPopup(
-      <Popup
+      <PopupHarness
         modelList={[makeModel()]}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
       />,
     )
@@ -561,9 +749,8 @@ describe('Popup', () => {
     ]
 
     renderPopup(
-      <Popup
+      <PopupHarness
         modelList={[makeModel()]}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
       />,
     )
@@ -574,9 +761,8 @@ describe('Popup', () => {
   it('should open provider settings when clicking footer link', () => {
     const onHide = vi.fn()
     renderPopup(
-      <Popup
+      <PopupHarness
         modelList={[makeModel()]}
-        onSelect={vi.fn()}
         onHide={onHide}
       />,
     )
@@ -592,9 +778,8 @@ describe('Popup', () => {
   it('should show empty state when no providers are configured', () => {
     const onHide = vi.fn()
     renderPopup(
-      <Popup
+      <PopupHarness
         modelList={[]}
-        onSelect={vi.fn()}
         onHide={onHide}
       />,
     )
@@ -613,9 +798,8 @@ describe('Popup', () => {
     mockContextModelProviders.current = [makeContextProvider({ provider: 'test-openai' })]
 
     renderPopup(
-      <Popup
+      <PopupHarness
         modelList={[]}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
       />,
     )
@@ -635,9 +819,8 @@ describe('Popup', () => {
     })]
 
     renderPopup(
-      <Popup
+      <PopupHarness
         modelList={[]}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
       />,
     )
@@ -660,9 +843,8 @@ describe('Popup', () => {
     })]
 
     renderPopup(
-      <Popup
+      <PopupHarness
         modelList={[]}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
       />,
     )
@@ -674,9 +856,8 @@ describe('Popup', () => {
 
   it('should toggle marketplace section collapse', () => {
     renderPopup(
-      <Popup
+      <PopupHarness
         modelList={[]}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
       />,
     )
@@ -699,9 +880,8 @@ describe('Popup', () => {
     mockInstallMutateAsync.mockResolvedValue({ all_installed: true, task_id: 'task-1' })
 
     renderPopup(
-      <Popup
+      <PopupHarness
         modelList={[]}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
       />,
     )
@@ -722,9 +902,8 @@ describe('Popup', () => {
     mockInstallMutateAsync.mockRejectedValue(new Error('Install failed'))
 
     renderPopup(
-      <Popup
+      <PopupHarness
         modelList={[]}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
       />,
     )
@@ -736,7 +915,6 @@ describe('Popup', () => {
       expect(mockInstallMutateAsync).toHaveBeenCalled()
     })
 
-    // Should not crash, install buttons should still be available
     expect(screen.getAllByText(/common\.modelProvider\.selector\.install/).length).toBeGreaterThan(0)
   })
 
@@ -748,9 +926,8 @@ describe('Popup', () => {
     mockCheck.mockResolvedValue(undefined)
 
     renderPopup(
-      <Popup
+      <PopupHarness
         modelList={[]}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
       />,
     )
@@ -774,9 +951,8 @@ describe('Popup', () => {
     mockMarketplacePlugins.isLoading = true
 
     renderPopup(
-      <Popup
+      <PopupHarness
         modelList={[]}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
       />,
     )
@@ -792,9 +968,8 @@ describe('Popup', () => {
     mockMarketplacePlugins.current = []
 
     renderPopup(
-      <Popup
+      <PopupHarness
         modelList={[]}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
       />,
     )
@@ -808,13 +983,12 @@ describe('Popup', () => {
 
   it('should sort the selected provider to the top when a default model is provided', () => {
     renderPopup(
-      <Popup
+      <PopupHarness
         defaultModel={{ provider: 'anthropic', model: 'claude-3' }}
         modelList={[
           makeModel({ provider: 'openai', label: { en_US: 'OpenAI', zh_Hans: 'OpenAI' } }),
           makeModel({ provider: 'anthropic', label: { en_US: 'Anthropic', zh_Hans: 'Anthropic' } }),
         ]}
-        onSelect={vi.fn()}
         onHide={vi.fn()}
       />,
     )
diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/feature-icon.tsx b/web/app/components/header/account-setting/model-provider-page/model-selector/feature-icon.tsx
index cc5e0154d7..69dff3a158 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-selector/feature-icon.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-selector/feature-icon.tsx
@@ -1,17 +1,7 @@
-import type { FC } from 'react'
 import { cn } from '@langgenius/dify-ui/cn'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
-import {
-  RiFileTextLine,
-  RiFilmAiLine,
-  RiImageCircleAiLine,
-  RiVoiceAiFill,
-} from '@remixicon/react'
 import { useTranslation } from 'react-i18next'
-import {
-  ModelFeatureEnum,
-  ModelFeatureTextEnum,
-} from '../declarations'
+import { ModelFeatureEnum, ModelFeatureTextEnum } from '../declarations'
 import ModelBadge from '../model-badge'
 
 type FeatureIconProps = {
@@ -19,56 +9,20 @@ type FeatureIconProps = {
   className?: string
   showFeaturesLabel?: boolean
 }
-const FeatureIcon: FC<FeatureIconProps> = ({
+function FeatureIcon({
   className,
   feature,
   showFeaturesLabel,
-}) => {
+}: FeatureIconProps) {
   const { t } = useTranslation()
 
-  // if (feature === ModelFeatureEnum.agentThought) {
-  //   return (
-  //     <Tooltip
-  //       popupContent={t('common.modelProvider.featureSupported', { feature: ModelFeatureTextEnum.agentThought })}
-  //     >
-  //       <ModelBadge className={`mr-0.5 px-0! w-[18px] justify-center text-gray-500 ${className}`}>
-  //         <Robot className='w-3 h-3' />
-  //       </ModelBadge>
-  //     </Tooltip>
-  //   )
-  // }
-
-  // if (feature === ModelFeatureEnum.toolCall) {
-  //   return (
-  //     <Tooltip
-  //       popupContent={t('common.modelProvider.featureSupported', { feature: ModelFeatureTextEnum.toolCall })}
-  //     >
-  //       <ModelBadge className={`mr-0.5 px-0! w-[18px] justify-center text-gray-500 ${className}`}>
-  //         <MagicWand className='w-3 h-3' />
-  //       </ModelBadge>
-  //     </Tooltip>
-  //   )
-  // }
-
-  // if (feature === ModelFeatureEnum.multiToolCall) {
-  //   return (
-  //     <Tooltip
-  //       popupContent={t('common.modelProvider.featureSupported', { feature: ModelFeatureTextEnum.multiToolCall })}
-  //     >
-  //       <ModelBadge className={`mr-0.5 px-0! w-[18px] justify-center text-gray-500 ${className}`}>
-  //         <MagicBox className='w-3 h-3' />
-  //       </ModelBadge>
-  //     </Tooltip>
-  //   )
-  // }
-
   if (feature === ModelFeatureEnum.vision) {
     if (showFeaturesLabel) {
       return (
         <ModelBadge
           className={cn('gap-x-0.5', className)}
         >
-          <RiImageCircleAiLine className="size-3" />
+          <span className="i-ri-image-circle-ai-line size-3" aria-hidden="true" />
           <span>{ModelFeatureTextEnum.vision}</span>
         </ModelBadge>
       )
@@ -81,11 +35,11 @@ const FeatureIcon: FC<FeatureIconProps> = ({
             <div className="inline-block cursor-help">
               <ModelBadge
                 className={cn(
-                  'w-[18px] justify-center px-0!',
+                  'w-4.5 justify-center px-0!',
                   className,
                 )}
               >
-                <RiImageCircleAiLine className="size-3" />
+                <span className="i-ri-image-circle-ai-line size-3" aria-hidden="true" />
               </ModelBadge>
             </div>
           )}
@@ -103,7 +57,7 @@ const FeatureIcon: FC<FeatureIconProps> = ({
         <ModelBadge
           className={cn('gap-x-0.5', className)}
         >
-          <RiFileTextLine className="size-3" />
+          <span className="i-ri-file-text-line size-3" aria-hidden="true" />
           <span>{ModelFeatureTextEnum.document}</span>
         </ModelBadge>
       )
@@ -116,11 +70,11 @@ const FeatureIcon: FC<FeatureIconProps> = ({
             <div className="inline-block cursor-help">
               <ModelBadge
                 className={cn(
-                  'w-[18px] justify-center px-0!',
+                  'w-4.5 justify-center px-0!',
                   className,
                 )}
               >
-                <RiFileTextLine className="size-3" />
+                <span className="i-ri-file-text-line size-3" aria-hidden="true" />
               </ModelBadge>
             </div>
           )}
@@ -138,7 +92,7 @@ const FeatureIcon: FC<FeatureIconProps> = ({
         <ModelBadge
           className={cn('gap-x-0.5', className)}
         >
-          <RiVoiceAiFill className="size-3" />
+          <span className="i-ri-voice-ai-fill size-3" aria-hidden="true" />
           <span>{ModelFeatureTextEnum.audio}</span>
         </ModelBadge>
       )
@@ -151,11 +105,11 @@ const FeatureIcon: FC<FeatureIconProps> = ({
             <div className="inline-block cursor-help">
               <ModelBadge
                 className={cn(
-                  'w-[18px] justify-center px-0!',
+                  'w-4.5 justify-center px-0!',
                   className,
                 )}
               >
-                <RiVoiceAiFill className="size-3" />
+                <span className="i-ri-voice-ai-fill size-3" aria-hidden="true" />
               </ModelBadge>
             </div>
           )}
@@ -173,7 +127,7 @@ const FeatureIcon: FC<FeatureIconProps> = ({
         <ModelBadge
           className={cn('gap-x-0.5', className)}
         >
-          <RiFilmAiLine className="size-3" />
+          <span className="i-ri-film-ai-line size-3" aria-hidden="true" />
           <span>{ModelFeatureTextEnum.video}</span>
         </ModelBadge>
       )
@@ -186,11 +140,11 @@ const FeatureIcon: FC<FeatureIconProps> = ({
             <div className="inline-block cursor-help">
               <ModelBadge
                 className={cn(
-                  'w-[18px] justify-center px-0!',
+                  'w-4.5 justify-center px-0!',
                   className,
                 )}
               >
-                <RiFilmAiLine className="size-3" />
+                <span className="i-ri-film-ai-line size-3" aria-hidden="true" />
               </ModelBadge>
             </div>
           )}
diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/index.tsx b/web/app/components/header/account-setting/model-provider-page/model-selector/index.tsx
index 835821fd59..79ea3dc9c3 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-selector/index.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-selector/index.tsx
@@ -1,19 +1,15 @@
-import type { FC } from 'react'
-import type {
-  DefaultModel,
-  Model,
-  ModelFeatureEnum,
-  ModelItem,
-} from '../declarations'
-import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from '@langgenius/dify-ui/popover'
-import { useState } from 'react'
+import type { ComboboxRootChangeEventDetails } from '@langgenius/dify-ui/combobox'
+import type { DefaultModel, Model, ModelFeatureEnum, ModelItem } from '../declarations'
+import type { ModelSelectorValue } from './types'
+import { cn } from '@langgenius/dify-ui/cn'
+import { Combobox, ComboboxContent, ComboboxTrigger } from '@langgenius/dify-ui/combobox'
+import { useCallback, useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { ModelStatusEnum } from '../declarations'
 import { useCurrentProviderAndModel } from '../hooks'
 import ModelSelectorTrigger from './model-selector-trigger'
 import Popup from './popup'
+import { getModelSelectorValueLabel, isSameModelSelectorValue } from './types'
 
 type ModelSelectorProps = {
   defaultModel?: DefaultModel
@@ -27,7 +23,7 @@ type ModelSelectorProps = {
   deprecatedClassName?: string
   showDeprecatedWarnIcon?: boolean
 }
-const ModelSelector: FC<ModelSelectorProps> = ({
+function ModelSelector({
   defaultModel,
   modelList,
   triggerClassName,
@@ -38,8 +34,10 @@ const ModelSelector: FC<ModelSelectorProps> = ({
   scopeFeatures = [],
   deprecatedClassName,
   showDeprecatedWarnIcon = true,
-}) => {
+}: ModelSelectorProps) {
+  const { t } = useTranslation()
   const [open, setOpen] = useState(false)
+  const [inputValue, setInputValue] = useState('')
   const {
     currentProvider,
     currentModel,
@@ -47,62 +45,103 @@ const ModelSelector: FC<ModelSelectorProps> = ({
     modelList,
     defaultModel,
   )
+  const currentValue = useMemo<ModelSelectorValue | null>(() => {
+    if (!currentProvider || !currentModel)
+      return null
 
-  const handleSelect = (provider: string, model: ModelItem) => {
+    return {
+      provider: currentProvider.provider,
+      model: currentModel.model,
+    }
+  }, [currentModel, currentProvider])
+
+  const handleOpenChange = useCallback((newOpen: boolean) => {
+    if (readonly)
+      return
+
+    setOpen(newOpen)
+    if (!newOpen)
+      setInputValue('')
+  }, [readonly])
+
+  const handleSelect = useCallback((provider: string, model: ModelItem) => {
     setOpen(false)
+    setInputValue('')
 
     if (onSelect)
       onSelect({ provider, model: model.model })
-  }
+  }, [onSelect])
+
+  const handleValueChange = useCallback((value: ModelSelectorValue | null) => {
+    if (!value)
+      return
+
+    const provider = modelList.find(model => model.provider === value.provider)
+    const model = provider?.models.find(model => model.model === value.model)
+
+    if (!provider || !model)
+      return
+    if (model.status !== ModelStatusEnum.active)
+      return
+
+    handleSelect(provider.provider, model)
+  }, [handleSelect, modelList])
+
+  const handleInputValueChange = useCallback((inputValue: string, details: ComboboxRootChangeEventDetails) => {
+    if (details.reason !== 'item-press')
+      setInputValue(inputValue)
+  }, [])
+
+  const handleHide = useCallback(() => {
+    setOpen(false)
+    setInputValue('')
+    onHide?.()
+  }, [onHide])
 
   return (
-    <Popover
+    <Combobox<ModelSelectorValue>
+      filter={null}
+      inputValue={inputValue}
+      isItemEqualToValue={isSameModelSelectorValue}
+      itemToStringLabel={getModelSelectorValueLabel}
       open={open}
-      onOpenChange={(newOpen) => {
-        if (readonly)
-          return
-        setOpen(newOpen)
-      }}
+      value={currentValue}
+      onInputValueChange={handleInputValueChange}
+      onOpenChange={handleOpenChange}
+      onValueChange={handleValueChange}
     >
-      <PopoverTrigger
-        render={(
-          <button
-            type="button"
-            className="block w-full border-0 bg-transparent p-0 text-left"
-            disabled={readonly}
-          >
-            <ModelSelectorTrigger
-              currentProvider={currentProvider}
-              currentModel={currentModel}
-              defaultModel={defaultModel}
-              open={open}
-              readonly={readonly}
-              className={triggerClassName}
-              deprecatedClassName={deprecatedClassName}
-              showDeprecatedWarnIcon={showDeprecatedWarnIcon}
-            />
-          </button>
-        )}
-      />
-      <PopoverContent
+      <ComboboxTrigger
+        aria-label={t('detailPanel.configureModel', { ns: 'plugin' })}
+        icon={false}
+        className="block h-auto w-full border-0 bg-transparent p-0 text-left hover:bg-transparent focus-visible:bg-transparent focus-visible:ring-0 data-open:bg-transparent"
+        disabled={readonly}
+      >
+        <ModelSelectorTrigger
+          currentProvider={currentProvider}
+          currentModel={currentModel}
+          defaultModel={defaultModel}
+          open={open}
+          readonly={readonly}
+          className={triggerClassName}
+          deprecatedClassName={deprecatedClassName}
+          showDeprecatedWarnIcon={showDeprecatedWarnIcon}
+        />
+      </ComboboxTrigger>
+      <ComboboxContent
         placement="bottom-start"
         sideOffset={4}
-        className={popupClassName}
-        popupClassName="overflow-hidden rounded-xl"
-        popupProps={{ style: { minWidth: '320px', width: 'var(--anchor-width, auto)' } }}
+        popupClassName={cn('w-[432px] max-w-[432px] overflow-hidden rounded-xl', popupClassName)}
       >
         <Popup
           defaultModel={defaultModel}
+          inputValue={inputValue}
           modelList={modelList}
-          onSelect={handleSelect}
           scopeFeatures={scopeFeatures}
-          onHide={() => {
-            setOpen(false)
-            onHide?.()
-          }}
+          onInputValueChange={setInputValue}
+          onHide={handleHide}
         />
-      </PopoverContent>
-    </Popover>
+      </ComboboxContent>
+    </Combobox>
   )
 }
 
diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/marketplace-section.tsx b/web/app/components/header/account-setting/model-provider-page/model-selector/marketplace-section.tsx
index 469e3c201f..33079a80c6 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-selector/marketplace-section.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-selector/marketplace-section.tsx
@@ -1,4 +1,3 @@
-import type { FC } from 'react'
 import type { ModelProviderQuotaGetPaid } from '@/types/model-provider'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
@@ -16,7 +15,7 @@ type MarketplaceSectionProps = {
   onInstallPlugin: (key: ModelProviderQuotaGetPaid) => void | Promise<void>
 }
 
-const MarketplaceSection: FC<MarketplaceSectionProps> = ({
+function MarketplaceSection({
   marketplaceProviders,
   marketplaceCollapsed,
   installingProvider,
@@ -24,7 +23,7 @@ const MarketplaceSection: FC<MarketplaceSectionProps> = ({
   theme,
   onMarketplaceCollapsedChange,
   onInstallPlugin,
-}) => {
+}: MarketplaceSectionProps) {
   const { t } = useTranslation()
 
   if (marketplaceProviders.length === 0)
@@ -36,14 +35,15 @@ const MarketplaceSection: FC<MarketplaceSectionProps> = ({
         <div className="h-px bg-divider-subtle" />
       </div>
       <div>
-        <div className="flex h-[22px] items-center pr-2 pl-4">
-          <div
-            className="flex flex-1 cursor-pointer items-center system-sm-medium text-text-primary"
+        <div className="flex h-5.5 items-center pr-2 pl-4">
+          <button
+            type="button"
+            className="flex flex-1 cursor-pointer items-center border-0 bg-transparent p-0 text-left system-sm-medium text-text-primary"
             onClick={() => onMarketplaceCollapsedChange(!marketplaceCollapsed)}
           >
             {t('modelProvider.selector.fromMarketplace', { ns: 'common' })}
             <span className={cn('i-custom-vender-solid-general-arrow-down-round-fill h-4 w-4 text-text-quaternary', marketplaceCollapsed && '-rotate-90')} />
-          </div>
+          </button>
         </div>
         {!marketplaceCollapsed && (
           <div className="px-1 pb-1">
diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/model-search.ts b/web/app/components/header/account-setting/model-provider-page/model-selector/model-search.ts
new file mode 100644
index 0000000000..9870b70ea9
--- /dev/null
+++ b/web/app/components/header/account-setting/model-provider-page/model-selector/model-search.ts
@@ -0,0 +1,194 @@
+import type { DefaultModel, Model, ModelItem, TypeWithI18N } from '../declarations'
+import Fuse from 'fuse.js'
+import { supportFunctionCall } from '@/utils/tool-call'
+import { ModelFeatureEnum } from '../declarations'
+
+type ProviderSearchEntry = {
+  provider: string
+  labels: string[]
+  providerKeys: string[]
+}
+
+type ModelSearchEntry = {
+  provider: string
+  model: string
+  normalizedLabels: string[]
+}
+
+type SearchMatches = {
+  providers: Set<string>
+  models: Set<string>
+}
+
+type ModelSelectorSearchIndex = {
+  search: (query: string) => SearchMatches
+}
+
+type FilterModelSelectorModelsParams = {
+  aiCreditVisibleProviders: Set<string>
+  defaultModel?: DefaultModel
+  inputValue: string
+  installedModelList: Model[]
+  scopeFeatures: ModelFeatureEnum[]
+  searchIndex: ModelSelectorSearchIndex
+}
+
+const providerSearchOptions = {
+  ignoreDiacritics: true,
+  ignoreLocation: true,
+  minMatchCharLength: 2,
+  shouldSort: false,
+  threshold: 0.25,
+  keys: [
+    { name: 'labels', weight: 2 },
+    { name: 'providerKeys', weight: 1 },
+  ],
+}
+
+const modelSearchOptions = {
+  ignoreDiacritics: true,
+  shouldSort: false,
+  useExtendedSearch: true,
+  keys: [
+    'normalizedLabels',
+  ],
+}
+
+const normalizeModelSearchValue = (value: string) => (
+  value
+    .toLowerCase()
+    .normalize('NFKD')
+    .replace(/[^\p{Letter}\p{Number}]+/gu, '')
+)
+
+const looksLikeModelQuery = (value: string) => /\d/.test(value)
+
+const getLabelSearchValues = (label: TypeWithI18N, language: string) => {
+  if (label[language] !== undefined)
+    return [label[language]]
+
+  return Array.from(new Set(Object.values(label)))
+}
+
+const getProviderKeySearchValues = (provider: string) => {
+  const keys = provider
+    .split('/')
+    .filter(part => part && part !== 'langgenius')
+
+  return Array.from(new Set([
+    ...keys,
+    ...keys.map(normalizeModelSearchValue),
+  ]))
+}
+
+const createModelSearchKey = (provider: string, model: string) => `${provider}/${model}`
+
+const modelSupportsScopeFeatures = (modelItem: ModelItem, scopeFeatures: ModelFeatureEnum[]) => {
+  if (scopeFeatures.length === 0)
+    return true
+
+  return scopeFeatures.every((feature) => {
+    if (feature === ModelFeatureEnum.toolCall)
+      return supportFunctionCall(modelItem.features)
+
+    return modelItem.features?.includes(feature) ?? false
+  })
+}
+
+export const createModelSelectorSearchIndex = (installedModelList: Model[], language: string): ModelSelectorSearchIndex => {
+  const providerEntries = installedModelList.map<ProviderSearchEntry>((model) => {
+    return {
+      provider: model.provider,
+      labels: getLabelSearchValues(model.label, language),
+      providerKeys: getProviderKeySearchValues(model.provider),
+    }
+  })
+  const modelEntries = installedModelList.flatMap<ModelSearchEntry>(model =>
+    model.models.map((modelItem) => {
+      const labels = getLabelSearchValues(modelItem.label, language)
+
+      return {
+        provider: model.provider,
+        model: modelItem.model,
+        normalizedLabels: Array.from(new Set([
+          modelItem.model,
+          ...labels,
+        ].map(normalizeModelSearchValue))),
+      }
+    }),
+  )
+  const providerFuse = new Fuse(providerEntries, providerSearchOptions)
+  const modelFuse = new Fuse(modelEntries, modelSearchOptions)
+
+  return {
+    search: (query) => {
+      const trimmedQuery = query.trim()
+
+      if (!trimmedQuery)
+        return { providers: new Set(), models: new Set() }
+
+      const normalizedQuery = normalizeModelSearchValue(trimmedQuery)
+      const providerMatches = looksLikeModelQuery(trimmedQuery)
+        ? new Set<string>()
+        : new Set(providerFuse.search(trimmedQuery).map(({ item }) => item.provider))
+      const modelMatches = normalizedQuery
+        ? new Set(
+            modelFuse
+              .search(`'${normalizedQuery}`)
+              .map(({ item }) => createModelSearchKey(item.provider, item.model)),
+          )
+        : new Set<string>()
+
+      return {
+        providers: providerMatches,
+        models: modelMatches,
+      }
+    },
+  }
+}
+
+export const filterModelSelectorModels = ({
+  aiCreditVisibleProviders,
+  defaultModel,
+  inputValue,
+  installedModelList,
+  scopeFeatures,
+  searchIndex,
+}: FilterModelSelectorModelsParams) => {
+  const trimmedInputValue = inputValue.trim()
+  const matches = trimmedInputValue
+    ? searchIndex.search(trimmedInputValue)
+    : { providers: new Set<string>(), models: new Set<string>() }
+
+  const filtered = installedModelList.map((model) => {
+    const providerMatched = matches.providers.has(model.provider)
+    const filteredModels = model.models
+      .filter((modelItem) => {
+        if (!trimmedInputValue || providerMatched)
+          return true
+
+        return matches.models.has(createModelSearchKey(model.provider, modelItem.model))
+      })
+      .filter(modelItem => modelSupportsScopeFeatures(modelItem, scopeFeatures))
+
+    if (
+      (trimmedInputValue && filteredModels.length === 0)
+      || (!trimmedInputValue && filteredModels.length === 0 && !aiCreditVisibleProviders.has(model.provider))
+    ) {
+      return null
+    }
+
+    return { ...model, models: filteredModels }
+  }).filter((model): model is Model => model !== null)
+
+  if (defaultModel?.provider) {
+    filtered.sort((a, b) => {
+      const aSelected = a.provider === defaultModel.provider ? 0 : 1
+      const bSelected = b.provider === defaultModel.provider ? 0 : 1
+
+      return aSelected - bSelected
+    })
+  }
+
+  return filtered
+}
diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/model-selector-trigger.tsx b/web/app/components/header/account-setting/model-provider-page/model-selector/model-selector-trigger.tsx
index 6b9bcae8dc..e63b94aea3 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-selector/model-selector-trigger.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-selector/model-selector-trigger.tsx
@@ -1,18 +1,9 @@
-import type { FC } from 'react'
-import type {
-  DefaultModel,
-  Model,
-  ModelItem,
-} from '../declarations'
+import type { DefaultModel, Model, ModelItem } from '../declarations'
 import { cn } from '@langgenius/dify-ui/cn'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { useTranslation } from 'react-i18next'
 import { useProviderContext } from '@/context/provider-context'
-import {
-  DERIVED_MODEL_STATUS_BADGE_I18N,
-  DERIVED_MODEL_STATUS_TOOLTIP_I18N,
-  deriveModelStatus,
-} from '../derive-model-status'
+import { DERIVED_MODEL_STATUS_BADGE_I18N, DERIVED_MODEL_STATUS_TOOLTIP_I18N, deriveModelStatus } from '../derive-model-status'
 import ModelIcon from '../model-icon'
 import ModelName from '../model-name'
 import { useCredentialPanelState } from '../provider-added-card/use-credential-panel-state'
@@ -28,7 +19,7 @@ type ModelSelectorTriggerProps = {
   showDeprecatedWarnIcon?: boolean
 }
 
-const ModelSelectorTrigger: FC<ModelSelectorTriggerProps> = ({
+function ModelSelectorTrigger({
   currentProvider,
   currentModel,
   defaultModel,
@@ -37,7 +28,7 @@ const ModelSelectorTrigger: FC<ModelSelectorTriggerProps> = ({
   className,
   deprecatedClassName,
   showDeprecatedWarnIcon = true,
-}) => {
+}: ModelSelectorTriggerProps) {
   const { t } = useTranslation()
   const { modelProviders } = useProviderContext()
 
@@ -100,7 +91,7 @@ const ModelSelectorTrigger: FC<ModelSelectorTriggerProps> = ({
             />
           )}
 
-      <div className={cn('flex grow items-center gap-1 truncate px-1 py-[3px]', isDeprecated && deprecatedClassName)}>
+      <div className={cn('flex grow items-center gap-1 truncate px-1 py-0.75', isDeprecated && deprecatedClassName)}>
         {isSelected && (
           <ModelName
             className="grow"
@@ -127,8 +118,8 @@ const ModelSelectorTrigger: FC<ModelSelectorTriggerProps> = ({
               render={(
                 <div
                   className={cn(
-                    'flex shrink-0 items-center gap-[3px] rounded-md border border-text-warning px-[5px] py-0.5',
-                    isCreditsExhausted && 'min-w-[20px] justify-center bg-components-badge-bg-dimm',
+                    'flex shrink-0 items-center gap-0.75 rounded-md border border-text-warning px-1.25 py-0.5',
+                    isCreditsExhausted && 'min-w-5 justify-center bg-components-badge-bg-dimm',
                   )}
                 >
                   <span className="i-ri-alert-fill h-3 w-3 text-text-warning" />
@@ -150,7 +141,7 @@ const ModelSelectorTrigger: FC<ModelSelectorTriggerProps> = ({
           <Tooltip>
             <TooltipTrigger
               render={(
-                <div className="flex shrink-0 items-center gap-[3px] rounded-md border border-text-warning bg-components-badge-bg-dimm px-[5px] py-0.5">
+                <div className="flex shrink-0 items-center gap-0.75 rounded-md border border-text-warning bg-components-badge-bg-dimm px-1.25 py-0.5">
                   <span className="i-ri-alert-fill h-3 w-3 text-text-warning" />
                   <span className="system-xs-medium whitespace-nowrap text-text-warning">
                     {deprecatedStatusLabel}
diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/popup-empty-state.tsx b/web/app/components/header/account-setting/model-provider-page/model-selector/popup-empty-state.tsx
index dafd26387b..c68e2df8fe 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-selector/popup-empty-state.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-selector/popup-empty-state.tsx
@@ -1,4 +1,3 @@
-import type { FC } from 'react'
 import { Button } from '@langgenius/dify-ui/button'
 import { useTranslation } from 'react-i18next'
 
@@ -6,9 +5,9 @@ type ModelSelectorEmptyStateProps = {
   onConfigure: () => void
 }
 
-const ModelSelectorEmptyState: FC<ModelSelectorEmptyStateProps> = ({
+function ModelSelectorEmptyState({
   onConfigure,
-}) => {
+}: ModelSelectorEmptyStateProps) {
   const { t } = useTranslation()
 
   return (
diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/popup-item.tsx b/web/app/components/header/account-setting/model-provider-page/model-selector/popup-item.tsx
index ff9e6575bb..d262634cbb 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-selector/popup-item.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-selector/popup-item.tsx
@@ -1,60 +1,43 @@
-import type { FC } from 'react'
-import type {
-  DefaultModel,
-  Model,
-  ModelItem,
-} from '../declarations'
+import type { ComponentProps } from 'react'
+import type { DefaultModel, Model, ModelItem } from '../declarations'
 import { cn } from '@langgenius/dify-ui/cn'
-import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from '@langgenius/dify-ui/popover'
-import {
-  PreviewCard,
-  PreviewCardContent,
-  PreviewCardTrigger,
-} from '@langgenius/dify-ui/preview-card'
-import { useCallback, useState } from 'react'
+import { ComboboxGroup, ComboboxItem, ComboboxItemIndicator } from '@langgenius/dify-ui/combobox'
+import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
+import { PreviewCardTrigger } from '@langgenius/dify-ui/preview-card'
+import { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { CreditsCoin } from '@/app/components/base/icons/src/vender/line/financeAndECommerce'
 import { useModalContext } from '@/context/modal-context'
 import { useProviderContext } from '@/context/provider-context'
-import {
-  ConfigurationMethodEnum,
-  ModelFeatureEnum,
-  ModelStatusEnum,
-  ModelTypeEnum,
-} from '../declarations'
-import {
-  useLanguage,
-  useUpdateModelList,
-  useUpdateModelProviders,
-} from '../hooks'
-import ModelBadge from '../model-badge'
+import { ConfigurationMethodEnum, ModelStatusEnum } from '../declarations'
+import { useLanguage, useUpdateModelList, useUpdateModelProviders } from '../hooks'
 import ModelIcon from '../model-icon'
 import ModelName from '../model-name'
 import DropdownContent from '../provider-added-card/model-auth-dropdown/dropdown-content'
 import { useChangeProviderPriority } from '../provider-added-card/use-change-provider-priority'
 import { useCredentialPanelState } from '../provider-added-card/use-credential-panel-state'
-import {
-  modelTypeFormat,
-  sizeFormat,
-} from '../utils'
-import FeatureIcon from './feature-icon'
+
+export type ModelSelectorPreviewPayload = {
+  provider: Model
+  modelItem: ModelItem
+}
+
+type PreviewCardHandle = NonNullable<ComponentProps<typeof PreviewCardTrigger>['handle']>
 
 type PopupItemProps = {
   defaultModel?: DefaultModel
   model: Model
-  onSelect: (provider: string, model: ModelItem) => void
+  previewCardHandle: PreviewCardHandle
+  onPreviewCardClose: () => void
   onHide: () => void
 }
-const PopupItem: FC<PopupItemProps> = ({
+function PopupItem({
   defaultModel,
   model,
-  onSelect,
+  previewCardHandle,
+  onPreviewCardClose,
   onHide,
-}) => {
+}: PopupItemProps) {
   const [collapsed, setCollapsed] = useState(false)
   const [dropdownOpen, setDropdownOpen] = useState(false)
   const { t } = useTranslation()
@@ -64,12 +47,6 @@ const PopupItem: FC<PopupItemProps> = ({
   const updateModelList = useUpdateModelList()
   const updateModelProviders = useUpdateModelProviders()
   const currentProvider = modelProviders.find(provider => provider.provider === model.provider)
-  const handleSelect = (provider: string, modelItem: ModelItem) => {
-    if (modelItem.status !== ModelStatusEnum.active)
-      return
-
-    onSelect(provider, modelItem)
-  }
   const handleOpenModelModal = () => {
     if (!currentProvider)
       return
@@ -91,6 +68,12 @@ const PopupItem: FC<PopupItemProps> = ({
 
   const state = useCredentialPanelState(currentProvider)
   const { isChangingPriority, handleChangePriority } = useChangeProviderPriority(currentProvider)
+  const groupItems = useMemo(() => model.models
+    .filter(modelItem => modelItem.status !== ModelStatusEnum.noConfigure)
+    .map(modelItem => ({
+      provider: model.provider,
+      model: modelItem.model,
+    })), [model.models, model.provider])
 
   const isUsingCredits = state.priority === 'credits'
   const hasCredits = !state.isCreditsExhausted
@@ -106,33 +89,33 @@ const PopupItem: FC<PopupItemProps> = ({
     return null
 
   return (
-    <div className="mb-1">
-      {/* Keep the sticky provider header above model rows while the list scrolls. */}
-      <div className="sticky top-0 z-1 flex h-[22px] items-center justify-between bg-components-panel-bg px-3 text-xs font-medium text-text-tertiary">
-        <div
-          className="flex cursor-pointer items-center"
+    <ComboboxGroup className="mb-1" items={groupItems}>
+      <div className="sticky top-0 z-1 flex h-5.5 min-w-0 items-center justify-between gap-2 bg-components-panel-bg px-3 text-xs font-medium text-text-tertiary">
+        <button
+          type="button"
+          className="flex min-w-0 cursor-pointer items-center border-0 bg-transparent p-0 text-left"
           onClick={() => setCollapsed(prev => !prev)}
         >
-          {model.label[language] || model.label.en_US}
-          <span className={cn('i-custom-vender-solid-general-arrow-down-round-fill h-4 w-4 text-text-quaternary', collapsed && '-rotate-90')} />
-        </div>
+          <span className="truncate">{model.label[language] || model.label.en_US}</span>
+          <span className={cn('i-custom-vender-solid-general-arrow-down-round-fill h-4 w-4 shrink-0 text-text-quaternary', collapsed && '-rotate-90')} />
+        </button>
         <Popover open={dropdownOpen} onOpenChange={setDropdownOpen}>
           <PopoverTrigger
             render={(
-              <button type="button" className="flex cursor-pointer items-center rounded-md px-1.5 py-1 system-xs-medium text-text-tertiary hover:bg-components-button-ghost-bg-hover">
+              <button type="button" className="flex max-w-[50%] min-w-0 shrink-0 cursor-pointer items-center rounded-md px-1.5 py-1 system-xs-medium text-text-tertiary hover:bg-components-button-ghost-bg-hover">
                 {isUsingCredits
                   ? (
                       hasCredits
                         ? (
                             <>
                               <CreditsCoin className="h-3 w-3" />
-                              <span className="ml-1">{t('modelProvider.selector.aiCredits', { ns: 'common' })}</span>
+                              <span className="ml-1 truncate">{t('modelProvider.selector.aiCredits', { ns: 'common' })}</span>
                             </>
                           )
                         : (
                             <>
-                              <span className="i-ri-alert-fill h-3 w-3 text-text-warning-secondary" />
-                              <span className="ml-1 text-text-warning">{t('modelProvider.selector.creditsExhausted', { ns: 'common' })}</span>
+                              <span className="i-ri-alert-fill h-3 w-3 shrink-0 text-text-warning-secondary" />
+                              <span className="ml-1 truncate text-text-warning">{t('modelProvider.selector.creditsExhausted', { ns: 'common' })}</span>
                             </>
                           )
                     )
@@ -140,16 +123,16 @@ const PopupItem: FC<PopupItemProps> = ({
                     ? (
                         <>
                           <span className={cn('h-1.5 w-1.5 shrink-0 rounded-xs border', isApiKeyActive ? 'border-components-badge-status-light-success-border-inner bg-components-badge-status-light-success-bg' : 'border-components-badge-status-light-error-border-inner bg-components-badge-status-light-error-bg')} />
-                          <span className="ml-1 text-text-tertiary">{credentialName}</span>
+                          <span className="ml-1 truncate text-text-tertiary">{credentialName}</span>
                         </>
                       )
                     : (
                         <>
                           <span className="h-1.5 w-1.5 shrink-0 rounded-xs border border-components-badge-status-light-disabled-border-inner bg-components-badge-status-light-disabled-bg" />
-                          <span className="ml-1 text-text-tertiary">{t('modelProvider.selector.configureRequired', { ns: 'common' })}</span>
+                          <span className="ml-1 truncate text-text-tertiary">{t('modelProvider.selector.configureRequired', { ns: 'common' })}</span>
                         </>
                       )}
-                <span className="i-ri-arrow-down-s-line h-[14px]! w-[14px]! translate-y-px text-text-tertiary" />
+                <span className="i-ri-arrow-down-s-line h-3.5! w-3.5! shrink-0 translate-y-px text-text-tertiary" />
               </button>
             )}
           />
@@ -164,100 +147,76 @@ const PopupItem: FC<PopupItemProps> = ({
           </PopoverContent>
         </Popover>
       </div>
-      {!collapsed && model.models.map(modelItem => (
-        // Preview is supplementary: every field in it (name / type / mode / context size / capabilities)
-        // is reachable from the model's own configuration surface once the row is selected.
-        // Touch + screen reader users rely on the button's primary onClick, not the preview.
-        <PreviewCard key={modelItem.model}>
+      {!collapsed && model.models.map((modelItem) => {
+        const rowClassName = cn(
+          'group relative mx-1 flex h-8 min-w-0 items-center gap-1 rounded-lg px-3 py-1.5 text-left',
+          modelItem.status === ModelStatusEnum.active ? 'cursor-pointer hover:bg-state-base-hover' : 'cursor-not-allowed hover:bg-state-base-hover-alt',
+        )
+        const rowContent = (
+          <>
+            <div className="flex min-w-0 items-center gap-2">
+              <ModelIcon
+                className={cn('h-5 w-5 shrink-0')}
+                provider={model}
+                modelName={modelItem.model}
+              />
+              <ModelName
+                className={cn('system-sm-medium text-text-secondary', modelItem.status !== ModelStatusEnum.active && 'opacity-60')}
+                modelItem={modelItem}
+              />
+            </div>
+            {
+              defaultModel?.model === modelItem.model && defaultModel.provider === currentProvider.provider && (
+                <ComboboxItemIndicator className="shrink-0 text-text-accent">
+                  <span className="i-custom-vender-line-general-check h-4 w-4" aria-hidden="true" />
+                </ComboboxItemIndicator>
+              )
+            }
+          </>
+        )
+        const itemRender = modelItem.status === ModelStatusEnum.noConfigure
+          ? (
+              <div
+                className={rowClassName}
+                aria-disabled="true"
+                onPointerDown={onPreviewCardClose}
+              >
+                {rowContent}
+                <button
+                  type="button"
+                  className="hidden cursor-pointer text-xs font-medium text-text-accent group-hover:block"
+                  onClick={handleOpenModelModal}
+                >
+                  {t('operation.add', { ns: 'common' }).toLocaleUpperCase()}
+                </button>
+              </div>
+            )
+          : (
+              <ComboboxItem
+                value={{
+                  provider: model.provider,
+                  model: modelItem.model,
+                }}
+                disabled={modelItem.status !== ModelStatusEnum.active}
+                className={rowClassName}
+                onPointerDown={onPreviewCardClose}
+              >
+                {rowContent}
+              </ComboboxItem>
+            )
+
+        return (
           <PreviewCardTrigger
+            key={modelItem.model}
             delay={150}
             closeDelay={150}
-            render={(
-              <button
-                type="button"
-                className={cn('group relative flex h-8 w-full items-center gap-1 rounded-lg px-3 py-1.5 text-left', modelItem.status === ModelStatusEnum.active ? 'cursor-pointer hover:bg-state-base-hover' : 'cursor-not-allowed hover:bg-state-base-hover-alt')}
-                onClick={() => handleSelect(model.provider, modelItem)}
-              >
-                <div className="flex items-center gap-2">
-                  <ModelIcon
-                    className={cn('h-5 w-5 shrink-0')}
-                    provider={model}
-                    modelName={modelItem.model}
-                  />
-                  <ModelName
-                    className={cn('system-sm-medium text-text-secondary', modelItem.status !== ModelStatusEnum.active && 'opacity-60')}
-                    modelItem={modelItem}
-                  />
-                </div>
-                {
-                  defaultModel?.model === modelItem.model && defaultModel.provider === currentProvider.provider && (
-                    <span className="i-custom-vender-line-general-check h-4 w-4 shrink-0 text-text-accent" />
-                  )
-                }
-                {
-                  modelItem.status === ModelStatusEnum.noConfigure && (
-                    <div
-                      className="hidden cursor-pointer text-xs font-medium text-text-accent group-hover:block"
-                      onClick={handleOpenModelModal}
-                    >
-                      {t('operation.add', { ns: 'common' }).toLocaleUpperCase()}
-                    </div>
-                  )
-                }
-              </button>
-            )}
+            handle={previewCardHandle}
+            payload={{ provider: model, modelItem }}
+            render={itemRender}
           />
-          <PreviewCardContent
-            placement="right"
-            popupClassName="w-[206px] bg-components-panel-bg-blur p-3 shadow-none backdrop-blur-xs"
-          >
-            <div className="flex flex-col gap-1">
-              <div className="flex flex-col items-start gap-2">
-                <ModelIcon
-                  className={cn('h-5 w-5 shrink-0')}
-                  provider={model}
-                  modelName={modelItem.model}
-                />
-                <div className="system-md-medium text-wrap wrap-break-word text-text-primary">{modelItem.label[language] || modelItem.label.en_US}</div>
-              </div>
-              <div className="flex flex-wrap gap-1">
-                {!!modelItem.model_type && (
-                  <ModelBadge>
-                    {modelTypeFormat(modelItem.model_type)}
-                  </ModelBadge>
-                )}
-                {!!modelItem.model_properties.mode && (
-                  <ModelBadge>
-                    {(modelItem.model_properties.mode as string).toLocaleUpperCase()}
-                  </ModelBadge>
-                )}
-                {!!modelItem.model_properties.context_size && (
-                  <ModelBadge>
-                    {sizeFormat(modelItem.model_properties.context_size as number)}
-                  </ModelBadge>
-                )}
-              </div>
-              {[ModelTypeEnum.textGeneration, ModelTypeEnum.textEmbedding, ModelTypeEnum.rerank].includes(modelItem.model_type as ModelTypeEnum)
-                && modelItem.features?.some(feature => [ModelFeatureEnum.vision, ModelFeatureEnum.audio, ModelFeatureEnum.video, ModelFeatureEnum.document].includes(feature))
-                && (
-                  <div className="pt-2">
-                    <div className="mb-1 system-2xs-medium-uppercase text-text-tertiary">{t('model.capabilities', { ns: 'common' })}</div>
-                    <div className="flex flex-wrap gap-1">
-                      {modelItem.features?.map(feature => (
-                        <FeatureIcon
-                          key={feature}
-                          feature={feature}
-                          showFeaturesLabel
-                        />
-                      ))}
-                    </div>
-                  </div>
-                )}
-            </div>
-          </PreviewCardContent>
-        </PreviewCard>
-      ))}
-    </div>
+        )
+      })}
+    </ComboboxGroup>
   )
 }
 
diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/popup-layout.tsx b/web/app/components/header/account-setting/model-provider-page/model-selector/popup-layout.tsx
index 50bd098af1..95c930ef28 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-selector/popup-layout.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-selector/popup-layout.tsx
@@ -1,4 +1,6 @@
-import type { FC, ReactNode } from 'react'
+import type { ReactNode } from 'react'
+import { cn } from '@langgenius/dify-ui/cn'
+import { ComboboxInput, ComboboxInputGroup } from '@langgenius/dify-ui/combobox'
 import {
   ScrollAreaContent,
   ScrollAreaRoot,
@@ -12,9 +14,9 @@ type ModelSelectorPopupFrameProps = {
   children: ReactNode
 }
 
-export const ModelSelectorPopupFrame: FC<ModelSelectorPopupFrameProps> = ({
+export function ModelSelectorPopupFrame({
   children,
-}) => {
+}: ModelSelectorPopupFrameProps) {
   return (
     <div className="flex max-h-[min(624px,var(--available-height,624px))] flex-col overflow-hidden rounded-xl bg-components-panel-bg">
       {children}
@@ -23,44 +25,52 @@ export const ModelSelectorPopupFrame: FC<ModelSelectorPopupFrameProps> = ({
 }
 
 type ModelSelectorSearchHeaderProps = {
-  searchText: string
-  onSearchTextChange: (value: string) => void
+  inputValue: string
+  onInputValueChange: (value: string) => void
 }
 
-export const ModelSelectorSearchHeader: FC<ModelSelectorSearchHeaderProps> = ({
-  searchText,
-  onSearchTextChange,
-}) => {
+export function ModelSelectorSearchHeader({
+  inputValue,
+  onInputValueChange,
+}: ModelSelectorSearchHeaderProps) {
   const { t } = useTranslation()
 
   return (
     <div className="shrink-0 bg-components-panel-bg px-2 pt-2 pb-1">
-      <div className={`
-        flex h-8 items-center rounded-lg border px-2
-        ${searchText ? 'border-components-input-border-active bg-components-input-bg-active shadow-xs' : 'border-transparent bg-components-input-bg-normal'}
-      `}
+      <ComboboxInputGroup
+        className={cn(
+          'h-8 min-h-8 px-2',
+          inputValue
+            ? 'border-components-input-border-active bg-components-input-bg-active shadow-xs'
+            : 'border-transparent bg-components-input-bg-normal',
+        )}
       >
         <span
           className={`
             mr-0.5 i-ri-search-line h-4 w-4 shrink-0
-            ${searchText ? 'text-text-tertiary' : 'text-text-quaternary'}
+            ${inputValue ? 'text-text-tertiary' : 'text-text-quaternary'}
           `}
+          aria-hidden="true"
         />
-        <input
-          className="block h-[18px] grow appearance-none bg-transparent px-1 text-[13px] text-text-primary outline-hidden"
+        <ComboboxInput
+          aria-label={t('form.searchModel', { ns: 'datasetSettings' }) || ''}
+          className="block h-4.5 grow px-1 py-0 text-[13px] text-text-primary"
           placeholder={t('form.searchModel', { ns: 'datasetSettings' }) || ''}
-          value={searchText}
-          onChange={e => onSearchTextChange(e.target.value)}
         />
         {
-          searchText && (
-            <span
-              className="ml-1.5 i-custom-vender-solid-general-x-circle h-[14px] w-[14px] shrink-0 cursor-pointer text-text-quaternary"
-              onClick={() => onSearchTextChange('')}
-            />
+          inputValue && (
+            <button
+              type="button"
+              aria-label={t('operation.clear', { ns: 'common' }) || 'Clear'}
+              className="ml-1.5 flex size-3.5 shrink-0 cursor-pointer items-center justify-center rounded-none text-text-quaternary outline-hidden hover:bg-transparent hover:text-text-quaternary focus-visible:bg-transparent focus-visible:ring-1 focus-visible:ring-components-input-border-active"
+              onClick={() => onInputValueChange('')}
+              onPointerDown={event => event.preventDefault()}
+            >
+              <span className="i-custom-vender-solid-general-x-circle h-3.5 w-3.5" aria-hidden="true" />
+            </button>
           )
         }
-      </div>
+      </ComboboxInputGroup>
     </div>
   )
 }
@@ -70,22 +80,19 @@ type ModelSelectorScrollBodyProps = {
   label: string
 }
 
-export const ModelSelectorScrollBody: FC<ModelSelectorScrollBodyProps> = ({
+export function ModelSelectorScrollBody({
   children,
   label,
-}) => {
+}: ModelSelectorScrollBodyProps) {
   return (
     <ScrollAreaRoot className="relative min-h-0 overflow-hidden overscroll-contain">
       <ScrollAreaViewport
         aria-label={label}
-        className="max-h-[calc(min(624px,var(--available-height,624px))-84px)] overscroll-contain"
+        className="max-h-[calc(min(624px,var(--available-height,624px))-84px)] overflow-x-hidden overscroll-contain"
         role="region"
       >
-        <ScrollAreaContent className="min-w-0">
-          {children}
-        </ScrollAreaContent>
+        <ScrollAreaContent className="min-w-0 overflow-x-hidden">{children}</ScrollAreaContent>
       </ScrollAreaViewport>
-      {/* Keep the overlay scrollbar above sticky provider headers inside this scroll area. */}
       <ScrollAreaScrollbar className="z-2 data-[orientation=vertical]:my-1 data-[orientation=vertical]:me-1">
         <ScrollAreaThumb />
       </ScrollAreaScrollbar>
@@ -93,7 +100,7 @@ export const ModelSelectorScrollBody: FC<ModelSelectorScrollBodyProps> = ({
   )
 }
 
-export const CompatibleModelsNotice = () => {
+export function CompatibleModelsNotice() {
   const { t } = useTranslation()
 
   return (
@@ -110,9 +117,9 @@ type ModelProviderSettingsFooterProps = {
   onOpenSettings: () => void
 }
 
-export const ModelProviderSettingsFooter: FC<ModelProviderSettingsFooterProps> = ({
+export function ModelProviderSettingsFooter({
   onOpenSettings,
-}) => {
+}: ModelProviderSettingsFooterProps) {
   const { t } = useTranslation()
 
   return (
diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/popup.tsx b/web/app/components/header/account-setting/model-provider-page/model-selector/popup.tsx
index 86bac84310..7dd83e2d08 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-selector/popup.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-selector/popup.tsx
@@ -1,10 +1,8 @@
-import type { FC } from 'react'
-import type {
-  DefaultModel,
-  Model,
-  ModelItem,
-} from '../declarations'
+import type { DefaultModel, Model } from '../declarations'
+import type { ModelSelectorPreviewPayload } from './popup-item'
 import type { ModelProviderQuotaGetPaid } from '@/types/model-provider'
+import { ComboboxList } from '@langgenius/dify-ui/combobox'
+import { createPreviewCardHandle, PreviewCard, PreviewCardContent } from '@langgenius/dify-ui/preview-card'
 import { useSuspenseQuery } from '@tanstack/react-query'
 import { useTheme } from 'next-themes'
 import { useCallback, useMemo, useState } from 'react'
@@ -16,46 +14,41 @@ import { useModalContext } from '@/context/modal-context'
 import { useProviderContext } from '@/context/provider-context'
 import { systemFeaturesQueryOptions } from '@/service/system-features'
 import { useInstallPackageFromMarketPlace } from '@/service/use-plugins'
-import { supportFunctionCall } from '@/utils/tool-call'
-import {
-  CustomConfigurationStatusEnum,
-  ModelFeatureEnum,
-  ModelStatusEnum,
-} from '../declarations'
+import { CustomConfigurationStatusEnum, ModelFeatureEnum, ModelStatusEnum, ModelTypeEnum } from '../declarations'
 import { useLanguage, useMarketplaceAllPlugins } from '../hooks'
+import ModelBadge from '../model-badge'
+import ModelIcon from '../model-icon'
 import CreditsExhaustedAlert from '../provider-added-card/model-auth-dropdown/credits-exhausted-alert'
 import { useTrialCredits } from '../provider-added-card/use-trial-credits'
 import { providerSupportsCredits } from '../supports-credits'
-import { MODEL_PROVIDER_QUOTA_GET_PAID, providerKeyToPluginId } from '../utils'
+import { MODEL_PROVIDER_QUOTA_GET_PAID, modelTypeFormat, providerKeyToPluginId, sizeFormat } from '../utils'
+import FeatureIcon from './feature-icon'
 import MarketplaceSection from './marketplace-section'
+import { createModelSelectorSearchIndex, filterModelSelectorModels } from './model-search'
 import ModelSelectorEmptyState from './popup-empty-state'
 import PopupItem from './popup-item'
-import {
-  CompatibleModelsNotice,
-  ModelProviderSettingsFooter,
-  ModelSelectorPopupFrame,
-  ModelSelectorScrollBody,
-  ModelSelectorSearchHeader,
-} from './popup-layout'
+import { CompatibleModelsNotice, ModelProviderSettingsFooter, ModelSelectorPopupFrame, ModelSelectorScrollBody, ModelSelectorSearchHeader } from './popup-layout'
 
-type PopupProps = {
+export type PopupProps = {
   defaultModel?: DefaultModel
+  inputValue: string
   modelList: Model[]
-  onSelect: (provider: string, model: ModelItem) => void
   scopeFeatures?: ModelFeatureEnum[]
+  onInputValueChange: (value: string) => void
   onHide: () => void
 }
-const Popup: FC<PopupProps> = ({
+function Popup({
   defaultModel,
+  inputValue,
   modelList,
-  onSelect,
   scopeFeatures = [],
+  onInputValueChange,
   onHide,
-}) => {
+}: PopupProps) {
   const { t } = useTranslation()
   const { theme } = useTheme()
   const language = useLanguage()
-  const [searchText, setSearchText] = useState('')
+  const previewCardHandle = useMemo(() => createPreviewCardHandle<ModelSelectorPreviewPayload>(), [])
   const [marketplaceCollapsed, setMarketplaceCollapsed] = useState(false)
   const { setShowAccountSettingModal } = useModalContext()
   const { modelProviders } = useProviderContext()
@@ -142,57 +135,18 @@ const Popup: FC<PopupProps> = ({
     return [...installedMarketplaceModels, ...otherModels]
   }, [aiCreditVisibleProviders, installedProviderMap, modelList])
 
-  const filteredModelList = useMemo(() => {
-    const normalizedSearch = searchText.toLowerCase()
-    const matchesLabel = (label: Record<string, string>) => {
-      if (label[language] !== undefined)
-        return label[language].toLowerCase().includes(normalizedSearch)
-      return Object.values(label).some(value =>
-        value.toLowerCase().includes(normalizedSearch),
-      )
-    }
-
-    const filtered = installedModelList.map((model) => {
-      const providerMatched = !!searchText && (
-        matchesLabel(model.label)
-        || model.provider.toLowerCase().includes(normalizedSearch)
-      )
-
-      const filteredModels = model.models
-        .filter((modelItem) => {
-          if (!searchText || providerMatched)
-            return true
-          return matchesLabel(modelItem.label)
-        })
-        .filter((modelItem) => {
-          if (scopeFeatures.length === 0)
-            return true
-          return scopeFeatures.every((feature) => {
-            if (feature === ModelFeatureEnum.toolCall)
-              return supportFunctionCall(modelItem.features)
-            return modelItem.features?.includes(feature) ?? false
-          })
-        })
-      if (
-        (searchText && filteredModels.length === 0)
-        || (!searchText && filteredModels.length === 0 && !aiCreditVisibleProviders.has(model.provider))
-      ) {
-        return null
-      }
-
-      return { ...model, models: filteredModels }
-    }).filter((model): model is Model => model !== null)
-
-    if (defaultModel?.provider) {
-      filtered.sort((a, b) => {
-        const aSelected = a.provider === defaultModel.provider ? 0 : 1
-        const bSelected = b.provider === defaultModel.provider ? 0 : 1
-        return aSelected - bSelected
-      })
-    }
-
-    return filtered
-  }, [aiCreditVisibleProviders, defaultModel?.provider, installedModelList, language, scopeFeatures, searchText])
+  const searchIndex = useMemo(
+    () => createModelSelectorSearchIndex(installedModelList, language),
+    [installedModelList, language],
+  )
+  const filteredModelList = useMemo(() => filterModelSelectorModels({
+    aiCreditVisibleProviders,
+    defaultModel,
+    inputValue,
+    installedModelList,
+    scopeFeatures,
+    searchIndex,
+  }), [aiCreditVisibleProviders, defaultModel, inputValue, installedModelList, scopeFeatures, searchIndex])
 
   const marketplaceProviders = useMemo(() => {
     const installedProviders = new Set(modelProviders.map(provider => provider.provider))
@@ -203,37 +157,45 @@ const Popup: FC<PopupProps> = ({
     onHide()
     setShowAccountSettingModal({ payload: ACCOUNT_SETTING_TAB.PROVIDER })
   }, [onHide, setShowAccountSettingModal])
+  const handleClosePreviewCard = useCallback(() => {
+    previewCardHandle.close()
+  }, [previewCardHandle])
 
   return (
     <ModelSelectorPopupFrame>
       <ModelSelectorSearchHeader
-        searchText={searchText}
-        onSearchTextChange={setSearchText}
+        inputValue={inputValue}
+        onInputValueChange={onInputValueChange}
       />
       {showCreditsExhaustedAlert && (
         <CreditsExhaustedAlert hasApiKeyFallback={hasApiKeyFallback} />
       )}
       <ModelSelectorScrollBody label={t('modelProvider.models', { ns: 'common' })}>
+        <ComboboxList className="max-h-none overflow-visible p-0">
+          <div className="pb-1">
+            {
+              filteredModelList.map(model => (
+                <PopupItem
+                  key={model.provider}
+                  defaultModel={defaultModel}
+                  model={model}
+                  previewCardHandle={previewCardHandle}
+                  onPreviewCardClose={handleClosePreviewCard}
+                  onHide={onHide}
+                />
+              ))
+            }
+          </div>
+        </ComboboxList>
         <div className="pb-1">
-          {
-            filteredModelList.map(model => (
-              <PopupItem
-                key={model.provider}
-                defaultModel={defaultModel}
-                model={model}
-                onSelect={onSelect}
-                onHide={onHide}
-              />
-            ))
-          }
           {!filteredModelList.length && !installedModelList.length && (
             <ModelSelectorEmptyState
               onConfigure={handleOpenSettings}
             />
           )}
           {!filteredModelList.length && installedModelList.length > 0 && (
-            <div className="px-3 py-1.5 text-center text-xs leading-[18px] break-all text-text-tertiary">
-              {`No model found for \u201C${searchText}\u201D`}
+            <div className="px-3 py-1.5 text-center text-xs leading-4.5 break-all text-text-tertiary">
+              {`No model found for \u201C${inputValue}\u201D`}
             </div>
           )}
           {scopeFeatures.length > 0 && (
@@ -250,9 +212,86 @@ const Popup: FC<PopupProps> = ({
           />
         </div>
       </ModelSelectorScrollBody>
+      <PreviewCard handle={previewCardHandle}>
+        {({ payload }) => (
+          <ModelSelectorPreviewCard
+            capabilitiesLabel={t('model.capabilities', { ns: 'common' })}
+            language={language}
+            payload={payload as ModelSelectorPreviewPayload | undefined}
+          />
+        )}
+      </PreviewCard>
       <ModelProviderSettingsFooter onOpenSettings={handleOpenSettings} />
     </ModelSelectorPopupFrame>
   )
 }
 
+type ModelSelectorPreviewCardProps = {
+  capabilitiesLabel: string
+  language: string
+  payload?: ModelSelectorPreviewPayload
+}
+
+function ModelSelectorPreviewCard({
+  capabilitiesLabel,
+  language,
+  payload,
+}: ModelSelectorPreviewCardProps) {
+  if (!payload)
+    return null
+
+  const { provider, modelItem } = payload
+
+  return (
+    <PreviewCardContent
+      placement="right"
+      popupClassName="w-[206px] bg-components-panel-bg-blur p-3 shadow-none backdrop-blur-xs"
+    >
+      <div className="flex flex-col gap-1">
+        <div className="flex flex-col items-start gap-2">
+          <ModelIcon
+            className="h-5 w-5 shrink-0"
+            provider={provider}
+            modelName={modelItem.model}
+          />
+          <div className="system-md-medium text-wrap wrap-break-word text-text-primary">{modelItem.label[language] || modelItem.label.en_US}</div>
+        </div>
+        <div className="flex flex-wrap gap-1">
+          {!!modelItem.model_type && (
+            <ModelBadge>
+              {modelTypeFormat(modelItem.model_type)}
+            </ModelBadge>
+          )}
+          {!!modelItem.model_properties.mode && (
+            <ModelBadge>
+              {(modelItem.model_properties.mode as string).toLocaleUpperCase()}
+            </ModelBadge>
+          )}
+          {!!modelItem.model_properties.context_size && (
+            <ModelBadge>
+              {sizeFormat(modelItem.model_properties.context_size as number)}
+            </ModelBadge>
+          )}
+        </div>
+        {[ModelTypeEnum.textGeneration, ModelTypeEnum.textEmbedding, ModelTypeEnum.rerank].includes(modelItem.model_type as ModelTypeEnum)
+          && modelItem.features?.some(feature => [ModelFeatureEnum.vision, ModelFeatureEnum.audio, ModelFeatureEnum.video, ModelFeatureEnum.document].includes(feature))
+          && (
+            <div className="pt-2">
+              <div className="mb-1 system-2xs-medium-uppercase text-text-tertiary">{capabilitiesLabel}</div>
+              <div className="flex flex-wrap gap-1">
+                {modelItem.features?.map(feature => (
+                  <FeatureIcon
+                    key={feature}
+                    feature={feature}
+                    showFeaturesLabel
+                  />
+                ))}
+              </div>
+            </div>
+          )}
+      </div>
+    </PreviewCardContent>
+  )
+}
+
 export default Popup
diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/types.ts b/web/app/components/header/account-setting/model-provider-page/model-selector/types.ts
new file mode 100644
index 0000000000..93314a6208
--- /dev/null
+++ b/web/app/components/header/account-setting/model-provider-page/model-selector/types.ts
@@ -0,0 +1,11 @@
+export type ModelSelectorValue = {
+  provider: string
+  model: string
+}
+
+export const isSameModelSelectorValue = (
+  itemValue: ModelSelectorValue,
+  value: ModelSelectorValue,
+) => itemValue.provider === value.provider && itemValue.model === value.model
+
+export const getModelSelectorValueLabel = (itemValue: ModelSelectorValue) => itemValue.model
diff --git a/web/app/components/header/account-setting/model-provider-page/provider-added-card/__tests__/index.spec.tsx b/web/app/components/header/account-setting/model-provider-page/provider-added-card/__tests__/index.spec.tsx
index 7c996515b2..0b920008b4 100644
--- a/web/app/components/header/account-setting/model-provider-page/provider-added-card/__tests__/index.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/provider-added-card/__tests__/index.spec.tsx
@@ -113,7 +113,7 @@ describe('ProviderAddedCard', () => {
     mockFetchModelProviderModels.mockResolvedValue({ data: [{ model: 'gpt-4' }] })
     renderWithQueryClient(<ProviderAddedCard provider={mockProvider} />)
 
-    const showModelsBtn = screen.getByTestId('show-models-button')
+    const showModelsBtn = screen.getByRole('button', { name: /modelProvider\.showModels/i })
     fireEvent.click(showModelsBtn)
 
     await waitFor(() => {
@@ -127,7 +127,7 @@ describe('ProviderAddedCard', () => {
     await waitFor(() => expect(screen.queryByTestId('model-list')).not.toBeInTheDocument())
 
     // Explicitly re-find and click to re-open
-    fireEvent.click(screen.getByTestId('show-models-button'))
+    fireEvent.click(screen.getByRole('button', { name: /modelProvider\.showModels/i }))
     expect(await screen.findByTestId('model-list')).toBeInTheDocument()
     expect(mockFetchModelProviderModels).toHaveBeenCalledTimes(2) // Re-open fetches again with default stale/gc behavior
 
@@ -147,7 +147,7 @@ describe('ProviderAddedCard', () => {
     mockFetchModelProviderModels.mockReturnValue(promise)
 
     renderWithQueryClient(<ProviderAddedCard provider={mockProvider} />)
-    const showModelsBtn = screen.getByTestId('show-models-button')
+    const showModelsBtn = screen.getByRole('button', { name: /modelProvider\.showModels/i })
 
     // First call sets loading to true
     fireEvent.click(showModelsBtn)
diff --git a/web/app/components/header/account-setting/model-provider-page/provider-added-card/__tests__/model-load-balancing-modal.spec.tsx b/web/app/components/header/account-setting/model-provider-page/provider-added-card/__tests__/model-load-balancing-modal.spec.tsx
index c4794c9775..002908ce8b 100644
--- a/web/app/components/header/account-setting/model-provider-page/provider-added-card/__tests__/model-load-balancing-modal.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/provider-added-card/__tests__/model-load-balancing-modal.spec.tsx
@@ -4,14 +4,6 @@ import userEvent from '@testing-library/user-event'
 import { ConfigurationMethodEnum } from '../../declarations'
 import ModelLoadBalancingModal from '../model-load-balancing-modal'
 
-vi.mock('@headlessui/react', () => ({
-  Transition: ({ show, children }: { show: boolean, children: React.ReactNode }) => (show ? <>{children}</> : null),
-  TransitionChild: ({ children }: { children: React.ReactNode }) => <>{children}</>,
-  Dialog: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
-  DialogPanel: ({ children, className }: { children: React.ReactNode, className?: string }) => <div className={className}>{children}</div>,
-  DialogTitle: ({ children, className }: { children: React.ReactNode, className?: string }) => <h3 className={className}>{children}</h3>,
-}))
-
 type CredentialData = {
   load_balancing: {
     enabled: boolean
diff --git a/web/app/components/header/account-setting/model-provider-page/provider-added-card/__tests__/priority-selector.spec.tsx b/web/app/components/header/account-setting/model-provider-page/provider-added-card/__tests__/priority-selector.spec.tsx
deleted file mode 100644
index d122bf921b..0000000000
--- a/web/app/components/header/account-setting/model-provider-page/provider-added-card/__tests__/priority-selector.spec.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { fireEvent, render, screen } from '@testing-library/react'
-import PrioritySelector from '../priority-selector'
-
-describe('PrioritySelector', () => {
-  const mockOnSelect = vi.fn()
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it('should render selector button', () => {
-    render(<PrioritySelector value="system" onSelect={mockOnSelect} />)
-    expect(screen.getByRole('button')).toBeInTheDocument()
-  })
-
-  it('should call onSelect when option clicked', () => {
-    render(<PrioritySelector value="system" onSelect={mockOnSelect} />)
-    fireEvent.click(screen.getByRole('button'))
-    const option = screen.getByText('common.modelProvider.apiKey')
-    fireEvent.click(option)
-    expect(mockOnSelect).toHaveBeenCalled()
-  })
-
-  it('should display priority use header in popover', () => {
-    render(<PrioritySelector value="custom" onSelect={mockOnSelect} />)
-    fireEvent.click(screen.getByRole('button'))
-    expect(screen.getByText('common.modelProvider.card.priorityUse')).toBeInTheDocument()
-  })
-})
diff --git a/web/app/components/header/account-setting/model-provider-page/provider-added-card/index.tsx b/web/app/components/header/account-setting/model-provider-page/provider-added-card/index.tsx
index c0bbab04f3..3439206785 100644
--- a/web/app/components/header/account-setting/model-provider-page/provider-added-card/index.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/provider-added-card/index.tsx
@@ -127,8 +127,7 @@ const ProviderAddedCard: FC<ProviderAddedCardProps> = ({
             {(showModelProvider || !notConfigured) && (
               <button
                 type="button"
-                data-testid="show-models-button"
-                className="flex h-6 items-center rounded-lg pr-1.5 pl-1 hover:bg-components-button-ghost-bg-hover"
+                className="flex h-6 items-center rounded-lg border-none bg-transparent pr-1.5 pl-1 text-left hover:bg-components-button-ghost-bg-hover"
                 aria-label={t('modelProvider.showModels', { ns: 'common' })}
                 onClick={handleOpenModelList}
               >
@@ -137,7 +136,7 @@ const ProviderAddedCard: FC<ProviderAddedCardProps> = ({
                     ? t('modelProvider.modelsNum', { ns: 'common', num: modelList.length })
                     : t('modelProvider.showModels', { ns: 'common' })
                 }
-                {!loading && <div className="i-ri-arrow-right-s-line h-4 w-4" />}
+                {!loading && <div className="i-ri-arrow-right-s-line h-4 w-4" aria-hidden="true" />}
                 {
                   loading && (
                     <div className="ml-0.5 i-ri-loader-2-line h-3 w-3 animate-spin" />
diff --git a/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-list-item.tsx b/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-list-item.tsx
index 305ef71c50..8ef0f11901 100644
--- a/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-list-item.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-list-item.tsx
@@ -1,5 +1,6 @@
 import type { ModelItem, ModelProvider } from '../declarations'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
 import { Switch } from '@langgenius/dify-ui/switch'
 import { useQueryClient } from '@tanstack/react-query'
 import { useDebounceFn } from 'ahooks'
@@ -7,7 +8,6 @@ import { memo, useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 import Badge from '@/app/components/base/badge'
 import { Balance } from '@/app/components/base/icons/src/vender/line/financeAndECommerce'
-import Tooltip from '@/app/components/base/tooltip'
 import { Plan } from '@/app/components/billing/type'
 import { useAppContext } from '@/context/app-context'
 import { useProviderContext, useProviderContextSelector } from '@/context/provider-context'
@@ -102,14 +102,12 @@ const ModelListItem = ({ model, provider, isConfigurable, onChange, onModifyLoad
         {
           model.deprecated
             ? (
-                <Tooltip
-                  popupContent={
-                    <span className="font-semibold">{t('modelProvider.modelHasBeenDeprecated', { ns: 'common' })}</span>
-                  }
-                  offset={{ mainAxis: 4 }}
-                >
-                  <Switch checked={false} disabled size="md" />
-                </Tooltip>
+                <Popover>
+                  <PopoverTrigger nativeButton={false} openOnHover render={<span><Switch checked={false} disabled size="md" /></span>} />
+                  <PopoverContent popupClassName="px-3 py-2 font-semibold system-xs-regular text-text-tertiary">
+                    {t('modelProvider.modelHasBeenDeprecated', { ns: 'common' })}
+                  </PopoverContent>
+                </Popover>
               )
             : (isCurrentWorkspaceManager && (
                 <Switch
diff --git a/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-load-balancing-configs.tsx b/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-load-balancing-configs.tsx
index e8b99bbcea..6d87e6af33 100644
--- a/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-load-balancing-configs.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-load-balancing-configs.tsx
@@ -15,6 +15,7 @@ import { useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import Badge from '@/app/components/base/badge/index'
 import GridMask from '@/app/components/base/grid-mask'
+import { Infotip } from '@/app/components/base/infotip'
 import UpgradeBtn from '@/app/components/billing/upgrade-btn'
 import s from '@/app/components/custom/style.module.css'
 import { AddCredentialInLoadBalancing } from '@/app/components/header/account-setting/model-provider-page/model-auth'
@@ -152,18 +153,14 @@ const ModelLoadBalancingConfigs = ({
           <div className="grow">
             <div className="flex items-center gap-1 text-sm text-text-primary">
               {t('modelProvider.loadBalancing', { ns: 'common' })}
-              <Tooltip>
-                <TooltipTrigger
-                  render={(
-                    <span className="flex h-3 w-3 shrink-0 p-px">
-                      <span aria-hidden className="i-ri-question-line h-full w-full text-text-quaternary hover:text-text-tertiary" />
-                    </span>
-                  )}
-                />
-                <TooltipContent className="max-w-[300px]">
-                  {t('modelProvider.loadBalancingInfo', { ns: 'common' })}
-                </TooltipContent>
-              </Tooltip>
+              <Infotip
+                aria-label={t('modelProvider.loadBalancingInfo', { ns: 'common' })}
+                className="h-3 w-3"
+                iconClassName="h-full w-full"
+                popupClassName="max-w-[300px]"
+              >
+                {t('modelProvider.loadBalancingInfo', { ns: 'common' })}
+              </Infotip>
             </div>
             <div className="text-xs text-text-tertiary">{t('modelProvider.loadBalancingDescription', { ns: 'common' })}</div>
           </div>
diff --git a/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-load-balancing-modal.tsx b/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-load-balancing-modal.tsx
index 34b9d1578f..4ed93a98e8 100644
--- a/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-load-balancing-modal.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/provider-added-card/model-load-balancing-modal.tsx
@@ -9,11 +9,11 @@ import {
 } from '@langgenius/dify-ui/alert-dialog'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
 import { memo, useCallback, useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Loading from '@/app/components/base/loading'
-import Modal from '@/app/components/base/modal'
 import { SwitchCredentialInLoadBalancing } from '@/app/components/header/account-setting/model-provider-page/model-auth'
 import { useGetModelCredential, useUpdateModelLoadBalancingConfig } from '@/service/use-models'
 import { ConfigurationMethodEnum, FormTypeEnum } from '../declarations'
@@ -180,114 +180,118 @@ const ModelLoadBalancingModal = ({ provider, configurateMethod, currentCustomCon
   }, [refetch, onClose])
   return (
     <>
-      <Modal
-        isShow={Boolean(model) && open}
-        onClose={onClose}
-        wrapperClassName="z-1002"
-        className="w-[640px] max-w-none px-8 pt-8"
-        title={(
-          <div className="pb-3 font-semibold">
-            <div className="h-[30px]">
-              {draftConfig?.enabled
-                ? t('modelProvider.auth.configLoadBalancing', { ns: 'common' })
-                : t('modelProvider.auth.configModel', { ns: 'common' })}
-            </div>
-            {Boolean(model) && (
-              <div className="flex h-5 items-center">
-                <ModelIcon className="mr-2 shrink-0" provider={provider} modelName={model!.model} />
-                <ModelName className="grow system-md-regular text-text-secondary" modelItem={model!} showModelType showMode showContextSize />
-              </div>
-            )}
-          </div>
-        )}
+      <Dialog
+        open={Boolean(model) && open}
+        onOpenChange={(open) => {
+          if (!open)
+            onClose?.()
+        }}
       >
-        {!draftConfig
-          ? <Loading type="area" />
-          : (
-              <>
-                <div className="py-2">
-                  <div className={cn('min-h-16 rounded-xl border bg-components-panel-bg transition-colors', draftConfig.enabled ? 'cursor-pointer border-components-panel-border' : 'cursor-default border-util-colors-blue-blue-600')} onClick={draftConfig.enabled ? () => toggleModalBalancing(false) : undefined}>
-                    <div className="flex items-center gap-2 px-[15px] py-3 select-none">
-                      <div className="flex h-8 w-8 shrink-0 grow-0 items-center justify-center rounded-lg border border-components-card-border bg-components-card-bg">
-                        {Boolean(model) && (<ModelIcon className="shrink-0" provider={provider} modelName={model!.model} />)}
-                      </div>
-                      <div className="grow">
-                        <div className="text-sm text-text-secondary">
-                          {providerFormSchemaPredefined
-                            ? t('modelProvider.auth.providerManaged', { ns: 'common' })
-                            : t('modelProvider.auth.specifyModelCredential', { ns: 'common' })}
-                        </div>
-                        <div className="text-xs text-text-tertiary">
-                          {providerFormSchemaPredefined
-                            ? t('modelProvider.auth.providerManagedTip', { ns: 'common' })
-                            : t('modelProvider.auth.specifyModelCredentialTip', { ns: 'common' })}
-                        </div>
-                      </div>
-                      {!providerFormSchemaPredefined && (<SwitchCredentialInLoadBalancing provider={provider} customModelCredential={customModelCredential ?? initialCustomModelCredential} setCustomModelCredential={setCustomModelCredential} model={model} credentials={available_credentials} onUpdate={handleUpdateWhenSwitchCredential} onRemove={handleUpdateWhenSwitchCredential} />)}
-                    </div>
-                  </div>
-                  {modelCredential && (
-                    <ModelLoadBalancingConfigs {...{
-                      draftConfig,
-                      setDraftConfig,
-                      provider,
-                      currentCustomConfigurationModelFixedFields: {
-                        __model_name: model.model,
-                        __model_type: model.model_type,
-                      },
-                      configurationMethod: model.fetch_from,
-                      className: 'mt-2',
-                      modelCredential,
-                      onUpdate: handleUpdate,
-                      onRemove: handleUpdateWhenSwitchCredential,
-                      model: {
-                        model: model.model,
-                        model_type: model.model_type,
-                      },
-                    }}
-                    />
-                  )}
+        <DialogContent className="w-[640px] max-w-none border-none px-8 pt-8 text-left align-middle">
+          <DialogTitle className="title-2xl-semi-bold text-text-primary">
+            <div className="pb-3 font-semibold">
+              <div className="h-[30px]">
+                {draftConfig?.enabled
+                  ? t('modelProvider.auth.configLoadBalancing', { ns: 'common' })
+                  : t('modelProvider.auth.configModel', { ns: 'common' })}
+              </div>
+              {Boolean(model) && (
+                <div className="flex h-5 items-center">
+                  <ModelIcon className="mr-2 shrink-0" provider={provider} modelName={model!.model} />
+                  <ModelName className="grow system-md-regular text-text-secondary" modelItem={model!} showModelType showMode showContextSize />
                 </div>
+              )}
+            </div>
+          </DialogTitle>
 
-                <div className="mt-6 flex items-center justify-between gap-2">
-                  <div>
-                    {!providerFormSchemaPredefined && (
-                      <Button onClick={() => openConfirmDelete(undefined, { model: model.model, model_type: model.model_type })} className="text-components-button-destructive-secondary-text">
-                        {t('modelProvider.auth.removeModel', { ns: 'common' })}
-                      </Button>
+          {!draftConfig
+            ? <Loading type="area" />
+            : (
+                <>
+                  <div className="py-2">
+                    <div className={cn('min-h-16 rounded-xl border bg-components-panel-bg transition-colors', draftConfig.enabled ? 'cursor-pointer border-components-panel-border' : 'cursor-default border-util-colors-blue-blue-600')} onClick={draftConfig.enabled ? () => toggleModalBalancing(false) : undefined}>
+                      <div className="flex items-center gap-2 px-[15px] py-3 select-none">
+                        <div className="flex h-8 w-8 shrink-0 grow-0 items-center justify-center rounded-lg border border-components-card-border bg-components-card-bg">
+                          {Boolean(model) && (<ModelIcon className="shrink-0" provider={provider} modelName={model!.model} />)}
+                        </div>
+                        <div className="grow">
+                          <div className="text-sm text-text-secondary">
+                            {providerFormSchemaPredefined
+                              ? t('modelProvider.auth.providerManaged', { ns: 'common' })
+                              : t('modelProvider.auth.specifyModelCredential', { ns: 'common' })}
+                          </div>
+                          <div className="text-xs text-text-tertiary">
+                            {providerFormSchemaPredefined
+                              ? t('modelProvider.auth.providerManagedTip', { ns: 'common' })
+                              : t('modelProvider.auth.specifyModelCredentialTip', { ns: 'common' })}
+                          </div>
+                        </div>
+                        {!providerFormSchemaPredefined && (<SwitchCredentialInLoadBalancing provider={provider} customModelCredential={customModelCredential ?? initialCustomModelCredential} setCustomModelCredential={setCustomModelCredential} model={model} credentials={available_credentials} onUpdate={handleUpdateWhenSwitchCredential} onRemove={handleUpdateWhenSwitchCredential} />)}
+                      </div>
+                    </div>
+                    {modelCredential && (
+                      <ModelLoadBalancingConfigs {...{
+                        draftConfig,
+                        setDraftConfig,
+                        provider,
+                        currentCustomConfigurationModelFixedFields: {
+                          __model_name: model.model,
+                          __model_type: model.model_type,
+                        },
+                        configurationMethod: model.fetch_from,
+                        className: 'mt-2',
+                        modelCredential,
+                        onUpdate: handleUpdate,
+                        onRemove: handleUpdateWhenSwitchCredential,
+                        model: {
+                          model: model.model,
+                          model_type: model.model_type,
+                        },
+                      }}
+                      />
                     )}
                   </div>
-                  <div className="space-x-2">
-                    <Button onClick={onClose}>{t('operation.cancel', { ns: 'common' })}</Button>
-                    <Button
-                      variant="primary"
-                      onClick={handleSave}
-                      disabled={loading
-                        || (draftConfig?.enabled && (draftConfig?.configs.filter(config => config.enabled).length ?? 0) < 2)
-                        || isLoading}
-                    >
-                      {t('operation.save', { ns: 'common' })}
-                    </Button>
+
+                  <div className="mt-6 flex items-center justify-between gap-2">
+                    <div>
+                      {!providerFormSchemaPredefined && (
+                        <Button onClick={() => openConfirmDelete(undefined, { model: model.model, model_type: model.model_type })} className="text-components-button-destructive-secondary-text">
+                          {t('modelProvider.auth.removeModel', { ns: 'common' })}
+                        </Button>
+                      )}
+                    </div>
+                    <div className="space-x-2">
+                      <Button onClick={onClose}>{t('operation.cancel', { ns: 'common' })}</Button>
+                      <Button
+                        variant="primary"
+                        onClick={handleSave}
+                        disabled={loading
+                          || (draftConfig?.enabled && (draftConfig?.configs.filter(config => config.enabled).length ?? 0) < 2)
+                          || isLoading}
+                      >
+                        {t('operation.save', { ns: 'common' })}
+                      </Button>
+                    </div>
                   </div>
-                </div>
-              </>
-            )}
-      </Modal>
-      <AlertDialog open={!!deleteModel} onOpenChange={open => !open && closeConfirmDelete()}>
-        <AlertDialogContent>
-          <div className="flex flex-col gap-2 px-6 pt-6 pb-4">
-            <AlertDialogTitle className="w-full truncate title-2xl-semi-bold text-text-primary">
-              {t('modelProvider.confirmDelete', { ns: 'common' })}
-            </AlertDialogTitle>
-          </div>
-          <AlertDialogActions>
-            <AlertDialogCancelButton>{t('operation.cancel', { ns: 'common' })}</AlertDialogCancelButton>
-            <AlertDialogConfirmButton disabled={doingAction} onClick={handleDeleteModel}>
-              {t('operation.confirm', { ns: 'common' })}
-            </AlertDialogConfirmButton>
-          </AlertDialogActions>
-        </AlertDialogContent>
-      </AlertDialog>
+                </>
+              )}
+          <AlertDialog open={!!deleteModel} onOpenChange={open => !open && closeConfirmDelete()}>
+            <AlertDialogContent>
+              <div className="flex flex-col gap-2 px-6 pt-6 pb-4">
+                <AlertDialogTitle className="w-full truncate title-2xl-semi-bold text-text-primary">
+                  {t('modelProvider.confirmDelete', { ns: 'common' })}
+                </AlertDialogTitle>
+              </div>
+              <AlertDialogActions>
+                <AlertDialogCancelButton>{t('operation.cancel', { ns: 'common' })}</AlertDialogCancelButton>
+                <AlertDialogConfirmButton disabled={doingAction} onClick={handleDeleteModel}>
+                  {t('operation.confirm', { ns: 'common' })}
+                </AlertDialogConfirmButton>
+              </AlertDialogActions>
+            </AlertDialogContent>
+          </AlertDialog>
+        </DialogContent>
+      </Dialog>
     </>
   )
 }
diff --git a/web/app/components/header/account-setting/model-provider-page/provider-added-card/priority-selector.tsx b/web/app/components/header/account-setting/model-provider-page/provider-added-card/priority-selector.tsx
deleted file mode 100644
index a74c400035..0000000000
--- a/web/app/components/header/account-setting/model-provider-page/provider-added-card/priority-selector.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-import type { FC } from 'react'
-import { Popover, PopoverButton, PopoverPanel, Transition } from '@headlessui/react'
-import { Button } from '@langgenius/dify-ui/button'
-import { cn } from '@langgenius/dify-ui/cn'
-import {
-  RiCheckLine,
-  RiMoreFill,
-} from '@remixicon/react'
-import { Fragment } from 'react'
-import { useTranslation } from 'react-i18next'
-import { PreferredProviderTypeEnum } from '../declarations'
-
-type SelectorProps = {
-  value?: string
-  onSelect: (key: PreferredProviderTypeEnum) => void
-}
-const Selector: FC<SelectorProps> = ({
-  value,
-  onSelect,
-}) => {
-  const { t } = useTranslation()
-  const options = [
-    {
-      key: PreferredProviderTypeEnum.custom,
-      text: t('modelProvider.apiKey', { ns: 'common' }),
-    },
-    {
-      key: PreferredProviderTypeEnum.system,
-      text: t('modelProvider.quota', { ns: 'common' }),
-    },
-  ]
-
-  return (
-    <Popover className="relative">
-      <PopoverButton as="div">
-        {
-          ({ open }) => (
-            <Button className={cn(
-              'h-6 w-6 rounded-md px-0',
-              open && 'bg-components-button-secondary-bg-hover',
-            )}
-            >
-              <RiMoreFill className="h-3 w-3" />
-            </Button>
-          )
-        }
-      </PopoverButton>
-      <Transition
-        as={Fragment}
-        leave="transition ease-in duration-100"
-        leaveFrom="opacity-100"
-        leaveTo="opacity-0"
-      >
-        <PopoverPanel className="absolute top-7 right-0 z-10 w-[144px] rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-lg">
-          <div className="p-1">
-            <div className="px-3 pt-2 pb-1 text-sm font-medium text-text-secondary">{t('modelProvider.card.priorityUse', { ns: 'common' })}</div>
-            {
-              options.map(option => (
-                <PopoverButton as={Fragment} key={option.key}>
-                  <div
-                    className="flex h-9 cursor-pointer items-center justify-between rounded-lg px-3 text-sm text-text-secondary hover:bg-components-panel-on-panel-item-bg-hover"
-                    onClick={() => onSelect(option.key)}
-                  >
-                    <div className="grow">{option.text}</div>
-                    {value === option.key && <RiCheckLine className="h-4 w-4 text-text-accent" />}
-                  </div>
-                </PopoverButton>
-              ))
-            }
-          </div>
-        </PopoverPanel>
-      </Transition>
-    </Popover>
-  )
-}
-
-export default Selector
diff --git a/web/app/components/header/account-setting/model-provider-page/system-model-selector/index.tsx b/web/app/components/header/account-setting/model-provider-page/system-model-selector/index.tsx
index 8ceaaaa32e..c750d82160 100644
--- a/web/app/components/header/account-setting/model-provider-page/system-model-selector/index.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/system-model-selector/index.tsx
@@ -162,67 +162,69 @@ const SystemModel: FC<SystemModelSelectorProps> = ({
       <Dialog open={open} onOpenChange={setOpen}>
         <DialogContent
           backdropProps={{ forceRender: true }}
-          className="w-[480px] max-w-[480px] overflow-hidden p-0"
+          className="flex max-h-[calc(100dvh-2rem)] w-[480px] max-w-[480px] flex-col overflow-hidden p-0"
         >
           <DialogCloseButton className="top-5 right-5" />
-          <div className="px-6 pt-6 pr-14 pb-3">
+          <div className="shrink-0 px-6 pt-6 pr-14 pb-3">
             <DialogTitle className="title-2xl-semi-bold text-text-primary">
               {t('modelProvider.systemModelSettings', { ns: 'common' })}
             </DialogTitle>
           </div>
-          <div className="flex flex-col gap-4 px-6 py-3">
-            <div className="flex flex-col gap-1">
-              {renderModelLabel('modelProvider.systemReasoningModel.key', 'modelProvider.systemReasoningModel.tip')}
-              <div>
-                <ModelSelector
-                  defaultModel={currentTextGenerationDefaultModel}
-                  modelList={textGenerationModelList}
-                  onSelect={model => handleChangeDefaultModel(ModelTypeEnum.textGeneration, model)}
-                />
+          <div className="min-h-0 flex-1 overflow-y-auto px-6 py-3">
+            <div className="flex flex-col gap-4">
+              <div className="flex flex-col gap-1">
+                {renderModelLabel('modelProvider.systemReasoningModel.key', 'modelProvider.systemReasoningModel.tip')}
+                <div>
+                  <ModelSelector
+                    defaultModel={currentTextGenerationDefaultModel}
+                    modelList={textGenerationModelList}
+                    onSelect={model => handleChangeDefaultModel(ModelTypeEnum.textGeneration, model)}
+                  />
+                </div>
               </div>
-            </div>
-            <div className="flex flex-col gap-1">
-              {renderModelLabel('modelProvider.embeddingModel.key', 'modelProvider.embeddingModel.tip')}
-              <div>
-                <ModelSelector
-                  defaultModel={currentEmbeddingsDefaultModel}
-                  modelList={embeddingModelList}
-                  onSelect={model => handleChangeDefaultModel(ModelTypeEnum.textEmbedding, model)}
-                />
+              <div className="flex flex-col gap-1">
+                {renderModelLabel('modelProvider.embeddingModel.key', 'modelProvider.embeddingModel.tip')}
+                <div>
+                  <ModelSelector
+                    defaultModel={currentEmbeddingsDefaultModel}
+                    modelList={embeddingModelList}
+                    onSelect={model => handleChangeDefaultModel(ModelTypeEnum.textEmbedding, model)}
+                  />
+                </div>
               </div>
-            </div>
-            <div className="flex flex-col gap-1">
-              {renderModelLabel('modelProvider.rerankModel.key', 'modelProvider.rerankModel.tip')}
-              <div>
-                <ModelSelector
-                  defaultModel={currentRerankDefaultModel}
-                  modelList={rerankModelList}
-                  onSelect={model => handleChangeDefaultModel(ModelTypeEnum.rerank, model)}
-                />
+              <div className="flex flex-col gap-1">
+                {renderModelLabel('modelProvider.rerankModel.key', 'modelProvider.rerankModel.tip')}
+                <div>
+                  <ModelSelector
+                    defaultModel={currentRerankDefaultModel}
+                    modelList={rerankModelList}
+                    onSelect={model => handleChangeDefaultModel(ModelTypeEnum.rerank, model)}
+                  />
+                </div>
               </div>
-            </div>
-            <div className="flex flex-col gap-1">
-              {renderModelLabel('modelProvider.speechToTextModel.key', 'modelProvider.speechToTextModel.tip')}
-              <div>
-                <ModelSelector
-                  defaultModel={currentSpeech2textDefaultModel}
-                  modelList={speech2textModelList}
-                  onSelect={model => handleChangeDefaultModel(ModelTypeEnum.speech2text, model)}
-                />
+              <div className="flex flex-col gap-1">
+                {renderModelLabel('modelProvider.speechToTextModel.key', 'modelProvider.speechToTextModel.tip')}
+                <div>
+                  <ModelSelector
+                    defaultModel={currentSpeech2textDefaultModel}
+                    modelList={speech2textModelList}
+                    onSelect={model => handleChangeDefaultModel(ModelTypeEnum.speech2text, model)}
+                  />
+                </div>
               </div>
-            </div>
-            <div className="flex flex-col gap-1">
-              {renderModelLabel('modelProvider.ttsModel.key', 'modelProvider.ttsModel.tip')}
-              <div>
-                <ModelSelector
-                  defaultModel={currentTTSDefaultModel}
-                  modelList={ttsModelList}
-                  onSelect={model => handleChangeDefaultModel(ModelTypeEnum.tts, model)}
-                />
+              <div className="flex flex-col gap-1">
+                {renderModelLabel('modelProvider.ttsModel.key', 'modelProvider.ttsModel.tip')}
+                <div>
+                  <ModelSelector
+                    defaultModel={currentTTSDefaultModel}
+                    modelList={ttsModelList}
+                    onSelect={model => handleChangeDefaultModel(ModelTypeEnum.tts, model)}
+                  />
+                </div>
               </div>
             </div>
           </div>
-          <div className="flex items-center justify-end gap-2 px-6 pt-5 pb-6">
+          <div className="flex shrink-0 items-center justify-end gap-2 px-6 pt-5 pb-6">
             <Button
               className="min-w-[72px]"
               onClick={() => setOpen(false)}
diff --git a/web/app/components/header/app-nav/__tests__/index.spec.tsx b/web/app/components/header/app-nav/__tests__/index.spec.tsx
index e7b546a589..c2b0207b83 100644
--- a/web/app/components/header/app-nav/__tests__/index.spec.tsx
+++ b/web/app/components/header/app-nav/__tests__/index.spec.tsx
@@ -1,17 +1,16 @@
+import { useInfiniteQuery } from '@tanstack/react-query'
 import { render, screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { useStore as useAppStore } from '@/app/components/app/store'
 import { useAppContext } from '@/context/app-context'
-import { useParams, usePathname, useRouter } from '@/next/navigation'
-import { useInfiniteAppList } from '@/service/use-apps'
-import { useCreateSnippetMutation, useInfiniteSnippetList, useSnippetApiDetail } from '@/service/use-snippets'
+import { useParams } from '@/next/navigation'
 import { AppModeEnum } from '@/types/app'
 import AppNav from '../index'
 
+const mockAppListInfiniteOptions = vi.hoisted(() => vi.fn((options: unknown) => options))
+
 vi.mock('@/next/navigation', () => ({
   useParams: vi.fn(),
-  usePathname: vi.fn(),
-  useRouter: vi.fn(),
 }))
 
 vi.mock('react-i18next', () => ({
@@ -28,23 +27,24 @@ vi.mock('@/app/components/app/store', () => ({
   useStore: vi.fn(),
 }))
 
-vi.mock('@/service/use-apps', () => ({
-  useInfiniteAppList: vi.fn(),
-}))
-
-vi.mock('@/service/use-snippets', () => ({
-  useCreateSnippetMutation: vi.fn(),
-  useInfiniteSnippetList: vi.fn(),
-  useSnippetApiDetail: vi.fn(),
-}))
-
-vi.mock('@langgenius/dify-ui/toast', () => ({
-  toast: {
-    error: vi.fn(),
-    success: vi.fn(),
+vi.mock('@/service/client', () => ({
+  consoleQuery: {
+    apps: {
+      list: {
+        infiniteOptions: (options: unknown) => mockAppListInfiniteOptions(options),
+      },
+    },
   },
 }))
 
+vi.mock('@tanstack/react-query', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@tanstack/react-query')>()
+  return {
+    ...actual,
+    useInfiniteQuery: vi.fn(),
+  }
+})
+
 vi.mock('@/app/components/app/create-app-dialog', () => ({
   default: ({ show, onClose, onSuccess }: { show: boolean, onClose: () => void, onSuccess: () => void }) =>
     show
@@ -99,67 +99,17 @@ vi.mock('@/app/components/app/create-from-dsl-modal', () => ({
       : null,
 }))
 
-vi.mock('@/app/components/workflow/create-snippet-dialog', () => ({
-  default: ({
-    isOpen,
-    onClose,
-    onConfirm,
-  }: {
-    isOpen: boolean
-    onClose: () => void
-    onConfirm: (payload: {
-      name: string
-      description: string
-      icon: { type: 'emoji', icon: string, background: string }
-    }) => void
-  }) =>
-    isOpen
-      ? (
-          <button
-            type="button"
-            data-testid="create-snippet-dialog"
-            onClick={() => {
-              onConfirm({
-                name: 'Created Snippet',
-                description: '',
-                icon: {
-                  type: 'emoji',
-                  icon: '🤖',
-                  background: '#fff',
-                },
-              })
-              onClose()
-            }}
-          >
-            Create Snippet
-          </button>
-        )
-      : null,
-}))
-
 vi.mock('../../nav', () => ({
   default: ({
-    createText,
-    curNav,
-    isApp,
-    link,
     onCreate,
     onLoadMore,
     navigationItems,
   }: {
-    createText: string
-    curNav?: { id: string, name: string }
-    isApp?: boolean
-    link: string
     onCreate: (state: string) => void
     onLoadMore?: () => void
     navigationItems?: Array<{ id: string, name: string, link: string }>
   }) => (
     <div data-testid="nav">
-      <div data-testid="nav-link">{link}</div>
-      <div data-testid="nav-is-app">{String(isApp)}</div>
-      <div data-testid="nav-create-text">{createText}</div>
-      <div data-testid="nav-current">{curNav ? `${curNav.id}:${curNav.name}` : ''}</div>
       <ul data-testid="nav-items">
         {(navigationItems ?? []).map(item => (
           <li key={item.id}>{`${item.name} -> ${item.link}`}</li>
@@ -193,53 +143,15 @@ const mockAppData = [
   },
 ]
 
-const mockSnippetData = [
-  {
-    id: 'snippet-1',
-    name: 'Snippet 1',
-    description: '',
-    icon_info: {
-      icon_type: 'emoji',
-      icon: '🧩',
-      icon_background: '#fff',
-      icon_url: null,
-    },
-    is_published: true,
-    use_count: 0,
-    created_at: 1,
-    created_by: 'user-1',
-    updated_at: 1,
-    updated_by: 'user-1',
-  },
-  {
-    id: 'snippet-2',
-    name: 'Snippet 2',
-    description: '',
-    icon_info: {
-      icon_type: 'emoji',
-      icon: '⚙️',
-      icon_background: '#000',
-      icon_url: null,
-    },
-    is_published: true,
-    use_count: 1,
-    created_at: 1,
-    created_by: 'user-1',
-    updated_at: 1,
-    updated_by: 'user-1',
-  },
-]
-
 const mockUseParams = vi.mocked(useParams)
-const mockUsePathname = vi.mocked(usePathname)
-const mockUseRouter = vi.mocked(useRouter)
 const mockUseAppContext = vi.mocked(useAppContext)
 const mockUseAppStore = vi.mocked(useAppStore)
-const mockUseInfiniteAppList = vi.mocked(useInfiniteAppList)
-const mockUseInfiniteSnippetList = vi.mocked(useInfiniteSnippetList)
-const mockUseSnippetApiDetail = vi.mocked(useSnippetApiDetail)
-const mockUseCreateSnippetMutation = vi.mocked(useCreateSnippetMutation)
+const mockUseInfiniteQuery = vi.mocked(useInfiniteQuery)
 let mockAppDetail: { id: string, name: string } | null = null
+type AppListInfiniteOptions = {
+  input: (pageParam: number) => { query: { page: number, limit: number, name: string } }
+  getNextPageParam: (lastPage: { has_more: boolean, page: number }) => number | undefined
+}
 
 const setupDefaultMocks = (options?: {
   hasNextPage?: boolean
@@ -252,62 +164,19 @@ const setupDefaultMocks = (options?: {
   const fetchNextPage = options?.fetchNextPage ?? vi.fn()
 
   mockUseParams.mockReturnValue({ appId: 'app-1' } as ReturnType<typeof useParams>)
-  mockUsePathname.mockReturnValue('/app/app-1/workflow')
-  mockUseRouter.mockReturnValue({ push: vi.fn() } as unknown as ReturnType<typeof useRouter>)
   mockUseAppContext.mockReturnValue({ isCurrentWorkspaceEditor: options?.isEditor ?? false } as ReturnType<typeof useAppContext>)
   mockUseAppStore.mockImplementation((selector: unknown) => (selector as (state: { appDetail: { id: string, name: string } | null }) => unknown)({ appDetail: mockAppDetail }))
-  mockUseInfiniteAppList.mockReturnValue({
+  mockUseInfiniteQuery.mockReturnValue({
     data: { pages: [{ data: options?.appData ?? mockAppData }] },
     fetchNextPage,
     hasNextPage: options?.hasNextPage ?? false,
     isFetchingNextPage: false,
     refetch,
-  } as ReturnType<typeof useInfiniteAppList>)
-  mockUseInfiniteSnippetList.mockReturnValue({
-    data: undefined,
-    fetchNextPage: vi.fn(),
-    hasNextPage: false,
-    isFetchingNextPage: false,
-  } as unknown as ReturnType<typeof useInfiniteSnippetList>)
-  mockUseSnippetApiDetail.mockReturnValue({
-    data: undefined,
-  } as ReturnType<typeof useSnippetApiDetail>)
-  mockUseCreateSnippetMutation.mockReturnValue({
-    isPending: false,
-    mutate: vi.fn(),
-  } as unknown as ReturnType<typeof useCreateSnippetMutation>)
+  } as ReturnType<typeof useInfiniteQuery>)
 
   return { refetch, fetchNextPage }
 }
 
-const setupSnippetMocks = (options?: {
-  fetchNextPage?: () => void
-  hasNextPage?: boolean
-  mutate?: ReturnType<typeof vi.fn>
-}) => {
-  const fetchNextPage = options?.fetchNextPage ?? vi.fn()
-  const mutate = options?.mutate ?? vi.fn()
-
-  setupDefaultMocks({ isEditor: true })
-  mockUseParams.mockReturnValue({ snippetId: 'snippet-1' } as ReturnType<typeof useParams>)
-  mockUsePathname.mockReturnValue('/snippets/snippet-1/orchestrate')
-  mockUseInfiniteSnippetList.mockReturnValue({
-    data: { pages: [{ data: mockSnippetData }] },
-    fetchNextPage,
-    hasNextPage: options?.hasNextPage ?? false,
-    isFetchingNextPage: false,
-  } as unknown as ReturnType<typeof useInfiniteSnippetList>)
-  mockUseSnippetApiDetail.mockReturnValue({
-    data: mockSnippetData[0],
-  } as ReturnType<typeof useSnippetApiDetail>)
-  mockUseCreateSnippetMutation.mockReturnValue({
-    isPending: false,
-    mutate,
-  } as unknown as ReturnType<typeof useCreateSnippetMutation>)
-
-  return { fetchNextPage, mutate }
-}
-
 describe('AppNav', () => {
   beforeEach(() => {
     vi.clearAllMocks()
@@ -315,6 +184,23 @@ describe('AppNav', () => {
     setupDefaultMocks()
   })
 
+  it('should configure paged app list query options', () => {
+    setupDefaultMocks()
+    render(<AppNav />)
+
+    const options = mockAppListInfiniteOptions.mock.calls.at(-1)?.[0] as AppListInfiniteOptions
+
+    expect(options.input(3)).toEqual({
+      query: {
+        page: 3,
+        limit: 30,
+        name: '',
+      },
+    })
+    expect(options.getNextPageParam({ has_more: true, page: 3 })).toBe(4)
+    expect(options.getNextPageParam({ has_more: false, page: 3 })).toBeUndefined()
+  })
+
   it('should build editor links and update app name when app detail changes', async () => {
     setupDefaultMocks({
       isEditor: true,
@@ -433,13 +319,13 @@ describe('AppNav', () => {
     // Arrange
     setupDefaultMocks()
     mockUseParams.mockReturnValue({} as ReturnType<typeof useParams>)
-    mockUseInfiniteAppList.mockReturnValue({
+    mockUseInfiniteQuery.mockReturnValue({
       data: undefined,
       fetchNextPage: vi.fn(),
       hasNextPage: false,
       isFetchingNextPage: false,
       refetch: vi.fn(),
-    } as unknown as ReturnType<typeof useInfiniteAppList>)
+    } as unknown as ReturnType<typeof useInfiniteQuery>)
 
     // Act
     render(<AppNav />)
@@ -489,67 +375,4 @@ describe('AppNav', () => {
       expect(screen.getByText('App 1 -> /app/app-1/configuration')).toBeInTheDocument()
     })
   })
-
-  it('should switch the main nav to snippet list and render snippet items on snippet detail routes', () => {
-    setupSnippetMocks()
-
-    render(<AppNav />)
-
-    expect(screen.getByTestId('nav-link')).toHaveTextContent('/snippets')
-    expect(screen.getByTestId('nav-is-app')).toHaveTextContent('false')
-    expect(screen.getByTestId('nav-current')).toHaveTextContent('snippet-1:Snippet 1')
-    expect(screen.getByTestId('nav-create-text')).toHaveTextContent('createFromBlank')
-    expect(screen.getByText('Snippet 1 -> /snippets/snippet-1/orchestrate')).toBeInTheDocument()
-    expect(screen.getByText('Snippet 2 -> /snippets/snippet-2/orchestrate')).toBeInTheDocument()
-  })
-
-  it('should not show stale snippet detail as the current nav while switching snippets', () => {
-    setupSnippetMocks()
-    mockUseParams.mockReturnValue({ snippetId: 'snippet-2' } as ReturnType<typeof useParams>)
-    mockUseSnippetApiDetail.mockReturnValue({
-      data: mockSnippetData[0],
-    } as ReturnType<typeof useSnippetApiDetail>)
-
-    render(<AppNav />)
-
-    expect(screen.getByTestId('nav-current')).toBeEmptyDOMElement()
-  })
-
-  it('should load more snippets from the snippet selector when more data is available', async () => {
-    const user = userEvent.setup()
-    const { fetchNextPage } = setupSnippetMocks({ hasNextPage: true })
-
-    render(<AppNav />)
-
-    await user.click(screen.getByTestId('load-more'))
-    expect(fetchNextPage).toHaveBeenCalledTimes(1)
-  })
-
-  it('should open the create snippet dialog from snippet nav create action', async () => {
-    const user = userEvent.setup()
-    const mutate = vi.fn()
-    setupSnippetMocks({ mutate })
-
-    render(<AppNav />)
-
-    await user.click(screen.getByTestId('create-blank'))
-    expect(screen.getByTestId('create-snippet-dialog')).toBeInTheDocument()
-
-    await user.click(screen.getByTestId('create-snippet-dialog'))
-    expect(mutate).toHaveBeenCalledWith({
-      body: {
-        name: 'Created Snippet',
-        description: undefined,
-        icon_info: {
-          icon: '🤖',
-          icon_type: 'emoji',
-          icon_background: '#fff',
-          icon_url: undefined,
-        },
-      },
-    }, expect.objectContaining({
-      onSuccess: expect.any(Function),
-      onError: expect.any(Function),
-    }))
-  })
 })
diff --git a/web/app/components/header/app-nav/index.tsx b/web/app/components/header/app-nav/index.tsx
index 4f3a580ef8..a65477e4df 100644
--- a/web/app/components/header/app-nav/index.tsx
+++ b/web/app/components/header/app-nav/index.tsx
@@ -1,22 +1,19 @@
 'use client'
 
 import type { NavItem } from '../nav/nav-selector'
-import type { AppIconSelection } from '@/app/components/base/app-icon-picker'
-import { toast } from '@langgenius/dify-ui/toast'
-import { flatten } from 'es-toolkit/compat'
+import type { AppListQuery } from '@/contract/console/apps'
+import {
+  RiRobot2Fill,
+  RiRobot2Line,
+} from '@remixicon/react'
+import { keepPreviousData, useInfiniteQuery } from '@tanstack/react-query'
 import { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useStore as useAppStore } from '@/app/components/app/store'
-import CreateSnippetDialog from '@/app/components/workflow/create-snippet-dialog'
 import { useAppContext } from '@/context/app-context'
 import dynamic from '@/next/dynamic'
-import { useParams, usePathname, useRouter } from '@/next/navigation'
-import { useInfiniteAppList } from '@/service/use-apps'
-import {
-  useCreateSnippetMutation,
-  useInfiniteSnippetList,
-  useSnippetApiDetail,
-} from '@/service/use-snippets'
+import { useParams } from '@/next/navigation'
+import { consoleQuery } from '@/service/client'
 import { AppModeEnum } from '@/types/app'
 import Nav from '../nav'
 
@@ -24,20 +21,30 @@ const CreateAppTemplateDialog = dynamic(() => import('@/app/components/app/creat
 const CreateAppModal = dynamic(() => import('@/app/components/app/create-app-modal'), { ssr: false })
 const CreateFromDSLModal = dynamic(() => import('@/app/components/app/create-from-dsl-modal'), { ssr: false })
 
+const appNavListQuery = {
+  page: 1,
+  limit: 30,
+  name: '',
+} satisfies AppListQuery
+
+const getAppLink = (isCurrentWorkspaceEditor: boolean, appId: string, appMode: AppModeEnum) => {
+  if (!isCurrentWorkspaceEditor)
+    return `/app/${appId}/overview`
+
+  if (appMode === AppModeEnum.WORKFLOW || appMode === AppModeEnum.ADVANCED_CHAT)
+    return `/app/${appId}/workflow`
+
+  return `/app/${appId}/configuration`
+}
+
 const AppNav = () => {
   const { t } = useTranslation()
-  const { appId, snippetId } = useParams()
-  const { push } = useRouter()
-  const pathname = usePathname()
-  const isSnippetSegment = pathname === '/snippets' || pathname.startsWith('/snippets/')
-  const currentSnippetId = typeof snippetId === 'string' ? snippetId : ''
+  const { appId } = useParams()
   const { isCurrentWorkspaceEditor } = useAppContext()
   const appDetail = useAppStore(state => state.appDetail)
   const [showNewAppDialog, setShowNewAppDialog] = useState(false)
   const [showNewAppTemplateDialog, setShowNewAppTemplateDialog] = useState(false)
   const [showCreateFromDSLModal, setShowCreateFromDSLModal] = useState(false)
-  const [showCreateSnippetDialog, setShowCreateSnippetDialog] = useState(false)
-  const createSnippetMutation = useCreateSnippetMutation()
 
   const {
     data: appsData,
@@ -45,40 +52,27 @@ const AppNav = () => {
     hasNextPage,
     isFetchingNextPage,
     refetch,
-  } = useInfiniteAppList({
-    page: 1,
-    limit: 30,
-    name: '',
-  }, { enabled: !!appId && !isSnippetSegment })
-
-  const {
-    data: snippetsData,
-    fetchNextPage: fetchNextSnippetPage,
-    hasNextPage: hasNextSnippetPage,
-    isFetchingNextPage: isFetchingNextSnippetPage,
-  } = useInfiniteSnippetList({
-    page: 1,
-    limit: 30,
-  }, { enabled: !!currentSnippetId })
-
-  const { data: snippetDetail } = useSnippetApiDetail(currentSnippetId)
+  } = useInfiniteQuery({
+    ...consoleQuery.apps.list.infiniteOptions({
+      input: pageParam => ({
+        query: {
+          ...appNavListQuery,
+          page: Number(pageParam),
+        },
+      }),
+      getNextPageParam: lastPage => lastPage.has_more ? lastPage.page + 1 : undefined,
+      initialPageParam: 1,
+      placeholderData: keepPreviousData,
+    }),
+    enabled: !!appId,
+  })
 
   const handleLoadMore = useCallback(() => {
     if (hasNextPage)
       fetchNextPage()
   }, [fetchNextPage, hasNextPage])
 
-  const handleLoadMoreSnippet = useCallback(() => {
-    if (hasNextSnippetPage)
-      fetchNextSnippetPage()
-  }, [fetchNextSnippetPage, hasNextSnippetPage])
-
   const openModal = (state: string) => {
-    if (isSnippetSegment) {
-      setShowCreateSnippetDialog(true)
-      return
-    }
-
     if (state === 'blank')
       setShowNewAppDialog(true)
     if (state === 'template')
@@ -87,125 +81,36 @@ const AppNav = () => {
       setShowCreateFromDSLModal(true)
   }
 
-  const appNavItems = useMemo<NavItem[]>(() => {
-    if (!appsData)
-      return []
+  const navItems = useMemo<NavItem[]>(() => {
+    const appItems = appsData?.pages.flatMap(appData => appData.data) ?? []
 
-    const appItems = flatten((appsData.pages ?? []).map(appData => appData.data))
-
-    return appItems.map((app) => {
-      const link = (() => {
-        if (!isCurrentWorkspaceEditor)
-          return `/app/${app.id}/overview`
-
-        if (app.mode === AppModeEnum.WORKFLOW || app.mode === AppModeEnum.ADVANCED_CHAT)
-          return `/app/${app.id}/workflow`
-
-        return `/app/${app.id}/configuration`
-      })()
-
-      return {
-        id: app.id,
-        icon_type: app.icon_type,
-        icon: app.icon,
-        icon_background: app.icon_background,
-        icon_url: app.icon_url,
-        name: appDetail?.id === app.id ? appDetail.name : app.name,
-        mode: app.mode,
-        link,
-      }
-    })
-  }, [appDetail?.id, appDetail?.name, appsData, isCurrentWorkspaceEditor])
-
-  const snippetNavItems = useMemo<NavItem[]>(() => {
-    if (!snippetsData)
-      return []
-
-    const snippetItems = flatten((snippetsData.pages ?? []).map(snippetData => snippetData.data))
-
-    return snippetItems.map(snippet => ({
-      id: snippet.id,
-      icon_type: snippet.icon_info.icon_type,
-      icon: snippet.icon_info.icon,
-      icon_background: snippet.icon_info.icon_background ?? null,
-      icon_url: snippet.icon_info.icon_url ?? null,
-      name: snippet.name,
-      link: `/snippets/${snippet.id}/orchestrate`,
+    return appItems.map(app => ({
+      id: app.id,
+      icon_type: app.icon_type,
+      icon: app.icon,
+      icon_background: app.icon_background,
+      icon_url: app.icon_url,
+      name: appDetail?.id === app.id ? appDetail.name : app.name,
+      mode: app.mode,
+      link: getAppLink(isCurrentWorkspaceEditor, app.id, app.mode),
     }))
-  }, [snippetsData])
-
-  const currentSnippetNav = useMemo(() => {
-    if (!snippetDetail)
-      return
-
-    if (snippetDetail.id !== currentSnippetId)
-      return
-
-    return {
-      id: snippetDetail.id,
-      icon_type: snippetDetail.icon_info.icon_type,
-      icon: snippetDetail.icon_info.icon,
-      icon_background: snippetDetail.icon_info.icon_background ?? null,
-      icon_url: snippetDetail.icon_info.icon_url ?? null,
-      name: snippetDetail.name,
-    }
-  }, [currentSnippetId, snippetDetail])
-
-  const handleCreateSnippet = useCallback(({
-    name,
-    description,
-    icon,
-  }: {
-    name: string
-    description: string
-    icon: AppIconSelection
-  }) => {
-    createSnippetMutation.mutate({
-      body: {
-        name,
-        description: description || undefined,
-        icon_info: {
-          icon: icon.type === 'emoji' ? icon.icon : icon.fileId,
-          icon_type: icon.type,
-          icon_background: icon.type === 'emoji' ? icon.background : undefined,
-          icon_url: icon.type === 'image' ? icon.url : undefined,
-        },
-      },
-    }, {
-      onSuccess: (snippet) => {
-        toast.success(t('snippet.createSuccess', { ns: 'workflow' }))
-        setShowCreateSnippetDialog(false)
-        push(`/snippets/${snippet.id}/orchestrate`)
-      },
-      onError: (error) => {
-        toast.error(error instanceof Error ? error.message : t('createFailed', { ns: 'snippet' }))
-      },
-    })
-  }, [createSnippetMutation, push, t])
-
-  const currentNav = isSnippetSegment ? currentSnippetNav : appDetail
-  const currentNavigationItems = isSnippetSegment ? snippetNavItems : appNavItems
-  const currentCreateText = isSnippetSegment
-    ? t('createFromBlank', { ns: 'snippet' })
-    : t('menus.newApp', { ns: 'common' })
-  const currentLoadMore = isSnippetSegment ? handleLoadMoreSnippet : handleLoadMore
-  const currentIsLoadingMore = isSnippetSegment ? isFetchingNextSnippetPage : isFetchingNextPage
+  }, [appDetail?.id, appDetail?.name, appsData?.pages, isCurrentWorkspaceEditor])
 
   return (
     <>
       <Nav
-        isApp={!isSnippetSegment}
-        icon={<span className="i-ri-robot-2-line h-4 w-4" />}
-        activeIcon={<span className="i-ri-robot-2-fill h-4 w-4" />}
+        isApp
+        icon={<RiRobot2Line className="h-4 w-4" />}
+        activeIcon={<RiRobot2Fill className="h-4 w-4" />}
         text={t('menus.apps', { ns: 'common' })}
-        activeSegment={['apps', 'app', 'snippets']}
-        link={isSnippetSegment ? '/snippets' : '/apps'}
-        curNav={currentNav ?? undefined}
-        navigationItems={currentNavigationItems}
-        createText={currentCreateText}
+        activeSegment={['apps', 'app']}
+        link="/apps"
+        curNav={appDetail}
+        navigationItems={navItems}
+        createText={t('menus.newApp', { ns: 'common' })}
         onCreate={openModal}
-        onLoadMore={currentLoadMore}
-        isLoadingMore={currentIsLoadingMore}
+        onLoadMore={handleLoadMore}
+        isLoadingMore={isFetchingNextPage}
       />
       <CreateAppModal
         show={showNewAppDialog}
@@ -222,14 +127,6 @@ const AppNav = () => {
         onClose={() => setShowCreateFromDSLModal(false)}
         onSuccess={() => refetch()}
       />
-      {showCreateSnippetDialog && (
-        <CreateSnippetDialog
-          isOpen={showCreateSnippetDialog}
-          isSubmitting={createSnippetMutation.isPending}
-          onClose={() => setShowCreateSnippetDialog(false)}
-          onConfirm={handleCreateSnippet}
-        />
-      )}
     </>
   )
 }
diff --git a/web/app/components/header/app-selector/__tests__/index.spec.tsx b/web/app/components/header/app-selector/__tests__/index.spec.tsx
deleted file mode 100644
index 2d255c006e..0000000000
--- a/web/app/components/header/app-selector/__tests__/index.spec.tsx
+++ /dev/null
@@ -1,172 +0,0 @@
-import type { AppDetailResponse } from '@/models/app'
-import { act, fireEvent, render, screen } from '@testing-library/react'
-import { vi } from 'vitest'
-import { useAppContext } from '@/context/app-context'
-import { useRouter } from '@/next/navigation'
-import AppSelector from '../index'
-
-// Mock next/navigation
-vi.mock('@/next/navigation', () => ({
-  useRouter: vi.fn(),
-}))
-
-// Mock app context
-vi.mock('@/context/app-context', () => ({
-  useAppContext: vi.fn(),
-}))
-
-// Mock CreateAppDialog to avoid complex dependencies
-vi.mock('@/app/components/app/create-app-dialog', () => ({
-  default: ({ show, onClose }: { show: boolean, onClose: () => void }) => show
-    ? (
-        <div data-testid="create-app-dialog">
-          <button onClick={onClose}>Close</button>
-        </div>
-      )
-    : null,
-}))
-
-describe('AppSelector Component', () => {
-  const mockPush = vi.fn()
-  const mockAppItems = [
-    { id: '1', name: 'App 1' },
-    { id: '2', name: 'App 2' },
-  ] as unknown as AppDetailResponse[]
-  const mockCurApp = mockAppItems[0]!
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    vi.mocked(useRouter).mockReturnValue({
-      push: mockPush,
-    } as unknown as ReturnType<typeof useRouter>)
-    vi.mocked(useAppContext).mockReturnValue({
-      isCurrentWorkspaceEditor: true,
-    } as unknown as ReturnType<typeof useAppContext>)
-  })
-
-  describe('Rendering', () => {
-    it('should render current app name', () => {
-      render(<AppSelector appItems={mockAppItems} curApp={mockCurApp} />)
-      expect(screen.getByText('App 1'))!.toBeInTheDocument()
-    })
-  })
-
-  describe('Interactions', () => {
-    it('should open menu and show app items', async () => {
-      render(<AppSelector appItems={mockAppItems} curApp={mockCurApp} />)
-
-      const button = screen.getByRole('button', { name: /App 1/i })
-      await act(async () => {
-        fireEvent.click(button)
-      })
-
-      expect(screen.getByText('App 2'))!.toBeInTheDocument()
-    })
-
-    it('should navigate to configuration when an app is clicked and user is editor', async () => {
-      render(<AppSelector appItems={mockAppItems} curApp={mockCurApp} />)
-
-      const button = screen.getByRole('button', { name: /App 1/i })
-      await act(async () => {
-        fireEvent.click(button)
-      })
-
-      const app2Item = screen.getByText('App 2')
-      await act(async () => {
-        fireEvent.click(app2Item)
-      })
-
-      expect(mockPush).toHaveBeenCalledWith('/app/2/configuration')
-    })
-
-    it('should navigate to overview when an app is clicked and user is not editor', async () => {
-      vi.mocked(useAppContext).mockReturnValue({
-        isCurrentWorkspaceEditor: false,
-      } as unknown as ReturnType<typeof useAppContext>)
-
-      render(<AppSelector appItems={mockAppItems} curApp={mockCurApp} />)
-
-      const button = screen.getByRole('button', { name: /App 1/i })
-      await act(async () => {
-        fireEvent.click(button)
-      })
-
-      const app2Item = screen.getByText('App 2')
-      await act(async () => {
-        fireEvent.click(app2Item)
-      })
-
-      expect(mockPush).toHaveBeenCalledWith('/app/2/overview')
-    })
-  })
-
-  describe('New App Dialog', () => {
-    it('should show "New App" button for editor and open dialog', async () => {
-      render(<AppSelector appItems={mockAppItems} curApp={mockCurApp} />)
-
-      const button = screen.getByRole('button', { name: /App 1/i })
-      await act(async () => {
-        fireEvent.click(button)
-      })
-
-      const newAppBtn = screen.getByText('common.menus.newApp')
-      await act(async () => {
-        fireEvent.click(newAppBtn)
-      })
-
-      expect(screen.getByTestId('create-app-dialog'))!.toBeInTheDocument()
-    })
-
-    it('should not show "New App" button for non-editor', async () => {
-      vi.mocked(useAppContext).mockReturnValue({
-        isCurrentWorkspaceEditor: false,
-      } as unknown as ReturnType<typeof useAppContext>)
-
-      render(<AppSelector appItems={mockAppItems} curApp={mockCurApp} />)
-
-      const button = screen.getByRole('button', { name: /App 1/i })
-      await act(async () => {
-        fireEvent.click(button)
-      })
-
-      expect(screen.queryByText('common.menus.newApp')).not.toBeInTheDocument()
-    })
-
-    it('should close dialog when onClose is called', async () => {
-      render(<AppSelector appItems={mockAppItems} curApp={mockCurApp} />)
-
-      const button = screen.getByRole('button', { name: /App 1/i })
-      await act(async () => {
-        fireEvent.click(button)
-      })
-
-      const newAppBtn = screen.getByText('common.menus.newApp')
-      await act(async () => {
-        fireEvent.click(newAppBtn)
-      })
-
-      const closeBtn = screen.getByText('Close')
-      await act(async () => {
-        fireEvent.click(closeBtn)
-      })
-
-      expect(screen.queryByTestId('create-app-dialog')).not.toBeInTheDocument()
-    })
-  })
-
-  describe('Edge Cases', () => {
-    it('should render nothing in menu if appItems is empty', async () => {
-      render(<AppSelector appItems={[]} curApp={mockCurApp} />)
-
-      const button = screen.getByRole('button', { name: /App 1/i })
-      await act(async () => {
-        fireEvent.click(button)
-      })
-
-      expect(screen.queryByText('App 2')).not.toBeInTheDocument()
-      // "New App" should still be there if editor
-      // "New App" should still be there if editor
-      expect(screen.getByText('common.menus.newApp'))!.toBeInTheDocument()
-    })
-  })
-})
diff --git a/web/app/components/header/app-selector/index.tsx b/web/app/components/header/app-selector/index.tsx
deleted file mode 100644
index 52e60de2b4..0000000000
--- a/web/app/components/header/app-selector/index.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-'use client'
-import type { AppDetailResponse } from '@/models/app'
-import { Menu, MenuButton, MenuItem, MenuItems, Transition } from '@headlessui/react'
-import { ChevronDownIcon, PlusIcon } from '@heroicons/react/24/solid'
-import { noop } from 'es-toolkit/function'
-import { Fragment, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import CreateAppDialog from '@/app/components/app/create-app-dialog'
-import AppIcon from '@/app/components/base/app-icon'
-import { useAppContext } from '@/context/app-context'
-import { useRouter } from '@/next/navigation'
-import Indicator from '../indicator'
-
-type IAppSelectorProps = {
-  appItems: AppDetailResponse[]
-  curApp: AppDetailResponse
-}
-
-export default function AppSelector({ appItems, curApp }: IAppSelectorProps) {
-  const router = useRouter()
-  const { isCurrentWorkspaceEditor } = useAppContext()
-  const [showNewAppDialog, setShowNewAppDialog] = useState(false)
-  const { t } = useTranslation()
-
-  const itemClassName = `
-    flex items-center w-full h-10 px-3 text-gray-700 text-[14px]
-    rounded-lg font-normal hover:bg-gray-100 cursor-pointer
-  `
-
-  return (
-    <div className="">
-      <Menu as="div" className="relative inline-block text-left">
-        <div>
-          <MenuButton
-            className="
-              inline-flex h-7 w-full items-center justify-center
-              rounded-[10px] pr-2.5 pl-2 text-[14px] font-semibold
-              text-[#1C64F2] hover:bg-[#EBF5FF]
-            "
-          >
-            {curApp?.name}
-            <ChevronDownIcon
-              className="ml-1 h-3 w-3"
-              aria-hidden="true"
-            />
-          </MenuButton>
-        </div>
-        <Transition
-          as={Fragment}
-          enter="transition ease-out duration-100"
-          enterFrom="transform opacity-0 scale-95"
-          enterTo="transform opacity-100 scale-100"
-          leave="transition ease-in duration-75"
-          leaveFrom="transform opacity-100 scale-100"
-          leaveTo="transform opacity-0 scale-95"
-        >
-          <MenuItems
-            className="
-              absolute right-0 -left-11 mt-1.5 w-60 max-w-80
-              origin-top-right divide-y divide-gray-100 rounded-lg bg-white
-              shadow-lg
-            "
-          >
-            {!!appItems.length && (
-              <div className="overflow-auto px-1 py-1" style={{ maxHeight: '50vh' }}>
-                {
-                  appItems.map((app: AppDetailResponse) => (
-                    <MenuItem key={app.id}>
-                      <div
-                        className={itemClassName}
-                        onClick={() =>
-                          router.push(`/app/${app.id}/${isCurrentWorkspaceEditor ? 'configuration' : 'overview'}`)}
-                      >
-                        <div className="relative mr-2 h-6 w-6 rounded-md bg-[#D5F5F6]">
-                          <AppIcon size="tiny" />
-                          <div className="absolute -right-0.5 -bottom-0.5 flex h-2.5 w-2.5 items-center justify-center rounded-sm bg-white">
-                            <Indicator />
-                          </div>
-                        </div>
-                        {app.name}
-                      </div>
-                    </MenuItem>
-                  ))
-                }
-              </div>
-            )}
-            {isCurrentWorkspaceEditor && (
-              <MenuItem>
-                <div className="p-1" onClick={() => setShowNewAppDialog(true)}>
-                  <div
-                    className="flex h-12 cursor-pointer items-center rounded-lg hover:bg-gray-100"
-                  >
-                    <div
-                      className="
-                      mr-2 ml-4 flex
-                      h-6 w-6 items-center justify-center rounded-md border-[0.5px]
-                      border-dashed border-gray-200 bg-gray-100
-                    "
-                    >
-                      <PlusIcon className="h-4 w-4 text-gray-500" />
-                    </div>
-                    <div className="text-[14px] font-normal text-gray-700">{t('menus.newApp', { ns: 'common' })}</div>
-                  </div>
-                </div>
-              </MenuItem>
-            )}
-          </MenuItems>
-        </Transition>
-      </Menu>
-      <CreateAppDialog
-        show={showNewAppDialog}
-        onClose={() => setShowNewAppDialog(false)}
-        onSuccess={noop}
-      />
-    </div>
-  )
-}
diff --git a/web/app/components/header/index.tsx b/web/app/components/header/index.tsx
index c7c12f1e35..8e94a831d4 100644
--- a/web/app/components/header/index.tsx
+++ b/web/app/components/header/index.tsx
@@ -18,7 +18,7 @@ import DatasetNav from './dataset-nav'
 import EnvNav from './env-nav'
 import ExploreNav from './explore-nav'
 import LicenseNav from './license-env'
-import PlanBadge from './plan-badge'
+import { PlanBadge } from './plan-badge'
 import PluginsNav from './plugins-nav'
 import ToolsNav from './tools-nav'
 
diff --git a/web/app/components/header/license-env/index.tsx b/web/app/components/header/license-env/index.tsx
index fd360796b1..e7112a61f1 100644
--- a/web/app/components/header/license-env/index.tsx
+++ b/web/app/components/header/license-env/index.tsx
@@ -17,7 +17,7 @@ const LicenseNav = () => {
     const count = dayjs(expiredAt).diff(dayjs(), 'days')
     return (
       <PremiumBadge color="orange" className="select-none">
-        <RiHourglass2Fill className="flex size-3 items-center pl-0.5 text-components-premium-badge-indigo-text-stop-0" />
+        <RiHourglass2Fill aria-hidden="true" className="flex size-3 items-center pl-0.5 text-components-premium-badge-indigo-text-stop-0" />
         {count <= 1 && <span className="px-0.5 system-xs-medium">{t('license.expiring', { ns: 'common', count })}</span>}
         {count > 1 && <span className="px-0.5 system-xs-medium">{t('license.expiring_plural', { ns: 'common', count })}</span>}
       </PremiumBadge>
diff --git a/web/app/components/header/maintenance-notice.tsx b/web/app/components/header/maintenance-notice.tsx
index 4df7108177..2c60477584 100644
--- a/web/app/components/header/maintenance-notice.tsx
+++ b/web/app/components/header/maintenance-notice.tsx
@@ -1,9 +1,11 @@
 import { useState } from 'react'
+import { useTranslation } from 'react-i18next'
 import { X } from '@/app/components/base/icons/src/vender/line/general'
 import { useLanguage } from '@/app/components/header/account-setting/model-provider-page/hooks'
 import { NOTICE_I18N } from '@/i18n-config/language'
 
 const MaintenanceNotice = () => {
+  const { t } = useTranslation()
   const locale = useLanguage()
 
   const [showNotice, setShowNotice] = useState(() => localStorage.getItem('hide-maintenance-notice') !== '1')
@@ -27,10 +29,25 @@ const MaintenanceNotice = () => {
       <div className="mr-2 flex h-[22px] shrink-0 items-center rounded-xl bg-[#F79009] px-2 text-[11px] font-medium text-white">{titleByLocale[locale]}</div>
       {
         (NOTICE_I18N.href && NOTICE_I18N.href !== '#')
-          ? <div className="grow cursor-pointer text-xs font-medium text-gray-700" onClick={handleJumpNotice}>{descByLocale[locale]}</div>
+          ? (
+              <button
+                type="button"
+                className="grow cursor-pointer border-none bg-transparent p-0 text-left text-xs font-medium text-gray-700"
+                onClick={handleJumpNotice}
+              >
+                {descByLocale[locale]}
+              </button>
+            )
           : <div className="grow text-xs font-medium text-gray-700">{descByLocale[locale]}</div>
       }
-      <X className="h-4 w-4 shrink-0 cursor-pointer text-gray-500" onClick={handleCloseNotice} />
+      <button
+        type="button"
+        aria-label={t('operation.close', { ns: 'common' })}
+        className="h-4 w-4 shrink-0 cursor-pointer border-none bg-transparent p-0 text-gray-500"
+        onClick={handleCloseNotice}
+      >
+        <X className="h-4 w-4" aria-hidden="true" />
+      </button>
     </div>
   )
 }
diff --git a/web/app/components/header/nav/__tests__/index.spec.tsx b/web/app/components/header/nav/__tests__/index.spec.tsx
index 3615a9a2c9..9f0f672358 100644
--- a/web/app/components/header/nav/__tests__/index.spec.tsx
+++ b/web/app/components/header/nav/__tests__/index.spec.tsx
@@ -7,8 +7,8 @@ import {
   screen,
   waitFor,
 } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
 import * as React from 'react'
-import { use } from 'react'
 import { vi } from 'vitest'
 import { useStore as useAppStore } from '@/app/components/app/store'
 import { useAppContext } from '@/context/app-context'
@@ -16,59 +16,6 @@ import { useRouter, useSelectedLayoutSegment } from '@/next/navigation'
 import { AppModeEnum } from '@/types/app'
 import Nav from '../index'
 
-vi.mock('@headlessui/react', () => {
-  type MenuContextValue = { open: boolean, setOpen: (open: boolean) => void }
-  const MenuContext = React.createContext<MenuContextValue | null>(null)
-
-  const Menu = ({ children }: { children: React.ReactNode | ((props: { open: boolean }) => React.ReactNode) }) => {
-    const [open, setOpen] = React.useState(false)
-    const value = React.useMemo(() => ({ open, setOpen }), [open])
-    return (
-      <MenuContext value={value}>
-        {typeof children === 'function' ? children({ open }) : children}
-      </MenuContext>
-    )
-  }
-
-  const MenuButton = ({ onClick, children, ...props }: { onClick?: () => void, children?: React.ReactNode }) => {
-    const context = use(MenuContext)
-    const handleClick = () => {
-      context?.setOpen(!context.open)
-      onClick?.()
-    }
-    return (
-      <button type="button" aria-expanded={context?.open ?? false} onClick={handleClick} {...props}>
-        {children}
-      </button>
-    )
-  }
-
-  const MenuItems = ({ as: Component = 'div', role, children, ...props }: { as?: React.ElementType, role?: string, children: React.ReactNode }) => {
-    const context = use(MenuContext)
-    if (!context?.open)
-      return null
-    return (
-      <Component role={role ?? 'menu'} {...props}>
-        {children}
-      </Component>
-    )
-  }
-
-  const MenuItem = ({ as: Component = 'div', role, children, ...props }: { as?: React.ElementType, role?: string, children: React.ReactNode }) => (
-    <Component role={role ?? 'menuitem'} {...props}>
-      {children}
-    </Component>
-  )
-
-  return {
-    Menu,
-    MenuButton,
-    MenuItems,
-    MenuItem,
-    Transition: ({ show = true, children }: { show?: boolean, children: React.ReactNode }) => (show ? <>{children}</> : null),
-  }
-})
-
 // Mock next/navigation
 vi.mock('@/next/navigation', () => ({
   useSelectedLayoutSegment: vi.fn(),
@@ -300,45 +247,24 @@ describe('Nav Component', () => {
     })
 
     it('should show sub-menu and call onCreate with types when isApp is true', async () => {
-      render(<Nav {...defaultProps} curNav={curNav} isApp />)
-      const selectorButton = screen.getByRole('button', { name: /Item 1/i })
-
-      await act(async () => {
-        fireEvent.click(selectorButton)
-      })
-
-      const openCreateMenu = async () => {
-        const createButton = await screen.findByText('Create New')
-        await act(async () => {
-          fireEvent.click(createButton)
-        })
-        return screen.findByText(/app\.newApp\.startFromBlank/i)
+      const user = userEvent.setup()
+      const clickCreateBranch = async (optionName: RegExp) => {
+        const { unmount } = render(<Nav {...defaultProps} curNav={curNav} isApp />)
+        await user.click(screen.getByRole('button', { name: /Item 1/i }))
+        const createButton = await screen.findByRole('menuitem', { name: /Create New/i })
+        await user.hover(createButton)
+        fireEvent.click(await screen.findByRole('menuitem', { name: optionName }))
+        unmount()
       }
 
-      await openCreateMenu()
-      const blankOption = await screen.findByText(
-        /app\.newApp\.startFromBlank/i,
-      )
-      await act(async () => {
-        fireEvent.click(blankOption)
-      })
-      expect(mockOnCreate).toHaveBeenCalledWith('blank')
+      await clickCreateBranch(/app\.newApp\.startFromBlank/i)
+      await clickCreateBranch(/app\.newApp\.startFromTemplate/i)
+      await clickCreateBranch(/app\.importDSL/i)
 
-      await openCreateMenu()
-      const templateOption = await screen.findByText(
-        /app\.newApp\.startFromTemplate/i,
-      )
-      await act(async () => {
-        fireEvent.click(templateOption)
-      })
-      expect(mockOnCreate).toHaveBeenCalledWith('template')
-
-      await openCreateMenu()
-      const dslOption = await screen.findByText(/app\.importDSL/i)
-      await act(async () => {
-        fireEvent.click(dslOption)
-      })
-      expect(mockOnCreate).toHaveBeenCalledWith('dsl')
+      expect(mockOnCreate).toHaveBeenNthCalledWith(1, 'blank')
+      expect(mockOnCreate).toHaveBeenNthCalledWith(2, 'template')
+      expect(mockOnCreate).toHaveBeenNthCalledWith(3, 'dsl')
+      expect(mockOnCreate).toHaveBeenCalledTimes(3)
     })
 
     it('should not show create button if NOT an editor', async () => {
diff --git a/web/app/components/header/nav/nav-selector/__tests__/index.spec.tsx b/web/app/components/header/nav/nav-selector/__tests__/index.spec.tsx
index b1de3ab5e3..aaabe45613 100644
--- a/web/app/components/header/nav/nav-selector/__tests__/index.spec.tsx
+++ b/web/app/components/header/nav/nav-selector/__tests__/index.spec.tsx
@@ -1,7 +1,7 @@
 import type { INavSelectorProps, NavItem } from '../index'
 import type { AppContextValue } from '@/context/app-context'
 import { act, fireEvent, render, screen } from '@testing-library/react'
-import * as React from 'react'
+import userEvent from '@testing-library/user-event'
 import { vi } from 'vitest'
 import { useStore as useAppStore } from '@/app/components/app/store'
 import { useAppContext } from '@/context/app-context'
@@ -9,59 +9,6 @@ import { useRouter } from '@/next/navigation'
 import { AppModeEnum } from '@/types/app'
 import NavSelector from '../index'
 
-vi.mock('@headlessui/react', () => {
-  type MenuContextValue = { open: boolean, setOpen: (open: boolean) => void }
-  const MenuContext = React.createContext<MenuContextValue | null>(null)
-
-  const Menu = ({ children }: { children: React.ReactNode | ((props: { open: boolean }) => React.ReactNode) }) => {
-    const [open, setOpen] = React.useState(false)
-    const value = React.useMemo(() => ({ open, setOpen }), [open])
-    return (
-      <MenuContext.Provider value={value}>
-        {typeof children === 'function' ? children({ open }) : children}
-      </MenuContext.Provider>
-    )
-  }
-
-  const MenuButton = ({ onClick, children, ...props }: { onClick?: () => void, children?: React.ReactNode }) => {
-    const context = React.useContext(MenuContext)
-    const handleClick = () => {
-      context?.setOpen(!context.open)
-      onClick?.()
-    }
-    return (
-      <button type="button" aria-expanded={context?.open ?? false} onClick={handleClick} {...props}>
-        {children}
-      </button>
-    )
-  }
-
-  const MenuItems = ({ as: Component = 'div', role, children, ...props }: { as?: React.ElementType, role?: string, children: React.ReactNode }) => {
-    const context = React.useContext(MenuContext)
-    if (!context?.open)
-      return null
-    return (
-      <Component role={role ?? 'menu'} {...props}>
-        {children}
-      </Component>
-    )
-  }
-
-  const MenuItem = ({ as: Component = 'div', role, children, ...props }: { as?: React.ElementType, role?: string, children: React.ReactNode }) => (
-    <Component role={role ?? 'menuitem'} {...props}>
-      {children}
-    </Component>
-  )
-
-  return {
-    Menu,
-    MenuButton,
-    MenuItems,
-    MenuItem,
-    Transition: ({ show = true, children }: { show?: boolean, children: React.ReactNode }) => (show ? <>{children}</> : null),
-  }
-})
-
 // Mock next/navigation
 vi.mock('@/next/navigation', () => ({
   useRouter: vi.fn(),
@@ -198,6 +145,7 @@ describe('NavSelector Component', () => {
     })
 
     it('should show extended create menu in app mode', async () => {
+      const user = userEvent.setup()
       render(<NavSelector {...defaultProps} isApp />)
       const button = screen.getByRole('button')
       await act(async () => {
@@ -205,10 +153,10 @@ describe('NavSelector Component', () => {
       })
 
       const openCreateMenu = async () => {
-        const createBtn = screen.getByText('Create New')
-        await act(async () => {
-          fireEvent.click(createBtn)
-        })
+        if (!screen.queryByRole('menuitem', { name: /Create New/i }))
+          await user.click(screen.getByRole('button', { name: /Item 1/i }))
+        const createBtn = await screen.findByRole('menuitem', { name: /Create New/i })
+        await user.hover(createBtn)
         return screen.findByText(/app\.newApp\.startFromBlank/i)
       }
 
@@ -235,16 +183,15 @@ describe('NavSelector Component', () => {
     })
 
     it('should open extended create menu on hover in app mode', async () => {
+      const user = userEvent.setup()
       render(<NavSelector {...defaultProps} isApp />)
       const button = screen.getByRole('button')
       await act(async () => {
         fireEvent.click(button)
       })
 
-      const createBtn = screen.getByText('Create New')
-      await act(async () => {
-        fireEvent.mouseEnter(createBtn)
-      })
+      const createBtn = await screen.findByRole('menuitem', { name: /Create New/i })
+      await user.hover(createBtn)
 
       expect(await screen.findByText(/app\.newApp\.startFromBlank/i))!.toBeInTheDocument()
     })
diff --git a/web/app/components/header/nav/nav-selector/index.tsx b/web/app/components/header/nav/nav-selector/index.tsx
index a46c200e3d..5a8c1ae9e3 100644
--- a/web/app/components/header/nav/nav-selector/index.tsx
+++ b/web/app/components/header/nav/nav-selector/index.tsx
@@ -1,14 +1,21 @@
 'use client'
 import type { AppIconType, AppModeEnum } from '@/types/app'
-import { Menu, MenuButton, MenuItem, MenuItems } from '@headlessui/react'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuSub,
+  DropdownMenuSubContent,
+  DropdownMenuSubTrigger,
+  DropdownMenuTrigger,
+} from '@langgenius/dify-ui/dropdown-menu'
 import {
   RiAddLine,
   RiArrowDownSLine,
-  RiArrowRightSLine,
 } from '@remixicon/react'
 import { debounce } from 'es-toolkit/compat'
-import { useCallback, useState } from 'react'
+import { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useStore as useAppStore } from '@/app/components/app/store'
 import { AppTypeIcon } from '@/app/components/app/type-selector'
@@ -53,57 +60,54 @@ const AppCreateMenu = ({
   importDSLText,
   onCreate,
 }: AppCreateMenuProps) => {
-  const [open, setOpen] = useState(false)
-
   const handleCreate = (state: string) => {
-    setOpen(false)
     onCreate(state)
   }
 
   return (
-    <div className="relative h-full w-full" onMouseLeave={() => setOpen(false)}>
-      <button
-        type="button"
-        className="w-full p-1 text-left"
-        onClick={() => setOpen(value => !value)}
-        onMouseEnter={() => setOpen(true)}
-      >
-        <div className={cn(
-          'flex cursor-pointer items-center gap-2 rounded-lg px-3 py-[6px] hover:bg-state-base-hover',
-          open && 'bg-state-base-hover!',
-        )}
+    <DropdownMenuSub>
+      <div className="p-1">
+        <DropdownMenuSubTrigger
+          className="h-9 gap-2 px-3 py-[6px]"
         >
           <div className="flex h-6 w-6 shrink-0 items-center justify-center rounded-md border-[0.5px] border-divider-regular bg-background-default">
-            <RiAddLine className="h-4 w-4 text-text-primary" />
+            <span className="i-ri-add-line h-4 w-4 text-text-primary" />
           </div>
-          <div className="grow text-left text-[14px] font-normal text-text-secondary">{createText}</div>
-          <RiArrowRightSLine className="h-3.5 w-3.5 shrink-0 text-text-primary" />
+          <span className="grow text-left text-[14px] font-normal text-text-secondary">{createText}</span>
+        </DropdownMenuSubTrigger>
+      </div>
+      <DropdownMenuSubContent
+        placement="right-start"
+        sideOffset={4}
+        popupClassName="min-w-[200px] bg-components-panel-bg-blur p-0"
+      >
+        <div className="p-1">
+          <DropdownMenuItem
+            className="h-9 px-3 py-[6px] font-normal text-text-secondary"
+            onClick={() => handleCreate('blank')}
+          >
+            <FilePlus01 className="mr-2 h-4 w-4 shrink-0 text-text-secondary" />
+            {startFromBlankText}
+          </DropdownMenuItem>
+          <DropdownMenuItem
+            className="h-9 px-3 py-[6px] font-normal text-text-secondary"
+            onClick={() => handleCreate('template')}
+          >
+            <FilePlus02 className="mr-2 h-4 w-4 shrink-0 text-text-secondary" />
+            {startFromTemplateText}
+          </DropdownMenuItem>
         </div>
-      </button>
-      {open && (
-        <div
-          className="absolute top-[3px] right-[-198px] z-10 min-w-[200px] rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg"
-          onMouseEnter={() => setOpen(true)}
-        >
-          <div className="p-1">
-            <button type="button" className={cn('flex w-full cursor-pointer items-center rounded-lg px-3 py-[6px] text-left font-normal text-text-secondary hover:bg-state-base-hover')} onClick={() => handleCreate('blank')}>
-              <FilePlus01 className="mr-2 h-4 w-4 shrink-0 text-text-secondary" />
-              {startFromBlankText}
-            </button>
-            <button type="button" className={cn('flex w-full cursor-pointer items-center rounded-lg px-3 py-[6px] text-left font-normal text-text-secondary hover:bg-state-base-hover')} onClick={() => handleCreate('template')}>
-              <FilePlus02 className="mr-2 h-4 w-4 shrink-0 text-text-secondary" />
-              {startFromTemplateText}
-            </button>
-          </div>
-          <div className="border-t border-divider-regular p-1">
-            <button type="button" className={cn('flex w-full cursor-pointer items-center rounded-lg px-3 py-[6px] text-left font-normal text-text-secondary hover:bg-state-base-hover')} onClick={() => handleCreate('dsl')}>
-              <FileArrow01 className="mr-2 h-4 w-4 shrink-0 text-text-secondary" />
-              {importDSLText}
-            </button>
-          </div>
+        <div className="border-t border-divider-regular p-1">
+          <DropdownMenuItem
+            className="h-9 px-3 py-[6px] font-normal text-text-secondary"
+            onClick={() => handleCreate('dsl')}
+          >
+            <FileArrow01 className="mr-2 h-4 w-4 shrink-0 text-text-secondary" />
+            {importDSLText}
+          </DropdownMenuItem>
         </div>
-      )}
-    </div>
+      </DropdownMenuSubContent>
+    </DropdownMenuSub>
   )
 }
 
@@ -123,94 +127,86 @@ const NavSelector = ({ curNav, navigationItems, createText, isApp, onCreate, onL
   }, 50), [])
 
   return (
-    <Menu as="div" className="relative">
-      {({ open }) => (
-        <>
-          <MenuButton className={cn(
-            'hover:hover:bg-components-main-nav-nav-button-bg-active-hover group inline-flex h-7 w-full items-center justify-center rounded-[10px] pr-2.5 pl-2 text-[14px] font-semibold text-components-main-nav-nav-button-text-active',
-            open && 'bg-components-main-nav-nav-button-bg-active',
-          )}
-          >
-            <div className="max-w-[157px] truncate" title={curNav?.name}>{curNav?.name}</div>
-            <RiArrowDownSLine
-              className={cn('ml-1 h-3 w-3 shrink-0 opacity-50 group-hover:opacity-100', open && 'opacity-100!')}
-              aria-hidden="true"
-            />
-          </MenuButton>
-          <MenuItems
-            className="
-              absolute right-0 -left-11 mt-1.5 w-60 max-w-80
-              origin-top-right divide-y divide-divider-regular rounded-lg bg-components-panel-bg-blur
-              shadow-lg outline-none
-            "
-          >
-            <div className="overflow-auto px-1 py-1" style={{ maxHeight: '50vh' }} onScroll={handleScroll}>
-              {
-                navigationItems.map(nav => (
-                  <MenuItem key={nav.id}>
-                    <div
-                      className="flex w-full cursor-pointer items-center truncate rounded-lg px-3 py-[6px] text-[14px] font-normal text-text-secondary hover:bg-state-base-hover"
-                      onClick={() => {
-                        if (curNav?.id === nav.id)
-                          return
-                        setAppDetail()
-                        router.push(nav.link)
-                      }}
-                      title={nav.name}
-                    >
-                      <div className="relative mr-2 h-6 w-6 rounded-md">
-                        <AppIcon
-                          size="tiny"
-                          iconType={nav.icon_type}
-                          icon={nav.icon}
-                          background={nav.icon_background}
-                          imageUrl={nav.icon_url}
-                        />
-                        {!!nav.mode && (
-                          <AppTypeIcon type={nav.mode} wrapperClassName="absolute -bottom-0.5 -right-0.5 h-3.5 w-3.5 shadow-sm" className="h-2.5 w-2.5" />
-                        )}
-                      </div>
-                      <div className="truncate">
-                        {nav.name}
-                      </div>
-                    </div>
-                  </MenuItem>
-                ))
-              }
-              {isLoadingMore && (
-                <div className="flex justify-center py-2">
-                  <Loading />
-                </div>
-              )}
-            </div>
-            {!isApp && isCurrentWorkspaceEditor && (
-              <MenuItem as="div" className="w-full p-1">
-                <div
-                  onClick={() => onCreate('')}
-                  className={cn(
-                    'flex cursor-pointer items-center gap-2 rounded-lg px-3 py-[6px] hover:bg-state-base-hover',
+    <DropdownMenu modal={false}>
+      <DropdownMenuTrigger
+        className={cn(
+          'hover:hover:bg-components-main-nav-nav-button-bg-active-hover group inline-flex h-7 items-center justify-center rounded-[10px] pr-2.5 pl-2 text-[14px] font-semibold text-components-main-nav-nav-button-text-active outline-hidden',
+          'focus-visible:bg-components-main-nav-nav-button-bg-active focus-visible:ring-1 focus-visible:ring-components-input-border-hover data-popup-open:bg-components-main-nav-nav-button-bg-active',
+        )}
+      >
+        <div className="max-w-[157px] truncate" title={curNav?.name}>{curNav?.name}</div>
+        <RiArrowDownSLine
+          className="ml-1 h-3 w-3 shrink-0 opacity-50 group-hover:opacity-100 group-data-popup-open:opacity-100"
+          aria-hidden="true"
+        />
+      </DropdownMenuTrigger>
+      <DropdownMenuContent
+        placement="bottom-end"
+        sideOffset={6}
+        popupClassName="w-60 max-w-80 divide-y divide-divider-regular bg-components-panel-bg-blur p-0"
+      >
+        <div className="max-h-[50vh] overflow-auto px-1 py-1" onScroll={handleScroll}>
+          {
+            navigationItems.map(nav => (
+              <DropdownMenuItem
+                key={nav.id}
+                className="h-auto truncate px-3 py-[6px] text-[14px] font-normal text-text-secondary"
+                onClick={() => {
+                  if (curNav?.id === nav.id)
+                    return
+                  setAppDetail()
+                  router.push(nav.link)
+                }}
+                title={nav.name}
+              >
+                <div className="relative mr-2 h-6 w-6 shrink-0 rounded-md">
+                  <AppIcon
+                    size="tiny"
+                    iconType={nav.icon_type}
+                    icon={nav.icon}
+                    background={nav.icon_background}
+                    imageUrl={nav.icon_url}
+                  />
+                  {!!nav.mode && (
+                    <AppTypeIcon type={nav.mode} wrapperClassName="absolute -bottom-0.5 -right-0.5 h-3.5 w-3.5 shadow-sm" className="h-2.5 w-2.5" />
                   )}
-                >
-                  <div className="flex h-6 w-6 shrink-0 items-center justify-center rounded-md border-[0.5px] border-divider-regular bg-background-default">
-                    <RiAddLine className="h-4 w-4 text-text-primary" />
-                  </div>
-                  <div className="grow text-left text-[14px] font-normal text-text-secondary">{createText}</div>
                 </div>
-              </MenuItem>
-            )}
-            {isApp && isCurrentWorkspaceEditor && (
-              <AppCreateMenu
-                createText={createText}
-                startFromBlankText={t('newApp.startFromBlank', { ns: 'app' })}
-                startFromTemplateText={t('newApp.startFromTemplate', { ns: 'app' })}
-                importDSLText={t('importDSL', { ns: 'app' })}
-                onCreate={onCreate}
-              />
-            )}
-          </MenuItems>
-        </>
-      )}
-    </Menu>
+                <div className="min-w-0 truncate">
+                  {nav.name}
+                </div>
+              </DropdownMenuItem>
+            ))
+          }
+          {isLoadingMore && (
+            <div className="flex justify-center py-2">
+              <Loading />
+            </div>
+          )}
+        </div>
+        {!isApp && isCurrentWorkspaceEditor && (
+          <div className="p-1">
+            <DropdownMenuItem
+              className="h-9 gap-2 px-3 py-[6px]"
+              onClick={() => onCreate('')}
+            >
+              <div className="flex h-6 w-6 shrink-0 items-center justify-center rounded-md border-[0.5px] border-divider-regular bg-background-default">
+                <RiAddLine className="h-4 w-4 text-text-primary" />
+              </div>
+              <div className="grow text-left text-[14px] font-normal text-text-secondary">{createText}</div>
+            </DropdownMenuItem>
+          </div>
+        )}
+        {isApp && isCurrentWorkspaceEditor && (
+          <AppCreateMenu
+            createText={createText}
+            startFromBlankText={t('newApp.startFromBlank', { ns: 'app' })}
+            startFromTemplateText={t('newApp.startFromTemplate', { ns: 'app' })}
+            importDSLText={t('importDSL', { ns: 'app' })}
+            onCreate={onCreate}
+          />
+        )}
+      </DropdownMenuContent>
+    </DropdownMenu>
   )
 }
 
diff --git a/web/app/components/header/plan-badge/__tests__/index.spec.tsx b/web/app/components/header/plan-badge/__tests__/index.spec.tsx
index 3abb791340..4e562ecf99 100644
--- a/web/app/components/header/plan-badge/__tests__/index.spec.tsx
+++ b/web/app/components/header/plan-badge/__tests__/index.spec.tsx
@@ -4,7 +4,7 @@ import { vi } from 'vitest'
 import { createMockProviderContextValue } from '@/__mocks__/provider-context'
 import { useProviderContext } from '@/context/provider-context'
 import { Plan } from '../../../billing/type'
-import PlanBadge from '../index'
+import { PlanBadge } from '../index'
 
 vi.mock('@/context/provider-context', () => ({
   useProviderContext: vi.fn(),
@@ -34,6 +34,20 @@ describe('PlanBadge', () => {
     expect(
       screen.getByText('billing.upgradeBtn.encourageShort'),
     ).toBeInTheDocument()
+    expect(screen.queryByRole('button')).not.toBeInTheDocument()
+  })
+
+  it('should render upgrade action as a button when onClick is provided', () => {
+    const handleClick = vi.fn()
+    mockUseProviderContext.mockReturnValue(
+      createMockProviderContextValue({ isFetchedPlan: true }),
+    )
+
+    render(<PlanBadge plan={Plan.sandbox} sandboxAsUpgrade={true} onClick={handleClick} />)
+
+    const button = screen.getByRole('button', { name: 'billing.upgradeBtn.encourageShort' })
+    fireEvent.click(button)
+    expect(handleClick).toHaveBeenCalledTimes(1)
   })
 
   it('should render sandbox badge when plan is sandbox and sandboxAsUpgrade is false', () => {
@@ -42,6 +56,7 @@ describe('PlanBadge', () => {
     )
     render(<PlanBadge plan={Plan.sandbox} sandboxAsUpgrade={false} />)
     expect(screen.getByText(Plan.sandbox)).toBeInTheDocument()
+    expect(screen.queryByRole('button')).not.toBeInTheDocument()
   })
 
   it('should render professional badge when plan is professional', () => {
@@ -87,7 +102,7 @@ describe('PlanBadge', () => {
       createMockProviderContextValue({ isFetchedPlan: true }),
     )
     render(<PlanBadge plan={Plan.team} onClick={handleClick} />)
-    fireEvent.click(screen.getByText(Plan.team))
+    fireEvent.click(screen.getByRole('button', { name: Plan.team }))
     expect(handleClick).toHaveBeenCalledTimes(1)
   })
 
diff --git a/web/app/components/header/plan-badge/index.tsx b/web/app/components/header/plan-badge/index.tsx
index 9547ddf6f7..c889e9d5ae 100644
--- a/web/app/components/header/plan-badge/index.tsx
+++ b/web/app/components/header/plan-badge/index.tsx
@@ -1,11 +1,11 @@
-import type { FC } from 'react'
+import type { ReactNode } from 'react'
 import {
   RiGraduationCapFill,
 } from '@remixicon/react'
 import { useTranslation } from 'react-i18next'
 import { useProviderContext } from '@/context/provider-context'
 import { SparklesSoft } from '../../base/icons/src/public/common'
-import PremiumBadge from '../../base/premium-badge'
+import PremiumBadge, { PremiumBadgeButton } from '../../base/premium-badge'
 import { Plan } from '../../billing/type'
 
 type PlanBadgeProps = {
@@ -15,7 +15,33 @@ type PlanBadgeProps = {
   onClick?: () => void
 }
 
-const PlanBadge: FC<PlanBadgeProps> = ({ plan, allowHover, sandboxAsUpgrade = false, onClick }) => {
+function PlanBadgeShell({
+  size,
+  color,
+  allowHover,
+  onClick,
+  children,
+}: Pick<PlanBadgeProps, 'allowHover' | 'onClick'> & {
+  size?: 's' | 'm'
+  color: 'blue' | 'indigo' | 'gray'
+  children: ReactNode
+}) {
+  if (onClick) {
+    return (
+      <PremiumBadgeButton className="select-none" size={size} color={color} allowHover={allowHover} onClick={onClick}>
+        {children}
+      </PremiumBadgeButton>
+    )
+  }
+
+  return (
+    <PremiumBadge className="select-none" size={size} color={color}>
+      {children}
+    </PremiumBadge>
+  )
+}
+
+export function PlanBadge({ plan, allowHover, sandboxAsUpgrade = false, onClick }: PlanBadgeProps) {
   const { isFetchedPlan, isEducationWorkspace } = useProviderContext()
   const { t } = useTranslation()
 
@@ -23,51 +49,49 @@ const PlanBadge: FC<PlanBadgeProps> = ({ plan, allowHover, sandboxAsUpgrade = fa
     return null
   if (plan === Plan.sandbox && sandboxAsUpgrade) {
     return (
-      <PremiumBadge className="select-none" color="blue" allowHover={allowHover} onClick={onClick}>
-        <SparklesSoft className="flex h-3.5 w-3.5 items-center py-px pl-[3px] text-components-premium-badge-indigo-text-stop-0" />
+      <PlanBadgeShell color="blue" allowHover={allowHover} onClick={onClick}>
+        <SparklesSoft aria-hidden="true" className="flex h-3.5 w-3.5 items-center py-px pl-[3px] text-components-premium-badge-indigo-text-stop-0" />
         <div className="system-xs-medium">
           <span className="p-1 whitespace-nowrap">
             {t('upgradeBtn.encourageShort', { ns: 'billing' })}
           </span>
         </div>
-      </PremiumBadge>
+      </PlanBadgeShell>
     )
   }
   if (plan === Plan.sandbox) {
     return (
-      <PremiumBadge className="select-none" size="s" color="gray" allowHover={allowHover} onClick={onClick}>
+      <PlanBadgeShell size="s" color="gray" allowHover={allowHover} onClick={onClick}>
         <div className="system-2xs-medium-uppercase">
           <span className="p-1">
             {plan}
           </span>
         </div>
-      </PremiumBadge>
+      </PlanBadgeShell>
     )
   }
   if (plan === Plan.professional) {
     return (
-      <PremiumBadge className="select-none" size="s" color="blue" allowHover={allowHover} onClick={onClick}>
+      <PlanBadgeShell size="s" color="blue" allowHover={allowHover} onClick={onClick}>
         <div className="system-2xs-medium-uppercase">
           <span className="inline-flex items-center gap-1 p-1">
-            {isEducationWorkspace && <RiGraduationCapFill className="h-3 w-3" />}
+            {isEducationWorkspace && <RiGraduationCapFill aria-hidden="true" className="h-3 w-3" />}
             pro
           </span>
         </div>
-      </PremiumBadge>
+      </PlanBadgeShell>
     )
   }
   if (plan === Plan.team) {
     return (
-      <PremiumBadge className="select-none" size="s" color="indigo" allowHover={allowHover} onClick={onClick}>
+      <PlanBadgeShell size="s" color="indigo" allowHover={allowHover} onClick={onClick}>
         <div className="system-2xs-medium-uppercase">
           <span className="p-1">
             {plan}
           </span>
         </div>
-      </PremiumBadge>
+      </PlanBadgeShell>
     )
   }
   return null
 }
-
-export default PlanBadge
diff --git a/web/app/components/plugins/base/deprecation-notice.tsx b/web/app/components/plugins/base/deprecation-notice.tsx
index 3f7561fed0..8f16be8e8c 100644
--- a/web/app/components/plugins/base/deprecation-notice.tsx
+++ b/web/app/components/plugins/base/deprecation-notice.tsx
@@ -1,11 +1,11 @@
 import type { FC } from 'react'
-import { useTranslation } from '#i18n'
 import { cn } from '@langgenius/dify-ui/cn'
 import { RiAlertFill } from '@remixicon/react'
 import { camelCase } from 'es-toolkit/string'
 import * as React from 'react'
 import { useMemo } from 'react'
 import { Trans } from 'react-i18next'
+import { useTranslation } from '#i18n'
 import Link from '@/next/link'
 
 type DeprecationNoticeProps = {
diff --git a/web/app/components/plugins/card/index.tsx b/web/app/components/plugins/card/index.tsx
index dd7f92184d..087afe65c8 100644
--- a/web/app/components/plugins/card/index.tsx
+++ b/web/app/components/plugins/card/index.tsx
@@ -1,9 +1,9 @@
 'use client'
 import type { Plugin } from '../types'
-import { useTranslation } from '#i18n'
 import { cn } from '@langgenius/dify-ui/cn'
 import { RiAlertFill } from '@remixicon/react'
 import * as React from 'react'
+import { useTranslation } from '#i18n'
 import { useSelector } from '@/context/app-context'
 import { useGetLanguage } from '@/context/i18n'
 import useTheme from '@/hooks/use-theme'
diff --git a/web/app/components/plugins/install-plugin/base/__tests__/loading-error.spec.tsx b/web/app/components/plugins/install-plugin/base/__tests__/loading-error.spec.tsx
index cfb548c602..656f76191c 100644
--- a/web/app/components/plugins/install-plugin/base/__tests__/loading-error.spec.tsx
+++ b/web/app/components/plugins/install-plugin/base/__tests__/loading-error.spec.tsx
@@ -26,10 +26,10 @@ describe('LoadingError', () => {
     expect(screen.getByText('plugin.installModal.pluginLoadErrorDesc')).toBeInTheDocument()
   })
 
-  it('should render disabled checkbox', () => {
+  it('should render non-interactive checkbox skeleton', () => {
     render(<LoadingError />)
 
-    expect(screen.getByTestId('checkbox-undefined')).toBeInTheDocument()
+    expect(screen.queryByRole('checkbox')).not.toBeInTheDocument()
   })
 
   it('should render error icon with close indicator', () => {
diff --git a/web/app/components/plugins/install-plugin/base/__tests__/loading.spec.tsx b/web/app/components/plugins/install-plugin/base/__tests__/loading.spec.tsx
index aea928f099..e2cf115460 100644
--- a/web/app/components/plugins/install-plugin/base/__tests__/loading.spec.tsx
+++ b/web/app/components/plugins/install-plugin/base/__tests__/loading.spec.tsx
@@ -15,10 +15,10 @@ describe('Loading', () => {
     Loading = mod.default
   })
 
-  it('should render disabled unchecked checkbox', () => {
+  it('should render non-interactive checkbox skeleton', () => {
     render(<Loading />)
 
-    expect(screen.getByTestId('checkbox-undefined')).toBeInTheDocument()
+    expect(screen.queryByRole('checkbox')).not.toBeInTheDocument()
   })
 
   it('should render placeholder', () => {
diff --git a/web/app/components/plugins/install-plugin/base/loading-error.tsx b/web/app/components/plugins/install-plugin/base/loading-error.tsx
index 6750936773..62409ee49b 100644
--- a/web/app/components/plugins/install-plugin/base/loading-error.tsx
+++ b/web/app/components/plugins/install-plugin/base/loading-error.tsx
@@ -1,9 +1,9 @@
 'use client'
 import type { FC } from 'react'
+import { CheckboxSkeleton } from '@langgenius/dify-ui/checkbox'
 import { RiCloseLine } from '@remixicon/react'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
-import Checkbox from '@/app/components/base/checkbox'
 import { LoadingPlaceholder } from '@/app/components/plugins/card/base/placeholder'
 import { Group } from '../../../base/icons/src/vender/other'
 
@@ -11,10 +11,8 @@ const LoadingError: FC = () => {
   const { t } = useTranslation()
   return (
     <div className="flex items-center space-x-2">
-      <Checkbox
+      <CheckboxSkeleton
         className="shrink-0"
-        checked={false}
-        disabled
       />
       <div className="hover-bg-components-panel-on-panel-item-bg relative grow rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-on-panel-item-bg p-4 pb-3 shadow-xs">
         <div className="flex">
diff --git a/web/app/components/plugins/install-plugin/base/loading.tsx b/web/app/components/plugins/install-plugin/base/loading.tsx
index 7416311dc8..4cb90ad994 100644
--- a/web/app/components/plugins/install-plugin/base/loading.tsx
+++ b/web/app/components/plugins/install-plugin/base/loading.tsx
@@ -1,15 +1,13 @@
 'use client'
+import { CheckboxSkeleton } from '@langgenius/dify-ui/checkbox'
 import * as React from 'react'
-import Checkbox from '@/app/components/base/checkbox'
 import Placeholder from '../../card/base/placeholder'
 
 const Loading = () => {
   return (
     <div className="flex items-center space-x-2">
-      <Checkbox
+      <CheckboxSkeleton
         className="shrink-0"
-        checked={false}
-        disabled
       />
       <div className="hover-bg-components-panel-on-panel-item-bg relative grow rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-on-panel-item-bg p-4 pb-3 shadow-xs">
         <Placeholder
diff --git a/web/app/components/plugins/install-plugin/install-bundle/__tests__/index.spec.tsx b/web/app/components/plugins/install-plugin/install-bundle/__tests__/index.spec.tsx
index dd3d63aa32..2e03205353 100644
--- a/web/app/components/plugins/install-plugin/install-bundle/__tests__/index.spec.tsx
+++ b/web/app/components/plugins/install-plugin/install-bundle/__tests__/index.spec.tsx
@@ -261,6 +261,12 @@ describe('InstallBundle', () => {
       expect(screen.getByText('plugin.installModal.installPlugin')).toBeInTheDocument()
     })
 
+    it('should constrain modal height to the viewport', () => {
+      render(<InstallBundle {...defaultProps} />)
+
+      expect(screen.getByText('plugin.installModal.installPlugin').parentElement?.parentElement).toHaveClass('max-h-[calc(100dvh-48px)]')
+    })
+
     it('should render ReadyToInstall component', () => {
       render(<InstallBundle {...defaultProps} />)
 
@@ -1047,8 +1053,7 @@ describe('LoadedItem', () => {
     vi.clearAllMocks()
   })
 
-  // Helper to find checkbox element
-  const getCheckbox = () => screen.getByTestId(/^checkbox/)
+  const getCheckbox = () => screen.getByRole('checkbox', { name: defaultLoadedItemProps.payload.name })
 
   // ================================
   // Rendering Tests
@@ -1064,16 +1069,14 @@ describe('LoadedItem', () => {
       render(<LoadedItem {...defaultLoadedItemProps} checked={true} />)
 
       expect(getCheckbox()).toBeInTheDocument()
-      // Check icon should be present when checked
-      expect(screen.getByTestId(/^check-icon/)).toBeInTheDocument()
+      expect(getCheckbox()).toHaveAttribute('aria-checked', 'true')
     })
 
     it('should render checkbox without check icon when checked prop is false', () => {
       render(<LoadedItem {...defaultLoadedItemProps} checked={false} />)
 
       expect(getCheckbox()).toBeInTheDocument()
-      // Check icon should not be present when unchecked
-      expect(screen.queryByTestId(/^check-icon/)).not.toBeInTheDocument()
+      expect(getCheckbox()).toHaveAttribute('aria-checked', 'false')
     })
   })
 
@@ -1136,8 +1139,7 @@ describe('MarketplaceItem', () => {
     vi.clearAllMocks()
   })
 
-  // Helper to find checkbox element
-  const getCheckbox = () => screen.getByTestId(/^checkbox/)
+  const getCheckbox = () => screen.getByRole('checkbox', { name: defaultMarketplaceItemProps.payload.name })
 
   // ================================
   // Rendering Tests
@@ -1152,9 +1154,7 @@ describe('MarketplaceItem', () => {
     it('should render Loading when payload is undefined', () => {
       render(<MarketplaceItem {...defaultMarketplaceItemProps} payload={undefined} />)
 
-      // Loading component renders a disabled checkbox
-      const checkbox = screen.getByTestId(/^checkbox/)
-      expect(checkbox).toHaveClass('cursor-not-allowed')
+      expect(screen.queryByRole('checkbox')).not.toBeInTheDocument()
     })
   })
 
@@ -1171,8 +1171,7 @@ describe('MarketplaceItem', () => {
     it('should pass checked state to LoadedItem', () => {
       render(<MarketplaceItem {...defaultMarketplaceItemProps} checked={true} />)
 
-      // When checked, the check icon should be present
-      expect(screen.getByTestId(/^check-icon/)).toBeInTheDocument()
+      expect(getCheckbox()).toHaveAttribute('aria-checked', 'true')
     })
   })
 
@@ -1216,8 +1215,7 @@ describe('PackageItem', () => {
     vi.clearAllMocks()
   })
 
-  // Helper to find checkbox element
-  const getCheckbox = () => screen.getByTestId(/^checkbox/)
+  const getCheckbox = () => screen.getByRole('checkbox', { name: 'Package Plugin' })
 
   // ================================
   // Rendering Tests
@@ -1237,9 +1235,7 @@ describe('PackageItem', () => {
 
       render(<PackageItem {...defaultPackageItemProps} payload={invalidPayload} />)
 
-      // LoadingError renders a disabled checkbox and error text
-      const checkbox = screen.getByTestId(/^checkbox/)
-      expect(checkbox).toHaveClass('cursor-not-allowed')
+      expect(screen.queryByRole('checkbox')).not.toBeInTheDocument()
       expect(screen.getByText('plugin.installModal.pluginLoadError')).toBeInTheDocument()
     })
   })
@@ -1257,8 +1253,7 @@ describe('PackageItem', () => {
     it('should pass checked state to LoadedItem', () => {
       render(<PackageItem {...defaultPackageItemProps} checked={true} />)
 
-      // When checked, the check icon should be present
-      expect(screen.getByTestId(/^check-icon/)).toBeInTheDocument()
+      expect(getCheckbox()).toHaveAttribute('aria-checked', 'true')
     })
   })
 
@@ -1313,9 +1308,7 @@ describe('GithubItem', () => {
       mockUseUploadGitHub.mockReturnValue({ data: null, error: null })
       render(<GithubItem {...defaultGithubItemProps} />)
 
-      // Loading component renders a disabled checkbox
-      const checkbox = screen.getByTestId(/^checkbox/)
-      expect(checkbox).toHaveClass('cursor-not-allowed')
+      expect(screen.queryByRole('checkbox')).not.toBeInTheDocument()
     })
 
     it('should render LoadedItem when data is fetched', async () => {
@@ -1346,9 +1339,8 @@ describe('GithubItem', () => {
 
       render(<GithubItem {...defaultGithubItemProps} />)
 
-      // When data is loaded, LoadedItem should be rendered with checkbox
       await waitFor(() => {
-        expect(screen.getByTestId(/^checkbox/)).toBeInTheDocument()
+        expect(screen.getByRole('checkbox', { name: 'Test Plugin' })).toBeInTheDocument()
       })
     })
   })
diff --git a/web/app/components/plugins/install-plugin/install-bundle/index.tsx b/web/app/components/plugins/install-plugin/install-bundle/index.tsx
index 6d2b476c51..7f07ee2150 100644
--- a/web/app/components/plugins/install-plugin/install-bundle/index.tsx
+++ b/web/app/components/plugins/install-plugin/install-bundle/index.tsx
@@ -2,10 +2,10 @@
 import type { FC } from 'react'
 import type { Dependency } from '../../types'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogCloseButton, DialogContent } from '@langgenius/dify-ui/dialog'
 import * as React from 'react'
 import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import Modal from '@/app/components/base/modal'
 import { InstallStep } from '../../types'
 import useHideLogic from '../hooks/use-hide-logic'
 import ReadyToInstall from './ready-to-install'
@@ -50,26 +50,31 @@ const InstallBundle: FC<Props> = ({
   }, [step, t])
 
   return (
-    <Modal
-      isShow={true}
-      onClose={foldAnimInto}
-      className={cn(modalClassName, 'shadows-shadow-xl flex min-w-[560px] flex-col items-start rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg p-0')}
-      closable
+    <Dialog
+      open
+      onOpenChange={(open) => {
+        if (!open)
+          foldAnimInto()
+      }}
     >
-      <div className="flex items-start gap-2 self-stretch pt-6 pr-14 pb-3 pl-6">
-        <div className="self-stretch title-2xl-semi-bold text-text-primary">
-          {getTitle()}
+      <DialogContent className={cn('w-full max-w-[480px] overflow-hidden! text-left align-middle', cn(modalClassName, 'shadows-shadow-xl flex max-h-[calc(100dvh-48px)] min-w-[560px] flex-col items-start rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg p-0'))}>
+        <DialogCloseButton />
+
+        <div className="flex items-start gap-2 self-stretch pt-6 pr-14 pb-3 pl-6">
+          <div className="self-stretch title-2xl-semi-bold text-text-primary">
+            {getTitle()}
+          </div>
         </div>
-      </div>
-      <ReadyToInstall
-        step={step}
-        onStepChange={setStep}
-        onStartToInstall={handleStartToInstall}
-        setIsInstalling={setIsInstalling}
-        allPlugins={fromDSLPayload}
-        onClose={onClose}
-      />
-    </Modal>
+        <ReadyToInstall
+          step={step}
+          onStepChange={setStep}
+          onStartToInstall={handleStartToInstall}
+          setIsInstalling={setIsInstalling}
+          allPlugins={fromDSLPayload}
+          onClose={onClose}
+        />
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/components/plugins/install-plugin/install-bundle/item/__tests__/loaded-item.spec.tsx b/web/app/components/plugins/install-plugin/install-bundle/item/__tests__/loaded-item.spec.tsx
index d19331a4e4..89dc295caf 100644
--- a/web/app/components/plugins/install-plugin/install-bundle/item/__tests__/loaded-item.spec.tsx
+++ b/web/app/components/plugins/install-plugin/install-bundle/item/__tests__/loaded-item.spec.tsx
@@ -4,7 +4,6 @@ import { fireEvent, render, screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import LoadedItem from '../loaded-item'
 
-const mockCheckbox = vi.fn()
 const mockCard = vi.fn()
 const mockVersion = vi.fn()
 const mockUsePluginInstallLimit = vi.fn()
@@ -14,21 +13,6 @@ vi.mock('@/config', () => ({
   MARKETPLACE_API_PREFIX: 'https://marketplace.example.com',
 }))
 
-vi.mock('@/app/components/base/checkbox', () => ({
-  default: (props: { checked: boolean, disabled: boolean, onCheck: () => void }) => {
-    mockCheckbox(props)
-    return (
-      <button
-        data-testid="checkbox"
-        disabled={props.disabled}
-        onClick={props.onCheck}
-      >
-        {String(props.checked)}
-      </button>
-    )
-  },
-}))
-
 vi.mock('../../../../card', () => ({
   default: (props: { titleLeft?: React.ReactNode }) => {
     mockCard(props)
@@ -117,7 +101,7 @@ describe('LoadedItem', () => {
       />,
     )
 
-    expect(screen.getByTestId('checkbox')).toBeDisabled()
+    expect(screen.getByRole('checkbox', { name: 'Loaded Plugin' })).toHaveAttribute('aria-disabled', 'true')
     expect(mockCard).toHaveBeenCalledWith(expect.objectContaining({
       limitedInstall: true,
       payload: expect.objectContaining({
@@ -138,7 +122,7 @@ describe('LoadedItem', () => {
       />,
     )
 
-    fireEvent.click(screen.getByTestId('checkbox'))
+    fireEvent.click(screen.getByRole('checkbox', { name: 'Loaded Plugin' }))
 
     expect(onCheckedChange).toHaveBeenCalledWith(payload)
   })
diff --git a/web/app/components/plugins/install-plugin/install-bundle/item/loaded-item.tsx b/web/app/components/plugins/install-plugin/install-bundle/item/loaded-item.tsx
index 29f4a44ddb..9f1db59ba1 100644
--- a/web/app/components/plugins/install-plugin/install-bundle/item/loaded-item.tsx
+++ b/web/app/components/plugins/install-plugin/install-bundle/item/loaded-item.tsx
@@ -1,8 +1,8 @@
 'use client'
 import type { FC } from 'react'
 import type { Plugin, VersionProps } from '../../../types'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import * as React from 'react'
-import Checkbox from '@/app/components/base/checkbox'
 import { MARKETPLACE_API_PREFIX } from '@/config'
 import Card from '../../../card'
 import useGetIcon from '../../base/use-get-icon'
@@ -36,7 +36,8 @@ const LoadedItem: FC<Props> = ({
         disabled={!canInstall}
         className="shrink-0"
         checked={checked}
-        onCheck={() => onCheckedChange(payload)}
+        aria-label={payload.name}
+        onCheckedChange={() => onCheckedChange(payload)}
       />
       <Card
         className="grow"
diff --git a/web/app/components/plugins/install-plugin/install-bundle/steps/__tests__/install.spec.tsx b/web/app/components/plugins/install-plugin/install-bundle/steps/__tests__/install.spec.tsx
index 3e848b35f4..f9d55571a7 100644
--- a/web/app/components/plugins/install-plugin/install-bundle/steps/__tests__/install.spec.tsx
+++ b/web/app/components/plugins/install-plugin/install-bundle/steps/__tests__/install.spec.tsx
@@ -265,6 +265,18 @@ describe('Install Component', () => {
       expect(screen.getByTestId('all-plugins-count')).toHaveTextContent('2')
     })
 
+    it('should make the plugin list scrollable inside the modal body', () => {
+      render(<Install {...defaultProps} />)
+
+      expect(screen.getByTestId('install-multi').parentElement).toHaveClass('overflow-y-auto')
+    })
+
+    it('should constrain the install step so the plugin list can scroll with many items', () => {
+      const { container } = render(<Install {...defaultProps} />)
+
+      expect(container.firstElementChild).toHaveClass('min-h-0', 'flex-1', 'overflow-hidden')
+    })
+
     it('should show singular text when one plugin is selected', async () => {
       render(<Install {...defaultProps} />)
 
diff --git a/web/app/components/plugins/install-plugin/install-bundle/steps/install.tsx b/web/app/components/plugins/install-plugin/install-bundle/steps/install.tsx
index a94cd8588d..2751108eea 100644
--- a/web/app/components/plugins/install-plugin/install-bundle/steps/install.tsx
+++ b/web/app/components/plugins/install-plugin/install-bundle/steps/install.tsx
@@ -3,11 +3,11 @@ import type { FC } from 'react'
 import type { Dependency, InstallStatus, InstallStatusResponse, Plugin, VersionInfo } from '../../../types'
 import type { ExposeRefs } from './install-multi'
 import { Button } from '@langgenius/dify-ui/button'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import { RiLoader2Line } from '@remixicon/react'
 import * as React from 'react'
 import { useCallback, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import Checkbox from '@/app/components/base/checkbox'
 import { useCanInstallPluginFromMarketplace } from '@/app/components/plugins/plugin-page/use-reference-setting'
 import { useMittContextSelector } from '@/context/mitt-context'
 import { useInstallOrUpdate, usePluginTaskList } from '@/service/use-plugins'
@@ -170,12 +170,12 @@ const Install: FC<Props> = ({
 
   const { canInstallPluginFromMarketplace } = useCanInstallPluginFromMarketplace()
   return (
-    <>
-      <div className="flex flex-col items-start justify-center gap-4 self-stretch px-6 py-3">
+    <div className="flex min-h-0 flex-1 flex-col self-stretch overflow-hidden">
+      <div className="flex min-h-0 flex-1 flex-col items-start justify-center gap-4 self-stretch overflow-hidden px-6 py-3">
         <div className="system-md-regular text-text-secondary">
           <p>{t(`${i18nPrefix}.${selectedPluginsNum > 1 ? 'readyToInstallPackages' : 'readyToInstallPackage'}`, { ns: 'plugin', num: selectedPluginsNum })}</p>
         </div>
-        <div className="w-full space-y-1 rounded-2xl bg-background-section-burn p-2">
+        <div className="flex min-h-0 w-full flex-1 flex-col gap-1 overflow-y-auto rounded-2xl bg-background-section-burn p-2">
           <InstallMulti
             ref={installMultiRef}
             allPlugins={allPlugins}
@@ -193,10 +193,10 @@ const Install: FC<Props> = ({
         <div className="flex items-center justify-between gap-2 self-stretch p-6 pt-5">
           <div className="px-2">
             {canInstall && (
-              <div className="flex items-center gap-x-2" onClick={handleClickSelectAll}>
-                <Checkbox checked={isSelectAll} indeterminate={isIndeterminate} />
-                <p className="cursor-pointer system-sm-medium text-text-secondary">{isSelectAll ? t('operation.deSelectAll', { ns: 'common' }) : t('operation.selectAll', { ns: 'common' })}</p>
-              </div>
+              <label className="flex cursor-pointer items-center gap-x-2">
+                <Checkbox checked={isSelectAll} indeterminate={isIndeterminate} onCheckedChange={() => handleClickSelectAll()} />
+                <span className="system-sm-medium text-text-secondary">{isSelectAll ? t('operation.deSelectAll', { ns: 'common' }) : t('operation.selectAll', { ns: 'common' })}</span>
+              </label>
             )}
           </div>
           <div className="flex items-center justify-end gap-2 self-stretch">
@@ -218,7 +218,7 @@ const Install: FC<Props> = ({
         </div>
       )}
 
-    </>
+    </div>
   )
 }
 export default React.memo(Install)
diff --git a/web/app/components/plugins/install-plugin/install-from-github/__tests__/index.spec.tsx b/web/app/components/plugins/install-plugin/install-from-github/__tests__/index.spec.tsx
index e923de5e38..105e1212b0 100644
--- a/web/app/components/plugins/install-plugin/install-from-github/__tests__/index.spec.tsx
+++ b/web/app/components/plugins/install-plugin/install-from-github/__tests__/index.spec.tsx
@@ -101,25 +101,6 @@ vi.mock('../../hooks/use-hide-logic', () => ({
 }))
 
 // Mock child components
-vi.mock('../steps/setURL', () => ({
-  default: ({ repoUrl, onChange, onNext, onCancel }: {
-    repoUrl: string
-    onChange: (value: string) => void
-    onNext: () => void
-    onCancel: () => void
-  }) => (
-    <div data-testid="set-url-step">
-      <input
-        data-testid="repo-url-input"
-        value={repoUrl}
-        onChange={e => onChange(e.target.value)}
-      />
-      <button data-testid="next-btn" onClick={onNext}>Next</button>
-      <button data-testid="cancel-btn" onClick={onCancel}>Cancel</button>
-    </div>
-  ),
-}))
-
 vi.mock('../steps/selectPackage', () => ({
   default: ({
     repoUrl,
@@ -236,6 +217,10 @@ vi.mock('../../base/installed', () => ({
   ),
 }))
 
+const getRepoUrlInput = () => screen.getByLabelText('plugin.installFromGitHub.gitHubRepo')
+const getNextButton = () => screen.getByRole('button', { name: 'plugin.installModal.next' })
+const getCancelButton = () => screen.getByRole('button', { name: 'plugin.installModal.cancel' })
+
 describe('InstallFromGitHub', () => {
   const defaultProps = {
     onClose: vi.fn(),
@@ -261,8 +246,8 @@ describe('InstallFromGitHub', () => {
     it('should render modal with correct initial state for new installation', () => {
       render(<InstallFromGitHub {...defaultProps} />)
 
-      expect(screen.getByTestId('set-url-step')).toBeInTheDocument()
-      expect(screen.getByTestId('repo-url-input')).toHaveValue('')
+      expect(getRepoUrlInput()).toBeInTheDocument()
+      expect(getRepoUrlInput()).toHaveValue('')
     })
 
     it('should render modal with selectPackage step when updatePayload is provided', () => {
@@ -312,7 +297,7 @@ describe('InstallFromGitHub', () => {
     it('should update repoUrl when user types in input', () => {
       render(<InstallFromGitHub {...defaultProps} />)
 
-      const input = screen.getByTestId('repo-url-input')
+      const input = getRepoUrlInput()
       fireEvent.change(input, { target: { value: 'https://github.com/test/repo' } })
 
       expect(input).toHaveValue('https://github.com/test/repo')
@@ -321,10 +306,10 @@ describe('InstallFromGitHub', () => {
     it('should transition from setUrl to selectPackage on successful URL submit', async () => {
       render(<InstallFromGitHub {...defaultProps} />)
 
-      const input = screen.getByTestId('repo-url-input')
+      const input = getRepoUrlInput()
       fireEvent.change(input, { target: { value: 'https://github.com/owner/repo' } })
 
-      const nextBtn = screen.getByTestId('next-btn')
+      const nextBtn = getNextButton()
       fireEvent.click(nextBtn)
 
       await waitFor(() => {
@@ -443,10 +428,10 @@ describe('InstallFromGitHub', () => {
     it('should show error toast for invalid GitHub URL', async () => {
       render(<InstallFromGitHub {...defaultProps} />)
 
-      const input = screen.getByTestId('repo-url-input')
+      const input = getRepoUrlInput()
       fireEvent.change(input, { target: { value: 'invalid-url' } })
 
-      const nextBtn = screen.getByTestId('next-btn')
+      const nextBtn = getNextButton()
       fireEvent.click(nextBtn)
 
       await waitFor(() => {
@@ -462,10 +447,10 @@ describe('InstallFromGitHub', () => {
 
       render(<InstallFromGitHub {...defaultProps} />)
 
-      const input = screen.getByTestId('repo-url-input')
+      const input = getRepoUrlInput()
       fireEvent.change(input, { target: { value: 'https://github.com/owner/repo' } })
 
-      const nextBtn = screen.getByTestId('next-btn')
+      const nextBtn = getNextButton()
       fireEvent.click(nextBtn)
 
       await waitFor(() => {
@@ -481,10 +466,10 @@ describe('InstallFromGitHub', () => {
 
       render(<InstallFromGitHub {...defaultProps} />)
 
-      const input = screen.getByTestId('repo-url-input')
+      const input = getRepoUrlInput()
       fireEvent.change(input, { target: { value: 'https://github.com/owner/repo' } })
 
-      const nextBtn = screen.getByTestId('next-btn')
+      const nextBtn = getNextButton()
       fireEvent.click(nextBtn)
 
       await waitFor(() => {
@@ -504,9 +489,9 @@ describe('InstallFromGitHub', () => {
       render(<InstallFromGitHub {...defaultProps} />)
 
       // Navigate to selectPackage
-      const input = screen.getByTestId('repo-url-input')
+      const input = getRepoUrlInput()
       fireEvent.change(input, { target: { value: 'https://github.com/owner/repo' } })
-      fireEvent.click(screen.getByTestId('next-btn'))
+      fireEvent.click(getNextButton())
 
       await waitFor(() => {
         expect(screen.getByTestId('select-package-step')).toBeInTheDocument()
@@ -516,7 +501,7 @@ describe('InstallFromGitHub', () => {
       fireEvent.click(screen.getByTestId('back-btn'))
 
       await waitFor(() => {
-        expect(screen.getByTestId('set-url-step')).toBeInTheDocument()
+        expect(getRepoUrlInput()).toBeInTheDocument()
       })
     })
 
@@ -546,7 +531,7 @@ describe('InstallFromGitHub', () => {
     it('should call onClose when cancel button is clicked', () => {
       render(<InstallFromGitHub {...defaultProps} />)
 
-      fireEvent.click(screen.getByTestId('cancel-btn'))
+      fireEvent.click(getCancelButton())
 
       expect(defaultProps.onClose).toHaveBeenCalledTimes(1)
     })
@@ -783,10 +768,10 @@ describe('InstallFromGitHub', () => {
     it('should handle URL without trailing slash', async () => {
       render(<InstallFromGitHub {...defaultProps} />)
 
-      const input = screen.getByTestId('repo-url-input')
+      const input = getRepoUrlInput()
       fireEvent.change(input, { target: { value: 'https://github.com/owner/repo' } })
 
-      fireEvent.click(screen.getByTestId('next-btn'))
+      fireEvent.click(getNextButton())
 
       await waitFor(() => {
         expect(mockFetchReleases).toHaveBeenCalledWith('owner', 'repo')
@@ -797,11 +782,11 @@ describe('InstallFromGitHub', () => {
       render(<InstallFromGitHub {...defaultProps} />)
 
       // Set URL
-      const input = screen.getByTestId('repo-url-input')
+      const input = getRepoUrlInput()
       fireEvent.change(input, { target: { value: 'https://github.com/test/myrepo' } })
 
       // Navigate to selectPackage
-      fireEvent.click(screen.getByTestId('next-btn'))
+      fireEvent.click(getNextButton())
 
       await waitFor(() => {
         expect(screen.getByTestId('select-package-step')).toBeInTheDocument()
@@ -980,12 +965,12 @@ describe('InstallFromGitHub', () => {
       render(<InstallFromGitHub {...defaultProps} />)
 
       // Start from setUrl step
-      expect(screen.getByTestId('set-url-step')).toBeInTheDocument()
+      expect(getRepoUrlInput()).toBeInTheDocument()
 
       // Enter URL
-      const input = screen.getByTestId('repo-url-input')
+      const input = getRepoUrlInput()
       fireEvent.change(input, { target: { value: 'https://github.com/owner/repo' } })
-      fireEvent.click(screen.getByTestId('next-btn'))
+      fireEvent.click(getNextButton())
 
       await waitFor(() => {
         expect(screen.getByTestId('select-package-step')).toBeInTheDocument()
@@ -1086,7 +1071,7 @@ describe('InstallFromGitHub', () => {
       render(<InstallFromGitHub {...defaultProps} />)
 
       // Verify we're on setUrl step
-      expect(screen.getByTestId('set-url-step')).toBeInTheDocument()
+      expect(getRepoUrlInput()).toBeInTheDocument()
 
       // The setUrl step doesn't expose onBack in the real component,
       // but our mock doesn't have it either - this is correct behavior
@@ -1097,9 +1082,9 @@ describe('InstallFromGitHub', () => {
       render(<InstallFromGitHub {...defaultProps} />)
 
       // Navigate to selectPackage
-      const input = screen.getByTestId('repo-url-input')
+      const input = getRepoUrlInput()
       fireEvent.change(input, { target: { value: 'https://github.com/owner/repo' } })
-      fireEvent.click(screen.getByTestId('next-btn'))
+      fireEvent.click(getNextButton())
 
       await waitFor(() => {
         expect(screen.getByTestId('select-package-step')).toBeInTheDocument()
@@ -1123,11 +1108,11 @@ describe('InstallFromGitHub', () => {
       fireEvent.click(screen.getByTestId('back-btn'))
 
       await waitFor(() => {
-        expect(screen.getByTestId('set-url-step')).toBeInTheDocument()
+        expect(getRepoUrlInput()).toBeInTheDocument()
       })
 
       // Verify URL is preserved after back navigation
-      expect(screen.getByTestId('repo-url-input')).toHaveValue('https://github.com/owner/repo')
+      expect(getRepoUrlInput()).toHaveValue('https://github.com/owner/repo')
     })
   })
 })
@@ -1368,114 +1353,6 @@ describe('Install Plugin Utils', () => {
 // Steps Components Tests
 // ================================
 
-// SetURL Component Tests
-describe('SetURL Component', () => {
-  // Import the real component for testing
-  const SetURL = vi.fn()
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    // Re-mock the SetURL component with a more testable version
-    vi.doMock('./steps/setURL', () => ({
-      default: SetURL,
-    }))
-  })
-
-  describe('Rendering', () => {
-    it('should render label with correct text', () => {
-      render(<InstallFromGitHub onClose={vi.fn()} onSuccess={vi.fn()} />)
-
-      // The mocked component should be rendered
-      expect(screen.getByTestId('set-url-step')).toBeInTheDocument()
-    })
-
-    it('should render input field with placeholder', () => {
-      render(<InstallFromGitHub onClose={vi.fn()} onSuccess={vi.fn()} />)
-
-      const input = screen.getByTestId('repo-url-input')
-      expect(input).toBeInTheDocument()
-    })
-
-    it('should render cancel and next buttons', () => {
-      render(<InstallFromGitHub onClose={vi.fn()} onSuccess={vi.fn()} />)
-
-      expect(screen.getByTestId('cancel-btn')).toBeInTheDocument()
-      expect(screen.getByTestId('next-btn')).toBeInTheDocument()
-    })
-  })
-
-  describe('Props', () => {
-    it('should display repoUrl value in input', () => {
-      render(<InstallFromGitHub onClose={vi.fn()} onSuccess={vi.fn()} />)
-
-      const input = screen.getByTestId('repo-url-input')
-      fireEvent.change(input, { target: { value: 'https://github.com/test/repo' } })
-
-      expect(input).toHaveValue('https://github.com/test/repo')
-    })
-
-    it('should call onChange when input value changes', () => {
-      render(<InstallFromGitHub onClose={vi.fn()} onSuccess={vi.fn()} />)
-
-      const input = screen.getByTestId('repo-url-input')
-      fireEvent.change(input, { target: { value: 'new-value' } })
-
-      expect(input).toHaveValue('new-value')
-    })
-  })
-
-  describe('User Interactions', () => {
-    it('should call onNext when next button is clicked', async () => {
-      mockFetchReleases.mockResolvedValue(createMockReleases())
-
-      render(<InstallFromGitHub onClose={vi.fn()} onSuccess={vi.fn()} />)
-
-      const input = screen.getByTestId('repo-url-input')
-      fireEvent.change(input, { target: { value: 'https://github.com/owner/repo' } })
-
-      fireEvent.click(screen.getByTestId('next-btn'))
-
-      await waitFor(() => {
-        expect(mockFetchReleases).toHaveBeenCalled()
-      })
-    })
-
-    it('should call onCancel when cancel button is clicked', () => {
-      const onClose = vi.fn()
-      render(<InstallFromGitHub onClose={onClose} onSuccess={vi.fn()} />)
-
-      fireEvent.click(screen.getByTestId('cancel-btn'))
-
-      expect(onClose).toHaveBeenCalledTimes(1)
-    })
-  })
-
-  describe('Edge Cases', () => {
-    it('should handle empty URL input', () => {
-      render(<InstallFromGitHub onClose={vi.fn()} onSuccess={vi.fn()} />)
-
-      const input = screen.getByTestId('repo-url-input')
-      expect(input).toHaveValue('')
-    })
-
-    it('should handle URL with whitespace only', () => {
-      render(<InstallFromGitHub onClose={vi.fn()} onSuccess={vi.fn()} />)
-
-      const input = screen.getByTestId('repo-url-input')
-      fireEvent.change(input, { target: { value: '   ' } })
-
-      // With whitespace only, next should still be submittable but validation will fail
-      fireEvent.click(screen.getByTestId('next-btn'))
-
-      // Should show error for invalid URL
-      expect(mockNotify).toHaveBeenCalledWith({
-        type: 'error',
-        message: 'plugin.error.inValidGitHubUrl',
-      })
-    })
-  })
-})
-
 // SelectPackage Component Tests
 describe('SelectPackage Component', () => {
   beforeEach(() => {
@@ -1513,9 +1390,9 @@ describe('SelectPackage Component', () => {
       render(<InstallFromGitHub onClose={vi.fn()} onSuccess={vi.fn()} />)
 
       // Navigate to selectPackage step
-      const input = screen.getByTestId('repo-url-input')
+      const input = getRepoUrlInput()
       fireEvent.change(input, { target: { value: 'https://github.com/owner/repo' } })
-      fireEvent.click(screen.getByTestId('next-btn'))
+      fireEvent.click(getNextButton())
 
       await waitFor(() => {
         expect(screen.getByTestId('back-btn')).toBeInTheDocument()
@@ -1590,9 +1467,9 @@ describe('SelectPackage Component', () => {
       render(<InstallFromGitHub onClose={vi.fn()} onSuccess={vi.fn()} />)
 
       // Navigate to selectPackage
-      const input = screen.getByTestId('repo-url-input')
+      const input = getRepoUrlInput()
       fireEvent.change(input, { target: { value: 'https://github.com/owner/repo' } })
-      fireEvent.click(screen.getByTestId('next-btn'))
+      fireEvent.click(getNextButton())
 
       await waitFor(() => {
         expect(screen.getByTestId('select-package-step')).toBeInTheDocument()
@@ -1601,7 +1478,7 @@ describe('SelectPackage Component', () => {
       fireEvent.click(screen.getByTestId('back-btn'))
 
       await waitFor(() => {
-        expect(screen.getByTestId('set-url-step')).toBeInTheDocument()
+        expect(getRepoUrlInput()).toBeInTheDocument()
       })
     })
 
diff --git a/web/app/components/plugins/install-plugin/install-from-github/index.tsx b/web/app/components/plugins/install-plugin/install-from-github/index.tsx
index 4e2c97ab0b..71b0a431d3 100644
--- a/web/app/components/plugins/install-plugin/install-from-github/index.tsx
+++ b/web/app/components/plugins/install-plugin/install-from-github/index.tsx
@@ -2,12 +2,13 @@
 
 import type { PluginDeclaration, UpdateFromGitHubPayload } from '../../types'
 import type { InstallState } from '@/app/components/plugins/types'
+import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogCloseButton, DialogContent } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
 import * as React from 'react'
 import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import Modal from '@/app/components/base/modal'
 import useGetIcon from '@/app/components/plugins/install-plugin/base/use-get-icon'
 import { InstallStepFromGitHub } from '../../types'
 import Installed from '../base/installed'
@@ -17,7 +18,6 @@ import useRefreshPluginList from '../hooks/use-refresh-plugin-list'
 import { convertRepoToUrl, parseGitHubUrl } from '../utils'
 import Loaded from './steps/loaded'
 import SelectPackage from './steps/selectPackage'
-import SetURL from './steps/setURL'
 
 const i18nPrefix = 'installFromGitHub'
 
@@ -160,74 +160,109 @@ const InstallFromGitHub: React.FC<InstallFromGitHubProps> = ({ updatePayload, on
   }
 
   return (
-    <Modal
-      isShow={true}
-      onClose={foldAnimInto}
-      className={cn(modalClassName, `shadows-shadow-xl flex min-w-[560px] flex-col items-start rounded-2xl border-[0.5px]
-        border-components-panel-border bg-components-panel-bg p-0`)}
-      closable
+    <Dialog
+      open
+      onOpenChange={(open) => {
+        if (!open)
+          foldAnimInto()
+      }}
     >
-      <div className="flex items-start gap-2 self-stretch pt-6 pr-14 pb-3 pl-6">
-        <div className="flex grow flex-col items-start gap-1">
-          <div className="self-stretch title-2xl-semi-bold text-text-primary">
-            {getTitle()}
-          </div>
-          <div className="self-stretch system-xs-regular text-text-tertiary">
-            {!([InstallStepFromGitHub.uploadFailed, InstallStepFromGitHub.installed, InstallStepFromGitHub.installFailed].includes(state.step)) && t('installFromGitHub.installNote', { ns: 'plugin' })}
+      <DialogContent className={cn('w-[560px] max-w-none! overflow-hidden! text-left align-middle', cn(modalClassName, `shadows-shadow-xl flex max-h-[calc(100dvh-48px)] min-w-[560px] flex-col items-start rounded-2xl border-[0.5px]
+        border-components-panel-border bg-components-panel-bg p-0`))}
+      >
+        <DialogCloseButton />
+
+        <div className="flex shrink-0 items-start gap-2 self-stretch pt-6 pr-14 pb-3 pl-6">
+          <div className="flex grow flex-col items-start gap-1">
+            <div className="self-stretch title-2xl-semi-bold text-text-primary">
+              {getTitle()}
+            </div>
+            <div className="self-stretch system-xs-regular text-text-tertiary">
+              {!([InstallStepFromGitHub.uploadFailed, InstallStepFromGitHub.installed, InstallStepFromGitHub.installFailed].includes(state.step)) && t('installFromGitHub.installNote', { ns: 'plugin' })}
+            </div>
           </div>
         </div>
-      </div>
-      {([InstallStepFromGitHub.uploadFailed, InstallStepFromGitHub.installed, InstallStepFromGitHub.installFailed].includes(state.step))
-        ? (
-            <Installed
-              payload={manifest}
-              isFailed={[InstallStepFromGitHub.uploadFailed, InstallStepFromGitHub.installFailed].includes(state.step)}
-              errMsg={errorMsg}
-              onCancel={onClose}
-            />
-          )
-        : (
-            <div className={`flex flex-col items-start justify-center self-stretch px-6 py-3 ${state.step === InstallStepFromGitHub.installed ? 'gap-2' : 'gap-4'}`}>
-              {state.step === InstallStepFromGitHub.setUrl && (
-                <SetURL
-                  repoUrl={state.repoUrl}
-                  onChange={value => setState(prevState => ({ ...prevState, repoUrl: value }))}
-                  onNext={handleUrlSubmit}
-                  onCancel={onClose}
-                />
-              )}
-              {state.step === InstallStepFromGitHub.selectPackage && (
-                <SelectPackage
-                  updatePayload={updatePayload!}
-                  repoUrl={state.repoUrl}
-                  selectedVersion={state.selectedVersion}
-                  versions={versions}
-                  onSelectVersion={item => setState(prevState => ({ ...prevState, selectedVersion: String(item.value) }))}
-                  selectedPackage={state.selectedPackage}
-                  packages={packages}
-                  onSelectPackage={item => setState(prevState => ({ ...prevState, selectedPackage: String(item.value) }))}
-                  onUploaded={handleUploaded}
-                  onFailed={handleUploadFail}
-                  onBack={handleBack}
-                />
-              )}
-              {state.step === InstallStepFromGitHub.readyToInstall && (
-                <Loaded
-                  updatePayload={updatePayload!}
-                  uniqueIdentifier={uniqueIdentifier!}
-                  payload={manifest as any}
-                  repoUrl={state.repoUrl}
-                  selectedVersion={state.selectedVersion}
-                  selectedPackage={state.selectedPackage}
-                  onBack={handleBack}
-                  onStartToInstall={handleStartToInstall}
-                  onInstalled={handleInstalled}
-                  onFailed={handleFailed}
-                />
-              )}
-            </div>
-          )}
-    </Modal>
+        {([InstallStepFromGitHub.uploadFailed, InstallStepFromGitHub.installed, InstallStepFromGitHub.installFailed].includes(state.step))
+          ? (
+              <Installed
+                payload={manifest}
+                isFailed={[InstallStepFromGitHub.uploadFailed, InstallStepFromGitHub.installFailed].includes(state.step)}
+                errMsg={errorMsg}
+                onCancel={onClose}
+              />
+            )
+          : (
+              <div className={`flex min-h-0 flex-1 flex-col items-start justify-center self-stretch overflow-y-auto px-6 py-3 ${state.step === InstallStepFromGitHub.installed ? 'gap-2' : 'gap-4'}`}>
+                {state.step === InstallStepFromGitHub.setUrl && (
+                  <>
+                    <label
+                      htmlFor="repoUrl"
+                      className="flex flex-col items-start justify-center self-stretch text-text-secondary"
+                    >
+                      <span className="system-sm-semibold">{t('installFromGitHub.gitHubRepo', { ns: 'plugin' })}</span>
+                    </label>
+                    <input
+                      autoFocus
+                      type="url"
+                      id="repoUrl"
+                      name="repoUrl"
+                      value={state.repoUrl}
+                      onChange={e => setState(prevState => ({ ...prevState, repoUrl: e.target.value }))}
+                      className="flex grow items-center gap-0.5 self-stretch overflow-hidden rounded-lg border border-components-input-border-active bg-components-input-bg-active p-2 system-sm-regular text-ellipsis text-components-input-text-filled outline-hidden"
+                      placeholder="Please enter GitHub repo URL"
+                    />
+                    <div className="mt-4 flex items-center justify-end gap-2 self-stretch">
+                      <Button
+                        variant="secondary"
+                        className="min-w-18"
+                        onClick={onClose}
+                      >
+                        {t('installModal.cancel', { ns: 'plugin' })}
+                      </Button>
+                      <Button
+                        variant="primary"
+                        className="min-w-18"
+                        onClick={handleUrlSubmit}
+                        disabled={!state.repoUrl.trim()}
+                      >
+                        {t('installModal.next', { ns: 'plugin' })}
+                      </Button>
+                    </div>
+                  </>
+                )}
+                {state.step === InstallStepFromGitHub.selectPackage && (
+                  <SelectPackage
+                    updatePayload={updatePayload!}
+                    repoUrl={state.repoUrl}
+                    selectedVersion={state.selectedVersion}
+                    versions={versions}
+                    onSelectVersion={item => setState(prevState => ({ ...prevState, selectedVersion: String(item.value) }))}
+                    selectedPackage={state.selectedPackage}
+                    packages={packages}
+                    onSelectPackage={item => setState(prevState => ({ ...prevState, selectedPackage: String(item.value) }))}
+                    onUploaded={handleUploaded}
+                    onFailed={handleUploadFail}
+                    onBack={handleBack}
+                  />
+                )}
+                {state.step === InstallStepFromGitHub.readyToInstall && manifest && uniqueIdentifier && (
+                  <Loaded
+                    updatePayload={updatePayload!}
+                    uniqueIdentifier={uniqueIdentifier}
+                    payload={manifest}
+                    repoUrl={state.repoUrl}
+                    selectedVersion={state.selectedVersion}
+                    selectedPackage={state.selectedPackage}
+                    onBack={handleBack}
+                    onStartToInstall={handleStartToInstall}
+                    onInstalled={handleInstalled}
+                    onFailed={handleFailed}
+                  />
+                )}
+              </div>
+            )}
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/components/plugins/install-plugin/install-from-github/steps/__tests__/setURL.spec.tsx b/web/app/components/plugins/install-plugin/install-from-github/steps/__tests__/setURL.spec.tsx
deleted file mode 100644
index 327e0bddcf..0000000000
--- a/web/app/components/plugins/install-plugin/install-from-github/steps/__tests__/setURL.spec.tsx
+++ /dev/null
@@ -1,189 +0,0 @@
-import { fireEvent, render, screen, waitFor } from '@testing-library/react'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import SetURL from '../setURL'
-
-describe('SetURL', () => {
-  const defaultProps = {
-    repoUrl: '',
-    onChange: vi.fn(),
-    onNext: vi.fn(),
-    onCancel: vi.fn(),
-  }
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  // ================================
-  // Rendering Tests
-  // ================================
-  describe('Rendering', () => {
-    it('should render label with GitHub repo text', () => {
-      render(<SetURL {...defaultProps} />)
-
-      expect(screen.getByText('plugin.installFromGitHub.gitHubRepo')).toBeInTheDocument()
-    })
-
-    it('should render input field with correct attributes', () => {
-      render(<SetURL {...defaultProps} />)
-
-      const input = screen.getByRole('textbox')
-      expect(input).toBeInTheDocument()
-      expect(input).toHaveAttribute('type', 'url')
-      expect(input).toHaveAttribute('id', 'repoUrl')
-      expect(input).toHaveAttribute('name', 'repoUrl')
-      expect(input).toHaveAttribute('placeholder', 'Please enter GitHub repo URL')
-    })
-
-    it('should render cancel button', () => {
-      render(<SetURL {...defaultProps} />)
-
-      expect(screen.getByRole('button', { name: 'plugin.installModal.cancel' })).toBeInTheDocument()
-    })
-
-    it('should render next button', () => {
-      render(<SetURL {...defaultProps} />)
-
-      expect(screen.getByRole('button', { name: 'plugin.installModal.next' })).toBeInTheDocument()
-    })
-
-    it('should associate label with input field', () => {
-      render(<SetURL {...defaultProps} />)
-
-      const input = screen.getByLabelText('plugin.installFromGitHub.gitHubRepo')
-      expect(input).toBeInTheDocument()
-    })
-
-    it('should auto-focus the input on mount', async () => {
-      render(<SetURL {...defaultProps} />)
-
-      const input = screen.getByRole('textbox')
-      await waitFor(() => {
-        expect(input).toHaveFocus()
-      })
-    })
-  })
-
-  // ================================
-  // Props Tests
-  // ================================
-  describe('Props', () => {
-    it('should display repoUrl value in input', () => {
-      render(<SetURL {...defaultProps} repoUrl="https://github.com/test/repo" />)
-
-      expect(screen.getByRole('textbox')).toHaveValue('https://github.com/test/repo')
-    })
-
-    it('should display empty string when repoUrl is empty', () => {
-      render(<SetURL {...defaultProps} repoUrl="" />)
-
-      expect(screen.getByRole('textbox')).toHaveValue('')
-    })
-  })
-
-  // ================================
-  // User Interactions Tests
-  // ================================
-  describe('User Interactions', () => {
-    it('should call onChange when input value changes', () => {
-      const onChange = vi.fn()
-      render(<SetURL {...defaultProps} onChange={onChange} />)
-
-      const input = screen.getByRole('textbox')
-      fireEvent.change(input, { target: { value: 'https://github.com/owner/repo' } })
-
-      expect(onChange).toHaveBeenCalledTimes(1)
-      expect(onChange).toHaveBeenCalledWith('https://github.com/owner/repo')
-    })
-
-    it('should call onCancel when cancel button is clicked', () => {
-      const onCancel = vi.fn()
-      render(<SetURL {...defaultProps} onCancel={onCancel} />)
-
-      fireEvent.click(screen.getByRole('button', { name: 'plugin.installModal.cancel' }))
-
-      expect(onCancel).toHaveBeenCalledTimes(1)
-    })
-
-    it('should call onNext when next button is clicked', () => {
-      const onNext = vi.fn()
-      render(<SetURL {...defaultProps} repoUrl="https://github.com/test/repo" onNext={onNext} />)
-
-      fireEvent.click(screen.getByRole('button', { name: 'plugin.installModal.next' }))
-
-      expect(onNext).toHaveBeenCalledTimes(1)
-    })
-  })
-
-  // ================================
-  // Button State Tests
-  // ================================
-  describe('Button State', () => {
-    it('should disable next button when repoUrl is empty', () => {
-      render(<SetURL {...defaultProps} repoUrl="" />)
-
-      expect(screen.getByRole('button', { name: 'plugin.installModal.next' })).toBeDisabled()
-    })
-
-    it('should disable next button when repoUrl is only whitespace', () => {
-      render(<SetURL {...defaultProps} repoUrl="   " />)
-
-      expect(screen.getByRole('button', { name: 'plugin.installModal.next' })).toBeDisabled()
-    })
-
-    it('should enable next button when repoUrl has content', () => {
-      render(<SetURL {...defaultProps} repoUrl="https://github.com/test/repo" />)
-
-      expect(screen.getByRole('button', { name: 'plugin.installModal.next' })).not.toBeDisabled()
-    })
-
-    it('should not disable cancel button regardless of repoUrl', () => {
-      render(<SetURL {...defaultProps} repoUrl="" />)
-
-      expect(screen.getByRole('button', { name: 'plugin.installModal.cancel' })).not.toBeDisabled()
-    })
-  })
-
-  // ================================
-  // Edge Cases Tests
-  // ================================
-  describe('Edge Cases', () => {
-    it('should handle URL with special characters', () => {
-      const onChange = vi.fn()
-      render(<SetURL {...defaultProps} onChange={onChange} />)
-
-      const input = screen.getByRole('textbox')
-      fireEvent.change(input, { target: { value: 'https://github.com/test-org/repo_name-123' } })
-
-      expect(onChange).toHaveBeenCalledWith('https://github.com/test-org/repo_name-123')
-    })
-
-    it('should handle very long URLs', () => {
-      const longUrl = `https://github.com/${'a'.repeat(100)}/${'b'.repeat(100)}`
-      render(<SetURL {...defaultProps} repoUrl={longUrl} />)
-
-      expect(screen.getByRole('textbox')).toHaveValue(longUrl)
-    })
-
-    it('should handle onChange with empty string', () => {
-      const onChange = vi.fn()
-      render(<SetURL {...defaultProps} repoUrl="some-value" onChange={onChange} />)
-
-      const input = screen.getByRole('textbox')
-      fireEvent.change(input, { target: { value: '' } })
-
-      expect(onChange).toHaveBeenCalledWith('')
-    })
-
-    it('should preserve callback references on rerender', () => {
-      const onNext = vi.fn()
-      const { rerender } = render(<SetURL {...defaultProps} repoUrl="https://github.com/a/b" onNext={onNext} />)
-
-      rerender(<SetURL {...defaultProps} repoUrl="https://github.com/a/b" onNext={onNext} />)
-
-      fireEvent.click(screen.getByRole('button', { name: 'plugin.installModal.next' }))
-
-      expect(onNext).toHaveBeenCalledTimes(1)
-    })
-  })
-})
diff --git a/web/app/components/plugins/install-plugin/install-from-github/steps/selectPackage.tsx b/web/app/components/plugins/install-plugin/install-from-github/steps/selectPackage.tsx
index 8e48de55b1..94dd904b83 100644
--- a/web/app/components/plugins/install-plugin/install-from-github/steps/selectPackage.tsx
+++ b/web/app/components/plugins/install-plugin/install-from-github/steps/selectPackage.tsx
@@ -109,7 +109,7 @@ const SelectPackage: React.FC<SelectPackageProps> = ({
             )}
           </div>
         </SelectTrigger>
-        <SelectContent popupClassName="z-1001 w-[512px]">
+        <SelectContent popupClassName="w-[512px]">
           {versions.map(item => (
             <SelectItem key={item.value} value={String(item.value)}>
               <SelectItemText>{item.name}</SelectItemText>
@@ -141,7 +141,7 @@ const SelectPackage: React.FC<SelectPackageProps> = ({
         <SelectTrigger className="h-9 text-components-input-text-filled">
           {selectedPackageOption?.name ?? t(`${i18nPrefix}.selectPackagePlaceholder`, { ns: 'plugin' }) ?? ''}
         </SelectTrigger>
-        <SelectContent popupClassName="z-1001 w-[512px]">
+        <SelectContent popupClassName="w-[512px]">
           {packages.map(item => (
             <SelectItem key={item.value} value={String(item.value)}>
               <SelectItemText>{item.name}</SelectItemText>
diff --git a/web/app/components/plugins/install-plugin/install-from-github/steps/setURL.tsx b/web/app/components/plugins/install-plugin/install-from-github/steps/setURL.tsx
deleted file mode 100644
index b4f0741eb2..0000000000
--- a/web/app/components/plugins/install-plugin/install-from-github/steps/setURL.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-'use client'
-
-import { Button } from '@langgenius/dify-ui/button'
-import * as React from 'react'
-import { useTranslation } from 'react-i18next'
-
-type SetURLProps = {
-  repoUrl: string
-  onChange: (value: string) => void
-  onNext: () => void
-  onCancel: () => void
-}
-
-const SetURL: React.FC<SetURLProps> = ({ repoUrl, onChange, onNext, onCancel }) => {
-  const { t } = useTranslation()
-  const inputRef = React.useRef<HTMLInputElement>(null)
-
-  // Focus the input after the dropdown's focus-return animation settles.
-  // Using rAF avoids racing the DropdownMenu FloatingFocusManager that returns
-  // focus to the trigger on close.
-  React.useEffect(() => {
-    const frame = requestAnimationFrame(() => {
-      inputRef.current?.focus()
-    })
-    return () => cancelAnimationFrame(frame)
-  }, [])
-
-  return (
-    <>
-      <label
-        htmlFor="repoUrl"
-        className="flex flex-col items-start justify-center self-stretch text-text-secondary"
-      >
-        <span className="system-sm-semibold">{t('installFromGitHub.gitHubRepo', { ns: 'plugin' })}</span>
-      </label>
-      <input
-        ref={inputRef}
-        type="url"
-        id="repoUrl"
-        name="repoUrl"
-        value={repoUrl}
-        onChange={e => onChange(e.target.value)}
-        className="shadows-shadow-xs flex grow items-center gap-[2px] self-stretch
-          overflow-hidden rounded-lg border border-components-input-border-active bg-components-input-bg-active p-2
-          system-sm-regular text-ellipsis text-components-input-text-filled"
-        placeholder="Please enter GitHub repo URL"
-      />
-      <div className="mt-4 flex items-center justify-end gap-2 self-stretch">
-        <Button
-          variant="secondary"
-          className="min-w-[72px]"
-          onClick={onCancel}
-        >
-          {t('installModal.cancel', { ns: 'plugin' })}
-        </Button>
-        <Button
-          variant="primary"
-          className="min-w-[72px]"
-          onClick={onNext}
-          disabled={!repoUrl.trim()}
-        >
-          {t('installModal.next', { ns: 'plugin' })}
-        </Button>
-      </div>
-    </>
-  )
-}
-
-export default SetURL
diff --git a/web/app/components/plugins/install-plugin/install-from-local-package/__tests__/index.spec.tsx b/web/app/components/plugins/install-plugin/install-from-local-package/__tests__/index.spec.tsx
index cac6250550..65b74bcac0 100644
--- a/web/app/components/plugins/install-plugin/install-from-local-package/__tests__/index.spec.tsx
+++ b/web/app/components/plugins/install-plugin/install-from-local-package/__tests__/index.spec.tsx
@@ -292,6 +292,12 @@ describe('InstallFromLocalPackage', () => {
       expect(screen.getByTestId('is-bundle')).toHaveTextContent('true')
     })
 
+    it('should constrain dialog height so bundle dependency lists can scroll', () => {
+      render(<InstallFromLocalPackage {...defaultProps} file={createMockBundleFile()} />)
+
+      expect(screen.getByRole('dialog')).toHaveClass('max-h-[calc(100dvh-48px)]')
+    })
+
     it('should identify package file correctly', () => {
       render(<InstallFromLocalPackage {...defaultProps} />)
 
diff --git a/web/app/components/plugins/install-plugin/install-from-local-package/index.tsx b/web/app/components/plugins/install-plugin/install-from-local-package/index.tsx
index 94504acd98..032c2197f1 100644
--- a/web/app/components/plugins/install-plugin/install-from-local-package/index.tsx
+++ b/web/app/components/plugins/install-plugin/install-from-local-package/index.tsx
@@ -2,10 +2,10 @@
 
 import type { Dependency, PluginDeclaration } from '../../types'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogCloseButton, DialogContent } from '@langgenius/dify-ui/dialog'
 import * as React from 'react'
 import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import Modal from '@/app/components/base/modal'
 import useGetIcon from '@/app/components/plugins/install-plugin/base/use-get-icon'
 import { InstallStep } from '../../types'
 import useHideLogic from '../hooks/use-hide-logic'
@@ -86,52 +86,57 @@ const InstallFromLocalPackage: React.FC<InstallFromLocalPackageProps> = ({
   }, [])
 
   return (
-    <Modal
-      isShow={true}
-      onClose={foldAnimInto}
-      className={cn(modalClassName, 'shadows-shadow-xl flex min-w-[560px] flex-col items-start rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg p-0')}
-      closable
+    <Dialog
+      open
+      onOpenChange={(open) => {
+        if (!open)
+          foldAnimInto()
+      }}
     >
-      <div className="flex items-start gap-2 self-stretch pt-6 pr-14 pb-3 pl-6">
-        <div className="self-stretch title-2xl-semi-bold text-text-primary">
-          {getTitle()}
+      <DialogContent className={cn('w-[560px] max-w-none! overflow-hidden! text-left align-middle', cn(modalClassName, 'shadows-shadow-xl flex max-h-[calc(100dvh-48px)] min-w-[560px] flex-col items-start rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg p-0'))}>
+        <DialogCloseButton />
+
+        <div className="flex items-start gap-2 self-stretch pt-6 pr-14 pb-3 pl-6">
+          <div className="self-stretch title-2xl-semi-bold text-text-primary">
+            {getTitle()}
+          </div>
         </div>
-      </div>
-      {step === InstallStep.uploading && (
-        <Uploading
-          isBundle={isBundle}
-          file={file}
-          onCancel={onClose}
-          onPackageUploaded={handlePackageUploaded}
-          onBundleUploaded={handleBundleUploaded}
-          onFailed={handleUploadFail}
-        />
-      )}
-      {isBundle
-        ? (
-            <ReadyToInstallBundle
-              step={step}
-              onStepChange={setStep}
-              onStartToInstall={handleStartToInstall}
-              setIsInstalling={setIsInstalling}
-              onClose={onClose}
-              allPlugins={dependencies}
-            />
-          )
-        : (
-            <ReadyToInstallPackage
-              step={step}
-              onStepChange={setStep}
-              onStartToInstall={handleStartToInstall}
-              setIsInstalling={setIsInstalling}
-              onClose={onClose}
-              uniqueIdentifier={uniqueIdentifier}
-              manifest={manifest}
-              errorMsg={errorMsg}
-              onError={setErrorMsg}
-            />
-          )}
-    </Modal>
+        {step === InstallStep.uploading && (
+          <Uploading
+            isBundle={isBundle}
+            file={file}
+            onCancel={onClose}
+            onPackageUploaded={handlePackageUploaded}
+            onBundleUploaded={handleBundleUploaded}
+            onFailed={handleUploadFail}
+          />
+        )}
+        {isBundle
+          ? (
+              <ReadyToInstallBundle
+                step={step}
+                onStepChange={setStep}
+                onStartToInstall={handleStartToInstall}
+                setIsInstalling={setIsInstalling}
+                onClose={onClose}
+                allPlugins={dependencies}
+              />
+            )
+          : (
+              <ReadyToInstallPackage
+                step={step}
+                onStepChange={setStep}
+                onStartToInstall={handleStartToInstall}
+                setIsInstalling={setIsInstalling}
+                onClose={onClose}
+                uniqueIdentifier={uniqueIdentifier}
+                manifest={manifest}
+                errorMsg={errorMsg}
+                onError={setErrorMsg}
+              />
+            )}
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/components/plugins/install-plugin/install-from-local-package/steps/__tests__/uploading.spec.tsx b/web/app/components/plugins/install-plugin/install-from-local-package/steps/__tests__/uploading.spec.tsx
index aace5dcbe9..674d6a451c 100644
--- a/web/app/components/plugins/install-plugin/install-from-local-package/steps/__tests__/uploading.spec.tsx
+++ b/web/app/components/plugins/install-plugin/install-from-local-package/steps/__tests__/uploading.spec.tsx
@@ -161,11 +161,9 @@ describe('Uploading', () => {
       })
     })
 
-    // NOTE: The uploadFile API has an unconventional contract where it always rejects.
-    // Success vs failure is determined by whether response.message exists:
-    // - If response.message exists → treated as failure (calls onFailed)
-    // - If response.message is absent → treated as success (calls onPackageUploaded/onBundleUploaded)
-    // This explains why we use mockRejectedValue for "success" scenarios below.
+    // NOTE: Some upload endpoints have historically returned successful plugin upload
+    // payloads through rejected XHR objects, so the component accepts both resolved
+    // responses and rejected responses without an error message.
 
     it('should call onPackageUploaded when upload rejects without error message (success case)', async () => {
       const mockResult = {
@@ -193,6 +191,30 @@ describe('Uploading', () => {
       })
     })
 
+    it('should call onPackageUploaded when upload resolves with package response', async () => {
+      const mockResult = {
+        unique_identifier: 'test-uid',
+        manifest: createMockManifest(),
+      }
+      mockUploadFile.mockResolvedValue(mockResult)
+
+      const onPackageUploaded = vi.fn()
+      render(
+        <Uploading
+          {...defaultProps}
+          isBundle={false}
+          onPackageUploaded={onPackageUploaded}
+        />,
+      )
+
+      await waitFor(() => {
+        expect(onPackageUploaded).toHaveBeenCalledWith({
+          uniqueIdentifier: mockResult.unique_identifier,
+          manifest: mockResult.manifest,
+        })
+      })
+    })
+
     it('should call onBundleUploaded when upload rejects without error message (success case)', async () => {
       const mockDependencies = createMockDependencies()
       mockUploadFile.mockRejectedValue({
@@ -212,6 +234,24 @@ describe('Uploading', () => {
         expect(onBundleUploaded).toHaveBeenCalledWith(mockDependencies)
       })
     })
+
+    it('should call onBundleUploaded when upload resolves with bundle response', async () => {
+      const mockDependencies = createMockDependencies()
+      mockUploadFile.mockResolvedValue(mockDependencies)
+
+      const onBundleUploaded = vi.fn()
+      render(
+        <Uploading
+          {...defaultProps}
+          isBundle
+          onBundleUploaded={onBundleUploaded}
+        />,
+      )
+
+      await waitFor(() => {
+        expect(onBundleUploaded).toHaveBeenCalledWith(mockDependencies)
+      })
+    })
   })
 
   // ================================
@@ -260,35 +300,48 @@ describe('Uploading', () => {
   // Edge Cases Tests
   // ================================
   describe('Edge Cases', () => {
-    it('should handle empty response gracefully', async () => {
+    it('should fail gracefully when upload response is empty', async () => {
       mockUploadFile.mockRejectedValue({
         response: {},
       })
 
       const onPackageUploaded = vi.fn()
-      render(<Uploading {...defaultProps} onPackageUploaded={onPackageUploaded} />)
+      const onFailed = vi.fn()
+      render(<Uploading {...defaultProps} onPackageUploaded={onPackageUploaded} onFailed={onFailed} />)
 
       await waitFor(() => {
-        expect(onPackageUploaded).toHaveBeenCalledWith({
-          uniqueIdentifier: undefined,
-          manifest: undefined,
-        })
+        expect(onPackageUploaded).not.toHaveBeenCalled()
+        expect(onFailed).toHaveBeenCalledWith('plugin.installModal.uploadFailed')
       })
     })
 
-    it('should handle response with only unique_identifier', async () => {
+    it('should fail gracefully when upload response has no manifest', async () => {
       mockUploadFile.mockRejectedValue({
         response: { unique_identifier: 'only-uid' },
       })
 
       const onPackageUploaded = vi.fn()
-      render(<Uploading {...defaultProps} onPackageUploaded={onPackageUploaded} />)
+      const onFailed = vi.fn()
+      render(<Uploading {...defaultProps} onPackageUploaded={onPackageUploaded} onFailed={onFailed} />)
 
       await waitFor(() => {
-        expect(onPackageUploaded).toHaveBeenCalledWith({
-          uniqueIdentifier: 'only-uid',
-          manifest: undefined,
-        })
+        expect(onPackageUploaded).not.toHaveBeenCalled()
+        expect(onFailed).toHaveBeenCalledWith('plugin.installModal.uploadFailed')
+      })
+    })
+
+    it('should fail gracefully when upload response is null', async () => {
+      mockUploadFile.mockRejectedValue({
+        response: null,
+      })
+
+      const onPackageUploaded = vi.fn()
+      const onFailed = vi.fn()
+      render(<Uploading {...defaultProps} onPackageUploaded={onPackageUploaded} onFailed={onFailed} />)
+
+      await waitFor(() => {
+        expect(onPackageUploaded).not.toHaveBeenCalled()
+        expect(onFailed).toHaveBeenCalledWith('plugin.installModal.uploadFailed')
       })
     })
 
diff --git a/web/app/components/plugins/install-plugin/install-from-local-package/steps/uploading.tsx b/web/app/components/plugins/install-plugin/install-from-local-package/steps/uploading.tsx
index e7c3b4cd0f..ea90975ec5 100644
--- a/web/app/components/plugins/install-plugin/install-from-local-package/steps/uploading.tsx
+++ b/web/app/components/plugins/install-plugin/install-from-local-package/steps/uploading.tsx
@@ -1,8 +1,7 @@
 'use client'
 import type { FC } from 'react'
-import type { Dependency, PluginDeclaration } from '../../../types'
+import type { Dependency, Plugin, PluginDeclaration } from '../../../types'
 import { Button } from '@langgenius/dify-ui/button'
-import { RiLoader2Line } from '@remixicon/react'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import { uploadFile } from '@/service/plugins'
@@ -10,6 +9,40 @@ import Card from '../../../card'
 
 const i18nPrefix = 'installModal'
 
+type PackageUploadResponse = {
+  unique_identifier: string
+  manifest: PluginDeclaration
+}
+
+type UploadFailureResponse = {
+  message?: string
+}
+
+function isObject(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null
+}
+
+function isPackageUploadResponse(value: unknown): value is PackageUploadResponse {
+  if (!isObject(value))
+    return false
+
+  return typeof value.unique_identifier === 'string' && isObject(value.manifest)
+}
+
+function getRejectedResponse(error: unknown): unknown {
+  if (!isObject(error) || !('response' in error))
+    return undefined
+
+  return error.response
+}
+
+function getUploadFailureMessage(response: unknown): string | undefined {
+  if (!isObject(response))
+    return undefined
+
+  return (response as UploadFailureResponse).message
+}
+
 type Props = {
   isBundle: boolean
   file: File
@@ -32,36 +65,50 @@ const Uploading: FC<Props> = ({
 }) => {
   const { t } = useTranslation()
   const fileName = file.name
-  const handleUpload = async () => {
+  const handleUploadedResponse = React.useCallback((response: unknown) => {
+    if (isBundle) {
+      if (Array.isArray(response)) {
+        onBundleUploaded(response as Dependency[])
+        return
+      }
+      onFailed(t(`${i18nPrefix}.uploadFailed`, { ns: 'plugin' }))
+      return
+    }
+
+    if (!isPackageUploadResponse(response)) {
+      onFailed(t(`${i18nPrefix}.uploadFailed`, { ns: 'plugin' }))
+      return
+    }
+
+    onPackageUploaded({
+      uniqueIdentifier: response.unique_identifier,
+      manifest: response.manifest,
+    })
+  }, [isBundle, onBundleUploaded, onFailed, onPackageUploaded, t])
+
+  const handleUpload = React.useCallback(async () => {
     try {
-      await uploadFile(file, isBundle)
+      handleUploadedResponse(await uploadFile(file, isBundle))
     }
-    catch (e: any) {
-      if (e.response?.message) {
-        onFailed(e.response?.message)
-      }
-      else { // Why it would into this branch?
-        const res = e.response
-        if (isBundle) {
-          onBundleUploaded(res)
-          return
-        }
-        onPackageUploaded({
-          uniqueIdentifier: res.unique_identifier,
-          manifest: res.manifest,
-        })
+    catch (error: unknown) {
+      const response = getRejectedResponse(error)
+      const message = getUploadFailureMessage(response)
+      if (message) {
+        onFailed(message)
+        return
       }
+      handleUploadedResponse(response)
     }
-  }
+  }, [file, handleUploadedResponse, isBundle, onFailed])
 
   React.useEffect(() => {
     handleUpload()
-  }, [])
+  }, [handleUpload])
   return (
     <>
       <div className="flex flex-col items-start justify-center gap-4 self-stretch px-6 py-3">
         <div className="flex items-center gap-1 self-stretch">
-          <RiLoader2Line className="h-4 w-4 animate-spin-slow text-text-accent" />
+          <span className="i-ri-loader-2-line h-4 w-4 animate-spin-slow text-text-accent" />
           <div className="system-md-regular text-text-secondary">
             {t(`${i18nPrefix}.uploadingPackage`, {
               ns: 'plugin',
@@ -72,7 +119,7 @@ const Uploading: FC<Props> = ({
         <div className="flex flex-wrap content-start items-start gap-1 self-stretch rounded-2xl bg-background-section-burn p-2">
           <Card
             className="w-full"
-            payload={{ name: fileName } as any}
+            payload={{ name: fileName } as Plugin}
             isLoading
             loadingFileName={fileName}
             installed={false}
diff --git a/web/app/components/plugins/install-plugin/install-from-marketplace/__tests__/index.spec.tsx b/web/app/components/plugins/install-plugin/install-from-marketplace/__tests__/index.spec.tsx
index 18fa634202..05d5640c96 100644
--- a/web/app/components/plugins/install-plugin/install-from-marketplace/__tests__/index.spec.tsx
+++ b/web/app/components/plugins/install-plugin/install-from-marketplace/__tests__/index.spec.tsx
@@ -212,6 +212,19 @@ describe('InstallFromMarketplace', () => {
       expect(screen.getByTestId('bundle-plugins-count')).toHaveTextContent('2')
     })
 
+    it('should constrain bundle dialog height so dependency lists can scroll', () => {
+      const dependencies = createMockDependencies()
+      render(
+        <InstallFromMarketplace
+          {...defaultProps}
+          isBundle={true}
+          dependencies={dependencies}
+        />,
+      )
+
+      expect(screen.getByRole('dialog')).toHaveClass('max-h-[calc(100dvh-48px)]')
+    })
+
     it('should pass isFromMarketPlace as true to bundle component', () => {
       const dependencies = createMockDependencies()
       render(
diff --git a/web/app/components/plugins/install-plugin/install-from-marketplace/index.tsx b/web/app/components/plugins/install-plugin/install-from-marketplace/index.tsx
index 128b49fcae..a53b014e6e 100644
--- a/web/app/components/plugins/install-plugin/install-from-marketplace/index.tsx
+++ b/web/app/components/plugins/install-plugin/install-from-marketplace/index.tsx
@@ -2,10 +2,10 @@
 
 import type { Dependency, Plugin, PluginManifestInMarket } from '../../types'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogCloseButton, DialogContent } from '@langgenius/dify-ui/dialog'
 import * as React from 'react'
 import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import Modal from '@/app/components/base/modal'
 import { InstallStep } from '../../types'
 import Installed from '../base/installed'
 import useHideLogic from '../hooks/use-hide-logic'
@@ -70,60 +70,64 @@ const InstallFromMarketplace: React.FC<InstallFromMarketplaceProps> = ({
   }, [setIsInstalling])
 
   return (
-    <Modal
-      isShow={true}
-      onClose={foldAnimInto}
-      wrapperClassName="z-9999"
-      className={cn(modalClassName, 'shadows-shadow-xl flex min-w-[560px] flex-col items-start rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg p-0')}
-      closable
+    <Dialog
+      open
+      onOpenChange={(open) => {
+        if (!open)
+          foldAnimInto()
+      }}
     >
-      <div className="flex items-start gap-2 self-stretch pt-6 pr-14 pb-3 pl-6">
-        <div className="self-stretch title-2xl-semi-bold text-text-primary">
-          {getTitle()}
+      <DialogContent className={cn('w-[560px] max-w-none! overflow-hidden! text-left align-middle', cn(modalClassName, 'shadows-shadow-xl flex max-h-[calc(100dvh-48px)] min-w-[560px] flex-col items-start rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg p-0'))}>
+        <DialogCloseButton />
+
+        <div className="flex items-start gap-2 self-stretch pt-6 pr-14 pb-3 pl-6">
+          <div className="self-stretch title-2xl-semi-bold text-text-primary">
+            {getTitle()}
+          </div>
         </div>
-      </div>
-      {
-        isBundle
-          ? (
-              <ReadyToInstallBundle
-                step={step}
-                onStepChange={setStep}
-                onStartToInstall={handleStartToInstall}
-                setIsInstalling={setIsInstalling}
-                onClose={onClose}
-                allPlugins={dependencies!}
-                isFromMarketPlace
-              />
-            )
-          : (
-              <>
-                {
-                  step === InstallStep.readyToInstall && (
-                    <Install
-                      uniqueIdentifier={uniqueIdentifier}
-                      payload={manifest!}
-                      onCancel={onClose}
-                      onInstalled={handleInstalled}
-                      onFailed={handleFailed}
-                      onStartToInstall={handleStartToInstall}
-                    />
-                  )
-                }
-                {
-                  [InstallStep.installed, InstallStep.installFailed].includes(step) && (
-                    <Installed
-                      payload={manifest!}
-                      isMarketPayload
-                      isFailed={step === InstallStep.installFailed}
-                      errMsg={errorMsg}
-                      onCancel={onSuccess}
-                    />
-                  )
-                }
-              </>
-            )
-      }
-    </Modal>
+        {
+          isBundle
+            ? (
+                <ReadyToInstallBundle
+                  step={step}
+                  onStepChange={setStep}
+                  onStartToInstall={handleStartToInstall}
+                  setIsInstalling={setIsInstalling}
+                  onClose={onClose}
+                  allPlugins={dependencies!}
+                  isFromMarketPlace
+                />
+              )
+            : (
+                <>
+                  {
+                    step === InstallStep.readyToInstall && (
+                      <Install
+                        uniqueIdentifier={uniqueIdentifier}
+                        payload={manifest!}
+                        onCancel={onClose}
+                        onInstalled={handleInstalled}
+                        onFailed={handleFailed}
+                        onStartToInstall={handleStartToInstall}
+                      />
+                    )
+                  }
+                  {
+                    [InstallStep.installed, InstallStep.installFailed].includes(step) && (
+                      <Installed
+                        payload={manifest!}
+                        isMarketPayload
+                        isFailed={step === InstallStep.installFailed}
+                        errMsg={errorMsg}
+                        onCancel={onSuccess}
+                      />
+                    )
+                  }
+                </>
+              )
+        }
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/components/plugins/marketplace/empty/index.tsx b/web/app/components/plugins/marketplace/empty/index.tsx
index bff77b5d8e..0c6c0c6009 100644
--- a/web/app/components/plugins/marketplace/empty/index.tsx
+++ b/web/app/components/plugins/marketplace/empty/index.tsx
@@ -1,6 +1,6 @@
 'use client'
-import { useTranslation } from '#i18n'
 import { cn } from '@langgenius/dify-ui/cn'
+import { useTranslation } from '#i18n'
 import { Group } from '@/app/components/base/icons/src/vender/other'
 import Line from './line'
 
diff --git a/web/app/components/plugins/marketplace/list/card-wrapper.tsx b/web/app/components/plugins/marketplace/list/card-wrapper.tsx
index 9dc5bc3d78..b2fabfcc0b 100644
--- a/web/app/components/plugins/marketplace/list/card-wrapper.tsx
+++ b/web/app/components/plugins/marketplace/list/card-wrapper.tsx
@@ -1,12 +1,12 @@
 'use client'
 import type { Plugin } from '@/app/components/plugins/types'
-import { useLocale, useTranslation } from '#i18n'
 import { Button } from '@langgenius/dify-ui/button'
 import { RiArrowRightUpLine } from '@remixicon/react'
 import { useBoolean } from 'ahooks'
 import { useTheme } from 'next-themes'
 import * as React from 'react'
 import { useMemo } from 'react'
+import { useLocale, useTranslation } from '#i18n'
 import Card from '@/app/components/plugins/card'
 import CardMoreInfo from '@/app/components/plugins/card/card-more-info'
 import { useTags } from '@/app/components/plugins/hooks'
diff --git a/web/app/components/plugins/marketplace/list/list-with-collection.tsx b/web/app/components/plugins/marketplace/list/list-with-collection.tsx
index 744885ae09..ffe7d6128d 100644
--- a/web/app/components/plugins/marketplace/list/list-with-collection.tsx
+++ b/web/app/components/plugins/marketplace/list/list-with-collection.tsx
@@ -2,9 +2,9 @@
 
 import type { MarketplaceCollection } from '../types'
 import type { Plugin } from '@/app/components/plugins/types'
-import { useLocale, useTranslation } from '#i18n'
 import { cn } from '@langgenius/dify-ui/cn'
 import { RiArrowRightSLine } from '@remixicon/react'
+import { useLocale, useTranslation } from '#i18n'
 import { getLanguage } from '@/i18n-config/language'
 import { useMarketplaceMoreClick } from '../atoms'
 import CardWrapper from './card-wrapper'
diff --git a/web/app/components/plugins/marketplace/plugin-type-switch.tsx b/web/app/components/plugins/marketplace/plugin-type-switch.tsx
index d9f305db72..d987027fc5 100644
--- a/web/app/components/plugins/marketplace/plugin-type-switch.tsx
+++ b/web/app/components/plugins/marketplace/plugin-type-switch.tsx
@@ -1,6 +1,5 @@
 'use client'
 import type { ActivePluginType } from './constants'
-import { useTranslation } from '#i18n'
 import { cn } from '@langgenius/dify-ui/cn'
 import {
   RiArchive2Line,
@@ -11,6 +10,7 @@ import {
   RiSpeakAiLine,
 } from '@remixicon/react'
 import { useSetAtom } from 'jotai'
+import { useTranslation } from '#i18n'
 import { Trigger as TriggerIcon } from '@/app/components/base/icons/src/vender/plugin'
 import { searchModeAtom, useActivePluginType } from './atoms'
 import { PLUGIN_CATEGORY_WITH_COLLECTIONS, PLUGIN_TYPE_SEARCH_MAP } from './constants'
diff --git a/web/app/components/plugins/marketplace/search-box/__tests__/tags-filter.spec.tsx b/web/app/components/plugins/marketplace/search-box/__tests__/tags-filter.spec.tsx
index e87022fe38..f84470a3e4 100644
--- a/web/app/components/plugins/marketplace/search-box/__tests__/tags-filter.spec.tsx
+++ b/web/app/components/plugins/marketplace/search-box/__tests__/tags-filter.spec.tsx
@@ -32,10 +32,6 @@ vi.mock('@/app/components/plugins/hooks', () => ({
   }),
 }))
 
-vi.mock('@/app/components/base/checkbox', () => ({
-  default: ({ checked }: { checked: boolean }) => <span data-testid="checkbox">{String(checked)}</span>,
-}))
-
 vi.mock('@/app/components/base/input', () => ({
   default: ({
     value,
diff --git a/web/app/components/plugins/marketplace/search-box/tags-filter.tsx b/web/app/components/plugins/marketplace/search-box/tags-filter.tsx
index d97420b672..33ab3b9a91 100644
--- a/web/app/components/plugins/marketplace/search-box/tags-filter.tsx
+++ b/web/app/components/plugins/marketplace/search-box/tags-filter.tsx
@@ -1,13 +1,13 @@
 'use client'
 
-import { useTranslation } from '#i18n'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import {
   Popover,
   PopoverContent,
   PopoverTrigger,
 } from '@langgenius/dify-ui/popover'
 import { useState } from 'react'
-import Checkbox from '@/app/components/base/checkbox'
+import { useTranslation } from '#i18n'
 import Input from '@/app/components/base/input'
 import { useTags } from '@/app/components/plugins/hooks'
 import MarketplaceTrigger from './trigger/marketplace'
@@ -88,19 +88,19 @@ const TagsFilter = ({
           <div className="max-h-[448px] overflow-y-auto p-1">
             {
               filteredOptions.map(option => (
-                <div
+                <label
                   key={option.name}
                   className="flex h-7 cursor-pointer items-center rounded-lg px-2 py-1.5 select-none hover:bg-state-base-hover"
-                  onClick={() => handleCheck(option.name)}
                 >
                   <Checkbox
                     className="mr-1"
                     checked={tags.includes(option.name)}
+                    onCheckedChange={() => handleCheck(option.name)}
                   />
                   <div className="px-1 system-sm-medium text-text-secondary">
                     {option.label}
                   </div>
-                </div>
+                </label>
               ))
             }
           </div>
diff --git a/web/app/components/plugins/marketplace/search-box/trigger/marketplace.tsx b/web/app/components/plugins/marketplace/search-box/trigger/marketplace.tsx
index 167d6fcd70..99299a56b4 100644
--- a/web/app/components/plugins/marketplace/search-box/trigger/marketplace.tsx
+++ b/web/app/components/plugins/marketplace/search-box/trigger/marketplace.tsx
@@ -1,8 +1,8 @@
 import type { Tag } from '../../../hooks'
-import { useTranslation } from '#i18n'
 import { cn } from '@langgenius/dify-ui/cn'
 import { RiArrowDownSLine, RiCloseCircleFill, RiFilter3Line } from '@remixicon/react'
 import * as React from 'react'
+import { useTranslation } from '#i18n'
 
 type MarketplaceTriggerProps = {
   selectedTagsLength: number
diff --git a/web/app/components/plugins/marketplace/sort-dropdown/index.tsx b/web/app/components/plugins/marketplace/sort-dropdown/index.tsx
index b8f5467fa1..a9dc6b4d72 100644
--- a/web/app/components/plugins/marketplace/sort-dropdown/index.tsx
+++ b/web/app/components/plugins/marketplace/sort-dropdown/index.tsx
@@ -1,5 +1,4 @@
 'use client'
-import { useTranslation } from '#i18n'
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -7,6 +6,7 @@ import {
   DropdownMenuTrigger,
 } from '@langgenius/dify-ui/dropdown-menu'
 import { useState } from 'react'
+import { useTranslation } from '#i18n'
 import { useMarketplaceSort } from '../atoms'
 
 const SortDropdown = () => {
diff --git a/web/app/components/plugins/plugin-auth/authorize/__tests__/add-oauth-button.spec.tsx b/web/app/components/plugins/plugin-auth/authorize/__tests__/add-oauth-button.spec.tsx
index f00df35d0c..dc05641a08 100644
--- a/web/app/components/plugins/plugin-auth/authorize/__tests__/add-oauth-button.spec.tsx
+++ b/web/app/components/plugins/plugin-auth/authorize/__tests__/add-oauth-button.spec.tsx
@@ -104,7 +104,7 @@ describe('AddOAuthButton', () => {
   it('should open OAuth settings modal when settings icon clicked', () => {
     render(<AddOAuthButton pluginPayload={basePayload} buttonText="Use OAuth" />)
 
-    fireEvent.click(screen.getByTestId('oauth-settings-button'))
+    fireEvent.click(screen.getByRole('button', { name: /plugin\.auth\.oauthClientSettings/i }))
 
     expect(screen.getByTestId('oauth-settings-modal')).toBeInTheDocument()
     expect(mockOAuthClientSettingsProps.at(-1)?.open).toBe(true)
@@ -113,7 +113,7 @@ describe('AddOAuthButton', () => {
   it('should close OAuth settings modal', () => {
     render(<AddOAuthButton pluginPayload={basePayload} buttonText="Use OAuth" />)
 
-    fireEvent.click(screen.getByTestId('oauth-settings-button'))
+    fireEvent.click(screen.getByRole('button', { name: /plugin\.auth\.oauthClientSettings/i }))
     fireEvent.click(screen.getByTestId('oauth-settings-close'))
 
     expect(screen.queryByTestId('oauth-settings-modal')).not.toBeInTheDocument()
@@ -223,7 +223,7 @@ describe('AddOAuthButton', () => {
       />,
     )
 
-    fireEvent.click(screen.getByTestId('oauth-settings-button'))
+    fireEvent.click(screen.getByRole('button', { name: /plugin\.auth\.oauthClientSettings/i }))
 
     const settingsProps = mockOAuthClientSettingsProps.at(-1)
     expect(settingsProps?.editValues).toMatchObject({
diff --git a/web/app/components/plugins/plugin-auth/authorize/__tests__/api-key-modal.spec.tsx b/web/app/components/plugins/plugin-auth/authorize/__tests__/api-key-modal.spec.tsx
index ad99f7ce8c..6987d6435b 100644
--- a/web/app/components/plugins/plugin-auth/authorize/__tests__/api-key-modal.spec.tsx
+++ b/web/app/components/plugins/plugin-auth/authorize/__tests__/api-key-modal.spec.tsx
@@ -55,10 +55,6 @@ vi.mock('../../../readme-panel/entrance', () => ({
   ReadmeEntrance: () => <div data-testid="readme-entrance" />,
 }))
 
-vi.mock('../../../readme-panel/store', () => ({
-  ReadmeShowType: { modal: 'modal' },
-}))
-
 vi.mock('@/app/components/base/encrypted-bottom', () => ({
   EncryptedBottom: () => <div data-testid="encrypted-bottom" />,
 }))
@@ -235,7 +231,7 @@ describe('ApiKeyModal', () => {
     const mockOnClose = vi.fn()
     render(<ApiKeyModal pluginPayload={basePayload} onClose={mockOnClose} />)
 
-    fireEvent.click(screen.getByTestId('modal-close'))
+    fireEvent.click(screen.getByRole('button', { name: /Close|operation.close/ }))
     expect(mockOnClose).toHaveBeenCalled()
   })
 
diff --git a/web/app/components/plugins/plugin-auth/authorize/__tests__/authorize-components.spec.tsx b/web/app/components/plugins/plugin-auth/authorize/__tests__/authorize-components.spec.tsx
index cba5c60654..3601d95a6b 100644
--- a/web/app/components/plugins/plugin-auth/authorize/__tests__/authorize-components.spec.tsx
+++ b/web/app/components/plugins/plugin-auth/authorize/__tests__/authorize-components.spec.tsx
@@ -440,7 +440,7 @@ describe('AddOAuthButton', () => {
         { wrapper: createWrapper() },
       )
 
-      expect(screen.getByRole('button').className).toContain('custom-class')
+      expect(screen.getByText('use oauth').closest('.custom-class')).toBeInTheDocument()
     })
 
     it('should use oAuthData prop when provided', () => {
@@ -580,8 +580,7 @@ describe('AddOAuthButton', () => {
 
       render(<AddOAuthButton pluginPayload={pluginPayload} />, { wrapper: createWrapper() })
 
-      // Click the settings icon using data-testid for reliable selection
-      const settingsButton = screen.getByTestId('oauth-settings-button')
+      const settingsButton = screen.getByRole('button', { name: /plugin\.auth\.oauthClientSettings/i })
       fireEvent.click(settingsButton)
 
       await waitFor(() => {
@@ -669,11 +668,7 @@ describe('AddOAuthButton', () => {
 
       render(<AddOAuthButton pluginPayload={pluginPayload} />, { wrapper: createWrapper() })
 
-      // Open settings by clicking the gear icon
-      const button = screen.getByRole('button')
-      const gearIconContainer = button.querySelector('[class*="shrink-0"][class*="w-8"]')
-      if (gearIconContainer)
-        fireEvent.click(gearIconContainer)
+      fireEvent.click(screen.getByRole('button', { name: /plugin\.auth\.oauthClientSettings/i }))
 
       await waitFor(() => {
         expect(screen.getByText('plugin.auth.oauthClientSettings')).toBeInTheDocument()
@@ -706,11 +701,7 @@ describe('AddOAuthButton', () => {
 
       render(<AddOAuthButton pluginPayload={pluginPayload} />, { wrapper: createWrapper() })
 
-      // Click the settings icon
-      const button = screen.getByRole('button')
-      const gearIconContainer = button.querySelector('[class*="shrink-0"][class*="w-8"]')
-      if (gearIconContainer)
-        fireEvent.click(gearIconContainer)
+      fireEvent.click(screen.getByRole('button', { name: /plugin\.auth\.oauthClientSettings/i }))
 
       await waitFor(() => {
         // OAuthClientSettings modal should open
diff --git a/web/app/components/plugins/plugin-auth/authorize/__tests__/oauth-client-settings.spec.tsx b/web/app/components/plugins/plugin-auth/authorize/__tests__/oauth-client-settings.spec.tsx
index d99e3514db..1a0e63c45e 100644
--- a/web/app/components/plugins/plugin-auth/authorize/__tests__/oauth-client-settings.spec.tsx
+++ b/web/app/components/plugins/plugin-auth/authorize/__tests__/oauth-client-settings.spec.tsx
@@ -41,10 +41,6 @@ vi.mock('../../../readme-panel/entrance', () => ({
   ReadmeEntrance: () => <div data-testid="readme-entrance" />,
 }))
 
-vi.mock('../../../readme-panel/store', () => ({
-  ReadmeShowType: { modal: 'modal' },
-}))
-
 vi.mock('@/app/components/base/form/form-scenarios/auth', () => {
   const MockAuthForm = ({ ref, ...props }: { ref?: React.Ref<unknown> } & Record<string, unknown>) => {
     mockAuthFormProps = props
@@ -209,7 +205,7 @@ describe('OAuthClientSettings', () => {
       />,
     )
 
-    fireEvent.click(screen.getByTestId('modal-close'))
+    fireEvent.click(screen.getByRole('button', { name: /operation\.cancel/i }))
     expect(mockOnClose).toHaveBeenCalled()
   })
 
@@ -217,7 +213,7 @@ describe('OAuthClientSettings', () => {
     const mockOnClose = vi.fn()
     render(<ControlledSettingsHarness OAuthClientSettings={OAuthClientSettings} onClose={mockOnClose} />)
 
-    fireEvent.click(screen.getByTestId('modal-close'))
+    fireEvent.click(screen.getByRole('button', { name: /operation\.cancel/i }))
 
     await waitFor(() => {
       expect(screen.getByTestId('modal-open-state')).toHaveTextContent('false')
@@ -225,7 +221,7 @@ describe('OAuthClientSettings', () => {
     expect(mockOnClose).toHaveBeenCalled()
   })
 
-  it('should close when backdrop is clicked', async () => {
+  it('should stay open when backdrop is clicked', () => {
     const mockOnClose = vi.fn()
     render(<ControlledSettingsHarness OAuthClientSettings={OAuthClientSettings} onClose={mockOnClose} />)
 
@@ -234,10 +230,8 @@ describe('OAuthClientSettings', () => {
 
     fireEvent.click(backdrop!)
 
-    await waitFor(() => {
-      expect(screen.getByTestId('modal-open-state')).toHaveTextContent('false')
-    })
-    expect(mockOnClose).toHaveBeenCalled()
+    expect(screen.getByTestId('modal-open-state')).toHaveTextContent('true')
+    expect(mockOnClose).not.toHaveBeenCalled()
   })
 
   it('should save settings on save only button click', async () => {
diff --git a/web/app/components/plugins/plugin-auth/authorize/add-oauth-button.tsx b/web/app/components/plugins/plugin-auth/authorize/add-oauth-button.tsx
index 41ef893db8..b2326d8ed0 100644
--- a/web/app/components/plugins/plugin-auth/authorize/add-oauth-button.tsx
+++ b/web/app/components/plugins/plugin-auth/authorize/add-oauth-button.tsx
@@ -187,19 +187,15 @@ const AddOAuthButton = ({
     <>
       {
         isConfigured && (
-          <Button
-            variant={buttonVariant}
-            className={cn(
-              'w-full px-0 py-0 hover:bg-components-button-primary-bg',
-              className,
-            )}
-            disabled={disabled}
-            onClick={handleOAuth}
-          >
-            <div className={cn(
-              'flex h-full w-0 grow items-center justify-center rounded-l-lg pl-0.5 hover:bg-components-button-primary-bg-hover',
-              buttonLeftClassName,
-            )}
+          <div className={cn('flex w-full', className)}>
+            <Button
+              variant={buttonVariant}
+              className={cn(
+                'h-8 min-w-0 flex-1 rounded-r-none px-0 py-0 hover:bg-components-button-primary-bg-hover',
+                buttonLeftClassName,
+              )}
+              disabled={disabled}
+              onClick={handleOAuth}
             >
               <div
                 className="truncate"
@@ -219,27 +215,28 @@ const AddOAuthButton = ({
                   </Badge>
                 )
               }
-            </div>
+            </Button>
             <div className={cn(
-              'h-4 w-px shrink-0 bg-text-primary-on-surface opacity-[0.15]',
+              'h-4 w-px shrink-0 self-center bg-text-primary-on-surface opacity-[0.15]',
               dividerClassName,
             )}
             >
             </div>
-            <div
-              data-testid="oauth-settings-button"
+            <Button
+              variant={buttonVariant}
+              aria-label={t('auth.oauthClientSettings', { ns: 'plugin' })}
               className={cn(
-                'flex h-full w-8 shrink-0 items-center justify-center rounded-r-lg hover:bg-components-button-primary-bg-hover',
+                'h-8 w-8 shrink-0 rounded-l-none px-0 py-0 hover:bg-components-button-primary-bg-hover',
                 buttonRightClassName,
               )}
-              onClick={(e) => {
-                e.stopPropagation()
+              disabled={disabled}
+              onClick={() => {
                 openOAuthSettings()
               }}
             >
-              <span className="i-ri-equalizer-2-line h-4 w-4" />
-            </div>
-          </Button>
+              <span className="i-ri-equalizer-2-line h-4 w-4" aria-hidden="true" />
+            </Button>
+          </div>
         )
       }
       {
diff --git a/web/app/components/plugins/plugin-auth/authorize/api-key-modal.tsx b/web/app/components/plugins/plugin-auth/authorize/api-key-modal.tsx
index e01886ccde..90e44cc5ec 100644
--- a/web/app/components/plugins/plugin-auth/authorize/api-key-modal.tsx
+++ b/web/app/components/plugins/plugin-auth/authorize/api-key-modal.tsx
@@ -19,7 +19,6 @@ import AuthForm from '@/app/components/base/form/form-scenarios/auth'
 import { FormTypeEnum } from '@/app/components/base/form/types'
 import Loading from '@/app/components/base/loading'
 import { ReadmeEntrance } from '../../readme-panel/entrance'
-import { ReadmeShowType } from '../../readme-panel/store'
 import {
   useAddPluginCredentialHook,
   useGetPluginCredentialSchemaHook,
@@ -153,13 +152,12 @@ const ApiKeyModal = ({
               {t('auth.useApiAuthDesc', { ns: 'plugin' })}
             </div>
             <DialogCloseButton
-              data-testid="modal-close"
               className="top-5 right-5 h-8 w-8 rounded-lg"
             />
           </div>
           <div className="min-h-0 flex-1 overflow-y-auto px-6 py-3">
             {pluginPayload.detail && (
-              <ReadmeEntrance pluginDetail={pluginPayload.detail} showType={ReadmeShowType.modal} />
+              <ReadmeEntrance pluginDetail={pluginPayload.detail} presentation="dialog" />
             )}
             {
               isLoading && (
diff --git a/web/app/components/plugins/plugin-auth/authorize/oauth-client-settings.tsx b/web/app/components/plugins/plugin-auth/authorize/oauth-client-settings.tsx
index d06ecf1d60..9f4c5cc046 100644
--- a/web/app/components/plugins/plugin-auth/authorize/oauth-client-settings.tsx
+++ b/web/app/components/plugins/plugin-auth/authorize/oauth-client-settings.tsx
@@ -19,7 +19,6 @@ import {
 import { useTranslation } from 'react-i18next'
 import AuthForm from '@/app/components/base/form/form-scenarios/auth'
 import { ReadmeEntrance } from '../../readme-panel/entrance'
-import { ReadmeShowType } from '../../readme-panel/store'
 import {
   useDeletePluginOAuthCustomClientHook,
   useInvalidPluginOAuthClientSchemaHook,
@@ -138,6 +137,7 @@ const OAuthClientSettings = ({
   return (
     <Dialog
       open={open}
+      disablePointerDismissal
       onOpenChange={handleOpenChange}
     >
       <DialogContent
@@ -150,13 +150,12 @@ const OAuthClientSettings = ({
               {t('auth.oauthClientSettings', { ns: 'plugin' })}
             </DialogTitle>
             <DialogCloseButton
-              data-testid="modal-x-close"
               className="top-5 right-5 h-8 w-8 rounded-lg"
             />
           </div>
           <div className="min-h-0 flex-1 overflow-y-auto px-6 py-3 pt-0">
             {pluginPayload.detail && (
-              <ReadmeEntrance pluginDetail={pluginPayload.detail} showType={ReadmeShowType.modal} />
+              <ReadmeEntrance pluginDetail={pluginPayload.detail} presentation="dialog" />
             )}
             <AuthForm
               formFromProps={form}
@@ -182,7 +181,6 @@ const OAuthClientSettings = ({
             </div>
             <div className="flex items-center">
               <Button
-                data-testid="modal-close"
                 variant="secondary"
                 onClick={() => handleOpenChange(false)}
                 disabled={isDisabled}
diff --git a/web/app/components/plugins/plugin-auth/authorized/__tests__/index.spec.tsx b/web/app/components/plugins/plugin-auth/authorized/__tests__/index.spec.tsx
index 271252464a..9eb1ce3d26 100644
--- a/web/app/components/plugins/plugin-auth/authorized/__tests__/index.spec.tsx
+++ b/web/app/components/plugins/plugin-auth/authorized/__tests__/index.spec.tsx
@@ -1427,7 +1427,7 @@ describe('Authorized Component', () => {
       expect(document.querySelector('.custom-popup-class'))!.toBeInTheDocument()
     })
 
-    it('should pass placement to PortalToFollowElem', () => {
+    it('should pass placement to Popover', () => {
       const pluginPayload = createPluginPayload()
       const credentials = [createCredential()]
 
diff --git a/web/app/components/plugins/plugin-detail-panel/app-selector/__tests__/app-picker.spec.tsx b/web/app/components/plugins/plugin-detail-panel/app-selector/__tests__/app-picker.spec.tsx
deleted file mode 100644
index af3f97c889..0000000000
--- a/web/app/components/plugins/plugin-detail-panel/app-selector/__tests__/app-picker.spec.tsx
+++ /dev/null
@@ -1,181 +0,0 @@
-import type { ReactNode } from 'react'
-import { fireEvent, render, screen } from '@testing-library/react'
-import { beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'
-import { AppModeEnum } from '@/types/app'
-import AppPicker from '../app-picker'
-
-class MockIntersectionObserver {
-  observe = vi.fn()
-  disconnect = vi.fn()
-  unobserve = vi.fn()
-}
-
-class MockMutationObserver {
-  observe = vi.fn()
-  disconnect = vi.fn()
-  takeRecords = vi.fn().mockReturnValue([])
-}
-
-beforeAll(() => {
-  vi.stubGlobal('IntersectionObserver', MockIntersectionObserver)
-  vi.stubGlobal('MutationObserver', MockMutationObserver)
-})
-
-vi.mock('@/app/components/base/app-icon', () => ({
-  default: () => <div data-testid="app-icon" />,
-}))
-
-vi.mock('@/app/components/base/input', () => ({
-  default: ({
-    value,
-    onChange,
-    onClear,
-  }: {
-    value: string
-    onChange: (e: { target: { value: string } }) => void
-    onClear?: () => void
-  }) => (
-    <div>
-      <input
-        data-testid="search-input"
-        value={value}
-        onChange={e => onChange({ target: { value: e.target.value } })}
-      />
-      <button data-testid="clear-input" onClick={onClear}>Clear</button>
-    </div>
-  ),
-}))
-
-vi.mock('@langgenius/dify-ui/popover', () => ({
-  Popover: ({
-    children,
-    open,
-  }: {
-    children: ReactNode
-    open: boolean
-  }) => (
-    <div data-testid="portal" data-open={open}>
-      {children}
-    </div>
-  ),
-  PopoverTrigger: ({
-    children,
-    render,
-    onClick,
-  }: {
-    children: ReactNode
-    render?: ReactNode
-    onClick?: () => void
-  }) => (
-    <button data-testid="picker-trigger" onClick={onClick}>
-      {render ?? children}
-    </button>
-  ),
-  PopoverContent: ({ children }: { children: ReactNode }) => (
-    <div data-testid="portal-content">{children}</div>
-  ),
-}))
-
-const apps = [
-  {
-    id: 'app-1',
-    name: 'Chat App',
-    mode: AppModeEnum.CHAT,
-    icon_type: 'emoji',
-    icon: '🤖',
-    icon_background: '#fff',
-  },
-  {
-    id: 'app-2',
-    name: 'Workflow App',
-    mode: AppModeEnum.WORKFLOW,
-    icon_type: 'emoji',
-    icon: '⚙️',
-    icon_background: '#fff',
-  },
-]
-
-describe('AppPicker', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it('should open when the trigger is clicked', () => {
-    const onShowChange = vi.fn()
-
-    render(
-      <AppPicker
-        scope="all"
-        disabled={false}
-        trigger={<span>Trigger</span>}
-        isShow={false}
-        onShowChange={onShowChange}
-        onSelect={vi.fn()}
-        apps={apps as never}
-        isLoading={false}
-        hasMore={false}
-        onLoadMore={vi.fn()}
-        searchText=""
-        onSearchChange={vi.fn()}
-      />,
-    )
-
-    fireEvent.click(screen.getByTestId('picker-trigger'))
-
-    expect(onShowChange).toHaveBeenCalledWith(true)
-  })
-
-  it('should render apps, select one, and handle search changes', () => {
-    const onSelect = vi.fn()
-    const onSearchChange = vi.fn()
-
-    render(
-      <AppPicker
-        scope="all"
-        disabled={false}
-        trigger={<span>Trigger</span>}
-        isShow
-        onShowChange={vi.fn()}
-        onSelect={onSelect}
-        apps={apps as never}
-        isLoading={false}
-        hasMore={false}
-        onLoadMore={vi.fn()}
-        searchText="chat"
-        onSearchChange={onSearchChange}
-      />,
-    )
-
-    fireEvent.change(screen.getByTestId('search-input'), {
-      target: { value: 'workflow' },
-    })
-    fireEvent.click(screen.getByText('Workflow App'))
-    fireEvent.click(screen.getByTestId('clear-input'))
-
-    expect(onSearchChange).toHaveBeenCalledWith('workflow')
-    expect(onSearchChange).toHaveBeenCalledWith('')
-    expect(onSelect).toHaveBeenCalledWith(apps[1])
-    expect(screen.getByText('chat')).toBeInTheDocument()
-  })
-
-  it('should render loading text when loading more apps', () => {
-    render(
-      <AppPicker
-        scope="all"
-        disabled={false}
-        trigger={<span>Trigger</span>}
-        isShow
-        onShowChange={vi.fn()}
-        onSelect={vi.fn()}
-        apps={apps as never}
-        isLoading
-        hasMore
-        onLoadMore={vi.fn()}
-        searchText=""
-        onSearchChange={vi.fn()}
-      />,
-    )
-
-    expect(screen.getByText('common.loading')).toBeInTheDocument()
-  })
-})
diff --git a/web/app/components/plugins/plugin-detail-panel/app-selector/__tests__/app-trigger.spec.tsx b/web/app/components/plugins/plugin-detail-panel/app-selector/__tests__/app-trigger.spec.tsx
deleted file mode 100644
index 1b6ac7f1f0..0000000000
--- a/web/app/components/plugins/plugin-detail-panel/app-selector/__tests__/app-trigger.spec.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import { render, screen } from '@testing-library/react'
-import * as React from 'react'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-vi.mock('@/app/components/base/app-icon', () => ({
-  default: ({ size }: { size: string }) => <div data-testid="app-icon" data-size={size} />,
-}))
-
-vi.mock('@langgenius/dify-ui/cn', () => ({
-  cn: (...args: unknown[]) => args.filter(Boolean).join(' '),
-}))
-
-describe('AppTrigger', () => {
-  let AppTrigger: (typeof import('../app-trigger'))['default']
-
-  beforeEach(async () => {
-    vi.clearAllMocks()
-    const mod = await import('../app-trigger')
-    AppTrigger = mod.default
-  })
-
-  it('should render placeholder when no app is selected', () => {
-    render(<AppTrigger open={false} />)
-
-    expect(screen.queryByTestId('app-icon')).not.toBeInTheDocument()
-  })
-
-  it('should render app details when appDetail is provided', () => {
-    const appDetail = {
-      name: 'My App',
-      icon_type: 'emoji',
-      icon: '🤖',
-      icon_background: '#fff',
-    }
-    render(<AppTrigger open={false} appDetail={appDetail as never} />)
-
-    expect(screen.getByTestId('app-icon')).toBeInTheDocument()
-    expect(screen.getByText('My App')).toBeInTheDocument()
-  })
-
-  it('should render when open', () => {
-    const { container } = render(<AppTrigger open={true} />)
-
-    expect(container.firstChild).toBeInTheDocument()
-  })
-})
diff --git a/web/app/components/plugins/plugin-detail-panel/app-selector/__tests__/index.spec.tsx b/web/app/components/plugins/plugin-detail-panel/app-selector/__tests__/index.spec.tsx
index d67be38ab4..8810d35b28 100644
--- a/web/app/components/plugins/plugin-detail-panel/app-selector/__tests__/index.spec.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/app-selector/__tests__/index.spec.tsx
@@ -1,2582 +1,201 @@
 import type { ReactNode } from 'react'
+import type { AppSelectorValue } from '../index'
 import type { App } from '@/types/app'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
-import { act, fireEvent, render, screen } from '@testing-library/react'
-import * as React from 'react'
+import { fireEvent, render, screen, waitFor } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { useState } from 'react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { InputVarType } from '@/app/components/workflow/types'
 import { AppModeEnum } from '@/types/app'
-import AppInputsForm from '../app-inputs-form'
-import AppInputsPanel from '../app-inputs-panel'
-import AppPicker from '../app-picker'
-import AppTrigger from '../app-trigger'
+import { AppSelector } from '../index'
 
-import AppSelector from '../index'
-
-// ==================== Mock Setup ====================
-
-// Mock IntersectionObserver globally using class syntax
-let intersectionObserverCallback: IntersectionObserverCallback | null = null
-const mockIntersectionObserver = {
-  observe: vi.fn(),
-  disconnect: vi.fn(),
-  unobserve: vi.fn(),
-  root: null,
-  rootMargin: '',
-  thresholds: [],
-  takeRecords: vi.fn().mockReturnValue([]),
-} as unknown as IntersectionObserver
-
-// Helper function to trigger intersection observer callback
-const triggerIntersection = (entries: IntersectionObserverEntry[]) => {
-  if (intersectionObserverCallback) {
-    intersectionObserverCallback(entries, mockIntersectionObserver)
-  }
-}
-
-class MockIntersectionObserver {
-  constructor(callback: IntersectionObserverCallback) {
-    intersectionObserverCallback = callback
-  }
-
-  observe = vi.fn()
-  disconnect = vi.fn()
-  unobserve = vi.fn()
-}
-
-// Mock MutationObserver globally using class syntax
-let mutationObserverCallback: MutationCallback | null = null
-
-class MockMutationObserver {
-  constructor(callback: MutationCallback) {
-    mutationObserverCallback = callback
-  }
-
-  observe = vi.fn()
-  disconnect = vi.fn()
-  takeRecords = vi.fn().mockReturnValue([])
-}
-
-// Helper function to trigger mutation observer callback
-const triggerMutationObserver = () => {
-  if (mutationObserverCallback) {
-    mutationObserverCallback([], new MockMutationObserver(() => {}))
-  }
-}
-
-// Set up global mocks before tests
-beforeAll(() => {
-  vi.stubGlobal('IntersectionObserver', MockIntersectionObserver)
-  vi.stubGlobal('MutationObserver', MockMutationObserver)
-})
-
-afterAll(() => {
-  vi.unstubAllGlobals()
-})
-
-// Mock portal components for controlled positioning in tests
-// Use React context to properly scope open state per portal instance (for nested portals)
-vi.mock('@langgenius/dify-ui/popover', () => {
-  // Context reference shared across mock components
-  let sharedContext: React.Context<boolean> | null = null
-
-  // Lazily get or create the context
-  const getContext = (): React.Context<boolean> => {
-    if (!sharedContext) {
-      const PortalOpenContext = React.createContext(false)
-      sharedContext = PortalOpenContext
-    }
-    return sharedContext
-  }
-
-  return {
-    Popover: ({
-      children,
-      open,
-    }: {
-      children: ReactNode
-      open?: boolean
-    }) => {
-      const Context = getContext()
-      return React.createElement(
-        Context.Provider,
-        { value: open || false },
-        React.createElement('div', { 'data-testid': 'portal-to-follow-elem', 'data-open': open }, children),
-      )
-    },
-    PopoverTrigger: ({
-      children,
-      render,
-      onClick,
-      className,
-    }: {
-      children: ReactNode
-      render?: ReactNode
-      onClick?: () => void
-      className?: string
-    }) => (
-      <div data-testid="portal-trigger" onClick={onClick} className={className}>
-        {render ?? children}
-      </div>
-    ),
-    PopoverContent: ({ children, className }: { children: ReactNode, className?: string }) => {
-      const Context = getContext()
-      const isOpen = React.useContext(Context)
-      if (!isOpen)
-        return null
-      return (
-        <div data-testid="portal-content" className={className}>{children}</div>
-      )
-    },
-  }
-})
-
-// Mock service hooks
-let mockAppListData: { pages: Array<{ data: App[], has_more: boolean, page: number }> } | undefined
-let mockIsLoading = false
-let mockIsFetchingNextPage = false
-let mockHasNextPage = true
-const mockFetchNextPage = vi.fn()
-
-// Allow configurable mock data for useAppDetail
-let mockAppDetailData: App | undefined | null
-let mockAppDetailLoading = false
-
-// Helper to get app detail data - avoids nested ternary and hoisting issues
-const getAppDetailData = (appId: string) => {
-  if (mockAppDetailData !== undefined)
-    return mockAppDetailData
-  if (!appId)
-    return undefined
-  // Extract number from appId (e.g., 'app-1' -> '1') for consistent naming with createMockApps
-  const appNumber = appId.replace('app-', '')
-  // Return a basic mock app structure
-  return {
-    id: appId,
-    name: `App ${appNumber}`,
-    mode: 'chat',
+const apps: App[] = [
+  {
+    id: 'app-1',
+    name: 'Support Bot',
+    mode: AppModeEnum.CHAT,
     icon_type: 'emoji',
     icon: '🤖',
     icon_background: '#FFEAD5',
-    model_config: { user_input_form: [] },
-  }
-}
+    model_config: {
+      user_input_form: [],
+    },
+  } as unknown as App,
+  {
+    id: 'app-2',
+    name: 'Workflow App',
+    mode: AppModeEnum.WORKFLOW,
+    icon_type: 'emoji',
+    icon: '⚙️',
+    icon_background: '#E0EAFF',
+  } as unknown as App,
+]
+
+vi.mock('@/service/client', () => ({
+  consoleQuery: {
+    apps: {
+      list: {
+        infiniteOptions: ({
+          input,
+          getNextPageParam,
+          initialPageParam,
+          placeholderData,
+        }: {
+          input: (pageParam: number) => { query: { name?: string } }
+          getNextPageParam: (lastPage: { has_more: boolean, page: number }) => number | undefined
+          initialPageParam: number
+          placeholderData: unknown
+        }) => ({
+          queryKey: ['apps', input(1).query],
+          queryFn: ({ pageParam = initialPageParam }: { pageParam?: number }) => {
+            const query = input(Number(pageParam)).query
+            const keyword = query.name?.toLowerCase() ?? ''
+            const filteredApps = keyword
+              ? apps.filter(app => app.name.toLowerCase().includes(keyword))
+              : apps
+
+            return {
+              data: filteredApps,
+              has_more: false,
+              page: Number(pageParam),
+            }
+          },
+          getNextPageParam,
+          initialPageParam,
+          placeholderData,
+        }),
+      },
+    },
+  },
+}))
 
 vi.mock('@/service/use-apps', () => ({
-  useInfiniteAppList: () => ({
-    data: mockAppListData,
-    isLoading: mockIsLoading,
-    isFetchingNextPage: mockIsFetchingNextPage,
-    fetchNextPage: mockFetchNextPage,
-    hasNextPage: mockHasNextPage,
-  }),
   useAppDetail: (appId: string) => ({
-    data: getAppDetailData(appId),
-    isFetching: mockAppDetailLoading,
+    data: apps.find(app => app.id === appId),
   }),
 }))
 
-// Allow configurable mock data for useAppWorkflow
-let mockWorkflowData: Record<string, unknown> | undefined | null
-let mockWorkflowLoading = false
-
-// Helper to get workflow data - avoids nested ternary
-const getWorkflowData = (appId: string) => {
-  if (mockWorkflowData !== undefined)
-    return mockWorkflowData
-  if (!appId)
-    return undefined
-  return {
-    graph: {
-      nodes: [
-        {
-          data: {
-            type: 'start',
-            variables: [
-              { type: 'text-input', label: 'Name', variable: 'name', required: false },
-            ],
-          },
-        },
-      ],
-    },
-    features: {},
-  }
-}
+vi.mock('@/service/use-common', () => ({
+  useFileUploadConfig: () => ({ data: undefined }),
+}))
 
 vi.mock('@/service/use-workflow', () => ({
-  useAppWorkflow: (appId: string) => ({
-    data: getWorkflowData(appId),
-    isFetching: mockWorkflowLoading,
-  }),
+  useAppWorkflow: () => ({ data: undefined, isFetching: false }),
 }))
 
-// Mock common service
-vi.mock('@/service/use-common', () => ({
-  useFileUploadConfig: () => ({
-    data: {
-      image_file_size_limit: 10,
-      file_size_limit: 15,
-      audio_file_size_limit: 50,
-      video_file_size_limit: 100,
-      workflow_file_upload_limit: 10,
-    },
-  }),
-}))
-
-// Mock file uploader
-vi.mock('@/app/components/base/file-uploader', () => ({
-  FileUploaderInAttachmentWrapper: ({ onChange, value }: { onChange: (files: unknown[]) => void, value: unknown[] }) => (
-    <div data-testid="file-uploader">
-      <span data-testid="file-value">{JSON.stringify(value)}</span>
-      <button
-        data-testid="upload-file-btn"
-        onClick={() => onChange([{ id: 'file-1', name: 'test.png' }])}
-      >
-        Upload
-      </button>
-      <button
-        data-testid="upload-multi-files-btn"
-        onClick={() => onChange([{ id: 'file-1' }, { id: 'file-2' }])}
-      >
-        Upload Multiple
-      </button>
-    </div>
-  ),
-}))
-
-// Mock Select for testing select field interactions
-vi.mock('@langgenius/dify-ui/select', async () => {
-  const React = await import('react')
-  const SelectContext = React.createContext<{
-    onValueChange?: (value: string) => void
-  }>({})
-
-  return {
-    Select: ({ children, onValueChange }: {
-      children: React.ReactNode
-      onValueChange?: (value: string) => void
-    }) => (
-      <SelectContext.Provider value={{ onValueChange }}>
-        <div data-testid="portal-select">{children}</div>
-      </SelectContext.Provider>
-    ),
-    SelectTrigger: ({ children }: { children: React.ReactNode }) => (
-      <span data-testid="select-value">{children}</span>
-    ),
-    SelectContent: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
-    SelectItem: ({ children, value }: { children: React.ReactNode, value: string }) => {
-      const context = React.useContext(SelectContext)
-      return (
-        <button
-          key={value}
-          data-testid={`select-option-${value}`}
-          onClick={() => context.onValueChange?.(value)}
-        >
-          {children}
-        </button>
-      )
-    },
-    SelectItemText: ({ children }: { children: React.ReactNode }) => <>{children}</>,
-    SelectItemIndicator: () => null,
-  }
-})
-
-// Mock Input component with onClear support
-vi.mock('@/app/components/base/input', () => ({
-  default: ({ onChange, onClear, value, showClearIcon, ...props }: {
-    onChange: (e: { target: { value: string } }) => void
-    onClear?: () => void
-    value: string
-    showClearIcon?: boolean
-    placeholder?: string
-  }) => (
-    <div data-testid="input-wrapper">
-      <input
-        data-testid="input"
-        value={value}
-        onChange={onChange}
-        {...props}
-      />
-      {showClearIcon && onClear && (
-        <button data-testid="clear-btn" onClick={onClear}>Clear</button>
-      )}
-    </div>
-  ),
-}))
-
-// ==================== Test Utilities ====================
-
-const createTestQueryClient = () =>
-  new QueryClient({
+function renderWithQueryClient(children: ReactNode) {
+  const queryClient = new QueryClient({
     defaultOptions: {
-      queries: { retry: false },
-      mutations: { retry: false },
+      queries: {
+        retry: false,
+      },
     },
   })
 
-const renderWithQueryClient = (ui: React.ReactElement) => {
-  const queryClient = createTestQueryClient()
   return render(
     <QueryClientProvider client={queryClient}>
-      {ui}
+      {children}
     </QueryClientProvider>,
   )
 }
 
-// Mock data factories
-const createMockApp = (overrides: Record<string, unknown> = {}): App => ({
-  id: 'app-1',
-  name: 'Test App',
-  description: 'A test app',
-  mode: AppModeEnum.CHAT,
-  icon_type: 'emoji',
-  icon: '🤖',
-  icon_background: '#FFEAD5',
-  icon_url: null,
-  use_icon_as_answer_icon: false,
-  enable_site: true,
-  enable_api: true,
-  api_rpm: 60,
-  api_rph: 3600,
-  is_demo: false,
-  model_config: {
-    provider: 'openai',
-    model_id: 'gpt-4',
-    model: {
-      provider: 'openai',
-      name: 'gpt-4',
-      mode: 'chat',
-      completion_params: {},
-    },
-    configs: {
-      prompt_template: '',
-      prompt_variables: [],
-      completion_params: {},
-    },
-    opening_statement: '',
-    suggested_questions: [],
-    suggested_questions_after_answer: { enabled: false },
-    speech_to_text: { enabled: false },
-    text_to_speech: { enabled: false, voice: '', language: '' },
-    retriever_resource: { enabled: false },
-    annotation_reply: { enabled: false },
-    more_like_this: { enabled: false },
-    sensitive_word_avoidance: { enabled: false },
-    external_data_tools: [],
-    dataSets: [],
-    agentMode: { enabled: false, strategy: null, tools: [] },
-    chatPromptConfig: {},
-    completionPromptConfig: {},
-    file_upload: {},
-    user_input_form: [],
-  },
-  app_model_config: {},
-  created_at: Date.now(),
-  updated_at: Date.now(),
-  site: {},
-  api_base_url: '',
-  tags: [],
-  access_mode: 'public',
-  ...overrides,
-} as unknown as App)
+function StatefulAppSelector({
+  onSelect,
+}: {
+  onSelect: (value: AppSelectorValue) => void
+}) {
+  const [value, setValue] = useState<AppSelectorValue>()
 
-// Helper function to get app mode based on index
-const getAppModeByIndex = (index: number): AppModeEnum => {
-  if (index % 5 === 0)
-    return AppModeEnum.ADVANCED_CHAT
-  if (index % 4 === 0)
-    return AppModeEnum.AGENT_CHAT
-  if (index % 3 === 0)
-    return AppModeEnum.WORKFLOW
-  if (index % 2 === 0)
-    return AppModeEnum.COMPLETION
-  return AppModeEnum.CHAT
+  return (
+    <AppSelector
+      value={value}
+      onSelect={(nextValue) => {
+        setValue(nextValue)
+        onSelect(nextValue)
+      }}
+    />
+  )
 }
 
-const createMockApps = (count: number): App[] => {
-  return Array.from({ length: count }, (_, i) =>
-    createMockApp({
-      id: `app-${i + 1}`,
-      name: `App ${i + 1}`,
-      mode: getAppModeByIndex(i),
-    }))
-}
-
-// ==================== AppTrigger Tests ====================
-
-describe('AppTrigger', () => {
-  describe('Rendering', () => {
-    it('should render placeholder when no app is selected', () => {
-      render(<AppTrigger open={false} />)
-      // i18n mock returns key with namespace in dot format
-      // i18n mock returns key with namespace in dot format
-      expect(screen.getByText('app.appSelector.placeholder'))!.toBeInTheDocument()
-    })
-
-    it('should render app details when app is selected', () => {
-      const app = createMockApp({ name: 'My Test App' })
-      render(<AppTrigger open={false} appDetail={app} />)
-      expect(screen.getByText('My Test App'))!.toBeInTheDocument()
-    })
-
-    it('should apply open state styling', () => {
-      const { container } = render(<AppTrigger open={true} />)
-      const trigger = container.querySelector('.bg-state-base-hover-alt')
-      expect(trigger)!.toBeInTheDocument()
-    })
-
-    it('should render AppIcon when app is provided', () => {
-      const app = createMockApp()
-      const { container } = render(<AppTrigger open={false} appDetail={app} />)
-      // AppIcon renders with a specific class when app is provided
-      const iconContainer = container.querySelector('.mr-2')
-      expect(iconContainer)!.toBeInTheDocument()
-    })
-  })
-
-  describe('Props', () => {
-    it('should handle undefined appDetail gracefully', () => {
-      render(<AppTrigger open={false} appDetail={undefined} />)
-      expect(screen.getByText('app.appSelector.placeholder'))!.toBeInTheDocument()
-    })
-
-    it('should display app name with title attribute', () => {
-      const app = createMockApp({ name: 'Long App Name For Testing' })
-      render(<AppTrigger open={false} appDetail={app} />)
-      const nameElement = screen.getByTitle('Long App Name For Testing')
-      expect(nameElement)!.toBeInTheDocument()
-    })
-  })
-
-  describe('Styling', () => {
-    it('should have correct base classes', () => {
-      const { container } = render(<AppTrigger open={false} />)
-      const trigger = container.firstChild as HTMLElement
-      expect(trigger)!.toHaveClass('group', 'flex', 'cursor-pointer')
-    })
-
-    it('should apply different padding when app is provided', () => {
-      const app = createMockApp()
-      const { container } = render(<AppTrigger open={false} appDetail={app} />)
-      const trigger = container.firstChild as HTMLElement
-      expect(trigger)!.toHaveClass('py-1.5', 'pl-1.5')
-    })
-  })
-})
-
-// ==================== AppPicker Tests ====================
-
-describe('AppPicker', () => {
-  const defaultProps = {
-    scope: 'all',
-    disabled: false,
-    trigger: <button>Select App</button>,
-    placement: 'right-start' as const,
-    offset: 0,
-    isShow: false,
-    onShowChange: vi.fn(),
-    onSelect: vi.fn(),
-    apps: createMockApps(5),
-    isLoading: false,
-    hasMore: false,
-    onLoadMore: vi.fn(),
-    searchText: '',
-    onSearchChange: vi.fn(),
-  }
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    vi.useFakeTimers()
-  })
-
-  afterEach(() => {
-    vi.useRealTimers()
-  })
-
-  describe('Rendering', () => {
-    it('should render trigger element', () => {
-      render(<AppPicker {...defaultProps} />)
-      expect(screen.getByText('Select App'))!.toBeInTheDocument()
-    })
-
-    it('should render app list when open', () => {
-      render(<AppPicker {...defaultProps} isShow={true} />)
-      expect(screen.getByText('App 1'))!.toBeInTheDocument()
-      expect(screen.getByText('App 2'))!.toBeInTheDocument()
-    })
-
-    it('should show loading indicator when isLoading is true', () => {
-      render(<AppPicker {...defaultProps} isShow={true} isLoading={true} />)
-      expect(screen.getByText('common.loading'))!.toBeInTheDocument()
-    })
-
-    it('should not render content when isShow is false', () => {
-      render(<AppPicker {...defaultProps} isShow={false} />)
-      expect(screen.queryByText('App 1')).not.toBeInTheDocument()
-    })
-  })
-
-  describe('User Interactions', () => {
-    it('should call onSelect when app is clicked', () => {
-      const onSelect = vi.fn()
-      render(<AppPicker {...defaultProps} isShow={true} onSelect={onSelect} />)
-
-      fireEvent.click(screen.getByText('App 1'))
-      expect(onSelect).toHaveBeenCalledWith(expect.objectContaining({ id: 'app-1' }))
-    })
-
-    it('should call onSearchChange when typing in search input', () => {
-      const onSearchChange = vi.fn()
-      render(<AppPicker {...defaultProps} isShow={true} onSearchChange={onSearchChange} />)
-
-      const input = screen.getByRole('textbox')
-      fireEvent.change(input, { target: { value: 'test' } })
-      expect(onSearchChange).toHaveBeenCalledWith('test')
-    })
-
-    it('should not call onShowChange when disabled', () => {
-      const onShowChange = vi.fn()
-      render(<AppPicker {...defaultProps} disabled={true} onShowChange={onShowChange} />)
-
-      fireEvent.click(screen.getByTestId('portal-trigger'))
-      expect(onShowChange).not.toHaveBeenCalled()
-    })
-
-    it('should call onShowChange when trigger is clicked and not disabled', () => {
-      const onShowChange = vi.fn()
-      render(<AppPicker {...defaultProps} disabled={false} onShowChange={onShowChange} />)
-
-      fireEvent.click(screen.getByTestId('portal-trigger'))
-      expect(onShowChange).toHaveBeenCalledWith(true)
-    })
-  })
-
-  describe('App Type Display', () => {
-    it('should display correct app type for CHAT', () => {
-      const apps = [createMockApp({ id: 'chat-app', name: 'Chat App', mode: AppModeEnum.CHAT })]
-      render(<AppPicker {...defaultProps} isShow={true} apps={apps} />)
-      expect(screen.getByText('chat'))!.toBeInTheDocument()
-    })
-
-    it('should display correct app type for WORKFLOW', () => {
-      const apps = [createMockApp({ id: 'workflow-app', name: 'Workflow App', mode: AppModeEnum.WORKFLOW })]
-      render(<AppPicker {...defaultProps} isShow={true} apps={apps} />)
-      expect(screen.getByText('workflow'))!.toBeInTheDocument()
-    })
-
-    it('should display correct app type for ADVANCED_CHAT', () => {
-      const apps = [createMockApp({ id: 'chatflow-app', name: 'Chatflow App', mode: AppModeEnum.ADVANCED_CHAT })]
-      render(<AppPicker {...defaultProps} isShow={true} apps={apps} />)
-      expect(screen.getByText('chatflow'))!.toBeInTheDocument()
-    })
-
-    it('should display correct app type for AGENT_CHAT', () => {
-      const apps = [createMockApp({ id: 'agent-app', name: 'Agent App', mode: AppModeEnum.AGENT_CHAT })]
-      render(<AppPicker {...defaultProps} isShow={true} apps={apps} />)
-      expect(screen.getByText('agent'))!.toBeInTheDocument()
-    })
-
-    it('should display correct app type for COMPLETION', () => {
-      const apps = [createMockApp({ id: 'completion-app', name: 'Completion App', mode: AppModeEnum.COMPLETION })]
-      render(<AppPicker {...defaultProps} isShow={true} apps={apps} />)
-      expect(screen.getByText('completion'))!.toBeInTheDocument()
-    })
-  })
-
-  describe('Edge Cases', () => {
-    it('should handle empty apps array', () => {
-      render(<AppPicker {...defaultProps} isShow={true} apps={[]} />)
-      expect(screen.queryByRole('listitem')).not.toBeInTheDocument()
-    })
-
-    it('should handle search text with value', () => {
-      render(<AppPicker {...defaultProps} isShow={true} searchText="test search" />)
-      const input = screen.getByTestId('input')
-      expect(input)!.toHaveValue('test search')
-    })
-  })
-
-  describe('Search Clear', () => {
-    it('should call onSearchChange with empty string when clear button is clicked', () => {
-      const onSearchChange = vi.fn()
-      render(<AppPicker {...defaultProps} isShow={true} searchText="test" onSearchChange={onSearchChange} />)
-
-      const clearBtn = screen.getByTestId('clear-btn')
-      fireEvent.click(clearBtn)
-      expect(onSearchChange).toHaveBeenCalledWith('')
-    })
-  })
-
-  describe('Infinite Scroll', () => {
-    it('should not call onLoadMore when isLoading is true', () => {
-      const onLoadMore = vi.fn()
-
-      render(<AppPicker {...defaultProps} isShow={true} hasMore={true} isLoading={true} onLoadMore={onLoadMore} />)
-
-      // Simulate intersection
-      triggerIntersection([{ isIntersecting: true } as IntersectionObserverEntry])
-
-      // onLoadMore should not be called because isLoading blocks it
-      expect(onLoadMore).not.toHaveBeenCalled()
-    })
-
-    it('should not call onLoadMore when hasMore is false', () => {
-      const onLoadMore = vi.fn()
-
-      render(<AppPicker {...defaultProps} isShow={true} hasMore={false} onLoadMore={onLoadMore} />)
-
-      // Simulate intersection
-      triggerIntersection([{ isIntersecting: true } as IntersectionObserverEntry])
-
-      // onLoadMore should not be called when hasMore is false
-      expect(onLoadMore).not.toHaveBeenCalled()
-    })
-
-    it('should call onLoadMore when intersection observer fires and conditions are met', () => {
-      const onLoadMore = vi.fn()
-
-      render(<AppPicker {...defaultProps} isShow={true} hasMore={true} isLoading={false} onLoadMore={onLoadMore} />)
-
-      // Simulate intersection
-      triggerIntersection([{ isIntersecting: true } as IntersectionObserverEntry])
-
-      expect(onLoadMore).toHaveBeenCalled()
-    })
-
-    it('should not call onLoadMore when target is not intersecting', () => {
-      const onLoadMore = vi.fn()
-
-      render(<AppPicker {...defaultProps} isShow={true} hasMore={true} isLoading={false} onLoadMore={onLoadMore} />)
-
-      // Simulate non-intersecting
-      triggerIntersection([{ isIntersecting: false } as IntersectionObserverEntry])
-
-      expect(onLoadMore).not.toHaveBeenCalled()
-    })
-
-    it('should handle observer target ref', () => {
-      render(<AppPicker {...defaultProps} isShow={true} hasMore={true} />)
-
-      // The component should render without errors
-      // The component should render without errors
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-
-    it('should handle isShow toggle correctly', () => {
-      const { rerender } = render(<AppPicker {...defaultProps} isShow={false} />)
-
-      // Change isShow to true
-      rerender(<AppPicker {...defaultProps} isShow={true} />)
-
-      // Then back to false
-      rerender(<AppPicker {...defaultProps} isShow={false} />)
-
-      // Should not crash
-      // Should not crash
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-
-    it('should setup intersection observer when isShow is true', () => {
-      render(<AppPicker {...defaultProps} isShow={true} hasMore={true} />)
-
-      // IntersectionObserver callback should have been set
-      expect(intersectionObserverCallback).not.toBeNull()
-    })
-
-    it('should disconnect observer when isShow changes from true to false', () => {
-      const { rerender } = render(<AppPicker {...defaultProps} isShow={true} />)
-
-      // Verify observer was set up
-      expect(intersectionObserverCallback).not.toBeNull()
-
-      // Change to not shown - should disconnect observer (lines 74-75)
-      rerender(<AppPicker {...defaultProps} isShow={false} />)
-
-      // Component should render without errors
-      // Component should render without errors
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-
-    it('should cleanup observer on component unmount', () => {
-      const { unmount } = render(<AppPicker {...defaultProps} isShow={true} />)
-
-      // Unmount should trigger cleanup without throwing
-      expect(() => unmount()).not.toThrow()
-    })
-
-    it('should handle MutationObserver callback when target becomes available', () => {
-      render(<AppPicker {...defaultProps} isShow={true} hasMore={true} />)
-
-      // Trigger MutationObserver callback (simulates DOM change)
-      triggerMutationObserver()
-
-      // Component should still work correctly
-      // Component should still work correctly
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-
-    it('should not setup IntersectionObserver when observerTarget is null', () => {
-      // When isShow is false, the observer target won't be in the DOM
-      render(<AppPicker {...defaultProps} isShow={false} />)
-
-      // The guard at line 84 should prevent setup
-      // The guard at line 84 should prevent setup
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-
-    it('should debounce onLoadMore calls using loadingRef', () => {
-      const onLoadMore = vi.fn()
-
-      render(<AppPicker {...defaultProps} isShow={true} hasMore={true} isLoading={false} onLoadMore={onLoadMore} />)
-
-      // First intersection should trigger onLoadMore
-      triggerIntersection([{ isIntersecting: true } as IntersectionObserverEntry])
-      expect(onLoadMore).toHaveBeenCalledTimes(1)
-
-      // Second immediate intersection should be blocked by loadingRef
-      triggerIntersection([{ isIntersecting: true } as IntersectionObserverEntry])
-      // Still only called once due to loadingRef debounce
-      expect(onLoadMore).toHaveBeenCalledTimes(1)
-
-      // After 500ms timeout, loadingRef should reset
-      act(() => {
-        vi.advanceTimersByTime(600)
-      })
-
-      // Now it can be called again
-      triggerIntersection([{ isIntersecting: true } as IntersectionObserverEntry])
-      expect(onLoadMore).toHaveBeenCalledTimes(2)
-    })
-
-    it('should reset loadingRef when the picker closes before the debounce timeout finishes', () => {
-      const onLoadMore = vi.fn()
-      const { rerender } = render(
-        <AppPicker {...defaultProps} isShow={true} hasMore={true} isLoading={false} onLoadMore={onLoadMore} />,
-      )
-
-      triggerIntersection([{ isIntersecting: true } as IntersectionObserverEntry])
-      expect(onLoadMore).toHaveBeenCalledTimes(1)
-
-      rerender(<AppPicker {...defaultProps} isShow={false} hasMore={true} isLoading={false} onLoadMore={onLoadMore} />)
-      rerender(<AppPicker {...defaultProps} isShow={true} hasMore={true} isLoading={false} onLoadMore={onLoadMore} />)
-
-      triggerIntersection([{ isIntersecting: true } as IntersectionObserverEntry])
-      expect(onLoadMore).toHaveBeenCalledTimes(2)
-    })
-
-    it('should reset loadingRef when the picker unmounts before the debounce timeout finishes', () => {
-      const onLoadMore = vi.fn()
-      const { unmount } = render(
-        <AppPicker {...defaultProps} isShow={true} hasMore={true} isLoading={false} onLoadMore={onLoadMore} />,
-      )
-
-      triggerIntersection([{ isIntersecting: true } as IntersectionObserverEntry])
-      expect(onLoadMore).toHaveBeenCalledTimes(1)
-
-      unmount()
-
-      render(<AppPicker {...defaultProps} isShow={true} hasMore={true} isLoading={false} onLoadMore={onLoadMore} />)
-
-      triggerIntersection([{ isIntersecting: true } as IntersectionObserverEntry])
-      expect(onLoadMore).toHaveBeenCalledTimes(2)
-    })
-  })
-
-  describe('Memoization', () => {
-    it('should be wrapped with React.memo', () => {
-      expect(AppPicker).toBeDefined()
-      const onSelect = vi.fn()
-      const { rerender } = render(<AppPicker {...defaultProps} onSelect={onSelect} />)
-      rerender(<AppPicker {...defaultProps} onSelect={onSelect} />)
-    })
-  })
-})
-
-// ==================== AppInputsForm Tests ====================
-
-describe('AppInputsForm', () => {
-  const mockInputsRef = { current: {} as Record<string, unknown> }
-
-  const defaultProps = {
-    inputsForms: [],
-    inputs: {} as Record<string, unknown>,
-    inputsRef: mockInputsRef,
-    onFormChange: vi.fn(),
-  }
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    mockInputsRef.current = {}
-  })
-
-  describe('Rendering', () => {
-    it('should return null when inputsForms is empty', () => {
-      const { container } = render(<AppInputsForm {...defaultProps} />)
-      expect(container.firstChild).toBeNull()
-    })
-
-    it('should render text input field', () => {
-      const forms = [
-        { type: InputVarType.textInput, label: 'Name', variable: 'name', required: false },
-      ]
-      render(<AppInputsForm {...defaultProps} inputsForms={forms} />)
-      expect(screen.getByText('Name'))!.toBeInTheDocument()
-      expect(screen.getByPlaceholderText('Name'))!.toBeInTheDocument()
-    })
-
-    it('should render number input field', () => {
-      const forms = [
-        { type: InputVarType.number, label: 'Count', variable: 'count', required: false },
-      ]
-      render(<AppInputsForm {...defaultProps} inputsForms={forms} />)
-      expect(screen.getByText('Count'))!.toBeInTheDocument()
-    })
-
-    it('should render paragraph (textarea) field', () => {
-      const forms = [
-        { type: InputVarType.paragraph, label: 'Description', variable: 'desc', required: false },
-      ]
-      render(<AppInputsForm {...defaultProps} inputsForms={forms} />)
-      expect(screen.getByText('Description'))!.toBeInTheDocument()
-    })
-
-    it('should render select field', () => {
-      const forms = [
-        { type: InputVarType.select, label: 'Select Option', variable: 'option', options: ['a', 'b'], required: false },
-      ]
-      render(<AppInputsForm {...defaultProps} inputsForms={forms} />)
-      // Label and placeholder both contain "Select Option"
-      expect(screen.getAllByText(/Select Option/).length).toBeGreaterThanOrEqual(1)
-    })
-
-    it('should render file uploader for single file', () => {
-      const forms = [
-        {
-          type: InputVarType.singleFile,
-          label: 'Single File Upload',
-          variable: 'file',
-          required: false,
-          allowed_file_types: ['image'],
-          allowed_file_extensions: ['.png'],
-          allowed_file_upload_methods: ['local_file'],
-        },
-      ]
-      render(<AppInputsForm {...defaultProps} inputsForms={forms} />)
-      expect(screen.getByText('Single File Upload'))!.toBeInTheDocument()
-      expect(screen.getByTestId('file-uploader'))!.toBeInTheDocument()
-    })
-
-    it('should render file uploader for single file with existing value', () => {
-      const existingFile = { id: 'existing-file-1', name: 'test.png' }
-      const forms = [
-        {
-          type: InputVarType.singleFile,
-          label: 'Single File',
-          variable: 'singleFile',
-          required: false,
-          allowed_file_types: ['image'],
-          allowed_file_extensions: ['.png'],
-          allowed_file_upload_methods: ['local_file'],
-        },
-      ]
-      render(<AppInputsForm {...defaultProps} inputsForms={forms} inputs={{ singleFile: existingFile }} />)
-      // The file uploader should receive the existing file as an array
-      // The file uploader should receive the existing file as an array
-      expect(screen.getByTestId('file-value'))!.toHaveTextContent(JSON.stringify([existingFile]))
-    })
-
-    it('should render file uploader for multi files', () => {
-      const forms = [
-        {
-          type: InputVarType.multiFiles,
-          label: 'Attachments',
-          variable: 'files',
-          required: false,
-          max_length: 5,
-          allowed_file_types: ['image'],
-          allowed_file_extensions: ['.png', '.jpg'],
-          allowed_file_upload_methods: ['local_file'],
-        },
-      ]
-      render(<AppInputsForm {...defaultProps} inputsForms={forms} />)
-      expect(screen.getByText('Attachments'))!.toBeInTheDocument()
-    })
-
-    it('should show optional label for non-required fields', () => {
-      const forms = [
-        { type: InputVarType.textInput, label: 'Name', variable: 'name', required: false },
-      ]
-      render(<AppInputsForm {...defaultProps} inputsForms={forms} />)
-      expect(screen.getByText('workflow.panel.optional'))!.toBeInTheDocument()
-    })
-
-    it('should not show optional label for required fields', () => {
-      const forms = [
-        { type: InputVarType.textInput, label: 'Name', variable: 'name', required: true },
-      ]
-      render(<AppInputsForm {...defaultProps} inputsForms={forms} />)
-      expect(screen.queryByText('workflow.panel.optional')).not.toBeInTheDocument()
-    })
-  })
-
-  describe('User Interactions', () => {
-    it('should call onFormChange when text input changes', () => {
-      const onFormChange = vi.fn()
-      const forms = [
-        { type: InputVarType.textInput, label: 'Name', variable: 'name', required: false },
-      ]
-      render(<AppInputsForm {...defaultProps} inputsForms={forms} onFormChange={onFormChange} />)
-
-      const input = screen.getByPlaceholderText('Name')
-      fireEvent.change(input, { target: { value: 'test value' } })
-
-      expect(onFormChange).toHaveBeenCalledWith(expect.objectContaining({ name: 'test value' }))
-    })
-
-    it('should call onFormChange when number input changes', () => {
-      const onFormChange = vi.fn()
-      const forms = [
-        { type: InputVarType.number, label: 'Count', variable: 'count', required: false },
-      ]
-      render(<AppInputsForm {...defaultProps} inputsForms={forms} onFormChange={onFormChange} />)
-
-      const input = screen.getByPlaceholderText('Count')
-      fireEvent.change(input, { target: { value: '42' } })
-
-      expect(onFormChange).toHaveBeenCalledWith(expect.objectContaining({ count: '42' }))
-    })
-
-    it('should call onFormChange when textarea changes', () => {
-      const onFormChange = vi.fn()
-      const forms = [
-        { type: InputVarType.paragraph, label: 'Description', variable: 'desc', required: false },
-      ]
-      render(<AppInputsForm {...defaultProps} inputsForms={forms} onFormChange={onFormChange} />)
-
-      const textarea = screen.getByPlaceholderText('Description')
-      fireEvent.change(textarea, { target: { value: 'long text' } })
-
-      expect(onFormChange).toHaveBeenCalledWith(expect.objectContaining({ desc: 'long text' }))
-    })
-
-    it('should call onFormChange when file is uploaded', () => {
-      const onFormChange = vi.fn()
-      const forms = [
-        {
-          type: InputVarType.singleFile,
-          label: 'Upload',
-          variable: 'file',
-          required: false,
-          allowed_file_types: ['image'],
-          allowed_file_extensions: ['.png'],
-          allowed_file_upload_methods: ['local_file'],
-        },
-      ]
-      render(<AppInputsForm {...defaultProps} inputsForms={forms} onFormChange={onFormChange} />)
-
-      fireEvent.click(screen.getByTestId('upload-file-btn'))
-      expect(onFormChange).toHaveBeenCalled()
-    })
-
-    it('should call onFormChange when select option is clicked', () => {
-      const onFormChange = vi.fn()
-      const forms = [
-        { type: InputVarType.select, label: 'Color', variable: 'color', options: ['red', 'blue'], required: false },
-      ]
-      render(<AppInputsForm {...defaultProps} inputsForms={forms} onFormChange={onFormChange} />)
-
-      // Click on select option
-      fireEvent.click(screen.getByTestId('select-option-red'))
-      expect(onFormChange).toHaveBeenCalledWith(expect.objectContaining({ color: 'red' }))
-    })
-
-    it('should call onFormChange when multiple files are uploaded', () => {
-      const onFormChange = vi.fn()
-      const forms = [
-        {
-          type: InputVarType.multiFiles,
-          label: 'Files',
-          variable: 'files',
-          required: false,
-          max_length: 5,
-          allowed_file_types: ['image'],
-          allowed_file_extensions: ['.png'],
-          allowed_file_upload_methods: ['local_file'],
-        },
-      ]
-      render(<AppInputsForm {...defaultProps} inputsForms={forms} onFormChange={onFormChange} />)
-
-      fireEvent.click(screen.getByTestId('upload-multi-files-btn'))
-      expect(onFormChange).toHaveBeenCalledWith(expect.objectContaining({
-        files: [{ id: 'file-1' }, { id: 'file-2' }],
-      }))
-    })
-  })
-
-  describe('Callback Stability', () => {
-    it('should preserve reference to handleFormChange with useCallback', () => {
-      const onFormChange = vi.fn()
-      const forms = [
-        { type: InputVarType.textInput, label: 'Name', variable: 'name', required: false },
-      ]
-
-      const { rerender } = render(
-        <AppInputsForm {...defaultProps} inputsForms={forms} onFormChange={onFormChange} />,
-      )
-
-      // Change inputs without changing onFormChange
-      rerender(
-        <AppInputsForm
-          {...defaultProps}
-          inputsForms={forms}
-          inputs={{ name: 'initial' }}
-          onFormChange={onFormChange}
-        />,
-      )
-
-      const input = screen.getByPlaceholderText('Name')
-      fireEvent.change(input, { target: { value: 'updated' } })
-
-      expect(onFormChange).toHaveBeenCalled()
-    })
-  })
-
-  describe('Edge Cases', () => {
-    it('should handle inputs with existing values', () => {
-      const forms = [
-        { type: InputVarType.textInput, label: 'Name', variable: 'name', required: false },
-      ]
-      render(<AppInputsForm {...defaultProps} inputsForms={forms} inputs={{ name: 'existing' }} />)
-
-      const input = screen.getByPlaceholderText('Name')
-      expect(input)!.toHaveValue('existing')
-    })
-
-    it('should handle empty string value', () => {
-      const forms = [
-        { type: InputVarType.textInput, label: 'Name', variable: 'name', required: false },
-      ]
-      render(<AppInputsForm {...defaultProps} inputsForms={forms} inputs={{ name: '' }} />)
-
-      const input = screen.getByPlaceholderText('Name')
-      expect(input)!.toHaveValue('')
-    })
-
-    it('should handle undefined variable value', () => {
-      const forms = [
-        { type: InputVarType.textInput, label: 'Name', variable: 'name', required: false },
-      ]
-      render(<AppInputsForm {...defaultProps} inputsForms={forms} inputs={{}} />)
-
-      const input = screen.getByPlaceholderText('Name')
-      expect(input)!.toHaveValue('')
-    })
-
-    it('should handle multiple form fields', () => {
-      const forms = [
-        { type: InputVarType.textInput, label: 'Name', variable: 'name', required: false },
-        { type: InputVarType.number, label: 'Age', variable: 'age', required: false },
-        { type: InputVarType.paragraph, label: 'Bio', variable: 'bio', required: false },
-      ]
-      render(<AppInputsForm {...defaultProps} inputsForms={forms} />)
-
-      expect(screen.getByText('Name'))!.toBeInTheDocument()
-      expect(screen.getByText('Age'))!.toBeInTheDocument()
-      expect(screen.getByText('Bio'))!.toBeInTheDocument()
-    })
-
-    it('should handle unknown form type gracefully', () => {
-      const forms = [
-        { type: 'unknown-type' as InputVarType, label: 'Unknown', variable: 'unknown', required: false },
-      ]
-      // Should not throw error, just not render the field
-      render(<AppInputsForm {...defaultProps} inputsForms={forms} />)
-      expect(screen.getByText('Unknown'))!.toBeInTheDocument()
-    })
-  })
-})
-
-// ==================== AppInputsPanel Tests ====================
-
-describe('AppInputsPanel', () => {
-  const defaultProps = {
-    value: { app_id: 'app-1', inputs: {} },
-    appDetail: createMockApp({ mode: AppModeEnum.CHAT }),
-    onFormChange: vi.fn(),
-  }
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    mockAppDetailData = undefined
-    mockAppDetailLoading = false
-    mockWorkflowData = undefined
-    mockWorkflowLoading = false
-  })
-
-  describe('Rendering', () => {
-    it('should render without crashing', () => {
-      renderWithQueryClient(<AppInputsPanel {...defaultProps} />)
-      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
-    })
-
-    it('should show no params message when form schema is empty', () => {
-      renderWithQueryClient(<AppInputsPanel {...defaultProps} />)
-      expect(screen.getByText('app.appSelector.noParams'))!.toBeInTheDocument()
-    })
-
-    it('should show loading state when app is loading', () => {
-      mockAppDetailLoading = true
-      renderWithQueryClient(<AppInputsPanel {...defaultProps} />)
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      // Loading component should be rendered
-      expect(screen.queryByText('app.appSelector.params')).not.toBeInTheDocument()
-    })
-
-    it('should show loading state when workflow is loading', () => {
-      mockWorkflowLoading = true
-      const workflowApp = createMockApp({ mode: AppModeEnum.WORKFLOW })
-      renderWithQueryClient(<AppInputsPanel {...defaultProps} appDetail={workflowApp} />)
-      expect(screen.queryByText('app.appSelector.params')).not.toBeInTheDocument()
-    })
-  })
-
-  describe('Props', () => {
-    it('should handle undefined value', () => {
-      renderWithQueryClient(<AppInputsPanel {...defaultProps} value={undefined} />)
-      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
-    })
-
-    it('should handle different app modes', () => {
-      const workflowApp = createMockApp({ mode: AppModeEnum.WORKFLOW })
-      renderWithQueryClient(<AppInputsPanel {...defaultProps} appDetail={workflowApp} />)
-      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
-    })
-
-    it('should handle advanced chat mode', () => {
-      const advancedChatApp = createMockApp({ mode: AppModeEnum.ADVANCED_CHAT })
-      renderWithQueryClient(<AppInputsPanel {...defaultProps} appDetail={advancedChatApp} />)
-      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
-    })
-  })
-
-  describe('Form Schema Generation - Basic App', () => {
-    it('should generate schema for paragraph input', () => {
-      mockAppDetailData = createMockApp({
-        mode: AppModeEnum.CHAT,
-        model_config: {
-          ...createMockApp().model_config,
-          user_input_form: [
-            { paragraph: { label: 'Description', variable: 'desc' } },
-          ],
-        },
-      })
-      renderWithQueryClient(<AppInputsPanel {...defaultProps} />)
-      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
-    })
-
-    it('should generate schema for number input', () => {
-      mockAppDetailData = createMockApp({
-        mode: AppModeEnum.CHAT,
-        model_config: {
-          ...createMockApp().model_config,
-          user_input_form: [
-            { number: { label: 'Count', variable: 'count' } },
-          ],
-        },
-      })
-      renderWithQueryClient(<AppInputsPanel {...defaultProps} />)
-      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
-    })
-
-    it('should generate schema for checkbox input', () => {
-      mockAppDetailData = createMockApp({
-        mode: AppModeEnum.CHAT,
-        model_config: {
-          ...createMockApp().model_config,
-          user_input_form: [
-            { checkbox: { label: 'Enabled', variable: 'enabled' } },
-          ],
-        },
-      })
-      renderWithQueryClient(<AppInputsPanel {...defaultProps} />)
-      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
-    })
-
-    it('should generate schema for select input', () => {
-      mockAppDetailData = createMockApp({
-        mode: AppModeEnum.CHAT,
-        model_config: {
-          ...createMockApp().model_config,
-          user_input_form: [
-            { select: { label: 'Option', variable: 'option', options: ['a', 'b'] } },
-          ],
-        },
-      })
-      renderWithQueryClient(<AppInputsPanel {...defaultProps} />)
-      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
-    })
-
-    it('should generate schema for file-list input', () => {
-      mockAppDetailData = createMockApp({
-        mode: AppModeEnum.CHAT,
-        model_config: {
-          ...createMockApp().model_config,
-          user_input_form: [
-            { 'file-list': { label: 'Files', variable: 'files' } },
-          ],
-        },
-      })
-      renderWithQueryClient(<AppInputsPanel {...defaultProps} />)
-      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
-    })
-
-    it('should generate schema for file input', () => {
-      mockAppDetailData = createMockApp({
-        mode: AppModeEnum.CHAT,
-        model_config: {
-          ...createMockApp().model_config,
-          user_input_form: [
-            { file: { label: 'File', variable: 'file' } },
-          ],
-        },
-      })
-      renderWithQueryClient(<AppInputsPanel {...defaultProps} />)
-      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
-    })
-
-    it('should generate schema for json_object input', () => {
-      mockAppDetailData = createMockApp({
-        mode: AppModeEnum.CHAT,
-        model_config: {
-          ...createMockApp().model_config,
-          user_input_form: [
-            { json_object: { label: 'JSON', variable: 'json' } },
-          ],
-        },
-      })
-      renderWithQueryClient(<AppInputsPanel {...defaultProps} />)
-      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
-    })
-
-    it('should generate schema for text-input (default)', () => {
-      mockAppDetailData = createMockApp({
-        mode: AppModeEnum.CHAT,
-        model_config: {
-          ...createMockApp().model_config,
-          user_input_form: [
-            { 'text-input': { label: 'Name', variable: 'name' } },
-          ],
-        },
-      })
-      renderWithQueryClient(<AppInputsPanel {...defaultProps} />)
-      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
-    })
-
-    it('should filter external_data_tool items', () => {
-      mockAppDetailData = createMockApp({
-        mode: AppModeEnum.CHAT,
-        model_config: {
-          ...createMockApp().model_config,
-          user_input_form: [
-            { 'text-input': { label: 'Name', variable: 'name' }, 'external_data_tool': true },
-            { 'text-input': { label: 'Email', variable: 'email' } },
-          ],
-        },
-      })
-      renderWithQueryClient(<AppInputsPanel {...defaultProps} />)
-      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
-    })
-  })
-
-  describe('Form Schema Generation - Workflow App', () => {
-    it('should generate schema for workflow with multiFiles variable', () => {
-      mockWorkflowData = {
-        graph: {
-          nodes: [
-            {
-              data: {
-                type: 'start',
-                variables: [
-                  { type: 'file-list', label: 'Files', variable: 'files' },
-                ],
-              },
-            },
-          ],
-        },
-        features: {},
-      }
-      const workflowApp = createMockApp({ mode: AppModeEnum.WORKFLOW })
-      renderWithQueryClient(<AppInputsPanel {...defaultProps} appDetail={workflowApp} />)
-      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
-    })
-
-    it('should generate schema for workflow with singleFile variable', () => {
-      mockWorkflowData = {
-        graph: {
-          nodes: [
-            {
-              data: {
-                type: 'start',
-                variables: [
-                  { type: 'file', label: 'File', variable: 'file' },
-                ],
-              },
-            },
-          ],
-        },
-        features: {},
-      }
-      const workflowApp = createMockApp({ mode: AppModeEnum.WORKFLOW })
-      renderWithQueryClient(<AppInputsPanel {...defaultProps} appDetail={workflowApp} />)
-      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
-    })
-
-    it('should generate schema for workflow with regular variable', () => {
-      mockWorkflowData = {
-        graph: {
-          nodes: [
-            {
-              data: {
-                type: 'start',
-                variables: [
-                  { type: 'text-input', label: 'Name', variable: 'name' },
-                ],
-              },
-            },
-          ],
-        },
-        features: {},
-      }
-      const workflowApp = createMockApp({ mode: AppModeEnum.WORKFLOW })
-      renderWithQueryClient(<AppInputsPanel {...defaultProps} appDetail={workflowApp} />)
-      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
-    })
-  })
-
-  describe('Image Upload Schema', () => {
-    it('should add image upload schema for COMPLETION mode with file upload enabled', () => {
-      mockAppDetailData = createMockApp({
-        mode: AppModeEnum.COMPLETION,
-        model_config: {
-          ...createMockApp().model_config,
-          file_upload: {
-            enabled: true,
-            image: { enabled: true },
-          },
-          user_input_form: [],
-        },
-      })
-      const completionApp = createMockApp({ mode: AppModeEnum.COMPLETION })
-      renderWithQueryClient(<AppInputsPanel {...defaultProps} appDetail={completionApp} />)
-      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
-    })
-
-    it('should add image upload schema for WORKFLOW mode with file upload enabled', () => {
-      mockAppDetailData = createMockApp({
-        mode: AppModeEnum.WORKFLOW,
-        model_config: {
-          ...createMockApp().model_config,
-          file_upload: {
-            enabled: true,
-          },
-          user_input_form: [],
-        },
-      })
-      mockWorkflowData = {
-        graph: { nodes: [{ data: { type: 'start', variables: [] } }] },
-        features: { file_upload: { enabled: true } },
-      }
-      const workflowApp = createMockApp({ mode: AppModeEnum.WORKFLOW })
-      renderWithQueryClient(<AppInputsPanel {...defaultProps} appDetail={workflowApp} />)
-      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
-    })
-  })
-
-  describe('User Interactions', () => {
-    it('should call onFormChange when form is updated', () => {
-      const onFormChange = vi.fn()
-      renderWithQueryClient(<AppInputsPanel {...defaultProps} onFormChange={onFormChange} />)
-      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
-    })
-
-    it('should call onFormChange with updated values when text input changes', () => {
-      const onFormChange = vi.fn()
-      mockAppDetailData = createMockApp({
-        mode: AppModeEnum.CHAT,
-        model_config: {
-          ...createMockApp().model_config,
-          user_input_form: [
-            { 'text-input': { label: 'TestField', variable: 'testField', default: '', required: false, max_length: 100 } },
-          ],
-        },
-      })
-      renderWithQueryClient(<AppInputsPanel {...defaultProps} onFormChange={onFormChange} />)
-
-      // Find and change the text input
-      const input = screen.getByPlaceholderText('TestField')
-      fireEvent.change(input, { target: { value: 'new value' } })
-
-      // handleFormChange should be called with the new value
-      expect(onFormChange).toHaveBeenCalledWith({ testField: 'new value' })
-    })
-
-    it('should update inputsRef when form changes', () => {
-      const onFormChange = vi.fn()
-      mockAppDetailData = createMockApp({
-        mode: AppModeEnum.CHAT,
-        model_config: {
-          ...createMockApp().model_config,
-          user_input_form: [
-            { 'text-input': { label: 'RefTestField', variable: 'refField', default: '', required: false, max_length: 50 } },
-          ],
-        },
-      })
-      renderWithQueryClient(<AppInputsPanel {...defaultProps} onFormChange={onFormChange} />)
-
-      const input = screen.getByPlaceholderText('RefTestField')
-      fireEvent.change(input, { target: { value: 'ref updated' } })
-
-      expect(onFormChange).toHaveBeenCalledWith({ refField: 'ref updated' })
-    })
-  })
-
-  describe('Memoization', () => {
-    it('should memoize basicAppFileConfig correctly', () => {
-      const { rerender } = renderWithQueryClient(<AppInputsPanel {...defaultProps} />)
-      rerender(
-        <QueryClientProvider client={createTestQueryClient()}>
-          <AppInputsPanel {...defaultProps} />
-        </QueryClientProvider>,
-      )
-      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
-    })
-  })
-
-  describe('Edge Cases', () => {
-    it('should return empty schema when currentApp is null', () => {
-      mockAppDetailData = null
-      renderWithQueryClient(<AppInputsPanel {...defaultProps} />)
-      expect(screen.getByText('app.appSelector.noParams'))!.toBeInTheDocument()
-    })
-
-    it('should handle workflow without start node', () => {
-      mockWorkflowData = {
-        graph: { nodes: [] },
-        features: {},
-      }
-      const workflowApp = createMockApp({ mode: AppModeEnum.WORKFLOW })
-      renderWithQueryClient(<AppInputsPanel {...defaultProps} appDetail={workflowApp} />)
-      expect(screen.getByText('app.appSelector.params'))!.toBeInTheDocument()
-    })
-  })
-})
-
-// ==================== AppSelector (Main Component) Tests ====================
-
 describe('AppSelector', () => {
-  const defaultProps = {
-    onSelect: vi.fn(),
-  }
-
   beforeEach(() => {
     vi.clearAllMocks()
-    vi.useFakeTimers()
-    mockAppListData = {
-      pages: [{ data: createMockApps(5), has_more: false, page: 1 }],
-    }
-    mockIsLoading = false
-    mockIsFetchingNextPage = false
-    mockHasNextPage = false
-    mockFetchNextPage.mockResolvedValue(undefined)
-    mockAppDetailData = undefined
-    mockAppDetailLoading = false
-    mockWorkflowData = undefined
-    mockWorkflowLoading = false
   })
 
-  afterEach(() => {
-    vi.useRealTimers()
-  })
+  it('should keep the main interaction: outer panel, inner app list, then inputs panel', async () => {
+    const onSelect = vi.fn()
 
-  describe('Rendering', () => {
-    it('should render without crashing', () => {
-      renderWithQueryClient(<AppSelector {...defaultProps} />)
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
+    renderWithQueryClient(<AppSelector onSelect={onSelect} />)
+
+    fireEvent.click(screen.getByRole('button', { name: 'app.appSelector.label' }))
+    expect(screen.getByText('app.appSelector.label')).toBeInTheDocument()
+
+    fireEvent.click(screen.getByRole('combobox', { name: 'app.appSelector.label' }))
+
+    await waitFor(() => {
+      expect(screen.getByText('Support Bot')).toBeInTheDocument()
     })
 
-    it('should render trigger component', () => {
-      renderWithQueryClient(<AppSelector {...defaultProps} />)
-      expect(screen.getByText('app.appSelector.placeholder'))!.toBeInTheDocument()
-    })
+    fireEvent.click(screen.getByText('Support Bot'))
 
-    it('should show selected app info when value is provided', () => {
-      renderWithQueryClient(
-        <AppSelector
-          {...defaultProps}
-          value={{ app_id: 'app-1', inputs: {}, files: [] }}
-        />,
-      )
-      // Should show the app trigger with app info
-      // Should show the app trigger with app info
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
+    expect(onSelect).toHaveBeenCalledWith({
+      app_id: 'app-1',
+      inputs: {},
+      files: [],
+    })
+    expect(screen.getByText('app.appSelector.label')).toBeInTheDocument()
+    expect(screen.getByRole('combobox', { name: 'app.appSelector.label' })).toBeInTheDocument()
+    await waitFor(() => {
+      expect(screen.queryByText('Workflow App')).not.toBeInTheDocument()
     })
   })
 
-  describe('Props', () => {
-    it('should handle different placement values', () => {
-      renderWithQueryClient(<AppSelector {...defaultProps} placement="top" />)
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
+  it('should search apps from the content input', async () => {
+    renderWithQueryClient(<AppSelector onSelect={vi.fn()} />)
+
+    fireEvent.click(screen.getByRole('button', { name: 'app.appSelector.label' }))
+    fireEvent.click(screen.getByRole('combobox', { name: 'app.appSelector.label' }))
+    fireEvent.change(screen.getByRole('combobox', { name: 'app.appSelector.placeholder' }), {
+      target: { value: 'workflow' },
     })
 
-    it('should handle different offset values', () => {
-      renderWithQueryClient(<AppSelector {...defaultProps} offset={10} />)
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-
-    it('should handle disabled state', () => {
-      renderWithQueryClient(<AppSelector {...defaultProps} disabled={true} />)
-      const trigger = screen.getByTestId('portal-trigger')
-      fireEvent.click(trigger)
-      // Portal should remain closed when disabled
-      // Portal should remain closed when disabled
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toHaveAttribute('data-open', 'false')
-    })
-
-    it('should handle scope prop', () => {
-      renderWithQueryClient(<AppSelector {...defaultProps} scope="workflow" />)
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-
-    it('should handle value with inputs', () => {
-      renderWithQueryClient(
-        <AppSelector
-          {...defaultProps}
-          value={{ app_id: 'app-1', inputs: { name: 'test' }, files: [] }}
-        />,
-      )
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-
-    it('should handle value with files', () => {
-      renderWithQueryClient(
-        <AppSelector
-          {...defaultProps}
-          value={{ app_id: 'app-1', inputs: {}, files: [{ id: 'file-1' }] }}
-        />,
-      )
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
+    await waitFor(() => {
+      expect(screen.getByText('Workflow App')).toBeInTheDocument()
     })
+    expect(screen.queryByText('Support Bot')).not.toBeInTheDocument()
   })
 
-  describe('State Management', () => {
-    it('should toggle isShow state when trigger is clicked', () => {
-      renderWithQueryClient(<AppSelector {...defaultProps} />)
+  it('should not keep the selected app in filtered results', async () => {
+    const user = userEvent.setup()
+    const onSelect = vi.fn()
 
-      const trigger = screen.getAllByTestId('portal-trigger')[0]
-      fireEvent.click(trigger!)
+    renderWithQueryClient(<StatefulAppSelector onSelect={onSelect} />)
 
-      // The portal state should update synchronously - get the first one (outer portal)
-      // The portal state should update synchronously - get the first one (outer portal)
-      expect(screen.getAllByTestId('portal-to-follow-elem')[0])!.toHaveAttribute('data-open', 'true')
+    await user.click(screen.getByRole('button', { name: 'app.appSelector.label' }))
+    await user.click(screen.getByRole('combobox', { name: 'app.appSelector.label' }))
+
+    await waitFor(() => {
+      expect(screen.getByText('Support Bot')).toBeInTheDocument()
     })
 
-    it('should not toggle isShow when disabled', () => {
-      renderWithQueryClient(<AppSelector {...defaultProps} disabled={true} />)
+    await user.click(screen.getByText('Support Bot'))
+    await user.click(screen.getByRole('combobox', { name: 'app.appSelector.label' }))
+    await user.type(screen.getByRole('combobox', { name: 'app.appSelector.placeholder' }), 'workflow')
 
-      const trigger = screen.getByTestId('portal-trigger')
-      fireEvent.click(trigger)
-
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toHaveAttribute('data-open', 'false')
+    await waitFor(() => {
+      expect(screen.queryByRole('option', { name: /Support Bot/ })).not.toBeInTheDocument()
     })
+    expect(screen.getByRole('option', { name: /Workflow App/ })).toBeInTheDocument()
 
-    it('should manage search text state', () => {
-      renderWithQueryClient(<AppSelector {...defaultProps} />)
+    await user.keyboard('{ArrowDown}')
+    await user.keyboard('{Enter}')
 
-      const trigger = screen.getByTestId('portal-trigger')
-      fireEvent.click(trigger)
-
-      // Portal content should be visible after click
-      // Portal content should be visible after click
-      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
-    })
-
-    it('should render correctly during load more setup', () => {
-      mockHasNextPage = true
-      mockFetchNextPage.mockImplementation(() => new Promise(resolve => setTimeout(resolve, 100)))
-
-      renderWithQueryClient(<AppSelector {...defaultProps} />)
-
-      // Trigger should be rendered
-      // Trigger should be rendered
-      expect(screen.getByTestId('portal-trigger'))!.toBeInTheDocument()
-    })
-  })
-
-  describe('Callbacks', () => {
-    it('should call onSelect when app is selected', () => {
-      const onSelect = vi.fn()
-
-      renderWithQueryClient(<AppSelector {...defaultProps} onSelect={onSelect} />)
-
-      // Open the portal
-      fireEvent.click(screen.getByTestId('portal-trigger'))
-
-      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
-    })
-
-    it('should call onSelect with correct value structure', () => {
-      const onSelect = vi.fn()
-      renderWithQueryClient(
-        <AppSelector
-          {...defaultProps}
-          onSelect={onSelect}
-          value={{ app_id: 'old-app', inputs: { old: 'value' }, files: [] }}
-        />,
-      )
-
-      // The component should maintain the correct value structure
-      // The component should maintain the correct value structure
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-
-    it('should clear inputs when selecting different app', () => {
-      const onSelect = vi.fn()
-      renderWithQueryClient(
-        <AppSelector
-          {...defaultProps}
-          onSelect={onSelect}
-          value={{ app_id: 'app-1', inputs: { name: 'test' }, files: [{ id: 'file' }] }}
-        />,
-      )
-
-      // Component renders with existing value
-      // Component renders with existing value
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-
-    it('should preserve inputs when selecting same app', () => {
-      const onSelect = vi.fn()
-      renderWithQueryClient(
-        <AppSelector
-          {...defaultProps}
-          onSelect={onSelect}
-          value={{ app_id: 'app-1', inputs: { name: 'test' }, files: [] }}
-        />,
-      )
-
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-  })
-
-  describe('Memoization', () => {
-    it('should memoize displayedApps correctly', () => {
-      mockAppListData = {
-        pages: [
-          { data: createMockApps(3), has_more: true, page: 1 },
-          { data: createMockApps(3), has_more: false, page: 2 },
-        ],
-      }
-
-      renderWithQueryClient(<AppSelector {...defaultProps} />)
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-
-    it('should memoize currentAppInfo correctly', () => {
-      mockAppListData = {
-        pages: [{ data: createMockApps(5), has_more: false, page: 1 }],
-      }
-
-      renderWithQueryClient(
-        <AppSelector
-          {...defaultProps}
-          value={{ app_id: 'app-1', inputs: {}, files: [] }}
-        />,
-      )
-
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-
-    it('should memoize formattedValue correctly', () => {
-      renderWithQueryClient(
-        <AppSelector
-          {...defaultProps}
-          value={{ app_id: 'app-1', inputs: { name: 'test' }, files: [{ id: 'file-1' }] }}
-        />,
-      )
-
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-
-    it('should be wrapped with React.memo', () => {
-      // Verify the component is defined and memoized
-      expect(AppSelector).toBeDefined()
-
-      const onSelect = vi.fn()
-      const { rerender } = renderWithQueryClient(<AppSelector {...defaultProps} onSelect={onSelect} />)
-
-      // Re-render with same props should not cause unnecessary updates
-      rerender(
-        <QueryClientProvider client={createTestQueryClient()}>
-          <AppSelector {...defaultProps} onSelect={onSelect} />
-        </QueryClientProvider>,
-      )
-
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-  })
-
-  describe('Load More Functionality', () => {
-    it('should handle load more when hasMore is true', async () => {
-      mockHasNextPage = true
-      renderWithQueryClient(<AppSelector {...defaultProps} />)
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-
-    it('should not trigger load more when already loading', async () => {
-      mockIsFetchingNextPage = true
-      mockHasNextPage = true
-      renderWithQueryClient(<AppSelector {...defaultProps} />)
-      expect(mockFetchNextPage).not.toHaveBeenCalled()
-    })
-
-    it('should not trigger load more when no more data', () => {
-      mockHasNextPage = false
-      renderWithQueryClient(<AppSelector {...defaultProps} />)
-      expect(mockFetchNextPage).not.toHaveBeenCalled()
-    })
-
-    it('should handle fetchNextPage completion with delay', async () => {
-      mockHasNextPage = true
-      mockFetchNextPage.mockResolvedValue(undefined)
-
-      renderWithQueryClient(<AppSelector {...defaultProps} />)
-
-      act(() => {
-        vi.advanceTimersByTime(500)
-      })
-
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-
-    it('should render load more area when hasMore is true', () => {
-      mockHasNextPage = true
-      mockIsFetchingNextPage = false
-      mockFetchNextPage.mockResolvedValue(undefined)
-
-      renderWithQueryClient(<AppSelector {...defaultProps} />)
-
-      // Open the portal
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
-
-      // Should render without errors
-      // Should render without errors
-      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
-    })
-
-    it('should handle fetchNextPage rejection gracefully in handleLoadMore', async () => {
-      mockHasNextPage = true
-      mockFetchNextPage.mockRejectedValue(new Error('Network error'))
-
-      renderWithQueryClient(<AppSelector {...defaultProps} />)
-
-      // Should not crash even if fetchNextPage rejects
-      // Should not crash even if fetchNextPage rejects
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-
-    it('should call fetchNextPage when intersection observer triggers handleLoadMore', async () => {
-      mockHasNextPage = true
-      mockIsFetchingNextPage = false
-      mockFetchNextPage.mockResolvedValue(undefined)
-
-      renderWithQueryClient(<AppSelector {...defaultProps} />)
-
-      // Open the main portal
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
-
-      // Open the inner app picker portal
-      const triggers = screen.getAllByTestId('portal-trigger')
-      fireEvent.click(triggers[1]!)
-
-      // Simulate intersection to trigger handleLoadMore
-      triggerIntersection([{ isIntersecting: true } as IntersectionObserverEntry])
-
-      // fetchNextPage should be called
-      expect(mockFetchNextPage).toHaveBeenCalled()
-    })
-
-    it('should avoid duplicate fetches while the picker debounce is active', async () => {
-      mockHasNextPage = true
-      mockIsFetchingNextPage = false
-      mockFetchNextPage.mockResolvedValue(undefined)
-
-      renderWithQueryClient(<AppSelector {...defaultProps} />)
-
-      // Open portals
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
-      const triggers = screen.getAllByTestId('portal-trigger')
-      fireEvent.click(triggers[1]!)
-
-      // Trigger first intersection
-      triggerIntersection([{ isIntersecting: true } as IntersectionObserverEntry])
-
-      expect(mockFetchNextPage).toHaveBeenCalledTimes(1)
-
-      // Try to trigger again immediately - should be blocked by AppPicker loadingRef
-      triggerIntersection([{ isIntersecting: true } as IntersectionObserverEntry])
-
-      // Still only one call due to the picker-level debounce
-      expect(mockFetchNextPage).toHaveBeenCalledTimes(1)
-
-      expect(screen.getAllByTestId('portal-content').length).toBeGreaterThan(0)
-    })
-
-    it('should skip handleLoadMore when isFetchingNextPage is true', async () => {
-      mockHasNextPage = true
-      mockIsFetchingNextPage = true // This will block the handleLoadMore
-      mockFetchNextPage.mockResolvedValue(undefined)
-
-      renderWithQueryClient(<AppSelector {...defaultProps} />)
-
-      // Open portals
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
-      const triggers = screen.getAllByTestId('portal-trigger')
-      fireEvent.click(triggers[1]!)
-
-      // Trigger intersection
-      triggerIntersection([{ isIntersecting: true } as IntersectionObserverEntry])
-
-      // fetchNextPage should NOT be called because isFetchingNextPage is true
-      expect(mockFetchNextPage).not.toHaveBeenCalled()
-    })
-
-    it('should skip handleLoadMore when hasMore is false', async () => {
-      mockHasNextPage = false // This will block the handleLoadMore
-      mockIsFetchingNextPage = false
-      mockFetchNextPage.mockResolvedValue(undefined)
-
-      renderWithQueryClient(<AppSelector {...defaultProps} />)
-
-      // Open portals
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
-      const triggers = screen.getAllByTestId('portal-trigger')
-      fireEvent.click(triggers[1]!)
-
-      // Trigger intersection
-      triggerIntersection([{ isIntersecting: true } as IntersectionObserverEntry])
-
-      // fetchNextPage should NOT be called because hasMore is false
-      expect(mockFetchNextPage).not.toHaveBeenCalled()
-    })
-  })
-  describe('Form Change Handling', () => {
-    it('should handle form change with image file', () => {
-      const onSelect = vi.fn()
-      renderWithQueryClient(
-        <AppSelector
-          {...defaultProps}
-          onSelect={onSelect}
-          value={{ app_id: 'app-1', inputs: {}, files: [] }}
-        />,
-      )
-
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-
-    it('should handle form change without image file', () => {
-      const onSelect = vi.fn()
-      renderWithQueryClient(
-        <AppSelector
-          {...defaultProps}
-          onSelect={onSelect}
-          value={{ app_id: 'app-1', inputs: { name: 'test' }, files: [] }}
-        />,
-      )
-
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-
-    it('should extract #image# from inputs and add to files array', () => {
-      const onSelect = vi.fn()
-      // The handleFormChange function should extract #image# and add to files
-      renderWithQueryClient(
-        <AppSelector
-          {...defaultProps}
-          onSelect={onSelect}
-          value={{ app_id: 'app-1', inputs: { '#image#': { id: 'img-1' } }, files: [] }}
-        />,
-      )
-
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-
-    it('should preserve existing files when no #image# in inputs', () => {
-      const onSelect = vi.fn()
-      renderWithQueryClient(
-        <AppSelector
-          {...defaultProps}
-          onSelect={onSelect}
-          value={{ app_id: 'app-1', inputs: { name: 'test' }, files: [{ id: 'existing-file' }] }}
-        />,
-      )
-
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-  })
-
-  describe('App Selection', () => {
-    it('should clear inputs when selecting a different app', () => {
-      const onSelect = vi.fn()
-      mockAppListData = {
-        pages: [{ data: createMockApps(3), has_more: false, page: 1 }],
-      }
-
-      renderWithQueryClient(
-        <AppSelector
-          {...defaultProps}
-          onSelect={onSelect}
-          value={{ app_id: 'app-1', inputs: { name: 'old' }, files: [{ id: 'old-file' }] }}
-        />,
-      )
-
-      // Open the main portal
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
-
-      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
-    })
-
-    it('should preserve inputs when selecting the same app', () => {
-      const onSelect = vi.fn()
-      mockAppListData = {
-        pages: [{ data: createMockApps(3), has_more: false, page: 1 }],
-      }
-
-      renderWithQueryClient(
-        <AppSelector
-          {...defaultProps}
-          onSelect={onSelect}
-          value={{ app_id: 'app-1', inputs: { name: 'test' }, files: [] }}
-        />,
-      )
-
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-
-    it('should handle app selection with empty value', () => {
-      const onSelect = vi.fn()
-      mockAppListData = {
-        pages: [{ data: createMockApps(3), has_more: false, page: 1 }],
-      }
-
-      renderWithQueryClient(
-        <AppSelector
-          {...defaultProps}
-          onSelect={onSelect}
-          value={undefined}
-        />,
-      )
-
-      // Open the main portal
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
-
-      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
-    })
-  })
-
-  describe('Edge Cases', () => {
-    it('should handle undefined value', () => {
-      renderWithQueryClient(<AppSelector {...defaultProps} value={undefined} />)
-      expect(screen.getByText('app.appSelector.placeholder'))!.toBeInTheDocument()
-    })
-
-    it('should handle empty pages array', () => {
-      mockAppListData = { pages: [] }
-      renderWithQueryClient(<AppSelector {...defaultProps} />)
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-
-    it('should handle undefined data', () => {
-      mockAppListData = undefined
-      renderWithQueryClient(<AppSelector {...defaultProps} />)
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-
-    it('should handle loading state', () => {
-      mockIsLoading = true
-      renderWithQueryClient(<AppSelector {...defaultProps} />)
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-
-    it('should handle app not found in displayedApps', () => {
-      mockAppListData = {
-        pages: [{ data: createMockApps(3), has_more: false, page: 1 }],
-      }
-
-      renderWithQueryClient(
-        <AppSelector
-          {...defaultProps}
-          value={{ app_id: 'non-existent', inputs: {}, files: [] }}
-        />,
-      )
-
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-
-    it('should handle value with empty inputs and files', () => {
-      renderWithQueryClient(
-        <AppSelector
-          {...defaultProps}
-          value={{ app_id: 'app-1', inputs: {}, files: [] }}
-        />,
-      )
-
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-  })
-
-  describe('Error Handling', () => {
-    it('should handle fetchNextPage rejection gracefully', async () => {
-      mockHasNextPage = true
-      mockFetchNextPage.mockRejectedValue(new Error('Network error'))
-
-      renderWithQueryClient(<AppSelector {...defaultProps} />)
-
-      // Should not crash
-      // Should not crash
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-  })
-})
-
-// ==================== Integration Tests ====================
-
-describe('AppSelector Integration', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    vi.useFakeTimers()
-    mockAppListData = {
-      pages: [{ data: createMockApps(5), has_more: false, page: 1 }],
-    }
-    mockIsLoading = false
-    mockIsFetchingNextPage = false
-    mockHasNextPage = false
-    mockAppDetailData = undefined
-    mockAppDetailLoading = false
-    mockWorkflowData = undefined
-    mockWorkflowLoading = false
-  })
-
-  afterEach(() => {
-    vi.useRealTimers()
-  })
-
-  describe('Full User Flow', () => {
-    it('should complete full app selection flow', () => {
-      const onSelect = vi.fn()
-
-      renderWithQueryClient(<AppSelector onSelect={onSelect} />)
-
-      // 1. Click trigger to open picker - get first trigger (outer portal)
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
-
-      // Get the first portal element (outer portal)
-      // Get the first portal element (outer portal)
-      expect(screen.getAllByTestId('portal-to-follow-elem')[0])!.toHaveAttribute('data-open', 'true')
-    })
-
-    it('should handle app change with input preservation logic', () => {
-      const onSelect = vi.fn()
-      renderWithQueryClient(
-        <AppSelector
-          onSelect={onSelect}
-          value={{ app_id: 'app-1', inputs: { existing: 'value' }, files: [] }}
-        />,
-      )
-
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-  })
-
-  describe('Component Communication', () => {
-    it('should pass correct props to AppTrigger', () => {
-      renderWithQueryClient(<AppSelector onSelect={vi.fn()} />)
-
-      // AppTrigger should show placeholder when no app selected
-      // AppTrigger should show placeholder when no app selected
-      expect(screen.getByText('app.appSelector.placeholder'))!.toBeInTheDocument()
-    })
-
-    it('should pass correct props to AppPicker', () => {
-      renderWithQueryClient(<AppSelector onSelect={vi.fn()} />)
-
-      fireEvent.click(screen.getByTestId('portal-trigger'))
-
-      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
-    })
-  })
-
-  describe('Data Flow', () => {
-    it('should properly format value with files for AppInputsPanel', () => {
-      renderWithQueryClient(
-        <AppSelector
-          onSelect={vi.fn()}
-          value={{ app_id: 'app-1', inputs: { name: 'test' }, files: [{ id: 'img' }] }}
-        />,
-      )
-
-      expect(screen.getByTestId('portal-to-follow-elem'))!.toBeInTheDocument()
-    })
-
-    it('should handle search filtering through app list', () => {
-      renderWithQueryClient(<AppSelector onSelect={vi.fn()} />)
-
-      fireEvent.click(screen.getByTestId('portal-trigger'))
-
-      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
-    })
-  })
-
-  describe('handleSelectApp Callback', () => {
-    it('should call onSelect with new app when selecting different app', () => {
-      const onSelect = vi.fn()
-      mockAppListData = {
-        pages: [{ data: createMockApps(3), has_more: false, page: 1 }],
-      }
-
-      renderWithQueryClient(
-        <AppSelector
-          onSelect={onSelect}
-          value={{ app_id: 'app-1', inputs: { old: 'value' }, files: [{ id: 'old-file' }] }}
-        />,
-      )
-
-      // Open the main portal
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
-
-      // The inner AppPicker portal is closed by default (isShowChooseApp = false)
-      // We need to click on the inner trigger to open it
-      const innerTriggers = screen.getAllByTestId('portal-trigger')
-      // The second trigger is the inner AppPicker trigger
-      fireEvent.click(innerTriggers[1]!)
-
-      // Now the inner portal should be open and show the app list
-      // Find and click on app-2
-      const app2 = screen.getByText('App 2')
-      fireEvent.click(app2)
-
-      // onSelect should be called with cleared inputs since it's a different app
-      expect(onSelect).toHaveBeenCalledWith({
+    await waitFor(() => {
+      expect(onSelect).toHaveBeenLastCalledWith({
         app_id: 'app-2',
         inputs: {},
         files: [],
       })
     })
-
-    it('should preserve inputs when selecting same app', () => {
-      const onSelect = vi.fn()
-      mockAppListData = {
-        pages: [{ data: createMockApps(3), has_more: false, page: 1 }],
-      }
-
-      renderWithQueryClient(
-        <AppSelector
-          onSelect={onSelect}
-          value={{ app_id: 'app-1', inputs: { existing: 'value' }, files: [{ id: 'existing-file' }] }}
-        />,
-      )
-
-      // Open the main portal
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
-
-      // Click on the inner trigger to open app picker
-      const innerTriggers = screen.getAllByTestId('portal-trigger')
-      fireEvent.click(innerTriggers[1]!)
-
-      // Click on the same app - need to get the one in the app list, not the trigger
-      const appItems = screen.getAllByText('App 1')
-      // The last one should be in the dropdown list
-      fireEvent.click(appItems[appItems.length - 1]!)
-
-      // onSelect should be called with preserved inputs since it's the same app
-      expect(onSelect).toHaveBeenCalledWith({
-        app_id: 'app-1',
-        inputs: { existing: 'value' },
-        files: [{ id: 'existing-file' }],
-      })
-    })
-
-    it('should handle app selection when value is undefined', () => {
-      const onSelect = vi.fn()
-      mockAppListData = {
-        pages: [{ data: createMockApps(3), has_more: false, page: 1 }],
-      }
-
-      renderWithQueryClient(
-        <AppSelector
-          onSelect={onSelect}
-          value={undefined}
-        />,
-      )
-
-      // Open the main portal
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
-
-      // Click on inner trigger to open app picker
-      const innerTriggers = screen.getAllByTestId('portal-trigger')
-      fireEvent.click(innerTriggers[1]!)
-
-      // Click on an app from the dropdown
-      const app1Elements = screen.getAllByText('App 1')
-      fireEvent.click(app1Elements[app1Elements.length - 1]!)
-
-      // onSelect should be called with new app and empty inputs/files
-      expect(onSelect).toHaveBeenCalledWith({
-        app_id: 'app-1',
-        inputs: {},
-        files: [],
-      })
-    })
-  })
-
-  describe('handleLoadMore Callback', () => {
-    it('should handle load more by calling fetchNextPage', async () => {
-      mockHasNextPage = true
-      mockIsFetchingNextPage = false
-      mockFetchNextPage.mockResolvedValue(undefined)
-
-      renderWithQueryClient(<AppSelector onSelect={vi.fn()} />)
-
-      // Open the portal to render the app picker
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
-
-      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
-    })
-
-    it('should stay stable after fetchNextPage completes', async () => {
-      mockHasNextPage = true
-      mockIsFetchingNextPage = false
-      mockFetchNextPage.mockResolvedValue(undefined)
-
-      renderWithQueryClient(<AppSelector onSelect={vi.fn()} />)
-
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
-
-      expect(screen.getByTestId('portal-content'))!.toBeInTheDocument()
-    })
-
-    it('should not call fetchNextPage when conditions prevent it', () => {
-      mockHasNextPage = false
-      mockIsFetchingNextPage = true
-
-      renderWithQueryClient(<AppSelector onSelect={vi.fn()} />)
-
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
-
-      // fetchNextPage should not be called
-      expect(mockFetchNextPage).not.toHaveBeenCalled()
-    })
-  })
-
-  describe('handleFormChange Callback', () => {
-    it('should format value correctly with files for display', () => {
-      const onSelect = vi.fn()
-      mockAppListData = {
-        pages: [{ data: createMockApps(3), has_more: false, page: 1 }],
-      }
-
-      renderWithQueryClient(
-        <AppSelector
-          onSelect={onSelect}
-          value={{ app_id: 'app-1', inputs: { name: 'test' }, files: [{ id: 'file-1' }] }}
-        />,
-      )
-
-      // Open portal
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
-
-      // formattedValue should include #image# from files
-      expect(screen.getAllByTestId('portal-content').length).toBeGreaterThan(0)
-    })
-
-    it('should handle value with no files', () => {
-      const onSelect = vi.fn()
-      mockAppListData = {
-        pages: [{ data: createMockApps(3), has_more: false, page: 1 }],
-      }
-
-      renderWithQueryClient(
-        <AppSelector
-          onSelect={onSelect}
-          value={{ app_id: 'app-1', inputs: { name: 'test' }, files: [] }}
-        />,
-      )
-
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
-
-      expect(screen.getAllByTestId('portal-content').length).toBeGreaterThan(0)
-    })
-
-    it('should handle undefined value.files', () => {
-      const onSelect = vi.fn()
-      mockAppListData = {
-        pages: [{ data: createMockApps(3), has_more: false, page: 1 }],
-      }
-
-      renderWithQueryClient(
-        <AppSelector
-          onSelect={onSelect}
-          value={{ app_id: 'app-1', inputs: {} }}
-        />,
-      )
-
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
-
-      expect(screen.getAllByTestId('portal-content').length).toBeGreaterThan(0)
-    })
-
-    it('should call onSelect with transformed inputs when form input changes', () => {
-      const onSelect = vi.fn()
-      // Include app-1 in the list so currentAppInfo is found
-      mockAppListData = {
-        pages: [{ data: createMockApps(3), has_more: false, page: 1 }],
-      }
-      // Setup mock app detail with form fields - ensure complete form config
-      mockAppDetailData = createMockApp({
-        id: 'app-1',
-        mode: AppModeEnum.CHAT,
-        model_config: {
-          ...createMockApp().model_config,
-          user_input_form: [
-            { 'text-input': { label: 'FormInputField', variable: 'formVar', default: '', required: false, max_length: 100 } },
-          ],
-        },
-      })
-
-      renderWithQueryClient(
-        <AppSelector
-          onSelect={onSelect}
-          value={{ app_id: 'app-1', inputs: {}, files: [] }}
-        />,
-      )
-
-      // Open portal to render AppInputsPanel
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
-
-      // Find and interact with the form input (may not exist if schema is empty)
-      const formInputs = screen.queryAllByPlaceholderText('FormInputField')
-      if (formInputs.length > 0) {
-        fireEvent.change(formInputs[0]!, { target: { value: 'test value' } })
-
-        // handleFormChange in index.tsx should have been called
-        expect(onSelect).toHaveBeenCalledWith({
-          app_id: 'app-1',
-          inputs: { formVar: 'test value' },
-          files: [],
-        })
-      }
-      else {
-        // If form inputs aren't rendered, at least verify component rendered
-        expect(screen.getAllByTestId('portal-content').length).toBeGreaterThan(0)
-      }
-    })
-
-    it('should extract #image# field from inputs and add to files array', () => {
-      const onSelect = vi.fn()
-      mockAppListData = {
-        pages: [{ data: createMockApps(3), has_more: false, page: 1 }],
-      }
-      // Setup COMPLETION mode app with file upload enabled for #image# field
-      // The #image# schema is added when basicAppFileConfig.enabled is true
-      mockAppDetailData = createMockApp({
-        id: 'app-1',
-        mode: AppModeEnum.COMPLETION,
-        model_config: {
-          ...createMockApp().model_config,
-          file_upload: {
-            enabled: true,
-            image: {
-              enabled: true,
-              number_limits: 1,
-              detail: 'high',
-              transfer_methods: ['local_file'],
-            },
-          },
-          user_input_form: [],
-        },
-      })
-
-      renderWithQueryClient(
-        <AppSelector
-          onSelect={onSelect}
-          value={{ app_id: 'app-1', inputs: {}, files: [] }}
-        />,
-      )
-
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
-
-      // Find file uploader and trigger upload - the #image# field will be extracted
-      const uploadBtns = screen.queryAllByTestId('upload-file-btn')
-      if (uploadBtns.length > 0) {
-        fireEvent.click(uploadBtns[0]!)
-        // handleFormChange should extract #image# and convert to files
-        expect(onSelect).toHaveBeenCalled()
-      }
-      else {
-        // Verify component rendered
-        expect(screen.getAllByTestId('portal-content').length).toBeGreaterThan(0)
-      }
-    })
-
-    it('should preserve existing files when inputs do not contain #image#', () => {
-      const onSelect = vi.fn()
-      mockAppListData = {
-        pages: [{ data: createMockApps(3), has_more: false, page: 1 }],
-      }
-      mockAppDetailData = createMockApp({
-        id: 'app-1',
-        mode: AppModeEnum.CHAT,
-        model_config: {
-          ...createMockApp().model_config,
-          user_input_form: [
-            { 'text-input': { label: 'PreserveField', variable: 'name', default: '', required: false, max_length: 50 } },
-          ],
-        },
-      })
-
-      renderWithQueryClient(
-        <AppSelector
-          onSelect={onSelect}
-          value={{ app_id: 'app-1', inputs: { name: 'test' }, files: [{ id: 'preserved-file' }] }}
-        />,
-      )
-
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
-
-      // Find form input (may not exist if schema is empty)
-      const inputs = screen.queryAllByPlaceholderText('PreserveField')
-      if (inputs.length > 0) {
-        fireEvent.change(inputs[0]!, { target: { value: 'updated name' } })
-
-        // onSelect should be called preserving existing files (no #image# in inputs)
-        expect(onSelect).toHaveBeenCalledWith({
-          app_id: 'app-1',
-          inputs: { name: 'updated name' },
-          files: [{ id: 'preserved-file' }],
-        })
-      }
-      else {
-        // If form inputs aren't rendered, at least verify component rendered
-        expect(screen.getAllByTestId('portal-content').length).toBeGreaterThan(0)
-      }
-    })
-
-    it('should handle handleFormChange with #image# field and convert to files', () => {
-      const onSelect = vi.fn()
-      mockAppListData = {
-        pages: [{ data: createMockApps(3), has_more: false, page: 1 }],
-      }
-      // Setup COMPLETION app with file upload - this will add #image# to form schema
-      mockAppDetailData = createMockApp({
-        id: 'app-1',
-        mode: AppModeEnum.COMPLETION,
-        model_config: {
-          ...createMockApp().model_config,
-          file_upload: {
-            enabled: true,
-            image: {
-              enabled: true,
-              number_limits: 1,
-              detail: 'high',
-              transfer_methods: ['local_file'],
-            },
-          },
-          user_input_form: [],
-        },
-      })
-
-      renderWithQueryClient(
-        <AppSelector
-          onSelect={onSelect}
-          value={{ app_id: 'app-1', inputs: {}, files: [] }}
-        />,
-      )
-
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
-
-      // Try to find and click the upload button which triggers #image# form change
-      const uploadBtn = screen.queryByTestId('upload-file-btn')
-      if (uploadBtn) {
-        fireEvent.click(uploadBtn)
-        // handleFormChange should be called and extract #image# to files
-        expect(onSelect).toHaveBeenCalled()
-      }
-    })
-
-    it('should handle handleFormChange without #image# and preserve value files', () => {
-      const onSelect = vi.fn()
-      mockAppListData = {
-        pages: [{ data: createMockApps(3), has_more: false, page: 1 }],
-      }
-      mockAppDetailData = createMockApp({
-        id: 'app-1',
-        mode: AppModeEnum.CHAT,
-        model_config: {
-          ...createMockApp().model_config,
-          user_input_form: [
-            { 'text-input': { label: 'SimpleInput', variable: 'simple', default: '', required: false, max_length: 100 } },
-          ],
-        },
-      })
-
-      renderWithQueryClient(
-        <AppSelector
-          onSelect={onSelect}
-          value={{ app_id: 'app-1', inputs: {}, files: [{ id: 'pre-existing-file' }] }}
-        />,
-      )
-
-      fireEvent.click(screen.getAllByTestId('portal-trigger')[0]!)
-
-      const inputs = screen.queryAllByPlaceholderText('SimpleInput')
-      if (inputs.length > 0) {
-        fireEvent.change(inputs[0]!, { target: { value: 'changed' } })
-        // handleFormChange should preserve existing files when no #image# in inputs
-        expect(onSelect).toHaveBeenCalledWith({
-          app_id: 'app-1',
-          inputs: { simple: 'changed' },
-          files: [{ id: 'pre-existing-file' }],
-        })
-      }
-    })
   })
 })
diff --git a/web/app/components/plugins/plugin-detail-panel/app-selector/app-inputs-form.tsx b/web/app/components/plugins/plugin-detail-panel/app-selector/app-inputs-form.tsx
index c91db9dd84..777882b14a 100644
--- a/web/app/components/plugins/plugin-detail-panel/app-selector/app-inputs-form.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/app-selector/app-inputs-form.tsx
@@ -70,7 +70,7 @@ const AppInputsForm = ({
           <SelectTrigger className="w-full">
             {selectedOption?.name ?? label}
           </SelectTrigger>
-          <SelectContent popupClassName="z-1050 w-(--anchor-width)">
+          <SelectContent>
             {selectOptions.map(option => (
               <SelectItem key={option.value} value={option.value}>
                 <SelectItemText>{option.name}</SelectItemText>
diff --git a/web/app/components/plugins/plugin-detail-panel/app-selector/app-picker.tsx b/web/app/components/plugins/plugin-detail-panel/app-selector/app-picker.tsx
index cf387b1715..9c1f40af90 100644
--- a/web/app/components/plugins/plugin-detail-panel/app-selector/app-picker.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/app-selector/app-picker.tsx
@@ -1,28 +1,32 @@
 'use client'
-import type {
-  OffsetOptions,
-  Placement,
-} from '@floating-ui/react'
-import type { FC } from 'react'
+
+import type { Placement } from '@langgenius/dify-ui/combobox'
+import type { ReactNode } from 'react'
 import type { App } from '@/types/app'
+import { Button } from '@langgenius/dify-ui/button'
 import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from '@langgenius/dify-ui/popover'
-import * as React from 'react'
-import { useCallback, useEffect, useRef } from 'react'
+  Combobox,
+  ComboboxContent,
+  ComboboxEmpty,
+  ComboboxInput,
+  ComboboxInputGroup,
+  ComboboxItem,
+  ComboboxItemText,
+  ComboboxList,
+  ComboboxStatus,
+  ComboboxTrigger,
+} from '@langgenius/dify-ui/combobox'
+import { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 import AppIcon from '@/app/components/base/app-icon'
-import Input from '@/app/components/base/input'
 import { AppModeEnum } from '@/types/app'
 
-type Props = {
-  scope: string
+type AppPickerProps = {
+  scope?: string
   disabled: boolean
-  trigger: React.ReactNode
+  trigger: ReactNode
   placement?: Placement
-  offset?: OffsetOptions
+  offset?: number
   isShow: boolean
   onShowChange: (isShow: boolean) => void
   onSelect: (app: App) => void
@@ -34,8 +38,62 @@ type Props = {
   onSearchChange: (text: string) => void
 }
 
-const AppPicker: FC<Props> = ({
-  scope: _scope,
+function getAppTypeLabel(app: App) {
+  switch (app.mode) {
+    case AppModeEnum.ADVANCED_CHAT:
+      return 'chatflow'
+    case AppModeEnum.AGENT_CHAT:
+      return 'agent'
+    case AppModeEnum.CHAT:
+      return 'chat'
+    case AppModeEnum.COMPLETION:
+      return 'completion'
+    case AppModeEnum.WORKFLOW:
+      return 'workflow'
+    default:
+      return app.mode
+  }
+}
+
+function getAppSearchText(app: App) {
+  return `${app.name} ${app.id} ${getAppTypeLabel(app)}`
+}
+
+function AppPickerOption({
+  app,
+}: {
+  app: App
+}) {
+  return (
+    <ComboboxItem
+      key={app.id}
+      value={app}
+      className="mx-0 grid-cols-[minmax(0,1fr)_auto] gap-3 py-1 pr-3 pl-2"
+    >
+      <ComboboxItemText className="flex min-w-0 items-center gap-3 px-0">
+        <AppIcon
+          className="shrink-0"
+          size="xs"
+          iconType={app.icon_type}
+          icon={app.icon}
+          background={app.icon_background}
+          imageUrl={app.icon_url}
+        />
+        <span title={`${app.name} (${app.id})`} className="min-w-0 grow truncate system-sm-medium text-components-input-text-filled">
+          <span className="mr-1">{app.name}</span>
+          <span className="text-text-tertiary">
+            (
+            {app.id.slice(0, 8)}
+            )
+          </span>
+        </span>
+      </ComboboxItemText>
+      <span className="shrink-0 system-2xs-medium-uppercase text-text-tertiary">{getAppTypeLabel(app)}</span>
+    </ComboboxItem>
+  )
+}
+
+export function AppPicker({
   disabled,
   trigger,
   placement = 'right-start',
@@ -49,186 +107,91 @@ const AppPicker: FC<Props> = ({
   onLoadMore,
   searchText,
   onSearchChange,
-}) => {
+}: AppPickerProps) {
   const { t } = useTranslation()
-  const observerTargetRef = useRef<HTMLDivElement>(null)
-  const observerRef = useRef<IntersectionObserver | null>(null)
-  const loadingRef = useRef(false)
-  const loadingResetTimerIdRef = useRef<number | undefined>(undefined)
 
-  const retimeLoadingReset = useCallback((timerId?: number) => {
-    if (loadingResetTimerIdRef.current !== undefined)
-      globalThis.clearTimeout(loadingResetTimerIdRef.current)
-
-    loadingResetTimerIdRef.current = timerId
-  }, [])
-
-  const resetLoadingState = useCallback(() => {
-    retimeLoadingReset()
-    loadingRef.current = false
-  }, [retimeLoadingReset])
-
-  const disconnectObserver = useCallback(() => {
-    if (!observerRef.current)
+  const handleValueChange = useCallback((app: App | null) => {
+    if (!app)
       return
 
-    observerRef.current.disconnect()
-    observerRef.current = null
-  }, [])
-
-  const handleIntersection = useCallback((entries: IntersectionObserverEntry[]) => {
-    const target = entries[0]
-    if (!target!.isIntersecting || loadingRef.current || !hasMore || isLoading)
-      return
-
-    loadingRef.current = true
-    onLoadMore()
-    retimeLoadingReset(window.setTimeout(() => {
-      loadingRef.current = false
-      retimeLoadingReset()
-    }, 500))
-  }, [hasMore, isLoading, onLoadMore, retimeLoadingReset])
-
-  useEffect(() => {
-    if (!isShow) {
-      resetLoadingState()
-      disconnectObserver()
-      return
-    }
-
-    let mutationObserver: MutationObserver | null = null
-
-    const setupIntersectionObserver = () => {
-      if (!observerTargetRef.current)
-        return
-
-      disconnectObserver()
-
-      // Create new observer
-      observerRef.current = new IntersectionObserver(handleIntersection, {
-        root: null,
-        rootMargin: '100px',
-        threshold: 0.1,
-      })
-
-      observerRef.current.observe(observerTargetRef.current)
-    }
-
-    // Set up MutationObserver to watch DOM changes
-    mutationObserver = new MutationObserver((_mutations) => {
-      if (observerTargetRef.current) {
-        setupIntersectionObserver()
-        mutationObserver?.disconnect()
-      }
-    })
-
-    // Watch body changes since Portal adds content to body
-    mutationObserver.observe(document.body, {
-      childList: true,
-      subtree: true,
-    })
-
-    // If element exists, set up IntersectionObserver directly
-    if (observerTargetRef.current)
-      setupIntersectionObserver()
-
-    return () => {
-      resetLoadingState()
-      disconnectObserver()
-      mutationObserver?.disconnect()
-    }
-  }, [disconnectObserver, handleIntersection, isShow, resetLoadingState])
-
-  const getAppType = (app: App) => {
-    switch (app.mode) {
-      case AppModeEnum.ADVANCED_CHAT:
-        return 'chatflow'
-      case AppModeEnum.AGENT_CHAT:
-        return 'agent'
-      case AppModeEnum.CHAT:
-        return 'chat'
-      case AppModeEnum.COMPLETION:
-        return 'completion'
-      case AppModeEnum.WORKFLOW:
-        return 'workflow'
-    }
-  }
-
-  const resolvedOffset = typeof offset === 'number' || typeof offset === 'function' ? undefined : offset
-  const sideOffset = typeof offset === 'number' ? offset : resolvedOffset?.mainAxis ?? 0
-  const alignOffset = typeof offset === 'number' ? 0 : resolvedOffset?.crossAxis ?? resolvedOffset?.alignmentAxis ?? 0
-  const handleTriggerClick = useCallback((event: React.MouseEvent<HTMLElement>) => {
-    event.preventDefault()
-    if (disabled || isShow)
-      return
-
-    onShowChange(true)
-  }, [disabled, isShow, onShowChange])
+    onSelect(app)
+    onShowChange(false)
+  }, [onSelect, onShowChange])
 
   return (
-    <Popover
+    <Combobox<App>
+      items={apps}
       open={isShow}
+      inputValue={searchText}
       onOpenChange={onShowChange}
+      onInputValueChange={onSearchChange}
+      onValueChange={handleValueChange}
+      itemToStringLabel={app => app?.name ?? ''}
+      itemToStringValue={app => app?.id ?? ''}
+      filter={(app, query) => getAppSearchText(app).toLowerCase().includes(query.toLowerCase())}
+      disabled={disabled}
     >
-      <PopoverTrigger
-        render={<div>{trigger}</div>}
-        onClick={handleTriggerClick}
-      />
-
-      <PopoverContent
+      <ComboboxTrigger
+        aria-label={t('appSelector.label', { ns: 'app' })}
+        icon={false}
+        className="block h-auto w-full border-0 bg-transparent p-0 text-left hover:bg-transparent focus-visible:bg-transparent focus-visible:ring-0 data-open:bg-transparent"
+      >
+        {trigger}
+      </ComboboxTrigger>
+      <ComboboxContent
         placement={placement}
-        sideOffset={sideOffset}
-        alignOffset={alignOffset}
+        sideOffset={offset}
         popupClassName="border-0 bg-transparent p-0 shadow-none backdrop-blur-none"
       >
-        <div className="relative flex max-h-[400px] min-h-20 w-[356px] flex-col rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg backdrop-blur-xs">
+        <div className="relative flex max-h-100 min-h-20 w-89 flex-col rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg backdrop-blur-xs">
           <div className="p-2 pb-1">
-            <Input
-              showLeftIcon
-              showClearIcon
-              value={searchText}
-              onChange={e => onSearchChange(e.target.value)}
-              onClear={() => onSearchChange('')}
-            />
+            <ComboboxInputGroup className="h-8 min-h-8 px-2">
+              <span className="mr-0.5 i-ri-search-line size-4 shrink-0 text-text-tertiary" aria-hidden="true" />
+              <ComboboxInput
+                aria-label={t('appSelector.placeholder', { ns: 'app' })}
+                placeholder={t('appSelector.placeholder', { ns: 'app' })}
+                className="block h-4.5 grow px-1 py-0 text-[13px] text-text-primary"
+              />
+              {searchText && (
+                <button
+                  type="button"
+                  aria-label={t('operation.clear', { ns: 'common' })}
+                  className="ml-1.5 flex size-3.5 shrink-0 cursor-pointer items-center justify-center rounded-none text-text-quaternary outline-hidden hover:bg-transparent hover:text-text-quaternary focus-visible:ring-1 focus-visible:ring-components-input-border-active"
+                  onClick={() => onSearchChange('')}
+                >
+                  <span className="i-custom-vender-solid-general-x-circle size-3.5" aria-hidden="true" />
+                </button>
+              )}
+            </ComboboxInputGroup>
           </div>
           <div className="min-h-0 flex-1 overflow-y-auto p-1">
-            {apps.map(app => (
-              <div
-                key={app.id}
-                className="flex cursor-pointer items-center gap-3 rounded-lg py-1 pr-3 pl-2 hover:bg-state-base-hover"
-                onClick={() => onSelect(app)}
-              >
-                <AppIcon
-                  className="shrink-0"
-                  size="xs"
-                  iconType={app.icon_type}
-                  icon={app.icon}
-                  background={app.icon_background}
-                  imageUrl={app.icon_url}
-                />
-                <div title={`${app.name} (${app.id})`} className="grow system-sm-medium text-components-input-text-filled">
-                  <span className="mr-1">{app.name}</span>
-                  <span className="text-text-tertiary">
-                    (
-                    {app.id.slice(0, 8)}
-                    )
-                  </span>
-                </div>
-                <div className="shrink-0 system-2xs-medium-uppercase text-text-tertiary">{getAppType(app)}</div>
-              </div>
-            ))}
-            <div ref={observerTargetRef} className="h-4 w-full">
-              {isLoading && (
-                <div className="flex justify-center py-2">
-                  <div className="text-sm text-gray-500">{t('loading', { ns: 'common' })}</div>
-                </div>
+            {isLoading && (
+              <ComboboxStatus>
+                {t('loading', { ns: 'common' })}
+              </ComboboxStatus>
+            )}
+            <ComboboxList className="max-h-none p-0">
+              {(app: App) => (
+                <AppPickerOption key={app.id} app={app} />
               )}
-            </div>
+            </ComboboxList>
+            <ComboboxEmpty>
+              {t('noData', { ns: 'common' })}
+            </ComboboxEmpty>
+            {hasMore && (
+              <div className="flex justify-center px-3 py-2">
+                <Button
+                  size="small"
+                  disabled={isLoading}
+                  onClick={() => onLoadMore()}
+                >
+                  {isLoading ? t('loading', { ns: 'common' }) : t('common.loadMore', { ns: 'workflow' })}
+                </Button>
+              </div>
+            )}
           </div>
         </div>
-      </PopoverContent>
-    </Popover>
+      </ComboboxContent>
+    </Combobox>
   )
 }
-
-export default React.memo(AppPicker)
diff --git a/web/app/components/plugins/plugin-detail-panel/app-selector/app-trigger.tsx b/web/app/components/plugins/plugin-detail-panel/app-selector/app-trigger.tsx
index aacafb3c31..d6f2c15bcf 100644
--- a/web/app/components/plugins/plugin-detail-panel/app-selector/app-trigger.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/app-selector/app-trigger.tsx
@@ -1,33 +1,32 @@
 'use client'
+
 import type { App } from '@/types/app'
 import { cn } from '@langgenius/dify-ui/cn'
-import {
-  RiArrowDownSLine,
-} from '@remixicon/react'
-import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import AppIcon from '@/app/components/base/app-icon'
 
-type Props = {
+type AppTriggerProps = {
   open: boolean
   appDetail?: App
 }
 
-const AppTrigger = ({
+export function AppTrigger({
   open,
   appDetail,
-}: Props) => {
+}: AppTriggerProps) {
   const { t } = useTranslation()
+
   return (
-    <div className={cn(
-      'group flex cursor-pointer items-center rounded-lg bg-components-input-bg-normal p-2 pl-3 hover:bg-state-base-hover-alt',
-      open && 'bg-state-base-hover-alt',
-      appDetail && 'py-1.5 pl-1.5',
-    )}
+    <span
+      className={cn(
+        'group flex cursor-pointer items-center rounded-lg bg-components-input-bg-normal p-2 pl-3 hover:bg-state-base-hover-alt',
+        open && 'bg-state-base-hover-alt',
+        appDetail && 'py-1.5 pl-1.5',
+      )}
     >
       {appDetail && (
         <AppIcon
-          className="mr-2"
+          className="mr-2 shrink-0"
           size="xs"
           iconType={appDetail.icon_type}
           icon={appDetail.icon}
@@ -35,15 +34,24 @@ const AppTrigger = ({
           imageUrl={appDetail.icon_url}
         />
       )}
-      {appDetail && (
-        <div title={appDetail.name} className="grow system-sm-medium text-components-input-text-filled">{appDetail.name}</div>
-      )}
-      {!appDetail && (
-        <div className="grow truncate system-sm-regular text-components-input-text-placeholder">{t('appSelector.placeholder', { ns: 'app' })}</div>
-      )}
-      <RiArrowDownSLine className={cn('ml-0.5 h-4 w-4 shrink-0 text-text-quaternary group-hover:text-text-secondary', open && 'text-text-secondary')} />
-    </div>
+      {appDetail
+        ? (
+            <span title={appDetail.name} className="min-w-0 grow truncate system-sm-medium text-components-input-text-filled">
+              {appDetail.name}
+            </span>
+          )
+        : (
+            <span className="min-w-0 grow truncate system-sm-regular text-components-input-text-placeholder">
+              {t('appSelector.placeholder', { ns: 'app' })}
+            </span>
+          )}
+      <span
+        className={cn(
+          'ml-0.5 i-ri-arrow-down-s-line size-4 shrink-0 text-text-quaternary group-hover:text-text-secondary',
+          open && 'text-text-secondary',
+        )}
+        aria-hidden="true"
+      />
+    </span>
   )
 }
-
-export default AppTrigger
diff --git a/web/app/components/plugins/plugin-detail-panel/app-selector/index.tsx b/web/app/components/plugins/plugin-detail-panel/app-selector/index.tsx
index 76dbdba7aa..8d3094a2a0 100644
--- a/web/app/components/plugins/plugin-detail-panel/app-selector/index.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/app-selector/index.tsx
@@ -1,212 +1,176 @@
 'use client'
-import type {
-  OffsetOptions,
-  Placement,
-} from '@floating-ui/react'
-import type { FC } from 'react'
+
+import type { Placement } from '@langgenius/dify-ui/popover'
 import type { App } from '@/types/app'
 import {
   Popover,
   PopoverContent,
   PopoverTrigger,
 } from '@langgenius/dify-ui/popover'
-import * as React from 'react'
+import { keepPreviousData, useInfiniteQuery } from '@tanstack/react-query'
 import { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import AppInputsPanel from '@/app/components/plugins/plugin-detail-panel/app-selector/app-inputs-panel'
-import AppPicker from '@/app/components/plugins/plugin-detail-panel/app-selector/app-picker'
-import AppTrigger from '@/app/components/plugins/plugin-detail-panel/app-selector/app-trigger'
-import { useAppDetail, useInfiniteAppList } from '@/service/use-apps'
+import { AppPicker } from '@/app/components/plugins/plugin-detail-panel/app-selector/app-picker'
+import { AppTrigger } from '@/app/components/plugins/plugin-detail-panel/app-selector/app-trigger'
+import { consoleQuery } from '@/service/client'
+import { useAppDetail } from '@/service/use-apps'
 
 const PAGE_SIZE = 20
 
-type Props = {
-  value?: {
-    app_id: string
-    inputs: Record<string, unknown>
-    files?: unknown[]
-  }
+export type AppSelectorValue = {
+  app_id: string
+  inputs: Record<string, unknown>
+  files?: unknown[]
+}
+
+type AppSelectorProps = {
+  value?: AppSelectorValue
   scope?: string
   disabled?: boolean
   placement?: Placement
-  offset?: OffsetOptions
-  onSelect: (app: {
-    app_id: string
-    inputs: Record<string, unknown>
-    files?: unknown[]
-  }) => void
-  supportAddCustomTool?: boolean
+  offset?: number
+  onSelect: (app: AppSelectorValue) => void
 }
 
-const AppSelector: FC<Props> = ({
+export function AppSelector({
   value,
-  scope,
   disabled,
   placement = 'bottom',
   offset = 4,
   onSelect,
-}) => {
+}: AppSelectorProps) {
   const { t } = useTranslation()
   const [isShow, setIsShow] = useState(false)
+  const [isShowChooseApp, setIsShowChooseApp] = useState(false)
   const [searchText, setSearchText] = useState('')
 
+  const appListQuery = useMemo(() => ({
+    page: 1,
+    limit: PAGE_SIZE,
+    name: searchText,
+  }), [searchText])
+
   const {
     data,
     isLoading,
     isFetchingNextPage,
     fetchNextPage,
     hasNextPage,
-  } = useInfiniteAppList({
-    page: 1,
-    limit: PAGE_SIZE,
-    name: searchText,
+  } = useInfiniteQuery({
+    ...consoleQuery.apps.list.infiniteOptions({
+      input: pageParam => ({
+        query: {
+          ...appListQuery,
+          page: Number(pageParam),
+        },
+      }),
+      getNextPageParam: lastPage => lastPage.has_more ? lastPage.page + 1 : undefined,
+      initialPageParam: 1,
+      placeholderData: keepPreviousData,
+    }),
   })
 
   const displayedApps = useMemo(() => {
-    const pages = data?.pages ?? []
-    if (!pages.length)
-      return []
-    return pages.flatMap(({ data: apps }) => apps)
+    return data?.pages.flatMap(({ data: apps }) => apps) ?? []
   }, [data?.pages])
 
-  // fetch selected app by id to avoid pagination gaps
   const { data: selectedAppDetail } = useAppDetail(value?.app_id || '')
 
-  // Ensure the currently selected app is available for display and in the picker options
   const currentAppInfo = useMemo(() => {
     if (!value?.app_id)
       return undefined
+
     return selectedAppDetail || displayedApps.find(app => app.id === value.app_id)
-  }, [value?.app_id, selectedAppDetail, displayedApps])
-
-  const appsForPicker = useMemo(() => {
-    if (!currentAppInfo)
-      return displayedApps
-
-    const appIndex = displayedApps.findIndex(a => a.id === currentAppInfo.id)
-
-    if (appIndex === -1)
-      return [currentAppInfo, ...displayedApps]
-
-    const updatedApps = [...displayedApps]
-    updatedApps[appIndex] = currentAppInfo
-    return updatedApps
-  }, [currentAppInfo, displayedApps])
+  }, [displayedApps, selectedAppDetail, value?.app_id])
 
   const hasMore = hasNextPage ?? true
-  const resolvedOffset = typeof offset === 'number' || typeof offset === 'function' ? undefined : offset
-  const sideOffset = typeof offset === 'number' ? offset : resolvedOffset?.mainAxis ?? 0
-  const alignOffset = typeof offset === 'number' ? 0 : resolvedOffset?.crossAxis ?? resolvedOffset?.alignmentAxis ?? 0
 
-  const handleLoadMore = useCallback(async () => {
-    if (isFetchingNextPage || !hasMore)
-      return
+  const handleSelectApp = useCallback((app: App) => {
+    const shouldClearValue = app.id !== value?.app_id
 
-    await fetchNextPage()
-  }, [fetchNextPage, hasMore, isFetchingNextPage])
-
-  const handleTriggerClick = useCallback((event: React.MouseEvent<HTMLElement>) => {
-    event.preventDefault()
-    if (disabled || isShow)
-      return
-
-    setIsShow(true)
-  }, [disabled, isShow])
-
-  const [isShowChooseApp, setIsShowChooseApp] = useState(false)
-  const handleSelectApp = (app: App) => {
-    const clearValue = app.id !== value?.app_id
-    const appValue = {
+    onSelect({
       app_id: app.id,
-      inputs: clearValue ? {} : value?.inputs || {},
-      files: clearValue ? [] : value?.files || [],
-    }
-    onSelect(appValue)
-    setIsShowChooseApp(false)
-  }
+      inputs: shouldClearValue ? {} : value?.inputs || {},
+      files: shouldClearValue ? [] : value?.files || [],
+    })
+  }, [onSelect, value?.app_id, value?.files, value?.inputs])
 
-  const handleFormChange = (inputs: Record<string, unknown>) => {
+  const handleFormChange = useCallback((inputs: Record<string, unknown>) => {
     const newFiles = inputs['#image#']
-    delete inputs['#image#']
-    const newValue = {
-      app_id: value?.app_id || '',
-      inputs,
-      files: newFiles ? [newFiles] : value?.files || [],
-    }
-    onSelect(newValue)
-  }
+    const nextInputs = { ...inputs }
+    delete nextInputs['#image#']
 
-  const formattedValue = useMemo(() => {
-    return {
+    onSelect({
       app_id: value?.app_id || '',
-      inputs: {
-        ...value?.inputs,
-        ...(value?.files?.length ? { '#image#': value.files[0] } : {}),
-      },
-    }
-  }, [value])
+      inputs: nextInputs,
+      files: newFiles ? [newFiles] : value?.files || [],
+    })
+  }, [onSelect, value?.app_id, value?.files])
+
+  const formattedValue = useMemo(() => ({
+    app_id: value?.app_id || '',
+    inputs: {
+      ...value?.inputs,
+      ...(value?.files?.length ? { '#image#': value.files[0] } : {}),
+    },
+  }), [value])
 
   return (
-    <>
-      <Popover
-        open={isShow}
-        onOpenChange={setIsShow}
+    <Popover
+      open={isShow}
+      onOpenChange={setIsShow}
+    >
+      <PopoverTrigger
+        aria-label={t('appSelector.label', { ns: 'app' })}
+        disabled={disabled}
+        render={<button type="button" className="block w-full border-0 bg-transparent p-0 text-left" />}
       >
-        <PopoverTrigger
-          render={(
-            <div className="w-full">
-              <AppTrigger
-                open={isShow}
-                appDetail={currentAppInfo}
-              />
-            </div>
-          )}
-          onClick={handleTriggerClick}
+        <AppTrigger
+          open={isShow}
+          appDetail={currentAppInfo}
         />
-        <PopoverContent
-          placement={placement}
-          sideOffset={sideOffset}
-          alignOffset={alignOffset}
-          popupClassName="border-0 bg-transparent p-0 shadow-none backdrop-blur-none"
-        >
-          <div className="relative min-h-20 w-[389px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg backdrop-blur-xs">
-            <div className="flex flex-col gap-1 px-4 py-3">
-              <div className="flex h-6 items-center system-sm-semibold text-text-secondary">{t('appSelector.label', { ns: 'app' })}</div>
-              <AppPicker
-                placement="bottom"
-                offset={offset}
-                trigger={(
-                  <AppTrigger
-                    open={isShowChooseApp}
-                    appDetail={currentAppInfo}
-                  />
-                )}
-                isShow={isShowChooseApp}
-                onShowChange={setIsShowChooseApp}
-                disabled={false}
-                onSelect={handleSelectApp}
-                scope={scope || 'all'}
-                apps={appsForPicker}
-                isLoading={isLoading || isFetchingNextPage}
-                hasMore={hasMore}
-                onLoadMore={handleLoadMore}
-                searchText={searchText}
-                onSearchChange={setSearchText}
-              />
-            </div>
-            {/* app inputs config panel */}
-            {currentAppInfo && (
-              <AppInputsPanel
-                value={formattedValue}
-                appDetail={currentAppInfo}
-                onFormChange={handleFormChange}
-              />
-            )}
+      </PopoverTrigger>
+      <PopoverContent
+        placement={placement}
+        sideOffset={offset}
+        popupClassName="border-0 bg-transparent p-0 shadow-none backdrop-blur-none"
+      >
+        <div className="relative min-h-20 w-[389px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg backdrop-blur-xs">
+          <div className="flex flex-col gap-1 px-4 py-3">
+            <div className="flex h-6 items-center system-sm-semibold text-text-secondary">{t('appSelector.label', { ns: 'app' })}</div>
+            <AppPicker
+              placement="bottom"
+              offset={offset}
+              trigger={(
+                <AppTrigger
+                  open={isShowChooseApp}
+                  appDetail={currentAppInfo}
+                />
+              )}
+              isShow={isShowChooseApp}
+              onShowChange={setIsShowChooseApp}
+              disabled={false}
+              onSelect={handleSelectApp}
+              apps={displayedApps}
+              isLoading={isLoading || isFetchingNextPage}
+              hasMore={hasMore}
+              onLoadMore={() => {
+                void fetchNextPage()
+              }}
+              searchText={searchText}
+              onSearchChange={setSearchText}
+            />
           </div>
-        </PopoverContent>
-      </Popover>
-    </>
+          {currentAppInfo && (
+            <AppInputsPanel
+              value={formattedValue}
+              appDetail={currentAppInfo}
+              onFormChange={handleFormChange}
+            />
+          )}
+        </div>
+      </PopoverContent>
+    </Popover>
   )
 }
-
-export default React.memo(AppSelector)
diff --git a/web/app/components/plugins/plugin-detail-panel/endpoint-modal.tsx b/web/app/components/plugins/plugin-detail-panel/endpoint-modal.tsx
index 0fe0fff6df..5bac8c827b 100644
--- a/web/app/components/plugins/plugin-detail-panel/endpoint-modal.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/endpoint-modal.tsx
@@ -4,12 +4,19 @@ import type { FormSchema } from '../../base/form/types'
 import type { PluginDetail } from '../types'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  Drawer,
+  DrawerBackdrop,
+  DrawerContent,
+  DrawerPopup,
+  DrawerPortal,
+  DrawerViewport,
+} from '@langgenius/dify-ui/drawer'
 import { toast } from '@langgenius/dify-ui/toast'
 import { RiArrowRightUpLine, RiCloseLine } from '@remixicon/react'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import ActionButton from '@/app/components/base/action-button'
-import Drawer from '@/app/components/base/drawer'
 import Form from '@/app/components/header/account-setting/model-provider-page/model-modal/Form'
 import { useRenderI18nObject } from '@/hooks/use-i18n'
 import { ReadmeEntrance } from '../readme-panel/entrance'
@@ -75,60 +82,67 @@ const EndpointModal: FC<Props> = ({
 
   return (
     <Drawer
-      isOpen
-      clickOutsideNotOpen={false}
-      onClose={onCancel}
-      footer={null}
-      mask
-      positionCenter={false}
-      panelClassName={cn('mt-[64px] mr-2 mb-2 w-[420px]! max-w-[420px]! justify-start rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg! p-0! shadow-xl')}
+      open
+      modal
+      swipeDirection="right"
+      onOpenChange={(open) => {
+        if (!open)
+          onCancel()
+      }}
     >
-      <>
-        <div className="p-4 pb-2">
-          <div className="flex items-center justify-between">
-            <div className="system-xl-semibold text-text-primary">{t('detailPanel.endpointModalTitle', { ns: 'plugin' })}</div>
-            <ActionButton onClick={onCancel}>
-              <RiCloseLine className="h-4 w-4" />
-            </ActionButton>
-          </div>
-          <div className="mt-0.5 system-xs-regular text-text-tertiary">{t('detailPanel.endpointModalDesc', { ns: 'plugin' })}</div>
-          <ReadmeEntrance pluginDetail={pluginDetail} className="px-0 pt-3" />
-        </div>
-        <div className="grow overflow-y-auto">
-          <div className="px-4 py-2">
-            <Form
-              value={tempCredential}
-              onChange={(v) => {
-                setTempCredential(v)
-              }}
-              formSchemas={formSchemas as any}
-              isEditMode={true}
-              showOnVariableMap={{}}
-              validating={false}
-              inputClassName="bg-components-input-bg-normal hover:bg-components-input-bg-hover"
-              fieldMoreInfo={item => item.url
-                ? (
-                    <a
-                      href={item.url}
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      className="inline-flex items-center body-xs-regular text-text-accent-secondary"
-                    >
-                      {t('howToGet', { ns: 'tools' })}
-                      <RiArrowRightUpLine className="ml-1 h-3 w-3" />
-                    </a>
-                  )
-                : null}
-            />
-          </div>
-          <div className={cn('flex justify-end p-4 pt-0')}>
-            <div className="flex gap-2">
-              <Button onClick={onCancel}>{t('operation.cancel', { ns: 'common' })}</Button>
-              <Button variant="primary" onClick={handleSave}>{t('operation.save', { ns: 'common' })}</Button>
-            </div>
-          </div>
-        </div>
-      </>
+      <DrawerPortal>
+        <DrawerBackdrop className="bg-black/30" />
+        <DrawerViewport>
+          <DrawerPopup className={cn('justify-start bg-components-panel-bg! p-0! shadow-xl data-[swipe-direction=right]:top-16 data-[swipe-direction=right]:right-2 data-[swipe-direction=right]:bottom-2 data-[swipe-direction=right]:h-auto data-[swipe-direction=right]:w-[420px] data-[swipe-direction=right]:max-w-[420px] data-[swipe-direction=right]:rounded-2xl data-[swipe-direction=right]:border-[0.5px] data-[swipe-direction=right]:border-components-panel-border')}>
+            <DrawerContent className="flex min-h-0 flex-1 flex-col p-0 pb-0">
+              <div className="p-4 pb-2">
+                <div className="flex items-center justify-between">
+                  <div className="system-xl-semibold text-text-primary">{t('detailPanel.endpointModalTitle', { ns: 'plugin' })}</div>
+                  <ActionButton onClick={onCancel}>
+                    <RiCloseLine className="h-4 w-4" />
+                  </ActionButton>
+                </div>
+                <div className="mt-0.5 system-xs-regular text-text-tertiary">{t('detailPanel.endpointModalDesc', { ns: 'plugin' })}</div>
+                <ReadmeEntrance pluginDetail={pluginDetail} className="px-0 pt-3" />
+              </div>
+              <div className="grow overflow-y-auto">
+                <div className="px-4 py-2">
+                  <Form
+                    value={tempCredential}
+                    onChange={(v) => {
+                      setTempCredential(v)
+                    }}
+                    formSchemas={formSchemas as any}
+                    isEditMode={true}
+                    showOnVariableMap={{}}
+                    validating={false}
+                    inputClassName="bg-components-input-bg-normal hover:bg-components-input-bg-hover"
+                    fieldMoreInfo={item => item.url
+                      ? (
+                          <a
+                            href={item.url}
+                            target="_blank"
+                            rel="noopener noreferrer"
+                            className="inline-flex items-center body-xs-regular text-text-accent-secondary"
+                          >
+                            {t('howToGet', { ns: 'tools' })}
+                            <RiArrowRightUpLine className="ml-1 h-3 w-3" />
+                          </a>
+                        )
+                      : null}
+                  />
+                </div>
+                <div className={cn('flex justify-end p-4 pt-0')}>
+                  <div className="flex gap-2">
+                    <Button onClick={onCancel}>{t('operation.cancel', { ns: 'common' })}</Button>
+                    <Button variant="primary" onClick={handleSave}>{t('operation.save', { ns: 'common' })}</Button>
+                  </div>
+                </div>
+              </div>
+            </DrawerContent>
+          </DrawerPopup>
+        </DrawerViewport>
+      </DrawerPortal>
     </Drawer>
   )
 }
diff --git a/web/app/components/plugins/plugin-detail-panel/index.tsx b/web/app/components/plugins/plugin-detail-panel/index.tsx
index 3041d2e2a6..877b15c51e 100644
--- a/web/app/components/plugins/plugin-detail-panel/index.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/index.tsx
@@ -2,8 +2,15 @@
 import type { FC } from 'react'
 import type { PluginDetail } from '@/app/components/plugins/types'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  Drawer,
+  DrawerBackdrop,
+  DrawerContent,
+  DrawerPopup,
+  DrawerPortal,
+  DrawerViewport,
+} from '@langgenius/dify-ui/drawer'
 import { useCallback, useEffect } from 'react'
-import Drawer from '@/app/components/base/drawer'
 import { PluginCategoryEnum } from '@/app/components/plugins/types'
 import { ReadmeEntrance } from '../readme-panel/entrance'
 import ActionList from './action-list'
@@ -53,37 +60,46 @@ const PluginDetailPanel: FC<Props> = ({
 
   return (
     <Drawer
-      isOpen={!!detail}
-      clickOutsideNotOpen={false}
-      onClose={onHide}
-      footer={null}
-      mask={false}
-      positionCenter={false}
-      panelClassName={cn('mt-[64px] mr-2 mb-2 w-[420px]! max-w-[420px]! justify-start rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg! p-0! shadow-xl')}
+      open={!!detail}
+      modal
+      swipeDirection="right"
+      onOpenChange={(open) => {
+        if (!open)
+          onHide()
+      }}
     >
-      {detail && (
-        <>
-          <DetailHeader detail={detail} onUpdate={handleUpdate} onHide={onHide} />
-          <div className="grow overflow-y-auto">
-            <div className="flex min-h-full flex-col">
-              <div className="flex-1">
-                {detail.declaration.category === PluginCategoryEnum.trigger && (
-                  <>
-                    <SubscriptionList pluginDetail={detail} />
-                    <TriggerEventsList />
-                  </>
-                )}
-                {!!detail.declaration.tool && <ActionList detail={detail} />}
-                {!!detail.declaration.agent_strategy && <AgentStrategyList detail={detail} />}
-                {!!detail.declaration.endpoint && <EndpointList detail={detail} />}
-                {!!detail.declaration.model && <ModelList detail={detail} />}
-                {!!detail.declaration.datasource && <DatasourceActionList detail={detail} />}
-              </div>
-              <ReadmeEntrance pluginDetail={detail} className="mt-auto" />
-            </div>
-          </div>
-        </>
-      )}
+      <DrawerPortal>
+        <DrawerBackdrop className="bg-transparent" />
+        <DrawerViewport>
+          <DrawerPopup className={cn('justify-start bg-components-panel-bg! p-0! shadow-xl data-[swipe-direction=right]:top-16 data-[swipe-direction=right]:right-2 data-[swipe-direction=right]:bottom-2 data-[swipe-direction=right]:h-auto data-[swipe-direction=right]:w-[420px] data-[swipe-direction=right]:max-w-[420px] data-[swipe-direction=right]:rounded-2xl data-[swipe-direction=right]:border-[0.5px] data-[swipe-direction=right]:border-components-panel-border')}>
+            <DrawerContent className="flex min-h-0 flex-1 flex-col p-0 pb-0">
+              {detail && (
+                <>
+                  <DetailHeader detail={detail} onUpdate={handleUpdate} onHide={onHide} />
+                  <div className="grow overflow-y-auto">
+                    <div className="flex min-h-full flex-col">
+                      <div className="flex-1">
+                        {detail.declaration.category === PluginCategoryEnum.trigger && (
+                          <>
+                            <SubscriptionList pluginDetail={detail} />
+                            <TriggerEventsList />
+                          </>
+                        )}
+                        {!!detail.declaration.tool && <ActionList detail={detail} />}
+                        {!!detail.declaration.agent_strategy && <AgentStrategyList detail={detail} />}
+                        {!!detail.declaration.endpoint && <EndpointList detail={detail} />}
+                        {!!detail.declaration.model && <ModelList detail={detail} />}
+                        {!!detail.declaration.datasource && <DatasourceActionList detail={detail} />}
+                      </div>
+                      <ReadmeEntrance pluginDetail={detail} className="mt-auto" />
+                    </div>
+                  </div>
+                </>
+              )}
+            </DrawerContent>
+          </DrawerPopup>
+        </DrawerViewport>
+      </DrawerPortal>
     </Drawer>
   )
 }
diff --git a/web/app/components/plugins/plugin-detail-panel/model-selector/__tests__/llm-params-panel.spec.tsx b/web/app/components/plugins/plugin-detail-panel/model-selector/__tests__/llm-params-panel.spec.tsx
index 17fad8d7a7..8230ec5b14 100644
--- a/web/app/components/plugins/plugin-detail-panel/model-selector/__tests__/llm-params-panel.spec.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/model-selector/__tests__/llm-params-panel.spec.tsx
@@ -75,14 +75,58 @@ vi.mock('@/config', () => ({
 
 // Mock PresetsParameter component
 vi.mock('@/app/components/header/account-setting/model-provider-page/model-parameter-modal/presets-parameter', () => ({
-  default: ({ onSelect }: { onSelect: (toneId: number) => void }) => (
-    <div data-testid="presets-parameter">
-      <button data-testid="preset-creative" onClick={() => onSelect(1)}>Creative</button>
-      <button data-testid="preset-balanced" onClick={() => onSelect(2)}>Balanced</button>
-      <button data-testid="preset-precise" onClick={() => onSelect(3)}>Precise</button>
-      <button data-testid="preset-custom" onClick={() => onSelect(4)}>Custom</button>
-    </div>
-  ),
+  default: ({ onSelect, supportedParameterNames }: { onSelect: (toneId: number) => void, supportedParameterNames?: string[] }) => {
+    const hasSupportedParameter = !supportedParameterNames || supportedParameterNames.some(name => ['temperature', 'top_p', 'presence_penalty', 'frequency_penalty'].includes(name))
+    if (!hasSupportedParameter)
+      return null
+
+    return (
+      <div data-testid="presets-parameter">
+        <button data-testid="preset-creative" onClick={() => onSelect(1)}>Creative</button>
+        <button data-testid="preset-balanced" onClick={() => onSelect(2)}>Balanced</button>
+        <button data-testid="preset-precise" onClick={() => onSelect(3)}>Precise</button>
+        <button data-testid="preset-custom" onClick={() => onSelect(4)}>Custom</button>
+      </div>
+    )
+  },
+}))
+
+vi.mock('@/app/components/header/account-setting/model-provider-page/model-parameter-modal/presets-parameter-utils', () => ({
+  getSupportedPresetConfig: (toneId: number, supportedParameterNames?: string[]) => {
+    const toneConfigMap: Record<number, Record<string, number> | undefined> = {
+      1: {
+        temperature: 0.8,
+        top_p: 0.9,
+        presence_penalty: 0.1,
+        frequency_penalty: 0.1,
+      },
+      2: {
+        temperature: 0.5,
+        top_p: 0.85,
+        presence_penalty: 0.2,
+        frequency_penalty: 0.3,
+      },
+      3: {
+        temperature: 0.2,
+        top_p: 0.75,
+        presence_penalty: 0.5,
+        frequency_penalty: 0.5,
+      },
+    }
+    const toneConfig = toneConfigMap[toneId]
+    if (!toneConfig)
+      return {}
+
+    if (!supportedParameterNames)
+      return toneConfig
+
+    return Object.entries(toneConfig).reduce<Record<string, number>>((acc, [key, value]) => {
+      if (supportedParameterNames.includes(key))
+        acc[key] = value
+
+      return acc
+    }, {})
+  },
 }))
 
 // Mock ParameterItem component
@@ -148,10 +192,12 @@ const createDefaultProps = (overrides: Partial<{
 const setupModelParameterRulesMock = (config: {
   data?: ModelParameterRule[]
   isPending?: boolean
+  isLoading?: boolean
 } = {}) => {
   mockUseModelParameterRules.mockReturnValue({
     data: config.data ? { data: config.data } : undefined,
     isPending: config.isPending ?? false,
+    isLoading: config.isLoading ?? config.isPending ?? false,
   })
 }
 
@@ -188,6 +234,19 @@ describe('LLMParamsPanel', () => {
       expect(screen.getByRole('status')).toBeInTheDocument()
     })
 
+    it('should not render loading state when model is not configured and parameter rules query is pending but disabled', () => {
+      // Arrange
+      setupModelParameterRulesMock({ isPending: true, isLoading: false })
+      const props = createDefaultProps({ provider: '', modelId: '' })
+
+      // Act
+      render(<LLMParamsPanel {...props} />)
+
+      // Assert
+      expect(screen.queryByRole('status')).not.toBeInTheDocument()
+      expect(screen.getByText('common.modelProvider.parameters')).toBeInTheDocument()
+    })
+
     it('should render parameters header', () => {
       // Arrange
       setupModelParameterRulesMock({ data: [], isPending: false })
@@ -202,7 +261,7 @@ describe('LLMParamsPanel', () => {
 
     it('should render PresetsParameter for openai provider', () => {
       // Arrange
-      setupModelParameterRulesMock({ data: [], isPending: false })
+      setupModelParameterRulesMock({ data: [createParameterRule({ name: 'temperature' })], isPending: false })
       const props = createDefaultProps({ provider: 'langgenius/openai/openai' })
 
       // Act
@@ -214,7 +273,7 @@ describe('LLMParamsPanel', () => {
 
     it('should render PresetsParameter for azure_openai provider', () => {
       // Arrange
-      setupModelParameterRulesMock({ data: [], isPending: false })
+      setupModelParameterRulesMock({ data: [createParameterRule({ name: 'temperature' })], isPending: false })
       const props = createDefaultProps({ provider: 'langgenius/azure_openai/azure_openai' })
 
       // Act
@@ -224,6 +283,18 @@ describe('LLMParamsPanel', () => {
       expect(screen.getByTestId('presets-parameter')).toBeInTheDocument()
     })
 
+    it('should not render PresetsParameter when no visible parameter supports presets', () => {
+      // Arrange
+      setupModelParameterRulesMock({ data: [createParameterRule({ name: 'max_tokens', type: 'int' })], isPending: false })
+      const props = createDefaultProps({ provider: 'langgenius/openai/openai' })
+
+      // Act
+      render(<LLMParamsPanel {...props} />)
+
+      // Assert
+      expect(screen.queryByTestId('presets-parameter')).not.toBeInTheDocument()
+    })
+
     it('should not render PresetsParameter for non-preset providers', () => {
       // Arrange
       setupModelParameterRulesMock({ data: [], isPending: false })
@@ -360,7 +431,15 @@ describe('LLMParamsPanel', () => {
       it('should apply Creative preset config', () => {
         // Arrange
         const onCompletionParamsChange = vi.fn()
-        setupModelParameterRulesMock({ data: [], isPending: false })
+        setupModelParameterRulesMock({
+          data: [
+            createParameterRule({ name: 'temperature' }),
+            createParameterRule({ name: 'top_p' }),
+            createParameterRule({ name: 'presence_penalty' }),
+            createParameterRule({ name: 'frequency_penalty' }),
+          ],
+          isPending: false,
+        })
         const props = createDefaultProps({
           provider: 'langgenius/openai/openai',
           onCompletionParamsChange,
@@ -384,7 +463,15 @@ describe('LLMParamsPanel', () => {
       it('should apply Balanced preset config', () => {
         // Arrange
         const onCompletionParamsChange = vi.fn()
-        setupModelParameterRulesMock({ data: [], isPending: false })
+        setupModelParameterRulesMock({
+          data: [
+            createParameterRule({ name: 'temperature' }),
+            createParameterRule({ name: 'top_p' }),
+            createParameterRule({ name: 'presence_penalty' }),
+            createParameterRule({ name: 'frequency_penalty' }),
+          ],
+          isPending: false,
+        })
         const props = createDefaultProps({
           provider: 'langgenius/openai/openai',
           onCompletionParamsChange,
@@ -407,7 +494,15 @@ describe('LLMParamsPanel', () => {
       it('should apply Precise preset config', () => {
         // Arrange
         const onCompletionParamsChange = vi.fn()
-        setupModelParameterRulesMock({ data: [], isPending: false })
+        setupModelParameterRulesMock({
+          data: [
+            createParameterRule({ name: 'temperature' }),
+            createParameterRule({ name: 'top_p' }),
+            createParameterRule({ name: 'presence_penalty' }),
+            createParameterRule({ name: 'frequency_penalty' }),
+          ],
+          isPending: false,
+        })
         const props = createDefaultProps({
           provider: 'langgenius/openai/openai',
           onCompletionParamsChange,
@@ -430,7 +525,7 @@ describe('LLMParamsPanel', () => {
       it('should apply empty config for Custom preset (spreads undefined)', () => {
         // Arrange
         const onCompletionParamsChange = vi.fn()
-        setupModelParameterRulesMock({ data: [], isPending: false })
+        setupModelParameterRulesMock({ data: [createParameterRule({ name: 'temperature' })], isPending: false })
         const props = createDefaultProps({
           provider: 'langgenius/openai/openai',
           onCompletionParamsChange,
@@ -444,6 +539,27 @@ describe('LLMParamsPanel', () => {
         // Assert - Custom preset has no config, so only existing params are kept
         expect(onCompletionParamsChange).toHaveBeenCalledWith({ existing: 'value' })
       })
+
+      it('should apply only preset config keys supported by visible parameters', () => {
+        // Arrange
+        const onCompletionParamsChange = vi.fn()
+        setupModelParameterRulesMock({ data: [createParameterRule({ name: 'temperature' })], isPending: false })
+        const props = createDefaultProps({
+          provider: 'langgenius/openai/openai',
+          onCompletionParamsChange,
+          completionParams: { existing: 'value' },
+        })
+
+        // Act
+        render(<LLMParamsPanel {...props} />)
+        fireEvent.click(screen.getByTestId('preset-creative'))
+
+        // Assert
+        expect(onCompletionParamsChange).toHaveBeenCalledWith({
+          existing: 'value',
+          temperature: 0.8,
+        })
+      })
     })
 
     describe('handleParamChange', () => {
diff --git a/web/app/components/plugins/plugin-detail-panel/model-selector/llm-params-panel.tsx b/web/app/components/plugins/plugin-detail-panel/model-selector/llm-params-panel.tsx
index d699621c22..4d12efb9b5 100644
--- a/web/app/components/plugins/plugin-detail-panel/model-selector/llm-params-panel.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/model-selector/llm-params-panel.tsx
@@ -10,7 +10,8 @@ import { useTranslation } from 'react-i18next'
 import Loading from '@/app/components/base/loading'
 import ParameterItem from '@/app/components/header/account-setting/model-provider-page/model-parameter-modal/parameter-item'
 import PresetsParameter from '@/app/components/header/account-setting/model-provider-page/model-parameter-modal/presets-parameter'
-import { PROVIDER_WITH_PRESET_TONE, STOP_PARAMETER_RULE, TONE_LIST } from '@/config'
+import { getSupportedPresetConfig } from '@/app/components/header/account-setting/model-provider-page/model-parameter-modal/presets-parameter-utils'
+import { PROVIDER_WITH_PRESET_TONE, STOP_PARAMETER_RULE } from '@/config'
 import { useModelParameterRules } from '@/service/use-common'
 
 type Props = {
@@ -29,20 +30,21 @@ const LLMParamsPanel = ({
   onCompletionParamsChange,
 }: Props) => {
   const { t } = useTranslation()
-  const { data: parameterRulesData, isPending: isLoading } = useModelParameterRules(provider, modelId)
+  const { data: parameterRulesData, isLoading } = useModelParameterRules(provider, modelId)
+  const isRulesLoading = !!provider && !!modelId && isLoading
 
   const parameterRules: ModelParameterRule[] = useMemo(() => {
     return parameterRulesData?.data || []
   }, [parameterRulesData])
+  const supportedPresetParameterNames = useMemo(() => {
+    return parameterRules.map(parameterRule => parameterRule.name)
+  }, [parameterRules])
 
   const handleSelectPresetParameter = (toneId: number) => {
-    const tone = TONE_LIST.find(tone => tone.id === toneId)
-    if (tone) {
-      onCompletionParamsChange({
-        ...completionParams,
-        ...tone.config,
-      })
-    }
+    onCompletionParamsChange({
+      ...completionParams,
+      ...getSupportedPresetConfig(toneId, supportedPresetParameterNames),
+    })
   }
   const handleParamChange = (key: string, value: ParameterValue) => {
     onCompletionParamsChange({
@@ -65,7 +67,7 @@ const LLMParamsPanel = ({
     }
   }
 
-  if (isLoading) {
+  if (isRulesLoading) {
     return (
       <div className="mt-5"><Loading /></div>
     )
@@ -77,7 +79,10 @@ const LLMParamsPanel = ({
         <div className={cn('flex h-6 items-center system-sm-semibold text-text-secondary')}>{t('modelProvider.parameters', { ns: 'common' })}</div>
         {
           PROVIDER_WITH_PRESET_TONE.includes(provider) && (
-            <PresetsParameter onSelect={handleSelectPresetParameter} />
+            <PresetsParameter
+              onSelect={handleSelectPresetParameter}
+              supportedParameterNames={supportedPresetParameterNames}
+            />
           )
         }
       </div>
diff --git a/web/app/components/plugins/plugin-detail-panel/multiple-tool-selector/index.tsx b/web/app/components/plugins/plugin-detail-panel/multiple-tool-selector/index.tsx
index 7972ea5f89..f2779772b6 100644
--- a/web/app/components/plugins/plugin-detail-panel/multiple-tool-selector/index.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/multiple-tool-selector/index.tsx
@@ -2,16 +2,15 @@ import type { Node } from 'reactflow'
 import type { ToolValue } from '@/app/components/workflow/block-selector/types'
 import type { NodeOutPutVar } from '@/app/components/workflow/types'
 import { cn } from '@langgenius/dify-ui/cn'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import {
   RiAddLine,
-  RiQuestionLine,
 } from '@remixicon/react'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import ActionButton from '@/app/components/base/action-button'
 import Divider from '@/app/components/base/divider'
 import { ArrowDownRoundFill } from '@/app/components/base/icons/src/vender/solid/general'
+import { Infotip } from '@/app/components/base/infotip'
 import ToolSelector from '@/app/components/plugins/plugin-detail-panel/tool-selector'
 import { useMCPToolAvailability } from '@/app/components/workflow/nodes/_base/components/mcp-tool-availability'
 import { useAllMCPTools } from '@/service/use-tools'
@@ -21,7 +20,7 @@ type Props = {
   value: ToolValue[]
   label: string
   required?: boolean
-  tooltip?: any
+  tooltip?: React.ReactNode
   supportCollapse?: boolean
   scope?: string
   onChange: (value: ToolValue[]) => void
@@ -111,18 +110,16 @@ const MultipleToolSelector = ({
         >
           <div className="flex h-6 items-center system-sm-semibold-uppercase text-text-secondary">{label}</div>
           {required && <div className="text-red-500">*</div>}
-          {tooltip && (
-            <Tooltip>
-              <TooltipTrigger
-                render={(
-                  <div><RiQuestionLine className="h-3.5 w-3.5 text-text-quaternary hover:text-text-tertiary" /></div>
-                )}
-              />
-              <TooltipContent>
-                {tooltip}
-              </TooltipContent>
-            </Tooltip>
-          )}
+          {tooltip
+            ? (
+                <Infotip
+                  aria-label={typeof tooltip === 'string' ? tooltip : label}
+                  className="h-3.5 w-3.5"
+                >
+                  {tooltip}
+                </Infotip>
+              )
+            : null}
           {supportCollapse && (
             <ArrowDownRoundFill
               className={cn(
diff --git a/web/app/components/plugins/plugin-detail-panel/strategy-detail.tsx b/web/app/components/plugins/plugin-detail-panel/strategy-detail.tsx
index 8fda455b26..824697566b 100644
--- a/web/app/components/plugins/plugin-detail-panel/strategy-detail.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/strategy-detail.tsx
@@ -5,6 +5,14 @@ import type {
 } from '@/app/components/plugins/types'
 import type { Locale } from '@/i18n-config'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  Drawer,
+  DrawerBackdrop,
+  DrawerContent,
+  DrawerPopup,
+  DrawerPortal,
+  DrawerViewport,
+} from '@langgenius/dify-ui/drawer'
 import {
   RiArrowLeftLine,
   RiCloseLine,
@@ -14,7 +22,6 @@ import { useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import ActionButton from '@/app/components/base/action-button'
 import Divider from '@/app/components/base/divider'
-import Drawer from '@/app/components/base/drawer'
 import Icon from '@/app/components/plugins/card/base/card-icon'
 import Description from '@/app/components/plugins/card/base/description'
 import { API_PREFIX } from '@/config'
@@ -75,92 +82,99 @@ const StrategyDetail: FC<Props> = ({
 
   return (
     <Drawer
-      isOpen
-      clickOutsideNotOpen={false}
-      onClose={onHide}
-      footer={null}
-      mask={false}
-      positionCenter={false}
-      panelClassName={cn('mt-[64px] mr-2 mb-2 w-[420px]! max-w-[420px]! justify-start rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg! p-0! shadow-xl')}
+      open
+      modal
+      swipeDirection="right"
+      onOpenChange={(open) => {
+        if (!open)
+          onHide()
+      }}
     >
-      <>
-        {/* header */}
-        <div className="relative border-b border-divider-subtle p-4 pb-3">
-          <div className="absolute top-3 right-3">
-            <ActionButton onClick={onHide}>
-              <RiCloseLine className="h-4 w-4" />
-            </ActionButton>
-          </div>
-          <div
-            className="mb-2 flex cursor-pointer items-center gap-1 system-xs-semibold-uppercase text-text-accent-secondary"
-            onClick={onHide}
-          >
-            <RiArrowLeftLine className="h-4 w-4" />
-            BACK
-          </div>
-          <div className="flex items-center gap-1">
-            <Icon size="tiny" className="h-6 w-6" src={`${API_PREFIX}/workspaces/current/plugin/icon?tenant_id=${provider.tenant_id}&filename=${provider.icon}`} />
-            <div className="">{getValueFromI18nObject(provider.label)}</div>
-          </div>
-          <div className="mt-1 system-md-semibold text-text-primary">{getValueFromI18nObject(detail.identity.label)}</div>
-          <Description className="mt-3" text={getValueFromI18nObject(detail.description)} descriptionLineRows={2}></Description>
-        </div>
-        {/* form */}
-        <div className="h-full">
-          <div className="flex h-full flex-col overflow-y-auto">
-            <div className="p-4 pb-1 system-sm-semibold-uppercase text-text-primary">{t('setBuiltInTools.parameters', { ns: 'tools' })}</div>
-            <div className="px-4">
-              {detail.parameters.length > 0 && (
-                <div className="space-y-1 py-2">
-                  {detail.parameters.map((item: any, index) => (
-                    <div key={index} className="py-1">
-                      <div className="flex items-center gap-2">
-                        <div className="code-sm-semibold text-text-secondary">{getValueFromI18nObject(item.label)}</div>
-                        <div className="system-xs-regular text-text-tertiary">
-                          {getType(item.type)}
-                        </div>
-                        {item.required && (
-                          <div className="system-xs-medium text-text-warning-secondary">{t('setBuiltInTools.required', { ns: 'tools' })}</div>
-                        )}
+      <DrawerPortal>
+        <DrawerBackdrop className="bg-transparent" />
+        <DrawerViewport>
+          <DrawerPopup className={cn('justify-start bg-components-panel-bg! p-0! shadow-xl data-[swipe-direction=right]:top-16 data-[swipe-direction=right]:right-2 data-[swipe-direction=right]:bottom-2 data-[swipe-direction=right]:h-auto data-[swipe-direction=right]:w-[420px] data-[swipe-direction=right]:max-w-[420px] data-[swipe-direction=right]:rounded-2xl data-[swipe-direction=right]:border-[0.5px] data-[swipe-direction=right]:border-components-panel-border')}>
+            <DrawerContent className="flex min-h-0 flex-1 flex-col p-0 pb-0">
+              {/* header */}
+              <div className="relative border-b border-divider-subtle p-4 pb-3">
+                <div className="absolute top-3 right-3">
+                  <ActionButton onClick={onHide}>
+                    <RiCloseLine className="h-4 w-4" />
+                  </ActionButton>
+                </div>
+                <div
+                  className="mb-2 flex cursor-pointer items-center gap-1 system-xs-semibold-uppercase text-text-accent-secondary"
+                  onClick={onHide}
+                >
+                  <RiArrowLeftLine className="h-4 w-4" />
+                  BACK
+                </div>
+                <div className="flex items-center gap-1">
+                  <Icon size="tiny" className="h-6 w-6" src={`${API_PREFIX}/workspaces/current/plugin/icon?tenant_id=${provider.tenant_id}&filename=${provider.icon}`} />
+                  <div className="">{getValueFromI18nObject(provider.label)}</div>
+                </div>
+                <div className="mt-1 system-md-semibold text-text-primary">{getValueFromI18nObject(detail.identity.label)}</div>
+                <Description className="mt-3" text={getValueFromI18nObject(detail.description)} descriptionLineRows={2}></Description>
+              </div>
+              {/* form */}
+              <div className="h-full">
+                <div className="flex h-full flex-col overflow-y-auto">
+                  <div className="p-4 pb-1 system-sm-semibold-uppercase text-text-primary">{t('setBuiltInTools.parameters', { ns: 'tools' })}</div>
+                  <div className="px-4">
+                    {detail.parameters.length > 0 && (
+                      <div className="space-y-1 py-2">
+                        {detail.parameters.map((item: any, index) => (
+                          <div key={index} className="py-1">
+                            <div className="flex items-center gap-2">
+                              <div className="code-sm-semibold text-text-secondary">{getValueFromI18nObject(item.label)}</div>
+                              <div className="system-xs-regular text-text-tertiary">
+                                {getType(item.type)}
+                              </div>
+                              {item.required && (
+                                <div className="system-xs-medium text-text-warning-secondary">{t('setBuiltInTools.required', { ns: 'tools' })}</div>
+                              )}
+                            </div>
+                            {item.human_description && (
+                              <div className="mt-0.5 system-xs-regular text-text-tertiary">
+                                {getValueFromI18nObject(item.human_description)}
+                              </div>
+                            )}
+                          </div>
+                        ))}
                       </div>
-                      {item.human_description && (
-                        <div className="mt-0.5 system-xs-regular text-text-tertiary">
-                          {getValueFromI18nObject(item.human_description)}
+                    )}
+                  </div>
+                  {detail.output_schema && (
+                    <>
+                      <div className="px-4">
+                        <Divider className="mt-2!" />
+                      </div>
+                      <div className="p-4 pb-1 system-sm-semibold-uppercase text-text-primary">OUTPUT</div>
+                      {outputSchema.length > 0 && (
+                        <div className="space-y-1 px-4 py-2">
+                          {outputSchema.map((outputItem, index) => (
+                            <div key={index} className="py-1">
+                              <div className="flex items-center gap-2">
+                                <div className="code-sm-semibold text-text-secondary">{outputItem.name}</div>
+                                <div className="system-xs-regular text-text-tertiary">{outputItem.type}</div>
+                              </div>
+                              {outputItem.description && (
+                                <div className="mt-0.5 system-xs-regular text-text-tertiary">
+                                  {outputItem.description}
+                                </div>
+                              )}
+                            </div>
+                          ))}
                         </div>
                       )}
-                    </div>
-                  ))}
+                    </>
+                  )}
                 </div>
-              )}
-            </div>
-            {detail.output_schema && (
-              <>
-                <div className="px-4">
-                  <Divider className="mt-2!" />
-                </div>
-                <div className="p-4 pb-1 system-sm-semibold-uppercase text-text-primary">OUTPUT</div>
-                {outputSchema.length > 0 && (
-                  <div className="space-y-1 px-4 py-2">
-                    {outputSchema.map((outputItem, index) => (
-                      <div key={index} className="py-1">
-                        <div className="flex items-center gap-2">
-                          <div className="code-sm-semibold text-text-secondary">{outputItem.name}</div>
-                          <div className="system-xs-regular text-text-tertiary">{outputItem.type}</div>
-                        </div>
-                        {outputItem.description && (
-                          <div className="mt-0.5 system-xs-regular text-text-tertiary">
-                            {outputItem.description}
-                          </div>
-                        )}
-                      </div>
-                    ))}
-                  </div>
-                )}
-              </>
-            )}
-          </div>
-        </div>
-      </>
+              </div>
+            </DrawerContent>
+          </DrawerPopup>
+        </DrawerViewport>
+      </DrawerPortal>
     </Drawer>
   )
 }
diff --git a/web/app/components/plugins/plugin-detail-panel/subscription-list/create/__tests__/common-modal.spec.tsx b/web/app/components/plugins/plugin-detail-panel/subscription-list/create/__tests__/common-modal.spec.tsx
index af52ec14f0..2f050f2747 100644
--- a/web/app/components/plugins/plugin-detail-panel/subscription-list/create/__tests__/common-modal.spec.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/subscription-list/create/__tests__/common-modal.spec.tsx
@@ -379,7 +379,7 @@ describe('CommonCreateModal', () => {
       const mockOnClose = vi.fn()
       render(<CommonCreateModal {...defaultProps} onClose={mockOnClose} />)
 
-      fireEvent.click(screen.getByTestId('modal-close'))
+      fireEvent.click(screen.getByRole('button', { name: /Close|operation.close/ }))
 
       expect(mockOnClose).toHaveBeenCalled()
     })
diff --git a/web/app/components/plugins/plugin-detail-panel/subscription-list/create/__tests__/index.spec.tsx b/web/app/components/plugins/plugin-detail-panel/subscription-list/create/__tests__/index.spec.tsx
index 490fdf10ad..726c6f32dc 100644
--- a/web/app/components/plugins/plugin-detail-panel/subscription-list/create/__tests__/index.spec.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/subscription-list/create/__tests__/index.spec.tsx
@@ -5,34 +5,8 @@ import { fireEvent, render, screen, waitFor } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { SupportedCreationMethods } from '@/app/components/plugins/types'
 import { TriggerCredentialTypeEnum } from '@/app/components/workflow/block-selector/types'
-import { CreateButtonType, CreateSubscriptionButton, DEFAULT_METHOD } from '../index'
-
-let mockPortalOpenState = false
-
-vi.mock('@/app/components/base/portal-to-follow-elem', () => ({
-  PortalToFollowElem: ({ children, open }: { children: React.ReactNode, open: boolean }) => {
-    mockPortalOpenState = open || false
-    return (
-      <div data-testid="portal-elem" data-open={open}>
-        {children}
-      </div>
-    )
-  },
-  PortalToFollowElemTrigger: ({ children, onClick, className }: { children: React.ReactNode, onClick?: () => void, className?: string }) => (
-    <div data-testid="portal-trigger" onClick={onClick} className={className}>
-      {children}
-    </div>
-  ),
-  PortalToFollowElemContent: ({ children, className }: { children: React.ReactNode, className?: string }) => {
-    if (!mockPortalOpenState)
-      return null
-    return (
-      <div data-testid="portal-content" className={className}>
-        {children}
-      </div>
-    )
-  },
-}))
+import { CreateSubscriptionButton } from '../index'
+import { CreateButtonType, DEFAULT_METHOD } from '../types'
 
 vi.mock('@langgenius/dify-ui/toast', () => ({
   toast: Object.assign(vi.fn(), {
@@ -80,56 +54,74 @@ vi.mock('@/hooks/use-oauth', () => ({
 }))
 
 vi.mock('../common-modal', () => ({
-  CommonCreateModal: ({ createType, onClose, builder }: {
+  CommonCreateModal: ({ open, createType, onClose, builder }: {
+    open?: boolean
     createType: SupportedCreationMethods
     onClose: () => void
     builder?: TriggerSubscriptionBuilder
-  }) => (
-    <div
-      data-testid="common-create-modal"
-      data-create-type={createType}
-      data-has-builder={!!builder}
-    >
-      <button data-testid="close-modal" onClick={onClose}>Close</button>
-    </div>
-  ),
+  }) => {
+    if (open === false)
+      return null
+
+    return (
+      <div
+        data-testid="common-create-modal"
+        data-create-type={createType}
+        data-has-builder={!!builder}
+      >
+        <button
+          data-testid="close-modal"
+          onClick={onClose}
+        >
+          Close
+        </button>
+      </div>
+    )
+  },
 }))
 
 vi.mock('../oauth-client', () => ({
-  OAuthClientSettingsModal: ({ oauthConfig, onClose, showOAuthCreateModal }: {
+  OAuthClientSettingsModal: ({ open, oauthConfig, onOpenChange, showOAuthCreateModal }: {
+    open: boolean
     oauthConfig?: TriggerOAuthConfig
-    onClose: () => void
+    onOpenChange: (open: boolean) => void
     showOAuthCreateModal: (builder: TriggerSubscriptionBuilder) => void
-  }) => (
-    <div
-      data-testid="oauth-client-modal"
-      data-has-config={!!oauthConfig}
-    >
-      <button data-testid="close-oauth-modal" onClick={onClose}>Close</button>
-      <button
-        data-testid="show-create-modal"
-        onClick={() => showOAuthCreateModal({
-          id: 'test-builder',
-          name: 'test',
-          provider: 'test-provider',
-          credential_type: TriggerCredentialTypeEnum.Oauth2,
-          credentials: {},
-          endpoint: 'https://test.com',
-          parameters: {},
-          properties: {},
-          workflows_in_use: 0,
-        })}
+  }) => {
+    if (!open)
+      return null
+
+    return (
+      <div
+        data-testid="oauth-client-modal"
+        data-has-config={!!oauthConfig}
       >
-        Show Create Modal
-      </button>
-    </div>
-  ),
+        <button data-testid="close-oauth-modal" onClick={() => onOpenChange(false)}>Close</button>
+        <button
+          data-testid="show-create-modal"
+          onClick={() => showOAuthCreateModal({
+            id: 'test-builder',
+            name: 'test',
+            provider: 'test-provider',
+            credential_type: TriggerCredentialTypeEnum.Oauth2,
+            credentials: {},
+            endpoint: 'https://test.com',
+            parameters: {},
+            properties: {},
+            workflows_in_use: 0,
+          })}
+        >
+          Show Create Modal
+        </button>
+      </div>
+    )
+  },
 }))
 
 vi.mock('@langgenius/dify-ui/select', async () => {
   const React = await import('react')
 
   const SelectContext = React.createContext<{
+    onOpenChange?: (open: boolean) => void
     onValueChange?: (value: string) => void
   }>({})
 
@@ -149,11 +141,13 @@ vi.mock('@langgenius/dify-ui/select', async () => {
       children,
       value,
       open,
+      onOpenChange,
       onValueChange,
     }: {
       children: React.ReactNode
       value: string | null
       open?: boolean
+      onOpenChange?: (open: boolean) => void
       onValueChange?: (value: string) => void
     }) => {
       const currentValue = value ?? DEFAULT_METHOD
@@ -164,10 +158,11 @@ vi.mock('@langgenius/dify-ui/select', async () => {
           : String(open ?? false)
 
       return (
-        <SelectContext.Provider value={{ onValueChange }}>
+        <SelectContext.Provider value={{ onOpenChange, onValueChange }}>
           <div
             data-testid="custom-select"
             data-value={currentValue}
+            data-open={String(open ?? false)}
             data-options-count={optionsCount}
             data-container-open={containerOpen}
           >
@@ -177,7 +172,16 @@ vi.mock('@langgenius/dify-ui/select', async () => {
       )
     },
     SelectTrigger: ({ children, className }: { children: React.ReactNode, render?: React.ReactNode, className?: string }) => {
-      return <div data-testid="custom-trigger" className={className}>{children}</div>
+      const context = React.useContext(SelectContext)
+      return (
+        <div
+          data-testid="custom-trigger"
+          className={className}
+          onClick={() => context.onOpenChange?.(true)}
+        >
+          {children}
+        </div>
+      )
     },
     SelectContent: ({ children }: { children: React.ReactNode }) => (
       <div data-testid="options-container">{children}</div>
@@ -253,6 +257,10 @@ const createDefaultProps = (overrides: Partial<Parameters<typeof CreateSubscript
   ...overrides,
 })
 
+const getCreateButton = () => screen.getByRole('button', {
+  name: /pluginTrigger\.subscription\.(createButton|empty\.button)/,
+})
+
 const setupMocks = (config: {
   providerInfo?: TriggerProviderApiEntity
   oauthConfig?: TriggerOAuthConfig
@@ -270,7 +278,6 @@ const setupMocks = (config: {
 describe('CreateSubscriptionButton', () => {
   beforeEach(() => {
     vi.clearAllMocks()
-    mockPortalOpenState = false
     setupMocks()
   })
 
@@ -350,7 +357,7 @@ describe('CreateSubscriptionButton', () => {
 
       // Assert
       // Assert
-      expect(screen.getByRole('button'))!.toBeInTheDocument()
+      expect(getCreateButton()).toBeInTheDocument()
     })
 
     it('should render icon button when buttonType is ICON_BUTTON', () => {
@@ -384,7 +391,7 @@ describe('CreateSubscriptionButton', () => {
 
       // Assert
       // Assert
-      expect(screen.getByRole('button'))!.toBeInTheDocument()
+      expect(getCreateButton()).toBeInTheDocument()
     })
 
     it('should apply shape prop correctly', () => {
@@ -483,6 +490,38 @@ describe('CreateSubscriptionButton', () => {
       })
     })
 
+    it('should close dropdown when oauth settings is clicked from option extra action', async () => {
+      // Arrange
+      setupMocks({
+        storeDetail: createStoreDetail(),
+        providerInfo: createProviderInfo({
+          supported_creation_methods: [
+            SupportedCreationMethods.OAUTH,
+            SupportedCreationMethods.APIKEY,
+            SupportedCreationMethods.MANUAL,
+          ],
+        }),
+        oauthConfig: createOAuthConfig({ configured: false }),
+      })
+      const props = createDefaultProps()
+
+      // Act
+      render(<CreateSubscriptionButton {...props} />)
+
+      fireEvent.click(screen.getByTestId('custom-trigger'))
+      expect(screen.getByTestId('custom-select'))!.toHaveAttribute('data-open', 'true')
+
+      fireEvent.click(screen.getByRole('button', {
+        name: 'pluginTrigger.subscription.addType.options.oauth.clientSettings',
+      }))
+
+      // Assert
+      await waitFor(() => {
+        expect(screen.getByTestId('oauth-client-modal'))!.toBeInTheDocument()
+        expect(screen.getByTestId('custom-select'))!.toHaveAttribute('data-open', 'false')
+      })
+    })
+
     it('should close OAuthClientSettingsModal and refetch config when closed', async () => {
       // Arrange
       const mockRefetchOAuth = vi.fn()
@@ -557,7 +596,7 @@ describe('CreateSubscriptionButton', () => {
 
       // Assert
       // Assert
-      expect(screen.getByRole('button'))!.toHaveTextContent('pluginTrigger.subscription.createButton.apiKey')
+      expect(getCreateButton()).toHaveTextContent('pluginTrigger.subscription.createButton.apiKey')
     })
 
     it('should display correct button text for MANUAL method', () => {
@@ -575,7 +614,7 @@ describe('CreateSubscriptionButton', () => {
 
       // Assert
       // Assert
-      expect(screen.getByRole('button'))!.toHaveTextContent('pluginTrigger.subscription.createButton.manual')
+      expect(getCreateButton()).toHaveTextContent('pluginTrigger.subscription.createButton.manual')
     })
 
     it('should display default button text when multiple methods are supported', () => {
@@ -593,7 +632,7 @@ describe('CreateSubscriptionButton', () => {
 
       // Assert
       // Assert
-      expect(screen.getByRole('button'))!.toHaveTextContent('pluginTrigger.subscription.empty.button')
+      expect(getCreateButton()).toHaveTextContent('pluginTrigger.subscription.empty.button')
     })
   })
 
@@ -745,7 +784,7 @@ describe('CreateSubscriptionButton', () => {
 
       // Act
       render(<CreateSubscriptionButton {...props} />)
-      const button = screen.getByRole('button')
+      const button = getCreateButton()
       fireEvent.click(button)
 
       // Assert - modal should not open
@@ -795,7 +834,7 @@ describe('CreateSubscriptionButton', () => {
 
       // Act
       render(<CreateSubscriptionButton {...props} />)
-      const button = screen.getByRole('button')
+      const button = getCreateButton()
       fireEvent.click(button)
 
       // Assert - modal should open
@@ -1293,7 +1332,7 @@ describe('CreateSubscriptionButton', () => {
       render(<CreateSubscriptionButton {...props} />)
 
       // Assert - should not have settings divider
-      const button = screen.getByRole('button')
+      const button = getCreateButton()
       const divider = button.querySelector('.bg-text-primary-on-surface')
       expect(divider).not.toBeInTheDocument()
     })
@@ -1412,7 +1451,7 @@ describe('CreateSubscriptionButton', () => {
       render(<CreateSubscriptionButton {...props} />)
 
       // Assert
-      const button = screen.getByRole('button')
+      const button = getCreateButton()
       expect(button)!.toHaveClass('w-full')
     })
 
diff --git a/web/app/components/plugins/plugin-detail-panel/subscription-list/create/__tests__/oauth-client.spec.tsx b/web/app/components/plugins/plugin-detail-panel/subscription-list/create/__tests__/oauth-client.spec.tsx
index 46b9499027..21c76ecdca 100644
--- a/web/app/components/plugins/plugin-detail-panel/subscription-list/create/__tests__/oauth-client.spec.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/subscription-list/create/__tests__/oauth-client.spec.tsx
@@ -110,48 +110,6 @@ Object.defineProperty(navigator, 'clipboard', {
   writable: true,
 })
 
-vi.mock('@/app/components/base/modal/modal', () => ({
-  default: ({
-    children,
-    onClose,
-    onConfirm,
-    onCancel,
-    title,
-    confirmButtonText,
-    cancelButtonText,
-    footerSlot,
-    onExtraButtonClick,
-    extraButtonText,
-  }: {
-    children: React.ReactNode
-    onClose: () => void
-    onConfirm: () => void
-    onCancel: () => void
-    title: string
-    confirmButtonText: string
-    cancelButtonText?: string
-    footerSlot?: React.ReactNode
-    onExtraButtonClick?: () => void
-    extraButtonText?: string
-  }) => (
-    <div data-testid="modal">
-      <div data-testid="modal-title">{title}</div>
-      <div data-testid="modal-content">{children}</div>
-      <div data-testid="modal-footer">
-        {footerSlot}
-        {extraButtonText && (
-          <button data-testid="modal-extra" onClick={onExtraButtonClick}>{extraButtonText}</button>
-        )}
-        {cancelButtonText && (
-          <button data-testid="modal-cancel" onClick={onCancel}>{cancelButtonText}</button>
-        )}
-        <button data-testid="modal-confirm" onClick={onConfirm}>{confirmButtonText}</button>
-        <button data-testid="modal-close" onClick={onClose}>Close</button>
-      </div>
-    </div>
-  ),
-}))
-
 let mockFormValues: { values: Record<string, string>, isCheckValidated: boolean } = {
   values: { client_id: 'test-client-id', client_secret: 'test-client-secret' },
   isCheckValidated: true,
@@ -161,10 +119,13 @@ const setMockFormValues = (values: typeof mockFormValues) => {
 }
 
 vi.mock('@/app/components/base/form/components/base', () => ({
-  BaseForm: React.forwardRef((
-    { formSchemas }: { formSchemas: Array<{ name: string, default?: string }> },
-    ref: React.ForwardedRef<{ getFormValues: () => { values: Record<string, string>, isCheckValidated: boolean } }>,
-  ) => {
+  BaseForm: ({
+    formSchemas,
+    ref,
+  }: {
+    formSchemas: Array<{ name: string, default?: string }>
+    ref?: React.Ref<{ getFormValues: () => { values: Record<string, string>, isCheckValidated: boolean } }>
+  }) => {
     React.useImperativeHandle(ref, () => ({
       getFormValues: () => mockFormValues,
     }))
@@ -180,15 +141,24 @@ vi.mock('@/app/components/base/form/components/base', () => ({
         ))}
       </div>
     )
-  }),
+  },
 }))
 
 describe('OAuthClientSettingsModal', () => {
   const defaultProps = {
+    open: true,
     oauthConfig: createMockOAuthConfig(),
-    onClose: vi.fn(),
+    onOpenChange: vi.fn(),
     showOAuthCreateModal: vi.fn(),
   }
+  const title = 'pluginTrigger.modal.oauth.title'
+  const getDialog = () => screen.getByRole('dialog', { name: title })
+  const getCloseButton = () => screen.getByRole('button', { name: 'Close' })
+  const getCancelButton = () => screen.getByRole('button', { name: 'common.operation.cancel' })
+  const getSaveOnlyButton = () => screen.getByRole('button', { name: 'plugin.auth.saveOnly' })
+  const getConfirmButton = () => screen.getByRole('button', {
+    name: /plugin\.auth\.saveAndAuth|pluginTrigger\.modal\.common\.authorizing|pluginTrigger\.modal\.oauth\.authorization\.waitingJump/,
+  })
 
   beforeEach(() => {
     vi.clearAllMocks()
@@ -215,7 +185,7 @@ describe('OAuthClientSettingsModal', () => {
     it('should render modal with correct title', () => {
       render(<OAuthClientSettingsModal {...defaultProps} />)
 
-      expect(screen.getByTestId('modal-title')).toHaveTextContent('pluginTrigger.modal.oauth.title')
+      expect(screen.getByRole('heading', { name: title })).toBeInTheDocument()
     })
 
     it('should render client type selector when system_configured is true', () => {
@@ -332,7 +302,7 @@ describe('OAuthClientSettingsModal', () => {
 
       render(<OAuthClientSettingsModal {...defaultProps} />)
 
-      fireEvent.click(screen.getByTestId('modal-confirm'))
+      fireEvent.click(getConfirmButton())
 
       expect(mockConfigureOAuth).toHaveBeenCalled()
     })
@@ -350,7 +320,7 @@ describe('OAuthClientSettingsModal', () => {
 
       render(<OAuthClientSettingsModal {...defaultProps} />)
 
-      fireEvent.click(screen.getByTestId('modal-confirm'))
+      fireEvent.click(getConfirmButton())
 
       expect(mockOpenOAuthPopup).toHaveBeenCalledWith(
         'https://oauth.example.com/authorize',
@@ -359,7 +329,7 @@ describe('OAuthClientSettingsModal', () => {
     })
 
     it('should show success toast and close modal when OAuth callback succeeds', () => {
-      const mockOnClose = vi.fn()
+      const mockOnOpenChange = vi.fn()
       const mockShowOAuthCreateModal = vi.fn()
 
       mockConfigureOAuth.mockImplementation((params, { onSuccess }) => {
@@ -379,18 +349,18 @@ describe('OAuthClientSettingsModal', () => {
       render(
         <OAuthClientSettingsModal
           {...defaultProps}
-          onClose={mockOnClose}
+          onOpenChange={mockOnOpenChange}
           showOAuthCreateModal={mockShowOAuthCreateModal}
         />,
       )
 
-      fireEvent.click(screen.getByTestId('modal-confirm'))
+      fireEvent.click(getConfirmButton())
 
       expect(mockToastNotify).toHaveBeenCalledWith({
         type: 'success',
         message: 'pluginTrigger.modal.oauth.authorization.authSuccess',
       })
-      expect(mockOnClose).toHaveBeenCalled()
+      expect(mockOnOpenChange).toHaveBeenCalledWith(false)
     })
 
     it('should show error toast when OAuth initiation fails', () => {
@@ -403,7 +373,7 @@ describe('OAuthClientSettingsModal', () => {
 
       render(<OAuthClientSettingsModal {...defaultProps} />)
 
-      fireEvent.click(screen.getByTestId('modal-confirm'))
+      fireEvent.click(getConfirmButton())
 
       expect(mockToastNotify).toHaveBeenCalledWith({
         type: 'error',
@@ -420,7 +390,7 @@ describe('OAuthClientSettingsModal', () => {
 
       render(<OAuthClientSettingsModal {...defaultProps} />)
 
-      fireEvent.click(screen.getByTestId('modal-cancel'))
+      fireEvent.click(getSaveOnlyButton())
 
       expect(mockConfigureOAuth).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -432,20 +402,20 @@ describe('OAuthClientSettingsModal', () => {
     })
 
     it('should show success toast when save only succeeds', () => {
-      const mockOnClose = vi.fn()
+      const mockOnOpenChange = vi.fn()
       mockConfigureOAuth.mockImplementation((params, { onSuccess }) => {
         onSuccess()
       })
 
-      render(<OAuthClientSettingsModal {...defaultProps} onClose={mockOnClose} />)
+      render(<OAuthClientSettingsModal {...defaultProps} onOpenChange={mockOnOpenChange} />)
 
-      fireEvent.click(screen.getByTestId('modal-cancel'))
+      fireEvent.click(getSaveOnlyButton())
 
       expect(mockToastNotify).toHaveBeenCalledWith({
         type: 'success',
         message: 'pluginTrigger.modal.oauth.save.success',
       })
-      expect(mockOnClose).toHaveBeenCalled()
+      expect(mockOnOpenChange).toHaveBeenCalledWith(false)
     })
   })
 
@@ -469,7 +439,7 @@ describe('OAuthClientSettingsModal', () => {
     })
 
     it('should show success toast when remove succeeds', () => {
-      const mockOnClose = vi.fn()
+      const mockOnOpenChange = vi.fn()
       const configWithCustomEnabled = createMockOAuthConfig({
         system_configured: false,
         custom_enabled: true,
@@ -484,7 +454,7 @@ describe('OAuthClientSettingsModal', () => {
         <OAuthClientSettingsModal
           {...defaultProps}
           oauthConfig={configWithCustomEnabled}
-          onClose={mockOnClose}
+          onOpenChange={mockOnOpenChange}
         />,
       )
 
@@ -495,7 +465,7 @@ describe('OAuthClientSettingsModal', () => {
         type: 'success',
         message: 'pluginTrigger.modal.oauth.remove.success',
       })
-      expect(mockOnClose).toHaveBeenCalled()
+      expect(mockOnOpenChange).toHaveBeenCalledWith(false)
     })
 
     it('should show error toast when remove fails', () => {
@@ -522,22 +492,22 @@ describe('OAuthClientSettingsModal', () => {
   })
 
   describe('Modal Actions', () => {
-    it('should call onClose when close button is clicked', () => {
-      const mockOnClose = vi.fn()
-      render(<OAuthClientSettingsModal {...defaultProps} onClose={mockOnClose} />)
+    it('should call onOpenChange when close button is clicked', () => {
+      const mockOnOpenChange = vi.fn()
+      render(<OAuthClientSettingsModal {...defaultProps} onOpenChange={mockOnOpenChange} />)
 
-      fireEvent.click(screen.getByTestId('modal-close'))
+      fireEvent.click(getCloseButton())
 
-      expect(mockOnClose).toHaveBeenCalled()
+      expect(mockOnOpenChange.mock.calls[0]?.[0]).toBe(false)
     })
 
-    it('should call onClose when extra button (cancel) is clicked', () => {
-      const mockOnClose = vi.fn()
-      render(<OAuthClientSettingsModal {...defaultProps} onClose={mockOnClose} />)
+    it('should call onOpenChange when cancel button is clicked', () => {
+      const mockOnOpenChange = vi.fn()
+      render(<OAuthClientSettingsModal {...defaultProps} onOpenChange={mockOnOpenChange} />)
 
-      fireEvent.click(screen.getByTestId('modal-extra'))
+      fireEvent.click(getCancelButton())
 
-      expect(mockOnClose).toHaveBeenCalled()
+      expect(mockOnOpenChange).toHaveBeenCalledWith(false)
     })
   })
 
@@ -545,13 +515,13 @@ describe('OAuthClientSettingsModal', () => {
     it('should show default button text initially', () => {
       render(<OAuthClientSettingsModal {...defaultProps} />)
 
-      expect(screen.getByTestId('modal-confirm')).toHaveTextContent('plugin.auth.saveAndAuth')
+      expect(getConfirmButton()).toHaveTextContent('plugin.auth.saveAndAuth')
     })
 
     it('should show save only button text', () => {
       render(<OAuthClientSettingsModal {...defaultProps} />)
 
-      expect(screen.getByTestId('modal-cancel')).toHaveTextContent('plugin.auth.saveOnly')
+      expect(getSaveOnlyButton()).toHaveTextContent('plugin.auth.saveOnly')
     })
   })
 
@@ -591,7 +561,7 @@ describe('OAuthClientSettingsModal', () => {
     it('should handle undefined oauthConfig', () => {
       render(<OAuthClientSettingsModal {...defaultProps} oauthConfig={undefined} />)
 
-      expect(screen.getByTestId('modal')).toBeInTheDocument()
+      expect(getDialog()).toBeInTheDocument()
     })
 
     it('should handle missing provider', () => {
@@ -600,7 +570,7 @@ describe('OAuthClientSettingsModal', () => {
 
       render(<OAuthClientSettingsModal {...defaultProps} />)
 
-      expect(screen.getByTestId('modal')).toBeInTheDocument()
+      expect(getDialog()).toBeInTheDocument()
     })
   })
 
@@ -618,7 +588,7 @@ describe('OAuthClientSettingsModal', () => {
 
       render(<OAuthClientSettingsModal {...defaultProps} />)
 
-      fireEvent.click(screen.getByTestId('modal-confirm'))
+      fireEvent.click(getConfirmButton())
 
       // Verify OAuth flow was initiated
       expect(mockInitiateOAuth).toHaveBeenCalledWith(
@@ -644,13 +614,13 @@ describe('OAuthClientSettingsModal', () => {
 
       render(<OAuthClientSettingsModal {...defaultProps} />)
 
-      fireEvent.click(screen.getByTestId('modal-confirm'))
+      fireEvent.click(getConfirmButton())
 
       vi.advanceTimersByTime(3000)
       expect(mockVerifyBuilder).toHaveBeenCalled()
 
       // Should still be in pending state (polling continues)
-      expect(screen.getByTestId('modal-confirm')).toHaveTextContent('pluginTrigger.modal.common.authorizing')
+      expect(getConfirmButton()).toHaveTextContent('pluginTrigger.modal.common.authorizing')
 
       vi.useRealTimers()
     })
@@ -765,7 +735,7 @@ describe('OAuthClientSettingsModal', () => {
 
   describe('OAuth callback edge cases', () => {
     it('should not show success toast when OAuth callback returns falsy data', () => {
-      const mockOnClose = vi.fn()
+      const mockOnOpenChange = vi.fn()
       const mockShowOAuthCreateModal = vi.fn()
 
       mockConfigureOAuth.mockImplementation((params, { onSuccess }) => {
@@ -784,12 +754,12 @@ describe('OAuthClientSettingsModal', () => {
       render(
         <OAuthClientSettingsModal
           {...defaultProps}
-          onClose={mockOnClose}
+          onOpenChange={mockOnOpenChange}
           showOAuthCreateModal={mockShowOAuthCreateModal}
         />,
       )
 
-      fireEvent.click(screen.getByTestId('modal-confirm'))
+      fireEvent.click(getConfirmButton())
 
       // Should not show success toast or call callbacks
       expect(mockToastNotify).not.toHaveBeenCalledWith(
@@ -811,7 +781,7 @@ describe('OAuthClientSettingsModal', () => {
       const customCard = screen.getByText('pluginTrigger.subscription.addType.options.oauth.custom').closest('div')
       fireEvent.click(customCard!)
 
-      fireEvent.click(screen.getByTestId('modal-cancel'))
+      fireEvent.click(getSaveOnlyButton())
 
       expect(mockConfigureOAuth).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -829,7 +799,7 @@ describe('OAuthClientSettingsModal', () => {
       render(<OAuthClientSettingsModal {...defaultProps} />)
 
       // Default is already selected
-      fireEvent.click(screen.getByTestId('modal-cancel'))
+      fireEvent.click(getSaveOnlyButton())
 
       expect(mockConfigureOAuth).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -901,7 +871,7 @@ describe('OAuthClientSettingsModal', () => {
     it('should show saveAndAuth text by default', () => {
       render(<OAuthClientSettingsModal {...defaultProps} />)
 
-      expect(screen.getByTestId('modal-confirm')).toHaveTextContent('plugin.auth.saveAndAuth')
+      expect(getConfirmButton()).toHaveTextContent('plugin.auth.saveAndAuth')
     })
 
     it('should show authorizing text when authorization is pending', () => {
@@ -914,9 +884,9 @@ describe('OAuthClientSettingsModal', () => {
 
       render(<OAuthClientSettingsModal {...defaultProps} />)
 
-      fireEvent.click(screen.getByTestId('modal-confirm'))
+      fireEvent.click(getConfirmButton())
 
-      expect(screen.getByTestId('modal-confirm')).toHaveTextContent('pluginTrigger.modal.common.authorizing')
+      expect(getConfirmButton()).toHaveTextContent('pluginTrigger.modal.common.authorizing')
     })
   })
 
@@ -931,10 +901,10 @@ describe('OAuthClientSettingsModal', () => {
 
       render(<OAuthClientSettingsModal {...defaultProps} />)
 
-      fireEvent.click(screen.getByTestId('modal-confirm'))
+      fireEvent.click(getConfirmButton())
 
       // After failure, button text should return to default
-      expect(screen.getByTestId('modal-confirm')).toHaveTextContent('plugin.auth.saveAndAuth')
+      expect(getConfirmButton()).toHaveTextContent('plugin.auth.saveAndAuth')
     })
   })
 
@@ -1013,7 +983,7 @@ describe('OAuthClientSettingsModal', () => {
       const customCard = screen.getByText('pluginTrigger.subscription.addType.options.oauth.custom').closest('div')!
       fireEvent.click(customCard)
 
-      fireEvent.click(screen.getByTestId('modal-cancel'))
+      fireEvent.click(getSaveOnlyButton())
 
       // Should not call configureOAuth because form validation failed
       expect(mockConfigureOAuth).not.toHaveBeenCalled()
@@ -1035,7 +1005,7 @@ describe('OAuthClientSettingsModal', () => {
       // Switch to custom type
       fireEvent.click(screen.getByText('pluginTrigger.subscription.addType.options.oauth.custom').closest('div')!)
 
-      fireEvent.click(screen.getByTestId('modal-cancel'))
+      fireEvent.click(getSaveOnlyButton())
 
       expect(mockConfigureOAuth).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -1062,7 +1032,7 @@ describe('OAuthClientSettingsModal', () => {
       // Switch to custom type
       fireEvent.click(screen.getByText('pluginTrigger.subscription.addType.options.oauth.custom').closest('div')!)
 
-      fireEvent.click(screen.getByTestId('modal-cancel'))
+      fireEvent.click(getSaveOnlyButton())
 
       expect(mockConfigureOAuth).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -1089,7 +1059,7 @@ describe('OAuthClientSettingsModal', () => {
       // Switch to custom type
       fireEvent.click(screen.getByText('pluginTrigger.subscription.addType.options.oauth.custom').closest('div')!)
 
-      fireEvent.click(screen.getByTestId('modal-cancel'))
+      fireEvent.click(getSaveOnlyButton())
 
       expect(mockConfigureOAuth).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -1116,7 +1086,7 @@ describe('OAuthClientSettingsModal', () => {
       // Switch to custom type
       fireEvent.click(screen.getByText('pluginTrigger.subscription.addType.options.oauth.custom').closest('div')!)
 
-      fireEvent.click(screen.getByTestId('modal-cancel'))
+      fireEvent.click(getSaveOnlyButton())
 
       expect(mockConfigureOAuth).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -1148,7 +1118,7 @@ describe('OAuthClientSettingsModal', () => {
 
       render(<OAuthClientSettingsModal {...defaultProps} />)
 
-      fireEvent.click(screen.getByTestId('modal-confirm'))
+      fireEvent.click(getConfirmButton())
 
       // Advance timer to trigger polling
       await vi.advanceTimersByTimeAsync(3000)
@@ -1157,7 +1127,7 @@ describe('OAuthClientSettingsModal', () => {
 
       // Button text should show waitingJump after verified
       await waitFor(() => {
-        expect(screen.getByTestId('modal-confirm')).toHaveTextContent('pluginTrigger.modal.oauth.authorization.waitingJump')
+        expect(getConfirmButton()).toHaveTextContent('pluginTrigger.modal.oauth.authorization.waitingJump')
       })
 
       vi.useRealTimers()
@@ -1180,7 +1150,7 @@ describe('OAuthClientSettingsModal', () => {
 
       render(<OAuthClientSettingsModal {...defaultProps} />)
 
-      fireEvent.click(screen.getByTestId('modal-confirm'))
+      fireEvent.click(getConfirmButton())
 
       // First poll
       await vi.advanceTimersByTimeAsync(3000)
@@ -1191,7 +1161,7 @@ describe('OAuthClientSettingsModal', () => {
       expect(mockVerifyBuilder).toHaveBeenCalledTimes(2)
 
       // Should still be in authorizing state
-      expect(screen.getByTestId('modal-confirm')).toHaveTextContent('pluginTrigger.modal.common.authorizing')
+      expect(getConfirmButton()).toHaveTextContent('pluginTrigger.modal.common.authorizing')
 
       vi.useRealTimers()
     })
diff --git a/web/app/components/plugins/plugin-detail-panel/subscription-list/create/common-modal.tsx b/web/app/components/plugins/plugin-detail-panel/subscription-list/create/common-modal.tsx
index 502cf73d54..201f521b48 100644
--- a/web/app/components/plugins/plugin-detail-panel/subscription-list/create/common-modal.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/subscription-list/create/common-modal.tsx
@@ -23,12 +23,39 @@ import {
 } from './hooks/use-common-modal-state'
 
 type Props = {
+  open?: boolean
   onClose: () => void
   createType: SupportedCreationMethods
   builder?: TriggerSubscriptionBuilder
 }
 
-export const CommonCreateModal = ({ onClose, createType, builder }: Props) => {
+export const CommonCreateModal = ({ open = true, onClose, createType, builder }: Props) => {
+  return (
+    <Dialog
+      open={open}
+      onOpenChange={nextOpen => !nextOpen && onClose()}
+      disablePointerDismissal
+    >
+      <DialogContent
+        backdropProps={{ forceRender: true }}
+        className={cn(
+          'flex max-h-[80%] min-h-[360px] flex-col overflow-hidden p-0 shadow-xs',
+          createType === SupportedCreationMethods.MANUAL
+            ? 'w-[640px] max-w-[calc(100vw-2rem)]'
+            : 'w-[480px] max-w-[calc(100vw-2rem)]',
+        )}
+      >
+        <CommonCreateModalContent
+          createType={createType}
+          builder={builder}
+          onClose={onClose}
+        />
+      </DialogContent>
+    </Dialog>
+  )
+}
+
+function CommonCreateModalContent({ onClose, createType, builder }: Omit<Props, 'open'>) {
   const { t } = useTranslation()
 
   const {
@@ -59,89 +86,76 @@ export const CommonCreateModal = ({ onClose, createType, builder }: Props) => {
   const modalSize = createType === SupportedCreationMethods.MANUAL ? 'md' : 'sm'
 
   return (
-    <Dialog open disablePointerDismissal>
-      <DialogContent
-        backdropProps={{ forceRender: true }}
-        className={cn(
-          'flex max-h-[80%] min-h-[360px] flex-col overflow-hidden p-0 shadow-xs',
-          modalSize === 'md'
-            ? 'w-[640px] max-w-[calc(100vw-2rem)]'
-            : 'w-[480px] max-w-[calc(100vw-2rem)]',
+    <div
+      className="flex min-h-0 flex-1 flex-col"
+      data-testid="modal"
+      data-size={modalSize}
+      data-disabled={isDisabled}
+    >
+      <div className="relative shrink-0 p-6 pr-14 pb-3">
+        <DialogTitle className="title-2xl-semi-bold text-text-primary" data-testid="modal-title">
+          {t(MODAL_TITLE_KEY_MAP[createType], { ns: 'pluginTrigger' })}
+        </DialogTitle>
+        <DialogCloseButton
+          className="top-5 right-5 h-8 w-8 rounded-lg [&>span]:h-5 [&>span]:w-5"
+          onClick={onClose}
+        />
+      </div>
+
+      <div className="min-h-0 flex-1 overflow-y-auto px-6 py-3">
+        {isApiKeyType && <MultiSteps currentStep={currentStep} />}
+
+        {isVerifyStep && (
+          <VerifyStepContent
+            apiKeyCredentialsSchema={apiKeyCredentialsSchema}
+            apiKeyCredentialsFormRef={formRefs.apiKeyCredentialsFormRef}
+            onChange={handleApiKeyCredentialsChange}
+          />
         )}
-      >
-        <div
-          className="flex min-h-0 flex-1 flex-col"
-          data-testid="modal"
-          data-size={modalSize}
-          data-disabled={isDisabled}
-        >
-          <div className="relative shrink-0 p-6 pr-14 pb-3">
-            <DialogTitle className="title-2xl-semi-bold text-text-primary" data-testid="modal-title">
-              {t(MODAL_TITLE_KEY_MAP[createType], { ns: 'pluginTrigger' })}
-            </DialogTitle>
-            <DialogCloseButton
-              className="top-5 right-5 h-8 w-8 rounded-lg [&>span]:h-5 [&>span]:w-5"
-              data-testid="modal-close"
-              onClick={onClose}
-            />
-          </div>
 
-          <div className="min-h-0 flex-1 overflow-y-auto px-6 py-3">
-            {isApiKeyType && <MultiSteps currentStep={currentStep} />}
+        {isConfigurationStep && (
+          <ConfigurationStepContent
+            createType={createType}
+            subscriptionBuilder={subscriptionBuilder}
+            subscriptionFormRef={formRefs.subscriptionFormRef}
+            autoCommonParametersSchema={autoCommonParametersSchema}
+            autoCommonParametersFormRef={formRefs.autoCommonParametersFormRef}
+            manualPropertiesSchema={manualPropertiesSchema}
+            manualPropertiesFormRef={formRefs.manualPropertiesFormRef}
+            onManualPropertiesChange={handleManualPropertiesChange}
+            logs={logData?.logs || []}
+            pluginId={detail?.plugin_id || ''}
+            pluginName={detail?.name || ''}
+            provider={detail?.provider || ''}
+          />
+        )}
+      </div>
 
-            {isVerifyStep && (
-              <VerifyStepContent
-                apiKeyCredentialsSchema={apiKeyCredentialsSchema}
-                apiKeyCredentialsFormRef={formRefs.apiKeyCredentialsFormRef}
-                onChange={handleApiKeyCredentialsChange}
-              />
-            )}
-
-            {isConfigurationStep && (
-              <ConfigurationStepContent
-                createType={createType}
-                subscriptionBuilder={subscriptionBuilder}
-                subscriptionFormRef={formRefs.subscriptionFormRef}
-                autoCommonParametersSchema={autoCommonParametersSchema}
-                autoCommonParametersFormRef={formRefs.autoCommonParametersFormRef}
-                manualPropertiesSchema={manualPropertiesSchema}
-                manualPropertiesFormRef={formRefs.manualPropertiesFormRef}
-                onManualPropertiesChange={handleManualPropertiesChange}
-                logs={logData?.logs || []}
-                pluginId={detail?.plugin_id || ''}
-                pluginName={detail?.name || ''}
-                provider={detail?.provider || ''}
-              />
-            )}
-          </div>
-
-          <div className="flex shrink-0 justify-end p-6 pt-5">
-            <div className="flex items-center">
-              <Button
-                disabled={isDisabled}
-                onClick={onClose}
-              >
-                {t('operation.cancel', { ns: 'common' })}
-              </Button>
-              <Button
-                className="ml-2"
-                variant="primary"
-                disabled={isDisabled}
-                data-testid="modal-confirm"
-                onClick={handleConfirm}
-              >
-                {confirmButtonText}
-              </Button>
-            </div>
-          </div>
-
-          {isVerifyStep && (
-            <div className="shrink-0">
-              <EncryptedBottom />
-            </div>
-          )}
+      <div className="flex shrink-0 justify-end p-6 pt-5">
+        <div className="flex items-center">
+          <Button
+            disabled={isDisabled}
+            onClick={onClose}
+          >
+            {t('operation.cancel', { ns: 'common' })}
+          </Button>
+          <Button
+            className="ml-2"
+            variant="primary"
+            disabled={isDisabled}
+            data-testid="modal-confirm"
+            onClick={handleConfirm}
+          >
+            {confirmButtonText}
+          </Button>
         </div>
-      </DialogContent>
-    </Dialog>
+      </div>
+
+      {isVerifyStep && (
+        <div className="shrink-0">
+          <EncryptedBottom />
+        </div>
+      )}
+    </div>
   )
 }
diff --git a/web/app/components/plugins/plugin-detail-panel/subscription-list/create/hooks/__tests__/use-oauth-client-state.spec.ts b/web/app/components/plugins/plugin-detail-panel/subscription-list/create/hooks/__tests__/use-oauth-client-state.spec.ts
index 82eddf501d..4c88b1207c 100644
--- a/web/app/components/plugins/plugin-detail-panel/subscription-list/create/hooks/__tests__/use-oauth-client-state.spec.ts
+++ b/web/app/components/plugins/plugin-detail-panel/subscription-list/create/hooks/__tests__/use-oauth-client-state.spec.ts
@@ -137,7 +137,7 @@ describe('useOAuthClientState', () => {
   const defaultParams = {
     oauthConfig: createMockOAuthConfig(),
     providerName: 'test-provider',
-    onClose: vi.fn(),
+    onOpenChange: vi.fn(),
     showOAuthCreateModal: vi.fn(),
   }
 
@@ -310,20 +310,20 @@ describe('useOAuthClientState', () => {
       )
     })
 
-    it('should call onClose and show success toast on success', () => {
+    it('should call onOpenChange and show success toast on success', () => {
       mockDeleteOAuth.mockImplementation((provider, { onSuccess }) => onSuccess())
 
-      const onClose = vi.fn()
+      const onOpenChange = vi.fn()
       const { result } = renderHook(() => useOAuthClientState({
         ...defaultParams,
-        onClose,
+        onOpenChange,
       }))
 
       act(() => {
         result.current.handleRemove()
       })
 
-      expect(onClose).toHaveBeenCalled()
+      expect(onOpenChange).toHaveBeenCalledWith(false)
       expect(mockToastNotify).toHaveBeenCalledWith({
         type: 'success',
         message: 'pluginTrigger.modal.oauth.remove.success',
@@ -398,20 +398,20 @@ describe('useOAuthClientState', () => {
       )
     })
 
-    it('should show success toast and call onClose when needAuth is false', () => {
+    it('should show success toast and call onOpenChange when needAuth is false', () => {
       mockConfigureOAuth.mockImplementation((params, { onSuccess }) => onSuccess())
-      const onClose = vi.fn()
+      const onOpenChange = vi.fn()
 
       const { result } = renderHook(() => useOAuthClientState({
         ...defaultParams,
-        onClose,
+        onOpenChange,
       }))
 
       act(() => {
         result.current.handleSave(false)
       })
 
-      expect(onClose).toHaveBeenCalled()
+      expect(onOpenChange).toHaveBeenCalledWith(false)
       expect(mockToastNotify).toHaveBeenCalledWith({
         type: 'success',
         message: 'pluginTrigger.modal.oauth.save.success',
@@ -495,8 +495,8 @@ describe('useOAuthClientState', () => {
       })
     })
 
-    it('should call onClose and showOAuthCreateModal on callback success', () => {
-      const onClose = vi.fn()
+    it('should call onOpenChange and showOAuthCreateModal on callback success', () => {
+      const onOpenChange = vi.fn()
       const showOAuthCreateModal = vi.fn()
       const builder = createMockSubscriptionBuilder()
 
@@ -513,7 +513,7 @@ describe('useOAuthClientState', () => {
 
       const { result } = renderHook(() => useOAuthClientState({
         ...defaultParams,
-        onClose,
+        onOpenChange,
         showOAuthCreateModal,
       }))
 
@@ -521,7 +521,7 @@ describe('useOAuthClientState', () => {
         result.current.handleSave(true)
       })
 
-      expect(onClose).toHaveBeenCalled()
+      expect(onOpenChange).toHaveBeenCalledWith(false)
       expect(showOAuthCreateModal).toHaveBeenCalledWith(builder)
       expect(mockToastNotify).toHaveBeenCalledWith({
         type: 'success',
@@ -530,7 +530,7 @@ describe('useOAuthClientState', () => {
     })
 
     it('should not call callbacks when OAuth callback returns falsy', () => {
-      const onClose = vi.fn()
+      const onOpenChange = vi.fn()
       const showOAuthCreateModal = vi.fn()
 
       mockConfigureOAuth.mockImplementation((params, { onSuccess }) => onSuccess())
@@ -546,7 +546,7 @@ describe('useOAuthClientState', () => {
 
       const { result } = renderHook(() => useOAuthClientState({
         ...defaultParams,
-        onClose,
+        onOpenChange,
         showOAuthCreateModal,
       }))
 
@@ -554,7 +554,7 @@ describe('useOAuthClientState', () => {
         result.current.handleSave(true)
       })
 
-      expect(onClose).not.toHaveBeenCalled()
+      expect(onOpenChange).not.toHaveBeenCalled()
       expect(showOAuthCreateModal).not.toHaveBeenCalled()
     })
   })
diff --git a/web/app/components/plugins/plugin-detail-panel/subscription-list/create/hooks/use-oauth-client-state.ts b/web/app/components/plugins/plugin-detail-panel/subscription-list/create/hooks/use-oauth-client-state.ts
index 25058e529c..e2bd284d15 100644
--- a/web/app/components/plugins/plugin-detail-panel/subscription-list/create/hooks/use-oauth-client-state.ts
+++ b/web/app/components/plugins/plugin-detail-panel/subscription-list/create/hooks/use-oauth-client-state.ts
@@ -13,16 +13,20 @@ import {
   useVerifyAndUpdateTriggerSubscriptionBuilder,
 } from '@/service/use-triggers'
 
-export enum AuthorizationStatusEnum {
-  Pending = 'pending',
-  Success = 'success',
-  Failed = 'failed',
-}
+export const AuthorizationStatusEnum = {
+  Pending: 'pending',
+  Success: 'success',
+  Failed: 'failed',
+} as const
 
-export enum ClientTypeEnum {
-  Default = 'default',
-  Custom = 'custom',
-}
+export type AuthorizationStatusEnum = typeof AuthorizationStatusEnum[keyof typeof AuthorizationStatusEnum]
+
+export const ClientTypeEnum = {
+  Default: 'default',
+  Custom: 'custom',
+} as const
+
+export type ClientTypeEnum = typeof ClientTypeEnum[keyof typeof ClientTypeEnum]
 
 const POLL_INTERVAL_MS = 3000
 
@@ -41,7 +45,7 @@ export const getErrorMessage = (error: unknown, fallback: string): string => {
 type UseOAuthClientStateParams = {
   oauthConfig?: TriggerOAuthConfig
   providerName: string
-  onClose: () => void
+  onOpenChange: (open: boolean) => void
   showOAuthCreateModal: (builder: TriggerSubscriptionBuilder) => void
 }
 
@@ -67,7 +71,7 @@ type UseOAuthClientStateReturn = {
 export const useOAuthClientState = ({
   oauthConfig,
   providerName,
-  onClose,
+  onOpenChange,
   showOAuthCreateModal,
 }: UseOAuthClientStateParams): UseOAuthClientStateReturn => {
   const { t } = useTranslation()
@@ -119,7 +123,7 @@ export const useOAuthClientState = ({
           if (!callbackData)
             return
           toast.success(t('modal.oauth.authorization.authSuccess', { ns: 'pluginTrigger' }))
-          onClose()
+          onOpenChange(false)
           showOAuthCreateModal(response.subscription_builder)
         })
       },
@@ -128,20 +132,20 @@ export const useOAuthClientState = ({
         toast.error(t('modal.oauth.authorization.authFailed', { ns: 'pluginTrigger' }))
       },
     })
-  }, [providerName, initiateOAuth, onClose, showOAuthCreateModal, t])
+  }, [providerName, initiateOAuth, onOpenChange, showOAuthCreateModal, t])
 
   // Remove handler
   const handleRemove = useCallback(() => {
     deleteOAuth(providerName, {
       onSuccess: () => {
-        onClose()
+        onOpenChange(false)
         toast.success(t('modal.oauth.remove.success', { ns: 'pluginTrigger' }))
       },
       onError: (error: unknown) => {
         toast.error(getErrorMessage(error, t('modal.oauth.remove.failed', { ns: 'pluginTrigger' })))
       },
     })
-  }, [providerName, deleteOAuth, onClose, t])
+  }, [providerName, deleteOAuth, onOpenChange, t])
 
   // Save handler
   const handleSave = useCallback((needAuth: boolean) => {
@@ -174,11 +178,11 @@ export const useOAuthClientState = ({
           handleAuthorization()
           return
         }
-        onClose()
+        onOpenChange(false)
         toast.success(t('modal.oauth.save.success', { ns: 'pluginTrigger' }))
       },
     })
-  }, [clientType, providerName, oauthClientSchema, oauthConfig?.params, configureOAuth, handleAuthorization, onClose, t])
+  }, [clientType, providerName, oauthClientSchema, oauthConfig?.params, configureOAuth, handleAuthorization, onOpenChange, t])
 
   // Polling effect for authorization verification
   useEffect(() => {
diff --git a/web/app/components/plugins/plugin-detail-panel/subscription-list/create/index.tsx b/web/app/components/plugins/plugin-detail-panel/subscription-list/create/index.tsx
index be970b6cec..7060b39dcf 100644
--- a/web/app/components/plugins/plugin-detail-panel/subscription-list/create/index.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/subscription-list/create/index.tsx
@@ -4,12 +4,12 @@ import { cn } from '@langgenius/dify-ui/cn'
 import { Select, SelectContent, SelectItem, SelectItemIndicator, SelectTrigger } from '@langgenius/dify-ui/select'
 import { toast } from '@langgenius/dify-ui/toast'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
-import { RiAddLine, RiEqualizer2Line } from '@remixicon/react'
 import { useBoolean } from 'ahooks'
 import { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { ActionButton, ActionButtonState } from '@/app/components/base/action-button'
 import Badge from '@/app/components/base/badge'
+import { Infotip } from '@/app/components/base/infotip'
 import { openOAuthPopup } from '@/hooks/use-oauth'
 import { useInitiateTriggerOAuth, useTriggerOAuthConfig, useTriggerProviderInfo } from '@/service/use-triggers'
 import { SupportedCreationMethods } from '../../../types'
@@ -40,6 +40,7 @@ export const CreateSubscriptionButton = ({ buttonType = CreateButtonType.FULL_BU
   const { subscriptions } = useSubscriptionList()
   const subscriptionCount = subscriptions?.length || 0
   const [selectedCreateInfo, setSelectedCreateInfo] = useState<{ type: SupportedCreationMethods, builder?: TriggerSubscriptionBuilder } | null>(null)
+  const [isCreateModalOpen, setIsCreateModalOpen] = useState(false)
 
   const detail = usePluginStore(state => state.detail)
   const [isMenuOpen, setIsMenuOpen] = useState(false)
@@ -68,9 +69,20 @@ export const CreateSubscriptionButton = ({ buttonType = CreateButtonType.FULL_BU
   const onClickClientSettings = useCallback((e: React.MouseEvent<HTMLDivElement | HTMLButtonElement>) => {
     e.stopPropagation()
     e.preventDefault()
+    setIsMenuOpen(false)
     showClientSettingsModal()
   }, [showClientSettingsModal])
 
+  const handleClientSettingsOpenChange = useCallback((open: boolean) => {
+    if (open) {
+      showClientSettingsModal()
+      return
+    }
+
+    hideClientSettingsModal()
+    refetchOAuthConfig()
+  }, [hideClientSettingsModal, refetchOAuthConfig, showClientSettingsModal])
+
   const allOptions = useMemo<CreateTypeOption[]>(() => {
     const showCustomBadge = oauthConfig?.custom_enabled && oauthConfig?.custom_configured
 
@@ -89,8 +101,11 @@ export const CreateSubscriptionButton = ({ buttonType = CreateButtonType.FULL_BU
           <Tooltip>
             <TooltipTrigger
               render={(
-                <ActionButton onClick={onClickClientSettings}>
-                  <RiEqualizer2Line className="h-4 w-4 text-text-tertiary" />
+                <ActionButton
+                  aria-label={t('subscription.addType.options.oauth.clientSettings', { ns: 'pluginTrigger' })}
+                  onClick={onClickClientSettings}
+                >
+                  <span aria-hidden className="i-ri-equalizer-2-line h-4 w-4 text-text-tertiary" />
                 </ActionButton>
               )}
             />
@@ -110,28 +125,32 @@ export const CreateSubscriptionButton = ({ buttonType = CreateButtonType.FULL_BU
         value: SupportedCreationMethods.MANUAL,
         label: t('subscription.addType.options.manual.description', { ns: 'pluginTrigger' }),
         extra: (
-          <Tooltip>
-            <TooltipTrigger
-              render={(
-                <span className="flex h-3.5 w-3.5 shrink-0 p-px">
-                  <span aria-hidden className="i-ri-question-line h-full w-full text-text-quaternary hover:text-text-tertiary" />
-                </span>
-              )}
-            />
-            <TooltipContent>
-              {t('subscription.addType.options.manual.tip', { ns: 'pluginTrigger' })}
-            </TooltipContent>
-          </Tooltip>
+          <Infotip
+            aria-label={t('subscription.addType.options.manual.tip', { ns: 'pluginTrigger' })}
+            className="h-3.5 w-3.5"
+            iconClassName="h-full w-full"
+          >
+            {t('subscription.addType.options.manual.tip', { ns: 'pluginTrigger' })}
+          </Infotip>
         ),
         show: supportedMethods.includes(SupportedCreationMethods.MANUAL),
       },
     ]
-  }, [t, oauthConfig, supportedMethods, methodType, onClickClientSettings])
+  }, [t, oauthConfig, supportedMethods, onClickClientSettings])
   const visibleOptions = useMemo(() => {
     return allOptions.filter(option => option.show)
   }, [allOptions])
   const shouldAllowSelect = methodType === DEFAULT_METHOD || (methodType === SupportedCreationMethods.OAUTH && supportedMethods.length === 1)
 
+  const showCreateModal = useCallback((createInfo: { type: SupportedCreationMethods, builder?: TriggerSubscriptionBuilder }) => {
+    setSelectedCreateInfo(createInfo)
+    setIsCreateModalOpen(true)
+  }, [])
+
+  const hideCreateModal = useCallback(() => {
+    setIsCreateModalOpen(false)
+  }, [])
+
   const onChooseCreateType = async (type: SupportedCreationMethods) => {
     if (type === SupportedCreationMethods.OAUTH) {
       if (oauthConfig?.configured) {
@@ -140,7 +159,10 @@ export const CreateSubscriptionButton = ({ buttonType = CreateButtonType.FULL_BU
             openOAuthPopup(response.authorization_url, (callbackData) => {
               if (callbackData) {
                 toast.success(t('modal.oauth.authorization.authSuccess', { ns: 'pluginTrigger' }))
-                setSelectedCreateInfo({ type: SupportedCreationMethods.OAUTH, builder: response.subscription_builder })
+                showCreateModal({
+                  type: SupportedCreationMethods.OAUTH,
+                  builder: response.subscription_builder,
+                })
               }
             })
           },
@@ -154,10 +176,21 @@ export const CreateSubscriptionButton = ({ buttonType = CreateButtonType.FULL_BU
       }
     }
     else {
-      setSelectedCreateInfo({ type })
+      showCreateModal({
+        type,
+      })
     }
   }
 
+  const handleCreateTypeChange = (value: string | null) => {
+    const option = visibleOptions.find(item => item.value === value)
+    if (!option)
+      return
+
+    setIsMenuOpen(false)
+    void onChooseCreateType(option.value)
+  }
+
   const onClickCreate = (e: React.MouseEvent<HTMLButtonElement>) => {
     if (subscriptionCount >= MAX_COUNT) {
       e.stopPropagation()
@@ -181,12 +214,7 @@ export const CreateSubscriptionButton = ({ buttonType = CreateButtonType.FULL_BU
         value={methodType === DEFAULT_METHOD ? null : methodType}
         open={shouldAllowSelect ? isMenuOpen : false}
         onOpenChange={setIsMenuOpen}
-        onValueChange={(value) => {
-          if (!value)
-            return
-          setIsMenuOpen(false)
-          void onChooseCreateType(value as SupportedCreationMethods)
-        }}
+        onValueChange={handleCreateTypeChange}
       >
         <SelectTrigger
           render={<div />}
@@ -202,7 +230,7 @@ export const CreateSubscriptionButton = ({ buttonType = CreateButtonType.FULL_BU
                   onClick={onClickCreate}
                 >
                   <div className="flex flex-1 items-center justify-center">
-                    <RiAddLine className="mr-2 size-4" />
+                    <span aria-hidden className="mr-2 i-ri-add-line size-4" />
                     {buttonTextMap[methodType!]}
                     {methodType === SupportedCreationMethods.OAUTH && oauthConfig?.custom_enabled && oauthConfig?.custom_configured && (
                       <Badge
@@ -220,7 +248,7 @@ export const CreateSubscriptionButton = ({ buttonType = CreateButtonType.FULL_BU
                           <TooltipTrigger
                             render={(
                               <div onClick={onClickClientSettings} className="p-2">
-                                <RiEqualizer2Line className="size-4 text-components-button-primary-text" />
+                                <span aria-hidden className="i-ri-equalizer-2-line size-4 text-components-button-primary-text" />
                               </div>
                             )}
                           />
@@ -238,6 +266,7 @@ export const CreateSubscriptionButton = ({ buttonType = CreateButtonType.FULL_BU
                     disabled={!(supportedMethods?.length === 1 || subscriptionCount >= MAX_COUNT)}
                     render={(
                       <ActionButton
+                        aria-label={buttonTextMap[methodType!]}
                         onClick={onClickCreate}
                         className={cn(
                           'float-right',
@@ -245,7 +274,7 @@ export const CreateSubscriptionButton = ({ buttonType = CreateButtonType.FULL_BU
                         )}
                         state={subscriptionCount >= MAX_COUNT ? ActionButtonState.Disabled : ActionButtonState.Default}
                       >
-                        <RiAddLine className="size-4" />
+                        <span aria-hidden className="i-ri-add-line size-4" />
                       </ActionButton>
                     )}
                   />
@@ -255,7 +284,7 @@ export const CreateSubscriptionButton = ({ buttonType = CreateButtonType.FULL_BU
                 </Tooltip>
               )}
         </SelectTrigger>
-        <SelectContent placement="bottom-start" sideOffset={4} popupClassName={cn('z-1000', buttonType === CreateButtonType.FULL_BUTTON && 'min-w-(--anchor-width)')}>
+        <SelectContent placement="bottom-start" sideOffset={4}>
           {visibleOptions.map(option => (
             <SelectItem key={option.value} value={option.value}>
               <div className="mr-8 flex grow items-center gap-1 truncate px-1">
@@ -268,25 +297,31 @@ export const CreateSubscriptionButton = ({ buttonType = CreateButtonType.FULL_BU
           ))}
         </SelectContent>
       </Select>
-      {selectedCreateInfo && (
-        <CommonCreateModal
-          createType={selectedCreateInfo.type}
-          builder={selectedCreateInfo.builder}
-          onClose={() => setSelectedCreateInfo(null)}
-        />
-      )}
-      {isShowClientSettingsModal && (
-        <OAuthClientSettingsModal
-          oauthConfig={oauthConfig}
-          onClose={() => {
-            hideClientSettingsModal()
-            refetchOAuthConfig()
-          }}
-          showOAuthCreateModal={builder => setSelectedCreateInfo({ type: SupportedCreationMethods.OAUTH, builder })}
-        />
-      )}
+      {selectedCreateInfo
+        ? (
+            <CommonCreateModal
+              open={isCreateModalOpen}
+              createType={selectedCreateInfo.type}
+              builder={selectedCreateInfo.builder}
+              onClose={hideCreateModal}
+            />
+          )
+        : null}
+      {isShowClientSettingsModal
+        ? (
+            <OAuthClientSettingsModal
+              open={isShowClientSettingsModal}
+              oauthConfig={oauthConfig}
+              onOpenChange={handleClientSettingsOpenChange}
+              showOAuthCreateModal={(builder) => {
+                showCreateModal({
+                  type: SupportedCreationMethods.OAUTH,
+                  builder,
+                })
+              }}
+            />
+          )
+        : null}
     </>
   )
 }
-
-export { CreateButtonType, DEFAULT_METHOD } from './types'
diff --git a/web/app/components/plugins/plugin-detail-panel/subscription-list/create/oauth-client.tsx b/web/app/components/plugins/plugin-detail-panel/subscription-list/create/oauth-client.tsx
index 450324ae40..189e4af2a5 100644
--- a/web/app/components/plugins/plugin-detail-panel/subscription-list/create/oauth-client.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/subscription-list/create/oauth-client.tsx
@@ -1,31 +1,36 @@
 'use client'
 import type { TriggerOAuthConfig, TriggerSubscriptionBuilder } from '@/app/components/workflow/block-selector/types'
 import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogCloseButton, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
-import {
-  RiClipboardLine,
-  RiInformation2Fill,
-} from '@remixicon/react'
+import { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 import { BaseForm } from '@/app/components/base/form/components/base'
-import Modal from '@/app/components/base/modal/modal'
 import OptionCard from '@/app/components/workflow/nodes/_base/components/option-card'
 import { usePluginStore } from '../../store'
-import { ClientTypeEnum, useOAuthClientState } from './hooks/use-oauth-client-state'
+import { ClientTypeEnum, useOAuthClientState as useOAuthClientSettings } from './hooks/use-oauth-client-state'
 
 type Props = {
+  open: boolean
   oauthConfig?: TriggerOAuthConfig
-  onClose: () => void
+  onOpenChange: (open: boolean) => void
   showOAuthCreateModal: (builder: TriggerSubscriptionBuilder) => void
 }
 
 const CLIENT_TYPE_OPTIONS = [ClientTypeEnum.Default, ClientTypeEnum.Custom] as const
 
-export const OAuthClientSettingsModal = ({ oauthConfig, onClose, showOAuthCreateModal }: Props) => {
+export const OAuthClientSettingsModal = ({ open, oauthConfig, onOpenChange, showOAuthCreateModal }: Props) => {
   const { t } = useTranslation()
   const detail = usePluginStore(state => state.detail)
   const providerName = detail?.provider || ''
+  const closeModal = useCallback(() => onOpenChange(false), [onOpenChange])
 
+  const oauthClientSettings = useOAuthClientSettings({
+    oauthConfig,
+    providerName,
+    onOpenChange,
+    showOAuthCreateModal,
+  })
   const {
     clientType,
     setClientType,
@@ -34,12 +39,7 @@ export const OAuthClientSettingsModal = ({ oauthConfig, onClose, showOAuthCreate
     confirmButtonText,
     handleRemove,
     handleSave,
-  } = useOAuthClientState({
-    oauthConfig,
-    providerName,
-    onClose,
-    showOAuthCreateModal,
-  })
+  } = oauthClientSettings
 
   const isCustomClient = clientType === ClientTypeEnum.Custom
   const showRemoveButton = oauthConfig?.custom_enabled && oauthConfig?.params && isCustomClient
@@ -51,81 +51,116 @@ export const OAuthClientSettingsModal = ({ oauthConfig, onClose, showOAuthCreate
     toast.success(t('actionMsg.copySuccessfully', { ns: 'common' }))
   }
 
+  const title = t('modal.oauth.title', { ns: 'pluginTrigger' })
+
   return (
-    <Modal
-      title={t('modal.oauth.title', { ns: 'pluginTrigger' })}
-      confirmButtonText={confirmButtonText}
-      cancelButtonText={t('auth.saveOnly', { ns: 'plugin' })}
-      extraButtonText={t('operation.cancel', { ns: 'common' })}
-      showExtraButton
-      clickOutsideNotClose
-      extraButtonVariant="secondary"
-      onExtraButtonClick={onClose}
-      onClose={onClose}
-      onCancel={() => handleSave(false)}
-      onConfirm={() => handleSave(true)}
-      footerSlot={showRemoveButton && (
-        <div className="grow">
-          <Button
-            variant="secondary"
-            className="text-components-button-destructive-secondary-text"
-            onClick={handleRemove}
-          >
-            {t('operation.remove', { ns: 'common' })}
-          </Button>
-        </div>
-      )}
+    <Dialog
+      open={open}
+      disablePointerDismissal
+      onOpenChange={onOpenChange}
     >
-      <div className="mb-2 system-sm-medium text-text-secondary">
-        {t('subscription.addType.options.oauth.clientTitle', { ns: 'pluginTrigger' })}
-      </div>
-
-      {oauthConfig?.system_configured && (
-        <div className="mb-4 flex w-full items-start justify-between gap-2">
-          {CLIENT_TYPE_OPTIONS.map(option => (
-            <OptionCard
-              key={option}
-              title={t(`subscription.addType.options.oauth.${option}`, { ns: 'pluginTrigger' })}
-              onSelect={() => setClientType(option)}
-              selected={clientType === option}
-              className="flex-1"
-            />
-          ))}
-        </div>
-      )}
-
-      {showRedirectInfo && (
-        <div className="mb-4 flex items-start gap-3 rounded-xl bg-background-section-burn p-4">
-          <div className="rounded-lg border-[0.5px] border-components-card-border bg-components-card-bg p-2 shadow-xs shadow-shadow-shadow-3">
-            <RiInformation2Fill className="h-5 w-5 shrink-0 text-text-accent" />
+      <DialogContent
+        backdropProps={{ forceRender: true }}
+        className="p-0"
+      >
+        <div data-testid="modal" className="flex max-h-[80dvh] flex-col">
+          <div className="relative shrink-0 p-6 pr-14 pb-3">
+            <DialogTitle data-testid="modal-title" className="title-2xl-semi-bold text-text-primary">
+              {title}
+            </DialogTitle>
+            <DialogCloseButton className="top-5 right-5 h-8 w-8 rounded-lg" />
           </div>
-          <div className="flex-1 text-text-secondary">
-            <div className="system-sm-regular leading-4 whitespace-pre-wrap">
-              {t('modal.oauthRedirectInfo', { ns: 'pluginTrigger' })}
+          <div data-testid="modal-content" className="min-h-0 flex-1 overflow-y-auto px-6 py-3">
+            <div className="mb-2 system-sm-medium text-text-secondary">
+              {t('subscription.addType.options.oauth.clientTitle', { ns: 'pluginTrigger' })}
             </div>
-            <div className="my-1.5 system-sm-medium leading-4 break-all">
-              {oauthConfig?.redirect_uri}
+
+            {oauthConfig?.system_configured && (
+              <div className="mb-4 flex w-full items-start justify-between gap-2">
+                {CLIENT_TYPE_OPTIONS.map(option => (
+                  <OptionCard
+                    key={option}
+                    title={t(`subscription.addType.options.oauth.${option}`, { ns: 'pluginTrigger' })}
+                    onSelect={() => setClientType(option)}
+                    selected={clientType === option}
+                    className="flex-1"
+                  />
+                ))}
+              </div>
+            )}
+
+            {showRedirectInfo && (
+              <div className="mb-4 flex items-start gap-3 rounded-xl bg-background-section-burn p-4">
+                <div className="rounded-lg border-[0.5px] border-components-card-border bg-components-card-bg p-2 shadow-xs shadow-shadow-shadow-3">
+                  <span aria-hidden="true" className="i-ri-information-2-fill h-5 w-5 shrink-0 text-text-accent" />
+                </div>
+                <div className="min-w-0 flex-1 text-text-secondary">
+                  <div className="system-sm-regular leading-4 whitespace-pre-wrap">
+                    {t('modal.oauthRedirectInfo', { ns: 'pluginTrigger' })}
+                  </div>
+                  <div className="my-1.5 system-sm-medium leading-4 break-all">
+                    {oauthConfig?.redirect_uri}
+                  </div>
+                  <Button
+                    variant="secondary"
+                    size="small"
+                    onClick={handleCopyRedirectUri}
+                  >
+                    <span aria-hidden="true" className="mr-1 i-ri-clipboard-line h-[14px] w-[14px]" />
+                    {t('operation.copy', { ns: 'common' })}
+                  </Button>
+                </div>
+              </div>
+            )}
+
+            {showClientForm && (
+              <BaseForm
+                formSchemas={oauthClientSchema}
+                ref={clientFormRef}
+                labelClassName="system-sm-medium mb-2 block text-text-secondary"
+                formClassName="space-y-4"
+              />
+            )}
+          </div>
+          <div data-testid="modal-footer" className="flex shrink-0 justify-between p-6 pt-5">
+            <div>
+              {showRemoveButton && (
+                <Button
+                  variant="secondary"
+                  className="text-components-button-destructive-secondary-text"
+                  onClick={handleRemove}
+                >
+                  {t('operation.remove', { ns: 'common' })}
+                </Button>
+              )}
+            </div>
+            <div className="flex items-center">
+              <Button
+                data-testid="modal-extra"
+                variant="secondary"
+                onClick={closeModal}
+              >
+                {t('operation.cancel', { ns: 'common' })}
+              </Button>
+              <div className="mx-3 h-4 w-px bg-divider-regular"></div>
+              <Button
+                data-testid="modal-cancel"
+                onClick={() => handleSave(false)}
+              >
+                {t('auth.saveOnly', { ns: 'plugin' })}
+              </Button>
+              <Button
+                data-testid="modal-confirm"
+                className="ml-2"
+                variant="primary"
+                onClick={() => handleSave(true)}
+              >
+                {confirmButtonText}
+              </Button>
             </div>
-            <Button
-              variant="secondary"
-              size="small"
-              onClick={handleCopyRedirectUri}
-            >
-              <RiClipboardLine className="mr-1 h-[14px] w-[14px]" />
-              {t('operation.copy', { ns: 'common' })}
-            </Button>
           </div>
         </div>
-      )}
-
-      {showClientForm && (
-        <BaseForm
-          formSchemas={oauthClientSchema}
-          ref={clientFormRef}
-          labelClassName="system-sm-medium mb-2 block text-text-secondary"
-          formClassName="space-y-4"
-        />
-      )}
-    </Modal>
+      </DialogContent>
+    </Dialog>
   )
 }
diff --git a/web/app/components/plugins/plugin-detail-panel/subscription-list/edit/__tests__/index.spec.tsx b/web/app/components/plugins/plugin-detail-panel/subscription-list/edit/__tests__/index.spec.tsx
index 6cf58b8972..dcf07e66a2 100644
--- a/web/app/components/plugins/plugin-detail-panel/subscription-list/edit/__tests__/index.spec.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/subscription-list/edit/__tests__/index.spec.tsx
@@ -76,6 +76,11 @@ vi.mock('../../../store', () => ({
     selector({ detail: mockPluginStoreDetail }),
 }))
 
+const getCancelButton = () => screen.getByRole('button', { name: /common\.operation\.cancel/i })
+const getConfirmButton = () => screen.getByRole('button', { name: /common\.operation\.(save|saving)|pluginTrigger\.modal\.common\.verify/i })
+const getBackButton = () => screen.getByRole('button', { name: /pluginTrigger\.modal\.common\.back/i })
+const queryBackButton = () => screen.queryByRole('button', { name: /pluginTrigger\.modal\.common\.back/i })
+
 const mockRefetch = vi.fn()
 vi.mock('../../use-subscription-list', () => ({
   useSubscriptionList: () => ({ refetch: mockRefetch }),
@@ -166,49 +171,6 @@ vi.mock('@/app/components/base/form/components/base', () => ({
   }),
 }))
 
-vi.mock('@/app/components/base/modal/modal', () => ({
-  default: ({
-    title,
-    confirmButtonText,
-    onClose,
-    onCancel,
-    onConfirm,
-    disabled,
-    children,
-    showExtraButton,
-    extraButtonText,
-    onExtraButtonClick,
-    bottomSlot,
-  }: {
-    title: string
-    confirmButtonText: string
-    onClose: () => void
-    onCancel: () => void
-    onConfirm: () => void
-    disabled?: boolean
-    children: React.ReactNode
-    showExtraButton?: boolean
-    extraButtonText?: string
-    onExtraButtonClick?: () => void
-    bottomSlot?: React.ReactNode
-  }) => (
-    <div data-testid="modal" data-title={title} data-disabled={disabled}>
-      <div data-testid="modal-content">{children}</div>
-      <button data-testid="modal-confirm-button" onClick={onConfirm} disabled={disabled}>
-        {confirmButtonText}
-      </button>
-      <button data-testid="modal-cancel-button" onClick={onCancel}>Cancel</button>
-      <button data-testid="modal-close-button" onClick={onClose}>Close</button>
-      {showExtraButton && (
-        <button data-testid="modal-extra-button" onClick={onExtraButtonClick}>
-          {extraButtonText}
-        </button>
-      )}
-      {!!bottomSlot && <div data-testid="modal-bottom-slot">{bottomSlot}</div>}
-    </div>
-  ),
-}))
-
 // ==================== Test Utilities ====================
 
 const createSubscription = (overrides: Partial<TriggerSubscription> = {}): TriggerSubscription => ({
@@ -444,7 +406,7 @@ describe('Edit Modal Components', () => {
     describe('Confirm Button Text', () => {
       it('should show "save" when not updating', () => {
         render(<ManualEditModal {...createProps()} />)
-        expect(screen.getByTestId('modal-confirm-button')).toHaveTextContent('common.operation.save')
+        expect(getConfirmButton()).toHaveTextContent('common.operation.save')
       })
     })
 
@@ -452,21 +414,21 @@ describe('Edit Modal Components', () => {
       it('should call onClose when cancel button is clicked', () => {
         const onClose = vi.fn()
         render(<ManualEditModal {...createProps({ onClose })} />)
-        fireEvent.click(screen.getByTestId('modal-cancel-button'))
+        fireEvent.click(getCancelButton())
         expect(onClose).toHaveBeenCalledTimes(1)
       })
 
       it('should call onClose when close button is clicked', () => {
         const onClose = vi.fn()
         render(<ManualEditModal {...createProps({ onClose })} />)
-        fireEvent.click(screen.getByTestId('modal-close-button'))
+        fireEvent.click(screen.getByRole('button', { name: 'Close' }))
         expect(onClose).toHaveBeenCalledTimes(1)
       })
 
       it('should call updateSubscription when confirm is clicked with valid form', () => {
         formValuesMap.set('main', { values: { subscription_name: 'New Name' }, isCheckValidated: true })
         render(<ManualEditModal {...createProps()} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         expect(mockUpdateSubscription).toHaveBeenCalledWith(
           expect.objectContaining({ subscriptionId: 'test-subscription-id', name: 'New Name' }),
           expect.any(Object),
@@ -476,7 +438,7 @@ describe('Edit Modal Components', () => {
       it('should not call updateSubscription when form validation fails', () => {
         formValuesMap.set('main', { values: {}, isCheckValidated: false })
         render(<ManualEditModal {...createProps()} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         expect(mockUpdateSubscription).not.toHaveBeenCalled()
       })
     })
@@ -489,7 +451,7 @@ describe('Edit Modal Components', () => {
           isCheckValidated: true,
         })
         render(<ManualEditModal {...createProps({ subscription })} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         expect(mockUpdateSubscription).toHaveBeenCalledWith(
           expect.objectContaining({ properties: undefined }),
           expect.any(Object),
@@ -503,7 +465,7 @@ describe('Edit Modal Components', () => {
           isCheckValidated: true,
         })
         render(<ManualEditModal {...createProps({ subscription })} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         expect(mockUpdateSubscription).toHaveBeenCalledWith(
           expect.objectContaining({ properties: { custom: 'new' } }),
           expect.any(Object),
@@ -517,7 +479,7 @@ describe('Edit Modal Components', () => {
         mockUpdateSubscription.mockImplementation((_p, cb) => cb.onSuccess())
         const onClose = vi.fn()
         render(<ManualEditModal {...createProps({ onClose })} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
           expect(mockToastNotify).toHaveBeenCalledWith(expect.objectContaining({ type: 'success' }))
         })
@@ -529,7 +491,7 @@ describe('Edit Modal Components', () => {
         formValuesMap.set('main', { values: { subscription_name: 'Name' }, isCheckValidated: true })
         mockUpdateSubscription.mockImplementation((_p, cb) => cb.onError(new Error('Custom error')))
         render(<ManualEditModal {...createProps()} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
           expect(mockToastNotify).toHaveBeenCalledWith(expect.objectContaining({
             type: 'error',
@@ -542,7 +504,7 @@ describe('Edit Modal Components', () => {
         formValuesMap.set('main', { values: { subscription_name: 'Name' }, isCheckValidated: true })
         mockUpdateSubscription.mockImplementation((_p, cb) => cb.onError({ message: 'Object error' }))
         render(<ManualEditModal {...createProps()} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
           expect(mockToastNotify).toHaveBeenCalledWith(expect.objectContaining({
             type: 'error',
@@ -555,7 +517,7 @@ describe('Edit Modal Components', () => {
         formValuesMap.set('main', { values: { subscription_name: 'Name' }, isCheckValidated: true })
         mockUpdateSubscription.mockImplementation((_p, cb) => cb.onError({}))
         render(<ManualEditModal {...createProps()} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
           expect(mockToastNotify).toHaveBeenCalledWith(expect.objectContaining({
             type: 'error',
@@ -568,7 +530,7 @@ describe('Edit Modal Components', () => {
         formValuesMap.set('main', { values: { subscription_name: 'Name' }, isCheckValidated: true })
         mockUpdateSubscription.mockImplementation((_p, cb) => cb.onError(null))
         render(<ManualEditModal {...createProps()} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
           expect(mockToastNotify).toHaveBeenCalledWith(expect.objectContaining({
             type: 'error',
@@ -581,7 +543,7 @@ describe('Edit Modal Components', () => {
         formValuesMap.set('main', { values: { subscription_name: 'Name' }, isCheckValidated: true })
         mockUpdateSubscription.mockImplementation((_p, cb) => cb.onError({ message: 123 }))
         render(<ManualEditModal {...createProps()} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
           expect(mockToastNotify).toHaveBeenCalledWith(expect.objectContaining({
             type: 'error',
@@ -594,7 +556,7 @@ describe('Edit Modal Components', () => {
         formValuesMap.set('main', { values: { subscription_name: 'Name' }, isCheckValidated: true })
         mockUpdateSubscription.mockImplementation((_p, cb) => cb.onError({ message: '' }))
         render(<ManualEditModal {...createProps()} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
           expect(mockToastNotify).toHaveBeenCalledWith(expect.objectContaining({
             type: 'error',
@@ -634,7 +596,7 @@ describe('Edit Modal Components', () => {
       it('should show saving text when isUpdating is true', () => {
         mockIsUpdating = true
         render(<ManualEditModal {...createProps()} />)
-        expect(screen.getByTestId('modal-confirm-button')).toHaveTextContent('common.operation.saving')
+        expect(getConfirmButton()).toHaveTextContent('common.operation.saving')
       })
     })
   })
@@ -740,7 +702,7 @@ describe('Edit Modal Components', () => {
           })}
           />,
         )
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         expect(mockUpdateSubscription).toHaveBeenCalledWith(
           expect.objectContaining({ parameters: undefined }),
           expect.any(Object),
@@ -761,7 +723,7 @@ describe('Edit Modal Components', () => {
           })}
           />,
         )
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         expect(mockUpdateSubscription).toHaveBeenCalledWith(
           expect.objectContaining({ parameters: { channel: 'new' } }),
           expect.any(Object),
@@ -775,7 +737,7 @@ describe('Edit Modal Components', () => {
         mockUpdateSubscription.mockImplementation((_p, cb) => cb.onSuccess())
         const onClose = vi.fn()
         render(<OAuthEditModal {...createProps({ onClose })} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
           expect(mockToastNotify).toHaveBeenCalledWith(expect.objectContaining({ type: 'success' }))
         })
@@ -786,7 +748,7 @@ describe('Edit Modal Components', () => {
         formValuesMap.set('main', { values: { subscription_name: 'Name' }, isCheckValidated: true })
         mockUpdateSubscription.mockImplementation((_p, cb) => cb.onError(new Error('Failed')))
         render(<OAuthEditModal {...createProps()} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
           expect(mockToastNotify).toHaveBeenCalledWith(expect.objectContaining({ type: 'error' }))
         })
@@ -796,7 +758,7 @@ describe('Edit Modal Components', () => {
         formValuesMap.set('main', { values: { subscription_name: 'Name' }, isCheckValidated: true })
         mockUpdateSubscription.mockImplementation((_p, cb) => cb.onError({ message: 123 }))
         render(<OAuthEditModal {...createProps()} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
           expect(mockToastNotify).toHaveBeenCalledWith(expect.objectContaining({
             type: 'error',
@@ -809,7 +771,7 @@ describe('Edit Modal Components', () => {
         formValuesMap.set('main', { values: { subscription_name: 'Name' }, isCheckValidated: true })
         mockUpdateSubscription.mockImplementation((_p, cb) => cb.onError({ message: '' }))
         render(<OAuthEditModal {...createProps()} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
           expect(mockToastNotify).toHaveBeenCalledWith(expect.objectContaining({
             type: 'error',
@@ -823,7 +785,7 @@ describe('Edit Modal Components', () => {
       it('should not call updateSubscription when form validation fails', () => {
         formValuesMap.set('main', { values: {}, isCheckValidated: false })
         render(<OAuthEditModal {...createProps()} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         expect(mockUpdateSubscription).not.toHaveBeenCalled()
       })
     })
@@ -874,7 +836,7 @@ describe('Edit Modal Components', () => {
       it('should show saving text when isUpdating is true', () => {
         mockIsUpdating = true
         render(<OAuthEditModal {...createProps()} />)
-        expect(screen.getByTestId('modal-confirm-button')).toHaveTextContent('common.operation.saving')
+        expect(getConfirmButton()).toHaveTextContent('common.operation.saving')
       })
     })
   })
@@ -922,12 +884,12 @@ describe('Edit Modal Components', () => {
 
       it('should show verify button text in credentials step', () => {
         render(<ApiKeyEditModal {...createProps()} />)
-        expect(screen.getByTestId('modal-confirm-button')).toHaveTextContent('pluginTrigger.modal.common.verify')
+        expect(getConfirmButton()).toHaveTextContent('pluginTrigger.modal.common.verify')
       })
 
       it('should not show extra button (back) in credentials step', () => {
         render(<ApiKeyEditModal {...createProps()} />)
-        expect(screen.queryByTestId('modal-extra-button')).not.toBeInTheDocument()
+        expect(queryBackButton()).not.toBeInTheDocument()
       })
 
       it('should render ReadmeEntrance when pluginDetail is provided', () => {
@@ -960,7 +922,7 @@ describe('Edit Modal Components', () => {
       it('should call verifyCredentials when confirm clicked in credentials step', () => {
         formValuesMap.set('credentials', { values: { api_key: 'test-key' }, isCheckValidated: true })
         render(<ApiKeyEditModal {...createProps()} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         expect(mockVerifyCredentials).toHaveBeenCalledWith(
           expect.objectContaining({
             provider: 'test-provider',
@@ -974,7 +936,7 @@ describe('Edit Modal Components', () => {
       it('should not call verifyCredentials when form validation fails', () => {
         formValuesMap.set('credentials', { values: {}, isCheckValidated: false })
         render(<ApiKeyEditModal {...createProps()} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         expect(mockVerifyCredentials).not.toHaveBeenCalled()
       })
 
@@ -982,7 +944,7 @@ describe('Edit Modal Components', () => {
         formValuesMap.set('credentials', { values: { api_key: 'new-key' }, isCheckValidated: true })
         mockVerifyCredentials.mockImplementation((_p, cb) => cb.onSuccess())
         render(<ApiKeyEditModal {...createProps()} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
           expect(mockToastNotify).toHaveBeenCalledWith(expect.objectContaining({
             type: 'success',
@@ -990,7 +952,7 @@ describe('Edit Modal Components', () => {
           }))
         })
         // Should now be in step 2
-        expect(screen.getByTestId('modal-confirm-button')).toHaveTextContent('common.operation.save')
+        expect(getConfirmButton()).toHaveTextContent('common.operation.save')
       })
 
       it('should show error toast on verification failure', async () => {
@@ -998,7 +960,7 @@ describe('Edit Modal Components', () => {
         mockParsePluginErrorMessage.mockResolvedValue('Invalid API key')
         mockVerifyCredentials.mockImplementation((_p, cb) => cb.onError(new Error('Invalid')))
         render(<ApiKeyEditModal {...createProps()} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
           expect(mockToastNotify).toHaveBeenCalledWith(expect.objectContaining({
             type: 'error',
@@ -1012,7 +974,7 @@ describe('Edit Modal Components', () => {
         mockParsePluginErrorMessage.mockResolvedValue(null)
         mockVerifyCredentials.mockImplementation((_p, cb) => cb.onError(new Error('Invalid')))
         render(<ApiKeyEditModal {...createProps()} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
           expect(mockToastNotify).toHaveBeenCalledWith(expect.objectContaining({
             type: 'error',
@@ -1028,13 +990,13 @@ describe('Edit Modal Components', () => {
         render(<ApiKeyEditModal {...createProps()} />)
 
         // Verify credentials
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
-          expect(screen.getByTestId('modal-confirm-button')).toHaveTextContent('common.operation.save')
+          expect(getConfirmButton()).toHaveTextContent('common.operation.save')
         })
 
         // Update subscription
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         expect(mockUpdateSubscription).toHaveBeenCalledWith(
           expect.objectContaining({ credentials: undefined }),
           expect.any(Object),
@@ -1051,24 +1013,24 @@ describe('Edit Modal Components', () => {
 
       it('should show save button text in configuration step', async () => {
         render(<ApiKeyEditModal {...createProps()} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
-          expect(screen.getByTestId('modal-confirm-button')).toHaveTextContent('common.operation.save')
+          expect(getConfirmButton()).toHaveTextContent('common.operation.save')
         })
       })
 
       it('should show extra button (back) in configuration step', async () => {
         render(<ApiKeyEditModal {...createProps()} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
-          expect(screen.getByTestId('modal-extra-button')).toBeInTheDocument()
-          expect(screen.getByTestId('modal-extra-button')).toHaveTextContent('pluginTrigger.modal.common.back')
+          expect(getBackButton()).toBeInTheDocument()
+          expect(getBackButton()).toHaveTextContent('pluginTrigger.modal.common.back')
         })
       })
 
       it('should not show EncryptedBottom in configuration step', async () => {
         render(<ApiKeyEditModal {...createProps()} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
           expect(screen.queryByTestId('modal-bottom-slot')).not.toBeInTheDocument()
         })
@@ -1076,7 +1038,7 @@ describe('Edit Modal Components', () => {
 
       it('should render basic form fields in step 2', async () => {
         render(<ApiKeyEditModal {...createProps()} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
           expect(screen.getByTestId('form-field-subscription_name')).toBeInTheDocument()
           expect(screen.getByTestId('form-field-callback_url')).toBeInTheDocument()
@@ -1088,7 +1050,7 @@ describe('Edit Modal Components', () => {
           createSchemaField('param1'),
         ]
         render(<ApiKeyEditModal {...createProps()} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
           expect(screen.getByTestId('form-field-param1')).toBeInTheDocument()
         })
@@ -1106,19 +1068,19 @@ describe('Edit Modal Components', () => {
         render(<ApiKeyEditModal {...createProps()} />)
 
         // Go to step 2
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
-          expect(screen.getByTestId('modal-extra-button')).toBeInTheDocument()
+          expect(getBackButton()).toBeInTheDocument()
         })
 
         // Click back
-        fireEvent.click(screen.getByTestId('modal-extra-button'))
+        fireEvent.click(getBackButton())
 
         // Should be back in step 1
         await waitFor(() => {
-          expect(screen.getByTestId('modal-confirm-button')).toHaveTextContent('pluginTrigger.modal.common.verify')
+          expect(getConfirmButton()).toHaveTextContent('pluginTrigger.modal.common.verify')
         })
-        expect(screen.queryByTestId('modal-extra-button')).not.toBeInTheDocument()
+        expect(queryBackButton()).not.toBeInTheDocument()
       })
 
       it('should go back to credentials step when clicking step indicator', async () => {
@@ -1127,9 +1089,9 @@ describe('Edit Modal Components', () => {
         render(<ApiKeyEditModal {...createProps()} />)
 
         // Go to step 2
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
-          expect(screen.getByTestId('modal-confirm-button')).toHaveTextContent('common.operation.save')
+          expect(getConfirmButton()).toHaveTextContent('common.operation.save')
         })
 
         // Find and click the step indicator (first step text should be clickable in step 2)
@@ -1138,7 +1100,7 @@ describe('Edit Modal Components', () => {
 
         // Should be back in step 1
         await waitFor(() => {
-          expect(screen.getByTestId('modal-confirm-button')).toHaveTextContent('pluginTrigger.modal.common.verify')
+          expect(getConfirmButton()).toHaveTextContent('pluginTrigger.modal.common.verify')
         })
       })
     })
@@ -1155,13 +1117,13 @@ describe('Edit Modal Components', () => {
         render(<ApiKeyEditModal {...createProps()} />)
 
         // Step 1: Verify
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
-          expect(screen.getByTestId('modal-confirm-button')).toHaveTextContent('common.operation.save')
+          expect(getConfirmButton()).toHaveTextContent('common.operation.save')
         })
 
         // Step 2: Update
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         expect(mockUpdateSubscription).toHaveBeenCalledWith(
           expect.objectContaining({
             subscriptionId: 'test-subscription-id',
@@ -1176,12 +1138,12 @@ describe('Edit Modal Components', () => {
         formValuesMap.set('basic', { values: {}, isCheckValidated: false })
         render(<ApiKeyEditModal {...createProps()} />)
 
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
-          expect(screen.getByTestId('modal-confirm-button')).toHaveTextContent('common.operation.save')
+          expect(getConfirmButton()).toHaveTextContent('common.operation.save')
         })
 
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         expect(mockUpdateSubscription).not.toHaveBeenCalled()
       })
 
@@ -1191,12 +1153,12 @@ describe('Edit Modal Components', () => {
         const onClose = vi.fn()
         render(<ApiKeyEditModal {...createProps({ onClose })} />)
 
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
-          expect(screen.getByTestId('modal-confirm-button')).toHaveTextContent('common.operation.save')
+          expect(getConfirmButton()).toHaveTextContent('common.operation.save')
         })
 
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
           expect(mockToastNotify).toHaveBeenCalledWith(expect.objectContaining({
             type: 'success',
@@ -1213,12 +1175,12 @@ describe('Edit Modal Components', () => {
         mockUpdateSubscription.mockImplementation((_p, cb) => cb.onError(new Error('Failed')))
         render(<ApiKeyEditModal {...createProps()} />)
 
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
-          expect(screen.getByTestId('modal-confirm-button')).toHaveTextContent('common.operation.save')
+          expect(getConfirmButton()).toHaveTextContent('common.operation.save')
         })
 
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
           expect(mockToastNotify).toHaveBeenCalledWith(expect.objectContaining({
             type: 'error',
@@ -1251,12 +1213,12 @@ describe('Edit Modal Components', () => {
           />,
         )
 
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
-          expect(screen.getByTestId('modal-confirm-button')).toHaveTextContent('common.operation.save')
+          expect(getConfirmButton()).toHaveTextContent('common.operation.save')
         })
 
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         expect(mockUpdateSubscription).toHaveBeenCalledWith(
           expect.objectContaining({ parameters: undefined }),
           expect.any(Object),
@@ -1276,12 +1238,12 @@ describe('Edit Modal Components', () => {
           />,
         )
 
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
-          expect(screen.getByTestId('modal-confirm-button')).toHaveTextContent('common.operation.save')
+          expect(getConfirmButton()).toHaveTextContent('common.operation.save')
         })
 
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         expect(mockUpdateSubscription).toHaveBeenCalledWith(
           expect.objectContaining({ parameters: { param1: 'new_value' } }),
           expect.any(Object),
@@ -1328,9 +1290,9 @@ describe('Edit Modal Components', () => {
         ]
         render(<ApiKeyEditModal {...createProps()} />)
 
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
-          expect(screen.getByTestId('modal-confirm-button')).toHaveTextContent('common.operation.save')
+          expect(getConfirmButton()).toHaveTextContent('common.operation.save')
         })
 
         expect(screen.getByTestId('form-field-channel')).toHaveAttribute('data-has-dynamic-select', 'true')
@@ -1350,9 +1312,9 @@ describe('Edit Modal Components', () => {
         ]
         render(<ApiKeyEditModal {...createProps()} />)
 
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
-          expect(screen.getByTestId('modal-confirm-button')).toHaveTextContent('common.operation.save')
+          expect(getConfirmButton()).toHaveTextContent('common.operation.save')
         })
 
         expect(screen.getByTestId('form-field-enabled')).toHaveAttribute(
@@ -1427,12 +1389,12 @@ describe('Edit Modal Components', () => {
         formValuesMap.set('parameters', { values: {}, isCheckValidated: false })
         render(<ApiKeyEditModal {...createProps()} />)
 
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
-          expect(screen.getByTestId('modal-confirm-button')).toHaveTextContent('common.operation.save')
+          expect(getConfirmButton()).toHaveTextContent('common.operation.save')
         })
 
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         expect(mockUpdateSubscription).not.toHaveBeenCalled()
       })
     })
@@ -1458,7 +1420,7 @@ describe('Edit Modal Components', () => {
           createSchemaField('secret_param', 'password'),
         ]
         render(<ApiKeyEditModal {...createProps()} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
           expect(screen.getByTestId('form-field-secret_param')).toHaveAttribute('data-field-type', FormTypeEnum.secretInput)
         })
@@ -1469,7 +1431,7 @@ describe('Edit Modal Components', () => {
           createSchemaField('api_secret', 'secret'),
         ]
         render(<ApiKeyEditModal {...createProps()} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
           expect(screen.getByTestId('form-field-api_secret')).toHaveAttribute('data-field-type', FormTypeEnum.secretInput)
         })
@@ -1480,7 +1442,7 @@ describe('Edit Modal Components', () => {
           createSchemaField('count', 'integer'),
         ]
         render(<ApiKeyEditModal {...createProps()} />)
-        fireEvent.click(screen.getByTestId('modal-confirm-button'))
+        fireEvent.click(getConfirmButton())
         await waitFor(() => {
           expect(screen.getByTestId('form-field-count')).toHaveAttribute('data-field-type', FormTypeEnum.textNumber)
         })
diff --git a/web/app/components/plugins/plugin-detail-panel/subscription-list/edit/apikey-edit-modal.tsx b/web/app/components/plugins/plugin-detail-panel/subscription-list/edit/apikey-edit-modal.tsx
index f191ad41a8..14d7dc30ad 100644
--- a/web/app/components/plugins/plugin-detail-panel/subscription-list/edit/apikey-edit-modal.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/subscription-list/edit/apikey-edit-modal.tsx
@@ -2,6 +2,8 @@
 import type { FormRefObject, FormSchema } from '@/app/components/base/form/types'
 import type { ParametersSchema, PluginDetail } from '@/app/components/plugins/types'
 import type { TriggerSubscription } from '@/app/components/workflow/block-selector/types'
+import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogCloseButton, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
 import { isEqual } from 'es-toolkit/predicate'
 import { useMemo, useRef, useState } from 'react'
@@ -9,11 +11,9 @@ import { useTranslation } from 'react-i18next'
 import { EncryptedBottom } from '@/app/components/base/encrypted-bottom'
 import { BaseForm } from '@/app/components/base/form/components/base'
 import { FormTypeEnum } from '@/app/components/base/form/types'
-import Modal from '@/app/components/base/modal/modal'
 import { ReadmeEntrance } from '@/app/components/plugins/readme-panel/entrance'
 import { useUpdateTriggerSubscription, useVerifyTriggerSubscription } from '@/service/use-triggers'
 import { parsePluginErrorMessage } from '@/utils/error-parser'
-import { ReadmeShowType } from '../../../readme-panel/store'
 import { usePluginStore } from '../../store'
 import { useSubscriptionList } from '../use-subscription-list'
 
@@ -23,10 +23,12 @@ type Props = {
   pluginDetail?: PluginDetail
 }
 
-enum EditStep {
-  EditCredentials = 'edit_credentials',
-  EditConfiguration = 'edit_configuration',
-}
+const EditStep = {
+  EditCredentials: 'edit_credentials',
+  EditConfiguration: 'edit_configuration',
+} as const
+
+type EditStep = typeof EditStep[keyof typeof EditStep]
 
 const normalizeFormType = (type: string): FormTypeEnum => {
   switch (type) {
@@ -52,7 +54,6 @@ const normalizeFormType = (type: string): FormTypeEnum => {
 
 const HIDDEN_SECRET_VALUE = '[__HIDDEN__]'
 
-// Check if all credential values are hidden (meaning nothing was changed)
 const areAllCredentialsHidden = (credentials: Record<string, unknown>): boolean => {
   return Object.values(credentials).every(value => value === HIDDEN_SECRET_VALUE)
 }
@@ -63,17 +64,36 @@ const StatusStep = ({ isActive, text, onClick, clickable }: {
   onClick?: () => void
   clickable?: boolean
 }) => {
-  return (
-    <div
-      className={`flex items-center gap-1 system-2xs-semibold-uppercase ${isActive
-        ? 'text-state-accent-solid'
-        : 'text-text-tertiary'} ${clickable ? 'cursor-pointer hover:text-text-secondary' : ''}`}
-      onClick={clickable ? onClick : undefined}
-    >
-      {isActive && (
-        <div className="h-1 w-1 rounded-full bg-state-accent-solid"></div>
-      )}
+  const className = `flex items-center gap-1 system-2xs-semibold-uppercase ${isActive
+    ? 'text-state-accent-solid'
+    : 'text-text-tertiary'} ${clickable ? 'cursor-pointer rounded bg-transparent p-0 text-left hover:text-text-secondary focus-visible:text-text-secondary focus-visible:ring-1 focus-visible:ring-components-input-border-hover focus-visible:outline-hidden' : ''}`
+
+  const content = (
+    <>
+      {isActive
+        ? (
+            <div className="h-1 w-1 rounded-full bg-state-accent-solid"></div>
+          )
+        : null}
       {text}
+    </>
+  )
+
+  if (clickable) {
+    return (
+      <button
+        type="button"
+        className={className}
+        onClick={onClick}
+      >
+        {content}
+      </button>
+    )
+  }
+
+  return (
+    <div className={className}>
+      {content}
     </div>
   )
 }
@@ -260,78 +280,120 @@ export const ApiKeyEditModal = ({ onClose, subscription, pluginDetail }: Props)
     })
   }, [parametersSchema, subscription.parameters, subscription.id, detail?.plugin_id, detail?.provider, verifiedCredentials])
 
-  const getConfirmButtonText = () => {
+  const confirmButtonText = (() => {
     if (currentStep === EditStep.EditCredentials)
       return isVerifying ? t('modal.common.verifying', { ns: 'pluginTrigger' }) : t('modal.common.verify', { ns: 'pluginTrigger' })
 
     return isUpdating ? t('operation.saving', { ns: 'common' }) : t('operation.save', { ns: 'common' })
-  }
+  })()
 
   const handleBack = () => {
     setCurrentStep(EditStep.EditCredentials)
     setVerifiedCredentials(null)
   }
 
+  const isDisabled = isUpdating || isVerifying
+  const title = t('subscription.list.item.actions.edit.title', { ns: 'pluginTrigger' })
+
   return (
-    <Modal
-      title={t('subscription.list.item.actions.edit.title', { ns: 'pluginTrigger' })}
-      confirmButtonText={getConfirmButtonText()}
-      onClose={onClose}
-      onCancel={onClose}
-      onConfirm={handleConfirm}
-      disabled={isUpdating || isVerifying}
-      showExtraButton={currentStep === EditStep.EditConfiguration}
-      extraButtonText={t('modal.common.back', { ns: 'pluginTrigger' })}
-      extraButtonVariant="secondary"
-      onExtraButtonClick={handleBack}
-      clickOutsideNotClose
-      wrapperClassName="z-101!"
-      bottomSlot={currentStep === EditStep.EditCredentials ? <EncryptedBottom /> : null}
+    <Dialog
+      open
+      disablePointerDismissal
+      onOpenChange={(open) => {
+        if (!open)
+          onClose()
+      }}
     >
-      {pluginDetail && (
-        <ReadmeEntrance pluginDetail={pluginDetail} showType={ReadmeShowType.modal} />
-      )}
+      <DialogContent
+        backdropProps={{ forceRender: true }}
+        className="p-0"
+      >
+        <div data-testid="modal" data-title={title} data-disabled={isDisabled} className="flex max-h-[80dvh] flex-col">
+          <div className="relative shrink-0 p-6 pr-14 pb-3">
+            <DialogTitle data-testid="modal-title" className="title-2xl-semi-bold text-text-primary">
+              {title}
+            </DialogTitle>
+            <DialogCloseButton className="top-5 right-5 h-8 w-8 rounded-lg" />
+          </div>
+          <div data-testid="modal-content" className="min-h-0 flex-1 overflow-y-auto px-6 py-3">
+            {pluginDetail && (
+              <ReadmeEntrance pluginDetail={pluginDetail} presentation="dialog" />
+            )}
 
-      {/* Multi-step indicator */}
-      <MultiSteps currentStep={currentStep} onStepClick={handleBack} />
+            <MultiSteps currentStep={currentStep} onStepClick={handleBack} />
 
-      {/* Step 1: Edit Credentials */}
-      {currentStep === EditStep.EditCredentials && (
-        <div className="mb-4">
-          {credentialsFormSchemas.length > 0 && (
-            <BaseForm
-              formSchemas={credentialsFormSchemas}
-              ref={credentialsFormRef}
-              labelClassName="system-sm-medium mb-2 flex items-center gap-1 text-text-primary"
-              formClassName="space-y-4"
-              preventDefaultSubmit={true}
-            />
+            {currentStep === EditStep.EditCredentials
+              ? (
+                  <div className="mb-4">
+                    {credentialsFormSchemas.length > 0 && (
+                      <BaseForm
+                        formSchemas={credentialsFormSchemas}
+                        ref={credentialsFormRef}
+                        labelClassName="system-sm-medium mb-2 flex items-center gap-1 text-text-primary"
+                        formClassName="space-y-4"
+                        preventDefaultSubmit={true}
+                      />
+                    )}
+                  </div>
+                )
+              : (
+                  <div className="max-h-[70vh]">
+                    <BaseForm
+                      formSchemas={basicFormSchemas}
+                      ref={basicFormRef}
+                      labelClassName="system-sm-medium mb-2 flex items-center gap-1 text-text-primary"
+                      formClassName="space-y-4 mb-4"
+                    />
+
+                    {parametersFormSchemas.length > 0 && (
+                      <BaseForm
+                        formSchemas={parametersFormSchemas}
+                        ref={parametersFormRef}
+                        labelClassName="system-sm-medium mb-2 flex items-center gap-1 text-text-primary"
+                        formClassName="space-y-4"
+                      />
+                    )}
+                  </div>
+                )}
+          </div>
+          <div className="flex shrink-0 justify-between p-6 pt-5">
+            <div />
+            <div className="flex items-center">
+              {currentStep === EditStep.EditConfiguration && (
+                <>
+                  <Button
+                    variant="secondary"
+                    onClick={handleBack}
+                    disabled={isDisabled}
+                  >
+                    {t('modal.common.back', { ns: 'pluginTrigger' })}
+                  </Button>
+                  <div className="mx-3 h-4 w-px bg-divider-regular"></div>
+                </>
+              )}
+              <Button
+                onClick={onClose}
+                disabled={isDisabled}
+              >
+                {t('operation.cancel', { ns: 'common' })}
+              </Button>
+              <Button
+                className="ml-2"
+                variant="primary"
+                onClick={handleConfirm}
+                disabled={isDisabled}
+              >
+                {confirmButtonText}
+              </Button>
+            </div>
+          </div>
+          {currentStep === EditStep.EditCredentials && (
+            <div data-testid="modal-bottom-slot" className="shrink-0">
+              <EncryptedBottom />
+            </div>
           )}
         </div>
-      )}
-
-      {/* Step 2: Edit Configuration */}
-      {currentStep === EditStep.EditConfiguration && (
-        <div className="max-h-[70vh]">
-          {/* Basic form: subscription name and callback URL */}
-          <BaseForm
-            formSchemas={basicFormSchemas}
-            ref={basicFormRef}
-            labelClassName="system-sm-medium mb-2 flex items-center gap-1 text-text-primary"
-            formClassName="space-y-4 mb-4"
-          />
-
-          {/* Parameters */}
-          {parametersFormSchemas.length > 0 && (
-            <BaseForm
-              formSchemas={parametersFormSchemas}
-              ref={parametersFormRef}
-              labelClassName="system-sm-medium mb-2 flex items-center gap-1 text-text-primary"
-              formClassName="space-y-4"
-            />
-          )}
-        </div>
-      )}
-    </Modal>
+      </DialogContent>
+    </Dialog>
   )
 }
diff --git a/web/app/components/plugins/plugin-detail-panel/subscription-list/edit/manual-edit-modal.tsx b/web/app/components/plugins/plugin-detail-panel/subscription-list/edit/manual-edit-modal.tsx
index 3b3fa1082f..d70fcbfdef 100644
--- a/web/app/components/plugins/plugin-detail-panel/subscription-list/edit/manual-edit-modal.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/subscription-list/edit/manual-edit-modal.tsx
@@ -2,16 +2,16 @@
 import type { FormRefObject, FormSchema } from '@/app/components/base/form/types'
 import type { ParametersSchema, PluginDetail } from '@/app/components/plugins/types'
 import type { TriggerSubscription } from '@/app/components/workflow/block-selector/types'
+import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogCloseButton, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
 import { isEqual } from 'es-toolkit/predicate'
 import { useMemo, useRef } from 'react'
 import { useTranslation } from 'react-i18next'
 import { BaseForm } from '@/app/components/base/form/components/base'
 import { FormTypeEnum } from '@/app/components/base/form/types'
-import Modal from '@/app/components/base/modal/modal'
 import { ReadmeEntrance } from '@/app/components/plugins/readme-panel/entrance'
 import { useUpdateTriggerSubscription } from '@/service/use-triggers'
-import { ReadmeShowType } from '../../../readme-panel/store'
 import { usePluginStore } from '../../store'
 import { useSubscriptionList } from '../use-subscription-list'
 
@@ -133,26 +133,61 @@ export const ManualEditModal = ({ onClose, subscription, pluginDetail }: Props)
     })),
   ], [t, subscription.name, subscription.endpoint, subscription.properties, propertiesSchema])
 
+  const title = t('subscription.list.item.actions.edit.title', { ns: 'pluginTrigger' })
+  const confirmButtonText = isUpdating ? t('operation.saving', { ns: 'common' }) : t('operation.save', { ns: 'common' })
+
   return (
-    <Modal
-      title={t('subscription.list.item.actions.edit.title', { ns: 'pluginTrigger' })}
-      confirmButtonText={isUpdating ? t('operation.saving', { ns: 'common' }) : t('operation.save', { ns: 'common' })}
-      onClose={onClose}
-      onCancel={onClose}
-      onConfirm={handleConfirm}
-      disabled={isUpdating}
-      clickOutsideNotClose
-      wrapperClassName="z-101!"
+    <Dialog
+      open
+      disablePointerDismissal
+      onOpenChange={(open) => {
+        if (!open)
+          onClose()
+      }}
     >
-      {pluginDetail && (
-        <ReadmeEntrance pluginDetail={pluginDetail} showType={ReadmeShowType.modal} />
-      )}
-      <BaseForm
-        formSchemas={formSchemas}
-        ref={formRef}
-        labelClassName="system-sm-medium mb-2 flex items-center gap-1 text-text-primary"
-        formClassName="space-y-4"
-      />
-    </Modal>
+      <DialogContent
+        backdropProps={{ forceRender: true }}
+        className="p-0"
+      >
+        <div data-testid="modal" data-title={title} data-disabled={isUpdating} className="flex max-h-[80dvh] flex-col">
+          <div className="relative shrink-0 p-6 pr-14 pb-3">
+            <DialogTitle data-testid="modal-title" className="title-2xl-semi-bold text-text-primary">
+              {title}
+            </DialogTitle>
+            <DialogCloseButton className="top-5 right-5 h-8 w-8 rounded-lg" />
+          </div>
+          <div data-testid="modal-content" className="min-h-0 flex-1 overflow-y-auto px-6 py-3">
+            {pluginDetail && (
+              <ReadmeEntrance pluginDetail={pluginDetail} presentation="dialog" />
+            )}
+            <BaseForm
+              formSchemas={formSchemas}
+              ref={formRef}
+              labelClassName="system-sm-medium mb-2 flex items-center gap-1 text-text-primary"
+              formClassName="space-y-4"
+            />
+          </div>
+          <div className="flex shrink-0 justify-between p-6 pt-5">
+            <div />
+            <div className="flex items-center">
+              <Button
+                onClick={onClose}
+                disabled={isUpdating}
+              >
+                {t('operation.cancel', { ns: 'common' })}
+              </Button>
+              <Button
+                className="ml-2"
+                variant="primary"
+                onClick={handleConfirm}
+                disabled={isUpdating}
+              >
+                {confirmButtonText}
+              </Button>
+            </div>
+          </div>
+        </div>
+      </DialogContent>
+    </Dialog>
   )
 }
diff --git a/web/app/components/plugins/plugin-detail-panel/subscription-list/edit/oauth-edit-modal.tsx b/web/app/components/plugins/plugin-detail-panel/subscription-list/edit/oauth-edit-modal.tsx
index 355a132bd2..afbdbe56b3 100644
--- a/web/app/components/plugins/plugin-detail-panel/subscription-list/edit/oauth-edit-modal.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/subscription-list/edit/oauth-edit-modal.tsx
@@ -2,16 +2,16 @@
 import type { FormRefObject, FormSchema } from '@/app/components/base/form/types'
 import type { ParametersSchema, PluginDetail } from '@/app/components/plugins/types'
 import type { TriggerSubscription } from '@/app/components/workflow/block-selector/types'
+import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogCloseButton, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
 import { isEqual } from 'es-toolkit/predicate'
 import { useMemo, useRef } from 'react'
 import { useTranslation } from 'react-i18next'
 import { BaseForm } from '@/app/components/base/form/components/base'
 import { FormTypeEnum } from '@/app/components/base/form/types'
-import Modal from '@/app/components/base/modal/modal'
 import { ReadmeEntrance } from '@/app/components/plugins/readme-panel/entrance'
 import { useUpdateTriggerSubscription } from '@/service/use-triggers'
-import { ReadmeShowType } from '../../../readme-panel/store'
 import { usePluginStore } from '../../store'
 import { useSubscriptionList } from '../use-subscription-list'
 
@@ -147,26 +147,61 @@ export const OAuthEditModal = ({ onClose, subscription, pluginDetail }: Props) =
     }),
   ], [t, subscription.name, subscription.endpoint, subscription.parameters, subscription.id, parametersSchema, detail?.plugin_id, detail?.provider])
 
+  const title = t('subscription.list.item.actions.edit.title', { ns: 'pluginTrigger' })
+  const confirmButtonText = isUpdating ? t('operation.saving', { ns: 'common' }) : t('operation.save', { ns: 'common' })
+
   return (
-    <Modal
-      title={t('subscription.list.item.actions.edit.title', { ns: 'pluginTrigger' })}
-      confirmButtonText={isUpdating ? t('operation.saving', { ns: 'common' }) : t('operation.save', { ns: 'common' })}
-      onClose={onClose}
-      onCancel={onClose}
-      onConfirm={handleConfirm}
-      disabled={isUpdating}
-      clickOutsideNotClose
-      wrapperClassName="z-101!"
+    <Dialog
+      open
+      disablePointerDismissal
+      onOpenChange={(open) => {
+        if (!open)
+          onClose()
+      }}
     >
-      {pluginDetail && (
-        <ReadmeEntrance pluginDetail={pluginDetail} showType={ReadmeShowType.modal} />
-      )}
-      <BaseForm
-        formSchemas={formSchemas}
-        ref={formRef}
-        labelClassName="system-sm-medium mb-2 flex items-center gap-1 text-text-primary"
-        formClassName="space-y-4"
-      />
-    </Modal>
+      <DialogContent
+        backdropProps={{ forceRender: true }}
+        className="p-0"
+      >
+        <div data-testid="modal" data-title={title} data-disabled={isUpdating} className="flex max-h-[80dvh] flex-col">
+          <div className="relative shrink-0 p-6 pr-14 pb-3">
+            <DialogTitle data-testid="modal-title" className="title-2xl-semi-bold text-text-primary">
+              {title}
+            </DialogTitle>
+            <DialogCloseButton className="top-5 right-5 h-8 w-8 rounded-lg" />
+          </div>
+          <div data-testid="modal-content" className="min-h-0 flex-1 overflow-y-auto px-6 py-3">
+            {pluginDetail && (
+              <ReadmeEntrance pluginDetail={pluginDetail} presentation="dialog" />
+            )}
+            <BaseForm
+              formSchemas={formSchemas}
+              ref={formRef}
+              labelClassName="system-sm-medium mb-2 flex items-center gap-1 text-text-primary"
+              formClassName="space-y-4"
+            />
+          </div>
+          <div className="flex shrink-0 justify-between p-6 pt-5">
+            <div />
+            <div className="flex items-center">
+              <Button
+                onClick={onClose}
+                disabled={isUpdating}
+              >
+                {t('operation.cancel', { ns: 'common' })}
+              </Button>
+              <Button
+                className="ml-2"
+                variant="primary"
+                onClick={handleConfirm}
+                disabled={isUpdating}
+              >
+                {confirmButtonText}
+              </Button>
+            </div>
+          </div>
+        </div>
+      </DialogContent>
+    </Dialog>
   )
 }
diff --git a/web/app/components/plugins/plugin-detail-panel/subscription-list/list-view.tsx b/web/app/components/plugins/plugin-detail-panel/subscription-list/list-view.tsx
index 45d4c486b7..76c5a02065 100644
--- a/web/app/components/plugins/plugin-detail-panel/subscription-list/list-view.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/subscription-list/list-view.tsx
@@ -1,10 +1,11 @@
 'use client'
 import type { PluginDetail } from '@/app/components/plugins/types'
 import { cn } from '@langgenius/dify-ui/cn'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
-import { CreateButtonType, CreateSubscriptionButton } from './create'
+import { Infotip } from '@/app/components/base/infotip'
+import { CreateSubscriptionButton } from './create'
+import { CreateButtonType } from './create/types'
 import SubscriptionCard from './subscription-card'
 import { useSubscriptionList } from './use-subscription-list'
 
@@ -30,18 +31,13 @@ export const SubscriptionListView: React.FC<SubscriptionListViewProps> = ({
             <span className="system-sm-semibold-uppercase text-text-secondary">
               {t('subscription.listNum', { ns: 'pluginTrigger', num: subscriptionCount })}
             </span>
-            <Tooltip>
-              <TooltipTrigger
-                render={(
-                  <span className="flex h-3.5 w-3.5 shrink-0 p-px">
-                    <span aria-hidden className="i-ri-question-line h-full w-full text-text-quaternary hover:text-text-tertiary" />
-                  </span>
-                )}
-              />
-              <TooltipContent>
-                {t('subscription.list.tip', { ns: 'pluginTrigger' })}
-              </TooltipContent>
-            </Tooltip>
+            <Infotip
+              aria-label={t('subscription.list.tip', { ns: 'pluginTrigger' })}
+              className="h-3.5 w-3.5"
+              iconClassName="h-full w-full"
+            >
+              {t('subscription.list.tip', { ns: 'pluginTrigger' })}
+            </Infotip>
           </div>
         )}
         <CreateSubscriptionButton
diff --git a/web/app/components/plugins/plugin-detail-panel/subscription-list/selector-entry.tsx b/web/app/components/plugins/plugin-detail-panel/subscription-list/selector-entry.tsx
index 21f1d4898b..c29ca0a54c 100644
--- a/web/app/components/plugins/plugin-detail-panel/subscription-list/selector-entry.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/subscription-list/selector-entry.tsx
@@ -110,7 +110,6 @@ export const SubscriptionSelectorEntry = ({ selectedId, onSelect }: {
         placement="bottom-start"
         sideOffset={4}
         popupClassName="border-none bg-transparent p-0 shadow-none backdrop-blur-none"
-        positionerProps={{ style: { zIndex: 11 } }}
       >
         <div className="rounded-xl border border-components-panel-border bg-components-panel-bg shadow-lg">
           <SubscriptionList
diff --git a/web/app/components/plugins/plugin-detail-panel/subscription-list/selector-view.tsx b/web/app/components/plugins/plugin-detail-panel/subscription-list/selector-view.tsx
index 993c9f36cb..e5be965a12 100644
--- a/web/app/components/plugins/plugin-detail-panel/subscription-list/selector-view.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/subscription-list/selector-view.tsx
@@ -1,13 +1,14 @@
 'use client'
 import type { TriggerSubscription } from '@/app/components/workflow/block-selector/types'
 import { cn } from '@langgenius/dify-ui/cn'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { RiCheckLine, RiDeleteBinLine, RiWebhookLine } from '@remixicon/react'
 import * as React from 'react'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import ActionButton from '@/app/components/base/action-button'
-import { CreateButtonType, CreateSubscriptionButton } from './create'
+import { Infotip } from '@/app/components/base/infotip'
+import { CreateSubscriptionButton } from './create'
+import { CreateButtonType } from './create/types'
 import { DeleteConfirm } from './delete-confirm'
 import { useSubscriptionList } from './use-subscription-list'
 
@@ -33,18 +34,13 @@ export const SubscriptionSelectorView: React.FC<SubscriptionSelectorProps> = ({
             <span className="system-sm-semibold-uppercase text-text-secondary">
               {t('subscription.listNum', { ns: 'pluginTrigger', num: subscriptionCount })}
             </span>
-            <Tooltip>
-              <TooltipTrigger
-                render={(
-                  <span className="flex h-3.5 w-3.5 shrink-0 p-px">
-                    <span aria-hidden className="i-ri-question-line h-full w-full text-text-quaternary hover:text-text-tertiary" />
-                  </span>
-                )}
-              />
-              <TooltipContent>
-                {t('subscription.list.tip', { ns: 'pluginTrigger' })}
-              </TooltipContent>
-            </Tooltip>
+            <Infotip
+              aria-label={t('subscription.list.tip', { ns: 'pluginTrigger' })}
+              className="h-3.5 w-3.5"
+              iconClassName="h-full w-full"
+            >
+              {t('subscription.list.tip', { ns: 'pluginTrigger' })}
+            </Infotip>
           </div>
           <CreateSubscriptionButton
             buttonType={CreateButtonType.ICON_BUTTON}
diff --git a/web/app/components/plugins/plugin-detail-panel/subscription-list/subscription-card.tsx b/web/app/components/plugins/plugin-detail-panel/subscription-list/subscription-card.tsx
index 84e9b61173..c5ee665063 100644
--- a/web/app/components/plugins/plugin-detail-panel/subscription-list/subscription-card.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/subscription-list/subscription-card.tsx
@@ -2,6 +2,7 @@
 import type { PluginDetail } from '@/app/components/plugins/types'
 import type { TriggerSubscription } from '@/app/components/workflow/block-selector/types'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
 import {
   RiDeleteBinLine,
   RiEditLine,
@@ -10,7 +11,6 @@ import {
 import { useBoolean } from 'ahooks'
 import { useTranslation } from 'react-i18next'
 import ActionButton from '@/app/components/base/action-button'
-import Tooltip from '@/app/components/base/tooltip'
 import { DeleteConfirm } from './delete-confirm'
 import { EditModal } from './edit'
 
@@ -65,19 +65,26 @@ const SubscriptionCard = ({ data, pluginDetail }: Props) => {
         </div>
 
         <div className="mt-1 flex items-center justify-between">
-          <Tooltip
-            disabled={!data.endpoint}
-            popupContent={data.endpoint && (
-              <div className="max-w-[320px] break-all">
-                {data.endpoint}
-              </div>
-            )}
-            position="left"
-          >
-            <div className="flex-1 truncate system-xs-regular text-text-tertiary">
-              {data.endpoint}
-            </div>
-          </Tooltip>
+          {data.endpoint
+            ? (
+                <Popover>
+                  <PopoverTrigger
+                    openOnHover
+                    aria-label={data.endpoint}
+                    className="flex-1 truncate border-0 bg-transparent p-0 text-left system-xs-regular text-text-tertiary"
+                  >
+                    {data.endpoint}
+                  </PopoverTrigger>
+                  <PopoverContent placement="left" popupClassName="max-w-[320px] break-all px-3 py-2 system-xs-regular text-text-tertiary">
+                    {data.endpoint}
+                  </PopoverContent>
+                </Popover>
+              )
+            : (
+                <div className="flex-1 truncate system-xs-regular text-text-tertiary">
+                  {data.endpoint}
+                </div>
+              )}
           <div className="mx-2 text-xs text-text-tertiary opacity-30">·</div>
           <div className="shrink-0 system-xs-regular text-text-tertiary">
             {data.workflows_in_use > 0 ? t('subscription.list.item.usedByNum', { ns: 'pluginTrigger', num: data.workflows_in_use }) : t('subscription.list.item.noUsed', { ns: 'pluginTrigger' })}
diff --git a/web/app/components/plugins/plugin-detail-panel/tool-selector/__tests__/index.spec.tsx b/web/app/components/plugins/plugin-detail-panel/tool-selector/__tests__/index.spec.tsx
index 67ade347e8..6c58405f4a 100644
--- a/web/app/components/plugins/plugin-detail-panel/tool-selector/__tests__/index.spec.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/tool-selector/__tests__/index.spec.tsx
@@ -152,20 +152,20 @@ vi.mock('@/app/components/plugins/plugin-auth', () => ({
   ),
 }))
 
-// Portal components need mocking for controlled positioning in tests
-vi.mock('@/app/components/base/portal-to-follow-elem', () => ({
-  PortalToFollowElem: ({
+// Popover positioning is mocked for deterministic panel tests.
+vi.mock('@langgenius/dify-ui/popover', () => ({
+  Popover: ({
     children,
     open,
   }: {
     children: ReactNode
     open?: boolean
   }) => (
-    <div data-testid="portal-to-follow-elem" data-open={open}>
+    <div data-testid="popover" data-open={open}>
       {children}
     </div>
   ),
-  PortalToFollowElemTrigger: ({
+  PopoverTrigger: ({
     children,
     render,
     onClick,
@@ -174,12 +174,19 @@ vi.mock('@/app/components/base/portal-to-follow-elem', () => ({
     render?: ReactNode
     onClick?: () => void
   }) => (
-    <div data-testid="portal-trigger" onClick={onClick}>
-      {render ?? children}
+    <div data-testid="popover-trigger" onClick={onClick}>
+      {render
+        ? (
+            <>
+              {render}
+              {children}
+            </>
+          )
+        : children}
     </div>
   ),
-  PortalToFollowElemContent: ({ children }: { children: ReactNode }) => (
-    <div data-testid="portal-content">{children}</div>
+  PopoverContent: ({ children }: { children: ReactNode }) => (
+    <div data-testid="popover-content">{children}</div>
   ),
 }))
 
@@ -254,11 +261,15 @@ vi.mock('@/app/components/workflow/block-icon', () => ({
   default: () => <div data-testid="block-icon" />,
 }))
 
-// Mock Modal - headlessui Dialog has complex behavior
-vi.mock('@/app/components/base/modal', () => ({
-  default: ({ children, isShow }: { children: ReactNode, isShow: boolean }) => (
-    isShow ? <div data-testid="modal">{children}</div> : null
+// Mock Dialog to avoid Base UI focus/portal behavior in tests
+vi.mock('@langgenius/dify-ui/dialog', () => ({
+  Dialog: ({ children, open }: { children: ReactNode, open?: boolean }) => (
+    open ? <div>{children}</div> : null
   ),
+  DialogContent: ({ children }: { children: ReactNode }) => (
+    <div data-testid="modal">{children}</div>
+  ),
+  DialogTitle: ({ children }: { children: ReactNode }) => <div>{children}</div>,
 }))
 
 // Mock VisualEditor - complex component with many dependencies
@@ -1372,7 +1383,7 @@ describe('ToolSelector Component', () => {
   describe('Rendering', () => {
     it('should render without crashing', () => {
       render(<ToolSelector {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('popover')).toBeInTheDocument()
     })
 
     it('should render ToolTrigger when no value and no trigger', () => {
@@ -1394,7 +1405,7 @@ describe('ToolSelector Component', () => {
 
     it('should render panel content', () => {
       render(<ToolSelector {...defaultProps} />, { wrapper: createWrapper() })
-      expect(screen.getByTestId('portal-content')).toBeInTheDocument()
+      expect(screen.getByTestId('popover-content')).toBeInTheDocument()
     })
 
     it('should render tool base form in panel', () => {
@@ -1426,7 +1437,7 @@ describe('ToolSelector Component', () => {
         { wrapper: createWrapper() },
       )
       // The component should receive and use the nodeId
-      expect(screen.getByTestId('portal-content')).toBeInTheDocument()
+      expect(screen.getByTestId('popover-content')).toBeInTheDocument()
     })
   })
 
@@ -1442,7 +1453,7 @@ describe('ToolSelector Component', () => {
         />,
         { wrapper: createWrapper() },
       )
-      expect(screen.getByTestId('portal-to-follow-elem')).toHaveAttribute('data-open', 'true')
+      expect(screen.getByTestId('popover')).toHaveAttribute('data-open', 'true')
     })
 
     it('should use internal state when no trigger', () => {
@@ -1450,7 +1461,7 @@ describe('ToolSelector Component', () => {
         <ToolSelector {...defaultProps} />,
         { wrapper: createWrapper() },
       )
-      expect(screen.getByTestId('portal-to-follow-elem')).toHaveAttribute('data-open', 'false')
+      expect(screen.getByTestId('popover')).toHaveAttribute('data-open', 'false')
     })
   })
 
@@ -1503,9 +1514,9 @@ describe('ToolSelector Component', () => {
       )
 
       // Click on portal trigger
-      fireEvent.click(screen.getByTestId('portal-trigger'))
+      fireEvent.click(screen.getByTestId('popover-trigger'))
       // State should not change when disabled
-      expect(screen.getByTestId('portal-to-follow-elem')).toHaveAttribute('data-open', 'false')
+      expect(screen.getByTestId('popover')).toHaveAttribute('data-open', 'false')
     })
   })
 
@@ -1523,7 +1534,7 @@ describe('ToolSelector Component', () => {
       rerender(<ToolSelector {...defaultProps} onSelect={onSelect} />)
 
       // Component should not trigger unnecessary re-renders
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('popover')).toBeInTheDocument()
     })
   })
 })
@@ -1541,7 +1552,7 @@ describe('Edge Cases', () => {
         <ToolSelector {...defaultProps} value={undefined} />,
         { wrapper: createWrapper() },
       )
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('popover')).toBeInTheDocument()
     })
 
     it('should handle undefined selectedTools', () => {
@@ -1549,7 +1560,7 @@ describe('Edge Cases', () => {
         <ToolSelector {...defaultProps} selectedTools={undefined} />,
         { wrapper: createWrapper() },
       )
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('popover')).toBeInTheDocument()
     })
 
     it('should handle empty nodeOutputVars', () => {
@@ -1557,7 +1568,7 @@ describe('Edge Cases', () => {
         <ToolSelector {...defaultProps} nodeOutputVars={[]} />,
         { wrapper: createWrapper() },
       )
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('popover')).toBeInTheDocument()
     })
 
     it('should handle empty availableNodes', () => {
@@ -1565,7 +1576,7 @@ describe('Edge Cases', () => {
         <ToolSelector {...defaultProps} availableNodes={[]} />,
         { wrapper: createWrapper() },
       )
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('popover')).toBeInTheDocument()
     })
   })
 
@@ -2515,11 +2526,11 @@ describe('Additional Coverage Tests', () => {
       )
 
       // Click on the trigger
-      const trigger = screen.getByTestId('portal-trigger')
+      const trigger = screen.getByTestId('popover-trigger')
       fireEvent.click(trigger)
 
       // Should still be closed because disabled
-      expect(screen.getByTestId('portal-to-follow-elem')).toHaveAttribute('data-open', 'false')
+      expect(screen.getByTestId('popover')).toHaveAttribute('data-open', 'false')
     })
 
     it('should handle trigger click when provider and tool exist', () => {
@@ -2530,10 +2541,10 @@ describe('Additional Coverage Tests', () => {
       )
 
       // Without provider/tool, clicking should not open
-      const trigger = screen.getByTestId('portal-trigger')
+      const trigger = screen.getByTestId('popover-trigger')
       fireEvent.click(trigger)
 
-      expect(screen.getByTestId('portal-to-follow-elem')).toHaveAttribute('data-open', 'false')
+      expect(screen.getByTestId('popover')).toHaveAttribute('data-open', 'false')
     })
 
     it('should early return from handleTriggerClick when disabled', () => {
@@ -2546,11 +2557,11 @@ describe('Additional Coverage Tests', () => {
       // Rerender with disabled=true
       rerender(<ToolSelector {...defaultProps} disabled={true} />)
 
-      const trigger = screen.getByTestId('portal-trigger')
+      const trigger = screen.getByTestId('popover-trigger')
       fireEvent.click(trigger)
 
       // Verify it stays closed
-      expect(screen.getByTestId('portal-to-follow-elem')).toHaveAttribute('data-open', 'false')
+      expect(screen.getByTestId('popover')).toHaveAttribute('data-open', 'false')
     })
 
     it('should set isShow when clicked with valid provider and tool', () => {
@@ -2584,12 +2595,12 @@ describe('Additional Coverage Tests', () => {
       )
 
       // Click on the trigger - this should call handleTriggerClick
-      const trigger = screen.getByTestId('portal-trigger')
+      const trigger = screen.getByTestId('popover-trigger')
       fireEvent.click(trigger)
 
       // Now that we have provider and tool, the click should work
       // This tests lines 106-108 and 148
-      expect(screen.getByTestId('portal-to-follow-elem')).toBeInTheDocument()
+      expect(screen.getByTestId('popover')).toBeInTheDocument()
     })
 
     it('should not open when disabled is true even with valid provider', () => {
@@ -2622,11 +2633,11 @@ describe('Additional Coverage Tests', () => {
       )
 
       // Click should not open because disabled=true
-      const trigger = screen.getByTestId('portal-trigger')
+      const trigger = screen.getByTestId('popover-trigger')
       fireEvent.click(trigger)
 
       // Verify it stays closed due to disabled
-      expect(screen.getByTestId('portal-to-follow-elem')).toHaveAttribute('data-open', 'false')
+      expect(screen.getByTestId('popover')).toHaveAttribute('data-open', 'false')
     })
   })
 
diff --git a/web/app/components/plugins/plugin-detail-panel/tool-selector/components/__tests__/reasoning-config-form.spec.tsx b/web/app/components/plugins/plugin-detail-panel/tool-selector/components/__tests__/reasoning-config-form.spec.tsx
index f7853a1fcd..50db3887b0 100644
--- a/web/app/components/plugins/plugin-detail-panel/tool-selector/components/__tests__/reasoning-config-form.spec.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/tool-selector/components/__tests__/reasoning-config-form.spec.tsx
@@ -1,4 +1,5 @@
 import type { ReactNode } from 'react'
+import type { AppSelectorValue } from '@/app/components/plugins/plugin-detail-panel/app-selector'
 import type { ToolFormSchema } from '@/app/components/tools/utils/to-form-schema'
 import { fireEvent, render, screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
@@ -53,20 +54,16 @@ vi.mock('@langgenius/dify-ui/switch', () => ({
   ),
 }))
 
-vi.mock('@/app/components/base/tooltip', () => ({
-  default: ({ children }: { children?: React.ReactNode }) => <>{children}</>,
-}))
-
 vi.mock('@/app/components/header/account-setting/model-provider-page/hooks', () => ({
   useLanguage: () => 'en_US',
 }))
 
 vi.mock('@/app/components/plugins/plugin-detail-panel/app-selector', () => ({
-  default: ({ onSelect, scope }: { onSelect: (value: Record<string, unknown>) => void, scope?: string }) => (
+  AppSelector: ({ onSelect, scope }: { onSelect: (value: AppSelectorValue) => void, scope?: string }) => (
     <button
       data-testid="app-selector"
       data-scope={scope}
-      onClick={() => onSelect({ app_id: 'app-1', inputs: { topic: 'hello' } })}
+      onClick={() => onSelect({ app_id: 'app-1', inputs: { topic: 'hello' }, files: [] })}
     >
       Select App
     </button>
@@ -232,7 +229,7 @@ describe('ReasoningConfigForm', () => {
   it('should open schema modal for object fields and support app selection', () => {
     const onChange = vi.fn()
 
-    const { container } = render(
+    render(
       <ReasoningConfigForm
         value={{
           app: {
@@ -264,7 +261,7 @@ describe('ReasoningConfigForm', () => {
       />,
     )
 
-    fireEvent.click(container.querySelector('div.ml-0\\.5.cursor-pointer')!)
+    fireEvent.click(screen.getByRole('button', { name: 'workflow.nodes.agent.clickToViewParameterSchema' }))
     expect(screen.getByTestId('schema-modal')).toHaveTextContent('Config')
     fireEvent.click(screen.getByTestId('close-schema'))
 
@@ -275,7 +272,7 @@ describe('ReasoningConfigForm', () => {
         auto: 0,
         value: {
           type: undefined,
-          value: { app_id: 'app-1', inputs: { topic: 'hello' } },
+          value: { app_id: 'app-1', inputs: { topic: 'hello' }, files: [] },
         },
       },
     }))
diff --git a/web/app/components/plugins/plugin-detail-panel/tool-selector/components/__tests__/schema-modal.spec.tsx b/web/app/components/plugins/plugin-detail-panel/tool-selector/components/__tests__/schema-modal.spec.tsx
index 86158ab950..b2debdb10f 100644
--- a/web/app/components/plugins/plugin-detail-panel/tool-selector/components/__tests__/schema-modal.spec.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/tool-selector/components/__tests__/schema-modal.spec.tsx
@@ -2,14 +2,11 @@ import { fireEvent, render, screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import SchemaModal from '../schema-modal'
 
-vi.mock('@/app/components/base/modal', () => ({
-  default: ({
-    children,
-    isShow,
-  }: {
-    children: React.ReactNode
-    isShow: boolean
-  }) => isShow ? <div data-testid="modal">{children}</div> : null,
+vi.mock('@langgenius/dify-ui/dialog', () => ({
+  Dialog: ({ children, open }: { children: React.ReactNode, open?: boolean }) =>
+    open === false ? null : <>{children}</>,
+  DialogContent: ({ children }: { children: React.ReactNode }) => <div data-testid="modal">{children}</div>,
+  DialogTitle: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
 }))
 
 vi.mock('@/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor', () => ({
@@ -53,8 +50,7 @@ describe('SchemaModal', () => {
     expect(screen.getByText('workflow.nodes.agent.parameterSchema')).toBeInTheDocument()
     expect(screen.getByTestId('visual-editor')).toHaveTextContent('response')
 
-    const closeButton = document.body.querySelector('div.absolute.right-5.top-5')
-    fireEvent.click(closeButton!)
+    fireEvent.click(screen.getByRole('button', { name: 'common.operation.close' }))
 
     expect(onClose).toHaveBeenCalled()
   })
diff --git a/web/app/components/plugins/plugin-detail-panel/tool-selector/components/reasoning-config-form.tsx b/web/app/components/plugins/plugin-detail-panel/tool-selector/components/reasoning-config-form.tsx
index ebb589d8a5..1baae6d3ca 100644
--- a/web/app/components/plugins/plugin-detail-panel/tool-selector/components/reasoning-config-form.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/tool-selector/components/reasoning-config-form.tsx
@@ -9,6 +9,7 @@ import type {
 import { cn } from '@langgenius/dify-ui/cn'
 import { Select, SelectContent, SelectItem, SelectItemIndicator, SelectItemText, SelectTrigger } from '@langgenius/dify-ui/select'
 import { Switch } from '@langgenius/dify-ui/switch'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import {
   RiArrowRightUpLine,
   RiBracesLine,
@@ -16,12 +17,11 @@ import {
 import { useBoolean } from 'ahooks'
 import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
+import { Infotip } from '@/app/components/base/infotip'
 import Input from '@/app/components/base/input'
-// eslint-disable-next-line no-restricted-imports -- legacy tooltip migration is handled separately from this change
-import Tooltip from '@/app/components/base/tooltip'
 import { FormTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import { useLanguage } from '@/app/components/header/account-setting/model-provider-page/hooks'
-import AppSelector from '@/app/components/plugins/plugin-detail-panel/app-selector'
+import { AppSelector } from '@/app/components/plugins/plugin-detail-panel/app-selector'
 import ModelParameterModal from '@/app/components/plugins/plugin-detail-panel/model-selector'
 import CodeEditor from '@/app/components/workflow/nodes/_base/components/editor/code-editor'
 import FormInputBoolean from '@/app/components/workflow/nodes/_base/components/form-input-boolean'
@@ -127,17 +127,16 @@ const ReasoningConfigForm: React.FC<Props> = ({
     } = schema
     const auto = value[variable]?.auto
     const fieldTitle = getFieldTitle(label, language)
-    const tooltipContent = (tooltip && (
-      <Tooltip
-        popupContent={(
-          <div className="w-[200px]">
-            {tooltip[language] || tooltip.en_US}
-          </div>
-        )}
-        triggerClassName="ml-0.5 w-4 h-4"
-        asChild={false}
-      />
-    ))
+    const tooltipText = tooltip?.[language] || tooltip?.en_US
+    const tooltipContent = tooltipText && (
+      <Infotip
+        aria-label={tooltipText}
+        className="ml-0.5 h-4 w-4"
+        popupClassName="w-[200px]"
+      >
+        {tooltipText}
+      </Infotip>
+    )
     const varInput = value[variable]!.value
     const {
       isString,
@@ -173,20 +172,22 @@ const ReasoningConfigForm: React.FC<Props> = ({
             <span className="mx-1 system-xs-regular text-text-quaternary">·</span>
             <span className="system-xs-regular text-text-tertiary">{resolveTargetVarType(type)}</span>
             {isShowJSONEditor && (
-              <Tooltip
-                popupContent={(
-                  <div className="system-xs-medium text-text-secondary">
-                    {t('nodes.agent.clickToViewParameterSchema', { ns: 'workflow' })}
-                  </div>
-                )}
-                asChild={false}
-              >
-                <div
-                  className="ml-0.5 cursor-pointer rounded-sm p-px text-text-tertiary hover:bg-state-base-hover hover:text-text-secondary"
-                  onClick={() => showSchema(input_schema as SchemaRoot, fieldTitle!)}
-                >
-                  <RiBracesLine className="size-3.5" />
-                </div>
+              <Tooltip>
+                <TooltipTrigger
+                  render={(
+                    <button
+                      type="button"
+                      aria-label={t('nodes.agent.clickToViewParameterSchema', { ns: 'workflow' })}
+                      className="ml-0.5 cursor-pointer rounded-sm border-0 bg-transparent p-px text-text-tertiary hover:bg-state-base-hover hover:text-text-secondary"
+                      onClick={() => showSchema(input_schema as SchemaRoot, fieldTitle!)}
+                    >
+                      <RiBracesLine className="size-3.5" />
+                    </button>
+                  )}
+                />
+                <TooltipContent className="system-xs-medium text-text-secondary">
+                  {t('nodes.agent.clickToViewParameterSchema', { ns: 'workflow' })}
+                </TooltipContent>
               </Tooltip>
             )}
 
@@ -233,7 +234,7 @@ const ReasoningConfigForm: React.FC<Props> = ({
                 <SelectTrigger className="h-8 grow">
                   {selectedOption?.name ?? placeholder?.[language] ?? placeholder?.en_US}
                 </SelectTrigger>
-                <SelectContent popupClassName="w-(--anchor-width)">
+                <SelectContent>
                   {pickerProps.selectItems.map(item => (
                     <SelectItem key={item.value} value={String(item.value)}>
                       <SelectItemText>{item.name}</SelectItemText>
@@ -278,7 +279,6 @@ const ReasoningConfigForm: React.FC<Props> = ({
             )}
             {showVariableSelector && (
               <VarReferencePicker
-                zIndex={1001}
                 className="h-8 grow"
                 readonly={false}
                 isShowNodeName
diff --git a/web/app/components/plugins/plugin-detail-panel/tool-selector/components/schema-modal.tsx b/web/app/components/plugins/plugin-detail-panel/tool-selector/components/schema-modal.tsx
index c01848ea59..6ea17dc565 100644
--- a/web/app/components/plugins/plugin-detail-panel/tool-selector/components/schema-modal.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/tool-selector/components/schema-modal.tsx
@@ -1,10 +1,13 @@
 'use client'
 import type { FC } from 'react'
 import type { SchemaRoot } from '@/app/components/workflow/nodes/llm/types'
-import { RiCloseLine } from '@remixicon/react'
+import {
+  Dialog,
+  DialogContent,
+  DialogTitle,
+} from '@langgenius/dify-ui/dialog'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
-import Modal from '@/app/components/base/modal'
 import VisualEditor from '@/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor'
 import { MittProvider, VisualEditorContextProvider } from '@/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/context'
 
@@ -23,38 +26,43 @@ const SchemaModal: FC<Props> = ({
 }) => {
   const { t } = useTranslation()
   return (
-    <Modal
-      isShow={isShow}
-      onClose={onClose}
-      className="max-w-[960px] p-0"
-      wrapperClassName="z-9999"
+    <Dialog
+      open={isShow}
+      onOpenChange={open => !open && onClose()}
     >
-      <div className="pb-6">
-        {/* Header */}
-        <div className="relative flex p-6 pr-14 pb-3">
-          <div className="grow truncate title-2xl-semi-bold text-text-primary">
-            {t('nodes.agent.parameterSchema', { ns: 'workflow' })}
+      <DialogContent className="w-full max-w-[960px] p-0">
+        <div className="pb-6">
+          {/* Header */}
+          <div className="relative flex p-6 pr-14 pb-3">
+            <DialogTitle className="grow truncate title-2xl-semi-bold text-text-primary">
+              {t('nodes.agent.parameterSchema', { ns: 'workflow' })}
+            </DialogTitle>
+            <button
+              type="button"
+              aria-label={t('operation.close', { ns: 'common' })}
+              className="absolute top-5 right-5 flex h-8 w-8 items-center justify-center p-1.5"
+              onClick={onClose}
+            >
+              <span className="i-ri-close-line h-[18px] w-[18px] text-text-tertiary" />
+            </button>
           </div>
-          <div className="absolute top-5 right-5 flex h-8 w-8 items-center justify-center p-1.5" onClick={onClose}>
-            <RiCloseLine className="h-[18px] w-[18px] text-text-tertiary" />
+          {/* Content */}
+          <div className="flex max-h-[700px] overflow-y-auto px-6 py-2">
+            <MittProvider>
+              <VisualEditorContextProvider>
+                <VisualEditor
+                  className="w-full"
+                  schema={schema}
+                  rootName={rootName}
+                  readOnly
+                >
+                </VisualEditor>
+              </VisualEditorContextProvider>
+            </MittProvider>
           </div>
         </div>
-        {/* Content */}
-        <div className="flex max-h-[700px] overflow-y-auto px-6 py-2">
-          <MittProvider>
-            <VisualEditorContextProvider>
-              <VisualEditor
-                className="w-full"
-                schema={schema}
-                rootName={rootName}
-                readOnly
-              >
-              </VisualEditor>
-            </VisualEditorContextProvider>
-          </MittProvider>
-        </div>
-      </div>
-    </Modal>
+      </DialogContent>
+    </Dialog>
   )
 }
 export default React.memo(SchemaModal)
diff --git a/web/app/components/plugins/plugin-detail-panel/tool-selector/components/tool-item.tsx b/web/app/components/plugins/plugin-detail-panel/tool-selector/components/tool-item.tsx
index ba85957108..d92c59b457 100644
--- a/web/app/components/plugins/plugin-detail-panel/tool-selector/components/tool-item.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/tool-selector/components/tool-item.tsx
@@ -1,8 +1,8 @@
 'use client'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
 import { Switch } from '@langgenius/dify-ui/switch'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import {
   RiDeleteBinLine,
   RiEqualizer2Line,
@@ -14,7 +14,6 @@ import { useTranslation } from 'react-i18next'
 import ActionButton from '@/app/components/base/action-button'
 import AppIcon from '@/app/components/base/app-icon'
 import { Group } from '@/app/components/base/icons/src/vender/other'
-import { ToolTipContent } from '@/app/components/base/tooltip/content'
 import Indicator from '@/app/components/header/indicator'
 import { InstallPluginButton } from '@/app/components/workflow/nodes/_base/components/install-plugin-button'
 import { useMCPToolAvailability } from '@/app/components/workflow/nodes/_base/components/mcp-tool-availability'
@@ -144,11 +143,14 @@ const ToolItem = ({
             className="-mt-1"
             uniqueIdentifier={installInfo}
             tooltip={(
-              <ToolTipContent
-                title={t('detailPanel.toolSelector.unsupportedTitle', { ns: 'plugin' })}
-              >
-                {`${t('detailPanel.toolSelector.unsupportedContent', { ns: 'plugin' })} ${t('detailPanel.toolSelector.unsupportedContent2', { ns: 'plugin' })}`}
-              </ToolTipContent>
+              <div className="w-[180px]" data-testid="tooltip-content">
+                <div className="mb-1.5 font-semibold text-text-secondary" data-testid="tooltip-content-title">
+                  {t('detailPanel.toolSelector.unsupportedTitle', { ns: 'plugin' })}
+                </div>
+                <div className="mb-1.5 text-text-tertiary" data-testid="tooltip-content-body">
+                  {`${t('detailPanel.toolSelector.unsupportedContent', { ns: 'plugin' })} ${t('detailPanel.toolSelector.unsupportedContent2', { ns: 'plugin' })}`}
+                </div>
+              </div>
             )}
             onChange={() => {
               onInstall?.()
@@ -167,18 +169,18 @@ const ToolItem = ({
         />
       )}
       {isError && (
-        <Tooltip>
-          <TooltipTrigger
-            render={(
-              <div aria-label={typeof errorTip === 'string' ? errorTip : undefined}>
-                <RiErrorWarningFill className="h-4 w-4 text-text-destructive" />
-              </div>
-            )}
-          />
-          <TooltipContent>
+        <Popover>
+          <PopoverTrigger
+            openOnHover
+            aria-label={typeof errorTip === 'string' ? errorTip : t('detailPanel.toolSelector.unsupportedTitle', { ns: 'plugin' })}
+            className="inline-flex border-0 bg-transparent p-0"
+          >
+            <RiErrorWarningFill className="h-4 w-4 text-text-destructive" />
+          </PopoverTrigger>
+          <PopoverContent popupClassName="px-3 py-2 system-xs-regular text-text-tertiary">
             {errorTip}
-          </TooltipContent>
-        </Tooltip>
+          </PopoverContent>
+        </Popover>
       )}
     </div>
   )
diff --git a/web/app/components/plugins/plugin-detail-panel/tool-selector/index.tsx b/web/app/components/plugins/plugin-detail-panel/tool-selector/index.tsx
index 0ea14ecdfc..40166ff9ec 100644
--- a/web/app/components/plugins/plugin-detail-panel/tool-selector/index.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/tool-selector/index.tsx
@@ -1,21 +1,18 @@
 'use client'
-import type {
-  OffsetOptions,
-  Placement,
-} from '@floating-ui/react'
+import type { OffsetOptions } from '@floating-ui/react'
+import type { Placement } from '@langgenius/dify-ui/popover'
 import type { FC } from 'react'
 import type { Node } from 'reactflow'
 import type { ToolValue } from '@/app/components/workflow/block-selector/types'
 import type { NodeOutPutVar } from '@/app/components/workflow/types'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from '@langgenius/dify-ui/popover'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
-// eslint-disable-next-line no-restricted-imports -- legacy overlay migration is handled separately from this change
-import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
 import { CollectionType } from '@/app/components/tools/types'
 import Link from '@/next/link'
 import {
@@ -72,6 +69,8 @@ const ToolSelector: FC<Props> = ({
   nodeId = '',
 }) => {
   const { t } = useTranslation()
+  const sideOffset = typeof offset === 'number' ? offset : (typeof offset === 'function' ? 0 : (offset?.mainAxis ?? 0))
+  const alignOffset = typeof offset === 'number' ? 0 : (typeof offset === 'function' ? 0 : (offset?.crossAxis ?? 0))
 
   // Use custom hook for state management
   const state = useToolSelectorState({ value, onSelect, onSelectMultiple })
@@ -103,15 +102,14 @@ const ToolSelector: FC<Props> = ({
     getSettingsValue,
   } = state
 
-  const handleTriggerClick = () => {
-    if (disabled)
-      return
-    setIsShow(true)
-  }
-
   // Determine portal open state based on controlled vs uncontrolled mode
   const portalOpen = trigger ? controlledState : isShow
   const onPortalOpenChange = trigger ? onControlledStateChange : setIsShow
+  const handlePortalOpenChange = (nextOpen: boolean) => {
+    if (nextOpen && (disabled || !currentProvider || !currentTool))
+      return
+    onPortalOpenChange?.(nextOpen)
+  }
 
   // Build error tooltip content
   const renderErrorTip = () => (
@@ -135,19 +133,13 @@ const ToolSelector: FC<Props> = ({
   )
 
   return (
-    <PortalToFollowElem
-      placement={placement}
-      offset={offset}
+    <Popover
       open={portalOpen}
-      onOpenChange={onPortalOpenChange}
+      onOpenChange={handlePortalOpenChange}
     >
-      <PortalToFollowElemTrigger
-        className="w-full"
-        onClick={() => {
-          if (!currentProvider || !currentTool)
-            return
-          handleTriggerClick()
-        }}
+      <PopoverTrigger
+        nativeButton={false}
+        render={<div className="w-full" />}
       >
         {trigger}
 
@@ -183,9 +175,14 @@ const ToolSelector: FC<Props> = ({
             errorTip={renderErrorTip()}
           />
         )}
-      </PortalToFollowElemTrigger>
+      </PopoverTrigger>
 
-      <PortalToFollowElemContent className="z-10">
+      <PopoverContent
+        placement={placement}
+        sideOffset={sideOffset}
+        alignOffset={alignOffset}
+        popupClassName="border-none bg-transparent shadow-none"
+      >
         <div className={cn(
           'relative max-h-[642px] min-h-20 w-[361px] rounded-xl',
           'border-[0.5px] border-components-panel-border bg-components-panel-bg-blur',
@@ -240,8 +237,8 @@ const ToolSelector: FC<Props> = ({
             onParamsFormChange={handleParamsFormChange}
           />
         </div>
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
+      </PopoverContent>
+    </Popover>
   )
 }
 
diff --git a/web/app/components/plugins/plugin-detail-panel/trigger/event-detail-drawer.tsx b/web/app/components/plugins/plugin-detail-panel/trigger/event-detail-drawer.tsx
index eb56a0178c..3de2b30f1c 100644
--- a/web/app/components/plugins/plugin-detail-panel/trigger/event-detail-drawer.tsx
+++ b/web/app/components/plugins/plugin-detail-panel/trigger/event-detail-drawer.tsx
@@ -4,6 +4,14 @@ import type { FC } from 'react'
 import type { TriggerEvent } from '@/app/components/plugins/types'
 import type { TriggerProviderApiEntity } from '@/app/components/workflow/block-selector/types'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  Drawer,
+  DrawerBackdrop,
+  DrawerContent,
+  DrawerPopup,
+  DrawerPortal,
+  DrawerViewport,
+} from '@langgenius/dify-ui/drawer'
 import {
   RiArrowLeftLine,
   RiCloseLine,
@@ -11,7 +19,6 @@ import {
 import { useTranslation } from 'react-i18next'
 import ActionButton from '@/app/components/base/action-button'
 import Divider from '@/app/components/base/divider'
-import Drawer from '@/app/components/base/drawer'
 import { useLanguage } from '@/app/components/header/account-setting/model-provider-page/hooks'
 import Icon from '@/app/components/plugins/card/base/card-icon'
 import Description from '@/app/components/plugins/card/base/description'
@@ -82,78 +89,87 @@ export const EventDetailDrawer: FC<EventDetailDrawerProps> = (props) => {
 
   return (
     <Drawer
-      isOpen
-      clickOutsideNotOpen={false}
-      onClose={onClose}
-      footer={null}
-      mask={false}
-      positionCenter={false}
-      panelClassName={cn('mt-[64px] mr-2 mb-2 w-[420px]! max-w-[420px]! justify-start rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg! p-0! shadow-xl')}
+      open
+      modal
+      swipeDirection="right"
+      onOpenChange={(open) => {
+        if (!open)
+          onClose()
+      }}
     >
-      <div className="relative border-b border-divider-subtle p-4 pb-3">
-        <div className="absolute top-3 right-3">
-          <ActionButton onClick={onClose}>
-            <RiCloseLine className="h-4 w-4" />
-          </ActionButton>
-        </div>
-        <div
-          className="mb-2 flex cursor-pointer items-center gap-1 system-xs-semibold-uppercase text-text-accent-secondary"
-          onClick={onClose}
-        >
-          <RiArrowLeftLine className="h-4 w-4" />
-          {t('detailPanel.operation.back', { ns: 'plugin' })}
-        </div>
-        <div className="flex items-center gap-1">
-          <Icon size="tiny" className="h-6 w-6" src={providerInfo.icon!} />
-          <OrgInfo
-            packageNameClassName="w-auto"
-            orgName={providerInfo.author}
-            packageName={providerInfo.name.split('/').pop() || ''}
-          />
-        </div>
-        <div className="mt-1 system-md-semibold text-text-primary">{eventInfo?.identity?.label[language]}</div>
-        <Description className="mt-3 mb-2 h-auto" text={eventInfo.description[language]!} descriptionLineRows={2}></Description>
-      </div>
-      <div className="flex h-full flex-col gap-2 overflow-y-auto px-4 pt-4 pb-2">
-        <div className="system-sm-semibold-uppercase text-text-secondary">{t('setBuiltInTools.parameters', { ns: 'tools' })}</div>
-        {parametersSchemas.length > 0
-          ? (
-              parametersSchemas.map((item, index) => (
-                <div key={index} className="py-1">
-                  <div className="flex items-center gap-2">
-                    <div className="code-sm-semibold text-text-secondary">{item.label[language]}</div>
-                    <div className="system-xs-regular text-text-tertiary">
-                      {getType(item.type, t)}
-                    </div>
-                    {item.required && (
-                      <div className="system-xs-medium text-text-warning-secondary">{t('setBuiltInTools.required', { ns: 'tools' })}</div>
-                    )}
-                  </div>
-                  {item.description && (
-                    <div className="mt-0.5 system-xs-regular text-text-tertiary">
-                      {item.description?.[language]}
-                    </div>
-                  )}
+      <DrawerPortal>
+        <DrawerBackdrop className="bg-transparent" />
+        <DrawerViewport>
+          <DrawerPopup className={cn('justify-start bg-components-panel-bg! p-0! shadow-xl data-[swipe-direction=right]:top-16 data-[swipe-direction=right]:right-2 data-[swipe-direction=right]:bottom-2 data-[swipe-direction=right]:h-auto data-[swipe-direction=right]:w-[420px] data-[swipe-direction=right]:max-w-[420px] data-[swipe-direction=right]:rounded-2xl data-[swipe-direction=right]:border-[0.5px] data-[swipe-direction=right]:border-components-panel-border')}>
+            <DrawerContent className="flex min-h-0 flex-1 flex-col p-0 pb-0">
+              <div className="relative border-b border-divider-subtle p-4 pb-3">
+                <div className="absolute top-3 right-3">
+                  <ActionButton onClick={onClose}>
+                    <RiCloseLine className="h-4 w-4" />
+                  </ActionButton>
                 </div>
-              ))
-            )
-          : <div className="system-xs-regular text-text-tertiary">{t('events.item.noParameters', { ns: 'pluginTrigger' })}</div>}
-        <Divider className="mt-1 mb-2 h-px" />
-        <div className="flex flex-col gap-2">
-          <div className="system-sm-semibold-uppercase text-text-secondary">{t('events.output', { ns: 'pluginTrigger' })}</div>
-          <div className="relative left-[-7px]">
-            {outputFields.map(item => (
-              <Field
-                key={item.name}
-                name={item.name}
-                payload={item.field}
-                required={item.required}
-                rootClassName="code-sm-semibold text-text-secondary"
-              />
-            ))}
-          </div>
-        </div>
-      </div>
+                <div
+                  className="mb-2 flex cursor-pointer items-center gap-1 system-xs-semibold-uppercase text-text-accent-secondary"
+                  onClick={onClose}
+                >
+                  <RiArrowLeftLine className="h-4 w-4" />
+                  {t('detailPanel.operation.back', { ns: 'plugin' })}
+                </div>
+                <div className="flex items-center gap-1">
+                  <Icon size="tiny" className="h-6 w-6" src={providerInfo.icon!} />
+                  <OrgInfo
+                    packageNameClassName="w-auto"
+                    orgName={providerInfo.author}
+                    packageName={providerInfo.name.split('/').pop() || ''}
+                  />
+                </div>
+                <div className="mt-1 system-md-semibold text-text-primary">{eventInfo?.identity?.label[language]}</div>
+                <Description className="mt-3 mb-2 h-auto" text={eventInfo.description[language]!} descriptionLineRows={2}></Description>
+              </div>
+              <div className="flex h-full flex-col gap-2 overflow-y-auto px-4 pt-4 pb-2">
+                <div className="system-sm-semibold-uppercase text-text-secondary">{t('setBuiltInTools.parameters', { ns: 'tools' })}</div>
+                {parametersSchemas.length > 0
+                  ? (
+                      parametersSchemas.map((item, index) => (
+                        <div key={index} className="py-1">
+                          <div className="flex items-center gap-2">
+                            <div className="code-sm-semibold text-text-secondary">{item.label[language]}</div>
+                            <div className="system-xs-regular text-text-tertiary">
+                              {getType(item.type, t)}
+                            </div>
+                            {item.required && (
+                              <div className="system-xs-medium text-text-warning-secondary">{t('setBuiltInTools.required', { ns: 'tools' })}</div>
+                            )}
+                          </div>
+                          {item.description && (
+                            <div className="mt-0.5 system-xs-regular text-text-tertiary">
+                              {item.description?.[language]}
+                            </div>
+                          )}
+                        </div>
+                      ))
+                    )
+                  : <div className="system-xs-regular text-text-tertiary">{t('events.item.noParameters', { ns: 'pluginTrigger' })}</div>}
+                <Divider className="mt-1 mb-2 h-px" />
+                <div className="flex flex-col gap-2">
+                  <div className="system-sm-semibold-uppercase text-text-secondary">{t('events.output', { ns: 'pluginTrigger' })}</div>
+                  <div className="relative left-[-7px]">
+                    {outputFields.map(item => (
+                      <Field
+                        key={item.name}
+                        name={item.name}
+                        payload={item.field}
+                        required={item.required}
+                        rootClassName="code-sm-semibold text-text-secondary"
+                      />
+                    ))}
+                  </div>
+                </div>
+              </div>
+            </DrawerContent>
+          </DrawerPopup>
+        </DrawerViewport>
+      </DrawerPortal>
     </Drawer>
   )
 }
diff --git a/web/app/components/plugins/plugin-item/__tests__/action.spec.tsx b/web/app/components/plugins/plugin-item/__tests__/action.spec.tsx
index b0ecc839b3..32e2e8065c 100644
--- a/web/app/components/plugins/plugin-item/__tests__/action.spec.tsx
+++ b/web/app/components/plugins/plugin-item/__tests__/action.spec.tsx
@@ -82,15 +82,7 @@ vi.mock('../../plugin-page/plugin-info', () => ({
   ),
 }))
 
-// Mock Tooltip - uses PortalToFollowElem which requires complex floating UI setup
-// Simplified mock that just renders children with tooltip content accessible
-vi.mock('../../../base/tooltip', () => ({
-  default: ({ children, popupContent }: { children: React.ReactNode, popupContent: string }) => (
-    <div data-testid="tooltip" data-popup-content={popupContent}>
-      {children}
-    </div>
-  ),
-}))
+vi.mock('@langgenius/dify-ui/tooltip', () => import('@/__mocks__/base-ui-tooltip'))
 
 // ==================== Test Utilities ====================
 
@@ -236,8 +228,17 @@ describe('Action Component', () => {
       render(<Action {...props} />)
 
       // Assert
-      const tooltips = screen.getAllByTestId('tooltip')
-      expect(tooltips).toHaveLength(3)
+      const buttons = getActionButtons()
+      fireEvent.mouseEnter(buttons[0]!)
+      expect(screen.getByText('plugin.action.checkForUpdates'))!.toBeInTheDocument()
+      fireEvent.mouseLeave(buttons[0]!)
+
+      fireEvent.mouseEnter(buttons[1]!)
+      expect(screen.getByText('plugin.action.pluginInfo'))!.toBeInTheDocument()
+      fireEvent.mouseLeave(buttons[1]!)
+
+      fireEvent.mouseEnter(buttons[2]!)
+      expect(screen.getByText('plugin.action.delete'))!.toBeInTheDocument()
     })
   })
 
@@ -256,8 +257,7 @@ describe('Action Component', () => {
       fireEvent.click(getActionButtons()[0]!)
 
       // Assert
-      // Assert
-      expect(screen.getByText('plugin.action.delete'))!.toBeInTheDocument()
+      expect(screen.getByRole('heading', { name: 'plugin.action.delete' }))!.toBeInTheDocument()
     })
 
     it('should display plugin name in delete confirm content', () => {
@@ -289,13 +289,13 @@ describe('Action Component', () => {
       // Act
       render(<Action {...props} />)
       fireEvent.click(getActionButtons()[0]!)
-      expect(screen.getByText('plugin.action.delete'))!.toBeInTheDocument()
+      expect(screen.getByRole('heading', { name: 'plugin.action.delete' }))!.toBeInTheDocument()
 
       fireEvent.click(getDeleteCancelButton())
 
       // Assert
       return waitFor(() => {
-        expect(screen.queryByText('plugin.action.delete')).not.toBeInTheDocument()
+        expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument()
       })
     })
 
@@ -414,7 +414,7 @@ describe('Action Component', () => {
       // Resolve and check modal closes
       resolveUninstall!({ success: true })
       await waitFor(() => {
-        expect(screen.queryByText('plugin.action.delete')).not.toBeInTheDocument()
+        expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument()
       })
     })
   })
@@ -871,7 +871,7 @@ describe('Action Component', () => {
       resolveFirst!({ success: true })
 
       await waitFor(() => {
-        expect(screen.queryByText('plugin.action.delete')).not.toBeInTheDocument()
+        expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument()
       })
     })
 
diff --git a/web/app/components/plugins/plugin-item/action.tsx b/web/app/components/plugins/plugin-item/action.tsx
index fe0ba932fc..b04bc85779 100644
--- a/web/app/components/plugins/plugin-item/action.tsx
+++ b/web/app/components/plugins/plugin-item/action.tsx
@@ -11,7 +11,7 @@ import {
   AlertDialogTitle,
 } from '@langgenius/dify-ui/alert-dialog'
 import { toast } from '@langgenius/dify-ui/toast'
-import { RiDeleteBinLine, RiInformation2Line, RiLoopLeftLine } from '@remixicon/react'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { useBoolean } from 'ahooks'
 import * as React from 'react'
 import { useCallback } from 'react'
@@ -20,7 +20,6 @@ import { useModalContext } from '@/context/modal-context'
 import { uninstallPlugin } from '@/service/plugins'
 import { useInvalidateInstalledPluginList } from '@/service/use-plugins'
 import ActionButton from '../../base/action-button'
-import Tooltip from '../../base/tooltip'
 import { checkForUpdates, fetchReleases } from '../install-plugin/hooks'
 import PluginInfo from '../plugin-page/plugin-info'
 import { PluginSource } from '../types'
@@ -114,38 +113,59 @@ const Action: FC<Props> = ({
     finally {
       hideDeleting()
     }
-  }, [installationId, onDelete])
+  }, [hideDeleteConfirm, hideDeleting, installationId, onDelete, showDeleting])
   return (
     <div className="flex space-x-1">
       {/* Only plugin installed from GitHub need to check if it's the new version  */}
       {isShowFetchNewVersion
         && (
-          <Tooltip popupContent={t(`${i18nPrefix}.checkForUpdates`, { ns: 'plugin' })}>
-            <ActionButton onClick={handleFetchNewVersion}>
-              <RiLoopLeftLine className="h-4 w-4 text-text-tertiary" />
-            </ActionButton>
+          <Tooltip>
+            <TooltipTrigger
+              render={(
+                <ActionButton onClick={handleFetchNewVersion}>
+                  <span className="i-ri-loop-left-line h-4 w-4 text-text-tertiary" />
+                </ActionButton>
+              )}
+            />
+            <TooltipContent>
+              {t(`${i18nPrefix}.checkForUpdates`, { ns: 'plugin' })}
+            </TooltipContent>
           </Tooltip>
         )}
       {
         isShowInfo
         && (
-          <Tooltip popupContent={t(`${i18nPrefix}.pluginInfo`, { ns: 'plugin' })}>
-            <ActionButton onClick={showPluginInfo}>
-              <RiInformation2Line className="h-4 w-4 text-text-tertiary" />
-            </ActionButton>
+          <Tooltip>
+            <TooltipTrigger
+              render={(
+                <ActionButton onClick={showPluginInfo}>
+                  <span className="i-ri-information-2-line h-4 w-4 text-text-tertiary" />
+                </ActionButton>
+              )}
+            />
+            <TooltipContent>
+              {t(`${i18nPrefix}.pluginInfo`, { ns: 'plugin' })}
+            </TooltipContent>
           </Tooltip>
         )
       }
       {
         isShowDelete
         && (
-          <Tooltip popupContent={t(`${i18nPrefix}.delete`, { ns: 'plugin' })}>
-            <ActionButton
-              className="text-text-tertiary hover:bg-state-destructive-hover hover:text-text-destructive"
-              onClick={showDeleteConfirm}
-            >
-              <RiDeleteBinLine className="h-4 w-4" />
-            </ActionButton>
+          <Tooltip>
+            <TooltipTrigger
+              render={(
+                <ActionButton
+                  className="text-text-tertiary hover:bg-state-destructive-hover hover:text-text-destructive"
+                  onClick={showDeleteConfirm}
+                >
+                  <span className="i-ri-delete-bin-line h-4 w-4" />
+                </ActionButton>
+              )}
+            />
+            <TooltipContent>
+              {t(`${i18nPrefix}.delete`, { ns: 'plugin' })}
+            </TooltipContent>
           </Tooltip>
         )
       }
diff --git a/web/app/components/plugins/plugin-item/index.tsx b/web/app/components/plugins/plugin-item/index.tsx
index 5843dffbe9..6e6aaf88c9 100644
--- a/web/app/components/plugins/plugin-item/index.tsx
+++ b/web/app/components/plugins/plugin-item/index.tsx
@@ -2,6 +2,7 @@
 import type { FC } from 'react'
 import type { PluginDetail } from '../types'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
 import {
   RiArrowRightUpLine,
   RiBugLine,
@@ -13,7 +14,6 @@ import { useSuspenseQuery } from '@tanstack/react-query'
 import * as React from 'react'
 import { useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
-import Tooltip from '@/app/components/base/tooltip'
 import useRefreshPluginList from '@/app/components/plugins/install-plugin/hooks/use-refresh-plugin-list'
 import { API_PREFIX } from '@/config'
 import { useAppContext } from '@/context/app-context'
@@ -124,12 +124,18 @@ const PluginItem: FC<Props> = ({
               <Title title={title} />
               {verified && <Verified className="ml-0.5 h-4 w-4" text={t('marketplace.verifiedTip', { ns: 'plugin' })} />}
               {!isDifyVersionCompatible && (
-                <Tooltip popupContent={
-                  t('difyVersionNotCompatible', { ns: 'plugin', minimalDifyVersion: declarationMeta.minimum_dify_version })
-                }
-                >
-                  <RiErrorWarningLine color="red" className="ml-0.5 h-4 w-4 shrink-0 text-text-accent" />
-                </Tooltip>
+                <Popover>
+                  <PopoverTrigger
+                    openOnHover
+                    aria-label={t('difyVersionNotCompatible', { ns: 'plugin', minimalDifyVersion: declarationMeta.minimum_dify_version })}
+                    className="ml-0.5 inline-flex h-4 w-4 shrink-0 border-0 bg-transparent p-0"
+                  >
+                    <RiErrorWarningLine color="red" className="h-4 w-4 text-text-accent" />
+                  </PopoverTrigger>
+                  <PopoverContent popupClassName="px-3 py-2 system-xs-regular text-text-tertiary">
+                    {t('difyVersionNotCompatible', { ns: 'plugin', minimalDifyVersion: declarationMeta.minimum_dify_version })}
+                  </PopoverContent>
+                </Popover>
               )}
               <Badge
                 className="ml-1 shrink-0"
diff --git a/web/app/components/plugins/plugin-mutation-model/index.tsx b/web/app/components/plugins/plugin-mutation-model/index.tsx
index 96a60fd938..c8f666326a 100644
--- a/web/app/components/plugins/plugin-mutation-model/index.tsx
+++ b/web/app/components/plugins/plugin-mutation-model/index.tsx
@@ -2,9 +2,9 @@ import type { UseMutationResult } from '@tanstack/react-query'
 import type { FC, ReactNode } from 'react'
 import type { Plugin } from '../types'
 import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogCloseButton, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import * as React from 'react'
 import { memo } from 'react'
-import Modal from '@/app/components/base/modal'
 import Card from '@/app/components/plugins/card'
 
 type Props = {
@@ -33,45 +33,52 @@ const PluginMutationModal: FC<Props> = ({
   modalBottomLeft,
 }: Props) => {
   return (
-    <Modal
-      isShow={true}
-      onClose={onCancel}
-      className="min-w-[560px]"
-      closable
-      title={modelTitle}
+    <Dialog
+      open
+      onOpenChange={(open) => {
+        if (!open)
+          onCancel()
+      }}
     >
-      <div className="mt-3 mb-2 system-md-regular text-text-secondary">
-        {description}
-      </div>
-      <div className="flex flex-wrap content-start items-start gap-1 self-stretch rounded-2xl bg-background-section-burn p-2">
-        <Card
-          installed={mutation.isSuccess}
-          payload={plugin}
-          className="w-full"
-          titleLeft={cardTitleLeft}
-        />
-      </div>
-      <div className="flex items-center gap-2 self-stretch pt-5">
-        <div>
-          {modalBottomLeft}
+      <DialogContent className="w-full min-w-[560px] overflow-hidden! border-none text-left align-middle">
+        <DialogCloseButton />
+        <DialogTitle className="title-2xl-semi-bold text-text-primary">
+          {modelTitle}
+        </DialogTitle>
+
+        <div className="mt-3 mb-2 system-md-regular text-text-secondary">
+          {description}
         </div>
-        <div className="ml-auto flex gap-2">
-          {!mutation.isPending && (
-            <Button onClick={onCancel}>
-              {cancelButtonText}
+        <div className="flex flex-wrap content-start items-start gap-1 self-stretch rounded-2xl bg-background-section-burn p-2">
+          <Card
+            installed={mutation.isSuccess}
+            payload={plugin}
+            className="w-full"
+            titleLeft={cardTitleLeft}
+          />
+        </div>
+        <div className="flex items-center gap-2 self-stretch pt-5">
+          <div>
+            {modalBottomLeft}
+          </div>
+          <div className="ml-auto flex gap-2">
+            {!mutation.isPending && (
+              <Button onClick={onCancel}>
+                {cancelButtonText}
+              </Button>
+            )}
+            <Button
+              variant="primary"
+              loading={mutation.isPending}
+              onClick={mutate}
+              disabled={mutation.isPending}
+            >
+              {confirmButtonText}
             </Button>
-          )}
-          <Button
-            variant="primary"
-            loading={mutation.isPending}
-            onClick={mutate}
-            disabled={mutation.isPending}
-          >
-            {confirmButtonText}
-          </Button>
+          </div>
         </div>
-      </div>
-    </Modal>
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/components/plugins/plugin-page/__tests__/index.spec.tsx b/web/app/components/plugins/plugin-page/__tests__/index.spec.tsx
index 067cea0a42..59d041f50c 100644
--- a/web/app/components/plugins/plugin-page/__tests__/index.spec.tsx
+++ b/web/app/components/plugins/plugin-page/__tests__/index.spec.tsx
@@ -465,7 +465,7 @@ describe('PluginPage Component', () => {
     it('should open settings modal when settings button is clicked', async () => {
       render(<PluginPageWithContext {...createDefaultProps()} />)
 
-      fireEvent.click(screen.getByTestId('plugin-settings-button'))
+      fireEvent.click(screen.getByRole('button', { name: /plugin\.privilege\.title/i }))
 
       await waitFor(() => {
         expect(screen.getByTestId('reference-setting-modal')).toBeInTheDocument()
@@ -476,7 +476,7 @@ describe('PluginPage Component', () => {
       render(<PluginPageWithContext {...createDefaultProps()} />)
 
       // Open modal
-      fireEvent.click(screen.getByTestId('plugin-settings-button'))
+      fireEvent.click(screen.getByRole('button', { name: /plugin\.privilege\.title/i }))
 
       await waitFor(() => {
         expect(screen.getByTestId('reference-setting-modal')).toBeInTheDocument()
diff --git a/web/app/components/plugins/plugin-page/__tests__/install-plugin-dropdown.spec.tsx b/web/app/components/plugins/plugin-page/__tests__/install-plugin-dropdown.spec.tsx
index 9f883af1b2..bc39cfdbd4 100644
--- a/web/app/components/plugins/plugin-page/__tests__/install-plugin-dropdown.spec.tsx
+++ b/web/app/components/plugins/plugin-page/__tests__/install-plugin-dropdown.spec.tsx
@@ -60,16 +60,18 @@ vi.mock('@langgenius/dify-ui/dropdown-menu', async () => {
     DropdownMenu: ({
       open,
       onOpenChange,
+      modal,
       children,
     }: {
       open: boolean
       onOpenChange?: (open: boolean) => void
+      modal?: boolean
       children: React.ReactNode
     }) => {
       portalOpen = open
       return (
         <DropdownMenuContext value={{ isOpen: open, setOpen: onOpenChange ?? vi.fn() }}>
-          <div data-testid="dropdown-menu" data-open={open}>{children}</div>
+          <div data-testid="dropdown-menu" data-open={open} data-modal={modal}>{children}</div>
         </DropdownMenuContext>
       )
     },
@@ -158,6 +160,7 @@ describe('InstallPluginDropdown', () => {
 
     fireEvent.click(screen.getByTestId('dropdown-trigger'))
 
+    expect(screen.getByTestId('dropdown-menu')).toHaveAttribute('data-modal', 'false')
     expect(screen.getByText('plugin.installFrom')).toBeInTheDocument()
     expect(screen.getByText('plugin.source.marketplace')).toBeInTheDocument()
     expect(screen.getByText('plugin.source.github')).toBeInTheDocument()
diff --git a/web/app/components/plugins/plugin-page/__tests__/plugin-info.spec.tsx b/web/app/components/plugins/plugin-page/__tests__/plugin-info.spec.tsx
index e95f4686f8..54818e4d02 100644
--- a/web/app/components/plugins/plugin-page/__tests__/plugin-info.spec.tsx
+++ b/web/app/components/plugins/plugin-page/__tests__/plugin-info.spec.tsx
@@ -2,17 +2,19 @@ import { render, screen } from '@testing-library/react'
 import * as React from 'react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-vi.mock('../../../base/modal', () => ({
-  default: ({ children, title, isShow }: { children: React.ReactNode, title: string, isShow: boolean }) => (
-    isShow
+vi.mock('@langgenius/dify-ui/dialog', () => ({
+  Dialog: ({ children, open }: { children: React.ReactNode, open?: boolean }) => (
+    open !== false
       ? (
           <div data-testid="modal">
-            <div data-testid="modal-title">{title}</div>
             {children}
           </div>
         )
       : null
   ),
+  DialogContent: ({ children }: { children: React.ReactNode }) => <>{children}</>,
+  DialogTitle: ({ children }: { children: React.ReactNode }) => <div data-testid="modal-title">{children}</div>,
+  DialogCloseButton: () => <button type="button">Close</button>,
 }))
 
 vi.mock('../../base/key-value-item', () => ({
diff --git a/web/app/components/plugins/plugin-page/filter-management/__tests__/index.spec.tsx b/web/app/components/plugins/plugin-page/filter-management/__tests__/index.spec.tsx
index 46493a87df..643b51fc10 100644
--- a/web/app/components/plugins/plugin-page/filter-management/__tests__/index.spec.tsx
+++ b/web/app/components/plugins/plugin-page/filter-management/__tests__/index.spec.tsx
@@ -695,10 +695,8 @@ describe('CategoriesFilter Component', () => {
       // Act
       fireEvent.click(screen.getByTestId('portal-trigger'))
 
-      // Assert - Check icon appears for checked state
       await waitFor(() => {
-        const checkIcons = screen.getAllByTestId(/check-icon/)
-        expect(checkIcons.length).toBeGreaterThan(0)
+        expect(screen.getByRole('checkbox', { name: 'Models' })).toHaveAttribute('aria-checked', 'true')
       })
     })
 
@@ -709,10 +707,8 @@ describe('CategoriesFilter Component', () => {
       // Act
       fireEvent.click(screen.getByTestId('portal-trigger'))
 
-      // Assert - No check icon for unchecked state
       await waitFor(() => {
-        const checkIcons = screen.queryAllByTestId(/check-icon/)
-        expect(checkIcons.length).toBe(0)
+        expect(screen.getByRole('checkbox', { name: 'Models' })).toHaveAttribute('aria-checked', 'false')
       })
     })
   })
diff --git a/web/app/components/plugins/plugin-page/filter-management/category-filter.tsx b/web/app/components/plugins/plugin-page/filter-management/category-filter.tsx
index f75c63be94..a578b4a4fd 100644
--- a/web/app/components/plugins/plugin-page/filter-management/category-filter.tsx
+++ b/web/app/components/plugins/plugin-page/filter-management/category-filter.tsx
@@ -1,5 +1,6 @@
 'use client'
 
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import { cn } from '@langgenius/dify-ui/cn'
 import {
   Popover,
@@ -12,7 +13,6 @@ import {
 } from '@remixicon/react'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import Checkbox from '@/app/components/base/checkbox'
 import Input from '@/app/components/base/input'
 import { useCategories } from '../../hooks'
 
@@ -108,19 +108,19 @@ const CategoriesFilter = ({
           <div className="max-h-[448px] overflow-y-auto p-1">
             {
               filteredOptions.map(option => (
-                <div
+                <label
                   key={option.name}
                   className="flex h-7 cursor-pointer items-center rounded-lg px-2 py-1.5 hover:bg-state-base-hover"
-                  onClick={() => handleCheck(option.name)}
                 >
                   <Checkbox
                     className="mr-1"
                     checked={value.includes(option.name)}
+                    onCheckedChange={() => handleCheck(option.name)}
                   />
                   <div className="px-1 system-sm-medium text-text-secondary">
                     {option.label}
                   </div>
-                </div>
+                </label>
               ))
             }
           </div>
diff --git a/web/app/components/plugins/plugin-page/filter-management/tag-filter.tsx b/web/app/components/plugins/plugin-page/filter-management/tag-filter.tsx
index 6916edd219..226bd9514d 100644
--- a/web/app/components/plugins/plugin-page/filter-management/tag-filter.tsx
+++ b/web/app/components/plugins/plugin-page/filter-management/tag-filter.tsx
@@ -1,5 +1,6 @@
 'use client'
 
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import { cn } from '@langgenius/dify-ui/cn'
 import {
   Popover,
@@ -12,7 +13,6 @@ import {
 } from '@remixicon/react'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import Checkbox from '@/app/components/base/checkbox'
 import Input from '@/app/components/base/input'
 import { useTags } from '../../hooks'
 
@@ -106,19 +106,19 @@ const TagsFilter = ({
           <div className="max-h-[448px] overflow-y-auto p-1">
             {
               filteredOptions.map(option => (
-                <div
+                <label
                   key={option.name}
                   className="flex h-7 cursor-pointer items-center rounded-lg px-2 py-1.5 select-none hover:bg-state-base-hover"
-                  onClick={() => handleCheck(option.name)}
                 >
                   <Checkbox
                     className="mr-1"
                     checked={value.includes(option.name)}
+                    onCheckedChange={() => handleCheck(option.name)}
                   />
                   <div className="px-1 system-sm-medium text-text-secondary">
                     {option.label}
                   </div>
-                </div>
+                </label>
               ))
             }
           </div>
diff --git a/web/app/components/plugins/plugin-page/index.tsx b/web/app/components/plugins/plugin-page/index.tsx
index d40a91e2b0..acd25836ab 100644
--- a/web/app/components/plugins/plugin-page/index.tsx
+++ b/web/app/components/plugins/plugin-page/index.tsx
@@ -222,11 +222,11 @@ const PluginPage = ({
                   <TooltipTrigger
                     render={(
                       <Button
-                        data-testid="plugin-settings-button"
+                        aria-label={t('privilege.title', { ns: 'plugin' })}
                         className="group h-full w-full p-2 text-components-button-secondary-text"
                         onClick={setShowPluginSettingModal}
                       >
-                        <RiEqualizer2Line className="h-4 w-4" />
+                        <RiEqualizer2Line className="h-4 w-4" aria-hidden="true" />
                       </Button>
                     )}
                   />
diff --git a/web/app/components/plugins/plugin-page/install-plugin-dropdown.tsx b/web/app/components/plugins/plugin-page/install-plugin-dropdown.tsx
index a972c9891c..8e996345af 100644
--- a/web/app/components/plugins/plugin-page/install-plugin-dropdown.tsx
+++ b/web/app/components/plugins/plugin-page/install-plugin-dropdown.tsx
@@ -111,7 +111,7 @@ const InstallPluginDropdown = ({
   }
 
   return (
-    <DropdownMenu open={isMenuOpen} onOpenChange={setIsMenuOpen}>
+    <DropdownMenu open={isMenuOpen} onOpenChange={setIsMenuOpen} modal={false}>
       <div className="relative">
         <input
           type="file"
diff --git a/web/app/components/plugins/plugin-page/plugin-info.tsx b/web/app/components/plugins/plugin-page/plugin-info.tsx
index 0638bd66a2..6c836731cf 100644
--- a/web/app/components/plugins/plugin-page/plugin-info.tsx
+++ b/web/app/components/plugins/plugin-page/plugin-info.tsx
@@ -1,8 +1,8 @@
 'use client'
 import type { FC } from 'react'
+import { Dialog, DialogCloseButton, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
-import Modal from '../../base/modal'
 import KeyValueItem from '../base/key-value-item'
 import { convertRepoToUrl } from '../install-plugin/utils'
 
@@ -23,19 +23,26 @@ const PlugInfo: FC<Props> = ({
   const { t } = useTranslation()
   const labelWidthClassName = 'w-[96px]'
   return (
-    <Modal
-      title={t(`${i18nPrefix}.title`, { ns: 'plugin' })}
-      className="w-[480px]"
-      isShow
-      onClose={onHide}
-      closable
+    <Dialog
+      open
+      onOpenChange={(open) => {
+        if (!open)
+          onHide()
+      }}
     >
-      <div className="mt-5 space-y-3">
-        {repository && <KeyValueItem label={t(`${i18nPrefix}.repository`, { ns: 'plugin' })} labelWidthClassName={labelWidthClassName} value={`${convertRepoToUrl(repository)}`} valueMaxWidthClassName="max-w-[190px]" />}
-        {release && <KeyValueItem label={t(`${i18nPrefix}.release`, { ns: 'plugin' })} labelWidthClassName={labelWidthClassName} value={release} />}
-        {packageName && <KeyValueItem label={t(`${i18nPrefix}.packageName`, { ns: 'plugin' })} labelWidthClassName={labelWidthClassName} value={packageName} />}
-      </div>
-    </Modal>
+      <DialogContent className="w-full max-w-[480px]! overflow-hidden! border-none text-left align-middle">
+        <DialogCloseButton />
+        <DialogTitle className="title-2xl-semi-bold text-text-primary">
+          {t(`${i18nPrefix}.title`, { ns: 'plugin' })}
+        </DialogTitle>
+
+        <div className="mt-5 space-y-3">
+          {repository && <KeyValueItem label={t(`${i18nPrefix}.repository`, { ns: 'plugin' })} labelWidthClassName={labelWidthClassName} value={`${convertRepoToUrl(repository)}`} valueMaxWidthClassName="max-w-[190px]" />}
+          {release && <KeyValueItem label={t(`${i18nPrefix}.release`, { ns: 'plugin' })} labelWidthClassName={labelWidthClassName} value={release} />}
+          {packageName && <KeyValueItem label={t(`${i18nPrefix}.packageName`, { ns: 'plugin' })} labelWidthClassName={labelWidthClassName} value={packageName} />}
+        </div>
+      </DialogContent>
+    </Dialog>
   )
 }
 export default React.memo(PlugInfo)
diff --git a/web/app/components/plugins/readme-panel/__tests__/entrance.spec.tsx b/web/app/components/plugins/readme-panel/__tests__/entrance.spec.tsx
index 59051d4623..35b91853b2 100644
--- a/web/app/components/plugins/readme-panel/__tests__/entrance.spec.tsx
+++ b/web/app/components/plugins/readme-panel/__tests__/entrance.spec.tsx
@@ -1,31 +1,11 @@
 import { fireEvent, render, screen } from '@testing-library/react'
-import * as React from 'react'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-vi.mock('@langgenius/dify-ui/cn', () => ({
-  cn: (...args: unknown[]) => args.filter(Boolean).join(' '),
-}))
-
-const mockSetCurrentPluginDetail = vi.fn()
-
-vi.mock('../store', () => ({
-  ReadmeShowType: { drawer: 'drawer', side: 'side', modal: 'modal' },
-  useReadmePanelStore: () => ({
-    setCurrentPluginDetail: mockSetCurrentPluginDetail,
-  }),
-}))
-
-vi.mock('../constants', () => ({
-  BUILTIN_TOOLS_ARRAY: ['google_search', 'bing_search'],
-}))
+import { beforeEach, describe, expect, it } from 'vitest'
+import { ReadmeEntrance } from '../entrance'
+import { useReadmePanelStore } from '../store'
 
 describe('ReadmeEntrance', () => {
-  let ReadmeEntrance: (typeof import('../entrance'))['ReadmeEntrance']
-
-  beforeEach(async () => {
-    vi.clearAllMocks()
-    const mod = await import('../entrance')
-    ReadmeEntrance = mod.ReadmeEntrance
+  beforeEach(() => {
+    useReadmePanelStore.setState({ currentPanel: undefined })
   })
 
   it('should render readme button for non-builtin plugin with unique identifier', () => {
@@ -35,18 +15,31 @@ describe('ReadmeEntrance', () => {
     expect(screen.getByRole('button')).toBeInTheDocument()
   })
 
-  it('should call setCurrentPluginDetail on button click', () => {
+  it('should open drawer presentation by default', () => {
     const pluginDetail = { id: 'custom-plugin', name: 'custom-plugin', plugin_unique_identifier: 'org/custom-plugin' } as never
     render(<ReadmeEntrance pluginDetail={pluginDetail} />)
 
     const button = screen.getByRole('button')
     fireEvent.click(button)
 
-    expect(mockSetCurrentPluginDetail).toHaveBeenCalledWith(pluginDetail, 'drawer')
+    expect(useReadmePanelStore.getState().currentPanel).toEqual({
+      detail: pluginDetail,
+      presentation: 'drawer',
+      triggerId: button.id,
+    })
+  })
+
+  it('should open dialog presentation when requested', () => {
+    const pluginDetail = { id: 'custom-plugin', name: 'custom-plugin', plugin_unique_identifier: 'org/custom-plugin' } as never
+    render(<ReadmeEntrance pluginDetail={pluginDetail} presentation="dialog" />)
+
+    fireEvent.click(screen.getByRole('button'))
+
+    expect(useReadmePanelStore.getState().currentPanel?.presentation).toBe('dialog')
   })
 
   it('should return null for builtin tools', () => {
-    const pluginDetail = { id: 'google_search', name: 'Google Search', plugin_unique_identifier: 'org/google' } as never
+    const pluginDetail = { id: 'code', name: 'Code', plugin_unique_identifier: 'org/code' } as never
     const { container } = render(<ReadmeEntrance pluginDetail={pluginDetail} />)
 
     expect(container.innerHTML).toBe('')
diff --git a/web/app/components/plugins/readme-panel/__tests__/index.spec.tsx b/web/app/components/plugins/readme-panel/__tests__/index.spec.tsx
index d52a22cb61..433ac011c5 100644
--- a/web/app/components/plugins/readme-panel/__tests__/index.spec.tsx
+++ b/web/app/components/plugins/readme-panel/__tests__/index.spec.tsx
@@ -1,29 +1,29 @@
+import type { ReactElement } from 'react'
 import type { PluginDetail } from '../../types'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
-import { act, fireEvent, render, screen, waitFor } from '@testing-library/react'
+import { fireEvent, render, screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { PluginCategoryEnum, PluginSource } from '../../types'
 import { ReadmeEntrance } from '../entrance'
 import ReadmePanel from '../index'
-import { ReadmeShowType, useReadmePanelStore } from '../store'
+import { useReadmePanelStore } from '../store'
 
-// ================================
-// Mock external dependencies only
-// ================================
+(
+  globalThis as typeof globalThis & {
+    BASE_UI_ANIMATIONS_DISABLED: boolean
+  }
+).BASE_UI_ANIMATIONS_DISABLED = true
 
-// Mock usePluginReadme hook
 const mockUsePluginReadme = vi.fn()
 vi.mock('@/service/use-plugins', () => ({
   usePluginReadme: (params: { plugin_unique_identifier: string, language?: string }) => mockUsePluginReadme(params),
 }))
 
-// Mock useLanguage hook
 let mockLanguage = 'en-US'
 vi.mock('@/app/components/header/account-setting/model-provider-page/hooks', () => ({
   useLanguage: () => mockLanguage,
 }))
 
-// Mock DetailHeader component (complex component with many dependencies)
 vi.mock('../../plugin-detail-panel/detail-header', () => ({
   default: ({ detail, isReadmeView }: { detail: PluginDetail, isReadmeView: boolean }) => (
     <div data-testid="detail-header" data-is-readme-view={isReadmeView}>
@@ -32,10 +32,6 @@ vi.mock('../../plugin-detail-panel/detail-header', () => ({
   ),
 }))
 
-// ================================
-// Test Data Factories
-// ================================
-
 const createMockPluginDetail = (overrides: Partial<PluginDetail> = {}): PluginDetail => ({
   id: 'test-plugin-id',
   created_at: '2024-01-01T00:00:00Z',
@@ -93,10 +89,6 @@ const createMockPluginDetail = (overrides: Partial<PluginDetail> = {}): PluginDe
   ...overrides,
 })
 
-// ================================
-// Test Utilities
-// ================================
-
 const createQueryClient = () => new QueryClient({
   defaultOptions: {
     queries: {
@@ -105,7 +97,7 @@ const createQueryClient = () => new QueryClient({
   },
 })
 
-const renderWithQueryClient = (ui: React.ReactElement) => {
+const renderWithQueryClient = (ui: ReactElement) => {
   const queryClient = createQueryClient()
   return render(
     <QueryClientProvider client={queryClient}>
@@ -114,15 +106,23 @@ const renderWithQueryClient = (ui: React.ReactElement) => {
   )
 }
 
-// Constants (BUILTIN_TOOLS_ARRAY) tests moved to constants.spec.ts
-// Store (useReadmePanelStore) tests moved to store.spec.ts
-// Entrance (ReadmeEntrance) tests moved to entrance.spec.tsx
+const openReadmePanel = (
+  detail = createMockPluginDetail(),
+  presentation: 'drawer' | 'dialog' = 'drawer',
+) => {
+  useReadmePanelStore.getState().openReadmePanel({
+    detail,
+    presentation,
+    triggerId: 'readme-trigger',
+  })
+  return detail
+}
 
-// ================================
-// ReadmePanel Component Tests
-// ================================
 describe('ReadmePanel', () => {
   beforeEach(() => {
+    vi.clearAllMocks()
+    mockLanguage = 'en-US'
+    useReadmePanelStore.setState({ currentPanel: undefined })
     mockUsePluginReadme.mockReturnValue({
       data: null,
       isLoading: false,
@@ -130,487 +130,114 @@ describe('ReadmePanel', () => {
     })
   })
 
-  // ================================
-  // Rendering Tests
-  // ================================
-  describe('Rendering', () => {
-    it('should return null when no plugin detail is set', () => {
-      const { container } = renderWithQueryClient(<ReadmePanel />)
+  it('should return null when no readme panel is open', () => {
+    const { container } = renderWithQueryClient(<ReadmePanel />)
 
-      expect(container.firstChild).toBeNull()
+    expect(container.firstChild).toBeNull()
+  })
+
+  it('should render drawer presentation with plugin header content', () => {
+    openReadmePanel()
+
+    renderWithQueryClient(<ReadmePanel />)
+
+    expect(screen.getByRole('dialog')).toBeInTheDocument()
+    expect(screen.getByText('plugin.readmeInfo.title')).toBeInTheDocument()
+    expect(screen.getByTestId('detail-header')).toHaveAttribute('data-is-readme-view', 'true')
+    expect(screen.getByRole('dialog')).toHaveClass('data-[swipe-direction=left]:w-150')
+  })
+
+  it('should render dialog presentation when requested', () => {
+    openReadmePanel(createMockPluginDetail(), 'dialog')
+
+    renderWithQueryClient(<ReadmePanel />)
+
+    expect(screen.getByRole('dialog')).toHaveClass('max-w-200')
+  })
+
+  it('should close the active panel when close button is clicked', () => {
+    openReadmePanel()
+
+    renderWithQueryClient(<ReadmePanel />)
+    fireEvent.click(screen.getByRole('button', { name: 'common.operation.close' }))
+
+    expect(useReadmePanelStore.getState().currentPanel).toBeUndefined()
+  })
+
+  it('should render loading, error, empty, and readme states from the readme query', () => {
+    openReadmePanel()
+    mockUsePluginReadme.mockReturnValue({
+      data: null,
+      isLoading: true,
+      error: null,
     })
+    const { rerender } = renderWithQueryClient(<ReadmePanel />)
+    expect(screen.getByRole('status')).toBeInTheDocument()
 
-    it('should render portal content when plugin detail is set', () => {
-      const mockDetail = createMockPluginDetail()
-      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
-      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
-
-      renderWithQueryClient(<ReadmePanel />)
-
-      expect(screen.getByText('plugin.readmeInfo.title')).toBeInTheDocument()
+    mockUsePluginReadme.mockReturnValue({
+      data: null,
+      isLoading: false,
+      error: new Error('Failed to fetch'),
     })
+    rerender(<ReadmePanel />)
+    expect(screen.getByText('plugin.readmeInfo.failedToFetch')).toBeInTheDocument()
 
-    it('should render DetailHeader component', () => {
-      const mockDetail = createMockPluginDetail()
-      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
-      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
-
-      renderWithQueryClient(<ReadmePanel />)
-
-      expect(screen.getByTestId('detail-header')).toBeInTheDocument()
-      expect(screen.getByTestId('detail-header')).toHaveAttribute('data-is-readme-view', 'true')
+    mockUsePluginReadme.mockReturnValue({
+      data: { readme: '' },
+      isLoading: false,
+      error: null,
     })
+    rerender(<ReadmePanel />)
+    expect(screen.getByText('plugin.readmeInfo.noReadmeAvailable')).toBeInTheDocument()
 
-    it('should render close button', () => {
-      const mockDetail = createMockPluginDetail()
-      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
-      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
+    mockUsePluginReadme.mockReturnValue({
+      data: { readme: '# Test Readme Content' },
+      isLoading: false,
+      error: null,
+    })
+    rerender(<ReadmePanel />)
+    expect(screen.getByTestId('markdown-body')).toBeInTheDocument()
+  })
 
-      renderWithQueryClient(<ReadmePanel />)
+  it('should call usePluginReadme with the plugin identifier and selected language', () => {
+    openReadmePanel(createMockPluginDetail({
+      plugin_unique_identifier: 'custom-plugin@2.0.0',
+    }))
 
-      // ActionButton wraps the close icon
-      expect(screen.getByRole('button')).toBeInTheDocument()
+    renderWithQueryClient(<ReadmePanel />)
+
+    expect(mockUsePluginReadme).toHaveBeenCalledWith({
+      plugin_unique_identifier: 'custom-plugin@2.0.0',
+      language: 'en-US',
     })
   })
 
-  // ================================
-  // Loading State Tests
-  // ================================
-  describe('Loading State', () => {
-    it('should show loading indicator when isLoading is true', () => {
-      mockUsePluginReadme.mockReturnValue({
-        data: null,
-        isLoading: true,
-        error: null,
-      })
+  it('should pass undefined language for zh-Hans locale', () => {
+    mockLanguage = 'zh-Hans'
+    openReadmePanel(createMockPluginDetail({
+      plugin_unique_identifier: 'zh-plugin@1.0.0',
+    }))
 
-      const mockDetail = createMockPluginDetail()
-      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
-      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
+    renderWithQueryClient(<ReadmePanel />)
 
-      renderWithQueryClient(<ReadmePanel />)
-
-      // Loading component should be rendered with role="status"
-      expect(screen.getByRole('status')).toBeInTheDocument()
+    expect(mockUsePluginReadme).toHaveBeenCalledWith({
+      plugin_unique_identifier: 'zh-plugin@1.0.0',
+      language: undefined,
     })
   })
 
-  // ================================
-  // Error State Tests
-  // ================================
-  describe('Error State', () => {
-    it('should show error message when error occurs', () => {
-      mockUsePluginReadme.mockReturnValue({
-        data: null,
-        isLoading: false,
-        error: new Error('Failed to fetch'),
-      })
+  it('should open correctly from ReadmeEntrance through the global host', () => {
+    const detail = createMockPluginDetail()
 
-      const mockDetail = createMockPluginDetail()
-      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
-      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
+    renderWithQueryClient(
+      <>
+        <ReadmeEntrance pluginDetail={detail} />
+        <ReadmePanel />
+      </>,
+    )
 
-      renderWithQueryClient(<ReadmePanel />)
+    fireEvent.click(screen.getByRole('button', { name: /plugin\.readmeInfo\.needHelpCheckReadme/ }))
 
-      expect(screen.getByText('plugin.readmeInfo.failedToFetch')).toBeInTheDocument()
-    })
-  })
-
-  // ================================
-  // No Readme Available State Tests
-  // ================================
-  describe('No Readme Available', () => {
-    it('should show no readme message when readme is empty', () => {
-      mockUsePluginReadme.mockReturnValue({
-        data: { readme: '' },
-        isLoading: false,
-        error: null,
-      })
-
-      const mockDetail = createMockPluginDetail()
-      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
-      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
-
-      renderWithQueryClient(<ReadmePanel />)
-
-      expect(screen.getByText('plugin.readmeInfo.noReadmeAvailable')).toBeInTheDocument()
-    })
-
-    it('should show no readme message when data is null', () => {
-      mockUsePluginReadme.mockReturnValue({
-        data: null,
-        isLoading: false,
-        error: null,
-      })
-
-      const mockDetail = createMockPluginDetail()
-      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
-      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
-
-      renderWithQueryClient(<ReadmePanel />)
-
-      expect(screen.getByText('plugin.readmeInfo.noReadmeAvailable')).toBeInTheDocument()
-    })
-  })
-
-  // ================================
-  // Markdown Content Tests
-  // ================================
-  describe('Markdown Content', () => {
-    it('should render markdown container when readme is available', () => {
-      mockUsePluginReadme.mockReturnValue({
-        data: { readme: '# Test Readme Content' },
-        isLoading: false,
-        error: null,
-      })
-
-      const mockDetail = createMockPluginDetail()
-      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
-      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
-
-      renderWithQueryClient(<ReadmePanel />)
-
-      // Markdown component container should be rendered
-      // Note: The Markdown component uses dynamic import, so content may load asynchronously
-      const markdownContainer = document.querySelector('.markdown-body')
-      expect(markdownContainer).toBeInTheDocument()
-    })
-
-    it('should not show error or no-readme message when readme is available', () => {
-      mockUsePluginReadme.mockReturnValue({
-        data: { readme: '# Test Readme Content' },
-        isLoading: false,
-        error: null,
-      })
-
-      const mockDetail = createMockPluginDetail()
-      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
-      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
-
-      renderWithQueryClient(<ReadmePanel />)
-
-      // Should not show error or no-readme message
-      expect(screen.queryByText('plugin.readmeInfo.failedToFetch')).not.toBeInTheDocument()
-      expect(screen.queryByText('plugin.readmeInfo.noReadmeAvailable')).not.toBeInTheDocument()
-    })
-  })
-
-  // ================================
-  // Portal Rendering Tests (Drawer Mode)
-  // ================================
-  describe('Portal Rendering - Drawer Mode', () => {
-    it('should render drawer styled container in drawer mode', () => {
-      mockUsePluginReadme.mockReturnValue({
-        data: { readme: '# Test' },
-        isLoading: false,
-        error: null,
-      })
-
-      const mockDetail = createMockPluginDetail()
-      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
-      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
-
-      renderWithQueryClient(<ReadmePanel />)
-
-      // Drawer mode has specific max-width
-      const drawerContainer = document.querySelector('.max-w-\\[600px\\]')
-      expect(drawerContainer).toBeInTheDocument()
-    })
-
-    it('should have correct drawer positioning classes', () => {
-      const mockDetail = createMockPluginDetail()
-      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
-      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
-
-      renderWithQueryClient(<ReadmePanel />)
-
-      // Check for drawer-specific classes
-      const backdrop = document.querySelector('.justify-start')
-      expect(backdrop).toBeInTheDocument()
-    })
-  })
-
-  // ================================
-  // Portal Rendering Tests (Modal Mode)
-  // ================================
-  describe('Portal Rendering - Modal Mode', () => {
-    it('should render modal styled container in modal mode', () => {
-      mockUsePluginReadme.mockReturnValue({
-        data: { readme: '# Test' },
-        isLoading: false,
-        error: null,
-      })
-
-      const mockDetail = createMockPluginDetail()
-      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
-      setCurrentPluginDetail(mockDetail, ReadmeShowType.modal)
-
-      renderWithQueryClient(<ReadmePanel />)
-
-      // Modal mode has different max-width
-      const modalContainer = document.querySelector('.max-w-\\[800px\\]')
-      expect(modalContainer).toBeInTheDocument()
-    })
-
-    it('should have correct modal positioning classes', () => {
-      const mockDetail = createMockPluginDetail()
-      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
-      setCurrentPluginDetail(mockDetail, ReadmeShowType.modal)
-
-      renderWithQueryClient(<ReadmePanel />)
-
-      // Check for modal-specific classes
-      const backdrop = document.querySelector('.items-center.justify-center')
-      expect(backdrop).toBeInTheDocument()
-    })
-  })
-
-  // ================================
-  // User Interactions / Event Handlers
-  // ================================
-  describe('User Interactions', () => {
-    it('should close panel when close button is clicked', () => {
-      const mockDetail = createMockPluginDetail()
-      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
-      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
-
-      renderWithQueryClient(<ReadmePanel />)
-
-      fireEvent.click(screen.getByRole('button'))
-
-      const { currentPluginDetail } = useReadmePanelStore.getState()
-      expect(currentPluginDetail).toBeUndefined()
-    })
-
-    it('should close panel when backdrop is clicked', () => {
-      const mockDetail = createMockPluginDetail()
-      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
-      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
-
-      renderWithQueryClient(<ReadmePanel />)
-
-      // Click on the backdrop (outer div)
-      const backdrop = document.querySelector('.fixed.inset-0')
-      fireEvent.click(backdrop!)
-
-      const { currentPluginDetail } = useReadmePanelStore.getState()
-      expect(currentPluginDetail).toBeUndefined()
-    })
-
-    it('should not close panel when content area is clicked', async () => {
-      const mockDetail = createMockPluginDetail()
-      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
-      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
-
-      renderWithQueryClient(<ReadmePanel />)
-
-      // Click on the content container (should stop propagation)
-      const contentContainer = document.querySelector('.pointer-events-auto')
-      fireEvent.click(contentContainer!)
-
-      await waitFor(() => {
-        const { currentPluginDetail } = useReadmePanelStore.getState()
-        expect(currentPluginDetail).toBeDefined()
-      })
-    })
-
-    it('should not close panel when content area is clicked in modal mode', async () => {
-      const mockDetail = createMockPluginDetail()
-      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
-      setCurrentPluginDetail(mockDetail, ReadmeShowType.modal)
-
-      renderWithQueryClient(<ReadmePanel />)
-
-      // Click on the content container in modal mode (should stop propagation)
-      const contentContainer = document.querySelector('.pointer-events-auto')
-      fireEvent.click(contentContainer!)
-
-      await waitFor(() => {
-        const { currentPluginDetail } = useReadmePanelStore.getState()
-        expect(currentPluginDetail).toBeDefined()
-      })
-    })
-  })
-
-  // ================================
-  // API Call Tests
-  // ================================
-  describe('API Calls', () => {
-    it('should call usePluginReadme with correct parameters', () => {
-      const mockDetail = createMockPluginDetail({
-        plugin_unique_identifier: 'custom-plugin@2.0.0',
-      })
-      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
-      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
-
-      renderWithQueryClient(<ReadmePanel />)
-
-      expect(mockUsePluginReadme).toHaveBeenCalledWith({
-        plugin_unique_identifier: 'custom-plugin@2.0.0',
-        language: 'en-US',
-      })
-    })
-
-    it('should pass undefined language for zh-Hans locale', () => {
-      // Set language to zh-Hans
-      mockLanguage = 'zh-Hans'
-
-      const mockDetail = createMockPluginDetail({
-        plugin_unique_identifier: 'zh-plugin@1.0.0',
-      })
-      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
-      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
-
-      renderWithQueryClient(<ReadmePanel />)
-
-      // The component should pass undefined for language when zh-Hans
-      expect(mockUsePluginReadme).toHaveBeenCalledWith({
-        plugin_unique_identifier: 'zh-plugin@1.0.0',
-        language: undefined,
-      })
-
-      // Reset language
-      mockLanguage = 'en-US'
-    })
-
-    it('should handle empty plugin_unique_identifier', () => {
-      mockUsePluginReadme.mockReturnValue({
-        data: null,
-        isLoading: false,
-        error: null,
-      })
-
-      const mockDetail = createMockPluginDetail({
-        plugin_unique_identifier: '',
-      })
-      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
-      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
-
-      renderWithQueryClient(<ReadmePanel />)
-
-      expect(mockUsePluginReadme).toHaveBeenCalledWith({
-        plugin_unique_identifier: '',
-        language: 'en-US',
-      })
-    })
-  })
-
-  // ================================
-  // Edge Cases
-  // ================================
-  describe('Edge Cases', () => {
-    it('should handle detail with missing declaration', () => {
-      const mockDetail = createMockPluginDetail()
-      // Simulate missing fields
-      delete (mockDetail as Partial<PluginDetail>).declaration
-
-      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
-
-      // This should not throw
-      expect(() => setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)).not.toThrow()
-    })
-
-    it('should handle rapid open/close operations', async () => {
-      const mockDetail = createMockPluginDetail()
-      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
-
-      // Rapidly toggle the panel
-      act(() => {
-        setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
-        setCurrentPluginDetail()
-        setCurrentPluginDetail(mockDetail, ReadmeShowType.modal)
-      })
-
-      const { currentPluginDetail } = useReadmePanelStore.getState()
-      expect(currentPluginDetail?.showType).toBe(ReadmeShowType.modal)
-    })
-
-    it('should handle switching between drawer and modal modes', () => {
-      const mockDetail = createMockPluginDetail()
-      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
-
-      // Start with drawer
-      act(() => {
-        setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
-      })
-
-      let state = useReadmePanelStore.getState()
-      expect(state.currentPluginDetail?.showType).toBe(ReadmeShowType.drawer)
-
-      // Switch to modal
-      act(() => {
-        setCurrentPluginDetail(mockDetail, ReadmeShowType.modal)
-      })
-
-      state = useReadmePanelStore.getState()
-      expect(state.currentPluginDetail?.showType).toBe(ReadmeShowType.modal)
-    })
-
-    it('should handle undefined detail gracefully', () => {
-      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
-
-      // Set to undefined explicitly
-      act(() => {
-        setCurrentPluginDetail(undefined, ReadmeShowType.drawer)
-      })
-
-      const { currentPluginDetail } = useReadmePanelStore.getState()
-      expect(currentPluginDetail).toBeUndefined()
-    })
-  })
-
-  // ================================
-  // Integration Tests
-  // ================================
-  describe('Integration', () => {
-    it('should work correctly when opened from ReadmeEntrance', () => {
-      const mockDetail = createMockPluginDetail()
-
-      mockUsePluginReadme.mockReturnValue({
-        data: { readme: '# Integration Test' },
-        isLoading: false,
-        error: null,
-      })
-
-      // Render both components
-      const { rerender } = renderWithQueryClient(
-        <>
-          <ReadmeEntrance pluginDetail={mockDetail} />
-          <ReadmePanel />
-        </>,
-      )
-
-      // Initially panel should not show content
-      expect(screen.queryByTestId('detail-header')).not.toBeInTheDocument()
-
-      // Click the entrance button
-      fireEvent.click(screen.getByRole('button'))
-
-      // Re-render to pick up store changes
-      rerender(
-        <QueryClientProvider client={createQueryClient()}>
-          <ReadmeEntrance pluginDetail={mockDetail} />
-          <ReadmePanel />
-        </QueryClientProvider>,
-      )
-
-      // Panel should now show content
-      expect(screen.getByTestId('detail-header')).toBeInTheDocument()
-      // Markdown content renders in a container (dynamic import may not render content synchronously)
-      expect(document.querySelector('.markdown-body')).toBeInTheDocument()
-    })
-
-    it('should display correct plugin information in header', () => {
-      const mockDetail = createMockPluginDetail({
-        name: 'my-awesome-plugin',
-      })
-
-      const { setCurrentPluginDetail } = useReadmePanelStore.getState()
-      setCurrentPluginDetail(mockDetail, ReadmeShowType.drawer)
-
-      renderWithQueryClient(<ReadmePanel />)
-
-      expect(screen.getByText('my-awesome-plugin')).toBeInTheDocument()
-    })
+    expect(screen.getByRole('dialog')).toBeInTheDocument()
   })
 })
diff --git a/web/app/components/plugins/readme-panel/__tests__/store.spec.ts b/web/app/components/plugins/readme-panel/__tests__/store.spec.ts
index a349659f42..f8f1ae035e 100644
--- a/web/app/components/plugins/readme-panel/__tests__/store.spec.ts
+++ b/web/app/components/plugins/readme-panel/__tests__/store.spec.ts
@@ -1,54 +1,52 @@
 import type { PluginDetail } from '@/app/components/plugins/types'
 import { beforeEach, describe, expect, it } from 'vitest'
-import { ReadmeShowType, useReadmePanelStore } from '../store'
+import { useReadmePanelStore } from '../store'
 
 describe('readme-panel/store', () => {
   beforeEach(() => {
-    useReadmePanelStore.setState({ currentPluginDetail: undefined })
+    useReadmePanelStore.setState({ currentPanel: undefined })
   })
 
-  it('initializes with undefined currentPluginDetail', () => {
+  it('initializes without an active panel', () => {
     const state = useReadmePanelStore.getState()
-    expect(state.currentPluginDetail).toBeUndefined()
+    expect(state.currentPanel).toBeUndefined()
   })
 
-  it('sets current plugin detail with drawer showType by default', () => {
-    const mockDetail = { id: 'test', plugin_unique_identifier: 'uid' } as PluginDetail
-    useReadmePanelStore.getState().setCurrentPluginDetail(mockDetail)
+  it('opens drawer presentation by default', () => {
+    const detail = { id: 'test', plugin_unique_identifier: 'uid' } as PluginDetail
+    useReadmePanelStore.getState().openReadmePanel({ detail, triggerId: 'readme-trigger' })
 
-    const state = useReadmePanelStore.getState()
-    expect(state.currentPluginDetail).toEqual({
-      detail: mockDetail,
-      showType: ReadmeShowType.drawer,
+    expect(useReadmePanelStore.getState().currentPanel).toEqual({
+      detail,
+      presentation: 'drawer',
+      triggerId: 'readme-trigger',
     })
   })
 
-  it('sets current plugin detail with modal showType', () => {
-    const mockDetail = { id: 'test', plugin_unique_identifier: 'uid' } as PluginDetail
-    useReadmePanelStore.getState().setCurrentPluginDetail(mockDetail, ReadmeShowType.modal)
+  it('opens dialog presentation when requested', () => {
+    const detail = { id: 'test', plugin_unique_identifier: 'uid' } as PluginDetail
+    useReadmePanelStore.getState().openReadmePanel({ detail, presentation: 'dialog' })
 
-    const state = useReadmePanelStore.getState()
-    expect(state.currentPluginDetail?.showType).toBe(ReadmeShowType.modal)
+    expect(useReadmePanelStore.getState().currentPanel?.presentation).toBe('dialog')
   })
 
-  it('clears current plugin detail when called with undefined', () => {
-    const mockDetail = { id: 'test', plugin_unique_identifier: 'uid' } as PluginDetail
-    useReadmePanelStore.getState().setCurrentPluginDetail(mockDetail)
-    expect(useReadmePanelStore.getState().currentPluginDetail).toBeDefined()
+  it('closes the active panel', () => {
+    const detail = { id: 'test', plugin_unique_identifier: 'uid' } as PluginDetail
+    useReadmePanelStore.getState().openReadmePanel({ detail })
+    expect(useReadmePanelStore.getState().currentPanel).toBeDefined()
 
-    useReadmePanelStore.getState().setCurrentPluginDetail(undefined)
-    expect(useReadmePanelStore.getState().currentPluginDetail).toBeUndefined()
+    useReadmePanelStore.getState().closeReadmePanel()
+    expect(useReadmePanelStore.getState().currentPanel).toBeUndefined()
   })
 
-  it('replaces previous detail with new one', () => {
+  it('replaces the active panel with the latest request', () => {
     const detail1 = { id: 'plugin-1', plugin_unique_identifier: 'uid-1' } as PluginDetail
     const detail2 = { id: 'plugin-2', plugin_unique_identifier: 'uid-2' } as PluginDetail
 
-    useReadmePanelStore.getState().setCurrentPluginDetail(detail1)
-    expect(useReadmePanelStore.getState().currentPluginDetail?.detail.id).toBe('plugin-1')
+    useReadmePanelStore.getState().openReadmePanel({ detail: detail1 })
+    useReadmePanelStore.getState().openReadmePanel({ detail: detail2, presentation: 'dialog' })
 
-    useReadmePanelStore.getState().setCurrentPluginDetail(detail2, ReadmeShowType.modal)
-    expect(useReadmePanelStore.getState().currentPluginDetail?.detail.id).toBe('plugin-2')
-    expect(useReadmePanelStore.getState().currentPluginDetail?.showType).toBe(ReadmeShowType.modal)
+    expect(useReadmePanelStore.getState().currentPanel?.detail.id).toBe('plugin-2')
+    expect(useReadmePanelStore.getState().currentPanel?.presentation).toBe('dialog')
   })
 })
diff --git a/web/app/components/plugins/readme-panel/content.tsx b/web/app/components/plugins/readme-panel/content.tsx
new file mode 100644
index 0000000000..1fde49b701
--- /dev/null
+++ b/web/app/components/plugins/readme-panel/content.tsx
@@ -0,0 +1,81 @@
+'use client'
+
+import type { ReactNode } from 'react'
+import type { PluginDetail } from '../types'
+import { useTranslation } from 'react-i18next'
+import Loading from '@/app/components/base/loading'
+import { Markdown } from '@/app/components/base/markdown'
+import { useLanguage } from '@/app/components/header/account-setting/model-provider-page/hooks'
+import { usePluginReadme } from '@/service/use-plugins'
+import DetailHeader from '../plugin-detail-panel/detail-header'
+
+type ReadmePanelContentProps = {
+  detail: PluginDetail
+  title: ReactNode
+  closeButton: ReactNode
+}
+
+export function ReadmePanelContent({
+  detail,
+  title,
+  closeButton,
+}: ReadmePanelContentProps) {
+  const { t } = useTranslation()
+  const language = useLanguage()
+  const pluginUniqueIdentifier = detail.plugin_unique_identifier || ''
+
+  const { data: readmeData, isLoading, error } = usePluginReadme({
+    plugin_unique_identifier: pluginUniqueIdentifier,
+    language: language === 'zh-Hans' ? undefined : language,
+  })
+
+  let readmeContent: ReactNode
+  if (isLoading) {
+    readmeContent = (
+      <div className="flex h-40 items-center justify-center">
+        <Loading type="area" />
+      </div>
+    )
+  }
+  else if (error) {
+    readmeContent = (
+      <div className="py-8 text-center text-text-tertiary">
+        <p>{t('readmeInfo.failedToFetch', { ns: 'plugin' })}</p>
+      </div>
+    )
+  }
+  else if (readmeData?.readme) {
+    readmeContent = (
+      <Markdown
+        content={readmeData.readme}
+        pluginInfo={{ pluginUniqueIdentifier, pluginId: detail.plugin_id }}
+      />
+    )
+  }
+  else {
+    readmeContent = (
+      <div className="py-8 text-center text-text-tertiary">
+        <p>{t('readmeInfo.noReadmeAvailable', { ns: 'plugin' })}</p>
+      </div>
+    )
+  }
+
+  return (
+    <div className="flex h-full min-h-0 w-full flex-col overflow-hidden">
+      <div className="shrink-0 rounded-t-xl bg-background-body px-4 py-4">
+        <div className="mb-3 flex items-center justify-between gap-3">
+          <div className="flex min-w-0 items-center gap-1">
+            <span aria-hidden="true" className="i-ri-book-read-line h-3 w-3 shrink-0 text-text-tertiary" />
+            {title}
+          </div>
+          {closeButton}
+        </div>
+        <DetailHeader detail={detail} isReadmeView={true} />
+      </div>
+
+      <div className="min-h-0 flex-1 overflow-y-auto overscroll-contain px-4 py-3">
+        {readmeContent}
+      </div>
+    </div>
+  )
+}
diff --git a/web/app/components/plugins/readme-panel/dialog.tsx b/web/app/components/plugins/readme-panel/dialog.tsx
new file mode 100644
index 0000000000..36695196b3
--- /dev/null
+++ b/web/app/components/plugins/readme-panel/dialog.tsx
@@ -0,0 +1,52 @@
+'use client'
+
+import type { PluginDetail } from '../types'
+import {
+  Dialog,
+  DialogCloseButton,
+  DialogContent,
+  DialogTitle,
+} from '@langgenius/dify-ui/dialog'
+import { useTranslation } from 'react-i18next'
+import { ReadmePanelContent } from './content'
+
+type ReadmeDialogProps = {
+  detail: PluginDetail
+  open: boolean
+  onOpenChange: (open: boolean) => void
+  triggerId?: string
+}
+
+export function ReadmeDialog({
+  detail,
+  open,
+  onOpenChange,
+  triggerId,
+}: ReadmeDialogProps) {
+  const { t } = useTranslation()
+
+  return (
+    <Dialog
+      open={open}
+      onOpenChange={onOpenChange}
+      triggerId={triggerId}
+    >
+      <DialogContent className="h-[calc(100dvh-16px)] w-full max-w-200 overflow-hidden p-0">
+        <ReadmePanelContent
+          detail={detail}
+          title={(
+            <DialogTitle className="truncate text-xs font-medium text-text-tertiary uppercase">
+              {t('readmeInfo.title', { ns: 'plugin' })}
+            </DialogTitle>
+          )}
+          closeButton={(
+            <DialogCloseButton
+              aria-label={t('operation.close', { ns: 'common' })}
+              className="static h-8 w-8 rounded-lg"
+            />
+          )}
+        />
+      </DialogContent>
+    </Dialog>
+  )
+}
diff --git a/web/app/components/plugins/readme-panel/drawer.tsx b/web/app/components/plugins/readme-panel/drawer.tsx
new file mode 100644
index 0000000000..97ce5185fd
--- /dev/null
+++ b/web/app/components/plugins/readme-panel/drawer.tsx
@@ -0,0 +1,62 @@
+'use client'
+
+import type { PluginDetail } from '../types'
+import {
+  Drawer,
+  DrawerBackdrop,
+  DrawerCloseButton,
+  DrawerContent,
+  DrawerPopup,
+  DrawerPortal,
+  DrawerTitle,
+  DrawerViewport,
+} from '@langgenius/dify-ui/drawer'
+import { useTranslation } from 'react-i18next'
+import { ReadmePanelContent } from './content'
+
+type ReadmeDrawerProps = {
+  detail: PluginDetail
+  open: boolean
+  onOpenChange: (open: boolean) => void
+  triggerId?: string
+}
+
+export function ReadmeDrawer({
+  detail,
+  open,
+  onOpenChange,
+  triggerId,
+}: ReadmeDrawerProps) {
+  const { t } = useTranslation()
+
+  return (
+    <Drawer
+      open={open}
+      onOpenChange={onOpenChange}
+      triggerId={triggerId}
+      modal
+      swipeDirection="left"
+    >
+      <DrawerPortal>
+        <DrawerBackdrop className="bg-transparent" />
+        <DrawerViewport>
+          <DrawerPopup className="data-[swipe-direction=left]:top-16 data-[swipe-direction=left]:bottom-2 data-[swipe-direction=left]:left-2 data-[swipe-direction=left]:h-auto data-[swipe-direction=left]:w-150 data-[swipe-direction=left]:max-w-[calc(100vw-1rem)] data-[swipe-direction=left]:rounded-2xl data-[swipe-direction=left]:border-l-[0.5px]">
+            <DrawerContent className="flex min-h-0 flex-1 flex-col p-0">
+              <ReadmePanelContent
+                detail={detail}
+                title={(
+                  <DrawerTitle className="truncate text-xs font-medium text-text-tertiary uppercase">
+                    {t('readmeInfo.title', { ns: 'plugin' })}
+                  </DrawerTitle>
+                )}
+                closeButton={(
+                  <DrawerCloseButton aria-label={t('operation.close', { ns: 'common' })} />
+                )}
+              />
+            </DrawerContent>
+          </DrawerPopup>
+        </DrawerViewport>
+      </DrawerPortal>
+    </Drawer>
+  )
+}
diff --git a/web/app/components/plugins/readme-panel/entrance.tsx b/web/app/components/plugins/readme-panel/entrance.tsx
index 2d8188874d..067420f5f7 100644
--- a/web/app/components/plugins/readme-panel/entrance.tsx
+++ b/web/app/components/plugins/readme-panel/entrance.tsx
@@ -1,34 +1,40 @@
 import type { PluginDetail } from '../types'
+import type { ReadmePanelPresentation } from './store'
 import { cn } from '@langgenius/dify-ui/cn'
-import { RiBookReadLine } from '@remixicon/react'
-import * as React from 'react'
+import { useId } from 'react'
 import { useTranslation } from 'react-i18next'
 import { BUILTIN_TOOLS_ARRAY } from './constants'
-import { ReadmeShowType, useReadmePanelStore } from './store'
+import { useReadmePanelStore } from './store'
 
 export const ReadmeEntrance = ({
   pluginDetail,
-  showType = ReadmeShowType.drawer,
+  presentation = 'drawer',
   className,
   showShortTip = false,
 }: {
   pluginDetail: PluginDetail
-  showType?: ReadmeShowType
+  presentation?: ReadmePanelPresentation
   className?: string
   showShortTip?: boolean
 }) => {
   const { t } = useTranslation()
-  const { setCurrentPluginDetail } = useReadmePanelStore()
+  const triggerId = useId()
+  const openReadmePanel = useReadmePanelStore(s => s.openReadmePanel)
 
   const handleReadmeClick = () => {
-    if (pluginDetail)
-      setCurrentPluginDetail(pluginDetail, showType)
+    if (pluginDetail) {
+      openReadmePanel({
+        detail: pluginDetail,
+        presentation,
+        triggerId,
+      })
+    }
   }
   if (!pluginDetail || !pluginDetail?.plugin_unique_identifier || BUILTIN_TOOLS_ARRAY.includes(pluginDetail.id))
     return null
 
   return (
-    <div className={cn('flex flex-col items-start justify-center gap-2 pt-0 pb-4', showType === ReadmeShowType.drawer && 'px-4', className)}>
+    <div className={cn('flex flex-col items-start justify-center gap-2 pt-0 pb-4', presentation === 'drawer' && 'px-4', className)}>
       {!showShortTip && (
         <div className="relative h-1 w-8 shrink-0">
           <div className="h-px w-full bg-divider-regular"></div>
@@ -36,11 +42,13 @@ export const ReadmeEntrance = ({
       )}
 
       <button
+        id={triggerId}
+        type="button"
         onClick={handleReadmeClick}
-        className="flex w-full items-center justify-start gap-1 text-text-tertiary transition-opacity hover:text-text-accent-light-mode-only"
+        className="flex w-full items-center justify-start gap-1 rounded-sm text-text-tertiary transition-opacity hover:text-text-accent-light-mode-only focus-visible:ring-1 focus-visible:ring-components-input-border-hover focus-visible:outline-hidden"
       >
         <div className="relative flex h-3 w-3 items-center justify-center overflow-hidden">
-          <RiBookReadLine className="h-3 w-3" />
+          <span aria-hidden="true" className="i-ri-book-read-line h-3 w-3" />
         </div>
         <span className="text-xs leading-4 font-normal">
           {!showShortTip ? t('readmeInfo.needHelpCheckReadme', { ns: 'plugin' }) : t('readmeInfo.title', { ns: 'plugin' })}
diff --git a/web/app/components/plugins/readme-panel/index.tsx b/web/app/components/plugins/readme-panel/index.tsx
index 0ed17aec28..72f56c0d73 100644
--- a/web/app/components/plugins/readme-panel/index.tsx
+++ b/web/app/components/plugins/readme-panel/index.tsx
@@ -1,124 +1,38 @@
 'use client'
-import type { FC } from 'react'
-import { cn } from '@langgenius/dify-ui/cn'
-import { RiBookReadLine, RiCloseLine } from '@remixicon/react'
-import { createPortal } from 'react-dom'
-import { useTranslation } from 'react-i18next'
-import ActionButton from '@/app/components/base/action-button'
-import Loading from '@/app/components/base/loading'
-import { Markdown } from '@/app/components/base/markdown'
-import { useLanguage } from '@/app/components/header/account-setting/model-provider-page/hooks'
-import { usePluginReadme } from '@/service/use-plugins'
-import DetailHeader from '../plugin-detail-panel/detail-header'
-import { ReadmeShowType, useReadmePanelStore } from './store'
 
-const ReadmePanel: FC = () => {
-  const { currentPluginDetail, setCurrentPluginDetail } = useReadmePanelStore()
-  const { detail, showType } = currentPluginDetail || {}
-  const { t } = useTranslation()
-  const language = useLanguage()
+import { ReadmeDialog } from './dialog'
+import { ReadmeDrawer } from './drawer'
+import { useReadmePanelStore } from './store'
 
-  const pluginUniqueIdentifier = detail?.plugin_unique_identifier || ''
+export default function ReadmePanel() {
+  const currentPanel = useReadmePanelStore(s => s.currentPanel)
+  const closeReadmePanel = useReadmePanelStore(s => s.closeReadmePanel)
 
-  const { data: readmeData, isLoading, error } = usePluginReadme(
-    { plugin_unique_identifier: pluginUniqueIdentifier, language: language === 'zh-Hans' ? undefined : language },
-  )
-
-  const onClose = () => {
-    setCurrentPluginDetail()
-  }
-
-  if (!detail)
+  if (!currentPanel)
     return null
 
-  const children = (
-    <div className="flex h-full w-full flex-col overflow-hidden">
-      <div className="rounded-t-xl bg-background-body px-4 py-4">
-        <div className="mb-3 flex items-center justify-between">
-          <div className="flex items-center gap-1">
-            <RiBookReadLine className="h-3 w-3 text-text-tertiary" />
-            <span className="text-xs font-medium text-text-tertiary uppercase">
-              {t('readmeInfo.title', { ns: 'plugin' })}
-            </span>
-          </div>
-          <ActionButton onClick={onClose}>
-            <RiCloseLine className="h-4 w-4" />
-          </ActionButton>
-        </div>
-        <DetailHeader detail={detail} isReadmeView={true} />
-      </div>
+  const onOpenChange = (open: boolean) => {
+    if (!open)
+      closeReadmePanel()
+  }
 
-      <div className="flex-1 overflow-y-auto px-4 py-3">
-        {(() => {
-          if (isLoading) {
-            return (
-              <div className="flex h-40 items-center justify-center">
-                <Loading type="area" />
-              </div>
-            )
-          }
+  if (currentPanel.presentation === 'dialog') {
+    return (
+      <ReadmeDialog
+        detail={currentPanel.detail}
+        open
+        onOpenChange={onOpenChange}
+        triggerId={currentPanel.triggerId}
+      />
+    )
+  }
 
-          if (error) {
-            return (
-              <div className="py-8 text-center text-text-tertiary">
-                <p>{t('readmeInfo.failedToFetch', { ns: 'plugin' })}</p>
-              </div>
-            )
-          }
-
-          if (readmeData?.readme) {
-            return (
-              <Markdown
-                content={readmeData.readme}
-                pluginInfo={{ pluginUniqueIdentifier, pluginId: detail.plugin_id }}
-              />
-            )
-          }
-
-          return (
-            <div className="py-8 text-center text-text-tertiary">
-              <p>{t('readmeInfo.noReadmeAvailable', { ns: 'plugin' })}</p>
-            </div>
-          )
-        })()}
-      </div>
-    </div>
-  )
-
-  const portalContent = showType === ReadmeShowType.drawer
-    ? (
-        <div className="fixed inset-0 z-1002 flex justify-start" onClick={onClose}>
-          <div
-            className={cn(
-              'pointer-events-auto mt-16 mr-2 mb-2 ml-2 w-[600px] max-w-[600px] justify-start rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg p-0 shadow-xl',
-            )}
-            onClick={(event) => {
-              event.stopPropagation()
-            }}
-          >
-            {children}
-          </div>
-        </div>
-      )
-    : (
-        <div className="fixed inset-0 z-1002 flex items-center justify-center p-2" onClick={onClose}>
-          <div
-            className={cn(
-              'pointer-events-auto relative h-[calc(100vh-16px)] w-full max-w-[800px] rounded-2xl bg-components-panel-bg p-0 shadow-xl',
-            )}
-            onClick={(event) => {
-              event.stopPropagation()
-            }}
-          >
-            {children}
-          </div>
-        </div>
-      )
-
-  return createPortal(
-    portalContent,
-    document.body,
+  return (
+    <ReadmeDrawer
+      detail={currentPanel.detail}
+      open
+      onOpenChange={onOpenChange}
+      triggerId={currentPanel.triggerId}
+    />
   )
 }
-
-export default ReadmePanel
diff --git a/web/app/components/plugins/readme-panel/store.ts b/web/app/components/plugins/readme-panel/store.ts
index 3bbd92b632..f3231c3bfb 100644
--- a/web/app/components/plugins/readme-panel/store.ts
+++ b/web/app/components/plugins/readme-panel/store.ts
@@ -1,27 +1,34 @@
 import type { PluginDetail } from '@/app/components/plugins/types'
 import { create } from 'zustand'
 
-export enum ReadmeShowType {
-  drawer = 'drawer',
-  modal = 'modal',
+export type ReadmePanelPresentation = 'drawer' | 'dialog'
+
+type ReadmePanelState = {
+  detail: PluginDetail
+  presentation: ReadmePanelPresentation
+  triggerId?: string
+}
+
+type OpenReadmePanelPayload = {
+  detail: PluginDetail
+  presentation?: ReadmePanelPresentation
+  triggerId?: string
 }
 
 type Shape = {
-  currentPluginDetail?: {
-    detail: PluginDetail
-    showType: ReadmeShowType
-  }
-  setCurrentPluginDetail: (detail?: PluginDetail, showType?: ReadmeShowType) => void
+  currentPanel?: ReadmePanelState
+  openReadmePanel: (payload: OpenReadmePanelPayload) => void
+  closeReadmePanel: () => void
 }
 
 export const useReadmePanelStore = create<Shape>(set => ({
-  currentPluginDetail: undefined,
-  setCurrentPluginDetail: (detail?: PluginDetail, showType?: ReadmeShowType) => set({
-    currentPluginDetail: !detail
-      ? undefined
-      : {
-          detail,
-          showType: showType ?? ReadmeShowType.drawer,
-        },
+  currentPanel: undefined,
+  openReadmePanel: ({ detail, presentation = 'drawer', triggerId }) => set({
+    currentPanel: {
+      detail,
+      presentation,
+      triggerId,
+    },
   }),
+  closeReadmePanel: () => set({ currentPanel: undefined }),
 }))
diff --git a/web/app/components/plugins/reference-setting-modal/__tests__/index.spec.tsx b/web/app/components/plugins/reference-setting-modal/__tests__/index.spec.tsx
index 95a9910038..f1959e8119 100644
--- a/web/app/components/plugins/reference-setting-modal/__tests__/index.spec.tsx
+++ b/web/app/components/plugins/reference-setting-modal/__tests__/index.spec.tsx
@@ -14,28 +14,25 @@ const mockSystemFeatures = { enable_marketplace: true }
 const render = (ui: ReactElement) =>
   renderWithSystemFeatures(ui, { systemFeatures: mockSystemFeatures })
 
-// Mock Modal component
-vi.mock('@/app/components/base/modal', () => ({
-  default: ({ children, isShow, onClose, closable, className }: {
+let mockDialogOnOpenChange: ((open: boolean) => void) | undefined
+
+vi.mock('@langgenius/dify-ui/dialog', () => ({
+  Dialog: ({ children, open, onOpenChange }: {
     children: React.ReactNode
-    isShow: boolean
-    onClose: () => void
-    closable?: boolean
-    className?: string
+    open?: boolean
+    onOpenChange?: (open: boolean) => void
   }) => {
-    if (!isShow)
-      return null
-    return (
-      <div data-testid="modal" className={className}>
-        {closable && (
-          <button data-testid="modal-close" onClick={onClose}>
-            Close
-          </button>
-        )}
-        {children}
-      </div>
-    )
+    mockDialogOnOpenChange = onOpenChange
+    return open === false ? null : <>{children}</>
   },
+  DialogContent: ({ children, className }: { children: React.ReactNode, className?: string }) => (
+    <div data-testid="modal" className={className}>{children}</div>
+  ),
+  DialogCloseButton: () => (
+    <button data-testid="modal-close" onClick={() => mockDialogOnOpenChange?.(false)}>
+      Close
+    </button>
+  ),
 }))
 
 // Mock OptionCard component
diff --git a/web/app/components/plugins/reference-setting-modal/auto-update-setting/__tests__/index.spec.tsx b/web/app/components/plugins/reference-setting-modal/auto-update-setting/__tests__/index.spec.tsx
index 0ee9efc416..0e13be6d48 100644
--- a/web/app/components/plugins/reference-setting-modal/auto-update-setting/__tests__/index.spec.tsx
+++ b/web/app/components/plugins/reference-setting-modal/auto-update-setting/__tests__/index.spec.tsx
@@ -63,19 +63,19 @@ vi.mock('@/service/use-plugins', () => ({
 }))
 
 // Mock popover component for ToolPicker and StrategyPicker
-let mockPortalOpen = false
-let forcePortalContentVisible = false // Allow tests to force content visibility
-let mockPortalOnOpenChange: ((open: boolean) => void) | undefined
+let mockPopoverOpen = false
+let forcePopoverContentVisible = false // Allow tests to force content visibility
+let mockPopoverOnOpenChange: ((open: boolean) => void) | undefined
 vi.mock('@langgenius/dify-ui/popover', () => ({
   Popover: ({ children, open = false, onOpenChange }: {
     children: React.ReactNode
     open?: boolean
     onOpenChange?: (open: boolean) => void
   }) => {
-    mockPortalOpen = open
-    mockPortalOnOpenChange = onOpenChange
+    mockPopoverOpen = open
+    mockPopoverOnOpenChange = onOpenChange
     return (
-      <div data-testid="portal-elem" data-open={open}>{children}</div>
+      <div data-testid="popover" data-open={open}>{children}</div>
     )
   },
   PopoverTrigger: ({ children, render, onClick, className }: {
@@ -85,11 +85,11 @@ vi.mock('@langgenius/dify-ui/popover', () => ({
     className?: string
   }) => (
     <div
-      data-testid="portal-trigger"
+      data-testid="popover-trigger"
       onClick={(e) => {
         onClick?.(e)
         if (!onClick)
-          mockPortalOnOpenChange?.(!mockPortalOpen)
+          mockPopoverOnOpenChange?.(!mockPopoverOpen)
       }}
       className={className}
     >
@@ -101,39 +101,9 @@ vi.mock('@langgenius/dify-ui/popover', () => ({
     className?: string
     popupClassName?: string
   }) => {
-    if (!mockPortalOpen && !forcePortalContentVisible)
+    if (!mockPopoverOpen && !forcePopoverContentVisible)
       return null
-    return <div data-testid="portal-content" className={[className, popupClassName].filter(Boolean).join(' ')}>{children}</div>
-  },
-}))
-
-vi.mock('@/app/components/base/portal-to-follow-elem', () => ({
-  PortalToFollowElem: ({ children, open = false, onOpenChange }: {
-    children: React.ReactNode
-    open?: boolean
-    onOpenChange?: (open: boolean) => void
-  }) => {
-    mockPortalOpen = open
-    mockPortalOnOpenChange = onOpenChange
-    return <div data-testid="portal-elem" data-open={open}>{children}</div>
-  },
-  PortalToFollowElemTrigger: ({ children, onClick, className }: {
-    children?: React.ReactNode
-    onClick?: (e: React.MouseEvent) => void
-    className?: string
-  }) => (
-    <div data-testid="portal-trigger" onClick={onClick} className={className}>
-      {children}
-    </div>
-  ),
-  PortalToFollowElemContent: ({ children, className, popupClassName }: {
-    children: React.ReactNode
-    className?: string
-    popupClassName?: string
-  }) => {
-    if (!mockPortalOpen && !forcePortalContentVisible)
-      return null
-    return <div data-testid="portal-content" className={[className, popupClassName].filter(Boolean).join(' ')}>{children}</div>
+    return <div data-testid="popover-content" className={[className, popupClassName].filter(Boolean).join(' ')}>{children}</div>
   },
 }))
 
@@ -209,23 +179,6 @@ vi.mock('@/app/components/plugins/marketplace/search-box', () => ({
   ),
 }))
 
-// Mock Checkbox component
-vi.mock('@/app/components/base/checkbox', () => ({
-  default: ({ checked, onCheck, className }: {
-    checked?: boolean
-    onCheck: () => void
-    className?: string
-  }) => (
-    <input
-      type="checkbox"
-      checked={checked}
-      onChange={onCheck}
-      className={className}
-      data-testid="checkbox"
-    />
-  ),
-}))
-
 // Mock Icon component
 vi.mock('@/app/components/plugins/card/base/card-icon', () => ({
   default: ({ size, src }: { size: string, src: string }) => (
@@ -362,9 +315,9 @@ const renderWithQueryClient = (ui: React.ReactElement) => {
 describe('auto-update-setting', () => {
   beforeEach(() => {
     vi.clearAllMocks()
-    mockPortalOpen = false
-    mockPortalOnOpenChange = undefined
-    forcePortalContentVisible = false
+    mockPopoverOpen = false
+    mockPopoverOnOpenChange = undefined
+    forcePopoverContentVisible = false
     mockPluginsData.plugins = []
   })
 
@@ -769,7 +722,7 @@ describe('auto-update-setting', () => {
         render(<ToolItem {...defaultProps} isChecked={false} />)
 
         // Assert
-        expect(screen.getByTestId('checkbox')).not.toBeChecked()
+        expect(screen.getByRole('checkbox')).not.toBeChecked()
       })
 
       it('should render checkbox checked when isChecked is true', () => {
@@ -777,7 +730,7 @@ describe('auto-update-setting', () => {
         render(<ToolItem {...defaultProps} isChecked={true} />)
 
         // Assert
-        expect(screen.getByTestId('checkbox')).toBeChecked()
+        expect(screen.getByRole('checkbox')).toBeChecked()
       })
     })
 
@@ -788,7 +741,7 @@ describe('auto-update-setting', () => {
 
         // Act
         render(<ToolItem {...defaultProps} onCheckChange={onCheckChange} />)
-        fireEvent.click(screen.getByTestId('checkbox'))
+        fireEvent.click(screen.getByRole('checkbox'))
 
         // Assert
         expect(onCheckChange).toHaveBeenCalledTimes(1)
@@ -928,12 +881,12 @@ describe('auto-update-setting', () => {
         render(<ToolPicker {...defaultProps} isShow={false} />)
 
         // Assert
-        expect(screen.queryByTestId('portal-content')).not.toBeInTheDocument()
+        expect(screen.queryByTestId('popover-content')).not.toBeInTheDocument()
       })
 
       it('should render search box and tabs when isShow is true', () => {
         // Arrange
-        mockPortalOpen = true
+        mockPopoverOpen = true
 
         // Act
         render(<ToolPicker {...defaultProps} isShow={true} />)
@@ -944,7 +897,7 @@ describe('auto-update-setting', () => {
 
       it('should show NoDataPlaceholder when no plugins and no search query', () => {
         // Arrange
-        mockPortalOpen = true
+        mockPopoverOpen = true
         mockPluginsData.plugins = []
 
         // Act
@@ -986,7 +939,7 @@ describe('auto-update-setting', () => {
 
       it('should filter out non-marketplace plugins', () => {
         // Arrange
-        mockPortalOpen = true
+        mockPopoverOpen = true
 
         // Act
         renderWithQueryClient(<ToolPicker {...defaultProps} isShow={true} />)
@@ -997,7 +950,7 @@ describe('auto-update-setting', () => {
 
       it('should filter by search query', () => {
         // Arrange
-        mockPortalOpen = true
+        mockPopoverOpen = true
 
         // Act
         renderWithQueryClient(<ToolPicker {...defaultProps} isShow={true} />)
@@ -1018,7 +971,7 @@ describe('auto-update-setting', () => {
 
         // Act
         render(<ToolPicker {...defaultProps} onShowChange={onShowChange} />)
-        fireEvent.click(screen.getByTestId('portal-trigger'))
+        fireEvent.click(screen.getByTestId('popover-trigger'))
 
         // Assert
         expect(onShowChange).toHaveBeenCalledWith(true)
@@ -1026,7 +979,7 @@ describe('auto-update-setting', () => {
 
       it('should call onChange when plugin is selected', () => {
         // Arrange
-        mockPortalOpen = true
+        mockPopoverOpen = true
         mockPluginsData.plugins = [
           createMockPluginDetail({
             plugin_id: 'test-plugin',
@@ -1038,7 +991,7 @@ describe('auto-update-setting', () => {
 
         // Act
         renderWithQueryClient(<ToolPicker {...defaultProps} isShow={true} onChange={onChange} />)
-        fireEvent.click(screen.getByTestId('checkbox'))
+        fireEvent.click(screen.getByRole('checkbox'))
 
         // Assert
         expect(onChange).toHaveBeenCalledWith(['test-plugin'])
@@ -1046,7 +999,7 @@ describe('auto-update-setting', () => {
 
       it('should unselect plugin when already selected', () => {
         // Arrange
-        mockPortalOpen = true
+        mockPopoverOpen = true
         mockPluginsData.plugins = [
           createMockPluginDetail({
             plugin_id: 'test-plugin',
@@ -1059,7 +1012,7 @@ describe('auto-update-setting', () => {
         renderWithQueryClient(
           <ToolPicker {...defaultProps} isShow={true} value={['test-plugin']} onChange={onChange} />,
         )
-        fireEvent.click(screen.getByTestId('checkbox'))
+        fireEvent.click(screen.getByRole('checkbox'))
 
         // Assert
         expect(onChange).toHaveBeenCalledWith([])
@@ -1070,7 +1023,7 @@ describe('auto-update-setting', () => {
       it('handleCheckChange should be memoized with correct dependencies', () => {
         // Arrange
         const onChange = vi.fn()
-        mockPortalOpen = true
+        mockPopoverOpen = true
         mockPluginsData.plugins = [
           createMockPluginDetail({
             plugin_id: 'plugin-1',
@@ -1084,7 +1037,7 @@ describe('auto-update-setting', () => {
         )
 
         // Click to select
-        fireEvent.click(screen.getByTestId('checkbox'))
+        fireEvent.click(screen.getByRole('checkbox'))
         expect(onChange).toHaveBeenCalledWith(['plugin-1'])
 
         // Rerender with new value
@@ -1096,7 +1049,7 @@ describe('auto-update-setting', () => {
         )
 
         // Click to unselect
-        fireEvent.click(screen.getByTestId('checkbox'))
+        fireEvent.click(screen.getByRole('checkbox'))
         expect(onChange).toHaveBeenCalledWith([])
       })
     })
@@ -1134,7 +1087,7 @@ describe('auto-update-setting', () => {
 
         // Assert
         expect(screen.getByText('plugin.autoUpdate.partialUPdate:{"num":2}')).toBeInTheDocument()
-        expect(screen.getByText('plugin.autoUpdate.operation.clearAll')).toBeInTheDocument()
+        expect(screen.getByRole('button', { name: 'plugin.autoUpdate.operation.clearAll' })).toBeInTheDocument()
       })
 
       it('should render select button', () => {
@@ -1173,7 +1126,7 @@ describe('auto-update-setting', () => {
             onChange={onChange}
           />,
         )
-        fireEvent.click(screen.getByText('plugin.autoUpdate.operation.clearAll'))
+        fireEvent.click(screen.getByRole('button', { name: 'plugin.autoUpdate.operation.clearAll' }))
 
         // Assert
         expect(onChange).toHaveBeenCalledWith([])
@@ -1380,10 +1333,10 @@ describe('auto-update-setting', () => {
         render(<AutoUpdateSetting payload={payload} onChange={onChange} />)
 
         // Click time picker trigger
-        fireEvent.click(screen.getByTestId('time-picker').querySelector('[data-testid="time-input"]')!.parentElement!)
+        fireEvent.click(screen.getByRole('button', { name: /GMT-5/ }))
 
         // Set time
-        fireEvent.click(screen.getByTestId('time-picker-set'))
+        fireEvent.click(screen.getByRole('button', { name: 'Set 10:30' }))
 
         // Assert
         expect(onChange).toHaveBeenCalled()
@@ -1398,10 +1351,10 @@ describe('auto-update-setting', () => {
         render(<AutoUpdateSetting payload={payload} onChange={onChange} />)
 
         // Click time picker trigger
-        fireEvent.click(screen.getByTestId('time-picker').querySelector('[data-testid="time-input"]')!.parentElement!)
+        fireEvent.click(screen.getByRole('button', { name: /GMT-5/ }))
 
         // Clear time
-        fireEvent.click(screen.getByTestId('time-picker-clear'))
+        fireEvent.click(screen.getByRole('button', { name: 'Clear' }))
 
         // Assert
         expect(onChange).toHaveBeenCalled()
@@ -1420,7 +1373,7 @@ describe('auto-update-setting', () => {
         render(<AutoUpdateSetting payload={payload} onChange={onChange} />)
 
         // Click clear all
-        fireEvent.click(screen.getByText('plugin.autoUpdate.operation.clearAll'))
+        fireEvent.click(screen.getByRole('button', { name: 'plugin.autoUpdate.operation.clearAll' }))
 
         // Assert
         expect(onChange).toHaveBeenCalledWith(expect.objectContaining({
@@ -1441,7 +1394,7 @@ describe('auto-update-setting', () => {
         render(<AutoUpdateSetting payload={payload} onChange={onChange} />)
 
         // Click clear all
-        fireEvent.click(screen.getByText('plugin.autoUpdate.operation.clearAll'))
+        fireEvent.click(screen.getByRole('button', { name: 'plugin.autoUpdate.operation.clearAll' }))
 
         // Assert
         expect(onChange).toHaveBeenCalledWith(expect.objectContaining({
@@ -1456,7 +1409,6 @@ describe('auto-update-setting', () => {
         // Act
         render(<AutoUpdateSetting {...defaultProps} payload={payload} />)
 
-        // Assert - timezone Trans component is rendered
         expect(screen.getByText('autoUpdate.changeTimezone')).toBeInTheDocument()
       })
     })
@@ -1489,7 +1441,7 @@ describe('auto-update-setting', () => {
         render(<AutoUpdateSetting payload={payload} onChange={onChange} />)
 
         // Trigger a change (clear plugins)
-        fireEvent.click(screen.getByText('plugin.autoUpdate.operation.clearAll'))
+        fireEvent.click(screen.getByRole('button', { name: 'plugin.autoUpdate.operation.clearAll' }))
 
         // Assert - other values should be preserved
         expect(onChange).toHaveBeenCalledWith(expect.objectContaining({
diff --git a/web/app/components/plugins/reference-setting-modal/auto-update-setting/__tests__/plugins-picker.spec.tsx b/web/app/components/plugins/reference-setting-modal/auto-update-setting/__tests__/plugins-picker.spec.tsx
index 99d7a5fdc5..a9ffe76ae6 100644
--- a/web/app/components/plugins/reference-setting-modal/auto-update-setting/__tests__/plugins-picker.spec.tsx
+++ b/web/app/components/plugins/reference-setting-modal/auto-update-setting/__tests__/plugins-picker.spec.tsx
@@ -60,7 +60,7 @@ describe('PluginsPicker', () => {
     expect(screen.getByText('plugin.autoUpdate.excludeUpdate:{"num":2}')).toBeInTheDocument()
     expect(screen.getByTestId('plugins-selected')).toHaveTextContent('dify/plugin-1,dify/plugin-2')
 
-    fireEvent.click(screen.getByText('plugin.autoUpdate.operation.clearAll'))
+    fireEvent.click(screen.getByRole('button', { name: 'plugin.autoUpdate.operation.clearAll' }))
 
     expect(onChange).toHaveBeenCalledWith([])
   })
diff --git a/web/app/components/plugins/reference-setting-modal/auto-update-setting/__tests__/tool-item.spec.tsx b/web/app/components/plugins/reference-setting-modal/auto-update-setting/__tests__/tool-item.spec.tsx
index f15fe5933f..6edfb799d0 100644
--- a/web/app/components/plugins/reference-setting-modal/auto-update-setting/__tests__/tool-item.spec.tsx
+++ b/web/app/components/plugins/reference-setting-modal/auto-update-setting/__tests__/tool-item.spec.tsx
@@ -19,20 +19,6 @@ vi.mock('@/app/components/plugins/card/base/card-icon', () => ({
   default: ({ src }: { src: string }) => <div data-testid="plugin-icon">{src}</div>,
 }))
 
-vi.mock('@/app/components/base/checkbox', () => ({
-  default: ({
-    checked,
-    onCheck,
-  }: {
-    checked?: boolean
-    onCheck: () => void
-  }) => (
-    <button data-testid="checkbox" onClick={onCheck}>
-      {String(checked)}
-    </button>
-  ),
-}))
-
 const payload = {
   plugin_id: 'dify/plugin-1',
   declaration: {
@@ -51,14 +37,14 @@ describe('ToolItem', () => {
     expect(screen.getByText('Plugin One')).toBeInTheDocument()
     expect(screen.getByText('Dify')).toBeInTheDocument()
     expect(screen.getByText('https://marketplace.example.com/plugins/dify/plugin-1/icon')).toBeInTheDocument()
-    expect(screen.getByText('true')).toBeInTheDocument()
+    expect(screen.getByRole('checkbox', { name: 'Plugin One' })).toHaveAttribute('aria-checked', 'true')
   })
 
   it('calls onCheckChange when checkbox is clicked', () => {
     const onCheckChange = vi.fn()
     render(<ToolItem payload={payload} onCheckChange={onCheckChange} />)
 
-    fireEvent.click(screen.getByTestId('checkbox'))
+    fireEvent.click(screen.getByRole('checkbox', { name: 'Plugin One' }))
 
     expect(onCheckChange).toHaveBeenCalledTimes(1)
   })
diff --git a/web/app/components/plugins/reference-setting-modal/auto-update-setting/index.tsx b/web/app/components/plugins/reference-setting-modal/auto-update-setting/index.tsx
index d7d6fcd35f..33049f4b1b 100644
--- a/web/app/components/plugins/reference-setting-modal/auto-update-setting/index.tsx
+++ b/web/app/components/plugins/reference-setting-modal/auto-update-setting/index.tsx
@@ -33,7 +33,13 @@ const SettingTimeZone: FC<{
 }) => {
   const setShowAccountSettingModal = useModalContextSelector(s => s.setShowAccountSettingModal)
   return (
-    <span className="cursor-pointer body-xs-regular text-text-accent" onClick={() => setShowAccountSettingModal({ payload: ACCOUNT_SETTING_TAB.LANGUAGE })}>{children}</span>
+    <button
+      type="button"
+      className="cursor-pointer border-none bg-transparent p-0 text-left body-xs-regular text-text-accent focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+      onClick={() => setShowAccountSettingModal({ payload: ACCOUNT_SETTING_TAB.LANGUAGE })}
+    >
+      {children}
+    </button>
   )
 }
 const AutoUpdateSetting: FC<Props> = ({
@@ -104,8 +110,9 @@ const AutoUpdateSetting: FC<Props> = ({
 
   const renderTimePickerTrigger = useCallback(({ inputElem, onClick, isOpen }: TriggerParams) => {
     return (
-      <div
-        className="group flex h-8 w-[160px] cursor-pointer items-center justify-between rounded-lg bg-components-input-bg-normal px-2 hover:bg-state-base-hover-alt"
+      <button
+        type="button"
+        className="group flex h-8 w-[160px] cursor-pointer items-center justify-between rounded-lg border-none bg-components-input-bg-normal px-2 text-left hover:bg-state-base-hover-alt focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
         onClick={onClick}
       >
         <div className="flex w-0 grow items-center gap-x-1">
@@ -117,7 +124,7 @@ const AutoUpdateSetting: FC<Props> = ({
           {inputElem}
         </div>
         <div className="system-sm-regular text-text-tertiary">{convertTimezoneToOffsetStr(timezone)}</div>
-      </div>
+      </button>
     )
   }, [timezone])
 
@@ -143,7 +150,6 @@ const AutoUpdateSetting: FC<Props> = ({
                   timezone={timezone}
                   onChange={v => handleChange('upgrade_time_of_day')(convertLocalSecondsToUTCDaySeconds(dayjsToTimeOfDay(v), timezone!))}
                   onClear={() => handleChange('upgrade_time_of_day')(convertLocalSecondsToUTCDaySeconds(0, timezone!))}
-                  popupClassName="z-99"
                   title={t(`${i18nPrefix}.updateTime`, { ns: 'plugin' })}
                   minuteFilter={minuteFilter}
                   renderTrigger={renderTimePickerTrigger}
diff --git a/web/app/components/plugins/reference-setting-modal/auto-update-setting/plugins-picker.tsx b/web/app/components/plugins/reference-setting-modal/auto-update-setting/plugins-picker.tsx
index 1bb4caeb3f..ef25c35592 100644
--- a/web/app/components/plugins/reference-setting-modal/auto-update-setting/plugins-picker.tsx
+++ b/web/app/components/plugins/reference-setting-modal/auto-update-setting/plugins-picker.tsx
@@ -39,7 +39,13 @@ const PluginsPicker: FC<Props> = ({
         ? (
             <div className="flex justify-between text-text-tertiary">
               <div className="system-xs-medium">{t(`${i18nPrefix}.${isExcludeMode ? 'excludeUpdate' : 'partialUPdate'}`, { ns: 'plugin', num: value.length })}</div>
-              <div className="cursor-pointer system-xs-medium" onClick={handleClear}>{t(`${i18nPrefix}.operation.clearAll`, { ns: 'plugin' })}</div>
+              <button
+                type="button"
+                className="cursor-pointer border-none bg-transparent p-0 text-left system-xs-medium text-text-tertiary focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+                onClick={handleClear}
+              >
+                {t(`${i18nPrefix}.operation.clearAll`, { ns: 'plugin' })}
+              </button>
             </div>
           )
         : (
diff --git a/web/app/components/plugins/reference-setting-modal/auto-update-setting/strategy-picker.tsx b/web/app/components/plugins/reference-setting-modal/auto-update-setting/strategy-picker.tsx
index 5247352f9b..55ff7ffe91 100644
--- a/web/app/components/plugins/reference-setting-modal/auto-update-setting/strategy-picker.tsx
+++ b/web/app/components/plugins/reference-setting-modal/auto-update-setting/strategy-picker.tsx
@@ -58,7 +58,6 @@ const StrategyPicker = ({
       <DropdownMenuContent
         placement="top-end"
         sideOffset={4}
-        className="z-99"
         popupClassName="w-[280px] p-1"
       >
         <DropdownMenuRadioGroup
diff --git a/web/app/components/plugins/reference-setting-modal/auto-update-setting/tool-item.tsx b/web/app/components/plugins/reference-setting-modal/auto-update-setting/tool-item.tsx
index e5dbc24b8f..b4dddcf818 100644
--- a/web/app/components/plugins/reference-setting-modal/auto-update-setting/tool-item.tsx
+++ b/web/app/components/plugins/reference-setting-modal/auto-update-setting/tool-item.tsx
@@ -1,8 +1,8 @@
 'use client'
 import type { FC } from 'react'
 import type { PluginDetail } from '@/app/components/plugins/types'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import * as React from 'react'
-import Checkbox from '@/app/components/base/checkbox'
 import Icon from '@/app/components/plugins/card/base/card-icon'
 import { MARKETPLACE_API_PREFIX } from '@/config'
 import { useGetLanguage } from '@/context/i18n'
@@ -35,8 +35,9 @@ const ToolItem: FC<Props> = ({
         </div>
         <Checkbox
           checked={isChecked}
-          onCheck={onCheckChange}
+          onCheckedChange={() => onCheckChange()}
           className="shrink-0"
+          aria-label={renderI18nObject(label, language)}
         />
       </div>
     </div>
diff --git a/web/app/components/plugins/reference-setting-modal/auto-update-setting/tool-picker.tsx b/web/app/components/plugins/reference-setting-modal/auto-update-setting/tool-picker.tsx
index 1c499104c2..f6ffb1618e 100644
--- a/web/app/components/plugins/reference-setting-modal/auto-update-setting/tool-picker.tsx
+++ b/web/app/components/plugins/reference-setting-modal/auto-update-setting/tool-picker.tsx
@@ -101,7 +101,6 @@ const ToolPicker: FC<Props> = ({
         placement="top"
         sideOffset={0}
         popupClassName="border-none bg-transparent p-0 shadow-none backdrop-blur-none"
-        positionerProps={{ style: { zIndex: 1000 } }}
       >
         <div className="relative min-h-20 w-full rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur pb-2 shadow-lg backdrop-blur-xs">
           <div className="p-2 pb-1">
diff --git a/web/app/components/plugins/reference-setting-modal/index.tsx b/web/app/components/plugins/reference-setting-modal/index.tsx
index b93713bdd8..e7d15f5402 100644
--- a/web/app/components/plugins/reference-setting-modal/index.tsx
+++ b/web/app/components/plugins/reference-setting-modal/index.tsx
@@ -3,11 +3,11 @@ import type { FC } from 'react'
 import type { AutoUpdateConfig } from './auto-update-setting/types'
 import type { Permissions, ReferenceSetting } from '@/app/components/plugins/types'
 import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogCloseButton, DialogContent } from '@langgenius/dify-ui/dialog'
 import { useSuspenseQuery } from '@tanstack/react-query'
 import * as React from 'react'
 import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import Modal from '@/app/components/base/modal'
 import { PermissionType } from '@/app/components/plugins/types'
 import OptionCard from '@/app/components/workflow/nodes/_base/components/option-card'
 import { systemFeaturesQueryOptions } from '@/service/system-features'
@@ -53,59 +53,64 @@ const PluginSettingModal: FC<Props> = ({
   }, [onHide, onSave, tempAutoUpdateConfig, tempPrivilege])
 
   return (
-    <Modal
-      isShow
-      onClose={onHide}
-      closable
-      className="w-[620px] max-w-[620px] p-0!"
+    <Dialog
+      open
+      onOpenChange={(open) => {
+        if (!open)
+          onHide()
+      }}
     >
-      <div className="shadows-shadow-xl flex w-full flex-col items-start rounded-2xl border border-components-panel-border bg-components-panel-bg">
-        <div className="flex items-start gap-2 self-stretch pt-6 pr-14 pb-3 pl-6">
-          <span className="self-stretch title-2xl-semi-bold text-text-primary">{t(`${i18nPrefix}.title`, { ns: 'plugin' })}</span>
-        </div>
-        <div className="flex flex-col items-start justify-center gap-4 self-stretch px-6 py-3">
-          {[
-            { title: t(`${i18nPrefix}.whoCanInstall`, { ns: 'plugin' }), key: 'install_permission', value: tempPrivilege?.install_permission || PermissionType.noOne },
-            { title: t(`${i18nPrefix}.whoCanDebug`, { ns: 'plugin' }), key: 'debug_permission', value: tempPrivilege?.debug_permission || PermissionType.noOne },
-          ].map(({ title, key, value }) => (
-            <div key={key} className="flex flex-col items-start gap-1 self-stretch">
-              <Label label={title} />
-              <div className="flex w-full items-start justify-between gap-2">
-                {[PermissionType.everyone, PermissionType.admin, PermissionType.noOne].map(option => (
-                  <OptionCard
-                    key={option}
-                    title={t(`${i18nPrefix}.${option}`, { ns: 'plugin' })}
-                    onSelect={() => handlePrivilegeChange(key)(option)}
-                    selected={value === option}
-                    className="flex-1"
-                  />
-                ))}
+      <DialogContent className="w-[620px] max-w-[620px] overflow-hidden! border-none p-0! text-left align-middle">
+        <DialogCloseButton />
+
+        <div className="shadows-shadow-xl flex w-full flex-col items-start rounded-2xl border border-components-panel-border bg-components-panel-bg">
+          <div className="flex items-start gap-2 self-stretch pt-6 pr-14 pb-3 pl-6">
+            <span className="self-stretch title-2xl-semi-bold text-text-primary">{t(`${i18nPrefix}.title`, { ns: 'plugin' })}</span>
+          </div>
+          <div className="flex flex-col items-start justify-center gap-4 self-stretch px-6 py-3">
+            {[
+              { title: t(`${i18nPrefix}.whoCanInstall`, { ns: 'plugin' }), key: 'install_permission', value: tempPrivilege?.install_permission || PermissionType.noOne },
+              { title: t(`${i18nPrefix}.whoCanDebug`, { ns: 'plugin' }), key: 'debug_permission', value: tempPrivilege?.debug_permission || PermissionType.noOne },
+            ].map(({ title, key, value }) => (
+              <div key={key} className="flex flex-col items-start gap-1 self-stretch">
+                <Label label={title} />
+                <div className="flex w-full items-start justify-between gap-2">
+                  {[PermissionType.everyone, PermissionType.admin, PermissionType.noOne].map(option => (
+                    <OptionCard
+                      key={option}
+                      title={t(`${i18nPrefix}.${option}`, { ns: 'plugin' })}
+                      onSelect={() => handlePrivilegeChange(key)(option)}
+                      selected={value === option}
+                      className="flex-1"
+                    />
+                  ))}
+                </div>
               </div>
-            </div>
-          ))}
+            ))}
+          </div>
+          {
+            enable_marketplace && (
+              <AutoUpdateSetting payload={tempAutoUpdateConfig} onChange={setTempAutoUpdateConfig} />
+            )
+          }
+          <div className="flex h-[76px] items-center justify-end gap-2 self-stretch p-6 pt-5">
+            <Button
+              className="min-w-[72px]"
+              onClick={onHide}
+            >
+              {t('operation.cancel', { ns: 'common' })}
+            </Button>
+            <Button
+              className="min-w-[72px]"
+              variant="primary"
+              onClick={handleSave}
+            >
+              {t('operation.save', { ns: 'common' })}
+            </Button>
+          </div>
         </div>
-        {
-          enable_marketplace && (
-            <AutoUpdateSetting payload={tempAutoUpdateConfig} onChange={setTempAutoUpdateConfig} />
-          )
-        }
-        <div className="flex h-[76px] items-center justify-end gap-2 self-stretch p-6 pt-5">
-          <Button
-            className="min-w-[72px]"
-            onClick={onHide}
-          >
-            {t('operation.cancel', { ns: 'common' })}
-          </Button>
-          <Button
-            className="min-w-[72px]"
-            variant="primary"
-            onClick={handleSave}
-          >
-            {t('operation.save', { ns: 'common' })}
-          </Button>
-        </div>
-      </div>
-    </Modal>
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/components/plugins/update-plugin/plugin-version-picker.tsx b/web/app/components/plugins/update-plugin/plugin-version-picker.tsx
index a76fd085ba..458947da6b 100644
--- a/web/app/components/plugins/update-plugin/plugin-version-picker.tsx
+++ b/web/app/components/plugins/update-plugin/plugin-version-picker.tsx
@@ -45,7 +45,7 @@ const PluginVersionPicker: FC<Props> = ({
   trigger,
   placement = 'bottom-start',
   sideOffset = 4,
-  alignOffset = -16,
+  alignOffset = 0,
   onSelect,
 }) => {
   const { t } = useTranslation()
diff --git a/web/app/components/rag-pipeline/components/__tests__/index.spec.tsx b/web/app/components/rag-pipeline/components/__tests__/index.spec.tsx
index 0eec89b8b8..2f21811f86 100644
--- a/web/app/components/rag-pipeline/components/__tests__/index.spec.tsx
+++ b/web/app/components/rag-pipeline/components/__tests__/index.spec.tsx
@@ -420,7 +420,7 @@ function getDescriptionTextarea() {
 }
 
 // Helper to find the AppIcon span in PublishAsKnowledgePipelineModal
-// HeadlessUI Dialog renders via portal to document.body, so we search the full document
+// The modal renders via portal to document.body, so we search the full document.
 function getAppIcon() {
   const emoji = document.querySelector('em-emoji')
   return emoji?.closest('span') as HTMLElement
@@ -687,7 +687,7 @@ describe('PublishAsKnowledgePipelineModal', () => {
       render(<PublishAsKnowledgePipelineModal {...defaultProps} />)
 
       // Real AppIcon renders an em-emoji custom element inside a span
-      // HeadlessUI Dialog renders via portal, so search the full document
+      // The modal renders via portal, so search the full document.
       expect(document.querySelector('em-emoji')).toBeInTheDocument()
     })
 
@@ -729,7 +729,7 @@ describe('PublishAsKnowledgePipelineModal', () => {
     it('should call onCancel when close icon is clicked', () => {
       render(<PublishAsKnowledgePipelineModal {...defaultProps} />)
 
-      fireEvent.click(screen.getByTestId('publish-modal-close-btn'))
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.close' }))
 
       expect(mockOnCancel).toHaveBeenCalledTimes(1)
     })
@@ -845,7 +845,7 @@ describe('PublishAsKnowledgePipelineModal', () => {
       const { rerender } = render(<PublishAsKnowledgePipelineModal {...defaultProps} />)
 
       rerender(<PublishAsKnowledgePipelineModal {...defaultProps} />)
-      // HeadlessUI Dialog renders via portal, so search the full document
+      // The modal renders via portal, so search the full document.
       expect(document.querySelector('em-emoji')).toBeInTheDocument()
     })
   })
diff --git a/web/app/components/rag-pipeline/components/__tests__/publish-as-knowledge-pipeline-modal.spec.tsx b/web/app/components/rag-pipeline/components/__tests__/publish-as-knowledge-pipeline-modal.spec.tsx
index 7a99b7ab90..4a795ba516 100644
--- a/web/app/components/rag-pipeline/components/__tests__/publish-as-knowledge-pipeline-modal.spec.tsx
+++ b/web/app/components/rag-pipeline/components/__tests__/publish-as-knowledge-pipeline-modal.spec.tsx
@@ -17,9 +17,12 @@ vi.mock('@/app/components/workflow/store', () => ({
   }),
 }))
 
-vi.mock('@/app/components/base/modal', () => ({
-  default: ({ children, isShow }: { children: React.ReactNode, isShow: boolean }) =>
-    isShow ? <div data-testid="modal">{children}</div> : null,
+vi.mock('@langgenius/dify-ui/dialog', () => ({
+  Dialog: ({ children, open }: { children: React.ReactNode, open?: boolean }) =>
+    open === false ? null : <>{children}</>,
+  DialogContent: ({ children, className }: { children: React.ReactNode, className?: string }) => (
+    <div data-testid="modal" className={className}>{children}</div>
+  ),
 }))
 
 vi.mock('@langgenius/dify-ui/button', () => ({
@@ -119,7 +122,7 @@ describe('PublishAsKnowledgePipelineModal', () => {
   it('should call onCancel when close button clicked', () => {
     render(<PublishAsKnowledgePipelineModal {...defaultProps} />)
 
-    fireEvent.click(screen.getByTestId('publish-modal-close-btn'))
+    fireEvent.click(screen.getByRole('button', { name: 'common.operation.close' }))
 
     expect(mockOnCancel).toHaveBeenCalled()
   })
diff --git a/web/app/components/rag-pipeline/components/__tests__/update-dsl-modal.spec.tsx b/web/app/components/rag-pipeline/components/__tests__/update-dsl-modal.spec.tsx
index d31a06f421..815b21ba98 100644
--- a/web/app/components/rag-pipeline/components/__tests__/update-dsl-modal.spec.tsx
+++ b/web/app/components/rag-pipeline/components/__tests__/update-dsl-modal.spec.tsx
@@ -121,18 +121,14 @@ vi.mock('@langgenius/dify-ui/button', () => ({
   ),
 }))
 
-vi.mock('@/app/components/base/modal', () => ({
-  default: ({ children, isShow, _onClose, className }: PropsWithChildren<{
-    isShow: boolean
-    _onClose: () => void
-    className?: string
-  }>) => isShow
-    ? (
-        <div data-testid="modal" className={className}>
-          {children}
-        </div>
-      )
-    : null,
+vi.mock('@langgenius/dify-ui/dialog', () => ({
+  Dialog: ({ children, open }: PropsWithChildren<{ open?: boolean }>) =>
+    open === false ? null : <>{children}</>,
+  DialogContent: ({ children, className }: PropsWithChildren<{ className?: string }>) => (
+    <div data-testid="modal" className={className}>
+      {children}
+    </div>
+  ),
 }))
 
 vi.mock('@/app/components/workflow/constants', () => ({
diff --git a/web/app/components/rag-pipeline/components/__tests__/version-mismatch-modal.spec.tsx b/web/app/components/rag-pipeline/components/__tests__/version-mismatch-modal.spec.tsx
index 56ed88e2ae..b4b29fd0a8 100644
--- a/web/app/components/rag-pipeline/components/__tests__/version-mismatch-modal.spec.tsx
+++ b/web/app/components/rag-pipeline/components/__tests__/version-mismatch-modal.spec.tsx
@@ -31,13 +31,13 @@ describe('VersionMismatchModal', () => {
     it('should render dialog when isShow is true', () => {
       render(<VersionMismatchModal {...defaultProps} />)
 
-      expect(screen.getByRole('dialog')).toBeInTheDocument()
+      expect(screen.getByRole('alertdialog')).toBeInTheDocument()
     })
 
     it('should not render dialog when isShow is false', () => {
       render(<VersionMismatchModal {...defaultProps} isShow={false} />)
 
-      expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
+      expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument()
     })
 
     it('should render error title', () => {
diff --git a/web/app/components/rag-pipeline/components/panel/input-field/__tests__/index.spec.tsx b/web/app/components/rag-pipeline/components/panel/input-field/__tests__/index.spec.tsx
index 3146695cae..d362b31057 100644
--- a/web/app/components/rag-pipeline/components/panel/input-field/__tests__/index.spec.tsx
+++ b/web/app/components/rag-pipeline/components/panel/input-field/__tests__/index.spec.tsx
@@ -219,7 +219,7 @@ describe('InputFieldPanel', () => {
     it('should render close button', () => {
       render(<InputFieldPanel />)
 
-      const closeButton = screen.getByRole('button', { name: '' })
+      const closeButton = screen.getByRole('button', { name: 'common.operation.close' })
       expect(closeButton)!.toBeInTheDocument()
     })
 
diff --git a/web/app/components/rag-pipeline/components/panel/input-field/editor/__tests__/index.spec.tsx b/web/app/components/rag-pipeline/components/panel/input-field/editor/__tests__/index.spec.tsx
index d8feea44c6..d824ea52fb 100644
--- a/web/app/components/rag-pipeline/components/panel/input-field/editor/__tests__/index.spec.tsx
+++ b/web/app/components/rag-pipeline/components/panel/input-field/editor/__tests__/index.spec.tsx
@@ -153,7 +153,7 @@ describe('InputFieldEditorPanel', () => {
 
       renderWithProviders(<InputFieldEditorPanel {...props} />)
 
-      const closeButton = screen.getByRole('button', { name: '' })
+      const closeButton = screen.getByRole('button', { name: /Close|operation.close/ })
       expect(closeButton).toBeInTheDocument()
     })
 
@@ -270,7 +270,7 @@ describe('InputFieldEditorPanel', () => {
       const props = createInputFieldEditorProps({ onClose })
 
       renderWithProviders(<InputFieldEditorPanel {...props} />)
-      fireEvent.click(screen.getByTestId('input-field-editor-close-btn'))
+      fireEvent.click(screen.getByRole('button', { name: /Close|operation.close/ }))
 
       expect(onClose).toHaveBeenCalledTimes(1)
     })
diff --git a/web/app/components/rag-pipeline/components/panel/input-field/editor/form/__tests__/show-all-settings.spec.tsx b/web/app/components/rag-pipeline/components/panel/input-field/editor/form/__tests__/show-all-settings.spec.tsx
index 9dd943f969..438fef8d7b 100644
--- a/web/app/components/rag-pipeline/components/panel/input-field/editor/form/__tests__/show-all-settings.spec.tsx
+++ b/web/app/components/rag-pipeline/components/panel/input-field/editor/form/__tests__/show-all-settings.spec.tsx
@@ -55,7 +55,7 @@ describe('ShowAllSettings', () => {
     }
     render(<ShowAllSettingsHarness />)
 
-    fireEvent.click(screen.getByText('appDebug.variableConfig.showAllSettings'))
+    fireEvent.click(screen.getByRole('button', { name: /appDebug\.variableConfig\.showAllSettings/ }))
 
     expect(handleShowAllSettings).toHaveBeenCalledTimes(1)
   })
diff --git a/web/app/components/rag-pipeline/components/panel/input-field/editor/form/show-all-settings.tsx b/web/app/components/rag-pipeline/components/panel/input-field/editor/form/show-all-settings.tsx
index d881188446..4eb290450a 100644
--- a/web/app/components/rag-pipeline/components/panel/input-field/editor/form/show-all-settings.tsx
+++ b/web/app/components/rag-pipeline/components/panel/input-field/editor/form/show-all-settings.tsx
@@ -24,7 +24,11 @@ const ShowAllSettings = ({
     const hiddenFieldNames = useHiddenFieldNames(type)
 
     return (
-      <div className="flex cursor-pointer items-center gap-x-4" onClick={handleShowAllSettings}>
+      <button
+        type="button"
+        className="flex w-full cursor-pointer items-center gap-x-4 border-none bg-transparent p-0 text-left"
+        onClick={handleShowAllSettings}
+      >
         <div className="flex grow flex-col">
           <span className="flex min-h-6 items-center system-sm-medium text-text-secondary">
             {t('variableConfig.showAllSettings', { ns: 'appDebug' })}
@@ -33,8 +37,8 @@ const ShowAllSettings = ({
             {hiddenFieldNames}
           </span>
         </div>
-        <RiArrowRightSLine className="h-4 w-4 shrink-0 text-text-secondary" />
-      </div>
+        <RiArrowRightSLine className="h-4 w-4 shrink-0 text-text-secondary" aria-hidden="true" />
+      </button>
     )
   },
 })
diff --git a/web/app/components/rag-pipeline/components/panel/input-field/editor/index.tsx b/web/app/components/rag-pipeline/components/panel/input-field/editor/index.tsx
index 6bd21866db..5b7f565c09 100644
--- a/web/app/components/rag-pipeline/components/panel/input-field/editor/index.tsx
+++ b/web/app/components/rag-pipeline/components/panel/input-field/editor/index.tsx
@@ -49,11 +49,11 @@ const InputFieldEditorPanel = ({
       </div>
       <button
         type="button"
-        data-testid="input-field-editor-close-btn"
-        className="absolute top-2.5 right-2.5 flex size-8 items-center justify-center"
+        aria-label={t('operation.close', { ns: 'common' })}
+        className="absolute top-2.5 right-2.5 flex size-8 items-center justify-center border-none bg-transparent p-0"
         onClick={onClose}
       >
-        <RiCloseLine className="size-4 text-text-tertiary" />
+        <RiCloseLine className="size-4 text-text-tertiary" aria-hidden="true" />
       </button>
       <InputFieldForm
         initialData={formData}
diff --git a/web/app/components/rag-pipeline/components/panel/input-field/field-list/__tests__/index.spec.tsx b/web/app/components/rag-pipeline/components/panel/input-field/field-list/__tests__/index.spec.tsx
index 84c700e273..b87b097c60 100644
--- a/web/app/components/rag-pipeline/components/panel/input-field/field-list/__tests__/index.spec.tsx
+++ b/web/app/components/rag-pipeline/components/panel/input-field/field-list/__tests__/index.spec.tsx
@@ -1574,7 +1574,7 @@ describe('handleSubmitField', () => {
       />,
     )
 
-    fireEvent.click(screen.getByTestId('field-list-add-btn'))
+    fireEvent.click(screen.getByRole('button', { name: 'common.operation.add' }))
 
     expect(mockToggleInputFieldEditPanel).toHaveBeenCalled()
     const editorProps = mockToggleInputFieldEditPanel.mock.calls[0]![0]
@@ -1798,7 +1798,7 @@ describe('handleSubmitField', () => {
       />,
     )
 
-    fireEvent.click(screen.getByTestId('field-list-add-btn'))
+    fireEvent.click(screen.getByRole('button', { name: 'common.operation.add' }))
 
     const editorProps = mockToggleInputFieldEditPanel.mock.calls[0]![0]
 
@@ -1822,7 +1822,7 @@ describe('handleSubmitField', () => {
       />,
     )
 
-    fireEvent.click(screen.getByTestId('field-list-add-btn'))
+    fireEvent.click(screen.getByRole('button', { name: 'common.operation.add' }))
 
     const editorProps = mockToggleInputFieldEditPanel.mock.calls[0]![0]
     expect(editorProps).toHaveProperty('onClose')
@@ -1853,7 +1853,7 @@ describe('Duplicate Variable Name Handling', () => {
       />,
     )
 
-    fireEvent.click(screen.getByTestId('field-list-add-btn'))
+    fireEvent.click(screen.getByRole('button', { name: 'common.operation.add' }))
 
     const editorProps = mockToggleInputFieldEditPanel.mock.calls[0]![0]
 
@@ -1939,7 +1939,7 @@ describe('Integration Tests', () => {
       )
       fireEvent.mouseEnter(container.querySelector('.handle')!)
 
-      fireEvent.click(screen.getByTestId('field-list-add-btn'))
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.add' }))
       expect(mockToggleInputFieldEditPanel).toHaveBeenCalled()
 
       const fieldItemButtons = container.querySelectorAll('.handle button.action-btn')
diff --git a/web/app/components/rag-pipeline/components/panel/input-field/field-list/index.tsx b/web/app/components/rag-pipeline/components/panel/input-field/field-list/index.tsx
index 64b05f762d..0e7400d302 100644
--- a/web/app/components/rag-pipeline/components/panel/input-field/field-list/index.tsx
+++ b/web/app/components/rag-pipeline/components/panel/input-field/field-list/index.tsx
@@ -3,6 +3,7 @@ import { cn } from '@langgenius/dify-ui/cn'
 import { RiAddLine } from '@remixicon/react'
 import * as React from 'react'
 import { useCallback } from 'react'
+import { useTranslation } from 'react-i18next'
 import ActionButton from '@/app/components/base/action-button'
 import RemoveEffectVarConfirm from '@/app/components/workflow/nodes/_base/components/remove-effect-var-confirm'
 import FieldListContainer from './field-list-container'
@@ -27,6 +28,7 @@ const FieldList = ({
   labelClassName,
   allVariableNames,
 }: FieldListProps) => {
+  const { t } = useTranslation()
   const onInputFieldsChange = useCallback((value: InputVar[]) => {
     handleInputFieldsChange(nodeId, value)
   }, [handleInputFieldsChange, nodeId])
@@ -53,12 +55,12 @@ const FieldList = ({
           {LabelRightContent}
         </div>
         <ActionButton
-          data-testid="field-list-add-btn"
+          aria-label={t('operation.add', { ns: 'common' })}
           onClick={() => handleOpenInputFieldEditor()}
           disabled={readonly}
           className={cn(readonly && 'cursor-not-allowed')}
         >
-          <RiAddLine className="h-4 w-4 text-text-tertiary" />
+          <RiAddLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
         </ActionButton>
       </div>
       <FieldListContainer
diff --git a/web/app/components/rag-pipeline/components/panel/input-field/index.tsx b/web/app/components/rag-pipeline/components/panel/input-field/index.tsx
index 12eed4ece4..3572d6012f 100644
--- a/web/app/components/rag-pipeline/components/panel/input-field/index.tsx
+++ b/web/app/components/rag-pipeline/components/panel/input-field/index.tsx
@@ -13,7 +13,7 @@ import {
 import { useTranslation } from 'react-i18next'
 import { useNodes } from 'reactflow'
 import Divider from '@/app/components/base/divider'
-import Tooltip from '@/app/components/base/tooltip'
+import { Infotip } from '@/app/components/base/infotip'
 import { useInputFieldPanel } from '@/app/components/rag-pipeline/hooks'
 import { useNodesSyncDraft } from '@/app/components/workflow/hooks'
 import { useStore } from '@/app/components/workflow/store'
@@ -121,6 +121,7 @@ const InputFieldPanel = () => {
         <Divider type="vertical" className="mx-1 h-3" />
         <button
           type="button"
+          aria-label={t('operation.close', { ns: 'common' })}
           className="flex size-6 shrink-0 items-center justify-center p-0.5"
           onClick={closePanel}
         >
@@ -136,10 +137,12 @@ const InputFieldPanel = () => {
           <span className="system-sm-semibold-uppercase text-text-secondary">
             {t('inputFieldPanel.uniqueInputs.title', { ns: 'datasetPipeline' })}
           </span>
-          <Tooltip
-            popupContent={t('inputFieldPanel.uniqueInputs.tooltip', { ns: 'datasetPipeline' })}
+          <Infotip
+            aria-label={t('inputFieldPanel.uniqueInputs.tooltip', { ns: 'datasetPipeline' })}
             popupClassName="max-w-[240px]"
-          />
+          >
+            {t('inputFieldPanel.uniqueInputs.tooltip', { ns: 'datasetPipeline' })}
+          </Infotip>
         </div>
         <div className="flex flex-col gap-y-1 py-1">
           {
diff --git a/web/app/components/rag-pipeline/components/publish-as-knowledge-pipeline-modal.tsx b/web/app/components/rag-pipeline/components/publish-as-knowledge-pipeline-modal.tsx
index faa71f0f4e..1a6ed46ec0 100644
--- a/web/app/components/rag-pipeline/components/publish-as-knowledge-pipeline-modal.tsx
+++ b/web/app/components/rag-pipeline/components/publish-as-knowledge-pipeline-modal.tsx
@@ -2,14 +2,13 @@
 import type { AppIconSelection } from '@/app/components/base/app-icon-picker'
 import type { IconInfo } from '@/models/datasets'
 import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { RiCloseLine } from '@remixicon/react'
-import { noop } from 'es-toolkit/function'
 import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import AppIcon from '@/app/components/base/app-icon'
 import AppIconPicker from '@/app/components/base/app-icon-picker'
 import Input from '@/app/components/base/input'
-import Modal from '@/app/components/base/modal'
 import Textarea from '@/app/components/base/textarea'
 import { useWorkflowStore } from '@/app/components/workflow/store'
 
@@ -77,77 +76,77 @@ const PublishAsKnowledgePipelineModal = ({
 
   return (
     <>
-      <Modal
-        isShow
-        onClose={noop}
-        className="relative w-[520px]! p-0!"
-      >
-        <div className="relative flex items-center p-6 pr-14 pb-3 title-2xl-semi-bold text-text-primary">
-          {t('common.publishAs', { ns: 'pipeline' })}
-          <div
-            data-testid="publish-modal-close-btn"
-            className="absolute top-5 right-5 flex h-8 w-8 cursor-pointer items-center justify-center"
-            onClick={onCancel}
-          >
-            <RiCloseLine className="h-4 w-4 text-text-tertiary" />
+      <Dialog open>
+        <DialogContent className="w-full max-w-[480px]! overflow-hidden! border-none p-0! text-left align-middle">
+
+          <div className="relative flex items-center p-6 pr-14 pb-3 title-2xl-semi-bold text-text-primary">
+            {t('common.publishAs', { ns: 'pipeline' })}
+            <button
+              type="button"
+              aria-label={t('operation.close', { ns: 'common' })}
+              className="absolute top-5 right-5 flex h-8 w-8 cursor-pointer items-center justify-center border-none bg-transparent p-0"
+              onClick={onCancel}
+            >
+              <RiCloseLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
+            </button>
           </div>
-        </div>
-        <div className="px-6 py-3">
-          <div className="mb-5 flex">
-            <div className="mr-3 grow">
-              <div className="mb-1 flex h-6 items-center system-sm-medium text-text-secondary">
-                {t('common.publishAsPipeline.name', { ns: 'pipeline' })}
+          <div className="px-6 py-3">
+            <div className="mb-5 flex">
+              <div className="mr-3 grow">
+                <div className="mb-1 flex h-6 items-center system-sm-medium text-text-secondary">
+                  {t('common.publishAsPipeline.name', { ns: 'pipeline' })}
+                </div>
+                <Input
+                  value={pipelineName}
+                  onChange={e => setPipelineName(e.target.value)}
+                  placeholder={t('common.publishAsPipeline.namePlaceholder', { ns: 'pipeline' }) || ''}
+                />
               </div>
-              <Input
-                value={pipelineName}
-                onChange={e => setPipelineName(e.target.value)}
-                placeholder={t('common.publishAsPipeline.namePlaceholder', { ns: 'pipeline' }) || ''}
+              <AppIcon
+                size="xxl"
+                onClick={() => { setShowAppIconPicker(true) }}
+                className="mt-2 shrink-0 cursor-pointer"
+                iconType={pipelineIcon?.icon_type}
+                icon={pipelineIcon?.icon}
+                background={pipelineIcon?.icon_background}
+                imageUrl={pipelineIcon?.icon_url}
               />
             </div>
-            <AppIcon
-              size="xxl"
-              onClick={() => { setShowAppIconPicker(true) }}
-              className="mt-2 shrink-0 cursor-pointer"
-              iconType={pipelineIcon?.icon_type}
-              icon={pipelineIcon?.icon}
-              background={pipelineIcon?.icon_background}
-              imageUrl={pipelineIcon?.icon_url}
-            />
-          </div>
-          <div>
-            <div className="mb-1 flex h-6 items-center system-sm-medium text-text-secondary">
-              {t('common.publishAsPipeline.description', { ns: 'pipeline' })}
+            <div>
+              <div className="mb-1 flex h-6 items-center system-sm-medium text-text-secondary">
+                {t('common.publishAsPipeline.description', { ns: 'pipeline' })}
+              </div>
+              <Textarea
+                className="resize-none"
+                placeholder={t('common.publishAsPipeline.descriptionPlaceholder', { ns: 'pipeline' }) || ''}
+                value={description}
+                onChange={e => setDescription(e.target.value)}
+              />
             </div>
-            <Textarea
-              className="resize-none"
-              placeholder={t('common.publishAsPipeline.descriptionPlaceholder', { ns: 'pipeline' }) || ''}
-              value={description}
-              onChange={e => setDescription(e.target.value)}
-            />
           </div>
-        </div>
-        <div className="flex items-center justify-end px-6 py-5">
-          <Button
-            className="mr-2"
-            onClick={onCancel}
-          >
-            {t('operation.cancel', { ns: 'common' })}
-          </Button>
-          <Button
-            disabled={!pipelineName?.trim() || confirmDisabled}
-            variant="primary"
-            onClick={() => handleConfirm()}
-          >
-            {t('common.publish', { ns: 'workflow' })}
-          </Button>
-        </div>
-      </Modal>
-      {showAppIconPicker && (
-        <AppIconPicker
-          onSelect={handleSelectIcon}
-          onClose={handleCloseIconPicker}
-        />
-      )}
+          <div className="flex items-center justify-end px-6 py-5">
+            <Button
+              className="mr-2"
+              onClick={onCancel}
+            >
+              {t('operation.cancel', { ns: 'common' })}
+            </Button>
+            <Button
+              disabled={!pipelineName?.trim() || confirmDisabled}
+              variant="primary"
+              onClick={() => handleConfirm()}
+            >
+              {t('common.publish', { ns: 'workflow' })}
+            </Button>
+          </div>
+          {showAppIconPicker && (
+            <AppIconPicker
+              onSelect={handleSelectIcon}
+              onClose={handleCloseIconPicker}
+            />
+          )}
+        </DialogContent>
+      </Dialog>
     </>
   )
 }
diff --git a/web/app/components/rag-pipeline/components/rag-pipeline-header/publisher/__tests__/index.spec.tsx b/web/app/components/rag-pipeline/components/rag-pipeline-header/publisher/__tests__/index.spec.tsx
index afd7c04ed1..ffc7d684ed 100644
--- a/web/app/components/rag-pipeline/components/rag-pipeline-header/publisher/__tests__/index.spec.tsx
+++ b/web/app/components/rag-pipeline/components/rag-pipeline-header/publisher/__tests__/index.spec.tsx
@@ -480,7 +480,9 @@ describe('publisher', () => {
       it('should show publish as knowledge pipeline modal when permitted', async () => {
         mockPublishedAt.mockReturnValue(1700000000)
         mockIsAllowPublishAsCustomKnowledgePipelineTemplate.mockReturnValue(true)
-        renderWithQueryClient(<Popup />)
+        renderWithQueryClient(<Publisher />)
+
+        fireEvent.click(screen.getByText('workflow.common.publish'))
 
         const publishAsButton = screen.getAllByRole('button').find(btn =>
           btn.textContent?.includes('pipeline.common.publishAs'),
@@ -495,7 +497,9 @@ describe('publisher', () => {
       it('should close publish as knowledge pipeline modal when cancel is clicked', async () => {
         mockPublishedAt.mockReturnValue(1700000000)
         mockIsAllowPublishAsCustomKnowledgePipelineTemplate.mockReturnValue(true)
-        renderWithQueryClient(<Popup />)
+        renderWithQueryClient(<Publisher />)
+
+        fireEvent.click(screen.getByText('workflow.common.publish'))
 
         const publishAsButton = screen.getAllByRole('button').find(btn =>
           btn.textContent?.includes('pipeline.common.publishAs'),
@@ -516,7 +520,9 @@ describe('publisher', () => {
       it('should call publishAsCustomizedPipeline when confirm is clicked in modal', async () => {
         mockPublishedAt.mockReturnValue(1700000000)
         mockPublishAsCustomizedPipeline.mockResolvedValue({})
-        renderWithQueryClient(<Popup />)
+        renderWithQueryClient(<Publisher />)
+
+        fireEvent.click(screen.getByText('workflow.common.publish'))
 
         const publishAsButton = screen.getAllByRole('button').find(btn =>
           btn.textContent?.includes('pipeline.common.publishAs'),
@@ -538,6 +544,35 @@ describe('publisher', () => {
           })
         })
       })
+
+      it('should publish as template with empty pipeline id fallback', async () => {
+        mockPublishedAt.mockReturnValue(1700000000)
+        mockPipelineId.mockReturnValue(undefined as unknown as string)
+        mockPublishAsCustomizedPipeline.mockResolvedValue({})
+        renderWithQueryClient(<Publisher />)
+
+        fireEvent.click(screen.getByText('workflow.common.publish'))
+
+        const publishAsButton = screen.getAllByRole('button').find(btn =>
+          btn.textContent?.includes('pipeline.common.publishAs'),
+        )
+        fireEvent.click(publishAsButton!)
+
+        await waitFor(() => {
+          expect(screen.getByTestId('publish-as-knowledge-pipeline-modal')).toBeInTheDocument()
+        })
+
+        fireEvent.click(screen.getByTestId('modal-confirm'))
+
+        await waitFor(() => {
+          expect(mockPublishAsCustomizedPipeline).toHaveBeenCalledWith({
+            pipelineId: '',
+            name: 'Test Pipeline',
+            icon_info: { type: 'emoji', emoji: '📚', background: '#fff' },
+            description: 'Test description',
+          })
+        })
+      })
     })
 
     describe('API Calls and Async Operations', () => {
@@ -607,7 +642,9 @@ describe('publisher', () => {
       it('should show success notification for publish as template', async () => {
         mockPublishedAt.mockReturnValue(1700000000)
         mockPublishAsCustomizedPipeline.mockResolvedValue({})
-        renderWithQueryClient(<Popup />)
+        renderWithQueryClient(<Publisher />)
+
+        fireEvent.click(screen.getByText('workflow.common.publish'))
 
         const publishAsButton = screen.getAllByRole('button').find(btn =>
           btn.textContent?.includes('pipeline.common.publishAs'),
@@ -633,7 +670,9 @@ describe('publisher', () => {
       it('should invalidate customized template list after publish as template', async () => {
         mockPublishedAt.mockReturnValue(1700000000)
         mockPublishAsCustomizedPipeline.mockResolvedValue({})
-        renderWithQueryClient(<Popup />)
+        renderWithQueryClient(<Publisher />)
+
+        fireEvent.click(screen.getByText('workflow.common.publish'))
 
         const publishAsButton = screen.getAllByRole('button').find(btn =>
           btn.textContent?.includes('pipeline.common.publishAs'),
@@ -686,7 +725,9 @@ describe('publisher', () => {
       it('should show error notification when publish as template fails', async () => {
         mockPublishedAt.mockReturnValue(1700000000)
         mockPublishAsCustomizedPipeline.mockRejectedValue(new Error('Template publish failed'))
-        renderWithQueryClient(<Popup />)
+        renderWithQueryClient(<Publisher />)
+
+        fireEvent.click(screen.getByText('workflow.common.publish'))
 
         const publishAsButton = screen.getAllByRole('button').find(btn =>
           btn.textContent?.includes('pipeline.common.publishAs'),
@@ -710,7 +751,9 @@ describe('publisher', () => {
       it('should close modal after publish as template error', async () => {
         mockPublishedAt.mockReturnValue(1700000000)
         mockPublishAsCustomizedPipeline.mockRejectedValue(new Error('Template publish failed'))
-        renderWithQueryClient(<Popup />)
+        renderWithQueryClient(<Publisher />)
+
+        fireEvent.click(screen.getByText('workflow.common.publish'))
 
         const publishAsButton = screen.getAllByRole('button').find(btn =>
           btn.textContent?.includes('pipeline.common.publishAs'),
@@ -1051,7 +1094,9 @@ describe('publisher', () => {
     it('should complete full publish as template flow', async () => {
       mockPublishedAt.mockReturnValue(1700000000)
       mockPublishAsCustomizedPipeline.mockResolvedValue({})
-      renderWithQueryClient(<Popup />)
+      renderWithQueryClient(<Publisher />)
+
+      fireEvent.click(screen.getByText('workflow.common.publish'))
 
       const publishAsButton = screen.getAllByRole('button').find(btn =>
         btn.textContent?.includes('pipeline.common.publishAs'),
diff --git a/web/app/components/rag-pipeline/components/rag-pipeline-header/publisher/__tests__/popup.spec.tsx b/web/app/components/rag-pipeline/components/rag-pipeline-header/publisher/__tests__/popup.spec.tsx
index dab8046c43..6d8ee0ca04 100644
--- a/web/app/components/rag-pipeline/components/rag-pipeline-header/publisher/__tests__/popup.spec.tsx
+++ b/web/app/components/rag-pipeline/components/rag-pipeline-header/publisher/__tests__/popup.spec.tsx
@@ -327,11 +327,18 @@ describe('Popup', () => {
 
     it('should request closing the outer popover before opening publish-as modal', () => {
       const onRequestClose = vi.fn()
-      render(<Popup onRequestClose={onRequestClose} />)
+      const onShowPublishAsKnowledgePipelineModal = vi.fn()
+      render(
+        <Popup
+          onRequestClose={onRequestClose}
+          onShowPublishAsKnowledgePipelineModal={onShowPublishAsKnowledgePipelineModal}
+        />,
+      )
 
       fireEvent.click(screen.getByText('pipeline.common.publishAs'))
 
       expect(onRequestClose).toHaveBeenCalledTimes(1)
+      expect(onShowPublishAsKnowledgePipelineModal).toHaveBeenCalledTimes(1)
     })
   })
 
@@ -352,27 +359,6 @@ describe('Popup', () => {
     })
   })
 
-  describe('Publish params', () => {
-    it('should publish as template with empty pipeline id fallback', async () => {
-      mockPipelineId = undefined
-      mockUseBoolean
-        .mockImplementationOnce((initial: boolean) => [initial, { setFalse: vi.fn(), setTrue: vi.fn() }])
-        .mockImplementationOnce((initial: boolean) => [initial, { setFalse: vi.fn(), setTrue: vi.fn() }])
-        .mockImplementationOnce(() => [true, { setFalse: vi.fn(), setTrue: vi.fn() }])
-        .mockImplementationOnce((initial: boolean) => [initial, { setFalse: vi.fn(), setTrue: vi.fn() }])
-      render(<Popup />)
-
-      fireEvent.click(screen.getByTestId('publish-as-confirm'))
-
-      expect(mockPublishAsCustomizedPipeline).toHaveBeenCalledWith({
-        pipelineId: '',
-        name: 'My Pipeline',
-        icon_info: { icon_type: 'emoji' },
-        description: 'desc',
-      })
-    })
-  })
-
   describe('Time formatting', () => {
     it('should format published time', () => {
       render(<Popup />)
diff --git a/web/app/components/rag-pipeline/components/rag-pipeline-header/publisher/index.tsx b/web/app/components/rag-pipeline/components/rag-pipeline-header/publisher/index.tsx
index 1d7b13d71d..9e9f4b2b79 100644
--- a/web/app/components/rag-pipeline/components/rag-pipeline-header/publisher/index.tsx
+++ b/web/app/components/rag-pipeline/components/rag-pipeline-header/publisher/index.tsx
@@ -1,5 +1,8 @@
+import type { IconInfo } from '@/models/datasets'
 import { Button } from '@langgenius/dify-ui/button'
+import { cn } from '@langgenius/dify-ui/cn'
 import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
+import { toast } from '@langgenius/dify-ui/toast'
 import { RiArrowDownSLine } from '@remixicon/react'
 import { useBoolean } from 'ahooks'
 import {
@@ -9,6 +12,11 @@ import {
 } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useNodesSyncDraft } from '@/app/components/workflow/hooks'
+import { useStore } from '@/app/components/workflow/store'
+import { useDocLink } from '@/context/i18n'
+import Link from '@/next/link'
+import { useInvalidCustomizedTemplateList, usePublishAsCustomizedPipeline } from '@/service/use-pipeline'
+import PublishAsKnowledgePipelineModal from '../../publish-as-knowledge-pipeline-modal'
 import Popup from './popup'
 
 const Publisher = () => {
@@ -16,6 +24,12 @@ const Publisher = () => {
   const [open, setOpen] = useState(false)
   const [confirmVisible, { setFalse: hideConfirm, setTrue: showConfirm }] = useBoolean(false)
   const { handleSyncWorkflowDraft } = useNodesSyncDraft()
+  const docLink = useDocLink()
+  const pipelineId = useStore(s => s.pipelineId)
+  const { mutateAsync: publishAsCustomizedPipeline } = usePublishAsCustomizedPipeline()
+  const invalidCustomizedTemplateList = useInvalidCustomizedTemplateList()
+  const [showPublishAsKnowledgePipelineModal, setShowPublishAsKnowledgePipelineModal] = useState(false)
+  const [isPublishingAsCustomizedPipeline, setIsPublishingAsCustomizedPipeline] = useState(false)
 
   const handleOpenChange = useCallback((newOpen: boolean) => {
     if (!newOpen && confirmVisible)
@@ -27,38 +41,86 @@ const Publisher = () => {
   const closePopover = useCallback(() => {
     setOpen(false)
   }, [])
+  const openPublishAsKnowledgePipelineModal = useCallback(() => {
+    setShowPublishAsKnowledgePipelineModal(true)
+  }, [])
+  const hidePublishAsKnowledgePipelineModal = useCallback(() => {
+    setShowPublishAsKnowledgePipelineModal(false)
+  }, [])
+  const handlePublishAsKnowledgePipeline = useCallback(async (name: string, icon: IconInfo, description?: string) => {
+    try {
+      setIsPublishingAsCustomizedPipeline(true)
+      await publishAsCustomizedPipeline({
+        pipelineId: pipelineId || '',
+        name,
+        icon_info: icon,
+        description,
+      })
+      toast.success(t('publishTemplate.success.message', { ns: 'datasetPipeline' }), {
+        description: (
+          <div className="flex flex-col gap-y-1">
+            <span className="system-xs-regular text-text-secondary">
+              {t('publishTemplate.success.tip', { ns: 'datasetPipeline' })}
+            </span>
+            <Link href={docLink()} target="_blank" className="inline-block system-xs-medium-uppercase text-text-accent">
+              {t('publishTemplate.success.learnMore', { ns: 'datasetPipeline' })}
+            </Link>
+          </div>
+        ),
+      })
+      invalidCustomizedTemplateList()
+    }
+    catch {
+      toast.error(t('publishTemplate.error.message', { ns: 'datasetPipeline' }))
+    }
+    finally {
+      setIsPublishingAsCustomizedPipeline(false)
+      hidePublishAsKnowledgePipelineModal()
+    }
+  }, [docLink, hidePublishAsKnowledgePipelineModal, invalidCustomizedTemplateList, pipelineId, publishAsCustomizedPipeline, t])
 
   return (
-    <Popover
-      open={open}
-      onOpenChange={handleOpenChange}
-    >
-      <PopoverTrigger
-        nativeButton
-        render={(
-          <Button
-            className="px-2"
-            variant="primary"
-          >
-            <span className="pl-1">{t('common.publish', { ns: 'workflow' })}</span>
-            <RiArrowDownSLine className="h-4 w-4" />
-          </Button>
-        )}
-      />
-      <PopoverContent
-        placement="bottom-end"
-        sideOffset={4}
-        alignOffset={40}
-        popupClassName="border-none bg-transparent shadow-none"
+    <>
+      <Popover
+        open={open}
+        onOpenChange={handleOpenChange}
       >
-        <Popup
-          onRequestClose={closePopover}
-          confirmVisible={confirmVisible}
-          onShowConfirm={showConfirm}
-          onHideConfirm={hideConfirm}
+        <PopoverTrigger
+          nativeButton
+          render={(
+            <Button
+              className="px-2"
+              variant="primary"
+            >
+              <span className="pl-1">{t('common.publish', { ns: 'workflow' })}</span>
+              <RiArrowDownSLine className="h-4 w-4" />
+            </Button>
+          )}
         />
-      </PopoverContent>
-    </Popover>
+        <PopoverContent
+          placement="bottom-end"
+          sideOffset={4}
+          alignOffset={40}
+          popupClassName={cn('border-none bg-transparent shadow-none', confirmVisible && 'hidden')}
+        >
+          <Popup
+            onRequestClose={closePopover}
+            confirmVisible={confirmVisible}
+            onShowConfirm={showConfirm}
+            onHideConfirm={hideConfirm}
+            isPublishingAsCustomizedPipeline={isPublishingAsCustomizedPipeline}
+            onShowPublishAsKnowledgePipelineModal={openPublishAsKnowledgePipelineModal}
+          />
+        </PopoverContent>
+      </Popover>
+      {showPublishAsKnowledgePipelineModal && (
+        <PublishAsKnowledgePipelineModal
+          confirmDisabled={isPublishingAsCustomizedPipeline}
+          onConfirm={handlePublishAsKnowledgePipeline}
+          onCancel={hidePublishAsKnowledgePipelineModal}
+        />
+      )}
+    </>
   )
 }
 
diff --git a/web/app/components/rag-pipeline/components/rag-pipeline-header/publisher/popup.tsx b/web/app/components/rag-pipeline/components/rag-pipeline-header/publisher/popup.tsx
index 0970d66cfc..ba18f2d963 100644
--- a/web/app/components/rag-pipeline/components/rag-pipeline-header/publisher/popup.tsx
+++ b/web/app/components/rag-pipeline/components/rag-pipeline-header/publisher/popup.tsx
@@ -1,4 +1,3 @@
-import type { IconInfo } from '@/models/datasets'
 import type { PublishWorkflowParams } from '@/types/workflow'
 import {
   AlertDialog,
@@ -25,7 +24,6 @@ import ShortcutsName from '@/app/components/workflow/shortcuts-name'
 import { useStore, useWorkflowStore } from '@/app/components/workflow/store'
 import { getKeyboardKeyCodeBySystem } from '@/app/components/workflow/utils'
 import { useDatasetDetailContextWithSelector } from '@/context/dataset-detail'
-import { useDocLink } from '@/context/i18n'
 import { useModalContextSelector } from '@/context/modal-context'
 import { useProviderContextSelector } from '@/context/provider-context'
 import { useDatasetApiAccessUrl } from '@/hooks/use-api-access-url'
@@ -34,9 +32,8 @@ import Link from '@/next/link'
 import { useParams, useRouter } from '@/next/navigation'
 import { useInvalidDatasetList } from '@/service/knowledge/use-dataset'
 import { useInvalid } from '@/service/use-base'
-import { publishedPipelineInfoQueryKeyPrefix, useInvalidCustomizedTemplateList, usePublishAsCustomizedPipeline } from '@/service/use-pipeline'
+import { publishedPipelineInfoQueryKeyPrefix } from '@/service/use-pipeline'
 import { usePublishWorkflow } from '@/service/use-workflow'
-import PublishAsKnowledgePipelineModal from '../../publish-as-knowledge-pipeline-modal'
 
 const PUBLISH_SHORTCUT = ['ctrl', '⇧', 'P']
 type PopupProps = {
@@ -44,6 +41,8 @@ type PopupProps = {
   confirmVisible?: boolean
   onShowConfirm?: () => void
   onHideConfirm?: () => void
+  isPublishingAsCustomizedPipeline?: boolean
+  onShowPublishAsKnowledgePipelineModal?: () => void
 }
 
 const Popup = ({
@@ -51,11 +50,12 @@ const Popup = ({
   confirmVisible: controlledConfirmVisible,
   onShowConfirm,
   onHideConfirm,
+  isPublishingAsCustomizedPipeline = false,
+  onShowPublishAsKnowledgePipelineModal,
 }: PopupProps) => {
   const { t } = useTranslation()
   const { datasetId } = useParams()
   const { push } = useRouter()
-  const docLink = useDocLink()
   const publishedAt = useStore(s => s.publishedAt)
   const draftUpdatedAt = useStore(s => s.draftUpdatedAt)
   const pipelineId = useStore(s => s.pipelineId)
@@ -73,9 +73,6 @@ const Popup = ({
   const showConfirm = onShowConfirm ?? showLocalConfirm
   const hideConfirm = onHideConfirm ?? hideLocalConfirm
   const [publishing, { setFalse: hidePublishing, setTrue: showPublishing }] = useBoolean(false)
-  const { mutateAsync: publishAsCustomizedPipeline } = usePublishAsCustomizedPipeline()
-  const [showPublishAsKnowledgePipelineModal, { setFalse: hidePublishAsKnowledgePipelineModal, setTrue: setShowPublishAsKnowledgePipelineModal }] = useBoolean(false)
-  const [isPublishingAsCustomizedPipeline, { setFalse: hidePublishingAsCustomizedPipeline, setTrue: showPublishingAsCustomizedPipeline }] = useBoolean(false)
   const invalidPublishedPipelineInfo = useInvalid([...publishedPipelineInfoQueryKeyPrefix, pipelineId])
   const invalidDatasetList = useInvalidDatasetList()
   const handleHideConfirm = useCallback(() => {
@@ -145,47 +142,15 @@ const Popup = ({
   const goToAddDocuments = useCallback(() => {
     push(`/datasets/${datasetId}/documents/create-from-pipeline`)
   }, [datasetId, push])
-  const invalidCustomizedTemplateList = useInvalidCustomizedTemplateList()
-  const handlePublishAsKnowledgePipeline = useCallback(async (name: string, icon: IconInfo, description?: string) => {
-    try {
-      showPublishingAsCustomizedPipeline()
-      await publishAsCustomizedPipeline({
-        pipelineId: pipelineId || '',
-        name,
-        icon_info: icon,
-        description,
-      })
-      toast.success(t('publishTemplate.success.message', { ns: 'datasetPipeline' }), {
-        description: (
-          <div className="flex flex-col gap-y-1">
-            <span className="system-xs-regular text-text-secondary">
-              {t('publishTemplate.success.tip', { ns: 'datasetPipeline' })}
-            </span>
-            <Link href={docLink()} target="_blank" className="inline-block system-xs-medium-uppercase text-text-accent">
-              {t('publishTemplate.success.learnMore', { ns: 'datasetPipeline' })}
-            </Link>
-          </div>
-        ),
-      })
-      invalidCustomizedTemplateList()
-    }
-    catch {
-      toast.error(t('publishTemplate.error.message', { ns: 'datasetPipeline' }))
-    }
-    finally {
-      hidePublishingAsCustomizedPipeline()
-      hidePublishAsKnowledgePipelineModal()
-    }
-  }, [showPublishingAsCustomizedPipeline, publishAsCustomizedPipeline, pipelineId, t, invalidCustomizedTemplateList, hidePublishingAsCustomizedPipeline, hidePublishAsKnowledgePipelineModal, docLink])
   const handleClickPublishAsKnowledgePipeline = useCallback(() => {
     onRequestClose?.()
     if (!isAllowPublishAsCustomKnowledgePipelineTemplate) {
       setShowPricingModal()
     }
     else {
-      setShowPublishAsKnowledgePipelineModal()
+      onShowPublishAsKnowledgePipelineModal?.()
     }
-  }, [isAllowPublishAsCustomKnowledgePipelineTemplate, onRequestClose, setShowPublishAsKnowledgePipelineModal, setShowPricingModal])
+  }, [isAllowPublishAsCustomKnowledgePipelineTemplate, onRequestClose, onShowPublishAsKnowledgePipelineModal, setShowPricingModal])
   return (
     <div className={cn('rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-xl shadow-shadow-shadow-5', isAllowPublishAsCustomKnowledgePipelineTemplate ? 'w-[360px]' : 'w-[400px]')}>
       <div className="p-4 pt-3">
@@ -246,8 +211,8 @@ const Popup = ({
               {t('common.publishAs', { ns: 'pipeline' })}
             </span>
             {!isAllowPublishAsCustomKnowledgePipelineTemplate && (
-              <PremiumBadge className="shrink-0 cursor-pointer select-none" size="s" color="indigo">
-                <SparklesSoft className="flex size-3 items-center text-components-premium-badge-indigo-text-stop-0" />
+              <PremiumBadge className="shrink-0 select-none" size="s" color="indigo">
+                <SparklesSoft aria-hidden="true" className="flex size-3 items-center text-components-premium-badge-indigo-text-stop-0" />
                 <span className="p-0.5 system-2xs-medium">
                   {t('upgradeBtn.encourageShort', { ns: 'billing' })}
                 </span>
@@ -279,7 +244,6 @@ const Popup = ({
           </AlertDialogActions>
         </AlertDialogContent>
       </AlertDialog>
-      {showPublishAsKnowledgePipelineModal && (<PublishAsKnowledgePipelineModal confirmDisabled={isPublishingAsCustomizedPipeline} onConfirm={handlePublishAsKnowledgePipeline} onCancel={hidePublishAsKnowledgePipelineModal} />)}
     </div>
   )
 }
diff --git a/web/app/components/rag-pipeline/components/update-dsl-modal.tsx b/web/app/components/rag-pipeline/components/update-dsl-modal.tsx
index 742c29a6da..7a597c911b 100644
--- a/web/app/components/rag-pipeline/components/update-dsl-modal.tsx
+++ b/web/app/components/rag-pipeline/components/update-dsl-modal.tsx
@@ -1,6 +1,7 @@
 'use client'
 
 import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import {
   RiAlertFill,
   RiCloseLine,
@@ -9,7 +10,6 @@ import {
 import { memo } from 'react'
 import { useTranslation } from 'react-i18next'
 import Uploader from '@/app/components/app/create-from-dsl-modal/uploader'
-import Modal from '@/app/components/base/modal'
 import { useUpdateDSLModal } from '../hooks/use-update-dsl-modal'
 import VersionMismatchModal from './version-mismatch-modal'
 
@@ -39,66 +39,76 @@ const UpdateDSLModal = ({
 
   return (
     <>
-      <Modal
-        className="w-[520px] rounded-2xl p-6"
-        isShow={show}
-        onClose={onCancel}
+      <Dialog
+        open={show}
+        onOpenChange={(open) => {
+          if (!open)
+            onCancel()
+        }}
       >
-        <div className="mb-3 flex items-center justify-between">
-          <div className="title-2xl-semi-bold text-text-primary">{t('common.importDSL', { ns: 'workflow' })}</div>
-          <div className="flex h-[22px] w-[22px] cursor-pointer items-center justify-center" onClick={onCancel}>
-            <RiCloseLine className="h-[18px] w-[18px] text-text-tertiary" />
+        <DialogContent className="w-full max-w-[480px]! overflow-hidden! rounded-2xl border-none p-6 text-left align-middle">
+
+          <div className="mb-3 flex items-center justify-between">
+            <div className="title-2xl-semi-bold text-text-primary">{t('common.importDSL', { ns: 'workflow' })}</div>
+            <button
+              type="button"
+              className="flex h-[22px] w-[22px] cursor-pointer items-center justify-center border-none bg-transparent p-0 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+              aria-label={t('operation.close', { ns: 'common' })}
+              onClick={onCancel}
+            >
+              <RiCloseLine className="h-[18px] w-[18px] text-text-tertiary" aria-hidden="true" />
+            </button>
           </div>
-        </div>
-        <div className="relative mb-2 flex grow gap-0.5 overflow-hidden rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur p-2 shadow-xs">
-          <div className="absolute top-0 left-0 h-full w-full bg-toast-warning-bg opacity-40" />
-          <div className="flex items-start justify-center p-1">
-            <RiAlertFill className="h-4 w-4 shrink-0 text-text-warning-secondary" />
-          </div>
-          <div className="flex grow flex-col items-start gap-0.5 py-1">
-            <div className="system-xs-medium whitespace-pre-line text-text-primary">{t('common.importDSLTip', { ns: 'workflow' })}</div>
-            <div className="flex items-start gap-1 self-stretch pt-1 pb-0.5">
-              <Button
-                size="small"
-                variant="secondary"
-                className="z-1000"
-                onClick={onBackup}
-              >
-                <RiFileDownloadLine className="h-3.5 w-3.5 text-components-button-secondary-text" />
-                <div className="flex items-center justify-center gap-1 px-[3px]">
-                  {t('common.backupCurrentDraft', { ns: 'workflow' })}
-                </div>
-              </Button>
+          <div className="relative mb-2 flex grow gap-0.5 overflow-hidden rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur p-2 shadow-xs">
+            <div className="absolute top-0 left-0 h-full w-full bg-toast-warning-bg opacity-40" />
+            <div className="flex items-start justify-center p-1">
+              <RiAlertFill className="h-4 w-4 shrink-0 text-text-warning-secondary" />
+            </div>
+            <div className="flex grow flex-col items-start gap-0.5 py-1">
+              <div className="system-xs-medium whitespace-pre-line text-text-primary">{t('common.importDSLTip', { ns: 'workflow' })}</div>
+              <div className="flex items-start gap-1 self-stretch pt-1 pb-0.5">
+                <Button
+                  size="small"
+                  variant="secondary"
+                  className="z-1000"
+                  onClick={onBackup}
+                >
+                  <RiFileDownloadLine className="h-3.5 w-3.5 text-components-button-secondary-text" />
+                  <div className="flex items-center justify-center gap-1 px-[3px]">
+                    {t('common.backupCurrentDraft', { ns: 'workflow' })}
+                  </div>
+                </Button>
+              </div>
             </div>
           </div>
-        </div>
-        <div>
-          <div className="pt-2 system-md-semibold text-text-primary">
-            {t('common.chooseDSL', { ns: 'workflow' })}
+          <div>
+            <div className="pt-2 system-md-semibold text-text-primary">
+              {t('common.chooseDSL', { ns: 'workflow' })}
+            </div>
+            <div className="flex w-full flex-col items-start justify-center gap-4 self-stretch py-4">
+              <Uploader
+                file={currentFile}
+                updateFile={handleFile}
+                className="mt-0! w-full"
+                accept=".pipeline"
+                displayName="PIPELINE"
+              />
+            </div>
           </div>
-          <div className="flex w-full flex-col items-start justify-center gap-4 self-stretch py-4">
-            <Uploader
-              file={currentFile}
-              updateFile={handleFile}
-              className="mt-0! w-full"
-              accept=".pipeline"
-              displayName="PIPELINE"
-            />
+          <div className="flex items-center justify-end gap-2 self-stretch pt-5">
+            <Button onClick={onCancel}>{t('newApp.Cancel', { ns: 'app' })}</Button>
+            <Button
+              disabled={!currentFile || loading}
+              variant="primary"
+              tone="destructive"
+              onClick={handleImport}
+              loading={loading}
+            >
+              {t('common.overwriteAndImport', { ns: 'workflow' })}
+            </Button>
           </div>
-        </div>
-        <div className="flex items-center justify-end gap-2 self-stretch pt-5">
-          <Button onClick={onCancel}>{t('newApp.Cancel', { ns: 'app' })}</Button>
-          <Button
-            disabled={!currentFile || loading}
-            variant="primary"
-            tone="destructive"
-            onClick={handleImport}
-            loading={loading}
-          >
-            {t('common.overwriteAndImport', { ns: 'workflow' })}
-          </Button>
-        </div>
-      </Modal>
+        </DialogContent>
+      </Dialog>
       <VersionMismatchModal
         isShow={showErrorModal}
         versions={versions}
diff --git a/web/app/components/rag-pipeline/components/version-mismatch-modal.tsx b/web/app/components/rag-pipeline/components/version-mismatch-modal.tsx
index dc50e972e9..221757de02 100644
--- a/web/app/components/rag-pipeline/components/version-mismatch-modal.tsx
+++ b/web/app/components/rag-pipeline/components/version-mismatch-modal.tsx
@@ -1,7 +1,14 @@
 import type { MouseEventHandler } from 'react'
-import { Button } from '@langgenius/dify-ui/button'
+import {
+  AlertDialog,
+  AlertDialogActions,
+  AlertDialogCancelButton,
+  AlertDialogConfirmButton,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogTitle,
+} from '@langgenius/dify-ui/alert-dialog'
 import { useTranslation } from 'react-i18next'
-import Modal from '@/app/components/base/modal'
 
 type VersionMismatchModalProps = {
   isShow: boolean
@@ -22,32 +29,36 @@ const VersionMismatchModal = ({
   const { t } = useTranslation()
 
   return (
-    <Modal
-      isShow={isShow}
-      onClose={onClose}
-      className="w-[480px]"
+    <AlertDialog
+      open={isShow}
+      onOpenChange={(open) => {
+        if (!open)
+          onClose()
+      }}
     >
-      <div className="flex flex-col items-start gap-2 self-stretch pb-4">
-        <div className="title-2xl-semi-bold text-text-primary">{t('newApp.appCreateDSLErrorTitle', { ns: 'app' })}</div>
-        <div className="flex grow flex-col system-md-regular text-text-secondary">
-          <div>{t('newApp.appCreateDSLErrorPart1', { ns: 'app' })}</div>
-          <div>{t('newApp.appCreateDSLErrorPart2', { ns: 'app' })}</div>
-          <br />
-          <div>
-            {t('newApp.appCreateDSLErrorPart3', { ns: 'app' })}
-            <span className="system-md-medium">{versions?.importedVersion}</span>
-          </div>
-          <div>
-            {t('newApp.appCreateDSLErrorPart4', { ns: 'app' })}
-            <span className="system-md-medium">{versions?.systemVersion}</span>
-          </div>
+      <AlertDialogContent className="w-[480px] max-w-none! overflow-hidden! border-none p-6 text-left align-middle shadow-xl">
+        <div className="flex flex-col items-start gap-2 self-stretch pb-4">
+          <AlertDialogTitle className="title-2xl-semi-bold text-text-primary">{t('newApp.appCreateDSLErrorTitle', { ns: 'app' })}</AlertDialogTitle>
+          <AlertDialogDescription render={<div />} className="flex grow flex-col system-md-regular text-text-secondary">
+            <div>{t('newApp.appCreateDSLErrorPart1', { ns: 'app' })}</div>
+            <div>{t('newApp.appCreateDSLErrorPart2', { ns: 'app' })}</div>
+            <br />
+            <div>
+              {t('newApp.appCreateDSLErrorPart3', { ns: 'app' })}
+              <span className="system-md-medium">{versions?.importedVersion}</span>
+            </div>
+            <div>
+              {t('newApp.appCreateDSLErrorPart4', { ns: 'app' })}
+              <span className="system-md-medium">{versions?.systemVersion}</span>
+            </div>
+          </AlertDialogDescription>
         </div>
-      </div>
-      <div className="flex items-start justify-end gap-2 self-stretch pt-6">
-        <Button variant="secondary" onClick={onClose}>{t('newApp.Cancel', { ns: 'app' })}</Button>
-        <Button variant="primary" tone="destructive" onClick={onConfirm}>{t('newApp.Confirm', { ns: 'app' })}</Button>
-      </div>
-    </Modal>
+        <AlertDialogActions className="items-start p-0 pt-6">
+          <AlertDialogCancelButton variant="secondary">{t('newApp.Cancel', { ns: 'app' })}</AlertDialogCancelButton>
+          <AlertDialogConfirmButton onClick={onConfirm}>{t('newApp.Confirm', { ns: 'app' })}</AlertDialogConfirmButton>
+        </AlertDialogActions>
+      </AlertDialogContent>
+    </AlertDialog>
   )
 }
 
diff --git a/web/app/components/rag-pipeline/hooks/__tests__/use-pipeline-config.spec.ts b/web/app/components/rag-pipeline/hooks/__tests__/use-pipeline-config.spec.ts
index 412fd299d1..a57f255c6f 100644
--- a/web/app/components/rag-pipeline/hooks/__tests__/use-pipeline-config.spec.ts
+++ b/web/app/components/rag-pipeline/hooks/__tests__/use-pipeline-config.spec.ts
@@ -175,7 +175,7 @@ describe('usePipelineConfig', () => {
       expect(mockSetPublishedAt).toHaveBeenCalledWith('2024-01-01T00:00:00Z')
     })
 
-    it('should handle undefined workflow response', () => {
+    it('should reset published at when workflow response is empty', () => {
       let capturedCallback: ((data: unknown) => void) | undefined
       mockUseWorkflowConfig.mockImplementation((url: string, callback: (data: unknown) => void) => {
         if (url.includes('/publish')) {
@@ -187,7 +187,7 @@ describe('usePipelineConfig', () => {
 
       capturedCallback?.(undefined)
 
-      expect(mockSetPublishedAt).toHaveBeenCalledWith(undefined)
+      expect(mockSetPublishedAt).toHaveBeenCalledWith(0)
     })
   })
 
diff --git a/web/app/components/rag-pipeline/hooks/__tests__/use-update-dsl-modal.spec.ts b/web/app/components/rag-pipeline/hooks/__tests__/use-update-dsl-modal.spec.ts
index 2449bcc605..6876df9014 100644
--- a/web/app/components/rag-pipeline/hooks/__tests__/use-update-dsl-modal.spec.ts
+++ b/web/app/components/rag-pipeline/hooks/__tests__/use-update-dsl-modal.spec.ts
@@ -340,6 +340,7 @@ describe('useUpdateDSLModal', () => {
         id: 'import-id',
         status: DSLImportStatus.FAILED,
         pipeline_id: 'test-pipeline-id',
+        error: 'Missing rag_pipeline data in YAML content',
       })
 
       const { result } = renderUpdateDSLModal()
@@ -351,7 +352,10 @@ describe('useUpdateDSLModal', () => {
         await (result.current.handleImport as unknown as AsyncFn)()
       })
 
-      expect(toastMocks.call).toHaveBeenCalledWith(expect.objectContaining({ type: 'error' }))
+      expect(toastMocks.call).toHaveBeenCalledWith({
+        type: 'error',
+        message: 'Missing rag_pipeline data in YAML content',
+      })
     })
 
     it('should notify error when importDSL throws', async () => {
@@ -369,6 +373,29 @@ describe('useUpdateDSLModal', () => {
       expect(toastMocks.call).toHaveBeenCalledWith(expect.objectContaining({ type: 'error' }))
     })
 
+    it('should notify response error when importDSL rejects with a response body', async () => {
+      mockImportDSL.mockRejectedValue(new Response(JSON.stringify({
+        error: 'Missing rag_pipeline data in YAML content',
+      }), {
+        status: 400,
+        headers: { 'Content-Type': 'application/json' },
+      }))
+
+      const { result } = renderUpdateDSLModal()
+      act(() => {
+        result.current.handleFile(createFile())
+      })
+
+      await act(async () => {
+        await (result.current.handleImport as unknown as AsyncFn)()
+      })
+
+      expect(toastMocks.call).toHaveBeenCalledWith({
+        type: 'error',
+        message: 'Missing rag_pipeline data in YAML content',
+      })
+    })
+
     it('should notify error when pipeline_id is missing on success', async () => {
       mockImportDSL.mockResolvedValue({
         id: 'import-id',
@@ -468,6 +495,7 @@ describe('useUpdateDSLModal', () => {
       mockImportDSLConfirm.mockResolvedValue({
         status: DSLImportStatus.FAILED,
         pipeline_id: 'test-pipeline-id',
+        error: 'Import information expired or does not exist',
       })
 
       const { result } = renderUpdateDSLModal()
@@ -477,7 +505,10 @@ describe('useUpdateDSLModal', () => {
         await (result.current.onUpdateDSLConfirm as unknown as AsyncFn)()
       })
 
-      expect(toastMocks.call).toHaveBeenCalledWith(expect.objectContaining({ type: 'error' }))
+      expect(toastMocks.call).toHaveBeenCalledWith({
+        type: 'error',
+        message: 'Import information expired or does not exist',
+      })
     })
 
     it('should notify error when confirm throws exception', async () => {
@@ -493,6 +524,27 @@ describe('useUpdateDSLModal', () => {
       expect(toastMocks.call).toHaveBeenCalledWith(expect.objectContaining({ type: 'error' }))
     })
 
+    it('should notify response error when confirm rejects with a response body', async () => {
+      mockImportDSLConfirm.mockRejectedValue(new Response(JSON.stringify({
+        error: 'Import information expired or does not exist',
+      }), {
+        status: 400,
+        headers: { 'Content-Type': 'application/json' },
+      }))
+
+      const { result } = renderUpdateDSLModal()
+      await setupPendingState(result)
+
+      await act(async () => {
+        await (result.current.onUpdateDSLConfirm as unknown as AsyncFn)()
+      })
+
+      expect(toastMocks.call).toHaveBeenCalledWith({
+        type: 'error',
+        message: 'Import information expired or does not exist',
+      })
+    })
+
     it('should notify error when confirm succeeds but pipeline_id is missing', async () => {
       mockImportDSLConfirm.mockResolvedValue({
         status: DSLImportStatus.COMPLETED,
diff --git a/web/app/components/rag-pipeline/hooks/use-pipeline-config.ts b/web/app/components/rag-pipeline/hooks/use-pipeline-config.ts
index 1d1b214624..b1871248fc 100644
--- a/web/app/components/rag-pipeline/hooks/use-pipeline-config.ts
+++ b/web/app/components/rag-pipeline/hooks/use-pipeline-config.ts
@@ -33,10 +33,10 @@ export const usePipelineConfig = () => {
     handleUpdateNodesDefaultConfigs,
   )
 
-  const handleUpdatePublishedAt = useCallback((publishedWorkflow: FetchWorkflowDraftResponse) => {
+  const handleUpdatePublishedAt = useCallback((publishedWorkflow: FetchWorkflowDraftResponse | null) => {
     const { setPublishedAt } = workflowStore.getState()
 
-    setPublishedAt(publishedWorkflow?.created_at)
+    setPublishedAt(publishedWorkflow?.created_at ?? 0)
   }, [workflowStore])
   useWorkflowConfig(
     pipelineId ? `/rag/pipelines/${pipelineId}/workflows/publish` : '',
diff --git a/web/app/components/rag-pipeline/hooks/use-update-dsl-modal.ts b/web/app/components/rag-pipeline/hooks/use-update-dsl-modal.ts
index 7271279996..0d12a0a881 100644
--- a/web/app/components/rag-pipeline/hooks/use-update-dsl-modal.ts
+++ b/web/app/components/rag-pipeline/hooks/use-update-dsl-modal.ts
@@ -15,11 +15,36 @@ type VersionInfo = {
   importedVersion: string
   systemVersion: string
 }
+type ImportErrorResponse = {
+  message?: unknown
+  error?: unknown
+}
 type UseUpdateDSLModalParams = {
   onCancel: () => void
   onImport?: () => void
 }
 const isCompletedStatus = (status: DSLImportStatus): boolean => status === DSLImportStatus.COMPLETED || status === DSLImportStatus.COMPLETED_WITH_WARNINGS
+const getNonEmptyString = (value: unknown): string | undefined => {
+  if (typeof value !== 'string')
+    return undefined
+
+  const trimmedValue = value.trim()
+  return trimmedValue || undefined
+}
+const getImportErrorMessage = async (error: unknown): Promise<string | undefined> => {
+  if (error instanceof Response && !error.bodyUsed) {
+    try {
+      const errorData = await error.clone().json() as ImportErrorResponse
+      return getNonEmptyString(errorData.message) ?? getNonEmptyString(errorData.error)
+    }
+    catch {}
+  }
+
+  if (error instanceof Error)
+    return getNonEmptyString(error.message)
+
+  return undefined
+}
 export const useUpdateDSLModal = ({ onCancel, onImport }: UseUpdateDSLModalParams) => {
   const { t } = useTranslation()
   const { eventEmitter } = useEventEmitterContextContext()
@@ -52,9 +77,9 @@ export const useUpdateDSLModal = ({ onCancel, onImport }: UseUpdateDSLModalParam
     if (!file)
       setFileContent('')
   }
-  const notifyError = useCallback(() => {
+  const notifyError = useCallback((message?: string) => {
     setLoading(false)
-    toast.error(t('common.importFailure', { ns: 'workflow' }))
+    toast.error(message || t('common.importFailure', { ns: 'workflow' }))
   }, [t])
   const updateWorkflow = useCallback(async (pipelineId: string) => {
     const { graph, hash, rag_pipeline_variables } = await fetchWorkflowDraft(`/rag/pipelines/${pipelineId}/workflows/draft`)
@@ -117,10 +142,10 @@ export const useUpdateDSLModal = ({ onCancel, onImport }: UseUpdateDSLModalParam
       else if (status === DSLImportStatus.PENDING)
         showVersionMismatch(id, imported_dsl_version, current_dsl_version)
       else
-        notifyError()
+        notifyError(response.error)
     }
-    catch {
-      notifyError()
+    catch (error) {
+      notifyError(await getImportErrorMessage(error))
     }
     isCreatingRef.current = false
   }, [currentFile, fileContent, workflowStore, importDSL, completeImport, showVersionMismatch, notifyError])
@@ -128,16 +153,16 @@ export const useUpdateDSLModal = ({ onCancel, onImport }: UseUpdateDSLModalParam
     if (!importId)
       return
     try {
-      const { status, pipeline_id } = await importDSLConfirm(importId)
+      const { status, pipeline_id, error } = await importDSLConfirm(importId)
       if (status === DSLImportStatus.COMPLETED) {
         await completeImport(pipeline_id)
         return
       }
       if (status === DSLImportStatus.FAILED)
-        notifyError()
+        notifyError(error)
     }
-    catch {
-      notifyError()
+    catch (error) {
+      notifyError(await getImportErrorMessage(error))
     }
   }, [importId, importDSLConfirm, completeImport, notifyError])
   return {
diff --git a/web/app/components/share/text-generation/__tests__/info-modal.spec.tsx b/web/app/components/share/text-generation/__tests__/info-modal.spec.tsx
index 972c22dfce..63a15604c2 100644
--- a/web/app/components/share/text-generation/__tests__/info-modal.spec.tsx
+++ b/web/app/components/share/text-generation/__tests__/info-modal.spec.tsx
@@ -72,10 +72,10 @@ describe('InfoModal', () => {
       expect(screen.getByText('Test App')).toBeInTheDocument()
     })
 
-    it('should render copyright when provided', async () => {
+    it('should render copyright in the full rights reserved format when provided', async () => {
       const siteInfoWithCopyright: SiteInfo = {
         ...baseSiteInfo,
-        copyright: 'Dify Inc.',
+        copyright: 'Dify AI',
       }
 
       await renderModal(
@@ -86,7 +86,8 @@ describe('InfoModal', () => {
         />,
       )
 
-      expect(screen.getByText(/Dify Inc./)).toBeInTheDocument()
+      const currentYear = new Date().getFullYear().toString()
+      expect(screen.getByText(`Copyright © ${currentYear} Dify AI. All Rights Reserved.`)).toBeInTheDocument()
     })
 
     it('should render current year in copyright', async () => {
diff --git a/web/app/components/share/text-generation/__tests__/text-generation-result-panel.spec.tsx b/web/app/components/share/text-generation/__tests__/text-generation-result-panel.spec.tsx
index e0d361eefb..b54534eb3c 100644
--- a/web/app/components/share/text-generation/__tests__/text-generation-result-panel.spec.tsx
+++ b/web/app/components/share/text-generation/__tests__/text-generation-result-panel.spec.tsx
@@ -151,10 +151,10 @@ describe('TextGenerationResultPanel', () => {
       values: baseProps.exportRes,
     }))
     expect(screen.getByText('share.generation.batchFailed.info:{"num":1}'))!.toBeInTheDocument()
-    expect(screen.getByText('share.generation.batchFailed.retry'))!.toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'share.generation.batchFailed.retry' }))!.toBeInTheDocument()
     expect(screen.getByRole('status', { name: 'appApi.loading' }))!.toBeInTheDocument()
 
-    fireEvent.click(screen.getByText('share.generation.batchFailed.retry'))
+    fireEvent.click(screen.getByRole('button', { name: 'share.generation.batchFailed.retry' }))
     expect(handleRetryAllFailedTask).toHaveBeenCalledTimes(1)
   })
 
diff --git a/web/app/components/share/text-generation/hooks/__tests__/use-text-generation-app-state.spec.ts b/web/app/components/share/text-generation/hooks/__tests__/use-text-generation-app-state.spec.ts
index df8dcf3f98..67fbe59339 100644
--- a/web/app/components/share/text-generation/hooks/__tests__/use-text-generation-app-state.spec.ts
+++ b/web/app/components/share/text-generation/hooks/__tests__/use-text-generation-app-state.spec.ts
@@ -11,6 +11,7 @@ const renderHook = <Result, Props = void>(callback: (props: Props) => Result) =>
 const {
   changeLanguageMock,
   fetchSavedMessageMock,
+  getRawInputsFromUrlParamsMock,
   notifyMock,
   removeMessageMock,
   saveMessageMock,
@@ -19,6 +20,7 @@ const {
 } = vi.hoisted(() => ({
   changeLanguageMock: vi.fn(() => Promise.resolve()),
   fetchSavedMessageMock: vi.fn(),
+  getRawInputsFromUrlParamsMock: vi.fn(),
   notifyMock: vi.fn(),
   removeMessageMock: vi.fn(),
   saveMessageMock: vi.fn(),
@@ -50,6 +52,10 @@ vi.mock('@/i18n-config/client', () => ({
   changeLanguage: changeLanguageMock,
 }))
 
+vi.mock('@/app/components/base/chat/utils', () => ({
+  getRawInputsFromUrlParams: getRawInputsFromUrlParamsMock,
+}))
+
 vi.mock('@/service/share', async () => {
   const actual = await vi.importActual<typeof import('@/service/share')>('@/service/share')
   return {
@@ -102,7 +108,7 @@ const defaultAppParams = {
         hide: false,
       },
     },
-  ],
+  ] as Record<string, Record<string, unknown>>[],
   more_like_this: {
     enabled: true,
   },
@@ -175,6 +181,7 @@ describe('useTextGenerationAppState', () => {
     })
     removeMessageMock.mockResolvedValue(undefined)
     saveMessageMock.mockResolvedValue(undefined)
+    getRawInputsFromUrlParamsMock.mockResolvedValue({})
   })
 
   it('should initialize app state and fetch saved messages for non-workflow web apps', async () => {
@@ -295,4 +302,239 @@ describe('useTextGenerationAppState', () => {
       enable: false,
     }))
   })
+
+  it('should apply workflow launch inputs from the url to hidden prompt variables', async () => {
+    mockWebAppState.appParams = {
+      ...defaultAppParams,
+      user_input_form: [
+        {
+          'text-input': {
+            label: 'Visible',
+            variable: 'visible',
+            required: true,
+            max_length: 48,
+            default: 'Shown',
+            hide: false,
+          },
+        },
+        {
+          'text-input': {
+            label: 'Hidden Secret',
+            variable: 'secret',
+            required: true,
+            max_length: 48,
+            default: '',
+            hide: true,
+          },
+        },
+      ],
+    }
+    getRawInputsFromUrlParamsMock.mockResolvedValue({
+      secret: 'prefilled-secret',
+    })
+
+    const { result } = renderHook(() => useTextGenerationAppState({
+      isInstalledApp: false,
+      isWorkflow: true,
+    }))
+
+    await waitFor(() => {
+      expect(result.current.promptConfig?.prompt_variables).toEqual(expect.arrayContaining([
+        expect.objectContaining({
+          key: 'visible',
+          default: 'Shown',
+        }),
+        expect.objectContaining({
+          key: 'secret',
+          hide: true,
+          default: 'prefilled-secret',
+        }),
+      ]))
+    })
+
+    expect(getRawInputsFromUrlParamsMock).toHaveBeenCalled()
+    expect(fetchSavedMessageMock).not.toHaveBeenCalled()
+  })
+
+  it('should coerce checkbox url defaults from string and boolean values', async () => {
+    mockWebAppState.appParams = {
+      ...defaultAppParams,
+      user_input_form: [
+        {
+          checkbox: {
+            label: 'Bool True',
+            variable: 'bool_true',
+            required: false,
+            default: false,
+            hide: true,
+          },
+        },
+        {
+          checkbox: {
+            label: 'String True',
+            variable: 'str_true',
+            required: false,
+            default: false,
+            hide: true,
+          },
+        },
+        {
+          checkbox: {
+            label: 'String False',
+            variable: 'str_false',
+            required: false,
+            default: true,
+            hide: true,
+          },
+        },
+        {
+          checkbox: {
+            label: 'Invalid',
+            variable: 'invalid_cb',
+            required: false,
+            default: false,
+            hide: true,
+          },
+        },
+      ],
+    }
+    getRawInputsFromUrlParamsMock.mockResolvedValue({
+      bool_true: true,
+      str_true: 'true',
+      str_false: 'false',
+      invalid_cb: 'invalid',
+    })
+
+    const { result } = renderHook(() => useTextGenerationAppState({
+      isInstalledApp: false,
+      isWorkflow: true,
+    }))
+
+    await waitFor(() => {
+      expect(result.current.promptConfig?.prompt_variables).toEqual(expect.arrayContaining([
+        expect.objectContaining({ key: 'bool_true', default: true }),
+        expect.objectContaining({ key: 'str_true', default: true }),
+        expect.objectContaining({ key: 'str_false', default: false }),
+        expect.objectContaining({ key: 'invalid_cb', default: false }),
+      ]))
+    })
+  })
+
+  it('should coerce number url defaults and ignore NaN values', async () => {
+    mockWebAppState.appParams = {
+      ...defaultAppParams,
+      user_input_form: [
+        {
+          number: {
+            label: 'Valid Number',
+            variable: 'num_valid',
+            required: false,
+            default: 0,
+            hide: true,
+          },
+        },
+        {
+          number: {
+            label: 'NaN Number',
+            variable: 'num_nan',
+            required: false,
+            default: 0,
+            hide: true,
+          },
+        },
+      ],
+    }
+    getRawInputsFromUrlParamsMock.mockResolvedValue({
+      num_valid: '42',
+      num_nan: 'not-a-number',
+    })
+
+    const { result } = renderHook(() => useTextGenerationAppState({
+      isInstalledApp: false,
+      isWorkflow: true,
+    }))
+
+    await waitFor(() => {
+      expect(result.current.promptConfig?.prompt_variables).toEqual(expect.arrayContaining([
+        expect.objectContaining({ key: 'num_valid', default: 42 }),
+        expect.objectContaining({ key: 'num_nan', default: 0 }),
+      ]))
+    })
+  })
+
+  it('should coerce select url defaults and ignore invalid options', async () => {
+    mockWebAppState.appParams = {
+      ...defaultAppParams,
+      user_input_form: [
+        {
+          select: {
+            label: 'Valid Option',
+            variable: 'sel_valid',
+            required: false,
+            default: '',
+            options: ['alpha', 'beta'],
+            hide: true,
+          },
+        },
+        {
+          select: {
+            label: 'Invalid Option',
+            variable: 'sel_invalid',
+            required: false,
+            default: 'alpha',
+            options: ['alpha', 'beta'],
+            hide: true,
+          },
+        },
+      ],
+    }
+    getRawInputsFromUrlParamsMock.mockResolvedValue({
+      sel_valid: 'beta',
+      sel_invalid: 'gamma',
+    })
+
+    const { result } = renderHook(() => useTextGenerationAppState({
+      isInstalledApp: false,
+      isWorkflow: true,
+    }))
+
+    await waitFor(() => {
+      expect(result.current.promptConfig?.prompt_variables).toEqual(expect.arrayContaining([
+        expect.objectContaining({ key: 'sel_valid', default: 'beta' }),
+        expect.objectContaining({ key: 'sel_invalid', default: 'alpha' }),
+      ]))
+    })
+  })
+
+  it('should ignore non-string url values for text inputs', async () => {
+    mockWebAppState.appParams = {
+      ...defaultAppParams,
+      user_input_form: [
+        {
+          'text-input': {
+            label: 'Text Field',
+            variable: 'text_field',
+            required: false,
+            max_length: 48,
+            default: 'original',
+            hide: true,
+          },
+        },
+      ],
+    }
+    getRawInputsFromUrlParamsMock.mockResolvedValue({
+      text_field: 12345,
+    })
+
+    const { result } = renderHook(() => useTextGenerationAppState({
+      isInstalledApp: false,
+      isWorkflow: true,
+    }))
+
+    await waitFor(() => {
+      expect(result.current.promptConfig?.prompt_variables).toEqual(expect.arrayContaining([
+        expect.objectContaining({ key: 'text_field', default: 'original' }),
+      ]))
+    })
+  })
 })
diff --git a/web/app/components/share/text-generation/hooks/use-text-generation-app-state.ts b/web/app/components/share/text-generation/hooks/use-text-generation-app-state.ts
index f56efc3902..12e0f22d16 100644
--- a/web/app/components/share/text-generation/hooks/use-text-generation-app-state.ts
+++ b/web/app/components/share/text-generation/hooks/use-text-generation-app-state.ts
@@ -6,6 +6,7 @@ import { toast } from '@langgenius/dify-ui/toast'
 import { useSuspenseQuery } from '@tanstack/react-query'
 import { useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
+import { getRawInputsFromUrlParams } from '@/app/components/base/chat/utils'
 import { useWebAppStore } from '@/context/web-app-context'
 import { useAppFavicon } from '@/hooks/use-app-favicon'
 import useDocumentTitle from '@/hooks/use-document-title'
@@ -31,6 +32,44 @@ type ShareAppParams = {
     image_file_size_limit?: number
   }
 }
+
+const coerceWorkflowUrlDefault = (
+  promptVariable: NonNullable<PromptConfig['prompt_variables']>[number],
+  rawValue: unknown,
+) => {
+  if (rawValue === undefined || rawValue === null)
+    return undefined
+
+  if (promptVariable.type === 'checkbox') {
+    if (typeof rawValue === 'boolean')
+      return rawValue
+
+    const normalized = String(rawValue).toLowerCase()
+    if (normalized === 'true')
+      return true
+    if (normalized === 'false')
+      return false
+
+    return undefined
+  }
+
+  if (promptVariable.type === 'number') {
+    const numericValue = Number(rawValue)
+    return Number.isNaN(numericValue) ? undefined : numericValue
+  }
+
+  if (typeof rawValue !== 'string')
+    return undefined
+
+  if (promptVariable.type === 'select')
+    return promptVariable.options?.includes(rawValue) ? rawValue : undefined
+
+  if (promptVariable.max_length)
+    return rawValue.slice(0, promptVariable.max_length)
+
+  return rawValue
+}
+
 export const useTextGenerationAppState = ({ isInstalledApp, isWorkflow }: UseTextGenerationAppStateOptions) => {
   const { t } = useTranslation()
   const appSourceType = isInstalledApp ? AppSourceType.installedApp : AppSourceType.webApp
@@ -84,6 +123,15 @@ export const useTextGenerationAppState = ({ isInstalledApp, isWorkflow }: UseTex
       setCustomConfig((custom_config || null) as TextGenerationCustomConfig | null)
       await changeLanguage(site.default_language)
       const { user_input_form, more_like_this, file_upload, text_to_speech } = appParams as unknown as ShareAppParams
+      const promptVariables = userInputsFormToPromptVariables(user_input_form)
+      if (isWorkflow && !isInstalledApp) {
+        const workflowUrlInputs = await getRawInputsFromUrlParams()
+        promptVariables.forEach((promptVariable) => {
+          const workflowDefault = coerceWorkflowUrlDefault(promptVariable, workflowUrlInputs[promptVariable.key])
+          if (workflowDefault !== undefined)
+            promptVariable.default = workflowDefault
+        })
+      }
       if (cancelled)
         return
       setVisionConfig({
@@ -94,7 +142,7 @@ export const useTextGenerationAppState = ({ isInstalledApp, isWorkflow }: UseTex
       } as VisionSettings)
       setPromptConfig({
         prompt_template: '',
-        prompt_variables: userInputsFormToPromptVariables(user_input_form),
+        prompt_variables: promptVariables,
       } as PromptConfig)
       setMoreLikeThisConfig(more_like_this)
       setTextToSpeechConfig(text_to_speech)
@@ -105,7 +153,7 @@ export const useTextGenerationAppState = ({ isInstalledApp, isWorkflow }: UseTex
     return () => {
       cancelled = true
     }
-  }, [appData, appParams, fetchSavedMessages, isWorkflow])
+  }, [appData, appParams, fetchSavedMessages, isInstalledApp, isWorkflow])
   useDocumentTitle(siteInfo?.title || t('generation.title', { ns: 'share' }))
   useAppFavicon({
     enable: !isInstalledApp,
diff --git a/web/app/components/share/text-generation/info-modal.tsx b/web/app/components/share/text-generation/info-modal.tsx
index 29471548ef..894ca8781e 100644
--- a/web/app/components/share/text-generation/info-modal.tsx
+++ b/web/app/components/share/text-generation/info-modal.tsx
@@ -1,8 +1,8 @@
 import type { SiteInfo } from '@/models/share'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogCloseButton, DialogContent } from '@langgenius/dify-ui/dialog'
 import * as React from 'react'
 import AppIcon from '@/app/components/base/app-icon'
-import Modal from '@/app/components/base/modal'
 import { appDefaultIconBackground } from '@/config'
 
 type Props = {
@@ -16,38 +16,50 @@ const InfoModal = ({
   onClose,
   data,
 }: Props) => {
+  const [currentYear] = React.useState(() => new Date().getFullYear())
+
   return (
-    <Modal
-      isShow={isShow}
-      onClose={onClose}
-      className="max-w-[400px] min-w-[400px] p-0!"
-      closable
+    <Dialog
+      open={isShow}
+      onOpenChange={(open) => {
+        if (!open)
+          onClose()
+      }}
     >
-      <div className={cn('flex flex-col items-center gap-4 px-4 pt-10 pb-8')}>
-        <AppIcon
-          size="xxl"
-          iconType={data?.icon_type}
-          icon={data?.icon}
-          background={data?.icon_background || appDefaultIconBackground}
-          imageUrl={data?.icon_url}
-        />
-        <div className="system-xl-semibold text-text-secondary">{data?.title}</div>
-        <div className="system-xs-regular text-text-tertiary">
-          {/* copyright */}
-          {data?.copyright && (
-            <div>
-              ©
-              {(new Date()).getFullYear()}
-              {' '}
-              {data?.copyright}
-            </div>
-          )}
-          {data?.custom_disclaimer && (
-            <div className="mt-2">{data.custom_disclaimer}</div>
-          )}
+      <DialogContent className="w-full max-w-100 min-w-100 overflow-hidden! border-none p-0! text-left align-middle">
+        <DialogCloseButton />
+
+        <div className={cn('flex flex-col items-center gap-4 px-4 pt-10 pb-8')}>
+          <AppIcon
+            size="xxl"
+            iconType={data?.icon_type}
+            icon={data?.icon}
+            background={data?.icon_background || appDefaultIconBackground}
+            imageUrl={data?.icon_url}
+          />
+          <div className="w-full text-center">
+            <div className="system-xl-semibold text-text-secondary">{data?.title}</div>
+            <div className="mt-1 system-xl-medium text-text-tertiary">{data?.description}</div>
+          </div>
+          <div className="system-xs-regular text-text-tertiary">
+            {/* copyright */}
+            {data?.copyright && (
+              <div>
+                Copyright ©
+                {' '}
+                {currentYear}
+                {' '}
+                {data?.copyright}
+                . All Rights Reserved.
+              </div>
+            )}
+            {data?.custom_disclaimer && (
+              <div className="mt-2">{data.custom_disclaimer}</div>
+            )}
+          </div>
         </div>
-      </div>
-    </Modal>
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/components/share/text-generation/menu-dropdown.tsx b/web/app/components/share/text-generation/menu-dropdown.tsx
index e82681946b..004648909f 100644
--- a/web/app/components/share/text-generation/menu-dropdown.tsx
+++ b/web/app/components/share/text-generation/menu-dropdown.tsx
@@ -68,13 +68,13 @@ const MenuDropdown: FC<Props> = ({
         onOpenChange={setOpen}
       >
         <DropdownMenuTrigger
-          render={<div />}
+          render={(
+            <ActionButton size="l" className={cn(open && 'bg-state-base-hover')}>
+              <span aria-hidden className="i-ri-equalizer-2-line h-[18px] w-[18px]" />
+            </ActionButton>
+          )}
           aria-label={t('operation.more', { ns: 'common' })}
-        >
-          <ActionButton size="l" className={cn(open && 'bg-state-base-hover')}>
-            <span aria-hidden className="i-ri-equalizer-2-line h-[18px] w-[18px]" />
-          </ActionButton>
-        </DropdownMenuTrigger>
+        />
         <DropdownMenuContent
           placement={placement || 'bottom-end'}
           sideOffset={4}
diff --git a/web/app/components/share/text-generation/run-once/__tests__/index.spec.tsx b/web/app/components/share/text-generation/run-once/__tests__/index.spec.tsx
index 628bf9bd85..40a2bdbaaf 100644
--- a/web/app/components/share/text-generation/run-once/__tests__/index.spec.tsx
+++ b/web/app/components/share/text-generation/run-once/__tests__/index.spec.tsx
@@ -219,7 +219,7 @@ describe('RunOnce', () => {
     await waitFor(() => {
       expect(onInputsChange).toHaveBeenCalled()
     })
-    fireEvent.click(screen.getByTestId('run-button'))
+    fireEvent.click(screen.getByRole('button', { name: 'share.generation.run' }))
     expect(onSend).toHaveBeenCalledTimes(1)
   })
 
@@ -233,7 +233,7 @@ describe('RunOnce', () => {
     await waitFor(() => {
       expect(onInputsChange).toHaveBeenCalled()
     })
-    const stopButton = screen.getByTestId('stop-button')
+    const stopButton = screen.getByRole('button', { name: 'share.generation.stopRun:{"defaultValue":"Stop Run"}' })
     fireEvent.click(stopButton)
     expect(onStop).toHaveBeenCalledTimes(1)
   })
@@ -247,7 +247,7 @@ describe('RunOnce', () => {
     await waitFor(() => {
       expect(onInputsChange).toHaveBeenCalled()
     })
-    const stopButton = screen.getByTestId('stop-button')
+    const stopButton = screen.getByRole('button', { name: 'share.generation.stopRun:{"defaultValue":"Stop Run"}' })
     expect(stopButton)!.toBeDisabled()
   })
 
diff --git a/web/app/components/share/text-generation/run-once/index.tsx b/web/app/components/share/text-generation/run-once/index.tsx
index 499403223e..285ca803a8 100644
--- a/web/app/components/share/text-generation/run-once/index.tsx
+++ b/web/app/components/share/text-generation/run-once/index.tsx
@@ -138,7 +138,7 @@ const RunOnce: FC<IRunOnceProps> = ({
                         <SelectTrigger className="w-full">
                           {String(inputs[item.key] || item.default || t('placeholder.select', { ns: 'common' }))}
                         </SelectTrigger>
-                        <SelectContent popupClassName="w-(--anchor-width)">
+                        <SelectContent>
                           {(item.options || []).map(option => (
                             <SelectItem key={option} value={option}>
                               <SelectItemText>{option}</SelectItemText>
@@ -251,7 +251,6 @@ const RunOnce: FC<IRunOnceProps> = ({
                 variant={isRunning ? 'secondary' : 'primary'}
                 disabled={isRunning && runControl?.isStopping}
                 onClick={handlePrimaryClick}
-                data-testid={isRunning ? 'stop-button' : 'run-button'}
               >
                 {isRunning
                   ? (
diff --git a/web/app/components/share/text-generation/text-generation-result-panel.tsx b/web/app/components/share/text-generation/text-generation-result-panel.tsx
index bcd38e563a..67681a123a 100644
--- a/web/app/components/share/text-generation/text-generation-result-panel.tsx
+++ b/web/app/components/share/text-generation/text-generation-result-panel.tsx
@@ -184,7 +184,13 @@ const TextGenerationResultPanel: FC<TextGenerationResultPanelProps> = ({
             <span aria-hidden className="i-ri-error-warning-fill h-4 w-4 text-text-destructive" />
             <div className="system-sm-medium text-text-secondary">{t('generation.batchFailed.info', { ns: 'share', num: allFailedTaskList.length })}</div>
             <div className="h-3.5 w-px bg-divider-regular"></div>
-            <div onClick={handleRetryAllFailedTask} className="cursor-pointer system-sm-semibold-uppercase text-text-accent">{t('generation.batchFailed.retry', { ns: 'share' })}</div>
+            <button
+              type="button"
+              className="inline cursor-pointer border-none bg-transparent p-0 text-left system-sm-semibold-uppercase text-text-accent focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+              onClick={handleRetryAllFailedTask}
+            >
+              {t('generation.batchFailed.retry', { ns: 'share' })}
+            </button>
           </div>
         )}
       </div>
diff --git a/web/app/components/signin/__tests__/countdown.spec.tsx b/web/app/components/signin/__tests__/countdown.spec.tsx
index 7d5e847b72..4ac0b437bb 100644
--- a/web/app/components/signin/__tests__/countdown.spec.tsx
+++ b/web/app/components/signin/__tests__/countdown.spec.tsx
@@ -31,7 +31,7 @@ describe('Countdown', () => {
       localStorage.setItem(COUNT_DOWN_KEY, '0')
       render(<Countdown />)
 
-      expect(screen.getByText('login.checkCode.resend')).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'login.checkCode.resend' })).toBeInTheDocument()
       expect(screen.queryByText('s')).not.toBeInTheDocument()
     })
 
@@ -39,7 +39,7 @@ describe('Countdown', () => {
       localStorage.setItem(COUNT_DOWN_KEY, '1000')
       render(<Countdown />)
 
-      expect(screen.queryByText('login.checkCode.resend')).not.toBeInTheDocument()
+      expect(screen.queryByRole('button', { name: 'login.checkCode.resend' })).not.toBeInTheDocument()
     })
   })
 
@@ -79,7 +79,7 @@ describe('Countdown', () => {
 
       render(<Countdown onResend={onResend} />)
 
-      const resendLink = screen.getByText('login.checkCode.resend')
+      const resendLink = screen.getByRole('button', { name: 'login.checkCode.resend' })
       fireEvent.click(resendLink)
 
       expect(onResend).toHaveBeenCalledTimes(1)
@@ -90,7 +90,7 @@ describe('Countdown', () => {
 
       render(<Countdown />)
 
-      const resendLink = screen.getByText('login.checkCode.resend')
+      const resendLink = screen.getByRole('button', { name: 'login.checkCode.resend' })
       fireEvent.click(resendLink)
 
       expect(localStorage.setItem).toHaveBeenCalledWith(COUNT_DOWN_KEY, String(COUNT_DOWN_TIME_MS))
@@ -101,7 +101,7 @@ describe('Countdown', () => {
 
       render(<Countdown />)
 
-      const resendLink = screen.getByText('login.checkCode.resend')
+      const resendLink = screen.getByRole('button', { name: 'login.checkCode.resend' })
       expect(() => fireEvent.click(resendLink)).not.toThrow()
     })
   })
@@ -127,14 +127,14 @@ describe('Countdown', () => {
       localStorage.setItem(COUNT_DOWN_KEY, '0')
       render(<Countdown />)
 
-      expect(screen.getByText('login.checkCode.resend')).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'login.checkCode.resend' })).toBeInTheDocument()
     })
 
     it('should handle negative time values', () => {
       localStorage.setItem(COUNT_DOWN_KEY, '-1000')
       render(<Countdown />)
 
-      expect(screen.getByText('login.checkCode.resend')).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'login.checkCode.resend' })).toBeInTheDocument()
     })
 
     it('should round time display correctly', () => {
@@ -160,7 +160,7 @@ describe('Countdown', () => {
 
       render(<Countdown onResend={onResend} />)
 
-      expect(screen.getByText('login.checkCode.resend')).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'login.checkCode.resend' })).toBeInTheDocument()
     })
 
     it('should render correctly without any props', () => {
diff --git a/web/app/components/signin/countdown.tsx b/web/app/components/signin/countdown.tsx
index 651a2fb430..627a1eea36 100644
--- a/web/app/components/signin/countdown.tsx
+++ b/web/app/components/signin/countdown.tsx
@@ -41,7 +41,15 @@ export default function Countdown({ onResend }: CountdownProps) {
         </span>
       )}
       {
-        time <= 0 && <span className="cursor-pointer system-xs-medium text-text-accent-secondary" onClick={resend}>{t('checkCode.resend', { ns: 'login' })}</span>
+        time <= 0 && (
+          <button
+            type="button"
+            className="cursor-pointer border-none bg-transparent p-0 text-left system-xs-medium text-text-accent-secondary focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+            onClick={resend}
+          >
+            {t('checkCode.resend', { ns: 'login' })}
+          </button>
+        )
       }
     </p>
   )
diff --git a/web/app/components/tools/__tests__/provider-list.spec.tsx b/web/app/components/tools/__tests__/provider-list.spec.tsx
index 6661c26083..30c2854fa3 100644
--- a/web/app/components/tools/__tests__/provider-list.spec.tsx
+++ b/web/app/components/tools/__tests__/provider-list.spec.tsx
@@ -306,7 +306,7 @@ describe('ProviderList', () => {
       const input = screen.getByRole('textbox')
       fireEvent.change(input, { target: { value: 'Google' } })
       expect(screen.queryByTestId('card-weather-tool')).not.toBeInTheDocument()
-      fireEvent.click(screen.getByTestId('input-clear'))
+      fireEvent.click(screen.getByRole('button', { name: 'common.operation.clear' }))
       expect(screen.getByTestId('card-weather-tool')).toBeInTheDocument()
     })
 
diff --git a/web/app/components/tools/edit-custom-collection-modal/__tests__/config-credentials.spec.tsx b/web/app/components/tools/edit-custom-collection-modal/__tests__/config-credentials.spec.tsx
index ec4866b212..98a7b10c76 100644
--- a/web/app/components/tools/edit-custom-collection-modal/__tests__/config-credentials.spec.tsx
+++ b/web/app/components/tools/edit-custom-collection-modal/__tests__/config-credentials.spec.tsx
@@ -1,5 +1,5 @@
 import type { Credential } from '@/app/components/tools/types'
-import { act, fireEvent, render, screen } from '@testing-library/react'
+import { act, fireEvent, render, screen, waitFor } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { AuthHeaderPrefix, AuthType } from '@/app/components/tools/types'
 import ConfigCredential from '../config-credentials'
@@ -82,6 +82,25 @@ describe('ConfigCredential', () => {
       expect(mockOnChange).not.toHaveBeenCalled()
     })
 
+    it('should call onHide when Escape is pressed', async () => {
+      await act(async () => {
+        render(
+          <ConfigCredential
+            credential={baseCredential}
+            onChange={mockOnChange}
+            onHide={mockOnHide}
+          />,
+        )
+      })
+
+      fireEvent.keyDown(document, { key: 'Escape' })
+
+      await waitFor(() => {
+        expect(mockOnHide).toHaveBeenCalledTimes(1)
+      })
+      expect(mockOnChange).not.toHaveBeenCalled()
+    })
+
     it('should call both onChange and onHide when save is pressed', async () => {
       await act(async () => {
         render(
diff --git a/web/app/components/tools/edit-custom-collection-modal/__tests__/index.spec.tsx b/web/app/components/tools/edit-custom-collection-modal/__tests__/index.spec.tsx
index 58ebab69b3..faa91a1cdf 100644
--- a/web/app/components/tools/edit-custom-collection-modal/__tests__/index.spec.tsx
+++ b/web/app/components/tools/edit-custom-collection-modal/__tests__/index.spec.tsx
@@ -26,7 +26,6 @@ const mockSetShowAccountSettingModal = vi.fn()
 vi.mock('@/context/modal-context', () => ({
   useModalContext: (): ModalContextState => ({
     setShowAccountSettingModal: mockSetShowAccountSettingModal,
-    setShowApiBasedExtensionModal: vi.fn(),
     setShowModerationSettingModal: vi.fn(),
     setShowExternalDataToolModal: vi.fn(),
     setShowPricingModal: mockSetShowPricingModal,
diff --git a/web/app/components/tools/edit-custom-collection-modal/config-credentials.tsx b/web/app/components/tools/edit-custom-collection-modal/config-credentials.tsx
index bee775e80b..dde11b56f3 100644
--- a/web/app/components/tools/edit-custom-collection-modal/config-credentials.tsx
+++ b/web/app/components/tools/edit-custom-collection-modal/config-credentials.tsx
@@ -1,14 +1,22 @@
 'use client'
-import type { FC } from 'react'
 import type { Credential } from '@/app/components/tools/types'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
-import * as React from 'react'
+import {
+  Drawer,
+  DrawerBackdrop,
+  DrawerCloseButton,
+  DrawerContent,
+  DrawerPopup,
+  DrawerPortal,
+  DrawerTitle,
+  DrawerViewport,
+} from '@langgenius/dify-ui/drawer'
+import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import Drawer from '@/app/components/base/drawer-plus'
+import { Infotip } from '@/app/components/base/infotip'
 import Input from '@/app/components/base/input'
 import Radio from '@/app/components/base/radio/ui'
-import Tooltip from '@/app/components/base/tooltip'
 import { AuthHeaderPrefix, AuthType } from '@/app/components/tools/types'
 
 type Props = {
@@ -25,177 +33,200 @@ type ItemProps = {
   onClick: (value: AuthType | AuthHeaderPrefix) => void
 }
 
-const SelectItem: FC<ItemProps> = ({ text, value, isChecked, onClick }) => {
+function SelectItem({ text, value, isChecked, onClick }: ItemProps) {
   return (
-    <div
-      className={cn(isChecked ? 'border-2 border-util-colors-indigo-indigo-600 bg-components-panel-on-panel-item-bg shadow-sm' : 'border border-components-card-border', 'mb-2 flex h-9 w-[150px] cursor-pointer items-center space-x-2 rounded-xl bg-components-panel-on-panel-item-bg pl-3 hover:bg-components-panel-on-panel-item-bg-hover')}
+    <button
+      type="button"
+      className={cn(
+        isChecked ? 'border-2 border-util-colors-indigo-indigo-600 bg-components-panel-on-panel-item-bg shadow-sm' : 'border border-components-card-border',
+        'mb-2 flex h-9 w-37.5 cursor-pointer items-center space-x-2 rounded-xl bg-components-panel-on-panel-item-bg pl-3 text-left outline-hidden hover:bg-components-panel-on-panel-item-bg-hover focus-visible:ring-1 focus-visible:ring-components-input-border-hover',
+      )}
       onClick={() => onClick(value)}
     >
       <Radio isChecked={isChecked} />
       <div className="system-sm-regular text-text-primary">{text}</div>
-    </div>
+    </button>
   )
 }
 
-const ConfigCredential: FC<Props> = ({
+export default function ConfigCredential({
   positionCenter,
   credential,
   onChange,
   onHide,
-}) => {
+}: Props) {
   const { t } = useTranslation()
-  const [tempCredential, setTempCredential] = React.useState<Credential>(credential)
+  const [tempCredential, setTempCredential] = useState<Credential>(credential)
 
   return (
     <Drawer
-      isShow
-      positionCenter={positionCenter}
-      onHide={onHide}
-      title={t('createTool.authMethod.title', { ns: 'tools' })!}
-      dialogClassName="z-60"
-      dialogBackdropClassName="z-70"
-      panelClassName="mt-2 w-[520px]! h-fit z-80"
-      maxWidthClassName="max-w-[520px]!"
-      height="fit-content"
-      headerClassName="border-b-divider-regular!"
-      body={(
-        <div className="px-6 pt-2">
-          <div className="space-y-4">
-            <div>
-              <div className="py-2 system-sm-medium text-text-primary">{t('createTool.authMethod.type', { ns: 'tools' })}</div>
-              <div className="flex space-x-3">
-                <SelectItem
-                  text={t('createTool.authMethod.types.none', { ns: 'tools' })}
-                  value={AuthType.none}
-                  isChecked={tempCredential.auth_type === AuthType.none}
-                  onClick={value => setTempCredential({
-                    auth_type: value as AuthType,
-                  })}
-                />
-                <SelectItem
-                  text={t('createTool.authMethod.types.api_key_header', { ns: 'tools' })}
-                  value={AuthType.apiKeyHeader}
-                  isChecked={tempCredential.auth_type === AuthType.apiKeyHeader}
-                  onClick={value => setTempCredential({
-                    auth_type: value as AuthType,
-                    api_key_header: tempCredential.api_key_header || 'Authorization',
-                    api_key_value: tempCredential.api_key_value || '',
-                    api_key_header_prefix: tempCredential.api_key_header_prefix || AuthHeaderPrefix.custom,
-                  })}
-                />
-                <SelectItem
-                  text={t('createTool.authMethod.types.api_key_query', { ns: 'tools' })}
-                  value={AuthType.apiKeyQuery}
-                  isChecked={tempCredential.auth_type === AuthType.apiKeyQuery}
-                  onClick={value => setTempCredential({
-                    auth_type: value as AuthType,
-                    api_key_query_param: tempCredential.api_key_query_param || 'key',
-                    api_key_value: tempCredential.api_key_value || '',
-                  })}
-                />
+      open
+      modal
+      disablePointerDismissal
+      swipeDirection="right"
+      onOpenChange={(open) => {
+        if (!open)
+          onHide()
+      }}
+    >
+      <DrawerPortal>
+        <DrawerBackdrop forceRender />
+        <DrawerViewport>
+          <DrawerPopup
+            className={cn(
+              'data-[swipe-direction=right]:top-2 data-[swipe-direction=right]:bottom-auto data-[swipe-direction=right]:h-fit data-[swipe-direction=right]:max-h-[calc(100dvh-1rem)] data-[swipe-direction=right]:w-130 data-[swipe-direction=right]:max-w-[calc(100vw-1rem)] data-[swipe-direction=right]:rounded-xl data-[swipe-direction=right]:border-r-[0.5px] data-[swipe-direction=right]:border-divider-subtle',
+              positionCenter
+                ? 'data-[swipe-direction=right]:right-[max(0.5rem,calc(50%_-_260px))]'
+                : 'data-[swipe-direction=right]:right-2',
+            )}
+          >
+            <DrawerContent className="flex min-h-0 flex-1 flex-col p-0 pb-0">
+              <div className="shrink-0 border-b border-divider-regular py-4">
+                <div className="flex h-6 items-center justify-between pr-5 pl-6">
+                  <DrawerTitle className="min-w-0 truncate system-xl-semibold text-text-primary">
+                    {t('createTool.authMethod.title', { ns: 'tools' })}
+                  </DrawerTitle>
+                  <DrawerCloseButton
+                    aria-label={t('operation.close', { ns: 'common' })}
+                    className="h-6 w-6 rounded-md"
+                  />
+                </div>
               </div>
-            </div>
-            {tempCredential.auth_type === AuthType.apiKeyHeader && (
-              <>
-                <div>
-                  <div className="py-2 system-sm-medium text-text-primary">{t('createTool.authHeaderPrefix.title', { ns: 'tools' })}</div>
-                  <div className="flex space-x-3">
-                    <SelectItem
-                      text={t('createTool.authHeaderPrefix.types.basic', { ns: 'tools' })}
-                      value={AuthHeaderPrefix.basic}
-                      isChecked={tempCredential.api_key_header_prefix === AuthHeaderPrefix.basic}
-                      onClick={value => setTempCredential({ ...tempCredential, api_key_header_prefix: value as AuthHeaderPrefix })}
-                    />
-                    <SelectItem
-                      text={t('createTool.authHeaderPrefix.types.bearer', { ns: 'tools' })}
-                      value={AuthHeaderPrefix.bearer}
-                      isChecked={tempCredential.api_key_header_prefix === AuthHeaderPrefix.bearer}
-                      onClick={value => setTempCredential({ ...tempCredential, api_key_header_prefix: value as AuthHeaderPrefix })}
-                    />
-                    <SelectItem
-                      text={t('createTool.authHeaderPrefix.types.custom', { ns: 'tools' })}
-                      value={AuthHeaderPrefix.custom}
-                      isChecked={tempCredential.api_key_header_prefix === AuthHeaderPrefix.custom}
-                      onClick={value => setTempCredential({ ...tempCredential, api_key_header_prefix: value as AuthHeaderPrefix })}
-                    />
+              <div className="min-h-0 flex-1 overflow-y-auto px-6 pt-2">
+                <div className="space-y-4">
+                  <div>
+                    <div className="py-2 system-sm-medium text-text-primary">{t('createTool.authMethod.type', { ns: 'tools' })}</div>
+                    <div className="flex space-x-3">
+                      <SelectItem
+                        text={t('createTool.authMethod.types.none', { ns: 'tools' })}
+                        value={AuthType.none}
+                        isChecked={tempCredential.auth_type === AuthType.none}
+                        onClick={value => setTempCredential({
+                          auth_type: value as AuthType,
+                        })}
+                      />
+                      <SelectItem
+                        text={t('createTool.authMethod.types.api_key_header', { ns: 'tools' })}
+                        value={AuthType.apiKeyHeader}
+                        isChecked={tempCredential.auth_type === AuthType.apiKeyHeader}
+                        onClick={value => setTempCredential({
+                          auth_type: value as AuthType,
+                          api_key_header: tempCredential.api_key_header || 'Authorization',
+                          api_key_value: tempCredential.api_key_value || '',
+                          api_key_header_prefix: tempCredential.api_key_header_prefix || AuthHeaderPrefix.custom,
+                        })}
+                      />
+                      <SelectItem
+                        text={t('createTool.authMethod.types.api_key_query', { ns: 'tools' })}
+                        value={AuthType.apiKeyQuery}
+                        isChecked={tempCredential.auth_type === AuthType.apiKeyQuery}
+                        onClick={value => setTempCredential({
+                          auth_type: value as AuthType,
+                          api_key_query_param: tempCredential.api_key_query_param || 'key',
+                          api_key_value: tempCredential.api_key_value || '',
+                        })}
+                      />
+                    </div>
                   </div>
-                </div>
-                <div>
-                  <div className="flex items-center py-2 system-sm-medium text-text-primary">
-                    {t('createTool.authMethod.key', { ns: 'tools' })}
-                    <Tooltip
-                      popupContent={(
-                        <div className="w-[261px] text-text-tertiary">
-                          {t('createTool.authMethod.keyTooltip', { ns: 'tools' })}
+                  {tempCredential.auth_type === AuthType.apiKeyHeader && (
+                    <>
+                      <div>
+                        <div className="py-2 system-sm-medium text-text-primary">{t('createTool.authHeaderPrefix.title', { ns: 'tools' })}</div>
+                        <div className="flex space-x-3">
+                          <SelectItem
+                            text={t('createTool.authHeaderPrefix.types.basic', { ns: 'tools' })}
+                            value={AuthHeaderPrefix.basic}
+                            isChecked={tempCredential.api_key_header_prefix === AuthHeaderPrefix.basic}
+                            onClick={value => setTempCredential({ ...tempCredential, api_key_header_prefix: value as AuthHeaderPrefix })}
+                          />
+                          <SelectItem
+                            text={t('createTool.authHeaderPrefix.types.bearer', { ns: 'tools' })}
+                            value={AuthHeaderPrefix.bearer}
+                            isChecked={tempCredential.api_key_header_prefix === AuthHeaderPrefix.bearer}
+                            onClick={value => setTempCredential({ ...tempCredential, api_key_header_prefix: value as AuthHeaderPrefix })}
+                          />
+                          <SelectItem
+                            text={t('createTool.authHeaderPrefix.types.custom', { ns: 'tools' })}
+                            value={AuthHeaderPrefix.custom}
+                            isChecked={tempCredential.api_key_header_prefix === AuthHeaderPrefix.custom}
+                            onClick={value => setTempCredential({ ...tempCredential, api_key_header_prefix: value as AuthHeaderPrefix })}
+                          />
                         </div>
-                      )}
-                      triggerClassName="ml-0.5 w-4 h-4"
-                    />
-                  </div>
-                  <Input
-                    value={tempCredential.api_key_header}
-                    onChange={e => setTempCredential({ ...tempCredential, api_key_header: e.target.value })}
-                    placeholder={t('createTool.authMethod.types.apiKeyPlaceholder', { ns: 'tools' })!}
-                  />
-                </div>
-                <div>
-                  <div className="py-2 system-sm-medium text-text-primary">{t('createTool.authMethod.value', { ns: 'tools' })}</div>
-                  <Input
-                    value={tempCredential.api_key_value}
-                    onChange={e => setTempCredential({ ...tempCredential, api_key_value: e.target.value })}
-                    placeholder={t('createTool.authMethod.types.apiValuePlaceholder', { ns: 'tools' })!}
-                  />
-                </div>
-              </>
-            )}
-            {tempCredential.auth_type === AuthType.apiKeyQuery && (
-              <>
-                <div>
-                  <div className="flex items-center py-2 system-sm-medium text-text-primary">
-                    {t('createTool.authMethod.queryParam', { ns: 'tools' })}
-                    <Tooltip
-                      popupContent={(
-                        <div className="w-[261px] text-text-tertiary">
-                          {t('createTool.authMethod.queryParamTooltip', { ns: 'tools' })}
+                      </div>
+                      <div>
+                        <div className="flex items-center py-2 system-sm-medium text-text-primary">
+                          {t('createTool.authMethod.key', { ns: 'tools' })}
+                          <Infotip
+                            aria-label={t('createTool.authMethod.keyTooltip', { ns: 'tools' })}
+                            className="ml-0.5 h-4 w-4"
+                            popupClassName="w-[261px] text-text-tertiary"
+                          >
+                            {t('createTool.authMethod.keyTooltip', { ns: 'tools' })}
+                          </Infotip>
                         </div>
-                      )}
-                      triggerClassName="ml-0.5 w-4 h-4"
-                    />
-                  </div>
-                  <Input
-                    value={tempCredential.api_key_query_param}
-                    onChange={e => setTempCredential({ ...tempCredential, api_key_query_param: e.target.value })}
-                    placeholder={t('createTool.authMethod.types.queryParamPlaceholder', { ns: 'tools' })!}
-                  />
+                        <Input
+                          value={tempCredential.api_key_header}
+                          onChange={e => setTempCredential({ ...tempCredential, api_key_header: e.target.value })}
+                          placeholder={t('createTool.authMethod.types.apiKeyPlaceholder', { ns: 'tools' })!}
+                        />
+                      </div>
+                      <div>
+                        <div className="py-2 system-sm-medium text-text-primary">{t('createTool.authMethod.value', { ns: 'tools' })}</div>
+                        <Input
+                          value={tempCredential.api_key_value}
+                          onChange={e => setTempCredential({ ...tempCredential, api_key_value: e.target.value })}
+                          placeholder={t('createTool.authMethod.types.apiValuePlaceholder', { ns: 'tools' })!}
+                        />
+                      </div>
+                    </>
+                  )}
+                  {tempCredential.auth_type === AuthType.apiKeyQuery && (
+                    <>
+                      <div>
+                        <div className="flex items-center py-2 system-sm-medium text-text-primary">
+                          {t('createTool.authMethod.queryParam', { ns: 'tools' })}
+                          <Infotip
+                            aria-label={t('createTool.authMethod.queryParamTooltip', { ns: 'tools' })}
+                            className="ml-0.5 h-4 w-4"
+                            popupClassName="w-[261px] text-text-tertiary"
+                          >
+                            {t('createTool.authMethod.queryParamTooltip', { ns: 'tools' })}
+                          </Infotip>
+                        </div>
+                        <Input
+                          value={tempCredential.api_key_query_param}
+                          onChange={e => setTempCredential({ ...tempCredential, api_key_query_param: e.target.value })}
+                          placeholder={t('createTool.authMethod.types.queryParamPlaceholder', { ns: 'tools' })!}
+                        />
+                      </div>
+                      <div>
+                        <div className="py-2 system-sm-medium text-text-primary">{t('createTool.authMethod.value', { ns: 'tools' })}</div>
+                        <Input
+                          value={tempCredential.api_key_value}
+                          onChange={e => setTempCredential({ ...tempCredential, api_key_value: e.target.value })}
+                          placeholder={t('createTool.authMethod.types.apiValuePlaceholder', { ns: 'tools' })!}
+                        />
+                      </div>
+                    </>
+                  )}
                 </div>
-                <div>
-                  <div className="py-2 system-sm-medium text-text-primary">{t('createTool.authMethod.value', { ns: 'tools' })}</div>
-                  <Input
-                    value={tempCredential.api_key_value}
-                    onChange={e => setTempCredential({ ...tempCredential, api_key_value: e.target.value })}
-                    placeholder={t('createTool.authMethod.types.apiValuePlaceholder', { ns: 'tools' })!}
-                  />
-                </div>
-              </>
-            )}
-
-          </div>
-
-          <div className="mt-4 flex shrink-0 justify-end space-x-2 py-4">
-            <Button onClick={onHide}>{t('operation.cancel', { ns: 'common' })}</Button>
-            <Button
-              variant="primary"
-              onClick={() => {
-                onChange(tempCredential)
-                onHide()
-              }}
-            >
-              {t('operation.save', { ns: 'common' })}
-            </Button>
-          </div>
-        </div>
-      )}
-    />
+              </div>
+              <div className="mt-4 flex shrink-0 justify-end space-x-2 py-4 pr-6 pl-6">
+                <Button onClick={onHide}>{t('operation.cancel', { ns: 'common' })}</Button>
+                <Button
+                  variant="primary"
+                  onClick={() => {
+                    onChange(tempCredential)
+                    onHide()
+                  }}
+                >
+                  {t('operation.save', { ns: 'common' })}
+                </Button>
+              </div>
+            </DrawerContent>
+          </DrawerPopup>
+        </DrawerViewport>
+      </DrawerPortal>
+    </Drawer>
   )
 }
-export default React.memo(ConfigCredential)
diff --git a/web/app/components/tools/edit-custom-collection-modal/get-schema.tsx b/web/app/components/tools/edit-custom-collection-modal/get-schema.tsx
index 2bb5059870..b07d21ce14 100644
--- a/web/app/components/tools/edit-custom-collection-modal/get-schema.tsx
+++ b/web/app/components/tools/edit-custom-collection-modal/get-schema.tsx
@@ -1,12 +1,13 @@
 'use client'
 import type { FC } from 'react'
 import { Button } from '@langgenius/dify-ui/button'
-import { toast } from '@langgenius/dify-ui/toast'
 import {
-  RiAddLine,
-  RiArrowDownSLine,
-} from '@remixicon/react'
-import { useClickAway } from 'ahooks'
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from '@langgenius/dify-ui/dropdown-menu'
+import { toast } from '@langgenius/dify-ui/toast'
 import * as React from 'react'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -32,7 +33,7 @@ const GetSchema: FC<Props> = ({
     }
     setIsParsing(true)
     try {
-      const { schema } = await importSchemaFromURL(importUrl) as any
+      const { schema } = await importSchemaFromURL(importUrl)
       setImportUrl('')
       onChange(schema)
     }
@@ -42,79 +43,79 @@ const GetSchema: FC<Props> = ({
     }
   }
 
-  const importURLRef = React.useRef(null)
-  useClickAway(() => {
-    setShowImportFromUrl(false)
-  }, importURLRef)
-
   const [showExamples, setShowExamples] = useState(false)
-  const showExamplesRef = React.useRef(null)
-  useClickAway(() => {
-    setShowExamples(false)
-  }, showExamplesRef)
 
   return (
-    <div className="relative flex w-[224px] justify-end space-x-1">
-      <div ref={importURLRef}>
-        <Button
-          size="small"
-          className="space-x-1"
-          onClick={() => { setShowImportFromUrl(!showImportFromUrl) }}
+    <div className="flex w-[224px] justify-end gap-1">
+      <DropdownMenu open={showImportFromUrl} onOpenChange={setShowImportFromUrl}>
+        <DropdownMenuTrigger
+          render={(
+            <Button
+              size="small"
+              className="gap-1"
+            />
+          )}
         >
-          <RiAddLine className="h-3 w-3" />
-          <div className="system-xs-medium text-text-secondary">{t('createTool.importFromUrl', { ns: 'tools' })}</div>
-        </Button>
-        {showImportFromUrl && (
-          <div className="absolute top-[26px] left-[-35px] rounded-lg border border-components-panel-border bg-components-panel-bg p-2 shadow-lg">
-            <div className="relative">
-              <Input
-                type="text"
-                className="w-[244px]"
-                placeholder={t('createTool.importFromUrlPlaceHolder', { ns: 'tools' })!}
-                value={importUrl}
-                onChange={e => setImportUrl(e.target.value)}
-              />
-              <Button
-                className="absolute top-1 right-1"
-                size="small"
-                variant="primary"
-                disabled={!importUrl}
-                onClick={handleImportFromUrl}
-                loading={isParsing}
-              >
-                {isParsing ? '' : t('operation.ok', { ns: 'common' })}
-              </Button>
-            </div>
-          </div>
-        )}
-      </div>
-      <div className="relative -mt-0.5" ref={showExamplesRef}>
-        <Button
-          size="small"
-          className="space-x-1"
-          onClick={() => { setShowExamples(!showExamples) }}
+          <span className="i-ri-add-line size-3" aria-hidden />
+          <span className="system-xs-medium text-text-secondary">{t('createTool.importFromUrl', { ns: 'tools' })}</span>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent
+          placement="bottom-start"
+          sideOffset={2}
+          popupClassName="w-[300px] p-2"
         >
-          <div className="system-xs-medium text-text-secondary">{t('createTool.examples', { ns: 'tools' })}</div>
-          <RiArrowDownSLine className="h-3 w-3" />
-        </Button>
-        {showExamples && (
-          <div className="absolute top-7 right-0 rounded-lg bg-components-panel-bg p-1 shadow-sm">
-            {examples.map(item => (
-              <div
-                key={item.key}
-                onClick={() => {
-                  onChange(item.content)
-                  setShowExamples(false)
-                }}
-                className="cursor-pointer rounded-lg px-3 py-1.5 system-sm-regular leading-5 whitespace-nowrap text-text-secondary hover:bg-components-panel-on-panel-item-bg-hover"
-              >
-                {t(`createTool.exampleOptions.${item.key}`, { ns: 'tools' })}
-              </div>
-            ))}
+          <div className="relative">
+            <Input
+              type="text"
+              className="w-full"
+              placeholder={t('createTool.importFromUrlPlaceHolder', { ns: 'tools' })!}
+              value={importUrl}
+              onChange={e => setImportUrl(e.target.value)}
+            />
+            <Button
+              className="absolute top-1 right-1"
+              size="small"
+              variant="primary"
+              disabled={!importUrl}
+              onClick={handleImportFromUrl}
+              loading={isParsing}
+            >
+              {isParsing ? '' : t('operation.ok', { ns: 'common' })}
+            </Button>
           </div>
-        )}
-
-      </div>
+        </DropdownMenuContent>
+      </DropdownMenu>
+      <DropdownMenu open={showExamples} onOpenChange={setShowExamples}>
+        <DropdownMenuTrigger
+          render={(
+            <Button
+              size="small"
+              className="gap-1"
+            />
+          )}
+        >
+          <span className="system-xs-medium text-text-secondary">{t('createTool.examples', { ns: 'tools' })}</span>
+          <span className="i-ri-arrow-down-s-line size-3" aria-hidden />
+        </DropdownMenuTrigger>
+        <DropdownMenuContent
+          placement="bottom-end"
+          sideOffset={2}
+          popupClassName="min-w-max"
+        >
+          {examples.map(item => (
+            <DropdownMenuItem
+              key={item.key}
+              onClick={() => {
+                onChange(item.content)
+                setShowExamples(false)
+              }}
+              className="system-sm-regular whitespace-nowrap text-text-secondary"
+            >
+              {t(`createTool.exampleOptions.${item.key}`, { ns: 'tools' })}
+            </DropdownMenuItem>
+          ))}
+        </DropdownMenuContent>
+      </DropdownMenu>
     </div>
   )
 }
diff --git a/web/app/components/tools/edit-custom-collection-modal/index.tsx b/web/app/components/tools/edit-custom-collection-modal/index.tsx
index 03899941ba..0a0f017a36 100644
--- a/web/app/components/tools/edit-custom-collection-modal/index.tsx
+++ b/web/app/components/tools/edit-custom-collection-modal/index.tsx
@@ -3,6 +3,16 @@ import type { FC } from 'react'
 import type { Credential, CustomCollectionBackend, CustomParamSchema, Emoji } from '../types'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  Drawer,
+  DrawerBackdrop,
+  DrawerCloseButton,
+  DrawerContent,
+  DrawerPopup,
+  DrawerPortal,
+  DrawerTitle,
+  DrawerViewport,
+} from '@langgenius/dify-ui/drawer'
 import { toast } from '@langgenius/dify-ui/toast'
 import { RiSettings2Line } from '@remixicon/react'
 import { useDebounce, useGetState } from 'ahooks'
@@ -11,7 +21,6 @@ import * as React from 'react'
 import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import AppIcon from '@/app/components/base/app-icon'
-import Drawer from '@/app/components/base/drawer-plus'
 import EmojiPicker from '@/app/components/base/emoji-picker'
 import Input from '@/app/components/base/input'
 import Textarea from '@/app/components/base/textarea'
@@ -191,199 +200,224 @@ const EditCustomCollectionModal: FC<Props> = ({
   return (
     <>
       <Drawer
-        isShow
-        positionCenter={isAdd && !positionLeft}
-        onHide={onHide}
-        title={t(`createTool.${isAdd ? 'title' : 'editTitle'}`, { ns: 'tools' })!}
-        dialogClassName={dialogClassName}
-        panelClassName="mt-2 w-[640px]!"
-        maxWidthClassName="max-w-[640px]!"
-        height="calc(100vh - 16px)"
-        headerClassName="border-b-divider-regular!"
-        body={(
-          <div className="flex h-full flex-col">
-            <div className="h-0 grow space-y-4 overflow-y-auto px-6 py-3">
-              <div>
-                <div className="py-2 system-sm-medium text-text-primary">
-                  {t('createTool.name', { ns: 'tools' })}
-                  {' '}
-                  <span className="ml-1 text-red-500">*</span>
-                </div>
-                <div className="flex items-center justify-between gap-3">
-                  <AppIcon size="large" onClick={() => { setShowEmojiPicker(true) }} className="cursor-pointer" icon={emoji.content} background={emoji.background} />
-                  <Input
-                    className="h-10 grow"
-                    placeholder={t('createTool.toolNamePlaceHolder', { ns: 'tools' })!}
-                    value={customCollection.provider}
-                    onChange={(e) => {
-                      const newCollection = produce(customCollection, (draft) => {
-                        draft.provider = e.target.value
-                      })
-                      setCustomCollection(newCollection)
-                    }}
-                  />
-                </div>
-              </div>
-
-              {/* Schema */}
-              <div className="select-none">
-                <div className="flex items-center justify-between">
-                  <div className="flex items-center">
-                    <div className="py-2 system-sm-medium text-text-primary">
-                      {t('createTool.schema', { ns: 'tools' })}
-                      <span className="ml-1 text-red-500">*</span>
-                    </div>
-                    <div className="mx-2 h-3 w-px bg-divider-regular"></div>
-                    <a
-                      href="https://swagger.io/specification/"
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      className="flex h-[18px] items-center space-x-1 text-text-accent"
-                    >
-                      <div className="text-xs font-normal">{t('createTool.viewSchemaSpec', { ns: 'tools' })}</div>
-                      <LinkExternal02 className="h-3 w-3" />
-                    </a>
+        open
+        modal
+        disablePointerDismissal
+        swipeDirection="right"
+        onOpenChange={(open) => {
+          if (!open)
+            onHide()
+        }}
+      >
+        <DrawerPortal>
+          <DrawerBackdrop forceRender />
+          <DrawerViewport className={dialogClassName}>
+            <DrawerPopup
+              className={cn(
+                'data-[swipe-direction=right]:top-2 data-[swipe-direction=right]:bottom-2 data-[swipe-direction=right]:h-auto data-[swipe-direction=right]:w-160 data-[swipe-direction=right]:max-w-[calc(100vw-1rem)] data-[swipe-direction=right]:rounded-xl data-[swipe-direction=right]:border-r-[0.5px] data-[swipe-direction=right]:border-divider-subtle',
+                isAdd && !positionLeft
+                  ? 'data-[swipe-direction=right]:right-[max(0.5rem,calc(50%_-_320px))]'
+                  : 'data-[swipe-direction=right]:right-2',
+              )}
+            >
+              <DrawerContent className="flex min-h-0 flex-1 flex-col p-0 pb-0">
+                <div className="shrink-0 border-b border-divider-regular py-4">
+                  <div className="flex h-6 items-center justify-between pr-5 pl-6">
+                    <DrawerTitle className="min-w-0 truncate system-xl-semibold text-text-primary">
+                      {t(`createTool.${isAdd ? 'title' : 'editTitle'}`, { ns: 'tools' })}
+                    </DrawerTitle>
+                    <DrawerCloseButton
+                      aria-label={t('operation.close', { ns: 'common' })}
+                      className="h-6 w-6 rounded-md"
+                    />
                   </div>
-                  <GetSchema onChange={setSchema} />
-
                 </div>
-                <Textarea
-                  className="h-[240px] resize-none"
-                  value={schema}
-                  onChange={e => setSchema(e.target.value)}
-                  placeholder={t('createTool.schemaPlaceHolder', { ns: 'tools' })!}
-                />
-              </div>
+                <div className="min-h-0 flex-1">
+                  <div className="flex h-full flex-col">
+                    <div className="h-0 grow space-y-4 overflow-y-auto px-6 py-3">
+                      <div>
+                        <div className="py-2 system-sm-medium text-text-primary">
+                          {t('createTool.name', { ns: 'tools' })}
+                          {' '}
+                          <span className="ml-1 text-red-500">*</span>
+                        </div>
+                        <div className="flex items-center justify-between gap-3">
+                          <AppIcon size="large" onClick={() => { setShowEmojiPicker(true) }} className="cursor-pointer" icon={emoji.content} background={emoji.background} />
+                          <Input
+                            className="h-10 grow"
+                            placeholder={t('createTool.toolNamePlaceHolder', { ns: 'tools' })!}
+                            value={customCollection.provider}
+                            onChange={(e) => {
+                              const newCollection = produce(customCollection, (draft) => {
+                                draft.provider = e.target.value
+                              })
+                              setCustomCollection(newCollection)
+                            }}
+                          />
+                        </div>
+                      </div>
 
-              {/* Available Tools  */}
-              <div>
-                <div className="py-2 system-sm-medium text-text-primary">{t('createTool.availableTools.title', { ns: 'tools' })}</div>
-                <div className="w-full overflow-x-auto rounded-lg border border-divider-regular">
-                  <table className="w-full system-xs-regular text-text-secondary">
-                    <thead className="text-text-tertiary uppercase">
-                      <tr className={cn(paramsSchemas.length > 0 && 'border-b', 'border-divider-regular')}>
-                        <th className="p-2 pl-3 font-medium">{t('createTool.availableTools.name', { ns: 'tools' })}</th>
-                        <th className="w-[236px] p-2 pl-3 font-medium">{t('createTool.availableTools.description', { ns: 'tools' })}</th>
-                        <th className="p-2 pl-3 font-medium">{t('createTool.availableTools.method', { ns: 'tools' })}</th>
-                        <th className="p-2 pl-3 font-medium">{t('createTool.availableTools.path', { ns: 'tools' })}</th>
-                        <th className="w-[54px] p-2 pl-3 font-medium">{t('createTool.availableTools.action', { ns: 'tools' })}</th>
-                      </tr>
-                    </thead>
-                    <tbody>
-                      {paramsSchemas.map((item, index) => (
-                        <tr key={index} className="border-b border-divider-regular last:border-0">
-                          <td className="p-2 pl-3">{item.operation_id}</td>
-                          <td className="w-[236px] p-2 pl-3">{item.summary}</td>
-                          <td className="p-2 pl-3">{item.method}</td>
-                          <td className="p-2 pl-3">{getPath(item.server_url)}</td>
-                          <td className="w-[62px] p-2 pl-3">
-                            <Button
-                              size="small"
-                              onClick={() => {
-                                setCurrTool(item)
-                                setIsShowTestApi(true)
-                              }}
+                      {/* Schema */}
+                      <div className="select-none">
+                        <div className="flex items-center justify-between">
+                          <div className="flex items-center">
+                            <div className="py-2 system-sm-medium text-text-primary">
+                              {t('createTool.schema', { ns: 'tools' })}
+                              <span className="ml-1 text-red-500">*</span>
+                            </div>
+                            <div className="mx-2 h-3 w-px bg-divider-regular"></div>
+                            <a
+                              href="https://swagger.io/specification/"
+                              target="_blank"
+                              rel="noopener noreferrer"
+                              className="flex h-[18px] items-center space-x-1 text-text-accent"
                             >
-                              {t('createTool.availableTools.test', { ns: 'tools' })}
-                            </Button>
-                          </td>
-                        </tr>
-                      ))}
-                    </tbody>
-                  </table>
+                              <div className="text-xs font-normal">{t('createTool.viewSchemaSpec', { ns: 'tools' })}</div>
+                              <LinkExternal02 className="h-3 w-3" />
+                            </a>
+                          </div>
+                          <GetSchema onChange={setSchema} />
+
+                        </div>
+                        <Textarea
+                          className="h-[240px] resize-none"
+                          value={schema}
+                          onChange={e => setSchema(e.target.value)}
+                          placeholder={t('createTool.schemaPlaceHolder', { ns: 'tools' })!}
+                        />
+                      </div>
+
+                      {/* Available Tools  */}
+                      <div>
+                        <div className="py-2 system-sm-medium text-text-primary">{t('createTool.availableTools.title', { ns: 'tools' })}</div>
+                        <div className="w-full overflow-x-auto rounded-lg border border-divider-regular">
+                          <table className="w-full system-xs-regular text-text-secondary">
+                            <thead className="text-text-tertiary uppercase">
+                              <tr className={cn(paramsSchemas.length > 0 && 'border-b', 'border-divider-regular')}>
+                                <th className="p-2 pl-3 font-medium">{t('createTool.availableTools.name', { ns: 'tools' })}</th>
+                                <th className="w-[236px] p-2 pl-3 font-medium">{t('createTool.availableTools.description', { ns: 'tools' })}</th>
+                                <th className="p-2 pl-3 font-medium">{t('createTool.availableTools.method', { ns: 'tools' })}</th>
+                                <th className="p-2 pl-3 font-medium">{t('createTool.availableTools.path', { ns: 'tools' })}</th>
+                                <th className="w-[54px] p-2 pl-3 font-medium">{t('createTool.availableTools.action', { ns: 'tools' })}</th>
+                              </tr>
+                            </thead>
+                            <tbody>
+                              {paramsSchemas.map((item, index) => (
+                                <tr key={index} className="border-b border-divider-regular last:border-0">
+                                  <td className="p-2 pl-3">{item.operation_id}</td>
+                                  <td className="w-[236px] p-2 pl-3">{item.summary}</td>
+                                  <td className="p-2 pl-3">{item.method}</td>
+                                  <td className="p-2 pl-3">{getPath(item.server_url)}</td>
+                                  <td className="w-[62px] p-2 pl-3">
+                                    <Button
+                                      size="small"
+                                      onClick={() => {
+                                        setCurrTool(item)
+                                        setIsShowTestApi(true)
+                                      }}
+                                    >
+                                      {t('createTool.availableTools.test', { ns: 'tools' })}
+                                    </Button>
+                                  </td>
+                                </tr>
+                              ))}
+                            </tbody>
+                          </table>
+                        </div>
+                      </div>
+
+                      {/* Authorization method */}
+                      <div>
+                        <div className="py-2 system-sm-medium text-text-primary">{t('createTool.authMethod.title', { ns: 'tools' })}</div>
+                        <div className="flex h-9 cursor-pointer items-center justify-between rounded-lg bg-components-input-bg-normal px-2.5" onClick={() => setCredentialsModalShow(true)}>
+                          <div className="system-xs-regular text-text-primary">{t(`createTool.authMethod.types.${credential.auth_type}`, { ns: 'tools' })}</div>
+                          <RiSettings2Line className="h-4 w-4 text-text-secondary" />
+                        </div>
+                      </div>
+
+                      {/* Labels */}
+                      <div>
+                        <div className="py-2 system-sm-medium text-text-primary">{t('createTool.toolInput.label', { ns: 'tools' })}</div>
+                        <LabelSelector value={labels} onChange={handleLabelSelect} />
+                      </div>
+
+                      {/* Privacy Policy */}
+                      <div>
+                        <div className="py-2 system-sm-medium text-text-primary">{t('createTool.privacyPolicy', { ns: 'tools' })}</div>
+                        <Input
+                          value={customCollection.privacy_policy}
+                          onChange={(e) => {
+                            const newCollection = produce(customCollection, (draft) => {
+                              draft.privacy_policy = e.target.value
+                            })
+                            setCustomCollection(newCollection)
+                          }}
+                          className="h-10 grow"
+                          placeholder={t('createTool.privacyPolicyPlaceholder', { ns: 'tools' }) || ''}
+                        />
+                      </div>
+
+                      <div>
+                        <div className="py-2 system-sm-medium text-text-primary">{t('createTool.customDisclaimer', { ns: 'tools' })}</div>
+                        <Input
+                          value={customCollection.custom_disclaimer}
+                          onChange={(e) => {
+                            const newCollection = produce(customCollection, (draft) => {
+                              draft.custom_disclaimer = e.target.value
+                            })
+                            setCustomCollection(newCollection)
+                          }}
+                          className="h-10 grow"
+                          placeholder={t('createTool.customDisclaimerPlaceholder', { ns: 'tools' }) || ''}
+                        />
+                      </div>
+
+                    </div>
+                    <div className={cn(isEdit ? 'justify-between' : 'justify-end', 'mt-2 flex shrink-0 rounded-b-[10px] border-t border-divider-regular bg-background-section-burn px-6 py-4')}>
+                      {
+                        isEdit && (
+                          <Button variant="primary" tone="destructive" onClick={onRemove}>{t('operation.delete', { ns: 'common' })}</Button>
+                        )
+                      }
+                      <div className="flex space-x-2">
+                        <Button onClick={onHide}>{t('operation.cancel', { ns: 'common' })}</Button>
+                        <Button variant="primary" onClick={handleSave}>{t('operation.save', { ns: 'common' })}</Button>
+                      </div>
+                    </div>
+                    {showEmojiPicker && (
+                      <EmojiPicker
+                        onSelect={(icon, icon_background) => {
+                          setEmoji({ content: icon, background: icon_background })
+                          setShowEmojiPicker(false)
+                        }}
+                        onClose={() => {
+                          setShowEmojiPicker(false)
+                        }}
+                      />
+                    )}
+                    {credentialsModalShow && (
+                      <ConfigCredentials
+                        positionCenter={isAdd}
+                        credential={credential}
+                        onChange={setCredential}
+                        onHide={() => setCredentialsModalShow(false)}
+                      />
+                    )}
+                    {isShowTestApi && (
+                      <TestApi
+                        positionCenter={isAdd}
+                        tool={currTool as CustomParamSchema}
+                        customCollection={customCollection}
+                        onHide={() => setIsShowTestApi(false)}
+                      />
+                    )}
+                  </div>
                 </div>
-              </div>
-
-              {/* Authorization method */}
-              <div>
-                <div className="py-2 system-sm-medium text-text-primary">{t('createTool.authMethod.title', { ns: 'tools' })}</div>
-                <div className="flex h-9 cursor-pointer items-center justify-between rounded-lg bg-components-input-bg-normal px-2.5" onClick={() => setCredentialsModalShow(true)}>
-                  <div className="system-xs-regular text-text-primary">{t(`createTool.authMethod.types.${credential.auth_type}`, { ns: 'tools' })}</div>
-                  <RiSettings2Line className="h-4 w-4 text-text-secondary" />
-                </div>
-              </div>
-
-              {/* Labels */}
-              <div>
-                <div className="py-2 system-sm-medium text-text-primary">{t('createTool.toolInput.label', { ns: 'tools' })}</div>
-                <LabelSelector value={labels} onChange={handleLabelSelect} />
-              </div>
-
-              {/* Privacy Policy */}
-              <div>
-                <div className="py-2 system-sm-medium text-text-primary">{t('createTool.privacyPolicy', { ns: 'tools' })}</div>
-                <Input
-                  value={customCollection.privacy_policy}
-                  onChange={(e) => {
-                    const newCollection = produce(customCollection, (draft) => {
-                      draft.privacy_policy = e.target.value
-                    })
-                    setCustomCollection(newCollection)
-                  }}
-                  className="h-10 grow"
-                  placeholder={t('createTool.privacyPolicyPlaceholder', { ns: 'tools' }) || ''}
-                />
-              </div>
-
-              <div>
-                <div className="py-2 system-sm-medium text-text-primary">{t('createTool.customDisclaimer', { ns: 'tools' })}</div>
-                <Input
-                  value={customCollection.custom_disclaimer}
-                  onChange={(e) => {
-                    const newCollection = produce(customCollection, (draft) => {
-                      draft.custom_disclaimer = e.target.value
-                    })
-                    setCustomCollection(newCollection)
-                  }}
-                  className="h-10 grow"
-                  placeholder={t('createTool.customDisclaimerPlaceholder', { ns: 'tools' }) || ''}
-                />
-              </div>
-
-            </div>
-            <div className={cn(isEdit ? 'justify-between' : 'justify-end', 'mt-2 flex shrink-0 rounded-b-[10px] border-t border-divider-regular bg-background-section-burn px-6 py-4')}>
-              {
-                isEdit && (
-                  <Button variant="primary" tone="destructive" onClick={onRemove}>{t('operation.delete', { ns: 'common' })}</Button>
-                )
-              }
-              <div className="flex space-x-2">
-                <Button onClick={onHide}>{t('operation.cancel', { ns: 'common' })}</Button>
-                <Button variant="primary" onClick={handleSave}>{t('operation.save', { ns: 'common' })}</Button>
-              </div>
-            </div>
-            {showEmojiPicker && (
-              <EmojiPicker
-                onSelect={(icon, icon_background) => {
-                  setEmoji({ content: icon, background: icon_background })
-                  setShowEmojiPicker(false)
-                }}
-                onClose={() => {
-                  setShowEmojiPicker(false)
-                }}
-              />
-            )}
-            {credentialsModalShow && (
-              <ConfigCredentials
-                positionCenter={isAdd}
-                credential={credential}
-                onChange={setCredential}
-                onHide={() => setCredentialsModalShow(false)}
-              />
-            )}
-            {isShowTestApi && (
-              <TestApi
-                positionCenter={isAdd}
-                tool={currTool as CustomParamSchema}
-                customCollection={customCollection}
-                onHide={() => setIsShowTestApi(false)}
-              />
-            )}
-          </div>
-        )}
-        isShowMask={true}
-        clickOutsideNotOpen={true}
-      />
+              </DrawerContent>
+            </DrawerPopup>
+          </DrawerViewport>
+        </DrawerPortal>
+      </Drawer>
     </>
 
   )
diff --git a/web/app/components/tools/edit-custom-collection-modal/test-api.tsx b/web/app/components/tools/edit-custom-collection-modal/test-api.tsx
index 0eecb8ca6b..19ef1bbf54 100644
--- a/web/app/components/tools/edit-custom-collection-modal/test-api.tsx
+++ b/web/app/components/tools/edit-custom-collection-modal/test-api.tsx
@@ -2,11 +2,21 @@
 import type { FC } from 'react'
 import type { Credential, CustomCollectionBackend, CustomParamSchema } from '@/app/components/tools/types'
 import { Button } from '@langgenius/dify-ui/button'
+import { cn } from '@langgenius/dify-ui/cn'
+import {
+  Drawer,
+  DrawerBackdrop,
+  DrawerCloseButton,
+  DrawerContent,
+  DrawerPopup,
+  DrawerPortal,
+  DrawerTitle,
+  DrawerViewport,
+} from '@langgenius/dify-ui/drawer'
 import { RiSettings2Line } from '@remixicon/react'
 import * as React from 'react'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import Drawer from '@/app/components/base/drawer-plus'
 import Input from '@/app/components/base/input'
 import { AuthType } from '@/app/components/tools/types'
 import { useLocale } from '@/context/i18n'
@@ -63,70 +73,96 @@ const TestApi: FC<Props> = ({
   return (
     <>
       <Drawer
-        isShow
-        positionCenter={positionCenter}
-        onHide={onHide}
-        title={`${t('test.title', { ns: 'tools' })}  ${toolName}`}
-        panelClassName="mt-2 w-[600px]!"
-        maxWidthClassName="max-w-[600px]!"
-        height="calc(100vh - 16px)"
-        headerClassName="border-b-divider-regular!"
-        body={(
-          <div className="overflow-y-auto px-6 pt-2">
-            <div className="space-y-4">
-              <div>
-                <div className="py-2 system-sm-medium text-text-primary">{t('createTool.authMethod.title', { ns: 'tools' })}</div>
-                <div className="flex h-9 cursor-pointer items-center justify-between rounded-lg bg-components-input-bg-normal px-2.5" onClick={() => setCredentialsModalShow(true)}>
-                  <div className="system-xs-regular text-text-primary">{t(`createTool.authMethod.types.${tempCredential.auth_type}`, { ns: 'tools' })}</div>
-                  <RiSettings2Line className="h-4 w-4 text-text-secondary" />
+        open
+        modal
+        disablePointerDismissal
+        swipeDirection="right"
+        onOpenChange={(open) => {
+          if (!open)
+            onHide()
+        }}
+      >
+        <DrawerPortal>
+          <DrawerBackdrop forceRender />
+          <DrawerViewport>
+            <DrawerPopup
+              className={cn(
+                'data-[swipe-direction=right]:top-2 data-[swipe-direction=right]:bottom-2 data-[swipe-direction=right]:h-auto data-[swipe-direction=right]:w-150 data-[swipe-direction=right]:max-w-[calc(100vw-1rem)] data-[swipe-direction=right]:rounded-xl data-[swipe-direction=right]:border-r-[0.5px] data-[swipe-direction=right]:border-divider-subtle',
+                positionCenter
+                  ? 'data-[swipe-direction=right]:right-[max(0.5rem,calc(50%_-_300px))]'
+                  : 'data-[swipe-direction=right]:right-2',
+              )}
+            >
+              <DrawerContent className="flex min-h-0 flex-1 flex-col p-0 pb-0">
+                <div className="shrink-0 border-b border-divider-regular py-4">
+                  <div className="flex h-6 items-center justify-between pr-5 pl-6">
+                    <DrawerTitle className="min-w-0 truncate system-xl-semibold text-text-primary">
+                      {`${t('test.title', { ns: 'tools' })}  ${toolName}`}
+                    </DrawerTitle>
+                    <DrawerCloseButton
+                      aria-label={t('operation.close', { ns: 'common' })}
+                      className="h-6 w-6 rounded-md"
+                    />
+                  </div>
                 </div>
-              </div>
+                <div className="min-h-0 flex-1 overflow-y-auto px-6 pt-2">
+                  <div className="space-y-4">
+                    <div>
+                      <div className="py-2 system-sm-medium text-text-primary">{t('createTool.authMethod.title', { ns: 'tools' })}</div>
+                      <div className="flex h-9 cursor-pointer items-center justify-between rounded-lg bg-components-input-bg-normal px-2.5" onClick={() => setCredentialsModalShow(true)}>
+                        <div className="system-xs-regular text-text-primary">{t(`createTool.authMethod.types.${tempCredential.auth_type}`, { ns: 'tools' })}</div>
+                        <RiSettings2Line className="h-4 w-4 text-text-secondary" />
+                      </div>
+                    </div>
 
-              <div>
-                <div className="py-2 system-sm-medium text-text-primary">{t('test.parametersValue', { ns: 'tools' })}</div>
-                <div className="rounded-lg border border-divider-regular">
-                  <table className="w-full system-xs-regular font-normal text-text-secondary">
-                    <thead className="text-text-tertiary uppercase">
-                      <tr className="border-b border-divider-regular">
-                        <th className="p-2 pl-3 font-medium">{t('test.parameters', { ns: 'tools' })}</th>
-                        <th className="p-2 pl-3 font-medium">{t('test.value', { ns: 'tools' })}</th>
-                      </tr>
-                    </thead>
-                    <tbody>
-                      {parameters.map((item, index) => (
-                        <tr key={index} className="border-b border-divider-regular last:border-0">
-                          <td className="py-2 pr-2.5 pl-3">
-                            {item.label[language]}
-                          </td>
-                          <td className="">
-                            <Input
-                              value={parametersValue[item.name] || ''}
-                              onChange={e => setParametersValue({ ...parametersValue, [item.name]: e.target.value })}
-                              type="text"
-                              className="!hover:border-transparent !hover:bg-transparent !focus:border-transparent !focus:bg-transparent border-transparent! bg-transparent!"
-                            />
-                          </td>
-                        </tr>
-                      ))}
-                    </tbody>
-                  </table>
+                    <div>
+                      <div className="py-2 system-sm-medium text-text-primary">{t('test.parametersValue', { ns: 'tools' })}</div>
+                      <div className="rounded-lg border border-divider-regular">
+                        <table className="w-full system-xs-regular font-normal text-text-secondary">
+                          <thead className="text-text-tertiary uppercase">
+                            <tr className="border-b border-divider-regular">
+                              <th className="p-2 pl-3 font-medium">{t('test.parameters', { ns: 'tools' })}</th>
+                              <th className="p-2 pl-3 font-medium">{t('test.value', { ns: 'tools' })}</th>
+                            </tr>
+                          </thead>
+                          <tbody>
+                            {parameters.map((item, index) => (
+                              <tr key={index} className="border-b border-divider-regular last:border-0">
+                                <td className="py-2 pr-2.5 pl-3">
+                                  {item.label[language]}
+                                </td>
+                                <td className="">
+                                  <Input
+                                    value={parametersValue[item.name] || ''}
+                                    onChange={e => setParametersValue({ ...parametersValue, [item.name]: e.target.value })}
+                                    type="text"
+                                    className="!hover:border-transparent !hover:bg-transparent !focus:border-transparent !focus:bg-transparent border-transparent! bg-transparent!"
+                                  />
+                                </td>
+                              </tr>
+                            ))}
+                          </tbody>
+                        </table>
+                      </div>
+                    </div>
+
+                  </div>
+                  <Button variant="primary" className="mt-4 h-10 w-full" loading={testing} disabled={testing} onClick={handleTest}>{t('test.title', { ns: 'tools' })}</Button>
+                  <div className="mt-6">
+                    <div className="flex items-center space-x-3">
+                      <div className="system-xs-semibold text-text-tertiary">{t('test.testResult', { ns: 'tools' })}</div>
+                      <div className="bg-[rgb(243, 244, 246)] h-px w-0 grow"></div>
+                    </div>
+                    <div className="mt-2 h-[200px] overflow-x-hidden overflow-y-auto rounded-lg bg-components-input-bg-normal px-3 py-2 system-xs-regular text-text-secondary">
+                      {result || <span className="text-text-quaternary">{t('test.testResultPlaceholder', { ns: 'tools' })}</span>}
+                    </div>
+                  </div>
                 </div>
-              </div>
-
-            </div>
-            <Button variant="primary" className="mt-4 h-10 w-full" loading={testing} disabled={testing} onClick={handleTest}>{t('test.title', { ns: 'tools' })}</Button>
-            <div className="mt-6">
-              <div className="flex items-center space-x-3">
-                <div className="system-xs-semibold text-text-tertiary">{t('test.testResult', { ns: 'tools' })}</div>
-                <div className="bg-[rgb(243, 244, 246)] h-px w-0 grow"></div>
-              </div>
-              <div className="mt-2 h-[200px] overflow-x-hidden overflow-y-auto rounded-lg bg-components-input-bg-normal px-3 py-2 system-xs-regular text-text-secondary">
-                {result || <span className="text-text-quaternary">{t('test.testResultPlaceholder', { ns: 'tools' })}</span>}
-              </div>
-            </div>
-          </div>
-        )}
-      />
+              </DrawerContent>
+            </DrawerPopup>
+          </DrawerViewport>
+        </DrawerPortal>
+      </Drawer>
       {credentialsModalShow && (
         <ConfigCredentials
           positionCenter={positionCenter}
diff --git a/web/app/components/tools/labels/__tests__/selector.spec.tsx b/web/app/components/tools/labels/__tests__/selector.spec.tsx
index 4ef4534759..13bdb48316 100644
--- a/web/app/components/tools/labels/__tests__/selector.spec.tsx
+++ b/web/app/components/tools/labels/__tests__/selector.spec.tsx
@@ -34,12 +34,28 @@ vi.mock('@langgenius/dify-ui/popover', async () => {
     )
   }
 
-  const PopoverTrigger = ({ render }: { render: React.ReactNode }) => {
+  const PopoverTrigger = ({
+    children,
+    className,
+    render,
+  }: {
+    children?: React.ReactNode
+    className?: string
+    render?: React.ReactNode
+  }) => {
     const { open, setOpen } = React.useContext(PopoverContext)
+    if (render) {
+      return (
+        <div onClick={() => setOpen(!open)}>
+          {render}
+        </div>
+      )
+    }
+
     return (
-      <div onClick={() => setOpen(!open)}>
-        {render}
-      </div>
+      <button type="button" className={className} onClick={() => setOpen(!open)}>
+        {children}
+      </button>
     )
   }
 
@@ -119,6 +135,12 @@ describe('LabelSelector', () => {
       expect(screen.getByText('tools.createTool.toolInput.labelPlaceholder')).toBeInTheDocument()
     })
 
+    it('should render the trigger as a native button', () => {
+      render(<LabelSelector value={[]} onChange={mockOnChange} />)
+
+      expect(screen.getByRole('button', { name: 'tools.createTool.toolInput.labelPlaceholder' })).toHaveAttribute('type', 'button')
+    })
+
     it('should display selected labels as comma-separated list', () => {
       render(<LabelSelector value={['agent', 'rag']} onChange={mockOnChange} />)
 
@@ -243,9 +265,7 @@ describe('LabelSelector', () => {
         vi.advanceTimersByTime(10)
       })
 
-      // Checkboxes should be visible in the dropdown
-      const checkboxes = document.querySelectorAll('[data-testid^="checkbox"]')
-      expect(checkboxes.length).toBeGreaterThan(0)
+      expect(screen.getAllByRole('checkbox').length).toBeGreaterThan(0)
     })
   })
 
diff --git a/web/app/components/tools/labels/filter.tsx b/web/app/components/tools/labels/filter.tsx
index 00fa47ace4..029d9889e5 100644
--- a/web/app/components/tools/labels/filter.tsx
+++ b/web/app/components/tools/labels/filter.tsx
@@ -77,11 +77,10 @@ const LabelFilter: FC<LabelFilterProps> = ({
           <button
             type="button"
             aria-label={t('operation.clear', { ns: 'common' })}
-            className="group/clear absolute top-1/2 right-2 -translate-y-1/2 p-px"
-            data-testid="label-filter-clear-button"
+            className="group/clear absolute top-1/2 right-2 -translate-y-1/2 border-none bg-transparent p-px"
             onClick={() => onChange([])}
           >
-            <XCircle className="h-3.5 w-3.5 text-text-tertiary group-hover/clear:text-text-secondary" />
+            <XCircle className="h-3.5 w-3.5 text-text-tertiary group-hover/clear:text-text-secondary" aria-hidden="true" />
           </button>
         )}
         <PopoverContent
@@ -104,11 +103,11 @@ const LabelFilter: FC<LabelFilterProps> = ({
                 <button
                   key={label.name}
                   type="button"
-                  className="flex w-full items-center gap-2 rounded-lg py-[6px] pr-2 pl-3 text-left select-none hover:bg-state-base-hover"
+                  className="flex w-full items-center gap-2 rounded-lg border-none bg-transparent py-[6px] pr-2 pl-3 text-left select-none hover:bg-state-base-hover"
                   onClick={() => selectLabel(label)}
                 >
                   <div title={label.label} className="grow truncate text-sm leading-5 text-text-secondary">{label.label}</div>
-                  {value.includes(label.name) && <Check className="h-4 w-4 shrink-0 text-text-accent" />}
+                  {value.includes(label.name) && <Check className="h-4 w-4 shrink-0 text-text-accent" aria-hidden="true" />}
                 </button>
               ))}
               {!filteredLabelList.length && (
diff --git a/web/app/components/tools/labels/selector.tsx b/web/app/components/tools/labels/selector.tsx
index 67539715a7..07e60e08df 100644
--- a/web/app/components/tools/labels/selector.tsx
+++ b/web/app/components/tools/labels/selector.tsx
@@ -1,17 +1,15 @@
 import type { FC } from 'react'
 import type { Label } from '@/app/components/tools/labels/constant'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import { cn } from '@langgenius/dify-ui/cn'
 import {
   Popover,
   PopoverContent,
   PopoverTrigger,
 } from '@langgenius/dify-ui/popover'
-import { RiArrowDownSLine } from '@remixicon/react'
 import { useDebounceFn } from 'ahooks'
-import { noop } from 'es-toolkit/function'
 import { useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import Checkbox from '@/app/components/base/checkbox'
 import { Tag03 } from '@/app/components/base/icons/src/vender/line/financeAndECommerce'
 import Input from '@/app/components/base/input'
 import { useTags } from '@/app/components/plugins/hooks'
@@ -60,27 +58,23 @@ const LabelSelector: FC<LabelSelectorProps> = ({
     <Popover open={open} onOpenChange={setOpen}>
       <div className="relative">
         <PopoverTrigger
-          render={(
-            <div className={cn(
-              'flex h-10 cursor-pointer items-center gap-1 rounded-lg border-[0.5px] border-transparent bg-components-input-bg-normal px-3 hover:bg-components-input-bg-hover',
-              open && '!hover:bg-components-input-bg-hover hover:bg-components-input-bg-hover',
-            )}
-            >
-              <div title={value.length > 0 ? selectedLabels : ''} className={cn('grow truncate text-[13px] leading-[18px] text-text-secondary', !value.length && 'text-text-quaternary!')}>
-                {!value.length && t('createTool.toolInput.labelPlaceholder', { ns: 'tools' })}
-                {!!value.length && selectedLabels}
-              </div>
-              <div className="ml-1 shrink-0 text-text-secondary opacity-60">
-                <RiArrowDownSLine className="h-4 w-4" />
-              </div>
-            </div>
+          className={cn(
+            'flex h-10 cursor-pointer items-center gap-1 rounded-lg border-[0.5px] border-transparent bg-components-input-bg-normal px-3 text-left hover:bg-components-input-bg-hover',
+            open && 'bg-components-input-bg-hover hover:bg-components-input-bg-hover',
           )}
-        />
+        >
+          <div title={value.length > 0 ? selectedLabels : ''} className={cn('grow truncate text-[13px] leading-4.5 text-text-secondary', !value.length && 'text-text-quaternary!')}>
+            {!value.length && t('createTool.toolInput.labelPlaceholder', { ns: 'tools' })}
+            {!!value.length && selectedLabels}
+          </div>
+          <div className="ml-1 shrink-0 text-text-secondary opacity-60">
+            <span className="i-ri-arrow-down-s-line h-4 w-4" />
+          </div>
+        </PopoverTrigger>
         <PopoverContent
           placement="bottom-start"
           sideOffset={4}
           popupClassName="border-none bg-transparent p-0 shadow-none backdrop-blur-none"
-          positionerProps={{ style: { zIndex: 1040 } }}
         >
           <div className="relative w-[591px] rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg backdrop-blur-[5px]">
             <div className="border-b-[0.5px] border-divider-regular p-2">
@@ -94,18 +88,17 @@ const LabelSelector: FC<LabelSelectorProps> = ({
             </div>
             <div className="max-h-[264px] overflow-y-auto p-1">
               {filteredLabelList.map(label => (
-                <div
+                <label
                   key={label.name}
                   className="flex cursor-pointer items-center gap-2 rounded-lg py-[6px] pr-2 pl-3 hover:bg-components-panel-on-panel-item-bg-hover"
-                  onClick={() => selectLabel(label)}
                 >
                   <Checkbox
                     className="shrink-0"
                     checked={value.includes(label.name)}
-                    onCheck={noop}
+                    onCheckedChange={() => selectLabel(label)}
                   />
                   <div title={label.label} className="grow truncate text-sm leading-5 text-text-secondary">{label.label}</div>
-                </div>
+                </label>
               ))}
               {!filteredLabelList.length && (
                 <div className="flex flex-col items-center gap-1 p-3">
diff --git a/web/app/components/tools/marketplace/index.tsx b/web/app/components/tools/marketplace/index.tsx
index e7d6a22d42..798e19686a 100644
--- a/web/app/components/tools/marketplace/index.tsx
+++ b/web/app/components/tools/marketplace/index.tsx
@@ -1,11 +1,11 @@
 import type { useMarketplace } from './hooks'
-import { useLocale } from '#i18n'
 import {
   RiArrowRightUpLine,
   RiArrowUpDoubleLine,
 } from '@remixicon/react'
 import { useTheme } from 'next-themes'
 import { useTranslation } from 'react-i18next'
+import { useLocale } from '#i18n'
 import Loading from '@/app/components/base/loading'
 import List from '@/app/components/plugins/marketplace/list'
 import { getMarketplaceUrl } from '@/utils/var'
diff --git a/web/app/components/tools/mcp/__tests__/mcp-server-modal.spec.tsx b/web/app/components/tools/mcp/__tests__/mcp-server-modal.spec.tsx
index 9029ee56a2..a3bf645ba7 100644
--- a/web/app/components/tools/mcp/__tests__/mcp-server-modal.spec.tsx
+++ b/web/app/components/tools/mcp/__tests__/mcp-server-modal.spec.tsx
@@ -3,9 +3,12 @@ import type { MCPServerDetail } from '@/app/components/tools/types'
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { fireEvent, render, screen, waitFor } from '@testing-library/react'
 import * as React from 'react'
-import { describe, expect, it, vi } from 'vitest'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
 import MCPServerModal from '../mcp-server-modal'
 
+const mockGetSocket = vi.hoisted(() => vi.fn())
+const mockSocketEmit = vi.hoisted(() => vi.fn())
+
 // Mock the services
 vi.mock('@/service/use-tools', () => ({
   useCreateMCPServer: () => ({
@@ -19,6 +22,12 @@ vi.mock('@/service/use-tools', () => ({
   useInvalidateMCPServerDetail: () => vi.fn(),
 }))
 
+vi.mock('@/app/components/workflow/collaboration/core/websocket-manager', () => ({
+  webSocketClient: {
+    getSocket: mockGetSocket,
+  },
+}))
+
 describe('MCPServerModal', () => {
   const createWrapper = () => {
     const queryClient = new QueryClient({
@@ -38,6 +47,11 @@ describe('MCPServerModal', () => {
     onHide: vi.fn(),
   }
 
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockGetSocket.mockReturnValue(null)
+  })
+
   describe('Rendering', () => {
     it('should render without crashing', () => {
       render(<MCPServerModal {...defaultProps} />, { wrapper: createWrapper() })
@@ -99,8 +113,7 @@ describe('MCPServerModal', () => {
 
     it('should render close icon', () => {
       render(<MCPServerModal {...defaultProps} />, { wrapper: createWrapper() })
-      const closeButton = document.querySelector('.cursor-pointer svg')
-      expect(closeButton)!.toBeInTheDocument()
+      expect(screen.getByRole('button', { name: /operation\.close/ }))!.toBeInTheDocument()
     })
   })
 
@@ -161,11 +174,17 @@ describe('MCPServerModal', () => {
       const onHide = vi.fn()
       render(<MCPServerModal {...defaultProps} onHide={onHide} />, { wrapper: createWrapper() })
 
-      const closeButton = document.querySelector('.cursor-pointer')
-      if (closeButton) {
-        fireEvent.click(closeButton)
-        expect(onHide).toHaveBeenCalled()
-      }
+      fireEvent.click(screen.getByRole('button', { name: /operation\.close/ }))
+      expect(onHide).toHaveBeenCalled()
+    })
+
+    it('should call onHide when the dialog requests close', () => {
+      const onHide = vi.fn()
+      render(<MCPServerModal {...defaultProps} onHide={onHide} />, { wrapper: createWrapper() })
+
+      fireEvent.keyDown(document, { key: 'Escape', code: 'Escape' })
+
+      expect(onHide).toHaveBeenCalledTimes(1)
     })
 
     it('should disable confirm button when description is empty', () => {
@@ -346,6 +365,48 @@ describe('MCPServerModal', () => {
       })
     })
 
+    it('should ignore parameters without variables when rendering and submitting', async () => {
+      const onHide = vi.fn()
+      const latestParams = [
+        { label: 'Missing variable', type: 'string' },
+      ]
+
+      render(
+        <MCPServerModal {...defaultProps} latestParams={latestParams} onHide={onHide} />,
+        { wrapper: createWrapper() },
+      )
+
+      expect(screen.queryByText('Missing variable')).not.toBeInTheDocument()
+
+      fireEvent.change(screen.getByPlaceholderText('tools.mcp.server.modal.descriptionPlaceholder'), {
+        target: { value: 'Test description' },
+      })
+      fireEvent.click(screen.getByText('tools.mcp.server.modal.confirm'))
+
+      await waitFor(() => {
+        expect(onHide).toHaveBeenCalled()
+      })
+    })
+
+    it('should emit a created update when socket exists', async () => {
+      const onHide = vi.fn()
+      mockGetSocket.mockReturnValue({ emit: mockSocketEmit })
+
+      render(<MCPServerModal {...defaultProps} onHide={onHide} />, { wrapper: createWrapper() })
+
+      fireEvent.change(screen.getByPlaceholderText('tools.mcp.server.modal.descriptionPlaceholder'), {
+        target: { value: 'Test description' },
+      })
+      fireEvent.click(screen.getByText('tools.mcp.server.modal.confirm'))
+
+      await waitFor(() => {
+        expect(mockSocketEmit).toHaveBeenCalledWith('collaboration_event', expect.objectContaining({
+          type: 'mcp_server_update',
+          data: expect.objectContaining({ action: 'created' }),
+        }))
+      })
+    })
+
     it('should handle empty description submission', async () => {
       const onHide = vi.fn()
       render(<MCPServerModal {...defaultProps} onHide={onHide} />, { wrapper: createWrapper() })
diff --git a/web/app/components/tools/mcp/__tests__/modal.spec.tsx b/web/app/components/tools/mcp/__tests__/modal.spec.tsx
index a57f88ecad..435d06b75f 100644
--- a/web/app/components/tools/mcp/__tests__/modal.spec.tsx
+++ b/web/app/components/tools/mcp/__tests__/modal.spec.tsx
@@ -227,16 +227,8 @@ describe('MCPModal', () => {
       const onHide = vi.fn()
       render(<MCPModal {...defaultProps} onHide={onHide} />, { wrapper: createWrapper() })
 
-      // Find the close button by its parent div with cursor-pointer class
-      const closeButtons = document.querySelectorAll('.cursor-pointer')
-      const closeButton = Array.from(closeButtons).find(el =>
-        el.querySelector('svg'),
-      )
-
-      if (closeButton) {
-        fireEvent.click(closeButton)
-        expect(onHide).toHaveBeenCalled()
-      }
+      fireEvent.click(screen.getByRole('button', { name: /operation\.close/ }))
+      expect(onHide).toHaveBeenCalled()
     })
 
     it('should have confirm button disabled when form is empty', () => {
diff --git a/web/app/components/tools/mcp/detail/__tests__/provider-detail.spec.tsx b/web/app/components/tools/mcp/detail/__tests__/provider-detail.spec.tsx
index 05380916b2..4d69d89516 100644
--- a/web/app/components/tools/mcp/detail/__tests__/provider-detail.spec.tsx
+++ b/web/app/components/tools/mcp/detail/__tests__/provider-detail.spec.tsx
@@ -6,15 +6,6 @@ import * as React from 'react'
 import { describe, expect, it, vi } from 'vitest'
 import MCPDetailPanel from '../provider-detail'
 
-// Mock the drawer component
-vi.mock('@/app/components/base/drawer', () => ({
-  default: ({ children, isOpen }: { children: ReactNode, isOpen: boolean }) => {
-    if (!isOpen)
-      return null
-    return <div data-testid="drawer">{children}</div>
-  },
-}))
-
 // Mock the content component to expose onUpdate callback
 vi.mock('../content', () => ({
   default: ({ detail, onUpdate }: { detail: ToolWithProvider, onUpdate: (isDelete?: boolean) => void }) => (
@@ -71,7 +62,7 @@ describe('MCPDetailPanel', () => {
         <MCPDetailPanel {...defaultProps} detail={detail} />,
         { wrapper: createWrapper() },
       )
-      expect(screen.getByTestId('drawer')).toBeInTheDocument()
+      expect(screen.getByRole('dialog')).toBeInTheDocument()
     })
 
     it('should render content when detail is provided', () => {
diff --git a/web/app/components/tools/mcp/detail/provider-detail.tsx b/web/app/components/tools/mcp/detail/provider-detail.tsx
index 7b2d351637..e704e6d262 100644
--- a/web/app/components/tools/mcp/detail/provider-detail.tsx
+++ b/web/app/components/tools/mcp/detail/provider-detail.tsx
@@ -2,8 +2,15 @@
 import type { FC } from 'react'
 import type { ToolWithProvider } from '../../../workflow/types'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  Drawer,
+  DrawerBackdrop,
+  DrawerContent,
+  DrawerPopup,
+  DrawerPortal,
+  DrawerViewport,
+} from '@langgenius/dify-ui/drawer'
 import * as React from 'react'
-import Drawer from '@/app/components/base/drawer'
 import MCPDetailContent from './content'
 
 type Props = {
@@ -32,23 +39,32 @@ const MCPDetailPanel: FC<Props> = ({
 
   return (
     <Drawer
-      isOpen={!!detail}
-      clickOutsideNotOpen={false}
-      onClose={onHide}
-      footer={null}
-      mask={false}
-      positionCenter={false}
-      panelClassName={cn('mt-[64px] mr-2 mb-2 w-[420px]! max-w-[420px]! justify-start rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg! p-0! shadow-xl')}
+      open={!!detail}
+      modal
+      swipeDirection="right"
+      onOpenChange={(open) => {
+        if (!open)
+          onHide()
+      }}
     >
-      {detail && (
-        <MCPDetailContent
-          detail={detail}
-          onHide={onHide}
-          onUpdate={handleUpdate}
-          isTriggerAuthorize={isTriggerAuthorize}
-          onFirstCreate={onFirstCreate}
-        />
-      )}
+      <DrawerPortal>
+        <DrawerBackdrop className="bg-transparent" />
+        <DrawerViewport>
+          <DrawerPopup className={cn('justify-start bg-components-panel-bg! p-0! shadow-xl data-[swipe-direction=right]:top-16 data-[swipe-direction=right]:right-2 data-[swipe-direction=right]:bottom-2 data-[swipe-direction=right]:h-auto data-[swipe-direction=right]:w-[420px] data-[swipe-direction=right]:max-w-[420px] data-[swipe-direction=right]:rounded-2xl data-[swipe-direction=right]:border-[0.5px] data-[swipe-direction=right]:border-components-panel-border')}>
+            <DrawerContent className="flex min-h-0 flex-1 flex-col p-0 pb-0">
+              {detail && (
+                <MCPDetailContent
+                  detail={detail}
+                  onHide={onHide}
+                  onUpdate={handleUpdate}
+                  isTriggerAuthorize={isTriggerAuthorize}
+                  onFirstCreate={onFirstCreate}
+                />
+              )}
+            </DrawerContent>
+          </DrawerPopup>
+        </DrawerViewport>
+      </DrawerPortal>
     </Drawer>
   )
 }
diff --git a/web/app/components/tools/mcp/mcp-server-modal.tsx b/web/app/components/tools/mcp/mcp-server-modal.tsx
index ab4a5c36f4..f4653a33eb 100644
--- a/web/app/components/tools/mcp/mcp-server-modal.tsx
+++ b/web/app/components/tools/mcp/mcp-server-modal.tsx
@@ -3,12 +3,11 @@ import type {
   MCPServerDetail,
 } from '@/app/components/tools/types'
 import { Button } from '@langgenius/dify-ui/button'
-import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { RiCloseLine } from '@remixicon/react'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import Divider from '@/app/components/base/divider'
-import Modal from '@/app/components/base/modal'
 import Textarea from '@/app/components/base/textarea'
 import MCPServerParamItem from '@/app/components/tools/mcp/mcp-server-param-item'
 import { webSocketClient } from '@/app/components/workflow/collaboration/core/websocket-manager'
@@ -20,11 +19,19 @@ import {
 
 type ModalProps = {
   appID: string
-  latestParams?: any[]
+  latestParams?: MCPServerParam[]
   data?: MCPServerDetail
   show: boolean
   onHide: () => void
-  appInfo?: any
+  appInfo?: {
+    description?: string
+  }
+}
+
+type MCPServerParam = {
+  variable?: string
+  label?: string
+  type?: string
 }
 
 const MCPServerModal = ({
@@ -42,7 +49,7 @@ const MCPServerModal = ({
 
   const defaultDescription = data?.description || appInfo?.description || ''
   const [description, setDescription] = React.useState(defaultDescription)
-  const [params, setParams] = React.useState(data?.parameters || {})
+  const [params, setParams] = React.useState<Record<string, string>>(data?.parameters || {})
 
   const handleParamChange = (variable: string, value: string) => {
     setParams(prev => ({
@@ -52,10 +59,14 @@ const MCPServerModal = ({
   }
 
   const getParamValue = () => {
-    const res = {} as any
-    latestParams.map((param) => {
-      res[param.variable] = params[param.variable]
-      return param
+    const res: Record<string, string> = {}
+    latestParams.forEach((param) => {
+      if (!param.variable)
+        return
+
+      const value = params[param.variable]
+      if (value !== undefined)
+        res[param.variable] = value
     })
     return res
   }
@@ -78,7 +89,11 @@ const MCPServerModal = ({
 
   const submit = async () => {
     if (!data) {
-      const payload: any = {
+      const payload: {
+        appID: string
+        description?: string
+        parameters: Record<string, string>
+      } = {
         appID,
         parameters: getParamValue(),
       }
@@ -92,13 +107,18 @@ const MCPServerModal = ({
       onHide()
     }
     else {
-      const payload: any = {
+      const payload: {
+        appID: string
+        id: string
+        description: string
+        parameters: Record<string, string>
+      } = {
         appID,
         id: data.id,
         parameters: getParamValue(),
+        description,
       }
 
-      payload.description = description
       await updateMCPServer(payload)
       invalidateMCPServerDetail(appID)
       emitMcpServerUpdate('updated')
@@ -107,56 +127,75 @@ const MCPServerModal = ({
   }
 
   return (
-    <Modal
-      isShow={show}
-      onClose={onHide}
-      className={cn('relative max-w-[520px]! p-0!')}
+    <Dialog
+      open={show}
+      onOpenChange={(open) => {
+        if (!open)
+          onHide()
+      }}
     >
-      <div className="absolute top-5 right-5 z-10 cursor-pointer p-1.5" onClick={onHide}>
-        <RiCloseLine className="h-5 w-5 text-text-tertiary" />
-      </div>
-      <div className="relative p-6 pb-3 title-2xl-semi-bold text-xl text-text-primary">
-        {!data ? t('mcp.server.modal.addTitle', { ns: 'tools' }) : t('mcp.server.modal.editTitle', { ns: 'tools' })}
-      </div>
-      <div className="space-y-5 px-6 py-3">
-        <div className="space-y-0.5">
-          <div className="flex h-6 items-center gap-1">
-            <div className="system-sm-medium text-text-secondary">{t('mcp.server.modal.description', { ns: 'tools' })}</div>
-            <div className="system-xs-regular text-text-destructive-secondary">*</div>
-          </div>
-          <Textarea
-            className="h-[96px] resize-none"
-            value={description}
-            placeholder={t('mcp.server.modal.descriptionPlaceholder', { ns: 'tools' })}
-            onChange={e => setDescription(e.target.value)}
-          >
-          </Textarea>
+      <DialogContent className="flex max-h-[calc(100dvh-2rem)] w-[calc(100vw-2rem)] max-w-[520px]! flex-col overflow-hidden! border-none p-0! text-left align-middle transition-all duration-100 ease-in">
+        <button
+          type="button"
+          aria-label={t('operation.close', { ns: 'common' })}
+          className="absolute top-5 right-5 z-10 cursor-pointer border-none bg-transparent p-1.5 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+          onClick={onHide}
+        >
+          <RiCloseLine className="h-5 w-5 text-text-tertiary" aria-hidden="true" />
+        </button>
+        <div className="relative shrink-0 p-6 pr-12 pb-3 title-2xl-semi-bold text-xl wrap-break-word text-text-primary">
+          {!data ? t('mcp.server.modal.addTitle', { ns: 'tools' }) : t('mcp.server.modal.editTitle', { ns: 'tools' })}
         </div>
-        {latestParams.length > 0 && (
-          <div>
-            <div className="mb-1 flex items-center gap-2">
-              <div className="shrink-0 system-xs-medium-uppercase text-text-primary">{t('mcp.server.modal.parameters', { ns: 'tools' })}</div>
-              <Divider type="horizontal" className="m-0! h-px! grow bg-divider-subtle" />
-            </div>
-            <div className="mb-2 body-xs-regular text-text-tertiary">{t('mcp.server.modal.parametersTip', { ns: 'tools' })}</div>
-            <div className="space-y-3">
-              {latestParams.map(paramItem => (
-                <MCPServerParamItem
-                  key={paramItem.variable}
-                  data={paramItem}
-                  value={params[paramItem.variable] || ''}
-                  onChange={value => handleParamChange(paramItem.variable, value)}
-                />
-              ))}
+        <div className="min-h-0 min-w-0 flex-1 overflow-x-hidden overflow-y-auto">
+          <div className="min-w-0 space-y-5 px-6 py-3">
+            <div className="space-y-0.5">
+              <div className="flex h-6 items-center gap-1">
+                <div className="system-sm-medium text-text-secondary">{t('mcp.server.modal.description', { ns: 'tools' })}</div>
+                <div className="system-xs-regular text-text-destructive-secondary">*</div>
+              </div>
+              <Textarea
+                className="h-[96px] resize-none"
+                value={description}
+                placeholder={t('mcp.server.modal.descriptionPlaceholder', { ns: 'tools' })}
+                onChange={e => setDescription(e.target.value)}
+              >
+              </Textarea>
             </div>
+
+            {latestParams.length > 0 && (
+              <div className="min-w-0">
+                <div className="mb-1 flex items-center gap-2">
+                  <div className="shrink-0 system-xs-medium-uppercase text-text-primary">{t('mcp.server.modal.parameters', { ns: 'tools' })}</div>
+                  <Divider type="horizontal" className="m-0! h-px! grow bg-divider-subtle" />
+                </div>
+                <div className="mb-2 body-xs-regular text-text-tertiary">{t('mcp.server.modal.parametersTip', { ns: 'tools' })}</div>
+                <div className="min-w-0 space-y-3">
+                  {latestParams.map((paramItem) => {
+                    if (!paramItem.variable)
+                      return null
+
+                    const { variable } = paramItem
+
+                    return (
+                      <MCPServerParamItem
+                        key={variable}
+                        data={paramItem}
+                        value={params[variable] || ''}
+                        onChange={value => handleParamChange(variable, value)}
+                      />
+                    )
+                  })}
+                </div>
+              </div>
+            )}
           </div>
-        )}
-      </div>
-      <div className="flex flex-row-reverse p-6 pt-5">
-        <Button disabled={!description || creating || updating} className="ml-2" variant="primary" onClick={submit}>{data ? t('mcp.modal.save', { ns: 'tools' }) : t('mcp.server.modal.confirm', { ns: 'tools' })}</Button>
-        <Button onClick={onHide}>{t('mcp.modal.cancel', { ns: 'tools' })}</Button>
-      </div>
-    </Modal>
+        </div>
+        <div className="flex shrink-0 flex-row-reverse flex-wrap gap-2 p-6 pt-5">
+          <Button disabled={!description || creating || updating} variant="primary" onClick={submit}>{data ? t('mcp.modal.save', { ns: 'tools' }) : t('mcp.server.modal.confirm', { ns: 'tools' })}</Button>
+          <Button onClick={onHide}>{t('mcp.modal.cancel', { ns: 'tools' })}</Button>
+        </div>
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/components/tools/mcp/mcp-server-param-item.tsx b/web/app/components/tools/mcp/mcp-server-param-item.tsx
index db27cfdf98..316bbca556 100644
--- a/web/app/components/tools/mcp/mcp-server-param-item.tsx
+++ b/web/app/components/tools/mcp/mcp-server-param-item.tsx
@@ -17,12 +17,12 @@ const MCPServerParamItem = ({
   const { t } = useTranslation()
 
   return (
-    <div className="space-y-0.5">
-      <div className="flex h-6 items-center gap-2">
-        <div className="system-xs-medium text-text-secondary">{data.label}</div>
+    <div className="min-w-0 space-y-0.5">
+      <div className="flex min-h-6 min-w-0 flex-wrap items-center gap-2">
+        <div className="max-w-full min-w-0 system-xs-medium wrap-break-word text-text-secondary">{data.label}</div>
         <div className="system-xs-medium text-text-quaternary">·</div>
-        <div className="system-xs-medium text-text-secondary">{data.variable}</div>
-        <div className="system-xs-medium text-text-tertiary">{data.type}</div>
+        <div className="max-w-full min-w-0 system-xs-medium break-all text-text-secondary">{data.variable}</div>
+        <div className="max-w-full min-w-0 system-xs-medium wrap-break-word text-text-tertiary">{data.type}</div>
       </div>
       <Textarea
         className="h-8 resize-none"
diff --git a/web/app/components/tools/mcp/modal.tsx b/web/app/components/tools/mcp/modal.tsx
index 165535127d..0fe81589a8 100644
--- a/web/app/components/tools/mcp/modal.tsx
+++ b/web/app/components/tools/mcp/modal.tsx
@@ -4,17 +4,15 @@ import type { AppIconSelection } from '@/app/components/base/app-icon-picker'
 import type { ToolWithProvider } from '@/app/components/workflow/types'
 import type { AppIconType } from '@/types/app'
 import { Button } from '@langgenius/dify-ui/button'
-import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
 import { RiCloseLine, RiEditLine } from '@remixicon/react'
 import { useHover } from 'ahooks'
-import { noop } from 'es-toolkit/function'
 import { useTranslation } from 'react-i18next'
 import AppIcon from '@/app/components/base/app-icon'
 import AppIconPicker from '@/app/components/base/app-icon-picker'
 import { Mcp } from '@/app/components/base/icons/src/vender/other'
 import Input from '@/app/components/base/input'
-import Modal from '@/app/components/base/modal'
 import TabSlider from '@/app/components/base/tab-slider'
 import { MCPAuthMethod } from '@/app/components/tools/types'
 import { shouldUseMcpIconForAppIcon } from '@/utils/mcp'
@@ -131,9 +129,14 @@ const MCPModalContent: FC<MCPModalContentProps> = ({
 
   return (
     <>
-      <div className="absolute top-5 right-5 z-10 cursor-pointer p-1.5" onClick={onHide}>
-        <RiCloseLine className="h-5 w-5 text-text-tertiary" />
-      </div>
+      <button
+        type="button"
+        aria-label={t('operation.close', { ns: 'common' })}
+        className="absolute top-5 right-5 z-10 cursor-pointer border-none bg-transparent p-1.5 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+        onClick={onHide}
+      >
+        <RiCloseLine className="h-5 w-5 text-text-tertiary" aria-hidden="true" />
+      </button>
       <div className="relative pb-3 title-2xl-semi-bold text-xl text-text-primary">
         {!isCreate ? t('mcp.modal.editTitle', { ns: 'tools' }) : t('mcp.modal.title', { ns: 'tools' })}
       </div>
@@ -281,18 +284,16 @@ const MCPModal: FC<DuplicateAppModalProps> = ({
   const formKey = data?.id ?? 'create'
 
   return (
-    <Modal
-      isShow={show}
-      onClose={noop}
-      className={cn('relative max-w-[520px]!', 'p-6')}
-    >
-      <MCPModalContent
-        key={formKey}
-        data={data}
-        onConfirm={onConfirm}
-        onHide={onHide}
-      />
-    </Modal>
+    <Dialog open={show}>
+      <DialogContent className="w-full max-w-[520px]! border-none p-6 text-left align-middle">
+        <MCPModalContent
+          key={formKey}
+          data={data}
+          onConfirm={onConfirm}
+          onHide={onHide}
+        />
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/components/tools/provider/__tests__/detail.spec.tsx b/web/app/components/tools/provider/__tests__/detail.spec.tsx
index d510eb2a34..5a26589e11 100644
--- a/web/app/components/tools/provider/__tests__/detail.spec.tsx
+++ b/web/app/components/tools/provider/__tests__/detail.spec.tsx
@@ -74,11 +74,6 @@ vi.mock('@/utils/var', () => ({
   basePath: '',
 }))
 
-vi.mock('@/app/components/base/drawer', () => ({
-  default: ({ children, isOpen }: { children: React.ReactNode, isOpen: boolean }) =>
-    isOpen ? <div data-testid="drawer">{children}</div> : null,
-}))
-
 const mockToastSuccess = vi.hoisted(() => vi.fn())
 const mockToastError = vi.hoisted(() => vi.fn())
 vi.mock('@langgenius/dify-ui/toast', () => ({
@@ -133,8 +128,8 @@ vi.mock('@/app/components/tools/setting/build-in/config-credentials', () => ({
 }))
 
 vi.mock('@/app/components/tools/workflow-tool', () => ({
-  default: ({ onHide, onSave, onRemove }: { onHide: () => void, onSave: (data: unknown) => void, onRemove: () => void }) => (
-    <div data-testid="workflow-tool-modal">
+  WorkflowToolDrawer: ({ onHide, onSave, onRemove }: { onHide: () => void, onSave: (data: unknown) => void, onRemove: () => void }) => (
+    <div data-testid="workflow-tool-drawer">
       <button data-testid="wf-save" onClick={() => onSave({ name: 'test' })}>Save</button>
       <button data-testid="wf-remove" onClick={onRemove}>Remove</button>
       <button data-testid="wf-close" onClick={onHide}>Close</button>
@@ -581,7 +576,7 @@ describe('ProviderDetail', () => {
       })
     })
 
-    it('saves workflow tool via workflow modal', async () => {
+    it('saves workflow tool via workflow drawer', async () => {
       render(
         <ProviderDetail
           collection={createMockCollection({ type: CollectionType.workflow })}
@@ -593,7 +588,7 @@ describe('ProviderDetail', () => {
         expect(screen.getByText('tools.createTool.editAction'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('tools.createTool.editAction'))
-      expect(screen.getByTestId('workflow-tool-modal'))!.toBeInTheDocument()
+      expect(screen.getByTestId('workflow-tool-drawer'))!.toBeInTheDocument()
       await act(async () => {
         fireEvent.click(screen.getByTestId('wf-save'))
       })
@@ -627,7 +622,7 @@ describe('ProviderDetail', () => {
     })
   })
 
-  describe('Modal Close Actions', () => {
+  describe('Overlay Close Actions', () => {
     it('closes ConfigCredential when cancel is clicked', async () => {
       render(
         <ProviderDetail
@@ -665,7 +660,7 @@ describe('ProviderDetail', () => {
       expect(screen.queryByTestId('edit-custom-modal')).not.toBeInTheDocument()
     })
 
-    it('closes WorkflowToolModal via onHide', async () => {
+    it('closes WorkflowToolDrawer via onHide', async () => {
       render(
         <ProviderDetail
           collection={createMockCollection({ type: CollectionType.workflow })}
@@ -677,9 +672,9 @@ describe('ProviderDetail', () => {
         expect(screen.getByText('tools.createTool.editAction'))!.toBeInTheDocument()
       })
       fireEvent.click(screen.getByText('tools.createTool.editAction'))
-      expect(screen.getByTestId('workflow-tool-modal'))!.toBeInTheDocument()
+      expect(screen.getByTestId('workflow-tool-drawer'))!.toBeInTheDocument()
       fireEvent.click(screen.getByTestId('wf-close'))
-      expect(screen.queryByTestId('workflow-tool-modal')).not.toBeInTheDocument()
+      expect(screen.queryByTestId('workflow-tool-drawer')).not.toBeInTheDocument()
     })
   })
 
diff --git a/web/app/components/tools/provider/detail.tsx b/web/app/components/tools/provider/detail.tsx
index eee3f423bb..359f6af88c 100644
--- a/web/app/components/tools/provider/detail.tsx
+++ b/web/app/components/tools/provider/detail.tsx
@@ -1,6 +1,6 @@
 'use client'
 import type { Collection, CustomCollectionBackend, Tool, WorkflowToolProviderRequest, WorkflowToolProviderResponse } from '../types'
-import type { WorkflowToolModalPayload } from '@/app/components/tools/workflow-tool'
+import type { WorkflowToolDrawerPayload } from '@/app/components/tools/workflow-tool'
 import {
   AlertDialog,
   AlertDialogActions,
@@ -12,6 +12,14 @@ import {
 } from '@langgenius/dify-ui/alert-dialog'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  Drawer,
+  DrawerBackdrop,
+  DrawerContent,
+  DrawerPopup,
+  DrawerPortal,
+  DrawerViewport,
+} from '@langgenius/dify-ui/drawer'
 import { toast } from '@langgenius/dify-ui/toast'
 import {
   RiCloseLine,
@@ -20,7 +28,6 @@ import * as React from 'react'
 import { useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import ActionButton from '@/app/components/base/action-button'
-import Drawer from '@/app/components/base/drawer'
 import { LinkExternal02, Settings01 } from '@/app/components/base/icons/src/vender/line/general'
 import Loading from '@/app/components/base/loading'
 import { ConfigurationMethodEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
@@ -31,7 +38,7 @@ import OrgInfo from '@/app/components/plugins/card/base/org-info'
 import Title from '@/app/components/plugins/card/base/title'
 import EditCustomToolModal from '@/app/components/tools/edit-custom-collection-modal'
 import ConfigCredential from '@/app/components/tools/setting/build-in/config-credentials'
-import WorkflowToolModal from '@/app/components/tools/workflow-tool'
+import { WorkflowToolDrawer } from '@/app/components/tools/workflow-tool'
 import { useAppContext } from '@/context/app-context'
 import { useLocale } from '@/context/i18n'
 import { useModalContext } from '@/context/modal-context'
@@ -140,7 +147,7 @@ const ProviderDetail = ({
     setIsShowEditCustomCollectionModal(false)
   }
   // workflow provider
-  const [isShowEditWorkflowToolModal, setIsShowEditWorkflowToolModal] = useState(false)
+  const [workflowToolDrawerOpen, setWorkflowToolDrawerOpen] = useState(false)
   const getWorkflowToolProvider = useCallback(async () => {
     setIsDetailLoading(true)
     const res = await fetchWorkflowToolDetail(collection.id)
@@ -164,7 +171,7 @@ const ProviderDetail = ({
     await deleteWorkflowTool(collection.id)
     onRefreshData()
     toast.success(t('api.actionSuccess', { ns: 'common' }))
-    setIsShowEditWorkflowToolModal(false)
+    setWorkflowToolDrawerOpen(false)
   }
   const updateWorkflowToolProvider = async (data: WorkflowToolProviderRequest & Partial<{
     workflow_app_id: string
@@ -175,7 +182,7 @@ const ProviderDetail = ({
     onRefreshData()
     getWorkflowToolProvider()
     toast.success(t('api.actionSuccess', { ns: 'common' }))
-    setIsShowEditWorkflowToolModal(false)
+    setWorkflowToolDrawerOpen(false)
   }
   const onClickCustomToolDelete = () => {
     setDeleteAction('customTool')
@@ -230,204 +237,213 @@ const ProviderDetail = ({
 
   return (
     <Drawer
-      isOpen={!!collection}
-      clickOutsideNotOpen={false}
-      onClose={onHide}
-      footer={null}
-      mask={false}
-      positionCenter={false}
-      panelClassName={cn('mt-[64px] mr-2 mb-2 w-[420px]! max-w-[420px]! justify-start rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg! p-0! shadow-xl')}
+      open={!!collection}
+      modal
+      swipeDirection="right"
+      onOpenChange={(open) => {
+        if (!open)
+          onHide()
+      }}
     >
-      <div className="flex h-full flex-col p-4">
-        <div className="shrink-0">
-          <div className="mb-3 flex">
-            <Icon src={collection.icon} />
-            <div className="ml-3 w-0 grow">
-              <div className="flex h-5 items-center">
-                <Title title={collection.label[language]!} />
-              </div>
-              <div className="mt-0.5 mb-1 flex h-4 items-center justify-between">
-                <OrgInfo
-                  packageNameClassName="w-auto"
-                  orgName={collection.author}
-                  packageName={collection.name}
-                />
-              </div>
-            </div>
-            <div className="flex gap-1">
-              <ActionButton onClick={onHide}>
-                <RiCloseLine className="h-4 w-4" />
-              </ActionButton>
-            </div>
-          </div>
-        </div>
-        {!!collection.description[language] && (
-          <Description text={collection.description[language]} descriptionLineRows={2}></Description>
-        )}
-        <div className="flex gap-1 border-b-[0.5px] border-divider-subtle">
-          {collection.type === CollectionType.custom && !isDetailLoading && (
-            <Button
-              className={cn('my-3 w-full shrink-0')}
-              onClick={() => setIsShowEditCustomCollectionModal(true)}
-            >
-              <Settings01 className="mr-1 h-4 w-4 text-text-tertiary" />
-              <div className="system-sm-medium text-text-secondary">{t('createTool.editAction', { ns: 'tools' })}</div>
-            </Button>
-          )}
-          {collection.type === CollectionType.workflow && !isDetailLoading && customCollection && (
-            <>
-              <Button
-                variant="primary"
-                className={cn('my-3 w-[183px] shrink-0')}
-              >
-                <a className="flex items-center" href={`${basePath}/app/${(customCollection as WorkflowToolProviderResponse).workflow_app_id}/workflow`} rel="noreferrer" target="_blank">
-                  <div className="system-sm-medium">{t('openInStudio', { ns: 'tools' })}</div>
-                  <LinkExternal02 className="ml-1 h-4 w-4" />
-                </a>
-              </Button>
-              <Button
-                className={cn('my-3 w-[183px] shrink-0')}
-                onClick={() => setIsShowEditWorkflowToolModal(true)}
-                disabled={!isCurrentWorkspaceManager}
-              >
-                <div className="system-sm-medium text-text-secondary">{t('createTool.editAction', { ns: 'tools' })}</div>
-              </Button>
-            </>
-          )}
-        </div>
-        <div className="flex min-h-0 flex-1 flex-col pt-3">
-          {isDetailLoading && <div className="flex h-[200px]"><Loading type="app" /></div>}
-          {!isDetailLoading && (
-            <>
-              <div className="shrink-0">
-                {(collection.type === CollectionType.builtIn || collection.type === CollectionType.model) && isAuthed && (
-                  <div className="mb-1 flex h-6 items-center justify-between system-sm-semibold-uppercase text-text-secondary">
-                    {t('detailPanel.actionNum', { ns: 'plugin', num: toolList.length, action: toolList.length > 1 ? 'actions' : 'action' })}
-                    {needAuth && (
+      <DrawerPortal>
+        <DrawerBackdrop className="bg-transparent" />
+        <DrawerViewport>
+          <DrawerPopup className={cn('justify-start bg-components-panel-bg! p-0! shadow-xl data-[swipe-direction=right]:top-16 data-[swipe-direction=right]:right-2 data-[swipe-direction=right]:bottom-2 data-[swipe-direction=right]:h-auto data-[swipe-direction=right]:w-[420px] data-[swipe-direction=right]:max-w-[420px] data-[swipe-direction=right]:rounded-2xl data-[swipe-direction=right]:border-[0.5px] data-[swipe-direction=right]:border-components-panel-border')}>
+            <DrawerContent className="flex min-h-0 flex-1 flex-col p-0 pb-0">
+              <div className="flex h-full flex-col p-4">
+                <div className="shrink-0">
+                  <div className="mb-3 flex">
+                    <Icon src={collection.icon} />
+                    <div className="ml-3 w-0 grow">
+                      <div className="flex h-5 items-center">
+                        <Title title={collection.label[language]!} />
+                      </div>
+                      <div className="mt-0.5 mb-1 flex h-4 items-center justify-between">
+                        <OrgInfo
+                          packageNameClassName="w-auto"
+                          orgName={collection.author}
+                          packageName={collection.name}
+                        />
+                      </div>
+                    </div>
+                    <div className="flex gap-1">
+                      <ActionButton aria-label={t('operation.close', { ns: 'common' })} onClick={onHide}>
+                        <RiCloseLine className="h-4 w-4" />
+                      </ActionButton>
+                    </div>
+                  </div>
+                </div>
+                {!!collection.description[language] && (
+                  <Description text={collection.description[language]} descriptionLineRows={2}></Description>
+                )}
+                <div className="flex gap-1 border-b-[0.5px] border-divider-subtle">
+                  {collection.type === CollectionType.custom && !isDetailLoading && (
+                    <Button
+                      className={cn('my-3 w-full shrink-0')}
+                      onClick={() => setIsShowEditCustomCollectionModal(true)}
+                    >
+                      <Settings01 className="mr-1 h-4 w-4 text-text-tertiary" />
+                      <div className="system-sm-medium text-text-secondary">{t('createTool.editAction', { ns: 'tools' })}</div>
+                    </Button>
+                  )}
+                  {collection.type === CollectionType.workflow && !isDetailLoading && customCollection && (
+                    <>
                       <Button
-                        variant="secondary"
-                        size="small"
-                        onClick={() => {
-                          if (collection.type === CollectionType.builtIn || collection.type === CollectionType.model)
-                            showSettingAuthModal()
-                        }}
+                        variant="primary"
+                        className={cn('my-3 w-[183px] shrink-0')}
+                      >
+                        <a className="flex items-center" href={`${basePath}/app/${(customCollection as WorkflowToolProviderResponse).workflow_app_id}/workflow`} rel="noreferrer" target="_blank">
+                          <div className="system-sm-medium">{t('openInStudio', { ns: 'tools' })}</div>
+                          <LinkExternal02 className="ml-1 h-4 w-4" />
+                        </a>
+                      </Button>
+                      <Button
+                        className={cn('my-3 w-[183px] shrink-0')}
+                        onClick={() => setWorkflowToolDrawerOpen(true)}
                         disabled={!isCurrentWorkspaceManager}
                       >
-                        <Indicator className="mr-2" color="green" />
-                        {t('auth.authorized', { ns: 'tools' })}
+                        <div className="system-sm-medium text-text-secondary">{t('createTool.editAction', { ns: 'tools' })}</div>
                       </Button>
-                    )}
-                  </div>
-                )}
-                {(collection.type === CollectionType.builtIn || collection.type === CollectionType.model) && needAuth && !isAuthed && (
-                  <>
-                    <div className="system-sm-semibold-uppercase text-text-secondary">
-                      <span className="">{t('includeToolNum', { ns: 'tools', num: toolList.length, action: toolList.length > 1 ? 'actions' : 'action' }).toLocaleUpperCase()}</span>
-                      <span className="px-1">·</span>
-                      <span className="text-util-colors-orange-orange-600">{t('auth.setup', { ns: 'tools' }).toLocaleUpperCase()}</span>
-                    </div>
-                    <Button
-                      variant="primary"
-                      className={cn('my-3 w-full shrink-0')}
-                      onClick={() => {
-                        if (collection.type === CollectionType.builtIn || collection.type === CollectionType.model)
-                          showSettingAuthModal()
-                      }}
-                      disabled={!isCurrentWorkspaceManager}
-                    >
-                      {t('auth.unauthorized', { ns: 'tools' })}
-                    </Button>
-                  </>
-                )}
-                {(collection.type === CollectionType.custom) && (
-                  <div className="system-sm-semibold-uppercase text-text-secondary">
-                    <span className="">{t('includeToolNum', { ns: 'tools', num: toolList.length, action: toolList.length > 1 ? 'actions' : 'action' }).toLocaleUpperCase()}</span>
-                  </div>
-                )}
-                {(collection.type === CollectionType.workflow) && (
-                  <div className="system-sm-semibold-uppercase text-text-secondary">
-                    <span className="">{t('createTool.toolInput.title', { ns: 'tools' }).toLocaleUpperCase()}</span>
-                  </div>
-                )}
-              </div>
-              <div className="mt-1 flex-1 overflow-y-auto py-2">
-                {collection.type !== CollectionType.workflow && toolList.map(tool => (
-                  <ToolItem
-                    key={tool.name}
-                    disabled={false}
+                    </>
+                  )}
+                </div>
+                <div className="flex min-h-0 flex-1 flex-col pt-3">
+                  {isDetailLoading && <div className="flex h-[200px]"><Loading type="app" /></div>}
+                  {!isDetailLoading && (
+                    <>
+                      <div className="shrink-0">
+                        {(collection.type === CollectionType.builtIn || collection.type === CollectionType.model) && isAuthed && (
+                          <div className="mb-1 flex h-6 items-center justify-between system-sm-semibold-uppercase text-text-secondary">
+                            {t('detailPanel.actionNum', { ns: 'plugin', num: toolList.length, action: toolList.length > 1 ? 'actions' : 'action' })}
+                            {needAuth && (
+                              <Button
+                                variant="secondary"
+                                size="small"
+                                onClick={() => {
+                                  if (collection.type === CollectionType.builtIn || collection.type === CollectionType.model)
+                                    showSettingAuthModal()
+                                }}
+                                disabled={!isCurrentWorkspaceManager}
+                              >
+                                <Indicator className="mr-2" color="green" />
+                                {t('auth.authorized', { ns: 'tools' })}
+                              </Button>
+                            )}
+                          </div>
+                        )}
+                        {(collection.type === CollectionType.builtIn || collection.type === CollectionType.model) && needAuth && !isAuthed && (
+                          <>
+                            <div className="system-sm-semibold-uppercase text-text-secondary">
+                              <span className="">{t('includeToolNum', { ns: 'tools', num: toolList.length, action: toolList.length > 1 ? 'actions' : 'action' }).toLocaleUpperCase()}</span>
+                              <span className="px-1">·</span>
+                              <span className="text-util-colors-orange-orange-600">{t('auth.setup', { ns: 'tools' }).toLocaleUpperCase()}</span>
+                            </div>
+                            <Button
+                              variant="primary"
+                              className={cn('my-3 w-full shrink-0')}
+                              onClick={() => {
+                                if (collection.type === CollectionType.builtIn || collection.type === CollectionType.model)
+                                  showSettingAuthModal()
+                              }}
+                              disabled={!isCurrentWorkspaceManager}
+                            >
+                              {t('auth.unauthorized', { ns: 'tools' })}
+                            </Button>
+                          </>
+                        )}
+                        {(collection.type === CollectionType.custom) && (
+                          <div className="system-sm-semibold-uppercase text-text-secondary">
+                            <span className="">{t('includeToolNum', { ns: 'tools', num: toolList.length, action: toolList.length > 1 ? 'actions' : 'action' }).toLocaleUpperCase()}</span>
+                          </div>
+                        )}
+                        {(collection.type === CollectionType.workflow) && (
+                          <div className="system-sm-semibold-uppercase text-text-secondary">
+                            <span className="">{t('createTool.toolInput.title', { ns: 'tools' }).toLocaleUpperCase()}</span>
+                          </div>
+                        )}
+                      </div>
+                      <div className="mt-1 flex-1 overflow-y-auto py-2">
+                        {collection.type !== CollectionType.workflow && toolList.map(tool => (
+                          <ToolItem
+                            key={tool.name}
+                            disabled={false}
+                            collection={collection}
+                            tool={tool}
+                            isBuiltIn={isBuiltIn}
+                            isModel={isModel}
+                          />
+                        ))}
+                        {collection.type === CollectionType.workflow && (customCollection as WorkflowToolProviderResponse)?.tool?.parameters.map(item => (
+                          <div key={item.name} className="mb-1 py-1">
+                            <div className="mb-1 flex items-center gap-2">
+                              <span className="code-sm-semibold text-text-secondary">{item.name}</span>
+                              <span className="system-xs-regular text-text-tertiary">{item.type}</span>
+                              <span className="system-xs-medium text-text-warning-secondary">{item.required ? t('createTool.toolInput.required', { ns: 'tools' }) : ''}</span>
+                            </div>
+                            <div className="system-xs-regular text-text-tertiary">{item.llm_description}</div>
+                          </div>
+                        ))}
+                      </div>
+                    </>
+                  )}
+                </div>
+                {showSettingAuth && (
+                  <ConfigCredential
                     collection={collection}
-                    tool={tool}
-                    isBuiltIn={isBuiltIn}
-                    isModel={isModel}
+                    onCancel={() => setShowSettingAuth(false)}
+                    onSaved={async (value) => {
+                      await updateBuiltInToolCredential(collection.name, value)
+                      toast.success(t('api.actionSuccess', { ns: 'common' }))
+                      await onRefreshData()
+                      setShowSettingAuth(false)
+                    }}
+                    onRemove={async () => {
+                      await removeBuiltInToolCredential(collection.name)
+                      toast.success(t('api.actionSuccess', { ns: 'common' }))
+                      await onRefreshData()
+                      setShowSettingAuth(false)
+                    }}
                   />
-                ))}
-                {collection.type === CollectionType.workflow && (customCollection as WorkflowToolProviderResponse)?.tool?.parameters.map(item => (
-                  <div key={item.name} className="mb-1 py-1">
-                    <div className="mb-1 flex items-center gap-2">
-                      <span className="code-sm-semibold text-text-secondary">{item.name}</span>
-                      <span className="system-xs-regular text-text-tertiary">{item.type}</span>
-                      <span className="system-xs-medium text-text-warning-secondary">{item.required ? t('createTool.toolInput.required', { ns: 'tools' }) : ''}</span>
+                )}
+                {isShowEditCollectionToolModal && (
+                  <EditCustomToolModal
+                    payload={customCollection}
+                    onHide={() => setIsShowEditCustomCollectionModal(false)}
+                    onEdit={doUpdateCustomToolCollection}
+                    onRemove={onClickCustomToolDelete}
+                  />
+                )}
+                {workflowToolDrawerOpen && (
+                  <WorkflowToolDrawer
+                    payload={customCollection as unknown as WorkflowToolDrawerPayload}
+                    onHide={() => setWorkflowToolDrawerOpen(false)}
+                    onRemove={onClickWorkflowToolDelete}
+                    onSave={updateWorkflowToolProvider}
+                  />
+                )}
+                <AlertDialog open={showConfirmDelete} onOpenChange={open => !open && setShowConfirmDelete(false)}>
+                  <AlertDialogContent>
+                    <div className="flex flex-col gap-2 px-6 pt-6 pb-4">
+                      <AlertDialogTitle className="w-full truncate title-2xl-semi-bold text-text-primary">
+                        {t('createTool.deleteToolConfirmTitle', { ns: 'tools' })}
+                      </AlertDialogTitle>
+                      <AlertDialogDescription className="w-full system-md-regular wrap-break-word whitespace-pre-wrap text-text-tertiary">
+                        {t('createTool.deleteToolConfirmContent', { ns: 'tools' })}
+                      </AlertDialogDescription>
                     </div>
-                    <div className="system-xs-regular text-text-tertiary">{item.llm_description}</div>
-                  </div>
-                ))}
+                    <AlertDialogActions>
+                      <AlertDialogCancelButton>{t('operation.cancel', { ns: 'common' })}</AlertDialogCancelButton>
+                      <AlertDialogConfirmButton onClick={handleConfirmDelete}>
+                        {t('operation.confirm', { ns: 'common' })}
+                      </AlertDialogConfirmButton>
+                    </AlertDialogActions>
+                  </AlertDialogContent>
+                </AlertDialog>
               </div>
-            </>
-          )}
-        </div>
-        {showSettingAuth && (
-          <ConfigCredential
-            collection={collection}
-            onCancel={() => setShowSettingAuth(false)}
-            onSaved={async (value) => {
-              await updateBuiltInToolCredential(collection.name, value)
-              toast.success(t('api.actionSuccess', { ns: 'common' }))
-              await onRefreshData()
-              setShowSettingAuth(false)
-            }}
-            onRemove={async () => {
-              await removeBuiltInToolCredential(collection.name)
-              toast.success(t('api.actionSuccess', { ns: 'common' }))
-              await onRefreshData()
-              setShowSettingAuth(false)
-            }}
-          />
-        )}
-        {isShowEditCollectionToolModal && (
-          <EditCustomToolModal
-            payload={customCollection}
-            onHide={() => setIsShowEditCustomCollectionModal(false)}
-            onEdit={doUpdateCustomToolCollection}
-            onRemove={onClickCustomToolDelete}
-          />
-        )}
-        {isShowEditWorkflowToolModal && (
-          <WorkflowToolModal
-            payload={customCollection as unknown as WorkflowToolModalPayload}
-            onHide={() => setIsShowEditWorkflowToolModal(false)}
-            onRemove={onClickWorkflowToolDelete}
-            onSave={updateWorkflowToolProvider}
-          />
-        )}
-        <AlertDialog open={showConfirmDelete} onOpenChange={open => !open && setShowConfirmDelete(false)}>
-          <AlertDialogContent>
-            <div className="flex flex-col gap-2 px-6 pt-6 pb-4">
-              <AlertDialogTitle className="w-full truncate title-2xl-semi-bold text-text-primary">
-                {t('createTool.deleteToolConfirmTitle', { ns: 'tools' })}
-              </AlertDialogTitle>
-              <AlertDialogDescription className="w-full system-md-regular wrap-break-word whitespace-pre-wrap text-text-tertiary">
-                {t('createTool.deleteToolConfirmContent', { ns: 'tools' })}
-              </AlertDialogDescription>
-            </div>
-            <AlertDialogActions>
-              <AlertDialogCancelButton>{t('operation.cancel', { ns: 'common' })}</AlertDialogCancelButton>
-              <AlertDialogConfirmButton onClick={handleConfirmDelete}>
-                {t('operation.confirm', { ns: 'common' })}
-              </AlertDialogConfirmButton>
-            </AlertDialogActions>
-          </AlertDialogContent>
-        </AlertDialog>
-      </div>
+            </DrawerContent>
+          </DrawerPopup>
+        </DrawerViewport>
+      </DrawerPortal>
     </Drawer>
   )
 }
diff --git a/web/app/components/tools/setting/build-in/__tests__/config-credentials.spec.tsx b/web/app/components/tools/setting/build-in/__tests__/config-credentials.spec.tsx
index 996a4077af..0cb3970eaa 100644
--- a/web/app/components/tools/setting/build-in/__tests__/config-credentials.spec.tsx
+++ b/web/app/components/tools/setting/build-in/__tests__/config-credentials.spec.tsx
@@ -23,16 +23,6 @@ vi.mock('../../../utils/to-form-schema', () => ({
   addDefaultValue: (value: Record<string, unknown>, _schemas: unknown[]) => ({ ...value }),
 }))
 
-vi.mock('@/app/components/base/drawer-plus', () => ({
-  default: ({ body, title, onHide }: { body: React.ReactNode, title: string, onHide: () => void }) => (
-    <div data-testid="drawer">
-      <span data-testid="drawer-title">{title}</span>
-      <button data-testid="drawer-close" onClick={onHide}>Close</button>
-      {body}
-    </div>
-  ),
-}))
-
 vi.mock('@langgenius/dify-ui/toast', () => ({
   default: { notify: vi.fn() },
 }))
@@ -104,7 +94,7 @@ describe('ConfigCredential', () => {
         onSaved={mockOnSaved}
       />,
     )
-    expect(screen.getByTestId('drawer-title')).toHaveTextContent('tools.auth.setupModalTitle')
+    expect(screen.getByText('tools.auth.setupModalTitle')).toBeInTheDocument()
   })
 
   it('calls onCancel when cancel button is clicked', async () => {
diff --git a/web/app/components/tools/setting/build-in/config-credentials.tsx b/web/app/components/tools/setting/build-in/config-credentials.tsx
index d6c62f5d88..2ee17d4298 100644
--- a/web/app/components/tools/setting/build-in/config-credentials.tsx
+++ b/web/app/components/tools/setting/build-in/config-credentials.tsx
@@ -3,12 +3,22 @@ import type { FC } from 'react'
 import type { Collection } from '../../types'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  Drawer,
+  DrawerBackdrop,
+  DrawerCloseButton,
+  DrawerContent,
+  DrawerDescription,
+  DrawerPopup,
+  DrawerPortal,
+  DrawerTitle,
+  DrawerViewport,
+} from '@langgenius/dify-ui/drawer'
 import { toast } from '@langgenius/dify-ui/toast'
 import { noop } from 'es-toolkit/function'
 import * as React from 'react'
 import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import Drawer from '@/app/components/base/drawer-plus'
 import { LinkExternal02 } from '@/app/components/base/icons/src/vender/line/general'
 import Loading from '@/app/components/base/loading'
 import { useLanguage } from '@/app/components/header/account-setting/model-provider-page/hooks'
@@ -69,64 +79,81 @@ const ConfigCredential: FC<Props> = ({
 
   return (
     <Drawer
-      isShow
-      onHide={onCancel}
-      title={t('auth.setupModalTitle', { ns: 'tools' }) as string}
-      titleDescription={t('auth.setupModalTitleDescription', { ns: 'tools' }) as string}
-      panelClassName="mt-[64px] mb-2 w-[420px]! border-components-panel-border"
-      maxWidthClassName="max-w-[420px]!"
-      height="calc(100vh - 64px)"
-      contentClassName="bg-components-panel-bg!"
-      headerClassName="border-b-divider-subtle!"
-      body={(
-        <div className="h-full px-6 py-3">
-          {!credentialSchema
-            ? <Loading type="app" />
-            : (
-                <>
-                  <Form
-                    value={tempCredential}
-                    onChange={(v) => {
-                      setTempCredential(v)
-                    }}
-                    formSchemas={credentialSchema}
-                    isEditMode={true}
-                    showOnVariableMap={{}}
-                    validating={false}
-                    inputClassName="bg-components-input-bg-normal!"
-                    fieldMoreInfo={item => item.url
-                      ? (
-                          <a
-                            href={item.url}
-                            target="_blank"
-                            rel="noopener noreferrer"
-                            className="inline-flex items-center text-xs text-text-accent"
-                          >
-                            {t('howToGet', { ns: 'tools' })}
-                            <LinkExternal02 className="ml-1 h-3 w-3" />
-                          </a>
-                        )
-                      : null}
+      open
+      modal
+      swipeDirection="right"
+      onOpenChange={(open) => {
+        if (!open)
+          onCancel()
+      }}
+    >
+      <DrawerPortal>
+        <DrawerBackdrop />
+        <DrawerViewport>
+          <DrawerPopup className="data-[swipe-direction=right]:top-16 data-[swipe-direction=right]:right-2 data-[swipe-direction=right]:bottom-2 data-[swipe-direction=right]:h-auto data-[swipe-direction=right]:w-105 data-[swipe-direction=right]:max-w-[calc(100vw-1rem)] data-[swipe-direction=right]:rounded-xl data-[swipe-direction=right]:border-[0.5px] data-[swipe-direction=right]:border-components-panel-border">
+            <DrawerContent className="flex min-h-0 flex-1 flex-col bg-components-panel-bg p-0 pb-0">
+              <div className="shrink-0 border-b border-divider-subtle py-4">
+                <div className="flex h-6 items-center justify-between pr-5 pl-6">
+                  <DrawerTitle className="min-w-0 truncate system-xl-semibold text-text-primary">
+                    {t('auth.setupModalTitle', { ns: 'tools' })}
+                  </DrawerTitle>
+                  <DrawerCloseButton
+                    aria-label={t('operation.close', { ns: 'common' })}
+                    className="h-6 w-6 rounded-md"
                   />
-                  <div className={cn((collection.is_team_authorization && !isHideRemoveBtn) ? 'justify-between' : 'justify-end', 'mt-2 flex')}>
-                    {
-                      (collection.is_team_authorization && !isHideRemoveBtn) && (
-                        <Button onClick={onRemove}>{t('operation.remove', { ns: 'common' })}</Button>
-                      )
-                    }
-                    <div className="flex space-x-2">
-                      <Button onClick={onCancel}>{t('operation.cancel', { ns: 'common' })}</Button>
-                      <Button loading={isLoading || isSaving} disabled={isLoading || isSaving} variant="primary" onClick={handleSave}>{t('operation.save', { ns: 'common' })}</Button>
-                    </div>
-                  </div>
-                </>
-              )}
-
-        </div>
-      )}
-      isShowMask={true}
-      clickOutsideNotOpen={false}
-    />
+                </div>
+                <DrawerDescription className="pr-10 pl-6 system-xs-regular text-text-tertiary">
+                  {t('auth.setupModalTitleDescription', { ns: 'tools' })}
+                </DrawerDescription>
+              </div>
+              <div className="min-h-0 flex-1 overflow-y-auto px-6 py-3">
+                {!credentialSchema
+                  ? <Loading type="app" />
+                  : (
+                      <>
+                        <Form
+                          value={tempCredential}
+                          onChange={(v) => {
+                            setTempCredential(v)
+                          }}
+                          formSchemas={credentialSchema}
+                          isEditMode={true}
+                          showOnVariableMap={{}}
+                          validating={false}
+                          inputClassName="bg-components-input-bg-normal!"
+                          fieldMoreInfo={item => item.url
+                            ? (
+                                <a
+                                  href={item.url}
+                                  target="_blank"
+                                  rel="noopener noreferrer"
+                                  className="inline-flex items-center text-xs text-text-accent"
+                                >
+                                  {t('howToGet', { ns: 'tools' })}
+                                  <LinkExternal02 className="ml-1 h-3 w-3" />
+                                </a>
+                              )
+                            : null}
+                        />
+                        <div className={cn((collection.is_team_authorization && !isHideRemoveBtn) ? 'justify-between' : 'justify-end', 'mt-2 flex')}>
+                          {
+                            (collection.is_team_authorization && !isHideRemoveBtn) && (
+                              <Button onClick={onRemove}>{t('operation.remove', { ns: 'common' })}</Button>
+                            )
+                          }
+                          <div className="flex space-x-2">
+                            <Button onClick={onCancel}>{t('operation.cancel', { ns: 'common' })}</Button>
+                            <Button loading={isLoading || isSaving} disabled={isLoading || isSaving} variant="primary" onClick={handleSave}>{t('operation.save', { ns: 'common' })}</Button>
+                          </div>
+                        </div>
+                      </>
+                    )}
+              </div>
+            </DrawerContent>
+          </DrawerPopup>
+        </DrawerViewport>
+      </DrawerPortal>
+    </Drawer>
   )
 }
 export default React.memo(ConfigCredential)
diff --git a/web/app/components/tools/workflow-tool/__tests__/configure-button.spec.tsx b/web/app/components/tools/workflow-tool/__tests__/configure-button.spec.tsx
index 7060e29f95..9db9852e0b 100644
--- a/web/app/components/tools/workflow-tool/__tests__/configure-button.spec.tsx
+++ b/web/app/components/tools/workflow-tool/__tests__/configure-button.spec.tsx
@@ -1,12 +1,10 @@
-import type { WorkflowToolModalPayload } from '../index'
+import type { WorkflowToolDrawerPayload } from '../index'
 import type { WorkflowToolProviderResponse } from '@/app/components/tools/types'
-import type { InputVar, Variable } from '@/app/components/workflow/types'
 import { act, render, screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
-import * as React from 'react'
-import { InputVarType, VarType } from '@/app/components/workflow/types'
+import { VarType } from '@/app/components/workflow/types'
 import WorkflowToolConfigureButton from '../configure-button'
-import WorkflowToolAsModal from '../index'
+import { WorkflowToolDrawer } from '../index'
 import MethodSelector from '../method-selector'
 
 vi.mock('@langgenius/dify-ui/popover', () => import('@/__mocks__/base-ui-popover'))
@@ -70,21 +68,6 @@ vi.mock('@/app/components/plugins/hooks', () => ({
   }),
 }))
 
-// Mock Drawer - simplified for testing, preserves behavior
-vi.mock('@/app/components/base/drawer-plus', () => ({
-  default: ({ isShow, onHide, title, body }: { isShow: boolean, onHide: () => void, title: string, body: React.ReactNode }) => {
-    if (!isShow)
-      return null
-    return (
-      <div data-testid="drawer" role="dialog">
-        <div data-testid="drawer-title">{title}</div>
-        <button data-testid="drawer-close" onClick={onHide}>Close</button>
-        {body}
-      </div>
-    )
-  },
-}))
-
 // Mock EmojiPickerInner - simplified for testing
 vi.mock('@/app/components/base/emoji-picker/Inner', () => ({
   default: ({ onSelect }: { onSelect: (icon: string, background: string) => void }) => (
@@ -113,29 +96,6 @@ vi.mock('@/app/components/tools/labels/selector', () => ({
   ),
 }))
 
-// Mock PortalToFollowElem for dropdown tests
-let mockPortalOpenState = false
-vi.mock('@/app/components/base/portal-to-follow-elem', () => ({
-  PortalToFollowElem: ({ children, open, onOpenChange }: { children: React.ReactNode, open: boolean, onOpenChange: (open: boolean) => void }) => {
-    mockPortalOpenState = open
-    return (
-      <div data-testid="portal-elem" data-open={open} onClick={() => onOpenChange(!open)}>
-        {children}
-      </div>
-    )
-  },
-  PortalToFollowElemTrigger: ({ children, onClick, className }: { children: React.ReactNode, onClick: () => void, className?: string }) => (
-    <div data-testid="portal-trigger" onClick={onClick} className={className}>
-      {children}
-    </div>
-  ),
-  PortalToFollowElemContent: ({ children, className }: { children: React.ReactNode, className?: string }) => {
-    if (!mockPortalOpenState)
-      return null
-    return <div data-testid="portal-content" className={className}>{children}</div>
-  },
-}))
-
 // Test data factories
 const createMockEmoji = (overrides = {}) => ({
   content: '🔧',
@@ -143,22 +103,6 @@ const createMockEmoji = (overrides = {}) => ({
   ...overrides,
 })
 
-const createMockInputVar = (overrides: Partial<InputVar> = {}): InputVar => ({
-  variable: 'test_var',
-  label: 'Test Variable',
-  type: InputVarType.textInput,
-  required: true,
-  max_length: 100,
-  options: [],
-  ...overrides,
-} as InputVar)
-
-const createMockVariable = (overrides: Partial<Variable> = {}): Variable => ({
-  variable: 'output_var',
-  value_type: 'string',
-  ...overrides,
-} as Variable)
-
 const createMockWorkflowToolDetail = (overrides: Partial<WorkflowToolProviderResponse> = {}): WorkflowToolProviderResponse => ({
   workflow_app_id: 'workflow-app-123',
   workflow_tool_id: 'workflow-tool-456',
@@ -202,19 +146,14 @@ const createMockWorkflowToolDetail = (overrides: Partial<WorkflowToolProviderRes
 const createDefaultConfigureButtonProps = (overrides = {}) => ({
   disabled: false,
   published: false,
-  detailNeedUpdate: false,
-  workflowAppId: 'workflow-app-123',
-  icon: createMockEmoji(),
-  name: 'Test Workflow',
-  description: 'Test workflow description',
-  inputs: [createMockInputVar()],
-  outputs: [createMockVariable()],
-  handlePublish: vi.fn().mockResolvedValue(undefined),
-  onRefreshData: vi.fn(),
+  isLoading: false,
+  outdated: false,
+  isCurrentWorkspaceManager: true,
+  onConfigure: vi.fn(),
   ...overrides,
 })
 
-const createDefaultModalPayload = (overrides: Partial<WorkflowToolModalPayload> = {}): WorkflowToolModalPayload => ({
+const createDefaultDrawerPayload = (overrides: Partial<WorkflowToolDrawerPayload> = {}): WorkflowToolDrawerPayload => ({
   icon: createMockEmoji(),
   label: 'Test Tool',
   name: 'test_tool',
@@ -246,7 +185,6 @@ const createDefaultModalPayload = (overrides: Partial<WorkflowToolModalPayload>
 describe('WorkflowToolConfigureButton', () => {
   beforeEach(() => {
     vi.clearAllMocks()
-    mockPortalOpenState = false
     mockIsCurrentWorkspaceManager.mockReturnValue(true)
     mockUseWorkflowToolDetailByAppID.mockImplementation((_appId: string, enabled: boolean) => ({
       data: enabled ? createMockWorkflowToolDetail() : undefined,
@@ -321,8 +259,7 @@ describe('WorkflowToolConfigureButton', () => {
 
     it('should render loading state when published and fetching details', () => {
       // Arrange
-      mockUseWorkflowToolDetailByAppID.mockReturnValue({ data: undefined, isLoading: true })
-      const props = createDefaultConfigureButtonProps({ published: true })
+      const props = createDefaultConfigureButtonProps({ published: true, isLoading: true })
 
       // Act
       render(<WorkflowToolConfigureButton {...props} />)
@@ -348,8 +285,7 @@ describe('WorkflowToolConfigureButton', () => {
 
     it('should render different UI for non-workspace manager', () => {
       // Arrange
-      mockIsCurrentWorkspaceManager.mockReturnValue(false)
-      const props = createDefaultConfigureButtonProps()
+      const props = createDefaultConfigureButtonProps({ isCurrentWorkspaceManager: false })
 
       // Act
       render(<WorkflowToolConfigureButton {...props} />)
@@ -370,53 +306,46 @@ describe('WorkflowToolConfigureButton', () => {
       expect(() => render(<WorkflowToolConfigureButton {...props} />)).not.toThrow()
     })
 
-    it('should handle undefined inputs and outputs', () => {
+    it('should render without disabled reason', () => {
       // Arrange
-      const props = createDefaultConfigureButtonProps({
-        inputs: undefined,
-        outputs: undefined,
-      })
+      const props = createDefaultConfigureButtonProps({ disabledReason: undefined })
 
       // Act & Assert
       expect(() => render(<WorkflowToolConfigureButton {...props} />)).not.toThrow()
     })
 
-    it('should handle empty inputs and outputs arrays', () => {
+    it('should handle configured callback props', () => {
       // Arrange
-      const props = createDefaultConfigureButtonProps({
-        inputs: [],
-        outputs: [],
-      })
+      const props = createDefaultConfigureButtonProps({ onConfigure: vi.fn() })
 
       // Act & Assert
       expect(() => render(<WorkflowToolConfigureButton {...props} />)).not.toThrow()
     })
   })
 
-  // Modal behavior tests
-  describe('Modal Behavior', () => {
-    it('should toggle modal visibility', async () => {
+  // Drawer behavior tests
+  describe('Drawer Behavior', () => {
+    it('should request configuration from the unpublished entry point', async () => {
       // Arrange
       const user = userEvent.setup()
-      const props = createDefaultConfigureButtonProps()
+      const onConfigure = vi.fn()
+      const props = createDefaultConfigureButtonProps({ onConfigure })
 
       // Act
       render(<WorkflowToolConfigureButton {...props} />)
 
-      // Click to open modal
+      // Click to request opening the drawer
       const triggerArea = screen.getByText('workflow.common.workflowAsTool').closest('.flex')
       await user.click(triggerArea!)
 
-      // Assert
-      await waitFor(() => {
-        expect(screen.getByTestId('drawer'))!.toBeInTheDocument()
-      })
+      expect(onConfigure).toHaveBeenCalledTimes(1)
     })
 
-    it('should not open modal when disabled', async () => {
+    it('should not request configuration when disabled', async () => {
       // Arrange
       const user = userEvent.setup()
-      const props = createDefaultConfigureButtonProps({ disabled: true })
+      const onConfigure = vi.fn()
+      const props = createDefaultConfigureButtonProps({ disabled: true, onConfigure })
 
       // Act
       render(<WorkflowToolConfigureButton {...props} />)
@@ -424,45 +353,14 @@ describe('WorkflowToolConfigureButton', () => {
       const triggerArea = screen.getByText('workflow.common.workflowAsTool').closest('.flex')
       await user.click(triggerArea!)
 
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      // Assert
-      expect(screen.queryByTestId('drawer')).not.toBeInTheDocument()
+      expect(onConfigure).not.toHaveBeenCalled()
     })
 
-    it('should not open modal when published (use configure button instead)', async () => {
+    it('should request configuration from the published configure button only', async () => {
       // Arrange
       const user = userEvent.setup()
-      const props = createDefaultConfigureButtonProps({ published: true })
+      const onConfigure = vi.fn()
+      const props = createDefaultConfigureButtonProps({ published: true, onConfigure })
 
       // Act
       render(<WorkflowToolConfigureButton {...props} />)
@@ -471,51 +369,16 @@ describe('WorkflowToolConfigureButton', () => {
         expect(screen.getByText('workflow.common.configure'))!.toBeInTheDocument()
       })
 
-      // Click the main area (should not open modal)
+      // Click the main area (should not request opening the drawer)
       const mainArea = screen.getByText('workflow.common.workflowAsTool').closest('.flex')
       await user.click(mainArea!)
 
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      // Should not open modal from main click
-      expect(screen.queryByTestId('drawer')).not.toBeInTheDocument()
+      expect(onConfigure).not.toHaveBeenCalled()
 
       // Click configure button
       await user.click(screen.getByText('workflow.common.configure'))
 
-      // Assert
-      await waitFor(() => {
-        expect(screen.getByTestId('drawer'))!.toBeInTheDocument()
-      })
+      expect(onConfigure).toHaveBeenCalledTimes(1)
     })
   })
 
@@ -565,12 +428,11 @@ describe('WorkflowToolConfigureButton', () => {
       expect(screen.getByText('workflow.common.workflowAsTool'))!.toBeInTheDocument()
     })
 
-    it('should handle paragraph type input conversion', async () => {
+    it('should keep the configure entry independent from workflow parameter shape', async () => {
       // Arrange
       const user = userEvent.setup()
-      const props = createDefaultConfigureButtonProps({
-        inputs: [createMockInputVar({ variable: 'test_var', type: InputVarType.paragraph })],
-      })
+      const onConfigure = vi.fn()
+      const props = createDefaultConfigureButtonProps({ onConfigure })
 
       // Act
       render(<WorkflowToolConfigureButton {...props} />)
@@ -578,10 +440,7 @@ describe('WorkflowToolConfigureButton', () => {
       const triggerArea = screen.getByText('workflow.common.workflowAsTool').closest('.flex')
       await user.click(triggerArea!)
 
-      // Assert - should render without error
-      await waitFor(() => {
-        expect(screen.getByTestId('drawer'))!.toBeInTheDocument()
-      })
+      expect(onConfigure).toHaveBeenCalledTimes(1)
     })
   })
 
@@ -603,8 +462,7 @@ describe('WorkflowToolConfigureButton', () => {
 
     it('should disable configure button when not workspace manager', async () => {
       // Arrange
-      mockIsCurrentWorkspaceManager.mockReturnValue(false)
-      const props = createDefaultConfigureButtonProps({ published: true })
+      const props = createDefaultConfigureButtonProps({ published: true, isCurrentWorkspaceManager: false })
 
       // Act
       render(<WorkflowToolConfigureButton {...props} />)
@@ -619,12 +477,11 @@ describe('WorkflowToolConfigureButton', () => {
 })
 
 // ============================================================================
-// WorkflowToolAsModal Tests
+// WorkflowToolDrawer Tests
 // ============================================================================
-describe('WorkflowToolAsModal', () => {
+describe('WorkflowToolDrawer', () => {
   beforeEach(() => {
     vi.clearAllMocks()
-    mockPortalOpenState = false
   })
 
   // Rendering Tests (REQUIRED)
@@ -633,12 +490,12 @@ describe('WorkflowToolAsModal', () => {
       // Arrange
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload(),
+        payload: createDefaultDrawerPayload(),
         onHide: vi.fn(),
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
 
       // Assert
       // Assert
@@ -649,12 +506,12 @@ describe('WorkflowToolAsModal', () => {
       // Arrange
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload(),
+        payload: createDefaultDrawerPayload(),
         onHide: vi.fn(),
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
 
       // Assert
       // Assert
@@ -665,12 +522,12 @@ describe('WorkflowToolAsModal', () => {
       // Arrange
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload(),
+        payload: createDefaultDrawerPayload(),
         onHide: vi.fn(),
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
 
       // Assert
       // Assert
@@ -681,12 +538,12 @@ describe('WorkflowToolAsModal', () => {
       // Arrange
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload(),
+        payload: createDefaultDrawerPayload(),
         onHide: vi.fn(),
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
 
       // Assert
       // Assert
@@ -697,12 +554,12 @@ describe('WorkflowToolAsModal', () => {
       // Arrange
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload(),
+        payload: createDefaultDrawerPayload(),
         onHide: vi.fn(),
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
 
       // Assert
       // Assert
@@ -713,12 +570,12 @@ describe('WorkflowToolAsModal', () => {
       // Arrange
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload(),
+        payload: createDefaultDrawerPayload(),
         onHide: vi.fn(),
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
 
       // Assert
       // Assert
@@ -729,12 +586,12 @@ describe('WorkflowToolAsModal', () => {
       // Arrange
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload(),
+        payload: createDefaultDrawerPayload(),
         onHide: vi.fn(),
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
 
       // Assert
       // Assert
@@ -747,12 +604,12 @@ describe('WorkflowToolAsModal', () => {
       // Arrange
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload(),
+        payload: createDefaultDrawerPayload(),
         onHide: vi.fn(),
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
 
       // Assert
       // Assert
@@ -763,12 +620,12 @@ describe('WorkflowToolAsModal', () => {
       // Arrange
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload(),
+        payload: createDefaultDrawerPayload(),
         onHide: vi.fn(),
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
 
       // Assert
       // Assert
@@ -779,13 +636,13 @@ describe('WorkflowToolAsModal', () => {
       // Arrange
       const props = {
         isAdd: false,
-        payload: createDefaultModalPayload({ workflow_tool_id: 'tool-123' }),
+        payload: createDefaultDrawerPayload({ workflow_tool_id: 'tool-123' }),
         onHide: vi.fn(),
         onRemove: vi.fn(),
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
 
       // Assert
       // Assert
@@ -796,13 +653,13 @@ describe('WorkflowToolAsModal', () => {
       // Arrange
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload(),
+        payload: createDefaultDrawerPayload(),
         onHide: vi.fn(),
         onRemove: vi.fn(),
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
 
       // Assert
       // Assert
@@ -844,7 +701,7 @@ describe('WorkflowToolAsModal', () => {
   describe('Props', () => {
     it('should initialize state from payload', () => {
       // Arrange
-      const payload = createDefaultModalPayload({
+      const payload = createDefaultDrawerPayload({
         label: 'Custom Label',
         name: 'custom_name',
         description: 'Custom description',
@@ -856,7 +713,7 @@ describe('WorkflowToolAsModal', () => {
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
 
       // Assert
       // Assert
@@ -867,7 +724,7 @@ describe('WorkflowToolAsModal', () => {
 
     it('should pass labels to label selector', () => {
       // Arrange
-      const payload = createDefaultModalPayload({ labels: ['tag1', 'tag2'] })
+      const payload = createDefaultDrawerPayload({ labels: ['tag1', 'tag2'] })
       const props = {
         isAdd: true,
         payload,
@@ -875,7 +732,7 @@ describe('WorkflowToolAsModal', () => {
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
 
       // Assert
       // Assert
@@ -890,12 +747,12 @@ describe('WorkflowToolAsModal', () => {
       const user = userEvent.setup()
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload({ label: '' }),
+        payload: createDefaultDrawerPayload({ label: '' }),
         onHide: vi.fn(),
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
       const labelInput = screen.getByPlaceholderText('tools.createTool.toolNamePlaceHolder')
       await user.type(labelInput, 'New Label')
 
@@ -909,12 +766,12 @@ describe('WorkflowToolAsModal', () => {
       const user = userEvent.setup()
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload({ name: '' }),
+        payload: createDefaultDrawerPayload({ name: '' }),
         onHide: vi.fn(),
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
       const nameInput = screen.getByPlaceholderText('tools.createTool.nameForToolCallPlaceHolder')
       await user.type(nameInput, 'new_name')
 
@@ -928,12 +785,12 @@ describe('WorkflowToolAsModal', () => {
       const user = userEvent.setup()
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload({ description: '' }),
+        payload: createDefaultDrawerPayload({ description: '' }),
         onHide: vi.fn(),
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
       const descInput = screen.getByPlaceholderText('tools.createTool.descriptionPlaceholder')
       await user.type(descInput, 'New description')
 
@@ -947,12 +804,12 @@ describe('WorkflowToolAsModal', () => {
       const user = userEvent.setup()
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload(),
+        payload: createDefaultDrawerPayload(),
         onHide: vi.fn(),
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
       const iconButton = screen.getByTestId('app-icon')
       await user.click(iconButton)
 
@@ -966,12 +823,12 @@ describe('WorkflowToolAsModal', () => {
       const user = userEvent.setup()
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload(),
+        payload: createDefaultDrawerPayload(),
         onHide: vi.fn(),
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
 
       // Open emoji picker
       const iconButton = screen.getByTestId('app-icon')
@@ -992,12 +849,12 @@ describe('WorkflowToolAsModal', () => {
       const user = userEvent.setup()
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload(),
+        payload: createDefaultDrawerPayload(),
         onHide: vi.fn(),
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
 
       const iconButton = screen.getByTestId('app-icon')
       await user.click(iconButton)
@@ -1046,12 +903,12 @@ describe('WorkflowToolAsModal', () => {
       const user = userEvent.setup()
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload({ labels: ['initial'] }),
+        payload: createDefaultDrawerPayload({ labels: ['initial'] }),
         onHide: vi.fn(),
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
       await user.click(screen.getByTestId('add-label'))
 
       // Assert
@@ -1064,12 +921,12 @@ describe('WorkflowToolAsModal', () => {
       const user = userEvent.setup()
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload({ privacy_policy: '' }),
+        payload: createDefaultDrawerPayload({ privacy_policy: '' }),
         onHide: vi.fn(),
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
       const privacyInput = screen.getByPlaceholderText('tools.createTool.privacyPolicyPlaceholder')
       await user.type(privacyInput, 'https://example.com/privacy')
 
@@ -1087,12 +944,12 @@ describe('WorkflowToolAsModal', () => {
       const onHide = vi.fn()
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload(),
+        payload: createDefaultDrawerPayload(),
         onHide,
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
       await user.click(screen.getByText('common.operation.cancel'))
 
       // Assert
@@ -1105,13 +962,13 @@ describe('WorkflowToolAsModal', () => {
       const onHide = vi.fn()
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload(),
+        payload: createDefaultDrawerPayload(),
         onHide,
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
-      await user.click(screen.getByTestId('drawer-close'))
+      render(<WorkflowToolDrawer {...props} />)
+      await user.click(screen.getByRole('button', { name: /Close|operation.close/ }))
 
       // Assert
       expect(onHide).toHaveBeenCalledTimes(1)
@@ -1123,13 +980,13 @@ describe('WorkflowToolAsModal', () => {
       const onRemove = vi.fn()
       const props = {
         isAdd: false,
-        payload: createDefaultModalPayload({ workflow_tool_id: 'tool-123' }),
+        payload: createDefaultDrawerPayload({ workflow_tool_id: 'tool-123' }),
         onHide: vi.fn(),
         onRemove,
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
       await user.click(screen.getByText('common.operation.delete'))
 
       // Assert
@@ -1142,13 +999,13 @@ describe('WorkflowToolAsModal', () => {
       const onCreate = vi.fn()
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload(),
+        payload: createDefaultDrawerPayload(),
         onHide: vi.fn(),
         onCreate,
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
       await user.click(screen.getByText('common.operation.save'))
 
       // Assert
@@ -1163,13 +1020,13 @@ describe('WorkflowToolAsModal', () => {
       const user = userEvent.setup()
       const props = {
         isAdd: false,
-        payload: createDefaultModalPayload({ workflow_tool_id: 'tool-123' }),
+        payload: createDefaultDrawerPayload({ workflow_tool_id: 'tool-123' }),
         onHide: vi.fn(),
         onSave: vi.fn(),
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
       await user.click(screen.getByText('common.operation.save'))
 
       // Assert
@@ -1183,13 +1040,13 @@ describe('WorkflowToolAsModal', () => {
       const onSave = vi.fn()
       const props = {
         isAdd: false,
-        payload: createDefaultModalPayload({ workflow_tool_id: 'tool-123' }),
+        payload: createDefaultDrawerPayload({ workflow_tool_id: 'tool-123' }),
         onHide: vi.fn(),
         onSave,
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
       await user.click(screen.getByText('common.operation.save'))
       await user.click(screen.getByText('common.operation.confirm'))
 
@@ -1204,7 +1061,7 @@ describe('WorkflowToolAsModal', () => {
       const user = userEvent.setup()
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload({
+        payload: createDefaultDrawerPayload({
           parameters: [{
             name: 'param1',
             description: '', // Start with empty description
@@ -1217,7 +1074,7 @@ describe('WorkflowToolAsModal', () => {
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
       const descInput = screen.getByPlaceholderText('tools.createTool.toolInput.descriptionPlaceholder')
       await user.type(descInput, 'New parameter description')
 
@@ -1234,13 +1091,13 @@ describe('WorkflowToolAsModal', () => {
       const user = userEvent.setup()
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload({ label: '' }),
+        payload: createDefaultDrawerPayload({ label: '' }),
         onHide: vi.fn(),
         onCreate: vi.fn(),
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
       await user.click(screen.getByText('common.operation.save'))
 
       // Assert
@@ -1255,13 +1112,13 @@ describe('WorkflowToolAsModal', () => {
       const user = userEvent.setup()
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload({ label: 'Test', name: '' }),
+        payload: createDefaultDrawerPayload({ label: 'Test', name: '' }),
         onHide: vi.fn(),
         onCreate: vi.fn(),
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
       await user.click(screen.getByText('common.operation.save'))
 
       // Assert
@@ -1276,12 +1133,12 @@ describe('WorkflowToolAsModal', () => {
       const user = userEvent.setup()
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload({ name: '' }),
+        payload: createDefaultDrawerPayload({ name: '' }),
         onHide: vi.fn(),
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
       const nameInput = screen.getByPlaceholderText('tools.createTool.nameForToolCallPlaceHolder')
       await user.type(nameInput, 'invalid name with spaces')
 
@@ -1295,12 +1152,12 @@ describe('WorkflowToolAsModal', () => {
       const user = userEvent.setup()
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload({ name: '' }),
+        payload: createDefaultDrawerPayload({ name: '' }),
         onHide: vi.fn(),
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
       const nameInput = screen.getByPlaceholderText('tools.createTool.nameForToolCallPlaceHolder')
       await user.type(nameInput, 'valid_name_123')
 
@@ -1346,31 +1203,31 @@ describe('WorkflowToolAsModal', () => {
       // Arrange
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload({ parameters: [] }),
+        payload: createDefaultDrawerPayload({ parameters: [] }),
         onHide: vi.fn(),
       }
 
       // Act & Assert
-      expect(() => render(<WorkflowToolAsModal {...props} />)).not.toThrow()
+      expect(() => render(<WorkflowToolDrawer {...props} />)).not.toThrow()
     })
 
     it('should handle empty output parameters', () => {
       // Arrange
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload({ outputParameters: [] }),
+        payload: createDefaultDrawerPayload({ outputParameters: [] }),
         onHide: vi.fn(),
       }
 
       // Act & Assert
-      expect(() => render(<WorkflowToolAsModal {...props} />)).not.toThrow()
+      expect(() => render(<WorkflowToolDrawer {...props} />)).not.toThrow()
     })
 
     it('should handle parameter with __image name specially', () => {
       // Arrange
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload({
+        payload: createDefaultDrawerPayload({
           parameters: [{
             name: '__image',
             description: 'Image parameter',
@@ -1383,7 +1240,7 @@ describe('WorkflowToolAsModal', () => {
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
 
       // Assert - __image should show method as text, not selector
       // Assert - __image should show method as text, not selector
@@ -1394,7 +1251,7 @@ describe('WorkflowToolAsModal', () => {
       // Arrange
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload({
+        payload: createDefaultDrawerPayload({
           outputParameters: [{
             name: 'text', // Collides with reserved
             description: 'Custom text output',
@@ -1405,7 +1262,7 @@ describe('WorkflowToolAsModal', () => {
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
 
       // Assert - should show both reserved and custom with warning icon
       const textElements = screen.getAllByText('text')
@@ -1417,13 +1274,13 @@ describe('WorkflowToolAsModal', () => {
       const user = userEvent.setup()
       const props = {
         isAdd: false,
-        payload: createDefaultModalPayload({ workflow_tool_id: 'tool-123' }),
+        payload: createDefaultDrawerPayload({ workflow_tool_id: 'tool-123' }),
         onHide: vi.fn(),
         // onSave is undefined
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
       await user.click(screen.getByText('common.operation.save'))
 
       // Show confirm modal
@@ -1440,13 +1297,13 @@ describe('WorkflowToolAsModal', () => {
       const user = userEvent.setup()
       const props = {
         isAdd: true,
-        payload: createDefaultModalPayload(),
+        payload: createDefaultDrawerPayload(),
         onHide: vi.fn(),
         // onCreate is undefined
       }
 
       // Act & Assert - should not crash
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
       await user.click(screen.getByText('common.operation.save'))
     })
 
@@ -1455,13 +1312,13 @@ describe('WorkflowToolAsModal', () => {
       const user = userEvent.setup()
       const props = {
         isAdd: false,
-        payload: createDefaultModalPayload({ workflow_tool_id: 'tool-123' }),
+        payload: createDefaultDrawerPayload({ workflow_tool_id: 'tool-123' }),
         onHide: vi.fn(),
         onSave: vi.fn(),
       }
 
       // Act
-      render(<WorkflowToolAsModal {...props} />)
+      render(<WorkflowToolDrawer {...props} />)
       await user.click(screen.getByText('common.operation.save'))
 
       await waitFor(() => {
@@ -1486,7 +1343,6 @@ describe('WorkflowToolAsModal', () => {
 describe('MethodSelector', () => {
   beforeEach(() => {
     vi.clearAllMocks()
-    mockPortalOpenState = false
   })
 
   // Rendering Tests (REQUIRED)
@@ -1709,7 +1565,6 @@ describe('MethodSelector', () => {
 describe('Integration Tests', () => {
   beforeEach(() => {
     vi.clearAllMocks()
-    mockPortalOpenState = false
     mockIsCurrentWorkspaceManager.mockReturnValue(true)
     mockUseWorkflowToolDetailByAppID.mockImplementation((_appId: string, enabled: boolean) => ({
       data: enabled ? createMockWorkflowToolDetail() : undefined,
@@ -1717,25 +1572,22 @@ describe('Integration Tests', () => {
     }))
   })
 
-  // Complete workflow: open modal -> fill form -> save
+  // Complete workflow: open drawer -> fill form -> save
   describe('Complete Workflow', () => {
     it('should complete full create workflow', async () => {
       // Arrange
       const user = userEvent.setup()
-      mockCreateWorkflowToolProvider.mockResolvedValue({})
-      const onRefreshData = vi.fn()
-      const props = createDefaultConfigureButtonProps({ onRefreshData })
+      const onCreate = vi.fn()
 
       // Act
-      render(<WorkflowToolConfigureButton {...props} />)
-
-      // Open modal
-      const triggerArea = screen.getByText('workflow.common.workflowAsTool').closest('.flex')
-      await user.click(triggerArea!)
-
-      await waitFor(() => {
-        expect(screen.getByTestId('drawer'))!.toBeInTheDocument()
-      })
+      render(
+        <WorkflowToolDrawer
+          isAdd
+          payload={createDefaultDrawerPayload()}
+          onHide={vi.fn()}
+          onCreate={onCreate}
+        />,
+      )
 
       // Fill form
       const labelInput = screen.getByPlaceholderText('tools.createTool.toolNamePlaceHolder')
@@ -1743,6 +1595,7 @@ describe('Integration Tests', () => {
       await user.type(labelInput, 'My Custom Tool')
 
       const nameInput = screen.getByPlaceholderText('tools.createTool.nameForToolCallPlaceHolder')
+      await user.clear(nameInput)
       await user.type(nameInput, 'my_custom_tool')
 
       const descInput = screen.getByPlaceholderText('tools.createTool.descriptionPlaceholder')
@@ -1754,7 +1607,7 @@ describe('Integration Tests', () => {
 
       // Assert
       await waitFor(() => {
-        expect(mockCreateWorkflowToolProvider).toHaveBeenCalledWith(
+        expect(onCreate).toHaveBeenCalledWith(
           expect.objectContaining({
             name: 'my_custom_tool',
             label: 'My Custom Tool',
@@ -1762,36 +1615,22 @@ describe('Integration Tests', () => {
           }),
         )
       })
-
-      await waitFor(() => {
-        expect(onRefreshData).toHaveBeenCalled()
-      })
     })
 
     it('should complete full update workflow', async () => {
       // Arrange
       const user = userEvent.setup()
-      const handlePublish = vi.fn().mockResolvedValue(undefined)
-      mockSaveWorkflowToolProvider.mockResolvedValue({})
-      const props = createDefaultConfigureButtonProps({
-        published: true,
-        handlePublish,
-      })
+      const onSave = vi.fn()
 
       // Act
-      render(<WorkflowToolConfigureButton {...props} />)
-
-      // Wait for detail to load
-      await waitFor(() => {
-        expect(screen.getByText('workflow.common.configure'))!.toBeInTheDocument()
-      })
-
-      // Open modal
-      await user.click(screen.getByText('workflow.common.configure'))
-
-      await waitFor(() => {
-        expect(screen.getByTestId('drawer'))!.toBeInTheDocument()
-      })
+      render(
+        <WorkflowToolDrawer
+          isAdd={false}
+          payload={createDefaultDrawerPayload({ workflow_tool_id: 'workflow-tool-1' })}
+          onHide={vi.fn()}
+          onSave={onSave}
+        />,
+      )
 
       // Modify description
       const descInput = screen.getByPlaceholderText('tools.createTool.descriptionPlaceholder')
@@ -1809,8 +1648,10 @@ describe('Integration Tests', () => {
 
       // Assert
       await waitFor(() => {
-        expect(handlePublish).toHaveBeenCalled()
-        expect(mockSaveWorkflowToolProvider).toHaveBeenCalled()
+        expect(onSave).toHaveBeenCalledWith(expect.objectContaining({
+          workflow_tool_id: 'workflow-tool-1',
+          description: 'Updated description',
+        }))
       })
     })
   })
@@ -1819,11 +1660,9 @@ describe('Integration Tests', () => {
   describe('Callback Stability', () => {
     it('should maintain callback references across rerenders', async () => {
       // Arrange
-      const handlePublish = vi.fn().mockResolvedValue(undefined)
-      const onRefreshData = vi.fn()
+      const onConfigure = vi.fn()
       const props = createDefaultConfigureButtonProps({
-        handlePublish,
-        onRefreshData,
+        onConfigure,
       })
 
       // Act
diff --git a/web/app/components/tools/workflow-tool/__tests__/index.spec.tsx b/web/app/components/tools/workflow-tool/__tests__/index.spec.tsx
index 9f5532f1f7..3a8e3a539b 100644
--- a/web/app/components/tools/workflow-tool/__tests__/index.spec.tsx
+++ b/web/app/components/tools/workflow-tool/__tests__/index.spec.tsx
@@ -1,22 +1,8 @@
-import type { WorkflowToolModalPayload } from '../index'
+import type { WorkflowToolDrawerPayload } from '../index'
 import { render, screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import WorkflowToolAsModal from '../index'
-
-vi.mock('@/app/components/base/drawer-plus', () => ({
-  default: ({ isShow, onHide, title, body }: { isShow: boolean, onHide: () => void, title: string, body: React.ReactNode }) => (
-    isShow
-      ? (
-          <div data-testid="drawer" role="dialog">
-            <span>{title}</span>
-            <button data-testid="drawer-close" onClick={onHide}>Close</button>
-            {body}
-          </div>
-        )
-      : null
-  ),
-}))
+import { WorkflowToolDrawer } from '../index'
 
 vi.mock('@/app/components/base/emoji-picker/Inner', () => ({
   default: ({ onSelect }: { onSelect: (icon: string, background: string) => void }) => (
@@ -41,21 +27,6 @@ vi.mock('@/app/components/tools/labels/selector', () => ({
   ),
 }))
 
-vi.mock('@/app/components/base/tooltip', () => ({
-  default: ({
-    children,
-    popupContent,
-  }: {
-    children?: React.ReactNode
-    popupContent?: React.ReactNode
-  }) => (
-    <div>
-      {children}
-      {popupContent}
-    </div>
-  ),
-}))
-
 vi.mock('../confirm-modal', () => ({
   default: ({ show, onClose, onConfirm }: { show: boolean, onClose: () => void, onConfirm: () => void }) => (
     show
@@ -86,7 +57,7 @@ vi.mock('@/app/components/plugins/hooks', () => ({
   }),
 }))
 
-const createPayload = (overrides: Partial<WorkflowToolModalPayload> = {}): WorkflowToolModalPayload => ({
+const createPayload = (overrides: Partial<WorkflowToolDrawerPayload> = {}): WorkflowToolDrawerPayload => ({
   icon: { content: '🔧', background: '#ffffff' },
   label: 'My Tool',
   name: 'my_tool',
@@ -105,7 +76,7 @@ const createPayload = (overrides: Partial<WorkflowToolModalPayload> = {}): Workf
   ...overrides,
 })
 
-describe('WorkflowToolAsModal', () => {
+describe('WorkflowToolDrawer', () => {
   beforeEach(() => {
     vi.clearAllMocks()
   })
@@ -115,7 +86,7 @@ describe('WorkflowToolAsModal', () => {
     const onCreate = vi.fn()
 
     render(
-      <WorkflowToolAsModal
+      <WorkflowToolDrawer
         isAdd
         payload={createPayload()}
         onHide={vi.fn()}
@@ -144,7 +115,7 @@ describe('WorkflowToolAsModal', () => {
     const onCreate = vi.fn()
 
     render(
-      <WorkflowToolAsModal
+      <WorkflowToolDrawer
         isAdd
         payload={createPayload({ name: 'bad-name' })}
         onHide={vi.fn()}
@@ -165,7 +136,7 @@ describe('WorkflowToolAsModal', () => {
     const onSave = vi.fn()
 
     render(
-      <WorkflowToolAsModal
+      <WorkflowToolDrawer
         payload={createPayload()}
         onHide={vi.fn()}
         onSave={onSave}
@@ -187,7 +158,7 @@ describe('WorkflowToolAsModal', () => {
 
   it('should show duplicate reserved output warnings', () => {
     render(
-      <WorkflowToolAsModal
+      <WorkflowToolDrawer
         isAdd
         payload={createPayload()}
         onHide={vi.fn()}
diff --git a/web/app/components/tools/workflow-tool/configure-button.tsx b/web/app/components/tools/workflow-tool/configure-button.tsx
index 1e7053f744..370154aa57 100644
--- a/web/app/components/tools/workflow-tool/configure-button.tsx
+++ b/web/app/components/tools/workflow-tool/configure-button.tsx
@@ -1,70 +1,33 @@
 'use client'
-import type { Emoji } from '@/app/components/tools/types'
-import type { InputVar, Variable } from '@/app/components/workflow/types'
-import type { PublishWorkflowParams } from '@/types/workflow'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
-import { RiArrowRightUpLine, RiHammerLine } from '@remixicon/react'
 import { useTranslation } from 'react-i18next'
 import Loading from '@/app/components/base/loading'
 import Indicator from '@/app/components/header/indicator'
-import WorkflowToolModal from '@/app/components/tools/workflow-tool'
+import { useRouter } from '@/next/navigation'
 import Divider from '../../base/divider'
-import { useConfigureButton } from './hooks/use-configure-button'
 
 type Props = {
   disabled: boolean
   published: boolean
-  detailNeedUpdate: boolean
-  workflowAppId: string
-  icon: Emoji
-  name: string
-  description: string
-  inputs?: InputVar[]
-  outputs?: Variable[]
-  handlePublish: (params?: PublishWorkflowParams) => Promise<void>
-  onRefreshData?: () => void
+  isLoading: boolean
+  outdated: boolean
+  isCurrentWorkspaceManager: boolean
+  onConfigure: () => void
   disabledReason?: string
 }
 
 const WorkflowToolConfigureButton = ({
   disabled,
   published,
-  detailNeedUpdate,
-  workflowAppId,
-  icon,
-  name,
-  description,
-  inputs,
-  outputs,
-  handlePublish,
-  onRefreshData,
+  isLoading,
+  outdated,
+  isCurrentWorkspaceManager,
+  onConfigure,
   disabledReason,
 }: Props) => {
   const { t } = useTranslation()
-  const {
-    showModal,
-    isLoading,
-    outdated,
-    payload,
-    isCurrentWorkspaceManager,
-    openModal,
-    closeModal,
-    handleCreate,
-    handleUpdate,
-    navigateToTools,
-  } = useConfigureButton({
-    published,
-    detailNeedUpdate,
-    workflowAppId,
-    icon,
-    name,
-    description,
-    inputs,
-    outputs,
-    handlePublish,
-    onRefreshData,
-  })
+  const router = useRouter()
 
   return (
     <>
@@ -80,9 +43,12 @@ const WorkflowToolConfigureButton = ({
             ? (
                 <div
                   className="flex items-center justify-start gap-2 p-2 pl-2.5"
-                  onClick={() => !disabled && !published && openModal()}
+                  onClick={() => {
+                    if (!disabled && !published)
+                      onConfigure()
+                  }}
                 >
-                  <RiHammerLine className={cn('relative h-4 w-4 text-text-secondary', !disabled && !published && 'group-hover:text-text-accent')} />
+                  <span className={cn('relative i-ri-hammer-line h-4 w-4 text-text-secondary', !disabled && !published && 'group-hover:text-text-accent')} />
                   <div
                     title={t('common.workflowAsTool', { ns: 'workflow' }) || ''}
                     className={cn('shrink grow basis-0 truncate system-sm-medium text-text-secondary', !disabled && !published && 'group-hover:text-text-accent')}
@@ -100,7 +66,7 @@ const WorkflowToolConfigureButton = ({
                 <div
                   className="flex items-center justify-start gap-2 p-2 pl-2.5"
                 >
-                  <RiHammerLine className="h-4 w-4 text-text-tertiary" />
+                  <span className="i-ri-hammer-line h-4 w-4 text-text-tertiary" />
                   <div
                     title={t('common.workflowAsTool', { ns: 'workflow' }) || ''}
                     className="shrink grow basis-0 truncate system-sm-medium text-text-tertiary"
@@ -120,7 +86,7 @@ const WorkflowToolConfigureButton = ({
                 <Button
                   size="small"
                   className="w-[140px]"
-                  onClick={openModal}
+                  onClick={onConfigure}
                   disabled={!isCurrentWorkspaceManager || disabled}
                 >
                   {t('common.configure', { ns: 'workflow' })}
@@ -129,11 +95,11 @@ const WorkflowToolConfigureButton = ({
                 <Button
                   size="small"
                   className="w-[140px]"
-                  onClick={navigateToTools}
+                  onClick={() => router.push('/tools?category=workflow')}
                   disabled={disabled}
                 >
                   {t('common.manageInTools', { ns: 'workflow' })}
-                  <RiArrowRightUpLine className="ml-1 h-4 w-4" />
+                  <span className="ml-1 i-ri-arrow-right-up-line h-4 w-4" />
                 </Button>
               </div>
               {outdated && (
@@ -146,15 +112,6 @@ const WorkflowToolConfigureButton = ({
         </div>
       )}
       {published && isLoading && <div className="pt-2"><Loading type="app" /></div>}
-      {showModal && (
-        <WorkflowToolModal
-          isAdd={!published}
-          payload={payload}
-          onHide={closeModal}
-          onCreate={handleCreate}
-          onSave={handleUpdate}
-        />
-      )}
     </>
   )
 }
diff --git a/web/app/components/tools/workflow-tool/confirm-modal/__tests__/index.spec.tsx b/web/app/components/tools/workflow-tool/confirm-modal/__tests__/index.spec.tsx
index 6535564a32..e81d1789dd 100644
--- a/web/app/components/tools/workflow-tool/confirm-modal/__tests__/index.spec.tsx
+++ b/web/app/components/tools/workflow-tool/confirm-modal/__tests__/index.spec.tsx
@@ -110,10 +110,7 @@ describe('ConfirmModal', () => {
       const onClose = vi.fn()
       renderComponent({ onClose })
 
-      // Act - Find the close button and click it
-      const closeButton = document.querySelector('.cursor-pointer')
-      expect(closeButton).toBeInTheDocument() // Ensure the button is found before clicking
-      await user.click(closeButton!)
+      await user.click(screen.getByRole('button', { name: 'common.operation.close' }))
 
       // Assert
       expect(onClose).toHaveBeenCalledTimes(1)
@@ -243,10 +240,9 @@ describe('ConfirmModal', () => {
       renderComponent()
 
       // Assert
-      const buttons = screen.getAllByRole('button')
-      expect(buttons).toHaveLength(2)
-      expect(buttons[0]).toHaveTextContent('common.operation.cancel')
-      expect(buttons[1]).toHaveTextContent('common.operation.confirm')
+      expect(screen.getByRole('button', { name: 'common.operation.close' })).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'common.operation.cancel' })).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'common.operation.confirm' })).toBeInTheDocument()
     })
 
     it('should have proper text hierarchy', () => {
diff --git a/web/app/components/tools/workflow-tool/confirm-modal/index.tsx b/web/app/components/tools/workflow-tool/confirm-modal/index.tsx
index 4f17862c1a..08d3253535 100644
--- a/web/app/components/tools/workflow-tool/confirm-modal/index.tsx
+++ b/web/app/components/tools/workflow-tool/confirm-modal/index.tsx
@@ -21,9 +21,14 @@ const ConfirmModal = ({ show, onConfirm, onClose }: ConfirmModalProps) => {
         backdropProps={{ forceRender: true }}
         className={cn('w-[600px]! max-w-[600px]! p-8!')}
       >
-        <div className="absolute top-4 right-4 cursor-pointer p-2" onClick={onClose}>
-          <span className="i-ri-close-line h-4 w-4 text-text-tertiary" />
-        </div>
+        <button
+          type="button"
+          aria-label={t('operation.close', { ns: 'common' })}
+          className="absolute top-4 right-4 cursor-pointer border-none bg-transparent p-2"
+          onClick={onClose}
+        >
+          <span aria-hidden className="i-ri-close-line h-4 w-4 text-text-tertiary" />
+        </button>
         <div className="h-12 w-12 rounded-xl border-[0.5px] border-divider-regular bg-background-section p-3 shadow-xl">
           <AlertTriangle className="h-6 w-6 text-[rgb(247,144,9)]" />
         </div>
diff --git a/web/app/components/tools/workflow-tool/hooks/__tests__/use-configure-button.spec.ts b/web/app/components/tools/workflow-tool/hooks/__tests__/use-configure-button.spec.ts
index 8bc3db95da..fd800fe5b0 100644
--- a/web/app/components/tools/workflow-tool/hooks/__tests__/use-configure-button.spec.ts
+++ b/web/app/components/tools/workflow-tool/hooks/__tests__/use-configure-button.spec.ts
@@ -4,11 +4,6 @@ import { act, renderHook } from '@testing-library/react'
 import { InputVarType } from '@/app/components/workflow/types'
 import { isParametersOutdated, useConfigureButton } from '../use-configure-button'
 
-const mockPush = vi.fn()
-vi.mock('@/next/navigation', () => ({
-  useRouter: () => ({ push: mockPush }),
-}))
-
 const mockIsCurrentWorkspaceManager = vi.fn(() => true)
 vi.mock('@/context/app-context', () => ({
   useAppContext: () => ({
@@ -98,6 +93,7 @@ const createMockDetail = (overrides: Partial<WorkflowToolProviderResponse> = {})
 })
 
 const createDefaultOptions = (overrides = {}) => ({
+  enabled: true,
   published: false,
   detailNeedUpdate: false,
   workflowAppId: 'app-123',
@@ -213,9 +209,9 @@ describe('useConfigureButton', () => {
   })
 
   describe('Initialization', () => {
-    it('should return showModal as false by default', () => {
+    it('should return workflow tool state without owning drawer visibility', () => {
       const { result } = renderHook(() => useConfigureButton(createDefaultOptions()))
-      expect(result.current.showModal).toBe(false)
+      expect(result.current.payload).toMatchObject({ workflow_app_id: 'app-123' })
     })
 
     it('should forward isCurrentWorkspaceManager from context', () => {
@@ -239,6 +235,11 @@ describe('useConfigureButton', () => {
       renderHook(() => useConfigureButton(createDefaultOptions({ published: false })))
       expect(mockUseWorkflowToolDetailByAppID).toHaveBeenCalledWith('app-123', false)
     })
+
+    it('should call query hook with enabled=false when controller is disabled', () => {
+      renderHook(() => useConfigureButton(createDefaultOptions({ enabled: false, published: true })))
+      expect(mockUseWorkflowToolDetailByAppID).toHaveBeenCalledWith('app-123', false)
+    })
   })
 
   // Computed values
@@ -348,46 +349,13 @@ describe('useConfigureButton', () => {
     })
   })
 
-  // Modal controls
-  describe('Modal Controls', () => {
-    it('should open modal via openModal', () => {
-      const { result } = renderHook(() => useConfigureButton(createDefaultOptions()))
-      act(() => {
-        result.current.openModal()
-      })
-      expect(result.current.showModal).toBe(true)
-    })
-
-    it('should close modal via closeModal', () => {
-      const { result } = renderHook(() => useConfigureButton(createDefaultOptions()))
-      act(() => {
-        result.current.openModal()
-      })
-      act(() => {
-        result.current.closeModal()
-      })
-      expect(result.current.showModal).toBe(false)
-    })
-
-    it('should navigate to tools page', () => {
-      const { result } = renderHook(() => useConfigureButton(createDefaultOptions()))
-      act(() => {
-        result.current.navigateToTools()
-      })
-      expect(mockPush).toHaveBeenCalledWith('/tools?category=workflow')
-    })
-  })
-
   // Mutation handlers
   describe('handleCreate', () => {
-    it('should create provider, invalidate caches, refresh, and close modal', async () => {
+    it('should create provider, invalidate caches, refresh, and notify configured', async () => {
       mockCreateWorkflowToolProvider.mockResolvedValue({})
       const onRefreshData = vi.fn()
-      const { result } = renderHook(() => useConfigureButton(createDefaultOptions({ onRefreshData })))
-
-      act(() => {
-        result.current.openModal()
-      })
+      const onConfigured = vi.fn()
+      const { result } = renderHook(() => useConfigureButton(createDefaultOptions({ onRefreshData, onConfigured })))
 
       await act(async () => {
         await result.current.handleCreate(createMockRequest({ workflow_app_id: 'app-123' }) as WorkflowToolProviderRequest & { workflow_app_id: string })
@@ -398,7 +366,7 @@ describe('useConfigureButton', () => {
       expect(onRefreshData).toHaveBeenCalled()
       expect(mockInvalidateWorkflowToolDetailByAppID).toHaveBeenCalledWith('app-123')
       expect(mockToastNotify).toHaveBeenCalledWith({ type: 'success', message: expect.any(String) })
-      expect(result.current.showModal).toBe(false)
+      expect(onConfigured).toHaveBeenCalled()
     })
 
     it('should show error toast on failure', async () => {
@@ -414,20 +382,18 @@ describe('useConfigureButton', () => {
   })
 
   describe('handleUpdate', () => {
-    it('should publish, save, invalidate caches, and close modal', async () => {
+    it('should publish, save, invalidate caches, and notify configured', async () => {
       mockSaveWorkflowToolProvider.mockResolvedValue({})
       const handlePublish = vi.fn().mockResolvedValue(undefined)
       const onRefreshData = vi.fn()
+      const onConfigured = vi.fn()
       const { result } = renderHook(() => useConfigureButton(createDefaultOptions({
         published: true,
         handlePublish,
         onRefreshData,
+        onConfigured,
       })))
 
-      act(() => {
-        result.current.openModal()
-      })
-
       await act(async () => {
         await result.current.handleUpdate(createMockRequest({ workflow_tool_id: 'tool-456' }) as WorkflowToolProviderRequest & Partial<{ workflow_app_id: string, workflow_tool_id: string }>)
       })
@@ -437,7 +403,7 @@ describe('useConfigureButton', () => {
       expect(onRefreshData).toHaveBeenCalled()
       expect(mockInvalidateAllWorkflowTools).toHaveBeenCalled()
       expect(mockInvalidateWorkflowToolDetailByAppID).toHaveBeenCalledWith('app-123')
-      expect(result.current.showModal).toBe(false)
+      expect(onConfigured).toHaveBeenCalled()
     })
 
     it('should show error toast when publish fails', async () => {
@@ -491,6 +457,16 @@ describe('useConfigureButton', () => {
 
       expect(mockInvalidateWorkflowToolDetailByAppID).not.toHaveBeenCalled()
     })
+
+    it('should not invalidate detail while disabled', () => {
+      renderHook(() => useConfigureButton(createDefaultOptions({
+        enabled: false,
+        published: true,
+        detailNeedUpdate: true,
+      })))
+
+      expect(mockInvalidateWorkflowToolDetailByAppID).not.toHaveBeenCalled()
+    })
   })
 
   // Edge cases
diff --git a/web/app/components/tools/workflow-tool/hooks/use-configure-button.ts b/web/app/components/tools/workflow-tool/hooks/use-configure-button.ts
index 33965aa5ee..f4b6881f98 100644
--- a/web/app/components/tools/workflow-tool/hooks/use-configure-button.ts
+++ b/web/app/components/tools/workflow-tool/hooks/use-configure-button.ts
@@ -2,10 +2,9 @@ import type { Emoji, WorkflowToolProviderOutputParameter, WorkflowToolProviderPa
 import type { InputVar, Variable } from '@/app/components/workflow/types'
 import type { PublishWorkflowParams } from '@/types/workflow'
 import { toast } from '@langgenius/dify-ui/toast'
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { useEffect, useMemo, useRef } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useAppContext } from '@/context/app-context'
-import { useRouter } from '@/next/navigation'
 import { createWorkflowToolProvider, saveWorkflowToolProvider } from '@/service/tools'
 import { useInvalidateAllWorkflowTools, useInvalidateWorkflowToolDetailByAppID, useWorkflowToolDetailByAppID } from '@/service/use-tools'
 
@@ -89,6 +88,7 @@ function buildExistingOutputParameters(
 // endregion
 
 type UseConfigureButtonOptions = {
+  enabled: boolean
   published: boolean
   detailNeedUpdate: boolean
   workflowAppId: string
@@ -99,10 +99,12 @@ type UseConfigureButtonOptions = {
   outputs?: Variable[]
   handlePublish: (params?: PublishWorkflowParams) => Promise<void>
   onRefreshData?: () => void
+  onConfigured?: () => void
 }
 
 export function useConfigureButton(options: UseConfigureButtonOptions) {
   const {
+    enabled,
     published,
     detailNeedUpdate,
     workflowAppId,
@@ -113,16 +115,14 @@ export function useConfigureButton(options: UseConfigureButtonOptions) {
     outputs,
     handlePublish,
     onRefreshData,
+    onConfigured,
   } = options
 
   const { t } = useTranslation()
-  const router = useRouter()
   const { isCurrentWorkspaceManager } = useAppContext()
 
-  const [showModal, setShowModal] = useState(false)
-
   // Data fetching via React Query
-  const { data: detail, isLoading } = useWorkflowToolDetailByAppID(workflowAppId, published)
+  const { data: detail, isLoading } = useWorkflowToolDetailByAppID(workflowAppId, enabled && published)
 
   // Invalidation functions (store in ref for stable effect dependency)
   const invalidateDetail = useInvalidateWorkflowToolDetailByAppID()
@@ -133,9 +133,9 @@ export function useConfigureButton(options: UseConfigureButtonOptions) {
 
   // Refetch when detailNeedUpdate becomes true
   useEffect(() => {
-    if (detailNeedUpdate)
+    if (enabled && detailNeedUpdate)
       invalidateDetailRef.current(workflowAppId)
-  }, [detailNeedUpdate, workflowAppId])
+  }, [detailNeedUpdate, enabled, workflowAppId])
 
   // Computed values
   const outdated = useMemo(
@@ -173,14 +173,6 @@ export function useConfigureButton(options: UseConfigureButtonOptions) {
     }
   }, [detail, published, workflowAppId, icon, name, description, inputs, outputs])
 
-  // Modal controls (stable callbacks)
-  const openModal = useCallback(() => setShowModal(true), [])
-  const closeModal = useCallback(() => setShowModal(false), [])
-  const navigateToTools = useCallback(
-    () => router.push('/tools?category=workflow'),
-    [router],
-  )
-
   // Mutation handlers (not memoized — only used in conditionally-rendered modal)
   const handleCreate = async (data: WorkflowToolProviderRequest & { workflow_app_id: string }) => {
     try {
@@ -189,7 +181,7 @@ export function useConfigureButton(options: UseConfigureButtonOptions) {
       onRefreshData?.()
       invalidateDetail(workflowAppId)
       toast.success(t('api.actionSuccess', { ns: 'common' }))
-      setShowModal(false)
+      onConfigured?.()
     }
     catch (e) {
       toast.error((e as Error).message)
@@ -206,7 +198,7 @@ export function useConfigureButton(options: UseConfigureButtonOptions) {
       onRefreshData?.()
       invalidateAllWorkflowTools()
       invalidateDetail(workflowAppId)
-      setShowModal(false)
+      onConfigured?.()
     }
     catch (e) {
       toast.error((e as Error).message)
@@ -214,15 +206,11 @@ export function useConfigureButton(options: UseConfigureButtonOptions) {
   }
 
   return {
-    showModal,
     isLoading,
     outdated,
     payload,
     isCurrentWorkspaceManager,
-    openModal,
-    closeModal,
     handleCreate,
     handleUpdate,
-    navigateToTools,
   }
 }
diff --git a/web/app/components/tools/workflow-tool/index.tsx b/web/app/components/tools/workflow-tool/index.tsx
index 6f8258f185..2fe23abd48 100644
--- a/web/app/components/tools/workflow-tool/index.tsx
+++ b/web/app/components/tools/workflow-tool/index.tsx
@@ -1,9 +1,19 @@
 'use client'
-import type { FC } from 'react'
+import type { DrawerRootProps } from '@langgenius/dify-ui/drawer'
 import type { Emoji, WorkflowToolProviderOutputParameter, WorkflowToolProviderOutputSchema, WorkflowToolProviderParameter, WorkflowToolProviderRequest } from '../types'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
 import { Dialog, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
+import {
+  Drawer,
+  DrawerBackdrop,
+  DrawerCloseButton,
+  DrawerContent,
+  DrawerPopup,
+  DrawerPortal,
+  DrawerTitle,
+  DrawerViewport,
+} from '@langgenius/dify-ui/drawer'
 import { toast } from '@langgenius/dify-ui/toast'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { produce } from 'immer'
@@ -13,6 +23,7 @@ import { useTranslation } from 'react-i18next'
 import AppIcon from '@/app/components/base/app-icon'
 import Divider from '@/app/components/base/divider'
 import EmojiPickerInner from '@/app/components/base/emoji-picker/Inner'
+import { Infotip } from '@/app/components/base/infotip'
 import Input from '@/app/components/base/input'
 import Textarea from '@/app/components/base/textarea'
 import LabelSelector from '@/app/components/tools/labels/selector'
@@ -26,7 +37,7 @@ import {
   isWorkflowToolNameValid,
 } from './helpers'
 
-export type WorkflowToolModalPayload = {
+export type WorkflowToolDrawerPayload = {
   icon: Emoji
   label: string
   name: string
@@ -42,9 +53,9 @@ export type WorkflowToolModalPayload = {
   workflow_app_id?: string
 }
 
-type Props = {
+export type WorkflowToolDrawerProps = {
   isAdd?: boolean
-  payload: WorkflowToolModalPayload
+  payload: WorkflowToolDrawerPayload
   onHide: () => void
   onRemove?: () => void
   onCreate?: (payload: WorkflowToolProviderRequest & { workflow_app_id: string }) => void
@@ -54,62 +65,64 @@ type Props = {
   }>) => void
 }
 
-type WorkflowToolDrawerProps = {
+type WorkflowToolDrawerFrameProps = {
   title: string
+  closeLabel: string
   onHide: () => void
   children: React.ReactNode
 }
 
-const InfoTooltip = ({ children }: { children: React.ReactNode }) => {
+const InfoTooltip = ({ children }: { children: string }) => {
   return (
-    <Tooltip>
-      <TooltipTrigger
-        render={(
-          <span className="i-ri-question-line h-3.5 w-3.5 shrink-0 cursor-help text-text-quaternary hover:text-text-tertiary" />
-        )}
-      />
-      <TooltipContent>
-        <div className="w-[180px]">
-          {children}
-        </div>
-      </TooltipContent>
-    </Tooltip>
+    <Infotip
+      aria-label={children}
+      className="ml-1 h-3.5 w-3.5"
+      iconClassName="h-3.5 w-3.5"
+      popupClassName="w-[180px]"
+    >
+      {children}
+    </Infotip>
   )
 }
 
-const WorkflowToolDrawer = ({ title, onHide, children }: WorkflowToolDrawerProps) => {
+const WorkflowToolDrawerFrame = ({ title, closeLabel, onHide, children }: WorkflowToolDrawerFrameProps) => {
+  const handleOpenChange = React.useCallback<NonNullable<DrawerRootProps['onOpenChange']>>((open) => {
+    if (!open)
+      onHide()
+  }, [onHide])
+
   return (
-    <Dialog open disablePointerDismissal>
-      <DialogContent
-        className={cn(
-          'top-2 right-2 bottom-2 left-auto h-[calc(100dvh-16px)] max-h-[calc(100dvh-16px)] w-[640px]! max-w-[calc(100vw-16px)]! translate-x-0! translate-y-0! overflow-hidden rounded-xl border-none bg-transparent p-0 shadow-none',
-          'data-ending-style:translate-x-4 data-ending-style:scale-100 data-starting-style:translate-x-4 data-starting-style:scale-100',
-        )}
-        backdropClassName="bg-background-overlay"
-      >
-        <div data-testid="drawer" className="flex h-full w-full flex-col rounded-xl border-[0.5px] border-divider-subtle bg-components-panel-bg shadow-xl">
-          <div className="shrink-0 border-b border-divider-subtle py-4">
-            <div className="flex h-6 items-center justify-between pr-5 pl-6">
-              <DialogTitle data-testid="drawer-title" className="system-xl-semibold text-text-primary">
-                {title}
-              </DialogTitle>
-              <button
-                type="button"
-                data-testid="drawer-close"
-                className="flex h-6 w-6 cursor-pointer items-center justify-center rounded-md hover:bg-state-base-hover"
-                aria-label="Close"
-                onClick={onHide}
-              >
-                <span className="i-ri-close-line h-4 w-4 text-text-tertiary" />
-              </button>
-            </div>
-          </div>
-          <div className="grow overflow-hidden">
-            {children}
-          </div>
-        </div>
-      </DialogContent>
-    </Dialog>
+    <Drawer open modal disablePointerDismissal swipeDirection="right" onOpenChange={handleOpenChange}>
+      <DrawerPortal>
+        <DrawerBackdrop />
+        <DrawerViewport>
+          <DrawerPopup
+            data-testid="drawer"
+            className={cn(
+              'data-[swipe-direction=right]:top-2 data-[swipe-direction=right]:right-2 data-[swipe-direction=right]:bottom-2 data-[swipe-direction=right]:h-[calc(100dvh-16px)] data-[swipe-direction=right]:w-160 data-[swipe-direction=right]:max-w-[calc(100vw-16px)]',
+              'data-[swipe-direction=right]:rounded-xl data-[swipe-direction=right]:border-r-[0.5px] data-[swipe-direction=right]:border-divider-subtle',
+            )}
+          >
+            <DrawerContent className="flex min-h-0 flex-1 flex-col overflow-hidden p-0 pb-0">
+              <div className="shrink-0 border-b border-divider-subtle py-4">
+                <div className="flex h-6 items-center justify-between pr-5 pl-6">
+                  <DrawerTitle data-testid="drawer-title" className="min-w-0 truncate system-xl-semibold text-text-primary">
+                    {title}
+                  </DrawerTitle>
+                  <DrawerCloseButton
+                    className="h-6 w-6 rounded-md"
+                    aria-label={closeLabel}
+                  />
+                </div>
+              </div>
+              <div className="grow overflow-hidden">
+                {children}
+              </div>
+            </DrawerContent>
+          </DrawerPopup>
+        </DrawerViewport>
+      </DrawerPortal>
+    </Drawer>
   )
 }
 
@@ -158,15 +171,14 @@ const WorkflowToolEmojiPicker = ({ onSelect, onClose }: WorkflowToolEmojiPickerP
   )
 }
 
-// Add and Edit
-const WorkflowToolAsModal: FC<Props> = ({
+export function WorkflowToolDrawer({
   isAdd,
   payload,
   onHide,
   onRemove,
   onSave,
   onCreate,
-}) => {
+}: WorkflowToolDrawerProps) {
   const { t } = useTranslation()
 
   const [showEmojiPicker, setShowEmojiPicker] = useState<boolean>(false)
@@ -200,7 +212,7 @@ const WorkflowToolAsModal: FC<Props> = ({
     setLabels(value)
   }
   const [privacyPolicy, setPrivacyPolicy] = useState(payload.privacy_policy)
-  const [showModal, setShowModal] = useState(false)
+  const [confirmModalOpen, setConfirmModalOpen] = useState(false)
 
   const onConfirm = () => {
     let errorMessage = ''
@@ -243,9 +255,10 @@ const WorkflowToolAsModal: FC<Props> = ({
 
   return (
     <>
-      <WorkflowToolDrawer
+      <WorkflowToolDrawerFrame
         onHide={onHide}
         title={t('common.workflowAsTool', { ns: 'workflow' })!}
+        closeLabel={t('operation.close', { ns: 'common' })!}
       >
         <div className="flex h-full flex-col">
           <div className="h-0 grow space-y-4 overflow-y-auto px-6 py-3">
@@ -427,7 +440,7 @@ const WorkflowToolAsModal: FC<Props> = ({
                   if (isAdd)
                     onConfirm()
                   else
-                    setShowModal(true)
+                    setConfirmModalOpen(true)
                 }}
               >
                 {t('operation.save', { ns: 'common' })}
@@ -435,7 +448,7 @@ const WorkflowToolAsModal: FC<Props> = ({
             </div>
           </div>
         </div>
-      </WorkflowToolDrawer>
+      </WorkflowToolDrawerFrame>
       {showEmojiPicker && (
         <WorkflowToolEmojiPicker
           onSelect={(icon, icon_background) => {
@@ -447,10 +460,10 @@ const WorkflowToolAsModal: FC<Props> = ({
           }}
         />
       )}
-      {showModal && (
+      {confirmModalOpen && (
         <ConfirmModal
-          show={showModal}
-          onClose={() => setShowModal(false)}
+          show={confirmModalOpen}
+          onClose={() => setConfirmModalOpen(false)}
           onConfirm={onConfirm}
         />
       )}
@@ -458,4 +471,3 @@ const WorkflowToolAsModal: FC<Props> = ({
 
   )
 }
-export default React.memo(WorkflowToolAsModal)
diff --git a/web/app/components/tools/workflow-tool/method-selector.tsx b/web/app/components/tools/workflow-tool/method-selector.tsx
index 6310f07f3c..2122eb9fae 100644
--- a/web/app/components/tools/workflow-tool/method-selector.tsx
+++ b/web/app/components/tools/workflow-tool/method-selector.tsx
@@ -51,28 +51,35 @@ const MethodSelector: FC<MethodSelectorProps> = ({
         <PopoverContent
           placement="bottom-start"
           sideOffset={4}
-          positionerProps={{ style: { zIndex: 1040 } }}
         >
           <div className="relative w-[320px]">
             <div className="p-1">
-              <div className="cursor-pointer rounded-lg py-2.5 pr-2 pl-3 hover:bg-components-panel-on-panel-item-bg-hover" onClick={() => handleSelect('llm')}>
+              <button
+                type="button"
+                className="block w-full cursor-pointer rounded-lg border-none bg-transparent py-2.5 pr-2 pl-3 text-left hover:bg-components-panel-on-panel-item-bg-hover"
+                onClick={() => handleSelect('llm')}
+              >
                 <div className="flex items-center gap-1">
                   <div className="h-4 w-4 shrink-0">
-                    {value === 'llm' && <Check className="h-4 w-4 shrink-0 text-text-accent" />}
+                    {value === 'llm' && <Check className="h-4 w-4 shrink-0 text-text-accent" aria-hidden />}
                   </div>
                   <div className="text-[13px] leading-[18px] font-medium text-text-secondary">{t('createTool.toolInput.methodParameter', { ns: 'tools' })}</div>
                 </div>
                 <div className="pl-5 text-[13px] leading-[18px] text-text-tertiary">{t('createTool.toolInput.methodParameterTip', { ns: 'tools' })}</div>
-              </div>
-              <div className="cursor-pointer rounded-lg py-2.5 pr-2 pl-3 hover:bg-components-panel-on-panel-item-bg-hover" onClick={() => handleSelect('form')}>
+              </button>
+              <button
+                type="button"
+                className="block w-full cursor-pointer rounded-lg border-none bg-transparent py-2.5 pr-2 pl-3 text-left hover:bg-components-panel-on-panel-item-bg-hover"
+                onClick={() => handleSelect('form')}
+              >
                 <div className="flex items-center gap-1">
                   <div className="h-4 w-4 shrink-0">
-                    {value === 'form' && <Check className="h-4 w-4 shrink-0 text-text-accent" />}
+                    {value === 'form' && <Check className="h-4 w-4 shrink-0 text-text-accent" aria-hidden />}
                   </div>
                   <div className="text-[13px] leading-[18px] font-medium text-text-secondary">{t('createTool.toolInput.methodSetting', { ns: 'tools' })}</div>
                 </div>
                 <div className="pl-5 text-[13px] leading-[18px] text-text-tertiary">{t('createTool.toolInput.methodSettingTip', { ns: 'tools' })}</div>
-              </div>
+              </button>
             </div>
           </div>
         </PopoverContent>
diff --git a/web/app/components/workflow-app/components/workflow-header/__tests__/features-trigger.spec.tsx b/web/app/components/workflow-app/components/workflow-header/__tests__/features-trigger.spec.tsx
index 5f9815a72f..4da4ea1b14 100644
--- a/web/app/components/workflow-app/components/workflow-header/__tests__/features-trigger.spec.tsx
+++ b/web/app/components/workflow-app/components/workflow-header/__tests__/features-trigger.spec.tsx
@@ -124,7 +124,7 @@ vi.mock('@/app/components/app/app-publisher', () => ({
         <button type="button" onClick={() => { Promise.resolve(props.onPublish?.()).catch(() => undefined) }}>
           publisher-publish
         </button>
-        <button type="button" onClick={() => { Promise.resolve(props.onPublish?.({ title: 'Test title', releaseNotes: 'Test notes' })).catch(() => undefined) }}>
+        <button type="button" onClick={() => { Promise.resolve(props.onPublish?.({ url: '/apps/app-1/workflows/publish', title: 'Test title', releaseNotes: 'Test notes' })).catch(() => undefined) }}>
           publisher-publish-with-params
         </button>
         <button type="button" onClick={() => { Promise.resolve(props.onPublish?.({ url: '/apps/app-id/workflows/publish/evaluation', title: 'Evaluation title', releaseNotes: 'Evaluation notes' })).catch(() => undefined) }}>
diff --git a/web/app/components/workflow-app/components/workflow-onboarding-modal/__tests__/index.spec.tsx b/web/app/components/workflow-app/components/workflow-onboarding-modal/__tests__/index.spec.tsx
index 479b95dcb6..c61882146b 100644
--- a/web/app/components/workflow-app/components/workflow-onboarding-modal/__tests__/index.spec.tsx
+++ b/web/app/components/workflow-app/components/workflow-onboarding-modal/__tests__/index.spec.tsx
@@ -2,21 +2,8 @@ import type { ReactNode } from 'react'
 import { fireEvent, render, screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { BlockEnum } from '@/app/components/workflow/types'
-import { AppTypeEnum } from '@/types/app'
 import WorkflowOnboardingModal from '../index'
 
-const mockAppType = vi.hoisted<{ current?: string }>(() => ({
-  current: 'workflow',
-}))
-
-vi.mock('@/app/components/app/store', () => ({
-  useStore: (selector: (state: { appDetail: { type?: string } }) => unknown) => selector({
-    appDetail: {
-      type: mockAppType.current,
-    },
-  }),
-}))
-
 vi.mock('@/app/components/workflow/block-selector', () => ({
   default: function MockNodeSelector({
     open,
@@ -57,7 +44,6 @@ describe('WorkflowOnboardingModal', () => {
 
   beforeEach(() => {
     vi.clearAllMocks()
-    mockAppType.current = AppTypeEnum.WORKFLOW
   })
 
   const renderComponent = (props = {}) => {
@@ -105,27 +91,12 @@ describe('WorkflowOnboardingModal', () => {
       expect(getTriggerHeading()).toBeInTheDocument()
     })
 
-    it('should hide the trigger starter in evaluation workflows', () => {
-      mockAppType.current = AppTypeEnum.EVALUATION
-
-      renderComponent()
-
-      expect(getUserInputHeading()).toBeInTheDocument()
-      expect(screen.queryByRole('heading', { name: 'workflow.onboarding.trigger' })).not.toBeInTheDocument()
-    })
-
-    it('should render ESC tip when shown', () => {
+    it('should not render ESC tip', () => {
       renderComponent({ isShow: true })
 
-      expect(screen.getByText('workflow.onboarding.escTip.press')).toBeInTheDocument()
-      expect(screen.getByText('workflow.onboarding.escTip.key')).toBeInTheDocument()
-      expect(screen.getByText('workflow.onboarding.escTip.toDismiss')).toBeInTheDocument()
-    })
-
-    it('should not render ESC tip when hidden', () => {
-      renderComponent({ isShow: false })
-
       expect(screen.queryByText('workflow.onboarding.escTip.press')).not.toBeInTheDocument()
+      expect(screen.queryByText('workflow.onboarding.escTip.key')).not.toBeInTheDocument()
+      expect(screen.queryByText('workflow.onboarding.escTip.toDismiss')).not.toBeInTheDocument()
     })
 
     it('should have correct styling for title', () => {
@@ -409,20 +380,6 @@ describe('WorkflowOnboardingModal', () => {
       expect(mockOnClose).toHaveBeenCalledTimes(1)
     })
 
-    it('should have visible ESC key hint', () => {
-      renderComponent({ isShow: true })
-
-      const escKey = screen.getByText('workflow.onboarding.escTip.key')
-      expect(escKey.closest('.system-kbd')).toBeInTheDocument()
-    })
-
-    it('should have descriptive text for ESC functionality', () => {
-      renderComponent({ isShow: true })
-
-      expect(screen.getByText('workflow.onboarding.escTip.press')).toBeInTheDocument()
-      expect(screen.getByText('workflow.onboarding.escTip.toDismiss')).toBeInTheDocument()
-    })
-
     it('should have proper text color classes', () => {
       renderComponent()
 
@@ -466,8 +423,6 @@ describe('WorkflowOnboardingModal', () => {
       expect(dialog).toBeInTheDocument()
       expect(screen.getByText('workflow.onboarding.title')).toBeInTheDocument()
       expect(getUserInputHeading()).toBeInTheDocument()
-      expect(screen.getByText('workflow.onboarding.escTip.key')).toBeInTheDocument()
-      expect(dialog).not.toContainElement(screen.getByText('workflow.onboarding.escTip.key'))
     })
 
     it('should coordinate between keyboard and click interactions', async () => {
diff --git a/web/app/components/workflow-app/components/workflow-onboarding-modal/index.tsx b/web/app/components/workflow-app/components/workflow-onboarding-modal/index.tsx
index c72a515925..8f25cd00d0 100644
--- a/web/app/components/workflow-app/components/workflow-onboarding-modal/index.tsx
+++ b/web/app/components/workflow-app/components/workflow-onboarding-modal/index.tsx
@@ -1,9 +1,8 @@
 'use client'
 import type { FC } from 'react'
 import type { PluginDefaultValue } from '@/app/components/workflow/block-selector/types'
-import { Dialog, DialogCloseButton, DialogContent, DialogDescription, DialogPortal, DialogTitle } from '@langgenius/dify-ui/dialog'
+import { Dialog, DialogCloseButton, DialogContent, DialogDescription, DialogTitle } from '@langgenius/dify-ui/dialog'
 import { useTranslation } from 'react-i18next'
-import ShortcutsName from '@/app/components/workflow/shortcuts-name'
 import { BlockEnum } from '@/app/components/workflow/types'
 import StartNodeSelectionPanel from './start-node-selection-panel'
 
@@ -44,15 +43,6 @@ const WorkflowOnboardingModal: FC<WorkflowOnboardingModalProps> = ({
           />
         </div>
       </DialogContent>
-
-      {/* TODO: reduce z-1002 to match @langgenius/dify-ui primitives after legacy overlay migration completes */}
-      <DialogPortal>
-        <div className="pointer-events-none fixed top-1/2 left-1/2 z-1002 flex -translate-x-1/2 translate-y-[165px] items-center gap-1 body-xs-regular text-text-quaternary">
-          <span>{t('onboarding.escTip.press', { ns: 'workflow' })}</span>
-          <ShortcutsName keys={[t('onboarding.escTip.key', { ns: 'workflow' })]} textColor="secondary" />
-          <span>{t('onboarding.escTip.toDismiss', { ns: 'workflow' })}</span>
-        </div>
-      </DialogPortal>
     </Dialog>
   )
 }
diff --git a/web/app/components/workflow-app/hooks/__tests__/use-workflow-run-callbacks.spec.ts b/web/app/components/workflow-app/hooks/__tests__/use-workflow-run-callbacks.spec.ts
index 880d5e56e6..3756381822 100644
--- a/web/app/components/workflow-app/hooks/__tests__/use-workflow-run-callbacks.spec.ts
+++ b/web/app/components/workflow-app/hooks/__tests__/use-workflow-run-callbacks.spec.ts
@@ -64,6 +64,12 @@ const createUserCallbacks = () => ({
   onCompleted: vi.fn(),
 })
 
+const createWorkflowData = () => ({
+  result: { status: 'running' },
+  tracing: [{ node_id: 'node-1', status: 'running' }],
+  resultText: 'partial result',
+})
+
 describe('useWorkflowRun callbacks helpers', () => {
   beforeEach(() => {
     vi.clearAllMocks()
@@ -77,6 +83,8 @@ describe('useWorkflowRun callbacks helpers', () => {
     const fetchInspectVars = vi.fn()
     const invalidAllLastRun = vi.fn()
     const trackWorkflowRunFailed = vi.fn()
+    const workflowData = createWorkflowData()
+    const getWorkflowRunningData = vi.fn(() => workflowData)
     const userOnWorkflowFinished = vi.fn()
     const userOnError = vi.fn()
     const userOnWorkflowPaused = vi.fn()
@@ -95,6 +103,7 @@ describe('useWorkflowRun callbacks helpers', () => {
       invalidateRunHistory,
       clearAbortController,
       clearListeningState,
+      getWorkflowRunningData,
       trackWorkflowRunFailed,
       handlers,
       callbacks: {
@@ -118,7 +127,8 @@ describe('useWorkflowRun callbacks helpers', () => {
     expect(clearAbortController).toHaveBeenCalled()
     expect(handlers.handleWorkflowFailed).toHaveBeenCalled()
     expect(userOnError).toHaveBeenCalled()
-    expect(trackWorkflowRunFailed).toHaveBeenCalledWith({ error: 'failed', node_type: 'llm' })
+    expect(getWorkflowRunningData).toHaveBeenCalled()
+    expect(trackWorkflowRunFailed).toHaveBeenCalledWith({ error: 'failed', node_type: 'llm' }, workflowData)
 
     callbacks.onTTSChunk?.('message-1', 'audio-chunk')
     expect(getOrCreatePlayer).toHaveBeenCalled()
@@ -149,6 +159,7 @@ describe('useWorkflowRun callbacks helpers', () => {
       invalidateRunHistory: vi.fn(),
       clearAbortController: vi.fn(),
       clearListeningState: vi.fn(),
+      getWorkflowRunningData: vi.fn(() => createWorkflowData()),
       trackWorkflowRunFailed: vi.fn(),
       handlers,
       callbacks: {},
@@ -166,6 +177,7 @@ describe('useWorkflowRun callbacks helpers', () => {
       invalidateRunHistory: vi.fn(),
       clearAbortController: vi.fn(),
       clearListeningState: vi.fn(),
+      getWorkflowRunningData: vi.fn(() => createWorkflowData()),
       trackWorkflowRunFailed: vi.fn(),
       handlers,
       callbacks: {},
@@ -188,6 +200,10 @@ describe('useWorkflowRun callbacks helpers', () => {
     finalCallbacks.onTTSChunk?.('message-2', 'audio-chunk')
     expect(player.playAudioWithAudio).toHaveBeenCalledWith('audio-chunk', true)
     expect(mockResetMsgId).toHaveBeenCalledWith('message-2')
+
+    finalCallbacks.onTTSChunk?.('message-3', '')
+    expect(player.playAudioWithAudio).toHaveBeenCalledTimes(1)
+    expect(mockResetMsgId).toHaveBeenCalledTimes(1)
   })
 
   it('should route base workflow events through handlers, user callbacks, and pause continuation with the same callback object', async () => {
@@ -199,6 +215,8 @@ describe('useWorkflowRun callbacks helpers', () => {
     const fetchInspectVars = vi.fn()
     const invalidAllLastRun = vi.fn()
     const trackWorkflowRunFailed = vi.fn()
+    const workflowData = createWorkflowData()
+    const getWorkflowRunningData = vi.fn(() => workflowData)
     const player = {
       playAudioWithAudio: vi.fn(),
     } as unknown as AudioPlayer
@@ -213,6 +231,7 @@ describe('useWorkflowRun callbacks helpers', () => {
       invalidateRunHistory,
       clearAbortController,
       clearListeningState,
+      getWorkflowRunningData,
       trackWorkflowRunFailed,
       handlers,
       callbacks: userCallbacks,
@@ -297,7 +316,8 @@ describe('useWorkflowRun callbacks helpers', () => {
     expect(clearAbortController).toHaveBeenCalled()
     expect(handlers.handleWorkflowFailed).toHaveBeenCalled()
     expect(userCallbacks.onError).toHaveBeenCalledWith({ error: 'failed', node_type: 'llm' }, '500')
-    expect(trackWorkflowRunFailed).toHaveBeenCalledWith({ error: 'failed', node_type: 'llm' })
+    expect(getWorkflowRunningData).toHaveBeenCalled()
+    expect(trackWorkflowRunFailed).toHaveBeenCalledWith({ error: 'failed', node_type: 'llm' }, workflowData)
     expect(invalidateRunHistory).toHaveBeenCalledWith('/apps/app-1/workflow-runs')
   })
 
@@ -317,6 +337,7 @@ describe('useWorkflowRun callbacks helpers', () => {
       invalidateRunHistory: vi.fn(),
       clearAbortController: vi.fn(),
       clearListeningState: vi.fn(),
+      getWorkflowRunningData: vi.fn(() => createWorkflowData()),
       trackWorkflowRunFailed: vi.fn(),
       handlers,
       callbacks: {},
@@ -340,6 +361,11 @@ describe('useWorkflowRun callbacks helpers', () => {
     const fetchInspectVars = vi.fn()
     const invalidAllLastRun = vi.fn()
     const invalidateRunHistory = vi.fn()
+    const clearAbortController = vi.fn()
+    const clearListeningState = vi.fn()
+    const trackWorkflowRunFailed = vi.fn()
+    const workflowData = createWorkflowData()
+    const getWorkflowRunningData = vi.fn(() => workflowData)
     const setAbortController = vi.fn()
     const player = {
       playAudioWithAudio: vi.fn(),
@@ -355,6 +381,7 @@ describe('useWorkflowRun callbacks helpers', () => {
       invalidateRunHistory: vi.fn(),
       clearAbortController: vi.fn(),
       clearListeningState: vi.fn(),
+      getWorkflowRunningData: vi.fn(() => createWorkflowData()),
       trackWorkflowRunFailed: vi.fn(),
       handlers,
       callbacks: {},
@@ -370,9 +397,10 @@ describe('useWorkflowRun callbacks helpers', () => {
       fetchInspectVars,
       invalidAllLastRun,
       invalidateRunHistory,
-      clearAbortController: vi.fn(),
-      clearListeningState: vi.fn(),
-      trackWorkflowRunFailed: vi.fn(),
+      clearAbortController,
+      clearListeningState,
+      getWorkflowRunningData,
+      trackWorkflowRunFailed,
       handlers,
       callbacks: userCallbacks,
       restCallback: {},
@@ -444,8 +472,12 @@ describe('useWorkflowRun callbacks helpers', () => {
     expect(mockSseGet).toHaveBeenCalledWith('/workflow/run-2/events', {}, finalCallbacks)
     expect(player.playAudioWithAudio).toHaveBeenCalledWith('audio-chunk', true)
     expect(player.playAudioWithAudio).toHaveBeenCalledWith('audio-finished', false)
+    expect(clearAbortController).toHaveBeenCalled()
     expect(handlers.handleWorkflowFailed).toHaveBeenCalled()
+    expect(clearListeningState).toHaveBeenCalled()
     expect(userCallbacks.onError).toHaveBeenCalledWith({ error: 'failed' }, '500')
+    expect(getWorkflowRunningData).toHaveBeenCalled()
+    expect(trackWorkflowRunFailed).toHaveBeenCalledWith({ error: 'failed' }, workflowData)
     expect(invalidateRunHistory).toHaveBeenCalledWith('/apps/app-1/workflow-runs')
   })
 })
diff --git a/web/app/components/workflow-app/hooks/__tests__/use-workflow-run.spec.ts b/web/app/components/workflow-app/hooks/__tests__/use-workflow-run.spec.ts
index 59ba667f8d..c42fb0b03f 100644
--- a/web/app/components/workflow-app/hooks/__tests__/use-workflow-run.spec.ts
+++ b/web/app/components/workflow-app/hooks/__tests__/use-workflow-run.spec.ts
@@ -17,6 +17,7 @@ type DebugControllerWindow = Window & {
 type WorkflowStoreState = {
   backupDraft?: unknown
   environmentVariables?: unknown
+  workflowRunningData?: unknown
   setBackupDraft?: (value: unknown) => void
   setEnvironmentVariables?: (value: unknown) => void
   setWorkflowRunningData?: (value: unknown) => void
@@ -219,13 +220,16 @@ vi.mock('../use-workflow-run-callbacks', async (importOriginal) => {
 const createWorkflowStoreState = () => ({
   backupDraft: undefined,
   environmentVariables: [{ id: 'env-current', value: 'secret' }],
+  workflowRunningData: undefined,
   setBackupDraft: vi.fn((value: unknown) => {
     mocks.workflowStoreState.backupDraft = value
   }),
   setEnvironmentVariables: vi.fn((value: unknown) => {
     mocks.workflowStoreState.environmentVariables = value
   }),
-  setWorkflowRunningData: vi.fn(),
+  setWorkflowRunningData: vi.fn((value: unknown) => {
+    mocks.workflowStoreState.workflowRunningData = value
+  }),
   setIsListening: vi.fn(),
   setShowVariableInspectPanel: vi.fn(),
   setListeningTriggerType: vi.fn(),
@@ -253,6 +257,15 @@ describe('useWorkflowRun', () => {
     mocks.mockGetAudioPlayer.mockReturnValue({
       playAudioWithAudio: vi.fn(),
     })
+    mocks.runEventHandlers.handleWorkflowFailed.mockImplementation(() => {
+      const workflowRunningData = mocks.workflowStoreState.workflowRunningData
+      if (typeof workflowRunningData !== 'object' || workflowRunningData === null)
+        return
+
+      const result = (workflowRunningData as { result?: { status?: string } }).result
+      if (result)
+        result.status = WorkflowRunningStatus.Failed
+    })
     mocks.workflowStoreState.backupDraft = undefined
     Object.assign(mocks.workflowStoreState, createWorkflowStoreState())
     mocks.workflowStoreSetState.mockImplementation((partial: Record<string, unknown>) => {
@@ -415,15 +428,88 @@ describe('useWorkflowRun', () => {
     })
 
     const baseCallbackFactoryContext = mocks.mockCreateBaseWorkflowRunCallbacks.mock.calls.at(-1)?.[0] as {
-      trackWorkflowRunFailed: (params: { error?: string, node_type?: string }) => void
+      getWorkflowRunningData: () => unknown
+      trackWorkflowRunFailed: (params: unknown, workflowData: unknown) => void
+    }
+    const workflowData = {
+      result: { status: WorkflowRunningStatus.Running },
+      tracing: [{ node_id: 'node-1', status: 'running' }],
     }
 
-    baseCallbackFactoryContext.trackWorkflowRunFailed({ error: 'failed', node_type: 'llm' })
+    baseCallbackFactoryContext.trackWorkflowRunFailed({ error: 'failed', node_type: 'llm' }, workflowData)
 
     expect(mocks.mockTrackEvent).toHaveBeenCalledWith('workflow_run_failed', {
       workflow_id: 'flow-1',
       reason: 'failed',
       node_type: 'llm',
+      data: {
+        workflow_status: WorkflowRunningStatus.Running,
+        workflow_tracing_count: 1,
+        workflow_data: workflowData,
+        workflow_data_json: JSON.stringify(workflowData),
+      },
+    })
+
+    mocks.mockTrackEvent.mockClear()
+    baseCallbackFactoryContext.trackWorkflowRunFailed('Server Error', workflowData)
+
+    expect(mocks.mockTrackEvent).toHaveBeenCalledWith('workflow_run_failed', {
+      workflow_id: 'flow-1',
+      reason: 'Server Error',
+      node_type: undefined,
+      data: {
+        workflow_status: WorkflowRunningStatus.Running,
+        workflow_tracing_count: 1,
+        workflow_data: workflowData,
+        workflow_data_json: JSON.stringify(workflowData),
+      },
+    })
+  })
+
+  it('should track workflow failures when the error or workflow data is malformed', async () => {
+    const { result } = renderHook(() => useWorkflowRun())
+
+    await act(async () => {
+      await result.current.handleRun({ inputs: { query: 'hello' } })
+    })
+
+    const baseCallbackFactoryContext = mocks.mockCreateBaseWorkflowRunCallbacks.mock.calls.at(-1)?.[0] as {
+      trackWorkflowRunFailed: (params: unknown, workflowData: unknown) => void
+    }
+
+    baseCallbackFactoryContext.trackWorkflowRunFailed(new Error('network down'), undefined)
+
+    expect(mocks.mockTrackEvent).toHaveBeenCalledWith('workflow_run_failed', {
+      workflow_id: 'flow-1',
+      reason: 'network down',
+      node_type: undefined,
+      data: {
+        workflow_status: undefined,
+        workflow_tracing_count: undefined,
+        workflow_data: undefined,
+        workflow_data_json: undefined,
+      },
+    })
+
+    mocks.mockTrackEvent.mockClear()
+    const circularWorkflowData: Record<string, unknown> = {
+      result: null,
+      tracing: 'not-a-list',
+    }
+    circularWorkflowData.self = circularWorkflowData
+
+    baseCallbackFactoryContext.trackWorkflowRunFailed({ message: 'missing error' }, circularWorkflowData)
+
+    expect(mocks.mockTrackEvent).toHaveBeenCalledWith('workflow_run_failed', {
+      workflow_id: 'flow-1',
+      reason: undefined,
+      node_type: undefined,
+      data: {
+        workflow_status: undefined,
+        workflow_tracing_count: undefined,
+        workflow_data: circularWorkflowData,
+        workflow_data_json: undefined,
+      },
     })
   })
 
diff --git a/web/app/components/workflow-app/hooks/use-workflow-init.ts b/web/app/components/workflow-app/hooks/use-workflow-init.ts
index 00bff2919f..548407257e 100644
--- a/web/app/components/workflow-app/hooks/use-workflow-init.ts
+++ b/web/app/components/workflow-app/hooks/use-workflow-init.ts
@@ -124,7 +124,7 @@ export const useWorkflowInit = () => {
           return acc
         }, {} as Record<string, any>),
       })
-      workflowStore.getState().setPublishedAt(publishedWorkflow?.created_at)
+      workflowStore.getState().setPublishedAt(publishedWorkflow?.created_at ?? 0)
       const graph = publishedWorkflow?.graph
       workflowStore.getState().setLastPublishedHasUserInput(
         hasConnectedUserInput(graph?.nodes, graph?.edges),
diff --git a/web/app/components/workflow-app/hooks/use-workflow-run-callbacks.ts b/web/app/components/workflow-app/hooks/use-workflow-run-callbacks.ts
index a396442002..e8820f755c 100644
--- a/web/app/components/workflow-app/hooks/use-workflow-run-callbacks.ts
+++ b/web/app/components/workflow-app/hooks/use-workflow-run-callbacks.ts
@@ -61,7 +61,8 @@ type CallbackContext = {
   invalidateRunHistory: (url: string) => void
   clearAbortController: () => void
   clearListeningState: () => void
-  trackWorkflowRunFailed: (params: unknown) => void
+  getWorkflowRunningData: () => unknown
+  trackWorkflowRunFailed: (params: unknown, workflowData: unknown) => void
   handlers: WorkflowRunEventHandlers
   callbacks: UserCallbackHandlers
   restCallback: IOtherOptions
@@ -87,6 +88,7 @@ export const createBaseWorkflowRunCallbacks = ({
   invalidateRunHistory,
   clearAbortController,
   clearListeningState,
+  getWorkflowRunningData,
   trackWorkflowRunFailed,
   handlers,
   callbacks,
@@ -138,13 +140,14 @@ export const createBaseWorkflowRunCallbacks = ({
   const wrappedOnError: IOtherOptions['onError'] = (params, code) => {
     clearAbortController()
     handleWorkflowFailed()
+    const workflowData = getWorkflowRunningData()
     invalidateRunHistory(runHistoryUrl)
     clearListeningState()
 
     if (onError)
       onError(params, code)
 
-    trackWorkflowRunFailed(params)
+    trackWorkflowRunFailed(params, workflowData)
   }
 
   const wrappedOnCompleted: IOtherOptions['onCompleted'] = async (hasError, errorMessage) => {
@@ -293,9 +296,10 @@ export const createFinalWorkflowRunCallbacks = ({
   fetchInspectVars,
   invalidAllLastRun,
   invalidateRunHistory,
-  clearAbortController: _clearAbortController,
-  clearListeningState: _clearListeningState,
-  trackWorkflowRunFailed: _trackWorkflowRunFailed,
+  clearAbortController,
+  clearListeningState,
+  getWorkflowRunningData,
+  trackWorkflowRunFailed,
   handlers,
   callbacks,
   restCallback,
@@ -359,11 +363,15 @@ export const createFinalWorkflowRunCallbacks = ({
       }
     },
     onError: (params, code) => {
+      clearAbortController()
       handleWorkflowFailed()
+      const workflowData = getWorkflowRunningData()
       invalidateRunHistory(runHistoryUrl)
+      clearListeningState()
 
       if (onError)
         onError(params, code)
+      trackWorkflowRunFailed(params, workflowData)
     },
     onNodeStarted: (params) => {
       handleWorkflowNodeStarted(params, { clientWidth, clientHeight })
diff --git a/web/app/components/workflow-app/hooks/use-workflow-run.ts b/web/app/components/workflow-app/hooks/use-workflow-run.ts
index eb32c68049..aa6b860acb 100644
--- a/web/app/components/workflow-app/hooks/use-workflow-run.ts
+++ b/web/app/components/workflow-app/hooks/use-workflow-run.ts
@@ -48,6 +48,54 @@ import {
   validateWorkflowRunRequest,
 } from './use-workflow-run-utils'
 
+type WorkflowRunParams = Record<string, unknown> & {
+  token?: string
+  appId?: string
+}
+
+type DebugAbortController = {
+  abort: () => void
+}
+
+type WorkflowDebugWindow = Window & {
+  __webhookDebugAbortController?: DebugAbortController
+  __pluginDebugAbortController?: DebugAbortController
+  __scheduleDebugAbortController?: DebugAbortController
+  __allTriggersDebugAbortController?: DebugAbortController
+}
+
+const stringifyWorkflowData = (workflowData: unknown) => {
+  if (!workflowData)
+    return undefined
+
+  try {
+    return JSON.stringify(workflowData)
+  }
+  catch {
+    return undefined
+  }
+}
+
+const getWorkflowStatus = (workflowData: unknown) => {
+  if (typeof workflowData !== 'object' || workflowData === null)
+    return undefined
+
+  const result = (workflowData as Record<string, unknown>).result
+  if (typeof result !== 'object' || result === null)
+    return undefined
+
+  const status = (result as Record<string, unknown>).status
+  return typeof status === 'string' ? status : undefined
+}
+
+const getWorkflowTracingCount = (workflowData: unknown) => {
+  if (typeof workflowData !== 'object' || workflowData === null)
+    return undefined
+
+  const tracing = (workflowData as Record<string, unknown>).tracing
+  return Array.isArray(tracing) ? tracing.length : undefined
+}
+
 export const useWorkflowRun = () => {
   const store = useStoreApi()
   const workflowStore = useWorkflowStore()
@@ -141,12 +189,12 @@ export const useWorkflowRun = () => {
   }, [handleUpdateWorkflowCanvas, workflowStore, featuresStore])
 
   const handleRun = useCallback(async (
-    params: any,
+    params: WorkflowRunParams | null | undefined,
     callback?: IOtherOptions,
     options?: HandleRunOptions,
   ) => {
     const runMode = options?.mode ?? TriggerType.UserInput
-    const resolvedParams = params ?? {}
+    const resolvedParams: WorkflowRunParams = params ?? {}
     const {
       getNodes,
       setNodes,
@@ -297,9 +345,34 @@ export const useWorkflowRun = () => {
       onCompleted,
     }
 
-    const trackWorkflowRunFailed = (eventParams: unknown) => {
-      const payload = eventParams as { error?: string, node_type?: string }
-      trackEvent('workflow_run_failed', { workflow_id: flowId, reason: payload?.error, node_type: payload?.node_type })
+    const getWorkflowRunningData = () => workflowStore.getState().workflowRunningData
+
+    const trackWorkflowRunFailed = (eventParams: unknown, workflowData: unknown) => {
+      const payload = typeof eventParams === 'object' && eventParams !== null
+        ? eventParams as Record<string, unknown>
+        : undefined
+      const reason = typeof eventParams === 'string'
+        ? eventParams
+        : eventParams instanceof Error
+          ? eventParams.message
+          : typeof payload?.error === 'string'
+            ? payload.error
+            : undefined
+      const nodeType = typeof payload?.node_type === 'string'
+        ? payload.node_type
+        : undefined
+
+      trackEvent('workflow_run_failed', {
+        workflow_id: flowId,
+        reason,
+        node_type: nodeType,
+        data: {
+          workflow_status: getWorkflowStatus(workflowData),
+          workflow_tracing_count: getWorkflowTracingCount(workflowData),
+          workflow_data: workflowData,
+          workflow_data_json: stringifyWorkflowData(workflowData),
+        },
+      })
     }
 
     const baseSseOptions = createBaseWorkflowRunCallbacks({
@@ -312,6 +385,7 @@ export const useWorkflowRun = () => {
       invalidateRunHistory,
       clearAbortController,
       clearListeningState: clearListeningStateInStore,
+      getWorkflowRunningData,
       trackWorkflowRunFailed,
       handlers: workflowRunEventHandlers,
       callbacks: userCallbacks,
@@ -346,6 +420,7 @@ export const useWorkflowRun = () => {
       invalidateRunHistory,
       clearAbortController,
       clearListeningState: clearListeningStateInStore,
+      getWorkflowRunningData,
       trackWorkflowRunFailed,
       handlers: workflowRunEventHandlers,
       callbacks: userCallbacks,
@@ -393,19 +468,21 @@ export const useWorkflowRun = () => {
     }
 
     // Try webhook debug controller from global variable first
-    const webhookController = (window as any).__webhookDebugAbortController
+    const debugWindow = window as WorkflowDebugWindow
+
+    const webhookController = debugWindow.__webhookDebugAbortController
     if (webhookController)
       webhookController.abort()
 
-    const pluginController = (window as any).__pluginDebugAbortController
+    const pluginController = debugWindow.__pluginDebugAbortController
     if (pluginController)
       pluginController.abort()
 
-    const scheduleController = (window as any).__scheduleDebugAbortController
+    const scheduleController = debugWindow.__scheduleDebugAbortController
     if (scheduleController)
       scheduleController.abort()
 
-    const allTriggerController = (window as any).__allTriggersDebugAbortController
+    const allTriggerController = debugWindow.__allTriggersDebugAbortController
     if (allTriggerController)
       allTriggerController.abort()
 
diff --git a/web/app/components/workflow/__tests__/selection-contextmenu.spec.tsx b/web/app/components/workflow/__tests__/selection-contextmenu.spec.tsx
index 6ca94c2804..749326591c 100644
--- a/web/app/components/workflow/__tests__/selection-contextmenu.spec.tsx
+++ b/web/app/components/workflow/__tests__/selection-contextmenu.spec.tsx
@@ -177,24 +177,24 @@ describe('SelectionContextmenu', () => {
     })
 
     await waitFor(() => {
-      expect(screen.getByTestId('selection-contextmenu-item-copy')).toBeInTheDocument()
+      expect(screen.getByRole('menuitem', { name: /common.copy/ })).toBeInTheDocument()
     })
 
-    fireEvent.click(screen.getByTestId('selection-contextmenu-item-copy'))
+    fireEvent.click(screen.getByRole('menuitem', { name: /common.copy/ }))
     expect(mockHandleNodesCopy).toHaveBeenCalledTimes(1)
     expect(store.getState().selectionMenu).toBeUndefined()
 
     act(() => {
       store.setState({ selectionMenu: { clientX: 120, clientY: 120 } })
     })
-    fireEvent.click(screen.getByTestId('selection-contextmenu-item-duplicate'))
+    fireEvent.click(screen.getByRole('menuitem', { name: /common.duplicate/ }))
     expect(mockHandleNodesDuplicate).toHaveBeenCalledTimes(1)
     expect(store.getState().selectionMenu).toBeUndefined()
 
     act(() => {
       store.setState({ selectionMenu: { clientX: 120, clientY: 120 } })
     })
-    fireEvent.click(screen.getByTestId('selection-contextmenu-item-delete'))
+    fireEvent.click(screen.getByRole('menuitem', { name: /operation.delete/ }))
     expect(mockHandleNodesDelete).toHaveBeenCalledTimes(1)
     expect(store.getState().selectionMenu).toBeUndefined()
   })
diff --git a/web/app/components/workflow/__tests__/update-dsl-modal.spec.tsx b/web/app/components/workflow/__tests__/update-dsl-modal.spec.tsx
index 241cd7d762..f461c70927 100644
--- a/web/app/components/workflow/__tests__/update-dsl-modal.spec.tsx
+++ b/web/app/components/workflow/__tests__/update-dsl-modal.spec.tsx
@@ -126,6 +126,24 @@ describe('UpdateDSLModal', () => {
     expect(defaultProps.onBackup).toHaveBeenCalledTimes(1)
   })
 
+  it('should call cancel handler when the import dialog requests close', () => {
+    const onCancel = vi.fn()
+    renderModal({ ...defaultProps, onCancel })
+
+    fireEvent.keyDown(document, { key: 'Escape', code: 'Escape' })
+
+    expect(onCancel).toHaveBeenCalledTimes(1)
+  })
+
+  it('should call cancel handler when the close button is clicked', () => {
+    const onCancel = vi.fn()
+    renderModal({ ...defaultProps, onCancel })
+
+    fireEvent.click(screen.getByRole('button', { name: 'common.operation.close' }))
+
+    expect(onCancel).toHaveBeenCalledTimes(1)
+  })
+
   it('should import a valid file and emit workflow update payload', async () => {
     renderModal()
 
@@ -228,6 +246,32 @@ describe('UpdateDSLModal', () => {
     })
   })
 
+  it('should close the pending modal when dialog requests close', async () => {
+    mockImportDSL.mockResolvedValue({
+      id: 'import-8',
+      status: DSLImportStatus.PENDING,
+      imported_dsl_version: '1.0.0',
+      current_dsl_version: '2.0.0',
+    })
+
+    renderModal()
+
+    fireEvent.change(screen.getByTestId('dsl-file-input'), {
+      target: { files: [new File(['workflow'], 'workflow.yml', { type: 'text/yaml' })] },
+    })
+    fireEvent.click(screen.getByRole('button', { name: 'workflow.common.overwriteAndImport' }))
+
+    await waitFor(() => {
+      expect(screen.getByRole('button', { name: 'app.newApp.Confirm' })).toBeInTheDocument()
+    })
+
+    fireEvent.keyDown(document, { key: 'Escape', code: 'Escape' })
+
+    await waitFor(() => {
+      expect(screen.queryByRole('button', { name: 'app.newApp.Confirm' })).not.toBeInTheDocument()
+    })
+  })
+
   it('should show an error when the selected file content is invalid for the current app mode', async () => {
     class InvalidDSLFileReader extends MockFileReader {
       override readAsText(_file: Blob) {
diff --git a/web/app/components/workflow/__tests__/workflow-edge-events.spec.tsx b/web/app/components/workflow/__tests__/workflow-edge-events.spec.tsx
index 28be928a82..2bbe12f1c0 100644
--- a/web/app/components/workflow/__tests__/workflow-edge-events.spec.tsx
+++ b/web/app/components/workflow/__tests__/workflow-edge-events.spec.tsx
@@ -27,6 +27,12 @@ const reactFlowBridge = vi.hoisted(() => ({
 const collaborationBridge = vi.hoisted(() => ({
   graphImportHandler: null as null | ((payload: { nodes: Node[], edges: Edge[] }) => void),
   historyActionHandler: null as null | ((payload: unknown) => void),
+  restoreIntentHandler: null as null | ((payload: {
+    versionId: string
+    versionName?: string
+    initiatorUserId: string
+    initiatorName: string
+  }) => void),
 }))
 
 const toastInfoMock = vi.hoisted(() => vi.fn())
@@ -180,6 +186,10 @@ vi.mock('../collaboration/core/collaboration-manager', () => ({
       collaborationBridge.historyActionHandler = handler
       return vi.fn()
     },
+    onRestoreIntent: (handler: typeof collaborationBridge.restoreIntentHandler) => {
+      collaborationBridge.restoreIntentHandler = handler
+      return vi.fn()
+    },
   },
 }))
 
@@ -401,7 +411,6 @@ vi.mock('../hooks', () => ({
   useWorkflowRefreshDraft: () => ({
     handleRefreshWorkflowDraft: vi.fn(),
   }),
-  useLeaderRestoreListener: vi.fn(),
 }))
 
 vi.mock('../hooks/use-workflow-search', () => ({
@@ -479,6 +488,7 @@ describe('Workflow edge event wiring', () => {
     reactFlowBridge.store = null
     collaborationBridge.graphImportHandler = null
     collaborationBridge.historyActionHandler = null
+    collaborationBridge.restoreIntentHandler = null
     workflowCommentState.comments = []
     workflowCommentState.pendingComment = null
     workflowCommentState.activeComment = null
@@ -626,6 +636,25 @@ describe('Workflow edge event wiring', () => {
     })
   })
 
+  it('should show restore intent toast when another collaborator restores a workflow version', async () => {
+    renderSubject()
+
+    act(() => {
+      collaborationBridge.restoreIntentHandler?.({
+        versionId: 'version-1',
+        versionName: 'Version One',
+        initiatorUserId: 'user-1',
+        initiatorName: 'Alice',
+      })
+    })
+
+    await waitFor(() => {
+      expect(toastInfoMock).toHaveBeenCalledWith(
+        'workflow.versionHistory.action.restoreInProgress:{"userName":"Alice","versionName":"Version One"}',
+      )
+    })
+  })
+
   it('should render comment overlays and execute comment actions in comment mode', async () => {
     workflowCommentState.comments = [
       { id: 'comment-1', resolved: false },
diff --git a/web/app/components/workflow/block-selector/__tests__/index-bar.spec.tsx b/web/app/components/workflow/block-selector/__tests__/index-bar.spec.tsx
index cdf2e2afd4..f956b3d99f 100644
--- a/web/app/components/workflow/block-selector/__tests__/index-bar.spec.tsx
+++ b/web/app/components/workflow/block-selector/__tests__/index-bar.spec.tsx
@@ -89,7 +89,7 @@ describe('IndexBar', () => {
         />,
       )
 
-      await user.click(screen.getByText('A'))
+      await user.click(screen.getByRole('button', { name: 'A' }))
 
       expect(scrollIntoView).toHaveBeenCalledWith({ behavior: 'smooth' })
     })
diff --git a/web/app/components/workflow/block-selector/__tests__/tabs.spec.tsx b/web/app/components/workflow/block-selector/__tests__/tabs.spec.tsx
index 3002cafa0a..208d87c23a 100644
--- a/web/app/components/workflow/block-selector/__tests__/tabs.spec.tsx
+++ b/web/app/components/workflow/block-selector/__tests__/tabs.spec.tsx
@@ -23,21 +23,6 @@ const {
   },
 }))
 
-vi.mock('@/app/components/base/tooltip', () => ({
-  default: ({
-    children,
-    popupContent,
-  }: {
-    children: React.ReactNode
-    popupContent: React.ReactNode
-  }) => (
-    <div>
-      <span>{popupContent}</span>
-      {children}
-    </div>
-  ),
-}))
-
 vi.mock('@/service/use-plugins', () => ({
   useFeaturedToolsRecommendations: () => ({
     plugins: [],
@@ -121,11 +106,13 @@ describe('Tabs', () => {
     filterElem: <div>filter</div>,
   }
 
-  it('should render start content and disabled tab tooltip text', () => {
+  it('should render start content and disabled tab tooltip text', async () => {
+    const user = userEvent.setup()
     render(<Tabs {...baseProps} />)
 
     expect(screen.getByText('start-content'))!.toBeInTheDocument()
-    expect(screen.getByText('workflow.tabs.startDisabledTip'))!.toBeInTheDocument()
+    await user.hover(screen.getByText('Blocks'))
+    expect(await screen.findByText('workflow.tabs.startDisabledTip'))!.toBeInTheDocument()
   })
 
   it('should switch tabs through click handlers and render tools content with normalized icons', () => {
diff --git a/web/app/components/workflow/block-selector/__tests__/tool-picker.spec.tsx b/web/app/components/workflow/block-selector/__tests__/tool-picker.spec.tsx
index 1ec4ed241f..943c3649ae 100644
--- a/web/app/components/workflow/block-selector/__tests__/tool-picker.spec.tsx
+++ b/web/app/components/workflow/block-selector/__tests__/tool-picker.spec.tsx
@@ -376,15 +376,15 @@ describe('ToolPicker', () => {
 
     renderToolPicker({ onShowChange })
 
-    await user.click(screen.getByRole('button', { name: 'open-picker' }))
-    expect(onShowChange).toHaveBeenCalledWith(true)
+    await user.click(screen.getByText('open-picker').closest('[role="button"]')!)
+    expect(onShowChange.mock.calls[0]?.[0]).toBe(true)
 
     renderToolPicker({
       disabled: true,
       onShowChange: disabledOnShowChange,
     })
 
-    await user.click(screen.getAllByRole('button', { name: 'open-picker' })[1]!)
+    await user.click(screen.getAllByText('open-picker')[1]!.closest('[role="button"]')!)
     expect(disabledOnShowChange).not.toHaveBeenCalled()
   })
 
diff --git a/web/app/components/workflow/block-selector/blocks.tsx b/web/app/components/workflow/block-selector/blocks.tsx
index ecd6142975..f0938aba62 100644
--- a/web/app/components/workflow/block-selector/blocks.tsx
+++ b/web/app/components/workflow/block-selector/blocks.tsx
@@ -1,6 +1,7 @@
 import type { NodeDefault } from '../types'
 import type { BlockClassificationEnum } from './types'
 import {
+  createPreviewCardHandle,
   PreviewCard,
   PreviewCardContent,
   PreviewCardTrigger,
@@ -15,7 +16,6 @@ import { useTranslation } from 'react-i18next'
 import { useStoreApi } from 'reactflow'
 import { useStore as useAppStore } from '@/app/components/app/store'
 import Badge from '@/app/components/base/badge'
-import { filterEvaluationWorkflowRestrictedBlockTypes, isEvaluationWorkflow } from '@/app/components/workflow/utils/evaluation-workflow'
 import BlockIcon from '../block-icon'
 import { BlockEnum } from '../types'
 import { BLOCK_CLASSIFICATIONS } from './constants'
@@ -27,6 +27,10 @@ type BlocksProps = {
   availableBlocksTypes?: BlockEnum[]
   blocks?: NodeDefault[]
 }
+type BlockPreviewPayload = {
+  block: NodeDefault
+}
+
 const Blocks = ({
   searchText,
   onSelect,
@@ -35,14 +39,8 @@ const Blocks = ({
 }: BlocksProps) => {
   const { t } = useTranslation()
   const store = useStoreApi()
-  const appType = useAppStore(s => s.appDetail?.workflow_kind)
   const blocksFromHooks = useBlocks()
-  const filteredAvailableBlocksTypes = useMemo(() => {
-    if (!isEvaluationWorkflow(appType))
-      return availableBlocksTypes
-
-    return filterEvaluationWorkflowRestrictedBlockTypes(availableBlocksTypes)
-  }, [appType, availableBlocksTypes])
+  const previewCardHandle = useMemo(() => createPreviewCardHandle<BlockPreviewPayload>(), [])
 
   // Use external blocks if provided, otherwise fallback to hook-based blocks
   const blocks = blocksFromProps || blocksFromHooks.map(block => ({
@@ -70,7 +68,7 @@ const Blocks = ({
           return false
         }
 
-        return block.metaData.title.toLowerCase().includes(searchText.toLowerCase()) && filteredAvailableBlocksTypes.includes(block.metaData.type)
+        return block.metaData.title.toLowerCase().includes(searchText.toLowerCase()) && availableBlocksTypes.includes(block.metaData.type)
       })
 
       return {
@@ -78,7 +76,7 @@ const Blocks = ({
         [classification]: list,
       }
     }, {} as Record<string, typeof blocks>)
-  }, [blocks, filteredAvailableBlocksTypes, searchText])
+  }, [blocks, availableBlocksTypes, searchText])
   const isEmpty = Object.values(groups).every(list => !list.length)
 
   const renderGroup = useCallback((classification: BlockClassificationEnum) => {
@@ -110,51 +108,38 @@ const Blocks = ({
           // hover/focus-only activation is a11y-safe. See
           // packages/dify-ui/AGENTS.md → Overlay Primitive Selection.
           filteredList.map(block => (
-            <PreviewCard key={block.metaData.type}>
-              <PreviewCardTrigger
-                delay={150}
-                closeDelay={150}
-                render={(
-                  <div
-                    className="flex h-8 w-full cursor-pointer items-center rounded-lg px-3 hover:bg-state-base-hover"
-                    onClick={() => onSelect(block.metaData.type)}
-                  >
-                    <BlockIcon
-                      className="mr-2 shrink-0"
-                      type={block.metaData.type}
-                    />
-                    <div className="grow text-sm text-text-secondary">{block.metaData.title}</div>
-                    {
-                      block.metaData.type === BlockEnum.LoopEnd && (
-                        <Badge
-                          text={t('nodes.loop.loopNode', { ns: 'workflow' })}
-                          className="ml-2 shrink-0"
-                        />
-                      )
-                    }
-                  </div>
-                )}
-              />
-              <PreviewCardContent
-                placement="right"
-                popupClassName="w-[200px] border-none px-3 py-2"
-              >
-                <div>
+            <PreviewCardTrigger
+              key={block.metaData.type}
+              delay={150}
+              closeDelay={150}
+              handle={previewCardHandle}
+              payload={{ block }}
+              render={(
+                <div
+                  className="flex h-8 w-full cursor-pointer items-center rounded-lg px-3 hover:bg-state-base-hover"
+                  onClick={() => onSelect(block.metaData.type)}
+                >
                   <BlockIcon
-                    size="md"
-                    className="mb-2"
+                    className="mr-2 shrink-0"
                     type={block.metaData.type}
                   />
-                  <div className="mb-1 system-md-medium text-text-primary">{block.metaData.title}</div>
-                  <div className="system-xs-regular text-text-tertiary">{block.metaData.description}</div>
+                  <div className="grow text-sm text-text-secondary">{block.metaData.title}</div>
+                  {
+                    block.metaData.type === BlockEnum.LoopEnd && (
+                      <Badge
+                        text={t('nodes.loop.loopNode', { ns: 'workflow' })}
+                        className="ml-2 shrink-0"
+                      />
+                    )
+                  }
                 </div>
-              </PreviewCardContent>
-            </PreviewCard>
+              )}
+            />
           ))
         }
       </div>
     )
-  }, [groups, onSelect, t, store])
+  }, [groups, onSelect, previewCardHandle, t, store])
 
   return (
     <div className="max-h-[480px] max-w-[500px] overflow-y-auto p-1">
@@ -166,8 +151,43 @@ const Blocks = ({
       {
         !isEmpty && BLOCK_CLASSIFICATIONS.map(renderGroup)
       }
+      <PreviewCard handle={previewCardHandle}>
+        {({ payload }) => (
+          <BlockPreviewCard payload={payload as BlockPreviewPayload | undefined} />
+        )}
+      </PreviewCard>
     </div>
   )
 }
 
+type BlockPreviewCardProps = {
+  payload?: BlockPreviewPayload
+}
+
+function BlockPreviewCard({
+  payload,
+}: BlockPreviewCardProps) {
+  if (!payload)
+    return null
+
+  const { block } = payload
+
+  return (
+    <PreviewCardContent
+      placement="right"
+      popupClassName="w-[200px] border-none px-3 py-2"
+    >
+      <div>
+        <BlockIcon
+          size="md"
+          className="mb-2"
+          type={block.metaData.type}
+        />
+        <div className="mb-1 system-md-medium text-text-primary">{block.metaData.title}</div>
+        <div className="system-xs-regular wrap-break-word text-text-tertiary">{block.metaData.description}</div>
+      </div>
+    </PreviewCardContent>
+  )
+}
+
 export default memo(Blocks)
diff --git a/web/app/components/workflow/block-selector/featured-tools.tsx b/web/app/components/workflow/block-selector/featured-tools.tsx
index 0cdeebcb79..4b1dc8b138 100644
--- a/web/app/components/workflow/block-selector/featured-tools.tsx
+++ b/web/app/components/workflow/block-selector/featured-tools.tsx
@@ -1,9 +1,10 @@
 'use client'
+import type { TFunction } from 'i18next'
 import type { ToolWithProvider } from '../types'
 import type { ToolDefaultValue, ToolValue } from './types'
 import type { Plugin } from '@/app/components/plugins/types'
 import type { Locale } from '@/i18n-config'
-import { PreviewCard, PreviewCardContent, PreviewCardTrigger } from '@langgenius/dify-ui/preview-card'
+import { createPreviewCardHandle, PreviewCard, PreviewCardContent, PreviewCardTrigger } from '@langgenius/dify-ui/preview-card'
 import { RiMoreLine } from '@remixicon/react'
 import { useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -33,6 +34,11 @@ type FeaturedToolsProps = {
   isLoading?: boolean
   onInstallSuccess?: () => void
 }
+type FeaturedToolPreviewPayload = {
+  plugin: Plugin
+  label: string
+  description: string
+}
 
 const STORAGE_KEY = 'workflow_tools_featured_collapsed'
 
@@ -46,7 +52,9 @@ const FeaturedTools = ({
 }: FeaturedToolsProps) => {
   const { t } = useTranslation()
   const language = useGetLanguage()
+  const previewCardHandle = useMemo(() => createPreviewCardHandle<FeaturedToolPreviewPayload>(), [])
   const [visibleCount, setVisibleCount] = useState(INITIAL_VISIBLE_COUNT)
+  const [visibleCountPlugins, setVisibleCountPlugins] = useState(plugins)
   const [isCollapsed, setIsCollapsed] = useState<boolean>(() => {
     if (isServer)
       return false
@@ -54,23 +62,16 @@ const FeaturedTools = ({
     return stored === 'true'
   })
 
-  useEffect(() => {
-    if (isServer)
-      return
-    const stored = window.localStorage.getItem(STORAGE_KEY)
-    if (stored !== null)
-      setIsCollapsed(stored === 'true')
-  }, [])
-
   useEffect(() => {
     if (isServer)
       return
     window.localStorage.setItem(STORAGE_KEY, String(isCollapsed))
   }, [isCollapsed])
 
-  useEffect(() => {
+  if (visibleCountPlugins !== plugins) {
+    setVisibleCountPlugins(plugins)
     setVisibleCount(INITIAL_VISIBLE_COUNT)
-  }, [plugins])
+  }
 
   const limitedPlugins = useMemo(
     () => plugins.slice(0, MAX_RECOMMENDED_COUNT),
@@ -174,10 +175,11 @@ const FeaturedTools = ({
                       key={plugin.plugin_id}
                       plugin={plugin}
                       language={language}
+                      previewCardHandle={previewCardHandle}
                       onInstallSuccess={async () => {
                         await onInstallSuccess?.()
                       }}
-                      t={t as any}
+                      t={t}
                     />
                   ))}
                 </div>
@@ -214,6 +216,11 @@ const FeaturedTools = ({
           )}
         </>
       )}
+      <PreviewCard handle={previewCardHandle}>
+        {({ payload }) => (
+          <FeaturedToolPreviewCard payload={payload as FeaturedToolPreviewPayload | undefined} />
+        )}
+      </PreviewCard>
     </div>
   )
 }
@@ -221,13 +228,15 @@ const FeaturedTools = ({
 type FeaturedToolUninstalledItemProps = {
   plugin: Plugin
   language: Locale
+  previewCardHandle: ReturnType<typeof createPreviewCardHandle<FeaturedToolPreviewPayload>>
   onInstallSuccess?: () => Promise<void> | void
-  t: (key: string, options?: Record<string, any>) => string
+  t: TFunction
 }
 
 function FeaturedToolUninstalledItem({
   plugin,
   language,
+  previewCardHandle,
   onInstallSuccess,
   t,
 }: FeaturedToolUninstalledItemProps) {
@@ -296,16 +305,13 @@ function FeaturedToolUninstalledItem({
             // Preview is supplementary: icon / label / brief are all reachable from
             // the InstallFromMarketplace modal that opens on click, so hover/focus-only
             // activation is a11y-safe. See packages/dify-ui/AGENTS.md → Overlay Primitive Selection.
-            <PreviewCard>
-              <PreviewCardTrigger delay={150} closeDelay={150} render={row} />
-              <PreviewCardContent placement="right" popupClassName="w-[224px] px-3 py-2.5">
-                <div>
-                  <BlockIcon size="md" className="mb-2" type={BlockEnum.Tool} toolIcon={plugin.icon} />
-                  <div className="mb-1 text-sm leading-5 text-text-primary">{label}</div>
-                  <div className="text-xs leading-[18px] text-text-secondary">{description}</div>
-                </div>
-              </PreviewCardContent>
-            </PreviewCard>
+            <PreviewCardTrigger
+              delay={150}
+              closeDelay={150}
+              handle={previewCardHandle}
+              payload={{ plugin, label, description }}
+              render={row}
+            />
           )
         : row}
       {isInstallModalOpen && (
@@ -325,4 +331,25 @@ function FeaturedToolUninstalledItem({
   )
 }
 
+type FeaturedToolPreviewCardProps = {
+  payload?: FeaturedToolPreviewPayload
+}
+
+function FeaturedToolPreviewCard({
+  payload,
+}: FeaturedToolPreviewCardProps) {
+  if (!payload)
+    return null
+
+  return (
+    <PreviewCardContent placement="right" popupClassName="w-[224px] px-3 py-2.5">
+      <div>
+        <BlockIcon size="md" className="mb-2" type={BlockEnum.Tool} toolIcon={payload.plugin.icon} />
+        <div className="mb-1 text-sm leading-5 text-text-primary">{payload.label}</div>
+        <div className="text-xs leading-[18px] wrap-break-word text-text-secondary">{payload.description}</div>
+      </div>
+    </PreviewCardContent>
+  )
+}
+
 export default FeaturedTools
diff --git a/web/app/components/workflow/block-selector/featured-triggers.tsx b/web/app/components/workflow/block-selector/featured-triggers.tsx
index 3d3cdee2b7..842541d88d 100644
--- a/web/app/components/workflow/block-selector/featured-triggers.tsx
+++ b/web/app/components/workflow/block-selector/featured-triggers.tsx
@@ -1,8 +1,10 @@
 'use client'
+import type { TFunction } from 'i18next'
+import type { TriggerPluginActionPreviewPayload } from './trigger-plugin/action-item'
 import type { TriggerDefaultValue, TriggerWithProvider } from './types'
 import type { Plugin } from '@/app/components/plugins/types'
 import type { Locale } from '@/i18n-config'
-import { PreviewCard, PreviewCardContent, PreviewCardTrigger } from '@langgenius/dify-ui/preview-card'
+import { createPreviewCardHandle, PreviewCard, PreviewCardContent, PreviewCardTrigger } from '@langgenius/dify-ui/preview-card'
 import { RiMoreLine } from '@remixicon/react'
 import { useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -17,6 +19,7 @@ import { formatNumber } from '@/utils/format'
 import { getMarketplaceUrl } from '@/utils/var'
 import BlockIcon from '../block-icon'
 import { BlockEnum } from '../types'
+import { TriggerPluginActionPreviewCard } from './trigger-plugin/action-item'
 import TriggerPluginItem from './trigger-plugin/item'
 
 const MAX_RECOMMENDED_COUNT = 15
@@ -29,6 +32,11 @@ type FeaturedTriggersProps = {
   isLoading?: boolean
   onInstallSuccess?: () => void | Promise<void>
 }
+type FeaturedTriggerPreviewPayload = {
+  plugin: Plugin
+  label: string
+  description: string
+}
 
 const STORAGE_KEY = 'workflow_triggers_featured_collapsed'
 
@@ -41,7 +49,10 @@ const FeaturedTriggers = ({
 }: FeaturedTriggersProps) => {
   const { t } = useTranslation()
   const language = useGetLanguage()
+  const previewCardHandle = useMemo(() => createPreviewCardHandle<FeaturedTriggerPreviewPayload>(), [])
+  const triggerActionPreviewCardHandle = useMemo(() => createPreviewCardHandle<TriggerPluginActionPreviewPayload>(), [])
   const [visibleCount, setVisibleCount] = useState(INITIAL_VISIBLE_COUNT)
+  const [visibleCountPlugins, setVisibleCountPlugins] = useState(plugins)
   const [isCollapsed, setIsCollapsed] = useState<boolean>(() => {
     if (isServer)
       return false
@@ -49,23 +60,16 @@ const FeaturedTriggers = ({
     return stored === 'true'
   })
 
-  useEffect(() => {
-    if (isServer)
-      return
-    const stored = window.localStorage.getItem(STORAGE_KEY)
-    if (stored !== null)
-      setIsCollapsed(stored === 'true')
-  }, [])
-
   useEffect(() => {
     if (isServer)
       return
     window.localStorage.setItem(STORAGE_KEY, String(isCollapsed))
   }, [isCollapsed])
 
-  useEffect(() => {
+  if (visibleCountPlugins !== plugins) {
+    setVisibleCountPlugins(plugins)
     setVisibleCount(INITIAL_VISIBLE_COUNT)
-  }, [plugins])
+  }
 
   const limitedPlugins = useMemo(
     () => plugins.slice(0, MAX_RECOMMENDED_COUNT),
@@ -156,6 +160,7 @@ const FeaturedTriggers = ({
                       key={provider.id}
                       payload={provider}
                       hasSearchText={false}
+                      previewCardHandle={triggerActionPreviewCardHandle}
                       onSelect={onSelect}
                     />
                   ))}
@@ -169,10 +174,11 @@ const FeaturedTriggers = ({
                       key={plugin.plugin_id}
                       plugin={plugin}
                       language={language}
+                      previewCardHandle={previewCardHandle}
                       onInstallSuccess={async () => {
                         await onInstallSuccess?.()
                       }}
-                      t={t as any}
+                      t={t}
                     />
                   ))}
                 </div>
@@ -209,6 +215,16 @@ const FeaturedTriggers = ({
           )}
         </>
       )}
+      <PreviewCard handle={previewCardHandle}>
+        {({ payload }) => (
+          <FeaturedTriggerPreviewCard payload={payload as FeaturedTriggerPreviewPayload | undefined} />
+        )}
+      </PreviewCard>
+      <PreviewCard handle={triggerActionPreviewCardHandle}>
+        {({ payload }) => (
+          <TriggerPluginActionPreviewCard payload={payload as TriggerPluginActionPreviewPayload | undefined} />
+        )}
+      </PreviewCard>
     </div>
   )
 }
@@ -216,13 +232,15 @@ const FeaturedTriggers = ({
 type FeaturedTriggerUninstalledItemProps = {
   plugin: Plugin
   language: Locale
+  previewCardHandle: ReturnType<typeof createPreviewCardHandle<FeaturedTriggerPreviewPayload>>
   onInstallSuccess?: () => Promise<void> | void
-  t: (key: string, options?: Record<string, any>) => string
+  t: TFunction
 }
 
 function FeaturedTriggerUninstalledItem({
   plugin,
   language,
+  previewCardHandle,
   onInstallSuccess,
   t,
 }: FeaturedTriggerUninstalledItemProps) {
@@ -291,16 +309,13 @@ function FeaturedTriggerUninstalledItem({
             // Preview is supplementary: icon / label / brief are all reachable from
             // the InstallFromMarketplace modal that opens on click, so hover/focus-only
             // activation is a11y-safe. See packages/dify-ui/AGENTS.md → Overlay Primitive Selection.
-            <PreviewCard>
-              <PreviewCardTrigger delay={150} closeDelay={150} render={row} />
-              <PreviewCardContent placement="right" popupClassName="w-[224px] px-3 py-2.5">
-                <div>
-                  <BlockIcon size="md" className="mb-2" type={BlockEnum.TriggerPlugin} toolIcon={plugin.icon} />
-                  <div className="mb-1 text-sm leading-5 text-text-primary">{label}</div>
-                  <div className="text-xs leading-[18px] text-text-secondary">{description}</div>
-                </div>
-              </PreviewCardContent>
-            </PreviewCard>
+            <PreviewCardTrigger
+              delay={150}
+              closeDelay={150}
+              handle={previewCardHandle}
+              payload={{ plugin, label, description }}
+              render={row}
+            />
           )
         : row}
       {isInstallModalOpen && (
@@ -320,4 +335,25 @@ function FeaturedTriggerUninstalledItem({
   )
 }
 
+type FeaturedTriggerPreviewCardProps = {
+  payload?: FeaturedTriggerPreviewPayload
+}
+
+function FeaturedTriggerPreviewCard({
+  payload,
+}: FeaturedTriggerPreviewCardProps) {
+  if (!payload)
+    return null
+
+  return (
+    <PreviewCardContent placement="right" popupClassName="w-[224px] px-3 py-2.5">
+      <div>
+        <BlockIcon size="md" className="mb-2" type={BlockEnum.TriggerPlugin} toolIcon={payload.plugin.icon} />
+        <div className="mb-1 text-sm leading-5 text-text-primary">{payload.label}</div>
+        <div className="text-xs leading-[18px] wrap-break-word text-text-secondary">{payload.description}</div>
+      </div>
+    </PreviewCardContent>
+  )
+}
+
 export default FeaturedTriggers
diff --git a/web/app/components/workflow/block-selector/index-bar.tsx b/web/app/components/workflow/block-selector/index-bar.tsx
index 7565c087c3..d983519539 100644
--- a/web/app/components/workflow/block-selector/index-bar.tsx
+++ b/web/app/components/workflow/block-selector/index-bar.tsx
@@ -89,9 +89,14 @@ const IndexBar: FC<IndexBarProps> = ({ letters, itemRefs, className }) => {
     <div className={cn('index-bar sticky top-[20px] flex h-full w-6 flex-col items-center justify-center text-xs font-medium text-text-quaternary', className)}>
       <div className={cn('absolute top-0 left-0 h-full w-px bg-[linear-gradient(270deg,rgba(255,255,255,0)_0%,rgba(16,24,40,0.08)_30%,rgba(16,24,40,0.08)_50%,rgba(16,24,40,0.08)_70.5%,rgba(255,255,255,0)_100%)]')}></div>
       {letters.map(letter => (
-        <div className="cursor-pointer hover:text-text-secondary" key={letter} onClick={() => handleIndexClick(letter)}>
+        <button
+          type="button"
+          className="cursor-pointer border-none bg-transparent p-0 text-left hover:text-text-secondary"
+          key={letter}
+          onClick={() => handleIndexClick(letter)}
+        >
           {letter}
-        </div>
+        </button>
       ))}
     </div>
   )
diff --git a/web/app/components/workflow/block-selector/rag-tool-recommendations/list.tsx b/web/app/components/workflow/block-selector/rag-tool-recommendations/list.tsx
index d5873ddc1f..3e536b91b5 100644
--- a/web/app/components/workflow/block-selector/rag-tool-recommendations/list.tsx
+++ b/web/app/components/workflow/block-selector/rag-tool-recommendations/list.tsx
@@ -1,11 +1,14 @@
 import type { BlockEnum, ToolWithProvider } from '../../types'
+import type { ToolActionPreviewPayload } from '../tool/action-item'
 import type { ToolDefaultValue } from '../types'
 import type { Plugin } from '@/app/components/plugins/types'
 import type { OnSelectBlock } from '@/app/components/workflow/types'
 import { cn } from '@langgenius/dify-ui/cn'
+import { createPreviewCardHandle, PreviewCard } from '@langgenius/dify-ui/preview-card'
 import { useCallback, useMemo, useRef } from 'react'
 import { useGetLanguage } from '@/context/i18n'
 import { groupItems } from '../index-bar'
+import { ToolActionPreviewCard } from '../tool/action-item'
 import ToolListFlatView from '../tool/tool-list-flat-view/list'
 import ToolListTreeView from '../tool/tool-list-tree-view/list'
 import { ViewType } from '../view-type-select'
@@ -27,6 +30,7 @@ const List = ({
   className,
 }: ListProps) => {
   const language = useGetLanguage()
+  const previewCardHandle = useMemo(() => createPreviewCardHandle<ToolActionPreviewPayload>(), [])
   const isFlatView = viewType === ViewType.flat
 
   const { letters, groups: withLetterAndGroupViewToolsData } = groupItems(tools, tool => tool.label[language]![0]!)
@@ -58,7 +62,7 @@ const List = ({
     return result
   }, [withLetterAndGroupViewToolsData, letters])
 
-  const toolRefs = useRef({})
+  const toolRefsRef = useRef<Record<string, HTMLDivElement | null>>({})
 
   const handleSelect = useCallback((type: BlockEnum, tool: ToolDefaultValue) => {
     onSelect(type, tool)
@@ -70,9 +74,10 @@ const List = ({
         isFlatView
           ? (
               <ToolListFlatView
-                toolRefs={toolRefs}
+                toolRefs={toolRefsRef}
                 letters={letters}
                 payload={listViewToolData}
+                previewCardHandle={previewCardHandle}
                 isShowLetterIndex={false}
                 hasSearchText={false}
                 onSelect={handleSelect}
@@ -83,12 +88,18 @@ const List = ({
           : (
               <ToolListTreeView
                 payload={treeViewToolsData}
+                previewCardHandle={previewCardHandle}
                 hasSearchText={false}
                 onSelect={handleSelect}
                 canNotSelectMultiple
               />
             )
       )}
+      <PreviewCard handle={previewCardHandle}>
+        {({ payload }) => (
+          <ToolActionPreviewCard payload={payload as ToolActionPreviewPayload | undefined} />
+        )}
+      </PreviewCard>
       {
         unInstalledPlugins.map((item) => {
           return (
diff --git a/web/app/components/workflow/block-selector/start-blocks.tsx b/web/app/components/workflow/block-selector/start-blocks.tsx
index efc1e5c1b9..9ed4aa4008 100644
--- a/web/app/components/workflow/block-selector/start-blocks.tsx
+++ b/web/app/components/workflow/block-selector/start-blocks.tsx
@@ -1,6 +1,7 @@
 import type { BlockEnum, CommonNodeType } from '../types'
 import type { TriggerDefaultValue } from './types'
 import {
+  createPreviewCardHandle,
   PreviewCard,
   PreviewCardContent,
   PreviewCardTrigger,
@@ -25,6 +26,9 @@ type StartBlocksProps = {
   onContentStateChange?: (hasContent: boolean) => void
   hideUserInput?: boolean
 }
+type StartBlockPreviewPayload = {
+  block: typeof START_BLOCKS[number]
+}
 
 const StartBlocks = ({
   searchText,
@@ -35,6 +39,7 @@ const StartBlocks = ({
 }: StartBlocksProps) => {
   const { t } = useTranslation()
   const nodes = useNodes()
+  const previewCardHandle = useMemo(() => createPreviewCardHandle<StartBlockPreviewPayload>(), [])
   // const nodeMetaData = useNodeMetaData()
 
   const filteredBlocks = useMemo(() => {
@@ -74,54 +79,31 @@ const StartBlocks = ({
   // the start node, so hover/focus-only activation is a11y-safe. See
   // packages/dify-ui/AGENTS.md → Overlay Primitive Selection.
   const renderBlock = useCallback((block: typeof START_BLOCKS[number]) => (
-    <PreviewCard key={block.type}>
-      <PreviewCardTrigger
-        delay={150}
-        closeDelay={150}
-        render={(
-          <div
-            className="flex h-8 w-full cursor-pointer items-center rounded-lg px-3 hover:bg-state-base-hover"
-            onClick={() => onSelect(block.type)}
-          >
-            <BlockIcon
-              className="mr-2 shrink-0"
-              type={block.type}
-            />
-            <div className="flex w-0 grow items-center justify-between text-sm text-text-secondary">
-              <span className="truncate">{t(`blocks.${block.type}`, { ns: 'workflow' })}</span>
-              {block.type === BlockEnumValues.Start && (
-                <span className="ml-2 shrink-0 system-xs-regular text-text-quaternary">{t('blocks.originalStartNode', { ns: 'workflow' })}</span>
-              )}
-            </div>
-          </div>
-        )}
-      />
-      <PreviewCardContent placement="right" popupClassName="w-[224px] px-3 py-2.5">
-        <div>
+    <PreviewCardTrigger
+      key={block.type}
+      delay={150}
+      closeDelay={150}
+      handle={previewCardHandle}
+      payload={{ block }}
+      render={(
+        <div
+          className="flex h-8 w-full cursor-pointer items-center rounded-lg px-3 hover:bg-state-base-hover"
+          onClick={() => onSelect(block.type)}
+        >
           <BlockIcon
-            size="md"
-            className="mb-2"
+            className="mr-2 shrink-0"
             type={block.type}
           />
-          <div className="mb-1 system-md-medium text-text-primary">
-            {block.type === BlockEnumValues.TriggerWebhook
-              ? t('customWebhook', { ns: 'workflow' })
-              : t(`blocks.${block.type}`, { ns: 'workflow' })}
+          <div className="flex w-0 grow items-center justify-between text-sm text-text-secondary">
+            <span className="truncate">{t(`blocks.${block.type}`, { ns: 'workflow' })}</span>
+            {block.type === BlockEnumValues.Start && (
+              <span className="ml-2 shrink-0 system-xs-regular text-text-quaternary">{t('blocks.originalStartNode', { ns: 'workflow' })}</span>
+            )}
           </div>
-          <div className="system-xs-regular text-text-secondary">
-            {t(`blocksAbout.${block.type}`, { ns: 'workflow' })}
-          </div>
-          {(block.type === BlockEnumValues.TriggerWebhook || block.type === BlockEnumValues.TriggerSchedule) && (
-            <div className="mt-1 mb-1 system-xs-regular text-text-tertiary">
-              {t('author', { ns: 'tools' })}
-              {' '}
-              {t('difyTeam', { ns: 'workflow' })}
-            </div>
-          )}
         </div>
-      </PreviewCardContent>
-    </PreviewCard>
-  ), [onSelect, t])
+      )}
+    />
+  ), [onSelect, previewCardHandle, t])
 
   if (isEmpty)
     return null
@@ -140,8 +122,58 @@ const StartBlocks = ({
           </div>
         ))}
       </div>
+      <PreviewCard handle={previewCardHandle}>
+        {({ payload }) => (
+          <StartBlockPreviewCard
+            payload={payload as StartBlockPreviewPayload | undefined}
+            t={t}
+          />
+        )}
+      </PreviewCard>
     </div>
   )
 }
 
+type StartBlockPreviewCardProps = {
+  payload?: StartBlockPreviewPayload
+  t: ReturnType<typeof useTranslation>['t']
+}
+
+function StartBlockPreviewCard({
+  payload,
+  t,
+}: StartBlockPreviewCardProps) {
+  if (!payload)
+    return null
+
+  const { block } = payload
+
+  return (
+    <PreviewCardContent placement="right" popupClassName="w-[224px] px-3 py-2.5">
+      <div>
+        <BlockIcon
+          size="md"
+          className="mb-2"
+          type={block.type}
+        />
+        <div className="mb-1 system-md-medium text-text-primary">
+          {block.type === BlockEnumValues.TriggerWebhook
+            ? t('customWebhook', { ns: 'workflow' })
+            : t(`blocks.${block.type}`, { ns: 'workflow' })}
+        </div>
+        <div className="system-xs-regular wrap-break-word text-text-secondary">
+          {t(`blocksAbout.${block.type}`, { ns: 'workflow' })}
+        </div>
+        {(block.type === BlockEnumValues.TriggerWebhook || block.type === BlockEnumValues.TriggerSchedule) && (
+          <div className="mt-1 mb-1 system-xs-regular text-text-tertiary">
+            {t('author', { ns: 'tools' })}
+            {' '}
+            {t('difyTeam', { ns: 'workflow' })}
+          </div>
+        )}
+      </div>
+    </PreviewCardContent>
+  )
+}
+
 export default memo(StartBlocks)
diff --git a/web/app/components/workflow/block-selector/tabs.tsx b/web/app/components/workflow/block-selector/tabs.tsx
index 8262146c26..0ce521f171 100644
--- a/web/app/components/workflow/block-selector/tabs.tsx
+++ b/web/app/components/workflow/block-selector/tabs.tsx
@@ -6,10 +6,10 @@ import type {
   ToolWithProvider,
 } from '../types'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { useSuspenseQuery } from '@tanstack/react-query'
 import { memo, useEffect, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
-import Tooltip from '@/app/components/base/tooltip'
 import { systemFeaturesQueryOptions } from '@/service/system-features'
 import { useFeaturedToolsRecommendations } from '@/service/use-plugins'
 import { useAllBuiltInTools, useAllCustomTools, useAllMCPTools, useAllWorkflowTools, useInvalidateAllBuiltInTools } from '@/service/use-tools'
@@ -131,19 +131,22 @@ const TabHeaderItem = ({
 
   if (tab.disabled) {
     return (
-      <Tooltip
-        key={tab.key}
-        position="top"
-        popupClassName="max-w-[200px]"
-        popupContent={disabledTip}
-      >
-        <div
-          className={className}
-          aria-disabled={tab.disabled}
-          onClick={handleClick}
-        >
-          {tab.name}
-        </div>
+      <Tooltip key={tab.key}>
+        <TooltipTrigger
+          render={(
+            <button
+              type="button"
+              className={className}
+              aria-disabled={tab.disabled}
+              onClick={handleClick}
+            >
+              {tab.name}
+            </button>
+          )}
+        />
+        <TooltipContent placement="top" className="max-w-[200px]">
+          {disabledTip}
+        </TooltipContent>
       </Tooltip>
     )
   }
diff --git a/web/app/components/workflow/block-selector/tool-picker.tsx b/web/app/components/workflow/block-selector/tool-picker.tsx
index dcd3392ec6..93ee1882db 100644
--- a/web/app/components/workflow/block-selector/tool-picker.tsx
+++ b/web/app/components/workflow/block-selector/tool-picker.tsx
@@ -1,25 +1,22 @@
 'use client'
-import type {
-  OffsetOptions,
-  Placement,
-} from '@floating-ui/react'
+import type { OffsetOptions } from '@floating-ui/react'
+import type { Placement } from '@langgenius/dify-ui/popover'
 import type { FC } from 'react'
 import type { ToolDefaultValue, ToolValue } from './types'
 import type { CustomCollectionBackend } from '@/app/components/tools/types'
 import type { BlockEnum, OnSelectBlock } from '@/app/components/workflow/types'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from '@langgenius/dify-ui/popover'
 import { toast } from '@langgenius/dify-ui/toast'
 import { useSuspenseQuery } from '@tanstack/react-query'
 import { useBoolean } from 'ahooks'
 import * as React from 'react'
 import { useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-// eslint-disable-next-line no-restricted-imports -- legacy overlay migration is handled separately from this change
-import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
 import SearchBox from '@/app/components/plugins/marketplace/search-box'
 import EditCustomToolModal from '@/app/components/tools/edit-custom-collection-modal'
 import AllTools from '@/app/components/workflow/block-selector/all-tools'
@@ -71,6 +68,8 @@ const ToolPicker: FC<Props> = ({
   const { t } = useTranslation()
   const [searchText, setSearchText] = useState('')
   const [tags, setTags] = useState<string[]>([])
+  const sideOffset = typeof offset === 'number' ? offset : (typeof offset === 'function' ? 0 : (offset?.mainAxis ?? 0))
+  const alignOffset = typeof offset === 'number' ? 0 : (typeof offset === 'function' ? 0 : (offset?.crossAxis ?? 0))
 
   const { data: enable_marketplace } = useSuspenseQuery({
     ...systemFeaturesQueryOptions(),
@@ -121,10 +120,10 @@ const ToolPicker: FC<Props> = ({
 
   const handleAddedCustomTool = invalidateCustomTools
 
-  const handleTriggerClick = () => {
-    if (disabled)
+  const handleOpenChange = (nextOpen: boolean) => {
+    if (nextOpen && disabled)
       return
-    onShowChange(true)
+    onShowChange(nextOpen)
   }
 
   const handleSelect = (_type: BlockEnum, tool?: ToolDefaultValue) => {
@@ -159,19 +158,23 @@ const ToolPicker: FC<Props> = ({
   }
 
   return (
-    <PortalToFollowElem
-      placement={placement}
-      offset={offset}
+    <Popover
       open={isShow}
-      onOpenChange={onShowChange}
+      onOpenChange={handleOpenChange}
     >
-      <PortalToFollowElemTrigger
-        onClick={handleTriggerClick}
+      <PopoverTrigger
+        nativeButton={false}
+        render={<div className="inline-block" />}
       >
         {trigger}
-      </PortalToFollowElemTrigger>
+      </PopoverTrigger>
 
-      <PortalToFollowElemContent className="z-1002">
+      <PopoverContent
+        placement={placement}
+        sideOffset={sideOffset}
+        alignOffset={alignOffset}
+        popupClassName="border-none bg-transparent shadow-none"
+      >
         <div className={cn('relative min-h-20 rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg backdrop-blur-xs', panelClassName)}>
           <div className="p-2 pb-1">
             <SearchBox
@@ -210,8 +213,8 @@ const ToolPicker: FC<Props> = ({
             }}
           />
         </div>
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
+      </PopoverContent>
+    </Popover>
   )
 }
 
diff --git a/web/app/components/workflow/block-selector/tool/__tests__/tool.spec.tsx b/web/app/components/workflow/block-selector/tool/__tests__/tool.spec.tsx
index d9fad38854..b0cb229626 100644
--- a/web/app/components/workflow/block-selector/tool/__tests__/tool.spec.tsx
+++ b/web/app/components/workflow/block-selector/tool/__tests__/tool.spec.tsx
@@ -1,3 +1,4 @@
+import { createPreviewCardHandle } from '@langgenius/dify-ui/preview-card'
 import { render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { trackEvent } from '@/app/components/base/amplitude'
@@ -51,6 +52,7 @@ describe('Tool', () => {
             createTool('tool-b', 'Tool B'),
           ],
         })}
+        previewCardHandle={createPreviewCardHandle()}
         viewType={ViewType.flat}
         hasSearchText={false}
         onSelect={onSelect}
@@ -82,6 +84,7 @@ describe('Tool', () => {
           type: CollectionType.workflow,
           tools: [createTool('workflow-tool', 'Workflow Tool')],
         })}
+        previewCardHandle={createPreviewCardHandle()}
         viewType={ViewType.flat}
         hasSearchText={false}
         onSelect={onSelect}
diff --git a/web/app/components/workflow/block-selector/tool/action-item.tsx b/web/app/components/workflow/block-selector/tool/action-item.tsx
index 343f8482df..05aa05c162 100644
--- a/web/app/components/workflow/block-selector/tool/action-item.tsx
+++ b/web/app/components/workflow/block-selector/tool/action-item.tsx
@@ -1,10 +1,10 @@
 'use client'
-import type { FC } from 'react'
+import type { ComponentProps, FC } from 'react'
 import type { ToolWithProvider } from '../../types'
 import type { ToolDefaultValue } from '../types'
 import type { Tool } from '@/app/components/tools/types'
 import { cn } from '@langgenius/dify-ui/cn'
-import { PreviewCard, PreviewCardContent, PreviewCardTrigger } from '@langgenius/dify-ui/preview-card'
+import { PreviewCardContent, PreviewCardTrigger } from '@langgenius/dify-ui/preview-card'
 import * as React from 'react'
 import { useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -27,14 +27,25 @@ const normalizeProviderIcon = (icon?: ToolWithProvider['icon']) => {
 type Props = {
   provider: ToolWithProvider
   payload: Tool
+  previewCardHandle: PreviewCardHandle
   disabled?: boolean
   isAdded?: boolean
   onSelect: (type: BlockEnum, tool: ToolDefaultValue) => void
 }
 
+export type ToolActionPreviewPayload = {
+  providerIcon: ToolWithProvider['icon']
+  payload: Tool
+  language: ReturnType<typeof useGetLanguage>
+}
+
+type PreviewCardHandle = NonNullable<ComponentProps<typeof PreviewCardTrigger>['handle']>
+export type ToolActionPreviewCardHandle = PreviewCardHandle
+
 const ToolItem: FC<Props> = ({
   provider,
   payload,
+  previewCardHandle,
   onSelect,
   disabled,
   isAdded,
@@ -107,21 +118,45 @@ const ToolItem: FC<Props> = ({
     // reachable from the node inspector after the row is clicked to add the tool,
     // so hover/focus-only activation is a11y-safe. See
     // packages/dify-ui/AGENTS.md → Overlay Primitive Selection.
-    <PreviewCard key={payload.name}>
-      <PreviewCardTrigger delay={150} closeDelay={150} render={row} />
-      <PreviewCardContent placement="right" popupClassName="w-[200px] px-3 py-2.5">
-        <div>
-          <BlockIcon
-            size="md"
-            className="mb-2"
-            type={BlockEnum.Tool}
-            toolIcon={providerIcon}
-          />
-          <div className="mb-1 text-sm leading-5 text-text-primary">{payload.label[language]}</div>
-          <div className="text-xs leading-[18px] text-text-secondary">{payload.description[language]}</div>
-        </div>
-      </PreviewCardContent>
-    </PreviewCard>
+    <PreviewCardTrigger
+      key={payload.name}
+      delay={150}
+      closeDelay={150}
+      handle={previewCardHandle}
+      payload={{
+        providerIcon,
+        payload,
+        language,
+      }}
+      render={row}
+    />
   )
 }
+
+type ToolActionPreviewCardProps = {
+  payload?: ToolActionPreviewPayload
+}
+
+export function ToolActionPreviewCard({
+  payload,
+}: ToolActionPreviewCardProps) {
+  if (!payload)
+    return null
+
+  return (
+    <PreviewCardContent placement="right" popupClassName="w-[200px] px-3 py-2.5">
+      <div>
+        <BlockIcon
+          size="md"
+          className="mb-2"
+          type={BlockEnum.Tool}
+          toolIcon={payload.providerIcon}
+        />
+        <div className="mb-1 text-sm leading-5 text-text-primary">{payload.payload.label[payload.language]}</div>
+        <div className="text-xs leading-[18px] wrap-break-word text-text-secondary">{payload.payload.description[payload.language]}</div>
+      </div>
+    </PreviewCardContent>
+  )
+}
+
 export default React.memo(ToolItem)
diff --git a/web/app/components/workflow/block-selector/tool/tool-list-flat-view/__tests__/list.spec.tsx b/web/app/components/workflow/block-selector/tool/tool-list-flat-view/__tests__/list.spec.tsx
index ecb5dfe0a6..38bac7efcb 100644
--- a/web/app/components/workflow/block-selector/tool/tool-list-flat-view/__tests__/list.spec.tsx
+++ b/web/app/components/workflow/block-selector/tool/tool-list-flat-view/__tests__/list.spec.tsx
@@ -1,3 +1,4 @@
+import { createPreviewCardHandle } from '@langgenius/dify-ui/preview-card'
 import { render, screen } from '@testing-library/react'
 import { useGetLanguage } from '@/context/i18n'
 import useTheme from '@/hooks/use-theme'
@@ -37,6 +38,7 @@ describe('ToolListFlatView', () => {
     render(
       <List
         letters={['A', 'B']}
+        previewCardHandle={createPreviewCardHandle()}
         payload={[
           createToolProvider({
             id: 'provider-a',
diff --git a/web/app/components/workflow/block-selector/tool/tool-list-flat-view/list.tsx b/web/app/components/workflow/block-selector/tool/tool-list-flat-view/list.tsx
index 1852fc168a..e2694d1f06 100644
--- a/web/app/components/workflow/block-selector/tool/tool-list-flat-view/list.tsx
+++ b/web/app/components/workflow/block-selector/tool/tool-list-flat-view/list.tsx
@@ -1,7 +1,8 @@
 'use client'
-import type { FC } from 'react'
+import type { FC, RefObject } from 'react'
 import type { BlockEnum, ToolWithProvider } from '../../../types'
 import type { ToolDefaultValue, ToolValue } from '../../types'
+import type { ToolActionPreviewCardHandle } from '../action-item'
 import * as React from 'react'
 import { useMemo } from 'react'
 import { ViewType } from '../../view-type-select'
@@ -9,6 +10,7 @@ import Tool from '../tool'
 
 type Props = {
   payload: ToolWithProvider[]
+  previewCardHandle: ToolActionPreviewCardHandle
   isShowLetterIndex: boolean
   indexBar: React.ReactNode
   hasSearchText: boolean
@@ -16,13 +18,14 @@ type Props = {
   canNotSelectMultiple?: boolean
   onSelectMultiple?: (type: BlockEnum, tools: ToolDefaultValue[]) => void
   letters: string[]
-  toolRefs: any
+  toolRefs: RefObject<Record<string, HTMLDivElement | null>>
   selectedTools?: ToolValue[]
 }
 
 const ToolViewFlatView: FC<Props> = ({
   letters,
   payload,
+  previewCardHandle,
   isShowLetterIndex,
   indexBar,
   hasSearchText,
@@ -55,6 +58,7 @@ const ToolViewFlatView: FC<Props> = ({
           >
             <Tool
               payload={tool}
+              previewCardHandle={previewCardHandle}
               viewType={ViewType.flat}
               hasSearchText={hasSearchText}
               onSelect={onSelect}
diff --git a/web/app/components/workflow/block-selector/tool/tool-list-tree-view/__tests__/item.spec.tsx b/web/app/components/workflow/block-selector/tool/tool-list-tree-view/__tests__/item.spec.tsx
index 027ad7c11c..f0eb788b70 100644
--- a/web/app/components/workflow/block-selector/tool/tool-list-tree-view/__tests__/item.spec.tsx
+++ b/web/app/components/workflow/block-selector/tool/tool-list-tree-view/__tests__/item.spec.tsx
@@ -1,3 +1,4 @@
+import { createPreviewCardHandle } from '@langgenius/dify-ui/preview-card'
 import { render, screen } from '@testing-library/react'
 import { useGetLanguage } from '@/context/i18n'
 import useTheme from '@/hooks/use-theme'
@@ -36,6 +37,7 @@ describe('ToolListTreeView Item', () => {
         toolList={[createToolProvider({
           label: { en_US: 'Provider Alpha', zh_Hans: 'Provider Alpha' },
         })]}
+        previewCardHandle={createPreviewCardHandle()}
         hasSearchText={false}
         onSelect={vi.fn()}
       />,
diff --git a/web/app/components/workflow/block-selector/tool/tool-list-tree-view/__tests__/list.spec.tsx b/web/app/components/workflow/block-selector/tool/tool-list-tree-view/__tests__/list.spec.tsx
index 7b3c083e85..66b5a043ab 100644
--- a/web/app/components/workflow/block-selector/tool/tool-list-tree-view/__tests__/list.spec.tsx
+++ b/web/app/components/workflow/block-selector/tool/tool-list-tree-view/__tests__/list.spec.tsx
@@ -1,3 +1,4 @@
+import { createPreviewCardHandle } from '@langgenius/dify-ui/preview-card'
 import { render, screen } from '@testing-library/react'
 import { useGetLanguage } from '@/context/i18n'
 import useTheme from '@/hooks/use-theme'
@@ -43,6 +44,7 @@ describe('ToolListTreeView', () => {
             label: { en_US: 'Custom Provider', zh_Hans: 'Custom Provider' },
           })],
         }}
+        previewCardHandle={createPreviewCardHandle()}
         hasSearchText={false}
         onSelect={vi.fn()}
       />,
diff --git a/web/app/components/workflow/block-selector/tool/tool-list-tree-view/item.tsx b/web/app/components/workflow/block-selector/tool/tool-list-tree-view/item.tsx
index 97049e5f79..aa4ce9abe2 100644
--- a/web/app/components/workflow/block-selector/tool/tool-list-tree-view/item.tsx
+++ b/web/app/components/workflow/block-selector/tool/tool-list-tree-view/item.tsx
@@ -2,6 +2,7 @@
 import type { FC } from 'react'
 import type { BlockEnum, ToolWithProvider } from '../../../types'
 import type { ToolDefaultValue, ToolValue } from '../../types'
+import type { ToolActionPreviewCardHandle } from '../action-item'
 import * as React from 'react'
 import { ViewType } from '../../view-type-select'
 import Tool from '../tool'
@@ -9,6 +10,7 @@ import Tool from '../tool'
 type Props = {
   groupName: string
   toolList: ToolWithProvider[]
+  previewCardHandle: ToolActionPreviewCardHandle
   hasSearchText: boolean
   onSelect: (type: BlockEnum, tool: ToolDefaultValue) => void
   canNotSelectMultiple?: boolean
@@ -19,6 +21,7 @@ type Props = {
 const Item: FC<Props> = ({
   groupName,
   toolList,
+  previewCardHandle,
   hasSearchText,
   onSelect,
   canNotSelectMultiple,
@@ -35,6 +38,7 @@ const Item: FC<Props> = ({
           <Tool
             key={tool.id}
             payload={tool}
+            previewCardHandle={previewCardHandle}
             viewType={ViewType.tree}
             hasSearchText={hasSearchText}
             onSelect={onSelect}
diff --git a/web/app/components/workflow/block-selector/tool/tool-list-tree-view/list.tsx b/web/app/components/workflow/block-selector/tool/tool-list-tree-view/list.tsx
index 56e306895f..9afdf1e022 100644
--- a/web/app/components/workflow/block-selector/tool/tool-list-tree-view/list.tsx
+++ b/web/app/components/workflow/block-selector/tool/tool-list-tree-view/list.tsx
@@ -2,6 +2,7 @@
 import type { FC } from 'react'
 import type { BlockEnum, ToolWithProvider } from '../../../types'
 import type { ToolDefaultValue, ToolValue } from '../../types'
+import type { ToolActionPreviewCardHandle } from '../action-item'
 import * as React from 'react'
 import { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -10,6 +11,7 @@ import Item from './item'
 
 type Props = {
   payload: Record<string, ToolWithProvider[]>
+  previewCardHandle: ToolActionPreviewCardHandle
   hasSearchText: boolean
   onSelect: (type: BlockEnum, tool: ToolDefaultValue) => void
   canNotSelectMultiple?: boolean
@@ -19,6 +21,7 @@ type Props = {
 
 const ToolListTreeView: FC<Props> = ({
   payload,
+  previewCardHandle,
   hasSearchText,
   onSelect,
   canNotSelectMultiple,
@@ -49,6 +52,7 @@ const ToolListTreeView: FC<Props> = ({
           key={groupName}
           groupName={getI18nGroupName(groupName)}
           toolList={payload[groupName]!}
+          previewCardHandle={previewCardHandle}
           hasSearchText={hasSearchText}
           onSelect={onSelect}
           canNotSelectMultiple={canNotSelectMultiple}
diff --git a/web/app/components/workflow/block-selector/tool/tool.tsx b/web/app/components/workflow/block-selector/tool/tool.tsx
index 9a25d10208..ebcfc3b8d1 100644
--- a/web/app/components/workflow/block-selector/tool/tool.tsx
+++ b/web/app/components/workflow/block-selector/tool/tool.tsx
@@ -3,11 +3,12 @@ import type { FC } from 'react'
 import type { Tool as ToolType } from '../../../tools/types'
 import type { ToolWithProvider } from '../../types'
 import type { ToolDefaultValue, ToolValue } from '../types'
+import type { ToolActionPreviewCardHandle } from './action-item'
 import { cn } from '@langgenius/dify-ui/cn'
 import { RiArrowDownSLine, RiArrowRightSLine } from '@remixicon/react'
 import { useHover } from 'ahooks'
 import * as React from 'react'
-import { useCallback, useEffect, useMemo, useRef } from 'react'
+import { useCallback, useMemo, useRef } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Mcp } from '@/app/components/base/icons/src/vender/other'
 import { useMCPToolAvailability } from '@/app/components/workflow/nodes/_base/components/mcp-tool-availability'
@@ -33,6 +34,7 @@ const normalizeProviderIcon = (icon?: ToolWithProvider['icon']) => {
 type Props = {
   className?: string
   payload: ToolWithProvider
+  previewCardHandle: ToolActionPreviewCardHandle
   viewType: ViewType
   hasSearchText: boolean
   onSelect: (type: BlockEnum, tool: ToolDefaultValue) => void
@@ -45,6 +47,7 @@ type Props = {
 const Tool: FC<Props> = ({
   className,
   payload,
+  previewCardHandle,
   viewType,
   hasSearchText,
   onSelect,
@@ -59,7 +62,8 @@ const Tool: FC<Props> = ({
   const notShowProvider = payload.type === CollectionType.workflow
   const actions = payload.tools
   const hasAction = !notShowProvider
-  const [isFold, setFold] = React.useState<boolean>(true)
+  const [isFold, setIsFold] = React.useState<boolean>(true)
+  const [isFoldHasSearchText, setIsFoldHasSearchText] = React.useState(hasSearchText)
   const ref = useRef(null)
   const isHovering = useHover(ref)
   const isMCPTool = payload.type === CollectionType.mcp
@@ -146,14 +150,10 @@ const Tool: FC<Props> = ({
     )
   }, [actions, getIsDisabled, isAllSelected, isHovering, language, onSelectMultiple, payload.id, payload.is_team_authorization, payload.name, payload.type, selectedToolsNum, t, totalToolsNum])
 
-  useEffect(() => {
-    if (hasSearchText && isFold) {
-      setFold(false)
-      return
-    }
-    if (!hasSearchText && !isFold)
-      setFold(true)
-  }, [hasSearchText])
+  if (isFoldHasSearchText !== hasSearchText) {
+    setIsFoldHasSearchText(hasSearchText)
+    setIsFold(!hasSearchText)
+  }
 
   const FoldIcon = isFold ? RiArrowRightSLine : RiArrowDownSLine
 
@@ -181,7 +181,7 @@ const Tool: FC<Props> = ({
           className="group/item flex w-full cursor-pointer items-center justify-between rounded-lg pr-1 pl-3 select-none hover:bg-state-base-hover"
           onClick={() => {
             if (hasAction) {
-              setFold(!isFold)
+              setIsFold(!isFold)
               return
             }
 
@@ -240,6 +240,7 @@ const Tool: FC<Props> = ({
               key={action.name}
               provider={payload}
               payload={action}
+              previewCardHandle={previewCardHandle}
               onSelect={onSelect}
               disabled={getIsDisabled(action) || isShowCanNotChooseMCPTip}
               isAdded={getIsDisabled(action)}
diff --git a/web/app/components/workflow/block-selector/tools.tsx b/web/app/components/workflow/block-selector/tools.tsx
index cabc079750..e2c4a88048 100644
--- a/web/app/components/workflow/block-selector/tools.tsx
+++ b/web/app/components/workflow/block-selector/tools.tsx
@@ -1,10 +1,13 @@
 import type { BlockEnum, ToolWithProvider } from '../types'
+import type { ToolActionPreviewPayload } from './tool/action-item'
 import type { ToolDefaultValue, ToolTypeEnum, ToolValue } from './types'
 import { cn } from '@langgenius/dify-ui/cn'
+import { createPreviewCardHandle, PreviewCard } from '@langgenius/dify-ui/preview-card'
 import { memo, useMemo, useRef } from 'react'
 import Empty from '@/app/components/tools/provider/empty'
 import { useGetLanguage } from '@/context/i18n'
 import IndexBar, { groupItems } from './index-bar'
+import { ToolActionPreviewCard } from './tool/action-item'
 import ToolListFlatView from './tool/tool-list-flat-view/list'
 import ToolListTreeView from './tool/tool-list-tree-view/list'
 import { ViewType } from './view-type-select'
@@ -35,8 +38,8 @@ const Tools = ({
   indexBarClassName,
   selectedTools,
 }: ToolsProps) => {
-  // const tools: any = []
   const language = useGetLanguage()
+  const previewCardHandle = useMemo(() => createPreviewCardHandle<ToolActionPreviewPayload>(), [])
   const isFlatView = viewType === ViewType.flat
   const isShowLetterIndex = isFlatView && tools.length > 10
 
@@ -85,7 +88,7 @@ const Tools = ({
     return result
   }, [withLetterAndGroupViewToolsData, letters])
 
-  const toolRefs = useRef({})
+  const toolRefsRef = useRef<Record<string, HTMLDivElement | null>>({})
 
   return (
     <div className={cn('max-w-full p-1', className)}>
@@ -98,21 +101,23 @@ const Tools = ({
         isFlatView
           ? (
               <ToolListFlatView
-                toolRefs={toolRefs}
+                toolRefs={toolRefsRef}
                 letters={letters}
                 payload={listViewToolData}
+                previewCardHandle={previewCardHandle}
                 isShowLetterIndex={isShowLetterIndex}
                 hasSearchText={hasSearchText}
                 onSelect={onSelect}
                 canNotSelectMultiple={canNotSelectMultiple}
                 onSelectMultiple={onSelectMultiple}
                 selectedTools={selectedTools}
-                indexBar={<IndexBar letters={letters} itemRefs={toolRefs} className={indexBarClassName} />}
+                indexBar={<IndexBar letters={letters} itemRefs={toolRefsRef} className={indexBarClassName} />}
               />
             )
           : (
               <ToolListTreeView
                 payload={treeViewToolsData}
+                previewCardHandle={previewCardHandle}
                 hasSearchText={hasSearchText}
                 onSelect={onSelect}
                 canNotSelectMultiple={canNotSelectMultiple}
@@ -121,6 +126,11 @@ const Tools = ({
               />
             )
       )}
+      <PreviewCard handle={previewCardHandle}>
+        {({ payload }) => (
+          <ToolActionPreviewCard payload={payload as ToolActionPreviewPayload | undefined} />
+        )}
+      </PreviewCard>
     </div>
   )
 }
diff --git a/web/app/components/workflow/block-selector/trigger-plugin/action-item.tsx b/web/app/components/workflow/block-selector/trigger-plugin/action-item.tsx
index 38c4c2b0f5..d2829363e7 100644
--- a/web/app/components/workflow/block-selector/trigger-plugin/action-item.tsx
+++ b/web/app/components/workflow/block-selector/trigger-plugin/action-item.tsx
@@ -1,9 +1,9 @@
 'use client'
-import type { FC } from 'react'
+import type { ComponentProps, FC } from 'react'
 import type { TriggerDefaultValue, TriggerWithProvider } from '../types'
 import type { Event } from '@/app/components/tools/types'
 import { cn } from '@langgenius/dify-ui/cn'
-import { PreviewCard, PreviewCardContent, PreviewCardTrigger } from '@langgenius/dify-ui/preview-card'
+import { PreviewCardContent, PreviewCardTrigger } from '@langgenius/dify-ui/preview-card'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import { useGetLanguage } from '@/context/i18n'
@@ -13,14 +13,25 @@ import { BlockEnum } from '../../types'
 type Props = {
   provider: TriggerWithProvider
   payload: Event
+  previewCardHandle: TriggerPluginActionPreviewCardHandle
   disabled?: boolean
   isAdded?: boolean
   onSelect: (type: BlockEnum, trigger?: TriggerDefaultValue) => void
 }
 
+export type TriggerPluginActionPreviewPayload = {
+  provider: TriggerWithProvider
+  payload: Event
+  language: ReturnType<typeof useGetLanguage>
+}
+
+type PreviewCardHandle = NonNullable<ComponentProps<typeof PreviewCardTrigger>['handle']>
+export type TriggerPluginActionPreviewCardHandle = PreviewCardHandle
+
 const TriggerPluginActionItem: FC<Props> = ({
   provider,
   payload,
+  previewCardHandle,
   onSelect,
   disabled,
   isAdded,
@@ -37,7 +48,7 @@ const TriggerPluginActionItem: FC<Props> = ({
           return
         const params: Record<string, string> = {}
         if (payload.parameters) {
-          payload.parameters.forEach((item: any) => {
+          payload.parameters.forEach((item) => {
             params[item.name] = ''
           })
         }
@@ -73,21 +84,41 @@ const TriggerPluginActionItem: FC<Props> = ({
     // reachable from the node inspector after the row is clicked to add the trigger,
     // so hover/focus-only activation is a11y-safe. See
     // packages/dify-ui/AGENTS.md → Overlay Primitive Selection.
-    <PreviewCard key={payload.name}>
-      <PreviewCardTrigger delay={150} closeDelay={150} render={row} />
-      <PreviewCardContent placement="right" popupClassName="w-[224px] px-3 py-2.5">
-        <div>
-          <BlockIcon
-            size="md"
-            className="mb-2"
-            type={BlockEnum.TriggerPlugin}
-            toolIcon={provider.icon}
-          />
-          <div className="mb-1 text-sm leading-5 text-text-primary">{payload.label[language]}</div>
-          <div className="text-xs leading-[18px] text-text-secondary">{payload.description[language]}</div>
-        </div>
-      </PreviewCardContent>
-    </PreviewCard>
+    <PreviewCardTrigger
+      key={payload.name}
+      delay={150}
+      closeDelay={150}
+      handle={previewCardHandle}
+      payload={{ provider, payload, language }}
+      render={row}
+    />
   )
 }
+
+type TriggerPluginActionPreviewCardProps = {
+  payload?: TriggerPluginActionPreviewPayload
+}
+
+export function TriggerPluginActionPreviewCard({
+  payload,
+}: TriggerPluginActionPreviewCardProps) {
+  if (!payload)
+    return null
+
+  return (
+    <PreviewCardContent placement="right" popupClassName="w-[224px] px-3 py-2.5">
+      <div>
+        <BlockIcon
+          size="md"
+          className="mb-2"
+          type={BlockEnum.TriggerPlugin}
+          toolIcon={payload.provider.icon}
+        />
+        <div className="mb-1 text-sm leading-5 text-text-primary">{payload.payload.label[payload.language]}</div>
+        <div className="text-xs leading-[18px] wrap-break-word text-text-secondary">{payload.payload.description[payload.language]}</div>
+      </div>
+    </PreviewCardContent>
+  )
+}
+
 export default React.memo(TriggerPluginActionItem)
diff --git a/web/app/components/workflow/block-selector/trigger-plugin/item.tsx b/web/app/components/workflow/block-selector/trigger-plugin/item.tsx
index 9e6c315506..68946fb04c 100644
--- a/web/app/components/workflow/block-selector/trigger-plugin/item.tsx
+++ b/web/app/components/workflow/block-selector/trigger-plugin/item.tsx
@@ -1,10 +1,11 @@
 'use client'
 import type { FC } from 'react'
+import type { TriggerPluginActionPreviewCardHandle } from './action-item'
 import type { TriggerDefaultValue, TriggerWithProvider } from '@/app/components/workflow/block-selector/types'
 import { cn } from '@langgenius/dify-ui/cn'
 import { RiArrowDownSLine, RiArrowRightSLine } from '@remixicon/react'
 import * as React from 'react'
-import { useEffect, useMemo, useRef } from 'react'
+import { useMemo, useRef } from 'react'
 import { useTranslation } from 'react-i18next'
 import { CollectionType } from '@/app/components/tools/types'
 import BlockIcon from '@/app/components/workflow/block-icon'
@@ -27,6 +28,7 @@ type Props = {
   className?: string
   payload: TriggerWithProvider
   hasSearchText: boolean
+  previewCardHandle: TriggerPluginActionPreviewCardHandle
   onSelect: (type: BlockEnum, trigger?: TriggerDefaultValue) => void
 }
 
@@ -34,6 +36,7 @@ const TriggerPluginItem: FC<Props> = ({
   className,
   payload,
   hasSearchText,
+  previewCardHandle,
   onSelect,
 }) => {
   const { t } = useTranslation()
@@ -42,17 +45,14 @@ const TriggerPluginItem: FC<Props> = ({
   const notShowProvider = payload.type === CollectionType.workflow
   const actions = payload.events
   const hasAction = !notShowProvider
-  const [isFold, setFold] = React.useState<boolean>(true)
+  const [isFold, setIsFold] = React.useState<boolean>(true)
+  const [isFoldHasSearchText, setIsFoldHasSearchText] = React.useState(hasSearchText)
   const ref = useRef(null)
 
-  useEffect(() => {
-    if (hasSearchText && isFold) {
-      setFold(false)
-      return
-    }
-    if (!hasSearchText && !isFold)
-      setFold(true)
-  }, [hasSearchText])
+  if (isFoldHasSearchText !== hasSearchText) {
+    setIsFoldHasSearchText(hasSearchText)
+    setIsFold(!hasSearchText)
+  }
 
   const FoldIcon = isFold ? RiArrowRightSLine : RiArrowDownSLine
 
@@ -97,14 +97,14 @@ const TriggerPluginItem: FC<Props> = ({
           className="group/item flex w-full cursor-pointer items-center justify-between rounded-lg pr-1 pl-3 select-none hover:bg-state-base-hover"
           onClick={() => {
             if (hasAction) {
-              setFold(!isFold)
+              setIsFold(!isFold)
               return
             }
 
             const event = actions[0]
             const params: Record<string, string> = {}
             if (event!.parameters) {
-              event!.parameters.forEach((item: any) => {
+              event!.parameters.forEach((item) => {
                 params[item.name] = ''
               })
             }
@@ -150,6 +150,7 @@ const TriggerPluginItem: FC<Props> = ({
               key={action.name}
               provider={providerWithResolvedIcon}
               payload={action}
+              previewCardHandle={previewCardHandle}
               onSelect={onSelect}
               disabled={false}
               isAdded={false}
diff --git a/web/app/components/workflow/block-selector/trigger-plugin/list.tsx b/web/app/components/workflow/block-selector/trigger-plugin/list.tsx
index 126583be73..2d2752c4f6 100644
--- a/web/app/components/workflow/block-selector/trigger-plugin/list.tsx
+++ b/web/app/components/workflow/block-selector/trigger-plugin/list.tsx
@@ -1,9 +1,12 @@
 'use client'
 import type { BlockEnum } from '../../types'
 import type { TriggerDefaultValue, TriggerWithProvider } from '../types'
+import type { TriggerPluginActionPreviewPayload } from './action-item'
+import { createPreviewCardHandle, PreviewCard } from '@langgenius/dify-ui/preview-card'
 import { memo, useEffect, useMemo } from 'react'
 import { useGetLanguage } from '@/context/i18n'
 import { useAllTriggerPlugins } from '@/service/use-triggers'
+import { TriggerPluginActionPreviewCard } from './action-item'
 import TriggerPluginItem from './item'
 
 type TriggerPluginListProps = {
@@ -20,6 +23,7 @@ const TriggerPluginList = ({
 }: TriggerPluginListProps) => {
   const { data: triggerPluginsData } = useAllTriggerPlugins()
   const language = useGetLanguage()
+  const previewCardHandle = useMemo(() => createPreviewCardHandle<TriggerPluginActionPreviewPayload>(), [])
 
   const normalizedSearch = searchText.trim().toLowerCase()
   const triggerPlugins = useMemo(() => {
@@ -96,8 +100,14 @@ const TriggerPluginList = ({
           payload={plugin}
           onSelect={onSelect}
           hasSearchText={!!searchText}
+          previewCardHandle={previewCardHandle}
         />
       ))}
+      <PreviewCard handle={previewCardHandle}>
+        {({ payload }) => (
+          <TriggerPluginActionPreviewCard payload={payload as TriggerPluginActionPreviewPayload | undefined} />
+        )}
+      </PreviewCard>
     </div>
   )
 }
diff --git a/web/app/components/workflow/collaboration/core/__tests__/collaboration-manager.logs-and-events.spec.ts b/web/app/components/workflow/collaboration/core/__tests__/collaboration-manager.logs-and-events.spec.ts
index 89888bf1cb..e56aa1d82c 100644
--- a/web/app/components/workflow/collaboration/core/__tests__/collaboration-manager.logs-and-events.spec.ts
+++ b/web/app/components/workflow/collaboration/core/__tests__/collaboration-manager.logs-and-events.spec.ts
@@ -1,5 +1,5 @@
 import type { LoroMap } from 'loro-crdt'
-import type { OnlineUser, RestoreRequestData } from '../../types/collaboration'
+import type { OnlineUser } from '../../types/collaboration'
 import type { NoteNodeType } from '@/app/components/workflow/note-node/types'
 import type { Edge, Node } from '@/app/components/workflow/types'
 import { LoroDoc } from 'loro-crdt'
@@ -67,18 +67,6 @@ const createEdge = (id: string, source: string, target: string): Edge => ({
   },
 })
 
-const createRestoreRequestData = (): RestoreRequestData => ({
-  versionId: 'version-1',
-  versionName: 'Version One',
-  initiatorUserId: 'user-1',
-  initiatorName: 'Alice',
-  graphData: {
-    nodes: [createNode('n-restore')],
-    edges: [],
-    viewport: { x: 1, y: 2, zoom: 0.5 },
-  },
-})
-
 const setupManagerWithDoc = () => {
   const manager = new CollaborationManager()
   const doc = new LoroDoc()
@@ -275,7 +263,6 @@ describe('CollaborationManager logs and event helpers', () => {
 
     manager.emitCommentsUpdate('app-1')
     manager.emitHistoryAction('undo')
-    manager.emitRestoreRequest(createRestoreRequestData())
     manager.emitRestoreIntent({
       versionId: 'version-1',
       versionName: 'Version One',
@@ -289,13 +276,11 @@ describe('CollaborationManager logs and event helpers', () => {
 
     manager.emitCommentsUpdate('app-1')
     manager.emitHistoryAction('undo')
-    manager.emitRestoreRequest(createRestoreRequestData())
     expect(sendSpy).not.toHaveBeenCalled()
 
     isConnectedSpy.mockReturnValue(true)
     manager.emitCommentsUpdate('app-1')
     manager.emitHistoryAction('redo')
-    manager.emitRestoreRequest(createRestoreRequestData())
     manager.emitRestoreIntent({
       versionId: 'version-2',
       initiatorUserId: 'u-2',
@@ -309,7 +294,6 @@ describe('CollaborationManager logs and event helpers', () => {
     expect(eventTypes).toEqual([
       'comments_update',
       'workflow_history_action',
-      'workflow_restore_request',
       'workflow_restore_intent',
       'workflow_restore_complete',
     ])
diff --git a/web/app/components/workflow/collaboration/core/__tests__/collaboration-manager.socket-and-subscriptions.spec.ts b/web/app/components/workflow/collaboration/core/__tests__/collaboration-manager.socket-and-subscriptions.spec.ts
index 6768e5b4e2..63487432dc 100644
--- a/web/app/components/workflow/collaboration/core/__tests__/collaboration-manager.socket-and-subscriptions.spec.ts
+++ b/web/app/components/workflow/collaboration/core/__tests__/collaboration-manager.socket-and-subscriptions.spec.ts
@@ -203,7 +203,6 @@ describe('CollaborationManager socket and subscription behavior', () => {
     const mcpHandler = vi.fn()
     const workflowUpdateHandler = vi.fn()
     const commentsHandler = vi.fn()
-    const restoreRequestHandler = vi.fn()
     const restoreIntentHandler = vi.fn()
     const restoreCompleteHandler = vi.fn()
     const historyHandler = vi.fn()
@@ -218,7 +217,6 @@ describe('CollaborationManager socket and subscription behavior', () => {
     manager.onMcpServerUpdate(mcpHandler)
     manager.onWorkflowUpdate(workflowUpdateHandler)
     manager.onCommentsUpdate(commentsHandler)
-    manager.onRestoreRequest(restoreRequestHandler)
     manager.onRestoreIntent(restoreIntentHandler)
     manager.onRestoreComplete(restoreCompleteHandler)
     manager.onHistoryAction(historyHandler)
@@ -296,11 +294,6 @@ describe('CollaborationManager socket and subscription behavior', () => {
       type: 'graph_resync_request',
       data: {},
     } satisfies CollaborationUpdate)
-    socket.trigger('collaboration_update', {
-      ...baseUpdate,
-      type: 'workflow_restore_request',
-      data: { versionId: 'v1', initiatorUserId: 'u-1', initiatorName: 'Alice', graphData: { nodes: [], edges: [] } } as unknown as Record<string, unknown>,
-    } satisfies CollaborationUpdate)
     socket.trigger('collaboration_update', {
       ...baseUpdate,
       type: 'workflow_restore_intent',
@@ -335,7 +328,6 @@ describe('CollaborationManager socket and subscription behavior', () => {
     expect(latestPresence).toMatchObject({ 'n-1': { 'socket-events': { userId: 'u-1' } } })
     expect(syncRequestHandler).toHaveBeenCalledTimes(1)
     expect(broadcastSpy).toHaveBeenCalledTimes(1)
-    expect(restoreRequestHandler).toHaveBeenCalledTimes(1)
     expect(restoreIntentHandler).toHaveBeenCalledWith({ versionId: 'v1', initiatorUserId: 'u-1', initiatorName: 'Alice' } satisfies RestoreIntentData)
     expect(restoreCompleteHandler).toHaveBeenCalledWith({ versionId: 'v1', success: true } satisfies RestoreCompleteData)
     expect(historyHandler).toHaveBeenCalledWith({ action: 'undo', userId: 'u-1' })
diff --git a/web/app/components/workflow/collaboration/core/collaboration-manager.ts b/web/app/components/workflow/collaboration/core/collaboration-manager.ts
index 5000886222..a80e493da9 100644
--- a/web/app/components/workflow/collaboration/core/collaboration-manager.ts
+++ b/web/app/components/workflow/collaboration/core/collaboration-manager.ts
@@ -16,7 +16,6 @@ import type {
   OnlineUser,
   RestoreCompleteData,
   RestoreIntentData,
-  RestoreRequestData,
 } from '../types/collaboration'
 import { cloneDeep } from 'es-toolkit/object'
 import { isEqual } from 'es-toolkit/predicate'
@@ -770,17 +769,6 @@ export class CollaborationManager {
     return this.eventEmitter.on('historyAction', callback)
   }
 
-  emitRestoreRequest(data: RestoreRequestData): void {
-    if (!this.currentAppId || !webSocketClient.isConnected(this.currentAppId))
-      return
-
-    this.sendCollaborationEvent({
-      type: 'workflow_restore_request',
-      data: data as unknown as Record<string, unknown>,
-      timestamp: Date.now(),
-    })
-  }
-
   emitRestoreIntent(data: RestoreIntentData): void {
     if (!this.currentAppId || !webSocketClient.isConnected(this.currentAppId))
       return
@@ -803,10 +791,6 @@ export class CollaborationManager {
     })
   }
 
-  onRestoreRequest(callback: (data: RestoreRequestData) => void): () => void {
-    return this.eventEmitter.on('restoreRequest', callback)
-  }
-
   onRestoreIntent(callback: (data: RestoreIntentData) => void): () => void {
     return this.eventEmitter.on('restoreIntent', callback)
   }
@@ -1476,10 +1460,6 @@ export class CollaborationManager {
         if (this.isLeader)
           this.broadcastCurrentGraph()
       }
-      else if (update.type === 'workflow_restore_request') {
-        if (this.isLeader)
-          this.eventEmitter.emit('restoreRequest', update.data as RestoreRequestData)
-      }
       else if (update.type === 'workflow_restore_intent') {
         this.eventEmitter.emit('restoreIntent', update.data as RestoreIntentData)
       }
diff --git a/web/app/components/workflow/collaboration/types/collaboration.ts b/web/app/components/workflow/collaboration/types/collaboration.ts
index 3a5b71e2d1..7c083bca18 100644
--- a/web/app/components/workflow/collaboration/types/collaboration.ts
+++ b/web/app/components/workflow/collaboration/types/collaboration.ts
@@ -1,7 +1,3 @@
-import type { Viewport } from 'reactflow'
-import type { ConversationVariable, Edge, EnvironmentVariable, Node } from '../../types'
-import type { Features } from '@/app/components/base/features/types'
-
 export type OnlineUser = {
   user_id: string
   username: string
@@ -51,7 +47,6 @@ type CollaborationEventType
     | 'node_panel_presence'
     | 'app_publish_update'
     | 'graph_resync_request'
-    | 'workflow_restore_request'
     | 'workflow_restore_intent'
     | 'workflow_restore_complete'
     | 'workflow_history_action'
@@ -63,21 +58,6 @@ export type CollaborationUpdate = {
   timestamp: number
 }
 
-export type RestoreRequestData = {
-  versionId: string
-  versionName?: string
-  initiatorUserId: string
-  initiatorName: string
-  graphData: {
-    nodes: Node[]
-    edges: Edge[]
-    viewport?: Viewport
-  }
-  features?: Features
-  environmentVariables?: EnvironmentVariable[]
-  conversationVariables?: ConversationVariable[]
-}
-
 export type RestoreIntentData = {
   versionId: string
   versionName?: string
diff --git a/web/app/components/workflow/comment/comment-icon.spec.tsx b/web/app/components/workflow/comment/comment-icon.spec.tsx
index aee8c64fa3..eeca5bb4e6 100644
--- a/web/app/components/workflow/comment/comment-icon.spec.tsx
+++ b/web/app/components/workflow/comment/comment-icon.spec.tsx
@@ -1,4 +1,4 @@
-import type { WorkflowCommentList } from '@/service/workflow-comment'
+import type { WorkflowCommentList } from '@/contract/console/workflow-comment'
 import { fireEvent, render, screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { CommentIcon } from './comment-icon'
diff --git a/web/app/components/workflow/comment/comment-icon.tsx b/web/app/components/workflow/comment/comment-icon.tsx
index 7f005f3465..7270cd3ac9 100644
--- a/web/app/components/workflow/comment/comment-icon.tsx
+++ b/web/app/components/workflow/comment/comment-icon.tsx
@@ -1,7 +1,7 @@
 'use client'
 
 import type { FC, PointerEvent as ReactPointerEvent } from 'react'
-import type { WorkflowCommentList } from '@/service/workflow-comment'
+import type { WorkflowCommentList } from '@/contract/console/workflow-comment'
 import { memo, useCallback, useMemo, useRef, useState } from 'react'
 import { useReactFlow, useViewport } from 'reactflow'
 import { UserAvatarList } from '@/app/components/base/user-avatar-list'
diff --git a/web/app/components/workflow/comment/comment-preview.spec.tsx b/web/app/components/workflow/comment/comment-preview.spec.tsx
index d411c67ecd..a83303cb0d 100644
--- a/web/app/components/workflow/comment/comment-preview.spec.tsx
+++ b/web/app/components/workflow/comment/comment-preview.spec.tsx
@@ -1,9 +1,9 @@
-import type { WorkflowCommentList } from '@/service/workflow-comment'
+import type { WorkflowCommentList } from '@/contract/console/workflow-comment'
 import { fireEvent, render, screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import CommentPreview from './comment-preview'
 
-type UserProfile = WorkflowCommentList['created_by_account']
+type UserProfile = NonNullable<WorkflowCommentList['created_by_account']>
 
 const mockSetHovering = vi.fn()
 let capturedUsers: UserProfile[] = []
diff --git a/web/app/components/workflow/comment/comment-preview.tsx b/web/app/components/workflow/comment/comment-preview.tsx
index 5985ed848b..6aadb522a9 100644
--- a/web/app/components/workflow/comment/comment-preview.tsx
+++ b/web/app/components/workflow/comment/comment-preview.tsx
@@ -1,7 +1,7 @@
 'use client'
 
 import type { FC } from 'react'
-import type { WorkflowCommentList } from '@/service/workflow-comment'
+import type { WorkflowCommentList } from '@/contract/console/workflow-comment'
 import { memo, useEffect, useMemo } from 'react'
 import { UserAvatarList } from '@/app/components/base/user-avatar-list'
 import { useFormatTimeFromNow } from '@/hooks/use-format-time-from-now'
@@ -15,6 +15,7 @@ type CommentPreviewProps = {
 const CommentPreview: FC<CommentPreviewProps> = ({ comment, onClick }) => {
   const { formatTimeFromNow } = useFormatTimeFromNow()
   const setCommentPreviewHovering = useStore(s => s.setCommentPreviewHovering)
+  const authorName = comment.created_by_account?.name ?? ''
   const participants = useMemo(() => {
     const list = comment.participants ?? []
     const author = comment.created_by_account
@@ -44,7 +45,7 @@ const CommentPreview: FC<CommentPreviewProps> = ({ comment, onClick }) => {
 
       <div className="mb-2 flex items-start">
         <div className="flex min-w-0 items-center gap-2">
-          <div className="truncate system-sm-medium text-text-primary">{comment.created_by_account.name}</div>
+          <div className="truncate system-sm-medium text-text-primary">{authorName}</div>
           <div className="shrink-0 system-2xs-regular text-text-tertiary">
             {formatTimeFromNow(comment.updated_at * 1000)}
           </div>
diff --git a/web/app/components/workflow/comment/mention-input.spec.tsx b/web/app/components/workflow/comment/mention-input.spec.tsx
index 49fc7b6e87..ce53880595 100644
--- a/web/app/components/workflow/comment/mention-input.spec.tsx
+++ b/web/app/components/workflow/comment/mention-input.spec.tsx
@@ -1,5 +1,5 @@
-import type { UserProfile } from '@/service/workflow-comment'
-import { fireEvent, render, screen, waitFor } from '@testing-library/react'
+import type { UserProfile } from '@/contract/console/workflow-comment'
+import { act, fireEvent, render, screen, waitFor } from '@testing-library/react'
 import { useState } from 'react'
 import { MentionInput } from './mention-input'
 
@@ -30,8 +30,12 @@ vi.mock('@/next/navigation', () => ({
   useParams: () => ({ appId: 'app-1' }),
 }))
 
-vi.mock('@/service/workflow-comment', () => ({
-  fetchMentionableUsers: (...args: unknown[]) => mockFetchMentionableUsers(...args),
+vi.mock('@/service/client', () => ({
+  consoleClient: {
+    workflowComments: {
+      mentionUsers: (...args: unknown[]) => mockFetchMentionableUsers(...args),
+    },
+  },
 }))
 
 vi.mock('../store', () => ({
@@ -80,7 +84,7 @@ describe('MentionInput', () => {
     vi.clearAllMocks()
     mentionStoreState.mentionableUsersCache = {}
     mentionStoreState.mentionableUsersLoading = {}
-    mockFetchMentionableUsers.mockResolvedValue(mentionUsers)
+    mockFetchMentionableUsers.mockResolvedValue({ users: mentionUsers })
   })
 
   it('loads mentionable users when cache is empty', async () => {
@@ -93,7 +97,9 @@ describe('MentionInput', () => {
     )
 
     await waitFor(() => {
-      expect(mockFetchMentionableUsers).toHaveBeenCalledWith('app-1')
+      expect(mockFetchMentionableUsers).toHaveBeenCalledWith({
+        params: { appId: 'app-1' },
+      })
     })
 
     expect(mockSetMentionableUsersLoading).toHaveBeenCalledWith('app-1', true)
@@ -148,4 +154,35 @@ describe('MentionInput', () => {
       expect(onSubmit).toHaveBeenCalledWith('updated reply', [])
     })
   })
+
+  it('focuses the textarea at the end when autoFocus is enabled', () => {
+    vi.useFakeTimers()
+    try {
+      mentionStoreState.mentionableUsersCache['app-1'] = mentionUsers
+
+      const { unmount } = render(
+        <MentionInput
+          value="draft"
+          onChange={vi.fn()}
+          onSubmit={vi.fn()}
+          autoFocus
+        />,
+      )
+
+      const textarea = screen.getByPlaceholderText('workflow.comments.placeholder.add') as HTMLTextAreaElement
+
+      act(() => {
+        vi.runOnlyPendingTimers()
+      })
+
+      expect(document.activeElement).toBe(textarea)
+      expect(textarea.selectionStart).toBe(5)
+      expect(textarea.selectionEnd).toBe(5)
+
+      unmount()
+    }
+    finally {
+      vi.useRealTimers()
+    }
+  })
 })
diff --git a/web/app/components/workflow/comment/mention-input.tsx b/web/app/components/workflow/comment/mention-input.tsx
index b6a7caa055..511de1055c 100644
--- a/web/app/components/workflow/comment/mention-input.tsx
+++ b/web/app/components/workflow/comment/mention-input.tsx
@@ -1,7 +1,7 @@
 'use client'
 
 import type { ReactNode } from 'react'
-import type { UserProfile } from '@/service/workflow-comment'
+import type { UserProfile } from '@/contract/console/workflow-comment'
 import { Avatar } from '@langgenius/dify-ui/avatar'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
@@ -22,7 +22,7 @@ import { useTranslation } from 'react-i18next'
 import Textarea from 'react-textarea-autosize'
 import EnterKey from '@/app/components/base/icons/src/public/common/EnterKey'
 import { useParams } from '@/next/navigation'
-import { fetchMentionableUsers } from '@/service/workflow-comment'
+import { consoleClient } from '@/service/client'
 import { useStore, useWorkflowStore } from '../store'
 
 type MentionInputProps = {
@@ -38,6 +38,8 @@ type MentionInputProps = {
   autoFocus?: boolean
 }
 
+const EMPTY_USERS: UserProfile[] = []
+
 const MentionInputInner = forwardRef<HTMLTextAreaElement, MentionInputProps>(({
   value,
   onChange,
@@ -66,7 +68,7 @@ const MentionInputInner = forwardRef<HTMLTextAreaElement, MentionInputProps>(({
   const mentionUsersFromStore = useStore(state => (
     appId ? state.mentionableUsersCache[appId] : undefined
   ))
-  const mentionUsers = mentionUsersFromStore ?? []
+  const mentionUsers = useMemo(() => mentionUsersFromStore ?? EMPTY_USERS, [mentionUsersFromStore])
 
   const [showMentionDropdown, setShowMentionDropdown] = useState(false)
   const [mentionQuery, setMentionQuery] = useState('')
@@ -163,8 +165,10 @@ const MentionInputInner = forwardRef<HTMLTextAreaElement, MentionInputProps>(({
 
     state.setMentionableUsersLoading(appId, true)
     try {
-      const users = await fetchMentionableUsers(appId)
-      workflowStore.getState().setMentionableUsersCache(appId, users)
+      const response = await consoleClient.workflowComments.mentionUsers({
+        params: { appId },
+      })
+      workflowStore.getState().setMentionableUsersCache(appId, response.users)
     }
     catch (error) {
       console.error('Failed to load mentionable users:', error)
@@ -495,14 +499,17 @@ const MentionInputInner = forwardRef<HTMLTextAreaElement, MentionInputProps>(({
   }, [value, resetMentionState])
 
   useEffect(() => {
-    if (autoFocus && textareaRef.current) {
-      const textarea = textareaRef.current
-      setTimeout(() => {
-        textarea.focus()
-        const length = textarea.value.length
-        textarea.setSelectionRange(length, length)
-      }, 0)
-    }
+    if (!autoFocus || !textareaRef.current)
+      return
+
+    const textarea = textareaRef.current
+    const timeout = window.setTimeout(() => {
+      textarea.focus()
+      const length = textarea.value.length
+      textarea.setSelectionRange(length, length)
+    }, 0)
+
+    return () => window.clearTimeout(timeout)
   }, [autoFocus])
 
   return (
@@ -528,7 +535,7 @@ const MentionInputInner = forwardRef<HTMLTextAreaElement, MentionInputProps>(({
         <Textarea
           ref={textareaRef}
           className={cn(
-            'relative z-10 w-full resize-none bg-transparent p-1 body-lg-regular leading-6 text-transparent caret-primary-500 outline-none',
+            'relative z-10 w-full resize-none bg-transparent p-1 body-lg-regular leading-6 text-transparent caret-primary-500 outline-hidden',
             'placeholder:text-text-tertiary',
           )}
           style={{ paddingRight, paddingBottom }}
diff --git a/web/app/components/workflow/comment/thread.spec.tsx b/web/app/components/workflow/comment/thread.spec.tsx
index 58bb99cff0..2aa36142e9 100644
--- a/web/app/components/workflow/comment/thread.spec.tsx
+++ b/web/app/components/workflow/comment/thread.spec.tsx
@@ -1,4 +1,4 @@
-import type { WorkflowCommentDetail } from '@/service/workflow-comment'
+import type { WorkflowCommentDetail } from '@/contract/console/workflow-comment'
 import { fireEvent, render, screen, waitFor } from '@testing-library/react'
 import { CommentThread } from './thread'
 
diff --git a/web/app/components/workflow/comment/thread.tsx b/web/app/components/workflow/comment/thread.tsx
index 34e0092372..8eaf542604 100644
--- a/web/app/components/workflow/comment/thread.tsx
+++ b/web/app/components/workflow/comment/thread.tsx
@@ -1,7 +1,7 @@
 'use client'
 
 import type { FC, ReactNode } from 'react'
-import type { WorkflowCommentDetail, WorkflowCommentDetailReply } from '@/service/workflow-comment'
+import type { WorkflowCommentDetail, WorkflowCommentDetailReply } from '@/contract/console/workflow-comment'
 import { Avatar, AvatarFallback, AvatarImage, AvatarRoot } from '@langgenius/dify-ui/avatar'
 import { cn } from '@langgenius/dify-ui/cn'
 import {
@@ -545,7 +545,7 @@ export const CommentThread: FC<CommentThreadProps> = memo(({
                   <DropdownMenuContent
                     placement="bottom-end"
                     sideOffset={4}
-                    popupClassName="z-[100] w-36 rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg backdrop-blur-[10px]"
+                    popupClassName="w-36 rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg backdrop-blur-[10px]"
                   >
                     <button
                       className="flex w-full items-center justify-start rounded-xl px-3 py-2 text-left text-sm text-text-secondary hover:bg-state-base-hover"
@@ -635,7 +635,7 @@ export const CommentThread: FC<CommentThreadProps> = memo(({
                           <DropdownMenuContent
                             placement="bottom-end"
                             sideOffset={4}
-                            popupClassName="z-[100] w-36 rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg backdrop-blur-[10px]"
+                            popupClassName="w-36 rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg backdrop-blur-[10px]"
                             data-reply-menu
                           >
                             <div className={cn(deletingReplyId === reply.id ? 'hidden' : 'block')}>
diff --git a/web/app/components/workflow/constants.ts b/web/app/components/workflow/constants.ts
index ed9a072824..32c7c82e33 100644
--- a/web/app/components/workflow/constants.ts
+++ b/web/app/components/workflow/constants.ts
@@ -172,6 +172,10 @@ export const QUESTION_CLASSIFIER_OUTPUT_STRUCT = [
     variable: 'class_name',
     type: VarType.string,
   },
+  {
+    variable: 'class_label',
+    type: VarType.string,
+  },
   {
     variable: 'usage',
     type: VarType.object,
@@ -217,6 +221,10 @@ export const HUMAN_INPUT_OUTPUT_STRUCT: Var[] = [
     variable: '__action_id',
     type: VarType.string,
   },
+  {
+    variable: '__action_value',
+    type: VarType.string,
+  },
   {
     variable: '__rendered_content',
     type: VarType.string,
diff --git a/web/app/components/workflow/dsl-export-confirm-modal.tsx b/web/app/components/workflow/dsl-export-confirm-modal.tsx
index 58efa2d3bc..6b4c741e6c 100644
--- a/web/app/components/workflow/dsl-export-confirm-modal.tsx
+++ b/web/app/components/workflow/dsl-export-confirm-modal.tsx
@@ -1,15 +1,18 @@
 'use client'
 import type { EnvironmentVariable } from '@/app/components/workflow/types'
-import { Button } from '@langgenius/dify-ui/button'
+import {
+  AlertDialog,
+  AlertDialogActions,
+  AlertDialogCancelButton,
+  AlertDialogConfirmButton,
+  AlertDialogContent,
+  AlertDialogTitle,
+} from '@langgenius/dify-ui/alert-dialog'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import { cn } from '@langgenius/dify-ui/cn'
-import { RiCloseLine, RiLock2Line } from '@remixicon/react'
-import { noop } from 'es-toolkit/function'
 import * as React from 'react'
 import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import Checkbox from '@/app/components/base/checkbox'
-import { Env } from '@/app/components/base/icons/src/vender/line/others'
-import Modal from '@/app/components/base/modal'
 
 export type DSLExportConfirmModalProps = {
   envList: EnvironmentVariable[]
@@ -17,11 +20,16 @@ export type DSLExportConfirmModalProps = {
   onClose: () => void
 }
 
-const DSLExportConfirmModal = ({
+type DSLExportConfirmContentProps = DSLExportConfirmModalProps & {
+  onExportingChange?: (isExporting: boolean) => void
+}
+
+export const DSLExportConfirmContent = ({
   envList = [],
   onConfirm,
   onClose,
-}: DSLExportConfirmModalProps) => {
+  onExportingChange,
+}: DSLExportConfirmContentProps) => {
   const { t } = useTranslation()
 
   const [exportSecrets, setExportSecrets] = useState<boolean>(false)
@@ -32,73 +40,73 @@ const DSLExportConfirmModal = ({
       return
 
     setIsExporting(true)
+    onExportingChange?.(true)
     try {
       await onConfirm(exportSecrets)
       onClose()
     }
     finally {
       setIsExporting(false)
+      onExportingChange?.(false)
     }
-  }, [exportSecrets, isExporting, onClose, onConfirm])
+  }, [exportSecrets, isExporting, onClose, onConfirm, onExportingChange])
 
   return (
-    <Modal
-      isShow={true}
-      onClose={noop}
-      className={cn('w-[480px] max-w-[480px]')}
-    >
-      <div className="relative pb-6 title-2xl-semi-bold text-text-primary">{t('env.export.title', { ns: 'workflow' })}</div>
-      <div
-        className={cn('absolute top-4 right-4 p-2', !isExporting && 'cursor-pointer')}
-        onClick={() => !isExporting && onClose()}
-      >
-        <RiCloseLine className="h-4 w-4 text-text-tertiary" />
-      </div>
-      <div className="relative">
-        <table className="w-full border-separate border-spacing-0 rounded-lg border border-divider-regular shadow-xs">
-          <thead className="system-xs-medium-uppercase text-text-tertiary">
-            <tr>
-              <td width={220} className="h-7 border-r border-b border-divider-regular pl-3">{t('env.export.name', { ns: 'workflow' })}</td>
-              <td className="h-7 border-b border-divider-regular pl-3">{t('env.export.value', { ns: 'workflow' })}</td>
-            </tr>
-          </thead>
-          <tbody>
-            {envList.map((env, index) => (
-              <tr key={env.name}>
-                <td className={cn('h-7 border-r pl-3 system-xs-medium', index + 1 !== envList.length && 'border-b')}>
-                  <div className="flex w-[200px] items-center gap-1">
-                    <Env className="h-4 w-4 shrink-0 text-util-colors-violet-violet-600" />
-                    <div className="truncate text-text-primary">{env.name}</div>
-                    <div className="shrink-0 text-text-tertiary">{t('env.export.secret', { ns: 'workflow' })}</div>
-                    <RiLock2Line className="h-3 w-3 shrink-0 text-text-tertiary" />
-                  </div>
-                </td>
-                <td className={cn('h-7 pl-3', index + 1 !== envList.length && 'border-b')}>
-                  <div className="truncate system-xs-regular text-text-secondary">{env.value}</div>
-                </td>
+    <AlertDialogContent className="w-120 max-w-120">
+      <div className="px-6 pt-6">
+        <AlertDialogTitle className="pb-6 title-2xl-semi-bold text-text-primary">
+          {t('env.export.title', { ns: 'workflow' })}
+        </AlertDialogTitle>
+        <div className="relative">
+          <table className="w-full border-separate border-spacing-0 rounded-lg border border-divider-regular shadow-xs">
+            <thead className="system-xs-medium-uppercase text-text-tertiary">
+              <tr>
+                <td width={220} className="h-7 border-r border-b border-divider-regular pl-3">{t('env.export.name', { ns: 'workflow' })}</td>
+                <td className="h-7 border-b border-divider-regular pl-3">{t('env.export.value', { ns: 'workflow' })}</td>
               </tr>
-            ))}
-          </tbody>
-        </table>
-      </div>
-      <div className="mt-4 flex gap-2">
-        <Checkbox
-          className="shrink-0"
-          checked={exportSecrets}
-          disabled={isExporting}
-          onCheck={() => setExportSecrets(!exportSecrets)}
-        />
-        <div
-          className={cn('system-sm-medium text-text-primary', !isExporting && 'cursor-pointer')}
-          onClick={() => !isExporting && setExportSecrets(!exportSecrets)}
-        >
-          {t('env.export.checkbox', { ns: 'workflow' })}
+            </thead>
+            <tbody>
+              {envList.map((env, index) => (
+                <tr key={env.name}>
+                  <td className={cn('h-7 border-r border-divider-regular pl-3 system-xs-medium', index + 1 !== envList.length && 'border-b border-divider-regular')}>
+                    <div className="flex w-50 items-center gap-1">
+                      <span aria-hidden="true" className="i-custom-vender-line-others-env h-4 w-4 shrink-0 text-util-colors-violet-violet-600" />
+                      <div className="truncate text-text-primary">{env.name}</div>
+                      <div className="shrink-0 text-text-tertiary">{t('env.export.secret', { ns: 'workflow' })}</div>
+                      <span aria-hidden="true" className="i-ri-lock-2-line h-3 w-3 shrink-0 text-text-tertiary" />
+                    </div>
+                  </td>
+                  <td className={cn('h-7 pl-3', index + 1 !== envList.length && 'border-b border-divider-regular')}>
+                    <div className="truncate system-xs-regular text-text-secondary">{env.value}</div>
+                  </td>
+                </tr>
+              ))}
+            </tbody>
+          </table>
         </div>
+        <label className={cn('mt-4 flex gap-2', !isExporting && 'cursor-pointer')}>
+          <Checkbox
+            className="shrink-0"
+            checked={exportSecrets}
+            disabled={isExporting}
+            onCheckedChange={setExportSecrets}
+          />
+          <span
+            className={cn(
+              'rounded-sm text-left system-sm-medium text-text-primary outline-hidden',
+              isExporting && 'cursor-not-allowed opacity-50',
+            )}
+          >
+            {t('env.export.checkbox', { ns: 'workflow' })}
+          </span>
+        </label>
       </div>
-      <div className="flex flex-row-reverse pt-6">
-        <Button
-          className="ml-2"
-          variant="primary"
+      <AlertDialogActions>
+        <AlertDialogCancelButton disabled={isExporting}>
+          {t('operation.cancel', { ns: 'common' })}
+        </AlertDialogCancelButton>
+        <AlertDialogConfirmButton
+          tone="default"
           loading={isExporting}
           disabled={isExporting}
           onClick={submit}
@@ -108,10 +116,28 @@ const DSLExportConfirmModal = ({
             : exportSecrets
               ? t('env.export.export', { ns: 'workflow' })
               : t('env.export.ignore', { ns: 'workflow' })}
-        </Button>
-        <Button disabled={isExporting} onClick={onClose}>{t('operation.cancel', { ns: 'common' })}</Button>
-      </div>
-    </Modal>
+        </AlertDialogConfirmButton>
+      </AlertDialogActions>
+    </AlertDialogContent>
+  )
+}
+
+const DSLExportConfirmModal = (props: DSLExportConfirmModalProps) => {
+  const { envList, onClose } = props
+  const [isExporting, setIsExporting] = useState(false)
+  const isDialogOpen = envList.length > 0
+
+  const handleOpenChange = useCallback((open: boolean) => {
+    if (open || isExporting)
+      return
+
+    onClose()
+  }, [isExporting, onClose])
+
+  return (
+    <AlertDialog open={isDialogOpen} onOpenChange={handleOpenChange}>
+      <DSLExportConfirmContent {...props} onExportingChange={setIsExporting} />
+    </AlertDialog>
   )
 }
 
diff --git a/web/app/components/workflow/header/__tests__/header-in-restoring.spec.tsx b/web/app/components/workflow/header/__tests__/header-in-restoring.spec.tsx
index 60d55a931c..87e1db69bf 100644
--- a/web/app/components/workflow/header/__tests__/header-in-restoring.spec.tsx
+++ b/web/app/components/workflow/header/__tests__/header-in-restoring.spec.tsx
@@ -7,9 +7,9 @@ import HeaderInRestoring from '../header-in-restoring'
 
 const mockRestoreWorkflow = vi.fn()
 const mockInvalidAllLastRun = vi.fn()
+const mockResetWorkflowVersionHistory = vi.fn()
 const mockHandleLoadBackupDraft = vi.fn()
 const mockHandleRefreshWorkflowDraft = vi.fn()
-const mockRequestRestore = vi.fn()
 
 vi.mock('@/hooks/use-theme', () => ({
   default: () => ({
@@ -31,6 +31,7 @@ vi.mock('@/hooks/use-format-time-from-now', () => ({
 
 vi.mock('@/service/use-workflow', () => ({
   useInvalidAllLastRun: () => mockInvalidAllLastRun,
+  useResetWorkflowVersionHistory: () => mockResetWorkflowVersionHistory,
   useRestoreWorkflow: () => ({
     mutateAsync: mockRestoreWorkflow,
   }),
@@ -43,9 +44,6 @@ vi.mock('../../hooks', () => ({
   useWorkflowRefreshDraft: () => ({
     handleRefreshWorkflowDraft: mockHandleRefreshWorkflowDraft,
   }),
-  useLeaderRestore: () => ({
-    requestRestore: mockRequestRestore,
-  }),
 }))
 
 const createVersion = (overrides: Partial<VersionHistory> = {}): VersionHistory => ({
@@ -92,7 +90,7 @@ describe('HeaderInRestoring', () => {
     expect(screen.getByRole('button', { name: 'workflow.common.restore' })).toBeDisabled()
   })
 
-  it('should enable restore when version and flow config are both ready', () => {
+  it('should enable restore when version and flow id are both ready', () => {
     renderWorkflowComponent(<HeaderInRestoring />, {
       initialStoreState: {
         currentVersion: createVersion(),
@@ -100,7 +98,7 @@ describe('HeaderInRestoring', () => {
       hooksStoreProps: {
         configsMap: {
           flowId: 'app-1',
-          flowType: FlowType.appFlow,
+          flowType: undefined as never,
           fileSettings: {} as never,
         },
       },
diff --git a/web/app/components/workflow/header/__tests__/header-layouts.spec.tsx b/web/app/components/workflow/header/__tests__/header-layouts.spec.tsx
index 4d91180863..c02c60c749 100644
--- a/web/app/components/workflow/header/__tests__/header-layouts.spec.tsx
+++ b/web/app/components/workflow/header/__tests__/header-layouts.spec.tsx
@@ -14,7 +14,11 @@ const mockHandleNodeSelect = vi.fn()
 const mockHandleRefreshWorkflowDraft = vi.fn()
 const mockCloseAllInputFieldPanels = vi.fn()
 const mockInvalidAllLastRun = vi.fn()
-const mockRequestRestore = vi.fn()
+const mockRestoreWorkflow = vi.fn()
+const mockResetWorkflowVersionHistory = vi.fn()
+const mockEmitRestoreIntent = vi.fn()
+const mockEmitRestoreComplete = vi.fn()
+const mockEmitWorkflowUpdate = vi.fn()
 const mockNotify = vi.fn()
 const mockRunAndHistory = vi.fn()
 const mockViewHistory = vi.fn()
@@ -33,9 +37,6 @@ vi.mock('../../hooks', () => ({
     handleBackupDraft: mockHandleBackupDraft,
     handleLoadBackupDraft: mockHandleLoadBackupDraft,
   }),
-  useLeaderRestore: () => ({
-    requestRestore: mockRequestRestore,
-  }),
   useNodesSyncDraft: () => ({
     handleSyncWorkflowDraft: vi.fn(),
   }),
@@ -58,6 +59,18 @@ vi.mock('@/hooks/use-theme', () => ({
 
 vi.mock('@/service/use-workflow', () => ({
   useInvalidAllLastRun: () => mockInvalidAllLastRun,
+  useResetWorkflowVersionHistory: () => mockResetWorkflowVersionHistory,
+  useRestoreWorkflow: () => ({
+    mutateAsync: mockRestoreWorkflow,
+  }),
+}))
+
+vi.mock('../../collaboration/core/collaboration-manager', () => ({
+  collaborationManager: {
+    emitRestoreIntent: mockEmitRestoreIntent,
+    emitRestoreComplete: mockEmitRestoreComplete,
+    emitWorkflowUpdate: mockEmitWorkflowUpdate,
+  },
 }))
 
 vi.mock('@langgenius/dify-ui/toast', () => ({
@@ -166,13 +179,7 @@ describe('Header layout components', () => {
     mockNodesReadOnly = false
     mockTheme = 'light'
     mockUseNodes.mockReturnValue([])
-    mockRequestRestore.mockImplementation((_payload: unknown, callbacks?: {
-      onSuccess?: () => void
-      onSettled?: () => void
-    }) => {
-      callbacks?.onSuccess?.()
-      callbacks?.onSettled?.()
-    })
+    mockRestoreWorkflow.mockResolvedValue({})
   })
 
   describe('HeaderInNormal', () => {
@@ -291,7 +298,7 @@ describe('Header layout components', () => {
       fireEvent.click(screen.getByRole('button', { name: 'workflow.common.restore' }))
 
       await waitFor(() => {
-        expect(mockRequestRestore).toHaveBeenCalledTimes(1)
+        expect(mockRestoreWorkflow).toHaveBeenCalledWith('/apps/flow-1/workflows/version-1/restore')
         expect(store.getState().showWorkflowVersionHistoryPanel).toBe(false)
         expect(store.getState().isRestoring).toBe(false)
         expect(store.getState().backupDraft).toBeUndefined()
@@ -303,8 +310,53 @@ describe('Header layout components', () => {
           message: 'workflow.versionHistory.action.restoreSuccess',
         })
       })
+      expect(mockEmitRestoreIntent).toHaveBeenCalledWith({
+        versionId: currentVersion.id,
+        versionName: currentVersion.marked_name,
+        initiatorUserId: '',
+        initiatorName: '',
+      })
+      expect(mockEmitRestoreComplete).toHaveBeenCalledWith({
+        versionId: currentVersion.id,
+        success: true,
+      })
+      expect(mockEmitWorkflowUpdate).toHaveBeenCalledWith('flow-1')
+      expect(mockResetWorkflowVersionHistory).toHaveBeenCalledTimes(1)
       expect(onRestoreSettled).toHaveBeenCalledTimes(1)
     })
+
+    it('should restore rag pipeline versions without emitting collaboration events', async () => {
+      const currentVersion = createCurrentVersion()
+
+      renderWorkflowComponent(
+        <HeaderInRestoring />,
+        {
+          initialStoreState: {
+            isRestoring: true,
+            showWorkflowVersionHistoryPanel: true,
+            backupDraft: createBackupDraft(),
+            currentVersion,
+          },
+          hooksStoreProps: {
+            configsMap: {
+              flowType: FlowType.ragPipeline,
+              flowId: 'pipeline-1',
+              fileSettings: {},
+            },
+          },
+        },
+      )
+
+      fireEvent.click(screen.getByRole('button', { name: 'workflow.common.restore' }))
+
+      await waitFor(() => {
+        expect(mockRestoreWorkflow).toHaveBeenCalledWith('/rag/pipelines/pipeline-1/workflows/version-1/restore')
+        expect(mockHandleRefreshWorkflowDraft).toHaveBeenCalledTimes(1)
+      })
+      expect(mockEmitRestoreIntent).not.toHaveBeenCalled()
+      expect(mockEmitRestoreComplete).not.toHaveBeenCalled()
+      expect(mockEmitWorkflowUpdate).not.toHaveBeenCalled()
+    })
   })
 
   describe('HeaderInHistory', () => {
diff --git a/web/app/components/workflow/header/checklist/__tests__/index.spec.tsx b/web/app/components/workflow/header/checklist/__tests__/index.spec.tsx
index 25150e2d04..934dcc490f 100644
--- a/web/app/components/workflow/header/checklist/__tests__/index.spec.tsx
+++ b/web/app/components/workflow/header/checklist/__tests__/index.spec.tsx
@@ -54,6 +54,8 @@ vi.mock('@langgenius/dify-ui/popover', () => ({
   },
   PopoverTrigger: ({ render }: { render: ReactNode }) => <>{render}</>,
   PopoverContent: ({ children }: { children: ReactNode }) => <div>{children}</div>,
+  PopoverTitle: ({ children, className }: { children: ReactNode, className?: string }) => <h2 className={className}>{children}</h2>,
+  PopoverDescription: ({ children, className }: { children: ReactNode, className?: string }) => <p className={className}>{children}</p>,
   PopoverClose: ({ children, className }: { children: ReactNode, className?: string }) => <button className={className}>{children}</button>,
 }))
 
diff --git a/web/app/components/workflow/header/checklist/__tests__/node-group.spec.tsx b/web/app/components/workflow/header/checklist/__tests__/node-group.spec.tsx
index d574dda0ac..a84ddd06af 100644
--- a/web/app/components/workflow/header/checklist/__tests__/node-group.spec.tsx
+++ b/web/app/components/workflow/header/checklist/__tests__/node-group.spec.tsx
@@ -36,6 +36,7 @@ describe('ChecklistNodeGroup', () => {
     expect(screen.getByText('Needs configuration')).toBeInTheDocument()
     expect(screen.getByText(/needConnectTip/i)).toBeInTheDocument()
     expect(screen.getAllByText(/goToFix/i)).toHaveLength(2)
+    expect(screen.getByRole('button', { name: /Needs configuration/i })).toHaveAttribute('title', 'Needs configuration')
 
     fireEvent.click(screen.getByText('Needs configuration'))
 
@@ -57,5 +58,7 @@ describe('ChecklistNodeGroup', () => {
 
     expect(onItemClick).not.toHaveBeenCalled()
     expect(screen.queryByText(/goToFix/i)).not.toBeInTheDocument()
+    expect(screen.queryByRole('button', { name: /Needs configuration/i })).not.toBeInTheDocument()
+    expect(screen.getByText('Needs configuration').parentElement).toHaveAttribute('title', 'Needs configuration')
   })
 })
diff --git a/web/app/components/workflow/header/checklist/index.tsx b/web/app/components/workflow/header/checklist/index.tsx
index 9a54175c8c..1e4303d401 100644
--- a/web/app/components/workflow/header/checklist/index.tsx
+++ b/web/app/components/workflow/header/checklist/index.tsx
@@ -7,6 +7,8 @@ import {
   Popover,
   PopoverClose,
   PopoverContent,
+  PopoverDescription,
+  PopoverTitle,
   PopoverTrigger,
 } from '@langgenius/dify-ui/popover'
 import {
@@ -43,6 +45,7 @@ const WorkflowChecklist = ({
   const nodes = useNodes()
   const needWarningNodes = useChecklist(nodes, edges)
   const { handleNodeSelect } = useNodesInteractions()
+  const checklistLabel = t('panel.checklist', { ns: 'workflow' })
 
   const { pluginItems, nodeItems } = useMemo(() => {
     const plugins: ChecklistItem[] = []
@@ -75,12 +78,14 @@ const WorkflowChecklist = ({
               disabled && 'cursor-not-allowed opacity-50',
             )}
             disabled={disabled || undefined}
+            aria-label={checklistLabel}
           >
             <span
               className={cn('group flex h-full w-full items-center justify-center rounded-md hover:bg-state-accent-hover', open && 'bg-state-accent-hover')}
             >
               <span
                 className={cn('i-ri-list-check-3 h-4 w-4 group-hover:text-components-button-secondary-accent-text', open ? 'text-components-button-secondary-accent-text' : 'text-components-button-ghost-text')}
+                aria-hidden="true"
               />
             </span>
             {!!needWarningNodes.length && (
@@ -104,19 +109,22 @@ const WorkflowChecklist = ({
           <div className="flex flex-col gap-0.5 px-3 pt-3.5 pb-1">
             <div className="flex items-start px-1">
               <div className="min-w-0 grow pr-8">
-                <h2 className="text-base leading-6 font-semibold text-text-primary">
-                  {t('panel.checklist', { ns: 'workflow' })}
+                <PopoverTitle className="text-base leading-6 font-semibold text-text-primary">
+                  {checklistLabel}
                   {needWarningNodes.length > 0 && `(${needWarningNodes.length})`}
-                </h2>
+                </PopoverTitle>
               </div>
-              <PopoverClose className="-mt-0.5 -mr-0.5 flex size-7 shrink-0 items-center justify-center rounded-lg">
-                <span className="i-ri-close-line size-4 text-text-tertiary" />
+              <PopoverClose
+                className="-mt-0.5 -mr-0.5 flex size-7 shrink-0 items-center justify-center rounded-lg"
+                aria-label={t('operation.close', { ns: 'common' })}
+              >
+                <span className="i-ri-close-line size-4 text-text-tertiary" aria-hidden="true" />
               </PopoverClose>
             </div>
             {needWarningNodes.length > 0 && (
-              <p className="px-1 text-xs leading-4 text-text-tertiary">
+              <PopoverDescription className="px-1 text-xs leading-4 text-text-tertiary">
                 {t('panel.checklistDescription', { ns: 'workflow' })}
-              </p>
+              </PopoverDescription>
             )}
           </div>
 
diff --git a/web/app/components/workflow/header/checklist/node-group.tsx b/web/app/components/workflow/header/checklist/node-group.tsx
index a161c6cb87..05987b632e 100644
--- a/web/app/components/workflow/header/checklist/node-group.tsx
+++ b/web/app/components/workflow/header/checklist/node-group.tsx
@@ -45,29 +45,48 @@ export const ChecklistNodeGroup = memo(({
         </span>
       </div>
       <div className="p-1">
-        {subItems.map(sub => (
-          <div
-            key={sub.key}
-            className={cn(
-              'group/item flex items-start gap-2 rounded-lg px-1',
-              goToEnabled && 'cursor-pointer hover:bg-state-base-hover',
-            )}
-            onClick={() => goToEnabled && onItemClick(item)}
-          >
-            <ItemIndicator />
-            <span className="min-w-0 grow py-1 text-xs leading-4 text-text-warning">
-              {sub.message}
-            </span>
-            {goToEnabled && (
-              <div className="flex shrink-0 items-center gap-0.5 pt-1 pr-0.5 opacity-0 transition-opacity duration-150 group-hover/item:opacity-100">
-                <span className="text-xs leading-4 font-medium whitespace-nowrap text-text-accent">
-                  {t('panel.goToFix', { ns: 'workflow' })}
-                </span>
-                <span className="i-ri-arrow-right-line size-3.5 text-text-accent" />
-              </div>
-            )}
-          </div>
-        ))}
+        {subItems.map((sub) => {
+          const content = (
+            <>
+              <ItemIndicator />
+              <span className="min-w-0 grow truncate text-xs leading-4 text-text-warning">
+                {sub.message}
+              </span>
+              {goToEnabled && (
+                <div className="flex shrink-0 items-center gap-0.5 pr-0.5 opacity-0 transition-opacity duration-150 group-hover/item:opacity-100">
+                  <span className="text-xs leading-4 font-medium whitespace-nowrap text-text-accent">
+                    {t('panel.goToFix', { ns: 'workflow' })}
+                  </span>
+                  <span className="i-ri-arrow-right-line size-3.5 text-text-accent" aria-hidden="true" />
+                </div>
+              )}
+            </>
+          )
+          const className = cn(
+            'group/item flex w-full items-center gap-2 rounded-lg px-1 text-left',
+            goToEnabled && 'cursor-pointer hover:bg-state-base-hover',
+          )
+
+          if (goToEnabled) {
+            return (
+              <button
+                key={sub.key}
+                type="button"
+                className={cn(className, 'border-none bg-transparent')}
+                title={sub.message}
+                onClick={() => onItemClick(item)}
+              >
+                {content}
+              </button>
+            )
+          }
+
+          return (
+            <div key={sub.key} className={className} title={sub.message}>
+              {content}
+            </div>
+          )
+        })}
       </div>
     </div>
   )
diff --git a/web/app/components/workflow/header/header-in-restoring.tsx b/web/app/components/workflow/header/header-in-restoring.tsx
index f07d28ff13..8ce061eb2a 100644
--- a/web/app/components/workflow/header/header-in-restoring.tsx
+++ b/web/app/components/workflow/header/header-in-restoring.tsx
@@ -6,12 +6,11 @@ import {
   useCallback,
 } from 'react'
 import { useTranslation } from 'react-i18next'
-import { useFeaturesStore } from '@/app/components/base/features/hooks'
 import { useSelector as useAppContextSelector } from '@/context/app-context'
 import useTheme from '@/hooks/use-theme'
-import { useInvalidAllLastRun } from '@/service/use-workflow'
+import { useInvalidAllLastRun, useResetWorkflowVersionHistory, useRestoreWorkflow } from '@/service/use-workflow'
+import { FlowType } from '@/types/common'
 import {
-  useLeaderRestore,
   useWorkflowRefreshDraft,
   useWorkflowRun,
 } from '../hooks'
@@ -35,7 +34,6 @@ const HeaderInRestoring = ({
   const { theme } = useTheme()
   const workflowStore = useWorkflowStore()
   const userProfile = useAppContextSelector(s => s.userProfile)
-  const featuresStore = useFeaturesStore()
   const configsMap = useHooksStore(s => s.configsMap)
   const invalidAllLastRun = useInvalidAllLastRun(configsMap?.flowType, configsMap?.flowId)
   const {
@@ -47,9 +45,11 @@ const HeaderInRestoring = ({
   const {
     handleLoadBackupDraft,
   } = useWorkflowRun()
-  const { requestRestore } = useLeaderRestore()
   const { handleRefreshWorkflowDraft } = useWorkflowRefreshDraft()
+  const { mutateAsync: restoreWorkflow } = useRestoreWorkflow()
+  const resetWorkflowVersionHistory = useResetWorkflowVersionHistory()
   const canRestore = !!currentVersion?.id && !!configsMap?.flowId && currentVersion.version !== WorkflowVersion.Draft
+  const canEmitCollaborationEvents = configsMap?.flowType === FlowType.appFlow
 
   const handleCancelRestore = useCallback(() => {
     handleLoadBackupDraft()
@@ -57,47 +57,86 @@ const HeaderInRestoring = ({
     setShowWorkflowVersionHistoryPanel(false)
   }, [workflowStore, handleLoadBackupDraft, setShowWorkflowVersionHistoryPanel])
 
-  const handleRestore = useCallback(() => {
+  const restoreVersionUrl = useCallback((versionId: string) => {
+    if (!configsMap?.flowId)
+      return ''
+    if (configsMap.flowType === FlowType.ragPipeline)
+      return `/rag/pipelines/${configsMap.flowId}/workflows/${versionId}/restore`
+    return `/apps/${configsMap.flowId}/workflows/${versionId}/restore`
+  }, [configsMap?.flowId, configsMap?.flowType])
+
+  const emitRestoreIntent = useCallback(async () => {
+    if (!currentVersion || !canEmitCollaborationEvents)
+      return
+    try {
+      const { collaborationManager } = await import('../collaboration/core/collaboration-manager')
+      collaborationManager.emitRestoreIntent({
+        versionId: currentVersion.id,
+        versionName: currentVersion.marked_name,
+        initiatorUserId: userProfile.id,
+        initiatorName: userProfile.name,
+      })
+    }
+    catch (error) {
+      console.error('Failed to emit restore intent:', error)
+    }
+  }, [canEmitCollaborationEvents, currentVersion, userProfile.id, userProfile.name])
+
+  const emitRestoreComplete = useCallback(async (success: boolean, errorMessage?: string) => {
+    if (!currentVersion || !canEmitCollaborationEvents)
+      return
+    try {
+      const { collaborationManager } = await import('../collaboration/core/collaboration-manager')
+      collaborationManager.emitRestoreComplete({
+        versionId: currentVersion.id,
+        success,
+        ...(errorMessage ? { error: errorMessage } : {}),
+      })
+    }
+    catch (error) {
+      console.error('Failed to emit restore complete:', error)
+    }
+  }, [canEmitCollaborationEvents, currentVersion])
+
+  const emitWorkflowUpdate = useCallback(async () => {
+    if (!configsMap?.flowId || !canEmitCollaborationEvents)
+      return
+    try {
+      const { collaborationManager } = await import('../collaboration/core/collaboration-manager')
+      collaborationManager.emitWorkflowUpdate(configsMap.flowId)
+    }
+    catch (error) {
+      console.error('Failed to emit workflow update:', error)
+    }
+  }, [canEmitCollaborationEvents, configsMap?.flowId])
+
+  const handleRestore = useCallback(async () => {
     if (!canRestore || !currentVersion)
       return
 
     setShowWorkflowVersionHistoryPanel(false)
-    workflowStore.setState({ isRestoring: false })
-    workflowStore.setState({ backupDraft: undefined })
+    await emitRestoreIntent()
 
-    const { graph } = currentVersion
-    const features = featuresStore?.getState().features
-    const environmentVariables = currentVersion.environment_variables || []
-    const conversationVariables = currentVersion.conversation_variables || []
-
-    requestRestore({
-      versionId: currentVersion.id,
-      versionName: currentVersion.marked_name,
-      initiatorUserId: userProfile.id,
-      initiatorName: userProfile.name,
-      graphData: {
-        nodes: graph.nodes,
-        edges: graph.edges,
-        viewport: graph.viewport,
-      },
-      features,
-      environmentVariables,
-      conversationVariables,
-    }, {
-      onSuccess: () => {
-        handleRefreshWorkflowDraft()
-        toast.success(t('versionHistory.action.restoreSuccess', { ns: 'workflow' }))
-        deleteAllInspectVars()
-        invalidAllLastRun()
-      },
-      onError: () => {
-        toast.error(t('versionHistory.action.restoreFailure', { ns: 'workflow' }))
-      },
-      onSettled: () => {
-        onRestoreSettled?.()
-      },
-    })
-  }, [canRestore, currentVersion, setShowWorkflowVersionHistoryPanel, workflowStore, featuresStore, requestRestore, userProfile, handleRefreshWorkflowDraft, deleteAllInspectVars, invalidAllLastRun, t, onRestoreSettled])
+    try {
+      await restoreWorkflow(restoreVersionUrl(currentVersion.id))
+      workflowStore.setState({ isRestoring: false })
+      workflowStore.setState({ backupDraft: undefined })
+      handleRefreshWorkflowDraft()
+      toast.success(t('versionHistory.action.restoreSuccess', { ns: 'workflow' }))
+      deleteAllInspectVars()
+      invalidAllLastRun()
+      await emitRestoreComplete(true)
+      await emitWorkflowUpdate()
+    }
+    catch {
+      toast.error(t('versionHistory.action.restoreFailure', { ns: 'workflow' }))
+      await emitRestoreComplete(false, 'restore failed')
+    }
+    finally {
+      resetWorkflowVersionHistory()
+      onRestoreSettled?.()
+    }
+  }, [canRestore, currentVersion, setShowWorkflowVersionHistoryPanel, emitRestoreIntent, restoreWorkflow, restoreVersionUrl, workflowStore, handleRefreshWorkflowDraft, t, deleteAllInspectVars, invalidAllLastRun, emitRestoreComplete, emitWorkflowUpdate, resetWorkflowVersionHistory, onRestoreSettled])
 
   return (
     <>
diff --git a/web/app/components/workflow/header/online-users.tsx b/web/app/components/workflow/header/online-users.tsx
index 17e1de3feb..93e9d1fa85 100644
--- a/web/app/components/workflow/header/online-users.tsx
+++ b/web/app/components/workflow/header/online-users.tsx
@@ -189,7 +189,6 @@ const OnlineUsers = () => {
                 placement="bottom-start"
                 sideOffset={8}
                 alignOffset={-48}
-                className="z-[9999]"
                 popupClassName={cn(
                   'mt-1.5 flex max-h-[200px] w-[240px] flex-col overflow-y-auto',
                   'rounded-xl border-[0.5px] border-components-panel-border',
diff --git a/web/app/components/workflow/hooks/__tests__/use-leader-restore.spec.ts b/web/app/components/workflow/hooks/__tests__/use-leader-restore.spec.ts
deleted file mode 100644
index b0fb43f768..0000000000
--- a/web/app/components/workflow/hooks/__tests__/use-leader-restore.spec.ts
+++ /dev/null
@@ -1,262 +0,0 @@
-import type { RestoreIntentData, RestoreRequestData } from '../../collaboration/types/collaboration'
-import type { SyncDraftCallback } from '../../hooks-store/store'
-import type { Edge, Node } from '../../types'
-import { act, renderHook } from '@testing-library/react'
-import { renderHookWithSystemFeatures } from '@/__tests__/utils/mock-system-features'
-import { ChatVarType } from '../../panel/chat-variable-panel/type'
-import { useLeaderRestore, useLeaderRestoreListener } from '../use-leader-restore'
-
-const mockSetViewport = vi.hoisted(() => vi.fn())
-const mockSetFeatures = vi.hoisted(() => vi.fn())
-const mockSetEnvironmentVariables = vi.hoisted(() => vi.fn())
-const mockSetConversationVariables = vi.hoisted(() => vi.fn())
-const mockDoSyncWorkflowDraft = vi.hoisted(() => vi.fn())
-const mockToastInfo = vi.hoisted(() => vi.fn())
-
-const mockEmitRestoreIntent = vi.hoisted(() => vi.fn())
-const mockEmitRestoreComplete = vi.hoisted(() => vi.fn())
-const mockEmitWorkflowUpdate = vi.hoisted(() => vi.fn())
-const mockEmitRestoreRequest = vi.hoisted(() => vi.fn())
-const mockIsConnected = vi.hoisted(() => vi.fn())
-const mockGetIsLeader = vi.hoisted(() => vi.fn())
-const mockSetNodes = vi.hoisted(() => vi.fn())
-const mockSetEdges = vi.hoisted(() => vi.fn())
-const mockRefreshGraphSynchronously = vi.hoisted(() => vi.fn())
-const mockGetNodes = vi.hoisted(() => vi.fn(() => [{ id: 'old-node' } as unknown as Node]))
-const mockGetEdges = vi.hoisted(() => vi.fn(() => [{ id: 'old-edge' } as unknown as Edge]))
-
-let restoreCompleteCallback: ((data: { versionId: string, success: boolean }) => void) | null = null
-let restoreRequestCallback: ((data: RestoreRequestData) => void) | null = null
-let restoreIntentCallback: ((data: RestoreIntentData) => void) | null = null
-
-const unsubscribeRestoreComplete = vi.hoisted(() => vi.fn())
-const unsubscribeRestoreRequest = vi.hoisted(() => vi.fn())
-const unsubscribeRestoreIntent = vi.hoisted(() => vi.fn())
-
-let isCollaborationEnabled = true
-
-vi.mock('react-i18next', () => ({
-  useTranslation: () => ({
-    t: (key: string, options?: { ns?: string, userName?: string, versionName?: string }) => {
-      const ns = options?.ns ? `${options.ns}.` : ''
-      const extra = options?.userName ? `:${options.userName}:${options.versionName}` : ''
-      return `${ns}${key}${extra}`
-    },
-  }),
-}))
-
-vi.mock('reactflow', () => ({
-  useReactFlow: () => ({
-    setViewport: mockSetViewport,
-  }),
-}))
-
-vi.mock('@/app/components/app/store', () => ({
-  useStore: {
-    getState: () => ({
-      appDetail: { id: 'app-1' },
-    }),
-  },
-}))
-
-vi.mock('@/app/components/base/features/hooks', () => ({
-  useFeaturesStore: () => ({
-    getState: () => ({
-      setFeatures: mockSetFeatures,
-    }),
-  }),
-}))
-
-vi.mock('@langgenius/dify-ui/toast', () => ({
-  toast: {
-    info: (...args: unknown[]) => mockToastInfo(...args),
-  },
-}))
-
-vi.mock('../../store', () => ({
-  useWorkflowStore: () => ({
-    getState: () => ({
-      setEnvironmentVariables: mockSetEnvironmentVariables,
-      setConversationVariables: mockSetConversationVariables,
-    }),
-  }),
-}))
-
-vi.mock('../use-nodes-sync-draft', () => ({
-  useNodesSyncDraft: () => ({
-    doSyncWorkflowDraft: (...args: unknown[]) => mockDoSyncWorkflowDraft(...args),
-  }),
-}))
-
-vi.mock('../../collaboration/core/collaboration-manager', () => ({
-  collaborationManager: {
-    emitRestoreIntent: (...args: unknown[]) => mockEmitRestoreIntent(...args),
-    emitRestoreComplete: (...args: unknown[]) => mockEmitRestoreComplete(...args),
-    emitWorkflowUpdate: (...args: unknown[]) => mockEmitWorkflowUpdate(...args),
-    emitRestoreRequest: (...args: unknown[]) => mockEmitRestoreRequest(...args),
-    isConnected: (...args: unknown[]) => mockIsConnected(...args),
-    getIsLeader: (...args: unknown[]) => mockGetIsLeader(...args),
-    setNodes: (...args: unknown[]) => mockSetNodes(...args),
-    setEdges: (...args: unknown[]) => mockSetEdges(...args),
-    refreshGraphSynchronously: (...args: unknown[]) => mockRefreshGraphSynchronously(...args),
-    getNodes: () => mockGetNodes(),
-    getEdges: () => mockGetEdges(),
-    onRestoreComplete: (callback: (data: { versionId: string, success: boolean }) => void) => {
-      restoreCompleteCallback = callback
-      return unsubscribeRestoreComplete
-    },
-    onRestoreRequest: (callback: (data: RestoreRequestData) => void) => {
-      restoreRequestCallback = callback
-      return unsubscribeRestoreRequest
-    },
-    onRestoreIntent: (callback: (data: RestoreIntentData) => void) => {
-      restoreIntentCallback = callback
-      return unsubscribeRestoreIntent
-    },
-  },
-}))
-
-describe('useLeaderRestore', () => {
-  const restoreData: RestoreRequestData = {
-    versionId: 'v-1',
-    versionName: 'Version One',
-    initiatorUserId: 'u-1',
-    initiatorName: 'Alice',
-    features: { moreLikeThis: { enabled: true } },
-    environmentVariables: [{ id: 'env-1', name: 'A', value: '1', value_type: ChatVarType.String, description: '' }],
-    conversationVariables: [{ id: 'conv-1', name: 'B', value: '2', value_type: ChatVarType.String, description: '' }],
-    graphData: {
-      nodes: [{ id: 'new-node' } as unknown as Node],
-      edges: [{ id: 'new-edge' } as unknown as Edge],
-      viewport: { x: 1, y: 2, zoom: 0.5 },
-    },
-  }
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    restoreCompleteCallback = null
-    restoreRequestCallback = null
-    restoreIntentCallback = null
-    isCollaborationEnabled = true
-    mockIsConnected.mockReturnValue(true)
-    mockGetIsLeader.mockReturnValue(false)
-    mockDoSyncWorkflowDraft.mockImplementation((_sync: boolean, callbacks?: SyncDraftCallback) => {
-      callbacks?.onSuccess?.()
-      callbacks?.onSettled?.()
-    })
-  })
-
-  it('performs restore locally when collaboration is disabled', async () => {
-    isCollaborationEnabled = false
-    const onSuccess = vi.fn()
-    const onSettled = vi.fn()
-
-    const { result } = renderHookWithSystemFeatures(() => useLeaderRestore(), {
-      systemFeatures: { enable_collaboration_mode: isCollaborationEnabled },
-    })
-
-    await act(async () => {
-      result.current.requestRestore(restoreData, { onSuccess, onSettled })
-    })
-
-    expect(mockEmitRestoreIntent).toHaveBeenCalledWith(expect.objectContaining({
-      versionId: 'v-1',
-      initiatorName: 'Alice',
-    }))
-    expect(mockSetFeatures).toHaveBeenCalledWith({ moreLikeThis: { enabled: true } })
-    expect(mockSetEnvironmentVariables).toHaveBeenCalled()
-    expect(mockSetConversationVariables).toHaveBeenCalled()
-    expect(mockSetNodes).toHaveBeenCalledWith([{ id: 'old-node' }], [{ id: 'new-node' }], 'leader-restore:apply-graph')
-    expect(mockSetEdges).toHaveBeenCalledWith([{ id: 'old-edge' }], [{ id: 'new-edge' }])
-    expect(mockRefreshGraphSynchronously).toHaveBeenCalled()
-    expect(mockSetViewport).toHaveBeenCalledWith({ x: 1, y: 2, zoom: 0.5 })
-    expect(mockEmitRestoreComplete).toHaveBeenCalledWith({ versionId: 'v-1', success: true })
-    expect(mockEmitWorkflowUpdate).toHaveBeenCalledWith('app-1')
-    expect(onSuccess).toHaveBeenCalled()
-    expect(onSettled).toHaveBeenCalled()
-  })
-
-  it('emits restore request and resolves callbacks from restore-complete events', async () => {
-    isCollaborationEnabled = true
-    mockIsConnected.mockReturnValue(true)
-    mockGetIsLeader.mockReturnValue(false)
-    const onSuccess = vi.fn()
-    const onError = vi.fn()
-    const onSettled = vi.fn()
-
-    const { result } = renderHookWithSystemFeatures(() => useLeaderRestore(), {
-      systemFeatures: { enable_collaboration_mode: isCollaborationEnabled },
-    })
-
-    act(() => {
-      result.current.requestRestore(restoreData, { onSuccess, onError, onSettled })
-    })
-
-    expect(mockEmitRestoreRequest).toHaveBeenCalledWith(restoreData)
-    expect(mockDoSyncWorkflowDraft).not.toHaveBeenCalled()
-
-    act(() => {
-      restoreCompleteCallback?.({ versionId: 'v-1', success: true })
-    })
-    expect(onSuccess).toHaveBeenCalledTimes(1)
-    expect(onSettled).toHaveBeenCalledTimes(1)
-
-    act(() => {
-      result.current.requestRestore(restoreData, { onSuccess, onError, onSettled })
-      restoreCompleteCallback?.({ versionId: 'v-1', success: false })
-    })
-    expect(onError).toHaveBeenCalledTimes(1)
-    expect(onSettled).toHaveBeenCalledTimes(2)
-  })
-})
-
-describe('useLeaderRestoreListener', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    restoreRequestCallback = null
-    restoreIntentCallback = null
-    mockDoSyncWorkflowDraft.mockImplementation((_sync: boolean, callbacks?: SyncDraftCallback) => {
-      callbacks?.onSuccess?.()
-      callbacks?.onSettled?.()
-    })
-  })
-
-  it('shows restore notifications for request and intent events', () => {
-    const { unmount } = renderHook(() => useLeaderRestoreListener())
-
-    act(() => {
-      restoreRequestCallback?.({
-        ...{
-          versionId: 'v-2',
-          versionName: 'Version Two',
-          initiatorUserId: 'u-2',
-          initiatorName: 'Bob',
-          graphData: { nodes: [], edges: [] },
-        },
-      })
-    })
-
-    expect(mockToastInfo).toHaveBeenCalledWith(
-      'workflow.versionHistory.action.restoreInProgress:Bob:Version Two',
-      { timeout: 3000 },
-    )
-    expect(mockEmitRestoreIntent).toHaveBeenCalled()
-
-    act(() => {
-      restoreIntentCallback?.({
-        versionId: 'v-3',
-        versionName: 'Version Three',
-        initiatorUserId: 'u-3',
-        initiatorName: 'Carol',
-      })
-    })
-    expect(mockToastInfo).toHaveBeenCalledWith(
-      'workflow.versionHistory.action.restoreInProgress:Carol:Version Three',
-      { timeout: 3000 },
-    )
-
-    unmount()
-    expect(unsubscribeRestoreRequest).toHaveBeenCalled()
-    expect(unsubscribeRestoreIntent).toHaveBeenCalled()
-  })
-})
diff --git a/web/app/components/workflow/hooks/__tests__/use-workflow-comment.spec.ts b/web/app/components/workflow/hooks/__tests__/use-workflow-comment.spec.ts
index b2edfa5234..19eb1ad0e8 100644
--- a/web/app/components/workflow/hooks/__tests__/use-workflow-comment.spec.ts
+++ b/web/app/components/workflow/hooks/__tests__/use-workflow-comment.spec.ts
@@ -1,4 +1,4 @@
-import type { WorkflowCommentDetail, WorkflowCommentList } from '@/service/workflow-comment'
+import type { WorkflowCommentDetail, WorkflowCommentList } from '@/contract/console/workflow-comment'
 import { act, waitFor } from '@testing-library/react'
 import { createTestQueryClient, seedSystemFeatures } from '@/__tests__/utils/mock-system-features'
 import { renderWorkflowHook } from '../../__tests__/workflow-test-env'
@@ -52,16 +52,30 @@ vi.mock('@/context/app-context', () => ({
   }),
 }))
 
-vi.mock('@/service/workflow-comment', () => ({
-  createWorkflowComment: (...args: unknown[]) => mockCreateWorkflowComment(...args),
-  createWorkflowCommentReply: (...args: unknown[]) => mockCreateWorkflowCommentReply(...args),
-  deleteWorkflowComment: (...args: unknown[]) => mockDeleteWorkflowComment(...args),
-  deleteWorkflowCommentReply: (...args: unknown[]) => mockDeleteWorkflowCommentReply(...args),
-  fetchWorkflowComment: (...args: unknown[]) => mockFetchWorkflowComment(...args),
-  fetchWorkflowComments: (...args: unknown[]) => mockFetchWorkflowComments(...args),
-  resolveWorkflowComment: (...args: unknown[]) => mockResolveWorkflowComment(...args),
-  updateWorkflowComment: (...args: unknown[]) => mockUpdateWorkflowComment(...args),
-  updateWorkflowCommentReply: (...args: unknown[]) => mockUpdateWorkflowCommentReply(...args),
+vi.mock('@/service/client', () => ({
+  consoleClient: {
+    systemFeatures: () => ({
+      enable_collaboration_mode: globalFeatureState.enableCollaboration,
+    }),
+    workflowComments: {
+      create: (...args: unknown[]) => mockCreateWorkflowComment(...args),
+      delete: (...args: unknown[]) => mockDeleteWorkflowComment(...args),
+      detail: (...args: unknown[]) => mockFetchWorkflowComment(...args),
+      list: (...args: unknown[]) => mockFetchWorkflowComments(...args),
+      resolve: (...args: unknown[]) => mockResolveWorkflowComment(...args),
+      update: (...args: unknown[]) => mockUpdateWorkflowComment(...args),
+      replies: {
+        create: (...args: unknown[]) => mockCreateWorkflowCommentReply(...args),
+        delete: (...args: unknown[]) => mockDeleteWorkflowCommentReply(...args),
+        update: (...args: unknown[]) => mockUpdateWorkflowCommentReply(...args),
+      },
+    },
+  },
+  consoleQuery: {
+    systemFeatures: {
+      queryKey: () => ['console', 'systemFeatures'],
+    },
+  },
 }))
 
 vi.mock('@/app/components/workflow/collaboration/core/collaboration-manager', () => ({
@@ -127,25 +141,27 @@ describe('useWorkflowComment', () => {
     commentsUpdateState.handler = undefined
     globalFeatureState.enableCollaboration = true
 
-    mockFetchWorkflowComments.mockResolvedValue([])
+    mockFetchWorkflowComments.mockResolvedValue({ data: [] })
     mockFetchWorkflowComment.mockResolvedValue(baseCommentDetail())
     mockCreateWorkflowComment.mockResolvedValue({
       id: 'comment-2',
-      created_at: '1700000000',
+      created_at: 1700000000,
     })
     mockUpdateWorkflowComment.mockResolvedValue({})
   })
 
   it('loads comment list on mount when collaboration is enabled', async () => {
     const comment = baseComment()
-    mockFetchWorkflowComments.mockResolvedValue([comment])
+    mockFetchWorkflowComments.mockResolvedValue({ data: [comment] })
 
     const { store } = renderWorkflowHook(() => useWorkflowComment(), {
       queryClient: createSeededQueryClient(),
     })
 
     await waitFor(() => {
-      expect(mockFetchWorkflowComments).toHaveBeenCalledWith('app-1')
+      expect(mockFetchWorkflowComments).toHaveBeenCalledWith({
+        params: { appId: 'app-1' },
+      })
     })
 
     expect(store.getState().comments).toEqual([comment])
@@ -186,11 +202,14 @@ describe('useWorkflowComment', () => {
       await result.current.handleCommentSubmit('new message', ['user-2'])
     })
 
-    expect(mockCreateWorkflowComment).toHaveBeenCalledWith('app-1', {
-      position_x: 10,
-      position_y: 20,
-      content: 'new message',
-      mentioned_user_ids: ['user-2'],
+    expect(mockCreateWorkflowComment).toHaveBeenCalledWith({
+      params: { appId: 'app-1' },
+      body: {
+        position_x: 10,
+        position_y: 20,
+        content: 'new message',
+        mentioned_user_ids: ['user-2'],
+      },
     })
     expect(mockEmitCommentsUpdate).toHaveBeenCalledWith('app-1')
 
@@ -214,6 +233,79 @@ describe('useWorkflowComment', () => {
     expect(store.getState().isCommentQuickAdd).toBe(false)
   })
 
+  it('normalizes numeric string timestamps when creating a comment', async () => {
+    mockCreateWorkflowComment.mockResolvedValue({
+      id: 'comment-string-time',
+      created_at: '1700001234',
+    })
+
+    const { result, store } = renderWorkflowHook(() => useWorkflowComment(), {
+      queryClient: createSeededQueryClient(),
+      initialStoreState: {
+        comments: [],
+        pendingComment: { pageX: 100, pageY: 200, elementX: 10, elementY: 20 },
+        isCommentQuickAdd: true,
+      },
+    })
+
+    await act(async () => {
+      await result.current.handleCommentSubmit('new message')
+    })
+
+    expect(store.getState().comments[0]).toMatchObject({
+      id: 'comment-string-time',
+      created_at: 1700001234,
+      updated_at: 1700001234,
+    })
+  })
+
+  it('normalizes ISO timestamps and keeps unresolved mentions as null', async () => {
+    const createdAt = '2024-01-02T03:04:05.000Z'
+    mockCreateWorkflowComment.mockResolvedValue({
+      id: 'comment-date-time',
+      created_at: createdAt,
+    })
+
+    const { result, store } = renderWorkflowHook(() => useWorkflowComment(), {
+      queryClient: createSeededQueryClient(),
+      initialStoreState: {
+        comments: [],
+        pendingComment: { pageX: 100, pageY: 200, elementX: 10, elementY: 20 },
+        isCommentQuickAdd: true,
+        mentionableUsersCache: {
+          'app-1': [{
+            id: 'user-2',
+            name: 'Bob',
+            email: 'bob@example.com',
+            avatar_url: 'bob.png',
+          }],
+        },
+      },
+    })
+
+    await act(async () => {
+      await result.current.handleCommentSubmit('new message', ['missing-user'])
+    })
+
+    const expectedCreatedAt = Math.floor(Date.parse(createdAt) / 1000)
+    expect(store.getState().comments[0]).toMatchObject({
+      id: 'comment-date-time',
+      created_at: expectedCreatedAt,
+      updated_at: expectedCreatedAt,
+      participants: [{
+        id: 'user-1',
+        name: 'Alice',
+        email: 'alice@example.com',
+        avatar_url: 'alice.png',
+      }],
+    })
+    expect(store.getState().commentDetailCache['comment-date-time']?.mentions).toEqual([{
+      mentioned_user_id: 'missing-user',
+      mentioned_user_account: null,
+      reply_id: null,
+    }])
+  })
+
   it('rolls back optimistic position update when API update fails', async () => {
     const comment = baseComment()
     const commentDetail = baseCommentDetail()
@@ -235,10 +327,13 @@ describe('useWorkflowComment', () => {
       await result.current.handleCommentPositionUpdate(comment.id, { x: 300, y: 400 })
     })
 
-    expect(mockUpdateWorkflowComment).toHaveBeenCalledWith('app-1', comment.id, {
-      content: 'hello',
-      position_x: 300,
-      position_y: 400,
+    expect(mockUpdateWorkflowComment).toHaveBeenCalledWith({
+      params: { appId: 'app-1', commentId: comment.id },
+      body: {
+        content: 'hello',
+        position_x: 300,
+        position_y: 400,
+      },
     })
     expect(mockEmitCommentsUpdate).not.toHaveBeenCalled()
     expect(store.getState().comments[0]).toMatchObject({
@@ -257,8 +352,8 @@ describe('useWorkflowComment', () => {
       ...baseCommentDetail(),
       content: 'updated by another user',
     }
-    mockFetchWorkflowComments.mockResolvedValue([comment])
-    mockFetchWorkflowComment.mockResolvedValue({ data: detail })
+    mockFetchWorkflowComments.mockResolvedValue({ data: [comment] })
+    mockFetchWorkflowComment.mockResolvedValue(detail)
 
     const { unmount } = renderWorkflowHook(() => useWorkflowComment(), {
       queryClient: createSeededQueryClient(),
@@ -276,7 +371,9 @@ describe('useWorkflowComment', () => {
     })
 
     await waitFor(() => {
-      expect(mockFetchWorkflowComment).toHaveBeenCalledWith('app-1', comment.id)
+      expect(mockFetchWorkflowComment).toHaveBeenCalledWith({
+        params: { appId: 'app-1', commentId: comment.id },
+      })
     })
     expect(mockFetchWorkflowComments).toHaveBeenCalledTimes(2)
 
@@ -362,7 +459,7 @@ describe('useWorkflowComment', () => {
       position_x: 33,
       position_y: 55,
     }
-    mockFetchWorkflowComments.mockResolvedValue([commentB])
+    mockFetchWorkflowComments.mockResolvedValue({ data: [commentB] })
     mockFetchWorkflowComment.mockResolvedValue({
       ...baseCommentDetail(),
       id: commentB.id,
@@ -383,7 +480,9 @@ describe('useWorkflowComment', () => {
       await result.current.handleCommentResolve(commentA.id)
     })
 
-    expect(mockResolveWorkflowComment).toHaveBeenCalledWith('app-1', commentA.id)
+    expect(mockResolveWorkflowComment).toHaveBeenCalledWith({
+      params: { appId: 'app-1', commentId: commentA.id },
+    })
 
     await act(async () => {
       await result.current.handleCommentReply(commentA.id, '  new reply  ', ['user-2'])
@@ -391,24 +490,154 @@ describe('useWorkflowComment', () => {
       await result.current.handleCommentReplyDelete(commentA.id, 'reply-1')
     })
 
-    expect(mockCreateWorkflowCommentReply).toHaveBeenCalledWith('app-1', commentA.id, {
-      content: 'new reply',
-      mentioned_user_ids: ['user-2'],
+    expect(mockCreateWorkflowCommentReply).toHaveBeenCalledWith({
+      params: { appId: 'app-1', commentId: commentA.id },
+      body: {
+        content: 'new reply',
+        mentioned_user_ids: ['user-2'],
+      },
     })
-    expect(mockUpdateWorkflowCommentReply).toHaveBeenCalledWith('app-1', commentA.id, 'reply-1', {
-      content: 'edited reply',
-      mentioned_user_ids: ['user-2'],
+    expect(mockUpdateWorkflowCommentReply).toHaveBeenCalledWith({
+      params: { appId: 'app-1', commentId: commentA.id, replyId: 'reply-1' },
+      body: {
+        content: 'edited reply',
+        mentioned_user_ids: ['user-2'],
+      },
+    })
+    expect(mockDeleteWorkflowCommentReply).toHaveBeenCalledWith({
+      params: { appId: 'app-1', commentId: commentA.id, replyId: 'reply-1' },
     })
-    expect(mockDeleteWorkflowCommentReply).toHaveBeenCalledWith('app-1', commentA.id, 'reply-1')
 
     await act(async () => {
       await result.current.handleCommentDelete(commentA.id)
     })
 
-    expect(mockDeleteWorkflowComment).toHaveBeenCalledWith('app-1', commentA.id)
+    expect(mockDeleteWorkflowComment).toHaveBeenCalledWith({
+      params: { appId: 'app-1', commentId: commentA.id },
+    })
     await waitFor(() => {
       expect(store.getState().activeCommentId).toBe(commentB.id)
     })
     expect(mockEmitCommentsUpdate).toHaveBeenCalled()
   })
+
+  it('does not update a reply when the content is blank', async () => {
+    const { result } = renderWorkflowHook(() => useWorkflowComment(), {
+      queryClient: createSeededQueryClient(),
+    })
+
+    await act(async () => {
+      await result.current.handleCommentReplyUpdate('comment-1', 'reply-1', '   ')
+    })
+
+    expect(mockUpdateWorkflowCommentReply).not.toHaveBeenCalled()
+  })
+
+  it('resets reply submit loading when creation fails', async () => {
+    mockCreateWorkflowCommentReply.mockRejectedValueOnce(new Error('create reply failed'))
+
+    const { result, store } = renderWorkflowHook(() => useWorkflowComment(), {
+      queryClient: createSeededQueryClient(),
+      initialStoreState: {
+        replySubmitting: false,
+      },
+    })
+
+    await act(async () => {
+      await result.current.handleCommentReply('comment-1', 'new reply')
+    })
+
+    expect(mockCreateWorkflowCommentReply).toHaveBeenCalledWith({
+      params: { appId: 'app-1', commentId: 'comment-1' },
+      body: {
+        content: 'new reply',
+        mentioned_user_ids: [],
+      },
+    })
+    expect(store.getState().replySubmitting).toBe(false)
+  })
+
+  it('resets reply update loading when update fails', async () => {
+    mockUpdateWorkflowCommentReply.mockRejectedValueOnce(new Error('update failed'))
+
+    const { result, store } = renderWorkflowHook(() => useWorkflowComment(), {
+      queryClient: createSeededQueryClient(),
+      initialStoreState: {
+        replyUpdating: false,
+      },
+    })
+
+    await act(async () => {
+      await result.current.handleCommentReplyUpdate('comment-1', 'reply-1', 'updated reply')
+    })
+
+    expect(mockUpdateWorkflowCommentReply).toHaveBeenCalledWith({
+      params: { appId: 'app-1', commentId: 'comment-1', replyId: 'reply-1' },
+      body: {
+        content: 'updated reply',
+        mentioned_user_ids: [],
+      },
+    })
+    expect(store.getState().replyUpdating).toBe(false)
+  })
+
+  it('resets reply delete loading when deletion fails', async () => {
+    mockDeleteWorkflowCommentReply.mockRejectedValueOnce(new Error('delete failed'))
+
+    const { result, store } = renderWorkflowHook(() => useWorkflowComment(), {
+      queryClient: createSeededQueryClient(),
+      initialStoreState: {
+        activeCommentDetailLoading: false,
+      },
+    })
+
+    await act(async () => {
+      await result.current.handleCommentReplyDelete('comment-1', 'reply-1')
+    })
+
+    expect(mockDeleteWorkflowCommentReply).toHaveBeenCalledWith({
+      params: { appId: 'app-1', commentId: 'comment-1', replyId: 'reply-1' },
+    })
+    expect(store.getState().activeCommentDetailLoading).toBe(false)
+  })
+
+  it('ignores navigation when no active comment or active comment is absent from the list', () => {
+    const { result } = renderWorkflowHook(() => useWorkflowComment(), {
+      queryClient: createSeededQueryClient(),
+      initialStoreState: {
+        comments: [baseComment()],
+      },
+    })
+
+    act(() => {
+      result.current.handleCommentNavigate('next')
+    })
+
+    expect(mockSetCenter).not.toHaveBeenCalled()
+
+    act(() => {
+      result.current.handleCommentIconClick({ ...baseComment(), id: 'missing-comment' })
+    })
+
+    mockSetCenter.mockClear()
+
+    act(() => {
+      result.current.handleCommentNavigate('next')
+    })
+
+    expect(mockSetCenter).not.toHaveBeenCalled()
+  })
+
+  it('clears a pending comment when comment mode is left outside quick add', () => {
+    const { store } = renderWorkflowHook(() => useWorkflowComment(), {
+      queryClient: createSeededQueryClient(),
+      initialStoreState: {
+        controlMode: ControlMode.Pointer,
+        isCommentQuickAdd: false,
+        pendingComment: { pageX: 1, pageY: 2, elementX: 3, elementY: 4 },
+      },
+    })
+
+    expect(store.getState().pendingComment).toBeNull()
+  })
 })
diff --git a/web/app/components/workflow/hooks/index.ts b/web/app/components/workflow/hooks/index.ts
index e0e24ef994..8dc5def829 100644
--- a/web/app/components/workflow/hooks/index.ts
+++ b/web/app/components/workflow/hooks/index.ts
@@ -4,7 +4,6 @@ export * from './use-checklist'
 export * from './use-DSL'
 export * from './use-edges-interactions'
 export * from './use-inspect-vars-crud'
-export * from './use-leader-restore'
 export * from './use-node-data-update'
 export * from './use-nodes-interactions'
 export * from './use-nodes-meta-data'
diff --git a/web/app/components/workflow/hooks/use-leader-restore.ts b/web/app/components/workflow/hooks/use-leader-restore.ts
deleted file mode 100644
index 9083767f40..0000000000
--- a/web/app/components/workflow/hooks/use-leader-restore.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-import type { RestoreCompleteData, RestoreIntentData, RestoreRequestData } from '../collaboration/types/collaboration'
-import type { SyncCallback } from './use-nodes-sync-draft'
-import { toast } from '@langgenius/dify-ui/toast'
-import { useSuspenseQuery } from '@tanstack/react-query'
-import { useCallback, useEffect, useRef } from 'react'
-import { useTranslation } from 'react-i18next'
-import { useReactFlow } from 'reactflow'
-import { useStore as useAppStore } from '@/app/components/app/store'
-import { useFeaturesStore } from '@/app/components/base/features/hooks'
-import { systemFeaturesQueryOptions } from '@/service/system-features'
-import { collaborationManager } from '../collaboration/core/collaboration-manager'
-import { useWorkflowStore } from '../store'
-import { useNodesSyncDraft } from './use-nodes-sync-draft'
-
-type RestoreCallbacks = SyncCallback
-
-const usePerformRestore = () => {
-  const { doSyncWorkflowDraft } = useNodesSyncDraft()
-  const appDetail = useAppStore.getState().appDetail
-  const featuresStore = useFeaturesStore()
-  const workflowStore = useWorkflowStore()
-  const reactflow = useReactFlow()
-
-  return useCallback((data: RestoreRequestData, callbacks?: RestoreCallbacks) => {
-    collaborationManager.emitRestoreIntent({
-      versionId: data.versionId,
-      versionName: data.versionName,
-      initiatorUserId: data.initiatorUserId,
-      initiatorName: data.initiatorName,
-    })
-
-    if (data.features && featuresStore) {
-      const { setFeatures } = featuresStore.getState()
-      setFeatures(data.features)
-    }
-
-    if (data.environmentVariables) {
-      workflowStore.getState().setEnvironmentVariables(data.environmentVariables)
-    }
-
-    if (data.conversationVariables) {
-      workflowStore.getState().setConversationVariables(data.conversationVariables)
-    }
-
-    const { nodes, edges, viewport } = data.graphData
-    const currentNodes = collaborationManager.getNodes()
-    const currentEdges = collaborationManager.getEdges()
-
-    collaborationManager.setNodes(currentNodes, nodes, 'leader-restore:apply-graph')
-    collaborationManager.setEdges(currentEdges, edges)
-    collaborationManager.refreshGraphSynchronously()
-
-    if (viewport)
-      reactflow.setViewport(viewport)
-
-    doSyncWorkflowDraft(false, {
-      onSuccess: () => {
-        collaborationManager.emitRestoreComplete({
-          versionId: data.versionId,
-          success: true,
-        })
-
-        if (appDetail)
-          collaborationManager.emitWorkflowUpdate(appDetail.id)
-
-        callbacks?.onSuccess?.()
-      },
-      onError: () => {
-        collaborationManager.emitRestoreComplete({
-          versionId: data.versionId,
-          success: false,
-          error: 'Failed to sync restore to server',
-        })
-        callbacks?.onError?.()
-      },
-      onSettled: () => {
-        callbacks?.onSettled?.()
-      },
-    })
-  }, [appDetail, doSyncWorkflowDraft, featuresStore, reactflow, workflowStore])
-}
-
-export const useLeaderRestoreListener = () => {
-  const { t } = useTranslation()
-  const performRestore = usePerformRestore()
-
-  useEffect(() => {
-    const unsubscribe = collaborationManager.onRestoreRequest((data: RestoreRequestData) => {
-      toast.info(t('versionHistory.action.restoreInProgress', {
-        ns: 'workflow',
-        userName: data.initiatorName,
-        versionName: data.versionName || data.versionId,
-      }), { timeout: 3000 })
-      performRestore(data)
-    })
-
-    return unsubscribe
-  }, [performRestore, t])
-
-  useEffect(() => {
-    const unsubscribe = collaborationManager.onRestoreIntent((data: RestoreIntentData) => {
-      toast.info(t('versionHistory.action.restoreInProgress', {
-        ns: 'workflow',
-        userName: data.initiatorName,
-        versionName: data.versionName || data.versionId,
-      }), { timeout: 3000 })
-    })
-
-    return unsubscribe
-  }, [t])
-}
-
-export const useLeaderRestore = () => {
-  const performRestore = usePerformRestore()
-  const pendingCallbacksRef = useRef<{
-    versionId: string
-    callbacks: RestoreCallbacks | null
-  } | null>(null)
-  const { data: isCollaborationEnabled } = useSuspenseQuery({
-    ...systemFeaturesQueryOptions(),
-    select: s => s.enable_collaboration_mode,
-  })
-
-  const requestRestore = useCallback((data: RestoreRequestData, callbacks?: RestoreCallbacks) => {
-    if (!isCollaborationEnabled || !collaborationManager.isConnected() || collaborationManager.getIsLeader()) {
-      performRestore(data, callbacks)
-      return
-    }
-
-    pendingCallbacksRef.current = {
-      versionId: data.versionId,
-      callbacks: callbacks || null,
-    }
-    collaborationManager.emitRestoreRequest(data)
-  }, [isCollaborationEnabled, performRestore])
-
-  useEffect(() => {
-    const unsubscribe = collaborationManager.onRestoreComplete((data: RestoreCompleteData) => {
-      const pending = pendingCallbacksRef.current
-      if (!pending || pending.versionId !== data.versionId)
-        return
-
-      const callbacks = pending.callbacks
-      if (!callbacks) {
-        pendingCallbacksRef.current = null
-        return
-      }
-
-      if (data.success)
-        callbacks.onSuccess?.()
-      else
-        callbacks.onError?.()
-
-      callbacks.onSettled?.()
-      pendingCallbacksRef.current = null
-    })
-
-    return unsubscribe
-  }, [])
-
-  return {
-    requestRestore,
-  }
-}
diff --git a/web/app/components/workflow/hooks/use-workflow-comment.ts b/web/app/components/workflow/hooks/use-workflow-comment.ts
index cdd14ceef1..54be5325e5 100644
--- a/web/app/components/workflow/hooks/use-workflow-comment.ts
+++ b/web/app/components/workflow/hooks/use-workflow-comment.ts
@@ -1,24 +1,34 @@
-import type { UserProfile, WorkflowCommentDetail, WorkflowCommentList } from '@/service/workflow-comment'
+import type { UserProfile, WorkflowCommentDetail, WorkflowCommentList } from '@/contract/console/workflow-comment'
 import { useSuspenseQuery } from '@tanstack/react-query'
-import { useCallback, useEffect, useRef } from 'react'
+import { useCallback, useEffect, useMemo, useRef } from 'react'
 import { useReactFlow } from 'reactflow'
 import { collaborationManager } from '@/app/components/workflow/collaboration/core/collaboration-manager'
 import { useAppContext } from '@/context/app-context'
 import { useParams } from '@/next/navigation'
+import { consoleClient } from '@/service/client'
 import { systemFeaturesQueryOptions } from '@/service/system-features'
-import { createWorkflowComment, createWorkflowCommentReply, deleteWorkflowComment, deleteWorkflowCommentReply, fetchWorkflowComment, fetchWorkflowComments, resolveWorkflowComment, updateWorkflowComment, updateWorkflowCommentReply } from '@/service/workflow-comment'
 import { useStore } from '../store'
 import { ControlMode } from '../types'
 
 const EMPTY_USERS: UserProfile[] = []
-type CommentDetailResponse = WorkflowCommentDetail | { data: WorkflowCommentDetail }
 
-const getCommentDetail = (response: CommentDetailResponse): WorkflowCommentDetail => {
-  if ('data' in response)
-    return response.data
-  return response
+const normalizeTimestamp = (value: number | string): number => {
+  if (typeof value === 'number')
+    return value
+
+  const parsed = Number(value)
+  if (!Number.isNaN(parsed))
+    return parsed
+
+  return Math.floor(Date.parse(value) / 1000)
 }
 
+const toCommentDetailPreview = (comment: WorkflowCommentList): WorkflowCommentDetail => ({
+  ...comment,
+  replies: [],
+  mentions: [],
+})
+
 export const useWorkflowComment = () => {
   const params = useParams()
   const appId = params.appId as string
@@ -50,6 +60,10 @@ export const useWorkflowComment = () => {
   const mentionableUsers = useStore(state => (
     appId ? state.mentionableUsersCache[appId] ?? EMPTY_USERS : EMPTY_USERS
   ))
+  const mentionableUserById = useMemo(
+    () => new Map(mentionableUsers.map(user => [user.id, user])),
+    [mentionableUsers],
+  )
   const { userProfile } = useAppContext()
   const { data: isCollaborationEnabled } = useSuspenseQuery({
     ...systemFeaturesQueryOptions(),
@@ -70,8 +84,9 @@ export const useWorkflowComment = () => {
     if (!appId)
       return
 
-    const detailResponse = await fetchWorkflowComment(appId, commentId) as CommentDetailResponse
-    const detail = getCommentDetail(detailResponse)
+    const detail = await consoleClient.workflowComments.detail({
+      params: { appId, commentId },
+    })
 
     commentDetailCacheRef.current = {
       ...commentDetailCacheRef.current,
@@ -87,8 +102,10 @@ export const useWorkflowComment = () => {
 
     setCommentsLoading(true)
     try {
-      const commentsData = await fetchWorkflowComments(appId)
-      setComments(commentsData)
+      const response = await consoleClient.workflowComments.list({
+        params: { appId },
+      })
+      setComments(response.data)
     }
     catch (error) {
       console.error('Failed to fetch comments:', error)
@@ -133,17 +150,17 @@ export const useWorkflowComment = () => {
         y: pendingComment.pageY,
       })
 
-      const newComment = await createWorkflowComment(appId, {
-        position_x: flowPosition.x,
-        position_y: flowPosition.y,
-        content,
-        mentioned_user_ids: mentionedUserIds,
+      const newComment = await consoleClient.workflowComments.create({
+        params: { appId },
+        body: {
+          position_x: flowPosition.x,
+          position_y: flowPosition.y,
+          content,
+          mentioned_user_ids: mentionedUserIds,
+        },
       })
 
-      const createdAt = Number(newComment.created_at)
-      const createdAtSeconds = Number.isNaN(createdAt)
-        ? Math.floor(Date.parse(newComment.created_at) / 1000)
-        : createdAt
+      const createdAtSeconds = normalizeTimestamp(newComment.created_at)
       const createdByAccount = {
         id: userProfile?.id ?? '',
         name: userProfile?.name ?? '',
@@ -151,7 +168,7 @@ export const useWorkflowComment = () => {
         avatar_url: userProfile?.avatar_url || userProfile?.avatar || undefined,
       }
       const mentionedUsers = mentionedUserIds
-        .map(mentionedId => mentionableUsers.find(user => user.id === mentionedId))
+        .map(mentionedId => mentionableUserById.get(mentionedId))
         .filter((user): user is NonNullable<typeof user> => Boolean(user))
       const uniqueParticipantsMap = new Map<string, typeof createdByAccount>()
       if (createdByAccount.id)
@@ -196,7 +213,7 @@ export const useWorkflowComment = () => {
         replies: [],
         mentions: mentionedUserIds.map(mentionedId => ({
           mentioned_user_id: mentionedId,
-          mentioned_user_account: mentionableUsers.find(user => user.id === mentionedId) ?? null,
+          mentioned_user_account: mentionableUserById.get(mentionedId) ?? null,
           reply_id: null,
         })),
       }
@@ -218,7 +235,7 @@ export const useWorkflowComment = () => {
       setPendingComment(null)
       setCommentQuickAdd(false)
     }
-  }, [appId, pendingComment, setPendingComment, setCommentQuickAdd, reactflow, comments, setComments, userProfile, setCommentDetailCache, mentionableUsers])
+  }, [appId, pendingComment, setPendingComment, setCommentQuickAdd, reactflow, comments, setComments, userProfile, setCommentDetailCache, mentionableUserById])
 
   const handleCommentCancel = useCallback(() => {
     setPendingComment(null)
@@ -241,8 +258,8 @@ export const useWorkflowComment = () => {
     activeCommentIdRef.current = comment.id
     setActiveCommentId(comment.id)
 
-    const cachedDetail = commentDetailCacheRef.current[comment.id]!
-    setActiveComment(cachedDetail || comment)
+    const cachedDetail = commentDetailCacheRef.current[comment.id]
+    setActiveComment(cachedDetail ?? toCommentDetailPreview(comment))
 
     const hasSelectedNode = reactflow.getNodes().some(node => node.data?.selected)
     const commentPanelWidth = controlMode === ControlMode.Comment ? 420 : 0
@@ -267,8 +284,9 @@ export const useWorkflowComment = () => {
     setActiveCommentLoading(!cachedDetail)
 
     try {
-      const detailResponse = await fetchWorkflowComment(appId, comment.id) as CommentDetailResponse
-      const detail = getCommentDetail(detailResponse)
+      const detail = await consoleClient.workflowComments.detail({
+        params: { appId, commentId: comment.id },
+      })
 
       commentDetailCacheRef.current = {
         ...commentDetailCacheRef.current,
@@ -304,7 +322,9 @@ export const useWorkflowComment = () => {
 
     setActiveCommentLoading(true)
     try {
-      await resolveWorkflowComment(appId, commentId)
+      await consoleClient.workflowComments.resolve({
+        params: { appId, commentId },
+      })
 
       collaborationManager.emitCommentsUpdate(appId)
 
@@ -325,7 +345,9 @@ export const useWorkflowComment = () => {
 
     setActiveCommentLoading(true)
     try {
-      await deleteWorkflowComment(appId, commentId)
+      await consoleClient.workflowComments.delete({
+        params: { appId, commentId },
+      })
 
       collaborationManager.emitCommentsUpdate(appId)
 
@@ -399,10 +421,13 @@ export const useWorkflowComment = () => {
     }
 
     try {
-      await updateWorkflowComment(appId, commentId, {
-        content: targetComment.content,
-        position_x: nextPosition.position_x,
-        position_y: nextPosition.position_y,
+      await consoleClient.workflowComments.update({
+        params: { appId, commentId },
+        body: {
+          content: targetComment.content,
+          position_x: nextPosition.position_x,
+          position_y: nextPosition.position_y,
+        },
       })
       collaborationManager.emitCommentsUpdate(appId)
     }
@@ -443,11 +468,14 @@ export const useWorkflowComment = () => {
       return
 
     try {
-      await updateWorkflowComment(appId, commentId, {
-        content: trimmed,
-        position_x: positionX,
-        position_y: positionY,
-        mentioned_user_ids: mentionedUserIds,
+      await consoleClient.workflowComments.update({
+        params: { appId, commentId },
+        body: {
+          content: trimmed,
+          position_x: positionX,
+          position_y: positionY,
+          mentioned_user_ids: mentionedUserIds,
+        },
       })
 
       collaborationManager.emitCommentsUpdate(appId)
@@ -469,7 +497,10 @@ export const useWorkflowComment = () => {
 
     setReplySubmitting(true)
     try {
-      await createWorkflowCommentReply(appId, commentId, { content: trimmed, mentioned_user_ids: mentionedUserIds })
+      await consoleClient.workflowComments.replies.create({
+        params: { appId, commentId },
+        body: { content: trimmed, mentioned_user_ids: mentionedUserIds },
+      })
 
       collaborationManager.emitCommentsUpdate(appId)
 
@@ -493,7 +524,10 @@ export const useWorkflowComment = () => {
 
     setReplyUpdating(true)
     try {
-      await updateWorkflowCommentReply(appId, commentId, replyId, { content: trimmed, mentioned_user_ids: mentionedUserIds })
+      await consoleClient.workflowComments.replies.update({
+        params: { appId, commentId, replyId },
+        body: { content: trimmed, mentioned_user_ids: mentionedUserIds },
+      })
 
       collaborationManager.emitCommentsUpdate(appId)
 
@@ -514,7 +548,9 @@ export const useWorkflowComment = () => {
 
     setActiveCommentLoading(true)
     try {
-      await deleteWorkflowCommentReply(appId, commentId, replyId)
+      await consoleClient.workflowComments.replies.delete({
+        params: { appId, commentId, replyId },
+      })
 
       collaborationManager.emitCommentsUpdate(appId)
 
diff --git a/web/app/components/workflow/index.tsx b/web/app/components/workflow/index.tsx
index 8598904cb7..d946ad4a97 100644
--- a/web/app/components/workflow/index.tsx
+++ b/web/app/components/workflow/index.tsx
@@ -81,7 +81,6 @@ import EdgeContextmenu from './edge-contextmenu'
 import HelpLine from './help-line'
 import {
   useEdgesInteractions,
-  useLeaderRestoreListener,
   useNodesInteractions,
   useNodesReadOnly,
   useNodesSyncDraft,
@@ -214,6 +213,8 @@ export const Workflow: FC<WorkflowProps> = memo(({
   const bottomPanelHeight = useStore(s => s.bottomPanelHeight)
   const setWorkflowCanvasWidth = useStore(s => s.setWorkflowCanvasWidth)
   const setWorkflowCanvasHeight = useStore(s => s.setWorkflowCanvasHeight)
+  const workflowCanvasSizeRef = useRef<{ width?: number, height?: number }>({})
+  const workflowCanvasResizeFrameRef = useRef<number | undefined>(undefined)
   const controlHeight = useMemo(() => {
     if (!workflowCanvasHeight)
       return '100%'
@@ -223,15 +224,33 @@ export const Workflow: FC<WorkflowProps> = memo(({
   // update workflow Canvas width and height
   useEffect(() => {
     if (workflowContainerRef.current) {
+      const updateWorkflowCanvasSize = (width: number, height: number) => {
+        if (workflowCanvasSizeRef.current.width === width && workflowCanvasSizeRef.current.height === height)
+          return
+
+        workflowCanvasSizeRef.current = { width, height }
+        if (workflowCanvasResizeFrameRef.current)
+          cancelAnimationFrame(workflowCanvasResizeFrameRef.current)
+
+        workflowCanvasResizeFrameRef.current = requestAnimationFrame(() => {
+          workflowCanvasResizeFrameRef.current = undefined
+          setWorkflowCanvasWidth(width)
+          setWorkflowCanvasHeight(height)
+        })
+      }
+
       const resizeContainerObserver = new ResizeObserver((entries) => {
         for (const entry of entries) {
           const { inlineSize, blockSize } = entry.borderBoxSize[0]!
-          setWorkflowCanvasWidth(inlineSize)
-          setWorkflowCanvasHeight(blockSize)
+          updateWorkflowCanvasSize(inlineSize, blockSize)
         }
       })
       resizeContainerObserver.observe(workflowContainerRef.current)
       return () => {
+        if (workflowCanvasResizeFrameRef.current) {
+          cancelAnimationFrame(workflowCanvasResizeFrameRef.current)
+          workflowCanvasResizeFrameRef.current = undefined
+        }
         resizeContainerObserver.disconnect()
       }
     }
@@ -277,6 +296,17 @@ export const Workflow: FC<WorkflowProps> = memo(({
       toast.info(t('collaboration.historyAction.generic', { ns: 'workflow' }))
     })
   }, [t])
+
+  useEffect(() => {
+    return collaborationManager.onRestoreIntent((data) => {
+      toast.info(t('versionHistory.action.restoreInProgress', {
+        ns: 'workflow',
+        userName: data.initiatorName,
+        versionName: data.versionName || data.versionId,
+      }))
+    })
+  }, [t])
+
   const {
     handleSyncWorkflowDraft,
     syncWorkflowDraftWhenPageClose,
@@ -533,8 +563,6 @@ export const Workflow: FC<WorkflowProps> = memo(({
   // Initialize workflow node search functionality
   useWorkflowSearch()
 
-  useLeaderRestoreListener()
-
   // Set up scroll to node event listener using the utility function
   useEffect(() => {
     return setupScrollToNodeListener(nodes, reactflow)
diff --git a/web/app/components/workflow/node-actions-menu/__tests__/details.spec.tsx b/web/app/components/workflow/node-actions-menu/__tests__/details.spec.tsx
index 0a510f9828..49edc6aa87 100644
--- a/web/app/components/workflow/node-actions-menu/__tests__/details.spec.tsx
+++ b/web/app/components/workflow/node-actions-menu/__tests__/details.spec.tsx
@@ -226,6 +226,11 @@ describe('node actions menu details', () => {
     const user = userEvent.setup()
     renderDropdownContent()
 
+    const deleteMenuItem = screen.getByText('common.operation.delete').closest('[role="menuitem"]')
+    expect(deleteMenuItem).toHaveAttribute('data-variant', 'default')
+    expect(deleteMenuItem).toHaveClass('text-text-secondary')
+    expect(deleteMenuItem).toHaveClass('data-highlighted:text-text-destructive')
+
     await user.click(screen.getByText('workflow.panel.runThisStep'))
     await user.click(screen.getByText('workflow.common.copy'))
     await user.click(screen.getByText('workflow.common.duplicate'))
diff --git a/web/app/components/workflow/node-actions-menu/context-menu-content.tsx b/web/app/components/workflow/node-actions-menu/context-menu-content.tsx
index 8548450d59..0cbb1bccaa 100644
--- a/web/app/components/workflow/node-actions-menu/context-menu-content.tsx
+++ b/web/app/components/workflow/node-actions-menu/context-menu-content.tsx
@@ -8,6 +8,7 @@ import {
 import { useTranslation } from 'react-i18next'
 import { ChangeBlockMenuTrigger } from './change-block-menu-trigger'
 import {
+  NODE_ACTIONS_MENU_DELETE_ITEM_CLASS_NAME,
   NODE_ACTIONS_MENU_ITEM_WITH_SHORTCUT_CLASS_NAME,
   NodeActionsMenuAbout,
   NodeActionsMenuItemContent,
@@ -64,8 +65,7 @@ export function NodeActionsContextMenuContent(props: NodeActionsMenuProps) {
       {hasDeleteGroup && (
         <ContextMenuGroup>
           <ContextMenuItem
-            variant="destructive"
-            className={NODE_ACTIONS_MENU_ITEM_WITH_SHORTCUT_CLASS_NAME}
+            className={NODE_ACTIONS_MENU_DELETE_ITEM_CLASS_NAME}
             onClick={model.handleDelete}
           >
             <NodeActionsMenuItemContent shortcut="workflow.delete">
diff --git a/web/app/components/workflow/node-actions-menu/dropdown-content.tsx b/web/app/components/workflow/node-actions-menu/dropdown-content.tsx
index 25d793c5f3..8d79b706f7 100644
--- a/web/app/components/workflow/node-actions-menu/dropdown-content.tsx
+++ b/web/app/components/workflow/node-actions-menu/dropdown-content.tsx
@@ -8,6 +8,7 @@ import {
 import { useTranslation } from 'react-i18next'
 import { ChangeBlockMenuTrigger } from './change-block-menu-trigger'
 import {
+  NODE_ACTIONS_MENU_DELETE_ITEM_CLASS_NAME,
   NODE_ACTIONS_MENU_ITEM_WITH_SHORTCUT_CLASS_NAME,
   NodeActionsMenuAbout,
   NodeActionsMenuItemContent,
@@ -64,8 +65,7 @@ export function NodeActionsDropdownContent(props: NodeActionsMenuProps) {
       {hasDeleteGroup && (
         <DropdownMenuGroup>
           <DropdownMenuItem
-            variant="destructive"
-            className={NODE_ACTIONS_MENU_ITEM_WITH_SHORTCUT_CLASS_NAME}
+            className={NODE_ACTIONS_MENU_DELETE_ITEM_CLASS_NAME}
             onClick={model.handleDelete}
           >
             <NodeActionsMenuItemContent shortcut="workflow.delete">
diff --git a/web/app/components/workflow/node-actions-menu/shared.tsx b/web/app/components/workflow/node-actions-menu/shared.tsx
index a150025575..502629396a 100644
--- a/web/app/components/workflow/node-actions-menu/shared.tsx
+++ b/web/app/components/workflow/node-actions-menu/shared.tsx
@@ -5,6 +5,7 @@ import { ShortcutKbd } from '@/app/components/workflow/shortcuts/shortcut-kbd'
 
 export const NODE_ACTIONS_MENU_WIDTH_CLASS_NAME = 'w-[240px] rounded-lg'
 export const NODE_ACTIONS_MENU_ITEM_WITH_SHORTCUT_CLASS_NAME = 'w-auto justify-between gap-4'
+export const NODE_ACTIONS_MENU_DELETE_ITEM_CLASS_NAME = `${NODE_ACTIONS_MENU_ITEM_WITH_SHORTCUT_CLASS_NAME} text-text-secondary data-highlighted:bg-state-destructive-hover data-highlighted:text-text-destructive`
 
 export function NodeActionsMenuItemContent({
   children,
diff --git a/web/app/components/workflow/nodes/_base/components/__tests__/form-input-item.branches.spec.tsx b/web/app/components/workflow/nodes/_base/components/__tests__/form-input-item.branches.spec.tsx
index 2e95473bb2..9ca932e54c 100644
--- a/web/app/components/workflow/nodes/_base/components/__tests__/form-input-item.branches.spec.tsx
+++ b/web/app/components/workflow/nodes/_base/components/__tests__/form-input-item.branches.spec.tsx
@@ -1,6 +1,8 @@
 import type { ComponentProps } from 'react'
 import type { CredentialFormSchema, FormOption } from '@/app/components/header/account-setting/model-provider-page/declarations'
+import type { AppSelectorValue } from '@/app/components/plugins/plugin-detail-panel/app-selector'
 import { fireEvent, screen, waitFor } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
 import { FormTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import { PluginCategoryEnum } from '@/app/components/plugins/types'
 import { renderWorkflowFlowComponent } from '@/app/components/workflow/__tests__/workflow-test-env'
@@ -45,8 +47,8 @@ vi.mock('@/app/components/workflow/hooks', () => ({
 }))
 
 vi.mock('@/app/components/plugins/plugin-detail-panel/app-selector', () => ({
-  default: ({ onSelect }: { onSelect: (value: string) => void }) => (
-    <button onClick={() => onSelect('app-1')}>app-selector</button>
+  AppSelector: ({ onSelect }: { onSelect: (value: AppSelectorValue) => void }) => (
+    <button onClick={() => onSelect({ app_id: 'app-1', inputs: {}, files: [] })}>app-selector</button>
   ),
 }))
 
@@ -206,7 +208,8 @@ describe('FormInputItem branches', () => {
     })
   })
 
-  it('should render static multi-select values and update selected labels', () => {
+  it('should render static multi-select values and update selected labels', async () => {
+    const user = userEvent.setup()
     const { onChange } = renderFormInputItem({
       schema: createSchema({
         multiple: true,
@@ -225,8 +228,8 @@ describe('FormInputItem branches', () => {
     })
 
     expect(screen.getByText('alpha')).toBeInTheDocument()
-    fireEvent.click(screen.getByText('alpha').closest('button') as HTMLButtonElement)
-    fireEvent.click(screen.getByText('beta'))
+    await user.click(screen.getByRole('combobox', { name: 'alpha' }))
+    await user.click(await screen.findByRole('option', { name: 'beta' }))
 
     expect(onChange).toHaveBeenCalledWith({
       field: {
@@ -341,7 +344,11 @@ describe('FormInputItem branches', () => {
     expect(app.onChange).toHaveBeenCalledWith({
       field: {
         type: VarKindType.constant,
-        value: 'app-1',
+        value: {
+          app_id: 'app-1',
+          inputs: {},
+          files: [],
+        },
       },
     })
 
diff --git a/web/app/components/workflow/nodes/_base/components/__tests__/form-input-item.sections.spec.tsx b/web/app/components/workflow/nodes/_base/components/__tests__/form-input-item.sections.spec.tsx
index 9a98e60483..34382f2be0 100644
--- a/web/app/components/workflow/nodes/_base/components/__tests__/form-input-item.sections.spec.tsx
+++ b/web/app/components/workflow/nodes/_base/components/__tests__/form-input-item.sections.spec.tsx
@@ -1,4 +1,5 @@
-import { fireEvent, screen } from '@testing-library/react'
+import { screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
 import { renderWorkflowComponent } from '@/app/components/workflow/__tests__/workflow-test-env'
 import {
   JsonEditorField,
@@ -18,7 +19,7 @@ describe('form-input-item sections', () => {
       />,
     )
 
-    expect(screen.getByText('Loading...')).toBeInTheDocument()
+    expect(screen.getByRole('combobox', { name: 'Options' })).toHaveTextContent('Loading')
   })
 
   it('should render the shared json editor section', () => {
@@ -33,7 +34,8 @@ describe('form-input-item sections', () => {
     expect(screen.getByText('JSON')).toBeInTheDocument()
   })
 
-  it('should render placeholder, icons, and select multi-select options', () => {
+  it('should render placeholder, icons, and select multi-select options', async () => {
+    const user = userEvent.setup()
     const onChange = vi.fn()
 
     renderWorkflowComponent(
@@ -51,8 +53,8 @@ describe('form-input-item sections', () => {
     )
 
     expect(screen.getByText('Choose options')).toBeInTheDocument()
-    fireEvent.click(screen.getByRole('button'))
-    fireEvent.click(screen.getByText('Alpha'))
+    await user.click(screen.getByRole('combobox', { name: 'Choose options' }))
+    await user.click(await screen.findByRole('option', { name: 'Alpha' }))
 
     expect(document.querySelector('img[src="/alpha.svg"]')).toBeInTheDocument()
     expect(onChange).toHaveBeenCalled()
diff --git a/web/app/components/workflow/nodes/_base/components/agent-strategy-selector.tsx b/web/app/components/workflow/nodes/_base/components/agent-strategy-selector.tsx
index 765c8ea76a..b8ddfef0b4 100644
--- a/web/app/components/workflow/nodes/_base/components/agent-strategy-selector.tsx
+++ b/web/app/components/workflow/nodes/_base/components/agent-strategy-selector.tsx
@@ -231,7 +231,6 @@ export const AgentStrategySelector = memo((props: AgentStrategySelectorProps) =>
         placement="bottom"
         sideOffset={0}
         popupClassName="border-none bg-transparent p-0 shadow-none backdrop-blur-none"
-        positionerProps={{ style: { zIndex: 10 } }}
       >
         <div className="w-[388px] overflow-hidden rounded-md border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow">
           <header className="flex gap-1 p-2">
diff --git a/web/app/components/workflow/nodes/_base/components/before-run-form/bool-input.tsx b/web/app/components/workflow/nodes/_base/components/before-run-form/bool-input.tsx
index 00e4f165e4..e38247f9ce 100644
--- a/web/app/components/workflow/nodes/_base/components/before-run-form/bool-input.tsx
+++ b/web/app/components/workflow/nodes/_base/components/before-run-form/bool-input.tsx
@@ -1,9 +1,9 @@
 'use client'
 import type { FC } from 'react'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import * as React from 'react'
 import { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
-import Checkbox from '@/app/components/base/checkbox'
 
 type Props = {
   name: string
@@ -21,22 +21,22 @@ const BoolInput: FC<Props> = ({
   readonly,
 }) => {
   const { t } = useTranslation()
-  const handleChange = useCallback(() => {
-    onChange(!value)
-  }, [value, onChange])
+  const handleChange = useCallback((checked: boolean) => {
+    onChange(checked)
+  }, [onChange])
   return (
-    <div className="flex h-6 items-center gap-2">
+    <label className="flex h-6 items-center gap-2">
       <Checkbox
         className="h-4! w-4!"
         checked={!!value}
-        onCheck={handleChange}
+        onCheckedChange={handleChange}
         disabled={readonly}
       />
       <div className="flex items-center gap-1 system-sm-medium text-text-secondary">
         {name}
         {!required && <span className="system-xs-regular text-text-tertiary">{t('panel.optional', { ns: 'workflow' })}</span>}
       </div>
-    </div>
+    </label>
   )
 }
 export default React.memo(BoolInput)
diff --git a/web/app/components/workflow/nodes/_base/components/before-run-form/form-item.tsx b/web/app/components/workflow/nodes/_base/components/before-run-form/form-item.tsx
index d17ed23a28..e13b769176 100644
--- a/web/app/components/workflow/nodes/_base/components/before-run-form/form-item.tsx
+++ b/web/app/components/workflow/nodes/_base/components/before-run-form/form-item.tsx
@@ -191,7 +191,7 @@ const FormItem: FC<Props> = ({
               <SelectTrigger className="w-full">
                 {String(value || payload.default || t('placeholder.select', { ns: 'common' }))}
               </SelectTrigger>
-              <SelectContent popupClassName="w-(--anchor-width)">
+              <SelectContent>
                 {(payload.options || []).map(option => (
                   <SelectItem key={option} value={option}>
                     <SelectItemText>{option}</SelectItemText>
diff --git a/web/app/components/workflow/nodes/_base/components/before-run-form/form.tsx b/web/app/components/workflow/nodes/_base/components/before-run-form/form.tsx
index 55732ff1cb..e073011321 100644
--- a/web/app/components/workflow/nodes/_base/components/before-run-form/form.tsx
+++ b/web/app/components/workflow/nodes/_base/components/before-run-form/form.tsx
@@ -5,6 +5,7 @@ import { cn } from '@langgenius/dify-ui/cn'
 import { produce } from 'immer'
 import * as React from 'react'
 import { useCallback, useEffect, useMemo, useRef } from 'react'
+import { useTranslation } from 'react-i18next'
 import { RETRIEVAL_OUTPUT_STRUCT } from '@/app/components/workflow/constants'
 import { InputVarType } from '@/app/components/workflow/types'
 import FormItem from './form-item'
@@ -24,6 +25,7 @@ const Form: FC<Props> = ({
   values,
   onChange,
 }) => {
+  const { t } = useTranslation()
   const mapKeysWithSameValueSelector = useMemo(() => {
     const keysWithSameValueSelector = (key: string) => {
       const targetValueSelector = inputs.find(
@@ -80,9 +82,14 @@ const Form: FC<Props> = ({
         <div className="mb-1 flex items-center justify-between">
           <div className="flex h-6 items-center system-xs-medium-uppercase text-text-tertiary">{label}</div>
           {isArrayLikeType && !isIteratorItemFile && (
-            <div className="cursor-pointer rounded-md p-1 select-none hover:bg-state-base-hover" onClick={handleAddContext} data-testid="add-button">
-              <span className="i-ri-add-line h-4 w-4 text-text-tertiary" />
-            </div>
+            <button
+              type="button"
+              aria-label={`${t('operation.add', { ns: 'common' })} ${label}`}
+              className="cursor-pointer rounded-md border-none bg-transparent p-1 select-none hover:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+              onClick={handleAddContext}
+            >
+              <span className="i-ri-add-line h-4 w-4 text-text-tertiary" aria-hidden="true" />
+            </button>
           )}
         </div>
       )}
diff --git a/web/app/components/workflow/nodes/_base/components/error-handle/__tests__/index.spec.tsx b/web/app/components/workflow/nodes/_base/components/error-handle/__tests__/index.spec.tsx
index 9521f9b307..392f8e5a2a 100644
--- a/web/app/components/workflow/nodes/_base/components/error-handle/__tests__/index.spec.tsx
+++ b/web/app/components/workflow/nodes/_base/components/error-handle/__tests__/index.spec.tsx
@@ -149,7 +149,7 @@ describe('error-handle path', () => {
       await user.click(screen.getByRole('button'))
       await user.click(screen.getByText('workflow.nodes.common.errorHandle.defaultValue.title'))
 
-      expect(onSelected).toHaveBeenCalledWith(ErrorHandleTypeEnum.defaultValue)
+      expect(onSelected.mock.calls[0]?.[0]).toBe(ErrorHandleTypeEnum.defaultValue)
     })
 
     it('should render the error tip only when a strategy exists', () => {
diff --git a/web/app/components/workflow/nodes/_base/components/error-handle/error-handle-type-selector.tsx b/web/app/components/workflow/nodes/_base/components/error-handle/error-handle-type-selector.tsx
index 07b6519e41..c83057a6c0 100644
--- a/web/app/components/workflow/nodes/_base/components/error-handle/error-handle-type-selector.tsx
+++ b/web/app/components/workflow/nodes/_base/components/error-handle/error-handle-type-selector.tsx
@@ -1,15 +1,16 @@
 import { Button } from '@langgenius/dify-ui/button'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuTrigger,
+} from '@langgenius/dify-ui/dropdown-menu'
 import {
   RiArrowDownSLine,
   RiCheckLine,
 } from '@remixicon/react'
-import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
 import { ErrorHandleTypeEnum } from './types'
 
 type ErrorHandleTypeSelectorProps = {
@@ -21,7 +22,6 @@ const ErrorHandleTypeSelector = ({
   onSelected,
 }: ErrorHandleTypeSelectorProps) => {
   const { t } = useTranslation()
-  const [open, setOpen] = useState(false)
   const options = [
     {
       value: ErrorHandleTypeEnum.none,
@@ -42,37 +42,38 @@ const ErrorHandleTypeSelector = ({
   const selectedOption = options.find(option => option.value === value)
 
   return (
-    <PortalToFollowElem
-      open={open}
-      onOpenChange={setOpen}
-      placement="bottom-end"
-      offset={4}
-    >
-      <PortalToFollowElemTrigger onClick={(e) => {
-        e.stopPropagation()
-        e.nativeEvent.stopImmediatePropagation()
-        setOpen(v => !v)
-      }}
+    <DropdownMenu>
+      <DropdownMenuTrigger
+        render={(
+          <Button
+            size="small"
+            onClick={(e) => {
+              e.stopPropagation()
+            }}
+          />
+        )}
       >
-        <Button
-          size="small"
+        {selectedOption?.label}
+        <RiArrowDownSLine className="h-3.5 w-3.5" />
+      </DropdownMenuTrigger>
+      <DropdownMenuContent
+        placement="bottom-end"
+        sideOffset={4}
+        popupClassName="w-[280px] rounded-xl border-[0.5px] bg-components-panel-bg-blur p-1"
+      >
+        <DropdownMenuRadioGroup
+          value={value}
+          onValueChange={onSelected}
         >
-          {selectedOption?.label}
-          <RiArrowDownSLine className="h-3.5 w-3.5" />
-        </Button>
-      </PortalToFollowElemTrigger>
-      <PortalToFollowElemContent className="z-11">
-        <div className="w-[280px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur p-1 shadow-lg">
           {
             options.map(option => (
-              <div
+              <DropdownMenuRadioItem
                 key={option.value}
-                className="flex cursor-pointer rounded-lg p-2 pr-3 hover:bg-state-base-hover"
+                value={option.value}
+                closeOnClick
+                className="h-auto items-start rounded-lg p-2 pr-3"
                 onClick={(e) => {
                   e.stopPropagation()
-                  e.nativeEvent.stopImmediatePropagation()
-                  onSelected(option.value)
-                  setOpen(false)
                 }}
               >
                 <div className="mr-1 w-4 shrink-0">
@@ -86,12 +87,12 @@ const ErrorHandleTypeSelector = ({
                   <div className="mb-0.5 system-sm-semibold text-text-secondary">{option.label}</div>
                   <div className="system-xs-regular text-text-tertiary">{option.description}</div>
                 </div>
-              </div>
+              </DropdownMenuRadioItem>
             ))
           }
-        </div>
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
+        </DropdownMenuRadioGroup>
+      </DropdownMenuContent>
+    </DropdownMenu>
   )
 }
 
diff --git a/web/app/components/workflow/nodes/_base/components/file-type-item.tsx b/web/app/components/workflow/nodes/_base/components/file-type-item.tsx
index 0f1fd9bafa..861d525d9a 100644
--- a/web/app/components/workflow/nodes/_base/components/file-type-item.tsx
+++ b/web/app/components/workflow/nodes/_base/components/file-type-item.tsx
@@ -1,11 +1,11 @@
 'use client'
 import type { FC } from 'react'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import { cn } from '@langgenius/dify-ui/cn'
 import { noop } from 'es-toolkit/function'
 import * as React from 'react'
 import { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
-import Checkbox from '@/app/components/base/checkbox'
 import { FileTypeIcon } from '@/app/components/base/file-uploader'
 import { FILE_EXTS } from '@/app/components/base/prompt-editor/constants'
 import TagInput from '@/app/components/base/tag-input'
@@ -50,7 +50,7 @@ const FileTypeItem: FC<Props> = ({
               <div className="flex items-center border-b border-divider-subtle p-3 pb-2">
                 <FileTypeIcon className="shrink-0" type={type} size="lg" />
                 <div className="mx-2 grow system-sm-medium text-text-primary">{t(`variableConfig.file.${type}.name`, { ns: 'appDebug' })}</div>
-                <Checkbox className="shrink-0" checked={selected} />
+                <Checkbox className="shrink-0" checked={selected} aria-label={t(`variableConfig.file.${type}.name`, { ns: 'appDebug' })} />
               </div>
               <div className="p-3" onClick={e => e.stopPropagation()}>
                 <TagInput
@@ -68,7 +68,7 @@ const FileTypeItem: FC<Props> = ({
                 <div className="system-sm-medium text-text-primary">{t(`variableConfig.file.${type}.name`, { ns: 'appDebug' })}</div>
                 <div className="mt-1 system-2xs-regular-uppercase text-text-tertiary">{type !== SupportUploadFileTypes.custom ? FILE_EXTS[type]!.join(', ') : t('variableConfig.file.custom.description', { ns: 'appDebug' })}</div>
               </div>
-              <Checkbox className="shrink-0" checked={selected} />
+              <Checkbox className="shrink-0" checked={selected} aria-label={t(`variableConfig.file.${type}.name`, { ns: 'appDebug' })} />
             </div>
           )}
 
diff --git a/web/app/components/workflow/nodes/_base/components/form-input-item.sections.tsx b/web/app/components/workflow/nodes/_base/components/form-input-item.sections.tsx
index 84cfb4629d..896250508c 100644
--- a/web/app/components/workflow/nodes/_base/components/form-input-item.sections.tsx
+++ b/web/app/components/workflow/nodes/_base/components/form-input-item.sections.tsx
@@ -2,10 +2,16 @@
 
 import type { FC, ReactElement } from 'react'
 import type { SelectItem } from './form-input-item.helpers'
-import { Listbox, ListboxButton, ListboxOption, ListboxOptions } from '@headlessui/react'
-import { ChevronDownIcon } from '@heroicons/react/20/solid'
 import { cn } from '@langgenius/dify-ui/cn'
-import { RiCheckLine, RiLoader4Line } from '@remixicon/react'
+import {
+  SelectItem as DifySelectItem,
+  Select,
+  SelectContent,
+  SelectItemIndicator,
+  SelectItemText,
+  SelectTrigger,
+} from '@langgenius/dify-ui/select'
+import { RiLoader4Line } from '@remixicon/react'
 import CodeEditor from '@/app/components/workflow/nodes/_base/components/editor/code-editor'
 import { CodeLanguage } from '@/app/components/workflow/nodes/code/types'
 
@@ -20,20 +26,7 @@ type MultiSelectFieldProps = {
 }
 
 const LoadingIndicator = () => (
-  <RiLoader4Line className="h-3.5 w-3.5 animate-spin text-text-secondary" />
-)
-
-const ToggleIndicator = () => (
-  <ChevronDownIcon
-    className="h-4 w-4 text-text-quaternary group-hover/simple-select:text-text-secondary"
-    aria-hidden="true"
-  />
-)
-
-const SelectedMark = () => (
-  <span className="absolute inset-y-0 right-0 flex items-center pr-2 text-text-accent">
-    <RiCheckLine className="h-4 w-4" aria-hidden="true" />
-  </span>
+  <RiLoader4Line className="mr-1 h-3.5 w-3.5 shrink-0 animate-spin text-text-secondary motion-reduce:animate-none" aria-hidden="true" />
 )
 
 export const MultiSelectField: FC<MultiSelectFieldProps> = ({
@@ -56,48 +49,44 @@ export const MultiSelectField: FC<MultiSelectFieldProps> = ({
 
   const renderLabel = () => {
     if (isLoading)
-      return 'Loading...'
+      return 'Loading…'
 
     return selectedLabel || placeholder || 'Select options'
   }
 
   return (
-    <Listbox multiple value={value} onChange={onChange} disabled={disabled}>
-      <div className="group/simple-select relative h-8 grow">
-        <ListboxButton className="flex h-full w-full cursor-pointer items-center rounded-lg border-0 bg-components-input-bg-normal pr-10 pl-3 group-hover/simple-select:bg-state-base-hover-alt focus-visible:bg-state-base-hover-alt focus-visible:outline-hidden sm:text-sm sm:leading-6">
-          <span className={textClassName}>
+    <Select multiple value={value} onValueChange={onChange} disabled={disabled || isLoading}>
+      <div className="grow">
+        <SelectTrigger aria-label={placeholder || selectedLabel || 'Options'}>
+          <span className={cn('flex min-w-0 items-center', textClassName)}>
+            {isLoading && <LoadingIndicator />}
             {renderLabel()}
           </span>
-          <span className="absolute inset-y-0 right-0 flex items-center pr-2">
-            {isLoading ? <LoadingIndicator /> : <ToggleIndicator />}
-          </span>
-        </ListboxButton>
-        <ListboxOptions className="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur px-1 py-1 text-base shadow-lg backdrop-blur-xs focus:outline-hidden sm:text-sm">
+        </SelectTrigger>
+        <SelectContent
+          popupClassName="w-(--anchor-width) bg-components-panel-bg-blur backdrop-blur-xs"
+          listClassName="max-h-60"
+        >
           {items.map(item => (
-            <ListboxOption
+            <DifySelectItem
               key={item.value}
               value={item.value}
-              className={({ focus }) =>
-                cn('relative cursor-pointer rounded-lg py-2 pr-9 pl-3 text-text-secondary select-none hover:bg-state-base-hover', focus && 'bg-state-base-hover')}
+              className="h-auto py-2 pr-9 pl-3"
             >
-              {({ selected }) => (
-                <>
-                  <div className="flex items-center">
-                    {item.icon && (
-                      <img src={item.icon} alt="" className="mr-2 h-4 w-4" />
-                    )}
-                    <span className={cn('block truncate', selected && 'font-normal')}>
-                      {item.name}
-                    </span>
-                  </div>
-                  {selected && <SelectedMark />}
-                </>
-              )}
-            </ListboxOption>
+              <div className="flex min-w-0 items-center">
+                {item.icon && (
+                  <img src={item.icon} alt="" width={16} height={16} className="mr-2 h-4 w-4 shrink-0" />
+                )}
+                <SelectItemText>
+                  {item.name}
+                </SelectItemText>
+              </div>
+              <SelectItemIndicator />
+            </DifySelectItem>
           ))}
-        </ListboxOptions>
+        </SelectContent>
       </div>
-    </Listbox>
+    </Select>
   )
 }
 
diff --git a/web/app/components/workflow/nodes/_base/components/form-input-item.tsx b/web/app/components/workflow/nodes/_base/components/form-input-item.tsx
index 369f2682b0..88b65f3ab9 100644
--- a/web/app/components/workflow/nodes/_base/components/form-input-item.tsx
+++ b/web/app/components/workflow/nodes/_base/components/form-input-item.tsx
@@ -8,10 +8,10 @@ import type { ToolWithProvider, ValueSelector, Var } from '@/app/components/work
 import { cn } from '@langgenius/dify-ui/cn'
 import { Select, SelectContent, SelectItem, SelectItemIndicator, SelectItemText, SelectTrigger } from '@langgenius/dify-ui/select'
 import { useEffect, useMemo, useState } from 'react'
-import CheckboxList from '@/app/components/base/checkbox-list'
+import { CheckboxList } from '@/app/components/base/checkbox-list'
 import Input from '@/app/components/base/input'
 import { useLanguage } from '@/app/components/header/account-setting/model-provider-page/hooks'
-import AppSelector from '@/app/components/plugins/plugin-detail-panel/app-selector'
+import { AppSelector } from '@/app/components/plugins/plugin-detail-panel/app-selector'
 import ModelParameterModal from '@/app/components/plugins/plugin-detail-panel/model-selector'
 import { PluginCategoryEnum } from '@/app/components/plugins/types'
 import VarReferencePicker from '@/app/components/workflow/nodes/_base/components/variable/var-reference-picker'
@@ -65,7 +65,6 @@ const FormInputItem: FC<Props> = ({
   schema,
   value,
   onChange,
-  inPanel,
   currentTool,
   currentProvider,
   showManageInputField,
@@ -329,7 +328,7 @@ const FormInputItem: FC<Props> = ({
           <SelectTrigger className="h-8 grow">
             {selectedStaticOption?.name ?? placeholder?.[language] ?? placeholder?.en_US}
           </SelectTrigger>
-          <SelectContent popupClassName="w-(--anchor-width)">
+          <SelectContent>
             {staticSelectItems.map(item => (
               <SelectItem key={item.value} value={item.value}>
                 {item.icon && (
@@ -361,7 +360,7 @@ const FormInputItem: FC<Props> = ({
           <SelectTrigger className="h-8 grow">
             {selectedDynamicOption?.name ?? (isLoadingOptions ? 'Loading...' : (placeholder?.[language] ?? placeholder?.en_US))}
           </SelectTrigger>
-          <SelectContent popupClassName="w-(--anchor-width)">
+          <SelectContent>
             {dynamicSelectItems.map(item => (
               <SelectItem key={item.value} value={item.value}>
                 {item.icon && (
@@ -413,7 +412,6 @@ const FormInputItem: FC<Props> = ({
       )}
       {showVariableSelector && (
         <VarReferencePicker
-          zIndex={inPanel ? 1000 : undefined}
           className="h-8 grow"
           readonly={readOnly}
           isShowNodeName
diff --git a/web/app/components/workflow/nodes/_base/components/layout/__tests__/field-title.spec.tsx b/web/app/components/workflow/nodes/_base/components/layout/__tests__/field-title.spec.tsx
index c11b5ecfc8..371a68fe49 100644
--- a/web/app/components/workflow/nodes/_base/components/layout/__tests__/field-title.spec.tsx
+++ b/web/app/components/workflow/nodes/_base/components/layout/__tests__/field-title.spec.tsx
@@ -1,12 +1,6 @@
 import { fireEvent, render, screen } from '@testing-library/react'
 import { FieldTitle } from '../field-title'
 
-vi.mock('@langgenius/dify-ui/tooltip', () => ({
-  Tooltip: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
-  TooltipTrigger: ({ render }: { render: React.ReactNode }) => <>{render}</>,
-  TooltipContent: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
-}))
-
 describe('FieldTitle', () => {
   it('should render title, subtitle, operation, tooltip and warning dot', () => {
     render(
@@ -21,7 +15,7 @@ describe('FieldTitle', () => {
 
     expect(screen.getByText('Embedding')).toBeInTheDocument()
     expect(screen.getByText('subtitle')).toBeInTheDocument()
-    expect(screen.getByText('Tooltip copy')).toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'Tooltip copy' })).toBeInTheDocument()
     expect(screen.getByRole('button', { name: 'action' })).toBeInTheDocument()
     expect(document.querySelector('.bg-text-warning-secondary')).not.toBeNull()
   })
diff --git a/web/app/components/workflow/nodes/_base/components/layout/field-title.tsx b/web/app/components/workflow/nodes/_base/components/layout/field-title.tsx
index ce080fb6dd..070b932605 100644
--- a/web/app/components/workflow/nodes/_base/components/layout/field-title.tsx
+++ b/web/app/components/workflow/nodes/_base/components/layout/field-title.tsx
@@ -1,10 +1,10 @@
 import type { ReactNode } from 'react'
 import { cn } from '@langgenius/dify-ui/cn'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import {
   memo,
   useState,
 } from 'react'
+import { Infotip } from '@/app/components/base/infotip'
 
 export type FieldTitleProps = {
   title?: string
@@ -62,18 +62,9 @@ export const FieldTitle = memo(({
           }
           {
             tooltip && (
-              <Tooltip>
-                <TooltipTrigger
-                  render={(
-                    <span className="ml-1 flex h-4 w-4 shrink-0 items-center justify-center">
-                      <span aria-hidden className="i-ri-question-line h-3.5 w-3.5 text-text-quaternary hover:text-text-tertiary" />
-                    </span>
-                  )}
-                />
-                <TooltipContent>
-                  {tooltip}
-                </TooltipContent>
-              </Tooltip>
+              <Infotip aria-label={tooltip} className="ml-1">
+                {tooltip}
+              </Infotip>
             )
           }
         </div>
diff --git a/web/app/components/workflow/nodes/_base/components/mcp-tool-not-support-tooltip.tsx b/web/app/components/workflow/nodes/_base/components/mcp-tool-not-support-tooltip.tsx
index 671459bbbd..8c2ee7f976 100644
--- a/web/app/components/workflow/nodes/_base/components/mcp-tool-not-support-tooltip.tsx
+++ b/web/app/components/workflow/nodes/_base/components/mcp-tool-not-support-tooltip.tsx
@@ -1,22 +1,23 @@
 'use client'
 import type { FC } from 'react'
+import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
 import { RiAlertFill } from '@remixicon/react'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
-import Tooltip from '@/app/components/base/tooltip'
 
 const McpToolNotSupportTooltip: FC = () => {
   const { t } = useTranslation()
+  const tip = t('detailPanel.toolSelector.unsupportedMCPTool', { ns: 'plugin' })
+
   return (
-    <Tooltip
-      popupContent={(
-        <div className="w-[256px]">
-          {t('detailPanel.toolSelector.unsupportedMCPTool', { ns: 'plugin' })}
-        </div>
-      )}
-    >
-      <RiAlertFill className="size-4 text-text-warning-secondary" />
-    </Tooltip>
+    <Popover>
+      <PopoverTrigger openOnHover aria-label={tip} className="inline-flex border-0 bg-transparent p-0">
+        <RiAlertFill className="size-4 text-text-warning-secondary" />
+      </PopoverTrigger>
+      <PopoverContent popupClassName="w-[256px] px-3 py-2 system-xs-regular text-text-tertiary">
+        {tip}
+      </PopoverContent>
+    </Popover>
   )
 }
 export default React.memo(McpToolNotSupportTooltip)
diff --git a/web/app/components/workflow/nodes/_base/components/switch-plugin-version.tsx b/web/app/components/workflow/nodes/_base/components/switch-plugin-version.tsx
index 141323e5b3..fc2b328950 100644
--- a/web/app/components/workflow/nodes/_base/components/switch-plugin-version.tsx
+++ b/web/app/components/workflow/nodes/_base/components/switch-plugin-version.tsx
@@ -2,13 +2,13 @@
 
 import type { FC, ReactNode } from 'react'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
 import { RiArrowLeftRightLine, RiExternalLinkLine } from '@remixicon/react'
 import { useBoolean } from 'ahooks'
 import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Badge from '@/app/components/base/badge'
 import { Badge as Badge2, BadgeState } from '@/app/components/base/badge/index'
-import Tooltip from '@/app/components/base/tooltip'
 import useGetIcon from '@/app/components/plugins/install-plugin/base/use-get-icon'
 import { pluginManifestToCardPluginProps } from '@/app/components/plugins/install-plugin/utils'
 import PluginMutationModel from '@/app/components/plugins/plugin-mutation-model'
@@ -67,76 +67,91 @@ export const SwitchPluginVersion: FC<SwitchPluginVersionProps> = (props) => {
   if (!uniqueIdentifier || !pluginId)
     return null
 
+  const content = (
+    <div className={cn('flex w-fit items-center justify-center', className)} onClick={e => e.stopPropagation()}>
+      {isShowUpdateModal && pluginDetail && (
+        <PluginMutationModel
+          onCancel={hideUpdateModal}
+          plugin={pluginManifestToCardPluginProps({
+            ...pluginDetail.declaration,
+            icon: icon!,
+          })}
+          mutation={mutation}
+          mutate={install}
+          confirmButtonText={t('nodes.agent.installPlugin.install', { ns: 'workflow' })}
+          cancelButtonText={t('nodes.agent.installPlugin.cancel', { ns: 'workflow' })}
+          modelTitle={t('nodes.agent.installPlugin.title', { ns: 'workflow' })}
+          description={t('nodes.agent.installPlugin.desc', { ns: 'workflow' })}
+          cardTitleLeft={(
+            <>
+              <Badge2 className="mx-1" size="s" state={BadgeState.Warning}>
+                {`${pluginDetail.version} -> ${target!.version}`}
+              </Badge2>
+            </>
+          )}
+          modalBottomLeft={(
+            <Link
+              className="flex items-center justify-center gap-1"
+              href={getMarketplaceUrl(`/plugins/${pluginDetail.declaration.author}/${pluginDetail.declaration.name}`)}
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              <span className="system-xs-regular text-xs text-text-accent">
+                {t('nodes.agent.installPlugin.changelog', { ns: 'workflow' })}
+              </span>
+              <RiExternalLinkLine className="size-3 text-text-accent" />
+            </Link>
+          )}
+        />
+      )}
+      {pluginDetail && (
+        <PluginVersionPicker
+          isShow={isShow}
+          onShowChange={setIsShow}
+          pluginID={pluginId}
+          currentVersion={pluginDetail.version}
+          onSelect={(state) => {
+            setTarget({
+              pluginUniqueIden: state.unique_identifier,
+              version: state.version,
+            })
+            showUpdateModal()
+          }}
+          trigger={(
+            <Badge
+              className={cn(
+                'mx-1 flex hover:bg-state-base-hover',
+                isShow && 'bg-state-base-hover',
+              )}
+              uppercase={true}
+              text={(
+                <>
+                  <div>{pluginDetail.version}</div>
+                  <RiArrowLeftRightLine className="ml-1 h-3 w-3 text-text-tertiary" />
+                </>
+              )}
+              hasRedCornerMark={true}
+            />
+          )}
+        />
+      )}
+    </div>
+  )
+
+  if (!tooltip || isShow || isShowUpdateModal)
+    return content
+
   return (
-    <Tooltip popupContent={!isShow && !isShowUpdateModal && tooltip} triggerMethod="hover">
-      <div className={cn('flex w-fit items-center justify-center', className)} onClick={e => e.stopPropagation()}>
-        {isShowUpdateModal && pluginDetail && (
-          <PluginMutationModel
-            onCancel={hideUpdateModal}
-            plugin={pluginManifestToCardPluginProps({
-              ...pluginDetail.declaration,
-              icon: icon!,
-            })}
-            mutation={mutation}
-            mutate={install}
-            confirmButtonText={t('nodes.agent.installPlugin.install', { ns: 'workflow' })}
-            cancelButtonText={t('nodes.agent.installPlugin.cancel', { ns: 'workflow' })}
-            modelTitle={t('nodes.agent.installPlugin.title', { ns: 'workflow' })}
-            description={t('nodes.agent.installPlugin.desc', { ns: 'workflow' })}
-            cardTitleLeft={(
-              <>
-                <Badge2 className="mx-1" size="s" state={BadgeState.Warning}>
-                  {`${pluginDetail.version} -> ${target!.version}`}
-                </Badge2>
-              </>
-            )}
-            modalBottomLeft={(
-              <Link
-                className="flex items-center justify-center gap-1"
-                href={getMarketplaceUrl(`/plugins/${pluginDetail.declaration.author}/${pluginDetail.declaration.name}`)}
-                target="_blank"
-                rel="noopener noreferrer"
-              >
-                <span className="system-xs-regular text-xs text-text-accent">
-                  {t('nodes.agent.installPlugin.changelog', { ns: 'workflow' })}
-                </span>
-                <RiExternalLinkLine className="size-3 text-text-accent" />
-              </Link>
-            )}
-          />
-        )}
-        {pluginDetail && (
-          <PluginVersionPicker
-            isShow={isShow}
-            onShowChange={setIsShow}
-            pluginID={pluginId}
-            currentVersion={pluginDetail.version}
-            onSelect={(state) => {
-              setTarget({
-                pluginUniqueIden: state.unique_identifier,
-                version: state.version,
-              })
-              showUpdateModal()
-            }}
-            trigger={(
-              <Badge
-                className={cn(
-                  'mx-1 flex hover:bg-state-base-hover',
-                  isShow && 'bg-state-base-hover',
-                )}
-                uppercase={true}
-                text={(
-                  <>
-                    <div>{pluginDetail.version}</div>
-                    <RiArrowLeftRightLine className="ml-1 h-3 w-3 text-text-tertiary" />
-                  </>
-                )}
-                hasRedCornerMark={true}
-              />
-            )}
-          />
-        )}
-      </div>
-    </Tooltip>
+    <Popover>
+      <PopoverTrigger
+        openOnHover
+        nativeButton={false}
+        aria-label={typeof tooltip === 'string' ? tooltip : t('nodes.agent.installPlugin.title', { ns: 'workflow' })}
+        render={content}
+      />
+      <PopoverContent popupClassName="px-3 py-2 system-xs-regular text-text-tertiary">
+        {tooltip}
+      </PopoverContent>
+    </Popover>
   )
 }
diff --git a/web/app/components/workflow/nodes/_base/components/variable/__tests__/var-reference-picker.branches.spec.tsx b/web/app/components/workflow/nodes/_base/components/variable/__tests__/var-reference-picker.branches.spec.tsx
index 2844f683c0..6ed63f361e 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/__tests__/var-reference-picker.branches.spec.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/__tests__/var-reference-picker.branches.spec.tsx
@@ -157,7 +157,7 @@ describe('VarReferencePicker branches', () => {
       value: ['node-a', 'answer'],
     })
 
-    fireEvent.click(screen.getByTestId('var-reference-picker-clear'))
+    fireEvent.click(screen.getByRole('button', { name: /Clear|operation.clear/ }))
 
     expect(onChange).toHaveBeenCalledWith([], VarKindType.variable)
   })
diff --git a/web/app/components/workflow/nodes/_base/components/variable/__tests__/var-reference-picker.spec.tsx b/web/app/components/workflow/nodes/_base/components/variable/__tests__/var-reference-picker.spec.tsx
index b915201ca4..d01f68784d 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/__tests__/var-reference-picker.spec.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/__tests__/var-reference-picker.spec.tsx
@@ -115,7 +115,7 @@ describe('VarReferencePicker', () => {
     expect(screen.getByText('Source Node')).toBeInTheDocument()
     expect(screen.getByText('answer')).toBeInTheDocument()
 
-    fireEvent.click(screen.getByTestId('var-reference-picker-clear'))
+    fireEvent.click(screen.getByRole('button', { name: /Clear|operation.clear/ }))
     expect(onChange).toHaveBeenCalledWith('', 'constant')
   })
 
diff --git a/web/app/components/workflow/nodes/_base/components/variable/__tests__/var-reference-picker.trigger.spec.tsx b/web/app/components/workflow/nodes/_base/components/variable/__tests__/var-reference-picker.trigger.spec.tsx
index a01d2a0387..422cf9cf5a 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/__tests__/var-reference-picker.trigger.spec.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/__tests__/var-reference-picker.trigger.spec.tsx
@@ -96,7 +96,7 @@ describe('VarReferencePickerTrigger', () => {
     fireEvent.click(screen.getByText('Source Node'), { ctrlKey: true })
     expect(handleVariableJump).toHaveBeenCalledWith('node-a')
 
-    fireEvent.click(screen.getByTestId('var-reference-picker-clear'))
+    fireEvent.click(screen.getByRole('button', { name: /Clear|operation.clear/ }))
     expect(handleClearVar).toHaveBeenCalledTimes(1)
   })
 
@@ -131,7 +131,7 @@ describe('VarReferencePickerTrigger', () => {
       varName: 'answer',
     })
 
-    expect(screen.getByTestId('add-button'))!.toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'common.operation.add' }))!.toBeInTheDocument()
   })
 
   it('should stay inert in readonly mode and show value type placeholder badge', () => {
diff --git a/web/app/components/workflow/nodes/_base/components/variable/constant-field.tsx b/web/app/components/workflow/nodes/_base/components/variable/constant-field.tsx
index 9159319de6..e793b5922a 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/constant-field.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/constant-field.tsx
@@ -66,7 +66,7 @@ const ConstantField: FC<Props> = ({
           >
             {selectedOption?.name ?? placeholder?.[language] ?? placeholder?.en_US}
           </SelectTrigger>
-          <SelectContent popupClassName="w-(--anchor-width)">
+          <SelectContent>
             {selectOptions.map(option => (
               <SelectItem key={option.value} value={option.value}>
                 <SelectItemText>{option.name}</SelectItemText>
diff --git a/web/app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/picker/field.tsx b/web/app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/picker/field.tsx
index 7097f60ced..58f55c959d 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/picker/field.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/picker/field.tsx
@@ -43,7 +43,7 @@ const Field: FC<Props> = ({
           disabled={depth !== MAX_DEPTH + 1}
           render={(
             <div
-              className={cn('flex items-center justify-between rounded-md pr-2 outline-none focus:outline-none focus-visible:outline-none', !readonly && 'hover:bg-state-base-hover', depth !== MAX_DEPTH + 1 && 'cursor-pointer')}
+              className={cn('flex items-center justify-between rounded-md pr-2 outline-hidden focus:outline-hidden focus-visible:outline-hidden', !readonly && 'hover:bg-state-base-hover', depth !== MAX_DEPTH + 1 && 'cursor-pointer')}
               onMouseDown={() => !readonly && onSelect?.([...valueSelector, name])}
             >
               <div className="flex grow items-stretch">
diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.trigger.tsx b/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.trigger.tsx
index 3c9c517e55..7d87d69ac5 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.trigger.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.trigger.tsx
@@ -11,6 +11,7 @@ import { PopoverTrigger } from '@langgenius/dify-ui/popover'
 import { PreviewCard, PreviewCardContent, PreviewCardTrigger } from '@langgenius/dify-ui/preview-card'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { RiArrowDownSLine, RiCloseLine, RiErrorWarningFill, RiLoader4Line, RiMoreLine } from '@remixicon/react'
+import { useTranslation } from 'react-i18next'
 import Badge from '@/app/components/base/badge'
 import { Line3 } from '@/app/components/base/icons/src/public/common'
 import { Variable02 } from '@/app/components/base/icons/src/vender/solid/development'
@@ -114,6 +115,7 @@ const VarReferencePickerTrigger: FC<Props> = ({
   varName,
   variableCategory,
 }) => {
+  const { t } = useTranslation()
   const handleTriggerReadonlyClick = (e: React.MouseEvent<HTMLElement>) => {
     if (!readonly)
       return
@@ -252,9 +254,14 @@ const VarReferencePickerTrigger: FC<Props> = ({
         {isAddBtnTrigger
           ? (
               <div>
-                <div className="cursor-pointer rounded-md p-1 select-none hover:bg-state-base-hover" onClick={() => {}} data-testid="add-button">
-                  <span className="i-ri-add-line h-4 w-4 text-text-tertiary" />
-                </div>
+                <button
+                  type="button"
+                  aria-label={t('operation.add', { ns: 'common' })}
+                  className="cursor-pointer rounded-md border-none bg-transparent p-1 select-none hover:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+                  onClick={() => {}}
+                >
+                  <span className="i-ri-add-line h-4 w-4 text-text-tertiary" aria-hidden="true" />
+                </button>
               </div>
             )
           : (
@@ -303,13 +310,14 @@ const VarReferencePickerTrigger: FC<Props> = ({
                     )
                   : resolvedVariablePicker}
                 {(hasValue && !readonly && !isInTable && !isJustShowValue) && (
-                  <div
-                    className="group invisible absolute top-[50%] right-1 h-5 translate-y-[-50%] cursor-pointer rounded-md p-1 group-hover/wrap:visible hover:bg-state-base-hover"
+                  <button
+                    type="button"
+                    aria-label={t('operation.clear', { ns: 'common' })}
+                    className="group invisible absolute top-[50%] right-1 h-5 translate-y-[-50%] cursor-pointer rounded-md border-none bg-transparent p-1 group-hover/wrap:visible hover:bg-state-base-hover"
                     onClick={handleClearVar}
-                    data-testid="var-reference-picker-clear"
                   >
-                    <RiCloseLine className="h-3.5 w-3.5 text-text-tertiary group-hover:text-text-secondary" />
-                  </div>
+                    <RiCloseLine className="h-3.5 w-3.5 text-text-tertiary group-hover:text-text-secondary" aria-hidden="true" />
+                  </button>
                 )}
                 {!hasValue && valueTypePlaceHolder && (
                   <Badge
diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx b/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx
index c2645ee870..3ff9b4a1cb 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx
@@ -82,7 +82,6 @@ type Props = {
   placeholder?: string
   minWidth?: number
   popupFor?: 'assigned' | 'toAssigned'
-  zIndex?: number
   currentTool?: Tool
   currentProvider?: ToolWithProvider | TriggerWithProvider
   preferSchemaType?: boolean
@@ -117,7 +116,6 @@ const VarReferencePicker: FC<Props> = ({
   placeholder,
   minWidth,
   popupFor,
-  zIndex,
   currentTool,
   currentProvider,
   preferSchemaType,
@@ -415,11 +413,6 @@ const VarReferencePicker: FC<Props> = ({
           sideOffset={0}
           className="mt-1"
           popupClassName="border-none bg-transparent p-0 shadow-none backdrop-blur-none"
-          positionerProps={{
-            style: {
-              zIndex: zIndex || 100,
-            },
-          }}
         >
           {!isConstant && (
             <VarReferencePopup
@@ -428,7 +421,6 @@ const VarReferencePicker: FC<Props> = ({
               onChange={handleVarReferenceChange}
               itemWidth={isAddBtnTrigger ? 260 : (minWidth || triggerWidth)}
               isSupportFileVar={isSupportFileVar}
-              zIndex={zIndex}
               preferSchemaType={preferSchemaType}
             />
           )}
diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-reference-popup.tsx b/web/app/components/workflow/nodes/_base/components/variable/var-reference-popup.tsx
index 26f10b7a1d..4aa1688a12 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/var-reference-popup.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/var-reference-popup.tsx
@@ -14,7 +14,6 @@ type Props = {
   onChange: (value: ValueSelector, varDetail: Var) => void
   itemWidth?: number
   isSupportFileVar?: boolean
-  zIndex?: number
   preferSchemaType?: boolean
 }
 const VarReferencePopup: FC<Props> = ({
@@ -23,7 +22,6 @@ const VarReferencePopup: FC<Props> = ({
   onChange,
   itemWidth,
   isSupportFileVar = true,
-  zIndex,
   preferSchemaType,
 }) => {
   const { t } = useTranslation()
@@ -68,7 +66,6 @@ const VarReferencePopup: FC<Props> = ({
               onChange={onChange}
               itemWidth={itemWidth}
               isSupportFileVar={isSupportFileVar}
-              zIndex={zIndex}
               showManageInputField={showManageRagInputFields}
               onManageInputField={() => setShowInputFieldPanel?.(true)}
               preferSchemaType={preferSchemaType}
diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx b/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx
index 420888cb13..ffd50e1ef1 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx
@@ -78,7 +78,6 @@ type ItemProps = {
   isLoopVar?: boolean
   isFlat?: boolean
   isInCodeGeneratorInstructionEditor?: boolean
-  zIndex?: number
   className?: string
   preferSchemaType?: boolean
   isSelected?: boolean
@@ -97,7 +96,6 @@ const Item: FC<ItemProps> = ({
   isLoopVar,
   isFlat,
   isInCodeGeneratorInstructionEditor,
-  zIndex,
   className,
   preferSchemaType,
   isSelected,
@@ -211,7 +209,7 @@ const Item: FC<ItemProps> = ({
       className={cn(
         (isObj || isStructureOutput) ? 'pr-1' : 'pr-[18px]',
         (isHovering || isSelected) && ((isObj || isStructureOutput) ? 'bg-components-panel-on-panel-item-bg-hover' : 'bg-state-base-hover'),
-        'relative flex h-6 w-full cursor-pointer items-center rounded-md pl-3 outline-none focus:outline-none focus-visible:outline-none',
+        'relative flex h-6 w-full cursor-pointer items-center rounded-md pl-3 outline-hidden focus:outline-hidden focus-visible:outline-hidden',
         className,
       )}
       data-selected={isSelected ? 'true' : 'false'}
@@ -265,11 +263,6 @@ const Item: FC<ItemProps> = ({
         placement="left-start"
         sideOffset={0}
         popupClassName={cn(VAR_REFERENCE_CHILD_POPUP_CLASS_NAME, 'border-none bg-transparent p-0 shadow-none backdrop-blur-none')}
-        positionerProps={{
-          style: {
-            zIndex: zIndex || 100,
-          },
-        }}
       >
         {(isStructureOutput || isObj) && (
           <PickerStructurePanel
@@ -297,7 +290,6 @@ type Props = {
   maxHeightClass?: string
   onClose?: () => void
   onBlur?: () => void
-  zIndex?: number
   isInCodeGeneratorInstructionEditor?: boolean
   showManageInputField?: boolean
   onManageInputField?: () => void
@@ -315,7 +307,6 @@ const VarReferenceVars: FC<Props> = ({
   maxHeightClass,
   onClose,
   onBlur,
-  zIndex,
   isInCodeGeneratorInstructionEditor,
   showManageInputField,
   onManageInputField,
@@ -490,7 +481,6 @@ const VarReferenceVars: FC<Props> = ({
                         isLoopVar={item.isLoop}
                         isFlat={item.isFlat}
                         isInCodeGeneratorInstructionEditor={isInCodeGeneratorInstructionEditor}
-                        zIndex={zIndex}
                         preferSchemaType={preferSchemaType}
                         isSelected={effectiveSelectedIndex === optionIndex}
                         onActivate={() => setSelectedIndex(optionIndex)}
diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-type-picker.tsx b/web/app/components/workflow/nodes/_base/components/variable/var-type-picker.tsx
index 6d3cfe7cfb..14a88b4432 100644
--- a/web/app/components/workflow/nodes/_base/components/variable/var-type-picker.tsx
+++ b/web/app/components/workflow/nodes/_base/components/variable/var-type-picker.tsx
@@ -1,15 +1,15 @@
 'use client'
 import type { FC } from 'react'
 import { cn } from '@langgenius/dify-ui/cn'
-import { RiArrowDownSLine } from '@remixicon/react'
-import * as React from 'react'
-import { useCallback, useState } from 'react'
-import { Check } from '@/app/components/base/icons/src/vender/line/general'
 import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectItemIndicator,
+  SelectItemText,
+  SelectTrigger,
+} from '@langgenius/dify-ui/select'
+import * as React from 'react'
 import { VarType } from '@/app/components/workflow/types'
 
 type Props = {
@@ -26,47 +26,39 @@ const VarReferencePicker: FC<Props> = ({
   value,
   onChange,
 }) => {
-  const [open, setOpen] = useState(false)
-
-  const handleChange = useCallback((type: string) => {
-    return () => {
-      setOpen(false)
-      onChange(type)
-    }
-  }, [onChange])
-
   return (
     <div className={cn(className, !readonly && 'cursor-pointer select-none')}>
-      <PortalToFollowElem
-        open={open}
-        onOpenChange={setOpen}
-        placement="bottom-start"
-        offset={4}
-      >
-        <PortalToFollowElemTrigger onClick={() => setOpen(!open)} className="w-[120px] cursor-pointer">
-          <div className="flex h-8 items-center justify-between rounded-lg border-0 bg-components-input-bg-normal px-2.5 text-[13px] text-text-primary">
-            <div className="w-0 grow truncate capitalize" title={value}>{value}</div>
-            <RiArrowDownSLine className="h-3.5 w-3.5 shrink-0 text-text-secondary" />
-          </div>
-        </PortalToFollowElemTrigger>
-        <PortalToFollowElemContent style={{
-          zIndex: 100,
+      <Select
+        value={value}
+        readOnly={readonly}
+        onValueChange={(type) => {
+          if (type)
+            onChange(type)
         }}
+      >
+        <SelectTrigger
+          className="h-8 w-[120px] cursor-pointer rounded-lg px-2.5 text-[13px] text-text-primary"
+          title={value}
         >
-          <div className="w-[120px] rounded-lg bg-components-panel-bg p-1 shadow-sm">
-            {TYPES.map(type => (
-              <div
-                key={type}
-                className="flex h-[30px] cursor-pointer items-center justify-between rounded-lg pr-2 pl-3 text-[13px] text-text-primary hover:bg-state-base-hover"
-                onClick={handleChange(type)}
-              >
-                <div className="w-0 grow truncate capitalize">{type}</div>
-                {type === value && <Check className="h-4 w-4 shrink-0 text-text-accent" />}
-              </div>
-            ))}
-          </div>
-        </PortalToFollowElemContent>
-      </PortalToFollowElem>
+          <span className="capitalize">{value}</span>
+        </SelectTrigger>
+        <SelectContent
+          sideOffset={4}
+          popupClassName="w-[120px] rounded-lg border-0 p-1 shadow-sm"
+          listClassName="p-0"
+        >
+          {TYPES.map(type => (
+            <SelectItem
+              key={type}
+              value={type}
+              className="h-[30px] rounded-lg pr-2 pl-3 text-[13px] text-text-primary"
+            >
+              <SelectItemText className="px-0 capitalize">{type}</SelectItemText>
+              <SelectItemIndicator />
+            </SelectItem>
+          ))}
+        </SelectContent>
+      </Select>
     </div>
   )
 }
diff --git a/web/app/components/workflow/nodes/_base/components/workflow-panel/trigger-subscription.tsx b/web/app/components/workflow/nodes/_base/components/workflow-panel/trigger-subscription.tsx
index 317f4853ac..d85d215923 100644
--- a/web/app/components/workflow/nodes/_base/components/workflow-panel/trigger-subscription.tsx
+++ b/web/app/components/workflow/nodes/_base/components/workflow-panel/trigger-subscription.tsx
@@ -1,7 +1,8 @@
 import type { FC } from 'react'
 import type { SimpleSubscription } from '@/app/components/plugins/plugin-detail-panel/subscription-list'
 import { cn } from '@langgenius/dify-ui/cn'
-import { CreateButtonType, CreateSubscriptionButton } from '@/app/components/plugins/plugin-detail-panel/subscription-list/create'
+import { CreateSubscriptionButton } from '@/app/components/plugins/plugin-detail-panel/subscription-list/create'
+import { CreateButtonType } from '@/app/components/plugins/plugin-detail-panel/subscription-list/create/types'
 import { SubscriptionSelectorEntry } from '@/app/components/plugins/plugin-detail-panel/subscription-list/selector-entry'
 import { useSubscriptionList } from '@/app/components/plugins/plugin-detail-panel/subscription-list/use-subscription-list'
 
diff --git a/web/app/components/workflow/nodes/code/__tests__/panel.spec.tsx b/web/app/components/workflow/nodes/code/__tests__/panel.spec.tsx
index 72d640651d..ed3342ab57 100644
--- a/web/app/components/workflow/nodes/code/__tests__/panel.spec.tsx
+++ b/web/app/components/workflow/nodes/code/__tests__/panel.spec.tsx
@@ -226,16 +226,15 @@ describe('code/panel', () => {
     expect(screen.getByText('editor:editable')).toBeInTheDocument()
     expect(screen.getByText('language:javascript')).toBeInTheDocument()
 
-    const addButtons = screen.getAllByTestId('add-button')
-    await user.click(addButtons[0]!)
-    await user.click(screen.getByTestId('sync-button'))
+    await user.click(screen.getByRole('button', { name: 'common.operation.add workflow.nodes.code.inputVars' }))
+    await user.click(screen.getByRole('button', { name: 'workflow.nodes.code.syncFunctionSignature' }))
     await user.click(screen.getByRole('button', { name: 'change-code' }))
     await user.click(screen.getByRole('button', { name: 'generate-code' }))
     await user.click(screen.getByRole('button', { name: 'language:javascript' }))
     await user.click(screen.getByRole('button', { name: 'change-var-list' }))
     await user.click(screen.getByRole('button', { name: 'change-output-list' }))
     await user.click(screen.getByRole('button', { name: 'remove-output' }))
-    await user.click(addButtons[1]!)
+    await user.click(screen.getByRole('button', { name: 'common.operation.add workflow.nodes.code.outputVars' }))
     await user.click(screen.getByRole('button', { name: 'cancel-remove' }))
     await user.click(screen.getByRole('button', { name: 'confirm-remove' }))
 
@@ -285,8 +284,9 @@ describe('code/panel', () => {
 
     renderPanel()
 
-    expect(screen.queryByTestId('sync-button')).not.toBeInTheDocument()
-    expect(screen.getAllByTestId('add-button')).toHaveLength(1)
+    expect(screen.queryByRole('button', { name: 'workflow.nodes.code.syncFunctionSignature' })).not.toBeInTheDocument()
+    expect(screen.queryByRole('button', { name: 'common.operation.add workflow.nodes.code.inputVars' })).not.toBeInTheDocument()
+    expect(screen.getByRole('button', { name: 'common.operation.add workflow.nodes.code.outputVars' })).toBeInTheDocument()
     expect(screen.getByText('editor:readonly')).toBeInTheDocument()
     expect(screen.getByText('var-list:readonly')).toBeInTheDocument()
     expect(screen.getByText('output-list:readonly')).toBeInTheDocument()
diff --git a/web/app/components/workflow/nodes/code/dependency-picker.tsx b/web/app/components/workflow/nodes/code/dependency-picker.tsx
index dd9e97af6f..2303ba32a6 100644
--- a/web/app/components/workflow/nodes/code/dependency-picker.tsx
+++ b/web/app/components/workflow/nodes/code/dependency-picker.tsx
@@ -51,7 +51,6 @@ const DependencyPicker: FC<Props> = ({
         placement="bottom-start"
         sideOffset={4}
         popupClassName="border-none bg-transparent p-0 shadow-none backdrop-blur-none"
-        positionerProps={{ style: { zIndex: 100 } }}
       >
         <div
           className="rounded-lg bg-white p-1 shadow-sm"
diff --git a/web/app/components/workflow/nodes/code/panel.tsx b/web/app/components/workflow/nodes/code/panel.tsx
index b531dcf49c..225585eb26 100644
--- a/web/app/components/workflow/nodes/code/panel.tsx
+++ b/web/app/components/workflow/nodes/code/panel.tsx
@@ -75,17 +75,22 @@ const Panel: FC<NodePanelProps<CodeNodeType>> = ({
                   <div className="flex gap-2">
                     <Tooltip>
                       <TooltipTrigger
-                        className="cursor-pointer rounded-md p-1 select-none hover:bg-state-base-hover"
+                        className="cursor-pointer rounded-md border-none bg-transparent p-1 select-none hover:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
                         onClick={handleSyncFunctionSignature}
-                        data-testid="sync-button"
+                        aria-label={t(`${i18nPrefix}.syncFunctionSignature`, { ns: 'workflow' })}
                       >
-                        <span className="i-ri-refresh-line h-4 w-4 text-text-tertiary" />
+                        <span className="i-ri-refresh-line h-4 w-4 text-text-tertiary" aria-hidden="true" />
                       </TooltipTrigger>
                       <TooltipContent>{t(`${i18nPrefix}.syncFunctionSignature`, { ns: 'workflow' })}</TooltipContent>
                     </Tooltip>
-                    <div className="cursor-pointer rounded-md p-1 select-none hover:bg-state-base-hover" onClick={handleAddVariable} data-testid="add-button">
-                      <span className="i-ri-add-line h-4 w-4 text-text-tertiary" />
-                    </div>
+                    <button
+                      type="button"
+                      aria-label={`${t('operation.add', { ns: 'common' })} ${t(`${i18nPrefix}.inputVars`, { ns: 'workflow' })}`}
+                      className="cursor-pointer rounded-md border-none bg-transparent p-1 select-none hover:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+                      onClick={handleAddVariable}
+                    >
+                      <span className="i-ri-add-line h-4 w-4 text-text-tertiary" aria-hidden="true" />
+                    </button>
                   </div>
                 )
               : undefined
@@ -124,9 +129,14 @@ const Panel: FC<NodePanelProps<CodeNodeType>> = ({
         <Field
           title={t(`${i18nPrefix}.outputVars`, { ns: 'workflow' })}
           operations={(
-            <div className="cursor-pointer rounded-md p-1 select-none hover:bg-state-base-hover" onClick={handleAddOutputVariable} data-testid="add-button">
-              <span className="i-ri-add-line h-4 w-4 text-text-tertiary" />
-            </div>
+            <button
+              type="button"
+              aria-label={`${t('operation.add', { ns: 'common' })} ${t(`${i18nPrefix}.outputVars`, { ns: 'workflow' })}`}
+              className="cursor-pointer rounded-md border-none bg-transparent p-1 select-none hover:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+              onClick={handleAddOutputVariable}
+            >
+              <span className="i-ri-add-line h-4 w-4 text-text-tertiary" aria-hidden="true" />
+            </button>
           )}
           required
         >
diff --git a/web/app/components/workflow/nodes/end/__tests__/panel.spec.tsx b/web/app/components/workflow/nodes/end/__tests__/panel.spec.tsx
index b4218e338b..4340d341ff 100644
--- a/web/app/components/workflow/nodes/end/__tests__/panel.spec.tsx
+++ b/web/app/components/workflow/nodes/end/__tests__/panel.spec.tsx
@@ -38,7 +38,7 @@ describe('EndPanel', () => {
 
     expect(screen.getByText('workflow.nodes.end.output.variable')).toBeInTheDocument()
 
-    fireEvent.click(screen.getByTestId('add-button'))
+    fireEvent.click(screen.getByRole('button', { name: 'common.operation.add workflow.nodes.end.output.variable' }))
 
     expect(handleAddVariable).toHaveBeenCalledTimes(1)
   })
@@ -53,6 +53,6 @@ describe('EndPanel', () => {
 
     render(<Panel id="end-node" data={createData()} panelProps={{} as PanelProps} />)
 
-    expect(screen.queryByTestId('add-button')).not.toBeInTheDocument()
+    expect(screen.queryByRole('button', { name: 'common.operation.add workflow.nodes.end.output.variable' })).not.toBeInTheDocument()
   })
 })
diff --git a/web/app/components/workflow/nodes/end/panel.tsx b/web/app/components/workflow/nodes/end/panel.tsx
index a88777c82d..a428a926eb 100644
--- a/web/app/components/workflow/nodes/end/panel.tsx
+++ b/web/app/components/workflow/nodes/end/panel.tsx
@@ -33,9 +33,14 @@ const Panel: FC<NodePanelProps<EndNodeType>> = ({
           operations={
             !readOnly
               ? (
-                  <div className="cursor-pointer rounded-md p-1 select-none hover:bg-state-base-hover" onClick={handleAddVariable} data-testid="add-button">
-                    <span className="i-ri-add-line h-4 w-4 text-text-tertiary" />
-                  </div>
+                  <button
+                    type="button"
+                    aria-label={`${t('operation.add', { ns: 'common' })} ${t(`${i18nPrefix}.output.variable`, { ns: 'workflow' })}`}
+                    className="cursor-pointer rounded-md border-none bg-transparent p-1 select-none hover:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+                    onClick={handleAddVariable}
+                  >
+                    <span className="i-ri-add-line h-4 w-4 text-text-tertiary" aria-hidden="true" />
+                  </button>
                 )
               : undefined
           }
diff --git a/web/app/components/workflow/nodes/http/components/authorization/index.tsx b/web/app/components/workflow/nodes/http/components/authorization/index.tsx
index b72e52911d..a3d8fc7331 100644
--- a/web/app/components/workflow/nodes/http/components/authorization/index.tsx
+++ b/web/app/components/workflow/nodes/http/components/authorization/index.tsx
@@ -4,12 +4,12 @@ import type { Authorization as AuthorizationPayloadType } from '../../types'
 import type { Var } from '@/app/components/workflow/types'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import { produce } from 'immer'
 import * as React from 'react'
 import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import BaseInput from '@/app/components/base/input'
-import Modal from '@/app/components/base/modal'
 import Input from '@/app/components/workflow/nodes/_base/components/input-support-select-var'
 import useAvailableVarList from '@/app/components/workflow/nodes/_base/hooks/use-available-var-list'
 import { VarType } from '@/app/components/workflow/types'
@@ -115,70 +115,78 @@ const Authorization: FC<Props> = ({
     onHide()
   }, [tempPayload, onChange, onHide])
   return (
-    <Modal
-      title={t(`${i18nPrefix}.authorization`, { ns: 'workflow' })}
-      isShow={isShow}
-      onClose={onHide}
+    <Dialog
+      open={isShow}
+      onOpenChange={(open) => {
+        if (!open)
+          onHide()
+      }}
     >
-      <div>
-        <div className="space-y-2">
-          <Field title={t(`${i18nPrefix}.authorizationType`, { ns: 'workflow' })}>
-            <RadioGroup
-              options={[
-                { value: AuthorizationType.none, label: t(`${i18nPrefix}.no-auth`, { ns: 'workflow' }) },
-                { value: AuthorizationType.apiKey, label: t(`${i18nPrefix}.api-key`, { ns: 'workflow' }) },
-              ]}
-              value={tempPayload.type}
-              onChange={handleAuthTypeChange}
-            />
-          </Field>
+      <DialogContent className="border-none text-left align-middle">
+        <DialogTitle className="title-2xl-semi-bold text-text-primary">
+          {t(`${i18nPrefix}.authorization`, { ns: 'workflow' })}
+        </DialogTitle>
 
-          {tempPayload.type === AuthorizationType.apiKey && (
-            <>
-              <Field title={t(`${i18nPrefix}.auth-type`, { ns: 'workflow' })}>
-                <RadioGroup
-                  options={[
-                    { value: APIType.basic, label: t(`${i18nPrefix}.basic`, { ns: 'workflow' }) },
-                    { value: APIType.bearer, label: t(`${i18nPrefix}.bearer`, { ns: 'workflow' }) },
-                    { value: APIType.custom, label: t(`${i18nPrefix}.custom`, { ns: 'workflow' }) },
-                  ]}
-                  value={tempPayload.config?.type || APIType.basic}
-                  onChange={handleAuthAPITypeChange}
-                />
-              </Field>
-              {tempPayload.config?.type === APIType.custom && (
-                <Field title={t(`${i18nPrefix}.header`, { ns: 'workflow' })} isRequired>
-                  <BaseInput
-                    value={tempPayload.config?.header || ''}
-                    onChange={handleAPIKeyOrHeaderChange('header')}
+        <div>
+          <div className="space-y-2">
+            <Field title={t(`${i18nPrefix}.authorizationType`, { ns: 'workflow' })}>
+              <RadioGroup
+                options={[
+                  { value: AuthorizationType.none, label: t(`${i18nPrefix}.no-auth`, { ns: 'workflow' }) },
+                  { value: AuthorizationType.apiKey, label: t(`${i18nPrefix}.api-key`, { ns: 'workflow' }) },
+                ]}
+                value={tempPayload.type}
+                onChange={handleAuthTypeChange}
+              />
+            </Field>
+
+            {tempPayload.type === AuthorizationType.apiKey && (
+              <>
+                <Field title={t(`${i18nPrefix}.auth-type`, { ns: 'workflow' })}>
+                  <RadioGroup
+                    options={[
+                      { value: APIType.basic, label: t(`${i18nPrefix}.basic`, { ns: 'workflow' }) },
+                      { value: APIType.bearer, label: t(`${i18nPrefix}.bearer`, { ns: 'workflow' }) },
+                      { value: APIType.custom, label: t(`${i18nPrefix}.custom`, { ns: 'workflow' }) },
+                    ]}
+                    value={tempPayload.config?.type || APIType.basic}
+                    onChange={handleAuthAPITypeChange}
                   />
                 </Field>
-              )}
+                {tempPayload.config?.type === APIType.custom && (
+                  <Field title={t(`${i18nPrefix}.header`, { ns: 'workflow' })} isRequired>
+                    <BaseInput
+                      value={tempPayload.config?.header || ''}
+                      onChange={handleAPIKeyOrHeaderChange('header')}
+                    />
+                  </Field>
+                )}
 
-              <Field title={t(`${i18nPrefix}.api-key-title`, { ns: 'workflow' })} isRequired>
-                <div className="flex">
-                  <Input
-                    instanceId="http-api-key"
-                    className={cn(isFocus ? 'border-components-input-border-active bg-components-input-bg-active shadow-xs' : 'border-components-input-border-hover bg-components-input-bg-normal', 'w-0 grow rounded-lg border px-3 py-[6px]')}
-                    value={tempPayload.config?.api_key || ''}
-                    onChange={handleAPIKeyChange}
-                    nodesOutputVars={availableVars}
-                    availableNodes={availableNodesWithParent}
-                    onFocusChange={setIsFocus}
-                    placeholder={' '}
-                    placeholderClassName="leading-[21px]!"
-                  />
-                </div>
-              </Field>
-            </>
-          )}
+                <Field title={t(`${i18nPrefix}.api-key-title`, { ns: 'workflow' })} isRequired>
+                  <div className="flex">
+                    <Input
+                      instanceId="http-api-key"
+                      className={cn(isFocus ? 'border-components-input-border-active bg-components-input-bg-active shadow-xs' : 'border-components-input-border-hover bg-components-input-bg-normal', 'w-0 grow rounded-lg border px-3 py-[6px]')}
+                      value={tempPayload.config?.api_key || ''}
+                      onChange={handleAPIKeyChange}
+                      nodesOutputVars={availableVars}
+                      availableNodes={availableNodesWithParent}
+                      onFocusChange={setIsFocus}
+                      placeholder={' '}
+                      placeholderClassName="leading-[21px]!"
+                    />
+                  </div>
+                </Field>
+              </>
+            )}
+          </div>
+          <div className="mt-6 flex justify-end space-x-2">
+            <Button onClick={onHide}>{t('operation.cancel', { ns: 'common' })}</Button>
+            <Button variant="primary" onClick={handleConfirm}>{t('operation.save', { ns: 'common' })}</Button>
+          </div>
         </div>
-        <div className="mt-6 flex justify-end space-x-2">
-          <Button onClick={onHide}>{t('operation.cancel', { ns: 'common' })}</Button>
-          <Button variant="primary" onClick={handleConfirm}>{t('operation.save', { ns: 'common' })}</Button>
-        </div>
-      </div>
-    </Modal>
+      </DialogContent>
+    </Dialog>
   )
 }
 export default React.memo(Authorization)
diff --git a/web/app/components/workflow/nodes/http/components/curl-panel.tsx b/web/app/components/workflow/nodes/http/components/curl-panel.tsx
index 8ba5fb36a9..87dc2a3427 100644
--- a/web/app/components/workflow/nodes/http/components/curl-panel.tsx
+++ b/web/app/components/workflow/nodes/http/components/curl-panel.tsx
@@ -2,11 +2,11 @@
 import type { FC } from 'react'
 import type { HttpNodeType } from '../types'
 import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
 import * as React from 'react'
 import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import Modal from '@/app/components/base/modal'
 import Textarea from '@/app/components/base/textarea'
 import { useNodesInteractions } from '@/app/components/workflow/hooks'
 import { parseCurl } from './curl-parser'
@@ -42,28 +42,35 @@ const CurlPanel: FC<Props> = ({ nodeId, isShow, onHide, handleCurlImport }) => {
   }, [onHide, nodeId, inputString, handleNodeSelect, handleCurlImport])
 
   return (
-    <Modal
-      title={t('nodes.http.curl.title', { ns: 'workflow' })}
-      isShow={isShow}
-      onClose={onHide}
-      className="w-[400px]! max-w-[400px]! p-4!"
+    <Dialog
+      open={isShow}
+      onOpenChange={(open) => {
+        if (!open)
+          onHide()
+      }}
     >
-      <div>
-        <Textarea
-          value={inputString}
-          className="my-3 h-40 w-full grow"
-          onChange={e => setInputString(e.target.value)}
-          placeholder={t('nodes.http.curl.placeholder', { ns: 'workflow' })!}
-        />
-      </div>
-      <div className="mt-4 flex justify-end space-x-2">
-        <Button className="w-[95px]!" onClick={onHide}>{t('operation.cancel', { ns: 'common' })}</Button>
-        <Button className="w-[95px]!" variant="primary" onClick={handleSave}>
-          {' '}
-          {t('operation.save', { ns: 'common' })}
-        </Button>
-      </div>
-    </Modal>
+      <DialogContent className="w-[400px]! max-w-[400px]! overflow-hidden! border-none p-4! text-left align-middle">
+        <DialogTitle className="title-2xl-semi-bold text-text-primary">
+          {t('nodes.http.curl.title', { ns: 'workflow' })}
+        </DialogTitle>
+
+        <div>
+          <Textarea
+            value={inputString}
+            className="my-3 h-40 w-full grow"
+            onChange={e => setInputString(e.target.value)}
+            placeholder={t('nodes.http.curl.placeholder', { ns: 'workflow' })!}
+          />
+        </div>
+        <div className="mt-4 flex justify-end space-x-2">
+          <Button className="w-[95px]!" onClick={onHide}>{t('operation.cancel', { ns: 'common' })}</Button>
+          <Button className="w-[95px]!" variant="primary" onClick={handleSave}>
+            {' '}
+            {t('operation.save', { ns: 'common' })}
+          </Button>
+        </div>
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/components/workflow/nodes/human-input/__tests__/human-input.spec.tsx b/web/app/components/workflow/nodes/human-input/__tests__/human-input.spec.tsx
index cbc9cddd4a..8d41a45468 100644
--- a/web/app/components/workflow/nodes/human-input/__tests__/human-input.spec.tsx
+++ b/web/app/components/workflow/nodes/human-input/__tests__/human-input.spec.tsx
@@ -516,7 +516,7 @@ describe('DSL Import with Human Input Node', () => {
       ])
     })
 
-    it('should return empty output variables when no form inputs exist', () => {
+    it('should return no output variables when no form inputs exist', () => {
       const payload = {
         ...humanInputDefault.defaultValue,
         inputs: [],
diff --git a/web/app/components/workflow/nodes/human-input/__tests__/panel.spec.tsx b/web/app/components/workflow/nodes/human-input/__tests__/panel.spec.tsx
index 6ff61dce3f..03247710a7 100644
--- a/web/app/components/workflow/nodes/human-input/__tests__/panel.spec.tsx
+++ b/web/app/components/workflow/nodes/human-input/__tests__/panel.spec.tsx
@@ -306,13 +306,14 @@ describe('human-input/panel', () => {
     const config = createConfigResult()
     mockUseConfig.mockReturnValue(config)
 
-    const { container } = renderPanel()
+    renderPanel()
 
     expect(screen.getByRole('button', { name: 'delivery-method:editable' })).toBeInTheDocument()
     expect(screen.getByText('form-content:collapsed')).toBeInTheDocument()
     expect(screen.getByText('approve:editable')).toBeInTheDocument()
     expect(screen.getByText('review_result:string:Form input value')).toBeInTheDocument()
     expect(screen.getByText('__action_id:string:Action ID user triggered')).toBeInTheDocument()
+    expect(screen.getByText('__action_value:string:Selected action value')).toBeInTheDocument()
     expect(screen.getByText('__rendered_content:string:Rendered content')).toBeInTheDocument()
 
     await user.click(screen.getByRole('button', { name: 'delivery-method:editable' }))
@@ -328,9 +329,8 @@ describe('human-input/panel', () => {
     await user.click(screen.getByRole('button', { name: 'toggle-output-vars' }))
     await user.click(screen.getByRole('button', { name: 'close-preview' }))
 
-    const iconContainers = container.querySelectorAll('div.flex.size-6.cursor-pointer')
-    await user.click(iconContainers[0] as HTMLElement)
-    await user.click(iconContainers[1] as HTMLElement)
+    await user.click(screen.getByRole('button', { name: 'common.operation.copy' }))
+    await user.click(screen.getByRole('button', { name: 'share.chat.expand' }))
 
     expect(config.handleDeliveryMethodChange).toHaveBeenCalledWith([{
       id: 'dm-email',
diff --git a/web/app/components/workflow/nodes/human-input/components/__tests__/single-run-form.spec.tsx b/web/app/components/workflow/nodes/human-input/components/__tests__/single-run-form.spec.tsx
new file mode 100644
index 0000000000..13ec9b346d
--- /dev/null
+++ b/web/app/components/workflow/nodes/human-input/components/__tests__/single-run-form.spec.tsx
@@ -0,0 +1,102 @@
+import type { ReactNode } from 'react'
+import type { HumanInputFormData } from '@/types/workflow'
+import { render, screen, waitFor } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { InputVarType } from '@/app/components/workflow/types'
+import { UserActionButtonType } from '../../types'
+import SingleRunForm from '../single-run-form'
+
+vi.mock('react-i18next', () => ({
+  useTranslation: () => ({
+    t: (key: string) => key,
+  }),
+}))
+
+vi.mock('@langgenius/dify-ui/button', () => ({
+  Button: ({
+    children,
+    disabled,
+    onClick,
+  }: {
+    children?: ReactNode
+    disabled?: boolean
+    onClick?: () => void
+  }) => (
+    <button type="button" disabled={disabled} onClick={onClick}>
+      {children}
+    </button>
+  ),
+}))
+
+vi.mock('@/app/components/base/chat/chat/answer/human-input-content/content-item', () => ({
+  __esModule: true,
+  default: ({ content }: { content: string }) => <div>{content}</div>,
+}))
+
+const createFormData = (overrides: Partial<HumanInputFormData> = {}): HumanInputFormData => ({
+  form_id: 'form-1',
+  node_id: 'human-1',
+  node_title: 'Review',
+  form_content: 'Please review {{#$output.review#}}',
+  inputs: [{
+    type: InputVarType.paragraph,
+    output_variable_name: 'review',
+    default: {
+      selector: [],
+      type: 'constant',
+      value: 'initial review',
+    },
+  }],
+  actions: [{
+    id: 'approve',
+    title: 'Approve',
+    button_style: UserActionButtonType.Primary,
+  }],
+  form_token: 'token',
+  resolved_default_values: {},
+  display_in_ui: true,
+  expiration_time: 0,
+  ...overrides,
+})
+
+describe('SingleRunForm', () => {
+  it('renders the back action as a named button and forwards clicks', async () => {
+    const user = userEvent.setup()
+    const handleBack = vi.fn()
+
+    render(
+      <SingleRunForm
+        nodeName="Review"
+        data={createFormData()}
+        showBackButton
+        handleBack={handleBack}
+      />,
+    )
+
+    await user.click(screen.getByRole('button', { name: 'nodes.humanInput.singleRun.back' }))
+
+    expect(handleBack).toHaveBeenCalledTimes(1)
+  })
+
+  it('submits the selected action with initialized inputs', async () => {
+    const user = userEvent.setup()
+    const onSubmit = vi.fn().mockResolvedValue(undefined)
+
+    render(
+      <SingleRunForm
+        nodeName="Review"
+        data={createFormData()}
+        onSubmit={onSubmit}
+      />,
+    )
+
+    await user.click(screen.getByRole('button', { name: 'Approve' }))
+
+    await waitFor(() => {
+      expect(onSubmit).toHaveBeenCalledWith({
+        inputs: { review: 'initial review' },
+        action: 'approve',
+      })
+    })
+  })
+})
diff --git a/web/app/components/workflow/nodes/human-input/components/__tests__/user-action.spec.tsx b/web/app/components/workflow/nodes/human-input/components/__tests__/user-action.spec.tsx
index a47a012f49..5e9074a42b 100644
--- a/web/app/components/workflow/nodes/human-input/components/__tests__/user-action.spec.tsx
+++ b/web/app/components/workflow/nodes/human-input/components/__tests__/user-action.spec.tsx
@@ -87,7 +87,7 @@ describe('UserActionItem', () => {
     fireEvent.change(screen.getByTestId('nodes.humanInput.userActions.actionNamePlaceholder'), { target: { value: 'Approve action' } })
     fireEvent.change(screen.getByTestId('nodes.humanInput.userActions.actionNamePlaceholder'), { target: { value: '1invalid' } })
     fireEvent.change(screen.getByTestId('nodes.humanInput.userActions.actionNamePlaceholder'), { target: { value: 'averyveryveryverylongidentifier' } })
-    fireEvent.change(screen.getByTestId('nodes.humanInput.userActions.buttonTextPlaceholder'), { target: { value: 'A very very very long button title' } })
+    fireEvent.change(screen.getByTestId('nodes.humanInput.userActions.buttonTextPlaceholder'), { target: { value: 'card_visa_enterprise_001' } })
 
     expect(onChange).toHaveBeenNthCalledWith(1, expect.objectContaining({
       id: 'Approve_action',
@@ -96,7 +96,7 @@ describe('UserActionItem', () => {
       id: 'averyveryveryverylon',
     }))
     expect(onChange).toHaveBeenNthCalledWith(3, expect.objectContaining({
-      title: 'A very very very lon',
+      title: 'card_visa_enterprise_001',
     }))
     expect(mockNotify).toHaveBeenNthCalledWith(1, expect.objectContaining({
       type: 'error',
@@ -106,10 +106,7 @@ describe('UserActionItem', () => {
       type: 'error',
       message: 'nodes.humanInput.userActions.actionIdTooLong',
     }))
-    expect(mockNotify).toHaveBeenNthCalledWith(3, expect.objectContaining({
-      type: 'error',
-      message: 'nodes.humanInput.userActions.buttonTextTooLong',
-    }))
+    expect(mockNotify).toHaveBeenCalledTimes(2)
   })
 
   it('should support clearing ids, updating button style, deleting, and readonly mode', () => {
diff --git a/web/app/components/workflow/nodes/human-input/components/delivery-method/__tests__/test-email-sender.spec.tsx b/web/app/components/workflow/nodes/human-input/components/delivery-method/__tests__/test-email-sender.spec.tsx
index 7c62b20b8a..638a309c06 100644
--- a/web/app/components/workflow/nodes/human-input/components/delivery-method/__tests__/test-email-sender.spec.tsx
+++ b/web/app/components/workflow/nodes/human-input/components/delivery-method/__tests__/test-email-sender.spec.tsx
@@ -263,7 +263,7 @@ describe('human-input/delivery-method/test-email-sender', () => {
 
     expect(screen.getByPlaceholderText('message')).toBeInTheDocument()
 
-    await user.click(screen.getByText('workflow.nodes.humanInput.deliveryMethod.emailSender.vars'))
+    await user.click(screen.getByRole('button', { name: 'workflow.nodes.humanInput.deliveryMethod.emailSender.vars' }))
 
     expect(screen.queryByPlaceholderText('message')).not.toBeInTheDocument()
 
diff --git a/web/app/components/workflow/nodes/human-input/components/delivery-method/__tests__/upgrade-modal.spec.tsx b/web/app/components/workflow/nodes/human-input/components/delivery-method/__tests__/upgrade-modal.spec.tsx
index 0abae16f9a..b6af667022 100644
--- a/web/app/components/workflow/nodes/human-input/components/delivery-method/__tests__/upgrade-modal.spec.tsx
+++ b/web/app/components/workflow/nodes/human-input/components/delivery-method/__tests__/upgrade-modal.spec.tsx
@@ -8,15 +8,6 @@ vi.mock('@/context/modal-context', () => ({
     mockUseModalContextSelector(selector),
 }))
 
-vi.mock('@/app/components/base/premium-badge', () => ({
-  __esModule: true,
-  default: ({ children, onClick }: { children: React.ReactNode, onClick?: () => void }) => (
-    <button type="button" onClick={onClick}>
-      {children}
-    </button>
-  ),
-}))
-
 describe('human-input/delivery-method/upgrade-modal', () => {
   beforeEach(() => {
     vi.clearAllMocks()
diff --git a/web/app/components/workflow/nodes/human-input/components/delivery-method/recipient/email-input.tsx b/web/app/components/workflow/nodes/human-input/components/delivery-method/recipient/email-input.tsx
index cb8de634a2..189a2ce1d9 100644
--- a/web/app/components/workflow/nodes/human-input/components/delivery-method/recipient/email-input.tsx
+++ b/web/app/components/workflow/nodes/human-input/components/delivery-method/recipient/email-input.tsx
@@ -155,12 +155,7 @@ const EmailInput = ({
               sideOffset={4}
               alignOffset={-40}
               popupClassName="border-none bg-transparent p-0 shadow-none backdrop-blur-none"
-              positionerProps={{
-                anchor: inputRef,
-                style: {
-                  zIndex: 1000,
-                },
-              }}
+              positionerProps={{ anchor: inputRef }}
             >
               <MemberList
                 searchValue={searchKey}
diff --git a/web/app/components/workflow/nodes/human-input/components/delivery-method/recipient/member-selector.tsx b/web/app/components/workflow/nodes/human-input/components/delivery-method/recipient/member-selector.tsx
index f091ec5a30..fa2f3121dd 100644
--- a/web/app/components/workflow/nodes/human-input/components/delivery-method/recipient/member-selector.tsx
+++ b/web/app/components/workflow/nodes/human-input/components/delivery-method/recipient/member-selector.tsx
@@ -58,7 +58,6 @@ const MemberSelector: FC<Props> = ({
         sideOffset={4}
         alignOffset={35}
         popupClassName="border-none bg-transparent p-0 shadow-none backdrop-blur-none"
-        positionerProps={{ style: { zIndex: 1000 } }}
       >
         <MemberList
           searchValue={searchValue}
diff --git a/web/app/components/workflow/nodes/human-input/components/delivery-method/test-email-sender.tsx b/web/app/components/workflow/nodes/human-input/components/delivery-method/test-email-sender.tsx
index b88ec6cef6..158d199cbc 100644
--- a/web/app/components/workflow/nodes/human-input/components/delivery-method/test-email-sender.tsx
+++ b/web/app/components/workflow/nodes/human-input/components/delivery-method/test-email-sender.tsx
@@ -315,7 +315,13 @@ const EmailSenderModal = ({
                 i18nKey={`${i18nPrefix}.deliveryMethod.emailSender.tip`}
                 ns="workflow"
                 components={{
-                  strong: <span onClick={jumpToEmailConfigModal} className="cursor-pointer system-xs-regular text-text-accent"></span>,
+                  strong: (
+                    <button
+                      type="button"
+                      onClick={jumpToEmailConfigModal}
+                      className="inline cursor-pointer border-none bg-transparent p-0 text-left system-xs-regular text-text-accent"
+                    />
+                  ),
                 }}
               />
             </div>
@@ -328,10 +334,15 @@ const EmailSenderModal = ({
               <Divider className="mt-4! mb-2! h-px! w-12! bg-divider-regular" />
             </div>
             <div className="py-2">
-              <div className="group flex h-6 cursor-pointer items-center" onClick={() => setCollapsed(!collapsed)}>
+              <button
+                type="button"
+                aria-expanded={!collapsed}
+                className="group flex h-6 cursor-pointer items-center border-none bg-transparent p-0 text-left"
+                onClick={() => setCollapsed(!collapsed)}
+              >
                 <div className="mr-1 system-sm-semibold-uppercase text-text-secondary">{t(`${i18nPrefix}.deliveryMethod.emailSender.vars`, { ns: 'workflow' })}</div>
-                <RiArrowRightSFill className={cn('h-4 w-4 text-text-quaternary group-hover:text-text-primary', !collapsed && 'rotate-90')} />
-              </div>
+                <RiArrowRightSFill className={cn('h-4 w-4 text-text-quaternary group-hover:text-text-primary', !collapsed && 'rotate-90')} aria-hidden />
+              </button>
               <div className="system-xs-regular text-text-tertiary">{t(`${i18nPrefix}.deliveryMethod.emailSender.varsTip`, { ns: 'workflow' })}</div>
               {!collapsed && (
                 <div className="mt-3 space-y-4">
diff --git a/web/app/components/workflow/nodes/human-input/components/delivery-method/upgrade-modal.tsx b/web/app/components/workflow/nodes/human-input/components/delivery-method/upgrade-modal.tsx
index 18a6e90796..3daa347448 100644
--- a/web/app/components/workflow/nodes/human-input/components/delivery-method/upgrade-modal.tsx
+++ b/web/app/components/workflow/nodes/human-input/components/delivery-method/upgrade-modal.tsx
@@ -2,7 +2,7 @@ import { Button } from '@langgenius/dify-ui/button'
 import { RiMailSendFill } from '@remixicon/react'
 import { useTranslation } from 'react-i18next'
 import { SparklesSoft } from '@/app/components/base/icons/src/public/common'
-import PremiumBadge from '@/app/components/base/premium-badge'
+import { PremiumBadgeButton } from '@/app/components/base/premium-badge'
 import { UpgradeModal as BaseUpgradeModal } from '@/app/components/base/upgrade-modal'
 import { useModalContextSelector } from '@/context/modal-context'
 
@@ -39,20 +39,19 @@ export function UpgradeModal({
           >
             {t('nodes.humanInput.deliveryMethod.upgradeTipHide', { ns: 'workflow' })}
           </Button>
-          <PremiumBadge
+          <PremiumBadgeButton
             size="custom"
             color="blue"
-            allowHover={true}
             className="h-8 w-[93px]"
             onClick={handleUpgrade}
           >
-            <SparklesSoft className="flex h-3.5 w-3.5 items-center py-px pl-[3px] text-components-premium-badge-indigo-text-stop-0" />
+            <SparklesSoft aria-hidden="true" className="flex h-3.5 w-3.5 items-center py-px pl-[3px] text-components-premium-badge-indigo-text-stop-0" />
             <div className="system-sm-medium">
               <span className="p-1">
                 {t('upgradeBtn.encourageShort', { ns: 'billing' })}
               </span>
             </div>
-          </PremiumBadge>
+          </PremiumBadgeButton>
         </>
       )}
     />
diff --git a/web/app/components/workflow/nodes/human-input/components/single-run-form.tsx b/web/app/components/workflow/nodes/human-input/components/single-run-form.tsx
index 6226b6c06f..507b9b1a39 100644
--- a/web/app/components/workflow/nodes/human-input/components/single-run-form.tsx
+++ b/web/app/components/workflow/nodes/human-input/components/single-run-form.tsx
@@ -49,10 +49,14 @@ const FormContent = ({
     <>
       {showBackButton && (
         <div className="flex items-center p-4 pb-1">
-          <div className="flex cursor-pointer items-center system-sm-semibold-uppercase text-text-accent" onClick={handleBack}>
-            <RiArrowLeftLine className="mr-1 h-4 w-4" />
+          <button
+            type="button"
+            className="flex cursor-pointer items-center border-none bg-transparent p-0 text-left system-sm-semibold-uppercase text-text-accent"
+            onClick={handleBack}
+          >
+            <RiArrowLeftLine className="mr-1 h-4 w-4" aria-hidden />
             {t('nodes.humanInput.singleRun.back', { ns: 'workflow' })}
-          </div>
+          </button>
           <div className="mx-1 system-xs-regular text-divider-deep">/</div>
           <div className="system-sm-semibold-uppercase text-text-secondary">{nodeName}</div>
         </div>
diff --git a/web/app/components/workflow/nodes/human-input/components/user-action.tsx b/web/app/components/workflow/nodes/human-input/components/user-action.tsx
index a83ea4f8f2..94581281e8 100644
--- a/web/app/components/workflow/nodes/human-input/components/user-action.tsx
+++ b/web/app/components/workflow/nodes/human-input/components/user-action.tsx
@@ -12,7 +12,7 @@ import ButtonStyleDropdown from './button-style-dropdown'
 
 const i18nPrefix = 'nodes.humanInput'
 const ACTION_ID_MAX_LENGTH = 20
-const BUTTON_TEXT_MAX_LENGTH = 20
+const ACTION_VALUE_MAX_LENGTH = 100
 
 type UserActionItemProps = {
   data: UserAction
@@ -63,9 +63,9 @@ const UserActionItem: FC<UserActionItemProps> = ({
 
   const handleTextChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     let value = e.target.value
-    if (value.length > BUTTON_TEXT_MAX_LENGTH) {
-      value = value.slice(0, BUTTON_TEXT_MAX_LENGTH)
-      toast.error(t(`${i18nPrefix}.userActions.buttonTextTooLong`, { ns: 'workflow', maxLength: BUTTON_TEXT_MAX_LENGTH }))
+    if (value.length > ACTION_VALUE_MAX_LENGTH) {
+      value = value.slice(0, ACTION_VALUE_MAX_LENGTH)
+      toast.error(t(`${i18nPrefix}.userActions.buttonTextTooLong`, { ns: 'workflow', maxLength: ACTION_VALUE_MAX_LENGTH }))
     }
     onChange({ ...data, title: value })
   }
diff --git a/web/app/components/workflow/nodes/human-input/panel.tsx b/web/app/components/workflow/nodes/human-input/panel.tsx
index fa0914c098..2f51af95b6 100644
--- a/web/app/components/workflow/nodes/human-input/panel.tsx
+++ b/web/app/components/workflow/nodes/human-input/panel.tsx
@@ -128,18 +128,25 @@ const Panel: FC<NodePanelProps<HumanInputNodeType>> = ({
               </Button>
               <div className="mx-2 h-3 w-px bg-divider-regular"></div>
               <div className="flex items-center space-x-1">
-                <div
-                  className="flex size-6 cursor-pointer items-center justify-center rounded-md hover:bg-components-button-ghost-bg-hover"
+                <button
+                  type="button"
+                  aria-label={t('operation.copy', { ns: 'common' })}
+                  className="flex size-6 cursor-pointer items-center justify-center rounded-md border-none bg-transparent p-0 hover:bg-components-button-ghost-bg-hover"
                   onClick={() => {
                     copy(inputs.form_content)
                     toast.success(t('actionMsg.copySuccessfully', { ns: 'common' }))
                   }}
                 >
-                  <RiClipboardLine className="h-4 w-4 text-text-secondary" />
-                </div>
-                <div className={cn('flex size-6 cursor-pointer items-center justify-center rounded-md text-text-secondary hover:bg-components-button-ghost-bg-hover', isExpandFormContent && 'bg-state-accent-active text-text-accent')} onClick={toggleExpandFormContent}>
-                  {isExpandFormContent ? <RiCollapseDiagonalLine className="h-4 w-4" /> : <RiExpandDiagonalLine className="h-4 w-4" />}
-                </div>
+                  <RiClipboardLine className="h-4 w-4 text-text-secondary" aria-hidden />
+                </button>
+                <button
+                  type="button"
+                  aria-label={t(isExpandFormContent ? 'chat.collapse' : 'chat.expand', { ns: 'share' })}
+                  className={cn('flex size-6 cursor-pointer items-center justify-center rounded-md border-none bg-transparent p-0 text-text-secondary hover:bg-components-button-ghost-bg-hover', isExpandFormContent && 'bg-state-accent-active text-text-accent')}
+                  onClick={toggleExpandFormContent}
+                >
+                  {isExpandFormContent ? <RiCollapseDiagonalLine className="h-4 w-4" aria-hidden /> : <RiExpandDiagonalLine className="h-4 w-4" aria-hidden />}
+                </button>
               </div>
             </div>
           )}
@@ -229,6 +236,11 @@ const Panel: FC<NodePanelProps<HumanInputNodeType>> = ({
           type="string"
           description="Action ID user triggered"
         />
+        <VarItem
+          name="__action_value"
+          type="string"
+          description="Selected action value"
+        />
         <VarItem
           name="__rendered_content"
           type="string"
diff --git a/web/app/components/workflow/nodes/if-else/__tests__/integration.spec.tsx b/web/app/components/workflow/nodes/if-else/__tests__/integration.spec.tsx
index 0ed61eb641..af73cd8581 100644
--- a/web/app/components/workflow/nodes/if-else/__tests__/integration.spec.tsx
+++ b/web/app/components/workflow/nodes/if-else/__tests__/integration.spec.tsx
@@ -264,8 +264,8 @@ describe('if-else path', () => {
       await user.click(screen.getByText('Variable'))
       fireEvent.change(screen.getByDisplayValue('12'), { target: { value: '42' } })
 
-      expect(onSelect).toHaveBeenCalledWith(ComparisonOperator.is)
-      expect(onNumberVarTypeChange).toHaveBeenCalledWith(NumberVarType.variable)
+      expect(onSelect.mock.calls[0]?.[0]).toBe(ComparisonOperator.is)
+      expect(onNumberVarTypeChange.mock.calls[0]?.[0]).toBe(NumberVarType.variable)
       expect(onValueChange).toHaveBeenCalledWith('42')
     })
 
diff --git a/web/app/components/workflow/nodes/if-else/components/condition-add.tsx b/web/app/components/workflow/nodes/if-else/components/condition-add.tsx
index b8f5dab85b..01cf6c6f7e 100644
--- a/web/app/components/workflow/nodes/if-else/components/condition-add.tsx
+++ b/web/app/components/workflow/nodes/if-else/components/condition-add.tsx
@@ -63,7 +63,6 @@ const ConditionAdd = ({
         placement="bottom-start"
         sideOffset={4}
         popupClassName="border-none bg-transparent p-0 shadow-none backdrop-blur-none"
-        positionerProps={{ style: { zIndex: 1000 } }}
       >
         <div className="w-[296px] rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg">
           <VarReferenceVars
diff --git a/web/app/components/workflow/nodes/if-else/components/condition-list/condition-item.tsx b/web/app/components/workflow/nodes/if-else/components/condition-list/condition-item.tsx
index 9347a150b2..23e7443234 100644
--- a/web/app/components/workflow/nodes/if-else/components/condition-list/condition-item.tsx
+++ b/web/app/components/workflow/nodes/if-else/components/condition-list/condition-item.tsx
@@ -373,7 +373,7 @@ const ConditionItem = ({
                 <SelectTrigger className="h-8 rounded-t-none border-0 px-2 text-xs hover:bg-components-input-bg-normal focus-visible:bg-components-input-bg-normal">
                   {selectedSelectOption?.name ?? t('placeholder.select', { ns: 'common' })}
                 </SelectTrigger>
-                <SelectContent popupClassName="w-(--anchor-width)">
+                <SelectContent>
                   {selectOptions.map(option => (
                     <SelectItem key={option.value} value={option.value} className="text-xs">
                       <SelectItemText>{option.name}</SelectItemText>
diff --git a/web/app/components/workflow/nodes/if-else/components/condition-list/condition-operator.tsx b/web/app/components/workflow/nodes/if-else/components/condition-list/condition-operator.tsx
index 83dc97f088..d343b0c8e5 100644
--- a/web/app/components/workflow/nodes/if-else/components/condition-list/condition-operator.tsx
+++ b/web/app/components/workflow/nodes/if-else/components/condition-list/condition-operator.tsx
@@ -2,17 +2,18 @@ import type { ComparisonOperator } from '../../types'
 import type { VarType } from '@/app/components/workflow/types'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuTrigger,
+} from '@langgenius/dify-ui/dropdown-menu'
 import { RiArrowDownSLine } from '@remixicon/react'
 import {
   useMemo,
-  useState,
 } from 'react'
 import { useTranslation } from 'react-i18next'
-import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
 import { getOperators, isComparisonOperatorNeedTranslate } from '../../utils'
 
 const i18nPrefix = 'nodes.ifElse'
@@ -34,7 +35,6 @@ const ConditionOperator = ({
   onSelect,
 }: ConditionOperatorProps) => {
   const { t } = useTranslation()
-  const [open, setOpen] = useState(false)
 
   const options = useMemo(() => {
     return getOperators(varType, file).map((o) => {
@@ -46,49 +46,48 @@ const ConditionOperator = ({
   }, [t, varType, file])
   const selectedOption = options.find(o => Array.isArray(value) ? o.value === value[0] : o.value === value)
   return (
-    <PortalToFollowElem
-      open={open}
-      onOpenChange={setOpen}
-      placement="bottom-end"
-      offset={{
-        mainAxis: 4,
-        crossAxis: 0,
-      }}
-    >
-      <PortalToFollowElemTrigger onClick={() => setOpen(v => !v)}>
-        <Button
-          className={cn('shrink-0', !selectedOption && 'opacity-50', className)}
-          size="small"
-          variant="ghost"
-          disabled={disabled}
+    <DropdownMenu>
+      <DropdownMenuTrigger
+        render={(
+          <Button
+            className={cn('shrink-0', !selectedOption && 'opacity-50', className)}
+            size="small"
+            variant="ghost"
+            disabled={disabled}
+          />
+        )}
+      >
+        {
+          selectedOption
+            ? selectedOption.label
+            : t(`${i18nPrefix}.select`, { ns: 'workflow' })
+        }
+        <RiArrowDownSLine className="ml-1 h-3.5 w-3.5" />
+      </DropdownMenuTrigger>
+      <DropdownMenuContent
+        placement="bottom-end"
+        sideOffset={4}
+        popupClassName="rounded-xl border-[0.5px] bg-components-panel-bg-blur p-1"
+      >
+        <DropdownMenuRadioGroup
+          value={selectedOption?.value}
+          onValueChange={onSelect}
         >
-          {
-            selectedOption
-              ? selectedOption.label
-              : t(`${i18nPrefix}.select`, { ns: 'workflow' })
-          }
-          <RiArrowDownSLine className="ml-1 h-3.5 w-3.5" />
-        </Button>
-      </PortalToFollowElemTrigger>
-      <PortalToFollowElemContent className="z-11">
-        <div className="rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur p-1 shadow-lg">
           {
             options.map(option => (
-              <div
+              <DropdownMenuRadioItem
                 key={option.value}
-                className="flex h-7 cursor-pointer items-center rounded-lg px-3 py-1.5 text-[13px] font-medium text-text-secondary hover:bg-state-base-hover"
-                onClick={() => {
-                  onSelect(option.value)
-                  setOpen(false)
-                }}
+                value={option.value}
+                closeOnClick
+                className="h-7 rounded-lg px-3 py-1.5 text-[13px] font-medium text-text-secondary"
               >
                 {option.label}
-              </div>
+              </DropdownMenuRadioItem>
             ))
           }
-        </div>
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
+        </DropdownMenuRadioGroup>
+      </DropdownMenuContent>
+    </DropdownMenu>
   )
 }
 
diff --git a/web/app/components/workflow/nodes/if-else/components/condition-list/condition-var-selector.tsx b/web/app/components/workflow/nodes/if-else/components/condition-list/condition-var-selector.tsx
index e94eca7b38..b1582be22d 100644
--- a/web/app/components/workflow/nodes/if-else/components/condition-list/condition-var-selector.tsx
+++ b/web/app/components/workflow/nodes/if-else/components/condition-list/condition-var-selector.tsx
@@ -44,7 +44,6 @@ const ConditionVarSelector = ({
         placement="bottom-start"
         sideOffset={4}
         popupClassName="border-none bg-transparent p-0 shadow-none backdrop-blur-none"
-        positionerProps={{ style: { zIndex: 1000 } }}
       >
         <div className="w-[296px] rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg">
           <VarReferenceVars
diff --git a/web/app/components/workflow/nodes/if-else/components/condition-number-input.tsx b/web/app/components/workflow/nodes/if-else/components/condition-number-input.tsx
index 954f713a78..a17d7589f1 100644
--- a/web/app/components/workflow/nodes/if-else/components/condition-number-input.tsx
+++ b/web/app/components/workflow/nodes/if-else/components/condition-number-input.tsx
@@ -4,6 +4,18 @@ import type {
 } from '@/app/components/workflow/types'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuTrigger,
+} from '@langgenius/dify-ui/dropdown-menu'
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from '@langgenius/dify-ui/popover'
 import { RiArrowDownSLine } from '@remixicon/react'
 import { useBoolean } from 'ahooks'
 import { capitalize } from 'es-toolkit/string'
@@ -14,11 +26,6 @@ import {
 } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Variable02 } from '@/app/components/base/icons/src/vender/solid/development'
-import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
 import VarReferenceVars from '@/app/components/workflow/nodes/_base/components/variable/var-reference-vars'
 import { VarType } from '@/app/components/workflow/types'
 import { variableTransformer } from '@/app/components/workflow/utils'
@@ -63,58 +70,61 @@ const ConditionNumberInput = ({
 
   return (
     <div className="flex cursor-pointer items-center">
-      <PortalToFollowElem
+      <DropdownMenu
         open={numberVarTypeVisible}
         onOpenChange={setNumberVarTypeVisible}
-        placement="bottom-start"
-        offset={{ mainAxis: 2, crossAxis: 0 }}
       >
-        <PortalToFollowElemTrigger onClick={() => setNumberVarTypeVisible(v => !v)}>
-          <Button
-            className="shrink-0"
-            variant="ghost"
-            size="small"
+        <DropdownMenuTrigger
+          render={(
+            <Button
+              className="shrink-0"
+              variant="ghost"
+              size="small"
+            />
+          )}
+        >
+          {capitalize(numberVarType)}
+          <RiArrowDownSLine className="ml-px h-3.5 w-3.5" />
+        </DropdownMenuTrigger>
+        <DropdownMenuContent
+          placement="bottom-start"
+          sideOffset={2}
+          popupClassName="w-[112px] rounded-xl border-[0.5px] bg-components-panel-bg-blur p-1"
+        >
+          <DropdownMenuRadioGroup
+            value={numberVarType}
+            onValueChange={onNumberVarTypeChange}
           >
-            {capitalize(numberVarType)}
-            <RiArrowDownSLine className="ml-px h-3.5 w-3.5" />
-          </Button>
-        </PortalToFollowElemTrigger>
-        <PortalToFollowElemContent className="z-1000">
-          <div className="w-[112px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur p-1 shadow-lg">
             {
               options.map(option => (
-                <div
+                <DropdownMenuRadioItem
                   key={option}
+                  value={option}
+                  closeOnClick
                   className={cn(
-                    'flex h-7 cursor-pointer items-center rounded-md px-3 hover:bg-state-base-hover',
+                    'h-7 rounded-md px-3',
                     'text-[13px] font-medium text-text-secondary',
                     numberVarType === option && 'bg-state-base-hover',
                   )}
-                  onClick={() => {
-                    onNumberVarTypeChange(option)
-                    setNumberVarTypeVisible(false)
-                  }}
                 >
                   {capitalize(option)}
-                </div>
+                </DropdownMenuRadioItem>
               ))
             }
-          </div>
-        </PortalToFollowElemContent>
-      </PortalToFollowElem>
+          </DropdownMenuRadioGroup>
+        </DropdownMenuContent>
+      </DropdownMenu>
       <div className="mx-1 h-4 w-px bg-divider-regular"></div>
       <div className="ml-0.5 w-0 grow">
         {
           numberVarType === NumberVarType.variable && (
-            <PortalToFollowElem
+            <Popover
               open={variableSelectorVisible}
               onOpenChange={setVariableSelectorVisible}
-              placement="bottom-start"
-              offset={{ mainAxis: 2, crossAxis: 0 }}
             >
-              <PortalToFollowElemTrigger
-                className="w-full"
-                onClick={() => setVariableSelectorVisible(v => !v)}
+              <PopoverTrigger
+                nativeButton={false}
+                render={<div className="w-full" />}
               >
                 {
                   value && (
@@ -133,16 +143,20 @@ const ConditionNumberInput = ({
                     </div>
                   )
                 }
-              </PortalToFollowElemTrigger>
-              <PortalToFollowElemContent className="z-1000">
+              </PopoverTrigger>
+              <PopoverContent
+                placement="bottom-start"
+                sideOffset={2}
+                popupClassName="border-none bg-transparent shadow-none"
+              >
                 <div className={cn('w-[296px] rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg-blur pt-1 shadow-lg', isShort && 'w-[200px]')}>
                   <VarReferenceVars
                     vars={variables}
                     onChange={handleSelectVariable}
                   />
                 </div>
-              </PortalToFollowElemContent>
-            </PortalToFollowElem>
+              </PopoverContent>
+            </Popover>
           )
         }
         {
diff --git a/web/app/components/workflow/nodes/iteration-start/index.tsx b/web/app/components/workflow/nodes/iteration-start/index.tsx
index 90a57bef26..ec4f1bfa7f 100644
--- a/web/app/components/workflow/nodes/iteration-start/index.tsx
+++ b/web/app/components/workflow/nodes/iteration-start/index.tsx
@@ -1,8 +1,8 @@
 import type { NodeProps } from 'reactflow'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { RiHome5Fill } from '@remixicon/react'
 import { memo } from 'react'
 import { useTranslation } from 'react-i18next'
-import Tooltip from '@/app/components/base/tooltip'
 import { NodeSourceHandle } from '@/app/components/workflow/nodes/_base/components/node-handle'
 
 const IterationStartNode = ({ id, data }: NodeProps) => {
@@ -10,10 +10,14 @@ const IterationStartNode = ({ id, data }: NodeProps) => {
 
   return (
     <div className="nodrag group mt-1 flex h-11 w-11 items-center justify-center rounded-2xl border border-workflow-block-border bg-workflow-block-bg shadow-xs">
-      <Tooltip popupContent={t('blocks.iteration-start', { ns: 'workflow' })} asChild={false}>
-        <div className="flex h-6 w-6 items-center justify-center rounded-full border-[0.5px] border-components-panel-border-subtle bg-util-colors-blue-brand-blue-brand-500">
+      <Tooltip>
+        <TooltipTrigger
+          aria-label={t('blocks.iteration-start', { ns: 'workflow' })}
+          className="flex h-6 w-6 items-center justify-center rounded-full border-[0.5px] border-components-panel-border-subtle bg-util-colors-blue-brand-blue-brand-500 p-0"
+        >
           <RiHome5Fill className="h-3 w-3 text-text-primary-on-surface" />
-        </div>
+        </TooltipTrigger>
+        <TooltipContent>{t('blocks.iteration-start', { ns: 'workflow' })}</TooltipContent>
       </Tooltip>
       <NodeSourceHandle
         id={id}
@@ -30,10 +34,14 @@ export const IterationStartNodeDumb = () => {
 
   return (
     <div className="nodrag relative top-[21px] left-[17px] z-11 flex h-11 w-11 items-center justify-center rounded-2xl border border-workflow-block-border bg-workflow-block-bg">
-      <Tooltip popupContent={t('blocks.iteration-start', { ns: 'workflow' })} asChild={false}>
-        <div className="flex h-6 w-6 items-center justify-center rounded-full border-[0.5px] border-components-panel-border-subtle bg-util-colors-blue-brand-blue-brand-500">
+      <Tooltip>
+        <TooltipTrigger
+          aria-label={t('blocks.iteration-start', { ns: 'workflow' })}
+          className="flex h-6 w-6 items-center justify-center rounded-full border-[0.5px] border-components-panel-border-subtle bg-util-colors-blue-brand-blue-brand-500 p-0"
+        >
           <RiHome5Fill className="h-3 w-3 text-text-primary-on-surface" />
-        </div>
+        </TooltipTrigger>
+        <TooltipContent>{t('blocks.iteration-start', { ns: 'workflow' })}</TooltipContent>
       </Tooltip>
     </div>
   )
diff --git a/web/app/components/workflow/nodes/iteration/panel.tsx b/web/app/components/workflow/nodes/iteration/panel.tsx
index 6a3fbc17b0..c252c3b67d 100644
--- a/web/app/components/workflow/nodes/iteration/panel.tsx
+++ b/web/app/components/workflow/nodes/iteration/panel.tsx
@@ -101,7 +101,7 @@ const Panel: FC<NodePanelProps<IterationNodeType>> = ({
           <div className="px-4 pb-2">
             <Field title={t(`${i18nPrefix}.MaxParallelismTitle`, { ns: 'workflow' })} isSubTitle tooltip={<div className="w-[230px]">{t(`${i18nPrefix}.MaxParallelismDesc`, { ns: 'workflow' })}</div>}>
               <div className="row flex">
-                <Input type="number" wrapperClassName="w-18 mr-4 " max={MAX_PARALLEL_LIMIT} min={MIN_ITERATION_PARALLEL_NUM} value={inputs.parallel_nums} onChange={(e) => { changeParallelNums(Number(e.target.value)) }} />
+                <Input type="number" wrapperClassName="w-18 mr-4" max={MAX_PARALLEL_LIMIT} min={MIN_ITERATION_PARALLEL_NUM} value={inputs.parallel_nums} onChange={(e) => { changeParallelNums(Number(e.target.value)) }} />
                 <Slider
                   value={inputs.parallel_nums}
                   onValueChange={changeParallelNums}
@@ -133,7 +133,7 @@ const Panel: FC<NodePanelProps<IterationNodeType>> = ({
             <SelectTrigger className="w-full">
               {selectedResponseMethod?.name ?? t('placeholder.select', { ns: 'common' })}
             </SelectTrigger>
-            <SelectContent popupClassName="w-(--anchor-width)">
+            <SelectContent>
               {responseMethod.map(item => (
                 <SelectItem key={item.value} value={String(item.value)}>
                   <SelectItemText>{item.name}</SelectItemText>
diff --git a/web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/__tests__/selector.spec.tsx b/web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/__tests__/selector.spec.tsx
index 617944e4ee..bd2ec4cf53 100644
--- a/web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/__tests__/selector.spec.tsx
+++ b/web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/__tests__/selector.spec.tsx
@@ -1,4 +1,4 @@
-import { fireEvent, render, screen } from '@testing-library/react'
+import { fireEvent, render, screen, waitFor } from '@testing-library/react'
 import { ChunkStructureEnum } from '../../../types'
 import Selector from '../selector'
 
@@ -20,7 +20,7 @@ const options = [
 ]
 
 describe('ChunkStructureSelector', () => {
-  it('should open the selector panel and close it after selecting an option', () => {
+  it('should open the selector panel and close it after selecting an option', async () => {
     const onChange = vi.fn()
 
     render(
@@ -38,7 +38,9 @@ describe('ChunkStructureSelector', () => {
     fireEvent.click(screen.getByText('Parent child'))
 
     expect(onChange).toHaveBeenCalledWith(ChunkStructureEnum.parent_child)
-    expect(screen.queryByText('workflow.nodes.knowledgeBase.changeChunkStructure')).not.toBeInTheDocument()
+    await waitFor(() => {
+      expect(screen.queryByText('workflow.nodes.knowledgeBase.changeChunkStructure')).not.toBeInTheDocument()
+    })
   })
 
   it('should not open the selector when readonly is enabled', () => {
@@ -51,7 +53,8 @@ describe('ChunkStructureSelector', () => {
       />,
     )
 
-    fireEvent.click(screen.getByRole('button', { name: 'custom-trigger' }))
+    const trigger = screen.getByText('custom-trigger').closest('[role="button"]')
+    fireEvent.click(trigger!)
 
     expect(screen.queryByText('workflow.nodes.knowledgeBase.changeChunkStructure')).not.toBeInTheDocument()
   })
diff --git a/web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/selector.tsx b/web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/selector.tsx
index 7ab8de508f..dc38729854 100644
--- a/web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/selector.tsx
+++ b/web/app/components/workflow/nodes/knowledge-base/components/chunk-structure/selector.tsx
@@ -2,13 +2,13 @@ import type { ReactNode } from 'react'
 import type { ChunkStructureEnum } from '../../types'
 import type { Option } from './type'
 import { Button } from '@langgenius/dify-ui/button'
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from '@langgenius/dify-ui/popover'
 import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
 import OptionCard from '../option-card'
 
 type SelectorProps = {
@@ -32,37 +32,46 @@ const Selector = ({
     onChange(optionId)
     setOpen(false)
   }, [onChange])
+  const handleOpenChange = useCallback((nextOpen: boolean) => {
+    if (readonly && nextOpen)
+      return
+    setOpen(nextOpen)
+  }, [readonly])
 
   return (
-    <PortalToFollowElem
-      placement="bottom-end"
-      offset={{
-        mainAxis: 0,
-        crossAxis: -8,
-      }}
+    <Popover
       open={open}
-      onOpenChange={setOpen}
+      onOpenChange={handleOpenChange}
     >
-      <PortalToFollowElemTrigger
-        asChild
-        onClick={() => {
-          if (readonly)
-            return
-          setOpen(!open)
-        }}
+      {
+        trigger
+          ? (
+              <PopoverTrigger
+                nativeButton={false}
+                render={<div />}
+              >
+                {trigger}
+              </PopoverTrigger>
+            )
+          : (
+              <PopoverTrigger
+                render={(
+                  <Button
+                    size="small"
+                    variant="ghost-accent"
+                  />
+                )}
+              >
+                {t('panel.change', { ns: 'workflow' })}
+              </PopoverTrigger>
+            )
+      }
+      <PopoverContent
+        placement="bottom-end"
+        sideOffset={0}
+        alignOffset={-8}
+        popupClassName="border-none bg-transparent shadow-none"
       >
-        {
-          trigger || (
-            <Button
-              size="small"
-              variant="ghost-accent"
-            >
-              {t('panel.change', { ns: 'workflow' })}
-            </Button>
-          )
-        }
-      </PortalToFollowElemTrigger>
-      <PortalToFollowElemContent className="z-10">
         <div className="w-[404px] rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-xl backdrop-blur-[5px]">
           <div className="px-3 pt-3.5 system-sm-semibold text-text-primary">
             {t('nodes.knowledgeBase.changeChunkStructure', { ns: 'workflow' })}
@@ -86,8 +95,8 @@ const Selector = ({
             }
           </div>
         </div>
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
+      </PopoverContent>
+    </Popover>
   )
 }
 
diff --git a/web/app/components/workflow/nodes/knowledge-base/components/index-method.tsx b/web/app/components/workflow/nodes/knowledge-base/components/index-method.tsx
index 82ccf265ba..0597d621f6 100644
--- a/web/app/components/workflow/nodes/knowledge-base/components/index-method.tsx
+++ b/web/app/components/workflow/nodes/knowledge-base/components/index-method.tsx
@@ -1,7 +1,5 @@
 import { cn } from '@langgenius/dify-ui/cn'
 import { Slider } from '@langgenius/dify-ui/slider'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
-import { RiQuestionLine } from '@remixicon/react'
 import {
   memo,
   useCallback,
@@ -11,6 +9,7 @@ import {
   Economic,
   HighQuality,
 } from '@/app/components/base/icons/src/vender/knowledge'
+import { Infotip } from '@/app/components/base/infotip'
 import Input from '@/app/components/base/input'
 import { Field } from '@/app/components/workflow/nodes/_base/components/layout'
 import {
@@ -97,14 +96,12 @@ const IndexMethod = ({
                   <div className="truncate system-xs-medium text-text-secondary">
                     {t('form.numberOfKeywords', { ns: 'datasetSettings' })}
                   </div>
-                  <Tooltip>
-                    <TooltipTrigger
-                      render={<RiQuestionLine className="ml-0.5 h-3.5 w-3.5 text-text-quaternary" />}
-                    />
-                    <TooltipContent>
-                      number of keywords
-                    </TooltipContent>
-                  </Tooltip>
+                  <Infotip
+                    aria-label={t('form.numberOfKeywords', { ns: 'datasetSettings' })}
+                    className="ml-0.5 h-3.5 w-3.5"
+                  >
+                    {t('form.numberOfKeywords', { ns: 'datasetSettings' })}
+                  </Infotip>
                 </div>
                 <Slider
                   disabled={readonly}
diff --git a/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/search-method-option.tsx b/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/search-method-option.tsx
index a1f601cce9..54b37f9b52 100644
--- a/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/search-method-option.tsx
+++ b/web/app/components/workflow/nodes/knowledge-base/components/retrieval-setting/search-method-option.tsx
@@ -17,7 +17,7 @@ import {
 import { useTranslation } from 'react-i18next'
 import WeightedScoreComponent from '@/app/components/app/configuration/dataset-config/params-config/weighted-score'
 import { AlertTriangle } from '@/app/components/base/icons/src/vender/solid/alertsAndFeedback'
-import Tooltip from '@/app/components/base/tooltip'
+import { Infotip } from '@/app/components/base/infotip'
 import { DEFAULT_WEIGHTED_SCORE } from '@/models/datasets'
 import {
   HybridSearchModeEnum,
@@ -174,10 +174,13 @@ const SearchMethodOption = ({
                       disabled={readonly}
                     />
                     {t('modelProvider.rerankModel.key', { ns: 'common' })}
-                    <Tooltip
-                      triggerClassName="ml-0.5 shrink-0 w-3.5 h-3.5"
-                      popupContent={t('modelProvider.rerankModel.tip', { ns: 'common' })}
-                    />
+                    <Infotip
+                      aria-label={t('modelProvider.rerankModel.tip', { ns: 'common' })}
+                      className="ml-0.5 h-3.5 w-3.5 shrink-0"
+                      iconClassName="h-3.5 w-3.5"
+                    >
+                      {t('modelProvider.rerankModel.tip', { ns: 'common' })}
+                    </Infotip>
                   </div>
                 )
               }
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/__tests__/integration.spec.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/__tests__/integration.spec.tsx
index b9f2b17bb2..1c7513d13f 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/__tests__/integration.spec.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/__tests__/integration.spec.tsx
@@ -19,6 +19,7 @@ import { BlockEnum, VarType } from '../../../types'
 import AddDataset from '../components/add-dataset'
 import DatasetItem from '../components/dataset-item'
 import DatasetList from '../components/dataset-list'
+import AddCondition from '../components/metadata/add-condition'
 import ConditionCommonVariableSelector from '../components/metadata/condition-list/condition-common-variable-selector'
 import ConditionDate from '../components/metadata/condition-list/condition-date'
 import ConditionItem from '../components/metadata/condition-list/condition-item'
@@ -299,7 +300,7 @@ describe('knowledge-retrieval path', () => {
         />,
       )
 
-      await user.click(screen.getByTestId('add-button'))
+      await user.click(screen.getByRole('button', { name: 'common.operation.add workflow.nodes.knowledgeRetrieval.knowledge' }))
       await user.click(screen.getByText('select-dataset'))
 
       expect(onChange).toHaveBeenCalledWith([
@@ -426,7 +427,7 @@ describe('knowledge-retrieval path', () => {
       await user.click(screen.getByRole('button', { name: /workflow.nodes.knowledgeRetrieval.metadata.options.disabled.title/i }))
       await user.click(screen.getByText('workflow.nodes.knowledgeRetrieval.metadata.options.manual.title'))
 
-      expect(onSelect).toHaveBeenCalledWith(MetadataFilteringModeEnum.manual)
+      expect(onSelect.mock.calls[0]?.[0]).toBe(MetadataFilteringModeEnum.manual)
     })
 
     it('should remove stale metadata conditions and open the manual metadata panel', async () => {
@@ -462,6 +463,29 @@ describe('knowledge-retrieval path', () => {
       expect(screen.getByText('metadata-panel')).toBeInTheDocument()
     })
 
+    it('should call handleAddCondition with the correct metadata item when clicking any part of the row', async () => {
+      const user = userEvent.setup()
+      const handleAddCondition = vi.fn()
+      const permissionMetadata = createMetadata({ id: 'meta-perm', name: 'permission', type: MetadataFilteringVariableType.string })
+      const topicMetadata = createMetadata({ id: 'meta-topic', name: 'topic', type: MetadataFilteringVariableType.string })
+
+      render(
+        <AddCondition
+          metadataList={[permissionMetadata, topicMetadata]}
+          handleAddCondition={handleAddCondition}
+        />,
+      )
+
+      await user.click(screen.getByRole('button', { name: /workflow.nodes.knowledgeRetrieval.metadata.panel.add/i }))
+      await user.click(screen.getAllByText('string', { selector: 'div.shrink-0' })[0]!)
+
+      expect(handleAddCondition).toHaveBeenCalledTimes(1)
+      expect(handleAddCondition).toHaveBeenCalledWith(expect.objectContaining({
+        id: 'meta-perm',
+        name: 'permission',
+      }))
+    })
+
     it('should render automatic and manual metadata filter states', async () => {
       const user = userEvent.setup()
       const baseProps: MetadataShape = {
@@ -582,7 +606,7 @@ describe('knowledge-retrieval path', () => {
 
       await user.click(screen.getAllByRole('button', { name: /contains/i })[0]!)
       await user.click(screen.getByText('workflow.nodes.ifElse.comparisonOperator.is'))
-      await user.click(screen.getByText(/March 09 2024/).nextElementSibling as Element)
+      await user.click(screen.getByRole('button', { name: 'common.operation.clear' }))
       fireEvent.change(screen.getByDisplayValue('agent'), { target: { value: 'updated-agent' } })
       fireEvent.click(container.querySelector('.ml-1.mt-1') as Element)
 
@@ -591,6 +615,24 @@ describe('knowledge-retrieval path', () => {
       expect(onUpdateCondition).toHaveBeenCalledWith('condition-1', expect.objectContaining({ value: 'updated-agent' }))
       expect(onRemoveCondition).toHaveBeenCalledWith('condition-1')
     })
+
+    it('should resolve built-in metadata fields by name because their ids are shared', () => {
+      render(
+        <ConditionItem
+          metadataList={[
+            createMetadata({ id: 'built-in', name: 'document_name' }),
+            createMetadata({ id: 'built-in', name: 'uploader' }),
+          ]}
+          condition={createCondition({
+            metadata_id: 'built-in',
+            name: 'uploader',
+          })}
+        />,
+      )
+
+      expect(screen.getByText('uploader')).toBeInTheDocument()
+      expect(screen.queryByText('document_name')).not.toBeInTheDocument()
+    })
   })
 
   describe('Node rendering', () => {
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/components/add-dataset.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/components/add-dataset.tsx
index fe6d83d244..df30932137 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/components/add-dataset.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/components/add-dataset.tsx
@@ -4,6 +4,7 @@ import type { DataSet } from '@/models/datasets'
 import { useBoolean } from 'ahooks'
 import * as React from 'react'
 import { useCallback } from 'react'
+import { useTranslation } from 'react-i18next'
 import SelectDataset from '@/app/components/app/configuration/dataset-config/select-dataset'
 
 type Props = {
@@ -15,6 +16,7 @@ const AddDataset: FC<Props> = ({
   selectedIds,
   onChange,
 }) => {
+  const { t } = useTranslation()
   const [isShowModal, {
     setTrue: showModal,
     setFalse: hideModal,
@@ -26,17 +28,20 @@ const AddDataset: FC<Props> = ({
   }, [onChange, hideModal])
   return (
     <div>
-      <div className="cursor-pointer rounded-md p-1 select-none hover:bg-state-base-hover" onClick={showModal} data-testid="add-button">
-        <span className="i-ri-add-line h-4 w-4 text-text-tertiary" />
-      </div>
-      {isShowModal && (
-        <SelectDataset
-          isShow={isShowModal}
-          onClose={hideModal}
-          selectedIds={selectedIds}
-          onSelect={handleSelect}
-        />
-      )}
+      <button
+        type="button"
+        aria-label={`${t('operation.add', { ns: 'common' })} ${t('nodes.knowledgeRetrieval.knowledge', { ns: 'workflow' })}`}
+        className="cursor-pointer rounded-md border-none bg-transparent p-1 outline-hidden select-none hover:bg-state-base-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid"
+        onClick={showModal}
+      >
+        <span aria-hidden="true" className="i-ri-add-line h-4 w-4 text-text-tertiary" />
+      </button>
+      <SelectDataset
+        isShow={isShowModal}
+        onClose={hideModal}
+        selectedIds={selectedIds}
+        onSelect={handleSelect}
+      />
     </div>
   )
 }
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/components/dataset-item.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/components/dataset-item.tsx
index 90e9caae9d..c8a0824565 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/components/dataset-item.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/components/dataset-item.tsx
@@ -1,6 +1,15 @@
 'use client'
 import type { FC } from 'react'
 import type { DataSet } from '@/models/datasets'
+import { cn } from '@langgenius/dify-ui/cn'
+import {
+  Drawer,
+  DrawerBackdrop,
+  DrawerContent,
+  DrawerPopup,
+  DrawerPortal,
+  DrawerViewport,
+} from '@langgenius/dify-ui/drawer'
 import {
   RiDeleteBinLine,
   RiEditLine,
@@ -13,7 +22,6 @@ import SettingsModal from '@/app/components/app/configuration/dataset-config/set
 import ActionButton, { ActionButtonState } from '@/app/components/base/action-button'
 import AppIcon from '@/app/components/base/app-icon'
 import Badge from '@/app/components/base/badge'
-import Drawer from '@/app/components/base/drawer'
 import { ModelFeatureEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import FeatureIcon from '@/app/components/header/account-setting/model-provider-page/model-selector/feature-icon'
 import useBreakpoints, { MediaType } from '@/hooks/use-breakpoints'
@@ -86,7 +94,6 @@ const DatasetItem: FC<Props> = ({
             editable && (
               <ActionButton
                 aria-label={t('operation.edit', { ns: 'common' })}
-                data-testid="dataset-item-edit-button"
                 onClick={(e) => {
                   e.stopPropagation()
                   showSettingsModal()
@@ -98,7 +105,6 @@ const DatasetItem: FC<Props> = ({
           }
           <ActionButton
             aria-label={t('operation.remove', { ns: 'common' })}
-            data-testid="dataset-item-remove-button"
             onClick={handleRemove}
             state={isDeleteHovered ? ActionButtonState.Destructive : ActionButtonState.Default}
             onMouseEnter={() => setIsDeleteHovered(true)}
@@ -131,12 +137,29 @@ const DatasetItem: FC<Props> = ({
       }
 
       {isShowSettingsModal && (
-        <Drawer isOpen={isShowSettingsModal} onClose={hideSettingsModal} footer={null} mask={isMobile} panelClassName="mt-16 mx-2 sm:mr-2 mb-3 p-0! max-w-[640px]! rounded-xl">
-          <SettingsModal
-            currentDataset={payload}
-            onCancel={hideSettingsModal}
-            onSave={handleSave}
-          />
+        <Drawer
+          open={isShowSettingsModal}
+          modal
+          swipeDirection="right"
+          onOpenChange={(open) => {
+            if (!open)
+              hideSettingsModal()
+          }}
+        >
+          <DrawerPortal>
+            <DrawerBackdrop className={cn(!isMobile && 'bg-transparent')} />
+            <DrawerViewport>
+              <DrawerPopup className="p-0! data-[swipe-direction=right]:top-16 data-[swipe-direction=right]:right-2 data-[swipe-direction=right]:bottom-3 data-[swipe-direction=right]:h-auto data-[swipe-direction=right]:w-full data-[swipe-direction=right]:max-w-[640px] data-[swipe-direction=right]:rounded-xl">
+                <DrawerContent className="flex min-h-0 flex-1 flex-col p-0 pb-0">
+                  <SettingsModal
+                    currentDataset={payload}
+                    onCancel={hideSettingsModal}
+                    onSave={handleSave}
+                  />
+                </DrawerContent>
+              </DrawerPopup>
+            </DrawerViewport>
+          </DrawerPortal>
         </Drawer>
       )}
     </div>
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/add-condition.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/add-condition.tsx
index 2787aafafd..2de3348ca3 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/add-condition.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/add-condition.tsx
@@ -50,7 +50,6 @@ const AddCondition = ({
         placement="bottom-start"
         sideOffset={12}
         popupClassName="border-none bg-transparent p-0 shadow-none backdrop-blur-none"
-        positionerProps={{ style: { zIndex: 1002 } }}
       >
         <div className="w-[320px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg">
           <div className="p-2 pb-1">
@@ -66,6 +65,7 @@ const AddCondition = ({
               <div
                 key={metadata.name}
                 className="flex h-6 cursor-pointer items-center rounded-md px-3 system-sm-medium text-text-secondary hover:bg-state-base-hover"
+                onClick={() => handleAddConditionWrapped(metadata)}
               >
                 <div className="mr-1 p-px">
                   <MetadataIcon type={metadata.type} />
@@ -73,7 +73,6 @@ const AddCondition = ({
                 <div
                   className="grow truncate"
                   title={metadata.name}
-                  onClick={() => handleAddConditionWrapped(metadata)}
                 >
                   {metadata.name}
                 </div>
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-common-variable-selector.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-common-variable-selector.tsx
index d4aedbd8b9..07e5481f6c 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-common-variable-selector.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-common-variable-selector.tsx
@@ -63,7 +63,6 @@ const ConditionCommonVariableSelector = ({
         placement="bottom-start"
         sideOffset={4}
         popupClassName="border-none bg-transparent p-0 shadow-none backdrop-blur-none"
-        positionerProps={{ style: { zIndex: 1000 } }}
       >
         <div className="w-[200px] rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg-blur p-1 shadow-lg">
           {variables.map(v => (
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-date.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-date.tsx
index fe4c086cb4..639ef164e4 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-date.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-date.tsx
@@ -31,41 +31,46 @@ const ConditionDate = ({
   const renderTrigger = useCallback(({
     handleClickTrigger,
   }: TriggerProps) => {
+    const hasValue = Boolean(value)
+    const triggerText = value
+      ? dayjs(value * 1000).tz(timezone).format('MMMM DD YYYY HH:mm A')
+      : t('nodes.knowledgeRetrieval.metadata.panel.datePlaceholder', { ns: 'workflow' })
+
     return (
-      <div className="group flex items-center" onClick={handleClickTrigger}>
-        <div
+      <div className="group flex items-center">
+        <button
+          type="button"
           className={cn(
-            'mr-0.5 flex h-6 grow cursor-pointer items-center px-1 system-sm-regular',
-            value ? 'text-text-secondary' : 'text-text-tertiary',
+            'mr-0.5 flex h-6 grow cursor-pointer items-center border-none bg-transparent px-1 py-0 text-left system-sm-regular focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden',
+            hasValue ? 'text-text-secondary' : 'text-text-tertiary',
           )}
+          onClick={handleClickTrigger}
         >
-          {
-            value
-              ? dayjs(value * 1000).tz(timezone).format('MMMM DD YYYY HH:mm A')
-              : t('nodes.knowledgeRetrieval.metadata.panel.datePlaceholder', { ns: 'workflow' })
-          }
-        </div>
-        {
-          !!value && (
-            <RiCloseCircleFill
-              className={cn(
-                'hidden h-4 w-4 shrink-0 cursor-pointer group-hover:block hover:text-components-input-text-filled',
-                value && 'text-text-quaternary',
-              )}
-              onClick={(e) => {
-                e.stopPropagation()
-                handleDateChange()
-              }}
-            />
-          )
-        }
-        <RiCalendarLine
-          className={cn(
-            'block h-4 w-4 shrink-0',
-            value ? 'text-text-quaternary' : 'text-text-tertiary',
-            value && 'group-hover:hidden',
-          )}
-        />
+          <span className="grow">{triggerText}</span>
+          <RiCalendarLine
+            className={cn(
+              'block h-4 w-4 shrink-0',
+              hasValue ? 'text-text-quaternary' : 'text-text-tertiary',
+              hasValue && 'group-hover:hidden',
+            )}
+            aria-hidden="true"
+          />
+        </button>
+        {hasValue
+          ? (
+              <button
+                type="button"
+                aria-label={t('operation.clear', { ns: 'common' })}
+                className="hidden h-4 w-4 shrink-0 cursor-pointer border-none bg-transparent p-0 text-text-quaternary group-hover:block hover:text-components-input-text-filled focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+                onClick={(e) => {
+                  e.stopPropagation()
+                  handleDateChange()
+                }}
+              >
+                <RiCloseCircleFill className="h-4 w-4" aria-hidden="true" />
+              </button>
+            )
+          : null}
       </div>
     )
   }, [value, handleDateChange, timezone, t])
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-item.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-item.tsx
index 46f03d0c77..56936d9251 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-item.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-item.tsx
@@ -62,13 +62,16 @@ const ConditionItem = ({
   }, [onRemoveCondition, condition.id])
 
   const currentMetadata = useMemo(() => {
-    // Try to match by metadata_id first (reliable reference)
     if (condition.metadata_id) {
-      const found = metadataList.find(metadata => metadata.id === condition.metadata_id)
-      if (found)
-        return found
+      const foundByIdAndName = metadataList.find(metadata => metadata.id === condition.metadata_id && metadata.name === condition.name)
+      if (foundByIdAndName)
+        return foundByIdAndName
+
+      const foundById = metadataList.filter(metadata => metadata.id === condition.metadata_id)
+      if (foundById.length === 1)
+        return foundById[0]
     }
-    // Fallback to name matching for backward compatibility with old conditions
+
     return metadataList.find(metadata => metadata.name === condition.name)
   }, [metadataList, condition.metadata_id, condition.name])
 
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-operator.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-operator.tsx
index f14743ce9f..0784b99cfb 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-operator.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-operator.tsx
@@ -4,17 +4,17 @@ import type {
 } from '@/app/components/workflow/nodes/knowledge-retrieval/types'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from '@langgenius/dify-ui/popover'
 import { RiArrowDownSLine } from '@remixicon/react'
 import {
   useMemo,
   useState,
 } from 'react'
 import { useTranslation } from 'react-i18next'
-import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
 import {
   getOperators,
   isComparisonOperatorNeedTranslate,
@@ -49,31 +49,32 @@ const ConditionOperator = ({
   }, [t, variableType])
   const selectedOption = options.find(o => Array.isArray(value) ? o.value === value[0] : o.value === value)
   return (
-    <PortalToFollowElem
+    <Popover
       open={open}
       onOpenChange={setOpen}
-      placement="bottom-end"
-      offset={{
-        mainAxis: 4,
-        crossAxis: 0,
-      }}
     >
-      <PortalToFollowElemTrigger onClick={() => setOpen(v => !v)}>
-        <Button
-          className={cn('shrink-0', !selectedOption && 'opacity-50', className)}
-          size="small"
-          variant="ghost"
-          disabled={disabled}
-        >
-          {
-            selectedOption
-              ? selectedOption.label
-              : t(`${i18nPrefix}.select`, { ns: 'workflow' })
-          }
-          <RiArrowDownSLine className="ml-1 h-3.5 w-3.5" />
-        </Button>
-      </PortalToFollowElemTrigger>
-      <PortalToFollowElemContent className="z-10">
+      <PopoverTrigger
+        render={(
+          <Button
+            className={cn('shrink-0', !selectedOption && 'opacity-50', className)}
+            size="small"
+            variant="ghost"
+            disabled={disabled}
+          >
+            {
+              selectedOption
+                ? selectedOption.label
+                : t(`${i18nPrefix}.select`, { ns: 'workflow' })
+            }
+            <RiArrowDownSLine className="ml-1 h-3.5 w-3.5" />
+          </Button>
+        )}
+      />
+      <PopoverContent
+        placement="bottom-end"
+        sideOffset={4}
+        popupClassName="border-none bg-transparent p-0 shadow-none backdrop-blur-none"
+      >
         <div className="rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur p-1 shadow-lg">
           {
             options.map(option => (
@@ -90,8 +91,8 @@ const ConditionOperator = ({
             ))
           }
         </div>
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
+      </PopoverContent>
+    </Popover>
   )
 }
 
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-value-method.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-value-method.tsx
index 12d7c9cc69..d93af76fd7 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-value-method.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-value-method.tsx
@@ -1,13 +1,13 @@
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from '@langgenius/dify-ui/popover'
 import { RiArrowDownSLine } from '@remixicon/react'
 import { capitalize } from 'es-toolkit/string'
 import { useState } from 'react'
-import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
 
 export type ConditionValueMethodProps = {
   valueMethod?: string
@@ -24,23 +24,27 @@ const ConditionValueMethod = ({
   const [open, setOpen] = useState(false)
 
   return (
-    <PortalToFollowElem
+    <Popover
       open={open}
       onOpenChange={setOpen}
-      placement="bottom-start"
-      offset={{ mainAxis: 4, crossAxis: 0 }}
     >
-      <PortalToFollowElemTrigger asChild onClick={() => setOpen(v => !v)}>
-        <Button
-          className="shrink-0"
-          variant="ghost"
-          size="small"
-        >
-          {capitalize(valueMethod)}
-          <RiArrowDownSLine className="ml-px h-3.5 w-3.5" />
-        </Button>
-      </PortalToFollowElemTrigger>
-      <PortalToFollowElemContent className="z-1000">
+      <PopoverTrigger
+        render={(
+          <Button
+            className="shrink-0"
+            variant="ghost"
+            size="small"
+          >
+            {capitalize(valueMethod)}
+            <RiArrowDownSLine className="ml-px h-3.5 w-3.5" />
+          </Button>
+        )}
+      />
+      <PopoverContent
+        placement="bottom-start"
+        sideOffset={4}
+        popupClassName="border-none bg-transparent p-0 shadow-none backdrop-blur-none"
+      >
         <div className="w-[112px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur p-1 shadow-lg">
           {
             options.map(option => (
@@ -63,8 +67,8 @@ const ConditionValueMethod = ({
             ))
           }
         </div>
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
+      </PopoverContent>
+    </Popover>
   )
 }
 
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-variable-selector.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-variable-selector.tsx
index 7ef4ed7388..a81e2465e0 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-variable-selector.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-variable-selector.tsx
@@ -70,7 +70,6 @@ const ConditionVariableSelector = ({
         placement="bottom-start"
         sideOffset={4}
         popupClassName="border-none bg-transparent p-0 shadow-none backdrop-blur-none"
-        positionerProps={{ style: { zIndex: 1000 } }}
       >
         <div className="w-[296px] rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg">
           <VarReferenceVars
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/index.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/index.tsx
index 2f5baeb089..61d693de29 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/index.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/index.tsx
@@ -5,7 +5,7 @@ import {
   useState,
 } from 'react'
 import { useTranslation } from 'react-i18next'
-import Tooltip from '@/app/components/base/tooltip'
+import { Infotip } from '@/app/components/base/infotip'
 import ModelParameterModal from '@/app/components/header/account-setting/model-provider-page/model-parameter-modal'
 import Collapse from '@/app/components/workflow/nodes/_base/components/collapse'
 import { MetadataFilteringModeEnum } from '@/app/components/workflow/nodes/knowledge-retrieval/types'
@@ -46,13 +46,9 @@ const MetadataFilter = ({
             <div className="mr-0.5 system-sm-semibold-uppercase text-text-secondary">
               {t('nodes.knowledgeRetrieval.metadata.title', { ns: 'workflow' })}
             </div>
-            <Tooltip
-              popupContent={(
-                <div className="w-[200px]">
-                  {t('nodes.knowledgeRetrieval.metadata.tip', { ns: 'workflow' })}
-                </div>
-              )}
-            />
+            <Infotip aria-label={t('nodes.knowledgeRetrieval.metadata.tip', { ns: 'workflow' })} popupClassName="w-[200px]">
+              {t('nodes.knowledgeRetrieval.metadata.tip', { ns: 'workflow' })}
+            </Infotip>
             {collapseIcon}
           </div>
           <div className="flex items-center">
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/metadata-filter-selector.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/metadata-filter-selector.tsx
index 396fd069e7..0d2ee187e8 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/metadata-filter-selector.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-filter/metadata-filter-selector.tsx
@@ -1,15 +1,16 @@
 import { Button } from '@langgenius/dify-ui/button'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuTrigger,
+} from '@langgenius/dify-ui/dropdown-menu'
 import {
   RiArrowDownSLine,
   RiCheckLine,
 } from '@remixicon/react'
-import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
 import { MetadataFilteringModeEnum } from '@/app/components/workflow/nodes/knowledge-retrieval/types'
 
 type MetadataFilterSelectorProps = {
@@ -21,7 +22,6 @@ const MetadataFilterSelector = ({
   onSelect,
 }: MetadataFilterSelectorProps) => {
   const { t } = useTranslation()
-  const [open, setOpen] = useState(false)
   const options = [
     {
       key: MetadataFilteringModeEnum.disabled,
@@ -43,41 +43,35 @@ const MetadataFilterSelector = ({
   const selectedOption = options.find(option => option.key === value)!
 
   return (
-    <PortalToFollowElem
-      placement="bottom-end"
-      offset={{
-        mainAxis: 4,
-        crossAxis: 0,
-      }}
-      open={open}
-      onOpenChange={setOpen}
-    >
-      <PortalToFollowElemTrigger
-        onClick={(e) => {
-          e.stopPropagation()
-          setOpen(!open)
-        }}
-        asChild
+    <DropdownMenu>
+      <DropdownMenuTrigger
+        render={(
+          <Button
+            variant="secondary"
+            size="small"
+            onClick={e => e.stopPropagation()}
+          />
+        )}
       >
-        <Button
-          variant="secondary"
-          size="small"
+        {selectedOption.value}
+        <RiArrowDownSLine className="h-3.5 w-3.5" />
+      </DropdownMenuTrigger>
+      <DropdownMenuContent
+        placement="bottom-end"
+        sideOffset={4}
+        popupClassName="w-[280px] rounded-xl border-[0.5px] bg-components-panel-bg-blur p-1"
+      >
+        <DropdownMenuRadioGroup
+          value={value}
+          onValueChange={onSelect}
         >
-          {selectedOption.value}
-          <RiArrowDownSLine className="h-3.5 w-3.5" />
-        </Button>
-      </PortalToFollowElemTrigger>
-      <PortalToFollowElemContent className="z-10">
-        <div className="w-[280px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur p-1 shadow-lg">
           {
             options.map(option => (
-              <div
+              <DropdownMenuRadioItem
                 key={option.key}
-                className="flex cursor-pointer rounded-lg p-2 pr-3 hover:bg-state-base-hover"
-                onClick={() => {
-                  onSelect(option.key)
-                  setOpen(false)
-                }}
+                value={option.key}
+                closeOnClick
+                className="h-auto items-start rounded-lg p-2 pr-3"
               >
                 <div className="w-4 shrink-0">
                   {
@@ -94,12 +88,12 @@ const MetadataFilterSelector = ({
                     {option.desc}
                   </div>
                 </div>
-              </div>
+              </DropdownMenuRadioItem>
             ))
           }
-        </div>
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
+        </DropdownMenuRadioGroup>
+      </DropdownMenuContent>
+    </DropdownMenu>
   )
 }
 
diff --git a/web/app/components/workflow/nodes/list-operator/components/filter-condition.tsx b/web/app/components/workflow/nodes/list-operator/components/filter-condition.tsx
index 3994eba7f0..6d92b8123c 100644
--- a/web/app/components/workflow/nodes/list-operator/components/filter-condition.tsx
+++ b/web/app/components/workflow/nodes/list-operator/components/filter-condition.tsx
@@ -134,7 +134,7 @@ const ValueInput = ({
         <SelectTrigger className="h-8 grow text-[13px]">
           {selectedOption?.name ?? 'Select value'}
         </SelectTrigger>
-        <SelectContent popupClassName="w-(--anchor-width)">
+        <SelectContent>
           {selectOptions.map(option => (
             <SelectItem key={option.value} value={option.value}>
               <SelectItemText>{option.name}</SelectItemText>
diff --git a/web/app/components/workflow/nodes/llm/components/__tests__/panel-output-section.spec.tsx b/web/app/components/workflow/nodes/llm/components/__tests__/panel-output-section.spec.tsx
index 65ff728292..97d5a8eb27 100644
--- a/web/app/components/workflow/nodes/llm/components/__tests__/panel-output-section.spec.tsx
+++ b/web/app/components/workflow/nodes/llm/components/__tests__/panel-output-section.spec.tsx
@@ -33,7 +33,7 @@ vi.mock('@/app/components/workflow/nodes/_base/components/output-vars', () => ({
 
 vi.mock('../structure-output', () => ({
   __esModule: true,
-  default: (props: { className?: string, value?: StructuredOutput, onChange: (value: StructuredOutput) => void }) => {
+  StructureOutput: (props: { className?: string, value?: StructuredOutput, onChange: (value: StructuredOutput) => void }) => {
     mockStructureOutput(props)
     return <div data-testid="structure-output">structured-output</div>
   },
diff --git a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/index.tsx b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/index.tsx
index 66ea3bfc59..5b3d187406 100644
--- a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/index.tsx
+++ b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/index.tsx
@@ -1,8 +1,6 @@
-import type { FC } from 'react'
 import type { SchemaRoot } from '../../types'
-import * as React from 'react'
-import Modal from '../../../../../base/modal'
-import JsonSchemaConfig from './json-schema-config'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
+import { JsonSchemaConfig } from './json-schema-config'
 
 type JsonSchemaConfigModalProps = {
   isShow: boolean
@@ -11,25 +9,28 @@ type JsonSchemaConfigModalProps = {
   onClose: () => void
 }
 
-const JsonSchemaConfigModal: FC<JsonSchemaConfigModalProps> = ({
+export function JsonSchemaConfigModal({
   isShow,
   defaultSchema,
   onSave,
   onClose,
-}) => {
+}: JsonSchemaConfigModalProps) {
   return (
-    <Modal
-      isShow={isShow}
-      onClose={onClose}
-      className="h-[800px] max-w-[960px] p-0"
+    <Dialog
+      open={isShow}
+      onOpenChange={(open) => {
+        if (!open)
+          onClose()
+      }}
     >
-      <JsonSchemaConfig
-        defaultSchema={defaultSchema}
-        onSave={onSave}
-        onClose={onClose}
-      />
-    </Modal>
+      <DialogContent className="h-[calc(100dvh-32px)] max-h-[800px] w-full max-w-[960px] overflow-hidden! border-none p-0 text-left align-middle">
+
+        <JsonSchemaConfig
+          defaultSchema={defaultSchema}
+          onSave={onSave}
+          onClose={onClose}
+        />
+      </DialogContent>
+    </Dialog>
   )
 }
-
-export default JsonSchemaConfigModal
diff --git a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-importer.tsx b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-importer.tsx
index da8c89f755..d521a0b861 100644
--- a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-importer.tsx
+++ b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-importer.tsx
@@ -99,9 +99,14 @@ const JsonImporter: FC<JsonImporterProps> = ({
         <div className="flex w-[400px] flex-col rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-2xl shadow-shadow-shadow-9">
           {/* Title */}
           <div className="relative px-3 pt-3.5 pb-1">
-            <div className="absolute right-2.5 bottom-0 flex h-8 w-8 items-center justify-center" onClick={onClose}>
-              <RiCloseLine className="h-4 w-4 text-text-tertiary" />
-            </div>
+            <button
+              type="button"
+              aria-label={t('operation.close', { ns: 'common' })}
+              className="absolute right-2.5 bottom-0 flex h-8 w-8 items-center justify-center border-none bg-transparent p-0"
+              onClick={onClose}
+            >
+              <RiCloseLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
+            </button>
             <div className="flex pr-8 pl-1 system-xl-semibold text-text-primary">
               {t('nodes.llm.jsonSchema.import', { ns: 'workflow' })}
             </div>
diff --git a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-config.tsx b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-config.tsx
index 96c508b48f..c8dbf3ab90 100644
--- a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-config.tsx
+++ b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-config.tsx
@@ -1,13 +1,12 @@
-import type { FC } from 'react'
 import type { SchemaRoot } from '../../types'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
 import { toast } from '@langgenius/dify-ui/toast'
-import { useCallback, useState } from 'react'
+import { ToggleGroup, ToggleGroupItem } from '@langgenius/dify-ui/toggle-group'
+import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Divider from '@/app/components/base/divider'
 import { JSON_SCHEMA_MAX_DEPTH } from '@/config'
-import { SegmentedControl } from '../../../../../base/segmented-control'
 import { Type } from '../../types'
 import {
   checkJsonSchemaDepth,
@@ -35,11 +34,15 @@ enum SchemaView {
   JsonSchema = 'jsonSchema',
 }
 
-const TimelineViewIcon: FC<{ className?: string }> = ({ className }) => {
+type IconProps = {
+  className?: string
+}
+
+function TimelineViewIcon({ className }: IconProps) {
   return <span className={cn('i-ri-timeline-view', className)} />
 }
 
-const BracesIcon: FC<{ className?: string }> = ({ className }) => {
+function BracesIcon({ className }: IconProps) {
   return <span className={cn('i-ri-braces-line', className)} />
 }
 
@@ -55,13 +58,13 @@ const DEFAULT_SCHEMA: SchemaRoot = {
   additionalProperties: false,
 }
 
-const JsonSchemaConfig: FC<JsonSchemaConfigProps> = ({
+function JsonSchemaConfigContent({
   defaultSchema,
   onSave,
   onClose,
-}) => {
+}: JsonSchemaConfigProps) {
   const { t } = useTranslation()
-  const [currentTab, setCurrentTab] = useState(SchemaView.VisualEditor)
+  const [currentTab, setCurrentTab] = useState<readonly SchemaView[]>([SchemaView.VisualEditor])
   const [jsonSchema, setJsonSchema] = useState(defaultSchema || DEFAULT_SCHEMA)
   const [json, setJson] = useState(() => JSON.stringify(jsonSchema, null, 2))
   const [btnWidth, setBtnWidth] = useState(0)
@@ -73,15 +76,16 @@ const JsonSchemaConfig: FC<JsonSchemaConfigProps> = ({
   const setIsAddingNewField = useVisualEditorStore(state => state.setIsAddingNewField)
   const setHoveringProperty = useVisualEditorStore(state => state.setHoveringProperty)
   const { emit } = useMittContext()
+  const selectedTab = currentTab[0] ?? SchemaView.VisualEditor
 
-  const updateBtnWidth = useCallback((width: number) => {
+  function updateBtnWidth(width: number) {
     setBtnWidth(width + 32)
-  }, [])
+  }
 
-  const handleTabChange = useCallback((value: SchemaView) => {
-    if (currentTab === value)
+  function handleTabChange(value: SchemaView) {
+    if (selectedTab === value)
       return
-    if (currentTab === SchemaView.JsonSchema) {
+    if (selectedTab === SchemaView.JsonSchema) {
       try {
         const schema = JSON.parse(json)
         setParseError(null)
@@ -112,41 +116,41 @@ const JsonSchemaConfig: FC<JsonSchemaConfigProps> = ({
         return
       }
     }
-    else if (currentTab === SchemaView.VisualEditor) {
+    else if (selectedTab === SchemaView.VisualEditor) {
       if (advancedEditing || isAddingNewField)
         emit('quitEditing', { callback: (backup: SchemaRoot) => setJson(JSON.stringify(backup || jsonSchema, null, 2)) })
       else
         setJson(JSON.stringify(jsonSchema, null, 2))
     }
 
-    setCurrentTab(value)
-  }, [currentTab, jsonSchema, json, advancedEditing, isAddingNewField, emit])
+    setCurrentTab([value])
+  }
 
-  const handleApplySchema = useCallback((schema: SchemaRoot) => {
-    if (currentTab === SchemaView.VisualEditor)
+  function handleApplySchema(schema: SchemaRoot) {
+    if (selectedTab === SchemaView.VisualEditor)
       setJsonSchema(schema)
-    else if (currentTab === SchemaView.JsonSchema)
+    else if (selectedTab === SchemaView.JsonSchema)
       setJson(JSON.stringify(schema, null, 2))
-  }, [currentTab])
+  }
 
-  const handleSubmit = useCallback((schema: Record<string, unknown>) => {
+  function handleSubmit(schema: Record<string, unknown>) {
     const jsonSchema = jsonToSchema(schema) as SchemaRoot
-    if (currentTab === SchemaView.VisualEditor)
+    if (selectedTab === SchemaView.VisualEditor)
       setJsonSchema(jsonSchema)
-    else if (currentTab === SchemaView.JsonSchema)
+    else if (selectedTab === SchemaView.JsonSchema)
       setJson(JSON.stringify(jsonSchema, null, 2))
-  }, [currentTab])
+  }
 
-  const handleVisualEditorUpdate = useCallback((schema: SchemaRoot) => {
+  function handleVisualEditorUpdate(schema: SchemaRoot) {
     setJsonSchema(schema)
-  }, [])
+  }
 
-  const handleSchemaEditorUpdate = useCallback((schema: string) => {
+  function handleSchemaEditorUpdate(schema: string) {
     setJson(schema)
-  }, [])
+  }
 
-  const handleResetDefaults = useCallback(() => {
-    if (currentTab === SchemaView.VisualEditor) {
+  function handleResetDefaults() {
+    if (selectedTab === SchemaView.VisualEditor) {
       setHoveringProperty(null)
       if (advancedEditing)
         setAdvancedEditing(false)
@@ -155,15 +159,15 @@ const JsonSchemaConfig: FC<JsonSchemaConfigProps> = ({
     }
     setJsonSchema(DEFAULT_SCHEMA)
     setJson(JSON.stringify(DEFAULT_SCHEMA, null, 2))
-  }, [currentTab, advancedEditing, isAddingNewField, setAdvancedEditing, setIsAddingNewField, setHoveringProperty])
+  }
 
-  const handleCancel = useCallback(() => {
+  function handleCancel() {
     onClose()
-  }, [onClose])
+  }
 
-  const handleSave = useCallback(() => {
+  function handleSave() {
     let schema = jsonSchema
-    if (currentTab === SchemaView.JsonSchema) {
+    if (selectedTab === SchemaView.JsonSchema) {
       try {
         schema = JSON.parse(json)
         setParseError(null)
@@ -194,7 +198,7 @@ const JsonSchemaConfig: FC<JsonSchemaConfigProps> = ({
         return
       }
     }
-    else if (currentTab === SchemaView.VisualEditor) {
+    else if (selectedTab === SchemaView.VisualEditor) {
       if (advancedEditing || isAddingNewField) {
         toast.warning(t('nodes.llm.jsonSchema.warningTips.saveSchema', { ns: 'workflow' }))
         return
@@ -202,7 +206,7 @@ const JsonSchemaConfig: FC<JsonSchemaConfigProps> = ({
     }
     onSave(schema)
     onClose()
-  }, [currentTab, jsonSchema, json, onSave, onClose, advancedEditing, isAddingNewField, t])
+  }
 
   return (
     <div className="flex h-full flex-col">
@@ -211,18 +215,34 @@ const JsonSchemaConfig: FC<JsonSchemaConfigProps> = ({
         <div className="grow truncate title-2xl-semi-bold text-text-primary">
           {t('nodes.llm.jsonSchema.title', { ns: 'workflow' })}
         </div>
-        <div className="absolute top-5 right-5 flex h-8 w-8 items-center justify-center p-1.5" onClick={onClose}>
+        <button
+          type="button"
+          className="absolute top-5 right-5 flex h-8 w-8 items-center justify-center p-1.5"
+          aria-label={t('operation.close', { ns: 'common' })}
+          onClick={onClose}
+        >
           <span className="i-ri-close-line h-[18px] w-[18px] text-text-tertiary" />
-        </div>
+        </button>
       </div>
       {/* Content */}
       <div className="flex items-center justify-between px-6 py-2">
         {/* Tab */}
-        <SegmentedControl<SchemaView>
-          options={VIEW_TABS}
+        <ToggleGroup<SchemaView>
+          aria-label={t('nodes.llm.jsonSchema.title', { ns: 'workflow' })}
           value={currentTab}
-          onChange={handleTabChange}
-        />
+          onValueChange={(nextTab) => {
+            const value = nextTab[0]
+            if (value)
+              handleTabChange(value)
+          }}
+        >
+          {VIEW_TABS.map(({ Icon, text, value }) => (
+            <ToggleGroupItem key={value} value={value}>
+              <Icon className="size-4 shrink-0" />
+              <span className="p-0.5">{text}</span>
+            </ToggleGroupItem>
+          ))}
+        </ToggleGroup>
         <div className="flex items-center gap-x-0.5">
           {/* JSON Schema Generator */}
           <JsonSchemaGenerator
@@ -238,13 +258,13 @@ const JsonSchemaConfig: FC<JsonSchemaConfigProps> = ({
         </div>
       </div>
       <div className="flex grow flex-col gap-y-1 overflow-hidden px-6">
-        {currentTab === SchemaView.VisualEditor && (
+        {selectedTab === SchemaView.VisualEditor && (
           <VisualEditor
             schema={jsonSchema}
             onChange={handleVisualEditorUpdate}
           />
         )}
-        {currentTab === SchemaView.JsonSchema && (
+        {selectedTab === SchemaView.JsonSchema && (
           <SchemaEditor
             schema={json}
             onUpdate={handleSchemaEditorUpdate}
@@ -276,14 +296,12 @@ const JsonSchemaConfig: FC<JsonSchemaConfigProps> = ({
   )
 }
 
-const JsonSchemaConfigWrapper: FC<JsonSchemaConfigProps> = (props) => {
+export function JsonSchemaConfig(props: JsonSchemaConfigProps) {
   return (
     <MittProvider>
       <VisualEditorContextProvider>
-        <JsonSchemaConfig {...props} />
+        <JsonSchemaConfigContent {...props} />
       </VisualEditorContextProvider>
     </MittProvider>
   )
 }
-
-export default JsonSchemaConfigWrapper
diff --git a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-generator/generated-result.tsx b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-generator/generated-result.tsx
index 2023d093a7..ddb1ac2eb3 100644
--- a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-generator/generated-result.tsx
+++ b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-generator/generated-result.tsx
@@ -68,9 +68,14 @@ const GeneratedResult: FC<GeneratedResultProps> = ({
           </div>
         ) : (
           <>
-            <div className="absolute top-2.5 right-2.5 flex h-8 w-8 items-center justify-center" onClick={onClose}>
-              <RiCloseLine className="h-4 w-4 text-text-tertiary" />
-            </div>
+            <button
+              type="button"
+              aria-label={t('operation.close', { ns: 'common' })}
+              className="absolute top-2.5 right-2.5 flex h-8 w-8 items-center justify-center border-none bg-transparent p-0"
+              onClick={onClose}
+            >
+              <RiCloseLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
+            </button>
             {/* Title */}
             <div className="flex flex-col gap-y-[0.5px] px-3 pt-3.5 pb-1">
               <div className="flex pr-8 pl-1 system-xl-semibold text-text-primary">
diff --git a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-generator/prompt-editor.tsx b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-generator/prompt-editor.tsx
index 42b57bc40b..60311129db 100644
--- a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-generator/prompt-editor.tsx
+++ b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/json-schema-generator/prompt-editor.tsx
@@ -2,11 +2,11 @@ import type { FC } from 'react'
 import type { FormValue } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import type { Model } from '@/types/app'
 import { Button } from '@langgenius/dify-ui/button'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { RiCloseLine, RiSparklingFill } from '@remixicon/react'
 import * as React from 'react'
 import { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
+import { Infotip } from '@/app/components/base/infotip'
 import Textarea from '@/app/components/base/textarea'
 import ModelParameterModal from '@/app/components/header/account-setting/model-provider-page/model-parameter-modal'
 
@@ -44,9 +44,14 @@ const PromptEditor: FC<PromptEditorProps> = ({
 
   return (
     <div className="relative flex w-[480px] flex-col rounded-2xl border-[0.5px] border-components-panel-border bg-components-panel-bg shadow-2xl shadow-shadow-shadow-9">
-      <div className="absolute top-2.5 right-2.5 flex h-8 w-8 items-center justify-center" onClick={onClose}>
-        <RiCloseLine className="h-4 w-4 text-text-tertiary" />
-      </div>
+      <button
+        type="button"
+        aria-label={t('operation.close', { ns: 'common' })}
+        className="absolute top-2.5 right-2.5 flex h-8 w-8 items-center justify-center border-none bg-transparent p-0"
+        onClick={onClose}
+      >
+        <RiCloseLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
+      </button>
       {/* Title */}
       <div className="flex flex-col gap-y-[0.5px] px-3 pt-3.5 pb-1">
         <div className="flex pr-8 pl-1 system-xl-semibold text-text-primary">
@@ -75,18 +80,13 @@ const PromptEditor: FC<PromptEditorProps> = ({
       <div className="flex flex-col gap-y-1 px-4 py-2">
         <div className="flex h-6 items-center system-sm-semibold-uppercase text-text-secondary">
           <span>{t('nodes.llm.jsonSchema.instruction', { ns: 'workflow' })}</span>
-          <Tooltip>
-            <TooltipTrigger
-              render={(
-                <span className="flex h-3.5 w-3.5 shrink-0 p-px">
-                  <span aria-hidden className="i-ri-question-line h-full w-full text-text-quaternary hover:text-text-tertiary" />
-                </span>
-              )}
-            />
-            <TooltipContent>
-              {t('nodes.llm.jsonSchema.promptTooltip', { ns: 'workflow' })}
-            </TooltipContent>
-          </Tooltip>
+          <Infotip
+            aria-label={t('nodes.llm.jsonSchema.promptTooltip', { ns: 'workflow' })}
+            className="h-3.5 w-3.5"
+            iconClassName="h-full w-full"
+          >
+            {t('nodes.llm.jsonSchema.promptTooltip', { ns: 'workflow' })}
+          </Infotip>
         </div>
         <div className="flex items-center">
           <Textarea
diff --git a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/index.tsx b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/index.tsx
index 5650c65641..986116f6a0 100644
--- a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/index.tsx
+++ b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/index.tsx
@@ -232,7 +232,6 @@ const EditCard: FC<EditCardProps> = ({
             currentValue={currentFields.type}
             items={maximumDepthReached ? MAXIMUM_DEPTH_TYPE_OPTIONS : TYPE_OPTIONS}
             onSelect={handleTypeChange}
-            popupClassName="z-1000"
           />
           {
             currentFields.required && (
diff --git a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/type-selector.tsx b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/type-selector.tsx
index 213b6895d3..e3f637954d 100644
--- a/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/type-selector.tsx
+++ b/web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/type-selector.tsx
@@ -1,9 +1,16 @@
 import type { FC } from 'react'
 import type { ArrayType, Type } from '../../../../types'
 import { cn } from '@langgenius/dify-ui/cn'
-import { RiArrowDownSLine, RiCheckLine } from '@remixicon/react'
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectItemIndicator,
+  SelectItemText,
+  SelectTrigger,
+} from '@langgenius/dify-ui/select'
+import { RiCheckLine } from '@remixicon/react'
 import { useState } from 'react'
-import { PortalToFollowElem, PortalToFollowElemContent, PortalToFollowElemTrigger } from '@/app/components/base/portal-to-follow-elem'
 
 export type TypeItem = {
   value: Type | ArrayType
@@ -26,45 +33,46 @@ const TypeSelector: FC<TypeSelectorProps> = ({
   const [open, setOpen] = useState(false)
 
   return (
-    <PortalToFollowElem
+    <Select<Type | ArrayType>
       open={open}
       onOpenChange={setOpen}
-      placement="bottom-start"
-      offset={{
-        mainAxis: 4,
+      value={currentValue}
+      onValueChange={(nextValue) => {
+        const selected = items.find(item => item.value === nextValue)
+        if (selected)
+          onSelect(selected)
       }}
     >
-      <PortalToFollowElemTrigger onClick={() => setOpen(v => !v)}>
-        <div className={cn(
-          'flex items-center rounded-[5px] p-0.5 pl-1 hover:bg-state-base-hover',
+      <SelectTrigger
+        className={cn(
+          'h-auto w-auto rounded-[5px] bg-transparent p-0.5 pl-1 hover:bg-state-base-hover',
           open && 'bg-state-base-hover',
         )}
-        >
-          <span className="system-xs-medium text-text-tertiary">{currentValue}</span>
-          <RiArrowDownSLine className="h-4 w-4 text-text-tertiary" />
-        </div>
-      </PortalToFollowElemTrigger>
-      <PortalToFollowElemContent className={popupClassName}>
-        <div className="w-40 rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg p-1 shadow-lg shadow-shadow-shadow-5">
-          {items.map((item) => {
-            const isSelected = item.value === currentValue
-            return (
-              <div
-                key={item.value}
-                className="flex items-center gap-x-1 rounded-lg px-2 py-1 hover:bg-state-base-hover"
-                onClick={() => {
-                  onSelect(item)
-                  setOpen(false)
-                }}
-              >
-                <span className="px-1 system-sm-medium text-text-secondary">{item.text}</span>
-                {isSelected && <RiCheckLine className="h-4 w-4 text-text-accent" />}
-              </div>
-            )
-          })}
-        </div>
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
+      >
+        <span className="system-xs-medium text-text-tertiary">{currentValue}</span>
+      </SelectTrigger>
+      <SelectContent
+        sideOffset={4}
+        className={popupClassName}
+        popupClassName="w-40 rounded-xl border-[0.5px] p-1 shadow-lg shadow-shadow-shadow-5"
+        listClassName="p-0"
+      >
+        {items.map((item) => {
+          const isSelected = item.value === currentValue
+          return (
+            <SelectItem
+              key={item.value}
+              value={item.value}
+              className="gap-x-1 rounded-lg px-2 py-1"
+            >
+              <SelectItemText className="px-1 system-sm-medium text-text-secondary">{item.text}</SelectItemText>
+              {isSelected && <RiCheckLine className="h-4 w-4 text-text-accent" />}
+              <SelectItemIndicator className="hidden" />
+            </SelectItem>
+          )
+        })}
+      </SelectContent>
+    </Select>
   )
 }
 
diff --git a/web/app/components/workflow/nodes/llm/components/panel-output-section.tsx b/web/app/components/workflow/nodes/llm/components/panel-output-section.tsx
index 53f7161fba..82b0a24aef 100644
--- a/web/app/components/workflow/nodes/llm/components/panel-output-section.tsx
+++ b/web/app/components/workflow/nodes/llm/components/panel-output-section.tsx
@@ -7,7 +7,7 @@ import { useTranslation } from 'react-i18next'
 import { Infotip } from '@/app/components/base/infotip'
 import OutputVars, { VarItem } from '@/app/components/workflow/nodes/_base/components/output-vars'
 import Split from '@/app/components/workflow/nodes/_base/components/split'
-import StructureOutput from './structure-output'
+import { StructureOutput } from './structure-output'
 
 type Props = {
   readOnly: boolean
diff --git a/web/app/components/workflow/nodes/llm/components/structure-output.tsx b/web/app/components/workflow/nodes/llm/components/structure-output.tsx
index d8b3e132bb..c7dadab269 100644
--- a/web/app/components/workflow/nodes/llm/components/structure-output.tsx
+++ b/web/app/components/workflow/nodes/llm/components/structure-output.tsx
@@ -1,16 +1,12 @@
 'use client'
-import type { FC } from 'react'
 import type { SchemaRoot, StructuredOutput } from '../types'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
-import { RiEditLine } from '@remixicon/react'
 import { useBoolean } from 'ahooks'
-import * as React from 'react'
-import { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 import ShowPanel from '@/app/components/workflow/nodes/_base/components/variable/object-child-tree-panel/show'
 import { Type } from '../types'
-import JsonSchemaConfigModal from './json-schema-config-modal'
+import { JsonSchemaConfigModal } from './json-schema-config-modal'
 
 type Props = {
   className?: string
@@ -18,22 +14,23 @@ type Props = {
   onChange: (value: StructuredOutput) => void
 }
 
-const StructureOutput: FC<Props> = ({
+export function StructureOutput({
   className,
   value,
   onChange,
-}) => {
+}: Props) {
   const { t } = useTranslation()
   const [showConfig, {
     setTrue: showConfigModal,
     setFalse: hideConfigModal,
   }] = useBoolean(false)
 
-  const handleChange = useCallback((value: SchemaRoot) => {
+  function handleChange(value: SchemaRoot) {
     onChange({
       schema: value,
     })
-  }, [onChange])
+  }
+
   return (
     <div className={cn(className)}>
       <div className="flex justify-between">
@@ -47,7 +44,7 @@ const StructureOutput: FC<Props> = ({
           className="flex"
           onClick={showConfigModal}
         >
-          <RiEditLine className="mr-1 size-3.5" />
+          <i className="mr-1 i-ri-edit-line size-3.5" aria-hidden="true" />
           <div className="system-xs-medium text-components-button-secondary-text">{t('structOutput.configure', { ns: 'app' })}</div>
         </Button>
       </div>
@@ -58,7 +55,13 @@ const StructureOutput: FC<Props> = ({
             />
           )
         : (
-            <div className="mt-1.5 flex h-10 cursor-pointer items-center justify-center rounded-[10px] bg-background-section system-xs-regular text-text-tertiary" onClick={showConfigModal}>{t('structOutput.notConfiguredTip', { ns: 'app' })}</div>
+            <button
+              type="button"
+              className="mt-1.5 flex h-10 w-full cursor-pointer items-center justify-center rounded-[10px] bg-background-section system-xs-regular text-text-tertiary"
+              onClick={showConfigModal}
+            >
+              {t('structOutput.notConfiguredTip', { ns: 'app' })}
+            </button>
           )}
 
       {showConfig && (
@@ -77,4 +80,3 @@ const StructureOutput: FC<Props> = ({
     </div>
   )
 }
-export default React.memo(StructureOutput)
diff --git a/web/app/components/workflow/nodes/llm/panel.tsx b/web/app/components/workflow/nodes/llm/panel.tsx
index 922a18e46e..ba103736d4 100644
--- a/web/app/components/workflow/nodes/llm/panel.tsx
+++ b/web/app/components/workflow/nodes/llm/panel.tsx
@@ -174,9 +174,14 @@ const Panel: FC<NodePanelProps<LLMNodeType>> = ({
             operations={
               !readOnly
                 ? (
-                    <div className="cursor-pointer rounded-md p-1 select-none hover:bg-state-base-hover" onClick={handleAddEmptyVariable} data-testid="add-button">
-                      <span className="i-ri-add-line h-4 w-4 text-text-tertiary" />
-                    </div>
+                    <button
+                      type="button"
+                      aria-label={`${t('operation.add', { ns: 'common' })} ${t('nodes.templateTransform.inputVars', { ns: 'workflow' })}`}
+                      className="cursor-pointer rounded-md border-none bg-transparent p-1 select-none hover:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+                      onClick={handleAddEmptyVariable}
+                    >
+                      <span className="i-ri-add-line h-4 w-4 text-text-tertiary" aria-hidden="true" />
+                    </button>
                   )
                 : undefined
             }
diff --git a/web/app/components/workflow/nodes/loop-start/index.tsx b/web/app/components/workflow/nodes/loop-start/index.tsx
index a7bd18c7a5..9900b84856 100644
--- a/web/app/components/workflow/nodes/loop-start/index.tsx
+++ b/web/app/components/workflow/nodes/loop-start/index.tsx
@@ -1,8 +1,8 @@
 import type { NodeProps } from 'reactflow'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { RiHome5Fill } from '@remixicon/react'
 import { memo } from 'react'
 import { useTranslation } from 'react-i18next'
-import Tooltip from '@/app/components/base/tooltip'
 import { NodeSourceHandle } from '@/app/components/workflow/nodes/_base/components/node-handle'
 
 const LoopStartNode = ({ id, data }: NodeProps) => {
@@ -10,10 +10,14 @@ const LoopStartNode = ({ id, data }: NodeProps) => {
 
   return (
     <div className="nodrag group mt-1 flex h-11 w-11 items-center justify-center rounded-2xl border border-workflow-block-border bg-workflow-block-bg">
-      <Tooltip popupContent={t('blocks.loop-start', { ns: 'workflow' })} asChild={false}>
-        <div className="flex h-6 w-6 items-center justify-center rounded-full border-[0.5px] border-components-panel-border-subtle bg-util-colors-blue-brand-blue-brand-500">
+      <Tooltip>
+        <TooltipTrigger
+          aria-label={t('blocks.loop-start', { ns: 'workflow' })}
+          className="flex h-6 w-6 items-center justify-center rounded-full border-[0.5px] border-components-panel-border-subtle bg-util-colors-blue-brand-blue-brand-500 p-0"
+        >
           <RiHome5Fill className="h-3 w-3 text-text-primary-on-surface" />
-        </div>
+        </TooltipTrigger>
+        <TooltipContent>{t('blocks.loop-start', { ns: 'workflow' })}</TooltipContent>
       </Tooltip>
       <NodeSourceHandle
         id={id}
@@ -30,10 +34,14 @@ export const LoopStartNodeDumb = () => {
 
   return (
     <div className="nodrag relative top-[21px] left-[17px] z-11 flex h-11 w-11 items-center justify-center rounded-2xl border border-workflow-block-border bg-workflow-block-bg">
-      <Tooltip popupContent={t('blocks.loop-start', { ns: 'workflow' })} asChild={false}>
-        <div className="flex h-6 w-6 items-center justify-center rounded-full border-[0.5px] border-components-panel-border-subtle bg-util-colors-blue-brand-blue-brand-500">
+      <Tooltip>
+        <TooltipTrigger
+          aria-label={t('blocks.loop-start', { ns: 'workflow' })}
+          className="flex h-6 w-6 items-center justify-center rounded-full border-[0.5px] border-components-panel-border-subtle bg-util-colors-blue-brand-blue-brand-500 p-0"
+        >
           <RiHome5Fill className="h-3 w-3 text-text-primary-on-surface" />
-        </div>
+        </TooltipTrigger>
+        <TooltipContent>{t('blocks.loop-start', { ns: 'workflow' })}</TooltipContent>
       </Tooltip>
     </div>
   )
diff --git a/web/app/components/workflow/nodes/loop/__tests__/integration.spec.tsx b/web/app/components/workflow/nodes/loop/__tests__/integration.spec.tsx
index a4a00fee67..99c0f9c81d 100644
--- a/web/app/components/workflow/nodes/loop/__tests__/integration.spec.tsx
+++ b/web/app/components/workflow/nodes/loop/__tests__/integration.spec.tsx
@@ -353,8 +353,8 @@ describe('loop path', () => {
       await user.click(screen.getByText('Variable'))
       fireEvent.change(screen.getByDisplayValue('12'), { target: { value: '42' } })
 
-      expect(onSelect).toHaveBeenCalledWith(ComparisonOperator.is)
-      expect(onNumberVarTypeChange).toHaveBeenCalledWith(NumberVarType.variable)
+      expect(onSelect.mock.calls[0]?.[0]).toBe(ComparisonOperator.is)
+      expect(onNumberVarTypeChange.mock.calls[0]?.[0]).toBe(NumberVarType.variable)
       expect(onValueChange).toHaveBeenCalledWith('42')
     })
 
diff --git a/web/app/components/workflow/nodes/loop/components/condition-add.tsx b/web/app/components/workflow/nodes/loop/components/condition-add.tsx
index a28b066098..5187c3bbf8 100644
--- a/web/app/components/workflow/nodes/loop/components/condition-add.tsx
+++ b/web/app/components/workflow/nodes/loop/components/condition-add.tsx
@@ -61,7 +61,6 @@ const ConditionAdd = ({
         placement="bottom-start"
         sideOffset={4}
         popupClassName="border-none bg-transparent p-0 shadow-none backdrop-blur-none"
-        positionerProps={{ style: { zIndex: 1000 } }}
       >
         <div className="w-[296px] rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg">
           <VarReferenceVars
diff --git a/web/app/components/workflow/nodes/loop/components/condition-list/condition-item.tsx b/web/app/components/workflow/nodes/loop/components/condition-list/condition-item.tsx
index 3f34e06054..0c55ed4e1c 100644
--- a/web/app/components/workflow/nodes/loop/components/condition-list/condition-item.tsx
+++ b/web/app/components/workflow/nodes/loop/components/condition-list/condition-item.tsx
@@ -317,7 +317,7 @@ const ConditionItem = ({
                 <SelectTrigger className="h-8 rounded-t-none border-0 px-2 text-xs hover:bg-components-input-bg-normal focus-visible:bg-components-input-bg-normal">
                   {selectedSelectOption?.name ?? t('placeholder.select', { ns: 'common' })}
                 </SelectTrigger>
-                <SelectContent popupClassName="w-(--anchor-width)">
+                <SelectContent>
                   {selectOptions.map(option => (
                     <SelectItem key={option.value} value={option.value} className="text-xs">
                       <SelectItemText>{option.name}</SelectItemText>
diff --git a/web/app/components/workflow/nodes/loop/components/condition-list/condition-operator.tsx b/web/app/components/workflow/nodes/loop/components/condition-list/condition-operator.tsx
index 916326c416..d343b0c8e5 100644
--- a/web/app/components/workflow/nodes/loop/components/condition-list/condition-operator.tsx
+++ b/web/app/components/workflow/nodes/loop/components/condition-list/condition-operator.tsx
@@ -2,17 +2,18 @@ import type { ComparisonOperator } from '../../types'
 import type { VarType } from '@/app/components/workflow/types'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuTrigger,
+} from '@langgenius/dify-ui/dropdown-menu'
 import { RiArrowDownSLine } from '@remixicon/react'
 import {
   useMemo,
-  useState,
 } from 'react'
 import { useTranslation } from 'react-i18next'
-import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
 import { getOperators, isComparisonOperatorNeedTranslate } from '../../utils'
 
 const i18nPrefix = 'nodes.ifElse'
@@ -34,7 +35,6 @@ const ConditionOperator = ({
   onSelect,
 }: ConditionOperatorProps) => {
   const { t } = useTranslation()
-  const [open, setOpen] = useState(false)
 
   const options = useMemo(() => {
     return getOperators(varType, file).map((o) => {
@@ -46,49 +46,48 @@ const ConditionOperator = ({
   }, [t, varType, file])
   const selectedOption = options.find(o => Array.isArray(value) ? o.value === value[0] : o.value === value)
   return (
-    <PortalToFollowElem
-      open={open}
-      onOpenChange={setOpen}
-      placement="bottom-end"
-      offset={{
-        mainAxis: 4,
-        crossAxis: 0,
-      }}
-    >
-      <PortalToFollowElemTrigger onClick={() => setOpen(v => !v)}>
-        <Button
-          className={cn('shrink-0', !selectedOption && 'opacity-50', className)}
-          size="small"
-          variant="ghost"
-          disabled={disabled}
+    <DropdownMenu>
+      <DropdownMenuTrigger
+        render={(
+          <Button
+            className={cn('shrink-0', !selectedOption && 'opacity-50', className)}
+            size="small"
+            variant="ghost"
+            disabled={disabled}
+          />
+        )}
+      >
+        {
+          selectedOption
+            ? selectedOption.label
+            : t(`${i18nPrefix}.select`, { ns: 'workflow' })
+        }
+        <RiArrowDownSLine className="ml-1 h-3.5 w-3.5" />
+      </DropdownMenuTrigger>
+      <DropdownMenuContent
+        placement="bottom-end"
+        sideOffset={4}
+        popupClassName="rounded-xl border-[0.5px] bg-components-panel-bg-blur p-1"
+      >
+        <DropdownMenuRadioGroup
+          value={selectedOption?.value}
+          onValueChange={onSelect}
         >
-          {
-            selectedOption
-              ? selectedOption.label
-              : t(`${i18nPrefix}.select`, { ns: 'workflow' })
-          }
-          <RiArrowDownSLine className="ml-1 h-3.5 w-3.5" />
-        </Button>
-      </PortalToFollowElemTrigger>
-      <PortalToFollowElemContent className="z-10">
-        <div className="rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur p-1 shadow-lg">
           {
             options.map(option => (
-              <div
+              <DropdownMenuRadioItem
                 key={option.value}
-                className="flex h-7 cursor-pointer items-center rounded-lg px-3 py-1.5 text-[13px] font-medium text-text-secondary hover:bg-state-base-hover"
-                onClick={() => {
-                  onSelect(option.value)
-                  setOpen(false)
-                }}
+                value={option.value}
+                closeOnClick
+                className="h-7 rounded-lg px-3 py-1.5 text-[13px] font-medium text-text-secondary"
               >
                 {option.label}
-              </div>
+              </DropdownMenuRadioItem>
             ))
           }
-        </div>
-      </PortalToFollowElemContent>
-    </PortalToFollowElem>
+        </DropdownMenuRadioGroup>
+      </DropdownMenuContent>
+    </DropdownMenu>
   )
 }
 
diff --git a/web/app/components/workflow/nodes/loop/components/condition-list/condition-var-selector.tsx b/web/app/components/workflow/nodes/loop/components/condition-list/condition-var-selector.tsx
index 496ed4087d..f43c7c0ba9 100644
--- a/web/app/components/workflow/nodes/loop/components/condition-list/condition-var-selector.tsx
+++ b/web/app/components/workflow/nodes/loop/components/condition-list/condition-var-selector.tsx
@@ -44,7 +44,6 @@ const ConditionVarSelector = ({
         placement="bottom-start"
         sideOffset={4}
         popupClassName="border-none bg-transparent p-0 shadow-none backdrop-blur-none"
-        positionerProps={{ style: { zIndex: 1000 } }}
       >
         <div className="w-[296px] rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg">
           <VarReferenceVars
diff --git a/web/app/components/workflow/nodes/loop/components/condition-number-input.tsx b/web/app/components/workflow/nodes/loop/components/condition-number-input.tsx
index 954f713a78..a17d7589f1 100644
--- a/web/app/components/workflow/nodes/loop/components/condition-number-input.tsx
+++ b/web/app/components/workflow/nodes/loop/components/condition-number-input.tsx
@@ -4,6 +4,18 @@ import type {
 } from '@/app/components/workflow/types'
 import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuTrigger,
+} from '@langgenius/dify-ui/dropdown-menu'
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from '@langgenius/dify-ui/popover'
 import { RiArrowDownSLine } from '@remixicon/react'
 import { useBoolean } from 'ahooks'
 import { capitalize } from 'es-toolkit/string'
@@ -14,11 +26,6 @@ import {
 } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Variable02 } from '@/app/components/base/icons/src/vender/solid/development'
-import {
-  PortalToFollowElem,
-  PortalToFollowElemContent,
-  PortalToFollowElemTrigger,
-} from '@/app/components/base/portal-to-follow-elem'
 import VarReferenceVars from '@/app/components/workflow/nodes/_base/components/variable/var-reference-vars'
 import { VarType } from '@/app/components/workflow/types'
 import { variableTransformer } from '@/app/components/workflow/utils'
@@ -63,58 +70,61 @@ const ConditionNumberInput = ({
 
   return (
     <div className="flex cursor-pointer items-center">
-      <PortalToFollowElem
+      <DropdownMenu
         open={numberVarTypeVisible}
         onOpenChange={setNumberVarTypeVisible}
-        placement="bottom-start"
-        offset={{ mainAxis: 2, crossAxis: 0 }}
       >
-        <PortalToFollowElemTrigger onClick={() => setNumberVarTypeVisible(v => !v)}>
-          <Button
-            className="shrink-0"
-            variant="ghost"
-            size="small"
+        <DropdownMenuTrigger
+          render={(
+            <Button
+              className="shrink-0"
+              variant="ghost"
+              size="small"
+            />
+          )}
+        >
+          {capitalize(numberVarType)}
+          <RiArrowDownSLine className="ml-px h-3.5 w-3.5" />
+        </DropdownMenuTrigger>
+        <DropdownMenuContent
+          placement="bottom-start"
+          sideOffset={2}
+          popupClassName="w-[112px] rounded-xl border-[0.5px] bg-components-panel-bg-blur p-1"
+        >
+          <DropdownMenuRadioGroup
+            value={numberVarType}
+            onValueChange={onNumberVarTypeChange}
           >
-            {capitalize(numberVarType)}
-            <RiArrowDownSLine className="ml-px h-3.5 w-3.5" />
-          </Button>
-        </PortalToFollowElemTrigger>
-        <PortalToFollowElemContent className="z-1000">
-          <div className="w-[112px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur p-1 shadow-lg">
             {
               options.map(option => (
-                <div
+                <DropdownMenuRadioItem
                   key={option}
+                  value={option}
+                  closeOnClick
                   className={cn(
-                    'flex h-7 cursor-pointer items-center rounded-md px-3 hover:bg-state-base-hover',
+                    'h-7 rounded-md px-3',
                     'text-[13px] font-medium text-text-secondary',
                     numberVarType === option && 'bg-state-base-hover',
                   )}
-                  onClick={() => {
-                    onNumberVarTypeChange(option)
-                    setNumberVarTypeVisible(false)
-                  }}
                 >
                   {capitalize(option)}
-                </div>
+                </DropdownMenuRadioItem>
               ))
             }
-          </div>
-        </PortalToFollowElemContent>
-      </PortalToFollowElem>
+          </DropdownMenuRadioGroup>
+        </DropdownMenuContent>
+      </DropdownMenu>
       <div className="mx-1 h-4 w-px bg-divider-regular"></div>
       <div className="ml-0.5 w-0 grow">
         {
           numberVarType === NumberVarType.variable && (
-            <PortalToFollowElem
+            <Popover
               open={variableSelectorVisible}
               onOpenChange={setVariableSelectorVisible}
-              placement="bottom-start"
-              offset={{ mainAxis: 2, crossAxis: 0 }}
             >
-              <PortalToFollowElemTrigger
-                className="w-full"
-                onClick={() => setVariableSelectorVisible(v => !v)}
+              <PopoverTrigger
+                nativeButton={false}
+                render={<div className="w-full" />}
               >
                 {
                   value && (
@@ -133,16 +143,20 @@ const ConditionNumberInput = ({
                     </div>
                   )
                 }
-              </PortalToFollowElemTrigger>
-              <PortalToFollowElemContent className="z-1000">
+              </PopoverTrigger>
+              <PopoverContent
+                placement="bottom-start"
+                sideOffset={2}
+                popupClassName="border-none bg-transparent shadow-none"
+              >
                 <div className={cn('w-[296px] rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg-blur pt-1 shadow-lg', isShort && 'w-[200px]')}>
                   <VarReferenceVars
                     vars={variables}
                     onChange={handleSelectVariable}
                   />
                 </div>
-              </PortalToFollowElemContent>
-            </PortalToFollowElem>
+              </PopoverContent>
+            </Popover>
           )
         }
         {
diff --git a/web/app/components/workflow/nodes/loop/components/loop-variables/input-mode-selec.tsx b/web/app/components/workflow/nodes/loop/components/loop-variables/input-mode-selec.tsx
index 510118dc8a..797ca7a4c1 100644
--- a/web/app/components/workflow/nodes/loop/components/loop-variables/input-mode-selec.tsx
+++ b/web/app/components/workflow/nodes/loop/components/loop-variables/input-mode-selec.tsx
@@ -27,7 +27,7 @@ const InputModeSelect = ({
       <SelectTrigger className="w-full">
         {selectedOption?.label ?? t('nodes.loop.inputMode', { ns: 'workflow' })}
       </SelectTrigger>
-      <SelectContent popupClassName="w-(--anchor-width)">
+      <SelectContent>
         {options.map(option => (
           <SelectItem key={option.value} value={option.value}>
             <SelectItemText>{option.label}</SelectItemText>
diff --git a/web/app/components/workflow/nodes/loop/components/loop-variables/variable-type-select.tsx b/web/app/components/workflow/nodes/loop/components/loop-variables/variable-type-select.tsx
index 1a256432f2..9db5a21c19 100644
--- a/web/app/components/workflow/nodes/loop/components/loop-variables/variable-type-select.tsx
+++ b/web/app/components/workflow/nodes/loop/components/loop-variables/variable-type-select.tsx
@@ -50,7 +50,7 @@ const VariableTypeSelect = ({
       <SelectTrigger className="w-full">
         {selectedOption?.label}
       </SelectTrigger>
-      <SelectContent popupClassName="w-(--anchor-width)">
+      <SelectContent>
         {options.map(option => (
           <SelectItem key={option.value} value={option.value}>
             <SelectItemText>{option.label}</SelectItemText>
diff --git a/web/app/components/workflow/nodes/parameter-extractor/__tests__/integration.spec.tsx b/web/app/components/workflow/nodes/parameter-extractor/__tests__/integration.spec.tsx
index f63d9a0d50..a818b8601b 100644
--- a/web/app/components/workflow/nodes/parameter-extractor/__tests__/integration.spec.tsx
+++ b/web/app/components/workflow/nodes/parameter-extractor/__tests__/integration.spec.tsx
@@ -110,24 +110,23 @@ vi.mock('@/app/components/header/account-setting/model-provider-page/model-param
   ),
 }))
 
-vi.mock('@/app/components/base/modal', () => ({
+vi.mock('@langgenius/dify-ui/dialog', () => ({
   __esModule: true,
-  default: ({
+  Dialog: ({
     children,
-    isShow,
-    title,
+    open,
   }: {
     children: ReactNode
-    isShow?: boolean
-    title?: ReactNode
-  }) => isShow
+    open?: boolean
+  }) => open !== false
     ? (
         <div data-testid="base-modal">
-          <div>{title}</div>
           {children}
         </div>
       )
     : null,
+  DialogContent: ({ children }: { children: ReactNode }) => <>{children}</>,
+  DialogTitle: ({ children }: { children: ReactNode }) => <div>{children}</div>,
 }))
 
 vi.mock('@/app/components/workflow/nodes/_base/components/collapse', () => ({
@@ -605,7 +604,7 @@ describe('parameter-extractor path', () => {
         />,
       )
 
-      expect(screen.getByTestId('add-button')).toBeInTheDocument()
+      expect(screen.getByRole('button', { name: 'workflow.nodes.parameterExtractor.addExtractParameter' })).toBeInTheDocument()
     })
 
     it('should reject invalid names and reset add modal fields after canceling', async () => {
@@ -620,7 +619,7 @@ describe('parameter-extractor path', () => {
         />,
       )
 
-      await user.click(screen.getByTestId('add-button'))
+      await user.click(screen.getByRole('button', { name: 'workflow.nodes.parameterExtractor.addExtractParameter' }))
 
       const nameInput = screen.getByPlaceholderText('workflow.nodes.parameterExtractor.addExtractParameterContent.namePlaceholder')
       const descriptionInput = screen.getByPlaceholderText('workflow.nodes.parameterExtractor.addExtractParameterContent.descriptionPlaceholder')
@@ -636,7 +635,7 @@ describe('parameter-extractor path', () => {
       expect(onCancel).toHaveBeenCalledTimes(1)
       expect(screen.queryByTestId('base-modal')).not.toBeInTheDocument()
 
-      await user.click(screen.getByTestId('add-button'))
+      await user.click(screen.getByRole('button', { name: 'workflow.nodes.parameterExtractor.addExtractParameter' }))
       expect(screen.getByPlaceholderText('workflow.nodes.parameterExtractor.addExtractParameterContent.namePlaceholder')).toHaveValue('')
       expect(screen.getByPlaceholderText('workflow.nodes.parameterExtractor.addExtractParameterContent.descriptionPlaceholder')).toHaveValue('')
     })
diff --git a/web/app/components/workflow/nodes/parameter-extractor/components/extract-parameter/__tests__/update.spec.tsx b/web/app/components/workflow/nodes/parameter-extractor/components/extract-parameter/__tests__/update.spec.tsx
index c73b990b68..34d788be50 100644
--- a/web/app/components/workflow/nodes/parameter-extractor/components/extract-parameter/__tests__/update.spec.tsx
+++ b/web/app/components/workflow/nodes/parameter-extractor/components/extract-parameter/__tests__/update.spec.tsx
@@ -41,7 +41,7 @@ describe('parameter-extractor/extract-parameter/update', () => {
 
     const existingDialogs = screen.queryAllByRole('dialog').length
 
-    fireEvent.click(screen.getByTestId('add-button'))
+    fireEvent.click(screen.getByRole('button', { name: 'workflow.nodes.parameterExtractor.addExtractParameter' }))
     const dialogs = await waitFor(() => {
       const nextDialogs = screen.getAllByRole('dialog')
       expect(nextDialogs.length).toBeGreaterThan(existingDialogs)
@@ -88,7 +88,7 @@ describe('parameter-extractor/extract-parameter/update', () => {
 
     const existingDialogs = screen.queryAllByRole('dialog').length
 
-    await user.click(screen.getByTestId('add-button'))
+    await user.click(screen.getByRole('button', { name: 'workflow.nodes.parameterExtractor.addExtractParameter' }))
     const dialogs = await waitFor(() => {
       const nextDialogs = screen.getAllByRole('dialog')
       expect(nextDialogs.length).toBeGreaterThan(existingDialogs)
diff --git a/web/app/components/workflow/nodes/parameter-extractor/components/extract-parameter/update.tsx b/web/app/components/workflow/nodes/parameter-extractor/components/extract-parameter/update.tsx
index 52f875c674..895f240176 100644
--- a/web/app/components/workflow/nodes/parameter-extractor/components/extract-parameter/update.tsx
+++ b/web/app/components/workflow/nodes/parameter-extractor/components/extract-parameter/update.tsx
@@ -3,6 +3,7 @@ import type { FC } from 'react'
 import type { Param } from '../../types'
 import type { MoreInfo } from '@/app/components/workflow/types'
 import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import { Select, SelectContent, SelectItem, SelectItemIndicator, SelectItemText, SelectTrigger } from '@langgenius/dify-ui/select'
 import { Switch } from '@langgenius/dify-ui/switch'
 import { toast } from '@langgenius/dify-ui/toast'
@@ -13,7 +14,6 @@ import { useTranslation } from 'react-i18next'
 import Field from '@/app/components/app/configuration/config-var/config-modal/field'
 import ConfigSelect from '@/app/components/app/configuration/config-var/config-select'
 import Input from '@/app/components/base/input'
-import Modal from '@/app/components/base/modal'
 import Textarea from '@/app/components/base/textarea'
 import { ChangeType } from '@/app/components/workflow/types'
 import { checkKeys } from '@/utils/var'
@@ -119,69 +119,81 @@ const AddExtractParameter: FC<Props> = ({
   return (
     <div>
       {isAdd && (
-        <div className="mx-1 cursor-pointer rounded-md p-1 select-none hover:bg-state-base-hover" onClick={showAddModal} data-testid="add-button">
-          <span className="i-ri-add-line h-4 w-4 text-text-tertiary" />
-        </div>
+        <button
+          type="button"
+          aria-label={t(`${i18nPrefix}.addExtractParameter`, { ns: 'workflow' })}
+          className="mx-1 cursor-pointer rounded-md border-none bg-transparent p-1 select-none hover:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+          onClick={showAddModal}
+        >
+          <span className="i-ri-add-line h-4 w-4 text-text-tertiary" aria-hidden="true" />
+        </button>
       )}
       {isShowModal && (
-        <Modal
-          title={t(`${i18nPrefix}.addExtractParameter`, { ns: 'workflow' })}
-          isShow
-          onClose={hideModal}
-          className="w-[400px]! max-w-[400px]! p-4!"
+        <Dialog
+          open
+          onOpenChange={(open) => {
+            if (!open)
+              hideModal()
+          }}
         >
-          <div>
-            <div className="space-y-2">
-              <Field title={t(`${i18nPrefix}.addExtractParameterContent.name`, { ns: 'workflow' })}>
-                <Input
-                  value={param.name}
-                  onChange={e => handleParamChange('name')(e.target.value)}
-                  placeholder={t(`${i18nPrefix}.addExtractParameterContent.namePlaceholder`, { ns: 'workflow' })!}
-                />
-              </Field>
-              <Field title={t(`${i18nPrefix}.addExtractParameterContent.type`, { ns: 'workflow' })}>
-                <Select
-                  value={param.type}
-                  onValueChange={value => value && handleParamChange('type')(value)}
-                >
-                  <SelectTrigger className="w-full capitalize">
-                    {param.type}
-                  </SelectTrigger>
-                  <SelectContent popupClassName="w-(--anchor-width)">
-                    {TYPES.map(type => (
-                      <SelectItem key={type} value={type} className="capitalize">
-                        <SelectItemText className="capitalize">{type}</SelectItemText>
-                        <SelectItemIndicator />
-                      </SelectItem>
-                    ))}
-                  </SelectContent>
-                </Select>
-              </Field>
-              {param.type === ParamType.select && (
-                <Field title={t('variableConfig.options', { ns: 'appDebug' })}>
-                  <ConfigSelect options={param.options || []} onChange={handleParamChange('options')} />
+          <DialogContent className="w-[400px]! max-w-[400px]! overflow-hidden! border-none p-4! text-left align-middle">
+            <DialogTitle className="title-2xl-semi-bold text-text-primary">
+              {t(`${i18nPrefix}.addExtractParameter`, { ns: 'workflow' })}
+            </DialogTitle>
+
+            <div>
+              <div className="space-y-2">
+                <Field title={t(`${i18nPrefix}.addExtractParameterContent.name`, { ns: 'workflow' })}>
+                  <Input
+                    value={param.name}
+                    onChange={e => handleParamChange('name')(e.target.value)}
+                    placeholder={t(`${i18nPrefix}.addExtractParameterContent.namePlaceholder`, { ns: 'workflow' })!}
+                  />
                 </Field>
-              )}
-              <Field title={t(`${i18nPrefix}.addExtractParameterContent.description`, { ns: 'workflow' })}>
-                <Textarea
-                  value={param.description}
-                  onChange={e => handleParamChange('description')(e.target.value)}
-                  placeholder={t(`${i18nPrefix}.addExtractParameterContent.descriptionPlaceholder`, { ns: 'workflow' })!}
-                />
-              </Field>
-              <Field title={t(`${i18nPrefix}.addExtractParameterContent.required`, { ns: 'workflow' })}>
-                <>
-                  <div className="mb-1.5 text-xs leading-[18px] font-normal text-text-tertiary">{t(`${i18nPrefix}.addExtractParameterContent.requiredContent`, { ns: 'workflow' })}</div>
-                  <Switch size="lg" checked={param.required ?? false} onCheckedChange={handleParamChange('required')} />
-                </>
-              </Field>
+                <Field title={t(`${i18nPrefix}.addExtractParameterContent.type`, { ns: 'workflow' })}>
+                  <Select
+                    value={param.type}
+                    onValueChange={value => value && handleParamChange('type')(value)}
+                  >
+                    <SelectTrigger className="w-full capitalize">
+                      {param.type}
+                    </SelectTrigger>
+                    <SelectContent>
+                      {TYPES.map(type => (
+                        <SelectItem key={type} value={type} className="capitalize">
+                          <SelectItemText className="capitalize">{type}</SelectItemText>
+                          <SelectItemIndicator />
+                        </SelectItem>
+                      ))}
+                    </SelectContent>
+                  </Select>
+                </Field>
+                {param.type === ParamType.select && (
+                  <Field title={t('variableConfig.options', { ns: 'appDebug' })}>
+                    <ConfigSelect options={param.options || []} onChange={handleParamChange('options')} />
+                  </Field>
+                )}
+                <Field title={t(`${i18nPrefix}.addExtractParameterContent.description`, { ns: 'workflow' })}>
+                  <Textarea
+                    value={param.description}
+                    onChange={e => handleParamChange('description')(e.target.value)}
+                    placeholder={t(`${i18nPrefix}.addExtractParameterContent.descriptionPlaceholder`, { ns: 'workflow' })!}
+                  />
+                </Field>
+                <Field title={t(`${i18nPrefix}.addExtractParameterContent.required`, { ns: 'workflow' })}>
+                  <>
+                    <div className="mb-1.5 text-xs leading-[18px] font-normal text-text-tertiary">{t(`${i18nPrefix}.addExtractParameterContent.requiredContent`, { ns: 'workflow' })}</div>
+                    <Switch size="lg" checked={param.required ?? false} onCheckedChange={handleParamChange('required')} />
+                  </>
+                </Field>
+              </div>
+              <div className="mt-4 flex justify-end space-x-2">
+                <Button className="w-[95px]!" onClick={hideModal}>{t('operation.cancel', { ns: 'common' })}</Button>
+                <Button className="w-[95px]!" variant="primary" onClick={handleSave}>{isAdd ? t('operation.add', { ns: 'common' }) : t('operation.save', { ns: 'common' })}</Button>
+              </div>
             </div>
-            <div className="mt-4 flex justify-end space-x-2">
-              <Button className="w-[95px]!" onClick={hideModal}>{t('operation.cancel', { ns: 'common' })}</Button>
-              <Button className="w-[95px]!" variant="primary" onClick={handleSave}>{isAdd ? t('operation.add', { ns: 'common' }) : t('operation.save', { ns: 'common' })}</Button>
-            </div>
-          </div>
-        </Modal>
+          </DialogContent>
+        </Dialog>
       )}
     </div>
   )
diff --git a/web/app/components/workflow/nodes/parameter-extractor/panel.tsx b/web/app/components/workflow/nodes/parameter-extractor/panel.tsx
index a116a6303d..9165d53394 100644
--- a/web/app/components/workflow/nodes/parameter-extractor/panel.tsx
+++ b/web/app/components/workflow/nodes/parameter-extractor/panel.tsx
@@ -3,7 +3,7 @@ import type { ParameterExtractorNodeType } from './types'
 import type { NodePanelProps } from '@/app/components/workflow/types'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
-import Tooltip from '@/app/components/base/tooltip'
+import { Infotip } from '@/app/components/base/infotip'
 import ModelParameterModal from '@/app/components/header/account-setting/model-provider-page/model-parameter-modal'
 import { FieldCollapse } from '@/app/components/workflow/nodes/_base/components/collapse'
 import Field from '@/app/components/workflow/nodes/_base/components/field'
@@ -131,14 +131,14 @@ const Panel: FC<NodePanelProps<ParameterExtractorNodeType>> = ({
           title={(
             <div className="flex items-center space-x-1">
               <span className="uppercase">{t(`${i18nPrefix}.instruction`, { ns: 'workflow' })}</span>
-              <Tooltip
-                popupContent={(
-                  <div className="w-[120px]">
-                    {t(`${i18nPrefix}.instructionTip`, { ns: 'workflow' })}
-                  </div>
-                )}
-                triggerClassName="w-3.5 h-3.5 ml-0.5"
-              />
+              <Infotip
+                aria-label={t(`${i18nPrefix}.instructionTip`, { ns: 'workflow' })}
+                className="ml-0.5 h-3.5 w-3.5"
+                iconClassName="h-3.5 w-3.5"
+                popupClassName="w-[120px]"
+              >
+                {t(`${i18nPrefix}.instructionTip`, { ns: 'workflow' })}
+              </Infotip>
             </div>
           )}
           value={inputs.instruction}
diff --git a/web/app/components/workflow/nodes/question-classifier/__tests__/integration.spec.tsx b/web/app/components/workflow/nodes/question-classifier/__tests__/integration.spec.tsx
index c11f78bc08..c4f8a41d47 100644
--- a/web/app/components/workflow/nodes/question-classifier/__tests__/integration.spec.tsx
+++ b/web/app/components/workflow/nodes/question-classifier/__tests__/integration.spec.tsx
@@ -55,6 +55,12 @@ vi.mock('@/app/components/header/account-setting/model-provider-page/model-selec
   default: ({ defaultModel }: any) => <div>{defaultModel.provider}:{defaultModel.model}</div>,
 }))
 
+vi.mock('@langgenius/dify-ui/tooltip', () => ({
+  Tooltip: ({ children }: any) => <div>{children}</div>,
+  TooltipTrigger: ({ children }: any) => <>{children}</>,
+  TooltipContent: ({ children }: any) => <div>{children}</div>,
+}))
+
 vi.mock('@/app/components/workflow/nodes/_base/components/readonly-input-with-select-var', () => ({
   default: ({ value }: any) => <div>{value}</div>,
 }))
@@ -344,8 +350,8 @@ describe('question-classifier path', () => {
       )
 
       expect(screen.getByText(`${longName.slice(0, 50)}...`)).toBeInTheDocument()
-      await user.hover(screen.getByText(`${longName.slice(0, 50)}...`))
-      expect(screen.getByText(longName)).toBeInTheDocument()
+      await user.hover(screen.getByRole('button', { name: longName }))
+      expect(await screen.findByText(longName)).toBeInTheDocument()
 
       rerender(
         <Node
diff --git a/web/app/components/workflow/nodes/question-classifier/__tests__/node.spec.tsx b/web/app/components/workflow/nodes/question-classifier/__tests__/node.spec.tsx
index a7e72c343c..3356226a85 100644
--- a/web/app/components/workflow/nodes/question-classifier/__tests__/node.spec.tsx
+++ b/web/app/components/workflow/nodes/question-classifier/__tests__/node.spec.tsx
@@ -1,25 +1,10 @@
 import type { QuestionClassifierNodeType, Topic } from '../types'
 import { render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
 import { useTextGenerationCurrentProviderAndModelAndModelList } from '@/app/components/header/account-setting/model-provider-page/hooks'
 import { BlockEnum } from '@/app/components/workflow/types'
 import Node from '../node'
 
-vi.mock('@/app/components/base/tooltip', () => ({
-  __esModule: true,
-  default: ({
-    children,
-    popupContent,
-  }: {
-    children: React.ReactNode
-    popupContent: React.ReactNode
-  }) => (
-    <div>
-      {children}
-      {popupContent}
-    </div>
-  ),
-}))
-
 vi.mock('@/app/components/header/account-setting/model-provider-page/hooks', () => ({
   useTextGenerationCurrentProviderAndModelAndModelList: vi.fn(),
 }))
@@ -91,17 +76,24 @@ describe('question-classifier/node', () => {
     render(
       <Node
         {...baseNodeProps}
-        data={createData({ classes: [createTopic(), createTopic({ id: 'topic-2', name: 'Refunds' })] })}
+        data={createData({
+          classes: [
+            createTopic({ label: 'Billing' } as Partial<Topic>),
+            createTopic({ id: 'topic-2', name: 'Refunds', label: 'Refund desk' } as Partial<Topic>),
+          ],
+        })}
       />,
     )
 
     expect(screen.getByText('openai:gpt-4o')).toBeInTheDocument()
-    expect(screen.getByText('Billing questions')).toBeInTheDocument()
+    expect(screen.getByText('Billing')).toBeInTheDocument()
+    expect(screen.getByText('Refund desk')).toBeInTheDocument()
     expect(screen.getByText('handle-topic-1')).toBeInTheDocument()
     expect(screen.getByText('handle-topic-2')).toBeInTheDocument()
   })
 
-  it('returns nothing when neither model nor classes are configured and truncates long class names', () => {
+  it('returns nothing when neither model nor classes are configured and truncates long class names', async () => {
+    const user = userEvent.setup()
     const longName = 'L'.repeat(60)
     const { container, rerender } = render(
       <Node
@@ -119,7 +111,8 @@ describe('question-classifier/node', () => {
     )
 
     expect(screen.getByText(`${longName.slice(0, 50)}...`)).toBeInTheDocument()
-    expect(screen.getByText(longName)).toBeInTheDocument()
+    await user.hover(screen.getByRole('button', { name: longName }))
+    expect(await screen.findByText(longName)).toBeInTheDocument()
 
     rerender(
       <Node
diff --git a/web/app/components/workflow/nodes/question-classifier/__tests__/panel.spec.tsx b/web/app/components/workflow/nodes/question-classifier/__tests__/panel.spec.tsx
index c205f57d08..f92bb5abb3 100644
--- a/web/app/components/workflow/nodes/question-classifier/__tests__/panel.spec.tsx
+++ b/web/app/components/workflow/nodes/question-classifier/__tests__/panel.spec.tsx
@@ -144,6 +144,7 @@ describe('question-classifier/panel', () => {
     expect(handleVisionResolutionEnabledChange).toHaveBeenCalledWith(true)
     expect(handleVisionResolutionChange).toHaveBeenCalledWith({ resolution: 'high' })
     expect(screen.getByText('class_name:string')).toBeInTheDocument()
+    expect(screen.getByText('class_label:string')).toBeInTheDocument()
     expect(screen.getByText('usage:object')).toBeInTheDocument()
   })
 })
diff --git a/web/app/components/workflow/nodes/question-classifier/__tests__/use-config.spec.ts b/web/app/components/workflow/nodes/question-classifier/__tests__/use-config.spec.ts
new file mode 100644
index 0000000000..89af550de1
--- /dev/null
+++ b/web/app/components/workflow/nodes/question-classifier/__tests__/use-config.spec.ts
@@ -0,0 +1,147 @@
+import type { QuestionClassifierNodeType } from '../types'
+import { act, renderHook, waitFor } from '@testing-library/react'
+import { useModelListAndDefaultModelAndCurrentProviderAndModel } from '@/app/components/header/account-setting/model-provider-page/hooks'
+import {
+  useIsChatMode,
+  useNodesReadOnly,
+  useWorkflow,
+} from '@/app/components/workflow/hooks'
+import useConfigVision from '@/app/components/workflow/hooks/use-config-vision'
+import useAvailableVarList from '@/app/components/workflow/nodes/_base/hooks/use-available-var-list'
+import useNodeCrud from '@/app/components/workflow/nodes/_base/hooks/use-node-crud'
+import { useStore } from '@/app/components/workflow/store'
+import { BlockEnum } from '@/app/components/workflow/types'
+import { AppModeEnum } from '@/types/app'
+import useConfig from '../use-config'
+
+vi.mock('@/app/components/workflow/hooks', () => ({
+  useNodesReadOnly: vi.fn(),
+  useIsChatMode: vi.fn(),
+  useWorkflow: vi.fn(),
+}))
+
+vi.mock('reactflow', () => ({
+  useUpdateNodeInternals: vi.fn(() => vi.fn()),
+}))
+
+vi.mock('@/app/components/workflow/nodes/_base/hooks/use-node-crud', () => ({
+  __esModule: true,
+  default: vi.fn(),
+}))
+
+vi.mock('@/app/components/header/account-setting/model-provider-page/hooks', () => ({
+  useModelListAndDefaultModelAndCurrentProviderAndModel: vi.fn(),
+}))
+
+vi.mock('@/app/components/workflow/store', () => ({
+  useStore: vi.fn(),
+}))
+
+vi.mock('@/app/components/workflow/hooks/use-config-vision', () => ({
+  __esModule: true,
+  default: vi.fn(),
+}))
+
+vi.mock('@/app/components/workflow/nodes/_base/hooks/use-available-var-list', () => ({
+  __esModule: true,
+  default: vi.fn(),
+}))
+
+const mockUseNodesReadOnly = vi.mocked(useNodesReadOnly)
+const mockUseIsChatMode = vi.mocked(useIsChatMode)
+const mockUseWorkflow = vi.mocked(useWorkflow)
+const mockUseNodeCrud = vi.mocked(useNodeCrud)
+const mockUseModelListAndDefaultModelAndCurrentProviderAndModel = vi.mocked(useModelListAndDefaultModelAndCurrentProviderAndModel)
+const mockUseStore = vi.mocked(useStore)
+const mockUseConfigVision = vi.mocked(useConfigVision)
+const mockUseAvailableVarList = vi.mocked(useAvailableVarList)
+
+const createPayload = (overrides: Partial<QuestionClassifierNodeType> = {}): QuestionClassifierNodeType => ({
+  type: BlockEnum.QuestionClassifier,
+  title: 'Question Classifier',
+  desc: '',
+  model: {
+    provider: '',
+    name: '',
+    mode: AppModeEnum.CHAT,
+    completion_params: {},
+  },
+  classes: [{ id: 'topic-1', name: 'Billing questions', label: 'CLASS 1' }],
+  query_variable_selector: ['start-node', 'sys.query'],
+  instruction: 'Route by topic',
+  vision: {
+    enabled: false,
+  },
+  ...overrides,
+})
+
+describe('question-classifier/use-config', () => {
+  const setInputs = vi.fn()
+  let latestVisionOptions: {
+    onChange: (payload: QuestionClassifierNodeType['vision']) => void
+  } | null = null
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    latestVisionOptions = null
+    mockUseNodesReadOnly.mockReturnValue({ nodesReadOnly: false, getNodesReadOnly: () => false })
+    mockUseIsChatMode.mockReturnValue(true)
+    mockUseWorkflow.mockReturnValue({
+      getBeforeNodesInSameBranch: vi.fn(() => []),
+    } as unknown as ReturnType<typeof useWorkflow>)
+    mockUseNodeCrud.mockReturnValue({
+      inputs: createPayload(),
+      setInputs,
+    })
+    mockUseModelListAndDefaultModelAndCurrentProviderAndModel.mockReturnValue({
+      modelList: [],
+      defaultModel: undefined,
+      currentProvider: undefined,
+      currentModel: undefined,
+    } as ReturnType<typeof useModelListAndDefaultModelAndCurrentProviderAndModel>)
+    mockUseStore.mockImplementation((selector) => {
+      return selector({ nodesDefaultConfigs: {} } as never)
+    })
+    mockUseConfigVision.mockImplementation((_model, options) => {
+      latestVisionOptions = options as typeof latestVisionOptions
+      return {
+        isVisionModel: false,
+        handleVisionResolutionEnabledChange: vi.fn(),
+        handleVisionResolutionChange: vi.fn(),
+        handleModelChanged: vi.fn(() => {
+          latestVisionOptions?.onChange({ enabled: false })
+        }),
+      }
+    })
+    mockUseAvailableVarList.mockReturnValue({
+      availableVars: [],
+      availableNodes: [],
+      availableNodesWithParent: [],
+    } as unknown as ReturnType<typeof useAvailableVarList>)
+  })
+
+  it('preserves the selected model when the vision follow-up updates after model selection', async () => {
+    const { result } = renderHook(() => useConfig('question-classifier-node', createPayload()))
+
+    act(() => {
+      result.current.handleModelChanged({
+        provider: 'openai',
+        modelId: 'gpt-4o',
+        mode: AppModeEnum.CHAT,
+      })
+    })
+
+    await waitFor(() => {
+      expect(setInputs).toHaveBeenLastCalledWith(expect.objectContaining({
+        model: expect.objectContaining({
+          provider: 'openai',
+          name: 'gpt-4o',
+          mode: AppModeEnum.CHAT,
+        }),
+        vision: {
+          enabled: false,
+        },
+      }))
+    })
+  })
+})
diff --git a/web/app/components/workflow/nodes/question-classifier/components/__tests__/class-item.spec.tsx b/web/app/components/workflow/nodes/question-classifier/components/__tests__/class-item.spec.tsx
index 6ba88016e0..ab1d0e0224 100644
--- a/web/app/components/workflow/nodes/question-classifier/components/__tests__/class-item.spec.tsx
+++ b/web/app/components/workflow/nodes/question-classifier/components/__tests__/class-item.spec.tsx
@@ -3,8 +3,6 @@ import { fireEvent, render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import ClassItem from '../class-item'
 
-const mockEditorRender = vi.hoisted(() => vi.fn())
-
 vi.mock('@/app/components/workflow/nodes/_base/hooks/use-available-var-list', () => ({
   __esModule: true,
   default: () => ({
@@ -16,13 +14,12 @@ vi.mock('@/app/components/workflow/nodes/_base/hooks/use-available-var-list', ()
 vi.mock('@/app/components/workflow/nodes/_base/components/prompt/editor', () => ({
   __esModule: true,
   default: (props: {
-    title: string
+    title: React.ReactNode
     value: string
     onChange: (value: string) => void
     onRemove: () => void
     showRemove?: boolean
   }) => {
-    mockEditorRender(props)
     return (
       <div>
         <div>{props.title}</div>
@@ -70,9 +67,32 @@ describe('question-classifier/class-item', () => {
       name: 'Billing questions updated',
     })
     expect(onRemove).toHaveBeenCalledTimes(1)
-    expect(mockEditorRender).toHaveBeenCalledWith(expect.objectContaining({
-      title: 'workflow.nodes.questionClassifiers.class 1',
-      value: 'Billing questions',
-    }))
+    expect(screen.getByRole('button', { name: 'CLASS 1' })).toBeInTheDocument()
+  })
+
+  it('preserves a custom label when editing the classifier name', () => {
+    const onChange = vi.fn()
+
+    render(
+      <ClassItem
+        nodeId="node-1"
+        payload={{ id: 'topic-1', name: 'Billing questions', label: 'Billing' } as Topic}
+        onChange={onChange}
+        onRemove={vi.fn()}
+        index={1}
+        filterVar={() => true}
+      />,
+    )
+
+    fireEvent.change(screen.getByLabelText('class-name'), {
+      target: { value: 'Billing questions updated' },
+    })
+
+    expect(onChange).toHaveBeenCalledWith({
+      id: 'topic-1',
+      name: 'Billing questions updated',
+      label: 'Billing',
+    })
+    expect(screen.getByRole('button', { name: 'Billing' })).toBeInTheDocument()
   })
 })
diff --git a/web/app/components/workflow/nodes/question-classifier/components/__tests__/class-list.spec.tsx b/web/app/components/workflow/nodes/question-classifier/components/__tests__/class-list.spec.tsx
index 8a7542ab89..0ce9af524f 100644
--- a/web/app/components/workflow/nodes/question-classifier/components/__tests__/class-list.spec.tsx
+++ b/web/app/components/workflow/nodes/question-classifier/components/__tests__/class-list.spec.tsx
@@ -79,10 +79,10 @@ describe('question-classifier/class-list', () => {
     await user.click(screen.getAllByText('remove-item')[0]!)
     expect(handleEdgeDeleteByDeleteBranch).toHaveBeenCalledWith('node-1', 'topic-1')
 
-    await user.click(screen.getByText('workflow.nodes.questionClassifiers.class'))
+    await user.click(screen.getByRole('button', { name: /workflow\.nodes\.questionClassifiers\.class/ }))
     expect(screen.queryByText('workflow.nodes.questionClassifiers.addClass')).not.toBeInTheDocument()
 
-    await user.click(screen.getByText('workflow.nodes.questionClassifiers.class'))
+    await user.click(screen.getByRole('button', { name: /workflow\.nodes\.questionClassifiers\.class/ }))
     await user.click(screen.getByText('workflow.nodes.questionClassifiers.addClass'))
     expect(onChange).toHaveBeenCalledWith(expect.arrayContaining([
       expect.objectContaining({ name: '' }),
diff --git a/web/app/components/workflow/nodes/question-classifier/components/advanced-setting.tsx b/web/app/components/workflow/nodes/question-classifier/components/advanced-setting.tsx
index 90d53f7271..d788d2518f 100644
--- a/web/app/components/workflow/nodes/question-classifier/components/advanced-setting.tsx
+++ b/web/app/components/workflow/nodes/question-classifier/components/advanced-setting.tsx
@@ -3,7 +3,7 @@ import type { FC } from 'react'
 import type { Memory, Node, NodeOutPutVar } from '@/app/components/workflow/types'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
-import Tooltip from '@/app/components/base/tooltip'
+import { Infotip } from '@/app/components/base/infotip'
 import Editor from '@/app/components/workflow/nodes/_base/components/prompt/editor'
 import MemoryConfig from '../../_base/components/memory-config'
 
@@ -48,14 +48,14 @@ const AdvancedSetting: FC<Props> = ({
         title={(
           <div className="flex items-center space-x-1">
             <span className="uppercase">{t(`${i18nPrefix}.instruction`, { ns: 'workflow' })}</span>
-            <Tooltip
-              popupContent={(
-                <div className="w-[120px]">
-                  {t(`${i18nPrefix}.instructionTip`, { ns: 'workflow' })}
-                </div>
-              )}
-              triggerClassName="w-3.5 h-3.5 ml-0.5"
-            />
+            <Infotip
+              aria-label={t(`${i18nPrefix}.instructionTip`, { ns: 'workflow' })}
+              className="ml-0.5 h-3.5 w-3.5"
+              iconClassName="h-3.5 w-3.5"
+              popupClassName="w-[120px]"
+            >
+              {t(`${i18nPrefix}.instructionTip`, { ns: 'workflow' })}
+            </Infotip>
           </div>
         )}
         value={instruction}
diff --git a/web/app/components/workflow/nodes/question-classifier/components/class-item.tsx b/web/app/components/workflow/nodes/question-classifier/components/class-item.tsx
index 1e90d4590d..139c314def 100644
--- a/web/app/components/workflow/nodes/question-classifier/components/class-item.tsx
+++ b/web/app/components/workflow/nodes/question-classifier/components/class-item.tsx
@@ -2,12 +2,13 @@
 import type { FC } from 'react'
 import type { Topic } from '../types'
 import type { ValueSelector, Var } from '@/app/components/workflow/types'
-import { uniqueId } from 'es-toolkit/compat'
+import { cn } from '@langgenius/dify-ui/cn'
 import * as React from 'react'
-import { useCallback, useEffect, useState } from 'react'
+import { useCallback, useEffect, useId, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Editor from '@/app/components/workflow/nodes/_base/components/prompt/editor'
 import useAvailableVarList from '@/app/components/workflow/nodes/_base/hooks/use-available-var-list'
+import { getCanonicalClassLabel, getDisplayClassLabel } from './class-label-utils'
 
 const i18nPrefix = 'nodes.questionClassifiers'
 
@@ -21,6 +22,7 @@ type Props = {
   index: number
   readonly?: boolean
   filterVar: (payload: Var, valueSelector: ValueSelector) => boolean
+  onLabelEditStart?: () => void
 }
 
 const ClassItem: FC<Props> = ({
@@ -33,18 +35,49 @@ const ClassItem: FC<Props> = ({
   index,
   readonly,
   filterVar,
+  onLabelEditStart,
 }) => {
   const { t } = useTranslation()
-  const [instanceId, setInstanceId] = useState(() => uniqueId())
+  const reactId = useId()
+  const [isEditingLabel, setIsEditingLabel] = useState(false)
+  const [draftLabel, setDraftLabel] = useState('')
+  const labelInputRef = useRef<HTMLInputElement>(null)
+  const displayLabel = getDisplayClassLabel(payload.label, index, t)
+  const instanceId = `${nodeId}-${reactId}`
 
   useEffect(() => {
-    setInstanceId(`${nodeId}-${uniqueId()}`)
-  }, [nodeId])
+    if (isEditingLabel)
+      labelInputRef.current?.select()
+  }, [isEditingLabel])
 
   const handleNameChange = useCallback((value: string) => {
     onChange({ ...payload, name: value })
   }, [onChange, payload])
 
+  const handleLabelSave = useCallback((nextValue: string) => {
+    const normalizedLabel = getCanonicalClassLabel(nextValue, index, t)
+    setIsEditingLabel(false)
+    setDraftLabel(normalizedLabel)
+    const shouldPersistLabel = normalizedLabel !== displayLabel
+      || (payload.label !== undefined && payload.label !== normalizedLabel)
+    if (shouldPersistLabel)
+      onChange({ ...payload, label: normalizedLabel })
+  }, [displayLabel, index, onChange, payload, t])
+
+  const handleLabelCancel = useCallback(() => {
+    setDraftLabel(displayLabel)
+    setIsEditingLabel(false)
+  }, [displayLabel])
+
+  const handleLabelEditStart = useCallback(() => {
+    if (readonly)
+      return
+
+    setDraftLabel(displayLabel)
+    setIsEditingLabel(true)
+    onLabelEditStart?.()
+  }, [displayLabel, onLabelEditStart, readonly])
+
   const { availableVars, availableNodesWithParent } = useAvailableVarList(nodeId, {
     onlyLeafNodeVar: false,
     hideChatVar: false,
@@ -52,11 +85,65 @@ const ClassItem: FC<Props> = ({
     filterVar,
   })
 
+  const title = isEditingLabel
+    ? (
+        <input
+          ref={labelInputRef}
+          value={draftLabel}
+          aria-label={t(`${i18nPrefix}.labelEditorAriaLabel`, { ns: 'workflow' })}
+          className={cn(
+            'h-6 w-full rounded-md border border-divider-regular bg-components-input-bg-normal px-2 text-xs font-semibold text-text-secondary ring-0 outline-none',
+            'focus:border-components-input-border-active',
+          )}
+          onChange={event => setDraftLabel(event.target.value)}
+          onBlur={() => handleLabelSave(draftLabel)}
+          onClick={event => event.stopPropagation()}
+          onDoubleClick={event => event.stopPropagation()}
+          onKeyDown={(event) => {
+            if (event.key === 'Enter') {
+              event.preventDefault()
+              handleLabelSave(draftLabel)
+            }
+
+            if (event.key === 'Escape') {
+              event.preventDefault()
+              handleLabelCancel()
+            }
+          }}
+          autoFocus
+        />
+      )
+    : readonly
+      ? (
+          <div className="-ml-1 px-1 py-0.5 text-left text-xs leading-4 font-semibold text-text-secondary">
+            {displayLabel}
+          </div>
+        )
+      : (
+          <button
+            type="button"
+            aria-label={displayLabel}
+            className={cn(
+              '-ml-1 rounded px-1 py-0.5 text-left text-xs leading-4 font-semibold text-text-secondary transition-colors',
+              'cursor-text hover:bg-state-base-hover',
+            )}
+            onDoubleClick={handleLabelEditStart}
+            onKeyDown={(event) => {
+              if (event.key === 'Enter' || event.key === ' ') {
+                event.preventDefault()
+                handleLabelEditStart()
+              }
+            }}
+          >
+            {displayLabel}
+          </button>
+        )
+
   return (
     <Editor
       className={className}
       headerClassName={headerClassName}
-      title={`${t(`${i18nPrefix}.class`, { ns: 'workflow' })} ${index}`}
+      title={title}
       placeholder={t(`${i18nPrefix}.topicPlaceholder`, { ns: 'workflow' })!}
       value={payload.name}
       onChange={handleNameChange}
diff --git a/web/app/components/workflow/nodes/question-classifier/components/class-label-utils.ts b/web/app/components/workflow/nodes/question-classifier/components/class-label-utils.ts
new file mode 100644
index 0000000000..aea17588b8
--- /dev/null
+++ b/web/app/components/workflow/nodes/question-classifier/components/class-label-utils.ts
@@ -0,0 +1,66 @@
+'use client'
+import type { TFunction } from 'i18next'
+
+const i18nPrefix = 'nodes.questionClassifiers'
+const LEGACY_DEFAULT_LABEL_PREFIX = 'CLASS'
+const DEFAULT_EQUIVALENT_PREFIXES = ['CLASS', '分类', '分類', 'クラス']
+
+const getCanonicalDefaultClassLabel = (index: number) => `${LEGACY_DEFAULT_LABEL_PREFIX} ${index}`
+
+const getTranslatedDefaultClassLabel = (t: TFunction, index: number) => {
+  const translated = t(`${i18nPrefix}.defaultLabel`, { ns: 'workflow', index })
+  if (typeof translated !== 'string')
+    return undefined
+
+  const resolvedLabel = translated.replace('{{index}}', String(index))
+  const rawWorkflowKey = `workflow.${i18nPrefix}.defaultLabel`
+  const rawKey = `${i18nPrefix}.defaultLabel`
+  if (
+    resolvedLabel === rawWorkflowKey
+    || resolvedLabel === rawKey
+    || resolvedLabel.startsWith(`${rawWorkflowKey}:`)
+    || resolvedLabel.startsWith(`${rawKey}:`)
+  ) {
+    return undefined
+  }
+
+  return resolvedLabel
+}
+
+const normalizeClassLabel = (label?: string | null) => label?.trim() ?? ''
+
+export const getDefaultClassLabel = (_t: TFunction, index: number) => getCanonicalDefaultClassLabel(index)
+
+export const getDisplayClassLabel = (
+  label: string | undefined,
+  index: number,
+  t: TFunction,
+) => normalizeClassLabel(label) || getTranslatedDefaultClassLabel(t, index) || getCanonicalDefaultClassLabel(index)
+
+export const isDefaultClassLabel = (
+  label: string | undefined,
+  index: number,
+  t: TFunction,
+) => {
+  const normalizedLabel = normalizeClassLabel(label)
+  if (!normalizedLabel)
+    return true
+
+  return DEFAULT_EQUIVALENT_PREFIXES.some(prefix => normalizedLabel === `${prefix} ${index}`)
+    || normalizedLabel === getTranslatedDefaultClassLabel(t, index)
+}
+
+export const getCanonicalClassLabel = (
+  label: string | undefined,
+  index: number,
+  t: TFunction,
+) => {
+  const normalizedLabel = normalizeClassLabel(label)
+  if (!normalizedLabel)
+    return getCanonicalDefaultClassLabel(index)
+
+  if (isDefaultClassLabel(normalizedLabel, index, t))
+    return getCanonicalDefaultClassLabel(index)
+
+  return normalizedLabel
+}
diff --git a/web/app/components/workflow/nodes/question-classifier/components/class-list.tsx b/web/app/components/workflow/nodes/question-classifier/components/class-list.tsx
index 8f62c27bb1..cf92439cd5 100644
--- a/web/app/components/workflow/nodes/question-classifier/components/class-list.tsx
+++ b/web/app/components/workflow/nodes/question-classifier/components/class-list.tsx
@@ -14,11 +14,10 @@ import { ArrowDownRoundFill } from '@/app/components/base/icons/src/vender/solid
 import { useEdgesInteractions } from '../../../hooks'
 import AddButton from '../../_base/components/add-button'
 import Item from './class-item'
+import { getDefaultClassLabel, isDefaultClassLabel } from './class-label-utils'
 
 const i18nPrefix = 'nodes.questionClassifiers'
-
-// Layout constants
-const HANDLE_SIDE_WIDTH = 3 // Width offset for drag handle spacing
+const INLINE_LABEL_HINT_STORAGE_KEY = 'question-classifier-inline-label-hint-dismissed'
 
 type Props = {
   nodeId: string
@@ -43,6 +42,17 @@ const ClassList: FC<Props> = ({
   const [shouldScrollToEnd, setShouldScrollToEnd] = useState(false)
   const prevListLength = useRef(list.length)
   const [collapsed, setCollapsed] = useState(false)
+  const [isRenameHintDismissed, setIsRenameHintDismissed] = useState(() => {
+    if (typeof window === 'undefined')
+      return true
+
+    try {
+      return window.localStorage.getItem(INLINE_LABEL_HINT_STORAGE_KEY) === 'true'
+    }
+    catch {
+      return false
+    }
+  })
 
   const handleClassChange = useCallback((index: number) => {
     return (value: Topic) => {
@@ -55,13 +65,17 @@ const ClassList: FC<Props> = ({
 
   const handleAddClass = useCallback(() => {
     const newList = produce(list, (draft) => {
-      draft.push({ id: `${Date.now()}`, name: '' })
+      draft.push({
+        id: `${Date.now()}`,
+        name: '',
+        label: getDefaultClassLabel(t, draft.length + 1),
+      })
     })
     onChange(newList)
     setShouldScrollToEnd(true)
     if (collapsed)
       setCollapsed(false)
-  }, [list, onChange, collapsed])
+  }, [collapsed, list, onChange, t])
 
   const handleRemoveClass = useCallback((index: number) => {
     return () => {
@@ -75,7 +89,6 @@ const ClassList: FC<Props> = ({
 
   const topicCount = list.length
 
-  // Scroll to the newly added item after the list updates
   useEffect(() => {
     if (shouldScrollToEnd && list.length > prevListLength.current)
       setShouldScrollToEnd(false)
@@ -86,10 +99,30 @@ const ClassList: FC<Props> = ({
     setCollapsed(!collapsed)
   }, [collapsed])
 
+  const dismissRenameHint = useCallback(() => {
+    if (isRenameHintDismissed)
+      return
+
+    setIsRenameHintDismissed(true)
+    try {
+      window.localStorage.setItem(INLINE_LABEL_HINT_STORAGE_KEY, 'true')
+    }
+    catch {
+    }
+  }, [isRenameHintDismissed])
+
+  const shouldShowRenameHint = !readonly && !isRenameHintDismissed && list.some((item, index) => {
+    return isDefaultClassLabel(item.label, index + 1, t)
+  })
+
   return (
     <>
-      <div className="mb-2 flex items-center justify-between" onClick={handleCollapse}>
-        <div className="flex cursor-pointer items-center text-xs font-semibold text-text-secondary uppercase">
+      <div className="mb-2 flex items-center justify-between">
+        <button
+          type="button"
+          className="flex cursor-pointer items-center border-none bg-transparent p-0 text-left text-xs font-semibold text-text-secondary uppercase focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+          onClick={handleCollapse}
+        >
           {t(`${i18nPrefix}.class`, { ns: 'workflow' })}
           {' '}
           <span className="text-text-destructive">*</span>
@@ -99,15 +132,21 @@ const ClassList: FC<Props> = ({
                 'h-4 w-4 text-text-quaternary transition-transform duration-200',
                 collapsed && '-rotate-90',
               )}
+              aria-hidden="true"
             />
           )}
-        </div>
+        </button>
       </div>
+      {shouldShowRenameHint && (
+        <div className="mb-2 rounded-lg border border-divider-subtle bg-components-panel-bg px-3 py-2 text-xs text-text-tertiary">
+          {t(`${i18nPrefix}.renameHint`, { ns: 'workflow' })}
+        </div>
+      )}
 
       {!collapsed && (
         <div
           ref={listContainerRef}
-          className={cn('overflow-y-visible', `pl-${HANDLE_SIDE_WIDTH}`)}
+          className="overflow-y-visible pl-3"
         >
           <ReactSortable
             list={list.map(item => ({ ...item }))}
@@ -120,18 +159,12 @@ const ClassList: FC<Props> = ({
           >
             {
               list.map((item, index) => {
-                const canDrag = (() => {
-                  if (readonly)
-                    return false
-
-                  return topicCount >= 2
-                })()
+                const canDrag = !readonly && topicCount >= 2
                 return (
                   <div
                     key={item.id}
                     className={cn(
-                      'group relative rounded-[10px] bg-components-panel-bg',
-                      `-ml-${HANDLE_SIDE_WIDTH} min-h-[40px] px-0 py-0`,
+                      'group relative -ml-3 min-h-[40px] rounded-[10px] bg-components-panel-bg px-0 py-0',
                     )}
                     style={{
                       // Performance hint for browser
@@ -157,6 +190,7 @@ const ClassList: FC<Props> = ({
                         index={index + 1}
                         readonly={readonly}
                         filterVar={filterVar}
+                        onLabelEditStart={dismissRenameHint}
                       />
                     </div>
                   </div>
diff --git a/web/app/components/workflow/nodes/question-classifier/default.ts b/web/app/components/workflow/nodes/question-classifier/default.ts
index 1ee0d3e8d1..c8f882ae31 100644
--- a/web/app/components/workflow/nodes/question-classifier/default.ts
+++ b/web/app/components/workflow/nodes/question-classifier/default.ts
@@ -1,3 +1,4 @@
+import type { TFunction } from 'i18next'
 import type { NodeDefault } from '../../types'
 import type { QuestionClassifierNodeType } from './types'
 import { BlockClassificationEnum } from '@/app/components/workflow/block-selector/types'
@@ -28,10 +29,12 @@ const nodeDefault: NodeDefault<QuestionClassifierNodeType> = {
       {
         id: '1',
         name: '',
+        label: 'CLASS 1',
       },
       {
         id: '2',
         name: '',
+        label: 'CLASS 2',
       },
     ],
     _targetBranches: [
@@ -48,7 +51,7 @@ const nodeDefault: NodeDefault<QuestionClassifierNodeType> = {
       enabled: false,
     },
   },
-  checkValid(payload: QuestionClassifierNodeType, t: any) {
+  checkValid(payload: QuestionClassifierNodeType, t: TFunction<'workflow'>) {
     let errorMessages = ''
     if (!errorMessages && (!payload.query_variable_selector || payload.query_variable_selector.length === 0))
       errorMessages = t(`${i18nPrefix}errorMsg.fieldRequired`, { ns: 'workflow', field: t(`${i18nPrefix}nodes.questionClassifiers.inputVars`, { ns: 'workflow' }) })
diff --git a/web/app/components/workflow/nodes/question-classifier/node.tsx b/web/app/components/workflow/nodes/question-classifier/node.tsx
index 2aae8debcf..ac932f4767 100644
--- a/web/app/components/workflow/nodes/question-classifier/node.tsx
+++ b/web/app/components/workflow/nodes/question-classifier/node.tsx
@@ -2,28 +2,28 @@ import type { TFunction } from 'i18next'
 import type { FC } from 'react'
 import type { NodeProps } from 'reactflow'
 import type { QuestionClassifierNodeType } from './types'
+import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
-import Tooltip from '@/app/components/base/tooltip'
 import {
   useTextGenerationCurrentProviderAndModelAndModelList,
 } from '@/app/components/header/account-setting/model-provider-page/hooks'
 import ModelSelector from '@/app/components/header/account-setting/model-provider-page/model-selector'
 import { NodeSourceHandle } from '../_base/components/node-handle'
 import ReadonlyInputWithSelectVar from '../_base/components/readonly-input-with-select-var'
-
-const i18nPrefix = 'nodes.questionClassifiers'
+import { getDisplayClassLabel } from './components/class-label-utils'
 
 const MAX_CLASS_TEXT_LENGTH = 50
 
 type TruncatedClassItemProps = {
-  topic: { id: string, name: string }
+  topic: { id: string, name: string, label?: string }
   index: number
   nodeId: string
   t: TFunction
 }
 
 const TruncatedClassItem: FC<TruncatedClassItemProps> = ({ topic, index, nodeId, t }) => {
+  const displayLabel = getDisplayClassLabel(topic.label, index + 1, t)
   const truncatedText = topic.name.length > MAX_CLASS_TEXT_LENGTH
     ? `${topic.name.slice(0, MAX_CLASS_TEXT_LENGTH)}...`
     : topic.name
@@ -42,20 +42,23 @@ const TruncatedClassItem: FC<TruncatedClassItemProps> = ({ topic, index, nodeId,
 
   return (
     <div className="flex flex-col gap-y-0.5 rounded-md bg-workflow-block-parma-bg px-[5px] py-[3px]">
-      <div className="system-2xs-semibold-uppercase text-text-secondary uppercase">
-        {`${t(`${i18nPrefix}.class`, { ns: 'workflow' })} ${index + 1}`}
+      <div className="text-xs leading-4 font-semibold text-text-secondary">
+        {displayLabel}
       </div>
       {shouldShowTooltip
         ? (
-            <Tooltip
-              popupContent={(
-                <div className="max-w-[300px] wrap-break-word">
-                  <ReadonlyInputWithSelectVar value={topic.name} nodeId={nodeId} />
-                </div>
-              )}
-            >
-              {content}
-            </Tooltip>
+            <Popover>
+              <PopoverTrigger
+                openOnHover
+                aria-label={topic.name}
+                className="w-full border-0 bg-transparent p-0 text-left"
+              >
+                {content}
+              </PopoverTrigger>
+              <PopoverContent popupClassName="max-w-[300px] px-3 py-2 system-xs-regular wrap-break-word text-text-tertiary">
+                <ReadonlyInputWithSelectVar value={topic.name} nodeId={nodeId} />
+              </PopoverContent>
+            </Popover>
           )
         : content}
     </div>
diff --git a/web/app/components/workflow/nodes/question-classifier/panel.tsx b/web/app/components/workflow/nodes/question-classifier/panel.tsx
index 8d0bd4665f..624952203b 100644
--- a/web/app/components/workflow/nodes/question-classifier/panel.tsx
+++ b/web/app/components/workflow/nodes/question-classifier/panel.tsx
@@ -127,6 +127,11 @@ const Panel: FC<NodePanelProps<QuestionClassifierNodeType>> = ({
               type="string"
               description={t(`${i18nPrefix}.outputVars.className`, { ns: 'workflow' })}
             />
+            <VarItem
+              name="class_label"
+              type="string"
+              description={t(`${i18nPrefix}.outputVars.classLabel`, { ns: 'workflow' })}
+            />
             <VarItem
               name="usage"
               type="object"
diff --git a/web/app/components/workflow/nodes/question-classifier/types.ts b/web/app/components/workflow/nodes/question-classifier/types.ts
index ddc16b4501..3f11299aeb 100644
--- a/web/app/components/workflow/nodes/question-classifier/types.ts
+++ b/web/app/components/workflow/nodes/question-classifier/types.ts
@@ -3,6 +3,7 @@ import type { CommonNodeType, Memory, ModelConfig, ValueSelector, VisionSetting
 export type Topic = {
   id: string
   name: string
+  label?: string
 }
 
 export type QuestionClassifierNodeType = CommonNodeType & {
diff --git a/web/app/components/workflow/nodes/question-classifier/use-config.ts b/web/app/components/workflow/nodes/question-classifier/use-config.ts
index 5a46897de5..9200b1bb3f 100644
--- a/web/app/components/workflow/nodes/question-classifier/use-config.ts
+++ b/web/app/components/workflow/nodes/question-classifier/use-config.ts
@@ -1,7 +1,7 @@
 import type { Memory, ValueSelector, Var } from '../../types'
 import type { QuestionClassifierNodeType, Topic } from './types'
 import { produce } from 'immer'
-import { useCallback, useEffect, useRef, useState } from 'react'
+import { startTransition, useCallback, useEffect, useRef } from 'react'
 import { useUpdateNodeInternals } from 'reactflow'
 import { checkHasQueryBlock } from '@/app/components/base/prompt-editor/constants'
 import { ModelTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
@@ -26,13 +26,17 @@ const useConfig = (id: string, payload: QuestionClassifierNodeType) => {
   const { getBeforeNodesInSameBranch } = useWorkflow()
   const startNode = getBeforeNodesInSameBranch(id).find(node => node.data.type === BlockEnum.Start)
   const startNodeId = startNode?.id
-  const { inputs, setInputs } = useNodeCrud<QuestionClassifierNodeType>(id, payload)
+  const { inputs, setInputs: doSetInputs } = useNodeCrud<QuestionClassifierNodeType>(id, payload)
   const inputRef = useRef(inputs)
+  const setInputs = useCallback((newInputs: QuestionClassifierNodeType) => {
+    doSetInputs(newInputs)
+    inputRef.current = newInputs
+  }, [doSetInputs])
   useEffect(() => {
     inputRef.current = inputs
   }, [inputs])
 
-  const [modelChanged, setModelChanged] = useState(false)
+  const isHandlingModelChangeRef = useRef(false)
   const {
     currentProvider,
     currentModel,
@@ -42,6 +46,13 @@ const useConfig = (id: string, payload: QuestionClassifierNodeType) => {
   const modelMode = inputs.model?.mode
   const isChatModel = modelMode === AppModeEnum.CHAT
 
+  const handleVisionChange = useCallback((newPayload: QuestionClassifierNodeType['vision']) => {
+    const newInputs = produce(inputRef.current, (draft) => {
+      draft.vision = newPayload
+    })
+    setInputs(newInputs)
+  }, [setInputs])
+
   const {
     isVisionModel,
     handleVisionResolutionEnabledChange,
@@ -49,12 +60,7 @@ const useConfig = (id: string, payload: QuestionClassifierNodeType) => {
     handleModelChanged: handleVisionConfigAfterModelChanged,
   } = useConfigVision(model, {
     payload: inputs.vision,
-    onChange: (newPayload) => {
-      const newInputs = produce(inputs, (draft) => {
-        draft.vision = newPayload
-      })
-      setInputs(newInputs)
-    },
+    onChange: handleVisionChange,
   })
 
   const handleModelChanged = useCallback((model: { provider: string, modelId: string, mode?: string }) => {
@@ -63,21 +69,23 @@ const useConfig = (id: string, payload: QuestionClassifierNodeType) => {
       draft.model.name = model.modelId
       draft.model.mode = model.mode!
     })
+    isHandlingModelChangeRef.current = true
     setInputs(newInputs)
-    setModelChanged(true)
   }, [setInputs])
 
   useEffect(() => {
     if (currentProvider?.provider && currentModel?.model && !model.provider) {
-      handleModelChanged({
-        provider: currentProvider?.provider,
-        modelId: currentModel?.model,
-        mode: currentModel?.model_properties?.mode as string,
+      startTransition(() => {
+        handleModelChanged({
+          provider: currentProvider?.provider,
+          modelId: currentModel?.model,
+          mode: currentModel?.model_properties?.mode as string | undefined,
+        })
       })
     }
   }, [model.provider, currentProvider, currentModel, handleModelChanged])
 
-  const handleCompletionParamsChange = useCallback((newParams: Record<string, any>) => {
+  const handleCompletionParamsChange = useCallback((newParams: Record<string, unknown>) => {
     const newInputs = produce(inputs, (draft) => {
       draft.model.completion_params = newParams
     })
@@ -86,11 +94,13 @@ const useConfig = (id: string, payload: QuestionClassifierNodeType) => {
 
   // change to vision model to set vision enabled, else disabled
   useEffect(() => {
-    if (!modelChanged)
+    if (!isHandlingModelChangeRef.current)
       return
-    setModelChanged(false)
-    handleVisionConfigAfterModelChanged()
-  }, [isVisionModel, modelChanged])
+    isHandlingModelChangeRef.current = false
+    startTransition(() => {
+      handleVisionConfigAfterModelChanged()
+    })
+  }, [handleVisionConfigAfterModelChanged, isVisionModel])
 
   const handleQueryVarChange = useCallback((newVar: ValueSelector | string) => {
     const newInputs = produce(inputs, (draft) => {
@@ -101,22 +111,58 @@ const useConfig = (id: string, payload: QuestionClassifierNodeType) => {
 
   useEffect(() => {
     const isReady = defaultConfig && Object.keys(defaultConfig).length > 0
-    if (isReady) {
-      let query_variable_selector: ValueSelector = []
-      if (isChatMode && inputs.query_variable_selector.length === 0 && startNodeId)
-        query_variable_selector = [startNodeId, 'sys.query']
-      setInputs({
-        ...inputs,
-        ...defaultConfig,
-        query_variable_selector: inputs.query_variable_selector.length > 0 ? inputs.query_variable_selector : query_variable_selector,
-      })
-    }
-  }, [defaultConfig])
+    if (!isReady)
+      return
 
-  const handleClassesChange = useCallback((newClasses: any) => {
+    const currentInputs = inputRef.current
+    let shouldUpdate = false
+
+    const nextInputs = produce(currentInputs, (draft) => {
+      if (!draft.model)
+        draft.model = defaultConfig.model
+
+      if (!draft.classes)
+        draft.classes = defaultConfig.classes
+
+      if (!draft._targetBranches)
+        draft._targetBranches = defaultConfig._targetBranches
+
+      if (!draft.vision)
+        draft.vision = defaultConfig.vision
+
+      if (draft.query_variable_selector.length === 0 && isChatMode && startNodeId) {
+        draft.query_variable_selector = [startNodeId, 'sys.query']
+        shouldUpdate = true
+      }
+
+      if (!currentInputs.model && defaultConfig.model)
+        shouldUpdate = true
+
+      if (!currentInputs.classes && defaultConfig.classes)
+        shouldUpdate = true
+
+      if (!currentInputs._targetBranches && defaultConfig._targetBranches)
+        shouldUpdate = true
+
+      if (!currentInputs.vision && defaultConfig.vision)
+        shouldUpdate = true
+    })
+
+    if (!shouldUpdate)
+      return
+
+    startTransition(() => {
+      setInputs(nextInputs)
+    })
+  }, [defaultConfig, isChatMode, setInputs, startNodeId])
+
+  const handleClassesChange = useCallback((newClasses: Topic[]) => {
     const newInputs = produce(inputs, (draft) => {
       draft.classes = newClasses
-      draft._targetBranches = newClasses
+      draft._targetBranches = newClasses.map((item: Topic) => ({
+        id: item.id,
+        name: item.name,
+      }))
     })
     setInputs(newInputs)
   }, [inputs, setInputs])
@@ -170,7 +216,13 @@ const useConfig = (id: string, payload: QuestionClassifierNodeType) => {
 
   const handleSortTopic = useCallback((newTopics: (Topic & { id: string })[]) => {
     const newInputs = produce(inputs, (draft) => {
-      draft.classes = newTopics.filter(Boolean).map(item => ({
+      const sortedTopics = newTopics.filter(Boolean)
+      draft.classes = sortedTopics.map(item => ({
+        id: item.id,
+        name: item.name,
+        label: item.label,
+      }))
+      draft._targetBranches = sortedTopics.map(item => ({
         id: item.id,
         name: item.name,
       }))
diff --git a/web/app/components/workflow/nodes/start/__tests__/panel.spec.tsx b/web/app/components/workflow/nodes/start/__tests__/panel.spec.tsx
index 1d9e1bc7bb..7b7f7a096d 100644
--- a/web/app/components/workflow/nodes/start/__tests__/panel.spec.tsx
+++ b/web/app/components/workflow/nodes/start/__tests__/panel.spec.tsx
@@ -93,7 +93,7 @@ describe('StartPanel', () => {
     expect(screen.getByText('userinput.files')).toBeInTheDocument()
     expect(screen.queryByText('LEGACY')).not.toBeInTheDocument()
 
-    fireEvent.click(screen.getByTestId('add-button'))
+    fireEvent.click(screen.getByRole('button', { name: 'common.operation.add workflow.nodes.start.inputField' }))
 
     expect(showAddVarModal).toHaveBeenCalledTimes(1)
   })
diff --git a/web/app/components/workflow/nodes/start/components/__tests__/var-item.spec.tsx b/web/app/components/workflow/nodes/start/components/__tests__/var-item.spec.tsx
new file mode 100644
index 0000000000..720d0f1bc0
--- /dev/null
+++ b/web/app/components/workflow/nodes/start/components/__tests__/var-item.spec.tsx
@@ -0,0 +1,38 @@
+import type { InputVar } from '@/app/components/workflow/types'
+import { fireEvent, render, screen } from '@testing-library/react'
+import { InputVarType } from '@/app/components/workflow/types'
+import VarItem from '../var-item'
+
+vi.mock('@/app/components/app/configuration/config-var/config-modal', () => ({
+  __esModule: true,
+  default: ({ isShow }: { isShow: boolean }) => isShow ? <div role="dialog">edit-variable</div> : null,
+}))
+
+const createPayload = (overrides: Partial<InputVar> = {}): InputVar => ({
+  label: 'Query',
+  variable: 'query',
+  type: InputVarType.textInput,
+  required: false,
+  ...overrides,
+})
+
+describe('StartVarItem', () => {
+  it('shows named edit and remove actions on hover', () => {
+    const handleRemove = vi.fn()
+    const { container } = render(
+      <VarItem
+        readonly={false}
+        payload={createPayload()}
+        onRemove={handleRemove}
+      />,
+    )
+
+    fireEvent.mouseEnter(container.firstElementChild!)
+
+    fireEvent.click(screen.getByRole('button', { name: 'common.operation.edit' }))
+    expect(screen.getByRole('dialog')).toHaveTextContent('edit-variable')
+
+    fireEvent.click(screen.getByRole('button', { name: 'common.operation.remove' }))
+    expect(handleRemove).toHaveBeenCalledTimes(1)
+  })
+})
diff --git a/web/app/components/workflow/nodes/start/components/var-item.tsx b/web/app/components/workflow/nodes/start/components/var-item.tsx
index 8cb7f8acf6..ce03fb55f6 100644
--- a/web/app/components/workflow/nodes/start/components/var-item.tsx
+++ b/web/app/components/workflow/nodes/start/components/var-item.tsx
@@ -86,12 +86,22 @@ const VarItem: FC<Props> = ({
                 )
               : (!readonly && (
                   <>
-                    <div onClick={showEditVarModal} className="mr-1 cursor-pointer rounded-md p-1 hover:bg-state-base-hover">
-                      <Edit03 className="h-4 w-4 text-text-tertiary" />
-                    </div>
-                    <div onClick={onRemove} className="group cursor-pointer rounded-md p-1 hover:bg-state-destructive-hover">
-                      <RiDeleteBinLine className="h-4 w-4 text-text-tertiary group-hover:text-text-destructive" />
-                    </div>
+                    <button
+                      type="button"
+                      aria-label={t('operation.edit', { ns: 'common' })}
+                      className="mr-1 cursor-pointer rounded-md border-none bg-transparent p-1 hover:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+                      onClick={showEditVarModal}
+                    >
+                      <Edit03 className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
+                    </button>
+                    <button
+                      type="button"
+                      aria-label={t('operation.remove', { ns: 'common' })}
+                      className="group cursor-pointer rounded-md border-none bg-transparent p-1 hover:bg-state-destructive-hover focus-visible:ring-1 focus-visible:ring-state-destructive-border focus-visible:outline-hidden"
+                      onClick={onRemove}
+                    >
+                      <RiDeleteBinLine className="h-4 w-4 text-text-tertiary group-hover:text-text-destructive" aria-hidden="true" />
+                    </button>
                   </>
                 ))}
           </>
diff --git a/web/app/components/workflow/nodes/start/panel.tsx b/web/app/components/workflow/nodes/start/panel.tsx
index 5fc8f224fe..c723ee8931 100644
--- a/web/app/components/workflow/nodes/start/panel.tsx
+++ b/web/app/components/workflow/nodes/start/panel.tsx
@@ -47,9 +47,14 @@ const Panel: FC<NodePanelProps<StartNodeType>> = ({
           operations={
             !readOnly
               ? (
-                  <div className="cursor-pointer rounded-md p-1 select-none hover:bg-state-base-hover" onClick={showAddVarModal} data-testid="add-button">
-                    <span className="i-ri-add-line h-4 w-4 text-text-tertiary" />
-                  </div>
+                  <button
+                    type="button"
+                    aria-label={`${t('operation.add', { ns: 'common' })} ${t(`${i18nPrefix}.inputField`, { ns: 'workflow' })}`}
+                    className="cursor-pointer rounded-md border-none bg-transparent p-1 select-none hover:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+                    onClick={showAddVarModal}
+                  >
+                    <span className="i-ri-add-line h-4 w-4 text-text-tertiary" aria-hidden="true" />
+                  </button>
                 )
               : undefined
           }
diff --git a/web/app/components/workflow/nodes/template-transform/__tests__/integration.spec.tsx b/web/app/components/workflow/nodes/template-transform/__tests__/integration.spec.tsx
index 6e5b00ee20..c956caf305 100644
--- a/web/app/components/workflow/nodes/template-transform/__tests__/integration.spec.tsx
+++ b/web/app/components/workflow/nodes/template-transform/__tests__/integration.spec.tsx
@@ -178,7 +178,7 @@ describe('template-transform path', () => {
       />,
     )
 
-    await user.click(screen.getByTestId('add-button'))
+    await user.click(screen.getByRole('button', { name: 'common.operation.add workflow.nodes.templateTransform.inputVars' }))
     await user.click(screen.getByRole('button', { name: 'change-var-list' }))
     await user.click(screen.getByRole('button', { name: 'rename-var' }))
     await user.click(screen.getByRole('button', { name: 'add-var' }))
@@ -219,6 +219,6 @@ describe('template-transform path', () => {
       />,
     )
 
-    expect(screen.queryByTestId('add-button')).not.toBeInTheDocument()
+    expect(screen.queryByRole('button', { name: 'common.operation.add workflow.nodes.templateTransform.inputVars' })).not.toBeInTheDocument()
   })
 })
diff --git a/web/app/components/workflow/nodes/template-transform/__tests__/panel.spec.tsx b/web/app/components/workflow/nodes/template-transform/__tests__/panel.spec.tsx
index ed0db7647b..3a51948082 100644
--- a/web/app/components/workflow/nodes/template-transform/__tests__/panel.spec.tsx
+++ b/web/app/components/workflow/nodes/template-transform/__tests__/panel.spec.tsx
@@ -144,7 +144,7 @@ describe('template-transform/panel', () => {
       />,
     )
 
-    await user.click(screen.getByTestId('add-button'))
+    await user.click(screen.getByRole('button', { name: 'common.operation.add workflow.nodes.templateTransform.inputVars' }))
     await user.click(screen.getByRole('button', { name: 'change-var-list' }))
     await user.click(screen.getByRole('button', { name: 'rename-var' }))
     await user.click(screen.getByRole('button', { name: 'add-var' }))
@@ -185,6 +185,6 @@ describe('template-transform/panel', () => {
       />,
     )
 
-    expect(screen.queryByTestId('add-button')).not.toBeInTheDocument()
+    expect(screen.queryByRole('button', { name: 'common.operation.add workflow.nodes.templateTransform.inputVars' })).not.toBeInTheDocument()
   })
 })
diff --git a/web/app/components/workflow/nodes/template-transform/panel.tsx b/web/app/components/workflow/nodes/template-transform/panel.tsx
index 4a6515da7a..4993d232d1 100644
--- a/web/app/components/workflow/nodes/template-transform/panel.tsx
+++ b/web/app/components/workflow/nodes/template-transform/panel.tsx
@@ -43,9 +43,14 @@ const Panel: FC<NodePanelProps<TemplateTransformNodeType>> = ({
           operations={
             !readOnly
               ? (
-                  <div className="cursor-pointer rounded-md p-1 select-none hover:bg-state-base-hover" onClick={handleAddEmptyVariable} data-testid="add-button">
-                    <span className="i-ri-add-line h-4 w-4 text-text-tertiary" />
-                  </div>
+                  <button
+                    type="button"
+                    aria-label={`${t('operation.add', { ns: 'common' })} ${t(`${i18nPrefix}.inputVars`, { ns: 'workflow' })}`}
+                    className="cursor-pointer rounded-md border-none bg-transparent p-1 select-none hover:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+                    onClick={handleAddEmptyVariable}
+                  >
+                    <span className="i-ri-add-line h-4 w-4 text-text-tertiary" aria-hidden="true" />
+                  </button>
                 )
               : undefined
           }
diff --git a/web/app/components/workflow/nodes/tool/components/__tests__/input-var-list.spec.tsx b/web/app/components/workflow/nodes/tool/components/__tests__/input-var-list.spec.tsx
index 990153d308..87ee0447ff 100644
--- a/web/app/components/workflow/nodes/tool/components/__tests__/input-var-list.spec.tsx
+++ b/web/app/components/workflow/nodes/tool/components/__tests__/input-var-list.spec.tsx
@@ -1,7 +1,7 @@
 import type { ToolVarInputs } from '../../types'
 import type { CredentialFormSchema } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import type { App } from '@/types/app'
-import { screen } from '@testing-library/react'
+import { screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import { useState } from 'react'
 import { createMockProviderContextValue } from '@/__mocks__/provider-context'
@@ -116,23 +116,30 @@ vi.mock('@/app/components/header/account-setting/model-provider-page/hooks', ()
 }))
 
 vi.mock('@/service/use-apps', () => ({
-  useInfiniteAppList: () => ({
-    data: {
-      pages: [{
-        data: mockApps,
-      }],
-    },
-    isLoading: false,
-    isFetchingNextPage: false,
-    fetchNextPage: mockFetchNextPage,
-    hasNextPage: false,
-  }),
   useAppDetail: (appId: string) => ({
     data: mockApps.find(app => app.id === appId),
     isFetching: false,
   }),
 }))
 
+vi.mock('@tanstack/react-query', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@tanstack/react-query')>()
+  return {
+    ...actual,
+    useInfiniteQuery: () => ({
+      data: {
+        pages: [{
+          data: mockApps,
+        }],
+      },
+      isLoading: false,
+      isFetchingNextPage: false,
+      fetchNextPage: mockFetchNextPage,
+      hasNextPage: false,
+    }),
+  }
+})
+
 vi.mock('@/service/use-workflow', () => ({
   useAppWorkflow: () => ({
     data: undefined,
@@ -460,7 +467,6 @@ describe('InputVarList', () => {
     await user.click(screen.getAllByText('app.appSelector.placeholder')[0]!)
     await user.click(screen.getAllByText('app.appSelector.placeholder')[1]!)
     await user.click(screen.getByTitle('Weather Assistant (app-1)'))
-    await user.type(screen.getByPlaceholderText('Topic'), 'weather')
 
     expect(onChange).toHaveBeenNthCalledWith(1, {
       assistant: {
@@ -472,20 +478,27 @@ describe('InputVarList', () => {
         credential_id: 'credential-1',
       },
     })
-    expect(onChange).toHaveBeenLastCalledWith({
-      assistant: {
-        app_id: 'app-1',
-        inputs: { topic: 'weather' },
-        files: [],
-      },
-      model: {
-        credential_id: 'credential-1',
-      },
+
+    const topicInput = await screen.findByPlaceholderText('Topic')
+    await user.type(topicInput, 'weather')
+
+    await waitFor(() => {
+      expect(onChange).toHaveBeenLastCalledWith({
+        assistant: {
+          app_id: 'app-1',
+          inputs: { topic: 'weather' },
+          files: [],
+        },
+        model: {
+          credential_id: 'credential-1',
+        },
+      })
     })
 
+    await user.click(screen.getByRole('button', { name: 'app.appSelector.label' }))
     await user.click(screen.getByText('workflow:errorMsg.configureModel'))
-    await user.click(await screen.findByRole('button', { name: 'plugin.detailPanel.configureModel' }))
-    await user.click(await screen.findByRole('button', { name: /GPT-4o/i }))
+    await user.click(await screen.findByRole('combobox', { name: 'plugin.detailPanel.configureModel' }))
+    await user.click(await screen.findByRole('option', { name: /GPT-4o/i }))
 
     expect(onChange).toHaveBeenLastCalledWith({
       assistant: {
diff --git a/web/app/components/workflow/nodes/tool/components/input-var-list.tsx b/web/app/components/workflow/nodes/tool/components/input-var-list.tsx
index f24b0cfef3..6765c92033 100644
--- a/web/app/components/workflow/nodes/tool/components/input-var-list.tsx
+++ b/web/app/components/workflow/nodes/tool/components/input-var-list.tsx
@@ -12,7 +12,7 @@ import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { FormTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import { useLanguage } from '@/app/components/header/account-setting/model-provider-page/hooks'
-import AppSelector from '@/app/components/plugins/plugin-detail-panel/app-selector'
+import { AppSelector } from '@/app/components/plugins/plugin-detail-panel/app-selector'
 import ModelParameterModal from '@/app/components/plugins/plugin-detail-panel/model-selector'
 import Input from '@/app/components/workflow/nodes/_base/components/input-support-select-var'
 import VarReferencePicker from '@/app/components/workflow/nodes/_base/components/variable/var-reference-picker'
diff --git a/web/app/components/workflow/nodes/tool/components/tool-form/__tests__/item.spec.tsx b/web/app/components/workflow/nodes/tool/components/tool-form/__tests__/item.spec.tsx
index e935085fe9..42478ca34d 100644
--- a/web/app/components/workflow/nodes/tool/components/tool-form/__tests__/item.spec.tsx
+++ b/web/app/components/workflow/nodes/tool/components/tool-form/__tests__/item.spec.tsx
@@ -171,7 +171,7 @@ describe('tool/tool-form/item', () => {
       } as unknown as SchemaRoot,
     })
 
-    const { container } = render(
+    render(
       <ToolFormItem
         readOnly={false}
         nodeId="tool-node"
@@ -182,7 +182,8 @@ describe('tool/tool-form/item', () => {
       />,
     )
 
-    fireEvent.mouseEnter(container.querySelector('svg')?.parentElement as HTMLElement)
+    const infotipTrigger = screen.getByRole('button', { name: 'Select from tools' })
+    fireEvent.click(infotipTrigger)
     expect(screen.getByText('Select from tools'))!.toBeInTheDocument()
 
     fireEvent.click(screen.getByRole('button', { name: 'JSON Schema' }))
diff --git a/web/app/components/workflow/nodes/tool/components/tool-form/item.tsx b/web/app/components/workflow/nodes/tool/components/tool-form/item.tsx
index 6cd13984f0..1cb3179135 100644
--- a/web/app/components/workflow/nodes/tool/components/tool-form/item.tsx
+++ b/web/app/components/workflow/nodes/tool/components/tool-form/item.tsx
@@ -9,7 +9,7 @@ import {
   RiBracesLine,
 } from '@remixicon/react'
 import { useBoolean } from 'ahooks'
-import Tooltip from '@/app/components/base/tooltip'
+import { Infotip } from '@/app/components/base/infotip'
 import { FormTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import { useLanguage } from '@/app/components/header/account-setting/model-provider-page/hooks'
 import { SchemaModal } from '@/app/components/plugins/plugin-detail-panel/tool-selector/components'
@@ -100,15 +100,13 @@ const ToolFormItem: FC<Props> = ({
             <div className="ml-1 system-xs-regular text-text-destructive-secondary">*</div>
           )}
           {!showDescription && tooltip && (
-            <Tooltip
-              popupContent={(
-                <div className="w-[200px]">
-                  {tooltip[language] || tooltip.en_US}
-                </div>
-              )}
-              triggerClassName="ml-1 w-4 h-4"
-              asChild={false}
-            />
+            <Infotip
+              aria-label={tooltip[language] || tooltip.en_US}
+              className="ml-1"
+              popupClassName="w-[200px]"
+            >
+              {tooltip[language] || tooltip.en_US}
+            </Infotip>
           )}
           {showSchemaButton && (
             <>
diff --git a/web/app/components/workflow/nodes/trigger-plugin/components/trigger-form/item.tsx b/web/app/components/workflow/nodes/trigger-plugin/components/trigger-form/item.tsx
index 44eb9d44c6..3cae373d48 100644
--- a/web/app/components/workflow/nodes/trigger-plugin/components/trigger-form/item.tsx
+++ b/web/app/components/workflow/nodes/trigger-plugin/components/trigger-form/item.tsx
@@ -9,7 +9,7 @@ import {
   RiBracesLine,
 } from '@remixicon/react'
 import { useBoolean } from 'ahooks'
-import Tooltip from '@/app/components/base/tooltip'
+import { Infotip } from '@/app/components/base/infotip'
 import { FormTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import { useLanguage } from '@/app/components/header/account-setting/model-provider-page/hooks'
 import { SchemaModal } from '@/app/components/plugins/plugin-detail-panel/tool-selector/components'
@@ -57,15 +57,13 @@ const TriggerFormItem: FC<Props> = ({
             <div className="ml-1 system-xs-regular text-text-destructive-secondary">*</div>
           )}
           {!showDescription && tooltip && (
-            <Tooltip
-              popupContent={(
-                <div className="w-[200px]">
-                  {tooltip[language] || tooltip.en_US}
-                </div>
-              )}
-              triggerClassName="ml-1 w-4 h-4"
-              asChild={false}
-            />
+            <Infotip
+              aria-label={tooltip[language] || tooltip.en_US}
+              className="ml-1 h-4 w-4"
+              popupClassName="w-[200px]"
+            >
+              {tooltip[language] || tooltip.en_US}
+            </Infotip>
           )}
           {showSchemaButton && (
             <>
diff --git a/web/app/components/workflow/nodes/trigger-schedule/components/__tests__/integration.spec.tsx b/web/app/components/workflow/nodes/trigger-schedule/components/__tests__/integration.spec.tsx
index c0a769ffb0..26609885d2 100644
--- a/web/app/components/workflow/nodes/trigger-schedule/components/__tests__/integration.spec.tsx
+++ b/web/app/components/workflow/nodes/trigger-schedule/components/__tests__/integration.spec.tsx
@@ -3,7 +3,6 @@ import type { ScheduleTriggerNodeType } from '../../types'
 import { render, screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import FrequencySelector from '../frequency-selector'
-import ModeSwitcher from '../mode-switcher'
 import ModeToggle from '../mode-toggle'
 import MonthlyDaysSelector from '../monthly-days-selector'
 import NextExecutionTimes from '../next-execution-times'
@@ -53,16 +52,6 @@ describe('trigger-schedule components', () => {
       })
     })
 
-    it('should switch between visual and cron modes', async () => {
-      const user = userEvent.setup()
-      const onChange = vi.fn()
-      render(<ModeSwitcher mode="visual" onChange={onChange} />)
-
-      await user.click(screen.getByText('workflow.nodes.triggerSchedule.modeCron'))
-
-      expect(onChange).toHaveBeenCalledWith('cron')
-    })
-
     it('should toggle the mode from visual to cron', async () => {
       const user = userEvent.setup()
       const onChange = vi.fn()
diff --git a/web/app/components/workflow/nodes/trigger-schedule/components/__tests__/mode-switcher.spec.tsx b/web/app/components/workflow/nodes/trigger-schedule/components/__tests__/mode-switcher.spec.tsx
deleted file mode 100644
index c4d5af5b11..0000000000
--- a/web/app/components/workflow/nodes/trigger-schedule/components/__tests__/mode-switcher.spec.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { render, screen } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
-import ModeSwitcher from '../mode-switcher'
-
-describe('trigger-schedule/mode-switcher', () => {
-  it('switches between visual and cron modes', async () => {
-    const user = userEvent.setup()
-    const onChange = vi.fn()
-
-    render(<ModeSwitcher mode="visual" onChange={onChange} />)
-
-    await user.click(screen.getByText('workflow.nodes.triggerSchedule.modeCron'))
-
-    expect(onChange).toHaveBeenCalledWith('cron')
-  })
-})
diff --git a/web/app/components/workflow/nodes/trigger-schedule/components/frequency-selector.tsx b/web/app/components/workflow/nodes/trigger-schedule/components/frequency-selector.tsx
index 5a7729d836..379749e3b8 100644
--- a/web/app/components/workflow/nodes/trigger-schedule/components/frequency-selector.tsx
+++ b/web/app/components/workflow/nodes/trigger-schedule/components/frequency-selector.tsx
@@ -9,8 +9,6 @@ import {
   SelectLabel,
   SelectTrigger,
 } from '@langgenius/dify-ui/select'
-import * as React from 'react'
-import { useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 
 type FrequencyOption = {
@@ -27,24 +25,30 @@ const FrequencySelector = ({ frequency, onChange }: FrequencySelectorProps) => {
   const { t } = useTranslation()
   const groupLabel = t('nodes.triggerSchedule.frequency.label', { ns: 'workflow' })
 
-  const frequencies = useMemo<FrequencyOption[]>(() => [
+  const frequencies: FrequencyOption[] = [
     { value: 'hourly', name: t('nodes.triggerSchedule.frequency.hourly', { ns: 'workflow' }) },
     { value: 'daily', name: t('nodes.triggerSchedule.frequency.daily', { ns: 'workflow' }) },
     { value: 'weekly', name: t('nodes.triggerSchedule.frequency.weekly', { ns: 'workflow' }) },
     { value: 'monthly', name: t('nodes.triggerSchedule.frequency.monthly', { ns: 'workflow' }) },
-  ], [t])
+  ]
   const selectedFrequency = frequencies.find(item => item.value === frequency)
 
+  const handleFrequencyChange = (value: string | null) => {
+    const selected = frequencies.find(item => item.value === value)
+    if (selected)
+      onChange(selected.value)
+  }
+
   return (
     <Select
       key={`${frequency}-${groupLabel}`}
       value={frequency}
-      onValueChange={value => value && onChange(value as ScheduleFrequency)}
+      onValueChange={handleFrequencyChange}
     >
       <SelectTrigger className="w-full py-2">
         {selectedFrequency?.name ?? t('nodes.triggerSchedule.selectFrequency', { ns: 'workflow' })}
       </SelectTrigger>
-      <SelectContent popupClassName="w-(--anchor-width)">
+      <SelectContent>
         <SelectGroup>
           <SelectLabel>{groupLabel}</SelectLabel>
           {frequencies.map(item => (
diff --git a/web/app/components/workflow/nodes/trigger-schedule/components/mode-switcher.tsx b/web/app/components/workflow/nodes/trigger-schedule/components/mode-switcher.tsx
deleted file mode 100644
index bb914e313f..0000000000
--- a/web/app/components/workflow/nodes/trigger-schedule/components/mode-switcher.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import type { ScheduleMode } from '../types'
-import { RiCalendarLine, RiCodeLine } from '@remixicon/react'
-import * as React from 'react'
-import { useTranslation } from 'react-i18next'
-import { SegmentedControl } from '@/app/components/base/segmented-control'
-
-type ModeSwitcherProps = {
-  mode: ScheduleMode
-  onChange: (mode: ScheduleMode) => void
-}
-
-const ModeSwitcher = ({ mode, onChange }: ModeSwitcherProps) => {
-  const { t } = useTranslation()
-
-  const options = [
-    {
-      Icon: RiCalendarLine,
-      text: t('nodes.triggerSchedule.modeVisual', { ns: 'workflow' }),
-      value: 'visual' as const,
-    },
-    {
-      Icon: RiCodeLine,
-      text: t('nodes.triggerSchedule.modeCron', { ns: 'workflow' }),
-      value: 'cron' as const,
-    },
-  ]
-
-  return (
-    <SegmentedControl
-      options={options}
-      value={mode}
-      onChange={onChange}
-    />
-  )
-}
-
-export default ModeSwitcher
diff --git a/web/app/components/workflow/nodes/trigger-schedule/components/monthly-days-selector.tsx b/web/app/components/workflow/nodes/trigger-schedule/components/monthly-days-selector.tsx
index 5fd0fc7c41..23e87554e3 100644
--- a/web/app/components/workflow/nodes/trigger-schedule/components/monthly-days-selector.tsx
+++ b/web/app/components/workflow/nodes/trigger-schedule/components/monthly-days-selector.tsx
@@ -1,7 +1,6 @@
-import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
-import { RiQuestionLine } from '@remixicon/react'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
+import { Infotip } from '@/app/components/base/infotip'
 
 type MonthlyDaysSelectorProps = {
   selectedDays: (number | 'last')[]
@@ -41,38 +40,46 @@ const MonthlyDaysSelector = ({ selectedDays, onChange }: MonthlyDaysSelectorProp
         {rows.map((row, rowIndex) => (
           <div key={rowIndex} className="grid grid-cols-7 gap-1.5">
             {row.map(day => (
-              <button
-                key={day}
-                type="button"
-                onClick={() => handleDayClick(day)}
-                className={`rounded-lg border bg-components-option-card-option-bg py-1 text-xs transition-colors ${
-                  day === 'last' ? 'col-span-2 min-w-0' : ''
-                } ${
-                  isDaySelected(day)
-                    ? 'border-util-colors-blue-brand-blue-brand-600 text-text-secondary'
-                    : 'border-divider-subtle text-text-tertiary hover:border-divider-regular hover:text-text-secondary'
-                }`}
-              >
-                {day === 'last'
-                  ? (
-                      <div className="flex items-center justify-center gap-1">
-                        <span>{t('nodes.triggerSchedule.lastDay', { ns: 'workflow' })}</span>
-                        <Tooltip>
-                          <TooltipTrigger
-                            render={(
-                              <RiQuestionLine className="h-3 w-3 text-text-quaternary" />
-                            )}
-                          />
-                          <TooltipContent>
-                            {t('nodes.triggerSchedule.lastDayTooltip', { ns: 'workflow' })}
-                          </TooltipContent>
-                        </Tooltip>
-                      </div>
-                    )
-                  : (
-                      day
-                    )}
-              </button>
+              day === 'last'
+                ? (
+                    <div
+                      key={day}
+                      className={`col-span-2 flex min-w-0 items-center rounded-lg border bg-components-option-card-option-bg text-xs transition-colors ${
+                        isDaySelected(day)
+                          ? 'border-util-colors-blue-brand-blue-brand-600 text-text-secondary'
+                          : 'border-divider-subtle text-text-tertiary hover:border-divider-regular hover:text-text-secondary'
+                      }`}
+                    >
+                      <button
+                        type="button"
+                        onClick={() => handleDayClick(day)}
+                        className="min-w-0 flex-1 py-1"
+                      >
+                        {t('nodes.triggerSchedule.lastDay', { ns: 'workflow' })}
+                      </button>
+                      <Infotip
+                        aria-label={t('nodes.triggerSchedule.lastDayTooltip', { ns: 'workflow' })}
+                        className="mr-1 h-3 w-3"
+                        iconClassName="h-3 w-3"
+                      >
+                        {t('nodes.triggerSchedule.lastDayTooltip', { ns: 'workflow' })}
+                      </Infotip>
+                    </div>
+                  )
+                : (
+                    <button
+                      key={day}
+                      type="button"
+                      onClick={() => handleDayClick(day)}
+                      className={`rounded-lg border bg-components-option-card-option-bg py-1 text-xs transition-colors ${
+                        isDaySelected(day)
+                          ? 'border-util-colors-blue-brand-blue-brand-600 text-text-secondary'
+                          : 'border-divider-subtle text-text-tertiary hover:border-divider-regular hover:text-text-secondary'
+                      }`}
+                    >
+                      {day}
+                    </button>
+                  )
             ))}
             {/* Fill empty cells in the last row (Last day takes 2 cols, so need 1 less) */}
             {rowIndex === rows.length - 1 && Array.from({ length: 7 - row.length - 1 }, (_, i) => (
diff --git a/web/app/components/workflow/nodes/trigger-webhook/__tests__/panel.spec.tsx b/web/app/components/workflow/nodes/trigger-webhook/__tests__/panel.spec.tsx
index a1f5f1e2c8..4d60e77ba2 100644
--- a/web/app/components/workflow/nodes/trigger-webhook/__tests__/panel.spec.tsx
+++ b/web/app/components/workflow/nodes/trigger-webhook/__tests__/panel.spec.tsx
@@ -94,10 +94,6 @@ vi.mock('@/app/components/base/input-with-copy', () => ({
   ),
 }))
 
-vi.mock('@/app/components/base/tooltip', () => ({
-  default: ({ children }: { children: React.ReactNode }) => <>{children}</>,
-}))
-
 vi.mock('@/app/components/workflow/nodes/_base/components/field', () => ({
   default: ({ title, children }: { title: string, children: React.ReactNode }) => (
     <div>
diff --git a/web/app/components/workflow/nodes/trigger-webhook/components/generic-table.tsx b/web/app/components/workflow/nodes/trigger-webhook/components/generic-table.tsx
index a14a642c40..e2e82cddde 100644
--- a/web/app/components/workflow/nodes/trigger-webhook/components/generic-table.tsx
+++ b/web/app/components/workflow/nodes/trigger-webhook/components/generic-table.tsx
@@ -1,11 +1,11 @@
 'use client'
 import type { FC, ReactNode } from 'react'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import { cn } from '@langgenius/dify-ui/cn'
 import { Select, SelectContent, SelectItem, SelectItemIndicator, SelectItemText, SelectTrigger } from '@langgenius/dify-ui/select'
 import { RiDeleteBinLine } from '@remixicon/react'
 import * as React from 'react'
 import { useCallback, useMemo } from 'react'
-import Checkbox from '@/app/components/base/checkbox'
 import Input from '@/app/components/base/input'
 import { replaceSpaceWithUnderscoreInVarNameInput } from '@/utils/var'
 
@@ -147,7 +147,7 @@ const renderSelectCell = (
       >
         {selectedOption?.name ?? column.placeholder}
       </SelectTrigger>
-      <SelectContent className="-translate-x-3" popupClassName="z-60 w-26 min-w-26">
+      <SelectContent className="-translate-x-3" popupClassName="w-26 min-w-26">
         {options.map(option => (
           <SelectItem key={option.value} value={option.value}>
             <SelectItemText>{option.name}</SelectItemText>
@@ -169,9 +169,9 @@ const renderSwitchCell = (
   return (
     <div className="flex h-7 items-center">
       <Checkbox
-        id={`${column.key}-${String(dataIndex ?? 'v')}`}
         checked={Boolean(value)}
-        onCheck={() => handleChange(!value)}
+        aria-label={column.title}
+        onCheckedChange={handleChange}
         disabled={readonly}
       />
     </div>
diff --git a/web/app/components/workflow/nodes/trigger-webhook/panel.tsx b/web/app/components/workflow/nodes/trigger-webhook/panel.tsx
index 81a7828668..9acfa7e702 100644
--- a/web/app/components/workflow/nodes/trigger-webhook/panel.tsx
+++ b/web/app/components/workflow/nodes/trigger-webhook/panel.tsx
@@ -11,12 +11,12 @@ import {
 } from '@langgenius/dify-ui/number-field'
 import { Select, SelectContent, SelectItem, SelectItemIndicator, SelectItemText, SelectTrigger } from '@langgenius/dify-ui/select'
 import { toast } from '@langgenius/dify-ui/toast'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import copy from 'copy-to-clipboard'
 import * as React from 'react'
 import { useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import InputWithCopy from '@/app/components/base/input-with-copy'
-import Tooltip from '@/app/components/base/tooltip'
 import Field from '@/app/components/workflow/nodes/_base/components/field'
 import OutputVars from '@/app/components/workflow/nodes/_base/components/output-vars'
 import Split from '@/app/components/workflow/nodes/_base/components/split'
@@ -36,7 +36,7 @@ const HTTP_METHODS = [
   { name: 'DELETE', value: 'DELETE' },
   { name: 'PATCH', value: 'PATCH' },
   { name: 'HEAD', value: 'HEAD' },
-]
+] satisfies Array<{ name: string, value: HttpMethod }>
 
 const CONTENT_TYPES = [
   { name: 'application/json', value: 'application/json' },
@@ -46,6 +46,51 @@ const CONTENT_TYPES = [
   { name: 'multipart/form-data', value: 'multipart/form-data' },
 ]
 
+type WebhookMethodSelectorProps = {
+  nodeId: string
+  label: string
+  value: HttpMethod
+  disabled: boolean
+  onChange: (method: HttpMethod) => void
+}
+
+const WebhookMethodSelector = ({
+  nodeId,
+  label,
+  value,
+  disabled,
+  onChange,
+}: WebhookMethodSelectorProps) => {
+  const selectedMethod = HTTP_METHODS.find(item => item.value === value) ?? null
+
+  const handleMethodChange = (nextValue: string | null) => {
+    const nextMethod = HTTP_METHODS.find(item => item.value === nextValue)
+    if (nextMethod)
+      onChange(nextMethod.value)
+  }
+
+  return (
+    <Select
+      key={`${nodeId}-method-${value}`}
+      value={selectedMethod?.value ?? null}
+      disabled={disabled}
+      onValueChange={handleMethodChange}
+    >
+      <SelectTrigger aria-label={label} className="h-8 pr-8 text-sm">
+        {selectedMethod?.name}
+      </SelectTrigger>
+      <SelectContent popupClassName="w-26 min-w-26">
+        {HTTP_METHODS.map(item => (
+          <SelectItem key={item.value} value={item.value}>
+            <SelectItemText>{item.name}</SelectItemText>
+            <SelectItemIndicator />
+          </SelectItem>
+        ))}
+      </SelectContent>
+    </Select>
+  )
+}
+
 const Panel: FC<NodePanelProps<WebhookTriggerNodeType>> = ({
   id,
   data,
@@ -75,7 +120,6 @@ const Panel: FC<NodePanelProps<WebhookTriggerNodeType>> = ({
     }
   }, [readOnly, inputs.webhook_url, generateWebhookUrl])
 
-  const selectedMethod = HTTP_METHODS.find(item => item.value === inputs.method) ?? null
   const selectedContentType = CONTENT_TYPES.find(item => item.value === inputs.content_type) ?? null
 
   return (
@@ -86,24 +130,13 @@ const Panel: FC<NodePanelProps<WebhookTriggerNodeType>> = ({
           <div className="space-y-1">
             <div className="flex gap-1" style={{ height: '32px' }}>
               <div className="w-26 shrink-0">
-                <Select
-                  key={`${id}-method-${inputs.method}`}
-                  value={selectedMethod?.value ?? null}
+                <WebhookMethodSelector
+                  nodeId={id}
+                  label={t(`${i18nPrefix}.method`, { ns: 'workflow' })}
+                  value={inputs.method}
                   disabled={readOnly}
-                  onValueChange={value => value && handleMethodChange(value as HttpMethod)}
-                >
-                  <SelectTrigger className="h-8 pr-8 text-sm">
-                    {selectedMethod?.name}
-                  </SelectTrigger>
-                  <SelectContent popupClassName="z-5 w-26 min-w-26">
-                    {HTTP_METHODS.map(item => (
-                      <SelectItem key={item.value} value={item.value}>
-                        <SelectItemText>{item.name}</SelectItemText>
-                        <SelectItemIndicator />
-                      </SelectItem>
-                    ))}
-                  </SelectContent>
-                </Select>
+                  onChange={handleMethodChange}
+                />
               </div>
               <div className="flex-1" style={{ width: '284px' }}>
                 <InputWithCopy
@@ -118,32 +151,38 @@ const Panel: FC<NodePanelProps<WebhookTriggerNodeType>> = ({
             </div>
             {inputs.webhook_debug_url && (
               <div className="space-y-2">
-                <Tooltip
-                  popupContent={debugUrlCopied ? t(`${i18nPrefix}.debugUrlCopied`, { ns: 'workflow' }) : t(`${i18nPrefix}.debugUrlCopy`, { ns: 'workflow' })}
-                  popupClassName="system-xs-regular text-text-primary bg-components-tooltip-bg border border-components-panel-border shadow-lg backdrop-blur-xs rounded-md px-1.5 py-1"
-                  position="top"
-                  offset={{ mainAxis: -20 }}
-                  needsDelay={true}
-                >
-                  <div
-                    className="flex cursor-pointer gap-1.5 rounded-lg px-1 py-1.5 transition-colors"
-                    style={{ width: '368px', height: '38px' }}
-                    onClick={() => {
-                      copy(inputs.webhook_debug_url || '')
-                      setDebugUrlCopied(true)
-                      setTimeout(() => setDebugUrlCopied(false), 2000)
-                    }}
+                <Tooltip>
+                  <TooltipTrigger
+                    render={(
+                      <button
+                        type="button"
+                        aria-label={t(`${i18nPrefix}.debugUrlCopy`, { ns: 'workflow' })}
+                        className="flex cursor-pointer gap-1.5 rounded-lg px-1 py-1.5 text-left transition-colors"
+                        style={{ width: '368px', height: '38px' }}
+                        onClick={() => {
+                          copy(inputs.webhook_debug_url || '')
+                          setDebugUrlCopied(true)
+                          setTimeout(() => setDebugUrlCopied(false), 2000)
+                        }}
+                      >
+                        <span className="mt-0.5 w-0.5 bg-divider-regular" style={{ height: '28px' }} />
+                        <span className="flex-1" style={{ width: '352px', height: '32px' }}>
+                          <span className="block text-xs leading-4 text-text-tertiary">
+                            {t(`${i18nPrefix}.debugUrlTitle`, { ns: 'workflow' })}
+                          </span>
+                          <span className="block truncate text-xs leading-4 text-text-primary">
+                            {inputs.webhook_debug_url}
+                          </span>
+                        </span>
+                      </button>
+                    )}
+                  />
+                  <TooltipContent
+                    placement="top"
+                    className="rounded-md border border-components-panel-border bg-components-tooltip-bg px-1.5 py-1 system-xs-regular text-text-primary shadow-lg backdrop-blur-xs"
                   >
-                    <div className="mt-0.5 w-0.5 bg-divider-regular" style={{ height: '28px' }}></div>
-                    <div className="flex-1" style={{ width: '352px', height: '32px' }}>
-                      <div className="text-xs leading-4 text-text-tertiary">
-                        {t(`${i18nPrefix}.debugUrlTitle`, { ns: 'workflow' })}
-                      </div>
-                      <div className="truncate text-xs leading-4 text-text-primary">
-                        {inputs.webhook_debug_url}
-                      </div>
-                    </div>
-                  </div>
+                    {debugUrlCopied ? t(`${i18nPrefix}.debugUrlCopied`, { ns: 'workflow' }) : t(`${i18nPrefix}.debugUrlCopy`, { ns: 'workflow' })}
+                  </TooltipContent>
                 </Tooltip>
                 {isPrivateOrLocalAddress(inputs.webhook_debug_url) && (
                   <div className="mt-1 px-0 py-[2px] system-xs-regular text-text-warning">
@@ -167,7 +206,7 @@ const Panel: FC<NodePanelProps<WebhookTriggerNodeType>> = ({
               <SelectTrigger className="h-8 w-full text-sm">
                 {selectedContentType?.name}
               </SelectTrigger>
-              <SelectContent popupClassName="z-5">
+              <SelectContent>
                 {CONTENT_TYPES.map(item => (
                   <SelectItem key={item.value} value={item.value}>
                     <SelectItemText>{item.name}</SelectItemText>
diff --git a/web/app/components/workflow/operator/__tests__/index.spec.tsx b/web/app/components/workflow/operator/__tests__/index.spec.tsx
index 455f3aa0b5..49f077341d 100644
--- a/web/app/components/workflow/operator/__tests__/index.spec.tsx
+++ b/web/app/components/workflow/operator/__tests__/index.spec.tsx
@@ -1,4 +1,4 @@
-import { act, screen } from '@testing-library/react'
+import { act, screen, waitFor } from '@testing-library/react'
 import { createNode } from '../../__tests__/fixtures'
 import { renderWorkflowFlowComponent } from '../../__tests__/workflow-test-env'
 import { BlockEnum } from '../../types'
@@ -110,7 +110,7 @@ describe('Operator', () => {
     expect(container.querySelector('div[style*="width: auto"]')).toBeInTheDocument()
   })
 
-  it('should sync the observed panel size back into the workflow store and disconnect on unmount', () => {
+  it('should sync the observed panel size back into the workflow store and disconnect on unmount', async () => {
     const { store, unmount } = renderOperator({
       workflowCanvasWidth: 900,
       rightPanelWidth: 260,
@@ -126,8 +126,10 @@ describe('Operator', () => {
       ], {} as ResizeObserver)
     })
 
-    expect(store.getState().bottomPanelWidth).toBe(512)
-    expect(store.getState().bottomPanelHeight).toBe(188)
+    await waitFor(() => {
+      expect(store.getState().bottomPanelWidth).toBe(512)
+      expect(store.getState().bottomPanelHeight).toBe(188)
+    })
 
     unmount()
 
diff --git a/web/app/components/workflow/operator/index.tsx b/web/app/components/workflow/operator/index.tsx
index 052953cecf..97fc4378b9 100644
--- a/web/app/components/workflow/operator/index.tsx
+++ b/web/app/components/workflow/operator/index.tsx
@@ -15,6 +15,8 @@ type OperatorProps = {
 
 const Operator = ({ handleUndo, handleRedo }: OperatorProps) => {
   const bottomPanelRef = useRef<HTMLDivElement>(null)
+  const bottomPanelSizeRef = useRef<{ width?: number, height?: number }>({})
+  const bottomPanelResizeFrameRef = useRef<number | undefined>(undefined)
   const [showMiniMap, setShowMiniMap] = useState(true)
   const showUserCursors = useStore(s => s.showUserCursors)
   const setShowUserCursors = useStore(s => s.setShowUserCursors)
@@ -55,15 +57,33 @@ const Operator = ({ handleUndo, handleRedo }: OperatorProps) => {
   // update bottom panel height
   useEffect(() => {
     if (bottomPanelRef.current) {
+      const updateBottomPanelSize = (width: number, height: number) => {
+        if (bottomPanelSizeRef.current.width === width && bottomPanelSizeRef.current.height === height)
+          return
+
+        bottomPanelSizeRef.current = { width, height }
+        if (bottomPanelResizeFrameRef.current)
+          cancelAnimationFrame(bottomPanelResizeFrameRef.current)
+
+        bottomPanelResizeFrameRef.current = requestAnimationFrame(() => {
+          bottomPanelResizeFrameRef.current = undefined
+          setBottomPanelWidth(width)
+          setBottomPanelHeight(height)
+        })
+      }
+
       const resizeContainerObserver = new ResizeObserver((entries) => {
         for (const entry of entries) {
           const { inlineSize, blockSize } = entry.borderBoxSize[0]!
-          setBottomPanelWidth(inlineSize)
-          setBottomPanelHeight(blockSize)
+          updateBottomPanelSize(inlineSize, blockSize)
         }
       })
       resizeContainerObserver.observe(bottomPanelRef.current)
       return () => {
+        if (bottomPanelResizeFrameRef.current) {
+          cancelAnimationFrame(bottomPanelResizeFrameRef.current)
+          bottomPanelResizeFrameRef.current = undefined
+        }
         resizeContainerObserver.disconnect()
       }
     }
@@ -72,7 +92,7 @@ const Operator = ({ handleUndo, handleRedo }: OperatorProps) => {
   return (
     <div
       ref={bottomPanelRef}
-      className="absolute right-0 bottom-0 left-0 z-[60] px-1"
+      className="absolute right-0 bottom-0 left-0 z-10 px-1"
       style={
         {
           width: bottomPanelWidth,
diff --git a/web/app/components/workflow/panel/__tests__/index.spec.tsx b/web/app/components/workflow/panel/__tests__/index.spec.tsx
index 5da08dd832..4a813f392d 100644
--- a/web/app/components/workflow/panel/__tests__/index.spec.tsx
+++ b/web/app/components/workflow/panel/__tests__/index.spec.tsx
@@ -1,4 +1,4 @@
-import { render, screen } from '@testing-library/react'
+import { act, render, screen, waitFor } from '@testing-library/react'
 import * as React from 'react'
 import Panel from '../index'
 
@@ -232,17 +232,55 @@ describe('Panel', () => {
     expect(mockPanelStoreState.setPreviewPanelWidth).not.toHaveBeenCalled()
   })
 
-  it('should derive observer widths from border-box, content-rect, and fallback values and disconnect on unmount', () => {
-    mockResizeModes = ['borderBox', 'contentRect', 'fallback']
-
+  it('should derive observer widths from border-box, content-rect, and fallback values and disconnect on unmount', async () => {
     const { unmount } = render(<Panel />)
 
-    expect(mockPanelStoreState.setRightPanelWidth).toHaveBeenCalledWith(720)
-    expect(mockPanelStoreState.setRightPanelWidth).toHaveBeenCalledWith(530)
-    expect(mockPanelStoreState.setRightPanelWidth).toHaveBeenCalledWith(640)
-    expect(mockPanelStoreState.setOtherPanelWidth).toHaveBeenCalledWith(720)
-    expect(mockPanelStoreState.setOtherPanelWidth).toHaveBeenCalledWith(530)
-    expect(mockPanelStoreState.setOtherPanelWidth).toHaveBeenCalledWith(640)
+    await waitFor(() => {
+      expect(mockPanelStoreState.setRightPanelWidth).toHaveBeenCalledWith(640)
+      expect(mockPanelStoreState.setOtherPanelWidth).toHaveBeenCalledWith(640)
+    })
+
+    vi.mocked(mockPanelStoreState.setRightPanelWidth).mockClear()
+    vi.mocked(mockPanelStoreState.setOtherPanelWidth).mockClear()
+
+    act(() => {
+      mockResizeObservers.forEach((observer) => {
+        observer.callback([createResizeEntry('borderBox')], observer as unknown as ResizeObserver)
+      })
+    })
+
+    await waitFor(() => {
+      expect(mockPanelStoreState.setRightPanelWidth).toHaveBeenCalledWith(720)
+      expect(mockPanelStoreState.setOtherPanelWidth).toHaveBeenCalledWith(720)
+    })
+
+    vi.mocked(mockPanelStoreState.setRightPanelWidth).mockClear()
+    vi.mocked(mockPanelStoreState.setOtherPanelWidth).mockClear()
+
+    act(() => {
+      mockResizeObservers.forEach((observer) => {
+        observer.callback([createResizeEntry('contentRect')], observer as unknown as ResizeObserver)
+      })
+    })
+
+    await waitFor(() => {
+      expect(mockPanelStoreState.setRightPanelWidth).toHaveBeenCalledWith(530)
+      expect(mockPanelStoreState.setOtherPanelWidth).toHaveBeenCalledWith(530)
+    })
+
+    vi.mocked(mockPanelStoreState.setRightPanelWidth).mockClear()
+    vi.mocked(mockPanelStoreState.setOtherPanelWidth).mockClear()
+
+    act(() => {
+      mockResizeObservers.forEach((observer) => {
+        observer.callback([createResizeEntry('fallback')], observer as unknown as ResizeObserver)
+      })
+    })
+
+    await waitFor(() => {
+      expect(mockPanelStoreState.setRightPanelWidth).toHaveBeenCalledWith(640)
+      expect(mockPanelStoreState.setOtherPanelWidth).toHaveBeenCalledWith(640)
+    })
 
     unmount()
 
diff --git a/web/app/components/workflow/panel/__tests__/workflow-preview.spec.tsx b/web/app/components/workflow/panel/__tests__/workflow-preview.spec.tsx
index 9b5f89ebd0..63ee0ceb37 100644
--- a/web/app/components/workflow/panel/__tests__/workflow-preview.spec.tsx
+++ b/web/app/components/workflow/panel/__tests__/workflow-preview.spec.tsx
@@ -153,7 +153,7 @@ describe('WorkflowPreview', () => {
 
   it('should keep the input tab active, switch to result after running, and close the preview panel', async () => {
     const user = userEvent.setup()
-    const { container } = renderWorkflowComponent(
+    renderWorkflowComponent(
       <WorkflowPreview />,
       {
         initialStoreState: {
@@ -169,7 +169,7 @@ describe('WorkflowPreview', () => {
     await user.click(screen.getByRole('button', { name: 'run-inputs' }))
     expect(screen.getByTestId('result-text')).toBeInTheDocument()
 
-    await user.click(container.querySelector('.flex.items-center.justify-between .cursor-pointer.p-1') as HTMLElement)
+    await user.click(screen.getByRole('button', { name: /operation\.close/ }))
     expect(mockHandleCancelDebugAndPreviewPanel).toHaveBeenCalledTimes(1)
   })
 
diff --git a/web/app/components/workflow/panel/comments-panel/__tests__/index.spec.tsx b/web/app/components/workflow/panel/comments-panel/__tests__/index.spec.tsx
index 49ae2a11a8..fd3f570f02 100644
--- a/web/app/components/workflow/panel/comments-panel/__tests__/index.spec.tsx
+++ b/web/app/components/workflow/panel/comments-panel/__tests__/index.spec.tsx
@@ -1,14 +1,12 @@
-import type { WorkflowCommentList } from '@/service/workflow-comment'
+import type { WorkflowCommentList } from '@/contract/console/workflow-comment'
 import { fireEvent, render, screen, waitFor } from '@testing-library/react'
 import CommentsPanel from '../index'
 
 const mockHandleCommentIconClick = vi.hoisted(() => vi.fn())
-const mockLoadComments = vi.hoisted(() => vi.fn())
+const mockHandleCommentResolve = vi.hoisted(() => vi.fn())
 const mockSetActiveCommentId = vi.hoisted(() => vi.fn())
 const mockSetControlMode = vi.hoisted(() => vi.fn())
 const mockSetShowResolvedComments = vi.hoisted(() => vi.fn())
-const mockResolveWorkflowComment = vi.hoisted(() => vi.fn())
-const mockEmitCommentsUpdate = vi.hoisted(() => vi.fn())
 
 const commentFixtures: WorkflowCommentList[] = [
   {
@@ -90,21 +88,11 @@ vi.mock('@/app/components/workflow/hooks/use-workflow-comment', () => ({
   useWorkflowComment: () => ({
     comments: commentFixtures,
     loading: false,
-    loadComments: (...args: unknown[]) => mockLoadComments(...args),
     handleCommentIconClick: (...args: unknown[]) => mockHandleCommentIconClick(...args),
+    handleCommentResolve: (...args: unknown[]) => mockHandleCommentResolve(...args),
   }),
 }))
 
-vi.mock('@/service/workflow-comment', () => ({
-  resolveWorkflowComment: (...args: unknown[]) => mockResolveWorkflowComment(...args),
-}))
-
-vi.mock('@/app/components/workflow/collaboration/core/collaboration-manager', () => ({
-  collaborationManager: {
-    emitCommentsUpdate: (...args: unknown[]) => mockEmitCommentsUpdate(...args),
-  },
-}))
-
 vi.mock('@/app/components/base/user-avatar-list', () => ({
   UserAvatarList: () => <div data-testid="user-avatar-list" />,
 }))
@@ -122,8 +110,7 @@ describe('CommentsPanel', () => {
     vi.clearAllMocks()
     storeState.activeCommentId = null
     storeState.showResolvedComments = true
-    mockResolveWorkflowComment.mockResolvedValue({})
-    mockLoadComments.mockResolvedValue(undefined)
+    mockHandleCommentResolve.mockResolvedValue(undefined)
   })
 
   it('filters comments and selects a thread', () => {
@@ -149,9 +136,7 @@ describe('CommentsPanel', () => {
     fireEvent.click(resolveIcons[0]!)
 
     await waitFor(() => {
-      expect(mockResolveWorkflowComment).toHaveBeenCalledWith('app-1', 'c-1')
-      expect(mockEmitCommentsUpdate).toHaveBeenCalledWith('app-1')
-      expect(mockLoadComments).toHaveBeenCalled()
+      expect(mockHandleCommentResolve).toHaveBeenCalledWith('c-1')
       expect(mockSetActiveCommentId).toHaveBeenCalledWith('c-1')
     })
   })
diff --git a/web/app/components/workflow/panel/comments-panel/index.tsx b/web/app/components/workflow/panel/comments-panel/index.tsx
index 05480abb2b..47f7c015ba 100644
--- a/web/app/components/workflow/panel/comments-panel/index.tsx
+++ b/web/app/components/workflow/panel/comments-panel/index.tsx
@@ -1,4 +1,4 @@
-import type { WorkflowCommentList } from '@/service/workflow-comment'
+import type { WorkflowCommentList } from '@/contract/console/workflow-comment'
 import { cn } from '@langgenius/dify-ui/cn'
 import { Switch } from '@langgenius/dify-ui/switch'
 import { RiCheckboxCircleFill, RiCheckboxCircleLine, RiCheckLine, RiCloseLine, RiFilter3Line } from '@remixicon/react'
@@ -6,14 +6,11 @@ import { memo, useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Divider from '@/app/components/base/divider'
 import { UserAvatarList } from '@/app/components/base/user-avatar-list'
-import { collaborationManager } from '@/app/components/workflow/collaboration/core/collaboration-manager'
 import { useWorkflowComment } from '@/app/components/workflow/hooks/use-workflow-comment'
 import { useStore } from '@/app/components/workflow/store'
 import { ControlMode } from '@/app/components/workflow/types'
 import { useAppContext } from '@/context/app-context'
 import { useFormatTimeFromNow } from '@/hooks/use-format-time-from-now'
-import { useParams } from '@/next/navigation'
-import { resolveWorkflowComment } from '@/service/workflow-comment'
 
 const CommentsPanel = () => {
   const { t } = useTranslation()
@@ -22,9 +19,7 @@ const CommentsPanel = () => {
   const setControlMode = useStore(s => s.setControlMode)
   const showResolvedComments = useStore(s => s.showResolvedComments)
   const setShowResolvedComments = useStore(s => s.setShowResolvedComments)
-  const { comments, loading, loadComments, handleCommentIconClick } = useWorkflowComment()
-  const params = useParams()
-  const appId = params.appId as string
+  const { comments, loading, handleCommentIconClick, handleCommentResolve } = useWorkflowComment()
   const { formatTimeFromNow } = useFormatTimeFromNow()
 
   const [showOnlyMine, setShowOnlyMine] = useState(false)
@@ -48,20 +43,14 @@ const CommentsPanel = () => {
   const handleResolve = useCallback(async (comment: WorkflowCommentList) => {
     if (comment.resolved)
       return
-    if (!appId)
-      return
     try {
-      await resolveWorkflowComment(appId, comment.id)
-
-      collaborationManager.emitCommentsUpdate(appId)
-
-      await loadComments()
+      await handleCommentResolve(comment.id)
       setActiveCommentId(comment.id)
     }
     catch (e) {
       console.error('Resolve comment failed', e)
     }
-  }, [appId, loadComments, setActiveCommentId])
+  }, [handleCommentResolve, setActiveCommentId])
 
   const hasActiveFilter = showOnlyMine || !showResolvedComments
 
@@ -172,7 +161,7 @@ const CommentsPanel = () => {
                 {/* Header row: creator + time */}
                 <div className="flex items-start">
                   <div className="flex min-w-0 items-center gap-2">
-                    <div className="truncate system-sm-medium text-text-primary">{c.created_by_account.name}</div>
+                    <div className="truncate system-sm-medium text-text-primary">{c.created_by_account?.name ?? ''}</div>
                     <div className="shrink-0 system-2xs-regular text-text-tertiary">
                       {formatTimeFromNow(c.updated_at * 1000)}
                     </div>
diff --git a/web/app/components/workflow/panel/debug-and-preview/__tests__/conversation-variable-modal.spec.tsx b/web/app/components/workflow/panel/debug-and-preview/__tests__/conversation-variable-modal.spec.tsx
index e36c17ca96..fa050b9bc5 100644
--- a/web/app/components/workflow/panel/debug-and-preview/__tests__/conversation-variable-modal.spec.tsx
+++ b/web/app/components/workflow/panel/debug-and-preview/__tests__/conversation-variable-modal.spec.tsx
@@ -118,8 +118,7 @@ describe('ConversationVariableModal', () => {
     await user.click(screen.getByText('summary'))
     expect(screen.getByText('latest text')).toBeInTheDocument()
 
-    const closeTrigger = document.querySelector('.absolute.right-4.top-4.cursor-pointer') as HTMLElement
-    await user.click(closeTrigger)
+    await user.click(screen.getByRole('button', { name: /operation\.close/ }))
 
     expect(onHide).toHaveBeenCalledTimes(1)
   })
diff --git a/web/app/components/workflow/panel/debug-and-preview/conversation-variable-modal.tsx b/web/app/components/workflow/panel/debug-and-preview/conversation-variable-modal.tsx
index 573d3e5642..cb188f69cf 100644
--- a/web/app/components/workflow/panel/debug-and-preview/conversation-variable-modal.tsx
+++ b/web/app/components/workflow/panel/debug-and-preview/conversation-variable-modal.tsx
@@ -3,10 +3,10 @@ import type {
   ConversationVariable,
 } from '@/app/components/workflow/types'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { RiCloseLine } from '@remixicon/react'
 import { useMount } from 'ahooks'
 import copy from 'copy-to-clipboard'
-import { noop } from 'es-toolkit/function'
 import { capitalize } from 'es-toolkit/string'
 import * as React from 'react'
 import { useCallback } from 'react'
@@ -16,7 +16,6 @@ import {
   CopyCheck,
 } from '@/app/components/base/icons/src/vender/line/files'
 import { BubbleX } from '@/app/components/base/icons/src/vender/line/others'
-import Modal from '@/app/components/base/modal'
 import CodeEditor from '@/app/components/workflow/nodes/_base/components/editor/code-editor'
 import { CodeLanguage } from '@/app/components/workflow/nodes/code/types'
 import { ChatVarType } from '@/app/components/workflow/panel/chat-variable-panel/type'
@@ -76,87 +75,96 @@ const ConversationVariableModal = ({
   })
 
   return (
-    <Modal
-      isShow
-      onClose={noop}
-      className={cn('h-[640px] w-[920px] max-w-[920px] p-0')}
-    >
-      <div className="absolute top-4 right-4 cursor-pointer p-2" onClick={onHide}>
-        <RiCloseLine className="h-4 w-4 text-text-tertiary" />
-      </div>
-      <div className="flex h-full w-full">
-        {/* LEFT */}
-        <div className="flex h-full w-[224px] shrink-0 flex-col border-r border-divider-burn bg-background-sidenav-bg">
-          <div className="shrink-0 pt-5 pr-4 pb-3 pl-5 system-xl-semibold text-text-primary">{t('chatVariable.panelTitle', { ns: 'workflow' })}</div>
-          <div className="grow overflow-y-auto px-3 py-2">
-            {varList.map(chatVar => (
-              <div key={chatVar.id} className={cn('group mb-0.5 flex cursor-pointer items-center rounded-lg p-2 hover:bg-state-base-hover', currentVar.id === chatVar.id && 'bg-state-base-hover')} onClick={() => setCurrentVar(chatVar)}>
-                <BubbleX className={cn('mr-1 h-4 w-4 shrink-0 text-text-tertiary group-hover:text-util-colors-teal-teal-700', currentVar.id === chatVar.id && 'text-util-colors-teal-teal-700')} />
-                <div title={chatVar.name} className={cn('truncate system-sm-medium text-text-tertiary group-hover:text-util-colors-teal-teal-700', currentVar.id === chatVar.id && 'text-util-colors-teal-teal-700')}>{chatVar.name}</div>
-              </div>
-            ))}
-          </div>
-        </div>
-        {/* RIGHT */}
-        <div className="flex h-full w-0 grow flex-col bg-components-panel-bg">
-          <div className="shrink-0 p-4 pb-2">
-            <div className="flex items-center gap-1 py-1">
-              <div className="system-xl-semibold text-text-primary">{currentVar.name}</div>
-              <div className="system-xs-medium text-text-tertiary">{capitalize(currentVar.value_type)}</div>
+    <Dialog open>
+      <DialogContent className={cn('w-full overflow-hidden! border-none text-left align-middle', cn('h-[min(640px,calc(100dvh-2rem))] max-h-none! w-[920px] max-w-[calc(100vw-2rem)] p-0'))}>
+
+        <button
+          type="button"
+          aria-label={t('operation.close', { ns: 'common' })}
+          className="absolute top-4 right-4 cursor-pointer border-none bg-transparent p-2 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+          onClick={onHide}
+        >
+          <RiCloseLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
+        </button>
+        <div className="flex h-full w-full">
+          {/* LEFT */}
+          <div className="flex h-full w-[224px] shrink-0 flex-col border-r border-divider-burn bg-background-sidenav-bg">
+            <div className="shrink-0 pt-5 pr-4 pb-3 pl-5 system-xl-semibold text-text-primary">{t('chatVariable.panelTitle', { ns: 'workflow' })}</div>
+            <div className="grow overflow-y-auto px-3 py-2">
+              {varList.map(chatVar => (
+                <button
+                  key={chatVar.id}
+                  type="button"
+                  className={cn('group mb-0.5 flex w-full cursor-pointer items-center rounded-lg border-none bg-transparent p-2 text-left hover:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden', currentVar.id === chatVar.id && 'bg-state-base-hover')}
+                  onClick={() => setCurrentVar(chatVar)}
+                >
+                  <BubbleX className={cn('mr-1 h-4 w-4 shrink-0 text-text-tertiary group-hover:text-util-colors-teal-teal-700', currentVar.id === chatVar.id && 'text-util-colors-teal-teal-700')} aria-hidden="true" />
+                  <div title={chatVar.name} className={cn('truncate system-sm-medium text-text-tertiary group-hover:text-util-colors-teal-teal-700', currentVar.id === chatVar.id && 'text-util-colors-teal-teal-700')}>{chatVar.name}</div>
+                </button>
+              ))}
             </div>
           </div>
-          <div className="flex h-0 grow flex-col p-4 pt-2">
-            <div className="mb-2 flex shrink-0 items-center gap-2">
-              <div className="shrink-0 system-xs-medium-uppercase text-text-tertiary">{t('chatVariable.storedContent', { ns: 'workflow' }).toLocaleUpperCase()}</div>
-              <div
-                className="h-px grow"
-                style={{
-                  background: 'linear-gradient(to right, rgba(16, 24, 40, 0.08) 0%, rgba(255, 255, 255) 100%)',
-                }}
-              >
+          {/* RIGHT */}
+          <div className="flex h-full w-0 grow flex-col bg-components-panel-bg">
+            <div className="shrink-0 p-4 pb-2">
+              <div className="flex items-center gap-1 py-1">
+                <div className="system-xl-semibold text-text-primary">{currentVar.name}</div>
+                <div className="system-xs-medium text-text-tertiary">{capitalize(currentVar.value_type)}</div>
               </div>
-              {!!latestValueTimestampMap[currentVar.id] && (
-                <div className="shrink-0 system-xs-regular text-text-tertiary">
-                  {t('chatVariable.updatedAt', { ns: 'workflow' })}
-                  {formatTime(latestValueTimestampMap[currentVar.id]!, t('dateTimeFormat', { ns: 'appLog' }) as string)}
+            </div>
+            <div className="flex h-0 grow flex-col p-4 pt-2">
+              <div className="mb-2 flex shrink-0 items-center gap-2">
+                <div className="shrink-0 system-xs-medium-uppercase text-text-tertiary">{t('chatVariable.storedContent', { ns: 'workflow' }).toLocaleUpperCase()}</div>
+                <div
+                  className="h-px grow"
+                  style={{
+                    background: 'linear-gradient(to right, rgba(16, 24, 40, 0.08) 0%, rgba(255, 255, 255) 100%)',
+                  }}
+                >
                 </div>
-              )}
-            </div>
-            <div className="grow overflow-y-auto">
-              {currentVar.value_type !== ChatVarType.Number && currentVar.value_type !== ChatVarType.String && (
-                <div className="flex h-full flex-col rounded-lg bg-components-input-bg-normal px-2 pb-2">
-                  <div className="flex h-7 shrink-0 items-center justify-between pt-1 pr-2 pl-3">
-                    <div className="system-xs-semibold text-text-secondary">JSON</div>
-                    <div className="flex items-center p-1">
-                      {!isCopied
-                        ? (
-                            <Copy className="h-4 w-4 cursor-pointer text-text-tertiary" onClick={handleCopy} />
-                          )
-                        : (
-                            <CopyCheck className="h-4 w-4 text-text-tertiary" />
-                          )}
+                {!!latestValueTimestampMap[currentVar.id] && (
+                  <div className="shrink-0 system-xs-regular text-text-tertiary">
+                    {t('chatVariable.updatedAt', { ns: 'workflow' })}
+                    {formatTime(latestValueTimestampMap[currentVar.id]!, t('dateTimeFormat', { ns: 'appLog' }) as string)}
+                  </div>
+                )}
+              </div>
+              <div className="grow overflow-y-auto">
+                {currentVar.value_type !== ChatVarType.Number && currentVar.value_type !== ChatVarType.String && (
+                  <div className="flex h-full flex-col rounded-lg bg-components-input-bg-normal px-2 pb-2">
+                    <div className="flex h-7 shrink-0 items-center justify-between pt-1 pr-2 pl-3">
+                      <div className="system-xs-semibold text-text-secondary">JSON</div>
+                      <div className="flex items-center p-1">
+                        {!isCopied
+                          ? (
+                              <Copy className="h-4 w-4 cursor-pointer text-text-tertiary" onClick={handleCopy} />
+                            )
+                          : (
+                              <CopyCheck className="h-4 w-4 text-text-tertiary" />
+                            )}
+                      </div>
+                    </div>
+                    <div className="grow pl-4">
+                      <CodeEditor
+                        readOnly
+                        noWrapper
+                        isExpand
+                        language={CodeLanguage.json}
+                        value={latestValueMap[currentVar.id] || ''}
+                        isJSONStringifyBeauty
+                      />
                     </div>
                   </div>
-                  <div className="grow pl-4">
-                    <CodeEditor
-                      readOnly
-                      noWrapper
-                      isExpand
-                      language={CodeLanguage.json}
-                      value={latestValueMap[currentVar.id] || ''}
-                      isJSONStringifyBeauty
-                    />
-                  </div>
-                </div>
-              )}
-              {(currentVar.value_type === ChatVarType.Number || currentVar.value_type === ChatVarType.String) && (
-                <div className="h-full overflow-x-hidden overflow-y-auto rounded-lg bg-components-input-bg-normal px-4 py-3 system-md-regular text-components-input-text-filled">{latestValueMap[currentVar.id] || ''}</div>
-              )}
+                )}
+                {(currentVar.value_type === ChatVarType.Number || currentVar.value_type === ChatVarType.String) && (
+                  <div className="h-full overflow-x-hidden overflow-y-auto rounded-lg bg-components-input-bg-normal px-4 py-3 system-md-regular text-components-input-text-filled">{latestValueMap[currentVar.id] || ''}</div>
+                )}
+              </div>
             </div>
           </div>
         </div>
-      </div>
-    </Modal>
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/components/workflow/panel/env-panel/variable-modal.tsx b/web/app/components/workflow/panel/env-panel/variable-modal.tsx
index 267c014e1d..2560ab968e 100644
--- a/web/app/components/workflow/panel/env-panel/variable-modal.tsx
+++ b/web/app/components/workflow/panel/env-panel/variable-modal.tsx
@@ -7,8 +7,8 @@ import * as React from 'react'
 import { useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
 import { v4 as uuid4 } from 'uuid'
+import { Infotip } from '@/app/components/base/infotip'
 import Input from '@/app/components/base/input'
-import Tooltip from '@/app/components/base/tooltip'
 import { useWorkflowStore } from '@/app/components/workflow/store'
 import { checkKeys, replaceSpaceWithUnderscoreInVarNameInput } from '@/utils/var'
 
@@ -129,14 +129,14 @@ const VariableModal = ({
               onClick={() => setType('secret')}
             >
               <span>Secret</span>
-              <Tooltip
-                popupContent={(
-                  <div className="w-[240px]">
-                    {t('env.modal.secretTip', { ns: 'workflow' })}
-                  </div>
-                )}
-                triggerClassName="ml-0.5 w-3.5 h-3.5"
-              />
+              <Infotip
+                aria-label={t('env.modal.secretTip', { ns: 'workflow' })}
+                className="ml-0.5 h-3.5 w-3.5"
+                iconClassName="h-3.5 w-3.5"
+                popupClassName="w-[240px]"
+              >
+                {t('env.modal.secretTip', { ns: 'workflow' })}
+              </Infotip>
             </div>
           </div>
         </div>
diff --git a/web/app/components/workflow/panel/index.tsx b/web/app/components/workflow/panel/index.tsx
index 89e8419b5f..3b54583d1c 100644
--- a/web/app/components/workflow/panel/index.tsx
+++ b/web/app/components/workflow/panel/index.tsx
@@ -1,7 +1,7 @@
 import type { FC } from 'react'
 import type { VersionHistoryPanelProps } from '@/app/components/workflow/panel/version-history-panel'
 import { cn } from '@langgenius/dify-ui/cn'
-import { memo, useCallback, useEffect, useRef } from 'react'
+import { memo, useEffect, useRef } from 'react'
 import { useStore as useReactflow } from 'reactflow'
 import { useShallow } from 'zustand/react/shallow'
 import dynamic from '@/next/dynamic'
@@ -34,35 +34,50 @@ const getEntryWidth = (entry: ResizeObserverEntry, element: HTMLElement): number
   return element.getBoundingClientRect().width
 }
 
-const useResizeObserver = (
-  callback: (width: number) => void,
-  dependencies: React.DependencyList = [],
-) => {
+const useResizeObserver = (callback: (width: number) => void) => {
   const elementRef = useRef<HTMLDivElement>(null)
-
-  const stableCallback = useCallback(callback, [callback])
+  const widthRef = useRef<number | undefined>(undefined)
+  const animationFrameRef = useRef<number | undefined>(undefined)
 
   useEffect(() => {
     const element = elementRef.current
     if (!element)
       return
 
+    widthRef.current = undefined
+
+    const updateWidth = (width: number) => {
+      if (widthRef.current === width)
+        return
+
+      widthRef.current = width
+      if (animationFrameRef.current)
+        cancelAnimationFrame(animationFrameRef.current)
+
+      animationFrameRef.current = requestAnimationFrame(() => {
+        animationFrameRef.current = undefined
+        callback(width)
+      })
+    }
+
     const resizeObserver = new ResizeObserver((entries) => {
-      for (const entry of entries) {
-        const width = getEntryWidth(entry, element)
-        stableCallback(width)
-      }
+      for (const entry of entries)
+        updateWidth(getEntryWidth(entry, element))
     })
 
     resizeObserver.observe(element)
 
     const initialWidth = element.getBoundingClientRect().width
-    stableCallback(initialWidth)
+    updateWidth(initialWidth)
 
     return () => {
+      if (animationFrameRef.current) {
+        cancelAnimationFrame(animationFrameRef.current)
+        animationFrameRef.current = undefined
+      }
       resizeObserver.disconnect()
     }
-  }, [stableCallback, ...dependencies])
+  }, [callback])
   return elementRef
 }
 
@@ -113,15 +128,9 @@ const Panel: FC<PanelProps> = ({
   const setRightPanelWidth = useStore(s => s.setRightPanelWidth)
   const setOtherPanelWidth = useStore(s => s.setOtherPanelWidth)
 
-  const rightPanelRef = useResizeObserver(
-    setRightPanelWidth,
-    [setRightPanelWidth, selectedNode, showEnvPanel, showWorkflowVersionHistoryPanel],
-  )
+  const rightPanelRef = useResizeObserver(setRightPanelWidth)
 
-  const otherPanelRef = useResizeObserver(
-    setOtherPanelWidth,
-    [setOtherPanelWidth, showEnvPanel, showWorkflowVersionHistoryPanel],
-  )
+  const otherPanelRef = useResizeObserver(setOtherPanelWidth)
 
   return (
     <div
diff --git a/web/app/components/workflow/panel/version-history-panel/action-menu/index.tsx b/web/app/components/workflow/panel/version-history-panel/action-menu/index.tsx
index 8299ff2b30..bd0c9934c3 100644
--- a/web/app/components/workflow/panel/version-history-panel/action-menu/index.tsx
+++ b/web/app/components/workflow/panel/version-history-panel/action-menu/index.tsx
@@ -33,7 +33,8 @@ const ActionMenu: FC<ActionMenuProps> = (props: ActionMenuProps) => {
       onOpenChange={setOpen}
     >
       <DropdownMenuTrigger
-        render={<Button size="small" className="px-1" onClick={e => e.stopPropagation()} />}
+        nativeButton={false}
+        render={<Button nativeButton={false} size="small" className="px-1" onClick={e => e.stopPropagation()} />}
       >
         <RiMoreFill className="h-4 w-4" />
       </DropdownMenuTrigger>
diff --git a/web/app/components/workflow/panel/version-history-panel/delete-confirm-modal.tsx b/web/app/components/workflow/panel/version-history-panel/delete-confirm-modal.tsx
index 1f7948c41b..b2057ae54c 100644
--- a/web/app/components/workflow/panel/version-history-panel/delete-confirm-modal.tsx
+++ b/web/app/components/workflow/panel/version-history-panel/delete-confirm-modal.tsx
@@ -1,9 +1,16 @@
 import type { FC } from 'react'
 import type { VersionHistory } from '@/types/workflow'
-import { Button } from '@langgenius/dify-ui/button'
+import {
+  AlertDialog,
+  AlertDialogActions,
+  AlertDialogCancelButton,
+  AlertDialogConfirmButton,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogTitle,
+} from '@langgenius/dify-ui/alert-dialog'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
-import Modal from '@/app/components/base/modal'
 
 type DeleteConfirmModalProps = {
   isOpen: boolean
@@ -21,24 +28,36 @@ const DeleteConfirmModal: FC<DeleteConfirmModalProps> = ({
   const { t } = useTranslation()
 
   return (
-    <Modal className="p-0" isShow={isOpen} onClose={onClose}>
-      <div className="flex flex-col gap-y-2 p-6 pb-4">
-        <div className="title-2xl-semi-bold text-text-primary">
-          {`${t('operation.delete', { ns: 'common' })} ${versionInfo.marked_name || t('versionHistory.defaultName', { ns: 'workflow' })}`}
+    <AlertDialog
+      open={isOpen}
+      onOpenChange={(open) => {
+        if (!open)
+          onClose()
+      }}
+    >
+      <AlertDialogContent className="overflow-hidden! border-none text-left align-middle shadow-xl">
+        <div className="flex flex-col gap-y-2 p-6 pb-4">
+          <AlertDialogTitle className="title-2xl-semi-bold text-text-primary">
+            {`${t('operation.delete', { ns: 'common' })} ${versionInfo.marked_name || t('versionHistory.defaultName', { ns: 'workflow' })}`}
+          </AlertDialogTitle>
+          <AlertDialogDescription className="system-md-regular text-text-secondary">
+            {t('versionHistory.deletionTip', { ns: 'workflow' })}
+          </AlertDialogDescription>
         </div>
-        <p className="system-md-regular text-text-secondary">
-          {t('versionHistory.deletionTip', { ns: 'workflow' })}
-        </p>
-      </div>
-      <div className="flex items-center justify-end gap-x-2 p-6">
-        <Button onClick={onClose}>
-          {t('operation.cancel', { ns: 'common' })}
-        </Button>
-        <Button variant="primary" tone="destructive" onClick={onDelete.bind(null, versionInfo.id)}>
-          {t('operation.delete', { ns: 'common' })}
-        </Button>
-      </div>
-    </Modal>
+        <AlertDialogActions>
+          <AlertDialogCancelButton
+            nativeButton={false}
+            variant="secondary"
+            closeProps={{ nativeButton: false }}
+          >
+            {t('operation.cancel', { ns: 'common' })}
+          </AlertDialogCancelButton>
+          <AlertDialogConfirmButton nativeButton={false} onClick={onDelete.bind(null, versionInfo.id)}>
+            {t('operation.delete', { ns: 'common' })}
+          </AlertDialogConfirmButton>
+        </AlertDialogActions>
+      </AlertDialogContent>
+    </AlertDialog>
   )
 }
 
diff --git a/web/app/components/workflow/panel/version-history-panel/empty.tsx b/web/app/components/workflow/panel/version-history-panel/empty.tsx
index 21751234d7..844b53412e 100644
--- a/web/app/components/workflow/panel/version-history-panel/empty.tsx
+++ b/web/app/components/workflow/panel/version-history-panel/empty.tsx
@@ -22,7 +22,7 @@ const Empty: FC<EmptyProps> = ({
         {t('versionHistory.filter.empty', { ns: 'workflow' })}
       </div>
       <div className="flex justify-center">
-        <Button size="small" onClick={onResetFilter}>
+        <Button nativeButton={false} size="small" onClick={onResetFilter}>
           {t('versionHistory.filter.reset', { ns: 'workflow' })}
         </Button>
       </div>
diff --git a/web/app/components/workflow/panel/version-history-panel/filter/index.tsx b/web/app/components/workflow/panel/version-history-panel/filter/index.tsx
index bb94e3727a..e2277b3fb1 100644
--- a/web/app/components/workflow/panel/version-history-panel/filter/index.tsx
+++ b/web/app/components/workflow/panel/version-history-panel/filter/index.tsx
@@ -42,6 +42,7 @@ const Filter: FC<FilterProps> = ({
       onOpenChange={setOpen}
     >
       <PopoverTrigger
+        nativeButton={false}
         render={(
           <div
             className={cn(
diff --git a/web/app/components/workflow/panel/version-history-panel/restore-confirm-modal.tsx b/web/app/components/workflow/panel/version-history-panel/restore-confirm-modal.tsx
index 9fc2c25742..b001224c08 100644
--- a/web/app/components/workflow/panel/version-history-panel/restore-confirm-modal.tsx
+++ b/web/app/components/workflow/panel/version-history-panel/restore-confirm-modal.tsx
@@ -1,9 +1,16 @@
 import type { FC } from 'react'
 import type { VersionHistory } from '@/types/workflow'
-import { Button } from '@langgenius/dify-ui/button'
+import {
+  AlertDialog,
+  AlertDialogActions,
+  AlertDialogCancelButton,
+  AlertDialogConfirmButton,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogTitle,
+} from '@langgenius/dify-ui/alert-dialog'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
-import Modal from '@/app/components/base/modal'
 
 type RestoreConfirmModalProps = {
   isOpen: boolean
@@ -21,24 +28,36 @@ const RestoreConfirmModal: FC<RestoreConfirmModalProps> = ({
   const { t } = useTranslation()
 
   return (
-    <Modal className="p-0" isShow={isOpen} onClose={onClose}>
-      <div className="flex flex-col gap-y-2 p-6 pb-4">
-        <div className="title-2xl-semi-bold text-text-primary">
-          {`${t('common.restore', { ns: 'workflow' })} ${versionInfo.marked_name || t('versionHistory.defaultName', { ns: 'workflow' })}`}
+    <AlertDialog
+      open={isOpen}
+      onOpenChange={(open) => {
+        if (!open)
+          onClose()
+      }}
+    >
+      <AlertDialogContent className="overflow-hidden! border-none text-left align-middle shadow-xl">
+        <div className="flex flex-col gap-y-2 p-6 pb-4">
+          <AlertDialogTitle className="title-2xl-semi-bold text-text-primary">
+            {`${t('common.restore', { ns: 'workflow' })} ${versionInfo.marked_name || t('versionHistory.defaultName', { ns: 'workflow' })}`}
+          </AlertDialogTitle>
+          <AlertDialogDescription className="system-md-regular text-text-secondary">
+            {t('versionHistory.restorationTip', { ns: 'workflow' })}
+          </AlertDialogDescription>
         </div>
-        <p className="system-md-regular text-text-secondary">
-          {t('versionHistory.restorationTip', { ns: 'workflow' })}
-        </p>
-      </div>
-      <div className="flex items-center justify-end gap-x-2 p-6">
-        <Button onClick={onClose}>
-          {t('operation.cancel', { ns: 'common' })}
-        </Button>
-        <Button variant="primary" onClick={onRestore.bind(null, versionInfo)}>
-          {t('common.restore', { ns: 'workflow' })}
-        </Button>
-      </div>
-    </Modal>
+        <AlertDialogActions>
+          <AlertDialogCancelButton
+            nativeButton={false}
+            variant="secondary"
+            closeProps={{ nativeButton: false }}
+          >
+            {t('operation.cancel', { ns: 'common' })}
+          </AlertDialogCancelButton>
+          <AlertDialogConfirmButton nativeButton={false} tone="default" onClick={onRestore.bind(null, versionInfo)}>
+            {t('common.restore', { ns: 'workflow' })}
+          </AlertDialogConfirmButton>
+        </AlertDialogActions>
+      </AlertDialogContent>
+    </AlertDialog>
   )
 }
 
diff --git a/web/app/components/workflow/panel/workflow-preview.tsx b/web/app/components/workflow/panel/workflow-preview.tsx
index 89ae09c374..7bf858fdd3 100644
--- a/web/app/components/workflow/panel/workflow-preview.tsx
+++ b/web/app/components/workflow/panel/workflow-preview.tsx
@@ -116,9 +116,14 @@ const WorkflowPreview = () => {
       />
       <div className="flex items-center justify-between p-4 pb-1 text-base font-semibold text-text-primary">
         {`Test Run${formatWorkflowRunIdentifier(workflowRunningData?.result.finished_at, workflowRunningData?.result.status)}`}
-        <div className="cursor-pointer p-1" onClick={() => handleCancelDebugAndPreviewPanel()}>
-          <span className="i-ri-close-line h-4 w-4 text-text-tertiary" />
-        </div>
+        <button
+          type="button"
+          aria-label={t('operation.close', { ns: 'common' })}
+          className="cursor-pointer border-none bg-transparent p-1 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+          onClick={() => handleCancelDebugAndPreviewPanel()}
+        >
+          <span className="i-ri-close-line h-4 w-4 text-text-tertiary" aria-hidden="true" />
+        </button>
       </div>
       <div className="relative flex grow flex-col">
         <div className="flex shrink-0 items-center border-b-[0.5px] border-divider-subtle px-4">
diff --git a/web/app/components/workflow/run/__tests__/loop-result-panel.spec.tsx b/web/app/components/workflow/run/__tests__/loop-result-panel.spec.tsx
index fd9ce7a29c..2f7658f984 100644
--- a/web/app/components/workflow/run/__tests__/loop-result-panel.spec.tsx
+++ b/web/app/components/workflow/run/__tests__/loop-result-panel.spec.tsx
@@ -75,7 +75,7 @@ describe('LoopResultPanel', () => {
     const contentPanels = container.querySelectorAll('.transition-all.duration-200')
     expect(contentPanels[0]).toHaveClass('max-h-0')
 
-    fireEvent.click(screen.getByText('workflow.singleRun.loop 1'))
+    fireEvent.click(screen.getByRole('button', { name: 'workflow.singleRun.loop 1' }))
     expect(contentPanels[0]).not.toHaveClass('max-h-0')
     expect(screen.getAllByTestId('tracing-panel')[0]).toHaveTextContent('1')
     expect(mockTracingPanel).toHaveBeenCalledWith({
@@ -83,11 +83,8 @@ describe('LoopResultPanel', () => {
       className: 'bg-background-section-burn',
     })
 
-    fireEvent.click(screen.getByText('workflow.singleRun.back'))
-    const closeTrigger = container.querySelector('.ml-2.shrink-0.cursor-pointer.p-1')
-    if (!closeTrigger)
-      throw new Error('Expected close trigger to be rendered')
-    fireEvent.click(closeTrigger)
+    fireEvent.click(screen.getByRole('button', { name: 'workflow.singleRun.back' }))
+    fireEvent.click(screen.getByRole('button', { name: 'common.operation.close' }))
 
     expect(onBack).toHaveBeenCalledTimes(1)
     expect(onHide).toHaveBeenCalledTimes(1)
diff --git a/web/app/components/workflow/run/__tests__/result-text.spec.tsx b/web/app/components/workflow/run/__tests__/result-text.spec.tsx
index 9b0827c2f0..b9ba43deda 100644
--- a/web/app/components/workflow/run/__tests__/result-text.spec.tsx
+++ b/web/app/components/workflow/run/__tests__/result-text.spec.tsx
@@ -43,7 +43,7 @@ describe('ResultText', () => {
 
     expect(screen.getByText('runLog.resultEmpty.title')).toBeInTheDocument()
 
-    fireEvent.click(screen.getByText('runLog.resultEmpty.link'))
+    fireEvent.click(screen.getByRole('button', { name: 'runLog.resultEmpty.link' }))
 
     expect(onClick).toHaveBeenCalledTimes(1)
   })
diff --git a/web/app/components/workflow/run/loop-result-panel.tsx b/web/app/components/workflow/run/loop-result-panel.tsx
index bd391266c3..a2867fb310 100644
--- a/web/app/components/workflow/run/loop-result-panel.tsx
+++ b/web/app/components/workflow/run/loop-result-panel.tsx
@@ -45,24 +45,34 @@ const LoopResultPanel: FC<Props> = ({
           <div className="truncate system-xl-semibold text-text-primary">
             {t(`${i18nPrefix}.testRunLoop`, { ns: 'workflow' }) }
           </div>
-          <div className="ml-2 shrink-0 cursor-pointer p-1" onClick={onHide}>
-            <RiCloseLine className="h-4 w-4 text-text-tertiary" />
-          </div>
+          <button
+            type="button"
+            className="ml-2 shrink-0 cursor-pointer border-none bg-transparent p-1 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+            aria-label={t('operation.close', { ns: 'common' })}
+            onClick={onHide}
+          >
+            <RiCloseLine className="h-4 w-4 text-text-tertiary" aria-hidden="true" />
+          </button>
         </div>
-        <div className="flex cursor-pointer items-center space-x-1 py-2 text-text-accent-secondary" onClick={onBack}>
-          <ArrowNarrowLeft className="h-4 w-4" />
+        <button
+          type="button"
+          className="flex cursor-pointer items-center space-x-1 border-none bg-transparent px-0 py-2 text-left text-text-accent-secondary focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+          onClick={onBack}
+        >
+          <ArrowNarrowLeft className="h-4 w-4" aria-hidden="true" />
           <div className="system-sm-medium">{t(`${i18nPrefix}.back`, { ns: 'workflow' })}</div>
-        </div>
+        </button>
       </div>
       {/* List */}
       <div className={cn(!noWrap ? 'grow overflow-auto' : 'max-h-full', 'bg-components-panel-bg p-2')}>
         {list.map((loop, index) => (
           <div key={index} className={cn('mb-1 overflow-hidden rounded-xl border-none bg-background-section-burn')}>
-            <div
+            <button
+              type="button"
               className={cn(
                 'flex w-full cursor-pointer items-center justify-between px-3',
                 expandedLoops[index] ? 'pt-3 pb-2' : 'py-3',
-                'rounded-xl text-left',
+                'rounded-xl border-none bg-transparent text-left focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden',
               )}
               onClick={() => toggleLoop(index)}
             >
@@ -75,13 +85,15 @@ const LoopResultPanel: FC<Props> = ({
                   {' '}
                   {index + 1}
                 </span>
-                <RiArrowRightSLine className={cn(
-                  'h-4 w-4 shrink-0 text-text-tertiary transition-transform duration-200',
-                  expandedLoops[index] && 'rotate-90',
-                )}
+                <RiArrowRightSLine
+                  className={cn(
+                    'h-4 w-4 shrink-0 text-text-tertiary transition-transform duration-200',
+                    expandedLoops[index] && 'rotate-90',
+                  )}
+                  aria-hidden="true"
                 />
               </div>
-            </div>
+            </button>
             {expandedLoops[index] && (
               <div
                 className="h-px grow bg-divider-subtle"
diff --git a/web/app/components/workflow/run/node.tsx b/web/app/components/workflow/run/node.tsx
index 9895868887..85607a1342 100644
--- a/web/app/components/workflow/run/node.tsx
+++ b/web/app/components/workflow/run/node.tsx
@@ -17,7 +17,7 @@ import {
   RiLoader2Line,
   RiPauseCircleFill,
 } from '@remixicon/react'
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { useCallback, useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import CodeEditor from '@/app/components/workflow/nodes/_base/components/editor/code-editor'
 import ErrorHandleTip from '@/app/components/workflow/nodes/_base/components/error-handle/error-handle-tip'
@@ -68,16 +68,6 @@ const NodePanel: FC<Props> = ({
       return
     doSetCollapseState(state)
   }, [hideProcessDetail])
-  const titleRef = useRef<HTMLDivElement>(null)
-  const [isTooltipOpen, setIsTooltipOpen] = useState(false)
-  const handleTooltipOpenChange = useCallback((open: boolean) => {
-    if (open) {
-      const el = titleRef.current
-      if (!el || el.scrollWidth <= el.clientWidth)
-        return
-    }
-    setIsTooltipOpen(open)
-  }, [])
   const { t } = useTranslation()
   const docLink = useDocLink()
 
@@ -142,11 +132,10 @@ const NodePanel: FC<Props> = ({
             />
           )}
           <BlockIcon size={inMessage ? 'xs' : 'sm'} className={cn('mr-2 shrink-0', inMessage && 'mr-1!')} type={nodeInfo.node_type} toolIcon={nodeInfo.extras?.icon || nodeInfo.extras} />
-          <Tooltip open={isTooltipOpen} onOpenChange={handleTooltipOpenChange}>
+          <Tooltip>
             <TooltipTrigger
               render={(
                 <div
-                  ref={titleRef}
                   className={cn(
                     'min-w-0 grow truncate system-xs-semibold-uppercase text-text-secondary',
                     hideInfo && 'text-xs!',
@@ -271,6 +260,7 @@ const NodePanel: FC<Props> = ({
               <div className={cn('mb-1')}>
                 <CodeEditor
                   readOnly
+                  showFileList
                   title={<div>{processDataTitle}</div>}
                   language={CodeLanguage.json}
                   value={nodeInfo.process_data}
@@ -282,6 +272,7 @@ const NodePanel: FC<Props> = ({
               <div>
                 <CodeEditor
                   readOnly
+                  showFileList
                   title={<div>{outputTitle}</div>}
                   language={CodeLanguage.json}
                   value={nodeInfo.outputs}
diff --git a/web/app/components/workflow/run/result-panel.tsx b/web/app/components/workflow/run/result-panel.tsx
index 0304037d27..699aceae78 100644
--- a/web/app/components/workflow/run/result-panel.tsx
+++ b/web/app/components/workflow/run/result-panel.tsx
@@ -143,6 +143,7 @@ const ResultPanel: FC<ResultPanelProps> = ({
         {process_data && (
           <CodeEditor
             readOnly
+            showFileList
             title={<div>{t('common.processData', { ns: 'workflow' }).toLocaleUpperCase()}</div>}
             language={CodeLanguage.json}
             value={process_data}
@@ -153,6 +154,7 @@ const ResultPanel: FC<ResultPanelProps> = ({
         {(outputs || status === 'running') && (
           <CodeEditor
             readOnly
+            showFileList
             title={<div>{t('common.output', { ns: 'workflow' }).toLocaleUpperCase()}</div>}
             language={CodeLanguage.json}
             value={outputs}
diff --git a/web/app/components/workflow/run/result-text.tsx b/web/app/components/workflow/run/result-text.tsx
index fcbbf8043d..f76c99fe9c 100644
--- a/web/app/components/workflow/run/result-text.tsx
+++ b/web/app/components/workflow/run/result-text.tsx
@@ -45,7 +45,13 @@ const ResultText: FC<ResultTextProps> = ({
           <div className="mr-2">{t('resultEmpty.title', { ns: 'runLog' })}</div>
           <div>
             {t('resultEmpty.tipLeft', { ns: 'runLog' })}
-            <span onClick={onClick} className="cursor-pointer text-primary-600">{t('resultEmpty.link', { ns: 'runLog' })}</span>
+            <button
+              type="button"
+              onClick={onClick}
+              className="inline cursor-pointer border-none bg-transparent p-0 text-left text-primary-600"
+            >
+              {t('resultEmpty.link', { ns: 'runLog' })}
+            </button>
             {t('resultEmpty.tipRight', { ns: 'runLog' })}
           </div>
         </div>
diff --git a/web/app/components/workflow/run/status-container.tsx b/web/app/components/workflow/run/status-container.tsx
index b8a70be95c..6eb4035237 100644
--- a/web/app/components/workflow/run/status-container.tsx
+++ b/web/app/components/workflow/run/status-container.tsx
@@ -18,7 +18,7 @@ const StatusContainer: FC<Props> = ({
   return (
     <div
       className={cn(
-        'relative rounded-lg border px-3 py-2.5 system-xs-regular break-all',
+        'relative rounded-lg border border-workflow-display-disabled-border-1 px-3 py-2.5 system-xs-regular break-all',
         status === 'succeeded' && 'border-[rgba(23,178,106,0.8)] bg-workflow-display-success-bg bg-[url(~@/app/components/workflow/run/assets/bg-line-success.svg)] text-text-success',
         status === 'succeeded' && theme === Theme.light && 'shadow-[inset_2px_2px_0_0_rgba(255,255,255,0.5),inset_0_1px_3px_0_rgba(0,0,0,0.12),inset_0_2px_24px_0_rgba(23,178,106,0.2),0_1px_2px_0_rgba(9,9,11,0.05),0_0_0_1px_rgba(0,0,0,0.05)]',
         status === 'succeeded' && theme === Theme.dark && 'shadow-[inset_2px_2px_0_0_rgba(255,255,255,0.12),inset_0_1px_3px_0_rgba(0,0,0,0.4),inset_0_2px_24px_0_rgba(23,178,106,0.25),0_1px_2px_0_rgba(0,0,0,0.1),0_0_0_1px_rgba(24,24,27,0.95)]',
diff --git a/web/app/components/workflow/store/workflow/comment-slice.ts b/web/app/components/workflow/store/workflow/comment-slice.ts
index cc7605c285..71d439fced 100644
--- a/web/app/components/workflow/store/workflow/comment-slice.ts
+++ b/web/app/components/workflow/store/workflow/comment-slice.ts
@@ -1,5 +1,5 @@
 import type { StateCreator } from 'zustand'
-import type { UserProfile, WorkflowCommentDetail, WorkflowCommentList } from '@/service/workflow-comment'
+import type { UserProfile, WorkflowCommentDetail, WorkflowCommentList } from '@/contract/console/workflow-comment'
 
 export type CommentSliceShape = {
   comments: WorkflowCommentList[]
diff --git a/web/app/components/workflow/store/workflow/layout-slice.ts b/web/app/components/workflow/store/workflow/layout-slice.ts
index 91c80ba84a..eb81f12bac 100644
--- a/web/app/components/workflow/store/workflow/layout-slice.ts
+++ b/web/app/components/workflow/store/workflow/layout-slice.ts
@@ -27,22 +27,32 @@ export type LayoutSliceShape = {
 export const createLayoutSlice: StateCreator<LayoutSliceShape> = set => ({
   workflowCanvasWidth: undefined,
   workflowCanvasHeight: undefined,
-  setWorkflowCanvasWidth: width => set(() => ({ workflowCanvasWidth: width })),
-  setWorkflowCanvasHeight: height => set(() => ({ workflowCanvasHeight: height })),
+  setWorkflowCanvasWidth: width => set(state =>
+    state.workflowCanvasWidth === width ? state : ({ workflowCanvasWidth: width })),
+  setWorkflowCanvasHeight: height => set(state =>
+    state.workflowCanvasHeight === height ? state : ({ workflowCanvasHeight: height })),
   rightPanelWidth: undefined,
-  setRightPanelWidth: width => set(() => ({ rightPanelWidth: width })),
+  setRightPanelWidth: width => set(state =>
+    state.rightPanelWidth === width ? state : ({ rightPanelWidth: width })),
   nodePanelWidth: localStorage.getItem('workflow-node-panel-width') ? Number.parseFloat(localStorage.getItem('workflow-node-panel-width')!) : 400,
-  setNodePanelWidth: width => set(() => ({ nodePanelWidth: width })),
+  setNodePanelWidth: width => set(state =>
+    state.nodePanelWidth === width ? state : ({ nodePanelWidth: width })),
   previewPanelWidth: localStorage.getItem('debug-and-preview-panel-width') ? Number.parseFloat(localStorage.getItem('debug-and-preview-panel-width')!) : 400,
-  setPreviewPanelWidth: width => set(() => ({ previewPanelWidth: width })),
+  setPreviewPanelWidth: width => set(state =>
+    state.previewPanelWidth === width ? state : ({ previewPanelWidth: width })),
   otherPanelWidth: 400,
-  setOtherPanelWidth: width => set(() => ({ otherPanelWidth: width })),
+  setOtherPanelWidth: width => set(state =>
+    state.otherPanelWidth === width ? state : ({ otherPanelWidth: width })),
   bottomPanelWidth: 480,
-  setBottomPanelWidth: width => set(() => ({ bottomPanelWidth: width })),
+  setBottomPanelWidth: width => set(state =>
+    state.bottomPanelWidth === width ? state : ({ bottomPanelWidth: width })),
   bottomPanelHeight: 324,
-  setBottomPanelHeight: height => set(() => ({ bottomPanelHeight: height })),
+  setBottomPanelHeight: height => set(state =>
+    state.bottomPanelHeight === height ? state : ({ bottomPanelHeight: height })),
   variableInspectPanelHeight: localStorage.getItem('workflow-variable-inpsect-panel-height') ? Number.parseFloat(localStorage.getItem('workflow-variable-inpsect-panel-height')!) : 320,
-  setVariableInspectPanelHeight: height => set(() => ({ variableInspectPanelHeight: height })),
+  setVariableInspectPanelHeight: height => set(state =>
+    state.variableInspectPanelHeight === height ? state : ({ variableInspectPanelHeight: height })),
   maximizeCanvas: localStorage.getItem('workflow-canvas-maximize') === 'true',
-  setMaximizeCanvas: maximize => set(() => ({ maximizeCanvas: maximize })),
+  setMaximizeCanvas: maximize => set(state =>
+    state.maximizeCanvas === maximize ? state : ({ maximizeCanvas: maximize })),
 })
diff --git a/web/app/components/workflow/types.ts b/web/app/components/workflow/types.ts
index efd21e099c..99ad3af49e 100644
--- a/web/app/components/workflow/types.ts
+++ b/web/app/components/workflow/types.ts
@@ -214,7 +214,7 @@ export type InputVar = {
   }
   variable: string
   max_length?: number
-  default?: string | number
+  default?: string | number | boolean
   required: boolean
   hint?: string
   options?: string[]
diff --git a/web/app/components/workflow/update-dsl-modal.tsx b/web/app/components/workflow/update-dsl-modal.tsx
index 549dee487f..de5e92a006 100644
--- a/web/app/components/workflow/update-dsl-modal.tsx
+++ b/web/app/components/workflow/update-dsl-modal.tsx
@@ -2,6 +2,7 @@
 
 import type { MouseEventHandler } from 'react'
 import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'
 import { toast } from '@langgenius/dify-ui/toast'
 import {
   RiAlertFill,
@@ -17,7 +18,6 @@ import {
 import { useTranslation } from 'react-i18next'
 import Uploader from '@/app/components/app/create-from-dsl-modal/uploader'
 import { useStore as useAppStore } from '@/app/components/app/store'
-import Modal from '@/app/components/base/modal'
 import { usePluginDependencies } from '@/app/components/workflow/plugin-dependency/hooks'
 import { useEventEmitterContextContext } from '@/context/event-emitter'
 import {
@@ -199,90 +199,105 @@ const UpdateDSLModal = ({
 
   return (
     <>
-      <Modal
-        className="w-[520px] rounded-2xl p-6"
-        isShow={show}
-        onClose={onCancel}
+      <Dialog
+        open={show}
+        onOpenChange={(open) => {
+          if (!open)
+            onCancel()
+        }}
       >
-        <div className="mb-3 flex items-center justify-between">
-          <div className="title-2xl-semi-bold text-text-primary">{t('importApp', { ns: 'app' })}</div>
-          <div className="flex h-[22px] w-[22px] cursor-pointer items-center justify-center" onClick={onCancel}>
-            <RiCloseLine className="h-[18px] w-[18px] text-text-tertiary" />
+        <DialogContent className="w-full max-w-[480px]! overflow-hidden! rounded-2xl border-none p-6 text-left align-middle">
+
+          <div className="mb-3 flex items-center justify-between">
+            <div className="title-2xl-semi-bold text-text-primary">{t('importApp', { ns: 'app' })}</div>
+            <button
+              type="button"
+              className="flex h-[22px] w-[22px] cursor-pointer items-center justify-center border-none bg-transparent p-0 focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+              aria-label={t('operation.close', { ns: 'common' })}
+              onClick={onCancel}
+            >
+              <RiCloseLine className="h-[18px] w-[18px] text-text-tertiary" aria-hidden="true" />
+            </button>
           </div>
-        </div>
-        <div className="relative mb-2 flex grow gap-0.5 overflow-hidden rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur p-2 shadow-xs">
-          <div className="absolute top-0 left-0 h-full w-full bg-toast-warning-bg opacity-40" />
-          <div className="flex items-start justify-center p-1">
-            <RiAlertFill className="h-4 w-4 shrink-0 text-text-warning-secondary" />
-          </div>
-          <div className="flex grow flex-col items-start gap-0.5 py-1">
-            <div className="system-xs-medium whitespace-pre-line text-text-primary">{t('common.importDSLTip', { ns: 'workflow' })}</div>
-            <div className="flex items-start gap-1 self-stretch pt-1 pb-0.5">
-              <Button
-                size="small"
-                variant="secondary"
-                className="z-1000"
-                onClick={onBackup}
-              >
-                <RiFileDownloadLine className="h-3.5 w-3.5 text-components-button-secondary-text" />
-                <div className="flex items-center justify-center gap-1 px-[3px]">
-                  {t('common.backupCurrentDraft', { ns: 'workflow' })}
-                </div>
-              </Button>
+          <div className="relative mb-2 flex grow gap-0.5 overflow-hidden rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur p-2 shadow-xs">
+            <div className="absolute top-0 left-0 h-full w-full bg-toast-warning-bg opacity-40" />
+            <div className="flex items-start justify-center p-1">
+              <RiAlertFill className="h-4 w-4 shrink-0 text-text-warning-secondary" />
+            </div>
+            <div className="flex grow flex-col items-start gap-0.5 py-1">
+              <div className="system-xs-medium whitespace-pre-line text-text-primary">{t('common.importDSLTip', { ns: 'workflow' })}</div>
+              <div className="flex items-start gap-1 self-stretch pt-1 pb-0.5">
+                <Button
+                  size="small"
+                  variant="secondary"
+                  className="z-1000"
+                  onClick={onBackup}
+                >
+                  <RiFileDownloadLine className="h-3.5 w-3.5 text-components-button-secondary-text" />
+                  <div className="flex items-center justify-center gap-1 px-[3px]">
+                    {t('common.backupCurrentDraft', { ns: 'workflow' })}
+                  </div>
+                </Button>
+              </div>
             </div>
           </div>
-        </div>
-        <div>
-          <div className="pt-2 system-md-semibold text-text-primary">
-            {t('common.chooseDSL', { ns: 'workflow' })}
+          <div>
+            <div className="pt-2 system-md-semibold text-text-primary">
+              {t('common.chooseDSL', { ns: 'workflow' })}
+            </div>
+            <div className="flex w-full flex-col items-start justify-center gap-4 self-stretch py-4">
+              <Uploader
+                file={currentFile}
+                updateFile={handleFile}
+                className="mt-0! w-full"
+              />
+            </div>
           </div>
-          <div className="flex w-full flex-col items-start justify-center gap-4 self-stretch py-4">
-            <Uploader
-              file={currentFile}
-              updateFile={handleFile}
-              className="mt-0! w-full"
-            />
+          <div className="flex items-center justify-end gap-2 self-stretch pt-5">
+            <Button onClick={onCancel}>{t('newApp.Cancel', { ns: 'app' })}</Button>
+            <Button
+              disabled={!currentFile || loading}
+              variant="primary"
+              tone="destructive"
+              onClick={handleImport}
+              loading={loading}
+            >
+              {t('common.overwriteAndImport', { ns: 'workflow' })}
+            </Button>
           </div>
-        </div>
-        <div className="flex items-center justify-end gap-2 self-stretch pt-5">
-          <Button onClick={onCancel}>{t('newApp.Cancel', { ns: 'app' })}</Button>
-          <Button
-            disabled={!currentFile || loading}
-            variant="primary"
-            tone="destructive"
-            onClick={handleImport}
-            loading={loading}
-          >
-            {t('common.overwriteAndImport', { ns: 'workflow' })}
-          </Button>
-        </div>
-      </Modal>
-      <Modal
-        isShow={showErrorModal}
-        onClose={() => setShowErrorModal(false)}
-        className="w-[480px]"
+        </DialogContent>
+      </Dialog>
+      <Dialog
+        open={showErrorModal}
+        onOpenChange={(open) => {
+          if (!open)
+            setShowErrorModal(false)
+        }}
       >
-        <div className="flex flex-col items-start gap-2 self-stretch pb-4">
-          <div className="title-2xl-semi-bold text-text-primary">{t('newApp.appCreateDSLErrorTitle', { ns: 'app' })}</div>
-          <div className="flex grow flex-col system-md-regular text-text-secondary">
-            <div>{t('newApp.appCreateDSLErrorPart1', { ns: 'app' })}</div>
-            <div>{t('newApp.appCreateDSLErrorPart2', { ns: 'app' })}</div>
-            <br />
-            <div>
-              {t('newApp.appCreateDSLErrorPart3', { ns: 'app' })}
-              <span className="system-md-medium">{versions?.importedVersion}</span>
-            </div>
-            <div>
-              {t('newApp.appCreateDSLErrorPart4', { ns: 'app' })}
-              <span className="system-md-medium">{versions?.systemVersion}</span>
+        <DialogContent className="w-full max-w-[480px]! overflow-hidden! border-none text-left align-middle">
+
+          <div className="flex flex-col items-start gap-2 self-stretch pb-4">
+            <div className="title-2xl-semi-bold text-text-primary">{t('newApp.appCreateDSLErrorTitle', { ns: 'app' })}</div>
+            <div className="flex grow flex-col system-md-regular text-text-secondary">
+              <div>{t('newApp.appCreateDSLErrorPart1', { ns: 'app' })}</div>
+              <div>{t('newApp.appCreateDSLErrorPart2', { ns: 'app' })}</div>
+              <br />
+              <div>
+                {t('newApp.appCreateDSLErrorPart3', { ns: 'app' })}
+                <span className="system-md-medium">{versions?.importedVersion}</span>
+              </div>
+              <div>
+                {t('newApp.appCreateDSLErrorPart4', { ns: 'app' })}
+                <span className="system-md-medium">{versions?.systemVersion}</span>
+              </div>
             </div>
           </div>
-        </div>
-        <div className="flex items-start justify-end gap-2 self-stretch pt-6">
-          <Button variant="secondary" onClick={() => setShowErrorModal(false)}>{t('newApp.Cancel', { ns: 'app' })}</Button>
-          <Button variant="primary" tone="destructive" onClick={onUpdateDSLConfirm}>{t('newApp.Confirm', { ns: 'app' })}</Button>
-        </div>
-      </Modal>
+          <div className="flex items-start justify-end gap-2 self-stretch pt-6">
+            <Button variant="secondary" onClick={() => setShowErrorModal(false)}>{t('newApp.Cancel', { ns: 'app' })}</Button>
+            <Button variant="primary" tone="destructive" onClick={onUpdateDSLConfirm}>{t('newApp.Confirm', { ns: 'app' })}</Button>
+          </div>
+        </DialogContent>
+      </Dialog>
     </>
   )
 }
diff --git a/web/app/components/workflow/variable-inspect/__tests__/display-content.spec.tsx b/web/app/components/workflow/variable-inspect/__tests__/display-content.spec.tsx
index bbc4714a92..9ba5763576 100644
--- a/web/app/components/workflow/variable-inspect/__tests__/display-content.spec.tsx
+++ b/web/app/components/workflow/variable-inspect/__tests__/display-content.spec.tsx
@@ -1,5 +1,5 @@
 import { fireEvent, render, screen } from '@testing-library/react'
-import DisplayContent from '../display-content'
+import { DisplayContent } from '../display-content'
 import { PreviewType } from '../types'
 
 describe('variable inspect display content', () => {
diff --git a/web/app/components/workflow/variable-inspect/__tests__/group.spec.tsx b/web/app/components/workflow/variable-inspect/__tests__/group.spec.tsx
index f87bc3b896..c445670717 100644
--- a/web/app/components/workflow/variable-inspect/__tests__/group.spec.tsx
+++ b/web/app/components/workflow/variable-inspect/__tests__/group.spec.tsx
@@ -69,7 +69,7 @@ describe('VariableInspect Group', () => {
       />,
     )
 
-    fireEvent.click(screen.getByText('API_KEY'))
+    fireEvent.click(screen.getByRole('button', { name: /API_KEY/ }))
 
     expect(screen.getByText('workflow.debug.variableInspect.envNode'))!.toBeInTheDocument()
     expect(handleSelect).toHaveBeenCalledWith({
@@ -100,7 +100,7 @@ describe('VariableInspect Group', () => {
     expect(screen.getByText('visible_var'))!.toBeInTheDocument()
     expect(screen.queryByText('hidden_var')).not.toBeInTheDocument()
 
-    fireEvent.click(screen.getByText('Code'))
+    fireEvent.click(screen.getByRole('button', { name: 'Code' }))
 
     expect(screen.queryByText('visible_var')).not.toBeInTheDocument()
   })
@@ -120,10 +120,8 @@ describe('VariableInspect Group', () => {
       />,
     )
 
-    const actionButtons = screen.getAllByRole('button')
-
-    fireEvent.click(actionButtons[0]!)
-    fireEvent.click(actionButtons[1]!)
+    fireEvent.click(screen.getByRole('button', { name: 'workflow.debug.variableInspect.view' }))
+    fireEvent.click(screen.getByRole('button', { name: 'workflow.debug.variableInspect.clearNode' }))
 
     expect(handleView).toHaveBeenCalledTimes(1)
     expect(handleClear).toHaveBeenCalledTimes(1)
diff --git a/web/app/components/workflow/variable-inspect/display-content.tsx b/web/app/components/workflow/variable-inspect/display-content.tsx
index 2edd84d0de..11ee2a7a42 100644
--- a/web/app/components/workflow/variable-inspect/display-content.tsx
+++ b/web/app/components/workflow/variable-inspect/display-content.tsx
@@ -2,12 +2,10 @@ import type { VarType } from '../types'
 import type { ChunkInfo } from '@/app/components/rag-pipeline/components/chunk-card-list/types'
 import type { ParentMode } from '@/models/datasets'
 import { cn } from '@langgenius/dify-ui/cn'
-import { RiBracesLine, RiEyeLine } from '@remixicon/react'
-import * as React from 'react'
+import { ToggleGroup, ToggleGroupItem } from '@langgenius/dify-ui/toggle-group'
 import { useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Markdown } from '@/app/components/base/markdown'
-import { SegmentedControl } from '@/app/components/base/segmented-control'
 import Textarea from '@/app/components/base/textarea'
 import { ChunkCardList } from '@/app/components/rag-pipeline/components/chunk-card-list'
 import SchemaEditor from '@/app/components/workflow/nodes/llm/components/json-schema-config-modal/schema-editor'
@@ -26,11 +24,16 @@ type DisplayContentProps = {
   className?: string
 }
 
-const DisplayContent = (props: DisplayContentProps) => {
+export function DisplayContent(props: DisplayContentProps) {
   const { previewType, varType, schemaType, mdString, jsonString, readonly, handleTextChange, handleEditorChange, className } = props
-  const [viewMode, setViewMode] = useState<ViewMode>(ViewMode.Code)
+  const [viewMode, setViewMode] = useState<readonly ViewMode[]>([ViewMode.Code])
   const [isFocused, setIsFocused] = useState(false)
   const { t } = useTranslation()
+  const viewOptions = [
+    { value: ViewMode.Code, label: t('nodes.templateTransform.code', { ns: 'workflow' }), iconClassName: 'i-ri-braces-line' },
+    { value: ViewMode.Preview, label: t('common.preview', { ns: 'workflow' }), iconClassName: 'i-ri-eye-line' },
+  ]
+  const selectedViewMode = viewMode[0] ?? ViewMode.Code
 
   const chunkType = useMemo(() => {
     if (previewType !== PreviewType.Chunks || !schemaType)
@@ -65,22 +68,26 @@ const DisplayContent = (props: DisplayContentProps) => {
             {schemaType ? `(${schemaType})` : ''}
           </div>
         )}
-        <SegmentedControl
-          options={[
-            { value: ViewMode.Code, text: t('nodes.templateTransform.code', { ns: 'workflow' }), Icon: RiBracesLine },
-            { value: ViewMode.Preview, text: t('common.preview', { ns: 'workflow' }), Icon: RiEyeLine },
-          ]}
+        <ToggleGroup<ViewMode>
+          aria-label={t('common.preview', { ns: 'workflow' })}
           value={viewMode}
-          onChange={setViewMode}
-          size="small"
-          padding="with"
-          activeClassName="text-text-accent-light-mode-only!"
-          btnClassName="pl-1.5! pr-0.5! gap-[3px]"
-          className="shrink-0"
-        />
+          onValueChange={setViewMode}
+          className="shrink-0 rounded-md p-px"
+        >
+          {viewOptions.map(({ value, label, iconClassName }) => (
+            <ToggleGroupItem
+              key={value}
+              value={value}
+              className="h-[22px] gap-[3px] rounded-md p-px pr-0.5 pl-1.5 text-text-tertiary data-pressed:text-text-accent-light-mode-only"
+            >
+              <i className={cn('size-4 shrink-0', iconClassName)} aria-hidden="true" />
+              <span className="p-0.5 pr-1">{label}</span>
+            </ToggleGroupItem>
+          ))}
+        </ToggleGroup>
       </div>
       <div className="flex flex-1 overflow-auto rounded-b-[10px] pr-1 pl-3">
-        {viewMode === ViewMode.Code && (
+        {selectedViewMode === ViewMode.Code && (
           previewType === PreviewType.Markdown
             ? (
                 <Textarea
@@ -105,7 +112,7 @@ const DisplayContent = (props: DisplayContentProps) => {
                 />
               )
         )}
-        {viewMode === ViewMode.Preview && (
+        {selectedViewMode === ViewMode.Preview && (
           previewType === PreviewType.Markdown
             ? <Markdown className="grow overflow-auto rounded-lg px-4 py-3" content={(mdString ?? '') as string} />
             : (
@@ -120,5 +127,3 @@ const DisplayContent = (props: DisplayContentProps) => {
     </div>
   )
 }
-
-export default React.memo(DisplayContent)
diff --git a/web/app/components/workflow/variable-inspect/group.tsx b/web/app/components/workflow/variable-inspect/group.tsx
index ab3c327ce0..bef4fecb63 100644
--- a/web/app/components/workflow/variable-inspect/group.tsx
+++ b/web/app/components/workflow/variable-inspect/group.tsx
@@ -45,6 +45,11 @@ const Group = ({
   const isEnv = varType === VarInInspectType.environment
   const isChatVar = varType === VarInInspectType.conversation
   const isSystem = varType === VarInInspectType.system
+  const groupTitle = nodeData?.title
+    || (isEnv && t('debug.variableInspect.envNode', { ns: 'workflow' }))
+    || (isChatVar && t('debug.variableInspect.chatNode', { ns: 'workflow' }))
+    || (isSystem && t('debug.variableInspect.systemNode', { ns: 'workflow' }))
+    || ''
 
   const visibleVarList = isEnv ? varList : varList.filter(v => v.visible)
 
@@ -100,15 +105,20 @@ const Group = ({
     <div className="p-0.5">
       {/* node item */}
       <div className="group flex h-6 items-center gap-0.5">
-        <div className="h-3 w-3 shrink-0">
-          {nodeData?.isSingRunRunning && (
-            <RiLoader2Line className="h-3 w-3 animate-spin text-text-accent" />
-          )}
-          {(!nodeData || !nodeData.isSingRunRunning) && visibleVarList.length > 0 && (
-            <RiArrowRightSLine className={cn('h-3 w-3 text-text-tertiary', !isCollapsed && 'rotate-90')} onClick={() => setIsCollapsed(!isCollapsed)} />
-          )}
-        </div>
-        <div className="flex grow cursor-pointer items-center gap-1" onClick={() => setIsCollapsed(!isCollapsed)}>
+        <button
+          type="button"
+          aria-expanded={visibleVarList.length > 0 ? !isCollapsed : undefined}
+          className="flex min-w-0 grow cursor-pointer items-center gap-0.5 rounded-sm border-none bg-transparent p-0 text-left outline-hidden focus-visible:ring-1 focus-visible:ring-components-input-border-hover"
+          onClick={() => setIsCollapsed(!isCollapsed)}
+        >
+          <div className="h-3 w-3 shrink-0">
+            {nodeData?.isSingRunRunning && (
+              <RiLoader2Line className="h-3 w-3 animate-spin text-text-accent" aria-hidden />
+            )}
+            {(!nodeData || !nodeData.isSingRunRunning) && visibleVarList.length > 0 && (
+              <RiArrowRightSLine className={cn('h-3 w-3 text-text-tertiary', !isCollapsed && 'rotate-90')} aria-hidden />
+            )}
+          </div>
           {nodeData && (
             <>
               <BlockIcon
@@ -122,19 +132,17 @@ const Group = ({
           )}
           {!nodeData && (
             <div className="truncate system-xs-medium-uppercase text-text-tertiary">
-              {isEnv && t('debug.variableInspect.envNode', { ns: 'workflow' })}
-              {isChatVar && t('debug.variableInspect.chatNode', { ns: 'workflow' })}
-              {isSystem && t('debug.variableInspect.systemNode', { ns: 'workflow' })}
+              {groupTitle}
             </div>
           )}
-        </div>
+        </button>
         {nodeData && !nodeData.isSingRunRunning && (
           <div className="hidden shrink-0 items-center group-hover:flex">
             <Tooltip>
               <TooltipTrigger
                 render={(
-                  <ActionButton onClick={handleView}>
-                    <RiFileList3Line className="h-4 w-4" />
+                  <ActionButton aria-label={t('debug.variableInspect.view', { ns: 'workflow' })} onClick={handleView}>
+                    <RiFileList3Line className="h-4 w-4" aria-hidden />
                   </ActionButton>
                 )}
               />
@@ -145,8 +153,8 @@ const Group = ({
             <Tooltip>
               <TooltipTrigger
                 render={(
-                  <ActionButton onClick={handleClear}>
-                    <RiDeleteBinLine className="h-4 w-4" />
+                  <ActionButton aria-label={t('debug.variableInspect.clearNode', { ns: 'workflow' })} onClick={handleClear}>
+                    <RiDeleteBinLine className="h-4 w-4" aria-hidden />
                   </ActionButton>
                 )}
               />
@@ -161,11 +169,14 @@ const Group = ({
       {!isCollapsed && !nodeData?.isSingRunRunning && (
         <div className="px-0.5">
           {visibleVarList.length > 0 && visibleVarList.map(varItem => (
-            <div
+            <button
+              type="button"
               key={varItem.id}
               className={cn(
-                'relative flex cursor-pointer items-center gap-1 rounded-md px-3 py-1 hover:bg-state-base-hover',
-                varItem.id === currentVar?.var?.id && 'bg-state-base-hover-alt hover:bg-state-base-hover-alt',
+                'relative flex w-full cursor-pointer items-center gap-1 rounded-md border-none px-3 py-1 text-left outline-hidden hover:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-hover',
+                varItem.id === currentVar?.var?.id
+                  ? 'bg-state-base-hover-alt hover:bg-state-base-hover-alt'
+                  : 'bg-transparent',
               )}
               onClick={() => handleSelectVar(varItem, varType)}
             >
@@ -176,7 +187,7 @@ const Group = ({
               />
               <div className="grow truncate system-sm-medium text-text-secondary">{varItem.name}</div>
               <div className="shrink-0 system-xs-regular text-text-tertiary">{varItem.value_type}</div>
-            </div>
+            </button>
           ))}
         </div>
       )}
diff --git a/web/app/components/workflow/variable-inspect/left.tsx b/web/app/components/workflow/variable-inspect/left.tsx
index 6d590eb281..4cbd6b5f63 100644
--- a/web/app/components/workflow/variable-inspect/left.tsx
+++ b/web/app/components/workflow/variable-inspect/left.tsx
@@ -9,8 +9,6 @@ import { VarInInspectType } from '@/types/workflow'
 import useCurrentVars from '../hooks/use-inspect-vars-crud'
 import { useNodesInteractions } from '../hooks/use-nodes-interactions'
 import { useStore } from '../store'
-// import ActionButton from '@/app/components/base/action-button'
-// import Tooltip from '@/app/components/base/tooltip'
 import Group from './group'
 
 type Props = {
diff --git a/web/app/components/workflow/variable-inspect/listening.tsx b/web/app/components/workflow/variable-inspect/listening.tsx
index 3994355d58..cf702a623a 100644
--- a/web/app/components/workflow/variable-inspect/listening.tsx
+++ b/web/app/components/workflow/variable-inspect/listening.tsx
@@ -4,12 +4,12 @@ import type { Node } from 'reactflow'
 import type { ScheduleTriggerNodeType } from '@/app/components/workflow/nodes/trigger-schedule/types'
 import type { WebhookTriggerNodeType } from '@/app/components/workflow/nodes/trigger-webhook/types'
 import { Button } from '@langgenius/dify-ui/button'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import copy from 'copy-to-clipboard'
 import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useStoreApi } from 'reactflow'
 import { StopCircle } from '@/app/components/base/icons/src/vender/line/mediaAndDevices'
-import Tooltip from '@/app/components/base/tooltip'
 import BlockIcon from '@/app/components/workflow/block-icon'
 import { useGetToolIcon } from '@/app/components/workflow/hooks/use-tool-icon'
 import { getNextExecutionTime } from '@/app/components/workflow/nodes/trigger-schedule/utils/execution-time-calculator'
@@ -179,28 +179,32 @@ const Listening: FC<ListeningProps> = ({
           <div className="shrink-0 system-xs-regular whitespace-pre-line text-text-tertiary">
             {t('nodes.triggerWebhook.debugUrlTitle', { ns: 'workflow' })}
           </div>
-          <Tooltip
-            popupContent={debugUrlCopied
-              ? t('nodes.triggerWebhook.debugUrlCopied', { ns: 'workflow' })
-              : t('nodes.triggerWebhook.debugUrlCopy', { ns: 'workflow' })}
-            popupClassName="system-xs-regular text-text-primary bg-components-tooltip-bg border border-components-panel-border shadow-lg backdrop-blur-xs rounded-md px-1.5 py-1"
-            position="top"
-            offset={{ mainAxis: -4 }}
-            needsDelay={true}
-          >
-            <button
-              type="button"
-              aria-label={t('nodes.triggerWebhook.debugUrlCopy', { ns: 'workflow' }) || ''}
-              className={`inline-flex items-center rounded-md border border-divider-regular bg-components-badge-white-to-dark px-1.5 py-[2px] font-mono text-[13px] leading-[18px] text-text-secondary transition-colors hover:bg-components-panel-on-panel-item-bg-hover focus:outline-hidden focus-visible:outline-2 focus-visible:outline-components-panel-border focus-visible:outline-solid ${debugUrlCopied ? 'bg-components-panel-on-panel-item-bg-hover text-text-primary' : ''}`}
-              onClick={() => {
-                copy(webhookDebugUrl)
-                setDebugUrlCopied(true)
-              }}
+          <Tooltip>
+            <TooltipTrigger
+              render={(
+                <button
+                  type="button"
+                  aria-label={t('nodes.triggerWebhook.debugUrlCopy', { ns: 'workflow' }) || ''}
+                  className={`inline-flex items-center rounded-md border border-divider-regular bg-components-badge-white-to-dark px-1.5 py-[2px] font-mono text-[13px] leading-[18px] text-text-secondary transition-colors hover:bg-components-panel-on-panel-item-bg-hover focus:outline-hidden focus-visible:outline-2 focus-visible:outline-components-panel-border focus-visible:outline-solid ${debugUrlCopied ? 'bg-components-panel-on-panel-item-bg-hover text-text-primary' : ''}`}
+                  onClick={() => {
+                    copy(webhookDebugUrl)
+                    setDebugUrlCopied(true)
+                  }}
+                >
+                  <span className="whitespace-nowrap text-text-primary">
+                    {webhookDebugUrl}
+                  </span>
+                </button>
+              )}
+            />
+            <TooltipContent
+              placement="top"
+              className="rounded-md border border-components-panel-border bg-components-tooltip-bg px-1.5 py-1 system-xs-regular text-text-primary shadow-lg backdrop-blur-xs"
             >
-              <span className="whitespace-nowrap text-text-primary">
-                {webhookDebugUrl}
-              </span>
-            </button>
+              {debugUrlCopied
+                ? t('nodes.triggerWebhook.debugUrlCopied', { ns: 'workflow' })
+                : t('nodes.triggerWebhook.debugUrlCopy', { ns: 'workflow' })}
+            </TooltipContent>
           </Tooltip>
         </div>
       )}
diff --git a/web/app/components/workflow/variable-inspect/value-content-sections.tsx b/web/app/components/workflow/variable-inspect/value-content-sections.tsx
index 8d892343cd..8fb6c14d2f 100644
--- a/web/app/components/workflow/variable-inspect/value-content-sections.tsx
+++ b/web/app/components/workflow/variable-inspect/value-content-sections.tsx
@@ -11,7 +11,7 @@ import { SupportUploadFileTypes } from '@/app/components/workflow/types'
 import { TransferMethod } from '@/types/app'
 import { PreviewMode } from '../../base/features/types'
 import BoolValue from '../panel/chat-variable-panel/components/bool-value'
-import DisplayContent from './display-content'
+import { DisplayContent } from './display-content'
 import LargeDataAlert from './large-data-alert'
 import { PreviewType } from './types'
 
diff --git a/web/app/components/workflow/workflow-preview/components/nodes/base.tsx b/web/app/components/workflow/workflow-preview/components/nodes/base.tsx
index 34c8d753ce..5bfbd52561 100644
--- a/web/app/components/workflow/workflow-preview/components/nodes/base.tsx
+++ b/web/app/components/workflow/workflow-preview/components/nodes/base.tsx
@@ -6,12 +6,12 @@ import type {
   NodeProps,
 } from '@/app/components/workflow/types'
 import { cn } from '@langgenius/dify-ui/cn'
+import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
 import {
   cloneElement,
   memo,
 } from 'react'
 import { useTranslation } from 'react-i18next'
-import Tooltip from '@/app/components/base/tooltip'
 import BlockIcon from '@/app/components/workflow/block-icon'
 import {
   BlockEnum,
@@ -91,19 +91,21 @@ const BaseCard = ({
             </div>
             {
               data.type === BlockEnum.Iteration && (data as IterationNodeType).is_parallel && (
-                <Tooltip popupContent={(
-                  <div className="w-[180px]">
+                <Popover>
+                  <PopoverTrigger
+                    openOnHover
+                    aria-label={t('nodes.iteration.parallelModeEnableTitle', { ns: 'workflow' })}
+                    className="ml-1 flex items-center justify-center rounded-[5px] border border-text-warning bg-transparent px-[5px] py-[3px] system-2xs-medium-uppercase text-text-warning"
+                  >
+                    {t('nodes.iteration.parallelModeUpper', { ns: 'workflow' })}
+                  </PopoverTrigger>
+                  <PopoverContent popupClassName="w-[180px] px-3 py-2 system-xs-regular text-text-tertiary">
                     <div className="font-extrabold">
                       {t('nodes.iteration.parallelModeEnableTitle', { ns: 'workflow' })}
                     </div>
                     {t('nodes.iteration.parallelModeEnableDesc', { ns: 'workflow' })}
-                  </div>
-                )}
-                >
-                  <div className="ml-1 flex items-center justify-center rounded-[5px] border border-text-warning px-[5px] py-[3px] system-2xs-medium-uppercase text-text-warning">
-                    {t('nodes.iteration.parallelModeUpper', { ns: 'workflow' })}
-                  </div>
-                </Tooltip>
+                  </PopoverContent>
+                </Popover>
               )
             }
           </div>
diff --git a/web/app/components/workflow/workflow-preview/components/nodes/iteration-start/index.tsx b/web/app/components/workflow/workflow-preview/components/nodes/iteration-start/index.tsx
index 6a69e5f2aa..391150649f 100644
--- a/web/app/components/workflow/workflow-preview/components/nodes/iteration-start/index.tsx
+++ b/web/app/components/workflow/workflow-preview/components/nodes/iteration-start/index.tsx
@@ -1,8 +1,8 @@
 import type { NodeProps } from 'reactflow'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { RiHome5Fill } from '@remixicon/react'
 import { memo } from 'react'
 import { useTranslation } from 'react-i18next'
-import Tooltip from '@/app/components/base/tooltip'
 import { NodeSourceHandle } from '../../node-handle'
 
 const IterationStartNode = ({ id, data }: NodeProps) => {
@@ -10,10 +10,14 @@ const IterationStartNode = ({ id, data }: NodeProps) => {
 
   return (
     <div className="nodrag group mt-1 flex h-11 w-11 items-center justify-center rounded-2xl border border-workflow-block-border bg-workflow-block-bg shadow-xs">
-      <Tooltip popupContent={t('blocks.iteration-start', { ns: 'workflow' })} asChild={false}>
-        <div className="flex h-6 w-6 items-center justify-center rounded-full border-[0.5px] border-components-panel-border-subtle bg-util-colors-blue-brand-blue-brand-500">
+      <Tooltip>
+        <TooltipTrigger
+          aria-label={t('blocks.iteration-start', { ns: 'workflow' })}
+          className="flex h-6 w-6 items-center justify-center rounded-full border-[0.5px] border-components-panel-border-subtle bg-util-colors-blue-brand-blue-brand-500 p-0"
+        >
           <RiHome5Fill className="h-3 w-3 text-text-primary-on-surface" />
-        </div>
+        </TooltipTrigger>
+        <TooltipContent>{t('blocks.iteration-start', { ns: 'workflow' })}</TooltipContent>
       </Tooltip>
       <NodeSourceHandle
         id={id}
diff --git a/web/app/components/workflow/workflow-preview/components/nodes/loop-start/index.tsx b/web/app/components/workflow/workflow-preview/components/nodes/loop-start/index.tsx
index e67c0d9f10..67865be470 100644
--- a/web/app/components/workflow/workflow-preview/components/nodes/loop-start/index.tsx
+++ b/web/app/components/workflow/workflow-preview/components/nodes/loop-start/index.tsx
@@ -1,8 +1,8 @@
 import type { NodeProps } from 'reactflow'
+import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
 import { RiHome5Fill } from '@remixicon/react'
 import { memo } from 'react'
 import { useTranslation } from 'react-i18next'
-import Tooltip from '@/app/components/base/tooltip'
 import { NodeSourceHandle } from '../../node-handle'
 
 const LoopStartNode = ({ id, data }: NodeProps) => {
@@ -10,10 +10,14 @@ const LoopStartNode = ({ id, data }: NodeProps) => {
 
   return (
     <div className="nodrag group mt-1 flex h-11 w-11 items-center justify-center rounded-2xl border border-workflow-block-border bg-workflow-block-bg">
-      <Tooltip popupContent={t('blocks.loop-start', { ns: 'workflow' })} asChild={false}>
-        <div className="flex h-6 w-6 items-center justify-center rounded-full border-[0.5px] border-components-panel-border-subtle bg-util-colors-blue-brand-blue-brand-500">
+      <Tooltip>
+        <TooltipTrigger
+          aria-label={t('blocks.loop-start', { ns: 'workflow' })}
+          className="flex h-6 w-6 items-center justify-center rounded-full border-[0.5px] border-components-panel-border-subtle bg-util-colors-blue-brand-blue-brand-500 p-0"
+        >
           <RiHome5Fill className="h-3 w-3 text-text-primary-on-surface" />
-        </div>
+        </TooltipTrigger>
+        <TooltipContent>{t('blocks.loop-start', { ns: 'workflow' })}</TooltipContent>
       </Tooltip>
       <NodeSourceHandle
         id={id}
diff --git a/web/app/components/workflow/workflow-preview/components/nodes/question-classifier/__tests__/node.spec.tsx b/web/app/components/workflow/workflow-preview/components/nodes/question-classifier/__tests__/node.spec.tsx
index 82cede1d85..463c4dd43d 100644
--- a/web/app/components/workflow/workflow-preview/components/nodes/question-classifier/__tests__/node.spec.tsx
+++ b/web/app/components/workflow/workflow-preview/components/nodes/question-classifier/__tests__/node.spec.tsx
@@ -28,7 +28,7 @@ describe('workflow preview question classifier node', () => {
         title: 'Classifier',
         desc: '',
         classes: [
-          { id: 'class-1', name: 'Billing' },
+          { id: 'class-1', name: 'Billing', label: 'Billing label' },
           { id: 'class-2', name: 'Support' },
         ],
       } as never,
@@ -38,7 +38,8 @@ describe('workflow preview question classifier node', () => {
       <Node {...props} />,
     )
 
-    expect(getByText('workflow.nodes.questionClassifiers.class 1')).toBeInTheDocument()
+    expect(getByText('Billing label')).toBeInTheDocument()
+    expect(getByText('CLASS 2')).toBeInTheDocument()
     expect(container.querySelector('[data-handleid="class-1"]')).toBeInTheDocument()
     expect(container.querySelector('[data-handleid="class-2"]')).toBeInTheDocument()
   })
diff --git a/web/app/components/workflow/workflow-preview/components/nodes/question-classifier/node.tsx b/web/app/components/workflow/workflow-preview/components/nodes/question-classifier/node.tsx
index d0e23f7823..9884990309 100644
--- a/web/app/components/workflow/workflow-preview/components/nodes/question-classifier/node.tsx
+++ b/web/app/components/workflow/workflow-preview/components/nodes/question-classifier/node.tsx
@@ -4,10 +4,9 @@ import type { QuestionClassifierNodeType } from '@/app/components/workflow/nodes
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import InfoPanel from '@/app/components/workflow/nodes/_base/components/info-panel'
+import { getDisplayClassLabel } from '@/app/components/workflow/nodes/question-classifier/components/class-label-utils'
 import { NodeSourceHandle } from '../../node-handle'
 
-const i18nPrefix = 'nodes.questionClassifiers'
-
 const Node: FC<NodeProps<QuestionClassifierNodeType>> = (props) => {
   const { t } = useTranslation()
   const { data } = props
@@ -24,7 +23,7 @@ const Node: FC<NodeProps<QuestionClassifierNodeType>> = (props) => {
                 className="relative"
               >
                 <InfoPanel
-                  title={`${t(`${i18nPrefix}.class`, { ns: 'workflow' })} ${index + 1}`}
+                  title={getDisplayClassLabel(topic.label, index + 1, t)}
                   content=""
                 />
                 <NodeSourceHandle
diff --git a/web/app/education-apply/applied-education-content.tsx b/web/app/education-apply/applied-education-content.tsx
new file mode 100644
index 0000000000..cbe2e11fda
--- /dev/null
+++ b/web/app/education-apply/applied-education-content.tsx
@@ -0,0 +1,95 @@
+'use client'
+
+import type { ReactNode } from 'react'
+import type { Plan as PlanType } from '@/app/components/billing/type'
+import type { ICurrentWorkspace, IWorkspace } from '@/models/common'
+import {
+  Select,
+  SelectTrigger,
+} from '@langgenius/dify-ui/select'
+import { useTranslation } from 'react-i18next'
+import { Plan } from '@/app/components/billing/type'
+import { WorkplaceSelectorContent } from '@/app/components/header/account-dropdown/workplace-selector'
+import { PlanBadge } from '@/app/components/header/plan-badge'
+
+type AppliedEducationContentProps = {
+  workspaces: IWorkspace[]
+  currentWorkspace: ICurrentWorkspace
+  plan: PlanType
+  action: ReactNode
+  onSwitchWorkspace: (tenantId: string) => void
+}
+
+const AppliedEducationContent = ({
+  workspaces,
+  currentWorkspace,
+  plan,
+  action,
+  onSwitchWorkspace,
+}: AppliedEducationContentProps) => {
+  const { t } = useTranslation()
+  const currentWorkspaceInList = workspaces.find(workspace => workspace.current)
+  const workspacePlan = Object.values(Plan).includes(currentWorkspaceInList?.plan as Plan)
+    ? currentWorkspaceInList?.plan as Plan
+    : Object.values(Plan).includes(plan as Plan)
+      ? plan as Plan
+      : Plan.sandbox
+  const workspaceName = currentWorkspaceInList?.name || currentWorkspace?.name
+  const workspaceId = currentWorkspaceInList?.id || currentWorkspace?.id
+
+  return (
+    <div className="flex w-full flex-col gap-4">
+      <div className="rounded-lg border border-effects-highlight bg-background-default-subtle px-3">
+        <div className="flex items-center gap-2">
+          <div className="flex size-5 shrink-0 items-center justify-center rounded-full bg-state-success-solid text-text-primary-on-surface">
+            <span className="i-ri-check-line h-3.5 w-3.5" />
+          </div>
+          <div>
+            <div className="text-text-secondary">
+              {t('applied.step1.description', { ns: 'education' })}
+            </div>
+          </div>
+        </div>
+      </div>
+      <div className="rounded-lg px-3">
+        <div className="mb-3.5 flex items-center gap-2">
+          <div className="flex size-5 shrink-0 items-center justify-center rounded-full bg-components-icon-bg-blue-solid system-xs-semibold text-text-primary-on-surface">
+            2
+          </div>
+          <div>
+            <div className="system-xl-medium text-text-secondary">
+              {t('applied.step2.description', { ns: 'education' })}
+            </div>
+          </div>
+        </div>
+        <div className="ml-7">
+          <Select
+            value={workspaceId ?? ''}
+            onValueChange={(value) => {
+              if (value)
+                onSwitchWorkspace(value)
+            }}
+          >
+            <SelectTrigger className="h-12! w-fit max-w-full min-w-[280px] cursor-pointer justify-between rounded-lg border-[0.5px] border-transparent bg-components-input-bg-normal px-3! py-1.5! hover:bg-state-base-hover">
+              <span className="flex min-w-0 items-center gap-3">
+                <span className="flex size-8 shrink-0 items-center justify-center rounded-lg bg-components-icon-bg-blue-solid text-[14px]">
+                  <span className="bg-gradient-to-r from-components-avatar-shape-fill-stop-0 to-components-avatar-shape-fill-stop-100 bg-clip-text font-semibold text-shadow-shadow-1 uppercase opacity-90">
+                    {workspaceName?.[0]?.toLocaleUpperCase()}
+                  </span>
+                </span>
+                <span className="min-w-0 truncate system-md-semibold text-text-primary">{workspaceName}</span>
+                <PlanBadge plan={workspacePlan} />
+              </span>
+            </SelectTrigger>
+            <WorkplaceSelectorContent workspaces={workspaces} />
+          </Select>
+          <div className="mt-3 pr-5">
+            {action}
+          </div>
+        </div>
+      </div>
+    </div>
+  )
+}
+
+export default AppliedEducationContent
diff --git a/web/app/education-apply/education-apply-page.tsx b/web/app/education-apply/education-apply-page.tsx
index 7998af6e66..3a8455e407 100644
--- a/web/app/education-apply/education-apply-page.tsx
+++ b/web/app/education-apply/education-apply-page.tsx
@@ -1,57 +1,79 @@
 'use client'
 
+import type { ReactNode } from 'react'
+import type { Plan as PlanType } from '@/app/components/billing/type'
+import type { ICurrentWorkspace } from '@/models/common'
 import { Button } from '@langgenius/dify-ui/button'
+import { Checkbox } from '@langgenius/dify-ui/checkbox'
 import { toast } from '@langgenius/dify-ui/toast'
-import { RiExternalLinkLine } from '@remixicon/react'
+import { useQueryClient } from '@tanstack/react-query'
 import { noop } from 'es-toolkit/function'
-import {
-  useState,
-} from 'react'
-import { useTranslation } from 'react-i18next'
-import Checkbox from '@/app/components/base/checkbox'
+import { useState } from 'react'
+import { Trans, useTranslation } from 'react-i18next'
+import { useEducationDiscount } from '@/app/components/billing/hooks/use-education-discount'
+import { Plan } from '@/app/components/billing/type'
 import { EDUCATION_VERIFYING_LOCALSTORAGE_ITEM } from '@/app/education-apply/constants'
+import { useAppContext } from '@/context/app-context'
 import { useDocLink } from '@/context/i18n'
 import { useProviderContext } from '@/context/provider-context'
+import { useWorkspacesContext } from '@/context/workspace-context'
+import { WorkspaceProvider } from '@/context/workspace-context-provider'
+import { useAsyncWindowOpen } from '@/hooks/use-async-window-open'
 import {
   useRouter,
   useSearchParams,
 } from '@/next/navigation'
+import { consoleClient } from '@/service/client'
+import { switchWorkspace } from '@/service/common'
+import { commonQueryKeys } from '@/service/use-common'
 import {
   useEducationAdd,
   useInvalidateEducationStatus,
 } from '@/service/use-education'
 import DifyLogo from '../components/base/logo/dify-logo'
+import AppliedEducationContent from './applied-education-content'
 import RoleSelector from './role-selector'
 import SearchInput from './search-input'
 import UserInfo from './user-info'
-import Confirm from './verify-state-modal'
 
-const EducationApplyAge = () => {
+const AppliedEducationCase = {
+  eligible: 'eligible',
+  activeSubscription: 'activeSubscription',
+  noPaymentPermission: 'noPaymentPermission',
+} as const
+
+const EducationApplyAgeContent = () => {
   const { t } = useTranslation()
   const [schoolName, setSchoolName] = useState('')
   const [role, setRole] = useState('Student')
   const [ageChecked, setAgeChecked] = useState(false)
   const [inSchoolChecked, setInSchoolChecked] = useState(false)
+  const [hasSubmittedEducation, setHasSubmittedEducation] = useState(false)
+  const [isOpeningBillingPortal, setIsOpeningBillingPortal] = useState(false)
   const {
     isPending,
     mutateAsync: educationAdd,
   } = useEducationAdd({ onSuccess: noop })
-  const [modalShow, setShowModal] = useState<undefined | { title: string, desc: string, onConfirm?: () => void }>(undefined)
-  const { onPlanInfoChanged } = useProviderContext()
+  const { onPlanInfoChanged, isEducationAccount, plan } = useProviderContext()
+  const { currentWorkspace, isCurrentWorkspaceManager } = useAppContext()
   const updateEducationStatus = useInvalidateEducationStatus()
-  const router = useRouter()
   const docLink = useDocLink()
-
-  const handleModalConfirm = () => {
-    setShowModal(undefined)
-    onPlanInfoChanged()
-    updateEducationStatus()
-    localStorage.removeItem(EDUCATION_VERIFYING_LOCALSTORAGE_ITEM)
-    router.replace('/')
-  }
+  const { handleEducationDiscount } = useEducationDiscount()
+  const router = useRouter()
+  const openAsyncWindow = useAsyncWindowOpen()
+  const queryClient = useQueryClient()
 
   const searchParams = useSearchParams()
   const token = searchParams.get('token')
+  const appliedEducationCase = (() => {
+    if (!isCurrentWorkspaceManager)
+      return AppliedEducationCase.noPaymentPermission
+
+    if (plan.type === Plan.sandbox)
+      return AppliedEducationCase.eligible
+
+    return AppliedEducationCase.activeSubscription
+  })()
   const handleSubmit = () => {
     educationAdd({
       token: token || '',
@@ -59,17 +81,113 @@ const EducationApplyAge = () => {
       institution: schoolName,
     }).then((res) => {
       if (res.message === 'success') {
-        setShowModal({
-          title: t('successTitle', { ns: 'education' }),
-          desc: t('successContent', { ns: 'education' }),
-          onConfirm: handleModalConfirm,
-        })
+        onPlanInfoChanged()
+        updateEducationStatus()
+        localStorage.removeItem(EDUCATION_VERIFYING_LOCALSTORAGE_ITEM)
+        setHasSubmittedEducation(true)
       }
       else {
         toast.error(t('submitError', { ns: 'education' }))
       }
     })
   }
+  const handleOpenBillingPortal = async () => {
+    if (isOpeningBillingPortal)
+      return
+
+    setIsOpeningBillingPortal(true)
+    try {
+      await openAsyncWindow(async () => {
+        const res = await consoleClient.billing.invoices()
+        if (res.url)
+          return res.url
+
+        throw new Error('Failed to open billing page')
+      }, {
+        onError: (err) => {
+          toast.error(err.message || String(err))
+        },
+      })
+    }
+    finally {
+      setIsOpeningBillingPortal(false)
+    }
+  }
+  const handleReturnHome = () => {
+    router.push('/')
+  }
+  const renderBackToDifyButton = () => (
+    <Button variant="ghost-accent" onClick={handleReturnHome}>
+      <span className="mr-1 i-ri-arrow-left-line h-4 w-4" />
+      {t('applied.noPaymentPermission.returnHome', { ns: 'education' })}
+    </Button>
+  )
+  const handleSwitchWorkspace = async (tenantId: string) => {
+    if (tenantId === currentWorkspace?.id)
+      return
+
+    try {
+      await switchWorkspace({ url: '/workspaces/switch', body: { tenant_id: tenantId } })
+      await Promise.all([
+        queryClient.invalidateQueries({ queryKey: commonQueryKeys.currentWorkspace }),
+        queryClient.invalidateQueries({ queryKey: commonQueryKeys.workspaces }),
+      ])
+      onPlanInfoChanged()
+      updateEducationStatus()
+    }
+    catch {
+      toast.error(t('actionMsg.modifiedUnsuccessfully', { ns: 'common' }))
+    }
+  }
+
+  const renderAppliedEducationAction = () => {
+    if (appliedEducationCase === AppliedEducationCase.eligible) {
+      return (
+        <Button variant="primary" onClick={handleEducationDiscount}>
+          {t('useEducationDiscount', { ns: 'education' })}
+        </Button>
+      )
+    }
+
+    if (appliedEducationCase === AppliedEducationCase.activeSubscription) {
+      return (
+        <div className="flex w-full flex-col items-start gap-3">
+          <div className="flex w-full items-start rounded-lg border-[0.5px] border-components-badge-status-light-warning-halo bg-state-warning-hover px-3 py-2.5">
+            <span className="mt-0.5 mr-2 i-ri-alert-fill h-4 w-4 shrink-0 text-text-warning-secondary" />
+            <div className="system-md-regular text-text-warning">
+              <Trans
+                i18nKey="applied.activeSubscription.description"
+                ns="education"
+                components={{
+                  stripeLink: (
+                    <button
+                      type="button"
+                      className="text-text-accent hover:underline disabled:cursor-not-allowed disabled:text-text-disabled"
+                      onClick={handleOpenBillingPortal}
+                      disabled={isOpeningBillingPortal}
+                    />
+                  ),
+                }}
+              />
+            </div>
+          </div>
+          {renderBackToDifyButton()}
+        </div>
+      )
+    }
+
+    return (
+      <div className="flex w-full flex-col items-start gap-3">
+        <div className="flex w-full items-start rounded-lg border-[0.5px] border-components-badge-status-light-warning-halo bg-state-warning-hover px-3 py-2.5">
+          <span className="mt-0.5 mr-2 i-ri-alert-fill h-4 w-4 shrink-0 text-text-warning-secondary" />
+          <div className="system-md-regular text-text-warning">
+            {t('applied.noPaymentPermission.description', { ns: 'education' })}
+          </div>
+        </div>
+        {renderBackToDifyButton()}
+      </div>
+    )
+  }
 
   return (
     <div className="fixed inset-0 z-31 overflow-y-auto bg-background-body p-6">
@@ -89,94 +207,141 @@ const EducationApplyAge = () => {
             <div className="mb-2 title-5xl-bold shadow-xs">{t('toVerified', { ns: 'education' })}</div>
             <div className="system-md-medium shadow-xs">
               {t('toVerifiedTip.front', { ns: 'education' })}
-&nbsp;
+              &nbsp;
               <span className="system-md-semibold underline">{t('toVerifiedTip.coupon', { ns: 'education' })}</span>
-&nbsp;
+              &nbsp;
               {t('toVerifiedTip.end', { ns: 'education' })}
             </div>
           </div>
           <div className="mb-7">
             <UserInfo />
           </div>
-          <div className="mb-7">
-            <div className="mb-1 flex h-6 items-center system-md-semibold text-text-secondary">
-              {t('form.schoolName.title', { ns: 'education' })}
-            </div>
-            <SearchInput
-              value={schoolName}
-              onChange={setSchoolName}
-            />
-          </div>
-          <div className="mb-7">
-            <div className="mb-1 flex h-6 items-center system-md-semibold text-text-secondary">
-              {t('form.schoolRole.title', { ns: 'education' })}
-            </div>
-            <RoleSelector
-              value={role}
-              onChange={setRole}
-            />
-          </div>
-          <div className="mb-7">
-            <div className="mb-1 flex h-6 items-center system-md-semibold text-text-secondary">
-              {t('form.terms.title', { ns: 'education' })}
-            </div>
-            <div className="mb-1 system-md-regular text-text-tertiary">
-              {t('form.terms.desc.front', { ns: 'education' })}
-&nbsp;
-              <a href="https://dify.ai/terms" target="_blank" rel="noopener noreferrer" className="text-text-secondary hover:underline">{t('form.terms.desc.termsOfService', { ns: 'education' })}</a>
-&nbsp;
-              {t('form.terms.desc.and', { ns: 'education' })}
-&nbsp;
-              <a href="https://dify.ai/privacy" target="_blank" rel="noopener noreferrer" className="text-text-secondary hover:underline">{t('form.terms.desc.privacyPolicy', { ns: 'education' })}</a>
-              {t('form.terms.desc.end', { ns: 'education' })}
-            </div>
-            <div className="py-2 system-md-regular text-text-primary">
-              <div className="mb-2 flex">
-                <Checkbox
-                  className="mr-2 shrink-0"
-                  checked={ageChecked}
-                  onCheck={() => setAgeChecked(!ageChecked)}
-                />
-                {t('form.terms.option.age', { ns: 'education' })}
-              </div>
-              <div className="flex">
-                <Checkbox
-                  className="mr-2 shrink-0"
-                  checked={inSchoolChecked}
-                  onCheck={() => setInSchoolChecked(!inSchoolChecked)}
-                />
-                {t('form.terms.option.inSchool', { ns: 'education' })}
-              </div>
-            </div>
-          </div>
-          <Button
-            variant="primary"
-            disabled={!ageChecked || !inSchoolChecked || !schoolName || !role || isPending}
-            onClick={handleSubmit}
-          >
-            {t('submit', { ns: 'education' })}
-          </Button>
-          <div className="mt-5 mb-4 h-px bg-linear-to-r from-[rgba(16,24,40,0.08)]"></div>
-          <a
-            className="flex items-center system-xs-regular text-text-accent"
-            href={docLink('/use-dify/workspace/subscription-management#dify-for-education')}
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            {t('learn', { ns: 'education' })}
-            <RiExternalLinkLine className="ml-1 h-3 w-3" />
-          </a>
+          {isEducationAccount || hasSubmittedEducation
+            ? (
+                <div className="flex">
+                  <AppliedEducationWorkspaceBlock
+                    currentWorkspace={currentWorkspace}
+                    plan={plan.type}
+                    action={renderAppliedEducationAction()}
+                    onSwitchWorkspace={(value) => {
+                      void handleSwitchWorkspace(value)
+                    }}
+                  />
+                </div>
+              )
+            : (
+                <>
+                  <div className="mb-7">
+                    <div className="mb-1 flex h-6 items-center system-md-semibold text-text-secondary">
+                      {t('form.schoolName.title', { ns: 'education' })}
+                    </div>
+                    <SearchInput
+                      value={schoolName}
+                      onChange={setSchoolName}
+                    />
+                  </div>
+                  <div className="mb-7">
+                    <div className="mb-1 flex h-6 items-center system-md-semibold text-text-secondary">
+                      {t('form.schoolRole.title', { ns: 'education' })}
+                    </div>
+                    <RoleSelector
+                      value={role}
+                      onChange={setRole}
+                    />
+                  </div>
+                  <div className="mb-7">
+                    <div className="mb-1 flex h-6 items-center system-md-semibold text-text-secondary">
+                      {t('form.terms.title', { ns: 'education' })}
+                    </div>
+                    <div className="mb-1 system-md-regular text-text-tertiary">
+                      {t('form.terms.desc.front', { ns: 'education' })}
+                      &nbsp;
+                      <a href="https://dify.ai/terms" target="_blank" className="text-text-secondary hover:underline">{t('form.terms.desc.termsOfService', { ns: 'education' })}</a>
+                      &nbsp;
+                      {t('form.terms.desc.and', { ns: 'education' })}
+                      &nbsp;
+                      <a href="https://dify.ai/privacy" target="_blank" className="text-text-secondary hover:underline">{t('form.terms.desc.privacyPolicy', { ns: 'education' })}</a>
+                      {t('form.terms.desc.end', { ns: 'education' })}
+                    </div>
+                    <div className="py-2 system-md-regular text-text-primary">
+                      <label className="mb-2 flex">
+                        <Checkbox
+                          className="mr-2 shrink-0"
+                          checked={ageChecked}
+                          onCheckedChange={setAgeChecked}
+                        />
+                        {t('form.terms.option.age', { ns: 'education' })}
+                      </label>
+                      <label className="flex">
+                        <Checkbox
+                          className="mr-2 shrink-0"
+                          checked={inSchoolChecked}
+                          onCheckedChange={setInSchoolChecked}
+                        />
+                        {t('form.terms.option.inSchool', { ns: 'education' })}
+                      </label>
+                    </div>
+                  </div>
+                  <Button
+                    variant="primary"
+                    disabled={!ageChecked || !inSchoolChecked || !schoolName || !role || isPending}
+                    onClick={handleSubmit}
+                  >
+                    {t('submit', { ns: 'education' })}
+                  </Button>
+                  <div className="mt-5 mb-4 h-px bg-linear-to-r from-[rgba(16,24,40,0.08)]"></div>
+                  <a
+                    className="flex items-center system-xs-regular text-text-accent"
+                    href={docLink('/use-dify/workspace/subscription-management#dify-for-education')}
+                    target="_blank"
+                  >
+                    {t('learn', { ns: 'education' })}
+                    <span className="ml-1 i-ri-external-link-line h-3 w-3" />
+                  </a>
+                </>
+              )}
         </div>
       </div>
-      <Confirm
-        isShow={!!modalShow}
-        title={modalShow?.title || ''}
-        content={modalShow?.desc}
-        onConfirm={modalShow?.onConfirm || noop}
-        onCancel={modalShow?.onConfirm || noop}
-      />
     </div>
   )
 }
 
+type AppliedEducationWorkspaceBlockProps = {
+  currentWorkspace: ICurrentWorkspace
+  plan: PlanType
+  action: ReactNode
+  onSwitchWorkspace: (tenantId: string) => void
+}
+
+function AppliedEducationWorkspaceContent({
+  currentWorkspace,
+  plan,
+  action,
+  onSwitchWorkspace,
+}: AppliedEducationWorkspaceBlockProps) {
+  const { workspaces } = useWorkspacesContext()
+
+  return (
+    <AppliedEducationContent
+      workspaces={workspaces}
+      currentWorkspace={currentWorkspace}
+      plan={plan}
+      action={action}
+      onSwitchWorkspace={onSwitchWorkspace}
+    />
+  )
+}
+
+function AppliedEducationWorkspaceBlock(props: AppliedEducationWorkspaceBlockProps) {
+  return (
+    <WorkspaceProvider>
+      <AppliedEducationWorkspaceContent {...props} />
+    </WorkspaceProvider>
+  )
+}
+
+const EducationApplyAge = () => <EducationApplyAgeContent />
+
 export default EducationApplyAge
+
+type AppliedEducationCase = typeof AppliedEducationCase[keyof typeof AppliedEducationCase]
diff --git a/web/app/education-apply/expire-notice-modal.tsx b/web/app/education-apply/expire-notice-modal.tsx
index e54afaecde..ca59527508 100644
--- a/web/app/education-apply/expire-notice-modal.tsx
+++ b/web/app/education-apply/expire-notice-modal.tsx
@@ -1,9 +1,9 @@
 'use client'
 import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogCloseButton, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import { RiExternalLinkLine } from '@remixicon/react'
 import * as React from 'react'
 import { useTranslation } from 'react-i18next'
-import Modal from '@/app/components/base/modal'
 import { useDocLink } from '@/context/i18n'
 import { useModalContextSelector } from '@/context/modal-context'
 import useTimestamp from '@/hooks/use-timestamp'
@@ -41,63 +41,70 @@ const ExpireNoticeModal: React.FC<Props> = ({ expireAt, expired, onClose }) => {
   }
 
   return (
-    <Modal
-      isShow
-      onClose={onClose}
-      title={expired ? t(`${i18nPrefix}.expired.title`, { ns: 'education' }) : t(`${i18nPrefix}.isAboutToExpire.title`, { ns: 'education', date: formatTime(expireAt, t(`${i18nPrefix}.dateFormat`, { ns: 'education' }) as string), interpolation: { escapeValue: false } })}
-      closable
-      className="max-w-[600px]"
+    <Dialog
+      open
+      onOpenChange={(open) => {
+        if (!open)
+          onClose()
+      }}
     >
-      <div className="mt-5 space-y-5 body-md-regular text-text-secondary">
-        <div>
-          {expired
-            ? (
-                <>
-                  <div>{t(`${i18nPrefix}.expired.summary.line1`, { ns: 'education' })}</div>
-                  <div>{t(`${i18nPrefix}.expired.summary.line2`, { ns: 'education' })}</div>
-                </>
-              )
-            : t(`${i18nPrefix}.isAboutToExpire.summary`, { ns: 'education' })}
+      <DialogContent className="w-full max-w-[600px] overflow-hidden! border-none text-left align-middle">
+        <DialogCloseButton />
+        <DialogTitle className="title-2xl-semi-bold text-text-primary">
+          {expired ? t(`${i18nPrefix}.expired.title`, { ns: 'education' }) : t(`${i18nPrefix}.isAboutToExpire.title`, { ns: 'education', date: formatTime(expireAt, t(`${i18nPrefix}.dateFormat`, { ns: 'education' }) as string), interpolation: { escapeValue: false } })}
+        </DialogTitle>
+
+        <div className="mt-5 space-y-5 body-md-regular text-text-secondary">
+          <div>
+            {expired
+              ? (
+                  <>
+                    <div>{t(`${i18nPrefix}.expired.summary.line1`, { ns: 'education' })}</div>
+                    <div>{t(`${i18nPrefix}.expired.summary.line2`, { ns: 'education' })}</div>
+                  </>
+                )
+              : t(`${i18nPrefix}.isAboutToExpire.summary`, { ns: 'education' })}
+          </div>
+          <div>
+            <strong className="block title-md-semi-bold">{t(`${i18nPrefix}.stillInEducation.title`, { ns: 'education' })}</strong>
+            {t(`${i18nPrefix}.stillInEducation.${expired ? 'expired' : 'isAboutToExpire'}`, { ns: 'education' })}
+          </div>
+          <div>
+            <strong className="block title-md-semi-bold">{t(`${i18nPrefix}.alreadyGraduated.title`, { ns: 'education' })}</strong>
+            {t(`${i18nPrefix}.alreadyGraduated.${expired ? 'expired' : 'isAboutToExpire'}`, { ns: 'education' })}
+          </div>
         </div>
-        <div>
-          <strong className="block title-md-semi-bold">{t(`${i18nPrefix}.stillInEducation.title`, { ns: 'education' })}</strong>
-          {t(`${i18nPrefix}.stillInEducation.${expired ? 'expired' : 'isAboutToExpire'}`, { ns: 'education' })}
+        <div className="mt-7 flex items-center justify-between space-x-2">
+          <Link className="flex items-center space-x-1 system-xs-regular text-text-accent" href={eduDocLink} target="_blank" rel="noopener noreferrer">
+            <div>{t('learn', { ns: 'education' })}</div>
+            <RiExternalLinkLine className="size-3" />
+          </Link>
+          <div className="flex space-x-2">
+            {expired
+              ? (
+                  <Button
+                    onClick={() => {
+                      onClose()
+                      setShowPricingModal()
+                    }}
+                    className="flex items-center space-x-1"
+                  >
+                    <SparklesSoftAccent className="size-4" />
+                    <div className="text-components-button-secondary-accent-text">{t(`${i18nPrefix}.action.upgrade`, { ns: 'education' })}</div>
+                  </Button>
+                )
+              : (
+                  <Button onClick={onClose}>
+                    {t(`${i18nPrefix}.action.dismiss`, { ns: 'education' })}
+                  </Button>
+                )}
+            <Button variant="primary" onClick={handleConfirm}>
+              {t(`${i18nPrefix}.action.reVerify`, { ns: 'education' })}
+            </Button>
+          </div>
         </div>
-        <div>
-          <strong className="block title-md-semi-bold">{t(`${i18nPrefix}.alreadyGraduated.title`, { ns: 'education' })}</strong>
-          {t(`${i18nPrefix}.alreadyGraduated.${expired ? 'expired' : 'isAboutToExpire'}`, { ns: 'education' })}
-        </div>
-      </div>
-      <div className="mt-7 flex items-center justify-between space-x-2">
-        <Link className="flex items-center space-x-1 system-xs-regular text-text-accent" href={eduDocLink} target="_blank" rel="noopener noreferrer">
-          <div>{t('learn', { ns: 'education' })}</div>
-          <RiExternalLinkLine className="size-3" />
-        </Link>
-        <div className="flex space-x-2">
-          {expired
-            ? (
-                <Button
-                  onClick={() => {
-                    onClose()
-                    setShowPricingModal()
-                  }}
-                  className="flex items-center space-x-1"
-                >
-                  <SparklesSoftAccent className="size-4" />
-                  <div className="text-components-button-secondary-accent-text">{t(`${i18nPrefix}.action.upgrade`, { ns: 'education' })}</div>
-                </Button>
-              )
-            : (
-                <Button onClick={onClose}>
-                  {t(`${i18nPrefix}.action.dismiss`, { ns: 'education' })}
-                </Button>
-              )}
-          <Button variant="primary" onClick={handleConfirm}>
-            {t(`${i18nPrefix}.action.reVerify`, { ns: 'education' })}
-          </Button>
-        </div>
-      </div>
-    </Modal>
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/education-apply/search-input.tsx b/web/app/education-apply/search-input.tsx
index 5125eba439..738f2a0ec6 100644
--- a/web/app/education-apply/search-input.tsx
+++ b/web/app/education-apply/search-input.tsx
@@ -87,33 +87,34 @@ const SearchInput = ({
           />
         )}
       />
-      {open && !!schools.length && !!value && (
-        <PopoverContent
-          placement="bottom"
-          sideOffset={4}
-          popupClassName="w-[var(--anchor-width)] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur p-1 shadow-lg"
-          positionerProps={{ style: { zIndex: 32 } }}
-        >
-          <div
-            className="max-h-[330px] overflow-y-auto"
-            onScroll={handleScroll}
-          >
-            {schools.map(school => (
+      {!!schools.length && !!value
+        ? (
+            <PopoverContent
+              placement="bottom"
+              sideOffset={4}
+              popupClassName="w-[var(--anchor-width)] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur p-1 shadow-lg"
+            >
               <div
-                key={school}
-                className="flex h-8 cursor-pointer items-center truncate rounded-lg px-2 py-1.5 system-md-regular text-text-secondary hover:bg-state-base-hover"
-                title={school}
-                onClick={() => {
-                  onChange(school)
-                  setOpen(false)
-                }}
+                className="max-h-[330px] overflow-y-auto"
+                onScroll={handleScroll}
               >
-                {school}
+                {schools.map(school => (
+                  <div
+                    key={school}
+                    className="flex h-8 cursor-pointer items-center truncate rounded-lg px-2 py-1.5 system-md-regular text-text-secondary hover:bg-state-base-hover"
+                    title={school}
+                    onClick={() => {
+                      onChange(school)
+                      setOpen(false)
+                    }}
+                  >
+                    {school}
+                  </div>
+                ))}
               </div>
-            ))}
-          </div>
-        </PopoverContent>
-      )}
+            </PopoverContent>
+          )
+        : null}
     </Popover>
   )
 }
diff --git a/web/app/education-apply/verify-state-modal.tsx b/web/app/education-apply/verify-state-modal.tsx
index d51a815297..ac10f2319e 100644
--- a/web/app/education-apply/verify-state-modal.tsx
+++ b/web/app/education-apply/verify-state-modal.tsx
@@ -1,10 +1,9 @@
 import { Button } from '@langgenius/dify-ui/button'
+import { Dialog, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'
 import {
   RiExternalLinkLine,
 } from '@remixicon/react'
 import * as React from 'react'
-import { useEffect, useRef, useState } from 'react'
-import { createPortal } from 'react-dom'
 import { useTranslation } from 'react-i18next'
 import { useDocLink } from '@/context/i18n'
 
@@ -18,6 +17,7 @@ type IConfirm = {
   maskClosable?: boolean
   email?: string
   showLink?: boolean
+  confirmText?: string
 }
 
 function Confirm({
@@ -29,66 +29,29 @@ function Confirm({
   maskClosable = true,
   showLink,
   email,
+  confirmText,
 }: IConfirm) {
   const { t } = useTranslation()
   const docLink = useDocLink()
-  const dialogRef = useRef<HTMLDivElement>(null)
-  const [isVisible, setIsVisible] = useState(isShow)
   const eduDocLink = docLink('/use-dify/workspace/subscription-management#dify-for-education')
 
   const handleClick = () => {
     window.open(eduDocLink, '_blank', 'noopener,noreferrer')
   }
 
-  useEffect(() => {
-    const handleKeyDown = (event: KeyboardEvent) => {
-      if (event.key === 'Escape')
-        onCancel()
-    }
-
-    document.addEventListener('keydown', handleKeyDown)
-    return () => {
-      document.removeEventListener('keydown', handleKeyDown)
-    }
-  }, [onCancel])
-
-  const handleClickOutside = (event: MouseEvent) => {
-    if (maskClosable && dialogRef.current && !dialogRef.current.contains(event.target as Node))
-      onCancel()
-  }
-
-  useEffect(() => {
-    document.addEventListener('mousedown', handleClickOutside)
-    return () => {
-      document.removeEventListener('mousedown', handleClickOutside)
-    }
-  }, [maskClosable])
-
-  useEffect(() => {
-    if (isShow) {
-      setIsVisible(true)
-    }
-    else {
-      const timer = setTimeout(() => setIsVisible(false), 200)
-      return () => clearTimeout(timer)
-    }
-  }, [isShow])
-
-  if (!isVisible)
-    return null
-
-  return createPortal(
-    <div
-      className="fixed inset-0 z-10000000 flex items-center justify-center bg-background-overlay"
-      onClick={(e) => {
-        e.preventDefault()
-        e.stopPropagation()
+  return (
+    <Dialog
+      open={isShow}
+      onOpenChange={(open) => {
+        if (!open)
+          onCancel()
       }}
+      disablePointerDismissal={!maskClosable}
     >
-      <div ref={dialogRef} className="relative w-full max-w-[481px] overflow-hidden">
+      <DialogContent className="w-full max-w-[481px]! overflow-hidden! border-none bg-transparent p-0! shadow-none">
         <div className="shadows-shadow-lg flex max-w-full flex-col items-start rounded-2xl border-[0.5px] border-solid border-components-panel-border bg-components-panel-bg">
           <div className="flex flex-col items-start gap-2 self-stretch pt-6 pr-6 pb-4 pl-6">
-            <div className="title-2xl-semi-bold text-text-primary">{title}</div>
+            <DialogTitle className="title-2xl-semi-bold text-text-primary">{title}</DialogTitle>
             <div className="w-full system-md-regular text-text-tertiary">{content}</div>
           </div>
           {email && (
@@ -106,12 +69,11 @@ function Confirm({
                 </>
               )}
             </div>
-            <Button variant="primary" className="w-20!" onClick={onConfirm}>{t('operation.ok', { ns: 'common' })}</Button>
+            <Button variant="primary" className={confirmText ? 'min-w-20!' : 'w-20!'} onClick={onConfirm}>{confirmText || t('operation.ok', { ns: 'common' })}</Button>
           </div>
         </div>
-      </div>
-    </div>,
-    document.body,
+      </DialogContent>
+    </Dialog>
   )
 }
 
diff --git a/web/app/layout.tsx b/web/app/layout.tsx
index 9fb2b8dae2..4eb392fb6d 100644
--- a/web/app/layout.tsx
+++ b/web/app/layout.tsx
@@ -4,10 +4,11 @@ import { TooltipProvider } from '@langgenius/dify-ui/tooltip'
 import { Provider as JotaiProvider } from 'jotai/react'
 import { ThemeProvider } from 'next-themes'
 import { NuqsAdapter } from 'nuqs/adapters/next/app'
-import AmplitudeProvider from '@/app/components/base/amplitude'
+import { IS_PROD } from '@/config'
 import { TanstackQueryInitializer } from '@/context/query-client'
 import { getDatasetMap } from '@/env'
 import { getLocaleOnServer } from '@/i18n-config/server'
+import { headers } from '@/next/headers'
 import PartnerStackCookieRecorder from './components/billing/partner-stack/cookie-recorder'
 import CreateAppAttributionBootstrap from './components/create-app-attribution-bootstrap'
 import { AgentationLoader } from './components/devtools/agentation-loader'
@@ -32,6 +33,7 @@ const LocaleLayout = async ({
 }) => {
   const locale = await getLocaleOnServer()
   const datasetMap = getDatasetMap()
+  const nonce = IS_PROD ? (await headers()).get('x-nonce') ?? undefined : undefined
 
   return (
     <html lang={locale ?? 'en'} className="h-full" suppressHydrationWarning>
@@ -57,14 +59,13 @@ const LocaleLayout = async ({
         {...datasetMap}
       >
         <div className="isolate h-full">
-          <AmplitudeProvider />
           <JotaiProvider>
             <ThemeProvider
               attribute="data-theme"
               defaultTheme="system"
               enableSystem
               disableTransitionOnChange
-              enableColorScheme={false}
+              nonce={nonce}
             >
               <NuqsAdapter>
                 <TanstackQueryInitializer>
diff --git a/web/app/signin/check-code/page.tsx b/web/app/signin/check-code/page.tsx
index 42024c561b..c90f426fe2 100644
--- a/web/app/signin/check-code/page.tsx
+++ b/web/app/signin/check-code/page.tsx
@@ -13,6 +13,7 @@ import { useLocale } from '@/context/i18n'
 import { useRouter, useSearchParams } from '@/next/navigation'
 import { emailLoginWithCode, sendEMailLoginCode } from '@/service/common'
 import { encryptVerificationCode } from '@/utils/encryption'
+import { getBrowserTimezone } from '@/utils/timezone'
 import { resolvePostLoginRedirect } from '../utils/post-login-redirect'
 
 export default function CheckCode() {
@@ -39,7 +40,13 @@ export default function CheckCode() {
         return
       }
       setIsLoading(true)
-      const ret = await emailLoginWithCode({ email, code: encryptVerificationCode(code), token, language })
+      const ret = await emailLoginWithCode({
+        email,
+        code: encryptVerificationCode(code),
+        token,
+        language,
+        timezone: getBrowserTimezone(),
+      })
       if (ret.result === 'success') {
         // Track login success event
         trackEvent('user_login_success', {
diff --git a/web/app/signin/components/__tests__/social-auth.spec.tsx b/web/app/signin/components/__tests__/social-auth.spec.tsx
new file mode 100644
index 0000000000..bf1183f324
--- /dev/null
+++ b/web/app/signin/components/__tests__/social-auth.spec.tsx
@@ -0,0 +1,86 @@
+import { render, screen } from '@testing-library/react'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { useLocale } from '@/context/i18n'
+import { useSearchParams } from '@/next/navigation'
+import { getBrowserTimezone } from '@/utils/timezone'
+import SocialAuth from '../social-auth'
+
+vi.mock('@/next/navigation', () => ({
+  useSearchParams: vi.fn(),
+}))
+
+vi.mock('@/context/i18n', () => ({
+  useLocale: vi.fn(),
+}))
+
+vi.mock('@/utils/timezone', () => ({
+  getBrowserTimezone: vi.fn(),
+}))
+
+const mockUseSearchParams = vi.mocked(useSearchParams)
+const mockUseLocale = vi.mocked(useLocale)
+const mockGetBrowserTimezone = vi.mocked(getBrowserTimezone)
+
+describe('SocialAuth', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockUseSearchParams.mockReturnValue(new URLSearchParams() as unknown as ReturnType<typeof useSearchParams>)
+    mockUseLocale.mockReturnValue('zh-Hans')
+    mockGetBrowserTimezone.mockReturnValue('Asia/Shanghai')
+  })
+
+  describe('Rendering', () => {
+    it('should render oauth provider links', () => {
+      render(<SocialAuth />)
+
+      expect(screen.getByRole('link', { name: 'login.withGitHub' })).toBeInTheDocument()
+      expect(screen.getByRole('link', { name: 'login.withGoogle' })).toBeInTheDocument()
+    })
+  })
+
+  describe('OAuth params', () => {
+    it('should include browser timezone and locale in oauth links', () => {
+      render(<SocialAuth />)
+
+      expect(screen.getByRole('link', { name: 'login.withGitHub' })).toHaveAttribute(
+        'href',
+        expect.stringContaining('timezone=Asia%2FShanghai'),
+      )
+      expect(screen.getByRole('link', { name: 'login.withGitHub' })).toHaveAttribute(
+        'href',
+        expect.stringContaining('language=zh-Hans'),
+      )
+      expect(screen.getByRole('link', { name: 'login.withGoogle' })).toHaveAttribute(
+        'href',
+        expect.stringContaining('timezone=Asia%2FShanghai'),
+      )
+      expect(screen.getByRole('link', { name: 'login.withGoogle' })).toHaveAttribute(
+        'href',
+        expect.stringContaining('language=zh-Hans'),
+      )
+    })
+
+    it('should preserve invite token when adding timezone', () => {
+      mockUseSearchParams.mockReturnValue(
+        new URLSearchParams('invite_token=invite-123') as unknown as ReturnType<typeof useSearchParams>,
+      )
+
+      render(<SocialAuth />)
+
+      const githubLink = screen.getByRole('link', { name: 'login.withGitHub' })
+      expect(githubLink).toHaveAttribute('href', expect.stringContaining('invite_token=invite-123'))
+      expect(githubLink).toHaveAttribute('href', expect.stringContaining('timezone=Asia%2FShanghai'))
+      expect(githubLink).toHaveAttribute('href', expect.stringContaining('language=zh-Hans'))
+    })
+  })
+
+  describe('Edge Cases', () => {
+    it('should omit timezone when browser timezone is unavailable', () => {
+      mockGetBrowserTimezone.mockReturnValue(undefined)
+
+      render(<SocialAuth />)
+
+      expect(screen.getByRole('link', { name: 'login.withGitHub' }).getAttribute('href')).not.toContain('timezone=')
+    })
+  })
+})
diff --git a/web/app/signin/components/social-auth.tsx b/web/app/signin/components/social-auth.tsx
index 09fa528d1f..17455cebf4 100644
--- a/web/app/signin/components/social-auth.tsx
+++ b/web/app/signin/components/social-auth.tsx
@@ -2,8 +2,10 @@ import { Button } from '@langgenius/dify-ui/button'
 import { cn } from '@langgenius/dify-ui/cn'
 import { useTranslation } from 'react-i18next'
 import { API_PREFIX } from '@/config'
+import { useLocale } from '@/context/i18n'
 import { useSearchParams } from '@/next/navigation'
 import { getPurifyHref } from '@/utils'
+import { getBrowserTimezone } from '@/utils/timezone'
 import style from '../page.module.css'
 
 type SocialAuthProps = {
@@ -13,11 +15,19 @@ type SocialAuthProps = {
 export default function SocialAuth(props: SocialAuthProps) {
   const { t } = useTranslation()
   const searchParams = useSearchParams()
+  const locale = useLocale()
 
   const getOAuthLink = (href: string) => {
     const url = getPurifyHref(`${API_PREFIX}${href}`)
-    if (searchParams.has('invite_token'))
-      return `${url}?${searchParams.toString()}`
+    const params = new URLSearchParams(searchParams.toString())
+    const timezone = getBrowserTimezone()
+    if (timezone)
+      params.set('timezone', timezone)
+    params.set('language', locale)
+
+    const query = params.toString()
+    if (query)
+      return `${url}?${query}`
 
     return url
   }
diff --git a/web/app/signin/invite-settings/__tests__/page.spec.tsx b/web/app/signin/invite-settings/__tests__/page.spec.tsx
new file mode 100644
index 0000000000..12e6f4dfb7
--- /dev/null
+++ b/web/app/signin/invite-settings/__tests__/page.spec.tsx
@@ -0,0 +1,139 @@
+import type { MockedFunction } from 'vitest'
+import { fireEvent, render, screen, waitFor } from '@testing-library/react'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { useLocale } from '@/context/i18n'
+import { useRouter, useSearchParams } from '@/next/navigation'
+import { activateMember } from '@/service/common'
+import { useInvitationCheck } from '@/service/use-common'
+import { getBrowserTimezone } from '@/utils/timezone'
+import InviteSettingsPage from '../page'
+
+vi.mock('@tanstack/react-query', async () => {
+  const actual = await vi.importActual<typeof import('@tanstack/react-query')>('@tanstack/react-query')
+  return {
+    ...actual,
+    useSuspenseQuery: vi.fn(() => ({
+      data: {
+        branding: {
+          enabled: true,
+        },
+      },
+    })),
+  }
+})
+
+vi.mock('@/context/i18n', () => ({
+  useLocale: vi.fn(),
+}))
+
+vi.mock('@/i18n-config', () => ({
+  i18n: {
+    defaultLocale: 'en-US',
+  },
+  setLocaleOnClient: vi.fn(() => Promise.resolve()),
+}))
+
+vi.mock('@/next/navigation', () => ({
+  useRouter: vi.fn(),
+  useSearchParams: vi.fn(),
+}))
+
+vi.mock('@/service/common', () => ({
+  activateMember: vi.fn(),
+}))
+
+vi.mock('@/service/use-common', () => ({
+  useInvitationCheck: vi.fn(),
+}))
+
+vi.mock('@/utils/timezone', () => ({
+  getBrowserTimezone: vi.fn(),
+  timezones: [
+    { value: 'Asia/Shanghai', name: 'Asia/Shanghai' },
+    { value: 'America/Los_Angeles', name: 'America/Los_Angeles' },
+  ],
+}))
+
+vi.mock('../utils/post-login-redirect', () => ({
+  resolvePostLoginRedirect: vi.fn(() => null),
+}))
+
+const mockReplace = vi.fn()
+const mockRefetch = vi.fn()
+
+const mockUseLocale = useLocale as unknown as MockedFunction<typeof useLocale>
+const mockUseRouter = useRouter as unknown as MockedFunction<typeof useRouter>
+const mockUseSearchParams = useSearchParams as unknown as MockedFunction<typeof useSearchParams>
+const mockActivateMember = activateMember as unknown as MockedFunction<typeof activateMember>
+const mockUseInvitationCheck = useInvitationCheck as unknown as MockedFunction<typeof useInvitationCheck>
+const mockGetBrowserTimezone = getBrowserTimezone as unknown as MockedFunction<typeof getBrowserTimezone>
+
+describe('InviteSettingsPage', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockUseLocale.mockReturnValue('zh-Hans')
+    mockUseRouter.mockReturnValue({ replace: mockReplace } as unknown as ReturnType<typeof useRouter>)
+    mockUseSearchParams.mockReturnValue(
+      new URLSearchParams('invite_token=invite-token') as unknown as ReturnType<typeof useSearchParams>,
+    )
+    mockUseInvitationCheck.mockReturnValue({
+      data: {
+        is_valid: true,
+        data: {
+          workspace_name: 'Acme',
+          workspace_id: 'workspace-id',
+          email: 'invitee@example.com',
+        },
+      },
+      refetch: mockRefetch,
+    } as unknown as ReturnType<typeof useInvitationCheck>)
+    mockGetBrowserTimezone.mockReturnValue('Asia/Shanghai')
+    mockActivateMember.mockResolvedValue({ result: 'success' })
+  })
+
+  describe('Activation payload', () => {
+    it('should default language to the current UI locale', async () => {
+      render(<InviteSettingsPage />)
+
+      fireEvent.change(screen.getByLabelText('login.name'), {
+        target: { value: 'Invitee' },
+      })
+      fireEvent.click(screen.getByRole('button', { name: 'login.join Acme' }))
+
+      await waitFor(() => {
+        expect(mockActivateMember).toHaveBeenCalledWith({
+          url: '/activate',
+          body: {
+            token: 'invite-token',
+            name: 'Invitee',
+            interface_language: 'zh-Hans',
+            timezone: 'Asia/Shanghai',
+          },
+        })
+      })
+    })
+
+    it('should fall back to configured default locale when current locale is unsupported', async () => {
+      mockUseLocale.mockReturnValue('unsupported-locale' as ReturnType<typeof useLocale>)
+
+      render(<InviteSettingsPage />)
+
+      fireEvent.change(screen.getByLabelText('login.name'), {
+        target: { value: 'Invitee' },
+      })
+      fireEvent.click(screen.getByRole('button', { name: 'login.join Acme' }))
+
+      await waitFor(() => {
+        expect(mockActivateMember).toHaveBeenCalledWith({
+          url: '/activate',
+          body: {
+            token: 'invite-token',
+            name: 'Invitee',
+            interface_language: 'en-US',
+            timezone: 'Asia/Shanghai',
+          },
+        })
+      })
+    })
+  })
+})
diff --git a/web/app/signin/invite-settings/page.tsx b/web/app/signin/invite-settings/page.tsx
index 43ca96ab05..ddde11b940 100644
--- a/web/app/signin/invite-settings/page.tsx
+++ b/web/app/signin/invite-settings/page.tsx
@@ -11,33 +11,70 @@ import { useTranslation } from 'react-i18next'
 import Input from '@/app/components/base/input'
 import Loading from '@/app/components/base/loading'
 import { LICENSE_LINK } from '@/constants/link'
-import { setLocaleOnClient } from '@/i18n-config'
-import { languages, LanguagesSupported } from '@/i18n-config/language'
+import { useLocale } from '@/context/i18n'
+import { i18n, setLocaleOnClient } from '@/i18n-config'
+import { languages } from '@/i18n-config/language'
 import Link from '@/next/link'
 import { useRouter, useSearchParams } from '@/next/navigation'
 import { activateMember } from '@/service/common'
 import { systemFeaturesQueryOptions } from '@/service/system-features'
 import { useInvitationCheck } from '@/service/use-common'
-import { timezones } from '@/utils/timezone'
+import { getBrowserTimezone, timezones } from '@/utils/timezone'
 import { resolvePostLoginRedirect } from '../utils/post-login-redirect'
 
-type SelectOption = {
+type LanguageSelectOption = {
+  value: Locale
+  name: string
+}
+
+type TimezoneSelectOption = {
   value: string
   name: string
 }
 
+const LANGUAGE_OPTIONS: LanguageSelectOption[] = languages
+  .filter(item => item.supported)
+  .map(item => ({
+    value: item.value,
+    name: item.name,
+  }))
+
+const TIMEZONE_OPTIONS: TimezoneSelectOption[] = timezones.map(item => ({
+  value: String(item.value),
+  name: item.name,
+}))
+
+const getInitialLanguage = (locale: Locale): Locale => {
+  if (LANGUAGE_OPTIONS.some(item => item.value === locale))
+    return locale
+
+  return i18n.defaultLocale
+}
+
 export default function InviteSettingsPage() {
   const { t } = useTranslation()
   const { data: systemFeatures } = useSuspenseQuery(systemFeaturesQueryOptions())
   const router = useRouter()
   const searchParams = useSearchParams()
   const token = decodeURIComponent(searchParams.get('invite_token') as string)
+  const locale = useLocale()
   const [name, setName] = useState('')
-  const [language, setLanguage] = useState(LanguagesSupported[0])
-  const [timezone, setTimezone] = useState(() => Intl.DateTimeFormat().resolvedOptions().timeZone || 'America/Los_Angeles')
-  const languageOptions: SelectOption[] = languages.filter(item => item.supported)
-  const selectedLanguage = languageOptions.find(item => item.value === language)
-  const selectedTimezone = timezones.find(item => item.value === timezone)
+  const [language, setLanguage] = useState(() => getInitialLanguage(locale))
+  const [timezone, setTimezone] = useState(() => getBrowserTimezone() || 'America/Los_Angeles')
+  const selectedLanguage = LANGUAGE_OPTIONS.find(item => item.value === language)
+  const selectedTimezone = TIMEZONE_OPTIONS.find(item => item.value === timezone)
+
+  const handleLanguageChange = (nextValue: string | null) => {
+    const nextLanguage = LANGUAGE_OPTIONS.find(item => item.value === nextValue)
+    if (nextLanguage)
+      setLanguage(nextLanguage.value)
+  }
+
+  const handleTimezoneChange = (nextValue: string | null) => {
+    const nextTimezone = TIMEZONE_OPTIONS.find(item => item.value === nextValue)
+    if (nextTimezone)
+      setTimezone(nextTimezone.value)
+  }
 
   const checkParams = {
     url: '/activate/check',
@@ -123,23 +160,19 @@ export default function InviteSettingsPage() {
           </div>
         </div>
         <div className="mb-5">
-          <label htmlFor="name" className="my-2 system-md-semibold text-text-secondary">
+          <label htmlFor="interface_language" className="my-2 system-md-semibold text-text-secondary">
             {t('interfaceLanguage', { ns: 'login' })}
           </label>
           <div className="mt-1">
             <Select
               value={selectedLanguage?.value ?? null}
-              onValueChange={(nextValue) => {
-                if (!nextValue)
-                  return
-                setLanguage(nextValue as Locale)
-              }}
+              onValueChange={handleLanguageChange}
             >
-              <SelectTrigger size="large">
+              <SelectTrigger id="interface_language" size="large">
                 {selectedLanguage?.name ?? t('placeholder.select', { ns: 'common' })}
               </SelectTrigger>
-              <SelectContent popupClassName="w-(--anchor-width)">
-                {languageOptions.map(item => (
+              <SelectContent>
+                {LANGUAGE_OPTIONS.map(item => (
                   <SelectItem key={item.value} value={item.value}>
                     <SelectItemText>{item.name}</SelectItemText>
                     <SelectItemIndicator />
@@ -156,19 +189,15 @@ export default function InviteSettingsPage() {
           </label>
           <div className="mt-1">
             <Select
-              value={selectedTimezone ? String(selectedTimezone.value) : null}
-              onValueChange={(nextValue) => {
-                if (!nextValue)
-                  return
-                setTimezone(nextValue as string)
-              }}
+              value={selectedTimezone?.value ?? null}
+              onValueChange={handleTimezoneChange}
             >
-              <SelectTrigger size="large">
+              <SelectTrigger id="timezone" size="large">
                 {selectedTimezone?.name ?? t('placeholder.select', { ns: 'common' })}
               </SelectTrigger>
               <SelectContent>
-                {timezones.map(item => (
-                  <SelectItem key={item.value} value={String(item.value)}>
+                {TIMEZONE_OPTIONS.map(item => (
+                  <SelectItem key={item.value} value={item.value}>
                     <SelectItemText>{item.name}</SelectItemText>
                     <SelectItemIndicator />
                   </SelectItem>
diff --git a/web/app/signin/one-more-step.tsx b/web/app/signin/one-more-step.tsx
index 47982e87a5..bb86a8675d 100644
--- a/web/app/signin/one-more-step.tsx
+++ b/web/app/signin/one-more-step.tsx
@@ -1,6 +1,5 @@
 'use client'
 import type { Reducer } from 'react'
-import type { LanguagesSupported } from '@/i18n-config/language'
 import { Button } from '@langgenius/dify-ui/button'
 import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
 import { Select, SelectContent, SelectItem, SelectItemIndicator, SelectItemText, SelectTrigger } from '@langgenius/dify-ui/select'
@@ -51,6 +50,19 @@ type SelectOption = {
   name: string
 }
 
+const LANGUAGE_OPTIONS: SelectOption[] = languages.filter(item => item.supported)
+const TIMEZONE_OPTIONS: SelectOption[] = timezones.map(item => ({
+  value: String(item.value),
+  name: item.name,
+}))
+
+const hasStatus = (error: unknown): error is { status: number } => {
+  return typeof error === 'object'
+    && error !== null
+    && 'status' in error
+    && typeof error.status === 'number'
+}
+
 const OneMoreStep = () => {
   const { t } = useTranslation()
   const router = useRouter()
@@ -62,9 +74,20 @@ const OneMoreStep = () => {
     timezone: 'Asia/Shanghai',
   })
   const { mutateAsync: submitOneMoreStep, isPending } = useOneMoreStep()
-  const languageOptions: SelectOption[] = languages.filter(item => item.supported)
-  const selectedLanguage = languageOptions.find(item => item.value === state.interface_language)
-  const selectedTimezone = timezones.find(item => item.value === state.timezone)
+  const selectedLanguage = LANGUAGE_OPTIONS.find(item => item.value === state.interface_language)
+  const selectedTimezone = TIMEZONE_OPTIONS.find(item => item.value === state.timezone)
+
+  const handleLanguageChange = (nextValue: string | null) => {
+    const nextLanguage = LANGUAGE_OPTIONS.find(item => item.value === nextValue)
+    if (nextLanguage)
+      dispatch({ type: 'interface_language', value: nextLanguage.value })
+  }
+
+  const handleTimezoneChange = (nextValue: string | null) => {
+    const nextTimezone = TIMEZONE_OPTIONS.find(item => item.value === nextValue)
+    if (nextTimezone)
+      dispatch({ type: 'timezone', value: nextTimezone.value })
+  }
 
   const handleSubmit = async () => {
     if (isPending)
@@ -77,8 +100,8 @@ const OneMoreStep = () => {
       })
       router.push('/apps')
     }
-    catch (error: any) {
-      if (error && error.status === 400)
+    catch (error: unknown) {
+      if (hasStatus(error) && error.status === 400)
         toast.error(t('invalidInvitationCode', { ns: 'login' }))
       dispatch({ type: 'failed', payload: null })
     }
@@ -136,23 +159,19 @@ const OneMoreStep = () => {
             </div>
           </div>
           <div className="mb-5">
-            <label htmlFor="name" className="my-2 system-md-semibold text-text-secondary">
+            <label htmlFor="interface_language" className="my-2 system-md-semibold text-text-secondary">
               {t('interfaceLanguage', { ns: 'login' })}
             </label>
             <div className="mt-1">
               <Select
                 value={selectedLanguage?.value ?? null}
-                onValueChange={(nextValue) => {
-                  if (!nextValue)
-                    return
-                  dispatch({ type: 'interface_language', value: nextValue as typeof LanguagesSupported[number] })
-                }}
+                onValueChange={handleLanguageChange}
               >
-                <SelectTrigger size="large">
+                <SelectTrigger id="interface_language" size="large">
                   {selectedLanguage?.name ?? t('placeholder.select', { ns: 'common' })}
                 </SelectTrigger>
-                <SelectContent popupClassName="w-(--anchor-width)">
-                  {languageOptions.map(item => (
+                <SelectContent>
+                  {LANGUAGE_OPTIONS.map(item => (
                     <SelectItem key={item.value} value={item.value}>
                       <SelectItemText>{item.name}</SelectItemText>
                       <SelectItemIndicator />
@@ -168,19 +187,15 @@ const OneMoreStep = () => {
             </label>
             <div className="mt-1">
               <Select
-                value={selectedTimezone ? String(selectedTimezone.value) : null}
-                onValueChange={(nextValue) => {
-                  if (!nextValue)
-                    return
-                  dispatch({ type: 'timezone', value: nextValue as typeof state.timezone })
-                }}
+                value={selectedTimezone?.value ?? null}
+                onValueChange={handleTimezoneChange}
               >
-                <SelectTrigger size="large">
+                <SelectTrigger id="timezone" size="large">
                   {selectedTimezone?.name ?? t('placeholder.select', { ns: 'common' })}
                 </SelectTrigger>
-                <SelectContent popupClassName="w-(--anchor-width)">
-                  {timezones.map(item => (
-                    <SelectItem key={item.value} value={String(item.value)}>
+                <SelectContent>
+                  {TIMEZONE_OPTIONS.map(item => (
+                    <SelectItem key={item.value} value={item.value}>
                       <SelectItemText>{item.name}</SelectItemText>
                       <SelectItemIndicator />
                     </SelectItem>
diff --git a/web/app/signup/set-password/__tests__/page.spec.tsx b/web/app/signup/set-password/__tests__/page.spec.tsx
new file mode 100644
index 0000000000..e68694db15
--- /dev/null
+++ b/web/app/signup/set-password/__tests__/page.spec.tsx
@@ -0,0 +1,85 @@
+import type { MockedFunction } from 'vitest'
+import { fireEvent, render, screen, waitFor } from '@testing-library/react'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { useLocale } from '@/context/i18n'
+import { useRouter, useSearchParams } from '@/next/navigation'
+import { useMailRegister } from '@/service/use-common'
+import { getBrowserTimezone } from '@/utils/timezone'
+import ChangePasswordForm from '../page'
+
+vi.mock('@/context/i18n', () => ({
+  useLocale: vi.fn(),
+}))
+
+vi.mock('@/next/navigation', () => ({
+  useRouter: vi.fn(),
+  useSearchParams: vi.fn(),
+}))
+
+vi.mock('@/service/use-common', () => ({
+  useMailRegister: vi.fn(),
+}))
+
+vi.mock('@/utils/timezone', () => ({
+  getBrowserTimezone: vi.fn(),
+}))
+
+vi.mock('@/utils/gtag', () => ({
+  sendGAEvent: vi.fn(),
+}))
+
+vi.mock('@/app/components/base/amplitude', () => ({
+  trackEvent: vi.fn(),
+}))
+
+vi.mock('@/utils/create-app-tracking', () => ({
+  rememberCreateAppExternalAttribution: vi.fn(),
+}))
+
+const mockRegister = vi.fn()
+const mockReplace = vi.fn()
+
+const mockUseLocale = useLocale as unknown as MockedFunction<typeof useLocale>
+const mockUseSearchParams = useSearchParams as unknown as MockedFunction<typeof useSearchParams>
+const mockUseRouter = useRouter as unknown as MockedFunction<typeof useRouter>
+const mockUseMailRegister = useMailRegister as unknown as MockedFunction<typeof useMailRegister>
+const mockGetBrowserTimezone = getBrowserTimezone as unknown as MockedFunction<typeof getBrowserTimezone>
+
+describe('Signup Set Password Page', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockUseLocale.mockReturnValue('zh-Hans')
+    mockUseSearchParams.mockReturnValue(new URLSearchParams('token=register-token') as unknown as ReturnType<typeof useSearchParams>)
+    mockUseRouter.mockReturnValue({ replace: mockReplace } as unknown as ReturnType<typeof useRouter>)
+    mockUseMailRegister.mockReturnValue({
+      mutateAsync: mockRegister,
+      isPending: false,
+    } as unknown as ReturnType<typeof useMailRegister>)
+    mockGetBrowserTimezone.mockReturnValue('Asia/Shanghai')
+    mockRegister.mockResolvedValue({ result: 'fail', data: {} })
+  })
+
+  describe('Registration payload', () => {
+    it('should submit locale and browser timezone when setting password', async () => {
+      render(<ChangePasswordForm />)
+
+      fireEvent.change(screen.getByLabelText('common.account.newPassword'), {
+        target: { value: 'ValidPass123!' },
+      })
+      fireEvent.change(screen.getByLabelText('common.account.confirmPassword'), {
+        target: { value: 'ValidPass123!' },
+      })
+      fireEvent.click(screen.getByRole('button', { name: 'login.changePasswordBtn' }))
+
+      await waitFor(() => {
+        expect(mockRegister).toHaveBeenCalledWith({
+          token: 'register-token',
+          new_password: 'ValidPass123!',
+          password_confirm: 'ValidPass123!',
+          language: 'zh-Hans',
+          timezone: 'Asia/Shanghai',
+        })
+      })
+    })
+  })
+})
diff --git a/web/app/signup/set-password/page.tsx b/web/app/signup/set-password/page.tsx
index a8eb883078..534b6b55d4 100644
--- a/web/app/signup/set-password/page.tsx
+++ b/web/app/signup/set-password/page.tsx
@@ -9,10 +9,12 @@ import { useTranslation } from 'react-i18next'
 import { trackEvent } from '@/app/components/base/amplitude'
 import Input from '@/app/components/base/input'
 import { validPassword } from '@/config'
+import { useLocale } from '@/context/i18n'
 import { useRouter, useSearchParams } from '@/next/navigation'
 import { useMailRegister } from '@/service/use-common'
 import { rememberCreateAppExternalAttribution } from '@/utils/create-app-tracking'
 import { sendGAEvent } from '@/utils/gtag'
+import { getBrowserTimezone } from '@/utils/timezone'
 
 const parseUtmInfo = () => {
   const utmInfoStr = Cookies.get('utm_info')
@@ -32,6 +34,7 @@ const ChangePasswordForm = () => {
   const router = useRouter()
   const searchParams = useSearchParams()
   const token = decodeURIComponent(searchParams.get('token') || '')
+  const locale = useLocale()
 
   const [password, setPassword] = useState('')
   const [confirmPassword, setConfirmPassword] = useState('')
@@ -65,6 +68,8 @@ const ChangePasswordForm = () => {
         token,
         new_password: password,
         password_confirm: confirmPassword,
+        language: locale,
+        timezone: getBrowserTimezone(),
       })
       const { result } = res as MailRegisterResponse
       if (result === 'success') {
@@ -88,7 +93,7 @@ const ChangePasswordForm = () => {
     catch (error) {
       console.error(error)
     }
-  }, [password, token, valid, confirmPassword, register])
+  }, [password, token, valid, confirmPassword, register, locale])
 
   return (
     <div className={
diff --git a/web/app/styles/globals.css b/web/app/styles/globals.css
index 17a44fd1f0..9cb7d3a459 100644
--- a/web/app/styles/globals.css
+++ b/web/app/styles/globals.css
@@ -1,79 +1,12 @@
-@import './preflight.css' layer(base);
+@import './tailwind-core.css';
 
-@import '@langgenius/dify-ui/styles.css';
-@import '../../themes/manual-light.css' layer(base);
-@import '../../themes/manual-dark.css' layer(base);
-@import './monaco-sticky-fix.css' layer(base);
-
-@import '../components/base/action-button/index.css';
-@import '../components/base/badge/index.css';
-@import '../components/base/premium-badge/index.css';
-@import '../components/base/segmented-control/index.css';
-
-@import 'tailwindcss';
-
-@config '../../tailwind.config.ts';
-
-/*
-  The default border color has changed to `currentcolor` in Tailwind CSS v4,
-  so we've added these compatibility styles to make sure everything still
-  looks the same as it did with Tailwind CSS v3.
-
-  If we ever want to remove these styles, we need to add an explicit border
-  color utility to any element that depends on these defaults.
-*/
-@layer base {
-  *,
-  ::after,
-  ::before,
-  ::backdrop,
-  ::file-selector-button {
-    border-color: var(--color-gray-200, currentcolor);
-  }
-}
-
-@layer components {
-  html {
-    color-scheme: light;
-  }
-
-  html[data-theme='dark'] {
-    color-scheme: dark;
-  }
-
-  html[data-changing-theme] * {
-    transition: none !important;
-  }
-
-  [class*='code-'] {
-    @apply font-mono;
-  }
-
-  .text-gradient {
-    background: linear-gradient(91.58deg, #2250f2 -29.55%, #0ebcf3 75.22%);
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
-    background-clip: text;
-    text-fill-color: transparent;
-  }
-
-  [data-theme='dark'] [data-hide-on-theme='dark'],
-  [data-theme='light'] [data-hide-on-theme='light'] {
-    display: none;
-  }
-
-  /* Shiki code block line numbers */
-  .shiki-line-numbers code {
-    counter-reset: line;
-  }
-  .shiki-line-numbers .line::before {
-    counter-increment: line;
-    content: counter(line);
-    display: inline-block;
-    width: 1rem;
-    margin-right: 0.75rem;
-    text-align: right;
-    color: var(--color-text-quaternary);
-    user-select: none;
-  }
-}
+@source '../../app';
+@source '../../context';
+@source '../../hooks';
+@source '../../../packages/dify-ui/src';
+@source '../../node_modules/streamdown/dist';
+@source '../../node_modules/@streamdown/math/dist';
+@source not '../../**/*.{spec,test}.{js,ts,jsx,tsx}';
+@source not '../../**/*.stories.{js,ts,jsx,tsx}';
+@source not '../../../packages/dify-ui/src/**/*.{spec,test}.{ts,tsx}';
+@source not '../../../packages/dify-ui/src/**/*.stories.{ts,tsx}';
diff --git a/web/app/styles/monaco-sticky-fix.css b/web/app/styles/monaco-sticky-fix.css
index ac928cf246..982c62eacd 100644
--- a/web/app/styles/monaco-sticky-fix.css
+++ b/web/app/styles/monaco-sticky-fix.css
@@ -1,15 +1,13 @@
-/* Ensures Monaco sticky header and other sticky headers remain visible in dark mode */
 html[data-theme="dark"] .monaco-editor .sticky-widget {
-  background-color: var(--color-components-sticky-header-bg) !important;
-  border-bottom: 1px solid var(--color-components-sticky-header-border) !important;
+  background-color: var(--color-monaco-sticky-header-bg) !important;
+  border-bottom: 1px solid var(--color-monaco-sticky-header-border) !important;
   box-shadow: var(--vscode-editorStickyScroll-shadow) 0 4px 2px -2px !important;
 }
 
 html[data-theme="dark"] .monaco-editor .sticky-line-content:hover {
-  background-color: var(--color-components-sticky-header-bg-hover) !important;
+  background-color: var(--color-monaco-sticky-header-bg-hover) !important;
 }
 
-/* Monaco editor specific sticky scroll styles in dark mode */
 html[data-theme="dark"] .monaco-editor .sticky-line-root {
-  background-color: var(--color-components-sticky-header-bg) !important;
-}
\ No newline at end of file
+  background-color: var(--color-monaco-sticky-header-bg) !important;
+}
diff --git a/web/app/styles/plugins/icons.ts b/web/app/styles/plugins/icons.ts
new file mode 100644
index 0000000000..1e73c28bf0
--- /dev/null
+++ b/web/app/styles/plugins/icons.ts
@@ -0,0 +1,21 @@
+/*
+ * Pre-bound icons plugin used by `web/`. Combines Iconify's heroicons and
+ * remix icon packs with the project's custom public and vendor sprites.
+ * Wired into Tailwind v4 via `@plugin './plugins/icons.ts';` in tailwind-core.css.
+ */
+import { icons as customPublicIcons } from '@dify/iconify-collections/custom-public'
+import { icons as customVenderIcons } from '@dify/iconify-collections/custom-vender'
+import { getIconCollections, iconsPlugin } from '@egoist/tailwindcss-icons'
+
+export default iconsPlugin({
+  collections: {
+    ...getIconCollections(['heroicons', 'ri']),
+    'custom-public': customPublicIcons,
+    'custom-vender': customVenderIcons,
+  },
+  extraProperties: {
+    width: '1rem',
+    height: '1rem',
+    display: 'block',
+  },
+})
diff --git a/web/typography.js b/web/app/styles/plugins/typography-config.js
similarity index 100%
rename from web/typography.js
rename to web/app/styles/plugins/typography-config.js
diff --git a/web/app/styles/plugins/typography.ts b/web/app/styles/plugins/typography.ts
new file mode 100644
index 0000000000..9ebb015c99
--- /dev/null
+++ b/web/app/styles/plugins/typography.ts
@@ -0,0 +1,17 @@
+/*
+ * `@tailwindcss/typography` configured with Dify's prose color tokens.
+ * Injects `theme.typography` for v4 CSS-first via plugin `config` merge.
+ */
+import typographyPlugin from '@tailwindcss/typography'
+import typographyConfig from './typography-config.js'
+
+const created = typographyPlugin()
+
+export default {
+  handler: created.handler,
+  config: {
+    theme: {
+      typography: typographyConfig,
+    },
+  },
+}
diff --git a/web/app/styles/tailwind-core.css b/web/app/styles/tailwind-core.css
new file mode 100644
index 0000000000..614a46652b
--- /dev/null
+++ b/web/app/styles/tailwind-core.css
@@ -0,0 +1,127 @@
+/*
+ * Tailwind CSS v4 shared core for `web/`. CSS-first: no tailwind.config.ts.
+ *
+ * Layers, JS plugins, project-only design tokens, and app-level CSS are
+ * declared here. Environment-specific entry files declare source scanning.
+ */
+
+@layer theme, base, components, utilities;
+
+/* Tailwind core — selective layer imports skip preflight; we ship our own
+ * (see ./preflight.css) so cross-app baseline stays controlled. */
+@import 'tailwindcss/theme.css' layer(theme);
+@import 'tailwindcss/utilities.css' layer(utilities);
+
+/* Local preflight keeps the browser baseline controlled across app entries. */
+@import './preflight.css' layer(base);
+
+/* Design system: palette overrides, semantic tokens, light/dark themes,
+ * project utilities and components. */
+@import '@langgenius/dify-ui/styles.css';
+
+/* Project-only runtime CSS variables (gradients and special masks). */
+@import '../../themes/manual-light.css' layer(base);
+@import '../../themes/manual-dark.css' layer(base);
+@import './monaco-sticky-fix.css' layer(base);
+
+/* Component CSS using @apply / @utility. */
+@import '../components/base/action-button/index.css';
+@import '../components/base/badge/index.css';
+@import '../components/base/premium-badge/index.css';
+
+/* ---------- JS plugins ------------------------------------------------ */
+@plugin './plugins/icons.ts';
+@plugin './plugins/typography.ts';
+
+/* ---------- Project-only theme tokens --------------------------------- */
+@theme {
+  /* Additional breakpoints layered on top of v4 defaults. */
+  --breakpoint-mobile: 100px;
+  --breakpoint-tablet: 640px;
+  --breakpoint-pc: 769px;
+  --breakpoint-2k: 2560px;
+
+  /* Custom animations. */
+  --animate-spin-slow: spin 2s linear infinite;
+}
+
+/* Background-image / gradient utilities. Values resolve at runtime from
+ * manual-light.css / manual-dark.css. Using @theme inline so the variable
+ * indirection survives without re-declaring values at :root. */
+@theme inline {
+  /* Flat color (used as `bg-background-gradient-bg-fill-chat-bubble-bg-3`). */
+  --color-background-gradient-bg-fill-chat-bubble-bg-3: var(--color-background-gradient-bg-fill-chat-bubble-bg-3);
+
+  /* Gradients — registered under v4's --background-image-* namespace. */
+  --background-image-chatbot-bg: var(--color-chatbot-bg);
+  --background-image-chat-bubble-bg: var(--color-chat-bubble-bg);
+  --background-image-chat-input-mask: var(--color-chat-input-mask);
+  --background-image-workflow-process-bg: var(--color-workflow-process-bg);
+  --background-image-workflow-process-paused-bg: var(--color-workflow-process-paused-bg);
+  --background-image-workflow-run-failed-bg: var(--color-workflow-run-failed-bg);
+  --background-image-workflow-batch-failed-bg: var(--color-workflow-batch-failed-bg);
+  --background-image-mask-top2bottom-gray-50-to-transparent: var(--mask-top2bottom-gray-50-to-transparent);
+  --background-image-marketplace-divider-bg: var(--color-marketplace-divider-bg);
+  --background-image-marketplace-plugin-empty: var(--color-marketplace-plugin-empty);
+  --background-image-toast-success-bg: var(--color-toast-success-bg);
+  --background-image-toast-warning-bg: var(--color-toast-warning-bg);
+  --background-image-toast-error-bg: var(--color-toast-error-bg);
+  --background-image-toast-info-bg: var(--color-toast-info-bg);
+  --background-image-app-detail-bg: var(--color-app-detail-bg);
+  --background-image-app-detail-overlay-bg: var(--color-app-detail-overlay-bg);
+  --background-image-dataset-chunk-process-success-bg: var(--color-dataset-chunk-process-success-bg);
+  --background-image-dataset-chunk-process-error-bg: var(--color-dataset-chunk-process-error-bg);
+  --background-image-dataset-chunk-detail-card-hover-bg: var(--color-dataset-chunk-detail-card-hover-bg);
+  --background-image-dataset-child-chunk-expand-btn-bg: var(--color-dataset-child-chunk-expand-btn-bg);
+  --background-image-dataset-option-card-blue-gradient: var(--color-dataset-option-card-blue-gradient);
+  --background-image-dataset-option-card-purple-gradient: var(--color-dataset-option-card-purple-gradient);
+  --background-image-dataset-option-card-orange-gradient: var(--color-dataset-option-card-orange-gradient);
+  --background-image-dataset-chunk-list-mask-bg: var(--color-dataset-chunk-list-mask-bg);
+  --background-image-line-divider-bg: var(--color-line-divider-bg);
+  --background-image-dataset-warning-message-bg: var(--color-dataset-warning-message-bg);
+  --background-image-price-premium-badge-background: var(--color-premium-badge-background);
+  --background-image-premium-yearly-tip-text-background: var(--color-premium-yearly-tip-text-background);
+  --background-image-price-premium-text-background: var(--color-premium-text-background);
+  --background-image-price-enterprise-background: var(--color-price-enterprise-background);
+  --background-image-grid-mask-background: var(--color-grid-mask-background);
+  --background-image-node-data-source-bg: var(--color-node-data-source-bg);
+  --background-image-tag-selector-mask-bg: var(--color-tag-selector-mask-bg);
+  --background-image-tag-selector-mask-hover-bg: var(--color-tag-selector-mask-hover-bg);
+  --background-image-pipeline-template-card-hover-bg: var(--color-pipeline-template-card-hover-bg);
+  --background-image-pipeline-add-documents-title-bg: var(--color-pipeline-add-documents-title-bg);
+  --background-image-billing-plan-title-bg: var(--color-billing-plan-title-bg);
+  --background-image-billing-plan-card-premium-bg: var(--color-billing-plan-card-premium-bg);
+  --background-image-billing-plan-card-enterprise-bg: var(--color-billing-plan-card-enterprise-bg);
+  --background-image-knowledge-pipeline-creation-footer-bg: var(--color-knowledge-pipeline-creation-footer-bg);
+  --background-image-progress-bar-indeterminate-stripe: var(--color-progress-bar-indeterminate-stripe);
+  --background-image-chat-answer-human-input-form-divider-bg: var(--color-chat-answer-human-input-form-divider-bg);
+}
+
+/* ---------- App-level component CSS ----------------------------------- */
+@layer components {
+  [class*='code-'] {
+    @apply font-mono;
+  }
+
+  .text-gradient {
+    background: linear-gradient(91.58deg, #2250f2 -29.55%, #0ebcf3 75.22%);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+    background-clip: text;
+  }
+
+  /* Shiki code block line numbers */
+  .shiki-line-numbers code {
+    counter-reset: line;
+  }
+  .shiki-line-numbers .line::before {
+    counter-increment: line;
+    content: counter(line);
+    display: inline-block;
+    width: 1rem;
+    margin-right: 0.75rem;
+    text-align: right;
+    color: var(--color-text-quaternary);
+    user-select: none;
+  }
+}
diff --git a/web/context/i18n.spec.ts b/web/context/i18n.spec.ts
index 9ebbda825e..83e510f040 100644
--- a/web/context/i18n.spec.ts
+++ b/web/context/i18n.spec.ts
@@ -1,7 +1,7 @@
 import type { DocPathMap } from './i18n'
 import type { DocPathWithoutLang } from '@/types/doc-paths'
-import { useTranslation } from '#i18n'
 import { renderHook } from '@testing-library/react'
+import { useTranslation } from '#i18n'
 import { getDocLanguage } from '@/i18n-config/language'
 import { defaultDocBaseUrl, useDocLink } from './i18n'
 
diff --git a/web/context/i18n.ts b/web/context/i18n.ts
index f371c1129b..ac11f44f32 100644
--- a/web/context/i18n.ts
+++ b/web/context/i18n.ts
@@ -1,7 +1,7 @@
 import type { Locale } from '@/i18n-config/language'
 import type { DocPathWithoutLang } from '@/types/doc-paths'
-import { useTranslation } from '#i18n'
 import { useCallback } from 'react'
+import { useTranslation } from '#i18n'
 import { getDocLanguage, getLanguage, getPricingPageLanguage } from '@/i18n-config/language'
 import { apiReferencePathTranslations } from '@/types/doc-paths'
 
diff --git a/web/context/modal-context-provider.tsx b/web/context/modal-context-provider.tsx
index c51d422aad..b424a22bf4 100644
--- a/web/context/modal-context-provider.tsx
+++ b/web/context/modal-context-provider.tsx
@@ -9,7 +9,7 @@ import type { ModelLoadBalancingModalProps } from '@/app/components/header/accou
 import type { UpdatePluginPayload } from '@/app/components/plugins/types'
 import type { InputVar } from '@/app/components/workflow/types'
 import type { ExpireNoticeModalPayloadProps } from '@/app/education-apply/expire-notice-modal'
-import type { ApiBasedExtension, ExternalDataTool } from '@/models/common'
+import type { ExternalDataTool } from '@/models/common'
 import type { ModerationConfig, PromptVariable } from '@/models/debug'
 import { useCallback, useEffect, useRef, useState } from 'react'
 import {
@@ -35,9 +35,6 @@ import {
 const AccountSetting = dynamic(() => import('@/app/components/header/account-setting'), {
   ssr: false,
 })
-const ApiBasedExtensionModal = dynamic(() => import('@/app/components/header/account-setting/api-based-extension-page/modal'), {
-  ssr: false,
-})
 const ModerationSettingModal = dynamic(() => import('@/app/components/base/features/new-feature-panel/moderation/moderation-setting-modal'), {
   ssr: false,
 })
@@ -89,7 +86,6 @@ export const ModalContextProvider = ({
         ? urlAccountModalState.payload
         : DEFAULT_ACCOUNT_SETTING_TAB)
     : null
-  const [showApiBasedExtensionModal, setShowApiBasedExtensionModal] = useState<ModalState<ApiBasedExtension> | null>(null)
   const [showModerationSettingModal, setShowModerationSettingModal] = useState<ModalState<ModerationConfig> | null>(null)
   const [showExternalDataToolModal, setShowExternalDataToolModal] = useState<ModalState<ExternalDataTool> | null>(null)
   const [showModelModal, setShowModelModal] = useState<ModalState<ModelModalType> | null>(null)
@@ -205,12 +201,6 @@ export const ModalContextProvider = ({
       showOpeningModal.onCancelCallback()
   }, [showOpeningModal])
 
-  const handleSaveApiBasedExtension = (newApiBasedExtension: ApiBasedExtension) => {
-    if (showApiBasedExtensionModal?.onSaveCallback)
-      showApiBasedExtensionModal.onSaveCallback(newApiBasedExtension)
-    setShowApiBasedExtensionModal(null)
-  }
-
   const handleSaveModeration = (newModerationConfig: ModerationConfig) => {
     if (showModerationSettingModal?.onSaveCallback)
       showModerationSettingModal.onSaveCallback(newModerationConfig)
@@ -246,7 +236,6 @@ export const ModalContextProvider = ({
   return (
     <ModalContext.Provider value={{
       setShowAccountSettingModal,
-      setShowApiBasedExtensionModal,
       setShowModerationSettingModal,
       setShowExternalDataToolModal,
       setShowPricingModal: handleShowPricingModal,
@@ -272,15 +261,6 @@ export const ModalContextProvider = ({
           )
         }
 
-        {
-          !!showApiBasedExtensionModal && (
-            <ApiBasedExtensionModal
-              data={showApiBasedExtensionModal.payload}
-              onCancel={() => setShowApiBasedExtensionModal(null)}
-              onSave={handleSaveApiBasedExtension}
-            />
-          )
-        }
         {
           !!showModerationSettingModal && (
             <ModerationSettingModal
diff --git a/web/context/modal-context.ts b/web/context/modal-context.ts
index a8f1597cdb..37dec476b3 100644
--- a/web/context/modal-context.ts
+++ b/web/context/modal-context.ts
@@ -18,7 +18,6 @@ import type { UpdatePluginPayload } from '@/app/components/plugins/types'
 import type { InputVar } from '@/app/components/workflow/types'
 import type { ExpireNoticeModalPayloadProps } from '@/app/education-apply/expire-notice-modal'
 import type {
-  ApiBasedExtension,
   ExternalDataTool,
 } from '@/models/common'
 import type { ModerationConfig, PromptVariable } from '@/models/debug'
@@ -48,7 +47,6 @@ export type ModelModalType = {
 
 export type ModalContextState = {
   setShowAccountSettingModal: Dispatch<SetStateAction<ModalState<AccountSettingTab> | null>>
-  setShowApiBasedExtensionModal: Dispatch<SetStateAction<ModalState<ApiBasedExtension> | null>>
   setShowModerationSettingModal: Dispatch<SetStateAction<ModalState<ModerationConfig> | null>>
   setShowExternalDataToolModal: Dispatch<SetStateAction<ModalState<ExternalDataTool> | null>>
   setShowPricingModal: () => void
@@ -68,7 +66,6 @@ export type ModalContextState = {
 
 export const ModalContext = createContext<ModalContextState>({
   setShowAccountSettingModal: noop,
-  setShowApiBasedExtensionModal: noop,
   setShowModerationSettingModal: noop,
   setShowExternalDataToolModal: noop,
   setShowPricingModal: noop,
diff --git a/web/context/provider-context-provider.tsx b/web/context/provider-context-provider.tsx
index 0af0f24b9a..160a559a77 100644
--- a/web/context/provider-context-provider.tsx
+++ b/web/context/provider-context-provider.tsx
@@ -38,6 +38,7 @@ export const ProviderContextProvider = ({
 
   const [plan, setPlan] = useState(defaultPlan)
   const [isFetchedPlan, setIsFetchedPlan] = useState(false)
+  const [isFetchedPlanInfo, setIsFetchedPlanInfo] = useState(false)
   const [enableBilling, setEnableBilling] = useState(true)
   const [enableReplaceWebAppLogo, setEnableReplaceWebAppLogo] = useState(false)
   const [modelLoadBalancingEnabled, setModelLoadBalancingEnabled] = useState(false)
@@ -103,6 +104,9 @@ export const ProviderContextProvider = ({
       setIsEducationWorkspace(false)
       setEnableReplaceWebAppLogo(false)
     }
+    finally {
+      setIsFetchedPlanInfo(true)
+    }
   }
   useEffect(() => {
     fetchPlan()
@@ -150,6 +154,7 @@ export const ProviderContextProvider = ({
       supportRetrievalMethods: supportRetrievalMethods?.retrieval_method || [],
       plan,
       isFetchedPlan,
+      isFetchedPlanInfo,
       enableBilling,
       onPlanInfoChanged: fetchPlan,
       enableReplaceWebAppLogo,
diff --git a/web/context/provider-context.ts b/web/context/provider-context.ts
index 5d6c49c6b2..29a1c01f1e 100644
--- a/web/context/provider-context.ts
+++ b/web/context/provider-context.ts
@@ -20,6 +20,7 @@ export type ProviderContextState = {
     reset: UsageResetInfo
   }
   isFetchedPlan: boolean
+  isFetchedPlanInfo: boolean
   enableBilling: boolean
   onPlanInfoChanged: () => void
   enableReplaceWebAppLogo: boolean
@@ -53,6 +54,7 @@ export const baseProviderContextValue: ProviderContextState = {
   isAPIKeySet: true,
   plan: defaultPlan,
   isFetchedPlan: false,
+  isFetchedPlanInfo: false,
   enableBilling: false,
   onPlanInfoChanged: noop,
   enableReplaceWebAppLogo: false,
diff --git a/web/contract/console/apps.ts b/web/contract/console/apps.ts
index 077c719671..bd9e8ed06b 100644
--- a/web/contract/console/apps.ts
+++ b/web/contract/console/apps.ts
@@ -1,8 +1,27 @@
-import type { WorkflowOnlineUsersResponse } from '@/models/app'
-import type { WorkflowTypeConversionTarget } from '@/types/workflow'
+import type { AppListResponse, WorkflowOnlineUsersResponse } from '@/models/app'
+import type { AppModeEnum } from '@/types/app'
 import { type } from '@orpc/contract'
 import { base } from '../base'
 
+export type AppListQuery = {
+  page?: number
+  limit?: number
+  name?: string
+  mode?: AppModeEnum
+  tag_ids?: string[]
+  is_created_by_me?: boolean
+}
+
+export const appListContract = base
+  .route({
+    path: '/apps',
+    method: 'GET',
+  })
+  .input(type<{
+    query?: AppListQuery
+  }>())
+  .output(type<AppListResponse>())
+
 export const appDeleteContract = base
   .route({
     path: '/apps/{appId}',
@@ -15,20 +34,6 @@ export const appDeleteContract = base
   }>())
   .output(type<unknown>())
 
-export const appWorkflowTypeConvertContract = base
-  .route({
-    path: '/apps/{appId}/workflows/convert-type',
-    method: 'POST',
-  })
-  .input(type<{
-    params: {
-      appId: string
-    }
-    query: {
-      target_type: WorkflowTypeConversionTarget
-    }
-  }>())
-  .output(type<unknown>())
 export const workflowOnlineUsersContract = base
   .route({
     path: '/apps/workflows/online-users',
diff --git a/web/contract/console/tags.ts b/web/contract/console/tags.ts
new file mode 100644
index 0000000000..438da8a95e
--- /dev/null
+++ b/web/contract/console/tags.ts
@@ -0,0 +1,91 @@
+import { type } from '@orpc/contract'
+import { base } from '../base'
+
+export type TagType = 'knowledge' | 'app'
+
+export type Tag = {
+  id: string
+  name: string
+  type: TagType
+  binding_count: number
+}
+
+export const tagListContract = base
+  .route({
+    path: '/tags',
+    method: 'GET',
+  })
+  .input(type<{
+    query: {
+      type: TagType
+    }
+  }>())
+  .output(type<Tag[]>())
+
+export const tagCreateContract = base
+  .route({
+    path: '/tags',
+    method: 'POST',
+  })
+  .input(type<{
+    body: {
+      name: string
+      type: TagType
+    }
+  }>())
+  .output(type<Tag>())
+
+export const tagUpdateContract = base
+  .route({
+    path: '/tags/{tagId}',
+    method: 'PATCH',
+  })
+  .input(type<{
+    params: {
+      tagId: string
+    }
+    body: {
+      name: string
+    }
+  }>())
+  .output(type<Tag>())
+
+export const tagDeleteContract = base
+  .route({
+    path: '/tags/{tagId}',
+    method: 'DELETE',
+  })
+  .input(type<{
+    params: {
+      tagId: string
+    }
+  }>())
+  .output(type<unknown>())
+
+export const tagBindingCreateContract = base
+  .route({
+    path: '/tag-bindings',
+    method: 'POST',
+  })
+  .input(type<{
+    body: {
+      tag_ids: string[]
+      target_id: string
+      type: TagType
+    }
+  }>())
+  .output(type<unknown>())
+
+export const tagBindingRemoveContract = base
+  .route({
+    path: '/tag-bindings/remove',
+    method: 'POST',
+  })
+  .input(type<{
+    body: {
+      tag_ids: string[]
+      target_id: string
+      type: TagType
+    }
+  }>())
+  .output(type<unknown>())
diff --git a/web/contract/console/workflow-comment.ts b/web/contract/console/workflow-comment.ts
index a4c55a46e0..216487f8c8 100644
--- a/web/contract/console/workflow-comment.ts
+++ b/web/contract/console/workflow-comment.ts
@@ -15,13 +15,13 @@ export type WorkflowCommentList = {
   position_y: number
   content: string
   created_by: string
-  created_by_account: UserProfile
+  created_by_account: UserProfile | null
   created_at: number
   updated_at: number
   resolved: boolean
-  resolved_by?: string
-  resolved_by_account?: UserProfile
-  resolved_at?: number
+  resolved_by?: string | null
+  resolved_by_account?: UserProfile | null
+  resolved_at?: number | null
   mention_count: number
   reply_count: number
   participants: UserProfile[]
@@ -47,59 +47,59 @@ export type WorkflowCommentDetail = {
   position_y: number
   content: string
   created_by: string
-  created_by_account: UserProfile
+  created_by_account: UserProfile | null
   created_at: number
   updated_at: number
   resolved: boolean
-  resolved_by?: string
-  resolved_by_account?: UserProfile
-  resolved_at?: number
+  resolved_by?: string | null
+  resolved_by_account?: UserProfile | null
+  resolved_at?: number | null
   replies: WorkflowCommentDetailReply[]
   mentions: WorkflowCommentDetailMention[]
 }
 
-export type WorkflowCommentCreateRes = {
+type WorkflowCommentCreateRes = {
   id: string
-  created_at: string
+  created_at: number
 }
 
-export type WorkflowCommentUpdateRes = {
+type WorkflowCommentUpdateRes = {
   id: string
-  updated_at: string
+  updated_at: number
 }
 
-export type WorkflowCommentResolveRes = {
+type WorkflowCommentResolveRes = {
   id: string
   resolved: boolean
   resolved_by: string
   resolved_at: number
 }
 
-export type WorkflowCommentReplyCreateRes = {
+type WorkflowCommentReplyCreateRes = {
   id: string
-  created_at: string
+  created_at: number
 }
 
-export type WorkflowCommentReplyUpdateRes = {
+type WorkflowCommentReplyUpdateRes = {
   id: string
-  updated_at: string
+  updated_at: number
 }
 
-export type CreateCommentParams = {
+type CreateCommentParams = {
   position_x: number
   position_y: number
   content: string
   mentioned_user_ids?: string[]
 }
 
-export type UpdateCommentParams = {
+type UpdateCommentParams = {
   content: string
   position_x?: number
   position_y?: number
   mentioned_user_ids?: string[]
 }
 
-export type CreateReplyParams = {
+type CreateReplyParams = {
   content: string
   mentioned_user_ids?: string[]
 }
diff --git a/web/contract/router.ts b/web/contract/router.ts
index 8812ad5b1c..cb285fed46 100644
--- a/web/contract/router.ts
+++ b/web/contract/router.ts
@@ -1,7 +1,8 @@
 import type { InferContractRouterInputs } from '@orpc/contract'
+import { contract as communityContract } from '@dify/contracts/api/console/orpc.gen'
 import { contract as enterpriseContract } from '@dify/contracts/enterprise/orpc.gen'
 import { accountAvatarContract } from './console/account'
-import { appDeleteContract, appWorkflowTypeConvertContract, workflowOnlineUsersContract } from './console/apps'
+import { appDeleteContract, appListContract, workflowOnlineUsersContract } from './console/apps'
 import { bindPartnerStackContract, invoicesContract } from './console/billing'
 import {
   availableEvaluationWorkflowsContract,
@@ -71,6 +72,14 @@ import {
   updateCustomizedSnippetContract,
 } from './console/snippets'
 import { systemFeaturesContract } from './console/system'
+import {
+  tagBindingCreateContract,
+  tagBindingRemoveContract,
+  tagCreateContract,
+  tagDeleteContract,
+  tagListContract,
+  tagUpdateContract,
+} from './console/tags'
 import {
   triggerOAuthConfigContract,
   triggerOAuthConfigureContract,
@@ -107,18 +116,27 @@ export const marketplaceRouterContract = {
 
 export type MarketPlaceInputs = InferContractRouterInputs<typeof marketplaceRouterContract>
 
+// Hand-written console contracts below are temporary overrides for gaps in the
+// generated community contract. Prefer fixing backend OpenAPI annotations so
+// generated contracts include accurate method, path, input, and output types;
+// once generated contracts are correct, the matching hand-written contracts
+// should be removed instead of kept in parallel.
 export const consoleRouterContract = {
   enterprise: enterpriseContract,
+  ...communityContract,
   account: {
+    ...communityContract.account,
     avatar: accountAvatarContract,
   },
   systemFeatures: systemFeaturesContract,
   apps: {
+    ...communityContract.apps,
+    list: appListContract,
     deleteApp: appDeleteContract,
-    convertWorkflowType: appWorkflowTypeConvertContract,
     workflowOnlineUsers: workflowOnlineUsersContract,
   },
   explore: {
+    ...communityContract.explore,
     apps: exploreAppsContract,
     appDetail: exploreAppDetailContract,
     installedApps: exploreInstalledAppsContract,
@@ -130,6 +148,7 @@ export const consoleRouterContract = {
     banners: exploreBannersContract,
   },
   trialApps: {
+    ...communityContract.trialApps,
     info: trialAppInfoContract,
     datasets: trialAppDatasetsContract,
     parameters: trialAppParametersContract,
@@ -199,6 +218,7 @@ export const consoleRouterContract = {
     stopWorkflowTask: stopSnippetWorkflowTaskContract,
   },
   billing: {
+    ...communityContract.billing,
     invoices: invoicesContract,
     bindPartnerStack: bindPartnerStackContract,
   },
@@ -211,6 +231,15 @@ export const consoleRouterContract = {
   workflowComments: workflowCommentContracts,
   notification: notificationContract,
   notificationDismiss: notificationDismissContract,
+  tags: {
+    ...communityContract.tags,
+    list: tagListContract,
+    create: tagCreateContract,
+    update: tagUpdateContract,
+    delete: tagDeleteContract,
+    bind: tagBindingCreateContract,
+    unbind: tagBindingRemoveContract,
+  },
   triggers: {
     list: triggersContract,
     providerInfo: triggerProviderInfoContract,
diff --git a/web/dev-proxy.config.ts b/web/dev-proxy.config.ts
new file mode 100644
index 0000000000..d9787795b3
--- /dev/null
+++ b/web/dev-proxy.config.ts
@@ -0,0 +1,50 @@
+import type { CookieRewriteOptions, DevProxyConfig } from '@langgenius/dev-proxy'
+
+const DIFY_CLOUD_TARGET = 'https://cloud.dify.ai'
+const DEV_PROXY_TARGET = process.env.DEV_PROXY_TARGET || DIFY_CLOUD_TARGET
+const DEV_PROXY_ENTERPRISE_TARGET = process.env.DEV_PROXY_ENTERPRISE_TARGET || DEV_PROXY_TARGET
+const DEV_PROXY_HOST = process.env.DEV_PROXY_HOST || '127.0.0.1'
+const DEV_PROXY_PORT = Number(process.env.DEV_PROXY_PORT || 5001)
+
+const difyCookieRewrite: CookieRewriteOptions = {
+  hostPrefixCookies: [
+    'access_token',
+    'csrf_token',
+    'refresh_token',
+    'webapp_access_token',
+    /^passport-/,
+  ],
+}
+
+export default {
+  server: {
+    host: DEV_PROXY_HOST,
+    port: DEV_PROXY_PORT,
+  },
+  routes: [
+    {
+      paths: [
+        '/console/api/enterprise',
+        '/api/enterprise',
+        '/admin-api',
+        '/inner/api',
+        '/mfa',
+        '/scim',
+        '/v1/audit',
+        '/v1/dashboard',
+        '/v1/healthz',
+        '/v1/plugin-manager',
+      ],
+      target: DEV_PROXY_ENTERPRISE_TARGET,
+      cookieRewrite: difyCookieRewrite,
+    },
+    {
+      paths: [
+        '/console/api',
+        '/api',
+      ],
+      target: DEV_PROXY_TARGET,
+      cookieRewrite: difyCookieRewrite,
+    },
+  ],
+} satisfies DevProxyConfig
diff --git a/web/docs/lint.md b/web/docs/lint.md
index ed38a7cf37..047a30d25f 100644
--- a/web/docs/lint.md
+++ b/web/docs/lint.md
@@ -62,7 +62,7 @@ This command lints the entire project and is intended for final verification bef
 If a new rule causes many existing code errors or automatic fixes generate too many diffs, do not use the `--fix` option for automatic fixes.
 You can introduce the rule first, then use the `--suppress-all` option to temporarily suppress these errors, and gradually fix them in subsequent changes.
 
-For overlay migration policy and cleanup phases, see [Overlay Migration Guide].
+For overlay import policy and composition rules, see [Overlay Guide].
 
 ## Type Check
 
@@ -78,7 +78,7 @@ Type checking is powered by [`tsgo`] (the native TypeScript 7 compiler), which i
 
 [ESLint bulk suppressions blog post]: https://eslint.org/blog/2025/04/introducing-bulk-suppressions
 [ESLint multi-thread linting blog post]: https://eslint.org/blog/2025/08/multithread-linting
-[Overlay Migration Guide]: ./overlay-migration.md
+[Overlay Guide]: ./overlay.md
 [TSSLint]: https://github.com/johnsoncodehk/tsslint
 [`tsgo`]: https://devblogs.microsoft.com/typescript/announcing-typescript-7-0-beta
 [no-leaked-conditional-rendering]: https://www.eslint-react.xyz/docs/rules/no-leaked-conditional-rendering
diff --git a/web/docs/overlay-migration.md b/web/docs/overlay-migration.md
deleted file mode 100644
index 1ab79511f2..0000000000
--- a/web/docs/overlay-migration.md
+++ /dev/null
@@ -1,94 +0,0 @@
-# Overlay Migration Guide
-
-This document tracks the Dify-web migration away from legacy overlay APIs.
-
-> **See also:** [`packages/dify-ui/README.md`] for the permanent overlay / portal / z-index contract of the replacement primitives. This document covers the one-off migration mechanics (allowlist, deprecated import paths, coexistence z-index strategy) and is expected to shrink and eventually be removed once the legacy overlays are gone.
-
-## Scope
-
-- Deprecated imports:
-  - `@/app/components/base/portal-to-follow-elem`
-  - `@/app/components/base/tooltip`
-  - `@/app/components/base/modal`
-  - `@/app/components/base/dialog`
-- Replacement primitives:
-  - `@langgenius/dify-ui/tooltip`
-  - `@langgenius/dify-ui/dropdown-menu`
-  - `@langgenius/dify-ui/context-menu`
-  - `@langgenius/dify-ui/popover`
-  - `@langgenius/dify-ui/dialog`
-  - `@langgenius/dify-ui/alert-dialog`
-  - `@langgenius/dify-ui/select`
-  - `@langgenius/dify-ui/toast`
-- Tracking issue: <https://github.com/langgenius/dify/issues/32767>
-
-## ESLint policy
-
-- `no-restricted-imports` blocks all deprecated imports listed above.
-- The rule is enabled for normal source files (`.ts` / `.tsx`) and test files are excluded.
-- Legacy `app/components/base/*` callers are temporarily allowlisted in `OVERLAY_MIGRATION_LEGACY_BASE_FILES` (`web/eslint.constants.mjs`).
-- New files must not be added to the allowlist without migration owner approval.
-
-## Migration phases
-
-1. Business/UI features outside `app/components/base/**`
-   - Migrate old calls to semantic primitives from `@langgenius/dify-ui/*`.
-   - Keep deprecated imports out of newly touched files.
-1. Legacy base components in allowlist
-   - Migrate allowlisted base callers gradually.
-   - Remove migrated files from `OVERLAY_MIGRATION_LEGACY_BASE_FILES` immediately.
-1. Cleanup
-   - Remove remaining allowlist entries.
-   - Remove legacy overlay implementations when import count reaches zero.
-
-## Allowlist maintenance
-
-- If a migrated file was in the allowlist, remove it from `web/eslint.constants.mjs` in the same PR.
-- Never increase allowlist scope to bypass new code.
-
-## z-index strategy
-
-All new overlay primitives in `@langgenius/dify-ui/*` share a single z-index value:
-**`z-1002`**, except Toast which stays one layer above at **`z-1003`**.
-
-### Why z-[1002]?
-
-During the migration period, legacy and new overlays coexist. Legacy overlays
-portal to `document.body` with explicit z-index values:
-
-| Layer                             | z-index        | Components                                               |
-| --------------------------------- | -------------- | -------------------------------------------------------- |
-| Legacy Drawer                     | `z-30`         | `base/drawer`                                            |
-| Legacy Modal                      | `z-60`         | `base/modal` (default)                                   |
-| Legacy PortalToFollowElem callers | up to `z-1001` | various business components                              |
-| **New UI primitives**             | **`z-1002`**   | `@langgenius/dify-ui/*` (Popover, Dialog, Tooltip, etc.) |
-| Toast                             | `z-1003`       | `@langgenius/dify-ui/toast`                              |
-
-`z-1002` sits above all common legacy overlays, so new primitives always
-render on top without needing per-call-site z-index hacks. Among themselves,
-new primitives share the same z-index and rely on **DOM order** for stacking
-(later portal = on top).
-
-Toast stays one layer above the overlay primitives so notifications remain
-visible above dialogs, popovers, and other portalled surfaces without falling
-back to `z-9999`.
-
-### Rules
-
-- **Do NOT add z-index overrides** (e.g. `className="z-1003"`) on new
-  `@langgenius/dify-ui/*` components. If you find yourself needing one, the
-  parent legacy overlay should be migrated instead.
-- When migrating a legacy overlay that has a high z-index, remove the z-index
-  entirely — the new primitive's default `z-1002` handles it.
-- `portalToFollowElemContentClassName` with z-index values (e.g. `z-1000`)
-  should be deleted when the surrounding legacy container is migrated.
-
-### Post-migration cleanup
-
-Once all legacy overlays are removed:
-
-1. Reduce `z-1002` back to `z-50` across all `@langgenius/dify-ui/*` primitives.
-1. Reduce Toast from `z-1003` to `z-51`.
-1. Remove this section from the migration guide.
-
-[`packages/dify-ui/README.md`]: ../../packages/dify-ui/README.md
diff --git a/web/docs/overlay.md b/web/docs/overlay.md
new file mode 100644
index 0000000000..76ba21b64d
--- /dev/null
+++ b/web/docs/overlay.md
@@ -0,0 +1,44 @@
+# Overlay Best Practices
+
+Use `@langgenius/dify-ui/*` primitives for overlays in new and modified web
+code. Do not import raw Base UI overlays or legacy web overlays from
+`@/app/components/base/modal`, `@/app/components/base/dialog`, or
+`@/app/components/base/drawer`.
+
+## Primitive choice
+
+- Use `@langgenius/dify-ui/dialog` for modal surfaces that need focus
+  management, scroll locking, escape handling, and outside-press dismissal.
+- Use `@langgenius/dify-ui/alert-dialog` only for destructive or must-confirm
+  decisions.
+- Use `@langgenius/dify-ui/drawer` for side panels, setup panels, and nested
+  editor panels that must behave like a drawer. Do not add separate web drawer
+  wrappers.
+- Use `@langgenius/dify-ui/popover` or the web `Infotip` wrapper for
+  explanatory content, long help text, rich layout, or interactive content.
+- Use `@langgenius/dify-ui/tooltip` only for short, non-interactive labels where
+  the trigger already has its own accessible name.
+
+## Preferences
+
+- Prefer the most specific semantic primitive over styling a generic `Dialog`.
+- Prefer controlled `open` / `onOpenChange` when business state, analytics, or
+  cleanup must react to open state changes.
+- Prefer the primitive-owned portal or content component. Do not create manual
+  portals around overlay primitives.
+- Prefer native button trigger semantics. When passing a Base UI trigger
+  `render` prop, render a real `<button type="button">` for button-like
+  triggers; use `nativeButton={false}` only for intentional non-button triggers.
+- Use `Infotip` for visible `?` help triggers. Give icon-only triggers an
+  accessible name.
+- Keep overlay chrome inside the shared primitive or business wrapper instead of
+  repeating backdrop, z-index, and portal styles at call sites.
+
+## Layering
+
+All body-portalled Dify UI overlays use `z-50`. Toast uses `z-60`. The app root
+must keep an isolated stacking context.
+
+Do not add call-site z-index overrides such as `z-9999`. If an overlay is
+clipped or hidden, fix the parent overlay structure instead of raising the
+child primitive.
diff --git a/web/docs/test.md b/web/docs/test.md
index 836ab7ad56..aab8b81eef 100644
--- a/web/docs/test.md
+++ b/web/docs/test.md
@@ -4,25 +4,19 @@ This document is the complete testing specification for the Dify frontend projec
 Goal: Readable, change-friendly, reusable, and debuggable tests.
 When I ask you to write/refactor/fix tests, follow these rules by default.
 
-## Tech Stack
-
-- **Framework**: Next.js 15 + React 19 + TypeScript
-- **Testing Tools**: Vitest 4.0.16 + React Testing Library 16.0
-- **Test Environment**: happy-dom
-- **File Naming**: `ComponentName.spec.tsx` inside a same-level `__tests__/` directory
-- **Placement Rule**: Component, hook, and utility tests must live in a sibling `__tests__/` folder at the same level as the source under test. For example, `foo/index.tsx` maps to `foo/__tests__/index.spec.tsx`, and `foo/bar.ts` maps to `foo/__tests__/bar.spec.ts`.
-
 ## Running Tests
 
+Run these commands from `web/`. From the repository root, prefix them with `pnpm -C web`.
+
 ```bash
 # Run all tests
 pnpm test
 
 # Watch mode
-pnpm test:watch
+pnpm test --watch
 
 # Generate coverage report
-pnpm test:coverage
+pnpm test --coverage
 
 # Run specific file
 pnpm test path/to/file.spec.tsx
@@ -31,6 +25,8 @@ pnpm test path/to/file.spec.tsx
 ## Project Test Setup
 
 - **Configuration**: `vite.config.ts` sets the `happy-dom` environment, loads the Testing Library presets, and respects our path aliases (`@/...`). Check this file before adding new transformers or module name mappers.
+- **File naming**: `ComponentName.spec.tsx` inside a same-level `__tests__/` directory.
+- **Placement rule**: Component, hook, and utility tests must live in a sibling `__tests__/` folder at the same level as the source under test. For example, `foo/index.tsx` maps to `foo/__tests__/index.spec.tsx`, and `foo/bar.ts` maps to `foo/__tests__/bar.spec.ts`.
 - **Global setup**: `vitest.setup.ts` already imports `@testing-library/jest-dom`, runs `cleanup()` after every test, and defines shared mocks (for example `react-i18next`). Add any environment-level mocks (for example `ResizeObserver`, `matchMedia`, `IntersectionObserver`, `TextEncoder`, `crypto`) here so they are shared consistently.
 - **Reusable mocks**: Place shared mock factories inside `web/__mocks__/` and use `vi.mock('module-name')` to point to them rather than redefining mocks in every spec.
 - **Mocking behavior**: Modules are not mocked automatically. Use `vi.mock(...)` in tests, or place global mocks in `vitest.setup.ts`.
@@ -45,6 +41,8 @@ pnpm test path/to/file.spec.tsx
 
 - **Single behavior per test**: Each test verifies one user-observable behavior.
 - **Black-box first**: Assert external behavior and observable outputs, avoid internal implementation details. Prefer role-based queries (`getByRole`) and pattern matching (`/text/i`) over hardcoded string assertions.
+- **Accessibility selectors first**: Prefer `getByRole` with accessible `name`, then `getByLabelText`, `getByPlaceholderText`, `getByText`, and scoped `within(...)` queries. Avoid `getByTestId` unless the target has no user-observable semantics, such as a mocked non-visual integration boundary, virtualized/canvas output, or a third-party widget shim.
+- **Fix markup before selectors**: If a test cannot find a control by role, name, label, landmark, or dialog scope, treat that as a component accessibility problem first. Add semantic HTML, an accessible name, or an associated label instead of adding `data-testid`.
 - **Semantic naming**: Use `should <behavior> when <condition>` and group related cases with `describe(<subject or scenario>)`.
 - **AAA / Given–When–Then**: Separate Arrange, Act, and Assert clearly with code blocks or comments.
 - **Minimal but sufficient assertions**: Keep only the expectations that express the essence of the behavior.
@@ -83,12 +81,22 @@ Use `pnpm analyze-component <path>` to analyze component complexity and adopt di
 - ✅ TypeScript: No `any` types
 - ✅ **Cleanup**: `vi.clearAllMocks()` should be in `beforeEach()`, not `afterEach()`. This ensures mock call history is reset before each test, preventing test pollution when using assertions like `toHaveBeenCalledWith()` or `toHaveBeenCalledTimes()`.
 
+### Test ID Policy
+
+`data-testid` is a last resort because users and assistive technology cannot perceive it. It can hide broken semantics, such as a clickable `div` that should have been a button or an input without a label.
+
+- Prefer `screen.getByRole('button', { name: /save/i })`, `screen.getByRole('textbox', { name: /email/i })`, and scoped queries like `within(screen.getByRole('dialog', { name: /settings/i }))`.
+- Prefer `userEvent` for interactions that should match real user behavior.
+- Remove production `data-testid` attributes when they exist only to support tests and a semantic selector is available.
+- Keep `data-testid` only for justified boundaries that cannot expose stable semantics in the test environment: mocked non-visual children, browser/editor shims such as Monaco, canvas/chart output, or third-party widgets. In those cases, keep assertions focused on the boundary contract rather than internal DOM shape.
+- Do not assert decorative icons by test id. If the icon conveys meaning, give the control an accessible name and assert the control. If the icon is decorative, keep it `aria-hidden`.
+
 **⚠️ Mock components must accurately reflect actual component behavior**, especially conditional rendering based on props or state.
 
 **Rules**:
 
 1. **Match actual conditional rendering**: If the real component returns `null` or doesn't render under certain conditions, the mock must do the same. Always check the actual component implementation before creating mocks.
-1. **Use shared state variables when needed**: When mocking components that depend on shared context or state (e.g., `PortalToFollowElem` with `PortalToFollowElemContent`), use module-level variables to track state and reset them in `beforeEach`.
+1. **Use shared state variables when needed**: When mocking components that depend on shared context or state (for example, a parent overlay mock with a separate content component), use module-level variables to track state and reset them in `beforeEach`.
 1. **Always reset shared mock state in beforeEach**: Module-level variables used in mocks must be reset in `beforeEach` to ensure test isolation, even if you set default values elsewhere.
 1. **Use fake timers only when needed**: Only use `vi.useFakeTimers()` if:
    - Testing components that use real `setTimeout`/`setInterval` (not mocked)
@@ -216,8 +224,8 @@ Simulate the interactions that matter to users—primary clicks, change events,
 
 **Guidelines**:
 
-- Prefer spying on `global.fetch`/`axios`/`ky` and returning deterministic responses over reaching out to the network.
-- Use MSW (`msw` is already installed) when you need declarative request handlers across multiple specs.
+- Prefer mocking `@/service/*` modules or spying on `global.fetch` / `ky` clients with deterministic responses over reaching out to the network.
+- Do not introduce an HTTP interception dependency such as MSW unless it is already declared in the workspace or adding it is part of the task.
 - Keep async assertions inside `await waitFor(...)` blocks or the async `findBy*` queries to avoid race conditions.
 
 ### 7. Next.js Routing
@@ -281,7 +289,7 @@ For complex inputs/entities, use Builders with solid defaults and chainable over
 
 Reserve snapshots for static, deterministic fragments (icons, badges, layout chrome). Keep them tight, prefer explicit assertions for behavior, and review any snapshot updates deliberately instead of accepting them wholesale.
 
-**Note**: Dify is a desktop application. **No need for** responsive/mobile testing.
+**Note**: Dify primarily targets desktop workflows, but the supported browsers list includes mobile browsers. Do not add responsive/mobile assertions to ordinary unit tests unless the component has responsive behavior, mobile-specific behavior, or accessibility behavior that must be covered.
 
 ## Code Style
 
@@ -377,16 +385,16 @@ describe('ComponentName', () => {
 
 ```tsx
 // ✅ CORRECT: Matches actual component behavior
-let mockPortalOpenState = false
+let mockOverlayOpenState = false
 
-vi.mock('@/app/components/base/portal-to-follow-elem', () => ({
-  PortalToFollowElem: ({ children, open, ...props }) => {
-    mockPortalOpenState = open || false // Update shared state
+vi.mock('external-overlay-library', () => ({
+  OverlayRoot: ({ children, open, ...props }) => {
+    mockOverlayOpenState = open || false // Update shared state
     return <div data-open={open}>{children}</div>
   },
-  PortalToFollowElemContent: ({ children }) => {
+  OverlayContent: ({ children }) => {
     // ✅ Matches actual: returns null when open is false
-    if (!mockPortalOpenState)
+    if (!mockOverlayOpenState)
       return null
     return <div>{children}</div>
   },
@@ -395,7 +403,7 @@ vi.mock('@/app/components/base/portal-to-follow-elem', () => ({
 describe('Component', () => {
   beforeEach(() => {
     vi.clearAllMocks() // ✅ Reset mock call history
-    mockPortalOpenState = false // ✅ Reset shared state
+    mockOverlayOpenState = false // ✅ Reset shared state
   })
 })
 ```
diff --git a/web/eslint.config.mjs b/web/eslint.config.mjs
index 2a043ac73d..7c4d2242cf 100644
--- a/web/eslint.config.mjs
+++ b/web/eslint.config.mjs
@@ -11,10 +11,9 @@ import noBarrelFiles from 'eslint-plugin-no-barrel-files'
 import sonar from 'eslint-plugin-sonarjs'
 import storybook from 'eslint-plugin-storybook'
 import {
+  GENERATED_IGNORES,
   HYOBAN_PREFER_TAILWIND_ICONS_OPTIONS,
   NEXT_PLATFORM_RESTRICTED_IMPORT_PATHS,
-  OVERLAY_MIGRATION_LEGACY_BASE_FILES,
-  OVERLAY_RESTRICTED_IMPORT_PATTERNS,
   WEB_RESTRICTED_IMPORT_PATTERNS,
 } from './eslint.constants.mjs'
 import dify from './plugins/eslint/index.js'
@@ -27,7 +26,7 @@ export default antfu(
         'react/no-unnecessary-use-prefix': 'error',
       },
     },
-    ignores: ['public', 'types/doc-paths.ts', 'eslint-suppressions.json'],
+    ignores: ['public', 'types/doc-paths.ts', 'eslint-suppressions.json', ...GENERATED_IGNORES],
     typescript: {
       overrides: {
         'ts/consistent-type-definitions': ['error', 'type'],
@@ -52,7 +51,6 @@ export default antfu(
   {
     files: [...GLOB_TESTS, GLOB_MARKDOWN_CODE, 'vitest.setup.ts', 'test/i18n-mock.ts'],
     rules: {
-      'react/component-hook-factories': 'off',
       'react/no-unnecessary-use-prefix': 'off',
     },
   },
@@ -154,12 +152,6 @@ export default antfu(
       'dify/consistent-placeholders': 'error',
     },
   },
-  {
-    files: ['package.json'],
-    rules: {
-      'hyoban/no-dependency-version-prefix': 'error',
-    },
-  },
   {
     name: 'dify/restricted-imports',
     files: [GLOB_TS, GLOB_TSX],
@@ -171,22 +163,4 @@ export default antfu(
       }],
     },
   },
-  {
-    name: 'dify/overlay-migration',
-    files: [GLOB_TS, GLOB_TSX],
-    ignores: [
-      'next/**',
-      ...GLOB_TESTS,
-      ...OVERLAY_MIGRATION_LEGACY_BASE_FILES,
-    ],
-    rules: {
-      'no-restricted-imports': ['error', {
-        paths: NEXT_PLATFORM_RESTRICTED_IMPORT_PATHS,
-        patterns: [
-          ...WEB_RESTRICTED_IMPORT_PATTERNS,
-          ...OVERLAY_RESTRICTED_IMPORT_PATTERNS,
-        ],
-      }],
-    },
-  },
 )
diff --git a/web/eslint.constants.mjs b/web/eslint.constants.mjs
index 240d3ab06c..1d342fbf4d 100644
--- a/web/eslint.constants.mjs
+++ b/web/eslint.constants.mjs
@@ -1,3 +1,12 @@
+export const GENERATED_IGNORES = [
+  'storybook-static/',
+  '.next/',
+  'next/',
+  'next-env.d.ts',
+  'dist/',
+  'coverage/',
+]
+
 export const NEXT_PLATFORM_RESTRICTED_IMPORT_PATHS = [
   {
     name: 'next',
@@ -30,50 +39,19 @@ const BASE_UI_RESTRICTED_IMPORT_PATTERNS = [
   },
 ]
 
+const FLOATING_UI_RESTRICTED_IMPORT_PATTERNS = [
+  {
+    group: [
+      '@floating-ui/*',
+    ],
+    message: 'Do not import Floating UI directly in web. Use @langgenius/dify-ui/* primitives instead.',
+  },
+]
+
 export const WEB_RESTRICTED_IMPORT_PATTERNS = [
   ...NEXT_PLATFORM_RESTRICTED_IMPORT_PATTERNS,
   ...BASE_UI_RESTRICTED_IMPORT_PATTERNS,
-]
-
-export const OVERLAY_RESTRICTED_IMPORT_PATTERNS = [
-  {
-    group: [
-      '**/portal-to-follow-elem',
-      '**/portal-to-follow-elem/index',
-    ],
-    message: 'Deprecated: use semantic overlay primitives from @langgenius/dify-ui (popover / dropdown-menu / tooltip / context-menu) instead. See issue #32767.',
-  },
-  {
-    group: [
-      '**/base/tooltip',
-      '**/base/tooltip/index',
-    ],
-    message: 'Deprecated: use @langgenius/dify-ui/tooltip instead. See issue #32767.',
-  },
-  {
-    group: [
-      '**/base/modal',
-      '**/base/modal/index',
-      '**/base/modal/modal',
-    ],
-    message: 'Deprecated: use @langgenius/dify-ui/dialog instead. See issue #32767.',
-  },
-  {
-    group: [
-      '**/base/dialog',
-      '**/base/dialog/index',
-    ],
-    message: 'Deprecated: use @langgenius/dify-ui/dialog instead. See issue #32767.',
-  },
-]
-
-export const OVERLAY_MIGRATION_LEGACY_BASE_FILES = [
-  'app/components/base/chat/chat/citation/progress-tooltip.tsx',
-  'app/components/base/chat/chat/citation/tooltip.tsx',
-  'app/components/base/chip/index.tsx',
-  'app/components/base/modal/modal.tsx',
-  'app/components/base/sort/index.tsx',
-  'app/components/base/tooltip/index.tsx',
+  ...FLOATING_UI_RESTRICTED_IMPORT_PATTERNS,
 ]
 
 export const HYOBAN_PREFER_TAILWIND_ICONS_OPTIONS = {
diff --git a/web/features/tag-management/__tests__/dataset-card-tags.spec.tsx b/web/features/tag-management/__tests__/dataset-card-tags.spec.tsx
new file mode 100644
index 0000000000..7de4325ad2
--- /dev/null
+++ b/web/features/tag-management/__tests__/dataset-card-tags.spec.tsx
@@ -0,0 +1,157 @@
+import type { Tag } from '@/contract/console/tags'
+import { fireEvent, render, screen } from '@testing-library/react'
+import { describe, expect, it, vi } from 'vitest'
+import { DatasetCardTags } from '../components/dataset-card-tags'
+
+vi.mock('@/features/tag-management/components/tag-selector', () => ({
+  TagSelector: ({ value, onOpenTagManagement }: {
+    value: Tag[]
+    onOpenTagManagement?: () => void
+  }) => (
+    <div role="group" aria-label="Tag selector mock">
+      <div>{value.map(tag => tag.id).join(',')}</div>
+      <div>
+        {value.length}
+        {' '}
+        tags
+      </div>
+      <button onClick={onOpenTagManagement}>
+        Open Management
+      </button>
+    </div>
+  ),
+}))
+
+describe('DatasetCardTags', () => {
+  const mockTags: Tag[] = [
+    { id: 'tag-1', name: 'Tag 1', type: 'knowledge', binding_count: 0 },
+    { id: 'tag-2', name: 'Tag 2', type: 'knowledge', binding_count: 0 },
+  ]
+
+  const defaultProps = {
+    datasetId: 'dataset-1',
+    embeddingAvailable: true,
+    tags: mockTags,
+    onClick: vi.fn(),
+  }
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  describe('Rendering', () => {
+    it('should render without crashing', () => {
+      render(<DatasetCardTags {...defaultProps} />)
+      expect(screen.getByRole('group', { name: 'Tag selector mock' })).toBeInTheDocument()
+    })
+
+    it('should render TagSelector with correct value', () => {
+      render(<DatasetCardTags {...defaultProps} />)
+      expect(screen.getByText('tag-1,tag-2')).toBeInTheDocument()
+    })
+
+    it('should display selected tags count', () => {
+      render(<DatasetCardTags {...defaultProps} />)
+      expect(screen.getByText('2 tags')).toBeInTheDocument()
+    })
+  })
+
+  describe('Props', () => {
+    it('should pass dataset id to TagSelector', () => {
+      render(<DatasetCardTags {...defaultProps} datasetId="custom-dataset-id" />)
+      expect(screen.getByRole('group', { name: 'Tag selector mock' })).toBeInTheDocument()
+    })
+
+    it('should render with empty tags', () => {
+      render(<DatasetCardTags {...defaultProps} tags={[]} />)
+      expect(screen.getByText('0 tags')).toBeInTheDocument()
+    })
+  })
+
+  describe('User Interactions', () => {
+    it('should call onClick when container is clicked', () => {
+      const onClick = vi.fn()
+      const { container } = render(<DatasetCardTags {...defaultProps} onClick={onClick} />)
+
+      const wrapper = container.firstElementChild
+      if (!wrapper)
+        throw new Error('Expected dataset card tag wrapper')
+      fireEvent.click(wrapper)
+
+      expect(onClick).toHaveBeenCalledTimes(1)
+    })
+
+    it('should open tag management when requested', () => {
+      const onOpenTagManagement = vi.fn()
+      render(<DatasetCardTags {...defaultProps} onOpenTagManagement={onOpenTagManagement} />)
+
+      fireEvent.click(screen.getByText('Open Management'))
+
+      expect(onOpenTagManagement).toHaveBeenCalledTimes(1)
+    })
+  })
+
+  describe('Styles', () => {
+    it('should have opacity class when embedding is not available', () => {
+      const { container } = render(<DatasetCardTags {...defaultProps} embeddingAvailable={false} />)
+      const wrapper = container.firstElementChild
+      if (!wrapper)
+        throw new Error('Expected dataset card tag wrapper')
+      expect(wrapper).toHaveClass('opacity-30')
+    })
+
+    it('should not have opacity class when embedding is available', () => {
+      const { container } = render(<DatasetCardTags {...defaultProps} embeddingAvailable={true} />)
+      const wrapper = container.firstElementChild
+      if (!wrapper)
+        throw new Error('Expected dataset card tag wrapper')
+      expect(wrapper).not.toHaveClass('opacity-30')
+    })
+
+    it('should hide mask with CSS when the tag area is hovered', () => {
+      const { container } = render(<DatasetCardTags {...defaultProps} />)
+      const maskDiv = container.querySelector('.bg-tag-selector-mask-bg')
+      expect(maskDiv).toBeInTheDocument()
+      expect(maskDiv).toHaveClass('group-hover/tag-area:hidden')
+      expect(maskDiv).toHaveClass('group-focus-within/tag-area:hidden')
+      expect(maskDiv).toHaveClass('group-hover:bg-tag-selector-mask-hover-bg')
+    })
+
+    it('should keep TagSelector visible when tags are empty', () => {
+      const { container } = render(<DatasetCardTags {...defaultProps} tags={[]} />)
+      const tagSelectorWrapper = screen.getByRole('group', { name: 'Tag selector mock' }).parentElement
+
+      expect(tagSelectorWrapper).toBeInTheDocument()
+      expect(tagSelectorWrapper).toHaveClass('w-full')
+      expect(tagSelectorWrapper).not.toHaveClass('invisible')
+      expect(container.querySelector('.invisible')).not.toBeInTheDocument()
+    })
+
+    it('should keep TagSelector visible when tags exist', () => {
+      const { container } = render(<DatasetCardTags {...defaultProps} />)
+      const tagSelectorWrapper = screen.getByRole('group', { name: 'Tag selector mock' }).parentElement
+
+      expect(tagSelectorWrapper).toBeInTheDocument()
+      expect(tagSelectorWrapper).toHaveClass('w-full')
+      expect(container.querySelector('.invisible')).not.toBeInTheDocument()
+    })
+  })
+
+  describe('Edge Cases', () => {
+    it('should handle undefined onOpenTagManagement', () => {
+      render(<DatasetCardTags {...defaultProps} onOpenTagManagement={undefined} />)
+      expect(() => fireEvent.click(screen.getByText('Open Management'))).not.toThrow()
+    })
+
+    it('should handle many tags', () => {
+      const manyTags: Tag[] = Array.from({ length: 20 }, (_, i): Tag => ({
+        id: `tag-${i}`,
+        name: `Tag ${i}`,
+        type: 'knowledge',
+        binding_count: 0,
+      }))
+      render(<DatasetCardTags {...defaultProps} tags={manyTags} />)
+      expect(screen.getByText('20 tags')).toBeInTheDocument()
+    })
+  })
+})
diff --git a/web/app/components/base/tag-management/__tests__/filter.spec.tsx b/web/features/tag-management/__tests__/tag-filter.spec.tsx
similarity index 73%
rename from web/app/components/base/tag-management/__tests__/filter.spec.tsx
rename to web/features/tag-management/__tests__/tag-filter.spec.tsx
index a455d1a791..adf109079a 100644
--- a/web/app/components/base/tag-management/__tests__/filter.spec.tsx
+++ b/web/features/tag-management/__tests__/tag-filter.spec.tsx
@@ -1,28 +1,15 @@
-import type { Tag } from '@/app/components/base/tag-management/constant'
-import { render, screen, waitFor } from '@testing-library/react'
+import type { Tag } from '@/contract/console/tags'
+import { render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
-import { act } from 'react'
-import * as React from 'react'
-import TagFilter from '../filter'
-import { useStore as useTagStore } from '../store'
+import { TagFilter } from '../components/tag-filter'
 
-const { fetchTagList } = vi.hoisted(() => ({
-  fetchTagList: vi.fn(),
-}))
-// Mock the tag service (API layer)
-vi.mock('@/service/tag', () => ({
-  fetchTagList,
+const { mockUseQueryData } = vi.hoisted(() => ({
+  mockUseQueryData: { current: [] as Tag[] },
 }))
 
-vi.mock('ahooks', () => {
-  return {
-    useMount: (fn: () => void) => {
-      React.useEffect(() => {
-        fn()
-      }, [])
-    },
-  }
-})
+vi.mock('@tanstack/react-query', () => ({
+  useQuery: () => ({ data: mockUseQueryData.current }),
+}))
 
 const mockTags: Tag[] = [
   { id: 'tag-1', name: 'Frontend', type: 'app', binding_count: 3 },
@@ -40,6 +27,8 @@ const defaultProps = {
 // Helper: the i18n mock renders "ns.key" format (dot-separated)
 const i18n = {
   placeholder: 'common.tag.placeholder',
+  selectorPlaceholder: 'common.tag.selectorPlaceholder',
+  operationClear: 'common.operation.clear',
   noTag: 'common.tag.noTag',
   manageTags: 'common.tag.manageTags',
 }
@@ -47,11 +36,7 @@ const i18n = {
 describe('TagFilter', () => {
   beforeEach(() => {
     vi.clearAllMocks()
-    vi.mocked(fetchTagList).mockResolvedValue(mockTags)
-    // Pre-populate the Zustand store with tags so dropdown content is available
-    act(() => {
-      useTagStore.setState({ tagList: mockTags, showTagManagementModal: false })
-    })
+    mockUseQueryData.current = mockTags
   })
 
   describe('Rendering', () => {
@@ -60,16 +45,15 @@ describe('TagFilter', () => {
       expect(screen.getByText(i18n.placeholder)).toBeInTheDocument()
     })
 
-    it('should render the tag icon', () => {
+    it('should expose the trigger as a named combobox', () => {
       render(<TagFilter {...defaultProps} />)
-      expect(screen.getByTestId('tag-filter-trigger-icon')).toBeInTheDocument()
+      expect(screen.getByRole('combobox', { name: i18n.placeholder })).toBeInTheDocument()
     })
 
-    it('should render the arrow down icon when no tags are selected', () => {
+    it('should keep the placeholder in the trigger when no tags are selected', () => {
       render(<TagFilter {...defaultProps} />)
       expect(screen.getByText(i18n.placeholder)).toBeInTheDocument()
-      expect(screen.getByTestId('tag-filter-trigger-icon')).toBeInTheDocument()
-      expect(screen.getByTestId('tag-filter-arrow-down-icon')).toBeInTheDocument()
+      expect(screen.getByRole('combobox', { name: i18n.placeholder })).toBeInTheDocument()
     })
 
     it('should display the first selected tag name when tags are selected', () => {
@@ -118,6 +102,19 @@ describe('TagFilter', () => {
       expect(onChange).toHaveBeenCalledWith(['tag-1'])
     })
 
+    it('should select the highlighted tag with keyboard navigation', async () => {
+      const user = userEvent.setup()
+      const onChange = vi.fn()
+      render(<TagFilter {...defaultProps} onChange={onChange} />)
+
+      await user.click(screen.getByText(i18n.placeholder))
+      await user.type(screen.getByRole('combobox', { name: i18n.selectorPlaceholder }), 'Back')
+      await user.keyboard('{ArrowDown}')
+      await user.keyboard('{Enter}')
+
+      expect(onChange).toHaveBeenCalledWith(['tag-2'])
+    })
+
     it('should call onChange to deselect when an already-selected tag is clicked', async () => {
       const user = userEvent.setup()
       const onChange = vi.fn()
@@ -175,11 +172,9 @@ describe('TagFilter', () => {
       await user.click(screen.getByText('Frontend'))
 
       // The Check icon should be rendered for the selected tag
-      const tagItem = screen.getByTitle('Frontend')
+      const tagItem = screen.getByRole('option', { name: /Frontend/i })
       expect(tagItem).toBeInTheDocument()
-      // The parent container of the tag has a Check SVG sibling
-      const checkIcons = screen.getAllByTestId('tag-filter-selected-icon')
-      expect(checkIcons?.length).toBeGreaterThanOrEqual(1)
+      expect(tagItem).toHaveAttribute('aria-selected', 'true')
     })
 
     it('should clear all selected tags when clear button is clicked', async () => {
@@ -187,21 +182,22 @@ describe('TagFilter', () => {
       const onChange = vi.fn()
       render(<TagFilter {...defaultProps} value={['tag-1', 'tag-2']} onChange={onChange} />)
 
-      const clearButton = screen.getByTestId('tag-filter-clear-button')
+      const clearButton = screen.getByRole('button', { name: i18n.operationClear })
       expect(clearButton).toBeInTheDocument()
-      await user.click(clearButton!)
+      await user.click(clearButton)
 
       expect(onChange).toHaveBeenCalledWith([])
     })
 
     it('should open manage tags modal and close dropdown', async () => {
       const user = userEvent.setup()
-      render(<TagFilter {...defaultProps} />)
+      const onOpenTagManagement = vi.fn()
+      render(<TagFilter {...defaultProps} onOpenTagManagement={onOpenTagManagement} />)
 
       await user.click(screen.getByText(i18n.placeholder))
       await user.click(screen.getByText(i18n.manageTags))
 
-      expect(useTagStore.getState().showTagManagementModal).toBe(true)
+      expect(onOpenTagManagement).toHaveBeenCalledTimes(1)
     })
   })
 
@@ -213,7 +209,7 @@ describe('TagFilter', () => {
 
       await user.click(screen.getByText(i18n.placeholder))
 
-      const searchInput = screen.getByRole('textbox')
+      const searchInput = screen.getByRole('combobox', { name: i18n.selectorPlaceholder })
       await user.type(searchInput, 'Front')
 
       expect(screen.getByText('Frontend')).toBeInTheDocument()
@@ -228,7 +224,7 @@ describe('TagFilter', () => {
 
       await user.click(screen.getByText(i18n.placeholder))
 
-      const searchInput = screen.getByRole('textbox')
+      const searchInput = screen.getByRole('combobox', { name: i18n.selectorPlaceholder })
       await user.type(searchInput, 'NonExistentTag')
 
       expect(screen.getByText(i18n.noTag)).toBeInTheDocument()
@@ -241,12 +237,12 @@ describe('TagFilter', () => {
 
       await user.click(screen.getByText(i18n.placeholder))
 
-      const searchInput = screen.getByRole('textbox')
+      const searchInput = screen.getByRole('combobox', { name: i18n.selectorPlaceholder })
       await user.type(searchInput, 'Front')
 
       expect(screen.queryByText('Backend')).not.toBeInTheDocument()
 
-      const clearButton = screen.getByTestId('input-clear')
+      const clearButton = screen.getByRole('button', { name: i18n.operationClear })
       await user.click(clearButton)
 
       expect(searchInput).toHaveValue('')
@@ -257,42 +253,10 @@ describe('TagFilter', () => {
     })
   })
 
-  describe('Data Fetching', () => {
-    it('should fetch tag list on mount', () => {
-      render(<TagFilter {...defaultProps} />)
-      expect(fetchTagList).toHaveBeenCalledWith('app')
-    })
-
-    it('should fetch with correct type parameter', () => {
-      render(<TagFilter {...defaultProps} type="knowledge" />)
-      expect(fetchTagList).toHaveBeenCalledWith('knowledge')
-    })
-
-    it('should update the store with fetched tags', async () => {
-      const freshTags: Tag[] = [
-        { id: 'new-1', name: 'NewTag', type: 'app', binding_count: 0 },
-      ]
-      vi.mocked(fetchTagList).mockResolvedValue(freshTags)
-      act(() => {
-        useTagStore.setState({ tagList: [] })
-      })
-
-      render(<TagFilter {...defaultProps} />)
-
-      await waitFor(() => {
-        expect(useTagStore.getState().tagList).toEqual(freshTags)
-      })
-    })
-  })
-
   describe('Edge Cases', () => {
     it('should show no tag message when tag list is completely empty', async () => {
       const user = userEvent.setup()
-      // Mock fetchTagList to return empty so useMount doesn't repopulate
-      vi.mocked(fetchTagList).mockResolvedValue([])
-      act(() => {
-        useTagStore.setState({ tagList: [] })
-      })
+      mockUseQueryData.current = []
 
       render(<TagFilter {...defaultProps} />)
 
@@ -316,7 +280,7 @@ describe('TagFilter', () => {
       const onChange = vi.fn()
       render(<TagFilter {...defaultProps} value={['tag-1']} onChange={onChange} />)
 
-      const clearButton = screen.getByTestId('tag-filter-clear-button')
+      const clearButton = screen.getByRole('button', { name: i18n.operationClear })
       expect(clearButton).toBeInTheDocument()
 
       await user.click(clearButton)
diff --git a/web/app/components/base/tag-management/__tests__/tag-item-editor.spec.tsx b/web/features/tag-management/__tests__/tag-item-editor.spec.tsx
similarity index 69%
rename from web/app/components/base/tag-management/__tests__/tag-item-editor.spec.tsx
rename to web/features/tag-management/__tests__/tag-item-editor.spec.tsx
index 2f7a65b1b4..0114b677a6 100644
--- a/web/app/components/base/tag-management/__tests__/tag-item-editor.spec.tsx
+++ b/web/features/tag-management/__tests__/tag-item-editor.spec.tsx
@@ -1,10 +1,8 @@
-import type { Tag } from '@/app/components/base/tag-management/constant'
+import type { Tag } from '@/contract/console/tags'
 import { render, screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import * as React from 'react'
-import { act } from 'react'
-import { useStore as useTagStore } from '../store'
-import TagItemEditor from '../tag-item-editor'
+import { TagItemEditor } from '../components/tag-item-editor'
 
 const tagMocks = vi.hoisted(() => {
   const record = vi.fn()
@@ -25,9 +23,32 @@ const tagMocks = vi.hoisted(() => {
   }
 })
 
-vi.mock('@/service/tag', () => ({
-  updateTag: tagMocks.updateTag,
-  deleteTag: tagMocks.deleteTag,
+vi.mock('@tanstack/react-query', () => ({
+  useMutation: (mutationOptions: { mutationFn: (input: unknown) => Promise<unknown> }) => ({
+    isPending: false,
+    mutate: (input: unknown, options?: { onSuccess?: () => void, onError?: () => void }) => {
+      Promise.resolve(mutationOptions.mutationFn(input))
+        .then(() => options?.onSuccess?.())
+        .catch(() => options?.onError?.())
+    },
+  }),
+}))
+
+vi.mock('@/service/client', () => ({
+  consoleQuery: {
+    tags: {
+      update: {
+        mutationOptions: () => ({
+          mutationFn: ({ params, body }: { params: { tagId: string }, body: { name: string } }) => tagMocks.updateTag(params.tagId, body.name),
+        }),
+      },
+      delete: {
+        mutationOptions: () => ({
+          mutationFn: ({ params }: { params: { tagId: string } }) => tagMocks.deleteTag(params.tagId),
+        }),
+      },
+    },
+  },
 }))
 
 vi.mock('@langgenius/dify-ui/toast', () => ({
@@ -58,11 +79,10 @@ const baseTag: Tag = {
   binding_count: 3,
 }
 
-const anotherTag: Tag = {
-  id: 'tag-2',
-  name: 'Backend',
-  type: 'app',
-  binding_count: 1,
+const i18n = {
+  editTag: 'common.operation.edit Frontend',
+  removeTag: 'common.operation.remove Frontend',
+  renameTag: 'common.operation.rename Frontend',
 }
 
 describe('TagItemEditor', () => {
@@ -70,12 +90,6 @@ describe('TagItemEditor', () => {
     vi.clearAllMocks()
     vi.mocked(tagMocks.updateTag).mockResolvedValue(undefined)
     vi.mocked(tagMocks.deleteTag).mockResolvedValue(undefined)
-    act(() => {
-      useTagStore.setState({
-        tagList: [baseTag, anotherTag],
-        showTagManagementModal: false,
-      })
-    })
   })
 
   // Rendering behavior for initial tag display.
@@ -94,19 +108,19 @@ describe('TagItemEditor', () => {
       const user = userEvent.setup()
       render(<TagItemEditor tag={baseTag} />)
 
-      const editButton = screen.getByTestId('tag-item-editor-edit-button')
+      const editButton = screen.getByRole('button', { name: i18n.editTag })
       expect(editButton).toBeInTheDocument()
-      await user.click(editButton as HTMLElement)
+      await user.click(editButton)
 
-      expect(screen.getByRole('textbox')).toHaveValue('Frontend')
+      expect(screen.getByRole('textbox', { name: i18n.renameTag })).toHaveValue('Frontend')
     })
 
     it('should update tag and notify success when submitting a new name', async () => {
       const user = userEvent.setup()
       render(<TagItemEditor tag={baseTag} />)
 
-      const editButton = screen.getByTestId('tag-item-editor-edit-button')
-      await user.click(editButton as HTMLElement)
+      const editButton = screen.getByRole('button', { name: i18n.editTag })
+      await user.click(editButton)
 
       const input = screen.getByRole('textbox')
       await user.clear(input)
@@ -120,7 +134,6 @@ describe('TagItemEditor', () => {
         type: 'success',
         message: 'common.actionMsg.modifiedSuccessfully',
       })
-      expect(useTagStore.getState().tagList.find(tag => tag.id === 'tag-1')?.name).toBe('Frontend V2')
       expect(screen.queryByRole('textbox')).not.toBeInTheDocument()
     })
 
@@ -128,7 +141,7 @@ describe('TagItemEditor', () => {
       const user = userEvent.setup()
       render(<TagItemEditor tag={baseTag} />)
 
-      await user.click(screen.getByTestId('tag-item-editor-edit-button') as HTMLElement)
+      await user.click(screen.getByRole('button', { name: i18n.editTag }))
       await user.keyboard('{Enter}')
 
       expect(tagMocks.updateTag).not.toHaveBeenCalled()
@@ -139,8 +152,8 @@ describe('TagItemEditor', () => {
       const user = userEvent.setup()
       render(<TagItemEditor tag={baseTag} />)
 
-      const editButton = screen.getByTestId('tag-item-editor-edit-button')
-      await user.click(editButton as HTMLElement)
+      const editButton = screen.getByRole('button', { name: i18n.editTag })
+      await user.click(editButton)
 
       const input = screen.getByRole('textbox')
       await user.clear(input)
@@ -162,8 +175,8 @@ describe('TagItemEditor', () => {
       vi.mocked(tagMocks.updateTag).mockRejectedValueOnce(new Error('update failed'))
       render(<TagItemEditor tag={baseTag} />)
 
-      const editButton = screen.getByTestId('tag-item-editor-edit-button')
-      await user.click(editButton as HTMLElement)
+      const editButton = screen.getByRole('button', { name: i18n.editTag })
+      await user.click(editButton)
 
       const input = screen.getByRole('textbox')
       await user.clear(input)
@@ -177,7 +190,6 @@ describe('TagItemEditor', () => {
         type: 'error',
         message: 'common.actionMsg.modifiedUnsuccessfully',
       })
-      expect(useTagStore.getState().tagList.find(tag => tag.id === 'tag-1')?.name).toBe('Frontend')
     })
   })
 
@@ -186,14 +198,11 @@ describe('TagItemEditor', () => {
     it('should delete immediately when binding count is zero', async () => {
       const user = userEvent.setup()
       const removableTag: Tag = { ...baseTag, binding_count: 0 }
-      act(() => {
-        useTagStore.setState({ tagList: [removableTag, anotherTag] })
-      })
       render(<TagItemEditor tag={removableTag} />)
 
-      const removeButton = screen.getByTestId('tag-item-editor-remove-button')
+      const removeButton = screen.getByRole('button', { name: i18n.removeTag })
       expect(removeButton).toBeInTheDocument()
-      await user.click(removeButton as HTMLElement)
+      await user.click(removeButton)
 
       await waitFor(() => {
         expect(tagMocks.deleteTag).toHaveBeenCalledWith('tag-1')
@@ -202,15 +211,14 @@ describe('TagItemEditor', () => {
         type: 'success',
         message: 'common.actionMsg.modifiedSuccessfully',
       })
-      expect(useTagStore.getState().tagList.find(tag => tag.id === 'tag-1')).toBeUndefined()
     })
 
     it('should open confirm modal and delete on confirm when binding count is non-zero', async () => {
       const user = userEvent.setup()
       render(<TagItemEditor tag={baseTag} />)
 
-      const removeButton = screen.getByTestId('tag-item-editor-remove-button')
-      await user.click(removeButton as HTMLElement)
+      const removeButton = screen.getByRole('button', { name: i18n.removeTag })
+      await user.click(removeButton)
 
       expect(screen.getByText('common.tag.delete "Frontend"')).toBeInTheDocument()
       await user.click(screen.getByText('common.operation.confirm'))
@@ -227,8 +235,8 @@ describe('TagItemEditor', () => {
       const user = userEvent.setup()
       render(<TagItemEditor tag={baseTag} />)
 
-      const removeButton = screen.getByTestId('tag-item-editor-remove-button')
-      await user.click(removeButton as HTMLElement)
+      const removeButton = screen.getByRole('button', { name: i18n.removeTag })
+      await user.click(removeButton)
 
       expect(screen.getByText('common.tag.delete "Frontend"')).toBeInTheDocument()
       await user.click(screen.getByText('common.operation.cancel'))
@@ -243,13 +251,10 @@ describe('TagItemEditor', () => {
       const user = userEvent.setup()
       vi.mocked(tagMocks.deleteTag).mockRejectedValueOnce(new Error('delete failed'))
       const removableTag: Tag = { ...baseTag, binding_count: 0 }
-      act(() => {
-        useTagStore.setState({ tagList: [removableTag, anotherTag] })
-      })
       render(<TagItemEditor tag={removableTag} />)
 
-      const removeButton = screen.getByTestId('tag-item-editor-remove-button')
-      await user.click(removeButton as HTMLElement)
+      const removeButton = screen.getByRole('button', { name: i18n.removeTag })
+      await user.click(removeButton)
 
       await waitFor(() => {
         expect(tagMocks.deleteTag).toHaveBeenCalledWith('tag-1')
@@ -258,31 +263,6 @@ describe('TagItemEditor', () => {
         type: 'error',
         message: 'common.actionMsg.modifiedUnsuccessfully',
       })
-      expect(useTagStore.getState().tagList.find(tag => tag.id === 'tag-1')).toBeDefined()
-    })
-
-    it('should prevent duplicate delete requests while pending', async () => {
-      const user = userEvent.setup()
-      let resolveDelete!: () => void
-      vi.mocked(tagMocks.deleteTag).mockImplementation(() => new Promise((resolve) => {
-        resolveDelete = () => resolve(undefined)
-      }))
-
-      const removableTag: Tag = { ...baseTag, binding_count: 0 }
-      act(() => {
-        useTagStore.setState({ tagList: [removableTag, anotherTag] })
-      })
-      render(<TagItemEditor tag={removableTag} />)
-
-      const removeButton = screen.getByTestId('tag-item-editor-remove-button')
-      await user.click(removeButton as HTMLElement)
-      await user.click(removeButton as HTMLElement)
-
-      expect(tagMocks.deleteTag).toHaveBeenCalledTimes(1)
-
-      await act(async () => {
-        resolveDelete()
-      })
     })
   })
 })
diff --git a/web/app/components/base/tag-management/__tests__/index.spec.tsx b/web/features/tag-management/__tests__/tag-management-modal.spec.tsx
similarity index 53%
rename from web/app/components/base/tag-management/__tests__/index.spec.tsx
rename to web/features/tag-management/__tests__/tag-management-modal.spec.tsx
index 04d9bdd11f..d9afcca54f 100644
--- a/web/app/components/base/tag-management/__tests__/index.spec.tsx
+++ b/web/features/tag-management/__tests__/tag-management-modal.spec.tsx
@@ -1,11 +1,9 @@
-import type { Tag } from '@/app/components/base/tag-management/constant'
+import type { Tag } from '@/contract/console/tags'
 import { render, screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import * as React from 'react'
-import { act } from 'react'
 import * as ReactI18next from 'react-i18next'
-import TagManagementModal from '../index'
-import { useStore as useTagStore } from '../store'
+import { TagManagementModal } from '../components/tag-management-modal'
 
 const { mockNotify, mockToast } = vi.hoisted(() => {
   const mockNotify = vi.fn()
@@ -25,15 +23,46 @@ vi.mock('@langgenius/dify-ui/toast', () => ({
   toast: mockToast,
 }))
 
-// Hoisted mocks
-const { fetchTagList, createTag } = vi.hoisted(() => ({
-  fetchTagList: vi.fn(),
+const { mockUseQueryData, createTag } = vi.hoisted(() => ({
+  mockUseQueryData: { current: [] as Tag[] },
   createTag: vi.fn(),
 }))
 
-vi.mock('@/service/tag', () => ({
-  fetchTagList,
-  createTag,
+vi.mock('@tanstack/react-query', () => ({
+  useQuery: () => ({ data: mockUseQueryData.current }),
+  useMutation: (mutationOptions: { mutationFn: (input: unknown) => Promise<unknown> }) => ({
+    isPending: false,
+    mutate: (input: unknown, options?: { onSuccess?: () => void, onError?: () => void }) => {
+      Promise.resolve(mutationOptions.mutationFn(input))
+        .then(() => options?.onSuccess?.())
+        .catch(() => options?.onError?.())
+    },
+  }),
+}))
+
+vi.mock('@/service/client', () => ({
+  consoleQuery: {
+    tags: {
+      list: {
+        queryOptions: () => ({}),
+      },
+      create: {
+        mutationOptions: () => ({
+          mutationFn: ({ body }: { body: { name: string, type: 'app' | 'knowledge' } }) => createTag(body.name, body.type),
+        }),
+      },
+      update: {
+        mutationOptions: () => ({
+          mutationFn: () => Promise.resolve(undefined),
+        }),
+      },
+      delete: {
+        mutationOptions: () => ({
+          mutationFn: () => Promise.resolve(undefined),
+        }),
+      },
+    },
+  },
 }))
 
 const mockTags: Tag[] = [
@@ -45,6 +74,7 @@ const mockTags: Tag[] = [
 const defaultProps = {
   type: 'app' as const,
   show: true,
+  onClose: vi.fn(),
 }
 
 // i18n mock renders "ns.key" format (dot-separated)
@@ -58,11 +88,8 @@ const i18n = {
 describe('TagManagementModal', () => {
   beforeEach(() => {
     vi.clearAllMocks()
-    vi.mocked(fetchTagList).mockResolvedValue(mockTags)
+    mockUseQueryData.current = mockTags
     vi.mocked(createTag).mockResolvedValue({ id: 'new-tag', name: 'NewTag', type: 'app', binding_count: 0 })
-    act(() => {
-      useTagStore.setState({ tagList: mockTags, showTagManagementModal: false })
-    })
   })
 
   describe('Rendering', () => {
@@ -73,13 +100,12 @@ describe('TagManagementModal', () => {
 
     it('should render the close button', () => {
       render(<TagManagementModal {...defaultProps} />)
-      const closeIcon = screen.getByTestId('tag-management-modal-close-button')
-      expect(closeIcon).toBeTruthy()
+      expect(screen.getByRole('button', { name: 'Close' })).toBeInTheDocument()
     })
 
     it('should render the new tag input with placeholder', () => {
       render(<TagManagementModal {...defaultProps} />)
-      expect(screen.getByPlaceholderText(i18n.addNew)).toBeInTheDocument()
+      expect(screen.getByRole('textbox', { name: i18n.addNew })).toBeInTheDocument()
     })
 
     it('should fallback to empty placeholder when translation returns empty', () => {
@@ -95,7 +121,7 @@ describe('TagManagementModal', () => {
       expect(screen.getByRole('textbox')).toHaveAttribute('placeholder', '')
     })
 
-    it('should render existing tags from the store', () => {
+    it('should render existing tags from query data', () => {
       render(<TagManagementModal {...defaultProps} />)
       // TagItemEditor renders each tag's name
       expect(screen.getByText('Frontend')).toBeInTheDocument()
@@ -109,39 +135,22 @@ describe('TagManagementModal', () => {
     })
   })
 
-  describe('Props', () => {
-    it('should fetch tags for the given type on mount', async () => {
-      render(<TagManagementModal {...defaultProps} type="app" />)
-      await waitFor(() => {
-        expect(fetchTagList).toHaveBeenCalledWith('app')
-      })
-    })
-
-    it('should fetch knowledge tags when type is knowledge', async () => {
-      render(<TagManagementModal {...defaultProps} type="knowledge" />)
-      await waitFor(() => {
-        expect(fetchTagList).toHaveBeenCalledWith('knowledge')
-      })
-    })
-  })
-
   describe('User Interactions', () => {
     it('should close modal when close button is clicked', async () => {
       const user = userEvent.setup()
-      render(<TagManagementModal {...defaultProps} />)
+      const onClose = vi.fn()
+      render(<TagManagementModal {...defaultProps} onClose={onClose} />)
 
-      const closeIcon = screen.getByTestId('tag-management-modal-close-button')
-      const closeButton = closeIcon.parentElement!
-      await user.click(closeButton)
+      await user.click(screen.getByRole('button', { name: 'Close' }))
 
-      expect(useTagStore.getState().showTagManagementModal).toBe(false)
+      expect(onClose).toHaveBeenCalledTimes(1)
     })
 
     it('should update input value when typing', async () => {
       const user = userEvent.setup()
       render(<TagManagementModal {...defaultProps} />)
 
-      const input = screen.getByPlaceholderText(i18n.addNew)
+      const input = screen.getByRole('textbox', { name: i18n.addNew })
       await user.type(input, 'NewTag')
 
       expect(input).toHaveValue('NewTag')
@@ -151,7 +160,7 @@ describe('TagManagementModal', () => {
       const user = userEvent.setup()
       render(<TagManagementModal {...defaultProps} />)
 
-      const input = screen.getByPlaceholderText(i18n.addNew)
+      const input = screen.getByRole('textbox', { name: i18n.addNew })
       await user.type(input, 'NewTag')
       await user.keyboard('{Enter}')
 
@@ -164,7 +173,7 @@ describe('TagManagementModal', () => {
       const user = userEvent.setup()
       render(<TagManagementModal {...defaultProps} />)
 
-      const input = screen.getByPlaceholderText(i18n.addNew)
+      const input = screen.getByRole('textbox', { name: i18n.addNew })
       await user.type(input, 'NewTag')
       await user.keyboard('{Enter}')
 
@@ -180,7 +189,7 @@ describe('TagManagementModal', () => {
       const user = userEvent.setup()
       render(<TagManagementModal {...defaultProps} />)
 
-      const input = screen.getByPlaceholderText(i18n.addNew)
+      const input = screen.getByRole('textbox', { name: i18n.addNew })
       await user.type(input, 'NewTag')
       await user.keyboard('{Enter}')
 
@@ -189,45 +198,11 @@ describe('TagManagementModal', () => {
       })
     })
 
-    it('should add the new tag to the store tag list', async () => {
-      const user = userEvent.setup()
-      const newTag = { id: 'new-tag', name: 'NewTag', type: 'app', binding_count: 0 }
-      vi.mocked(createTag).mockResolvedValue(newTag)
-
-      render(<TagManagementModal {...defaultProps} />)
-
-      const input = screen.getByPlaceholderText(i18n.addNew)
-      await user.type(input, 'NewTag')
-      await user.keyboard('{Enter}')
-
-      await waitFor(() => {
-        const storeTagList = useTagStore.getState().tagList
-        expect(storeTagList).toContainEqual(newTag)
-      })
-    })
-
-    it('should prepend the new tag to the beginning of the list', async () => {
-      const user = userEvent.setup()
-      const newTag = { id: 'new-tag', name: 'NewTag', type: 'app', binding_count: 0 }
-      vi.mocked(createTag).mockResolvedValue(newTag)
-
-      render(<TagManagementModal {...defaultProps} />)
-
-      const input = screen.getByPlaceholderText(i18n.addNew)
-      await user.type(input, 'NewTag')
-      await user.keyboard('{Enter}')
-
-      await waitFor(() => {
-        const storeTagList = useTagStore.getState().tagList
-        expect(storeTagList[0]).toEqual(newTag)
-      })
-    })
-
     it('should create a tag on input blur-sm', async () => {
       const user = userEvent.setup()
       render(<TagManagementModal {...defaultProps} />)
 
-      const input = screen.getByPlaceholderText(i18n.addNew)
+      const input = screen.getByRole('textbox', { name: i18n.addNew })
       await user.type(input, 'NewTag')
       // Click outside to trigger blur
       await user.click(document.body)
@@ -243,7 +218,7 @@ describe('TagManagementModal', () => {
       const user = userEvent.setup()
       render(<TagManagementModal {...defaultProps} />)
 
-      const input = screen.getByPlaceholderText(i18n.addNew)
+      const input = screen.getByRole('textbox', { name: i18n.addNew })
       // Focus and press Enter without typing
       await user.click(input)
       await user.keyboard('{Enter}')
@@ -257,7 +232,7 @@ describe('TagManagementModal', () => {
 
       render(<TagManagementModal {...defaultProps} />)
 
-      const input = screen.getByPlaceholderText(i18n.addNew)
+      const input = screen.getByRole('textbox', { name: i18n.addNew })
       await user.type(input, 'FailTag')
       await user.keyboard('{Enter}')
 
@@ -268,79 +243,16 @@ describe('TagManagementModal', () => {
         })
       })
     })
-
-    it('should not allow duplicate creation while pending', async () => {
-      const user = userEvent.setup()
-      // Make createTag slow to simulate pending
-      let resolveCreate: (value: Tag) => void
-      vi.mocked(createTag).mockImplementation(() => new Promise((resolve) => {
-        resolveCreate = resolve
-      }))
-
-      render(<TagManagementModal {...defaultProps} />)
-
-      const input = screen.getByPlaceholderText(i18n.addNew)
-      await user.type(input, 'NewTag')
-      await user.keyboard('{Enter}')
-
-      // First call should go through
-      expect(createTag).toHaveBeenCalledTimes(1)
-
-      // Attempt second creation while first is pending — need to type again + enter
-      // But the component sets pending=true, so the second call is blocked.
-      // The input value was cleared? No — pending is set before clearing.
-      // Actually the component does: setPending(true) -> await createTag -> setName('') -> setPending(false)
-      // So while pending, name is still 'NewTag', but calling createNewTag again does nothing.
-      // We can trigger via blur
-      await user.click(document.body)
-
-      // Should still be only 1 call because pending guard blocks it
-      expect(createTag).toHaveBeenCalledTimes(1)
-
-      // Resolve the pending promise
-      await act(async () => {
-        resolveCreate!({ id: 'new-tag', name: 'NewTag', type: 'app', binding_count: 0 })
-      })
-    })
-  })
-
-  describe('Data Fetching', () => {
-    it('should update store with fetched tags', async () => {
-      const freshTags: Tag[] = [
-        { id: 'fresh-1', name: 'FreshTag', type: 'app', binding_count: 0 },
-      ]
-      vi.mocked(fetchTagList).mockResolvedValue(freshTags)
-      act(() => {
-        useTagStore.setState({ tagList: [] })
-      })
-
-      render(<TagManagementModal {...defaultProps} />)
-
-      await waitFor(() => {
-        expect(useTagStore.getState().tagList).toEqual(freshTags)
-      })
-    })
-
-    it('should refetch when type prop changes', () => {
-      const { rerender } = render(<TagManagementModal {...defaultProps} type="app" />)
-      expect(fetchTagList).toHaveBeenCalledWith('app')
-
-      vi.clearAllMocks()
-      rerender(<TagManagementModal {...defaultProps} type="knowledge" />)
-      expect(fetchTagList).toHaveBeenCalledWith('knowledge')
-    })
   })
 
   describe('Edge Cases', () => {
     it('should handle empty tag list', () => {
-      act(() => {
-        useTagStore.setState({ tagList: [] })
-      })
+      mockUseQueryData.current = []
 
       render(<TagManagementModal {...defaultProps} />)
 
       // Should still render the input
-      expect(screen.getByPlaceholderText(i18n.addNew)).toBeInTheDocument()
+      expect(screen.getByRole('textbox', { name: i18n.addNew })).toBeInTheDocument()
     })
 
     it('should handle tag creation with knowledge type', async () => {
@@ -349,7 +261,7 @@ describe('TagManagementModal', () => {
 
       render(<TagManagementModal {...defaultProps} type="knowledge" />)
 
-      const input = screen.getByPlaceholderText(i18n.addNew)
+      const input = screen.getByRole('textbox', { name: i18n.addNew })
       await user.type(input, 'KnowledgeTag')
       await user.keyboard('{Enter}')
 
@@ -360,13 +272,11 @@ describe('TagManagementModal', () => {
 
     it('should close modal via the Modal onClose callback', async () => {
       const user = userEvent.setup()
-      act(() => {
-        useTagStore.setState({ showTagManagementModal: true })
-      })
-      render(<TagManagementModal {...defaultProps} />)
+      const onClose = vi.fn()
+      render(<TagManagementModal {...defaultProps} onClose={onClose} />)
       await user.keyboard('{Escape}')
       await waitFor(() => {
-        expect(useTagStore.getState().showTagManagementModal).toBe(false)
+        expect(onClose).toHaveBeenCalled()
       })
     })
   })
diff --git a/web/features/tag-management/__tests__/tag-panel.spec.tsx b/web/features/tag-management/__tests__/tag-panel.spec.tsx
new file mode 100644
index 0000000000..78c129b89d
--- /dev/null
+++ b/web/features/tag-management/__tests__/tag-panel.spec.tsx
@@ -0,0 +1,198 @@
+import type { TagComboboxItem } from '../components/tag-combobox-item'
+import type { Tag, TagType } from '@/contract/console/tags'
+import { Combobox } from '@langgenius/dify-ui/combobox'
+import { render, screen } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { useMemo, useState } from 'react'
+import { isCreateTagOption } from '../components/tag-combobox-item'
+import { TagPanel } from '../components/tag-panel'
+
+const { onValueChangeSpy } = vi.hoisted(() => ({
+  onValueChangeSpy: vi.fn(),
+}))
+
+const i18n = {
+  selectorPlaceholder: 'common.tag.selectorPlaceholder',
+  operationClear: 'common.operation.clear',
+  create: 'common.tag.create',
+  noTag: 'common.tag.noTag',
+  manageTags: 'common.tag.manageTags',
+}
+
+const appTags: Tag[] = [
+  { id: 'tag-1', name: 'Frontend', type: 'app', binding_count: 3 },
+  { id: 'tag-2', name: 'Backend', type: 'app', binding_count: 5 },
+  { id: 'tag-3', name: 'API', type: 'app', binding_count: 1 },
+]
+
+const knowledgeTag: Tag = { id: 'tag-k1', name: 'KnowledgeDB', type: 'knowledge', binding_count: 2 }
+
+type PanelHarnessProps = {
+  type?: TagType
+  value?: Tag[]
+  tagList?: Tag[]
+  onOpenTagManagement?: () => void
+}
+
+const tagToString = (tag: TagComboboxItem) => tag.name
+const isSameTag = (item: TagComboboxItem, value: TagComboboxItem) => item.id === value.id
+const tagFilter = (tag: TagComboboxItem, query: string) => tag.name.includes(query)
+
+const PanelHarness = ({
+  type = 'app',
+  value = [appTags[0]!],
+  tagList = [...appTags, knowledgeTag],
+  onOpenTagManagement,
+}: PanelHarnessProps) => {
+  const [selectedTags, setSelectedTags] = useState<Tag[]>(value)
+  const [inputValue, setInputValue] = useState('')
+  const items = useMemo<TagComboboxItem[]>(() => {
+    const tags = tagList.filter(tag => tag.type === type)
+
+    if (!inputValue || tags.some(tag => tag.name === inputValue))
+      return tags
+
+    return [{
+      id: `__create_tag__:${inputValue}`,
+      name: inputValue,
+      type,
+      binding_count: 0,
+      isCreateOption: true,
+    }, ...tags]
+  }, [inputValue, tagList, type])
+
+  return (
+    <Combobox
+      items={items}
+      multiple
+      value={selectedTags}
+      onValueChange={(nextTags) => {
+        onValueChangeSpy(nextTags)
+        if (nextTags.some(isCreateTagOption))
+          return
+        setSelectedTags(nextTags)
+      }}
+      inputValue={inputValue}
+      onInputValueChange={setInputValue}
+      filter={tagFilter}
+      itemToStringLabel={tagToString}
+      isItemEqualToValue={isSameTag}
+    >
+      <TagPanel
+        type={type}
+        inputValue={inputValue}
+        onInputValueChange={setInputValue}
+        onOpenTagManagement={onOpenTagManagement}
+      />
+    </Combobox>
+  )
+}
+
+describe('TagPanel', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('renders search, selected tags, unselected tags, and management action', () => {
+    render(<PanelHarness />)
+
+    expect(screen.getByRole('combobox', { name: i18n.selectorPlaceholder })).toBeInTheDocument()
+    expect(screen.getByRole('option', { name: /Frontend/i })).toBeInTheDocument()
+    expect(screen.getByRole('option', { name: /Backend/i })).toBeInTheDocument()
+    expect(screen.queryByText('KnowledgeDB')).not.toBeInTheDocument()
+    expect(screen.getByRole('button', { name: i18n.manageTags })).toBeInTheDocument()
+  })
+
+  it('filters options by the controlled combobox input value', async () => {
+    const user = userEvent.setup()
+    render(<PanelHarness />)
+
+    await user.type(screen.getByRole('combobox', { name: i18n.selectorPlaceholder }), 'Back')
+
+    expect(screen.getByRole('option', { name: /Backend/i })).toBeInTheDocument()
+    expect(screen.queryByRole('option', { name: /API/i })).not.toBeInTheDocument()
+  })
+
+  it('clears only the search input from the input clear button', async () => {
+    const user = userEvent.setup()
+    render(<PanelHarness />)
+
+    const input = screen.getByRole('combobox', { name: i18n.selectorPlaceholder })
+    await user.type(input, 'Back')
+    expect(input).toHaveValue('Back')
+    vi.clearAllMocks()
+
+    await user.click(screen.getByRole('button', { name: i18n.operationClear }))
+
+    expect(input).toHaveValue('')
+    expect(onValueChangeSpy).not.toHaveBeenCalled()
+    expect(screen.getByRole('option', { name: /Frontend/i })).toHaveAttribute('aria-selected', 'true')
+  })
+
+  it('shows a create option when the query is not an existing tag name', async () => {
+    const user = userEvent.setup()
+    render(<PanelHarness />)
+
+    await user.type(screen.getByRole('combobox', { name: i18n.selectorPlaceholder }), 'BrandNewTag')
+
+    const createOption = screen.getByRole('option', { name: /BrandNewTag/i })
+    expect(createOption).toHaveTextContent(i18n.create)
+    expect(createOption).toHaveTextContent('BrandNewTag')
+  })
+
+  it('does not show a create option for an exact existing tag name', async () => {
+    const user = userEvent.setup()
+    render(<PanelHarness />)
+
+    await user.type(screen.getByRole('combobox', { name: i18n.selectorPlaceholder }), 'Frontend')
+
+    expect(screen.queryByRole('option', { name: /common\.tag\.create/i })).not.toBeInTheDocument()
+  })
+
+  it('updates only the combobox draft value when selecting and deselecting options', async () => {
+    const user = userEvent.setup()
+    render(<PanelHarness />)
+
+    await user.click(screen.getByRole('option', { name: /Backend/i }))
+    expect(onValueChangeSpy).toHaveBeenLastCalledWith(expect.arrayContaining([expect.objectContaining({ id: 'tag-2' })]))
+
+    await user.click(screen.getByRole('option', { name: /Backend/i }))
+    expect(onValueChangeSpy).toHaveBeenLastCalledWith([expect.objectContaining({ id: 'tag-1' })])
+  })
+
+  it('routes create option activation through the combobox value change API', async () => {
+    const user = userEvent.setup()
+    render(<PanelHarness />)
+
+    const input = screen.getByRole('combobox', { name: i18n.selectorPlaceholder })
+    await user.type(input, 'BrandNewTag')
+    await user.click(screen.getByRole('option', { name: /BrandNewTag/i }))
+
+    expect(onValueChangeSpy).toHaveBeenLastCalledWith(expect.arrayContaining([
+      expect.objectContaining({
+        isCreateOption: true,
+        name: 'BrandNewTag',
+      }),
+    ]))
+  })
+
+  it('renders the empty state when no tags exist and no search is active', () => {
+    render(<PanelHarness value={[]} tagList={[]} />)
+    expect(screen.getByText(i18n.noTag)).toBeInTheDocument()
+  })
+
+  it('opens tag management through a semantic button', async () => {
+    const user = userEvent.setup()
+    const onOpenTagManagement = vi.fn()
+    render(<PanelHarness onOpenTagManagement={onOpenTagManagement} />)
+
+    await user.click(screen.getByRole('button', { name: i18n.manageTags }))
+
+    expect(onOpenTagManagement).toHaveBeenCalledTimes(1)
+  })
+
+  it('renders knowledge tags when the panel type is knowledge', () => {
+    render(<PanelHarness type="knowledge" value={[]} />)
+    expect(screen.getByRole('option', { name: /KnowledgeDB/i })).toBeInTheDocument()
+  })
+})
diff --git a/web/features/tag-management/__tests__/tag-selector.spec.tsx b/web/features/tag-management/__tests__/tag-selector.spec.tsx
new file mode 100644
index 0000000000..f33470825b
--- /dev/null
+++ b/web/features/tag-management/__tests__/tag-selector.spec.tsx
@@ -0,0 +1,243 @@
+import type { ComponentProps } from 'react'
+import type { Tag } from '@/contract/console/tags'
+import { render, screen, waitFor } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { TagSelector } from '../components/tag-selector'
+
+const { mockToast } = vi.hoisted(() => {
+  const mockToast = Object.assign(vi.fn(), {
+    success: vi.fn(),
+    error: vi.fn(),
+    warning: vi.fn(),
+    info: vi.fn(),
+    dismiss: vi.fn(),
+    update: vi.fn(),
+    promise: vi.fn(),
+  })
+  return { mockToast }
+})
+
+vi.mock('@langgenius/dify-ui/toast', () => ({ toast: mockToast }))
+
+const { mockUseQueryData, createTag, bindTag, unBindTag } = vi.hoisted(() => {
+  const mockUseQueryData: { current: Tag[] } = { current: [] }
+  return {
+    mockUseQueryData,
+    createTag: vi.fn(),
+    bindTag: vi.fn(),
+    unBindTag: vi.fn(),
+  }
+})
+
+vi.mock('@tanstack/react-query', () => ({
+  useQuery: () => ({ data: mockUseQueryData.current }),
+  useMutation: (mutationOptions: { mutationFn: (input: unknown) => Promise<unknown> }) => ({
+    isPending: false,
+    mutate: (input: unknown, options?: { onSuccess?: () => void, onError?: () => void }) => {
+      Promise.resolve(mutationOptions.mutationFn(input))
+        .then(() => options?.onSuccess?.())
+        .catch(() => options?.onError?.())
+    },
+  }),
+}))
+
+vi.mock('@/service/client', () => ({
+  consoleQuery: {
+    tags: {
+      list: {
+        queryOptions: () => ({}),
+      },
+      create: {
+        mutationOptions: () => ({
+          mutationFn: ({ body }: { body: { name: string, type: 'app' | 'knowledge' } }) => createTag(body.name, body.type),
+        }),
+      },
+    },
+  },
+}))
+
+vi.mock('../hooks/use-tag-mutations', () => ({
+  useApplyTagBindingsMutation: () => ({
+    mutate: (
+      { currentTagIds, nextTagIds, targetId, type }: { currentTagIds: string[], nextTagIds: string[], targetId: string, type: 'app' | 'knowledge' },
+      options?: { onSuccess?: () => void, onError?: () => void, onSettled?: () => void },
+    ) => {
+      const addTagIds = nextTagIds.filter(tagId => !currentTagIds.includes(tagId))
+      const removeTagIds = currentTagIds.filter(tagId => !nextTagIds.includes(tagId))
+      const operations: Promise<unknown>[] = []
+
+      if (addTagIds.length)
+        operations.push(Promise.resolve(bindTag(addTagIds, targetId, type)))
+      operations.push(...removeTagIds.map(tagId => Promise.resolve(unBindTag(tagId, targetId, type))))
+
+      Promise.all(operations)
+        .then(() => options?.onSuccess?.())
+        .catch(() => options?.onError?.())
+        .finally(() => options?.onSettled?.())
+    },
+  }),
+}))
+
+const i18n = {
+  addTag: 'common.tag.addTag',
+  selectorPlaceholder: 'common.tag.selectorPlaceholder',
+  manageTags: 'common.tag.manageTags',
+  modifiedSuccessfully: 'common.actionMsg.modifiedSuccessfully',
+  modifiedUnsuccessfully: 'common.actionMsg.modifiedUnsuccessfully',
+}
+
+const appTags: Tag[] = [
+  { id: 'tag-1', name: 'Frontend', type: 'app', binding_count: 3 },
+  { id: 'tag-2', name: 'Backend', type: 'app', binding_count: 5 },
+]
+
+const defaultProps = {
+  targetId: 'target-1',
+  type: 'app',
+  value: [appTags[0]!],
+} satisfies ComponentProps<typeof TagSelector>
+
+describe('TagSelector', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockUseQueryData.current = appTags
+    vi.mocked(createTag).mockResolvedValue({ id: 'new-tag', name: 'NewTag', type: 'app', binding_count: 0 })
+    vi.mocked(bindTag).mockResolvedValue(undefined)
+    vi.mocked(unBindTag).mockResolvedValue(undefined)
+  })
+
+  it('renders selected tag names in the combobox trigger', () => {
+    render(<TagSelector {...defaultProps} />)
+    expect(screen.getByText('Frontend')).toBeInTheDocument()
+  })
+
+  it('renders the add tag trigger when no current tag is visible in the workspace tag list', () => {
+    render(<TagSelector {...defaultProps} value={[{ id: 'orphan', name: 'Orphan', type: 'app', binding_count: 0 }]} />)
+    expect(screen.queryByText('Orphan')).not.toBeInTheDocument()
+    expect(screen.getByText(i18n.addTag)).toBeInTheDocument()
+  })
+
+  it('opens a searchable combobox popup', async () => {
+    const user = userEvent.setup()
+    render(<TagSelector {...defaultProps} />)
+
+    await user.click(screen.getByRole('combobox', { name: /Frontend/i }))
+
+    expect(await screen.findByRole('combobox', { name: i18n.selectorPlaceholder })).toBeInTheDocument()
+    expect(screen.getByText(i18n.manageTags)).toBeInTheDocument()
+    expect(screen.getByRole('option', { name: /Backend/i })).toBeInTheDocument()
+  })
+
+  it('applies added tags only when the popup closes', async () => {
+    const user = userEvent.setup()
+    render(<TagSelector {...defaultProps} />)
+
+    const trigger = screen.getByRole('combobox', { name: /Frontend/i })
+    await user.click(trigger)
+    await user.click(await screen.findByRole('option', { name: /Backend/i }))
+
+    expect(bindTag).not.toHaveBeenCalled()
+
+    await user.click(trigger)
+
+    await waitFor(() => {
+      expect(bindTag).toHaveBeenCalledWith(['tag-2'], 'target-1', 'app')
+    })
+    expect(mockToast.success).toHaveBeenCalledWith(i18n.modifiedSuccessfully, {
+      id: 'tag-bindings-app-target-1',
+    })
+  })
+
+  it('selects the highlighted tag with keyboard navigation and applies it on close', async () => {
+    const user = userEvent.setup()
+    render(<TagSelector {...defaultProps} />)
+
+    const trigger = screen.getByRole('combobox', { name: /Frontend/i })
+    await user.click(trigger)
+    await user.type(await screen.findByRole('combobox', { name: i18n.selectorPlaceholder }), 'Back')
+    await user.keyboard('{ArrowDown}')
+    await user.keyboard('{Enter}')
+    await user.click(trigger)
+
+    await waitFor(() => {
+      expect(bindTag).toHaveBeenCalledWith(['tag-2'], 'target-1', 'app')
+    })
+  })
+
+  it('applies removed tags only when the popup closes', async () => {
+    const user = userEvent.setup()
+    render(<TagSelector {...defaultProps} />)
+
+    const trigger = screen.getByRole('combobox', { name: /Frontend/i })
+    await user.click(trigger)
+    await user.click(await screen.findByRole('option', { name: /Frontend/i }))
+    await user.click(trigger)
+
+    await waitFor(() => {
+      expect(unBindTag).toHaveBeenCalledWith('tag-1', 'target-1', 'app')
+    })
+  })
+
+  it('does not submit unchanged draft selections on close', async () => {
+    const user = userEvent.setup()
+    const onTagsChange = vi.fn()
+    render(<TagSelector {...defaultProps} onTagsChange={onTagsChange} />)
+
+    const trigger = screen.getByRole('combobox', { name: /Frontend/i })
+    await user.click(trigger)
+    await screen.findByRole('combobox', { name: i18n.selectorPlaceholder })
+    await user.click(trigger)
+
+    expect(bindTag).not.toHaveBeenCalled()
+    expect(unBindTag).not.toHaveBeenCalled()
+    expect(mockToast.success).not.toHaveBeenCalled()
+    expect(mockToast.error).not.toHaveBeenCalled()
+    expect(onTagsChange).not.toHaveBeenCalled()
+  })
+
+  it('notifies after apply settles with success or error', async () => {
+    const user = userEvent.setup()
+    const onTagsChange = vi.fn()
+    render(<TagSelector {...defaultProps} onTagsChange={onTagsChange} />)
+
+    const trigger = screen.getByRole('combobox', { name: /Frontend/i })
+    await user.click(trigger)
+    await user.click(await screen.findByRole('option', { name: /Backend/i }))
+    await user.click(trigger)
+
+    await waitFor(() => {
+      expect(onTagsChange).toHaveBeenCalledTimes(1)
+    })
+  })
+
+  it('shows an error toast when applying bindings fails', async () => {
+    const user = userEvent.setup()
+    vi.mocked(unBindTag).mockRejectedValueOnce(new Error('Unbind failed'))
+    render(<TagSelector {...defaultProps} />)
+
+    const trigger = screen.getByRole('combobox', { name: /Frontend/i })
+    await user.click(trigger)
+    await user.click(await screen.findByRole('option', { name: /Frontend/i }))
+    await user.click(trigger)
+
+    await waitFor(() => {
+      expect(mockToast.error).toHaveBeenCalledWith(i18n.modifiedUnsuccessfully, {
+        id: 'tag-bindings-app-target-1',
+      })
+    })
+  })
+
+  it('creates a tag with the current tag type without binding it implicitly', async () => {
+    const user = userEvent.setup()
+    render(<TagSelector {...defaultProps} type="knowledge" value={[]} />)
+
+    await user.click(screen.getByRole('combobox', { name: i18n.addTag }))
+    await user.type(await screen.findByRole('combobox', { name: i18n.selectorPlaceholder }), 'NewKnowledgeTag')
+    await user.click(await screen.findByRole('option', { name: /NewKnowledgeTag/i }))
+
+    await waitFor(() => {
+      expect(createTag).toHaveBeenCalledWith('NewKnowledgeTag', 'knowledge')
+    })
+    expect(bindTag).not.toHaveBeenCalled()
+  })
+})
diff --git a/web/app/components/base/tag-management/__tests__/trigger.spec.tsx b/web/features/tag-management/__tests__/tag-trigger.spec.tsx
similarity index 75%
rename from web/app/components/base/tag-management/__tests__/trigger.spec.tsx
rename to web/features/tag-management/__tests__/tag-trigger.spec.tsx
index e188c4fed9..abca2b95ec 100644
--- a/web/app/components/base/tag-management/__tests__/trigger.spec.tsx
+++ b/web/features/tag-management/__tests__/tag-trigger.spec.tsx
@@ -1,5 +1,5 @@
 import { render, screen } from '@testing-library/react'
-import Trigger from '../trigger'
+import { TagTrigger } from '../components/tag-trigger'
 
 describe('Trigger', () => {
   beforeEach(() => {
@@ -9,13 +9,13 @@ describe('Trigger', () => {
   // Rendering behavior for empty and populated states.
   describe('Rendering', () => {
     it('should render add-tag placeholder when tags are empty', () => {
-      render(<Trigger tags={[]} />)
+      render(<TagTrigger tags={[]} />)
 
       expect(screen.getByText('common.tag.addTag')).toBeInTheDocument()
     })
 
     it('should render all tags when tags are provided', () => {
-      render(<Trigger tags={['Frontend', 'Backend']} />)
+      render(<TagTrigger tags={['Frontend', 'Backend']} />)
 
       expect(screen.getByText('Frontend')).toBeInTheDocument()
       expect(screen.getByText('Backend')).toBeInTheDocument()
@@ -26,10 +26,10 @@ describe('Trigger', () => {
   // Prop-driven rendering updates.
   describe('Props', () => {
     it('should update from placeholder to tag badges when tags prop changes', () => {
-      const { rerender } = render(<Trigger tags={[]} />)
+      const { rerender } = render(<TagTrigger tags={[]} />)
       expect(screen.getByText('common.tag.addTag')).toBeInTheDocument()
 
-      rerender(<Trigger tags={['Database']} />)
+      rerender(<TagTrigger tags={['Database']} />)
 
       expect(screen.getByText('Database')).toBeInTheDocument()
       expect(screen.queryByText('common.tag.addTag')).not.toBeInTheDocument()
@@ -39,19 +39,18 @@ describe('Trigger', () => {
   // Edge behavior for unusual but valid tag arrays.
   describe('Edge Cases', () => {
     it('should render a badge even when a tag label is an empty string', () => {
-      render(<Trigger tags={['']} />)
+      render(<TagTrigger tags={['']} />)
 
-      // One outer container + one tag badge.
-      expect(screen.getAllByTestId(/^tag-badge-/)).toHaveLength(1)
+      expect(screen.getAllByRole('listitem')).toHaveLength(1)
       expect(screen.queryByText('common.tag.addTag')).not.toBeInTheDocument()
     })
 
     it('should render one badge per tag for longer tag lists', () => {
       const tags = ['A', 'B', 'C', 'D', 'E']
-      render(<Trigger tags={tags} />)
+      render(<TagTrigger tags={tags} />)
 
       tags.forEach(tag => expect(screen.getByText(tag)).toBeInTheDocument())
-      expect(screen.getAllByTestId(/^tag-badge-/)).toHaveLength(tags.length)
+      expect(screen.getAllByRole('listitem')).toHaveLength(tags.length)
     })
   })
 })
diff --git a/web/features/tag-management/components/__tests__/app-card-tags.spec.tsx b/web/features/tag-management/components/__tests__/app-card-tags.spec.tsx
new file mode 100644
index 0000000000..8a75e99770
--- /dev/null
+++ b/web/features/tag-management/components/__tests__/app-card-tags.spec.tsx
@@ -0,0 +1,85 @@
+import type { Tag } from '@/contract/console/tags'
+import { fireEvent, render, screen } from '@testing-library/react'
+import { describe, expect, it, vi } from 'vitest'
+import { AppCardTags } from '../app-card-tags'
+
+const renderTagSelector = vi.hoisted(() => vi.fn())
+
+vi.mock('@/features/tag-management/components/tag-selector', () => ({
+  TagSelector: (props: {
+    onOpenTagManagement?: () => void
+    onTagsChange?: () => void
+    placement: string
+    targetId: string
+    type: string
+    value: Tag[]
+  }) => {
+    renderTagSelector(props)
+
+    return (
+      <div role="group" aria-label="Tag selector mock">
+        <span>{props.value.map(tag => tag.name).join(',')}</span>
+        <button type="button" onClick={props.onOpenTagManagement}>Manage Tags</button>
+        <button type="button" onClick={props.onTagsChange}>Tags Changed</button>
+      </div>
+    )
+  },
+}))
+
+const tags: Tag[] = [
+  { id: 'tag-1', name: 'Frontend', type: 'app', binding_count: 1 },
+  { id: 'tag-2', name: 'Backend', type: 'app', binding_count: 2 },
+]
+
+describe('AppCardTags', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  describe('Rendering', () => {
+    it('should render TagSelector with app tag bindings', () => {
+      render(<AppCardTags appId="app-1" tags={tags} />)
+
+      expect(screen.getByRole('group', { name: 'Tag selector mock' })).toBeInTheDocument()
+      expect(screen.getByText('Frontend,Backend')).toBeInTheDocument()
+      expect(renderTagSelector).toHaveBeenCalledWith(expect.objectContaining({
+        placement: 'bottom-start',
+        targetId: 'app-1',
+        type: 'app',
+        value: tags,
+      }))
+    })
+  })
+
+  describe('Callbacks', () => {
+    it('should forward tag management and tag change callbacks', () => {
+      const onOpenTagManagement = vi.fn()
+      const onTagsChange = vi.fn()
+
+      render(
+        <AppCardTags
+          appId="app-1"
+          tags={tags}
+          onOpenTagManagement={onOpenTagManagement}
+          onTagsChange={onTagsChange}
+        />,
+      )
+
+      fireEvent.click(screen.getByText('Manage Tags'))
+      fireEvent.click(screen.getByText('Tags Changed'))
+
+      expect(onOpenTagManagement).toHaveBeenCalledTimes(1)
+      expect(onTagsChange).toHaveBeenCalledTimes(1)
+    })
+  })
+
+  describe('Edge Cases', () => {
+    it('should pass an empty selection when the app has no tags', () => {
+      render(<AppCardTags appId="app-1" tags={[]} />)
+
+      expect(renderTagSelector).toHaveBeenCalledWith(expect.objectContaining({
+        value: [],
+      }))
+    })
+  })
+})
diff --git a/web/features/tag-management/components/app-card-tags.tsx b/web/features/tag-management/components/app-card-tags.tsx
new file mode 100644
index 0000000000..91c0b6783f
--- /dev/null
+++ b/web/features/tag-management/components/app-card-tags.tsx
@@ -0,0 +1,30 @@
+import type { Tag } from '@/contract/console/tags'
+import { TagSelector } from '@/features/tag-management/components/tag-selector'
+
+type AppCardTagsProps = {
+  appId: string
+  tags: Tag[]
+  onOpenTagManagement?: () => void
+  onTagsChange?: () => void
+}
+
+export const AppCardTags = ({
+  appId,
+  tags,
+  onOpenTagManagement = () => {},
+  onTagsChange,
+}: AppCardTagsProps) => {
+  return (
+    <div className="group/tag-area relative min-w-0 overflow-hidden">
+      <TagSelector
+        placement="bottom-start"
+        type="app"
+        targetId={appId}
+        value={tags}
+        onOpenTagManagement={onOpenTagManagement}
+        onTagsChange={onTagsChange}
+      />
+      <div className="pointer-events-none absolute top-0 right-0 h-full w-20 bg-tag-selector-mask-bg group-focus-within/tag-area:hidden group-hover:bg-tag-selector-mask-hover-bg group-hover/tag-area:hidden" />
+    </div>
+  )
+}
diff --git a/web/features/tag-management/components/dataset-card-tags.tsx b/web/features/tag-management/components/dataset-card-tags.tsx
new file mode 100644
index 0000000000..50131b1ce7
--- /dev/null
+++ b/web/features/tag-management/components/dataset-card-tags.tsx
@@ -0,0 +1,41 @@
+import type { MouseEvent } from 'react'
+import type { Tag } from '@/contract/console/tags'
+import { cn } from '@langgenius/dify-ui/cn'
+import { TagSelector } from '@/features/tag-management/components/tag-selector'
+
+type DatasetCardTagsProps = {
+  datasetId: string
+  embeddingAvailable: boolean
+  tags: Tag[]
+  onClick: (e: MouseEvent) => void
+  onOpenTagManagement?: () => void
+  onTagsChange?: () => void
+}
+
+export const DatasetCardTags = ({
+  datasetId,
+  embeddingAvailable,
+  tags,
+  onClick,
+  onOpenTagManagement = () => {},
+  onTagsChange,
+}: DatasetCardTagsProps) => (
+  <div
+    className={cn('group/tag-area relative w-full px-3', !embeddingAvailable && 'opacity-30')}
+    onClick={onClick}
+  >
+    <div className="w-full">
+      <TagSelector
+        placement="bottom-start"
+        type="knowledge"
+        targetId={datasetId}
+        value={tags}
+        onOpenTagManagement={onOpenTagManagement}
+        onTagsChange={onTagsChange}
+      />
+    </div>
+    <div
+      className="absolute top-0 right-0 h-full w-20 bg-tag-selector-mask-bg group-focus-within/tag-area:hidden group-hover:bg-tag-selector-mask-hover-bg group-hover/tag-area:hidden"
+    />
+  </div>
+)
diff --git a/web/features/tag-management/components/tag-combobox-item.ts b/web/features/tag-management/components/tag-combobox-item.ts
new file mode 100644
index 0000000000..4a5846afea
--- /dev/null
+++ b/web/features/tag-management/components/tag-combobox-item.ts
@@ -0,0 +1,15 @@
+import type { Tag, TagType } from '@/contract/console/tags'
+
+type CreateTagOption = {
+  id: string
+  name: string
+  type: TagType
+  binding_count: number
+  isCreateOption: true
+}
+
+export type TagComboboxItem = Tag | CreateTagOption
+
+export const isCreateTagOption = (tag: TagComboboxItem): tag is CreateTagOption => {
+  return 'isCreateOption' in tag
+}
diff --git a/web/features/tag-management/components/tag-filter.tsx b/web/features/tag-management/components/tag-filter.tsx
new file mode 100644
index 0000000000..2c6938dc4d
--- /dev/null
+++ b/web/features/tag-management/components/tag-filter.tsx
@@ -0,0 +1,129 @@
+import type { ComboboxRootProps } from '@langgenius/dify-ui/combobox'
+import type { Tag, TagType } from '@/contract/console/tags'
+import { cn } from '@langgenius/dify-ui/cn'
+import { Combobox, ComboboxContent, ComboboxTrigger } from '@langgenius/dify-ui/combobox'
+import { useQuery } from '@tanstack/react-query'
+import { useCallback, useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import Tag01Icon from '@/app/components/base/icons/src/vender/line/financeAndECommerce/Tag01'
+import XCircleIcon from '@/app/components/base/icons/src/vender/solid/general/XCircle'
+import { consoleQuery } from '@/service/client'
+import { TagPanel } from './tag-panel'
+
+const tagFilterComboboxFilter: NonNullable<ComboboxRootProps<Tag, true>['filter']> = (tag, query) => tag.name.includes(query)
+const tagToString = (tag: Tag) => tag.name
+const isSameTag = (item: Tag, value: Tag) => item.id === value.id
+
+type TagFilterProps = {
+  type: TagType
+  value: string[]
+  onChange: (v: string[]) => void
+  onOpenTagManagement?: () => void
+}
+export const TagFilter = ({
+  type,
+  value,
+  onChange,
+  onOpenTagManagement = () => {},
+}: TagFilterProps) => {
+  const { t } = useTranslation()
+  const [open, setOpen] = useState(false)
+  const [inputValue, setInputValue] = useState('')
+
+  const { data: tagList = [] } = useQuery(consoleQuery.tags.list.queryOptions({
+    input: {
+      query: {
+        type,
+      },
+    },
+  }))
+
+  const tagById = useMemo(() => new Map(tagList.map(tag => [tag.id, tag])), [tagList])
+  const items = useMemo(() => tagList.filter(tag => tag.type === type), [tagList, type])
+  const selectedTags = useMemo(() => {
+    return value.flatMap((tagId) => {
+      const tag = tagById.get(tagId)
+      return tag ? [tag] : []
+    })
+  }, [tagById, value])
+
+  const firstTagId = value[0]
+  const currentTagName = firstTagId ? tagById.get(firstTagId)?.name : undefined
+  const triggerLabel = selectedTags.length ? selectedTags.map(tag => tag.name).join(', ') : t('tag.placeholder', { ns: 'common' })
+  const handleValueChange = useCallback((nextTags: Tag[]) => {
+    const unknownTagIds = value.filter(tagId => !tagById.has(tagId))
+    onChange([...unknownTagIds, ...nextTags.map(tag => tag.id)])
+  }, [onChange, tagById, value])
+
+  return (
+    <Combobox
+      open={open}
+      onOpenChange={setOpen}
+      items={items}
+      multiple
+      value={selectedTags}
+      onValueChange={handleValueChange}
+      inputValue={inputValue}
+      onInputValueChange={setInputValue}
+      filter={tagFilterComboboxFilter}
+      itemToStringLabel={tagToString}
+      isItemEqualToValue={isSameTag}
+    >
+      <div className="relative">
+        <ComboboxTrigger
+          aria-label={triggerLabel}
+          icon={false}
+          className={cn(
+            'flex h-8 max-w-60 min-w-28 cursor-pointer items-center gap-1 rounded-lg border-[0.5px] border-transparent bg-components-input-bg-normal px-2 py-0 text-left select-none hover:bg-components-input-bg-normal focus-visible:bg-components-input-bg-normal data-open:bg-components-input-bg-normal',
+            !!value.length && 'pr-6 shadow-xs',
+          )}
+        >
+          <span className="flex w-full min-w-0 items-center gap-1">
+            <span className="p-px">
+              <Tag01Icon className="h-3.5 w-3.5 text-text-tertiary" aria-hidden="true" />
+            </span>
+            <span className="min-w-0 grow truncate text-[13px] leading-4.5 text-text-secondary">
+              {!value.length && t('tag.placeholder', { ns: 'common' })}
+              {!!value.length && currentTagName}
+            </span>
+            {value.length > 1 && (
+              <span className="shrink-0 text-xs leading-4.5 font-medium text-text-tertiary">{`+${value.length - 1}`}</span>
+            )}
+            {!value.length && (
+              <span className="shrink-0 p-px">
+                <span aria-hidden className="i-ri-arrow-down-s-line h-3.5 w-3.5 text-text-tertiary" />
+              </span>
+            )}
+          </span>
+        </ComboboxTrigger>
+        {!!value.length && (
+          <button
+            type="button"
+            aria-label={t('operation.clear', { ns: 'common' })}
+            className="group/clear absolute top-1/2 right-2 -translate-y-1/2 border-none bg-transparent p-px"
+            onClick={(event) => {
+              event.stopPropagation()
+              onChange([])
+            }}
+          >
+            <XCircleIcon className="h-3.5 w-3.5 text-text-tertiary group-hover/clear:text-text-secondary" aria-hidden="true" />
+          </button>
+        )}
+        <ComboboxContent
+          placement="bottom-start"
+          sideOffset={4}
+          popupClassName="w-[240px] rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg-blur p-0 shadow-lg backdrop-blur-[5px]"
+        >
+          <TagPanel
+            type={type}
+            inputValue={inputValue}
+            onInputValueChange={setInputValue}
+            onOpenTagManagement={onOpenTagManagement}
+            onClose={() => setOpen(false)}
+          />
+        </ComboboxContent>
+      </div>
+    </Combobox>
+
+  )
+}
diff --git a/web/features/tag-management/components/tag-item-editor.tsx b/web/features/tag-management/components/tag-item-editor.tsx
new file mode 100644
index 0000000000..09f8dbf45e
--- /dev/null
+++ b/web/features/tag-management/components/tag-item-editor.tsx
@@ -0,0 +1,169 @@
+import type { Tag } from '@/contract/console/tags'
+import {
+  AlertDialog,
+  AlertDialogActions,
+  AlertDialogCancelButton,
+  AlertDialogConfirmButton,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogTitle,
+} from '@langgenius/dify-ui/alert-dialog'
+import { cn } from '@langgenius/dify-ui/cn'
+import { toast } from '@langgenius/dify-ui/toast'
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipTrigger,
+} from '@langgenius/dify-ui/tooltip'
+import { useMutation } from '@tanstack/react-query'
+import { useDebounceFn } from 'ahooks'
+import { useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { consoleQuery } from '@/service/client'
+
+type TagItemEditorProps = {
+  tag: Tag
+  onTagsChange?: () => void
+}
+export const TagItemEditor = ({ tag, onTagsChange }: TagItemEditorProps) => {
+  const { t } = useTranslation()
+  const updateTagMutation = useMutation(consoleQuery.tags.update.mutationOptions())
+  const deleteTagMutation = useMutation(consoleQuery.tags.delete.mutationOptions())
+  const [isEditing, setIsEditing] = useState(false)
+  const editTag = (tagId: string, name: string) => {
+    if (name === tag.name) {
+      setIsEditing(false)
+      return
+    }
+    if (!name) {
+      toast.error('tag name is empty')
+      setIsEditing(false)
+      return
+    }
+
+    updateTagMutation.mutate({
+      params: {
+        tagId,
+      },
+      body: {
+        name,
+      },
+    }, {
+      onSuccess: () => {
+        toast.success(t('actionMsg.modifiedSuccessfully', { ns: 'common' }))
+        setIsEditing(false)
+        onTagsChange?.()
+      },
+      onError: () => {
+        toast.error(t('actionMsg.modifiedUnsuccessfully', { ns: 'common' }))
+        setIsEditing(false)
+      },
+    })
+  }
+  const [showRemoveModal, setShowRemoveModal] = useState(false)
+  const removeTag = (tagId: string) => {
+    if (deleteTagMutation.isPending)
+      return
+
+    deleteTagMutation.mutate({
+      params: {
+        tagId,
+      },
+    }, {
+      onSuccess: () => {
+        toast.success(t('actionMsg.modifiedSuccessfully', { ns: 'common' }))
+        onTagsChange?.()
+      },
+      onError: () => {
+        toast.error(t('actionMsg.modifiedUnsuccessfully', { ns: 'common' }))
+      },
+    })
+  }
+  const { run: handleRemove } = useDebounceFn(() => {
+    removeTag(tag.id)
+  }, { wait: 200 })
+  return (
+    <>
+      <div className={cn('flex shrink-0 items-center gap-0.5 rounded-lg border border-components-panel-border py-1 pr-1 pl-2 text-sm leading-5 text-text-secondary')}>
+        {!isEditing && (
+          <>
+            <div className="text-sm leading-5 text-text-secondary">
+              {tag.name}
+            </div>
+            <Tooltip>
+              <TooltipTrigger>
+                <div className="shrink-0 px-1 text-sm leading-4.5 font-medium text-text-tertiary">{tag.binding_count}</div>
+              </TooltipTrigger>
+              <TooltipContent>{t('common.tagBound', { ns: 'workflow' })}</TooltipContent>
+            </Tooltip>
+            <button
+              type="button"
+              aria-label={`${t('operation.edit', { ns: 'common' })} ${tag.name}`}
+              className="group/edit shrink-0 cursor-pointer rounded-md border-none bg-transparent p-1 hover:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+              onClick={() => setIsEditing(true)}
+            >
+              <span aria-hidden="true" className="i-ri-edit-line h-3 w-3 text-text-tertiary group-hover/edit:text-text-secondary" />
+            </button>
+            <button
+              type="button"
+              aria-label={`${t('operation.remove', { ns: 'common' })} ${tag.name}`}
+              className="group/remove shrink-0 cursor-pointer rounded-md border-none bg-transparent p-1 hover:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"
+              onClick={() => {
+                if (tag.binding_count)
+                  setShowRemoveModal(true)
+                else
+                  handleRemove()
+              }}
+            >
+              <span aria-hidden="true" className="i-ri-delete-bin-line h-3 w-3 text-text-tertiary group-hover/remove:text-text-secondary" />
+            </button>
+          </>
+        )}
+        {isEditing && (
+          <input
+            aria-label={`${t('operation.rename', { ns: 'common' })} ${tag.name}`}
+            className="shrink-0 appearance-none caret-primary-600 outline-hidden placeholder:text-text-quaternary"
+            autoFocus
+            defaultValue={tag.name}
+            onKeyDown={(e) => {
+              if (e.key !== 'Enter' || e.nativeEvent.isComposing)
+                return
+
+              e.preventDefault()
+              e.currentTarget.blur()
+            }}
+            onBlur={e => editTag(tag.id, e.currentTarget.value)}
+          />
+        )}
+      </div>
+      <AlertDialog open={showRemoveModal} onOpenChange={open => !open && setShowRemoveModal(false)}>
+        <AlertDialogContent>
+          <div className="flex flex-col gap-2 px-6 pt-6 pb-4">
+            <AlertDialogTitle
+              title={`${t('tag.delete', { ns: 'common' })} "${tag.name}"`}
+              className="w-full truncate title-2xl-semi-bold text-text-primary"
+            >
+              {`${t('tag.delete', { ns: 'common' })} "${tag.name}"`}
+            </AlertDialogTitle>
+            <AlertDialogDescription className="w-full system-md-regular wrap-break-word whitespace-pre-wrap text-text-tertiary">
+              {t('tag.deleteTip', { ns: 'common' })}
+            </AlertDialogDescription>
+          </div>
+          <AlertDialogActions>
+            <AlertDialogCancelButton>
+              {t('operation.cancel', { ns: 'common' })}
+            </AlertDialogCancelButton>
+            <AlertDialogConfirmButton
+              onClick={() => {
+                handleRemove()
+                setShowRemoveModal(false)
+              }}
+            >
+              {t('operation.confirm', { ns: 'common' })}
+            </AlertDialogConfirmButton>
+          </AlertDialogActions>
+        </AlertDialogContent>
+      </AlertDialog>
+    </>
+  )
+}
diff --git a/web/features/tag-management/components/tag-management-modal.tsx b/web/features/tag-management/components/tag-management-modal.tsx
new file mode 100644
index 0000000000..129ac2ce2e
--- /dev/null
+++ b/web/features/tag-management/components/tag-management-modal.tsx
@@ -0,0 +1,67 @@
+'use client'
+import { Dialog, DialogCloseButton, DialogContent } from '@langgenius/dify-ui/dialog'
+import { toast } from '@langgenius/dify-ui/toast'
+import { useMutation, useQuery } from '@tanstack/react-query'
+import { useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { consoleQuery } from '@/service/client'
+import { TagItemEditor } from './tag-item-editor'
+
+type TagManagementModalProps = {
+  type: 'knowledge' | 'app'
+  show: boolean
+  onClose: () => void
+  onTagsChange?: () => void
+}
+export const TagManagementModal = ({ show, type, onClose, onTagsChange }: TagManagementModalProps) => {
+  const { t } = useTranslation()
+  const { data: tagList = [] } = useQuery(consoleQuery.tags.list.queryOptions({
+    input: {
+      query: {
+        type,
+      },
+    },
+    enabled: show,
+  }))
+  const createTagMutation = useMutation(consoleQuery.tags.create.mutationOptions())
+  const [name, setName] = useState<string>('')
+
+  const createNewTag = () => {
+    if (!name)
+      return
+    if (createTagMutation.isPending)
+      return
+
+    createTagMutation.mutate({
+      body: {
+        name,
+        type,
+      },
+    }, {
+      onSuccess: () => {
+        toast.success(t('tag.created', { ns: 'common' }))
+        setName('')
+      },
+      onError: () => {
+        toast.error(t('tag.failed', { ns: 'common' }))
+      },
+    })
+  }
+  const handleClose = () => {
+    setName('')
+    onClose()
+  }
+
+  return (
+    <Dialog open={show} onOpenChange={open => !open && handleClose()}>
+      <DialogContent className="w-150 max-w-150 rounded-xl p-8">
+        <div className="relative pb-2 text-xl leading-7.5 font-semibold text-text-primary">{t('tag.manageTags', { ns: 'common' })}</div>
+        <DialogCloseButton className="top-4 right-4" />
+        <div className="mt-3 flex flex-wrap gap-2">
+          <input aria-label={t('tag.addNew', { ns: 'common' }) || ''} className="w-25 shrink-0 appearance-none rounded-lg border border-dashed border-divider-regular bg-transparent px-2 py-1 text-sm leading-5 text-text-secondary caret-primary-600 outline-hidden placeholder:text-text-quaternary focus:border-solid" placeholder={t('tag.addNew', { ns: 'common' }) || ''} autoFocus value={name} onChange={e => setName(e.target.value)} onKeyDown={e => e.key === 'Enter' && !e.nativeEvent.isComposing && createNewTag()} onBlur={createNewTag} />
+          {tagList.map(tag => (<TagItemEditor key={tag.id} tag={tag} onTagsChange={onTagsChange} />))}
+        </div>
+      </DialogContent>
+    </Dialog>
+  )
+}
diff --git a/web/features/tag-management/components/tag-panel.tsx b/web/features/tag-management/components/tag-panel.tsx
new file mode 100644
index 0000000000..e778ecdb03
--- /dev/null
+++ b/web/features/tag-management/components/tag-panel.tsx
@@ -0,0 +1,110 @@
+import type { TagComboboxItem } from './tag-combobox-item'
+import type { TagType } from '@/contract/console/tags'
+import { ComboboxInput, ComboboxInputGroup, ComboboxItem, ComboboxItemIndicator, ComboboxItemText, ComboboxList, ComboboxSeparator, useComboboxFilteredItems } from '@langgenius/dify-ui/combobox'
+import { Fragment } from 'react'
+import { useTranslation } from 'react-i18next'
+import { isCreateTagOption } from './tag-combobox-item'
+
+type TagPanelProps = {
+  type: TagType
+  inputValue: string
+  onInputValueChange: (value: string) => void
+  onOpenTagManagement?: () => void
+  onClose?: () => void
+}
+
+export const TagPanel = ({
+  type,
+  inputValue,
+  onInputValueChange,
+  onOpenTagManagement,
+  onClose,
+}: TagPanelProps) => {
+  const { t } = useTranslation()
+  const filteredItems = useComboboxFilteredItems<TagComboboxItem>()
+  const realItemCount = filteredItems.filter(tag => !isCreateTagOption(tag)).length
+  const hasCreateOption = filteredItems.some(isCreateTagOption)
+  const placeholder = t('tag.selectorPlaceholder', { ns: 'common' }) || ''
+
+  return (
+    <div className="relative w-full">
+      <div className="p-2 pb-1">
+        <ComboboxInputGroup className="border-divider-subtle bg-components-input-bg-normal">
+          <span aria-hidden="true" className="ml-2 i-ri-search-line h-4 w-4 shrink-0 text-text-tertiary" />
+          <ComboboxInput
+            aria-label={placeholder}
+            name={`tag-search-${type}`}
+            placeholder={placeholder}
+            className="pl-2"
+          />
+          {inputValue && (
+            <button
+              type="button"
+              aria-label={t('operation.clear', { ns: 'common' })}
+              className="mr-1.5 flex size-5 shrink-0 cursor-pointer items-center justify-center rounded-md text-text-tertiary outline-hidden hover:bg-components-input-bg-hover hover:text-text-secondary focus-visible:bg-components-input-bg-hover focus-visible:text-text-secondary focus-visible:ring-1 focus-visible:ring-components-input-border-active focus-visible:ring-inset"
+              onClick={() => onInputValueChange('')}
+              onPointerDown={event => event.preventDefault()}
+            >
+              <span className="i-ri-close-line size-4" aria-hidden="true" />
+            </button>
+          )}
+        </ComboboxInputGroup>
+      </div>
+      {filteredItems.length > 0 && (
+        <ComboboxList className="max-h-58">
+          {(tag: TagComboboxItem) => {
+            if (isCreateTagOption(tag)) {
+              return (
+                <Fragment key={tag.id}>
+                  <ComboboxItem
+                    value={tag}
+                  >
+                    <ComboboxItemText className="flex items-center gap-x-1 px-0">
+                      <span aria-hidden="true" className="i-ri-add-line h-4 w-4 shrink-0 text-text-tertiary" />
+                      <span className="min-w-0 grow truncate px-1 system-md-regular text-text-secondary">
+                        {`${t('tag.create', { ns: 'common' })} `}
+                        <span className="system-md-medium">{`'${tag.name}'`}</span>
+                      </span>
+                    </ComboboxItemText>
+                  </ComboboxItem>
+                  {realItemCount > 0 && <ComboboxSeparator />}
+                </Fragment>
+              )
+            }
+
+            return (
+              <ComboboxItem key={tag.id} value={tag}>
+                <ComboboxItemText title={tag.name}>{tag.name}</ComboboxItemText>
+                <ComboboxItemIndicator />
+              </ComboboxItem>
+            )
+          }}
+        </ComboboxList>
+      )}
+      {!hasCreateOption && realItemCount === 0 && (
+        <div className="p-1">
+          <div className="flex flex-col items-center gap-y-1 p-3">
+            <span aria-hidden="true" className="i-ri-price-tag-3-line h-6 w-6 text-text-quaternary" />
+            <div className="system-xs-regular text-text-tertiary">{t('tag.noTag', { ns: 'common' })}</div>
+          </div>
+        </div>
+      )}
+      <ComboboxSeparator />
+      <div className="p-1">
+        <button
+          type="button"
+          className="flex w-full cursor-pointer touch-manipulation items-center gap-x-1 rounded-lg px-2 py-1.5 text-left outline-hidden hover:bg-state-base-hover focus-visible:ring-1 focus-visible:ring-components-input-border-active"
+          onClick={() => {
+            onOpenTagManagement?.()
+            onClose?.()
+          }}
+        >
+          <span aria-hidden="true" className="i-ri-price-tag-3-line h-4 w-4 text-text-tertiary" />
+          <span className="min-w-0 grow truncate px-1 system-md-regular text-text-secondary">
+            {t('tag.manageTags', { ns: 'common' })}
+          </span>
+        </button>
+      </div>
+    </div>
+  )
+}
diff --git a/web/features/tag-management/components/tag-selector.tsx b/web/features/tag-management/components/tag-selector.tsx
new file mode 100644
index 0000000000..70dae241d5
--- /dev/null
+++ b/web/features/tag-management/components/tag-selector.tsx
@@ -0,0 +1,243 @@
+import type { ComboboxRootProps } from '@langgenius/dify-ui/combobox'
+import type { ComponentProps } from 'react'
+import type { TagComboboxItem } from './tag-combobox-item'
+import type { Tag, TagType } from '@/contract/console/tags'
+import { cn } from '@langgenius/dify-ui/cn'
+import { Combobox, ComboboxContent, ComboboxTrigger } from '@langgenius/dify-ui/combobox'
+import { toast } from '@langgenius/dify-ui/toast'
+import { useMutation, useQuery } from '@tanstack/react-query'
+import { useCallback, useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { consoleQuery } from '@/service/client'
+import { useApplyTagBindingsMutation } from '../hooks/use-tag-mutations'
+import { isCreateTagOption } from './tag-combobox-item'
+import { TagPanel } from './tag-panel'
+import { TagTrigger } from './tag-trigger'
+
+const TAG_COMBOBOX_FILTER: NonNullable<ComboboxRootProps<TagComboboxItem, true>['filter']> = (tag, query) => tag.name.includes(query)
+const tagToString = (tag: TagComboboxItem) => tag.name
+const isSameTag = (item: TagComboboxItem, value: TagComboboxItem) => item.id === value.id
+
+type TagSelectorRootProps = Omit<
+  ComboboxRootProps<TagComboboxItem, true>,
+  | 'items'
+  | 'multiple'
+  | 'value'
+  | 'defaultValue'
+  | 'onValueChange'
+  | 'inputValue'
+  | 'defaultInputValue'
+  | 'onInputValueChange'
+  | 'filter'
+  | 'itemToStringLabel'
+  | 'isItemEqualToValue'
+  | 'open'
+  | 'defaultOpen'
+  | 'onOpenChange'
+  | 'onOpenChangeComplete'
+  | 'children'
+>
+type TagSelectorContentProps = Pick<ComponentProps<typeof ComboboxContent>, 'placement' | 'sideOffset' | 'alignOffset' | 'portalProps' | 'positionerProps' | 'popupProps' | 'popupClassName'>
+
+type TagSelectorProps = TagSelectorRootProps & TagSelectorContentProps & {
+  targetId: string
+  type: TagType
+  value: Tag[]
+  onOpenTagManagement?: () => void
+  onTagsChange?: () => void
+}
+
+export const TagSelector = ({
+  targetId,
+  type,
+  value,
+  onOpenTagManagement = () => {},
+  onTagsChange,
+  placement = 'bottom-start',
+  sideOffset = 4,
+  alignOffset = 0,
+  portalProps,
+  positionerProps,
+  popupProps,
+  popupClassName,
+  ...rootProps
+}: TagSelectorProps) => {
+  const { t } = useTranslation()
+  const [open, setOpen] = useState(false)
+  const [draftTags, setDraftTags] = useState<Tag[]>(value)
+  const [inputValue, setInputValue] = useState('')
+  const applyTagBindingsMutation = useApplyTagBindingsMutation()
+  const {
+    isPending: isCreatingTag,
+    mutate: createTag,
+  } = useMutation(consoleQuery.tags.create.mutationOptions())
+  const { data: tagList = [] } = useQuery(consoleQuery.tags.list.queryOptions({
+    input: {
+      query: {
+        type,
+      },
+    },
+  }))
+
+  const selectedTagIds = useMemo(() => value.map(tag => tag.id), [value])
+  const tagNames = useMemo(() => {
+    if (!value.length)
+      return []
+
+    const tagNameById = new Map(tagList.map(tag => [tag.id, tag.name]))
+    return value.flatMap((tag) => {
+      const tagName = tagNameById.get(tag.id)
+      return tagName ? [tagName] : []
+    })
+  }, [tagList, value])
+  const triggerLabel = tagNames.length ? tagNames.join(', ') : t('tag.addTag', { ns: 'common' })
+
+  const items = useMemo<TagComboboxItem[]>(() => {
+    const tagIds = new Set<string>()
+    const nextItems: TagComboboxItem[] = []
+
+    for (const tag of tagList) {
+      if (tag.type !== type)
+        continue
+
+      tagIds.add(tag.id)
+      nextItems.push(tag)
+    }
+
+    for (const tag of value) {
+      if (tag.type === type && !tagIds.has(tag.id))
+        nextItems.push(tag)
+    }
+
+    if (inputValue && nextItems.every(tag => tag.name !== inputValue)) {
+      nextItems.push({
+        id: `__create_tag__:${inputValue}`,
+        name: inputValue,
+        type,
+        binding_count: 0,
+        isCreateOption: true,
+      })
+    }
+
+    return nextItems
+  }, [inputValue, tagList, type, value])
+
+  const applyTagBindings = useCallback(() => {
+    const draftTagIds = draftTags.map(tag => tag.id)
+    const draftTagIdSet = new Set(draftTagIds)
+    const tagSelectionChanged = selectedTagIds.length !== draftTagIds.length
+      || selectedTagIds.some(tagId => !draftTagIdSet.has(tagId))
+
+    if (!tagSelectionChanged)
+      return
+
+    const toastId = `tag-bindings-${type}-${targetId}`
+
+    applyTagBindingsMutation.mutate({
+      currentTagIds: selectedTagIds,
+      nextTagIds: draftTagIds,
+      targetId,
+      type,
+    }, {
+      onSuccess: () => {
+        toast.success(t('actionMsg.modifiedSuccessfully', { ns: 'common' }), {
+          id: toastId,
+        })
+      },
+      onError: () => {
+        toast.error(t('actionMsg.modifiedUnsuccessfully', { ns: 'common' }), {
+          id: toastId,
+        })
+      },
+      onSettled: () => {
+        onTagsChange?.()
+      },
+    })
+  }, [applyTagBindingsMutation, draftTags, onTagsChange, selectedTagIds, t, targetId, type])
+
+  const handleOpenChange = useCallback((nextOpen: boolean) => {
+    if (nextOpen) {
+      setDraftTags(value)
+    }
+    else {
+      applyTagBindings()
+    }
+
+    setOpen(nextOpen)
+  }, [applyTagBindings, value])
+
+  const createNewTag = useCallback((name: string) => {
+    if (!name || isCreatingTag)
+      return
+
+    createTag({
+      body: {
+        name,
+        type,
+      },
+    }, {
+      onSuccess: () => {
+        toast.success(t('tag.created', { ns: 'common' }))
+        setInputValue('')
+      },
+      onError: () => {
+        toast.error(t('tag.failed', { ns: 'common' }))
+      },
+    })
+  }, [createTag, isCreatingTag, t, type])
+
+  const handleValueChange = useCallback((nextTags: TagComboboxItem[]) => {
+    const createOption = nextTags.find(isCreateTagOption)
+    if (createOption) {
+      createNewTag(createOption.name)
+      return
+    }
+
+    setDraftTags(nextTags.filter(tag => !isCreateTagOption(tag)))
+  }, [createNewTag])
+
+  return (
+    <Combobox
+      {...rootProps}
+      open={open}
+      onOpenChange={handleOpenChange}
+      items={items}
+      multiple
+      value={draftTags}
+      onValueChange={handleValueChange}
+      inputValue={inputValue}
+      onInputValueChange={setInputValue}
+      filter={TAG_COMBOBOX_FILTER}
+      itemToStringLabel={tagToString}
+      isItemEqualToValue={isSameTag}
+    >
+      <ComboboxTrigger
+        aria-label={triggerLabel}
+        className={cn(
+          open ? 'bg-state-base-hover' : 'bg-transparent',
+          'block h-auto w-full rounded-lg border-0 bg-transparent p-0 text-left hover:bg-transparent focus:outline-hidden focus-visible:bg-transparent focus-visible:ring-1 focus-visible:ring-components-input-border-hover focus-visible:ring-inset data-open:bg-state-base-hover data-open:hover:bg-state-base-hover',
+        )}
+        icon={false}
+      >
+        <TagTrigger tags={tagNames} />
+      </ComboboxTrigger>
+      <ComboboxContent
+        placement={placement}
+        sideOffset={sideOffset}
+        alignOffset={alignOffset}
+        portalProps={portalProps}
+        positionerProps={positionerProps}
+        popupProps={popupProps}
+        popupClassName={cn('w-(--anchor-width) min-w-60 rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg-blur p-0 shadow-lg backdrop-blur-[5px]', popupClassName)}
+      >
+        <TagPanel
+          type={type}
+          inputValue={inputValue}
+          onInputValueChange={setInputValue}
+          onOpenTagManagement={onOpenTagManagement}
+          onClose={() => handleOpenChange(false)}
+        />
+      </ComboboxContent>
+    </Combobox>
+  )
+}
diff --git a/web/features/tag-management/components/tag-trigger.tsx b/web/features/tag-management/components/tag-trigger.tsx
new file mode 100644
index 0000000000..f76cba4333
--- /dev/null
+++ b/web/features/tag-management/components/tag-trigger.tsx
@@ -0,0 +1,48 @@
+import { useTranslation } from 'react-i18next'
+
+type TriggerProps = {
+  tags: string[]
+}
+
+export const TagTrigger = ({
+  tags,
+}: TriggerProps) => {
+  const { t } = useTranslation()
+
+  return (
+    <div
+      className="flex w-full cursor-pointer items-center gap-1 overflow-hidden rounded-lg p-1 hover:bg-state-base-hover"
+      role={tags.length ? 'list' : undefined}
+    >
+      {!tags.length
+        ? (
+            <div className="flex max-w-full min-w-0 items-center gap-x-0.5 rounded-[5px] border border-dashed border-divider-deep bg-components-badge-bg-dimm px-1.25 py-0.75">
+              <span aria-hidden="true" className="i-ri-price-tag-3-line h-3 w-3 shrink-0 text-text-quaternary" />
+              <div className="truncate system-2xs-medium-uppercase text-text-tertiary">
+                {t('tag.addTag', { ns: 'common' })}
+              </div>
+            </div>
+          )
+        : (
+            <>
+              {
+                tags.map((content) => {
+                  return (
+                    <div
+                      key={content}
+                      role="listitem"
+                      className="flex max-w-30 min-w-0 shrink-0 items-center gap-x-0.5 rounded-[5px] border border-divider-deep bg-components-badge-bg-dimm px-1.25 py-0.75"
+                    >
+                      <span aria-hidden="true" className="i-ri-price-tag-3-line h-3 w-3 shrink-0 text-text-quaternary" />
+                      <div className="truncate system-2xs-medium-uppercase text-text-tertiary">
+                        {content}
+                      </div>
+                    </div>
+                  )
+                })
+              }
+            </>
+          )}
+    </div>
+  )
+}
diff --git a/web/features/tag-management/hooks/__tests__/use-tag-mutations.spec.tsx b/web/features/tag-management/hooks/__tests__/use-tag-mutations.spec.tsx
new file mode 100644
index 0000000000..fd73c38c12
--- /dev/null
+++ b/web/features/tag-management/hooks/__tests__/use-tag-mutations.spec.tsx
@@ -0,0 +1,138 @@
+import type { ReactNode } from 'react'
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
+import { act, renderHook, waitFor } from '@testing-library/react'
+import { describe, expect, it, vi } from 'vitest'
+import { useApplyTagBindingsMutation } from '../use-tag-mutations'
+
+const {
+  bindTag,
+  listKey,
+  unbindTag,
+} = vi.hoisted(() => ({
+  bindTag: vi.fn(),
+  listKey: vi.fn((options: { type: 'query', input: { query: { type: string } } }) => ['console', 'tags', 'list', 'query', options.input.query.type]),
+  unbindTag: vi.fn(),
+}))
+
+vi.mock('@/service/client', () => ({
+  consoleClient: {
+    tags: {
+      bind: bindTag,
+      unbind: unbindTag,
+    },
+  },
+  consoleQuery: {
+    tags: {
+      list: {
+        key: listKey,
+      },
+    },
+  },
+}))
+
+const createQueryClient = () => new QueryClient({
+  defaultOptions: {
+    queries: {
+      retry: false,
+    },
+    mutations: {
+      retry: false,
+    },
+  },
+})
+
+const renderMutationHook = <TResult,>(hook: () => TResult) => {
+  const queryClient = createQueryClient()
+  const wrapper = ({ children }: { children: ReactNode }) => (
+    <QueryClientProvider client={queryClient}>
+      {children}
+    </QueryClientProvider>
+  )
+
+  return {
+    queryClient,
+    ...renderHook(hook, { wrapper }),
+  }
+}
+
+describe('useTagMutations', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    bindTag.mockResolvedValue(undefined)
+    unbindTag.mockResolvedValue(undefined)
+  })
+
+  describe('Apply Tag Bindings', () => {
+    it('should bind added tags and unbind removed tags using batched request bodies', async () => {
+      const { queryClient, result } = renderMutationHook(() => useApplyTagBindingsMutation())
+      const invalidateQueries = vi.spyOn(queryClient, 'invalidateQueries')
+
+      await act(async () => {
+        await result.current.mutateAsync({
+          currentTagIds: ['tag-1', 'tag-2'],
+          nextTagIds: ['tag-2', 'tag-3', 'tag-4'],
+          targetId: 'app-1',
+          type: 'app',
+        })
+      })
+
+      expect(bindTag).toHaveBeenCalledWith({
+        body: {
+          tag_ids: ['tag-3', 'tag-4'],
+          target_id: 'app-1',
+          type: 'app',
+        },
+      })
+      expect(unbindTag).toHaveBeenCalledWith({
+        body: {
+          tag_ids: ['tag-1'],
+          target_id: 'app-1',
+          type: 'app',
+        },
+      })
+      await waitFor(() => {
+        expect(invalidateQueries).toHaveBeenCalledWith({
+          queryKey: ['console', 'tags', 'list', 'query', 'app'],
+        })
+      })
+      expect(listKey).toHaveBeenCalledWith({
+        type: 'query',
+        input: {
+          query: {
+            type: 'app',
+          },
+        },
+      })
+    })
+
+    it('should skip network requests when tag bindings do not change but still invalidate tags', async () => {
+      const { queryClient, result } = renderMutationHook(() => useApplyTagBindingsMutation())
+      const invalidateQueries = vi.spyOn(queryClient, 'invalidateQueries')
+
+      await act(async () => {
+        await result.current.mutateAsync({
+          currentTagIds: ['tag-1'],
+          nextTagIds: ['tag-1'],
+          targetId: 'knowledge-1',
+          type: 'knowledge',
+        })
+      })
+
+      expect(bindTag).not.toHaveBeenCalled()
+      expect(unbindTag).not.toHaveBeenCalled()
+      await waitFor(() => {
+        expect(invalidateQueries).toHaveBeenCalledWith({
+          queryKey: ['console', 'tags', 'list', 'query', 'knowledge'],
+        })
+      })
+      expect(listKey).toHaveBeenCalledWith({
+        type: 'query',
+        input: {
+          query: {
+            type: 'knowledge',
+          },
+        },
+      })
+    })
+  })
+})
diff --git a/web/features/tag-management/hooks/use-tag-mutations.ts b/web/features/tag-management/hooks/use-tag-mutations.ts
new file mode 100644
index 0000000000..4b0dda9d82
--- /dev/null
+++ b/web/features/tag-management/hooks/use-tag-mutations.ts
@@ -0,0 +1,57 @@
+import type { TagType } from '@/contract/console/tags'
+import { useMutation, useQueryClient } from '@tanstack/react-query'
+import { consoleClient, consoleQuery } from '@/service/client'
+
+type ApplyTagBindingsInput = {
+  currentTagIds: string[]
+  nextTagIds: string[]
+  targetId: string
+  type: TagType
+}
+
+export const useApplyTagBindingsMutation = () => {
+  const queryClient = useQueryClient()
+
+  return useMutation({
+    mutationKey: ['tag-bindings', 'apply'],
+    mutationFn: async ({ currentTagIds, nextTagIds, targetId, type }: ApplyTagBindingsInput) => {
+      const addTagIds = nextTagIds.filter(tagId => !currentTagIds.includes(tagId))
+      const removeTagIds = currentTagIds.filter(tagId => !nextTagIds.includes(tagId))
+      const operations: Promise<unknown>[] = []
+
+      if (addTagIds.length) {
+        operations.push(consoleClient.tags.bind({
+          body: {
+            tag_ids: addTagIds,
+            target_id: targetId,
+            type,
+          },
+        }))
+      }
+
+      if (removeTagIds.length) {
+        operations.push(consoleClient.tags.unbind({
+          body: {
+            tag_ids: removeTagIds,
+            target_id: targetId,
+            type,
+          },
+        }))
+      }
+
+      return Promise.all(operations)
+    },
+    onSettled: (_data, _error, variables) => {
+      void queryClient.invalidateQueries({
+        queryKey: consoleQuery.tags.list.key({
+          type: 'query',
+          input: {
+            query: {
+              type: variables.type,
+            },
+          },
+        }),
+      })
+    },
+  })
+}
diff --git a/web/hooks/use-import-dsl.ts b/web/hooks/use-import-dsl.ts
index 1ece2a27f0..83b11157cf 100644
--- a/web/hooks/use-import-dsl.ts
+++ b/web/hooks/use-import-dsl.ts
@@ -32,7 +32,7 @@ type DSLPayload = {
   description?: string
 }
 type ResponseCallback = {
-  onSuccess?: () => void
+  onSuccess?: (payload: DSLImportResponse) => void
   onPending?: (payload: DSLImportResponse) => void
   onFailed?: () => void
 }
@@ -85,7 +85,7 @@ export const useImportDSL = () => {
           toast.success(message)
         else
           toast.warning(message, { description })
-        onSuccess?.()
+        onSuccess?.(response)
         localStorage.setItem(NEED_REFRESH_APP_LIST_KEY, '1')
         await handleCheckPluginDependencies(app_id)
         getRedirection(isCurrentWorkspaceEditor, { id: app_id, mode: app_mode }, push)
@@ -134,7 +134,7 @@ export const useImportDSL = () => {
         return
 
       if (status === DSLImportStatus.COMPLETED) {
-        onSuccess?.()
+        onSuccess?.(response)
         toast.success(t('newApp.appCreated', { ns: 'app' }))
         await handleCheckPluginDependencies(app_id)
         localStorage.setItem(NEED_REFRESH_APP_LIST_KEY, '1')
diff --git a/web/hooks/use-pay.tsx b/web/hooks/use-pay.tsx
index 593a33a1d2..36eb28ab84 100644
--- a/web/hooks/use-pay.tsx
+++ b/web/hooks/use-pay.tsx
@@ -102,7 +102,7 @@ export const CheckModal = () => {
 
   const confirmInfo = anthropicConfirmInfo || notionConfirmInfo || billingConfirmInfo
 
-  if (!confirmInfo || !showPayStatusModal)
+  if (!confirmInfo)
     return null
 
   const description = (confirmInfo as { desc?: string }).desc || ''
diff --git a/web/i18n/ar-TN/app-debug.json b/web/i18n/ar-TN/app-debug.json
index 8a8da237a7..b0a47ca5e2 100644
--- a/web/i18n/ar-TN/app-debug.json
+++ b/web/i18n/ar-TN/app-debug.json
@@ -337,6 +337,8 @@
   "variableConfig.file.image.name": "صورة",
   "variableConfig.file.supportFileTypes": "أنواع الملفات المدعومة",
   "variableConfig.file.video.name": "فيديو",
+  "variableConfig.hidden": "مخفي ومُعبَّأ مسبقاً",
+  "variableConfig.hiddenDescription": "أخفِ هذا الحقل عن المستخدمين النهائيين وأمد بقيمته بنفسك. خيار يستبعد خيار مطلوب. <docLink>تعلم المزيد</docLink>",
   "variableConfig.hide": "إخفاء",
   "variableConfig.inputPlaceholder": "يرجى الإدخال",
   "variableConfig.json": "كود JSON",
diff --git a/web/i18n/ar-TN/app-overview.json b/web/i18n/ar-TN/app-overview.json
index a207abd065..2ecf5420a4 100644
--- a/web/i18n/ar-TN/app-overview.json
+++ b/web/i18n/ar-TN/app-overview.json
@@ -56,6 +56,8 @@
   "overview.appInfo.embedded.copy": "نسخ",
   "overview.appInfo.embedded.entry": "مضمن",
   "overview.appInfo.embedded.explanation": "اختر طريقة لتضمين تطبيق الدردشة في موقعك",
+  "overview.appInfo.embedded.hiddenInputs.description": "أدخل قيمًا للحقول المخفية. تُضاف القيم إلى رابط iframe أو كائن inputs الخاص بالسكريبت.",
+  "overview.appInfo.embedded.hiddenInputs.title": "تعبئة مسبقة للحقول المخفية",
   "overview.appInfo.embedded.iframe": "لإضافة تطبيق الدردشة في أي مكان على موقعك، أضف هذا iframe إلى كود html الخاص بك.",
   "overview.appInfo.embedded.scripts": "لإضافة تطبيق دردشة إلى أسفل يمين موقعك، أضف هذا الكود إلى html الخاص بك.",
   "overview.appInfo.embedded.title": "تضمين في الموقع",
@@ -104,6 +106,8 @@
   "overview.appInfo.settings.workflow.subTitle": "تفاصيل سير العمل",
   "overview.appInfo.settings.workflow.title": "سير العمل",
   "overview.appInfo.title": "تطبيق ويب",
+  "overview.appInfo.workflowLaunchHiddenInputs.description": "أدخل قيمًا للحقول المخفية، ثم انقر على <bold>تشغيل</bold> لفتح تطبيق الويب مع القيم المدخلة.",
+  "overview.appInfo.workflowLaunchHiddenInputs.title": "تعبئة مسبقة للحقول المخفية",
   "overview.disableTooltip.triggerMode": "ميزة {{feature}} غير مدعومة في وضع عقدة المشغل.",
   "overview.status.disable": "تعطيل",
   "overview.status.running": "في الخدمة",
diff --git a/web/i18n/ar-TN/common.json b/web/i18n/ar-TN/common.json
index 893b9bdbfe..df3487018d 100644
--- a/web/i18n/ar-TN/common.json
+++ b/web/i18n/ar-TN/common.json
@@ -101,6 +101,7 @@
   "appModes.completionApp": "مولد النص",
   "avatar.deleteDescription": "هل أنت متأكد أنك تريد إزالة صورة ملفك الشخصي؟ سيستخدم حسابك الصورة الرمزية الأولية الافتراضية.",
   "avatar.deleteTitle": "إزالة الصورة الرمزية",
+  "avatar.editAction": "تعديل الصورة الرمزية",
   "chat.citation.characters": "الشخصيات:",
   "chat.citation.hitCount": "عدد الاسترجاع:",
   "chat.citation.hitScore": "درجة الاسترجاع:",
diff --git a/web/i18n/ar-TN/education.json b/web/i18n/ar-TN/education.json
index 6a25741f05..bf8ae1d795 100644
--- a/web/i18n/ar-TN/education.json
+++ b/web/i18n/ar-TN/education.json
@@ -1,5 +1,25 @@
 {
+  "applied.activeSubscription.description": "لديك اشتراك نشط. يمكنك استخدام الخصم التعليمي بعد انتهاء صلاحية اشتراكك. تأكيد اشتراكك في <stripeLink>Stripe</stripeLink>.",
+  "applied.description": "تهانينا! لقد قدمت بنجاح طلباً للحصول على الخصم التعليمي.",
+  "applied.noPaymentPermission.description": "ليس لديك صلاحية الدفع في هذه مساحة العمل. يرجى التبديل إلى مساحة عمل حيث يمكنك إدارة الفوترة لاستخدام الخصم التعليمي.",
+  "applied.noPaymentPermission.returnHome": "العودة إلى Dify",
+  "applied.step1.description": "لقد قدمت بنجاح طلباً للحصول على الخصم التعليمي.",
+  "applied.step1.title": "الخطوة 1",
+  "applied.step2.description": "اختر مساحة العمل التي تريد استخدامها مع الخصم التعليمي.",
+  "applied.step2.title": "الخطوة 2",
+  "applied.tabs.activeSubscription": "في الاشتراك",
+  "applied.tabs.eligible": "يمكن الشراء",
+  "applied.tabs.noPaymentPermission": "لا توجد صلاحية دفع",
+  "applied.title": "تم تطبيق الخصم التعليمي",
+  "applied.workspace.plan": "خطة مدفوعة",
+  "applied.workspace.title": "مساحة العمل الحالية",
   "currentSigned": "تم تسجيل الدخول حاليًا باسم",
+  "educationPricingConfirm.billingPeriod.monthly": "شهري",
+  "educationPricingConfirm.billingPeriod.yearly": "سنوي",
+  "educationPricingConfirm.cancel": "الاحتفاظ بالخطة الحالية",
+  "educationPricingConfirm.continue": "التبديل إلى Professional السنوية",
+  "educationPricingConfirm.description": "ينطبق الخصم التعليمي على خطة Professional السنوية فقط. الاحتفاظ بخطتك الحالية لن يتضمن الخصم.",
+  "educationPricingConfirm.title": "الخطة التي اخترتها لا تدعم الخصم التعليمي",
   "emailLabel": "بريدك الإلكتروني الحالي",
   "form.schoolName.placeholder": "أدخل الاسم الرسمي الكامل لمدرستك",
   "form.schoolName.title": "اسم مدرستك",
@@ -31,6 +51,7 @@
   "notice.stillInEducation.expired": "تحقق مرة أخرى الآن للحصول على كوبون جديد للعام الدراسي القادم. سنضيفه إلى حسابك ويمكنك استخدامه للترقية التالية.",
   "notice.stillInEducation.isAboutToExpire": "تحقق مرة أخرى الآن للحصول على كوبون جديد للعام الدراسي القادم. سيتم حفظه في حسابك وجاهز للاستخدام في تجديدك التالي.",
   "notice.stillInEducation.title": "هل ما زلت في التعليم؟",
+  "planNotSupportEducationDiscount": "غير مؤهل لأسعار التعليم",
   "rejectContent": "لسوء الحظ، أنت غير مؤهل للحصول على حالة التحقق التعليمي وبالتالي لا يمكنك الحصول على كوبون حصري 100٪ لخطة Dify Professional إذا كنت تستخدم عنوان البريد الإلكتروني هذا.",
   "rejectTitle": "تم رفض التحقق التعليمي الخاص بك في Dify",
   "submit": "إرسال",
@@ -40,5 +61,6 @@
   "toVerified": "احصل على التحقق التعليمي",
   "toVerifiedTip.coupon": "كوبون حصري 100٪",
   "toVerifiedTip.end": "لخطة Dify الاحترافية.",
-  "toVerifiedTip.front": "أنت الآن مؤهل للحصول على حالة التحقق التعليمي. يرجى إدخال معلومات التعليم الخاصة بك أدناه لإكمال العملية والحصول على"
+  "toVerifiedTip.front": "أنت الآن مؤهل للحصول على حالة التحقق التعليمي. يرجى إدخال معلومات التعليم الخاصة بك أدناه لإكمال العملية والحصول على",
+  "useEducationDiscount": "استخدام الخصم التعليمي"
 }
diff --git a/web/i18n/ar-TN/workflow.json b/web/i18n/ar-TN/workflow.json
index cc6c533ca1..08825f5dbc 100644
--- a/web/i18n/ar-TN/workflow.json
+++ b/web/i18n/ar-TN/workflow.json
@@ -646,12 +646,12 @@
   "nodes.humanInput.userActions.actionIdFormatTip": "يجب أن يبدأ معرف الإجراء بحرف أو شرطة سفلية، متبوعاً بأحرف أو أرقام أو شرطات سفلية",
   "nodes.humanInput.userActions.actionIdTooLong": "يجب أن يكون معرف الإجراء {{maxLength}} حرفاً أو أقل",
   "nodes.humanInput.userActions.actionNamePlaceholder": "اسم الإجراء",
-  "nodes.humanInput.userActions.buttonTextPlaceholder": "نص عرض الزر",
+  "nodes.humanInput.userActions.buttonTextPlaceholder": "قيمة الإجراء",
   "nodes.humanInput.userActions.buttonTextTooLong": "يجب أن يكون نص الزر {{maxLength}} حرفاً أو أقل",
   "nodes.humanInput.userActions.chooseStyle": "اختر نمط الزر",
   "nodes.humanInput.userActions.emptyTip": "انقر فوق الزر '+' لإضافة إجراءات المستخدم",
   "nodes.humanInput.userActions.title": "إجراءات المستخدم",
-  "nodes.humanInput.userActions.tooltip": "حدد الأزرار التي يمكن للمستخدمين النقر عليها للرد على هذا النموذج. يمكن لكل زر تشغيل مسارات سير عمل مختلفة. يجب أن يبدأ معرف الإجراء بحرف أو شرطة سفلية، متبوعاً بأحرف أو أرقام أو شرطات سفلية.",
+  "nodes.humanInput.userActions.tooltip": "حدد الأزرار التي يمكن للمستخدمين النقر عليها للرد على هذا النموذج. يتحكم معرف الإجراء في التفريع. يتم عرض قيمة الإجراء في المرحلة التالية كإخراج مدمج محدد. يجب أن يبدأ معرف الإجراء بحرف أو شرطة سفلية، متبوعاً بأحرف أو أرقام أو شرطات سفلية.",
   "nodes.humanInput.userActions.triggered": "تم تشغيل <strong>{{actionName}}</strong>",
   "nodes.ifElse.addCondition": "إضافة شرط",
   "nodes.ifElse.addSubVariable": "متغير فرعي",
@@ -897,13 +897,17 @@
   "nodes.questionClassifiers.advancedSetting": "إعدادات متقدمة",
   "nodes.questionClassifiers.class": "فئة",
   "nodes.questionClassifiers.classNamePlaceholder": "اكتب اسم الفئة الخاصة بك",
+  "nodes.questionClassifiers.defaultLabel": "الفئة {{index}}",
   "nodes.questionClassifiers.inputVars": "متغيرات الإدخال",
   "nodes.questionClassifiers.instruction": "تعليمات",
   "nodes.questionClassifiers.instructionPlaceholder": "اكتب تعليماتك",
   "nodes.questionClassifiers.instructionTip": "أدخل تعليمات إضافية لمساعدة مصنف الأسئلة على فهم كيفية تصنيف الأسئلة بشكل أفضل.",
+  "nodes.questionClassifiers.labelEditorAriaLabel": "محرر تسمية الفئة",
   "nodes.questionClassifiers.model": "النموذج",
+  "nodes.questionClassifiers.outputVars.classLabel": "تسمية الفئة",
   "nodes.questionClassifiers.outputVars.className": "اسم الفئة",
   "nodes.questionClassifiers.outputVars.usage": "معلومات استخدام النموذج",
+  "nodes.questionClassifiers.renameHint": "انقر نقراً مزدوجاً على عنوان الفئة لإعادة التسمية",
   "nodes.questionClassifiers.topicName": "اسم الموضوع",
   "nodes.questionClassifiers.topicPlaceholder": "اكتب اسم الموضوع الخاص بك",
   "nodes.start.builtInVar": "المتغيرات المدمجة",
diff --git a/web/i18n/de-DE/app-debug.json b/web/i18n/de-DE/app-debug.json
index e83678ce70..ca3c212f61 100644
--- a/web/i18n/de-DE/app-debug.json
+++ b/web/i18n/de-DE/app-debug.json
@@ -337,6 +337,8 @@
   "variableConfig.file.image.name": "Bild",
   "variableConfig.file.supportFileTypes": "Unterstützte Dateitypen",
   "variableConfig.file.video.name": "Video",
+  "variableConfig.hidden": "Ausgeblendet und vorausgefüllt",
+  "variableConfig.hiddenDescription": "Blendet dieses Feld für Endbenutzer aus und stellt den Wert selbst bereit. Schließt sich gegenseitig mit Erforderlich aus. <docLink>Mehr erfahren</docLink>",
   "variableConfig.hide": "Verstecken",
   "variableConfig.inputPlaceholder": "Bitte geben Sie ein",
   "variableConfig.json": "JSON-Code",
diff --git a/web/i18n/de-DE/app-overview.json b/web/i18n/de-DE/app-overview.json
index 6e16ba7b8d..3a0d90ee74 100644
--- a/web/i18n/de-DE/app-overview.json
+++ b/web/i18n/de-DE/app-overview.json
@@ -56,6 +56,8 @@
   "overview.appInfo.embedded.copy": "Kopieren",
   "overview.appInfo.embedded.entry": "Eingebettet",
   "overview.appInfo.embedded.explanation": "Wählen Sie die Art und Weise, wie die Chat-App auf Ihrer Website eingebettet wird",
+  "overview.appInfo.embedded.hiddenInputs.description": "Geben Sie Werte für die ausgeblendeten Felder ein. Die Werte werden zur iframe-URL oder zum inputs-Objekt des Skripts hinzugefügt.",
+  "overview.appInfo.embedded.hiddenInputs.title": "Ausgeblendete Felder vorausfüllen",
   "overview.appInfo.embedded.iframe": "Um die Chat-App an einer beliebigen Stelle auf Ihrer Website hinzuzufügen, fügen Sie diesen iframe in Ihren HTML-Code ein.",
   "overview.appInfo.embedded.scripts": "Um eine Chat-App unten rechts auf Ihrer Website hinzuzufügen, fügen Sie diesen Code in Ihren HTML-Code ein.",
   "overview.appInfo.embedded.title": "Einbetten auf der Website",
@@ -104,6 +106,8 @@
   "overview.appInfo.settings.workflow.subTitle": "Details zum Arbeitsablauf",
   "overview.appInfo.settings.workflow.title": "Workflow-Schritte",
   "overview.appInfo.title": "Webanwendung",
+  "overview.appInfo.workflowLaunchHiddenInputs.description": "Geben Sie Werte für die ausgeblendeten Felder ein und klicken Sie dann auf <bold>Starten</bold>, um die WebApp mit den Werten zu öffnen.",
+  "overview.appInfo.workflowLaunchHiddenInputs.title": "Ausgeblendete Felder vorausfüllen",
   "overview.disableTooltip.triggerMode": "Die Funktion {{feature}} wird im Trigger-Knoten-Modus nicht unterstützt.",
   "overview.status.disable": "Deaktivieren",
   "overview.status.running": "In Betrieb",
diff --git a/web/i18n/de-DE/common.json b/web/i18n/de-DE/common.json
index f24f94fb22..c61f9c3014 100644
--- a/web/i18n/de-DE/common.json
+++ b/web/i18n/de-DE/common.json
@@ -101,6 +101,7 @@
   "appModes.completionApp": "Textgenerator",
   "avatar.deleteDescription": "Bist du sicher, dass du dein Profilbild entfernen möchtest? Dein Konto wird das standardmäßige Anfangs-Avatar verwenden.",
   "avatar.deleteTitle": "Avatar entfernen",
+  "avatar.editAction": "Avatar bearbeiten",
   "chat.citation.characters": "Zeichen:",
   "chat.citation.hitCount": "Abrufanzahl:",
   "chat.citation.hitScore": "Abrufwertung:",
diff --git a/web/i18n/de-DE/education.json b/web/i18n/de-DE/education.json
index ceba9dcd23..c5153c7f75 100644
--- a/web/i18n/de-DE/education.json
+++ b/web/i18n/de-DE/education.json
@@ -1,5 +1,25 @@
 {
+  "applied.activeSubscription.description": "Sie haben ein aktives Abonnement. Sie können den Bildungsrabatt verwenden, nachdem Ihr Abonnement abläuft. Bestätigen Sie Ihr Abonnement in <stripeLink>Stripe</stripeLink>.",
+  "applied.description": "Herzlichen Glückwunsch! Sie haben erfolgreich den Bildungsrabatt beantragt.",
+  "applied.noPaymentPermission.description": "Sie haben keine Zahlungsberechtigung in diesem Arbeitsbereich. Bitte wechseln Sie zu einem Arbeitsbereich, in dem Sie die Abrechnung verwalten können, um den Bildungsrabatt zu nutzen.",
+  "applied.noPaymentPermission.returnHome": "Zurück zu Dify",
+  "applied.step1.description": "Sie haben erfolgreich den Bildungsrabatt beantragt.",
+  "applied.step1.title": "Schritt 1",
+  "applied.step2.description": "Wählen Sie den Arbeitsbereich aus, den Sie mit dem Bildungsrabatt verwenden möchten.",
+  "applied.step2.title": "Schritt 2",
+  "applied.tabs.activeSubscription": "Im Abonnement",
+  "applied.tabs.eligible": "Kann kaufen",
+  "applied.tabs.noPaymentPermission": "Keine Zahlungsberechtigung",
+  "applied.title": "Bildungsrabatt angewendet",
+  "applied.workspace.plan": "Bezahlter Plan",
+  "applied.workspace.title": "Aktueller Arbeitsbereich",
   "currentSigned": "DERZEIT ANGEMELDET ALS",
+  "educationPricingConfirm.billingPeriod.monthly": "monatlich",
+  "educationPricingConfirm.billingPeriod.yearly": "jährlich",
+  "educationPricingConfirm.cancel": "Aktuellen Plan behalten",
+  "educationPricingConfirm.continue": "Zu Professional jährlich wechseln",
+  "educationPricingConfirm.description": "Der Bildungsrabatt gilt nur für den jährlichen Professional-Plan. Wenn Sie Ihren aktuellen Plan behalten, ist der Rabatt nicht enthalten.",
+  "educationPricingConfirm.title": "Ihr ausgewählter Plan unterstützt den Bildungsrabatt nicht",
   "emailLabel": "Ihre aktuelle E-Mail",
   "form.schoolName.placeholder": "Geben Sie den offiziellen, unabgekürzten Namen Ihrer Schule ein.",
   "form.schoolName.title": "Ihr Schulname",
@@ -31,6 +51,7 @@
   "notice.stillInEducation.expired": "Überprüfen Sie jetzt erneut, um einen neuen Gutschein für das kommende akademische Jahr zu erhalten. Wir fügen ihn Ihrem Konto hinzu und Sie können ihn für das nächste Upgrade verwenden.",
   "notice.stillInEducation.isAboutToExpire": "Überprüfen Sie jetzt erneut, um einen neuen Gutschein für das kommende Studienjahr zu erhalten. Er wird in Ihrem Konto gespeichert und ist bereit zur Nutzung bei Ihrer nächsten Verlängerung.",
   "notice.stillInEducation.title": "Immer noch in der Ausbildung?",
+  "planNotSupportEducationDiscount": "Nicht für Bildungspreise berechtigt",
   "rejectContent": "Leider sind Sie nicht für den Status \"Education Verified\" berechtigt und können daher den exklusiven 100%-Gutschein für den Dify Professional Plan nicht erhalten, wenn Sie diese E-Mail-Adresse verwenden.",
   "rejectTitle": "Ihre Dify-Ausbildungsüberprüfung wurde abgelehnt.",
   "submit": "Einreichen",
@@ -40,5 +61,6 @@
   "toVerified": "Bildung überprüfen lassen",
   "toVerifiedTip.coupon": "exklusiver 100% Gutschein",
   "toVerifiedTip.end": "für den Dify Professional Plan.",
-  "toVerifiedTip.front": "Sie sind jetzt berechtigt, den Status „Bildung verifiziert“ zu erhalten. Bitte geben Sie unten Ihre Bildungsinformationen ein, um den Prozess abzuschließen und eine Zu erhalten."
+  "toVerifiedTip.front": "Sie sind jetzt berechtigt, den Status Bildung verifiziert zu erhalten. Bitte geben Sie unten Ihre Bildungsinformationen ein, um den Prozess abzuschließen und eine zu erhalten.",
+  "useEducationDiscount": "Bildungsrabatt verwenden"
 }
diff --git a/web/i18n/de-DE/workflow.json b/web/i18n/de-DE/workflow.json
index 426c023259..0133060080 100644
--- a/web/i18n/de-DE/workflow.json
+++ b/web/i18n/de-DE/workflow.json
@@ -646,12 +646,12 @@
   "nodes.humanInput.userActions.actionIdFormatTip": "Aktions-ID muss mit einem Buchstaben oder Unterstrich beginnen, gefolgt von Buchstaben, Zahlen oder Unterstrichen",
   "nodes.humanInput.userActions.actionIdTooLong": "Aktions-ID darf höchstens {{maxLength}} Zeichen lang sein",
   "nodes.humanInput.userActions.actionNamePlaceholder": "Aktionsname",
-  "nodes.humanInput.userActions.buttonTextPlaceholder": "Schaltflächen-Anzeigetext",
+  "nodes.humanInput.userActions.buttonTextPlaceholder": "Aktionswert",
   "nodes.humanInput.userActions.buttonTextTooLong": "Schaltflächentext darf höchstens {{maxLength}} Zeichen lang sein",
   "nodes.humanInput.userActions.chooseStyle": "Wählen Sie einen Schaltflächenstil",
   "nodes.humanInput.userActions.emptyTip": "Klicken Sie auf die '+'-Schaltfläche, um Benutzeraktionen hinzuzufügen",
   "nodes.humanInput.userActions.title": "Benutzeraktionen",
-  "nodes.humanInput.userActions.tooltip": "Definieren Sie Schaltflächen, auf die Benutzer klicken können, um auf dieses Formular zu reagieren. Jede Schaltfläche kann unterschiedliche Workflow-Pfade auslösen. Aktions-ID muss mit einem Buchstaben oder Unterstrich beginnen, gefolgt von Buchstaben, Zahlen oder Unterstrichen.",
+  "nodes.humanInput.userActions.tooltip": "Definieren Sie Schaltflächen, auf die Benutzer klicken können, um auf dieses Formular zu reagieren. Die Aktions-ID steuert die Verzweigung. Der Aktionswert wird nachgelagert als ausgewählte integrierte Ausgabe bereitgestellt. Aktions-ID muss mit einem Buchstaben oder Unterstrich beginnen, gefolgt von Buchstaben, Zahlen oder Unterstrichen.",
   "nodes.humanInput.userActions.triggered": "<strong>{{actionName}}</strong> wurde ausgelöst",
   "nodes.ifElse.addCondition": "Bedingung hinzufügen",
   "nodes.ifElse.addSubVariable": "Untervariable",
@@ -897,13 +897,17 @@
   "nodes.questionClassifiers.advancedSetting": "Erweiterte Einstellung",
   "nodes.questionClassifiers.class": "Klasse",
   "nodes.questionClassifiers.classNamePlaceholder": "Geben Sie Ihren Klassennamen ein",
+  "nodes.questionClassifiers.defaultLabel": "KLASSE {{index}}",
   "nodes.questionClassifiers.inputVars": "Eingabevariablen",
   "nodes.questionClassifiers.instruction": "Anweisung",
   "nodes.questionClassifiers.instructionPlaceholder": "Geben Sie Ihre Anweisung ein",
   "nodes.questionClassifiers.instructionTip": "Geben Sie zusätzliche Anweisungen ein, um dem Fragenklassifizierer zu helfen, besser zu verstehen, wie Fragen kategorisiert werden sollen.",
+  "nodes.questionClassifiers.labelEditorAriaLabel": "Klassenbeschriftungseditor",
   "nodes.questionClassifiers.model": "Modell",
+  "nodes.questionClassifiers.outputVars.classLabel": "Klassenbezeichnung",
   "nodes.questionClassifiers.outputVars.className": "Klassennamen",
   "nodes.questionClassifiers.outputVars.usage": "Nutzungsinformationen des Modells",
+  "nodes.questionClassifiers.renameHint": "Doppelklicken Sie auf den Klassentitel, um ihn umzubenennen",
   "nodes.questionClassifiers.topicName": "Themenname",
   "nodes.questionClassifiers.topicPlaceholder": "Geben Sie Ihren Themennamen ein",
   "nodes.start.builtInVar": "Eingebaute Variablen",
diff --git a/web/i18n/en-US/app-debug.json b/web/i18n/en-US/app-debug.json
index f010bbd92e..75f131f825 100644
--- a/web/i18n/en-US/app-debug.json
+++ b/web/i18n/en-US/app-debug.json
@@ -337,6 +337,8 @@
   "variableConfig.file.image.name": "Image",
   "variableConfig.file.supportFileTypes": "Support File Types",
   "variableConfig.file.video.name": "Video",
+  "variableConfig.hidden": "Hidden & Pre-Filled",
+  "variableConfig.hiddenDescription": "Hide this field from end users and supply its value yourself. Mutually exclusive with Required. <docLink>Learn more</docLink>",
   "variableConfig.hide": "Hide",
   "variableConfig.inputPlaceholder": "Please input",
   "variableConfig.json": "JSON Code",
diff --git a/web/i18n/en-US/app-overview.json b/web/i18n/en-US/app-overview.json
index 81256a769c..2b2a550631 100644
--- a/web/i18n/en-US/app-overview.json
+++ b/web/i18n/en-US/app-overview.json
@@ -56,6 +56,8 @@
   "overview.appInfo.embedded.copy": "Copy",
   "overview.appInfo.embedded.entry": "Embedded",
   "overview.appInfo.embedded.explanation": "Choose the way to embed chat app to your website",
+  "overview.appInfo.embedded.hiddenInputs.description": "Enter values for the hidden fields. The values are added to the iframe URL or the script's inputs object.",
+  "overview.appInfo.embedded.hiddenInputs.title": "Pre-Fill Hidden Fields",
   "overview.appInfo.embedded.iframe": "To add the chat app any where on your website, add this iframe to your html code.",
   "overview.appInfo.embedded.scripts": "To add a chat app to the bottom right of your website add this code to your html.",
   "overview.appInfo.embedded.title": "Embed on website",
@@ -104,6 +106,8 @@
   "overview.appInfo.settings.workflow.subTitle": "Workflow Details",
   "overview.appInfo.settings.workflow.title": "Workflow",
   "overview.appInfo.title": "Web App",
+  "overview.appInfo.workflowLaunchHiddenInputs.description": "Enter values for the hidden fields, then click <bold>Launch</bold> to open the WebApp with the values.",
+  "overview.appInfo.workflowLaunchHiddenInputs.title": "Pre-Fill Hidden Fields",
   "overview.disableTooltip.triggerMode": "The {{feature}} feature is not supported in Trigger Node mode.",
   "overview.status.disable": "Disabled",
   "overview.status.running": "In Service",
diff --git a/web/i18n/en-US/common.json b/web/i18n/en-US/common.json
index 978983ac1f..fbcc462a53 100644
--- a/web/i18n/en-US/common.json
+++ b/web/i18n/en-US/common.json
@@ -102,6 +102,7 @@
   "appModes.completionApp": "Text Generator",
   "avatar.deleteDescription": "Are you sure you want to remove your profile picture? Your account will use the default initial avatar.",
   "avatar.deleteTitle": "Remove Avatar",
+  "avatar.editAction": "Edit Avatar",
   "chat.citation.characters": "Characters:",
   "chat.citation.hitCount": "Retrieval count:",
   "chat.citation.hitScore": "Retrieval Score:",
@@ -195,6 +196,7 @@
   "imageInput.browse": "browse",
   "imageInput.dropImageHere": "Drop your image here, or",
   "imageInput.supportedFormats": "Supports PNG, JPG, JPEG, WEBP and GIF",
+  "imageUploader.imageList": "Image list",
   "imageUploader.imageUpload": "Image Upload",
   "imageUploader.pasteImageLink": "Paste image link",
   "imageUploader.pasteImageLinkInputPlaceholder": "Paste image link here",
@@ -513,6 +515,8 @@
   "operation.ok": "OK",
   "operation.openInNewTab": "Open in new tab",
   "operation.params": "Params",
+  "operation.pause": "Pause",
+  "operation.play": "Play",
   "operation.refresh": "Restart",
   "operation.regenerate": "Regenerate",
   "operation.reload": "Reload",
@@ -520,6 +524,7 @@
   "operation.rename": "Rename",
   "operation.reset": "Reset",
   "operation.resetKeywords": "Reset keywords",
+  "operation.retry": "Retry",
   "operation.save": "Save",
   "operation.saveAndEnable": "Save & Enable",
   "operation.saveAndRegenerate": "Save & Regenerate Child Chunks",
@@ -534,6 +539,8 @@
   "operation.skip": "Skip",
   "operation.submit": "Submit",
   "operation.sure": "I'm sure",
+  "operation.toggleFullscreen": "Toggle fullscreen",
+  "operation.toggleMute": "Toggle mute",
   "operation.view": "View",
   "operation.viewDetails": "View Details",
   "operation.viewMore": "VIEW MORE",
@@ -678,5 +685,6 @@
   "voiceInput.converting": "Converting to text...",
   "voiceInput.notAllow": "microphone not authorized",
   "voiceInput.speaking": "Speak now...",
+  "voiceInput.start": "Voice input",
   "you": "You"
 }
diff --git a/web/i18n/en-US/education.json b/web/i18n/en-US/education.json
index a0fb01c014..479ea5d28f 100644
--- a/web/i18n/en-US/education.json
+++ b/web/i18n/en-US/education.json
@@ -1,5 +1,25 @@
 {
+  "applied.activeSubscription.description": "You have an active subscription. You can use the education discount after your subscription expires. Confirm your subscription in <stripeLink>Stripe</stripeLink>.",
+  "applied.description": "Congratulations! You've successfully applied for the education discount.",
+  "applied.noPaymentPermission.description": "You don't have payment permission in this workspace. Please switch to a workspace where you can manage billing to use the education discount.",
+  "applied.noPaymentPermission.returnHome": "Back to Dify",
+  "applied.step1.description": "You've successfully applied for the education discount.",
+  "applied.step1.title": "Step 1",
+  "applied.step2.description": "Select the workspace you want to use the education discount with.",
+  "applied.step2.title": "Step 2",
+  "applied.tabs.activeSubscription": "In subscription",
+  "applied.tabs.eligible": "Can buy",
+  "applied.tabs.noPaymentPermission": "No payment permission",
+  "applied.title": "Education discount applied",
+  "applied.workspace.plan": "Paid plan",
+  "applied.workspace.title": "Current Workspace",
   "currentSigned": "CURRENTLY SIGNED IN AS",
+  "educationPricingConfirm.billingPeriod.monthly": "monthly",
+  "educationPricingConfirm.billingPeriod.yearly": "annual",
+  "educationPricingConfirm.cancel": "Keep current plan",
+  "educationPricingConfirm.continue": "Switch to Professional Annual",
+  "educationPricingConfirm.description": "The education discount applies to the Professional annual plan only. Keeping your current plan won't include the discount.",
+  "educationPricingConfirm.title": "Your selected plan doesn't support the education discount",
   "emailLabel": "Your current email",
   "form.schoolName.placeholder": "Enter the official, unabbreviated name of your school",
   "form.schoolName.title": "Your School Name",
@@ -31,6 +51,7 @@
   "notice.stillInEducation.expired": "Re-verify now to get a new coupon for the upcoming academic year. We'll add it to your account and you can use it for the next upgrade.",
   "notice.stillInEducation.isAboutToExpire": "Re-verify now to get a new coupon for the upcoming academic year. It'll be saved to your account and ready to use at your next renewal.",
   "notice.stillInEducation.title": "Still in education?",
+  "planNotSupportEducationDiscount": "Not eligible for education pricing",
   "rejectContent": "Unfortunately, you are not eligible for Education Verified status and therefore cannot receive the exclusive 100% coupon for the Dify Professional Plan if you use this email address.",
   "rejectTitle": "Your Dify Educational Verification Has Been Rejected",
   "submit": "Submit",
@@ -40,5 +61,6 @@
   "toVerified": "Get Education Verified",
   "toVerifiedTip.coupon": "exclusive 100% coupon",
   "toVerifiedTip.end": "for the Dify Professional Plan.",
-  "toVerifiedTip.front": "You are now eligible for Education Verified status. Please enter your education information below to complete the process and receive an"
+  "toVerifiedTip.front": "You are now eligible for Education Verified status. Please enter your education information below to complete the process and receive an",
+  "useEducationDiscount": "Use education discount"
 }
diff --git a/web/i18n/en-US/workflow.json b/web/i18n/en-US/workflow.json
index c8cbed8f1e..c6e35217f0 100644
--- a/web/i18n/en-US/workflow.json
+++ b/web/i18n/en-US/workflow.json
@@ -663,12 +663,12 @@
   "nodes.humanInput.userActions.actionIdFormatTip": "Action ID must start with a letter or underscores, followed by letters, numbers, or underscores",
   "nodes.humanInput.userActions.actionIdTooLong": "Action ID must be {{maxLength}} characters or less",
   "nodes.humanInput.userActions.actionNamePlaceholder": "Action Name",
-  "nodes.humanInput.userActions.buttonTextPlaceholder": "Button display Text",
+  "nodes.humanInput.userActions.buttonTextPlaceholder": "Action Value",
   "nodes.humanInput.userActions.buttonTextTooLong": "Button text must be {{maxLength}} characters or less",
   "nodes.humanInput.userActions.chooseStyle": "Choose a button style",
   "nodes.humanInput.userActions.emptyTip": "Click the '+' button to add user actions",
   "nodes.humanInput.userActions.title": "User Actions",
-  "nodes.humanInput.userActions.tooltip": "Define buttons that users can click to respond to this form. Each button can trigger different workflow paths. Action ID must start with a letter or underscores, followed by letters, numbers, or underscores.",
+  "nodes.humanInput.userActions.tooltip": "Define buttons that users can click to respond to this form. Action ID controls branching. Action Value is exposed downstream as the selected built-in output. Action ID must start with a letter or underscores, followed by letters, numbers, or underscores.",
   "nodes.humanInput.userActions.triggered": "<strong>{{actionName}}</strong> has been triggered",
   "nodes.ifElse.addCondition": "Add Condition",
   "nodes.ifElse.addSubVariable": "Sub Variable",
@@ -914,13 +914,17 @@
   "nodes.questionClassifiers.advancedSetting": "Advanced Setting",
   "nodes.questionClassifiers.class": "Class",
   "nodes.questionClassifiers.classNamePlaceholder": "Write your class name",
+  "nodes.questionClassifiers.defaultLabel": "CLASS {{index}}",
   "nodes.questionClassifiers.inputVars": "Input Variables",
   "nodes.questionClassifiers.instruction": "Instruction",
   "nodes.questionClassifiers.instructionPlaceholder": "Write your instruction",
   "nodes.questionClassifiers.instructionTip": "Input additional instructions to help the question classifier better understand how to categorize questions.",
+  "nodes.questionClassifiers.labelEditorAriaLabel": "Class label editor",
   "nodes.questionClassifiers.model": "model",
+  "nodes.questionClassifiers.outputVars.classLabel": "Class Label",
   "nodes.questionClassifiers.outputVars.className": "Class Name",
   "nodes.questionClassifiers.outputVars.usage": "Model Usage Information",
+  "nodes.questionClassifiers.renameHint": "Double-click class title to rename",
   "nodes.questionClassifiers.topicName": "Topic Name",
   "nodes.questionClassifiers.topicPlaceholder": "Write your topic name",
   "nodes.start.builtInVar": "Built-in Variables",
diff --git a/web/i18n/es-ES/app-debug.json b/web/i18n/es-ES/app-debug.json
index 554d705754..27277dc3c9 100644
--- a/web/i18n/es-ES/app-debug.json
+++ b/web/i18n/es-ES/app-debug.json
@@ -337,6 +337,8 @@
   "variableConfig.file.image.name": "Imagen",
   "variableConfig.file.supportFileTypes": "Tipos de archivos de soporte",
   "variableConfig.file.video.name": "Vídeo",
+  "variableConfig.hidden": "Oculto y Prerrellenado",
+  "variableConfig.hiddenDescription": "Oculta este campo a los usuarios finales y proporciona su valor tú mismo. Mutuamente exclusivo con Requerido. <docLink>Más información</docLink>",
   "variableConfig.hide": "Ocultar",
   "variableConfig.inputPlaceholder": "Por favor ingresa",
   "variableConfig.json": "Código JSON",
diff --git a/web/i18n/es-ES/app-overview.json b/web/i18n/es-ES/app-overview.json
index 8cd65bed18..ab97cee2b4 100644
--- a/web/i18n/es-ES/app-overview.json
+++ b/web/i18n/es-ES/app-overview.json
@@ -56,6 +56,8 @@
   "overview.appInfo.embedded.copy": "Copiar",
   "overview.appInfo.embedded.entry": "Incrustado",
   "overview.appInfo.embedded.explanation": "Elige la forma de incrustar la aplicación de chat en tu sitio web",
+  "overview.appInfo.embedded.hiddenInputs.description": "Introduce valores para los campos ocultos. Los valores se añaden a la URL del iframe o al objeto de inputs del script.",
+  "overview.appInfo.embedded.hiddenInputs.title": "Prerrellenar Campos Ocultos",
   "overview.appInfo.embedded.iframe": "Para agregar la aplicación de chat en cualquier lugar de tu sitio web, agrega este iframe a tu código HTML.",
   "overview.appInfo.embedded.scripts": "Para agregar una aplicación de chat en la esquina inferior derecha de tu sitio web, agrega este código a tu HTML.",
   "overview.appInfo.embedded.title": "Incrustar en el sitio web",
@@ -104,6 +106,8 @@
   "overview.appInfo.settings.workflow.subTitle": "Detalles del flujo de trabajo",
   "overview.appInfo.settings.workflow.title": "Pasos del flujo de trabajo",
   "overview.appInfo.title": "Aplicación web",
+  "overview.appInfo.workflowLaunchHiddenInputs.description": "Introduce valores para los campos ocultos y haz clic en <bold>Iniciar</bold> para abrir el WebApp con los valores.",
+  "overview.appInfo.workflowLaunchHiddenInputs.title": "Prerrellenar Campos Ocultos",
   "overview.disableTooltip.triggerMode": "La función {{feature}} no es compatible en el modo Nodo de disparo.",
   "overview.status.disable": "Deshabilitar",
   "overview.status.running": "En servicio",
diff --git a/web/i18n/es-ES/common.json b/web/i18n/es-ES/common.json
index 649ac803aa..3c3d99c7ac 100644
--- a/web/i18n/es-ES/common.json
+++ b/web/i18n/es-ES/common.json
@@ -101,6 +101,7 @@
   "appModes.completionApp": "Generador de Texto",
   "avatar.deleteDescription": "¿Estás seguro de que deseas eliminar tu foto de perfil? Tu cuenta usará el avatar inicial predeterminado.",
   "avatar.deleteTitle": "Eliminar Avatar",
+  "avatar.editAction": "Editar Avatar",
   "chat.citation.characters": "Caracteres:",
   "chat.citation.hitCount": "Conteo de recuperaciones:",
   "chat.citation.hitScore": "Puntuación de recuperación:",
diff --git a/web/i18n/es-ES/education.json b/web/i18n/es-ES/education.json
index c3c3f05e44..5784797977 100644
--- a/web/i18n/es-ES/education.json
+++ b/web/i18n/es-ES/education.json
@@ -1,5 +1,25 @@
 {
+  "applied.activeSubscription.description": "Tienes una suscripción activa. Puedes usar el descuento educativo después de que expire tu suscripción. Confirma tu suscripción en <stripeLink>Stripe</stripeLink>.",
+  "applied.description": "¡Felicitaciones! Has solicitado exitosamente el descuento educativo.",
+  "applied.noPaymentPermission.description": "No tienes permiso de pago en este workspace. Por favor, cambia a un workspace donde puedas gestionar la facturación para usar el descuento educativo.",
+  "applied.noPaymentPermission.returnHome": "Volver a Dify",
+  "applied.step1.description": "Has solicitado exitosamente el descuento educativo.",
+  "applied.step1.title": "Paso 1",
+  "applied.step2.description": "Selecciona el workspace que deseas usar con el descuento educativo.",
+  "applied.step2.title": "Paso 2",
+  "applied.tabs.activeSubscription": "En suscripción",
+  "applied.tabs.eligible": "Puede comprar",
+  "applied.tabs.noPaymentPermission": "Sin permiso de pago",
+  "applied.title": "Descuento educativo aplicado",
+  "applied.workspace.plan": "Plan de pago",
+  "applied.workspace.title": "Workspace actual",
   "currentSigned": "ACTUALMENTE CONECTADO COMO",
+  "educationPricingConfirm.billingPeriod.monthly": "mensual",
+  "educationPricingConfirm.billingPeriod.yearly": "anual",
+  "educationPricingConfirm.cancel": "Mantener el plan actual",
+  "educationPricingConfirm.continue": "Cambiar a Professional anual",
+  "educationPricingConfirm.description": "El descuento educativo solo se aplica al plan Professional anual. Si mantienes tu plan actual, no se incluirá el descuento.",
+  "educationPricingConfirm.title": "El plan seleccionado no admite el descuento educativo",
   "emailLabel": "Tu correo electrónico actual",
   "form.schoolName.placeholder": "Ingrese el nombre oficial y completo de su escuela",
   "form.schoolName.title": "El nombre de tu escuela",
@@ -31,6 +51,7 @@
   "notice.stillInEducation.expired": "Verifica de nuevo ahora para obtener un nuevo cupón para el próximo año académico. Lo añadiremos a tu cuenta y podrás usarlo para la próxima actualización.",
   "notice.stillInEducation.isAboutToExpire": "Verifica de nuevo ahora para obtener un nuevo cupón para el próximo año académico. Se guardará en tu cuenta y estará listo para usar en tu próxima renovación.",
   "notice.stillInEducation.title": "¿Aún en educación?",
+  "planNotSupportEducationDiscount": "No elegible para precios educativos",
   "rejectContent": "Desafortunadamente, no eres elegible para el estado de Educación Verificada y, por lo tanto, no puedes recibir el exclusivo cupón del 100% para el Plan Profesional de Dify si utilizas esta dirección de correo electrónico.",
   "rejectTitle": "Su verificación educativa de Dify ha sido rechazada.",
   "submit": "Enviar",
@@ -40,5 +61,6 @@
   "toVerified": "Verifica la educación",
   "toVerifiedTip.coupon": "cupón exclusivo del 100%",
   "toVerifiedTip.end": "para el Plan Profesional de Dify.",
-  "toVerifiedTip.front": "Ahora eres elegible para el estado de Educación Verificada. Por favor, introduce tu información educativa a continuación para completar el proceso y recibir un"
+  "toVerifiedTip.front": "Ahora eres elegible para el estado de Educación Verificada. Por favor, introduce tu información educativa a continuación para completar el proceso y recibir un",
+  "useEducationDiscount": "Usar descuento educativo"
 }
diff --git a/web/i18n/es-ES/workflow.json b/web/i18n/es-ES/workflow.json
index c55ffdfc1e..57cf555831 100644
--- a/web/i18n/es-ES/workflow.json
+++ b/web/i18n/es-ES/workflow.json
@@ -646,12 +646,12 @@
   "nodes.humanInput.userActions.actionIdFormatTip": "El ID de acción debe comenzar con una letra o guiones bajos, seguido de letras, números o guiones bajos",
   "nodes.humanInput.userActions.actionIdTooLong": "El ID de acción debe tener {{maxLength}} caracteres o menos",
   "nodes.humanInput.userActions.actionNamePlaceholder": "Nombre de Acción",
-  "nodes.humanInput.userActions.buttonTextPlaceholder": "Texto de visualización del botón",
+  "nodes.humanInput.userActions.buttonTextPlaceholder": "Valor de la Acción",
   "nodes.humanInput.userActions.buttonTextTooLong": "El texto del botón debe tener {{maxLength}} caracteres o menos",
   "nodes.humanInput.userActions.chooseStyle": "Elija un estilo de botón",
   "nodes.humanInput.userActions.emptyTip": "Haga clic en el botón '+' para agregar acciones del usuario",
   "nodes.humanInput.userActions.title": "Acciones del Usuario",
-  "nodes.humanInput.userActions.tooltip": "Defina botones en los que los usuarios puedan hacer clic para responder a este formulario. Cada botón puede activar diferentes rutas de flujo de trabajo. El ID de acción debe comenzar con una letra o guiones bajos, seguido de letras, números o guiones bajos.",
+  "nodes.humanInput.userActions.tooltip": "Defina botones en los que los usuarios puedan hacer clic para responder a este formulario. El ID de acción controla la ramificación. El Valor de la Acción se expone aguas abajo como la salida integrada seleccionada. El ID de acción debe comenzar con una letra o guiones bajos, seguido de letras, números o guiones bajos.",
   "nodes.humanInput.userActions.triggered": "<strong>{{actionName}}</strong> ha sido activado",
   "nodes.ifElse.addCondition": "Agregar condición",
   "nodes.ifElse.addSubVariable": "Sub Variable",
@@ -897,13 +897,17 @@
   "nodes.questionClassifiers.advancedSetting": "Configuración avanzada",
   "nodes.questionClassifiers.class": "Clase",
   "nodes.questionClassifiers.classNamePlaceholder": "Escribe el nombre de tu clase",
+  "nodes.questionClassifiers.defaultLabel": "CLASE {{index}}",
   "nodes.questionClassifiers.inputVars": "Variables de entrada",
   "nodes.questionClassifiers.instruction": "Instrucción",
   "nodes.questionClassifiers.instructionPlaceholder": "Write your instruction",
   "nodes.questionClassifiers.instructionTip": "Input additional instructions to help the question classifier better understand how to categorize questions.",
+  "nodes.questionClassifiers.labelEditorAriaLabel": "Editor de etiqueta de clase",
   "nodes.questionClassifiers.model": "modelo",
+  "nodes.questionClassifiers.outputVars.classLabel": "Etiqueta de clase",
   "nodes.questionClassifiers.outputVars.className": "Nombre de la clase",
   "nodes.questionClassifiers.outputVars.usage": "Información de uso del modelo",
+  "nodes.questionClassifiers.renameHint": "Haz doble clic en el título de la clase para renombrar",
   "nodes.questionClassifiers.topicName": "Nombre del tema",
   "nodes.questionClassifiers.topicPlaceholder": "Escribe el nombre de tu tema",
   "nodes.start.builtInVar": "Variables incorporadas",
diff --git a/web/i18n/fa-IR/app-debug.json b/web/i18n/fa-IR/app-debug.json
index 5bd769cd10..60f3ba4c2c 100644
--- a/web/i18n/fa-IR/app-debug.json
+++ b/web/i18n/fa-IR/app-debug.json
@@ -337,6 +337,8 @@
   "variableConfig.file.image.name": "تصویر",
   "variableConfig.file.supportFileTypes": "انواع فایل های پشتیبانی",
   "variableConfig.file.video.name": "ویدئو",
+  "variableConfig.hidden": "پنهان و پیش‌پر شده",
+  "variableConfig.hiddenDescription": "این فیلد را از کاربران نهایی پنهان کنید و مقدار آن را خودتان تأمین کنید. با اجباری به صورت متقابل انحصاری است. <docLink>بیشتر بدانید</docLink>",
   "variableConfig.hide": "مخفی کردن",
   "variableConfig.inputPlaceholder": "لطفا وارد کنید",
   "variableConfig.json": "کد JSON",
diff --git a/web/i18n/fa-IR/app-overview.json b/web/i18n/fa-IR/app-overview.json
index 6fcd633f41..2699f51f00 100644
--- a/web/i18n/fa-IR/app-overview.json
+++ b/web/i18n/fa-IR/app-overview.json
@@ -56,6 +56,8 @@
   "overview.appInfo.embedded.copy": "کپی",
   "overview.appInfo.embedded.entry": "جاسازی شده",
   "overview.appInfo.embedded.explanation": "روش‌های جاسازی برنامه چت در وب‌سایت خود را انتخاب کنید",
+  "overview.appInfo.embedded.hiddenInputs.description": "مقادیری برای فیلدهای پنهان وارد کنید. مقادیر به URL iframe یا شیء inputs اسکریپت اضافه می‌شوند.",
+  "overview.appInfo.embedded.hiddenInputs.title": "پیش‌پر کردن فیلدهای پنهان",
   "overview.appInfo.embedded.iframe": "برای افزودن برنامه چت در هرجای وب‌سایت خود، این iframe را به کد HTML خود اضافه کنید.",
   "overview.appInfo.embedded.scripts": "برای افزودن برنامه چت به گوشه پایین سمت راست وب‌سایت خود، این کد را به HTML خود اضافه کنید.",
   "overview.appInfo.embedded.title": "جاسازی در وب‌سایت",
@@ -104,6 +106,8 @@
   "overview.appInfo.settings.workflow.subTitle": "جزئیات گردش کار",
   "overview.appInfo.settings.workflow.title": "مراحل کاری",
   "overview.appInfo.title": "وب اپ",
+  "overview.appInfo.workflowLaunchHiddenInputs.description": "مقادیری برای فیلدهای پنهان وارد کنید، سپس روی <bold>راه‌اندازی</bold> کلیک کنید تا WebApp با مقادیر باز شود.",
+  "overview.appInfo.workflowLaunchHiddenInputs.title": "پیش‌پر کردن فیلدهای پنهان",
   "overview.disableTooltip.triggerMode": "ویژگی {{feature}} در حالت گره تریگر پشتیبانی نمی‌شود.",
   "overview.status.disable": "غیرفعال",
   "overview.status.running": "در حال سرویس‌دهی",
diff --git a/web/i18n/fa-IR/common.json b/web/i18n/fa-IR/common.json
index ba1179520e..b3af742a36 100644
--- a/web/i18n/fa-IR/common.json
+++ b/web/i18n/fa-IR/common.json
@@ -101,6 +101,7 @@
   "appModes.completionApp": "تولیدکننده متن",
   "avatar.deleteDescription": "آیا مطمئن هستید که می‌خواهید تصویر پروفایل خود را حذف کنید؟ حساب شما از آواتار اولیه پیش‌فرض استفاده خواهد کرد.",
   "avatar.deleteTitle": "حذف آواتار",
+  "avatar.editAction": "ویرایش آواتار",
   "chat.citation.characters": "کاراکترها:",
   "chat.citation.hitCount": "تعداد بازیابی:",
   "chat.citation.hitScore": "امتیاز بازیابی:",
diff --git a/web/i18n/fa-IR/education.json b/web/i18n/fa-IR/education.json
index 9ce7662b88..ee1e282719 100644
--- a/web/i18n/fa-IR/education.json
+++ b/web/i18n/fa-IR/education.json
@@ -1,5 +1,25 @@
 {
+  "applied.activeSubscription.description": "شما یک اشتراک فعال دارید. پس از انقضای اشتراک می‌توانید از تخفیف آموزشی استفاده کنید. اشتراک خود را در <stripeLink>Stripe</stripeLink> تأیید کنید.",
+  "applied.description": "تبریک می‌گوییم! درخواست تخفیف آموزشی شما با موفقیت ثبت شد.",
+  "applied.noPaymentPermission.description": "شما در این workspace مجوز پرداخت ندارید. لطفاً به workspace‌ای بروید که بتوانید صورتحساب را مدیریت کنید تا از تخفیف آموزشی استفاده کنید.",
+  "applied.noPaymentPermission.returnHome": "بازگشت به Dify",
+  "applied.step1.description": "درخواست تخفیف آموزشی شما با موفقیت ثبت شد.",
+  "applied.step1.title": "مرحله ۱",
+  "applied.step2.description": "workspace‌ای را که می‌خواهید با تخفیف آموزشی استفاده کنید انتخاب کنید.",
+  "applied.step2.title": "مرحله ۲",
+  "applied.tabs.activeSubscription": "در اشتراک",
+  "applied.tabs.eligible": "می‌تواند خرید کند",
+  "applied.tabs.noPaymentPermission": "بدون مجوز پرداخت",
+  "applied.title": "تخفیف آموزشی اعمال شد",
+  "applied.workspace.plan": "طرح پولی",
+  "applied.workspace.title": "Workspace فعلی",
   "currentSigned": "اکنون به عنوان",
+  "educationPricingConfirm.billingPeriod.monthly": "ماهانه",
+  "educationPricingConfirm.billingPeriod.yearly": "سالانه",
+  "educationPricingConfirm.cancel": "حفظ طرح فعلی",
+  "educationPricingConfirm.continue": "تغییر به Professional سالانه",
+  "educationPricingConfirm.description": "تخفیف آموزشی فقط برای طرح سالانه Professional اعمال می‌شود. با حفظ طرح فعلی، این تخفیف شامل نمی‌شود.",
+  "educationPricingConfirm.title": "طرح انتخاب‌شده شما از تخفیف آموزشی پشتیبانی نمی‌کند",
   "emailLabel": "ایمیل فعلی شما",
   "form.schoolName.placeholder": "نام رسمی و کامل مدرسه خود را وارد کنید",
   "form.schoolName.title": "نام مدرسه شما",
@@ -31,6 +51,7 @@
   "notice.stillInEducation.expired": "هم‌اکنون دوباره تأیید کنید تا یک کوپن جدید برای سال تحصیلی آینده دریافت کنید. ما آن را به حساب شما اضافه خواهیم کرد و می‌توانید از آن برای ارتقاء بعدی استفاده کنید.",
   "notice.stillInEducation.isAboutToExpire": "در حال حاضر دوباره تأیید کنید تا یک کوپن جدید برای سال تحصیلی آینده دریافت کنید. این کوپن به حساب شما ذخیره خواهد شد و در زمان تمدید بعدی شما آماده استفاده است.",
   "notice.stillInEducation.title": "آیا هنوز در حال تحصیل هستید؟",
+  "planNotSupportEducationDiscount": "واجد شرایط قیمت‌گذاری آموزشی نیست",
   "rejectContent": "متاسفانه، شما واجد شرایط وضعیت تأیید شده آموزشی نیستید و به همین دلیل نمی‌توانید کوپن انحصاری ۱۰۰٪ برای طرح حرفه‌ای Dify را در صورت استفاده از این آدرس ایمیل دریافت کنید.",
   "rejectTitle": "تأییدیه آموزشی دیفی شما رد شده است",
   "submit": "ارسال",
@@ -40,5 +61,6 @@
   "toVerified": "تحصیلات خود را تأیید کنید",
   "toVerifiedTip.coupon": "کوپن انحصاری ۱۰۰٪",
   "toVerifiedTip.end": "برای طرح حرفه‌ای دیفی.",
-  "toVerifiedTip.front": "شما اکنون برای وضعیت تأیید شده آموزشی واجد شرایط هستید. لطفاً اطلاعات تحصیلی خود را در زیر وارد کنید تا فرآیند را کامل کرده و یک دریافت کنید."
+  "toVerifiedTip.front": "شما اکنون برای وضعیت تأیید شده آموزشی واجد شرایط هستید. لطفاً اطلاعات تحصیلی خود را در زیر وارد کنید تا فرآیند را کامل کرده و یک دریافت کنید.",
+  "useEducationDiscount": "استفاده از تخفیف آموزشی"
 }
diff --git a/web/i18n/fa-IR/workflow.json b/web/i18n/fa-IR/workflow.json
index c23c781a04..813931c74f 100644
--- a/web/i18n/fa-IR/workflow.json
+++ b/web/i18n/fa-IR/workflow.json
@@ -646,12 +646,12 @@
   "nodes.humanInput.userActions.actionIdFormatTip": "شناسه عملیات باید با حرف یا زیرخط شروع شود و فقط شامل حروف، اعداد و زیرخط باشد",
   "nodes.humanInput.userActions.actionIdTooLong": "شناسه عملیات باید {{maxLength}} کاراکتر یا کمتر باشد",
   "nodes.humanInput.userActions.actionNamePlaceholder": "نام عملیات",
-  "nodes.humanInput.userActions.buttonTextPlaceholder": "متن نمایشی دکمه",
+  "nodes.humanInput.userActions.buttonTextPlaceholder": "مقدار عملیات",
   "nodes.humanInput.userActions.buttonTextTooLong": "متن دکمه باید {{maxLength}} کاراکتر یا کمتر باشد",
   "nodes.humanInput.userActions.chooseStyle": "انتخاب سبک دکمه",
   "nodes.humanInput.userActions.emptyTip": "برای افزودن عملیات کاربر روی '+' کلیک کنید",
   "nodes.humanInput.userActions.title": "عملیات کاربر",
-  "nodes.humanInput.userActions.tooltip": "دکمه‌هایی تعریف کنید که کاربر برای پاسخ به فرم روی آن‌ها کلیک کند. هر دکمه می‌تواند مسیر متفاوتی در گردش کار ایجاد کند. شناسه عملیات باید با حرف یا زیرخط شروع شود.",
+  "nodes.humanInput.userActions.tooltip": "دکمه‌هایی تعریف کنید که کاربر برای پاسخ به فرم روی آن‌ها کلیک کند. شناسه عملیات انشعاب را کنترل می‌کند. مقدار عملیات به عنوان خروجی داخلی انتخاب‌شده در مرحله پایین‌تر نمایش داده می‌شود. شناسه عملیات باید با حرف یا زیرخط شروع شود، و سپس حروف، اعداد یا زیرخط بیاید.",
   "nodes.humanInput.userActions.triggered": "عملیات <strong>{{actionName}}</strong> فعال شد",
   "nodes.ifElse.addCondition": "افزودن شرط",
   "nodes.ifElse.addSubVariable": "متغیر فرعی",
@@ -897,13 +897,17 @@
   "nodes.questionClassifiers.advancedSetting": "تنظیمات پیشرفته",
   "nodes.questionClassifiers.class": "کلاس",
   "nodes.questionClassifiers.classNamePlaceholder": "نام کلاس را بنویسید",
+  "nodes.questionClassifiers.defaultLabel": "کلاس {{index}}",
   "nodes.questionClassifiers.inputVars": "متغیرهای ورودی",
   "nodes.questionClassifiers.instruction": "دستورالعمل",
   "nodes.questionClassifiers.instructionPlaceholder": "دستورالعمل خود را بنویسید",
   "nodes.questionClassifiers.instructionTip": "دستورالعمل اضافی برای کمک به مدل در دسته‌بندی دقیق‌تر سؤالات.",
+  "nodes.questionClassifiers.labelEditorAriaLabel": "ویرایشگر برچسب کلاس",
   "nodes.questionClassifiers.model": "مدل",
+  "nodes.questionClassifiers.outputVars.classLabel": "برچسب کلاس",
   "nodes.questionClassifiers.outputVars.className": "نام کلاس",
   "nodes.questionClassifiers.outputVars.usage": "اطلاعات مصرف مدل",
+  "nodes.questionClassifiers.renameHint": "برای تغییر نام، دوبار روی عنوان کلاس کلیک کنید",
   "nodes.questionClassifiers.topicName": "نام موضوع",
   "nodes.questionClassifiers.topicPlaceholder": "نام موضوع را بنویسید",
   "nodes.start.builtInVar": "متغیرهای داخلی",
diff --git a/web/i18n/fr-FR/app-debug.json b/web/i18n/fr-FR/app-debug.json
index 047b754f23..a9527dcef7 100644
--- a/web/i18n/fr-FR/app-debug.json
+++ b/web/i18n/fr-FR/app-debug.json
@@ -337,6 +337,8 @@
   "variableConfig.file.image.name": "Image",
   "variableConfig.file.supportFileTypes": "Types de fichiers de support",
   "variableConfig.file.video.name": "Vidéo",
+  "variableConfig.hidden": "Masqué et pré-rempli",
+  "variableConfig.hiddenDescription": "Masquez ce champ aux utilisateurs finaux et fournissez sa valeur vous-même. Incompatible avec Requis. <docLink>En savoir plus</docLink>",
   "variableConfig.hide": "Caché",
   "variableConfig.inputPlaceholder": "Please input",
   "variableConfig.json": "Code JSON",
diff --git a/web/i18n/fr-FR/app-overview.json b/web/i18n/fr-FR/app-overview.json
index 7b9b2bf36d..d3a5704fb3 100644
--- a/web/i18n/fr-FR/app-overview.json
+++ b/web/i18n/fr-FR/app-overview.json
@@ -56,6 +56,8 @@
   "overview.appInfo.embedded.copy": "Copier",
   "overview.appInfo.embedded.entry": "Intégré",
   "overview.appInfo.embedded.explanation": "Choisissez la manière d'intégrer l'application de chat à votre site Web",
+  "overview.appInfo.embedded.hiddenInputs.description": "Entrez des valeurs pour les champs masqués. Les valeurs sont ajoutées à l'URL de l'iframe ou à l'objet inputs du script.",
+  "overview.appInfo.embedded.hiddenInputs.title": "Pré-remplir les champs masqués",
   "overview.appInfo.embedded.iframe": "Pour ajouter l'application de chat n'importe où sur votre site Web, ajoutez cette iframe à votre code HTML.",
   "overview.appInfo.embedded.scripts": "Pour ajouter une application de chat en bas à droite de votre site Web, ajoutez ce code à votre HTML.",
   "overview.appInfo.embedded.title": "Intégrer sur un site Web",
@@ -104,6 +106,8 @@
   "overview.appInfo.settings.workflow.subTitle": "Détails du flux de travail",
   "overview.appInfo.settings.workflow.title": "Étapes du workflow",
   "overview.appInfo.title": "Application Web",
+  "overview.appInfo.workflowLaunchHiddenInputs.description": "Entrez des valeurs pour les champs masqués, puis cliquez sur <bold>Lancer</bold> pour ouvrir la WebApp avec ces valeurs.",
+  "overview.appInfo.workflowLaunchHiddenInputs.title": "Pré-remplir les champs masqués",
   "overview.disableTooltip.triggerMode": "La fonctionnalité {{feature}} n'est pas prise en charge en mode Nœud Déclencheur.",
   "overview.status.disable": "Désactiver",
   "overview.status.running": "En service",
diff --git a/web/i18n/fr-FR/common.json b/web/i18n/fr-FR/common.json
index ea53de39d0..d22ba796a7 100644
--- a/web/i18n/fr-FR/common.json
+++ b/web/i18n/fr-FR/common.json
@@ -101,6 +101,7 @@
   "appModes.completionApp": "Générateur de Texte",
   "avatar.deleteDescription": "Êtes-vous sûr de vouloir supprimer votre photo de profil ? Votre compte utilisera l'avatar par défaut.",
   "avatar.deleteTitle": "Supprimer l'avatar",
+  "avatar.editAction": "Modifier l'avatar",
   "chat.citation.characters": "Personnages :",
   "chat.citation.hitCount": "Nombre de récupérations :",
   "chat.citation.hitScore": "Score de Récupération:",
diff --git a/web/i18n/fr-FR/education.json b/web/i18n/fr-FR/education.json
index 9a8952e541..1757a84911 100644
--- a/web/i18n/fr-FR/education.json
+++ b/web/i18n/fr-FR/education.json
@@ -1,5 +1,25 @@
 {
+  "applied.activeSubscription.description": "Vous avez un abonnement actif. Vous pouvez utiliser la remise éducative après l'expiration de votre abonnement. Confirmez votre abonnement dans <stripeLink>Stripe</stripeLink>.",
+  "applied.description": "Félicitations ! Vous avez fait la demande de remise éducative avec succès.",
+  "applied.noPaymentPermission.description": "Vous n'avez pas la permission de payer dans cet espace de travail. Veuillez passer à un espace de travail où vous pouvez gérer la facturation pour utiliser la remise éducative.",
+  "applied.noPaymentPermission.returnHome": "Retour à Dify",
+  "applied.step1.description": "Vous avez fait la demande de remise éducative avec succès.",
+  "applied.step1.title": "Étape 1",
+  "applied.step2.description": "Sélectionnez l'espace de travail que vous souhaitez utiliser avec la remise éducative.",
+  "applied.step2.title": "Étape 2",
+  "applied.tabs.activeSubscription": "En abonnement",
+  "applied.tabs.eligible": "Peut acheter",
+  "applied.tabs.noPaymentPermission": "Pas de permission de paiement",
+  "applied.title": "Remise éducative appliquée",
+  "applied.workspace.plan": "Plan payant",
+  "applied.workspace.title": "Espace de travail actuel",
   "currentSigned": "ACTUELLEMENT CONNECTÉ EN TANT QUE",
+  "educationPricingConfirm.billingPeriod.monthly": "mensuel",
+  "educationPricingConfirm.billingPeriod.yearly": "annuel",
+  "educationPricingConfirm.cancel": "Conserver le plan actuel",
+  "educationPricingConfirm.continue": "Passer à Professional annuel",
+  "educationPricingConfirm.description": "La remise éducation s'applique uniquement au plan Professional annuel. En conservant votre plan actuel, la remise ne sera pas incluse.",
+  "educationPricingConfirm.title": "Le plan sélectionné ne prend pas en charge la remise éducation",
   "emailLabel": "Votre email actuel",
   "form.schoolName.placeholder": "Entrez le nom officiel et complet de votre école",
   "form.schoolName.title": "Le nom de votre école",
@@ -31,6 +51,7 @@
   "notice.stillInEducation.expired": "Veuillez vérifier à nouveau maintenant pour obtenir un nouveau coupon pour la prochaine année académique. Nous l'ajouterons à votre compte et vous pourrez l'utiliser pour la prochaine mise à niveau.",
   "notice.stillInEducation.isAboutToExpire": "Vérifiez de nouveau maintenant pour obtenir un nouveau coupon pour la prochaine année académique. Il sera enregistré dans votre compte et prêt à être utilisé lors de votre prochain renouvellement.",
   "notice.stillInEducation.title": "Encore dans l'éducation ?",
+  "planNotSupportEducationDiscount": "Non éligible aux tarifs éducatifs",
   "rejectContent": "Malheureusement, vous n'êtes pas éligible au statut Éducation Vérifié et ne pouvez donc pas recevoir le coupon exclusif de 100 % pour le Plan Professionnel Dify si vous utilisez cette adresse e-mail.",
   "rejectTitle": "Votre vérification éducative Dify a été rejetée.",
   "submit": "Soumettre",
@@ -40,5 +61,6 @@
   "toVerified": "Faire vérifier l'éducation",
   "toVerifiedTip.coupon": "coupon exclusif 100%",
   "toVerifiedTip.end": "pour le Plan Professionnel Dify.",
-  "toVerifiedTip.front": "Vous êtes maintenant éligible pour le statut Vérifié en Éducation. Veuillez entrer vos informations éducatives ci-dessous pour compléter le processus et recevoir un"
+  "toVerifiedTip.front": "Vous êtes maintenant éligible pour le statut Vérifié en Éducation. Veuillez entrer vos informations éducatives ci-dessous pour compléter le processus et recevoir un",
+  "useEducationDiscount": "Utiliser la remise éducative"
 }
diff --git a/web/i18n/fr-FR/workflow.json b/web/i18n/fr-FR/workflow.json
index 727c3a91e6..8cc130cc02 100644
--- a/web/i18n/fr-FR/workflow.json
+++ b/web/i18n/fr-FR/workflow.json
@@ -646,12 +646,12 @@
   "nodes.humanInput.userActions.actionIdFormatTip": "L'ID d'action doit commencer par une lettre ou des traits de soulignement, suivi de lettres, de chiffres ou de traits de soulignement",
   "nodes.humanInput.userActions.actionIdTooLong": "L'ID d'action doit comporter {{maxLength}} caractères ou moins",
   "nodes.humanInput.userActions.actionNamePlaceholder": "Nom de l'Action",
-  "nodes.humanInput.userActions.buttonTextPlaceholder": "Texte d'affichage du bouton",
+  "nodes.humanInput.userActions.buttonTextPlaceholder": "Valeur de l'action",
   "nodes.humanInput.userActions.buttonTextTooLong": "Le texte du bouton doit comporter {{maxLength}} caractères ou moins",
   "nodes.humanInput.userActions.chooseStyle": "Choisissez un style de bouton",
   "nodes.humanInput.userActions.emptyTip": "Cliquez sur le bouton '+' pour ajouter des actions utilisateur",
   "nodes.humanInput.userActions.title": "Actions Utilisateur",
-  "nodes.humanInput.userActions.tooltip": "Définissez les boutons sur lesquels les utilisateurs peuvent cliquer pour répondre à ce formulaire. Chaque bouton peut déclencher différents chemins de flux de travail. L'ID d'action doit commencer par une lettre ou des traits de soulignement, suivi de lettres, de chiffres ou de traits de soulignement.",
+  "nodes.humanInput.userActions.tooltip": "Définissez les boutons sur lesquels les utilisateurs peuvent cliquer pour répondre à ce formulaire. L'ID d'action contrôle la ramification. La Valeur de l'action est exposée en aval comme la sortie intégrée sélectionnée. L'ID d'action doit commencer par une lettre ou des traits de soulignement, suivi de lettres, de chiffres ou de traits de soulignement.",
   "nodes.humanInput.userActions.triggered": "<strong>{{actionName}}</strong> a été déclenché",
   "nodes.ifElse.addCondition": "Ajouter une condition",
   "nodes.ifElse.addSubVariable": "Sous-variable",
@@ -897,13 +897,17 @@
   "nodes.questionClassifiers.advancedSetting": "Paramètre avancé",
   "nodes.questionClassifiers.class": "Classe",
   "nodes.questionClassifiers.classNamePlaceholder": "Écrivez le nom de votre classe",
+  "nodes.questionClassifiers.defaultLabel": "CLASSE {{index}}",
   "nodes.questionClassifiers.inputVars": "Variables de saisie",
   "nodes.questionClassifiers.instruction": "Instruction",
   "nodes.questionClassifiers.instructionPlaceholder": "Écrivez votre instruction",
   "nodes.questionClassifiers.instructionTip": "Entrez des instructions supplémentaires pour aider le classificateur de questions à mieux comprendre comment catégoriser les questions.",
+  "nodes.questionClassifiers.labelEditorAriaLabel": "Éditeur de libellé de classe",
   "nodes.questionClassifiers.model": "modèle",
+  "nodes.questionClassifiers.outputVars.classLabel": "Libellé de classe",
   "nodes.questionClassifiers.outputVars.className": "Nom de la classe",
   "nodes.questionClassifiers.outputVars.usage": "Informations sur l'utilisation du modèle",
+  "nodes.questionClassifiers.renameHint": "Double-cliquez sur le titre de la classe pour renommer",
   "nodes.questionClassifiers.topicName": "Nom du sujet",
   "nodes.questionClassifiers.topicPlaceholder": "Écrivez le nom de votre sujet",
   "nodes.start.builtInVar": "Variables intégrées",
diff --git a/web/i18n/hi-IN/app-debug.json b/web/i18n/hi-IN/app-debug.json
index d50ff04d9d..0c6a0f703d 100644
--- a/web/i18n/hi-IN/app-debug.json
+++ b/web/i18n/hi-IN/app-debug.json
@@ -337,6 +337,8 @@
   "variableConfig.file.image.name": "छवि",
   "variableConfig.file.supportFileTypes": "फ़ाइल प्रकारों का समर्थन करें",
   "variableConfig.file.video.name": "वीडियो",
+  "variableConfig.hidden": "छुपाया और पूर्व-भरा हुआ",
+  "variableConfig.hiddenDescription": "इस फ़ील्ड को अंतिम उपयोगकर्ताओं से छुपाएं और मान स्वयं प्रदान करें। आवश्यक के साथ परस्पर अनन्य है। <docLink>अधिक जानें</docLink>",
   "variableConfig.hide": "छुपाएँ",
   "variableConfig.inputPlaceholder": "कृपया इनपुट करें",
   "variableConfig.json": "JSON कोड",
diff --git a/web/i18n/hi-IN/app-overview.json b/web/i18n/hi-IN/app-overview.json
index ff3f7b1403..fa3a0c4518 100644
--- a/web/i18n/hi-IN/app-overview.json
+++ b/web/i18n/hi-IN/app-overview.json
@@ -56,6 +56,8 @@
   "overview.appInfo.embedded.copy": "कॉपी करें",
   "overview.appInfo.embedded.entry": "एम्बेडेड",
   "overview.appInfo.embedded.explanation": "अपनी वेबसाइट पर चैट ऐप को एम्बेड करने का तरीका चुनें",
+  "overview.appInfo.embedded.hiddenInputs.description": "छुपे हुए फ़ील्ड के लिए मान दर्ज करें। मान iframe URL या स्क्रिप्ट के inputs ऑब्जेक्ट में जोड़े जाते हैं।",
+  "overview.appInfo.embedded.hiddenInputs.title": "छुपे हुए फ़ील्ड पूर्व-भरें",
   "overview.appInfo.embedded.iframe": "अपनी वेबसाइट के किसी भी हिस्से पर चैट ऐप जोड़ने के लिए, इस iframe को अपने HTML कोड में जोड़ें।",
   "overview.appInfo.embedded.scripts": "अपनी वेबसाइट के निचले दाएं कोने में चैट ऐप जोड़ने के लिए इस कोड को अपने HTML में जोड़ें।",
   "overview.appInfo.embedded.title": "वेबसाइट पर एम्बेड करें",
@@ -104,6 +106,8 @@
   "overview.appInfo.settings.workflow.subTitle": "कार्यप्रवाह विवरण",
   "overview.appInfo.settings.workflow.title": "वर्कफ़्लो स्टेप्स",
   "overview.appInfo.title": "वेब एप",
+  "overview.appInfo.workflowLaunchHiddenInputs.description": "छुपे हुए फ़ील्ड के लिए मान दर्ज करें, फिर <bold>लॉन्च</bold> पर क्लिक करके WebApp को मानों के साथ खोलें।",
+  "overview.appInfo.workflowLaunchHiddenInputs.title": "छुपे हुए फ़ील्ड पूर्व-भरें",
   "overview.disableTooltip.triggerMode": "ट्रिगर नोड मोड में {{feature}} फ़ीचर समर्थित नहीं है।",
   "overview.status.disable": "अक्षम करें",
   "overview.status.running": "सेवा में",
diff --git a/web/i18n/hi-IN/common.json b/web/i18n/hi-IN/common.json
index 736618363f..c2fff7e1a7 100644
--- a/web/i18n/hi-IN/common.json
+++ b/web/i18n/hi-IN/common.json
@@ -101,6 +101,7 @@
   "appModes.completionApp": "पाठ जनरेटर",
   "avatar.deleteDescription": "क्या आप सुनिश्चित हैं कि आप अपनी प्रोफ़ाइल तस्वीर को हटाना चाहते हैं? आपका खाता डिफ़ॉल्ट प्रारंभिक अवतार का उपयोग करेगा।",
   "avatar.deleteTitle": "अवतार हटाएँ",
+  "avatar.editAction": "अवतार संपादित करें",
   "chat.citation.characters": "वर्ण:",
   "chat.citation.hitCount": "पुनः प्राप्ति गिनती:",
   "chat.citation.hitScore": "पुनः प्राप्ति स्कोर:",
diff --git a/web/i18n/hi-IN/education.json b/web/i18n/hi-IN/education.json
index 9c8ae16dbc..3d4df9db51 100644
--- a/web/i18n/hi-IN/education.json
+++ b/web/i18n/hi-IN/education.json
@@ -1,5 +1,25 @@
 {
+  "applied.activeSubscription.description": "आपके पास एक सक्रिय सदस्यता है। आपकी सदस्यता समाप्त होने के बाद आप शिक्षा छूट का उपयोग कर सकते हैं। <stripeLink>Stripe</stripeLink> में अपनी सदस्यता की पुष्टि करें।",
+  "applied.description": "बधाई हो! आपने शिक्षा छूट के लिए सफलतापूर्वक आवेदन किया है।",
+  "applied.noPaymentPermission.description": "इस workspace में आपके पास भुगतान की अनुमति नहीं है। शिक्षा छूट का उपयोग करने के लिए कृपया ऐसे workspace पर स्विच करें जहाँ आप बिलिंग प्रबंधित कर सकते हैं।",
+  "applied.noPaymentPermission.returnHome": "Dify पर वापस जाएं",
+  "applied.step1.description": "आपने शिक्षा छूट के लिए सफलतापूर्वक आवेदन किया है।",
+  "applied.step1.title": "चरण 1",
+  "applied.step2.description": "वह workspace चुनें जिसे आप शिक्षा छूट के साथ उपयोग करना चाहते हैं।",
+  "applied.step2.title": "चरण 2",
+  "applied.tabs.activeSubscription": "सदस्यता में",
+  "applied.tabs.eligible": "खरीद सकते हैं",
+  "applied.tabs.noPaymentPermission": "भुगतान की अनुमति नहीं",
+  "applied.title": "शिक्षा छूट लागू की गई",
+  "applied.workspace.plan": "भुगतान योजना",
+  "applied.workspace.title": "वर्तमान Workspace",
   "currentSigned": "वर्तमान में साइन इन किया गया है के रूप में",
+  "educationPricingConfirm.billingPeriod.monthly": "मासिक",
+  "educationPricingConfirm.billingPeriod.yearly": "वार्षिक",
+  "educationPricingConfirm.cancel": "वर्तमान प्लान रखें",
+  "educationPricingConfirm.continue": "Professional वार्षिक पर स्विच करें",
+  "educationPricingConfirm.description": "शिक्षा छूट केवल Professional वार्षिक प्लान पर लागू होती है। अपना वर्तमान प्लान रखने पर छूट शामिल नहीं होगी।",
+  "educationPricingConfirm.title": "आपका चुना हुआ प्लान शिक्षा छूट का समर्थन नहीं करता",
   "emailLabel": "आपका वर्तमान ईमेल",
   "form.schoolName.placeholder": "अपनी स्कूल का आधिकारिक, बिना संक्षिप्त नाम दर्ज करें",
   "form.schoolName.title": "आपके स्कूल का नाम",
@@ -31,6 +51,7 @@
   "notice.stillInEducation.expired": "अब पुनः सत्यापित करें ताकि आप आगामी शैक्षणिक वर्ष के लिए एक नया कूपन प्राप्त कर सकें। हम इसे आपके खाते में जोड़ देंगे और आप इसे अगले अपग्रेड के लिए उपयोग कर सकेंगे।",
   "notice.stillInEducation.isAboutToExpire": "अब फिर से सत्यापित करें ताकि आगामी शैक्षणिक वर्ष के लिए एक नया कूपन मिल सके। यह आपके खाते में सहेजा जाएगा और आपकी अगली नवीनीकरण पर उपयोग के लिए तैयार होगा।",
   "notice.stillInEducation.title": "क्या आप अभी भी शिक्षा में हैं?",
+  "planNotSupportEducationDiscount": "शिक्षा मूल्य निर्धारण के लिए पात्र नहीं",
   "rejectContent": "दुर्भाग्यवश, आप शिक्षा सत्यापित स्थिति के लिए योग्य नहीं हैं और इसलिए यदि आप इस ईमेल पते का उपयोग करते हैं, तो आप डिफाई प्रोफेशनल योजना के लिए विशेष 100% कूपन प्राप्त नहीं कर सकते।",
   "rejectTitle": "आपकी डिफाई शैक्षणिक सत्यापन को अस्वीकृत कर दिया गया है",
   "submit": "सबमिट करें",
@@ -40,5 +61,6 @@
   "toVerified": "शिक्षा की पुष्टि कराएँ",
   "toVerifiedTip.coupon": "विशेष 100% कूपन",
   "toVerifiedTip.end": "Dify प्रोफेशनल योजना के लिए।",
-  "toVerifiedTip.front": "आप अब शिक्षा सत्यापित स्थिति के लिए योग्य हैं। कृपया नीचे अपनी शिक्षा की जानकारी प्रदान करें ताकि प्रक्रिया को पूरा किया जा सके और एक प्राप्त हो सके"
+  "toVerifiedTip.front": "आप अब शिक्षा सत्यापित स्थिति के लिए योग्य हैं। कृपया नीचे अपनी शिक्षा की जानकारी प्रदान करें ताकि प्रक्रिया को पूरा किया जा सके और एक प्राप्त हो सके",
+  "useEducationDiscount": "शिक्षा छूट का उपयोग करें"
 }
diff --git a/web/i18n/hi-IN/workflow.json b/web/i18n/hi-IN/workflow.json
index 8b5ea73535..d5824f0039 100644
--- a/web/i18n/hi-IN/workflow.json
+++ b/web/i18n/hi-IN/workflow.json
@@ -646,12 +646,12 @@
   "nodes.humanInput.userActions.actionIdFormatTip": "कार्रवाई आईडी एक अक्षर या अंडरस्कोर से शुरू होनी चाहिए, उसके बाद अक्षर, संख्याएं या अंडरस्कोर हो सकते हैं",
   "nodes.humanInput.userActions.actionIdTooLong": "कार्रवाई आईडी {{maxLength}} वर्ण या उससे कम होनी चाहिए",
   "nodes.humanInput.userActions.actionNamePlaceholder": "कार्रवाई नाम",
-  "nodes.humanInput.userActions.buttonTextPlaceholder": "बटन प्रदर्शित करने के लिए पाठ",
+  "nodes.humanInput.userActions.buttonTextPlaceholder": "क्रिया मूल्य",
   "nodes.humanInput.userActions.buttonTextTooLong": "बटन पाठ {{maxLength}} वर्ण या उससे कम होना चाहिए",
   "nodes.humanInput.userActions.chooseStyle": "बटन शैली चुनें",
   "nodes.humanInput.userActions.emptyTip": "उपयोगकर्ता कार्रवाइयां जोड़ने के लिए '+' बटन पर क्लिक करें",
   "nodes.humanInput.userActions.title": "उपयोगकर्ता कार्रवाइयां",
-  "nodes.humanInput.userActions.tooltip": "उन बटन को परिभाषित करें जिन पर उपयोगकर्ता इस फॉर्म का जवाब देने के लिए क्लिक कर सकते हैं। प्रत्येक बटन विभिन्न वर्कफ़्लो पथों को ट्रिगर कर सकता है। कार्रवाई आईडी एक अक्षर या अंडरस्कोर से शुरू होनी चाहिए, उसके बाद अक्षर, संख्याएं या अंडरस्कोर हो सकते हैं।",
+  "nodes.humanInput.userActions.tooltip": "उन बटन को परिभाषित करें जिन पर उपयोगकर्ता इस फॉर्म का जवाब देने के लिए क्लिक कर सकते हैं। कार्रवाई आईडी शाखाओं को नियंत्रित करती है। क्रिया मूल्य डाउनस्ट्रीम में चयनित बिल्ट-इन आउटपुट के रूप में उजागर होता है। कार्रवाई आईडी एक अक्षर या अंडरस्कोर से शुरू होनी चाहिए, उसके बाद अक्षर, संख्याएं या अंडरस्कोर हो सकते हैं।",
   "nodes.humanInput.userActions.triggered": "<strong>{{actionName}}</strong> ट्रिगर किया गया है",
   "nodes.ifElse.addCondition": "शर्त जोड़ें",
   "nodes.ifElse.addSubVariable": "उप चर",
@@ -897,13 +897,17 @@
   "nodes.questionClassifiers.advancedSetting": "उन्नत सेटिंग",
   "nodes.questionClassifiers.class": "क्लास",
   "nodes.questionClassifiers.classNamePlaceholder": "अपना क्लास नाम लिखें",
+  "nodes.questionClassifiers.defaultLabel": "क्लास {{index}}",
   "nodes.questionClassifiers.inputVars": "इनपुट वेरिएबल्स",
   "nodes.questionClassifiers.instruction": "निर्देश",
   "nodes.questionClassifiers.instructionPlaceholder": "अपना निर्देश लिखें",
   "nodes.questionClassifiers.instructionTip": "प्रश्न वर्गीकरणकर्ता को प्रश्नों को वर्गीकृत करने के तरीके को समझने में मदद करने के लिए अतिरिक्त निर्देश दें।",
+  "nodes.questionClassifiers.labelEditorAriaLabel": "क्लास लेबल संपादक",
   "nodes.questionClassifiers.model": "मॉडल",
+  "nodes.questionClassifiers.outputVars.classLabel": "क्लास लेबल",
   "nodes.questionClassifiers.outputVars.className": "क्लास नाम",
   "nodes.questionClassifiers.outputVars.usage": "मॉडल उपयोग जानकारी",
+  "nodes.questionClassifiers.renameHint": "नाम बदलने के लिए क्लास शीर्षक पर डबल-क्लिक करें",
   "nodes.questionClassifiers.topicName": "विषय नाम",
   "nodes.questionClassifiers.topicPlaceholder": "अपना विषय नाम लिखें",
   "nodes.start.builtInVar": "निर्मित वेरिएबल्स",
diff --git a/web/i18n/id-ID/app-debug.json b/web/i18n/id-ID/app-debug.json
index cfdd57004e..1e015ad278 100644
--- a/web/i18n/id-ID/app-debug.json
+++ b/web/i18n/id-ID/app-debug.json
@@ -337,6 +337,8 @@
   "variableConfig.file.image.name": "Citra",
   "variableConfig.file.supportFileTypes": "Jenis File Dukungan",
   "variableConfig.file.video.name": "Video",
+  "variableConfig.hidden": "Tersembunyi dan Diisi Sebelumnya",
+  "variableConfig.hiddenDescription": "Sembunyikan kolom ini dari pengguna akhir dan berikan nilainya sendiri. Saling eksklusif dengan Wajib. <docLink>Pelajari lebih lanjut</docLink>",
   "variableConfig.hide": "Menyembunyikan",
   "variableConfig.inputPlaceholder": "Silakan masukkan",
   "variableConfig.json": "Kode JSON",
diff --git a/web/i18n/id-ID/app-overview.json b/web/i18n/id-ID/app-overview.json
index c5f2fd7d24..c0ec482238 100644
--- a/web/i18n/id-ID/app-overview.json
+++ b/web/i18n/id-ID/app-overview.json
@@ -56,6 +56,8 @@
   "overview.appInfo.embedded.copy": "Menyalin",
   "overview.appInfo.embedded.entry": "Tertanam",
   "overview.appInfo.embedded.explanation": "Pilih cara menyematkan aplikasi obrolan ke situs web Anda",
+  "overview.appInfo.embedded.hiddenInputs.description": "Masukkan nilai untuk kolom tersembunyi. Nilai ditambahkan ke URL iframe atau objek inputs skrip.",
+  "overview.appInfo.embedded.hiddenInputs.title": "Isi Kolom Tersembunyi Sebelumnya",
   "overview.appInfo.embedded.iframe": "Untuk menambahkan aplikasi obrolan di mana saja di situs web Anda, tambahkan iframe ini ke kode html Anda.",
   "overview.appInfo.embedded.scripts": "Untuk menambahkan aplikasi obrolan ke kanan bawah situs web Anda, tambahkan kode ini ke html Anda.",
   "overview.appInfo.embedded.title": "Sematkan di situs web",
@@ -104,6 +106,8 @@
   "overview.appInfo.settings.workflow.subTitle": "Detail Alur Kerja",
   "overview.appInfo.settings.workflow.title": "Alur Kerja",
   "overview.appInfo.title": "Aplikasi Web",
+  "overview.appInfo.workflowLaunchHiddenInputs.description": "Masukkan nilai untuk kolom tersembunyi, lalu klik <bold>Luncurkan</bold> untuk membuka WebApp dengan nilai tersebut.",
+  "overview.appInfo.workflowLaunchHiddenInputs.title": "Isi Kolom Tersembunyi Sebelumnya",
   "overview.disableTooltip.triggerMode": "Fitur {{feature}} tidak didukung dalam mode Node Pemicu.",
   "overview.status.disable": "Nonaktif",
   "overview.status.running": "Berjalan",
diff --git a/web/i18n/id-ID/common.json b/web/i18n/id-ID/common.json
index 8bb344acb8..196b28179d 100644
--- a/web/i18n/id-ID/common.json
+++ b/web/i18n/id-ID/common.json
@@ -101,6 +101,7 @@
   "appModes.completionApp": "Pembuat Teks",
   "avatar.deleteDescription": "Apakah Anda yakin ingin menghapus gambar profil Anda? Akun Anda akan menggunakan avatar awal default.",
   "avatar.deleteTitle": "Hapus Avatar",
+  "avatar.editAction": "Edit Avatar",
   "chat.citation.characters": "Karakter:",
   "chat.citation.hitCount": "Jumlah pengambilan:",
   "chat.citation.hitScore": "Skor Pengambilan:",
diff --git a/web/i18n/id-ID/education.json b/web/i18n/id-ID/education.json
index 00e0f4099a..6d37be99dd 100644
--- a/web/i18n/id-ID/education.json
+++ b/web/i18n/id-ID/education.json
@@ -1,5 +1,25 @@
 {
+  "applied.activeSubscription.description": "Anda memiliki langganan aktif. Anda dapat menggunakan diskon pendidikan setelah langganan Anda berakhir. Konfirmasi langganan Anda di <stripeLink>Stripe</stripeLink>.",
+  "applied.description": "Selamat! Anda telah berhasil mengajukan diskon pendidikan.",
+  "applied.noPaymentPermission.description": "Anda tidak memiliki izin pembayaran di workspace ini. Silakan beralih ke workspace di mana Anda dapat mengelola penagihan untuk menggunakan diskon pendidikan.",
+  "applied.noPaymentPermission.returnHome": "Kembali ke Dify",
+  "applied.step1.description": "Anda telah berhasil mengajukan diskon pendidikan.",
+  "applied.step1.title": "Langkah 1",
+  "applied.step2.description": "Pilih workspace yang ingin Anda gunakan dengan diskon pendidikan.",
+  "applied.step2.title": "Langkah 2",
+  "applied.tabs.activeSubscription": "Dalam langganan",
+  "applied.tabs.eligible": "Dapat membeli",
+  "applied.tabs.noPaymentPermission": "Tidak ada izin pembayaran",
+  "applied.title": "Diskon pendidikan diterapkan",
+  "applied.workspace.plan": "Paket berbayar",
+  "applied.workspace.title": "Workspace saat ini",
   "currentSigned": "SAAT INI MASUK SEBAGAI",
+  "educationPricingConfirm.billingPeriod.monthly": "bulanan",
+  "educationPricingConfirm.billingPeriod.yearly": "tahunan",
+  "educationPricingConfirm.cancel": "Tetap gunakan paket saat ini",
+  "educationPricingConfirm.continue": "Beralih ke Professional Tahunan",
+  "educationPricingConfirm.description": "Diskon pendidikan hanya berlaku untuk paket Professional tahunan. Jika tetap menggunakan paket saat ini, diskon tidak akan disertakan.",
+  "educationPricingConfirm.title": "Paket yang Anda pilih tidak mendukung diskon pendidikan",
   "emailLabel": "Email Anda saat ini",
   "form.schoolName.placeholder": "Masukkan nama resmi sekolah Anda yang tidak disingkat",
   "form.schoolName.title": "Nama Sekolah Anda",
@@ -31,6 +51,7 @@
   "notice.stillInEducation.expired": "Verifikasi ulang sekarang untuk mendapatkan kupon baru untuk tahun akademik mendatang. Kami akan menambahkannya ke akun Anda dan Anda dapat menggunakannya untuk peningkatan berikutnya.",
   "notice.stillInEducation.isAboutToExpire": "Verifikasi ulang sekarang untuk mendapatkan kupon baru untuk tahun akademik mendatang. Ini akan disimpan ke akun Anda dan siap digunakan pada perpanjangan berikutnya.",
   "notice.stillInEducation.title": "Masih dalam pendidikan?",
+  "planNotSupportEducationDiscount": "Tidak memenuhi syarat untuk harga pendidikan",
   "rejectContent": "Sayangnya, Anda tidak memenuhi syarat untuk status Education Verified dan oleh karena itu tidak dapat menerima kupon 100% eksklusif untuk Paket Dify Professional jika Anda menggunakan alamat email ini.",
   "rejectTitle": "Verifikasi Pendidikan Dify Anda telah ditolak",
   "submit": "Kirim",
@@ -40,5 +61,6 @@
   "toVerified": "Dapatkan Pendidikan Terverifikasi",
   "toVerifiedTip.coupon": "kupon eksklusif 100%",
   "toVerifiedTip.end": "untuk Paket Profesional Dify.",
-  "toVerifiedTip.front": "Anda sekarang memenuhi syarat untuk status Terverifikasi Pendidikan. Silakan masukkan informasi pendidikan Anda di bawah ini untuk menyelesaikan proses dan menerima"
+  "toVerifiedTip.front": "Anda sekarang memenuhi syarat untuk status Terverifikasi Pendidikan. Silakan masukkan informasi pendidikan Anda di bawah ini untuk menyelesaikan proses dan menerima",
+  "useEducationDiscount": "Gunakan diskon pendidikan"
 }
diff --git a/web/i18n/id-ID/workflow.json b/web/i18n/id-ID/workflow.json
index 058c15334b..7e60b33609 100644
--- a/web/i18n/id-ID/workflow.json
+++ b/web/i18n/id-ID/workflow.json
@@ -646,12 +646,12 @@
   "nodes.humanInput.userActions.actionIdFormatTip": "ID tindakan harus dimulai dengan huruf atau garis bawah, diikuti dengan huruf, angka, atau garis bawah",
   "nodes.humanInput.userActions.actionIdTooLong": "ID tindakan harus {{maxLength}} karakter atau kurang",
   "nodes.humanInput.userActions.actionNamePlaceholder": "Nama Tindakan",
-  "nodes.humanInput.userActions.buttonTextPlaceholder": "Teks Tampilan Tombol",
+  "nodes.humanInput.userActions.buttonTextPlaceholder": "Nilai Tindakan",
   "nodes.humanInput.userActions.buttonTextTooLong": "Teks tombol harus {{maxLength}} karakter atau kurang",
   "nodes.humanInput.userActions.chooseStyle": "Pilih gaya tombol",
   "nodes.humanInput.userActions.emptyTip": "Klik tombol '+' untuk menambahkan tindakan pengguna",
   "nodes.humanInput.userActions.title": "Tindakan Pengguna",
-  "nodes.humanInput.userActions.tooltip": "Tentukan tombol yang dapat diklik pengguna untuk merespons formulir ini. Setiap tombol dapat memicu jalur alur kerja yang berbeda. ID tindakan harus dimulai dengan huruf atau garis bawah, diikuti dengan huruf, angka, atau garis bawah.",
+  "nodes.humanInput.userActions.tooltip": "Tentukan tombol yang dapat diklik pengguna untuk merespons formulir ini. ID tindakan mengontrol percabangan. Nilai Tindakan diekspos ke hilir sebagai output bawaan yang dipilih. ID tindakan harus dimulai dengan huruf atau garis bawah, diikuti dengan huruf, angka, atau garis bawah.",
   "nodes.humanInput.userActions.triggered": "<strong>{{actionName}}</strong> telah dipicu",
   "nodes.ifElse.addCondition": "Tambahkan Kondisi",
   "nodes.ifElse.addSubVariable": "Sub Variabel",
@@ -897,13 +897,17 @@
   "nodes.questionClassifiers.advancedSetting": "Pengaturan Lanjutan",
   "nodes.questionClassifiers.class": "Kelas",
   "nodes.questionClassifiers.classNamePlaceholder": "Tulis nama kelas Anda",
+  "nodes.questionClassifiers.defaultLabel": "KELAS {{index}}",
   "nodes.questionClassifiers.inputVars": "Variabel Masukan",
   "nodes.questionClassifiers.instruction": "Ajaran",
   "nodes.questionClassifiers.instructionPlaceholder": "Tulis instruksi Anda",
   "nodes.questionClassifiers.instructionTip": "Masukkan instruksi tambahan untuk membantu pengklasifikasi pertanyaan lebih memahami cara mengkategorikan pertanyaan.",
+  "nodes.questionClassifiers.labelEditorAriaLabel": "Editor label kelas",
   "nodes.questionClassifiers.model": "pola",
+  "nodes.questionClassifiers.outputVars.classLabel": "Label Kelas",
   "nodes.questionClassifiers.outputVars.className": "Nama Kelas",
   "nodes.questionClassifiers.outputVars.usage": "Informasi Penggunaan Model",
+  "nodes.questionClassifiers.renameHint": "Klik dua kali judul kelas untuk mengganti nama",
   "nodes.questionClassifiers.topicName": "Nama Topik",
   "nodes.questionClassifiers.topicPlaceholder": "Tulis nama topik Anda",
   "nodes.start.builtInVar": "Variabel bawaan",
diff --git a/web/i18n/it-IT/app-debug.json b/web/i18n/it-IT/app-debug.json
index 379532973d..c111977eda 100644
--- a/web/i18n/it-IT/app-debug.json
+++ b/web/i18n/it-IT/app-debug.json
@@ -337,6 +337,8 @@
   "variableConfig.file.image.name": "Immagine",
   "variableConfig.file.supportFileTypes": "Tipi di file di supporto",
   "variableConfig.file.video.name": "Video",
+  "variableConfig.hidden": "Nascosto e precompilato",
+  "variableConfig.hiddenDescription": "Nascondi questo campo agli utenti finali e fornisci il valore tu stesso. Incompatibile con Obbligatorio. <docLink>Per saperne di più</docLink>",
   "variableConfig.hide": "Nascondi",
   "variableConfig.inputPlaceholder": "Per favore inserisci",
   "variableConfig.json": "Codice JSON",
diff --git a/web/i18n/it-IT/app-overview.json b/web/i18n/it-IT/app-overview.json
index 9406d89682..dc44a5d18e 100644
--- a/web/i18n/it-IT/app-overview.json
+++ b/web/i18n/it-IT/app-overview.json
@@ -56,6 +56,8 @@
   "overview.appInfo.embedded.copy": "Copia",
   "overview.appInfo.embedded.entry": "Incorporato",
   "overview.appInfo.embedded.explanation": "Scegli come incorporare l'app chat nel tuo sito web",
+  "overview.appInfo.embedded.hiddenInputs.description": "Inserisci i valori per i campi nascosti. I valori vengono aggiunti all'URL dell'iframe o all'oggetto inputs dello script.",
+  "overview.appInfo.embedded.hiddenInputs.title": "Precompila i campi nascosti",
   "overview.appInfo.embedded.iframe": "Per aggiungere l'app chat ovunque sul tuo sito web, aggiungi questo iframe al tuo codice HTML.",
   "overview.appInfo.embedded.scripts": "Per aggiungere un'app chat in basso a destra del tuo sito web, aggiungi questo codice al tuo HTML.",
   "overview.appInfo.embedded.title": "Incorpora sul sito web",
@@ -104,6 +106,8 @@
   "overview.appInfo.settings.workflow.subTitle": "Dettagli del flusso di lavoro",
   "overview.appInfo.settings.workflow.title": "Fasi del Workflow",
   "overview.appInfo.title": "App Web",
+  "overview.appInfo.workflowLaunchHiddenInputs.description": "Inserisci i valori per i campi nascosti, quindi fai clic su <bold>Avvia</bold> per aprire la WebApp con i valori.",
+  "overview.appInfo.workflowLaunchHiddenInputs.title": "Precompila i campi nascosti",
   "overview.disableTooltip.triggerMode": "La funzionalità {{feature}} non è supportata in modalità Nodo Trigger.",
   "overview.status.disable": "Disabilita",
   "overview.status.running": "In servizio",
diff --git a/web/i18n/it-IT/common.json b/web/i18n/it-IT/common.json
index 803586e584..4225bcbf62 100644
--- a/web/i18n/it-IT/common.json
+++ b/web/i18n/it-IT/common.json
@@ -101,6 +101,7 @@
   "appModes.completionApp": "Generatore di Testi",
   "avatar.deleteDescription": "Sei sicuro di voler rimuovere la tua immagine del profilo? Il tuo account utilizzerà l'avatar iniziale predefinito.",
   "avatar.deleteTitle": "Rimuovi avatar",
+  "avatar.editAction": "Modifica avatar",
   "chat.citation.characters": "Caratteri:",
   "chat.citation.hitCount": "Conteggio dei recuperi:",
   "chat.citation.hitScore": "Punteggio di recupero:",
diff --git a/web/i18n/it-IT/education.json b/web/i18n/it-IT/education.json
index c75768e54a..313c9b404b 100644
--- a/web/i18n/it-IT/education.json
+++ b/web/i18n/it-IT/education.json
@@ -1,5 +1,25 @@
 {
+  "applied.activeSubscription.description": "Hai un abbonamento attivo. Puoi utilizzare lo sconto educativo dopo la scadenza dell'abbonamento. Conferma il tuo abbonamento su <stripeLink>Stripe</stripeLink>.",
+  "applied.description": "Congratulazioni! Hai fatto domanda per lo sconto educativo con successo.",
+  "applied.noPaymentPermission.description": "Non hai il permesso di pagamento in questo workspace. Passa a un workspace in cui puoi gestire la fatturazione per utilizzare lo sconto educativo.",
+  "applied.noPaymentPermission.returnHome": "Torna a Dify",
+  "applied.step1.description": "Hai fatto domanda per lo sconto educativo con successo.",
+  "applied.step1.title": "Passo 1",
+  "applied.step2.description": "Seleziona il workspace che vuoi utilizzare con lo sconto educativo.",
+  "applied.step2.title": "Passo 2",
+  "applied.tabs.activeSubscription": "In abbonamento",
+  "applied.tabs.eligible": "Può acquistare",
+  "applied.tabs.noPaymentPermission": "Nessun permesso di pagamento",
+  "applied.title": "Sconto educativo applicato",
+  "applied.workspace.plan": "Piano a pagamento",
+  "applied.workspace.title": "Workspace corrente",
   "currentSigned": "ATTUALMENTE ACCEDUTO COME",
+  "educationPricingConfirm.billingPeriod.monthly": "mensile",
+  "educationPricingConfirm.billingPeriod.yearly": "annuale",
+  "educationPricingConfirm.cancel": "Mantieni il piano attuale",
+  "educationPricingConfirm.continue": "Passa a Professional annuale",
+  "educationPricingConfirm.description": "Lo sconto Education si applica solo al piano Professional annuale. Mantenendo il piano attuale, lo sconto non verrà incluso.",
+  "educationPricingConfirm.title": "Il piano selezionato non supporta lo sconto Education",
   "emailLabel": "La tua email attuale",
   "form.schoolName.placeholder": "Inserisci il nome ufficiale e completo della tua scuola",
   "form.schoolName.title": "Il Nome della tua Scuola",
@@ -31,6 +51,7 @@
   "notice.stillInEducation.expired": "Verifica di nuovo ora per ottenere un nuovo coupon per il prossimo anno accademico. Lo aggiungeremo al tuo account e potrai usarlo per il prossimo aggiornamento.",
   "notice.stillInEducation.isAboutToExpire": "Verifica di nuovo ora per ottenere un nuovo coupon per il prossimo anno accademico. Sarà salvato nel tuo account e pronto per essere utilizzato al tuo prossimo rinnovo.",
   "notice.stillInEducation.title": "Ancora in formazione?",
+  "planNotSupportEducationDiscount": "Non idoneo per i prezzi educativi",
   "rejectContent": "Sfortunatamente, non sei idoneo per lo status di Educazione Verificata e quindi non puoi ricevere il coupon esclusivo del 100% per il Piano Professionale Dify se usi questo indirizzo email.",
   "rejectTitle": "La tua verifica educativa Dify è stata rifiutata.",
   "submit": "Invia",
@@ -40,5 +61,6 @@
   "toVerified": "Fai verificare la tua istruzione",
   "toVerifiedTip.coupon": "coupon esclusivo al 100%",
   "toVerifiedTip.end": "per il Piano Professionale Dify.",
-  "toVerifiedTip.front": "Ora sei idoneo per lo stato di Educazione Verificata. Per favore, inserisci le tue informazioni educative qui sotto per completare il processo e ricevere un"
+  "toVerifiedTip.front": "Ora sei idoneo per lo stato di Educazione Verificata. Per favore, inserisci le tue informazioni educative qui sotto per completare il processo e ricevere un",
+  "useEducationDiscount": "Utilizza lo sconto educativo"
 }
diff --git a/web/i18n/it-IT/workflow.json b/web/i18n/it-IT/workflow.json
index fbd3041fb9..e8967d8b09 100644
--- a/web/i18n/it-IT/workflow.json
+++ b/web/i18n/it-IT/workflow.json
@@ -646,12 +646,12 @@
   "nodes.humanInput.userActions.actionIdFormatTip": "L'ID azione deve iniziare con una lettera o underscore, seguito da lettere, numeri o underscore",
   "nodes.humanInput.userActions.actionIdTooLong": "L'ID azione deve essere di {{maxLength}} caratteri o meno",
   "nodes.humanInput.userActions.actionNamePlaceholder": "Nome Azione",
-  "nodes.humanInput.userActions.buttonTextPlaceholder": "Testo del Pulsante da Visualizzare",
+  "nodes.humanInput.userActions.buttonTextPlaceholder": "Valore dell'azione",
   "nodes.humanInput.userActions.buttonTextTooLong": "Il testo del pulsante deve essere di {{maxLength}} caratteri o meno",
   "nodes.humanInput.userActions.chooseStyle": "Scegli uno stile del pulsante",
   "nodes.humanInput.userActions.emptyTip": "Clicca il pulsante '+' per aggiungere azioni utente",
   "nodes.humanInput.userActions.title": "Azioni Utente",
-  "nodes.humanInput.userActions.tooltip": "Definisci i pulsanti su cui gli utenti possono cliccare per rispondere a questo modulo. Ogni pulsante può attivare percorsi di workflow diversi. L'ID azione deve iniziare con una lettera o underscore, seguito da lettere, numeri o underscore.",
+  "nodes.humanInput.userActions.tooltip": "Definisci i pulsanti su cui gli utenti possono cliccare per rispondere a questo modulo. L'ID azione controlla la ramificazione. Il Valore dell'azione viene esposto a valle come output integrato selezionato. L'ID azione deve iniziare con una lettera o underscore, seguito da lettere, numeri o underscore.",
   "nodes.humanInput.userActions.triggered": "<strong>{{actionName}}</strong> è stato attivato",
   "nodes.ifElse.addCondition": "Aggiungi Condizione",
   "nodes.ifElse.addSubVariable": "Variabile secondaria",
@@ -897,13 +897,17 @@
   "nodes.questionClassifiers.advancedSetting": "Impostazione Avanzata",
   "nodes.questionClassifiers.class": "Classe",
   "nodes.questionClassifiers.classNamePlaceholder": "Scrivi il nome della tua classe",
+  "nodes.questionClassifiers.defaultLabel": "CLASSE {{index}}",
   "nodes.questionClassifiers.inputVars": "Variabili di Input",
   "nodes.questionClassifiers.instruction": "Istruzione",
   "nodes.questionClassifiers.instructionPlaceholder": "Scrivi la tua istruzione",
   "nodes.questionClassifiers.instructionTip": "Inserisci istruzioni aggiuntive per aiutare il classificatore di domande a capire meglio come categorizzare le domande.",
+  "nodes.questionClassifiers.labelEditorAriaLabel": "Editor etichetta classe",
   "nodes.questionClassifiers.model": "modello",
+  "nodes.questionClassifiers.outputVars.classLabel": "Etichetta classe",
   "nodes.questionClassifiers.outputVars.className": "Nome Classe",
   "nodes.questionClassifiers.outputVars.usage": "Informazioni sull'utilizzo del modello",
+  "nodes.questionClassifiers.renameHint": "Fai doppio clic sul titolo della classe per rinominare",
   "nodes.questionClassifiers.topicName": "Nome Argomento",
   "nodes.questionClassifiers.topicPlaceholder": "Scrivi il nome del tuo argomento",
   "nodes.start.builtInVar": "Variabili Integrate",
diff --git a/web/i18n/ja-JP/app-debug.json b/web/i18n/ja-JP/app-debug.json
index 8a37ccee9d..f4c58ea5a4 100644
--- a/web/i18n/ja-JP/app-debug.json
+++ b/web/i18n/ja-JP/app-debug.json
@@ -337,6 +337,8 @@
   "variableConfig.file.image.name": "画像",
   "variableConfig.file.supportFileTypes": "サポートされたファイルタイプ",
   "variableConfig.file.video.name": "映像",
+  "variableConfig.hidden": "非表示・事前入力",
+  "variableConfig.hiddenDescription": "エンドユーザーには非表示にし、値はご自身で入力します。必須 とは併用できません。<docLink>詳細はこちら</docLink>",
   "variableConfig.hide": "非表示",
   "variableConfig.inputPlaceholder": "入力してください",
   "variableConfig.json": "JSONコード",
diff --git a/web/i18n/ja-JP/app-overview.json b/web/i18n/ja-JP/app-overview.json
index 107d805dda..e7c59e926a 100644
--- a/web/i18n/ja-JP/app-overview.json
+++ b/web/i18n/ja-JP/app-overview.json
@@ -56,6 +56,8 @@
   "overview.appInfo.embedded.copy": "コピー",
   "overview.appInfo.embedded.entry": "埋め込み",
   "overview.appInfo.embedded.explanation": "チャットアプリをウェブサイトに埋め込む方法を選択します。",
+  "overview.appInfo.embedded.hiddenInputs.description": "非表示フィールドに値を入力します。これらの値は iframe の URL または埋め込みスクリプトの inputs オブジェクトに追加されます。",
+  "overview.appInfo.embedded.hiddenInputs.title": "非表示フィールドを事前入力",
   "overview.appInfo.embedded.iframe": "ウェブサイトの任意の場所にチャットアプリを追加するには、この iframe を HTML コードに追加してください。",
   "overview.appInfo.embedded.scripts": "ウェブサイトの右下にチャットアプリを追加するには、このコードを HTML に追加してください。",
   "overview.appInfo.embedded.title": "ウェブサイトに埋め込む",
@@ -104,6 +106,8 @@
   "overview.appInfo.settings.workflow.subTitle": "ワークフローの詳細",
   "overview.appInfo.settings.workflow.title": "ワークフローステップ",
   "overview.appInfo.title": "Web App",
+  "overview.appInfo.workflowLaunchHiddenInputs.description": "非表示フィールドに値を入力後、<bold>公開</bold>をクリックすると、事前入力された値が適用された WebApp が開きます。",
+  "overview.appInfo.workflowLaunchHiddenInputs.title": "非表示フィールドを事前入力",
   "overview.disableTooltip.triggerMode": "トリガーノードモードでは{{feature}}機能を使用できません。",
   "overview.status.disable": "無効",
   "overview.status.running": "稼働中",
diff --git a/web/i18n/ja-JP/common.json b/web/i18n/ja-JP/common.json
index 700e9aa11b..4b15b263ed 100644
--- a/web/i18n/ja-JP/common.json
+++ b/web/i18n/ja-JP/common.json
@@ -101,6 +101,7 @@
   "appModes.completionApp": "テキスト生成",
   "avatar.deleteDescription": "本当にプロフィール写真を削除してもよろしいですか？あなたのアカウントはデフォルトの初期アバターを使用します。",
   "avatar.deleteTitle": "アバターを削除する",
+  "avatar.editAction": "アバターを編集する",
   "chat.citation.characters": "文字数：",
   "chat.citation.hitCount": "検索回数：",
   "chat.citation.hitScore": "検索スコア：",
diff --git a/web/i18n/ja-JP/education.json b/web/i18n/ja-JP/education.json
index 3a68b5ffc6..9473f203cd 100644
--- a/web/i18n/ja-JP/education.json
+++ b/web/i18n/ja-JP/education.json
@@ -1,5 +1,25 @@
 {
+  "applied.activeSubscription.description": "現在有効なサブスクリプションがあります。サブスクリプションの有効期限が切れた後、教育割引を使用できます。<stripeLink>Stripe</stripeLink> でサブスクリプションを確認してください。",
+  "applied.description": "おめでとうございます！教育割引の申請が成功しました。",
+  "applied.noPaymentPermission.description": "このワークスペースでは支払い権限がありません。教育割引を使用するには、請求を管理できるワークスペースに切り替えてください。",
+  "applied.noPaymentPermission.returnHome": "Dify に戻る",
+  "applied.step1.description": "教育割引の申請が成功しました。",
+  "applied.step1.title": "ステップ 1",
+  "applied.step2.description": "教育割引を使用するワークスペースを選択してください。",
+  "applied.step2.title": "ステップ 2",
+  "applied.tabs.activeSubscription": "サブスクリプション中",
+  "applied.tabs.eligible": "購入可能",
+  "applied.tabs.noPaymentPermission": "支払い権限なし",
+  "applied.title": "教育割引が適用されました",
+  "applied.workspace.plan": "有料プラン",
+  "applied.workspace.title": "現在のワークスペース",
   "currentSigned": "現在ログイン中のアカウントは",
+  "educationPricingConfirm.billingPeriod.monthly": "月次",
+  "educationPricingConfirm.billingPeriod.yearly": "年次",
+  "educationPricingConfirm.cancel": "現在のプランを維持",
+  "educationPricingConfirm.continue": "Professional 年間プランに切り替える",
+  "educationPricingConfirm.description": "教育割引は Professional 年間プランにのみ適用されます。現在のプランを維持すると、割引は適用されません。",
+  "educationPricingConfirm.title": "選択したプランは教育割引に対応していません",
   "emailLabel": "現在のメールアドレス",
   "form.schoolName.placeholder": "学校の正式名称（省略不可）を入力してください。",
   "form.schoolName.title": "学校名",
@@ -31,6 +51,7 @@
   "notice.stillInEducation.expired": "今すぐ再認証して、次の学年度向けの教育クーポンを取得してください。クーポンはあなたのアカウントに追加され、次回のアップグレード時にご利用いただけます。",
   "notice.stillInEducation.isAboutToExpire": "今すぐ再認証して、次の学年度向けの教育クーポンを取得してください。クーポンは個人のアカウントに保存され、次回の更新時に使用できます。",
   "notice.stillInEducation.title": "まだ在学中ですか？",
+  "planNotSupportEducationDiscount": "教育価格の対象外",
   "rejectContent": "申し訳ございませんが、このメールアドレスでは 教育認証 の資格を取得できず、Dify プロフェッショナルプランの 100％割引クーポン を受け取ることはできません。",
   "rejectTitle": "Dify 教育認証が拒否されました",
   "submit": "送信",
@@ -40,5 +61,6 @@
   "toVerified": "教育認証を取得",
   "toVerifiedTip.coupon": "100％割引クーポン",
   "toVerifiedTip.end": "を受け取ることができます。",
-  "toVerifiedTip.front": "現在、教育認証ステータスを取得する資格があります。以下に教育情報を入力し、認証プロセスを完了すると、Dify プロフェッショナルプランの"
+  "toVerifiedTip.front": "現在、教育認証ステータスを取得する資格があります。以下に教育情報を入力し、認証プロセスを完了すると、Dify プロフェッショナルプランの",
+  "useEducationDiscount": "教育割引を使用"
 }
diff --git a/web/i18n/ja-JP/workflow.json b/web/i18n/ja-JP/workflow.json
index 1154a5baba..c7db4c465a 100644
--- a/web/i18n/ja-JP/workflow.json
+++ b/web/i18n/ja-JP/workflow.json
@@ -646,12 +646,12 @@
   "nodes.humanInput.userActions.actionIdFormatTip": "アクションIDは文字またはアンダースコアで始まり、その後に文字、数字、またはアンダースコアが続く必要があります",
   "nodes.humanInput.userActions.actionIdTooLong": "アクションIDは{{maxLength}}文字以下である必要があります",
   "nodes.humanInput.userActions.actionNamePlaceholder": "アクション名",
-  "nodes.humanInput.userActions.buttonTextPlaceholder": "ボタン表示テキスト",
+  "nodes.humanInput.userActions.buttonTextPlaceholder": "アクション値",
   "nodes.humanInput.userActions.buttonTextTooLong": "ボタンテキストは{{maxLength}}文字以下である必要があります",
   "nodes.humanInput.userActions.chooseStyle": "ボタンスタイルを選択",
   "nodes.humanInput.userActions.emptyTip": "'+'ボタンをクリックしてユーザーアクションを追加",
   "nodes.humanInput.userActions.title": "ユーザーアクション",
-  "nodes.humanInput.userActions.tooltip": "ユーザーがこのフォームに応答するためにクリックできるボタンを定義します。各ボタンは異なるワークフローパスをトリガーできます。アクションIDは文字またはアンダースコアで始まり、その後に文字、数字、またはアンダースコアが続く必要があります。",
+  "nodes.humanInput.userActions.tooltip": "ユーザーがこのフォームに応答するためにクリックできるボタンを定義します。アクションIDは分岐を制御します。アクション値は選択された組み込み出力として下流に公開されます。アクションIDは文字またはアンダースコアで始まり、その後に文字、数字、またはアンダースコアが続く必要があります。",
   "nodes.humanInput.userActions.triggered": "<strong>{{actionName}}</strong>がトリガーされました",
   "nodes.ifElse.addCondition": "条件を追加",
   "nodes.ifElse.addSubVariable": "サブ変数",
@@ -897,13 +897,17 @@
   "nodes.questionClassifiers.advancedSetting": "高度な設定",
   "nodes.questionClassifiers.class": "クラス",
   "nodes.questionClassifiers.classNamePlaceholder": "クラス名を入力してください",
+  "nodes.questionClassifiers.defaultLabel": "クラス {{index}}",
   "nodes.questionClassifiers.inputVars": "入力変数",
   "nodes.questionClassifiers.instruction": "指示",
   "nodes.questionClassifiers.instructionPlaceholder": "指示を入力してください",
   "nodes.questionClassifiers.instructionTip": "質問分類器が質問をどのように分類するかをよりよく理解するための追加の指示を入力します。",
+  "nodes.questionClassifiers.labelEditorAriaLabel": "クラスラベルエディター",
   "nodes.questionClassifiers.model": "モデル",
+  "nodes.questionClassifiers.outputVars.classLabel": "クラスラベル",
   "nodes.questionClassifiers.outputVars.className": "クラス名",
   "nodes.questionClassifiers.outputVars.usage": "モデル使用量",
+  "nodes.questionClassifiers.renameHint": "クラスタイトルをダブルクリックして名前を変更",
   "nodes.questionClassifiers.topicName": "トピック名",
   "nodes.questionClassifiers.topicPlaceholder": "トピック名を入力してください",
   "nodes.start.builtInVar": "組み込み変数",
diff --git a/web/i18n/ko-KR/app-debug.json b/web/i18n/ko-KR/app-debug.json
index 0b414189dc..620c16f243 100644
--- a/web/i18n/ko-KR/app-debug.json
+++ b/web/i18n/ko-KR/app-debug.json
@@ -337,6 +337,8 @@
   "variableConfig.file.image.name": "이미지",
   "variableConfig.file.supportFileTypes": "지원 파일 형식",
   "variableConfig.file.video.name": "비디오",
+  "variableConfig.hidden": "숨김 및 미리 채우기",
+  "variableConfig.hiddenDescription": "이 필드를 최종 사용자에게 숨기고 값을 직접 입력하세요. 필수 항목과 함께 사용할 수 없습니다. <docLink>자세히 알아보기</docLink>",
   "variableConfig.hide": "숨기기",
   "variableConfig.inputPlaceholder": "입력하세요",
   "variableConfig.json": "JSON 코드",
diff --git a/web/i18n/ko-KR/app-overview.json b/web/i18n/ko-KR/app-overview.json
index d3de2e8db9..0dcb194088 100644
--- a/web/i18n/ko-KR/app-overview.json
+++ b/web/i18n/ko-KR/app-overview.json
@@ -56,6 +56,8 @@
   "overview.appInfo.embedded.copy": "복사",
   "overview.appInfo.embedded.entry": "임베드",
   "overview.appInfo.embedded.explanation": "챗봇 앱을 웹사이트에 임베드하는 방법을 선택하세요.",
+  "overview.appInfo.embedded.hiddenInputs.description": "숨김 필드에 값을 입력하세요. 값은 iframe URL 또는 스크립트의 inputs 객체에 추가됩니다.",
+  "overview.appInfo.embedded.hiddenInputs.title": "숨김 필드 미리 채우기",
   "overview.appInfo.embedded.iframe": "웹사이트의 원하는 위치에 챗봇 앱을 추가하려면 이 iframe 을 HTML 코드에 추가하세요.",
   "overview.appInfo.embedded.scripts": "웹사이트의 우측 하단에 챗봇 앱을 추가하려면 이 코드를 HTML 에 추가하세요.",
   "overview.appInfo.embedded.title": "웹사이트에 임베드하기",
@@ -104,6 +106,8 @@
   "overview.appInfo.settings.workflow.subTitle": "워크플로우 세부 정보",
   "overview.appInfo.settings.workflow.title": "워크플로 단계",
   "overview.appInfo.title": "웹 앱",
+  "overview.appInfo.workflowLaunchHiddenInputs.description": "숨김 필드에 값을 입력한 후 <bold>실행</bold>을 클릭하여 해당 값이 적용된 WebApp을 엽니다.",
+  "overview.appInfo.workflowLaunchHiddenInputs.title": "숨김 필드 미리 채우기",
   "overview.disableTooltip.triggerMode": "트리거 노드 모드에서는 {{feature}} 기능이 지원되지 않습니다.",
   "overview.status.disable": "비활성",
   "overview.status.running": "서비스 중",
diff --git a/web/i18n/ko-KR/common.json b/web/i18n/ko-KR/common.json
index 280b7fcfce..a5a0dfbf36 100644
--- a/web/i18n/ko-KR/common.json
+++ b/web/i18n/ko-KR/common.json
@@ -101,6 +101,7 @@
   "appModes.completionApp": "텍스트 생성",
   "avatar.deleteDescription": "프로필 사진을 제거하시겠습니까? 귀하의 계정은 기본 초기 아바타를 사용하게 됩니다.",
   "avatar.deleteTitle": "아바타 제거하기",
+  "avatar.editAction": "아바타 편집하기",
   "chat.citation.characters": "문자수:",
   "chat.citation.hitCount": "검색 횟수:",
   "chat.citation.hitScore": "검색 점수:",
diff --git a/web/i18n/ko-KR/education.json b/web/i18n/ko-KR/education.json
index 5b9e009b23..1370265ae4 100644
--- a/web/i18n/ko-KR/education.json
+++ b/web/i18n/ko-KR/education.json
@@ -1,5 +1,25 @@
 {
+  "applied.activeSubscription.description": "현재 활성 구독이 있습니다. 구독이 만료된 후 교육 할인을 사용할 수 있습니다. <stripeLink>Stripe</stripeLink>에서 구독을 확인하세요.",
+  "applied.description": "축하합니다! 교육 할인 신청이 성공적으로 완료되었습니다.",
+  "applied.noPaymentPermission.description": "이 워크스페이스에서 결제 권한이 없습니다. 교육 할인을 사용하려면 청구를 관리할 수 있는 워크스페이스로 전환하세요.",
+  "applied.noPaymentPermission.returnHome": "Dify로 돌아가기",
+  "applied.step1.description": "교육 할인 신청이 성공적으로 완료되었습니다.",
+  "applied.step1.title": "1단계",
+  "applied.step2.description": "교육 할인을 사용할 워크스페이스를 선택하세요.",
+  "applied.step2.title": "2단계",
+  "applied.tabs.activeSubscription": "구독 중",
+  "applied.tabs.eligible": "구매 가능",
+  "applied.tabs.noPaymentPermission": "결제 권한 없음",
+  "applied.title": "교육 할인 적용됨",
+  "applied.workspace.plan": "유료 플랜",
+  "applied.workspace.title": "현재 워크스페이스",
   "currentSigned": "현재 로그인 중입니다",
+  "educationPricingConfirm.billingPeriod.monthly": "월간",
+  "educationPricingConfirm.billingPeriod.yearly": "연간",
+  "educationPricingConfirm.cancel": "현재 플랜 유지",
+  "educationPricingConfirm.continue": "Professional 연간으로 전환",
+  "educationPricingConfirm.description": "교육 할인은 Professional 연간 플랜에만 적용됩니다. 현재 플랜을 유지하면 할인이 포함되지 않습니다.",
+  "educationPricingConfirm.title": "선택한 플랜은 교육 할인을 지원하지 않습니다",
   "emailLabel": "현재 이메일",
   "form.schoolName.placeholder": "귀하의 학교의 공식 약어가 아닌 전체 이름을 입력하세요.",
   "form.schoolName.title": "당신의 학교 이름",
@@ -31,6 +51,7 @@
   "notice.stillInEducation.expired": "지금 다시 확인하여 다가오는 학년도에 사용할 새 쿠폰을 받아보세요. 우리는 그것을 귀하의 계정에 추가하며, 다음 업그레이드에 사용할 수 있습니다.",
   "notice.stillInEducation.isAboutToExpire": "새로운 학년을 위한 쿠폰을 받으시려면 지금 다시 인증하십시오. 쿠폰은 귀하의 계정에 저장되어 다음 갱신 시 사용할 수 있습니다.",
   "notice.stillInEducation.title": "아직 학업 중이신가요?",
+  "planNotSupportEducationDiscount": "교육 가격 대상 아님",
   "rejectContent": "안타깝게도, 귀하는 교육 인증 상태에 적합하지 않으므로 이 이메일 주소를 사용할 경우 Dify Professional Plan 의 독점 100% 쿠폰을 받을 수 없습니다.",
   "rejectTitle": "귀하의 Dify 교육 인증이 거부되었습니다.",
   "submit": "제출",
@@ -40,5 +61,6 @@
   "toVerified": "교육 인증 받기",
   "toVerifiedTip.coupon": "독점 100% 쿠폰",
   "toVerifiedTip.end": "Dify 프로페셔널 플랜을 위해.",
-  "toVerifiedTip.front": "당신은 이제 교육 인증 상태를 받을 자격이 있습니다. 아래에 귀하의 교육 정보를 입력하여 과정을 완료하고 인증을 받으십시오."
+  "toVerifiedTip.front": "당신은 이제 교육 인증 상태를 받을 자격이 있습니다. 아래에 귀하의 교육 정보를 입력하여 과정을 완료하고 인증을 받으십시오.",
+  "useEducationDiscount": "교육 할인 사용"
 }
diff --git a/web/i18n/ko-KR/workflow.json b/web/i18n/ko-KR/workflow.json
index a80c34b294..7eb315f1d4 100644
--- a/web/i18n/ko-KR/workflow.json
+++ b/web/i18n/ko-KR/workflow.json
@@ -646,12 +646,12 @@
   "nodes.humanInput.userActions.actionIdFormatTip": "작업 ID는 문자 또는 밑줄로 시작하고 그 뒤에 문자, 숫자 또는 밑줄이 와야 합니다",
   "nodes.humanInput.userActions.actionIdTooLong": "작업 ID는 {{maxLength}}자 이하여야 합니다",
   "nodes.humanInput.userActions.actionNamePlaceholder": "작업 이름",
-  "nodes.humanInput.userActions.buttonTextPlaceholder": "버튼 표시 텍스트",
+  "nodes.humanInput.userActions.buttonTextPlaceholder": "액션 값",
   "nodes.humanInput.userActions.buttonTextTooLong": "버튼 텍스트는 {{maxLength}}자 이하여야 합니다",
   "nodes.humanInput.userActions.chooseStyle": "버튼 스타일 선택",
   "nodes.humanInput.userActions.emptyTip": "'+' 버튼을 클릭하여 사용자 작업 추가",
   "nodes.humanInput.userActions.title": "사용자 작업",
-  "nodes.humanInput.userActions.tooltip": "사용자가 이 양식에 응답하기 위해 클릭할 수 있는 버튼을 정의합니다. 각 버튼은 다른 워크플로 경로를 트리거할 수 있습니다. 작업 ID는 문자 또는 밑줄로 시작하고 그 뒤에 문자, 숫자 또는 밑줄이 와야 합니다.",
+  "nodes.humanInput.userActions.tooltip": "사용자가 이 양식에 응답하기 위해 클릭할 수 있는 버튼을 정의합니다. 작업 ID는 분기를 제어합니다. 액션 값은 선택된 내장 출력으로 다운스트림에 노출됩니다. 작업 ID는 문자 또는 밑줄로 시작하고 그 뒤에 문자, 숫자 또는 밑줄이 와야 합니다.",
   "nodes.humanInput.userActions.triggered": "<strong>{{actionName}}</strong>이(가) 트리거되었습니다",
   "nodes.ifElse.addCondition": "조건 추가",
   "nodes.ifElse.addSubVariable": "하위 변수",
@@ -897,13 +897,17 @@
   "nodes.questionClassifiers.advancedSetting": "고급 설정",
   "nodes.questionClassifiers.class": "클래스",
   "nodes.questionClassifiers.classNamePlaceholder": "클래스 이름을 작성하세요",
+  "nodes.questionClassifiers.defaultLabel": "클래스 {{index}}",
   "nodes.questionClassifiers.inputVars": "입력 변수",
   "nodes.questionClassifiers.instruction": "지시",
   "nodes.questionClassifiers.instructionPlaceholder": "지시를 작성하세요",
   "nodes.questionClassifiers.instructionTip": "질문 분류기가 질문을 더 잘 분류할 수 있도록 추가 지시를 입력하세요.",
+  "nodes.questionClassifiers.labelEditorAriaLabel": "클래스 레이블 편집기",
   "nodes.questionClassifiers.model": "모델",
+  "nodes.questionClassifiers.outputVars.classLabel": "클래스 레이블",
   "nodes.questionClassifiers.outputVars.className": "클래스 이름",
   "nodes.questionClassifiers.outputVars.usage": "모델 사용 정보",
+  "nodes.questionClassifiers.renameHint": "클래스 제목을 더블 클릭하여 이름 변경",
   "nodes.questionClassifiers.topicName": "주제 이름",
   "nodes.questionClassifiers.topicPlaceholder": "주제 이름을 작성하세요",
   "nodes.start.builtInVar": "내장 변수",
diff --git a/web/i18n/nl-NL/app-debug.json b/web/i18n/nl-NL/app-debug.json
index 9562ece024..b6af12c3a1 100644
--- a/web/i18n/nl-NL/app-debug.json
+++ b/web/i18n/nl-NL/app-debug.json
@@ -337,6 +337,8 @@
   "variableConfig.file.image.name": "Image",
   "variableConfig.file.supportFileTypes": "Support File Types",
   "variableConfig.file.video.name": "Video",
+  "variableConfig.hidden": "Verborgen en vooraf ingevuld",
+  "variableConfig.hiddenDescription": "Verberg dit veld voor eindgebruikers en geef de waarde zelf op. Wederzijds exclusief met Verplicht. <docLink>Meer informatie</docLink>",
   "variableConfig.hide": "Hide",
   "variableConfig.inputPlaceholder": "Please input",
   "variableConfig.json": "JSON Code",
diff --git a/web/i18n/nl-NL/app-overview.json b/web/i18n/nl-NL/app-overview.json
index 81256a769c..400f92bdb3 100644
--- a/web/i18n/nl-NL/app-overview.json
+++ b/web/i18n/nl-NL/app-overview.json
@@ -56,6 +56,8 @@
   "overview.appInfo.embedded.copy": "Copy",
   "overview.appInfo.embedded.entry": "Embedded",
   "overview.appInfo.embedded.explanation": "Choose the way to embed chat app to your website",
+  "overview.appInfo.embedded.hiddenInputs.description": "Voer waarden in voor de verborgen velden. De waarden worden toegevoegd aan de iframe-URL of het inputs-object van het script.",
+  "overview.appInfo.embedded.hiddenInputs.title": "Verborgen velden vooraf invullen",
   "overview.appInfo.embedded.iframe": "To add the chat app any where on your website, add this iframe to your html code.",
   "overview.appInfo.embedded.scripts": "To add a chat app to the bottom right of your website add this code to your html.",
   "overview.appInfo.embedded.title": "Embed on website",
@@ -104,6 +106,8 @@
   "overview.appInfo.settings.workflow.subTitle": "Workflow Details",
   "overview.appInfo.settings.workflow.title": "Workflow",
   "overview.appInfo.title": "Web App",
+  "overview.appInfo.workflowLaunchHiddenInputs.description": "Voer waarden in voor de verborgen velden en klik op <bold>Starten</bold> om de WebApp te openen met de waarden.",
+  "overview.appInfo.workflowLaunchHiddenInputs.title": "Verborgen velden vooraf invullen",
   "overview.disableTooltip.triggerMode": "The {{feature}} feature is not supported in Trigger Node mode.",
   "overview.status.disable": "Disabled",
   "overview.status.running": "In Service",
diff --git a/web/i18n/nl-NL/common.json b/web/i18n/nl-NL/common.json
index 6336dd7001..7ae891fd35 100644
--- a/web/i18n/nl-NL/common.json
+++ b/web/i18n/nl-NL/common.json
@@ -101,6 +101,7 @@
   "appModes.completionApp": "Text Generator",
   "avatar.deleteDescription": "Are you sure you want to remove your profile picture? Your account will use the default initial avatar.",
   "avatar.deleteTitle": "Remove Avatar",
+  "avatar.editAction": "Avatar bewerken",
   "chat.citation.characters": "Characters:",
   "chat.citation.hitCount": "Retrieval count:",
   "chat.citation.hitScore": "Retrieval Score:",
diff --git a/web/i18n/nl-NL/education.json b/web/i18n/nl-NL/education.json
index a0fb01c014..4a6d14bf0e 100644
--- a/web/i18n/nl-NL/education.json
+++ b/web/i18n/nl-NL/education.json
@@ -1,5 +1,25 @@
 {
+  "applied.activeSubscription.description": "U heeft een actief abonnement. U kunt de onderwijskorting gebruiken nadat uw abonnement is verlopen. Bevestig uw abonnement in <stripeLink>Stripe</stripeLink>.",
+  "applied.description": "Gefeliciteerd! U heeft met succes de onderwijskorting aangevraagd.",
+  "applied.noPaymentPermission.description": "U heeft geen betalingsrechten in deze werkruimte. Schakel over naar een werkruimte waar u facturering kunt beheren om de onderwijskorting te gebruiken.",
+  "applied.noPaymentPermission.returnHome": "Terug naar Dify",
+  "applied.step1.description": "U heeft met succes de onderwijskorting aangevraagd.",
+  "applied.step1.title": "Stap 1",
+  "applied.step2.description": "Selecteer de werkruimte die u wilt gebruiken met de onderwijskorting.",
+  "applied.step2.title": "Stap 2",
+  "applied.tabs.activeSubscription": "In abonnement",
+  "applied.tabs.eligible": "Kan kopen",
+  "applied.tabs.noPaymentPermission": "Geen betalingsrechten",
+  "applied.title": "Onderwijskorting toegepast",
+  "applied.workspace.plan": "Betaald plan",
+  "applied.workspace.title": "Huidige werkruimte",
   "currentSigned": "CURRENTLY SIGNED IN AS",
+  "educationPricingConfirm.billingPeriod.monthly": "maandelijks",
+  "educationPricingConfirm.billingPeriod.yearly": "jaarlijks",
+  "educationPricingConfirm.cancel": "Huidig abonnement behouden",
+  "educationPricingConfirm.continue": "Overschakelen naar Professional jaarlijks",
+  "educationPricingConfirm.description": "De onderwijskorting is alleen van toepassing op het jaarlijkse Professional-abonnement. Als u uw huidige abonnement behoudt, is de korting niet inbegrepen.",
+  "educationPricingConfirm.title": "Uw geselecteerde abonnement ondersteunt de onderwijskorting niet",
   "emailLabel": "Your current email",
   "form.schoolName.placeholder": "Enter the official, unabbreviated name of your school",
   "form.schoolName.title": "Your School Name",
@@ -31,6 +51,7 @@
   "notice.stillInEducation.expired": "Re-verify now to get a new coupon for the upcoming academic year. We'll add it to your account and you can use it for the next upgrade.",
   "notice.stillInEducation.isAboutToExpire": "Re-verify now to get a new coupon for the upcoming academic year. It'll be saved to your account and ready to use at your next renewal.",
   "notice.stillInEducation.title": "Still in education?",
+  "planNotSupportEducationDiscount": "Niet in aanmerking voor onderwijsprijzen",
   "rejectContent": "Unfortunately, you are not eligible for Education Verified status and therefore cannot receive the exclusive 100% coupon for the Dify Professional Plan if you use this email address.",
   "rejectTitle": "Your Dify Educational Verification Has Been Rejected",
   "submit": "Submit",
@@ -40,5 +61,6 @@
   "toVerified": "Get Education Verified",
   "toVerifiedTip.coupon": "exclusive 100% coupon",
   "toVerifiedTip.end": "for the Dify Professional Plan.",
-  "toVerifiedTip.front": "You are now eligible for Education Verified status. Please enter your education information below to complete the process and receive an"
+  "toVerifiedTip.front": "You are now eligible for Education Verified status. Please enter your education information below to complete the process and receive an",
+  "useEducationDiscount": "Gebruik onderwijskorting"
 }
diff --git a/web/i18n/nl-NL/workflow.json b/web/i18n/nl-NL/workflow.json
index c8e8753eb4..a9607b92df 100644
--- a/web/i18n/nl-NL/workflow.json
+++ b/web/i18n/nl-NL/workflow.json
@@ -646,12 +646,12 @@
   "nodes.humanInput.userActions.actionIdFormatTip": "Action ID must start with a letter or underscores, followed by letters, numbers, or underscores",
   "nodes.humanInput.userActions.actionIdTooLong": "Action ID must be {{maxLength}} characters or less",
   "nodes.humanInput.userActions.actionNamePlaceholder": "Action Name",
-  "nodes.humanInput.userActions.buttonTextPlaceholder": "Button display Text",
+  "nodes.humanInput.userActions.buttonTextPlaceholder": "Actiewaarde",
   "nodes.humanInput.userActions.buttonTextTooLong": "Button text must be {{maxLength}} characters or less",
   "nodes.humanInput.userActions.chooseStyle": "Choose a button style",
   "nodes.humanInput.userActions.emptyTip": "Click the '+' button to add user actions",
   "nodes.humanInput.userActions.title": "User Actions",
-  "nodes.humanInput.userActions.tooltip": "Define buttons that users can click to respond to this form. Each button can trigger different workflow paths. Action ID must start with a letter or underscores, followed by letters, numbers, or underscores.",
+  "nodes.humanInput.userActions.tooltip": "Definieer knoppen waarop gebruikers kunnen klikken om op dit formulier te reageren. Actie-ID bepaalt de vertakking. De Actiewaarde wordt stroomafwaarts beschikbaar gesteld als de geselecteerde ingebouwde uitvoer. Actie-ID moet beginnen met een letter of onderstrepingsteken, gevolgd door letters, cijfers of onderstrepingstekens.",
   "nodes.humanInput.userActions.triggered": "<strong>{{actionName}}</strong> has been triggered",
   "nodes.ifElse.addCondition": "Add Condition",
   "nodes.ifElse.addSubVariable": "Sub Variable",
@@ -897,13 +897,17 @@
   "nodes.questionClassifiers.advancedSetting": "Advanced Setting",
   "nodes.questionClassifiers.class": "Class",
   "nodes.questionClassifiers.classNamePlaceholder": "Write your class name",
+  "nodes.questionClassifiers.defaultLabel": "KLASSE {{index}}",
   "nodes.questionClassifiers.inputVars": "Input Variables",
   "nodes.questionClassifiers.instruction": "Instruction",
   "nodes.questionClassifiers.instructionPlaceholder": "Write your instruction",
   "nodes.questionClassifiers.instructionTip": "Input additional instructions to help the question classifier better understand how to categorize questions.",
+  "nodes.questionClassifiers.labelEditorAriaLabel": "Klasse-labeleditor",
   "nodes.questionClassifiers.model": "model",
+  "nodes.questionClassifiers.outputVars.classLabel": "Klassenlabel",
   "nodes.questionClassifiers.outputVars.className": "Class Name",
   "nodes.questionClassifiers.outputVars.usage": "Model Usage Information",
+  "nodes.questionClassifiers.renameHint": "Dubbelklik op de klassentitel om de naam te wijzigen",
   "nodes.questionClassifiers.topicName": "Topic Name",
   "nodes.questionClassifiers.topicPlaceholder": "Write your topic name",
   "nodes.start.builtInVar": "Built-in Variables",
diff --git a/web/i18n/pl-PL/app-debug.json b/web/i18n/pl-PL/app-debug.json
index a60c960bc2..aad66ea9f8 100644
--- a/web/i18n/pl-PL/app-debug.json
+++ b/web/i18n/pl-PL/app-debug.json
@@ -337,6 +337,8 @@
   "variableConfig.file.image.name": "Obraz",
   "variableConfig.file.supportFileTypes": "Obsługa typów plików",
   "variableConfig.file.video.name": "Wideo",
+  "variableConfig.hidden": "Ukryte i wstępnie wypełnione",
+  "variableConfig.hiddenDescription": "Ukryj to pole przed użytkownikami końcowymi i sam podaj jego wartość. Wzajemnie wykluczające się z Wymagane. <docLink>Dowiedz się więcej</docLink>",
   "variableConfig.hide": "Ukryj",
   "variableConfig.inputPlaceholder": "Proszę wpisać",
   "variableConfig.json": "Kod JSON",
diff --git a/web/i18n/pl-PL/app-overview.json b/web/i18n/pl-PL/app-overview.json
index 1c0aa9d541..219288202c 100644
--- a/web/i18n/pl-PL/app-overview.json
+++ b/web/i18n/pl-PL/app-overview.json
@@ -56,6 +56,8 @@
   "overview.appInfo.embedded.copy": "Kopiuj",
   "overview.appInfo.embedded.entry": "Osadzone",
   "overview.appInfo.embedded.explanation": "Wybierz sposób osadzenia aplikacji czatu na swojej stronie internetowej",
+  "overview.appInfo.embedded.hiddenInputs.description": "Wprowadź wartości dla ukrytych pól. Wartości są dodawane do adresu URL elementu iframe lub do obiektu inputs skryptu.",
+  "overview.appInfo.embedded.hiddenInputs.title": "Wstępnie wypełnij ukryte pola",
   "overview.appInfo.embedded.iframe": "Aby dodać aplikację czatu w dowolnym miejscu na swojej stronie internetowej, dodaj ten kod iframe do swojego kodu HTML.",
   "overview.appInfo.embedded.scripts": "Aby dodać aplikację czatu w prawym dolnym rogu swojej strony internetowej, dodaj ten kod do swojego HTML.",
   "overview.appInfo.embedded.title": "Osadź na stronie internetowej",
@@ -104,6 +106,8 @@
   "overview.appInfo.settings.workflow.subTitle": "Szczegóły przepływu pracy",
   "overview.appInfo.settings.workflow.title": "Kroki przepływu pracy",
   "overview.appInfo.title": "Aplikacja internetowa",
+  "overview.appInfo.workflowLaunchHiddenInputs.description": "Wprowadź wartości dla ukrytych pól, a następnie kliknij <bold>Uruchom</bold>, aby otworzyć WebApp z tymi wartościami.",
+  "overview.appInfo.workflowLaunchHiddenInputs.title": "Wstępnie wypełnij ukryte pola",
   "overview.disableTooltip.triggerMode": "Funkcja {{feature}} nie jest obsługiwana w trybie węzła wyzwalającego.",
   "overview.status.disable": "Wyłącz",
   "overview.status.running": "W usłudze",
diff --git a/web/i18n/pl-PL/common.json b/web/i18n/pl-PL/common.json
index ceeab09acd..2520e1c0d4 100644
--- a/web/i18n/pl-PL/common.json
+++ b/web/i18n/pl-PL/common.json
@@ -101,6 +101,7 @@
   "appModes.completionApp": "Generator tekstu",
   "avatar.deleteDescription": "Czy na pewno chcesz usunąć swoje zdjęcie profilowe? Twoje konto będzie używać domyślnego, początkowego awatara.",
   "avatar.deleteTitle": "Usuń awatar",
+  "avatar.editAction": "Edytuj awatar",
   "chat.citation.characters": "Postacie:",
   "chat.citation.hitCount": "Liczba trafień:",
   "chat.citation.hitScore": "Wynik trafień:",
diff --git a/web/i18n/pl-PL/education.json b/web/i18n/pl-PL/education.json
index d8a6a08607..139d7912dd 100644
--- a/web/i18n/pl-PL/education.json
+++ b/web/i18n/pl-PL/education.json
@@ -1,5 +1,25 @@
 {
+  "applied.activeSubscription.description": "Masz aktywną subskrypcję. Możesz skorzystać z rabatu edukacyjnego po wygaśnięciu subskrypcji. Potwierdź subskrypcję w <stripeLink>Stripe</stripeLink>.",
+  "applied.description": "Gratulacje! Pomyślnie złożono wniosek o rabat edukacyjny.",
+  "applied.noPaymentPermission.description": "Nie masz uprawnień do płatności w tym obszarze roboczym. Przejdź do obszaru roboczego, w którym możesz zarządzać rozliczeniami, aby skorzystać z rabatu edukacyjnego.",
+  "applied.noPaymentPermission.returnHome": "Powrót do Dify",
+  "applied.step1.description": "Pomyślnie złożono wniosek o rabat edukacyjny.",
+  "applied.step1.title": "Krok 1",
+  "applied.step2.description": "Wybierz obszar roboczy, który chcesz używać z rabatem edukacyjnym.",
+  "applied.step2.title": "Krok 2",
+  "applied.tabs.activeSubscription": "W subskrypcji",
+  "applied.tabs.eligible": "Może kupić",
+  "applied.tabs.noPaymentPermission": "Brak uprawnień do płatności",
+  "applied.title": "Rabat edukacyjny zastosowany",
+  "applied.workspace.plan": "Plan płatny",
+  "applied.workspace.title": "Aktualny obszar roboczy",
   "currentSigned": "AKTUALNIE ZALOGOWANY JAKO",
+  "educationPricingConfirm.billingPeriod.monthly": "miesięcznie",
+  "educationPricingConfirm.billingPeriod.yearly": "rocznie",
+  "educationPricingConfirm.cancel": "Zachowaj obecny plan",
+  "educationPricingConfirm.continue": "Przełącz na Professional roczny",
+  "educationPricingConfirm.description": "Zniżka edukacyjna dotyczy tylko rocznego planu Professional. Pozostanie przy obecnym planie nie obejmie zniżki.",
+  "educationPricingConfirm.title": "Wybrany plan nie obsługuje zniżki edukacyjnej",
   "emailLabel": "Twój aktualny email",
   "form.schoolName.placeholder": "Wpisz oficjalną, pełną nazwę swojej szkoły",
   "form.schoolName.title": "Nazwa Twojej Szkoły",
@@ -31,6 +51,7 @@
   "notice.stillInEducation.expired": "Sprawdź ponownie teraz, aby otrzymać nowy kupon na nadchodzący rok akademicki. Dodamy go do twojego konta i będziesz mógł go użyć przy następnej aktualizacji.",
   "notice.stillInEducation.isAboutToExpire": "Zweryfikuj ponownie teraz, aby otrzymać nowy kupon na nadchodzący rok akademicki. Zostanie zapisany na Twoim koncie i gotowy do użycia przy następnej odnowie.",
   "notice.stillInEducation.title": "Wciąż w edukacji?",
+  "planNotSupportEducationDiscount": "Nie kwalifikuje się do cen edukacyjnych",
   "rejectContent": "Niestety, nie kwalifikujesz się do statusu Zweryfikowanej Edukacji i w związku z tym nie możesz otrzymać ekskluzywnego kuponu 100% na plan Dify Professional, jeśli korzystasz z tego adresu e-mail.",
   "rejectTitle": "Twoja weryfikacja edukacyjna Dify została odrzucona",
   "submit": "Zatwierdź",
@@ -40,5 +61,6 @@
   "toVerified": "Uzyskaj potwierdzenie edukacji",
   "toVerifiedTip.coupon": "ekskluzywny kupon 100%",
   "toVerifiedTip.end": "dla Profesjonalnego Planu Dify.",
-  "toVerifiedTip.front": "Teraz jesteś uprawniony do statusu zweryfikowanej edukacji. Proszę wprowadzić swoje informacje edukacyjne poniżej, aby zakończyć proces i otrzymać"
+  "toVerifiedTip.front": "Teraz jesteś uprawniony do statusu zweryfikowanej edukacji. Proszę wprowadzić swoje informacje edukacyjne poniżej, aby zakończyć proces i otrzymać",
+  "useEducationDiscount": "Użyj rabatu edukacyjnego"
 }
diff --git a/web/i18n/pl-PL/workflow.json b/web/i18n/pl-PL/workflow.json
index 805960a851..d8118a1bc5 100644
--- a/web/i18n/pl-PL/workflow.json
+++ b/web/i18n/pl-PL/workflow.json
@@ -646,12 +646,12 @@
   "nodes.humanInput.userActions.actionIdFormatTip": "Identyfikator akcji musi zaczynać się od litery lub podkreślenia, po którym następują litery, cyfry lub podkreślenia",
   "nodes.humanInput.userActions.actionIdTooLong": "Identyfikator akcji musi mieć {{maxLength}} znaków lub mniej",
   "nodes.humanInput.userActions.actionNamePlaceholder": "Nazwa akcji",
-  "nodes.humanInput.userActions.buttonTextPlaceholder": "Tekst wyświetlany na przycisku",
+  "nodes.humanInput.userActions.buttonTextPlaceholder": "Wartość akcji",
   "nodes.humanInput.userActions.buttonTextTooLong": "Tekst przycisku musi mieć {{maxLength}} znaków lub mniej",
   "nodes.humanInput.userActions.chooseStyle": "Wybierz styl przycisku",
   "nodes.humanInput.userActions.emptyTip": "Kliknij przycisk '+', aby dodać akcje użytkownika",
   "nodes.humanInput.userActions.title": "Akcje użytkownika",
-  "nodes.humanInput.userActions.tooltip": "Zdefiniuj przyciski, które użytkownicy mogą klikać, aby odpowiedzieć na ten formularz. Każdy przycisk może uruchomić różne ścieżki przepływu pracy. Identyfikator akcji musi zaczynać się od litery lub podkreślenia, po którym następują litery, cyfry lub podkreślenia.",
+  "nodes.humanInput.userActions.tooltip": "Zdefiniuj przyciski, które użytkownicy mogą klikać, aby odpowiedzieć na ten formularz. Identyfikator akcji kontroluje rozgałęzianie. Wartość akcji jest udostępniana w dalszej części jako wybrane wbudowane wyjście. Identyfikator akcji musi zaczynać się od litery lub podkreślenia, po którym następują litery, cyfry lub podkreślenia.",
   "nodes.humanInput.userActions.triggered": "<strong>{{actionName}}</strong> został uruchomiony",
   "nodes.ifElse.addCondition": "Dodaj warunek",
   "nodes.ifElse.addSubVariable": "Zmienna podrzędna",
@@ -897,13 +897,17 @@
   "nodes.questionClassifiers.advancedSetting": "Zaawansowane ustawienia",
   "nodes.questionClassifiers.class": "Klasa",
   "nodes.questionClassifiers.classNamePlaceholder": "Napisz nazwę swojej klasy",
+  "nodes.questionClassifiers.defaultLabel": "KLASA {{index}}",
   "nodes.questionClassifiers.inputVars": "Zmienne wejściowe",
   "nodes.questionClassifiers.instruction": "Instrukcja",
   "nodes.questionClassifiers.instructionPlaceholder": "Napisz swoją instrukcję",
   "nodes.questionClassifiers.instructionTip": "Wprowadź dodatkowe instrukcje, aby pomóc klasyfikatorowi pytań lepiej zrozumieć, jak kategoryzować pytania.",
+  "nodes.questionClassifiers.labelEditorAriaLabel": "Edytor etykiety klasy",
   "nodes.questionClassifiers.model": "model",
+  "nodes.questionClassifiers.outputVars.classLabel": "Etykieta klasy",
   "nodes.questionClassifiers.outputVars.className": "Nazwa klasy",
   "nodes.questionClassifiers.outputVars.usage": "Informacje o użyciu modelu",
+  "nodes.questionClassifiers.renameHint": "Kliknij dwukrotnie tytuł klasy, aby zmienić nazwę",
   "nodes.questionClassifiers.topicName": "Nazwa tematu",
   "nodes.questionClassifiers.topicPlaceholder": "Napisz nazwę swojego tematu",
   "nodes.start.builtInVar": "Wbudowane zmienne",
diff --git a/web/i18n/pt-BR/app-debug.json b/web/i18n/pt-BR/app-debug.json
index 22fb13806a..595c55d2ca 100644
--- a/web/i18n/pt-BR/app-debug.json
+++ b/web/i18n/pt-BR/app-debug.json
@@ -337,6 +337,8 @@
   "variableConfig.file.image.name": "Imagem",
   "variableConfig.file.supportFileTypes": "Tipos de arquivo de suporte",
   "variableConfig.file.video.name": "Vídeo",
+  "variableConfig.hidden": "Oculto e Pré-preenchido",
+  "variableConfig.hiddenDescription": "Oculte este campo dos usuários finais e forneça o valor você mesmo. Mutuamente exclusivo com Obrigatório. <docLink>Saiba mais</docLink>",
   "variableConfig.hide": "Ocultar",
   "variableConfig.inputPlaceholder": "Por favor, insira",
   "variableConfig.json": "Código JSON",
diff --git a/web/i18n/pt-BR/app-overview.json b/web/i18n/pt-BR/app-overview.json
index 91cd570ce5..9d29ce40fa 100644
--- a/web/i18n/pt-BR/app-overview.json
+++ b/web/i18n/pt-BR/app-overview.json
@@ -56,6 +56,8 @@
   "overview.appInfo.embedded.copy": "Copiar",
   "overview.appInfo.embedded.entry": "Embutido",
   "overview.appInfo.embedded.explanation": "Escolha a maneira de incorporar o aplicativo de chat ao seu site",
+  "overview.appInfo.embedded.hiddenInputs.description": "Insira valores para os campos ocultos. Os valores são adicionados à URL do iframe ou ao objeto de inputs do script.",
+  "overview.appInfo.embedded.hiddenInputs.title": "Pré-preencher Campos Ocultos",
   "overview.appInfo.embedded.iframe": "Para adicionar o aplicativo de chat em qualquer lugar do seu site, adicione este iframe ao seu código HTML.",
   "overview.appInfo.embedded.scripts": "Para adicionar um aplicativo de chat no canto inferior direito do seu site, adicione este código ao seu HTML.",
   "overview.appInfo.embedded.title": "Incorporar no site",
@@ -104,6 +106,8 @@
   "overview.appInfo.settings.workflow.subTitle": "Detalhes do fluxo de trabalho",
   "overview.appInfo.settings.workflow.title": "Etapas do fluxo de trabalho",
   "overview.appInfo.title": "Aplicativo Web",
+  "overview.appInfo.workflowLaunchHiddenInputs.description": "Insira valores para os campos ocultos e clique em <bold>Iniciar</bold> para abrir o WebApp com os valores.",
+  "overview.appInfo.workflowLaunchHiddenInputs.title": "Pré-preencher Campos Ocultos",
   "overview.disableTooltip.triggerMode": "O recurso {{feature}} não é compatível no modo Nó de Gatilho.",
   "overview.status.disable": "Desabilitar",
   "overview.status.running": "Em serviço",
diff --git a/web/i18n/pt-BR/common.json b/web/i18n/pt-BR/common.json
index cd7d8a5487..a7c5267837 100644
--- a/web/i18n/pt-BR/common.json
+++ b/web/i18n/pt-BR/common.json
@@ -101,6 +101,7 @@
   "appModes.completionApp": "Gerador de Texto",
   "avatar.deleteDescription": "Você tem certeza de que deseja remover sua foto de perfil? Sua conta usará o avatar padrão inicial.",
   "avatar.deleteTitle": "Remover Avatar",
+  "avatar.editAction": "Editar Avatar",
   "chat.citation.characters": "Personagens:",
   "chat.citation.hitCount": "Contagem de recuperação:",
   "chat.citation.hitScore": "Pontuação de recuperação:",
diff --git a/web/i18n/pt-BR/education.json b/web/i18n/pt-BR/education.json
index 93a35940ea..9441542015 100644
--- a/web/i18n/pt-BR/education.json
+++ b/web/i18n/pt-BR/education.json
@@ -1,5 +1,25 @@
 {
+  "applied.activeSubscription.description": "Você tem uma assinatura ativa. Você pode usar o desconto educacional após o vencimento da assinatura. Confirme sua assinatura no <stripeLink>Stripe</stripeLink>.",
+  "applied.description": "Parabéns! Você solicitou com sucesso o desconto educacional.",
+  "applied.noPaymentPermission.description": "Você não tem permissão de pagamento neste workspace. Por favor, mude para um workspace onde você possa gerenciar o faturamento para usar o desconto educacional.",
+  "applied.noPaymentPermission.returnHome": "Voltar para o Dify",
+  "applied.step1.description": "Você solicitou com sucesso o desconto educacional.",
+  "applied.step1.title": "Passo 1",
+  "applied.step2.description": "Selecione o workspace que deseja usar com o desconto educacional.",
+  "applied.step2.title": "Passo 2",
+  "applied.tabs.activeSubscription": "Em assinatura",
+  "applied.tabs.eligible": "Pode comprar",
+  "applied.tabs.noPaymentPermission": "Sem permissão de pagamento",
+  "applied.title": "Desconto educacional aplicado",
+  "applied.workspace.plan": "Plano pago",
+  "applied.workspace.title": "Workspace atual",
   "currentSigned": "ATUALMENTE CONECTADO COMO",
+  "educationPricingConfirm.billingPeriod.monthly": "mensal",
+  "educationPricingConfirm.billingPeriod.yearly": "anual",
+  "educationPricingConfirm.cancel": "Manter plano atual",
+  "educationPricingConfirm.continue": "Mudar para Professional anual",
+  "educationPricingConfirm.description": "O desconto educacional se aplica apenas ao plano Professional anual. Manter seu plano atual não incluirá o desconto.",
+  "educationPricingConfirm.title": "O plano selecionado não aceita o desconto educacional",
   "emailLabel": "Seu e-mail atual",
   "form.schoolName.placeholder": "Digite o nome oficial e não abreviado da sua escola",
   "form.schoolName.title": "O nome da sua escola",
@@ -31,6 +51,7 @@
   "notice.stillInEducation.expired": "Reveja agora para obter um novo cupom para o próximo ano acadêmico. Nós o adicionaremos à sua conta e você poderá usá-lo na próxima atualização.",
   "notice.stillInEducation.isAboutToExpire": "Verifique novamente agora para receber um novo cupom para o próximo ano acadêmico. Ele será salvo na sua conta e estará pronto para ser usado na sua próxima renovação.",
   "notice.stillInEducation.title": "Ainda na educação?",
+  "planNotSupportEducationDiscount": "Não elegível para preço educacional",
   "rejectContent": "Infelizmente, você não é elegível para o status de Educação Verificada e, portanto, não pode receber o cupom exclusivo de 100% para o Plano Profissional Dify se usar este endereço de e-mail.",
   "rejectTitle": "A sua verificação educacional Dify foi rejeitada.",
   "submit": "Enviar",
@@ -40,5 +61,6 @@
   "toVerified": "Verifique a Educação",
   "toVerifiedTip.coupon": "cupom exclusivo de 100%",
   "toVerifiedTip.end": "para o Plano Profissional Dify.",
-  "toVerifiedTip.front": "Você agora está elegível para o status de Educação Verificada. Por favor, insira suas informações educacionais abaixo para concluir o processo e receber um"
+  "toVerifiedTip.front": "Você agora está elegível para o status de Educação Verificada. Por favor, insira suas informações educacionais abaixo para concluir o processo e receber um",
+  "useEducationDiscount": "Usar desconto educacional"
 }
diff --git a/web/i18n/pt-BR/workflow.json b/web/i18n/pt-BR/workflow.json
index de6c882e0c..f303905759 100644
--- a/web/i18n/pt-BR/workflow.json
+++ b/web/i18n/pt-BR/workflow.json
@@ -646,12 +646,12 @@
   "nodes.humanInput.userActions.actionIdFormatTip": "O ID da ação deve começar com uma letra ou sublinhados, seguido de letras, números ou sublinhados",
   "nodes.humanInput.userActions.actionIdTooLong": "O ID da ação deve ter {{maxLength}} caracteres ou menos",
   "nodes.humanInput.userActions.actionNamePlaceholder": "Nome da Ação",
-  "nodes.humanInput.userActions.buttonTextPlaceholder": "Texto de exibição do botão",
+  "nodes.humanInput.userActions.buttonTextPlaceholder": "Valor da Ação",
   "nodes.humanInput.userActions.buttonTextTooLong": "O texto do botão deve ter {{maxLength}} caracteres ou menos",
   "nodes.humanInput.userActions.chooseStyle": "Escolha um estilo de botão",
   "nodes.humanInput.userActions.emptyTip": "Clique no botão '+' para adicionar ações do usuário",
   "nodes.humanInput.userActions.title": "Ações do Usuário",
-  "nodes.humanInput.userActions.tooltip": "Defina botões em que os usuários podem clicar para responder a este formulário. Cada botão pode acionar diferentes caminhos de fluxo de trabalho. O ID da ação deve começar com uma letra ou sublinhados, seguido de letras, números ou sublinhados.",
+  "nodes.humanInput.userActions.tooltip": "Defina botões em que os usuários podem clicar para responder a este formulário. O ID da ação controla a ramificação. O Valor da Ação é exposto posteriormente como a saída integrada selecionada. O ID da ação deve começar com uma letra ou sublinhados, seguido de letras, números ou sublinhados.",
   "nodes.humanInput.userActions.triggered": "<strong>{{actionName}}</strong> foi acionado",
   "nodes.ifElse.addCondition": "Adicionar condição",
   "nodes.ifElse.addSubVariable": "Subvariável",
@@ -897,13 +897,17 @@
   "nodes.questionClassifiers.advancedSetting": "Configuração avançada",
   "nodes.questionClassifiers.class": "Classe",
   "nodes.questionClassifiers.classNamePlaceholder": "Escreva o nome da sua classe",
+  "nodes.questionClassifiers.defaultLabel": "CLASSE {{index}}",
   "nodes.questionClassifiers.inputVars": "Variáveis de entrada",
   "nodes.questionClassifiers.instruction": "Instrução",
   "nodes.questionClassifiers.instructionPlaceholder": "Escreva sua instrução",
   "nodes.questionClassifiers.instructionTip": "Insira instruções adicionais para ajudar o classificador de perguntas a entender melhor como categorizar perguntas.",
+  "nodes.questionClassifiers.labelEditorAriaLabel": "Editor de rótulo de classe",
   "nodes.questionClassifiers.model": "modelo",
+  "nodes.questionClassifiers.outputVars.classLabel": "Rótulo da classe",
   "nodes.questionClassifiers.outputVars.className": "Nome da classe",
   "nodes.questionClassifiers.outputVars.usage": "Informações de uso do modelo",
+  "nodes.questionClassifiers.renameHint": "Clique duas vezes no título da classe para renomear",
   "nodes.questionClassifiers.topicName": "Nome do tópico",
   "nodes.questionClassifiers.topicPlaceholder": "Escreva o nome do seu tópico",
   "nodes.start.builtInVar": "Variáveis integradas",
diff --git a/web/i18n/ro-RO/app-debug.json b/web/i18n/ro-RO/app-debug.json
index 48f606542d..e295d3a813 100644
--- a/web/i18n/ro-RO/app-debug.json
+++ b/web/i18n/ro-RO/app-debug.json
@@ -337,6 +337,8 @@
   "variableConfig.file.image.name": "Imagine",
   "variableConfig.file.supportFileTypes": "Tipuri de fișiere de asistență",
   "variableConfig.file.video.name": "Video",
+  "variableConfig.hidden": "Ascuns și precompletat",
+  "variableConfig.hiddenDescription": "Ascundeți acest câmp de la utilizatorii finali și furnizați valoarea dvs. înșivă. Incompatibil cu Obligatoriu. <docLink>Aflați mai multe</docLink>",
   "variableConfig.hide": "Ascundeți",
   "variableConfig.inputPlaceholder": "Vă rugăm să introduceți",
   "variableConfig.json": "Cod JSON",
diff --git a/web/i18n/ro-RO/app-overview.json b/web/i18n/ro-RO/app-overview.json
index 347a799a4e..04d1cd822f 100644
--- a/web/i18n/ro-RO/app-overview.json
+++ b/web/i18n/ro-RO/app-overview.json
@@ -56,6 +56,8 @@
   "overview.appInfo.embedded.copy": "Copiați",
   "overview.appInfo.embedded.entry": "Încorporat",
   "overview.appInfo.embedded.explanation": "Alegeți modul de încorporare a aplicației de chat pe site-ul web",
+  "overview.appInfo.embedded.hiddenInputs.description": "Introduceți valori pentru câmpurile ascunse. Valorile sunt adăugate la URL-ul iframe sau la obiectul inputs al scriptului.",
+  "overview.appInfo.embedded.hiddenInputs.title": "Precompletați câmpurile ascunse",
   "overview.appInfo.embedded.iframe": "Pentru a adăuga aplicația de chat oriunde pe site-ul web, adăugați acest iframe la codul HTML.",
   "overview.appInfo.embedded.scripts": "Pentru a adăuga o aplicație de chat în colțul din dreapta jos al site-ului web, adăugați acest cod la codul HTML.",
   "overview.appInfo.embedded.title": "Încorporați pe site-ul web",
@@ -104,6 +106,8 @@
   "overview.appInfo.settings.workflow.subTitle": "Detalii despre fluxul de lucru",
   "overview.appInfo.settings.workflow.title": "Pași flux de lucru",
   "overview.appInfo.title": "Aplicație web",
+  "overview.appInfo.workflowLaunchHiddenInputs.description": "Introduceți valori pentru câmpurile ascunse, apoi faceți clic pe <bold>Lansare</bold> pentru a deschide WebApp cu valorile respective.",
+  "overview.appInfo.workflowLaunchHiddenInputs.title": "Precompletați câmpurile ascunse",
   "overview.disableTooltip.triggerMode": "Funcționalitatea {{feature}} nu este suportată în modul Nod Trigger.",
   "overview.status.disable": "Dezactivat",
   "overview.status.running": "În service",
diff --git a/web/i18n/ro-RO/common.json b/web/i18n/ro-RO/common.json
index 0d6dfa6c0f..1e3871ec43 100644
--- a/web/i18n/ro-RO/common.json
+++ b/web/i18n/ro-RO/common.json
@@ -101,6 +101,7 @@
   "appModes.completionApp": "Generator de text",
   "avatar.deleteDescription": "Ești sigur că vrei să îți ștergi fotografia de profil? Contul tău va folosi avatarul inițial implicit.",
   "avatar.deleteTitle": "Îndepărtează avatarul",
+  "avatar.editAction": "Editează avatarul",
   "chat.citation.characters": "Caractere:",
   "chat.citation.hitCount": "Număr de recuperări:",
   "chat.citation.hitScore": "Scor de recuperare:",
diff --git a/web/i18n/ro-RO/education.json b/web/i18n/ro-RO/education.json
index 6d92793a71..a361ec2bbe 100644
--- a/web/i18n/ro-RO/education.json
+++ b/web/i18n/ro-RO/education.json
@@ -1,5 +1,25 @@
 {
+  "applied.activeSubscription.description": "Ai un abonament activ. Poți folosi reducerea educațională după expirarea abonamentului. Confirmați abonamentul în <stripeLink>Stripe</stripeLink>.",
+  "applied.description": "Felicitări! Ai aplicat cu succes pentru reducerea educațională.",
+  "applied.noPaymentPermission.description": "Nu ai permisiunea de plată în acest workspace. Te rugăm să treci la un workspace unde poți gestiona facturarea pentru a folosi reducerea educațională.",
+  "applied.noPaymentPermission.returnHome": "Înapoi la Dify",
+  "applied.step1.description": "Ai aplicat cu succes pentru reducerea educațională.",
+  "applied.step1.title": "Pasul 1",
+  "applied.step2.description": "Selectează workspace-ul pe care dorești să-l utilizezi cu reducerea educațională.",
+  "applied.step2.title": "Pasul 2",
+  "applied.tabs.activeSubscription": "În abonament",
+  "applied.tabs.eligible": "Poate cumpăra",
+  "applied.tabs.noPaymentPermission": "Fără permisiune de plată",
+  "applied.title": "Reducere educațională aplicată",
+  "applied.workspace.plan": "Plan plătit",
+  "applied.workspace.title": "Workspace-ul curent",
   "currentSigned": "CONEXIUNE ÎN PREZENT CA",
+  "educationPricingConfirm.billingPeriod.monthly": "lunar",
+  "educationPricingConfirm.billingPeriod.yearly": "anual",
+  "educationPricingConfirm.cancel": "Păstrează planul curent",
+  "educationPricingConfirm.continue": "Treci la Professional anual",
+  "educationPricingConfirm.description": "Reducerea educațională se aplică doar planului Professional anual. Dacă păstrezi planul curent, reducerea nu va fi inclusă.",
+  "educationPricingConfirm.title": "Planul selectat nu acceptă reducerea educațională",
   "emailLabel": "Emailul tău curent",
   "form.schoolName.placeholder": "Introduceți numele oficial, neabbreviat al școlii dumneavoastră",
   "form.schoolName.title": "Numele Școlii Tale",
@@ -31,6 +51,7 @@
   "notice.stillInEducation.expired": "Re-verificați acum pentru a obține un nou cupon pentru următorul an academic. Vom adăuga acest cupon în contul dvs. și îl puteți folosi pentru următoarea actualizare.",
   "notice.stillInEducation.isAboutToExpire": "Re-verifică acum pentru a obține un nou cupon pentru anul universitar următor. Va fi salvat în contul tău și gata de utilizat la următoarea reînnoire.",
   "notice.stillInEducation.title": "Încă în educație?",
+  "planNotSupportEducationDiscount": "Nu este eligibil pentru prețuri educaționale",
   "rejectContent": "Din păcate, nu ești eligibil pentru statutul de Verificat Educațional și, prin urmare, nu poți primi cuponul exclusiv de 100% pentru Planul Profesional Dify dacă folosești această adresă de email.",
   "rejectTitle": "Verificarea educațională Dify a fost respinsă",
   "submit": "Trimite",
@@ -40,5 +61,6 @@
   "toVerified": "Obțineți verificarea educației",
   "toVerifiedTip.coupon": "cupom exclusiv 100%",
   "toVerifiedTip.end": "pentru Planul Profesional Dify.",
-  "toVerifiedTip.front": "Sunteți acum eligibil pentru statutul de Educație Verificată. Vă rugăm să introduceți informațiile despre educația dumneavoastră mai jos pentru a finaliza procesul și a primi un"
+  "toVerifiedTip.front": "Sunteți acum eligibil pentru statutul de Educație Verificată. Vă rugăm să introduceți informațiile despre educația dumneavoastră mai jos pentru a finaliza procesul și a primi un",
+  "useEducationDiscount": "Folosește reducerea educațională"
 }
diff --git a/web/i18n/ro-RO/workflow.json b/web/i18n/ro-RO/workflow.json
index 7b551294e8..aad60382da 100644
--- a/web/i18n/ro-RO/workflow.json
+++ b/web/i18n/ro-RO/workflow.json
@@ -646,12 +646,12 @@
   "nodes.humanInput.userActions.actionIdFormatTip": "ID-ul acțiunii trebuie să înceapă cu o literă sau underscore, urmat de litere, cifre sau underscore",
   "nodes.humanInput.userActions.actionIdTooLong": "ID-ul acțiunii trebuie să fie de {{maxLength}} caractere sau mai puțin",
   "nodes.humanInput.userActions.actionNamePlaceholder": "Nume acțiune",
-  "nodes.humanInput.userActions.buttonTextPlaceholder": "Text afișat pe buton",
+  "nodes.humanInput.userActions.buttonTextPlaceholder": "Valoarea Acțiunii",
   "nodes.humanInput.userActions.buttonTextTooLong": "Textul butonului trebuie să fie de {{maxLength}} caractere sau mai puțin",
   "nodes.humanInput.userActions.chooseStyle": "Alegeți un stil de buton",
   "nodes.humanInput.userActions.emptyTip": "Faceți clic pe butonul '+' pentru a adăuga acțiuni utilizator",
   "nodes.humanInput.userActions.title": "Acțiuni utilizator",
-  "nodes.humanInput.userActions.tooltip": "Definiți butoane pe care utilizatorii le pot apăsa pentru a răspunde la acest formular. Fiecare buton poate declanșa căi de flux diferite. ID-ul acțiunii trebuie să înceapă cu o literă sau underscore, urmat de litere, cifre sau underscore.",
+  "nodes.humanInput.userActions.tooltip": "Definiți butoane pe care utilizatorii le pot apăsa pentru a răspunde la acest formular. ID-ul acțiunii controlează ramificarea. Valoarea Acțiunii este expusă în aval ca ieșirea integrată selectată. ID-ul acțiunii trebuie să înceapă cu o literă sau underscore, urmat de litere, cifre sau underscore.",
   "nodes.humanInput.userActions.triggered": "<strong>{{actionName}}</strong> a fost declanșat",
   "nodes.ifElse.addCondition": "Adăugați condiție",
   "nodes.ifElse.addSubVariable": "Subvariabilă",
@@ -897,13 +897,17 @@
   "nodes.questionClassifiers.advancedSetting": "Setare avansată",
   "nodes.questionClassifiers.class": "Clasă",
   "nodes.questionClassifiers.classNamePlaceholder": "Scrieți numele clasei",
+  "nodes.questionClassifiers.defaultLabel": "CLASĂ {{index}}",
   "nodes.questionClassifiers.inputVars": "Variabile de intrare",
   "nodes.questionClassifiers.instruction": "Instrucțiune",
   "nodes.questionClassifiers.instructionPlaceholder": "Scrieți instrucțiunea",
   "nodes.questionClassifiers.instructionTip": "Introduceți instrucțiuni suplimentare pentru a ajuta clasificatorul de întrebări să înțeleagă mai bine cum să categorizeze întrebările.",
+  "nodes.questionClassifiers.labelEditorAriaLabel": "Editor etichete clasă",
   "nodes.questionClassifiers.model": "model",
+  "nodes.questionClassifiers.outputVars.classLabel": "Etichetă clasă",
   "nodes.questionClassifiers.outputVars.className": "Nume clasă",
   "nodes.questionClassifiers.outputVars.usage": "Informații de utilizare a modelului",
+  "nodes.questionClassifiers.renameHint": "Faceți dublu clic pe titlul clasei pentru redenumire",
   "nodes.questionClassifiers.topicName": "Nume subiect",
   "nodes.questionClassifiers.topicPlaceholder": "Scrieți numele subiectului",
   "nodes.start.builtInVar": "Variabile integrate",
diff --git a/web/i18n/ru-RU/app-debug.json b/web/i18n/ru-RU/app-debug.json
index 74f7c15a32..858c994938 100644
--- a/web/i18n/ru-RU/app-debug.json
+++ b/web/i18n/ru-RU/app-debug.json
@@ -337,6 +337,8 @@
   "variableConfig.file.image.name": "Образ",
   "variableConfig.file.supportFileTypes": "Типы файлов поддержки",
   "variableConfig.file.video.name": "Видео",
+  "variableConfig.hidden": "Скрыто и предзаполнено",
+  "variableConfig.hiddenDescription": "Скройте это поле от конечных пользователей и укажите значение самостоятельно. Взаимно исключает Обязательное. <docLink>Подробнее</docLink>",
   "variableConfig.hide": "Скрыть",
   "variableConfig.inputPlaceholder": "Пожалуйста, введите",
   "variableConfig.json": "JSON код",
diff --git a/web/i18n/ru-RU/app-overview.json b/web/i18n/ru-RU/app-overview.json
index c361441ceb..f04f090e65 100644
--- a/web/i18n/ru-RU/app-overview.json
+++ b/web/i18n/ru-RU/app-overview.json
@@ -56,6 +56,8 @@
   "overview.appInfo.embedded.copy": "Копировать",
   "overview.appInfo.embedded.entry": "Встраивание",
   "overview.appInfo.embedded.explanation": "Выберите способ встраивания чат-приложения на свой веб-сайт",
+  "overview.appInfo.embedded.hiddenInputs.description": "Введите значения для скрытых полей. Значения добавляются к URL iframe или в объект inputs скрипта.",
+  "overview.appInfo.embedded.hiddenInputs.title": "Предзаполнить скрытые поля",
   "overview.appInfo.embedded.iframe": "Чтобы добавить чат-приложение в любое место на вашем веб-сайте, добавьте этот iframe в свой HTML-код.",
   "overview.appInfo.embedded.scripts": "Чтобы добавить чат-приложение в правый нижний угол вашего веб-сайта, добавьте этот код в свой HTML.",
   "overview.appInfo.embedded.title": "Встроить на веб-сайт",
@@ -104,6 +106,8 @@
   "overview.appInfo.settings.workflow.subTitle": "Подробности рабочего процесса",
   "overview.appInfo.settings.workflow.title": "Рабочий процесс",
   "overview.appInfo.title": "Веб-приложение",
+  "overview.appInfo.workflowLaunchHiddenInputs.description": "Введите значения для скрытых полей, затем нажмите <bold>Запустить</bold>, чтобы открыть WebApp с указанными значениями.",
+  "overview.appInfo.workflowLaunchHiddenInputs.title": "Предзаполнить скрытые поля",
   "overview.disableTooltip.triggerMode": "Функция {{feature}} не поддерживается в режиме узла триггера.",
   "overview.status.disable": "Отключено",
   "overview.status.running": "В работе",
diff --git a/web/i18n/ru-RU/common.json b/web/i18n/ru-RU/common.json
index 9e984bfa6e..0825a58525 100644
--- a/web/i18n/ru-RU/common.json
+++ b/web/i18n/ru-RU/common.json
@@ -101,6 +101,7 @@
   "appModes.completionApp": "Генератор текста",
   "avatar.deleteDescription": "Вы уверены, что хотите удалить свою фотографию профиля? Ваш аккаунт будет использовать стандартный аватар.",
   "avatar.deleteTitle": "Удалить аватар",
+  "avatar.editAction": "Изменить аватар",
   "chat.citation.characters": "Символы:",
   "chat.citation.hitCount": "Количество совпадений:",
   "chat.citation.hitScore": "Оценка совпадения:",
diff --git a/web/i18n/ru-RU/education.json b/web/i18n/ru-RU/education.json
index f5ea530184..58534dd57e 100644
--- a/web/i18n/ru-RU/education.json
+++ b/web/i18n/ru-RU/education.json
@@ -1,5 +1,25 @@
 {
+  "applied.activeSubscription.description": "У вас есть активная подписка. Вы можете использовать образовательную скидку после истечения срока действия подписки. Подтвердите подписку в <stripeLink>Stripe</stripeLink>.",
+  "applied.description": "Поздравляем! Вы успешно подали заявку на образовательную скидку.",
+  "applied.noPaymentPermission.description": "У вас нет прав на оплату в этом рабочем пространстве. Пожалуйста, переключитесь в рабочее пространство, где вы можете управлять выставлением счетов, чтобы использовать образовательную скидку.",
+  "applied.noPaymentPermission.returnHome": "Вернуться в Dify",
+  "applied.step1.description": "Вы успешно подали заявку на образовательную скидку.",
+  "applied.step1.title": "Шаг 1",
+  "applied.step2.description": "Выберите рабочее пространство, которое хотите использовать с образовательной скидкой.",
+  "applied.step2.title": "Шаг 2",
+  "applied.tabs.activeSubscription": "В подписке",
+  "applied.tabs.eligible": "Можно купить",
+  "applied.tabs.noPaymentPermission": "Нет прав на оплату",
+  "applied.title": "Образовательная скидка применена",
+  "applied.workspace.plan": "Платный план",
+  "applied.workspace.title": "Текущее рабочее пространство",
   "currentSigned": "В ДАННЫЙ МОМЕНТ ВХОД В ПРОФИЛЬ КАК",
+  "educationPricingConfirm.billingPeriod.monthly": "ежемесячно",
+  "educationPricingConfirm.billingPeriod.yearly": "ежегодно",
+  "educationPricingConfirm.cancel": "Оставить текущий план",
+  "educationPricingConfirm.continue": "Перейти на Professional годовой",
+  "educationPricingConfirm.description": "Образовательная скидка применяется только к годовому плану Professional. Если оставить текущий план, скидка не будет включена.",
+  "educationPricingConfirm.title": "Выбранный план не поддерживает образовательную скидку",
   "emailLabel": "Ваш текущий адрес электронной почты",
   "form.schoolName.placeholder": "Введите официальное, полное название вашей школы",
   "form.schoolName.title": "Название вашей школы",
@@ -31,6 +51,7 @@
   "notice.stillInEducation.expired": "Переутвердите сейчас, чтобы получить новый купон на предстоящий учебный год. Мы добавим его на ваш аккаунт, и вы сможете использовать его для следующего обновления.",
   "notice.stillInEducation.isAboutToExpire": "Проверьте еще раз, чтобы получить новый купон на предстоящий учебный год. Он будет сохранен в вашем аккаунте и готов к использованию при следующем продлении.",
   "notice.stillInEducation.title": "Все еще учишься?",
+  "planNotSupportEducationDiscount": "Не подходит для образовательной цены",
   "rejectContent": "К сожалению, вы не имеете права на статус Проверенного образованием и, следовательно, не можете получить эксклюзивный купон на 100% для профессионального плана Dify, если вы используете этот адрес электронной почты.",
   "rejectTitle": "Ваша образовательная проверка Dify была отклонена",
   "submit": "Отправить",
@@ -40,5 +61,6 @@
   "toVerified": "Получите подтверждение образования",
   "toVerifiedTip.coupon": "эксклюзивный 100% купон",
   "toVerifiedTip.end": "для профессионального плана Dify.",
-  "toVerifiedTip.front": "Теперь вы имеете право на статус \"Проверенное образование\". Пожалуйста, введите свои образовательные данные ниже, чтобы завершить процесс и получить"
+  "toVerifiedTip.front": "Теперь вы имеете право на статус \"Проверенное образование\". Пожалуйста, введите свои образовательные данные ниже, чтобы завершить процесс и получить",
+  "useEducationDiscount": "Использовать образовательную скидку"
 }
diff --git a/web/i18n/ru-RU/workflow.json b/web/i18n/ru-RU/workflow.json
index aa5292f1cc..8748f2a27d 100644
--- a/web/i18n/ru-RU/workflow.json
+++ b/web/i18n/ru-RU/workflow.json
@@ -646,12 +646,12 @@
   "nodes.humanInput.userActions.actionIdFormatTip": "Идентификатор действия должен начинаться с буквы или подчеркивания, за которым следуют буквы, цифры или подчеркивания",
   "nodes.humanInput.userActions.actionIdTooLong": "Идентификатор действия должен содержать не более {{maxLength}} символов",
   "nodes.humanInput.userActions.actionNamePlaceholder": "Название действия",
-  "nodes.humanInput.userActions.buttonTextPlaceholder": "Текст кнопки для отображения",
+  "nodes.humanInput.userActions.buttonTextPlaceholder": "Значение действия",
   "nodes.humanInput.userActions.buttonTextTooLong": "Текст кнопки должен содержать не более {{maxLength}} символов",
   "nodes.humanInput.userActions.chooseStyle": "Выберите стиль кнопки",
   "nodes.humanInput.userActions.emptyTip": "Нажмите кнопку '+' для добавления действий пользователя",
   "nodes.humanInput.userActions.title": "Действия пользователя",
-  "nodes.humanInput.userActions.tooltip": "Определите кнопки, на которые пользователи могут нажимать, чтобы ответить на эту форму. Каждая кнопка может запускать разные пути рабочего процесса. Идентификатор действия должен начинаться с буквы или подчеркивания, за которым следуют буквы, цифры или подчеркивания.",
+  "nodes.humanInput.userActions.tooltip": "Определите кнопки, на которые пользователи могут нажимать, чтобы ответить на эту форму. Идентификатор действия управляет ветвлением. Значение действия передаётся далее как выбранный встроенный вывод. Идентификатор действия должен начинаться с буквы или подчеркивания, за которым следуют буквы, цифры или подчеркивания.",
   "nodes.humanInput.userActions.triggered": "<strong>{{actionName}}</strong> был запущен",
   "nodes.ifElse.addCondition": "Добавить условие",
   "nodes.ifElse.addSubVariable": "Подпеременная",
@@ -897,13 +897,17 @@
   "nodes.questionClassifiers.advancedSetting": "Расширенные настройки",
   "nodes.questionClassifiers.class": "Класс",
   "nodes.questionClassifiers.classNamePlaceholder": "Введите имя вашего класса",
+  "nodes.questionClassifiers.defaultLabel": "КЛАСС {{index}}",
   "nodes.questionClassifiers.inputVars": "Входные переменные",
   "nodes.questionClassifiers.instruction": "Инструкция",
   "nodes.questionClassifiers.instructionPlaceholder": "Введите вашу инструкцию",
   "nodes.questionClassifiers.instructionTip": "Введите дополнительные инструкции, чтобы помочь классификатору вопросов лучше понять, как классифицировать вопросы.",
+  "nodes.questionClassifiers.labelEditorAriaLabel": "Редактор метки класса",
   "nodes.questionClassifiers.model": "модель",
+  "nodes.questionClassifiers.outputVars.classLabel": "Метка класса",
   "nodes.questionClassifiers.outputVars.className": "Имя класса",
   "nodes.questionClassifiers.outputVars.usage": "Информация об использовании модели",
+  "nodes.questionClassifiers.renameHint": "Дважды щёлкните по заголовку класса для переименования",
   "nodes.questionClassifiers.topicName": "Название темы",
   "nodes.questionClassifiers.topicPlaceholder": "Введите название вашей темы",
   "nodes.start.builtInVar": "Встроенные переменные",
diff --git a/web/i18n/sl-SI/app-debug.json b/web/i18n/sl-SI/app-debug.json
index a8abfbd8ac..5fee642be5 100644
--- a/web/i18n/sl-SI/app-debug.json
+++ b/web/i18n/sl-SI/app-debug.json
@@ -337,6 +337,8 @@
   "variableConfig.file.image.name": "Podoba",
   "variableConfig.file.supportFileTypes": "Podporne vrste datotek",
   "variableConfig.file.video.name": "Video",
+  "variableConfig.hidden": "Skrito in vnaprej izpolnjeno",
+  "variableConfig.hiddenDescription": "Skrijte to polje pred končnimi uporabniki in sami navedite vrednost. Se medsebojno izključuje z Zahtevano. <docLink>Več informacij</docLink>",
   "variableConfig.hide": "Skriti",
   "variableConfig.inputPlaceholder": "Prosimo, vnesite",
   "variableConfig.json": "JSON koda",
diff --git a/web/i18n/sl-SI/app-overview.json b/web/i18n/sl-SI/app-overview.json
index 05ef1da689..33be7afb32 100644
--- a/web/i18n/sl-SI/app-overview.json
+++ b/web/i18n/sl-SI/app-overview.json
@@ -56,6 +56,8 @@
   "overview.appInfo.embedded.copy": "Kopiraj",
   "overview.appInfo.embedded.entry": "Vdelano",
   "overview.appInfo.embedded.explanation": "Izberite način vdelave klepeta na svojo spletno stran",
+  "overview.appInfo.embedded.hiddenInputs.description": "Vnesite vrednosti za skrita polja. Vrednosti se dodajo v URL iframe ali v objekt inputs skripta.",
+  "overview.appInfo.embedded.hiddenInputs.title": "Vnaprej izpolni skrita polja",
   "overview.appInfo.embedded.iframe": "Za dodajanje klepeta kjerkoli na vaši spletni strani dodajte to iframe v vašo HTML kodo.",
   "overview.appInfo.embedded.scripts": "Za dodajanje klepeta na spodnji desni del vaše spletne strani dodajte to kodo v vašo HTML kodo.",
   "overview.appInfo.embedded.title": "Vdelava na spletno stran",
@@ -104,6 +106,8 @@
   "overview.appInfo.settings.workflow.subTitle": "Podrobnosti poteka dela",
   "overview.appInfo.settings.workflow.title": "Potek dela",
   "overview.appInfo.title": "Spletna aplikacija",
+  "overview.appInfo.workflowLaunchHiddenInputs.description": "Vnesite vrednosti za skrita polja, nato kliknite <bold>Zaženi</bold>, da odprete WebApp z vrednostmi.",
+  "overview.appInfo.workflowLaunchHiddenInputs.title": "Vnaprej izpolni skrita polja",
   "overview.disableTooltip.triggerMode": "Funkcija {{feature}} ni podprta v načinu vozlišča sprožilca.",
   "overview.status.disable": "Onemogočeno",
   "overview.status.running": "V storitvi",
diff --git a/web/i18n/sl-SI/common.json b/web/i18n/sl-SI/common.json
index ff4e230a88..2c893d2cc6 100644
--- a/web/i18n/sl-SI/common.json
+++ b/web/i18n/sl-SI/common.json
@@ -101,6 +101,7 @@
   "appModes.completionApp": "Generator besedila",
   "avatar.deleteDescription": "Ali ste prepričani, da želite odstraniti svojo profilno sliko? Vaš račun bo uporabljal privzeti začetni avatar.",
   "avatar.deleteTitle": "Odstrani avatar",
+  "avatar.editAction": "Uredi avatar",
   "chat.citation.characters": "Znakov:",
   "chat.citation.hitCount": "Število pridobivanja:",
   "chat.citation.hitScore": "Rezultat pridobivanja:",
diff --git a/web/i18n/sl-SI/education.json b/web/i18n/sl-SI/education.json
index 92895ccff8..7855bd3e74 100644
--- a/web/i18n/sl-SI/education.json
+++ b/web/i18n/sl-SI/education.json
@@ -1,5 +1,25 @@
 {
+  "applied.activeSubscription.description": "Imate aktivno naročnino. Izobraževalni popust lahko uporabite po poteku naročnine. Potrdite naročnino v <stripeLink>Stripe</stripeLink>.",
+  "applied.description": "Čestitamo! Uspešno ste se prijavili za izobraževalni popust.",
+  "applied.noPaymentPermission.description": "V tem delovnem prostoru nimate dovoljenja za plačilo. Preklopite na delovni prostor, kjer lahko upravljate obračunavanje, da uporabite izobraževalni popust.",
+  "applied.noPaymentPermission.returnHome": "Nazaj na Dify",
+  "applied.step1.description": "Uspešno ste se prijavili za izobraževalni popust.",
+  "applied.step1.title": "Korak 1",
+  "applied.step2.description": "Izberite delovni prostor, ki ga želite uporabiti z izobraževalnim popustom.",
+  "applied.step2.title": "Korak 2",
+  "applied.tabs.activeSubscription": "V naročnini",
+  "applied.tabs.eligible": "Lahko kupi",
+  "applied.tabs.noPaymentPermission": "Brez dovoljenja za plačilo",
+  "applied.title": "Izobraževalni popust je bil uporabljen",
+  "applied.workspace.plan": "Plačljiv načrt",
+  "applied.workspace.title": "Trenutni delovni prostor",
   "currentSigned": "Trenutno prijavljen kot",
+  "educationPricingConfirm.billingPeriod.monthly": "mesečno",
+  "educationPricingConfirm.billingPeriod.yearly": "letno",
+  "educationPricingConfirm.cancel": "Obdrži trenutni paket",
+  "educationPricingConfirm.continue": "Preklopi na letni Professional",
+  "educationPricingConfirm.description": "Izobraževalni popust velja samo za letni paket Professional. Če obdržite trenutni paket, popust ne bo vključen.",
+  "educationPricingConfirm.title": "Izbrani paket ne podpira izobraževalnega popusta",
   "emailLabel": "Vaš trenutni elektronski naslov",
   "form.schoolName.placeholder": "Vpišite uradno, neokrnjeno ime vaše šole",
   "form.schoolName.title": "Ime vaše šole",
@@ -31,6 +51,7 @@
   "notice.stillInEducation.expired": "Ponovno preverite zdaj, da pridobite nov kupon za prihajajoče šolsko leto. Dodali ga bomo vašemu računu in lahko ga uporabite za naslednjo nadgradnjo.",
   "notice.stillInEducation.isAboutToExpire": "Ponovno preverite zdaj, da pridobite nov kupon za prihajajoče akademsko leto. Shranjen bo na vašem računu in pripravljen za uporabo ob vaši naslednji obnovitvi.",
   "notice.stillInEducation.title": "Še vedno v izobraževanju?",
+  "planNotSupportEducationDiscount": "Ni upravičen do izobraževalnih cen",
   "rejectContent": "Na žalost niste upravičeni do statusa Verificirane izobrazbe in zato ne morete prejeti ekskluzivnega 100-odstotnega kupona za Dify profesionalni načrt, če uporabljate ta e-poštni naslov.",
   "rejectTitle": "Vaša Dify izobraževalna verifikacija je bila zavrnjena.",
   "submit": "Predloži",
@@ -40,5 +61,6 @@
   "toVerified": "Preverite izobrazbo",
   "toVerifiedTip.coupon": "izključno 100% kupon",
   "toVerifiedTip.end": "za profesionalni načrt Dify.",
-  "toVerifiedTip.front": "Zdaj ste upravičeni do statusa Preverjeno izobraževanje. Prosimo, vnesite svoje izobraževalne podatke spodaj, da zaključite postopek in prejmete"
+  "toVerifiedTip.front": "Zdaj ste upravičeni do statusa Preverjeno izobraževanje. Prosimo, vnesite svoje izobraževalne podatke spodaj, da zaključite postopek in prejmete",
+  "useEducationDiscount": "Uporabi izobraževalni popust"
 }
diff --git a/web/i18n/sl-SI/workflow.json b/web/i18n/sl-SI/workflow.json
index a7c2914626..af8d236bf0 100644
--- a/web/i18n/sl-SI/workflow.json
+++ b/web/i18n/sl-SI/workflow.json
@@ -646,12 +646,12 @@
   "nodes.humanInput.userActions.actionIdFormatTip": "ID dejanja se mora začeti s črko ali podčrtajem, ki mu sledijo črke, številke ali podčrtaji",
   "nodes.humanInput.userActions.actionIdTooLong": "ID dejanja mora biti {{maxLength}} znakov ali manj",
   "nodes.humanInput.userActions.actionNamePlaceholder": "Ime dejanja",
-  "nodes.humanInput.userActions.buttonTextPlaceholder": "Besedilo za prikaz na gumbu",
+  "nodes.humanInput.userActions.buttonTextPlaceholder": "Vrednost dejanja",
   "nodes.humanInput.userActions.buttonTextTooLong": "Besedilo gumba mora biti {{maxLength}} znakov ali manj",
   "nodes.humanInput.userActions.chooseStyle": "Izberite slog gumba",
   "nodes.humanInput.userActions.emptyTip": "Kliknite gumb '+' za dodajanje uporabniških dejanj",
   "nodes.humanInput.userActions.title": "Uporabniška dejanja",
-  "nodes.humanInput.userActions.tooltip": "Definirajte gumbe, ki jih lahko uporabniki kliknejo, da se odzovejo na ta obrazec. Vsak gumb lahko sproži različne poti delovnega toka. ID dejanja se mora začeti s črko ali podčrtajem, ki mu sledijo črke, številke ali podčrtaji.",
+  "nodes.humanInput.userActions.tooltip": "Definirajte gumbe, ki jih lahko uporabniki kliknejo, da se odzovejo na ta obrazec. ID dejanja nadzoruje razvejanje. Vrednost dejanja je izpostavljena navzdol kot izbrani vgrajeni izhod. ID dejanja se mora začeti s črko ali podčrtajem, ki mu sledijo črke, številke ali podčrtaji.",
   "nodes.humanInput.userActions.triggered": "<strong>{{actionName}}</strong> je bil sprožen",
   "nodes.ifElse.addCondition": "Dodaj pogoj",
   "nodes.ifElse.addSubVariable": "Podspremenljivka",
@@ -897,13 +897,17 @@
   "nodes.questionClassifiers.advancedSetting": "Napredno nastavitev",
   "nodes.questionClassifiers.class": "Razred",
   "nodes.questionClassifiers.classNamePlaceholder": "Napiši ime svoje razredi",
+  "nodes.questionClassifiers.defaultLabel": "RAZRED {{index}}",
   "nodes.questionClassifiers.inputVars": "Vhodne spremenljivke",
   "nodes.questionClassifiers.instruction": "Navodilo",
   "nodes.questionClassifiers.instructionPlaceholder": "Napišite svoje navodilo",
   "nodes.questionClassifiers.instructionTip": "Vnesite dodatna navodila, ki bodo pomagala klasifikatorju vprašanj bolje razumeti, kako kategorizirati vprašanja.",
+  "nodes.questionClassifiers.labelEditorAriaLabel": "Urejevalnik oznak razreda",
   "nodes.questionClassifiers.model": "model",
+  "nodes.questionClassifiers.outputVars.classLabel": "Oznaka razreda",
   "nodes.questionClassifiers.outputVars.className": "Ime razreda",
   "nodes.questionClassifiers.outputVars.usage": "Informacije o uporabi modela",
+  "nodes.questionClassifiers.renameHint": "Dvokliknite naslov razreda za preimenovanje",
   "nodes.questionClassifiers.topicName": "Ime teme",
   "nodes.questionClassifiers.topicPlaceholder": "Napišite ime svoje teme",
   "nodes.start.builtInVar": "Vgrajene spremenljivke",
diff --git a/web/i18n/th-TH/app-debug.json b/web/i18n/th-TH/app-debug.json
index 7db9ef84e0..c7fc48a5e4 100644
--- a/web/i18n/th-TH/app-debug.json
+++ b/web/i18n/th-TH/app-debug.json
@@ -337,6 +337,8 @@
   "variableConfig.file.image.name": "ภาพ",
   "variableConfig.file.supportFileTypes": "ประเภทไฟล์ที่รองรับ",
   "variableConfig.file.video.name": "วีดิทัศน์",
+  "variableConfig.hidden": "ซ่อนและกรอกล่วงหน้า",
+  "variableConfig.hiddenDescription": "ซ่อนช่องนี้จากผู้ใช้ปลายทางและป้อนค่าด้วยตนเอง ไม่สามารถใช้ร่วมกับ จำเป็น ได้ <docLink>เรียนรู้เพิ่มเติม</docLink>",
   "variableConfig.hide": "ซ่อน",
   "variableConfig.inputPlaceholder": "กรุณาป้อน",
   "variableConfig.json": "รหัส JSON",
diff --git a/web/i18n/th-TH/app-overview.json b/web/i18n/th-TH/app-overview.json
index 53c5c4bfc5..611360eb29 100644
--- a/web/i18n/th-TH/app-overview.json
+++ b/web/i18n/th-TH/app-overview.json
@@ -56,6 +56,8 @@
   "overview.appInfo.embedded.copy": "ลอก",
   "overview.appInfo.embedded.entry": "ฝัง ตัว",
   "overview.appInfo.embedded.explanation": "เลือกวิธีฝังแอปแชทลงในเว็บไซต์ของคุณ",
+  "overview.appInfo.embedded.hiddenInputs.description": "ป้อนค่าสำหรับช่องที่ซ่อนอยู่ ค่าต่างๆ จะถูกเพิ่มไปยัง URL ของ iframe หรือวัตถุ inputs ของสคริปต์",
+  "overview.appInfo.embedded.hiddenInputs.title": "กรอกช่องที่ซ่อนล่วงหน้า",
   "overview.appInfo.embedded.iframe": "หากต้องการเพิ่มแอปแชทที่ใดก็ได้บนเว็บไซต์ของคุณ ให้เพิ่ม iframe นี้ลงในโค้ด html ของคุณ",
   "overview.appInfo.embedded.scripts": "หากต้องการเพิ่มแอปแชทที่ด้านขวาล่างของเว็บไซต์ ให้เพิ่มโค้ดนี้ลงใน html ของคุณ",
   "overview.appInfo.embedded.title": "ฝังบนเว็บไซต์",
@@ -104,6 +106,8 @@
   "overview.appInfo.settings.workflow.subTitle": "รายละเอียดเวิร์กโฟลว์",
   "overview.appInfo.settings.workflow.title": "เวิร์กโฟลว์",
   "overview.appInfo.title": "เว็บแอป",
+  "overview.appInfo.workflowLaunchHiddenInputs.description": "ป้อนค่าสำหรับช่องที่ซ่อนอยู่ จากนั้นคลิก <bold>เปิดใช้งาน</bold> เพื่อเปิด WebApp พร้อมค่าดังกล่าว",
+  "overview.appInfo.workflowLaunchHiddenInputs.title": "กรอกช่องที่ซ่อนล่วงหน้า",
   "overview.disableTooltip.triggerMode": "โหมดโหนดทริกเกอร์ไม่รองรับฟีเจอร์ {{feature}}.",
   "overview.status.disable": "พิการ",
   "overview.status.running": "ให้บริการ",
diff --git a/web/i18n/th-TH/common.json b/web/i18n/th-TH/common.json
index b0e20f5e4f..8dc39a16f7 100644
--- a/web/i18n/th-TH/common.json
+++ b/web/i18n/th-TH/common.json
@@ -101,6 +101,7 @@
   "appModes.completionApp": "เครื่องกําเนิดข้อความ",
   "avatar.deleteDescription": "คุณแน่ใจหรือไม่ว่าต้องการลบรูปโปรไฟล์ของคุณ? บัญชีของคุณจะใช้รูปโปรไฟล์เริ่มต้นตามค่าเริ่มต้น.",
   "avatar.deleteTitle": "ลบอวตาร",
+  "avatar.editAction": "แก้ไขอวตาร",
   "chat.citation.characters": "อักขระ:",
   "chat.citation.hitCount": "จํานวนการดึงข้อมูล:",
   "chat.citation.hitScore": "คะแนนการดึงข้อมูล:",
diff --git a/web/i18n/th-TH/education.json b/web/i18n/th-TH/education.json
index a309bfbe6b..830440802a 100644
--- a/web/i18n/th-TH/education.json
+++ b/web/i18n/th-TH/education.json
@@ -1,5 +1,25 @@
 {
+  "applied.activeSubscription.description": "คุณมีการสมัครสมาชิกที่ยังใช้งานอยู่ คุณสามารถใช้ส่วนลดการศึกษาได้หลังจากการสมัครสมาชิกของคุณหมดอายุ ยืนยันการสมัครสมาชิกของคุณใน <stripeLink>Stripe</stripeLink>",
+  "applied.description": "ยินดีด้วย! คุณได้สมัครรับส่วนลดการศึกษาสำเร็จแล้ว",
+  "applied.noPaymentPermission.description": "คุณไม่มีสิทธิ์การชำระเงินในพื้นที่ทำงานนี้ โปรดเปลี่ยนไปยังพื้นที่ทำงานที่คุณสามารถจัดการการเรียกเก็บเงินเพื่อใช้ส่วนลดการศึกษา",
+  "applied.noPaymentPermission.returnHome": "กลับไปที่ Dify",
+  "applied.step1.description": "คุณได้สมัครรับส่วนลดการศึกษาสำเร็จแล้ว",
+  "applied.step1.title": "ขั้นตอนที่ 1",
+  "applied.step2.description": "เลือกพื้นที่ทำงานที่คุณต้องการใช้กับส่วนลดการศึกษา",
+  "applied.step2.title": "ขั้นตอนที่ 2",
+  "applied.tabs.activeSubscription": "อยู่ในการสมัครสมาชิก",
+  "applied.tabs.eligible": "สามารถซื้อได้",
+  "applied.tabs.noPaymentPermission": "ไม่มีสิทธิ์ชำระเงิน",
+  "applied.title": "ใช้ส่วนลดการศึกษาแล้ว",
+  "applied.workspace.plan": "แผนชำระเงิน",
+  "applied.workspace.title": "พื้นที่ทำงานปัจจุบัน",
   "currentSigned": "ลงชื่อเข้าใช้ในฐานะ",
+  "educationPricingConfirm.billingPeriod.monthly": "รายเดือน",
+  "educationPricingConfirm.billingPeriod.yearly": "รายปี",
+  "educationPricingConfirm.cancel": "ใช้แผนปัจจุบันต่อ",
+  "educationPricingConfirm.continue": "เปลี่ยนเป็น Professional รายปี",
+  "educationPricingConfirm.description": "ส่วนลดการศึกษาใช้ได้เฉพาะกับแผน Professional รายปีเท่านั้น หากใช้แผนปัจจุบันต่อ จะไม่มีส่วนลดนี้รวมอยู่ด้วย",
+  "educationPricingConfirm.title": "แผนที่คุณเลือกไม่รองรับส่วนลดการศึกษา",
   "emailLabel": "อีเมลปัจจุบันของคุณ",
   "form.schoolName.placeholder": "กรุณาใส่ชื่อของโรงเรียนอย่างเป็นทางการที่ไม่มีการย่อ",
   "form.schoolName.title": "ชื่อโรงเรียนของคุณ",
@@ -31,6 +51,7 @@
   "notice.stillInEducation.expired": "ตรวจสอบอีกครั้งตอนนี้เพื่อรับคูปองใหม่สำหรับปีการศึกษาใหม่ เราจะเพิ่มมันเข้ากับบัญชีของคุณและคุณสามารถใช้มันสำหรับการอัปเกรดครั้งถัดไปได้",
   "notice.stillInEducation.isAboutToExpire": "ตรวจสอบอีกครั้งเดี๋ยวนี้เพื่อรับคูปองใหม่สำหรับปีการศึกษาที่จะมาถึง มันจะถูกบันทึกในบัญชีของคุณและพร้อมใช้งานในการต่ออายุครั้งถัดไปของคุณ.",
   "notice.stillInEducation.title": "ยังอยู่ในวัยเรียนใช่ไหม?",
+  "planNotSupportEducationDiscount": "ไม่มีสิทธิ์รับราคาการศึกษา",
   "rejectContent": "น่าเสียดายที่คุณไม่มีสิทธิ์ได้รับสถานะการตรวจสอบการศึกษาและดังนั้นคุณจึงไม่สามารถรับคูปองพิเศษ 100% สำหรับแผนมืออาชีพ Dify หากคุณใช้ที่อยู่อีเมลนี้.",
   "rejectTitle": "การตรวจสอบการศึกษา Dify ของคุณถูกปฏิเสธ",
   "submit": "ส่ง",
@@ -40,5 +61,6 @@
   "toVerified": "ตรวจสอบการศึกษา",
   "toVerifiedTip.coupon": "คูปองพิเศษ 100%",
   "toVerifiedTip.end": "สำหรับแผนมืออาชีพของ Dify.",
-  "toVerifiedTip.front": "คุณมีสิทธิ์ได้รับสถานะการตรวจสอบการศึกษาแล้ว กรุณากรอกข้อมูลการศึกษาของคุณด้านล่างเพื่อดำเนินการให้เสร็จสิ้นและรับสิทธิ์"
+  "toVerifiedTip.front": "คุณมีสิทธิ์ได้รับสถานะการตรวจสอบการศึกษาแล้ว กรุณากรอกข้อมูลการศึกษาของคุณด้านล่างเพื่อดำเนินการให้เสร็จสิ้นและรับสิทธิ์",
+  "useEducationDiscount": "ใช้ส่วนลดการศึกษา"
 }
diff --git a/web/i18n/th-TH/workflow.json b/web/i18n/th-TH/workflow.json
index d8a9b53f2a..b08d9fde0e 100644
--- a/web/i18n/th-TH/workflow.json
+++ b/web/i18n/th-TH/workflow.json
@@ -646,12 +646,12 @@
   "nodes.humanInput.userActions.actionIdFormatTip": "ID การดำเนินการต้องเริ่มต้นด้วยตัวอักษรหรือขีดล่าง ตามด้วยตัวอักษร ตัวเลข หรือขีดล่าง",
   "nodes.humanInput.userActions.actionIdTooLong": "ID การดำเนินการต้องมีความยาว {{maxLength}} ตัวอักษรหรือน้อยกว่า",
   "nodes.humanInput.userActions.actionNamePlaceholder": "ชื่อการดำเนินการ",
-  "nodes.humanInput.userActions.buttonTextPlaceholder": "ข้อความแสดงบนปุ่ม",
+  "nodes.humanInput.userActions.buttonTextPlaceholder": "ค่าการดำเนินการ",
   "nodes.humanInput.userActions.buttonTextTooLong": "ข้อความบนปุ่มต้องมีความยาว {{maxLength}} ตัวอักษรหรือน้อยกว่า",
   "nodes.humanInput.userActions.chooseStyle": "เลือกสไตล์ปุ่ม",
   "nodes.humanInput.userActions.emptyTip": "คลิกปุ่ม '+' เพื่อเพิ่มการดำเนินการของผู้ใช้",
   "nodes.humanInput.userActions.title": "การดำเนินการของผู้ใช้",
-  "nodes.humanInput.userActions.tooltip": "กำหนดปุ่มที่ผู้ใช้สามารถคลิกเพื่อตอบสนองต่อแบบฟอร์มนี้ แต่ละปุ่มสามารถเรียกใช้เส้นทางเวิร์กโฟลว์ที่แตกต่างกัน ID การดำเนินการต้องเริ่มต้นด้วยตัวอักษรหรือขีดล่าง ตามด้วยตัวอักษร ตัวเลข หรือขีดล่าง",
+  "nodes.humanInput.userActions.tooltip": "กำหนดปุ่มที่ผู้ใช้สามารถคลิกเพื่อตอบสนองต่อแบบฟอร์มนี้ ID การดำเนินการควบคุมการแยกสาขา ค่าการดำเนินการถูกเปิดเผยในระดับถัดไปเป็นเอาต์พุตในตัวที่เลือก ID การดำเนินการต้องเริ่มต้นด้วยตัวอักษรหรือขีดล่าง ตามด้วยตัวอักษร ตัวเลข หรือขีดล่าง",
   "nodes.humanInput.userActions.triggered": "<strong>{{actionName}}</strong> ถูกเรียกใช้แล้ว",
   "nodes.ifElse.addCondition": "เพิ่มเงื่อนไข",
   "nodes.ifElse.addSubVariable": "ตัวแปรย่อย",
@@ -897,13 +897,17 @@
   "nodes.questionClassifiers.advancedSetting": "การตั้งค่าขั้นสูง",
   "nodes.questionClassifiers.class": "ประเภท",
   "nodes.questionClassifiers.classNamePlaceholder": "เขียนชื่อชั้นเรียนของคุณ",
+  "nodes.questionClassifiers.defaultLabel": "ชั้นเรียน {{index}}",
   "nodes.questionClassifiers.inputVars": "ตัวแปรอินพุต",
   "nodes.questionClassifiers.instruction": "การสอน",
   "nodes.questionClassifiers.instructionPlaceholder": "เขียนคําแนะนําของคุณ",
   "nodes.questionClassifiers.instructionTip": "ป้อนคําแนะนําเพิ่มเติมเพื่อช่วยให้ตัวจําแนกคําถามเข้าใจวิธีจัดหมวดหมู่คําถามได้ดียิ่งขึ้น",
+  "nodes.questionClassifiers.labelEditorAriaLabel": "โปรแกรมแก้ไขป้ายชั้นเรียน",
   "nodes.questionClassifiers.model": "แบบ",
+  "nodes.questionClassifiers.outputVars.classLabel": "ป้ายชั้นเรียน",
   "nodes.questionClassifiers.outputVars.className": "ชื่อคลาส",
   "nodes.questionClassifiers.outputVars.usage": "ข้อมูลการใช้งานรุ่น",
+  "nodes.questionClassifiers.renameHint": "ดับเบิลคลิกที่ชื่อชั้นเรียนเพื่อเปลี่ยนชื่อ",
   "nodes.questionClassifiers.topicName": "ชื่อหัวข้อ",
   "nodes.questionClassifiers.topicPlaceholder": "เขียนชื่อหัวข้อของคุณ",
   "nodes.start.builtInVar": "ตัวแปรในตัว",
diff --git a/web/i18n/tr-TR/app-debug.json b/web/i18n/tr-TR/app-debug.json
index df14e4c175..196f7d8320 100644
--- a/web/i18n/tr-TR/app-debug.json
+++ b/web/i18n/tr-TR/app-debug.json
@@ -261,14 +261,14 @@
   "notSetAPIKey.trailFinished": "Deneme süresi sona erdi",
   "notSetVar": "Değişkenler, kullanıcıların form doldururken prompt kelimelerini veya açılış ifadelerini getirmesine izin verir. Prompt kelimelerine \"{{input}}\" yazmayı deneyebilirsiniz.",
   "openingStatement.add": "Ekle",
-  "openingStatement.editorTitle": "Acilis Mesaji",
+  "openingStatement.editorTitle": "Açılış Mesajı",
   "openingStatement.noDataPlaceHolder": "Kullanıcı ile konuşmayı başlatmak, AI'ın konuşma uygulamalarında onlarla daha yakın bir bağlantı kurmasına yardımcı olabilir.",
   "openingStatement.notIncludeKey": "Başlangıç promptu değişkeni içermiyor: {{key}}. Lütfen bunu başlangıç promptuna ekleyin.",
   "openingStatement.openingQuestion": "Açılış Soruları",
-  "openingStatement.openingQuestionDescription": "Acilis mesajindan sonra gosterilen istege bagli yonlendirmeler; kullanicilarin konusmayi surdurmesine yardimci olur.",
-  "openingStatement.openingQuestionPlaceholder": "Bir acilis sorusu girin.",
-  "openingStatement.placeholderLine1": "Buradan baslayin. Yapay zekanin gondermesi gereken ilk mesaji yazin.",
-  "openingStatement.placeholderLine2": "Değişkenler kullanabilirsiniz, {{variable}} yazmayı deneyin.",
+  "openingStatement.openingQuestionDescription": "Açılış mesajından sonra gösterilen isteğe bağlı yönlendirmeler; kullanıcıların konuşmayı sürdürmesine yardımcı olur.",
+  "openingStatement.openingQuestionPlaceholder": "Bir açılış sorusu girin.",
+  "openingStatement.placeholderLine1": "Buradan başlayın. Yapay zekânın göndermesi gereken ilk mesajı yazın.",
+  "openingStatement.placeholderLine2": "Değişkenleri kullanabilirsiniz; {{variable}} yazmayı deneyin.",
   "openingStatement.title": "Konuşma Başlatıcı",
   "openingStatement.tooShort": "Konuşma için açılış ifadeleri oluşturmak için en az 20 kelimelik başlangıç promptu gereklidir.",
   "openingStatement.varTip": "Değişkenler kullanabilirsiniz, örneğin {{variable}} yazmayı deneyin",
@@ -337,6 +337,8 @@
   "variableConfig.file.image.name": "Resim",
   "variableConfig.file.supportFileTypes": "Destek Dosya Türleri",
   "variableConfig.file.video.name": "Video",
+  "variableConfig.hidden": "Gizlenmiş ve Önceden Doldurulmuş",
+  "variableConfig.hiddenDescription": "Bu alanı son kullanıcılardan gizleyin ve değeri kendiniz girin. Gerekli ile karşılıklı olarak dışlayıcıdır. <docLink>Daha fazla bilgi</docLink>",
   "variableConfig.hide": "Gizle",
   "variableConfig.inputPlaceholder": "Lütfen girin",
   "variableConfig.json": "JSON Kodu",
diff --git a/web/i18n/tr-TR/app-overview.json b/web/i18n/tr-TR/app-overview.json
index e48c6c6fe7..60dd97436e 100644
--- a/web/i18n/tr-TR/app-overview.json
+++ b/web/i18n/tr-TR/app-overview.json
@@ -56,6 +56,8 @@
   "overview.appInfo.embedded.copy": "Kopyala",
   "overview.appInfo.embedded.entry": "Gömülü",
   "overview.appInfo.embedded.explanation": "Sohbet uygulamasını web sitenize yerleştirmenin yollarını seçin",
+  "overview.appInfo.embedded.hiddenInputs.description": "Gizli alanlar için değerler girin. Değerler iframe URL'sine veya komut dosyasının inputs nesnesine eklenir.",
+  "overview.appInfo.embedded.hiddenInputs.title": "Gizli Alanları Önceden Doldurun",
   "overview.appInfo.embedded.iframe": "Sohbet uygulamasını web sitenizin herhangi bir yerine eklemek için bu iframe'i HTML kodunuza ekleyin.",
   "overview.appInfo.embedded.scripts": "Sohbet uygulamasını web sitenizin sağ alt köşesine eklemek için bu kodu HTML'e ekleyin.",
   "overview.appInfo.embedded.title": "Siteye Yerleştir",
@@ -104,6 +106,8 @@
   "overview.appInfo.settings.workflow.subTitle": "İş Akışı Detayları",
   "overview.appInfo.settings.workflow.title": "İş Akışı Adımları",
   "overview.appInfo.title": "Web Uygulaması",
+  "overview.appInfo.workflowLaunchHiddenInputs.description": "Gizli alanlar için değerler girin, ardından WebApp'i değerlerle açmak için <bold>Başlat</bold>'a tıklayın.",
+  "overview.appInfo.workflowLaunchHiddenInputs.title": "Gizli Alanları Önceden Doldurun",
   "overview.disableTooltip.triggerMode": "Trigger Düğümü modunda {{feature}} özelliği desteklenmiyor.",
   "overview.status.disable": "Devre Dışı",
   "overview.status.running": "Çalışıyor",
diff --git a/web/i18n/tr-TR/app.json b/web/i18n/tr-TR/app.json
index aa10f954e9..e2f3f9aad4 100644
--- a/web/i18n/tr-TR/app.json
+++ b/web/i18n/tr-TR/app.json
@@ -136,11 +136,11 @@
   "marketplace.template.fetchFailed": "Şablon alınamadı",
   "marketplace.template.importConfirm": "İçe Aktar",
   "marketplace.template.importFailed": "Şablon içe aktarılamadı",
-  "marketplace.template.modalTitle": "Marketplace'den İçe Aktar",
+  "marketplace.template.modalTitle": "Pazar Yeri'nden İçe Aktar",
   "marketplace.template.overview": "Genel Bakış",
   "marketplace.template.publishedBy": "Yayıncı",
   "marketplace.template.usageCount": "Kullanım",
-  "marketplace.template.viewOnMarketplace": "Marketplace'de Görüntüle",
+  "marketplace.template.viewOnMarketplace": "Pazar Yeri'nde Görüntüle",
   "maxActiveRequests": "Maksimum eş zamanlı istekler",
   "maxActiveRequestsPlaceholder": "Sınırsız için 0 girin",
   "maxActiveRequestsTip": "Her uygulama için maksimum eşzamanlı aktif istek sayısı (sınırsız için 0)",
diff --git a/web/i18n/tr-TR/common.json b/web/i18n/tr-TR/common.json
index 78b0ed28cd..d4bb2dc9dc 100644
--- a/web/i18n/tr-TR/common.json
+++ b/web/i18n/tr-TR/common.json
@@ -101,6 +101,7 @@
   "appModes.completionApp": "Metin Üreteci",
   "avatar.deleteDescription": "Profil resminizi kaldırmak istediğinize emin misiniz? Hesabınız varsayılan başlangıç avatarını kullanacaktır.",
   "avatar.deleteTitle": "Avatarı kaldır",
+  "avatar.editAction": "Avatarı düzenle",
   "chat.citation.characters": "Karakterler:",
   "chat.citation.hitCount": "Geri Alım Sayısı:",
   "chat.citation.hitScore": "Geri Alım Skoru:",
diff --git a/web/i18n/tr-TR/education.json b/web/i18n/tr-TR/education.json
index 6f182e3b60..d3b77aad33 100644
--- a/web/i18n/tr-TR/education.json
+++ b/web/i18n/tr-TR/education.json
@@ -1,5 +1,25 @@
 {
+  "applied.activeSubscription.description": "Aktif bir aboneliğiniz var. Aboneliğinizin süresi dolduktan sonra eğitim indirimini kullanabilirsiniz. Aboneliğinizi <stripeLink>Stripe</stripeLink>'da onaylayın.",
+  "applied.description": "Tebrikler! Eğitim indirimi için başarıyla başvurdunuz.",
+  "applied.noPaymentPermission.description": "Bu çalışma alanında ödeme izniniz yok. Eğitim indirimini kullanmak için lütfen faturalamayı yönetebileceğiniz bir çalışma alanına geçin.",
+  "applied.noPaymentPermission.returnHome": "Dify'e geri dön",
+  "applied.step1.description": "Eğitim indirimi için başarıyla başvurdunuz.",
+  "applied.step1.title": "Adım 1",
+  "applied.step2.description": "Eğitim indirimiyle kullanmak istediğiniz çalışma alanını seçin.",
+  "applied.step2.title": "Adım 2",
+  "applied.tabs.activeSubscription": "Abonelikte",
+  "applied.tabs.eligible": "Satın alabilir",
+  "applied.tabs.noPaymentPermission": "Ödeme izni yok",
+  "applied.title": "Eğitim indirimi uygulandı",
+  "applied.workspace.plan": "Ücretli plan",
+  "applied.workspace.title": "Mevcut Çalışma Alanı",
   "currentSigned": "ŞU ANDA GİRİŞ YAPILDIĞI KİŞİ",
+  "educationPricingConfirm.billingPeriod.monthly": "aylık",
+  "educationPricingConfirm.billingPeriod.yearly": "yıllık",
+  "educationPricingConfirm.cancel": "Mevcut planı koru",
+  "educationPricingConfirm.continue": "Professional yıllık plana geç",
+  "educationPricingConfirm.description": "Eğitim indirimi yalnızca yıllık Professional planı için geçerlidir. Mevcut planınızı korursanız indirim dahil edilmez.",
+  "educationPricingConfirm.title": "Seçtiğiniz plan eğitim indirimini desteklemiyor",
   "emailLabel": "Şu anki e-posta adresin",
   "form.schoolName.placeholder": "Okulunuzun resmi, kısaltılmamış adını girin",
   "form.schoolName.title": "Okulunuzun Adı",
@@ -31,6 +51,7 @@
   "notice.stillInEducation.expired": "Şimdi yeniden doğrulayın, böylece yaklaşan akademik yıl için yeni bir kupon alın. Bu kuponu hesabınıza ekleyeceğiz ve sonraki yükseltme için kullanabilirsiniz.",
   "notice.stillInEducation.isAboutToExpire": "Şimdi yeniden doğrulayın ve gelecek akademik yıl için yeni bir kupon alın. Bu, hesabınıza kaydedilecek ve bir sonraki yenilemenizde kullanıma hazır olacak.",
   "notice.stillInEducation.title": "Hala eğitimde misin?",
+  "planNotSupportEducationDiscount": "Eğitim fiyatlandırması için uygun değil",
   "rejectContent": "Maalesef, Eğitim Doğrulama statüsüne uygun değilsiniz ve bu nedenle bu e-posta adresini kullanıyorsanız Dify Profesyonel Planı için özel %100 kuponu alamazsınız.",
   "rejectTitle": "Dify Eğitim Doğrulamanız Rededildi",
   "submit": "Gönder",
@@ -40,5 +61,6 @@
   "toVerified": "Eğitim Bilgilerinizi Doğrulayın",
   "toVerifiedTip.coupon": "özel %100 kupon",
   "toVerifiedTip.end": "Dify Profesyonel Planı için.",
-  "toVerifiedTip.front": "Artık Eğitim Doğrulandı statüsüne uygun oldunuz. Lütfen süreci tamamlamak ve bir almak için eğitim bilgilerinizi aşağıya girin."
+  "toVerifiedTip.front": "Artık Eğitim Doğrulandı statüsüne uygun oldunuz. Lütfen süreci tamamlamak ve bir almak için eğitim bilgilerinizi aşağıya girin.",
+  "useEducationDiscount": "Eğitim indirimini kullan"
 }
diff --git a/web/i18n/tr-TR/share.json b/web/i18n/tr-TR/share.json
index 8dc64335ea..7ec9d02ea8 100644
--- a/web/i18n/tr-TR/share.json
+++ b/web/i18n/tr-TR/share.json
@@ -16,8 +16,8 @@
   "chat.privacyPolicyMiddle": "gizlilik politikası",
   "chat.privacyPolicyRight": "uygulama geliştiricisi tarafından sağlanmıştır.",
   "chat.privatePromptConfigTitle": "Konuşma ayarları",
-  "chat.prompt": "Prompt",
-  "chat.publicPromptConfigTitle": "Başlangıç Promptu",
+  "chat.prompt": "İstem",
+  "chat.publicPromptConfigTitle": "Başlangıç İstemi",
   "chat.resetChat": "Konuşmayı sıfırla",
   "chat.startChat": "Sohbete Başla",
   "chat.temporarySystemIssue": "Üzgünüz, geçici sistem sorunu.",
diff --git a/web/i18n/tr-TR/workflow.json b/web/i18n/tr-TR/workflow.json
index 7cd69d7df1..c9a6a77168 100644
--- a/web/i18n/tr-TR/workflow.json
+++ b/web/i18n/tr-TR/workflow.json
@@ -111,33 +111,33 @@
   "chatVariable.updatedAt": "Güncellenme zamanı: ",
   "collaboration.historyAction.generic": "Bir işbirlikçi geri alma/yeniden yapma gerçekleştirdi",
   "comments.actions.addComment": "Yorum ekle",
-  "comments.actions.deleteReply": "Delete reply",
+  "comments.actions.deleteReply": "Yanıtı sil",
   "comments.actions.editComment": "Yorumu düzenle",
-  "comments.actions.editReply": "Edit reply",
-  "comments.aria.closeComment": "Close comment",
+  "comments.actions.editReply": "Yanıtı düzenle",
+  "comments.aria.closeComment": "Yorumu kapat",
   "comments.aria.commentActions": "Yorum işlemleri",
-  "comments.aria.deleteComment": "Delete thread",
+  "comments.aria.deleteComment": "Konuyu sil",
   "comments.aria.filterComments": "Yorumları filtrele",
-  "comments.aria.nextComment": "Next comment",
-  "comments.aria.previousComment": "Previous comment",
-  "comments.aria.replyActions": "Reply actions",
-  "comments.aria.resolveComment": "Resolve",
-  "comments.confirm.deleteReplyDesc": "This reply will be removed permanently.",
-  "comments.confirm.deleteReplyTitle": "Delete this reply?",
-  "comments.confirm.deleteThreadDesc": "This action will permanently delete the thread and all its replies. This cannot be undone.",
-  "comments.confirm.deleteThreadTitle": "Delete this thread?",
-  "comments.fallback.user": "User",
+  "comments.aria.nextComment": "Sonraki yorum",
+  "comments.aria.previousComment": "Önceki yorum",
+  "comments.aria.replyActions": "Yanıt işlemleri",
+  "comments.aria.resolveComment": "Çöz",
+  "comments.confirm.deleteReplyDesc": "Bu yanıt kalıcı olarak kaldırılacak.",
+  "comments.confirm.deleteReplyTitle": "Bu yanıt silinsin mi?",
+  "comments.confirm.deleteThreadDesc": "Bu işlem konuyu ve tüm yanıtlarını kalıcı olarak siler. Bu işlem geri alınamaz.",
+  "comments.confirm.deleteThreadTitle": "Bu konu silinsin mi?",
+  "comments.fallback.user": "Kullanıcı",
   "comments.filter.all": "Tümü",
-  "comments.filter.onlyYourThreads": "Yalnızca senin başlıkların",
+  "comments.filter.onlyYourThreads": "Yalnızca kendi konuların",
   "comments.filter.showResolved": "Çözülenleri göster",
-  "comments.loading": "Loading…",
-  "comments.noComments": "No comments yet",
-  "comments.panelTitle": "Comment",
-  "comments.placeholder.add": "Add a comment",
+  "comments.loading": "Yükleniyor…",
+  "comments.noComments": "Henüz yorum yok",
+  "comments.panelTitle": "Yorum",
+  "comments.placeholder.add": "Yorum ekle",
   "comments.placeholder.editComment": "Yorumu düzenle",
-  "comments.placeholder.editReply": "Edit reply",
-  "comments.placeholder.reply": "Reply",
-  "comments.reply": "Reply",
+  "comments.placeholder.editReply": "Yanıtı düzenle",
+  "comments.placeholder.reply": "Yanıtla",
+  "comments.reply": "Yanıtla",
   "common.ImageUploadLegacyTip": "Artık başlangıç formunda dosya türü değişkenleri oluşturabilirsiniz. Gelecekte resim yükleme özelliğini artık desteklemeyeceğiz.",
   "common.accessAPIReference": "API Referansına Eriş",
   "common.addBlock": "Düğüm Ekle",
@@ -229,8 +229,8 @@
   "common.previewPlaceholder": "Sohbet Robotunu hata ayıklamak için aşağıdaki kutuya içerik girin",
   "common.processData": "Veriyi İşle",
   "common.publish": "Yayınla",
-  "common.publishToMarketplace": "Marketplace'de Yayınla",
-  "common.publishToMarketplaceFailed": "Marketplace'de Yayınlama Başarısız",
+  "common.publishToMarketplace": "Pazar Yeri'nde Yayınla",
+  "common.publishToMarketplaceFailed": "Pazar Yeri'nde yayınlanamadı",
   "common.publishUpdate": "Güncellemeyi Yayınla",
   "common.published": "Yayınlandı",
   "common.publishedAt": "Yayınlandı",
@@ -646,12 +646,12 @@
   "nodes.humanInput.userActions.actionIdFormatTip": "Eylem kimliği bir harf veya alt çizgi ile başlamalı, ardından harf, rakam veya alt çizgi gelmelidir",
   "nodes.humanInput.userActions.actionIdTooLong": "Eylem kimliği {{maxLength}} karakter veya daha az olmalıdır",
   "nodes.humanInput.userActions.actionNamePlaceholder": "Eylem Adı",
-  "nodes.humanInput.userActions.buttonTextPlaceholder": "Düğme Görüntüleme Metni",
+  "nodes.humanInput.userActions.buttonTextPlaceholder": "Eylem Değeri",
   "nodes.humanInput.userActions.buttonTextTooLong": "Düğme metni {{maxLength}} karakter veya daha az olmalıdır",
   "nodes.humanInput.userActions.chooseStyle": "Bir düğme stili seçin",
   "nodes.humanInput.userActions.emptyTip": "Kullanıcı eylemleri eklemek için '+' düğmesine tıklayın",
   "nodes.humanInput.userActions.title": "Kullanıcı Eylemleri",
-  "nodes.humanInput.userActions.tooltip": "Kullanıcıların bu forma yanıt vermek için tıklayabileceği düğmeleri tanımlayın. Her düğme farklı iş akışı yollarını tetikleyebilir. Eylem kimliği bir harf veya alt çizgi ile başlamalı, ardından harf, rakam veya alt çizgi gelmelidir.",
+  "nodes.humanInput.userActions.tooltip": "Kullanıcıların bu forma yanıt vermek için tıklayabileceği düğmeleri tanımlayın. Eylem kimliği dallanmayı kontrol eder. Eylem Değeri, seçilen yerleşik çıktı olarak aşağı akışta sunulur. Eylem kimliği bir harf veya alt çizgi ile başlamalı, ardından harf, rakam veya alt çizgi gelmelidir.",
   "nodes.humanInput.userActions.triggered": "<strong>{{actionName}}</strong> tetiklendi",
   "nodes.ifElse.addCondition": "Koşul Ekle",
   "nodes.ifElse.addSubVariable": "Alt Değişken",
@@ -812,7 +812,7 @@
   "nodes.llm.outputVars.output": "İçerik Üret",
   "nodes.llm.outputVars.reasoning_content": "Akıl yürütme içeriği",
   "nodes.llm.outputVars.usage": "Model Kullanım Bilgileri",
-  "nodes.llm.prompt": "prompt",
+  "nodes.llm.prompt": "istem",
   "nodes.llm.reasoningFormat.separated": "Ayrı düşünce etiketleri",
   "nodes.llm.reasoningFormat.tagged": "Etiketleri düşünmeye devam et",
   "nodes.llm.reasoningFormat.title": "Akıl yürütme etiket ayrımını etkinleştir",
@@ -891,19 +891,23 @@
   "nodes.parameterExtractor.outputVars.usage": "Model Kullanım Bilgileri",
   "nodes.parameterExtractor.reasoningMode": "Akıl Yürütme Modu",
   "nodes.parameterExtractor.reasoningModeFunctionToolCalling": "Fonksiyon/Araç Çağrısı",
-  "nodes.parameterExtractor.reasoningModePrompt": "Prompt",
+  "nodes.parameterExtractor.reasoningModePrompt": "İstem",
   "nodes.parameterExtractor.reasoningModeTip": "Modelin fonksiyon çağırma veya istemler için talimatlara yanıt verme yeteneğine bağlı olarak uygun akıl yürütme modunu seçebilirsiniz.",
   "nodes.questionClassifiers.addClass": "Sınıf Ekle",
   "nodes.questionClassifiers.advancedSetting": "Gelişmiş Ayarlar",
   "nodes.questionClassifiers.class": "Sınıf",
   "nodes.questionClassifiers.classNamePlaceholder": "Sınıf adınızı yazın",
+  "nodes.questionClassifiers.defaultLabel": "SINIF {{index}}",
   "nodes.questionClassifiers.inputVars": "Giriş Değişkenleri",
   "nodes.questionClassifiers.instruction": "Talimat",
   "nodes.questionClassifiers.instructionPlaceholder": "Talimatınızı yazın",
   "nodes.questionClassifiers.instructionTip": "Soru sınıflandırıcının soruları nasıl kategorize edeceğini daha iyi anlamasına yardımcı olmak için ek talimatlar girin.",
+  "nodes.questionClassifiers.labelEditorAriaLabel": "Sınıf etiketi düzenleyicisi",
   "nodes.questionClassifiers.model": "model",
+  "nodes.questionClassifiers.outputVars.classLabel": "Sınıf Etiketi",
   "nodes.questionClassifiers.outputVars.className": "Sınıf Adı",
   "nodes.questionClassifiers.outputVars.usage": "Model Kullanım Bilgileri",
+  "nodes.questionClassifiers.renameHint": "Yeniden adlandırmak için sınıf başlığına çift tıklayın",
   "nodes.questionClassifiers.topicName": "Konu Adı",
   "nodes.questionClassifiers.topicPlaceholder": "Konu adınızı yazın",
   "nodes.start.builtInVar": "Yerleşik Değişkenler",
diff --git a/web/i18n/uk-UA/app-debug.json b/web/i18n/uk-UA/app-debug.json
index 6d5237c073..26d78f51a3 100644
--- a/web/i18n/uk-UA/app-debug.json
+++ b/web/i18n/uk-UA/app-debug.json
@@ -337,6 +337,8 @@
   "variableConfig.file.image.name": "Образ",
   "variableConfig.file.supportFileTypes": "Підтримка типів файлів",
   "variableConfig.file.video.name": "Відео",
+  "variableConfig.hidden": "Приховано та попередньо заповнено",
+  "variableConfig.hiddenDescription": "Приховайте це поле від кінцевих користувачів і введіть значення самостійно. Взаємно виключає Обов'язкове. <docLink>Дізнатися більше</docLink>",
   "variableConfig.hide": "Приховати",
   "variableConfig.inputPlaceholder": "Будь ласка, введіть",
   "variableConfig.json": "JSON Код",
diff --git a/web/i18n/uk-UA/app-overview.json b/web/i18n/uk-UA/app-overview.json
index 9b7f7d21f9..99f2caf05a 100644
--- a/web/i18n/uk-UA/app-overview.json
+++ b/web/i18n/uk-UA/app-overview.json
@@ -56,6 +56,8 @@
   "overview.appInfo.embedded.copy": "Скопіювати",
   "overview.appInfo.embedded.entry": "Вбудоване",
   "overview.appInfo.embedded.explanation": "Виберіть спосіб вбудування чат-додатка на ваш веб-сайт",
+  "overview.appInfo.embedded.hiddenInputs.description": "Введіть значення для прихованих полів. Значення додаються до URL iframe або об'єкта inputs скрипта.",
+  "overview.appInfo.embedded.hiddenInputs.title": "Попередньо заповнити приховані поля",
   "overview.appInfo.embedded.iframe": "Для додавання чат-додатка в будь-яке місце на вашому веб-сайті, додайте цей iframe до вашого HTML-коду.",
   "overview.appInfo.embedded.scripts": "Для додавання чат-додатка в правий нижній кут вашого веб-сайту додайте цей код до вашого HTML.",
   "overview.appInfo.embedded.title": "Вбудувати на веб-сайт",
@@ -104,6 +106,8 @@
   "overview.appInfo.settings.workflow.subTitle": "Деталі робочого процесу",
   "overview.appInfo.settings.workflow.title": "Кроки робочого процесу",
   "overview.appInfo.title": "Веб-додаток",
+  "overview.appInfo.workflowLaunchHiddenInputs.description": "Введіть значення для прихованих полів, а потім натисніть <bold>Запустити</bold>, щоб відкрити WebApp із введеними значеннями.",
+  "overview.appInfo.workflowLaunchHiddenInputs.title": "Попередньо заповнити приховані поля",
   "overview.disableTooltip.triggerMode": "Функція {{feature}} не підтримується в режимі вузла тригера.",
   "overview.status.disable": "Вимкнути",
   "overview.status.running": "У роботі",
diff --git a/web/i18n/uk-UA/common.json b/web/i18n/uk-UA/common.json
index e3892099d6..2af2e5477e 100644
--- a/web/i18n/uk-UA/common.json
+++ b/web/i18n/uk-UA/common.json
@@ -101,6 +101,7 @@
   "appModes.completionApp": "Генератор тексту",
   "avatar.deleteDescription": "Ви впевнені, що хочете видалити своє фото профілю? Ваш обліковий запис використовуватиме стандартний початковий аватар.",
   "avatar.deleteTitle": "Видалити аватар",
+  "avatar.editAction": "Редагувати аватар",
   "chat.citation.characters": "Символів:",
   "chat.citation.hitCount": "Кількість звернень:",
   "chat.citation.hitScore": "Оцінка звернення:",
diff --git a/web/i18n/uk-UA/education.json b/web/i18n/uk-UA/education.json
index 0564552f6d..6cfa324666 100644
--- a/web/i18n/uk-UA/education.json
+++ b/web/i18n/uk-UA/education.json
@@ -1,5 +1,25 @@
 {
+  "applied.activeSubscription.description": "У вас є активна підписка. Ви можете скористатися освітньою знижкою після закінчення терміну дії підписки. Підтвердіть підписку в <stripeLink>Stripe</stripeLink>.",
+  "applied.description": "Вітаємо! Ви успішно подали заявку на освітню знижку.",
+  "applied.noPaymentPermission.description": "У вас немає прав на оплату в цьому робочому просторі. Будь ласка, перейдіть до робочого простору, де ви можете керувати платіжними даними, щоб скористатися освітньою знижкою.",
+  "applied.noPaymentPermission.returnHome": "Повернутися до Dify",
+  "applied.step1.description": "Ви успішно подали заявку на освітню знижку.",
+  "applied.step1.title": "Крок 1",
+  "applied.step2.description": "Виберіть робочий простір, який ви хочете використовувати з освітньою знижкою.",
+  "applied.step2.title": "Крок 2",
+  "applied.tabs.activeSubscription": "У підписці",
+  "applied.tabs.eligible": "Можна купити",
+  "applied.tabs.noPaymentPermission": "Немає прав на оплату",
+  "applied.title": "Освітню знижку застосовано",
+  "applied.workspace.plan": "Платний план",
+  "applied.workspace.title": "Поточний робочий простір",
   "currentSigned": "В даний момент ви підписані як",
+  "educationPricingConfirm.billingPeriod.monthly": "щомісячно",
+  "educationPricingConfirm.billingPeriod.yearly": "щорічно",
+  "educationPricingConfirm.cancel": "Залишити поточний план",
+  "educationPricingConfirm.continue": "Перейти на Professional річний",
+  "educationPricingConfirm.description": "Освітня знижка застосовується лише до річного плану Professional. Якщо залишити поточний план, знижку не буде включено.",
+  "educationPricingConfirm.title": "Вибраний план не підтримує освітню знижку",
   "emailLabel": "Ваш поточний електронний лист",
   "form.schoolName.placeholder": "Введіть офіційну, повну назву вашої школи",
   "form.schoolName.title": "Ваша назва школи",
@@ -31,6 +51,7 @@
   "notice.stillInEducation.expired": "Перевірте ще раз зараз, щоб отримати новий купон на наступний навчальний рік. Ми додамо його до вашого облікового запису, і ви зможете скористатися ним для наступного оновлення.",
   "notice.stillInEducation.isAboutToExpire": "Перевірте ще раз зараз, щоб отримати новий купон на наступний навчальний рік. Він буде збережений у вашому обліковому записі та готовий до використання при наступному поновленні.",
   "notice.stillInEducation.title": "Все ще навчаєшся?",
+  "planNotSupportEducationDiscount": "Не підходить для освітньої ціни",
   "rejectContent": "На жаль, ви не відповідаєте вимогам для статусу Education Verified і тому не можете отримати ексклюзивний купон на 100% для професійного плану Dify, якщо використовуєте цю електронну адресу.",
   "rejectTitle": "Ваша перевірка освіти Dify була відхилена",
   "submit": "Надіслати",
@@ -40,5 +61,6 @@
   "toVerified": "Отримайте підтвердження освіти",
   "toVerifiedTip.coupon": "ексклюзивний купон 100%",
   "toVerifiedTip.end": "для професійного плану Dify.",
-  "toVerifiedTip.front": "Ви тепер маєте право на статус перевіреної освіти. Будь ласка, введіть свою інформацію про освіту нижче, щоб завершити процес і отримати"
+  "toVerifiedTip.front": "Ви тепер маєте право на статус перевіреної освіти. Будь ласка, введіть свою інформацію про освіту нижче, щоб завершити процес і отримати",
+  "useEducationDiscount": "Використати освітню знижку"
 }
diff --git a/web/i18n/uk-UA/workflow.json b/web/i18n/uk-UA/workflow.json
index 44d527618e..6fe9e4672f 100644
--- a/web/i18n/uk-UA/workflow.json
+++ b/web/i18n/uk-UA/workflow.json
@@ -646,12 +646,12 @@
   "nodes.humanInput.userActions.actionIdFormatTip": "Ідентифікатор дії повинен починатися з літери або підкреслення, за яким слідують літери, цифри або підкреслення",
   "nodes.humanInput.userActions.actionIdTooLong": "Ідентифікатор дії повинен містити не більше {{maxLength}} символів",
   "nodes.humanInput.userActions.actionNamePlaceholder": "Назва дії",
-  "nodes.humanInput.userActions.buttonTextPlaceholder": "Текст кнопки для відображення",
+  "nodes.humanInput.userActions.buttonTextPlaceholder": "Значення дії",
   "nodes.humanInput.userActions.buttonTextTooLong": "Текст кнопки повинен містити не більше {{maxLength}} символів",
   "nodes.humanInput.userActions.chooseStyle": "Виберіть стиль кнопки",
   "nodes.humanInput.userActions.emptyTip": "Натисніть кнопку '+' для додавання дій користувача",
   "nodes.humanInput.userActions.title": "Дії користувача",
-  "nodes.humanInput.userActions.tooltip": "Визначте кнопки, на які користувачі можуть натискати, щоб відповісти на цю форму. Кожна кнопка може запускати різні шляхи робочого процесу. Ідентифікатор дії повинен починатися з літери або підкреслення, за яким слідують літери, цифри або підкреслення.",
+  "nodes.humanInput.userActions.tooltip": "Визначте кнопки, на які користувачі можуть натискати, щоб відповісти на цю форму. Ідентифікатор дії контролює розгалуження. Значення дії відкривається нижче за потоком як вибраний вбудований вивід. Ідентифікатор дії повинен починатися з літери або підкреслення, за яким слідують літери, цифри або підкреслення.",
   "nodes.humanInput.userActions.triggered": "<strong>{{actionName}}</strong> було запущено",
   "nodes.ifElse.addCondition": "Додати умову",
   "nodes.ifElse.addSubVariable": "Підзмінна",
@@ -897,13 +897,17 @@
   "nodes.questionClassifiers.advancedSetting": "Розширене налаштування",
   "nodes.questionClassifiers.class": "Клас",
   "nodes.questionClassifiers.classNamePlaceholder": "Напишіть назву вашого класу",
+  "nodes.questionClassifiers.defaultLabel": "КЛАС {{index}}",
   "nodes.questionClassifiers.inputVars": "Вхідні змінні",
   "nodes.questionClassifiers.instruction": "Інструкція",
   "nodes.questionClassifiers.instructionPlaceholder": "Напишіть вашу інструкцію",
   "nodes.questionClassifiers.instructionTip": "Введіть додаткові інструкції, щоб допомогти класифікатору запитань краще зрозуміти, як категоризувати запитання.",
+  "nodes.questionClassifiers.labelEditorAriaLabel": "Редактор мітки класу",
   "nodes.questionClassifiers.model": "модель",
+  "nodes.questionClassifiers.outputVars.classLabel": "Мітка класу",
   "nodes.questionClassifiers.outputVars.className": "Назва класу",
   "nodes.questionClassifiers.outputVars.usage": "Інформація про використання моделі",
+  "nodes.questionClassifiers.renameHint": "Двічі клацніть заголовок класу, щоб перейменувати",
   "nodes.questionClassifiers.topicName": "Назва теми",
   "nodes.questionClassifiers.topicPlaceholder": "Напишіть назву вашої теми",
   "nodes.start.builtInVar": "Вбудовані змінні",
diff --git a/web/i18n/vi-VN/app-debug.json b/web/i18n/vi-VN/app-debug.json
index 96e7ecc49c..3168648153 100644
--- a/web/i18n/vi-VN/app-debug.json
+++ b/web/i18n/vi-VN/app-debug.json
@@ -337,6 +337,8 @@
   "variableConfig.file.image.name": "Ảnh",
   "variableConfig.file.supportFileTypes": "Các loại tệp hỗ trợ",
   "variableConfig.file.video.name": "Video",
+  "variableConfig.hidden": "Ẩn và điền sẵn",
+  "variableConfig.hiddenDescription": "Ẩn trường này khỏi người dùng cuối và tự cung cấp giá trị. Loại trừ lẫn nhau với Bắt buộc. <docLink>Tìm hiểu thêm</docLink>",
   "variableConfig.hide": "Ẩn",
   "variableConfig.inputPlaceholder": "Vui lòng nhập",
   "variableConfig.json": "Mã JSON",
diff --git a/web/i18n/vi-VN/app-overview.json b/web/i18n/vi-VN/app-overview.json
index 1e18b24a2d..c282758e18 100644
--- a/web/i18n/vi-VN/app-overview.json
+++ b/web/i18n/vi-VN/app-overview.json
@@ -56,6 +56,8 @@
   "overview.appInfo.embedded.copy": "Sao chép",
   "overview.appInfo.embedded.entry": "Nhúng",
   "overview.appInfo.embedded.explanation": "Chọn cách nhúng ứng dụng trò chuyện vào trang web của bạn",
+  "overview.appInfo.embedded.hiddenInputs.description": "Nhập giá trị cho các trường ẩn. Các giá trị được thêm vào URL iframe hoặc đối tượng inputs của script.",
+  "overview.appInfo.embedded.hiddenInputs.title": "Điền sẵn trường ẩn",
   "overview.appInfo.embedded.iframe": "Để thêm ứng dụng trò chuyện vào bất kỳ đâu trên trang web của bạn, hãy thêm iframe này vào mã HTML của bạn.",
   "overview.appInfo.embedded.scripts": "Để thêm ứng dụng trò chuyện vào góc dưới bên phải của trang web, thêm mã này vào mã HTML của bạn.",
   "overview.appInfo.embedded.title": "Nhúng vào trang web",
@@ -104,6 +106,8 @@
   "overview.appInfo.settings.workflow.subTitle": "Chi tiết quy trình làm việc",
   "overview.appInfo.settings.workflow.title": "Các bước quy trình",
   "overview.appInfo.title": "Ứng dụng web",
+  "overview.appInfo.workflowLaunchHiddenInputs.description": "Nhập giá trị cho các trường ẩn, sau đó nhấp <bold>Khởi chạy</bold> để mở WebApp với các giá trị đó.",
+  "overview.appInfo.workflowLaunchHiddenInputs.title": "Điền sẵn trường ẩn",
   "overview.disableTooltip.triggerMode": "Tính năng {{feature}} không được hỗ trợ trong chế độ Nút Kích hoạt.",
   "overview.status.disable": "Đã tắt",
   "overview.status.running": "Đang hoạt động",
diff --git a/web/i18n/vi-VN/common.json b/web/i18n/vi-VN/common.json
index cd8e9dd6fb..dd3cd38f28 100644
--- a/web/i18n/vi-VN/common.json
+++ b/web/i18n/vi-VN/common.json
@@ -101,6 +101,7 @@
   "appModes.completionApp": "Ứng dụng Tạo văn bản",
   "avatar.deleteDescription": "Bạn có chắc chắn muốn xóa ảnh đại diện của mình không? Tài khoản của bạn sẽ sử dụng avatar mặc định.",
   "avatar.deleteTitle": "Xóa Ảnh Đại Diện",
+  "avatar.editAction": "Chỉnh Sửa Ảnh Đại Diện",
   "chat.citation.characters": "Ký tự:",
   "chat.citation.hitCount": "Số lượt truy xuất:",
   "chat.citation.hitScore": "Điểm truy xuất:",
diff --git a/web/i18n/vi-VN/education.json b/web/i18n/vi-VN/education.json
index ac5b249928..65429bcd8a 100644
--- a/web/i18n/vi-VN/education.json
+++ b/web/i18n/vi-VN/education.json
@@ -1,5 +1,25 @@
 {
+  "applied.activeSubscription.description": "Bạn có một gói đăng ký đang hoạt động. Bạn có thể sử dụng giảm giá giáo dục sau khi gói đăng ký hết hạn. Xác nhận gói đăng ký của bạn trên <stripeLink>Stripe</stripeLink>.",
+  "applied.description": "Chúc mừng! Bạn đã đăng ký giảm giá giáo dục thành công.",
+  "applied.noPaymentPermission.description": "Bạn không có quyền thanh toán trong workspace này. Vui lòng chuyển sang workspace mà bạn có thể quản lý thanh toán để sử dụng giảm giá giáo dục.",
+  "applied.noPaymentPermission.returnHome": "Quay lại Dify",
+  "applied.step1.description": "Bạn đã đăng ký giảm giá giáo dục thành công.",
+  "applied.step1.title": "Bước 1",
+  "applied.step2.description": "Chọn workspace bạn muốn sử dụng với giảm giá giáo dục.",
+  "applied.step2.title": "Bước 2",
+  "applied.tabs.activeSubscription": "Đang đăng ký",
+  "applied.tabs.eligible": "Có thể mua",
+  "applied.tabs.noPaymentPermission": "Không có quyền thanh toán",
+  "applied.title": "Giảm giá giáo dục đã áp dụng",
+  "applied.workspace.plan": "Gói trả phí",
+  "applied.workspace.title": "Workspace hiện tại",
   "currentSigned": "HIỆN ĐANG ĐĂNG NHẬP VÀO",
+  "educationPricingConfirm.billingPeriod.monthly": "hàng tháng",
+  "educationPricingConfirm.billingPeriod.yearly": "hàng năm",
+  "educationPricingConfirm.cancel": "Giữ gói hiện tại",
+  "educationPricingConfirm.continue": "Chuyển sang Professional hằng năm",
+  "educationPricingConfirm.description": "Giảm giá giáo dục chỉ áp dụng cho gói Professional hằng năm. Nếu giữ gói hiện tại, giảm giá sẽ không được áp dụng.",
+  "educationPricingConfirm.title": "Gói bạn chọn không hỗ trợ giảm giá giáo dục",
   "emailLabel": "Email hiện tại của bạn",
   "form.schoolName.placeholder": "Nhập tên chính thức, không viết tắt của trường bạn",
   "form.schoolName.title": "Tên Trường Của Bạn",
@@ -31,6 +51,7 @@
   "notice.stillInEducation.expired": "Xác minh lại ngay bây giờ để nhận một phiếu giảm giá mới cho năm học sắp tới. Chúng tôi sẽ thêm nó vào tài khoản của bạn và bạn có thể sử dụng nó cho lần nâng cấp tiếp theo.",
   "notice.stillInEducation.isAboutToExpire": "Xác minh lại ngay bây giờ để nhận một phiếu giảm giá mới cho năm học sắp tới. Nó sẽ được lưu vào tài khoản của bạn và sẵn sàng sử dụng khi bạn gia hạn tiếp theo.",
   "notice.stillInEducation.title": "Vẫn đang học tập?",
+  "planNotSupportEducationDiscount": "Không đủ điều kiện cho giá giáo dục",
   "rejectContent": "Rất tiếc, bạn không đủ điều kiện để nhận trạng thái Xác minh Giáo dục và do đó không thể nhận được mã giảm giá độc quyền 100% cho Kế hoạch Chuyên nghiệp Dify nếu bạn sử dụng địa chỉ email này.",
   "rejectTitle": "Yêu cầu xác minh giáo dục Dify của bạn đã bị từ chối",
   "submit": "Gửi",
@@ -40,5 +61,6 @@
   "toVerified": "Xác thực giáo dục",
   "toVerifiedTip.coupon": "mã giảm giá độc quyền 100%",
   "toVerifiedTip.end": "cho Kế hoạch Chuyên nghiệp Dify.",
-  "toVerifiedTip.front": "Bạn hiện đủ điều kiện để có trạng thái Xác minh Giáo dục. Vui lòng nhập thông tin giáo dục của bạn bên dưới để hoàn tất quá trình và nhận một"
+  "toVerifiedTip.front": "Bạn hiện đủ điều kiện để có trạng thái Xác minh Giáo dục. Vui lòng nhập thông tin giáo dục của bạn bên dưới để hoàn tất quá trình và nhận một",
+  "useEducationDiscount": "Sử dụng giảm giá giáo dục"
 }
diff --git a/web/i18n/vi-VN/workflow.json b/web/i18n/vi-VN/workflow.json
index 231c01bc82..bbaccec6c6 100644
--- a/web/i18n/vi-VN/workflow.json
+++ b/web/i18n/vi-VN/workflow.json
@@ -646,12 +646,12 @@
   "nodes.humanInput.userActions.actionIdFormatTip": "ID hành động phải bắt đầu bằng chữ cái hoặc dấu gạch dưới, theo sau là chữ cái, số hoặc dấu gạch dưới",
   "nodes.humanInput.userActions.actionIdTooLong": "ID hành động phải có {{maxLength}} ký tự trở xuống",
   "nodes.humanInput.userActions.actionNamePlaceholder": "Tên Hành động",
-  "nodes.humanInput.userActions.buttonTextPlaceholder": "Văn bản Hiển thị Nút",
+  "nodes.humanInput.userActions.buttonTextPlaceholder": "Giá trị Hành động",
   "nodes.humanInput.userActions.buttonTextTooLong": "Văn bản nút phải có {{maxLength}} ký tự trở xuống",
   "nodes.humanInput.userActions.chooseStyle": "Chọn kiểu nút",
   "nodes.humanInput.userActions.emptyTip": "Nhấp vào nút '+' để thêm hành động người dùng",
   "nodes.humanInput.userActions.title": "Hành động Người dùng",
-  "nodes.humanInput.userActions.tooltip": "Xác định các nút mà người dùng có thể nhấp để phản hồi biểu mẫu này. Mỗi nút có thể kích hoạt các đường dẫn quy trình làm việc khác nhau. ID hành động phải bắt đầu bằng chữ cái hoặc dấu gạch dưới, theo sau là chữ cái, số hoặc dấu gạch dưới.",
+  "nodes.humanInput.userActions.tooltip": "Xác định các nút mà người dùng có thể nhấp để phản hồi biểu mẫu này. ID hành động kiểm soát việc phân nhánh. Giá trị Hành động được hiển thị ở phía sau như là đầu ra tích hợp được chọn. ID hành động phải bắt đầu bằng chữ cái hoặc dấu gạch dưới, theo sau là chữ cái, số hoặc dấu gạch dưới.",
   "nodes.humanInput.userActions.triggered": "<strong>{{actionName}}</strong> đã được kích hoạt",
   "nodes.ifElse.addCondition": "Thêm điều kiện",
   "nodes.ifElse.addSubVariable": "Biến phụ",
@@ -897,13 +897,17 @@
   "nodes.questionClassifiers.advancedSetting": "Cài đặt nâng cao",
   "nodes.questionClassifiers.class": "Lớp",
   "nodes.questionClassifiers.classNamePlaceholder": "Viết tên lớp của bạn",
+  "nodes.questionClassifiers.defaultLabel": "LỚP {{index}}",
   "nodes.questionClassifiers.inputVars": "Biến đầu vào",
   "nodes.questionClassifiers.instruction": "Hướng dẫn",
   "nodes.questionClassifiers.instructionPlaceholder": "Viết hướng dẫn của bạn",
   "nodes.questionClassifiers.instructionTip": "Nhập hướng dẫn bổ sung để giúp trình phân loại câu hỏi hiểu rõ hơn về cách phân loại câu hỏi.",
+  "nodes.questionClassifiers.labelEditorAriaLabel": "Trình chỉnh sửa nhãn lớp",
   "nodes.questionClassifiers.model": "mô hình",
+  "nodes.questionClassifiers.outputVars.classLabel": "Nhãn lớp",
   "nodes.questionClassifiers.outputVars.className": "Tên lớp",
   "nodes.questionClassifiers.outputVars.usage": "Thông tin sử dụng mô hình",
+  "nodes.questionClassifiers.renameHint": "Nhấp đúp vào tiêu đề lớp để đổi tên",
   "nodes.questionClassifiers.topicName": "Tên chủ đề",
   "nodes.questionClassifiers.topicPlaceholder": "Viết tên chủ đề của bạn",
   "nodes.start.builtInVar": "Biến tích hợp sẵn",
diff --git a/web/i18n/zh-Hans/app-debug.json b/web/i18n/zh-Hans/app-debug.json
index d44af6754a..e9eec99bd9 100644
--- a/web/i18n/zh-Hans/app-debug.json
+++ b/web/i18n/zh-Hans/app-debug.json
@@ -337,6 +337,8 @@
   "variableConfig.file.image.name": "图片",
   "variableConfig.file.supportFileTypes": "支持的文件类型",
   "variableConfig.file.video.name": "视频",
+  "variableConfig.hidden": "隐藏并预填",
+  "variableConfig.hiddenDescription": "对终端用户隐藏此字段，并由你预填字段值。与 必填 互斥。<docLink>了解更多</docLink>",
   "variableConfig.hide": "隐藏",
   "variableConfig.inputPlaceholder": "请输入",
   "variableConfig.json": "JSON",
diff --git a/web/i18n/zh-Hans/app-overview.json b/web/i18n/zh-Hans/app-overview.json
index 03a26cb32c..e4d410ad2e 100644
--- a/web/i18n/zh-Hans/app-overview.json
+++ b/web/i18n/zh-Hans/app-overview.json
@@ -56,6 +56,8 @@
   "overview.appInfo.embedded.copy": "复制",
   "overview.appInfo.embedded.entry": "嵌入",
   "overview.appInfo.embedded.explanation": "选择一种方式将聊天应用嵌入到你的网站中",
+  "overview.appInfo.embedded.hiddenInputs.description": "为隐藏字段输入值。这些值将被添加到 iframe URL 或嵌入脚本的 inputs 对象中。",
+  "overview.appInfo.embedded.hiddenInputs.title": "预填隐藏字段",
   "overview.appInfo.embedded.iframe": "将以下 iframe 嵌入到你的网站中的目标位置",
   "overview.appInfo.embedded.scripts": "将以下代码嵌入到你的网站中",
   "overview.appInfo.embedded.title": "嵌入到网站中",
@@ -104,6 +106,8 @@
   "overview.appInfo.settings.workflow.subTitle": "工作流详情",
   "overview.appInfo.settings.workflow.title": "工作流",
   "overview.appInfo.title": "Web App",
+  "overview.appInfo.workflowLaunchHiddenInputs.description": "为隐藏字段输入值后，点击 <bold>启动</bold> 即可打开已应用这些值的 WebApp。",
+  "overview.appInfo.workflowLaunchHiddenInputs.title": "预填隐藏字段",
   "overview.disableTooltip.triggerMode": "触发节点模式下不支持{{feature}}功能。",
   "overview.status.disable": "已停用",
   "overview.status.running": "运行中",
diff --git a/web/i18n/zh-Hans/common.json b/web/i18n/zh-Hans/common.json
index b2f0cb8bd5..bf136f359e 100644
--- a/web/i18n/zh-Hans/common.json
+++ b/web/i18n/zh-Hans/common.json
@@ -102,6 +102,7 @@
   "appModes.completionApp": "文本生成型应用",
   "avatar.deleteDescription": "确定要删除你的个人头像吗？你的账号将使用默认的首字母头像。",
   "avatar.deleteTitle": "删除头像",
+  "avatar.editAction": "编辑头像",
   "chat.citation.characters": "字符：",
   "chat.citation.hitCount": "召回次数：",
   "chat.citation.hitScore": "召回得分：",
diff --git a/web/i18n/zh-Hans/education.json b/web/i18n/zh-Hans/education.json
index 7fa38cd82e..f82c9b3405 100644
--- a/web/i18n/zh-Hans/education.json
+++ b/web/i18n/zh-Hans/education.json
@@ -1,5 +1,25 @@
 {
+  "applied.activeSubscription.description": "你当前有生效中的订阅。订阅到期后即可使用教育优惠。请前往 <stripeLink>Stripe</stripeLink> 确认你的订阅。",
+  "applied.description": "您已成功申请教育优惠。",
+  "applied.noPaymentPermission.description": "你没有此工作空间的付款权限。请切换到你可以管理账单的工作空间，以使用教育优惠。",
+  "applied.noPaymentPermission.returnHome": "返回 Dify",
+  "applied.step1.description": "您已成功申请教育优惠。",
+  "applied.step1.title": "第一步",
+  "applied.step2.description": "选择要使用教育优惠的 workspace。",
+  "applied.step2.title": "第二步",
+  "applied.tabs.activeSubscription": "在订阅中",
+  "applied.tabs.eligible": "能买",
+  "applied.tabs.noPaymentPermission": "无付款权限",
+  "applied.title": "教育优惠申请成功",
+  "applied.workspace.plan": "付费计划",
+  "applied.workspace.title": "当前 Workspace",
   "currentSigned": "您当前登录的账户是",
+  "educationPricingConfirm.billingPeriod.monthly": "月付",
+  "educationPricingConfirm.billingPeriod.yearly": "年付",
+  "educationPricingConfirm.cancel": "保留当前计划",
+  "educationPricingConfirm.continue": "切换到 Professional 年付",
+  "educationPricingConfirm.description": "教育优惠仅适用于 Professional 年付计划。保留当前计划将不包含该优惠。",
+  "educationPricingConfirm.title": "你选择的计划不支持教育优惠",
   "emailLabel": "您当前的邮箱",
   "form.schoolName.placeholder": "请输入您的学校的官方全称（不得缩写）",
   "form.schoolName.title": "您的学校名称",
@@ -31,6 +51,7 @@
   "notice.stillInEducation.expired": "立即重新认证，获取新学年的教育优惠券。优惠券将发放至您的账户，并可在下次升级时使用。",
   "notice.stillInEducation.isAboutToExpire": "立即重新验证，获取新学年的教育优惠券。优惠券将发放至您的账户，并可在下次续订时使用。",
   "notice.stillInEducation.title": "仍在就读？",
+  "planNotSupportEducationDiscount": "不适用教育优惠价格",
   "rejectContent": "非常遗憾，您无法使用此电子邮件以获得教育版认证资格，也无法领取 Dify Professional 版的 100% 独家优惠券。",
   "rejectTitle": "您的 Dify 教育版认证已被拒绝",
   "submit": "提交",
@@ -40,5 +61,6 @@
   "toVerified": "获取教育版认证",
   "toVerifiedTip.coupon": "100% 独家优惠券",
   "toVerifiedTip.end": "。",
-  "toVerifiedTip.front": "您现在符合教育版认证的资格。请在下方输入您的教育信息，以完成认证流程，并领取 Dify  Professional 版的"
+  "toVerifiedTip.front": "您现在符合教育版认证的资格。请在下方输入您的教育信息，以完成认证流程，并领取 Dify  Professional 版的",
+  "useEducationDiscount": "使用教育优惠"
 }
diff --git a/web/i18n/zh-Hans/workflow.json b/web/i18n/zh-Hans/workflow.json
index 51734ae1bd..3df23a0a05 100644
--- a/web/i18n/zh-Hans/workflow.json
+++ b/web/i18n/zh-Hans/workflow.json
@@ -663,12 +663,12 @@
   "nodes.humanInput.userActions.actionIdFormatTip": "操作 ID 必须以字母或下划线开头，后跟字母、数字或下划线",
   "nodes.humanInput.userActions.actionIdTooLong": "操作 ID 不能超过 {{maxLength}} 个字符",
   "nodes.humanInput.userActions.actionNamePlaceholder": "操作名称",
-  "nodes.humanInput.userActions.buttonTextPlaceholder": "按钮显示文本",
+  "nodes.humanInput.userActions.buttonTextPlaceholder": "操作值",
   "nodes.humanInput.userActions.buttonTextTooLong": "按钮文本不能超过 {{maxLength}} 个字符",
   "nodes.humanInput.userActions.chooseStyle": "选择按钮样式",
   "nodes.humanInput.userActions.emptyTip": "点击 '+' 按钮添加用户操作",
   "nodes.humanInput.userActions.title": "用户操作",
-  "nodes.humanInput.userActions.tooltip": "定义用户可以点击以响应此表单的按钮。每个按钮都可以触发不同的工作流路径。操作 ID 必须以字母或下划线开头，后跟字母、数字或下划线。",
+  "nodes.humanInput.userActions.tooltip": "定义用户可以点击以响应此表单的按钮。操作 ID 控制分支。操作值作为所选内置输出在下游公开。操作 ID 必须以字母或下划线开头，后跟字母、数字或下划线。",
   "nodes.humanInput.userActions.triggered": "已触发<strong>{{actionName}}</strong>",
   "nodes.ifElse.addCondition": "添加条件",
   "nodes.ifElse.addSubVariable": "添加子变量",
@@ -914,13 +914,17 @@
   "nodes.questionClassifiers.advancedSetting": "高级设置",
   "nodes.questionClassifiers.class": "分类",
   "nodes.questionClassifiers.classNamePlaceholder": "输入你的分类名称",
+  "nodes.questionClassifiers.defaultLabel": "分类 {{index}}",
   "nodes.questionClassifiers.inputVars": "输入变量",
   "nodes.questionClassifiers.instruction": "指令",
   "nodes.questionClassifiers.instructionPlaceholder": "在这里输入你的指令",
   "nodes.questionClassifiers.instructionTip": "你可以输入额外的附加指令，帮助问题分类器更好的理解如何分类",
+  "nodes.questionClassifiers.labelEditorAriaLabel": "分类标签编辑器",
   "nodes.questionClassifiers.model": "模型",
+  "nodes.questionClassifiers.outputVars.classLabel": "分类标签",
   "nodes.questionClassifiers.outputVars.className": "分类名称",
   "nodes.questionClassifiers.outputVars.usage": "模型用量信息",
+  "nodes.questionClassifiers.renameHint": "双击分类标题以重命名",
   "nodes.questionClassifiers.topicName": "主题内容",
   "nodes.questionClassifiers.topicPlaceholder": "在这里输入你的主题内容",
   "nodes.start.builtInVar": "内置变量",
diff --git a/web/i18n/zh-Hant/app-debug.json b/web/i18n/zh-Hant/app-debug.json
index 69ebfa71c1..35bb03dc96 100644
--- a/web/i18n/zh-Hant/app-debug.json
+++ b/web/i18n/zh-Hant/app-debug.json
@@ -337,6 +337,8 @@
   "variableConfig.file.image.name": "圖像",
   "variableConfig.file.supportFileTypes": "支援檔案類型",
   "variableConfig.file.video.name": "視頻",
+  "variableConfig.hidden": "隱藏並預填",
+  "variableConfig.hiddenDescription": "對終端用戶隱藏此欄位，並由你預填欄位值。與 必填 互斥。<docLink>了解更多</docLink>",
   "variableConfig.hide": "隱藏",
   "variableConfig.inputPlaceholder": "請輸入",
   "variableConfig.json": "JSON 代碼",
diff --git a/web/i18n/zh-Hant/app-overview.json b/web/i18n/zh-Hant/app-overview.json
index ccbdb86f19..fcd3569428 100644
--- a/web/i18n/zh-Hant/app-overview.json
+++ b/web/i18n/zh-Hant/app-overview.json
@@ -56,6 +56,8 @@
   "overview.appInfo.embedded.copy": "複製",
   "overview.appInfo.embedded.entry": "嵌入",
   "overview.appInfo.embedded.explanation": "選擇一種方式將聊天應用嵌入到你的網站中",
+  "overview.appInfo.embedded.hiddenInputs.description": "輸入隱藏欄位的值。這些值將被新增至 iframe URL 或嵌入腳本的 inputs 物件中。",
+  "overview.appInfo.embedded.hiddenInputs.title": "預填隱藏欄位",
   "overview.appInfo.embedded.iframe": "將以下 iframe 嵌入到你的網站中的目標位置",
   "overview.appInfo.embedded.scripts": "將以下程式碼嵌入到你的網站中",
   "overview.appInfo.embedded.title": "嵌入到網站中",
@@ -104,6 +106,8 @@
   "overview.appInfo.settings.workflow.subTitle": "工作流詳細資訊",
   "overview.appInfo.settings.workflow.title": "工作流程步驟",
   "overview.appInfo.title": "網頁應用程式",
+  "overview.appInfo.workflowLaunchHiddenInputs.description": "輸入隱藏欄位的值後，點擊 <bold>啟動</bold> 以使用這些值開啟 WebApp。",
+  "overview.appInfo.workflowLaunchHiddenInputs.title": "預填隱藏欄位",
   "overview.disableTooltip.triggerMode": "觸發節點模式不支援 {{feature}} 功能。",
   "overview.status.disable": "已停用",
   "overview.status.running": "執行中",
diff --git a/web/i18n/zh-Hant/common.json b/web/i18n/zh-Hant/common.json
index e6ee39bc47..64b4b55acf 100644
--- a/web/i18n/zh-Hant/common.json
+++ b/web/i18n/zh-Hant/common.json
@@ -101,6 +101,7 @@
   "appModes.completionApp": "文字生成型應用",
   "avatar.deleteDescription": "您確定要刪除您的個人資料照片嗎？您的帳戶將使用默認的初始頭像。",
   "avatar.deleteTitle": "移除頭像",
+  "avatar.editAction": "編輯頭像",
   "chat.citation.characters": "字元：",
   "chat.citation.hitCount": "檢索次數：",
   "chat.citation.hitScore": "檢索得分：",
diff --git a/web/i18n/zh-Hant/education.json b/web/i18n/zh-Hant/education.json
index 4324e7dd86..76ce672e14 100644
--- a/web/i18n/zh-Hant/education.json
+++ b/web/i18n/zh-Hant/education.json
@@ -1,5 +1,25 @@
 {
+  "applied.activeSubscription.description": "你目前有生效中的訂閱。訂閱到期後即可使用教育優惠。請前往 <stripeLink>Stripe</stripeLink> 確認你的訂閱。",
+  "applied.description": "恭喜！您已成功申請教育優惠。",
+  "applied.noPaymentPermission.description": "你沒有此工作空間的付款權限。請切換到你可以管理帳單的工作空間，以使用教育優惠。",
+  "applied.noPaymentPermission.returnHome": "返回 Dify",
+  "applied.step1.description": "您已成功申請教育優惠。",
+  "applied.step1.title": "第一步",
+  "applied.step2.description": "選擇要使用教育優惠的 workspace。",
+  "applied.step2.title": "第二步",
+  "applied.tabs.activeSubscription": "在訂閱中",
+  "applied.tabs.eligible": "能買",
+  "applied.tabs.noPaymentPermission": "無付款權限",
+  "applied.title": "教育優惠申請成功",
+  "applied.workspace.plan": "付費方案",
+  "applied.workspace.title": "目前 Workspace",
   "currentSigned": "當前以以下身份登入",
+  "educationPricingConfirm.billingPeriod.monthly": "月付",
+  "educationPricingConfirm.billingPeriod.yearly": "年付",
+  "educationPricingConfirm.cancel": "保留目前方案",
+  "educationPricingConfirm.continue": "切換到 Professional 年付",
+  "educationPricingConfirm.description": "教育優惠僅適用於 Professional 年付方案。保留目前方案將不包含此優惠。",
+  "educationPricingConfirm.title": "你選擇的方案不支援教育優惠",
   "emailLabel": "您當前的電子郵件",
   "form.schoolName.placeholder": "請輸入您學校的正式全名",
   "form.schoolName.title": "你的學校名稱",
@@ -31,6 +51,7 @@
   "notice.stillInEducation.expired": "立即重新驗證，以獲得即將到來的學年新優惠券。我們會將其新增到您的帳戶中，您可以用於下一次升級。",
   "notice.stillInEducation.isAboutToExpire": "現在重新驗證以獲得即將到來的學年新優惠券。它將保存在您的帳戶中，並在下次續訂時隨時可以使用。",
   "notice.stillInEducation.title": "仍在接受教育嗎？",
+  "planNotSupportEducationDiscount": "不適用教育優惠價格",
   "rejectContent": "不幸的是，您不符合教育驗證狀態，因此如果您使用此電子郵件地址，將無法獲得 Dify 專業計劃的 100% 獨家優惠券。",
   "rejectTitle": "您的 Dify 教育驗證已被拒絕",
   "submit": "提交",
@@ -40,5 +61,6 @@
   "toVerified": "獲取教育證明",
   "toVerifiedTip.coupon": "獨家 100% 優惠券",
   "toVerifiedTip.end": "用於 Dify 專業計劃。",
-  "toVerifiedTip.front": "您現在符合教育驗證狀態的資格。請在下面輸入您的教育資訊以完成此流程並獲得一個"
+  "toVerifiedTip.front": "您現在符合教育驗證狀態的資格。請在下面輸入您的教育資訊以完成此流程並獲得一個",
+  "useEducationDiscount": "使用教育優惠"
 }
diff --git a/web/i18n/zh-Hant/workflow.json b/web/i18n/zh-Hant/workflow.json
index 9d296250db..bd7e1b20d1 100644
--- a/web/i18n/zh-Hant/workflow.json
+++ b/web/i18n/zh-Hant/workflow.json
@@ -646,12 +646,12 @@
   "nodes.humanInput.userActions.actionIdFormatTip": "操作 ID 必須以字母或下劃線開頭,後跟字母、數字或下劃線",
   "nodes.humanInput.userActions.actionIdTooLong": "操作 ID 不能超過{{maxLength}}個字符",
   "nodes.humanInput.userActions.actionNamePlaceholder": "操作名稱",
-  "nodes.humanInput.userActions.buttonTextPlaceholder": "按鈕顯示文本",
+  "nodes.humanInput.userActions.buttonTextPlaceholder": "操作值",
   "nodes.humanInput.userActions.buttonTextTooLong": "按鈕文本不能超過{{maxLength}}個字符",
   "nodes.humanInput.userActions.chooseStyle": "選擇按鈕樣式",
   "nodes.humanInput.userActions.emptyTip": "點擊 '+' 按鈕添加用戶操作",
   "nodes.humanInput.userActions.title": "用戶操作",
-  "nodes.humanInput.userActions.tooltip": "定義用戶可以點擊以響應此表單的按鈕。每個按鈕可以觸發不同的工作流路徑。操作 ID 必須以字母或下劃線開頭,後跟字母、數字或下劃線。",
+  "nodes.humanInput.userActions.tooltip": "定義用戶可以點擊以響應此表單的按鈕。操作 ID 控制分支。操作值作為所選內置輸出在下游公開。操作 ID 必須以字母或下劃線開頭,後跟字母、數字或下劃線。",
   "nodes.humanInput.userActions.triggered": "<strong>{{actionName}}</strong>已被觸發",
   "nodes.ifElse.addCondition": "新增條件",
   "nodes.ifElse.addSubVariable": "子變數",
@@ -897,13 +897,17 @@
   "nodes.questionClassifiers.advancedSetting": "高級設置",
   "nodes.questionClassifiers.class": "分類",
   "nodes.questionClassifiers.classNamePlaceholder": "輸入你的分類名稱",
+  "nodes.questionClassifiers.defaultLabel": "分類 {{index}}",
   "nodes.questionClassifiers.inputVars": "輸入變數",
   "nodes.questionClassifiers.instruction": "指令",
   "nodes.questionClassifiers.instructionPlaceholder": "在這裡輸入你的指令",
   "nodes.questionClassifiers.instructionTip": "你可以輸入額外的附加指令，幫助問題分類器更好的理解如何分類",
+  "nodes.questionClassifiers.labelEditorAriaLabel": "分類標籤編輯器",
   "nodes.questionClassifiers.model": "模型",
+  "nodes.questionClassifiers.outputVars.classLabel": "分類標籤",
   "nodes.questionClassifiers.outputVars.className": "分類名稱",
   "nodes.questionClassifiers.outputVars.usage": "模型用量信息",
+  "nodes.questionClassifiers.renameHint": "雙擊分類標題以重新命名",
   "nodes.questionClassifiers.topicName": "主題內容",
   "nodes.questionClassifiers.topicPlaceholder": "在這裡輸入你的主題內容",
   "nodes.start.builtInVar": "內置變數",
diff --git a/web/knip.config.ts b/web/knip.config.ts
index d6b71b4af9..b18639e64f 100644
--- a/web/knip.config.ts
+++ b/web/knip.config.ts
@@ -8,6 +8,7 @@ const config: KnipConfig = {
     'scripts/**/*.{js,ts,mjs}',
     'bin/**/*.{js,ts,mjs}',
     'tsslint.config.ts',
+    'dev-proxy.config.ts',
   ],
   ignore: [
     'public/**',
diff --git a/web/models/common.ts b/web/models/common.ts
index 505db0e348..2b3acd1d2f 100644
--- a/web/models/common.ts
+++ b/web/models/common.ts
@@ -190,13 +190,6 @@ export type InvitationResponse = CommonResponse & {
   invitation_results: InvitationResult[]
 }
 
-export type ApiBasedExtension = {
-  id?: string
-  name?: string
-  api_endpoint?: string
-  api_key?: string
-}
-
 export type CodeBasedExtensionForm = {
   type: string
   label: I18nText
diff --git a/web/models/datasets.ts b/web/models/datasets.ts
index 4557d02af0..b9edad48f0 100644
--- a/web/models/datasets.ts
+++ b/web/models/datasets.ts
@@ -1,10 +1,11 @@
 import type { DataSourceNotionPage, DataSourceProvider } from './common'
 import type { DatasourceType } from './pipeline'
-import type { Tag } from '@/app/components/base/tag-management/constant'
 import type { IndexingType } from '@/app/components/datasets/create/step-two'
 import type { MetadataItemWithValue } from '@/app/components/datasets/metadata/types'
 import type { MetadataFilteringVariableType } from '@/app/components/workflow/nodes/knowledge-retrieval/types'
+import type { Tag } from '@/contract/console/tags'
 import type { AppIconType, AppModeEnum, RetrievalConfig, TransferMethod } from '@/types/app'
+import type { SegmentImportStatus } from '@/types/dataset'
 import type { I18nKeysByPrefix } from '@/types/i18n'
 import { ExternalKnowledgeBase, General, ParentChild, Qa } from '@/app/components/base/icons/src/public/knowledge/dataset-card'
 
@@ -783,7 +784,7 @@ export type UpdateDocumentBatchParams = {
 
 export type BatchImportResponse = {
   job_id: string
-  job_status: string
+  job_status: SegmentImportStatus
 }
 
 export const DOC_FORM_ICON_WITH_BG: Record<ChunkingMode | 'external', React.ComponentType<{ className: string }>> = {
diff --git a/web/models/debug.ts b/web/models/debug.ts
index a0dc9831ee..b069c8252f 100644
--- a/web/models/debug.ts
+++ b/web/models/debug.ts
@@ -52,7 +52,7 @@ export type PromptVariable = {
   key: string
   name: string
   type: string // "string" | "number" | "select",
-  default?: string | number
+  default?: string | number | boolean
   required?: boolean
   options?: string[]
   max_length?: number
diff --git a/web/models/explore.ts b/web/models/explore.ts
index c05dd1eca1..3a82c589b2 100644
--- a/web/models/explore.ts
+++ b/web/models/explore.ts
@@ -12,7 +12,7 @@ type AppBasicInfo = {
   use_icon_as_answer_icon: boolean
 }
 
-export type AppCategory = 'Writing' | 'Translate' | 'HR' | 'Programming' | 'Assistant' | 'Agent' | 'Recommended' | 'Workflow'
+export type AppCategory = string
 
 export type App = {
   app: AppBasicInfo
@@ -21,7 +21,7 @@ export type App = {
   copyright: string
   privacy_policy: string | null
   custom_disclaimer: string | null
-  category: AppCategory
+  categories: AppCategory[]
   position: number
   is_listed: boolean
   install_count: number
diff --git a/web/models/log.ts b/web/models/log.ts
index b9a0565fa9..81543f8ec0 100644
--- a/web/models/log.ts
+++ b/web/models/log.ts
@@ -202,10 +202,6 @@ export type LogMessageAnnotationsRequest = Omit<LogMessageFeedbacksRequest, 'rat
 
 export type LogMessageAnnotationsResponse = LogMessageFeedbacksResponse
 
-export type AnnotationsCountResponse = {
-  count: number
-}
-
 export enum WorkflowRunTriggeredFrom {
   DEBUGGING = 'debugging',
   APP_RUN = 'app-run',
diff --git a/web/models/pipeline.ts b/web/models/pipeline.ts
index e75ee7569a..30389ab5e0 100644
--- a/web/models/pipeline.ts
+++ b/web/models/pipeline.ts
@@ -89,6 +89,7 @@ export type ImportPipelineDSLResponse = {
   dataset_id: string
   current_dsl_version: string
   imported_dsl_version: string
+  error?: string
 }
 
 export type ImportPipelineDSLConfirmResponse = {
diff --git a/web/package.json b/web/package.json
index a7174da9c3..9f8a4f095c 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,7 +1,7 @@
 {
   "name": "dify-web",
   "type": "module",
-  "version": "1.14.0",
+  "version": "1.14.2",
   "private": true,
   "imports": {
     "#i18n": {
@@ -28,7 +28,7 @@
     "build:vinext": "vinext build",
     "dev": "next dev",
     "dev:inspect": "next dev --inspect",
-    "dev:proxy": "tsx ./scripts/dev-hono-proxy.ts",
+    "dev:proxy": "dev-proxy --config ./dev-proxy.config.ts --env-file ./.env.local",
     "dev:vinext": "vinext dev",
     "gen-doc-paths": "tsx ./scripts/gen-doc-paths.ts",
     "gen-icons": "pnpm --filter @dify/iconify-collections generate && node ./scripts/gen-icons.mjs && eslint --fix app/components/base/icons/src/",
@@ -54,7 +54,6 @@
     "@emoji-mart/data": "catalog:",
     "@floating-ui/react": "catalog:",
     "@formatjs/intl-localematcher": "catalog:",
-    "@headlessui/react": "catalog:",
     "@heroicons/react": "catalog:",
     "@lexical/code": "catalog:",
     "@lexical/link": "catalog:",
@@ -96,6 +95,7 @@
     "emoji-mart": "catalog:",
     "es-toolkit": "catalog:",
     "fast-deep-equal": "catalog:",
+    "fuse.js": "catalog:",
     "hast-util-to-jsx-runtime": "catalog:",
     "html-entities": "catalog:",
     "html-to-image": "catalog:",
@@ -160,9 +160,9 @@
     "@dify/tsconfig": "workspace:*",
     "@egoist/tailwindcss-icons": "catalog:",
     "@eslint-react/eslint-plugin": "catalog:",
-    "@hono/node-server": "catalog:",
     "@iconify-json/heroicons": "catalog:",
     "@iconify-json/ri": "catalog:",
+    "@langgenius/dev-proxy": "workspace:*",
     "@langgenius/dify-ui": "workspace:*",
     "@mdx-js/loader": "catalog:",
     "@mdx-js/react": "catalog:",
@@ -214,7 +214,6 @@
     "eslint-plugin-sonarjs": "catalog:",
     "eslint-plugin-storybook": "catalog:",
     "happy-dom": "catalog:",
-    "hono": "catalog:",
     "knip": "catalog:",
     "postcss": "catalog:",
     "react-server-dom-webpack": "catalog:",
diff --git a/web/plugins/dev-proxy/server.spec.ts b/web/plugins/dev-proxy/server.spec.ts
deleted file mode 100644
index d9c9ee22ba..0000000000
--- a/web/plugins/dev-proxy/server.spec.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * @vitest-environment node
- */
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { buildUpstreamUrl, createDevProxyApp, isAllowedDevOrigin, resolveDevProxyTargets } from './server'
-
-describe('dev proxy server', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  // Scenario: Hono proxy targets should be read directly from env.
-  it('should resolve Hono proxy targets from env', () => {
-    // Arrange
-    const targets = resolveDevProxyTargets({
-      HONO_CONSOLE_API_PROXY_TARGET: 'https://console.example.com',
-      HONO_PUBLIC_API_PROXY_TARGET: 'https://public.example.com',
-    })
-
-    // Assert
-    expect(targets.consoleApiTarget).toBe('https://console.example.com')
-    expect(targets.publicApiTarget).toBe('https://public.example.com')
-  })
-
-  // Scenario: target paths should not be duplicated when the incoming route already includes them.
-  it('should preserve prefixed targets when building upstream URLs', () => {
-    // Act
-    const url = buildUpstreamUrl('https://api.example.com/console/api', '/console/api/apps', '?page=1')
-
-    // Assert
-    expect(url.href).toBe('https://api.example.com/console/api/apps?page=1')
-  })
-
-  // Scenario: only localhost dev origins should be reflected for credentialed CORS.
-  it('should only allow local development origins', () => {
-    // Assert
-    expect(isAllowedDevOrigin('http://localhost:3000')).toBe(true)
-    expect(isAllowedDevOrigin('http://127.0.0.1:3000')).toBe(true)
-    expect(isAllowedDevOrigin('https://example.com')).toBe(false)
-  })
-
-  // Scenario: proxy requests should rewrite cookies and surface credentialed CORS headers.
-  it('should proxy api requests through Hono with local cookie rewriting', async () => {
-    // Arrange
-    const fetchImpl = vi.fn<typeof fetch>().mockResolvedValue(new Response('ok', {
-      status: 200,
-      headers: [
-        ['content-encoding', 'br'],
-        ['content-length', '123'],
-        ['set-cookie', '__Host-access_token=abc; Path=/console/api; Domain=cloud.dify.ai; Secure; SameSite=None'],
-        ['transfer-encoding', 'chunked'],
-      ],
-    }))
-    const app = createDevProxyApp({
-      consoleApiTarget: 'https://cloud.dify.ai',
-      publicApiTarget: 'https://public.dify.ai',
-      fetchImpl,
-    })
-
-    // Act
-    const response = await app.request('http://127.0.0.1:5001/console/api/apps?page=1', {
-      headers: {
-        Origin: 'http://localhost:3000',
-        Cookie: 'access_token=abc',
-      },
-    })
-
-    // Assert
-    expect(fetchImpl).toHaveBeenCalledTimes(1)
-    expect(fetchImpl).toHaveBeenCalledWith(
-      new URL('https://cloud.dify.ai/console/api/apps?page=1'),
-      expect.objectContaining({
-        method: 'GET',
-        headers: expect.any(Headers),
-      }),
-    )
-
-    const [, requestInit] = (fetchImpl.mock.calls[0] ?? []) as [unknown, any]
-    const requestHeaders = requestInit?.headers as Headers
-    expect(requestHeaders.get('cookie')).toBe('__Host-access_token=abc')
-    expect(requestHeaders.get('origin')).toBe('https://cloud.dify.ai')
-    expect(response.headers.get('access-control-allow-origin')).toBe('http://localhost:3000')
-    expect(response.headers.get('access-control-allow-credentials')).toBe('true')
-    expect(response.headers.get('content-encoding')).toBeNull()
-    expect(response.headers.get('content-length')).toBeNull()
-    expect(response.headers.get('transfer-encoding')).toBeNull()
-    expect(response.headers.getSetCookie()).toEqual([
-      'access_token=abc; Path=/; SameSite=Lax',
-    ])
-  })
-
-  // Scenario: preflight requests should advertise allowed headers for credentialed cross-origin calls.
-  it('should answer CORS preflight requests', async () => {
-    // Arrange
-    const app = createDevProxyApp({
-      consoleApiTarget: 'https://cloud.dify.ai',
-      publicApiTarget: 'https://public.dify.ai',
-      fetchImpl: vi.fn<typeof fetch>(),
-    })
-
-    // Act
-    const response = await app.request('http://127.0.0.1:5001/api/messages', {
-      method: 'OPTIONS',
-      headers: {
-        'Origin': 'http://localhost:3000',
-        'Access-Control-Request-Headers': 'authorization,content-type,x-csrf-token',
-      },
-    })
-
-    // Assert
-    expect(response.status).toBe(204)
-    expect(response.headers.get('access-control-allow-origin')).toBe('http://localhost:3000')
-    expect(response.headers.get('access-control-allow-credentials')).toBe('true')
-    expect(response.headers.get('access-control-allow-headers')).toBe('authorization,content-type,x-csrf-token')
-  })
-})
diff --git a/web/plugins/dev-proxy/server.ts b/web/plugins/dev-proxy/server.ts
deleted file mode 100644
index a3752784fa..0000000000
--- a/web/plugins/dev-proxy/server.ts
+++ /dev/null
@@ -1,202 +0,0 @@
-import type { Context, Hono } from 'hono'
-import { Hono as HonoApp } from 'hono'
-import { DEFAULT_PROXY_TARGET, rewriteCookieHeaderForUpstream, rewriteSetCookieHeadersForLocal } from './cookies'
-
-type DevProxyEnv = Partial<Record<
-  | 'HONO_CONSOLE_API_PROXY_TARGET'
-  | 'HONO_PUBLIC_API_PROXY_TARGET',
-  string
->>
-
-type DevProxyTargets = {
-  consoleApiTarget: string
-  publicApiTarget: string
-}
-
-type DevProxyAppOptions = DevProxyTargets & {
-  fetchImpl?: typeof globalThis.fetch
-}
-
-const LOCAL_DEV_HOSTS = new Set(['localhost', '127.0.0.1', '[::1]'])
-const ALLOW_METHODS = 'GET,HEAD,POST,PUT,PATCH,DELETE,OPTIONS'
-const DEFAULT_ALLOW_HEADERS = 'Authorization, Content-Type, X-CSRF-Token'
-const RESPONSE_HEADERS_TO_DROP = [
-  'connection',
-  'content-encoding',
-  'content-length',
-  'keep-alive',
-  'set-cookie',
-  'transfer-encoding',
-] as const
-
-const appendHeaderValue = (headers: Headers, name: string, value: string) => {
-  const currentValue = headers.get(name)
-  if (!currentValue) {
-    headers.set(name, value)
-    return
-  }
-
-  if (currentValue.split(',').map(item => item.trim()).includes(value))
-    return
-
-  headers.set(name, `${currentValue}, ${value}`)
-}
-
-export const isAllowedDevOrigin = (origin?: string | null) => {
-  if (!origin)
-    return false
-
-  try {
-    const url = new URL(origin)
-    return LOCAL_DEV_HOSTS.has(url.hostname)
-  }
-  catch {
-    return false
-  }
-}
-
-const applyCorsHeaders = (headers: Headers, origin?: string | null) => {
-  if (!isAllowedDevOrigin(origin))
-    return
-
-  headers.set('Access-Control-Allow-Origin', origin!)
-  headers.set('Access-Control-Allow-Credentials', 'true')
-  appendHeaderValue(headers, 'Vary', 'Origin')
-}
-
-export const buildUpstreamUrl = (target: string, requestPath: string, search = '') => {
-  const targetUrl = new URL(target)
-  const normalizedTargetPath = targetUrl.pathname === '/' ? '' : targetUrl.pathname.replace(/\/$/, '')
-  const normalizedRequestPath = requestPath.startsWith('/') ? requestPath : `/${requestPath}`
-  const hasTargetPrefix = normalizedTargetPath
-    && (normalizedRequestPath === normalizedTargetPath || normalizedRequestPath.startsWith(`${normalizedTargetPath}/`))
-
-  targetUrl.pathname = hasTargetPrefix
-    ? normalizedRequestPath
-    : `${normalizedTargetPath}${normalizedRequestPath}`
-  targetUrl.search = search
-
-  return targetUrl
-}
-
-const createProxyRequestHeaders = (request: Request, targetUrl: URL) => {
-  const headers = new Headers(request.headers)
-  headers.delete('host')
-
-  if (headers.has('origin'))
-    headers.set('origin', targetUrl.origin)
-
-  const rewrittenCookieHeader = rewriteCookieHeaderForUpstream(headers.get('cookie') || undefined)
-  if (rewrittenCookieHeader)
-    headers.set('cookie', rewrittenCookieHeader)
-
-  return headers
-}
-
-const createUpstreamResponseHeaders = (response: Response, requestOrigin?: string | null) => {
-  const headers = new Headers(response.headers)
-  RESPONSE_HEADERS_TO_DROP.forEach(header => headers.delete(header))
-
-  const rewrittenSetCookies = rewriteSetCookieHeadersForLocal(response.headers.getSetCookie())
-  rewrittenSetCookies?.forEach((cookie) => {
-    headers.append('set-cookie', cookie)
-  })
-
-  applyCorsHeaders(headers, requestOrigin)
-  return headers
-}
-
-const proxyRequest = async (
-  context: Context,
-  target: string,
-  fetchImpl: typeof globalThis.fetch,
-) => {
-  const requestUrl = new URL(context.req.url)
-  const targetUrl = buildUpstreamUrl(target, requestUrl.pathname, requestUrl.search)
-  const requestHeaders = createProxyRequestHeaders(context.req.raw, targetUrl)
-  const requestInit: RequestInit & { duplex?: 'half' } = {
-    method: context.req.method,
-    headers: requestHeaders,
-    redirect: 'manual',
-  }
-
-  if (context.req.method !== 'GET' && context.req.method !== 'HEAD') {
-    requestInit.body = context.req.raw.body
-    requestInit.duplex = 'half'
-  }
-
-  const upstreamResponse = await fetchImpl(targetUrl, requestInit)
-  const responseHeaders = createUpstreamResponseHeaders(upstreamResponse, context.req.header('origin'))
-
-  return new Response(upstreamResponse.body, {
-    status: upstreamResponse.status,
-    statusText: upstreamResponse.statusText,
-    headers: responseHeaders,
-  })
-}
-
-const registerProxyRoute = (
-  app: Hono,
-  path: '/console/api' | '/api',
-  target: string,
-  fetchImpl: typeof globalThis.fetch,
-) => {
-  app.all(path, context => proxyRequest(context, target, fetchImpl))
-  app.all(`${path}/*`, context => proxyRequest(context, target, fetchImpl))
-}
-
-export const resolveDevProxyTargets = (env: DevProxyEnv = {}): DevProxyTargets => {
-  const consoleApiTarget = env.HONO_CONSOLE_API_PROXY_TARGET
-    || DEFAULT_PROXY_TARGET
-  const publicApiTarget = env.HONO_PUBLIC_API_PROXY_TARGET
-    || consoleApiTarget
-
-  return {
-    consoleApiTarget,
-    publicApiTarget,
-  }
-}
-
-export const createDevProxyApp = (options: DevProxyAppOptions) => {
-  const app = new HonoApp()
-  const fetchImpl = options.fetchImpl || globalThis.fetch
-
-  app.onError((error, context) => {
-    console.error('[dev-hono-proxy]', error)
-
-    const headers = new Headers()
-    applyCorsHeaders(headers, context.req.header('origin'))
-
-    return new Response('Upstream proxy request failed.', {
-      status: 502,
-      headers,
-    })
-  })
-
-  app.use('*', async (context, next) => {
-    if (context.req.method === 'OPTIONS') {
-      const headers = new Headers()
-      applyCorsHeaders(headers, context.req.header('origin'))
-      headers.set('Access-Control-Allow-Methods', ALLOW_METHODS)
-      headers.set(
-        'Access-Control-Allow-Headers',
-        context.req.header('Access-Control-Request-Headers') || DEFAULT_ALLOW_HEADERS,
-      )
-      if (context.req.header('Access-Control-Request-Private-Network') === 'true')
-        headers.set('Access-Control-Allow-Private-Network', 'true')
-
-      return new Response(null, {
-        status: 204,
-        headers,
-      })
-    }
-
-    await next()
-    applyCorsHeaders(context.res.headers, context.req.header('origin'))
-  })
-
-  registerProxyRoute(app, '/console/api', options.consoleApiTarget, fetchImpl)
-  registerProxyRoute(app, '/api', options.publicApiTarget, fetchImpl)
-
-  return app
-}
diff --git a/web/proxy.ts b/web/proxy.ts
index 983713fd0e..d735c9f568 100644
--- a/web/proxy.ts
+++ b/web/proxy.ts
@@ -18,15 +18,16 @@ const wrapResponseWithXFrameOptions = (response: NextResponse, pathname: string)
 export function proxy(request: NextRequest) {
   const { pathname } = request.nextUrl
   const requestHeaders = new Headers(request.headers)
-  const response = NextResponse.next({
-    request: {
-      headers: requestHeaders,
-    },
-  })
 
   const isWhiteListEnabled = !!env.NEXT_PUBLIC_CSP_WHITELIST && process.env.NODE_ENV === 'production'
-  if (!isWhiteListEnabled)
+  if (!isWhiteListEnabled) {
+    const response = NextResponse.next({
+      request: {
+        headers: requestHeaders,
+      },
+    })
     return wrapResponseWithXFrameOptions(response, pathname)
+  }
 
   const whiteList = `${env.NEXT_PUBLIC_CSP_WHITELIST} ${NECESSARY_DOMAIN}`
   const nonce = Buffer.from(crypto.randomUUID()).toString('base64')
@@ -60,6 +61,12 @@ export function proxy(request: NextRequest) {
     contentSecurityPolicyHeaderValue,
   )
 
+  const response = NextResponse.next({
+    request: {
+      headers: requestHeaders,
+    },
+  })
+
   response.headers.set(
     'Content-Security-Policy',
     contentSecurityPolicyHeaderValue,
diff --git a/web/scripts/dev-hono-proxy.ts b/web/scripts/dev-hono-proxy.ts
deleted file mode 100644
index f550d47ae8..0000000000
--- a/web/scripts/dev-hono-proxy.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import path from 'node:path'
-import { fileURLToPath } from 'node:url'
-import { serve } from '@hono/node-server'
-import { loadEnv } from 'vite'
-import { createDevProxyApp, resolveDevProxyTargets } from '../plugins/dev-proxy/server'
-
-const projectRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..')
-const mode = process.env.MODE || process.env.NODE_ENV || 'development'
-const env = loadEnv(mode, projectRoot, '')
-
-const host = env.HONO_PROXY_HOST || '127.0.0.1'
-const port = Number(env.HONO_PROXY_PORT || 5001)
-const app = createDevProxyApp(resolveDevProxyTargets(env))
-
-serve({
-  fetch: app.fetch,
-  hostname: host,
-  port,
-})
-
-console.log(`[dev-hono-proxy] listening on http://${host}:${port}`)
diff --git a/web/service/__tests__/use-pipeline.spec.tsx b/web/service/__tests__/use-pipeline.spec.tsx
new file mode 100644
index 0000000000..411d29ac6a
--- /dev/null
+++ b/web/service/__tests__/use-pipeline.spec.tsx
@@ -0,0 +1,81 @@
+import type { ReactNode } from 'react'
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
+import { act, renderHook } from '@testing-library/react'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { DSLImportMode, DSLImportStatus } from '@/models/app'
+import { post } from '../base'
+import { useImportPipelineDSL, useImportPipelineDSLConfirm } from '../use-pipeline'
+
+vi.mock('../base', () => ({
+  post: vi.fn(),
+  get: vi.fn(),
+  patch: vi.fn(),
+  del: vi.fn(),
+}))
+
+const createWrapper = () => {
+  const queryClient = new QueryClient({
+    defaultOptions: {
+      queries: { retry: false },
+      mutations: { retry: false },
+    },
+  })
+
+  return ({ children }: { children: ReactNode }) => (
+    <QueryClientProvider client={queryClient}>
+      {children}
+    </QueryClientProvider>
+  )
+}
+
+describe('use-pipeline imports', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    vi.mocked(post).mockResolvedValue({
+      id: 'import-id',
+      status: DSLImportStatus.COMPLETED,
+      pipeline_id: 'pipeline-id',
+      dataset_id: 'dataset-id',
+      current_dsl_version: '0.1.0',
+      imported_dsl_version: '0.1.0',
+    })
+  })
+
+  it('should import pipeline DSL silently so callers can own error toasts', async () => {
+    const { result } = renderHook(
+      () => useImportPipelineDSL(),
+      { wrapper: createWrapper() },
+    )
+    const request = {
+      mode: DSLImportMode.YAML_CONTENT,
+      yaml_content: 'rag_pipeline: {}',
+    }
+
+    await act(async () => {
+      await result.current.mutateAsync(request)
+    })
+
+    expect(post).toHaveBeenCalledWith(
+      '/rag/pipelines/imports',
+      { body: request },
+      { silent: true },
+    )
+  })
+
+  it('should confirm pipeline DSL import silently so callers can own error toasts', async () => {
+    const { result } = renderHook(
+      () => useImportPipelineDSLConfirm(),
+      { wrapper: createWrapper() },
+    )
+
+    await act(async () => {
+      await result.current.mutateAsync('import-id')
+    })
+
+    expect(post).toHaveBeenCalledWith(
+      '/rag/pipelines/imports/import-id/confirm',
+      {},
+      { silent: true },
+    )
+  })
+})
diff --git a/web/service/annotation.spec.ts b/web/service/annotation.spec.ts
new file mode 100644
index 0000000000..60af578108
--- /dev/null
+++ b/web/service/annotation.spec.ts
@@ -0,0 +1,28 @@
+import { AnnotationEnableStatus } from '@/app/components/app/annotation/type'
+import { updateAnnotationStatus } from './annotation'
+import { post } from './base'
+
+vi.mock('./base', () => ({
+  post: vi.fn(),
+}))
+
+describe('annotation service', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('should preserve zero score threshold when updating annotation status', () => {
+    updateAnnotationStatus('app-1', AnnotationEnableStatus.enable, {
+      embedding_model_name: 'model',
+      embedding_provider_name: 'provider',
+    }, 0)
+
+    expect(post).toHaveBeenCalledWith('apps/app-1/annotation-reply/enable', {
+      body: {
+        embedding_model_name: 'model',
+        embedding_provider_name: 'provider',
+        score_threshold: 0,
+      },
+    })
+  })
+})
diff --git a/web/service/annotation.ts b/web/service/annotation.ts
index 8a19425044..ba8c560b1f 100644
--- a/web/service/annotation.ts
+++ b/web/service/annotation.ts
@@ -7,7 +7,7 @@ export const fetchAnnotationConfig = (appId: string) => {
 }
 export const updateAnnotationStatus = (appId: string, action: AnnotationEnableStatus, embeddingModel?: EmbeddingModelConfig, score?: number) => {
   let body: any = {
-    score_threshold: score || ANNOTATION_DEFAULT.score_threshold,
+    score_threshold: score ?? ANNOTATION_DEFAULT.score_threshold,
   }
   if (embeddingModel) {
     body = {
diff --git a/web/service/apps.ts b/web/service/apps.ts
index 221e83cf39..d8e5e2136b 100644
--- a/web/service/apps.ts
+++ b/web/service/apps.ts
@@ -1,40 +1,13 @@
 import type { TracingProvider } from '@/app/(commonLayout)/app/(appDetailLayout)/[appId]/overview/tracing/type'
-import type { AppDetailResponse, AppListResponse, CreateApiKeyResponse, DSLImportMode, DSLImportResponse, TracingConfig, TracingStatus, UpdateAppModelConfigResponse, UpdateAppSiteCodeResponse, WebhookTriggerResponse, WorkflowOnlineUser } from '@/models/app'
+import type { AppDetailResponse, AppListResponse, CreateApiKeyResponse, DSLImportMode, DSLImportResponse, TracingConfig, TracingStatus, UpdateAppModelConfigResponse, UpdateAppSiteCodeResponse, WebhookTriggerResponse } from '@/models/app'
 import type { CommonResponse } from '@/models/common'
 import type { AppIconType, AppModeEnum, ModelConfig } from '@/types/app'
 import { del, get, patch, post, put } from './base'
-import { consoleClient } from './client'
 
 export const fetchAppList = ({ url, params }: { url: string, params?: Record<string, any> }): Promise<AppListResponse> => {
   return get<AppListResponse>(url, { params })
 }
 
-export const fetchWorkflowOnlineUsers = async ({ appIds }: { appIds: string[] }): Promise<Record<string, WorkflowOnlineUser[]>> => {
-  if (!appIds.length)
-    return {}
-
-  const response = await consoleClient.apps.workflowOnlineUsers({
-    body: { app_ids: appIds },
-  })
-
-  if (!response?.data)
-    return {}
-
-  if (Array.isArray(response.data)) {
-    return response.data.reduce<Record<string, WorkflowOnlineUser[]>>((acc, item) => {
-      if (item?.app_id)
-        acc[item.app_id] = item.users || []
-      return acc
-    }, {})
-  }
-
-  return Object.entries(response.data).reduce<Record<string, WorkflowOnlineUser[]>>((acc, [appId, users]) => {
-    if (appId)
-      acc[appId] = users || []
-    return acc
-  }, {})
-}
-
 export const fetchAppDetail = ({ url, id }: { url: string, id: string }): Promise<AppDetailResponse> => {
   return get<AppDetailResponse>(`${url}/${id}`)
 }
diff --git a/web/service/base.ts b/web/service/base.ts
index ac7ab895a8..f382af81ac 100644
--- a/web/service/base.ts
+++ b/web/service/base.ts
@@ -830,6 +830,12 @@ export const request = async<T>(url: string, options = {}, otherOptions?: IOther
 }
 
 // request methods
+/**
+ * @deprecated For console JSON APIs, prefer generated contract clients (`consoleClient`/`consoleQuery`)
+ * only after the backend OpenAPI schema produces accurate method, path, input, and output types.
+ * Keep this helper for endpoints whose generated contract is missing or too loose, and for non-console
+ * flows such as public APIs, marketplace APIs, streaming, upload, or download.
+ */
 export const get = <T>(url: string, options = {}, otherOptions?: IOtherOptions) => {
   return request<T>(url, Object.assign({}, options, { method: 'GET' }), otherOptions)
 }
@@ -844,6 +850,12 @@ export const getMarketplace = <T>(url: string, options = {}, otherOptions?: IOth
   return get<T>(url, options, { ...otherOptions, isMarketplaceAPI: true })
 }
 
+/**
+ * @deprecated For console JSON APIs, prefer generated contract clients (`consoleClient`/`consoleQuery`)
+ * only after the backend OpenAPI schema produces accurate method, path, input, and output types.
+ * Keep this helper for endpoints whose generated contract is missing or too loose, and for non-console
+ * flows such as public APIs, marketplace APIs, streaming, upload, or download.
+ */
 export const post = <T>(url: string, options = {}, otherOptions?: IOtherOptions) => {
   return request<T>(url, Object.assign({}, options, { method: 'POST' }), otherOptions)
 }
@@ -857,10 +869,22 @@ export const postPublic = <T>(url: string, options = {}, otherOptions?: IOtherOp
   return post<T>(url, options, { ...otherOptions, isPublicAPI: true })
 }
 
+/**
+ * @deprecated For console JSON APIs, prefer generated contract clients (`consoleClient`/`consoleQuery`)
+ * only after the backend OpenAPI schema produces accurate method, path, input, and output types.
+ * Keep this helper for endpoints whose generated contract is missing or too loose, and for non-console
+ * flows such as public APIs, marketplace APIs, streaming, upload, or download.
+ */
 export const put = <T>(url: string, options = {}, otherOptions?: IOtherOptions) => {
   return request<T>(url, Object.assign({}, options, { method: 'PUT' }), otherOptions)
 }
 
+/**
+ * @deprecated For console JSON APIs, prefer generated contract clients (`consoleClient`/`consoleQuery`)
+ * only after the backend OpenAPI schema produces accurate method, path, input, and output types.
+ * Keep this helper for endpoints whose generated contract is missing or too loose, and for non-console
+ * flows such as public APIs, marketplace APIs, streaming, upload, or download.
+ */
 export const del = <T>(url: string, options = {}, otherOptions?: IOtherOptions) => {
   return request<T>(url, Object.assign({}, options, { method: 'DELETE' }), otherOptions)
 }
@@ -869,6 +893,12 @@ export const delPublic = <T>(url: string, options = {}, otherOptions?: IOtherOpt
   return del<T>(url, options, { ...otherOptions, isPublicAPI: true })
 }
 
+/**
+ * @deprecated For console JSON APIs, prefer generated contract clients (`consoleClient`/`consoleQuery`)
+ * only after the backend OpenAPI schema produces accurate method, path, input, and output types.
+ * Keep this helper for endpoints whose generated contract is missing or too loose, and for non-console
+ * flows such as public APIs, marketplace APIs, streaming, upload, or download.
+ */
 export const patch = <T>(url: string, options = {}, otherOptions?: IOtherOptions) => {
   return request<T>(url, Object.assign({}, options, { method: 'PATCH' }), otherOptions)
 }
diff --git a/web/service/client.spec.ts b/web/service/client.spec.ts
index 95bf720bfe..641cbda7c6 100644
--- a/web/service/client.spec.ts
+++ b/web/service/client.spec.ts
@@ -1,3 +1,6 @@
+import type { MutationFunctionContext } from '@tanstack/react-query'
+import type { Tag } from '@/contract/console/tags'
+import { QueryClient } from '@tanstack/react-query'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
 const loadGetBaseURL = async (isClientValue: boolean) => {
@@ -10,6 +13,28 @@ const loadGetBaseURL = async (isClientValue: boolean) => {
   return { getBaseURL: module.getBaseURL, warnSpy }
 }
 
+const loadConsoleQuery = async () => {
+  vi.resetModules()
+  vi.doMock('@/utils/client', () => ({ isClient: true, isServer: false }))
+  const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
+  const module = await import('./client')
+  warnSpy.mockRestore()
+  return module.consoleQuery
+}
+
+const createMutationContext = (queryClient: QueryClient): MutationFunctionContext => ({
+  client: queryClient,
+  meta: undefined,
+})
+
+const createTag = (overrides: Partial<Tag> = {}): Tag => ({
+  id: 'tag-1',
+  name: 'Frontend',
+  type: 'app',
+  binding_count: 1,
+  ...overrides,
+})
+
 // Scenario: base URL selection and warnings.
 describe('getBaseURL', () => {
   beforeEach(() => {
@@ -78,3 +103,158 @@ describe('getBaseURL', () => {
     expect(warnSpy).not.toHaveBeenCalled()
   })
 })
+
+// Scenario: oRPC mutation defaults own shared tag cache behavior.
+describe('consoleQuery tag mutation defaults', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  afterEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it('should add created tags to the matching list query cache', async () => {
+    const consoleQuery = await loadConsoleQuery()
+    const queryClient = new QueryClient()
+    const appListKey = consoleQuery.tags.list.queryKey({
+      input: {
+        query: {
+          type: 'app',
+        },
+      },
+    })
+    const knowledgeListKey = consoleQuery.tags.list.queryKey({
+      input: {
+        query: {
+          type: 'knowledge',
+        },
+      },
+    })
+    const existingAppTag = createTag({ id: 'tag-1', name: 'Existing' })
+    const existingKnowledgeTag = createTag({
+      id: 'knowledge-tag-1',
+      name: 'Knowledge',
+      type: 'knowledge',
+    })
+    const createdTag = createTag({ id: 'tag-2', name: 'Created' })
+
+    queryClient.setQueryData(appListKey, [existingAppTag])
+    queryClient.setQueryData(knowledgeListKey, [existingKnowledgeTag])
+
+    const mutationOptions = consoleQuery.tags.create.mutationOptions()
+    await mutationOptions.onSuccess?.(
+      createdTag,
+      {
+        body: {
+          name: createdTag.name,
+          type: createdTag.type,
+        },
+      },
+      undefined,
+      createMutationContext(queryClient),
+    )
+
+    expect(queryClient.getQueryData(appListKey)).toEqual([createdTag, existingAppTag])
+    expect(queryClient.getQueryData(knowledgeListKey)).toEqual([existingKnowledgeTag])
+  })
+
+  it('should update matching tags across cached list queries', async () => {
+    const consoleQuery = await loadConsoleQuery()
+    const queryClient = new QueryClient()
+    const appListKey = consoleQuery.tags.list.queryKey({
+      input: {
+        query: {
+          type: 'app',
+        },
+      },
+    })
+    const knowledgeListKey = consoleQuery.tags.list.queryKey({
+      input: {
+        query: {
+          type: 'knowledge',
+        },
+      },
+    })
+    const targetTag = createTag({ id: 'tag-1', name: 'Before' })
+    const otherTag = createTag({ id: 'tag-2', name: 'Other' })
+    const knowledgeTag = createTag({
+      id: 'knowledge-tag-1',
+      name: 'Knowledge',
+      type: 'knowledge',
+    })
+
+    queryClient.setQueryData(appListKey, [targetTag, otherTag])
+    queryClient.setQueryData(knowledgeListKey, [knowledgeTag])
+
+    const updatedTag = createTag({
+      ...targetTag,
+      name: 'After',
+      binding_count: 5,
+    })
+    const mutationOptions = consoleQuery.tags.update.mutationOptions()
+    await mutationOptions.onSuccess?.(
+      updatedTag,
+      {
+        params: {
+          tagId: targetTag.id,
+        },
+        body: {
+          name: 'Ignored Client Name',
+        },
+      },
+      undefined,
+      createMutationContext(queryClient),
+    )
+
+    expect(queryClient.getQueryData(appListKey)).toEqual([
+      updatedTag,
+      otherTag,
+    ])
+    expect(queryClient.getQueryData(knowledgeListKey)).toEqual([knowledgeTag])
+  })
+
+  it('should remove deleted tags across cached list queries', async () => {
+    const consoleQuery = await loadConsoleQuery()
+    const queryClient = new QueryClient()
+    const appListKey = consoleQuery.tags.list.queryKey({
+      input: {
+        query: {
+          type: 'app',
+        },
+      },
+    })
+    const knowledgeListKey = consoleQuery.tags.list.queryKey({
+      input: {
+        query: {
+          type: 'knowledge',
+        },
+      },
+    })
+    const deletedTag = createTag({ id: 'tag-1', name: 'Delete me' })
+    const remainingTag = createTag({ id: 'tag-2', name: 'Keep me' })
+    const knowledgeTag = createTag({
+      id: 'knowledge-tag-1',
+      name: 'Knowledge',
+      type: 'knowledge',
+    })
+
+    queryClient.setQueryData(appListKey, [deletedTag, remainingTag])
+    queryClient.setQueryData(knowledgeListKey, [knowledgeTag])
+
+    const mutationOptions = consoleQuery.tags.delete.mutationOptions()
+    await mutationOptions.onSuccess?.(
+      undefined,
+      {
+        params: {
+          tagId: deletedTag.id,
+        },
+      },
+      undefined,
+      createMutationContext(queryClient),
+    )
+
+    expect(queryClient.getQueryData(appListKey)).toEqual([remainingTag])
+    expect(queryClient.getQueryData(knowledgeListKey)).toEqual([knowledgeTag])
+  })
+})
diff --git a/web/service/client.ts b/web/service/client.ts
index 65c2b1fc68..984779e2b2 100644
--- a/web/service/client.ts
+++ b/web/service/client.ts
@@ -1,5 +1,6 @@
 import type { ContractRouterClient } from '@orpc/contract'
 import type { JsonifiedClient } from '@orpc/openapi-client'
+import type { Tag } from '@/contract/console/tags'
 import { createORPCClient, onError } from '@orpc/client'
 import { OpenAPILink } from '@orpc/openapi-client/fetch'
 import { createTanstackQueryUtils } from '@orpc/tanstack-query'
@@ -84,4 +85,53 @@ const consoleLink = new OpenAPILink(consoleRouterContract, {
 })
 
 export const consoleClient: JsonifiedClient<ContractRouterClient<typeof consoleRouterContract>> = createORPCClient(consoleLink)
-export const consoleQuery = createTanstackQueryUtils(consoleClient, { path: ['console'] })
+
+export const consoleQuery = createTanstackQueryUtils(consoleClient, {
+  path: ['console'],
+  experimental_defaults: {
+    tags: {
+      create: {
+        mutationOptions: {
+          onSuccess: (tag, _variables, _onMutateResult, context) => {
+            context.client.setQueryData(
+              consoleQuery.tags.list.queryKey({
+                input: {
+                  query: {
+                    type: tag.type,
+                  },
+                },
+              }),
+              (oldTags: Tag[] | undefined) => oldTags ? [tag, ...oldTags] : oldTags,
+            )
+          },
+        },
+      },
+      update: {
+        mutationOptions: {
+          onSuccess: (updatedTag, variables, _onMutateResult, context) => {
+            context.client.setQueriesData(
+              {
+                queryKey: consoleQuery.tags.list.key({ type: 'query' }),
+              },
+              (oldTags: Tag[] | undefined) => oldTags?.map(tag => tag.id === variables.params.tagId
+                ? updatedTag
+                : tag),
+            )
+          },
+        },
+      },
+      delete: {
+        mutationOptions: {
+          onSuccess: (_data, variables, _onMutateResult, context) => {
+            context.client.setQueriesData(
+              {
+                queryKey: consoleQuery.tags.list.key({ type: 'query' }),
+              },
+              (oldTags: Tag[] | undefined) => oldTags?.filter(tag => tag.id !== variables.params.tagId),
+            )
+          },
+        },
+      },
+    },
+  },
+})
diff --git a/web/service/common.ts b/web/service/common.ts
index d2fcf8c823..57304712dd 100644
--- a/web/service/common.ts
+++ b/web/service/common.ts
@@ -1,3 +1,8 @@
+import type {
+  ApiBasedExtensionListResponse,
+  ApiBasedExtensionPayload,
+  ApiBasedExtensionResponse,
+} from '@dify/contracts/api/console/api-based-extension/types.gen'
 import type {
   DefaultModelResponse,
   Model,
@@ -13,7 +18,6 @@ import type {
 } from '@/models/app'
 import type {
   AccountIntegrate,
-  ApiBasedExtension,
   CodeBasedExtension,
   CommonResponse,
   DataSourceNotion,
@@ -271,20 +275,20 @@ export const fetchDataSourceNotionBinding = (url: string): Promise<{ result: str
   return get<{ result: string }>(url)
 }
 
-export const fetchApiBasedExtensionList = (url: string): Promise<ApiBasedExtension[]> => {
-  return get<ApiBasedExtension[]>(url)
+export const fetchApiBasedExtensionList = (url: string): Promise<ApiBasedExtensionListResponse> => {
+  return get<ApiBasedExtensionListResponse>(url)
 }
 
-export const fetchApiBasedExtensionDetail = (url: string): Promise<ApiBasedExtension> => {
-  return get<ApiBasedExtension>(url)
+export const fetchApiBasedExtensionDetail = (url: string): Promise<ApiBasedExtensionResponse> => {
+  return get<ApiBasedExtensionResponse>(url)
 }
 
-export const addApiBasedExtension = ({ url, body }: { url: string, body: ApiBasedExtension }): Promise<ApiBasedExtension> => {
-  return post<ApiBasedExtension>(url, { body })
+export const addApiBasedExtension = ({ url, body }: { url: string, body: ApiBasedExtensionPayload }): Promise<ApiBasedExtensionResponse> => {
+  return post<ApiBasedExtensionResponse>(url, { body })
 }
 
-export const updateApiBasedExtension = ({ url, body }: { url: string, body: ApiBasedExtension }): Promise<ApiBasedExtension> => {
-  return post<ApiBasedExtension>(url, { body })
+export const updateApiBasedExtension = ({ url, body }: { url: string, body: ApiBasedExtensionPayload }): Promise<ApiBasedExtensionResponse> => {
+  return post<ApiBasedExtensionResponse>(url, { body })
 }
 
 export const deleteApiBasedExtension = (url: string): Promise<{ result: string }> => {
@@ -339,7 +343,13 @@ export const uploadRemoteFileInfo = (url: string, isPublic?: boolean, silent?: b
 export const sendEMailLoginCode = (email: string, language = 'en-US'): Promise<CommonResponse & { data: string }> =>
   post<CommonResponse & { data: string }>('/email-code-login', { body: { email, language } })
 
-export const emailLoginWithCode = (data: { email: string, code: string, token: string, language: string }): Promise<LoginResponse> =>
+export const emailLoginWithCode = (data: {
+  email: string
+  code: string
+  token: string
+  language: string
+  timezone?: string
+}): Promise<LoginResponse> =>
   post<LoginResponse>('/email-code-login/validity', { body: data })
 
 export const sendResetPasswordCode = (email: string, language = 'en-US'): Promise<CommonResponse & { data: string, message?: string, code?: string }> =>
diff --git a/web/service/knowledge/use-dataset.spec.ts b/web/service/knowledge/use-dataset.spec.ts
new file mode 100644
index 0000000000..161627934f
--- /dev/null
+++ b/web/service/knowledge/use-dataset.spec.ts
@@ -0,0 +1,94 @@
+import { useQuery } from '@tanstack/react-query'
+import { get } from '../base'
+import { useDatasetDetail, useDatasetRelatedApps } from './use-dataset'
+
+vi.mock('@tanstack/react-query', () => ({
+  keepPreviousData: Symbol('keepPreviousData'),
+  useInfiniteQuery: vi.fn(),
+  useMutation: vi.fn(),
+  useQuery: vi.fn(),
+  useQueryClient: vi.fn(),
+}))
+
+vi.mock('../base', () => ({
+  get: vi.fn(),
+  post: vi.fn(),
+}))
+
+vi.mock('../use-base', () => ({
+  useInvalid: vi.fn(),
+}))
+
+const mockUseQuery = vi.mocked(useQuery)
+const mockGet = vi.mocked(get)
+
+type QueryOptions = Parameters<typeof useQuery>[0]
+type RetryFn = (failureCount: number, error: unknown) => boolean
+
+const getLastQueryOptions = () => {
+  return mockUseQuery.mock.calls.at(-1)?.[0] as QueryOptions
+}
+
+const getRetryFn = () => {
+  return getLastQueryOptions().retry as RetryFn
+}
+
+describe('knowledge dataset hooks', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockUseQuery.mockReturnValue({} as ReturnType<typeof useQuery>)
+  })
+
+  describe('useDatasetDetail', () => {
+    it('should not retry forbidden or missing dataset detail errors', () => {
+      // Arrange & Act
+      useDatasetDetail('dataset-1')
+      const retry = getRetryFn()
+
+      // Assert
+      expect(retry(0, new Response(null, { status: 403 }))).toBe(false)
+      expect(retry(0, new Response(null, { status: 404 }))).toBe(false)
+    })
+
+    it('should retry other dataset detail errors fewer than three times', () => {
+      // Arrange & Act
+      useDatasetDetail('dataset-1')
+      const retry = getRetryFn()
+
+      // Assert
+      expect(retry(2, new Error('temporary failure'))).toBe(true)
+      expect(retry(3, new Error('temporary failure'))).toBe(false)
+    })
+
+    it('should fetch dataset detail without silent mode', () => {
+      // Arrange
+      mockGet.mockResolvedValue({ id: 'dataset-1' })
+
+      // Act
+      useDatasetDetail('dataset-1')
+      const queryFn = getLastQueryOptions().queryFn as () => unknown
+      queryFn()
+
+      // Assert
+      expect(mockGet).toHaveBeenCalledWith('/datasets/dataset-1')
+    })
+  })
+
+  describe('useDatasetRelatedApps', () => {
+    it('should use explicit enabled option when provided', () => {
+      // Arrange & Act
+      useDatasetRelatedApps('dataset-1', { enabled: false })
+
+      // Assert
+      expect(getLastQueryOptions().enabled).toBe(false)
+    })
+
+    it('should enable related apps query when dataset id exists and no option is provided', () => {
+      // Arrange & Act
+      useDatasetRelatedApps('dataset-1')
+
+      // Assert
+      expect(getLastQueryOptions().enabled).toBe(true)
+    })
+  })
+})
diff --git a/web/service/knowledge/use-dataset.ts b/web/service/knowledge/use-dataset.ts
index 1be3df18dd..a6183028bf 100644
--- a/web/service/knowledge/use-dataset.ts
+++ b/web/service/knowledge/use-dataset.ts
@@ -27,7 +27,7 @@ import { useInvalid } from '../use-base'
 
 const NAME_SPACE = 'dataset'
 
-const DatasetListKey = [NAME_SPACE, 'list']
+const datasetListQueryKey = [NAME_SPACE, 'list']
 
 const normalizeDatasetsParams = (params: Partial<FetchDatasetsParams['params']> = {}) => {
   const {
@@ -62,17 +62,16 @@ export const useInfiniteDatasets = (
   options?: UseInfiniteDatasetsOptions,
 ) => {
   const normalizedParams = normalizeDatasetsParams(params)
-  const buildUrl = (pageParam: number | undefined) => {
-    const queryString = qs.stringify({
-      ...normalizedParams,
-      page: pageParam ?? normalizedParams.page,
-    }, { indices: false })
-    return `/datasets?${queryString}`
-  }
 
   return useInfiniteQuery<DataSetListResponse>({
-    queryKey: [...DatasetListKey, 'infinite', normalizedParams],
-    queryFn: ({ pageParam = normalizedParams.page }) => get<DataSetListResponse>(buildUrl(pageParam as number | undefined)),
+    queryKey: [...datasetListQueryKey, 'infinite', normalizedParams],
+    queryFn: ({ pageParam = normalizedParams.page }) => {
+      const queryString = qs.stringify({
+        ...normalizedParams,
+        page: pageParam as number | undefined,
+      }, { indices: false })
+      return get<DataSetListResponse>(`/datasets?${queryString}`)
+    },
     getNextPageParam: lastPage => lastPage.has_more ? lastPage.page + 1 : undefined,
     initialPageParam: normalizedParams.page,
     staleTime: 0,
@@ -84,7 +83,7 @@ export const useInfiniteDatasets = (
 export const useDatasetList = (params: DatasetListRequest) => {
   const { initialPage, tag_ids, limit, include_all, keyword } = params
   return useInfiniteQuery({
-    queryKey: [...DatasetListKey, initialPage, tag_ids, limit, include_all, keyword],
+    queryKey: [...datasetListQueryKey, initialPage, tag_ids, limit, include_all, keyword],
     queryFn: ({ pageParam = 1 }) => {
       const urlParams = qs.stringify({
         tag_ids,
@@ -101,7 +100,7 @@ export const useDatasetList = (params: DatasetListRequest) => {
 }
 
 export const useInvalidDatasetList = () => {
-  return useInvalid([...DatasetListKey])
+  return useInvalid([...datasetListQueryKey])
 }
 
 export const datasetDetailQueryKeyPrefix = [NAME_SPACE, 'detail']
@@ -111,13 +110,20 @@ export const useDatasetDetail = (datasetId: string) => {
     queryKey: [...datasetDetailQueryKeyPrefix, datasetId],
     queryFn: () => get<DataSet>(`/datasets/${datasetId}`),
     enabled: !!datasetId,
+    retry: (failureCount, error) => {
+      if (error instanceof Response && [403, 404].includes(error.status))
+        return false
+
+      return failureCount < 3
+    },
   })
 }
 
-export const useDatasetRelatedApps = (datasetId: string) => {
+export const useDatasetRelatedApps = (datasetId: string, options?: { enabled?: boolean }) => {
   return useQuery({
     queryKey: [NAME_SPACE, 'related-apps', datasetId],
     queryFn: () => get<RelatedAppResponse>(`/datasets/${datasetId}/related-apps`),
+    enabled: options?.enabled ?? !!datasetId,
   })
 }
 
diff --git a/web/service/tag.ts b/web/service/tag.ts
deleted file mode 100644
index cf9d56951e..0000000000
--- a/web/service/tag.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import type { Tag } from '@/app/components/base/tag-management/constant'
-import { del, get, patch, post } from './base'
-
-export const fetchTagList = (type: string) => {
-  return get<Tag[]>('/tags', { params: { type } })
-}
-
-export const createTag = (name: string, type: string) => {
-  return post<Tag>('/tags', {
-    body: {
-      name,
-      type,
-    },
-  })
-}
-
-export const updateTag = (tagID: string, name: string) => {
-  return patch(`/tags/${tagID}`, {
-    body: {
-      name,
-    },
-  })
-}
-
-export const deleteTag = (tagID: string) => {
-  return del(`/tags/${tagID}`)
-}
-
-export const bindTag = (tagIDList: string[], targetID: string, type: string) => {
-  return post('/tag-bindings/create', {
-    body: {
-      tag_ids: tagIDList,
-      target_id: targetID,
-      type,
-    },
-  })
-}
-
-export const unBindTag = (tagID: string, targetID: string, type: string) => {
-  return post('/tag-bindings/remove', {
-    body: {
-      tag_id: tagID,
-      target_id: targetID,
-      type,
-    },
-  })
-}
diff --git a/web/service/tools.ts b/web/service/tools.ts
index ae9655d520..843fd64c6d 100644
--- a/web/service/tools.ts
+++ b/web/service/tools.ts
@@ -92,7 +92,7 @@ export const removeCustomCollection = (collectionName: string) => {
 }
 
 export const importSchemaFromURL = (url: string) => {
-  return get('/workspaces/current/tool-provider/api/remote', {
+  return get<{ schema: string }>('/workspaces/current/tool-provider/api/remote', {
     params: {
       url,
     },
diff --git a/web/service/use-apps.ts b/web/service/use-apps.ts
index 7a49ea604f..b09aa18f94 100644
--- a/web/service/use-apps.ts
+++ b/web/service/use-apps.ts
@@ -4,7 +4,6 @@ import type {
   AppDailyConversationsResponse,
   AppDailyEndUsersResponse,
   AppDailyMessagesResponse,
-  AppListResponse,
   AppStatisticsResponse,
   AppTokenCostsResponse,
   AppVoicesListResponse,
@@ -12,69 +11,20 @@ import type {
 } from '@/models/app'
 import type { App } from '@/types/app'
 import {
-  keepPreviousData,
-  useInfiniteQuery,
   useMutation,
   useQuery,
   useQueryClient,
 } from '@tanstack/react-query'
 import { consoleClient, consoleQuery } from '@/service/client'
-import { AppModeEnum } from '@/types/app'
 import { get, post } from './base'
 
 const NAME_SPACE = 'apps'
 
-type AppListParams = {
-  page?: number
-  limit?: number
-  name?: string
-  mode?: AppModeEnum | 'all'
-  tag_ids?: string[]
-  creator_id?: string
-  is_created_by_me?: boolean
-}
-
 type DateRangeParams = {
   start?: string
   end?: string
 }
 
-// Allowed app modes for filtering; defined at module scope to avoid re-creating on every call
-const allowedModes = new Set<AppModeEnum | 'all'>([
-  'all',
-  AppModeEnum.WORKFLOW,
-  AppModeEnum.ADVANCED_CHAT,
-  AppModeEnum.CHAT,
-  AppModeEnum.AGENT_CHAT,
-  AppModeEnum.COMPLETION,
-])
-
-const normalizeAppListParams = (params: AppListParams) => {
-  const {
-    page = 1,
-    limit = 30,
-    name = '',
-    mode,
-    tag_ids,
-    creator_id,
-    is_created_by_me,
-  } = params
-
-  const safeMode = allowedModes.has((mode as any)) ? mode : undefined
-
-  return {
-    page,
-    limit,
-    name,
-    ...(safeMode && safeMode !== 'all' ? { mode: safeMode } : {}),
-    ...(tag_ids?.length ? { tag_ids } : {}),
-    ...(creator_id ? { creator_id } : {}),
-    ...(is_created_by_me ? { is_created_by_me } : {}),
-  }
-}
-
-const appListKey = (params: AppListParams) => [NAME_SPACE, 'list', params]
-
 const useAppFullListKey = [NAME_SPACE, 'full-list']
 
 export const useGenerateRuleTemplate = (type: GeneratorType, disabled?: boolean) => {
@@ -98,32 +48,11 @@ export const useAppDetail = (appID: string) => {
   })
 }
 
-export const useAppList = (params: AppListParams, options?: { enabled?: boolean }) => {
-  const normalizedParams = normalizeAppListParams(params)
-  return useQuery<AppListResponse>({
-    queryKey: appListKey(normalizedParams),
-    queryFn: () => get<AppListResponse>('/apps', { params: normalizedParams }),
-    ...options,
-  })
-}
-
-export const useInfiniteAppList = (params: AppListParams, options?: { enabled?: boolean }) => {
-  const normalizedParams = normalizeAppListParams(params)
-  return useInfiniteQuery<AppListResponse>({
-    queryKey: appListKey(normalizedParams),
-    queryFn: ({ pageParam = normalizedParams.page }) => get<AppListResponse>('/apps', { params: { ...normalizedParams, page: pageParam } }),
-    getNextPageParam: lastPage => lastPage.has_more ? lastPage.page + 1 : undefined,
-    initialPageParam: normalizedParams.page,
-    placeholderData: keepPreviousData,
-    ...options,
-  })
-}
-
 export const useInvalidateAppList = () => {
   const queryClient = useQueryClient()
   return () => {
     queryClient.invalidateQueries({
-      queryKey: [NAME_SPACE, 'list'],
+      queryKey: consoleQuery.apps.list.key(),
     })
   }
 }
@@ -141,7 +70,7 @@ export const useDeleteAppMutation = () => {
     onSuccess: async () => {
       await Promise.all([
         queryClient.invalidateQueries({
-          queryKey: [NAME_SPACE, 'list'],
+          queryKey: consoleQuery.apps.list.key(),
         }),
         queryClient.invalidateQueries({
           queryKey: useAppFullListKey,
@@ -151,28 +80,6 @@ export const useDeleteAppMutation = () => {
   })
 }
 
-export const useConvertWorkflowTypeMutation = () => {
-  const queryClient = useQueryClient()
-
-  return useMutation({
-    ...consoleQuery.apps.convertWorkflowType.mutationOptions({
-      onSuccess: async (_, variables) => {
-        await Promise.all([
-          queryClient.invalidateQueries({
-            queryKey: [NAME_SPACE, 'detail', variables.params.appId],
-          }),
-          queryClient.invalidateQueries({
-            queryKey: [NAME_SPACE, 'list'],
-          }),
-          queryClient.invalidateQueries({
-            queryKey: useAppFullListKey,
-          }),
-        ])
-      },
-    }),
-  })
-}
-
 const useAppStatisticsQuery = <T>(metric: string, appId: string, params?: DateRangeParams) => {
   return useQuery<T>({
     queryKey: [NAME_SPACE, 'statistics', metric, appId, params],
diff --git a/web/service/use-common.ts b/web/service/use-common.ts
index 0154be09ff..9e39d090b5 100644
--- a/web/service/use-common.ts
+++ b/web/service/use-common.ts
@@ -7,7 +7,6 @@ import type {
 } from '@/app/components/header/account-setting/model-provider-page/declarations'
 import type {
   AccountIntegrate,
-  ApiBasedExtension,
   CodeBasedExtension,
   CommonResponse,
   FileUploadConfigResponse,
@@ -24,6 +23,7 @@ import type { RETRIEVE_METHOD } from '@/types/app'
 import { queryOptions, useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import { IS_DEV } from '@/config'
 import { get, post } from './base'
+import { consoleClient } from './client'
 
 /**
  * True iff `err` is a 401 Response thrown by `service/base.ts`.
@@ -178,7 +178,13 @@ export type MailRegisterResponse = { result: string, data: {} }
 export const useMailRegister = () => {
   return useMutation({
     mutationKey: [NAME_SPACE, 'mail-register'],
-    mutationFn: (body: { token: string, new_password: string, password_confirm: string }) => {
+    mutationFn: (body: {
+      token: string
+      new_password: string
+      password_confirm: string
+      language?: string
+      timezone?: string
+    }) => {
       return post<MailRegisterResponse>('/email-register', { body })
     },
   })
@@ -314,9 +320,9 @@ export const useCodeBasedExtensions = (module: string) => {
 }
 
 export const useApiBasedExtensions = () => {
-  return useQuery<ApiBasedExtension[]>({
+  return useQuery({
     queryKey: commonQueryKeys.apiBasedExtensions,
-    queryFn: () => get<ApiBasedExtension[]>('/api-based-extension'),
+    queryFn: () => consoleClient.apiBasedExtension.get(),
   })
 }
 
diff --git a/web/service/use-log.ts b/web/service/use-log.ts
index 310c5000d6..359dd14568 100644
--- a/web/service/use-log.ts
+++ b/web/service/use-log.ts
@@ -1,5 +1,4 @@
 import type {
-  AnnotationsCountResponse,
   ChatConversationFullDetailResponse,
   ChatConversationsRequest,
   ChatConversationsResponse,
@@ -11,15 +10,20 @@ import type {
 } from '@/models/log'
 import { useQuery } from '@tanstack/react-query'
 import { get } from './base'
+import { consoleClient } from './client'
 
 const NAME_SPACE = 'log'
 
 // ============ Annotations Count ============
 
 export const useAnnotationsCount = (appId: string) => {
-  return useQuery<AnnotationsCountResponse>({
+  return useQuery({
     queryKey: [NAME_SPACE, 'annotations-count', appId],
-    queryFn: () => get<AnnotationsCountResponse>(`/apps/${appId}/annotations/count`),
+    queryFn: () => consoleClient.apps.byAppId.annotations.count.get({
+      params: {
+        app_id: appId,
+      },
+    }),
     enabled: !!appId,
   })
 }
diff --git a/web/service/use-pipeline.ts b/web/service/use-pipeline.ts
index 6efb5bb8c6..70055fc718 100644
--- a/web/service/use-pipeline.ts
+++ b/web/service/use-pipeline.ts
@@ -113,7 +113,7 @@ export const useImportPipelineDSL = (
   return useMutation({
     mutationKey: [NAME_SPACE, 'dsl-import'],
     mutationFn: (request: ImportPipelineDSLRequest) => {
-      return post<ImportPipelineDSLResponse>('/rag/pipelines/imports', { body: request })
+      return post<ImportPipelineDSLResponse>('/rag/pipelines/imports', { body: request }, { silent: true })
     },
     ...mutationOptions,
   })
@@ -125,7 +125,7 @@ export const useImportPipelineDSLConfirm = (
   return useMutation({
     mutationKey: [NAME_SPACE, 'dsl-import-confirm'],
     mutationFn: (importId: string) => {
-      return post<ImportPipelineDSLConfirmResponse>(`/rag/pipelines/imports/${importId}/confirm`)
+      return post<ImportPipelineDSLConfirmResponse>(`/rag/pipelines/imports/${importId}/confirm`, {}, { silent: true })
     },
     ...mutationOptions,
   })
@@ -195,10 +195,10 @@ export const useInvalidDataSourceList = () => {
 export const publishedPipelineInfoQueryKeyPrefix = [NAME_SPACE, 'published-pipeline']
 
 export const usePublishedPipelineInfo = (pipelineId: string) => {
-  return useQuery<PublishedPipelineInfoResponse>({
+  return useQuery<PublishedPipelineInfoResponse | null>({
     queryKey: [...publishedPipelineInfoQueryKeyPrefix, pipelineId],
     queryFn: () => {
-      return get<PublishedPipelineInfoResponse>(`/rag/pipelines/${pipelineId}/workflows/publish`)
+      return get<PublishedPipelineInfoResponse | null>(`/rag/pipelines/${pipelineId}/workflows/publish`)
     },
     enabled: !!pipelineId,
   })
diff --git a/web/service/use-plugins.ts b/web/service/use-plugins.ts
index 6004ecde56..36397c7f64 100644
--- a/web/service/use-plugins.ts
+++ b/web/service/use-plugins.ts
@@ -336,7 +336,7 @@ export const useInstallOrUpdate = ({
           }
           if (item.type === 'marketplace') {
             const data = item as GitHubItemAndMarketPlaceDependency
-            uniqueIdentifier = data.value.marketplace_plugin_unique_identifier! || plugin[i]?.plugin_id!
+            uniqueIdentifier = data.value.marketplace_plugin_unique_identifier! || (plugin[i]?.latest_package_identifier ?? '') || (plugin[i]?.plugin_id ?? '')
             if (uniqueIdentifier === installedPayload?.uniqueIdentifier) {
               return {
                 status: TaskStatus.success,
diff --git a/web/service/use-workflow.ts b/web/service/use-workflow.ts
index 103e3b77b0..b9620aae40 100644
--- a/web/service/use-workflow.ts
+++ b/web/service/use-workflow.ts
@@ -19,10 +19,10 @@ import { getFlowPrefix } from './utils'
 const NAME_SPACE = 'workflow'
 
 export const useAppWorkflow = (appID: string) => {
-  return useQuery<FetchWorkflowDraftResponse>({
+  return useQuery<FetchWorkflowDraftResponse | null>({
     enabled: !!appID,
     queryKey: [NAME_SPACE, 'publish', appID],
-    queryFn: () => get<FetchWorkflowDraftResponse>(`/apps/${appID}/workflows/publish`),
+    queryFn: () => get<FetchWorkflowDraftResponse | null>(`/apps/${appID}/workflows/publish`),
   })
 }
 
diff --git a/web/service/workflow-comment.ts b/web/service/workflow-comment.ts
deleted file mode 100644
index a8debbfd15..0000000000
--- a/web/service/workflow-comment.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import type {
-  CreateCommentParams as ContractCreateCommentParams,
-  CreateReplyParams as ContractCreateReplyParams,
-  UpdateCommentParams as ContractUpdateCommentParams,
-  UserProfile as ContractUserProfile,
-  WorkflowCommentCreateRes as ContractWorkflowCommentCreateRes,
-  WorkflowCommentDetail as ContractWorkflowCommentDetail,
-  WorkflowCommentDetailReply as ContractWorkflowCommentDetailReply,
-  WorkflowCommentList as ContractWorkflowCommentList,
-  WorkflowCommentReplyCreateRes as ContractWorkflowCommentReplyCreateRes,
-  WorkflowCommentReplyUpdateRes as ContractWorkflowCommentReplyUpdateRes,
-  WorkflowCommentResolveRes as ContractWorkflowCommentResolveRes,
-  WorkflowCommentUpdateRes as ContractWorkflowCommentUpdateRes,
-} from '@/contract/console/workflow-comment'
-import type { CommonResponse } from '@/models/common'
-import { consoleClient } from './client'
-
-type CreateCommentParams = ContractCreateCommentParams
-type CreateReplyParams = ContractCreateReplyParams
-type UpdateCommentParams = ContractUpdateCommentParams
-export type UserProfile = ContractUserProfile
-type WorkflowCommentCreateRes = ContractWorkflowCommentCreateRes
-export type WorkflowCommentDetail = ContractWorkflowCommentDetail
-export type WorkflowCommentDetailReply = ContractWorkflowCommentDetailReply
-export type WorkflowCommentList = ContractWorkflowCommentList
-type WorkflowCommentReplyCreateRes = ContractWorkflowCommentReplyCreateRes
-type WorkflowCommentReplyUpdateRes = ContractWorkflowCommentReplyUpdateRes
-type WorkflowCommentResolveRes = ContractWorkflowCommentResolveRes
-type WorkflowCommentUpdateRes = ContractWorkflowCommentUpdateRes
-
-export const fetchWorkflowComments = async (appId: string): Promise<WorkflowCommentList[]> => {
-  const response = await consoleClient.workflowComments.list({
-    params: { appId },
-  })
-  return response.data
-}
-
-export const createWorkflowComment = async (appId: string, params: CreateCommentParams): Promise<WorkflowCommentCreateRes> => {
-  return consoleClient.workflowComments.create({
-    params: { appId },
-    body: params,
-  })
-}
-
-export const fetchWorkflowComment = async (appId: string, commentId: string): Promise<WorkflowCommentDetail> => {
-  return consoleClient.workflowComments.detail({
-    params: { appId, commentId },
-  })
-}
-
-export const updateWorkflowComment = async (appId: string, commentId: string, params: UpdateCommentParams): Promise<WorkflowCommentUpdateRes> => {
-  return consoleClient.workflowComments.update({
-    params: { appId, commentId },
-    body: params,
-  })
-}
-
-export const deleteWorkflowComment = async (appId: string, commentId: string): Promise<CommonResponse> => {
-  return consoleClient.workflowComments.delete({
-    params: { appId, commentId },
-  })
-}
-
-export const resolveWorkflowComment = async (appId: string, commentId: string): Promise<WorkflowCommentResolveRes> => {
-  return consoleClient.workflowComments.resolve({
-    params: { appId, commentId },
-  })
-}
-
-export const createWorkflowCommentReply = async (appId: string, commentId: string, params: CreateReplyParams): Promise<WorkflowCommentReplyCreateRes> => {
-  return consoleClient.workflowComments.replies.create({
-    params: { appId, commentId },
-    body: params,
-  })
-}
-
-export const updateWorkflowCommentReply = async (appId: string, commentId: string, replyId: string, params: CreateReplyParams): Promise<WorkflowCommentReplyUpdateRes> => {
-  return consoleClient.workflowComments.replies.update({
-    params: {
-      appId,
-      commentId,
-      replyId,
-    },
-    body: params,
-  })
-}
-
-export const deleteWorkflowCommentReply = async (appId: string, commentId: string, replyId: string): Promise<CommonResponse> => {
-  return consoleClient.workflowComments.replies.delete({
-    params: {
-      appId,
-      commentId,
-      replyId,
-    },
-  })
-}
-
-export const fetchMentionableUsers = async (appId: string) => {
-  const response = await consoleClient.workflowComments.mentionUsers({
-    params: { appId },
-  })
-  return response.users
-}
diff --git a/web/service/workflow.ts b/web/service/workflow.ts
index 2db8dffe53..3ecbf82637 100644
--- a/web/service/workflow.ts
+++ b/web/service/workflow.ts
@@ -43,7 +43,7 @@ export const getLoopSingleNodeRunUrl = (flowType: FlowType, isChatFlow: boolean,
 }
 
 export const fetchPublishedWorkflow = (url: string) => {
-  return get<FetchWorkflowDraftResponse>(url)
+  return get<FetchWorkflowDraftResponse | null>(url)
 }
 
 export const stopWorkflowRun = (url: string) => {
diff --git a/web/tailwind-common-config.ts b/web/tailwind-common-config.ts
deleted file mode 100644
index 0ebcfd8a71..0000000000
--- a/web/tailwind-common-config.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import { icons as customPublicIcons } from '@dify/iconify-collections/custom-public'
-import { icons as customVenderIcons } from '@dify/iconify-collections/custom-vender'
-import { getIconCollections, iconsPlugin } from '@egoist/tailwindcss-icons'
-import difyUIPreset from '@langgenius/dify-ui/tailwind-preset'
-import tailwindTypography from '@tailwindcss/typography'
-import typography from './typography.js'
-
-const config = {
-  presets: [difyUIPreset],
-  theme: {
-    typography,
-    extend: {
-      screens: {
-        'mobile': '100px',
-        'tablet': '640px',
-        'pc': '769px',
-        '2k': '2560px',
-      },
-      backgroundColor: {
-        'background-gradient-bg-fill-chat-bubble-bg-3': 'var(--color-background-gradient-bg-fill-chat-bubble-bg-3)',
-      },
-      backgroundImage: {
-        'chatbot-bg': 'var(--color-chatbot-bg)',
-        'chat-bubble-bg': 'var(--color-chat-bubble-bg)',
-        'chat-input-mask': 'var(--color-chat-input-mask)',
-        'workflow-process-bg': 'var(--color-workflow-process-bg)',
-        'workflow-process-paused-bg': 'var(--color-workflow-process-paused-bg)',
-        'workflow-run-failed-bg': 'var(--color-workflow-run-failed-bg)',
-        'workflow-batch-failed-bg': 'var(--color-workflow-batch-failed-bg)',
-        'mask-top2bottom-gray-50-to-transparent': 'var(--mask-top2bottom-gray-50-to-transparent)',
-        'marketplace-divider-bg': 'var(--color-marketplace-divider-bg)',
-        'marketplace-plugin-empty': 'var(--color-marketplace-plugin-empty)',
-        'toast-success-bg': 'var(--color-toast-success-bg)',
-        'toast-warning-bg': 'var(--color-toast-warning-bg)',
-        'toast-error-bg': 'var(--color-toast-error-bg)',
-        'toast-info-bg': 'var(--color-toast-info-bg)',
-        'app-detail-bg': 'var(--color-app-detail-bg)',
-        'app-detail-overlay-bg': 'var(--color-app-detail-overlay-bg)',
-        'dataset-chunk-process-success-bg': 'var(--color-dataset-chunk-process-success-bg)',
-        'dataset-chunk-process-error-bg': 'var(--color-dataset-chunk-process-error-bg)',
-        'dataset-chunk-detail-card-hover-bg': 'var(--color-dataset-chunk-detail-card-hover-bg)',
-        'dataset-child-chunk-expand-btn-bg': 'var(--color-dataset-child-chunk-expand-btn-bg)',
-        'dataset-option-card-blue-gradient': 'var(--color-dataset-option-card-blue-gradient)',
-        'dataset-option-card-purple-gradient': 'var(--color-dataset-option-card-purple-gradient)',
-        'dataset-option-card-orange-gradient': 'var(--color-dataset-option-card-orange-gradient)',
-        'dataset-chunk-list-mask-bg': 'var(--color-dataset-chunk-list-mask-bg)',
-        'line-divider-bg': 'var(--color-line-divider-bg)',
-        'dataset-warning-message-bg': 'var(--color-dataset-warning-message-bg)',
-        'price-premium-badge-background': 'var(--color-premium-badge-background)',
-        'premium-yearly-tip-text-background': 'var(--color-premium-yearly-tip-text-background)',
-        'price-premium-text-background': 'var(--color-premium-text-background)',
-        'price-enterprise-background': 'var(--color-price-enterprise-background)',
-        'grid-mask-background': 'var(--color-grid-mask-background)',
-        'node-data-source-bg': 'var(--color-node-data-source-bg)',
-        'tag-selector-mask-bg': 'var(--color-tag-selector-mask-bg)',
-        'tag-selector-mask-hover-bg': 'var(--color-tag-selector-mask-hover-bg)',
-        'pipeline-template-card-hover-bg': 'var(--color-pipeline-template-card-hover-bg)',
-        'pipeline-add-documents-title-bg': 'var(--color-pipeline-add-documents-title-bg)',
-        'billing-plan-title-bg': 'var(--color-billing-plan-title-bg)',
-        'billing-plan-card-premium-bg': 'var(--color-billing-plan-card-premium-bg)',
-        'billing-plan-card-enterprise-bg': 'var(--color-billing-plan-card-enterprise-bg)',
-        'knowledge-pipeline-creation-footer-bg': 'var(--color-knowledge-pipeline-creation-footer-bg)',
-        'progress-bar-indeterminate-stripe': 'var(--color-progress-bar-indeterminate-stripe)',
-        'chat-answer-human-input-form-divider-bg': 'var(--color-chat-answer-human-input-form-divider-bg)',
-      },
-      animation: {
-        'spin-slow': 'spin 2s linear infinite',
-      },
-    },
-  },
-  plugins: [
-    tailwindTypography,
-    iconsPlugin({
-      collections: {
-        ...getIconCollections(['heroicons', 'ri']),
-        'custom-public': customPublicIcons,
-        'custom-vender': customVenderIcons,
-      },
-      extraProperties: {
-        width: '1rem',
-        height: '1rem',
-        display: 'block',
-      },
-    }),
-  ],
-  corePlugins: {
-    preflight: false,
-  },
-}
-
-export default config
diff --git a/web/tailwind.config.ts b/web/tailwind.config.ts
deleted file mode 100644
index 21c0455177..0000000000
--- a/web/tailwind.config.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import type { Config } from 'tailwindcss'
-import commonConfig from './tailwind-common-config'
-
-const config: Config = {
-  content: [
-    './app/**/*.{js,ts,jsx,tsx}',
-    './components/**/*.{js,ts,jsx,tsx}',
-    './context/**/*.{js,ts,jsx,tsx}',
-    '../packages/dify-ui/src/**/*.{ts,tsx}',
-    './node_modules/streamdown/dist/*.js',
-    './node_modules/@streamdown/math/dist/*.js',
-    '!./**/*.{spec,test}.{js,ts,jsx,tsx}',
-    '!../packages/dify-ui/src/**/*.{spec,test}.{ts,tsx}',
-  ],
-  ...commonConfig,
-}
-
-export default config
diff --git a/web/themes/manual-dark.css b/web/themes/manual-dark.css
index 8a114204d8..6c975af6a3 100644
--- a/web/themes/manual-dark.css
+++ b/web/themes/manual-dark.css
@@ -1,4 +1,11 @@
 html[data-theme="dark"] {
+    --color-monaco-sticky-header-bg: var(--color-components-panel-bg);
+    --color-monaco-sticky-header-bg-hover: var(--color-components-panel-on-panel-item-bg-hover);
+    --color-monaco-sticky-header-border: var(--color-components-panel-border);
+    --vscode-editorStickyScroll-background: var(--color-monaco-sticky-header-bg);
+    --vscode-editorStickyScrollHover-background: var(--color-monaco-sticky-header-bg-hover);
+    --vscode-editorStickyScroll-border: var(--color-monaco-sticky-header-border);
+    --vscode-editorStickyScroll-shadow: rgba(0, 0, 0, 0.6);
     --color-chatbot-bg: linear-gradient(180deg,
             rgba(34, 34, 37, 0.9) 0%,
             rgba(29, 29, 32, 0.9) 90.48%);
diff --git a/web/types/app.ts b/web/types/app.ts
index 829bb6194f..c4f98ddf1d 100644
--- a/web/types/app.ts
+++ b/web/types/app.ts
@@ -1,6 +1,6 @@
-import type { Tag } from '@/app/components/base/tag-management/constant'
 import type { CollectionType } from '@/app/components/tools/types'
 import type { UploadFileSetting } from '@/app/components/workflow/types'
+import type { Tag } from '@/contract/console/tags'
 import type { LanguagesSupported } from '@/i18n-config/language'
 import type { AccessMode } from '@/models/access-control'
 import type { ExternalDataTool } from '@/models/common'
diff --git a/web/types/dataset.ts b/web/types/dataset.ts
new file mode 100644
index 0000000000..167a740098
--- /dev/null
+++ b/web/types/dataset.ts
@@ -0,0 +1,8 @@
+export const segmentImportStatus = {
+  waiting: 'waiting',
+  processing: 'processing',
+  completed: 'completed',
+  error: 'error',
+} as const
+
+export type SegmentImportStatus = typeof segmentImportStatus[keyof typeof segmentImportStatus]
diff --git a/web/utils/__tests__/create-app-tracking.spec.ts b/web/utils/__tests__/create-app-tracking.spec.ts
index b732d8d3b8..67e641811e 100644
--- a/web/utils/__tests__/create-app-tracking.spec.ts
+++ b/web/utils/__tests__/create-app-tracking.spec.ts
@@ -55,11 +55,12 @@ describe('create-app-tracking', () => {
   })
 
   describe('buildCreateAppEventPayload', () => {
-    it('should build original payloads with normalized app mode and timestamp', () => {
+    it('should build payloads with source, normalized app mode, and timestamp', () => {
       expect(buildCreateAppEventPayload({
+        source: 'studio_blank',
         appMode: AppModeEnum.ADVANCED_CHAT,
       }, null, new Date(2026, 3, 13, 14, 5, 9))).toEqual({
-        source: 'original',
+        source: 'studio_blank',
         app_mode: 'chatflow',
         time: '04-13-14:05:09',
       })
@@ -67,9 +68,10 @@ describe('create-app-tracking', () => {
 
     it('should map agent mode into the canonical app mode bucket', () => {
       expect(buildCreateAppEventPayload({
+        source: 'studio_blank',
         appMode: AppModeEnum.AGENT_CHAT,
       }, null, new Date(2026, 3, 13, 9, 8, 7))).toEqual({
-        source: 'original',
+        source: 'studio_blank',
         app_mode: 'agent',
         time: '04-13-09:08:07',
       })
@@ -77,17 +79,19 @@ describe('create-app-tracking', () => {
 
     it('should fold legacy non-agent modes into chatflow', () => {
       expect(buildCreateAppEventPayload({
+        source: 'studio_blank',
         appMode: AppModeEnum.CHAT,
       }, null, new Date(2026, 3, 13, 8, 0, 1))).toEqual({
-        source: 'original',
+        source: 'studio_blank',
         app_mode: 'chatflow',
         time: '04-13-08:00:01',
       })
 
       expect(buildCreateAppEventPayload({
+        source: 'studio_blank',
         appMode: AppModeEnum.COMPLETION,
       }, null, new Date(2026, 3, 13, 8, 0, 2))).toEqual({
-        source: 'original',
+        source: 'studio_blank',
         app_mode: 'chatflow',
         time: '04-13-08:00:02',
       })
@@ -95,29 +99,56 @@ describe('create-app-tracking', () => {
 
     it('should map workflow mode into the workflow bucket', () => {
       expect(buildCreateAppEventPayload({
+        source: 'studio_blank',
         appMode: AppModeEnum.WORKFLOW,
       }, null, new Date(2026, 3, 13, 7, 6, 5))).toEqual({
-        source: 'original',
+        source: 'studio_blank',
         app_mode: 'workflow',
         time: '04-13-07:06:05',
       })
     })
 
+    it('should include template_id for template sources', () => {
+      expect(buildCreateAppEventPayload({
+        source: 'studio_template_list',
+        appMode: AppModeEnum.CHAT,
+        templateId: 'template-1',
+      }, null, new Date(2026, 3, 13, 8, 0, 1))).toEqual({
+        source: 'studio_template_list',
+        app_mode: 'chatflow',
+        time: '04-13-08:00:01',
+        template_id: 'template-1',
+      })
+    })
+
     it('should prefer external attribution when present', () => {
       expect(buildCreateAppEventPayload(
         {
+          source: 'studio_template_list',
           appMode: AppModeEnum.WORKFLOW,
+          templateId: 'template-1',
         },
         {
           utmSource: 'linkedin',
           utmCampaign: 'agent-launch',
         },
+        new Date(2026, 3, 13, 7, 6, 5),
       )).toEqual({
         source: 'external',
+        app_mode: 'workflow',
+        time: '04-13-07:06:05',
+        template_id: 'template-1',
         utm_source: 'linkedin',
         utm_campaign: 'agent-launch',
       })
     })
+
+    it('should not build external payloads without attribution', () => {
+      expect(buildCreateAppEventPayload({
+        source: 'external',
+        appMode: AppModeEnum.WORKFLOW,
+      }, null, new Date(2026, 3, 13, 7, 6, 5))).toBeNull()
+    })
   })
 
   describe('trackCreateApp', () => {
@@ -126,20 +157,24 @@ describe('create-app-tracking', () => {
         searchParams: new URLSearchParams('utm_source=newsletter&slug=how-to-build-rag-agent'),
       })
 
-      trackCreateApp({ appMode: AppModeEnum.WORKFLOW })
+      trackCreateApp({ source: 'studio_template_list', appMode: AppModeEnum.WORKFLOW, templateId: 'template-1' })
 
       expect(amplitude.trackEvent).toHaveBeenNthCalledWith(1, 'create_app', {
         source: 'external',
+        app_mode: 'workflow',
+        time: expect.stringMatching(/^\d{2}-\d{2}-\d{2}:\d{2}:\d{2}$/),
+        template_id: 'template-1',
         utm_source: 'blog',
         utm_campaign: 'how-to-build-rag-agent',
       })
 
-      trackCreateApp({ appMode: AppModeEnum.WORKFLOW })
+      trackCreateApp({ source: 'studio_template_list', appMode: AppModeEnum.WORKFLOW, templateId: 'template-1' })
 
       expect(amplitude.trackEvent).toHaveBeenNthCalledWith(2, 'create_app', {
-        source: 'original',
+        source: 'studio_template_list',
         app_mode: 'workflow',
         time: expect.stringMatching(/^\d{2}-\d{2}-\d{2}:\d{2}:\d{2}$/),
+        template_id: 'template-1',
       })
     })
 
@@ -152,16 +187,19 @@ describe('create-app-tracking', () => {
 
       window.history.replaceState({}, '', '/explore')
 
-      trackCreateApp({ appMode: AppModeEnum.CHAT })
+      trackCreateApp({ source: 'explore_template_preview', appMode: AppModeEnum.CHAT, templateId: 'template-2' })
 
       expect(amplitude.trackEvent).toHaveBeenCalledWith('create_app', {
         source: 'external',
+        app_mode: 'chatflow',
+        time: expect.stringMatching(/^\d{2}-\d{2}-\d{2}:\d{2}:\d{2}$/),
+        template_id: 'template-2',
         utm_source: 'linkedin',
         utm_campaign: 'agent-launch',
       })
     })
 
-    it('should fall back to the original payload when window is unavailable', () => {
+    it('should fall back to the provided source when window is unavailable', () => {
       const originalWindow = globalThis.window
 
       try {
@@ -170,10 +208,10 @@ describe('create-app-tracking', () => {
           value: undefined,
         })
 
-        trackCreateApp({ appMode: AppModeEnum.AGENT_CHAT })
+        trackCreateApp({ source: 'studio_blank', appMode: AppModeEnum.AGENT_CHAT })
 
         expect(amplitude.trackEvent).toHaveBeenCalledWith('create_app', {
-          source: 'original',
+          source: 'studio_blank',
           app_mode: 'agent',
           time: expect.stringMatching(/^\d{2}-\d{2}-\d{2}:\d{2}:\d{2}$/),
         })
@@ -185,5 +223,29 @@ describe('create-app-tracking', () => {
         })
       }
     })
+
+    it('should read, normalize, and consume snake_case sessionStorage attribution', () => {
+      window.sessionStorage.setItem('create_app_external_attribution', JSON.stringify({
+        utm_source: 'twitter',
+        utm_campaign: 'launch-week',
+      }))
+
+      trackCreateApp({ source: 'studio_blank', appMode: AppModeEnum.CHAT })
+
+      expect(amplitude.trackEvent).toHaveBeenCalledWith('create_app', {
+        source: 'external',
+        app_mode: 'chatflow',
+        time: expect.stringMatching(/^\d{2}-\d{2}-\d{2}:\d{2}:\d{2}$/),
+        utm_source: 'twitter/x',
+        utm_campaign: 'launch-week',
+      })
+      expect(window.sessionStorage.getItem('create_app_external_attribution')).toBeNull()
+    })
+
+    it('should not track external source without remembered attribution', () => {
+      trackCreateApp({ source: 'external', appMode: AppModeEnum.WORKFLOW, templateId: 'template-1' })
+
+      expect(amplitude.trackEvent).not.toHaveBeenCalled()
+    })
   })
 })
diff --git a/web/utils/create-app-tracking.ts b/web/utils/create-app-tracking.ts
index f56e2c13fa..800171c894 100644
--- a/web/utils/create-app-tracking.ts
+++ b/web/utils/create-app-tracking.ts
@@ -6,12 +6,13 @@ const CREATE_APP_EXTERNAL_ATTRIBUTION_STORAGE_KEY = 'create_app_external_attribu
 const CREATE_APP_EXTERNAL_ATTRIBUTION_QUERY_KEYS = ['utm_source', 'utm_campaign', 'slug'] as const
 
 const EXTERNAL_UTM_SOURCE_MAP = {
-  blog: 'blog',
-  dify_blog: 'blog',
-  linkedin: 'linkedin',
-  newsletter: 'blog',
-  twitter: 'twitter/x',
-  x: 'twitter/x',
+  'blog': 'blog',
+  'dify_blog': 'blog',
+  'linkedin': 'linkedin',
+  'newsletter': 'blog',
+  'twitter': 'twitter/x',
+  'twitter/x': 'twitter/x',
+  'x': 'twitter/x',
 } as const
 
 type SearchParamReader = {
@@ -20,8 +21,19 @@ type SearchParamReader = {
 
 type OriginalCreateAppMode = 'workflow' | 'chatflow' | 'agent'
 
-type TrackCreateAppParams = {
+type CreateAppSource
+  = | 'external'
+    | 'explore_template_list'
+    | 'explore_template_preview'
+    | 'studio_blank'
+    | 'studio_template_list'
+    | 'studio_template_preview'
+    | 'studio_upload'
+
+export type TrackCreateAppParams = {
+  source: CreateAppSource
   appMode: AppModeEnum
+  templateId?: string
 }
 
 type ExternalCreateAppAttribution = {
@@ -173,7 +185,20 @@ export const extractExternalCreateAppAttribution = ({
 }
 
 const readRememberedExternalCreateAppAttribution = (): ExternalCreateAppAttribution | null => {
-  return parseJSONRecord(window.sessionStorage.getItem(CREATE_APP_EXTERNAL_ATTRIBUTION_STORAGE_KEY)) as ExternalCreateAppAttribution | null
+  const attribution = parseJSONRecord(window.sessionStorage.getItem(CREATE_APP_EXTERNAL_ATTRIBUTION_STORAGE_KEY))
+  const utmSource = mapExternalUtmSource(
+    getObjectStringValue(attribution?.utmSource) ?? getObjectStringValue(attribution?.utm_source),
+  )
+
+  if (!utmSource)
+    return null
+
+  const utmCampaign = getObjectStringValue(attribution?.utmCampaign) ?? getObjectStringValue(attribution?.utm_campaign)
+
+  return {
+    utmSource,
+    ...(utmCampaign ? { utmCampaign } : {}),
+  }
 }
 
 const writeRememberedExternalCreateAppAttribution = (attribution: ExternalCreateAppAttribution) => {
@@ -214,18 +239,22 @@ export const buildCreateAppEventPayload = (
   externalAttribution?: ExternalCreateAppAttribution | null,
   currentTime = new Date(),
 ) => {
-  if (externalAttribution) {
-    return {
-      source: 'external',
-      utm_source: externalAttribution.utmSource,
-      ...(externalAttribution.utmCampaign ? { utm_campaign: externalAttribution.utmCampaign } : {}),
-    } satisfies Record<string, string>
-  }
+  const source = externalAttribution ? 'external' : params.source
+
+  if (source === 'external' && !externalAttribution)
+    return null
 
   return {
-    source: 'original',
+    source,
     app_mode: mapOriginalCreateAppMode(params.appMode),
     time: formatCreateAppTime(currentTime),
+    ...(params.templateId ? { template_id: params.templateId } : {}),
+    ...(externalAttribution
+      ? {
+          utm_source: externalAttribution.utmSource,
+          ...(externalAttribution.utmCampaign ? { utm_campaign: externalAttribution.utmCampaign } : {}),
+        }
+      : {}),
   } satisfies Record<string, string>
 }
 
@@ -233,6 +262,9 @@ export const trackCreateApp = (params: TrackCreateAppParams) => {
   const externalAttribution = resolveCurrentExternalCreateAppAttribution()
   const payload = buildCreateAppEventPayload(params, externalAttribution)
 
+  if (!payload)
+    return
+
   if (externalAttribution)
     clearRememberedExternalCreateAppAttribution()
 
diff --git a/web/utils/timezone.ts b/web/utils/timezone.ts
index e854ae7d5a..38e2e04d50 100644
--- a/web/utils/timezone.ts
+++ b/web/utils/timezone.ts
@@ -5,3 +5,10 @@ type Item = {
   name: string
 }
 export const timezones: Item[] = tz
+
+export const getBrowserTimezone = () => {
+  if (typeof Intl === 'undefined')
+    return undefined
+
+  return Intl.DateTimeFormat().resolvedOptions().timeZone || undefined
+}
diff --git a/web/vite.config.ts b/web/vite.config.ts
index 3107a8fc60..a4d3df3c18 100644
--- a/web/vite.config.ts
+++ b/web/vite.config.ts
@@ -88,6 +88,7 @@ export default defineConfig(({ mode }) => {
       coverage: {
         provider: 'v8',
         reporter: isCI ? ['json', 'json-summary'] : ['text', 'json', 'json-summary'],
+        exclude: ['**/__mocks__/**'],
       },
     },
   }
diff --git a/web/vitest.setup.ts b/web/vitest.setup.ts
index 6211fcd2f4..99d264113e 100644
--- a/web/vitest.setup.ts
+++ b/web/vitest.setup.ts
@@ -1,46 +1,26 @@
 import * as jestDomMatchers from '@testing-library/jest-dom/matchers'
 import { act, cleanup } from '@testing-library/react'
 import * as React from 'react'
-import '@testing-library/jest-dom/vitest'
+import { afterEach, beforeEach, expect, vi } from 'vitest'
 import 'vitest-canvas-mock'
 
-expect.extend(jestDomMatchers)
-
-// Suppress act() warnings from @headlessui/react internal Transition component
-// These warnings are caused by Headless UI's internal async state updates, not our code
-const originalConsoleError = console.error
-console.error = (...args: unknown[]) => {
-  // Check all arguments for the Headless UI TransitionRootFn act warning
-  const fullMessage = args.map(arg => (typeof arg === 'string' ? arg : '')).join(' ')
-  if (fullMessage.includes('TransitionRootFn') && fullMessage.includes('not wrapped in act'))
-    return
-  originalConsoleError.apply(console, args)
+if (typeof expect.extend === 'function') {
+  expect.extend(jestDomMatchers)
 }
 
-// Fix for @headlessui/react compatibility with happy-dom
-// headlessui tries to override focus properties which may be read-only in happy-dom
+(
+  globalThis as typeof globalThis & {
+    BASE_UI_ANIMATIONS_DISABLED: boolean
+  }
+).BASE_UI_ANIMATIONS_DISABLED = true
+
+// Base UI waits for element animations while closing overlays.
 if (typeof window !== 'undefined') {
-  // Provide a minimal animations API polyfill before @headlessui/react boots
   if (typeof Element !== 'undefined' && !Element.prototype.getAnimations)
     Element.prototype.getAnimations = () => []
 
   if (!document.getAnimations)
     document.getAnimations = () => []
-
-  const ensureWritable = (target: object, prop: string) => {
-    const descriptor = Object.getOwnPropertyDescriptor(target, prop)
-    if (descriptor && !descriptor.writable) {
-      const original = descriptor.value ?? descriptor.get?.call(target)
-      Object.defineProperty(target, prop, {
-        value: typeof original === 'function' ? original : vi.fn(),
-        writable: true,
-        configurable: true,
-      })
-    }
-  }
-
-  ensureWritable(window, 'focus')
-  ensureWritable(HTMLElement.prototype, 'focus')
 }
 
 if (typeof globalThis.ResizeObserver === 'undefined') {